diff --git a/.changeset/adaptive-opus-five.md b/.changeset/adaptive-opus-five.md
deleted file mode 100644
index 9d8cf6c1b3..0000000000
--- a/.changeset/adaptive-opus-five.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Support adaptive thinking levels for Claude Opus and Sonnet 5 and later.
diff --git a/.changeset/agent-manager-diff-base-override.md b/.changeset/agent-manager-diff-base-override.md
new file mode 100644
index 0000000000..5d38f0e6cb
--- /dev/null
+++ b/.changeset/agent-manager-diff-base-override.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Apply the Agent Manager base branch picker selection to the active diff immediately. Changing the base branch now refreshes the diff against the new base instead of keeping the previous comparison until the scope or session changed.
diff --git a/.changeset/agent-manager-diff-scope-selector.md b/.changeset/agent-manager-diff-scope-selector.md
new file mode 100644
index 0000000000..341e5ee768
--- /dev/null
+++ b/.changeset/agent-manager-diff-scope-selector.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Add a scope selector and base branch picker to the Agent Manager diff review. The side panel and full-screen review now let you switch between Branch, Staged, Unstaged, and Session scopes for the selected worktree, and the Branch scope's base branch can be overridden from a picker next to it. Branch stays the default, so existing review behavior is unchanged.
diff --git a/.changeset/agent-manager-multi-project.md b/.changeset/agent-manager-multi-project.md
new file mode 100644
index 0000000000..1212a52f99
--- /dev/null
+++ b/.changeset/agent-manager-multi-project.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Add an experimental multi-project foundation for Agent Manager behind the Multi-Project Agent Manager toggle in Kilo Settings > Experimental. A persistent project registry catalogs additional Git repositories across restarts while the current workspace repository stays the pinned default project, and all repository-bound services (state, worktrees, setup scripts, stale tracking, polling) are now owned by immutable per-project contexts that can be activated, expanded, and switched through new project protocol messages. Every expanded project runs its own git stats and PR pollers, so all visible project accordions show live data at the same time; switching projects keeps previously visited projects expanded and restores the exact worktree or session that was open there. Sessions created anywhere (sidebar, another window, the CLI) appear in the owning project's list immediately, and open tabs stay private to the project they were opened in. Single-project behavior is unchanged when the experiment is disabled.
diff --git a/.changeset/agent-manager-session-scope-selection.md b/.changeset/agent-manager-session-scope-selection.md
new file mode 100644
index 0000000000..7d34311656
--- /dev/null
+++ b/.changeset/agent-manager-session-scope-selection.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Make the Agent Manager diff review follow the sidebar selection instead of a single session. Switching session tabs inside a worktree no longer refetches the Branch, Staged, and Unstaged scopes, the Session scope now swaps to the active session's changes on tab switch, and the Local tab gains the Session scope so sessions running in the workspace can be reviewed on their own. The Session scope shows a notice when snapshots are disabled instead of a blank list, worktrees without an open session now still show their branch diff, and the Apply dialog lists the worktree's changes again.
diff --git a/.changeset/agent-manager-side-terminal.md b/.changeset/agent-manager-side-terminal.md
deleted file mode 100644
index 533da3233c..0000000000
--- a/.changeset/agent-manager-side-terminal.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": minor
----
-
-Let users open Agent Manager terminals in the VS Code terminal or an embedded side panel. The terminal button's dropdown picks the destination; the side panel shares the right-hand inspector with the diff view and keeps running in the background when hidden.
diff --git a/.changeset/agent-manager-terminal-shortcut-focus.md b/.changeset/agent-manager-terminal-shortcut-focus.md
new file mode 100644
index 0000000000..8d0b718198
--- /dev/null
+++ b/.changeset/agent-manager-terminal-shortcut-focus.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Make Cmd/Ctrl+/ toggle the Agent Manager terminal even when the webview keybinding forwarding drops the key while the prompt input is focused, and stop it from triggering the Agent Manager terminal while the Kilo sidebar is focused.
diff --git a/.changeset/agent-manager-terminal-shortcut-platform.md b/.changeset/agent-manager-terminal-shortcut-platform.md
new file mode 100644
index 0000000000..dbd2a126cb
--- /dev/null
+++ b/.changeset/agent-manager-terminal-shortcut-platform.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Match the Agent Manager terminal shortcut fallback to the platform modifier (Cmd on macOS, Ctrl elsewhere) and consume the extension echo once per keypress so unrelated invocations are no longer swallowed.
diff --git a/.changeset/atomic-session-revert.md b/.changeset/atomic-session-revert.md
deleted file mode 100644
index ed922d1a6e..0000000000
--- a/.changeset/atomic-session-revert.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Keep conversations and workspace files unchanged when a checkpoint cannot be fully restored.
diff --git a/.changeset/calm-cursors-fit.md b/.changeset/calm-cursors-fit.md
new file mode 100644
index 0000000000..d35d8ee2d1
--- /dev/null
+++ b/.changeset/calm-cursors-fit.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep the Agent Manager terminal cursor visible on the bottom row.
diff --git a/.changeset/calm-run-terminals.md b/.changeset/calm-run-terminals.md
new file mode 100644
index 0000000000..df2a4ace3d
--- /dev/null
+++ b/.changeset/calm-run-terminals.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Run Agent Manager project scripts in the terminal selected by the existing toolbar dropdown. Agent Manager panel uses the named side terminal, while VS Code terminal retains the integrated task flow.
diff --git a/.changeset/cli-startup-lazy-loading.md b/.changeset/cli-startup-lazy-loading.md
new file mode 100644
index 0000000000..38571e5838
--- /dev/null
+++ b/.changeset/cli-startup-lazy-loading.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": patch
+"@kilocode/kilo-telemetry": patch
+---
+
+Reduce CLI startup time by deferring Kilo-specific module loading until commands actually run, caching the telemetry profile lookup across invocations, and uploading telemetry in the background so process exit is not delayed by a network round trip
diff --git a/.changeset/config-unset-propagation.md b/.changeset/config-unset-propagation.md
new file mode 100644
index 0000000000..82418a5635
--- /dev/null
+++ b/.changeset/config-unset-propagation.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Fix settings snapping back to their previous value after being cleared to "Not set" when multiple config files exist (e.g. both `kilo.json` and `kilo.jsonc`)
diff --git a/.changeset/console-headless-credentials.md b/.changeset/console-headless-credentials.md
deleted file mode 100644
index 6c6102f467..0000000000
--- a/.changeset/console-headless-credentials.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Include basic-auth credentials in the Local and Network Console URLs printed by `kilo console`, so users on headless hosts (no `DISPLAY`/`WAYLAND_DISPLAY`, SSH sessions, CI runners) can open the URL in a browser on another machine and reach the Console.
\ No newline at end of file
diff --git a/.changeset/enable-websearch-config.md b/.changeset/enable-websearch-config.md
new file mode 100644
index 0000000000..cd47a9e9fb
--- /dev/null
+++ b/.changeset/enable-websearch-config.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": patch
+"kilo-code": patch
+---
+
+Allow users to enable web search for models from all providers through Kilo configuration, VS Code settings, and Kilo Console settings.
diff --git a/.changeset/fix-nix-bun-pin.md b/.changeset/fix-nix-bun-pin.md
deleted file mode 100644
index 5facef0667..0000000000
--- a/.changeset/fix-nix-bun-pin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Keep Nix builds on the Bun version required by the repository.
diff --git a/.changeset/fix-scoped-mode-cycling.md b/.changeset/fix-scoped-mode-cycling.md
deleted file mode 100644
index d71009746d..0000000000
--- a/.changeset/fix-scoped-mode-cycling.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Update the visible agent mode when cycling modes in Kilo sidebars and pending session tabs.
diff --git a/.changeset/fix-vscode-settings-save.md b/.changeset/fix-vscode-settings-save.md
deleted file mode 100644
index c7ed178ad9..0000000000
--- a/.changeset/fix-vscode-settings-save.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Fix settings changes sometimes failing to save and apply in VS Code.
diff --git a/.changeset/fresh-rc-upgrades.md b/.changeset/fresh-rc-upgrades.md
new file mode 100644
index 0000000000..61a54ea4e2
--- /dev/null
+++ b/.changeset/fresh-rc-upgrades.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Keep RC installations up to date when a newer stable CLI release is published.
diff --git a/.changeset/friendly-memories-rest.md b/.changeset/friendly-memories-rest.md
new file mode 100644
index 0000000000..ff62c49064
--- /dev/null
+++ b/.changeset/friendly-memories-rest.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-memory": patch
+---
+
+Accept memory digest responses that include additional model-generated fields.
diff --git a/.changeset/fuzzy-otters-signal.md b/.changeset/fuzzy-otters-signal.md
new file mode 100644
index 0000000000..eb802171c1
--- /dev/null
+++ b/.changeset/fuzzy-otters-signal.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Report Bash commands terminated by a signal with the conventional 128 + signum exit code (e.g. 139 for SIGSEGV) instead of hanging until the command timeout.
diff --git a/.changeset/fuzzy-pandas-listen.md b/.changeset/fuzzy-pandas-listen.md
new file mode 100644
index 0000000000..c2d8334aec
--- /dev/null
+++ b/.changeset/fuzzy-pandas-listen.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Persist MCP server enable and disable changes from VS Code settings across window reloads.
diff --git a/.changeset/fuzzy-tildes-smile.md b/.changeset/fuzzy-tildes-smile.md
deleted file mode 100644
index 39c76209f8..0000000000
--- a/.changeset/fuzzy-tildes-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Preserve parenthesized tilde expressions as literal text in rendered chat messages.
diff --git a/.changeset/headless-run-honest-exit.md b/.changeset/headless-run-honest-exit.md
new file mode 100644
index 0000000000..37d00a8493
--- /dev/null
+++ b/.changeset/headless-run-honest-exit.md
@@ -0,0 +1,13 @@
+---
+"@kilocode/cli": patch
+---
+
+Non-interactive `kilo run` no longer reports success for runs that did not complete. A plain
+headless run (neither `--auto` nor `--dangerously-skip-permissions`) in which the CLI
+auto-rejected at least one permission ask now exits 1 with a stderr diagnostic naming the cause,
+and a run whose session errors mid-stream now prints that diagnostic to stderr under
+`--format json` as well (previously the JSON branch swallowed it). Runs that complete their turn
+with no auto-rejected permission still exit 0. Under `--format json` the auto-reject path adds a
+new `error` event to the stream; existing event shapes are unchanged. The same exit-1 rule applies
+to a plain non-interactive `--attach` run that auto-rejects an ask (that run was equally crippled);
+interactive mode is untouched.
diff --git a/.changeset/ingest-shutdown-flush.md b/.changeset/ingest-shutdown-flush.md
deleted file mode 100644
index 94ff86a5b1..0000000000
--- a/.changeset/ingest-shutdown-flush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Fix session transcripts losing their final messages when the CLI exits — pending uploads are now flushed on shutdown and as soon as a session closes.
diff --git a/.changeset/instant-prompt-tooltips.md b/.changeset/instant-prompt-tooltips.md
deleted file mode 100644
index d34f46dc04..0000000000
--- a/.changeset/instant-prompt-tooltips.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Show prompt input toggle tooltips instantly on hover instead of after a delay.
diff --git a/.changeset/jetbrains-bundled-cli.md b/.changeset/jetbrains-bundled-cli.md
deleted file mode 100644
index d0239ff176..0000000000
--- a/.changeset/jetbrains-bundled-cli.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-jetbrains": minor
----
-
-Publish a signed GitHub-hosted JetBrains plugin build with the CLI bundled for offline installation.
diff --git a/.changeset/jetbrains-queued-prompts.md b/.changeset/jetbrains-queued-prompts.md
deleted file mode 100644
index b22d8c8353..0000000000
--- a/.changeset/jetbrains-queued-prompts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-jetbrains": patch
----
-
-Allow sending prompts while a session is busy and show queued prompts with a remove action.
diff --git a/.changeset/long-session-prompt-navigation.md b/.changeset/long-session-prompt-navigation.md
new file mode 100644
index 0000000000..967dde901f
--- /dev/null
+++ b/.changeset/long-session-prompt-navigation.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Navigate long conversations from a compact prompt rail that loads earlier history as you scroll.
diff --git a/.changeset/opencode-v1-17-5-to-v1-17-9.md b/.changeset/opencode-v1-17-5-to-v1-17-9.md
deleted file mode 100644
index 5a019637c3..0000000000
--- a/.changeset/opencode-v1-17-5-to-v1-17-9.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Changes from opencode v1.17.5 to v1.17.9 upstream:
-
-- Core Bugfixes: Improved MCP server compatibility by declaring Kilo's supported client capabilities.
-- Core Bugfixes: Plugin client requests now reuse the active server instead of assuming the default local port.
-- Core Bugfixes: ACP shell tool calls now show the command and working directory from the start.
-- Core Bugfixes: Plugin-provided shell environment variables now apply to PTY sessions.
-- Core Bugfixes: OpenAI-compatible providers now accept MCP tool schemas that previously failed validation. (@jquense)
-- Core Bugfixes: Cloudflare AI Gateway now receives the configured API key correctly. (@keefetang)
-- Core Bugfixes: MCP tools without declared schema properties now work with providers that expect object properties.
-- Core Bugfixes: Long-running MCP tools now keep their timeout alive when they report progress. (@Nomadcxx)
-- Core Bugfixes: The MCP OAuth callback server now shuts down once authorization finishes or is cancelled.
-- Core Bugfixes: MCP tool failures now surface the server's error text instead of a generic failure.
-- Core Bugfixes: MCP OAuth error pages now escape provider error text correctly.
-- Core Bugfixes: Honor configured agent step limits by forcing a final text response instead of failing mid-run.
-- Core Bugfixes: Queue steering prompts before dismissing pending questions so the previous turn cannot resume first.
-- Core Bugfixes: Prevent local server credentials from leaking into spawned PTY processes.
-- Core Bugfixes: Fix Devstral model detection when provider IDs use different casing. (@Robin1987China)
-- Core Bugfixes: Pass configured custom headers to Copilot model requests.
-- Core Improvements: MCP servers can now receive the current workspace as a client root.
-- Core Improvements: Session timelines load much faster and avoid flicker or scroll jumps.
-- Core Improvements: Add `high` and `max` thinking variants for GLM-5.2 across supported providers. (@imranshaiedi-byte)
-- Core Improvements: Stop wrapping follow-up user messages in a steering reminder so prompt caching stays effective.
-- TUI Bugfixes: MCP debug now uses the SDK's latest protocol version.
-- TUI Bugfixes: Only show the background subagent shortcut when the server supports it.
-- UI Bugfixes: Render completed Mermaid blocks from diagram source instead of fenced Markdown.
diff --git a/.changeset/past-chats-worktree-family.md b/.changeset/past-chats-worktree-family.md
new file mode 100644
index 0000000000..395bee2b5a
--- /dev/null
+++ b/.changeset/past-chats-worktree-family.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix the `@` "Past chats" picker in Agent Manager showing only the current session's directory. It now lists previous sessions across the whole worktree family — the local workspace and every Agent Manager worktree — each labeled with its worktree name, matching the Agent Manager session search. Any listed session can be attached as context, including chats from other worktrees of the same repository.
diff --git a/.changeset/persian-language.md b/.changeset/persian-language.md
new file mode 100644
index 0000000000..9e07d9e8b8
--- /dev/null
+++ b/.changeset/persian-language.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Add Persian (Farsi) as a UI language, including right-to-left layout. Contributed by Babak Safabahar.
diff --git a/.changeset/pwsh-permission-fail-closed.md b/.changeset/pwsh-permission-fail-closed.md
deleted file mode 100644
index cb140f33cd..0000000000
--- a/.changeset/pwsh-permission-fail-closed.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Fix bash permission rules being bypassed on PowerShell for commands containing a bare `--` such as `git checkout -- <file>`. Commands the shell parser cannot parse now get checked against their raw command text instead of executing without a permission check.
diff --git a/.changeset/quiet-json-events.md b/.changeset/quiet-json-events.md
deleted file mode 100644
index bc7f513506..0000000000
--- a/.changeset/quiet-json-events.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Emit each agent event once from `kilo run --format json`.
diff --git a/.changeset/quiet-terminals-switch.md b/.changeset/quiet-terminals-switch.md
new file mode 100644
index 0000000000..0306eb3475
--- /dev/null
+++ b/.changeset/quiet-terminals-switch.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Open an embedded terminal automatically when switching to a worktree without one.
diff --git a/.changeset/quiet-vscode-watchers.md b/.changeset/quiet-vscode-watchers.md
deleted file mode 100644
index 0f44b7cfda..0000000000
--- a/.changeset/quiet-vscode-watchers.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Prevent the VS Code backend from eagerly starting native file watchers for every Agent Manager worktree.
diff --git a/.changeset/reliable-vscode-message-copy.md b/.changeset/reliable-vscode-message-copy.md
deleted file mode 100644
index 566918cf93..0000000000
--- a/.changeset/reliable-vscode-message-copy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep message and response copy buttons working after switching focus away from VS Code.
diff --git a/.changeset/responses-stream-error-details.md b/.changeset/responses-stream-error-details.md
new file mode 100644
index 0000000000..9b9d8cff06
--- /dev/null
+++ b/.changeset/responses-stream-error-details.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Show the provider's actual error message when an OpenAI or Azure Responses API stream fails (for example an upstream rate limit) instead of a generic retry notice.
diff --git a/.changeset/ripgrep-error-detail.md b/.changeset/ripgrep-error-detail.md
new file mode 100644
index 0000000000..6afe556432
--- /dev/null
+++ b/.changeset/ripgrep-error-detail.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Include the underlying reason in search execution failures instead of showing a bare "ripgrep execution failed" message.
diff --git a/.changeset/safe-windows-snapshot-diffs.md b/.changeset/safe-windows-snapshot-diffs.md
deleted file mode 100644
index 55dd9e61bc..0000000000
--- a/.changeset/safe-windows-snapshot-diffs.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Keep Windows snapshot diffs parseable and preserve valid files when a stored patch is malformed.
diff --git a/.changeset/side-terminal-tab-parity.md b/.changeset/side-terminal-tab-parity.md
new file mode 100644
index 0000000000..715a1bfe21
--- /dev/null
+++ b/.changeset/side-terminal-tab-parity.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Make Agent Manager panel terminals behave like session tabs: right-click Close and Close Others, arrow-key tab navigation, overflow scrolling with edge fades, and stable tab widths while closing. The new-terminal button now sits directly next to the last terminal tab instead of the far edge of the panel.
diff --git a/.changeset/skill-shell-execution.md b/.changeset/skill-shell-execution.md
new file mode 100644
index 0000000000..8689613673
--- /dev/null
+++ b/.changeset/skill-shell-execution.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": minor
+---
+
+Support executing shell commands embedded in skill files. Commands written as `` !`command` `` in a SKILL.md run and their output is inlined into the skill. Only trusted skills can run commands and `KILO_DISABLE_SKILL_SHELL` disables the behavior; when the model loads a skill, the commands are shown in a single up-front approval before running.
diff --git a/.changeset/smart-pandas-remain.md b/.changeset/smart-pandas-remain.md
new file mode 100644
index 0000000000..cab4570c52
--- /dev/null
+++ b/.changeset/smart-pandas-remain.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Run Agent Manager worktree setup scripts in the terminal selected by the toolbar dropdown. Agent Manager panel shows live setup output in a named `Setup` side tab that reveals itself while provisioning and hides again on success unless you engaged with the panel, while VS Code terminal retains the integrated task flow.
diff --git a/.changeset/stalled-provider-first-byte.md b/.changeset/stalled-provider-first-byte.md
deleted file mode 100644
index 2d11921fd6..0000000000
--- a/.changeset/stalled-provider-first-byte.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Bound the wait for a provider's first response byte by the request timeout. A provider that accepts a request and returns headers but never sends body data now fails and retries instead of leaving the turn hanging after a tool call completes. The same `timeout` value now covers both the connection phase and the wait for the first byte as a single deadline; streaming responses that have already produced data are unaffected.
diff --git a/.changeset/steady-cli-subprocess-tests.md b/.changeset/steady-cli-subprocess-tests.md
deleted file mode 100644
index e95a9d4c73..0000000000
--- a/.changeset/steady-cli-subprocess-tests.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Stabilize cross-platform CLI subprocess tests under constrained CI runners
diff --git a/.changeset/steady-editor-tabs.md b/.changeset/steady-editor-tabs.md
deleted file mode 100644
index 84e5f2b0b5..0000000000
--- a/.changeset/steady-editor-tabs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Open Kilo chats, settings, and files as tabs in the selected editor pane without creating, locking, or resizing editor panes.
diff --git a/.changeset/tidy-am-i18n-keys.md b/.changeset/tidy-am-i18n-keys.md
deleted file mode 100644
index 85c3ca1581..0000000000
--- a/.changeset/tidy-am-i18n-keys.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Remove unused translation keys from the Agent Manager, sidebar webview, shared kilo-i18n, and autocomplete dictionaries across all locales, and add a conservative lint test for unreferenced, unprotected dictionary keys.
diff --git a/.changeset/tidy-mice-report.md b/.changeset/tidy-mice-report.md
new file mode 100644
index 0000000000..3ba5fbb6e9
--- /dev/null
+++ b/.changeset/tidy-mice-report.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-telemetry": patch
+---
+
+Include the host operating system name, version, and architecture in telemetry events.
diff --git a/.changeset/tui-variant-shortcut-hint.md b/.changeset/tui-variant-shortcut-hint.md
deleted file mode 100644
index 8891876bdb..0000000000
--- a/.changeset/tui-variant-shortcut-hint.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Show the `Ctrl+T` variant cycling shortcut in the TUI prompt hint row whenever the active model exposes reasoning variants, as the first hint before the agent and command palette hints
diff --git a/.github/docs-sync/collect.mjs b/.github/docs-sync/collect.mjs
index 51be1a3d8e..75ab641039 100644
--- a/.github/docs-sync/collect.mjs
+++ b/.github/docs-sync/collect.mjs
@@ -7,15 +7,20 @@
  *
  * Pre-filter drops (triage never sees these):
  *   - PRs labeled auto-docs (this bot's own rolling PRs)
- *   - chore/test/ci/build/docs/style/refactor/revert conventional titles
+ *   - chore/test/ci/build/docs/style/refactor conventional titles
  *   - PRs touching only docs/non-product paths
  *
+ * Revert PRs (conventional `revert(...):` and GitHub-native `Revert "..."` titles)
+ * are intercepted as signals, never added to the digest; affected digest entries
+ * gain `reverted_by` so triage/edit can skip them.
+ *
  * Bot-authored PRs are kept: release/dependency bots ship user-facing
  * changes too, and the label + docs-only guards above prevent loops.
  */
 
 import fs from "node:fs"
 import { api, appendOutput, appendSummary, listPrFiles, searchIssues } from "./lib.mjs"
+import { revertTitleKind, parseRevertTargets, applyRevertAnnotations, unannotatedRevertSignals } from "./reverts.mjs"
 
 const SOURCE_REPOS = ["Kilo-Org/cloud", "Kilo-Org/kilocode"]
 const OUT_DIR = "docs-sync-out"
@@ -23,6 +28,7 @@ const BODY_LIMIT = 2000
 const SLIM_BODY_LIMIT = 300
 const PATCH_LIMIT = 8000
 const FILE_LIMIT = 30
+// Revert PRs (conventional AND GitHub-native) are intercepted below BEFORE this filter; the "revert" alternative here is unreachable and kept only to minimize diff.
 const DROP_TITLE = /^(chore|test|ci|build|docs|style|refactor|revert)(\(.+\))?!?:/i
 const DOCS_ONLY_PATH = /^(packages\/kilo-docs\/|\.github\/docs-sync\/|docs-sync-out\/|docs\/|[^/]+\.md$)/
 
@@ -44,7 +50,8 @@ const since = argSince()
 console.log(`collecting PRs merged since ${since.toISOString()}`)
 
 const digest = []
-const dropped = { label: 0, title: 0, docs_only: 0, fetch_error: 0 }
+const dropped = { label: 0, title: 0, docs_only: 0, fetch_error: 0, revert: 0 }
+const reverts = []
 
 for (const fullRepo of SOURCE_REPOS) {
   const prs = await mergedPrs(fullRepo, since)
@@ -56,6 +63,22 @@ for (const fullRepo of SOURCE_REPOS) {
       dropped.label++
       continue
     }
+    if (revertTitleKind(item.title ?? "")) {
+      try {
+        const pr = await api(`/repos/${fullRepo}/pulls/${item.number}`)
+        const targets = parseRevertTargets(pr.body ?? "", fullRepo)
+        reverts.push({ url: pr.html_url, merged_at: pr.merged_at, targets })
+        if (targets.length === 0) {
+          console.warn(`::warning::revert PR ${fullRepo}#${item.number} has no parseable targets`)
+        }
+        dropped.revert++
+      } catch (err) {
+        // One dead revert PR must not abort the run; its targets just go unannotated.
+        console.warn(`::warning::skipping revert ${fullRepo}#${item.number}: ${err.message}`)
+        dropped.fetch_error++
+      }
+      continue
+    }
     if (DROP_TITLE.test(item.title ?? "")) {
       dropped.title++
       continue
@@ -108,6 +131,9 @@ for (const fullRepo of SOURCE_REPOS) {
   }
 }
 
+const applied = applyRevertAnnotations(digest, reverts)
+const unannotated = unannotatedRevertSignals(reverts, applied)
+
 digest.sort((a, b) => new Date(a.merged_at) - new Date(b.merged_at))
 
 fs.mkdirSync(OUT_DIR, { recursive: true })
@@ -124,14 +150,31 @@ console.log(`kept ${digest.length} PRs, dropped:`, dropped)
 appendOutput("count", digest.length)
 appendOutput("digest", `${OUT_DIR}/digest.json`)
 
-appendSummary(
-  [
-    "### docs-sync collect",
-    "",
-    `- window: since \`${since.toISOString()}\``,
-    `- kept: **${digest.length}** PRs`,
-    `- dropped: ${dropped.label} auto-docs, ${dropped.title} title filter, ${dropped.docs_only} docs-only, ${dropped.fetch_error} fetch errors`,
-    "",
-    ...digest.map((d) => `- [${d.repo}#${d.number}](${d.url}) ${d.title}`),
-  ].join("\n"),
-)
+const summaryLines = [
+  "### docs-sync collect",
+  "",
+  `- window: since \`${since.toISOString()}\``,
+  `- kept: **${digest.length}** PRs`,
+  `- dropped: ${dropped.label} auto-docs, ${dropped.title} title filter, ${dropped.docs_only} docs-only, ${dropped.fetch_error} fetch errors, ${dropped.revert} reverts intercepted`,
+  "",
+  ...digest.map((d) => `- [${d.repo}#${d.number}](${d.url}) ${d.title}`),
+]
+if (applied.length > 0) {
+  summaryLines.push("", "**revert annotations:**", ...applied.map(([target, reverter]) => `- ${target} — reverted by ${reverter}`))
+}
+if (unannotated.missed.length > 0 || unannotated.unparsed.length > 0) {
+  summaryLines.push("", "**revert targets with no in-window annotation:**")
+  for (const m of unannotated.missed) {
+    summaryLines.push(`- ${m.url} — unannotated targets: ${m.targets.join(", ")}`)
+  }
+  for (const url of unannotated.unparsed) {
+    summaryLines.push(`- ${url} (no parseable targets)`)
+  }
+}
+if (unannotated.chains.length > 0) {
+  summaryLines.push("", "**revert chains (not annotated):**")
+  for (const c of unannotated.chains) {
+    summaryLines.push(`- ${c.url}${c.targets.length > 0 ? ` (targets: ${c.targets.join(", ")})` : ""}`)
+  }
+}
+appendSummary(summaryLines.join("\n"))
diff --git a/.github/docs-sync/edit-prompt.md b/.github/docs-sync/edit-prompt.md
index f0099e588f..c9a2b86abe 100644
--- a/.github/docs-sync/edit-prompt.md
+++ b/.github/docs-sync/edit-prompt.md
@@ -4,13 +4,16 @@ Before writing anything:
 
 1. Read `packages/kilo-docs/AGENTS.md` and `packages/kilo-docs/STYLE_GUIDE.md` and follow them exactly: Markdoc custom tags, the `/docs` prefix in image paths, navigation files under `lib/nav/`, redirect rules, and the generated-screenshot policy.
 2. Read the attached batch files: the full-details file (PR title, body, file list, `patch_excerpt` diffs) and the triage file (docs-worthiness verdicts, target sections, priorities).
+3. Verify facts against the current source tree — for Kilo-Org/kilocode PRs. This checkout reflects current kilocode main: before documenting a command, flag, setting, default, or behavior from a kilocode PR, confirm it exists in the current source. Existence alone is not enough: defaults, whether an option is required or optional, and on-by-default behavior must also match the current tree — a symbol that still exists as opt-in does not justify documenting default-on behavior. When the merged diff and the current tree disagree, the current tree wins — the change may have been reverted or superseded; skip it and record why. For Kilo-Org/cloud PRs the source is not in this checkout: rely on the PR diff and body, and on the `reverted_by` field below. Reading any file in the checkout for verification is expected; the hard rule against touching anything outside `packages/kilo-docs/` applies to writing only.
 
-For each PR in the batch, in priority order:
+For each PR in the batch, in priority order, first decide whether it needs documentation at all — skipping is a first-class outcome. For each one that does:
 
 - Find the most relevant existing docs page(s) and make minimal, precise updates in the style of the surrounding content.
 - Create a new page only when no existing page fits; then add it to the matching nav file in `packages/kilo-docs/lib/nav/`.
-- Document only behavior that is actually present in the merged diff. If the PR body or diff shows the feature is behind a flag or otherwise not user-visible yet, skip it and record why.
+- Document only behavior that is actually present in the merged diff and still present in the product now (step 3 above: when they disagree, the current state wins). If the PR body or diff shows the feature is behind a flag or otherwise not user-visible yet, skip it and record why.
 - If a PR turns out not to need documentation, skip it and record why. Trust evidence over the triage verdict.
+- A batch PR with a `reverted_by` field was reverted by that PR; skip it unless there is clear evidence the change is present now — for kilocode PRs verify it in the current source tree (re-land); for cloud PRs require explicit re-land evidence in the entry itself.
+- Skipping is a normal outcome: a batch where every PR is skipped is a valid result. Never write docs just to have something to show.
 
 Hard rules:
 
diff --git a/.github/docs-sync/edit.mjs b/.github/docs-sync/edit.mjs
index 777c3a2929..167656eda3 100644
--- a/.github/docs-sync/edit.mjs
+++ b/.github/docs-sync/edit.mjs
@@ -82,8 +82,13 @@ Batch specifics for this run: the PRs to handle are in the attached ${batchFile}
       break
     }
 
+    // Headless `kilo run` auto-rejects every permission ask; without --auto the
+    // agent cannot run shell commands. SECURITY: --auto grants unrestricted bash
+    // to an agent steered by external PR content. Hardening deferred: a scoped
+    // permission.bash map via KILO_CONFIG_CONTENT should replace --auto once the
+    // required shell patterns are stable (see PR #12605 review thread).
     const result = runKilo({
-      args: ["run", prompt, "-m", model, "--variant", "high", "--dir", process.cwd(), "-f", batchFile, "-f", triageFile],
+      args: ["run", "--auto", prompt, "-m", model, "--variant", "high", "--dir", process.cwd(), "-f", batchFile, "-f", triageFile],
       timeoutMs: Math.min(BATCH_TIMEOUT_MS, left),
       streamStdout: true,
       label: `edit batch ${index} attempt ${attempt}`,
diff --git a/.github/docs-sync/lib.mjs b/.github/docs-sync/lib.mjs
index 67c13354d8..6aaf9dc6c3 100644
--- a/.github/docs-sync/lib.mjs
+++ b/.github/docs-sync/lib.mjs
@@ -167,13 +167,53 @@ export function sleepSync(ms) {
 const STDERR_TAIL_LINES = 20
 const STDERR_TAIL_CHARS = 4_000
 
+// CSI sequences (colour, cursor moves, erases). kilo renders its TUI to stderr,
+// so an unstripped tail lands in the rolling PR's pending table as
+// "^[[0m→ ^[[0mRead packages/..." and the cause is unreadable. Stripped before
+// the line/char slice so escapes do not eat the budget. The persisted
+// docs-sync-out/kilo-stderr-*.log stays raw — that is the debugging record.
+// eslint-disable-next-line no-control-regex
+const ANSI_CSI = /\u001b\[[0-9;?]*[ -/]*[@-~]/g
+
 function tailText(text, { lines = STDERR_TAIL_LINES, chars = STDERR_TAIL_CHARS } = {}) {
-  const s = String(text ?? "").trim()
+  const s = String(text ?? "")
+    .replace(ANSI_CSI, "")
+    .trim()
   if (!s) return ""
   const lastLines = s.split("\n").slice(-lines).join("\n")
   return lastLines.length > chars ? lastLines.slice(-chars) : lastLines
 }
 
+/**
+ * Artifact files are raw: GitHub masks secret values in log streams only, and the runner
+ * env holds long-lived secrets (KILO_API_KEY), so exact values of secret-looking env vars
+ * are redacted before stdout/stderr is persisted or printed.
+ * Matching is exact-substring and case-sensitive on values — JSON-escaped, base64'd, or
+ * line-wrapped renderings and values shorter than 8 chars survive (same limitation as
+ * GitHub's own log masking); this is defense-in-depth, not a guarantee the logs are clean.
+ */
+export function redactEnvSecrets(text) {
+  let out = String(text ?? "")
+  // Also match CREDENTIAL/PASSWORD/ORG_ID/_PAT (e.g. KILO_ORG_ID, GH_PAT) beyond KEY|TOKEN|SECRET.
+  const nameRe = /KEY|TOKEN|SECRET|CREDENTIAL|PASSWORD|ORG_ID|_PAT$/i
+  const candidates = []
+  for (const [name, value] of Object.entries(process.env)) {
+    if (!nameRe.test(name)) continue
+    if (typeof value !== "string" || value.length < 8) continue
+    candidates.push(value)
+  }
+  // Longer values first so a shorter secret that is a prefix of a longer one cannot leave a remainder.
+  candidates.sort((a, b) => b.length - a.length)
+  for (const value of candidates) {
+    if (!out.includes(value)) continue
+    out = out.split(value).join("***")
+  }
+  return out
+}
+
+/** Max bytes of child stderr persisted to docs-sync-out/ (full buffer, not the console tail). */
+const STDERR_LOG_MAX_CHARS = 8 * 1024 * 1024
+
 /**
  * Run `kilo` via spawnSync so stderr is always recoverable — including when
  * the child exits 0 after writing a diagnostic (execFileSync cannot return
@@ -181,6 +221,10 @@ function tailText(text, { lines = STDERR_TAIL_LINES, chars = STDERR_TAIL_CHARS }
  *
  * streamStdout:true → inherit fd 1 (edit live log); false → capture stdout
  * (triage parses it). stderr is always buffered.
+ *
+ * Always writes the full captured stderr to
+ * docs-sync-out/kilo-stderr-<sanitized-label>.log (unconditional — success and
+ * failure). The console return value still uses the short tailText.
  */
 export function runKilo({ args, timeoutMs, streamStdout = false, label = "kilo" }) {
   const result = spawnSync("kilo", args, {
@@ -193,16 +237,30 @@ export function runKilo({ args, timeoutMs, streamStdout = false, label = "kilo"
   const timedOut = Boolean(result.error && result.error.code === "ETIMEDOUT")
   const exitCode =
     typeof result.status === "number" ? result.status : timedOut ? null : result.status === null ? null : result.status
-  const stderrTail = tailText(result.stderr)
-  const stdout = streamStdout ? "" : String(result.stdout ?? "")
+  const stderrRaw = String(result.stderr ?? "")
+  const stderrSafe = redactEnvSecrets(stderrRaw)
+  const stderrTail = tailText(stderrSafe)
+  const stdoutSafe = streamStdout ? "" : redactEnvSecrets(String(result.stdout ?? ""))
   // ok is "process finished without OS-level failure". Callers still treat a
   // missing summary / unparseable output as failure even when ok is true —
   // exit 0 is not success for the docs-sync bot.
   const ok = !result.error && result.status === 0
 
+  // Persist full stderr on every call (not gated on ok/exitCode/summary). Cap is
+  // generous (megabytes) so long batch dumps keep auto-rejecting lines; console
+  // still uses the short tail above.
+  try {
+    fs.mkdirSync("docs-sync-out", { recursive: true })
+    const safe = label.replace(/[^A-Za-z0-9._-]/g, "-")
+    const body = stderrSafe.length > STDERR_LOG_MAX_CHARS ? stderrSafe.slice(-STDERR_LOG_MAX_CHARS) : stderrSafe
+    fs.writeFileSync(`docs-sync-out/kilo-stderr-${safe}.log`, body)
+  } catch (err) {
+    console.warn(`${label}: failed to write kilo-stderr log: ${err.message}`)
+  }
+
   if (result.error && !timedOut) {
     console.warn(`${label}: spawn error: ${result.error.message}`)
   }
 
-  return { ok, stdout, stderrTail, exitCode, timedOut }
+  return { ok, stdout: stdoutSafe, stderrTail, exitCode, timedOut }
 }
diff --git a/.github/docs-sync/redact-stream.mjs b/.github/docs-sync/redact-stream.mjs
new file mode 100644
index 0000000000..341aea34ad
--- /dev/null
+++ b/.github/docs-sync/redact-stream.mjs
@@ -0,0 +1,25 @@
+// kilocode_change - new file
+
+/**
+ * Line-wise stdin→stdout filter that redacts secret-looking env values.
+ * Used in the docs-sync workflow so kilo stdout piped to edit-log.txt is safe.
+ * Env values contain no newlines, so line-wise processing never splits a value.
+ */
+
+import { redactEnvSecrets } from "./lib.mjs"
+
+let carry = ""
+
+process.stdin.setEncoding("utf8")
+process.stdin.on("data", (chunk) => {
+  carry += chunk
+  let idx
+  while ((idx = carry.indexOf("\n")) !== -1) {
+    const line = carry.slice(0, idx + 1)
+    carry = carry.slice(idx + 1)
+    process.stdout.write(redactEnvSecrets(line))
+  }
+})
+process.stdin.on("end", () => {
+  if (carry.length > 0) process.stdout.write(redactEnvSecrets(carry))
+})
diff --git a/.github/docs-sync/reverts.mjs b/.github/docs-sync/reverts.mjs
new file mode 100644
index 0000000000..5702fa3743
--- /dev/null
+++ b/.github/docs-sync/reverts.mjs
@@ -0,0 +1,153 @@
+// kilocode_change - new file
+
+/**
+ * Pure helpers for intercepting revert PRs during docs-sync collect.
+ * No I/O, no imports — offline-testable title/body/annotation logic only.
+ */
+
+/** Detect revert PR titles. Returns "conventional" | "github-native" | null. */
+export function revertTitleKind(title) {
+  const t = String(title ?? "")
+  if (/^revert(\(.+\))?!?:/i.test(t)) return "conventional"
+  if (/^revert\s+["']/i.test(t)) return "github-native"
+  return null
+}
+
+/**
+ * Parse revert targets from a PR body. `defaultRepo` ("Kilo-Org/kilocode") resolves bare `#N`.
+ * Returns [{ repo, number, url }] with url = `https://github.com/${repo}/pull/${number}`.
+ * Handles the conventional trailer form: a line starting with `Reverts` (case-insensitive),
+ * e.g. `Reverts #12249 and #12481.`, `Reverts Kilo-Org/cloud#42.`, comma-separated lists,
+ * several such lines in one body, and bulleted/quoted single-line trailers
+ * (`- Reverts #12249`, `> Reverts #12249`).
+ * NOT handled (documented limitation): `This reverts commit <sha>.` (no PR number),
+ * mid-sentence forms (`This reverts #5.`), narrative mentions (`Revert the fix in #99999`
+ * is prose, not a trailer — must NOT produce a target), `Revertsomething #5` (prose glued
+ * to the word — `\b` word boundary makes it inert), and multi-line lists
+ * (`Reverts:\n- #1\n- #2`).
+ */
+export function parseRevertTargets(body, defaultRepo) {
+  const text = String(body ?? "")
+  const repoDefault = String(defaultRepo ?? "")
+  const seen = new Set()
+  const out = []
+  const lineRe = /^[ \t>*-]*reverts\b[ \t:]*([^\n]*)/gim
+  let lineMatch
+  while ((lineMatch = lineRe.exec(text)) !== null) {
+    const capture = lineMatch[1] ?? ""
+    const refRe = /(?:([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+))?#(\d+)/g
+    let refMatch
+    while ((refMatch = refRe.exec(capture)) !== null) {
+      const repo = refMatch[1] || repoDefault
+      const number = Number(refMatch[2])
+      if (!repo || !Number.isInteger(number)) continue
+      const url = `https://github.com/${repo}/pull/${number}`
+      if (seen.has(url)) continue
+      seen.add(url)
+      out.push({ repo, number, url })
+    }
+  }
+  return out
+}
+
+/**
+ * revertSignals: [{ url, merged_at, targets: [{ repo, number, url }] }]
+ * Returns Map<targetUrl, { url, merged_at }> — the annotation for each reverted PR.
+ * Map keys are lowercased target urls; values keep signal.url as authored.
+ * Revert-of-revert: a signal whose own url is itself a target of another signal is
+ * dropped entirely (a re-land: net effect zero — one set lookup, no chain walking).
+ */
+export function computeRevertAnnotations(revertSignals) {
+  const signals = Array.isArray(revertSignals) ? revertSignals : []
+  const revertedUrls = new Set()
+  for (const signal of signals) {
+    for (const t of signal?.targets ?? []) {
+      if (t?.url) revertedUrls.add(t.url.toLowerCase())
+    }
+  }
+  const annotations = new Map()
+  for (const signal of signals) {
+    if (!signal?.url || revertedUrls.has(signal.url.toLowerCase())) continue
+    for (const t of signal.targets ?? []) {
+      if (!t?.url) continue
+      annotations.set(t.url.toLowerCase(), { url: signal.url, merged_at: signal.merged_at })
+    }
+  }
+  return annotations
+}
+
+/**
+ * Applies computeRevertAnnotations to digest entries in place: an entry whose url
+ * was reverted gains `reverted_by: { url, merged_at }` (the reverter).
+ * Lookup is case-insensitive; applied pairs still report entry.url (canonical).
+ * Returns applied [targetUrl, reverterUrl] pairs (digest entries only) for reporting.
+ */
+export function applyRevertAnnotations(digest, revertSignals) {
+  const annotations = computeRevertAnnotations(revertSignals)
+  const applied = []
+  for (const entry of digest ?? []) {
+    if (!entry?.url) continue
+    const ann = annotations.get(entry.url.toLowerCase())
+    if (!ann) continue
+    entry.reverted_by = { url: ann.url, merged_at: ann.merged_at }
+    applied.push([entry.url, ann.url])
+  }
+  return applied
+}
+
+/**
+ * Reports intercepted reverts whose targets received no digest annotation, for the
+ * step summary. `signals` is the same shape as computeRevertAnnotations takes;
+ * `appliedPairs` is applyRevertAnnotations' return ([targetUrl, reverterUrl]).
+ * Returns { missed, unparsed, chains }:
+ * - missed: [{ url, targets: [targetUrl, ...] }] — one entry per signal with at least
+ *   one unannotated plain target, listing exactly the targets that missed (a partially-covered
+ *   revert still surfaces its uncovered targets). Plain = not itself an intercepted revert.
+ * - unparsed: [url, ...] — urls of signals with zero targets (they already warn at
+ *   intercept time).
+ * - chains: [{ url, targets: [targetUrl, ...] }] — signals involved in a revert chain,
+ *   reported for human visibility only; the pipeline never resolves a chain's net effect.
+ *   A signal lands here when EITHER its own url is a target of another signal (cancelled
+ *   by computeRevertAnnotations — lists ALL its targets), OR at least one of its targets
+ *   is itself an intercepted revert (re-land chain link — lists ONLY those chain-link
+ *   targets; plain targets still flow through missed).
+ * Cancelled signals skip missed/unparsed. Chain-linked (non-cancelled) signals may also
+ * appear in missed for their unannotated plain targets. Chain-link targets never appear
+ * in missed. All url comparisons are case-insensitive.
+ */
+export function unannotatedRevertSignals(signals, appliedPairs) {
+  const list = Array.isArray(signals) ? signals : []
+  const annotated = new Set((appliedPairs ?? []).map(([target]) => String(target ?? "").toLowerCase()))
+  const signalUrls = new Set(list.map((s) => String(s?.url ?? "").toLowerCase()))
+  const cancelledUrls = new Set()
+  for (const s of list) {
+    for (const t of s?.targets ?? []) {
+      if (t?.url) cancelledUrls.add(t.url.toLowerCase())
+    }
+  }
+  const missed = []
+  const unparsed = []
+  const chains = []
+  for (const s of list) {
+    const url = s?.url
+    if (!url) continue
+    const targets = (s.targets ?? []).map((t) => t?.url).filter(Boolean)
+    const cancelled = cancelledUrls.has(url.toLowerCase())
+    const chainTargets = targets.filter((u) => signalUrls.has(u.toLowerCase()))
+    if (cancelled) {
+      chains.push({ url, targets })
+      continue
+    }
+    if (chainTargets.length > 0) {
+      chains.push({ url, targets: chainTargets })
+    }
+    if (targets.length === 0) {
+      unparsed.push(url)
+      continue
+    }
+    const plainTargets = targets.filter((u) => !signalUrls.has(u.toLowerCase()))
+    const missing = plainTargets.filter((u) => !annotated.has(u.toLowerCase()))
+    if (missing.length > 0) missed.push({ url, targets: missing })
+  }
+  return { missed, unparsed, chains }
+}
diff --git a/.github/docs-sync/selftest.mjs b/.github/docs-sync/selftest.mjs
index fe2cb1faec..9af35c58cd 100644
--- a/.github/docs-sync/selftest.mjs
+++ b/.github/docs-sync/selftest.mjs
@@ -24,6 +24,13 @@ import {
   renderBody,
   extractSectionRows,
 } from "./upsert-pr.mjs"
+import {
+  revertTitleKind,
+  parseRevertTargets,
+  computeRevertAnnotations,
+  applyRevertAnnotations,
+  unannotatedRevertSignals,
+} from "./reverts.mjs"
 
 const HERE = path.dirname(fileURLToPath(import.meta.url))
 const EDIT_SCRIPT = path.join(HERE, "edit.mjs")
@@ -55,7 +62,7 @@ function writeExecutable(filePath, body) {
 function makeStubKiloDir({ mode, callLog, stderrText = "event stream disconnected" }) {
   const dir = mktemp("docs-sync-kilo-")
   const kiloPath = path.join(dir, "kilo")
-  // mode: "stderr-exit0" | "record" | "partial-triage" | "mixed-triage"
+  // mode: "stderr-exit0" | "record" | "partial-triage" | "mixed-triage" | "write-edit-summary"
   const script = `#!/usr/bin/env node
 const fs = require("node:fs");
 const path = require("node:path");
@@ -81,6 +88,22 @@ let chunk = [];
 if (fileArg && fs.existsSync(fileArg)) {
   try { chunk = JSON.parse(fs.readFileSync(fileArg, "utf8")); } catch { chunk = []; }
 }
+if (mode === "write-edit-summary") {
+  // Success path: write the batch summary so edit.mjs returns true, while still
+  // emitting stderr so selftest can assert runKilo persisted it unconditionally.
+  process.stderr.write(stderrText + "\\n");
+  const m = fileArg && String(fileArg).match(/edit-batch-(\\d+)\\.json/);
+  const index = m ? m[1] : "0";
+  const summary = chunk.map((d) => ({
+    pr: d.number,
+    url: d.url,
+    action: "skipped",
+    reason: "selftest stub",
+  }));
+  fs.mkdirSync("docs-sync-out", { recursive: true });
+  fs.writeFileSync("docs-sync-out/edit-summary-" + index + ".json", JSON.stringify(summary));
+  process.exit(0);
+}
 if (mode === "partial-triage") {
   // Classify only a proper subset (first URL) of the chunk.
   const owned = chunk.slice(0, Math.max(0, chunk.length - 1));
@@ -116,6 +139,21 @@ if (mode === "mixed-triage") {
   process.stdout.write(JSON.stringify(entries) + "\\n");
   process.exit(0);
 }
+if (mode === "triage-embed-env-secret") {
+  // Valid triage JSON with a secret env value embedded in a string field
+  // (stdout is persisted to triage-raw-*.txt; must be redacted at capture).
+  const secret = process.env.KILO_API_KEY || "missing-secret";
+  const entries = chunk.map((d) => ({
+    pr: d.number,
+    url: d.url,
+    docs_worthy: true,
+    reason: "needs docs; diagnostic=" + secret,
+    target_sections: ["overview"],
+    priority: "high",
+  }));
+  process.stdout.write(JSON.stringify(entries) + "\\n");
+  process.exit(0);
+}
 process.stderr.write("unknown stub mode\\n");
 process.exit(1);
 `
@@ -129,7 +167,9 @@ function gitIn(cwd, args, env = {}) {
     env: { ...process.env, ...env },
     stdio: ["ignore", "pipe", "pipe"],
     encoding: "utf8",
-  }).toString().trim()
+  })
+    .toString()
+    .trim()
 }
 
 function makeGitRunner(cwd, env = {}) {
@@ -247,14 +287,19 @@ function case1_mergeOrFallback() {
         env: { ...process.env, ...env },
         stdio: ["ignore", "pipe", "pipe"],
         encoding: "utf8",
-      }).toString().trim()
+      })
+        .toString()
+        .trim()
 
-    assert.throws(() => mergeOrFallback({ branch: DEFAULT_BRANCH, git }), (err) => {
-      // Must throw the original merge error, not a merge --abort failure
-      const msg = String(err?.stderr ?? err?.message ?? err)
-      assert.ok(!/no merge to abort/i.test(msg), `should not reach merge --abort: ${msg}`)
-      return true
-    })
+    assert.throws(
+      () => mergeOrFallback({ branch: DEFAULT_BRANCH, git }),
+      (err) => {
+        // Must throw the original merge error, not a merge --abort failure
+        const msg = String(err?.stderr ?? err?.message ?? err)
+        assert.ok(!/no merge to abort/i.test(msg), `should not reach merge --abort: ${msg}`)
+        return true
+      },
+    )
   }
 }
 
@@ -372,6 +417,450 @@ function case2_defectB() {
   }
 }
 
+// ---------------------------------------------------------------------------
+// Case 2b — AC4a: every docs-sync kilo run argv carries --auto
+// ---------------------------------------------------------------------------
+/** Slice `args: [` … matching `]` from source (newlines allowed inside). */
+function extractArgsArraySlice(source) {
+  const start = source.indexOf("args: [")
+  assert.ok(start >= 0, "args: [ not found in source")
+  let i = start + "args: ".length
+  assert.equal(source[i], "[")
+  let depth = 0
+  for (; i < source.length; i++) {
+    const ch = source[i]
+    if (ch === "[") depth++
+    else if (ch === "]") {
+      depth--
+      if (depth === 0) return source.slice(start, i + 1)
+    }
+  }
+  throw new assert.AssertionError({ message: "unclosed args: [ array in source" })
+}
+
+/** Label → kilo-stderr filename rule (must match lib.mjs runKilo). */
+function kiloStderrLogName(label) {
+  return `kilo-stderr-${String(label).replace(/[^A-Za-z0-9._-]/g, "-")}.log`
+}
+
+function case2b_autoFlag() {
+  console.log("case 2b: AC4a (--auto on every docs-sync kilo run)")
+
+  // (i) region-scoped static check on triage.mjs / edit.mjs argv arrays
+  for (const name of ["triage.mjs", "edit.mjs"]) {
+    const src = fs.readFileSync(path.join(HERE, name), "utf8")
+    const slice = extractArgsArraySlice(src)
+    assert.ok(slice.includes('"--auto"'), `${name} args array must contain "--auto"; got:\n${slice}`)
+  }
+
+  // (ii) Fix verify failures step: join the run: | block and require --auto on kilo run
+  {
+    const yml = fs.readFileSync(path.join(HERE, "..", "workflows", "docs-sync.yml"), "utf8")
+    const stepIdx = yml.indexOf("Fix verify failures")
+    assert.ok(stepIdx >= 0, "Fix verify failures step missing")
+    const afterStep = yml.slice(stepIdx)
+    const runIdx = afterStep.indexOf("run: |")
+    assert.ok(runIdx >= 0, "run: | missing after Fix verify failures")
+    const blockStart = stepIdx + runIdx + "run: |".length
+    const rest = yml.slice(blockStart)
+    // Block ends at next unindented step key or EOF — collect indented lines
+    const lines = []
+    for (const line of rest.split("\n")) {
+      if (line === "") {
+        lines.push(line)
+        continue
+      }
+      // stop at next top-level list item under steps (two-space + "- ")
+      if (/^ {0,6}- name:/.test(line) || (/^\S/.test(line) && lines.length > 0)) break
+      lines.push(line)
+    }
+    // Join continuation backslashes then collapse whitespace for the kilo run line
+    const joined = lines
+      .map((l) => l.replace(/^\s+/, ""))
+      .join("\n")
+      .replace(/\\\n/g, " ")
+      .replace(/\s+/g, " ")
+    assert.match(joined, /kilo run\b/, `expected kilo run in Fix verify block:\n${joined}`)
+    const kiloCmd = joined.match(/kilo run\b[^|]*/)?.[0] ?? ""
+    assert.ok(
+      /\s--auto\b/.test(kiloCmd) || /kilo run\s+--auto\b/.test(kiloCmd),
+      `Fix verify kilo run must contain --auto; got: ${kiloCmd}`,
+    )
+
+    // The step runs under `set -o pipefail` + the default `bash -e`, so an
+    // unguarded kilo pipeline aborts the block before verify2.log is written
+    // once the CLI exits nonzero on a mid-stream error. The rebuild must decide
+    // this step's outcome, not the agent's exit code.
+    // Window is the end of the kilo pipeline → the rebuild, so a comment
+    // elsewhere in the block cannot satisfy the guard assertion.
+    const teeIdx = joined.indexOf("tee -a docs-sync-out/edit-log.txt")
+    assert.ok(teeIdx >= 0, `expected the kilo pipeline to tee edit-log.txt:\n${joined}`)
+    const kiloPipeline = joined.slice(teeIdx, joined.indexOf("bun run", teeIdx))
+    assert.match(
+      kiloPipeline,
+      /\|\|\s*(echo|true)\b/,
+      `Fix verify kilo pipeline must be guarded (|| echo/true) so bash -e cannot skip the rebuild; got: ${kiloPipeline}`,
+    )
+    assert.match(joined, /verify2\.log/, "Fix verify block must still write verify2.log")
+  }
+
+  // (iii) authoritative: real stub invocations with callLog — every argv has --auto
+  {
+    const prs = [1, 2, 3, 4, 5].map((n) => samplePr(n))
+    const worthy = prs
+    const triage = prs.map((p) => ({
+      pr: p.number,
+      url: p.url,
+      docs_worthy: true,
+      reason: "needs docs",
+      target_sections: ["overview"],
+      priority: "high",
+    }))
+    const cwd = setupEditCwd(worthy, triage)
+    const callLog = path.join(cwd, "kilo-calls.log")
+    const stderrText = "event stream disconnected DIAG-AUTO"
+    const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText, callLog })
+
+    const result = runNodeScript(EDIT_SCRIPT, {
+      cwd,
+      kiloDir,
+      env: {
+        EDIT_MODEL: "test/model",
+        DOCS_SYNC_BACKOFF_MS: "0",
+        EDIT_BUDGET_MINUTES: "5",
+        EDIT_BATCH_TIMEOUT_MINUTES: "1",
+      },
+    })
+    assert.equal(result.status, 0, `edit.mjs exit: ${result.output}`)
+
+    assert.ok(fs.existsSync(callLog), "callLog must be written (stub was invoked)")
+    const lines = fs.readFileSync(callLog, "utf8").trim().split("\n").filter(Boolean)
+    assert.ok(lines.length > 0, "callCount > 0 required (vacuous empty log forbidden)")
+    for (const line of lines) {
+      const { argv } = JSON.parse(line)
+      assert.ok(
+        Array.isArray(argv) && argv.includes("--auto"),
+        `every kilo argv must include --auto; got ${JSON.stringify(argv)}`,
+      )
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 2c — full child stderr always written (success and failure paths)
+// ---------------------------------------------------------------------------
+function case2c_stderrLogAlways() {
+  console.log("case 2c: unconditional kilo-stderr-*.log")
+
+  const prs = [1, 2, 3, 4, 5].map((n) => samplePr(n))
+  const worthy = prs
+  const triage = prs.map((p) => ({
+    pr: p.number,
+    url: p.url,
+    docs_worthy: true,
+    reason: "needs docs",
+    target_sections: ["overview"],
+    priority: "high",
+  }))
+
+  // Failure path: stub exits 0 without summary (same mode as case 2)
+  {
+    const cwd = setupEditCwd(worthy, triage)
+    const stderrText = "FAILPATH-STDERR-MARKER"
+    const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText })
+    const result = runNodeScript(EDIT_SCRIPT, {
+      cwd,
+      kiloDir,
+      env: {
+        EDIT_MODEL: "test/model",
+        DOCS_SYNC_BACKOFF_MS: "0",
+        EDIT_BUDGET_MINUTES: "5",
+        EDIT_BATCH_TIMEOUT_MINUTES: "1",
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    const logName = kiloStderrLogName("edit batch 0 attempt 1")
+    const logPath = path.join(cwd, "docs-sync-out", logName)
+    assert.equal(logName, "kilo-stderr-edit-batch-0-attempt-1.log")
+    assert.ok(fs.existsSync(logPath), `expected ${logPath} on failure path`)
+    assert.match(fs.readFileSync(logPath, "utf8"), /FAILPATH-STDERR-MARKER/)
+  }
+
+  // Success path: stub writes summary (today's path that discarded stderr)
+  {
+    const cwd = setupEditCwd(worthy, triage)
+    const stderrText = "SUCCESSPATH-STDERR-MARKER"
+    const kiloDir = makeStubKiloDir({ mode: "write-edit-summary", stderrText })
+    const result = runNodeScript(EDIT_SCRIPT, {
+      cwd,
+      kiloDir,
+      env: {
+        EDIT_MODEL: "test/model",
+        DOCS_SYNC_BACKOFF_MS: "0",
+        EDIT_BUDGET_MINUTES: "5",
+        EDIT_BATCH_TIMEOUT_MINUTES: "1",
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    assert.ok(
+      fs.existsSync(path.join(cwd, "docs-sync-out", "edit-summary-0.json")),
+      "stub must write summary (success path)",
+    )
+    const logName = kiloStderrLogName("edit batch 0 attempt 1")
+    const logPath = path.join(cwd, "docs-sync-out", logName)
+    assert.ok(fs.existsSync(logPath), `expected ${logPath} on success path`)
+    assert.match(fs.readFileSync(logPath, "utf8"), /SUCCESSPATH-STDERR-MARKER/)
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 2d — redact secret env values from captured kilo stderr (artifact-safe)
+// ---------------------------------------------------------------------------
+function case2d_redactEnvSecrets() {
+  console.log("case 2d: redact env secrets from kilo stderr capture")
+
+  const prs = [1, 2, 3, 4, 5].map((n) => samplePr(n))
+  const worthy = prs
+  const triage = prs.map((p) => ({
+    pr: p.number,
+    url: p.url,
+    docs_worthy: true,
+    reason: "needs docs",
+    target_sections: ["overview"],
+    priority: "high",
+  }))
+  const cwd = setupEditCwd(worthy, triage)
+  const secret = "selftest-secret-value-12345"
+  const stderrText = `leak before ${secret} after`
+  const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText })
+
+  const result = runNodeScript(EDIT_SCRIPT, {
+    cwd,
+    kiloDir,
+    env: {
+      EDIT_MODEL: "test/model",
+      DOCS_SYNC_BACKOFF_MS: "0",
+      EDIT_BUDGET_MINUTES: "5",
+      EDIT_BATCH_TIMEOUT_MINUTES: "1",
+      KILO_API_KEY: secret,
+    },
+  })
+  assert.equal(result.status, 0, `edit.mjs exit: ${result.output}`)
+
+  const logName = kiloStderrLogName("edit batch 0 attempt 1")
+  const logPath = path.join(cwd, "docs-sync-out", logName)
+  assert.ok(fs.existsSync(logPath), `expected ${logPath}`)
+  const logBody = fs.readFileSync(logPath, "utf8")
+  assert.ok(!logBody.includes(secret), `persisted stderr must not contain secret; got: ${logBody}`)
+  assert.ok(logBody.includes("leak before *** after"), `persisted stderr must redact to exact line; got: ${logBody}`)
+
+  // Console stderr-tail region must also be redacted (not only the artifact file).
+  const tailIdx = result.output.indexOf("stderr tail:")
+  assert.ok(tailIdx >= 0, `expected stderr tail: in output; got: ${result.output}`)
+  const tailRegion = result.output.slice(tailIdx)
+  assert.ok(!tailRegion.includes(secret), `console stderr tail must not contain secret; got: ${tailRegion}`)
+}
+
+// ---------------------------------------------------------------------------
+// Case 2e — longer secret first when a shorter env value is a prefix
+// ---------------------------------------------------------------------------
+function case2e_prefixSecretOrdering() {
+  console.log("case 2e: prefix-secret ordering (longer value redacted first)")
+
+  const prs = [1, 2, 3, 4, 5].map((n) => samplePr(n))
+  const worthy = prs
+  const triage = prs.map((p) => ({
+    pr: p.number,
+    url: p.url,
+    docs_worthy: true,
+    reason: "needs docs",
+    target_sections: ["overview"],
+    priority: "high",
+  }))
+  const cwd = setupEditCwd(worthy, triage)
+  const shortSecret = "abcdefgh"
+  const longSecret = "abcdefghIJKL-tail"
+  const stderrText = `leak: ${longSecret} end`
+  const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText })
+
+  const result = runNodeScript(EDIT_SCRIPT, {
+    cwd,
+    kiloDir,
+    env: {
+      EDIT_MODEL: "test/model",
+      DOCS_SYNC_BACKOFF_MS: "0",
+      EDIT_BUDGET_MINUTES: "5",
+      EDIT_BATCH_TIMEOUT_MINUTES: "1",
+      A_KEY: shortSecret,
+      B_TOKEN: longSecret,
+    },
+  })
+  assert.equal(result.status, 0, `edit.mjs exit: ${result.output}`)
+
+  const logName = kiloStderrLogName("edit batch 0 attempt 1")
+  const logPath = path.join(cwd, "docs-sync-out", logName)
+  assert.ok(fs.existsSync(logPath), `expected ${logPath}`)
+  const logBody = fs.readFileSync(logPath, "utf8")
+  assert.ok(!logBody.includes("IJKL-tail"), `must not leak prefix remainder; got: ${logBody}`)
+  assert.ok(logBody.includes("leak: *** end"), `expected full long secret redacted; got: ${logBody}`)
+}
+
+// ---------------------------------------------------------------------------
+// Case 2f — redact secret values from captured kilo stdout (triage-raw artifact)
+// ---------------------------------------------------------------------------
+function case2f_redactStdout() {
+  console.log("case 2f: redact env secrets from kilo stdout (triage-raw)")
+
+  const digest = [samplePr(501), samplePr(502)]
+  const cwd = setupTriageCwd(digest)
+  const secret = "selftest-stdout-secret-99999"
+  const kiloDir = makeStubKiloDir({ mode: "triage-embed-env-secret" })
+  const summaryFile = path.join(cwd, "step-summary.md")
+  fs.writeFileSync(summaryFile, "")
+
+  const result = runNodeScript(TRIAGE_SCRIPT, {
+    cwd,
+    kiloDir,
+    env: {
+      TRIAGE_MODEL: "test/model",
+      DOCS_SYNC_BACKOFF_MS: "0",
+      TRIAGE_BUDGET_MINUTES: "30",
+      GITHUB_STEP_SUMMARY: summaryFile,
+      KILO_API_KEY: secret,
+    },
+  })
+  assert.equal(result.status, 0, `triage.mjs exit: ${result.output}`)
+
+  const rawFiles = fs.readdirSync(path.join(cwd, "docs-sync-out")).filter((f) => f.startsWith("triage-raw-"))
+  assert.ok(rawFiles.length > 0, "expected triage-raw-*.txt artifact")
+  for (const f of rawFiles) {
+    const body = fs.readFileSync(path.join(cwd, "docs-sync-out", f), "utf8")
+    assert.ok(!body.includes(secret), `triage-raw must not contain secret; ${f}: ${body}`)
+  }
+
+  const triage = JSON.parse(fs.readFileSync(path.join(cwd, "docs-sync-out", "triage.json"), "utf8"))
+  assert.ok(triage.length >= 1, "triage must still parse after redaction")
+  assert.ok(
+    triage.some((e) => e.docs_worthy === true || e.pending === true || e.docs_worthy === false),
+    "triage entries must be structured",
+  )
+}
+
+// ---------------------------------------------------------------------------
+// Case 2g — redact-stream.mjs line-wise filter (including partial last line)
+// ---------------------------------------------------------------------------
+function case2g_redactStream() {
+  console.log("case 2g: redact-stream.mjs stdin filter")
+
+  const secret = "stream-secret-value-xyz"
+  const filterPath = path.join(HERE, "redact-stream.mjs")
+  assert.ok(fs.existsSync(filterPath), `expected ${filterPath}`)
+
+  const input = `leak ${secret} after\npartial-${secret}`
+  const result = spawnSync(process.execPath, [filterPath], {
+    env: { ...process.env, KILO_API_KEY: secret },
+    input,
+    encoding: "utf8",
+    timeout: 10_000,
+  })
+  assert.equal(result.status, 0, `redact-stream exit: ${result.stderr || result.error}`)
+  assert.equal(result.stdout, "leak *** after\npartial-***")
+}
+
+// ---------------------------------------------------------------------------
+// Case 2h — pending causes reach the rolling PR free of ANSI escapes
+// ---------------------------------------------------------------------------
+function case2h_pendingCauseIsReadable() {
+  console.log("case 2h: pending cause has no ANSI escapes")
+
+  const prs = [1, 2, 3, 4, 5].map((n) => samplePr(n))
+  const worthy = prs
+  const triage = prs.map((p) => ({
+    pr: p.number,
+    url: p.url,
+    docs_worthy: true,
+    reason: "needs docs",
+    target_sections: ["overview"],
+    priority: "high",
+  }))
+  const cwd = setupEditCwd(worthy, triage)
+  // Verbatim shape of a real kilo TUI stderr line (see PR #12521's pending table).
+  const ESC = "\u001b"
+  const stderrText = `${ESC}[0m→ ${ESC}[0mRead packages/kilo-docs/AGENTS.md${ESC}[2K${ESC}[1G done`
+  const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText })
+
+  const result = runNodeScript(EDIT_SCRIPT, {
+    cwd,
+    kiloDir,
+    env: {
+      EDIT_MODEL: "test/model",
+      DOCS_SYNC_BACKOFF_MS: "0",
+      EDIT_BUDGET_MINUTES: "5",
+      EDIT_BATCH_TIMEOUT_MINUTES: "1",
+    },
+  })
+  assert.equal(result.status, 0, `edit.mjs exit: ${result.output}`)
+
+  const summary = JSON.parse(fs.readFileSync(path.join(cwd, ".docs-sync-summary.json"), "utf8"))
+  assert.equal(summary.length, 5)
+  for (const e of summary) {
+    assert.equal(e.action, "pending", `expected pending, got ${JSON.stringify(e)}`)
+    assert.ok(!e.reason.includes(ESC), `pending reason must not contain ANSI escapes: ${JSON.stringify(e.reason)}`)
+    // Non-vacuous: the diagnostic text itself must survive the strip.
+    assert.match(e.reason, /Read packages\/kilo-docs\/AGENTS\.md/)
+  }
+
+  // The raw artifact log keeps the escapes — it is the debugging record.
+  const rawLog = fs.readFileSync(path.join(cwd, "docs-sync-out", "kilo-stderr-edit-batch-0-attempt-1.log"), "utf8")
+  assert.ok(rawLog.includes(ESC), "persisted stderr log must stay raw")
+}
+
+// ---------------------------------------------------------------------------
+// Case 2i — wall-clock budgets can actually fit work
+// ---------------------------------------------------------------------------
+/**
+ * The pre-unit gates in triage.mjs/edit.mjs refuse to start a chunk/batch unless
+ * a whole per-unit timeout remains, so a budget below that timeout silently runs
+ * ZERO units and defers every PR. Run 30306629290 hit the weaker form of this:
+ * 8 of 11 chunks and 4 of 11 batches ran, the rest deferred untried. Assert the
+ * workflow sets both budgets and that each fits at least two units.
+ */
+function case2i_budgetsFitWork() {
+  console.log("case 2i: triage/edit budgets fit at least two units")
+
+  const yml = fs.readFileSync(path.join(HERE, "..", "workflows", "docs-sync.yml"), "utf8")
+  const readEnvNumber = (key) => {
+    const m = yml.match(new RegExp(`^\\s*${key}:\\s*"?(\\d+)"?\\s*$`, "m"))
+    assert.ok(m, `${key} must be set in docs-sync.yml (default is too small to drain a backlog)`)
+    return Number(m[1])
+  }
+
+  // Per-unit timeouts are script constants, not workflow env; read them from source.
+  const triageSrc = fs.readFileSync(path.join(HERE, "triage.mjs"), "utf8")
+  const chunkMin = Number(triageSrc.match(/CHUNK_TIMEOUT_MS = (\d+) \* 60 \* 1000/)?.[1])
+  assert.ok(Number.isFinite(chunkMin), "could not read CHUNK_TIMEOUT_MS from triage.mjs")
+
+  const editSrc = fs.readFileSync(path.join(HERE, "edit.mjs"), "utf8")
+  const batchMin = Number(editSrc.match(/EDIT_BATCH_TIMEOUT_MINUTES\) \|\| (\d+)/)?.[1])
+  assert.ok(Number.isFinite(batchMin), "could not read EDIT_BATCH_TIMEOUT_MINUTES default from edit.mjs")
+
+  const triageBudget = readEnvNumber("TRIAGE_BUDGET_MINUTES")
+  const editBudget = readEnvNumber("EDIT_BUDGET_MINUTES")
+  assert.ok(
+    triageBudget >= 2 * chunkMin,
+    `TRIAGE_BUDGET_MINUTES=${triageBudget} must be >= 2x chunk timeout (${chunkMin}m)`,
+  )
+  assert.ok(editBudget >= 2 * batchMin, `EDIT_BUDGET_MINUTES=${editBudget} must be >= 2x batch timeout (${batchMin}m)`)
+
+  // The job timeout must outlast both budgets plus the non-LLM steps.
+  const jobTimeout = Number(yml.match(/^\s*timeout-minutes:\s*(\d+)\s*$/m)?.[1])
+  assert.ok(Number.isFinite(jobTimeout), "could not read job timeout-minutes")
+  assert.ok(
+    jobTimeout > triageBudget + editBudget,
+    `job timeout-minutes=${jobTimeout} must exceed triage+edit budgets (${triageBudget}+${editBudget})`,
+  )
+}
+
 // ---------------------------------------------------------------------------
 // Case 3 — watermark invariant
 // ---------------------------------------------------------------------------
@@ -611,14 +1100,8 @@ function case4_routing() {
       triage: [],
       uncovered: [],
     })
-    assert.ok(
-      !forgedRows.skippedRows[0].includes("<!--"),
-      "clean() must strip <!-- from reasons",
-    )
-    assert.ok(
-      !forgedRows.skippedRows[0].includes("-->"),
-      "clean() must strip --> from reasons",
-    )
+    assert.ok(!forgedRows.skippedRows[0].includes("<!--"), "clean() must strip <!-- from reasons")
+    assert.ok(!forgedRows.skippedRows[0].includes("-->"), "clean() must strip --> from reasons")
     const forgedBody = renderBody({
       date: "2026-07-27",
       since: "s",
@@ -927,6 +1410,420 @@ function case8_triage() {
   }
 }
 
+// ---------------------------------------------------------------------------
+// Case 9 — revert interception (title/body/annotations + source-order guards)
+// ---------------------------------------------------------------------------
+function case9_reverts() {
+  console.log("case 9: revert interception")
+
+  // --- revertTitleKind ---
+  assert.equal(revertTitleKind('revert(cli): restore opt-in stream idle timeouts'), "conventional")
+  assert.equal(revertTitleKind('Revert "feat(cli): default stream watchdog"'), "github-native")
+  assert.equal(revertTitleKind("REVERT: all of it"), "conventional")
+  assert.equal(revertTitleKind("feat(cli): add x"), null)
+  assert.equal(revertTitleKind("docs: update y"), null)
+  assert.equal(revertTitleKind("Reverted behavior docs"), null)
+
+  // --- parseRevertTargets ---
+  const defaultRepo = "Kilo-Org/kilocode"
+  const body12497 = `The default stream inactivity watchdog introduced by #12249 aborts requests based only on the absence of normalized AI SDK events. That signal cannot distinguish a dead provider stream from long prompt processing, reasoning, buffering, or transport behavior, and the follow-up in #12481 reduces false positives without resolving that ambiguity.
+
+Revert both changes and restore the previous opt-in contract: Kilo does not impose a stream idle timeout unless the provider configuration explicitly sets \`chunkTimeout\`. Explicit provider timeouts continue to use the existing AI SDK and SSE timeout paths. This removes the global heuristic while the underlying stalled-stream source and the required transport-level observability are investigated.
+
+This deliberately restores the possibility that an unconfigured provider stream can remain open indefinitely. A default watchdog should be reintroduced only with evidence that its liveness signal and threshold do not terminate healthy responses.
+
+Reverts #12249 and #12481.
+`
+  {
+    const targets = parseRevertTargets(body12497, defaultRepo)
+    assert.equal(targets.length, 2)
+    assert.deepEqual(
+      targets.map((t) => ({ repo: t.repo, number: t.number, url: t.url })),
+      [
+        {
+          repo: "Kilo-Org/kilocode",
+          number: 12249,
+          url: "https://github.com/Kilo-Org/kilocode/pull/12249",
+        },
+        {
+          repo: "Kilo-Org/kilocode",
+          number: 12481,
+          url: "https://github.com/Kilo-Org/kilocode/pull/12481",
+        },
+      ],
+    )
+  }
+
+  {
+    const narrative = "Revert the mistaken fix in #99999 because it broke streams.\n\nReverts #12249."
+    const targets = parseRevertTargets(narrative, defaultRepo)
+    assert.equal(targets.length, 1)
+    assert.equal(targets[0].number, 12249)
+    assert.ok(!targets.some((t) => t.number === 99999))
+  }
+
+  {
+    const targets = parseRevertTargets("Reverts Kilo-Org/cloud#42.", defaultRepo)
+    assert.equal(targets.length, 1)
+    assert.equal(targets[0].repo, "Kilo-Org/cloud")
+    assert.equal(targets[0].number, 42)
+    assert.equal(targets[0].url, "https://github.com/Kilo-Org/cloud/pull/42")
+  }
+
+  {
+    const targets = parseRevertTargets("Reverts #1, #2.", defaultRepo)
+    assert.equal(targets.length, 2)
+    assert.deepEqual(
+      targets.map((t) => t.number),
+      [1, 2],
+    )
+  }
+
+  assert.deepEqual(parseRevertTargets("This reverts commit deadbeefcafe.", defaultRepo), [])
+  assert.deepEqual(parseRevertTargets("This reverts #5.", defaultRepo), [])
+  assert.deepEqual(parseRevertTargets("No revert trailer here at all.", defaultRepo), [])
+
+  // bulleted / quoted single-line trailers
+  {
+    const targets = parseRevertTargets("- Reverts #7.", defaultRepo)
+    assert.equal(targets.length, 1)
+    assert.equal(targets[0].number, 7)
+  }
+  {
+    const targets = parseRevertTargets("> Reverts #8.", defaultRepo)
+    assert.equal(targets.length, 1)
+    assert.equal(targets[0].number, 8)
+  }
+  // word-boundary: prose glued to "Reverts" is not a trailer
+  assert.deepEqual(parseRevertTargets("Revertsomething #5", defaultRepo), [])
+
+  // --- computeRevertAnnotations ---
+  // Map keys are lowercased; lookups must use .toLowerCase()
+  const fUrl = "https://github.com/Kilo-Org/kilocode/pull/100"
+  const r1Url = "https://github.com/Kilo-Org/kilocode/pull/200"
+  const r2Url = "https://github.com/Kilo-Org/kilocode/pull/300"
+  const f2Url = "https://github.com/Kilo-Org/kilocode/pull/101"
+  const mergedAt = "2026-07-20T12:00:00.000Z"
+  const mergedAt2 = "2026-07-21T12:00:00.000Z"
+
+  {
+    const annotations = computeRevertAnnotations([
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+    ])
+    assert.equal(annotations.size, 1)
+    assert.deepEqual(annotations.get(fUrl.toLowerCase()), { url: r1Url, merged_at: mergedAt })
+  }
+
+  {
+    // two-target signal (#12497-shaped)
+    const annotations = computeRevertAnnotations([
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [
+          { repo: "Kilo-Org/kilocode", number: 100, url: fUrl },
+          { repo: "Kilo-Org/kilocode", number: 101, url: f2Url },
+        ],
+      },
+    ])
+    assert.equal(annotations.size, 2)
+    assert.deepEqual(annotations.get(fUrl.toLowerCase()), { url: r1Url, merged_at: mergedAt })
+    assert.deepEqual(annotations.get(f2Url.toLowerCase()), { url: r1Url, merged_at: mergedAt })
+  }
+
+  {
+    // revert-of-revert: R1 reverts F, R2 reverts R1 → F not annotated; R1 gets R2
+    const annotations = computeRevertAnnotations([
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+      {
+        url: r2Url,
+        merged_at: mergedAt2,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 200, url: r1Url }],
+      },
+    ])
+    assert.equal(annotations.has(fUrl.toLowerCase()), false)
+    assert.deepEqual(annotations.get(r1Url.toLowerCase()), { url: r2Url, merged_at: mergedAt2 })
+  }
+
+  {
+    const annotations = computeRevertAnnotations([{ url: r1Url, merged_at: mergedAt, targets: [] }])
+    assert.equal(annotations.size, 0)
+  }
+
+  // --- applyRevertAnnotations ---
+  {
+    const digest = [
+      { url: fUrl, title: "feat F" },
+      { url: "https://github.com/Kilo-Org/kilocode/pull/999", title: "untouched" },
+    ]
+    const applied = applyRevertAnnotations(digest, [
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+    ])
+    assert.deepEqual(digest[0].reverted_by, { url: r1Url, merged_at: mergedAt })
+    assert.equal(digest[1].reverted_by, undefined)
+    assert.deepEqual(applied, [[fUrl, r1Url]])
+  }
+
+  {
+    // end-to-end revert-of-revert: F must not gain reverted_by
+    const digest = [{ url: fUrl, title: "feat F" }]
+    const applied = applyRevertAnnotations(digest, [
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+      {
+        url: r2Url,
+        merged_at: mergedAt2,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 200, url: r1Url }],
+      },
+    ])
+    assert.equal(digest[0].reverted_by, undefined)
+    assert.deepEqual(applied, [])
+  }
+
+  {
+    // case-insensitive url matching: lowercase signal target vs canonical digest entry
+    const canonical = "https://github.com/Kilo-Org/kilocode/pull/12249"
+    const lowerTarget = "https://github.com/kilo-org/kilocode/pull/12249"
+    const reverter = "https://github.com/Kilo-Org/kilocode/pull/12497"
+    const digest = [{ url: canonical, title: "feat stream" }]
+    const applied = applyRevertAnnotations(digest, [
+      {
+        url: reverter,
+        merged_at: mergedAt,
+        targets: [{ repo: "kilo-org/kilocode", number: 12249, url: lowerTarget }],
+      },
+    ])
+    assert.deepEqual(digest[0].reverted_by, { url: reverter, merged_at: mergedAt })
+    assert.deepEqual(applied, [[canonical, reverter]])
+  }
+
+  // --- unannotatedRevertSignals ---
+  {
+    // partial coverage: F in-digest, G pre-window → only G missed; chains empty
+    const sUrl = "https://github.com/Kilo-Org/kilocode/pull/500"
+    const gUrl = "https://github.com/Kilo-Org/kilocode/pull/102"
+    const signals = [
+      {
+        url: sUrl,
+        merged_at: mergedAt,
+        targets: [
+          { repo: "Kilo-Org/kilocode", number: 100, url: fUrl },
+          { repo: "Kilo-Org/kilocode", number: 102, url: gUrl },
+        ],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [[fUrl, sUrl]])
+    assert.deepEqual(result, { missed: [{ url: sUrl, targets: [gUrl] }], unparsed: [], chains: [] })
+  }
+
+  {
+    // fully covered signal (no chain) → all three buckets empty
+    const signals = [
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [
+          { repo: "Kilo-Org/kilocode", number: 100, url: fUrl },
+          { repo: "Kilo-Org/kilocode", number: 101, url: f2Url },
+        ],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [
+      [fUrl, r1Url],
+      [f2Url, r1Url],
+    ])
+    assert.deepEqual(result, { missed: [], unparsed: [], chains: [] })
+  }
+
+  {
+    // depth-2 chain (#4709/#4759): R1→F, R2→R1 — both in chains; F visible as R1 target
+    const signals = [
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+      {
+        url: r2Url,
+        merged_at: mergedAt2,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 200, url: r1Url }],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [])
+    assert.deepEqual(result, {
+      missed: [],
+      unparsed: [],
+      chains: [
+        { url: r1Url, targets: [fUrl] },
+        { url: r2Url, targets: [r1Url] },
+      ],
+    })
+  }
+
+  {
+    // depth-3 chain: R1→F, R2→R1, R3→R2 — all three in chains; missed/unparsed empty
+    const r3Url = "https://github.com/Kilo-Org/kilocode/pull/301"
+    const signals = [
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+      {
+        url: r2Url,
+        merged_at: mergedAt2,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 200, url: r1Url }],
+      },
+      {
+        url: r3Url,
+        merged_at: "2026-04-03T00:00:00Z",
+        targets: [{ repo: "Kilo-Org/kilocode", number: 201, url: r2Url }],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [])
+    assert.deepEqual(result, {
+      missed: [],
+      unparsed: [],
+      chains: [
+        { url: r1Url, targets: [fUrl] },
+        { url: r2Url, targets: [r1Url] },
+        { url: r3Url, targets: [r2Url] },
+      ],
+    })
+  }
+
+  {
+    // mixed signal: M targets [R1, A, B]; A annotated, B missed; chains lists only R1
+    const mUrl = "https://github.com/Kilo-Org/kilocode/pull/800"
+    const aUrl = "https://github.com/Kilo-Org/kilocode/pull/801"
+    const bUrl = "https://github.com/Kilo-Org/kilocode/pull/802"
+    const signals = [
+      {
+        url: r1Url,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 100, url: fUrl }],
+      },
+      {
+        url: mUrl,
+        merged_at: mergedAt2,
+        targets: [
+          { repo: "Kilo-Org/kilocode", number: 200, url: r1Url },
+          { repo: "Kilo-Org/kilocode", number: 801, url: aUrl },
+          { repo: "Kilo-Org/kilocode", number: 802, url: bUrl },
+        ],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [[aUrl, mUrl]])
+    assert.deepEqual(result, {
+      missed: [{ url: mUrl, targets: [bUrl] }],
+      unparsed: [],
+      chains: [
+        { url: r1Url, targets: [fUrl] },
+        { url: mUrl, targets: [r1Url] },
+      ],
+    })
+  }
+
+  {
+    // zero-target signal → unparsed, not missed; chains empty
+    const emptyUrl = "https://github.com/Kilo-Org/kilocode/pull/400"
+    const result = unannotatedRevertSignals([{ url: emptyUrl, merged_at: mergedAt, targets: [] }], [])
+    assert.deepEqual(result, { missed: [], unparsed: [emptyUrl], chains: [] })
+  }
+
+  {
+    // case-insensitivity: annotated set matches target urls differing only by case
+    const signalUrl = "https://github.com/Kilo-Org/kilocode/pull/600"
+    const targetMixed = "https://github.com/Kilo-Org/kilocode/pull/700"
+    const targetLower = "https://github.com/kilo-org/kilocode/pull/700"
+    const signals = [
+      {
+        url: signalUrl,
+        merged_at: mergedAt,
+        targets: [{ repo: "Kilo-Org/kilocode", number: 700, url: targetMixed }],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [[targetLower, signalUrl]])
+    assert.deepEqual(result, { missed: [], unparsed: [], chains: [] })
+  }
+
+  {
+    // live-window lock: #12497-shaped signal with both targets covered
+    const s12497 = "https://github.com/Kilo-Org/kilocode/pull/12497"
+    const t12249 = "https://github.com/Kilo-Org/kilocode/pull/12249"
+    const t12481 = "https://github.com/Kilo-Org/kilocode/pull/12481"
+    const signals = [
+      {
+        url: s12497,
+        merged_at: mergedAt,
+        targets: [
+          { repo: "Kilo-Org/kilocode", number: 12249, url: t12249 },
+          { repo: "Kilo-Org/kilocode", number: 12481, url: t12481 },
+        ],
+      },
+    ]
+    const result = unannotatedRevertSignals(signals, [
+      [t12249, s12497],
+      [t12481, s12497],
+    ])
+    assert.deepEqual(result, { missed: [], unparsed: [], chains: [] })
+  }
+
+  // --- source-order guards (case-5 style) ---
+  {
+    const collectSrc = fs.readFileSync(COLLECT_SCRIPT, "utf8")
+    assert.ok(collectSrc.includes("./reverts.mjs"), "collect.mjs must import ./reverts.mjs")
+    const kindIdx = collectSrc.indexOf("revertTitleKind(item.title")
+    const dropIdx = collectSrc.indexOf("DROP_TITLE.test")
+    assert.ok(kindIdx >= 0, "revertTitleKind(item.title call missing")
+    assert.ok(dropIdx >= 0, "DROP_TITLE.test missing")
+    assert.ok(kindIdx < dropIdx, "revert interception must run before DROP_TITLE")
+
+    const applyIdx = collectSrc.indexOf("applyRevertAnnotations(digest")
+    const fullIdx = collectSrc.indexOf("digest-full.json")
+    assert.ok(applyIdx >= 0, "applyRevertAnnotations(digest call missing")
+    assert.ok(fullIdx >= 0, "digest-full.json write missing")
+    assert.ok(applyIdx < fullIdx, "annotations must be applied before digests are written")
+
+    assert.ok(
+      collectSrc.includes('if (revertTitleKind(item.title ?? "")) {'),
+      'collect must use exact intercept line if (revertTitleKind(item.title ?? "")) {',
+    )
+  }
+
+  // --- prompt-text guards ---
+  {
+    const triagePrompt = fs.readFileSync(path.join(HERE, "triage-prompt.md"), "utf8")
+    assert.ok(triagePrompt.includes("reverted_by"), "triage-prompt must mention reverted_by")
+    assert.ok(triagePrompt.includes("stream-liveness"), "triage-prompt must mention stream-liveness")
+    assert.ok(
+      triagePrompt.includes("reverted by https://github.com/Kilo-Org/kilocode/pull/12497"),
+      "triage-prompt must contain exact cite example",
+    )
+
+    const editPrompt = fs.readFileSync(path.join(HERE, "edit-prompt.md"), "utf8")
+    assert.ok(editPrompt.includes("reverted_by"), "edit-prompt must mention reverted_by")
+    assert.ok(editPrompt.includes("current source tree"), "edit-prompt must mention current source tree")
+    assert.ok(editPrompt.includes("Skipping is a normal outcome"), "edit-prompt must mention skipping outcome")
+    assert.ok(editPrompt.includes("Existence alone is not enough"), "edit-prompt must mention existence guard")
+  }
+}
+
 // ---------------------------------------------------------------------------
 // main
 // ---------------------------------------------------------------------------
@@ -934,12 +1831,21 @@ function main() {
   const cases = [
     case1_mergeOrFallback,
     case2_defectB,
+    case2b_autoFlag,
+    case2c_stderrLogAlways,
+    case2d_redactEnvSecrets,
+    case2e_prefixSecretOrdering,
+    case2f_redactStdout,
+    case2g_redactStream,
+    case2h_pendingCauseIsReadable,
+    case2i_budgetsFitWork,
     case3_watermark,
     case4_routing,
     case5_recollection,
     case6_budgets,
     case7_cap,
     case8_triage,
+    case9_reverts,
   ]
   let failed = 0
   for (const fn of cases) {
diff --git a/.github/docs-sync/triage-prompt.md b/.github/docs-sync/triage-prompt.md
index 10e54406e8..dbf2341e70 100644
--- a/.github/docs-sync/triage-prompt.md
+++ b/.github/docs-sync/triage-prompt.md
@@ -4,11 +4,12 @@ The attached `digest.json` file contains PRs recently merged to Kilo-Org/cloud a
 
 A PR is docs-worthy ONLY if a user of Kilo Code would need to learn something new or change how they use the product after this PR ships. Examples: new commands, flags, settings, UI workflows, providers, pricing/limits changes, breaking behavior changes, or fixes that change documented behavior.
 
-A PR is NOT docs-worthy when it is: an internal refactor, infrastructure or CI work, a feature-flag scaffold that is not yet user-visible, test or dependency work, a bug fix that merely restores already-documented behavior, or a change only visible to contributors or self-hosters.
+A PR is NOT docs-worthy when it is: an internal refactor, infrastructure or CI work, a feature-flag scaffold that is not yet user-visible, test or dependency work, a bug fix that merely restores already-documented behavior, a change only visible to contributors or self-hosters, an internal technical fix or plumbing change with no user-visible behavior or workflow change (for example stream-liveness/watchdog plumbing, internal retry or timeout handling with no user-facing setting), or UI or rendering polish that does not change what a user must do or learn.
 
 Rules:
 
 - Include every input PR exactly once, identified by its `number` and `url`. Never invent PRs.
+- A digest entry with a `reverted_by` field had its changes reverted by that later PR in the same window. Treat such PRs as not docs-worthy unless the entry's body or file list shows clear evidence the change was re-landed after the revert. When `reverted_by` drives your verdict, the `reason` must cite it, e.g. "reverted by https://github.com/Kilo-Org/kilocode/pull/12497".
 - When unsure, set `docs_worthy` to false and explain the doubt in `reason`.
 - `target_sections` is only filled for docs-worthy PRs. Use rough docs areas, e.g. `getting-started`, `code-with-ai/platforms/cli`, `code-with-ai/platforms/vscode`, `code-with-ai/agents`, `ai-providers`, `teams`, `enterprise`, `automate`.
 - `reason` is one short sentence, written for the human who reviews the final docs PR.
diff --git a/.github/docs-sync/triage.mjs b/.github/docs-sync/triage.mjs
index eb075980b5..a01eef0a99 100644
--- a/.github/docs-sync/triage.mjs
+++ b/.github/docs-sync/triage.mjs
@@ -71,8 +71,13 @@ function triageChunk(chunk, index, budgetDeadline) {
       break
     }
 
+    // Headless `kilo run` auto-rejects every permission ask; without --auto the
+    // agent cannot run shell commands. SECURITY: --auto grants unrestricted bash
+    // to an agent steered by external PR content. Hardening deferred: a scoped
+    // permission.bash map via KILO_CONFIG_CONTENT should replace --auto once the
+    // required shell patterns are stable (see PR #12605 review thread).
     const result = runKilo({
-      args: ["run", prompt, "-m", model, "--dir", process.cwd(), "-f", chunkFile],
+      args: ["run", "--auto", prompt, "-m", model, "--dir", process.cwd(), "-f", chunkFile],
       timeoutMs: Math.min(CHUNK_TIMEOUT_MS, left),
       streamStdout: false,
       label: `triage chunk ${index} attempt ${attempt}`,
diff --git a/.github/workflows/docs-sync.yml b/.github/workflows/docs-sync.yml
index 5a32e87698..147cde8a47 100644
--- a/.github/workflows/docs-sync.yml
+++ b/.github/workflows/docs-sync.yml
@@ -66,8 +66,13 @@ jobs:
   sync:
     if: github.repository == 'Kilo-Org/kilocode' && github.event_name != 'pull_request'
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    # Budget: 3 setup/collect + 35 triage + 50 edit + 2 verify + 10 fix + 2 upsert = 102 min, 18-minute reserve.
-    timeout-minutes: 120
+    # Budget: 4 setup/collect + 90 triage + 120 edit + 2 verify + 10 fix + 2 upsert = 228 min, 12-minute reserve.
+    # These are ceilings, not costs: a caught-up run triages ~2 chunks and edits
+    # ~1 batch and finishes in ~25 min. The old 35/50 pair was the binding
+    # constraint on backlog drain — run 30306629290 deferred 54 PRs untriaged and
+    # 31 unedited purely on budget, with no attempt made. See the throughput note
+    # in the PR description for the arithmetic.
+    timeout-minutes: 240
     env:
       # Both are required: without KILO_ORG_ID the gateway bills the key
       # owner's personal balance (402 "Add credits") instead of the org.
@@ -116,6 +121,9 @@ jobs:
         if: steps.collect.outputs.count != '0'
         env:
           SINCE_OVERRIDE: ${{ steps.wm.outputs.since_override }}
+          # Default 35 fit only 8 of 11 chunks on a 254-PR window. Headroom for
+          # --auto making chunks slower now that the agent really runs commands.
+          TRIAGE_BUDGET_MINUTES: "90"
         run: node .github/docs-sync/triage.mjs
 
       - name: Filter docs-worthy PRs
@@ -153,6 +161,11 @@ jobs:
       - name: Update docs (Kilo CLI, batched)
         if: (steps.worthy.outputs.count || '0') != '0' && inputs.dry_run != true
         continue-on-error: true
+        env:
+          # Default 50 fit only 4 of 11 batches. A healthy --auto batch is ~8 min,
+          # and edit.mjs will not start a batch without EDIT_BATCH_TIMEOUT_MINUTES
+          # (15) left, so 120 covers 14 batches = 70 PRs against ~5 worthy/day.
+          EDIT_BUDGET_MINUTES: "120"
         run: node .github/docs-sync/edit.mjs
 
       - name: Verify docs build and tests
@@ -174,9 +187,19 @@ jobs:
           NEXT_PUBLIC_POSTHOG_KEY: ${{ secrets.POSTHOG_API_KEY }}
         run: |
           set -o pipefail
-          kilo run "The docs build or tests failed. Read the attached docs-sync-out/verify.log and fix the packages/kilo-docs changes so they pass. Do not revert doc edits; fix them. Do not modify anything outside packages/kilo-docs." \
+          # Headless kilo run auto-rejects every permission ask; the runner has no
+          # user config granting bash, so without --auto the agent cannot run ordinary
+          # shell commands against the repository.
+          kilo run --auto "The docs build or tests failed. Read the attached docs-sync-out/verify.log and fix the packages/kilo-docs changes so they pass. Do not revert doc edits; fix them. Do not modify anything outside packages/kilo-docs." \
             -m "$EDIT_MODEL" --dir "$GITHUB_WORKSPACE" -f docs-sync-out/verify.log \
-            | tee -a docs-sync-out/edit-log.txt
+            | node .github/docs-sync/redact-stream.mjs \
+            | tee -a docs-sync-out/edit-log.txt \
+            || echo "::warning::kilo fix pass exited nonzero; re-verifying anyway"
+          # The rebuild below decides this step's outcome, not the agent's exit code.
+          # Without the guard above, `set -o pipefail` + the default `bash -e` would
+          # abort here once the CLI half of this PR ships: a mid-stream session error
+          # (or an auto-rejected ask) exits 1, verify2.log is never written, and
+          # `Re-verify status` reports VERIFIED=false even when the docs build fine.
           { bun run --filter @kilocode/kilo-docs build && bun run --filter @kilocode/kilo-docs test; } 2>&1 | tee docs-sync-out/verify2.log
 
       - name: Re-verify status
diff --git a/.kilo/plans/agent-manager-multi-project-configuration.md b/.kilo/plans/agent-manager-multi-project-configuration.md
new file mode 100644
index 0000000000..340082fbb6
--- /dev/null
+++ b/.kilo/plans/agent-manager-multi-project-configuration.md
@@ -0,0 +1,262 @@
+# Agent Manager multi-project configuration architecture
+
+**Status:** Blocking architecture for multi-project release
+
+**Date:** 2026-07-22
+
+This document is the canonical configuration specification for Agent Manager multi-project support. The main UI/runtime plan references it and must not duplicate or contradict it.
+
+The executable sequence from the current branch is [`agent-manager-multi-project-implementation-handoff.md`](./agent-manager-multi-project-implementation-handoff.md).
+
+## Decision
+
+Keep the useful current split between user and project settings, but make every Settings read and write target explicit, immutable, revisioned, and independent from Agent Manager activation.
+
+Multi-project must not ship broadly while Settings can load a draft for project A and resolve its save target from the mutable active project B.
+
+## Current behavior
+
+Kilo has four configuration stores:
+
+| Store | Example | Owner |
+|---|---|---|
+| VS Code preferences | VS Code `settings.json` | This VS Code user/installation |
+| Kilo user config | `~/.config/kilo/kilo.json` | User defaults across projects and Kilo clients |
+| Kilo project config | `<repo>/.kilo/kilo.jsonc` | Repository behavior and overrides |
+| Runtime/session state | In-memory, directory-qualified | One project, worktree, or session |
+
+The shared Settings save currently calls `splitConfigByScope()`:
+
+- `commit_message` is written to project config;
+- `indexing.enabled` is written to project config;
+- all other generic Settings fields are written to user config.
+
+The Indexing tab also has an explicit Global/Project selector and can write the entire `indexing` object to either layer. This is too broad because project config can receive provider/model/vector-store credentials and infrastructure settings.
+
+Several controls are VS Code preferences and bypass Kilo config entirely, including autocomplete UI, browser automation, notifications, max auto-approve cost, commit-message output language, and indexing button visibility.
+
+## Confirmed blocking failure
+
+The current protocol does not bind a draft to the config target it was loaded from:
+
+1. `KiloProvider.fetchAndSendConfig()` resolves a mutable current directory and sends unqualified `configLoaded` state.
+2. The webview owns one global/project/effective draft.
+3. Agent Manager changes the active project from A to B.
+4. The webview sends an unqualified `updateConfig`.
+5. `KiloProvider.handleUpdateConfig()` resolves the current directory again at save time and may write A's draft to B.
+
+Reads are directory-scoped, but writes are not bound to the read target. This is the release blocker.
+
+The backend also lacks an expected target/revision precondition, so external editors or another window can overwrite a config between read and save.
+
+## Ownership policy
+
+### VS Code preferences
+
+These remain in VS Code settings and do not participate in project config:
+
+- extension language and presentation preferences;
+- autocomplete enablement, keybindings, provider, and model;
+- browser automation enablement/system Chrome/headless mode;
+- notification enablement and sound;
+- maximum automatic approval cost;
+- commit-message output language;
+- indexing button visibility while indexing is disabled;
+- multi-project feature enablement.
+
+### Kilo user config
+
+These are personal defaults or security policy and should be edited in User scope:
+
+- default, small, and subagent models and variants;
+- provider enablement, custom providers, credentials, and endpoints;
+- user/global agents and default agent;
+- permission defaults and user tool defaults;
+- sandbox policy, network access, writable paths, and allowed hosts;
+- compaction, checkpoint/snapshot, and tool-output defaults;
+- username and display behavior;
+- sharing, remote control, telemetry, and experimental features;
+- user/global formatter, LSP, MCP, skills, instructions, commands, and workflows;
+- indexing provider, model, credentials, vector storage, and global tuning defaults.
+
+A trusted project may override many of these at runtime, but editing User scope never writes those overrides.
+
+### Kilo project config
+
+These describe repository behavior and are valid project settings:
+
+- commit-message prompt;
+- repository indexing file extensions, include/ignore rules, and deliberate project tuning overrides;
+- repository instructions;
+- repository skill paths;
+- repository commands/workflows;
+- trusted project agents;
+- trusted project MCP servers;
+- repository formatter/LSP overrides;
+- repository watcher ignores;
+- repository-specific tool restrictions and permission requests.
+
+Project configuration may override user model/agent/tool defaults, but provider credentials and security-policy weakening must not be silently authored into a repository.
+
+### Machine-local project consent
+
+Indexing enablement is privacy consent, not repository configuration. Store it outside the repository, keyed by canonical `ProjectId` in machine-local extension state:
+
+- newly observed projects default to indexing disabled;
+- users explicitly enable indexing for one project on this machine;
+- repository config cannot enable indexing;
+- repository config may describe what to index, but consent gates whether indexing starts;
+- canonical project identity prevents a symlink or alternate path from bypassing consent.
+
+Effective indexing requires both valid user-global indexing configuration and machine-local consent for that project.
+
+### Current tabs
+
+| Settings tab | Correct editable target |
+|---|---|
+| Models | User by default; explicit Project scope may override models/agents |
+| Providers | User only for credentials/endpoints; project-provided entries are source-labelled |
+| Agent Behaviour | User or explicit trusted Project scope |
+| Auto Approve | User Kilo config; max cost remains VS Code preference |
+| Browser | VS Code preferences |
+| Checkpoints | User default or explicit Project override |
+| Display | User config |
+| Autocomplete | VS Code preferences |
+| Notifications | VS Code preferences |
+| Context | User defaults; repository watcher/instruction rules in explicit Project scope |
+| Commit Message | Project scope for prompt; language remains VS Code preference |
+| Indexing | User for provider/model/credentials/storage; machine-local project consent for enablement; Project for repository rules |
+| Experimental | User config; multi-project also mirrors to VS Code preference |
+| Sandboxing | User config only |
+| Language | VS Code preference |
+| MCP/Commands/Skills | User defaults or explicit trusted Project scope |
+
+No field silently chooses a file during save. The UI must display its scope.
+
+## Settings UX
+
+Use explicit scope and project controls:
+
+```text
+Scope: User | Project
+
+Project: backend
+Target: /projects/backend/.kilo/kilo.jsonc
+```
+
+- User scope always targets user config.
+- Project scope requires an explicit trusted project selector.
+- The Settings selector is separate from Agent Manager's active project.
+- Opening Settings may initialize the project selector once from the current project, but later Agent Manager switches never change it.
+- A dirty project draft cannot move to another project. Selector changes require Save, Discard, or Stay.
+- Inherited values show source badges such as User, Project: backend, and Managed.
+- Project scope offers Override and Reset to inherited.
+- Project-sourced providers cannot be silently deleted from project config through User scope.
+
+Runtime config still follows the exact session directory. Settings Project scope targets the registered project root, not the active worktree. Worktree-config editing is a separate future feature requiring an explicit `WorktreeRef`.
+
+## Immutable binding contract
+
+A Settings read returns an opaque binding:
+
+```ts
+interface SettingsBinding {
+  id: string
+  connectionGeneration: number
+  scope: "global" | "project"
+  project?: {
+    projectId: string
+    root: string
+    generation: number
+  }
+  directory: string
+  target: {
+    scope: "global" | "project"
+    path: string
+    revision: string
+    exists: boolean
+    writable: boolean
+  }
+}
+```
+
+The write contains only the opaque binding and patch:
+
+```ts
+interface WriteSettingsConfig {
+  type: "settingsConfig.write"
+  requestId: string
+  bindingId: string
+  set: Record<string, unknown>
+  unset: string[][]
+}
+```
+
+The extension stores the authoritative binding. On write it must:
+
+1. reject unknown/expired bindings;
+2. verify project existence, generation, and trust;
+3. capture the binding before the first await;
+4. use the binding's stored directory and scope;
+5. never call `getWorkspaceDirectory()`, `contexts.active()`, or use a worktree/session fallback;
+6. clear a draft only from the matching `{ requestId, bindingId }` response.
+
+Bindings expire after save, reconnect, trust revocation, project removal, or context generation change.
+
+## Backend revision contract
+
+`GET /config/overlay` must return the exact global/project target path, parsed raw target config, effective config/source metadata, and a revision.
+
+The revision is a SHA-256 fingerprint of canonical target path, existence marker, and exact file bytes. This catches content changes, JSONC comment-only edits, and target changes.
+
+`PATCH /config/overlay` accepts one scope and requires:
+
+```ts
+{
+  scope: "global" | "project"
+  set: Record<string, unknown>
+  unset: string[][]
+  expected: {
+    path: string
+    revision: string
+  }
+}
+```
+
+The backend must re-resolve the authoritative target, verify path/revision under a target lock, patch the raw target layer, validate it, atomically replace the file, and return a fresh snapshot. It never accepts an arbitrary client path.
+
+Expected failures include expired binding, unknown/untrusted project, changed target, revision conflict, invalid config, non-writable target, and I/O failure. Every failure preserves the draft.
+
+## Required implementation
+
+1. Add revisioned target descriptors and compare-and-swap writes to the Kilo config overlay API.
+2. Split activation-bound runtime config state from binding-keyed Settings editor state.
+3. Replace unqualified `configLoaded`/`updateConfig` with settings read/write messages carrying request and binding IDs.
+4. Replace hidden `splitConfigByScope` saves with explicit scope on every editable control.
+5. Restrict Indexing Project scope to repository rules; keep provider/model/credentials/storage in User scope.
+6. Move indexing enablement from project config to machine-local consent keyed by canonical `ProjectId`, default off.
+7. Audit direct config mutators outside the save bar, especially provider disconnect, imports/resets, custom providers, work styles, permission rules, and indexing actions.
+8. Make Open Project Config take a `ProjectRef`, resolve the immutable registered root, and verify trust.
+9. Partition config caches/events by scope, directory, target, revision, and activation generation.
+
+## Blocking tests
+
+- Load Settings for A, switch Agent Manager to B, save: only A's bound target changes.
+- Same test while selecting A/B worktrees and sessions.
+- User-scope save always changes only user config.
+- Project-scope save requires the explicit trusted project and changes only its registered root config.
+- Dirty drafts survive Agent Manager switches and cannot migrate between Settings projects.
+- Out-of-order reads and writes update only the matching request/binding.
+- External file change causes a revision conflict without losing the draft.
+- A changed config target path causes a target conflict.
+- Project removal, generation change, or trust revocation expires its binding.
+- Indexing provider/model/credentials/storage never enter project config through the form.
+- A repository file containing `indexing.enabled: true` cannot grant indexing consent.
+- New projects default to indexing disabled until explicitly enabled on this machine.
+- Consent follows canonical project identity across symlink/path aliases and never leaks to another project.
+- `commit_message.prompt` and repository indexing rules still support explicit project writes.
+- Runtime worktree config uses the worktree directory while Project Settings remains bound to the registered project root.
+
+## Release gate
+
+Keep multi-project disabled by default until the immutable binding/revision contract and the blocking tests above are implemented. The useful existing project-local behavior should be preserved, not removed; its write target must become explicit and immutable.
diff --git a/.kilo/plans/agent-manager-multi-project-implementation-handoff.md b/.kilo/plans/agent-manager-multi-project-implementation-handoff.md
new file mode 100644
index 0000000000..510a5e1c38
--- /dev/null
+++ b/.kilo/plans/agent-manager-multi-project-implementation-handoff.md
@@ -0,0 +1,459 @@
+# Agent Manager multi-project implementation handoff
+
+**Status:** Implementation-ready handoff from the current branch
+
+**Date:** 2026-07-22
+
+This document tells the next implementation model exactly how to continue from branch `abalone-bactrosaurus` at commit `8f48da2278` plus the uncommitted plan files. It is the execution checklist. Detailed decisions live in:
+
+- [`agent-manager-multi-project-configuration.md`](./agent-manager-multi-project-configuration.md) for configuration ownership, bindings, revisions, indexing consent, and settings tests;
+- [`agent-manager-multi-project-uniform-ui.md`](./agent-manager-multi-project-uniform-ui.md) for runtime, routing, lifecycle, uniform sidebar UI, and acceptance criteria.
+
+If this handoff conflicts with either architecture document, stop and resolve the contradiction before coding.
+
+## Goal
+
+Finish the current prototype into a safe, complete multi-project Agent Manager behind a default-off VS Code experimental flag.
+
+The feature is done only when:
+
+- multiple expanded projects show the same full Agent Manager sidebar behavior;
+- every action uses explicit project/worktree/session ownership;
+- Settings cannot write the wrong project's config;
+- indexing requires machine-local consent per canonical project;
+- project identity is canonical, Git-root-aware, common-dir-safe, and remote-authority-aware;
+- single-project behavior remains unchanged when the flag is off.
+
+## Current branch baseline
+
+### Implemented and worth keeping
+
+- persistent additional-project registry with serialized/re-read mutations;
+- separate `ProjectContext` objects and per-project Agent Manager state files;
+- project-stamped state, stats, PR, and session payloads;
+- canonical worktree presence comparison for symlink/`/tmp` aliases;
+- per-project session listing from project root and worktree directories;
+- partial production `ProjectRouteService` integration and raw-session ambiguity rejection;
+- project-qualified sidebar DOM IDs and cross-project previous/next navigation;
+- atomic selection validation and same-project activation fast path;
+- flag-off return to pinned project;
+- Experimental Settings toggle and translations;
+- focused unit tests for registry, contexts, paths, pollers, routing, sessions, selection, and navigation.
+
+### Not implemented or incomplete
+
+- immutable/revisioned Settings bindings;
+- machine-local indexing consent;
+- canonical pinned Git toplevel, `commonGitDir`, URI scheme/authority identity;
+- strict project envelopes for all Agent Manager operations;
+- complete route-service use for every session/terminal/diff/share/permission operation;
+- one full sidebar body shared by single- and multi-project modes;
+- uniform per-context poller and stale-state ownership;
+- all repository mutations through `ProjectContext.run()`;
+- complete real two-project E2E verification.
+
+### Known diff cleanup
+
+- remove unrelated `packages/opencode/package.json` ordering/dependency drift;
+- restore unrelated `bun.lock` ordering/version drift unless required by a retained change;
+- remove `experimental.multi_project` from the CLI config schema and generated SDK once the VS Code flag is the sole source of truth;
+- rewrite the changeset after final behavior is complete.
+
+Do not reset or discard unrelated user changes. Inspect every cleanup diff before applying it.
+
+## Non-negotiable invariants
+
+1. Agent Manager activation is not a Settings write target.
+2. No identified operation falls back to the active project or workspace root in multi-project mode.
+3. A project config write targets the explicitly selected registered project root, never an active worktree.
+4. Runtime config remains directory-correct: project Local uses root, worktree sessions use exact worktree directory.
+5. Repository config cannot grant indexing consent.
+6. New projects default to indexing disabled on this machine.
+7. Provider/API credentials and indexing infrastructure never enter project config through Settings.
+8. Raw session/worktree IDs are never sufficient UI/runtime identity when multiple projects are exposed.
+9. The full existing sidebar behavior is reused; do not maintain a simplified multi-project copy.
+10. Do not raise `AgentManagerProvider.ts` or `AgentManagerApp.tsx` line caps.
+
+## Work order
+
+Complete slices in order. Do not start the next slice while the current slice's tests or checks fail.
+
+## Slice 0A: consolidate the feature flag
+
+### Required result
+
+Use one source of truth: VS Code application setting `kilo-code.new.experimental.multiProject`.
+
+### Required changes
+
+1. Remove `experimental.multi_project` from:
+   - `packages/core/src/v1/config/config.ts`;
+   - `packages/sdk/js/src/v2/gen/types.gen.ts` by regenerating the SDK after schema removal;
+   - `packages/kilo-vscode/webview-ui/src/types/messages/config.ts`.
+2. Do not hand-edit generated SDK files. Run `./script/generate.ts` from repository root after endpoint/schema changes.
+3. Change `ExperimentalTab.tsx` so the toggle reads the VS Code setting delivered in `configLoaded.settings`, not `config().experimental`.
+4. Add `multiProject` to the extension settings payload sent by `KiloProvider.fetchAndSendConfig()`.
+5. Toggling it sends only `updateSetting("experimental.multiProject", checked)`.
+6. Keep `VscodeHost.multiProject()` and its change listener reading the same VS Code setting.
+
+### Tests
+
+- toggle initial state reflects VS Code setting when CLI config disagrees;
+- toggling updates the VS Code setting and Agent Manager reacts;
+- no CLI/project config file gains `experimental.multi_project`.
+
+### Stop gate
+
+Run from `packages/kilo-vscode/`:
+
+```sh
+bun run format
+bun run format:check
+bun run typecheck
+bun run lint
+bun run test:unit
+```
+
+Do not continue if any command fails.
+
+## Slice 0B: machine-local indexing consent
+
+### Required result
+
+Indexing enablement is explicit machine-local consent keyed by canonical `ProjectId`, default false. Project config controls indexing rules but cannot enable indexing.
+
+### Required changes
+
+1. Add a versioned machine-local consent store in the extension, not repository config and not synced across machines.
+2. Use canonical project identity as the key. The pinned project and registered projects use the same identity resolver.
+3. Remove hidden routing of `indexing.enabled` to project config from `webview-ui/src/utils/config-scope.ts`.
+4. Remove project/global inheritance logic for `indexing.enabled` from `indexing-tab-state.ts`.
+5. The Indexing UI requires an explicit project selector for enablement and reads/writes consent through dedicated messages.
+6. Keep these in User config only:
+   - provider;
+   - model and dimension;
+   - credentials/API keys/base URLs;
+   - vector-store type and connection/storage settings;
+   - machine/infrastructure tuning defaults.
+7. Keep these available in explicit Project scope:
+   - file extensions;
+   - repository include/ignore rules;
+   - deliberate repository chunking/tuning overrides.
+8. Indexing startup/status must require both valid User indexing configuration and consent for the routed project.
+9. A repository containing `indexing.enabled: true` must not enable indexing.
+
+### Suggested files
+
+- new VS Code-free consent store under `src/indexing/` or `src/agent-manager/`;
+- `src/KiloProvider.ts` only as a thin protocol adapter;
+- `webview-ui/src/components/settings/IndexingTab.tsx`;
+- `webview-ui/src/components/settings/indexing-tab-state.ts`;
+- `webview-ui/src/context/config.tsx` only if necessary;
+- focused tests beside existing indexing tests.
+
+### Tests
+
+- unknown project defaults off;
+- A enabled does not enable B;
+- symlink/path alias resolves to the same consent;
+- repository config cannot grant consent;
+- removing/re-adding behavior follows the documented store policy;
+- no credentials/storage settings are emitted in a Project-scope patch.
+
+## Slice 0C: revisioned config overlay backend
+
+### Required result
+
+Config reads return authoritative target descriptors and revisions. Writes use compare-and-swap and cannot overwrite external changes or a changed target.
+
+### Required changes
+
+1. Extend Kilo-owned config overlay code:
+   - `packages/opencode/src/kilocode/config/overlay.ts`;
+   - a new Kilo-owned writer under `packages/opencode/src/kilocode/config/`;
+   - `packages/opencode/src/kilocode/server/httpapi/groups/config-console.ts`;
+   - `packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts`.
+2. Read response includes for global and project targets:
+   - canonical path;
+   - scope;
+   - exists/writable;
+   - SHA-256 revision of canonical path, existence marker, and exact bytes;
+   - raw parsed target layer;
+   - effective config and source metadata.
+3. Write request accepts exactly one scope, `set`, `unset`, and expected path/revision.
+4. Server re-resolves the authoritative target. Never trust client path as a destination.
+5. Lock by canonical target path, re-read inside lock, compare revision, patch raw JSONC, validate, and atomically replace.
+6. Return a fresh authoritative snapshot.
+7. Return typed 409 conflicts for target/revision changes; preserve drafts client-side.
+8. Keep Kilo logic in `packages/opencode/src/kilocode/`. Shared upstream files get minimal marked delegation only when unavoidable.
+9. Regenerate the SDK after endpoint changes.
+
+### Tests
+
+Add/extend:
+
+- `packages/opencode/test/kilocode/server/config-overlay.test.ts`;
+- `packages/opencode/test/kilocode/project-config-update.test.ts`.
+
+Cover:
+
+- exact raw target layer;
+- comment-only external edit conflict;
+- missing-file target revision;
+- newly created higher-priority target conflict;
+- concurrent writers: one success, one 409;
+- symlink escape rejection;
+- global and project writes remain separate;
+- atomic write failure never exposes partial content.
+
+### Stop gate
+
+From `packages/opencode/`:
+
+```sh
+bun run typecheck
+bun test test/kilocode/server/config-overlay.test.ts
+bun test test/kilocode/project-config-update.test.ts
+```
+
+From repository root:
+
+```sh
+./script/generate.ts
+bun run script/check-opencode-annotations.ts
+bun run script/check-opencode-promise-facades.ts
+```
+
+## Slice 0D: immutable Settings bindings
+
+### Required result
+
+Settings has explicit `User | Project` scope. Project scope requires an explicit trusted project selector. Drafts and saves never follow Agent Manager activation.
+
+### Required changes
+
+1. Split runtime-effective config from Settings editor config.
+2. Add a binding controller under `packages/kilo-vscode/src/kilo-provider/`; keep `KiloProvider.ts` as a thin adapter.
+3. Replace unqualified config protocol with:
+   - read request carrying request ID, scope, and optional project ID;
+   - snapshot carrying opaque binding ID and source/target metadata;
+   - write request carrying request ID, binding ID, set, and unset.
+4. The extension stores authoritative bindings. The webview never supplies a writable path.
+5. Project binding resolution:
+   - resolve registered `ProjectContext.root`;
+   - require project existence, matching generation, and trust;
+   - never use active worktree/session or `getWorkspaceDirectory()` after binding creation.
+6. Bindings expire on successful save, reconnect, project removal, generation change, or trust revocation.
+7. Separate drafts by scope/project binding.
+8. Dirty selector changes prompt Save, Discard, or Stay.
+9. Out-of-order reads/writes update only matching request/binding.
+10. External config events refresh clean drafts and mark dirty drafts stale without overwriting them.
+11. Remove `splitConfigByScope()` after all controls declare scope explicitly.
+12. Audit direct config mutators outside the save bar, including provider disconnect, imports/resets, custom providers, work styles, Permission Dock, MCP actions, and indexing.
+13. Open Project Config takes explicit `ProjectRef`, checks trust, and resolves the registered root.
+
+### UI scope policy
+
+Use the table in `agent-manager-multi-project-configuration.md`. Do not invent another policy.
+
+### Blocking tests
+
+- load A, activate B, save A: only A target changes;
+- same while selecting worktrees/sessions;
+- User save changes only user config;
+- Project save changes only selected trusted project's root config;
+- dirty draft cannot migrate to another project;
+- project removal/trust revocation expires binding;
+- external edit returns conflict and preserves draft;
+- no save-time active-directory lookup occurs.
+
+## Slice 1: canonical project identity
+
+### Required result
+
+Every project is a canonical Git repository root with URI authority and common Git directory identity.
+
+### Required changes
+
+1. Replace path-only project descriptors with:
+
+```ts
+{
+  id,
+  uri,
+  scheme,
+  authority,
+  root,
+  commonGitDir,
+  label,
+  order,
+  trusted,
+  addedAt
+}
+```
+
+2. Pinned and added projects use the same resolver:
+   - validate URI host scope;
+   - `git rev-parse --show-toplevel`;
+   - `git rev-parse --path-format=absolute --git-common-dir`;
+   - realpath/normalize both;
+   - derive ID from scheme, authority, and canonical root.
+3. Opening VS Code in a repository subdirectory still uses the Git toplevel and root state file.
+4. Reject another exposed project sharing canonical `commonGitDir`.
+5. Key Git mutation locks by common Git directory.
+6. Preserve remote URI scheme/authority in picker, storage, and open-folder operations.
+7. Migrate or safely read the current registry version without dropping valid entries.
+
+### Tests
+
+- workspace subdirectory resolves to repository root;
+- symlink aliases dedupe;
+- linked worktree/common-dir duplicate rejected;
+- other remote authority hidden but preserved;
+- missing/non-Git entry remains removable and never falls back to pinned root.
+
+## Slice 2: strict routing and lifecycle
+
+### Required result
+
+Every repository-bound operation is explicitly project-qualified once multiple projects are exposed.
+
+### Required changes
+
+1. Introduce one project envelope at the Agent Manager boundary with project ID and generation.
+2. Compatibility adapter injects pinned identity only in single-project mode.
+3. Multi-project mode rejects missing/mismatched identity with typed errors.
+4. Wire `ProjectRouteService` into every existing-session operation:
+   - transcript/messages;
+   - prompt/abort;
+   - share/unshare;
+   - fork/continuation;
+   - permission/question responses;
+   - terminal;
+   - file/context operations;
+   - diff/apply/revert.
+5. Route global SSE events once by exact directory/session ownership.
+6. Preserve non-Agent-Manager KiloProvider behavior.
+7. Execute repository mutations through `ctx.run()` and generation-check commits.
+8. Removal waits for mutation queue, stops pollers/watchers, flushes state, detaches routes, then removes registry entry.
+9. Flag-off activates pinned Local and suspends secondaries without aborting sessions.
+
+### Tests
+
+- same raw session ID across projects is ambiguous without qualifier;
+- B Local/share/unshare/permission never routes through A;
+- unknown IDs produce no terminal/file/diff operation;
+- project switch during mutation cannot change operation ownership;
+- late completion after removal cannot mutate replacement context.
+
+## Slice 3: uniform context-owned state and polling
+
+### Required result
+
+Every initialized expanded project owns the same live-state services. Active selection changes cadence/detail only, not ownership.
+
+### Required changes
+
+1. Move stats and PR pollers into `ProjectContext`; remove active singleton/background split.
+2. Each context owns stale/presence state, cached stats, local stats, PR state, run/setup state, and generation.
+3. Background presence updates project stale state rather than emitting empty arrays.
+4. All project outputs include project ID and generation; webview discards stale generations.
+5. Session-created/deleted/updated events refresh the owning project store without active-project filtering.
+6. Panel visibility and expansion uniformly control polling.
+
+### Tests
+
+- two expanded projects both receive stats/presence/PR updates;
+- collapse stops only that project's pollers;
+- stale late poll result is dropped;
+- background session deletion updates only its project.
+
+## Slice 4: one full sidebar body
+
+### Required result
+
+Single- and multi-project modes render the same full `ProjectSidebarBody` implementation.
+
+### Required changes
+
+1. Extract the current full `renderBody()` from `AgentManagerApp.tsx` intact.
+2. Parameterize it with one project store and project-qualified actions.
+3. Preserve:
+   - busy state;
+   - drag/drop and grouping;
+   - section actions;
+   - search and keyboard hints;
+   - run/setup state;
+   - New Worktree dialog;
+   - worktree menus and PR actions;
+   - complete managed/unassigned session behavior.
+4. Delete the simplified duplicate body path.
+5. Render project rows keyed by stable project ID and keep bodies mounted across active changes.
+6. New Worktree receives explicit target project, defaulting to Settings/detail selection policy as specified.
+
+### Tests
+
+- single-project behavior unchanged with flag off;
+- two expanded projects render two full bodies;
+- active selection changes no body mount identity;
+- drag/drop, sections, worktree actions, sessions, and keyboard navigation work across projects.
+
+## Slice 5: cleanup and release validation
+
+1. Remove unrelated manifest/lockfile drift.
+2. Update changeset to final user-visible behavior.
+3. Run all extension and affected CLI checks.
+4. Build/package the extension.
+5. Use the VS Code self-test fixture with two repositories and multiple worktrees/sessions.
+6. Keep feature default off until every blocking test passes.
+
+### Required extension checks
+
+From `packages/kilo-vscode/`:
+
+```sh
+bun run format
+bun run format:check
+bun run typecheck
+bun run lint
+bun run test:unit
+bun run knip
+bun run check-kilocode-change
+bun run compile
+```
+
+From repository root:
+
+```sh
+bun run script/check-opencode-annotations.ts
+bun run script/check-opencode-promise-facades.ts
+bun run script/check-md-table-padding.ts
+```
+
+### Manual scenarios
+
+1. Flag off: current single-project Agent Manager is unchanged.
+2. Enable flag in Experimental Settings; restart; value persists without CLI/project config changes.
+3. Add/trust/expand two repositories; restart; pinned remains first.
+4. Both projects show Local, worktrees, sessions, stats, PR state, and full actions.
+5. Navigate previous/next across projects.
+6. Create/delete/rename worktrees in both projects.
+7. Send prompts and answer permission/question requests in both projects.
+8. Share/unshare B while A is active; exact B directory is used.
+9. Load Project Settings A, activate B, save A; B is unchanged.
+10. Modify A config externally while draft is dirty; conflict preserves draft.
+11. Indexing defaults off for a new project; enabling A does not enable B; repo config cannot enable either.
+12. Disable flag while B is active; pinned Local becomes active and B remains registered/suspended.
+13. Repeat key routing and identity checks in a remote VS Code window.
+
+## Rules for the implementation model
+
+- Work on one slice at a time.
+- Read the referenced architecture section before editing.
+- Add focused tests before or with behavior changes.
+- Use `apply_patch` for manual edits.
+- Do not hand-edit generated SDK files.
+- Do not raise file-size caps.
+- Do not add fallback compatibility code unless the plan explicitly requires the single-project adapter.
+- Do not claim a slice complete until its stop gate passes.
+- If a required API or ownership decision is missing, stop and update this plan instead of guessing.
diff --git a/.kilo/plans/agent-manager-multi-project-runtime.md b/.kilo/plans/agent-manager-multi-project-runtime.md
new file mode 100644
index 0000000000..25bb0d9e07
--- /dev/null
+++ b/.kilo/plans/agent-manager-multi-project-runtime.md
@@ -0,0 +1,351 @@
+# Agent Manager multi-project runtime
+
+> UI architecture update: the active-body plus background-summary model in this document is superseded by `agent-manager-multi-project-uniform-ui.md`. The runtime findings remain useful, but the final UI renders one permanent real interactive body for every expanded project and requires strict project-qualified routing before background actions are enabled.
+
+**Status:** Runtime foundation implemented (this worktree); accordion UI pending
+
+## Implementation status (2026-07-20)
+
+Landed in this worktree, all covered by unit tests (`tests/unit/agent-project-*.test.ts`):
+
+- `src/agent-manager/project-paths.ts` — canonical root resolution (`realpath` + `normalizePath`), case-aware `samePath`, deterministic `projectIdFor(root)` (sha1, stable across restarts), `resolveGitRoot`.
+- `src/agent-manager/project-registry.ts` — versioned global catalog of **additional** projects (storage-injected, corrupt-safe, dedupe by id, trust/label/order). The pinned workspace project is never persisted.
+- `src/agent-manager/project-context.ts` — immutable `ProjectContext` (owns WorktreeStateManager/WorktreeManager/SetupScriptService/stale set per canonical root, lazy creation, peek accessors) and `ProjectContexts` coordinator (pinned derivation, active/expanded lifecycle, trust+flag gating, `syncPinned()` for workspace changes, webview `ProjectSnapshot`s).
+- `src/agent-manager/project-messages.ts` — vscode-free handlers: `requestProjects`, `addProject` (folder picker → git root resolve → dedupe), `removeProject`, `selectProject`, `setProjectExpanded`, `trustProject`. All fail closed when the flag is off.
+- `src/agent-manager/project-wiring.ts` — factory assembling registry/contexts/deps/host listeners (extracted to keep `AgentManagerProvider.ts` under its 2000-line cap).
+- `AgentManagerProvider` — fields `state/worktrees/setupScript/staleWorktreeIds` replaced by context-backed getters; every existing handler now operates on the active project with zero per-handler changes. `onMessage` consumes project messages first and drops messages whose `projectId` mismatches the active project (stale-pane protection). `activateProject` re-runs `initializeState` for the new context; pollers/importer/run/terminal follow the active context through the existing getters. `agentManager.state` now carries `projectId`.
+- Protocol — `agentManager.projects` out-message (`multiProject` flag + `ProjectSnapshot[]`); new in-messages listed above; `projectId?` on `agentManager.state` and `createWorktree`. Webview type mirrors updated (`webview-ui/src/types/messages/{extension,webview}-messages.ts`).
+- Host — `pickFolder`, `multiProject`, `readProjects`/`writeProjects` (globalState key `agentManager.projects`), `onDidChangeWorkspaceFolders`, `onDidChangeMultiProject`.
+- Setting — `kilo-code.new.agentManager.multiProject` (boolean, default false, application scope).
+- Changeset — `.changeset/agent-manager-multi-project.md`.
+
+Behavior with flag off: only the pinned workspace project exists; snapshots contain exactly one project; all registry data is preserved but hidden; no UI change.
+
+## Remaining for the UI session (accordion)
+
+- Project accordion rendering from `agentManager.projects`: header-only rows for collapsed/uninitialized projects (registry metadata only), full existing Local/worktree body for the active project, expanded non-active bodies from per-context state (extension must push per-context state with that context's `projectId` — currently `pushState` only pushes the active context).
+- Add-project entry point, trust CTA (sends `agentManager.trustProject` then expand/select), remove/rename in project menu.
+- `selectProject` before any repo action in a non-active project; send `projectId` on `createWorktree` (extension drops mismatches).
+- New Worktree dialog project selector (defaults to active project).
+- Extension follow-ups: hidden-cadence polling for expanded projects; session-owner index so Local sessions of project B open/share correctly even while A is active (currently Local sessions resolve through the active root — acceptable only while the UI activates before opening).
+- Implemented: per-context `pushState` for expanded non-active projects; per-project git stats/PR pollers (`ProjectPollers` in `project-pollers.ts`) so every expanded accordion receives live stats/PR data tagged with its projectId; webview `project-live.ts` store routing per-project payloads into per-project summary stores; `activate()` keeps the previously active project expanded.
+- Known boundary: `KiloProvider.projectID` and session refresh remain single-project; cross-project SSE filtering by session→directory owner is a follow-up (see "Verified findings" below).
+
+## Objective (original)
+
+Build the project-aware Agent Manager runtime before changing the UI. The eventual UI is a pinned current-project view plus lazily initialized additional project accordions, with one shared tab/detail area. The first backend slice must be mergeable with the flag disabled and must route today's single project through the same project-aware contracts that secondary projects will use.
+
+The implementation must preserve these invariants:
+
+- The first project is always the canonical Git root of the first VS Code workspace folder in the current window. It is derived at runtime, is always first, and cannot be removed or replaced by persisted state.
+- Global extension storage contains only the catalog of additional projects and project-list UI metadata. Each repository remains authoritative for its own `.kilo/agent-manager.json`.
+- A collapsed, never-opened additional project causes no `.kilo/agent-manager.json` read, Git mutation, setup/run initialization, terminal creation, or poller subscription.
+- Every session/worktree/draft operation has a project identity internally. Once secondary-project activation is enabled and more than one project is exposed, missing or mismatched identity is rejected rather than routed to the current workspace.
+- The feature flag gates catalog exposure, secondary activation, and multi-project wire/UI behavior. It does not select a separate legacy implementation.
+
+## Verified findings
+
+- `AgentManagerProvider` currently owns the panel and all repository-bound resources in one 1,941-line singleton. Its root is always `Host.workspacePath()` and its state/managers are lazily cached against that root (`packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts:56-212`, `1654-1695`). The architecture test caps this file at 2,000 lines and explicitly forbids raising the cap (`packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts:793-854`).
+- Opening the panel immediately initializes the current repository, performs `ensureGitExclude`, loads `.kilo/agent-manager.json`, discovers/restores worktrees, registers sessions, starts state-dependent behavior, and recovers prompts (`AgentManagerProvider.ts:267-360`). This whole sequence cannot run for a collapsed catalog entry.
+- `WorktreeStateManager` is correctly repository-scoped by constructor root and writes only `<root>/.kilo/agent-manager.json` (`WorktreeStateManager.ts:100-124`, `632-656`, `797-847`). Its save queue and `flush()` are suitable for a context shutdown barrier, but it has no cancellation/dispose primitive (`755-795`).
+- The embedded Agent Manager `KiloProvider` is one provider attached to the one panel/webview (`agent-manager/vscode-host.ts:67-169`). It already routes many SDK calls through a session-to-directory map, but local sessions are allowed to fall back to `workspaceFolders[0]` (`KiloProvider.ts:4343-4378`; `kilo-provider-utils.ts:319-345`). That fallback becomes a cross-project write risk.
+- `KiloProvider` has singleton project state (`projectID`, `currentSession`, project-scoped caches, one active project directory) and current session refresh treats all extra directories as worktrees of one canonical project (`KiloProvider.ts:344-359`, `1984-2029`; `kilo-provider-utils.ts:230-295`). It is not multi-project-correct without refactoring.
+- The shared backend and generated SDK support an explicit `directory` on session share and unshare (`packages/sdk/js/src/v2/gen/sdk.gen.ts:4733-4795`). Sharing must therefore use the same project/session route as prompts and transcript reads.
+- Backend session IDs are high-entropy process-global IDs (`packages/opencode/src/id/id.ts:1-17`, `23-33`, `42-49`). Raw IDs can remain the SDK/server identifier, but the UI/runtime identity still needs a project-qualified reference, and route registration must reject an observed cross-project collision.
+- `session.status` currently discards the SSE directory before invoking branch naming (`AgentManagerProvider.ts:204-220`). The orchestration bridge subscribes globally and rejects requests outside its root (`orchestration-bridge.ts:175-203`). Creating one unchanged bridge per project would let the wrong bridge reject a valid request before the correct project handles it.
+- Multiple `SessionTerminalManager` instances would each register the same global VS Code commands and terminal listeners (`SessionTerminalManager.ts:35-81`). It must remain panel/coordinator-owned, with project-qualified keys and explicit CWDs. Also, `TerminalRouter` currently falls back from an unknown worktree ID to the repository root (`terminal-routing.ts:120-130`), which must be removed in strict routing.
+- `VscodeHost.workspacePath()` uses `workspaceFolders[0]` (`vscode-host.ts:172-174`; `review-utils.ts:12-15`). It loses URI scheme/authority, and `openFolder` recreates paths with `Uri.file`. A catalog containing only path strings would be unsafe across local, SSH, container, and other remote extension hosts.
+- Existing Kilo experimental config is CLI/project config, not an application feature-flag service (`features.ts`; `webview-ui/src/types/messages/config.ts`). A multi-project bootstrap flag cannot be project-scoped because choosing which project config to read is the behavior being gated.
+
+## Architecture decisions
+
+### 1. Project identity and registry semantics
+
+Add a VS Code-free `ProjectRegistry` backed by an injected storage and resolver interface. `vscode-host.ts` implements those interfaces using `ExtensionContext.globalState`, workspace/open-dialog URIs, filesystem canonicalization, and Git.
+
+Use these core types in `src/agent-manager/project.ts`:
+
+```ts
+type ProjectId = string
+
+interface ProjectLocation {
+  uri: string
+  scheme: string
+  authority: string
+  root: string
+  commonGitDir: string
+}
+
+interface ProjectDescriptor extends ProjectLocation {
+  id: ProjectId
+  name: string
+  pinned: boolean
+  collapsed: boolean
+  order: number
+  status: "unverified" | "ready" | "missing" | "notGit" | "wrongAuthority"
+}
+```
+
+`root` is the canonical filesystem Git toplevel. Resolve it only when deriving the pinned project, adding a project, or expanding an unverified project:
+
+1. Start from the selected workspace/folder URI.
+2. Reject a URI whose scheme/authority is not the current extension-host scope.
+3. Run `git -C <fsPath> rev-parse --show-toplevel` through the existing hidden-window process wrapper.
+4. Resolve the result with `fs.promises.realpath`; normalize separators, trailing separators, and Windows case for identity comparison.
+5. Resolve and canonicalize `git rev-parse --path-format=absolute --git-common-dir` as `commonGitDir`.
+6. Derive `ProjectId` deterministically as a versioned SHA-256/base64url hash of `scheme + NUL + authority + NUL + normalized canonical root`. Do not expose a path-concatenated ID on the wire.
+
+Different linked worktree roots have different project IDs, but the first iteration must reject adding a project whose canonical `commonGitDir` matches any project already exposed in the window. Two Agent Manager contexts mutating the same Git common directory would bypass the current root-keyed worktree lock and could manage the same branches twice. This is a product-valid restriction to distinct Git projects, not a path workaround. Also change `WorktreeManager`'s write-lock key to canonical `commonGitDir` so future relaxation does not reintroduce `index.lock` races.
+
+Persist one unsynced global-state value under `kilo.agentManager.projects.v1`:
+
+```ts
+interface StoredProjectCatalogV1 {
+  version: 1
+  projects: Array<{
+    id: ProjectId
+    uri: string
+    scheme: string
+    authority: string
+    root: string
+    commonGitDir: string
+    name?: string
+    collapsed: boolean
+    order: number
+    addedAt: string
+  }>
+}
+```
+
+Do not call `setKeysForSync`; machine/remote paths must not sync to other machines. Serialize mutations in-process. Each mutation re-reads the latest value, validates it, applies add/remove/reorder/metadata changes, and performs one `globalState.update`.
+
+Registry behavior is exact:
+
+- `snapshot(flag)` derives the pinned current project fresh. It never reads a persisted active project.
+- The pinned descriptor is first, has `pinned: true`, and defaults to expanded. It is not written into the catalog.
+- Persisted entries matching the pinned project ID are suppressed, not deleted. They reappear as additional projects when another window has a different pinned project.
+- Additional entries are filtered to the current URI scheme/authority before exposure. Entries for other authorities remain untouched in storage.
+- Reading the catalog does not stat, realpath, run Git, or open per-repository state. Persisted additional entries start as `unverified`.
+- Adding validates/canonicalizes the chosen folder, rejects the pinned project, duplicate IDs, duplicate common Git directories, and authority mismatches, then persists it. A newly added project may be marked expanded and explicitly activated by the caller; listing alone never initializes it.
+- A missing or no-longer-Git root is marked unavailable only when expansion validates it. Keep the entry and its metadata. Do not prune it automatically and do not create a `ProjectContext`.
+- Removing is allowed only for non-pinned projects. It removes only the catalog entry after the context is idle/disposed; it never deletes `.kilo`, worktrees, sessions, branches, or shares.
+- On every extension/panel restart, the active selection is the pinned project's Local context. Persisted additional projects and collapse/order/name metadata survive, but a stale secondary active session does not override the current VS Code window.
+
+For a multi-root VS Code workspace, preserve current behavior by deriving the pinned project from `workspaceFolders[0]`, then canonicalize that folder to its Git toplevel. Do not silently select another workspace folder if the first is not a Git repository.
+
+### 2. Coordinator and immutable lazy ProjectContext
+
+Turn `AgentManagerProvider` into the panel-level coordinator and extract repository behavior into `project-context.ts`. Do not instantiate one current `AgentManagerProvider` per project.
+
+The coordinator owns:
+
+- the one panel and embedded `KiloProvider`/`SessionProvider`;
+- `ProjectRegistry`, active `ProjectId`, exposed descriptors, and `Map<ProjectId, LazyProjectContext>`;
+- a shared `Semaphore(3)` for Git/network polling across all projects;
+- the one project/session router;
+- one project-aware `AgentManagerVisiblePresence`;
+- one `SessionTerminalManager` and one project-aware `TerminalRouter`;
+- one global orchestration ingress and the global SSE/tool/status subscriptions;
+- project and activation generations used to discard stale async results.
+
+Each `ProjectContext` is constructed once with an immutable descriptor/root/common Git directory and owns only repository-bound resources:
+
+- `WorktreeStateManager`, `WorktreeManager`, `SetupScriptService`, and repository `GitOps`;
+- local diff functions, `WorktreeDiffController`, `WorktreeImporter`, and `RunController`;
+- `GitStatsPoller`, `PRStatusBridge`/poller, and `BranchNamingController`;
+- per-project cached state/stats/stale IDs, managed/open session refs, and initialization promise;
+- project-specific message handlers currently embedded in `AgentManagerProvider`.
+
+It does not own a webview, `KiloProvider`, VS Code terminal command registrations, global connection subscriptions, or a global orchestration subscription.
+
+Lifecycle:
+
+1. `cold`: descriptor only. No state manager, manager, poller, watcher, or per-repo read exists.
+2. `initializing`: one shared promise validates the location, constructs resources, performs the existing `ensureGitExclude -> state.load -> recoverWorktrees -> register routes` sequence, and captures a context generation.
+3. `ready/expanded`: posts project-stamped state and permits project actions. Pollers run only when both the panel is visible and this project is expanded. Multiple expanded contexts may be ready concurrently.
+4. `suspended/collapsed`: if active, the coordinator first activates pinned Local (or another explicit target). Stop stats/PR/diff polling and watchers, stop accepting new project mutations, wait for the current mutation barrier, flush state, and detach project-specific event side effects such as automatic branch naming. Keep validated session routes/tracking so a running backend session can still surface status and permission/question events without a repository read. Do not abort agents merely because an accordion collapsed.
+5. `disposed`: increment generation first, stop/dispose resources, await terminal-router/run/mutation cleanup and state flush, detach routes, then remove the exact context object from the map. Late completions may neither post nor mutate a replacement context.
+
+Expansion of a suspended context resumes its existing in-memory state and pollers; expansion of a cold context initializes. Concurrent expansions share the same promise. Collapse during initialization records the desired collapsed state, allows non-cancellable Git/state work to finish, suppresses stale posts, then immediately suspends.
+
+The coordinator routes global events by canonical event directory before invoking a context. `session.status` must retain its directory. A single orchestration ingress determines the one owning context and delegates there; it rejects an unknown directory once, globally. It must never create one rejecting bridge per project. A collapsed project does not auto-initialize in response to an unsolicited orchestration event; return a typed `project_inactive` result.
+
+Panel close keeps existing semantics for sessions actually opened/created by that panel, but aggregates their project-qualified routes before aborting. Project collapse and flag-off transitions do not abort them. Removing a project is refused while one of its tracked sessions or Agent Manager run/mutation is busy, rather than orphaning an interaction prompt.
+
+### 3. One embedded KiloProvider, made project-aware
+
+Use one embedded `KiloProvider`. Multiple providers are not safe or useful here:
+
+- there is one webview and one message handler;
+- each provider would own conflicting current-session/cached UI state and duplicate SSE handling;
+- multiple terminal/visibility registrations would be ambiguous;
+- it would not solve session identity at the shared webview boundary.
+
+Refactor its Agent Manager adapter around an injected project/session route service while leaving sidebar and standalone providers unchanged. The route service supplies:
+
+```ts
+interface ProjectSessionRef {
+  projectId: ProjectId
+  sessionId: string
+}
+
+interface SessionRoute extends ProjectSessionRef {
+  directory: string
+  generation: number
+}
+```
+
+Internally key UI maps by `projectId + NUL + sessionId`; never use that concatenation on the wire. Keep the raw `sessionId` for SDK calls and backend presence. Maintain a reverse raw-ID index only to process backend events. If the same raw ID is observed in two projects, mark it ambiguous and reject/drop operations and events that cannot also be disambiguated by event directory.
+
+Required routing changes:
+
+- Register an explicit route for every Agent Manager session, including Local sessions at a project root. Do not omit a map entry merely because it equals the first workspace root.
+- New/draft operations resolve from the outer project envelope and an explicit Local/worktree context. Unknown worktree IDs are errors; remove `TerminalRouter`'s fallback to root.
+- Existing session operations resolve only from `ProjectSessionRef`. In strict multi-project mode, an unknown session never falls back to `workspaceFolders[0]` or the currently active project.
+- Child/subagent sessions inherit the parent's project and directory. A directory-bearing event must also pass the owning-context check before registration.
+- Session list refresh runs per project root plus that project's worktree directories. It emits sessions stamped with that project; it does not infer one canonical `projectID` from the first root and merge all projects into it.
+- Replace singleton Agent Manager use of `KiloProvider.projectID` with the route table/directory ownership check. Keep existing project filtering for non-Agent-Manager provider instances.
+- On active-project/session change, call one `activateProject(projectId, root)` path. It updates `projectDirectory`, invalidates/refetches project-scoped config, providers, agents, commands, skills, MCP, indexing, sandbox, and Git status for that root. Guard every async refresh with activation generation so project A cannot populate caches after switching to B.
+- Every session create, continuation, prompt, permission/question response, terminal operation, diff operation, file/context operation, and share/unshare SDK call receives the resolved explicit directory.
+
+This picks up each secondary project's config naturally through the CLI's directory-scoped instance/config resolution. Do not copy provider/config/settings data into global storage.
+
+### 4. Project-qualified protocol and share semantics
+
+Define an internal/wire envelope in `agent-manager/types.ts` and mirror it in `webview-ui/src/types/messages/agent-manager.ts`:
+
+```ts
+interface ProjectStamp {
+  projectId: ProjectId
+  generation: number
+}
+
+interface ProjectEnvelope<T> {
+  type: "agentManager.projectMessage"
+  project: ProjectStamp
+  payload: T
+}
+```
+
+Use project-qualified references for sessions, worktrees, and drafts:
+
+```ts
+interface SessionRef { projectId: ProjectId; sessionId: string }
+interface WorktreeRef { projectId: ProjectId; worktreeId: string }
+interface DraftRef { projectId: ProjectId; draftId: string }
+```
+
+Raw IDs remain in each repository's existing state file. The repository/context supplies the project identity when state is loaded. Do not migrate session IDs into global state and do not permit moving an existing session record between projects. A future cross-project continuation must explicitly fork/create in the target project; relabeling a raw session is invalid.
+
+Protocol rules:
+
+- The coordinator is the only component that unwraps inbound envelopes and wraps context output.
+- Global catalog/route errors are global messages. Repository state, stats, session metadata, diff, run, PR, terminal, and chat messages are project envelopes.
+- Preserve `requestId` inside the payload. Return a typed route error (`project_required`, `project_unknown`, `project_inactive`, `project_mismatch`, `session_unknown`, or `session_ambiguous`) without forwarding the original message.
+- Validate the envelope project against the context, persisted session/worktree ownership, session route, and event/request directory. A valid raw ID in the wrong envelope is still rejected.
+- Outbound generation lets the webview/coordinator discard messages from a collapsed/disposed/replaced context.
+- While the flag is off, or while only the pinned project is exposed, a compatibility adapter wraps today's unqualified webview messages with the pinned project and unwraps pinned output to the existing shape. The core handlers still receive envelopes.
+- Once the flag is on and a second project is exposed, unqualified project/session/worktree messages fail closed. The multi-project UI must send/consume envelopes and use composite refs as tab/store keys.
+
+Sharing is an operation on `SessionRef`, not on a bare session ID:
+
+- Manual share calls `client.session.share({ sessionID, directory })`; unshare uses the exact same resolved route.
+- Automatic sharing remains a project config behavior because session creation is sent with the target project's directory.
+- Store no share URL or share state in the project catalog. Session list/get/update data remains authoritative and is enriched with `projectId` on output.
+- Removing/collapsing a project never unshares its sessions. A share URL is externally usable, but reopening or mutating the local session still requires its local project route.
+- A mismatched or missing project cannot share/unshare, even if the raw session ID happens to resolve elsewhere.
+
+### 5. Feature flag, restart, and migration behavior
+
+Contribute an application-scoped VS Code setting, default false, for example `kilo-code.new.agentManager.multiProject`, with `scope: "application"`. Read it in the host/coordinator; do not put it in CLI `experimental` config.
+
+- Flag off: derive and initialize only pinned current project, use the compatibility wire adapter, and preserve the exact current view. Read but do not expose, validate, initialize, rewrite, or delete additional catalog entries.
+- Flag on: publish lightweight descriptors. Only explicit expansion initializes an additional project. Selecting Local/worktree also expands and initializes its owner before activation.
+- Runtime on -> off: increment activation generation, activate pinned Local, suspend all secondary contexts, switch to compatibility protocol, and preserve catalog/per-repo state. Do not abort backend sessions.
+- Runtime off -> on: expose stored descriptors as cold/unverified. Do not eagerly restore a persisted secondary active project.
+
+No `.kilo/agent-manager.json` schema migration is needed. Existing state is loaded unchanged by the pinned context, and additional contexts load their own existing files only when expanded. An absent catalog means no additional projects. Invalid catalog entries are ignored in the snapshot and logged, but a successful write must preserve valid entries from other authorities. Never scan the filesystem to discover projects as migration.
+
+On restored legacy panel/webview state, unqualified tabs are accepted only in compatibility single-project mode. When multi-project mode exposes a second project, send a protocol reset and rebuild tabs/session lists from project envelopes instead of guessing which project owns a restored raw session ID.
+
+Remote behavior:
+
+- Scope catalog exposure and identity by full URI scheme + authority, not `vscode.env.remoteName` alone.
+- Run Git and filesystem operations in the current extension host against `fsPath`; preserve the original URI for `openFolder` and picker operations.
+- Reject selection from another authority. Keep such stored entries for their matching window/host.
+- Unsupported virtual filesystems, missing roots, permission failures, and non-Git directories become unavailable descriptors after explicit validation. They do not fall back to the pinned root.
+
+## Ordered implementation plan
+
+### Slice A: mergeable routing foundation before multi-project UI
+
+This is the narrow first PR. It produces no secondary-project UI, but the current pinned project runs through the durable identity/routing contracts and the registry is fully tested.
+
+1. Add `src/agent-manager/project.ts` with IDs, locations, descriptors, stamps, envelopes, and ref types. Add `src/agent-manager/project-registry.ts` with injected storage/resolver, v1 schema validation, pinned merge, authority filtering, dedupe, and serialized mutations.
+2. Extend `Host` in `src/agent-manager/host.ts`; implement global-state storage, canonical Git/URI resolution, pinned project resolution, and the application flag in `src/agent-manager/vscode-host.ts`. Preserve URIs in `openFolder`. Add the setting contribution in `packages/kilo-vscode/package.json`.
+3. Add `src/agent-manager/project-session-router.ts`. It must register Local and worktree routes, resolve refs/directories, inherit child routes, validate directory ownership, detect raw-ID ambiguity, and implement compatibility versus strict mode.
+4. Add envelope/route errors to `src/agent-manager/types.ts` and the mirrored webview type file. Add a coordinator adapter in `AgentManagerProvider` that derives the pinned project at panel attach, wraps all legacy inbound messages, stamps context output, and switches strictness based on exposed-project count. In this slice only the pinned context is activated, so rendered behavior remains unchanged.
+5. Extend the `SessionProvider` adapter (`host.ts`, `vscode-host.ts`) with project-aware `setSessionRoute`, `trackSession`, `getSessionInfo`, `loadMessages`, `share`, and `unshare` methods. Retain temporary legacy methods only as single-project adapters, not as a second implementation.
+6. Modify `KiloProvider`, `kilo-provider/options.ts`, and the extracted helpers in `kilo-provider-utils.ts` so Agent Manager Local sessions also have explicit routes, unknown strict routes fail closed, child routes inherit project identity, and project activation invalidates project-scoped cache work by generation. Keep non-Agent-Manager provider behavior unchanged.
+7. Update `extension.ts` auto-approve/session-directory lookup to ask the router/coordinator for the active or unique `SessionRef`; do not merge raw ID maps and choose the first match.
+8. Remove unknown-worktree-to-root fallback in `terminal-routing.ts`, and inject the pinned project root into `createTerminalHost` instead of reading `workspaceFolders[0]` internally.
+
+Slice A is complete when the flag-disabled Agent Manager is visually and behaviorally unchanged, every current project session has an explicit project route, and unit tests prove a second registered route cannot be accidentally handled through pinned-root fallback. Do not expose Add Project until Slice B is complete.
+
+### Slice B: lazy multi-context runtime, still before UI rendering
+
+1. Add `src/agent-manager/project-context.ts` and move root-bound state/managers/handlers out of `AgentManagerProvider`. Keep context code VS Code-free. Reduce the provider cap to the new rounded-up line count instead of raising it.
+2. Make `AgentManagerProvider` the coordinator described above. Add cold/initializing/ready/suspended/disposed state, generation guards, expansion/activation APIs, shared semaphore, and per-project message dispatch.
+3. Refactor status/tool/orchestration subscriptions so the coordinator routes once by project/directory. Do not retain per-context global subscriptions that can reject each other's requests.
+4. Make terminal management panel-global and key mappings by composite session/worktree refs. A context supplies only an already-validated CWD. Ensure context collapse cannot switch to another project's terminal by raw ID.
+5. Refactor session refresh to accept one project at a time and emit project-stamped results. Register routes for discovered Local sessions before they can be opened. Preserve failed-directory session IDs only within the affected project.
+6. Change `WorktreeManager`'s mutation lock key to canonical common Git directory and reject adding another exposed context with the same common directory.
+7. Add backend catalog commands (`requestProjects`, `addProject`, `removeProject`, `expandProject`, `collapseProject`, `activateProject`) behind the flag. These are testable protocol endpoints but need not yet have visible controls.
+
+### Slice C: first usable flagged UI
+
+After A and B are green, implement project accordions and the project selector in the New Worktree modal. Keep the current markup/layout when only the pinned project exists. Use composite refs in webview stores/tabs, one shared tab bar/detail pane, and clearly show the project name on cross-project session tabs and share actions. This UI slice is intentionally outside the backend-first scope.
+
+## Exact tests
+
+Add or update these focused tests under `packages/kilo-vscode/tests/unit/`:
+
+- `agent-manager-project-registry.test.ts`: pinned project is always first/fresh; persisted active cannot replace it; additional roots survive restart; pinned duplicate is suppressed; add canonicalizes subdirectories/symlinks; duplicate root/common Git dir and wrong authority are rejected; flag-off snapshot exposes only pinned without mutating catalog; catalog listing performs no resolver/filesystem calls; missing entries remain stored.
+- `agent-manager-project-router.test.ts`: every Local/worktree session has a route; matching refs resolve; wrong project, unknown session, unknown worktree, missing project, and raw-ID collision fail closed; child inherits parent project/directory; compatibility inference works only for one exposed project; share and unshare use the same explicit directory.
+- `agent-manager-project-context.test.ts`: collapsed cold projects construct/read nothing; concurrent expand initializes once; two expanded contexts use separate state roots and share the concurrency gate; collapse stops pollers and flushes; collapse during init suppresses posts; disposed-generation results cannot update a replacement context; remove is blocked while busy.
+- Extend `kilo-provider-session-refresh.test.ts`: lists per project instead of merging project roots; outputs project stamps; failed worktree listing preserves only that project's sessions; activation generation drops stale config/session results.
+- Extend `kilo-provider-worktree-context.test.ts`: strict unknown session/worktree has no workspace fallback; Local routes explicitly resolve to their own project root; a secondary Local session cannot resolve to pinned root.
+- Extend `AgentManagerProvider.spec.ts`: single-project legacy messages are wrapped pinned; two-project unqualified messages return `project_required`; mismatched session/project returns `project_mismatch`; status/tool events dispatch by directory; restart selects pinned Local.
+- Add terminal routing coverage: unknown project/worktree produces an error and no PTY/VS Code terminal; identical raw session IDs in different projects cannot select the wrong terminal.
+- Extend `agent-manager-arch.test.ts`: new domain modules do not import `vscode`; lower `AgentManagerProvider.ts` maxLines after extraction.
+
+Run from `packages/kilo-vscode/` after each slice:
+
+```sh
+bun test tests/unit/agent-manager-project-registry.test.ts tests/unit/agent-manager-project-router.test.ts tests/unit/kilo-provider-session-refresh.test.ts tests/unit/kilo-provider-worktree-context.test.ts
+bun run typecheck
+bun run lint
+bun run test:unit
+bun run knip
+bun run check-kilocode-change
+```
+
+For Slice B, add the context/provider/terminal tests to the focused first command. No CLI/SDK regeneration is required because this architecture uses existing explicit-directory SDK parameters and adds only extension/webview protocol types.
+
+## Manual validation after the UI slice
+
+1. With the flag off and a non-empty stored catalog, restart VS Code. Agent Manager must look and behave exactly as today and use only the current window's Git root.
+2. Turn the flag on, add a second repository, restart, and verify its header persists while the pinned current project remains first and active. Confirm the collapsed second project creates no output/state access/poll traffic until expanded.
+3. Expand both projects, open Local and worktree sessions from each, switch rapidly, send prompts, answer permission/question requests, open terminals/diffs, and share then unshare. Verify every operation affects the displayed project's repository and config.
+4. Disable the flag while a secondary project is active. Verify pinned Local becomes active, secondary state remains on disk/catalog, and re-enabling restores the descriptor without eager initialization.
+5. Rename/remove a cataloged directory and restart. Verify the project remains as unavailable, cannot route actions to pinned root, and can be removed without touching its repository state.
+6. Repeat in a remote window. Verify local/other-authority catalog entries are hidden but preserved and folder opening retains the remote URI authority.
+
+## Risks and rollback
+
+- The largest correctness risk is a hidden workspace-root fallback in `KiloProvider` or a helper. Treat every Agent Manager method that accepts `sessionID`, `worktreeId`, `draftID`, `requestID`, or directory as part of the routing audit. Tests should fail if strict mode calls `workspaceFolders[0]` for an identified operation.
+- Project-scoped KiloProvider caches can show stale settings after a rapid project switch. Activation generation checks are required before posting and before replacing caches; merely cancelling transcript load is insufficient.
+- Global event consumers can race. There must be exactly one ownership decision for orchestration/tool events, and directory must be retained for status/permission/question handling.
+- Multiple contexts increase polling/process pressure. Share the concurrency semaphore, gate all pollers by panel visibility and expansion, and suspend on collapse/flag-off.
+- Global-state updates from separate VS Code windows do not provide a transactional CAS. The first iteration should re-read before each serialized mutation and tolerate another window appearing after reload; do not build a filesystem lock or custom database for this feature.
+- Rollback is safe: turn off the application flag. The pinned path and existing `.kilo/agent-manager.json` format remain intact, while the unused global catalog is preserved for a later re-enable.
diff --git a/.kilo/plans/agent-manager-multi-project-shipping-gaps.md b/.kilo/plans/agent-manager-multi-project-shipping-gaps.md
new file mode 100644
index 0000000000..8301929bbd
--- /dev/null
+++ b/.kilo/plans/agent-manager-multi-project-shipping-gaps.md
@@ -0,0 +1,210 @@
+# Agent Manager Multi-Project — Shipping Gaps
+
+Status as of 2026-07-27. The multi-project sidebar renders and works end to end in the
+self-test harness (both projects list worktrees/sessions/sections, section creation
+persists, worktree delete works, project switching restores selection, live session
+upsert verified). Full unit suite green (3444 pass / 0 fail), typecheck, lint, knip,
+arch caps all pass. Everything is uncommitted in the worktree.
+
+This document lists what is still missing, ranked by whether it should block shipping.
+
+Two audiences matter for the blocking decision:
+
+- **All users**: the branch changes shared surfaces (legacy sidebar refactor, config
+  write path, indexing consent, pollers). Regressions here ship to everyone, flag off
+  or not.
+- **Experimental users**: multi-project mode is gated behind
+  `kilo-code.new.experimental.multiProject`, default off. Rough edges here are
+  acceptable if they cannot corrupt data.
+
+---
+
+## 1. Blocks shipping (all-user surfaces)
+
+### 1.0 Empty-state skeleton regression (fixed, must stay fixed)
+
+`initializeState` and `onRequestState` only called `refreshSessions()` when the
+managed state contained at least one session. With zero managed sessions the
+backend listing never ran, `sessionsLoaded` never reached the webview, and both
+the WORKTREES and SESSIONS sections stayed on skeletons forever (the worktree
+gate requires `worktreesLoaded() && sessionsLoaded()`). Any user whose state file
+lost its sessions — exactly what the earlier session-persist bugs caused — hit a
+permanently empty-looking sidebar. Reproduced in the harness on a worktree-root
+workspace and fixed by making both refreshes unconditional. Root-caused via
+stage-by-stage init logging on 2026-07-27; do not reintroduce a content-based
+guard here.
+
+### 1.1 Config write path can fail or wipe drafts for existing callers — P0-6 / P1-7
+
+The config binding rework requires every `updateConfig` sender to carry a binding id,
+and `configUpdateFailed` currently wipes the draft for the failed scope. Any existing
+sender without a binding (permission dock, model picker, auto-approve, onboarding)
+now fails or loses the user's unsaved edits.
+
+- Backend half is done: `expected` is optional in the overlay schema, writer, and
+  handler, so a client without a binding writes unconditionally again instead of
+  getting a 400. The webview half (draft retention on `configUpdateFailed`, and the
+  audit of every `updateConfig` sender) is still open.
+- Work: the code change is small; the real work is auditing every webview
+  `updateConfig` sender and classifying it.
+- Also: this change is orthogonal to multi-project. Split it into its own commit
+  (`feat(vscode): config write revision bindings`) so it can be reverted alone.
+
+### 1.2 Indexing status read silently revokes consent — P0-3 / P0-4
+
+Partially addressed: untrusted projects are now filtered out of the consent list
+(P0-4), and config scope switching plus project-scoped `indexing.enabled` writes
+were restored after the rework had hardcoded the tab to global scope (the earlier
+P1-8 gap). The remaining blocker is the read path below.
+
+
+`fetchAndSendIndexingStatus` issues `PUT /indexing/consent` (a write) on a plain
+status refresh, defaulting to `enabled: false` for any project not in local
+`globalState`. On a fresh machine/profile, the first status read turns indexing off
+for users who had it on. A refresh can also target the wrong project
+(`requestIndexingStatus` resolves from the current session's directory). Separately,
+the Indexing tab lists untrusted projects and would let a user enable indexing for a
+repo the trust system has not approved.
+
+- Fix: read status with a GET; PUT only from the explicit setter; seed consent from
+  the effective config on first read instead of defaulting false; require an explicit
+  project on refresh; filter the project list to trusted projects.
+- Dependency: needs a read-only status endpoint. If none exists, this escapes into
+  `packages/opencode` (shared upstream code, needs `kilocode_change` markers) or the
+  cloud repo.
+- Also orthogonal to multi-project; split into its own commit
+  (`feat(vscode): per-project indexing consent`).
+
+### 1.3 Land the current work as separate, revertable commits
+
+Everything currently sits uncommitted in one worktree. The review's recommendation
+stands: `git reset --soft origin/main` and stage by path into three commits —
+multi-project, config bindings, indexing consent. The multi-project commit message
+must not promise per-project config/indexing behavior that lands in the other two.
+
+---
+
+## 2. Should fix soon after (experimental surface, data-integrity relevant)
+
+### 2.1 Same repo can register twice — P0-5
+
+`projectIdFor` hashes the canonical path verbatim while `samePath` folds case, so two
+casings of one repo produce two project ids, two contexts, and two state managers
+racing to write the same `.kilo/agent-manager.json` (last write wins, worktrees and
+sessions vanish).
+
+- Fix: fold case inside `projectIdFor` on darwin/win32; reject `addProject` when
+  `samePath` matches any registered root.
+- Migration: existing registry keys were built from the old hash, so re-key them on
+  load or dual-lookup on read. Note `canonicalizePath` already realpaths existing
+  paths; the fallback branch must fold case too.
+- Why not blocking: requires an unusual casing mismatch at registration time, and the
+  feature is flag-gated.
+
+### 2.2 Route service is shared across panels but versioned per context — P0-7
+
+Two VS Code windows each have their own `ProjectContexts` with independent generation
+counters feeding one shared `ProjectRouteService`. Panel B registering a project at
+generation 0 while panel A is at 2 unregisters panel A's routes; closing one panel
+drops routes the other still needs.
+
+- Fix: panel-qualified keys (`panelId + projectId + sessionId`), generations issued
+  by the service, ambiguity computed across all panels.
+- Why not blocking: needs two windows running Agent Manager against the same repos.
+  The fallback already refuses ambiguous raw ids instead of resolving them wrong.
+- Note: no two-panel test harness exists today; this fix should create one.
+
+### 2.3 `gh pr` noise in repos without remotes — Bug 5
+
+`gh pr view` fails every 15s per worktree forever, logs before the dedupe, and
+`pollOnce` rejections are unhandled.
+
+- Fix: log after the `lastHash` dedupe; `void this.pollOnce().catch(log)` in
+  `schedule`; per-root remote probe with a single error emission; skip PR pollers for
+  remote-less projects in `ProjectPollers.sync`.
+
+---
+
+## 3. UX papercuts in experimental mode (fix opportunistically)
+
+- **Legacy tabs orphaned on upgrade** (P1-1): `createLocalTabs` migrates persisted
+  `localSessionIDs` into a `single` bucket that `tabKey()` never reads once the
+  catalog arrives. Migrate `single` to the pinned project id on first state apply.
+- **`restoreProjectTarget` skips tab bookkeeping** (P1-3): a restored session has no
+  tab. Call `selectLocal()` first, add the tab, then select.
+- **`ensurePendingTab` runs before restore** (P1-4): switch adds a "New Session"
+  draft that restore may contradict. Move it after restore.
+- **Per-keystroke state saves**: `setActiveTarget` writes
+  `.kilo/agent-manager.json` on every selection change. Debounce or persist on
+  deactivation/dispose only.
+- **Untranslated Indexing tab strings** (P1-9), **unused-ish composite id schemes**
+  (P1-12), **stats messages tagged at emit time** (P1-14), **no presence sync for
+  background projects** (P1-15), **registry read cache** (P1-16/17), **realpath
+  syscall churn** (P1-18), **`resolveProjectRoot` process spawning** (P1-19).
+
+---
+
+## 4. Structural debt (schedule, don't block)
+
+### 4.1 Two sidebar implementations — Arch 1.1
+
+Tracked as #12685 (section parity) and #12686 (sidebar drag-and-drop).
+
+`AgentManagerApp` keeps the legacy `renderBody` (now `SidebarBody.tsx`) and
+`ProjectSidebarBody.tsx` as a reduced reimplementation. The reimplementation already
+caused one full outage of multi-project mode (missing `DragDropProvider` crashed the
+webview render). Missing versus legacy: worktree ordering, drag-and-drop reorder and
+move-to-section, grouping, busy/navHint/shortcut badges, section auto-rename, stats
+skeletons.
+
+- Direction: single-project becomes the degenerate case of multi-project (one
+  implicit pinned project, header row hidden), `SidebarBody.tsx` is deleted.
+- Do this last: it churns the same message-stamping code as 2.2, needs per-project
+  DnD state, and must keep legacy pixel-identical for the default-off population.
+  Use the visual-regression skill to cover both modes before merging it.
+
+### 4.2 Ambient project scope via AsyncLocalStorage — Arch 1.3
+
+`ProjectScope` plus the `this.state`/`this.context` getters make the target project
+invisible at call sites; any continuation escaping ALS silently falls back to the
+active project. `provider-lifecycle.ts` shows the intended end state (explicit deps).
+Keep threading `ctx` explicitly into the remaining handler groups; add a dev-mode log
+in the `context` getter when a project-stamped message resolves without a scope.
+
+### 4.3 Per-project webview store — Arch 1.2
+
+`worktrees()`, `managedSessions()`, `selection()` etc. are single-valued with
+`memKey()`/`tabKey()` and two "current project" accessors that disagree during the
+switch window. Long-term: one `createProjectStore(projectId)` per project. For now
+the gating added to the remember effect contains the known race.
+
+---
+
+## 5. Verification gaps to close before the PR
+
+- **SSE session upsert** is unit-tested (`upsertSession`, `byDirectory`, fresh-skip
+  re-post) but not E2E-verified: the harness backend's basic-auth credentials could
+  not be re-extracted after a window reload, so external session creation was not
+  exercised live. Verify manually: `kilo` a new session in a registered repo from a
+  terminal and watch it appear in that project's sidebar.
+- **Tab isolation across projects** (per-project buckets) is unit-tested but not
+  E2E-verified with real sessions open in two projects.
+- **Legacy mode parity**: legacy sidebar and tab bar were smoke-tested (render,
+  select, section create + inline rename), but not the full matrix (delete, DnD
+  reorder, move-to-section, review tab, terminals). The extraction moved ~700 lines
+  of JSX; a visual-regression pass over `SidebarBody`/`TabBar` stories is the
+  cheapest safety net.
+- **Harness instability**: the isolated VS Code window crashed repeatedly during this
+  work. If it keeps failing on the next pass, say so in the PR rather than claiming
+  coverage that does not exist.
+
+---
+
+## Proposed landing sequence
+
+1. Quick independent fixes: 2.3 (gh noise), P0-4 (trust filter), 1.1's audit + 1.2's
+   fallback (config), 1.2's indexing read/write split if the GET endpoint exists.
+2. 2.1 (case-fold + registry migration).
+3. 2.2 (route service, with a two-panel test harness).
+4. 1.1's config/indexing commits split out and merged separately.
+5. Arch 1.1 (sidebar collapse) with visual-regression coverage; then the P1 batch.
diff --git a/.kilo/plans/agent-manager-multi-project-uniform-ui.md b/.kilo/plans/agent-manager-multi-project-uniform-ui.md
new file mode 100644
index 0000000000..5beb0e3ef2
--- /dev/null
+++ b/.kilo/plans/agent-manager-multi-project-uniform-ui.md
@@ -0,0 +1,740 @@
+# Agent Manager multi-project uniform UI architecture
+
+**Status:** Ready, corrected architecture; implementation pending
+
+**Date:** 2026-07-22
+
+This plan supersedes the active-body plus background-summary UI described in `agent-manager-multi-project-runtime.md`. The existing project registry, immutable project-root concept, per-project state payloads, and project-tagged stats work are useful foundations. The current read-only `ProjectSummary` and active-project dynamic getter routing are not the target architecture.
+
+Configuration reads, writes, scopes, drafts, trust, revisions, and release-blocking tests are specified canonically in [`agent-manager-multi-project-configuration.md`](./agent-manager-multi-project-configuration.md). If this plan and that document differ on configuration behavior, the configuration document wins.
+
+The step-by-step implementation sequence from the current branch is [`agent-manager-multi-project-implementation-handoff.md`](./agent-manager-multi-project-implementation-handoff.md). Implementers should follow that handoff slice by slice rather than treating this architecture document as an unordered task list.
+
+## Product requirement
+
+Every expanded project permanently renders the real existing Agent Manager sidebar UI:
+
+- the real Local card;
+- the real worktree cards, including their current menus and actions;
+- the real session list, which may initially use a simplified layout but must contain real live session data;
+- live git stats, PR state, run/setup state, stale state, and session state owned by that project.
+
+Selecting or interacting with a project may change the shared detail pane and top toolbar. It must not remove, replace, downgrade, or remount any expanded project body. There is no active-body versus background-summary rendering mode.
+
+The shared detail pane remains singular. The sidebar displays all expanded projects concurrently; the detail pane displays one selected project/local/worktree/session target at a time.
+
+## Architecture verdict on the current worktree
+
+The current implementation is a valid partial runtime foundation, but it is not safe to extend directly into fully interactive background cards.
+
+Keep and evolve:
+
+- `ProjectRegistry` and the pinned-workspace project concept;
+- immutable root ownership in `ProjectContext`;
+- `initContextState` extraction;
+- project-stamped state/stats/PR messages;
+- per-project webview stores;
+- reusable `WorktreeItem`, `SectionHeader`, `WorktreeSectionActions`, and `UnassignedSessionsSection` components;
+- the application-scoped feature flag.
+
+Replace or refactor before exposing interactive multi-project UI:
+
+- delete `ProjectSummary`; do not add more behavior to it;
+- remove the rule that only `project.active` renders `renderBody()`;
+- stop routing normal actions through `contexts.active()` and optional `projectId`;
+- replace raw session/worktree/local UI keys with project-qualified references;
+- replace the active singleton poller plus background poller split with uniform context-owned polling;
+- make context initialization, mutation, suspension, and disposal explicit and generation-guarded;
+- make the one embedded `KiloProvider` project/session-route aware.
+- separate activation-bound runtime config from the Settings editor's immutable read/write binding.
+
+## Core model
+
+### Project identity
+
+A project is one canonical Git repository root in the current extension host.
+
+```ts
+type ProjectId = string
+
+interface ProjectRef {
+  projectId: ProjectId
+}
+
+interface WorktreeRef extends ProjectRef {
+  worktreeId: string
+}
+
+interface SessionRef extends ProjectRef {
+  sessionId: string
+}
+
+type SidebarTarget =
+  | { projectId: ProjectId; kind: "local" }
+  | { projectId: ProjectId; kind: "worktree"; worktreeId: string }
+  | { projectId: ProjectId; kind: "session"; sessionId: string }
+```
+
+Raw backend and repository-local IDs remain unchanged. Composite references are required at every panel/runtime boundary so identical local sentinels, worktree IDs, section IDs, or session IDs cannot cross projects.
+
+Project identity must include the extension-host URI scheme and authority in addition to the canonical root. Adding a project must also resolve canonical `git-common-dir` and reject another exposed project sharing that common Git directory. Linked worktrees of one repository cannot be registered as independent projects in the first release.
+
+### Active project means detail selection only
+
+`activeProjectId` is not a rendering mode and not an implicit mutation target.
+
+It means:
+
+- which project owns the current shared detail/chat/diff/terminal pane;
+- which project the global top toolbar and global New Session/Run buttons target;
+- which project/worktree directory supplies runtime-effective Kilo configuration in the one embedded `KiloProvider`.
+
+It never selects a Settings write target. Settings bindings are explicit and remain unchanged when detail selection changes.
+
+Project expansion controls rendering. Every `project.expanded` project renders one stable `ProjectSidebarBody` keyed by `projectId`, regardless of active status.
+
+### Atomic selection
+
+Do not send `selectProject` followed by an unqualified worktree/session action. VS Code message handlers are asynchronous and are not a transaction queue.
+
+Use one atomic selection intent:
+
+```ts
+interface ActivateSelectionMessage {
+  type: "agentManager.activateSelection"
+  target: SidebarTarget
+}
+```
+
+The coordinator validates the project and target, ensures the context is ready, activates the project-specific Kilo route, then emits one project-qualified activation result. The sidebar body stays mounted; only shared detail state changes.
+
+Mutations that do not need the detail pane, such as rename, delete, section edits, run, setup, open window, PR actions, or worktree creation, execute directly against their explicit `ProjectRef` or `WorktreeRef`. They do not activate another project as a side effect.
+
+## Configuration architecture
+
+See [`agent-manager-multi-project-configuration.md`](./agent-manager-multi-project-configuration.md) for the complete contract.
+
+### Verified blocking failure
+
+The current config protocol is unsafe for multi-project use:
+
+- `KiloProvider.fetchAndSendConfig()` resolves a mutable current directory and emits one unqualified `configLoaded` value (`packages/kilo-vscode/src/KiloProvider.ts:2513`).
+- `ConfigProvider` owns one global/project/effective draft and sends an unqualified `updateConfig` (`packages/kilo-vscode/webview-ui/src/context/config.tsx:54`, `:243`).
+- `KiloProvider.handleUpdateConfig()` resolves `getWorkspaceDirectory()` again at save time (`packages/kilo-vscode/src/KiloProvider.ts:2982`). A draft loaded for project A can therefore be written to project B after detail activation changes.
+- The backend derives the project target from request directory and has no target or revision precondition (`packages/opencode/src/config/config.ts:944`, `packages/opencode/src/kilocode/config/config.ts:67`). Concurrent editors can overwrite one another, and a newly created higher-priority config file can redirect a pending write.
+- Hidden scope splitting currently writes `commit_message` and `indexing.enabled` to the project while most fields go global (`packages/kilo-vscode/webview-ui/src/utils/config-scope.ts:3`). The UI does not make this target choice explicit.
+- Project config writes also exist outside the save bar. In particular, provider disconnect can call `saveProject()` using the mutable provider workspace directory (`packages/kilo-vscode/src/provider-actions.ts:252`). Disabling only `handleUpdateConfig()` is insufficient.
+
+This is a release blocker, not a follow-up cleanup.
+
+### Product decision and staged order
+
+Preserve useful project-local editing such as `commit_message.prompt` and repository indexing rules. Indexing enablement is machine-local project consent, default off, and cannot be granted by repository config. Replace hidden active-directory targeting with explicit `User | Project` scope, a required Settings project selector for Project scope, an opaque immutable binding, and optimistic concurrency by target revision.
+
+Do not maintain one write model for flag-off mode and another for multi-project mode. Single-project mode uses the same explicit protocol, with a narrow adapter that injects the pinned `ProjectRef` for reads and open-file actions.
+
+### Separate runtime config from Settings editor config
+
+The current `ConfigProvider` conflates two different state machines. Split them:
+
+- **Runtime config** is read-only UI state for the selected detail/session route. It is keyed by `{ projectId, directory, activationGeneration }`, follows atomic detail activation, and drives chat, providers, agents, features, display, MCP, indexing, and sandbox behavior.
+- **Settings editor config** is a scoped layer editor keyed by an immutable binding. It never follows detail activation and its draft is never applied optimistically to runtime config.
+
+Use distinct messages. Names may follow repository conventions, but the fields and invariants are mandatory:
+
+```ts
+interface RuntimeConfigLoaded {
+  type: "runtimeConfigLoaded"
+  route: {
+    projectId: ProjectId
+    directory: string
+    activationGeneration: number
+  }
+  config: Config
+  features: FeatureFlags
+}
+
+type ConfigScope = "global" | "project"
+
+interface ConfigTarget {
+  scope: ConfigScope
+  path: string
+  revision: string
+  exists: boolean
+  writable: boolean
+}
+
+interface SettingsBinding {
+  id: string
+  connectionGeneration: number
+  scope: ConfigScope
+  project?: {
+    projectId: ProjectId
+    root: string
+    generation: number
+  }
+  directory: string
+  target: ConfigTarget
+}
+
+interface ReadSettingsConfig {
+  type: "settingsConfig.read"
+  requestId: string
+  scope: ConfigScope
+  projectId?: ProjectId
+}
+
+interface SettingsConfigSnapshot {
+  type: "settingsConfig.snapshot"
+  requestId: string
+  binding: SettingsBinding
+  preview?: {
+    projectId: ProjectId
+    root: string
+    generation: number
+    directory: string
+  }
+  targetConfig: Config
+  effective: Config
+  global: Config
+  project: Config
+  fields: Record<string, ResolvedConfigField>
+  collections: Record<string, ResolvedConfigField[]>
+}
+
+interface WriteSettingsConfig {
+  type: "settingsConfig.write"
+  requestId: string
+  bindingId: string
+  set: Partial<Config>
+  unset: string[][]
+}
+```
+
+For a global read, `projectId` is optional preview context used only to explain project shadowing. It never changes the global target. A project read requires `projectId` and always resolves the immutable `ProjectContext.root`, not the active worktree or session.
+
+For User scope, preview identity is presentation state, not part of the editable target identity. The controller keeps the global target binding and draft separate from the latest project preview. A clean preview change may replace both from one fresh snapshot. A dirty preview change updates only `preview`, effective/source metadata, and project raw data. It retains the original global target revision; if the fresh read reports a different global path or revision, mark the draft stale instead of silently rebasing it.
+
+`targetConfig` is the parsed raw content of the one file the API will patch. It is not the aggregate `global` or `project` layer. The form edits this raw target value so it never copies values inherited from another file into the target. The aggregate values remain in the snapshot solely for source, inheritance, and effective-preview UI. Existing JSONC comments remain server-side raw text and are preserved by patching; the webview does not round-trip serialized file contents.
+
+Parse `targetConfig` from raw JSONC without expanding `{env:}` or `{file:}` variables, so the Settings protocol never turns placeholders into secret values. If the exact target is syntactically or structurally invalid, return diagnostics and `writable: false` for form editing rather than treating it as `{}` and overwriting it. The recovery action is **Open file**. Source metadata must cover every path rendered by Settings, not only the current hand-maintained overlay field list.
+
+The extension owns an in-memory binding registry. Binding IDs are opaque, unpredictable, and scoped to one provider/webview lifecycle. The webview returns only `bindingId`, not a client-authoritative path or project envelope. On write the extension must:
+
+1. look up `bindingId` and reject unknown or expired bindings;
+2. verify that the project still exists, has the same context generation, and remains trusted;
+3. capture the stored binding before the first `await`;
+4. send the stored directory and expected target to the backend without calling `getWorkspaceDirectory()`, `contexts.active()`, or any fallback;
+5. route success or failure by `{ requestId, binding.id }` only.
+
+A binding expires after a successful save, backend reconnect, trust revocation, project removal, or context generation change. Success returns a new snapshot and binding. Cached snapshots are keyed by binding/scope/project identity; there is no singleton `cachedConfigMessage` for Settings.
+
+### Backend read/write and optimistic concurrency contract
+
+Evolve the Kilo-owned `/config/overlay` API rather than adding project identity to generic `Config.update`. The backend does not know Agent Manager `projectId`; it enforces the routed directory and filesystem target while the extension enforces project identity.
+
+`GET /config/overlay` continues to take explicit `directory` and `scope`, but returns:
+
+```ts
+interface ConfigOverlaySnapshot {
+  context: { directory: string; worktree?: string }
+  scope: ConfigScope
+  targetConfig: Config
+  effective: Config
+  global: Config
+  project: Config
+  sources: ConfigSource[]
+  targets: {
+    global: ConfigTarget
+    project: ConfigTarget
+    active: ConfigTarget
+  }
+  fields: Record<string, ResolvedConfigField>
+  collections: Record<string, ResolvedConfigField[]>
+}
+```
+
+The revision is a SHA-256 fingerprint of scope, canonical target path, existence marker, and exact file bytes. It is not an mtime. Exact bytes are required so comment-only JSONC edits and delete/recreate cycles with different content cause conflicts. The missing-file revision includes the intended canonical path. An ABA delete/recreate with identical bytes may retain the same revision; that state is content-equivalent and does not lose a user edit.
+
+`PATCH /config/overlay?directory=...` accepts exactly one scope per request:
+
+```ts
+interface ConfigOverlayWrite {
+  scope: ConfigScope
+  set?: Record<string, unknown>
+  unset?: string[][]
+  expected: {
+    path: string
+    revision: string
+  }
+}
+
+interface ConfigOverlayWriteResult {
+  outcome: "applied" | "applied_but_overridden"
+  changed: boolean
+  overriddenPaths: string[][]
+  snapshot: ConfigOverlaySnapshot
+}
+```
+
+The server performs the following transaction:
+
+1. Resolve the authoritative target from the routed instance directory and requested scope. Never accept `expected.path` as an arbitrary destination.
+2. Canonicalize and compare the resolved and expected paths. Reject a changed target, including a newly created higher-priority config file.
+3. Acquire a cross-process lock keyed by canonical target path. Project writes must use the same locking discipline already used for global config.
+4. Inside the lock, re-resolve the target, read exact bytes, recompute the revision, and reject a mismatch.
+5. Apply `set`/`unset` to the raw target layer, preserve JSONC comments where supported, validate the result, and atomically replace the target using a temporary file in the same directory. Do not expose a partially written config.
+6. Invalidate the affected config instances, reload the overlay, and return the authoritative post-write snapshot. Do not fabricate optimistic config if refresh fails.
+7. Emit a config event containing `scope`, routed `directory`, canonical `target`, and new `revision`. Global changes invalidate all runtime config caches; project changes invalidate only matching directory/project caches.
+
+`applied_but_overridden` is success. For each `set` leaf, the refreshed overlay identifies whether a higher layer still wins, such as project config shadowing a user value or managed/runtime config shadowing a project value. The UI keeps the saved value and explains why effective behavior did not change.
+
+Do not send global and project patches in one webview message or pretend that two files save atomically. User and Project scope maintain independent drafts and save independently. VS Code extension preferences such as autocomplete settings are a third, visibly separate store with their own request acknowledgements.
+
+Domain actions outside Settings must not perform client-side read-modify-write against a mutable effective config. Provider/custom-provider/work-style actions are User-global operations and should call either the same revision-aware User endpoint or a narrow backend mutation that merges named fields under the target lock. Permission Dock "always" rules remain a narrow global rule mutation tied to the exact pending request/session route; that session directory validates the request but does not select a project config target. All such mutations emit the revisioned config event, so a dirty Settings editor becomes stale rather than being overwritten.
+
+Expected typed failures are:
+
+- `unknown_project` or `stale_project_generation` from the extension;
+- `untrusted_project` or `workspace_untrusted` from the extension;
+- `binding_mismatch` or `binding_expired` from the extension;
+- HTTP 409 `config_target_changed` with the current target descriptor;
+- HTTP 409 `config_revision_conflict` with the current target descriptor and fresh snapshot when available;
+- HTTP 403 `config_target_not_writable` or project target escaping its trusted root;
+- HTTP 422 `config_invalid` with schema/parse details;
+- an I/O failure with no success acknowledgement.
+
+Every failure preserves the draft and names the scope/project/path. A config event is never treated as confirmation of the user's save; only a matching write response may clear that draft.
+
+### Draft and project-switch behavior
+
+- Detail activation from project A to B does not change the Settings selector, binding, values, draft, save state, or target.
+- A User Settings draft is global and survives all detail-project switches.
+- Project scope uses an explicit trusted project selector that never follows detail activation automatically.
+- On first open, the selector may initialize once from the pinned/selected project for convenience, but that choice is immediately captured as Settings state.
+- Choosing another Settings project with a dirty draft prompts `Save`, `Discard`, or `Stay`. Drafts are never carried to a different project.
+- Clean selector changes issue a new request and ignore out-of-order responses by `requestId`.
+- A save captures one binding. Switching visible settings while it is in flight does not redirect it; the result updates only the original binding store and identifies that target in its notification.
+- External config events refresh a clean binding. For a dirty or saving binding they mark it stale and show a changed-on-disk banner without replacing local edits.
+- A 409 preserves the draft and disables blind retry. The first version offers `Reload`, `Open file`, and `Discard`; it does not auto-merge or force overwrite. A future three-way merge may use the original snapshot, fresh snapshot, and draft.
+
+### Scope UX
+
+The first release presents explicit `User | Project` scope, a required selector in Project scope, source badges, and separate binding-keyed drafts. The selected scope applies to the entire operation. Remove hidden `splitConfigByScope`; no setting silently chooses a different file. Inherited user values remain visible in Project scope with `Override`/`Reset to inherited` affordances backed by `set`/`unset`.
+
+### Project root, worktree, and trust semantics
+
+- A Project Settings binding targets the registered checkout root held by `ProjectContext.root`. It never targets the last selected Local/worktree/session card.
+- Runtime config remains directory-correct: Local uses the project root, and a worktree session uses its exact routed worktree directory. Branch-specific config in a managed worktree can therefore differ at runtime.
+- Editing a project's root config does not claim to update already-created worktree checkouts. Editing a worktree config from Settings is out of scope for the first Project Settings release. A future worktree editor must use an explicit `WorktreeRef` and its own immutable binding.
+- The backend resolver may choose an existing root or `.kilo`/`.kilocode` config according to current precedence, but the expected target must remain within the trusted project checkout after canonical/symlink resolution. A symlink escape is read-only and must not be patched through the API.
+- For an existing target, canonicalize the file with `realpath`. For a missing target, canonicalize its nearest existing ancestor and append the remaining path components before checking containment. Global writes must similarly remain under the canonical `Global.Path.config` root. Do not rely on a lexical prefix check.
+- Additional Agent Manager projects must be registry-trusted before project overlay evaluation, opening/creating project config, or project writes. Global User Settings remain editable without trusting a project.
+- The pinned project is trusted for config evaluation only when the VS Code workspace is trusted. Do not treat `pinned` as an unconditional trust grant.
+- Trust is stored outside the repository in the extension registry/global state. A project config file cannot grant its own trust. Revoking trust invalidates all bindings and project runtime caches.
+
+### Concrete implementation sequence for config safety
+
+1. In `packages/opencode/src/kilocode/config/overlay.ts`, replace path-only targets with revisioned target descriptors and add generic changed-path source resolution.
+2. Add a Kilo-owned compare-and-swap writer under `packages/opencode/src/kilocode/config/` that resolves, confines, locks, fingerprints, patches, validates, and atomically replaces one target. Keep shared `packages/opencode/src/config/config.ts` changes to minimal marked delegation/invalidation hooks.
+3. Update `packages/opencode/src/kilocode/server/httpapi/groups/config-console.ts` and `handlers/config-console.ts` with the write precondition, result, and typed error contracts. Regenerate `packages/sdk/js/`.
+4. Extract a config binding controller under `packages/kilo-vscode/src/kilo-provider/` and have `KiloProvider.ts` delegate reads/writes to it. The controller receives explicit project-route resolution; it never reads mutable active workspace state during a bound operation.
+5. Replace `configLoaded`, `configUpdated`, and unqualified `updateConfig` in `webview-ui/src/types/messages/` with runtime and Settings message families. Keep a temporary single-project adapter only at the protocol edge.
+6. Split `webview-ui/src/context/config.tsx` into activation-bound runtime state and binding-keyed Settings editor state. Settings components consume the editor context; non-settings consumers continue to use runtime-effective config.
+7. Remove `webview-ui/src/utils/config-scope.ts` after migrating every control to explicit scope. Preserve explicit project editing for commit messages and repository indexing rules; move indexing enablement to machine-local project consent.
+8. Audit all extension config mutators and route user-config imports, resets, custom providers, work-style writes, project writes, and save-bar writes through a revision-aware endpoint or backend atomic field-level mutation. A project-sourced item must never fall back to an active directory write.
+9. Make open-file actions take `ProjectRef`, resolve `ProjectContext.root`, verify trust, and show the exact path. For a missing target, open an unsaved document at that explicit path or require an explicit create action; never create it merely by visiting Settings.
+10. Update config events and cache invalidation so scope/directory/revision are retained end to end.
+
+Focused tests belong in:
+
+- `packages/opencode/test/kilocode/server/config-overlay.test.ts` for raw target snapshots, target changes, 409 revisions, source shadowing, locks, symlink confinement, and response outcomes;
+- `packages/opencode/test/kilocode/project-config-update.test.ts` for target selection and atomic writes from repository roots/nested directories;
+- a new Kilo-owned backend unit test beside those files only if the compare-and-swap writer needs direct fault-injection coverage;
+- `packages/kilo-vscode/tests/unit/config-utils.test.ts`, replacing singleton `ConfigState` assumptions with binding/request-aware draft tests;
+- `packages/kilo-vscode/tests/unit/config-scope.test.ts`, deleted when `splitConfigByScope` is removed and replaced by tests proving one explicit scope per save;
+- Agent Manager route/context tests for immutable project-root resolution, trust revocation, removal, and generation changes;
+- KiloProvider protocol tests for A-to-B activation during reads and writes, out-of-order responses, cache partitioning, and auditing non-save-bar mutators.
+
+## One `.kilo/agent-manager.json` per project
+
+Yes, every project has its own repository-local state file:
+
+```text
+project-a/.kilo/agent-manager.json
+project-b/.kilo/agent-manager.json
+project-c/.kilo/agent-manager.json
+```
+
+This is already structurally supported because `WorktreeStateManager` derives its file from its immutable constructor root. The final architecture makes this ownership explicit and safe.
+
+### Ownership rules
+
+Each `ProjectContext` owns exactly one:
+
+- canonical repository root and canonical Git common directory;
+- `WorktreeStateManager(root)` writing only `<root>/.kilo/agent-manager.json`;
+- `WorktreeManager(root)`;
+- `SetupScriptService(root)` and project run service;
+- diff/import/branch-naming services;
+- git stats and PR pollers;
+- worktree/session/section/order/run/stale caches;
+- mutation queue and initialization promise.
+
+The global project registry stores descriptors only. It never stores worktrees, sections, sessions, tab order, or repository behavior. The pinned project is derived from the current workspace and remains outside the registry.
+
+### Initialization
+
+The first explicit expansion of a trusted project calls one single-flight `ensureReady()` promise:
+
+1. validate root and Git common directory;
+2. construct project-owned services;
+3. update that repository's local Git exclude;
+4. load only that repository's `.kilo/agent-manager.json`;
+5. discover and reconcile only that repository's worktrees;
+6. register Local and worktree session routes for that project;
+7. start context-owned polling if the project is expanded and the panel is visible;
+8. post one generation-stamped project snapshot.
+
+Repeated expansion must reuse the same initialization promise. Collapse/removal during initialization records the desired lifecycle transition and prevents late completion from posting or mutating a replacement context.
+
+### Writes and disposal
+
+All mutations for one project execute through that context's serialized mutation queue. An operation captures the context and generation before its first await and never re-resolves through `contexts.active()` afterward.
+
+Collapse:
+
+- leaves the project registered;
+- stops pollers/watchers after current operations reach a safe boundary;
+- flushes its own state file;
+- retains session routes required for already-running backend sessions;
+- never aborts a session merely because the UI collapsed.
+
+Removal:
+
+- never deletes `.kilo/agent-manager.json`, worktrees, branches, or sessions;
+- refuses removal while a project mutation/run requires ownership, unless an explicit coordinated shutdown is implemented;
+- awaits context disposal and state flush before deleting the registry descriptor;
+- invalidates context generation before awaits so late callbacks are ignored.
+
+Panel disposal awaits all initialized contexts before shared services are disposed.
+
+Two VS Code windows writing the same repository state file remain the same pre-existing concurrency boundary as today's single-project Agent Manager. This plan prevents one panel from creating two contexts for the same Git common directory; cross-window file coordination is not expanded in this feature.
+
+## ProjectContext lifecycle
+
+`ProjectContext` becomes a lifecycle owner rather than only a lazy service container.
+
+```ts
+type ProjectLifecycle =
+  | "cold"
+  | "initializing"
+  | "ready"
+  | "suspended"
+  | "disposing"
+  | "disposed"
+
+interface ProjectContext {
+  readonly id: ProjectId
+  readonly root: string
+  readonly commonGitDir: string
+  readonly generation: number
+  ensureReady(): Promise<ReadyProjectContext>
+  run<T>(operation: (ctx: ReadyProjectContext) => Promise<T>): Promise<T>
+  suspend(): Promise<void>
+  dispose(): Promise<void>
+}
+```
+
+Every async init, poll, mutation, diff, run, import, setup, PR update, branch naming, and session operation checks context identity and generation before committing state or posting to the webview.
+
+## Strict project-qualified protocol
+
+When multi-project mode exposes more than one project, every repository operation requires project identity.
+
+Required project qualification includes:
+
+- worktree create/delete/rename/import/order/section/open/PR actions;
+- Local and worktree session create/open/close/fork/promote/share/unshare actions;
+- prompt, abort, permission, question, command, sandbox, and context actions;
+- terminal create/input/resize/close/show actions;
+- diff/watch/apply/revert actions;
+- run/setup/configuration actions;
+- all state/session/diff/run/terminal/setup/PR output messages.
+
+Missing, unknown, mismatched, inactive-when-required, or ambiguous identities return a typed route error. They never fall back to the current project or `workspaceFolders[0]`.
+
+Single-project mode retains a narrow compatibility adapter that injects the pinned project identity. Core handlers always operate on explicit references.
+
+## One KiloProvider with a project/session route service
+
+Keep one embedded `KiloProvider`. Multiple providers would duplicate event handling, terminal registrations, caches, and current-session state for one webview.
+
+Add an Agent Manager route service:
+
+```ts
+interface SessionRoute extends SessionRef {
+  directory: string
+  generation: number
+}
+```
+
+It must:
+
+- register explicit routes for every Local session at its project root;
+- register every worktree session at its worktree path;
+- let child sessions inherit the parent route;
+- validate directory ownership;
+- detect ambiguous raw session IDs;
+- supply the exact directory to every SDK operation, including share/unshare;
+- remove current-root and workspace-root fallback for identified Agent Manager sessions;
+- refresh sessions independently for every initialized project and emit real project-stamped `SessionInfo` records.
+
+The shared detail pane consumes the selected `SessionRef`. Every sidebar body consumes its project's real session store. Background session UI may initially be visually simpler, but it must not display fabricated titles or placeholder session objects.
+
+Project activation in `KiloProvider` must invalidate and refresh project-scoped config, providers, agents, commands, skills, MCP state, indexing, sandbox state, and Git status under an activation generation guard.
+
+## Global services with composite keys
+
+Some services remain panel-global to avoid duplicate VS Code registrations, but all associations use composite references.
+
+- terminal mappings: `ProjectId + SessionId` or `ProjectId + WorktreeId`;
+- run state: keyed by `WorktreeRef`, including project Local;
+- visible/presence state: keyed by `SessionRef`;
+- tabs and sidebar selection: keyed by `SidebarTarget`;
+- diff/apply/revert state: keyed by `ProjectRef` and target;
+- pending setup/create/delete state: keyed by project-qualified resource refs.
+
+Remove unknown-worktree-to-current-root terminal fallback. A context supplies a validated CWD to the global terminal manager.
+
+Global backend events are routed once by event directory and registered session route. Status, tool, orchestration, permission, and question events retain their directory and enter exactly one owning project context. A cold/collapsed context is not initialized by an unsolicited event.
+
+## Uniform project sidebar UI
+
+### One body implementation
+
+Extract the existing real `renderBody()` from `AgentManagerApp.tsx` into `ProjectSidebarBody`. Do not maintain active and background implementations.
+
+`ProjectSidebarBody` receives a stable project-scoped store and project-qualified action callbacks. It reuses:
+
+- the existing Local card markup;
+- `WorktreeSectionActions`;
+- `WorktreeItem`;
+- `SectionHeader` and current drag/drop behavior;
+- `UnassignedSessionsSection`;
+- existing rename/delete/open/PR/run/setup/session affordances.
+
+Render it for every expanded project:
+
+```tsx
+<For each={projects()}>
+  {(project) => (
+    <ProjectAccordion project={project}>
+      <Show when={project.expanded}>
+        <ProjectSidebarBody projectId={project.id} />
+      </Show>
+    </ProjectAccordion>
+  )}
+</For>
+```
+
+The body is keyed by `projectId`, not active status. Changing detail selection cannot remount it.
+
+### Per-project webview stores
+
+Replace active-only shared sidebar signals with `Map<ProjectId, ProjectSidebarStore>` or an equivalent Solid store registry.
+
+Each store owns:
+
+- state/worktrees/sections/order/stale state;
+- real `SessionInfo` and managed-session state;
+- git stats and local stats;
+- PR and run/setup state;
+- pending delete/rename/create state;
+- sidebar search/order/collapse state where repository-owned;
+- generation for dropping stale output.
+
+Only shared detail/chat/terminal state remains global. The top toolbar reads the selected detail target's project store.
+
+`project-live.ts` may be evolved into this complete store registry. It must stop mirroring active payloads into a separate sidebar signal set.
+
+### Scrolling and layout
+
+The project list becomes the sidebar scroll container. Individual project bodies must not use a global `50vh` cap that makes two projects fight for viewport height. Section and project collapse state controls density; normal browser scrolling exposes all expanded worktrees.
+
+### UI behavior
+
+- Clicking a Local/worktree/session card emits one atomic project-qualified selection.
+- Rename/delete/run/open/section/PR actions execute against the clicked card's project without changing sidebar structure.
+- The active project may receive an emphasis style, but no different markup.
+- Active project chevrons are not disabled; expansion and detail selection are separate concepts.
+- Global New Session/Run buttons target the last selected detail project.
+- New Worktree accepts an explicit target project, defaulting to the selected detail project.
+
+## Uniform polling and live state
+
+Every ready expanded context owns the same poller set. There is no active singleton poller plus background poller split.
+
+Pollers emit `{ projectId, generation }` and update only their owning context/store. Stop/suspend increments generation before clearing timers so in-flight Git/PR results are dropped.
+
+Context state is pushed after every project mutation, not only initial expansion or active-project changes. This includes worktree/session/section/order/run/setup changes in background projects.
+
+Panel visibility changes poll cadence uniformly across all expanded contexts.
+
+## Registry correctness
+
+Registry mutations use one in-process queue. Each mutation re-reads persisted storage, validates it, applies one mutation, writes once, then updates memory. Trust/remove persistence failures are user-visible and do not leave UI state ahead of storage.
+
+Registry descriptors include canonical root, canonical Git common directory, URI scheme/authority, order, label, trust, and added time. They do not contain Agent Manager repository state.
+
+## Implementation order
+
+### Slice 0: configuration safety blocker
+
+1. Introduce revisioned `/config/overlay` reads and compare-and-swap writes, first for User scope and with the same generic implementation covered for Project scope.
+2. Separate runtime-effective config messages/state from immutable Settings bindings and drafts.
+3. Add explicit `User | Project` Settings scope and an immutable trusted project selector/binding for Project writes.
+4. Remove hidden `splitConfigByScope` persistence and audit every direct/indirect config mutation, including provider disconnect, import/reset, custom providers, work-style presets, Permission Dock, and indexing.
+5. Make config events scope/directory/target/revision aware and generation-guard runtime activation refreshes.
+6. Add target-switch, stale-binding, revision-conflict, trust, and draft-preservation tests.
+
+Do not enable multi-project broadly before this slice passes.
+
+### Slice 1: routing and identity blockers
+
+1. Add project-qualified refs and strict protocol types.
+2. Add the project/session route service and explicit Local routes.
+3. Remove Agent Manager current/workspace-root fallback for identified operations.
+4. Add atomic project-qualified selection.
+5. Convert panel-global maps to composite keys.
+6. Add strict routing and raw-ID collision tests.
+
+Do not expose interactive background controls before this slice passes.
+
+### Slice 2: context lifecycle and service ownership
+
+1. Add single-flight initialization, lifecycle state, generation, and mutation queue to `ProjectContext`.
+2. Move root-bound diff/import/run/setup/branch-naming/poller ownership behind context APIs.
+3. Replace dynamic active getters inside async mutations with captured contexts.
+4. Add suspend/remove/dispose coordination.
+5. Reject duplicate Git common directories and serialize registry writes.
+6. Route global backend events by directory.
+
+### Slice 3: complete per-project stores
+
+1. Refresh and store real sessions per project.
+2. Emit all relevant output with project and generation.
+3. Evolve `project-live.ts` into a complete project sidebar store registry.
+4. Make polling uniform and generation-safe.
+5. Add background mutation/state propagation tests.
+
+### Slice 4: uniform real UI
+
+1. Extract the current `renderBody()` intact into `ProjectSidebarBody`.
+2. Parameterize it by one project store and project-qualified callbacks.
+3. Render one body per expanded project.
+4. Delete `ProjectSummary` and its CSS.
+5. Separate project expansion from detail activation.
+6. Add project-aware New Worktree targeting.
+7. Add component/visual tests proving no body remount or structural change on selection.
+
+### Slice 5: validation and release gating
+
+1. Run focused lifecycle/router/context tests after each slice.
+2. From `packages/opencode/`, run the focused config overlay/project-update tests and CLI typecheck. Run the opencode annotation and Promise-facade guards for shared-file hooks.
+3. Regenerate the JS SDK after endpoint schema changes and verify generated consumers compile; never hand-edit generated sources.
+4. From `packages/kilo-vscode/`, run typecheck, lint, focused/unit tests, knip, compile/package, and architecture guards.
+5. Manually exercise two repositories with multiple worktrees and sessions in both, including a dirty User draft during project activation, an external config edit conflict, project trust revocation, project removal, and project-config open targeting.
+6. Keep the feature flag default off until all acceptance criteria pass.
+
+## Blocking tests
+
+The feature is not complete until tests prove:
+
+1. Two concurrent expands initialize one context once.
+2. Collapse/remove during initialization produces no late state or poller posts.
+3. A project switch during create/import/setup/session/run/diff cannot change operation ownership.
+4. Project B Local sessions never resolve through project A.
+5. Missing/mismatched project references fail closed.
+6. Poller/PR late results after stop or generation change are dropped.
+7. Same raw worktree/session/local IDs in two projects do not collide in runtime or UI stores.
+8. Two expanded projects render two permanent full `ProjectSidebarBody` instances.
+9. Selecting a card changes only shared detail state and active emphasis, not body structure or mount identity.
+10. Every worktree/session/terminal/diff/run/setup/section/PR action targets the clicked project's context.
+11. Registry writes preserve concurrent add/remove/trust changes.
+12. Roots sharing one Git common directory cannot both register.
+13. Panel shutdown awaits all contexts and stops background activity.
+14. Flag-off behavior remains the current single-project UI and state file.
+15. A Settings draft loaded for project A cannot write project B after any activation, expansion, removal, trust, or worktree switch.
+16. User Settings writes target the revisioned user file; explicit Project Settings writes target only the selected trusted project's revisioned root config. No key is silently rerouted.
+17. A clean external config change refreshes Settings; a dirty or saving binding is marked stale without losing its draft.
+18. Concurrent editors using the same revision produce one success and one 409 conflict, with no lost update or partial file.
+19. A comment-only JSONC edit, file deletion/recreation with changed bytes, or newly created higher-priority config changes the revision/target and rejects the stale write.
+20. A save response clears only the matching `{ requestId, binding.id }`; an SSE config event or out-of-order read cannot confirm a save.
+21. Global and project writes are independently acknowledged and never presented as one atomic transaction.
+22. Project config open/read/write actions reject unknown, untrusted, removed, generation-stale, symlink-escaping, or mismatched project targets.
+23. Runtime config for a selected managed worktree uses that worktree directory, while Project Settings/open-file targets the immutable registered project root.
+24. Project-sourced providers and other config collections cannot trigger an implicit active-project write from Settings actions.
+
+## Acceptance criteria
+
+- No `ProjectSummary` or alternate fake-card body exists.
+- Every expanded project displays real live Local, worktree, and session UI concurrently.
+- Every visible worktree/session action is usable and routes by explicit project identity.
+- Switching detail selection causes no sidebar body remount, replacement, collapse, or data reset.
+- Each project reads and writes only its own `.kilo/agent-manager.json`.
+- Expanded projects remain live independently; collapsed projects suspend safely.
+- No identified operation falls back to active/current/workspace root.
+- Single-project behavior and persisted state remain backward-compatible when the flag is off.
+- Shared Settings exposes explicit User and Project scope; Project writes require a trusted project selector and immutable binding.
+- Runtime project activation and Settings editor binding are separate state machines.
+- Every Settings config write has an immutable scope/target binding and revision precondition; narrow domain mutations merge named fields under the same target lock. No config mutation uses a save-time active-directory lookup.
+- Dirty drafts survive external updates and conflicts and can never migrate between projects.
+- Project Settings targets the explicit registered root, never the active Agent Manager project or active worktree.
+
+## Planned UI
+
+```text
+┌─ Sidebar ─────────────────────────────────┬─ Shared detail pane ──────────┐
+│ ← selected project   search calendar gear │                              │
+│                                           │  Chat / diff / terminal       │
+│ PROJECTS                                + │  for the selected             │
+│ ▾ abalone-bactrosaurus                    │  project/worktree/session     │
+│   ┌─────────────────────────────────┐     │                              │
+│   │ Local    main   +3295 -548 ↓54  │     │                              │
+│   └─────────────────────────────────┘     │                              │
+│   WORKTREES                     actions   │                              │
+│   ┌─────────────────────────────────┐     │                              │
+│   │ feature-x  #1234  +120 -8 ↓2    │     │                              │
+│   │ real menus, rename, run, open    │     │                              │
+│   └─────────────────────────────────┘     │                              │
+│   ┌─────────────────────────────────┐     │                              │
+│   │ bugfix-y            +45 -12      │     │                              │
+│   └─────────────────────────────────┘     │                              │
+│   SESSIONS                                │                              │
+│   • Fix login redirect          running   │                              │
+│   • Refactor auth                         │                              │
+│                                           │                              │
+│ ▾ kilo-pi-provider                        │                              │
+│   ┌─────────────────────────────────┐     │                              │
+│   │ Local    master   +16 -6 ↓1      │     │                              │
+│   └─────────────────────────────────┘     │                              │
+│   WORKTREES                     actions   │                              │
+│   ┌─────────────────────────────────┐     │                              │
+│   │ provider-z   #88   +88 -3        │     │                              │
+│   │ real menus, rename, run, open    │     │                              │
+│   └─────────────────────────────────┘     │                              │
+│   SESSIONS                                │                              │
+│   • Add provider tests                    │                              │
+│                                           │                              │
+│ ▸ docs-repo                    collapsed  │                              │
+│                                           │                              │
+│                 [New Session] [Run]       │                              │
+└───────────────────────────────────────────┴──────────────────────────────┘
+
+Selecting any card:
+
+- keeps every project body mounted and pixel-stable;
+- changes only the selected styling, top toolbar target, and shared detail pane;
+- never swaps a real body for a summary or vice versa.
+```
diff --git a/bun.lock b/bun.lock
index 1ccc20ef84..4efc3fec0e 100644
--- a/bun.lock
+++ b/bun.lock
@@ -32,7 +32,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -40,20 +40,20 @@
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/amazon-bedrock": "4.0.112",
         "@ai-sdk/anthropic": "3.0.82",
-        "@ai-sdk/azure": "3.0.49",
+        "@ai-sdk/azure": "3.0.93",
         "@ai-sdk/cerebras": "2.0.54",
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/deepinfra": "2.0.41",
-        "@ai-sdk/gateway": "3.0.104",
+        "@ai-sdk/gateway": "3.0.157",
         "@ai-sdk/google": "3.0.73",
         "@ai-sdk/google-vertex": "4.0.128",
         "@ai-sdk/groq": "3.0.31",
         "@ai-sdk/mistral": "3.0.27",
-        "@ai-sdk/openai": "3.0.53",
+        "@ai-sdk/openai": "3.0.88",
         "@ai-sdk/openai-compatible": "2.0.48",
         "@ai-sdk/perplexity": "3.0.26",
-        "@ai-sdk/provider": "3.0.8",
-        "@ai-sdk/provider-utils": "4.0.23",
+        "@ai-sdk/provider": "3.0.14",
+        "@ai-sdk/provider-utils": "4.0.40",
         "@ai-sdk/togetherai": "2.0.41",
         "@ai-sdk/vercel": "2.0.39",
         "@ai-sdk/xai": "3.0.102",
@@ -127,7 +127,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -141,7 +141,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -153,7 +153,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@effect/platform-node": "4.0.0-beta.74",
         "@effect/platform-node-shared": "4.0.0-beta.74",
@@ -174,7 +174,7 @@
     },
     "packages/kilo-console": {
       "name": "@kilocode/kilo-console",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/kilo-indexing": "workspace:*",
         "@kilocode/kilo-web-ui": "workspace:*",
@@ -197,7 +197,7 @@
     },
     "packages/kilo-docs": {
       "name": "@kilocode/kilo-docs",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@docsearch/css": "^4",
         "@docsearch/js": "^4",
@@ -227,12 +227,12 @@
     },
     "packages/kilo-gateway": {
       "name": "@kilocode/kilo-gateway",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@ai-sdk/alibaba": "1.0.17",
-        "@ai-sdk/anthropic": "3.0.71",
+        "@ai-sdk/anthropic": "3.0.82",
         "@ai-sdk/mistral": "3.0.27",
-        "@ai-sdk/openai": "3.0.53",
+        "@ai-sdk/openai": "3.0.88",
         "@ai-sdk/openai-compatible": "2.0.48",
         "@clack/prompts": "1.0.0-alpha.1",
         "@kilocode/plugin": "workspace:*",
@@ -263,7 +263,7 @@
     },
     "packages/kilo-i18n": {
       "name": "@kilocode/kilo-i18n",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "devDependencies": {
         "@tsconfig/node22": "catalog:",
         "@types/bun": "catalog:",
@@ -273,7 +273,7 @@
     },
     "packages/kilo-indexing": {
       "name": "@kilocode/kilo-indexing",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@aws-sdk/client-bedrock-runtime": "3.1005.0",
         "@aws-sdk/credential-provider-ini": "3.972.31",
@@ -305,11 +305,11 @@
     },
     "packages/kilo-jetbrains": {
       "name": "@kilocode/kilo-jetbrains",
-      "version": "7.4.15",
+      "version": "7.4.16",
     },
     "packages/kilo-memory": {
       "name": "@kilocode/kilo-memory",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "effect": "catalog:",
         "zod": "catalog:",
@@ -323,7 +323,7 @@
     },
     "packages/kilo-sandbox": {
       "name": "@kilocode/sandbox",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@anthropic-ai/sandbox-runtime": "catalog:",
         "effect": "catalog:",
@@ -338,7 +338,7 @@
     },
     "packages/kilo-telemetry": {
       "name": "@kilocode/kilo-telemetry",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/kilo-gateway": "workspace:*",
         "posthog-node": "4.4.0",
@@ -352,7 +352,7 @@
     },
     "packages/kilo-ui": {
       "name": "@kilocode/kilo-ui",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "0.13.11",
@@ -390,7 +390,7 @@
     },
     "packages/kilo-vscode": {
       "name": "kilo-code",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.39.0",
         "@kilocode/kilo-gateway": "workspace:*",
@@ -459,7 +459,7 @@
     },
     "packages/kilo-web-ui": {
       "name": "@kilocode/kilo-web-ui",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/kilo-ui": "workspace:*",
         "@kobalte/core": "catalog:",
@@ -476,7 +476,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@smithy/eventstream-codec": "4.2.14",
         "@smithy/util-utf8": "4.2.2",
@@ -494,7 +494,7 @@
     },
     "packages/opencode": {
       "name": "@kilocode/cli",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "bin": {
         "kilo": "./bin/kilo",
         "kilocode": "./bin/kilo",
@@ -506,20 +506,20 @@
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/amazon-bedrock": "4.0.112",
         "@ai-sdk/anthropic": "3.0.82",
-        "@ai-sdk/azure": "3.0.49",
+        "@ai-sdk/azure": "3.0.93",
         "@ai-sdk/cerebras": "2.0.54",
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/deepinfra": "2.0.41",
-        "@ai-sdk/gateway": "3.0.104",
+        "@ai-sdk/gateway": "3.0.157",
         "@ai-sdk/google": "3.0.73",
         "@ai-sdk/google-vertex": "4.0.128",
         "@ai-sdk/groq": "3.0.31",
         "@ai-sdk/mistral": "3.0.27",
-        "@ai-sdk/openai": "3.0.53",
+        "@ai-sdk/openai": "3.0.88",
         "@ai-sdk/openai-compatible": "2.0.48",
         "@ai-sdk/perplexity": "3.0.26",
-        "@ai-sdk/provider": "3.0.8",
-        "@ai-sdk/provider-utils": "4.0.23",
+        "@ai-sdk/provider": "3.0.14",
+        "@ai-sdk/provider-utils": "4.0.40",
         "@ai-sdk/togetherai": "2.0.41",
         "@ai-sdk/vercel": "2.0.39",
         "@ai-sdk/xai": "3.0.102",
@@ -661,7 +661,7 @@
     },
     "packages/plugin": {
       "name": "@kilocode/plugin",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "effect": "catalog:",
@@ -689,7 +689,7 @@
     },
     "packages/plugin-atomic-chat": {
       "name": "@kilocode/plugin-atomic-chat",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/plugin": "workspace:*",
       },
@@ -703,7 +703,7 @@
     },
     "packages/script": {
       "name": "@opencode-ai/script",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "semver": "^7.6.3",
       },
@@ -714,7 +714,7 @@
     },
     "packages/sdk/js": {
       "name": "@kilocode/sdk",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -729,7 +729,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "drizzle-orm": "catalog:",
@@ -743,7 +743,7 @@
     },
     "packages/storybook": {
       "name": "@opencode-ai/storybook",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "devDependencies": {
         "@opencode-ai/ui": "workspace:*",
         "@solidjs/meta": "catalog:",
@@ -766,7 +766,7 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/plugin": "workspace:*",
         "@kilocode/sdk": "workspace:*",
@@ -793,7 +793,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "7.4.16",
+      "version": "7.4.17",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "catalog:",
@@ -846,22 +846,22 @@
     },
   },
   "trustedDependencies": [
-    "web-tree-sitter",
     "esbuild",
-    "tree-sitter-bash",
     "protobufjs",
+    "web-tree-sitter",
+    "tree-sitter-bash",
   ],
   "patchedDependencies": {
-    "virtua@0.49.1": "patches/virtua@0.49.1.patch",
-    "mammoth@1.12.0": "patches/mammoth@1.12.0.patch",
-    "@ff-labs/fff-bun@0.9.4": "patches/@ff-labs%2Ffff-bun@0.9.4.patch",
-    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
-    "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
-    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
-    "pacote@21.5.1": "patches/pacote@21.5.1.patch",
-    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
-    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
     "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
+    "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
+    "@ff-labs/fff-bun@0.9.4": "patches/@ff-labs%2Ffff-bun@0.9.4.patch",
+    "pacote@21.5.1": "patches/pacote@21.5.1.patch",
+    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
+    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
+    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
+    "virtua@0.49.1": "patches/virtua@0.49.1.patch",
+    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
+    "mammoth@1.12.0": "patches/mammoth@1.12.0.patch",
   },
   "overrides": {
     "@effect/platform-node-shared": "4.0.0-beta.74",
@@ -917,7 +917,7 @@
     "@types/node": "24.12.4",
     "@types/semver": "7.7.1",
     "@typescript/native-preview": "7.0.0-dev.20260316.1",
-    "ai": "6.0.168",
+    "ai": "6.0.235",
     "cross-spawn": "7.0.6",
     "diff": "8.0.4",
     "dompurify": "3.4.2",
@@ -970,7 +970,7 @@
 
     "@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.82", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-WKKou2wbhGGYV8PSALAPyV2YY4nfCqCPkyBzYtJtDA9yCcIFwsbtkTNgg7bqtLCVzeEsY7wwxRoCWy+EMfrw/A=="],
 
-    "@ai-sdk/azure": ["@ai-sdk/azure@3.0.49", "", { "dependencies": { "@ai-sdk/openai": "3.0.48", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wskgAL+OmrHG7by/iWIxEBQCEdc1mDudha/UZav46i0auzdFfsDB/k2rXZaC4/3nWSgMZkxr0W3ncyouEGX/eg=="],
+    "@ai-sdk/azure": ["@ai-sdk/azure@3.0.93", "", { "dependencies": { "@ai-sdk/deepseek": "2.0.50", "@ai-sdk/openai": "3.0.88", "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-9nKNmRtopjE3+L+286/4sLBDfDvmdsL7fiQXG0TE38NywxkDDLUhdr0KSllkRQ+m1/8bO7x4rIVhHSjQQiqmnQ=="],
 
     "@ai-sdk/cerebras": ["@ai-sdk/cerebras@2.0.54", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.48", "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-m+oLYlZUA0j5aeE8BrjDd2DSCx6HujqPB2C0YjQF7iGQ4sTCCmhHfH2o0uY7vlSPIJpA2ak6YyF7R14a5dq8fw=="],
 
@@ -980,13 +980,13 @@
 
     "@ai-sdk/deepinfra": ["@ai-sdk/deepinfra@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-y6RoOP7DGWmDSiSxrUSt5p18sbz+Ixe5lMVPmdE7x+Tr5rlrzvftyHhjWHfqlAtoYERZTGFbP6tPW1OfQcrb4A=="],
 
-    "@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.29" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-IkBQPEfRUbPEcWzigT76KttqoDqM4FR8H8cp5pgAw5RdDN++nUoJa0uZan3LuOp4IC8BKGZABJCqB97CMIYLdQ=="],
+    "@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.50", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-pnl22aGBIdpK0sXSJN4zDykIXTdyO9m3gFhno3SBPpdwT4Tq041Uy0i/EDWSxIiFa9JEokFGiCt4NNzcE5ntRA=="],
 
     "@ai-sdk/elevenlabs": ["@ai-sdk/elevenlabs@2.0.35", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.29" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-KjgM2IDMwm1qTKaW2n2qCr2ok9/wlhUC9ggNvyYYeCupEEGR8Gki1oFRA16PsBcyEr98k+kaKw4cF6D0XaVWWA=="],
 
     "@ai-sdk/fireworks": ["@ai-sdk/fireworks@2.0.55", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.50", "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.29" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cdlFOq4NuwZdgdwocae5ItT7uKh3mf4junJWGVKtOcs7ATY42VZLzIU2MFBgm2imGVZXwB6kcl3jd9sDBnJ8cw=="],
 
-    "@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.104", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZKX5n74io8VIRlhIMSLWVlvT3sXC8Z7cZ9GHuWBWZDVi96+62AIsWuLGvMfcBA1STYuSoDrp6rIziZmvrTq0TA=="],
+    "@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.157", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-jO0LUsIQC+FeJRQI1KFiNcfTGp6a0lXrymekaXfBIvhVEOyt0NUyc9wiVi/dYGHQmWFXUo8QgmghgGAGLOPTAA=="],
 
     "@ai-sdk/google": ["@ai-sdk/google@3.0.73", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-o2MuIeyvZrFIeIbnbA8Thrr63irdyUBh0uWBZ2lY6yFeXuE/tcwyXF74bDKS4KvTu84uFpQfpbS/LXHGKKXz+g=="],
 
@@ -996,15 +996,15 @@
 
     "@ai-sdk/mistral": ["@ai-sdk/mistral@3.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZXe7nZQgliDdjz5ufH5RKpHWxbN72AzmzzKGbF/z+0K9GN5tUCnftrQRvTRFHA5jAzTapcm2BEevmGLVbMkW+A=="],
 
-    "@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],
+    "@ai-sdk/openai": ["@ai-sdk/openai@3.0.88", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-6M4+bxK/UMijDYK2ia1hCKYma1iajFYxHDlhbinFUdhH2WbFsjoZRMpSjEMlTOBptqmh2J1JclKnprGulF8WwQ=="],
 
     "@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.48", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z9MC6M4Oh/yUY/F/eszOtO8wc2nMz99XmZQKd2gWTtyIfe716xTfrKe3aYZKg20NZDtyjqPPKPSR+wqz7q1T7Q=="],
 
     "@ai-sdk/perplexity": ["@ai-sdk/perplexity@3.0.26", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-dXzrVsLR5f6tr+U04jq4AXoRroGFBTvODnLgss0SWbzNjGGQg3XqtQ9j7rCLo6o8qbYGuAHvqUrIpUCuiscuFg=="],
 
-    "@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+    "@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
 
-    "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+    "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.40", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OL5IrpUm9Y8Dwy+w/vvFwPotS6m52O9W0op2oXgXdCROMJIBalBI0oro6OIBYkPxvm5Xg02GSkoQN25RlR0bnw=="],
 
     "@ai-sdk/togetherai": ["@ai-sdk/togetherai@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-k3p9e3k0/gpDDyTtvafsK4HYR4D/aUQW/kzCwWo1+CzdBU84i4L14gWISC/mv6tgSicMXHcEUd521fPufQwNlg=="],
 
@@ -2670,7 +2670,7 @@
 
     "aggregate-error": ["aggregate-error@4.0.1", "", { "dependencies": { "clean-stack": "^4.0.0", "indent-string": "^5.0.0" } }, "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="],
 
-    "ai": ["ai@6.0.168", "", { "dependencies": { "@ai-sdk/gateway": "3.0.104", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-2HqCJuO+1V2aV7vfYs5LFEUfxbkGX+5oa54q/gCCTL7KLTdbxcCu5D7TdLA5kwsrs3Szgjah9q6D9tpjHM3hUQ=="],
+    "ai": ["ai@6.0.235", "", { "dependencies": { "@ai-sdk/gateway": "3.0.157", "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40", "@opentelemetry/api": "^1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Uyeuvowo20XChpFC0lUaQq8xf0Kg7OElA56fEjUYoeWMJIzqshDTz4S57KXobcJ4m+iDQxMeJoUj06CIxSLx7A=="],
 
     "ai-gateway-provider": ["ai-gateway-provider@3.1.2", "", { "optionalDependencies": { "@ai-sdk/amazon-bedrock": "^4.0.62", "@ai-sdk/anthropic": "^3.0.46", "@ai-sdk/azure": "^3.0.31", "@ai-sdk/cerebras": "^2.0.34", "@ai-sdk/cohere": "^3.0.21", "@ai-sdk/deepgram": "^2.0.20", "@ai-sdk/deepseek": "^2.0.20", "@ai-sdk/elevenlabs": "^2.0.20", "@ai-sdk/fireworks": "^2.0.34", "@ai-sdk/google": "^3.0.30", "@ai-sdk/google-vertex": "^4.0.61", "@ai-sdk/groq": "^3.0.24", "@ai-sdk/mistral": "^3.0.20", "@ai-sdk/openai": "^3.0.30", "@ai-sdk/perplexity": "^3.0.19", "@ai-sdk/xai": "^3.0.57", "@openrouter/ai-sdk-provider": "^2.2.3" }, "peerDependencies": { "@ai-sdk/openai-compatible": "^2.0.0", "@ai-sdk/provider": "^3.0.0", "@ai-sdk/provider-utils": "^4.0.0", "ai": "^6.0.0" } }, "sha512-krGNnJSoO/gJ7Hbe5nQDlsBpDUGIBGtMQTRUaW7s1MylsfvLduba0TLWzQaGtOmNRkP0pGhtGlwsnS6FNQMlyw=="],
 
@@ -4756,6 +4756,10 @@
 
     "@ai-sdk/alibaba/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
 
+    "@ai-sdk/alibaba/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "@ai-sdk/alibaba/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
     "@ai-sdk/amazon-bedrock/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.81", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-B1JDd9Ugq9R5AgIaW3674lhGCMMYJcPUxnrZh8fzbGojgg4QvHFRv6eZahGQAUsmGHbcf74G9bdSBDLWQGY2GA=="],
 
     "@ai-sdk/amazon-bedrock/@ai-sdk/openai": ["@ai-sdk/openai@3.0.67", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-oAiGC9eWG7IgtdsdS74bOCnAAHarAfTJhWN9x5INwnWPekL802AvF+0I5DvLzIF1MIRmNw4N8mPSL/GUVbX9Mw=="],
@@ -4768,14 +4772,12 @@
 
     "@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
-    "@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@3.0.48", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ALmj/53EXpcRqMbGpPJPP4UOSWw0q4VGpnDo7YctvsynjkrKDmoneDG/1a7VQnSPYHnJp6tTRMf5ZdxZ5whulg=="],
-
-    "@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
-
     "@ai-sdk/cerebras/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
 
     "@ai-sdk/cerebras/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
+    "@ai-sdk/cohere/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/cohere/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
     "@ai-sdk/deepgram/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
@@ -4784,12 +4786,10 @@
 
     "@ai-sdk/deepinfra/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.37", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-+POSFVcgiu47BK64dhsI6OpcDC0/VAE2ZSaXdXGNNhpC/ava++uSRJYks0k2bpfY0wwCTgpAWZsXn/dG2Yppiw=="],
 
+    "@ai-sdk/deepinfra/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/deepinfra/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
-    "@ai-sdk/deepseek/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
-
-    "@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.29", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-uhukHaCBvqkwBHkT8C2PrnqKTCoLn3pdHXqtcR9I8ErH+flbzgW4o7VHSNIup9LRu+WBvZIZDQLsx6rwl2tiOA=="],
-
     "@ai-sdk/elevenlabs/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
 
     "@ai-sdk/elevenlabs/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.29", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-uhukHaCBvqkwBHkT8C2PrnqKTCoLn3pdHXqtcR9I8ErH+flbzgW4o7VHSNIup9LRu+WBvZIZDQLsx6rwl2tiOA=="],
@@ -4812,24 +4812,34 @@
 
     "@ai-sdk/google-vertex/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
+    "@ai-sdk/groq/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/groq/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
+    "@ai-sdk/mistral/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/mistral/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
     "@ai-sdk/openai-compatible/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
 
     "@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
+    "@ai-sdk/perplexity/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/perplexity/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
     "@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
     "@ai-sdk/togetherai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.37", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-+POSFVcgiu47BK64dhsI6OpcDC0/VAE2ZSaXdXGNNhpC/ava++uSRJYks0k2bpfY0wwCTgpAWZsXn/dG2Yppiw=="],
 
+    "@ai-sdk/togetherai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/togetherai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
     "@ai-sdk/vercel/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.37", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-+POSFVcgiu47BK64dhsI6OpcDC0/VAE2ZSaXdXGNNhpC/ava++uSRJYks0k2bpfY0wwCTgpAWZsXn/dG2Yppiw=="],
 
+    "@ai-sdk/vercel/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
     "@ai-sdk/vercel/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
     "@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.56", "", { "dependencies": { "@ai-sdk/provider": "3.0.13", "@ai-sdk/provider-utils": "4.0.35" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cQrN6OUn/jvsY3OdsU6Wn+ss7vp1iwIcakZKSlSRMnYqShBfyT7Qht+eqmgxs7w9ttrw6FAG6o11AiBs+iEsTA=="],
@@ -5076,8 +5086,6 @@
 
     "@kilocode/kilo-docs/typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
 
-    "@kilocode/kilo-gateway/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.71", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-bUWOzrzR0gJKJO/PLGMR4uH2dqEgqGhrsCV+sSpk4KtOEnUQlfjZI/F7BFlqSvVpFbjdgYRRLysAeEZpJ6S1lg=="],
-
     "@kilocode/kilo-indexing/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="],
 
     "@kilocode/kilo-indexing/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="],
@@ -5092,6 +5100,8 @@
 
     "@modelcontextprotocol/sdk/jose": ["jose@6.2.3", "", {}, "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw=="],
 
+    "@morphllm/morphsdk/ai": ["ai@6.0.168", "", { "dependencies": { "@ai-sdk/gateway": "3.0.104", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-2HqCJuO+1V2aV7vfYs5LFEUfxbkGX+5oa54q/gCCTL7KLTdbxcCu5D7TdLA5kwsrs3Szgjah9q6D9tpjHM3hUQ=="],
+
     "@morphllm/morphsdk/openai": ["openai@4.104.0", "", { "dependencies": { "@types/node": "^18.11.18", "@types/node-fetch": "^2.6.4", "abort-controller": "^3.0.0", "agentkeepalive": "^4.2.1", "form-data-encoder": "1.7.2", "formdata-node": "^4.3.2", "node-fetch": "^2.6.7" }, "peerDependencies": { "ws": "^8.18.0", "zod": "^3.23.8" }, "optionalPeers": ["ws", "zod"], "bin": { "openai": "bin/cli" } }, "sha512-p99EFNsA/yX6UhVO93f5kJsDRLAg+CTA2RBqdHK4RtK8u5IJw32Hyb2dTGKbnnFmnuoBv5r7Z2CURI9sGZpSuA=="],
 
     "@npmcli/arborist/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="],
@@ -5346,10 +5356,16 @@
 
     "ai-gateway-provider/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.71", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-bUWOzrzR0gJKJO/PLGMR4uH2dqEgqGhrsCV+sSpk4KtOEnUQlfjZI/F7BFlqSvVpFbjdgYRRLysAeEZpJ6S1lg=="],
 
+    "ai-gateway-provider/@ai-sdk/azure": ["@ai-sdk/azure@3.0.49", "", { "dependencies": { "@ai-sdk/openai": "3.0.48", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wskgAL+OmrHG7by/iWIxEBQCEdc1mDudha/UZav46i0auzdFfsDB/k2rXZaC4/3nWSgMZkxr0W3ncyouEGX/eg=="],
+
+    "ai-gateway-provider/@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.29" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-IkBQPEfRUbPEcWzigT76KttqoDqM4FR8H8cp5pgAw5RdDN++nUoJa0uZan3LuOp4IC8BKGZABJCqB97CMIYLdQ=="],
+
     "ai-gateway-provider/@ai-sdk/google": ["@ai-sdk/google@3.0.64", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CbR82EgGPNrj/6q0HtclwuCqe0/pDShyv3nWDP/A9DroujzWXnLMlUJVrgPOsg4b40zQCwwVs2XSKCxvt/4QaA=="],
 
     "ai-gateway-provider/@ai-sdk/google-vertex": ["@ai-sdk/google-vertex@4.0.112", "", { "dependencies": { "@ai-sdk/anthropic": "3.0.71", "@ai-sdk/google": "3.0.64", "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "google-auth-library": "^10.5.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cSfHCkM+9ZrFtQWIN1WlV93JPD+isGSdFxKj7u1L9m2aLVZajlXdcE41GL9hMt7ld7bZYE4NnZ+4VLxBAHE+Eg=="],
 
+    "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],
+
     "ai-gateway-provider/@ai-sdk/xai": ["@ai-sdk/xai@3.0.92", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.48", "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-yqRMdEVfSkZCXs5mqeKfYOuQElo93igwz/4zWbYkhZWAW7tDh+5uqRef6MtQVYF/bTC1EsdbeO9DtsOtAZMOLA=="],
 
     "archiver-utils/glob": ["glob@10.5.0", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="],
@@ -5700,12 +5716,12 @@
 
     "@actions/artifact/@actions/core/@actions/exec": ["@actions/exec@2.0.0", "", { "dependencies": { "@actions/io": "^2.0.0" } }, "sha512-k8ngrX2voJ/RIN6r9xB82NVqKpnMRtxDoiO+g3olkIUpQNqjArXrCQceduQZCQj3P3xm32pChRLqRrtXTlqhIw=="],
 
+    "@ai-sdk/alibaba/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
     "@ai-sdk/amazon-bedrock/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
     "@ai-sdk/anthropic/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
-    "@ai-sdk/azure/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
     "@ai-sdk/cerebras/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
     "@ai-sdk/cohere/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
@@ -5714,8 +5730,6 @@
 
     "@ai-sdk/deepinfra/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
-    "@ai-sdk/deepseek/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
     "@ai-sdk/elevenlabs/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
     "@ai-sdk/fireworks/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
@@ -5854,6 +5868,12 @@
 
     "@manypkg/find-root/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
 
+    "@morphllm/morphsdk/ai/@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.104", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZKX5n74io8VIRlhIMSLWVlvT3sXC8Z7cZ9GHuWBWZDVi96+62AIsWuLGvMfcBA1STYuSoDrp6rIziZmvrTq0TA=="],
+
+    "@morphllm/morphsdk/ai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "@morphllm/morphsdk/ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
     "@morphllm/morphsdk/openai/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
     "@npmcli/package-json/glob/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="],
@@ -6042,8 +6062,38 @@
 
     "@vscode/vsce/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
 
+    "ai-gateway-provider/@ai-sdk/amazon-bedrock/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "ai-gateway-provider/@ai-sdk/amazon-bedrock/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
+    "ai-gateway-provider/@ai-sdk/anthropic/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "ai-gateway-provider/@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
+    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@3.0.48", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ALmj/53EXpcRqMbGpPJPP4UOSWw0q4VGpnDo7YctvsynjkrKDmoneDG/1a7VQnSPYHnJp6tTRMf5ZdxZ5whulg=="],
+
+    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
+
+    "ai-gateway-provider/@ai-sdk/deepseek/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
+
+    "ai-gateway-provider/@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.29", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-uhukHaCBvqkwBHkT8C2PrnqKTCoLn3pdHXqtcR9I8ErH+flbzgW4o7VHSNIup9LRu+WBvZIZDQLsx6rwl2tiOA=="],
+
+    "ai-gateway-provider/@ai-sdk/google/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "ai-gateway-provider/@ai-sdk/google/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
     "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
 
+    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
+
+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
+
     "ai-gateway-provider/@ai-sdk/xai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
 
     "ai-gateway-provider/@ai-sdk/xai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
@@ -6296,6 +6346,8 @@
 
     "@manypkg/find-root/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],
 
+    "@morphllm/morphsdk/ai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
     "@octokit/graphql/@octokit/request/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@27.0.0", "", {}, "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA=="],
 
     "@octokit/rest/@octokit/core/@octokit/request/@octokit/endpoint": ["@octokit/endpoint@11.0.3", "", { "dependencies": { "@octokit/types": "^16.0.0", "universal-user-agent": "^7.0.2" } }, "sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag=="],
@@ -6382,6 +6434,20 @@
 
     "@vscode/test-cli/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
 
+    "ai-gateway-provider/@ai-sdk/amazon-bedrock/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
+    "ai-gateway-provider/@ai-sdk/anthropic/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
+    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
+    "ai-gateway-provider/@ai-sdk/deepseek/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
+    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
+    "ai-gateway-provider/@ai-sdk/google/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
     "ai-gateway-provider/@ai-sdk/xai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
     "archiver-utils/glob/jackspeak/@isaacs/cliui": ["@isaacs/cliui@8.0.2", "", { "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", "strip-ansi": "^7.0.1", "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", "wrap-ansi": "^8.1.0", "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" } }, "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="],
diff --git a/nix/hashes.json b/nix/hashes.json
index 8f0a833b46..414454b412 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-Y64ujq2R4SiyOavsXmaYsQkVNfdjhkzmPolOEV1RVyc=",
-    "aarch64-linux": "sha256-7S209ir2j9o9NXYmMUnEfo6m64cUIkexd8L95UeCMFE=",
-    "aarch64-darwin": "sha256-bE1zw7EK+4rgUgw80t8hdc2yojAF2f8ihjorh6B7jJE=",
-    "x86_64-darwin": "sha256-xukM9cEvZAKCXewun9xReGBKz09i63LACLN/eH54020="
+    "x86_64-linux": "sha256-sid/FCql4CmiAb1MNGMH33fwNs6esv9UNC819Yb03bQ=",
+    "aarch64-linux": "sha256-1H1873nLqmcKrumAjnjPPts5+EyJLBm1Z5VKsOYANeg=",
+    "aarch64-darwin": "sha256-i7D5RSPIVxXNY1gUnsYdFhVU2FxYEcjqYcQx6zZrJjg=",
+    "x86_64-darwin": "sha256-5lSTqolFVcaKqN6ndKGJLcCUP8JQ8i60np+3eAulnZg="
   }
 }
diff --git a/package.json b/package.json
index 2cbfccad00..9c5567bfd5 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
       "drizzle-kit": "1.0.0-rc.2",
       "drizzle-orm": "1.0.0-rc.2",
       "effect": "4.0.0-beta.74",
-      "ai": "6.0.168",
+      "ai": "6.0.235",
       "cross-spawn": "7.0.6",
       "hono": "4.12.12",
       "hono-openapi": "1.1.2",
@@ -171,6 +171,6 @@
     "pacote@21.5.1": "patches/pacote@21.5.1.patch",
     "mammoth@1.12.0": "patches/mammoth@1.12.0.patch"
   },
-  "version": "7.4.16",
+  "version": "7.4.17",
   "peerDependencies": {}
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index ddb4d33d35..35301f1ac3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
@@ -85,20 +85,20 @@
     "@ai-sdk/alibaba": "1.0.17",
     "@ai-sdk/amazon-bedrock": "4.0.112",
     "@ai-sdk/anthropic": "3.0.82",
-    "@ai-sdk/azure": "3.0.49",
+    "@ai-sdk/azure": "3.0.93",
     "@ai-sdk/cerebras": "2.0.54",
     "@ai-sdk/cohere": "3.0.27",
     "@ai-sdk/deepinfra": "2.0.41",
-    "@ai-sdk/gateway": "3.0.104",
+    "@ai-sdk/gateway": "3.0.157",
     "@ai-sdk/google": "3.0.73",
     "@ai-sdk/google-vertex": "4.0.128",
     "@ai-sdk/groq": "3.0.31",
     "@ai-sdk/mistral": "3.0.27",
-    "@ai-sdk/openai": "3.0.53",
+    "@ai-sdk/openai": "3.0.88",
     "@ai-sdk/openai-compatible": "2.0.48",
     "@ai-sdk/perplexity": "3.0.26",
-    "@ai-sdk/provider": "3.0.8",
-    "@ai-sdk/provider-utils": "4.0.23",
+    "@ai-sdk/provider": "3.0.14",
+    "@ai-sdk/provider-utils": "4.0.40",
     "@ai-sdk/togetherai": "2.0.41",
     "@ai-sdk/vercel": "2.0.39",
     "@ai-sdk/xai": "3.0.102",
diff --git a/packages/core/src/cross-spawn-spawner.ts b/packages/core/src/cross-spawn-spawner.ts
index 554bea4892..0591311f1c 100644
--- a/packages/core/src/cross-spawn-spawner.ts
+++ b/packages/core/src/cross-spawn-spawner.ts
@@ -4,6 +4,7 @@ import * as NodePath from "@effect/platform-node/NodePath"
 import { prepareCommand as prepareSandbox } from "@kilocode/sandbox" // kilocode_change
 import { tap as tapStdio, tapped } from "./kilocode/stdio-tap" // kilocode_change - Bun drops buffered stdio on close
 import * as SpawnValidation from "./kilocode/spawn-validation" // kilocode_change
+import { settle } from "./kilocode/exit-code" // kilocode_change - settle signal termination as 128 + signum
 import * as Deferred from "effect/Deferred"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
@@ -441,16 +442,7 @@ export const make = Effect.gen(function* () {
             getInputFd: fd.getInputFd,
             getOutputFd: fd.getOutputFd,
             isRunning: Effect.map(Deferred.isDone(signal), (done) => !done),
-            exitCode: Effect.flatMap(Deferred.await(signal), ([code, signal]) => {
-              if (Predicate.isNotNull(code)) return Effect.succeed(ExitCode(code))
-              return Effect.fail(
-                toPlatformError(
-                  "exitCode",
-                  new Error(`Process interrupted due to receipt of signal: '${signal}'`),
-                  command,
-                ),
-              )
-            }),
+            exitCode: Effect.flatMap(Deferred.await(signal), settle), // kilocode_change - signal termination settles as 128 + signum
             kill: (opts?: ChildProcess.KillOptions) => {
               const sig = opts?.killSignal ?? "SIGTERM"
               const send = (s: NodeJS.Signals) =>
diff --git a/packages/core/src/kilocode/exit-code.ts b/packages/core/src/kilocode/exit-code.ts
new file mode 100644
index 0000000000..4a4408a7b4
--- /dev/null
+++ b/packages/core/src/kilocode/exit-code.ts
@@ -0,0 +1,16 @@
+import { constants } from "node:os"
+import * as Effect from "effect/Effect"
+import * as Predicate from "effect/Predicate"
+import { ExitCode } from "effect/unstable/process/ChildProcessSpawner"
+
+// A process terminated by a signal produces a null exit code (see the "exit"
+// event on node:child_process). Report the conventional 128 + signum code
+// (e.g. 139 for SIGSEGV) instead of failing, which left consumers like the
+// bash tool waiting on a numeric code that never arrived.
+export const settle = ([code, signal]: readonly [code: number | null, signal: NodeJS.Signals | null]) => {
+  if (Predicate.isNotNull(code)) return Effect.succeed(ExitCode(code))
+  if (Predicate.isNotNull(signal) && signal in constants.signals) {
+    return Effect.succeed(ExitCode(128 + constants.signals[signal]))
+  }
+  return Effect.succeed(ExitCode(1))
+}
diff --git a/packages/core/src/kilocode/pty/termination.ts b/packages/core/src/kilocode/pty/termination.ts
new file mode 100644
index 0000000000..bb1fd30be7
--- /dev/null
+++ b/packages/core/src/kilocode/pty/termination.ts
@@ -0,0 +1,179 @@
+import { spawn } from "child_process"
+import { setTimeout as sleep } from "node:timers/promises"
+import type { Proc } from "../../pty/pty"
+import { Log } from "../../util/log"
+
+const log = Log.create({ service: "pty.termination" })
+const GRACE_MS = 200
+const SPAWN_TIMEOUT_MS = 5_000
+
+export type Process = Pick<Proc, "pid" | "onExit" | "kill">
+
+export type Runtime = {
+  readonly platform: NodeJS.Platform
+  readonly taskkill: (
+    file: string,
+    args: string[],
+    opts: { stdio: "ignore"; windowsHide: true; timeout: number },
+  ) => Promise<boolean>
+  readonly tree: () => Promise<Array<{ pid: number; parent: number }>>
+  readonly alive: (pid: number) => boolean
+  readonly signal: (pid: number, signal: "SIGTERM" | "SIGKILL") => void
+  readonly sleep: (ms: number) => Promise<void>
+}
+
+const runtime: Runtime = {
+  platform: process.platform,
+  taskkill,
+  tree,
+  alive: (pid) => {
+    try {
+      process.kill(pid, 0)
+      return true
+    } catch {
+      return false
+    }
+  },
+  signal: (pid, signal) => process.kill(pid, signal),
+  sleep,
+}
+
+function direct(proc: Process, signal?: "SIGTERM" | "SIGKILL") {
+  try {
+    proc.kill(signal)
+  } catch (err) {
+    log.warn("failed to kill PTY directly", { err, pid: proc.pid, signal })
+  }
+}
+
+function descendants(root: number, rows: Array<{ pid: number; parent: number }>) {
+  const children = new Map<number, number[]>()
+  for (const row of rows) {
+    const list = children.get(row.parent) ?? []
+    list.push(row.pid)
+    children.set(row.parent, list)
+  }
+  const seen = new Set<number>()
+  const collect = (pid: number): number[] => {
+    const result: number[] = []
+    for (const child of children.get(pid) ?? []) {
+      if (seen.has(child)) continue
+      seen.add(child)
+      result.push(...collect(child), child)
+    }
+    return result
+  }
+  return collect(root)
+}
+
+async function family(root: number, input: Runtime) {
+  const rows = await input.tree().catch((err) => {
+    log.debug("failed to inspect PTY process tree", { err, pid: root })
+    return []
+  })
+  return [...descendants(root, rows), root]
+}
+
+function signal(proc: Process, pids: number[], value: "SIGTERM" | "SIGKILL", input: Runtime) {
+  for (const pid of pids) {
+    let sent = false
+    for (const target of [-pid, pid]) {
+      try {
+        input.signal(target, value)
+        sent = true
+      } catch (err) {
+        log.debug("failed to signal PTY process", { err, pid: target, signal: value })
+      }
+    }
+    if (pid === proc.pid && !sent) direct(proc, value)
+  }
+}
+
+async function tree(file: string = "ps", args: string[] = ["-axo", "pid=,ppid="]) {
+  return await new Promise<Array<{ pid: number; parent: number }>>((resolve) => {
+    try {
+      const child = spawn(file, args, {
+        stdio: ["ignore", "pipe", "ignore"],
+        windowsHide: true,
+        timeout: SPAWN_TIMEOUT_MS,
+        killSignal: "SIGKILL",
+      })
+      const chunks: Buffer[] = []
+      child.stdout?.on("data", (chunk: Buffer) => chunks.push(chunk))
+      child.once("error", () => resolve([]))
+      child.once("close", (code) => {
+        if (code !== 0) return resolve([])
+        const rows = Buffer.concat(chunks)
+          .toString("utf8")
+          .trim()
+          .split("\n")
+          .filter(Boolean)
+          .map((line) => line.trim().split(/\s+/).map(Number))
+          .filter(([pid, parent]) => Number.isSafeInteger(pid) && Number.isSafeInteger(parent))
+          .map(([pid, parent]) => ({ pid: pid!, parent: parent! }))
+        resolve(rows)
+      })
+    } catch {
+      resolve([])
+    }
+  })
+}
+
+async function taskkill(
+  file: string,
+  args: string[],
+  opts: { stdio: "ignore"; windowsHide: true; timeout: number },
+) {
+  return await new Promise<boolean>((resolve) => {
+    try {
+      const child = spawn(file, args, opts)
+      child.once("exit", (code) => resolve(code === 0))
+      child.once("error", (err) => {
+        log.warn("taskkill failed", { err })
+        resolve(false)
+      })
+    } catch (err) {
+      log.warn("failed to start taskkill", { err })
+      resolve(false)
+    }
+  })
+}
+
+export async function terminate(proc: Process, input: Runtime = runtime): Promise<void> {
+  const state = { exited: false }
+  const listener = proc.onExit(() => {
+    state.exited = true
+  })
+  try {
+    if (!proc.pid) {
+      direct(proc)
+      if (!state.exited) await input.sleep(GRACE_MS)
+      return
+    }
+
+    if (input.platform === "win32") {
+      const killed = await input.taskkill("taskkill", ["/pid", String(proc.pid), "/f", "/t"], {
+        stdio: "ignore",
+        windowsHide: true,
+        timeout: SPAWN_TIMEOUT_MS,
+      })
+      if (!killed && !state.exited) direct(proc)
+      if (!state.exited) await input.sleep(GRACE_MS)
+      return
+    }
+
+    const initial = await family(proc.pid, input)
+    signal(proc, initial, "SIGTERM", input)
+    await input.sleep(GRACE_MS)
+    const remaining = new Set(initial.filter(input.alive))
+    if (input.alive(proc.pid)) for (const pid of await family(proc.pid, input)) remaining.add(pid)
+    if (remaining.size > 0) {
+      signal(proc, [...remaining], "SIGKILL", input)
+      await input.sleep(GRACE_MS)
+    }
+  } finally {
+    listener.dispose()
+  }
+}
+
+export * as KiloPtyTermination from "./termination"
diff --git a/packages/core/src/models-dev.ts b/packages/core/src/models-dev.ts
index 8fff339ac1..a1b9be3044 100644
--- a/packages/core/src/models-dev.ts
+++ b/packages/core/src/models-dev.ts
@@ -210,13 +210,19 @@ export const layer = Layer.effect(
       if (snapshot) return snapshot
       if (Flag.KILO_DISABLE_MODELS_FETCH) return {}
       // Flock is cross-process: concurrent opencode CLIs can race on this cache file.
-      const text = yield* Effect.scoped(
+      return yield* Effect.scoped(
         Effect.gen(function* () {
           yield* Flock.effect(lockKey)
-          return yield* fetchAndWrite()
+          // kilocode_change start - re-read under the lock: a concurrent refresh
+          // may already have recovered the corrupted cache while we waited, and
+          // fetching again here would duplicate the network call.
+          const rechecked = yield* loadFromDisk
+          if (rechecked) return rechecked
+          // kilocode_change end
+          const text = yield* fetchAndWrite()
+          return JSON.parse(text) as Record<string, Provider>
         }),
       )
-      return JSON.parse(text) as Record<string, Provider>
     }).pipe(Effect.withSpan("ModelsDev.populate"), Effect.orDie)
 
     const [cachedGet, invalidate] = yield* Effect.cachedInvalidateWithTTL(populate, Duration.infinity)
diff --git a/packages/core/src/pty.ts b/packages/core/src/pty.ts
index 28e48f6b05..0157c0d8d1 100644
--- a/packages/core/src/pty.ts
+++ b/packages/core/src/pty.ts
@@ -11,6 +11,7 @@ import { SessionSchema } from "./session/schema" // kilocode_change
 import { Shell } from "./shell"
 import { lazy } from "./util/lazy"
 import { KiloPtySelfCommand } from "./kilocode/pty-self-command" // kilocode_change
+import { KiloPtyTermination } from "./kilocode/pty/termination" // kilocode_change
 
 const BUFFER_LIMIT = 1024 * 1024 * 2
 // Exited sessions stay observable (status, exit code, retained output) until removed explicitly.
@@ -35,6 +36,7 @@ type Active = {
   cursor: number
   subscribers: Map<object, Subscriber>
   listeners: Disp[]
+  stopping: boolean // kilocode_change
 }
 
 export const Info = Schema.Struct({
@@ -83,6 +85,8 @@ export type AttachInput = {
   readonly onData: (chunk: string) => void
   // Fired once when the session stops producing output: process exit (exitCode set), removal, or service teardown.
   readonly onEnd: (event: { exitCode?: number }) => void
+  // Canonical routes can replay retained output after exit; legacy callers retain the former error.
+  readonly allowExited?: boolean // kilocode_change
 }
 
 export type Attachment = {
@@ -147,23 +151,25 @@ export const layer = Layer.effect(
       session.subscribers.clear()
     }
 
-    function teardown(session: Active) {
+    // kilocode_change start - terminate the complete PTY tree before reporting removal.
+    async function teardown(session: Active) {
+      session.stopping = true
+      if (session.info.status === "running") await KiloPtyTermination.terminate(session.process)
       for (const listener of session.listeners) listener.dispose()
       session.listeners.length = 0
-      if (session.info.status === "running") {
-        try {
-          session.process.kill()
-        } catch {}
-      }
-      notifyEnd(session, {})
+      notifyEnd(session, session.info.status === "exited" ? { exitCode: session.info.exitCode } : {})
     }
+    // kilocode_change end
 
-    yield* Effect.addFinalizer(() =>
-      Effect.sync(() => {
-        for (const session of sessions.values()) teardown(session)
-        sessions.clear()
-        exitOrder.length = 0
-      }),
+    yield* Effect.addFinalizer(
+      () =>
+        // kilocode_change start - wait for process-tree termination during async service teardown.
+        Effect.promise(async () => {
+          await Promise.all(Array.from(sessions.values()).map(teardown))
+          sessions.clear()
+          exitOrder.length = 0
+        }),
+      // kilocode_change end
     )
 
     const requireSession = Effect.fn("Pty.requireSession")(function* (id: PtyID) {
@@ -173,14 +179,18 @@ export const layer = Layer.effect(
     })
 
     const removeSession = Effect.fnUntraced(function* (id: PtyID) {
-      const session = sessions.get(id)
-      if (!session) return
-      sessions.delete(id)
-      const index = exitOrder.indexOf(id)
-      if (index !== -1) exitOrder.splice(index, 1)
-      yield* Effect.logInfo("removing session", { id })
-      teardown(session)
-      yield* events.publish(Event.Deleted, { id: session.info.id })
+      // kilocode_change start - removal and its deleted event are one uninterruptible lifecycle transition.
+      yield* Effect.gen(function* () {
+        const session = sessions.get(id)
+        if (!session) return
+        yield* Effect.logInfo("removing session", { id })
+        yield* Effect.promise(() => teardown(session))
+        sessions.delete(id)
+        const index = exitOrder.indexOf(id)
+        if (index !== -1) exitOrder.splice(index, 1)
+        yield* events.publish(Event.Deleted, { id: session.info.id })
+      }).pipe(Effect.uninterruptible)
+      // kilocode_change end
     })
 
     const remove = Effect.fn("Pty.remove")(function* (id: PtyID) {
@@ -204,9 +214,10 @@ export const layer = Layer.effect(
         args: input.args ? [...input.args] : undefined,
         cwd: input.cwd,
       })
+      const implicit = !resolved.command
       const command = resolved.command || Shell.preferred(Config.latest(yield* config.entries(), "shell"))
       const base = resolved.args ?? []
-      const args = Shell.login(command) ? [...base, "-l"] : [...base]
+      const args = implicit && Shell.login(command) ? [...base, "-l"] : [...base]
       const cwd = resolved.cwd || location.directory
       // kilocode_change end
       const env = {
@@ -246,6 +257,7 @@ export const layer = Layer.effect(
         cursor: 0,
         subscribers: new Map(),
         listeners: [],
+        stopping: false, // kilocode_change
       }
       sessions.set(id, session)
       session.listeners.push(
@@ -269,7 +281,7 @@ export const layer = Layer.effect(
           session.bufferCursor += excess
         }),
         proc.onExit(({ exitCode }) => {
-          if (session.info.status === "exited") return
+          if (session.info.status === "exited" || session.stopping) return // kilocode_change
           session.info.status = "exited"
           session.info.exitCode = exitCode
           notifyEnd(session, { exitCode })
@@ -309,7 +321,7 @@ export const layer = Layer.effect(
 
     const attach = Effect.fn("Pty.attach")(function* (id: PtyID, input: AttachInput) {
       const session = yield* requireSession(id)
-      if (session.info.status !== "running") return yield* new ExitedError({ ptyID: id })
+      if (session.info.status !== "running" && !input.allowExited) return yield* new ExitedError({ ptyID: id }) // kilocode_change
       yield* Effect.logInfo("client attached to session", { id, directory: location.directory })
       const token = {}
       const subscriber: Subscriber = {
@@ -318,6 +330,7 @@ export const layer = Layer.effect(
         active: false,
         detached: false,
         pending: [],
+        end: session.info.status === "exited" ? { exitCode: session.info.exitCode } : undefined, // kilocode_change
       }
       session.subscribers.set(token, subscriber)
       const start = session.bufferCursor
diff --git a/packages/core/src/ripgrep.ts b/packages/core/src/ripgrep.ts
index 12d4c0eb0e..e154519560 100644
--- a/packages/core/src/ripgrep.ts
+++ b/packages/core/src/ripgrep.ts
@@ -165,11 +165,13 @@ export const layer = Layer.effect(
       )
       const abortable = input.signal ? program.pipe(Effect.raceFirst(waitForAbort(input.signal))) : program
       return abortable.pipe(
-        Effect.mapError((cause) =>
-          cause instanceof Error || cause instanceof InvalidPatternError
-            ? cause
-            : failure("ripgrep execution failed", cause),
-        ),
+        // kilocode_change start - surface the underlying reason instead of a bare wrapper message
+        Effect.mapError((cause) => {
+          if (cause instanceof Error || cause instanceof InvalidPatternError) return cause
+          const detail = cause instanceof globalThis.Error && cause.message.trim() ? `: ${cause.message.trim()}` : ""
+          return failure(`ripgrep execution failed${detail}`, cause)
+        }),
+        // kilocode_change end
       )
     }
 
diff --git a/packages/core/src/v1/config/config.ts b/packages/core/src/v1/config/config.ts
index 233f623837..77f5d55160 100644
--- a/packages/core/src/v1/config/config.ts
+++ b/packages/core/src/v1/config/config.ts
@@ -229,6 +229,9 @@ export const Info = Schema.Struct({
   layout: Schema.optional(ConfigLayoutV1.Layout).annotate({ description: "@deprecated Always uses stretch layout." }),
   permission: Schema.optional(ConfigPermissionV1.Info),
   tools: Schema.optional(Schema.Record(Schema.String, Schema.Boolean)),
+  web_search: Schema.optional(Schema.Boolean).annotate({
+    description: "Make web search available to models from all providers (default: false)",
+  }), // kilocode_change
   attachment: Schema.optional(ConfigAttachmentV1.Info).annotate({
     description: "Attachment processing configuration, including image size limits and resizing behavior",
   }),
diff --git a/packages/core/src/v1/permission.ts b/packages/core/src/v1/permission.ts
index b241ccd907..8c410562e6 100644
--- a/packages/core/src/v1/permission.ts
+++ b/packages/core/src/v1/permission.ts
@@ -45,6 +45,8 @@ export type Reply = typeof Reply.Type
 export const ReplyBody = Schema.Struct({
   reply: Reply,
   message: Schema.String.pipe(Schema.optional),
+  // kilocode_change - set by clients when a human answered the prompt; the server refuses machine approvals of skill-shell batches
+  interactive: Schema.Boolean.pipe(Schema.optional),
 }).annotate({ identifier: "PermissionReplyBody" })
 export type ReplyBody = typeof ReplyBody.Type
 
diff --git a/packages/core/test/kilocode/exit-code.test.ts b/packages/core/test/kilocode/exit-code.test.ts
new file mode 100644
index 0000000000..a316e839b3
--- /dev/null
+++ b/packages/core/test/kilocode/exit-code.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
+import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
+import { settle } from "@opencode-ai/core/kilocode/exit-code"
+import { testEffect } from "../lib/effect"
+
+const fx = testEffect(CrossSpawnSpawner.defaultLayer)
+
+const code = (exit: readonly [number | null, NodeJS.Signals | null]) => Effect.runPromise(settle(exit))
+
+describe("exit-code settle", () => {
+  test("maps exit results to numeric codes", async () => {
+    expect(await code([0, null])).toBe(ChildProcessSpawner.ExitCode(0))
+    expect(await code([42, null])).toBe(ChildProcessSpawner.ExitCode(42))
+    expect(await code([null, "SIGSEGV"])).toBe(ChildProcessSpawner.ExitCode(128 + 11))
+    expect(await code([null, "SIGTERM"])).toBe(ChildProcessSpawner.ExitCode(128 + 15))
+    expect(await code([null, null])).toBe(ChildProcessSpawner.ExitCode(1))
+    expect(await code([null, "SIGWHAT" as NodeJS.Signals])).toBe(ChildProcessSpawner.ExitCode(1))
+  })
+
+  fx.effect(
+    "reports signal termination as 128 + signum",
+    Effect.gen(function* () {
+      if (process.platform === "win32") return
+      const handle = yield* ChildProcess.make(process.execPath, ["-e", "process.kill(process.pid, 'SIGKILL')"])
+      expect(yield* handle.exitCode).toBe(ChildProcessSpawner.ExitCode(128 + 9))
+    }),
+  )
+})
diff --git a/packages/core/test/kilocode/pty-termination.test.ts b/packages/core/test/kilocode/pty-termination.test.ts
new file mode 100644
index 0000000000..a6162cfbe0
--- /dev/null
+++ b/packages/core/test/kilocode/pty-termination.test.ts
@@ -0,0 +1,108 @@
+import { describe, expect, test } from "bun:test"
+import { KiloPtyTermination } from "../../src/kilocode/pty/termination"
+
+function fake(pid = 123) {
+  const calls: Array<string | undefined> = []
+  const proc: KiloPtyTermination.Process = {
+    pid,
+    onExit: () => ({ dispose() {} }),
+    kill: (signal) => calls.push(signal),
+  }
+  return { proc, calls }
+}
+
+function runtime(
+  platform: NodeJS.Platform,
+  input: {
+    taskkill?: boolean
+    signal?: "throw"
+    tree?: Array<{ pid: number; parent: number }>
+  } = {},
+) {
+  const tasks: Array<{
+    file: string
+    args: string[]
+    opts: { stdio: "ignore"; windowsHide: true; timeout: number }
+  }> = []
+  const signals: Array<{ pid: number; signal: "SIGTERM" | "SIGKILL" }> = []
+  const sleeps: number[] = []
+  const value: KiloPtyTermination.Runtime = {
+    platform,
+    taskkill: async (file, args, opts) => {
+      tasks.push({ file, args, opts })
+      return input.taskkill ?? true
+    },
+    tree: async () => input.tree ?? [],
+    alive: () => true,
+    signal: (pid, signal) => {
+      signals.push({ pid, signal })
+      if (input.signal === "throw") throw new Error("process group unavailable")
+    },
+    sleep: async (ms) => {
+      sleeps.push(ms)
+    },
+  }
+  return { value, tasks, signals, sleeps }
+}
+
+describe("pty process-tree termination", () => {
+  test("uses hidden taskkill for Windows process trees", async () => {
+    const item = fake(42)
+    const input = runtime("win32")
+
+    await KiloPtyTermination.terminate(item.proc, input.value)
+
+    expect(input.tasks).toEqual([
+      {
+        file: "taskkill",
+        args: ["/pid", "42", "/f", "/t"],
+        opts: { stdio: "ignore", windowsHide: true, timeout: 5_000 },
+      },
+    ])
+    expect(input.signals).toEqual([])
+    expect(item.calls).toEqual([])
+    expect(input.sleeps).toEqual([200])
+  })
+
+  test("signals POSIX process groups before escalating", async () => {
+    const item = fake(42)
+    const input = runtime("linux")
+
+    await KiloPtyTermination.terminate(item.proc, input.value)
+
+    expect(input.signals).toEqual([
+      { pid: -42, signal: "SIGTERM" },
+      { pid: 42, signal: "SIGTERM" },
+      { pid: -42, signal: "SIGKILL" },
+      { pid: 42, signal: "SIGKILL" },
+    ])
+    expect(item.calls).toEqual([])
+    expect(input.sleeps).toEqual([200, 200])
+  })
+
+  test("falls back to direct PTY signals when a process group is unavailable", async () => {
+    const item = fake(42)
+    const input = runtime("darwin", { signal: "throw" })
+
+    await KiloPtyTermination.terminate(item.proc, input.value)
+
+    expect(item.calls).toEqual(["SIGTERM", "SIGKILL"])
+  })
+
+  test("signals descendants that run in separate process groups", async () => {
+    const item = fake(42)
+    const input = runtime("linux", {
+      tree: [
+        { pid: 43, parent: 42 },
+        { pid: 44, parent: 43 },
+      ],
+    })
+
+    await KiloPtyTermination.terminate(item.proc, input.value)
+
+    expect(input.signals).toContainEqual({ pid: -44, signal: "SIGTERM" })
+    expect(input.signals).toContainEqual({ pid: 44, signal: "SIGKILL" })
+    expect(input.signals).toContainEqual({ pid: -43, signal: "SIGTERM" })
+    expect(input.signals).toContainEqual({ pid: 43, signal: "SIGKILL" })
+  })
+})
diff --git a/packages/core/test/pty/pty-session.test.ts b/packages/core/test/pty/pty-session.test.ts
index 6b78ec4d13..30e223faac 100644
--- a/packages/core/test/pty/pty-session.test.ts
+++ b/packages/core/test/pty/pty-session.test.ts
@@ -127,6 +127,53 @@ describe("pty", () => {
     }),
   )
 
+  // kilocode_change start - explicit commands must not acquire implicit login-shell arguments.
+  ptyTest("preserves explicit command arguments", () =>
+    Effect.gen(function* () {
+      const args = ["-c", 'printf "<%s>" "$0"; sleep 5']
+      const info = yield* createPty("sh", args)
+      expect(info.args).toEqual(args)
+
+      const attached = yield* attachCollecting(info.id)
+      expect(yield* waitForOutput(attached.output, "<sh>")).toContain("<sh>")
+    }),
+  )
+
+  // (script terminals forward raw output to xterm without transcoding).
+  ptyTest("round-trips non-ASCII output byte-identically", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const marker = "café-über-北京-🚀"
+      const info = yield* createPty("sh", ["-c", `printf '${marker}\\n'`])
+      const attached = yield* attachCollecting(info.id)
+      expect(yield* waitForOutput(attached.output, marker)).toContain(marker)
+    }),
+  )
+  ptyTest("terminates background descendants outside the shell process group", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const info = yield* createPty("sh", ["-c", 'sleep 30 & printf "<CHILD:%s>" "$!"; wait'])
+      const attached = yield* attachCollecting(info.id)
+      const output = yield* waitForOutput(attached.output, ">")
+      const match = output.match(/<CHILD:(\d+)>/)
+      expect(match?.[1]).toBeDefined()
+      const pid = Number(match?.[1])
+
+      yield* pty.remove(info.id)
+      yield* Effect.sleep("100 millis")
+      const alive = yield* Effect.sync(() => {
+        try {
+          process.kill(pid, 0)
+          return true
+        } catch {
+          return false
+        }
+      })
+      expect(alive).toBe(false)
+    }),
+  )
+  // kilocode_change end
+
   ptyTest("replays buffered output and streams live output to attachments", () =>
     Effect.gen(function* () {
       const pty = yield* Pty.Service
@@ -201,6 +248,31 @@ describe("pty", () => {
         expect(Cause.squash(result.cause)).toMatchObject({ _tag: "Pty.ExitedError", ptyID: info.id })
     }),
   )
+
+  // kilocode_change start - canonical attachments replay retained exited output, then end without accepting input.
+  ptyTest("replays exited output and ends when enabled", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const events = yield* subscribePtyEvents()
+      const info = yield* createPty("sh", ["-c", 'printf "replayed"; exit 7'])
+      expect(yield* waitForEvents(events, info.id, 2)).toEqual(["created", "exited"])
+
+      const ended = yield* Deferred.make<{ exitCode?: number }>()
+      const attachment = yield* pty.attach(info.id, {
+        allowExited: true,
+        onData: () => {},
+        onEnd: (event) => Deferred.doneUnsafe(ended, Effect.succeed(event)),
+      })
+      expect(attachment.replay).toContain("replayed")
+
+      attachment.write("ignored")
+      yield* pty.remove(info.id)
+      attachment.activate()
+      expect(yield* Deferred.await(ended).pipe(Effect.timeout("5 seconds"))).toEqual({ exitCode: 7 })
+      attachment.detach()
+    }),
+  )
+  // kilocode_change end
 })
 
 const configuredShell = process.platform === "win32" ? undefined : Bun.which("bash")
diff --git a/packages/core/test/ripgrep.test.ts b/packages/core/test/ripgrep.test.ts
index 677ecc2dd6..b8e19e39ea 100644
--- a/packages/core/test/ripgrep.test.ts
+++ b/packages/core/test/ripgrep.test.ts
@@ -61,4 +61,18 @@ describe("Ripgrep", () => {
       (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
     ),
   )
+
+  // kilocode_change start - surfaced error keeps the underlying reason
+  it.live("includes the underlying reason in execution failures", () =>
+    Effect.gen(function* () {
+      const ripgrep = yield* Ripgrep.Service
+      const controller = new AbortController()
+      controller.abort()
+      const error = yield* ripgrep
+        .find({ cwd: process.cwd(), pattern: "*", limit: 1, signal: controller.signal })
+        .pipe(Effect.flip)
+      expect(error.message).toMatch(/^ripgrep execution failed: .+/)
+    }),
+  )
+  // kilocode_change end
 })
diff --git a/packages/effect-drizzle-sqlite/package.json b/packages/effect-drizzle-sqlite/package.json
index 920418a989..bdc5267013 100644
--- a/packages/effect-drizzle-sqlite/package.json
+++ b/packages/effect-drizzle-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "name": "@opencode-ai/effect-drizzle-sqlite",
   "type": "module",
   "license": "MIT",
diff --git a/packages/effect-sqlite-node/package.json b/packages/effect-sqlite-node/package.json
index 66a2274823..c5863bfad0 100644
--- a/packages/effect-sqlite-node/package.json
+++ b/packages/effect-sqlite-node/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "name": "@opencode-ai/effect-sqlite-node",
   "type": "module",
   "license": "MIT",
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index d31c75a3d8..a912fd5940 100644
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "kilo"
 name = "Kilo"
 description = "The open source coding agent."
-version = "7.4.16"
+version = "7.4.17"
 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.4.16/opencode-darwin-arm64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.17/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.4.16/opencode-darwin-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.17/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.16/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.17/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.4.16/opencode-linux-x64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.17/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.4.16/opencode-windows-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.17/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index fec3e374d0..46de980c7a 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "name": "@opencode-ai/http-recorder",
   "description": "Record and replay Effect HTTP client traffic with deterministic cassettes",
   "type": "module",
diff --git a/packages/kilo-console/package.json b/packages/kilo-console/package.json
index 82ed878f47..53ac288500 100755
--- a/packages/kilo-console/package.json
+++ b/packages/kilo-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-console",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/kilo-console/src/routes/config/SourcesRoute.tsx b/packages/kilo-console/src/routes/config/SourcesRoute.tsx
index 3fe405b8f0..d6fb5eb0e6 100644
--- a/packages/kilo-console/src/routes/config/SourcesRoute.tsx
+++ b/packages/kilo-console/src/routes/config/SourcesRoute.tsx
@@ -13,7 +13,11 @@ export function SourcesRoute() {
           <ConfigToolbar
             title="Load Order"
             description="Load order and editability without exposing secret values."
-            meta={<Tag>{data().overlay.targets.active ?? "Read only"}</Tag>}
+            meta={
+              <Tag>
+                {data().overlay.targets.active.writable ? data().overlay.targets.active.scope : "Read only"}
+              </Tag>
+            }
           />
 
           <div class="table" role="table" aria-label="Config sources">
diff --git a/packages/kilo-console/src/routes/config/ToolsRoute.tsx b/packages/kilo-console/src/routes/config/ToolsRoute.tsx
index 1aca8a16b8..1dd1001e66 100644
--- a/packages/kilo-console/src/routes/config/ToolsRoute.tsx
+++ b/packages/kilo-console/src/routes/config/ToolsRoute.tsx
@@ -1,14 +1,18 @@
 import { createMemo, createSignal, For, Show } from "solid-js"
 import { ConfigRow, SectionTitle, StatusTag } from "@kilocode/kilo-web-ui/console"
+import { Button } from "@kilocode/kilo-web-ui/button"
+import { Card } from "@kilocode/kilo-web-ui/card"
 import { SearchField } from "../../components/SearchField"
 import { useConfig } from "../../context/config"
 import { toolCapabilities, toolName } from "../../shared/utils"
-import { ConfigCountTag as CountTag, ConfigPage } from "./ConfigPage"
+import { ConfigCountTag as CountTag, ConfigPage, ConfigTag as Tag, SourceBadge } from "./ConfigPage"
 
 export function ToolsRoute() {
   const ctx = useConfig()
   const [search, setSearch] = createSignal("")
   const snap = () => ctx.data()
+  const websearch = createMemo(() => snap()?.overlay.fields.web_search)
+  const searchEnabled = createMemo(() => websearch()?.value === true)
   const rows = createMemo(() => {
     const data = snap()
     if (!data) return []
@@ -52,6 +56,48 @@ export function ToolsRoute() {
           }
           description="Built-in tools available to agents, including file access, terminal execution, search, fetch, and orchestration tools."
         >
+          <Card class="ui-card" padding={0}>
+            <header class="ui-card-header">
+              <div>
+                <h2>Web search</h2>
+                <p>Control web search availability for models from providers that do not enable it by default.</p>
+              </div>
+              <Show when={ctx.query()?.scope === "project" && websearch()?.overridden}>
+                <Button
+                  variant="secondary"
+                  disabled={Boolean(ctx.saving())}
+                  onClick={() => ctx.unset([["web_search"]])}
+                >
+                  Revert
+                </Button>
+              </Show>
+            </header>
+            <div class="ui-form">
+              <button
+                class="ui-toggle"
+                classList={{ selected: searchEnabled() }}
+                type="button"
+                aria-pressed={searchEnabled()}
+                disabled={Boolean(ctx.saving()) || websearch()?.editable === false}
+                onClick={() => ctx.save({ web_search: !searchEnabled() })}
+              >
+                <span>
+                  <strong>Enable for all providers</strong>
+                  <small>Search requests use Exa or Parallel.</small>
+                  <Show when={websearch()?.reason}>{(reason) => <small>{reason()}</small>}</Show>
+                </span>
+                <span class="tags">
+                  <SourceBadge
+                    source={websearch()?.source}
+                    inherited={websearch()?.inherited}
+                    overridden={websearch()?.overridden}
+                  />
+                  <Tag tone={searchEnabled() ? "success" : "neutral"}>{searchEnabled() ? "On" : "Off"}</Tag>
+                </span>
+              </button>
+            </div>
+          </Card>
+
           <SearchField
             label="Filter tools"
             value={search()}
diff --git a/packages/kilo-docs/lib/nav/ai-providers.ts b/packages/kilo-docs/lib/nav/ai-providers.ts
index f604826c7c..1a2dfe9ae3 100644
--- a/packages/kilo-docs/lib/nav/ai-providers.ts
+++ b/packages/kilo-docs/lib/nav/ai-providers.ts
@@ -46,6 +46,7 @@ export const AiProvidersNav: NavSection[] = [
       { href: "/ai-providers/groq", children: "Groq" },
       { href: "/ai-providers/cerebras", children: "Cerebras" },
       { href: "/ai-providers/fireworks", children: "Fireworks AI" },
+      { href: "/ai-providers/mixlayer", children: "Mixlayer" },
     ],
   },
   {
diff --git a/packages/kilo-docs/package.json b/packages/kilo-docs/package.json
index cff09854e6..742763dd4d 100644
--- a/packages/kilo-docs/package.json
+++ b/packages/kilo-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-docs",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "private": true,
   "scripts": {
     "dev": "next dev --webpack --port 3002",
diff --git a/packages/kilo-docs/pages/ai-providers/cerebras.md b/packages/kilo-docs/pages/ai-providers/cerebras.md
index 69487b2ee7..bdf7166a51 100644
--- a/packages/kilo-docs/pages/ai-providers/cerebras.md
+++ b/packages/kilo-docs/pages/ai-providers/cerebras.md
@@ -53,7 +53,7 @@ Then set your default model:
 
 ```jsonc
 {
-  "model": "cerebras/llama-4-scout-17b-16e-instruct",
+  "model": "cerebras/gpt-oss-120b",
 }
 ```
 
diff --git a/packages/kilo-docs/pages/ai-providers/mixlayer.md b/packages/kilo-docs/pages/ai-providers/mixlayer.md
new file mode 100644
index 0000000000..4f34abfaa1
--- /dev/null
+++ b/packages/kilo-docs/pages/ai-providers/mixlayer.md
@@ -0,0 +1,79 @@
+---
+title: "Using Mixlayer with Kilo Code | Fast Open-Model Inference"
+description: "Run open models like GLM and Qwen on Mixlayer's OpenAI-compatible API in Kilo Code. Setup guide for VS Code and the CLI."
+---
+
+# Using Mixlayer With Kilo Code
+
+Mixlayer is an inference platform for open models such as GLM and Qwen, with a serving stack built from scratch by core contributors to Candle. It exposes an OpenAI-compatible API and is available as a built-in provider in Kilo Code.
+
+**Website:** [https://mixlayer.com/](https://mixlayer.com/)
+
+## Getting an API Key
+
+1. **Sign Up/Sign In:** Go to [Mixlayer](https://mixlayer.com/) and create an account or sign in.
+2. **Navigate to API Keys:** Open the [Mixlayer console](https://console.mixlayer.com/) and go to the API Keys page.
+3. **Create a Key:** Click **New Key**, give it a descriptive name (e.g., "Kilo Code"), and copy it. You will not be able to view it again.
+
+## Configuration in Kilo Code
+
+Mixlayer is available as a **built-in provider** in Kilo Code, so you can connect it directly — no custom provider setup needed.
+
+{% tabs %}
+{% tab label="VSCode" %}
+
+1. Open **Settings** (gear icon) and go to the **Providers** tab.
+2. Click **Connect provider**, search for **Mixlayer**, and select it.
+3. Enter your Mixlayer API key.
+4. Pick a model — Kilo Code fetches the available models automatically.
+
+{% /tab %}
+{% tab label="CLI" %}
+
+**Method 1 — `/connect` (recommended)**
+
+Run `kilo`, then use the `/connect` command, select **Mixlayer**, and paste your API key when prompted:
+
+```bash
+kilo
+# then, inside Kilo, run:
+/connect
+```
+
+**Method 2 — config file**
+
+Set your API key and add Mixlayer in your `kilo.json` config file (`~/.config/kilo/kilo.json` or `./kilo.json`):
+
+```bash
+export MIXLAYER_API_KEY="your-api-key"
+```
+
+```jsonc
+{
+  "provider": {
+    "mixlayer": {
+      "env": ["MIXLAYER_API_KEY"],
+    },
+  },
+  "model": "mixlayer/z-ai/glm-5.2",
+}
+```
+
+{% /tab %}
+{% /tabs %}
+
+## Models
+
+Mixlayer serves open models including:
+
+- `z-ai/glm-5.2` — 256K context
+- `qwen/qwen3.5-397b-a17b` and the Qwen 3.5 / 3.6 line (vision-capable)
+- `moonshotai/kimi-k2.7-code`
+
+Tool calling and reasoning are supported across the model line. See the [Mixlayer docs](https://docs.mixlayer.com) for the full, current model list and supported parameters.
+
+## Tips and Notes
+
+- **Model list:** Kilo Code auto-detects available models from Mixlayer's `/v1/models` endpoint, so the picker stays current with your account.
+- **Pricing:** See the [Mixlayer console](https://console.mixlayer.com/) for current per-model pricing.
+- **Reasoning:** Qwen models support a thinking mode; reasoning tokens count against the output budget, so give responses enough room when reasoning is enabled.
diff --git a/packages/kilo-docs/pages/automate/agent-manager.md b/packages/kilo-docs/pages/automate/agent-manager.md
index 9651c14b2b..a6b566c47a 100644
--- a/packages/kilo-docs/pages/automate/agent-manager.md
+++ b/packages/kilo-docs/pages/automate/agent-manager.md
@@ -159,7 +159,9 @@ Each request can include 1-20 tasks. Each task must include at least one of `pro
 
 The companion `agent_manager_models` tool searches models and their supported reasoning variants on demand. Results are grouped by model name (with the offering providers listed for reference) and limited to 20 per call, so the full catalog is never added to the conversation context.
 
-The tool uses the `agent_manager` permission. Approval prompts are scoped to the requested capability, so approving `worktree` does not automatically approve `local`, an overview, or a targeted prompt. Prompting an existing managed session requires an explicit `prompt` approval the first time, even if Agent Manager session creation was previously approved broadly.
+The same tool also manages existing sessions. It can return a compact overview of sections, worktrees, and local sessions, send a prompt to one managed session, or stop a managed session. Stopping aborts the session's active work and removes it from the panel, just like closing the session tab.
+
+The tool uses the `agent_manager` permission. Approval prompts are scoped to the requested capability, so approving `worktree` does not automatically approve `local`, an overview, or a targeted prompt. Prompting an existing managed session requires an explicit `prompt` approval the first time, even if Agent Manager session creation was previously approved broadly. Stopping a session likewise requires an explicit `stop` approval.
 
 ## Sections
 
@@ -241,6 +243,8 @@ Create a script file in `.kilo/` using the appropriate filename for your platfor
 
 Kilo runs the script automatically whenever a new worktree is created. It uses `sh` for POSIX scripts, PowerShell for `.ps1`, and `cmd.exe` for `.cmd` / `.bat`, so executable permissions are not required.
 
+Where the script runs follows the terminal destination dropdown in the Agent Manager toolbar. **Agent Manager panel** shows live output in a named `Setup` tab in the side terminal panel. After success, the panel returns to its previous state unless you interacted with it; the retained tab remains available for review. Failures keep the panel open. **VS Code terminal** runs setup as a task in the integrated terminal. The script keeps the existing five-minute timeout; when it expires, the setup process tree is terminated and the failed tab retains its partial output.
+
 Two extra variables are injected into the setup script's environment:
 
 | Variable | Value |
@@ -263,7 +267,7 @@ if [ -f "$REPO_PATH/apps/web/.env.local" ] && [ ! -f "$WORKTREE_PATH/apps/web/.e
 fi
 ```
 
-If the setup script fails, Agent Manager shows the failure and keeps the worktree available so you can inspect it, fix the script, or run setup steps manually.
+If the setup script fails, Agent Manager shows the failure (a failed `Setup` tab in the side terminal panel, or the task output in the integrated terminal) and keeps the worktree available so you can inspect it, fix the script, or run setup steps manually.
 
 ### Environment File Copying
 
@@ -339,10 +343,12 @@ Two extra variables are injected into the script's environment:
 
 ### Using the run button
 
-- **Run:** Click the play button in the toolbar or press `Cmd+E` (macOS) / `Ctrl+E` (Windows/Linux). Output appears in a dedicated VS Code task panel.
+- **Run:** Click the play button in the toolbar or press `Cmd+E` (macOS) / `Ctrl+E` (Windows/Linux). Output appears in a named `Run` tab in the Agent Manager terminal panel and remains available after the script exits.
 - **Stop:** Click the stop button (same position) or press `Cmd+E` again while running.
 - **Configure:** Click the dropdown arrow next to the run button and select "Configure run script" to open the script in your editor.
 
+The terminal destination dropdown in the Agent Manager toolbar also controls where the script runs. **Agent Manager panel** uses the named side terminal, while **VS Code terminal** runs it as a task in the integrated terminal. The integrated terminal option is kept for comparison and will be removed in a future release.
+
 ## Session State and Persistence
 
 Agent Manager state is persisted in `.kilo/agent-manager.json`. It stores worktrees, sections, session tabs, ordering, collapsed state, diff preferences, and cached PR metadata. Git branches and worktree directories remain on disk separately.
diff --git a/packages/kilo-docs/pages/code-with-ai/agents/context-mentions.md b/packages/kilo-docs/pages/code-with-ai/agents/context-mentions.md
index 599917b6d2..7978ddd868 100644
--- a/packages/kilo-docs/pages/code-with-ai/agents/context-mentions.md
+++ b/packages/kilo-docs/pages/code-with-ai/agents/context-mentions.md
@@ -25,9 +25,16 @@ Type `@` in the chat input to get autocomplete suggestions. You can mention:
 | **File** | Attach a file's contents to your message | `@src/utils.ts` |
 | **Terminal** | Include your active VS Code terminal output | `@terminal` |
 | **Git Changes** | Attach uncommitted working-tree diffs and new files | `@git-changes` |
+| **Past chats** | Attach a previous session's transcript as context | `@` → **Past chats** → pick a session |
 
 Selecting a suggestion inserts the mention and highlights it in the input. File contents, terminal output, and git changes are attached as context when you send the message.
 
+### Referencing Past Chats
+
+Choosing **Past chats** from the `@` menu opens a searchable picker of your previous sessions in the current workspace, ordered by recency. Selecting a session inserts a highlighted mention token; when you send the message, that session's current transcript is attached as context so the agent can build on the earlier conversation. Clicking the mention token opens the referenced session.
+
+Very long transcripts are truncated, keeping the beginning and end, so a single mention cannot fill the context window.
+
 ### Drag and Drop
 
 You can also add file mentions by dragging and dropping:
@@ -70,6 +77,7 @@ This means the agent can explore your entire project as needed, rather than bein
 | **Mention files when helpful** | If you know the exact file, mention its path to save the agent a search step |
 | **Keep editor tabs relevant** | Open tabs are passed as context, so keep relevant files open |
 | **Trust the agent's tools** | The agent can search, read, and explore your codebase — let it do the discovery work |
+| **Reference a past chat** | Type `@` and choose **Past chats** to open a searchable picker of previous sessions in the current workspace. Selecting a session attaches its current transcript as context when you send the message. |
 
 {% /tab %}
 {% tab label="CLI" %}
diff --git a/packages/kilo-docs/pages/code-with-ai/agents/model-selection.md b/packages/kilo-docs/pages/code-with-ai/agents/model-selection.md
index 1ed19e42de..1ef3526d95 100644
--- a/packages/kilo-docs/pages/code-with-ai/agents/model-selection.md
+++ b/packages/kilo-docs/pages/code-with-ai/agents/model-selection.md
@@ -26,6 +26,7 @@ While the specifics change constantly, some principles stay consistent:
 
 - Use the **model selector** in the chat prompt area to pick a model for the current session. You can also type `/models` to open the model picker.
 - When the selected model supports variants, type `/variant` to open the reasoning effort selector.
+- Press `Shift+Tab` in the prompt input to cycle to the next reasoning effort variant, wrapping after the last one. This works in the sidebar chat, the Agent Manager prompt, and the New Worktree dialog, and the variant selector tooltip shows the shortcut on hover. To keep `Shift+Tab` for keyboard focus navigation instead, disable the `kilo-code.new.chat.shiftTabCyclesVariant` setting (also available under **Settings → Display**).
 - Set per-agent defaults and a global default in the **Settings** panel (Models tab), or directly in the `kilo.jsonc` config file.
 - **Model precedence:** Session override → Last picked per agent → Per-agent config → Global config → [Auto Free](/docs/code-with-ai/agents/auto-model#tiers) (note: Auto Free may route to providers that log prompts — see the Auto Model page for details).
 - The model selector remembers the last model you picked for each agent — switching agents restores your previous choice. A manual pick always beats config settings; use the **reset button** (visible when your active model differs from config) to go back to the config default.
diff --git a/packages/kilo-docs/pages/code-with-ai/features/checkpoints.md b/packages/kilo-docs/pages/code-with-ai/features/checkpoints.md
index d8a2d98158..2e36fa2bea 100644
--- a/packages/kilo-docs/pages/code-with-ai/features/checkpoints.md
+++ b/packages/kilo-docs/pages/code-with-ai/features/checkpoints.md
@@ -100,6 +100,10 @@ Clicking **Revert to here** does two things:
 
 The button is only active when the agent is idle. While the agent is running, the button is disabled to prevent reverting mid-operation.
 
+{% callout type="note" %}
+Workspace restoration requires snapshots. If snapshots are disabled or the reverted range has no stored checkpoint, only the conversation is rewound — the agent's file changes remain on disk, and the revert banner warns you (see below).
+{% /callout %}
+
 ### The Revert Banner
 
 After reverting, a **Revert Banner** appears at the bottom of the chat. The banner shows:
@@ -113,6 +117,11 @@ The banner provides two actions:
 - **Redo** — Steps forward one message at a time, re-applying changes from the next reverted message
 - **Redo All** — Restores the workspace to the latest state and un-hides all messages (only shown when more than one message is reverted)
 
+If a revert could not restore your workspace files, the banner warns you that only the conversation was rewound:
+
+- **Snapshots disabled** — the banner explains that file changes were not restored because snapshots are disabled, and offers an **Enable snapshots** button that opens **Settings → Checkpoints**.
+- **No checkpoint available** — the banner explains that no file checkpoint was available, so workspace changes remain on disk (for example, when reverting a range that predates checkpoints).
+
 ### Making a Revert Permanent
 
 While in a reverted state, you have two choices:
diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md b/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md
index 5a9fe22b84..bc21780063 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md
@@ -36,6 +36,16 @@ Before using Cloud Agents:
 
 Your work is always pushed to GitHub, ensuring nothing is lost.
 
+## Starting Tasks from the CLI
+
+Use the `kilo cloud` command to run Cloud Agent tasks without opening the browser:
+
+```bash
+kilo cloud start --prompt "Fix the flaky login test" --repo Kilo-Org/kilocode
+```
+
+`kilo cloud` can start tasks, send follow-up prompts, and check task status and results. Repository, branch, model, mode, and organization are inferred from your local checkout and CLI defaults unless you pass the matching flags. Add `--stream` to `kilo cloud start` to print task events as JSONL until the task completes. See the [CLI reference](/docs/code-with-ai/platforms/cli-reference#kilo-cloud) for all commands and options.
+
 ## How Cloud Agents Work
 
 - Each user receives an **isolated Linux container** with common dev tools preinstalled (Node.js, git, gh CLI, glab CLI, etc.).
@@ -96,7 +106,7 @@ You can customize each Cloud Agent session by also defining env vars and startup
 
 ## Skills
 
-Cloud Agents support project-level [skills](/docs/code-with-ai/platforms/cli#skills) stored in your repository. When your repo is cloned, any skills in `.kilocode/skills/` are automatically available.
+Cloud Agents support project-level [skills](/docs/code-with-ai/platforms/cli#skills) stored in your repository. When your repo is cloned, any skills in `.kilocode/skills/` are automatically available. Skill folders are uploaded as `.zip` archives, with up to 40 companion files per skill.
 
 {% callout type="note" %}
 Global skills (`~/.kilocode/skills/`) are not available in Cloud Agents since there is no persistent user home directory.
diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/jetbrains.md b/packages/kilo-docs/pages/code-with-ai/platforms/jetbrains.md
index a94b3cfc49..ca9f785b64 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/jetbrains.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/jetbrains.md
@@ -8,3 +8,11 @@ description: "Using Kilo Code in JetBrains IDEs"
 ## Installation
 
 {% partial file="install-jetbrains.md" /%}
+
+## Settings
+
+Open **Settings → Tools → Kilo Code** to configure the plugin. The JetBrains plugin reads and writes the same shared `kilo.jsonc` config files as the CLI and the VS Code extension, so changes apply across clients. See [Settings](/docs/getting-started/settings) for config file locations and precedence.
+
+- **Auto-Approve** — set per-tool permission levels (Allow / Ask / Deny) and manage granular command and path exceptions without editing config by hand. Permission prompts offer one-time approvals alongside saved allow/reject rules. See [Auto-Approving Actions](/docs/getting-started/settings/auto-approving-actions) for the shared permission model.
+- **Context** — toggle auto-compaction, set the auto-compaction limit (the percentage of the model window that triggers compaction), enable pruning of old tool outputs, and manage file watcher ignore patterns. See [Context Condensing](/docs/customize/context/context-condensing) and [.kilocodeignore](/docs/customize/context/kilocodeignore) for what these settings control.
+- **Agent Behavior → Skills** — inspect loaded skills, add extra skill sources (local paths or remote URLs), edit or remove custom skills, and open skill files in the editor. See [Skills](/docs/customize/skills) for the skill format and discovery rules.
diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/mobile.md b/packages/kilo-docs/pages/code-with-ai/platforms/mobile.md
index 44b2b74d41..b91950b5ec 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/mobile.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/mobile.md
@@ -20,6 +20,10 @@ The mobile app lets you:
 - Spawn Cloud Agents and code directly from the app.
 - Monitor and view all non-remote sessions in one place.
 - Create, onboard, and manage KiloClaw instances.
+- Send follow-up messages while a session is still running — they are queued and processed in order.
+- Run slash commands (like `/compact`) on connected remote CLI sessions, and start a new session in the same workspace with `/new`. Older CLI versions that do not support remote commands prompt you to upgrade.
+- Review GitHub pull requests end to end — diffs, checks, comments, and merging.
+- Start a new session on a connected `kilo remote` CLI instance with the **Run on** picker.
 
 ## Kilo Pass and Billing
 
@@ -39,6 +43,43 @@ For Kilo Pass pricing, billing, and account management details, use the [Kilo Pa
 {% image src="/docs/img/mobile-apps/session-filters.webp" alt="Kilo Code mobile session filter panel for Cloud Extension CLI Slack and other platforms" caption="Filter sessions by platform and project, including Cloud, Extension, CLI, Slack, and other sessions." /%}
 {% /imageGallery %}
 
+## Choosing where a session runs
+
+The new-session screen includes a **Run on** picker that chooses where your session runs:
+
+- **Cloud Agent** — the managed cloud environment (the default).
+- **A connected CLI instance** — a `kilo remote` CLI running on your own machine. The picker lists the instances currently connected to your account.
+
+Remote sessions use the CLI's own defaults, so the composer skips model, mode, and repository selection; you type your first prompt in the chat after the session starts. Sessions started in an organization context always run on the Cloud Agent, so the picker does not appear there.
+
+## Queueing follow-up messages
+
+The composer stays editable while the agent is working, so you don't have to wait for a session to finish before sending your next message. Type your follow-up and press **Send** to add it to the session's queue; queued messages are processed in order. While a session is streaming, **Stop** appears only when the composer is empty — with text entered, Send takes its place.
+
+A queued message shows a subtle **Queued** badge on its bubble. The badge clears when the message starts processing or when the queue drains or is cancelled. Queueing works for Cloud Agent sessions and for remote sessions on a connected `kilo remote` CLI instance.
+
+## Reviewing GitHub pull requests
+
+Open a pull request from a PR link to review it without leaving the app:
+
+- **Overview** — PR state and CI checks at a glance.
+- **Files** — syntax-highlighted diffs with line-level comments and a file navigator.
+- **Discussion** — review threads with replies, resolve/unresolve, and reactions.
+
+Comments you leave are collected into a pending review on your device and submitted to GitHub as a single review. When the PR is ready, you can merge it (merge, squash, or rebase), enable or disable auto-merge, or update the branch — all from the app.
+
+PR review uses your connected GitHub account; the app asks you to connect GitHub if you have not already.
+
+## Session cost and model details
+
+The app shows what each session cost and which models did the work:
+
+- **Session list** — a finished session with a recorded cost shows it in the row's meta line (for example, `$0.12 · 5m ago`). Sessions that are still running or have no cost show no cost.
+- **Cost breakdown** — open a session's Context usage sheet to see a Token usage section (input, output, reasoning, cache read, and cache write tokens, plus the cache hit rate) and a collapsible Models section with each model's name, provider, step count, and cost. A Subagents row covers any remaining spend, so the per-model costs always add up to the session total.
+- **Per-message model label** — assistant messages show a dimmed model label on the first assistant reply and whenever the model changes during the session. Turns routed by [Auto Model](/docs/code-with-ai/agents/auto-model) show the concrete model that handled the turn.
+
+Cost is recorded when a session closes; sessions that closed before this feature shipped do not show a cost.
+
 ## Android App
 
 The Android app is available now on Google Play.
diff --git a/packages/kilo-docs/pages/gateway/authentication.md b/packages/kilo-docs/pages/gateway/authentication.md
index 30129525ed..ba6c3a794f 100644
--- a/packages/kilo-docs/pages/gateway/authentication.md
+++ b/packages/kilo-docs/pages/gateway/authentication.md
@@ -97,6 +97,7 @@ BYOK lets you use your own provider API keys with the Kilo AI Gateway. When a BY
 | Kimi Code | `kimi-coding` |
 | Martian | `martian` |
 | Neuralwatt | `neuralwatt` |
+| NVIDIA | `nvidia-byok` |
 | Ollama Cloud | `ollama-cloud` |
 | OpenCode Go | `opencode-go` |
 | OrcaRouter | `orcarouter` |
diff --git a/packages/kilo-docs/pages/getting-started/byok.md b/packages/kilo-docs/pages/getting-started/byok.md
index adb426172d..84c47dfa23 100644
--- a/packages/kilo-docs/pages/getting-started/byok.md
+++ b/packages/kilo-docs/pages/getting-started/byok.md
@@ -49,6 +49,7 @@ These providers offer coding-focused subscriptions or dedicated endpoints. Bring
 - Martian
 - Mistral Codestral
 - Neuralwatt
+- NVIDIA
 - Ollama Cloud
 - OpenCode Go
 - OrcaRouter
diff --git a/packages/kilo-docs/pages/getting-started/settings/auto-approving-actions.md b/packages/kilo-docs/pages/getting-started/settings/auto-approving-actions.md
index 096b2d1b3d..070fc59df5 100644
--- a/packages/kilo-docs/pages/getting-started/settings/auto-approving-actions.md
+++ b/packages/kilo-docs/pages/getting-started/settings/auto-approving-actions.md
@@ -9,7 +9,7 @@ description: "Configure automatic approval settings for Kilo Code operations"
 **Security Warning:** Auto-approve settings bypass confirmation prompts, giving Kilo Code direct access to your system. This can result in data loss, file corruption, or worse. Command line access is particularly dangerous, as it can potentially execute harmful operations that could damage your system or compromise security. Only enable auto-approval for actions you fully trust.
 {% /callout %}
 
-Auto-approve settings speed up your workflow by eliminating repetitive confirmation prompts, but they significantly increase security risks. The VS Code extension and CLI share the same permission model; choose the tab that matches how you configure Kilo Code.
+Auto-approve settings speed up your workflow by eliminating repetitive confirmation prompts, but they significantly increase security risks. The VS Code extension, JetBrains plugin, and CLI share the same permission model; choose the tab that matches how you configure Kilo Code. In the JetBrains plugin, the same rules are configured under **Settings → Tools → Kilo Code → Auto-Approve**.
 
 {% callout type="note" %}
 **Editing project config while a session is running:** Kilo caches project-level `kilo.jsonc` / `kilo.json` (in `.kilo/`) when it first loads a workspace, and does not re-read it on every prompt. If you add, change, or remove a project permission rule while the backend is already running, reload the VS Code window (or start a fresh CLI session) for the change to take effect. Until then, Kilo keeps using the previously loaded rules — so an auto-approved call may still cite a project rule you just edited. Global config (`~/.config/kilo/`) is reloaded automatically.
diff --git a/packages/kilo-docs/pages/getting-started/settings/index.md b/packages/kilo-docs/pages/getting-started/settings/index.md
index 7a32691755..ab807ac597 100644
--- a/packages/kilo-docs/pages/getting-started/settings/index.md
+++ b/packages/kilo-docs/pages/getting-started/settings/index.md
@@ -29,6 +29,8 @@ This is especially useful for complex configuration like custom model definition
 
 Kilo reads JSONC config from a **global** location (`~/.config/kilo/kilo.jsonc`) and from your **project** (`kilo.jsonc`, or `.kilo/kilo.jsonc`). All clients — CLI, VS Code, and JetBrains — read the same files.
 
+If `kilo.json` or the legacy `opencode.json`, `opencode.jsonc`, or `config.json` files exist in the same locations, Kilo reads and deep-merges them as well. Clearing a setting in the Settings UI (for example, setting a model back to "Not set") removes it from every config file that contains it.
+
 {% callout type="warning" %}
 **Migrating from opencode?** Kilo no longer falls back to opencode configuration stored in `.opencode` directories (such as `~/.config/opencode` or a project `./.opencode/`). To keep using it, move your global config into `~/.config/kilo/` and any project config into `./.kilo/`.
 {% /callout %}
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/diff-panel-with-diffs-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/diff-panel-with-diffs-chromium-linux.png
index ac6b5490c0..49c95de8d9 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/diff-panel-with-diffs-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/diff-panel-with-diffs-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7c800d169ca92674fc9f7c7d83032ca17e7d7937bdcbea5c72cb921a7fdb89e
-size 51975
+oid sha256:2a74c7f53a5d9afa743ee49d298ce8fb7e357c5fcc46cad45de353694a7540dc
+size 49476
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/multi-project-sidebar-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/multi-project-sidebar-chromium-linux.png
new file mode 100644
index 0000000000..c7ae8ac558
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/multi-project-sidebar-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcb4fc19e832e52e4eda969d66be90cd4c6df26544bea0d117f9d3412dfcf9d9
+size 33866
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-many-prompts-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-many-prompts-chromium-linux.png
new file mode 100644
index 0000000000..2ed225e9ec
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-many-prompts-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7fc23fcb7adf483c0b771ef601b23cb365dc7f40033b00fce703b35910aa4fc
+size 27159
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-sidebar-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-sidebar-chromium-linux.png
new file mode 100644
index 0000000000..623df73220
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-sidebar-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d11f4004ed3170647d385c14df077d235f5bb9bd6e5dec07557ee2014d553233
+size 27302
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-wide-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-wide-chromium-linux.png
new file mode 100644
index 0000000000..c2410b066a
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/prompt-rail-wide-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8bd56ba87d0c2bbef8a2325ab2e9f0e956c89e2602ff8ca7415d5fb7c9fa1f3
+size 29709
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-catalog-loading-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-catalog-loading-chromium-linux.png
index 0230012032..9deb935daf 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-catalog-loading-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-catalog-loading-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d5db71fbed0542dd8ef3101d7b56b9538b9e6411921150d0957996acd620fde
-size 51161
+oid sha256:2aca8d565ce2a359173ed900f0aa88107a8ff34355ff1a52b7cc056d19238737
+size 53713
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-model-preset-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-model-preset-chromium-linux.png
index 21f11b47d2..635e479d14 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-model-preset-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-kilo-model-preset-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c501793cb8d0ad50b2d8d283a6314ce4b21dabdc0e95f63174c4a7e475523e32
-size 54055
+oid sha256:898e92b313ea6ca23750d6ad8fb05a6d5844f344e2e840d04b049613d7feef82
+size 54150
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-provider-blur-race-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-provider-blur-race-chromium-linux.png
index 041e7f16fe..6ce24e3c88 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-provider-blur-race-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-provider-blur-race-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d280dc15c3e64ddf365e1bdaa572d07da0199d0cb9d37acb174ae70db5ae746
-size 57329
+oid sha256:5d8e7348b7f94cecd48a9dab1cc91d4a2fd70a44e684a0bfea1699818a09dddf
+size 57664
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-scope-switch-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-scope-switch-chromium-linux.png
index cda24ddb93..7255deb492 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-scope-switch-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/indexing-scope-switch-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16b0e2bed3c576328a5565ae957c3af4abbc884a0db894472f587b29e1c355b4
-size 56194
+oid sha256:4c9e1684df008822f747a9258a740047fa86808b0c8f4e46fb5722cd88f3490b
+size 57664
diff --git a/packages/kilo-gateway/package.json b/packages/kilo-gateway/package.json
index 37461419a9..233cea6995 100644
--- a/packages/kilo-gateway/package.json
+++ b/packages/kilo-gateway/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-gateway",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@kilocode/plugin": "workspace:*",
     "@ai-sdk/alibaba": "1.0.17",
-    "@ai-sdk/anthropic": "3.0.71",
-    "@ai-sdk/openai": "3.0.53",
+    "@ai-sdk/anthropic": "3.0.82",
+    "@ai-sdk/openai": "3.0.88",
     "@ai-sdk/openai-compatible": "2.0.48",
     "@ai-sdk/mistral": "3.0.27",
     "@openrouter/ai-sdk-provider": "2.9.0",
diff --git a/packages/kilo-i18n/package.json b/packages/kilo-i18n/package.json
index f690fe2f5f..e50df8969b 100644
--- a/packages/kilo-i18n/package.json
+++ b/packages/kilo-i18n/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-i18n",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "description": "Kilo-specific i18n translations and overrides",
diff --git a/packages/kilo-indexing/package.json b/packages/kilo-indexing/package.json
index eac32eee09..fd56507373 100644
--- a/packages/kilo-indexing/package.json
+++ b/packages/kilo-indexing/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-indexing",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "description": "Standalone indexing engine and host helpers for Kilo Code",
diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index 7c48f6085e..90eda933de 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 7.5.0
+
+### Minor Changes
+
+- [#12518](https://github.com/Kilo-Org/kilocode/pull/12518) [`452d0eb`](https://github.com/Kilo-Org/kilocode/commit/452d0eb55f740e951cfd906375e22cf97250144c) - Publish a signed GitHub-hosted JetBrains plugin build with the CLI bundled for offline installation.
+
+### Patch Changes
+
+- [#12571](https://github.com/Kilo-Org/kilocode/pull/12571) [`9950739`](https://github.com/Kilo-Org/kilocode/commit/9950739e36b40a682c0a25173e62f5236e60f81a) - Allow sending prompts while a session is busy and show queued prompts with a remove action.
+
 ## 7.4.16
 
 ### Patch Changes
@@ -134,7 +144,9 @@
 ### Changed
 
 - Update the JetBrains CLI pin from Kilo Core 7.4.15 to 7.4.16.
+
 ## [7.0.10] - 2026-07-24
+
 ## [7.0.10] - 2026-07-24
 
 ### Added
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt
index 1d4fa2ee4b..d4e376bb81 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt
@@ -1579,6 +1579,7 @@ object KiloCliDataParser {
         sb.append("""{"reply":${escape(reply.reply)}""")
         val msg = reply.message
         if (msg != null) sb.append(""","message":${escape(msg)}""")
+        if (reply.interactive) sb.append(""","interactive":true""")
         sb.append("}")
         return sb.toString()
     }
diff --git a/packages/kilo-jetbrains/frontend/build.gradle.kts b/packages/kilo-jetbrains/frontend/build.gradle.kts
index 0c141225c6..a42f67e199 100644
--- a/packages/kilo-jetbrains/frontend/build.gradle.kts
+++ b/packages/kilo-jetbrains/frontend/build.gradle.kts
@@ -28,8 +28,8 @@ dependencies {
     implementation(libs.zxing.core)
 
     testImplementation(kotlin("test"))
-    testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.11.4")
+    testImplementation(libs.junit)
+    testRuntimeOnly(libs.junit.vintage.engine)
 }
 
 val providerIcons = tasks.register<Copy>("generateProviderIcons") {
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionController.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionController.kt
index 9b1e517ac6..d032d281cc 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionController.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionController.kt
@@ -722,7 +722,10 @@ class SessionController(
         LOG.debug { "${ChatLogSummary.sid(sid ?: ref?.key ?: "pending")} kind=permission-auto rid=$id" }
         cs.launch {
             try {
-                if (!autoApprove) {
+                // Skill-shell batches must be answered by a human: the server refuses
+                // non-interactive approvals, so auto-approve must show the card (whose
+                // manual reply sets interactive=true) rather than send a machine reply.
+                if (!autoApprove || restore().meta.raw["skillShell"] == "true") {
                     edt {
                         if (disposed) return@edt
                         model.setState(SessionState.AwaitingPermission(restore()))
@@ -759,9 +762,16 @@ class SessionController(
             try {
                 val permissions = sessions.pendingPermissions(directory).filter { it.sessionID in ids && it.id !in skip }
                 val count = replyAll(permissions)
-                if (count == 0) return@launch
+                // Skill-shell requests are skipped by replyAll; surface one as a card so it
+                // isn't stranded (never machine-approved, never shown).
+                val card = skillShellCard(permissions)?.let { toPermission(it) }
+                if (count == 0 && card == null) return@launch
                 runEdt {
                     if (disposed) return@runEdt
+                    if (card != null) {
+                        updateModel { model.setState(SessionState.AwaitingPermission(card)) }
+                        return@runEdt
+                    }
                     val current = model.state
                     if (current is SessionState.AwaitingPermission && current.permission.sessionId in ids) {
                         model.setState(SessionState.Busy(KiloBundle.message("session.status.considering")))
@@ -777,6 +787,8 @@ class SessionController(
         var count = 0
         for (request in permissions) {
             if (!autoApprove) return count
+            // Skill-shell batches need a human; skip them here (callers surface the card).
+            if (request.metadata["skillShell"] == "true") continue
             sessions.replyPermission(request.id, directory, PermissionReplyDto("once"))
             capture("Permission Auto Approved", sessionProps(request.sessionID) + mapOf("tool" to request.permission, "source" to "drain"))
             count++
@@ -784,6 +796,11 @@ class SessionController(
         return count
     }
 
+    // A skill-shell request is never machine-approved (the server refuses non-interactive
+    // approvals); after draining, callers must surface one as a card so a human can answer.
+    private fun skillShellCard(permissions: List<PermissionRequestDto>): PermissionRequestDto? =
+        permissions.lastOrNull { it.metadata["skillShell"] == "true" }
+
     private fun updatePermission(id: String, state: PermissionRequestState, message: String? = null) {
         assertEdt()
         val current = model.state
@@ -1156,11 +1173,15 @@ class SessionController(
             val permissions = sessions.pendingPermissions(directory).filter { it.sessionID == child }
             if (permissions.isEmpty()) return
             LOG.debug { "${ChatLogSummary.sid(sid ?: "pending")} kind=child-recovery child=$child permissions=${permissions.size}" }
-            if (autoApprove) {
+            // A skill-shell request must surface as a card even under auto-approve (replyAll
+            // skips it); prefer it over the last pending so a human can answer.
+            val show = if (autoApprove) {
                 replyAll(permissions)
-                return
+                skillShellCard(permissions) ?: return
+            } else {
+                skillShellCard(permissions) ?: permissions.last()
             }
-            val last = toPermission(permissions.last())
+            val last = toPermission(show)
             runEdt {
                 if (disposed) return@runEdt
                 if (child !in childIds) return@runEdt
@@ -1201,9 +1222,12 @@ class SessionController(
             val permissions = sessions.pendingPermissions(directory).filter { it.sessionID == id }
             val questions = sessions.pendingQuestions(directory).filter { it.sessionID == id }
             val status = sessions.statuses.value[id]
+            // replyAll auto-approves the ordinary permissions and skips skill-shell ones. A
+            // skill-shell request must then fall through to a human card rather than go Busy.
+            val skillCard = skillShellCard(permissions)
             if (permissions.isNotEmpty() && autoApprove) {
                 val count = replyAll(permissions)
-                if (count > 0) {
+                if (count > 0 && skillCard == null) {
                     runEdt {
                         if (disposed) return@runEdt
                         if (sid != id) return@runEdt
@@ -1226,7 +1250,8 @@ class SessionController(
                 if (sid != id) return@runEdt
                 updateModel {
                     if (permissions.isNotEmpty()) {
-                        model.setState(SessionState.AwaitingPermission(toPermission(permissions.last())))
+                        // Prefer a skill-shell request (needs a human) over the last pending.
+                        model.setState(SessionState.AwaitingPermission(toPermission(skillCard ?: permissions.last())))
                     } else if (questions.isNotEmpty()) {
                         model.setState(SessionState.AwaitingQuestion(toQuestion(questions.last())))
                     } else if (status != null) {
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/permission/PermissionView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/permission/PermissionView.kt
index d5323dd58a..0ae649ef54 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/permission/PermissionView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/permission/PermissionView.kt
@@ -356,7 +356,7 @@ class PermissionView(
         card.setActionEnabled(ID_RUN, false)
         card.setActionEnabled(ID_DENY, false)
         rules.setControlsEnabled(false)
-        reply(id, PermissionReplyDto(reply = "once"), rulePayload())
+        reply(id, PermissionReplyDto(reply = "once", interactive = true), rulePayload())
     }
 
     @RequiresEdt
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/PromptLifecycleTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/PromptLifecycleTest.kt
index 9d5e4225e1..768c9e36b3 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/PromptLifecycleTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/PromptLifecycleTest.kt
@@ -254,6 +254,23 @@ class PromptLifecycleTest : SessionControllerTestBase() {
         )
     }
 
+    fun `test auto approve does not machine-reply a skill shell batch`() {
+        val (m, _, _) = prompted()
+
+        edt { m.setAutoApprove(true) }
+        // skill-shell batches must be answered by a human; auto-approve must show the card
+        // instead of sending a non-interactive reply the server would refuse.
+        emit(
+            ChatEventDto.PermissionAsked(
+                "ses_test",
+                permission("perm1").copy(metadata = mapOf("skillShell" to "true")),
+            ),
+        )
+
+        assertTrue(rpc.permissionReplies.isEmpty())
+        assertTrue(m.model.state is SessionState.AwaitingPermission)
+    }
+
     fun `test disabling auto approve before reply restores awaiting permission`() {
         val (m, _, _) = prompted()
 
@@ -310,6 +327,31 @@ class PromptLifecycleTest : SessionControllerTestBase() {
         assertEquals("once", rpc.permissionReplies[0].third.reply)
     }
 
+    fun `test enabling auto approve surfaces a pending skill shell as a card`() {
+        val (m, _, _) = prompted()
+        rpc.pendingPermissionList.add(permission("perm_skill").copy(metadata = mapOf("skillShell" to "true")))
+
+        edt { m.setAutoApprove(true) }
+        flush()
+
+        // skill-shell must not be machine-approved; it surfaces as a human card instead
+        assertTrue(rpc.permissionReplies.isEmpty())
+        assertTrue(m.model.state is SessionState.AwaitingPermission)
+    }
+
+    fun `test recovery surfaces a pending skill shell as a card under auto approve`() {
+        appRpc.state.value = ai.kilocode.rpc.dto.KiloAppStateDto(ai.kilocode.rpc.dto.KiloAppStatusDto.READY, config = ai.kilocode.rpc.dto.ConfigDto(model = "kilo/gpt-5"))
+        projectRpc.state.value = workspaceReady()
+        rpc.pendingPermissionList.add(permission("perm_skill").copy(metadata = mapOf("skillShell" to "true")))
+        edt { KiloPluginSettings.setAutoApprove(true) }
+
+        val m = controller("ses_test")
+        flush()
+
+        assertTrue(rpc.permissionReplies.isEmpty())
+        assertTrue(m.model.state is SessionState.AwaitingPermission)
+    }
+
     fun `test auto approve drains pending permissions during recovery`() {
         appRpc.state.value = ai.kilocode.rpc.dto.KiloAppStateDto(ai.kilocode.rpc.dto.KiloAppStatusDto.READY, config = ai.kilocode.rpc.dto.ConfigDto(model = "kilo/gpt-5"))
         projectRpc.state.value = workspaceReady()
diff --git a/packages/kilo-jetbrains/gradle/libs.versions.toml b/packages/kilo-jetbrains/gradle/libs.versions.toml
index 15b48416fe..182e9b77c4 100644
--- a/packages/kilo-jetbrains/gradle/libs.versions.toml
+++ b/packages/kilo-jetbrains/gradle/libs.versions.toml
@@ -5,6 +5,9 @@ intellij-rpc-plugin = "2.3.20-RC2-0.1"
 kotlin-jvm-plugin = "2.3.20"
 kotlin-serialization-plugin = "2.3.20"
 kotlin-serialization = "1.11.0"
+kotlinx-coroutines = "1.10.2"
+junit = "4.13.2"
+junit-vintage = "5.11.4"
 okhttp = "4.12.0"
 openapi-generator = "7.21.0"
 detekt = "1.23.8"
@@ -22,7 +25,9 @@ okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-sse = { module = "com.squareup.okhttp3:okhttp-sse", version.ref = "okhttp" }
 okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.10.2" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
+junit = { module = "junit:junit", version.ref = "junit" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit-vintage" }
 zxing-core = { module = "com.google.zxing:core", version.ref = "zxing" }
 commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" }
 
diff --git a/packages/kilo-jetbrains/package.json b/packages/kilo-jetbrains/package.json
index fee84e7b2a..57a8e11ef2 100644
--- a/packages/kilo-jetbrains/package.json
+++ b/packages/kilo-jetbrains/package.json
@@ -8,7 +8,7 @@
     "test": "./gradlew test",
     "test:ci": "bun script/test-ci.ts"
   },
-  "version": "7.4.16",
+  "version": "7.4.17",
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {}
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/ChatDto.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/ChatDto.kt
index edbbed7b02..f4e222bbb2 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/ChatDto.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/ChatDto.kt
@@ -328,6 +328,8 @@ data class ToolRefDto(
 data class PermissionReplyDto(
     val reply: String,
     val message: String? = null,
+    // Set when a human answered the prompt; the CLI ignores machine approvals of skill-shell batches.
+    val interactive: Boolean = false,
 )
 
 @Serializable
diff --git a/packages/kilo-memory/package.json b/packages/kilo-memory/package.json
index df2adc3325..d48bcabe87 100644
--- a/packages/kilo-memory/package.json
+++ b/packages/kilo-memory/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-memory",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "description": "Project memory storage, indexing, recall, and command helpers for Kilo Code",
diff --git a/packages/kilo-memory/src/capture/parse.ts b/packages/kilo-memory/src/capture/parse.ts
index 21f756bef3..eb71e6269a 100644
--- a/packages/kilo-memory/src/capture/parse.ts
+++ b/packages/kilo-memory/src/capture/parse.ts
@@ -72,12 +72,10 @@ export const typedSchema = z
   })
   .strict()
 
-export const digestSchema = z
-  .object({
-    topic: z.string().max(160).default(""),
-    summary: z.string().max(64_000).default(""),
-  })
-  .strict()
+export const digestSchema = z.object({
+  topic: z.string().max(160).default(""),
+  summary: z.string().max(64_000).default(""),
+})
 
 export type CaptureSkip = z.infer<typeof typedSchema>["skipped"][number]
 export type CaptureDigest = z.infer<typeof digestSchema>
diff --git a/packages/kilo-memory/test/capture.test.ts b/packages/kilo-memory/test/capture.test.ts
index 01d81da699..eba37bc79d 100644
--- a/packages/kilo-memory/test/capture.test.ts
+++ b/packages/kilo-memory/test/capture.test.ts
@@ -29,6 +29,20 @@ describe("memory capture parsing", () => {
     expect(parsed).toEqual({ topic: "repo setup", summary: "Run package tests." })
   })
 
+  test("ignores additional digest fields from model output", () => {
+    const parsed = parseJson(
+      digestSchema,
+      JSON.stringify({
+        topic: "repo setup",
+        summary: "Run package tests.",
+        next_step: "Open a pull request.",
+        blockers: [],
+      }),
+    )
+
+    expect(parsed).toEqual({ topic: "repo setup", summary: "Run package tests." })
+  })
+
   test("maps consolidation operation names into deterministic memory operations", () => {
     const parsed = parseJson(
       typedSchema,
diff --git a/packages/kilo-sandbox/package.json b/packages/kilo-sandbox/package.json
index ff29edd756..b57728afed 100644
--- a/packages/kilo-sandbox/package.json
+++ b/packages/kilo-sandbox/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/sandbox",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "private": true,
diff --git a/packages/kilo-telemetry/package.json b/packages/kilo-telemetry/package.json
index 7b9e81497a..36243e82c9 100644
--- a/packages/kilo-telemetry/package.json
+++ b/packages/kilo-telemetry/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-telemetry",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "description": "Telemetry for Kilo CLI - PostHog analytics integration",
diff --git a/packages/kilo-telemetry/src/__tests__/identity.test.ts b/packages/kilo-telemetry/src/__tests__/identity.test.ts
new file mode 100644
index 0000000000..3754c047f0
--- /dev/null
+++ b/packages/kilo-telemetry/src/__tests__/identity.test.ts
@@ -0,0 +1,89 @@
+import { mkdtempSync, readFileSync, existsSync, statSync } from "node:fs"
+import { tmpdir } from "node:os"
+import path from "node:path"
+import { describe, test, expect, beforeEach, mock, afterEach } from "bun:test"
+import { createHash } from "node:crypto"
+
+let profileCalls = 0
+mock.module("@kilocode/kilo-gateway", () => ({
+  fetchProfile: async (token: string) => {
+    profileCalls++
+    if (token === "bad-token") return null
+    return { email: `user-${token}@example.com` }
+  },
+}))
+
+const { Identity } = await import("../identity.js")
+
+function digest(token: string) {
+  return createHash("sha256").update(token).digest("hex")
+}
+
+let dir: string
+
+beforeEach(() => {
+  profileCalls = 0
+  dir = mkdtempSync(path.join(tmpdir(), "kilo-telemetry-identity-"))
+  Identity.reset()
+  Identity.setDataPath(dir)
+})
+
+afterEach(() => {
+  Identity.setDataPath("")
+})
+
+describe("Identity.updateFromKiloAuth profile cache", () => {
+  test("fetches profile and writes cache keyed by token hash", async () => {
+    await Identity.updateFromKiloAuth("token-a")
+    expect(Identity.getUserId()).toBe("user-token-a@example.com")
+    expect(profileCalls).toBe(1)
+
+    const file = path.join(dir, "telemetry-profile.json")
+    expect(existsSync(file)).toBe(true)
+    const cache = JSON.parse(readFileSync(file, "utf8"))
+    expect(cache.token).toBe(digest("token-a"))
+    expect(cache.email).toBe("user-token-a@example.com")
+    expect(cache.token).not.toBe("token-a")
+    // The cache stores an email and a token verifier, so it must be owner-only.
+    // POSIX only: Windows reports default mode bits and enforces access via ACLs.
+    if (process.platform !== "win32") expect(statSync(file).mode & 0o777).toBe(0o600)
+  })
+
+  test("uses cached email without a network request on later invocations", async () => {
+    await Identity.updateFromKiloAuth("token-a")
+    expect(profileCalls).toBe(1)
+
+    // Simulate a fresh process: identity state resets, cache file persists.
+    Identity.reset()
+    await Identity.updateFromKiloAuth("token-a")
+    expect(Identity.getUserId()).toBe("user-token-a@example.com")
+    expect(profileCalls).toBe(1)
+  })
+
+  test("refetches when the token changes", async () => {
+    await Identity.updateFromKiloAuth("token-a")
+    Identity.reset()
+    await Identity.updateFromKiloAuth("token-b")
+    expect(Identity.getUserId()).toBe("user-token-b@example.com")
+    expect(profileCalls).toBe(2)
+  })
+
+  test("clears identity when token is null", async () => {
+    await Identity.updateFromKiloAuth("token-a")
+    Identity.reset()
+    await Identity.updateFromKiloAuth(null)
+    expect(Identity.getUserId()).toBeNull()
+    expect(profileCalls).toBe(1)
+  })
+
+  test("ignores a cache file for a different token", async () => {
+    await Identity.updateFromKiloAuth("token-a")
+    const file = path.join(dir, "telemetry-profile.json")
+    const cache = JSON.parse(readFileSync(file, "utf8"))
+    expect(cache.token).toBe(digest("token-a"))
+
+    Identity.reset()
+    await Identity.updateFromKiloAuth("token-b")
+    expect(Identity.getUserId()).toBe("user-token-b@example.com")
+  })
+})
diff --git a/packages/kilo-telemetry/src/__tests__/telemetry.test.ts b/packages/kilo-telemetry/src/__tests__/telemetry.test.ts
index ff87bf6909..939bb5dd24 100644
--- a/packages/kilo-telemetry/src/__tests__/telemetry.test.ts
+++ b/packages/kilo-telemetry/src/__tests__/telemetry.test.ts
@@ -1,4 +1,6 @@
-import { describe, test, expect, beforeEach } from "bun:test"
+import { arch, platform, release } from "node:os"
+import { describe, test, expect, beforeEach, spyOn } from "bun:test"
+import { Client } from "../client.js"
 import { Identity } from "../identity.js"
 import { TelemetryEvent } from "../events.js"
 import { Telemetry } from "../telemetry.js"
@@ -83,6 +85,22 @@ describe("TelemetryEvent", () => {
 })
 
 describe("Telemetry", () => {
+  test("includes host OS properties", () => {
+    const capture = spyOn(Client, "capture").mockImplementation(() => {})
+
+    Telemetry.track(TelemetryEvent.CLI_START)
+
+    expect(capture).toHaveBeenCalledWith(
+      TelemetryEvent.CLI_START,
+      expect.objectContaining({
+        os_name: platform(),
+        os_version: release(),
+        os_arch: arch(),
+      }),
+    )
+    capture.mockRestore()
+  })
+
   test("indexing helpers are exposed", () => {
     expect(typeof Telemetry.trackIndexingStarted).toBe("function")
     expect(typeof Telemetry.trackIndexingCompleted).toBe("function")
@@ -96,4 +114,3 @@ describe("Telemetry", () => {
     expect(typeof Telemetry.trackSuggestionAccepted).toBe("function")
   })
 })
-
diff --git a/packages/kilo-telemetry/src/client.ts b/packages/kilo-telemetry/src/client.ts
index 24c902b543..f5baa1ec54 100644
--- a/packages/kilo-telemetry/src/client.ts
+++ b/packages/kilo-telemetry/src/client.ts
@@ -82,4 +82,25 @@ export namespace Client {
       }
     }
   }
+
+  // Flush queued events in the background without blocking the caller. The
+  // flush is delayed slightly so commands that exit immediately pay only the
+  // single shutdown() flush instead of an in-flight flush plus a follow-up
+  // flush for CLI_EXIT. For commands that outlive the delay, the upload
+  // overlaps with execution, so by the time shutdown() runs the queue is
+  // usually empty (or the connection is still warm) and process exit is not
+  // delayed by a network round trip. The unref'd timer never keeps a process
+  // alive on its own. The authoritative, error-handled flush still happens in
+  // shutdown(); failures here are retried there, so they are only surfaced
+  // when debug logging is on.
+  export function flushInBackground(delayMs = 300): void {
+    if (!enabled || !client) return
+    const timer = setTimeout(() => {
+      if (!client) return
+      client.flush().catch((err) => {
+        if (process.env.KILO_PRINT_LOGS) console.warn("telemetry background flush failed", err)
+      })
+    }, delayMs)
+    timer.unref?.()
+  }
 }
diff --git a/packages/kilo-telemetry/src/identity.ts b/packages/kilo-telemetry/src/identity.ts
index c75fac4d29..974a32120d 100644
--- a/packages/kilo-telemetry/src/identity.ts
+++ b/packages/kilo-telemetry/src/identity.ts
@@ -1,4 +1,6 @@
 import * as path from "path"
+import { createHash } from "crypto"
+import { writeFile, chmod, rename, rm } from "fs/promises"
 import { fetchProfile } from "@kilocode/kilo-gateway"
 
 export namespace Identity {
@@ -7,6 +9,21 @@ export namespace Identity {
   let organizationId: string | null = null
   let dataPath = ""
 
+  // Cache the email resolved from the auth token so CLI startup does not block on
+  // a profile request for every invocation. Keyed by token hash; refreshed when
+  // the token changes. Stale entries (older than a week) are still used for the
+  // current run and refreshed on a best-effort basis for a later run: the
+  // background refresh is not awaited, so short-lived invocations may exit before
+  // it completes and simply retry next time.
+  const CACHE_FILE = "telemetry-profile.json"
+  const CACHE_TTL = 7 * 24 * 60 * 60 * 1000
+
+  interface Cache {
+    token: string
+    email: string
+    fetchedAt: number
+  }
+
   export function setDataPath(p: string) {
     dataPath = p
   }
@@ -51,6 +68,45 @@ export namespace Identity {
     organizationId = orgId
   }
 
+  function digest(token: string): string {
+    return createHash("sha256").update(token).digest("hex")
+  }
+
+  async function read(): Promise<Cache | null> {
+    if (!dataPath) return null
+    const file = Bun.file(path.join(dataPath, CACHE_FILE))
+    if (!(await file.exists())) return null
+    const parsed = await file.json().catch(() => null)
+    if (!parsed || typeof parsed.token !== "string" || typeof parsed.email !== "string") return null
+    if (typeof parsed.fetchedAt !== "number") return null
+    return parsed as Cache
+  }
+
+  async function write(cache: Cache): Promise<void> {
+    if (!dataPath) return
+    const filepath = path.join(dataPath, CACHE_FILE)
+    // The cache stores the user's email and a token verifier, so keep it
+    // readable only by the owner, including when replacing an existing file.
+    // Write to a temp file and rename so concurrent invocations or a mid-write
+    // kill cannot leave a truncated cache behind (POSIX rename is atomic).
+    const tmp = `${filepath}.${process.pid}.tmp`
+    try {
+      await writeFile(tmp, JSON.stringify(cache), { mode: 0o600 })
+      await chmod(tmp, 0o600)
+      await rename(tmp, filepath)
+    } catch (err) {
+      await rm(tmp, { force: true }).catch((rmErr) => {
+        if (process.env.KILO_PRINT_LOGS) console.warn("telemetry profile cache temp cleanup failed", rmErr)
+      })
+      if (process.env.KILO_PRINT_LOGS) console.warn("telemetry profile cache write failed", err)
+    }
+  }
+
+  async function refresh(token: string, tokenHash: string): Promise<void> {
+    const profile = await fetchProfile(token).catch(() => null)
+    if (profile?.email) await write({ token: tokenHash, email: profile.email, fetchedAt: Date.now() })
+  }
+
   export async function updateFromKiloAuth(token: string | null, accountId?: string): Promise<void> {
     organizationId = accountId || null
 
@@ -59,8 +115,21 @@ export namespace Identity {
       return
     }
 
+    const tokenHash = digest(token)
+    const cached = await read()
+    if (cached && cached.token === tokenHash) {
+      userId = cached.email
+      if (Date.now() - cached.fetchedAt > CACHE_TTL) {
+        refresh(token, tokenHash).catch((err) => {
+          if (process.env.KILO_PRINT_LOGS) console.warn("telemetry profile refresh failed", err)
+        })
+      }
+      return
+    }
+
     const profile = await fetchProfile(token).catch(() => null)
     userId = profile?.email || null
+    if (profile?.email) await write({ token: tokenHash, email: profile.email, fetchedAt: Date.now() })
   }
 
   export function reset() {
diff --git a/packages/kilo-telemetry/src/telemetry.ts b/packages/kilo-telemetry/src/telemetry.ts
index 3ac0d42e39..496bf1ad4c 100644
--- a/packages/kilo-telemetry/src/telemetry.ts
+++ b/packages/kilo-telemetry/src/telemetry.ts
@@ -1,3 +1,4 @@
+import { release } from "node:os"
 import { Client } from "./client.js"
 import { Identity } from "./identity.js"
 import { TelemetryEvent } from "./events.js"
@@ -6,6 +7,9 @@ export interface TelemetryProperties {
   appName: string
   appVersion: string
   platform: string
+  os_name: string
+  os_version: string
+  os_arch: string
   editorName?: string
   vscodeVersion?: string
 }
@@ -58,6 +62,9 @@ export namespace Telemetry {
     appName: "kilo-cli",
     appVersion: "unknown",
     platform: process.platform,
+    os_name: process.platform,
+    os_version: release(),
+    os_arch: process.arch,
   }
 
   export async function init(options: { dataPath: string; version: string; enabled: boolean }): Promise<void> {
@@ -109,6 +116,9 @@ export namespace Telemetry {
         appName: props.appName,
         appVersion: props.appVersion,
         platform: props.platform,
+        os_name: props.os_name,
+        os_version: props.os_version,
+        os_arch: props.os_arch,
       })
 
       // Link the anonymous machineId to the authenticated email
@@ -125,6 +135,12 @@ export namespace Telemetry {
     track(TelemetryEvent.CLI_START)
   }
 
+  // Upload queued events without blocking. Call after bootstrap so the flush
+  // overlaps with command execution and shutdown() stays fast (#10242).
+  export function flushInBackground() {
+    Client.flushInBackground()
+  }
+
   export function trackCliExit(exitCode?: number) {
     track(TelemetryEvent.CLI_EXIT, {
       duration: Date.now() - startTime,
diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json
index 7ee9692c7e..a4e4d07a16 100644
--- a/packages/kilo-ui/package.json
+++ b/packages/kilo-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-ui",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/kilo-vscode/CHANGELOG.md b/packages/kilo-vscode/CHANGELOG.md
index d41e4a8c94..8e0e1d920c 100644
--- a/packages/kilo-vscode/CHANGELOG.md
+++ b/packages/kilo-vscode/CHANGELOG.md
@@ -1,5 +1,78 @@
 # kilo-code
 
+## 7.4.17
+
+### Minor Changes
+
+- [#12631](https://github.com/Kilo-Org/kilocode/pull/12631) [`3321216`](https://github.com/Kilo-Org/kilocode/commit/3321216c0157e1a8a1829b0c8e0a1cae8d2f2ad2) - Show the ⌘1-9 (Ctrl+1-9 on Windows/Linux) shortcut badges on every Agent Manager sidebar card while the modifier key is held, making it easy to see which number jumps to which worktree before pressing it.
+
+- [#12598](https://github.com/Kilo-Org/kilocode/pull/12598) [`c6711fc`](https://github.com/Kilo-Org/kilocode/commit/c6711fcf6cea9fdbe78a04b95276d09a2faabfa7) - Let users open Agent Manager terminals in the VS Code terminal or an embedded side panel. The terminal button's dropdown picks the destination; the side panel shares the right-hand inspector with the diff view and keeps running in the background when hidden.
+
+- [#12633](https://github.com/Kilo-Org/kilocode/pull/12633) [`23039c0`](https://github.com/Kilo-Org/kilocode/commit/23039c0fb1e5b32704119ddde10a6a28ccd6bff3) - Support multiple Agent Manager side-panel terminals per context. The panel header is now a tab strip that reuses the main tab bar's terminal tabs: click to switch, drag to reorder, X to close a single terminal, and + to open another one. Terminal numbers fill gaps left by closed terminals, and tabs pick up the live title from the shell or running program (OSC escape codes), so a dev server or build names its own tab.
+
+- [#12632](https://github.com/Kilo-Org/kilocode/pull/12632) [`0d853df`](https://github.com/Kilo-Org/kilocode/commit/0d853df3ec338ac99e025939f74136dec6d9daa1) - Add a prompt navigator rail to the chat transcript. A thin rail of ticks on the left edge shows one tick per prompt you sent; hovering or focusing it expands a card listing those prompts with a short preview of the answer, and clicking jumps the transcript to that turn. It appears in the sidebar, Kilo editor tabs, the sub-agent viewer, and Agent Manager, and never changes the readable width of the chat.
+
+### Patch Changes
+
+- [#12629](https://github.com/Kilo-Org/kilocode/pull/12629) [`0a1c140`](https://github.com/Kilo-Org/kilocode/commit/0a1c14073a4bf14f8ad4e3c8295dc6ae6bfbfdaf) - Keep each Agent Manager panel's terminal destination consistent. A dropdown pick is now remembered per panel and no longer flips when another window rewrites the shared terminal destination setting, so the terminal shortcut keeps opening the terminal type that panel is actually using. The shortcut also no longer dead-ends on worktrees without an active session, and terminals left over from a reloaded webview are cleaned up instead of leaking.
+
+- [#12587](https://github.com/Kilo-Org/kilocode/pull/12587) [`16f8e7e`](https://github.com/Kilo-Org/kilocode/commit/16f8e7ef7fbd47755395539e7df54af3baae0c63) - Keep conversations and workspace files unchanged when a checkpoint cannot be fully restored.
+
+- [#12333](https://github.com/Kilo-Org/kilocode/pull/12333) [`290a5af`](https://github.com/Kilo-Org/kilocode/commit/290a5af56e6ddccd8b4a459883625e30f2ae0344) Thanks [@IamCoder18](https://github.com/IamCoder18)! - Include basic-auth credentials in the Local and Network Console URLs printed by `kilo console`, so users on headless hosts (no `DISPLAY`/`WAYLAND_DISPLAY`, SSH sessions, CI runners) can open the URL in a browser on another machine and reach the Console.
+
+- [#12630](https://github.com/Kilo-Org/kilocode/pull/12630) [`a7f972f`](https://github.com/Kilo-Org/kilocode/commit/a7f972f63bc948d70b73a36a5beab6d694316037) - Open Agent Manager terminals faster and avoid delayed shell prompts.
+
+- [#12560](https://github.com/Kilo-Org/kilocode/pull/12560) [`65c5e9d`](https://github.com/Kilo-Org/kilocode/commit/65c5e9d2c03cea152b140710228075edf9156def) - Update the visible agent mode when cycling modes in Kilo sidebars and pending session tabs.
+
+- [#12561](https://github.com/Kilo-Org/kilocode/pull/12561) [`44f5963`](https://github.com/Kilo-Org/kilocode/commit/44f596366931d5336f1cd4dfdd97ef54e0f2fa4c) - Fix settings changes sometimes failing to save and apply in VS Code.
+
+- [#12540](https://github.com/Kilo-Org/kilocode/pull/12540) [`2da8949`](https://github.com/Kilo-Org/kilocode/commit/2da89498138e49f857c354924fdecac85337e742) Thanks [@Githubguy132010](https://github.com/Githubguy132010)! - Preserve parenthesized tilde expressions as literal text in rendered chat messages.
+
+- [#12591](https://github.com/Kilo-Org/kilocode/pull/12591) [`625d2b9`](https://github.com/Kilo-Org/kilocode/commit/625d2b974de1381b4d475808c9215becb263d1f0) - Show prompt input toggle tooltips instantly on hover instead of after a delay.
+
+- [#12460](https://github.com/Kilo-Org/kilocode/pull/12460) [`51d8031`](https://github.com/Kilo-Org/kilocode/commit/51d8031c9997bd5478bcde715562169f732d04d4) - Changes from opencode v1.17.5 to v1.17.9 upstream:
+  - Core Bugfixes: Improved MCP server compatibility by declaring Kilo's supported client capabilities.
+  - Core Bugfixes: Plugin client requests now reuse the active server instead of assuming the default local port.
+  - Core Bugfixes: ACP shell tool calls now show the command and working directory from the start.
+  - Core Bugfixes: Plugin-provided shell environment variables now apply to PTY sessions.
+  - Core Bugfixes: OpenAI-compatible providers now accept MCP tool schemas that previously failed validation. (@jquense)
+  - Core Bugfixes: Cloudflare AI Gateway now receives the configured API key correctly. (@keefetang)
+  - Core Bugfixes: MCP tools without declared schema properties now work with providers that expect object properties.
+  - Core Bugfixes: Long-running MCP tools now keep their timeout alive when they report progress. (@Nomadcxx)
+  - Core Bugfixes: The MCP OAuth callback server now shuts down once authorization finishes or is cancelled.
+  - Core Bugfixes: MCP tool failures now surface the server's error text instead of a generic failure.
+  - Core Bugfixes: MCP OAuth error pages now escape provider error text correctly.
+  - Core Bugfixes: Honor configured agent step limits by forcing a final text response instead of failing mid-run.
+  - Core Bugfixes: Queue steering prompts before dismissing pending questions so the previous turn cannot resume first.
+  - Core Bugfixes: Prevent local server credentials from leaking into spawned PTY processes.
+  - Core Bugfixes: Fix Devstral model detection when provider IDs use different casing. (@Robin1987China)
+  - Core Bugfixes: Pass configured custom headers to Copilot model requests.
+  - Core Improvements: MCP servers can now receive the current workspace as a client root.
+  - Core Improvements: Session timelines load much faster and avoid flicker or scroll jumps.
+  - Core Improvements: Add `high` and `max` thinking variants for GLM-5.2 across supported providers. (@imranshaiedi-byte)
+  - Core Improvements: Stop wrapping follow-up user messages in a steering reminder so prompt caching stays effective.
+  - TUI Bugfixes: MCP debug now uses the SDK's latest protocol version.
+  - TUI Bugfixes: Only show the background subagent shortcut when the server supports it.
+  - UI Bugfixes: Render completed Mermaid blocks from diagram source instead of fenced Markdown.
+
+- [#11984](https://github.com/Kilo-Org/kilocode/pull/11984) [`26dac19`](https://github.com/Kilo-Org/kilocode/commit/26dac197fe28294c391c8d437abf06e18e2d22bd) Thanks [@sylwester-liljegren](https://github.com/sylwester-liljegren)! - Mention `@` file references in the chat input placeholder so users know they can add file mentions. Translated across all supported languages.
+
+- [#12593](https://github.com/Kilo-Org/kilocode/pull/12593) [`160b066`](https://github.com/Kilo-Org/kilocode/commit/160b06661acc5f04b21221ab6578c468325f64c5) - Prevent the VS Code backend from eagerly starting native file watchers for every Agent Manager worktree.
+
+- [#12123](https://github.com/Kilo-Org/kilocode/pull/12123) [`3075d35`](https://github.com/Kilo-Org/kilocode/commit/3075d35f13ba9738446ac28fa2eebf054097f2f5) Thanks [@mjnaderi](https://github.com/mjnaderi)! - Keep message and response copy buttons working after switching focus away from VS Code.
+
+- [#12583](https://github.com/Kilo-Org/kilocode/pull/12583) [`1310c12`](https://github.com/Kilo-Org/kilocode/commit/1310c1200ab613b316f27fe4fd59e23e262df02f) Thanks [@noobezlol](https://github.com/noobezlol)! - Keep Windows snapshot diffs parseable and preserve valid files when a stored patch is malformed.
+
+- [#12410](https://github.com/Kilo-Org/kilocode/pull/12410) [`85d65a3`](https://github.com/Kilo-Org/kilocode/commit/85d65a3137ecadfcbda8255bfb4a40daf1f155fb) - Open Kilo chats, settings, and files as tabs in the selected editor pane without creating, locking, or resizing editor panes.
+
+- [#12639](https://github.com/Kilo-Org/kilocode/pull/12639) [`8a47d8b`](https://github.com/Kilo-Org/kilocode/commit/8a47d8b78885fa8fd14c73b3aecdb57e1fc96c9c) - Stop flashing a "Turn interrupted" warning when a follow-up message is queued while the assistant is still working. The running turn now closes with a dedicated "superseded" reason instead of "interrupted" when it hands off to the queued prompt, so the premature-stop warning only appears for real interruptions.
+
+- [#12602](https://github.com/Kilo-Org/kilocode/pull/12602) [`5d87ca5`](https://github.com/Kilo-Org/kilocode/commit/5d87ca598c4c66328f0e476cb1be3fc9b26d05aa) - Remove unused translation keys from the Agent Manager, sidebar webview, shared kilo-i18n, and autocomplete dictionaries across all locales, and add a conservative lint test for unreferenced, unprotected dictionary keys.
+
+- [#12463](https://github.com/Kilo-Org/kilocode/pull/12463) [`1f3383c`](https://github.com/Kilo-Org/kilocode/commit/1f3383cf3de37327b02e0fc2a1c5ac176ca9134f) Thanks [@IamCoder18](https://github.com/IamCoder18)! - Show the `Ctrl+T` variant cycling shortcut in the TUI prompt hint row whenever the active model exposes reasoning variants, as the first hint before the agent and command palette hints
+
+- [#12634](https://github.com/Kilo-Org/kilocode/pull/12634) [`4c5c242`](https://github.com/Kilo-Org/kilocode/commit/4c5c2428927f26c4c818f23a650cfaf5723b7641) - Show the worktree directory name on the Agent Manager worktree hover card
+
 ## 7.4.16
 
 ### Minor Changes
diff --git a/packages/kilo-vscode/eslint.config.mjs b/packages/kilo-vscode/eslint.config.mjs
index d19df68b45..8aedaac465 100644
--- a/packages/kilo-vscode/eslint.config.mjs
+++ b/packages/kilo-vscode/eslint.config.mjs
@@ -43,17 +43,10 @@ export default [
   },
   {
     files: ["webview-ui/agent-manager/AgentManagerApp.tsx"],
-    // Raised from 3100 → 3200 for the experimental terminal tabs feature.
-    // ~600 lines of terminal logic were extracted to ./terminal/* and
-    // ./tab-rendering.tsx; the remaining ~75 lines are signal bindings,
-    // a stacking-container wrapper required by the hydration invariant
-    // (canvases must never leave the paint tree — see render.tsx), and
-    // render-call wiring that must live at the top of
-    // `AgentManagerContent` alongside the existing selection/session state.
-    // Raised from 3200 → 3210 for the per-message feedback `FeedbackProvider`
-    // wiring, which sits inside the provider chain and cannot be extracted
-    // without adding an intermediate wrapper component.
-    rules: { complexity: ["error", 74], "max-lines": ["error", 3210] },
+    // Lowered 3210 → 2800 after extracting the sidebar body (SidebarBody.tsx)
+    // and the tab bar (TabBar.tsx) into components. Keep shrinking as more
+    // logic moves out; do not raise.
+    rules: { complexity: ["error", 74], "max-lines": ["error", 2800] },
   },
   {
     files: ["src/agent-manager/AgentManagerProvider.ts"],
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index 45d6fbeb52..75e0fbb56c 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -2,7 +2,7 @@
   "name": "kilo-code",
   "displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete",
   "description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "icon": "assets/icons/logo-outline-black.png",
   "galleryBanner": {
     "color": "#FFFFFF",
@@ -678,7 +678,7 @@
         "command": "kilo-code.new.agentManager.showTerminal",
         "key": "ctrl+/",
         "mac": "cmd+/",
-        "when": "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel'"
+        "when": "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' && !kilo-code.new.sidebarFocused"
       },
       {
         "command": "kilo-code.new.agentManager.runScript",
@@ -868,7 +868,8 @@
             "tr",
             "nl",
             "uk",
-            "it"
+            "it",
+            "fa"
           ],
           "enumDescriptions": [
             "Auto (VS Code language)",
@@ -891,7 +892,8 @@
             "Türkçe",
             "Nederlands",
             "Українська",
-            "Italiano"
+            "Italiano",
+            "فارسی"
           ]
         },
         "kilo-code.new.languageCommitMessage": {
@@ -919,7 +921,8 @@
             "tr",
             "nl",
             "uk",
-            "it"
+            "it",
+            "fa"
           ],
           "enumDescriptions": [
             "跟随界面语言 (Sync with UI language)",
@@ -942,7 +945,8 @@
             "Türkçe",
             "Nederlands",
             "Українська",
-            "Italiano"
+            "Italiano",
+            "فارسی"
           ]
         },
         "kilo-code.new.model.providerID": {
@@ -1016,6 +1020,12 @@
           "scope": "application",
           "description": "Prefix for automatically named Agent Manager branches, for example 'marius/' or 'feature/'. Explicit branch names are unchanged."
         },
+        "kilo-code.new.experimental.multiProject": {
+          "type": "boolean",
+          "default": false,
+          "scope": "application",
+          "description": "Allow Agent Manager to manage sessions and worktrees across multiple repositories as projects. The current workspace repository is always the default project; additional projects can be added and persist across restarts."
+        },
         "kilo-code.new.agentManager.terminalButtonDestination": {
           "type": "string",
           "scope": "application",
@@ -1028,7 +1038,7 @@
             "Open or focus the VS Code integrated terminal.",
             "Open or focus an embedded terminal in the Agent Manager side panel."
           ],
-          "description": "Choose where the Agent Manager terminal button and Focus Terminal keyboard shortcut open a terminal."
+          "description": "Default destination for the Agent Manager terminal button and Focus Terminal keyboard shortcut. The terminal button's dropdown remembers its own choice per Agent Manager panel; this setting only applies to panels that never picked one."
         },
         "kilo-code.new.indexing.showButtonWhenDisabled": {
           "type": "boolean",
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index 48817cf901..980f8e4272 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -1,4 +1,5 @@
 import * as path from "path"
+import { existsSync } from "fs"
 import * as vscode from "vscode"
 import type {
   KiloClient,
@@ -161,8 +162,11 @@ import { AnacondaDesktopBridge } from "./anaconda-desktop/bridge"
 import { fetchOpenAIModels, FetchModelsError } from "./shared/fetch-models"
 import type { Agent } from "@kilocode/sdk/v2/client"
 import { configFeatures } from "./features"
+import { fetchSnapshot } from "./kilo-provider/config-snapshot"
 import { createAutoApproveBridge } from "./kilo-provider/auto-approve"
 import type { KiloProviderOptions } from "./kilo-provider/options"
+import type { ProjectRef, SessionRef, WorktreeRef } from "./agent-manager/project/route"
+import { indexingConsentStore, registeredProjects } from "./indexing-consent"
 import { fetchKiloEmbeddingModelCatalog } from "@kilocode/kilo-gateway"
 import { fetchImageModels } from "./image-generation/models"
 import { stopSessionProcesses } from "./kilo-provider/background-process"
@@ -172,7 +176,14 @@ import {
   validIndexingSetting,
   watchIndexingConfig,
 } from "./kilo-provider/indexing-settings"
-import { buildChatSettingsMessage, validChatSetting, watchChatConfig } from "./kilo-provider/chat-settings"
+import {
+  ConfigBindings,
+  type ConfigBinding,
+  type ConfigProject,
+  type ConfigTarget,
+} from "./kilo-provider/config-bindings"
+import { canonicalizePath, projectIdFor, samePath } from "./agent-manager/project/paths"
+import { validChatSetting, watchChatConfig } from "./kilo-provider/chat-settings"
 import { buildThroughputSettingMessage, watchThroughputConfig } from "./kilo-provider/throughput-settings"
 
 let maxCost = 0
@@ -189,6 +200,10 @@ type SandboxSupportClient = {
     options: { throwOnError: true },
   ) => Promise<{ data: { available: boolean; reason?: string } }>
 }
+type ConfigSnapshot = {
+  effective: Config
+  targets: { global: ConfigTarget; project: ConfigTarget }
+}
 
 function sandboxClient(client: KiloClient | null) {
   const sandbox = client?.sandbox
@@ -331,6 +346,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   private cachedCommandsMessage: unknown = null
   /** Cached configLoaded payload so requestConfig can be served before client is ready */
   private cachedConfigMessage: unknown = null
+  private readonly configBindings = new ConfigBindings()
   private cachedGlobalConfig: Config | null = null
   /** Cached indexingStatusLoaded payload so requestIndexingStatus can be served before client is ready */
   private cachedIndexingStatusMessage: unknown = null
@@ -412,6 +428,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   private ignoreControllerDir: string | null = null
   private chatAutocomplete: ChatTextAreaAutocomplete | null = null
   private projectDirectory: string | null | undefined
+  private indexingProjectId: string | undefined
+  private indexingSettingsRequest = 0
+  private indexingStatusRequest = 0
   private slimEditMetadata = true
 
   private pendingFollowup: Followup | null = null
@@ -536,7 +555,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   public setProjectDirectory(directory: string | null): void {
     if (this.projectDirectory === directory) return
     this.projectDirectory = directory
+    this.configBindings.clear()
+    this.cachedConfigMessage = null
     this.postMessage({ type: "workspaceDirectoryChanged", directory: directory ?? "" })
+    this.postMessage({ type: "configBindingExpired", reason: "project-changed" })
     this.requirements.clear()
   }
 
@@ -799,14 +821,16 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
    * When set, all operations for this session use this directory instead of the workspace root.
    */
   public setSessionDirectory(sessionId: string, directory: string): void {
-    this.aborts.preserve(sessionId, this.sessionStatusMap.get(sessionId), this.getWorkspaceDirectory(sessionId))
+    const current = this.sessionDirectories.get(sessionId) ?? this.getRootDirectory()
+    this.aborts.preserve(sessionId, this.sessionStatusMap.get(sessionId), current)
     this.sessionDirectories.set(sessionId, directory)
     this.requirements.clear()
     if (this.connectionState === "connected") void this.fetchAndSendSandboxStatus(sessionId)
   }
 
   public clearSessionDirectory(sessionId: string): void {
-    this.aborts.preserve(sessionId, this.sessionStatusMap.get(sessionId), this.getWorkspaceDirectory(sessionId))
+    const current = this.sessionDirectories.get(sessionId) ?? this.getRootDirectory()
+    this.aborts.preserve(sessionId, this.sessionStatusMap.get(sessionId), current)
     this.sessionDirectories.delete(sessionId)
     this.requirements.clear()
     if (this.connectionState === "connected") void this.fetchAndSendSandboxStatus(sessionId)
@@ -817,11 +841,53 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     return this.sessionDirectories
   }
 
+  /** Register a project root with the shared Agent Manager route service. */
+  public registerProjectRoute(ref: ProjectRef, root: string, generation: number): void {
+    this.opts.routeService?.registerProject(ref.projectId, root, generation)
+  }
+
+  /** Drop a project and all its session/worktree routes from the route service. */
+  public unregisterProjectRoute(projectId: string): void {
+    this.opts.routeService?.unregisterProject(projectId)
+  }
+
+  /** Register a worktree directory under a project. */
+  public registerWorktreeRoute(ref: WorktreeRef, directory: string, generation: number): void {
+    this.opts.routeService?.registerWorktree(ref, directory, generation)
+  }
+
+  /** Register a session directory under a project (exact routing). */
+  public registerSessionRoute(ref: SessionRef, directory: string, generation: number): void {
+    this.opts.routeService?.registerSession(ref, directory, generation)
+  }
+
+  /** Drop one session route, keeping the raw ambiguity index consistent. */
+  public unregisterSessionRoute(ref: SessionRef): void {
+    this.opts.routeService?.unregisterSession(ref)
+  }
+
+  /** Whether a raw session id is known to be ambiguous across projects. */
+  public isSessionRouteAmbiguous(sessionId: string): boolean {
+    return this.opts.routeService?.isSessionAmbiguous(sessionId) ?? false
+  }
+
+  /** Exact directory for a project-qualified session ref, or undefined. */
+  public routeSessionDirectoryFor(ref: SessionRef): string | undefined {
+    return this.opts.routeService?.trySessionDirectoryFor(ref)
+  }
+
   public async getSessionInfo(sessionId: string): Promise<Session | undefined> {
     await this.initializeConnection()
     const client = this.client
     if (!client) return
-    const directory = this.getWorkspaceDirectory(sessionId)
+    // Agent Manager: never query an ambiguous raw session id against the
+    // active root. The same id may exist in two projects, and the
+    // sessionDirectories map can only hold one entry per raw id, so falling
+    // back to the active root would silently resolve the wrong project's
+    // session. Require an exact route (qualified or unambiguous) instead.
+    const routed = this.routeSessionDirectory(sessionId)
+    if (routed === null) return undefined
+    const directory = routed ?? this.getWorkspaceDirectory(sessionId)
     return retry(() => client.session.get({ sessionID: sessionId, directory }, { throwOnError: true }))
       .then((result) => result.data)
       .catch((error: unknown) => {
@@ -927,7 +993,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.autocompleteConfigDisposable?.dispose()
     this.autocompleteConfigDisposable = watchAutocompleteConfig((msg) => this.postMessage(msg))
     this.indexingConfigDisposable?.dispose()
-    this.indexingConfigDisposable = watchIndexingConfig((msg) => this.postMessage(msg))
+    this.indexingConfigDisposable = watchIndexingConfig(() => void this.sendIndexingSettings())
     this.chatConfigDisposable?.dispose()
     this.chatConfigDisposable = watchChatConfig((msg) => this.postMessage(msg))
     this.throughputConfigDisposable?.dispose()
@@ -951,6 +1017,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
           connection: this.connectionService,
           dir: this.getWorkspaceDirectory(this.currentSession?.id),
           post: (msg) => this.postMessage(msg),
+          browserSettings: () => this.sendBrowserSettings(),
           exportTranscript: (sessionID) => this.handleExportSessionTranscript(sessionID),
           copy: (text) => vscode.env.clipboard.writeText(text),
           openSessions: (ids) => this.trackOpenSessions(ids),
@@ -1271,11 +1338,13 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
             console.error("[Kilo New] fetchAndSendIndexingStatus failed:", e),
           )
           break
-        case "requestIndexingSettings":
-          this.postMessage(buildIndexingSettingsMessage())
+        case "requestIndexingSettings": {
+          const project = await this.sendIndexingSettings(message.projectId)
+          if (message.projectId && project) await this.fetchAndSendIndexingStatus(project.root, project.id)
           break
-        case "requestChatSettings":
-          this.postMessage(buildChatSettingsMessage())
+        }
+        case "setIndexingConsent":
+          await this.setIndexingConsent(message.projectId, message.enabled)
           break
         case "requestKiloEmbeddingModels":
           this.fetchAndSendKiloEmbeddingModels().catch((e) =>
@@ -1291,6 +1360,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
             message.projectConfig,
             message.globalUnset,
             message.projectUnset,
+            message.globalBindingId,
+            message.projectBindingId,
           )
           break
         case "openSettingsTab":
@@ -1345,9 +1416,6 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
         case "updateSetting":
           await this.handleUpdateSetting(message.key, message.value)
           break
-        case "requestBrowserSettings":
-          this.sendBrowserSettings()
-          break
         case "requestClaudeCompatSetting":
           this.sendClaudeCompatSetting()
           break
@@ -1360,9 +1428,6 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
         case "requestTimelineSetting":
           this.sendTimelineSetting()
           break
-        case "requestThroughputSetting":
-          this.postMessage(buildThroughputSettingMessage())
-          break
         case "requestNotifications":
           this.fetchAndSendNotifications().catch((e) =>
             console.error("[Kilo New] fetchAndSendNotifications failed:", e),
@@ -1572,6 +1637,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
 
     this.connectionState = "connecting"
     this.connectionGeneration++
+    this.configBindings.clear()
     this.postMessage({ type: "connectionState", state: "connecting" })
 
     // Clean up any existing subscriptions (e.g., sidebar re-shown)
@@ -1586,7 +1652,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.unsubscribeDirectoryProvider?.()
 
     try {
-      const workspaceDir = this.getWorkspaceDirectory()
+      const workspaceDir = this.settingsDirectory()
 
       // Connect the shared service (no-op if already connected)
       await this.connectionService.connect(workspaceDir)
@@ -1637,7 +1703,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
 
       // Subscribe to connection state changes
       this.unsubscribeState = this.connectionService.onStateChange(async (state, error) => {
-        if (this.connectionState !== state) this.connectionGeneration++
+        if (this.connectionState !== state) {
+          this.connectionGeneration++
+          this.configBindings.clear()
+        }
         this.connectionState = state
         this.postConnectionState(error)
 
@@ -2562,24 +2631,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
 
     try {
-      const workspaceDir = this.getWorkspaceDirectory()
-      const [{ data: config }, { data: global }, { data: overlay }] = await Promise.all([
-        retry(() => this.client!.config.get({ directory: workspaceDir }, { throwOnError: true })),
-        this.client.global.config.get({ throwOnError: true }),
-        this.client.config.overlay({ directory: workspaceDir, scope: "project" }, { throwOnError: true }),
-      ])
-      this.cachedGlobalConfig = global ?? null
-
-      const message = {
-        type: "configLoaded",
-        config,
-        globalConfig: global,
-        projectConfig: overlay?.project,
-        settings: { maxCost: this.maxCostSetting(), languageCommitMessage: this.commitMessageLanguageSetting() },
-        features: configFeatures(config),
-      }
-      this.cachedConfigMessage = message
-      this.postMessage(message)
+      await this.refreshConfig("configLoaded")
     } catch (error) {
       console.error("[Kilo New] KiloProvider: Failed to fetch config:", error)
     }
@@ -2597,8 +2649,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
   }
 
-  private async fetchAndSendIndexingStatus(): Promise<void> {
-    if (!this.client) {
+  private async fetchAndSendIndexingStatus(directory?: string, projectId?: string): Promise<void> {
+    if (!this.client || !this.extensionContext) {
       if (this.cachedIndexingStatusMessage) {
         this.postMessage(this.cachedIndexingStatusMessage)
       }
@@ -2607,21 +2659,19 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
 
     const config = this.connectionService.getServerConfig()
     if (!config) return
+    const request = ++this.indexingStatusRequest
 
     try {
-      const dir = this.getWorkspaceDirectory(this.currentSession?.id)
-      const auth = Buffer.from(`kilo:${config.password}`).toString("base64")
-      const res = await fetch(`${config.baseUrl}/indexing/status`, {
-        headers: {
-          Authorization: `Basic ${auth}`,
-          ...(dir ? { "x-kilo-directory": dir } : {}),
-        },
-      })
-      if (!res.ok) throw new Error(`HTTP ${res.status}`)
-      const status = (await res.json()) as IndexingStatus
+      const dir = directory ?? this.getWorkspaceDirectory(this.currentSession?.id)
+      if (!dir) return
+      const store = indexingConsentStore(this.extensionContext)
+      const project = await store.project(dir)
+      const status = await this.syncIndexingConsent(project.root, store.enabled(project.id), config)
+      if (request !== this.indexingStatusRequest) return
       const message = {
         type: "indexingStatusLoaded",
         status,
+        projectId,
       }
       this.cachedIndexingStatusMessage = message
       this.postMessage(message)
@@ -2673,29 +2723,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   private async fetchAndSendConfigUpdated(): Promise<void> {
     if (!this.client || this.connectionState !== "connected") return
     try {
-      const dir = this.getWorkspaceDirectory()
-      const [{ data: config }, { data: global }, { data: overlay }] = await Promise.all([
-        retry(() => this.client!.config.get({ directory: dir }, { throwOnError: true })),
-        this.client.global.config.get({ throwOnError: true }),
-        this.client.config.overlay({ directory: dir, scope: "project" }, { throwOnError: true }),
-      ])
-      this.cachedGlobalConfig = global ?? null
-      this.cachedConfigMessage = {
-        type: "configLoaded",
-        config,
-        globalConfig: global,
-        projectConfig: overlay?.project,
-        settings: { maxCost: this.maxCostSetting(), languageCommitMessage: this.commitMessageLanguageSetting() },
-        features: configFeatures(config),
-      }
-      this.postMessage({
-        type: "configUpdated",
-        config,
-        globalConfig: global,
-        projectConfig: overlay?.project,
-        settings: { maxCost: this.maxCostSetting(), languageCommitMessage: this.commitMessageLanguageSetting() },
-        features: configFeatures(config),
-      })
+      await this.refreshConfig("configUpdated")
     } catch (error) {
       console.error("[Kilo New] KiloProvider: Failed to fetch config after update:", error)
     }
@@ -3021,6 +3049,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     project: Partial<Config> = {},
     globalUnset: string[][] = [],
     projectUnset: string[][] = [],
+    globalBindingId?: string,
+    projectBindingId?: string,
   ): Promise<void> {
     if (!this.client || this.connectionState !== "connected") {
       this.postMessage({ type: "configUpdateFailed", message: "Not connected to CLI backend" })
@@ -3039,100 +3069,188 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
       project.agent !== undefined
     const hasGlobal = Object.keys(partial).length > 0 || globalUnset.length > 0
     const hasProject = Object.keys(project).length > 0 || projectUnset.length > 0
+    if (!hasGlobal && !hasProject) return
+
+    const globalBinding = hasGlobal
+      ? this.configBindings.get(globalBindingId, this.connectionGeneration, (project) =>
+          this.validConfigProject(project),
+        )
+      : undefined
+    const projectBinding = hasProject
+      ? this.configBindings.get(projectBindingId, this.connectionGeneration, (project) =>
+          this.validConfigProject(project),
+        )
+      : undefined
+    if ((hasGlobal && !globalBinding) || (hasProject && !projectBinding)) {
+      this.postMessage({ type: "configUpdateFailed", message: "Settings changed or expired. Reload before saving." })
+      return
+    }
 
     this.pending++
-    const dir = this.getWorkspaceDirectory()
+    const dir = projectBinding?.directory ?? globalBinding?.directory ?? this.settingsDirectory()
+    const completed: Array<"global" | "project"> = []
+    let snapshot: ConfigSnapshot | undefined
 
     try {
       await this.connectionService.drainPendingPrompts()
       if (hasGlobal) {
-        await this.client.config.overlayUpdate(
-          { scope: "global", set: partial, unset: globalUnset, directory: dir },
+        const result = await this.client.config.overlayUpdate(
+          {
+            scope: "global",
+            set: partial,
+            unset: globalUnset,
+            directory: globalBinding!.directory,
+            expected: {
+              path: globalBinding!.target.path,
+              revision: globalBinding!.target.revision,
+            },
+          },
           { throwOnError: true },
         )
+        snapshot = result.data as ConfigSnapshot
+        completed.push("global")
       }
       if (hasProject) {
-        await this.client.config.overlayUpdate(
-          { scope: "project", set: project, unset: projectUnset, directory: dir },
+        const result = await this.client.config.overlayUpdate(
+          {
+            scope: "project",
+            set: project,
+            unset: projectUnset,
+            directory: projectBinding!.directory,
+            expected: {
+              path: projectBinding!.target.path,
+              revision: projectBinding!.target.revision,
+            },
+          },
           { throwOnError: true },
         )
+        snapshot = result.data as ConfigSnapshot
+        completed.push("project")
       }
     } catch (error) {
-      this.postConfigFailure(error)
+      if (completed.length > 0) {
+        if (globalBinding) this.configBindings.consume(globalBinding.id)
+        if (projectBinding) this.configBindings.consume(projectBinding.id)
+      }
+      this.postConfigFailure(error, completed, snapshot, dir)
       this.pending--
       return
     }
+    if (globalBinding) this.configBindings.consume(globalBinding.id)
+    if (projectBinding) this.configBindings.consume(projectBinding.id)
 
     try {
-      const [{ data: merged }, { data: global }, { data: overlay }] = await Promise.all([
-        retry(() => this.client!.config.get({ directory: dir }, { throwOnError: true })),
-        this.client.global.config.get({ throwOnError: true }),
-        this.client.config.overlay({ directory: dir, scope: "project" }, { throwOnError: true }),
-      ])
-      this.cachedGlobalConfig = global ?? null
+      if (!snapshot) throw new Error("Config update returned no authoritative snapshot")
+      const bindings = this.bindingsFor(dir, snapshot.targets)
+      const global = snapshot.targets.global.raw as Config
+      const projectConfig = bindings.project ? (snapshot.targets.project.raw as Config) : undefined
+      this.cachedGlobalConfig = global
       this.cachedConfigMessage = {
         type: "configLoaded",
-        config: merged,
+        config: snapshot.effective,
         globalConfig: global,
-        projectConfig: overlay?.project,
-        settings: { maxCost: this.maxCostSetting(), languageCommitMessage: this.commitMessageLanguageSetting() },
-        features: configFeatures(merged),
+        projectConfig,
+        bindings,
+        settings: this.configSettings(),
+        features: configFeatures(snapshot.effective),
       }
       this.postMessage({
         type: "configUpdated",
-        config: merged,
+        config: snapshot.effective,
         globalConfig: global,
-        projectConfig: overlay?.project,
-        settings: { maxCost: this.maxCostSetting(), languageCommitMessage: this.commitMessageLanguageSetting() },
-        features: configFeatures(merged),
+        projectConfig,
+        bindings,
+        settings: this.configSettings(),
+        features: configFeatures(snapshot.effective),
       })
       this.requirements.clear()
       await Promise.all([
         refreshProviders ? this.fetchAndSendProviders() : Promise.resolve(),
         refreshAgents ? this.fetchAndSendAgents() : Promise.resolve(),
-      ])
+      ]).catch((error) => console.error("[Kilo New] KiloProvider: Post-config refresh failed:", error))
     } catch (error) {
-      console.error("[Kilo New] KiloProvider: Config write succeeded but post-write refresh failed:", error)
-      const patch =
-        partial.indexing === undefined && project.indexing === undefined
-          ? { ...partial, ...project }
-          : { ...partial, ...project, indexing: { ...(partial.indexing ?? {}), ...(project.indexing ?? {}) } }
-      const cached = (this.cachedConfigMessage as { config?: unknown } | null)?.config
-      const features = (this.cachedConfigMessage as { features?: unknown } | null)?.features
-      const optimistic =
-        cached && typeof cached === "object" ? { ...(cached as Record<string, unknown>), ...patch } : patch
-      this.postMessage({
-        type: "configUpdated",
-        config: optimistic,
-        globalConfig: this.cachedGlobalConfig ?? undefined,
-        settings: { maxCost: this.maxCostSetting(), languageCommitMessage: this.commitMessageLanguageSetting() },
-        features: features ?? configFeatures(optimistic as Config),
-      })
-      this.requirements.clear()
+      this.postConfigFailure(error, completed, snapshot, dir)
     } finally {
       this.pending--
     }
   }
-  private postConfigFailure(error: unknown): void {
+  private async refreshConfig(type: "configLoaded" | "configUpdated", dir = this.settingsDirectory()) {
+    const snapshot = await fetchSnapshot(this.client!, dir, () => this.configSettings())
+    const bindings = this.bindingsFor(dir, snapshot.targets)
+    const globalConfig = (snapshot.targets?.global.raw ?? snapshot.globalConfig) as Config
+    const projectConfig = bindings.project ? (snapshot.targets?.project.raw as Config) : undefined
+    this.cachedGlobalConfig = globalConfig ?? null
+    this.cachedConfigMessage = {
+      type: "configLoaded",
+      config: snapshot.config,
+      globalConfig,
+      projectConfig,
+      bindings,
+      collections: snapshot.collections,
+      settings: snapshot.settings,
+      features: snapshot.features,
+    }
+    this.postMessage({
+      type,
+      config: snapshot.config,
+      globalConfig,
+      projectConfig,
+      bindings,
+      collections: snapshot.collections,
+      settings: snapshot.settings,
+      features: snapshot.features,
+    })
+  }
+
+  private postConfigFailure(
+    error: unknown,
+    completed: Array<"global" | "project"> = [],
+    snapshot?: ConfigSnapshot,
+    directory?: string,
+  ): void {
     console.error("[Kilo New] KiloProvider: Failed to update config:", error)
+    const bindings = snapshot && directory ? this.bindingsFor(directory, snapshot.targets) : undefined
     this.postMessage({
       type: "configUpdateFailed",
       message: getErrorMessage(error) || "Failed to update config",
       details: getConfigErrorDetails(error),
+      completedScopes: completed,
+      config: snapshot?.effective,
+      globalConfig: snapshot?.targets.global.raw,
+      projectConfig: bindings?.project ? snapshot?.targets.project.raw : undefined,
+      bindings,
     })
   }
   private async resolveSession(sessionID?: string, draftID?: string, context?: string, contextDirectory?: string) {
     if (!this.client) return undefined
 
-    const dir = resolveNewSessionDirectory({
-      sessionID,
-      currentSessionID: this.currentSession?.id,
-      contextSessionID: this.contextSessionID,
-      agentManagerContext: context,
-      contextDirectory,
-      sessionDirectories: this.sessionDirectories,
-      workspaceDirectory: this.getRootDirectory(),
-    })
+    // Agent Manager: consult the shared route service for an exact directory
+    // before the legacy sessionDirectories/workspace-root resolution. When a
+    // raw session id is ambiguous across projects, refuse to resolve rather
+    // than fall back to the active root or a stale single-entry map — share,
+    // unshare, send, and other command paths route through here. A project
+    // qualifier (when configured) disambiguates to the exact directory.
+    let routedDir: string | null | undefined = undefined
+    if (sessionID) {
+      routedDir = this.routeSessionDirectory(sessionID)
+      if (routedDir === null) {
+        throw new Error(
+          `Session ${sessionID} is ambiguous across projects; cannot resolve a directory without a project qualifier.`,
+        )
+      }
+    }
+
+    const dir =
+      routedDir ??
+      resolveNewSessionDirectory({
+        sessionID,
+        currentSessionID: this.currentSession?.id,
+        contextSessionID: this.contextSessionID,
+        agentManagerContext: context,
+        contextDirectory,
+        sessionDirectories: this.sessionDirectories,
+        workspaceDirectory: this.getRootDirectory(),
+      })
 
     const key = `${draftID ?? context ?? "new"}\0${dir}`
     const now = Date.now()
@@ -3276,6 +3394,134 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     return vscode.workspace.getConfiguration("kilo-code.new").get<string>("languageCommitMessage", "sync")
   }
 
+  private multiProjectSetting(): boolean {
+    return vscode.workspace.getConfiguration("kilo-code.new.experimental").get<boolean>("multiProject", false)
+  }
+
+  private async sendIndexingSettings(projectId?: string) {
+    if (!this.extensionContext) {
+      this.postMessage(buildIndexingSettingsMessage())
+      return undefined
+    }
+    const request = ++this.indexingSettingsRequest
+    const store = indexingConsentStore(this.extensionContext)
+    const projects = await store.list(this.getRootDirectory(), registeredProjects(this.extensionContext))
+    if (request !== this.indexingSettingsRequest) return undefined
+    const id = projects.some((project) => project.id === projectId)
+      ? projectId
+      : projects.some((project) => project.id === this.indexingProjectId)
+        ? this.indexingProjectId
+        : projects[0]?.id
+    this.indexingProjectId = id
+    this.postMessage(buildIndexingSettingsMessage(id ? store.enabled(id) : false, projects, id))
+    return projects.find((project) => project.id === id)
+  }
+
+  private async setIndexingConsent(projectId: string, enabled: boolean): Promise<void> {
+    if (!this.extensionContext) return
+    const store = indexingConsentStore(this.extensionContext)
+    const projects = await store.list(this.getRootDirectory(), registeredProjects(this.extensionContext))
+    const project = projects.find((item) => item.id === projectId)
+    if (!project) return
+    await store.set(project.id, enabled)
+    this.indexingProjectId = project.id
+    await this.sendIndexingSettings(project.id)
+    const config = this.connectionService.getServerConfig()
+    if (!config) return
+    const request = ++this.indexingStatusRequest
+    const status = await this.syncIndexingConsent(project.root, enabled, config)
+    if (request !== this.indexingStatusRequest || this.indexingProjectId !== project.id) return
+    const message = { type: "indexingStatusLoaded", status, projectId: project.id }
+    this.cachedIndexingStatusMessage = message
+    this.postMessage(message)
+  }
+
+  private async syncIndexingConsent(
+    dir: string,
+    enabled: boolean,
+    config: { baseUrl: string; password: string },
+  ): Promise<IndexingStatus> {
+    const auth = Buffer.from(`kilo:${config.password}`).toString("base64")
+    const res = await fetch(`${config.baseUrl}/indexing/consent`, {
+      method: "PUT",
+      headers: {
+        Authorization: `Basic ${auth}`,
+        "Content-Type": "application/json",
+        "x-kilo-directory": dir,
+      },
+      body: JSON.stringify({ enabled }),
+    })
+    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    return (await res.json()) as IndexingStatus
+  }
+
+  private configSettings() {
+    return {
+      maxCost: this.maxCostSetting(),
+      languageCommitMessage: this.commitMessageLanguageSetting(),
+      multiProject: this.multiProjectSetting(),
+    }
+  }
+
+  private settingsDirectory(): string {
+    return this.projectDirectory ?? this.getRootDirectory()
+  }
+
+  private bindingsFor(
+    directory: string,
+    targets:
+      | {
+          global: ConfigTarget
+          project: ConfigTarget
+        }
+      | undefined,
+  ): { global?: ConfigBinding; project?: ConfigBinding } {
+    if (!targets) return {}
+    const project = this.configProject(directory)
+    return {
+      global: this.configBindings.create({
+        connection: this.connectionGeneration,
+        scope: "global",
+        directory,
+        target: this.configTarget(targets.global),
+      }),
+      project: project
+        ? this.configBindings.create({
+            connection: this.connectionGeneration,
+            scope: "project",
+            directory: project.root,
+            target: this.configTarget(targets.project),
+            project,
+          })
+        : undefined,
+    }
+  }
+
+  private configTarget(target: ConfigTarget): ConfigTarget {
+    return { ...target, raw: { ...target.raw } }
+  }
+
+  private configProject(directory: string): ConfigProject | undefined {
+    const root = canonicalizePath(directory)
+    const pinned = canonicalizePath(this.getRootDirectory())
+    if (samePath(root, pinned)) {
+      return { id: projectIdFor(root), root, generation: 0, pinned: true }
+    }
+    if (!this.extensionContext) return undefined
+    const project = registeredProjects(this.extensionContext).find((item) => samePath(item.root, root))
+    if (!project?.trusted || !existsSync(project.root)) return undefined
+    return { id: project.id, root: project.root, generation: 0, pinned: false }
+  }
+
+  private validConfigProject(project: ConfigProject): boolean {
+    if (project.pinned) {
+      return samePath(project.root, canonicalizePath(this.getRootDirectory())) && existsSync(project.root)
+    }
+    if (!this.extensionContext) return false
+    const current = registeredProjects(this.extensionContext).find((item) => item.id === project.id)
+    return !!current?.trusted && samePath(current.root, project.root) && existsSync(current.root)
+  }
+
   private setMaxCost(value: unknown): number {
     maxCost = MaxCostNudge.normalizeLimit(typeof value === "number" ? value : Number(value)) ?? 0
     this.costs.setLimit(maxCost)
@@ -3795,7 +4041,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
 
     // Re-send all settings to the webview so the UI reflects the reset
     this.postMessage(buildAutocompleteSettingsMessage())
-    this.postMessage(buildIndexingSettingsMessage())
+    await this.sendIndexingSettings()
     this.sendBrowserSettings()
     this.sendNotificationSettings()
     this.sendTimelineSetting()
@@ -4426,6 +4672,12 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   }
 
   private getWorkspaceDirectory(sessionId?: string): string {
+    const routed = this.routeSessionDirectory(sessionId ?? undefined)
+    // Ambiguous ids degrade to the legacy resolution instead of throwing: this
+    // runs eagerly per webview message, where a throw would drop the message.
+    if (routed === null)
+      console.warn(`[Kilo New] KiloProvider: session ${sessionId} is ambiguous across projects, using workspace root`)
+    if (routed) return routed
     return resolveWorkspaceDirectory({
       sessionID: sessionId,
       sessionDirectories: this.sessionDirectories,
@@ -4434,9 +4686,44 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   }
 
   private getSessionDirectory(sessionId: string, session?: Session): string {
+    const routed = this.routeSessionDirectory(sessionId)
+    if (routed === null)
+      console.warn(
+        `[Kilo New] KiloProvider: session ${sessionId} is ambiguous across projects, using tracked directory`,
+      )
+    if (routed) return routed
     return this.sessionDirectories.get(sessionId) ?? session?.directory ?? this.getRootDirectory()
   }
 
+  /**
+   * Resolve a session directory through the Agent Manager route service.
+   *
+   * Returns the exact directory when the route service knows the id and it is
+   * unambiguous (or a project qualifier disambiguates it). Returns `undefined`
+   * when no route service is configured or the id is unknown — callers then
+   * fall through to the legacy sessionDirectories/workspace-root path, which
+   * preserves non-Agent-Manager behavior. Returns `null` when the id is
+   * ambiguous and cannot be qualified: callers must NOT fall back to an
+   * arbitrary root in that case, because doing so would silently target the
+   * wrong project.
+   */
+  private routeSessionDirectory(sessionId: string | undefined): string | null | undefined {
+    const routes = this.opts.routeService
+    if (!routes || !sessionId) return undefined
+    const exact = routes.trySessionDirectory(sessionId)
+    if (exact) return exact
+    if (routes.isSessionAmbiguous(sessionId)) {
+      const qualifier = this.opts.projectQualifier?.()
+      if (qualifier) {
+        const ref: SessionRef = { projectId: qualifier.projectId, sessionId }
+        const dir = routes.trySessionDirectoryFor(ref)
+        if (dir) return dir
+      }
+      return null
+    }
+    return undefined
+  }
+
   private getContextDirectory(): string {
     return resolveContextDirectory({
       currentSessionID: this.currentSession?.id,
@@ -4447,6 +4734,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   }
 
   private getRootDirectory(): string {
+    const override = this.opts.rootDirectory?.()
+    if (override) return override
     const workspaceFolders = vscode.workspace.workspaceFolders
     if (workspaceFolders && workspaceFolders.length > 0) {
       return workspaceFolders[0]!.uri.fsPath
@@ -4455,10 +4744,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   }
 
   private trackDirectory(sessionId: string, dir: string) {
-    if (path.resolve(dir) === path.resolve(this.getRootDirectory())) {
-      this.sessionDirectories.delete(sessionId)
-      return
-    }
+    // Agent Manager Local sessions must retain their explicit project root.
+    // Removing same-root entries would silently retarget them after switching
+    // the panel's active project.
     this.sessionDirectories.set(sessionId, dir)
   }
 
diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
index bf72af74ab..59a8ba8951 100644
--- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
+++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
@@ -2,29 +2,43 @@ import * as fs from "fs"
 import * as path from "path"
 import type { KiloClient, Session } from "@kilocode/sdk/v2/client"
 import type { KiloConnectionService } from "../services/cli-backend"
-import { getErrorMessage } from "../kilo-provider-utils"
+import { getErrorMessage, sessionToWebview } from "../kilo-provider-utils"
+import { samePath } from "./project/paths"
 import { resolveLocalDiffTarget } from "../diff/shared/target"
+import { DiffSourceCatalog } from "../diff/sources/catalog"
 import { getDiffMarkdownRender, setDiffMarkdownRender } from "../review-settings"
 import { isAbsolutePath } from "../path-utils"
 import { WorktreeManager, type CreateWorktreeResult } from "./WorktreeManager"
 import { remoteRef, WorktreeStateManager, type Worktree } from "./WorktreeStateManager"
+import { composeDiffId, normalizeScope } from "./diff-scope"
 import { handleSection } from "./section-handler"
+import { STATE_GATED } from "./project/state-gate"
+import {
+  addSessionToLifecycleWorktree,
+  closeLifecycleSession,
+  createLifecycleWorktree,
+  deleteLifecycleWorktree,
+  promoteLifecycleSession,
+  removeStaleLifecycleWorktree,
+  type LifecycleHost,
+} from "./provider-lifecycle"
 import { normalizeBaseBranch } from "./base-branch"
 import { GitStatsPoller, type LocalStats, type WorktreePresenceResult, type WorktreeStats } from "./GitStatsPoller"
 import { PRStatusBridge } from "./pr-status-bridge"
+import { createPollers, type ProjectPollers } from "./project/pollers"
 import { GitOps } from "./GitOps"
 import { versionedName } from "./branch-name"
 import { BranchNamingController } from "./branch-naming"
 import { SetupScriptService } from "./SetupScriptService"
-import { SetupScriptRunner } from "./SetupScriptRunner"
 import { copyEnvFiles } from "./env-copy"
 import { SessionTerminalManager } from "./SessionTerminalManager"
 import { createTerminalHost } from "./terminal-host"
 import { TerminalRouter } from "./terminal-routing"
 import { executeVscodeTask } from "./task-runner"
-import { startVscodeRunTask } from "./run/task"
+import { runWorktreeSetupScript } from "./setup-script-task"
 import { RunController } from "./run/controller"
 import { handleRunMessage } from "./run/message"
+import { createRunController, createScriptTerminalRuntime, clearScriptTerminals } from "./script-terminal-runtime"
 import { forkSession } from "./fork-session"
 import { AgentManagerVisiblePresence } from "./am-visible-presence"
 import { continueInWorktree } from "./continue-in-worktree"
@@ -35,51 +49,64 @@ import {
   type CreateWorktreeOnDiskOptions,
   type CreateWorktreeOnDiskResult,
 } from "./worktree-create"
-import { recordPromotionHandoff } from "./promotion-handoff"
-import { restoreWorktrees } from "./state-recovery"
-import { createLocalDiff, diffSummary as localDiffSummary } from "./local-diff"
+import { initContextState, pushProjectSessions, reactivateProject, registerProjectSessions } from "./project/init"
+import { createLocalDiff } from "./local-diff"
 import { parseToolRequest, startFromTool, type ToolRequest } from "./tool-start"
-import { stopSessionProcesses } from "../kilo-provider/background-process"
 import { sandboxSessionMetadata } from "../shared/sandbox-session"
 import { AgentManagerOrchestrationBridge } from "./orchestration-bridge"
 import { pruneSubagents } from "./prune-subagents"
-
 import { startSession } from "./mcp-warmup"
 import { readTerminalFont, watchTerminalFont } from "./terminal-font"
-import { readTerminalDestination, watchTerminalDestination } from "./terminal-destination"
+import { DestinationState, handleDestination, watchTerminalDestination } from "./terminal-destination"
 import { buildKeybindingMap } from "./format-keybinding"
 import { resolveVersionModels, buildInitialMessages, type CreatedVersion } from "./multi-version"
 import { ensureSandbox } from "./sandbox-bootstrap"
 import { Semaphore } from "./semaphore"
 import { PLATFORM } from "./constants"
+import { ProjectRegistry } from "./project/registry"
+import type { ProjectContext } from "./project/context"
+import { ProjectContexts } from "./project/contexts"
+import { createMultiVersion, type MultiVersionHost } from "./provider-multi-version"
+import { handleProjectMessage, type ProjectMessageDeps } from "./project/messages"
+import { createProjectWiring } from "./project/wiring"
+import { ProjectScope } from "./project/scope"
 import type { AgentManagerOutMessage, AgentManagerInMessage } from "./types"
 import type { Host, PanelContext, OutputHandle, Disposable } from "./host"
+
 export class AgentManagerProvider implements Disposable {
   public static readonly viewType = "kilo-code.new.AgentManagerPanel"
   private panel: PanelContext | undefined
   private outputChannel: OutputHandle
-  private worktrees: WorktreeManager | undefined
-  private state: WorktreeStateManager | undefined
-  private setupScript: SetupScriptService | undefined
+  private readonly registry: ProjectRegistry
+  private readonly contexts: ProjectContexts
+  private readonly projects: ProjectMessageDeps
+  private readonly projectScope = new ProjectScope()
   private importer: WorktreeImporter
   private terminalManager: SessionTerminalManager
   private terminalRouter: TerminalRouter
+  private scripts: ReturnType<typeof createScriptTerminalRuntime>
   private run: RunController
   private stateReady: Promise<void> | undefined
   private statsPoller: GitStatsPoller
+  private readonly projectPollers: ProjectPollers
   private prBridge!: PRStatusBridge
   private orchestration: AgentManagerOrchestrationBridge
   private gitOps: GitOps
   private diffs: WorktreeDiffController
+  private diffCatalog: DiffSourceCatalog
   private naming: BranchNamingController
-  private staleWorktreeIds = new Set<string>()
   private toolRequests = new Set<string>()
   private cachedWorktreeStats: { type: "agentManager.worktreeStats"; stats: WorktreeStats[] } | undefined
   private cachedLocalStats: { type: "agentManager.localStats"; stats: LocalStats } | undefined
   private unsubTool: (() => void) | undefined
   private unsubStatus: (() => void) | undefined
+  private unsubSessions: (() => void) | undefined
   private unsubFont: (() => void) | undefined
+  private unsubProjects: (() => void) | undefined
+  /** Scratch set returned when no active context exists; mutations are discarded. */
+  private readonly staleScratch = new Set<string>()
   private unsubDestination: (() => void) | undefined
+  private destination = new DestinationState()
   private closing: Promise<void> | undefined
   private onVisibilityChange: ((visible: boolean) => void) | undefined
   // Tracks sessions owned by this panel until they are explicitly closed.
@@ -103,6 +130,7 @@ export class AgentManagerProvider implements Disposable {
     )
     this.terminalRouter = new TerminalRouter({
       getClient: () => this.connectionService.getClient(),
+      getClientAsync: () => this.connectionService.getClientAsync(this.getRoot()),
       getServerConfig: () => this.connectionService.getServerConfig() ?? undefined,
       getRoot: () => this.getRoot(),
       getWorktreePath: (id) => this.getStateManager()?.getWorktree(id)?.path,
@@ -110,19 +138,27 @@ export class AgentManagerProvider implements Disposable {
       post: (msg) => this.postToWebview(msg),
       getTerminalFont: () => readTerminalFont(),
     })
+    this.scripts = createScriptTerminalRuntime({
+      connection: this.connectionService,
+      output: this.outputChannel,
+      post: (message) => this.postToWebview(message),
+    })
     this.unsubFont = watchTerminalFont((font) => {
       this.postToWebview({ type: "agentManager.terminal.fontChanged", font })
+      this.scripts.manager.snapshot()
     })
     this.unsubDestination = watchTerminalDestination((destination) => {
+      this.destination.sync(destination)
       this.postToWebview({ type: "agentManager.terminal.destinationChanged", destination })
     })
-    this.run = new RunController({
+    this.run = createRunController({
+      manager: this.scripts.manager,
       root: () => this.getRoot(),
       state: () => this.getStateManager(),
+      project: (id) => this.projectForScript(id),
       open: (file) => this.host.openDocument(file),
-      start: startVscodeRunTask,
-      post: (status) => this.postToWebview({ type: "agentManager.runStatus", ...status }),
-      error: (message) => this.postToWebview({ type: "error", message }),
+      trusted: () => this.host.isTrusted(),
+      post: (message) => this.postRunMessage(message),
       log: (msg) => this.outputChannel.appendLine(`[RunScript] ${msg}`),
       refresh: () => this.pushState(),
     })
@@ -139,6 +175,23 @@ export class AgentManagerProvider implements Disposable {
     })
     const semaphore = new Semaphore(3)
     this.gitOps = new GitOps({ log: (...args) => this.log(...args), semaphore })
+    const wiring = createProjectWiring({
+      host: this.host,
+      git: this.gitOps,
+      log: (...args) => this.log(...args),
+      output: (msg) => this.outputChannel.appendLine(msg),
+      activate: (ctx) => this.activateProject(ctx),
+      expand: (ctx) => this.initExpanded(ctx),
+      ready: (ctx) => initContextState(ctx, (...args) => this.log(...args)),
+      push: () => this.pushProjects(),
+      changed: () => this.onWorkspaceChanged(),
+      refresh: () => this.pushState(),
+      selected: (target) => this.postToWebview({ type: "agentManager.selectionActivated", target }),
+    })
+    this.registry = wiring.registry
+    this.contexts = wiring.contexts
+    this.projects = wiring.messages
+    this.unsubProjects = () => wiring.dispose()
     this.naming = new BranchNamingController({
       state: () => this.getStateManager(),
       manager: () => this.getWorktreeManager(),
@@ -148,47 +201,36 @@ export class AgentManagerProvider implements Disposable {
       log: (msg) => this.log(msg),
     })
     const local = createLocalDiff(this.gitOps, (...args) => this.log(...args))
+    this.diffCatalog = new DiffSourceCatalog(this.connectionService)
     this.diffs = new WorktreeDiffController({
       getState: () => this.getStateManager(),
       getRoot: () => this.getRoot(),
       getStateReady: () => this.stateReady,
+      catalog: this.diffCatalog,
       git: this.gitOps,
-      localDiff: local.summary,
       localDiffFile: local.file,
       post: (msg) => this.postToWebview(msg),
       log: (...args) => this.log(...args),
     })
-    this.statsPoller = new GitStatsPoller({
-      getWorktrees: () => this.state?.getWorktrees() ?? [],
-      getWorkspaceRoot: () => this.getRoot(),
-      localDiff: (dir, base) => localDiffSummary(this.gitOps, dir, base, (...args) => this.log(...args)),
-      semaphore,
-      onStats: (stats) => {
-        const msg = { type: "agentManager.worktreeStats" as const, stats }
-        this.cachedWorktreeStats = msg
-        this.postToWebview(msg)
-      },
-      onLocalStats: (stats) => {
-        const msg = { type: "agentManager.localStats" as const, stats }
-        this.cachedLocalStats = msg
-        this.postToWebview(msg)
-      },
-      onWorktreePresence: (presence) => {
-        this.onWorktreePresence(presence)
-      },
-      log: (...args) => this.log(...args),
+    const pollers = createPollers({
       git: this.gitOps,
-    })
-    this.prBridge = PRStatusBridge.create({
-      getWorktrees: () => this.state?.getWorktrees() ?? [],
-      getWorkspaceRoot: () => this.getRoot(),
-      postToWebview: (m) => this.postToWebview(m),
-      updateWorktreePR: (id, n, u, s) => this.state?.updateWorktreePR(id, n, u, s),
-      hasPersistedPR: (id: string) => !!this.state?.getWorktree(id)?.prNumber,
-      openExternal: (u) => this.host.openExternal(u),
-      log: (...a) => this.log(...a),
       semaphore,
+      state: () => this.state,
+      root: () => this.getRoot(),
+      activeId: () => this.contexts.active()?.id,
+      visible: () => this.panel?.visible ?? false,
+      post: (msg) => this.postToWebview(msg),
+      cache: (msg) => {
+        if (msg.type === "agentManager.worktreeStats") this.cachedWorktreeStats = msg
+        if (msg.type === "agentManager.localStats") this.cachedLocalStats = msg
+      },
+      presence: (presence) => this.onWorktreePresence(presence),
+      openExternal: (u) => this.host.openExternal(u),
+      log: (...args) => this.log(...args),
     })
+    this.statsPoller = pollers.stats
+    this.prBridge = pollers.pr
+    this.projectPollers = pollers.projects
     this.orchestration = new AgentManagerOrchestrationBridge(this.connectionService, {
       root: () => this.getRoot(),
       state: () => this.state,
@@ -214,6 +256,48 @@ export class AgentManagerProvider implements Disposable {
       (event) => (event as { type?: string }).type === "session.status",
       (event) => this.onSessionStatus(event),
     )
+    this.unsubSessions = this.connectionService.onEventFiltered(
+      (event) => {
+        const type = (event as { type?: string }).type
+        return type === "session.created" || type === "session.updated" || type === "session.deleted"
+      },
+      (event) => this.onSessionLifecycle(event),
+    )
+  }
+
+  /**
+   * Keep each project's cached sidebar session list in sync with backend
+   * session lifecycle events, so sessions created outside this panel (another
+   * window, the CLI, the API) appear without waiting for a full re-list.
+   */
+  private onSessionLifecycle(event: unknown): void {
+    const ev = event as { type?: string; properties?: { info?: Session; sessionID?: string } }
+    if (ev.type === "session.deleted") {
+      const id = ev.properties?.sessionID
+      if (!id) return
+      const ctx = this.contexts.byLiveSession(id)
+      if (!ctx) return
+      ctx.removeLiveSession(id)
+      this.postToWebview({ type: "agentManager.projectSessions", projectId: ctx.id, sessions: [...ctx.sessions()] })
+      return
+    }
+    const info = ev.properties?.info
+    const dir = info?.directory
+    // Session events from sync or older backends can lack time/directory; a
+    // throw here would escape into the SSE dispatch loop and starve the other
+    // listeners (there is no per-listener error isolation).
+    if (!info?.time || !dir) return
+    const ctx = this.contexts.byDirectory(dir)
+    if (!ctx || ctx.lifecycle !== "ready") return
+    const state = ctx.peekState()
+    const managed = state?.getSession(info.id)
+    const worktreeId =
+      managed?.worktreeId ?? state?.getWorktrees().find((wt) => wt.path && samePath(wt.path, dir))?.id ?? null
+    ctx.upsertSession({ ...sessionToWebview(info), worktreeId })
+    // The next regular push re-lists from the backend to reconcile the
+    // optimistic entry (position, subtrees, deletions elsewhere).
+    ctx.invalidateSessions()
+    this.postToWebview({ type: "agentManager.projectSessions", projectId: ctx.id, sessions: [...ctx.sessions()] })
   }
 
   private onSessionStatus(event: unknown): void {
@@ -244,6 +328,8 @@ export class AgentManagerProvider implements Disposable {
       this.host.openPanel({
         onBeforeMessage: (msg) => this.onMessage(msg),
         worktreeDirectories: () => this.getWorktreeDirectories(),
+        workspaceRoot: () => this.getRoot(),
+        projectId: () => this.contexts.active()?.id,
       }),
     )
   }
@@ -280,9 +366,11 @@ export class AgentManagerProvider implements Disposable {
     this.panel = ctx
 
     this.statsPoller.setVisible(ctx.visible)
+    this.projectPollers.setVisible(ctx.visible)
     this.onVisibilityChange?.(ctx.visible)
     ctx.onDidChangeVisibility((visible) => {
       this.statsPoller.setVisible(visible)
+      this.projectPollers.setVisible(visible)
       this.visiblePresence.flush()
     })
 
@@ -291,6 +379,7 @@ export class AgentManagerProvider implements Disposable {
     })
 
     this.stateReady = this.initializeState()
+    this.pushProjects()
     void this.sendRepoInfo()
     this.sendKeybindings()
     this.prBridge.attachPanel(ctx)
@@ -316,47 +405,39 @@ export class AgentManagerProvider implements Disposable {
     })
   }
 
-  // State initialization
-
   private async initializeState(): Promise<void> {
-    const manager = this.getWorktreeManager()
-    const state = this.getStateManager()
-    if (!manager || !state) {
+    const ctx = this.contexts.active()
+    if (!ctx) {
       this.pushEmptyState()
       return
     }
+    const state = ctx.stateManager()
+    const init = await initContextState(ctx, (...args) => this.log(...args))
 
-    await this.ensureGitExclude(manager)
-    const loaded = await state.load()
-    manager.cleanupOrphanedTempDirs()
-
-    if (loaded.status === "failed" && !(await state.prepareRecovery())) {
+    if (!init.ok) {
       this.postToWebview({ type: "error", message: "Agent Manager state could not be recovered." })
       this.pushState()
       return
     }
 
-    await this.recoverWorktrees(manager, state)
-
     // When the .kilocode → .kilo migration rewrote git worktree refs, nudge
     // VS Code's git extension to re-discover them. Without this, worktrees
     // won't appear in Source Control until the next VS Code restart.
-    if (loaded.refsFixed > 0) {
-      this.log(`Migration fixed ${loaded.refsFixed} git worktree ref(s), refreshing git`)
+    if (init.refsFixed > 0) {
+      this.log(`Migration fixed ${init.refsFixed} git worktree ref(s), refreshing git`)
       this.host.refreshGit()
     }
 
-    for (const wt of state.getWorktrees()) {
-      for (const s of state.getSessions(wt.id)) this.panel?.sessions.setSessionDirectory(s.id, wt.path)
-    }
+    registerProjectSessions(ctx, this.panel?.sessions)
     await pruneSubagents(state, this.panel?.sessions, (message) => this.log(message))
     for (const s of state.getSessions()) this.panel?.sessions.trackSession(s.id)
     this.pushState()
 
-    // Refresh sessions so worktree sessions appear in the list
-    if (state.getSessions().length > 0) {
-      this.panel?.sessions.refreshSessions()
-    }
+    // Always list sessions, even when the state tracks none: the backend may
+    // still hold sessions for this project, and without the listing the
+    // sessionsLoaded message never reaches the webview, leaving the sidebar
+    // on skeletons forever.
+    this.panel?.sessions.refreshSessions()
 
     // Recover any pending permission/question prompts that were missed during
     // panel recreation or SSE reconnection. Must run after all worktree sessions
@@ -365,26 +446,16 @@ export class AgentManagerProvider implements Disposable {
     this.panel?.sessions.recoverPendingPrompts()
   }
 
-  private async ensureGitExclude(manager: WorktreeManager): Promise<void> {
-    await manager.ensureGitExclude().catch((err) => {
-      this.log("Failed to update git exclude:", err)
+  /** Initialize an expanded background project and push its state (no panel wiring). */
+  private initExpanded(ctx: ProjectContext): void {
+    void initContextState(ctx, (...args) => this.log(...args)).then((result) => {
+      if (!result.current) return
+      registerProjectSessions(ctx, this.panel?.sessions)
+      this.pushState(ctx)
+      this.projectPollers.sync(this.contexts)
     })
   }
 
-  private async recoverWorktrees(manager: WorktreeManager, state: WorktreeStateManager): Promise<void> {
-    const infos = await manager.discoverWorktrees().catch((err) => {
-      this.log("Failed to discover worktrees during state recovery:", err)
-      return []
-    })
-    if (infos.length === 0) return
-
-    const result = restoreWorktrees(state, infos)
-    if (result.worktrees === 0 && result.sessions === 0) return
-
-    this.log(`Recovered ${result.worktrees} worktree(s) and ${result.sessions} session(s) from disk`)
-    await state.flush()
-  }
-
   // Message interceptor
 
   private async onMessage(msg: Record<string, unknown>): Promise<Record<string, unknown> | null> {
@@ -394,7 +465,27 @@ export class AgentManagerProvider implements Disposable {
     }
     msg = await this.contextMessage(msg)
     const m = msg as unknown as AgentManagerInMessage
-    if (this.shouldWaitForState(m)) await this.waitForStateReady(m.type)
+    if (await handleProjectMessage(m, this.projects)) return null
+    const ctx = this.messageProject(m)
+    if (!ctx) {
+      this.log(`dropping ${m.type}: message targets an unknown project`)
+      return null
+    }
+    return this.projectScope.run(ctx, () => this.dispatchMessage(m, msg, ctx))
+  }
+
+  private async dispatchMessage(
+    m: AgentManagerInMessage,
+    msg: Record<string, unknown>,
+    ctx: ProjectContext,
+  ): Promise<Record<string, unknown> | null> {
+    if (this.shouldWaitForState(m)) {
+      const result = await initContextState(ctx, (...args) => this.log(...args))
+      if (!result.current || !result.ok) {
+        this.log(`dropping ${m.type}: project ${ctx.id} not ready (current=${result.current}, ok=${result.ok})`)
+        return null
+      }
+    }
     this.onBranchPrompt(m)
 
     const worktree = await this.onWorktreeMessage(m)
@@ -411,6 +502,7 @@ export class AgentManagerProvider implements Disposable {
     if (diff !== undefined) return diff
     const bridge = this.onBridgeMessage(m)
     if (bridge !== undefined) return bridge
+    if (this.scripts.manager.intercept(m)) return null
     if (this.terminalRouter.handle(m)) return null
 
     return msg
@@ -584,7 +676,8 @@ export class AgentManagerProvider implements Disposable {
       void this.configureSetupScript()
       return null
     }
-    if (handleRunMessage(this.run, m)) return null
+    if (handleDestination(this.destination, m, (msg) => this.log("[XTerm]", msg))) return null
+    if (handleRunMessage(this.run, m, (id) => this.runKey(id))) return null
     if (m.type === "agentManager.showTerminal") {
       this.terminalManager.showTerminal(m.sessionId, this.state)
       return null
@@ -593,6 +686,10 @@ export class AgentManagerProvider implements Disposable {
       this.terminalManager.showLocalTerminal()
       return null
     }
+    if (m.type === "agentManager.showWorktreeTerminal") {
+      this.terminalManager.showWorktreeTerminal(m.worktreeId, this.state)
+      return null
+    }
     if (m.type === "agentManager.openWorktree") {
       this.openWorktreeDirectory(m.worktreeId)
       return null
@@ -640,6 +737,10 @@ export class AgentManagerProvider implements Disposable {
     }
     if (m.type === "agentManager.setSessionsCollapsed") {
       this.state?.setSessionsCollapsed(m.collapsed)
+      // Multi-project bodies render collapsed purely from pushed state, so the
+      // mutation must round-trip; legacy mode is covered by its optimistic
+      // signal and the push is a no-op update.
+      this.pushState()
       return null
     }
     if (m.type === "agentManager.setSidebarCollapsed") {
@@ -679,11 +780,11 @@ export class AgentManagerProvider implements Disposable {
 
   private onDiffMessage(m: AgentManagerInMessage): Record<string, unknown> | null | undefined {
     if (m.type === "agentManager.requestWorktreeDiff") {
-      void this.diffs.request(m.sessionId)
+      void this.diffs.request(composeDiffId(m.sessionId, normalizeScope(m.scope)))
       return null
     }
     if (m.type === "agentManager.requestWorktreeDiffFile") {
-      void this.diffs.requestFile(m.sessionId, m.file)
+      void this.diffs.requestFile(composeDiffId(m.sessionId, normalizeScope(m.scope), m.diffSessionId), m.file)
       return null
     }
     if (m.type === "agentManager.applyWorktreeDiff") {
@@ -691,23 +792,53 @@ export class AgentManagerProvider implements Disposable {
       return null
     }
     if (m.type === "agentManager.revertWorktreeFile") {
-      void this.diffs.revert(m.sessionId, m.file)
+      void this.diffs.revert(composeDiffId(m.sessionId, normalizeScope(m.scope)), m.file)
       return null
     }
     if (m.type === "agentManager.startDiffWatch") {
-      this.diffs.start(m.sessionId)
+      this.diffs.start(composeDiffId(m.sessionId, normalizeScope(m.scope), m.diffSessionId))
       return null
     }
     if (m.type === "agentManager.stopDiffWatch") {
       this.diffs.stop()
       return null
     }
+    if (m.type === "agentManager.requestDiffBranches") {
+      void this.sendDiffBranches(m.sessionId, m.scope)
+      return null
+    }
+    if (m.type === "agentManager.setDiffBaseBranch") {
+      void this.diffs
+        .setBase(composeDiffId(m.sessionId, normalizeScope(m.scope)), m.branch)
+        .catch((err) => this.log("Failed to set diff base:", err instanceof Error ? err.message : String(err)))
+        .then(() => void this.sendDiffBranches(m.sessionId, m.scope))
+      return null
+    }
     if (m.type === "agentManager.openFile") {
       this.openWorktreeFile(m.sessionId, m.filePath, m.line, m.column)
       return null
     }
   }
 
+  private async sendDiffBranches(sessionId: string, scope?: string): Promise<void> {
+    const id = composeDiffId(sessionId, normalizeScope(scope))
+    const result = await this.diffs.branches(id).catch((err) => {
+      this.log("Failed to list diff branches:", err instanceof Error ? err.message : String(err))
+      return undefined
+    })
+    if (!result) return
+    this.postToWebview({
+      type: "agentManager.diffBranches",
+      sessionId: id,
+      branches: result.branches,
+      defaultBranch: result.defaultBranch,
+      autoBase: result.autoBase,
+      currentBase: result.currentBase,
+      isAuto: result.isAuto,
+      currentBranch: result.currentBranch,
+    })
+  }
+
   private onBridgeMessage(m: AgentManagerInMessage): Record<string, unknown> | null | undefined {
     if (m.type !== "openFile") return undefined
 
@@ -720,6 +851,17 @@ export class AgentManagerProvider implements Disposable {
   }
 
   private onRequestState(): void {
+    // requestState fires from the webview's onMount, and a freshly mounted
+    // webview has no terminal records — any PTYs the router still tracks
+    // belong to a previous webview instance (reload or crash) and are
+    // unreachable orphans. Kill them here rather than leaking shells until
+    // the panel itself is disposed. In-flight creates from the dying
+    // instance are reaped by the router's generation guard.
+    void this.terminalRouter.dispose()
+    this.scripts.manager.snapshot()
+    this.log(
+      `onRequestState: stateReady=${this.stateReady ? "pending" : "missing"}, state=${this.state ? "ok" : "missing"}`,
+    )
     void this.stateReady
       ?.then(() => {
         // When the folder is not a git repo (or has no folder open),
@@ -740,9 +882,9 @@ export class AgentManagerProvider implements Disposable {
         // onMount). Without this, the initial refreshSessions() in
         // initializeState() can race ahead of webview mount, causing
         // sessionsLoaded to never flip to true.
-        if (this.state.getSessions().length > 0) {
-          this.panel?.sessions.refreshSessions()
-        }
+        // Unconditional: an empty managed list still needs the backend listing
+        // so the webview's sessionsLoaded gate can flip.
+        this.panel?.sessions.refreshSessions()
       })
       .catch((err) => {
         this.log("initializeState failed, pushing partial state:", err)
@@ -876,41 +1018,21 @@ export class AgentManagerProvider implements Disposable {
   }
 
   private async waitForStateReady(context: string): Promise<void> {
+    const ctx = this.projectScope.current()
+    // A message scoped to a background project must wait for that project's
+    // own initialization; this.stateReady only tracks the active project.
+    if (ctx && ctx.id !== this.contexts.active()?.id) {
+      const result = await initContextState(ctx, (...args) => this.log(...args))
+      if (!result.ok) this.log(`${context}: project ${ctx.id} state did not load`)
+      return
+    }
     if (!this.stateReady) return
     await this.stateReady.catch((err) => this.log(`${context}: stateReady rejected, continuing:`, err))
   }
 
   private shouldWaitForState(m: AgentManagerInMessage): boolean {
-    switch (m.type) {
-      case "agentManager.deleteWorktree":
-      case "agentManager.removeStaleWorktree":
-      case "agentManager.openLocally":
-      case "agentManager.addSessionToWorktree":
-      case "agentManager.closeSession":
-      case "agentManager.persistSession":
-      case "agentManager.forgetSession":
-      case "agentManager.renameWorktree":
-      case "agentManager.requestBranches":
-      case "agentManager.importFromBranch":
-      case "agentManager.importFromPR":
-      case "agentManager.setTabOrder":
-      case "agentManager.setWorktreeOrder":
-      case "agentManager.setSessionsCollapsed":
-      case "agentManager.setSidebarCollapsed":
-      case "agentManager.setReviewDiffStyle":
-      case "agentManager.setDefaultBaseBranch":
-      case "agentManager.createSection":
-      case "agentManager.renameSection":
-      case "agentManager.deleteSection":
-      case "agentManager.setSectionColor":
-      case "agentManager.toggleSectionCollapsed":
-      case "agentManager.moveToSection":
-      case "agentManager.moveSection":
-      case "agentManager.terminal.create":
-        return true
-      default:
-        return false
-    }
+    if (m.type === "agentManager.terminal.create") return m.worktreeId !== null
+    return STATE_GATED.has(m.type)
   }
 
   private onToolEvent(event: unknown, directory?: string): void {
@@ -951,7 +1073,7 @@ export class AgentManagerProvider implements Disposable {
         registerWorktreeSession: (sid, dir) => this.registerWorktreeSession(sid, dir),
         notifyReady: (sid, result, wid) => this.notifyWorktreeReady(sid, result, wid),
         push: () => this.pushState(),
-        post: (msg) => this.postToWebview(msg as AgentManagerOutMessage),
+        post: (msg) => this.postToWebview(msg as unknown as AgentManagerOutMessage),
         capture: (event, props) => this.host.capture(event, props),
         log: (...args) => this.log(...args),
         error: (msg) => this.host.showError(msg),
@@ -964,221 +1086,37 @@ export class AgentManagerProvider implements Disposable {
 
   /** Create a new worktree with an auto-created first session. */
   private async onCreateWorktree(baseBranch?: string, branchName?: string): Promise<null> {
-    await this.waitForStateReady("onCreateWorktree")
-
-    const created = await this.createWorktreeOnDisk({ baseBranch, branchName })
-    if (!created) return null
-
-    // Run setup script for new worktree (blocks until complete, shows in overlay)
-    await this.runSetupScriptForWorktree(created.result.path, created.result.branch, created.worktree.id)
-
-    const session = await this.createSessionInWorktree(created.result.path, created.result.branch, created.worktree.id)
-    if (!session) {
-      const state = this.getStateManager()
-      const manager = this.getWorktreeManager()
-      state?.removeWorktree(created.worktree.id)
-      await manager?.removeWorktree(created.result.path)
-      this.pushState()
-      return null
-    }
-
-    const state = this.getStateManager()!
-    state.addSession(session.id, created.worktree.id)
-    if (!branchName && this.host.autoBranchNaming().enabled) state.armAutoName(created.worktree.id, session.id)
-    this.registerWorktreeSession(session.id, created.result.path)
-    // Push state before registerSession so the webview's sessionCreated handler
-    // sees the worktree mapping and routes the session to the worktree tab.
-    this.notifyWorktreeReady(session.id, created.result, created.worktree.id)
-    this.panel?.sessions.registerSession(session)
-    this.host.capture("Agent Manager Session Started", {
-      source: PLATFORM,
-      sessionId: session.id,
-      worktreeId: created.worktree.id,
-      branch: created.result.branch,
-    })
-    this.log(`Created worktree ${created.worktree.id} with session ${session.id}`)
-    return null
+    const ctx = this.context
+    if (!ctx) return null
+    return createLifecycleWorktree(ctx, this.lifecycleHost, { baseBranch, branchName })
   }
 
   /** Delete a worktree and dissociate its sessions. */
   private async onDeleteWorktree(worktreeId: string): Promise<null> {
-    const manager = this.getWorktreeManager()
-    const state = this.getStateManager()
-    if (!manager || !state) return null
-    const worktree = state.getWorktree(worktreeId)
-    if (!worktree) {
-      this.log(`Worktree ${worktreeId} not found in state`)
-      return null
-    }
-    // Remove from state BEFORE disk removal so pollers immediately stop targeting this worktree.
-    // Pre-emptive skip covers any in-flight poll that already captured getWorktrees().
-    this.statsPoller.skipWorktree(worktreeId)
-    this.prBridge.remove(worktreeId)
-    this.run.remove(worktreeId)
-    this.naming.forget(worktreeId)
-    const orphaned = state.removeWorktree(worktreeId)
-    if (this.diffs.shouldStopForWorktree(worktree.path, orphaned)) {
-      this.diffs.stop()
-    }
-    for (const s of orphaned) this.panel?.sessions.clearSessionDirectory(s.id)
-    this.pushState()
-    // Disk removal after state is clean — pollers no longer reference this worktree.
-    const branch = worktree.branchOwned === false ? undefined : (worktree.originalBranch ?? worktree.branch)
-    try {
-      await manager.removeWorktree(worktree.path, branch)
-    } catch (error) {
-      this.log(`Failed to remove worktree from disk: ${error}`)
-    }
-    this.log(`Deleted worktree ${worktreeId}${branch ? ` (${branch})` : ""}`)
-    return null
+    const ctx = this.context
+    if (!ctx) return null
+    return deleteLifecycleWorktree(ctx, this.lifecycleHost, worktreeId)
   }
 
   /** Remove a stale worktree entry from state without touching the filesystem. */
   private async onRemoveStaleWorktree(worktreeId: string): Promise<null> {
-    const state = this.getStateManager()
-    if (!state) return null
-    if (!this.staleWorktreeIds.has(worktreeId)) {
-      this.log(`Ignored stale removal for non-stale worktree ${worktreeId}`)
-      return null
-    }
-
-    const worktree = state.getWorktree(worktreeId)
-    if (!worktree) {
-      this.clearStaleTracking(worktreeId)
-      this.pushState()
-      return null
-    }
-
-    this.naming.forget(worktreeId)
-    const orphaned = state.removeWorktree(worktreeId)
-    if (this.diffs.shouldStopForWorktree(worktree.path, orphaned)) {
-      this.diffs.stop()
-    }
-    for (const session of orphaned) {
-      this.panel?.sessions.clearSessionDirectory(session.id)
-    }
-    this.clearStaleTracking(worktreeId)
-    this.pushState()
-    this.log(`Removed stale worktree entry ${worktreeId} (${worktree.branch})`)
-    return null
+    const ctx = this.context
+    if (!ctx) return null
+    return removeStaleLifecycleWorktree(ctx, this.lifecycleHost, worktreeId)
   }
 
   /** Promote a session: create a worktree and move the session into it. */
   private async onPromoteSession(sessionId: string): Promise<null> {
-    await this.waitForStateReady("onPromoteSession")
-    const created = await this.createWorktreeOnDisk({})
-    if (!created) return null
-
-    // Run setup script for new worktree (blocks until complete, shows in overlay)
-    await this.runSetupScriptForWorktree(created.result.path, created.result.branch, created.worktree.id)
-
-    const state = this.getStateManager()!
-    if (!state.getSession(sessionId)) {
-      state.addSession(sessionId, created.worktree.id)
-    } else {
-      state.moveSession(sessionId, created.worktree.id)
-    }
-
-    this.registerWorktreeSession(sessionId, created.result.path)
-    await this.recordPromotionHandoff(sessionId, created.result.path, created.result.branch)
-    this.notifyWorktreeReady(sessionId, created.result, created.worktree.id)
-    this.log(`Promoted session ${sessionId} to worktree ${created.worktree.id}`)
-    return null
-  }
-
-  private async recordPromotionHandoff(sessionId: string, dir: string, branch: string): Promise<void> {
-    try {
-      await recordPromotionHandoff({
-        client: this.connectionService.getClient(),
-        sessionId,
-        directory: dir,
-        branch,
-      })
-    } catch (err) {
-      this.log("Failed to record worktree promotion handoff:", getErrorMessage(err))
-    }
+    const ctx = this.context
+    if (!ctx) return null
+    return promoteLifecycleSession(ctx, this.lifecycleHost, sessionId)
   }
 
   /** Add a new session to an existing worktree. */
   private async onAddSessionToWorktree(worktreeId: string, sessionId?: string): Promise<null> {
-    let client: KiloClient
-    try {
-      client = this.connectionService.getClient()
-    } catch (err) {
-      this.log("onAddSessionToWorktree: client not available:", err)
-      this.postToWebview({ type: "error", message: "Not connected to CLI backend" })
-      return null
-    }
-
-    const state = this.getStateManager()
-    if (!state) return null
-
-    const worktree = state.getWorktree(worktreeId)
-    if (!worktree) {
-      this.log(`Worktree ${worktreeId} not found`)
-      return null
-    }
-
-    if (sessionId) {
-      if (state.getSession(sessionId)) state.moveSession(sessionId, worktreeId)
-      else state.addSession(sessionId, worktreeId)
-      this.registerWorktreeSession(sessionId, worktree.path)
-      this.pushState()
-      this.postToWebview({
-        type: "agentManager.sessionAdded",
-        sessionId,
-        worktreeId,
-      })
-      this.host.capture("Agent Manager Session Started", {
-        source: PLATFORM,
-        sessionId,
-        worktreeId,
-        existing: true,
-      })
-      this.log(`Added existing session ${sessionId} to worktree ${worktreeId}`)
-      return null
-    }
-
-    let session: Session
-    try {
-      const metadata = await sandboxSessionMetadata(this.connectionService.sandboxPreference, client, worktree.path)
-      const { data } = await client.session.create(
-        { directory: worktree.path, platform: PLATFORM, metadata },
-        { throwOnError: true },
-      )
-      session = data
-    } catch (error) {
-      const err = getErrorMessage(error)
-      this.postToWebview({ type: "error", message: `Failed to create session: ${err}` })
-      this.host.capture("Agent Manager Session Error", {
-        source: PLATFORM,
-        error: err,
-        context: "addSessionToWorktree",
-        worktreeId,
-      })
-      return null
-    }
-
-    state.addSession(session.id, worktreeId)
-    this.registerWorktreeSession(session.id, worktree.path)
-    this.pushState()
-    this.postToWebview({
-      type: "agentManager.sessionAdded",
-      sessionId: session.id,
-      worktreeId,
-    })
-
-    if (this.panel) {
-      this.panel.sessions.registerSession(session)
-    }
-
-    this.host.capture("Agent Manager Session Started", {
-      source: PLATFORM,
-      sessionId: session.id,
-      worktreeId,
-    })
-    this.log(`Added session ${session.id} to worktree ${worktreeId}`)
-    return null
+    const ctx = this.context
+    if (!ctx) return null
+    return addSessionToLifecycleWorktree(ctx, this.lifecycleHost, worktreeId, sessionId)
   }
 
   private onForkSession(sessionId: string, worktreeId?: string, messageId?: string) {
@@ -1208,22 +1146,9 @@ export class AgentManagerProvider implements Disposable {
 
   /** Stop a session and remove it from Agent Manager. */
   private async onCloseSession(sessionId: string): Promise<null> {
-    const state = this.getStateManager()
-    const dirs = this.panel?.sessions.getSessionDirectories()
-    const dir = state?.directoryFor(sessionId) ?? dirs?.get(sessionId) ?? this.getRoot() ?? process.cwd()
-    await this.panel?.sessions.abortSessions([sessionId])
-    this.panelSessions.delete(sessionId)
-    try {
-      await stopSessionProcesses(this.connectionService.getClient(), sessionId, dir)
-    } catch (err) {
-      this.log("onCloseSession: client not available:", err)
-    }
-
-    state?.removeSession(sessionId)
-    this.panel?.sessions.clearSessionDirectory(sessionId)
-    if (state) this.pushState()
-    this.log(`Closed session ${sessionId}`)
-    return null
+    const ctx = this.context
+    if (!ctx) return null
+    return closeLifecycleSession(ctx, this.lifecycleHost, sessionId)
   }
 
   // Multi-version worktree creation
@@ -1233,179 +1158,9 @@ export class AgentManagerProvider implements Disposable {
     msg: Extract<AgentManagerInMessage, { type: "agentManager.createMultiVersion" }>,
   ): Promise<null> {
     await this.waitForStateReady("onCreateMultiVersion")
-    const text = msg.text?.trim() || undefined
-
-    const worktreeName = msg.name?.trim() || undefined
-    const agent = msg.agent
-    const files = msg.files
-    const baseBranch = msg.baseBranch
-    const branchName = msg.branchName?.trim() || undefined
-
-    const fallback = msg.providerID && msg.modelID ? { providerID: msg.providerID, modelID: msg.modelID } : undefined
-    const resolved = resolveVersionModels(msg.modelAllocations, fallback, Number(msg.versions) || 1)
-    const { models, versions, providerID, modelID } = resolved
-
-    // Generate a shared group ID for multi-version worktrees
-    const groupId = versions > 1 ? `grp-${Date.now()}` : undefined
-
-    this.log(
-      `Creating ${versions} worktrees${models.length > 0 ? " (model comparison)" : ""}${text ? ` for: ${text.slice(0, 60)}` : ""}${groupId ? ` (group=${groupId})` : ""}`,
-    )
-
-    // Notify webview that multi-version creation has started
-    this.postToWebview({
-      type: "agentManager.multiVersionProgress",
-      status: "creating",
-      total: versions,
-      completed: 0,
-      groupId,
-    })
-
-    // Phase 1: Create all worktrees + sessions first
-    const created: CreatedVersion[] = []
-
-    for (let i = 0; i < versions; i++) {
-      this.log(`Creating worktree ${i + 1}/${versions}`)
-
-      const version = versionedName(branchName || worktreeName, i, versions)
-      const wt = await this.createWorktreeOnDisk({
-        groupId,
-        baseBranch,
-        branchName: version.branch,
-        name: version.branch,
-        label: version.label,
-      })
-      if (!wt) {
-        this.log(`Failed to create worktree for version ${i + 1}`)
-        continue
-      }
-
-      await this.runSetupScriptForWorktree(wt.result.path, wt.result.branch, wt.worktree.id)
-
-      const session = await this.createSessionInWorktree(wt.result.path, wt.result.branch, wt.worktree.id)
-      if (!session) {
-        const state = this.getStateManager()
-        const manager = this.getWorktreeManager()
-        state?.removeWorktree(wt.worktree.id)
-        await manager?.removeWorktree(wt.result.path)
-        this.log(`Failed to create session for version ${i + 1}`)
-        continue
-      }
-
-      const state = this.getStateManager()!
-      state.addSession(session.id, wt.worktree.id)
-      if (!branchName && !worktreeName && this.host.autoBranchNaming().enabled) {
-        state.armAutoName(wt.worktree.id, session.id)
-      }
-
-      // Sandbox must match the user's choice before this session is exposed or
-      // receives its initial prompt. A failed reconciliation aborts this version.
-      if (msg.sandbox !== undefined) {
-        try {
-          await ensureSandbox(this.connectionService.getClient(), session.id, wt.result.path, msg.sandbox)
-        } catch (error) {
-          const err = getErrorMessage(error)
-          this.log(`Failed to configure sandbox for ${session.id}: ${err}`)
-          this.postToWebview({
-            type: "agentManager.worktreeSetup",
-            status: "error",
-            message: `Failed to configure sandbox: ${err}`,
-            worktreeId: wt.worktree.id,
-          })
-          this.host.capture("Agent Manager Session Error", {
-            source: PLATFORM,
-            error: err,
-            context: "configureSandbox",
-          })
-          await this.discardWorktree(wt.worktree.id, wt.result.path, wt.result.branch, session.id)
-          continue
-        }
-      }
-
-      this.registerWorktreeSession(session.id, wt.result.path)
-      this.notifyWorktreeReady(session.id, wt.result, wt.worktree.id)
-      this.panel?.sessions.registerSession(session)
-
-      // Set the per-version model immediately so the UI selector reflects
-      // the correct model as soon as the worktree appears, before Phase 2.
-      // Uses a dedicated message type to avoid clearing the busy state.
-      const versionModel = models[i]
-      const earlyProviderID = versionModel?.providerID ?? providerID
-      const earlyModelID = versionModel?.modelID ?? modelID
-      if (earlyProviderID && earlyModelID) {
-        this.postToWebview({
-          type: "agentManager.setSessionModel",
-          sessionId: session.id,
-          providerID: earlyProviderID,
-          modelID: earlyModelID,
-        })
-      }
-
-      created.push({
-        worktreeId: wt.worktree.id,
-        sessionId: session.id,
-        path: wt.result.path,
-        branch: wt.result.branch,
-        parentBranch: wt.result.parentBranch,
-        versionIndex: i,
-      })
-
-      this.host.capture("Agent Manager Session Started", {
-        source: PLATFORM,
-        sessionId: session.id,
-        worktreeId: wt.worktree.id,
-        branch: wt.result.branch,
-        multiVersion: true,
-        version: i + 1,
-        totalVersions: versions,
-        groupId,
-      })
-      this.log(`Version ${i + 1} worktree ready: session=${session.id}`)
-
-      // Update progress
-      this.postToWebview({
-        type: "agentManager.multiVersionProgress",
-        status: "creating",
-        total: versions,
-        completed: created.length,
-        groupId,
-      })
-    }
-
-    // Phase 2: Send the initial prompt to all sessions, or clear busy state if no text.
-    const messages = buildInitialMessages(created, models, { providerID, modelID }, text, agent, msg.variant, files)
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i]!
-      if (text) {
-        this.log(`Sending initial message to version ${i + 1} (session=${msg.sessionId})`)
-        this.naming.prompt({
-          sessionID: msg.sessionId,
-          text,
-          providerID: msg.providerID,
-          modelID: msg.modelID,
-        })
-      }
-      this.postToWebview({ type: "agentManager.sendInitialMessage", ...msg })
-      if (text && i < messages.length - 1) {
-        await new Promise((resolve) => setTimeout(resolve, 300))
-      }
-    }
-
-    // Notify completion
-    this.postToWebview({
-      type: "agentManager.multiVersionProgress",
-      status: "done",
-      total: versions,
-      completed: created.length,
-      groupId,
-    })
-
-    if (created.length === 0) {
-      this.host.showError(`Failed to create any of the ${versions} multi-version worktrees.`)
-    }
-
-    this.log(`Multi-version creation complete: ${created.length}/${versions} versions`)
-    return null
+    const ctx = this.context
+    if (!ctx) return null
+    return createMultiVersion(ctx, this.multiVersionHost, msg)
   }
 
   private sendKeybindings(): void {
@@ -1441,21 +1196,21 @@ export class AgentManagerProvider implements Disposable {
     await copyEnvFiles(root, worktreePath, (msg) => this.outputChannel.appendLine(`[EnvCopy] ${msg}`))
 
     try {
-      const service = this.getSetupScriptService()
-      if (!service || !service.hasScript()) return
-      this.postToWebview({
-        type: "agentManager.worktreeSetup",
-        status: "creating",
-        message: "Running setup script...",
-        branch,
-        worktreeId,
-      })
-      const runner = new SetupScriptRunner(
-        (msg) => this.outputChannel.appendLine(`[SetupScriptRunner] ${msg}`),
-        service,
-        executeVscodeTask,
+      await runWorktreeSetupScript(
+        {
+          service: this.getSetupScriptService(),
+          destination: this.destination.value(),
+          projectId: this.context?.id,
+          worktreeId,
+          branch,
+          trusted: () => this.host.isTrusted(),
+          manager: this.scripts.manager,
+          vscode: executeVscodeTask,
+          log: (msg) => this.outputChannel.appendLine(`[SetupScript] ${msg}`),
+          post: (message) => this.postToWebview(message),
+        },
+        { worktreePath, repoPath: root },
       )
-      await runner.runIfConfigured({ worktreePath, repoPath: root })
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error)
       this.outputChannel.appendLine(`[AgentManager] Setup script error: ${msg}`)
@@ -1463,6 +1218,7 @@ export class AgentManagerProvider implements Disposable {
         type: "agentManager.worktreeSetup",
         status: "error",
         message: `Setup script failed: ${msg}`,
+        projectId: this.context?.id,
         branch,
         worktreeId,
       })
@@ -1551,7 +1307,9 @@ export class AgentManagerProvider implements Disposable {
     const next = new Set(entries.filter((entry) => entry.missing).map((entry) => entry.worktreeId))
     const staleChanged =
       next.size !== this.staleWorktreeIds.size || [...next].some((worktreeId) => !this.staleWorktreeIds.has(worktreeId))
-    this.staleWorktreeIds = next
+    const stale = this.staleWorktreeIds
+    stale.clear()
+    for (const id of next) stale.add(id)
 
     if (staleChanged || branchChanged) {
       this.pushState()
@@ -1586,34 +1344,41 @@ export class AgentManagerProvider implements Disposable {
     }
     const stats = this.statsPoller.syncSkips(skipped)
     if (!stats) return
-    const msg = { type: "agentManager.worktreeStats" as const, stats }
+    const msg = { type: "agentManager.worktreeStats" as const, projectId: this.contexts.active()?.id, stats }
     this.cachedWorktreeStats = msg
     this.postToWebview(msg)
   }
 
-  private pushState(): void {
-    const state = this.state
-    if (!state) return
+  private pushState(ctx?: ProjectContext): void {
+    const target = ctx ?? this.context
+    const state = target?.peekState()
+    if (!target || !state) {
+      this.log(`pushState skipped: target=${target?.id ?? "none"}, state=${state ? "ok" : "missing"}`)
+      return
+    }
+    const active = this.contexts.active()?.id === target.id
     const worktrees = state.getWorktrees()
-    const staleWorktreeIds = this.staleWorktreesForState(worktrees)
-    const run = this.run.state()
     this.postToWebview({
       type: "agentManager.state",
+      projectId: target.id,
       worktrees,
       sessions: state.getSessions(),
       sections: state.getSections(),
-      staleWorktreeIds,
+      staleWorktreeIds: active ? this.staleWorktreesForState(worktrees) : [],
       tabOrder: state.getTabOrder(),
       worktreeOrder: state.getWorktreeOrder(),
       sessionsCollapsed: state.getSessionsCollapsed(),
       sidebarCollapsed: state.getSidebarCollapsed(),
       reviewDiffStyle: state.getReviewDiffStyle(),
       reviewMarkdownRender: getDiffMarkdownRender(),
-      terminalDestination: readTerminalDestination(),
+      terminalDestination: this.destination.value(),
       isGitRepo: true,
       defaultBaseBranch: state.getDefaultBaseBranch(),
-      ...run,
+      activeTarget: state.getActiveTarget(),
+      ...(active ? this.runStateFor(target) : {}),
     })
+    void pushProjectSessions(target, this.panel?.sessions, (message) => this.postToWebview(message))
+    if (!active) return
 
     // Sync skip set before enabling the poller so the first poll cycle
     // already excludes worktrees in collapsed sections.
@@ -1632,54 +1397,176 @@ export class AgentManagerProvider implements Disposable {
       staleWorktreeIds: [],
       reviewDiffStyle: "unified",
       reviewMarkdownRender: getDiffMarkdownRender(),
-      terminalDestination: readTerminalDestination(),
+      terminalDestination: this.destination.value(),
       isGitRepo: false,
       runStatuses: [],
       runScriptConfigured: false,
     })
   }
 
-  // Manager accessors
+  // Manager accessors — repository-bound services are owned by the active ProjectContext (immutable per root).
+  /** Provider capabilities for the worktree lifecycle handlers (state stays in ProjectContext). */
+  private get lifecycleHost(): LifecycleHost {
+    return {
+      createOnDisk: (opts) => this.createWorktreeOnDisk(opts),
+      runSetup: (dir, branch, id) => this.runSetupScriptForWorktree(dir, branch, id),
+      createSession: (dir, branch, id) => this.createSessionInWorktree(dir, branch, id),
+      notifyReady: (sid, result, id) => this.notifyWorktreeReady(sid, result, id),
+      sessions: {
+        register: (session) => this.panel?.sessions.registerSession(session),
+        clearDirectory: (sid) => this.panel?.sessions.clearSessionDirectory(sid),
+        directories: () => this.panel?.sessions.getSessionDirectories(),
+        abort: (ids) => this.panel?.sessions.abortSessions(ids) ?? Promise.resolve(),
+        forget: (sid) => void this.panelSessions.delete(sid),
+      },
+      push: () => this.pushState(),
+      register: (sid, dir) => this.registerWorktreeSession(sid, dir),
+      skipStats: (id) => this.statsPoller.skipWorktree(id),
+      unskipStats: (id) => this.statsPoller.unskipWorktree(id),
+      removePR: (id) => this.prBridge.remove(id),
+      removeRun: (id) => this.run.remove(id),
+      clearRun: (id) => clearScriptTerminals(this.scripts.manager, id, this.context?.id),
+      forgetName: (id) => this.naming.forget(id),
+      stopDiffs: (path, orphaned) => {
+        if (this.diffs.shouldStopForWorktree(path, orphaned)) this.diffs.stop()
+      },
+      capture: (event, props) => this.host.capture(event, props),
+      autoName: () => this.host.autoBranchNaming(),
+      client: () => this.connectionService.getClient(),
+      metadata: (client, dir) => sandboxSessionMetadata(this.connectionService.sandboxPreference, client, dir),
+      post: (msg) => this.postToWebview(msg),
+      log: (...args) => this.log(...args),
+    }
+  }
+
+  private get multiVersionHost(): MultiVersionHost {
+    return {
+      ...this.lifecycleHost,
+      discard: (id, dir, branch, sessionId) => this.discardWorktree(id, dir, branch, sessionId),
+      promptName: (input) => this.naming.prompt(input),
+      error: (message) => this.host.showError(message),
+    }
+  }
+
+  private get context(): ProjectContext | undefined {
+    return this.projectScope.current() ?? this.contexts.active()
+  }
 
   private getRoot(): string | undefined {
-    return this.host.workspacePath()
+    return this.context?.root
   }
 
   private getWorktreeManager(): WorktreeManager | undefined {
-    if (this.worktrees) return this.worktrees
-    const root = this.getRoot()
-    if (!root) {
-      this.log("getWorktreeManager: no folder available")
-      return undefined
-    }
-    this.worktrees = new WorktreeManager(
-      root,
-      (msg) => this.outputChannel.appendLine(`[WorktreeManager] ${msg}`),
-      this.gitOps,
-    )
-    return this.worktrees
+    return this.context?.worktreeManager()
   }
 
   private getStateManager(): WorktreeStateManager | undefined {
-    if (this.state) return this.state
-    const root = this.getRoot()
-    if (!root) {
-      this.log("getStateManager: no folder available")
-      return undefined
-    }
-    this.state = new WorktreeStateManager(root, (msg) => this.outputChannel.appendLine(`[StateManager] ${msg}`))
-    return this.state
+    return this.context?.stateManager()
   }
 
   private getSetupScriptService(): SetupScriptService | undefined {
-    if (this.setupScript) return this.setupScript
-    const root = this.getRoot()
-    if (!root) {
-      this.log("getSetupScriptService: no folder available")
-      return undefined
+    return this.context?.setupService()
+  }
+
+  private get state(): WorktreeStateManager | undefined {
+    return this.context?.peekState()
+  }
+  private get worktrees(): WorktreeManager | undefined {
+    return this.context?.peekWorktrees()
+  }
+
+  private get setupScript(): SetupScriptService | undefined {
+    return this.context?.peekSetup()
+  }
+
+  private get staleWorktreeIds(): Set<string> {
+    return this.context?.stale ?? this.staleScratch
+  }
+
+  /**
+   * Namespace the shared "local" run key with the owning project id so two
+   * projects' local run scripts do not collide in the provider-wide manager.
+   */
+  private runKey(worktreeId: string): string {
+    if (worktreeId !== "local") return worktreeId
+    if (!this.host.multiProject()) return worktreeId
+    const ctx = this.context
+    if (!ctx) return worktreeId
+    return `${ctx.id}:local`
+  }
+
+  /** Resolve the project bucket that owns a provider-wide script key. */
+  private projectForScript(worktreeId: string): string | undefined {
+    if (worktreeId.endsWith(":local") && worktreeId !== "local") return worktreeId.slice(0, -":local".length)
+    return this.contexts.byWorktree(worktreeId)?.id ?? this.context?.id
+  }
+
+  /** Run state for one project's payload: its worktrees and its own local key, un-namespaced. */
+  private runStateFor(ctx: ProjectContext): ReturnType<RunController["state"]> {
+    const state = this.run.state()
+    const ids = new Set((ctx.peekState()?.getWorktrees() ?? []).map((wt) => wt.id))
+    const localKey = `${ctx.id}:local`
+    const runStatuses = state.runStatuses
+      .filter(
+        (status) =>
+          ids.has(status.worktreeId) || status.worktreeId === localKey || (status.worktreeId === "local" && ctx.pinned),
+      )
+      .map((status) => (status.worktreeId === localKey ? { ...status, worktreeId: "local" } : status))
+    return { ...state, runStatuses }
+  }
+
+  /** Route run status emissions to the owning project and un-namespace the local key. */
+  private postRunMessage(message: AgentManagerOutMessage): void {
+    if (message.type !== "agentManager.runStatus") {
+      this.postToWebview(message)
+      return
     }
-    this.setupScript = new SetupScriptService(root)
-    return this.setupScript
+    const qualified = message.worktreeId.endsWith(":local") && message.worktreeId !== "local"
+    const owner = qualified
+      ? this.contexts.resolve(message.worktreeId.slice(0, -":local".length))
+      : this.contexts.byWorktree(message.worktreeId)
+    this.postToWebview({
+      ...message,
+      worktreeId: qualified ? "local" : message.worktreeId,
+      ...(owner ? { projectId: owner.id } : {}),
+    })
+  }
+
+  private messageProject(m: AgentManagerInMessage): ProjectContext | undefined {
+    const pid = (m as { projectId?: unknown }).projectId
+    if (typeof pid !== "string") return this.contexts.active()
+    // Re-check trust and enablement on every project-stamped message: a context
+    // instance can be cached before trust is confirmed, and get() checks neither.
+    return this.contexts.usable(pid)
+  }
+
+  private activateProject(ctx: ProjectContext): void {
+    if (this.contexts.active()?.id !== ctx.id) return
+    this.statsPoller.stop()
+    this.prBridge.reset()
+    this.activeSessionId = undefined
+    this.cachedWorktreeStats = this.cachedLocalStats = undefined
+    void this.sendRepoInfo()
+    if (!reactivateProject(ctx, this.panel?.sessions, (c) => this.pushState(c)))
+      this.stateReady = this.initializeState()
+    else this.projectPollers.sync(this.contexts)
+  }
+  private onWorkspaceChanged(): void {
+    if (this.contexts.syncPinned()) {
+      this.activeSessionId = undefined
+      this.stateReady = this.initializeState()
+      void this.sendRepoInfo()
+    }
+    this.pushProjects()
+  }
+
+  private pushProjects(): void {
+    this.postToWebview({
+      type: "agentManager.projects",
+      multiProject: this.host.multiProject(),
+      projects: this.contexts.snapshots(),
+    })
+    this.projectPollers.sync(this.contexts)
   }
 
   // Worktree file helpers
@@ -1700,18 +1587,19 @@ export class AgentManagerProvider implements Disposable {
   }
 
   /** Open a file from a worktree or local session in the VS Code editor.
-   * Absolute paths (Unix `/…` or Windows `C:\…`) are opened directly.
-   * Relative paths are resolved against the session's worktree directory
-   * (or repo root for local sessions) with symlink-traversal protection. */
-  private openWorktreeFile(sessionId: string, filePath: string, line?: number, column?: number): void {
+   * Absolute paths are opened directly; relative paths resolve against the
+   * context's worktree directory (repo root for local) with symlink-traversal
+   * protection. The id may be a worktree id, session id, or `local`. */
+  private openWorktreeFile(id: string, filePath: string, line?: number, column?: number): void {
     if (isAbsolutePath(filePath)) {
       this.host.openFile(filePath, line, column)
       return
     }
     const state = this.getStateManager()
     if (!state) return
-    const session = state.getSession(sessionId)
-    const base = session?.worktreeId ? state.getWorktree(session.worktreeId)?.path : this.getRoot()
+    const worktree = state.getWorktree(id)
+    const session = worktree ? undefined : state.getSession(id)
+    const base = worktree?.path ?? (session?.worktreeId ? state.getWorktree(session.worktreeId)?.path : this.getRoot())
     if (!base) return
     // Resolve real paths to prevent symlink traversal and normalize for
     // consistent comparison on both Unix and Windows.
@@ -1729,7 +1617,11 @@ export class AgentManagerProvider implements Disposable {
   }
 
   private postToWebview(message: AgentManagerOutMessage): void {
-    this.panel?.postMessage(message)
+    if (message.type !== "agentManager.worktreeSetup" || message.projectId) {
+      this.panel?.postMessage(message)
+      return
+    }
+    this.panel?.postMessage({ ...message, projectId: this.context?.id })
   }
 
   /**
@@ -1820,6 +1712,9 @@ export class AgentManagerProvider implements Disposable {
     )
   }
 
+  public workspaceRoot = () => this.getRoot()
+
+  public projectId = () => this.contexts.active()?.id
   /**
    * Continue a sidebar session in a new worktree.
    * Captures git state, creates worktree, applies state, forks session.
@@ -1888,7 +1783,12 @@ export class AgentManagerProvider implements Disposable {
   }
 
   private handleSection(m: AgentManagerInMessage): boolean {
-    return handleSection(this.state, m, () => this.pushState())
+    return handleSection(
+      this.state,
+      m,
+      () => this.pushState(),
+      (...args) => this.log(...args),
+    )
   }
 
   public postMessage(message: unknown): void {
@@ -1906,16 +1806,21 @@ export class AgentManagerProvider implements Disposable {
 
   private async disposeAsync(): Promise<void> {
     await this.stateReady?.catch((err) => this.log("dispose: stateReady rejected:", err))
-    await this.state?.flush().catch((err) => this.log("dispose: state flush failed:", err))
+    await this.contexts.dispose()
     this.unsubTool?.()
     this.unsubStatus?.()
+    this.unsubSessions?.()
     this.unsubFont?.()
+    this.unsubProjects?.()
     this.unsubDestination?.()
+    await this.scripts.dispose()
     this.orchestration.dispose()
     this.visiblePresence.clear()
     this.diffs.stop()
+    this.diffCatalog.dispose()
     this.naming.dispose()
     this.statsPoller.stop()
+    this.projectPollers.dispose()
     this.gitOps.dispose()
     this.prBridge.poller.stop()
     this.run.dispose()
diff --git a/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts b/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts
index ce386a858a..9b5fd45ef5 100644
--- a/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts
+++ b/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts
@@ -3,7 +3,7 @@ import * as path from "path"
 import { remoteRef, type Worktree } from "./WorktreeStateManager"
 import type { GitOps } from "./GitOps"
 import type { Semaphore } from "./semaphore"
-import { normalizePath } from "./git-import"
+import { findTrackedBranch } from "./project/paths"
 import type { WorktreeDiffEntry } from "./types"
 
 export interface WorktreeStats {
@@ -69,6 +69,7 @@ export class GitStatsPoller {
   private readonly git: GitOps
   private skipWorktreeIds = new Set<string>()
   private visible = true
+  private generation = 0
 
   constructor(private readonly options: GitStatsPollerOptions) {
     this.intervalMs = options.intervalMs ?? 5000
@@ -102,6 +103,10 @@ export class GitStatsPoller {
     this.skipWorktreeIds.add(id)
   }
 
+  unskipWorktree(id: string): void {
+    this.skipWorktreeIds.delete(id)
+  }
+
   setEnabled(enabled: boolean): void {
     if (enabled) {
       if (this.active) return
@@ -113,6 +118,7 @@ export class GitStatsPoller {
   }
 
   stop(): void {
+    this.generation++
     this.active = false
     if (this.timer) {
       clearTimeout(this.timer)
@@ -153,21 +159,26 @@ export class GitStatsPoller {
     if (!this.active) return Promise.resolve()
     if (this.busy) return Promise.resolve()
     this.busy = true
-    return this.fetch().finally(() => {
+    const generation = this.generation
+    return this.fetch(generation).finally(() => {
+      // stop() already reset busy and bumped the generation, so a stale
+      // fetch must not touch busy: a restarted poll may own it right now.
+      if (generation !== this.generation) return
       this.busy = false
       this.schedule(this.currentInterval())
     })
   }
 
-  private async fetch(): Promise<void> {
-    await Promise.all([this.fetchWorktreeStats(), this.fetchLocalStats()])
+  private async fetch(generation = this.generation): Promise<void> {
+    await Promise.all([this.fetchWorktreeStats(false, generation), this.fetchLocalStats(generation)])
   }
 
-  private async fetchWorktreeStats(includeSkipped = false): Promise<void> {
+  private async fetchWorktreeStats(includeSkipped = false, generation = this.generation): Promise<void> {
     const worktrees = this.options.getWorktrees()
     if (worktrees.length === 0) return
 
     const presence = await this.probeWorktreePresence(worktrees)
+    if (generation !== this.generation) return
     this.options.onWorktreePresence?.(presence)
 
     const missing = new Set(
@@ -211,6 +222,7 @@ export class GitStatsPoller {
         }),
       )
     ).filter((item): item is WorktreeStats => !!item)
+    if (generation !== this.generation) return
 
     for (const item of stats) this.lastStats[item.worktreeId] = item
 
@@ -248,13 +260,12 @@ export class GitStatsPoller {
     const worktreeStatuses = await Promise.all(
       worktrees.map(async (wt) => {
         const abs = path.isAbsolute(wt.path) ? wt.path : path.join(root, wt.path)
-        const normalized = normalizePath(abs)
         const exists = await fs.promises.access(abs).then(
           () => true,
           () => false,
         )
-        const missing = !exists || !tracked.has(normalized)
-        const branch = tracked.get(normalized)
+        const branch = exists ? findTrackedBranch(tracked, abs) : undefined
+        const missing = !exists || branch === undefined
         return { worktreeId: wt.id, missing, branch }
       }),
     )
@@ -262,7 +273,7 @@ export class GitStatsPoller {
     return { worktrees: worktreeStatuses, degraded: false }
   }
 
-  private async fetchLocalStats(): Promise<void> {
+  private async fetchLocalStats(generation = this.generation): Promise<void> {
     const root = this.options.getWorkspaceRoot()
     if (!root) return
 
@@ -301,6 +312,7 @@ export class GitStatsPoller {
         if (this.lastLocalStats && this.lastLocalStats.branch === branch) return
         return
       }
+      if (generation !== this.generation) return
 
       const hash = `local:${branch}:${files}:${additions}:${deletions}:${ahead}:${behind}`
       if (hash === this.lastLocalHash) {
diff --git a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts
index f655616b96..155bd410bb 100644
--- a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts
+++ b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts
@@ -38,6 +38,11 @@ export class PRStatusPoller {
   private lastFullSync = 0 // timestamp of last full (all-worktree) sync
   private readonly intervalMs: number
   private readonly semaphore: Semaphore | undefined
+  private generation = 0
+
+  private stale(generation: number): boolean {
+    return generation !== this.generation
+  }
 
   constructor(private readonly options: PRStatusPollerOptions) {
     this.intervalMs = options.intervalMs ?? 15_000
@@ -87,6 +92,7 @@ export class PRStatusPoller {
   }
 
   stop(): void {
+    this.generation++
     this.active = false
     if (this.timer) {
       clearTimeout(this.timer)
@@ -144,7 +150,11 @@ export class PRStatusPoller {
     if (!this.active || !this.visible) return Promise.resolve()
     if (this.busy) return Promise.resolve()
     this.busy = true
-    return this.fetchAll().finally(() => {
+    const generation = this.generation
+    return this.fetchAll(generation).finally(() => {
+      // stop() already reset busy and bumped the generation, so a stale
+      // fetch must not touch busy: a restarted poll may own it right now.
+      if (this.stale(generation)) return
       this.busy = false
       this.schedule()
     })
@@ -165,8 +175,9 @@ export class PRStatusPoller {
     return this.ghAvailable
   }
 
-  private async fetchAll(): Promise<void> {
+  private async fetchAll(generation = this.generation): Promise<void> {
     if (!(await this.probeGh())) {
+      if (generation !== this.generation) return
       // De-duplicate: only emit gh_missing once, not every poll cycle
       if (this.lastError !== "gh_missing") {
         this.lastError = "gh_missing"
@@ -196,10 +207,11 @@ export class PRStatusPoller {
       return
     }
 
-    const thunks = targets.map((wt) => () => this.fetchOne(wt.id))
+    const thunks = targets.map((wt) => () => this.fetchOne(wt.id, generation))
     const results = full
       ? await settled(thunks, FULL_SYNC_CONCURRENCY)
       : await Promise.allSettled(thunks.map((fn) => fn()))
+    if (this.stale(generation)) return
     const ok = results.every((r) => r.status === "fulfilled")
     if (ok) {
       this.failures = 0
@@ -208,16 +220,14 @@ export class PRStatusPoller {
     this.failures++
   }
 
-  private async fetchOne(worktreeId: string): Promise<void> {
-    const worktrees = this.options.getWorktrees()
-    const wt = worktrees.find((w) => w.id === worktreeId)
+  private async fetchOne(worktreeId: string, generation = this.generation): Promise<void> {
+    const wt = this.target(worktreeId)
     if (!wt) return
 
-    if (!this.options.getWorkspaceRoot()) return
-
     try {
       const pr = await this.cachedFetchPR(wt.branch, wt.path)
-      if (!pr) {
+      if (!pr || this.stale(generation)) {
+        if (this.stale(generation)) return
         const hash = `${worktreeId}:none`
         if (this.lastHash.get(worktreeId) === hash) return
         this.lastHash.set(worktreeId, hash)
@@ -229,6 +239,7 @@ export class PRStatusPoller {
         this.fetchChecks(pr.number, wt.path),
         this.activeWorktreeId === worktreeId ? this.fetchComments(pr.number, wt.path) : undefined,
       ])
+      if (this.stale(generation)) return
 
       const status: PRStatus = {
         number: pr.number,
@@ -249,23 +260,28 @@ export class PRStatusPoller {
 
       this.options.onStatus(worktreeId, status)
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err)
-      const kind = classifyPRError(msg)
-      this.options.log(`PR fetch failed for ${wt.branch}:`, msg)
-
-      const errKey = kind === "gh_missing" ? "gh_missing" : kind === "gh_auth" ? "gh_auth" : "fetch_failed"
-      if (kind === "gh_missing") this.ghAvailable = false
-
-      // De-duplicate: only emit if the error state changed for this worktree
-      const hash = `${worktreeId}:error:${errKey}`
-      if (this.lastHash.get(worktreeId) !== hash) {
-        this.lastHash.set(worktreeId, hash)
-        this.options.onStatus(worktreeId, null, errKey)
-      }
+      this.handleError(worktreeId, wt.branch, err)
       throw err // propagate so fetchAll can track failures for backoff
     }
   }
 
+  private handleError(worktreeId: string, branch: string, err: unknown): void {
+    const msg = err instanceof Error ? err.message : String(err)
+    const kind = classifyPRError(msg)
+    this.options.log(`PR fetch failed for ${branch}:`, msg)
+    const key = kind === "gh_missing" ? "gh_missing" : kind === "gh_auth" ? "gh_auth" : "fetch_failed"
+    if (kind === "gh_missing") this.ghAvailable = false
+    const hash = `${worktreeId}:error:${key}`
+    if (this.lastHash.get(worktreeId) === hash) return
+    this.lastHash.set(worktreeId, hash)
+    this.options.onStatus(worktreeId, null, key)
+  }
+
+  private target(worktreeId: string): Worktree | undefined {
+    if (!this.options.getWorkspaceRoot()) return
+    return this.options.getWorktrees().find((worktree) => worktree.id === worktreeId)
+  }
+
   private static readonly PR_JSON_FIELDS =
     "number,title,url,state,isDraft,reviewDecision,additions,deletions,changedFiles,headRefName,headRefOid"
 
diff --git a/packages/kilo-vscode/src/agent-manager/ScriptTerminalManager.ts b/packages/kilo-vscode/src/agent-manager/ScriptTerminalManager.ts
new file mode 100644
index 0000000000..b1c438cb12
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/ScriptTerminalManager.ts
@@ -0,0 +1,460 @@
+import type { KiloClient } from "@kilocode/sdk/v2/client"
+import type { TerminalFont } from "./terminal-font"
+import type { RunHandle } from "./run/manager"
+
+export type ScriptTerminalKind = "run" | "setup"
+type ScriptTerminalState = "running" | "stopping" | "exited" | "failed"
+
+const TITLE: Record<ScriptTerminalKind, "Run" | "Setup"> = { run: "Run", setup: "Setup" }
+
+interface ScriptTerminalConfig {
+  projectId?: string
+  worktreeId: string
+  command: string
+  args: string[]
+  cwd: string
+  env: Record<string, string>
+}
+
+interface ScriptTerminalExit {
+  exitCode?: number
+  stopped?: boolean
+  error?: string
+}
+
+export interface ScriptTerminalView {
+  terminalId: string
+  projectId?: string
+  /** null for the LOCAL workspace; RunController retains its internal "local" key. */
+  worktreeId: string | null
+  kind: ScriptTerminalKind
+  title: "Run" | "Setup"
+  wsUrl: string
+  state: ScriptTerminalState
+  exitCode?: number
+  font: TerminalFont
+}
+
+interface ScriptTerminalDeps {
+  getClient(): KiloClient
+  getClientAsync(directory: string): Promise<KiloClient>
+  buildWsUrl(ptyID: string, cwd: string): string
+  getTerminalFont(): TerminalFont
+  emit(terminals: ScriptTerminalView[]): void
+  closed(terminalId: string): void
+  log(msg: string): void
+}
+
+interface Entry {
+  key: string
+  kind: ScriptTerminalKind
+  terminalId: string
+  ptyID: string
+  projectId?: string
+  worktreeId: string
+  cwd: string
+  wsUrl: string
+  state: ScriptTerminalState
+  exitCode?: number
+  done: (exit: ScriptTerminalExit) => void
+  finished: boolean
+  closing?: Promise<void>
+}
+
+interface TerminalMessage {
+  type: string
+  terminalId?: unknown
+  cols?: unknown
+  rows?: unknown
+}
+
+function message(error: unknown): string {
+  if (error instanceof Error) return error.message
+  return String(error)
+}
+
+function missing(error: unknown): boolean {
+  if (!error || typeof error !== "object") return false
+  const value = error as Record<string, unknown>
+  if (value.status === 404 || value._tag === "PtyNotFoundError") return true
+  if (!value.data || typeof value.data !== "object") return false
+  const data = value.data as Record<string, unknown>
+  return data.status === 404 || data._tag === "PtyNotFoundError"
+}
+
+function key(kind: ScriptTerminalKind, worktreeId: string, projectId?: string): string {
+  return `${projectId ?? "single"}:${kind}:${worktreeId}`
+}
+
+function terminalId(): string {
+  return `script:${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
+}
+
+/**
+ * Owns extension-host script PTYs independently from webview terminal routing.
+ * Exited records stay available for output replay until the user closes them.
+ */
+export class ScriptTerminalManager {
+  private readonly entries = new Map<string, Entry>()
+  private readonly terminals = new Map<string, Entry>()
+  private readonly ptys = new Map<string, Entry>()
+
+  constructor(private readonly deps: ScriptTerminalDeps) {}
+
+  async start(
+    kind: ScriptTerminalKind,
+    config: ScriptTerminalConfig,
+    done: (exit: ScriptTerminalExit) => void,
+  ): Promise<RunHandle> {
+    const id = key(kind, config.worktreeId, config.projectId)
+    const prior = this.entries.get(id)
+    if (prior) {
+      if (prior.state === "running" || prior.state === "stopping")
+        throw new Error(`${TITLE[kind]} terminal is already active`)
+      await this.remove(prior, false)
+      if (this.entries.has(id)) throw new Error(`Failed to remove previous ${TITLE[kind]} terminal`)
+    }
+
+    const client = await this.deps.getClientAsync(config.cwd).catch((error) => {
+      const detail = message(error)
+      this.deps.log(`${TITLE[kind]} terminal create failed: ${detail}`)
+      throw new Error(detail)
+    })
+    const created = await client.v2.pty
+      .create({
+        location: { directory: config.cwd },
+        command: config.command,
+        args: config.args,
+        cwd: config.cwd,
+        env: config.env,
+        title: TITLE[kind],
+      })
+      .catch((error) => {
+        const detail = message(error)
+        this.deps.log(`${TITLE[kind]} terminal create failed: ${detail}`)
+        throw new Error(detail)
+      })
+    const pty = created.data?.data
+    if (created.error || !pty) {
+      const detail = message(created.error ?? "unknown error")
+      this.deps.log(`${TITLE[kind]} terminal create failed: ${detail}`)
+      throw new Error(`Failed to create ${TITLE[kind]} terminal: ${detail}`)
+    }
+
+    const wsUrl = await this.url(client, kind, pty.id, config.cwd)
+    const entry: Entry = {
+      key: id,
+      kind,
+      terminalId: terminalId(),
+      ptyID: pty.id,
+      projectId: config.projectId,
+      worktreeId: config.worktreeId,
+      cwd: config.cwd,
+      wsUrl,
+      state: "running",
+      done,
+      finished: false,
+    }
+    this.entries.set(entry.key, entry)
+    this.terminals.set(entry.terminalId, entry)
+    this.ptys.set(entry.ptyID, entry)
+    this.emit()
+
+    await this.reconcile(entry, client)
+
+    return {
+      stop: () => this.stop(entry),
+      kill: (reason) => this.kill(entry, reason),
+    }
+  }
+
+  /** Return true only for close/resize messages owned by a script terminal. */
+  intercept(msg: TerminalMessage): boolean {
+    const id = msg.terminalId
+    if (typeof id !== "string" || !this.terminals.has(id)) return false
+    if (msg.type === "agentManager.terminal.close") {
+      void this.close(id).then((closed) => {
+        if (closed) this.deps.closed(id)
+      })
+      return true
+    }
+    if (msg.type === "agentManager.terminal.stop") {
+      // Deliberate user stop: always allowed, even for a running Setup
+      // script whose accidental close is blocked.
+      void this.close(id, true).then((closed) => {
+        if (closed) this.deps.closed(id)
+      })
+      return true
+    }
+    if (msg.type !== "agentManager.terminal.resize") return false
+    if (typeof msg.cols !== "number" || typeof msg.rows !== "number") return true
+    void this.resize(id, msg.cols, msg.rows)
+    return true
+  }
+
+  exited(ptyID: string, exitCode: number): void {
+    const entry = this.ptys.get(ptyID)
+    if (!entry) return
+    this.finishExited(entry, exitCode)
+  }
+
+  deleted(ptyID: string): void {
+    const entry = this.ptys.get(ptyID)
+    if (!entry) return
+    const state = entry.state
+    if (state === "failed") {
+      // Retained failure (e.g. after a timeout kill): the backend PTY is
+      // gone now, but the tab and its output stay until the user closes it.
+      this.ptys.delete(ptyID)
+      return
+    }
+    this.drop(entry)
+    this.emit()
+    if (state === "stopping") {
+      this.done(entry, { stopped: true })
+      return
+    }
+    if (state === "running") this.done(entry, { error: `${TITLE[entry.kind]} terminal was removed before it exited` })
+  }
+
+  snapshot(): void {
+    this.emit()
+  }
+
+  owns(ptyID: string): boolean {
+    return this.ptys.has(ptyID)
+  }
+
+  /** True while a script of this kind is running or stopping for the worktree. */
+  active(kind: ScriptTerminalKind, worktreeId: string, projectId?: string): boolean {
+    const entry = this.entries.get(key(kind, worktreeId, projectId))
+    return entry?.state === "running" || entry?.state === "stopping"
+  }
+
+  async sync(): Promise<void> {
+    await Promise.all(
+      [...this.entries.values()].map(async (entry) => {
+        const client = await this.deps.getClientAsync(entry.cwd).catch((error) => {
+          this.deps.log(`Failed to reconnect ${TITLE[entry.kind]} terminal: ${message(error)}`)
+          return undefined
+        })
+        if (client) await this.reconcile(entry, client)
+      }),
+    )
+  }
+
+  async clear(kind: ScriptTerminalKind, worktreeId: string, projectId?: string): Promise<boolean> {
+    const entry = this.entries.get(key(kind, worktreeId, projectId))
+    if (!entry) return true
+    return this.close(entry.terminalId, true)
+  }
+
+  /**
+   * User-initiated tab close. A running Setup script must keep its output
+   * and finish (or time out) on its own, so only forced paths (worktree
+   * deletion, shutdown, timeout) may tear it down early.
+   */
+  async close(terminalId: string, force = false): Promise<boolean> {
+    const entry = this.terminals.get(terminalId)
+    if (!entry) return true
+    if (!force && entry.kind === "setup" && (entry.state === "running" || entry.state === "stopping")) {
+      this.deps.log(`Ignored close for ${TITLE[entry.kind]} terminal while it is running`)
+      return false
+    }
+    if (entry.state === "running") {
+      await this.stop(entry)
+      return !this.terminals.has(terminalId)
+    }
+    if (entry.state === "stopping") {
+      await entry.closing
+      return !this.terminals.has(terminalId)
+    }
+    await this.remove(entry, false)
+    return !this.terminals.has(terminalId)
+  }
+
+  async resize(terminalId: string, cols: number, rows: number): Promise<void> {
+    const entry = this.terminals.get(terminalId)
+    if (!entry) return
+    try {
+      const client = this.deps.getClient()
+      const result = await client.v2.pty.update({
+        ptyID: entry.ptyID,
+        location: { directory: entry.cwd },
+        size: { cols, rows },
+      })
+      if (!result.error) return
+      this.deps.log(`${TITLE[entry.kind]} terminal resize failed (${terminalId}): ${message(result.error)}`)
+    } catch (error) {
+      this.deps.log(`${TITLE[entry.kind]} terminal resize failed (${terminalId}): ${message(error)}`)
+    }
+  }
+
+  async dispose(): Promise<void> {
+    await Promise.all([...this.terminals.keys()].map((terminalId) => this.close(terminalId, true)))
+  }
+
+  private async reconcile(entry: Entry, client: KiloClient): Promise<void> {
+    if (!this.current(entry)) return
+    try {
+      const result = await client.v2.pty.get({ ptyID: entry.ptyID, location: { directory: entry.cwd } })
+      const pty = result.data?.data
+      if (result.error || !pty) {
+        this.missing(
+          entry,
+          `${TITLE[entry.kind]} terminal is no longer available: ${message(result.error ?? "unknown error")}`,
+        )
+        return
+      }
+      if (pty.status === "exited") this.finishExited(entry, pty.exitCode ?? 0)
+    } catch (error) {
+      this.deps.log(`Failed to read ${TITLE[entry.kind]} terminal: ${message(error)}`)
+    }
+  }
+
+  private async stop(entry: Entry): Promise<void> {
+    if (!this.current(entry)) return
+    if (entry.state === "stopping") {
+      await entry.closing
+      return
+    }
+    if (entry.state === "exited" || entry.state === "failed") {
+      await this.remove(entry, false)
+      return
+    }
+    entry.state = "stopping"
+    this.emit()
+    await this.remove(entry, true)
+  }
+
+  private remove(entry: Entry, stopped: boolean): Promise<void> {
+    if (entry.closing) return entry.closing
+    const task = this.removeEntry(entry, stopped)
+    entry.closing = task
+    void task.finally(() => {
+      if (this.current(entry) && entry.closing === task) entry.closing = undefined
+    })
+    return task
+  }
+
+  private async removeEntry(entry: Entry, stopped: boolean): Promise<void> {
+    try {
+      const client = await this.deps.getClientAsync(entry.cwd)
+      const result = await client.v2.pty.remove({ ptyID: entry.ptyID, location: { directory: entry.cwd } })
+      if (result.error) {
+        if (missing(result.error)) {
+          this.drop(entry)
+          this.emit()
+          if (stopped) this.done(entry, { stopped: true })
+          return
+        }
+        this.failed(entry, `Failed to remove ${TITLE[entry.kind]} terminal: ${message(result.error)}`)
+        return
+      }
+      this.drop(entry)
+      this.emit()
+      if (stopped) this.done(entry, { stopped: true })
+    } catch (error) {
+      this.failed(entry, `Failed to remove ${TITLE[entry.kind]} terminal: ${message(error)}`)
+    }
+  }
+
+  private async url(client: KiloClient, kind: ScriptTerminalKind, ptyID: string, cwd: string): Promise<string> {
+    try {
+      return this.deps.buildWsUrl(ptyID, cwd)
+    } catch (error) {
+      this.deps.log(`Failed to build ${TITLE[kind]} terminal URL: ${message(error)}`)
+      try {
+        const result = await client.v2.pty.remove({ ptyID, location: { directory: cwd } })
+        if (result.error)
+          this.deps.log(`Failed to remove ${TITLE[kind]} terminal after URL failure: ${message(result.error)}`)
+      } catch (cleanup) {
+        this.deps.log(`Failed to remove ${TITLE[kind]} terminal after URL failure: ${message(cleanup)}`)
+      }
+      throw error
+    }
+  }
+
+  private finishExited(entry: Entry, exitCode: number): void {
+    if (!this.current(entry) || entry.state === "exited") return
+    entry.state = "exited"
+    entry.exitCode = exitCode
+    this.emit()
+    this.done(entry, { exitCode })
+  }
+
+  private failed(entry: Entry, error: string): void {
+    if (!this.current(entry)) return
+    this.deps.log(error)
+    entry.state = "failed"
+    this.emit()
+    this.done(entry, { error })
+  }
+
+  /**
+   * Kill the process tree but retain the terminal as failed with its
+   * partial output. Timeouts use this so the user can see how far the
+   * script got; user-initiated stops use stop() and drop the tab instead.
+   */
+  private kill(entry: Entry, reason: string): void {
+    if (!this.current(entry) || (entry.state !== "running" && entry.state !== "stopping")) return
+    entry.state = "failed"
+    this.emit()
+    void this.deps
+      .getClientAsync(entry.cwd)
+      .then(async (client) => {
+        const result = await client.v2.pty.remove({ ptyID: entry.ptyID, location: { directory: entry.cwd } })
+        if (result.error) this.deps.log(`Failed to kill ${TITLE[entry.kind]} terminal: ${message(result.error)}`)
+      })
+      .catch((error) => {
+        this.deps.log(`Failed to kill ${TITLE[entry.kind]} terminal: ${message(error)}`)
+      })
+    this.deps.log(reason)
+    this.done(entry, { error: reason })
+  }
+
+  private missing(entry: Entry, error: string): void {
+    if (!this.current(entry)) return
+    this.deps.log(error)
+    this.drop(entry)
+    this.emit()
+    this.done(entry, { error })
+  }
+
+  private done(entry: Entry, exit: ScriptTerminalExit): void {
+    if (entry.finished) return
+    entry.finished = true
+    entry.done(exit)
+  }
+
+  private drop(entry: Entry): void {
+    if (!this.current(entry)) return
+    this.entries.delete(entry.key)
+    this.terminals.delete(entry.terminalId)
+    this.ptys.delete(entry.ptyID)
+  }
+
+  private current(entry: Entry): boolean {
+    return this.entries.get(entry.key) === entry
+  }
+
+  private emit(): void {
+    const terminals: ScriptTerminalView[] = []
+    for (const entry of this.entries.values()) {
+      const local = entry.worktreeId === "local" || entry.worktreeId.endsWith(":local")
+      const terminal: ScriptTerminalView = {
+        terminalId: entry.terminalId,
+        ...(entry.projectId ? { projectId: entry.projectId } : {}),
+        worktreeId: local ? null : entry.worktreeId,
+        kind: entry.kind,
+        title: TITLE[entry.kind],
+        wsUrl: entry.wsUrl,
+        state: entry.state,
+        font: this.deps.getTerminalFont(),
+      }
+      if (entry.exitCode !== undefined) terminal.exitCode = entry.exitCode
+      terminals.push(terminal)
+    }
+    this.deps.emit(terminals)
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts b/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
index 6120ba6a1c..3fc41c1170 100644
--- a/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
+++ b/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
@@ -34,6 +34,8 @@ export interface Disposable {
  */
 export class SessionTerminalManager {
   private static readonly LOCAL_KEY = "__local__"
+  private static readonly SESSION_PREFIX = "session:"
+  private static readonly WORKTREE_PREFIX = "worktree:"
 
   private terminals = new Map<string, { terminal: TerminalHandle; cwd: string }>()
   private disposables: Disposable[] = []
@@ -47,10 +49,10 @@ export class SessionTerminalManager {
   ) {
     this.disposables.push(
       host.onTerminalClosed((terminal) => {
-        for (const [sessionId, entry] of this.terminals) {
+        for (const [key, entry] of this.terminals) {
           if (entry.terminal !== terminal) continue
-          this.terminals.delete(sessionId)
-          this.log(`Removed terminal mapping for session ${sessionId} (terminal closed)`)
+          this.terminals.delete(key)
+          this.log(`Removed terminal mapping for ${key} (terminal closed)`)
           break
         }
         this.updateContextKey()
@@ -86,7 +88,8 @@ export class SessionTerminalManager {
    */
   showTerminal(sessionId: string, state: WorktreeStateManager | undefined): void {
     // If terminal already exists, just focus it
-    if (this.showExisting(sessionId, false)) return
+    const key = SessionTerminalManager.sessionKey(sessionId)
+    if (this.showExistingKey(key, false)) return
 
     const repoPath = this.host.repoPath()
     const worktreePath = state?.directoryFor(sessionId)
@@ -102,7 +105,7 @@ export class SessionTerminalManager {
     const worktree = session?.worktreeId ? state?.getWorktree(session.worktreeId) : undefined
     const name = worktree ? `Agent: ${worktree.branch}` : "Agent: local"
 
-    this.showOrCreate(sessionId, cwd, name)
+    this.showOrCreate(key, cwd, name)
   }
 
   /**
@@ -110,7 +113,7 @@ export class SessionTerminalManager {
    * Used when the user triggers a terminal in local mode without an active session.
    */
   showLocalTerminal(): void {
-    if (this.showExisting(SessionTerminalManager.LOCAL_KEY, false)) return
+    if (this.showExistingKey(SessionTerminalManager.LOCAL_KEY, false)) return
 
     const cwd = this.host.repoPath()
     if (!cwd) {
@@ -122,11 +125,32 @@ export class SessionTerminalManager {
     this.showOrCreate(SessionTerminalManager.LOCAL_KEY, cwd, "Agent: local")
   }
 
+  /**
+   * Show (or create) a terminal rooted at a worktree directory. Used when
+   * the worktree has no session to key the terminal off (e.g. all of its
+   * sessions were closed) so the shortcut never dead-ends on a sessionless
+   * worktree.
+   */
+  showWorktreeTerminal(worktreeId: string, state: WorktreeStateManager | undefined): void {
+    const key = SessionTerminalManager.worktreeKey(worktreeId)
+    if (this.showExistingKey(key, false)) return
+
+    const worktree = state?.getWorktree(worktreeId)
+    const cwd = worktree?.path ?? this.host.repoPath()
+    if (!cwd) {
+      this.log(`showWorktreeTerminal: no cwd resolved for worktree ${worktreeId}`)
+      this.host.showWarning("Open a folder that contains a git repository to use worktrees")
+      return
+    }
+
+    this.showOrCreate(key, cwd, worktree ? `Agent: ${worktree.branch}` : "Agent: worktree")
+  }
+
   /**
    * Show the existing local terminal if one was previously created (used on context switch).
    */
   showExistingLocal(): boolean {
-    return this.showExisting(SessionTerminalManager.LOCAL_KEY)
+    return this.showExistingKey(SessionTerminalManager.LOCAL_KEY)
   }
 
   /**
@@ -159,34 +183,38 @@ export class SessionTerminalManager {
    * Pass preserveFocus=true to keep focus on the current editor (default for session switching).
    */
   showExisting(sessionId: string, preserveFocus = true): boolean {
-    const entry = this.terminals.get(sessionId)
+    return this.showExistingKey(SessionTerminalManager.sessionKey(sessionId), preserveFocus)
+  }
+
+  private showExistingKey(key: string, preserveFocus = true): boolean {
+    const entry = this.terminals.get(key)
     if (!entry) return false
 
     if (entry.terminal.exitStatus !== undefined) {
-      this.terminals.delete(sessionId)
-      this.log(`showExisting: terminal exited for session ${sessionId}, clearing`)
+      this.terminals.delete(key)
+      this.log(`showExisting: terminal exited for ${key}, clearing`)
       return false
     }
 
     entry.terminal.show(preserveFocus)
     this.panelOpen = true
-    this.log(`showExisting: revealed terminal for session ${sessionId}`)
+    this.log(`showExisting: revealed terminal for ${key}`)
     return true
   }
 
-  activeSession(): string | undefined {
+  private activeKey(): string | undefined {
     const active = this.host.activeTerminal()
     if (!active) return undefined
-    for (const [id, entry] of this.terminals) {
-      if (entry.terminal === active && entry.terminal.exitStatus === undefined) return id
+    for (const [key, entry] of this.terminals) {
+      if (entry.terminal === active && entry.terminal.exitStatus === undefined) return key
     }
     return undefined
   }
 
   prepareContext(sessionId: string): boolean {
     if (this.showExisting(sessionId)) return true
-    const active = this.activeSession()
-    return !active || active === sessionId
+    const active = this.activeKey()
+    return !active || active === SessionTerminalManager.sessionKey(sessionId)
   }
 
   dispose(): void {
@@ -254,32 +282,40 @@ export class SessionTerminalManager {
     void this.host.setContext("kilo-code.agentTerminalFocus", managed)
   }
 
-  private showOrCreate(sessionId: string, cwd: string, name: string): void {
-    let entry = this.terminals.get(sessionId)
+  private showOrCreate(key: string, cwd: string, name: string): void {
+    let entry = this.terminals.get(key)
 
     // Clean up exited terminals
     if (entry && entry.terminal.exitStatus !== undefined) {
-      this.terminals.delete(sessionId)
+      this.terminals.delete(key)
       entry = undefined
     }
 
     // Recreate if CWD changed
     if (entry && entry.cwd !== cwd) {
       entry.terminal.dispose()
-      this.terminals.delete(sessionId)
+      this.terminals.delete(key)
       entry = undefined
-      this.log(`showTerminal: cwd changed for session ${sessionId}, recreating`)
+      this.log(`showTerminal: cwd changed for ${key}, recreating`)
     }
 
     if (!entry) {
       const terminal = this.host.createTerminal({ cwd, name })
       entry = { terminal, cwd }
-      this.terminals.set(sessionId, entry)
-      this.log(`showTerminal: created terminal for session ${sessionId} (cwd=${cwd})`)
+      this.terminals.set(key, entry)
+      this.log(`showTerminal: created terminal for ${key} (cwd=${cwd})`)
     }
 
     entry.terminal.show(false)
     this.panelOpen = true
     this.updateContextKey()
   }
+
+  private static sessionKey(id: string): string {
+    return `${SessionTerminalManager.SESSION_PREFIX}${id}`
+  }
+
+  private static worktreeKey(id: string): string {
+    return `${SessionTerminalManager.WORKTREE_PREFIX}${id}`
+  }
 }
diff --git a/packages/kilo-vscode/src/agent-manager/SetupScriptRunner.ts b/packages/kilo-vscode/src/agent-manager/SetupScriptRunner.ts
index 7aca15168c..6aa46ff789 100644
--- a/packages/kilo-vscode/src/agent-manager/SetupScriptRunner.ts
+++ b/packages/kilo-vscode/src/agent-manager/SetupScriptRunner.ts
@@ -52,6 +52,7 @@ export class SetupScriptRunner {
     private readonly log: (msg: string) => void,
     private readonly service: SetupScriptService,
     private readonly run: RunTask,
+    private readonly failed: (message: string) => void = () => undefined,
   ) {}
 
   /**
@@ -92,6 +93,7 @@ export class SetupScriptRunner {
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error)
       this.log(`Setup script execution failed: ${msg}`)
+      this.failed(msg)
       return true // Script was attempted
     }
   }
diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts
index cca28e5c3e..d924129626 100644
--- a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts
+++ b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts
@@ -12,6 +12,22 @@
 import * as path from "path"
 import * as fs from "fs"
 import { normalizePath } from "./git-import"
+import type { SidebarTarget } from "./project/route"
+
+/** Accept a persisted sidebar target only when its shape matches a known kind. */
+function validTarget(value: unknown): SidebarTarget | undefined {
+  if (!value || typeof value !== "object") return undefined
+  const target = value as Record<string, unknown>
+  if (typeof target.projectId !== "string") return undefined
+  if (target.kind === "local") return { projectId: target.projectId, kind: "local" }
+  if (target.kind === "worktree" && typeof target.worktreeId === "string") {
+    return { projectId: target.projectId, kind: "worktree", worktreeId: target.worktreeId }
+  }
+  if (target.kind === "session" && typeof target.sessionId === "string") {
+    return { projectId: target.projectId, kind: "session", sessionId: target.sessionId }
+  }
+  return undefined
+}
 
 export interface Worktree {
   id: string
@@ -79,6 +95,7 @@ interface StateFile {
   sidebarCollapsed?: boolean
   reviewDiffStyle?: "unified" | "split"
   defaultBaseBranch?: string
+  activeTarget?: SidebarTarget
 }
 
 export type StateLoadStatus = "loaded" | "missing" | "failed"
@@ -108,6 +125,7 @@ export class WorktreeStateManager {
   private sidebar = false
   private reviewDiffStyle: "unified" | "split" = "unified"
   private defaultBase: string | undefined
+  private activeTarget: SidebarTarget | undefined
   private readonly log: (msg: string) => void
   private saving: Promise<void> | undefined
   private dirty = false
@@ -385,6 +403,23 @@ export class WorktreeStateManager {
     void this.save()
   }
 
+  /** Last selected sidebar target (Local/worktree/session) for seamless restore. */
+  getActiveTarget(): SidebarTarget | undefined {
+    return this.activeTarget
+  }
+
+  setActiveTarget(target: SidebarTarget | undefined): void {
+    const cur = this.activeTarget
+    const same =
+      cur?.kind === target?.kind &&
+      cur?.projectId === target?.projectId &&
+      (cur?.kind !== "worktree" || target?.kind !== "worktree" || cur.worktreeId === target.worktreeId) &&
+      (cur?.kind !== "session" || target?.kind !== "session" || cur.sessionId === target.sessionId)
+    if (same) return
+    this.activeTarget = target
+    void this.save()
+  }
+
   // ---------------------------------------------------------------------------
   // Worktree order
   // ---------------------------------------------------------------------------
@@ -719,6 +754,7 @@ export class WorktreeStateManager {
       this.reviewDiffStyle = "split"
     }
     this.defaultBase = data.defaultBaseBranch
+    this.activeTarget = validTarget(data.activeTarget)
     this.log(`Loaded state: ${this.worktrees.size} worktrees, ${this.sessions.size} sessions`)
     if (pruned > 0 || repaired) {
       if (pruned > 0) this.log(`Pruned ${pruned} orphaned sessions`)
@@ -827,6 +863,9 @@ export class WorktreeStateManager {
     if (this.defaultBase) {
       data.defaultBaseBranch = this.defaultBase
     }
+    if (this.activeTarget) {
+      data.activeTarget = this.activeTarget
+    }
 
     const tmp = `${this.file}.${process.pid}.${Date.now()}.tmp`
     try {
diff --git a/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts b/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
index 045a108faf..92c6c1a661 100644
--- a/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
+++ b/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
@@ -39,6 +39,7 @@ vi.mock("../SessionTerminalManager", () => ({
   SessionTerminalManager: class {
     showTerminal() {}
     showLocalTerminal() {}
+    showWorktreeTerminal() {}
     syncLocalOnSessionSwitch() {}
     syncOnSessionSwitch() {
       return false
@@ -70,6 +71,7 @@ function createMockHost(): Host {
   return {
     openPanel: vi.fn(),
     workspacePath: () => "/repo",
+    isTrusted: () => true,
     autoBranchNaming: () => ({ enabled: true, prefix: "" }),
     showError: vi.fn(),
     openDocument: vi.fn().mockResolvedValue(undefined),
@@ -77,7 +79,10 @@ function createMockHost(): Host {
     openFolder: vi.fn(),
     createOutput: () => ({ appendLine: vi.fn(), dispose: vi.fn() }) as OutputHandle,
     extensionKeybindings: () => [],
+    copyToClipboard: vi.fn(),
     capture: vi.fn(),
+    openExternal: vi.fn(),
+    refreshGit: vi.fn(),
     dispose: vi.fn(),
   }
 }
@@ -101,6 +106,7 @@ function createHarness() {
     prBridge: { handleMessage: ReturnType<typeof vi.fn> }
     activeSessionId: string | undefined
     naming: { prompt: ReturnType<typeof vi.fn> }
+    scripts: { intercept: ReturnType<typeof vi.fn>; snapshot: ReturnType<typeof vi.fn> }
     terminalRouter: { handle: ReturnType<typeof vi.fn> }
     stateReady: Promise<void> | undefined
     contextTarget: ReturnType<typeof vi.fn>
@@ -124,6 +130,7 @@ function createHarness() {
   manager.prBridge = { handleMessage: vi.fn().mockReturnValue(false) }
   manager.activeSessionId = undefined
   manager.naming = { prompt: vi.fn() }
+  manager.scripts = { intercept: vi.fn().mockReturnValue(false), snapshot: vi.fn() }
   manager.terminalRouter = { handle: vi.fn().mockReturnValue(false) }
   manager.stateReady = Promise.resolve()
   manager.contextTarget = vi.fn()
@@ -216,6 +223,20 @@ describe("AgentManagerProvider worktree creation", () => {
     expect(manager.createWorktreeOnDisk).toHaveBeenCalledTimes(1)
   })
 
+  it("disposes orphaned terminals when a freshly mounted webview requests state", async () => {
+    const manager = createHarness()
+    const dispose = vi.fn().mockResolvedValue(undefined)
+    manager.terminalRouter = { handle: vi.fn().mockReturnValue(false), dispose } as unknown as {
+      handle: ReturnType<typeof vi.fn>
+    }
+    // Avoid the vscode-backed pushEmptyState; the disposal under test is synchronous.
+    ;(manager as unknown as Record<string, unknown>).pushEmptyState = vi.fn()
+
+    await manager.onMessage({ type: "agentManager.requestState" })
+
+    expect(dispose).toHaveBeenCalledTimes(1)
+  })
+
   it("routes file search through the active worktree session", async () => {
     const manager = createHarness()
     manager.activeSessionId = "session-wt"
diff --git a/packages/kilo-vscode/src/agent-manager/delete-worktree.ts b/packages/kilo-vscode/src/agent-manager/delete-worktree.ts
index ac144290fc..d007d2b208 100644
--- a/packages/kilo-vscode/src/agent-manager/delete-worktree.ts
+++ b/packages/kilo-vscode/src/agent-manager/delete-worktree.ts
@@ -5,16 +5,16 @@ import type { ManagedSession } from "./WorktreeStateManager"
  * Determine whether diff polling should stop when a worktree is being removed.
  *
  * Returns true when the worktree being deleted is currently the diff target
- * (either by directory path or because one of its orphaned sessions is the
- * active diff session).
+ * (either by directory path or because the diff context is the worktree
+ * itself or one of its orphaned sessions).
  */
 export function shouldStopDiffPolling(
   worktreePath: string,
   orphaned: ManagedSession[],
   diffTarget: { directory: string } | undefined,
-  diffSessionId: string | undefined,
+  diffCtx: string | undefined,
 ): boolean {
   if (diffTarget && normalizePath(diffTarget.directory) === normalizePath(worktreePath)) return true
-  if (diffSessionId && orphaned.some((s) => s.id === diffSessionId)) return true
+  if (diffCtx && orphaned.some((s) => s.worktreeId === diffCtx || s.id === diffCtx)) return true
   return false
 }
diff --git a/packages/kilo-vscode/src/agent-manager/diff-scope.ts b/packages/kilo-vscode/src/agent-manager/diff-scope.ts
new file mode 100644
index 0000000000..ff8a5a3bd6
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/diff-scope.ts
@@ -0,0 +1,66 @@
+/**
+ * Composite diff-source keying for Agent Manager.
+ *
+ * Agent Manager keys diff sources by *context* (a worktree id, or the `local`
+ * workspace pseudo-context) while the standalone Changes viewer keys by
+ * *scope* (branch / staged / unstaged / session). To expose scopes in Agent
+ * Manager we compose the two into a single id the SourceController can build.
+ * The context is the sidebar selection, so it stays stable when the user
+ * switches between session tabs of the same worktree; only the Session scope
+ * follows the active session, carried inside the id.
+ *
+ *   ctx   = "local" | "<worktreeId>"
+ *   scope = "branch" | "staged" | "unstaged" | "session"
+ *   id    = `${ctx}#${scope}`        (git scopes)
+ *   id    = `${ctx}#session:<sid>`   (session scope, sid = active session id)
+ *
+ * `ctx#branch` is the default and reproduces the pre-scope behavior exactly.
+ */
+
+export type DiffScope = "branch" | "staged" | "unstaged" | "session"
+
+export const DEFAULT_DIFF_SCOPE: DiffScope = "branch"
+
+const SEP = "#"
+const SESSION_TOKEN = "session:"
+
+export function composeDiffId(ctx: string, scope: DiffScope, sessionId?: string): string {
+  if (scope === "session" && sessionId) return `${ctx}${SEP}${SESSION_TOKEN}${sessionId}`
+  return `${ctx}${SEP}${scope}`
+}
+
+/**
+ * Split a composite id back into context and scope. Tolerates a bare context
+ * id (no separator) by assuming the default branch scope, which keeps the
+ * pre-scope messages working unchanged.
+ */
+export function parseDiffId(id: string): { ctx: string; scope: DiffScope; sessionId?: string } {
+  const idx = id.lastIndexOf(SEP)
+  if (idx === -1) return { ctx: id, scope: DEFAULT_DIFF_SCOPE }
+  const token = id.slice(idx + SEP.length)
+  const ctx = id.slice(0, idx)
+  if (token.startsWith(SESSION_TOKEN)) return { ctx, scope: "session", sessionId: token.slice(SESSION_TOKEN.length) }
+  if (isDiffScope(token)) return { ctx, scope: token }
+  return { ctx: id, scope: DEFAULT_DIFF_SCOPE }
+}
+
+export function isDiffScope(value: string): value is DiffScope {
+  return value === "branch" || value === "staged" || value === "unstaged" || value === "session"
+}
+
+export function normalizeScope(value: unknown): DiffScope {
+  return typeof value === "string" && isDiffScope(value) ? value : DEFAULT_DIFF_SCOPE
+}
+
+/**
+ * Map a scope to the underlying standalone-viewer source id the catalog knows
+ * how to build. `branch` maps to the workspace source; `session` needs the
+ * active session id embedded in the source id (the context id is a worktree
+ * or `local`, not a session).
+ */
+export function scopeToSourceId(scope: DiffScope, ctx: string, sessionId?: string): string {
+  if (scope === "staged") return "staged"
+  if (scope === "unstaged") return "unstaged"
+  if (scope === "session") return `session:${sessionId ?? ctx}`
+  return "workspace"
+}
diff --git a/packages/kilo-vscode/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts
index ed8b1f2f63..f8e8cee3a6 100644
--- a/packages/kilo-vscode/src/agent-manager/host.ts
+++ b/packages/kilo-vscode/src/agent-manager/host.ts
@@ -9,6 +9,7 @@
  */
 
 import type { Session } from "@kilocode/sdk/v2/client"
+import type { ProjectRef, SessionRef, WorktreeRef } from "./project/route"
 
 // ---------------------------------------------------------------------------
 // Primitives
@@ -36,6 +37,8 @@ export interface SessionProvider {
   clearSessionDirectory(id: string): void
   getSessionDirectories(): ReadonlyMap<string, string>
   getSessionInfo?(id: string): Promise<Session | undefined>
+  /** List root sessions (no parent) whose directory exactly matches `dir`. */
+  listSessions?(dir: string): Promise<Session[]>
   trackSession(id: string): void
   refreshSessions(): void
   registerSession(session: Session): void
@@ -49,6 +52,20 @@ export interface SessionProvider {
   abortSessions(ids: readonly string[]): Promise<void>
   showMemory(sessionID?: string): Promise<void>
   toggleMemory(sessionID?: string): Promise<void>
+  /** Register a project root with the shared route service. */
+  registerProjectRoute?(ref: ProjectRef, root: string, generation: number): void
+  /** Drop a project and all its session/worktree routes. */
+  unregisterProjectRoute?(projectId: string): void
+  /** Register a worktree directory under a project. */
+  registerWorktreeRoute?(ref: WorktreeRef, directory: string, generation: number): void
+  /** Register a session directory under a project (exact routing). */
+  registerSessionRoute?(ref: SessionRef, directory: string, generation: number): void
+  /** Drop one session route (keeps the raw ambiguity index consistent). */
+  unregisterSessionRoute?(ref: SessionRef): void
+  /** Whether a raw session id is known to be ambiguous across projects. */
+  isSessionRouteAmbiguous?(sessionId: string): boolean
+  /** Exact directory for a project-qualified session ref, or undefined. */
+  routeSessionDirectoryFor?(ref: SessionRef): string | undefined
   dispose(): void
 }
 
@@ -99,11 +116,36 @@ export interface Host {
   openPanel(opts: {
     onBeforeMessage: (msg: Record<string, unknown>) => Promise<Record<string, unknown> | null>
     worktreeDirectories?: () => string[]
+    /** Dynamic root directory for the panel's session provider (follows the active project). */
+    workspaceRoot?: () => string | undefined
+    projectId?: () => string | undefined
   }): PanelContext
 
   /** Get the workspace/project root path. */
   workspacePath(): string | undefined
 
+  /** Show a folder picker and return the selected path, or undefined when cancelled. */
+  pickFolder(): Promise<string | undefined>
+
+  /** Whether the experimental multi-project Agent Manager mode is enabled. */
+  multiProject(): boolean
+
+  /** Read the persisted additional-project registry payload. */
+  readProjects(): unknown
+
+  /** Persist the additional-project registry payload. */
+  writeProjects(value: unknown): Promise<void>
+
+  unregisterProjectRoutes(projectId: string): void
+
+  /** Subscribe to workspace folder changes (pinned project re-derivation). */
+  onDidChangeWorkspaceFolders(cb: () => void): Disposable
+
+  /** Subscribe to multi-project flag changes. */
+  onDidChangeMultiProject(cb: (enabled: boolean) => void): Disposable
+  /** Whether the workspace permits executing configured scripts. */
+  isTrusted(): boolean
+
   /** Read the user's automatic branch naming preferences. */
   autoBranchNaming(): { enabled: boolean; prefix: string }
 
diff --git a/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts
index 5675c31c85..cbbb1bffda 100644
--- a/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts
+++ b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts
@@ -89,6 +89,11 @@ export class PRStatusBridge {
   remove(worktreeId: string): void {
     this.cache.delete(worktreeId)
   }
+
+  reset(): void {
+    this.poller.stop()
+    this.cache.clear()
+  }
 }
 
 /** Build PRStatusPoller options that forward events through the bridge cache. */
diff --git a/packages/kilo-vscode/src/agent-manager/project/context.ts b/packages/kilo-vscode/src/agent-manager/project/context.ts
new file mode 100644
index 0000000000..8dcbb85672
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/context.ts
@@ -0,0 +1,230 @@
+/**
+ * ProjectContext — immutable repository scope for Agent Manager.
+ *
+ * A context owns the repository-bound services that used to be singletons on
+ * the provider: WorktreeStateManager, WorktreeManager, SetupScriptService,
+ * plus stale-worktree tracking. Services are created lazily on first access
+ * and never re-pointed at another root, so a context can never mix state
+ * between repositories.
+ *
+ * Lifecycle policy:
+ * - The pinned context is derived from the current VS Code workspace root and
+ *   always exists while a folder is open. It is implicit and never persisted.
+ * - Additional projects come from the ProjectRegistry. Their contexts are
+ *   created on demand (expand/select), never eagerly at panel open.
+ * - Only the active context gets full Git/PR polling; the pollers follow the
+ *   active context through the provider's accessors.
+ * - Non-pinned contexts require the multi-project flag and registry trust
+ *   before they can be expanded or activated. Trust is checked here, before
+ *   any state load that could write git metadata.
+ */
+
+import * as fs from "fs"
+import { WorktreeStateManager } from "../WorktreeStateManager"
+import { WorktreeManager } from "../WorktreeManager"
+import { SetupScriptService } from "../SetupScriptService"
+import type { GitOps } from "../GitOps"
+import type { ProjectSessionView } from "./session-view"
+
+export interface ProjectContextDeps {
+  log: (msg: string) => void
+  git?: GitOps
+  exists?: (dir: string) => boolean
+  /** Factory overrides for tests. */
+  state?: (root: string, log: (msg: string) => void) => WorktreeStateManager
+  worktrees?: (root: string, log: (msg: string) => void, git?: GitOps) => WorktreeManager
+  setup?: (root: string) => SetupScriptService
+}
+
+export type ProjectLifecycle = "cold" | "initializing" | "ready" | "suspended" | "disposing" | "disposed"
+
+export interface ProjectInitResult {
+  ok: boolean
+  refsFixed: number
+  current: boolean
+}
+
+export class ProjectContext {
+  private state: WorktreeStateManager | undefined
+  private worktrees: WorktreeManager | undefined
+  private setup: SetupScriptService | undefined
+  private init: Promise<ProjectInitResult> | undefined
+  private last: ProjectInitResult | undefined
+  private phase: ProjectLifecycle = "cold"
+  private version = 0
+  private mutation: Promise<unknown> = Promise.resolve()
+  private live = new Set<string>()
+  private listed = 0
+  private views: readonly ProjectSessionView[] = []
+  readonly stale = new Set<string>()
+
+  constructor(
+    readonly id: string,
+    readonly root: string,
+    readonly pinned: boolean,
+    private readonly deps: ProjectContextDeps,
+  ) {}
+
+  get lifecycle(): ProjectLifecycle {
+    return this.phase
+  }
+
+  get generation(): number {
+    return this.version
+  }
+
+  isCurrent(generation: number): boolean {
+    return this.version === generation && this.phase !== "disposing" && this.phase !== "disposed"
+  }
+
+  /** Initialize repository state exactly once per context lifetime. */
+  ensureReady(run: (generation: number) => Promise<Omit<ProjectInitResult, "current">>): Promise<ProjectInitResult> {
+    if (this.phase === "disposed" || this.phase === "disposing") {
+      return Promise.resolve({ ok: false, refsFixed: 0, current: false })
+    }
+    if (this.phase === "ready" && this.last) return Promise.resolve(this.last)
+    if (this.phase === "suspended" && this.last) {
+      this.phase = "ready"
+      return Promise.resolve(this.last)
+    }
+    if (this.init) return this.init
+    const generation = this.version
+    this.phase = "initializing"
+    this.init = run(generation)
+      .then((result) => {
+        const current = this.isCurrent(generation)
+        const next = { ...result, current }
+        if (current) {
+          this.last = next
+          this.phase = result.ok ? "ready" : "cold"
+        }
+        return next
+      })
+      .finally(() => {
+        this.init = undefined
+      })
+    return this.init
+  }
+
+  /** Invalidate asynchronous work while keeping loaded repository state reusable. */
+  suspend(): void {
+    if (this.phase === "disposed" || this.phase === "disposing") return
+    this.version++
+    this.phase = "suspended"
+  }
+
+  /** Serialize repository mutations and pin them to this context generation. */
+  run<T>(operation: (generation: number) => Promise<T>): Promise<T> {
+    const generation = this.version
+    const run = async () => {
+      if (!this.isCurrent(generation)) throw new Error(`Project ${this.id} is no longer available.`)
+      const result = await operation(generation)
+      if (!this.isCurrent(generation)) throw new Error(`Project ${this.id} changed while the operation was running.`)
+      return result
+    }
+    const next = this.mutation.then(run, run)
+    this.mutation = next.catch(() => undefined)
+    return next
+  }
+
+  stateManager(): WorktreeStateManager {
+    this.state ??= (this.deps.state ?? ((root, log) => new WorktreeStateManager(root, log)))(this.root, (msg) =>
+      this.deps.log(`[StateManager] ${msg}`),
+    )
+    return this.state
+  }
+
+  worktreeManager(): WorktreeManager {
+    this.worktrees ??= (this.deps.worktrees ?? ((root, log, git) => new WorktreeManager(root, log, git)))(
+      this.root,
+      (msg) => this.deps.log(`[WorktreeManager] ${msg}`),
+      this.deps.git,
+    )
+    return this.worktrees
+  }
+
+  setupService(): SetupScriptService {
+    this.setup ??= (this.deps.setup ?? ((root) => new SetupScriptService(root)))(this.root)
+    return this.setup
+  }
+
+  /** Whether repository-bound services have been created. */
+  get loaded(): boolean {
+    return this.state !== undefined
+  }
+
+  /** Accessors that never create services, preserving "created?" checks. */
+  peekState(): WorktreeStateManager | undefined {
+    return this.state
+  }
+
+  peekWorktrees(): WorktreeManager | undefined {
+    return this.worktrees
+  }
+
+  peekSetup(): SetupScriptService | undefined {
+    return this.setup
+  }
+
+  setLiveSessions(ids: Iterable<string>): void {
+    this.live = new Set(ids)
+  }
+
+  hasLiveSession(id: string): boolean {
+    return this.live.has(id)
+  }
+
+  /** Replace the cached sidebar session list and mark it freshly listed. */
+  setSessions(views: readonly ProjectSessionView[]): void {
+    this.views = views
+    this.live = new Set(views.map((view) => view.id))
+    this.listed = Date.now()
+  }
+
+  /** The last collected sidebar session list, for re-posting on fresh skips. */
+  sessions(): readonly ProjectSessionView[] {
+    return this.views
+  }
+
+  /** Force the next push to re-list from the backend. */
+  invalidateSessions(): void {
+    this.listed = 0
+  }
+
+  /** Insert or refresh one session in the cached list (creation, rename, fork). */
+  upsertSession(view: ProjectSessionView): void {
+    this.views = [view, ...this.views.filter((item) => item.id !== view.id)]
+    this.live.add(view.id)
+  }
+
+  /** Drop one session from the cached list (deletion, close). */
+  removeLiveSession(id: string): void {
+    this.views = this.views.filter((item) => item.id !== id)
+    this.live.delete(id)
+  }
+
+  /** Mark that the backend session list was just collected for this context. */
+  markSessionsListed(): void {
+    this.listed = Date.now()
+  }
+
+  /** Whether the last backend session listing is still fresh enough to reuse. */
+  sessionsListedFresh(ms: number): boolean {
+    return this.listed > 0 && Date.now() - this.listed < ms
+  }
+
+  missing(): boolean {
+    return !(this.deps.exists ?? fs.existsSync)(this.root)
+  }
+
+  async dispose(): Promise<void> {
+    if (this.phase === "disposed") return
+    this.version++
+    this.phase = "disposing"
+    await this.init?.catch((err) => this.deps.log(`dispose: initialization failed: ${err}`))
+    await this.mutation.catch((err) => this.deps.log(`dispose: mutation failed: ${err}`))
+    await this.state?.flush().catch((err) => this.deps.log(`dispose: state flush failed: ${err}`))
+    this.live.clear()
+    this.phase = "disposed"
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/contexts.ts b/packages/kilo-vscode/src/agent-manager/project/contexts.ts
new file mode 100644
index 0000000000..a5ed3f3445
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/contexts.ts
@@ -0,0 +1,266 @@
+/**
+ * ProjectContexts — coordinator owning all ProjectContext instances for one panel.
+ *
+ * Derives the pinned context from the current workspace root, creates registry
+ * project contexts on demand (expand/select), tracks which project is active
+ * and which are expanded, and serializes snapshots for the webview. See
+ * ./context.ts for the per-repository lifecycle policy.
+ */
+
+import * as fs from "fs"
+import * as path from "path"
+import { canonicalizePath, projectIdFor, samePath } from "./paths"
+import type { StoredProject } from "./registry"
+import { ProjectContext, type ProjectContextDeps } from "./context"
+
+/** Serializable project description for the webview. */
+export interface ProjectSnapshot {
+  id: string
+  root: string
+  label: string
+  pinned: boolean
+  active: boolean
+  expanded: boolean
+  initialized: boolean
+  trusted: boolean
+  missing: boolean
+}
+
+interface ContextsOptions {
+  /** Current VS Code workspace root; may change when workspace folders change. */
+  workspaceRoot: () => string | undefined
+  registry: {
+    list(): StoredProject[]
+    get(id: string): StoredProject | undefined
+  }
+  /** Registry trust lookup for non-pinned projects. */
+  trusted: (id: string) => boolean
+  /** Whether the multi-project experiment is enabled. */
+  enabled: () => boolean
+  remove?: (id: string) => void
+  deps: ProjectContextDeps
+}
+
+export class ProjectContexts {
+  private readonly contexts = new Map<string, ProjectContext>()
+  private activeId: string | undefined
+  private readonly expanded = new Set<string>()
+
+  constructor(private readonly opts: ContextsOptions) {}
+
+  /** The pinned workspace project, derived lazily from the current workspace root. */
+  pinned(): ProjectContext | undefined {
+    const root = this.opts.workspaceRoot()
+    if (!root) return undefined
+    const canonical = canonicalizePath(root)
+    return this.ensure(projectIdFor(canonical), canonical, true)
+  }
+
+  private ensure(id: string, root: string, pinned: boolean): ProjectContext {
+    let ctx = this.contexts.get(id)
+    if (!ctx) {
+      ctx = new ProjectContext(id, root, pinned, this.opts.deps)
+      this.contexts.set(id, ctx)
+    }
+    return ctx
+  }
+
+  /** Resolve any known project id to a context, creating it on demand. */
+  private resolveCtx(id: string): ProjectContext | undefined {
+    const existing = this.contexts.get(id)
+    if (existing) return existing
+    const pinned = this.pinned()
+    if (pinned?.id === id) return pinned
+    if (!this.opts.enabled()) return undefined
+    const stored = this.opts.registry.get(id)
+    if (!stored) return undefined
+    return this.ensure(stored.id, stored.root, false)
+  }
+
+  /** The active context. Defaults to the pinned project, or the first trusted registry project without a workspace. */
+  active(): ProjectContext | undefined {
+    if (this.activeId) return this.contexts.get(this.activeId)
+    const pinned = this.pinned()
+    if (pinned) {
+      this.activeId = pinned.id
+      this.expanded.add(pinned.id)
+      return pinned
+    }
+    if (!this.opts.enabled()) return undefined
+    const first = this.opts.registry.list().find((p) => this.opts.trusted(p.id))
+    if (!first) return undefined
+    const ctx = this.ensure(first.id, first.root, false)
+    this.activeId = ctx.id
+    this.expanded.add(ctx.id)
+    return ctx
+  }
+
+  get(id: string): ProjectContext | undefined {
+    return this.contexts.get(id)
+  }
+
+  /** The context that owns a directory: its root or one of its worktree paths. */
+  byDirectory(dir: string): ProjectContext | undefined {
+    for (const ctx of this.contexts.values()) {
+      if (samePath(ctx.root, dir)) return ctx
+      const state = ctx.peekState()
+      if (state?.getWorktrees().some((wt) => wt.path && samePath(wt.path, dir))) return ctx
+    }
+    return undefined
+  }
+
+  /** The context whose state owns the worktree id. */
+  byWorktree(id: string): ProjectContext | undefined {
+    for (const ctx of this.contexts.values()) {
+      if (ctx.peekState()?.getWorktree(id)) return ctx
+    }
+    return undefined
+  }
+
+  /** The context whose live session list contains the session. */
+  byLiveSession(id: string): ProjectContext | undefined {
+    for (const ctx of this.contexts.values()) {
+      if (ctx.hasLiveSession(id)) return ctx
+    }
+    return undefined
+  }
+
+  /** Resolve any known project id to a context without activating it. */
+  resolve(id: string): ProjectContext | undefined {
+    return this.resolveCtx(id)
+  }
+
+  /** Whether a project may be shown or initialized: known, flag-gated, and trusted. */
+  usable(id: string): ProjectContext | undefined {
+    return this.usableCtx(id)
+  }
+
+  isActive(id: string): boolean {
+    return this.active()?.id === id
+  }
+
+  isExpanded(id: string): boolean {
+    return this.expanded.has(id)
+  }
+
+  /** Make a project the active context and expand it. Returns undefined when not allowed. */
+  activate(id: string): ProjectContext | undefined {
+    const ctx = this.usableCtx(id)
+    if (!ctx) return undefined
+    this.activeId = id
+    return ctx
+  }
+
+  /** Expand a project without activating it. Returns undefined when not allowed. */
+  expand(id: string): ProjectContext | undefined {
+    const ctx = this.usableCtx(id)
+    if (!ctx) return undefined
+    this.expanded.add(id)
+    return ctx
+  }
+
+  collapse(id: string): void {
+    this.expanded.delete(id)
+    if (this.isActive(id)) return
+    this.contexts.get(id)?.suspend()
+  }
+
+  /** Return ownership to pinned Local and suspend all secondary contexts. */
+  disable(): ProjectContext | undefined {
+    const pinned = this.pinned()
+    this.activeId = pinned?.id
+    if (pinned) this.expanded.add(pinned.id)
+    for (const ctx of this.contexts.values()) {
+      if (ctx.pinned) continue
+      this.expanded.delete(ctx.id)
+      ctx.suspend()
+      // Match remove()/syncPinned(): drop the routes too, otherwise the shared
+      // route service accumulates entries for every disabled project.
+      this.opts.remove?.(ctx.id)
+    }
+    return pinned
+  }
+
+  private usableCtx(id: string): ProjectContext | undefined {
+    const ctx = this.resolveCtx(id)
+    if (!ctx) return undefined
+    if (ctx.pinned) return ctx
+    if (!this.opts.enabled()) return undefined
+    if (!this.opts.trusted(id)) return undefined
+    return ctx
+  }
+
+  /** Remove a non-pinned project context. Falls back to the pinned project when it was active. */
+  async remove(id: string): Promise<boolean> {
+    const ctx = this.contexts.get(id)
+    if (!ctx || ctx.pinned) return false
+    this.expanded.delete(id)
+    if (this.activeId === id) this.activeId = undefined
+    this.contexts.delete(id)
+    this.opts.remove?.(id)
+    await ctx.dispose()
+    return true
+  }
+
+  /**
+   * Re-derive the pinned project after workspace folder changes. Disposes the
+   * old pinned context so cached services can never mix two roots. Returns
+   * true when the active context may have changed.
+   */
+  syncPinned(): boolean {
+    const root = this.opts.workspaceRoot()
+    const next = root ? projectIdFor(canonicalizePath(root)) : undefined
+    const current = [...this.contexts.values()].find((ctx) => ctx.pinned)?.id
+    if (current === next) return false
+    for (const [id, ctx] of [...this.contexts]) {
+      if (!ctx.pinned) continue
+      this.contexts.delete(id)
+      this.expanded.delete(id)
+      if (this.activeId === id) this.activeId = undefined
+      this.opts.remove?.(id)
+      ctx.suspend()
+      void ctx.dispose()
+    }
+    return true
+  }
+
+  /** Serializable snapshots for the webview: pinned first, then registry order. */
+  snapshots(): ProjectSnapshot[] {
+    const out: ProjectSnapshot[] = []
+    const pinned = this.pinned()
+    if (pinned) out.push(this.snapshot(pinned, undefined))
+    if (!this.opts.enabled()) return out
+    for (const stored of this.opts.registry.list()) {
+      if (pinned?.id === stored.id) continue
+      out.push(this.snapshot(this.contexts.get(stored.id), stored))
+    }
+    return out
+  }
+
+  private snapshot(ctx: ProjectContext | undefined, stored: StoredProject | undefined): ProjectSnapshot {
+    const id = ctx?.id ?? stored!.id
+    const root = ctx?.root ?? stored!.root
+    const pinned = ctx?.pinned ?? false
+    return {
+      id,
+      root,
+      label: stored?.label || path.basename(root) || root,
+      pinned,
+      active: this.isActive(id),
+      expanded: this.isExpanded(id),
+      initialized: ctx?.loaded ?? false,
+      trusted: pinned || (stored?.trusted ?? false),
+      missing: ctx ? ctx.missing() : !(this.opts.deps.exists ?? fs.existsSync)(root),
+    }
+  }
+
+  async dispose(): Promise<void> {
+    for (const ctx of this.contexts.values()) {
+      this.opts.remove?.(ctx.id)
+      await ctx.dispose()
+    }
+    this.contexts.clear()
+    this.expanded.clear()
+    this.activeId = undefined
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/init.ts b/packages/kilo-vscode/src/agent-manager/project/init.ts
new file mode 100644
index 0000000000..fc428c3a85
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/init.ts
@@ -0,0 +1,237 @@
+/**
+ * Repository-local state initialization for one Agent Manager project context.
+ *
+ * Extracted from AgentManagerProvider so the same sequence runs for the
+ * active project (full panel wiring follows) and for expanded background
+ * projects (state push only). Ordering matters: the git exclude update must
+ * land before the persisted state file is read.
+ */
+
+import { restoreWorktrees } from "../state-recovery"
+import type { ProjectContext, ProjectInitResult } from "./context"
+import type { Session } from "@kilocode/sdk/v2/client"
+import type { ProjectRef, SessionRef, WorktreeRef } from "./route"
+import { sessionToWebview } from "../../kilo-provider-utils"
+
+export type { ProjectSessionView } from "./session-view"
+import type { ProjectSessionView } from "./session-view"
+
+/**
+ * Subset of {@link SessionProvider} needed to discover and register live
+ * project sessions by directory. Kept narrow so project-init stays testable
+ * without importing the full provider. Route registration methods are
+ * optional so tests and non-Agent-Manager callers can omit them.
+ */
+export interface ProjectSessionListing {
+  listSessions?(dir: string): Promise<Session[]>
+  setSessionDirectory(id: string, directory: string): void
+  /** Register a project root with the shared route service. */
+  registerProjectRoute?(ref: ProjectRef, root: string, generation: number): void
+  /** Drop a project and all its session/worktree routes. */
+  unregisterProjectRoute?(projectId: string): void
+  /** Register a worktree directory under a project. */
+  registerWorktreeRoute?(ref: WorktreeRef, directory: string, generation: number): void
+  /** Register a session directory under a project (exact routing). */
+  registerSessionRoute?(ref: SessionRef, directory: string, generation: number): void
+  /** Drop one session route (keeps the raw ambiguity index consistent). */
+  unregisterSessionRoute?(ref: SessionRef): void
+}
+
+/**
+ * Register the project root, every worktree directory, and every persisted
+ * managed session with the shared route service. Registered routes let the
+ * KiloProvider resolve project-qualified session refs to exact directories
+ * and detect ambiguous raw session ids across projects. Safe to call when the
+ * listing has no route methods: registration is simply skipped.
+ */
+function registerProjectRoutes(ctx: ProjectContext, sessions: ProjectSessionListing | undefined): void {
+  if (!sessions) return
+  const state = ctx.peekState()
+  sessions.registerProjectRoute?.({ projectId: ctx.id }, ctx.root, ctx.generation)
+  if (state) {
+    for (const wt of state.getWorktrees()) {
+      if (!wt.path) continue
+      sessions.registerWorktreeRoute?.({ projectId: ctx.id, worktreeId: wt.id }, wt.path, ctx.generation)
+    }
+  }
+}
+
+/** Drop all routes for a project (e.g. when it is removed or disposed). */
+export function unregisterProjectRoutes(ctx: ProjectContext, sessions: ProjectSessionListing | undefined): void {
+  if (!sessions) return
+  sessions.unregisterProjectRoute?.(ctx.id)
+}
+
+export async function initContextState(
+  ctx: ProjectContext,
+  log: (...args: unknown[]) => void,
+): Promise<ProjectInitResult> {
+  return ctx.ensureReady(async (generation) => {
+    const manager = ctx.worktreeManager()
+    const state = ctx.stateManager()
+    await manager.ensureGitExclude().catch((err) => log("Failed to update git exclude:", err))
+    if (!ctx.isCurrent(generation)) return { ok: false, refsFixed: 0 }
+    const loaded = await state.load()
+    if (!ctx.isCurrent(generation)) return { ok: false, refsFixed: 0 }
+    manager.cleanupOrphanedTempDirs()
+
+    if (loaded.status === "failed" && !(await state.prepareRecovery())) {
+      return { ok: false, refsFixed: 0 }
+    }
+    if (!ctx.isCurrent(generation)) return { ok: false, refsFixed: 0 }
+
+    const infos = await manager.discoverWorktrees().catch((err) => {
+      log("Failed to discover worktrees during state recovery:", err)
+      return []
+    })
+    if (!ctx.isCurrent(generation)) return { ok: false, refsFixed: 0 }
+    if (infos.length > 0) {
+      const result = restoreWorktrees(state, infos)
+      if (result.worktrees > 0 || result.sessions > 0) {
+        log(`Recovered ${result.worktrees} worktree(s) and ${result.sessions} session(s) from disk`)
+        await state.flush()
+      }
+    }
+    return { ok: true, refsFixed: loaded.refsFixed }
+  })
+}
+
+/** Register explicit Local/worktree routes for every persisted project session. */
+export function registerProjectSessions(
+  ctx: ProjectContext,
+  sessions:
+    | ({
+        setSessionDirectory(id: string, directory: string): void
+        trackSession(id: string): void
+      } & Partial<ProjectSessionListing>)
+    | undefined,
+): void {
+  const state = ctx.peekState()
+  if (!state || !sessions) return
+  registerProjectRoutes(ctx, sessions)
+  for (const session of state.getSessions()) {
+    const worktree = session.worktreeId ? state.getWorktree(session.worktreeId) : undefined
+    const dir = worktree?.path ?? ctx.root
+    sessions.setSessionDirectory(session.id, dir)
+    sessions.trackSession(session.id)
+    sessions.registerSessionRoute?.({ projectId: ctx.id, sessionId: session.id }, dir, ctx.generation)
+  }
+}
+
+/**
+ * Directories whose root sessions belong to this project: exactly {@link ProjectContext.root}
+ * plus the paths of every worktree tracked by this context's state. No active
+ * workspace root is ever mixed in, so sessions from unrelated projects cannot
+ * leak into the listing.
+ */
+export function projectDirectories(ctx: ProjectContext): string[] {
+  const state = ctx.peekState()
+  const dirs = new Set<string>([ctx.root])
+  if (state) for (const wt of state.getWorktrees()) if (wt.path) dirs.add(wt.path)
+  return [...dirs]
+}
+
+/**
+ * Collect live root sessions for this project by listing exactly {@link ProjectContext.root}
+ * and each of its worktree directories through the SessionProvider. Each
+ * returned session is registered with the directory it was listed from before
+ * being included, so downstream backend requests route to the correct
+ * directory-scoped Instance. Managed placement is preserved separately by
+ * {@link registerProjectSessions}, which runs first and pins persisted managed
+ * sessions to their worktree paths; re-registering a managed session here with
+ * the same worktree path is a no-op.
+ *
+ * A failed directory listing (e.g. backend not connected, missing worktree)
+ * resolves to [] and never erases results from the other directories, so one
+ * failure cannot blank the whole project.
+ */
+export async function collectProjectSessions(
+  ctx: ProjectContext,
+  sessions: ProjectSessionListing | undefined,
+): Promise<ProjectSessionView[]> {
+  if (!sessions?.listSessions) {
+    ctx.setLiveSessions([])
+    return []
+  }
+  const generation = ctx.generation
+  const list = sessions.listSessions
+  const state = ctx.peekState()
+  // Register the project root and worktree directories before listing so the
+  // route service can disambiguate sessions discovered in this project even
+  // when a raw session id collides with one in another project.
+  registerProjectRoutes(ctx, sessions)
+  const dirs = [
+    { dir: ctx.root, worktreeId: null },
+    ...(state
+      ?.getWorktrees()
+      .filter((wt) => !!wt.path)
+      .map((wt) => ({ dir: wt.path, worktreeId: wt.id })) ?? []),
+  ].filter((entry, index, all) => all.findIndex((item) => item.dir === entry.dir) === index)
+  const byDir = await Promise.all(
+    dirs.map(async (entry) => {
+      const items = await list(entry.dir).catch((err) => {
+        console.warn(`[Kilo New] Agent Manager: listing sessions for ${entry.dir} failed:`, err)
+        return [] as Session[]
+      })
+      return { ...entry, items }
+    }),
+  )
+  if (ctx.lifecycle === "disposed" || ctx.lifecycle === "disposing") return []
+  if (!ctx.isCurrent(generation)) return []
+  const seen = new Set<string>()
+  const out: ProjectSessionView[] = []
+  for (const { dir, worktreeId, items } of byDir) {
+    for (const s of items) {
+      if (seen.has(s.id)) continue
+      seen.add(s.id)
+      sessions.setSessionDirectory(s.id, dir)
+      // Register an exact route for every live session. Re-registering a
+      // managed session (already routed by registerProjectSessions) with the
+      // same directory is a no-op; a different directory would mean the
+      // session moved worktrees, and the latest registration wins.
+      sessions.registerSessionRoute?.({ projectId: ctx.id, sessionId: s.id }, dir, generation)
+      if (worktreeId) {
+        sessions.registerWorktreeRoute?.({ projectId: ctx.id, worktreeId }, dir, generation)
+      }
+      out.push({ ...sessionToWebview(s), worktreeId })
+    }
+  }
+  return out
+}
+
+export async function pushProjectSessions(
+  ctx: ProjectContext,
+  sessions: ProjectSessionListing | undefined,
+  post: (message: { type: "agentManager.projectSessions"; projectId: string; sessions: ProjectSessionView[] }) => void,
+): Promise<void> {
+  const gone = () => ctx.lifecycle === "disposed" || ctx.lifecycle === "disposing"
+  if (gone()) return
+  // Skip the backend round trips when the listing is still fresh, but always
+  // re-post the cached list: the webview may have mounted after the last push
+  // and has no other way to learn this project's sessions.
+  if (ctx.sessionsListedFresh(2000)) {
+    post({ type: "agentManager.projectSessions", projectId: ctx.id, sessions: [...ctx.sessions()] })
+    return
+  }
+  const views = await collectProjectSessions(ctx, sessions)
+  if (gone()) return
+  ctx.setSessions(views)
+  post({ type: "agentManager.projectSessions", projectId: ctx.id, sessions: [...views] })
+}
+
+/**
+ * Fast reactivation of an already-initialized context: re-register routes and
+ * push in-memory state without re-running the full initialization sequence
+ * (state load, worktree discovery, session listing, prompt recovery). Returns
+ * false when the context is not ready and the caller must run the full init.
+ */
+export function reactivateProject(
+  ctx: ProjectContext,
+  sessions: Parameters<typeof registerProjectSessions>[1],
+  pushState: (ctx: ProjectContext) => void,
+): boolean {
+  if (ctx.lifecycle !== "ready" || !ctx.peekState()) return false
+  registerProjectSessions(ctx, sessions)
+  pushState(ctx)
+  return true
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/messages.ts b/packages/kilo-vscode/src/agent-manager/project/messages.ts
new file mode 100644
index 0000000000..9bf8c542f8
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/messages.ts
@@ -0,0 +1,204 @@
+/**
+ * Project message handlers for the Agent Manager multi-project protocol.
+ *
+ * Extracted from AgentManagerProvider (file-size cap) and kept free of VS Code
+ * imports so the flows are unit-testable. All handlers fail closed: unknown
+ * projects, untrusted projects, and disabled experiments leave state untouched.
+ */
+
+import simpleGit from "simple-git"
+import type { AgentManagerInMessage } from "../types"
+import type { ProjectRegistry } from "./registry"
+import type { ProjectContext, ProjectInitResult } from "./context"
+import type { ProjectContexts } from "./contexts"
+import { projectIdFor, resolveProjectRoot, samePath } from "./paths"
+import type { SidebarTarget } from "./route"
+
+export interface ProjectMessageDeps {
+  registry: ProjectRegistry
+  contexts: ProjectContexts
+  /** Whether the multi-project experiment is enabled. */
+  enabled: () => boolean
+  /** Show a folder picker; resolves undefined when cancelled. */
+  pickFolder: () => Promise<string | undefined>
+  /** Re-initialize provider state for a freshly activated context. */
+  activate: (ctx: ProjectContext) => void
+  /** Initialize an expanded background context and push its state. */
+  expand: (ctx: ProjectContext) => void
+  /** Push the current project snapshots to the webview. */
+  push: () => void
+  /** Acknowledge an atomically validated sidebar selection. */
+  selected: (target: SidebarTarget) => void
+  /** Show a user-facing error. */
+  error: (message: string) => void
+  /** Ensure a context's repository state is ready (no-op once initialized). */
+  ready: (ctx: ProjectContext) => Promise<ProjectInitResult>
+  log: (...args: unknown[]) => void
+}
+
+/** Handle a project-management message. Returns true when the message was consumed. */
+export async function handleProjectMessage(m: AgentManagerInMessage, deps: ProjectMessageDeps): Promise<boolean> {
+  if (m.type === "agentManager.requestProjects") {
+    deps.push()
+    return true
+  }
+  if (m.type === "agentManager.addProject") {
+    await addProject(deps)
+    return true
+  }
+  if (m.type === "agentManager.removeProject") {
+    await removeProject(m.projectId, deps)
+    return true
+  }
+  if (m.type === "agentManager.selectProject") {
+    selectProject(m.projectId, deps)
+    return true
+  }
+  if (m.type === "agentManager.activateSelection") {
+    await activateSelection(m.target, deps, m.restore === true)
+    return true
+  }
+  if (m.type === "agentManager.rememberTarget") {
+    rememberTarget(m.projectId, m.target, deps)
+    return true
+  }
+  if (m.type === "agentManager.setProjectExpanded") {
+    await setExpanded(m.projectId, m.expanded, deps)
+    return true
+  }
+  if (m.type === "agentManager.trustProject") {
+    await trustProject(m.projectId, deps)
+    return true
+  }
+  return false
+}
+
+async function activateSelection(requested: SidebarTarget, deps: ProjectMessageDeps, restore = false): Promise<void> {
+  if (disabled(deps)) return
+  const ctx = deps.contexts.resolve(requested.projectId)
+  if (!ctx || !deps.contexts.usable(requested.projectId)) {
+    deps.error("The project is unavailable. Trust it first or check that the repository still exists.")
+    return
+  }
+  const result = await deps.ready(ctx)
+  if (!result.current || !result.ok) {
+    deps.error("The project is not ready yet. Expand it before selecting a worktree or session.")
+    deps.push()
+    return
+  }
+  const state = ctx.peekState()
+  // Restoring a project returns the user to their persisted target for it.
+  const persisted = restore ? state?.getActiveTarget() : undefined
+  const target = persisted?.projectId === requested.projectId ? persisted : requested
+  // A missing target is not actionable: the user clicked a sidebar row the
+  // extension itself offered, or the persisted restore target went stale.
+  // Fall back to the project's local context instead of an error toast.
+  if (target.kind === "worktree" && !state?.getWorktree(target.worktreeId)) {
+    deps.log(`selection target worktree ${target.worktreeId} is gone, falling back to local`)
+    return finish({ projectId: target.projectId, kind: "local" }, deps)
+  }
+  if (target.kind === "session" && !state?.getSession(target.sessionId) && !ctx.hasLiveSession(target.sessionId)) {
+    deps.log(`selection target session ${target.sessionId} is gone, falling back to local`)
+    return finish({ projectId: target.projectId, kind: "local" }, deps)
+  }
+  finish(target, deps)
+}
+
+/** Commit the active project, persist the target, and acknowledge the selection. */
+function finish(target: SidebarTarget, deps: ProjectMessageDeps): void {
+  const previous = deps.contexts.active()?.id
+  const activated = deps.contexts.activate(target.projectId)
+  if (!activated) {
+    deps.error("The project is unavailable. Trust it first or check that the repository still exists.")
+    return
+  }
+  activated.peekState()?.setActiveTarget(target)
+  if (previous !== activated.id) deps.activate(activated)
+  deps.push()
+  deps.selected(target)
+}
+
+/** Persist the webview's current selection without activating or validating anything. */
+function rememberTarget(projectId: string, target: SidebarTarget, deps: ProjectMessageDeps): void {
+  if (target.projectId !== projectId) return
+  const state = deps.contexts.get(projectId)?.peekState()
+  if (!state) return
+  // Never persist a target the project does not have: the webview can race a
+  // project switch and still hold the previous project's selection.
+  if (target.kind === "worktree" && !state.getWorktree(target.worktreeId)) return
+  if (target.kind === "session" && !state.getSession(target.sessionId)) return
+  state.setActiveTarget(target)
+}
+
+function disabled(deps: ProjectMessageDeps): boolean {
+  if (deps.enabled()) return false
+  deps.error("Multi-project Agent Manager is disabled. Enable it in Kilo Settings > Experimental to add projects.")
+  return true
+}
+
+async function addProject(deps: ProjectMessageDeps): Promise<void> {
+  if (disabled(deps)) return
+  const dir = await deps.pickFolder()
+  if (!dir) return
+  // resolveProjectRoot (not resolveGitRoot) so a folder inside a linked worktree
+  // registers the primary checkout and cannot duplicate an existing project.
+  const root = await resolveProjectRoot(dir, (cwd, args) => simpleGit(cwd).raw(args))
+  if (!root) {
+    deps.error("The selected folder is not inside a Git repository.")
+    return
+  }
+  const pinned = deps.contexts.pinned()
+  if (pinned && samePath(pinned.root, root)) {
+    deps.error("That repository is already the workspace project.")
+    return
+  }
+  const id = projectIdFor(root)
+  if (deps.registry.get(id)) {
+    deps.error("That repository is already registered as a project.")
+    return
+  }
+  try {
+    await deps.registry.add({ id, root })
+  } catch (err) {
+    deps.log("addProject: registry write failed:", err)
+    deps.error("Failed to save the project. See the Agent Manager output for details.")
+    return
+  }
+  deps.log(`addProject: registered ${root}`)
+  deps.push()
+}
+
+async function removeProject(id: string, deps: ProjectMessageDeps): Promise<void> {
+  if (disabled(deps)) return
+  await deps.contexts.remove(id)
+  await deps.registry.remove(id)
+  deps.push()
+}
+
+function selectProject(id: string, deps: ProjectMessageDeps): void {
+  if (disabled(deps)) return
+  const ctx = deps.contexts.activate(id)
+  if (!ctx) {
+    deps.error("The project is unavailable. Trust it first or check that the repository still exists.")
+    deps.push()
+    return
+  }
+  deps.activate(ctx)
+  deps.push()
+}
+
+async function setExpanded(id: string, expanded: boolean, deps: ProjectMessageDeps): Promise<void> {
+  if (disabled(deps)) return
+  if (expanded) {
+    const ctx = deps.contexts.expand(id)
+    if (ctx) deps.expand(ctx)
+  }
+  if (!expanded) deps.contexts.collapse(id)
+  deps.push()
+}
+
+async function trustProject(id: string, deps: ProjectMessageDeps): Promise<void> {
+  if (disabled(deps)) return
+  await deps.registry.setTrusted(id, true)
+  deps.push()
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/paths.ts b/packages/kilo-vscode/src/agent-manager/project/paths.ts
new file mode 100644
index 0000000000..708a112212
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/paths.ts
@@ -0,0 +1,80 @@
+/**
+ * Project path canonicalization for the Agent Manager project registry.
+ *
+ * Project identity is anchored to the canonical Git top-level path so that
+ * symlink aliases (e.g. /tmp -> /private/tmp) and case variants cannot
+ * register the same repository twice or route sessions to the wrong project.
+ */
+
+import * as fs from "fs"
+import * as path from "path"
+import { createHash } from "crypto"
+import { normalizePath } from "../git-import"
+
+/** Resolve symlinks and normalize separators. Falls back to lexical resolution when the path does not exist. */
+export function canonicalizePath(dir: string): string {
+  const resolved = path.resolve(dir)
+  try {
+    return normalizePath(fs.realpathSync.native(resolved))
+  } catch {
+    return normalizePath(resolved)
+  }
+}
+
+/** Compare two canonical paths. Case-insensitive filesystems compare folded. */
+export function samePath(a: string, b: string, platform: NodeJS.Platform = process.platform): boolean {
+  if (platform === "darwin" || platform === "win32") return a.toLowerCase() === b.toLowerCase()
+  return a === b
+}
+
+/**
+ * Resolve the branch for the tracked worktree whose canonical path matches `dir`.
+ *
+ * `git worktree list --porcelain` realpath-resolves worktree registration, so
+ * tracked keys are canonical. The probe path is canonicalized the same way via
+ * `canonicalizePath` and compared with `samePath`, so symlink aliases such as
+ * /tmp -> /private/tmp and case variants on darwin/win32 cannot mark a real
+ * worktree missing. Tracked keys that no longer exist fall back to lexical
+ * normalization, preserving missing-path handling. Returns undefined when no
+ * tracked entry matches.
+ */
+export function findTrackedBranch(
+  tracked: Map<string, string>,
+  dir: string,
+  platform: NodeJS.Platform = process.platform,
+): string | undefined {
+  const canonical = canonicalizePath(dir)
+  for (const [key, branch] of tracked) {
+    if (samePath(canonicalizePath(key), canonical, platform)) return branch
+  }
+  return undefined
+}
+
+/** Deterministic project id derived from the canonical root. Stable across restarts and panel recreations. */
+export function projectIdFor(root: string): string {
+  return `prj-${createHash("sha1").update(root).digest("hex").slice(0, 12)}`
+}
+
+/** Resolve linked worktrees to the primary checkout so project-local state is shared by the repository. */
+export async function resolveProjectRoot(
+  dir: string,
+  git: (cwd: string, args: string[]) => Promise<string>,
+): Promise<string | undefined> {
+  const run = (args: string[]) =>
+    Promise.resolve()
+      .then(() => git(dir, args))
+      .catch(() => undefined)
+  const revparse = (args: string[]) => run(["rev-parse", ...args])
+  const top = await revparse(["--path-format=absolute", "--show-toplevel"])
+  if (!top) return undefined
+  const root = canonicalizePath(top.trim())
+  const [gitdir, common] = await Promise.all([
+    revparse(["--path-format=absolute", "--git-dir"]),
+    revparse(["--path-format=absolute", "--git-common-dir"]),
+  ])
+  if (!gitdir || !common) return root
+  if (samePath(canonicalizePath(gitdir.trim()), canonicalizePath(common.trim()))) return root
+  const listing = await run(["worktree", "list", "--porcelain", "-z"])
+  const first = listing?.split("\0").find((field) => field.startsWith("worktree "))
+  return first ? canonicalizePath(first.slice("worktree ".length)) : root
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/pollers.ts b/packages/kilo-vscode/src/agent-manager/project/pollers.ts
new file mode 100644
index 0000000000..04bc8f023b
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/pollers.ts
@@ -0,0 +1,179 @@
+/**
+ * Per-project stats/PR pollers for expanded background projects, plus the
+ * factory for the provider's poller trio (extracted from AgentManagerProvider
+ * for its file-size cap).
+ *
+ * The active project is served by the singleton `stats`/`pr` pollers (their
+ * getters follow the active context). `ProjectPollers` creates one poller pair
+ * per expanded non-active project so every visible project accordion receives
+ * live worktree stats, local stats, and PR statuses, each tagged with the
+ * owning projectId. VS Code-free and unit-testable: the poller pair factory is
+ * injectable.
+ */
+
+import type { GitOps } from "../GitOps"
+import { GitStatsPoller, type LocalStats, type WorktreePresenceResult, type WorktreeStats } from "../GitStatsPoller"
+import { diffSummary } from "../local-diff"
+import { PRStatusBridge } from "../pr-status-bridge"
+import type { PRStatus } from "../types"
+import type { ProjectContext } from "./context"
+import type { ProjectContexts } from "./contexts"
+import type { Semaphore } from "../semaphore"
+import type { AgentManagerOutMessage, WorktreeDiffEntry } from "../types"
+import type { WorktreeStateManager } from "../WorktreeStateManager"
+
+export interface PollerPair {
+  stats: { setEnabled(enabled: boolean): void; setVisible(visible: boolean): void; stop(): void }
+  pr: { poller: { setEnabled(enabled: boolean): void; setVisible(visible: boolean): void; stop(): void } }
+}
+
+export type StatsOutMessage =
+  | { type: "agentManager.worktreeStats"; projectId?: string; stats: WorktreeStats[] }
+  | { type: "agentManager.localStats"; projectId?: string; stats: LocalStats }
+  | { type: "agentManager.prStatus"; projectId?: string; worktreeId: string; pr: PRStatus | null }
+
+type StatsMessage = Extract<AgentManagerOutMessage, { type: "agentManager.worktreeStats" | "agentManager.localStats" }>
+
+interface PollerDeps {
+  git: GitOps
+  semaphore: Semaphore
+  localDiff: (dir: string, base: string) => Promise<WorktreeDiffEntry[]>
+  post: (msg: StatsOutMessage) => void
+  openExternal: (url: string) => void
+  visible: () => boolean
+  log: (...args: unknown[]) => void
+}
+
+/** Create the real poller pair for one project context. */
+function createPollerPair(ctx: ProjectContext, deps: PollerDeps): PollerPair {
+  const state = () => ctx.peekState()
+  const stats = new GitStatsPoller({
+    getWorktrees: () => state()?.getWorktrees() ?? [],
+    getWorkspaceRoot: () => ctx.root,
+    localDiff: deps.localDiff,
+    git: deps.git,
+    semaphore: deps.semaphore,
+    log: deps.log,
+    onStats: (stats) => deps.post({ type: "agentManager.worktreeStats", projectId: ctx.id, stats }),
+    onLocalStats: (stats) => deps.post({ type: "agentManager.localStats", projectId: ctx.id, stats }),
+  })
+  const pr = PRStatusBridge.create({
+    getWorktrees: () => state()?.getWorktrees() ?? [],
+    getWorkspaceRoot: () => ctx.root,
+    postToWebview: (m) => deps.post({ ...m, projectId: ctx.id } as StatsOutMessage),
+    updateWorktreePR: (id, n, u, s) => state()?.updateWorktreePR(id, n, u, s),
+    hasPersistedPR: (id) => !!state()?.getWorktree(id)?.prNumber,
+    openExternal: deps.openExternal,
+    log: deps.log,
+    semaphore: deps.semaphore,
+  })
+  return { stats, pr }
+}
+
+export class ProjectPollers {
+  private readonly pollers = new Map<string, PollerPair>()
+
+  constructor(
+    private readonly deps: PollerDeps,
+    private readonly create: (ctx: ProjectContext, deps: PollerDeps) => PollerPair = createPollerPair,
+  ) {}
+
+  /**
+   * Reconcile pollers with the current expanded set: start pollers for
+   * expanded, trusted, non-active projects whose state is initialized, and
+   * stop pollers for projects that were collapsed, removed, or activated.
+   */
+  sync(contexts: ProjectContexts): void {
+    const wanted = new Set<string>()
+    for (const snap of contexts.snapshots()) {
+      if (snap.active || !snap.expanded || !snap.trusted || snap.missing) continue
+      const ctx = contexts.get(snap.id)
+      if (!ctx?.peekState()) continue
+      wanted.add(snap.id)
+      if (this.pollers.has(snap.id)) continue
+      const pair = this.create(ctx, this.deps)
+      pair.stats.setVisible(this.deps.visible())
+      pair.pr.poller.setVisible(this.deps.visible())
+      pair.stats.setEnabled(true)
+      pair.pr.poller.setEnabled(true)
+      this.pollers.set(snap.id, pair)
+    }
+    for (const [id, pair] of [...this.pollers]) {
+      if (wanted.has(id)) continue
+      pair.stats.stop()
+      pair.pr.poller.stop()
+      this.pollers.delete(id)
+    }
+  }
+
+  setVisible(visible: boolean): void {
+    for (const pair of this.pollers.values()) {
+      pair.stats.setVisible(visible)
+      pair.pr.poller.setVisible(visible)
+    }
+  }
+
+  dispose(): void {
+    for (const pair of this.pollers.values()) {
+      pair.stats.stop()
+      pair.pr.poller.stop()
+    }
+    this.pollers.clear()
+  }
+}
+
+/** Create the provider's poller trio: singleton active-project pollers plus per-project background pollers. */
+export function createPollers(opts: {
+  git: GitOps
+  semaphore: Semaphore
+  state: () => WorktreeStateManager | undefined
+  root: () => string | undefined
+  activeId: () => string | undefined
+  visible: () => boolean
+  post: (msg: AgentManagerOutMessage) => void
+  cache: (msg: StatsMessage) => void
+  presence: (result: WorktreePresenceResult) => void
+  openExternal: (url: string) => void
+  log: (...args: unknown[]) => void
+}): { stats: GitStatsPoller; pr: PRStatusBridge; projects: ProjectPollers } {
+  const localDiff = (dir: string, base: string) => diffSummary(opts.git, dir, base, opts.log)
+  const stats = new GitStatsPoller({
+    getWorktrees: () => opts.state()?.getWorktrees() ?? [],
+    getWorkspaceRoot: opts.root,
+    localDiff,
+    semaphore: opts.semaphore,
+    onStats: (stats) => {
+      const msg = { type: "agentManager.worktreeStats" as const, projectId: opts.activeId(), stats }
+      opts.cache(msg)
+      opts.post(msg)
+    },
+    onLocalStats: (stats) => {
+      const msg = { type: "agentManager.localStats" as const, projectId: opts.activeId(), stats }
+      opts.cache(msg)
+      opts.post(msg)
+    },
+    onWorktreePresence: opts.presence,
+    log: opts.log,
+    git: opts.git,
+  })
+  const pr = PRStatusBridge.create({
+    getWorktrees: () => opts.state()?.getWorktrees() ?? [],
+    getWorkspaceRoot: opts.root,
+    postToWebview: (m) => opts.post(m.type === "agentManager.prStatus" ? { ...m, projectId: opts.activeId() } : m),
+    updateWorktreePR: (id, n, u, s) => opts.state()?.updateWorktreePR(id, n, u, s),
+    hasPersistedPR: (id) => !!opts.state()?.getWorktree(id)?.prNumber,
+    openExternal: opts.openExternal,
+    log: opts.log,
+    semaphore: opts.semaphore,
+  })
+  const projects = new ProjectPollers({
+    git: opts.git,
+    semaphore: opts.semaphore,
+    localDiff,
+    post: opts.post,
+    openExternal: opts.openExternal,
+    visible: opts.visible,
+    log: opts.log,
+  })
+  return { stats, pr, projects }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/registry.ts b/packages/kilo-vscode/src/agent-manager/project/registry.ts
new file mode 100644
index 0000000000..9b11a11513
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/registry.ts
@@ -0,0 +1,177 @@
+/**
+ * ProjectRegistry — global catalog of additional Agent Manager projects.
+ *
+ * The registry persists only *additional* projects: repositories the user
+ * explicitly added through the Agent Manager project picker. The pinned
+ * default project is always derived from the current VS Code workspace at
+ * runtime and is never stored here.
+ *
+ * Storage is injected so the registry stays free of VS Code imports and can
+ * be unit-tested with an in-memory store. The file is versioned; corrupt or
+ * foreign content fails closed to an empty catalog and is repaired by the
+ * next mutation.
+ *
+ * Concurrency model: every mutation is funneled through a single in-instance
+ * queue, and each mutation re-reads storage immediately before applying its
+ * change. That makes a mutation atomic with respect to other mutations on the
+ * same instance and lets it merge with the latest persisted state even when
+ * the in-memory cache is stale (another window wrote in the meantime). The
+ * cache is reassigned only after the write succeeds, so a failed write never
+ * leaves memory ahead of storage. There is no cross-process lock by design.
+ */
+
+export interface StoredProject {
+  /** Deterministic id from projectIdFor(root). */
+  id: string
+  /** Canonical Git top-level path. */
+  root: string
+  /** Optional user-facing display name. */
+  label?: string
+  order: number
+  /** Whether project-controlled scripts may execute for this project. */
+  trusted: boolean
+  addedAt: string
+}
+
+interface RegistryFile {
+  version: 1
+  projects: StoredProject[]
+}
+
+export interface RegistryStorage {
+  read(): unknown
+  write(value: unknown): Promise<void> | void
+}
+
+const VERSION = 1
+
+function valid(entry: unknown): entry is StoredProject {
+  if (!entry || typeof entry !== "object") return false
+  const e = entry as Record<string, unknown>
+  return (
+    typeof e.id === "string" &&
+    typeof e.root === "string" &&
+    typeof e.order === "number" &&
+    typeof e.trusted === "boolean" &&
+    typeof e.addedAt === "string"
+  )
+}
+
+function parse(raw: unknown, log: (msg: string) => void): StoredProject[] {
+  if (!raw || typeof raw !== "object") return []
+  const file = raw as Partial<RegistryFile>
+  if (file.version !== VERSION || !Array.isArray(file.projects)) {
+    if (file.version !== undefined) log("project registry has an unsupported shape, starting empty")
+    return []
+  }
+  const seen = new Set<string>()
+  const out: StoredProject[] = []
+  for (const entry of file.projects) {
+    if (!valid(entry)) continue
+    if (seen.has(entry.id)) continue
+    seen.add(entry.id)
+    out.push(entry)
+  }
+  return out.sort((a, b) => a.order - b.order)
+}
+
+export class ProjectRegistry {
+  private projects: StoredProject[] | undefined
+  private queue: Promise<void> = Promise.resolve()
+
+  constructor(
+    private readonly storage: RegistryStorage,
+    private readonly log: (msg: string) => void = () => {},
+  ) {}
+
+  private load(): StoredProject[] {
+    this.projects ??= parse(this.storage.read(), this.log)
+    return this.projects
+  }
+
+  /** Fresh re-read + validate/dedupe/sort, used by every mutation. */
+  private fresh(): StoredProject[] {
+    return parse(this.storage.read(), this.log)
+  }
+
+  /** Persist the next catalog and update the cache only after the write succeeds. */
+  private async write(next: StoredProject[]): Promise<void> {
+    const file: RegistryFile = { version: VERSION, projects: next }
+    await this.storage.write(file)
+    this.projects = next
+  }
+
+  /** Serialize mutations within this instance; a failed mutation does not poison the queue. */
+  private run<T>(fn: () => Promise<T>): Promise<T> {
+    const result = this.queue.catch(() => {}).then(fn)
+    this.queue = result.then(
+      () => {},
+      () => {},
+    )
+    return result
+  }
+
+  list(): StoredProject[] {
+    return [...this.load()]
+  }
+
+  get(id: string): StoredProject | undefined {
+    return this.load().find((p) => p.id === id)
+  }
+
+  /** Register an additional project. Throws when the id is already registered. */
+  add(input: { id: string; root: string; label?: string }): Promise<StoredProject> {
+    return this.run(() => this.doAdd(input))
+  }
+
+  private async doAdd(input: { id: string; root: string; label?: string }): Promise<StoredProject> {
+    const current = this.fresh()
+    if (current.find((p) => p.id === input.id)) throw new Error("That repository is already registered as a project.")
+    const order = current.reduce((max, p) => Math.max(max, p.order), 0) + 1
+    const project: StoredProject = {
+      id: input.id,
+      root: input.root,
+      label: input.label,
+      order,
+      trusted: false,
+      addedAt: new Date().toISOString(),
+    }
+    await this.write([...current, project])
+    return project
+  }
+
+  /** Remove a project from the catalog. Never deletes repository data. */
+  remove(id: string): Promise<boolean> {
+    return this.run(() => this.doRemove(id))
+  }
+
+  private async doRemove(id: string): Promise<boolean> {
+    const current = this.fresh()
+    const next = current.filter((p) => p.id !== id)
+    if (next.length === current.length) return false
+    await this.write(next)
+    return true
+  }
+
+  setTrusted(id: string, trusted: boolean): Promise<boolean> {
+    return this.run(() => this.doSetTrusted(id, trusted))
+  }
+
+  private async doSetTrusted(id: string, trusted: boolean): Promise<boolean> {
+    const current = this.fresh()
+    if (!current.find((p) => p.id === id)) return false
+    await this.write(current.map((p) => (p.id === id ? { ...p, trusted } : p)))
+    return true
+  }
+
+  setLabel(id: string, label: string | undefined): Promise<boolean> {
+    return this.run(() => this.doSetLabel(id, label))
+  }
+
+  private async doSetLabel(id: string, label: string | undefined): Promise<boolean> {
+    const current = this.fresh()
+    if (!current.find((p) => p.id === id)) return false
+    await this.write(current.map((p) => (p.id === id ? { ...p, label } : p)))
+    return true
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/route.ts b/packages/kilo-vscode/src/agent-manager/project/route.ts
new file mode 100644
index 0000000000..8504e65227
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/route.ts
@@ -0,0 +1,197 @@
+/** Strict project/resource ownership for Agent Manager multi-project routing. */
+
+export interface ProjectRef {
+  projectId: string
+}
+
+export interface WorktreeRef extends ProjectRef {
+  worktreeId: string
+}
+
+export interface SessionRef extends ProjectRef {
+  sessionId: string
+}
+
+export type SidebarTarget =
+  | { projectId: string; kind: "local" }
+  | { projectId: string; kind: "worktree"; worktreeId: string }
+  | { projectId: string; kind: "session"; sessionId: string }
+
+export type ProjectRouteErrorCode =
+  | "project_unknown"
+  | "project_stale"
+  | "worktree_unknown"
+  | "session_unknown"
+  | "session_ambiguous"
+
+export class ProjectRouteError extends Error {
+  constructor(
+    readonly code: ProjectRouteErrorCode,
+    message: string,
+  ) {
+    super(message)
+  }
+}
+
+interface ProjectRoute {
+  root: string
+  generation: number
+  worktrees: Map<string, string>
+}
+
+interface SessionRoute {
+  projectId: string
+  directory: string
+  generation: number
+}
+
+const key = (projectId: string, id: string) => `${projectId}\0${id}`
+
+export class ProjectRouteService {
+  private readonly projects = new Map<string, ProjectRoute>()
+  private readonly sessions = new Map<string, SessionRoute>()
+  private readonly raw = new Map<string, Set<string>>()
+
+  registerProject(projectId: string, root: string, generation: number): void {
+    const current = this.projects.get(projectId)
+    if (current && (current.generation !== generation || current.root !== root)) this.unregisterProject(projectId)
+    if (current && current.generation === generation && current.root === root) return
+    this.projects.set(projectId, { root, generation, worktrees: new Map() })
+  }
+
+  unregisterProject(projectId: string): void {
+    this.projects.delete(projectId)
+    for (const [id, route] of [...this.sessions]) {
+      if (route.projectId !== projectId) continue
+      this.sessions.delete(id)
+      const sessionId = id.slice(id.indexOf("\0") + 1)
+      const projects = this.raw.get(sessionId)
+      projects?.delete(projectId)
+      if (projects?.size === 0) this.raw.delete(sessionId)
+    }
+  }
+
+  registerWorktree(ref: WorktreeRef, directory: string, generation: number): void {
+    const project = this.requireProject(ref.projectId, generation)
+    project.worktrees.set(ref.worktreeId, directory)
+  }
+
+  registerSession(ref: SessionRef, directory: string, generation: number): void {
+    this.requireProject(ref.projectId, generation)
+    this.sessions.set(key(ref.projectId, ref.sessionId), { projectId: ref.projectId, directory, generation })
+    const projects = this.raw.get(ref.sessionId) ?? new Set<string>()
+    projects.add(ref.projectId)
+    this.raw.set(ref.sessionId, projects)
+  }
+
+  /**
+   * Drop a single session route. Safe to call for unknown refs; never throws.
+   * Keeps the raw index consistent so an unregistered id cannot remain
+   * ambiguous or stale.
+   */
+  unregisterSession(ref: SessionRef): void {
+    if (!this.sessions.delete(key(ref.projectId, ref.sessionId))) return
+    const projects = this.raw.get(ref.sessionId)
+    projects?.delete(ref.projectId)
+    if (projects?.size === 0) this.raw.delete(ref.sessionId)
+  }
+
+  /** Whether a session route is currently registered for this ref. */
+  hasSession(ref: SessionRef): boolean {
+    return this.sessions.has(key(ref.projectId, ref.sessionId))
+  }
+
+  /**
+   * Best-effort directory for a raw session id, without throwing.
+   *
+   * Returns the exact directory when the id maps to exactly one project,
+   * `undefined` when unknown, and `undefined` when the id is ambiguous across
+   * projects. Callers must NOT fall back to an arbitrary root for an
+   * ambiguous id — that would silently retarget the operation to the wrong
+   * project. Use {@link resolveRawSession} when a precise ref is required.
+   */
+  trySessionDirectory(sessionId: string): string | undefined {
+    const projects = this.raw.get(sessionId)
+    if (!projects?.size) return undefined
+    if (projects.size > 1) return undefined
+    const projectId = [...projects][0]!
+    const route = this.sessions.get(key(projectId, sessionId))
+    if (!route) return undefined
+    if (!this.projects.has(projectId)) return undefined
+    return route.directory
+  }
+
+  /** Whether a raw session id is known but maps to more than one project. */
+  isSessionAmbiguous(sessionId: string): boolean {
+    const projects = this.raw.get(sessionId)
+    return !!projects && projects.size > 1
+  }
+
+  inheritSession(ref: SessionRef, parent: SessionRef): void {
+    const route = this.requireSession(parent)
+    if (ref.projectId !== parent.projectId) {
+      throw new ProjectRouteError("session_unknown", "A child session cannot move between projects.")
+    }
+    this.registerSession(ref, route.directory, route.generation)
+  }
+
+  projectRoot(ref: ProjectRef, generation?: number): string {
+    return this.requireProject(ref.projectId, generation).root
+  }
+
+  worktreeDirectory(ref: WorktreeRef, generation?: number): string {
+    const project = this.requireProject(ref.projectId, generation)
+    const directory = project.worktrees.get(ref.worktreeId)
+    if (!directory) throw new ProjectRouteError("worktree_unknown", `Unknown worktree ${ref.worktreeId}.`)
+    return directory
+  }
+
+  sessionDirectory(ref: SessionRef): string {
+    return this.requireSession(ref).directory
+  }
+
+  /**
+   * Non-throwing variant of {@link sessionDirectory}. Returns the exact
+   * directory for a project-qualified session ref, or `undefined` when the
+   * project or session is unknown. Used by the KiloProvider adapter to route
+   * Agent Manager operations to an exact directory without risking an
+   * exception in message-handling paths.
+   */
+  trySessionDirectoryFor(ref: SessionRef): string | undefined {
+    const project = this.projects.get(ref.projectId)
+    if (!project) return undefined
+    const route = this.sessions.get(key(ref.projectId, ref.sessionId))
+    if (!route) return undefined
+    if (route.generation !== project.generation) return undefined
+    return route.directory
+  }
+
+  resolveRawSession(sessionId: string): SessionRef {
+    const projects = this.raw.get(sessionId)
+    if (!projects?.size) throw new ProjectRouteError("session_unknown", `Unknown session ${sessionId}.`)
+    if (projects.size > 1)
+      throw new ProjectRouteError("session_ambiguous", `Session ${sessionId} exists in multiple projects.`)
+    return { projectId: [...projects][0]!, sessionId }
+  }
+
+  static key(ref: ProjectRef & { sessionId?: string; worktreeId?: string }): string {
+    const id = ref.sessionId ?? ref.worktreeId ?? "local"
+    return key(ref.projectId, id)
+  }
+
+  private requireProject(projectId: string, generation?: number): ProjectRoute {
+    const project = this.projects.get(projectId)
+    if (!project) throw new ProjectRouteError("project_unknown", `Unknown project ${projectId}.`)
+    if (generation !== undefined && generation !== project.generation) {
+      throw new ProjectRouteError("project_stale", `Project ${projectId} has been replaced.`)
+    }
+    return project
+  }
+
+  private requireSession(ref: SessionRef): SessionRoute {
+    const route = this.sessions.get(key(ref.projectId, ref.sessionId))
+    if (!route) throw new ProjectRouteError("session_unknown", `Unknown session ${ref.sessionId} in ${ref.projectId}.`)
+    this.requireProject(ref.projectId, route.generation)
+    return route
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/scope.ts b/packages/kilo-vscode/src/agent-manager/project/scope.ts
new file mode 100644
index 0000000000..8c9780f2e5
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/scope.ts
@@ -0,0 +1,15 @@
+import { AsyncLocalStorage } from "async_hooks"
+import type { ProjectContext } from "./context"
+
+/** Pins dynamic provider getters to the project that started an async operation. */
+export class ProjectScope {
+  private readonly storage = new AsyncLocalStorage<ProjectContext>()
+
+  current(): ProjectContext | undefined {
+    return this.storage.getStore()
+  }
+
+  run<T>(ctx: ProjectContext, operation: () => Promise<T>): Promise<T> {
+    return this.storage.run(ctx, operation)
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/project/session-view.ts b/packages/kilo-vscode/src/agent-manager/project/session-view.ts
new file mode 100644
index 0000000000..f8643d21e9
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/session-view.ts
@@ -0,0 +1,4 @@
+import type { sessionToWebview } from "../../kilo-provider-utils"
+
+/** A root session as shown in a project's sidebar, tagged with its worktree. */
+export type ProjectSessionView = ReturnType<typeof sessionToWebview> & { worktreeId: string | null }
diff --git a/packages/kilo-vscode/src/agent-manager/project/state-gate.ts b/packages/kilo-vscode/src/agent-manager/project/state-gate.ts
new file mode 100644
index 0000000000..46aa539225
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/state-gate.ts
@@ -0,0 +1,35 @@
+/**
+ * Messages that mutate or read a project's persisted state and therefore must
+ * wait for that project's state to load before dispatch.
+ */
+export const STATE_GATED = new Set<string>([
+  "agentManager.createWorktree",
+  "agentManager.promoteSession",
+  "agentManager.createMultiVersion",
+  "agentManager.deleteWorktree",
+  "agentManager.removeStaleWorktree",
+  "agentManager.openLocally",
+  "agentManager.addSessionToWorktree",
+  "agentManager.closeSession",
+  "agentManager.persistSession",
+  "agentManager.forgetSession",
+  "agentManager.renameWorktree",
+  "agentManager.requestBranches",
+  "agentManager.importFromBranch",
+  "agentManager.importFromPR",
+  "agentManager.importExternalWorktree",
+  "agentManager.importAllExternalWorktrees",
+  "agentManager.setTabOrder",
+  "agentManager.setWorktreeOrder",
+  "agentManager.setSessionsCollapsed",
+  "agentManager.setSidebarCollapsed",
+  "agentManager.setReviewDiffStyle",
+  "agentManager.setDefaultBaseBranch",
+  "agentManager.createSection",
+  "agentManager.renameSection",
+  "agentManager.deleteSection",
+  "agentManager.setSectionColor",
+  "agentManager.toggleSectionCollapsed",
+  "agentManager.moveToSection",
+  "agentManager.moveSection",
+])
diff --git a/packages/kilo-vscode/src/agent-manager/project/wiring.ts b/packages/kilo-vscode/src/agent-manager/project/wiring.ts
new file mode 100644
index 0000000000..f3673365ac
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/project/wiring.ts
@@ -0,0 +1,94 @@
+/**
+ * Factory for the Agent Manager multi-project wiring: registry, context
+ * coordinator, message-handler dependencies, and host change listeners.
+ *
+ * Extracted from AgentManagerProvider (file-size cap). VS Code-free; the Host
+ * interface abstracts all platform capabilities.
+ */
+
+import type { Host, Disposable } from "../host"
+import type { GitOps } from "../GitOps"
+import { ProjectRegistry } from "./registry"
+import type { ProjectContext, ProjectInitResult } from "./context"
+import { ProjectContexts, type ProjectSnapshot } from "./contexts"
+import type { ProjectMessageDeps } from "./messages"
+
+export interface ProjectWiring {
+  registry: ProjectRegistry
+  contexts: ProjectContexts
+  messages: ProjectMessageDeps
+  /** Payload for the agentManager.projects webview message. */
+  snapshots(): { type: "agentManager.projects"; multiProject: boolean; projects: ProjectSnapshot[] }
+  dispose(): void
+}
+
+export function createProjectWiring(opts: {
+  host: Host
+  git: GitOps
+  log: (...args: unknown[]) => void
+  output: (msg: string) => void
+  /** Re-initialize provider state for a freshly activated context. */
+  activate: (ctx: ProjectContext) => void
+  /** Initialize an expanded background context and push its state. */
+  expand: (ctx: ProjectContext) => void
+  /** Ensure a context's repository state is ready (no-op once initialized). */
+  ready: (ctx: ProjectContext) => Promise<ProjectInitResult>
+  /** Push the project catalog to the webview. */
+  push: () => void
+  /** Re-derive the pinned project after workspace folder changes. */
+  changed: () => void
+  /** Re-push worktree state (e.g. after the flag toggles). */
+  refresh: () => void
+  /** Acknowledge an atomically validated sidebar selection. */
+  selected: (target: import("./route").SidebarTarget) => void
+}): ProjectWiring {
+  const registry = new ProjectRegistry(
+    { read: () => opts.host.readProjects(), write: (value) => opts.host.writeProjects(value) },
+    (msg) => opts.log(msg),
+  )
+  const contexts = new ProjectContexts({
+    workspaceRoot: () => opts.host.workspacePath(),
+    registry,
+    trusted: (id) => registry.get(id)?.trusted === true,
+    enabled: () => opts.host.multiProject(),
+    remove: (id) => opts.host.unregisterProjectRoutes(id),
+    deps: { log: opts.output, git: opts.git },
+  })
+  const messages: ProjectMessageDeps = {
+    registry,
+    contexts,
+    enabled: () => opts.host.multiProject(),
+    pickFolder: () => opts.host.pickFolder(),
+    activate: opts.activate,
+    expand: opts.expand,
+    ready: opts.ready,
+    push: opts.push,
+    selected: opts.selected,
+    error: (message) => opts.host.showError(message),
+    log: opts.log,
+  }
+  const listeners: Disposable[] = [
+    opts.host.onDidChangeWorkspaceFolders(() => opts.changed()),
+    opts.host.onDidChangeMultiProject((enabled) => {
+      if (!enabled) {
+        const pinned = contexts.disable()
+        if (pinned) opts.activate(pinned)
+      }
+      opts.push()
+      opts.refresh()
+    }),
+  ]
+  return {
+    registry,
+    contexts,
+    messages,
+    snapshots: () => ({
+      type: "agentManager.projects",
+      multiProject: opts.host.multiProject(),
+      projects: contexts.snapshots(),
+    }),
+    dispose: () => {
+      for (const listener of listeners) listener.dispose()
+    },
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/provider-lifecycle.ts b/packages/kilo-vscode/src/agent-manager/provider-lifecycle.ts
new file mode 100644
index 0000000000..a9aa615fd6
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/provider-lifecycle.ts
@@ -0,0 +1,299 @@
+import type { KiloClient, Session } from "@kilocode/sdk/v2/client"
+import { getErrorMessage } from "../kilo-provider-utils"
+import type { AgentManagerOutMessage } from "./types"
+import { PLATFORM } from "./constants"
+import { initContextState } from "./project/init"
+import type { ProjectContext } from "./project/context"
+import type { ManagedSession } from "./WorktreeStateManager"
+import type { CreateWorktreeResult, WorktreeManager } from "./WorktreeManager"
+import type { CreateWorktreeOnDiskOptions, CreateWorktreeOnDiskResult } from "./worktree-create"
+import { recordPromotionHandoff } from "./promotion-handoff"
+import { stopSessionProcesses } from "../kilo-provider/background-process"
+
+/**
+ * Provider capabilities the worktree lifecycle needs beyond project state.
+ * State is reached through the ProjectContext the handler receives; this host
+ * only carries what genuinely belongs to the provider: shared creation
+ * helpers, the panel session facade, route registration, poller skips, the
+ * diff controller, telemetry, and the webview boundary.
+ */
+export interface LifecycleHost {
+  createOnDisk: (opts?: CreateWorktreeOnDiskOptions) => Promise<CreateWorktreeOnDiskResult | null>
+  runSetup: (dir: string, branch: string, id: string) => Promise<void>
+  createSession: (dir: string, branch: string, id: string) => Promise<Session | null>
+  notifyReady: (sessionId: string, result: CreateWorktreeResult, worktreeId?: string) => void
+  sessions: {
+    register: (session: Session) => void
+    clearDirectory: (sessionId: string) => void
+    directories: () => ReadonlyMap<string, string> | undefined
+    abort: (sessionIds: string[]) => Promise<void>
+    forget: (sessionId: string) => void
+  }
+  push: () => void
+  register: (sessionId: string, dir: string) => void
+  skipStats: (worktreeId: string) => void
+  unskipStats: (worktreeId: string) => void
+  removePR: (worktreeId: string) => void
+  removeRun: (worktreeId: string) => Promise<void>
+  /** Stop the run script's terminal; false aborts the worktree removal. */
+  clearRun: (worktreeId: string) => Promise<boolean>
+  forgetName: (worktreeId: string) => void
+  stopDiffs: (path: string, orphaned: ManagedSession[]) => void
+  capture: (event: string, props: Record<string, unknown>) => void
+  autoName: () => { enabled: boolean }
+  client: () => KiloClient
+  metadata: (client: KiloClient, dir: string) => Promise<Record<string, unknown>>
+  post: (message: AgentManagerOutMessage) => void
+  log: (...args: unknown[]) => void
+}
+
+/** Create a new worktree with an auto-created first session. */
+export async function createLifecycleWorktree(
+  ctx: ProjectContext,
+  host: LifecycleHost,
+  opts: { baseBranch?: string; branchName?: string },
+): Promise<null> {
+  await initContextState(ctx, host.log)
+
+  const created = await host.createOnDisk({ baseBranch: opts.baseBranch, branchName: opts.branchName })
+  if (!created) return null
+
+  // Run setup script for new worktree (blocks until complete, shows in overlay)
+  await host.runSetup(created.result.path, created.result.branch, created.worktree.id)
+
+  const session = await host.createSession(created.result.path, created.result.branch, created.worktree.id)
+  if (!session) {
+    ctx.peekState()?.removeWorktree(created.worktree.id)
+    await ctx.worktreeManager().removeWorktree(created.result.path)
+    host.push()
+    return null
+  }
+
+  const state = ctx.peekState()!
+  state.addSession(session.id, created.worktree.id)
+  if (!opts.branchName && host.autoName().enabled) state.armAutoName(created.worktree.id, session.id)
+  host.register(session.id, created.result.path)
+  // Push state before registerSession so the webview's sessionCreated handler
+  // sees the worktree mapping and routes the session to the worktree tab.
+  host.notifyReady(session.id, created.result, created.worktree.id)
+  host.sessions.register(session)
+  host.capture("Agent Manager Session Started", {
+    source: PLATFORM,
+    sessionId: session.id,
+    worktreeId: created.worktree.id,
+    branch: created.result.branch,
+  })
+  host.log(`Created worktree ${created.worktree.id} with session ${session.id}`)
+  return null
+}
+
+/** Delete a worktree and dissociate its sessions. */
+export async function deleteLifecycleWorktree(
+  ctx: ProjectContext,
+  host: LifecycleHost,
+  worktreeId: string,
+): Promise<null> {
+  const state = ctx.peekState()
+  if (!state) return null
+  const worktree = state.getWorktree(worktreeId)
+  if (!worktree) {
+    host.log(`Worktree ${worktreeId} not found in state`)
+    return null
+  }
+  // Remove from state BEFORE disk removal so pollers immediately stop targeting this worktree.
+  // Pre-emptive skip covers any in-flight poll that already captured getWorktrees().
+  host.skipStats(worktreeId)
+  await host.removeRun(worktreeId)
+  if (!(await host.clearRun(worktreeId))) {
+    host.unskipStats(worktreeId)
+    host.post({ type: "error", message: "Failed to stop the Run script before deleting the worktree" })
+    return null
+  }
+  host.removePR(worktreeId)
+  host.forgetName(worktreeId)
+  const orphaned = state.removeWorktree(worktreeId)
+  host.stopDiffs(worktree.path, orphaned)
+  for (const s of orphaned) host.sessions.clearDirectory(s.id)
+  host.push()
+  // Disk removal after state is clean — pollers no longer reference this worktree.
+  const branch = worktree.branchOwned === false ? undefined : (worktree.originalBranch ?? worktree.branch)
+  try {
+    await ctx.worktreeManager().removeWorktree(worktree.path, branch)
+  } catch (error) {
+    host.log(`Failed to remove worktree from disk: ${error}`)
+  }
+  host.log(`Deleted worktree ${worktreeId}${branch ? ` (${branch})` : ""}`)
+  return null
+}
+
+/** Remove a stale worktree entry from state without touching the filesystem. */
+export async function removeStaleLifecycleWorktree(
+  ctx: ProjectContext,
+  host: LifecycleHost,
+  worktreeId: string,
+): Promise<null> {
+  const state = ctx.peekState()
+  if (!state) return null
+  if (!ctx.stale.has(worktreeId)) {
+    host.log(`Ignored stale removal for non-stale worktree ${worktreeId}`)
+    return null
+  }
+
+  const worktree = state.getWorktree(worktreeId)
+  if (!worktree) {
+    ctx.stale.delete(worktreeId)
+    host.push()
+    return null
+  }
+
+  await host.removeRun(worktreeId)
+  if (!(await host.clearRun(worktreeId))) {
+    host.post({ type: "error", message: "Failed to stop the Run script before removing the worktree" })
+    return null
+  }
+  host.forgetName(worktreeId)
+  const orphaned = state.removeWorktree(worktreeId)
+  host.stopDiffs(worktree.path, orphaned)
+  for (const session of orphaned) host.sessions.clearDirectory(session.id)
+  ctx.stale.delete(worktreeId)
+  host.push()
+  host.log(`Removed stale worktree entry ${worktreeId} (${worktree.branch})`)
+  return null
+}
+
+/** Promote a session: create a worktree and move the session into it. */
+export async function promoteLifecycleSession(
+  ctx: ProjectContext,
+  host: LifecycleHost,
+  sessionId: string,
+): Promise<null> {
+  await initContextState(ctx, host.log)
+  const created = await host.createOnDisk({})
+  if (!created) return null
+
+  // Run setup script for new worktree (blocks until complete, shows in overlay)
+  await host.runSetup(created.result.path, created.result.branch, created.worktree.id)
+
+  const state = ctx.peekState()!
+  if (!state.getSession(sessionId)) {
+    state.addSession(sessionId, created.worktree.id)
+  } else {
+    state.moveSession(sessionId, created.worktree.id)
+  }
+
+  host.register(sessionId, created.result.path)
+  try {
+    await recordPromotionHandoff({
+      client: host.client(),
+      sessionId,
+      directory: created.result.path,
+      branch: created.result.branch,
+    })
+  } catch (err) {
+    host.log("Failed to record worktree promotion handoff:", getErrorMessage(err))
+  }
+  host.notifyReady(sessionId, created.result, created.worktree.id)
+  host.log(`Promoted session ${sessionId} to worktree ${created.worktree.id}`)
+  return null
+}
+
+/** Add a new or existing session to an existing worktree. */
+export async function addSessionToLifecycleWorktree(
+  ctx: ProjectContext,
+  host: LifecycleHost,
+  worktreeId: string,
+  sessionId?: string,
+): Promise<null> {
+  let client: KiloClient
+  try {
+    client = host.client()
+  } catch (err) {
+    host.log("onAddSessionToWorktree: client not available:", err)
+    host.post({ type: "error", message: "Not connected to CLI backend" })
+    return null
+  }
+
+  const state = ctx.peekState()
+  if (!state) return null
+
+  const worktree = state.getWorktree(worktreeId)
+  if (!worktree) {
+    host.log(`Worktree ${worktreeId} not found`)
+    return null
+  }
+
+  if (sessionId) {
+    if (state.getSession(sessionId)) state.moveSession(sessionId, worktreeId)
+    else state.addSession(sessionId, worktreeId)
+    host.register(sessionId, worktree.path)
+    host.push()
+    host.post({ type: "agentManager.sessionAdded", sessionId, worktreeId })
+    host.capture("Agent Manager Session Started", {
+      source: PLATFORM,
+      sessionId,
+      worktreeId,
+      existing: true,
+    })
+    host.log(`Added existing session ${sessionId} to worktree ${worktreeId}`)
+    return null
+  }
+
+  let session: Session
+  try {
+    const metadata = await host.metadata(client, worktree.path)
+    const { data } = await client.session.create(
+      { directory: worktree.path, platform: PLATFORM, metadata },
+      { throwOnError: true },
+    )
+    session = data
+  } catch (error) {
+    const err = getErrorMessage(error)
+    host.post({ type: "error", message: `Failed to create session: ${err}` })
+    host.capture("Agent Manager Session Error", {
+      source: PLATFORM,
+      error: err,
+      context: "addSessionToWorktree",
+      worktreeId,
+    })
+    return null
+  }
+
+  state.addSession(session.id, worktreeId)
+  host.register(session.id, worktree.path)
+  host.push()
+  host.post({ type: "agentManager.sessionAdded", sessionId: session.id, worktreeId })
+  host.sessions.register(session)
+
+  host.capture("Agent Manager Session Started", {
+    source: PLATFORM,
+    sessionId: session.id,
+    worktreeId,
+  })
+  host.log(`Added session ${session.id} to worktree ${worktreeId}`)
+  return null
+}
+
+/** Stop a session and remove it from Agent Manager. */
+export async function closeLifecycleSession(
+  ctx: ProjectContext,
+  host: LifecycleHost,
+  sessionId: string,
+): Promise<null> {
+  const state = ctx.peekState()
+  const dir = state?.directoryFor(sessionId) ?? host.sessions.directories()?.get(sessionId) ?? ctx.root ?? process.cwd()
+  await host.sessions.abort([sessionId])
+  host.sessions.forget(sessionId)
+  try {
+    await stopSessionProcesses(host.client(), sessionId, dir)
+  } catch (err) {
+    host.log("onCloseSession: client not available:", err)
+  }
+
+  state?.removeSession(sessionId)
+  host.sessions.clearDirectory(sessionId)
+  if (state) host.push()
+  host.log(`Closed session ${sessionId}`)
+  return null
+}
+
+export type { WorktreeManager }
diff --git a/packages/kilo-vscode/src/agent-manager/provider-multi-version.ts b/packages/kilo-vscode/src/agent-manager/provider-multi-version.ts
new file mode 100644
index 0000000000..37a9fe93a1
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/provider-multi-version.ts
@@ -0,0 +1,262 @@
+import { getErrorMessage } from "../kilo-provider-utils"
+import { PLATFORM } from "./constants"
+import type { ProjectContext } from "./project/context"
+import type { AgentManagerInMessage } from "./types"
+import { versionedName } from "./branch-name"
+import { resolveVersionModels, buildInitialMessages, type CreatedVersion } from "./multi-version"
+import { ensureSandbox } from "./sandbox-bootstrap"
+import type { LifecycleHost } from "./provider-lifecycle"
+
+/**
+ * Multi-version creation needs the lifecycle capabilities plus three provider
+ * services of its own: worktree discard for failed versions, the branch
+ * naming controller for the initial prompt, and user-facing error reporting.
+ */
+export interface MultiVersionHost extends LifecycleHost {
+  discard: (id: string, dir: string, branch: string, sessionId?: string) => Promise<void>
+  promptName: (input: { sessionID: string; text: string; providerID?: string; modelID?: string }) => void
+  error: (message: string) => void
+}
+
+/**
+ * Create N worktrees with one session each (optionally one model per version),
+ * then fan the initial prompt out to every created session. State is reached
+ * through the project context; everything else goes through the host.
+ */
+export async function createMultiVersion(
+  ctx: ProjectContext,
+  host: MultiVersionHost,
+  msg: Extract<AgentManagerInMessage, { type: "agentManager.createMultiVersion" }>,
+): Promise<null> {
+  const text = msg.text?.trim() || undefined
+
+  const worktreeName = msg.name?.trim() || undefined
+  const agent = msg.agent
+  const files = msg.files
+  const baseBranch = msg.baseBranch
+  const branchName = msg.branchName?.trim() || undefined
+
+  const fallback = msg.providerID && msg.modelID ? { providerID: msg.providerID, modelID: msg.modelID } : undefined
+  const resolved = resolveVersionModels(msg.modelAllocations, fallback, Number(msg.versions) || 1)
+  const { models, versions, providerID, modelID } = resolved
+
+  // Generate a shared group ID for multi-version worktrees
+  const groupId = versions > 1 ? `grp-${Date.now()}` : undefined
+
+  host.log(
+    `Creating ${versions} worktrees${models.length > 0 ? " (model comparison)" : ""}${text ? ` for: ${text.slice(0, 60)}` : ""}${groupId ? ` (group=${groupId})` : ""}`,
+  )
+
+  // Notify webview that multi-version creation has started
+  host.post({
+    type: "agentManager.multiVersionProgress",
+    status: "creating",
+    total: versions,
+    completed: 0,
+    groupId,
+  })
+
+  // Phase 1: Create all worktrees + sessions first
+  const created: CreatedVersion[] = []
+
+  for (let i = 0; i < versions; i++) {
+    const version = await createVersion(ctx, host, {
+      index: i,
+      versions,
+      groupId,
+      baseBranch,
+      branchName,
+      worktreeName,
+      models,
+      providerID,
+      modelID,
+      sandbox: msg.sandbox,
+    })
+    if (!version) continue
+    created.push(version)
+
+    // Update progress
+    host.post({
+      type: "agentManager.multiVersionProgress",
+      status: "creating",
+      total: versions,
+      completed: created.length,
+      groupId,
+    })
+  }
+
+  // Phase 2: Send the initial prompt to all sessions, or clear busy state if no text.
+  await sendInitialPrompts(host, created, models, { providerID, modelID }, { text, agent, variant: msg.variant, files })
+
+  // Notify completion
+  host.post({
+    type: "agentManager.multiVersionProgress",
+    status: "done",
+    total: versions,
+    completed: created.length,
+    groupId,
+  })
+
+  if (created.length === 0) {
+    host.error(`Failed to create any of the ${versions} multi-version worktrees.`)
+  }
+
+  host.log(`Multi-version creation complete: ${created.length}/${versions} versions`)
+  return null
+}
+
+interface VersionSpec {
+  index: number
+  versions: number
+  groupId: string | undefined
+  baseBranch: string | undefined
+  branchName: string | undefined
+  worktreeName: string | undefined
+  models: ReturnType<typeof resolveVersionModels>["models"]
+  providerID: string | undefined
+  modelID: string | undefined
+  sandbox: boolean | undefined
+}
+
+/** Create one version's worktree + session and wire it into state and the webview. */
+async function createVersion(
+  ctx: ProjectContext,
+  host: MultiVersionHost,
+  spec: VersionSpec,
+): Promise<CreatedVersion | null> {
+  host.log(`Creating worktree ${spec.index + 1}/${spec.versions}`)
+
+  const version = versionedName(spec.branchName || spec.worktreeName, spec.index, spec.versions)
+  const wt = await host.createOnDisk({
+    groupId: spec.groupId,
+    baseBranch: spec.baseBranch,
+    branchName: version.branch,
+    name: version.branch,
+    label: version.label,
+  })
+  if (!wt) {
+    host.log(`Failed to create worktree for version ${spec.index + 1}`)
+    return null
+  }
+
+  await host.runSetup(wt.result.path, wt.result.branch, wt.worktree.id)
+
+  const session = await host.createSession(wt.result.path, wt.result.branch, wt.worktree.id)
+  if (!session) {
+    ctx.peekState()?.removeWorktree(wt.worktree.id)
+    await ctx.worktreeManager().removeWorktree(wt.result.path)
+    host.log(`Failed to create session for version ${spec.index + 1}`)
+    return null
+  }
+
+  const state = ctx.stateManager()
+  state.addSession(session.id, wt.worktree.id)
+  if (!spec.branchName && !spec.worktreeName && host.autoName().enabled) {
+    state.armAutoName(wt.worktree.id, session.id)
+  }
+
+  // Sandbox must match the user's choice before this session is exposed or
+  // receives its initial prompt. A failed reconciliation aborts this version.
+  if (spec.sandbox !== undefined && !(await reconcileSandbox(host, spec, wt, session.id))) return null
+
+  host.register(session.id, wt.result.path)
+  host.notifyReady(session.id, wt.result, wt.worktree.id)
+  host.sessions.register(session)
+
+  // Set the per-version model immediately so the UI selector reflects
+  // the correct model as soon as the worktree appears, before Phase 2.
+  // Uses a dedicated message type to avoid clearing the busy state.
+  const versionModel = spec.models[spec.index]
+  const earlyProviderID = versionModel?.providerID ?? spec.providerID
+  const earlyModelID = versionModel?.modelID ?? spec.modelID
+  if (earlyProviderID && earlyModelID) {
+    host.post({
+      type: "agentManager.setSessionModel",
+      sessionId: session.id,
+      providerID: earlyProviderID,
+      modelID: earlyModelID,
+    })
+  }
+
+  host.capture("Agent Manager Session Started", {
+    source: PLATFORM,
+    sessionId: session.id,
+    worktreeId: wt.worktree.id,
+    branch: wt.result.branch,
+    multiVersion: true,
+    version: spec.index + 1,
+    totalVersions: spec.versions,
+    groupId: spec.groupId,
+  })
+  host.log(`Version ${spec.index + 1} worktree ready: session=${session.id}`)
+
+  return {
+    worktreeId: wt.worktree.id,
+    sessionId: session.id,
+    path: wt.result.path,
+    branch: wt.result.branch,
+    parentBranch: wt.result.parentBranch,
+    versionIndex: spec.index,
+  }
+}
+
+/** Reconcile the sandbox preference for one version; rolls the worktree back on failure. */
+async function reconcileSandbox(
+  host: MultiVersionHost,
+  spec: VersionSpec,
+  wt: NonNullable<Awaited<ReturnType<MultiVersionHost["createOnDisk"]>>>,
+  sessionId: string,
+): Promise<boolean> {
+  try {
+    await ensureSandbox(host.client(), sessionId, wt.result.path, spec.sandbox!)
+    return true
+  } catch (error) {
+    const err = getErrorMessage(error)
+    host.log(`Failed to configure sandbox for ${sessionId}: ${err}`)
+    host.post({
+      type: "agentManager.worktreeSetup",
+      status: "error",
+      message: `Failed to configure sandbox: ${err}`,
+      worktreeId: wt.worktree.id,
+    })
+    host.capture("Agent Manager Session Error", {
+      source: PLATFORM,
+      error: err,
+      context: "configureSandbox",
+    })
+    await host.discard(wt.worktree.id, wt.result.path, wt.result.branch, sessionId)
+    return false
+  }
+}
+
+/** Fan the initial prompt out to every created session, throttled between sends. */
+async function sendInitialPrompts(
+  host: MultiVersionHost,
+  created: CreatedVersion[],
+  models: VersionSpec["models"],
+  resolved: { providerID: string | undefined; modelID: string | undefined },
+  input: {
+    text: string | undefined
+    agent: string | undefined
+    variant: string | undefined
+    files: Extract<AgentManagerInMessage, { type: "agentManager.createMultiVersion" }>["files"]
+  },
+): Promise<void> {
+  const messages = buildInitialMessages(created, models, resolved, input.text, input.agent, input.variant, input.files)
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i]!
+    if (input.text) {
+      host.log(`Sending initial message to version ${i + 1} (session=${msg.sessionId})`)
+      host.promptName({
+        sessionID: msg.sessionId,
+        text: input.text,
+        providerID: msg.providerID,
+        modelID: msg.modelID,
+      })
+    }
+    host.post({ type: "agentManager.sendInitialMessage", ...msg })
+    if (input.text && i < messages.length - 1) {
+      await new Promise((resolve) => setTimeout(resolve, 300))
+    }
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/run/controller.ts b/packages/kilo-vscode/src/agent-manager/run/controller.ts
index b5db0320e7..d0ade51e76 100644
--- a/packages/kilo-vscode/src/agent-manager/run/controller.ts
+++ b/packages/kilo-vscode/src/agent-manager/run/controller.ts
@@ -4,8 +4,10 @@ import { getShellEnvironment } from "../shell-env"
 import { RunScriptManager, type RunHandle, type RunStatus } from "./manager"
 import { RunScriptService } from "./service"
 import type { WorktreeStateManager } from "../WorktreeStateManager"
+import type { RunTerminalDestination } from "./destination"
 
 export interface RunTaskConfig {
+  destination: RunTerminalDestination
   worktreeId: string
   branch: string
   command: string
@@ -14,11 +16,13 @@ export interface RunTaskConfig {
   env: Record<string, string>
 }
 
-interface TaskExit {
+export interface RunTaskExit {
   exitCode?: number
+  stopped?: boolean
+  error?: string
 }
 
-type StartTask = (config: RunTaskConfig, done: (exit: TaskExit) => void) => Promise<RunHandle>
+export type StartTask = (config: RunTaskConfig, done: (exit: RunTaskExit) => void) => Promise<RunHandle>
 
 interface Options {
   root: () => string | undefined
@@ -60,7 +64,7 @@ export class RunController {
     this.opts.refresh?.()
   }
 
-  async run(worktreeId: string): Promise<void> {
+  async run(worktreeId: string, destination: RunTerminalDestination): Promise<void> {
     const status = this.manager.status(worktreeId)
     if (status.state !== "idle") {
       this.stop(worktreeId)
@@ -71,8 +75,9 @@ export class RunController {
     const service = this.getService()
     if (!root || !service) return
 
-    // Resolve cwd and branch: "local" runs from repo root, worktrees from their path
-    const local = worktreeId === "local"
+    // Resolve cwd and branch: "local" runs from repo root, worktrees from their path.
+    // Multi-project qualifies the local key as "<projectId>:local" (see run/message.ts).
+    const local = worktreeId === "local" || worktreeId.endsWith(":local")
     const state = this.opts.state()
     const worktree = local ? undefined : state?.getWorktree(worktreeId)
     if (!local && !worktree) {
@@ -109,18 +114,19 @@ export class RunController {
     }
 
     const start = () =>
-      this.opts.start({ worktreeId, branch, command: script.command, args: script.args, cwd, env }, (exit) =>
-        this.manager.finish(worktreeId, { exitCode: exit.exitCode }),
+      this.opts.start(
+        { destination, worktreeId, branch, command: script.command, args: script.args, cwd, env },
+        (exit) => this.manager.finish(worktreeId, exit),
       )
     await this.manager.start(worktreeId, start)
   }
 
   stop(worktreeId: string): void {
-    this.manager.stop(worktreeId)
+    void this.manager.stop(worktreeId)
   }
 
-  remove(worktreeId: string): void {
-    this.manager.remove(worktreeId)
+  remove(worktreeId: string): Promise<void> {
+    return this.manager.remove(worktreeId)
   }
 
   dispose(): void {
diff --git a/packages/kilo-vscode/src/agent-manager/run/destination.ts b/packages/kilo-vscode/src/agent-manager/run/destination.ts
new file mode 100644
index 0000000000..5945da16b7
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/run/destination.ts
@@ -0,0 +1,16 @@
+/**
+ * Where the Agent Manager Run button executes the project run script.
+ *
+ * The Agent Manager terminal dropdown owns this choice per panel.
+ * "agentManager" runs through the canonical PTY service in the embedded
+ * side terminal. "vscode" is the legacy integrated terminal task path,
+ * kept for comparison while the embedded path proves itself. Remove the
+ * "vscode" dropdown option, `run/task.ts`, and the integrated branch below
+ * together once the embedded path is the only one.
+ */
+
+export type RunTerminalDestination = "agentManager" | "vscode"
+
+export function pickRunStart<T>(destination: RunTerminalDestination, embedded: T, integrated: T): T {
+  return destination === "vscode" ? integrated : embedded
+}
diff --git a/packages/kilo-vscode/src/agent-manager/run/manager.ts b/packages/kilo-vscode/src/agent-manager/run/manager.ts
index a1b92e35c9..c3984db5fe 100644
--- a/packages/kilo-vscode/src/agent-manager/run/manager.ts
+++ b/packages/kilo-vscode/src/agent-manager/run/manager.ts
@@ -4,6 +4,7 @@ export interface RunStatus {
   worktreeId: string
   state: RunState
   exitCode?: number
+  stopped?: boolean
   signal?: string
   startedAt?: string
   finishedAt?: string
@@ -11,17 +12,27 @@ export interface RunStatus {
 }
 
 export interface RunHandle {
-  stop(): void
+  stop(): void | Promise<void>
+  /**
+   * Kill the process but retain the terminal as failed with its output,
+   * instead of dropping it (stop). Used for timeouts, where the partial
+   * output must stay reviewable.
+   */
+  kill?(reason: string): void
   dispose?(): void
 }
 
 interface Entry {
   status: RunStatus
   handle?: RunHandle
+  task?: Promise<RunHandle>
+  released?: boolean
+  stopping?: Promise<void>
 }
 
 interface FinishOptions {
   exitCode?: number
+  stopped?: boolean
   signal?: string
   error?: string
 }
@@ -42,6 +53,7 @@ export class RunScriptManager {
   ) {}
 
   async start(worktreeId: string, start: () => Promise<RunHandle>): Promise<boolean> {
+    this.removed.delete(worktreeId)
     const current = this.entries.get(worktreeId)
     if (current && current.status.state !== "idle") return false
 
@@ -56,21 +68,25 @@ export class RunScriptManager {
     this.emit(entry.status)
 
     try {
-      const handle = await start()
+      const task = start()
+      entry.task = task
+      const handle = await task
       const latest = this.entries.get(worktreeId)
       if (latest !== entry) {
-        handle.dispose?.()
+        await this.release(worktreeId, entry, handle, this.removed.has(worktreeId))
         return true
       }
       entry.handle = handle
-      if (entry.status.state === "stopping") handle.stop()
+      if (entry.status.state === "stopping") {
+        void this.halt(worktreeId, entry, handle)
+      }
     } catch (error) {
       this.finish(worktreeId, { error: message(error) })
     }
     return true
   }
 
-  stop(worktreeId: string): void {
+  async stop(worktreeId: string): Promise<void> {
     const entry = this.entries.get(worktreeId)
     if (!entry || entry.status.state === "idle" || entry.status.state === "stopping") return
 
@@ -81,11 +97,7 @@ export class RunScriptManager {
     this.emit(entry.status)
 
     if (!entry.handle) return
-    try {
-      entry.handle.stop()
-    } catch (error) {
-      this.log(`Failed to stop run script for ${worktreeId}: ${message(error)}`)
-    }
+    await this.halt(worktreeId, entry, entry.handle)
   }
 
   finish(worktreeId: string, opts: FinishOptions = {}): void {
@@ -100,6 +112,7 @@ export class RunScriptManager {
     }
     if (entry?.status.startedAt) status.startedAt = entry.status.startedAt
     if (opts.exitCode !== undefined) status.exitCode = opts.exitCode
+    if (opts.stopped) status.stopped = true
     if (opts.signal) status.signal = opts.signal
     if (opts.error) status.error = opts.error
 
@@ -115,24 +128,57 @@ export class RunScriptManager {
     return [...this.entries.values()].map((entry) => entry.status)
   }
 
-  remove(worktreeId: string): void {
+  async remove(worktreeId: string): Promise<void> {
     const entry = this.entries.get(worktreeId)
-    if (entry?.status.state !== "idle") this.stop(worktreeId)
-    this.entries.delete(worktreeId)
     this.removed.add(worktreeId)
+    this.entries.delete(worktreeId)
+    const handle =
+      entry?.handle ??
+      (entry?.task
+        ? await entry.task.catch((error) => {
+            this.log(`Failed to start removed run script for ${worktreeId}: ${message(error)}`)
+            return undefined
+          })
+        : undefined)
+    if (!entry || !handle) return
+    if (entry.status.state !== "idle") {
+      await this.release(worktreeId, entry, handle, true)
+      return
+    }
+    await this.release(worktreeId, entry, handle, false)
   }
 
   dispose(): void {
-    for (const entry of this.entries.values()) {
-      if (entry.status.state !== "idle") {
-        try {
-          entry.handle?.stop()
-        } catch (error) {
-          this.log(`Failed to stop run script during dispose: ${message(error)}`)
-        }
-      }
-      entry.handle?.dispose?.()
+    for (const [id, entry] of this.entries) {
+      this.removed.add(id)
+      if (!entry.handle || entry.released) continue
+      entry.released = true
+      if (entry.status.state !== "idle") void this.halt(id, entry, entry.handle)
+      entry.handle.dispose?.()
     }
     this.entries.clear()
   }
+
+  private async release(worktreeId: string, entry: Entry, handle: RunHandle, stop: boolean): Promise<void> {
+    if (entry.released) return
+    entry.released = true
+    if (stop) await this.halt(worktreeId, entry, handle)
+    handle.dispose?.()
+  }
+
+  private halt(worktreeId: string, entry: Entry, handle: RunHandle): Promise<void> {
+    if (entry.stopping) return entry.stopping
+    const task = (() => {
+      try {
+        return Promise.resolve(handle.stop())
+          .then(() => undefined)
+          .catch((error) => this.log(`Failed to stop run script for ${worktreeId}: ${message(error)}`))
+      } catch (error) {
+        this.log(`Failed to stop run script for ${worktreeId}: ${message(error)}`)
+        return Promise.resolve()
+      }
+    })()
+    entry.stopping = task
+    return task
+  }
 }
diff --git a/packages/kilo-vscode/src/agent-manager/run/message.ts b/packages/kilo-vscode/src/agent-manager/run/message.ts
index 1e8f21a936..0d55ed6005 100644
--- a/packages/kilo-vscode/src/agent-manager/run/message.ts
+++ b/packages/kilo-vscode/src/agent-manager/run/message.ts
@@ -1,17 +1,27 @@
 import type { AgentManagerInMessage } from "../types"
 import type { RunController } from "./controller"
 
-export function handleRunMessage(run: RunController, msg: AgentManagerInMessage): boolean {
+/**
+ * The webview sends worktreeId "local" for whichever project's local context
+ * is selected. In multi-project mode that key would collide across projects
+ * in the provider-wide RunScriptManager, so the provider passes a qualifier
+ * that namespaces it with the owning project id.
+ */
+export function handleRunMessage(
+  run: RunController,
+  msg: AgentManagerInMessage,
+  qualify?: (worktreeId: string) => string,
+): boolean {
   if (msg.type === "agentManager.configureRunScript") {
     void run.configure()
     return true
   }
   if (msg.type === "agentManager.runScript") {
-    void run.run(msg.worktreeId)
+    void run.run(qualify?.(msg.worktreeId) ?? msg.worktreeId, msg.destination)
     return true
   }
   if (msg.type === "agentManager.stopRunScript") {
-    run.stop(msg.worktreeId)
+    run.stop(qualify?.(msg.worktreeId) ?? msg.worktreeId)
     return true
   }
   return false
diff --git a/packages/kilo-vscode/src/agent-manager/run/task.ts b/packages/kilo-vscode/src/agent-manager/run/task.ts
index 0835b216af..664baf4753 100644
--- a/packages/kilo-vscode/src/agent-manager/run/task.ts
+++ b/packages/kilo-vscode/src/agent-manager/run/task.ts
@@ -1,3 +1,11 @@
+/**
+ * Legacy integrated terminal Run adapter.
+ *
+ * Kept while the Agent Manager terminal dropdown offers the "VS Code
+ * terminal" option so both execution paths can be compared. Remove this
+ * file together with that dropdown option and the integrated `pickRunStart`
+ * branch.
+ */
 import * as vscode from "vscode"
 import type { RunHandle } from "./manager"
 
diff --git a/packages/kilo-vscode/src/agent-manager/script-terminal-runtime.ts b/packages/kilo-vscode/src/agent-manager/script-terminal-runtime.ts
new file mode 100644
index 0000000000..9aa9c2a86f
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/script-terminal-runtime.ts
@@ -0,0 +1,93 @@
+import type { KiloConnectionService } from "../services/cli-backend"
+import type { OutputHandle } from "./host"
+import { ScriptTerminalManager } from "./ScriptTerminalManager"
+import { buildScriptTerminalWsUrl } from "./script-terminal-url"
+import { readTerminalFont } from "./terminal-font"
+import type { AgentManagerOutMessage } from "./types"
+import type { WorktreeStateManager } from "./WorktreeStateManager"
+import { RunController } from "./run/controller"
+import { pickRunStart } from "./run/destination"
+import { startVscodeRunTask } from "./run/task"
+
+interface Input {
+  connection: KiloConnectionService
+  output: OutputHandle
+  post(message: AgentManagerOutMessage): void
+}
+
+export function createScriptTerminalRuntime(input: Input) {
+  const manager = new ScriptTerminalManager({
+    getClient: () => input.connection.getClient(),
+    getClientAsync: (directory) => input.connection.getClientAsync(directory),
+    buildWsUrl: (ptyID, cwd) => {
+      const config = input.connection.getServerConfig()
+      if (!config) throw new Error("Not connected to CLI backend")
+      return buildScriptTerminalWsUrl(config, ptyID, cwd)
+    },
+    getTerminalFont: () => readTerminalFont(),
+    emit: (terminals) => input.post({ type: "agentManager.scriptTerminals", terminals }),
+    closed: (terminalId) => input.post({ type: "agentManager.terminal.closed", terminalId }),
+    log: (msg) => input.output.appendLine(`[RunScript] ${msg}`),
+  })
+  const event = input.connection.onEventFiltered(
+    (value) => (value.type === "pty.exited" || value.type === "pty.deleted") && manager.owns(value.properties.id),
+    (value) => {
+      if (value.type === "pty.exited") manager.exited(value.properties.id, value.properties.exitCode)
+      if (value.type === "pty.deleted") manager.deleted(value.properties.id)
+    },
+  )
+  const connection = input.connection.onStateChange((state) => {
+    if (state === "connected") void manager.sync()
+  })
+  return {
+    manager,
+    dispose: async () => {
+      event()
+      connection()
+      await manager.dispose()
+    },
+  }
+}
+
+interface RunInput {
+  manager: ScriptTerminalManager
+  root(): string | undefined
+  state(): WorktreeStateManager | undefined
+  project?(worktreeId: string): string | undefined
+  open(path: string): Promise<void>
+  trusted(): boolean
+  post(message: AgentManagerOutMessage): void
+  log(message: string): void
+  refresh(): void
+}
+
+/** Stop and remove any Run/Setup script terminals owned by a worktree. */
+export async function clearScriptTerminals(
+  manager: ScriptTerminalManager,
+  worktreeId: string,
+  projectId?: string,
+): Promise<boolean> {
+  const run = await manager.clear("run", worktreeId, projectId)
+  const setup = await manager.clear("setup", worktreeId, projectId)
+  return run && setup
+}
+
+export function createRunController(input: RunInput) {
+  return new RunController({
+    root: input.root,
+    state: input.state,
+    open: input.open,
+    start: async (config, done) => {
+      if (!input.trusted()) throw new Error("Trust the workspace before running scripts")
+      return pickRunStart(
+        config.destination,
+        (cfg, cb) => input.manager.start("run", { ...cfg, projectId: input.project?.(cfg.worktreeId) }, cb),
+        startVscodeRunTask,
+      )(config, done)
+    },
+    post: (status) => input.post({ type: "agentManager.runStatus", ...status }),
+    error: (message) => input.post({ type: "error", message }),
+    log: input.log,
+    refresh: input.refresh,
+  })
+}
diff --git a/packages/kilo-vscode/src/agent-manager/script-terminal-url.ts b/packages/kilo-vscode/src/agent-manager/script-terminal-url.ts
new file mode 100644
index 0000000000..8151b460ee
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/script-terminal-url.ts
@@ -0,0 +1,17 @@
+export interface PtyServerConfig {
+  baseUrl: string
+  password: string
+}
+
+/** Build the canonical authenticated PTY WebSocket URL for script terminals. */
+export function buildScriptTerminalWsUrl(config: PtyServerConfig, ptyID: string, cwd: string): string {
+  const base = config.baseUrl.replace(/^http/i, "ws").replace(/\/$/, "")
+  const token = Buffer.from(`kilo:${config.password}`).toString("base64")
+  const query = new URLSearchParams({
+    "location[directory]": cwd,
+    cursor: "0",
+    replayExited: "1",
+    auth_token: token,
+  })
+  return `${base}/api/pty/${encodeURIComponent(ptyID)}/connect?${query.toString()}`
+}
diff --git a/packages/kilo-vscode/src/agent-manager/section-handler.ts b/packages/kilo-vscode/src/agent-manager/section-handler.ts
index 624a23eb10..01bbd0c6cd 100644
--- a/packages/kilo-vscode/src/agent-manager/section-handler.ts
+++ b/packages/kilo-vscode/src/agent-manager/section-handler.ts
@@ -1,13 +1,27 @@
 import type { WorktreeStateManager } from "./WorktreeStateManager"
 import type { AgentManagerInMessage } from "./types"
 
+const SECTION_TYPES = new Set<string>([
+  "agentManager.createSection",
+  "agentManager.renameSection",
+  "agentManager.deleteSection",
+  "agentManager.setSectionColor",
+  "agentManager.toggleSectionCollapsed",
+  "agentManager.moveToSection",
+  "agentManager.moveSection",
+])
+
 /** Handle section CRUD messages. Returns true if handled. */
 export function handleSection(
   state: WorktreeStateManager | undefined,
   m: AgentManagerInMessage,
   push: () => void,
+  log?: (...args: unknown[]) => void,
 ): boolean {
-  if (!state) return false
+  if (!state) {
+    if (SECTION_TYPES.has(m.type)) log?.(`handleSection: ${m.type} dropped, state missing`)
+    return false
+  }
   if (m.type === "agentManager.createSection") state.addSection(m.name, m.color ?? null, m.worktreeIds)
   else if (m.type === "agentManager.renameSection") state.renameSection(m.sectionId, m.name)
   else if (m.type === "agentManager.deleteSection") state.deleteSection(m.sectionId)
diff --git a/packages/kilo-vscode/src/agent-manager/setup-script-task.ts b/packages/kilo-vscode/src/agent-manager/setup-script-task.ts
new file mode 100644
index 0000000000..f001955976
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/setup-script-task.ts
@@ -0,0 +1,176 @@
+/**
+ * Embedded setup-script execution through the canonical PTY script-terminal
+ * runtime. Selected by the Agent Manager terminal destination; the VS Code
+ * task runner (task-runner.ts) remains the integrated-terminal path. Remove
+ * the integrated path together with the "VS Code terminal" dropdown option
+ * once the embedded path is the only one.
+ *
+ * Exit-code semantics mirror task-runner.ts: resolve with the exit code
+ * (undefined when unknown), reject on execution errors and timeout. The
+ * SetupScriptRunner treats every outcome as best-effort, so worktree
+ * creation continues even when the script fails.
+ */
+
+import { getShellEnvironment } from "./shell-env"
+import { SetupScriptRunner, type RunTask } from "./SetupScriptRunner"
+import type { SetupScriptService } from "./SetupScriptService"
+import type { RunHandle } from "./run/manager"
+import type { ScriptTerminalManager } from "./ScriptTerminalManager"
+import type { TerminalDestination } from "./terminal-destination"
+import type { AgentManagerOutMessage } from "./types"
+
+const TIMEOUT_MS = 5 * 60 * 1000
+
+/** Reconcile cadence while a script runs: a lost exit event otherwise
+ *  stalls the awaited setup (and its tab) until the full timeout. */
+const WATCHDOG_MS = 15_000
+
+interface Input {
+  manager: ScriptTerminalManager
+  projectId?: string
+  worktreeId: string
+  trusted(): boolean
+  log(msg: string): void
+  /** Test hook; defaults to the same five minutes as task-runner.ts. */
+  timeoutMs?: number
+  /** Test hook; defaults to a 15s reconcile cadence while the script runs. */
+  watchdogMs?: number
+  /** Test hook; defaults to the login-shell (posix) / extension-host (win32) environment. */
+  env?: () => Promise<Record<string, string>>
+}
+
+interface PickInput extends Omit<Input, "worktreeId"> {
+  destination: TerminalDestination
+  worktreeId: string | undefined
+  /** Integrated-terminal task runner, used whenever the embedded path is off. */
+  vscode: RunTask
+}
+
+/**
+ * Pick where a worktree setup script executes. The terminal destination
+ * dropdown owns the choice. The embedded path enforces workspace trust
+ * itself; it never silently redirects a selected destination to VS Code.
+ */
+export function pickSetupTask(input: PickInput): RunTask {
+  const worktreeId = input.worktreeId
+  if (input.destination !== "agentManager" || !worktreeId) return input.vscode
+  return createSetupScriptTask({
+    manager: input.manager,
+    projectId: input.projectId,
+    worktreeId,
+    trusted: input.trusted,
+    log: input.log,
+    timeoutMs: input.timeoutMs,
+    env: input.env,
+  })
+}
+
+interface FlowInput extends PickInput {
+  service: SetupScriptService | undefined
+  branch?: string
+  post(message: AgentManagerOutMessage): void
+}
+
+/** Run the configured setup script for a worktree and wait for it to finish. */
+export async function runWorktreeSetupScript(
+  input: FlowInput,
+  env: { worktreePath: string; repoPath: string },
+): Promise<void> {
+  const service = input.service
+  if (!service || !service.hasScript()) return
+  input.post({
+    type: "agentManager.worktreeSetup",
+    projectId: input.projectId,
+    status: "creating",
+    message: "Running setup script...",
+    branch: input.branch,
+    worktreeId: input.worktreeId,
+  })
+  const runner = new SetupScriptRunner(input.log, service, pickSetupTask(input), (message) => {
+    if (message === "Setup script was stopped") return
+    input.post({
+      type: "agentManager.worktreeSetup",
+      projectId: input.projectId,
+      status: "error",
+      message,
+      branch: input.branch,
+      worktreeId: input.worktreeId,
+    })
+  })
+  await runner.runIfConfigured(env)
+}
+
+export function createSetupScriptTask(input: Input): RunTask {
+  return async (config) => {
+    if (!input.trusted()) throw new Error("Trust the workspace before running setup scripts")
+    const env = { ...(await (input.env ?? getShellEnvironment)()), ...config.env }
+    const ms = input.timeoutMs ?? TIMEOUT_MS
+    return new Promise<number | undefined>((resolve, reject) => {
+      let handle: RunHandle | undefined
+      let settled = false
+      let expired = false
+      const settle = (action: () => void) => {
+        if (settled) return
+        settled = true
+        clearTimeout(timer)
+        clearInterval(watchdog)
+        action()
+      }
+      const halt = (target: RunHandle, reason: string) => {
+        // Keep the tab with its partial output when the handle can kill;
+        // only fall back to dropping it for handles without kill support.
+        if (target.kill) {
+          target.kill(reason)
+          return
+        }
+        void Promise.resolve(target.stop()).catch((error) => {
+          input.log(`Failed to stop Setup terminal: ${error instanceof Error ? error.message : String(error)}`)
+        })
+      }
+      const expire = () => {
+        expired = true
+        settle(() => reject(new Error("Setup script timed out after 5 minutes")))
+        if (handle) halt(handle, "Setup script timed out after 5 minutes")
+      }
+      // The first budget covers connect + create; once the PTY is running
+      // the script itself gets a fresh full budget, so a slow backend start
+      // never eats into its five minutes.
+      let timer = setTimeout(expire, ms)
+      // Exit events are the primary signal; reconcile periodically so a
+      // lost event cannot leave the script (and worktree creation) stuck.
+      const watchdog = setInterval(() => {
+        void input.manager.sync().catch((error) => {
+          input.log(`Setup terminal reconcile failed: ${error instanceof Error ? error.message : String(error)}`)
+        })
+      }, input.watchdogMs ?? WATCHDOG_MS)
+
+      input.manager
+        .start("setup", { ...config, env, projectId: input.projectId, worktreeId: input.worktreeId }, (exit) => {
+          if (exit.error) {
+            settle(() => reject(new Error(exit.error)))
+            return
+          }
+          if (exit.stopped) {
+            settle(() => reject(new Error("Setup script was stopped")))
+            return
+          }
+          settle(() => resolve(exit.exitCode))
+        })
+        .then(
+          (created) => {
+            handle = created
+            if (settled) {
+              // Only an expired timer may kill a late handle. A natural
+              // settle (fast exit observed during creation) must keep the
+              // exited terminal and its retained output alive.
+              if (expired) halt(created, "Setup script timed out after 5 minutes")
+              return
+            }
+            clearTimeout(timer)
+            timer = setTimeout(expire, ms)
+          },
+          (error) => settle(() => reject(error instanceof Error ? error : new Error(String(error)))),
+        )
+    })
+  }
+}
diff --git a/packages/kilo-vscode/src/agent-manager/shell-env.ts b/packages/kilo-vscode/src/agent-manager/shell-env.ts
index 1b6e61d7f1..9644f65d2f 100644
--- a/packages/kilo-vscode/src/agent-manager/shell-env.ts
+++ b/packages/kilo-vscode/src/agent-manager/shell-env.ts
@@ -61,6 +61,15 @@ function parseEnvOutput(stdout: string): Record<string, string> {
  * Results are cached for 1 minute (10 seconds when the fallback was used).
  */
 export async function getShellEnvironment(): Promise<Record<string, string>> {
+  // Windows has no login shell to resolve; the extension-host environment
+  // already is the user's environment.
+  if (process.platform === "win32") {
+    const env: Record<string, string> = {}
+    for (const [key, value] of Object.entries(process.env)) {
+      if (typeof value === "string") env[key] = value
+    }
+    return env
+  }
   const now = Date.now()
   const ttl = wasFallback ? FALLBACK_TTL : TTL
   if (cached && now - cacheTime < ttl) return { ...cached }
diff --git a/packages/kilo-vscode/src/agent-manager/terminal-destination.ts b/packages/kilo-vscode/src/agent-manager/terminal-destination.ts
index f6fbceb591..fc334b7c6b 100644
--- a/packages/kilo-vscode/src/agent-manager/terminal-destination.ts
+++ b/packages/kilo-vscode/src/agent-manager/terminal-destination.ts
@@ -24,6 +24,45 @@ export function readTerminalDestination(): TerminalDestination {
   return resolveTerminalDestination(config.get("terminalButtonDestination"))
 }
 
+async function writeTerminalDestination(destination: TerminalDestination): Promise<void> {
+  const config = vscode.workspace.getConfiguration("kilo-code.new.agentManager")
+  await config.update("terminalButtonDestination", destination, vscode.ConfigurationTarget.Global)
+}
+
+/** Per-panel destination source of truth; local choices beat setting echoes. */
+export class DestinationState {
+  private local = false
+
+  constructor(private destination = readTerminalDestination()) {}
+
+  value(): TerminalDestination {
+    return this.destination
+  }
+
+  sync(destination: TerminalDestination): void {
+    if (!this.local) this.destination = destination
+  }
+
+  select(destination: TerminalDestination): void {
+    this.local = true
+    this.destination = destination
+  }
+}
+
+export function handleDestination(
+  state: DestinationState,
+  message: { type: string; destination?: unknown },
+  log: (message: string) => void,
+): boolean {
+  if (message.type !== "agentManager.terminal.destinationSelected") return false
+  const destination = resolveTerminalDestination(message.destination)
+  state.select(destination)
+  void writeTerminalDestination(destination).catch((error) => {
+    log(`Failed to persist terminal destination: ${error instanceof Error ? error.message : String(error)}`)
+  })
+  return true
+}
+
 export function affectsTerminalDestination(e: vscode.ConfigurationChangeEvent): boolean {
   return e.affectsConfiguration(KEY)
 }
diff --git a/packages/kilo-vscode/src/agent-manager/terminal-manager.ts b/packages/kilo-vscode/src/agent-manager/terminal-manager.ts
index c1662d92b3..9f3d030728 100644
--- a/packages/kilo-vscode/src/agent-manager/terminal-manager.ts
+++ b/packages/kilo-vscode/src/agent-manager/terminal-manager.ts
@@ -113,6 +113,16 @@ export class TerminalManager {
     }
   }
 
+  /** Titles of every live terminal in a context — used by the router to
+   *  pick the lowest free "Terminal N" ordinal. */
+  titles(worktreeId: string | null): string[] {
+    const out: string[] = []
+    for (const entry of this.entries.values()) {
+      if (entry.worktreeId === worktreeId) out.push(entry.title)
+    }
+    return out
+  }
+
   /** Kill a single terminal. Best-effort — we always drop our bookkeeping.
    *  The SDK's `pty.remove` returns `{ data, error }` without throwing
    *  on 4xx/5xx, so we have to check `error` ourselves; otherwise a
diff --git a/packages/kilo-vscode/src/agent-manager/terminal-routing.ts b/packages/kilo-vscode/src/agent-manager/terminal-routing.ts
index 566952f9b2..0de5399600 100644
--- a/packages/kilo-vscode/src/agent-manager/terminal-routing.ts
+++ b/packages/kilo-vscode/src/agent-manager/terminal-routing.ts
@@ -26,6 +26,8 @@ interface ServerConfig {
 export interface TerminalRoutingDeps {
   /** Shared SDK client. Throws when the CLI backend is not connected. */
   getClient(): KiloClient
+  /** Shared SDK client, connecting the CLI backend when needed. */
+  getClientAsync(): Promise<KiloClient>
   /** Loopback URL + basic-auth password for the running `kilo serve`. */
   getServerConfig(): ServerConfig | undefined
   /** Workspace root — used as cwd fallback when no worktree is selected (LOCAL). */
@@ -43,7 +45,10 @@ export interface TerminalRoutingDeps {
 /** True iff the message belongs to the terminal-tab subsystem. */
 function isTerminalMessage(
   m: AgentManagerInMessage,
-): m is Extract<AgentManagerInMessage, { type: `agentManager.terminal.${string}` }> {
+): m is Exclude<
+  Extract<AgentManagerInMessage, { type: `agentManager.terminal.${string}` }>,
+  { type: "agentManager.terminal.stop" | "agentManager.terminal.destinationSelected" }
+> {
   return (
     m.type === "agentManager.terminal.create" ||
     m.type === "agentManager.terminal.close" ||
@@ -53,7 +58,9 @@ function isTerminalMessage(
 
 export class TerminalRouter {
   private manager: TerminalManager
-  private readonly ordinals = new Map<string, number>()
+  /** Ordinals reserved by in-flight creates, per context — prevents two
+   *  concurrent creates from grabbing the same "Terminal N" title. */
+  private readonly reserved = new Map<string, Set<number>>()
   private generation = 0
 
   constructor(private readonly deps: TerminalRoutingDeps) {
@@ -100,6 +107,7 @@ export class TerminalRouter {
     this.generation++
     const manager = this.manager
     this.manager = this.createManager()
+    this.reserved.clear()
     return manager.dispose()
   }
 
@@ -117,8 +125,12 @@ export class TerminalRouter {
       })
       return
     }
-    const title = `Terminal ${this.nextOrdinal(worktreeId)}`
+    const ordinal = this.reserveOrdinal(worktreeId)
+    const title = `Terminal ${ordinal}`
     try {
+      // Join the shared backend connection instead of racing its synchronous
+      // client accessor when this is the first Kilo action in the window.
+      await this.deps.getClientAsync()
       const created = await manager.create({ worktreeId, cwd, title })
       if (generation !== this.generation) {
         await manager.close(created.terminalId)
@@ -139,6 +151,11 @@ export class TerminalRouter {
       const message = err instanceof Error ? err.message : String(err)
       this.deps.log(`Terminal create failed: ${message}`)
       this.deps.post({ type: "agentManager.terminal.error", createId, message })
+    } finally {
+      // Only a current-generation create may release: dispose() already
+      // cleared this create's reservation, and releasing here would
+      // delete a *new* panel's reservation for the same number.
+      if (generation === this.generation) this.releaseOrdinal(worktreeId, ordinal)
     }
   }
 
@@ -156,15 +173,40 @@ export class TerminalRouter {
     return this.deps.getWorktreePath(worktreeId)
   }
 
-  /** Per-context counter so default titles are "Terminal 1", "Terminal 2"…
-   *  Not persisted; a webview reload resets counts. */
-  private nextOrdinal(worktreeId: string | null): number {
+  /**
+   * Pick the lowest "Terminal N" ordinal not used by a live terminal or
+   * an in-flight create in this context, and reserve it until the
+   * create settles. Gap-filling keeps numbering consistent: closing
+   * "Terminal 1" of three frees 1 for the next terminal, instead of
+   * drifting to ever-higher numbers. Not persisted; a webview reload
+   * resets the live set.
+   */
+  private reserveOrdinal(worktreeId: string | null): number {
     const key = worktreeId ?? "__local__"
-    const next = (this.ordinals.get(key) ?? 0) + 1
-    this.ordinals.set(key, next)
+    const used = new Set<number>()
+    for (const title of this.manager.titles(worktreeId)) {
+      const match = /^Terminal (\d+)$/.exec(title)
+      if (match) used.add(Number(match[1]))
+    }
+    const pending = this.reserved.get(key)
+    if (pending) for (const n of pending) used.add(n)
+    let next = 1
+    while (used.has(next)) next++
+    const set = pending ?? new Set<number>()
+    set.add(next)
+    this.reserved.set(key, set)
     return next
   }
 
+  /** Return an in-flight create's reservation. */
+  private releaseOrdinal(worktreeId: string | null, ordinal: number) {
+    const key = worktreeId ?? "__local__"
+    const set = this.reserved.get(key)
+    if (!set) return
+    set.delete(ordinal)
+    if (set.size === 0) this.reserved.delete(key)
+  }
+
   /**
    * Build the WebSocket URL for a given PTY.
    *
@@ -182,6 +224,9 @@ export class TerminalRouter {
     const token = Buffer.from(`kilo:${config.password}`).toString("base64")
     const dir = encodeURIComponent(cwd)
     const auth = encodeURIComponent(token)
-    return `${base}/pty/${encodeURIComponent(ptyID)}/connect?directory=${dir}&cursor=-1&auth_token=${auth}`
+    // A new terminal has one initial attachment. Replay its retained startup
+    // bytes so xterm can answer shell capability queries emitted before the
+    // WebSocket connected; tailing from -1 can make shells wait for a timeout.
+    return `${base}/pty/${encodeURIComponent(ptyID)}/connect?directory=${dir}&cursor=0&auth_token=${auth}`
   }
 }
diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts
index 8950c68d22..6e26186d4d 100644
--- a/packages/kilo-vscode/src/agent-manager/types.ts
+++ b/packages/kilo-vscode/src/agent-manager/types.ts
@@ -15,9 +15,13 @@ import type { ApplyConflict } from "./GitOps"
 import type { BranchListItem, WorktreeSetupErrorCode } from "./git-import"
 import type { RunStatus } from "./run/manager"
 import type { TerminalFont } from "./terminal-font"
+import type { ProjectSnapshot } from "./project/contexts"
+import type { SidebarTarget } from "./project/route"
 import type { TerminalDestination } from "./terminal-destination"
+import type { ScriptTerminalView } from "./ScriptTerminalManager"
 
 export type { TerminalFont }
+export type { ProjectSnapshot }
 
 /** Where a terminal lives: main tab strip or right-side inspector panel. */
 export type TerminalPlacement = "tab" | "side"
@@ -97,16 +101,22 @@ export interface PRStatus {
 
 interface WorktreeStatsMessage {
   type: "agentManager.worktreeStats"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   stats: WorktreeStats[]
 }
 
 interface LocalStatsMessage {
   type: "agentManager.localStats"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   stats: LocalStats
 }
 
 interface WorktreeSetupMessage {
   type: "agentManager.worktreeSetup"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   status: "creating" | "starting" | "ready" | "error"
   message: string
   sessionId?: string
@@ -132,9 +142,41 @@ interface StateMessage {
   runStatuses?: RunStatus[]
   runScriptConfigured?: boolean
   runScriptPath?: string
+  /** Owning project for this state payload. Absent in legacy single-project payloads. */
+  projectId?: string
+  /** Last selected sidebar target for seamless project-switch restore. */
+  activeTarget?: SidebarTarget
   terminalDestination?: TerminalDestination
 }
 
+/** Project catalog pushed to the webview after registry or context changes. */
+interface ProjectsMessage {
+  type: "agentManager.projects"
+  /** Whether the multi-project experiment is enabled. */
+  multiProject: boolean
+  projects: ProjectSnapshot[]
+}
+
+interface SelectionActivatedMessage {
+  type: "agentManager.selectionActivated"
+  target: SidebarTarget
+}
+
+interface ProjectSessionsMessage {
+  type: "agentManager.projectSessions"
+  projectId: string
+  sessions: Array<{
+    id: string
+    parentID?: string | null
+    title?: string
+    createdAt: string
+    updatedAt: string
+    worktreeId: string | null
+    revert?: unknown
+    summary?: unknown
+  }>
+}
+
 // ---------------------------------------------------------------------------
 // Terminal messages
 // ---------------------------------------------------------------------------
@@ -177,6 +219,11 @@ interface TerminalFontChangedMessage {
   font: TerminalFont
 }
 
+interface ScriptTerminalsMessage {
+  type: "agentManager.scriptTerminals"
+  terminals: ScriptTerminalView[]
+}
+
 interface ErrorOutMessage {
   type: "error"
   message: string
@@ -229,6 +276,7 @@ interface SendInitialMessage {
 
 interface BranchesMessage {
   type: "agentManager.branches"
+  projectId?: string
   branches: (BranchListItem & { isCheckedOut?: boolean })[]
   defaultBranch: string
 }
@@ -265,6 +313,13 @@ interface WorktreeDiffLoadingMessage {
   loading: boolean
 }
 
+/** Source-level notice for a diff context (e.g. snapshots disabled). */
+interface WorktreeDiffNoticeMessage {
+  type: "agentManager.worktreeDiffNotice"
+  sessionId: string
+  notice?: string
+}
+
 interface WorktreeDiffMessage {
   type: "agentManager.worktreeDiff"
   sessionId: string
@@ -286,8 +341,22 @@ interface RevertWorktreeFileResultMessage {
   message: string
 }
 
+/** Branch picker data for a context's diff directory. */
+interface DiffBranchesMessage {
+  type: "agentManager.diffBranches"
+  sessionId: string
+  branches: BranchListItem[]
+  defaultBranch: string
+  autoBase?: string
+  currentBase?: string
+  isAuto: boolean
+  currentBranch?: string
+}
+
 interface PRStatusOutMessage {
   type: "agentManager.prStatus"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   worktreeId: string
   pr: PRStatus | null
   error?: "gh_missing" | "gh_auth" | "fetch_failed"
@@ -300,6 +369,8 @@ interface ActionOutMessage {
 
 interface RunStatusMessage extends RunStatus {
   type: "agentManager.runStatus"
+  /** Owning project for this status. Absent in legacy single-project mode. */
+  projectId?: string
 }
 
 /** All messages the Agent Manager extension sends to the webview. */
@@ -308,6 +379,9 @@ export type AgentManagerOutMessage =
   | LocalStatsMessage
   | WorktreeSetupMessage
   | StateMessage
+  | ProjectsMessage
+  | SelectionActivatedMessage
+  | ProjectSessionsMessage
   | ErrorOutMessage
   | SessionAddedMessage
   | SessionForkedMessage
@@ -321,9 +395,11 @@ export type AgentManagerOutMessage =
   | RepoInfoMessage
   | ApplyWorktreeDiffResultMessage
   | WorktreeDiffLoadingMessage
+  | WorktreeDiffNoticeMessage
   | WorktreeDiffMessage
   | WorktreeDiffFileMessage
   | RevertWorktreeFileResultMessage
+  | DiffBranchesMessage
   | PRStatusOutMessage
   | ActionOutMessage
   | RunStatusMessage
@@ -332,6 +408,7 @@ export type AgentManagerOutMessage =
   | TerminalErrorMessage
   | TerminalDestinationChangedMessage
   | TerminalFontChangedMessage
+  | ScriptTerminalsMessage
 
 // ---------------------------------------------------------------------------
 // Webview → Extension messages (onMessage)
@@ -341,25 +418,80 @@ interface CreateWorktreeIn {
   type: "agentManager.createWorktree"
   baseBranch?: string
   branchName?: string
+  /** Target project. Must match the active project when present; mismatches are dropped. */
+  projectId?: string
+}
+
+/** Request the current project catalog. */
+interface RequestProjectsIn {
+  type: "agentManager.requestProjects"
+}
+
+/** Add a repository as a project via the host folder picker. */
+interface AddProjectIn {
+  type: "agentManager.addProject"
+}
+
+/** Remove a project from the catalog. Never deletes repository data. */
+interface RemoveProjectIn {
+  type: "agentManager.removeProject"
+  projectId: string
+}
+
+/** Make a project the active context. */
+interface SelectProjectIn {
+  type: "agentManager.selectProject"
+  projectId: string
+}
+
+interface ActivateSelectionIn {
+  type: "agentManager.activateSelection"
+  target: SidebarTarget
+  /** Resolve the project's persisted target instead of using `target` verbatim. */
+  restore?: boolean
+}
+
+/** Persist the webview's current selection for seamless restore after switching back. */
+interface RememberTargetIn {
+  type: "agentManager.rememberTarget"
+  projectId: string
+  target: SidebarTarget
+}
+
+/** Expand or collapse a project accordion without changing the active project. */
+interface SetProjectExpandedIn {
+  type: "agentManager.setProjectExpanded"
+  projectId: string
+  expanded: boolean
+}
+
+/** Grant a project permission to run project-controlled scripts and load state. */
+interface TrustProjectIn {
+  type: "agentManager.trustProject"
+  projectId: string
 }
 
 interface DeleteWorktreeIn {
   type: "agentManager.deleteWorktree"
+  projectId?: string
   worktreeId: string
 }
 
 interface RemoveStaleWorktreeIn {
   type: "agentManager.removeStaleWorktree"
+  projectId?: string
   worktreeId: string
 }
 
 interface PromoteSessionIn {
   type: "agentManager.promoteSession"
+  projectId?: string
   sessionId: string
 }
 
 interface OpenLocallyIn {
   type: "agentManager.openLocally"
+  projectId?: string
   sessionId: string
 }
 
@@ -389,15 +521,19 @@ interface ForgetSessionIn {
 
 interface ConfigureSetupScriptIn {
   type: "agentManager.configureSetupScript"
+  projectId?: string
 }
 
 interface ConfigureRunScriptIn {
   type: "agentManager.configureRunScript"
+  projectId?: string
 }
 
 interface RunScriptIn {
   type: "agentManager.runScript"
+  projectId?: string
   worktreeId: string
+  destination: TerminalDestination
 }
 
 interface StopRunScriptIn {
@@ -414,8 +550,14 @@ interface ShowLocalTerminalIn {
   type: "agentManager.showLocalTerminal"
 }
 
+interface ShowWorktreeTerminalIn {
+  type: "agentManager.showWorktreeTerminal"
+  worktreeId: string
+}
+
 interface OpenWorktreeIn {
   type: "agentManager.openWorktree"
+  projectId?: string
   worktreeId: string
 }
 
@@ -434,6 +576,7 @@ interface RequestRepoInfoIn {
 
 interface CreateMultiVersionIn {
   type: "agentManager.createMultiVersion"
+  projectId?: string
   text?: string
   name?: string
   versions?: number
@@ -451,6 +594,7 @@ interface CreateMultiVersionIn {
 
 interface RenameWorktreeIn {
   type: "agentManager.renameWorktree"
+  projectId?: string
   worktreeId: string
   label: string
 }
@@ -461,6 +605,7 @@ interface RequestStateIn {
 
 interface RequestBranchesIn {
   type: "agentManager.requestBranches"
+  projectId?: string
 }
 
 interface SetTabOrderIn {
@@ -476,6 +621,7 @@ interface SetWorktreeOrderIn {
 
 interface SetSessionsCollapsedIn {
   type: "agentManager.setSessionsCollapsed"
+  projectId?: string
   collapsed: boolean
 }
 
@@ -496,22 +642,26 @@ interface SetReviewMarkdownRenderIn {
 
 interface SetDefaultBaseBranchIn {
   type: "agentManager.setDefaultBaseBranch"
+  projectId?: string
   branch?: string
 }
 
 interface ImportFromBranchIn {
   type: "agentManager.importFromBranch"
+  projectId?: string
   branch: string
 }
 
 interface ImportFromPRIn {
   type: "agentManager.importFromPR"
+  projectId?: string
   url: string
 }
 
 interface RequestWorktreeDiffIn {
   type: "agentManager.requestWorktreeDiff"
   sessionId: string
+  scope?: string
 }
 
 interface ApplyWorktreeDiffIn {
@@ -524,11 +674,17 @@ interface RequestWorktreeDiffFileIn {
   type: "agentManager.requestWorktreeDiffFile"
   sessionId: string
   file: string
+  scope?: string
+  /** Active session for the session scope (ctx alone is a worktree/local id). */
+  diffSessionId?: string
 }
 
 interface StartDiffWatchIn {
   type: "agentManager.startDiffWatch"
   sessionId: string
+  scope?: string
+  /** Active session for the session scope (ctx alone is a worktree/local id). */
+  diffSessionId?: string
 }
 
 interface StopDiffWatchIn {
@@ -539,6 +695,20 @@ interface RevertWorktreeFileIn {
   type: "agentManager.revertWorktreeFile"
   sessionId: string
   file: string
+  scope?: string
+}
+
+interface RequestDiffBranchesIn {
+  type: "agentManager.requestDiffBranches"
+  sessionId: string
+  scope?: string
+}
+
+interface SetDiffBaseBranchIn {
+  type: "agentManager.setDiffBaseBranch"
+  sessionId: string
+  scope?: string
+  branch?: string
 }
 
 interface RefreshPRIn {
@@ -548,6 +718,7 @@ interface RefreshPRIn {
 
 interface OpenPRIn {
   type: "agentManager.openPR"
+  projectId?: string
   worktreeId: string
 }
 
@@ -698,6 +869,7 @@ interface ContinueInWorktreeIn {
 
 interface CreateSectionIn {
   type: "agentManager.createSection"
+  projectId?: string
   name: string
   color?: string
   worktreeIds?: string[]
@@ -705,34 +877,40 @@ interface CreateSectionIn {
 
 interface RenameSectionIn {
   type: "agentManager.renameSection"
+  projectId?: string
   sectionId: string
   name: string
 }
 
 interface DeleteSectionIn {
   type: "agentManager.deleteSection"
+  projectId?: string
   sectionId: string
 }
 
 interface SetSectionColorIn {
   type: "agentManager.setSectionColor"
+  projectId?: string
   sectionId: string
   color: string | null
 }
 
 interface ToggleSectionCollapsedIn {
   type: "agentManager.toggleSectionCollapsed"
+  projectId?: string
   sectionId: string
 }
 
 interface MoveToSectionIn {
   type: "agentManager.moveToSection"
+  projectId?: string
   worktreeIds: string[]
   sectionId: string | null
 }
 
 interface MoveSectionIn {
   type: "agentManager.moveSection"
+  projectId?: string
   sectionId: string
   dir: -1 | 1
 }
@@ -755,6 +933,11 @@ interface TerminalCloseIn {
   terminalId: string
 }
 
+interface TerminalStopIn {
+  type: "agentManager.terminal.stop"
+  terminalId: string
+}
+
 interface TerminalResizeIn {
   type: "agentManager.terminal.resize"
   terminalId: string
@@ -762,9 +945,22 @@ interface TerminalResizeIn {
   rows: number
 }
 
+interface TerminalDestinationSelectedIn {
+  type: "agentManager.terminal.destinationSelected"
+  destination: TerminalDestination
+}
+
 /** All messages the Agent Manager expects from the webview (onMessage input). */
 export type AgentManagerInMessage =
   | CreateWorktreeIn
+  | RequestProjectsIn
+  | AddProjectIn
+  | RemoveProjectIn
+  | SelectProjectIn
+  | ActivateSelectionIn
+  | RememberTargetIn
+  | SetProjectExpandedIn
+  | TrustProjectIn
   | DeleteWorktreeIn
   | RemoveStaleWorktreeIn
   | PromoteSessionIn
@@ -780,6 +976,7 @@ export type AgentManagerInMessage =
   | StopRunScriptIn
   | ShowTerminalIn
   | ShowLocalTerminalIn
+  | ShowWorktreeTerminalIn
   | OpenWorktreeIn
   | CopyToClipboardIn
   | ShowExistingLocalTerminalIn
@@ -803,6 +1000,8 @@ export type AgentManagerInMessage =
   | StartDiffWatchIn
   | StopDiffWatchIn
   | RevertWorktreeFileIn
+  | RequestDiffBranchesIn
+  | SetDiffBaseBranchIn
   | RefreshPRIn
   | OpenPRIn
   | OpenSessionsIn
@@ -831,4 +1030,6 @@ export type AgentManagerInMessage =
   | MoveSectionIn
   | TerminalCreateIn
   | TerminalCloseIn
+  | TerminalStopIn
   | TerminalResizeIn
+  | TerminalDestinationSelectedIn
diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
index fc5dfd0107..4e1528f8a9 100644
--- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts
+++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
@@ -6,7 +6,9 @@
  */
 
 import * as vscode from "vscode"
-import type { Host, PanelContext, OutputHandle, SessionProvider } from "./host"
+import type { Session } from "@kilocode/sdk/v2/client"
+import type { Host, PanelContext, OutputHandle, SessionProvider, Disposable } from "./host"
+import { ProjectRouteService } from "./project/route"
 import type { KiloConnectionService } from "../services/cli-backend"
 import { KiloProvider } from "../KiloProvider"
 import { PLATFORM, SNAPSHOT_INITIALIZATION } from "./constants"
@@ -20,6 +22,12 @@ import type { RemoteStatusService } from "../services/RemoteStatusService"
 export class VscodeHost implements Host {
   private diffVirtual: DiffVirtualProvider | undefined
   private autoApprove: AutoApproveController | undefined
+  /**
+   * Shared project route registry for every Agent Manager panel opened by
+   * this host. One service keeps raw session id ambiguity consistent across
+   * panels, so two panels never disagree about whether an id is ambiguous.
+   */
+  private readonly routes = new ProjectRouteService()
 
   constructor(
     private readonly extensionUri: vscode.Uri,
@@ -59,6 +67,8 @@ export class VscodeHost implements Host {
     opts: {
       onBeforeMessage: (msg: Record<string, unknown>) => Promise<Record<string, unknown> | null>
       worktreeDirectories?: () => string[]
+      workspaceRoot?: () => string | undefined
+      projectId?: () => string | undefined
     },
   ): PanelContext {
     return this.wirePanel(panel, opts)
@@ -69,6 +79,8 @@ export class VscodeHost implements Host {
     opts: {
       onBeforeMessage: (msg: Record<string, unknown>) => Promise<Record<string, unknown> | null>
       worktreeDirectories?: () => string[]
+      workspaceRoot?: () => string | undefined
+      projectId?: () => string | undefined
     },
   ): PanelContext {
     panel.webview.options = {
@@ -96,7 +108,13 @@ export class VscodeHost implements Host {
       snapshotInitialization: SNAPSHOT_INITIALIZATION,
       slimEditMetadata: true,
       worktreeDirectories: () => opts.worktreeDirectories?.() ?? [],
+      rootDirectory: opts.workspaceRoot,
       disableViewedRegistration: true,
+      routeService: this.routes,
+      projectQualifier: () => {
+        const projectId = opts.projectId?.()
+        return projectId ? { projectId } : undefined
+      },
     })
     if (this.diffVirtual) {
       provider.setDiffVirtualProvider(this.diffVirtual)
@@ -116,6 +134,7 @@ export class VscodeHost implements Host {
       clearSessionDirectory: (id) => provider.clearSessionDirectory(id),
       getSessionDirectories: () => provider.getSessionDirectories(),
       getSessionInfo: (id) => provider.getSessionInfo(id),
+      listSessions: (dir) => this.listProjectSessions(dir),
       trackSession: (id) => provider.trackSession(id),
       refreshSessions: () => provider.refreshSessions(),
       registerSession: (s) => provider.registerSession(s),
@@ -125,6 +144,13 @@ export class VscodeHost implements Host {
       abortSessions: (ids) => provider.abortSessions(ids),
       showMemory: (id) => provider.showMemory(id),
       toggleMemory: (id) => provider.toggleMemory(id),
+      registerProjectRoute: (ref, root, generation) => provider.registerProjectRoute(ref, root, generation),
+      unregisterProjectRoute: (projectId) => provider.unregisterProjectRoute(projectId),
+      registerWorktreeRoute: (ref, directory, generation) => provider.registerWorktreeRoute(ref, directory, generation),
+      registerSessionRoute: (ref, directory, generation) => provider.registerSessionRoute(ref, directory, generation),
+      unregisterSessionRoute: (ref) => provider.unregisterSessionRoute(ref),
+      isSessionRouteAmbiguous: (sessionId) => provider.isSessionRouteAmbiguous(sessionId),
+      routeSessionDirectoryFor: (ref) => provider.routeSessionDirectoryFor(ref),
       dispose: () => provider.dispose(),
     }
 
@@ -169,10 +195,70 @@ export class VscodeHost implements Host {
     }
   }
 
+  /**
+   * List root sessions for one project directory via the shared CLI backend.
+   * Used by per-project session discovery so multi-project Agent Manager lists
+   * real Local/history sessions by their exact directory instead of only the
+   * persisted managed records. Returns [] when the backend is not connected or
+   * the listing fails, so one directory's failure cannot erase another's
+   * results.
+   */
+  private async listProjectSessions(dir: string): Promise<Session[]> {
+    try {
+      const client = await this.connectionService.getClientAsync(dir)
+      const res = await client.session.list({ directory: dir, roots: true }, { throwOnError: true })
+      return res.data
+    } catch (err) {
+      console.warn(`[Kilo New] Agent Manager: failed to list project sessions for ${dir}:`, err)
+      return []
+    }
+  }
+
   workspacePath(): string | undefined {
     return getWorkspaceRoot()
   }
 
+  async pickFolder(): Promise<string | undefined> {
+    const uris = await vscode.window.showOpenDialog({
+      canSelectFiles: false,
+      canSelectFolders: true,
+      canSelectMany: false,
+      openLabel: "Add Project",
+      title: "Add Project to Agent Manager",
+    })
+    return uris?.[0]?.fsPath
+  }
+
+  multiProject(): boolean {
+    return vscode.workspace.getConfiguration("kilo-code.new.experimental").get("multiProject", false)
+  }
+
+  readProjects(): unknown {
+    return this.context.globalState.get("agentManager.projects")
+  }
+
+  async writeProjects(value: unknown): Promise<void> {
+    await this.context.globalState.update("agentManager.projects", value)
+  }
+
+  unregisterProjectRoutes(projectId: string): void {
+    this.routes.unregisterProject(projectId)
+  }
+
+  onDidChangeWorkspaceFolders(cb: () => void): Disposable {
+    return vscode.workspace.onDidChangeWorkspaceFolders(() => cb())
+  }
+
+  onDidChangeMultiProject(cb: (enabled: boolean) => void): Disposable {
+    return vscode.workspace.onDidChangeConfiguration((e) => {
+      if (e.affectsConfiguration("kilo-code.new.experimental.multiProject")) cb(this.multiProject())
+    })
+  }
+
+  isTrusted(): boolean {
+    return vscode.workspace.isTrusted
+  }
+
   autoBranchNaming(): { enabled: boolean; prefix: string } {
     const cfg = vscode.workspace.getConfiguration("kilo-code.new.agentManager")
     return {
diff --git a/packages/kilo-vscode/src/agent-manager/worktree-diff-controller.ts b/packages/kilo-vscode/src/agent-manager/worktree-diff-controller.ts
index 75d538cc35..b8a4b269e7 100644
--- a/packages/kilo-vscode/src/agent-manager/worktree-diff-controller.ts
+++ b/packages/kilo-vscode/src/agent-manager/worktree-diff-controller.ts
@@ -1,12 +1,13 @@
 import { SourceController } from "../diff/SourceController"
 import { resolveLocalDiffTarget } from "../diff/shared/target"
 import { WorktreeDiffReverter, type StatusResolver } from "../diff/shared/reverter"
-import type { DiffFile } from "../diff/types"
-import type { DiffSource, DiffSourceDescriptor, DiffSourceFetch } from "../diff/sources/types"
+import type { DiffFile, PanelContext } from "../diff/types"
+import type { DiffSource } from "../diff/sources/types"
+import type { DiffSourceCatalog } from "../diff/sources/catalog"
 import type { ApplyConflict, GitOps } from "./GitOps"
 import { shouldStopDiffPolling } from "./delete-worktree"
-import { Semaphore } from "./semaphore"
 import { remoteRef, type ManagedSession, type WorktreeStateManager } from "./WorktreeStateManager"
+import { parseDiffId, scopeToSourceId } from "./diff-scope"
 import type { AgentManagerOutMessage, WorktreeDiffEntry } from "./types"
 
 const LOCAL_DIFF_ID = "local" as const
@@ -19,14 +20,11 @@ export interface WorktreeDiffControllerContext {
   getState: () => WorktreeStateManager | undefined
   getRoot: () => string | undefined
   getStateReady: () => Promise<void> | undefined
-  /**
-   * In-process diff paths deliberately bypass the SDK client to keep git spawns
-   * out of the Bun `kilo serve` process (see oven-sh/bun#18265).
-   */
+  /** Builds the underlying per-scope diff sources (workspace/staged/unstaged/session). */
+  catalog: DiffSourceCatalog
+  /** Shared git ops, injected into sources so they don't spawn their own channels. */
   git: GitOps
-  /** In-process diff summary (replaces client.worktree.diffSummary). */
-  localDiff: (dir: string, base: string) => Promise<WorktreeDiffEntry[]>
-  /** In-process single-file diff (replaces client.worktree.diffFile). */
+  /** In-process single-file diff (replaces client.worktree.diffFile). Used by revert. */
   localDiffFile: (dir: string, base: string, file: string) => Promise<WorktreeDiffEntry | null>
   post: (msg: AgentManagerOutMessage) => void
   log: (...args: unknown[]) => void
@@ -34,13 +32,16 @@ export interface WorktreeDiffControllerContext {
 
 export class WorktreeDiffController {
   private readonly controller: SourceController
-  private readonly details = new Semaphore(3)
   private target: Target | undefined
   private applying: string | undefined
+  /** Intended watch mode for the active context; isPolling lags the initial fetch. */
+  private poll = false
+  /** Ephemeral per-context base override, keyed by context id. */
+  private baseOverrides = new Map<string, string>()
 
   constructor(private readonly ctx: WorktreeDiffControllerContext) {
     this.controller = new SourceController(
-      (id) => this.source(id),
+      (id, ctx) => this.source(id, ctx),
       () => [],
       (msg) => this.ctx.post(msg as AgentManagerOutMessage),
       {
@@ -49,6 +50,11 @@ export class WorktreeDiffController {
           sessionId: source.descriptor.id,
           loading,
         }),
+        notice: (source, notice) => ({
+          type: "agentManager.worktreeDiffNotice",
+          sessionId: source.descriptor.id,
+          notice,
+        }),
         diffs: (source, diffs) => ({
           type: "agentManager.worktreeDiff",
           sessionId: source.descriptor.id,
@@ -80,7 +86,11 @@ export class WorktreeDiffController {
   }
 
   public shouldStopForWorktree(path: string, sessions: ManagedSession[]): boolean {
-    return shouldStopDiffPolling(path, sessions, this.target, this.controller.currentId)
+    // The parsed context id is a worktree id (or `local`), so the
+    // orphaned-session check matches sessions of the deleted worktree.
+    const current = this.controller.currentId
+    const ctxId = current ? parseDiffId(current).ctx : undefined
+    return shouldStopDiffPolling(path, sessions, this.target, ctxId)
   }
 
   public async apply(worktreeId: string, value?: unknown): Promise<void> {
@@ -144,131 +154,155 @@ export class WorktreeDiffController {
     }
   }
 
-  public async revert(sessionId: string, file: string): Promise<void> {
+  public async revert(id: string, file: string): Promise<void> {
     if (!file) return
-    if (this.controller.currentId !== sessionId) {
-      const result = await this.revertFile(sessionId, file)
-      this.postRevertResult(sessionId, file, result)
+    if (this.controller.currentId !== id) {
+      const result = await this.revertFile(id, file)
+      this.postRevertResult(id, file, result)
       return
     }
     await this.controller.revertFile(file)
   }
 
-  public async request(sessionId: string): Promise<void> {
-    if (this.controller.currentId !== sessionId) {
-      await this.activate(sessionId, false, true)
+  public async request(id: string): Promise<void> {
+    if (this.controller.currentId !== id) {
+      await this.activate(id, false, true)
       return
     }
     this.target = undefined
     await this.controller.refresh()
   }
 
-  public async requestFile(sessionId: string, file: string): Promise<void> {
+  public async requestFile(id: string, file: string): Promise<void> {
     if (!file) return
-    if (this.controller.currentId !== sessionId) {
-      this.ctx.post({ type: "agentManager.worktreeDiffFile", sessionId, file, diff: null })
+    if (this.controller.currentId !== id) {
+      this.ctx.post({ type: "agentManager.worktreeDiffFile", sessionId: id, file, diff: null })
       return
     }
     await this.controller.requestFile(file)
   }
 
-  public start(sessionId: string): void {
-    if (this.controller.isPolling && this.controller.currentId === sessionId) return
-    this.ctx.log(`Starting diff polling for session ${sessionId}`)
-    void this.activate(sessionId, true, true)
+  public start(id: string): void {
+    if (this.controller.isPolling && this.controller.currentId === id) return
+    this.ctx.log(`Starting diff polling for ${id}`)
+    void this.activate(id, true, true)
   }
 
   public stop(): void {
     this.controller.stop()
     this.target = undefined
+    this.poll = false
   }
 
-  private async activate(sessionId: string, poll: boolean, fetch: boolean): Promise<void> {
+  /**
+   * Set or clear an ephemeral base override for a context (worktree or local),
+   * then re-activate the current source so it refetches against the new base.
+   * Passing undefined clears the override and falls back to the recorded parent.
+   */
+  public async setBase(id: string, branch: string | undefined): Promise<void> {
+    const { ctx } = parseDiffId(id)
+    if (branch) this.baseOverrides.set(ctx, branch)
+    else this.baseOverrides.delete(ctx)
+    // Nothing to rebuild when the context isn't active; the override is
+    // picked up the next time start()/request() resolves it.
+    if (this.controller.currentId !== id) return
+    // Route through activate() so the base is re-resolved and pushed via
+    // setContext() — SourceController.reactivate() alone would rebuild the
+    // source against the stale context captured by the last activate(). The
+    // recorded poll intent preserves watch mode even when the initial fetch
+    // is still in flight (isPolling only turns true once it resolves).
+    await this.activate(id, this.poll, true)
+  }
+
+  /** Branch picker data for a context's directory, using any active override. */
+  public async branches(id: string) {
+    await this.ready("stateReady rejected, continuing diff branches resolve:")
+    const { ctx } = parseDiffId(id)
+    const target = await this.resolve(ctx)
+    if (!target) return undefined
+    return await this.ctx.catalog.listWorkspaceBranches(this.baseOverrides.get(ctx), target.directory)
+  }
+
+  private async activate(id: string, poll: boolean, fetch: boolean): Promise<void> {
     this.target = undefined
-    this.controller.setContext({ workspaceRoot: this.ctx.getRoot() })
-    await this.controller.activate(sessionId, { poll, fetch })
+    this.poll = poll
+    await this.ready("stateReady rejected, continuing diff activate:")
+    const { ctx } = parseDiffId(id)
+    const resolved = await this.resolve(ctx)
+    this.target = resolved ? { sessionId: id, ...resolved } : undefined
+    // Clear any stale source notice up front; sources only push a notice when
+    // one is active, so a swap away from a noticing source must reset it.
+    this.ctx.post({ type: "agentManager.worktreeDiffNotice", sessionId: id, notice: undefined })
+    this.controller.setContext({
+      workspaceRoot: this.ctx.getRoot(),
+      dir: resolved?.directory,
+      // The resolved base already bakes in any ephemeral override (see
+      // resolve()), so pass it as the explicit base and leave
+      // baseBranchOverride unset to avoid double resolution.
+      baseBranch: resolved?.baseBranch,
+      // Agent Manager always knows its intended directory (LOCAL resolves to
+      // the root). Never fall back to the workspace root for an unresolvable
+      // worktree context — return an empty diff instead.
+      strictDir: true,
+      git: this.ctx.git,
+      log: (...args) => this.ctx.log(...args),
+    })
+    await this.controller.activate(id, { poll, fetch })
   }
 
-  private async resolve(sessionId: string): Promise<{ directory: string; baseBranch: string } | undefined> {
-    if (sessionId === LOCAL_DIFF_ID) return await this.resolveLocal()
+  private async resolve(ctxId: string): Promise<{ directory: string; baseBranch: string } | undefined> {
+    if (ctxId === LOCAL_DIFF_ID) return await this.resolveLocal()
     const state = this.ctx.getState()
     if (!state) {
-      this.ctx.log(`resolveDiffTarget: no state manager for session ${sessionId}`)
+      this.ctx.log(`resolveDiffTarget: no state manager for context ${ctxId}`)
       return undefined
     }
 
-    const session = state.getSession(sessionId)
-    if (!session) {
-      this.ctx.log(
-        `resolveDiffTarget: session ${sessionId} not found in state (${state.getSessions().length} total sessions)`,
-      )
-      return undefined
-    }
-    if (!session.worktreeId) {
-      this.ctx.log(`resolveDiffTarget: session ${sessionId} has no worktreeId (local session)`)
-      return undefined
-    }
-
-    const worktree = state.getWorktree(session.worktreeId)
+    // The context is the worktree itself (the sidebar selection), not one of
+    // its sessions — resolution survives session churn inside the worktree.
+    const worktree = state.getWorktree(ctxId)
     if (!worktree) {
-      this.ctx.log(`resolveDiffTarget: worktree ${session.worktreeId} not found for session ${sessionId}`)
+      this.ctx.log(`resolveDiffTarget: worktree ${ctxId} not found`)
       return undefined
     }
-    return { directory: worktree.path, baseBranch: remoteRef(worktree) }
+    const base = this.baseOverrides.get(ctxId) ?? remoteRef(worktree)
+    return { directory: worktree.path, baseBranch: base }
   }
 
   private async resolveLocal(): Promise<{ directory: string; baseBranch: string } | undefined> {
-    return await resolveLocalDiffTarget(this.ctx.git, (...args) => this.ctx.log(...args), this.ctx.getRoot())
+    const root = this.ctx.getRoot()
+    if (!root) return undefined
+    const override = this.baseOverrides.get(LOCAL_DIFF_ID)
+    if (override) {
+      return { directory: root, baseBranch: override }
+    }
+    return await resolveLocalDiffTarget(this.ctx.git, (...args) => this.ctx.log(...args), root)
   }
 
   private async ready(msg: string): Promise<void> {
     await this.ctx.getStateReady()?.catch((err) => this.ctx.log(msg, err))
   }
 
-  private source(sessionId: string): DiffSource {
-    const descriptor: DiffSourceDescriptor = {
-      id: sessionId,
-      type: "workspace",
-      group: "Git",
-      capabilities: { revert: true, comments: true },
-    }
-
+  /**
+   * Build the active source for a composite id by delegating to the catalog.
+   * The composite id (`ctx#scope`, or `ctx#session:<sid>` for the session
+   * scope) is preserved as the descriptor id so the webview keys diff data by
+   * context+scope. Context resolution (dir/base) already happened in
+   * activate() and is carried by the PanelContext.
+   */
+  private source(id: string, panelCtx: PanelContext): DiffSource {
+    const { ctx, scope, sessionId } = parseDiffId(id)
+    const built = this.ctx.catalog.build(scopeToSourceId(scope, ctx, sessionId), panelCtx)
     return {
-      descriptor,
-      fetch: () => this.fetch(sessionId),
-      fetchFile: (file) => this.fetchFile(sessionId, file),
-      revert: (file) => this.revertFile(sessionId, file),
+      ...built,
+      descriptor: { ...built.descriptor, id },
     }
   }
 
-  private async fetch(sessionId: string): Promise<DiffSourceFetch> {
-    await this.ready("stateReady rejected, continuing diff resolve:")
-    const target = await this.ensureTarget(sessionId)
-    if (!target) return { diffs: [], stopPolling: true }
-
-    const files = await this.ctx.localDiff(target.directory, target.baseBranch)
-    this.ctx.log(`Worktree diff returned ${files.length} file(s) for session ${sessionId}`)
-    return { diffs: files as AgentManagerDiffFile[] }
-  }
-
-  private async fetchFile(sessionId: string, file: string): Promise<DiffFile | null> {
-    await this.ready("stateReady rejected, continuing diff detail resolve:")
-    return this.details.run(async () => {
-      const target = await this.ensureTarget(sessionId)
-      if (!target) return null
-
-      try {
-        return (await this.ctx.localDiffFile(target.directory, target.baseBranch, file)) as AgentManagerDiffFile | null
-      } catch (error) {
-        this.ctx.log("Failed to fetch worktree diff file:", error)
-        return null
-      }
-    })
-  }
-
-  private async revertFile(sessionId: string, file: string): Promise<{ ok: boolean; message: string }> {
+  private async revertFile(id: string, file: string): Promise<{ ok: boolean; message: string }> {
     await this.ready("stateReady rejected, continuing revert resolve:")
-    const target = await this.resolveTarget(sessionId)
+    const { ctx } = parseDiffId(id)
+    const target = await this.resolve(ctx)
     if (!target) return { ok: false, message: "Could not resolve diff target" }
 
     try {
@@ -285,19 +319,6 @@ export class WorktreeDiffController {
     }
   }
 
-  private async ensureTarget(sessionId: string): Promise<Target | undefined> {
-    if (this.controller.currentId !== sessionId) return undefined
-    if (this.target?.sessionId === sessionId) return this.target
-    return await this.resolveTarget(sessionId)
-  }
-
-  private async resolveTarget(sessionId: string): Promise<Target | undefined> {
-    const target = await this.resolve(sessionId)
-    if (!target) return undefined
-    this.target = { sessionId, ...target }
-    return this.target
-  }
-
   private postRevertResult(sessionId: string, file: string, result: { ok: boolean; message: string }): void {
     this.ctx.post({
       type: "agentManager.revertWorktreeFileResult",
diff --git a/packages/kilo-vscode/src/agent-manager/worktree-importer.ts b/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
index d840f67eb5..f589a7c4eb 100644
--- a/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
+++ b/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
@@ -56,63 +56,14 @@ export class WorktreeImporter {
   }
 
   async branch(branch: string): Promise<void> {
-    const manager = this.host.manager()
-    const state = this.host.state()
-    if (!manager || !state) {
-      this.host.post({ type: "agentManager.importResult", success: false, message: "Not a git repository" })
-      return
-    }
-    if (this.busy()) return
-
-    this.importing = true
-    try {
-      this.host.post({
-        type: "agentManager.worktreeSetup",
-        status: "creating",
-        message: "Creating worktree from branch...",
-      })
-      const result = await manager.createWorktree({ existingBranch: branch })
-      const worktree = state.addWorktree({
-        branch: result.branch,
-        path: result.path,
-        parentBranch: result.parentBranch,
-        remote: result.remote,
-        branchOwned: false,
-      })
-      this.host.push()
-
-      try {
-        this.host.post({
-          type: "agentManager.worktreeSetup",
-          status: "creating",
-          message: "Running setup script...",
-          branch: result.branch,
-          worktreeId: worktree.id,
-        })
-        await this.host.setup(result.path, result.branch, worktree.id)
-
-        const session = await this.host.session(result.path, result.branch, worktree.id)
-        if (!session) throw new Error("Failed to create session")
-
-        state.addSession(session.id, worktree.id)
-        this.host.register(session.id, result.path)
-        this.host.ready(session.id, result, worktree.id)
-        this.host.post({ type: "agentManager.importResult", success: true, message: `Opened branch ${branch}` })
-        this.host.log(`Imported branch ${branch} as worktree ${worktree.id}`)
-      } catch (error) {
-        state.removeWorktree(worktree.id)
-        await manager.removeWorktree(result.path)
-        this.host.push()
-        throw error
-      }
-    } catch (error) {
-      this.importError(error, `Branch "${branch}" is already checked out in another worktree`)
-    } finally {
-      this.importing = false
-    }
+    await this.run({ branch })
   }
 
   async pr(url: string): Promise<void> {
+    await this.run({ url })
+  }
+
+  private async run(target: { branch: string } | { url: string }): Promise<void> {
     const manager = this.host.manager()
     const state = this.host.state()
     if (!manager || !state) {
@@ -120,11 +71,21 @@ export class WorktreeImporter {
       return
     }
     if (this.busy()) return
-
     this.importing = true
+    const branch = "branch" in target
+    const creating = branch ? "Creating worktree from branch..." : "Resolving PR..."
+    const setup = branch ? "Running setup script..." : "Setting up worktree..."
+    const duplicate = branch
+      ? `Branch "${target.branch}" is already checked out in another worktree`
+      : "This PR's branch is already checked out in another worktree"
     try {
-      this.host.post({ type: "agentManager.worktreeSetup", status: "creating", message: "Resolving PR..." })
-      const result = await manager.createFromPR(url)
+      const progress = { type: "agentManager.worktreeSetup", status: "creating" } as const
+      this.host.post({ ...progress, message: creating })
+      const result = branch
+        ? await manager.createWorktree({ existingBranch: target.branch })
+        : await manager.createFromPR(target.url)
+      const success = branch ? `Opened branch ${target.branch}` : `Opened PR branch ${result.branch}`
+      const log = branch ? `Imported branch ${target.branch}` : `Imported PR ${target.url}`
       const worktree = state.addWorktree({
         branch: result.branch,
         path: result.path,
@@ -133,29 +94,16 @@ export class WorktreeImporter {
         branchOwned: false,
       })
       this.host.push()
-
       try {
-        this.host.post({
-          type: "agentManager.worktreeSetup",
-          status: "creating",
-          message: "Setting up worktree...",
-          branch: result.branch,
-          worktreeId: worktree.id,
-        })
+        this.host.post({ ...progress, message: setup, branch: result.branch, worktreeId: worktree.id })
         await this.host.setup(result.path, result.branch, worktree.id)
-
         const session = await this.host.session(result.path, result.branch, worktree.id)
         if (!session) throw new Error("Failed to create session")
-
         state.addSession(session.id, worktree.id)
         this.host.register(session.id, result.path)
         this.host.ready(session.id, result, worktree.id)
-        this.host.post({
-          type: "agentManager.importResult",
-          success: true,
-          message: `Opened PR branch ${result.branch}`,
-        })
-        this.host.log(`Imported PR ${url} as worktree ${worktree.id}`)
+        this.host.post({ type: "agentManager.importResult", success: true, message: success })
+        this.host.log(`${log} as worktree ${worktree.id}`)
       } catch (error) {
         state.removeWorktree(worktree.id)
         await manager.removeWorktree(result.path)
@@ -163,7 +111,7 @@ export class WorktreeImporter {
         throw error
       }
     } catch (error) {
-      this.importError(error, "This PR's branch is already checked out in another worktree")
+      this.importError(error, duplicate)
     } finally {
       this.importing = false
     }
diff --git a/packages/kilo-vscode/src/diff/sources/catalog.ts b/packages/kilo-vscode/src/diff/sources/catalog.ts
index fa36aaecf2..8eb2d0ffdf 100644
--- a/packages/kilo-vscode/src/diff/sources/catalog.ts
+++ b/packages/kilo-vscode/src/diff/sources/catalog.ts
@@ -90,12 +90,17 @@ export class DiffSourceCatalog implements vscode.Disposable {
   }
 
   build(id: string, ctx: PanelContext): DiffSource {
+    const opts = { dir: () => ctx.dir, strictDir: ctx.strictDir, git: ctx.git, log: ctx.log }
     if (id === WORKSPACE_SOURCE_ID) {
-      return createWorktreeDiffSource({ baseBranchOverride: ctx.baseBranchOverride })
+      return createWorktreeDiffSource({
+        ...opts,
+        baseBranchOverride: ctx.baseBranchOverride,
+        baseBranch: ctx.baseBranch,
+      })
     }
 
-    if (id === STAGED_SOURCE_ID) return createStagedDiffSource()
-    if (id === UNSTAGED_SOURCE_ID) return createUnstagedDiffSource()
+    if (id === STAGED_SOURCE_ID) return createStagedDiffSource(opts)
+    if (id === UNSTAGED_SOURCE_ID) return createUnstagedDiffSource(opts)
 
     if (id.startsWith(TURN_PREFIX)) {
       const [sessionId, messageId] = id.slice(TURN_PREFIX.length).split(":")
@@ -108,14 +113,22 @@ export class DiffSourceCatalog implements vscode.Disposable {
     if (id.startsWith(SESSION_PREFIX)) {
       const sessionId = id.slice(SESSION_PREFIX.length)
       if (!sessionId) throw new Error(`DiffSourceCatalog.build: empty session id in "${id}"`)
-      return createSessionDiffSource(sessionId, this.sessionFetch, ctx.workspaceRoot, this.checkSnapshotsEnabled)
+      return createSessionDiffSource(
+        sessionId,
+        this.sessionFetch,
+        ctx.dir ?? ctx.workspaceRoot,
+        this.checkSnapshotsEnabled,
+      )
     }
 
     throw new Error(`DiffSourceCatalog.build: unknown source id "${id}"`)
   }
 
-  async listWorkspaceBranches(override: string | undefined): Promise<WorkspaceBranchesResult | undefined> {
-    const root = getWorkspaceRoot()
+  async listWorkspaceBranches(
+    override: string | undefined,
+    dir?: string,
+  ): Promise<WorkspaceBranchesResult | undefined> {
+    const root = dir ?? getWorkspaceRoot()
     if (!root) return undefined
 
     const git = this.ensureBranchGit()
diff --git a/packages/kilo-vscode/src/diff/sources/staged.ts b/packages/kilo-vscode/src/diff/sources/staged.ts
index d21a508902..8cd250743c 100644
--- a/packages/kilo-vscode/src/diff/sources/staged.ts
+++ b/packages/kilo-vscode/src/diff/sources/staged.ts
@@ -34,17 +34,39 @@ function stamp(entry: FileEntry, before: string, after: string): FileEntry {
   return { ...entry, stamp: `${entry.status}:${before}:${after}` }
 }
 
+export interface StagedDiffSourceOptions {
+  /**
+   * Resolve the directory to diff. Defaults to the VS Code workspace root.
+   * Agent Manager passes a worktree path so the source diffs inside the
+   * worktree rather than the main checkout.
+   */
+  dir?: () => string | undefined
+  /**
+   * When true, a `dir` that resolves to undefined yields an empty diff rather
+   * than falling back to the workspace root.
+   */
+  strictDir?: boolean
+  /** Shared GitOps / log so sources don't each spawn their own channel. */
+  git?: GitOps
+  log?: (...args: unknown[]) => void
+}
+
 /**
  * Diff between the git index and HEAD — what `git diff --cached` would show.
  * Polls on the standard interval; revert isn't supported (use `git reset` from
  * a real git client). Read-only view.
  */
-export function createStagedDiffSource(): DiffSource {
-  const output = vscode.window.createOutputChannel("Kilo Diff: Staged")
-  const log = (...args: unknown[]) => appendOutput(output, "StagedDiffSource", ...args)
-  const git = new GitOps({ log })
+export function createStagedDiffSource(opts: StagedDiffSourceOptions = {}): DiffSource {
+  const output = opts.git ? undefined : vscode.window.createOutputChannel("Kilo Diff: Staged")
+  const log = opts.log ?? ((...args: unknown[]) => appendOutput(output!, "StagedDiffSource", ...args))
+  const git = opts.git ?? new GitOps({ log })
 
-  const root = (): string | undefined => getWorkspaceRoot()
+  const root = (): string | undefined => {
+    const dir = opts.dir?.()
+    if (dir) return dir
+    if (opts.strictDir) return undefined
+    return getWorkspaceRoot()
+  }
 
   const listEntries = async (dir: string): Promise<FileEntry[]> => {
     const [nameStatus, numstat, raw] = await Promise.all([
@@ -150,8 +172,10 @@ export function createStagedDiffSource(): DiffSource {
     },
 
     dispose(): void {
-      git.dispose()
-      output.dispose()
+      // Only dispose resources we own (created here). Injected git/log are
+      // owned by the caller.
+      if (!opts.git) git.dispose()
+      output?.dispose()
     },
   }
 }
diff --git a/packages/kilo-vscode/src/diff/sources/unstaged.ts b/packages/kilo-vscode/src/diff/sources/unstaged.ts
index b4d0c99616..5fcb03793d 100644
--- a/packages/kilo-vscode/src/diff/sources/unstaged.ts
+++ b/packages/kilo-vscode/src/diff/sources/unstaged.ts
@@ -40,17 +40,39 @@ function stamp(entry: FileEntry, before: string, after: string): FileEntry {
   return { ...entry, stamp: `${entry.status}:${before}:${after}` }
 }
 
+export interface UnstagedDiffSourceOptions {
+  /**
+   * Resolve the directory to diff. Defaults to the VS Code workspace root.
+   * Agent Manager passes a worktree path so the source diffs inside the
+   * worktree rather than the main checkout.
+   */
+  dir?: () => string | undefined
+  /**
+   * When true, a `dir` that resolves to undefined yields an empty diff rather
+   * than falling back to the workspace root.
+   */
+  strictDir?: boolean
+  /** Shared GitOps / log so sources don't each spawn their own channel. */
+  git?: GitOps
+  log?: (...args: unknown[]) => void
+}
+
 /**
  * Diff between the working tree and the index — what `git diff` shows for
  * tracked files, plus untracked files (treated as fully-added). Read-only;
  * polls on the standard interval.
  */
-export function createUnstagedDiffSource(): DiffSource {
-  const output = vscode.window.createOutputChannel("Kilo Diff: Unstaged")
-  const log = (...args: unknown[]) => appendOutput(output, "UnstagedDiffSource", ...args)
-  const git = new GitOps({ log })
+export function createUnstagedDiffSource(opts: UnstagedDiffSourceOptions = {}): DiffSource {
+  const output = opts.git ? undefined : vscode.window.createOutputChannel("Kilo Diff: Unstaged")
+  const log = opts.log ?? ((...args: unknown[]) => appendOutput(output!, "UnstagedDiffSource", ...args))
+  const git = opts.git ?? new GitOps({ log })
 
-  const root = (): string | undefined => getWorkspaceRoot()
+  const root = (): string | undefined => {
+    const dir = opts.dir?.()
+    if (dir) return dir
+    if (opts.strictDir) return undefined
+    return getWorkspaceRoot()
+  }
 
   const listTracked = async (dir: string): Promise<FileEntry[]> => {
     const [nameStatus, numstat, raw] = await Promise.all([
@@ -192,8 +214,10 @@ export function createUnstagedDiffSource(): DiffSource {
     },
 
     dispose(): void {
-      git.dispose()
-      output.dispose()
+      // Only dispose resources we own (created here). Injected git/log are
+      // owned by the caller.
+      if (!opts.git) git.dispose()
+      output?.dispose()
     },
   }
 }
diff --git a/packages/kilo-vscode/src/diff/sources/worktree.ts b/packages/kilo-vscode/src/diff/sources/worktree.ts
index 1f3d8ee25a..89e750a1c8 100644
--- a/packages/kilo-vscode/src/diff/sources/worktree.ts
+++ b/packages/kilo-vscode/src/diff/sources/worktree.ts
@@ -23,6 +23,28 @@ export interface WorktreeDiffSourceOptions {
    * the current branch — only the comparison target changes. Reset on dispose.
    */
   baseBranchOverride?: string
+  /**
+   * Resolve the directory to diff. Defaults to the VS Code workspace root.
+   * Agent Manager passes a worktree path so the source diffs inside the
+   * worktree rather than the main checkout.
+   */
+  dir?: () => string | undefined
+  /**
+   * When true, a `dir` that resolves to undefined yields an empty diff rather
+   * than falling back to the workspace root. Prevents an unresolvable
+   * worktree context from silently diffing the main checkout.
+   */
+  strictDir?: boolean
+  /**
+   * Explicit base branch to diff against. When set, the source skips
+   * auto-resolution (tracking → default) and diffs against this ref directly.
+   * Agent Manager passes the worktree's recorded parent so a worktree always
+   * compares against its own base even when the workspace default differs.
+   */
+  baseBranch?: string
+  /** Shared GitOps / log so sources don't each spawn their own channel. */
+  git?: GitOps
+  log?: (...args: unknown[]) => void
 }
 
 /**
@@ -32,9 +54,16 @@ export interface WorktreeDiffSourceOptions {
  * extension host — no `kilo serve` round-trip.
  */
 export function createWorktreeDiffSource(opts: WorktreeDiffSourceOptions = {}): DiffSource {
-  const output = vscode.window.createOutputChannel("Kilo Diff: Workspace")
-  const log = (...args: unknown[]) => appendOutput(output, "WorktreeDiffSource", ...args)
-  const git = new GitOps({ log })
+  const output = opts.git ? undefined : vscode.window.createOutputChannel("Kilo Diff: Workspace")
+  const log = opts.log ?? ((...args: unknown[]) => appendOutput(output!, "WorktreeDiffSource", ...args))
+  const git = opts.git ?? new GitOps({ log })
+
+  const root = (): string | undefined => {
+    const dir = opts.dir?.()
+    if (dir) return dir
+    if (opts.strictDir) return undefined
+    return getWorkspaceRoot()
+  }
 
   // Cached between fetches so repeated polling doesn't re-resolve the base
   // branch every tick. Reset only on dispose (when the source is swapped out).
@@ -42,22 +71,32 @@ export function createWorktreeDiffSource(opts: WorktreeDiffSourceOptions = {}):
 
   const resolveTarget = async (): Promise<DiffTarget | undefined> => {
     if (target) return target
+    if (opts.baseBranch) {
+      const dir = root()
+      if (!dir) {
+        log("Local diff: no directory (explicit base mode)")
+        return
+      }
+      target = { directory: dir, baseBranch: opts.baseBranch }
+      log(`Local diff: using explicit base=${opts.baseBranch} dir=${dir}`)
+      return target
+    }
     if (opts.baseBranchOverride) {
-      const root = getWorkspaceRoot()
-      if (!root) {
+      const dir = root()
+      if (!dir) {
         log("Local diff: no workspace root (override mode)")
         return
       }
-      const resolved = await resolveOverrideRef(git, root, opts.baseBranchOverride, log)
+      const resolved = await resolveOverrideRef(git, dir, opts.baseBranchOverride, log)
       if (!resolved) {
         log(`Local diff: override base="${opts.baseBranchOverride}" could not be resolved, falling back to auto`)
       } else {
-        target = { directory: root, baseBranch: resolved }
+        target = { directory: dir, baseBranch: resolved }
         log(`Local diff: using override base=${resolved}`)
         return target
       }
     }
-    target = await resolveLocalDiffTarget(git, log, getWorkspaceRoot())
+    target = await resolveLocalDiffTarget(git, log, root())
     return target
   }
 
@@ -109,8 +148,10 @@ export function createWorktreeDiffSource(opts: WorktreeDiffSourceOptions = {}):
     },
 
     dispose(): void {
-      git.dispose()
-      output.dispose()
+      // Only dispose resources we own (created here). Injected git/log are
+      // owned by the caller.
+      if (!opts.git) git.dispose()
+      output?.dispose()
       target = undefined
     },
   }
diff --git a/packages/kilo-vscode/src/diff/types.ts b/packages/kilo-vscode/src/diff/types.ts
index 913d4560a3..3ff72904e1 100644
--- a/packages/kilo-vscode/src/diff/types.ts
+++ b/packages/kilo-vscode/src/diff/types.ts
@@ -10,6 +10,27 @@ export interface PanelContext {
   hidePicker?: boolean
   /** User-picked base branch for the workspace source. Undefined = auto. */
   baseBranchOverride?: string
+  /**
+   * Explicit directory to diff inside, overriding the workspace root lookup.
+   * Agent Manager passes a worktree path so its sources operate in the
+   * worktree rather than the main checkout.
+   */
+  dir?: string
+  /**
+   * When true, a source whose `dir` resolves to undefined returns an empty
+   * diff instead of falling back to the workspace root. Agent Manager sets
+   * this so an unresolvable worktree context never silently diffs the main
+   * checkout.
+   */
+  strictDir?: boolean
+  /**
+   * Explicit base ref for the workspace source, skipping auto-resolution.
+   * Agent Manager passes the worktree's recorded parent ref.
+   */
+  baseBranch?: string
+  /** Shared GitOps / log injected by Agent Manager to avoid per-source channels. */
+  git?: import("../agent-manager/GitOps").GitOps
+  log?: (...args: unknown[]) => void
 }
 
 export type DiffImageError = "too-large" | "unreadable"
diff --git a/packages/kilo-vscode/src/extension.ts b/packages/kilo-vscode/src/extension.ts
index c750637d18..b1549e3c47 100644
--- a/packages/kilo-vscode/src/extension.ts
+++ b/packages/kilo-vscode/src/extension.ts
@@ -203,6 +203,8 @@ export function activate(context: vscode.ExtensionContext) {
         const ctx = agentManagerHost.wrapExistingPanel(panel, {
           onBeforeMessage: (msg) => agentManagerProvider.handleMessage(msg),
           worktreeDirectories: () => agentManagerProvider.getWorktreeDirectories(),
+          workspaceRoot: () => agentManagerProvider.workspaceRoot(),
+          projectId: () => agentManagerProvider.projectId(),
         })
         agentManagerProvider.deserializePanel(ctx)
         return Promise.resolve()
diff --git a/packages/kilo-vscode/src/indexing-consent.ts b/packages/kilo-vscode/src/indexing-consent.ts
new file mode 100644
index 0000000000..6636bc571c
--- /dev/null
+++ b/packages/kilo-vscode/src/indexing-consent.ts
@@ -0,0 +1,109 @@
+import * as path from "path"
+import type * as vscode from "vscode"
+import simpleGit from "simple-git"
+import { canonicalizePath, projectIdFor, resolveProjectRoot, samePath } from "./agent-manager/project/paths"
+import { ProjectRegistry } from "./agent-manager/project/registry"
+
+const KEY = "kilo.indexingConsent.v1"
+
+interface File {
+  version: 1
+  projects: Record<string, boolean>
+}
+
+export interface IndexingProject {
+  id: string
+  root: string
+  label: string
+}
+
+interface Storage {
+  read(): unknown
+  write(value: unknown): PromiseLike<void> | void
+}
+
+function parse(raw: unknown): File {
+  if (!raw || typeof raw !== "object") return { version: 1, projects: {} }
+  const file = raw as Partial<File>
+  if (file.version !== 1 || !file.projects || typeof file.projects !== "object") {
+    return { version: 1, projects: {} }
+  }
+  return {
+    version: 1,
+    projects: Object.fromEntries(Object.entries(file.projects).filter((entry) => typeof entry[1] === "boolean")),
+  }
+}
+
+export class IndexingConsentStore {
+  private queue: Promise<void> = Promise.resolve()
+
+  constructor(
+    private readonly storage: Storage,
+    private readonly resolve: (dir: string) => Promise<string | undefined>,
+  ) {}
+
+  async project(dir: string): Promise<IndexingProject> {
+    const root = (await this.resolve(dir)) ?? canonicalizePath(dir)
+    return { id: projectIdFor(root), root, label: path.basename(root) }
+  }
+
+  enabled(id: string): boolean {
+    return parse(this.storage.read()).projects[id] === true
+  }
+
+  set(id: string, enabled: boolean): Promise<void> {
+    const task = this.queue
+      .catch(() => {})
+      .then(async () => {
+        const file = parse(this.storage.read())
+        await this.storage.write({ ...file, projects: { ...file.projects, [id]: enabled } })
+      })
+    this.queue = task.then(
+      () => {},
+      () => {},
+    )
+    return task
+  }
+
+  async list(primary: string | undefined, extras: Array<{ root: string; label?: string }>): Promise<IndexingProject[]> {
+    const dirs = [...(primary ? [{ root: primary }] : []), ...extras]
+    const projects = await Promise.all(
+      dirs.map(async (entry) => ({
+        ...(await this.project(entry.root)),
+        label: entry.label ?? path.basename(entry.root),
+      })),
+    )
+    return projects.filter(
+      (project, index) => !projects.slice(0, index).some((item) => samePath(item.root, project.root)),
+    )
+  }
+}
+
+const stores = new WeakMap<vscode.ExtensionContext, IndexingConsentStore>()
+
+export function indexingConsentStore(context: vscode.ExtensionContext): IndexingConsentStore {
+  const existing = stores.get(context)
+  if (existing) return existing
+  const storage = {
+    read: () => context.globalState.get(KEY),
+    write: (value: unknown) => context.globalState.update(KEY, value),
+  }
+  const store = new IndexingConsentStore(storage, (dir) =>
+    resolveProjectRoot(dir, (cwd, args) => simpleGit(cwd).raw(args)),
+  )
+  stores.set(context, store)
+  return store
+}
+
+export function registeredProjects(context: vscode.ExtensionContext) {
+  return (
+    new ProjectRegistry({
+      read: () => context.globalState.get("agentManager.projects"),
+      write: (value) => Promise.resolve(context.globalState.update("agentManager.projects", value)),
+    })
+      .list()
+      // Consent must never be offered for a repository the user has not trusted:
+      // enabling indexing sends the directory to the backend for reading.
+      .filter((project) => project.trusted)
+  )
+}
diff --git a/packages/kilo-vscode/src/kilo-provider-utils.ts b/packages/kilo-vscode/src/kilo-provider-utils.ts
index e5dbd40e44..c9825cb771 100644
--- a/packages/kilo-vscode/src/kilo-provider-utils.ts
+++ b/packages/kilo-vscode/src/kilo-provider-utils.ts
@@ -408,7 +408,7 @@ export type WebviewMessage =
       message: Record<string, unknown>
     }
   | { type: "sessionStatus"; sessionID: string; status: string; attempt?: number; message?: string; next?: number }
-  | { type: "sessionTurnClosed"; sessionID: string; reason: "completed" | "error" | "interrupted" }
+  | { type: "sessionTurnClosed"; sessionID: string; reason: "completed" | "error" | "interrupted" | "superseded" }
   | {
       type: "permissionRequest"
       permission: {
diff --git a/packages/kilo-vscode/src/kilo-provider/config-bindings.ts b/packages/kilo-vscode/src/kilo-provider/config-bindings.ts
new file mode 100644
index 0000000000..585fdb6dc3
--- /dev/null
+++ b/packages/kilo-vscode/src/kilo-provider/config-bindings.ts
@@ -0,0 +1,64 @@
+import { randomUUID } from "crypto"
+
+export type ConfigScope = "global" | "project"
+
+export interface ConfigTarget {
+  scope: ConfigScope
+  path: string
+  revision: string
+  exists: boolean
+  writable: boolean
+  raw: Record<string, unknown>
+}
+
+export interface ConfigProject {
+  id: string
+  root: string
+  generation: number
+  pinned: boolean
+}
+
+export interface ConfigBinding {
+  id: string
+  connection: number
+  scope: ConfigScope
+  directory: string
+  target: ConfigTarget
+  project?: ConfigProject
+}
+
+export class ConfigBindings {
+  private readonly bindings = new Map<string, ConfigBinding>()
+
+  create(input: Omit<ConfigBinding, "id">): ConfigBinding {
+    const binding = { ...input, id: randomUUID() }
+    // Only the newest binding per scope+directory can still be saved against,
+    // so drop the superseded ones instead of growing forever on read-only
+    // refreshes (external config edits re-issue bindings without consuming).
+    for (const [id, existing] of this.bindings) {
+      if (existing.scope === binding.scope && existing.directory === binding.directory) this.bindings.delete(id)
+    }
+    this.bindings.set(binding.id, binding)
+    return binding
+  }
+
+  get(
+    id: string | undefined,
+    connection: number,
+    valid: (project: ConfigProject) => boolean,
+  ): ConfigBinding | undefined {
+    if (!id) return undefined
+    const binding = this.bindings.get(id)
+    if (!binding || binding.connection !== connection) return undefined
+    if (binding.project && !valid(binding.project)) return undefined
+    return binding
+  }
+
+  consume(id: string): void {
+    this.bindings.delete(id)
+  }
+
+  clear(): void {
+    this.bindings.clear()
+  }
+}
diff --git a/packages/kilo-vscode/src/kilo-provider/config-snapshot.ts b/packages/kilo-vscode/src/kilo-provider/config-snapshot.ts
new file mode 100644
index 0000000000..90ca1ac6fc
--- /dev/null
+++ b/packages/kilo-vscode/src/kilo-provider/config-snapshot.ts
@@ -0,0 +1,22 @@
+import type { KiloClient } from "@kilocode/sdk/v2/client"
+import { configFeatures } from "../features"
+import { retry } from "../services/cli-backend/retry"
+import type { ConfigTarget } from "./config-bindings"
+
+type Client = Pick<KiloClient, "config" | "global">
+type Settings = { maxCost: number; languageCommitMessage: string; multiProject: boolean }
+export async function fetchSnapshot(client: Client, dir: string, settings: () => Settings) {
+  const [{ data: config }, { data: global }, { data: overlay }] = await Promise.all([
+    retry(() => client.config.get({ directory: dir }, { throwOnError: true })),
+    client.global.config.get({ throwOnError: true }),
+    client.config.overlay({ directory: dir, scope: "project" }, { throwOnError: true }),
+  ])
+  return {
+    config,
+    globalConfig: global,
+    targets: overlay?.targets as { global: ConfigTarget; project: ConfigTarget } | undefined,
+    collections: overlay?.collections,
+    settings: settings(),
+    features: configFeatures(config),
+  }
+}
diff --git a/packages/kilo-vscode/src/kilo-provider/early-message.ts b/packages/kilo-vscode/src/kilo-provider/early-message.ts
index 1273d65584..f67a2144fa 100644
--- a/packages/kilo-vscode/src/kilo-provider/early-message.ts
+++ b/packages/kilo-vscode/src/kilo-provider/early-message.ts
@@ -4,6 +4,8 @@ import { routeInputToolMessage } from "../services/input-tools"
 import type { KiloConnectionService } from "../services/cli-backend/connection-service"
 import type { SuggestionContext } from "./handlers/suggestion"
 import type { KiloClient } from "@kilocode/sdk/v2/client"
+import { buildChatSettingsMessage } from "./chat-settings"
+import { buildThroughputSettingMessage } from "./throughput-settings"
 
 type Ctx = {
   question: SuggestionContext
@@ -11,6 +13,7 @@ type Ctx = {
   connection: KiloConnectionService
   dir: string
   post: (msg: unknown) => void
+  browserSettings: () => void
   exportTranscript: (sessionID: string) => Promise<void>
   copy: (text: string) => PromiseLike<void>
   openSessions: (ids: string[]) => void
@@ -53,5 +56,17 @@ export async function routeEarlyMessage(
     ctx.openSessions(ids)
     return true
   }
+  if (message.type === "requestChatSettings") {
+    ctx.post(buildChatSettingsMessage())
+    return true
+  }
+  if (message.type === "requestThroughputSetting") {
+    ctx.post(buildThroughputSettingMessage())
+    return true
+  }
+  if (message.type === "requestBrowserSettings") {
+    ctx.browserSettings()
+    return true
+  }
   return await routeInputToolMessage(message, { connection: ctx.connection, dir: ctx.dir, post: ctx.post })
 }
diff --git a/packages/kilo-vscode/src/kilo-provider/handlers/permission-handler.ts b/packages/kilo-vscode/src/kilo-provider/handlers/permission-handler.ts
index 2b6e3608ca..52008fdab4 100644
--- a/packages/kilo-vscode/src/kilo-provider/handlers/permission-handler.ts
+++ b/packages/kilo-vscode/src/kilo-provider/handlers/permission-handler.ts
@@ -106,7 +106,7 @@ export async function handlePermissionResponse(
   }
 
   const replyResult = await ctx.client.permission
-    .reply({ requestID: permissionId, reply: response, directory: dir }, { throwOnError: true })
+    .reply({ requestID: permissionId, reply: response, directory: dir, interactive: true }, { throwOnError: true })
     .then(() => "ok" as const)
     .catch((error: unknown) => {
       if (isNotFoundError(error)) return "stale" as const
diff --git a/packages/kilo-vscode/src/kilo-provider/indexing-settings.ts b/packages/kilo-vscode/src/kilo-provider/indexing-settings.ts
index 8fbd0ace48..be8a580a40 100644
--- a/packages/kilo-vscode/src/kilo-provider/indexing-settings.ts
+++ b/packages/kilo-vscode/src/kilo-provider/indexing-settings.ts
@@ -1,21 +1,23 @@
 import * as vscode from "vscode"
+import type { IndexingProject } from "../indexing-consent"
 
-type Post = (msg: unknown) => void
-
-export function buildIndexingSettingsMessage() {
+export function buildIndexingSettingsMessage(consent = false, projects: IndexingProject[] = [], projectId?: string) {
   const config = vscode.workspace.getConfiguration("kilo-code.new.indexing")
   return {
     type: "indexingSettingsLoaded" as const,
     settings: {
       showButtonWhenDisabled: config.get<boolean>("showButtonWhenDisabled", true),
+      consent,
+      projects,
+      projectId,
     },
   }
 }
 
-export function watchIndexingConfig(post: Post): vscode.Disposable {
+export function watchIndexingConfig(post: () => void): vscode.Disposable {
   return vscode.workspace.onDidChangeConfiguration((event) => {
     if (event.affectsConfiguration("kilo-code.new.indexing")) {
-      post(buildIndexingSettingsMessage())
+      post()
     }
   })
 }
diff --git a/packages/kilo-vscode/src/kilo-provider/options.ts b/packages/kilo-vscode/src/kilo-provider/options.ts
index 63b76a2766..fcd8481bbe 100644
--- a/packages/kilo-vscode/src/kilo-provider/options.ts
+++ b/packages/kilo-vscode/src/kilo-provider/options.ts
@@ -1,3 +1,5 @@
+import type { ProjectRouteService } from "../agent-manager/project/route"
+
 export type KiloProviderOptions = {
   /** Context key updated from focus events reported by this provider's webview. */
   focusContext?: string
@@ -7,6 +9,27 @@ export type KiloProviderOptions = {
   slimEditMetadata?: boolean
   tabTitle?: (title: string) => void
   worktreeDirectories?: () => string[]
+  /**
+   * Dynamic root directory override. When present, it replaces the
+   * workspaceFolders[0] fallback so the provider's sessions, prompts, and
+   * refreshes follow the host's active project (Agent Manager).
+   */
+  rootDirectory?: () => string | undefined
   /** Composite hosts (Agent Manager) own viewed/presence registration themselves. */
   disableViewedRegistration?: boolean
+  /**
+   * Project route registry shared by all Agent Manager panels. When set, the
+   * provider resolves project-qualified session refs to exact directories and
+   * refuses to silently retarget an ambiguous raw session id to the active
+   * root. Non-Agent-Manager providers leave this undefined and behave exactly
+   * as before.
+   */
+  routeService?: ProjectRouteService
+  /**
+   * Resolve the active Agent Manager project for a raw session id, so a
+   * project-qualified {@link SessionRef} can be built when the caller does not
+   * already carry one. Returns undefined when no project is active or the id
+   * is ambiguous.
+   */
+  projectQualifier?: () => { projectId: string } | undefined
 }
diff --git a/packages/kilo-vscode/src/kilo-provider/session-search.ts b/packages/kilo-vscode/src/kilo-provider/session-search.ts
index 7552fc6802..e525b5a854 100644
--- a/packages/kilo-vscode/src/kilo-provider/session-search.ts
+++ b/packages/kilo-vscode/src/kilo-provider/session-search.ts
@@ -4,6 +4,7 @@ type Item = {
   id: string
   title: string
   updated: number
+  worktreeName?: string
 }
 
 type Message = {
@@ -22,11 +23,14 @@ type Input = {
 }
 
 /**
- * Past-chat mention search. Lists root sessions for the directory the current
- * chat runs in (workspace root for the sidebar, the worktree for Agent Manager
- * sessions) — the same directory-scoped `session.list` the session history and
- * Agent Manager search are built on. Fuzzy title filtering happens in the
- * webview (same mechanism as the Agent Manager sidebar search).
+ * Past-chat mention search. Lists root sessions across the current directory's
+ * worktree family (the repo root and its sibling worktrees for git projects,
+ * just the directory itself otherwise) — the same family-wide listing the
+ * Agent Manager session search and the CLI's past-chat picker are built on.
+ * Every session in the family shares the project, so any of them can be
+ * attached regardless of which worktree the current chat runs in. Fuzzy title
+ * filtering happens in the webview (same mechanism as the Agent Manager
+ * sidebar search).
  */
 export async function handleSessionSearch(input: Input): Promise<void> {
   const client = input.client
@@ -39,10 +43,18 @@ export async function handleSessionSearch(input: Input): Promise<void> {
   const dir = input.dir(id)
 
   try {
-    const res = await client.session.list({ directory: dir, roots: true, limit: 50 }, { throwOnError: true })
+    const res = await client.experimental.session.list(
+      { worktrees: true, roots: true, directory: dir, limit: 50 },
+      { throwOnError: true },
+    )
     const sessions: Item[] = res.data
       .filter((session) => session.id !== input.exclude && session.title)
-      .map((session) => ({ id: session.id, title: session.title, updated: session.time.updated }))
+      .map((session) => ({
+        id: session.id,
+        title: session.title,
+        updated: session.time.updated,
+        worktreeName: session.worktreeName,
+      }))
     input.post({ type: "sessionSearchResult", sessions, requestId: input.message.requestId })
   } catch (err) {
     console.error("[Kilo New] Session search failed:", err)
diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/fa.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/fa.ts
new file mode 100644
index 0000000000..3aa4dc7483
--- /dev/null
+++ b/packages/kilo-vscode/src/services/cli-backend/i18n/fa.ts
@@ -0,0 +1,6 @@
+export const dict = {
+  "server.processExited": "فرآیند CLI با کد {{code}} قبل از راه‌اندازی سرور خاتمه یافت",
+  "server.startupTimeout": "زمان راه‌اندازی سرور پس از {{seconds}} ثانیه به پایان رسید",
+  "remote.connected": "Kilo Remote: متصل شد",
+  "remote.connecting": "Kilo Remote: در حال اتصال…",
+} as const
diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/index.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/index.ts
index 82c8c9358a..d41b11bd2c 100644
--- a/packages/kilo-vscode/src/services/cli-backend/i18n/index.ts
+++ b/packages/kilo-vscode/src/services/cli-backend/i18n/index.ts
@@ -6,6 +6,7 @@ import { dict as da } from "./da"
 import { dict as de } from "./de"
 import { dict as en } from "./en"
 import { dict as es } from "./es"
+import { dict as fa } from "./fa"
 import { dict as fr } from "./fr"
 import { dict as it } from "./it"
 import { dict as ja } from "./ja"
@@ -29,6 +30,7 @@ const bundles: Record<string, Record<string, string>> = {
   de,
   en,
   es,
+  fa,
   fr,
   it,
   ja,
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/fa.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/fa.ts
new file mode 100644
index 0000000000..593c89eb68
--- /dev/null
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/fa.ts
@@ -0,0 +1,27 @@
+// English runtime translations for autocomplete (kilocode:autocomplete.* namespace)
+// Source: src/i18n/locales/en/kilocode.json → "autocomplete" section
+
+export const dict = {
+  "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) تکمیل خودکار",
+  "kilocode:autocomplete.statusBar.snoozed": "به تعویق افتاده",
+  "kilocode:autocomplete.statusBar.warning": "$(warning) تکمیل خودکار",
+  "kilocode:autocomplete.statusBar.tooltip.basic": "تکمیل خودکار Kilo Code",
+  "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
+    "**هیچ مدل تکمیل خودکاری پیکربندی نشده است**\n\nبرای فعال‌سازی تکمیل خودکار، یک پروفایل با یکی از ارائه‌دهندگان پشتیبانی‌شده زیر اضافه کنید: {{providers}}.\n\n[باز کردن تنظیمات]({{command}})",
+  "kilocode:autocomplete.statusBar.tooltip.completionSummary":
+    "{{count}} تکمیل بین {{startTime}} و {{endTime}} انجام شد، با هزینه کل {{cost}}.",
+  "kilocode:autocomplete.statusBar.tooltip.providerInfo":
+    "تکمیل خودکار توسط {{model}} از طریق {{provider}} ارائه می‌شود.",
+  "kilocode:autocomplete.statusBar.cost.zero": "۰.۰۰$",
+  "kilocode:autocomplete.statusBar.cost.lessThanCent": "<۰.۰۱$",
+  "kilocode:autocomplete.codeAction.title": "Kilo Code: ویرایش‌های پیشنهادی",
+  "kilocode:autocomplete.incompatibilityExtensionPopup.message":
+    "تکمیل خودکار Kilo Code به دلیل تعارض با GitHub Copilot مسدود شده است. برای رفع این مشکل، باید پیشنهادات درون‌خطی Copilot را غیرفعال کنید.",
+  "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "غیرفعال کردن Copilot",
+  "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "غیرفعال کردن تکمیل خودکار",
+  "kilocode:autocomplete.creditsExhausted.message":
+    "تکمیل خودکار Kilo Code متوقف شده است. دلایل احتمالی: حساب Kilo شما اعتبار کافی ندارد، یا کلید API پیکربندی‌شده (BYOK) به سقف مجاز خود رسیده است. برای از سرگیری تکمیل خودکار، اعتبار Kilo اضافه کنید یا تنظیمات کلید API خود را بررسی کنید.",
+  "kilocode:autocomplete.creditsExhausted.addCredits": "افزودن اعتبار",
+  "kilocode:autocomplete.authError.message":
+    "تکمیل خودکار Kilo Code به دلیل مشکل احراز هویت متوقف شده است. دلایل احتمالی: وارد Kilo نشده‌اید، یا کلید API (BYOK) شما نامعتبر یا وارد نشده است. لطفاً دوباره وارد شوید یا تنظیمات کلید API ارائه‌دهنده خود را بررسی کنید.",
+}
diff --git a/packages/kilo-vscode/src/services/i18n/fa.ts b/packages/kilo-vscode/src/services/i18n/fa.ts
new file mode 100644
index 0000000000..e8daa62e10
--- /dev/null
+++ b/packages/kilo-vscode/src/services/i18n/fa.ts
@@ -0,0 +1,7 @@
+import { dict as autocompleteDict } from "./autocomplete/fa"
+
+export { autocompleteDict }
+
+export const dict = {
+  ...autocompleteDict,
+} as const
diff --git a/packages/kilo-vscode/src/services/i18n/index.ts b/packages/kilo-vscode/src/services/i18n/index.ts
index 4da8dda292..1090b84b39 100644
--- a/packages/kilo-vscode/src/services/i18n/index.ts
+++ b/packages/kilo-vscode/src/services/i18n/index.ts
@@ -6,6 +6,7 @@ import { dict as de } from "./de"
 import { dict as en } from "./en"
 import { type dict as enDict } from "./en"
 import { dict as es } from "./es"
+import { dict as fa } from "./fa"
 import { dict as fr } from "./fr"
 import { dict as it } from "./it"
 import { dict as ja } from "./ja"
@@ -28,6 +29,7 @@ const bundles: Record<string, Record<string, string>> = {
   de,
   en,
   es,
+  fa,
   fr,
   it,
   ja,
diff --git a/packages/kilo-vscode/tests/indexing-provider-blur-race.spec.ts b/packages/kilo-vscode/tests/indexing-provider-blur-race.spec.ts
index eb4830ec6c..c2ca48b72b 100644
--- a/packages/kilo-vscode/tests/indexing-provider-blur-race.spec.ts
+++ b/packages/kilo-vscode/tests/indexing-provider-blur-race.spec.ts
@@ -44,6 +44,15 @@ function field(page: Page, title: string) {
   return page.locator('[data-slot="settings-row"]', { hasText: title }).locator("input")
 }
 
+// Scope select triggers by their row title: the tab gained a project selector,
+// so positional lookups silently target the wrong control.
+function selectIn(page: Page, title: string) {
+  return page
+    .locator('[data-slot="settings-row"]', { hasText: title })
+    .locator('[data-slot="select-select-trigger"]')
+    .first()
+}
+
 test("provider switch writes to selected provider bucket", async ({ page }) => {
   await page.setViewportSize({ width: 420, height: 720 })
   await page.goto(storyUrl(), { waitUntil: "load" })
@@ -52,7 +61,7 @@ test("provider switch writes to selected provider bucket", async ({ page }) => {
 
   const saved = page.getByTestId("indexing-provider-save")
 
-  const trigger = page.locator('[data-component="select"] [data-slot="select-select-trigger"]').first()
+  const trigger = selectIn(page, "Embedding provider")
   await trigger.click()
   await page.locator('[data-slot="select-select-item-label"]', { hasText: "Gemini" }).click()
 
@@ -123,7 +132,7 @@ test("Kilo exposes only supported embedding model presets", async ({ page }) =>
   await expect(page.getByText("Embedding model", { exact: true })).toHaveCount(0)
   await expect(page.getByText("Vector dimension", { exact: true })).toBeVisible()
 
-  const preset = page.locator('[data-component="select"] [data-slot="select-select-trigger"]').nth(1)
+  const preset = selectIn(page, "Kilo model preset")
   await expect(preset).toContainText("Provider Model")
 
   const dimension = field(page, "Vector dimension").first()
diff --git a/packages/kilo-vscode/tests/package.json b/packages/kilo-vscode/tests/package.json
index 38105c8a8f..52e607fbd4 100644
--- a/packages/kilo-vscode/tests/package.json
+++ b/packages/kilo-vscode/tests/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {}
diff --git a/packages/kilo-vscode/tests/settings-accessibility.spec.ts b/packages/kilo-vscode/tests/settings-accessibility.spec.ts
index 03073ea4c5..5e2b62082f 100644
--- a/packages/kilo-vscode/tests/settings-accessibility.spec.ts
+++ b/packages/kilo-vscode/tests/settings-accessibility.spec.ts
@@ -6,7 +6,7 @@ const NAMES = [
   "Providers",
   "Agent Behaviour",
   "Auto-Approve",
-  "Browser",
+  "Web Tools",
   "Checkpoints",
   "Display",
   "Autocomplete",
diff --git a/packages/kilo-vscode/tests/unit/agent-behaviour-patches.test.ts b/packages/kilo-vscode/tests/unit/agent-behaviour-patches.test.ts
index 0820dc818e..796a2d0eeb 100644
--- a/packages/kilo-vscode/tests/unit/agent-behaviour-patches.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-behaviour-patches.test.ts
@@ -1,11 +1,52 @@
 import { describe, expect, it } from "bun:test"
 import {
+  mcpConfigScope,
+  mcpEnabledPatch,
   selectedAgentNumberOverrideValue,
   selectedAgentTextOverrideValue,
   selectedDefaultAgentValue,
   shouldClearDefaultAgentWhenAgentBecomesUnavailable,
 } from "../../webview-ui/src/components/settings/agent-behaviour-patches"
 
+describe("mcpEnabledPatch", () => {
+  it("returns only the enabled-state patch", () => {
+    expect(mcpEnabledPatch("docs", false)).toEqual({
+      mcp: {
+        docs: {
+          enabled: false,
+        },
+      },
+    })
+  })
+
+  it("routes project-defined servers to project config", () => {
+    expect(
+      mcpConfigScope("docs", {
+        mcp: [{ key: "docs", source: "project" }],
+      }),
+    ).toBe("project")
+  })
+
+  it("routes global servers to global config", () => {
+    const collections = {
+      mcp: [{ key: "docs", source: "global" as const }],
+    }
+    expect(mcpConfigScope("docs", collections)).toBe("global")
+  })
+
+  it("keeps system, default, and unknown servers runtime-only", () => {
+    const collections = {
+      mcp: [
+        { key: "legacy", source: "system" as const },
+        { key: "builtin", source: "default" as const },
+      ],
+    }
+    expect(mcpConfigScope("legacy", collections)).toBeUndefined()
+    expect(mcpConfigScope("builtin", collections)).toBeUndefined()
+    expect(mcpConfigScope("unknown", collections)).toBeUndefined()
+  })
+})
+
 describe("selectedAgentTextOverrideValue", () => {
   it("maps an empty text field value to a null delete sentinel", () => {
     expect(selectedAgentTextOverrideValue("")).toBeNull()
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-ambient-setup.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-ambient-setup.test.ts
new file mode 100644
index 0000000000..17809d05e8
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-ambient-setup.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it } from "bun:test"
+import { createRoot, createSignal } from "solid-js"
+import { LOCAL } from "../../webview-ui/agent-manager/navigate"
+import { ambientDecision, createAmbientSetup } from "../../webview-ui/agent-manager/terminal/ambient"
+import { createTerminalState } from "../../webview-ui/agent-manager/terminal/state"
+
+describe("ambientDecision", () => {
+  it("waits while setup is still running", () => {
+    expect(ambientDecision(undefined, "wt-1", "wt-1")).toBe("wait")
+    expect(ambientDecision({ state: "running", kind: "setup" }, "wt-1", "wt-1")).toBe("wait")
+    expect(ambientDecision({ state: "stopping", kind: "setup" }, "wt-1", "wt-1")).toBe("wait")
+  })
+
+  it("hides the panel after a clean exit in the revealed context", () => {
+    expect(ambientDecision({ state: "exited", exitCode: 0, kind: "setup" }, "wt-1", "wt-1")).toBe("hide")
+  })
+
+  it("keeps the panel when setup failed", () => {
+    expect(ambientDecision({ state: "exited", exitCode: 1, kind: "setup" }, "wt-1", "wt-1")).toBe("keep")
+    expect(ambientDecision({ state: "failed", kind: "setup" }, "wt-1", "wt-1")).toBe("keep")
+  })
+
+  it("keeps the panel when the user switched context before settle", () => {
+    expect(ambientDecision({ state: "exited", exitCode: 0, kind: "setup" }, LOCAL, "wt-1")).toBe("keep")
+  })
+})
+
+describe("createAmbientSetup tracking", () => {
+  function scene(panelOpen: boolean) {
+    const [selection] = createSignal<string | null>("wt-1")
+    const [panel] = createSignal<"diff" | "terminal" | null>(panelOpen ? "terminal" : null)
+    const terms = createTerminalState(selection)
+    const ambient = createAmbientSetup({ terms, selection, sidePanel: panel, setSidePanel: () => undefined })
+    return ambient
+  }
+
+  it("remembers an ambient reveal only when the panel was closed", () => {
+    createRoot((dispose) => {
+      const closed = scene(false)
+      closed.reveal("wt-1", "script:setup")
+      expect(closed.pending()).toBeDefined()
+      const open = scene(true)
+      open.reveal("wt-1", "script:setup")
+      expect(open.pending()).toBeUndefined()
+      dispose()
+    })
+  })
+
+  it("reveal and cancel drive the pending auto-hide", () => {
+    createRoot((dispose) => {
+      const ambient = scene(false)
+      ambient.reveal("wt-1", "script:setup")
+      expect(ambient.pending()).toEqual({ contextKey: "wt-1", terminalId: "script:setup" })
+      ambient.cancel()
+      expect(ambient.pending()).toBeUndefined()
+      dispose()
+    })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
index 804471f9bb..353070c085 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
@@ -11,6 +11,7 @@ import { describe, it, expect } from "bun:test"
 import fs from "node:fs"
 import path from "node:path"
 import { Project, SyntaxKind } from "ts-morph"
+import { WorktreeImporter } from "../../src/agent-manager/worktree-importer"
 
 const ROOT = path.resolve(import.meta.dir, "../..")
 const KILO_PROVIDER_FILE = path.join(ROOT, "src/KiloProvider.ts")
@@ -40,6 +41,13 @@ const TSX_FILES = [
   path.join(ROOT, "webview-ui/agent-manager/SidebarSearchMenu.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/SidebarToggleButton.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/WorktreeSectionActions.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/ProjectsSection.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/ProjectSidebarBody.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/ProjectList.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/ProjectActions.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/SidebarBody.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/TabBar.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/ProjectBranchDialog.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/tab-rendering.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/terminal/TerminalTab.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/terminal/SideTerminalPanel.tsx"),
@@ -60,6 +68,10 @@ const IMPORTER_FILE = path.join(ROOT, "src/agent-manager/worktree-importer.ts")
 const SETUP_SCRIPT_RUNNER_FILE = path.join(ROOT, "src/agent-manager/SetupScriptRunner.ts")
 const RUN_MESSAGE_FILE = path.join(ROOT, "src/agent-manager/run/message.ts")
 const TERMINAL_ROUTING_FILE = path.join(ROOT, "src/agent-manager/terminal-routing.ts")
+const SCRIPT_TERMINAL_FILE = path.join(ROOT, "src/agent-manager/ScriptTerminalManager.ts")
+const SCRIPT_TERMINAL_RUNTIME_FILE = path.join(ROOT, "src/agent-manager/script-terminal-runtime.ts")
+const RUN_TASK_FILE = path.join(ROOT, "src/agent-manager/run/task.ts")
+const RUN_DESTINATION_FILE = path.join(ROOT, "src/agent-manager/run/destination.ts")
 
 function readAllCss(): string {
   return CSS_FILES.map((f) => fs.readFileSync(f, "utf-8")).join("\n")
@@ -151,7 +163,15 @@ describe("Agent Manager Provider Messages", () => {
     const cls = source.getFirstDescendantByKind(SyntaxKind.ClassDeclaration)
     const method = cls?.getMethod(name)
     expect(method, `method ${name} not found in AgentManagerProvider`).toBeTruthy()
-    return method!.getText()
+    const text = method!.getText()
+    // Follow one-line delegations into the extracted lifecycle module so the
+    // assertions keep covering the real handler logic.
+    const delegated = text.match(/return (\w+Lifecycle\w+)\(/)
+    if (!delegated) return text
+    const lifecycle = project.addSourceFileAtPath(path.join(ROOT, "src/agent-manager/provider-lifecycle.ts"))
+    const fn = lifecycle.getFunction(delegated[1]!)
+    expect(fn, `delegated function ${delegated[1]} not found in provider-lifecycle`).toBeTruthy()
+    return fn!.getText()
   }
 
   /**
@@ -179,8 +199,38 @@ describe("Agent Manager Provider Messages", () => {
     expect(warmup).toBeLessThan(create)
   })
 
+  /**
+   * Regression: WorktreeDiffController calls getRoot() eagerly during
+   * construction, so the project contexts must exist before it is created.
+   * Constructing them later crashed extension activation at runtime.
+   */
+  it("creates project wiring before services that eagerly read the root", () => {
+    const text = fs.readFileSync(PROVIDER_FILE, "utf-8")
+    const wiring = text.indexOf("createProjectWiring(")
+    const diffs = text.indexOf("new WorktreeDiffController(")
+
+    expect(wiring).toBeGreaterThanOrEqual(0)
+    expect(diffs).toBeGreaterThanOrEqual(0)
+    expect(wiring).toBeLessThan(diffs)
+  })
+
+  /**
+   * Regression: project-management messages must be consumed before the
+   * state gate, because selectProject triggers the state initialization
+   * that later messages wait for.
+   */
+  it("handles project messages before state-gated dispatch", () => {
+    const body = getMethodBody("onMessage") + getMethodBody("dispatchMessage")
+    const projects = body.indexOf("handleProjectMessage(m, this.projects)")
+    const gate = body.indexOf("if (this.shouldWaitForState(m))")
+
+    expect(projects).toBeGreaterThanOrEqual(0)
+    expect(gate).toBeGreaterThanOrEqual(0)
+    expect(projects).toBeLessThan(gate)
+  })
+
   it("state-mutating messages wait for state initialization", () => {
-    const body = getMethodBody("shouldWaitForState")
+    const body = fs.readFileSync(path.join(ROOT, "src/agent-manager/project/state-gate.ts"), "utf-8")
     const messages = [
       "agentManager.setTabOrder",
       "agentManager.setWorktreeOrder",
@@ -196,13 +246,13 @@ describe("Agent Manager Provider Messages", () => {
       expect(body, `${message} should wait for loaded state`).toContain(message)
     }
 
-    expect(getMethodBody("onMessage")).toContain("if (this.shouldWaitForState(m)) await this.waitForStateReady(m.type)")
+    expect(getMethodBody("dispatchMessage")).toContain("if (this.shouldWaitForState(m))")
   })
 
-  it("initializeState updates local git exclude before loading persisted state", () => {
-    const body = getMethodBody("initializeState")
-    const exclude = body.indexOf("await this.ensureGitExclude(manager)")
-    const load = body.indexOf("const loaded = await state.load()")
+  it("context state init updates local git exclude before loading persisted state", () => {
+    const text = fs.readFileSync(path.join(ROOT, "src/agent-manager/project/init.ts"), "utf-8")
+    const exclude = text.indexOf("ensureGitExclude(")
+    const load = text.indexOf("state.load()")
 
     expect(exclude).toBeGreaterThanOrEqual(0)
     expect(load).toBeGreaterThanOrEqual(0)
@@ -225,7 +275,7 @@ describe("Agent Manager Provider Messages", () => {
     expect(body).toContain("closedDrafts.add(sessionId)")
     expect(body).toContain('vscode.postMessage({ type: "agentManager.closeSession", sessionId })')
     expect(body).not.toContain('type: "agentManager.forgetSession"')
-    expect(getMethodBody("onCloseSession")).toContain("await this.panel?.sessions.abortSessions([sessionId])")
+    expect(getMethodBody("onCloseSession")).toContain("await host.sessions.abort([sessionId])")
     expect(text).toContain("if (created.draftID && closedDrafts.delete(created.draftID)) return")
   })
 
@@ -376,7 +426,19 @@ describe("Agent Manager Provider — onMessage routing", () => {
     setup()
     const method = cls.getMethod(name)
     expect(method, `method ${name} not found`).toBeTruthy()
-    return method!.getText()
+    const text = method!.getText()
+    // Follow one-line delegations into the extracted handler modules so the
+    // assertions keep covering the real handler logic.
+    const delegated = text.match(/return (\w+Lifecycle\w+|createMultiVersion)\(/)
+    if (!delegated) return text
+    const module = delegated[1] === "createMultiVersion" ? "provider-multi-version.ts" : "provider-lifecycle.ts"
+    const lifecycle = source.getProject().addSourceFileAtPath(path.join(ROOT, "src/agent-manager", module))
+    const fn = lifecycle.getFunction(delegated[1]!)
+    expect(fn, `delegated function ${delegated[1]} not found in ${module}`).toBeTruthy()
+    // The multi-version flow spans phase helpers (createVersion, sendInitialPrompts),
+    // so ordering assertions need the whole module, not just the orchestrator.
+    if (delegated[1] === "createMultiVersion") return lifecycle.getText()
+    return fn!.getText()
   }
 
   function provider(): string {
@@ -411,6 +473,7 @@ describe("Agent Manager Provider — onMessage routing", () => {
       "agentManager.stopRunScript",
       "agentManager.showTerminal",
       "agentManager.showLocalTerminal",
+      "agentManager.showWorktreeTerminal",
       "agentManager.showExistingLocalTerminal",
       "agentManager.requestRepoInfo",
       "agentManager.requestState",
@@ -445,7 +508,7 @@ describe("Agent Manager Provider — onMessage routing", () => {
   })
 
   it("onMessage delegates to cohesive routing groups", () => {
-    const text = body("onMessage")
+    const text = body("onMessage") + body("dispatchMessage")
     expect(text).toContain("onWorktreeMessage")
     expect(text).toContain("onSessionMessage")
     expect(text).toContain("onImportMessage")
@@ -453,6 +516,53 @@ describe("Agent Manager Provider — onMessage routing", () => {
     expect(text).not.toContain("agentManager.requestState")
   })
 
+  it("routes script terminal close and resize messages before user terminals", () => {
+    const text = body("dispatchMessage")
+    expect(text.indexOf("this.scripts.manager.intercept(m)")).toBeLessThan(
+      text.indexOf("this.terminalRouter.handle(m)"),
+    )
+  })
+
+  it("runs scripts through the vscode-free canonical PTY manager", () => {
+    const text = fs.readFileSync(SCRIPT_TERMINAL_FILE, "utf-8")
+    expect(text).toMatch(/client\.v2\.pty\s*\.create/)
+    expect(text).toContain("client.v2.pty.get")
+    expect(text).toContain("client.v2.pty.update")
+    expect(text).toContain("client.v2.pty.remove")
+    expect(text).not.toContain("vscode")
+  })
+
+  it("selects the Run adapter from the panel dropdown message", () => {
+    const text = fs.readFileSync(SCRIPT_TERMINAL_RUNTIME_FILE, "utf-8")
+    expect(text).toContain("pickRunStart")
+    expect(text).toContain("config.destination")
+    expect(text).not.toContain("readRunTerminalDestination")
+    expect(text.indexOf("pickRunStart")).toBeLessThan(text.indexOf("config.destination"))
+  })
+
+  it("keeps the legacy integrated Run adapter isolated and removable", () => {
+    const task = fs.readFileSync(RUN_TASK_FILE, "utf-8")
+    expect(task).toContain("vscode.tasks.executeTask")
+    expect(task).toContain("Remove this")
+    const dest = fs.readFileSync(RUN_DESTINATION_FILE, "utf-8")
+    expect(dest).not.toContain('from "vscode"')
+    expect(dest).toContain("pickRunStart")
+    expect(dest).not.toContain("getConfiguration")
+  })
+
+  it("clears retained script terminals before removing worktree state", () => {
+    for (const name of ["onDeleteWorktree", "onRemoveStaleWorktree"]) {
+      const text = body(name)
+      expect(text).toContain("host.clearRun(worktreeId)")
+      expect(text.indexOf("host.clearRun(worktreeId)")).toBeLessThan(text.indexOf("state.removeWorktree"))
+    }
+    const deleted = body("onDeleteWorktree")
+    expect(deleted.indexOf("host.skipStats")).toBeLessThan(deleted.indexOf("host.removeRun"))
+    const helper = fs.readFileSync(path.join(ROOT, "src/agent-manager/script-terminal-runtime.ts"), "utf-8")
+    expect(helper).toContain('manager.clear("run", worktreeId, projectId)')
+    expect(helper).toContain('manager.clear("setup", worktreeId, projectId)')
+  })
+
   // -- onDeleteWorktree invariants -------------------------------------------
 
   /**
@@ -461,10 +571,10 @@ describe("Agent Manager Provider — onMessage routing", () => {
    */
   it("onDeleteWorktree removes from disk, state, clears orphans, and pushes", () => {
     const text = body("onDeleteWorktree")
-    expect(text).toContain("manager.removeWorktree")
+    expect(text).toContain("worktreeManager().removeWorktree")
     expect(text).toContain("state.removeWorktree")
-    expect(text).toContain("clearSessionDirectory")
-    expect(text).toContain("this.pushState()")
+    expect(text).toContain("sessions.clearDirectory")
+    expect(text).toContain("host.push()")
   })
 
   // -- onCreateWorktree invariants -------------------------------------------
@@ -476,8 +586,8 @@ describe("Agent Manager Provider — onMessage routing", () => {
    */
   it("onCreateWorktree runs setup script before creating session", () => {
     const text = body("onCreateWorktree")
-    const setupIdx = text.indexOf("runSetupScriptForWorktree")
-    const sessionIdx = text.indexOf("createSessionInWorktree")
+    const setupIdx = text.indexOf("host.runSetup(")
+    const sessionIdx = text.indexOf("host.createSession(")
     expect(setupIdx, "setup script call must exist").toBeGreaterThan(-1)
     expect(sessionIdx, "session creation call must exist").toBeGreaterThan(-1)
     expect(setupIdx, "setup script must run before session creation").toBeLessThan(sessionIdx)
@@ -494,8 +604,8 @@ describe("Agent Manager Provider — onMessage routing", () => {
 
   it("multi-version creation registers each session after publishing its worktree mapping", () => {
     const text = body("onCreateMultiVersion")
-    const ready = text.indexOf("this.notifyWorktreeReady(session.id, wt.result, wt.worktree.id)")
-    const register = text.indexOf("this.panel?.sessions.registerSession(session)")
+    const ready = text.indexOf("host.notifyReady(session.id, wt.result, wt.worktree.id)")
+    const register = text.indexOf("host.sessions.register(session)")
     const initial = text.indexOf("agentManager.sendInitialMessage")
 
     expect(ready, "multi-version path must publish ready state").toBeGreaterThan(-1)
@@ -512,7 +622,7 @@ describe("Agent Manager Provider — onMessage routing", () => {
    */
   it("onPromoteSession runs setup script before modifying session", () => {
     const text = body("onPromoteSession")
-    const setupIdx = text.indexOf("runSetupScriptForWorktree")
+    const setupIdx = text.indexOf("host.runSetup(")
     const moveIdx = text.indexOf("moveSession")
     expect(setupIdx).toBeGreaterThan(-1)
     expect(moveIdx).toBeGreaterThan(-1)
@@ -570,18 +680,70 @@ describe("Agent Manager Provider — onMessage routing", () => {
     expect(text).toContain("class WorktreeDiffController")
     expect(text).toContain("buildWorktreePatch")
     expect(text).toContain("revertFile")
-    expect(text).toContain("diffSummary")
+    // Summary/detail diff data comes from the shared DiffSourceCatalog sources
+    // (workspace/staged/unstaged/session), not a bespoke in-controller pipeline.
+    expect(text).toContain("catalog.build")
     expect(text).toContain("shouldStopDiffPolling")
     expect(providerText).toContain("this.diffs")
   })
 
   it("worktree import behavior lives in the cohesive importer", () => {
     const text = importer()
-    const providerText = body("onImportMessage")
-    expect(text).toContain("class WorktreeImporter")
-    expect(text).toContain("createFromPR")
-    expect(text).toContain("createWorktree")
-    expect(providerText).toContain("this.importer")
+    for (const value of ["createFromPR", "createWorktree", "this.busy()"]) expect(text).toContain(value)
+    expect(body("onImportMessage")).toContain("this.importer")
+  })
+
+  it("preserves branch and PR import ordering and rollback", async () => {
+    const run = async (kind: "branch" | "pr", fail?: "setup" | "duplicate") => {
+      const events: string[] = []
+      const create = async () => {
+        events.push("create")
+        if (fail === "duplicate") throw new Error("already checked out")
+        return { branch: "topic", path: "/repo/topic", parentBranch: "main" }
+      }
+      const importer = new WorktreeImporter({
+        manager: () =>
+          ({ createWorktree: create, createFromPR: create, removeWorktree: async () => events.push("disk") }) as never,
+        state: () =>
+          ({
+            addWorktree: (input: { branchOwned: boolean }) => ({
+              id: events.push(`add:${input.branchOwned}`) ? "worktree" : "",
+            }),
+            addSession: () => events.push("state-session"),
+            removeWorktree: () => events.push("state-remove"),
+          }) as never,
+        post: (msg) => events.push("message" in msg ? String(msg.message) : msg.type),
+        push: () => events.push("push"),
+        setup: async () => {
+          events.push("setup")
+          if (fail === "setup") throw new Error("setup failed")
+        },
+        session: async () => (events.push("session"), { id: "session" }) as never,
+        register: () => events.push("register"),
+        ready: () => events.push("ready"),
+        log: () => events.push("log"),
+      })
+      const action = () => (kind === "branch" ? importer.branch("topic") : importer.pr("https://example.test/pull/1"))
+      await action()
+      if (fail === "setup") await action()
+      return events.join("|")
+    }
+    for (const kind of ["branch", "pr"] as const) {
+      const branch = kind === "branch"
+      const creating = branch ? "Creating worktree from branch..." : "Resolving PR..."
+      const setup = branch ? "Running setup script..." : "Setting up worktree..."
+      const success = branch ? "Opened branch topic" : "Opened PR branch topic"
+      expect(await run(kind)).toBe(
+        `${creating}|create|add:false|push|${setup}|setup|session|state-session|register|ready|${success}|log`,
+      )
+      expect(await run(kind, "setup")).toBe(
+        `${creating}|create|add:false|push|${setup}|setup|state-remove|disk|push|setup failed|setup failed|${creating}|create|add:false|push|${setup}|setup|state-remove|disk|push|setup failed|setup failed`,
+      )
+      const duplicate = branch
+        ? 'Branch "topic" is already checked out in another worktree'
+        : "This PR's branch is already checked out in another worktree"
+      expect(await run(kind, "duplicate")).toBe(`${creating}|create|${duplicate}|${duplicate}`)
+    }
   })
 })
 
@@ -602,7 +764,7 @@ describe("Agent Manager Webview — non-git sessionsLoaded fix", () => {
     // Find the agentManager.state handler block
     const start = tsx.indexOf('"agentManager.state"')
     expect(start, "agentManager.state handler must exist").toBeGreaterThan(-1)
-    const snippet = tsx.slice(start, start + 800)
+    const snippet = tsx.slice(start, start + 1600)
     expect(snippet, "must call setSessionsLoaded in the non-git branch").toContain("setSessionsLoaded")
     expect(snippet, "must check isGitRepo === false before setting sessionsLoaded").toMatch(
       /isGitRepo.*false|false.*isGitRepo/,
@@ -790,9 +952,6 @@ const VSCODE_ALLOWED: Record<string, { note: string }> = {
   "task-runner.ts": {
     note: "vscode adapter for SetupScriptRunner",
   },
-  "run/task.ts": {
-    note: "vscode adapter for Agent Manager run scripts",
-  },
   // Reads terminal.integrated.* and editor.font* config for xterm font settings
   "terminal-font.ts": {
     note: "vscode config reader for integrated terminal font settings",
@@ -817,8 +976,8 @@ const VSCODE_ALLOWED: Record<string, { note: string }> = {
  */
 const MAX_LINES: Record<string, { maxLines: number; note: string }> = {
   "AgentManagerProvider.ts": {
-    maxLines: 2000,
-    note: "diff and import workflows are extracted into cohesive domain services; extract more orchestration next",
+    maxLines: 1900,
+    note: "worktree lifecycle handlers extracted into provider-lifecycle.ts; extract more orchestration next",
   },
 }
 
@@ -891,70 +1050,73 @@ describe("Agent Manager — VS Code import boundary", () => {
   })
 })
 
-// ---------------------------------------------------------------------------
-// Provider chain parity — sidebar App.tsx vs AgentManagerApp.tsx
-//
-// The agent manager reuses ChatView (and therefore MessageList, etc.) from the
-// sidebar. Any context provider that ChatView's tree may call useXxx() on must
-// also be present in the agent manager's provider chain. A missing provider
-// crashes the entire SolidJS component tree silently.
-//
-// Regression: PR #7473 moved KiloNotifications into MessageList. It calls
-// useNotifications(), but NotificationsProvider was only in App.tsx — the agent
-// manager rendered a blank screen.
-// ---------------------------------------------------------------------------
-
 const APP_FILE = path.join(ROOT, "webview-ui/src/App.tsx")
 const AGENT_MANAGER_APP_FILE = path.join(ROOT, "webview-ui/agent-manager/AgentManagerApp.tsx")
+const PROVIDER_SHELL_FILE = path.join(ROOT, "webview-ui/src/context/provider-shell.tsx")
 
-describe("Agent Manager — provider chain parity with sidebar", () => {
-  /**
-   * Extract provider component names used as JSX elements in a file.
-   * Matches `<FooProvider` and `<FooProvider>` patterns, returning the names.
-   */
-  function extractProviders(content: string): string[] {
-    const matches = [...content.matchAll(/<(\w+Provider)\b/g)]
-    return [...new Set(matches.map((m) => m[1]!))]
+describe("Shared webview provider shell", () => {
+  function ordered(source: string, names: string[]) {
+    const positions = names.map((name) => source.indexOf(`<${name}`))
+    expect(
+      positions.every((position) => position >= 0),
+      `Missing provider from ${names.join(" -> ")}`,
+    ).toBe(true)
+    expect(positions).toEqual([...positions].sort((a, b) => a - b))
   }
 
-  /**
-   * Providers that the agent manager intentionally omits because it does not
-   * use the components that depend on them. If a shared component (ChatView,
-   * MessageList, etc.) starts using one of these, the test will fail and
-   * force the developer to add the provider to AgentManagerApp.tsx.
-   */
-  const KNOWN_EXCLUSIONS: string[] = [
-    // These are wrapped by LanguageBridge and DataBridge respectively,
-    // which the agent manager already includes in its provider chain.
-    "LanguageProvider",
-    "DataProvider",
-    // Agent Manager owns its local session tabs and ChatView only reads this
-    // optional context in the standard sidebar/editor webview.
-    "LocalTabsProvider",
-    // Work-style onboarding is injected only into the sidebar empty state.
-    "WorkStyleProvider",
-  ]
+  it("owns the common provider order and bridges", () => {
+    const source = fs.readFileSync(PROVIDER_SHELL_FILE, "utf-8")
+    ordered(source, [
+      "ThemeProvider",
+      "DialogProvider",
+      "VSCodeProvider",
+      "MermaidDownloadBridge",
+      "ServerProvider",
+      "LanguageBridge",
+      "MarkedProvider",
+      "DiffComponentProvider",
+      "CodeComponentProvider",
+      "FileComponentProvider",
+      "ProviderProvider",
+      "ConfigProvider",
+      "SpeechToTextPrewarm",
+      "DisplayProvider",
+      "IndexingProvider",
+      "KiloEmbeddingModelsProvider",
+      "ImageModelsProvider",
+      "NotificationsProvider",
+      "SessionProvider",
+      "AgentRequirementsProvider",
+      "MemoryProvider",
+      "FeedbackProvider",
+    ])
+    expect(source.indexOf("<Toast.Region")).toBeGreaterThan(source.indexOf("</VSCodeProvider>"))
+  })
 
-  it("agent manager includes all context providers from sidebar App.tsx", () => {
-    const sidebar = fs.readFileSync(APP_FILE, "utf-8")
-    const agent = fs.readFileSync(AGENT_MANAGER_APP_FILE, "utf-8")
+  it("keeps sidebar-only providers in the sidebar root", () => {
+    const source = fs.readFileSync(APP_FILE, "utf-8")
+    ordered(source, [
+      "ProviderShell.Root",
+      "WorkStyleProvider",
+      "ProviderShell.Session",
+      "LocalTabsProvider",
+      "ProviderShell.Chat",
+      "DataBridge",
+      "AppContent",
+    ])
+    expect(fs.readFileSync(PROVIDER_SHELL_FILE, "utf-8")).not.toMatch(/WorkStyleProvider|LocalTabsProvider/)
+  })
 
-    const sidebarProviders = extractProviders(sidebar)
-    const agentProviders = extractProviders(agent)
-    const agentSet = new Set(agentProviders)
-    const excluded = new Set(KNOWN_EXCLUSIONS)
-
-    const missing = sidebarProviders.filter((p) => !agentSet.has(p) && !excluded.has(p))
-
-    expect(
-      missing,
-      `These providers are in App.tsx but missing from AgentManagerApp.tsx.\n` +
-        `The agent manager reuses ChatView — any provider that ChatView's component\n` +
-        `tree depends on must be present in both provider chains.\n\n` +
-        `Missing providers:\n` +
-        missing.map((p) => `  - ${p}`).join("\n") +
-        `\n\nFix: add the missing <${missing[0]}> to AgentManagerApp.tsx's provider chain,\n` +
-        `or add it to KNOWN_EXCLUSIONS with a justification if it's truly unused.`,
-    ).toEqual([])
+  it("keeps worktree mode in the Agent Manager root", () => {
+    const source = fs.readFileSync(AGENT_MANAGER_APP_FILE, "utf-8")
+    ordered(source, [
+      "ProviderShell.Root",
+      "ProviderShell.Session",
+      "ProviderShell.Chat",
+      "WorktreeModeProvider",
+      "DataBridge",
+      "AgentManagerContent",
+    ])
+    expect(fs.readFileSync(PROVIDER_SHELL_FILE, "utf-8")).not.toContain("WorktreeModeProvider")
   })
 })
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-close-session.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-close-session.test.ts
index 5575c78bb4..6ad70d26c8 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-close-session.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-close-session.test.ts
@@ -3,6 +3,8 @@ import { describe, expect, it, mock } from "bun:test"
 const { AgentManagerProvider } = await import("../../src/agent-manager/AgentManagerProvider")
 
 type Manager = {
+  projectScope: { current: () => unknown; run: (ctx: unknown, fn: () => unknown) => unknown }
+  contexts: { active: () => unknown }
   connectionService: { getClient: () => unknown }
   panel: {
     postMessage: (message: unknown) => void
@@ -61,6 +63,14 @@ function createManager(options?: { dir?: string; panelDir?: string; state?: bool
   manager.getRoot = () => "/repo"
   manager.pushState = mock(() => undefined)
   manager.log = mock(() => undefined)
+  const ctx = {
+    peekState: () => (options?.state === false ? undefined : state),
+    root: "/repo",
+    stale: new Set<string>(),
+    worktreeManager: () => ({}),
+  }
+  manager.projectScope = { current: () => ctx, run: (_: unknown, fn: () => unknown) => fn() }
+  manager.contexts = { active: () => ctx }
 
   return { manager, stopped, aborted, cleared, removed, messages, events }
 }
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-diff-scope-state.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-diff-scope-state.test.ts
new file mode 100644
index 0000000000..a387f16387
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-diff-scope-state.test.ts
@@ -0,0 +1,32 @@
+import { describe, it, expect } from "bun:test"
+import { composeDiffId, parseDiffId, scopeDescriptors } from "../../webview-ui/agent-manager/diff-scope-state"
+
+describe("agent-manager webview diff scope descriptors", () => {
+  it("offers the three git scopes without an active session", () => {
+    const descriptors = scopeDescriptors("wt_1")
+    expect(descriptors.map((d) => d.type)).toEqual(["workspace", "staged", "unstaged"])
+    expect(descriptors.map((d) => d.id)).toEqual(["wt_1#branch", "wt_1#staged", "wt_1#unstaged"])
+  })
+
+  it("adds the session scope with the active session embedded", () => {
+    const descriptors = scopeDescriptors("wt_1", "ses_abc")
+    expect(descriptors.map((d) => d.type)).toEqual(["workspace", "staged", "unstaged", "session"])
+    const session = descriptors[3]!
+    expect(session.id).toBe("wt_1#session:ses_abc")
+    expect(session.group).toBe("Session")
+    expect(session.capabilities.revert).toBe(false)
+  })
+
+  it("embeds the active local session for the local context", () => {
+    const descriptors = scopeDescriptors("local", "ses_abc")
+    expect(descriptors[3]!.id).toBe("local#session:ses_abc")
+  })
+
+  it("round-trips the session descriptor id", () => {
+    expect(parseDiffId(composeDiffId("wt_1", "session", "ses_abc"))).toEqual({
+      ctx: "wt_1",
+      scope: "session",
+      sessionId: "ses_abc",
+    })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-i18n-split.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-i18n-split.test.ts
index ab0965fa7e..3b7477aafc 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-i18n-split.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-i18n-split.test.ts
@@ -39,6 +39,7 @@ import { dict as amTr } from "../../webview-ui/agent-manager/i18n/tr"
 import { dict as amNl } from "../../webview-ui/agent-manager/i18n/nl"
 import { dict as amUk } from "../../webview-ui/agent-manager/i18n/uk"
 import { dict as amIt } from "../../webview-ui/agent-manager/i18n/it"
+import { dict as amFa } from "../../webview-ui/agent-manager/i18n/fa"
 
 const PREFIX = "agentManager."
 
@@ -63,6 +64,7 @@ const locales = {
   nl: amNl,
   uk: amUk,
   it: amIt,
+  fa: amFa,
 }
 
 const appLocales = {
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-chrome.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-chrome.test.ts
new file mode 100644
index 0000000000..c35a6a53e9
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-chrome.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from "bun:test"
+import { terminalChrome, terminalClosable, terminalStoppable } from "../../webview-ui/agent-manager/terminal/chrome"
+
+describe("Agent Manager Run terminal chrome", () => {
+  it("keeps the console icon for user terminals", () => {
+    expect(terminalChrome("Terminal 1", undefined)).toEqual({ icon: "console", tooltip: "Terminal 1" })
+  })
+
+  it("renders compact status icons with accessible Run status details", () => {
+    expect(terminalChrome("Run", { state: "running", kind: "run" })).toEqual({
+      icon: "spinner",
+      tooltip: "Run (Running)",
+    })
+    expect(terminalChrome("Run", { state: "stopping", kind: "run" })).toEqual({
+      icon: "spinner",
+      tooltip: "Run (Stopping)",
+    })
+    expect(terminalChrome("Run", { state: "exited", exitCode: 0, kind: "run" })).toEqual({
+      icon: "success",
+      tooltip: "Run (Exited, code 0)",
+    })
+    expect(terminalChrome("Run", { state: "exited", exitCode: 1, kind: "run" })).toEqual({
+      icon: "failure",
+      tooltip: "Run (Exited, code 1)",
+    })
+    expect(terminalChrome("Run", { state: "failed", kind: "run" })).toEqual({
+      icon: "failure",
+      tooltip: "Run (Failed)",
+    })
+  })
+
+  it("keeps a running Setup tab unclosable until the script settles", () => {
+    expect(terminalClosable(undefined)).toBe(true)
+    expect(terminalClosable({ state: "running", kind: "run" })).toBe(true)
+    expect(terminalClosable({ state: "running", kind: "setup" })).toBe(false)
+    expect(terminalClosable({ state: "stopping", kind: "setup" })).toBe(false)
+    expect(terminalClosable({ state: "exited", exitCode: 0, kind: "setup" })).toBe(true)
+    expect(terminalClosable({ state: "exited", exitCode: 1, kind: "setup" })).toBe(true)
+    expect(terminalClosable({ state: "failed", kind: "setup" })).toBe(true)
+  })
+
+  it("offers a deliberate stop only while Setup is running", () => {
+    expect(terminalStoppable(undefined)).toBe(false)
+    expect(terminalStoppable({ state: "running", kind: "run" })).toBe(false)
+    expect(terminalStoppable({ state: "running", kind: "setup" })).toBe(true)
+    expect(terminalStoppable({ state: "stopping", kind: "setup" })).toBe(false)
+    expect(terminalStoppable({ state: "exited", exitCode: 1, kind: "setup" })).toBe(false)
+    expect(terminalStoppable({ state: "failed", kind: "setup" })).toBe(false)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-destination.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-destination.test.ts
index 40330aa29c..9bc9472b49 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-terminal-destination.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-destination.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from "bun:test"
-import { affectsTerminalDestination, resolveTerminalDestination } from "../../src/agent-manager/terminal-destination"
+import {
+  DestinationState,
+  affectsTerminalDestination,
+  resolveTerminalDestination,
+} from "../../src/agent-manager/terminal-destination"
 
 function event(key: string) {
   return {
@@ -19,4 +23,13 @@ describe("Agent Manager terminal destination", () => {
     expect(affectsTerminalDestination(event("kilo-code.new.agentManager.terminalButtonDestination"))).toBe(true)
     expect(affectsTerminalDestination(event("terminal.integrated.fontFamily"))).toBe(false)
   })
+
+  it("lets a panel-local choice beat later setting echoes", () => {
+    const state = new DestinationState("vscode")
+    state.sync("agentManager")
+    expect(state.value()).toBe("agentManager")
+    state.select("agentManager")
+    state.sync("vscode")
+    expect(state.value()).toBe("agentManager")
+  })
 })
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-font.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-font.test.ts
index 64504d2600..02b7fffe27 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-terminal-font.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-font.test.ts
@@ -53,6 +53,7 @@ describe("Agent Manager terminal font", () => {
     const message = new Promise<AgentManagerOutMessage>((resolve) => {
       const router = new TerminalRouter({
         getClient: () => client,
+        getClientAsync: async () => client,
         getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
         getRoot: () => "/workspace",
         getWorktreePath: () => undefined,
@@ -77,6 +78,7 @@ describe("Agent Manager terminal font", () => {
     expect(created.font).toEqual(font)
     expect(created.worktreeId).toBeNull()
     expect(created.wsUrl).toContain("/pty/pty-1/connect")
+    expect(created.wsUrl).toContain("cursor=0")
   })
 
   it("keeps the created font in terminal state", () => {
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-layout.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-layout.test.ts
new file mode 100644
index 0000000000..f30ba800e5
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-layout.test.ts
@@ -0,0 +1,15 @@
+import { expect, test } from "bun:test"
+import { readFileSync } from "node:fs"
+import { resolve } from "node:path"
+
+const css = readFileSync(resolve(import.meta.dir, "../../webview-ui/agent-manager/agent-manager.css"), "utf8")
+
+test("xterm owns the padding used by FitAddon", () => {
+  const host = css.match(/\.am-terminal-host\s*\{([^}]*)\}/)?.[1]
+  const term = css.match(/\.am-terminal-host \[class~="xterm"\]\s*\{([^}]*)\}/)?.[1]
+
+  expect(host).toBeDefined()
+  expect(term).toBeDefined()
+  expect(host).not.toMatch(/\bpadding\s*:/)
+  expect(term).toMatch(/\bpadding\s*:\s*8px\s*;/)
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-routing.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-routing.test.ts
index bfa243d1fc..ef9bfcd6c4 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-terminal-routing.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-routing.test.ts
@@ -21,6 +21,7 @@ describe("Agent Manager terminal routing", () => {
     } as unknown as KiloClient
     const router = new TerminalRouter({
       getClient: () => client,
+      getClientAsync: async () => client,
       getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
       getRoot: () => "/workspace",
       getWorktreePath: (id) => (id === "wt-1" ? "/workspace/wt-1" : undefined),
@@ -78,6 +79,7 @@ describe("Agent Manager terminal routing", () => {
     } as unknown as KiloClient
     const router = new TerminalRouter({
       getClient: () => client,
+      getClientAsync: async () => client,
       getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
       getRoot: () => "/workspace",
       getWorktreePath: () => undefined,
@@ -108,4 +110,174 @@ describe("Agent Manager terminal routing", () => {
     await router.dispose()
     expect(removed).toContain("pty-new")
   })
+
+  it("fills numbering gaps left by closed terminals", async () => {
+    const messages: AgentManagerOutMessage[] = []
+    const titles: string[] = []
+    let seq = 0
+    const client = {
+      pty: {
+        create: async ({ title }: { title: string }) => {
+          titles.push(title)
+          seq++
+          return { data: { id: `pty-${seq}`, title } }
+        },
+        remove: async () => ({ data: true }),
+        update: async () => ({ data: true }),
+      },
+    } as unknown as KiloClient
+    const router = new TerminalRouter({
+      getClient: () => client,
+      getClientAsync: async () => client,
+      getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
+      getRoot: () => "/workspace",
+      getWorktreePath: () => undefined,
+      log: () => undefined,
+      post: (message) => messages.push(message),
+      getTerminalFont: () => font,
+    })
+    const create = (createId: string) =>
+      router.handle({ type: "agentManager.terminal.create", createId, placement: "side", worktreeId: null })
+
+    create("one")
+    await wait()
+    create("two")
+    await wait()
+    expect(titles).toEqual(["Terminal 1", "Terminal 2"])
+
+    // Close "Terminal 1"; the next create reuses the freed number.
+    const first = messages.find((m) => m.type === "agentManager.terminal.created" && m.createId === "one")
+    if (first?.type !== "agentManager.terminal.created") throw new Error("missing created message")
+    router.handle({ type: "agentManager.terminal.close", terminalId: first.terminalId })
+    await wait()
+
+    create("three")
+    await wait()
+    expect(titles).toEqual(["Terminal 1", "Terminal 2", "Terminal 1"])
+    await router.dispose()
+  })
+
+  it("hands out distinct numbers to concurrent creates", async () => {
+    const messages: AgentManagerOutMessage[] = []
+    const titles: string[] = []
+    const resolvers: Array<(value: { data: { id: string; title: string } }) => void> = []
+    const client = {
+      pty: {
+        create: ({ title }: { title: string }) =>
+          new Promise<{ data: { id: string; title: string } }>((resolve) => {
+            titles.push(title)
+            resolvers.push(resolve)
+          }),
+        remove: async () => ({ data: true }),
+        update: async () => ({ data: true }),
+      },
+    } as unknown as KiloClient
+    const router = new TerminalRouter({
+      getClient: () => client,
+      getClientAsync: async () => client,
+      getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
+      getRoot: () => "/workspace",
+      getWorktreePath: () => undefined,
+      log: () => undefined,
+      post: (message) => messages.push(message),
+      getTerminalFont: () => font,
+    })
+
+    // Two creates before either settles must not share an ordinal. The
+    // backend-connection await defers the PTY creates to a microtask.
+    router.handle({ type: "agentManager.terminal.create", createId: "a", placement: "side", worktreeId: null })
+    router.handle({ type: "agentManager.terminal.create", createId: "b", placement: "side", worktreeId: null })
+    await wait()
+    expect(titles).toEqual(["Terminal 1", "Terminal 2"])
+    resolvers[0]?.({ data: { id: "pty-a", title: titles[0]! } })
+    resolvers[1]?.({ data: { id: "pty-b", title: titles[1]! } })
+    await wait()
+
+    // A failed create releases its reservation for the next attempt.
+    await router.dispose()
+  })
+
+  it("does not let a stale create release a new generation's reservation", async () => {
+    const titles: string[] = []
+    const resolvers: Array<(value: { data: { id: string; title: string } }) => void> = []
+    const client = {
+      pty: {
+        create: ({ title }: { title: string }) =>
+          new Promise<{ data: { id: string; title: string } }>((resolve) => {
+            titles.push(title)
+            resolvers.push(resolve)
+          }),
+        remove: async () => ({ data: true }),
+        update: async () => ({ data: true }),
+      },
+    } as unknown as KiloClient
+    const router = new TerminalRouter({
+      getClient: () => client,
+      getClientAsync: async () => client,
+      getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
+      getRoot: () => "/workspace",
+      getWorktreePath: () => undefined,
+      log: () => undefined,
+      post: () => undefined,
+      getTerminalFont: () => font,
+    })
+
+    // Create A starts before the panel is recreated; its reservation dies
+    // with dispose(). Create B of the new generation reserves the same
+    // free number. When A's late completion settles, its release must not
+    // wipe B's reservation — otherwise create C would duplicate B's title.
+    router.handle({ type: "agentManager.terminal.create", createId: "a", placement: "side", worktreeId: null })
+    await router.dispose()
+    router.handle({ type: "agentManager.terminal.create", createId: "b", placement: "side", worktreeId: null })
+    await wait()
+    expect(titles).toEqual(["Terminal 1", "Terminal 1"])
+    resolvers[0]?.({ data: { id: "pty-a", title: titles[0]! } })
+    await wait()
+    router.handle({ type: "agentManager.terminal.create", createId: "c", placement: "side", worktreeId: null })
+    await wait()
+    expect(titles).toEqual(["Terminal 1", "Terminal 1", "Terminal 2"])
+    await router.dispose()
+  })
+
+  it("awaits the shared backend connection before creating a terminal", async () => {
+    let connected = false
+    const client = {
+      pty: {
+        create: async () => ({ data: { id: "pty-1", title: "Terminal 1" } }),
+        remove: async () => ({ data: true }),
+        update: async () => ({ data: true }),
+      },
+    } as unknown as KiloClient
+    const messages: AgentManagerOutMessage[] = []
+    const router = new TerminalRouter({
+      getClient: () => {
+        if (!connected) throw new Error("Not connected")
+        return client
+      },
+      getClientAsync: async () => {
+        await wait()
+        connected = true
+        return client
+      },
+      getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
+      getRoot: () => "/workspace",
+      getWorktreePath: () => undefined,
+      log: () => undefined,
+      post: (message) => messages.push(message),
+      getTerminalFont: () => font,
+    })
+
+    router.handle({
+      type: "agentManager.terminal.create",
+      createId: "real",
+      placement: "tab",
+      worktreeId: null,
+    })
+    expect(messages).toHaveLength(0)
+    await wait()
+    await wait()
+
+    expect(messages[0]).toMatchObject({ type: "agentManager.terminal.created", createId: "real" })
+    await router.dispose()
+  })
 })
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-side.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-side.test.ts
index 199d3adca2..a3fbb00fec 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-terminal-side.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-side.test.ts
@@ -1,32 +1,48 @@
 import { describe, expect, it } from "bun:test"
-import { createSideTerminal } from "../../webview-ui/agent-manager/terminal/side"
+import {
+  createSideTerminal,
+  readSavedDestination,
+  resolveRunScriptRequest,
+  resolveVscodeTerminalRequest,
+} from "../../webview-ui/agent-manager/terminal/side"
 
-function scene(opts: { destination?: "vscode" | "agentManager"; visible?: boolean; focused?: boolean } = {}) {
+function scene(
+  opts: {
+    destination?: "vscode" | "agentManager"
+    saved?: "vscode" | "agentManager"
+    visible?: boolean
+    focusedId?: string
+    mac?: boolean
+  } = {},
+) {
   const calls = {
     requestSide: 0,
-    closeSide: 0,
+    ensureSide: 0,
+    closed: [] as string[],
     hide: 0,
     refocus: 0,
     openVscode: 0,
+    persisted: [] as string[],
     posted: [] as Array<Record<string, unknown>>,
     tracked: [] as string[],
   }
   let visible = opts.visible ?? false
-  let focused = opts.focused ?? false
+  let focusedId = opts.focusedId as string | undefined
   const ctl = createSideTerminal({
     handlers: {
       requestSide: () => {
         calls.requestSide++
         visible = true
       },
-      closeSide: () => {
-        calls.closeSide++
-        visible = false
+      ensureSide: () => calls.ensureSide++,
+      closeSide: (terminalId) => {
+        calls.closed.push(terminalId)
+        focusedId = undefined
         return true
       },
     },
     visible: () => visible,
-    focused: () => focused,
+    focusedId: () => focusedId,
     hide: () => {
       calls.hide++
       visible = false
@@ -35,19 +51,22 @@ function scene(opts: { destination?: "vscode" | "agentManager"; visible?: boolea
     postMessage: (msg) => calls.posted.push(msg as Record<string, unknown>),
     track: (button) => calls.tracked.push(button),
     openVscode: () => calls.openVscode++,
+    saved: opts.saved,
+    save: (destination) => calls.persisted.push(destination),
+    mac: opts.mac,
   })
-  if (opts.destination) ctl.setDestination(opts.destination)
+  if (opts.destination) ctl.syncDefault(opts.destination)
   return { ctl, calls }
 }
 
 describe("Agent Manager side terminal controller", () => {
   it("toggles the panel and hands focus to the chat only when the terminal had it", () => {
-    const focused = scene({ destination: "agentManager", visible: true, focused: true })
+    const focused = scene({ destination: "agentManager", visible: true, focusedId: "terminal:side" })
     focused.ctl.toggle()
     expect(focused.calls.hide).toBe(1)
     expect(focused.calls.refocus).toBe(1)
 
-    const elsewhere = scene({ destination: "agentManager", visible: true, focused: false })
+    const elsewhere = scene({ destination: "agentManager", visible: true })
     elsewhere.ctl.toggle()
     expect(elsewhere.calls.hide).toBe(1)
     expect(elsewhere.calls.refocus).toBe(0)
@@ -58,15 +77,41 @@ describe("Agent Manager side terminal controller", () => {
     expect(hidden.calls.hide).toBe(0)
   })
 
-  it("refocuses the chat after killing a focused terminal, not otherwise", () => {
-    const focused = scene({ focused: true })
-    expect(focused.ctl.close()).toBe(true)
-    expect(focused.calls.closeSide).toBe(1)
-    expect(focused.calls.refocus).toBe(1)
+  it("ensures an open terminal panel has a terminal after switching contexts", async () => {
+    const visible = scene({ visible: true })
+    visible.ctl.syncContext("wt-2", "wt-1")
+    await Promise.resolve()
+    expect(visible.calls.ensureSide).toBe(1)
 
-    const elsewhere = scene({ focused: false })
-    expect(elsewhere.ctl.close()).toBe(true)
-    expect(elsewhere.calls.refocus).toBe(0)
+    visible.ctl.syncContext("wt-2", "wt-2")
+    visible.ctl.syncContext("wt-2", undefined)
+    await Promise.resolve()
+    expect(visible.calls.ensureSide).toBe(2)
+    expect(visible.calls.requestSide).toBe(0)
+
+    const hidden = scene()
+    hidden.ctl.syncContext("wt-2", "wt-1")
+    expect(hidden.calls.ensureSide).toBe(0)
+
+    const closed = scene({ visible: true })
+    closed.ctl.syncContext("wt-2", "wt-1")
+    closed.ctl.toggle()
+    await Promise.resolve()
+    expect(closed.calls.ensureSide).toBe(0)
+  })
+
+  it("kills the focused terminal and refocuses the chat", () => {
+    const focused = scene({ focusedId: "terminal:two" })
+    expect(focused.ctl.close()).toBe(true)
+    expect(focused.calls.closed).toEqual(["terminal:two"])
+    expect(focused.calls.refocus).toBe(1)
+  })
+
+  it("does nothing on close without a focused terminal", () => {
+    const item = scene()
+    expect(item.ctl.close()).toBe(false)
+    expect(item.calls.closed).toEqual([])
+    expect(item.calls.refocus).toBe(0)
   })
 
   it("routes the primary action by destination", () => {
@@ -81,12 +126,173 @@ describe("Agent Manager side terminal controller", () => {
     expect(panelFirst.calls.openVscode).toBe(0)
   })
 
+  it("handles the platform terminal shortcut locally and dedupes the extension echo", () => {
+    const press = (opts: Partial<KeyboardEvent> = {}) =>
+      ({ key: "/", metaKey: false, ctrlKey: false, shiftKey: false, altKey: false, ...opts }) as KeyboardEvent
+
+    // macOS: the workbench binding is Cmd+/, so only Cmd is accepted.
+    const mac = scene({ destination: "agentManager", mac: true })
+    expect(mac.ctl.press(press({ metaKey: true }))).toBe(true)
+    expect(mac.calls.requestSide).toBe(1)
+    expect(mac.ctl.press(press({ ctrlKey: true }))).toBe(false)
+    expect(mac.ctl.press(press({ metaKey: true, ctrlKey: true }))).toBe(false)
+    expect(mac.calls.requestSide).toBe(1)
+
+    // Windows/Linux: the workbench binding is Ctrl+/, so only Ctrl is accepted.
+    const win = scene({ destination: "agentManager", mac: false })
+    expect(win.ctl.press(press({ ctrlKey: true }))).toBe(true)
+    expect(win.calls.requestSide).toBe(1)
+    expect(win.ctl.press(press({ metaKey: true }))).toBe(false)
+    expect(win.calls.requestSide).toBe(1)
+
+    // Unrelated keys and modifier combinations are not the shortcut.
+    expect(win.ctl.press(press({ key: "?" }))).toBe(false)
+    expect(win.ctl.press(press({ ctrlKey: true, shiftKey: true }))).toBe(false)
+    expect(win.ctl.press(press({ ctrlKey: true, altKey: true }))).toBe(false)
+    expect(win.calls.requestSide).toBe(1)
+
+    // The extension echoes each locally handled keypress back as an action
+    // message; one echo is consumed per press, then invocations run again.
+    expect(mac.ctl.echo()).toBe(true)
+    expect(mac.ctl.echo()).toBe(false)
+  })
+
+  it("consumes one echo per press, even for rapid repeated presses", () => {
+    const item = scene({ destination: "agentManager", mac: true })
+    const press = () => item.ctl.press({ key: "/", metaKey: true } as KeyboardEvent)
+    press()
+    press()
+    // Two presses toggled the panel open and closed again; both echoes
+    // must still be consumed so neither press toggles a third time.
+    expect(item.calls.requestSide).toBe(1)
+    expect(item.calls.hide).toBe(1)
+    expect(item.ctl.echo()).toBe(true)
+    expect(item.ctl.echo()).toBe(true)
+    expect(item.ctl.echo()).toBe(false)
+  })
+
+  it("drops a never-arriving echo after the timeout safety valve", async () => {
+    const item = scene({ destination: "agentManager", mac: true })
+    item.ctl.press({ key: "/", metaKey: true } as KeyboardEvent)
+    await new Promise((resolve) => setTimeout(resolve, 550))
+    expect(item.ctl.echo()).toBe(false)
+    expect(item.ctl.echo()).toBe(false)
+  })
+
+  it("expires a dropped echo's backlog at the next spaced press", async () => {
+    const item = scene({ destination: "agentManager", mac: true })
+    // First press's echo never arrives (dropped forwarding); its backlog
+    // must not outlive the echo window into the next press.
+    item.ctl.press({ key: "/", metaKey: true } as KeyboardEvent)
+    await new Promise((resolve) => setTimeout(resolve, 550))
+    item.ctl.press({ key: "/", metaKey: true } as KeyboardEvent)
+    expect(item.ctl.echo()).toBe(true)
+    expect(item.ctl.echo()).toBe(false)
+  })
+
   it("persists the picked destination with a section-relative settings key", () => {
     const item = scene()
     item.ctl.choose("agentManager")
     expect(item.ctl.destination()).toBe("agentManager")
     expect(item.calls.posted).toEqual([
-      { type: "updateSetting", key: "agentManager.terminalButtonDestination", value: "agentManager" },
+      { type: "agentManager.terminal.destinationSelected", destination: "agentManager" },
     ])
+    expect(item.calls.persisted).toEqual(["agentManager"])
+  })
+
+  it("follows the remote default while the panel has no explicit choice", () => {
+    const item = scene()
+    item.ctl.syncDefault("agentManager")
+    expect(item.ctl.destination()).toBe("agentManager")
+    item.ctl.syncDefault("vscode")
+    expect(item.ctl.destination()).toBe("vscode")
+  })
+
+  it("keeps the panel's explicit choice when another window rewrites the shared setting", () => {
+    const item = scene()
+    item.ctl.choose("agentManager")
+    // Echo of the application-scoped setting being rewritten elsewhere:
+    // worktree window B picked the VS Code terminal, which must not flip
+    // this panel's routing.
+    item.ctl.syncDefault("vscode")
+    expect(item.ctl.destination()).toBe("agentManager")
+    item.ctl.openPreferred("keyboard_shortcut")
+    expect(item.calls.requestSide).toBe(1)
+    expect(item.calls.openVscode).toBe(0)
+  })
+
+  it("restores a saved panel choice and ignores remote defaults", () => {
+    const item = scene({ saved: "agentManager" })
+    expect(item.ctl.destination()).toBe("agentManager")
+    expect(item.calls.posted).toEqual([
+      { type: "agentManager.terminal.destinationSelected", destination: "agentManager" },
+    ])
+    item.ctl.syncDefault("vscode")
+    expect(item.ctl.destination()).toBe("agentManager")
+  })
+})
+
+describe("readSavedDestination", () => {
+  it("reads a valid choice and rejects anything else", () => {
+    expect(readSavedDestination({ terminalDestination: "agentManager" })).toBe("agentManager")
+    expect(readSavedDestination({ terminalDestination: "vscode" })).toBe("vscode")
+    expect(readSavedDestination({ terminalDestination: "bogus" })).toBeUndefined()
+    expect(readSavedDestination({})).toBeUndefined()
+    expect(readSavedDestination(undefined)).toBeUndefined()
+  })
+})
+
+describe("resolveRunScriptRequest", () => {
+  it("carries the current panel dropdown destination with every Run request", () => {
+    expect(resolveRunScriptRequest("wt-1", "agentManager")).toEqual({
+      type: "agentManager.runScript",
+      worktreeId: "wt-1",
+      destination: "agentManager",
+    })
+    expect(resolveRunScriptRequest("local", "vscode")).toEqual({
+      type: "agentManager.runScript",
+      worktreeId: "local",
+      destination: "vscode",
+    })
+  })
+})
+
+describe("resolveVscodeTerminalRequest", () => {
+  const sessions = new Map([
+    ["wt-1", "session-a"],
+    ["wt-2", "session-b"],
+  ])
+  const forWorktree = (id: string) => sessions.get(id)
+
+  it("prefers the current session", () => {
+    expect(resolveVscodeTerminalRequest("wt-1", "session-current", forWorktree)).toEqual({
+      type: "agentManager.showTerminal",
+      sessionId: "session-current",
+    })
+  })
+
+  it("falls back to a session of the selected worktree when the current session is cleared", () => {
+    // Terminal tab activation clears the current session; the shortcut
+    // must still open a terminal for the worktree, not dead-end.
+    expect(resolveVscodeTerminalRequest("wt-2", undefined, forWorktree)).toEqual({
+      type: "agentManager.showTerminal",
+      sessionId: "session-b",
+    })
+  })
+
+  it("opens a worktree-rooted terminal for sessionless worktrees", () => {
+    expect(resolveVscodeTerminalRequest("wt-3", undefined, forWorktree)).toEqual({
+      type: "agentManager.showWorktreeTerminal",
+      worktreeId: "wt-3",
+    })
+  })
+
+  it("opens the local terminal for the local context and unassigned selections", () => {
+    expect(resolveVscodeTerminalRequest("local", undefined, forWorktree)).toEqual({
+      type: "agentManager.showLocalTerminal",
+    })
+    expect(resolveVscodeTerminalRequest(null, undefined, forWorktree)).toEqual({
+      type: "agentManager.showLocalTerminal",
+    })
   })
 })
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-terminal-state.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-terminal-state.test.ts
index 432eed1fb6..ac3a8613b3 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-terminal-state.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-state.test.ts
@@ -5,6 +5,7 @@ import {
   createTerminalHandlers,
   createTerminalMessageHandler,
   createTerminalState,
+  isTerminalTabId,
 } from "../../webview-ui/agent-manager/terminal/state"
 import type { ExtensionMessage } from "../../webview-ui/src/types/messages/extension-messages"
 
@@ -14,7 +15,14 @@ function scene(initial: string | null = LOCAL) {
   const [selection, setSelection] = createSignal<string | null>(initial)
   const state = createTerminalState(selection)
   const posted: Array<Record<string, unknown>> = []
-  const events = { activated: [] as string[], selected: [] as string[], saved: 0, shown: [] as string[], hidden: 0 }
+  const events = {
+    activated: [] as string[],
+    selected: [] as string[],
+    saved: 0,
+    shown: [] as string[],
+    errors: 0,
+    running: [] as Array<{ contextKey: string; terminalId: string }>,
+  }
   const tabs = () => state.current().map((term) => term.id)
   const handlers = createTerminalHandlers({
     state,
@@ -27,7 +35,6 @@ function scene(initial: string | null = LOCAL) {
     findTab: () => undefined,
     postMessage: (message) => posted.push(message as Record<string, unknown>),
     onShowSide: (key) => events.shown.push(key),
-    onHideSide: () => events.hidden++,
     getSelection: selection,
     LOCAL,
     REVIEW_TAB_ID: "review",
@@ -40,12 +47,48 @@ function scene(initial: string | null = LOCAL) {
       events.selected.push(value)
       setSelection(value)
     },
-    showError: () => undefined,
+    showError: () => events.errors++,
     postMessage: (message) => posted.push(message as Record<string, unknown>),
+    onScriptRunning: (contextKey, terminalId) => events.running.push({ contextKey, terminalId }),
   })
   return { state, selection, setSelection, posted, events, handlers, dispatch }
 }
 
+function createdSide(createId: string, terminalId: string, title = "Terminal 1") {
+  return {
+    type: "agentManager.terminal.created",
+    createId,
+    placement: "side",
+    worktreeId: null,
+    terminalId,
+    title,
+    wsUrl: `ws://${terminalId}`,
+    font,
+  } satisfies ExtensionMessage
+}
+
+function script(
+  terminalId: string,
+  state: "running" | "stopping" | "exited" | "failed" = "running",
+  exitCode?: number,
+) {
+  return {
+    type: "agentManager.scriptTerminals",
+    terminals: [
+      {
+        terminalId,
+        worktreeId: null,
+        kind: "run",
+        title: "Run",
+        wsUrl: `ws://${terminalId}`,
+        state,
+        ...(exitCode === undefined ? {} : { exitCode }),
+        font,
+      },
+    ],
+  } satisfies ExtensionMessage
+}
+
 describe("Agent Manager terminal state", () => {
   it("keeps side terminals out of the tab state and shares root context with unassigned sessions", () => {
     createRoot((dispose) => {
@@ -64,21 +107,208 @@ describe("Agent Manager terminal state", () => {
         font,
         placement: "side",
       })
+      item.state.setSideActive(LOCAL, "terminal:side")
 
       expect(item.state.current().map((term) => term.id)).toEqual(["terminal:tab"])
       expect(item.state.all().map((term) => term.id)).toEqual(["terminal:tab"])
       expect(item.state.sides().map((term) => term.id)).toEqual(["terminal:side"])
-      expect(item.state.side()?.id).toBe("terminal:side")
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:side")
 
       item.setSelection(null)
       expect(item.state.current()).toEqual([])
       expect(item.state.sideKey()).toBe(LOCAL)
-      expect(item.state.side()?.id).toBe("terminal:side")
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:side")
       dispose()
     })
   })
 
-  it("deduplicates side creation and reuses the terminal without tab side effects", () => {
+  it("hydrates complete Run snapshots without create ids and preserves mounted terminal records", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:user", title: "Terminal 1", wsUrl: "ws://user", font, placement: "side" })
+      const user = item.state.sidesForContext(LOCAL)[0]!
+
+      expect(item.dispatch(script("script:run"))).toBe(true)
+      const run = item.state.sidesForContext(LOCAL).find((term) => term.id === "script:run")
+      expect(run).toMatchObject({ title: "Run", placement: "side", kind: "run", contextKey: LOCAL })
+      expect(item.events.running).toEqual([{ contextKey: LOCAL, terminalId: "script:run" }])
+      expect(item.state.scriptStatus("script:run")).toEqual({ state: "running", kind: "run" })
+      expect(isTerminalTabId("script:run")).toBe(true)
+
+      item.state.setTitle("script:run", "npm test")
+      expect(item.state.title("script:run")).toBe("Run")
+
+      item.dispatch(script("script:run", "exited", 0))
+      expect(item.state.sidesForContext(LOCAL).find((term) => term.id === "script:run")).toBe(run)
+      expect(item.state.scriptStatus("script:run")).toEqual({ state: "exited", exitCode: 0, kind: "run" })
+      expect(item.state.sidesForContext(LOCAL).find((term) => term.id === "terminal:user")).toBe(user)
+      // Existing snapshots update status only; they do not re-open the inspector.
+      expect(item.events.running).toEqual([{ contextKey: LOCAL, terminalId: "script:run" }])
+
+      item.dispatch({ type: "agentManager.scriptTerminals", terminals: [] } satisfies ExtensionMessage)
+      expect(item.state.sidesForContext(LOCAL)).toEqual([user])
+      expect(item.state.scriptStatus("script:run")).toBeUndefined()
+      dispose()
+    })
+  })
+
+  it("maps Local Run snapshots to LOCAL and does not reveal exited terminals", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.dispatch(script("script:exit", "exited", 2))
+
+      expect(item.state.sidesForContext(LOCAL)[0]).toMatchObject({ id: "script:exit", contextKey: LOCAL })
+      expect(item.events.running).toEqual([])
+      dispose()
+    })
+  })
+
+  it("hydrates Setup snapshots with their semantic title and kind", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.dispatch({
+        type: "agentManager.scriptTerminals",
+        terminals: [
+          {
+            terminalId: "script:setup",
+            worktreeId: "wt-1",
+            kind: "setup",
+            title: "Setup",
+            wsUrl: "ws://script:setup",
+            state: "running",
+            font,
+          },
+        ],
+      } satisfies ExtensionMessage)
+
+      const setup = item.state.sidesForContext("wt-1").find((term) => term.id === "script:setup")
+      expect(setup).toMatchObject({ title: "Setup", placement: "side", kind: "setup", contextKey: "wt-1" })
+      expect(item.events.running).toEqual([{ contextKey: "wt-1", terminalId: "script:setup" }])
+      expect(item.state.scriptStatus("script:setup")).toEqual({ state: "running", kind: "setup" })
+      expect(item.state.isScript("script:setup")).toBe(true)
+
+      item.state.setTitle("script:setup", "bash")
+      expect(item.state.title("script:setup")).toBe("Setup")
+
+      item.dispatch({ type: "agentManager.scriptTerminals", terminals: [] } satisfies ExtensionMessage)
+      expect(item.state.sidesForContext("wt-1")).toEqual([])
+      expect(item.state.scriptStatus("script:setup")).toBeUndefined()
+      dispose()
+    })
+  })
+
+  it("hydrates script terminals into independent project contexts", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.dispatch({
+        type: "agentManager.scriptTerminals",
+        terminals: [
+          {
+            terminalId: "script:setup-a",
+            projectId: "prj-a",
+            worktreeId: "wt-1",
+            kind: "setup",
+            title: "Setup",
+            wsUrl: "ws://script:setup-a",
+            state: "running",
+            font,
+          },
+          {
+            terminalId: "script:setup-b",
+            projectId: "prj-b",
+            worktreeId: "wt-1",
+            kind: "setup",
+            title: "Setup",
+            wsUrl: "ws://script:setup-b",
+            state: "running",
+            font,
+          },
+        ],
+      } satisfies ExtensionMessage)
+
+      expect(item.state.sidesForContext("prj-a:wt-1").map((term) => term.id)).toEqual(["script:setup-a"])
+      expect(item.state.sidesForContext("prj-b:wt-1").map((term) => term.id)).toEqual(["script:setup-b"])
+      expect(item.events.running).toEqual([
+        { contextKey: "prj-a:wt-1", terminalId: "script:setup-a" },
+        { contextKey: "prj-b:wt-1", terminalId: "script:setup-b" },
+      ])
+      dispose()
+    })
+  })
+
+  it("activates a Setup terminal that hydrates before its worktree is selected", () => {
+    createRoot((dispose) => {
+      const item = scene(LOCAL)
+      item.dispatch({
+        type: "agentManager.scriptTerminals",
+        terminals: [
+          {
+            terminalId: "script:setup-background",
+            worktreeId: "wt-background",
+            kind: "setup",
+            title: "Setup",
+            wsUrl: "ws://script:setup-background",
+            state: "running",
+            font,
+          },
+        ],
+      } satisfies ExtensionMessage)
+
+      expect(item.state.sideActiveFor("wt-background")).toBe("script:setup-background")
+      expect(item.events.running).toEqual([{ contextKey: "wt-background", terminalId: "script:setup-background" }])
+      dispose()
+    })
+  })
+
+  it("does not replace an existing side-terminal selection during background hydration", () => {
+    createRoot((dispose) => {
+      const item = scene(LOCAL)
+      item.dispatch({
+        type: "agentManager.scriptTerminals",
+        terminals: [
+          {
+            terminalId: "script:run-background",
+            worktreeId: "wt-background",
+            kind: "run",
+            title: "Run",
+            wsUrl: "ws://script:run-background",
+            state: "running",
+            font,
+          },
+        ],
+      } satisfies ExtensionMessage)
+      item.state.setSideActive("wt-background", "script:run-background")
+
+      item.dispatch({
+        type: "agentManager.scriptTerminals",
+        terminals: [
+          {
+            terminalId: "script:run-background",
+            worktreeId: "wt-background",
+            kind: "run",
+            title: "Run",
+            wsUrl: "ws://script:run-background",
+            state: "running",
+            font,
+          },
+          {
+            terminalId: "script:setup-background",
+            worktreeId: "wt-background",
+            kind: "setup",
+            title: "Setup",
+            wsUrl: "ws://script:setup-background",
+            state: "running",
+            font,
+          },
+        ],
+      } satisfies ExtensionMessage)
+
+      expect(item.state.sideActiveFor("wt-background")).toBe("script:run-background")
+      dispose()
+    })
+  })
+
+  it("deduplicates an in-flight reveal and focuses the active terminal on repeat", () => {
     createRoot((dispose) => {
       const item = scene()
       item.handlers.requestSide()
@@ -88,18 +318,8 @@ describe("Agent Manager terminal state", () => {
       const request = item.posted[0]!
       expect(request).toMatchObject({ type: "agentManager.terminal.create", placement: "side", worktreeId: null })
       const createId = String(request.createId)
-      const created = {
-        type: "agentManager.terminal.created",
-        createId,
-        placement: "side",
-        worktreeId: null,
-        terminalId: "terminal:side",
-        title: "Terminal 1",
-        wsUrl: "ws://side",
-        font,
-      } satisfies ExtensionMessage
-      expect(item.dispatch(created)).toBe(true)
-      expect(item.state.side()?.id).toBe("terminal:side")
+      expect(item.dispatch(createdSide(createId, "terminal:side"))).toBe(true)
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:side")
       expect(item.events.activated).toEqual([])
       expect(item.events.selected).toEqual([])
       expect(item.events.saved).toBe(0)
@@ -111,6 +331,135 @@ describe("Agent Manager terminal state", () => {
     })
   })
 
+  it("ensures a side terminal without revealing the panel", () => {
+    createRoot((dispose) => {
+      const item = scene("wt-1")
+      item.handlers.ensureSide()
+      item.handlers.ensureSide()
+
+      expect(item.events.shown).toEqual([])
+      expect(item.posted).toHaveLength(1)
+      expect(item.posted[0]).toMatchObject({
+        type: "agentManager.terminal.create",
+        placement: "side",
+        worktreeId: "wt-1",
+      })
+      dispose()
+    })
+  })
+
+  it("supports several side terminals per context with newest active", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.handlers.addSide()
+      item.handlers.addSide()
+      expect(item.posted).toHaveLength(2)
+      const first = String(item.posted[0]!.createId)
+      const second = String(item.posted[1]!.createId)
+
+      item.dispatch(createdSide(first, "terminal:one", "Terminal 1"))
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual(["terminal:one"])
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:one")
+
+      item.dispatch(createdSide(second, "terminal:two", "Terminal 2"))
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual(["terminal:one", "terminal:two"])
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:two")
+      dispose()
+    })
+  })
+
+  it("switches the active side terminal on select", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:one", title: "Terminal 1", wsUrl: "ws://one", font, placement: "side" })
+      item.state.add(null, { id: "terminal:two", title: "Terminal 2", wsUrl: "ws://two", font, placement: "side" })
+      item.state.setSideActive(LOCAL, "terminal:two")
+
+      item.handlers.selectSide("terminal:one")
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:one")
+      expect(item.state.focusRequest()?.id).toBe("terminal:one")
+      dispose()
+    })
+  })
+
+  it("moves activation to the last remaining side terminal on close", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:one", title: "Terminal 1", wsUrl: "ws://one", font, placement: "side" })
+      item.state.add(null, { id: "terminal:two", title: "Terminal 2", wsUrl: "ws://two", font, placement: "side" })
+      item.state.setSideActive(LOCAL, "terminal:two")
+
+      expect(item.handlers.closeSide("terminal:two")).toBe(true)
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:one")
+      expect(item.posted).toEqual([{ type: "agentManager.terminal.close", terminalId: "terminal:two" }])
+
+      expect(item.handlers.closeSide("terminal:one")).toBe(true)
+      expect(item.state.sideActiveFor(LOCAL)).toBeUndefined()
+      expect(item.state.sidesForContext(LOCAL)).toEqual([])
+
+      // Closing an unknown or non-side id is a no-op.
+      expect(item.handlers.closeSide("terminal:gone")).toBe(false)
+      expect(item.posted).toHaveLength(2)
+      dispose()
+    })
+  })
+
+  it("keeps only the target side terminal on close others", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:one", title: "Terminal 1", wsUrl: "ws://one", font, placement: "side" })
+      item.state.add(null, { id: "terminal:two", title: "Terminal 2", wsUrl: "ws://two", font, placement: "side" })
+      item.state.add(null, { id: "terminal:three", title: "Terminal 3", wsUrl: "ws://three", font, placement: "side" })
+      // Another context must survive untouched: "others" is per context.
+      item.state.add("wt-1", { id: "terminal:other", title: "Other", wsUrl: "ws://other", font, placement: "side" })
+      item.state.setSideActive(LOCAL, "terminal:one")
+
+      item.handlers.closeSideOthers("terminal:two")
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual(["terminal:two"])
+      expect(item.state.sidesForContext("wt-1").map((term) => term.id)).toEqual(["terminal:other"])
+      // The survivor becomes visible and focused, like selecting its tab.
+      expect(item.state.sideActiveFor(LOCAL)).toBe("terminal:two")
+      expect(item.state.focusRequest()?.id).toBe("terminal:two")
+      expect(item.posted).toEqual([
+        { type: "agentManager.terminal.close", terminalId: "terminal:one" },
+        { type: "agentManager.terminal.close", terminalId: "terminal:three" },
+      ])
+      dispose()
+    })
+  })
+
+  it("waits for Run closure confirmation while user terminal closes stay optimistic", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:user", title: "Terminal 1", wsUrl: "ws://user", font, placement: "side" })
+      item.dispatch(script("script:run"))
+
+      expect(item.handlers.closeSide("script:run")).toBe(true)
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual(["terminal:user", "script:run"])
+      expect(item.posted).toEqual([{ type: "agentManager.terminal.close", terminalId: "script:run" }])
+
+      expect(item.handlers.closeSide("terminal:user")).toBe(true)
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual(["script:run"])
+      expect(item.posted).toEqual([
+        { type: "agentManager.terminal.close", terminalId: "script:run" },
+        { type: "agentManager.terminal.close", terminalId: "terminal:user" },
+      ])
+      dispose()
+    })
+  })
+
+  it("closes a stale side answer whose create request is unknown", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      // A created message for a createId the webview never sent (e.g. it
+      // reloaded while the PTY was starting) must not leak the PTY.
+      item.dispatch(createdSide("stale-id", "terminal:stale"))
+      expect(item.state.sidesForContext(LOCAL)).toEqual([])
+      expect(item.posted).toEqual([{ type: "agentManager.terminal.close", terminalId: "terminal:stale" }])
+      dispose()
+    })
+  })
+
   it("creates explicit terminal tabs independently of the side destination", () => {
     createRoot((dispose) => {
       const item = scene("wt-1")
@@ -124,44 +473,91 @@ describe("Agent Manager terminal state", () => {
     })
   })
 
-  it("cancels a side terminal that is still starting", () => {
+  it("routes side creates of a worktree context to that worktree", () => {
     createRoot((dispose) => {
-      const item = scene()
-      item.handlers.requestSide()
-      const request = item.posted[0]!
-      expect(item.handlers.closeSide()).toBe(true)
-      expect(item.state.pendingSide(LOCAL)).toBeUndefined()
-
-      item.dispatch({
-        type: "agentManager.terminal.created",
-        createId: String(request.createId),
+      const item = scene("wt-1")
+      item.handlers.addSide()
+      expect(item.posted[0]).toMatchObject({
+        type: "agentManager.terminal.create",
         placement: "side",
-        worktreeId: null,
-        terminalId: "terminal:late",
-        title: "Terminal 1",
-        wsUrl: "ws://late",
-        font,
+        worktreeId: "wt-1",
       })
-      expect(item.state.side()).toBeUndefined()
-      expect(item.posted.at(-1)).toEqual({ type: "agentManager.terminal.close", terminalId: "terminal:late" })
       dispose()
     })
   })
 
-  it("closes a side terminal without changing the active chat tab", () => {
+  it("tracks OSC titles per terminal without touching the terminal records", () => {
     createRoot((dispose) => {
       const item = scene()
-      item.state.add(null, {
-        id: "terminal:side",
-        title: "Terminal 1",
-        wsUrl: "ws://side",
-        font,
-        placement: "side",
-      })
-      expect(item.handlers.closeSide()).toBe(true)
-      expect(item.state.side()).toBeUndefined()
-      expect(item.posted).toEqual([{ type: "agentManager.terminal.close", terminalId: "terminal:side" }])
-      expect(item.events.hidden).toBe(1)
+      item.state.add(null, { id: "terminal:one", title: "Terminal 1", wsUrl: "ws://one", font, placement: "side" })
+      const before = item.state.sidesForContext(LOCAL)[0]!
+
+      item.state.setTitle("terminal:one", "npm run dev")
+      expect(item.state.title("terminal:one")).toBe("npm run dev")
+      // Reference stability: the stored record is untouched so <For> does
+      // not remount the xterm instance on a title change.
+      expect(item.state.sidesForContext(LOCAL)[0]).toBe(before)
+
+      // Empty titles are ignored; removal drops the override.
+      item.state.setTitle("terminal:one", "  ")
+      expect(item.state.title("terminal:one")).toBe("npm run dev")
+      item.state.remove("terminal:one")
+      expect(item.state.title("terminal:one")).toBeUndefined()
+      dispose()
+    })
+  })
+
+  it("reorders side terminals within their context via drag", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:one", title: "Terminal 1", wsUrl: "ws://one", font, placement: "side" })
+      item.state.add(null, { id: "terminal:two", title: "Terminal 2", wsUrl: "ws://two", font, placement: "side" })
+      item.state.add(null, { id: "terminal:three", title: "Terminal 3", wsUrl: "ws://three", font, placement: "side" })
+      item.state.add(null, { id: "terminal:tab", title: "Terminal 4", wsUrl: "ws://tab", font, placement: "tab" })
+
+      // Drag the first side terminal onto the third position.
+      expect(item.state.reorderSideDrag(LOCAL, "terminal:one", "terminal:three")).toBe(true)
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual([
+        "terminal:two",
+        "terminal:three",
+        "terminal:one",
+      ])
+      // Tab terminals are untouched.
+      expect(item.state.current().map((term) => term.id)).toEqual(["terminal:tab"])
+
+      // The order survives switching to another context and back.
+      item.setSelection("wt-1")
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual([
+        "terminal:two",
+        "terminal:three",
+        "terminal:one",
+      ])
+      item.setSelection(LOCAL)
+      expect(item.state.sidesForContext(LOCAL).map((term) => term.id)).toEqual([
+        "terminal:two",
+        "terminal:three",
+        "terminal:one",
+      ])
+
+      // Unknown ids, tab-placement ids, and foreign contexts are rejected.
+      expect(item.state.reorderSideDrag(LOCAL, "terminal:gone", "terminal:two")).toBe(false)
+      expect(item.state.reorderSideDrag(LOCAL, "terminal:tab", "terminal:two")).toBe(false)
+      expect(item.state.reorderSideDrag("wt-1", "terminal:two", "terminal:three")).toBe(false)
+      dispose()
+    })
+  })
+
+  it("reports the focused side terminal only for the current context", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, { id: "terminal:side", title: "Terminal 1", wsUrl: "ws://side", font, placement: "side" })
+      item.state.add(null, { id: "terminal:tab", title: "Terminal 2", wsUrl: "ws://tab", font, placement: "tab" })
+
+      expect(item.state.sideFocusedId()).toBeUndefined()
+      item.state.setFocusedId("terminal:tab")
+      expect(item.state.sideFocusedId()).toBeUndefined()
+      item.state.setFocusedId("terminal:side")
+      expect(item.state.sideFocusedId()).toBe("terminal:side")
       dispose()
     })
   })
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts
new file mode 100644
index 0000000000..5d2e5bc3e1
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts
@@ -0,0 +1,103 @@
+import { describe, expect, it } from "bun:test"
+import { createRoot } from "solid-js"
+import { createWorktreeDiffs } from "../../webview-ui/agent-manager/worktree-diffs"
+import type { WorktreeFileDiff } from "../../webview-ui/src/types/messages"
+
+const diff = (file: string, additions = 1): WorktreeFileDiff => ({
+  file,
+  before: "",
+  after: "",
+  additions,
+  deletions: 0,
+})
+
+interface Sent {
+  type: string
+  sessionId?: string
+  file?: string
+}
+
+// Only `postMessage` is exercised by the diff workflow, so a recording stub is
+// enough — the signals and merge/pending logic under test are the real thing.
+const vscode = (sent: Sent[]) =>
+  ({ postMessage: (msg: Sent) => sent.push(msg) }) as unknown as Parameters<typeof createWorktreeDiffs>[0]
+
+const withDiffs = (fn: (diffs: ReturnType<typeof createWorktreeDiffs>, sent: Sent[]) => void) => {
+  createRoot((dispose) => {
+    const sent: Sent[] = []
+    fn(createWorktreeDiffs(vscode(sent)), sent)
+    dispose()
+  })
+}
+
+describe("createWorktreeDiffs", () => {
+  it("stores full diffs per session", () => {
+    withDiffs((diffs) => {
+      diffs.onWorktreeDiff({ type: "agentManager.worktreeDiff", sessionId: "s1", diffs: [diff("a.ts")] })
+      expect(diffs.diffDatas()["s1"]).toHaveLength(1)
+    })
+  })
+
+  it("does not replace state when an update produces an identical diff list", () => {
+    withDiffs((diffs) => {
+      diffs.onWorktreeDiff({ type: "agentManager.worktreeDiff", sessionId: "s1", diffs: [diff("a.ts")] })
+      const before = diffs.diffDatas()
+      diffs.onWorktreeDiff({ type: "agentManager.worktreeDiff", sessionId: "s1", diffs: [diff("a.ts")] })
+      expect(diffs.diffDatas()).toBe(before)
+    })
+  })
+
+  it("replaces a single file on a diffFile message and clears its pending flag", () => {
+    withDiffs((diffs) => {
+      diffs.onWorktreeDiff({ type: "agentManager.worktreeDiff", sessionId: "s1", diffs: [diff("a.ts", 1)] })
+      diffs.onWorktreeDiffFile({
+        type: "agentManager.worktreeDiffFile",
+        sessionId: "s1",
+        file: "a.ts",
+        diff: diff("a.ts", 9),
+      })
+      expect(diffs.diffDatas()["s1"]![0]!.additions).toBe(9)
+      expect(diffs.diffFileLoadingFor(() => "s1").size).toBe(0)
+    })
+  })
+
+  it("tracks panel loading via diffLoading", () => {
+    withDiffs((diffs) => {
+      diffs.onWorktreeDiffLoading({ type: "agentManager.worktreeDiffLoading", sessionId: "s1", loading: true })
+      expect(diffs.diffLoading()).toBe(true)
+      diffs.onWorktreeDiffLoading({ type: "agentManager.worktreeDiffLoading", sessionId: "s1", loading: false })
+      expect(diffs.diffLoading()).toBe(false)
+    })
+  })
+
+  it("requestDiffFile marks a file pending, posts once, and ignores repeats", () => {
+    withDiffs((diffs, sent) => {
+      diffs.requestDiffFile("s1", "a.ts")
+      diffs.requestDiffFile("s1", "a.ts")
+      expect(sent.filter((m) => m.type === "agentManager.requestWorktreeDiffFile")).toHaveLength(1)
+      expect(diffs.diffFileLoadingFor(() => "s1").has("a.ts")).toBe(true)
+    })
+  })
+
+  it("refreshStaleDiffs requests only files not already loading", () => {
+    withDiffs((diffs, sent) => {
+      diffs.requestDiffFile("s1", "a.ts")
+      diffs.refreshStaleDiffs("s1", new Set(["a.ts", "b.ts"]))
+      const files = sent.filter((m) => m.type === "agentManager.requestWorktreeDiffFile").map((m) => m.file)
+      expect(files).toEqual(["a.ts", "b.ts"])
+    })
+  })
+
+  it("clears the session key once its last pending file resolves", () => {
+    withDiffs((diffs) => {
+      diffs.requestDiffFile("s1", "a.ts")
+      diffs.onWorktreeDiffFile({
+        type: "agentManager.worktreeDiffFile",
+        sessionId: "s1",
+        file: "a.ts",
+        diff: diff("a.ts"),
+      })
+      expect(diffs.diffFileLoadingFor(() => "s1").size).toBe(0)
+    })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-contexts.test.ts b/packages/kilo-vscode/tests/unit/agent-project-contexts.test.ts
new file mode 100644
index 0000000000..97cb9265f9
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-contexts.test.ts
@@ -0,0 +1,236 @@
+import { describe, it, expect } from "bun:test"
+import { ProjectContexts } from "../../src/agent-manager/project/contexts"
+import { ProjectRegistry, type StoredProject } from "../../src/agent-manager/project/registry"
+import { projectIdFor } from "../../src/agent-manager/project/paths"
+import type { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
+
+const WORKSPACE = "/repo/main"
+const PINNED = projectIdFor(WORKSPACE)
+
+function stored(id: string, trusted = false): StoredProject {
+  return {
+    id,
+    root: `/repo/${id}`,
+    order: 1,
+    trusted,
+    addedAt: new Date().toISOString(),
+  }
+}
+
+function setup(opts: { workspace?: string; enabled?: boolean; projects?: StoredProject[] } = {}) {
+  const registryProjects = opts.projects ?? []
+  const registry = {
+    list: () => registryProjects,
+    get: (id: string) => registryProjects.find((p) => p.id === id),
+  }
+  const created: string[] = []
+  const contexts = new ProjectContexts({
+    workspaceRoot: () => opts.workspace,
+    registry,
+    trusted: (id) => registry.get(id)?.trusted === true,
+    enabled: () => opts.enabled ?? false,
+    deps: {
+      log: () => {},
+      exists: () => true,
+      state: (root) => {
+        created.push(root)
+        return { root, flush: async () => {} } as unknown as WorktreeStateManager
+      },
+    },
+  })
+  return { contexts, created, registryProjects }
+}
+
+describe("ProjectContexts", () => {
+  it("derives the pinned project from the current workspace root", () => {
+    const { contexts } = setup({ workspace: WORKSPACE })
+    const active = contexts.active()
+    expect(active?.id).toBe(PINNED)
+    expect(active?.root).toBe(WORKSPACE)
+    expect(active?.pinned).toBe(true)
+  })
+
+  it("has no active project without a workspace when the flag is off", () => {
+    const { contexts } = setup({ enabled: false })
+    expect(contexts.active()).toBeUndefined()
+  })
+
+  it("falls back to the first trusted registry project without a workspace", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ enabled: true, projects: [extra] })
+    expect(contexts.active()?.id).toBe("prj-extra")
+  })
+
+  it("rejects activating registry projects when the flag is off", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: false, projects: [extra] })
+    expect(contexts.activate("prj-extra")).toBeUndefined()
+    expect(contexts.active()?.id).toBe(PINNED)
+  })
+
+  it("rejects activating untrusted projects", () => {
+    const extra = stored("prj-extra", false)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    expect(contexts.activate("prj-extra")).toBeUndefined()
+    expect(contexts.active()?.id).toBe(PINNED)
+  })
+
+  it("activates trusted projects without changing accordion expansion", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    const ctx = contexts.activate("prj-extra")
+    expect(ctx?.root).toBe("/repo/prj-extra")
+    expect(contexts.active()?.id).toBe("prj-extra")
+    expect(contexts.isExpanded("prj-extra")).toBe(false)
+  })
+
+  it("keeps explicit accordion expansion unchanged after switching", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    contexts.active()
+    contexts.expand("prj-extra")
+    contexts.activate("prj-extra")
+    expect(contexts.active()?.id).toBe("prj-extra")
+    expect(contexts.isExpanded(PINNED)).toBe(true)
+    contexts.activate(PINNED)
+    expect(contexts.isExpanded("prj-extra")).toBe(true)
+  })
+
+  it("expands without changing the active project", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    expect(contexts.expand("prj-extra")?.id).toBe("prj-extra")
+    expect(contexts.active()?.id).toBe(PINNED)
+    expect(contexts.isExpanded("prj-extra")).toBe(true)
+  })
+
+  it("allows accordion collapse independently from active detail selection", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    contexts.activate("prj-extra")
+    contexts.collapse("prj-extra")
+    expect(contexts.isExpanded("prj-extra")).toBe(false)
+    expect(contexts.active()?.id).toBe("prj-extra")
+  })
+
+  it("removes projects and falls back to the pinned project", async () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    contexts.activate("prj-extra")
+    await contexts.remove("prj-extra")
+    expect(contexts.get("prj-extra")).toBeUndefined()
+    expect(contexts.active()?.id).toBe(PINNED)
+  })
+
+  it("initializes each context once while concurrent callers wait", async () => {
+    const { contexts } = setup({ workspace: WORKSPACE })
+    const ctx = contexts.active()!
+    let release: (() => void) | undefined
+    const gate = new Promise<void>((resolve) => (release = resolve))
+    let calls = 0
+    const run = async () => {
+      calls++
+      await gate
+      return { ok: true, refsFixed: 0 }
+    }
+    const first = ctx.ensureReady(run)
+    const second = ctx.ensureReady(run)
+    expect(first).toBe(second)
+    expect(calls).toBe(1)
+    release!()
+    expect((await first).current).toBe(true)
+    expect(ctx.lifecycle).toBe("ready")
+  })
+
+  it("invalidates initialization when suspended", async () => {
+    const { contexts } = setup({ workspace: WORKSPACE })
+    const ctx = contexts.active()!
+    let release: (() => void) | undefined
+    const gate = new Promise<void>((resolve) => (release = resolve))
+    const init = ctx.ensureReady(async () => {
+      await gate
+      return { ok: true, refsFixed: 0 }
+    })
+    ctx.suspend()
+    release!()
+    expect((await init).current).toBe(false)
+    expect(ctx.lifecycle).toBe("suspended")
+  })
+
+  it("creates repository services lazily, once per context", () => {
+    const { contexts, created } = setup({ workspace: WORKSPACE })
+    expect(created).toEqual([])
+    const active = contexts.active()!
+    active.stateManager()
+    active.stateManager()
+    expect(created).toEqual([WORKSPACE])
+    expect(active.loaded).toBe(true)
+  })
+
+  it("isolates services between projects", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts, created } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    contexts.active()!.stateManager()
+    contexts.activate("prj-extra")!.stateManager()
+    expect(created).toEqual([WORKSPACE, "/repo/prj-extra"])
+  })
+
+  it("re-derives the pinned project when the workspace changes", () => {
+    const ws: { root: string | undefined } = { root: undefined }
+    const { contexts } = setup({ enabled: false })
+    const dynamic = new ProjectContexts({
+      workspaceRoot: () => ws.root,
+      registry: { list: () => [], get: () => undefined },
+      trusted: () => false,
+      enabled: () => false,
+      deps: { log: () => {}, exists: () => true },
+    })
+    expect(dynamic.active()).toBeUndefined()
+    ws.root = WORKSPACE
+    expect(dynamic.syncPinned()).toBe(true)
+    expect(dynamic.active()?.id).toBe(PINNED)
+    expect(dynamic.syncPinned()).toBe(false)
+    ws.root = "/repo/other"
+    expect(dynamic.syncPinned()).toBe(true)
+    expect(dynamic.active()?.root).toBe("/repo/other")
+  })
+
+  it("snapshots pinned first with registry projects in order", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    const list = contexts.snapshots()
+    expect(list.map((p) => p.id)).toEqual([PINNED, "prj-extra"])
+    expect(list[0]!.pinned).toBe(true)
+    expect(list[0]!.active).toBe(true)
+    expect(list[0]!.trusted).toBe(true)
+    expect(list[1]!.label).toBe("prj-extra")
+    expect(list[1]!.initialized).toBe(false)
+  })
+
+  it("hides registry projects from snapshots when the flag is off", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: false, projects: [extra] })
+    expect(contexts.snapshots().map((p) => p.id)).toEqual([PINNED])
+  })
+
+  it("returns active ownership to pinned Local when multi-project is disabled", () => {
+    const extra = stored("prj-extra", true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [extra] })
+    const secondary = contexts.expand("prj-extra")!
+    contexts.activate("prj-extra")
+
+    const pinned = contexts.disable()
+
+    expect(pinned?.id).toBe(PINNED)
+    expect(contexts.active()?.id).toBe(PINNED)
+    expect(contexts.isExpanded(PINNED)).toBe(true)
+    expect(contexts.isExpanded("prj-extra")).toBe(false)
+    expect(secondary.lifecycle).toBe("suspended")
+  })
+
+  it("dedupes registry entries that match the pinned project", () => {
+    const dupe = stored(PINNED, true)
+    const { contexts } = setup({ workspace: WORKSPACE, enabled: true, projects: [dupe] })
+    expect(contexts.snapshots().map((p) => p.id)).toEqual([PINNED])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-messages.test.ts b/packages/kilo-vscode/tests/unit/agent-project-messages.test.ts
new file mode 100644
index 0000000000..762268d78d
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-messages.test.ts
@@ -0,0 +1,195 @@
+import { describe, it, expect } from "bun:test"
+import * as fs from "fs"
+import * as os from "os"
+import * as path from "path"
+import { execFileSync } from "child_process"
+import { handleProjectMessage, type ProjectMessageDeps } from "../../src/agent-manager/project/messages"
+import { ProjectRegistry } from "../../src/agent-manager/project/registry"
+import { ProjectContexts } from "../../src/agent-manager/project/contexts"
+import { projectIdFor } from "../../src/agent-manager/project/paths"
+import type { AgentManagerInMessage } from "../../src/agent-manager/types"
+
+const WORKSPACE = "/repo/main"
+
+function gitRepo(): string {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "kilo-am-msg-"))
+  execFileSync("git", ["init", "-q", dir])
+  return fs.realpathSync(dir)
+}
+
+function setup(opts: { enabled?: boolean; workspace?: string } = {}) {
+  let stored: unknown
+  let pickResult: string | undefined
+  const registry = new ProjectRegistry({
+    read: () => stored,
+    write: (value) => {
+      stored = value
+    },
+  })
+  const contexts = new ProjectContexts({
+    workspaceRoot: () => opts.workspace ?? WORKSPACE,
+    registry,
+    trusted: (id) => registry.get(id)?.trusted === true,
+    enabled: () => opts.enabled ?? true,
+    deps: { log: () => {}, exists: (dir) => fs.existsSync(dir) },
+  })
+  const calls = {
+    activate: [] as string[],
+    expand: [] as string[],
+    push: 0,
+    error: [] as string[],
+    pick: 0,
+    ready: [] as string[],
+    readyResult: { ok: true, refsFixed: 0, current: true } as { ok: boolean; refsFixed: number; current: boolean },
+  }
+  const deps: ProjectMessageDeps = {
+    registry,
+    contexts,
+    enabled: () => opts.enabled ?? true,
+    pickFolder: async () => {
+      calls.pick++
+      return pickResult
+    },
+    activate: (ctx) => calls.activate.push(ctx.id),
+    expand: (ctx) => calls.expand.push(ctx.id),
+    push: () => calls.push++,
+    error: (message) => calls.error.push(message),
+    ready: async (ctx) => {
+      calls.ready.push(ctx.id)
+      return calls.readyResult
+    },
+    log: () => {},
+  }
+  const pick = (dir: string | undefined) => {
+    pickResult = dir
+  }
+  return { registry, contexts, deps, calls, pick }
+}
+
+function msg(type: string, extra: Record<string, unknown> = {}): AgentManagerInMessage {
+  return { type, ...extra } as unknown as AgentManagerInMessage
+}
+
+describe("handleProjectMessage", () => {
+  it("ignores non-project messages", async () => {
+    const { deps } = setup()
+    expect(await handleProjectMessage(msg("agentManager.createWorktree"), deps)).toBe(false)
+  })
+
+  it("pushes the catalog on requestProjects", async () => {
+    const { deps, calls, pick } = setup()
+    expect(await handleProjectMessage(msg("agentManager.requestProjects"), deps)).toBe(true)
+    expect(calls.push).toBe(1)
+  })
+
+  it("rejects every mutation while the experiment is disabled", async () => {
+    const { deps, calls } = setup({ enabled: false })
+    for (const m of [
+      msg("agentManager.addProject"),
+      msg("agentManager.removeProject", { projectId: "prj-x" }),
+      msg("agentManager.selectProject", { projectId: "prj-x" }),
+      msg("agentManager.setProjectExpanded", { projectId: "prj-x", expanded: true }),
+      msg("agentManager.trustProject", { projectId: "prj-x" }),
+    ]) {
+      await handleProjectMessage(m, deps)
+    }
+    expect(calls.pick).toBe(0)
+    expect(calls.activate).toEqual([])
+    expect(calls.error.length).toBe(5)
+  })
+
+  it("adds a picked git repository to the registry", async () => {
+    const repo = gitRepo()
+    const { deps, registry, calls, pick } = setup()
+    pick(repo)
+    await handleProjectMessage(msg("agentManager.addProject"), deps)
+    const id = projectIdFor(repo)
+    const project = registry.get(id)
+    expect(project?.root).toBe(repo)
+    expect(project?.trusted).toBe(false)
+    expect(calls.push).toBe(1)
+    expect(calls.error).toEqual([])
+  })
+
+  it("rejects folders outside a git repository", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "kilo-am-nogit-"))
+    const { deps, calls, registry, pick } = setup()
+    pick(dir)
+    await handleProjectMessage(msg("agentManager.addProject"), deps)
+    expect(registry.list()).toEqual([])
+    expect(calls.error).toEqual(["The selected folder is not inside a Git repository."])
+  })
+
+  it("rejects the pinned workspace repository", async () => {
+    const repo = gitRepo()
+    const { deps, calls, pick } = setup({ workspace: repo })
+    pick(repo)
+    await handleProjectMessage(msg("agentManager.addProject"), deps)
+    expect(calls.error).toEqual(["That repository is already the workspace project."])
+  })
+
+  it("rejects duplicate registration", async () => {
+    const repo = gitRepo()
+    const { deps, calls, pick } = setup()
+    pick(repo)
+    await handleProjectMessage(msg("agentManager.addProject"), deps)
+    await handleProjectMessage(msg("agentManager.addProject"), deps)
+    expect(calls.error).toEqual(["That repository is already registered as a project."])
+  })
+
+  it("does nothing when the picker is cancelled", async () => {
+    const { deps, calls, registry, pick } = setup()
+    pick(undefined)
+    await handleProjectMessage(msg("agentManager.addProject"), deps)
+    expect(registry.list()).toEqual([])
+    expect(calls.push).toBe(0)
+  })
+
+  it("blocks selecting an untrusted project until trusted", async () => {
+    const repo = gitRepo()
+    const { deps, registry, calls, pick } = setup()
+    const id = projectIdFor(repo)
+    await registry.add({ id, root: repo })
+    await handleProjectMessage(msg("agentManager.selectProject", { projectId: id }), deps)
+    expect(calls.activate).toEqual([])
+    expect(calls.error.length).toBe(1)
+    await handleProjectMessage(msg("agentManager.trustProject", { projectId: id }), deps)
+    await handleProjectMessage(msg("agentManager.selectProject", { projectId: id }), deps)
+    expect(calls.activate).toEqual([id])
+  })
+
+  it("initializes trusted projects on expand", async () => {
+    const repo = gitRepo()
+    const { deps, registry, calls } = setup()
+    const id = projectIdFor(repo)
+    await registry.add({ id, root: repo })
+    await registry.setTrusted(id, true)
+    await handleProjectMessage(msg("agentManager.setProjectExpanded", { projectId: id, expanded: true }), deps)
+    expect(calls.expand).toEqual([id])
+    await handleProjectMessage(msg("agentManager.setProjectExpanded", { projectId: id, expanded: false }), deps)
+    expect(calls.expand).toEqual([id])
+  })
+
+  it("does not initialize untrusted projects on expand", async () => {
+    const repo = gitRepo()
+    const { deps, registry, calls } = setup()
+    const id = projectIdFor(repo)
+    await registry.add({ id, root: repo })
+    await handleProjectMessage(msg("agentManager.setProjectExpanded", { projectId: id, expanded: true }), deps)
+    expect(calls.expand).toEqual([])
+  })
+
+  it("removes projects without touching the pinned fallback", async () => {
+    const repo = gitRepo()
+    const { deps, registry, contexts, calls } = setup()
+    const id = projectIdFor(repo)
+    await registry.add({ id, root: repo })
+    await registry.setTrusted(id, true)
+    await handleProjectMessage(msg("agentManager.selectProject", { projectId: id }), deps)
+    await handleProjectMessage(msg("agentManager.removeProject", { projectId: id }), deps)
+    expect(registry.get(id)).toBeUndefined()
+    expect(contexts.get(id)).toBeUndefined()
+    expect(contexts.active()?.root).toBe(WORKSPACE)
+    expect(calls.activate).toEqual([id])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-paths.test.ts b/packages/kilo-vscode/tests/unit/agent-project-paths.test.ts
new file mode 100644
index 0000000000..6ad6b63bec
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-paths.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from "bun:test"
+import * as fs from "fs"
+import * as os from "os"
+import * as path from "path"
+import {
+  canonicalizePath,
+  findTrackedBranch,
+  resolveProjectRoot,
+  samePath,
+} from "../../src/agent-manager/project/paths"
+
+describe("project-paths", () => {
+  it("canonicalizePath resolves a symlink alias to its realpath", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "pp-root-"))
+    const target = fs.mkdtempSync(path.join(os.tmpdir(), "pp-target-"))
+    const alias = path.join(root, "alias")
+    fs.symlinkSync(target, alias)
+    try {
+      expect(canonicalizePath(alias)).toBe(canonicalizePath(target))
+      expect(canonicalizePath(alias)).not.toBe(alias)
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+      fs.rmSync(target, { recursive: true, force: true })
+    }
+  })
+
+  it("samePath folds case on darwin/win32 and matches exactly on linux", () => {
+    expect(samePath("/x/Y", "/x/y", "darwin")).toBe(true)
+    expect(samePath("/x/Y", "/x/y", "win32")).toBe(true)
+    expect(samePath("/x/Y", "/x/y", "linux")).toBe(false)
+    expect(samePath("/x/y", "/x/y", "linux")).toBe(true)
+  })
+
+  it("findTrackedBranch matches a symlink-aliased path against realpath keys", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "pp-tracked-"))
+    const target = fs.mkdtempSync(path.join(os.tmpdir(), "pp-target-"))
+    const alias = path.join(root, "alias")
+    fs.symlinkSync(target, alias)
+    try {
+      // git worktree list --porcelain realpath-resolves registration, so the
+      // tracked key is the realpath, not the lexical alias a session was
+      // registered with.
+      const tracked = new Map<string, string>([[canonicalizePath(target), "branch-a"]])
+      expect(findTrackedBranch(tracked, alias)).toBe("branch-a")
+      expect(findTrackedBranch(tracked, target)).toBe("branch-a")
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+      fs.rmSync(target, { recursive: true, force: true })
+    }
+  })
+
+  it("findTrackedBranch matches a lexical-keyed map by canonicalizing both sides", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "pp-lexical-"))
+    const target = fs.mkdtempSync(path.join(os.tmpdir(), "pp-lexical-target-"))
+    const alias = path.join(root, "alias")
+    fs.symlinkSync(target, alias)
+    try {
+      // A map keyed by the lexical alias (as older code paths produced) must
+      // still match a probe path that canonicalizes to the same realpath.
+      const tracked = new Map<string, string>([[alias, "branch-a"]])
+      expect(findTrackedBranch(tracked, target)).toBe("branch-a")
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+      fs.rmSync(target, { recursive: true, force: true })
+    }
+  })
+
+  it("findTrackedBranch returns undefined for an untracked existing path", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "pp-untracked-"))
+    const other = path.join(root, "other")
+    fs.mkdirSync(other, { recursive: true })
+    try {
+      const tracked = new Map<string, string>([[canonicalizePath(root), "branch-a"]])
+      expect(findTrackedBranch(tracked, other)).toBeUndefined()
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("resolveProjectRoot maps a linked worktree to the primary checkout", async () => {
+    const calls = new Map([
+      ["rev-parse --path-format=absolute --show-toplevel", "/repo/worktree"],
+      ["rev-parse --path-format=absolute --git-dir", "/repo/.git/worktrees/feature"],
+      ["rev-parse --path-format=absolute --git-common-dir", "/repo/.git"],
+      ["worktree list --porcelain -z", "worktree /repo\0HEAD abc\0\0worktree /repo/worktree\0HEAD def\0"],
+    ])
+    const root = await resolveProjectRoot("/repo/worktree", async (_cwd, args) => calls.get(args.join(" ")) ?? "")
+
+    expect(root).toBe(canonicalizePath("/repo"))
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-pollers.test.ts b/packages/kilo-vscode/tests/unit/agent-project-pollers.test.ts
new file mode 100644
index 0000000000..30b0454c22
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-pollers.test.ts
@@ -0,0 +1,175 @@
+import { describe, it, expect } from "bun:test"
+import { ProjectPollers, type PollerPair, type StatsOutMessage } from "../../src/agent-manager/project/pollers"
+import { ProjectContexts } from "../../src/agent-manager/project/contexts"
+import type { StoredProject } from "../../src/agent-manager/project/registry"
+import { projectIdFor } from "../../src/agent-manager/project/paths"
+import type { GitOps } from "../../src/agent-manager/GitOps"
+import type { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
+
+const WORKSPACE = "/repo/main"
+const PINNED = projectIdFor(WORKSPACE)
+
+function stored(id: string, trusted = true): StoredProject {
+  return { id, root: `/repo/${id}`, order: 1, trusted, addedAt: new Date().toISOString() }
+}
+
+function setup(projects: StoredProject[], opts: { enabled?: boolean } = {}) {
+  const contexts = new ProjectContexts({
+    workspaceRoot: () => WORKSPACE,
+    registry: {
+      list: () => projects,
+      get: (id) => projects.find((p) => p.id === id),
+    },
+    trusted: (id) => projects.find((p) => p.id === id)?.trusted === true,
+    enabled: () => opts.enabled ?? true,
+    deps: {
+      log: () => {},
+      exists: () => true,
+      state: () => ({ flush: async () => {} }) as unknown as WorktreeStateManager,
+    } as never,
+  })
+  return contexts
+}
+
+/** Expand a project and mark its state as initialized (as initExpanded would). */
+function expand(contexts: ProjectContexts, id: string, ready = true): void {
+  contexts.expand(id)
+  if (ready) contexts.get(id)?.stateManager()
+}
+
+interface FakePair {
+  pair: PollerPair
+  enabled: { stats: boolean; pr: boolean }
+  visible: { stats: boolean; pr: boolean }
+  stopped: { stats: boolean; pr: boolean }
+}
+
+function fakes() {
+  const posted: StatsOutMessage[] = []
+  const made = new Map<string, FakePair>()
+  const create = (ctx: { id: string }): PollerPair => {
+    const rec: FakePair = {
+      pair: {
+        stats: {
+          setEnabled: (v) => (rec.enabled.stats = v),
+          setVisible: (v) => (rec.visible.stats = v),
+          stop: () => (rec.stopped.stats = true),
+        },
+        pr: {
+          poller: {
+            setEnabled: (v) => (rec.enabled.pr = v),
+            setVisible: (v) => (rec.visible.pr = v),
+            stop: () => (rec.stopped.pr = true),
+          },
+        },
+      },
+      enabled: { stats: false, pr: false },
+      visible: { stats: true, pr: true },
+      stopped: { stats: false, pr: false },
+    }
+    made.set(ctx.id, rec)
+    return rec.pair
+  }
+  const deps = {
+    git: {} as GitOps,
+    semaphore: undefined as never,
+    localDiff: async () => [],
+    post: (msg: StatsOutMessage) => posted.push(msg),
+    openExternal: () => {},
+    visible: () => true,
+    log: () => {},
+  }
+  return { posted, made, create, deps }
+}
+
+describe("ProjectPollers", () => {
+  it("starts pollers for an expanded trusted background project", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra")
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    const rec = made.get("prj-extra")
+    expect(rec).toBeDefined()
+    expect(rec!.enabled).toEqual({ stats: true, pr: true })
+  })
+
+  it("does not start pollers for the active project", () => {
+    const contexts = setup([])
+    contexts.active()
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    expect(made.has(PINNED)).toBe(false)
+  })
+
+  it("stops pollers when a project is collapsed", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra")
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    contexts.collapse("prj-extra")
+    pollers.sync(contexts)
+    const rec = made.get("prj-extra")
+    expect(rec!.stopped).toEqual({ stats: true, pr: true })
+  })
+
+  it("stops pollers when a project is removed", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra")
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    contexts.remove("prj-extra")
+    pollers.sync(contexts)
+    expect(made.get("prj-extra")!.stopped.stats).toBe(true)
+  })
+
+  it("skips projects whose state is not initialized yet", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra", false)
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    expect(made.has("prj-extra")).toBe(false)
+  })
+
+  it("does not duplicate pollers on repeated syncs", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra")
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    pollers.sync(contexts)
+    expect(made.size).toBe(1)
+  })
+
+  it("stops pollers for a background project that becomes active", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra")
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    contexts.activate("prj-extra")
+    pollers.sync(contexts)
+    expect(made.get("prj-extra")!.stopped.stats).toBe(true)
+  })
+
+  it("disposes all pollers", () => {
+    const extra = stored("prj-extra")
+    const contexts = setup([extra])
+    expand(contexts, "prj-extra")
+    const { made, create, deps } = fakes()
+    const pollers = new ProjectPollers(deps, (ctx) => create(ctx))
+    pollers.sync(contexts)
+    pollers.dispose()
+    expect(made.get("prj-extra")!.stopped).toEqual({ stats: true, pr: true })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-reactivate.test.ts b/packages/kilo-vscode/tests/unit/agent-project-reactivate.test.ts
new file mode 100644
index 0000000000..c4064d8523
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-reactivate.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from "bun:test"
+import { ProjectContext, type ProjectContextDeps } from "../../src/agent-manager/project/context"
+import { reactivateProject } from "../../src/agent-manager/project/init"
+import type { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
+
+const ROOT = "/repo/main"
+
+function fakeState(): WorktreeStateManager {
+  return {
+    getWorktrees: () => [],
+    getSessions: () => [],
+    flush: async () => {},
+  } as unknown as WorktreeStateManager
+}
+
+function makeContext(): ProjectContext {
+  const deps: ProjectContextDeps = { log: () => {}, state: () => fakeState() }
+  const ctx = new ProjectContext("prj-test", ROOT, false, deps)
+  ctx.stateManager()
+  return ctx
+}
+
+describe("reactivateProject", () => {
+  it("returns false for a cold context that never initialized", () => {
+    const ctx = makeContext()
+    const pushed: string[] = []
+    expect(reactivateProject(ctx, undefined, () => pushed.push(ctx.id))).toBe(false)
+    expect(pushed).toHaveLength(0)
+  })
+
+  it("re-registers and pushes in-memory state for a ready context", async () => {
+    const ctx = makeContext()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+    const registered = new Map<string, string>()
+    const pushed: string[] = []
+    const ok = reactivateProject(
+      ctx,
+      {
+        setSessionDirectory: (id, dir) => registered.set(id, dir),
+        trackSession: () => {},
+      },
+      () => pushed.push(ctx.id),
+    )
+    expect(ok).toBe(true)
+    expect(pushed).toEqual(["prj-test"])
+  })
+
+  it("returns false after the context is suspended", async () => {
+    const ctx = makeContext()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+    ctx.suspend()
+    expect(reactivateProject(ctx, undefined, () => {})).toBe(false)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-registry.test.ts b/packages/kilo-vscode/tests/unit/agent-project-registry.test.ts
new file mode 100644
index 0000000000..059bd9f7df
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-registry.test.ts
@@ -0,0 +1,112 @@
+import { describe, expect, it } from "bun:test"
+import { createRoot } from "solid-js"
+import { createProjectRegistry } from "../../webview-ui/agent-manager/project/registry"
+
+const pending = (id: string) => id.startsWith("pending")
+
+function setup(active: string, persisted = {}) {
+  let id = active
+  const registry = createProjectRegistry({ persisted, activeId: () => id })
+  return { registry, set: (next: string) => (id = next) }
+}
+
+describe("createProjectRegistry", () => {
+  it("keeps each project's tabs to itself", () =>
+    createRoot((dispose) => {
+      const { registry, set } = setup("prj-a")
+      registry.active().tabs.set(["ses_a1", "ses_a2"])
+      set("prj-b")
+      expect(registry.active().tabs.ids()).toEqual([])
+      registry.active().tabs.set(["ses_b1"])
+      set("prj-a")
+      expect(registry.active().tabs.ids()).toEqual(["ses_a1", "ses_a2"])
+      dispose()
+    }))
+
+  it("migrates legacy single-project tabs into the first real project", () =>
+    createRoot((dispose) => {
+      const { registry, set } = setup("single", { localSessionIDs: ["ses_old"] })
+      expect(registry.active().tabs.ids()).toEqual(["ses_old"])
+      set("prj-a")
+      expect(registry.active().tabs.ids()).toEqual(["ses_old"])
+      expect(registry.all().map((s) => s.id)).toEqual(["prj-a"])
+      dispose()
+    }))
+
+  it("restores persisted buckets per project", () =>
+    createRoot((dispose) => {
+      const { registry, set } = setup("prj-b", { localTabs: { "prj-a": ["ses_a1"], "prj-b": ["ses_b1"] } })
+      expect(registry.active().tabs.ids()).toEqual(["ses_b1"])
+      set("prj-a")
+      expect(registry.active().tabs.ids()).toEqual(["ses_a1"])
+      dispose()
+    }))
+
+  it("migrates legacy tabs only once, into the first real project", () =>
+    createRoot((dispose) => {
+      const { registry, set } = setup("single", { localSessionIDs: ["ses_old"] })
+      set("prj-a")
+      expect(registry.active().tabs.ids()).toEqual(["ses_old"])
+      set("prj-b")
+      // "single" was consumed by the first migration, so prj-b stays empty.
+      expect(registry.active().tabs.ids()).toEqual([])
+      dispose()
+    }))
+
+  it("does not migrate single-project tabs over existing ones", () =>
+    createRoot((dispose) => {
+      const { registry, set } = setup("single", {
+        localSessionIDs: ["ses_old"],
+        localTabs: { "prj-a": ["ses_a1"] },
+      })
+      set("prj-a")
+      expect(registry.active().tabs.ids()).toEqual(["ses_a1"])
+      expect(registry.all().some((s) => s.id === "single")).toBe(true)
+      dispose()
+    }))
+
+  it("bumps version when a store is created", () =>
+    createRoot((dispose) => {
+      const { registry } = setup("prj-a")
+      const before = registry.version()
+      registry.ensure("prj-b")
+      expect(registry.version()).toBeGreaterThan(before)
+      dispose()
+    }))
+
+  it("prunes stores for removed projects but keeps single", () =>
+    createRoot((dispose) => {
+      const { registry } = setup("prj-a")
+      registry.ensure("prj-a")
+      registry.ensure("prj-b")
+      registry.ensure("single")
+      registry.prune(new Set(["prj-a"]))
+      expect(
+        registry
+          .all()
+          .map((s) => s.id)
+          .sort(),
+      ).toEqual(["prj-a", "single"])
+      dispose()
+    }))
+
+  it("keeps tab memory per project", () =>
+    createRoot((dispose) => {
+      const { registry, set } = setup("prj-a")
+      registry.active().tabMemory.set("local", "ses_a1")
+      set("prj-b")
+      expect(registry.active().tabMemory.get("local")).toBeUndefined()
+      registry.active().tabMemory.set("local", "ses_b1")
+      set("prj-a")
+      expect(registry.active().tabMemory.get("local")).toBe("ses_a1")
+      dispose()
+    }))
+
+  it("strips pending drafts from durable output", () =>
+    createRoot((dispose) => {
+      const { registry } = setup("prj-a")
+      registry.active().tabs.set(["ses_a1", "pending-1"])
+      expect(registry.active().tabs.durable(pending)).toEqual(["ses_a1"])
+      dispose()
+    }))
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-restore.test.ts b/packages/kilo-vscode/tests/unit/agent-project-restore.test.ts
new file mode 100644
index 0000000000..0b050648a0
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-restore.test.ts
@@ -0,0 +1,113 @@
+import { describe, expect, it } from "bun:test"
+import { rememberTarget, restoreProjectTarget, type RestoreDeps } from "../../webview-ui/agent-manager/project/restore"
+import type { AgentManagerStateMessage } from "../../webview-ui/src/types/messages"
+
+function state(over: Partial<AgentManagerStateMessage>): AgentManagerStateMessage {
+  return {
+    type: "agentManager.state",
+    projectId: "prj-a",
+    worktrees: [],
+    sessions: [],
+    ...over,
+  }
+}
+
+function deps() {
+  const calls: Record<string, unknown[]> = {}
+  const record =
+    (key: string) =>
+    (...args: unknown[]) => {
+      calls[key] = [...(calls[key] ?? []), ...(args.length > 0 ? args : [true])]
+    }
+  const impl: RestoreDeps = {
+    selectLocal: () => record("local")(),
+    selectWorktree: (id) => record("worktree")(id),
+    selectSession: (id) => record("session")(id),
+    focusManaged: (wt, sid) => record("managed")(wt, sid),
+    setSelection: (id) => record("selection")(id),
+    setActivePendingId: (id) => record("pending")(id),
+  }
+  return { calls, impl }
+}
+
+describe("restoreProjectTarget", () => {
+  it("restores a persisted worktree target", () => {
+    const { calls, impl } = deps()
+    restoreProjectTarget(
+      state({
+        worktrees: [{ id: "0" } as never],
+        activeTarget: { projectId: "prj-a", kind: "worktree", worktreeId: "0" },
+      }),
+      impl,
+    )
+    expect(calls.worktree).toEqual(["0"])
+    expect(calls.pending).toEqual([undefined])
+  })
+
+  it("restores a managed worktree session target", () => {
+    const { calls, impl } = deps()
+    restoreProjectTarget(
+      state({
+        worktrees: [{ id: "0" } as never],
+        sessions: [{ id: "ses-1", worktreeId: "0" } as never],
+        activeTarget: { projectId: "prj-a", kind: "session", sessionId: "ses-1" },
+      }),
+      impl,
+    )
+    expect(calls.managed).toEqual(["0", "ses-1"])
+  })
+
+  it("restores a local session target via Local + select", () => {
+    const { calls, impl } = deps()
+    restoreProjectTarget(state({ activeTarget: { projectId: "prj-a", kind: "session", sessionId: "ses-x" } }), impl)
+    expect(calls.selection).toEqual(["local"])
+    expect(calls.session).toEqual(["ses-x"])
+  })
+
+  it("falls back to Local when the target no longer exists", () => {
+    const { calls, impl } = deps()
+    restoreProjectTarget(state({ activeTarget: { projectId: "prj-a", kind: "worktree", worktreeId: "gone" } }), impl)
+    expect(calls.local).toHaveLength(1)
+    expect(calls.worktree).toBeUndefined()
+  })
+
+  it("falls back to Local when there is no target", () => {
+    const { calls, impl } = deps()
+    restoreProjectTarget(state({}), impl)
+    expect(calls.local).toHaveLength(1)
+  })
+})
+
+describe("rememberTarget", () => {
+  it("posts a session target when a session is active", () => {
+    const posted: unknown[] = []
+    rememberTarget((msg) => posted.push(msg), "prj-a", "0", "ses-1")
+    expect(posted).toEqual([
+      {
+        type: "agentManager.rememberTarget",
+        projectId: "prj-a",
+        target: { projectId: "prj-a", kind: "session", sessionId: "ses-1" },
+      },
+    ])
+  })
+
+  it("posts a worktree target when no session is active", () => {
+    const posted: unknown[] = []
+    rememberTarget((msg) => posted.push(msg), "prj-a", "0", undefined)
+    expect(posted).toEqual([
+      {
+        type: "agentManager.rememberTarget",
+        projectId: "prj-a",
+        target: { projectId: "prj-a", kind: "worktree", worktreeId: "0" },
+      },
+    ])
+  })
+
+  it("posts a local target for the Local context", () => {
+    const posted: unknown[] = []
+    rememberTarget((msg) => posted.push(msg), "prj-a", "local", undefined)
+    expect(posted).toEqual([
+      { type: "agentManager.rememberTarget", projectId: "prj-a", target: { projectId: "prj-a", kind: "local" } },
+    ])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-route.test.ts b/packages/kilo-vscode/tests/unit/agent-project-route.test.ts
new file mode 100644
index 0000000000..9ee54dc8fc
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-route.test.ts
@@ -0,0 +1,142 @@
+import { describe, expect, it } from "bun:test"
+import { ProjectRouteError, ProjectRouteService } from "../../src/agent-manager/project/route"
+
+describe("ProjectRouteService", () => {
+  it("resolves explicit local, worktree, and session routes", () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerWorktree({ projectId: "a", worktreeId: "wt" }, "/repo/a/.kilo/wt", 1)
+    routes.registerSession({ projectId: "a", sessionId: "local" }, "/repo/a", 1)
+    routes.registerSession({ projectId: "a", sessionId: "work" }, "/repo/a/.kilo/wt", 1)
+    expect(routes.projectRoot({ projectId: "a" })).toBe("/repo/a")
+    expect(routes.worktreeDirectory({ projectId: "a", worktreeId: "wt" })).toBe("/repo/a/.kilo/wt")
+    expect(routes.sessionDirectory({ projectId: "a", sessionId: "local" })).toBe("/repo/a")
+    expect(routes.sessionDirectory({ projectId: "a", sessionId: "work" })).toBe("/repo/a/.kilo/wt")
+  })
+
+  it("inherits child session ownership", () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerSession({ projectId: "a", sessionId: "parent" }, "/repo/a", 1)
+    routes.inheritSession({ projectId: "a", sessionId: "child" }, { projectId: "a", sessionId: "parent" })
+    expect(routes.sessionDirectory({ projectId: "a", sessionId: "child" })).toBe("/repo/a")
+  })
+
+  it("detects ambiguous raw session ids", () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerProject("b", "/repo/b", 1)
+    routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+    routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+    expect(() => routes.resolveRawSession("same")).toThrow(ProjectRouteError)
+    try {
+      routes.resolveRawSession("same")
+    } catch (err) {
+      expect((err as ProjectRouteError).code).toBe("session_ambiguous")
+    }
+  })
+
+  it("invalidates routes when a project generation changes", () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerSession({ projectId: "a", sessionId: "s" }, "/repo/a", 1)
+    routes.registerProject("a", "/repo/a", 2)
+    expect(() => routes.sessionDirectory({ projectId: "a", sessionId: "s" })).toThrow(ProjectRouteError)
+  })
+
+  it("uses composite UI keys", () => {
+    expect(ProjectRouteService.key({ projectId: "a", worktreeId: "same" })).not.toBe(
+      ProjectRouteService.key({ projectId: "b", worktreeId: "same" }),
+    )
+  })
+
+  describe("safe resolution (non-throwing)", () => {
+    it("trySessionDirectory returns the exact dir for an unambiguous raw id", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerSession({ projectId: "a", sessionId: "s1" }, "/repo/a", 1)
+      expect(routes.trySessionDirectory("s1")).toBe("/repo/a")
+    })
+
+    it("trySessionDirectory returns undefined for an unknown raw id", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      expect(routes.trySessionDirectory("missing")).toBeUndefined()
+    })
+
+    it("trySessionDirectory returns undefined for an ambiguous raw id (never picks one)", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerProject("b", "/repo/b", 1)
+      routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+      routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+      expect(routes.trySessionDirectory("same")).toBeUndefined()
+    })
+
+    it("isSessionAmbiguous is true only when a raw id maps to more than one project", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerProject("b", "/repo/b", 1)
+      routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+      expect(routes.isSessionAmbiguous("same")).toBe(false)
+      routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+      expect(routes.isSessionAmbiguous("same")).toBe(true)
+      expect(routes.isSessionAmbiguous("unknown")).toBe(false)
+    })
+
+    it("trySessionDirectoryFor resolves a project-qualified ref exactly", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerProject("b", "/repo/b", 1)
+      routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+      routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+      expect(routes.trySessionDirectoryFor({ projectId: "a", sessionId: "same" })).toBe("/repo/a")
+      expect(routes.trySessionDirectoryFor({ projectId: "b", sessionId: "same" })).toBe("/repo/b")
+    })
+
+    it("trySessionDirectoryFor returns undefined for an unknown project or session", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerSession({ projectId: "a", sessionId: "s1" }, "/repo/a", 1)
+      expect(routes.trySessionDirectoryFor({ projectId: "nope", sessionId: "s1" })).toBeUndefined()
+      expect(routes.trySessionDirectoryFor({ projectId: "a", sessionId: "missing" })).toBeUndefined()
+    })
+
+    it("unregisterSession removes one route and clears ambiguity", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerProject("b", "/repo/b", 1)
+      routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+      routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+      expect(routes.isSessionAmbiguous("same")).toBe(true)
+      routes.unregisterSession({ projectId: "b", sessionId: "same" })
+      expect(routes.isSessionAmbiguous("same")).toBe(false)
+      expect(routes.trySessionDirectory("same")).toBe("/repo/a")
+    })
+
+    it("unregisterSession is a no-op for an unknown ref", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      expect(() => routes.unregisterSession({ projectId: "a", sessionId: "missing" })).not.toThrow()
+    })
+
+    it("hasSession reports registered refs only", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerSession({ projectId: "a", sessionId: "s1" }, "/repo/a", 1)
+      expect(routes.hasSession({ projectId: "a", sessionId: "s1" })).toBe(true)
+      expect(routes.hasSession({ projectId: "a", sessionId: "s2" })).toBe(false)
+    })
+
+    it("unregisterProject clears all session routes for that project", () => {
+      const routes = new ProjectRouteService()
+      routes.registerProject("a", "/repo/a", 1)
+      routes.registerSession({ projectId: "a", sessionId: "s1" }, "/repo/a", 1)
+      routes.registerSession({ projectId: "a", sessionId: "s2" }, "/repo/a", 1)
+      routes.unregisterProject("a")
+      expect(routes.trySessionDirectory("s1")).toBeUndefined()
+      expect(routes.trySessionDirectory("s2")).toBeUndefined()
+      expect(routes.isSessionAmbiguous("s1")).toBe(false)
+    })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-run-status-webview.test.ts b/packages/kilo-vscode/tests/unit/agent-project-run-status-webview.test.ts
new file mode 100644
index 0000000000..8af28bc609
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-run-status-webview.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from "bun:test"
+import { createRoot } from "solid-js"
+import { applyRunStatus } from "../../webview-ui/agent-manager/project/run-status"
+import { createProjectRegistry } from "../../webview-ui/agent-manager/project/registry"
+
+const pending = (id: string) => id.startsWith("pending")
+
+function setup(active: string) {
+  let id = active
+  const registry = createProjectRegistry({ persisted: {}, activeId: () => id })
+  return {
+    registry,
+    set: (next: string) => (id = next),
+    deps: { ensure: (pid: string) => registry.ensure(pid), active: () => registry.active() },
+  }
+}
+
+describe("applyRunStatus", () => {
+  it("routes project-stamped statuses to their own store", () =>
+    createRoot((dispose) => {
+      const { registry, set, deps } = setup("prj-a")
+      registry.ensure("prj-b")
+
+      expect(
+        applyRunStatus(
+          { type: "agentManager.runStatus", worktreeId: "local", state: "running", projectId: "prj-b" },
+          deps,
+        ),
+      ).toBe(true)
+
+      expect(registry.ensure("prj-b").runStatuses()["local"]?.state).toBe("running")
+      expect(registry.active().runStatuses()["local"]).toBeUndefined()
+
+      set("prj-b")
+      expect(registry.active().runStatuses()["local"]?.state).toBe("running")
+      dispose()
+    }))
+
+  it("routes unstamped statuses to the active store (legacy behavior)", () =>
+    createRoot((dispose) => {
+      const { registry, deps } = setup("prj-a")
+      registry.ensure("prj-b")
+
+      expect(applyRunStatus({ type: "agentManager.runStatus", worktreeId: "local", state: "running" }, deps)).toBe(true)
+
+      expect(registry.active().runStatuses()["local"]?.state).toBe("running")
+      expect(registry.ensure("prj-b").runStatuses()["local"]).toBeUndefined()
+      dispose()
+    }))
+
+  it("ignores other message types", () =>
+    createRoot((dispose) => {
+      const { deps } = setup("prj-a")
+      expect(applyRunStatus({ type: "agentManager.localStats" }, deps)).toBe(false)
+      dispose()
+    }))
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-run-status.test.ts b/packages/kilo-vscode/tests/unit/agent-project-run-status.test.ts
new file mode 100644
index 0000000000..861fd29ca8
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-run-status.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it, mock } from "bun:test"
+import { AgentManagerProvider } from "../../src/agent-manager/AgentManagerProvider"
+import type { ProjectContext } from "../../src/agent-manager/project/context"
+import type { RunStatus } from "../../src/agent-manager/run/manager"
+import type { AgentManagerOutMessage } from "../../src/agent-manager/types"
+
+type Internals = {
+  run: { state: () => { runStatuses: RunStatus[]; runScriptConfigured: boolean } }
+  contexts: {
+    resolve: (id: string) => { id: string } | undefined
+    byWorktree: (id: string) => { id: string } | undefined
+  }
+  postToWebview: (message: AgentManagerOutMessage) => void
+  runStateFor: (ctx: ProjectContext) => { runStatuses: RunStatus[] }
+  postRunMessage: (message: AgentManagerOutMessage) => void
+}
+
+function ctx(id: string, pinned: boolean, worktreeIds: string[]): ProjectContext {
+  return {
+    id,
+    pinned,
+    peekState: () => ({ getWorktrees: () => worktreeIds.map((wt) => ({ id: wt })) }),
+  } as unknown as ProjectContext
+}
+
+function provider(runStatuses: RunStatus[]) {
+  const instance = Object.create(AgentManagerProvider.prototype) as Internals
+  instance.run = { state: () => ({ runStatuses, runScriptConfigured: true }) }
+  return instance
+}
+
+describe("Agent Manager run status project scoping", () => {
+  it("filters the state payload to the target project and un-namespaces its local key", () => {
+    const instance = provider([
+      { worktreeId: "wt-a1", state: "running" },
+      { worktreeId: "prj-a:local", state: "running" },
+      { worktreeId: "wt-b1", state: "running" },
+      { worktreeId: "prj-b:local", state: "stopping" },
+    ])
+
+    const a = instance.runStateFor(ctx("prj-a", false, ["wt-a1"]))
+    expect(a.runStatuses).toEqual([
+      { worktreeId: "wt-a1", state: "running" },
+      { worktreeId: "local", state: "running" },
+    ])
+
+    const b = instance.runStateFor(ctx("prj-b", false, ["wt-b1"]))
+    expect(b.runStatuses).toEqual([
+      { worktreeId: "wt-b1", state: "running" },
+      { worktreeId: "local", state: "stopping" },
+    ])
+  })
+
+  it("keeps legacy unqualified local entries on the pinned project only", () => {
+    const instance = provider([{ worktreeId: "local", state: "running" }])
+
+    expect(instance.runStateFor(ctx("prj-pinned", true, [])).runStatuses).toEqual([
+      { worktreeId: "local", state: "running" },
+    ])
+    expect(instance.runStateFor(ctx("prj-other", false, [])).runStatuses).toEqual([])
+  })
+
+  it("stamps the owning project on emissions and un-namespaces qualified local keys", () => {
+    const instance = provider([])
+    const posted: AgentManagerOutMessage[] = []
+    instance.contexts = {
+      resolve: (id) => (id === "prj-a" ? { id: "prj-a" } : undefined),
+      byWorktree: (id) => (id === "wt-a1" ? { id: "prj-a" } : undefined),
+    }
+    instance.postToWebview = mock((message: AgentManagerOutMessage) => void posted.push(message))
+
+    instance.postRunMessage({ type: "agentManager.runStatus", worktreeId: "prj-a:local", state: "running" })
+    instance.postRunMessage({ type: "agentManager.runStatus", worktreeId: "wt-a1", state: "running" })
+    instance.postRunMessage({ type: "agentManager.runStatus", worktreeId: "local", state: "running" })
+
+    expect(posted).toEqual([
+      { type: "agentManager.runStatus", worktreeId: "local", state: "running", projectId: "prj-a" },
+      { type: "agentManager.runStatus", worktreeId: "wt-a1", state: "running", projectId: "prj-a" },
+      { type: "agentManager.runStatus", worktreeId: "local", state: "running" },
+    ])
+  })
+
+  it("passes non-runStatus messages through untouched", () => {
+    const instance = provider([])
+    const posted: AgentManagerOutMessage[] = []
+    instance.postToWebview = mock((message: AgentManagerOutMessage) => void posted.push(message))
+
+    instance.postRunMessage({ type: "agentManager.localStats", stats: undefined } as never)
+    expect(posted).toEqual([{ type: "agentManager.localStats", stats: undefined }])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-selection-webview.test.ts b/packages/kilo-vscode/tests/unit/agent-project-selection-webview.test.ts
new file mode 100644
index 0000000000..146a738be6
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-selection-webview.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from "bun:test"
+import { applyProjectSelection } from "../../webview-ui/agent-manager/project/selection"
+
+function deps(active: string) {
+  const calls: string[] = []
+  return {
+    calls,
+    value: {
+      active: (projectId: string) => projectId === active,
+      managed: () => [],
+      local: (projectId: string) => calls.push(`local:${projectId}`),
+      worktree: (projectId: string, worktreeId: string) => calls.push(`worktree:${projectId}:${worktreeId}`),
+      session: (sessionId: string) => calls.push(`session:${sessionId}`),
+      openTab: (sessionId: string) => calls.push(`openTab:${sessionId}`),
+      managedSession: (worktreeId: string, sessionId: string) => calls.push(`managed:${worktreeId}:${sessionId}`),
+    },
+  }
+}
+
+describe("applyProjectSelection", () => {
+  it("ignores delayed local and worktree acknowledgements from another project", () => {
+    const result = deps("prj-b")
+
+    expect(
+      applyProjectSelection(
+        { type: "agentManager.selectionActivated", target: { projectId: "prj-a", kind: "local" } } as never,
+        result.value,
+      ),
+    ).toBe(true)
+    expect(
+      applyProjectSelection(
+        {
+          type: "agentManager.selectionActivated",
+          target: { projectId: "prj-a", kind: "worktree", worktreeId: "wt-a" },
+        } as never,
+        result.value,
+      ),
+    ).toBe(true)
+
+    expect(result.calls).toEqual([])
+  })
+
+  it("applies acknowledgements for the catalog-active project", () => {
+    const result = deps("prj-a")
+    applyProjectSelection(
+      { type: "agentManager.selectionActivated", target: { projectId: "prj-a", kind: "local" } } as never,
+      result.value,
+    )
+    applyProjectSelection(
+      {
+        type: "agentManager.selectionActivated",
+        target: { projectId: "prj-a", kind: "worktree", worktreeId: "wt-a" },
+      } as never,
+      result.value,
+    )
+
+    expect(result.calls).toEqual(["local:prj-a", "worktree:prj-a:wt-a"])
+  })
+
+  it("applies a worktree ack optimistically even before the state push arrives", () => {
+    // Regression: reactivation pushes state asynchronously, so the ack can
+    // arrive first. The catalog push is synchronous, so the project is already
+    // active and the ack must not be dropped.
+    const result = deps("prj-a")
+    applyProjectSelection(
+      {
+        type: "agentManager.selectionActivated",
+        target: { projectId: "prj-a", kind: "worktree", worktreeId: "wt-a" },
+      } as never,
+      result.value,
+    )
+
+    expect(result.calls).toEqual(["worktree:prj-a:wt-a"])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-selection.test.ts b/packages/kilo-vscode/tests/unit/agent-project-selection.test.ts
new file mode 100644
index 0000000000..31d064541f
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-selection.test.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect } from "bun:test"
+import { handleProjectMessage, type ProjectMessageDeps } from "../../src/agent-manager/project/messages"
+import type { ProjectContext, ProjectInitResult } from "../../src/agent-manager/project/context"
+import { ProjectContexts } from "../../src/agent-manager/project/contexts"
+import { projectIdFor } from "../../src/agent-manager/project/paths"
+import type { AgentManagerInMessage } from "../../src/agent-manager/types"
+import type { StoredProject } from "../../src/agent-manager/project/registry"
+import type { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
+
+const WORKSPACE = "/repo/main"
+const PINNED = projectIdFor(WORKSPACE)
+
+function stored(id: string, trusted = true): StoredProject {
+  return { id, root: `/repo/${id}`, order: 1, trusted, addedAt: new Date().toISOString() }
+}
+
+function fakeState(persisted?: { current?: unknown }) {
+  const store = persisted ?? {}
+  return {
+    getWorktree: (id: string) => (id === "wt1" ? { path: "/repo/prj-extra/wt1" } : undefined),
+    getSession: (id: string) => (id === "sess1" ? {} : undefined),
+    getActiveTarget: () => store.current,
+    setActiveTarget: (target: unknown) => {
+      store.current = target
+    },
+  } as unknown as WorktreeStateManager
+}
+
+function setup(
+  opts: {
+    enabled?: boolean
+    workspace?: string
+    ready?: (ctx: ProjectContext) => Promise<ProjectInitResult>
+    state?: () => WorktreeStateManager
+  } = {},
+) {
+  const extra = "prj-extra"
+  const projects = [stored(extra, true)]
+  const registry = {
+    list: () => projects,
+    get: (id: string) => projects.find((p) => p.id === id),
+  }
+  const contexts = new ProjectContexts({
+    workspaceRoot: () => opts.workspace ?? WORKSPACE,
+    registry,
+    trusted: (id) => registry.get(id)?.trusted === true,
+    enabled: () => opts.enabled ?? true,
+    deps: {
+      log: () => {},
+      exists: () => true,
+      state: opts.state ?? (() => fakeState()),
+    },
+  })
+  const calls = {
+    activate: [] as string[],
+    expand: [] as string[],
+    push: 0,
+    error: [] as string[],
+    selected: [] as string[],
+    ready: [] as string[],
+  }
+  const readyImpl =
+    opts.ready ??
+    (async (ctx: ProjectContext) => {
+      calls.ready.push(ctx.id)
+      return ctx.ensureReady(async () => {
+        ctx.stateManager()
+        return { ok: true, refsFixed: 0 }
+      })
+    })
+  const deps: ProjectMessageDeps = {
+    registry: registry as never,
+    contexts,
+    enabled: () => opts.enabled ?? true,
+    pickFolder: async () => undefined,
+    activate: (ctx) => calls.activate.push(ctx.id),
+    expand: (ctx) => calls.expand.push(ctx.id),
+    push: () => calls.push++,
+    error: (message) => calls.error.push(message),
+    ready: readyImpl,
+    selected: (target) => calls.selected.push(target.kind === "local" ? target.projectId : target.kind),
+    log: () => {},
+  }
+  return { contexts, deps, calls, extra }
+}
+
+function activateMsg(projectId: string, extra: Record<string, unknown> = {}): AgentManagerInMessage {
+  return {
+    type: "agentManager.activateSelection",
+    target: { projectId, kind: "local", ...extra },
+  } as unknown as AgentManagerInMessage
+}
+
+describe("activateSelection — cross-project selection", () => {
+  it("acknowledges a ready cross-project local selection without re-running completed initialization", async () => {
+    const { contexts, deps, calls, extra } = setup()
+    const ctx = contexts.expand(extra)!
+    ctx.stateManager()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+    expect(ctx.lifecycle).toBe("ready")
+
+    calls.ready = []
+    await handleProjectMessage(activateMsg(extra), deps)
+
+    expect(contexts.active()?.id).toBe(extra)
+    expect(calls.activate).toEqual([extra])
+    expect(calls.ready).toEqual([extra])
+    expect(calls.selected).toEqual([extra])
+    expect(calls.error).toEqual([])
+  })
+
+  it("waits for readiness on a cold (never-initialized) selection", async () => {
+    const { contexts, deps, calls, extra } = setup()
+    expect(contexts.get(extra)).toBeUndefined()
+
+    await handleProjectMessage(activateMsg(extra), deps)
+
+    expect(contexts.get(extra)?.lifecycle).toBe("ready")
+    expect(contexts.active()?.id).toBe(extra)
+    expect(calls.ready).toEqual([extra])
+    expect(calls.activate).toEqual([extra])
+    expect(calls.selected).toEqual([extra])
+  })
+
+  it("falls back to local without an error toast when the target is gone", async () => {
+    const { contexts, deps, calls, extra } = setup()
+    contexts.activate(PINNED)
+    expect(contexts.active()?.id).toBe(PINNED)
+
+    await handleProjectMessage(activateMsg(extra, { kind: "worktree", worktreeId: "missing" }), deps)
+
+    // A stale target is not actionable, so the selection lands on the
+    // project's local context instead of surfacing an error.
+    expect(contexts.active()?.id).toBe(extra)
+    expect(calls.activate).toEqual([extra])
+    expect(calls.selected).toEqual([extra])
+    expect(calls.error).toEqual([])
+  })
+
+  it("does not re-run initialization for an already-ready context", async () => {
+    const { contexts, deps, calls, extra } = setup()
+    const ctx = contexts.expand(extra)!
+    ctx.stateManager()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+    expect(ctx.lifecycle).toBe("ready")
+
+    const readyCalls: string[] = []
+    deps.ready = async (c) => {
+      readyCalls.push(c.id)
+      return { ok: true, refsFixed: 0, current: true }
+    }
+
+    await handleProjectMessage(activateMsg(extra), deps)
+    await handleProjectMessage(activateMsg(extra), deps)
+
+    expect(readyCalls).toEqual([extra, extra])
+    const initField = (ctx as unknown as { init?: unknown }).init
+    expect(initField).toBeUndefined()
+  })
+
+  it("does not reset project services when selecting within the active project", async () => {
+    const { contexts, deps, calls, extra } = setup()
+    const ctx = contexts.expand(extra)!
+    ctx.stateManager()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+    contexts.activate(extra)
+
+    await handleProjectMessage(activateMsg(extra, { kind: "worktree", worktreeId: "wt1" }), deps)
+
+    expect(contexts.active()?.id).toBe(extra)
+    expect(calls.activate).toEqual([])
+    expect(calls.selected).toEqual(["worktree"])
+    expect(calls.error).toEqual([])
+  })
+
+  it("restores the persisted target when the selection asks for it", async () => {
+    const persisted = { current: undefined as unknown }
+    const { contexts, deps, calls, extra } = setup({ state: () => fakeState(persisted) })
+    const ctx = contexts.expand(extra)!
+    ctx.stateManager()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+    persisted.current = { projectId: extra, kind: "worktree", worktreeId: "wt1" }
+
+    await handleProjectMessage(
+      { type: "agentManager.activateSelection", target: { projectId: extra, kind: "local" }, restore: true } as never,
+      deps,
+    )
+
+    expect(calls.selected).toEqual(["worktree"])
+    expect(calls.error).toEqual([])
+  })
+
+  it("falls back to the requested target when the persisted one is gone", async () => {
+    const persisted = { current: { projectId: "prj-extra", kind: "worktree", worktreeId: "missing" } as unknown }
+    const { contexts, deps, calls, extra } = setup({ state: () => fakeState(persisted) })
+    const ctx = contexts.expand(extra)!
+    ctx.stateManager()
+    await ctx.ensureReady(async () => ({ ok: true, refsFixed: 0 }))
+
+    await handleProjectMessage(
+      { type: "agentManager.activateSelection", target: { projectId: extra, kind: "local" }, restore: true } as never,
+      deps,
+    )
+
+    expect(calls.selected).toEqual([extra])
+    expect(calls.error).toEqual([])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-sessions.test.ts b/packages/kilo-vscode/tests/unit/agent-project-sessions.test.ts
new file mode 100644
index 0000000000..7bab778417
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-sessions.test.ts
@@ -0,0 +1,436 @@
+import { describe, expect, it } from "bun:test"
+import type { Session } from "@kilocode/sdk/v2/client"
+import { ProjectContext, type ProjectContextDeps } from "../../src/agent-manager/project/context"
+import type { Worktree, ManagedSession, WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
+import {
+  collectProjectSessions,
+  projectDirectories,
+  pushProjectSessions,
+  registerProjectSessions,
+  unregisterProjectRoutes,
+  type ProjectSessionListing,
+} from "../../src/agent-manager/project/init"
+import { ProjectRouteService, type SessionRef, type WorktreeRef } from "../../src/agent-manager/project/route"
+
+const ROOT = "/repo/main"
+const WT_PATH = "/repo/main/.kilo/worktrees/fix"
+const OTHER = "/other/project"
+
+function mkSession(id: string, dir: string): Session {
+  return {
+    id,
+    slug: id,
+    projectID: "prj-test",
+    directory: dir,
+    title: `Session ${id}`,
+    version: "1",
+    time: { created: 1000, updated: 2000 },
+  }
+}
+
+/** Build a fake WorktreeStateManager with just the queries project-init uses. */
+function fakeState(worktrees: Worktree[], sessions: ManagedSession[] = []): WorktreeStateManager {
+  const wtMap = new Map(worktrees.map((w) => [w.id, w]))
+  return {
+    getWorktrees: () => worktrees,
+    getWorktree: (id: string) => wtMap.get(id),
+    getSessions: () => sessions,
+    flush: async () => {},
+  } as unknown as WorktreeStateManager
+}
+
+function makeContext(root: string, state: WorktreeStateManager, id = "prj-test"): ProjectContext {
+  const deps: ProjectContextDeps = {
+    log: () => {},
+    state: () => state,
+  }
+  const ctx = new ProjectContext(id, root, false, deps)
+  // Instantiate the lazy state so peekState() returns the fake.
+  ctx.stateManager()
+  return ctx
+}
+
+/** A recording ProjectSessionListing: serves sessions by directory and records registrations. */
+function recordingListing(byDir: Record<string, Session[] | (() => Session[] | Promise<Session[]>)>): {
+  listing: ProjectSessionListing
+  calls: string[]
+  registered: Map<string, string>
+} {
+  const calls: string[] = []
+  const registered = new Map<string, string>()
+  const listing: ProjectSessionListing = {
+    listSessions: async (dir) => {
+      calls.push(dir)
+      const value = byDir[dir]
+      const resolved = typeof value === "function" ? await value() : (value ?? [])
+      return resolved
+    },
+    setSessionDirectory: (id, dir) => {
+      registered.set(id, dir)
+    },
+  }
+  return { listing, calls, registered }
+}
+
+/**
+ * A recording listing that also forwards route registrations to a real
+ * ProjectRouteService, so tests can assert exact-route behavior end-to-end
+ * through the project-init functions. Includes trackSession so it satisfies
+ * registerProjectSessions' full parameter shape.
+ */
+function routeListing(
+  routes: ProjectRouteService,
+  byDir: Record<string, Session[] | (() => Session[] | Promise<Session[]>)>,
+  projectId: string,
+  generation: number,
+): {
+  listing: ProjectSessionListing & { trackSession(id: string): void }
+  calls: string[]
+  registered: Map<string, string>
+  tracked: string[]
+} {
+  const calls: string[] = []
+  const registered = new Map<string, string>()
+  const tracked: string[] = []
+  const listing: ProjectSessionListing & { trackSession(id: string): void } = {
+    listSessions: async (dir) => {
+      calls.push(dir)
+      const value = byDir[dir]
+      const resolved = typeof value === "function" ? await value() : (value ?? [])
+      return resolved
+    },
+    setSessionDirectory: (id, dir) => {
+      registered.set(id, dir)
+    },
+    trackSession: (id) => tracked.push(id),
+    registerProjectRoute: (ref, root, gen) => routes.registerProject(ref.projectId, root, gen),
+    unregisterProjectRoute: (id) => routes.unregisterProject(id),
+    registerWorktreeRoute: (ref, dir, gen) => routes.registerWorktree(ref, dir, gen),
+    registerSessionRoute: (ref, dir, gen) => routes.registerSession(ref, dir, gen),
+    unregisterSessionRoute: (ref) => routes.unregisterSession(ref),
+  }
+  void projectId
+  void generation
+  return { listing, calls, registered, tracked }
+}
+
+describe("Agent Manager per-project session discovery", () => {
+  it("projectDirectories is exactly ctx.root plus this context's worktree paths", () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    expect(projectDirectories(ctx).sort()).toEqual([ROOT, WT_PATH].sort())
+  })
+
+  it("projectDirectories omits worktrees with empty paths and dedupes ctx.root", () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: ROOT, parentBranch: "main", createdAt: "" }
+    const empty: Worktree = { id: "wt-2", branch: "fix2", path: "", parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt, empty]))
+    expect(projectDirectories(ctx)).toEqual([ROOT])
+  })
+
+  it("lists root and worktree sessions and registers each with its exact directory", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const rootSession = mkSession("ses-root", ROOT)
+    const wtSession = mkSession("ses-wt", WT_PATH)
+    const { listing, calls, registered } = recordingListing({
+      [ROOT]: [rootSession],
+      [WT_PATH]: [wtSession],
+    })
+
+    const out = await collectProjectSessions(ctx, listing)
+
+    expect(out.map((s) => s.id).sort()).toEqual(["ses-root", "ses-wt"].sort())
+    expect(calls.sort()).toEqual([ROOT, WT_PATH].sort())
+    expect(registered.get("ses-root")).toBe(ROOT)
+    expect(registered.get("ses-wt")).toBe(WT_PATH)
+    // sessionToWebview round-trip
+    expect(out.find((s) => s.id === "ses-root")?.title).toBe("Session ses-root")
+  })
+
+  it("does not list or include sessions from unrelated-project directories", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const foreign = mkSession("ses-foreign", OTHER)
+    const rootSession = mkSession("ses-root", ROOT)
+    // The foreign directory is present in the listing map but must never be queried,
+    // because ctx only owns ROOT + its own worktree paths.
+    const { listing, calls } = recordingListing({
+      [ROOT]: [rootSession],
+      [WT_PATH]: [],
+      [OTHER]: [foreign],
+    })
+
+    const out = await collectProjectSessions(ctx, listing)
+
+    expect(calls).not.toContain(OTHER)
+    expect(out.map((s) => s.id)).toEqual(["ses-root"])
+  })
+
+  it("retains valid sessions when one directory listing fails", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const wtSession = mkSession("ses-wt", WT_PATH)
+    const { listing, registered } = recordingListing({
+      [ROOT]: () => {
+        throw new Error("backend not connected")
+      },
+      [WT_PATH]: [wtSession],
+    })
+
+    const out = await collectProjectSessions(ctx, listing)
+
+    expect(out.map((s) => s.id)).toEqual(["ses-wt"])
+    expect(registered.get("ses-wt")).toBe(WT_PATH)
+  })
+
+  it("retains valid sessions when listSessions rejects (promise) for one directory", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const wtSession = mkSession("ses-wt", WT_PATH)
+    const calls: string[] = []
+    const registered = new Map<string, string>()
+    const listing: ProjectSessionListing = {
+      listSessions: async (dir) => {
+        calls.push(dir)
+        if (dir === ROOT) throw new Error("boom")
+        return [wtSession]
+      },
+      setSessionDirectory: (id, dir) => registered.set(id, dir),
+    }
+
+    const out = await collectProjectSessions(ctx, listing)
+
+    expect(out.map((s) => s.id)).toEqual(["ses-wt"])
+    expect(registered.get("ses-wt")).toBe(WT_PATH)
+  })
+
+  it("returns [] when the SessionProvider has no listSessions", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const listing: ProjectSessionListing = { setSessionDirectory: () => {} }
+
+    const out = await collectProjectSessions(ctx, listing)
+
+    expect(out).toEqual([])
+  })
+
+  it("dedupes a session reported under two directories, keeping the first directory", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const shared = mkSession("ses-shared", ROOT)
+    const { listing, registered } = recordingListing({
+      [ROOT]: [shared],
+      [WT_PATH]: [shared],
+    })
+
+    const out = await collectProjectSessions(ctx, listing)
+
+    expect(out.map((s) => s.id)).toEqual(["ses-shared"])
+    // ctx.root is listed first (insertion order of the Set), so it wins.
+    expect(registered.get("ses-shared")).toBe(ROOT)
+  })
+
+  it("registerProjectSessions preserves managed placement (worktree session -> worktree path, local -> root)", () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const managed: ManagedSession[] = [
+      { id: "ses-wt", worktreeId: "wt-1", createdAt: "" },
+      { id: "ses-local", worktreeId: null, createdAt: "" },
+    ]
+    const ctx = makeContext(ROOT, fakeState([wt], managed))
+    const registered = new Map<string, string>()
+    const tracked: string[] = []
+    registerProjectSessions(ctx, {
+      setSessionDirectory: (id, dir) => registered.set(id, dir),
+      trackSession: (id) => tracked.push(id),
+    })
+
+    expect(registered.get("ses-wt")).toBe(WT_PATH)
+    expect(registered.get("ses-local")).toBe(ROOT)
+    expect(tracked.sort()).toEqual(["ses-local", "ses-wt"].sort())
+  })
+
+  it("registerProjectSessions falls back to ctx.root when a managed worktree is gone", () => {
+    const managed: ManagedSession[] = [{ id: "ses-orphan", worktreeId: "wt-gone", createdAt: "" }]
+    const ctx = makeContext(ROOT, fakeState([], managed))
+    const registered = new Map<string, string>()
+    registerProjectSessions(ctx, {
+      setSessionDirectory: (id, dir) => registered.set(id, dir),
+      trackSession: () => {},
+    })
+
+    expect(registered.get("ses-orphan")).toBe(ROOT)
+  })
+
+  it("pushProjectSessions posts one projectSessions message with the collected ids", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const { listing } = recordingListing({
+      [ROOT]: [mkSession("ses-root", ROOT)],
+      [WT_PATH]: [mkSession("ses-wt", WT_PATH)],
+    })
+    const posted: Array<{ type: string; projectId: string; sessions: { id: string }[] }> = []
+
+    await pushProjectSessions(ctx, listing, (msg) => posted.push(msg))
+
+    expect(posted).toHaveLength(1)
+    expect(posted[0]!.type).toBe("agentManager.projectSessions")
+    expect(posted[0]!.projectId).toBe("prj-test")
+    expect(posted[0]!.sessions.map((s) => s.id).sort()).toEqual(["ses-root", "ses-wt"].sort())
+  })
+
+  it("pushProjectSessions posts nothing when the context is disposed", async () => {
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const { listing } = recordingListing({ [ROOT]: [mkSession("ses-root", ROOT)] })
+    const posted: unknown[] = []
+    await ctx.dispose()
+    await pushProjectSessions(ctx, listing, (msg) => posted.push(msg))
+    expect(posted).toHaveLength(0)
+  })
+
+  it("pushProjectSessions re-posts the cached list while the previous listing is fresh", async () => {
+    const ctx = makeContext(ROOT, fakeState([]))
+    const { listing, calls } = recordingListing({ [ROOT]: [mkSession("ses-root", ROOT)] })
+    const posted: Array<{ sessions: Array<{ id: string }> }> = []
+
+    await pushProjectSessions(ctx, listing, (msg) => posted.push(msg))
+    expect(posted).toHaveLength(1)
+    expect(calls).toHaveLength(1)
+
+    // Fresh skip: no new backend listing, but the cached list is re-posted so
+    // a webview that mounted after the first push still learns the sessions.
+    await pushProjectSessions(ctx, listing, (msg) => posted.push(msg))
+    expect(posted).toHaveLength(2)
+    expect(posted[1]!.sessions.map((s) => s.id)).toEqual(["ses-root"])
+    expect(calls).toHaveLength(1)
+  })
+
+  it("upsertSession makes a new session visible without a backend listing", async () => {
+    const ctx = makeContext(ROOT, fakeState([]))
+    const { listing } = recordingListing({ [ROOT]: [mkSession("ses-root", ROOT)] })
+    const posted: Array<{ sessions: Array<{ id: string }> }> = []
+
+    await pushProjectSessions(ctx, listing, (msg) => posted.push(msg))
+    ctx.upsertSession({
+      id: "ses-new",
+      parentID: null,
+      title: "new",
+      createdAt: "",
+      updatedAt: "",
+      revert: null,
+      summary: null,
+      worktreeId: null,
+    })
+    expect(ctx.hasLiveSession("ses-new")).toBe(true)
+
+    // The next push (still fresh) includes the upserted session from the cache.
+    ctx.invalidateSessions()
+    const { listing: listing2, calls } = recordingListing({
+      [ROOT]: [mkSession("ses-root", ROOT), mkSession("ses-new", ROOT)],
+    })
+    await pushProjectSessions(ctx, listing2, (msg) => posted.push(msg))
+    expect(
+      posted
+        .at(-1)!
+        .sessions.map((s) => s.id)
+        .sort(),
+    ).toEqual(["ses-new", "ses-root"])
+    expect(calls).toHaveLength(1)
+  })
+})
+
+describe("Agent Manager route registration during project-init", () => {
+  it("registerProjectSessions registers the project root, worktrees, and managed session routes", () => {
+    const routes = new ProjectRouteService()
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const managed: ManagedSession[] = [
+      { id: "ses-wt", worktreeId: "wt-1", createdAt: "" },
+      { id: "ses-local", worktreeId: null, createdAt: "" },
+    ]
+    const ctx = makeContext(ROOT, fakeState([wt], managed))
+    const { listing } = routeListing(routes, {}, ctx.id, ctx.generation)
+
+    registerProjectSessions(ctx, listing)
+
+    // Project root route
+    expect(routes.projectRoot({ projectId: ctx.id })).toBe(ROOT)
+    // Worktree route
+    expect(routes.worktreeDirectory({ projectId: ctx.id, worktreeId: "wt-1" })).toBe(WT_PATH)
+    // Session routes resolve exactly
+    const wtRef: SessionRef = { projectId: ctx.id, sessionId: "ses-wt" }
+    const localRef: SessionRef = { projectId: ctx.id, sessionId: "ses-local" }
+    expect(routes.sessionDirectory(wtRef)).toBe(WT_PATH)
+    expect(routes.sessionDirectory(localRef)).toBe(ROOT)
+  })
+
+  it("collectProjectSessions registers routes for every live session and worktree", async () => {
+    const routes = new ProjectRouteService()
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const ctx = makeContext(ROOT, fakeState([wt]))
+    const rootSession = mkSession("ses-root", ROOT)
+    const wtSession = mkSession("ses-wt", WT_PATH)
+    const { listing } = routeListing(routes, { [ROOT]: [rootSession], [WT_PATH]: [wtSession] }, ctx.id, ctx.generation)
+
+    await collectProjectSessions(ctx, listing)
+
+    expect(routes.projectRoot({ projectId: ctx.id })).toBe(ROOT)
+    const wtDirRef: WorktreeRef = { projectId: ctx.id, worktreeId: "wt-1" }
+    expect(routes.worktreeDirectory(wtDirRef)).toBe(WT_PATH)
+    expect(routes.sessionDirectory({ projectId: ctx.id, sessionId: "ses-root" })).toBe(ROOT)
+    expect(routes.sessionDirectory({ projectId: ctx.id, sessionId: "ses-wt" })).toBe(WT_PATH)
+  })
+
+  it("same raw session id in two projects is ambiguous after both register", () => {
+    const routes = new ProjectRouteService()
+    const ctxA = makeContext("/repo/a", fakeState([]), "prj-a")
+    const ctxB = makeContext("/repo/b", fakeState([]), "prj-b")
+    const listingA = routeListing(routes, {}, ctxA.id, ctxA.generation).listing
+    const listingB = routeListing(routes, {}, ctxB.id, ctxB.generation).listing
+
+    // Register each project root first (as registerProjectRoutes would),
+    // then register the same raw session id in both projects.
+    listingA.registerProjectRoute!({ projectId: ctxA.id }, "/repo/a", ctxA.generation)
+    listingB.registerProjectRoute!({ projectId: ctxB.id }, "/repo/b", ctxB.generation)
+    listingA.registerSessionRoute!({ projectId: ctxA.id, sessionId: "same" }, "/repo/a", ctxA.generation)
+    listingB.registerSessionRoute!({ projectId: ctxB.id, sessionId: "same" }, "/repo/b", ctxB.generation)
+
+    expect(routes.isSessionAmbiguous("same")).toBe(true)
+    expect(routes.trySessionDirectory("same")).toBeUndefined()
+    // Project-qualified refs still resolve exactly.
+    expect(routes.trySessionDirectoryFor({ projectId: ctxA.id, sessionId: "same" })).toBe("/repo/a")
+    expect(routes.trySessionDirectoryFor({ projectId: ctxB.id, sessionId: "same" })).toBe("/repo/b")
+  })
+
+  it("unregisterProjectRoutes clears all routes for a project", () => {
+    const routes = new ProjectRouteService()
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const managed: ManagedSession[] = [{ id: "ses-wt", worktreeId: "wt-1", createdAt: "" }]
+    const ctx = makeContext(ROOT, fakeState([wt], managed))
+    const { listing } = routeListing(routes, {}, ctx.id, ctx.generation)
+
+    registerProjectSessions(ctx, listing)
+    expect(routes.hasSession({ projectId: ctx.id, sessionId: "ses-wt" })).toBe(true)
+
+    unregisterProjectRoutes(ctx, listing)
+    expect(routes.hasSession({ projectId: ctx.id, sessionId: "ses-wt" })).toBe(false)
+    expect(routes.trySessionDirectory("ses-wt")).toBeUndefined()
+  })
+
+  it("registerProjectSessions is a no-op when the listing has no route methods", () => {
+    const routes = new ProjectRouteService()
+    const wt: Worktree = { id: "wt-1", branch: "fix", path: WT_PATH, parentBranch: "main", createdAt: "" }
+    const managed: ManagedSession[] = [{ id: "ses-wt", worktreeId: "wt-1", createdAt: "" }]
+    const ctx = makeContext(ROOT, fakeState([wt], managed))
+    // Plain listing without route methods — must not throw.
+    const registered = new Map<string, string>()
+    const listing = {
+      setSessionDirectory: (id: string, dir: string) => registered.set(id, dir),
+      trackSession: () => {},
+    }
+    registerProjectSessions(ctx, listing)
+    expect(registered.get("ses-wt")).toBe(WT_PATH)
+    // No routes were registered.
+    expect(routes.trySessionDirectory("ses-wt")).toBeUndefined()
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/agent-project-state-router.test.ts b/packages/kilo-vscode/tests/unit/agent-project-state-router.test.ts
new file mode 100644
index 0000000000..ecc57fe54f
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-project-state-router.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it } from "bun:test"
+import { createProjectStateRouter } from "../../webview-ui/agent-manager/project/state"
+import type { AgentManagerStateMessage, AgentProjectSnapshot } from "../../src/types/messages"
+
+const state = (projectId: string) => ({ type: "agentManager.state", projectId }) as AgentManagerStateMessage
+const project = (id: string, active = false) => ({ id, label: id, root: `/repo/${id}`, active }) as AgentProjectSnapshot
+
+function setup(catalog: AgentProjectSnapshot[] = []) {
+  const calls: { applied: string[]; pruned: string[][] } = { applied: [], pruned: [] }
+  let list = catalog
+  const router = createProjectStateRouter({
+    catalog: () => list,
+    apply: (s) => calls.applied.push(s.projectId ?? ""),
+    pruneLive: (ids) => calls.pruned.push([...ids]),
+  })
+  return { router, calls, set: (projects: AgentProjectSnapshot[]) => (list = projects) }
+}
+
+describe("createProjectStateRouter", () => {
+  it("applies state directly when the catalog is empty (legacy mode)", () => {
+    const { router, calls } = setup()
+    expect(router.routeState(state("prj-a"))).toBe("applied")
+    expect(calls.applied).toEqual(["prj-a"])
+  })
+
+  it("defers state that arrives before its catalog activation and flushes it", () => {
+    const { router, calls, set } = setup([project("prj-a", true), project("prj-b")])
+
+    expect(router.routeState(state("prj-b"))).toBe("deferred")
+    expect(calls.applied).toEqual([])
+
+    set([project("prj-a"), project("prj-b", true)])
+    router.routeCatalog([project("prj-a"), project("prj-b", true)])
+    expect(calls.applied).toEqual(["prj-b"])
+  })
+
+  it("applies state immediately when its project is already catalog-active", () => {
+    const { router, calls } = setup([project("prj-a", true), project("prj-b")])
+    expect(router.routeState(state("prj-a"))).toBe("applied")
+    expect(calls.applied).toEqual(["prj-a"])
+  })
+
+  it("keeps the newest deferred state per project", () => {
+    const { router, calls, set } = setup([project("prj-a", true)])
+    router.routeState({ ...state("prj-b"), worktrees: [{ id: "1" }] } as never)
+    router.routeState({ ...state("prj-b"), worktrees: [{ id: "1" }, { id: "2" }] } as never)
+    set([project("prj-b", true)])
+    router.routeCatalog([project("prj-b", true)])
+    expect(calls.applied).toHaveLength(1)
+  })
+
+  it("drops deferred state for projects removed from the catalog", () => {
+    const { router, calls, set } = setup([project("prj-a", true), project("prj-b")])
+    router.routeState(state("prj-b"))
+    set([project("prj-a", true)])
+    router.routeCatalog([project("prj-a", true)])
+    expect(calls.applied).toEqual([])
+    expect(calls.pruned.at(-1)).toEqual(["prj-a"])
+  })
+
+  it("does not flush deferred state for a project that is not the active one", () => {
+    const { router, calls, set } = setup([project("prj-a", true), project("prj-b")])
+    router.routeState(state("prj-b"))
+    set([project("prj-c", true)])
+    router.routeCatalog([project("prj-a"), project("prj-b"), project("prj-c", true)])
+    expect(calls.applied).toEqual([])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/config-bindings.test.ts b/packages/kilo-vscode/tests/unit/config-bindings.test.ts
new file mode 100644
index 0000000000..fbb1327aaf
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/config-bindings.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from "bun:test"
+import { ConfigBindings, type ConfigProject } from "../../src/kilo-provider/config-bindings"
+
+const { KiloProvider } = await import("../../src/KiloProvider")
+
+const target = {
+  scope: "project" as const,
+  path: "/repo/.kilo/kilo.jsonc",
+  revision: "revision",
+  exists: false,
+  writable: true,
+  raw: {},
+}
+
+describe("ConfigBindings", () => {
+  it("keeps the read-time directory and target immutable", () => {
+    const bindings = new ConfigBindings()
+    const binding = bindings.create({
+      connection: 1,
+      scope: "project",
+      directory: "/repo/a",
+      target,
+      project: { id: "a", root: "/repo/a", generation: 2, pinned: false },
+    })
+
+    expect(bindings.get(binding.id, 1, () => true)).toMatchObject({
+      directory: "/repo/a",
+      target: { path: target.path, revision: target.revision },
+    })
+  })
+
+  it("expires on reconnect, trust revocation, removal, or successful save", () => {
+    const bindings = new ConfigBindings()
+    const project: ConfigProject = { id: "a", root: "/repo/a", generation: 2, pinned: false }
+    const binding = bindings.create({ connection: 1, scope: "project", directory: project.root, target, project })
+
+    expect(bindings.get(binding.id, 2, () => true)).toBeUndefined()
+    expect(bindings.get(binding.id, 1, () => false)).toBeUndefined()
+    expect(bindings.get(binding.id, 1, () => true)).toBeDefined()
+    bindings.consume(binding.id)
+    expect(bindings.get(binding.id, 1, () => true)).toBeUndefined()
+  })
+
+  it("expires retained-panel bindings when the selected project changes", () => {
+    const provider = new KiloProvider({} as never, {} as never, undefined, { projectDirectory: "/repo/a" })
+    const internal = provider as unknown as { configBindings: ConfigBindings; connectionGeneration: number }
+    const binding = internal.configBindings.create({
+      connection: internal.connectionGeneration,
+      scope: "global",
+      directory: "/repo/a",
+      target: { ...target, scope: "global" },
+    })
+
+    provider.setProjectDirectory("/repo/b")
+
+    expect(internal.configBindings.get(binding.id, internal.connectionGeneration, () => true)).toBeUndefined()
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/config-scope.test.ts b/packages/kilo-vscode/tests/unit/config-scope.test.ts
index eca588a5d1..80bd762552 100644
--- a/packages/kilo-vscode/tests/unit/config-scope.test.ts
+++ b/packages/kilo-vscode/tests/unit/config-scope.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from "bun:test"
 import { splitConfigByScope } from "../../webview-ui/src/utils/config-scope"
 
 describe("splitConfigByScope", () => {
-  it("writes indexing enablement to project config only", () => {
+  it("keeps indexing configuration out of project config", () => {
     const split = splitConfigByScope({
       indexing: {
         enabled: true,
@@ -10,8 +10,8 @@ describe("splitConfigByScope", () => {
       },
     })
 
-    expect(split.global).toEqual({ indexing: { provider: "ollama" } })
-    expect(split.project).toEqual({ indexing: { enabled: true } })
+    expect(split.global).toEqual({ indexing: { enabled: true, provider: "ollama" } })
+    expect(split.project).toEqual({})
   })
 
   it("writes indexing provider settings to global config", () => {
@@ -25,14 +25,6 @@ describe("splitConfigByScope", () => {
     expect(split.project).toEqual({})
   })
 
-  it("can write indexing enablement to global config through a global draft", () => {
-    const split = splitConfigByScope({ username: "marius" })
-    const draft = { indexing: { enabled: true } }
-
-    expect({ ...split.global, ...draft }).toEqual({ username: "marius", indexing: { enabled: true } })
-    expect(split.project).toEqual({})
-  })
-
   it("writes the speech-to-text model setting to global config", () => {
     const split = splitConfigByScope({
       experimental: {
diff --git a/packages/kilo-vscode/tests/unit/diff-scope.test.ts b/packages/kilo-vscode/tests/unit/diff-scope.test.ts
new file mode 100644
index 0000000000..9794d4bc6e
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/diff-scope.test.ts
@@ -0,0 +1,69 @@
+import { describe, it, expect } from "bun:test"
+import {
+  composeDiffId,
+  parseDiffId,
+  isDiffScope,
+  normalizeScope,
+  scopeToSourceId,
+  DEFAULT_DIFF_SCOPE,
+} from "../../src/agent-manager/diff-scope"
+
+describe("diff-scope composite ids", () => {
+  it("round-trips context and scope", () => {
+    expect(parseDiffId(composeDiffId("local", "branch"))).toEqual({ ctx: "local", scope: "branch" })
+    expect(parseDiffId(composeDiffId("wt_abc", "staged"))).toEqual({ ctx: "wt_abc", scope: "staged" })
+    expect(parseDiffId(composeDiffId("wt_abc", "unstaged"))).toEqual({ ctx: "wt_abc", scope: "unstaged" })
+    expect(parseDiffId(composeDiffId("wt_abc", "session"))).toEqual({ ctx: "wt_abc", scope: "session" })
+  })
+
+  it("embeds the active session id in the session scope", () => {
+    const id = composeDiffId("wt_abc", "session", "ses_xyz")
+    expect(id).toBe("wt_abc#session:ses_xyz")
+    expect(parseDiffId(id)).toEqual({ ctx: "wt_abc", scope: "session", sessionId: "ses_xyz" })
+    expect(parseDiffId(composeDiffId("local", "session", "ses_xyz"))).toEqual({
+      ctx: "local",
+      scope: "session",
+      sessionId: "ses_xyz",
+    })
+  })
+
+  it("parses context ids containing no separator as default branch scope", () => {
+    expect(parseDiffId("wt_abc")).toEqual({ ctx: "wt_abc", scope: DEFAULT_DIFF_SCOPE })
+  })
+
+  it("treats an unknown trailing segment as part of the context, not a scope", () => {
+    // A context id that happens to contain '#' but not a valid scope keeps the
+    // full id as context and falls back to branch.
+    expect(parseDiffId("wt_a#bogus")).toEqual({ ctx: "wt_a#bogus", scope: DEFAULT_DIFF_SCOPE })
+  })
+
+  it("isDiffScope guards the closed enum", () => {
+    expect(isDiffScope("branch")).toBe(true)
+    expect(isDiffScope("staged")).toBe(true)
+    expect(isDiffScope("unstaged")).toBe(true)
+    expect(isDiffScope("session")).toBe(true)
+    expect(isDiffScope("session:ses_xyz")).toBe(false)
+    expect(isDiffScope("turn")).toBe(false)
+    expect(isDiffScope("")).toBe(false)
+  })
+
+  it("normalizeScope falls back to branch for unknown input", () => {
+    expect(normalizeScope("staged")).toBe("staged")
+    expect(normalizeScope("nope")).toBe("branch")
+    expect(normalizeScope(undefined)).toBe("branch")
+    expect(normalizeScope(42)).toBe("branch")
+  })
+
+  it("maps scopes to catalog source ids", () => {
+    expect(scopeToSourceId("branch", "wt_abc")).toBe("workspace")
+    expect(scopeToSourceId("staged", "wt_abc")).toBe("staged")
+    expect(scopeToSourceId("unstaged", "wt_abc")).toBe("unstaged")
+    expect(scopeToSourceId("session", "wt_abc", "ses_xyz")).toBe("session:ses_xyz")
+    expect(scopeToSourceId("session", "local", "ses_xyz")).toBe("session:ses_xyz")
+    expect(scopeToSourceId("branch", "local")).toBe("workspace")
+  })
+
+  it("falls back to the context id for a session scope without a session id", () => {
+    expect(scopeToSourceId("session", "ses_abc")).toBe("session:ses_abc")
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/extension-arch.test.ts b/packages/kilo-vscode/tests/unit/extension-arch.test.ts
index 3e8e4d3067..160823e513 100644
--- a/packages/kilo-vscode/tests/unit/extension-arch.test.ts
+++ b/packages/kilo-vscode/tests/unit/extension-arch.test.ts
@@ -127,7 +127,7 @@ describe("Extension — package.json command sync", () => {
     expect(terminal).toMatchObject({
       key: "ctrl+/",
       mac: "cmd+/",
-      when: "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel'",
+      when: "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' && !kilo-code.new.sidebarFocused",
     })
     expect(create).toMatchObject({
       key: "ctrl+shift+t",
diff --git a/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts b/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts
index 0afb8b9254..c62663414f 100644
--- a/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts
+++ b/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts
@@ -83,6 +83,54 @@ describe("GitOps", () => {
 })
 
 describe("GitStatsPoller", () => {
+  it("keeps mutual exclusion when a stale fetch finishes after a restart", async () => {
+    let calls = 0
+    let running = 0
+    let max = 0
+    let gate: (() => void) | undefined
+    const gated = new Promise<void>((resolve) => {
+      gate = resolve
+    })
+    const localDiff = async () => {
+      calls += 1
+      running += 1
+      max = Math.max(max, running)
+      if (calls === 1) await gated
+      running -= 1
+      return [{ ...diff(1, 0)[0], stamp: `s${calls}` }]
+    }
+    const poller = new GitStatsPoller({
+      getWorktrees: () => [],
+      getWorkspaceRoot: () => "/tmp",
+      localDiff,
+      onStats: () => undefined,
+      onLocalStats: () => undefined,
+      log: () => undefined,
+      intervalMs: 5,
+      git: gitOps(async (args) => {
+        if (args[0] === "rev-parse" && args[2] === "HEAD") return "main"
+        if (args[0] === "symbolic-ref") return "origin/main"
+        if (args[0] === "rev-list") return "0	0"
+        return ""
+      }),
+    })
+
+    poller.setEnabled(true)
+    await waitFor(() => calls === 1)
+    // Restart while the first fetch is in flight, then let it finish. The
+    // stale finally must not clear the busy flag owned by the new poll.
+    poller.stop()
+    poller.setEnabled(true)
+    await waitFor(() => calls === 2)
+    gate?.()
+    await waitFor(() => calls >= 3)
+    poller.stop()
+
+    // The gated first fetch and the restarted poll overlapped by
+    // construction; no further overlap may occur after the restart.
+    expect(max).toBeLessThanOrEqual(2)
+  })
+
   it("does not overlap polling runs", async () => {
     let running = 0
     let max = 0
@@ -279,6 +327,57 @@ describe("GitStatsPoller", () => {
     expect(emitted[0]?.map((item) => item.worktreeId)).toEqual(["a"])
   })
 
+  it("treats symlink-aliased worktree paths as present via realpath canonicalization", async () => {
+    // git worktree list --porcelain realpath-resolves worktree registration, so
+    // a worktree registered through a symlink alias (e.g. /tmp -> /private/tmp
+    // on macOS) is reported under its realpath. The probe must canonicalize the
+    // session's lexical alias the same way, or a real worktree is marked missing
+    // and its stats are excluded.
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "gsp-symlink-"))
+    const real = fs.mkdtempSync(path.join(os.tmpdir(), "gsp-symlink-real-"))
+    const alias = path.join(root, "alias")
+    fs.symlinkSync(real, alias)
+
+    const presence: WorktreePresenceResult[] = []
+    const calls: string[] = []
+    const emitted: Array<Array<{ worktreeId: string; additions: number; deletions: number }>> = []
+
+    const poller = new GitStatsPoller({
+      getWorktrees: () => [{ ...worktree("a"), path: alias }],
+      getWorkspaceRoot: () => root,
+      localDiff: async (dir) => {
+        calls.push(dir)
+        return diff(3, 2)
+      },
+      onStats: (stats) => emitted.push(stats),
+      onLocalStats: () => undefined,
+      onWorktreePresence: (result) => presence.push(result),
+      log: () => undefined,
+      intervalMs: 5,
+      git: gitOps(async (args) => {
+        if (args[0] === "worktree") {
+          return `worktree ${real}\nbranch refs/heads/branch-a\n`
+        }
+        if (args[0] === "rev-parse" && args[3] === "@{upstream}") return "origin/main"
+        if (args[0] === "rev-list") return "1"
+        return ""
+      }),
+    })
+
+    poller.setEnabled(true)
+    await waitFor(() => presence.length >= 1 && emitted.length >= 1)
+    poller.stop()
+    fs.rmSync(root, { recursive: true, force: true })
+    fs.rmSync(real, { recursive: true, force: true })
+
+    expect(presence[0]).toEqual({
+      worktrees: [{ worktreeId: "a", missing: false, branch: "branch-a" }],
+      degraded: false,
+    })
+    expect(calls.some((dir) => dir === alias)).toBe(true)
+    expect(emitted[0]?.map((item) => item.worktreeId)).toEqual(["a"])
+  })
+
   it("preserves local stats when diff fails after initial success", async () => {
     let diffCalls = 0
     const emitted: Array<{
diff --git a/packages/kilo-vscode/tests/unit/i18n-keys.test.ts b/packages/kilo-vscode/tests/unit/i18n-keys.test.ts
index 11c8c277e3..1aa3db8111 100644
--- a/packages/kilo-vscode/tests/unit/i18n-keys.test.ts
+++ b/packages/kilo-vscode/tests/unit/i18n-keys.test.ts
@@ -41,6 +41,7 @@ import { dict as appTr } from "../../webview-ui/src/i18n/tr"
 import { dict as appNl } from "../../webview-ui/src/i18n/nl"
 import { dict as appUk } from "../../webview-ui/src/i18n/uk"
 import { dict as appIt } from "../../webview-ui/src/i18n/it"
+import { dict as appFa } from "../../webview-ui/src/i18n/fa"
 
 // Layer 2: upstream UI (@opencode-ai/ui re-exported via @kilocode/kilo-ui)
 import { dict as uiEn } from "../../../ui/src/i18n/en"
@@ -114,6 +115,7 @@ import { dict as cliTr } from "../../src/services/cli-backend/i18n/tr"
 import { dict as cliNl } from "../../src/services/cli-backend/i18n/nl"
 import { dict as cliUk } from "../../src/services/cli-backend/i18n/uk"
 import { dict as cliIt } from "../../src/services/cli-backend/i18n/it"
+import { dict as cliFa } from "../../src/services/cli-backend/i18n/fa"
 
 import { dict as hostEn } from "../../src/services/i18n/en"
 import { dict as hostZh } from "../../src/services/i18n/zh"
@@ -135,6 +137,7 @@ import { dict as hostTr } from "../../src/services/i18n/tr"
 import { dict as hostNl } from "../../src/services/i18n/nl"
 import { dict as hostUk } from "../../src/services/i18n/uk"
 import { dict as hostIt } from "../../src/services/i18n/it"
+import { dict as hostFa } from "../../src/services/i18n/fa"
 
 // ── Locale maps ─────────────────────────────────────────────────────────────
 
@@ -161,6 +164,7 @@ const appLocales: Record<string, Record<string, string>> = {
   nl: appNl,
   uk: appUk,
   it: appIt,
+  fa: appFa,
 }
 
 const kiloLocales: Record<string, Record<string, string>> = {
@@ -230,6 +234,7 @@ const cliLocales: Record<string, Record<string, string>> = {
   nl: cliNl,
   uk: cliUk,
   it: cliIt,
+  fa: cliFa,
 }
 
 const hostLocales: Record<string, Record<string, string>> = {
@@ -253,6 +258,7 @@ const hostLocales: Record<string, Record<string, string>> = {
   nl: hostNl,
   uk: hostUk,
   it: hostIt,
+  fa: hostFa,
 }
 
 // Merge webview dictionaries in the same priority order as language.tsx
diff --git a/packages/kilo-vscode/tests/unit/indexing-consent.test.ts b/packages/kilo-vscode/tests/unit/indexing-consent.test.ts
new file mode 100644
index 0000000000..bc8e5d504c
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/indexing-consent.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from "bun:test"
+import { IndexingConsentStore } from "../../src/indexing-consent"
+
+describe("IndexingConsentStore", () => {
+  it("isolates consent by canonical project id", async () => {
+    let value: unknown
+    const store = new IndexingConsentStore(
+      {
+        read: () => value,
+        write: (next) => {
+          value = next
+        },
+      },
+      async (dir) => (dir.includes("alias") ? "/repo/a" : dir),
+    )
+    const first = await store.project("/repo/a")
+    const alias = await store.project("/alias/a")
+    const second = await store.project("/repo/b")
+
+    await store.set(first.id, true)
+
+    expect(alias.id).toBe(first.id)
+    expect(store.enabled(alias.id)).toBe(true)
+    expect(store.enabled(second.id)).toBe(false)
+  })
+
+  it("serializes concurrent updates without dropping another project", async () => {
+    let value: unknown
+    const store = new IndexingConsentStore(
+      {
+        read: () => value,
+        write: async (next) => {
+          await Promise.resolve()
+          value = next
+        },
+      },
+      async (dir) => dir,
+    )
+    const first = await store.project("/repo/a")
+    const second = await store.project("/repo/b")
+
+    await Promise.all([store.set(first.id, true), store.set(second.id, true)])
+
+    expect(store.enabled(first.id)).toBe(true)
+    expect(store.enabled(second.id)).toBe(true)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-indexing-refresh.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-indexing-refresh.test.ts
index 31ed93fd4f..82621a7e46 100644
--- a/packages/kilo-vscode/tests/unit/kilo-provider-indexing-refresh.test.ts
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-indexing-refresh.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "bun:test"
 import type { Config } from "@kilocode/sdk/v2/client"
+import { fetchSnapshot } from "../../src/kilo-provider/config-snapshot"
 
 // vscode mock is provided by the shared preload (tests/setup/vscode-mock.ts)
 const { KiloProvider } = await import("../../src/KiloProvider")
@@ -17,17 +18,59 @@ type Internals = {
     projectUnset?: string[][],
   ) => Promise<void>
   fetchAndSendConfig: () => Promise<void>
+  fetchAndSendConfigUpdated: () => Promise<void>
   fetchAndSendProviders: () => Promise<void>
   fetchAndSendAgents: () => Promise<void>
   fetchAndSendSkills: () => Promise<void>
   fetchAndSendCommands: () => Promise<void>
   fetchAndSendNotifications: () => Promise<void>
   fetchAndSendIndexingStatus: () => Promise<void>
+  connectionGeneration: number
+  configBindings: {
+    create: (input: unknown) => { id: string }
+  }
+}
+
+function binding(internal: Internals, scope: "global" | "project") {
+  return internal.configBindings.create({
+    connection: internal.connectionGeneration,
+    scope,
+    directory: "/repo",
+    target: {
+      scope,
+      path: scope === "global" ? "/config/kilo.jsonc" : "/repo/.kilo/kilo.jsonc",
+      revision: `${scope}-revision`,
+      exists: false,
+      writable: true,
+      raw: {},
+    },
+  })
 }
 
 function createConnection() {
   let drains = 0
   const patches: unknown[] = []
+  const snapshot = {
+    effective: {},
+    targets: {
+      global: {
+        scope: "global",
+        path: "/config/kilo.jsonc",
+        revision: "global-next",
+        exists: true,
+        writable: true,
+        raw: {},
+      },
+      project: {
+        scope: "project",
+        path: "/repo/.kilo/kilo.jsonc",
+        revision: "project-next",
+        exists: true,
+        writable: true,
+        raw: {},
+      },
+    },
+  }
   const client = {
     global: {
       config: {
@@ -38,15 +81,16 @@ function createConnection() {
     config: {
       get: async () => ({ data: {} }),
       update: async () => ({ data: {} }),
-      overlay: async () => ({ data: { project: {} } }),
+      overlay: async () => ({ data: { project: {}, targets: snapshot.targets } }),
       overlayUpdate: async (patch: unknown) => {
         patches.push(patch)
-        return { data: {} }
+        return { data: snapshot }
       },
     },
   }
 
   return {
+    client,
     drains: () => drains,
     patches: () => patches,
     service: {
@@ -59,6 +103,43 @@ function createConnection() {
 }
 
 describe("KiloProvider indexing refresh", () => {
+  it("shares snapshot payloads across load, SSE refresh, and post-save refresh", async () => {
+    const conn = createConnection()
+    const settings = () => ({ maxCost: 0, languageCommitMessage: "sync", multiProject: false })
+    const snapshot = await fetchSnapshot(conn.client as never, "/repo", settings)
+    const provider = new KiloProvider({} as never, conn.service as never)
+    const internal = provider as unknown as Internals
+    const sent: Array<Record<string, unknown>> = []
+    provider.postMessage = (message) => void sent.push(message as Record<string, unknown>)
+    Object.assign(internal, { connectionState: "connected", commitMessageLanguageSetting: () => "sync" })
+    await internal.fetchAndSendConfig()
+    await internal.fetchAndSendConfigUpdated()
+    // Save against the binding the latest config load issued, like the webview
+    // does: each load supersedes older bindings for the same scope+directory.
+    const issued = (sent[sent.length - 1]!.bindings as { global: { id: string } }).global.id
+    await internal.handleUpdateConfig({ model: "test/global" }, {}, [], [], issued)
+
+    // bindings carry fresh per-load revision state, so compare the payload
+    // without them; each message still must carry a bindings object.
+    const strip = (m: Record<string, unknown>) => {
+      const { bindings, ...rest } = m
+      expect(bindings).toMatchObject({ global: expect.anything() })
+      return rest
+    }
+    const payload = {
+      config: snapshot.config,
+      globalConfig: snapshot.targets!.global.raw,
+      projectConfig: snapshot.targets!.project.raw,
+      settings: snapshot.settings,
+      features: snapshot.features,
+    }
+    expect(sent.map(strip)).toEqual([
+      { type: "configLoaded", ...payload },
+      { type: "configUpdated", ...payload },
+      { type: "configUpdated", ...payload },
+    ])
+  })
+
   it("reloadAfterAuthChange fetches config first, then indexing status", async () => {
     const provider = new KiloProvider({} as never, {} as never)
     const internal = provider as unknown as Internals
@@ -105,7 +186,7 @@ describe("KiloProvider indexing refresh", () => {
 
     await internal.handleUpdateConfig({})
 
-    expect(conn.drains()).toBe(1)
+    expect(conn.drains()).toBe(0)
     expect(indexing).toBe(0)
   })
 
@@ -118,8 +199,9 @@ describe("KiloProvider indexing refresh", () => {
     internal.fetchAndSendProviders = async () => {
       calls += 1
     }
+    const global = binding(internal, "global")
 
-    await internal.handleUpdateConfig({ hide_prompt_training_models: true })
+    await internal.handleUpdateConfig({ hide_prompt_training_models: true }, {}, [], [], global.id)
 
     expect(calls).toBe(1)
   })
@@ -129,29 +211,83 @@ describe("KiloProvider indexing refresh", () => {
     const provider = new KiloProvider({} as never, conn.service as never)
     const internal = provider as unknown as Internals
     internal.connectionState = "connected"
+    const global = binding(internal, "global")
+    const project = binding(internal, "project")
 
     await internal.handleUpdateConfig(
       { indexing: { qdrant: { apiKey: undefined } } },
       { indexing: { searchMinScore: undefined } },
       [["indexing", "qdrant", "apiKey"]],
       [["indexing", "searchMinScore"]],
+      global.id,
+      project.id,
     )
 
     expect(conn.patches()).toEqual([
       expect.objectContaining({
         scope: "global",
+        expected: { path: "/config/kilo.jsonc", revision: "global-revision" },
         set: { indexing: { qdrant: { apiKey: undefined } } },
         unset: [["indexing", "qdrant", "apiKey"]],
       }),
       expect.objectContaining({
         scope: "project",
+        expected: { path: "/repo/.kilo/kilo.jsonc", revision: "project-revision" },
         set: { indexing: { searchMinScore: undefined } },
         unset: [["indexing", "searchMinScore"]],
       }),
     ])
   })
 
-  it("fetchAndSendIndexingStatus uses current session directory header", async () => {
+  it("reports a completed global scope when the project write conflicts", async () => {
+    const target = (scope: "global" | "project", revision: string) => ({
+      scope,
+      path: scope === "global" ? "/config/kilo.jsonc" : "/repo/.kilo/kilo.jsonc",
+      revision,
+      exists: true,
+      writable: true,
+      raw: {},
+    })
+    const snapshot = {
+      effective: { model: "test/global" },
+      targets: { global: target("global", "global-next"), project: target("project", "project-revision") },
+    }
+    const client = {
+      config: {
+        overlayUpdate: async (input: { scope: string }) => {
+          if (input.scope === "project") throw new Error("revision conflict")
+          return { data: snapshot }
+        },
+      },
+    }
+    const provider = new KiloProvider(
+      {} as never,
+      { drainPendingPrompts: async () => {}, getClient: () => client } as never,
+    )
+    const internal = provider as unknown as Internals
+    const messages: Array<Record<string, unknown>> = []
+    provider.postMessage = (message) => messages.push(message as Record<string, unknown>)
+    internal.connectionState = "connected"
+    const global = binding(internal, "global")
+    const project = binding(internal, "project")
+
+    await internal.handleUpdateConfig(
+      { model: "test/global" },
+      { model: "test/project" },
+      [],
+      [],
+      global.id,
+      project.id,
+    )
+
+    expect(messages.find((message) => message.type === "configUpdateFailed")).toMatchObject({
+      completedScopes: ["global"],
+      config: snapshot.effective,
+      bindings: { global: { target: snapshot.targets.global }, project: { target: snapshot.targets.project } },
+    })
+  })
+
+  it("fetchAndSendIndexingStatus writes project consent through the dedicated endpoint", async () => {
     const worktree = "/repo/.kilo/.kilocode/worktrees/feature"
     const calls: { input: RequestInfo | URL; init?: RequestInit }[] = []
     const original = globalThis.fetch
@@ -180,6 +316,12 @@ describe("KiloProvider indexing refresh", () => {
           getClient: () => ({}) as never,
           getServerConfig: () => ({ baseUrl: "http://127.0.0.1:9999", password: "secret" }),
         } as never,
+        {
+          globalState: {
+            get: () => undefined,
+            update: async () => {},
+          },
+        } as never,
       )
       const internal = provider as unknown as Internals
       provider.setSessionDirectory("ses_worktree", worktree)
@@ -192,6 +334,9 @@ describe("KiloProvider indexing refresh", () => {
       const auth = Buffer.from("kilo:secret").toString("base64")
       expect(headers.get("Authorization")).toBe(`Basic ${auth}`)
       expect(headers.get("x-kilo-directory")).toBe(worktree)
+      expect(calls[0]?.init?.method).toBe("PUT")
+      expect(String(calls[0]?.input)).toBe("http://127.0.0.1:9999/indexing/consent")
+      expect(JSON.parse(String(calls[0]?.init?.body))).toEqual({ enabled: false })
     } finally {
       globalThis.fetch = original
     }
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-route-integration.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-route-integration.test.ts
new file mode 100644
index 0000000000..b8053f7abe
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-route-integration.test.ts
@@ -0,0 +1,327 @@
+import { describe, it, expect } from "bun:test"
+import { ProjectRouteService } from "../../src/agent-manager/project/route"
+
+// vscode mock is provided by the shared preload (tests/setup/vscode-mock.ts)
+const { KiloProvider } = await import("../../src/KiloProvider")
+
+type SessionGetParams = { sessionID: string; directory: string }
+
+/**
+ * Minimal connection service mock: exposes a controllable client whose
+ * session.get records every call so tests can assert which directory was
+ * queried. Mirrors the shape used by kilo-provider-session-refresh.test.ts.
+ */
+function mockConnection(getImpl?: (p: SessionGetParams) => Promise<unknown>) {
+  const calls: SessionGetParams[] = []
+  const client = {
+    session: {
+      get: async (p: SessionGetParams) => {
+        calls.push(p)
+        if (getImpl) return getImpl(p)
+        return {
+          data: {
+            id: p.sessionID,
+            slug: p.sessionID,
+            projectID: "prj-test",
+            directory: p.directory,
+            title: "s",
+            version: "1",
+            time: { created: 1, updated: 1 },
+          },
+        }
+      },
+      list: async () => ({ data: [] }),
+    },
+    provider: { list: async () => ({ data: { all: [], connected: {}, default: {} } }) },
+    app: {
+      agents: async () => ({ data: [] }),
+      skills: async () => ({ data: [] }),
+    },
+    config: { get: async () => ({ data: {} }) },
+    indexing: { status: async () => ({ data: { state: "disabled" } }) },
+    kilo: {
+      notifications: async () => ({ data: [] }),
+      profile: async () => ({ data: {} }),
+    },
+  }
+  let current: typeof client | null = client
+  return {
+    calls,
+    connection: {
+      connect: async () => {
+        current = client
+      },
+      getClient: () => {
+        if (!current) throw new Error("Not connected")
+        return current
+      },
+      getClientAsync: async () => client,
+      onEventFiltered: () => () => undefined,
+      onStateChange: () => () => undefined,
+      onNotificationDismissed: () => () => undefined,
+      onLanguageChanged: () => () => undefined,
+      onProfileChanged: () => () => undefined,
+      onMigrationComplete: () => () => undefined,
+      onFavoritesChanged: () => () => undefined,
+      onModelSelectorExpandedChanged: () => () => undefined,
+      onClearPendingPrompts: () => () => undefined,
+      registerDirectoryProvider: () => () => undefined,
+      getServerInfo: () => ({ port: 12345 }),
+      getServerConfig: () => ({ baseUrl: "http://127.0.0.1:12345", password: "test" }),
+      getConnectionState: () => "connected" as const,
+      getConnectionError: () => null,
+      resolveEventSessionId: () => undefined,
+      recordMessageSessionId: () => undefined,
+      notifyNotificationDismissed: () => undefined,
+    } as unknown as ConstructorParameters<typeof KiloProvider>[1],
+  }
+}
+
+type ProviderInternals = {
+  client: unknown
+  connectionState: "connecting" | "connected" | "disconnected" | "error"
+  initConnectionPromise: Promise<void> | null
+  webview: { postMessage: (message: unknown) => Promise<unknown> } | null
+  handleSendCommand: (
+    command: string,
+    args: string,
+    messageID?: string,
+    sessionID?: string,
+    draftID?: string,
+    providerID?: string,
+    modelID?: string,
+    agent?: string,
+    variant?: string,
+    files?: unknown[],
+    context?: string,
+    contextDirectory?: string,
+  ) => Promise<void>
+}
+
+/**
+ * Short-circuit initializeConnection: setting initConnectionPromise to a
+ * resolved promise makes the guarded initializeConnection() return
+ * immediately, and connectionState="connected" satisfies the guards in
+ * getSessionInfo. This avoids the full backend init sequence (commands,
+ * indexing, git status) which the minimal mock does not implement.
+ */
+function connect(internal: ProviderInternals): void {
+  internal.connectionState = "connected"
+  internal.initConnectionPromise = Promise.resolve()
+}
+
+describe("KiloProvider route integration", () => {
+  it("resolves a unique Local session route to its exact project root", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerSession({ projectId: "a", sessionId: "ses-local" }, "/repo/a", 1)
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+    const internal = provider as unknown as ProviderInternals
+    // Pretend the backend is already connected so getSessionInfo does not
+    // run the full initialization sequence.
+    connect(internal)
+
+    await provider.getSessionInfo("ses-local")
+
+    expect(calls).toHaveLength(1)
+    expect(calls[0]!.directory).toBe("/repo/a")
+    expect(calls[0]!.sessionID).toBe("ses-local")
+  })
+
+  it("resolves a unique worktree session route to its exact worktree directory", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerWorktree({ projectId: "a", worktreeId: "wt" }, "/repo/a/.kilo/wt", 1)
+    routes.registerSession({ projectId: "a", sessionId: "ses-wt" }, "/repo/a/.kilo/wt", 1)
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+
+    await provider.getSessionInfo("ses-wt")
+
+    expect(calls).toHaveLength(1)
+    expect(calls[0]!.directory).toBe("/repo/a/.kilo/wt")
+  })
+
+  it("does NOT query the active root for an ambiguous raw session id", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerProject("b", "/repo/b", 1)
+    // Same raw session id registered in two projects — ambiguous.
+    routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+    routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+
+    const result = await provider.getSessionInfo("same")
+
+    // Must not hit the backend at all — no active-root fallback.
+    expect(calls).toHaveLength(0)
+    expect(result).toBeUndefined()
+  })
+
+  it("does NOT silently use a stale sessionDirectories entry for an ambiguous id", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerProject("b", "/repo/b", 1)
+    routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+    routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+    // Simulate the legacy single-entry map holding only one project's dir.
+    provider.setSessionDirectory("same", "/repo/a")
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+
+    await provider.getSessionInfo("same")
+
+    // The route service blocks the query despite sessionDirectories having
+    // an entry, because the id is ambiguous and no qualifier disambiguates.
+    expect(calls).toHaveLength(0)
+  })
+
+  it("resolves an ambiguous id through a project qualifier to the exact dir", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerProject("b", "/repo/b", 1)
+    routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+    routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+      projectQualifier: () => ({ projectId: "b" }),
+    })
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+
+    await provider.getSessionInfo("same")
+
+    expect(calls).toHaveLength(1)
+    expect(calls[0]!.directory).toBe("/repo/b")
+  })
+
+  it("falls back to sessionDirectories when no route service is configured (non-Agent-Manager)", async () => {
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      rootDirectory: () => "/active/root",
+    })
+    provider.setSessionDirectory("ses-plain", "/some/dir")
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+
+    await provider.getSessionInfo("ses-plain")
+
+    expect(calls).toHaveLength(1)
+    expect(calls[0]!.directory).toBe("/some/dir")
+  })
+
+  it("exposes route registration helpers that forward to the route service", () => {
+    const routes = new ProjectRouteService()
+    const { connection } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+
+    provider.registerProjectRoute({ projectId: "a" }, "/repo/a", 1)
+    provider.registerWorktreeRoute({ projectId: "a", worktreeId: "wt" }, "/repo/a/.kilo/wt", 1)
+    provider.registerSessionRoute({ projectId: "a", sessionId: "s" }, "/repo/a/.kilo/wt", 1)
+
+    expect(routes.sessionDirectory({ projectId: "a", sessionId: "s" })).toBe("/repo/a/.kilo/wt")
+    expect(routes.worktreeDirectory({ projectId: "a", worktreeId: "wt" })).toBe("/repo/a/.kilo/wt")
+    expect(provider.isSessionRouteAmbiguous("s")).toBe(false)
+    expect(provider.routeSessionDirectoryFor({ projectId: "a", sessionId: "s" })).toBe("/repo/a/.kilo/wt")
+
+    provider.unregisterSessionRoute({ projectId: "a", sessionId: "s" })
+    expect(provider.routeSessionDirectoryFor({ projectId: "a", sessionId: "s" })).toBeUndefined()
+  })
+
+  it("refuses to run a share command on an ambiguous raw session id (no active-root fallback)", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerProject("b", "/repo/b", 1)
+    routes.registerSession({ projectId: "a", sessionId: "same" }, "/repo/a", 1)
+    routes.registerSession({ projectId: "b", sessionId: "same" }, "/repo/b", 1)
+    const { connection, calls } = mockConnection()
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+    const posted: unknown[] = []
+    internal.webview = { postMessage: async (m) => posted.push(m) }
+
+    // share/unshare are commands routed through handleSendCommand → resolveSession.
+    await internal.handleSendCommand("share", "", "mid", "same")
+
+    // No backend session.command call should fire — the ambiguous id is
+    // refused before any directory is resolved.
+    expect(calls).toHaveLength(0)
+    const failed = posted.find(
+      (m) => typeof m === "object" && m !== null && (m as { type?: string }).type === "sendMessageFailed",
+    )
+    expect(failed, "expected a sendMessageFailed message for the ambiguous share command").toBeTruthy()
+  })
+
+  it("runs a share command on a unique session route against its exact directory", async () => {
+    const routes = new ProjectRouteService()
+    routes.registerProject("a", "/repo/a", 1)
+    routes.registerWorktree({ projectId: "a", worktreeId: "wt" }, "/repo/a/.kilo/wt", 1)
+    routes.registerSession({ projectId: "a", sessionId: "ses-wt" }, "/repo/a/.kilo/wt", 1)
+    const { connection, calls } = mockConnection()
+    // Extend the mock client with session.command to record the directory.
+    const commandCalls: { sessionID: string; directory: string; command: string }[] = []
+    ;(connection.getClient() as { session: { command: unknown } }).session.command = async (p: {
+      sessionID: string
+      directory: string
+      command: string
+    }) => {
+      commandCalls.push(p)
+      return {
+        data: {
+          id: p.sessionID,
+          slug: p.sessionID,
+          directory: p.directory,
+          title: "s",
+          version: "1",
+          time: { created: 1, updated: 1 },
+        },
+      }
+    }
+    const provider = new KiloProvider({} as never, connection, undefined, {
+      routeService: routes,
+      rootDirectory: () => "/active/root",
+    })
+    const internal = provider as unknown as ProviderInternals
+    connect(internal)
+    internal.webview = { postMessage: async () => undefined }
+
+    await internal.handleSendCommand("share", "", "mid", "ses-wt")
+
+    // session.get is called by refreshSessionDetails; the command itself
+    // must target the exact worktree directory, never /active/root.
+    expect(commandCalls).toHaveLength(1)
+    expect(commandCalls[0]!.directory).toBe("/repo/a/.kilo/wt")
+    expect(commandCalls[0]!.command).toBe("share")
+    // No fallback to the active root anywhere.
+    expect(calls.every((c) => c.directory !== "/active/root")).toBe(true)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/language-utils.test.ts b/packages/kilo-vscode/tests/unit/language-utils.test.ts
index cc1a8c286b..b4dc8e0aee 100644
--- a/packages/kilo-vscode/tests/unit/language-utils.test.ts
+++ b/packages/kilo-vscode/tests/unit/language-utils.test.ts
@@ -33,6 +33,11 @@ describe("normalizeLocale", () => {
     expect(normalizeLocale("ko-KR")).toBe("ko")
   })
 
+  it("returns 'fa' for Persian", () => {
+    expect(normalizeLocale("fa")).toBe("fa")
+    expect(normalizeLocale("fa-IR")).toBe("fa")
+  })
+
   it("returns 'no' for Norwegian Bokmål", () => {
     expect(normalizeLocale("nb")).toBe("no")
     expect(normalizeLocale("nb-NO")).toBe("no")
diff --git a/packages/kilo-vscode/tests/unit/navigate.test.ts b/packages/kilo-vscode/tests/unit/navigate.test.ts
index 5e8ae6f423..be6e5d816e 100644
--- a/packages/kilo-vscode/tests/unit/navigate.test.ts
+++ b/packages/kilo-vscode/tests/unit/navigate.test.ts
@@ -1,4 +1,5 @@
-import { describe, it, expect } from "bun:test"
+import { describe, it, expect, beforeEach, afterEach } from "bun:test"
+import { createRoot } from "solid-js"
 import {
   resolveNavigation,
   validateLocalSession,
@@ -6,8 +7,21 @@ import {
   canOpenRootSession,
   filterUnassignedSessions,
   remoteSessions,
+  buildProjectNavOrder,
+  resolveProjectNav,
+  localNavId,
+  worktreeNavId,
+  sessionNavId,
+  type ProjectNavInput,
   LOCAL,
 } from "../../webview-ui/agent-manager/navigate"
+import { createProjectNav, type NavTarget } from "../../webview-ui/agent-manager/project-nav"
+import type { SidebarItem } from "../../webview-ui/agent-manager/section-helpers"
+import type {
+  AgentManagerStateMessage,
+  AgentProjectSnapshot,
+  ProjectSessionInfo,
+} from "../../webview-ui/src/types/messages"
 
 const ids = ["a", "b", "c", "d"]
 
@@ -322,3 +336,391 @@ describe("remoteSessions", () => {
     expect(remoteSessions([], [], pending)).toEqual([])
   })
 })
+
+describe("buildProjectNavOrder", () => {
+  const project = (
+    p: Omit<ProjectNavInput, "sessionsCollapsed"> & { sessionsCollapsed?: boolean },
+  ): ProjectNavInput => ({
+    ...p,
+    sessionsCollapsed: p.sessionsCollapsed ?? false,
+  })
+
+  it("builds A Local -> A worktree -> B Local -> B worktree -> B session across expanded projects", () => {
+    const order = buildProjectNavOrder([
+      project({ id: "A", expanded: true, worktrees: [{ id: "aw1" }], sections: [], unassigned: [] }),
+      project({ id: "B", expanded: true, worktrees: [{ id: "bw1" }], sections: [], unassigned: [{ id: "bs1" }] }),
+    ])
+
+    expect(order.map((e) => e.id)).toEqual([
+      localNavId("A"),
+      worktreeNavId("A", "aw1"),
+      localNavId("B"),
+      worktreeNavId("B", "bw1"),
+      sessionNavId("B", "bs1"),
+    ])
+    expect(order.map((e) => e.target)).toEqual([
+      { projectId: "A", kind: "local" },
+      { projectId: "A", kind: "worktree", worktreeId: "aw1" },
+      { projectId: "B", kind: "local" },
+      { projectId: "B", kind: "worktree", worktreeId: "bw1" },
+      { projectId: "B", kind: "session", sessionId: "bs1" },
+    ])
+  })
+
+  it("uses project-qualified composite ids, never raw worktree/session ids", () => {
+    const order = buildProjectNavOrder([
+      project({ id: "A", expanded: true, worktrees: [{ id: "aw1" }], sections: [], unassigned: [{ id: "as1" }] }),
+    ])
+    const ids = order.map((e) => e.id)
+    expect(ids).not.toContain("aw1")
+    expect(ids).not.toContain("as1")
+    expect(ids).toContain("A:local")
+    expect(ids).toContain("A:wt:aw1")
+    expect(ids).toContain("A:sess:as1")
+  })
+
+  it("excludes collapsed projects entirely", () => {
+    const order = buildProjectNavOrder([
+      project({ id: "A", expanded: true, worktrees: [{ id: "aw1" }], sections: [], unassigned: [] }),
+      project({ id: "C", expanded: false, worktrees: [{ id: "cw1" }], sections: [], unassigned: [{ id: "cs1" }] }),
+    ])
+    expect(order.map((e) => e.id)).toEqual([localNavId("A"), worktreeNavId("A", "aw1")])
+    expect(order.some((e) => e.target.kind === "worktree" && e.target.worktreeId === "cw1")).toBe(false)
+  })
+
+  it("excludes worktrees inside collapsed sections but keeps ungrouped ones", () => {
+    const order = buildProjectNavOrder([
+      project({
+        id: "A",
+        expanded: true,
+        worktrees: [{ id: "aw1", sectionId: "s1" }, { id: "aw2" }],
+        sections: [{ id: "s1", collapsed: true }],
+        unassigned: [],
+      }),
+    ])
+    expect(order.map((e) => e.id)).toEqual([localNavId("A"), worktreeNavId("A", "aw2")])
+  })
+
+  it("renders section members before ungrouped worktrees (matching the project body)", () => {
+    const order = buildProjectNavOrder([
+      project({
+        id: "A",
+        expanded: true,
+        worktrees: [{ id: "aw1", sectionId: "s1" }, { id: "aw2" }],
+        sections: [{ id: "s1", collapsed: false }],
+        unassigned: [],
+      }),
+    ])
+    expect(order.map((e) => e.id)).toEqual([localNavId("A"), worktreeNavId("A", "aw1"), worktreeNavId("A", "aw2")])
+  })
+
+  it("excludes unassigned sessions when the sessions section is collapsed", () => {
+    const order = buildProjectNavOrder([
+      project({
+        id: "A",
+        expanded: true,
+        worktrees: [{ id: "aw1" }],
+        sections: [],
+        sessionsCollapsed: true,
+        unassigned: [{ id: "as1" }, { id: "as2" }],
+      }),
+    ])
+    expect(order.map((e) => e.id)).toEqual([localNavId("A"), worktreeNavId("A", "aw1")])
+  })
+
+  it("returns an empty order when every project is collapsed", () => {
+    const order = buildProjectNavOrder([
+      project({ id: "A", expanded: false, worktrees: [{ id: "aw1" }], sections: [], unassigned: [] }),
+    ])
+    expect(order).toEqual([])
+  })
+})
+
+describe("resolveProjectNav", () => {
+  // A Local -> A worktree -> B Local -> B worktree -> B session
+  const inputs: ProjectNavInput[] = [
+    { id: "A", expanded: true, worktrees: [{ id: "aw1" }], sections: [], sessionsCollapsed: false, unassigned: [] },
+    {
+      id: "B",
+      expanded: true,
+      worktrees: [{ id: "bw1" }],
+      sections: [],
+      sessionsCollapsed: false,
+      unassigned: [{ id: "bs1" }],
+    },
+  ]
+  const order = buildProjectNavOrder(inputs)
+  // Collapsed project C must not appear in the order
+  const withCollapsed = buildProjectNavOrder([
+    ...inputs,
+    { id: "C", expanded: false, worktrees: [{ id: "cw1" }], sections: [], sessionsCollapsed: false, unassigned: [] },
+  ])
+
+  it("walks forward A Local -> A worktree -> B Local -> B worktree -> B session", () => {
+    let current: string | undefined = undefined
+    const trail: string[] = []
+    for (let i = 0; i < 6; i++) {
+      const entry = resolveProjectNav("down", current, order)
+      if (!entry) break
+      current = entry.id
+      trail.push(entry.id)
+    }
+    expect(trail).toEqual([
+      localNavId("A"),
+      worktreeNavId("A", "aw1"),
+      localNavId("B"),
+      worktreeNavId("B", "bw1"),
+      sessionNavId("B", "bs1"),
+    ])
+  })
+
+  it("walks in reverse B session -> B worktree -> B Local -> A worktree -> A Local", () => {
+    let current: string | undefined = sessionNavId("B", "bs1")
+    const trail: string[] = [current]
+    for (let i = 0; i < 6; i++) {
+      const entry = resolveProjectNav("up", current, order)
+      if (!entry) break
+      current = entry.id
+      trail.push(current)
+    }
+    expect(trail).toEqual([
+      sessionNavId("B", "bs1"),
+      worktreeNavId("B", "bw1"),
+      localNavId("B"),
+      worktreeNavId("A", "aw1"),
+      localNavId("A"),
+    ])
+  })
+
+  it("returns undefined at the top boundary (up from first)", () => {
+    expect(resolveProjectNav("up", localNavId("A"), order)).toBeUndefined()
+  })
+
+  it("returns undefined at the bottom boundary (down from last)", () => {
+    expect(resolveProjectNav("down", sessionNavId("B", "bs1"), order)).toBeUndefined()
+  })
+
+  it("does not wrap around", () => {
+    expect(resolveProjectNav("up", localNavId("A"), order)).toBeUndefined()
+    expect(resolveProjectNav("down", sessionNavId("B", "bs1"), order)).toBeUndefined()
+  })
+
+  it("treats an unknown current as before-first (down -> first, up -> undefined)", () => {
+    expect(resolveProjectNav("down", "unknown", order)?.id).toBe(localNavId("A"))
+    expect(resolveProjectNav("up", "unknown", order)).toBeUndefined()
+  })
+
+  it("treats undefined current as before-first", () => {
+    expect(resolveProjectNav("down", undefined, order)?.id).toBe(localNavId("A"))
+    expect(resolveProjectNav("up", undefined, order)).toBeUndefined()
+  })
+
+  it("returns undefined for an empty order", () => {
+    expect(resolveProjectNav("down", localNavId("A"), [])).toBeUndefined()
+    expect(resolveProjectNav("up", undefined, [])).toBeUndefined()
+  })
+
+  it("collapsed project C is excluded from the order", () => {
+    expect(withCollapsed.length).toBe(order.length)
+    expect(withCollapsed.some((e) => e.id === worktreeNavId("C", "cw1"))).toBe(false)
+    // Forward walk still ends at B session, never reaching C
+    let current: string | undefined = undefined
+    let last: string | undefined
+    for (let i = 0; i < 10; i++) {
+      const entry = resolveProjectNav("down", current, withCollapsed)
+      if (!entry) break
+      current = entry.id
+      last = entry.id
+    }
+    expect(last).toBe(sessionNavId("B", "bs1"))
+  })
+})
+
+describe("createProjectNav", () => {
+  // activate() schedules a DOM scroll via requestAnimationFrame; bun:test has
+  // no DOM/rAF, so stub rAF to a no-op. The atomic `post` callback fires before
+  // rAF, so targets are still observable. (solid-js resolves to its server
+  // build under bun, where createMemo is one-shot, so each helper below builds
+  // a fresh controller per call — mirroring one activation per keypress.)
+  let raf: typeof globalThis.requestAnimationFrame | undefined
+  beforeEach(() => {
+    raf = globalThis.requestAnimationFrame
+    globalThis.requestAnimationFrame = (() => 0) as never
+  })
+  afterEach(() => {
+    globalThis.requestAnimationFrame = raf
+  })
+
+  const project = (id: string, expanded: boolean): AgentProjectSnapshot =>
+    ({
+      id,
+      root: `/${id}`,
+      label: id,
+      pinned: false,
+      active: id === "A",
+      expanded,
+      initialized: true,
+      trusted: true,
+      missing: false,
+    }) as AgentProjectSnapshot
+
+  const state = (
+    worktrees: { id: string; sectionId?: string }[],
+    sessions: { id: string; worktreeId: string | null }[],
+    sections: { id: string; collapsed: boolean }[] = [],
+    sessionsCollapsed = false,
+  ): AgentManagerStateMessage =>
+    ({
+      type: "agentManager.state",
+      worktrees: worktrees as never,
+      sessions: sessions as never,
+      sections,
+      sessionsCollapsed,
+    }) as AgentManagerStateMessage
+
+  const session = (id: string): ProjectSessionInfo => ({
+    id,
+    title: id,
+    createdAt: "",
+    updatedAt: "",
+    worktreeId: null,
+  })
+
+  // A (expanded): worktree aw1. B (expanded): worktree bw1 + unassigned bs1.
+  // C (collapsed): worktree cw1 — must never be reached.
+  const projects = () => [project("A", true), project("B", true), project("C", false)]
+  const states = () => ({
+    A: state([{ id: "aw1" }], []),
+    B: state([{ id: "bw1" }], [{ id: "bs1", worktreeId: null }]),
+    C: state([{ id: "cw1" }], []),
+  })
+  const sessions = () => ({ A: [], B: [session("bs1")], C: [] })
+
+  const run = (
+    fn: (nav: ReturnType<typeof createProjectNav>) => void,
+    selection: typeof LOCAL | string | null,
+    activeProjectId: string | undefined,
+    currentSessionID: string | undefined,
+    post: (t: NavTarget) => void = () => {},
+    focus: (item: SidebarItem) => void = () => {},
+    multiProject = true,
+    sidebarOrder: () => SidebarItem[] = () => [],
+  ) =>
+    createRoot((dispose) => {
+      fn(
+        createProjectNav(
+          {
+            multiProject: () => multiProject,
+            sidebarOrder,
+            focus,
+            projects,
+            states,
+            sessions,
+            activeProjectId: () => activeProjectId,
+            selection: () => selection,
+            currentSessionID: () => currentSessionID,
+          },
+          post,
+          () => {},
+        ),
+      )
+      dispose()
+    })
+
+  const stepOnce = (
+    direction: "up" | "down",
+    selection: typeof LOCAL | string | null,
+    activeProjectId: string | undefined,
+    currentSessionID: string | undefined,
+  ): NavTarget | undefined => {
+    let posted: NavTarget | undefined
+    run(
+      (nav) => nav.step(direction),
+      selection,
+      activeProjectId,
+      currentSessionID,
+      (t) => (posted = t),
+    )
+    return posted
+  }
+
+  const jumpOnce = (index: number): NavTarget | undefined => {
+    let posted: NavTarget | undefined
+    run(
+      (nav) => nav.jump(index),
+      LOCAL,
+      "A",
+      undefined,
+      (t) => (posted = t),
+    )
+    return posted
+  }
+
+  it("multi-project step traverses A Local -> A worktree -> B Local -> B worktree -> B session", () => {
+    expect(stepOnce("down", LOCAL, "A", undefined)).toEqual({ projectId: "A", kind: "worktree", worktreeId: "aw1" })
+    expect(stepOnce("down", "aw1", "A", undefined)).toEqual({ projectId: "B", kind: "local" })
+    expect(stepOnce("down", LOCAL, "B", undefined)).toEqual({ projectId: "B", kind: "worktree", worktreeId: "bw1" })
+    expect(stepOnce("down", "bw1", "B", undefined)).toEqual({ projectId: "B", kind: "session", sessionId: "bs1" })
+    expect(stepOnce("down", null, "B", "bs1")).toBeUndefined()
+  })
+
+  it("multi-project step reverses B session -> B worktree -> B Local -> A worktree -> A Local", () => {
+    expect(stepOnce("up", null, "B", "bs1")).toEqual({ projectId: "B", kind: "worktree", worktreeId: "bw1" })
+    expect(stepOnce("up", "bw1", "B", undefined)).toEqual({ projectId: "B", kind: "local" })
+    expect(stepOnce("up", LOCAL, "B", undefined)).toEqual({ projectId: "A", kind: "worktree", worktreeId: "aw1" })
+    expect(stepOnce("up", "aw1", "A", undefined)).toEqual({ projectId: "A", kind: "local" })
+    expect(stepOnce("up", LOCAL, "A", undefined)).toBeUndefined()
+  })
+
+  it("collapsed project C is never reached via jump", () => {
+    // Global order: A:local(0), A:aw1(1), B:local(2), B:bw1(3), B:bs1(4).
+    expect(jumpOnce(0)).toEqual({ projectId: "A", kind: "local" })
+    expect(jumpOnce(1)).toEqual({ projectId: "A", kind: "worktree", worktreeId: "aw1" })
+    expect(jumpOnce(2)).toEqual({ projectId: "B", kind: "local" })
+    expect(jumpOnce(3)).toEqual({ projectId: "B", kind: "worktree", worktreeId: "bw1" })
+    expect(jumpOnce(4)).toEqual({ projectId: "B", kind: "session", sessionId: "bs1" })
+    // Past the end — and C's collapsed worktree is never reachable by any index.
+    expect(jumpOnce(5)).toBeUndefined()
+    expect(jumpOnce(99)).toBeUndefined()
+  })
+
+  it("multi-project jump targets the global order by index (⌘3 = B Local)", () => {
+    expect(jumpOnce(2)).toEqual({ projectId: "B", kind: "local" })
+  })
+
+  it("single-project mode keeps the legacy in-process traversal and never posts activateSelection", () => {
+    const order: SidebarItem[] = [
+      { type: "local", id: "local" },
+      { type: "wt", id: "w1" },
+      { type: "session", id: "s1" },
+    ]
+    const focused: SidebarItem[] = []
+    const posted: NavTarget[] = []
+    const focus = (item: SidebarItem) => focused.push(item)
+    const post = (t: NavTarget) => posted.push(t)
+    run(
+      (nav) => nav.step("down"),
+      LOCAL,
+      "A",
+      undefined,
+      post,
+      focus,
+      false,
+      () => order,
+    )
+    expect(focused.pop()).toEqual({ type: "wt", id: "w1" })
+    run(
+      (nav) => nav.jump(2),
+      "w1",
+      "A",
+      undefined,
+      post,
+      focus,
+      false,
+      () => order,
+    )
+    expect(focused.pop()).toEqual({ type: "session", id: "s1" })
+    // Legacy path never dispatches the multi-project activation message.
+    expect(posted).toEqual([])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/permission-recovery.test.ts b/packages/kilo-vscode/tests/unit/permission-recovery.test.ts
index df7a44d25d..406076ec60 100644
--- a/packages/kilo-vscode/tests/unit/permission-recovery.test.ts
+++ b/packages/kilo-vscode/tests/unit/permission-recovery.test.ts
@@ -141,7 +141,9 @@ describe("handlePermissionResponse", () => {
 
     await handlePermissionResponse(fake, "p1", "s1", "once", [], [])
 
-    expect(replies).toEqual([{ requestID: "p1", reply: "once", directory: "/workspace/.kilo/worktrees/feature" }])
+    expect(replies).toEqual([
+      { requestID: "p1", reply: "once", directory: "/workspace/.kilo/worktrees/feature", interactive: true },
+    ])
   })
 
   it("saves selected rules and replies in the recorded SSE directory", async () => {
@@ -158,7 +160,9 @@ describe("handlePermissionResponse", () => {
         deniedAlways: ["rm *"],
       },
     ])
-    expect(replies).toEqual([{ requestID: "p1", reply: "reject", directory: "/workspace/.kilo/worktrees/feature" }])
+    expect(replies).toEqual([
+      { requestID: "p1", reply: "reject", directory: "/workspace/.kilo/worktrees/feature", interactive: true },
+    ])
   })
 
   it("treats an SDK-wrapped 404 while saving rules as stale", async () => {
@@ -192,7 +196,9 @@ describe("handlePermissionResponse", () => {
 
     await handlePermissionResponse(fake, "p1", "s1", "once", [], [])
 
-    expect(replies).toEqual([{ requestID: "p1", reply: "once", directory: "/workspace/.kilo/worktrees/feature" }])
+    expect(replies).toEqual([
+      { requestID: "p1", reply: "once", directory: "/workspace/.kilo/worktrees/feature", interactive: true },
+    ])
     expect(permDirs.has("p1")).toBe(false)
     expect(messages).toEqual([{ type: "permissionError", permissionID: "p1", stale: true }])
   })
diff --git a/packages/kilo-vscode/tests/unit/prompt-rail.test.ts b/packages/kilo-vscode/tests/unit/prompt-rail.test.ts
new file mode 100644
index 0000000000..18c800e1bb
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/prompt-rail.test.ts
@@ -0,0 +1,239 @@
+import { describe, expect, it } from "bun:test"
+import { messageTurns } from "../../webview-ui/src/context/session-queue"
+import { transcriptRows } from "../../webview-ui/src/context/transcript-rows"
+import type { Message, Part, TextPart } from "../../webview-ui/src/types/messages"
+import {
+  capacity,
+  historyAction,
+  previewText,
+  promptItems,
+  railEntries,
+} from "../../webview-ui/src/components/chat/prompt-rail"
+
+const base = {
+  sessionID: "session",
+  createdAt: "2026-01-01T00:00:00.000Z",
+  time: { created: 1 },
+}
+
+const user = (id: string, opts: Partial<Message> = {}): Message => ({ ...base, id, role: "user", ...opts })
+const assistant = (id: string, parentID: string, opts: Partial<Message> = {}): Message => ({
+  ...base,
+  id,
+  parentID,
+  role: "assistant",
+  ...opts,
+})
+const text = (id: string, messageID: string, value: string, opts: Partial<TextPart> = {}): Part => ({
+  id,
+  messageID,
+  type: "text",
+  text: value,
+  ...opts,
+})
+const tool = (id: string, messageID: string, title: string): Part => ({
+  id,
+  messageID,
+  type: "tool",
+  tool: "bash",
+  state: { status: "completed", input: {}, output: "", title },
+})
+const lookup = (values: Record<string, Part[]>) => (id: string) => values[id] ?? []
+
+describe("previewText", () => {
+  it("collapses whitespace and keeps plain text", () => {
+    expect(previewText("  hello\n\nworld  ")).toBe("hello world")
+  })
+
+  it("drops fenced code blocks and inline code", () => {
+    expect(previewText("before `const x = 1` after\n```\nconst y = 2\n```\nend")).toBe("before after end")
+  })
+
+  it("keeps link labels but drops URLs and images", () => {
+    expect(previewText("see [the docs](https://example.com) and ![shot](img.png) now")).toBe("see the docs and now")
+  })
+
+  it("keeps bracket text inside inline code literal", () => {
+    expect(previewText("echo `[label](url)` verbatim")).toBe("echo verbatim")
+  })
+
+  it("strips heading, list, and quote markers", () => {
+    expect(previewText("# Title\n- one\n> two\nthree")).toBe("Title one two three")
+  })
+})
+
+describe("promptItems", () => {
+  it("emits one item per non-partial user turn with prompt and answer", () => {
+    const u1 = user("u1")
+    const a1 = assistant("a1", "u1")
+    const u2 = user("u2")
+    const a2 = assistant("a2", "u2")
+    const parts = {
+      u1: [text("up1", "u1", "add authentication")],
+      a1: [text("ap1", "a1", "Done, auth is wired up.")],
+      u2: [text("up2", "u2", "now fix the bug")],
+      a2: [text("ap2", "a2", "Fixed it.")],
+    }
+    const rows = transcriptRows(messageTurns([u1, a1, u2, a2]), lookup(parts))
+
+    const items = promptItems(rows)
+
+    expect(items).toEqual([
+      { key: "u1:user", turn: "u1", queued: false, prompt: "add authentication", answer: "Done, auth is wired up." },
+      { key: "u2:user", turn: "u2", queued: false, prompt: "now fix the bug", answer: "Fixed it." },
+    ])
+  })
+
+  it("keeps assistant chunks of one turn joined", () => {
+    const u1 = user("u1")
+    const a1 = assistant("a1", "u1")
+    const parts = {
+      u1: [text("up1", "u1", "go")],
+      a1: [text("ap1", "a1", "First."), text("ap2", "a1", "Second.")],
+    }
+    const rows = transcriptRows(messageTurns([u1, a1]), lookup(parts))
+
+    expect(promptItems(rows)[0]?.answer).toBe("First. Second.")
+  })
+
+  it("skips synthetic parts and leaves an empty answer for tool-only turns", () => {
+    const u1 = user("u1")
+    const a1 = assistant("a1", "u1")
+    const parts = {
+      u1: [text("up1", "u1", "run it"), text("up2", "u1", "internal", { synthetic: true })],
+      a1: [tool("at1", "a1", "Run tests"), text("at2", "a1", "hidden", { synthetic: true })],
+    }
+    const rows = transcriptRows(messageTurns([u1, a1]), lookup(parts))
+
+    expect(promptItems(rows)[0]).toMatchObject({ prompt: "run it", answer: "" })
+  })
+
+  it("marks queued rows", () => {
+    const u1 = user("u1")
+    const u2 = user("u2")
+    const rows = transcriptRows(messageTurns([u1, u2]), lookup({}), { queued: new Set(["u2"]) })
+
+    expect(promptItems(rows).map((item) => item.queued)).toEqual([false, true])
+  })
+
+  it("truncates long prompts and answers", () => {
+    const u1 = user("u1")
+    const a1 = assistant("a1", "u1")
+    const parts = {
+      u1: [text("up1", "u1", "x".repeat(400))],
+      a1: [text("ap1", "a1", "y".repeat(400))],
+    }
+    const rows = transcriptRows(messageTurns([u1, a1]), lookup(parts))
+
+    const [item] = promptItems(rows)
+    expect(item!.prompt.length).toBe(160)
+    expect(item!.prompt.endsWith("…")).toBe(true)
+    expect(item!.answer.length).toBe(220)
+    expect(item!.answer.endsWith("…")).toBe(true)
+  })
+
+  it("omits partial turns (assistant-only leads)", () => {
+    const a1 = assistant("a1", "u1")
+    const rows = transcriptRows(messageTurns([a1]), lookup({ a1: [text("p1", "a1", "hello")] }))
+
+    expect(promptItems(rows)).toEqual([])
+  })
+
+  it("promotes the answer when the prompt carries no text (image-only message)", () => {
+    const u1 = user("u1")
+    const a1 = assistant("a1", "u1")
+    const parts = {
+      u1: [{ id: "up1", messageID: "u1", type: "file", mime: "image/png", url: "data:," } as Part],
+      a1: [text("ap1", "a1", "That screenshot shows the rail overlapping the gutter.")],
+    }
+    const rows = transcriptRows(messageTurns([u1, a1]), lookup(parts))
+
+    expect(promptItems(rows)[0]).toMatchObject({
+      prompt: "That screenshot shows the rail overlapping the gutter.",
+      answer: "",
+    })
+  })
+
+  it("leaves both empty when neither prompt nor answer has text", () => {
+    const u1 = user("u1")
+    const rows = transcriptRows(messageTurns([u1]), lookup({}))
+
+    expect(promptItems(rows)[0]).toMatchObject({ prompt: "", answer: "" })
+  })
+})
+
+describe("capacity", () => {
+  it("counts how many ticks fit the transcript height", () => {
+    expect(capacity(24 + 7 * 5)).toBe(5)
+    expect(capacity(31)).toBe(1)
+  })
+
+  it("fits far more ticks than the navigator lists rows", () => {
+    // A tick is a hairline, so a sidebar-height transcript holds a whole
+    // session's prompts rather than the handful of card rows that fit.
+    expect(capacity(724)).toBe(100)
+  })
+
+  it("returns nothing usable for unmeasured or tiny transcripts", () => {
+    expect(capacity(0)).toBeLessThan(1)
+    expect(capacity(30)).toBeLessThan(1)
+  })
+})
+
+describe("historyAction", () => {
+  it("loads the next page only after the previous page made progress", () => {
+    expect(historyAction(80, 160, true)).toBe("load")
+  })
+
+  it("jumps after the final page", () => {
+    expect(historyAction(160, 200, false)).toBe("jump")
+  })
+
+  it("stops instead of retrying a page that made no progress", () => {
+    expect(historyAction(160, 160, true)).toBe("stop")
+  })
+})
+
+describe("railEntries", () => {
+  const items = Array.from({ length: 5 }, (_, i) => ({
+    key: `k${i}`,
+    turn: `t${i}`,
+    queued: false,
+    prompt: `p${i}`,
+    answer: `a${i}`,
+  }))
+
+  it("passes through when everything fits", () => {
+    expect(railEntries(items, 5)).toEqual(items.map((item, index) => ({ type: "prompt", item, index })))
+    expect(railEntries(items, 10)).toEqual(items.map((item, index) => ({ type: "prompt", item, index })))
+  })
+
+  it("keeps the first and latest prompts at minimal capacity", () => {
+    expect(railEntries(items, 2)).toEqual([
+      { type: "prompt", item: items[0], index: 0 },
+      { type: "prompt", item: items[4], index: 4 },
+    ])
+  })
+
+  it("summarizes hidden loaded prompts between the first and recent prompts", () => {
+    expect(railEntries(items, 4)).toEqual([
+      { type: "prompt", item: items[0], index: 0 },
+      { type: "overflow", count: 2, index: 1 },
+      { type: "prompt", item: items[3], index: 3 },
+      { type: "prompt", item: items[4], index: 4 },
+    ])
+  })
+
+  it("reserves the first entry for unloaded history", () => {
+    expect(railEntries(items, 4, true)).toEqual([
+      { type: "history" },
+      { type: "overflow", count: 3, index: 0 },
+      { type: "prompt", item: items[3], index: 3 },
+      { type: "prompt", item: items[4], index: 4 },
+    ])
+  })
+
+  it("returns nothing at zero capacity", () => {
+    expect(railEntries(items, 0)).toEqual([])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/run-controller.test.ts b/packages/kilo-vscode/tests/unit/run-controller.test.ts
new file mode 100644
index 0000000000..66d4577c70
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/run-controller.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, it } from "bun:test"
+import { mkdtempSync, rmSync } from "node:fs"
+import { tmpdir } from "node:os"
+import * as path from "node:path"
+import { RunController, type RunTaskConfig } from "../../src/agent-manager/run/controller"
+import type { RunStatus } from "../../src/agent-manager/run/manager"
+import type { RunTerminalDestination } from "../../src/agent-manager/run/destination"
+
+const destination: RunTerminalDestination = "vscode"
+
+function setup() {
+  const root = mkdtempSync(path.join(tmpdir(), "kilo-run-controller-"))
+  const configs: RunTaskConfig[] = []
+  const statuses: RunStatus[] = []
+  const controller = new RunController({
+    root: () => root,
+    state: () => undefined,
+    open: () => Promise.resolve(),
+    start: (config, done) => {
+      configs.push(config)
+      return Promise.resolve({ stop: () => done({ stopped: true }) })
+    },
+    post: (status) => statuses.push(status),
+    error: () => undefined,
+    log: () => undefined,
+  })
+  return { root, configs, statuses, controller, cleanup: () => rmSync(root, { recursive: true, force: true }) }
+}
+
+describe("RunController local key scoping", () => {
+  it("resolves a project-qualified local key to the repo root", async () => {
+    const { root, configs, controller, cleanup } = setup()
+    try {
+      await controller.configure()
+      await controller.run("prj-a:local", destination)
+
+      expect(configs).toHaveLength(1)
+      expect(configs[0]!.worktreeId).toBe("prj-a:local")
+      expect(configs[0]!.cwd).toBe(root)
+      expect(configs[0]!.branch).toBe("local")
+    } finally {
+      cleanup()
+    }
+  })
+
+  it("keeps two projects' local runs as independent entries", async () => {
+    const { statuses, controller, cleanup } = setup()
+    try {
+      await controller.configure()
+      await controller.run("prj-a:local", destination)
+      await controller.run("prj-b:local", destination)
+
+      // Starting B must not stop A: both entries report running.
+      const all = controller.state().runStatuses
+      expect(all.find((s) => s.worktreeId === "prj-a:local")?.state).toBe("running")
+      expect(all.find((s) => s.worktreeId === "prj-b:local")?.state).toBe("running")
+
+      // Stopping A leaves B untouched.
+      controller.stop("prj-a:local")
+      await new Promise((resolve) => setTimeout(resolve, 10))
+      const after = controller.state().runStatuses
+      expect(after.find((s) => s.worktreeId === "prj-a:local")?.state).not.toBe("running")
+      expect(after.find((s) => s.worktreeId === "prj-b:local")?.state).toBe("running")
+      expect(statuses.some((s) => s.worktreeId === "prj-a:local" && s.state === "stopping")).toBe(true)
+    } finally {
+      cleanup()
+    }
+  })
+
+  it("still treats the legacy unqualified local key as local", async () => {
+    const { root, configs, controller, cleanup } = setup()
+    try {
+      await controller.configure()
+      await controller.run("local", destination)
+
+      expect(configs[0]!.worktreeId).toBe("local")
+      expect(configs[0]!.cwd).toBe(root)
+      expect(configs[0]!.branch).toBe("local")
+    } finally {
+      cleanup()
+    }
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/run-message.test.ts b/packages/kilo-vscode/tests/unit/run-message.test.ts
new file mode 100644
index 0000000000..2ff281f9ae
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/run-message.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it, mock } from "bun:test"
+import type { RunController } from "../../src/agent-manager/run/controller"
+import { handleRunMessage } from "../../src/agent-manager/run/message"
+import type { AgentManagerInMessage } from "../../src/agent-manager/types"
+
+function controller() {
+  const run = mock(() => Promise.resolve())
+  const stop = mock(() => undefined)
+  const configure = mock(() => Promise.resolve())
+  return {
+    value: { run, stop, configure } as unknown as RunController,
+    run,
+    stop,
+    configure,
+  }
+}
+
+describe("Agent Manager Run messages", () => {
+  it.each(["agentManager", "vscode"] as const)("forwards the %s dropdown destination", (destination) => {
+    const item = controller()
+    const msg = {
+      type: "agentManager.runScript",
+      worktreeId: "wt-1",
+      destination,
+    } satisfies AgentManagerInMessage
+
+    expect(handleRunMessage(item.value, msg)).toBe(true)
+    expect(item.run).toHaveBeenCalledWith("wt-1", destination)
+  })
+
+  it("applies the project qualifier to the shared local key", () => {
+    const item = controller()
+    const qualify = (id: string) => (id === "local" ? "prj-a:local" : id)
+
+    expect(
+      handleRunMessage(
+        item.value,
+        { type: "agentManager.runScript", worktreeId: "local", destination: "vscode" } as AgentManagerInMessage,
+        qualify,
+      ),
+    ).toBe(true)
+    expect(item.run).toHaveBeenCalledWith("prj-a:local", "vscode")
+
+    expect(
+      handleRunMessage(
+        item.value,
+        { type: "agentManager.stopRunScript", worktreeId: "local" } as AgentManagerInMessage,
+        qualify,
+      ),
+    ).toBe(true)
+    expect(item.stop).toHaveBeenCalledWith("prj-a:local")
+  })
+
+  it("leaves worktree ids unqualified and works without a qualifier", () => {
+    const item = controller()
+    const qualify = (id: string) => (id === "local" ? `${id}:qualified` : id)
+
+    expect(
+      handleRunMessage(
+        item.value,
+        { type: "agentManager.runScript", worktreeId: "wt-1", destination: "vscode" } as AgentManagerInMessage,
+        qualify,
+      ),
+    ).toBe(true)
+    expect(item.run).toHaveBeenCalledWith("wt-1", "vscode")
+
+    expect(
+      handleRunMessage(item.value, {
+        type: "agentManager.stopRunScript",
+        worktreeId: "local",
+      } as AgentManagerInMessage),
+    ).toBe(true)
+    expect(item.stop).toHaveBeenCalledWith("local")
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/run-script-manager.test.ts b/packages/kilo-vscode/tests/unit/run-script-manager.test.ts
index baaab57e3f..59bd3c2df8 100644
--- a/packages/kilo-vscode/tests/unit/run-script-manager.test.ts
+++ b/packages/kilo-vscode/tests/unit/run-script-manager.test.ts
@@ -86,7 +86,7 @@ describe("RunScriptManager", () => {
     let stopped = 0
     await ctx.manager.start("wt-1", async () => ({ stop: () => stopped++ }))
 
-    ctx.manager.remove("wt-1")
+    await ctx.manager.remove("wt-1")
 
     expect(stopped).toBe(1)
     expect(ctx.manager.all()).toEqual([])
@@ -123,12 +123,28 @@ describe("RunScriptManager", () => {
   it("finish after remove does not resurrect stale state", async () => {
     const ctx = createManager()
     await ctx.manager.start("wt-1", async () => ({ stop: () => {} }))
-    ctx.manager.remove("wt-1")
+    await ctx.manager.remove("wt-1")
     ctx.manager.finish("wt-1", { exitCode: 0 })
 
     expect(ctx.manager.all()).toEqual([])
   })
 
+  it("stops and disposes once when removal races startup", async () => {
+    const ctx = createManager()
+    const gate = deferred<RunHandle>()
+    let stopped = 0
+    let disposed = 0
+    const started = ctx.manager.start("wt-1", () => gate.promise)
+    const removed = ctx.manager.remove("wt-1")
+
+    gate.resolve({ stop: () => stopped++, dispose: () => disposed++ })
+    await Promise.all([started, removed])
+
+    expect(stopped).toBe(1)
+    expect(disposed).toBe(1)
+    expect(ctx.manager.all()).toEqual([])
+  })
+
   it("dispose tolerates handles that throw on stop", async () => {
     const ctx = createManager()
     await ctx.manager.start("wt-1", async () => ({
diff --git a/packages/kilo-vscode/tests/unit/run-terminal-destination.test.ts b/packages/kilo-vscode/tests/unit/run-terminal-destination.test.ts
new file mode 100644
index 0000000000..d2a16dee95
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/run-terminal-destination.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, it } from "bun:test"
+import type { StartTask } from "../../src/agent-manager/run/controller"
+import { pickRunStart } from "../../src/agent-manager/run/destination"
+
+describe("Run terminal destination", () => {
+  it("picks the adapter matching the panel dropdown destination", () => {
+    const handle = { stop: () => undefined, dispose: () => undefined }
+    const embedded: StartTask = async () => handle
+    const integrated: StartTask = async () => handle
+
+    expect(pickRunStart("agentManager", embedded, integrated)).toBe(embedded)
+    expect(pickRunStart("vscode", embedded, integrated)).toBe(integrated)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/sandbox-bootstrap.test.ts b/packages/kilo-vscode/tests/unit/sandbox-bootstrap.test.ts
index d4d9072b66..445192eeff 100644
--- a/packages/kilo-vscode/tests/unit/sandbox-bootstrap.test.ts
+++ b/packages/kilo-vscode/tests/unit/sandbox-bootstrap.test.ts
@@ -91,36 +91,46 @@ describe("ensureSandbox", () => {
 
 describe("Agent Manager sandbox startup", () => {
   const provider = readFileSync(join(__dirname, "..", "..", "src", "agent-manager", "AgentManagerProvider.ts"), "utf8")
+  const flow = readFileSync(join(__dirname, "..", "..", "src", "agent-manager", "provider-multi-version.ts"), "utf8")
   const dialog = readFileSync(
     join(__dirname, "..", "..", "webview-ui", "agent-manager", "NewWorktreeDialog.tsx"),
     "utf8",
   )
 
   test("reconciles before exposing or prompting the session", () => {
-    const start = provider.indexOf("private async onCreateMultiVersion")
-    const end = provider.indexOf("\n  private ", start + 1)
-    const body = provider.slice(start, end)
-    const ensure = body.indexOf("await ensureSandbox")
-    const discard = body.indexOf("await this.discardWorktree", ensure)
-    const skip = body.indexOf("continue", discard)
-    const register = body.indexOf("this.registerWorktreeSession", ensure)
-    const ready = body.indexOf("this.notifyWorktreeReady", register)
-    const created = body.indexOf("created.push", ready)
-    const prompt = body.indexOf('type: "agentManager.sendInitialMessage"', created)
-
-    expect(ensure).toBeGreaterThan(-1)
-    expect(discard).toBeGreaterThan(ensure)
-    expect(skip).toBeGreaterThan(discard)
-    expect(register).toBeGreaterThan(skip)
+    // In createVersion the sandbox gate runs before the session is exposed.
+    const start = flow.indexOf("async function createVersion")
+    const version = flow.slice(start, flow.indexOf("\n/**", start + 1))
+    const gate = version.indexOf("await reconcileSandbox")
+    const register = version.indexOf("host.register", gate)
+    const ready = version.indexOf("host.notifyReady", register)
+    const created = version.indexOf("return {", ready)
+    expect(gate).toBeGreaterThan(-1)
+    expect(register).toBeGreaterThan(gate)
     expect(ready).toBeGreaterThan(register)
     expect(created).toBeGreaterThan(ready)
-    expect(prompt).toBeGreaterThan(created)
+
+    // In reconcileSandbox a failed reconciliation discards the worktree and
+    // aborts the version before any exposure can happen.
+    const rbStart = flow.indexOf("async function reconcileSandbox")
+    const rollback = flow.slice(rbStart, flow.indexOf("\n/**", rbStart + 1))
+    const attempt = rollback.indexOf("await ensureSandbox")
+    const discard = rollback.indexOf("await host.discard", attempt)
+    const abort = rollback.indexOf("return false", discard)
+    expect(attempt).toBeGreaterThan(-1)
+    expect(discard).toBeGreaterThan(attempt)
+    expect(abort).toBeGreaterThan(discard)
+
+    // The created sessions feed the initial prompt phase.
+    const prompts = flow.slice(flow.indexOf("async function sendInitialPrompts"))
+    expect(prompts).toContain("buildInitialMessages(created")
+    expect(prompts).toContain('type: "agentManager.sendInitialMessage"')
   })
 
   test("deletes the fresh branch when sandbox setup rolls back", () => {
     expect(provider).toContain("private async discardWorktree(id: string, dir: string, branch: string")
     expect(provider).toContain("removeWorktree(dir, branch)")
-    expect(provider).toContain("wt.result.path, wt.result.branch, session.id")
+    expect(flow).toContain("wt.result.path, wt.result.branch, sessionId")
   })
 
   test("uses the persisted sandbox default for UI and only sends explicit overrides", () => {
diff --git a/packages/kilo-vscode/tests/unit/script-terminal-manager.test.ts b/packages/kilo-vscode/tests/unit/script-terminal-manager.test.ts
new file mode 100644
index 0000000000..c9f97d8b6a
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/script-terminal-manager.test.ts
@@ -0,0 +1,492 @@
+import { describe, expect, it } from "bun:test"
+import type { KiloClient } from "@kilocode/sdk/v2/client"
+import { ScriptTerminalManager, type ScriptTerminalView } from "../../src/agent-manager/ScriptTerminalManager"
+import { buildScriptTerminalWsUrl } from "../../src/agent-manager/script-terminal-url"
+import { RunScriptManager, type RunStatus } from "../../src/agent-manager/run/manager"
+
+interface PtyInput {
+  location?: { directory?: string }
+  command?: string
+  args?: string[]
+  cwd?: string
+  env?: Record<string, string>
+  title?: string
+}
+
+interface PtyUpdate {
+  ptyID: string
+  location?: { directory?: string }
+  size?: { cols: number; rows: number }
+}
+
+interface PtyInfo {
+  id: string
+  title: string
+  command: string
+  args: string[]
+  cwd: string
+  status: "running" | "exited"
+  pid: number
+  exitCode?: number
+}
+
+interface PtyResponse {
+  data?: { location: { directory: string }; data: PtyInfo }
+  error?: unknown
+}
+
+function wait(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+function deferred<T>() {
+  let resolve: (value: T) => void = () => undefined
+  const promise = new Promise<T>((next) => {
+    resolve = next
+  })
+  return { promise, resolve }
+}
+
+function info(status: PtyInfo["status"] = "running", exitCode?: number): PtyInfo {
+  return {
+    id: "pty-1",
+    title: "Run",
+    command: "bun",
+    args: ["run", "check"],
+    cwd: "/repo/worktree",
+    status,
+    pid: 42,
+    ...(exitCode === undefined ? {} : { exitCode }),
+  }
+}
+
+function harness(opts?: {
+  create?: (input: PtyInput) => Promise<PtyResponse>
+  get?: () => Promise<PtyResponse>
+  remove?: () => Promise<{ data?: unknown; error?: unknown }>
+}) {
+  const calls: { create: PtyInput[]; get: unknown[]; update: PtyUpdate[]; remove: unknown[] } = {
+    create: [],
+    get: [],
+    update: [],
+    remove: [],
+  }
+  const snapshots: ScriptTerminalView[][] = []
+  const closed: string[] = []
+  const logs: string[] = []
+  const client = {
+    v2: {
+      pty: {
+        create: async (input: PtyInput) => {
+          calls.create.push(input)
+          return opts?.create ? opts.create(input) : { data: { location: { directory: config.cwd }, data: info() } }
+        },
+        get: async (input: unknown) => {
+          calls.get.push(input)
+          return opts?.get ? opts.get() : { data: { location: { directory: config.cwd }, data: info() } }
+        },
+        update: async (input: PtyUpdate) => {
+          calls.update.push(input)
+          return { data: info() }
+        },
+        remove: async (input: unknown) => {
+          calls.remove.push(input)
+          return opts?.remove ? opts.remove() : { data: undefined }
+        },
+      },
+    },
+  } as unknown as KiloClient
+  const manager = new ScriptTerminalManager({
+    getClient: () => client,
+    getClientAsync: async () => client,
+    buildWsUrl: (ptyID, cwd) => `ws://127.0.0.1:4096/api/pty/${ptyID}/connect?location=${cwd}`,
+    getTerminalFont: () => ({ fontFamily: "Menlo", fontSize: 12 }),
+    emit: (terminals) => snapshots.push(terminals),
+    closed: (terminalId) => closed.push(terminalId),
+    log: (msg) => logs.push(msg),
+  })
+  return { manager, calls, snapshots, closed, logs }
+}
+
+const config = {
+  worktreeId: "wt-1",
+  command: "bun",
+  args: ["run", "check"],
+  cwd: "/repo/worktree",
+  env: { PATH: "/bin", WORKTREE_PATH: "/repo/worktree" },
+}
+
+describe("ScriptTerminalManager", () => {
+  it("creates a Run PTY with explicit command settings and a safe snapshot", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+
+    expect(ctx.calls.create).toEqual([
+      {
+        location: { directory: "/repo/worktree" },
+        command: "bun",
+        args: ["run", "check"],
+        cwd: "/repo/worktree",
+        env: { PATH: "/bin", WORKTREE_PATH: "/repo/worktree" },
+        title: "Run",
+      },
+    ])
+    expect(ctx.calls.get).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(ctx.snapshots.at(-1)).toEqual([
+      expect.objectContaining({
+        worktreeId: "wt-1",
+        kind: "run",
+        title: "Run",
+        state: "running",
+        font: { fontFamily: "Menlo", fontSize: 12 },
+      }),
+    ])
+    expect(JSON.stringify(ctx.snapshots.at(-1))).not.toContain('"command"')
+    expect(JSON.stringify(ctx.snapshots.at(-1))).not.toContain('"env"')
+    expect(done).toEqual([])
+  })
+
+  it("normalizes the internal local Run key to a null external worktree id", async () => {
+    const ctx = harness()
+
+    await ctx.manager.start("run", { ...config, worktreeId: "local", cwd: "/repo" }, () => undefined)
+
+    expect(ctx.snapshots.at(-1)?.[0]?.worktreeId).toBeNull()
+  })
+
+  it("keeps identical worktree script terminals independent across projects", async () => {
+    let id = 0
+    const ctx = harness({
+      create: async () => ({
+        data: { location: { directory: config.cwd }, data: { ...info(), id: `pty-${++id}` } },
+      }),
+      get: async () => ({
+        data: { location: { directory: config.cwd }, data: { ...info(), id: `pty-${id}` } },
+      }),
+    })
+
+    await ctx.manager.start("setup", { ...config, projectId: "prj-a" }, () => undefined)
+    await ctx.manager.start("setup", { ...config, projectId: "prj-b" }, () => undefined)
+
+    expect(ctx.snapshots.at(-1)).toEqual([
+      expect.objectContaining({ projectId: "prj-a", worktreeId: "wt-1", kind: "setup" }),
+      expect.objectContaining({ projectId: "prj-b", worktreeId: "wt-1", kind: "setup" }),
+    ])
+    expect(ctx.manager.active("setup", "wt-1", "prj-a")).toBe(true)
+    expect(ctx.manager.active("setup", "wt-1", "prj-b")).toBe(true)
+
+    await ctx.manager.clear("setup", "wt-1", "prj-a")
+    expect(ctx.manager.active("setup", "wt-1", "prj-a")).toBe(false)
+    expect(ctx.manager.active("setup", "wt-1", "prj-b")).toBe(true)
+  })
+
+  it("builds canonical authenticated replay URLs", () => {
+    const value = buildScriptTerminalWsUrl(
+      { baseUrl: "http://127.0.0.1:4096", password: "secret" },
+      "pty / 1",
+      "/repo/worktree",
+    )
+    const url = new URL(value)
+
+    expect(url.protocol).toBe("ws:")
+    expect(url.pathname).toBe("/api/pty/pty%20%2F%201/connect")
+    expect(url.searchParams.get("location[directory]")).toBe("/repo/worktree")
+    expect(url.searchParams.get("cursor")).toBe("0")
+    expect(url.searchParams.get("replayExited")).toBe("1")
+    expect(url.searchParams.get("auth_token")).toBe(Buffer.from("kilo:secret").toString("base64"))
+  })
+
+  it("finishes once on a natural exit and retains the replayable terminal", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Run terminal")
+    ctx.manager.exited("pty-1", 17)
+    ctx.manager.exited("pty-1", 17)
+
+    expect(done).toEqual([{ exitCode: 17 }])
+    expect(ctx.calls.remove).toEqual([])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ terminalId, state: "exited", exitCode: 17 })])
+
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.close", terminalId })).toBe(true)
+    await wait()
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(ctx.closed).toEqual([terminalId])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("reconciles a PTY that exited before registration", async () => {
+    const ctx = harness({
+      get: async () => ({ data: { location: { directory: config.cwd }, data: info("exited", 7) } }),
+    })
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+
+    expect(done).toEqual([{ exitCode: 7 }])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ state: "exited", exitCode: 7 })])
+  })
+
+  it("reconciles an exit event that arrives before create registration", async () => {
+    const gate = deferred<PtyResponse>()
+    let state = info()
+    const ctx = harness({
+      create: async () => gate.promise,
+      get: async () => ({ data: { location: { directory: config.cwd }, data: state } }),
+    })
+    const done: unknown[] = []
+    const started = ctx.manager.start("run", config, (exit) => done.push(exit))
+
+    await wait()
+    state = info("exited", 9)
+    ctx.manager.exited("pty-1", 9)
+    gate.resolve({ data: { location: { directory: config.cwd }, data: info() } })
+    await started
+
+    expect(done).toEqual([{ exitCode: 9 }])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ state: "exited", exitCode: 9 })])
+  })
+
+  it("treats an already removed backend PTY as a successful close", async () => {
+    const ctx = harness({ remove: async () => ({ error: { _tag: "PtyNotFoundError", status: 404 } }) })
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Run terminal")
+
+    expect(await ctx.manager.close(terminalId)).toBe(true)
+    expect(done).toEqual([{ stopped: true }])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("stops a PTY when stop races startup", async () => {
+    const gate = deferred<PtyResponse>()
+    const ctx = harness({ create: async () => gate.promise })
+    const statuses: RunStatus[] = []
+    const run = new RunScriptManager(
+      () => undefined,
+      (status) => statuses.push({ ...status }),
+      () => new Date("2026-01-02T03:04:05.000Z"),
+    )
+    const started = run.start("wt-1", () => ctx.manager.start("run", config, (exit) => run.finish("wt-1", exit)))
+
+    await wait()
+    await run.stop("wt-1")
+    gate.resolve({ data: { location: { directory: config.cwd }, data: info() } })
+    await started
+    await wait()
+
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(statuses.map((status) => status.state)).toEqual(["running", "stopping", "idle"])
+    expect(run.status("wt-1")).toMatchObject({ state: "idle", stopped: true })
+  })
+
+  it("intercepts resize and stops a running terminal when it closes", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Run terminal")
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.resize", terminalId, cols: 120, rows: 40 })).toBe(true)
+    await wait()
+    expect(ctx.calls.update).toEqual([
+      { ptyID: "pty-1", location: { directory: "/repo/worktree" }, size: { cols: 120, rows: 40 } },
+    ])
+
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.close", terminalId })).toBe(true)
+    await wait()
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(done).toEqual([{ stopped: true }])
+    expect(ctx.closed).toEqual([terminalId])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("retries closure after a Run terminal removal fails", async () => {
+    let attempt = 0
+    const ctx = harness({
+      remove: async () => {
+        attempt++
+        if (attempt === 1) return { error: new Error("still running") }
+        return { data: undefined }
+      },
+    })
+
+    await ctx.manager.start("run", config, () => undefined)
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Run terminal")
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.close", terminalId })).toBe(true)
+    await wait()
+
+    expect(ctx.closed).toEqual([])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ terminalId, state: "failed" })])
+
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.close", terminalId })).toBe(true)
+    await wait()
+
+    expect(ctx.calls.remove).toHaveLength(2)
+    expect(ctx.closed).toEqual([terminalId])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("drops a retained Run terminal when the backend evicts it", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+    ctx.manager.exited("pty-1", 0)
+    ctx.manager.deleted("pty-1")
+
+    expect(done).toEqual([{ exitCode: 0 }])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+    expect(ctx.calls.remove).toEqual([])
+  })
+
+  it("reconciles a natural exit missed during an event-stream reconnect", async () => {
+    let state: PtyInfo = info()
+    const ctx = harness({ get: async () => ({ data: { location: { directory: config.cwd }, data: state } }) })
+    const done: unknown[] = []
+
+    await ctx.manager.start("run", config, (exit) => done.push(exit))
+    state = info("exited", 23)
+    await ctx.manager.sync()
+
+    expect(done).toEqual([{ exitCode: 23 }])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ state: "exited", exitCode: 23 })])
+  })
+
+  it("clears retained exited terminals by worktree context", async () => {
+    const ctx = harness()
+
+    await ctx.manager.start("run", config, () => undefined)
+    ctx.manager.exited("pty-1", 0)
+
+    expect(await ctx.manager.clear("run", "wt-1")).toBe(true)
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("replays the full retained snapshot after a webview reload", async () => {
+    const ctx = harness()
+
+    await ctx.manager.start("run", config, () => undefined)
+    const first = ctx.snapshots.at(-1)
+    ctx.manager.snapshot()
+
+    expect(ctx.snapshots.at(-1)).toEqual(first)
+  })
+})
+
+describe("ScriptTerminalManager Setup kind", () => {
+  it("creates a Setup PTY labeled Setup and tracks its kind", async () => {
+    const ctx = harness()
+
+    await ctx.manager.start("setup", config, () => undefined)
+
+    expect(ctx.calls.create[0]?.title).toBe("Setup")
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ kind: "setup", title: "Setup", state: "running" })])
+    expect(ctx.manager.active("setup", "wt-1")).toBe(true)
+    expect(ctx.manager.active("run", "wt-1")).toBe(false)
+  })
+
+  it("ignores a user close while Setup is running", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("setup", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Setup terminal")
+
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.close", terminalId })).toBe(true)
+    await wait()
+
+    expect(ctx.calls.remove).toEqual([])
+    expect(ctx.closed).toEqual([])
+    expect(done).toEqual([])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ terminalId, state: "running" })])
+    expect(ctx.logs.some((msg) => msg.includes("Ignored close"))).toBe(true)
+  })
+
+  it("force-stops a running Setup when the worktree is cleared", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("setup", config, (exit) => done.push(exit))
+
+    expect(await ctx.manager.clear("setup", "wt-1")).toBe(true)
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(done).toEqual([{ stopped: true }])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+    expect(ctx.manager.active("setup", "wt-1")).toBe(false)
+  })
+
+  it("closes an exited Setup terminal and reports inactive", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("setup", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Setup terminal")
+    ctx.manager.exited("pty-1", 0)
+
+    expect(ctx.manager.active("setup", "wt-1")).toBe(false)
+    expect(await ctx.manager.close(terminalId)).toBe(true)
+    expect(done).toEqual([{ exitCode: 0 }])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("retains the tab as failed when killed, and survives the backend deleted event", async () => {
+    let removes = 0
+    const ctx = harness({
+      remove: async () => {
+        removes += 1
+        // The first remove (the kill itself) succeeds; the PTY is gone for
+        // any later remove, which must still close the retained tab.
+        return removes > 1 ? { error: { _tag: "PtyNotFoundError" } } : { data: undefined }
+      },
+    })
+    const done: unknown[] = []
+
+    const handle = await ctx.manager.start("setup", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Setup terminal")
+
+    handle.kill?.("Setup script timed out after 5 minutes")
+    await wait()
+
+    // The process tree is killed but the tab keeps its partial output.
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(done).toEqual([{ error: "Setup script timed out after 5 minutes" }])
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ terminalId, state: "failed" })])
+
+    // The backend confirming the deletion must not drop the retained tab.
+    ctx.manager.deleted("pty-1")
+    expect(ctx.snapshots.at(-1)).toEqual([expect.objectContaining({ terminalId, state: "failed" })])
+
+    // Closing the retained tab still works when the PTY is already gone.
+    expect(await ctx.manager.close(terminalId)).toBe(true)
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+
+  it("stops a running Setup when the user deliberately stops it", async () => {
+    const ctx = harness()
+    const done: unknown[] = []
+
+    await ctx.manager.start("setup", config, (exit) => done.push(exit))
+    const terminalId = ctx.snapshots.at(-1)?.[0]?.terminalId
+    if (!terminalId) throw new Error("missing Setup terminal")
+
+    expect(ctx.manager.intercept({ type: "agentManager.terminal.stop", terminalId })).toBe(true)
+    await wait()
+
+    expect(ctx.calls.remove).toEqual([{ ptyID: "pty-1", location: { directory: "/repo/worktree" } }])
+    expect(done).toEqual([{ stopped: true }])
+    expect(ctx.closed).toEqual([terminalId])
+    expect(ctx.snapshots.at(-1)).toEqual([])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/session-outcome.test.ts b/packages/kilo-vscode/tests/unit/session-outcome.test.ts
index 8dd06b6dd6..93b8475e5f 100644
--- a/packages/kilo-vscode/tests/unit/session-outcome.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-outcome.test.ts
@@ -138,6 +138,13 @@ describe("terminal", () => {
     ).toBe("error")
   })
 
+  it("hides superseded turns that handed off to a queued follow-up", () => {
+    expect(
+      terminal({ reason: "superseded", messages: [message("tool-calls")], todos: [todo("pending")] }),
+    ).toBeUndefined()
+    expect(terminal({ reason: "superseded", messages: [message("unknown")], todos: [] })).toBeUndefined()
+  })
+
   it("reports only the latest assistant finish reason", () => {
     const user: Message = { id: "u1", sessionID: "s1", role: "user", createdAt: new Date(1).toISOString() }
     expect(terminal({ reason: "completed", messages: [message("length"), user], todos: [] })?.finish).toBeUndefined()
diff --git a/packages/kilo-vscode/tests/unit/session-search.test.ts b/packages/kilo-vscode/tests/unit/session-search.test.ts
new file mode 100644
index 0000000000..0bae8bb682
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/session-search.test.ts
@@ -0,0 +1,115 @@
+import { describe, expect, it } from "bun:test"
+import { handleSessionSearch } from "../../src/kilo-provider/session-search"
+
+type Query = Record<string, unknown>
+
+function stub(data: Array<Record<string, unknown>> | Error) {
+  const calls: Query[] = []
+  const client = {
+    experimental: {
+      session: {
+        list: async (query: Query) => {
+          calls.push(query)
+          if (data instanceof Error) throw data
+          return { data }
+        },
+      },
+    },
+  }
+  return { calls, client }
+}
+
+function session(id: string, title: string, updated: number, worktreeName?: string) {
+  return { id, title, time: { updated }, worktreeName }
+}
+
+describe("handleSessionSearch", () => {
+  it("lists root sessions across the worktree family for the resolved directory", async () => {
+    const { calls, client } = stub([session("ses_a", "Alpha", 2, "neon-author")])
+    const posted: unknown[] = []
+
+    await handleSessionSearch({
+      client: client as never,
+      message: { requestId: "r1", sessionID: "ses_current" },
+      dir: (id) => (id === "ses_current" ? "/repo/.kilo/worktrees/wt-1" : "/repo"),
+      post: (msg) => posted.push(msg),
+    })
+
+    expect(calls).toEqual([{ worktrees: true, roots: true, directory: "/repo/.kilo/worktrees/wt-1", limit: 50 }])
+    expect(posted).toEqual([
+      {
+        type: "sessionSearchResult",
+        sessions: [{ id: "ses_a", title: "Alpha", updated: 2, worktreeName: "neon-author" }],
+        requestId: "r1",
+      },
+    ])
+  })
+
+  it("falls back to the current and context sessions for directory resolution", async () => {
+    const { calls, client } = stub([])
+
+    await handleSessionSearch({
+      client: client as never,
+      message: { requestId: "r2" },
+      current: "ses_current",
+      context: "ses_context",
+      dir: (id) => `/dir/${id}`,
+      post: () => {},
+    })
+
+    expect(calls[0]?.directory).toBe("/dir/ses_current")
+
+    await handleSessionSearch({
+      client: client as never,
+      message: { requestId: "r3" },
+      context: "ses_context",
+      dir: (id) => `/dir/${id}`,
+      post: () => {},
+    })
+
+    expect(calls[1]?.directory).toBe("/dir/ses_context")
+  })
+
+  it("excludes the given session and sessions without titles", async () => {
+    const { client } = stub([
+      session("ses_keep", "Keep", 3),
+      session("ses_exclude", "Excluded", 2),
+      session("ses_untitled", "", 1),
+    ])
+    const posted: Array<{ sessions: Array<{ id: string }> }> = []
+
+    await handleSessionSearch({
+      client: client as never,
+      message: { requestId: "r4" },
+      dir: () => "/repo",
+      exclude: "ses_exclude",
+      post: (msg) => posted.push(msg as never),
+    })
+
+    expect(posted[0]?.sessions.map((s) => s.id)).toEqual(["ses_keep"])
+  })
+
+  it("posts an empty result when the client is missing or the list fails", async () => {
+    const posted: unknown[] = []
+
+    await handleSessionSearch({
+      client: null,
+      message: { requestId: "r5" },
+      dir: () => "/repo",
+      post: (msg) => posted.push(msg),
+    })
+
+    const failing = stub(new Error("boom"))
+    await handleSessionSearch({
+      client: failing.client as never,
+      message: { requestId: "r6" },
+      dir: () => "/repo",
+      post: (msg) => posted.push(msg),
+    })
+
+    expect(posted).toEqual([
+      { type: "sessionSearchResult", sessions: [], requestId: "r5" },
+      { type: "sessionSearchResult", sessions: [], requestId: "r6" },
+    ])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts b/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
index 4e763196bf..5669acaeac 100644
--- a/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
@@ -9,6 +9,7 @@ import { describe, it, expect } from "bun:test"
 import path from "node:path"
 import { Project, SyntaxKind } from "ts-morph"
 import { SessionTerminalManager, type TerminalHost } from "../../src/agent-manager/SessionTerminalManager"
+import type { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
 
 const ROOT = path.resolve(import.meta.dir, "../..")
 const FILE = path.join(ROOT, "src/agent-manager/SessionTerminalManager.ts")
@@ -130,8 +131,8 @@ describe("SessionTerminalManager structure", () => {
     expect(text).toContain("panel command registration skipped")
   })
 
-  it("resolves the session that owns the active managed terminal", () => {
-    const text = body("activeSession")
+  it("resolves the key that owns the active managed terminal", () => {
+    const text = body("activeKey")
     expect(text).toContain("this.host.activeTerminal()")
     expect(text).toContain("entry.terminal === active")
   })
@@ -139,7 +140,8 @@ describe("SessionTerminalManager structure", () => {
   it("rejects context capture from another managed session", () => {
     const text = body("prepareContext")
     expect(text).toContain("this.showExisting(sessionId)")
-    expect(text).toContain("this.activeSession()")
+    expect(text).toContain("this.activeKey()")
+    expect(text).toContain("SessionTerminalManager.sessionKey(sessionId)")
   })
 })
 
@@ -162,3 +164,74 @@ describe("SessionTerminalManager command restoration", () => {
     state.manager.dispose()
   })
 })
+
+describe("SessionTerminalManager worktree terminals", () => {
+  function scene(opts: { worktreePath?: string; repoPath?: string } = {}) {
+    const created: Array<{ cwd: string; name: string }> = []
+    const warnings: string[] = []
+    let shown = 0
+    const host: TerminalHost = {
+      createTerminal(o) {
+        created.push(o)
+        return {
+          show: () => shown++,
+          dispose() {},
+          exitStatus: undefined,
+        }
+      },
+      activeTerminal: () => undefined,
+      repoPath: () => opts.repoPath,
+      showWarning: (msg) => warnings.push(msg),
+      setContext() {},
+      onTerminalClosed: () => ({ dispose() {} }),
+      onActiveTerminalChanged: () => ({ dispose() {} }),
+      registerCommand: () => ({ dispose() {} }),
+      executeCommand: () => Promise.resolve(),
+    }
+    const state = {
+      getWorktree: (id: string) =>
+        opts.worktreePath ? { id, path: opts.worktreePath, branch: "feature/x" } : undefined,
+    } as unknown as WorktreeStateManager
+    const manager = new SessionTerminalManager(() => {}, host)
+    return { manager, state, created, warnings, shown: () => shown }
+  }
+
+  it("creates a terminal rooted at the worktree path", () => {
+    const s = scene({ worktreePath: "/repo/.kilo/worktrees/wt-1", repoPath: "/repo" })
+    s.manager.showWorktreeTerminal("wt-1", s.state)
+    expect(s.created).toEqual([{ cwd: "/repo/.kilo/worktrees/wt-1", name: "Agent: feature/x" }])
+    expect(s.shown()).toBe(1)
+  })
+
+  it("reuses the live terminal on repeat calls", () => {
+    const s = scene({ worktreePath: "/repo/.kilo/worktrees/wt-1" })
+    s.manager.showWorktreeTerminal("wt-1", s.state)
+    s.manager.showWorktreeTerminal("wt-1", s.state)
+    expect(s.created).toHaveLength(1)
+    expect(s.shown()).toBe(2)
+  })
+
+  it("keeps session and worktree terminal keys in separate namespaces", () => {
+    const s = scene({ worktreePath: "/repo/.kilo/worktrees/wt-1", repoPath: "/repo" })
+    s.manager.showTerminal("worktree:wt-1", undefined)
+    s.manager.showWorktreeTerminal("wt-1", s.state)
+    expect(s.created).toEqual([
+      { cwd: "/repo", name: "Agent: local" },
+      { cwd: "/repo/.kilo/worktrees/wt-1", name: "Agent: feature/x" },
+    ])
+    expect(s.shown()).toBe(2)
+  })
+
+  it("falls back to the repo root when the worktree is unknown", () => {
+    const s = scene({ repoPath: "/repo" })
+    s.manager.showWorktreeTerminal("gone", s.state)
+    expect(s.created).toEqual([{ cwd: "/repo", name: "Agent: worktree" }])
+  })
+
+  it("warns and creates nothing when no cwd resolves", () => {
+    const s = scene({})
+    s.manager.showWorktreeTerminal("gone", s.state)
+    expect(s.created).toHaveLength(0)
+    expect(s.warnings).toHaveLength(1)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/setup-script-task.test.ts b/packages/kilo-vscode/tests/unit/setup-script-task.test.ts
new file mode 100644
index 0000000000..7714cad6c2
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/setup-script-task.test.ts
@@ -0,0 +1,388 @@
+import { describe, expect, it } from "bun:test"
+import * as fs from "node:fs"
+import * as os from "node:os"
+import * as path from "node:path"
+import type { ScriptTerminalManager } from "../../src/agent-manager/ScriptTerminalManager"
+import { createSetupScriptTask, pickSetupTask, runWorktreeSetupScript } from "../../src/agent-manager/setup-script-task"
+import { SetupScriptService } from "../../src/agent-manager/SetupScriptService"
+import type { RunTask } from "../../src/agent-manager/SetupScriptRunner"
+import type { AgentManagerOutMessage } from "../../src/agent-manager/types"
+
+interface StartCall {
+  kind: string
+  config: { worktreeId: string; command: string; args: string[]; cwd: string; env: Record<string, string> }
+  done: (exit: { exitCode?: number; stopped?: boolean; error?: string }) => void
+}
+
+function wait(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+function deferred<T>() {
+  let resolve: (value: T) => void = () => undefined
+  const promise = new Promise<T>((next) => {
+    resolve = next
+  })
+  return { promise, resolve }
+}
+
+function harness(opts?: {
+  trusted?: boolean
+  timeoutMs?: number
+  gate?: ReturnType<typeof deferred<{ stop(): void }>>
+  startError?: Error
+}) {
+  const starts: StartCall[] = []
+  const stops: string[] = []
+  const manager = {
+    start: (kind: string, config: StartCall["config"], done: StartCall["done"]) => {
+      starts.push({ kind, config, done })
+      if (opts?.startError) return Promise.reject(opts.startError)
+      if (opts?.gate) return opts.gate.promise
+      stops.length = 0
+      return Promise.resolve({
+        stop: () => {
+          stops.push(config.worktreeId)
+        },
+      })
+    },
+  } as unknown as ScriptTerminalManager
+  const logs: string[] = []
+  const task = createSetupScriptTask({
+    manager,
+    worktreeId: "wt-1",
+    trusted: () => opts?.trusted ?? true,
+    log: (msg) => logs.push(msg),
+    timeoutMs: opts?.timeoutMs,
+    env: async () => ({ PATH: "/bin" }),
+  })
+  return { task, starts, stops, logs, manager }
+}
+
+const config = {
+  command: "sh",
+  args: ["/repo/.kilo/setup-script"],
+  cwd: "/repo/worktree",
+  env: { WORKTREE_PATH: "/repo/worktree", REPO_PATH: "/repo" },
+}
+
+describe("createSetupScriptTask", () => {
+  it("starts a setup script terminal with the composed environment", async () => {
+    const ctx = harness()
+    const result = ctx.task(config)
+    await wait()
+
+    expect(ctx.starts).toHaveLength(1)
+    expect(ctx.starts[0]?.kind).toBe("setup")
+    expect(ctx.starts[0]?.config).toEqual({
+      worktreeId: "wt-1",
+      command: "sh",
+      args: ["/repo/.kilo/setup-script"],
+      cwd: "/repo/worktree",
+      env: { PATH: "/bin", WORKTREE_PATH: "/repo/worktree", REPO_PATH: "/repo" },
+    })
+
+    ctx.starts[0]?.done({ exitCode: 0 })
+    await expect(result).resolves.toBe(0)
+  })
+
+  it("resolves a nonzero exit code so the runner can report it", async () => {
+    const ctx = harness()
+    const result = ctx.task(config)
+    await wait()
+    ctx.starts[0]?.done({ exitCode: 42 })
+
+    await expect(result).resolves.toBe(42)
+  })
+
+  it("rejects when the terminal reports an execution error", async () => {
+    const ctx = harness()
+    const result = ctx.task(config)
+    await wait()
+    ctx.starts[0]?.done({ error: "Setup terminal was removed before it exited" })
+
+    await expect(result).rejects.toThrow("Setup terminal was removed before it exited")
+  })
+
+  it("rejects when the terminal is stopped externally", async () => {
+    const ctx = harness()
+    const result = ctx.task(config)
+    await wait()
+    ctx.starts[0]?.done({ stopped: true })
+
+    await expect(result).rejects.toThrow("Setup script was stopped")
+  })
+
+  it("rejects when the backend refuses to create the terminal", async () => {
+    const ctx = harness({ startError: new Error("Not connected to CLI backend") })
+    const result = ctx.task(config)
+
+    await expect(result).rejects.toThrow("Not connected to CLI backend")
+  })
+
+  it("times out, rejects, and stops the process tree", async () => {
+    const ctx = harness({ timeoutMs: 5 })
+    const result = ctx.task(config)
+    await wait()
+
+    await expect(result).rejects.toThrow("Setup script timed out after 5 minutes")
+    expect(ctx.stops).toEqual(["wt-1"])
+
+    // A late exit after the timeout must not settle the promise again.
+    ctx.starts[0]?.done({ exitCode: 0 })
+  })
+
+  it("times out by killing with the reason so the tab stays reviewable", async () => {
+    const kills: string[] = []
+    const stops: string[] = []
+    const manager = {
+      start: async (kind: string, cfg: StartCall["config"], done: StartCall["done"]) => ({
+        stop: () => {
+          stops.push(cfg.worktreeId)
+        },
+        kill: (reason: string) => {
+          kills.push(reason)
+        },
+      }),
+    } as unknown as ScriptTerminalManager
+    const task = createSetupScriptTask({
+      manager,
+      worktreeId: "wt-1",
+      trusted: () => true,
+      log: () => undefined,
+      timeoutMs: 5,
+      env: async () => ({}),
+    })
+    const result = task(config)
+
+    await expect(result).rejects.toThrow("Setup script timed out after 5 minutes")
+    expect(kills).toEqual(["Setup script timed out after 5 minutes"])
+    expect(stops).toEqual([])
+  })
+
+  it("stops a handle that arrives after the timeout already fired", async () => {
+    const gate = deferred<{ stop(): void }>()
+    const stops: string[] = []
+    const starts: StartCall[] = []
+    const manager = {
+      start: (kind: string, config: StartCall["config"], done: StartCall["done"]) => {
+        starts.push({ kind, config, done })
+        return gate.promise
+      },
+    } as unknown as ScriptTerminalManager
+    const task = createSetupScriptTask({
+      manager,
+      worktreeId: "wt-1",
+      trusted: () => true,
+      log: () => undefined,
+      timeoutMs: 5,
+      env: async () => ({}),
+    })
+    const result = task(config)
+
+    await expect(result).rejects.toThrow("Setup script timed out after 5 minutes")
+    gate.resolve({
+      stop: () => {
+        stops.push("wt-1")
+      },
+    })
+    await wait()
+    expect(stops).toEqual(["wt-1"])
+  })
+
+  it("keeps the retained terminal when the script exits during creation", async () => {
+    const stops: string[] = []
+    const manager = {
+      start: async (kind: string, config: StartCall["config"], done: StartCall["done"]) => {
+        // Fast scripts: the PTY exit is reconciled before start() resolves.
+        done({ exitCode: 0 })
+        return {
+          stop: () => {
+            stops.push(config.worktreeId)
+          },
+        }
+      },
+    } as unknown as ScriptTerminalManager
+    const task = createSetupScriptTask({
+      manager,
+      worktreeId: "wt-1",
+      trusted: () => true,
+      log: () => undefined,
+      timeoutMs: 60_000,
+      env: async () => ({}),
+    })
+
+    await expect(task(config)).resolves.toBe(0)
+    await wait()
+    // The exited PTY must not be stopped: its tab retains the output.
+    expect(stops).toEqual([])
+  })
+
+  it("recovers a lost exit event through the reconcile watchdog", async () => {
+    let syncs = 0
+    const starts: StartCall[] = []
+    const manager = {
+      start: async (kind: string, cfg: StartCall["config"], done: StartCall["done"]) => {
+        starts.push({ kind, config: cfg, done })
+        return { stop: () => undefined }
+      },
+      sync: async () => {
+        syncs += 1
+        // The reconcile discovers the exit the event stream missed.
+        if (syncs === 2) starts[0]?.done({ exitCode: 7 })
+      },
+    } as unknown as ScriptTerminalManager
+    const task = createSetupScriptTask({
+      manager,
+      worktreeId: "wt-1",
+      trusted: () => true,
+      log: () => undefined,
+      timeoutMs: 60_000,
+      watchdogMs: 5,
+      env: async () => ({}),
+    })
+
+    await expect(task(config)).resolves.toBe(7)
+    expect(syncs).toBeGreaterThanOrEqual(2)
+    // The watchdog stops once the script settles.
+    const seen = syncs
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    expect(syncs).toBe(seen)
+  })
+
+  it("refuses to run in an untrusted workspace without touching the backend", async () => {
+    const ctx = harness({ trusted: false })
+
+    await expect(ctx.task(config)).rejects.toThrow("Trust the workspace before running setup scripts")
+    expect(ctx.starts).toEqual([])
+  })
+})
+
+describe("pickSetupTask", () => {
+  function pick(opts: { destination: "vscode" | "agentManager"; worktreeId?: string; trusted?: boolean }) {
+    const vscode: RunTask = async () => 0
+    const ctx = harness({ trusted: opts.trusted })
+    const task = pickSetupTask({
+      destination: opts.destination,
+      worktreeId: opts.worktreeId,
+      trusted: () => opts.trusted ?? true,
+      manager: ctx.manager,
+      log: () => undefined,
+      vscode,
+      env: async () => ({}),
+    })
+    return { task, vscode, ctx }
+  }
+
+  it("uses the integrated task runner when the destination is the VS Code terminal", () => {
+    const { task, vscode, ctx } = pick({ destination: "vscode", worktreeId: "wt-1" })
+    expect(task).toBe(vscode)
+    expect(ctx.starts).toEqual([])
+  })
+
+  it("uses the integrated task runner without a worktree id", () => {
+    const { task, vscode } = pick({ destination: "agentManager" })
+    expect(task).toBe(vscode)
+  })
+
+  it("does not redirect an untrusted embedded selection to VS Code", async () => {
+    const { task, vscode } = pick({ destination: "agentManager", worktreeId: "wt-1", trusted: false })
+    expect(task).not.toBe(vscode)
+    await expect(task(config)).rejects.toThrow("Trust the workspace before running setup scripts")
+  })
+
+  it("uses the embedded script terminal when the Agent Manager panel is selected", async () => {
+    const { task, vscode, ctx } = pick({ destination: "agentManager", worktreeId: "wt-1" })
+    expect(task).not.toBe(vscode)
+
+    const result = task(config)
+    await wait()
+    expect(ctx.starts[0]?.kind).toBe("setup")
+    ctx.starts[0]?.done({ exitCode: 0 })
+    await expect(result).resolves.toBe(0)
+  })
+})
+
+describe("runWorktreeSetupScript", () => {
+  function root(script: boolean): string {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "kilo-setup-flow-"))
+    if (!script) return dir
+    fs.mkdirSync(path.join(dir, ".kilo"), { recursive: true })
+    fs.writeFileSync(path.join(dir, ".kilo", "setup-script"), "#!/bin/sh\nexit 0\n")
+    return dir
+  }
+
+  function flow(
+    script: boolean,
+    opts?: { destination?: "vscode" | "agentManager"; code?: number; projectId?: string },
+  ) {
+    const posted: AgentManagerOutMessage[] = []
+    const runs: string[] = []
+    const ctx = harness()
+    const vscode: RunTask = async (cfg) => {
+      runs.push(cfg.cwd)
+      return opts?.code ?? 0
+    }
+    const input = {
+      service: new SetupScriptService(root(script)),
+      destination: opts?.destination ?? ("vscode" as const),
+      projectId: opts?.projectId,
+      worktreeId: "wt-1",
+      trusted: () => true,
+      manager: ctx.manager,
+      log: () => undefined,
+      vscode,
+      env: async () => ({}),
+      post: (message: AgentManagerOutMessage) => posted.push(message),
+    }
+    return { input, posted, runs, ctx }
+  }
+
+  it("posts progress and executes through the picked runner", async () => {
+    const scene = flow(true, { code: 0 })
+    await runWorktreeSetupScript(scene.input, { worktreePath: "/repo/worktree", repoPath: "/repo" })
+
+    expect(scene.posted).toEqual([
+      {
+        type: "agentManager.worktreeSetup",
+        status: "creating",
+        message: "Running setup script...",
+        worktreeId: "wt-1",
+      },
+    ])
+    expect(scene.runs).toEqual(["/repo/worktree"])
+  })
+
+  it("stamps progress and embedded terminals with the owning project", async () => {
+    const scene = flow(true, { destination: "agentManager", projectId: "prj-a" })
+    const result = runWorktreeSetupScript(scene.input, { worktreePath: "/repo/worktree", repoPath: "/repo" })
+    await new Promise((resolve) => setTimeout(resolve, 0))
+
+    expect(scene.posted[0]).toMatchObject({ projectId: "prj-a", worktreeId: "wt-1" })
+    expect(scene.ctx.starts[0]?.config).toMatchObject({ projectId: "prj-a", worktreeId: "wt-1" })
+    scene.ctx.starts[0]?.done({ exitCode: 0 })
+    await result
+  })
+
+  it("stays silent when no setup script is configured", async () => {
+    const scene = flow(false)
+    await runWorktreeSetupScript(scene.input, { worktreePath: "/repo/worktree", repoPath: "/repo" })
+
+    expect(scene.posted).toEqual([])
+    expect(scene.runs).toEqual([])
+  })
+
+  it("keeps worktree creation best-effort when the script fails", async () => {
+    const scene = flow(true, { code: 3 })
+    await expect(
+      runWorktreeSetupScript(scene.input, { worktreePath: "/repo/worktree", repoPath: "/repo" }),
+    ).resolves.toBeUndefined()
+    expect(scene.runs).toEqual(["/repo/worktree"])
+    expect(scene.posted).toContainEqual({
+      type: "agentManager.worktreeSetup",
+      status: "error",
+      message: "Setup script exited with code 3",
+      worktreeId: "wt-1",
+    })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/worktree-diff-controller.test.ts b/packages/kilo-vscode/tests/unit/worktree-diff-controller.test.ts
new file mode 100644
index 0000000000..59888079ed
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/worktree-diff-controller.test.ts
@@ -0,0 +1,120 @@
+import { describe, it, expect } from "bun:test"
+import { WorktreeDiffController } from "../../src/agent-manager/worktree-diff-controller"
+import type { DiffSourceCatalog } from "../../src/diff/sources/catalog"
+import type { DiffSource } from "../../src/diff/sources/types"
+import type { PanelContext } from "../../src/diff/types"
+import type { GitOps } from "../../src/agent-manager/GitOps"
+import type { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager"
+
+// Records every PanelContext handed to catalog.build so tests can assert which
+// base branch the active source was (re)built with. The controller, scope
+// resolution, and SourceController lifecycle under test are all real.
+// Contexts are worktree ids (the sidebar selection), not session ids.
+function make(onFetch?: (n: number) => Promise<void>) {
+  const builds: { id: string; ctx: PanelContext }[] = []
+  let fetches = 0
+  const catalog = {
+    build: (id: string, ctx: PanelContext): DiffSource => {
+      builds.push({ id, ctx })
+      return {
+        descriptor: { id, type: "workspace", group: "Git", capabilities: { revert: true, comments: true } },
+        async fetch() {
+          await onFetch?.(++fetches)
+          return { diffs: [] }
+        },
+      }
+    },
+  } as unknown as DiffSourceCatalog
+
+  const state = {
+    getSession: (id: string) => (id === "s1" ? { id: "s1", worktreeId: "w1", createdAt: "" } : undefined),
+    getWorktree: (id: string) =>
+      id === "w1" ? { id: "w1", path: "/wt", parentBranch: "main", remote: "origin" } : undefined,
+  } as unknown as WorktreeStateManager
+
+  const controller = new WorktreeDiffController({
+    getState: () => state,
+    getRoot: () => "/repo",
+    getStateReady: () => undefined,
+    catalog,
+    git: {} as GitOps,
+    localDiffFile: async () => null,
+    post: () => {},
+    log: () => {},
+  })
+  return { controller, builds }
+}
+
+const tick = () => new Promise((resolve) => setTimeout(resolve, 0))
+
+async function waitFor(cond: () => boolean): Promise<void> {
+  for (let i = 0; i < 50; i++) {
+    if (cond()) return
+    await tick()
+  }
+  throw new Error("waitFor timed out")
+}
+
+describe("WorktreeDiffController.setBase", () => {
+  it("rebuilds the active source against the overridden base branch", async () => {
+    const { controller, builds } = make()
+    controller.start("w1#branch")
+    await waitFor(() => builds.length === 1)
+    expect(builds[0]!.ctx.dir).toBe("/wt")
+    expect(builds[0]!.ctx.baseBranch).toBe("origin/main")
+
+    await controller.setBase("w1#branch", "feature-x")
+    expect(builds.length).toBe(2)
+    expect(builds[1]!.ctx.dir).toBe("/wt")
+    expect(builds[1]!.ctx.baseBranch).toBe("feature-x")
+
+    // Clearing the override falls back to the recorded parent ref.
+    await controller.setBase("w1#branch", undefined)
+    expect(builds.length).toBe(3)
+    expect(builds[2]!.ctx.baseBranch).toBe("origin/main")
+
+    controller.stop()
+  })
+
+  it("stores the override without rebuilding when the context isn't active", async () => {
+    const { controller, builds } = make()
+
+    await controller.setBase("w1#branch", "feature-x")
+    expect(builds.length).toBe(0)
+
+    // The next activation of that context resolves the stored override.
+    controller.start("w1#branch")
+    await waitFor(() => builds.length === 1)
+    expect(builds[0]!.ctx.baseBranch).toBe("feature-x")
+
+    controller.stop()
+  })
+
+  it("keeps watching when the base changes during the initial fetch", async () => {
+    // Hold the first activation's fetch in flight, simulating a slow worktree
+    // diff. isPolling is still false in this window, but the watch intent must
+    // survive the base change rather than downgrading the panel to one-shot.
+    let release: () => void = () => {}
+    const gate = new Promise<void>((resolve) => (release = resolve))
+    const { controller, builds } = make(async (n) => {
+      if (n === 1) await gate
+    })
+
+    controller.start("w1#branch")
+    await waitFor(() => builds.length === 1)
+
+    const change = controller.setBase("w1#branch", "feature-x")
+    release()
+    await change
+    expect(builds.length).toBe(2)
+    expect(builds[1]!.ctx.baseBranch).toBe("feature-x")
+
+    // Polling survives: start() early-returns for an id that is already
+    // watched. A downgraded one-shot panel would re-activate and rebuild here.
+    controller.start("w1#branch")
+    await tick()
+    expect(builds.length).toBe(2)
+
+    controller.stop()
+  })
+})
diff --git a/packages/kilo-vscode/tests/visual-regression.spec.mts b/packages/kilo-vscode/tests/visual-regression.spec.mts
index 3f210bb7cb..437ac4bd85 100644
--- a/packages/kilo-vscode/tests/visual-regression.spec.mts
+++ b/packages/kilo-vscode/tests/visual-regression.spec.mts
@@ -75,9 +75,12 @@ async function settle(page: Page) {
 // Spinner animation captures at an indeterminate frame, causing flaky diffs.
 // Permission dock config-preloaded has non-deterministic toggle rendering.
 // Sandboxing rows can settle at different scroll heights after settings context updates.
+// Side terminal tabs mount live xterm instances whose websocket error text
+// lands at indeterminate times.
 const SKIP = new Set<string>([
   "agentmanager--worktree-item-busy",
   "agentmanager--full-screen-diff-agent-edit-scroll",
+  "agentmanager--side-terminal-panel-tabs",
   "composite-webview--permission-dock-config-preloaded",
   "settings--sandboxing-allowlist",
   "settings--sandboxing-panel",
diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts b/packages/kilo-vscode/tests/visual-regression.spec.ts
index 3f210bb7cb..437ac4bd85 100644
--- a/packages/kilo-vscode/tests/visual-regression.spec.ts
+++ b/packages/kilo-vscode/tests/visual-regression.spec.ts
@@ -75,9 +75,12 @@ async function settle(page: Page) {
 // Spinner animation captures at an indeterminate frame, causing flaky diffs.
 // Permission dock config-preloaded has non-deterministic toggle rendering.
 // Sandboxing rows can settle at different scroll heights after settings context updates.
+// Side terminal tabs mount live xterm instances whose websocket error text
+// lands at indeterminate times.
 const SKIP = new Set<string>([
   "agentmanager--worktree-item-busy",
   "agentmanager--full-screen-diff-agent-edit-scroll",
+  "agentmanager--side-terminal-panel-tabs",
   "composite-webview--permission-dock-config-preloaded",
   "settings--sandboxing-allowlist",
   "settings--sandboxing-panel",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index ce6f795941..b1adf20541 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -11,11 +11,13 @@ import {
   onCleanup,
   type Component,
   type JSX,
+  type Setter,
 } from "solid-js"
 import type {
   AgentManagerRepoInfoMessage,
   AgentManagerWorktreeSetupMessage,
   AgentManagerStateMessage,
+  ExtensionMessage,
   AgentManagerKeybindingsMessage,
   AgentManagerMultiVersionProgressMessage,
   AgentManagerSendInitialMessage,
@@ -23,9 +25,9 @@ import type {
   AgentManagerWorktreeDiffMessage,
   AgentManagerWorktreeDiffFileMessage,
   AgentManagerWorktreeDiffLoadingMessage,
+  AgentManagerWorktreeDiffNoticeMessage,
+  AgentManagerDiffBranchesMessage,
   AgentManagerApplyWorktreeDiffResultMessage,
-  AgentManagerApplyWorktreeDiffStatus,
-  AgentManagerApplyWorktreeDiffConflict,
   AgentManagerWorktreeStatsMessage,
   AgentManagerLocalStatsMessage,
   WorktreeFileDiff,
@@ -35,40 +37,28 @@ import type {
   RunStatus,
   PRStatus,
   AgentManagerPRStatusMessage,
+  AgentManagerProjectsMessage,
+  AgentProjectSnapshot,
   ManagedSessionState,
   SectionState,
   SessionInfo,
   SessionCreatedMessage,
   BranchInfo,
+  TerminalDestination,
 } from "../src/types/messages"
 import { IndexingProvider } from "../src/context/indexing"
-import {
-  DragDropProvider,
-  DragDropSensors,
-  DragOverlay,
-  SortableProvider,
-  closestCenter,
-  createSortable,
-} from "@thisbeyond/solid-dnd"
+import {} from "@thisbeyond/solid-dnd"
 import type { DragEvent } from "@thisbeyond/solid-dnd"
-import { ThemeProvider } from "@kilocode/kilo-ui/theme"
-import { DialogProvider, useDialog } from "@kilocode/kilo-ui/context/dialog"
+import { useDialog } from "@kilocode/kilo-ui/context/dialog"
 import { Dialog } from "@kilocode/kilo-ui/dialog"
-import { DropdownMenu } from "@kilocode/kilo-ui/dropdown-menu"
-import { MarkedProvider } from "@kilocode/kilo-ui/context/marked"
-import { CodeComponentProvider } from "@kilocode/kilo-ui/context/code"
-import { DiffComponentProvider } from "@kilocode/kilo-ui/context/diff"
-import { FileComponentProvider } from "@kilocode/kilo-ui/context/file"
-import { Code } from "@kilocode/kilo-ui/code"
-import { Diff } from "@kilocode/kilo-ui/diff"
-import { File } from "@kilocode/kilo-ui/file"
-import { Toast, showToast } from "@kilocode/kilo-ui/toast"
+import { showToast } from "@kilocode/kilo-ui/toast"
 import { ResizeHandle } from "@kilocode/kilo-ui/resize-handle"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Button } from "@kilocode/kilo-ui/button"
 import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
+import { Popover } from "@kilocode/kilo-ui/popover"
 import { VSCodeProvider, useVSCode } from "../src/context/vscode"
 import { ServerProvider } from "../src/context/server"
 import { ProviderProvider } from "../src/context/provider"
@@ -82,11 +72,24 @@ import { MemoryProvider } from "../src/context/memory"
 import { SessionProvider, useSession } from "../src/context/session"
 import { AgentRequirementsProvider } from "../src/context/agent-requirements"
 import { WorktreeModeProvider } from "../src/context/worktree-mode"
+import { ProviderShell } from "../src/context/provider-shell"
 import { ChatView } from "../src/components/chat"
-import { SpeechToTextPrewarm } from "../src/components/speech-to-text/SpeechToTextPrewarm"
 import HistoryView from "../src/components/history/HistoryView"
 import { NewWorktreeDialog } from "./NewWorktreeDialog"
-import { DataBridge, MermaidDownloadBridge } from "../src/App"
+import { ProjectList } from "./ProjectList"
+import { SidebarBody } from "./SidebarBody"
+import { TabBar } from "./TabBar"
+import { createProjectLive } from "./project/live"
+import { createProjectSessionsLive } from "./project/sessions-live"
+import { applyProjectSelection, createTargetRememberer } from "./project/selection"
+import { createLocalSessions, persistLocalTabs } from "./project/local-tabs"
+import { createProjectRegistry, type PersistedProjectTabs } from "./project/registry"
+import type { WorktreeBusyState } from "./project/store"
+import { rememberTarget, restoreProjectTarget } from "./project/restore"
+import { createProjectStateRouter } from "./project/state"
+import { applyRunStatus } from "./project/run-status"
+import { selectLocalAction, selectWorktreeAction } from "./selection-actions"
+import { DataBridge } from "../src/App"
 import { LanguageBridge } from "../src/context/language-bridge"
 import { useLanguage } from "../src/context/language"
 import { createTabFocus } from "../src/utils/tab-navigation"
@@ -99,6 +102,7 @@ import {
   focusChatSearch,
   LOCAL,
 } from "./navigate"
+import { createProjectNav } from "./project-nav"
 import {
   addPendingTab as addLocalPendingTab,
   nextTabAfterClose,
@@ -126,23 +130,25 @@ import {
   createTerminalHandlers,
   createTerminalMessageHandler,
   createSideTerminal,
+  createAmbientSetup,
+  hasSetupTerminal,
+  showTerminalStack,
+  readSavedDestination,
+  resolveRunScriptRequest,
+  resolveVscodeTerminalRequest,
 } from "./terminal"
 import { focusCurrentTab, renderTab, renderTerminalLayer, renderNewTabButton } from "./tab-rendering"
 import { useTabScroll } from "./tab-scroll"
 import { DiffPanel } from "./DiffPanel"
 import { createRevertFile } from "./revert-file"
 import { FullScreenDiffView } from "../diff-viewer/FullScreenDiffView"
-import { ApplyDialog } from "./ApplyDialog"
-import { groupApplyConflicts } from "./apply-conflicts"
+import { createApplyToLocal } from "./apply-to-local"
+import { createWorktreeDiffs, wireDiffId } from "./worktree-diffs"
 import type { ReviewComment } from "../diff-viewer/review-comments"
 import { clearReviewComposer, createReviewComposer } from "../diff-viewer/review-annotations"
 import type { SidebarSearchMenuRef } from "./SidebarSearchMenu"
 import { createSidebarSearch, type SidebarSearchItem } from "./sidebar-search"
-import { WorktreeSectionActions } from "./WorktreeSectionActions"
 import { BranchSelect } from "../src/components/shared/BranchSelect"
-import { WorktreeItem } from "./WorktreeItem"
-import { UnassignedSessionsSection } from "./UnassignedSessionsSection"
-import SectionHeader from "./SectionHeader"
 import { randomColor } from "./section-colors"
 import { createNewTaskDrafts } from "./new-task-drafts"
 import {
@@ -154,9 +160,12 @@ import {
   isGroupEnd,
   type TopLevelItem,
 } from "./section-helpers"
-import { sectionAwareDetector } from "./section-dnd"
-import { ConstrainDragXAxis } from "./constrain-drag-x"
+import {} from "./section-dnd"
+import {} from "./constrain-drag-x"
 import { mergeWorktreeDiffs } from "../diff-viewer/diff-state"
+import { DiffScopeControls } from "../diff-viewer/DiffScopeControls"
+import { scopeCapabilities } from "./diff-scope-state"
+import { createDiffReviewScope } from "./diff-review-scope"
 import { initialMessage, seedInitialVariant } from "./initial-message"
 import { createMarkdownRender } from "./review-preferences"
 import { createSidebarCollapse } from "./sidebar-collapse"
@@ -178,17 +187,6 @@ interface SetupState {
   errorCode?: string
 }
 
-interface WorktreeBusyState {
-  reason: "setting-up" | "deleting"
-  message?: string
-  branch?: string
-}
-
-interface ApplyState {
-  status: AgentManagerApplyWorktreeDiffStatus
-  message: string
-  conflicts: AgentManagerApplyWorktreeDiffConflict[]
-}
 /** Sidebar selection: LOCAL for local repo, worktree ID for a worktree, or null for an unassigned session. */
 type SidebarSelection = typeof LOCAL | string | null
 type SidePanel = "diff" | "pr" | "terminal" | null
@@ -234,18 +232,34 @@ const AgentManagerContent: Component = () => {
   const [kb, setKb] = createSignal<Record<string, string>>(defaultBindings)
 
   const [setup, setSetup] = createSignal<SetupState>({ active: false, message: "" })
-  const [worktrees, setWorktrees] = createSignal<WorktreeState[]>([])
-  const [managedSessions, setManagedSessions] = createSignal<ManagedSessionState[]>([])
+  const worktrees = () => registry.active().worktrees()
+  const setWorktrees = (v: Parameters<Setter<WorktreeState[]>>[0]) => registry.active().setWorktrees(v)
+  const managedSessions = () => registry.active().managedSessions()
+  const setManagedSessions = (v: Parameters<Setter<ManagedSessionState[]>>[0]) =>
+    registry.active().setManagedSessions(v)
   const [selection, setSelection] = createSignal<SidebarSelection>(LOCAL)
   const metrics = tracker(vscode)
   const [repoBranch, setRepoBranch] = createSignal<string | undefined>()
-  const [busyWorktrees, setBusyWorktrees] = createSignal<Map<string, WorktreeBusyState>>(new Map())
-  const [staleWorktreeIds, setStaleWorktreeIds] = createSignal<Set<string>>(new Set())
+  const busyWorktrees = () => registry.active().busy()
+  const setBusyWorktrees: Setter<Map<string, WorktreeBusyState>> = (v) => registry.active().setBusy(v)
+  const staleWorktreeIds = () => registry.active().staleWorktreeIds()
+  const setStaleWorktreeIds: Setter<Set<string>> = (v) => registry.active().setStaleWorktreeIds(v)
+  /** True while the ⌘/Ctrl jump modifier is held — reveals the ⌘1-9 badges on all sidebar items. */
+  const [held, setHeld] = createSignal(false)
   const [worktreesLoaded, setWorktreesLoaded] = createSignal(false)
   const [sessionsLoaded, setSessionsLoaded] = createSignal(false)
   const [isGitRepo, setIsGitRepo] = createSignal(true)
   const [repoDetectedBranch, setRepoDetectedBranch] = createSignal<string | undefined>()
-  const [defaultBaseBranch, setDefaultBaseBranch] = createSignal<string | undefined>()
+  const defaultBaseBranch = () => registry.active().defaultBaseBranch()
+  const setDefaultBaseBranch = (v: Parameters<Setter<string | undefined>>[0]) =>
+    registry.active().setDefaultBaseBranch(v)
+  const [projectList, setProjectList] = createSignal<AgentProjectSnapshot[]>([])
+  const [multiProject, setMultiProject] = createSignal(false)
+  const [currentProjectId, setCurrentProjectId] = createSignal<string | undefined>()
+  const [projectStates, setProjectStates] = createSignal<Record<string, AgentManagerStateMessage>>({})
+  const activeProjectId = () => projectList().find((p) => p.active)?.id ?? currentProjectId()
+  const isActivePayload = (pid: string | undefined) =>
+    projectList().length === 0 || pid === undefined || pid === activeProjectId()
 
   const repoDefaultBranch = () => defaultBaseBranch() ?? repoDetectedBranch() ?? "main"
   const hasConfiguredBranch = () => !!defaultBaseBranch()
@@ -255,13 +269,20 @@ const AgentManagerContent: Component = () => {
   const MAX_SIDEBAR_WIDTH_RATIO = 0.4
 
   // Recover persisted local session IDs from webview state
-  const persisted = vscode.getState<{ localSessionIDs?: string[]; sidebarWidth?: number }>()
-  const [localSessionIDs, setLocalSessionIDs] = createSignal<string[]>(persisted?.localSessionIDs ?? [])
+  const persisted = vscode.getState<PersistedProjectTabs & { sidebarWidth?: number }>()
+  const registry = createProjectRegistry({
+    persisted: persisted ?? {},
+    activeId: () => currentProjectId() ?? "single",
+  })
+  const localSessionIDs = () => registry.active().tabs.ids()
+  const setLocalSessionIDs = (next: string[] | ((prev: string[]) => string[])) => registry.active().tabs.set(next)
   /** Remove a session ID from the local tab (no-op if absent). */
   const evictLocal = (sid: string) =>
     setLocalSessionIDs((prev) => (prev.includes(sid) ? prev.filter((id) => id !== sid) : prev))
   const [sidebarWidth, setSidebarWidth] = createSignal(persisted?.sidebarWidth ?? DEFAULT_SIDEBAR_WIDTH)
-  const [sessionsCollapsed, setSessionsCollapsed] = createSignal(true)
+  const sessionsCollapsed = () => registry.active().sessionsCollapsed() ?? true
+  const setSessionsCollapsed = (v: Parameters<Setter<boolean>>[0]) =>
+    registry.active().setSessionsCollapsed(typeof v === "function" ? v(sessionsCollapsed()) : v)
   const toggleSessions = () => {
     const collapsed = !sessionsCollapsed()
     setSessionsCollapsed(collapsed)
@@ -271,7 +292,8 @@ const AgentManagerContent: Component = () => {
   const sidebarCollapsed = sidebar.collapsed
   const expandSidebar = sidebar.expand
   const toggleSidebar = sidebar.toggle
-  const [sections, setSections] = createSignal<SectionState[]>([])
+  const sections = () => registry.active().sections()
+  const setSections = (v: Parameters<Setter<SectionState[]>>[0]) => registry.active().setSections(v)
 
   // rAF coalescing for resize handlers — at most one signal write per frame
   let sidebarRaf: number | undefined
@@ -282,9 +304,11 @@ const AgentManagerContent: Component = () => {
   const [history, setHistory] = createSignal(false)
   const [sidePanel, setSidePanel] = createSignal<SidePanel>(null)
   const diffOpen = () => sidePanel() === "diff"
-  const [diffDatas, setDiffDatas] = createSignal<Record<string, WorktreeFileDiff[]>>({})
-  const [diffLoading, setDiffLoading] = createSignal(false)
-  const [diffFileLoading, setDiffFileLoading] = createSignal<Record<string, Record<string, true>>>({})
+  const diffs = createWorktreeDiffs(vscode)
+  const diffDatas = diffs.diffDatas
+  const diffLoading = diffs.diffLoading
+  const setDiffLoading = diffs.setDiffLoading
+  const diffNotices = diffs.diffNotices
   // The diff and terminal panels each remember their own width: a diff
   // benefits from half the window, a terminal only needs about a third.
   const TERMINAL_MIN_WIDTH = 360
@@ -320,31 +344,51 @@ const AgentManagerContent: Component = () => {
   const [reviewDiffStyle, setReviewDiffStyle] = createSignal<"unified" | "split">("unified")
   const markdown = createMarkdownRender(vscode)
   // Per-worktree git stats (diff additions/deletions, commits missing from origin)
-  const [worktreeStats, setWorktreeStats] = createSignal<Record<string, WorktreeGitStats>>({})
+  const worktreeStats = () => registry.active().worktreeStats()
 
   // Per-worktree PR status data
-  const [prStatuses, setPrStatuses] = createSignal<Record<string, PRStatus | null>>({})
+  const prStatuses = () => registry.active().prStatuses()
 
-  const [runStatuses, setRunStatuses] = createSignal<Record<string, RunStatus>>({})
-  const [runScriptConfigured, setRunScriptConfigured] = createSignal(false)
+  const runStatuses = () => registry.active().runStatuses()
+  const setRunStatuses: Setter<Record<string, RunStatus>> = (v) => registry.active().setRunStatuses(v)
+  const runScriptConfigured = () => registry.active().runScriptConfigured()
+  const setRunScriptConfigured = (v: Parameters<Setter<boolean>>[0]) => registry.active().setRunScriptConfigured(v)
 
   // Local repo git stats (branch name, diff additions/deletions, commits)
-  const [localStats, setLocalStats] = createSignal<LocalGitStats | undefined>()
+  const localStats = () => registry.active().localStats()
 
-  // Per-worktree apply-to-local status
-  const [applyStates, setApplyStates] = createSignal<Record<string, ApplyState>>({})
-  const [applyTarget, setApplyTarget] = createSignal<string | undefined>()
-  const [applySelectedFiles, setApplySelectedFiles] = createSignal<string[]>([])
-  const [applySelectionTouched, setApplySelectionTouched] = createSignal(false)
+  const projectLive = createProjectLive({
+    ensure: (pid) => (pid ? registry.ensure(pid) : registry.active()),
+    active: isActivePayload,
+    branch: (branch) => setRepoBranch(branch),
+  })
 
   const PENDING_PREFIX = "pending:"
   const closedDrafts = new Set<string>()
   const [activePendingId, setActivePendingId] = createSignal<string | undefined>()
 
-  // Per-sidebar-context terminal state. `terms.activeId` holds the id
-  // of the focused terminal tab, if any — takes precedence over
-  // session/pending/review when deriving the visible tab.
-  const terms = createTerminalState(selection)
+  /** Namespace key so worktree/local ids from different projects never collide. */
+  const nsKey = (sel: string) => `${currentProjectId() ?? "single"}:${sel}`
+
+  // Per-sidebar-context terminal state. `terms.activeId` holds the id of the focused
+  // terminal tab, if any — takes precedence over session/pending/review when deriving
+  // the visible tab. Contexts are project-keyed: every project reuses LOCAL and ids like "0".
+  const terms = createTerminalState(() => {
+    const sel = selection()
+    return sel === null ? null : nsKey(sel)
+  })
+
+  // Ambient setup reveal restores the panel after success unless the user engaged.
+  const ambientSetup = createAmbientSetup({
+    terms,
+    selection: () => {
+      const sel = selection()
+      return sel === null ? null : nsKey(sel)
+    },
+    sidePanel,
+    setSidePanel,
+  })
+  const cancelAmbientSetup = ambientSetup.cancel
 
   // Inline delete confirmation: tracks which worktree is awaiting a second click/press
   const [pendingDelete, setPendingDelete] = createSignal<string | null>(null)
@@ -357,8 +401,9 @@ const AgentManagerContent: Component = () => {
   createEffect(on(selection, () => clearReviewComposer(reviewComposer), { defer: true }))
   onCleanup(() => clearTimeout(pendingDeleteTimer))
 
-  // Per-context tab memory: maps sidebar selection key -> last active session/pending ID
-  const [tabMemory, setTabMemory] = createSignal<Record<string, string>>({})
+  // Per-context tab memory lives in the active project's store: maps sidebar
+  // selection ("local" or a worktree id) -> last active session/pending ID
+  const tabMemory = () => registry.active().tabMemory.all()
 
   const reviewOpen = createMemo(() => {
     const sel = selection()
@@ -391,172 +436,18 @@ const AgentManagerContent: Component = () => {
     setReviewCommentsByContext((prev) => ({ ...prev, [sel]: comments }))
   }
 
-  const applyStateForSelection = createMemo(() => {
-    const sel = selection()
-    if (!sel || sel === LOCAL) return undefined
-    return applyStates()[sel]
+  const apply = createApplyToLocal({
+    vscode,
+    dialog,
+    t,
+    selection,
+    local: LOCAL,
+    worktrees,
+    diffDatas,
+    diffLoading,
+    track: metrics.track,
   })
-
-  const resolveWorktreeSessionId = (worktreeId: string) => {
-    const id = session.currentSessionID()
-    if (id) {
-      const current = managedSessions().find((entry) => entry.id === id)
-      if (current?.worktreeId === worktreeId) return id
-    }
-    return managedSessions().find((entry) => entry.worktreeId === worktreeId)?.id
-  }
-
-  const applyTargetSessionId = createMemo(() => {
-    const target = applyTarget()
-    if (!target) return undefined
-    return resolveWorktreeSessionId(target)
-  })
-
-  const applyDiffs = createMemo(() => {
-    const target = applyTarget()
-    if (!target) return [] as WorktreeFileDiff[]
-    const data = diffDatas()
-    const current = applyTargetSessionId()
-    if (current && data[current]) return data[current]!
-    const ids = managedSessions()
-      .filter((entry) => entry.worktreeId === target)
-      .map((entry) => entry.id)
-    for (const id of ids) {
-      if (data[id]) return data[id]!
-    }
-    return [] as WorktreeFileDiff[]
-  })
-
-  const applyStateForTarget = createMemo(() => {
-    const target = applyTarget()
-    if (!target) return undefined
-    return applyStates()[target]
-  })
-
-  const applyBusyForTarget = createMemo(() => {
-    const state = applyStateForTarget()
-    if (!state) return false
-    return state.status === "checking" || state.status === "applying"
-  })
-
-  const applySelectedSet = createMemo(() => new Set(applySelectedFiles()))
-
-  const applySelectionStats = createMemo(() => {
-    const set = applySelectedSet()
-    const selected = applyDiffs().filter((diff) => set.has(diff.file))
-    const additions = selected.reduce((sum, diff) => sum + diff.additions, 0)
-    const deletions = selected.reduce((sum, diff) => sum + diff.deletions, 0)
-    return {
-      total: applyDiffs().length,
-      selected: selected.length,
-      additions,
-      deletions,
-    }
-  })
-
-  const applyHasSelection = createMemo(() => applySelectionStats().selected > 0)
-
-  const applyConflictRows = createMemo(() => groupApplyConflicts(applyStateForTarget()?.conflicts ?? []))
-
-  const applyToLocal = (worktreeId: string, selectedFiles: string[]) => {
-    setApplyStates((prev) => ({
-      ...prev,
-      [worktreeId]: {
-        status: "checking",
-        message: t("agentManager.apply.checking"),
-        conflicts: [],
-      },
-    }))
-    vscode.postMessage({ type: "agentManager.applyWorktreeDiff", worktreeId, selectedFiles })
-  }
-
-  const resetApplyDialog = () => {
-    setApplyTarget(undefined)
-    setApplySelectedFiles([])
-    setApplySelectionTouched(false)
-  }
-
-  const closeApplyDialog = () => {
-    resetApplyDialog()
-    dialog.close()
-  }
-
-  const applySelectAll = () => {
-    setApplySelectionTouched(true)
-    setApplySelectedFiles(applyDiffs().map((diff) => diff.file))
-  }
-
-  const applySelectNone = () => {
-    setApplySelectionTouched(true)
-    setApplySelectedFiles([])
-  }
-
-  const applyToggleFile = (file: string, checked: boolean) => {
-    setApplySelectionTouched(true)
-    setApplySelectedFiles((prev) => {
-      if (checked) {
-        if (prev.includes(file)) return prev
-        const set = new Set(prev)
-        set.add(file)
-        return applyDiffs()
-          .map((diff) => diff.file)
-          .filter((path) => set.has(path))
-      }
-      if (!prev.includes(file)) return prev
-      return prev.filter((path) => path !== file)
-    })
-  }
-
-  const triggerApply = () => {
-    const target = applyTarget()
-    if (!target) return
-    if (!applyHasSelection()) return
-    if (applyBusyForTarget()) return
-    metrics.track("apply_to_local", "apply_dialog", { fileCount: applySelectedFiles().length })
-    applyToLocal(target, applySelectedFiles())
-  }
-
-  const openApplyDialog = () => {
-    const sel = selection()
-    if (!sel || sel === LOCAL) return
-    setApplyStates((prev) => {
-      if (!prev[sel]) return prev
-      const next = { ...prev }
-      delete next[sel]
-      return next
-    })
-    setApplyTarget(sel)
-    setApplySelectionTouched(false)
-    setApplySelectedFiles([])
-    const sid = resolveWorktreeSessionId(sel)
-    if (sid) vscode.postMessage({ type: "agentManager.requestWorktreeDiff", sessionId: sid })
-
-    setApplySelectedFiles(applyDiffs().map((diff) => diff.file))
-
-    dialog.show(
-      () => (
-        <ApplyDialog
-          diffs={applyDiffs()}
-          loading={diffLoading()}
-          selectedFiles={applySelectedSet()}
-          selectedCount={applySelectionStats().selected}
-          additions={applySelectionStats().additions}
-          deletions={applySelectionStats().deletions}
-          busy={applyBusyForTarget()}
-          hasSelection={applyHasSelection()}
-          status={applyStateForTarget()?.status}
-          message={applyStateForTarget()?.message}
-          conflictRows={applyConflictRows()}
-          onSelectAll={applySelectAll}
-          onSelectNone={applySelectNone}
-          onToggleFile={applyToggleFile}
-          onApply={triggerApply}
-          onClose={closeApplyDialog}
-        />
-      ),
-      resetApplyDialog,
-    )
-  }
+  const openApplyDialog = apply.openApplyDialog
 
   const openWorktreeDirectory = () => {
     const sel = selection()
@@ -572,47 +463,22 @@ const AgentManagerContent: Component = () => {
     vscode.postMessage({ type: "agentManager.openPR", worktreeId: sel })
   }
 
-  const runWorktree = (id: string) => {
+  const runWorktree = (id: string, destination: TerminalDestination) => {
     const state = runStatuses()[id]?.state ?? "idle"
     if (state === "running" || state === "stopping") {
       vscode.postMessage({ type: "agentManager.stopRunScript", worktreeId: id })
       return
     }
-    vscode.postMessage({ type: "agentManager.runScript", worktreeId: id })
+    vscode.postMessage(resolveRunScriptRequest(id, destination))
   }
 
   const configureRunScript = () => vscode.postMessage({ type: "agentManager.configureRunScript" })
 
   const runSelected = () => {
     const sel = selection()
-    if (sel) runWorktree(sel)
+    if (sel) runWorktree(sel, sideCtl.destination())
   }
 
-  createEffect(
-    on(
-      () => [applyTarget(), applyDiffs(), applySelectionTouched()] as const,
-      ([target, diffs, touched]) => {
-        if (!target) return
-        const files = diffs.map((diff) => diff.file)
-        if (files.length === 0) {
-          if (!touched) setApplySelectedFiles([])
-          return
-        }
-
-        if (!touched) {
-          setApplySelectedFiles(files)
-          return
-        }
-
-        const current = applySelectedFiles()
-        const set = new Set(current)
-        const next = files.filter((file) => set.has(file))
-        const same = next.length === current.length && next.every((file, index) => file === current[index])
-        if (!same) setApplySelectedFiles(next)
-      },
-    ),
-  )
-
   const isPending = (id: string) => id.startsWith(PENDING_PREFIX)
   reportRemoteSessions(vscode, localSessionIDs, managedSessions, isPending)
 
@@ -626,9 +492,11 @@ const AgentManagerContent: Component = () => {
 
   const releaseTabs = () => setTabWidths(false)
   // Tab ordering: context key → ordered session ID array (recovered from extension state)
-  const [worktreeTabOrder, setWorktreeTabOrder] = createSignal<Record<string, string[]>>({})
+  const worktreeTabOrder = () => registry.active().tabOrder()
+  const setWorktreeTabOrder: Setter<Record<string, string[]>> = (v) => registry.active().setTabOrder(v)
   // Sidebar worktree order (persisted to extension state)
-  const [sidebarWorktreeOrder, setSidebarWorktreeOrder] = createSignal<string[]>([])
+  const sidebarWorktreeOrder = () => registry.active().worktreeOrder()
+  const setSidebarWorktreeOrder = (v: Parameters<Setter<string[]>>[0]) => registry.active().setWorktreeOrder(v)
   const [draggingWorktree, setDraggingWorktree] = createSignal<string | undefined>()
   const [renamingSection, setRenamingSection] = createSignal<string | null>(null)
   let pendingNewSection = false
@@ -648,7 +516,7 @@ const AgentManagerContent: Component = () => {
     sessions: session.sessions,
     managedSessions,
     reviewOpenByContext,
-    terminalIdsFor: (key) => terms.forSelection(key).map((t) => t.id),
+    terminalIdsFor: (key) => terms.forSelection(nsKey(key)).map((t) => t.id),
   })
   const appendToTabOrder = tabOrderSync.append
 
@@ -674,30 +542,23 @@ const AgentManagerContent: Component = () => {
     if (pending && pending === active) setActivePendingId(undefined)
   }
 
-  // Persist local session IDs and sidebar width to webview state for recovery (exclude pending tabs).
-  // Debounced to avoid serializing state on every pixel during resize drag.
-  let persistTimer: ReturnType<typeof setTimeout> | undefined
-  createEffect(() => {
-    // Read signals eagerly so Solid tracks them as dependencies
-    const ids = localSessionIDs().filter((id) => !isPending(id))
-    const width = sidebarWidth()
-    clearTimeout(persistTimer)
-    persistTimer = setTimeout(() => {
-      const prev = vscode.getState<Record<string, unknown>>() ?? {}
-      vscode.setState({ ...prev, localSessionIDs: ids, sidebarWidth: width })
-    }, 300)
+  persistLocalTabs({
+    tabs: () => {
+      registry.version()
+      return Object.fromEntries(registry.all().map((store) => [store.id, store.tabs.durable(isPending)]))
+    },
+    key: () => registry.active().id,
+    width: sidebarWidth,
+    get: () => vscode.getState<Record<string, unknown>>(),
+    set: (value) => vscode.setState(value),
   })
-  onCleanup(() => clearTimeout(persistTimer))
 
   // Save the currently active tab for the current sidebar context before switching away
   const saveTabMemory = () => {
     const sel = selection()
     if (sel === null) return
-    const key = sel === LOCAL ? LOCAL : sel
     const active = visibleTabId()
-    if (active) {
-      setTabMemory((prev) => (prev[key] === active ? prev : { ...prev, [key]: active }))
-    }
+    if (active) registry.active().tabMemory.set(sel === LOCAL ? LOCAL : sel, active)
   }
 
   // Invalidate local session IDs if they no longer exist (preserve pending tabs)
@@ -728,14 +589,6 @@ const AgentManagerContent: Component = () => {
       if (Object.keys(next).length === Object.keys(prev).length) return prev
       return next
     })
-    setApplyStates((prev) => {
-      const next = Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id)))
-      if (Object.keys(next).length === Object.keys(prev).length) return prev
-      return next
-    })
-
-    const target = applyTarget()
-    if (target && !ids.has(target)) closeApplyDialog()
   })
 
   const worktreeSessionIds = createMemo(
@@ -754,22 +607,21 @@ const AgentManagerContent: Component = () => {
     filterUnassignedSessions(session.sessions(), worktreeSessionIds(), localSet()),
   )
 
-  // Local sessions (resolved from session list + pending tabs, in insertion order)
-  const localSessions = createMemo((): SessionInfo[] => {
-    const ids = localSessionIDs()
-    const all = session.sessions()
-    const lookup = new Map(all.map((s) => [s.id, s]))
-    const result: SessionInfo[] = []
-    const now = new Date().toISOString()
-    for (const id of ids) {
-      const real = lookup.get(id)
-      if (real && isKnownRootSession(real)) {
-        result.push(real)
-      } else if (isPending(id)) {
-        result.push({ id, title: t("agentManager.session.newSession"), createdAt: now, updatedAt: now })
-      }
-    }
-    return result
+  const projectSessionsLive = createProjectSessionsLive({
+    base: projectLive.sessions,
+    pid: currentProjectId,
+    enabled: multiProject,
+    store: session.sessions,
+    managed: managedSessions,
+    locals: localSet,
+  })
+
+  const localSessions = createLocalSessions({
+    ids: localSessionIDs,
+    sessions: session.sessions,
+    pending: isPending,
+    root: isKnownRootSession,
+    title: () => t("agentManager.session.newSession"),
   })
 
   // Oldest-first sort before applyTabOrder — worktree label and tab bar must agree on "first session".
@@ -819,9 +671,14 @@ const AgentManagerContent: Component = () => {
     return false
   })
 
+  const showDetailStack = createMemo(() => showTerminalStack(history(), selection()))
+
   const overlay = createMemo((): SetupState | null => {
     const state = setup()
     const sel = selection()
+    // A live Setup script terminal shows progress and failures on its own
+    // tab; never cover it with the blocking overlay.
+    if (typeof sel === "string" && sel !== LOCAL && hasSetupTerminal(nsKey(sel), terms.sides())) return null
     if (state.active && (!state.worktreeId || sel === state.worktreeId)) return state
     if (typeof sel !== "string" || sel === LOCAL) return null
     const busy = busyWorktrees().get(sel)
@@ -834,6 +691,15 @@ const AgentManagerContent: Component = () => {
     }
   })
 
+  /** The selected worktree is provisioning: block session CTAs, keep selection put. */
+  const settingUpSelection = createMemo(() => {
+    const sel = selection()
+    if (typeof sel !== "string" || sel === LOCAL) return undefined
+    const busy = busyWorktrees().get(sel)
+    if (busy?.reason !== "setting-up") return undefined
+    return busy
+  })
+
   createEffect(() => {
     const sel = selection()
     if (sel === null) {
@@ -987,22 +853,24 @@ const AgentManagerContent: Component = () => {
     if (el instanceof HTMLElement) scrollIntoView(el)
   }
 
-  // Navigate sidebar items with arrow keys (uses visual order from sidebarOrder)
-  const navigate = (direction: "up" | "down") => {
-    const flat = sidebarOrder()
-    if (flat.length === 0) return
-    const current = selection() ?? session.currentSessionID()
-    const idx = current ? flat.findIndex((f) => f.id === current) : -1
-    const next = direction === "up" ? idx - 1 : idx + 1
-    if (next < 0 || next >= flat.length) return
-    focusSidebarItem(flat[next]!)
-  }
-
-  // Jump to sidebar item by 0-based index into sidebarOrder (⌘1 = index 0 = LOCAL, ⌘2 = index 1, etc.)
-  const jumpToItem = (index: number) => {
-    const item = sidebarOrder()[index]
-    if (item) focusSidebarItem(item)
-  }
+  // Sidebar previous/next + numeric-shortcut nav. Multi-project mode traverses
+  // every expanded project and atomically activates via activateSelection;
+  // single-project mode keeps the legacy in-process path.
+  const projectNav = createProjectNav(
+    {
+      multiProject,
+      sidebarOrder,
+      focus: focusSidebarItem,
+      projects: projectList,
+      states: projectStates,
+      sessions: projectLive.sessions,
+      activeProjectId,
+      selection,
+      currentSessionID: session.currentSessionID,
+    },
+    (target) => vscode.postMessage({ type: "agentManager.activateSelection", target }),
+    scrollIntoView,
+  )
 
   // Navigate tabs with Cmd+Alt+Left/Right
   const navigateTab = (direction: "left" | "right") => {
@@ -1015,41 +883,27 @@ const AgentManagerContent: Component = () => {
     focusTab(ids[next]!)
   }
 
-  const selectLocal = () => {
-    saveTabMemory()
-    setReviewActive(false)
-    setSelection(LOCAL)
-    vscode.postMessage({ type: "agentManager.requestRepoInfo" })
-    const locals = localSessions()
-    const remembered = tabMemory()[LOCAL]
-    if (terms.hasRemembered(LOCAL, remembered)) return termHandlers.activate(remembered!)
-    terms.setActiveId(undefined)
-    const target = remembered ? locals.find((s) => s.id === remembered) : undefined
-    const fallback = target ?? locals[0]
-    if (fallback && !isPending(fallback.id)) {
-      setActivePendingId(undefined)
-      session.selectSession(fallback.id)
-    } else {
-      setActivePendingId(fallback && isPending(fallback.id) ? fallback.id : undefined)
-      session.clearCurrentSession()
-      vscode.postMessage({ type: "agentManager.showExistingLocalTerminal" })
-    }
-    setReviewActive(remembered === REVIEW_TAB_ID && reviewOpenByContext()[LOCAL] === true)
+  const selectionDeps = {
+    saveTabMemory,
+    setReviewActive,
+    setSelection,
+    post: (msg: unknown) => vscode.postMessage(msg as never),
+    tabMemory,
+    terms,
+    activateTerminal: (id: string) => termHandlers.activate(id),
+    setActivePendingId,
+    selectSession: session.selectSession,
+    clearSession: session.clearCurrentSession,
+    resetSession: () => session.setCurrentSessionID(undefined),
+    isPending,
+    isReviewTab: (remembered: string | undefined, sel: string) =>
+      remembered === REVIEW_TAB_ID && reviewOpenByContext()[sel] === true,
   }
 
-  const selectWorktree = (worktreeId: string) => {
-    saveTabMemory()
-    setSelection(worktreeId)
-    const remembered = tabMemory()[worktreeId]
-    if (terms.hasRemembered(worktreeId, remembered)) return termHandlers.activate(remembered!)
-    terms.setActiveId(undefined)
-    const rich = sessionsForWorktree(worktreeId)
-    const target = remembered ? rich.find((s) => s.id === remembered) : undefined
-    const fallback = target ?? rich[0]
-    if (fallback) session.selectSession(fallback.id)
-    else session.setCurrentSessionID(undefined)
-    setReviewActive(remembered === REVIEW_TAB_ID && reviewOpenByContext()[worktreeId] === true)
-  }
+  const selectLocal = () => selectLocalAction(selectionDeps, localSessions())
+
+  const selectWorktree = (worktreeId: string) =>
+    selectWorktreeAction(selectionDeps, worktreeId, sessionsForWorktree(worktreeId))
 
   const addSessionToCurrentWorktree = (sid: string) => {
     const sel = selection()
@@ -1114,19 +968,119 @@ const AgentManagerContent: Component = () => {
     })
   }
 
-  const syncRunStatuses = (items: RunStatus[] = []) => {
-    const map: Record<string, RunStatus> = {}
-    for (const item of items) map[item.worktreeId] = item
-    setRunStatuses(map)
+  const router = createProjectStateRouter({
+    catalog: projectList,
+    apply: (state) => applyActiveState(state),
+    pruneLive: (ids) => projectLive.prune(ids),
+  })
+
+  /** Store the project catalog pushed by the extension and drop states of removed projects. */
+  const applyProjects = (msg: ExtensionMessage) => {
+    if (msg.type !== "agentManager.projects") return
+    const ev = msg as AgentManagerProjectsMessage
+    setMultiProject(ev.multiProject)
+    setProjectList(ev.projects)
+    const ids = new Set(ev.projects.map((p) => p.id))
+    setProjectStates((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))))
+    router.routeCatalog(ev.projects)
   }
 
+  /** Apply one project state payload. Background payloads only feed their accordion summary. */
+  const applyState = (msg: ExtensionMessage) => {
+    if (msg.type !== "agentManager.state") return
+    const state = msg as AgentManagerStateMessage
+    const pid = state.projectId
+    if (pid) setProjectStates((prev) => ({ ...prev, [pid]: state }))
+    const store = pid ? registry.ensure(pid) : registry.active()
+    // A freshly created section needs the previous list to detect the new id,
+    // so it is handled before the data write below replaces it.
+    if (pendingNewSection && isActivePayload(pid)) {
+      const prev = new Set(store.sections().map((s) => s.id))
+      const created = (state.sections ?? []).find((s) => !prev.has(s.id))
+      pendingNewSection = false
+      if (created) setRenamingSection(created.id)
+    }
+    // Data lands in the payload's own store unconditionally; the router
+    // handles only the active-transition effects (selection/tab restore).
+    store.applyState(state)
+    router.routeState(state)
+  }
+
+  /** Apply the active-transition effects of a state payload (data already landed in the store). */
+  const applyActiveState = (state: AgentManagerStateMessage) => {
+    const switched = applyProjectSwitch(state)
+    if (state.isGitRepo !== undefined) setIsGitRepo(state.isGitRepo)
+    if (!worktreesLoaded()) setWorktreesLoaded(true)
+    // When not a git repo, also mark sessions as loaded since the Kilo
+    // server won't connect to send the sessionsLoaded message.
+    if (state.isGitRepo === false && !sessionsLoaded()) setSessionsLoaded(true)
+    if (state.reviewDiffStyle === "split" || state.reviewDiffStyle === "unified") {
+      setReviewDiffStyle(state.reviewDiffStyle)
+    }
+    markdown.setRender(state.reviewMarkdownRender === true)
+    const current = session.currentSessionID()
+    if (current && !settingUpSelection()) {
+      const ms = state.sessions.find((s) => s.id === current)
+      if (ms?.worktreeId) setSelection(ms.worktreeId)
+    }
+    // Restore local session IDs from persisted state (sessions with no worktreeId)
+    const restored = restoreTrackedTabs(
+      trackedSessionInventory(state.sessions, session.sessions()),
+      localSessionIDs(),
+      state.tabOrder?.[LOCAL],
+      isPending,
+      applyTabOrder,
+    )
+    if (restored) setLocalSessionIDs(restored)
+    ensurePendingTab(switched === "switched")
+    if (switched !== "same") {
+      restoreProjectTarget(state, {
+        selectLocal,
+        selectWorktree,
+        selectSession: session.selectSession,
+        focusManaged: focusManagedSession,
+        setSelection,
+        setActivePendingId,
+      })
+    }
+    // Recover sidebar collapsed state and mark hydrated so transitions enable
+    sidebar.hydrate(state.sidebarCollapsed)
+  }
+
+  /** Track project switches; full selection restore happens via restoreProjectTarget. */
+  const applyProjectSwitch = (state: AgentManagerStateMessage): "first" | "switched" | "same" => {
+    const pid = state.projectId
+    const previousProject = currentProjectId()
+    if (pid === previousProject) return "same"
+    setCurrentProjectId(pid)
+    if (previousProject === undefined) return "first"
+    setReviewActive(false)
+    setSidePanel(null)
+    return "switched"
+  }
+
+  /** Guarantee a fresh "New Session" tab after switching to a project with no local sessions. */
+  const ensurePendingTab = (switched: boolean) => {
+    if (switched && localSessionIDs().length === 0) addPendingTab()
+  }
+
+  createTargetRememberer({
+    pid: activeProjectId,
+    enabled: multiProject,
+    applied: currentProjectId,
+    selection,
+    owns: (sel) => worktrees().some((wt) => wt.id === sel),
+    sessionId: session.currentSessionID,
+    post: vscode.postMessage,
+  })
+
   onMount(() => {
     const handler = (event: MessageEvent) => {
       const msg = event.data
       if (msg?.type === "navigate" && msg.view === "history") return setHistory(true)
       if (msg?.type !== "action") return
-      if (msg.action === "sessionPrevious") navigate("up")
-      else if (msg.action === "sessionNext") navigate("down")
+      if (msg.action === "sessionPrevious") projectNav.step("up")
+      else if (msg.action === "sessionNext") projectNav.step("down")
       else if (msg.action === "tabPrevious") navigateTab("left")
       else if (msg.action === "tabNext") navigateTab("right")
       else if (msg.action === "search") {
@@ -1136,7 +1090,7 @@ const AgentManagerContent: Component = () => {
           requestAnimationFrame(() => sidebarSearchMenu?.open())
         }
       } else if (msg.action === "showTerminal") {
-        sideCtl.openPreferred("keyboard_shortcut")
+        if (!sideCtl.echo()) sideCtl.openPreferred("keyboard_shortcut")
       } else if (msg.action === "toggleDiff") {
         if (reviewActive()) {
           closeReviewTab()
@@ -1161,7 +1115,7 @@ const AgentManagerContent: Component = () => {
       else {
         // Handle jumpTo1 through jumpTo9
         const match = /^jumpTo([1-9])$/.exec(msg.action ?? "")
-        if (match) jumpToItem(parseInt(match[1]!) - 1)
+        if (match) projectNav.jump(parseInt(match[1]!) - 1)
       }
     }
     window.addEventListener("message", handler)
@@ -1194,6 +1148,13 @@ const AgentManagerContent: Component = () => {
     }
     window.addEventListener("keydown", preventDefaults, true)
 
+    // Cmd/Ctrl+/ toggles the terminal even when VS Code's webview keybinding
+    // forwarding drops the key before it reaches the workbench (reported with
+    // the prompt input focused). When forwarding does work, the extension
+    // echoes the shortcut back as an action message and sideCtl dedupes it.
+    const shortcut = (e: KeyboardEvent) => sideCtl.press(e)
+    window.addEventListener("keydown", shortcut, true)
+
     // Delete/Backspace on a selected worktree triggers inline delete confirmation.
     // Pressing the key twice in a row (within the 2500ms window) confirms the delete.
     const deleteKeyHandler = (e: KeyboardEvent) => {
@@ -1207,6 +1168,18 @@ const AgentManagerContent: Component = () => {
     }
     window.addEventListener("keydown", deleteKeyHandler)
 
+    // Reveal the ⌘/Ctrl+1-9 jump badges on all sidebar items while the modifier is held.
+    // Capture phase so the terminal's key handlers can't swallow them; blur resets state
+    // when the keyup is lost (e.g. Cmd+Tab away).
+    const modifier = isMac ? "Meta" : "Control"
+    const modTrack = (e: KeyboardEvent) => {
+      if (e.key === modifier) setHeld(e.type === "keydown")
+    }
+    const modReset = () => setHeld(false)
+    window.addEventListener("keydown", modTrack, true)
+    window.addEventListener("keyup", modTrack, true)
+    window.addEventListener("blur", modReset)
+
     // When the panel regains focus (e.g. returning from terminal), focus the prompt
     // and clear any stale body styles left by Kobalte modal overlays (dropdowns/dialogs
     // set pointer-events:none and overflow:hidden on body, but cleanup never runs if
@@ -1262,11 +1235,10 @@ const AgentManagerContent: Component = () => {
       if (msg.type === "sessionsLoaded" && !sessionsLoaded()) setSessionsLoaded(true)
       if (msg.type === "agentManager.sessionClosed") handleCloseTab(msg.sessionId, false)
     })
-    const unsubRun = vscode.onMessage((msg) => {
-      if (msg.type !== "agentManager.runStatus") return
-      const ev = msg as RunStatus
-      setRunStatuses((prev) => ({ ...prev, [ev.worktreeId]: ev }))
-    })
+    const unsubRun = vscode.onMessage((msg) =>
+      applyRunStatus(msg, { ensure: (id) => registry.ensure(id), active: () => registry.active() }),
+    )
+    const unsubProjects = vscode.onMessage((msg) => applyProjects(msg))
 
     // Terminal messages have their own subscription to keep main-handler complexity in check.
     const terminalDispatch = createTerminalMessageHandler({
@@ -1281,9 +1253,25 @@ const AgentManagerContent: Component = () => {
       onSideCreated: (contextKey, terminalId) => {
         // Focus only when the user is still looking at this panel —
         // a slow create landing after a mode switch must not steal it.
-        if (sidePanel() === "terminal" && terms.sideKey() === contextKey) terms.requestFocus(terminalId)
+        if (sidePanel() === "terminal" && !history() && !reviewActive() && terms.sideKey() === contextKey) {
+          terms.requestFocus(terminalId)
+        }
       },
-      onDestinationChanged: (destination) => sideCtl.setDestination(destination),
+      onScriptRunning: (contextKey, terminalId) => {
+        if (terms.sideKey() !== contextKey) return
+        // Setup output is informational: reveal without stealing focus, and
+        // remember an ambient reveal so the panel can restore itself later.
+        if (terms.scriptStatus(terminalId)?.kind === "setup") {
+          ambientSetup.reveal(contextKey, terminalId)
+          showSideTerminal()
+          terms.setSideActive(contextKey, terminalId)
+          return
+        }
+        showSideTerminal()
+        terms.setSideActive(contextKey, terminalId)
+        terms.requestFocus(terminalId)
+      },
+      onDestinationChanged: (destination) => sideCtl.syncDefault(destination),
     })
     const unsubTerminals = vscode.onMessage((msg) => {
       terminalDispatch(msg)
@@ -1298,9 +1286,12 @@ const AgentManagerContent: Component = () => {
 
       if (msg.type === "agentManager.worktreeSetup") {
         const ev = msg as AgentManagerWorktreeSetupMessage
+        const store = ev.projectId ? registry.ensure(ev.projectId) : registry.active()
+        const updateBusy: Setter<Map<string, WorktreeBusyState>> = (value) => store.setBusy(value)
         if (ev.status === "ready" || ev.status === "error") {
           const error = ev.status === "error"
-          if (ev.worktreeId) setBusyWorktrees((prev) => new Map([...prev].filter(([k]) => k !== ev.worktreeId)))
+          if (ev.worktreeId) updateBusy((prev) => new Map([...prev].filter(([k]) => k !== ev.worktreeId)))
+          if (!isActivePayload(ev.projectId)) return
           setSetup({
             active: true,
             message: ev.message,
@@ -1319,14 +1310,17 @@ const AgentManagerContent: Component = () => {
         } else {
           // Track this worktree as setting up and auto-select it in the sidebar
           if (ev.worktreeId) {
-            setBusyWorktrees(
+            updateBusy(
               (prev) =>
                 new Map([...prev, [ev.worktreeId!, { reason: "setting-up", message: ev.message, branch: ev.branch }]]),
             )
+            if (!isActivePayload(ev.projectId)) return
             setSelection(ev.worktreeId)
           }
-          // Close diff/review panels — nothing to show during setup
-          setSidePanel(null)
+          if (!isActivePayload(ev.projectId)) return
+          // Close diff/review panels — nothing to show during setup.
+          // Terminal panels keep live setup output, so they stay open.
+          if (sidePanel() === "diff") setSidePanel(null)
           setReviewActive(false)
           setSetup({ active: true, message: ev.message, branch: ev.branch, worktreeId: ev.worktreeId })
         }
@@ -1366,61 +1360,7 @@ const AgentManagerContent: Component = () => {
         setKb(ev.bindings)
       }
 
-      if (msg.type === "agentManager.state") {
-        const state = msg as AgentManagerStateMessage
-        setWorktrees(state.worktrees)
-        setManagedSessions(state.sessions)
-        setStaleWorktreeIds(new Set(state.staleWorktreeIds ?? []))
-        if (state.isGitRepo !== undefined) setIsGitRepo(state.isGitRepo)
-        if (!worktreesLoaded()) setWorktreesLoaded(true)
-        // When not a git repo, also mark sessions as loaded since the Kilo
-        // server won't connect to send the sessionsLoaded message.
-        if (state.isGitRepo === false && !sessionsLoaded()) setSessionsLoaded(true)
-        const prev = new Set(sections().map((s) => s.id)),
-          incoming = state.sections ?? []
-        setSections(incoming)
-        if (pendingNewSection) {
-          pendingNewSection = false
-          const c = incoming.find((s) => !prev.has(s.id))
-          if (c) setRenamingSection(c.id)
-        }
-        if (state.tabOrder) setWorktreeTabOrder(state.tabOrder)
-        if (state.worktreeOrder) setSidebarWorktreeOrder(state.worktreeOrder)
-        if (state.reviewDiffStyle === "split" || state.reviewDiffStyle === "unified") {
-          setReviewDiffStyle(state.reviewDiffStyle)
-        }
-        markdown.setRender(state.reviewMarkdownRender === true)
-        if ("defaultBaseBranch" in state) setDefaultBaseBranch(state.defaultBaseBranch || undefined)
-        setRunScriptConfigured(state.runScriptConfigured === true)
-        syncRunStatuses(state.runStatuses)
-        const current = session.currentSessionID()
-        if (current) {
-          const ms = state.sessions.find((s) => s.id === current)
-          if (ms?.worktreeId) setSelection(ms.worktreeId)
-        }
-        // Restore local session IDs from persisted state (sessions with no worktreeId)
-        const restored = restoreTrackedTabs(
-          trackedSessionInventory(state.sessions, session.sessions()),
-          localSessionIDs(),
-          state.tabOrder?.[LOCAL],
-          isPending,
-          applyTabOrder,
-        )
-        if (restored) setLocalSessionIDs(restored)
-        // Recover sessions collapsed state from extension-persisted state
-        if (state.sessionsCollapsed !== undefined) setSessionsCollapsed(state.sessionsCollapsed)
-        // Recover sidebar collapsed state and mark hydrated so transitions enable
-        sidebar.hydrate(state.sidebarCollapsed)
-        // Clear busy state for worktrees that have been removed
-        const ids = new Set(state.worktrees.map((wt) => wt.id))
-        setBusyWorktrees((prev) => {
-          const next = new Map([...prev].filter(([id]) => ids.has(id)))
-          return next.size === prev.size ? prev : next
-        })
-        setRunStatuses((prev) =>
-          Object.fromEntries(Object.entries(prev).filter(([id]) => id === "local" || ids.has(id))),
-        )
-      }
+      if (msg.type === "agentManager.state") applyState(msg)
 
       // When a multi-version progress update arrives, mark newly created worktrees as loading
       if ((msg as { type: string }).type === "agentManager.multiVersionProgress") {
@@ -1492,98 +1432,64 @@ const AgentManagerContent: Component = () => {
       }
 
       if (msg.type === "agentManager.worktreeDiff") {
-        const ev = msg as AgentManagerWorktreeDiffMessage
-        let staleFiles: Set<string> | undefined
-        setDiffDatas((prev) => {
-          const existing = prev[ev.sessionId]
-          const merged = existing
-            ? mergeWorktreeDiffs(existing, ev.diffs)
-            : { diffs: ev.diffs, stale: new Set<string>() }
-          staleFiles = merged.stale
-          const next = merged.diffs
-          if (existing && existing.length === next.length && existing.every((old, i) => old === next[i])) return prev
-          return { ...prev, [ev.sessionId]: next }
-        })
-        if (staleFiles) refreshStaleDiffs(ev.sessionId, staleFiles)
+        diffs.onWorktreeDiff(msg as AgentManagerWorktreeDiffMessage)
       }
 
       if (msg.type === "agentManager.worktreeDiffFile") {
-        const ev = msg as AgentManagerWorktreeDiffFileMessage
-        if (ev.diff) {
-          setDiffDatas((prev) => {
-            const existing = prev[ev.sessionId] ?? []
-            const next = existing.map((item) => (item.file === ev.diff!.file ? ev.diff! : item))
-            return { ...prev, [ev.sessionId]: next }
-          })
-          setDiffFilePending(ev.sessionId, ev.diff.file, false)
-          return
-        }
-        setDiffFilePending(ev.sessionId, ev.file, false)
+        diffs.onWorktreeDiffFile(msg as AgentManagerWorktreeDiffFileMessage)
       }
 
       if (msg.type === "agentManager.worktreeDiffLoading") {
-        const ev = msg as AgentManagerWorktreeDiffLoadingMessage
-        setDiffLoading(ev.loading)
+        diffs.onWorktreeDiffLoading(msg as AgentManagerWorktreeDiffLoadingMessage)
+      }
+
+      if (msg.type === "agentManager.worktreeDiffNotice") {
+        diffs.onWorktreeDiffNotice(msg as AgentManagerWorktreeDiffNoticeMessage)
+      }
+
+      if (msg.type === "agentManager.diffBranches") {
+        review.onBranches(msg as AgentManagerDiffBranchesMessage)
       }
 
       if (msg.type === "agentManager.applyWorktreeDiffResult") {
-        const ev = msg as AgentManagerApplyWorktreeDiffResultMessage
-        const files = new Set((ev.conflicts ?? []).map((entry) => entry.file).filter(Boolean)).size
-        const count = ev.conflicts?.length ?? 0
-        setApplyStates((prev) => ({
-          ...prev,
-          [ev.worktreeId]: {
-            status: ev.status,
-            message: ev.message,
-            conflicts: ev.conflicts ?? [],
-          },
-        }))
-
-        if (ev.status === "success") {
-          showToast({ variant: "success", title: t("agentManager.apply.success"), description: ev.message })
-          if (applyTarget() === ev.worktreeId) closeApplyDialog()
-        }
-        if (ev.status === "conflict") {
-          const summary =
-            count > 0 ? t("agentManager.apply.conflictToast", { count, files: Math.max(files, 1) }) : ev.message
-          showToast({ variant: "error", title: t("agentManager.apply.conflict"), description: summary })
-        }
-        if (ev.status === "error") {
-          showToast({ variant: "error", title: t("agentManager.apply.error"), description: ev.message })
-        }
+        apply.onApplyResult(msg as AgentManagerApplyWorktreeDiffResultMessage)
       }
 
       if (msg.type === "agentManager.revertWorktreeFileResult") revertCtl.onResult(msg as never)
 
-      if (msg.type === "agentManager.worktreeStats") {
-        const ev = msg as AgentManagerWorktreeStatsMessage
-        const map: Record<string, WorktreeGitStats> = {}
-        for (const s of ev.stats) map[s.worktreeId] = s
-        setWorktreeStats(map)
-      }
+      applyProjectSelection(msg, {
+        // The catalog push is synchronous, so activeProjectId is current when
+        // the ack arrives; currentProjectId may still be catching up after an
+        // async project reactivation, so it must not be part of the guard.
+        active: (projectId) => activeProjectId() === projectId,
+        managed: (projectId) => projectLive.sessions()[projectId] ?? projectStates()[projectId]?.sessions ?? [],
+        local: () => selectLocal(),
+        // The active guard above already scopes by project; apply the worktree
+        // optimistically and let the arriving state reconcile.
+        worktree: (projectId, worktreeId) => selectWorktree(worktreeId),
+        session: session.selectSession,
+        openTab: (id) => placeLocal(id, undefined, undefined),
+        managedSession: focusManagedSession,
+      })
 
-      if (msg.type === "agentManager.localStats") {
-        const ev = msg as AgentManagerLocalStatsMessage
-        setLocalStats(ev.stats)
-        setRepoBranch(ev.stats.branch)
-      }
-
-      if (msg.type === "agentManager.prStatus") {
-        const ev = msg as AgentManagerPRStatusMessage
-        setPrStatuses((prev) => ({ ...prev, [ev.worktreeId]: ev.pr }))
-      }
+      if (projectLive.apply(msg)) return
     })
 
     onCleanup(() => {
       window.removeEventListener("message", handler)
       window.removeEventListener("keydown", preventDefaults, true)
+      window.removeEventListener("keydown", shortcut, true)
       window.removeEventListener("keydown", deleteKeyHandler)
+      window.removeEventListener("keydown", modTrack, true)
+      window.removeEventListener("keyup", modTrack, true)
+      window.removeEventListener("blur", modReset)
       window.removeEventListener("focus", onWindowFocus)
       window.removeEventListener("newTaskRequest", newTaskHandler, true)
       drafts.cleanup()
       unsubCreate()
       unsubSessions()
       unsubRun()
+      unsubProjects()
       unsubTerminals()
       unsub()
     })
@@ -1595,41 +1501,74 @@ const AgentManagerContent: Component = () => {
     // Request worktree/session state from extension — handles race where
     // initializeState() pushState fires before the webview is mounted
     vscode.postMessage({ type: "agentManager.requestState" })
+    // Same race for the project catalog pushed at panel attach
+    vscode.postMessage({ type: "agentManager.requestProjects" })
     // Open a pending "New Session" tab if there are no persisted local sessions
     if (localSessionIDs().length === 0) {
       addPendingTab()
     }
   })
 
-  const selectedDiffSessionId = () => {
-    const sel = selection()
-    if (sel === LOCAL) return LOCAL
-    if (!sel) return undefined
+  // Diff context = sidebar selection (worktree id or LOCAL), stable across
+  // session tab switches inside the context so the git scopes don't refetch.
+  const diffCtx = createMemo(() => selection() ?? undefined)
 
+  // Active session within the diff context. The Session scope follows it, so
+  // switching session tabs swaps only the session diff.
+  const activeDiffSession = createMemo(() => {
+    const sel = selection()
+    if (!sel) return undefined
     const current = session.currentSessionID()
+    if (sel === LOCAL) {
+      if (current && localSessionIDs().includes(current) && !isPending(current)) return current
+      return localSessionIDs().find((id) => !isPending(id))
+    }
     if (current) {
       const item = managedSessions().find((entry) => entry.id === current)
       if (item?.worktreeId === sel) return current
     }
-
     return managedSessions().find((entry) => entry.worktreeId === sel)?.id
-  }
+  })
 
-  const currentDiffSessionId = createMemo(selectedDiffSessionId)
+  // Diff scope + base branch state, shared by the side panel and review tab.
+  const review = createDiffReviewScope({
+    ctx: diffCtx,
+    session: activeDiffSession,
+    panelOpen: diffOpen,
+    reviewActive,
+    vscode,
+  })
+  // The composite id (ctx#scope) the extension keys diff data by.
+  const diffScopeId = review.id
 
-  // Start/stop diff watch when panel opens/closes, review tab opens, or session changes
+  // Shared scope + base-picker controls for the side panel and review tab.
+  const diffScopeControls = (compact: boolean) => (
+    <DiffScopeControls
+      descriptors={review.descriptors()}
+      currentId={review.id()}
+      onSelectScope={review.select}
+      showBase={review.isBranch()}
+      branches={review.branches()}
+      branchesLoading={review.loading()}
+      defaultBranch={review.defaultBranch()}
+      autoBase={review.autoBase()}
+      currentBase={review.currentBase()}
+      isAuto={review.isAuto()}
+      currentBranch={review.currentBranch()}
+      onSelectBase={review.selectBase}
+      compact={compact}
+    />
+  )
+
+  // Start/stop diff watch when the panel opens/closes, the review tab opens,
+  // or the composite id (context, scope, active session) changes.
   createEffect(() => {
     const panel = diffOpen()
-    const review = reviewActive()
+    const active = reviewActive()
+    const id = review.id()
 
-    if (panel || review) {
-      const id = currentDiffSessionId()
-      if (id) {
-        vscode.postMessage({ type: "agentManager.startDiffWatch", sessionId: id })
-        return
-      }
-      vscode.postMessage({ type: "agentManager.stopDiffWatch" })
-      setDiffLoading(false)
+    if ((panel || active) && id) {
+      vscode.postMessage({ type: "agentManager.startDiffWatch", ...wireDiffId(id) })
       return
     }
 
@@ -1670,32 +1609,24 @@ const AgentManagerContent: Component = () => {
     tabFocus.restore()
   }
 
-  // Data for the review tab: use local diff data for local context,
-  // current session for selected worktree context, or first available in that worktree.
+  // Data for the review tab / side panel: keyed by the composite diff id
+  // (ctx#scope) the extension pushes, so each scope keeps its own file set and
+  // switching back to a fetched scope is instant.
   const reviewDiffs = createMemo(() => {
     const data = diffDatas()
-    const sel = selection()
-    const id = session.currentSessionID()
-    if (sel === LOCAL) return data[LOCAL] ?? []
-    if (id && data[id]) {
-      const current = managedSessions().find((s) => s.id === id)
-      if (sel && current?.worktreeId === sel) return data[id]!
-    }
-    if (!sel) return []
-    const ids = managedSessions()
-      .filter((s) => s.worktreeId === sel)
-      .map((s) => s.id)
-    for (const sid of ids) {
-      if (data[sid]) return data[sid]!
-    }
-    return []
+    const key = diffScopeId()
+    if (!key) return []
+    return data[key] ?? []
   })
 
-  const diffSessionKey = createMemo(() => {
-    const sel = selection()
-    if (sel === LOCAL) return `local:${LOCAL}`
-    if (sel === null) return `session:${session.currentSessionID() ?? ""}`
-    return `worktree:${sel}`
+  const diffSessionKey = createMemo(() => diffScopeId() ?? "")
+
+  // Source-level notice for the active composite id (e.g. snapshots disabled
+  // for the Session scope), shown as a banner instead of the empty state.
+  const diffNotice = createMemo(() => {
+    const key = diffScopeId()
+    if (!key) return undefined
+    return diffNotices()[key]
   })
 
   const setSharedDiffStyle = (style: "unified" | "split") => {
@@ -1704,56 +1635,15 @@ const AgentManagerContent: Component = () => {
     vscode.postMessage({ type: "agentManager.setReviewDiffStyle", style })
   }
 
-  const setDiffFilePending = (sessionId: string, file: string, value: boolean) => {
-    setDiffFileLoading((prev) => {
-      const session = prev[sessionId] ?? {}
-      if (value) {
-        if (session[file]) return prev
-        return {
-          ...prev,
-          [sessionId]: { ...session, [file]: true },
-        }
-      }
-
-      if (!session[file]) return prev
-      const next = { ...session }
-      delete next[file]
-      if (Object.keys(next).length === 0) {
-        const result = { ...prev }
-        delete result[sessionId]
-        return result
-      }
-      return {
-        ...prev,
-        [sessionId]: next,
-      }
-    })
-  }
-
   const requestDiffFile = (file: string) => {
-    const sessionId = currentDiffSessionId()
-    if (!sessionId) return
-    if (diffFileLoading()[sessionId]?.[file]) return
-    setDiffFilePending(sessionId, file, true)
-    vscode.postMessage({ type: "agentManager.requestWorktreeDiffFile", sessionId, file })
+    const id = diffScopeId()
+    if (!id) return
+    diffs.requestDiffFile(id, file)
   }
 
-  const refreshStaleDiffs = (sessionId: string, files: Set<string>) => {
-    const loading = diffFileLoading()[sessionId] ?? {}
-    for (const file of files) {
-      if (loading[file]) continue
-      setDiffFilePending(sessionId, file, true)
-      vscode.postMessage({ type: "agentManager.requestWorktreeDiffFile", sessionId, file })
-    }
-  }
+  const diffFileLoadingForCurrent = createMemo(() => diffs.diffFileLoadingFor(diffScopeId))
 
-  const diffFileLoadingForCurrent = createMemo(() => {
-    const sessionId = currentDiffSessionId()
-    if (!sessionId) return new Set<string>()
-    return new Set(Object.keys(diffFileLoading()[sessionId] ?? {}))
-  })
-
-  const revertCtl = createRevertFile(currentDiffSessionId, vscode, showToast, t)
+  const revertCtl = createRevertFile(diffScopeId, diffCtx, () => review.scope(), vscode, showToast, t)
 
   const handleConfigureSetupScript = () => {
     vscode.postMessage({ type: "agentManager.configureSetupScript" })
@@ -2010,6 +1900,8 @@ const AgentManagerContent: Component = () => {
 
   const handleAddSession = () => {
     const sel = selection()
+    // Setup is still provisioning this worktree; the Setup tab shows progress.
+    if (settingUpSelection()) return
     expandSidebar()
     if (sel === LOCAL) return addPendingTab()
     if (sel) {
@@ -2092,9 +1984,6 @@ const AgentManagerContent: Component = () => {
     postMessage: (msg) => vscode.postMessage(msg as never),
     onRemove: freezeTabs,
     onShowSide: showSideTerminal,
-    onHideSide: () => {
-      if (sidePanel() === "terminal") setSidePanel(null)
-    },
     getSelection: selection,
     LOCAL,
     REVIEW_TAB_ID,
@@ -2102,18 +1991,28 @@ const AgentManagerContent: Component = () => {
 
   const sideCtl = createSideTerminal({
     handlers: termHandlers,
-    visible: () => sidePanel() === "terminal",
-    focused: () => terms.focusedId() !== undefined && terms.focusedId() === terms.side()?.id,
-    hide: () => setSidePanel(null),
+    visible: () => sidePanel() === "terminal" && !history() && !reviewActive(),
+    focusedId: () => terms.sideFocusedId(),
+    hide: () => {
+      cancelAmbientSetup()
+      setSidePanel(null)
+    },
     refocus: () => window.dispatchEvent(new Event("focusPrompt")),
     postMessage: (msg) => vscode.postMessage(msg as never),
     track: (button, surface, properties) => metrics.track(button, surface, properties),
-    openVscode: () => {
-      const id = session.currentSessionID()
-      if (id) vscode.postMessage({ type: "agentManager.showTerminal", sessionId: id })
-      else if (selection() === LOCAL) vscode.postMessage({ type: "agentManager.showLocalTerminal" })
-    },
+    // Panel-local pick, immune to cross-window setting echoes (see side.ts).
+    saved: readSavedDestination(vscode.getState<Record<string, unknown>>()),
+    save: (d) => vscode.setState({ ...vscode.getState<Record<string, unknown>>(), terminalDestination: d }),
+    openVscode: () =>
+      vscode.postMessage(
+        resolveVscodeTerminalRequest(
+          selection(),
+          session.currentSessionID(),
+          (wt) => managedSessions().find((ms) => ms.worktreeId === wt)?.id,
+        ) as never,
+      ),
   })
+  createEffect(on(terms.sideKey, (key, previous) => sideCtl.syncContext(key, previous), { defer: true }))
 
   const handleReviewTabMouseDown = (e: MouseEvent) => {
     if (e.button !== 1) return
@@ -2186,8 +2085,8 @@ const AgentManagerContent: Component = () => {
     if (!id) return undefined
     if (id === REVIEW_TAB_ID) return { id, title: t("session.tab.review") }
     if (isTerminalTabId(id)) {
-      const term = terms.lookup().get(id)
-      return term ? { id, title: term.title } : undefined
+      const title = terms.title(id)
+      return title ? { id, title } : undefined
     }
     return activeTabs().find((s) => s.id === id)
   })
@@ -2215,8 +2114,8 @@ const AgentManagerContent: Component = () => {
   const closeActiveTab = () => {
     // A focused side terminal owns Cmd+W while its panel is visible —
     // closing a chat tab out from under the user's cursor would be
-    // surprising.
-    if (sidePanel() === "terminal" && terms.focusedId() && terms.focusedId() === terms.side()?.id) {
+    // surprising. Only that terminal dies; the panel keeps the rest.
+    if (sidePanel() === "terminal" && terms.sideFocusedId()) {
       if (sideCtl.close()) return
     }
     if (termHandlers.closeActive()) {
@@ -2261,6 +2160,61 @@ const AgentManagerContent: Component = () => {
     confirmDeleteWorktree(sel)
   }
 
+  /** The Local/worktrees/sessions body of the active project. */
+  const toggleDiffPanel = () => {
+    metrics.track("side_review", "tab_toolbar", {
+      action: diffOpen() && !reviewActive() ? "close" : "open",
+    })
+    if (reviewActive()) {
+      closeReviewTab()
+      setSidePanel("diff")
+      return
+    }
+    setSidePanel((prev) => (prev === "diff" ? null : "diff"))
+  }
+
+  const renderTabById = (id: string) =>
+    renderTab(id, {
+      terms,
+      REVIEW_TAB_ID,
+      tabIds,
+      kb,
+      reviewActive,
+      currentSessionID: () => session.currentSessionID(),
+      activePendingId,
+      visibleTabId,
+      isPending,
+      isBusy: isSessionBusy,
+      tabLookup,
+      adjacentHint,
+      activateTerminal: termHandlers.activate,
+      deactivateTerminal: termHandlers.deactivate,
+      closeTerminal: (id) => tabFocus.run(() => termHandlers.closeTerminal(id)),
+      terminalMiddleClick: (id, event) => tabFocus.middle(event, () => termHandlers.middleClick(id, event)),
+      closeReview: closeReviewTab,
+      reviewMiddleClick: handleReviewTabMouseDown,
+      selectReviewTab: () => setReviewActive(true),
+      selectSessionTab,
+      sessionMiddleClick: handleTabMouseDown,
+      sessionClose: handleCloseTab,
+      sessionFork: handleForkSession,
+      onTabKey: tabFocus.key,
+      reviewLabel: t("session.tab.review"),
+      reviewTooltip: t("command.review.toggle"),
+    })
+
+  const renderAddTab = () =>
+    renderNewTabButton({
+      contextSelected: () => selection() !== null,
+      kb,
+      newSessionLabel: t("agentManager.session.new"),
+      newTerminalLabel: t("agentManager.terminal.new"),
+      newSessionMenuLabel: t("agentManager.session.newSession"),
+      moreOptionsLabel: t("agentManager.tab.newOptions"),
+      onNewSession: metrics.click("new_session", "tab_bar", handleAddSession),
+      onNewTerminal: metrics.click("embedded_terminal", "new_tab_menu", () => termHandlers.requestNew()),
+    })
+
   return (
     <div
       class="am-layout"
@@ -2269,7 +2223,7 @@ const AgentManagerContent: Component = () => {
     >
       <div
         class="am-sidebar"
-        classList={{ "am-sidebar-collapsed": sidebarCollapsed() }}
+        classList={{ "am-sidebar-collapsed": sidebarCollapsed(), "am-show-shortcuts": held() }}
         style={{ width: sidebarCollapsed() ? "0px" : `${sidebarWidth()}px` }}
         inert={sidebarCollapsed() || undefined}
       >
@@ -2288,616 +2242,132 @@ const AgentManagerContent: Component = () => {
             }
           }}
         />
-        {/* Local repo item */}
-        <button
-          class={`am-local-item ${selection() === LOCAL ? "am-local-item-active" : ""}`}
-          data-sidebar-id="local"
-          onClick={() => selectLocal()}
-        >
-          <Show when={!isLocalBusy()} fallback={<Spinner class="am-worktree-spinner" />}>
-            <svg class="am-local-icon" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <rect x="2.5" y="3.5" width="15" height="10" rx="1" stroke="currentColor" />
-              <path d="M6 16.5H14" stroke="currentColor" stroke-linecap="square" />
-              <path d="M10 13.5V16.5" stroke="currentColor" />
-            </svg>
-          </Show>
-          <div class="am-local-text">
-            <span class="am-local-label">{t("agentManager.local")}</span>
-            <Show when={repoBranch()}>
-              <span class="am-local-branch">{repoBranch()}</span>
-            </Show>
-          </div>
-          <Show when={localStats() === undefined}>
-            <div class="am-worktree-stats-skeleton">
-              <div class="am-worktree-stats-skeleton-row" />
-              <div class="am-worktree-stats-skeleton-row" style={{ width: "70%" }} />
-            </div>
-          </Show>
-          <Show
-            when={
-              localStats() &&
-              (localStats()!.files > 0 ||
-                localStats()!.additions > 0 ||
-                localStats()!.deletions > 0 ||
-                localStats()!.ahead > 0 ||
-                localStats()!.behind > 0)
-            }
-          >
-            <div class="am-worktree-stats">
-              <Show
-                when={localStats()!.additions > 0 || localStats()!.deletions > 0}
-                fallback={
-                  <Show when={localStats()!.files > 0}>
-                    <span class="am-stat-files">{localStats()!.files}f</span>
-                  </Show>
-                }
-              >
-                <div class="am-worktree-stats-row">
-                  <Show when={localStats()!.additions > 0}>
-                    <span class="am-stat-additions">+{localStats()!.additions}</span>
-                  </Show>
-                  <Show when={localStats()!.deletions > 0}>
-                    <span class="am-stat-deletions">
-                      {"\u2212"}
-                      {localStats()!.deletions}
-                    </span>
-                  </Show>
-                </div>
-              </Show>
-              <Show when={localStats()!.ahead > 0 || localStats()!.behind > 0}>
-                <div class="am-worktree-stats-row">
-                  <Show when={localStats()!.ahead > 0}>
-                    <span class="am-worktree-commits">
-                      {"↑"}
-                      {localStats()!.ahead}
-                    </span>
-                  </Show>
-                  <Show when={localStats()!.behind > 0}>
-                    <span class="am-worktree-behind">
-                      {"↓"}
-                      {localStats()!.behind}
-                    </span>
-                  </Show>
-                </div>
-              </Show>
-            </div>
-          </Show>
-          <span class="am-shortcut-badge">{isMac ? "⌘" : "Ctrl+"}1</span>
-        </button>
-
-        {/* WORKTREES section */}
-        <div class={`am-section ${sessionsCollapsed() ? "am-section-grow" : ""}`}>
-          <div class="am-section-header">
-            <span class="am-section-label">{t("agentManager.section.worktrees")}</span>
-            <WorktreeSectionActions
-              items={sidebarSearch.items}
-              current={sidebarSearch.current}
-              bindings={kb()}
-              branch={repoDefaultBranch()}
-              git={isGitRepo()}
-              loaded={loaded()}
-              t={t}
-              onRef={(value) => (sidebarSearchMenu = value)}
-              onSelect={focusSidebarSearchItem}
-              onCreate={createWorktree}
-              onNew={showNewWorktreeDialog}
-              onSection={newSection}
-              onShortcuts={metrics.click("keyboard_shortcuts", "worktrees_header", handleShowKeyboardShortcuts)}
-              onSetup={setupScript}
-              onBranch={handleChangeDefaultBaseBranch}
-            />
-          </div>
-          <div class="am-worktree-list">
-            <Show
-              when={worktreesLoaded() && sessionsLoaded()}
-              fallback={
-                <div class="am-skeleton-list">
-                  <div class="am-skeleton-wt">
-                    <div class="am-skeleton-wt-icon" />
-                    <div class="am-skeleton-wt-text" style={{ width: "60%" }} />
-                  </div>
-                </div>
-              }
-            >
-              <Show when={!isGitRepo()}>
-                <div class="am-not-git-notice">
-                  <Icon name="warning" size="small" />
-                  <span>{t("agentManager.notGitRepo")}</span>
-                </div>
-              </Show>
-              <Show when={isGitRepo()}>
-                {(() => {
-                  const [renamingWt, setRenamingWt] = createSignal<string | null>(null)
-                  const [renameValue, setRenameValue] = createSignal("")
-
-                  const startRename = (wtId: string, current: string) => {
-                    setRenamingWt(wtId)
-                    setRenameValue(current)
-                  }
-
-                  let cancelled = false
-
-                  const commitRename = (wtId: string) => {
-                    if (cancelled) {
-                      cancelled = false
-                      return
-                    }
-                    const value = renameValue().trim()
-                    setRenamingWt(null)
-                    if (!value) return
-                    vscode.postMessage({ type: "agentManager.renameWorktree", worktreeId: wtId, label: value })
-                  }
-
-                  const cancelRename = () => {
-                    cancelled = true
-                    setRenamingWt(null)
-                  }
-
-                  const hasSections = createMemo(() => sections().length > 0)
-                  const wtIds = createMemo(() => sortedWorktrees().map((wt) => wt.id))
-                  const secIds = createMemo(() => new Set(sections().map((s) => s.id)))
-                  const home = () => new Map(sortedWorktrees().map((w) => [w.id, w.sectionId] as const))
-                  const sectionAware = sectionAwareDetector(secIds, home)
-
-                  const onWtDragStart = (event: DragEvent) => {
-                    const id = event.draggable?.id
-                    if (typeof id === "string") setDraggingWorktree(id)
-                    document.body.classList.add("am-wt-dragging-active")
-                  }
-                  const onWtDragOver = (event: DragEvent) => {
-                    const from = event.draggable?.id
-                    const to = event.droppable?.id
-                    if (typeof from !== "string" || typeof to !== "string") return
-                    if (secIds().has(to)) return
-                    setSidebarWorktreeOrder((prev) => {
-                      const cur = applyTabOrder(
-                        sortedWorktrees().map((w) => ({ id: w.id })),
-                        prev,
-                      ).map((i) => i.id)
-                      return reorderTabs(cur, from, to) ?? prev
-                    })
-                  }
-                  const onWtDragEnd = (event: DragEvent) => {
-                    const from = event.draggable?.id
-                    const to = event.droppable?.id
-                    setDraggingWorktree(undefined)
-                    document.body.classList.remove("am-wt-dragging-active")
-                    if (typeof from === "string" && typeof to === "string" && secIds().has(to)) {
-                      moveToSection([from], to)
-                      return
-                    }
-                    vscode.postMessage({ type: "agentManager.setWorktreeOrder", order: sidebarWorktreeOrder() })
-                  }
-
-                  return (
-                    <DragDropProvider
-                      onDragStart={onWtDragStart}
-                      onDragEnd={onWtDragEnd}
-                      onDragOver={onWtDragOver}
-                      collisionDetector={sectionAware}
-                    >
-                      <DragDropSensors />
-                      <ConstrainDragXAxis />
-                      <SortableProvider ids={wtIds()}>
-                        {(() => {
-                          const renderWt = (wt: WorktreeState, idx: () => number, list?: WorktreeState[]) => {
-                            const wtSessions = createMemo(() =>
-                              managedSessions().filter((ms) => ms.worktreeId === wt.id),
-                            )
-                            const navHint = () =>
-                              adjacentHint(
-                                wt.id,
-                                selection() ?? session.currentSessionID() ?? "",
-                                sidebarOrder().map((f) => f.id),
-                                kb().previousSession ?? "",
-                                kb().nextSession ?? "",
-                              )
-                            const groupSize = () =>
-                              !wt.groupId ? 0 : sortedWorktrees().filter((w) => w.groupId === wt.groupId).length
-                            const sortable = createSortable(wt.id)
-                            void sortable
-                            return (
-                              <div
-                                use:sortable
-                                class={`am-wt-sortable ${sortable.isActiveDraggable ? "am-wt-dragging" : ""}`}
-                              >
-                                <WorktreeItem
-                                  worktree={wt}
-                                  label={worktreeLabel(wt)}
-                                  subtitle={worktreeSubtitle(wt)}
-                                  active={selection() === wt.id}
-                                  pendingDelete={pendingDelete() === wt.id}
-                                  busy={busyWorktrees().has(wt.id)}
-                                  working={isAgentBusy(wt.id)}
-                                  stale={isStaleWorktree(wt.id)}
-                                  shortcut={shortcutMap().get(wt.id)}
-                                  stats={worktreeStats()[wt.id]}
-                                  navHint={navHint()}
-                                  sessions={wtSessions().length}
-                                  grouped={isGrouped(wt)}
-                                  groupStart={isGroupStart(wt, idx(), list ?? sortedWorktrees())}
-                                  groupEnd={isGroupEnd(wt, idx(), list ?? sortedWorktrees())}
-                                  groupSize={groupSize()}
-                                  renaming={renamingWt() === wt.id}
-                                  renameValue={renameValue()}
-                                  closeKeybind={kb().closeWorktree ?? ""}
-                                  openKeybind={kb().openWorktree ?? ""}
-                                  pr={
-                                    prStatuses()[wt.id] !== undefined ? (prStatuses()[wt.id] ?? undefined) : undefined
-                                  }
-                                  runStatus={runStatuses()[wt.id]}
-                                  onOpenPR={metrics.click("open_pull_request", "worktree_menu", () =>
-                                    vscode.postMessage({ type: "agentManager.openPR", worktreeId: wt.id }),
-                                  )}
-                                  sections={sections()}
-                                  currentSectionId={wt.sectionId}
-                                  onMoveToSection={(secId) => moveToSection([wt.id], secId)}
-                                  onMoveToNewSection={metrics.click("new_section", "worktree_menu", () => newSection())}
-                                  onClick={() => {
-                                    if (pendingDelete() === wt.id) {
-                                      confirmDeleteWorktree(wt.id)
-                                      return
-                                    }
-                                    selectWorktree(wt.id)
-                                  }}
-                                  onDelete={(e) => handleDeleteWorktree(wt.id, e)}
-                                  onStartRename={(current) => startRename(wt.id, current)}
-                                  onRenameInput={(v) => setRenameValue(v)}
-                                  onCommitRename={() => commitRename(wt.id)}
-                                  onCancelRename={cancelRename}
-                                  onRemoveStale={() => confirmRemoveStaleWorktree(wt.id)}
-                                  onCopyPath={() => navigator.clipboard.writeText(wt.path)}
-                                  onOpen={metrics.click("open_worktree_window", "worktree_menu", () =>
-                                    vscode.postMessage({ type: "agentManager.openWorktree", worktreeId: wt.id }),
-                                  )}
-                                />
-                              </div>
-                            )
-                          }
-                          if (hasSections()) {
-                            const post = vscode.postMessage.bind(vscode)
-                            return (
-                              <For each={topLevelItems()}>
-                                {(item, idx) => {
-                                  if (item.kind === "section") {
-                                    const sec = item.section
-                                    const members = createMemo(() => worktreesInSection(sec.id))
-                                    return (
-                                      <SectionHeader
-                                        section={sec}
-                                        count={members().length}
-                                        autoRename={renamingSection() === sec.id}
-                                        onRenameEnd={() => setRenamingSection(null)}
-                                        onToggle={() =>
-                                          post({ type: "agentManager.toggleSectionCollapsed", sectionId: sec.id })
-                                        }
-                                        onRename={(name) =>
-                                          post({ type: "agentManager.renameSection", sectionId: sec.id, name })
-                                        }
-                                        onDelete={() => post({ type: "agentManager.deleteSection", sectionId: sec.id })}
-                                        onSetColor={(color) =>
-                                          post({ type: "agentManager.setSectionColor", sectionId: sec.id, color })
-                                        }
-                                        isFirst={idx() === 0}
-                                        isLast={idx() === topLevelItems().length - 1}
-                                        onMoveUp={() => moveSection(sec.id, -1)}
-                                        onMoveDown={() => moveSection(sec.id, 1)}
-                                      >
-                                        <Show when={!sec.collapsed}>
-                                          <div class="am-section-group-body">
-                                            <For each={members()}>{(wt, wtIdx) => renderWt(wt, wtIdx, members())}</For>
-                                          </div>
-                                        </Show>
-                                      </SectionHeader>
-                                    )
-                                  }
-                                  const ug = ungrouped()
-                                  const wtIdx = () => ug.indexOf(item.wt)
-                                  return renderWt(item.wt, wtIdx, ug)
-                                }}
-                              </For>
-                            )
-                          }
-                          return <For each={sortedWorktrees()}>{(wt, idx) => renderWt(wt, idx)}</For>
-                        })()}
-                      </SortableProvider>
-                      <DragOverlay>
-                        {(() => {
-                          const wt = sortedWorktrees().find((w) => w.id === draggingWorktree())
-                          if (!wt) return null
-                          return (
-                            <div class="am-wt-overlay">
-                              <Icon name="branch" size="small" />
-                              <span>{worktreeLabel(wt)}</span>
-                            </div>
-                          )
-                        })()}
-                      </DragOverlay>
-                    </DragDropProvider>
-                  )
-                })()}
-                <Show when={worktrees().length === 0}>
-                  <button class="am-worktree-create" onClick={showNewWorktreeDialog}>
-                    <Icon name="plus" size="small" />
-                    <span>{t("agentManager.worktree.new")}</span>
-                  </button>
-                </Show>
-              </Show>
-            </Show>
-          </div>
-        </div>
-
-        <UnassignedSessionsSection
-          sessions={unassignedSessions}
-          loaded={sessionsLoaded}
-          collapsed={sessionsCollapsed}
-          active={() => (selection() === null ? session.currentSessionID() : undefined)}
-          onToggle={toggleSessions}
-          onSelect={selectUnassigned}
-          onPromote={promoteSession}
-          onOpen={openUnassigned}
-        />
+        <Show when={multiProject()}>
+          <ProjectList
+            projects={projectList()}
+            states={projectStates()}
+            stats={projectLive.stats()}
+            local={projectLive.local()}
+            prs={projectLive.prs()}
+            sessions={projectSessionsLive()}
+            selectedProject={activeProjectId()}
+            selection={selection() ?? undefined}
+            currentSessionID={session.currentSessionID}
+            bindings={kb()}
+            t={t}
+            onSearchRef={(ref) => (sidebarSearchMenu = ref)}
+            onShortcuts={handleShowKeyboardShortcuts}
+          />
+        </Show>
+        <Show when={!multiProject()}>
+          <SidebarBody
+            t={t}
+            selection={selection}
+            currentSessionID={session.currentSessionID}
+            selectLocal={selectLocal}
+            selectWorktree={selectWorktree}
+            isLocalBusy={isLocalBusy}
+            repoBranch={repoBranch}
+            localStats={localStats}
+            sessionsCollapsed={sessionsCollapsed}
+            toggleSessions={toggleSessions}
+            search={{ items: sidebarSearch.items, current: sidebarSearch.current }}
+            bindings={kb}
+            defaultBranch={repoDefaultBranch}
+            isGitRepo={isGitRepo}
+            loaded={loaded}
+            worktreesLoaded={worktreesLoaded}
+            sessionsLoaded={sessionsLoaded}
+            onSearchRef={(ref) => (sidebarSearchMenu = ref)}
+            onSearchSelect={focusSidebarSearchItem}
+            onCreateWorktree={createWorktree}
+            onNewWorktree={showNewWorktreeDialog}
+            onNewSection={newSection}
+            onShortcuts={metrics.click("keyboard_shortcuts", "worktrees_header", handleShowKeyboardShortcuts)}
+            onSetup={setupScript}
+            onBranch={handleChangeDefaultBaseBranch}
+            sections={sections}
+            sortedWorktrees={sortedWorktrees}
+            worktrees={worktrees}
+            ungrouped={ungrouped}
+            topLevelItems={topLevelItems}
+            worktreesInSection={worktreesInSection}
+            sidebarOrder={sidebarOrder}
+            sidebarWorktreeOrder={sidebarWorktreeOrder}
+            setSidebarWorktreeOrder={setSidebarWorktreeOrder}
+            draggingWorktree={draggingWorktree}
+            setDraggingWorktree={setDraggingWorktree}
+            moveToSection={moveToSection}
+            moveSection={moveSection}
+            renamingSection={renamingSection}
+            setRenamingSection={setRenamingSection}
+            managedSessions={managedSessions}
+            worktreeLabel={worktreeLabel}
+            worktreeSubtitle={worktreeSubtitle}
+            pendingDelete={pendingDelete}
+            busy={(id) => busyWorktrees().has(id)}
+            isAgentBusy={isAgentBusy}
+            isStaleWorktree={isStaleWorktree}
+            shortcutMap={shortcutMap}
+            worktreeStats={worktreeStats}
+            prStatuses={prStatuses}
+            runStatuses={runStatuses}
+            confirmDeleteWorktree={confirmDeleteWorktree}
+            handleDeleteWorktree={handleDeleteWorktree}
+            confirmRemoveStaleWorktree={confirmRemoveStaleWorktree}
+            unassignedSessions={unassignedSessions}
+            selectUnassigned={selectUnassigned}
+            promoteSession={promoteSession}
+            openUnassigned={openUnassigned}
+            track={metrics.click}
+          />
+        </Show>
       </div>
 
       <div class="am-detail">
         {/* Tab bar — full version with tabs renders when a section is selected
             and has tabs; otherwise a minimal version still renders so the
             sidebar toggle button stays at a fixed position. */}
-        <Show
-          when={selection() !== null && !contextEmpty()}
-          fallback={
-            <div class="am-tab-bar am-tab-bar-empty">
-              <div class="am-tab-leading">
-                <SidebarToggleButton collapsed={sidebarCollapsed()} onClick={toggleSidebar} />
-              </div>
-            </div>
-          }
-        >
-          <DragDropProvider
-            onDragStart={handleDragStart}
-            onDragEnd={handleDragEnd}
-            onDragOver={handleDragOver}
-            collisionDetector={closestCenter}
-          >
-            <DragDropSensors />
-            <ConstrainDragYAxis />
-            <div class="am-tab-bar" onPointerLeave={releaseTabs}>
-              <div class="am-tab-leading">
-                <SidebarToggleButton collapsed={sidebarCollapsed()} onClick={toggleSidebar} />
-              </div>
-              <div class="am-tab-scroll-area">
-                <div class={`am-tab-fade am-tab-fade-left ${tabScroll.showLeft() ? "am-tab-fade-visible" : ""}`} />
-                <div class="am-tab-list-wrap">
-                  <div
-                    class="am-tab-list"
-                    ref={tabScroll.setRef}
-                    role="tablist"
-                    aria-label={t("agentManager.shortcuts.category.tabs")}
-                    style={{ "--tab-count": `${tabIds().length}` } as JSX.CSSProperties}
-                  >
-                    <SortableProvider ids={tabIds()}>
-                      <For each={tabIds()}>
-                        {(id) =>
-                          renderTab(id, {
-                            terms,
-                            REVIEW_TAB_ID,
-                            tabIds,
-                            kb,
-                            reviewActive,
-                            currentSessionID: () => session.currentSessionID(),
-                            activePendingId,
-                            visibleTabId,
-                            isPending,
-                            isBusy: isSessionBusy,
-                            tabLookup,
-                            adjacentHint,
-                            activateTerminal: termHandlers.activate,
-                            deactivateTerminal: termHandlers.deactivate,
-                            closeTerminal: (id) => tabFocus.run(() => termHandlers.closeTerminal(id)),
-                            terminalMiddleClick: (id, event) =>
-                              tabFocus.middle(event, () => termHandlers.middleClick(id, event)),
-                            closeReview: closeReviewTab,
-                            reviewMiddleClick: handleReviewTabMouseDown,
-                            selectReviewTab: () => setReviewActive(true),
-                            selectSessionTab,
-                            sessionMiddleClick: handleTabMouseDown,
-                            sessionClose: handleCloseTab,
-                            sessionFork: handleForkSession,
-                            onTabKey: tabFocus.key,
-                            reviewLabel: t("session.tab.review"),
-                            reviewTooltip: t("command.review.toggle"),
-                          })
-                        }
-                      </For>
-                    </SortableProvider>
-                  </div>
-                </div>
-                <div class={`am-tab-fade am-tab-fade-right ${tabScroll.showRight() ? "am-tab-fade-visible" : ""}`} />
-              </div>
-              <Show when={selection() !== null}>
-                <div class="am-tab-add-wrap">
-                  <div class="am-tab-add-separator" />
-                  {renderNewTabButton({
-                    contextSelected: () => selection() !== null,
-                    kb,
-                    newSessionLabel: t("agentManager.session.new"),
-                    newTerminalLabel: t("agentManager.terminal.new"),
-                    newSessionMenuLabel: t("agentManager.session.newSession"),
-                    moreOptionsLabel: t("agentManager.tab.newOptions"),
-                    onNewSession: metrics.click("new_session", "tab_bar", handleAddSession),
-                    onNewTerminal: metrics.click("embedded_terminal", "new_tab_menu", () => termHandlers.requestNew()),
-                  })}
-                </div>
-              </Show>
-              <div class="am-tab-actions">
-                {(() => {
-                  const sel = () => selection()
-                  const isWorktree = () => typeof sel() === "string" && sel() !== LOCAL
-                  const stats = () => {
-                    if (sel() === LOCAL) return localStats()
-                    return typeof sel() === "string" ? worktreeStats()[sel() as string] : undefined
-                  }
-                  const hasChanges = () => {
-                    const s = stats()
-                    return s && (s.files > 0 || s.additions > 0 || s.deletions > 0)
-                  }
-                  const applyBusy = () => {
-                    const state = applyStateForSelection()
-                    if (!state) return false
-                    return state.status === "checking" || state.status === "applying"
-                  }
-                  return (
-                    <>
-                      <Show when={isWorktree()}>
-                        <>
-                          <Tooltip value={t("agentManager.open.tooltip")} placement="bottom">
-                            <Button size="small" variant="ghost" icon="folder" onClick={openWindow}>
-                              {t("agentManager.open.button")}
-                            </Button>
-                          </Tooltip>
-                          <Tooltip value={t("agentManager.apply.tooltip")} placement="bottom">
-                            <Button
-                              size="small"
-                              variant="ghost"
-                              onClick={openApplyDialog}
-                              disabled={!hasChanges() || applyBusy()}
-                            >
-                              <Show when={applyBusy()}>
-                                <Spinner class="am-apply-spinner" />
-                              </Show>
-                              {t("agentManager.apply.globalButton")}
-                            </Button>
-                          </Tooltip>
-                        </>
-                      </Show>
-                      <Show when={sel()}>
-                        {(() => {
-                          const rid = () => (sel() === LOCAL ? LOCAL : (sel() as string))
-                          const rs = () => runStatuses()[rid()]
-                          const active = () => rs()?.state === "running" || rs()?.state === "stopping"
-                          const configured = runScriptConfigured
-                          const title = () => (configured() ? (active() ? "Stop" : "Run") : "Configure run script")
-                          return (
-                            <span
-                              class={`am-run-group ${active() ? "am-run-active" : ""} ${!configured() ? "am-run-unconfigured" : ""}`}
-                            >
-                              <TooltipKeybind title={title()} keybind={kb().runScript ?? ""} placement="bottom">
-                                <Button
-                                  size="small"
-                                  variant="ghost"
-                                  icon={active() ? "stop" : "play"}
-                                  disabled={rs()?.state === "stopping"}
-                                  onClick={metrics.click(
-                                    "run_script",
-                                    "tab_toolbar",
-                                    () => runWorktree(rid()),
-                                    () => ({
-                                      action: active() ? "stop" : configured() ? "run" : "configure",
-                                    }),
-                                  )}
-                                >
-                                  {active() ? "Stop" : "Run"}
-                                </Button>
-                              </TooltipKeybind>
-                              <DropdownMenu gutter={4} placement="bottom-end">
-                                <DropdownMenu.Trigger
-                                  as={(p: Record<string, unknown>) => (
-                                    <IconButton
-                                      {...p}
-                                      icon="chevron-down"
-                                      size="small"
-                                      variant="ghost"
-                                      label={t("agentManager.run.options")}
-                                      class="am-run-group-chevron"
-                                    />
-                                  )}
-                                />
-                                <DropdownMenu.Portal>
-                                  <DropdownMenu.Content class="am-split-menu">
-                                    <DropdownMenu.Item
-                                      onSelect={metrics.click("configure_run_script", "run_menu", configureRunScript)}
-                                    >
-                                      <Icon name="settings-gear" size="small" />
-                                      <DropdownMenu.ItemLabel>{t("agentManager.run.configure")}</DropdownMenu.ItemLabel>
-                                    </DropdownMenu.Item>
-                                  </DropdownMenu.Content>
-                                </DropdownMenu.Portal>
-                              </DropdownMenu>
-                            </span>
-                          )
-                        })()}
-                      </Show>
-                      <TooltipKeybind
-                        title={t("agentManager.diff.toggle")}
-                        keybind={kb().toggleDiff ?? ""}
-                        placement="bottom"
-                      >
-                        <button
-                          class={`am-diff-toggle-btn ${diffOpen() && !reviewActive() ? "am-tab-diff-btn-active" : ""} ${hasChanges() ? "am-diff-toggle-has-changes" : ""}`}
-                          onClick={() => {
-                            metrics.track("side_review", "tab_toolbar", {
-                              action: diffOpen() && !reviewActive() ? "close" : "open",
-                            })
-                            if (reviewActive()) {
-                              closeReviewTab()
-                              setSidePanel("diff")
-                              return
-                            }
-                            setSidePanel((prev) => (prev === "diff" ? null : "diff"))
-                          }}
-                          title={t("agentManager.diff.toggle")}
-                        >
-                          <Icon name="layers" size="small" />
-                          <Show when={hasChanges()}>
-                            <span class="am-diff-toggle-stats">
-                              <Show when={stats()!.files > 0}>
-                                <span class="am-stat-files">{stats()!.files}f</span>
-                              </Show>
-                              <span class="am-stat-additions">+{stats()!.additions}</span>
-                              <span class="am-stat-deletions">−{stats()!.deletions}</span>
-                            </span>
-                          </Show>
-                        </button>
-                      </TooltipKeybind>
-                    </>
-                  )
-                })()}
-                <Show when={selection() !== null}>
-                  <Tooltip value={t("command.review.toggle")} placement="bottom">
-                    <IconButton
-                      icon="expand"
-                      size="small"
-                      variant="ghost"
-                      label={t("command.review.toggle")}
-                      class={reviewActive() ? "am-tab-diff-btn-active" : ""}
-                      onClick={metrics.click("fullscreen_review", "tab_toolbar", toggleReviewTab)}
-                    />
-                  </Tooltip>
-                </Show>
-                {/* Terminal destination split button: the primary action
-                    follows the user's setting (VS Code integrated terminal
-                    or the embedded side panel), the dropdown picks which.
-                    Cmd+Shift+T still creates an xterm tab via the `+` menu. */}
-                <TerminalDestinationButton
-                  destination={sideCtl.destination}
-                  active={() => sidePanel() === "terminal"}
-                  keybind={() => kb().showTerminal ?? ""}
-                  onOpen={() => sideCtl.openPreferred("tab_toolbar")}
-                  onChoose={sideCtl.choose}
-                />
-              </div>
-            </div>
-            <DragOverlay>
-              <Show when={draggedTab()}>
-                {(tab) => (
-                  <div class="am-tab am-tab-overlay">
-                    <span class="am-tab-label">{tab().title || t("agentManager.session.untitled")}</span>
-                  </div>
-                )}
-              </Show>
-            </DragOverlay>
-          </DragDropProvider>
-        </Show>
+        <TabBar
+          t={t}
+          bindings={kb}
+          selection={selection}
+          empty={contextEmpty}
+          collapsed={sidebarCollapsed()}
+          onToggleSidebar={toggleSidebar}
+          scroll={tabScroll}
+          ids={tabIds}
+          renderTab={renderTabById}
+          newTab={renderAddTab}
+          onDragStart={handleDragStart}
+          onDragEnd={handleDragEnd}
+          onDragOver={handleDragOver}
+          onRelease={releaseTabs}
+          overlay={draggedTab}
+          localStats={localStats}
+          worktreeStats={worktreeStats}
+          applyState={apply.applyStateForSelection}
+          reviewScope={review.scope}
+          onOpen={openWindow}
+          onApply={openApplyDialog}
+          runStatuses={runStatuses}
+          runConfigured={runScriptConfigured}
+          onRun={(id) => runWorktree(id, sideCtl.destination())}
+          onConfigureRun={configureRunScript}
+          diffOpen={diffOpen}
+          reviewActive={reviewActive}
+          onToggleDiff={toggleDiffPanel}
+          onToggleReview={metrics.click("fullscreen_review", "tab_toolbar", toggleReviewTab)}
+          terminalDestination={sideCtl.destination}
+          terminalDestinationActive={() => sidePanel() === "terminal"}
+          terminalKeybind={() => kb().showTerminal ?? ""}
+          onTerminalDestinationOpen={() => {
+            cancelAmbientSetup()
+            sideCtl.openPreferred("tab_toolbar")
+          }}
+          onTerminalDestinationChoose={sideCtl.choose}
+          track={metrics.click}
+        />
 
         {/* Empty worktree state */}
         <Show when={contextEmpty()}>
@@ -2960,7 +2430,7 @@ const AgentManagerContent: Component = () => {
             worktreeSessionIds={activeWorktreeSessionIds}
           />
         </Show>
-        <Show when={!contextEmpty() && !history()}>
+        <Show when={showDetailStack()}>
           {/* Terminal overlay is scoped to the main pane so it does not cover the tab bar or side panel. */}
           <div class="am-detail-stack">
             {/* Chat/terminal + side diff panel. Keep it mounted under the
@@ -2971,68 +2441,97 @@ const AgentManagerContent: Component = () => {
               <div class={`am-main-pane ${terms.activeId() ? "am-main-pane-terminal-active" : ""}`}>
                 {/* Keep terminal tabs mounted so output streams across worktree switches. */}
                 {renderTerminalLayer({ state: terms })}
-                <div class="am-chat-wrapper">
-                  <ChatView
-                    onSelectSession={(id) => {
-                      if (addSessionToCurrentWorktree(id)) return
-                      if (localSessionIDs().includes(id)) {
-                        session.selectSession(id)
-                        if (selection() === null) setSelection(LOCAL)
-                        return
+                {/* Session-less context (e.g. a worktree mid-provisioning): the
+                    empty state lives in the main pane so the side terminal
+                    panel can render next to it. */}
+                <Show when={contextEmpty()}>
+                  <div class="am-empty-state">
+                    <Show
+                      when={!settingUpSelection()}
+                      fallback={
+                        <>
+                          <Spinner class="am-setup-spinner" />
+                          <div class="am-empty-state-text">
+                            {settingUpSelection()?.message ?? t("agentManager.setup.settingUp")}
+                          </div>
+                        </>
                       }
-                      // Navigate to owning worktree instead of forcing into local mode
-                      if (worktreeSessionIds().has(id)) {
-                        const ms = managedSessions().find((s) => s.id === id)
-                        if (ms?.worktreeId) {
-                          selectWorktree(ms.worktreeId)
+                    >
+                      <div class="am-empty-state-icon">
+                        <Icon name="branch" size="large" />
+                      </div>
+                      <div class="am-empty-state-text">{t("agentManager.session.noSessions")}</div>
+                      <Button variant="primary" size="small" onClick={handleAddSession}>
+                        {t("agentManager.session.new")}
+                        <span class="am-shortcut-hint">{kb().newTab ?? ""}</span>
+                      </Button>
+                    </Show>
+                  </div>
+                </Show>
+                <Show when={!contextEmpty()}>
+                  <div class="am-chat-wrapper">
+                    <ChatView
+                      onSelectSession={(id) => {
+                        if (addSessionToCurrentWorktree(id)) return
+                        if (localSessionIDs().includes(id)) {
                           session.selectSession(id)
-                          setReviewActive(false)
+                          if (selection() === null) setSelection(LOCAL)
                           return
                         }
-                      }
-                      openLocally(id)
-                    }}
-                    onShowHistory={() => setHistory(true)}
-                    onForkMessage={readOnly() ? undefined : handleForkSession}
-                    onForkSession={readOnly() ? undefined : handleForkSession}
-                    readonly={readOnly()}
-                    continueInWorktree={selection() === LOCAL}
-                    promptBoxId={`agent-manager:${selection() ?? "unassigned"}`}
-                    pendingSessionID={selection() === LOCAL ? activePendingId() : undefined}
-                  />
-                  <Show when={readOnly()}>
-                    <div class="am-readonly-banner">
-                      <Icon name="branch" size="small" />
-                      <span class="am-readonly-text">{t("agentManager.session.readonly")}</span>
-                      <Button
-                        variant="secondary"
-                        size="small"
-                        onClick={() => {
-                          if (!loaded()) return
-                          const sid = session.currentSessionID()
-                          if (!sid) return
-                          metrics.track("open_session_locally", "readonly_banner")
-                          openLocally(sid)
-                        }}
-                      >
-                        {t("agentManager.session.openLocally")}
-                      </Button>
-                      <Button
-                        variant="primary"
-                        size="small"
-                        onClick={() => {
-                          if (!loaded()) return
-                          const sid = session.currentSessionID()
-                          if (!sid) return
-                          metrics.track("promote_session", "readonly_banner")
-                          vscode.postMessage({ type: "agentManager.promoteSession", sessionId: sid })
-                        }}
-                      >
-                        {t("agentManager.session.openInWorktree")}
-                      </Button>
-                    </div>
-                  </Show>
-                </div>
+                        // Navigate to owning worktree instead of forcing into local mode
+                        if (worktreeSessionIds().has(id)) {
+                          const ms = managedSessions().find((s) => s.id === id)
+                          if (ms?.worktreeId) {
+                            selectWorktree(ms.worktreeId)
+                            session.selectSession(id)
+                            setReviewActive(false)
+                            return
+                          }
+                        }
+                        openLocally(id)
+                      }}
+                      onShowHistory={() => setHistory(true)}
+                      onForkMessage={readOnly() ? undefined : handleForkSession}
+                      onForkSession={readOnly() ? undefined : handleForkSession}
+                      readonly={readOnly()}
+                      continueInWorktree={selection() === LOCAL}
+                      promptBoxId={`agent-manager:${selection() ?? "unassigned"}`}
+                      pendingSessionID={selection() === LOCAL ? activePendingId() : undefined}
+                    />
+                    <Show when={readOnly()}>
+                      <div class="am-readonly-banner">
+                        <Icon name="branch" size="small" />
+                        <span class="am-readonly-text">{t("agentManager.session.readonly")}</span>
+                        <Button
+                          variant="secondary"
+                          size="small"
+                          onClick={() => {
+                            if (!loaded()) return
+                            const sid = session.currentSessionID()
+                            if (!sid) return
+                            metrics.track("open_session_locally", "readonly_banner")
+                            openLocally(sid)
+                          }}
+                        >
+                          {t("agentManager.session.openLocally")}
+                        </Button>
+                        <Button
+                          variant="primary"
+                          size="small"
+                          onClick={() => {
+                            if (!loaded()) return
+                            const sid = session.currentSessionID()
+                            if (!sid) return
+                            metrics.track("promote_session", "readonly_banner")
+                            vscode.postMessage({ type: "agentManager.promoteSession", sessionId: sid })
+                          }}
+                        >
+                          {t("agentManager.session.openInWorktree")}
+                        </Button>
+                      </div>
+                    </Show>
+                  </div>
+                </Show>
               </div>
               {/* One inspector host for all right-side modes. It stays
                   mounted while a side terminal is alive — hidden via
@@ -3060,8 +2559,11 @@ const AgentManagerContent: Component = () => {
                         diffs={reviewDiffs()}
                         loading={diffLoading()}
                         loadingFiles={diffFileLoadingForCurrent()}
-                        sessionId={currentDiffSessionId()}
+                        sessionId={activeDiffSession()}
                         sessionKey={diffSessionKey()}
+                        notice={diffNotice()}
+                        lead={diffScopeControls(true)}
+                        canRevert={scopeCapabilities(review.scope()).revert}
                         diffStyle={reviewDiffStyle()}
                         onDiffStyleChange={setSharedDiffStyle}
                         markdownRender={markdown.render()}
@@ -3078,10 +2580,9 @@ const AgentManagerContent: Component = () => {
                         }
                         onRequestDiff={requestDiffFile}
                         onOpenFile={(file, line) => {
-                          const id = currentDiffSessionId()
+                          const id = diffCtx()
                           if (id)
                             vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file, line })
-                          else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file, line })
                         }}
                         onRevertFile={metrics.use("revert_file", "side_review", revertCtl.revert)}
                         revertingFiles={revertCtl.reverting()}
@@ -3092,8 +2593,23 @@ const AgentManagerContent: Component = () => {
                       state={terms}
                       contextKey={terms.sideKey}
                       visible={() => sidePanel() === "terminal"}
-                      onClose={() => sideCtl.close()}
-                      onStart={() => termHandlers.requestSide()}
+                      onSelect={(id) => termHandlers.selectSide(id)}
+                      onClose={(id) => {
+                        cancelAmbientSetup()
+                        termHandlers.closeSide(id)
+                      }}
+                      onCloseOthers={(id) => {
+                        cancelAmbientSetup()
+                        termHandlers.closeSideOthers(id)
+                      }}
+                      onStart={() => {
+                        cancelAmbientSetup()
+                        termHandlers.addSide()
+                      }}
+                      onStop={(id) => {
+                        cancelAmbientSetup()
+                        termHandlers.stopSide(id)
+                      }}
                     />
                   </div>
                 </div>
@@ -3106,8 +2622,12 @@ const AgentManagerContent: Component = () => {
                   diffs={reviewDiffs()}
                   loading={diffLoading()}
                   loadingFiles={diffFileLoadingForCurrent()}
-                  sessionId={currentDiffSessionId()}
+                  sessionId={activeDiffSession()}
                   sessionKey={diffSessionKey()}
+                  notice={diffNotice()}
+                  lead={diffScopeControls(false)}
+                  canRevert={scopeCapabilities(review.scope()).revert}
+                  canComment={scopeCapabilities(review.scope()).comments}
                   comments={reviewComments()}
                   onCommentsChange={setReviewCommentsForSelection}
                   composer={reviewComposer}
@@ -3119,9 +2639,8 @@ const AgentManagerContent: Component = () => {
                   onMarkdownRenderChange={markdown.update}
                   onRequestDiff={requestDiffFile}
                   onOpenFile={(file, line) => {
-                    const id = currentDiffSessionId()
+                    const id = diffCtx()
                     if (id) vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file, line })
-                    else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file, line })
                   }}
                   onRevertFile={metrics.use("revert_file", "fullscreen_review", revertCtl.revert)}
                   revertingFiles={revertCtl.reverting()}
@@ -3139,53 +2658,16 @@ const AgentManagerContent: Component = () => {
 
 export const AgentManagerApp: Component = () => {
   return (
-    <ThemeProvider defaultTheme="kilo-vscode">
-      <DialogProvider>
-        <VSCodeProvider>
-          <MermaidDownloadBridge />
-          <ServerProvider>
-            <LanguageBridge>
-              <MarkedProvider>
-                <DiffComponentProvider component={Diff}>
-                  <CodeComponentProvider component={Code}>
-                    <FileComponentProvider component={File}>
-                      <ProviderProvider>
-                        <ConfigProvider>
-                          <SpeechToTextPrewarm />
-                          <DisplayProvider>
-                            <IndexingProvider>
-                              <KiloEmbeddingModelsProvider>
-                                <ImageModelsProvider>
-                                  <NotificationsProvider>
-                                    <SessionProvider>
-                                      <AgentRequirementsProvider>
-                                        <MemoryProvider>
-                                          <FeedbackProvider>
-                                            <WorktreeModeProvider>
-                                              <DataBridge>
-                                                <AgentManagerContent />
-                                              </DataBridge>
-                                            </WorktreeModeProvider>
-                                          </FeedbackProvider>
-                                        </MemoryProvider>
-                                      </AgentRequirementsProvider>
-                                    </SessionProvider>
-                                  </NotificationsProvider>
-                                </ImageModelsProvider>
-                              </KiloEmbeddingModelsProvider>
-                            </IndexingProvider>
-                          </DisplayProvider>
-                        </ConfigProvider>
-                      </ProviderProvider>
-                    </FileComponentProvider>
-                  </CodeComponentProvider>
-                </DiffComponentProvider>
-              </MarkedProvider>
-            </LanguageBridge>
-          </ServerProvider>
-        </VSCodeProvider>
-        <Toast.Region />
-      </DialogProvider>
-    </ThemeProvider>
+    <ProviderShell.Root>
+      <ProviderShell.Session>
+        <ProviderShell.Chat>
+          <WorktreeModeProvider>
+            <DataBridge>
+              <AgentManagerContent />
+            </DataBridge>
+          </WorktreeModeProvider>
+        </ProviderShell.Chat>
+      </ProviderShell.Session>
+    </ProviderShell.Root>
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx
index 1d5750caa4..083d892d55 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx
@@ -1,4 +1,4 @@
-import { type Component, createSignal, createMemo, Show, createEffect, on } from "solid-js"
+import { type Component, createSignal, createMemo, Show, createEffect, on, type JSXElement } from "solid-js"
 import type { VirtualizerHandle } from "virtua/solid"
 import { Diff } from "@kilocode/kilo-ui/diff"
 import { Accordion } from "@kilocode/kilo-ui/accordion"
@@ -7,7 +7,6 @@ import { FileIcon } from "@kilocode/kilo-ui/file-icon"
 import { DiffChanges } from "@kilocode/kilo-ui/diff-changes"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Button } from "@kilocode/kilo-ui/button"
-import { RadioGroup } from "@kilocode/kilo-ui/radio-group"
 import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
@@ -15,6 +14,7 @@ import type { DiffLineAnnotation, AnnotationSide, SelectedLineRange } from "@pie
 import type { WorktreeFileDiff } from "../src/types/messages"
 import { KILO_FILE_PATH_MIME } from "../src/utils/path-mentions"
 import { useLanguage } from "../src/context/language"
+import { DiffStyleSelect } from "../diff-viewer/InlineSelect"
 import { useVSCode } from "../src/context/vscode"
 import { useServer } from "../src/context/server"
 import { useProvider } from "../src/context/provider"
@@ -64,12 +64,19 @@ import { createDiffRequests } from "../diff-viewer/diff-requests"
 
 // --- Data model ---
 
+/** Well-known diff source notices → i18n keys (mirrors the standalone viewer). */
+const DIFF_NOTICE_KEYS: Record<string, string> = {
+  "snapshots-disabled": "diffViewer.notice.snapshotsDisabled",
+}
+
 interface DiffPanelProps {
   diffs: WorktreeFileDiff[]
   loading: boolean
   loadingFiles?: Set<string>
   sessionId?: string
   sessionKey?: string
+  /** Well-known source notice kind (e.g. "snapshots-disabled"), shown as a banner. */
+  notice?: string
   diffStyle?: "unified" | "split"
   onDiffStyleChange?: (style: "unified" | "split") => void
   markdownRender?: boolean
@@ -86,10 +93,19 @@ interface DiffPanelProps {
   onRevertFile?: (file: string) => void
   revertingFiles?: Set<string>
   activeTerminalId?: string
+  /** Optional leading row rendered under the header (e.g. the scope selector). */
+  lead?: JSXElement
+  /** Defaults to true. Hides the per-file Revert action when false. */
+  canRevert?: boolean
 }
 
 export const DiffPanel: Component<DiffPanelProps> = (props) => {
   const { t } = useLanguage()
+  const noticeText = () => {
+    const n = props.notice
+    if (!n) return ""
+    return t(DIFF_NOTICE_KEYS[n] ?? n)
+  }
   const vscode = useVSCode()
   const server = useServer()
   const provider = useProvider()
@@ -475,21 +491,18 @@ export const DiffPanel: Component<DiffPanelProps> = (props) => {
     <div class="am-diff-panel" onKeyDown={handleKeyDown} onMouseDown={handleRootMouseDown} tabIndex={-1} ref={rootRef}>
       <div class="am-diff-header">
         <div class="am-diff-header-main">
-          <span class="am-diff-header-title">{t("session.review.change.other")}</span>
+          {/* Scope + base picker replace the static "Changes" title: it names
+              what you're looking at and is the primary control. Always shown,
+              so an empty scope can still be switched away from. */}
+          <Show when={props.lead}>{props.lead}</Show>
           <Show when={props.diffs.length > 0}>
             <>
-              <RadioGroup
-                options={["unified", "split"] as const}
-                current={props.diffStyle ?? "unified"}
-                size="small"
-                value={(style) => style}
-                label={(style) =>
-                  style === "unified" ? t("ui.sessionReview.diffStyle.unified") : t("ui.sessionReview.diffStyle.split")
-                }
-                onSelect={(style) => {
-                  if (!style) return
-                  props.onDiffStyleChange?.(style)
-                }}
+              <DiffStyleSelect
+                value={props.diffStyle ?? "unified"}
+                onSelect={(style) => props.onDiffStyleChange?.(style)}
+                unifiedLabel={t("ui.sessionReview.diffStyle.unified")}
+                splitLabel={t("ui.sessionReview.diffStyle.split")}
+                title={t("ui.sessionReview.diffStyle.unified")}
               />
               <span class="am-diff-header-stats">
                 <span>{t("session.review.filesChanged", { count: totals().files })}</span>
@@ -536,6 +549,15 @@ export const DiffPanel: Component<DiffPanelProps> = (props) => {
         </div>
       </div>
 
+      <Show when={noticeText()}>
+        <div class="diff-viewer-notice" role="status">
+          <span class="diff-viewer-notice-icon">
+            <Icon name="warning" size="small" />
+          </span>
+          <span class="diff-viewer-notice-text">{noticeText()}</span>
+        </div>
+      </Show>
+
       <Show when={props.loading && props.diffs.length === 0}>
         <div class="am-diff-loading">
           <Spinner />
@@ -543,7 +565,7 @@ export const DiffPanel: Component<DiffPanelProps> = (props) => {
         </div>
       </Show>
 
-      <Show when={!props.loading && props.diffs.length === 0}>
+      <Show when={!props.loading && props.diffs.length === 0 && !noticeText()}>
         <div class="am-diff-empty">
           <span>{t("session.review.noChanges")}</span>
         </div>
@@ -636,7 +658,7 @@ export const DiffPanel: Component<DiffPanelProps> = (props) => {
                                 />
                               </Tooltip>
                             </Show>
-                            <Show when={props.onRevertFile}>
+                            <Show when={props.onRevertFile && props.canRevert !== false}>
                               <Tooltip value={t("agentManager.diff.revertFile")} placement="top">
                                 <IconButton
                                   icon="discard"
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx b/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
index e141c5f077..a91193c725 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
@@ -74,7 +74,9 @@ function sanitizeBranchName(name: string): string {
     .join("/")
 }
 
-export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBranch?: string }> = (props) => {
+export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBranch?: string; projectId?: string }> = (
+  props,
+) => {
   const { t } = useLanguage()
   const vscode = useVSCode()
   const server = useServer()
@@ -250,7 +252,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
 
   onMount(() => {
     setBranchesLoading(true)
-    vscode.postMessage({ type: "agentManager.requestBranches" })
+    vscode.postMessage({ type: "agentManager.requestBranches", projectId: props.projectId })
     // Resize textarea if restoring a cached prompt
     if (prompt()) adjustHeight()
     const focus = () => {
@@ -302,6 +304,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
 
     vscode.postMessage({
       type: "agentManager.createMultiVersion",
+      projectId: props.projectId,
       text,
       name: name().trim() || undefined,
       versions: count,
@@ -470,7 +473,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
     const url = prUrl().trim()
     if (!url || isPending()) return
     setPrPending(true)
-    vscode.postMessage({ type: "agentManager.importFromPR", url })
+    vscode.postMessage({ type: "agentManager.importFromPR", projectId: props.projectId, url })
   }
 
   const handleBranchSelect = (name: string) => {
@@ -479,7 +482,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
     setImportPending(true)
     setBranchOpen(false)
     setBranchSearch("")
-    vscode.postMessage({ type: "agentManager.importFromBranch", branch: name })
+    vscode.postMessage({ type: "agentManager.importFromBranch", projectId: props.projectId, branch: name })
   }
 
   return (
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectActions.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectActions.tsx
new file mode 100644
index 0000000000..80d44c36be
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectActions.tsx
@@ -0,0 +1,96 @@
+/** @jsxImportSource solid-js */
+
+import type { Component } from "solid-js"
+import { DropdownMenu } from "@kilocode/kilo-ui/dropdown-menu"
+import { Icon } from "@kilocode/kilo-ui/icon"
+import { IconButton } from "@kilocode/kilo-ui/icon-button"
+import { TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
+import type { LanguageContextValue } from "../src/context/language"
+import { parseBindingTokens } from "./keybind-tokens"
+
+interface Props {
+  branch: string
+  bindings: Record<string, string>
+  loaded: boolean
+  t: LanguageContextValue["t"]
+  onCreate: () => void
+  onNew: () => void
+  onSection: () => void
+  onSetup: () => void
+  onBranch: () => void
+}
+
+export const ProjectActions: Component<Props> = (props) => (
+  <div class="am-project-actions">
+    <div class="am-split-button">
+      <TooltipKeybind
+        title={props.t("agentManager.shortcuts.advancedWorktree")}
+        keybind={props.bindings.newWorktree ?? ""}
+      >
+        <IconButton
+          icon="plus"
+          size="small"
+          variant="ghost"
+          label={props.t("agentManager.worktree.new")}
+          onClick={props.onNew}
+          disabled={!props.loaded}
+        />
+      </TooltipKeybind>
+      <DropdownMenu gutter={4} placement="bottom-end">
+        <DropdownMenu.Trigger
+          class="am-split-arrow"
+          aria-label={props.t("agentManager.worktree.advancedOptions")}
+          disabled={!props.loaded}
+        >
+          <Icon name="chevron-down" size="small" />
+        </DropdownMenu.Trigger>
+        <DropdownMenu.Portal>
+          <DropdownMenu.Content class="am-split-menu">
+            <DropdownMenu.Item onSelect={props.onCreate}>
+              <span class="am-worktree-menu-gap" aria-hidden="true" />
+              <DropdownMenu.ItemLabel class="am-worktree-menu-label">
+                <span>{props.t("sidebar.session.newWorktree.from")}</span>
+                <span class="am-worktree-menu-branch">
+                  <Icon name="branch" size="small" />
+                  <strong>{props.branch}</strong>
+                </span>
+              </DropdownMenu.ItemLabel>
+              <span class="am-menu-shortcut">
+                {parseBindingTokens(props.bindings.quickWorktree ?? "").map((token) => (
+                  <kbd class="am-menu-key">{token}</kbd>
+                ))}
+              </span>
+            </DropdownMenu.Item>
+            <DropdownMenu.Separator />
+            <DropdownMenu.Item onSelect={props.onSection}>
+              <Icon name="plus" size="small" />
+              <DropdownMenu.ItemLabel>{props.t("agentManager.worktree.newSection")}</DropdownMenu.ItemLabel>
+            </DropdownMenu.Item>
+          </DropdownMenu.Content>
+        </DropdownMenu.Portal>
+      </DropdownMenu>
+    </div>
+    <DropdownMenu gutter={4} placement="bottom-end">
+      <DropdownMenu.Trigger
+        as={IconButton}
+        icon="settings-gear"
+        size="small"
+        variant="ghost"
+        label={props.t("agentManager.worktree.settings")}
+      />
+      <DropdownMenu.Portal>
+        <DropdownMenu.Content class="am-split-menu">
+          <DropdownMenu.Item onSelect={props.onSetup}>
+            <DropdownMenu.ItemLabel>{props.t("agentManager.worktree.setupScript")}</DropdownMenu.ItemLabel>
+          </DropdownMenu.Item>
+          <DropdownMenu.Separator />
+          <DropdownMenu.Item onSelect={props.onBranch}>
+            <DropdownMenu.ItemLabel>
+              {props.t("agentManager.worktree.defaultBaseBranch")}: {props.branch}
+            </DropdownMenu.ItemLabel>
+          </DropdownMenu.Item>
+        </DropdownMenu.Content>
+      </DropdownMenu.Portal>
+    </DropdownMenu>
+  </div>
+)
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectBranchDialog.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectBranchDialog.tsx
new file mode 100644
index 0000000000..423172f237
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectBranchDialog.tsx
@@ -0,0 +1,73 @@
+/** @jsxImportSource solid-js */
+
+import { createMemo, createSignal, onCleanup, onMount, type Component } from "solid-js"
+import { Dialog } from "@kilocode/kilo-ui/dialog"
+import { BranchSelect } from "../src/components/shared/BranchSelect"
+import { useLanguage } from "../src/context/language"
+import { useVSCode } from "../src/context/vscode"
+import type { AgentManagerBranchesMessage, BranchInfo } from "../src/types/messages"
+
+interface Props {
+  projectId: string
+  selected?: string
+  detected?: string
+  onClose: () => void
+}
+
+export const ProjectBranchDialog: Component<Props> = (props) => {
+  const { t } = useLanguage()
+  const vscode = useVSCode()
+  const [search, setSearch] = createSignal("")
+  const [branches, setBranches] = createSignal<BranchInfo[]>([])
+  const [loading, setLoading] = createSignal(true)
+  const [highlighted, setHighlighted] = createSignal(-1)
+  const filtered = createMemo(() => {
+    const value = search().toLowerCase()
+    return value ? branches().filter((branch) => branch.name.toLowerCase().includes(value)) : branches()
+  })
+  const select = (branch?: string) => {
+    vscode.postMessage({ type: "agentManager.setDefaultBaseBranch", projectId: props.projectId, branch })
+    props.onClose()
+  }
+  const unsubscribe = vscode.onMessage((message) => {
+    if (message.type !== "agentManager.branches") return
+    const event = message as AgentManagerBranchesMessage
+    setBranches(event.branches)
+    setLoading(false)
+  })
+  onCleanup(unsubscribe)
+  onMount(() => vscode.postMessage({ type: "agentManager.requestBranches", projectId: props.projectId }))
+
+  return (
+    <Dialog title={t("agentManager.worktree.defaultBaseBranch")} fit>
+      <div class="am-default-base-branch">
+        <BranchSelect
+          branches={filtered()}
+          loading={loading()}
+          search={search()}
+          onSearch={(value) => {
+            setSearch(value)
+            setHighlighted(-1)
+          }}
+          onSelect={(branch) => select(branch.name)}
+          selected={props.selected}
+          highlighted={highlighted()}
+          onHighlight={setHighlighted}
+          searchPlaceholder={t("agentManager.dialog.searchBranches")}
+          emptyLabel={t("agentManager.import.noMatchingBranches")}
+          loadingLabel={t("agentManager.import.loadingBranches")}
+          defaultLabel={t("agentManager.dialog.branchBadge.default")}
+          remoteLabel={t("agentManager.dialog.branchBadge.remote")}
+          defaultName={props.selected ?? props.detected}
+          autoOption={{
+            label: t("agentManager.worktree.defaultBaseBranchAuto"),
+            hint: props.detected,
+            active: !props.selected,
+            highlighted: highlighted() === -1,
+            onSelect: () => select(),
+          }}
+        />
+      </div>
+    </Dialog>
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx
new file mode 100644
index 0000000000..fa03d3e0c4
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx
@@ -0,0 +1,225 @@
+import { createMemo, type Component } from "solid-js"
+import { IconButton } from "@kilocode/kilo-ui/icon-button"
+import { TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
+import type {
+  AgentManagerStateMessage,
+  AgentProjectSnapshot,
+  LocalGitStats,
+  PRStatus,
+  ProjectSessionInfo,
+  WorktreeGitStats,
+} from "../src/types/messages"
+import type { LanguageContextValue } from "../src/context/language"
+import { useDialog } from "@kilocode/kilo-ui/context/dialog"
+import { useVSCode } from "../src/context/vscode"
+import { ProjectsSection } from "./ProjectsSection"
+import { ProjectSidebarBody } from "./ProjectSidebarBody"
+import { SidebarSearchMenu, type SidebarSearchMenuRef } from "./SidebarSearchMenu"
+import type { SidebarSearchItem } from "./sidebar-search"
+import { LOCAL } from "./navigate"
+import { NewWorktreeDialog } from "./NewWorktreeDialog"
+import { ProjectBranchDialog } from "./ProjectBranchDialog"
+
+interface Props {
+  projects: AgentProjectSnapshot[]
+  states: Record<string, AgentManagerStateMessage>
+  stats: Record<string, Record<string, WorktreeGitStats>>
+  local: Record<string, LocalGitStats>
+  prs: Record<string, Record<string, PRStatus | null>>
+  sessions: Record<string, ProjectSessionInfo[]>
+  selectedProject?: string
+  selection?: string
+  currentSessionID?: () => string | undefined
+  busy?: (id: string) => boolean
+  bindings: Record<string, string>
+  t: LanguageContextValue["t"]
+  onSearchRef: (ref: SidebarSearchMenuRef) => void
+  onShortcuts: () => void
+}
+
+export const ProjectList: Component<Props> = (props) => {
+  const vscode = useVSCode()
+  const dialog = useDialog()
+  const select = (target: Record<string, unknown>) =>
+    vscode.postMessage({ type: "agentManager.activateSelection", target } as never)
+  const search = createMemo(() => {
+    const items: SidebarSearchItem[] = []
+    for (const project of props.projects) {
+      const state = props.states[project.id]
+      if (!state) continue
+      const local = props.sessions[project.id]?.filter((session) => session.worktreeId === null) ?? []
+      items.push({
+        key: `${project.id}:local`,
+        projectId: project.id,
+        kind: "local",
+        group: "contexts",
+        title: `${project.label} · ${props.t("agentManager.local")}`,
+        meta: props.local[project.id]?.branch ? [props.local[project.id]!.branch] : [],
+        search: [project.label, props.t("agentManager.local"), props.local[project.id]?.branch]
+          .filter(Boolean)
+          .join(" "),
+        updatedAt: local.reduce((latest, session) => (session.updatedAt > latest ? session.updatedAt : latest), ""),
+        state: "idle",
+        visible: project.expanded,
+        count: local.length,
+      })
+      for (const worktree of state.worktrees) {
+        const sessions = props.sessions[project.id]?.filter((session) => session.worktreeId === worktree.id) ?? []
+        items.push({
+          key: `${project.id}:worktree:${worktree.id}`,
+          projectId: project.id,
+          kind: "worktree",
+          group: "contexts",
+          title: worktree.label || worktree.branch,
+          meta: [project.label, worktree.branch],
+          search: [project.label, worktree.label, worktree.branch, worktree.id].filter(Boolean).join(" "),
+          updatedAt: worktree.createdAt,
+          state: "idle",
+          visible: project.expanded,
+          worktreeId: worktree.id,
+          count: sessions.length,
+        })
+      }
+      for (const session of props.sessions[project.id] ?? []) {
+        items.push({
+          key: `${project.id}:session:${session.id}`,
+          projectId: project.id,
+          kind: "session",
+          group: "sessions",
+          title: session.title || props.t("agentManager.session.untitled"),
+          meta: [project.label],
+          search: [project.label, session.title, session.id].filter(Boolean).join(" "),
+          updatedAt: session.updatedAt,
+          state: "idle",
+          visible: project.expanded,
+          sessionId: session.id,
+          location: session.worktreeId ? "worktree" : "local",
+          worktreeId: session.worktreeId ?? undefined,
+        })
+      }
+    }
+    return items
+  })
+  const current = createMemo(() => {
+    const projectId = props.selectedProject
+    if (!projectId) return
+    const worktree = search().find(
+      (item) => item.projectId === projectId && item.kind === "worktree" && item.worktreeId === props.selection,
+    )
+    if (worktree) return worktree
+    // On LOCAL, an open session tab is the active item when there is one, so the
+    // menu highlights the same row the sidebar does.
+    const session = props.currentSessionID?.()
+    if (session) {
+      const match = search().find(
+        (item) => item.projectId === projectId && item.kind === "session" && item.sessionId === session,
+      )
+      if (match) return match
+    }
+    if (props.selection === LOCAL) return search().find((item) => item.key === `${projectId}:local`)
+    return undefined
+  })
+  const selectSearch = (item: SidebarSearchItem) => {
+    if (!item.projectId) return
+    if (item.kind === "local") return select({ projectId: item.projectId, kind: "local" })
+    if (item.kind === "worktree")
+      return select({ projectId: item.projectId, kind: "worktree", worktreeId: item.worktreeId })
+    return select({ projectId: item.projectId, kind: "session", sessionId: item.sessionId })
+  }
+  const newWorktree = (projectId: string) => {
+    const state = props.states[projectId]
+    dialog.show(() => (
+      <NewWorktreeDialog
+        projectId={projectId}
+        defaultBaseBranch={state?.defaultBaseBranch ?? props.local[projectId]?.branch}
+        onClose={() => dialog.close()}
+      />
+    ))
+  }
+  const defaultBranch = (projectId: string, selected?: string, detected?: string) =>
+    dialog.show(() => (
+      <ProjectBranchDialog
+        projectId={projectId}
+        selected={selected}
+        detected={detected}
+        onClose={() => dialog.close()}
+      />
+    ))
+  return (
+    <ProjectsSection
+      projects={props.projects}
+      t={props.t}
+      tools={
+        <>
+          <SidebarSearchMenu
+            ref={props.onSearchRef}
+            items={search}
+            current={current}
+            keybind={props.bindings.search ?? ""}
+            portal
+            labels={{
+              search: props.t("agentManager.sidebarSearch.label"),
+              scope: props.t("agentManager.sidebarSearch.scope"),
+              sessions: props.t("agentManager.section.sessions"),
+              contexts: props.t("agentManager.sidebarSearch.contexts"),
+              waiting: props.t("agentManager.tabsMenu.status.waiting"),
+              retry: props.t("agentManager.tabsMenu.status.retry"),
+            }}
+            onSelect={selectSearch}
+          />
+          <TooltipKeybind
+            title={props.t("agentManager.shortcuts.title")}
+            keybind={props.bindings.showShortcuts ?? ""}
+            placement="bottom"
+          >
+            <IconButton
+              icon="keyboard"
+              size="small"
+              variant="ghost"
+              label={props.t("agentManager.shortcuts.title")}
+              onClick={props.onShortcuts}
+            />
+          </TooltipKeybind>
+        </>
+      }
+      onAdd={() => vscode.postMessage({ type: "agentManager.addProject" })}
+      onSelect={(projectId) =>
+        // Selecting the project itself returns to where the user left off in it;
+        // the extension resolves its persisted target authoritatively.
+        vscode.postMessage({
+          type: "agentManager.activateSelection",
+          target: { projectId, kind: "local" },
+          restore: true,
+        })
+      }
+      onRemove={(projectId) => vscode.postMessage({ type: "agentManager.removeProject", projectId })}
+      onTrust={(projectId) => vscode.postMessage({ type: "agentManager.trustProject", projectId })}
+      onExpand={(projectId, expanded) =>
+        vscode.postMessage({ type: "agentManager.setProjectExpanded", projectId, expanded })
+      }
+      count={(projectId) => {
+        const state = props.states[projectId]
+        return state ? state.worktrees.length + 1 : undefined
+      }}
+      body={(project) => (
+        <ProjectSidebarBody
+          project={project}
+          state={props.states[project.id]}
+          stats={props.stats[project.id]}
+          local={props.local[project.id]}
+          prs={props.prs[project.id]}
+          sessions={props.sessions[project.id]}
+          selectedProject={props.selectedProject}
+          selection={props.selection}
+          bindings={props.bindings}
+          t={props.t}
+          onSelectLocal={(projectId) => select({ projectId, kind: "local" })}
+          onSelectWorktree={(projectId, worktreeId) => select({ projectId, kind: "worktree", worktreeId })}
+          onSelectSession={(projectId, sessionId) => select({ projectId, kind: "session", sessionId })}
+          onNewWorktree={newWorktree}
+          onDefaultBranch={defaultBranch}
+        />
+      )}
+    />
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx
new file mode 100644
index 0000000000..2ddd29cb8a
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx
@@ -0,0 +1,269 @@
+import { For, Show, createMemo, createSignal, onCleanup, type Component } from "solid-js"
+import { Icon } from "@kilocode/kilo-ui/icon"
+import { Spinner } from "@kilocode/kilo-ui/spinner"
+import { DragDropProvider, DragDropSensors } from "@thisbeyond/solid-dnd"
+import type {
+  AgentManagerStateMessage,
+  AgentProjectSnapshot,
+  LocalGitStats,
+  PRStatus,
+  ProjectSessionInfo,
+  WorktreeGitStats,
+} from "../src/types/messages"
+import type { LanguageContextValue } from "../src/context/language"
+import { useVSCode } from "../src/context/vscode"
+import { formatRelativeDate } from "../src/utils/date"
+import SectionHeader from "./SectionHeader"
+import { WorktreeItem } from "./WorktreeItem"
+import { UnassignedSessionsSection } from "./UnassignedSessionsSection"
+import { ProjectActions } from "./ProjectActions"
+
+interface Props {
+  project: AgentProjectSnapshot
+  state?: AgentManagerStateMessage
+  busy?: (id: string) => boolean
+  stats?: Record<string, WorktreeGitStats>
+  local?: LocalGitStats
+  prs?: Record<string, PRStatus | null>
+  sessions?: ProjectSessionInfo[]
+  selectedProject?: string
+  selection?: string
+  bindings: Record<string, string>
+  t: LanguageContextValue["t"]
+  onSelectLocal: (projectId: string) => void
+  onSelectWorktree: (projectId: string, worktreeId: string) => void
+  onSelectSession: (projectId: string, sessionId: string) => void
+  onNewWorktree: (projectId: string) => void
+  onDefaultBranch: (projectId: string, selected?: string, detected?: string) => void
+}
+
+/** Permanent real sidebar body for one expanded project. */
+export const ProjectSidebarBody: Component<Props> = (props) => {
+  const vscode = useVSCode()
+  const [pending, setPending] = createSignal<string>()
+  const [renaming, setRenaming] = createSignal<string>()
+  const [name, setName] = createSignal("")
+  let pendingTimer: ReturnType<typeof setTimeout> | undefined
+  onCleanup(() => clearTimeout(pendingTimer))
+  /** Arm on the first click, execute on the second, matching the legacy sidebar. */
+  const confirmDelete = (worktreeId: string) => {
+    if (pending() === worktreeId) {
+      clearTimeout(pendingTimer)
+      setPending(undefined)
+      post({ type: "agentManager.deleteWorktree", worktreeId })
+      return
+    }
+    clearTimeout(pendingTimer)
+    setPending(worktreeId)
+    pendingTimer = setTimeout(() => setPending(undefined), 2500)
+  }
+  const state = () => props.state
+  const sessions = (worktreeId: string | null) =>
+    (props.sessions ?? []).filter((item) => item.worktreeId === worktreeId)
+  const active = () => props.selectedProject === props.project.id
+  const runs = createMemo(() => Object.fromEntries((state()?.runStatuses ?? []).map((run) => [run.worktreeId, run])))
+  const sections = () => state()?.sections ?? []
+  const localSessions = () => sessions(null)
+  const ungrouped = () => state()?.worktrees.filter((wt) => !wt.sectionId) ?? []
+  const members = (sectionId: string) => state()?.worktrees.filter((wt) => wt.sectionId === sectionId) ?? []
+  const post = (message: Record<string, unknown>) =>
+    vscode.postMessage({ ...message, projectId: props.project.id } as never)
+
+  // Escape unmounts the focused rename input, which fires a synchronous blur
+  // that would re-commit the cancelled value; this flag swallows that blur.
+  let cancelled = false
+  const commitRename = (worktreeId: string) => {
+    if (cancelled) {
+      cancelled = false
+      return
+    }
+    const label = name().trim()
+    setRenaming(undefined)
+    if (label) post({ type: "agentManager.renameWorktree", worktreeId, label })
+  }
+  const cancelRename = () => {
+    cancelled = true
+    setRenaming(undefined)
+  }
+
+  const renderWorktree = (worktree: NonNullable<Props["state"]>["worktrees"][number]) => (
+    <WorktreeItem
+      worktree={worktree}
+      sidebarId={`${props.project.id}:${worktree.id}`}
+      label={worktree.label || worktree.branch}
+      subtitle={worktree.label && worktree.label !== worktree.branch ? worktree.branch : undefined}
+      active={active() && props.selection === worktree.id}
+      pendingDelete={pending() === worktree.id}
+      busy={props.busy?.(worktree.id) ?? false}
+      working={runs()[worktree.id]?.state === "running"}
+      stale={state()?.staleWorktreeIds?.includes(worktree.id) === true}
+      stats={props.stats?.[worktree.id]}
+      sessions={sessions(worktree.id).length}
+      grouped={false}
+      groupStart={false}
+      groupEnd={false}
+      groupSize={0}
+      renaming={renaming() === worktree.id}
+      renameValue={name()}
+      closeKeybind=""
+      openKeybind=""
+      pr={props.prs?.[worktree.id] ?? undefined}
+      runStatus={runs()[worktree.id]}
+      sections={sections()}
+      currentSectionId={worktree.sectionId}
+      onMoveToSection={(sectionId) =>
+        post({ type: "agentManager.moveToSection", worktreeIds: [worktree.id], sectionId })
+      }
+      onMoveToNewSection={() =>
+        post({
+          type: "agentManager.createSection",
+          name: props.t("agentManager.worktree.newSection"),
+          worktreeIds: [worktree.id],
+        })
+      }
+      onClick={() => {
+        if (pending() === worktree.id) return confirmDelete(worktree.id)
+        props.onSelectWorktree(props.project.id, worktree.id)
+      }}
+      onDelete={(event) => {
+        event.stopPropagation()
+        confirmDelete(worktree.id)
+      }}
+      onStartRename={(value) => {
+        setName(value)
+        setRenaming(worktree.id)
+      }}
+      onRenameInput={setName}
+      onCommitRename={() => commitRename(worktree.id)}
+      onCancelRename={cancelRename}
+      onRemoveStale={() => post({ type: "agentManager.removeStaleWorktree", worktreeId: worktree.id })}
+      onCopyPath={() => navigator.clipboard.writeText(worktree.path)}
+      onOpen={() => post({ type: "agentManager.openWorktree", worktreeId: worktree.id })}
+      onOpenPR={() => post({ type: "agentManager.openPR", worktreeId: worktree.id })}
+    />
+  )
+
+  return (
+    <div class="am-project-body" data-project-body={props.project.id}>
+      <Show
+        when={state()}
+        fallback={
+          <div class="am-project-loading">
+            <Spinner class="am-worktree-spinner" />
+          </div>
+        }
+      >
+        <button
+          class="am-local-item"
+          classList={{ "am-local-item-active": active() && props.selection === "local" }}
+          data-sidebar-id={`${props.project.id}:local`}
+          onClick={() => props.onSelectLocal(props.project.id)}
+        >
+          <svg class="am-local-icon" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <rect x="2.5" y="3.5" width="15" height="10" rx="1" stroke="currentColor" />
+            <path d="M6 16.5H14" stroke="currentColor" stroke-linecap="square" />
+            <path d="M10 13.5V16.5" stroke="currentColor" />
+          </svg>
+          <div class="am-local-text">
+            <span class="am-local-label">{props.t("agentManager.local")}</span>
+            <Show when={props.local?.branch}>
+              <span class="am-local-branch">{props.local!.branch}</span>
+            </Show>
+          </div>
+          <Show
+            when={
+              props.local && (props.local.additions || props.local.deletions || props.local.ahead || props.local.behind)
+            }
+          >
+            <div class="am-worktree-stats">
+              <Show when={props.local!.behind}>
+                <span class="am-worktree-behind">↓{props.local!.behind}</span>
+              </Show>
+              <Show when={props.local!.ahead}>
+                <span class="am-worktree-commits">↑{props.local!.ahead}</span>
+              </Show>
+              <Show when={props.local!.additions}>
+                <span class="am-stat-additions">+{props.local!.additions}</span>
+              </Show>
+              <Show when={props.local!.deletions}>
+                <span class="am-stat-deletions">−{props.local!.deletions}</span>
+              </Show>
+            </div>
+          </Show>
+        </button>
+
+        <div class="am-section">
+          <div class="am-section-header">
+            <span class="am-section-label">{props.t("agentManager.section.worktrees")}</span>
+            <ProjectActions
+              branch={state()?.defaultBaseBranch ?? props.local?.branch ?? "main"}
+              bindings={props.bindings}
+              loaded={state() !== undefined}
+              t={props.t}
+              onCreate={() => post({ type: "agentManager.createWorktree" })}
+              onNew={() => props.onNewWorktree(props.project.id)}
+              onSection={() =>
+                post({
+                  type: "agentManager.createSection",
+                  name: props.t("agentManager.section.defaultName"),
+                })
+              }
+              onSetup={() => post({ type: "agentManager.configureSetupScript" })}
+              onBranch={() => props.onDefaultBranch(props.project.id, state()?.defaultBaseBranch, props.local?.branch)}
+            />
+          </div>
+          <div class="am-worktree-list">
+            {/*
+              SectionHeader registers a drop target via solid-dnd, which throws
+              without a DragDropProvider ancestor and kills the whole render.
+              Multi-project has no drag-and-drop yet, so this provider is a
+              no-op context until DnD lands here.
+            */}
+            <DragDropProvider onDragStart={() => {}} onDragEnd={() => {}}>
+              <DragDropSensors />
+              <For each={sections()}>
+                {(section, index) => (
+                  <SectionHeader
+                    section={section}
+                    count={members(section.id).length}
+                    onToggle={() => post({ type: "agentManager.toggleSectionCollapsed", sectionId: section.id })}
+                    onRename={(value: string) =>
+                      post({ type: "agentManager.renameSection", sectionId: section.id, name: value })
+                    }
+                    onDelete={() => post({ type: "agentManager.deleteSection", sectionId: section.id })}
+                    onSetColor={(color: string | null) =>
+                      post({ type: "agentManager.setSectionColor", sectionId: section.id, color })
+                    }
+                    isFirst={index() === 0}
+                    isLast={index() === sections().length - 1}
+                    onMoveUp={() => post({ type: "agentManager.moveSection", sectionId: section.id, dir: -1 })}
+                    onMoveDown={() => post({ type: "agentManager.moveSection", sectionId: section.id, dir: 1 })}
+                  >
+                    <Show when={!section.collapsed}>
+                      <div class="am-section-group-body">
+                        <For each={members(section.id)}>{renderWorktree}</For>
+                      </div>
+                    </Show>
+                  </SectionHeader>
+                )}
+              </For>
+              <For each={ungrouped()}>{renderWorktree}</For>
+            </DragDropProvider>
+          </div>
+        </div>
+
+        <UnassignedSessionsSection
+          sessions={localSessions}
+          loaded={() => props.sessions !== undefined}
+          collapsed={() => state()!.sessionsCollapsed === true}
+          active={() => undefined}
+          onToggle={() => post({ type: "agentManager.setSessionsCollapsed", collapsed: !state()!.sessionsCollapsed })}
+          onSelect={(sessionId) => props.onSelectSession(props.project.id, sessionId)}
+          onPromote={(sessionId) => post({ type: "agentManager.promoteSession", sessionId })}
+          onOpen={(sessionId) => post({ type: "agentManager.openLocally", sessionId })}
+          sidebarId={(sessionId) => `${props.project.id}:sess:${sessionId}`}
+        />
+      </Show>
+    </div>
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectsSection.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectsSection.tsx
new file mode 100644
index 0000000000..c8b39b253d
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectsSection.tsx
@@ -0,0 +1,102 @@
+/** @jsxImportSource solid-js */
+
+import { For, Show, untrack, type Accessor, type Component, type JSX } from "solid-js"
+import { Icon } from "@kilocode/kilo-ui/icon"
+import { IconButton } from "@kilocode/kilo-ui/icon-button"
+import type { LanguageContextValue } from "../src/context/language"
+import type { AgentProjectSnapshot } from "../src/types/messages"
+
+interface ProjectsSectionProps {
+  projects: AgentProjectSnapshot[]
+  t: LanguageContextValue["t"]
+  onAdd: () => void
+  onSelect: (id: string) => void
+  onRemove: (id: string) => void
+  onTrust: (id: string) => void
+  onExpand: (id: string, expanded: boolean) => void
+  count: (id: string) => number | undefined
+  tools?: JSX.Element
+  body: (project: AgentProjectSnapshot) => JSX.Element
+}
+
+const ProjectBodySlot: Component<{
+  project: Accessor<AgentProjectSnapshot>
+  body: (project: AgentProjectSnapshot) => JSX.Element
+}> = (props) => untrack(() => props.body(props.project()))
+
+/**
+ * Stable project accordion. Every expanded project renders the same real body;
+ * active state only controls detail-pane emphasis.
+ */
+export const ProjectsSection: Component<ProjectsSectionProps> = (props) => (
+  <div class="am-projects">
+    <div class="am-section-header">
+      <span class="am-section-label">{props.t("agentManager.projects")}</span>
+      <div class="am-projects-tools">
+        {props.tools}
+        <IconButton
+          icon="plus"
+          size="small"
+          variant="ghost"
+          label={props.t("agentManager.project.add")}
+          onClick={props.onAdd}
+        />
+      </div>
+    </div>
+    <div class="am-projects-list">
+      <For each={props.projects.map((project) => project.id)}>
+        {(id) => {
+          const project = () => props.projects.find((item) => item.id === id)!
+          return (
+            <div class="am-project" classList={{ "am-project-active": project().active }}>
+              <div class="am-project-item" data-project-id={project().id}>
+                <button
+                  class="am-project-main"
+                  title={project().missing ? props.t("agentManager.project.missing") : project().root}
+                  onClick={() => {
+                    if (project().active || project().missing) return
+                    if (project().trusted) props.onSelect(project().id)
+                    else props.onTrust(project().id)
+                  }}
+                >
+                  <span class="am-project-label">{project().label}</span>
+                  <Show when={props.count(project().id) !== undefined}>
+                    <span class="am-project-count">({props.count(project().id)})</span>
+                  </Show>
+                  <Show when={project().missing}>
+                    <Icon name="warning" size="small" />
+                  </Show>
+                  <Show when={!project().trusted && !project().missing}>
+                    <span class="am-project-trust">
+                      <Icon name="lock" size="small" />
+                      {props.t("agentManager.project.trust")}
+                    </span>
+                  </Show>
+                </button>
+                <Show when={!project().pinned}>
+                  <IconButton
+                    icon="close-small"
+                    size="small"
+                    variant="ghost"
+                    label={props.t("agentManager.project.remove")}
+                    onClick={() => props.onRemove(project().id)}
+                  />
+                </Show>
+                <button
+                  class="am-project-chevron"
+                  aria-label={project().label}
+                  onClick={() => props.onExpand(project().id, !project().expanded)}
+                >
+                  <Icon name={project().expanded ? "chevron-down" : "chevron-right"} size="small" />
+                </button>
+              </div>
+              <Show when={project().expanded}>
+                <ProjectBodySlot project={project} body={props.body} />
+              </Show>
+            </div>
+          )
+        }}
+      </For>
+    </div>
+  </div>
+)
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx b/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx
new file mode 100644
index 0000000000..a48c5c643c
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx
@@ -0,0 +1,462 @@
+import { For, Show, createMemo, createSignal, type Component } from "solid-js"
+import { Icon } from "@kilocode/kilo-ui/icon"
+import { Spinner } from "@kilocode/kilo-ui/spinner"
+import {
+  DragDropProvider,
+  DragDropSensors,
+  DragOverlay,
+  SortableProvider,
+  createSortable,
+  type DragEvent,
+} from "@thisbeyond/solid-dnd"
+import type {
+  LocalGitStats,
+  ManagedSessionState,
+  PRStatus,
+  RunStatus,
+  SectionState,
+  SessionInfo,
+  WorktreeGitStats,
+  WorktreeState,
+} from "../src/types/messages"
+import type { LanguageContextValue } from "../src/context/language"
+import type { SidebarSearchItem } from "./sidebar-search"
+import { LOCAL, adjacentHint } from "./navigate"
+import { applyTabOrder, reorderTabs } from "./tab-order"
+import { isGroupEnd, isGroupStart, isGrouped, type TopLevelItem } from "./section-helpers"
+import { sectionAwareDetector } from "./section-dnd"
+import { ConstrainDragXAxis } from "./constrain-drag-x"
+import { useVSCode } from "../src/context/vscode"
+import SectionHeader from "./SectionHeader"
+import { WorktreeItem } from "./WorktreeItem"
+import { WorktreeSectionActions } from "./WorktreeSectionActions"
+import { UnassignedSessionsSection } from "./UnassignedSessionsSection"
+import type { SidebarSearchMenuRef } from "./SidebarSearchMenu"
+
+const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent)
+
+/** Everything the legacy single-project sidebar body reads from the app. */
+export interface SidebarBodyProps {
+  t: LanguageContextValue["t"]
+  selection: () => string | null
+  currentSessionID: () => string | undefined
+  selectLocal: () => void
+  selectWorktree: (id: string) => void
+  isLocalBusy: () => boolean
+  repoBranch: () => string | undefined
+  localStats: () => LocalGitStats | undefined
+  sessionsCollapsed: () => boolean
+  toggleSessions: () => void
+  search: { items: () => SidebarSearchItem[]; current: () => SidebarSearchItem | undefined }
+  bindings: () => Record<string, string>
+  defaultBranch: () => string
+  isGitRepo: () => boolean
+  loaded: () => boolean
+  worktreesLoaded: () => boolean
+  sessionsLoaded: () => boolean
+  onSearchRef: (ref: SidebarSearchMenuRef | undefined) => void
+  onSearchSelect: (item: SidebarSearchItem) => void
+  onCreateWorktree: () => void
+  onNewWorktree: () => void
+  onNewSection: () => void
+  onShortcuts: () => void
+  onSetup: () => void
+  onBranch: () => void
+  sections: () => SectionState[]
+  sortedWorktrees: () => WorktreeState[]
+  worktrees: () => WorktreeState[]
+  ungrouped: () => WorktreeState[]
+  topLevelItems: () => TopLevelItem[]
+  worktreesInSection: (id: string) => WorktreeState[]
+  sidebarOrder: () => { id: string }[]
+  sidebarWorktreeOrder: () => string[]
+  setSidebarWorktreeOrder: (fn: (prev: string[]) => string[]) => void
+  draggingWorktree: () => string | undefined
+  setDraggingWorktree: (id: string | undefined) => void
+  moveToSection: (ids: string[], sectionId: string | null) => void
+  moveSection: (id: string, dir: -1 | 1) => void
+  renamingSection: () => string | null
+  setRenamingSection: (id: string | null) => void
+  managedSessions: () => ManagedSessionState[]
+  worktreeLabel: (wt: WorktreeState) => string
+  worktreeSubtitle: (wt: WorktreeState) => string | undefined
+  pendingDelete: () => string | null
+  busy: (id: string) => boolean
+  isAgentBusy: (id: string) => boolean
+  isStaleWorktree: (id: string) => boolean
+  shortcutMap: () => Map<string, number>
+  worktreeStats: () => Record<string, WorktreeGitStats>
+  prStatuses: () => Record<string, PRStatus | null>
+  runStatuses: () => Record<string, RunStatus>
+  confirmDeleteWorktree: (id: string) => void
+  handleDeleteWorktree: (id: string, e: MouseEvent) => void
+  confirmRemoveStaleWorktree: (id: string) => void
+  unassignedSessions: () => SessionInfo[]
+  selectUnassigned: (id: string) => void
+  promoteSession: (id: string) => void
+  openUnassigned: (id: string) => void
+  track: (event: string, source: string, action: () => void) => () => void
+}
+
+/** Legacy single-project sidebar body: local repo, worktrees, unassigned sessions. */
+export const SidebarBody: Component<SidebarBodyProps> = (props) => {
+  const vscode = useVSCode()
+
+  return (
+    <>
+      {/* Local repo item */}
+      <button
+        class={`am-local-item ${props.selection() === LOCAL ? "am-local-item-active" : ""}`}
+        data-sidebar-id="local"
+        onClick={() => props.selectLocal()}
+      >
+        <Show when={!props.isLocalBusy()} fallback={<Spinner class="am-worktree-spinner" />}>
+          <svg class="am-local-icon" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <rect x="2.5" y="3.5" width="15" height="10" rx="1" stroke="currentColor" />
+            <path d="M6 16.5H14" stroke="currentColor" stroke-linecap="square" />
+            <path d="M10 13.5V16.5" stroke="currentColor" />
+          </svg>
+        </Show>
+        <div class="am-local-text">
+          <span class="am-local-label">{props.t("agentManager.local")}</span>
+          <Show when={props.repoBranch()}>
+            <span class="am-local-branch">{props.repoBranch()}</span>
+          </Show>
+        </div>
+        <Show when={props.localStats() === undefined}>
+          <div class="am-worktree-stats-skeleton">
+            <div class="am-worktree-stats-skeleton-row" />
+            <div class="am-worktree-stats-skeleton-row" style={{ width: "70%" }} />
+          </div>
+        </Show>
+        <Show
+          when={
+            props.localStats() &&
+            (props.localStats()!.files > 0 ||
+              props.localStats()!.additions > 0 ||
+              props.localStats()!.deletions > 0 ||
+              props.localStats()!.ahead > 0 ||
+              props.localStats()!.behind > 0)
+          }
+        >
+          <div class="am-worktree-stats">
+            <Show
+              when={props.localStats()!.additions > 0 || props.localStats()!.deletions > 0}
+              fallback={
+                <Show when={props.localStats()!.files > 0}>
+                  <span class="am-stat-files">{props.localStats()!.files}f</span>
+                </Show>
+              }
+            >
+              <div class="am-worktree-stats-row">
+                <Show when={props.localStats()!.additions > 0}>
+                  <span class="am-stat-additions">+{props.localStats()!.additions}</span>
+                </Show>
+                <Show when={props.localStats()!.deletions > 0}>
+                  <span class="am-stat-deletions">
+                    {"−"}
+                    {props.localStats()!.deletions}
+                  </span>
+                </Show>
+              </div>
+            </Show>
+            <Show when={props.localStats()!.ahead > 0 || props.localStats()!.behind > 0}>
+              <div class="am-worktree-stats-row">
+                <Show when={props.localStats()!.ahead > 0}>
+                  <span class="am-worktree-commits">
+                    {"↑"}
+                    {props.localStats()!.ahead}
+                  </span>
+                </Show>
+                <Show when={props.localStats()!.behind > 0}>
+                  <span class="am-worktree-behind">
+                    {"↓"}
+                    {props.localStats()!.behind}
+                  </span>
+                </Show>
+              </div>
+            </Show>
+          </div>
+        </Show>
+        <span class="am-shortcut-badge">{isMac ? "⌘" : "Ctrl+"}1</span>
+      </button>
+
+      {/* WORKTREES section */}
+      <div class={`am-section ${props.sessionsCollapsed() ? "am-section-grow" : ""}`}>
+        <div class="am-section-header">
+          <span class="am-section-label">{props.t("agentManager.section.worktrees")}</span>
+          <WorktreeSectionActions
+            items={props.search.items}
+            current={props.search.current}
+            bindings={props.bindings()}
+            branch={props.defaultBranch()}
+            git={props.isGitRepo()}
+            loaded={props.loaded()}
+            t={props.t}
+            onRef={(value) => props.onSearchRef(value)}
+            onSelect={props.onSearchSelect}
+            onCreate={props.onCreateWorktree}
+            onNew={props.onNewWorktree}
+            onSection={props.onNewSection}
+            onShortcuts={props.onShortcuts}
+            onSetup={props.onSetup}
+            onBranch={props.onBranch}
+          />
+        </div>
+        <div class="am-worktree-list">
+          <Show
+            when={props.worktreesLoaded() && props.sessionsLoaded()}
+            fallback={
+              <div class="am-skeleton-list">
+                <div class="am-skeleton-wt">
+                  <div class="am-skeleton-wt-icon" />
+                  <div class="am-skeleton-wt-text" style={{ width: "60%" }} />
+                </div>
+              </div>
+            }
+          >
+            <Show when={!props.isGitRepo()}>
+              <div class="am-not-git-notice">
+                <Icon name="warning" size="small" />
+                <span>{props.t("agentManager.notGitRepo")}</span>
+              </div>
+            </Show>
+            <Show when={props.isGitRepo()}>
+              {(() => {
+                const [renamingWt, setRenamingWt] = createSignal<string | null>(null)
+                const [renameValue, setRenameValue] = createSignal("")
+
+                const startRename = (wtId: string, current: string) => {
+                  setRenamingWt(wtId)
+                  setRenameValue(current)
+                }
+
+                let cancelled = false
+
+                const commitRename = (wtId: string) => {
+                  if (cancelled) {
+                    cancelled = false
+                    return
+                  }
+                  const value = renameValue().trim()
+                  setRenamingWt(null)
+                  if (!value) return
+                  vscode.postMessage({ type: "agentManager.renameWorktree", worktreeId: wtId, label: value })
+                }
+
+                const cancelRename = () => {
+                  cancelled = true
+                  setRenamingWt(null)
+                }
+
+                const hasSections = createMemo(() => props.sections().length > 0)
+                const wtIds = createMemo(() => props.sortedWorktrees().map((wt) => wt.id))
+                const secIds = createMemo(() => new Set(props.sections().map((s) => s.id)))
+                const home = () => new Map(props.sortedWorktrees().map((w) => [w.id, w.sectionId] as const))
+                const sectionAware = sectionAwareDetector(secIds, home)
+
+                const onWtDragStart = (event: DragEvent) => {
+                  const id = event.draggable?.id
+                  if (typeof id === "string") props.setDraggingWorktree(id)
+                  document.body.classList.add("am-wt-dragging-active")
+                }
+                const onWtDragOver = (event: DragEvent) => {
+                  const from = event.draggable?.id
+                  const to = event.droppable?.id
+                  if (typeof from !== "string" || typeof to !== "string") return
+                  if (secIds().has(to)) return
+                  props.setSidebarWorktreeOrder((prev) => {
+                    const cur = applyTabOrder(
+                      props.sortedWorktrees().map((w) => ({ id: w.id })),
+                      prev,
+                    ).map((item: { id: string }) => item.id)
+                    return reorderTabs(cur, from, to) ?? prev
+                  })
+                }
+                const onWtDragEnd = (event: DragEvent) => {
+                  const from = event.draggable?.id
+                  const to = event.droppable?.id
+                  props.setDraggingWorktree(undefined)
+                  document.body.classList.remove("am-wt-dragging-active")
+                  if (typeof from === "string" && typeof to === "string" && secIds().has(to)) {
+                    props.moveToSection([from], to)
+                    return
+                  }
+                  vscode.postMessage({ type: "agentManager.setWorktreeOrder", order: props.sidebarWorktreeOrder() })
+                }
+
+                return (
+                  <DragDropProvider
+                    onDragStart={onWtDragStart}
+                    onDragEnd={onWtDragEnd}
+                    onDragOver={onWtDragOver}
+                    collisionDetector={sectionAware}
+                  >
+                    <DragDropSensors />
+                    <ConstrainDragXAxis />
+                    <SortableProvider ids={wtIds()}>
+                      {(() => {
+                        const renderWt = (wt: WorktreeState, idx: () => number, list?: WorktreeState[]) => {
+                          const wtSessions = createMemo(() =>
+                            props.managedSessions().filter((ms) => ms.worktreeId === wt.id),
+                          )
+                          const navHint = () =>
+                            adjacentHint(
+                              wt.id,
+                              props.selection() ?? props.currentSessionID() ?? "",
+                              props.sidebarOrder().map((f) => f.id),
+                              props.bindings().previousSession ?? "",
+                              props.bindings().nextSession ?? "",
+                            )
+                          const groupSize = () =>
+                            !wt.groupId ? 0 : props.sortedWorktrees().filter((w) => w.groupId === wt.groupId).length
+                          const sortable = createSortable(wt.id)
+                          void sortable
+                          return (
+                            <div
+                              use:sortable
+                              class={`am-wt-sortable ${sortable.isActiveDraggable ? "am-wt-dragging" : ""}`}
+                            >
+                              <WorktreeItem
+                                worktree={wt}
+                                label={props.worktreeLabel(wt)}
+                                subtitle={props.worktreeSubtitle(wt)}
+                                active={props.selection() === wt.id}
+                                pendingDelete={props.pendingDelete() === wt.id}
+                                busy={props.busy(wt.id)}
+                                working={props.isAgentBusy(wt.id)}
+                                stale={props.isStaleWorktree(wt.id)}
+                                shortcut={props.shortcutMap().get(wt.id)}
+                                stats={props.worktreeStats()[wt.id]}
+                                navHint={navHint()}
+                                sessions={wtSessions().length}
+                                grouped={isGrouped(wt)}
+                                groupStart={isGroupStart(wt, idx(), list ?? props.sortedWorktrees())}
+                                groupEnd={isGroupEnd(wt, idx(), list ?? props.sortedWorktrees())}
+                                groupSize={groupSize()}
+                                renaming={renamingWt() === wt.id}
+                                renameValue={renameValue()}
+                                closeKeybind={props.bindings().closeWorktree ?? ""}
+                                openKeybind={props.bindings().openWorktree ?? ""}
+                                pr={
+                                  props.prStatuses()[wt.id] !== undefined
+                                    ? (props.prStatuses()[wt.id] ?? undefined)
+                                    : undefined
+                                }
+                                runStatus={props.runStatuses()[wt.id]}
+                                onOpenPR={props.track("open_pull_request", "worktree_menu", () =>
+                                  vscode.postMessage({ type: "agentManager.openPR", worktreeId: wt.id }),
+                                )}
+                                sections={props.sections()}
+                                currentSectionId={wt.sectionId}
+                                onMoveToSection={(secId) => props.moveToSection([wt.id], secId)}
+                                onMoveToNewSection={props.track("new_section", "worktree_menu", () =>
+                                  props.onNewSection(),
+                                )}
+                                onClick={() => {
+                                  if (props.pendingDelete() === wt.id) {
+                                    props.confirmDeleteWorktree(wt.id)
+                                    return
+                                  }
+                                  props.selectWorktree(wt.id)
+                                }}
+                                onDelete={(e) => props.handleDeleteWorktree(wt.id, e)}
+                                onStartRename={(current) => startRename(wt.id, current)}
+                                onRenameInput={(v) => setRenameValue(v)}
+                                onCommitRename={() => commitRename(wt.id)}
+                                onCancelRename={cancelRename}
+                                onRemoveStale={() => props.confirmRemoveStaleWorktree(wt.id)}
+                                onCopyPath={() => navigator.clipboard.writeText(wt.path)}
+                                onOpen={props.track("open_worktree_window", "worktree_menu", () =>
+                                  vscode.postMessage({ type: "agentManager.openWorktree", worktreeId: wt.id }),
+                                )}
+                              />
+                            </div>
+                          )
+                        }
+                        if (hasSections()) {
+                          const post = vscode.postMessage.bind(vscode)
+                          return (
+                            <For each={props.topLevelItems()}>
+                              {(item, idx) => {
+                                if (item.kind === "section") {
+                                  const sec = item.section
+                                  const members = createMemo(() => props.worktreesInSection(sec.id))
+                                  return (
+                                    <SectionHeader
+                                      section={sec}
+                                      count={members().length}
+                                      autoRename={props.renamingSection() === sec.id}
+                                      onRenameEnd={() => props.setRenamingSection(null)}
+                                      onToggle={() =>
+                                        post({ type: "agentManager.toggleSectionCollapsed", sectionId: sec.id })
+                                      }
+                                      onRename={(name) =>
+                                        post({ type: "agentManager.renameSection", sectionId: sec.id, name })
+                                      }
+                                      onDelete={() => post({ type: "agentManager.deleteSection", sectionId: sec.id })}
+                                      onSetColor={(color) =>
+                                        post({ type: "agentManager.setSectionColor", sectionId: sec.id, color })
+                                      }
+                                      isFirst={idx() === 0}
+                                      isLast={idx() === props.topLevelItems().length - 1}
+                                      onMoveUp={() => props.moveSection(sec.id, -1)}
+                                      onMoveDown={() => props.moveSection(sec.id, 1)}
+                                    >
+                                      <Show when={!sec.collapsed}>
+                                        <div class="am-section-group-body">
+                                          <For each={members()}>{(wt, wtIdx) => renderWt(wt, wtIdx, members())}</For>
+                                        </div>
+                                      </Show>
+                                    </SectionHeader>
+                                  )
+                                }
+                                const ug = props.ungrouped()
+                                const wtIdx = () => ug.indexOf(item.wt)
+                                return renderWt(item.wt, wtIdx, ug)
+                              }}
+                            </For>
+                          )
+                        }
+                        return <For each={props.sortedWorktrees()}>{(wt, idx) => renderWt(wt, idx)}</For>
+                      })()}
+                    </SortableProvider>
+                    <DragOverlay>
+                      {(() => {
+                        const wt = props.sortedWorktrees().find((w) => w.id === props.draggingWorktree())
+                        if (!wt) return null
+                        return (
+                          <div class="am-wt-overlay">
+                            <Icon name="branch" size="small" />
+                            <span>{props.worktreeLabel(wt)}</span>
+                          </div>
+                        )
+                      })()}
+                    </DragOverlay>
+                  </DragDropProvider>
+                )
+              })()}
+              <Show when={props.worktrees().length === 0}>
+                <button class="am-worktree-create" onClick={props.onNewWorktree}>
+                  <Icon name="plus" size="small" />
+                  <span>{props.t("agentManager.worktree.new")}</span>
+                </button>
+              </Show>
+            </Show>
+          </Show>
+        </div>
+      </div>
+
+      <UnassignedSessionsSection
+        sessions={props.unassignedSessions}
+        loaded={props.sessionsLoaded}
+        collapsed={props.sessionsCollapsed}
+        active={() => (props.selection() === null ? props.currentSessionID() : undefined)}
+        onToggle={props.toggleSessions}
+        onSelect={props.selectUnassigned}
+        onPromote={props.promoteSession}
+        onOpen={props.openUnassigned}
+      />
+    </>
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/TabBar.tsx b/packages/kilo-vscode/webview-ui/agent-manager/TabBar.tsx
new file mode 100644
index 0000000000..fc1a36b462
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/TabBar.tsx
@@ -0,0 +1,279 @@
+import { For, Show, type Component, type JSX } from "solid-js"
+import { Button } from "@kilocode/kilo-ui/button"
+import { IconButton } from "@kilocode/kilo-ui/icon-button"
+import { Icon } from "@kilocode/kilo-ui/icon"
+import { Spinner } from "@kilocode/kilo-ui/spinner"
+import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
+import { DropdownMenu } from "@kilocode/kilo-ui/dropdown-menu"
+import {
+  DragDropProvider,
+  DragDropSensors,
+  DragOverlay,
+  SortableProvider,
+  closestCenter,
+  type DragEvent,
+} from "@thisbeyond/solid-dnd"
+import type { LocalGitStats, RunStatus, WorktreeGitStats } from "../src/types/messages"
+import type { LanguageContextValue } from "../src/context/language"
+import { LOCAL } from "./navigate"
+import { ConstrainDragYAxis } from "../src/components/chat/TabDnd"
+import type { tracker } from "./telemetry"
+import { SidebarToggleButton } from "./SidebarToggleButton"
+import type { DiffScope } from "./diff-scope-state"
+import { TerminalDestinationButton } from "./terminal/TerminalDestinationButton"
+import type { TerminalDestination } from "../src/types/messages/agent-manager"
+
+/** Everything the tab bar reads from the app. */
+export interface TabBarProps {
+  t: LanguageContextValue["t"]
+  bindings: () => Record<string, string>
+  selection: () => string | null
+  empty: () => boolean
+  collapsed: boolean
+  onToggleSidebar: () => void
+  scroll: { setRef: (el: HTMLDivElement) => void; showLeft: () => boolean; showRight: () => boolean }
+  ids: () => string[]
+  renderTab: (id: string) => JSX.Element
+  newTab: () => JSX.Element
+  onDragStart: (event: DragEvent) => void
+  onDragEnd: (event: DragEvent) => void
+  onDragOver: (event: DragEvent) => void
+  onRelease: () => void
+  overlay: () => { title?: string } | undefined
+  localStats: () => LocalGitStats | undefined
+  worktreeStats: () => Record<string, WorktreeGitStats>
+  applyState: () => { status: string } | undefined
+  /** Active diff scope; applying to local is only possible from the branch scope. */
+  reviewScope: () => DiffScope
+  onOpen: () => void
+  onApply: () => void
+  runStatuses: () => Record<string, RunStatus>
+  runConfigured: () => boolean
+  onRun: (id: string) => void
+  onConfigureRun: () => void
+  diffOpen: () => boolean
+  reviewActive: () => boolean
+  onToggleDiff: () => void
+  onToggleReview: () => void
+  terminalDestination: () => TerminalDestination
+  terminalDestinationActive: () => boolean
+  terminalKeybind: () => string
+  onTerminalDestinationOpen: () => void
+  onTerminalDestinationChoose: (destination: TerminalDestination) => void
+  track: ReturnType<typeof tracker>["click"]
+}
+
+/** Tab bar with sortable session/terminal/review tabs and the run/diff/apply actions. */
+export const TabBar: Component<TabBarProps> = (props) => (
+  <Show
+    when={props.selection() !== null && !props.empty()}
+    fallback={
+      <div class="am-tab-bar am-tab-bar-empty">
+        <div class="am-tab-leading">
+          <SidebarToggleButton collapsed={props.collapsed} onClick={props.onToggleSidebar} />
+        </div>
+      </div>
+    }
+  >
+    <DragDropProvider
+      onDragStart={props.onDragStart}
+      onDragEnd={props.onDragEnd}
+      onDragOver={props.onDragOver}
+      collisionDetector={closestCenter}
+    >
+      <DragDropSensors />
+      <ConstrainDragYAxis />
+      <div class="am-tab-bar" onPointerLeave={props.onRelease}>
+        <div class="am-tab-leading">
+          <SidebarToggleButton collapsed={props.collapsed} onClick={props.onToggleSidebar} />
+        </div>
+        <div class="am-tab-scroll-area">
+          <div class={`am-tab-fade am-tab-fade-left ${props.scroll.showLeft() ? "am-tab-fade-visible" : ""}`} />
+          <div class="am-tab-list-wrap">
+            <div
+              class="am-tab-list"
+              ref={props.scroll.setRef}
+              role="tablist"
+              aria-label={props.t("agentManager.shortcuts.category.tabs")}
+              style={{ "--tab-count": `${props.ids().length}` } as JSX.CSSProperties}
+            >
+              <SortableProvider ids={props.ids()}>
+                <For each={props.ids()}>{(id) => props.renderTab(id)}</For>
+              </SortableProvider>
+            </div>
+          </div>
+          <div class={`am-tab-fade am-tab-fade-right ${props.scroll.showRight() ? "am-tab-fade-visible" : ""}`} />
+        </div>
+        <Show when={props.selection() !== null}>
+          <div class="am-tab-add-wrap">
+            <div class="am-tab-add-separator" />
+            {props.newTab()}
+          </div>
+        </Show>
+        <div class="am-tab-actions">
+          {(() => {
+            const sel = () => props.selection()
+            const isWorktree = () => typeof sel() === "string" && sel() !== LOCAL
+            const stats = () => {
+              if (sel() === LOCAL) return props.localStats()
+              return typeof sel() === "string" ? props.worktreeStats()[sel() as string] : undefined
+            }
+            const hasChanges = () => {
+              const s = stats()
+              return s && (s.files > 0 || s.additions > 0 || s.deletions > 0)
+            }
+            const applyBusy = () => {
+              const state = props.applyState()
+              if (!state) return false
+              return state.status === "checking" || state.status === "applying"
+            }
+            return (
+              <>
+                <Show when={isWorktree()}>
+                  <>
+                    <Tooltip value={props.t("agentManager.open.tooltip")} placement="bottom">
+                      <Button size="small" variant="ghost" icon="folder" onClick={props.onOpen}>
+                        {props.t("agentManager.open.button")}
+                      </Button>
+                    </Tooltip>
+                    <Tooltip
+                      value={
+                        props.reviewScope() === "branch"
+                          ? props.t("agentManager.apply.tooltip")
+                          : props.t("agentManager.diff.applyBranchOnly")
+                      }
+                      placement="bottom"
+                    >
+                      <Button
+                        size="small"
+                        variant="ghost"
+                        onClick={props.onApply}
+                        disabled={!hasChanges() || applyBusy() || props.reviewScope() !== "branch"}
+                      >
+                        <Show when={applyBusy()}>
+                          <Spinner class="am-apply-spinner" />
+                        </Show>
+                        {props.t("agentManager.apply.globalButton")}
+                      </Button>
+                    </Tooltip>
+                  </>
+                </Show>
+                <Show when={sel()}>
+                  {(() => {
+                    const rid = () => (sel() === LOCAL ? LOCAL : (sel() as string))
+                    const rs = () => props.runStatuses()[rid()]
+                    const active = () => rs()?.state === "running" || rs()?.state === "stopping"
+                    const configured = props.runConfigured
+                    const title = () => (configured() ? (active() ? "Stop" : "Run") : "Configure run script")
+                    return (
+                      <span
+                        class={`am-run-group ${active() ? "am-run-active" : ""} ${!configured() ? "am-run-unconfigured" : ""}`}
+                      >
+                        <TooltipKeybind title={title()} keybind={props.bindings().runScript ?? ""} placement="bottom">
+                          <Button
+                            size="small"
+                            variant="ghost"
+                            icon={active() ? "stop" : "play"}
+                            disabled={rs()?.state === "stopping"}
+                            onClick={props.track(
+                              "run_script",
+                              "tab_toolbar",
+                              () => props.onRun(rid()),
+                              () => ({
+                                action: active() ? "stop" : configured() ? "run" : "configure",
+                              }),
+                            )}
+                          >
+                            {active() ? "Stop" : "Run"}
+                          </Button>
+                        </TooltipKeybind>
+                        <DropdownMenu gutter={4} placement="bottom-end">
+                          <DropdownMenu.Trigger
+                            as={(p: Record<string, unknown>) => (
+                              <IconButton
+                                {...p}
+                                icon="chevron-down"
+                                size="small"
+                                variant="ghost"
+                                label={props.t("agentManager.run.options")}
+                                class="am-run-group-chevron"
+                              />
+                            )}
+                          />
+                          <DropdownMenu.Portal>
+                            <DropdownMenu.Content class="am-split-menu">
+                              <DropdownMenu.Item
+                                onSelect={props.track("configure_run_script", "run_menu", props.onConfigureRun)}
+                              >
+                                <Icon name="settings-gear" size="small" />
+                                <DropdownMenu.ItemLabel>{props.t("agentManager.run.configure")}</DropdownMenu.ItemLabel>
+                              </DropdownMenu.Item>
+                            </DropdownMenu.Content>
+                          </DropdownMenu.Portal>
+                        </DropdownMenu>
+                      </span>
+                    )
+                  })()}
+                </Show>
+                <TooltipKeybind
+                  title={props.t("agentManager.diff.toggle")}
+                  keybind={props.bindings().toggleDiff ?? ""}
+                  placement="bottom"
+                >
+                  <button
+                    class={`am-diff-toggle-btn ${props.diffOpen() && !props.reviewActive() ? "am-tab-diff-btn-active" : ""} ${hasChanges() ? "am-diff-toggle-has-changes" : ""}`}
+                    onClick={props.onToggleDiff}
+                    title={props.t("agentManager.diff.toggle")}
+                  >
+                    <Icon name="layers" size="small" />
+                    <Show when={hasChanges()}>
+                      <span class="am-diff-toggle-stats">
+                        <Show when={stats()!.files > 0}>
+                          <span class="am-stat-files">{stats()!.files}f</span>
+                        </Show>
+                        <span class="am-stat-additions">+{stats()!.additions}</span>
+                        <span class="am-stat-deletions">−{stats()!.deletions}</span>
+                      </span>
+                    </Show>
+                  </button>
+                </TooltipKeybind>
+              </>
+            )
+          })()}
+          <Show when={props.selection() !== null}>
+            <Tooltip value={props.t("command.review.toggle")} placement="bottom">
+              <IconButton
+                icon="expand"
+                size="small"
+                variant="ghost"
+                label={props.t("command.review.toggle")}
+                class={props.reviewActive() ? "am-tab-diff-btn-active" : ""}
+                onClick={props.onToggleReview}
+              />
+            </Tooltip>
+          </Show>
+          {/* Terminal destination split button: the primary action
+              follows the user's setting (VS Code integrated terminal
+              or the embedded side panel), the dropdown picks which.
+              Cmd+Shift+T still creates an xterm tab via the `+` menu. */}
+          <TerminalDestinationButton
+            destination={props.terminalDestination}
+            active={props.terminalDestinationActive}
+            keybind={props.terminalKeybind}
+            onOpen={props.onTerminalDestinationOpen}
+            onChoose={props.onTerminalDestinationChoose}
+          />
+        </div>
+      </div>
+      <DragOverlay>
+        <Show when={props.overlay()}>
+          {(tab) => (
+            <div class="am-tab am-tab-overlay">
+              <span class="am-tab-label">{tab().title || props.t("agentManager.session.untitled")}</span>
+            </div>
+          )}
+        </Show>
+      </DragOverlay>
+    </DragDropProvider>
+  </Show>
+)
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/UnassignedSessionsSection.tsx b/packages/kilo-vscode/webview-ui/agent-manager/UnassignedSessionsSection.tsx
index 606d579eb2..966fee8234 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/UnassignedSessionsSection.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/UnassignedSessionsSection.tsx
@@ -16,6 +16,7 @@ interface Props {
   onSelect: (id: string) => void
   onPromote: (id: string) => void
   onOpen: (id: string) => void
+  sidebarId?: (id: string) => string
 }
 
 export const UnassignedSessionsSection: Component<Props> = (props) => {
@@ -61,7 +62,7 @@ export const UnassignedSessionsSection: Component<Props> = (props) => {
                   <ContextMenu.Trigger as="div" style={{ display: "contents" }}>
                     <button
                       class={`am-item ${session.id === props.active() ? "am-item-active" : ""}`}
-                      data-sidebar-id={session.id}
+                      data-sidebar-id={props.sidebarId?.(session.id) ?? session.id}
                       onClick={() => props.onSelect(session.id)}
                     >
                       <span class="am-item-title" dir="auto">
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx
index a349d0fe20..7088537db7 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx
@@ -21,6 +21,8 @@ const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigat
 
 interface WorktreeItemProps {
   worktree: WorktreeState
+  /** Stable composite ID used by multi-project sidebar bodies. */
+  sidebarId?: string
   /** Display label (resolved from label, first session title, or branch). */
   label: string
   /** Branch name shown as subtitle when it differs from the label. */
@@ -167,6 +169,13 @@ export const WorktreeItem: Component<WorktreeItemProps> = (props) => {
     props.onOpenPR?.()
   }
 
+  /** Worktree directory basename shown in the hover card (e.g. "decorous-taker"). */
+  const name = () => {
+    const p = props.worktree.path.replace(/[\\/]+$/, "")
+    const i = Math.max(p.lastIndexOf("/"), p.lastIndexOf("\\"))
+    return i >= 0 ? p.slice(i + 1) : p
+  }
+
   return (
     <>
       <Show when={props.groupStart}>
@@ -194,7 +203,7 @@ export const WorktreeItem: Component<WorktreeItemProps> = (props) => {
                   "am-wt-grouped": props.grouped,
                   "am-wt-group-end": props.groupEnd,
                 }}
-                data-sidebar-id={props.worktree.id}
+                data-sidebar-id={props.sidebarId ?? props.worktree.id}
                 onClick={() => props.onClick()}
               >
                 <div class="am-wt-icon">
@@ -387,6 +396,11 @@ export const WorktreeItem: Component<WorktreeItemProps> = (props) => {
                 <span class="am-hover-card-keybind">{props.navHint}</span>
               </Show>
             </div>
+            <div class="am-hover-card-divider" />
+            <div class="am-hover-card-row">
+              <span class="am-hover-card-row-label">{t("agentManager.hoverCard.worktree")}</span>
+              <span class="am-hover-card-row-value">{name()}</span>
+            </div>
             <Show when={props.worktree.parentBranch}>
               <div class="am-hover-card-divider" />
               <div class="am-hover-card-row">
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css
index 948dbaebc6..f9334bdfa6 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css
@@ -43,12 +43,20 @@
 .am-review-toolbar-left {
   display: flex;
   align-items: center;
-  gap: 12px;
+  gap: 10px;
   flex: 1;
   min-width: 0;
   overflow: hidden;
 }
 
+/* Keep the radio group from being the tallest thing in the row so it matches
+   the 22px selector chips and the small ghost buttons. The inline scope/base
+   controls are styled in banners.css (non-am- prefixed, shared with the
+   standalone diff viewer). */
+.am-review-toolbar [data-component="radio-group"] {
+  font-size: var(--font-size-small);
+}
+
 .am-review-toolbar-right {
   display: flex;
   align-items: center;
@@ -77,7 +85,7 @@
 .am-review-toolbar-stats {
   display: flex;
   align-items: center;
-  flex: 1 1 auto;
+  flex: 0 100 auto;
   gap: 8px;
   font-size: var(--font-size-small);
   color: var(--text-weak);
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
index 6cfde9cf3b..d51940cc0f 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
@@ -204,6 +204,155 @@ html[data-theme="kilo-vscode"]
   gap: 2px;
 }
 
+/* Projects Section */
+
+.am-projects {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0;
+  flex-shrink: 0;
+  padding-top: 2px;
+}
+
+.am-projects-list {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+.am-projects-tools,
+.am-project-actions {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+}
+
+.am-project {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  padding-bottom: 4px;
+  border-bottom: 1px solid var(--border-weak-base);
+}
+
+.am-project:last-child {
+  border-bottom: 0;
+}
+
+.am-project::before {
+  content: "";
+  position: absolute;
+  inset: 6px auto 6px 0;
+  width: 2px;
+  border-radius: 0 2px 2px 0;
+  background: transparent;
+}
+
+.am-project-active::before {
+  background: var(--border-interactive-base);
+}
+
+.am-project-item {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  min-height: 34px;
+  padding: 6px 8px 6px 12px;
+  box-sizing: border-box;
+}
+
+.am-project-item:hover {
+  background: var(--surface-inset-base-hover);
+}
+
+.am-project-main {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
+  padding: 0;
+  background: none;
+  border: none;
+  color: inherit;
+  font-family: inherit;
+  font-size: var(--font-size-base);
+  font-weight: 500;
+  text-align: left;
+  cursor: pointer;
+}
+
+.am-project-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.am-project-count {
+  flex-shrink: 0;
+  font-size: var(--font-size-small);
+  font-weight: 400;
+  font-variant-numeric: tabular-nums;
+  color: var(--text-weak);
+}
+
+.am-project-trust {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  flex-shrink: 0;
+  font-size: var(--font-size-small);
+  color: var(--text-weak);
+}
+
+.am-project-chevron {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 22px;
+  height: 22px;
+  flex-shrink: 0;
+  background: none;
+  border: none;
+  border-radius: var(--radius-sm);
+  color: var(--text-weak);
+  cursor: pointer;
+  padding: 0;
+}
+
+.am-project-chevron:hover {
+  background: var(--surface-inset-base-hover);
+  color: var(--text-base);
+}
+
+.am-project-chevron:disabled {
+  cursor: default;
+}
+
+.am-project-body {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  padding: 0 6px;
+}
+
+.am-project-body > .am-local-item {
+  margin: 0 0 2px;
+}
+
+.am-project-body .am-worktree-list {
+  overflow: visible;
+  max-height: none;
+}
+
+.am-project-loading {
+  display: flex;
+  justify-content: center;
+  padding: 8px 0;
+}
+
 /* Collapsible section toggle */
 
 button.am-section-toggle {
@@ -426,6 +575,25 @@ button.am-section-toggle:hover .am-section-label {
   color: var(--text-weak);
 }
 
+/* Jump modifier held (⌘/Ctrl): reveal shortcut badges on every item, not just the
+   hovered one. Scoped via :has so items without a badge (beyond ⌘9) keep their stats.
+   The close button stays hidden so holding the modifier never exposes the delete action. */
+.am-show-shortcuts .am-wt-hover-actions:has(.am-shortcut-badge) {
+  opacity: 1;
+  visibility: visible;
+}
+.am-show-shortcuts .am-wt-hover-actions .am-worktree-close {
+  display: none;
+}
+.am-show-shortcuts .am-wt-actions-cell:has(.am-shortcut-badge) > .am-worktree-stats,
+.am-show-shortcuts .am-wt-actions-cell:has(.am-shortcut-badge) > .am-worktree-stats-skeleton {
+  opacity: 0;
+  visibility: hidden;
+}
+.am-show-shortcuts .am-local-item .am-shortcut-badge {
+  opacity: 1;
+}
+
 .am-worktree-item:has(.am-worktree-rename-input) .am-wt-row2 {
   display: none;
 }
@@ -1277,6 +1445,19 @@ button.am-section-toggle:hover .am-section-label {
   color: currentColor;
 }
 
+.am-tab-icon[data-run-status="success"] {
+  color: var(--vscode-testing-iconPassed, #34d399);
+}
+
+.am-tab-icon[data-run-status="failure"] {
+  color: var(--vscode-testing-iconFailed, #f87171);
+}
+
+.am-terminal-tab-spinner {
+  width: 12px;
+  height: 12px;
+}
+
 .am-tab-label {
   flex: 1;
   min-width: 0;
@@ -1698,35 +1879,58 @@ body.am-wt-dragging-active * {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 4px 4px 4px 12px;
+  gap: 6px;
+  padding: 4px 4px 4px 8px;
   flex-shrink: 0;
   border-bottom: 1px solid var(--border-weak-base);
   position: relative;
   z-index: 20;
   background: var(--surface-base);
-}
-
-.am-diff-header-title {
-  font-size: var(--font-size-small);
-  font-weight: 500;
-  color: var(--text-weak);
+  /* Query container for the narrow-panel rules below and in banners.css. The
+     panel width is user-draggable, so the header adapts to its own width
+     rather than the viewport. */
+  container-type: inline-size;
+  container-name: am-diff-header;
 }
 
 .am-diff-header-main {
   display: flex;
   align-items: center;
-  gap: 10px;
+  gap: 6px;
   flex: 1;
   min-width: 0;
+  overflow: hidden;
 }
 
 .am-diff-header-stats {
   display: flex;
   align-items: center;
   gap: 8px;
+  flex: 0 1 auto;
+  min-width: 0;
   font-size: var(--font-size-small);
   color: var(--text-weak);
   white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* Progressive disclosure, least important first. Thresholds are derived from the
+   measured control widths: scope 76px, base <=191px, diff style 76px, 6px gaps,
+   plus ~90px of action buttons and 12px padding. Each breakpoint fires while the
+   remaining set still fits, so nothing is ever clipped under the buttons.
+   The collapsed-files hint goes before the totals; both are also shown on the
+   worktree row and the diff toggle button, so no information is lost. */
+@container am-diff-header (max-width: 560px) {
+  .am-diff-header-collapsed {
+    display: none;
+  }
+}
+
+@container am-diff-header (max-width: 520px) {
+  .am-diff-header-stats {
+    display: none;
+  }
 }
 
 .am-diff-header-adds {
@@ -4599,6 +4803,70 @@ body.vscode-high-contrast-light {
   color: var(--text-weak);
 }
 
+/* Side terminal tab strip — one row of tabs reusing the top bar's
+   .am-tab chrome, plus the "+" action. Height matches .am-diff-header
+   (32px) so switching inspector modes does not shift the panel chrome.
+   No vertical padding: tabs fill the strip like they fill .am-tab-bar,
+   which also keeps the "+" optically centered. The strip itself never
+   scrolls; the tab list does, so a narrow panel never pushes the "+"
+   action out of view (same split as .am-tab-list-wrap /
+   .am-tab-add-wrap). */
+.am-side-terminal-tabs {
+  display: flex;
+  align-items: stretch;
+  height: 32px;
+  padding: 0 4px;
+  gap: 2px;
+  flex-shrink: 0;
+  border-bottom: 1px solid var(--border-weak-base);
+  background: var(--surface-base);
+  position: relative;
+  z-index: 20;
+}
+
+/* Same width model as .am-tab-list: tabs claim an equal share of the
+   strip up to a maximum, and the list itself only grows as wide as its
+   tabs, so the "+" action stays glued to the last tab instead of
+   drifting to the far edge of a wide panel. The cap is smaller than the
+   top bar's 240px because the panel is narrow. */
+.am-side-terminal-tablist {
+  --am-tab-max-width: 180px;
+  --am-tab-width: clamp(72px, calc(100% / var(--tab-count, 1)), var(--am-tab-max-width));
+  display: flex;
+  align-items: stretch;
+  /* No gap, like .am-tab-list: equal-share tab widths already consume
+     the full width, so any gap would leave the list a few pixels
+     scrollable and keep the overflow fade lit for nothing. */
+  flex: 0 1 calc(var(--tab-count, 1) * var(--am-tab-max-width));
+  min-width: 0;
+  height: 100%;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: none;
+}
+
+.am-side-terminal-tablist::-webkit-scrollbar {
+  display: none;
+}
+
+.am-side-terminal-tablist[data-tab-widths-frozen] .am-tab-sortable {
+  transition: none;
+}
+
+/* The left divider marks a terminal among session tabs in the top bar.
+   Every tab here is a terminal, so it would just be noise. */
+.am-side-terminal-tablist .am-tab-terminal {
+  border-left-color: transparent;
+}
+
+.am-side-terminal-add {
+  display: flex;
+  align-items: center;
+  align-self: center;
+  flex-shrink: 0;
+  padding: 0 2px;
+}
+
 /* Hidden-but-alive side panel host: taken out of the flow so the chat
    reclaims the width, but kept painted so hidden side terminals keep
    streaming. Anchored to .am-detail-stack (position: relative). */
@@ -4615,14 +4883,15 @@ body.vscode-high-contrast-light {
   flex: 1;
   min-height: 0;
   min-width: 0;
-  padding: 8px;
   background: var(--vscode-terminal-background, #1e1e1e);
 }
 
 /* Third-party xterm classes — addressed by attribute selector so the
-   agent-manager "am-* prefix" architecture test does not flag them. */
-.am-terminal-host [class="xterm"] {
+   agent-manager "am-* prefix" architecture test does not flag them.
+   FitAddon subtracts padding from xterm itself, not its parent host. */
+.am-terminal-host [class~="xterm"] {
   height: 100%;
+  padding: 8px;
 }
 
 .am-terminal-host [class~="xterm-viewport"] {
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx b/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx
new file mode 100644
index 0000000000..5635b1bfae
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx
@@ -0,0 +1,284 @@
+/** @jsxImportSource solid-js */
+
+/**
+ * Apply-to-local workflow for Agent Manager.
+ *
+ * Owns everything about applying a selected worktree's diff into the local
+ * repo: the per-worktree apply status, the dialog's file selection state, the
+ * derived memos that drive `ApplyDialog`, and the result/toast handling for
+ * the backend's `applyWorktreeDiffResult` message. Extracted from
+ * `AgentManagerApp.tsx` so the app component only wires the workflow in.
+ */
+
+import { createEffect, createMemo, createSignal, on, type Accessor } from "solid-js"
+import { showToast } from "@kilocode/kilo-ui/toast"
+import { groupApplyConflicts } from "./apply-conflicts"
+import { ApplyDialog } from "./ApplyDialog"
+import { composeDiffId } from "./diff-scope-state"
+import type { tracker } from "./telemetry"
+import type { useDialog } from "@kilocode/kilo-ui/context/dialog"
+import type { useLanguage } from "../src/context/language"
+import type { useVSCode } from "../src/context/vscode"
+import type { AgentManagerApplyWorktreeDiffResultMessage, WorktreeFileDiff } from "../src/types/messages"
+
+interface ApplyState {
+  status: AgentManagerApplyWorktreeDiffResultMessage["status"]
+  message: string
+  conflicts: NonNullable<AgentManagerApplyWorktreeDiffResultMessage["conflicts"]>
+}
+
+interface ApplyToLocalOptions {
+  vscode: ReturnType<typeof useVSCode>
+  dialog: ReturnType<typeof useDialog>
+  t: ReturnType<typeof useLanguage>["t"]
+  /** Current sidebar selection (LOCAL, a worktree id, or null). */
+  selection: Accessor<string | null>
+  /** Sentinel id for the local repo selection. */
+  local: string
+  worktrees: Accessor<{ id: string }[]>
+  diffDatas: Accessor<Record<string, WorktreeFileDiff[]>>
+  diffLoading: Accessor<boolean>
+  /** Telemetry: metrics.track(name, surface, data). */
+  track: ReturnType<typeof tracker>["track"]
+}
+
+export function createApplyToLocal(opts: ApplyToLocalOptions) {
+  const { vscode, dialog, t, selection, local, worktrees, diffDatas, diffLoading } = opts
+
+  const [applyStates, setApplyStates] = createSignal<Record<string, ApplyState>>({})
+  const [applyTarget, setApplyTarget] = createSignal<string | undefined>()
+  const [applySelectedFiles, setApplySelectedFiles] = createSignal<string[]>([])
+  const [applySelectionTouched, setApplySelectionTouched] = createSignal(false)
+
+  const applyStateForSelection = createMemo(() => {
+    const sel = selection()
+    if (!sel || sel === local) return undefined
+    return applyStates()[sel]
+  })
+
+  const applyBusyForSelection = createMemo(() => {
+    const state = applyStateForSelection()
+    if (!state) return false
+    return state.status === "checking" || state.status === "applying"
+  })
+
+  // Apply diffs come from the branch-scoped diff data of the target worktree
+  // (keyed by `worktreeId#branch`, matching the review surfaces).
+  const applyDiffKey = createMemo(() => {
+    const target = applyTarget()
+    if (!target) return undefined
+    return composeDiffId(target, "branch")
+  })
+
+  const applyDiffs = createMemo(() => {
+    const key = applyDiffKey()
+    if (!key) return [] as WorktreeFileDiff[]
+    return diffDatas()[key] ?? ([] as WorktreeFileDiff[])
+  })
+
+  const applyStateForTarget = createMemo(() => {
+    const target = applyTarget()
+    if (!target) return undefined
+    return applyStates()[target]
+  })
+
+  const applyBusyForTarget = createMemo(() => {
+    const state = applyStateForTarget()
+    if (!state) return false
+    return state.status === "checking" || state.status === "applying"
+  })
+
+  const applySelectedSet = createMemo(() => new Set(applySelectedFiles()))
+
+  const applySelectionStats = createMemo(() => {
+    const set = applySelectedSet()
+    const selected = applyDiffs().filter((diff) => set.has(diff.file))
+    const additions = selected.reduce((sum, diff) => sum + diff.additions, 0)
+    const deletions = selected.reduce((sum, diff) => sum + diff.deletions, 0)
+    return {
+      total: applyDiffs().length,
+      selected: selected.length,
+      additions,
+      deletions,
+    }
+  })
+
+  const applyHasSelection = createMemo(() => applySelectionStats().selected > 0)
+
+  const applyConflictRows = createMemo(() => groupApplyConflicts(applyStateForTarget()?.conflicts ?? []))
+
+  const applyToLocal = (worktreeId: string, selectedFiles: string[]) => {
+    setApplyStates((prev) => ({
+      ...prev,
+      [worktreeId]: {
+        status: "checking",
+        message: t("agentManager.apply.checking"),
+        conflicts: [],
+      },
+    }))
+    vscode.postMessage({ type: "agentManager.applyWorktreeDiff", worktreeId, selectedFiles })
+  }
+
+  const resetApplyDialog = () => {
+    setApplyTarget(undefined)
+    setApplySelectedFiles([])
+    setApplySelectionTouched(false)
+  }
+
+  const closeApplyDialog = () => {
+    resetApplyDialog()
+    dialog.close()
+  }
+
+  const applySelectAll = () => {
+    setApplySelectionTouched(true)
+    setApplySelectedFiles(applyDiffs().map((diff) => diff.file))
+  }
+
+  const applySelectNone = () => {
+    setApplySelectionTouched(true)
+    setApplySelectedFiles([])
+  }
+
+  const applyToggleFile = (file: string, checked: boolean) => {
+    setApplySelectionTouched(true)
+    setApplySelectedFiles((prev) => {
+      if (checked) {
+        if (prev.includes(file)) return prev
+        const set = new Set(prev)
+        set.add(file)
+        return applyDiffs()
+          .map((diff) => diff.file)
+          .filter((path) => set.has(path))
+      }
+      if (!prev.includes(file)) return prev
+      return prev.filter((path) => path !== file)
+    })
+  }
+
+  const triggerApply = () => {
+    const target = applyTarget()
+    if (!target) return
+    if (!applyHasSelection()) return
+    if (applyBusyForTarget()) return
+    opts.track("apply_to_local", "apply_dialog", { fileCount: applySelectedFiles().length })
+    applyToLocal(target, applySelectedFiles())
+  }
+
+  const openApplyDialog = () => {
+    const sel = selection()
+    if (!sel || sel === local) return
+    setApplyStates((prev) => {
+      if (!prev[sel]) return prev
+      const next = { ...prev }
+      delete next[sel]
+      return next
+    })
+    setApplyTarget(sel)
+    setApplySelectionTouched(false)
+    setApplySelectedFiles([])
+    vscode.postMessage({ type: "agentManager.requestWorktreeDiff", sessionId: sel })
+
+    setApplySelectedFiles(applyDiffs().map((diff) => diff.file))
+
+    dialog.show(
+      () => (
+        <ApplyDialog
+          diffs={applyDiffs()}
+          loading={diffLoading()}
+          selectedFiles={applySelectedSet()}
+          selectedCount={applySelectionStats().selected}
+          additions={applySelectionStats().additions}
+          deletions={applySelectionStats().deletions}
+          busy={applyBusyForTarget()}
+          hasSelection={applyHasSelection()}
+          status={applyStateForTarget()?.status}
+          message={applyStateForTarget()?.message}
+          conflictRows={applyConflictRows()}
+          onSelectAll={applySelectAll}
+          onSelectNone={applySelectNone}
+          onToggleFile={applyToggleFile}
+          onApply={triggerApply}
+          onClose={closeApplyDialog}
+        />
+      ),
+      resetApplyDialog,
+    )
+  }
+
+  // Keep the dialog selection in step with the diff set: select everything on
+  // first load, then drop files that disappear from the diff without clobbering
+  // a selection the user has already made.
+  createEffect(
+    on(
+      () => [applyTarget(), applyDiffs(), applySelectionTouched()] as const,
+      ([target, diffs, touched]) => {
+        if (!target) return
+        const files = diffs.map((diff) => diff.file)
+        if (files.length === 0) {
+          if (!touched) setApplySelectedFiles([])
+          return
+        }
+
+        if (!touched) {
+          setApplySelectedFiles(files)
+          return
+        }
+
+        const current = applySelectedFiles()
+        const set = new Set(current)
+        const next = files.filter((file) => set.has(file))
+        const same = next.length === current.length && next.every((file, index) => file === current[index])
+        if (!same) setApplySelectedFiles(next)
+      },
+    ),
+  )
+
+  // Drop apply state for worktrees that no longer exist, and close a dialog
+  // whose target disappeared.
+  createEffect(() => {
+    const ids = new Set(worktrees().map((wt) => wt.id))
+    setApplyStates((prev) => {
+      const next = Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id)))
+      if (Object.keys(next).length === Object.keys(prev).length) return prev
+      return next
+    })
+
+    const target = applyTarget()
+    if (target && !ids.has(target)) closeApplyDialog()
+  })
+
+  // Backend `applyWorktreeDiffResult` message: record the new status and toast.
+  const onApplyResult = (ev: AgentManagerApplyWorktreeDiffResultMessage) => {
+    const files = new Set((ev.conflicts ?? []).map((entry) => entry.file).filter(Boolean)).size
+    const count = ev.conflicts?.length ?? 0
+    setApplyStates((prev) => ({
+      ...prev,
+      [ev.worktreeId]: {
+        status: ev.status,
+        message: ev.message,
+        conflicts: ev.conflicts ?? [],
+      },
+    }))
+
+    if (ev.status === "success") {
+      showToast({ variant: "success", title: t("agentManager.apply.success"), description: ev.message })
+      if (applyTarget() === ev.worktreeId) closeApplyDialog()
+    }
+    if (ev.status === "conflict") {
+      const summary =
+        count > 0 ? t("agentManager.apply.conflictToast", { count, files: Math.max(files, 1) }) : ev.message
+      showToast({ variant: "error", title: t("agentManager.apply.conflict"), description: summary })
+    }
+    if (ev.status === "error") {
+      showToast({ variant: "error", title: t("agentManager.apply.error"), description: ev.message })
+    }
+  }
+
+  return {
+    applyStateForSelection,
+    applyBusyForSelection,
+    openApplyDialog,
+    onApplyResult,
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/diff-review-scope.ts b/packages/kilo-vscode/webview-ui/agent-manager/diff-review-scope.ts
new file mode 100644
index 0000000000..5ab26be781
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/diff-review-scope.ts
@@ -0,0 +1,136 @@
+/**
+ * Diff scope + base branch state for the Agent Manager review surfaces.
+ *
+ * Owns the per-context scope selection, the branch picker data for the active
+ * context, and the message senders that drive both. Extracted from
+ * AgentManagerApp to keep that file under its line cap; both the side panel
+ * and the full-screen review tab consume the single instance returned here.
+ */
+
+import { createEffect, createMemo, createSignal, type Accessor } from "solid-js"
+import type { BranchInfo } from "../src/types/messages"
+import { composeDiffId, createDiffScope, isDiffScope, scopeDescriptors } from "./diff-scope-state"
+
+interface VsCode {
+  postMessage(msg: unknown): void
+}
+
+export interface DiffReviewScopeOptions {
+  /** Current diff context (worktree id or the LOCAL pseudo-id). */
+  ctx: Accessor<string | undefined>
+  /** Active session inside the context; the Session scope follows it. */
+  session: Accessor<string | undefined>
+  /** Whether the diff side panel is open. */
+  panelOpen: Accessor<boolean>
+  /** Whether the full-screen review tab is active. */
+  reviewActive: Accessor<boolean>
+  vscode: VsCode
+}
+
+export function createDiffReviewScope(opts: DiffReviewScopeOptions) {
+  const scope = createDiffScope(opts.ctx)
+  // The composite id (ctx#scope, or ctx#session:<sid>) the extension keys
+  // diff data by. Rebuilds when the active session changes while the Session
+  // scope is active, so a session tab switch refetches that session's diff.
+  const id = createMemo(() => {
+    const ctx = opts.ctx()
+    if (!ctx) return undefined
+    return composeDiffId(ctx, scope.scope(), scope.scope() === "session" ? opts.session() : undefined)
+  })
+
+  // Branch picker state for the active context (Branch scope only).
+  const [branches, setBranches] = createSignal<BranchInfo[]>([])
+  const [loading, setLoading] = createSignal(false)
+  const [defaultBranch, setDefaultBranch] = createSignal("")
+  const [autoBase, setAutoBase] = createSignal<string | undefined>(undefined)
+  const [currentBase, setCurrentBase] = createSignal<string | undefined>(undefined)
+  const [isAuto, setIsAuto] = createSignal(true)
+  const [currentBranch, setCurrentBranch] = createSignal<string | undefined>(undefined)
+
+  // Scope descriptors for the current context. The Session scope only exists
+  // when the context has an active session to diff.
+  const descriptors = createMemo(() => {
+    const ctx = opts.ctx()
+    if (!ctx) return []
+    return scopeDescriptors(ctx, opts.session())
+  })
+
+  // Fall back to Branch when the active session disappears (tab closed,
+  // session deleted) while the Session scope is selected.
+  createEffect(() => {
+    const ctx = opts.ctx()
+    if (!ctx) return
+    if (scope.scope() === "session" && !opts.session()) scope.setScope("branch")
+  })
+
+  const isBranch = () => scope.scope() === "branch"
+
+  const select = (next: string) => {
+    const ctx = opts.ctx()
+    if (!ctx) return
+    const value = next.slice(ctx.length + 1)
+    if (value.startsWith("session")) {
+      scope.setScope("session")
+      return
+    }
+    scope.setScope(isDiffScope(value) ? value : "branch")
+  }
+
+  const selectBase = (branch: string | undefined) => {
+    const ctx = opts.ctx()
+    if (!ctx) return
+    // Optimistic update; the extension echoes authoritative state back.
+    setCurrentBase(branch ?? autoBase())
+    setIsAuto(branch === undefined)
+    opts.vscode.postMessage({ type: "agentManager.setDiffBaseBranch", sessionId: ctx, scope: scope.scope(), branch })
+  }
+
+  // Fetch branch picker data whenever the Branch scope becomes active for the
+  // current context. The extension owns override state, so ask each time.
+  createEffect(() => {
+    if (scope.scope() !== "branch") return
+    const ctx = opts.ctx()
+    if (!ctx) return
+    if (!opts.panelOpen() && !opts.reviewActive()) return
+    setLoading(true)
+    opts.vscode.postMessage({ type: "agentManager.requestDiffBranches", sessionId: ctx, scope: scope.scope() })
+  })
+
+  /** Handle the extension's diffBranches push, ignoring stale contexts. */
+  const onBranches = (ev: {
+    sessionId: string
+    branches: BranchInfo[]
+    defaultBranch: string
+    autoBase?: string
+    currentBase?: string
+    isAuto: boolean
+    currentBranch?: string
+  }) => {
+    if (ev.sessionId === id()) {
+      setBranches(ev.branches)
+      setDefaultBranch(ev.defaultBranch)
+      setAutoBase(ev.autoBase)
+      setCurrentBase(ev.currentBase)
+      setIsAuto(ev.isAuto)
+      setCurrentBranch(ev.currentBranch)
+    }
+    setLoading(false)
+  }
+
+  return {
+    scope: scope.scope,
+    id,
+    descriptors,
+    isBranch,
+    select,
+    selectBase,
+    onBranches,
+    branches,
+    loading,
+    defaultBranch,
+    autoBase,
+    currentBase,
+    isAuto,
+    currentBranch,
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/diff-scope-state.ts b/packages/kilo-vscode/webview-ui/agent-manager/diff-scope-state.ts
new file mode 100644
index 0000000000..98f6b3de40
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/diff-scope-state.ts
@@ -0,0 +1,106 @@
+/**
+ * Webview-side diff scope state for Agent Manager.
+ *
+ * Mirrors the extension's composite diff id (`ctx#scope`, or `ctx#session:<sid>`
+ * for the session scope — see `src/agent-manager/diff-scope.ts`) and builds the
+ * fixed scope descriptor list shown in the scope selector. The context is the
+ * sidebar selection (a worktree id or the `local` pseudo-context), so it stays
+ * stable across session tab switches; only the Session scope follows the active
+ * session. Agent Manager always offers the same four scopes per context, so the
+ * descriptors are computed client-side rather than pushed from the extension.
+ */
+
+import { createMemo, createSignal, type Accessor } from "solid-js"
+import type { DiffSourceDescriptor } from "../../src/diff/sources/types"
+
+export type DiffScope = "branch" | "staged" | "unstaged" | "session"
+
+export const DEFAULT_DIFF_SCOPE: DiffScope = "branch"
+
+const SEP = "#"
+const SESSION_TOKEN = "session:"
+
+export function composeDiffId(ctx: string, scope: DiffScope, sessionId?: string): string {
+  if (scope === "session" && sessionId) return `${ctx}${SEP}${SESSION_TOKEN}${sessionId}`
+  return `${ctx}${SEP}${scope}`
+}
+
+export function parseDiffId(id: string): { ctx: string; scope: DiffScope; sessionId?: string } {
+  const idx = id.lastIndexOf(SEP)
+  if (idx === -1) return { ctx: id, scope: DEFAULT_DIFF_SCOPE }
+  const token = id.slice(idx + SEP.length)
+  const ctx = id.slice(0, idx)
+  if (token.startsWith(SESSION_TOKEN)) return { ctx, scope: "session", sessionId: token.slice(SESSION_TOKEN.length) }
+  if (isDiffScope(token)) return { ctx, scope: token }
+  return { ctx: id, scope: DEFAULT_DIFF_SCOPE }
+}
+
+export function isDiffScope(value: string): value is DiffScope {
+  return value === "branch" || value === "staged" || value === "unstaged" || value === "session"
+}
+
+/**
+ * The fixed scope descriptors for a context. `workspace` maps to the Branch
+ * scope to reuse the existing i18n keys (`diffViewer.source.workspace.*`).
+ * Session scope is only meaningful when the context has an active session, so
+ * it is omitted while a context has none (e.g. an empty worktree or the local
+ * context with no open session).
+ */
+export function scopeDescriptors(ctx: string, sessionId?: string): DiffSourceDescriptor[] {
+  const out: DiffSourceDescriptor[] = [
+    {
+      id: composeDiffId(ctx, "branch"),
+      type: "workspace",
+      group: "Git",
+      capabilities: { revert: true, comments: true },
+    },
+    { id: composeDiffId(ctx, "staged"), type: "staged", group: "Git", capabilities: { revert: false, comments: true } },
+    {
+      id: composeDiffId(ctx, "unstaged"),
+      type: "unstaged",
+      group: "Git",
+      capabilities: { revert: false, comments: true },
+    },
+  ]
+  if (sessionId) {
+    out.push({
+      id: composeDiffId(ctx, "session", sessionId),
+      type: "session",
+      group: "Session",
+      capabilities: { revert: false, comments: true },
+    })
+  }
+  return out
+}
+
+/**
+ * Whether the Branch scope supports revert. Staged/unstaged/session are
+ * read-only; only the Branch scope can revert files back to the merge base.
+ */
+export function scopeCapabilities(scope: DiffScope): { revert: boolean; comments: boolean } {
+  return { revert: scope === "branch", comments: true }
+}
+
+/**
+ * Per-context scope selection. Keeps the last-picked scope per context id so
+ * switching between worktrees restores each worktree's scope, while a brand
+ * new context defaults to Branch. The context is the sidebar selection, so the
+ * picked scope survives session tab switches inside the context.
+ */
+export function createDiffScope(currentCtx: Accessor<string | undefined>) {
+  const [scopes, setScopes] = createSignal<Record<string, DiffScope>>({})
+
+  const scope = createMemo((): DiffScope => {
+    const ctx = currentCtx()
+    if (!ctx) return DEFAULT_DIFF_SCOPE
+    return scopes()[ctx] ?? DEFAULT_DIFF_SCOPE
+  })
+
+  const setScope = (next: DiffScope) => {
+    const ctx = currentCtx()
+    if (!ctx) return
+    setScopes((prev) => ({ ...prev, [ctx]: next }))
+  }
+
+  return { scope, setScope }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
index 79d4b74c51..f80d0d2d36 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "إظهار الشريط الجانبي",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "الجلسات",
+  "agentManager.projects": "المشاريع",
+  "agentManager.project.add": "إضافة مشروع",
+  "agentManager.project.remove": "إزالة من Agent Manager",
+  "agentManager.project.trust": "وثوق",
+  "agentManager.project.missing": "المستودع غير موجود",
   "agentManager.notGitRepo": "ليس مستودع git",
   "agentManager.worktree.settings": "إعدادات Worktree",
   "agentManager.worktree.new": "Worktree جديد",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "تحريك لأعلى",
   "agentManager.section.moveDown": "تحريك لأسفل",
   "agentManager.hoverCard.branch": "الفرع",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "الأساس",
   "agentManager.hoverCard.sessions": "الجلسات",
   "agentManager.hoverCard.files": "الملفات",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "علامة تبويب جديدة للمحطة الطرفية",
   "agentManager.terminal.ended": "انتهت المحطة الطرفية — أغلق علامة التبويب للإخفاء",
+  "agentManager.terminal.setupFailed": "فشل البرنامج النصي للإعداد",
+  "agentManager.terminal.setupFailedCode": "فشل البرنامج النصي للإعداد برمز الخروج",
+  "agentManager.terminal.stopSetup": "إيقاف البرنامج النصي للإعداد",
   "agentManager.terminal.connectionError": "خطأ في اتصال المحطة الطرفية",
-  "agentManager.terminal.kill": "إنهاء المحطة الطرفية",
+  "agentManager.terminal.add": "محطة طرفية جديدة",
   "agentManager.terminal.empty": "لا توجد محطة طرفية هنا بعد",
   "agentManager.terminal.start": "بدء المحطة الطرفية",
   "agentManager.terminal.destination": "اختر ما الذي يفتحه زر المحطة الطرفية",
@@ -135,6 +144,8 @@ export const dict = {
   "agentManager.diff.revertFile": "استعادة الملف",
   "agentManager.diff.revertSuccess": "تم استعادة الملف",
   "agentManager.diff.revertError": "فشل الاستعادة",
+  "agentManager.diff.applyBranchOnly":
+    "لا يعمل تطبيق التغييرات إلا على فرق الفرع الكامل. انتقل إلى نطاق Branch لتطبيقها.",
   "agentManager.open.button": "فتح",
   "agentManager.open.tooltip": "فتح Worktree هذا في VS Code",
   "agentManager.apply.globalButton": "تطبيق",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
index 67cdb9bcf3..cf38d011df 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Mostrar barra lateral",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESSÕES",
+  "agentManager.projects": "PROJETOS",
+  "agentManager.project.add": "Adicionar projeto",
+  "agentManager.project.remove": "Remover do Agent Manager",
+  "agentManager.project.trust": "Confiar",
+  "agentManager.project.missing": "Repositório não encontrado",
   "agentManager.notGitRepo": "Não é um repositório git",
   "agentManager.worktree.settings": "Configurações do Worktree",
   "agentManager.worktree.new": "Novo Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Mover para Cima",
   "agentManager.section.moveDown": "Mover para Baixo",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessões",
   "agentManager.hoverCard.files": "Arquivos",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nova aba de terminal",
   "agentManager.terminal.ended": "terminal encerrado — feche a aba para dispensar",
+  "agentManager.terminal.setupFailed": "falha no script de configuração",
+  "agentManager.terminal.setupFailedCode": "falha no script de configuração com código de saída",
+  "agentManager.terminal.stopSetup": "Parar o script de configuração",
   "agentManager.terminal.connectionError": "erro de conexão do terminal",
-  "agentManager.terminal.kill": "Encerrar terminal",
+  "agentManager.terminal.add": "Novo terminal",
   "agentManager.terminal.empty": "Ainda não há terminal aqui",
   "agentManager.terminal.start": "Iniciar terminal",
   "agentManager.terminal.destination": "Escolha o que o botão do terminal abre",
@@ -138,6 +147,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Reverter arquivo",
   "agentManager.diff.revertSuccess": "Arquivo revertido",
   "agentManager.diff.revertError": "Falha ao reverter",
+  "agentManager.diff.applyBranchOnly":
+    "Aplicar funciona apenas no diff completo da branch. Mude para o escopo Branch para aplicar.",
   "agentManager.open.button": "Abrir",
   "agentManager.open.tooltip": "Abrir este Worktree no VS Code",
   "agentManager.apply.globalButton": "Aplicar",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
index f6fddfd612..c2fe0a23d9 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Prikaži bočnu traku",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESIJE",
+  "agentManager.projects": "PROJEKTI",
+  "agentManager.project.add": "Dodaj projekat",
+  "agentManager.project.remove": "Ukloni iz Agent Manager-a",
+  "agentManager.project.trust": "Vjeruj",
+  "agentManager.project.missing": "Repozitorij nije pronađen",
   "agentManager.notGitRepo": "Nije git repozitorij",
   "agentManager.worktree.settings": "Postavke Worktree-a",
   "agentManager.worktree.new": "Novi Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Pomjeri gore",
   "agentManager.section.moveDown": "Pomjeri dolje",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Baza",
   "agentManager.hoverCard.sessions": "Sesije",
   "agentManager.hoverCard.files": "Datoteke",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nova kartica terminala",
   "agentManager.terminal.ended": "terminal je završen — zatvorite karticu da biste odbacili",
+  "agentManager.terminal.setupFailed": "skripta za postavljanje nije uspjela",
+  "agentManager.terminal.setupFailedCode": "skripta za postavljanje nije uspjela s izlaznim kodom",
+  "agentManager.terminal.stopSetup": "Zaustavi skriptu za postavljanje",
   "agentManager.terminal.connectionError": "greška u vezi terminala",
-  "agentManager.terminal.kill": "Prekini terminal",
+  "agentManager.terminal.add": "Novi terminal",
   "agentManager.terminal.empty": "Ovdje još nema terminala",
   "agentManager.terminal.start": "Pokreni terminal",
   "agentManager.terminal.destination": "Odaberite šta otvara dugme terminala",
@@ -138,6 +147,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Vrati datoteku",
   "agentManager.diff.revertSuccess": "Datoteka vraćena",
   "agentManager.diff.revertError": "Vraćanje neuspješno",
+  "agentManager.diff.applyBranchOnly":
+    "Primijeni radi samo s kompletnim diffom grane. Prebacite se na opseg Branch da biste primijenili.",
   "agentManager.open.button": "Otvori",
   "agentManager.open.tooltip": "Otvori ovaj worktree u VS Code-u",
   "agentManager.apply.globalButton": "Primijeni",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
index beb827b1c9..3af20c04b9 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Vis sidebjælke",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESSIONER",
+  "agentManager.projects": "PROJEKTER",
+  "agentManager.project.add": "Tilføj projekt",
+  "agentManager.project.remove": "Fjern fra Agent Manager",
+  "agentManager.project.trust": "Godkend",
+  "agentManager.project.missing": "Repository ikke fundet",
   "agentManager.notGitRepo": "Ikke et git-repository",
   "agentManager.worktree.settings": "Worktree-indstillinger",
   "agentManager.worktree.new": "Nyt Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Flyt op",
   "agentManager.section.moveDown": "Flyt ned",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessioner",
   "agentManager.hoverCard.files": "Filer",
@@ -59,8 +65,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Ny terminalfane",
   "agentManager.terminal.ended": "terminal afsluttet — luk fanen for at fjerne",
+  "agentManager.terminal.setupFailed": "opsætningsscript mislykkedes",
+  "agentManager.terminal.setupFailedCode": "opsætningsscript mislykkedes med exitkode",
+  "agentManager.terminal.stopSetup": "Stop opsætningsscript",
   "agentManager.terminal.connectionError": "forbindelsesfejl til terminal",
-  "agentManager.terminal.kill": "Afslut terminal",
+  "agentManager.terminal.add": "Ny terminal",
   "agentManager.terminal.empty": "Ingen terminal her endnu",
   "agentManager.terminal.start": "Start terminal",
   "agentManager.terminal.destination": "Vælg, hvad terminalknappen åbner",
@@ -139,6 +148,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Gendan fil",
   "agentManager.diff.revertSuccess": "Fil gendannet",
   "agentManager.diff.revertError": "Gendannelse fejlede",
+  "agentManager.diff.applyBranchOnly":
+    "Anvend virker kun på hele Branch-diffen. Skift til Branch-området for at anvende.",
   "agentManager.open.button": "Åbn",
   "agentManager.open.tooltip": "Åbn dette Worktree i VS Code",
   "agentManager.apply.globalButton": "Anvend",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
index b9691ecbaf..7a4a9d30cb 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Seitenleiste anzeigen",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SITZUNGEN",
+  "agentManager.projects": "PROJEKTE",
+  "agentManager.project.add": "Projekt hinzufügen",
+  "agentManager.project.remove": "Aus Agent Manager entfernen",
+  "agentManager.project.trust": "Vertrauen",
+  "agentManager.project.missing": "Repository nicht gefunden",
   "agentManager.notGitRepo": "Kein Git-Repository",
   "agentManager.worktree.settings": "Worktree-Einstellungen",
   "agentManager.worktree.new": "Neuer Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Nach oben verschieben",
   "agentManager.section.moveDown": "Nach unten verschieben",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Basis",
   "agentManager.hoverCard.sessions": "Sitzungen",
   "agentManager.hoverCard.files": "Dateien",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Neuer Terminal-Tab",
   "agentManager.terminal.ended": "Terminal beendet — Tab schließen zum Verwerfen",
+  "agentManager.terminal.setupFailed": "Setup-Skript fehlgeschlagen",
+  "agentManager.terminal.setupFailedCode": "Setup-Skript mit Exit-Code fehlgeschlagen",
+  "agentManager.terminal.stopSetup": "Setup-Skript stoppen",
   "agentManager.terminal.connectionError": "Verbindungsfehler im Terminal",
-  "agentManager.terminal.kill": "Terminal beenden",
+  "agentManager.terminal.add": "Neues Terminal",
   "agentManager.terminal.empty": "Hier ist noch kein Terminal",
   "agentManager.terminal.start": "Terminal starten",
   "agentManager.terminal.destination": "Auswählen, was die Terminal-Schaltfläche öffnet",
@@ -139,6 +148,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Datei zurücksetzen",
   "agentManager.diff.revertSuccess": "Datei zurückgesetzt",
   "agentManager.diff.revertError": "Zurücksetzen fehlgeschlagen",
+  "agentManager.diff.applyBranchOnly":
+    "Anwenden funktioniert nur für den vollständigen Branch-Diff. Wechsle zum Bereich Branch, um anzuwenden.",
   "agentManager.open.button": "Öffnen",
   "agentManager.open.tooltip": "Dieses Worktree in VS Code öffnen",
   "agentManager.apply.globalButton": "Anwenden",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
index 236f18423a..46f9bf8ea1 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Show sidebar",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESSIONS",
+  "agentManager.projects": "PROJECTS",
+  "agentManager.project.add": "Add project",
+  "agentManager.project.remove": "Remove from Agent Manager",
+  "agentManager.project.trust": "Trust",
+  "agentManager.project.missing": "Repository not found",
   "agentManager.notGitRepo": "Not a git repository",
 
   "agentManager.worktree.settings": "Worktree settings",
@@ -32,6 +37,7 @@ export const dict = {
   "agentManager.section.moveDown": "Move Down",
 
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessions",
   "agentManager.hoverCard.files": "Files",
@@ -60,9 +66,12 @@ export const dict = {
   "agentManager.sidebarSearch.contexts": "LOCAL & WORKTREES",
 
   "agentManager.terminal.new": "New Terminal Tab",
+  "agentManager.terminal.add": "New terminal",
   "agentManager.terminal.ended": "terminal ended — close tab to dismiss",
+  "agentManager.terminal.setupFailed": "setup script failed",
+  "agentManager.terminal.setupFailedCode": "setup script failed with exit code",
+  "agentManager.terminal.stopSetup": "Stop setup script",
   "agentManager.terminal.connectionError": "terminal connection error",
-  "agentManager.terminal.kill": "Kill terminal",
   "agentManager.terminal.empty": "No terminal here yet",
   "agentManager.terminal.start": "Start terminal",
   "agentManager.terminal.destination": "Choose what the terminal button opens",
@@ -142,6 +151,7 @@ export const dict = {
   "agentManager.diff.revertFile": "Revert file",
   "agentManager.diff.revertSuccess": "File reverted",
   "agentManager.diff.revertError": "Revert failed",
+  "agentManager.diff.applyBranchOnly": "Apply works on the full branch diff. Switch to the Branch scope to apply.",
   "agentManager.open.button": "Open",
   "agentManager.open.tooltip": "Open this worktree in VS Code",
   "agentManager.apply.globalButton": "Apply",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
index a75de2ce0c..f8433dedc9 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Mostrar barra lateral",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESIONES",
+  "agentManager.projects": "PROYECTOS",
+  "agentManager.project.add": "Añadir proyecto",
+  "agentManager.project.remove": "Eliminar de Agent Manager",
+  "agentManager.project.trust": "Confiar",
+  "agentManager.project.missing": "Repositorio no encontrado",
   "agentManager.notGitRepo": "No es un repositorio git",
   "agentManager.worktree.settings": "Configuración de Worktree",
   "agentManager.worktree.new": "Nuevo Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Mover hacia arriba",
   "agentManager.section.moveDown": "Mover hacia abajo",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sesiones",
   "agentManager.hoverCard.files": "Archivos",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nueva pestaña de terminal",
   "agentManager.terminal.ended": "terminal finalizado — cierra la pestaña para descartar",
+  "agentManager.terminal.setupFailed": "el script de configuración falló",
+  "agentManager.terminal.setupFailedCode": "el script de configuración falló con el código de salida",
+  "agentManager.terminal.stopSetup": "Detener el script de configuración",
   "agentManager.terminal.connectionError": "error de conexión del terminal",
-  "agentManager.terminal.kill": "Terminar terminal",
+  "agentManager.terminal.add": "Nuevo terminal",
   "agentManager.terminal.empty": "Aún no hay ningún terminal aquí",
   "agentManager.terminal.start": "Iniciar terminal",
   "agentManager.terminal.destination": "Elegir qué abre el botón del terminal",
@@ -138,6 +147,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Revertir archivo",
   "agentManager.diff.revertSuccess": "Archivo revertido",
   "agentManager.diff.revertError": "Error al revertir",
+  "agentManager.diff.applyBranchOnly":
+    "Aplicar solo funciona con el diff completo de la rama. Cambia al ámbito Branch para aplicar.",
   "agentManager.open.button": "Abrir",
   "agentManager.open.tooltip": "Abrir este Worktree en VS Code",
   "agentManager.apply.globalButton": "Aplicar",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fa.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fa.ts
new file mode 100644
index 0000000000..83d29f71a4
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fa.ts
@@ -0,0 +1,217 @@
+export const dict = {
+  "agentManager.local": "محلی",
+  "agentManager.sidebar.collapse": "بستن نوار کناری",
+  "agentManager.sidebar.expand": "نمایش نوار کناری",
+  "agentManager.section.worktrees": "WORKTREES",
+  "agentManager.section.sessions": "SESSIONS",
+  "agentManager.projects": "PROJECTS",
+  "agentManager.project.add": "افزودن پروژه",
+  "agentManager.project.remove": "حذف از Agent Manager",
+  "agentManager.project.trust": "اعتماد",
+  "agentManager.project.missing": "مخزن یافت نشد",
+  "agentManager.notGitRepo": "این یک مخزن git نیست",
+
+  "agentManager.worktree.settings": "تنظیمات Worktree",
+  "agentManager.worktree.new": "Worktree جدید",
+  "agentManager.worktree.setupScript": "اسکریپت راه‌اندازی Worktree",
+  "agentManager.worktree.delete": "حذف Worktree",
+  "agentManager.worktree.confirmDelete": "حذف شود؟",
+  "agentManager.worktree.stale": "منسوخ",
+  "agentManager.worktree.staleTooltip": "روی دیسک وجود ندارد یا دیگر توسط git worktree ردیابی نمی‌شود",
+  "agentManager.worktree.removeStale": "حذف worktree منسوخ",
+  "agentManager.worktree.doubleClickRename": "برای تغییر نام دوبار کلیک کنید",
+  "agentManager.worktree.versions": "{{count}} نسخه",
+  "agentManager.worktree.advancedOptions": "گزینه‌های پیشرفته worktree",
+  "agentManager.worktree.defaultBaseBranch": "شاخه پایه پیش‌فرض",
+  "agentManager.worktree.defaultBaseBranchAuto": "تشخیص خودکار",
+  "agentManager.worktree.copyPath": "کپی مسیر",
+  "agentManager.worktree.openInVscode": "باز کردن در VS Code",
+  "agentManager.worktree.rename": "تغییر نام",
+  "agentManager.worktree.newSection": "بخش جدید",
+  "agentManager.worktree.ungrouped": "بدون گروه",
+  "agentManager.section.rename": "تغییر نام بخش",
+  "agentManager.section.setColor": "تنظیم رنگ",
+  "agentManager.section.delete": "حذف بخش",
+  "agentManager.section.defaultName": "بخش جدید",
+  "agentManager.section.moveUp": "انتقال به بالا",
+  "agentManager.section.moveDown": "انتقال به پایین",
+
+  "agentManager.hoverCard.branch": "شاخه",
+  "agentManager.hoverCard.worktree": "Worktree",
+  "agentManager.hoverCard.base": "پایه",
+  "agentManager.hoverCard.sessions": "جلسات",
+  "agentManager.hoverCard.files": "فایل‌ها",
+  "agentManager.hoverCard.changes": "تغییرات",
+  "agentManager.hoverCard.commits": "کامیت‌ها",
+
+  "agentManager.session.new": "جلسه جدید",
+  "agentManager.session.untitled": "بدون عنوان",
+  "agentManager.session.newSession": "جلسه جدید",
+  "agentManager.session.openInWorktree": "باز کردن در worktree",
+  "agentManager.session.openLocally": "باز کردن به صورت محلی",
+  "agentManager.session.readonly": "جلسه فقط‌خواندنی",
+  "agentManager.session.noSessions": "هیچ جلسه‌ای باز نیست",
+
+  "agentManager.tab.close": "بستن",
+  "agentManager.tab.closeOthers": "بستن بقیه",
+  "agentManager.tab.closeTab": "بستن برگه",
+  "agentManager.tab.forkSession": "انشعاب جلسه",
+  "agentManager.tab.terminal": "ترمینال",
+  "agentManager.tab.openTerminal": "باز کردن ترمینال",
+  "agentManager.tab.newOptions": "گزینه‌های بیشتر برای تب جدید",
+  "agentManager.tabsMenu.status.waiting": "انتظار",
+  "agentManager.tabsMenu.status.retry": "تلاش مجدد",
+  "agentManager.sidebarSearch.label": "جستجوی worktree‌ها و جلسات",
+  "agentManager.sidebarSearch.scope": "جستجو در فضای کاری محلی، جلسات محلی، worktree‌ها و جلسات آن‌ها",
+  "agentManager.sidebarSearch.contexts": "محلی و WORKTREE‌ها",
+
+  "agentManager.terminal.new": "تب ترمینال جدید",
+  "agentManager.terminal.add": "ترمینال جدید",
+  "agentManager.terminal.ended": "ترمینال پایان یافت — برای بستن، تب را ببندید",
+  "agentManager.terminal.setupFailed": "اسکریپت راه‌اندازی ناموفق بود",
+  "agentManager.terminal.setupFailedCode": "اسکریپت راه‌اندازی با کد خروجی ناموفق بود",
+  "agentManager.terminal.stopSetup": "توقف اسکریپت راه‌اندازی",
+  "agentManager.terminal.connectionError": "خطای اتصال ترمینال",
+  "agentManager.terminal.empty": "هنوز ترمینالی اینجا وجود ندارد",
+  "agentManager.terminal.start": "شروع ترمینال",
+  "agentManager.terminal.destination": "انتخاب کنید دکمه ترمینال چه چیزی را باز کند",
+  "agentManager.terminal.openInVscode": "ترمینال VS Code",
+  "agentManager.terminal.openInPanel": "پنل Agent Manager",
+  "agentManager.terminal.errorTitle": "خطای ترمینال",
+
+  "agentManager.setup.failed": "راه‌اندازی Worktree ناموفق بود",
+  "agentManager.setup.settingUp": "در حال راه‌اندازی Worktree",
+  "agentManager.setup.error.git_not_found":
+    "Git نصب نشده یا در PATH یافت نشد. لطفاً Git را نصب کرده و VS Code را مجدداً راه‌اندازی کنید.",
+  "agentManager.setup.error.not_git_repo": "برای استفاده از Worktree، پوشه‌ای که حاوی یک مخزن git است را باز کنید.",
+  "agentManager.setup.error.lfs_missing":
+    "این مخزن از Git LFS استفاده می‌کند، اما git-lfs یافت نشد. لطفاً Git LFS را نصب کنید.",
+  "agentManager.setup.error.no_commits":
+    "این مخزن هنوز هیچ کامیتی ندارد. قبل از استفاده از Worktree، یک کامیت اولیه ایجاد کنید.",
+  "agentManager.shortcuts.title": "میانبرهای صفحه‌کلید",
+  "agentManager.shortcuts.category.sidebar": "نوار کناری",
+  "agentManager.shortcuts.category.tabs": "تب‌ها",
+  "agentManager.shortcuts.category.terminal": "ترمینال",
+  "agentManager.shortcuts.category.global": "سراسری",
+  "agentManager.shortcuts.previousItem": "مورد قبلی",
+  "agentManager.shortcuts.nextItem": "مورد بعدی",
+  "agentManager.shortcuts.newWorktree": "Worktree جدید",
+  "agentManager.shortcuts.advancedWorktree": "پیکربندی Worktree جدید",
+  "agentManager.shortcuts.openWorktree": "باز کردن Worktree",
+  "agentManager.shortcuts.openPR": "باز کردن pull request",
+  "agentManager.shortcuts.deleteWorktree": "حذف Worktree",
+  "agentManager.shortcuts.previousTab": "تب قبلی",
+  "agentManager.shortcuts.nextTab": "تب بعدی",
+  "agentManager.shortcuts.newTab": "تب جدید",
+  "agentManager.shortcuts.closeTab": "بستن تب",
+  "agentManager.shortcuts.toggleTerminal": "نمایش/پنهان کردن ترمینال",
+  "agentManager.shortcuts.runScript": "اجرای اسکریپت",
+  "agentManager.run.options": "گزینه‌های اجرا",
+  "agentManager.run.configure": "پیکربندی اسکریپت اجرا",
+  "agentManager.shortcuts.openAgentManager": "باز کردن Agent Manager",
+  "agentManager.shortcuts.cycleAgentMode": "حالت عامل بعدی",
+  "agentManager.shortcuts.cyclePreviousAgentMode": "حالت عامل قبلی",
+  "agentManager.shortcuts.showShortcuts": "نمایش میانبرهای صفحه‌کلید",
+
+  "agentManager.dialog.removeStaleWorktree.title": "حذف Worktree قدیمی",
+  "agentManager.dialog.removeStaleWorktree.messagePre": "حذف Worktree قدیمی ",
+  "agentManager.dialog.removeStaleWorktree.messagePost":
+    "؟ این عملیات فقط نگاشت Agent Manager را حذف می‌کند و فایل‌های روی دیسک دست‌نخورده باقی می‌مانند.",
+  "agentManager.dialog.removeStaleWorktree.cancel": "لغو",
+  "agentManager.dialog.removeStaleWorktree.confirm": "حذف Worktree قدیمی",
+
+  "agentManager.dialog.openWorktree": "Worktree جدید",
+  "agentManager.dialog.tab.new": "جدید",
+  "agentManager.dialog.tab.import": "وارد کردن",
+  "agentManager.dialog.namePlaceholder": "نام Worktree (اختیاری)",
+  "agentManager.dialog.promptPlaceholder.mac": "پیامی بنویسید (⌘Enter برای ارسال)",
+  "agentManager.dialog.promptPlaceholder.other": "پیامی بنویسید (Ctrl+Enter برای ارسال)",
+  "agentManager.dialog.advancedOptions": "گزینه‌های پیشرفته",
+  "agentManager.dialog.branchName": "نام شاخه",
+  "agentManager.dialog.branchNamePlaceholder": "تولید خودکار",
+  "agentManager.dialog.baseBranch": "شاخه پایه",
+  "agentManager.dialog.searchBranches": "جستجوی شاخه‌ها...",
+  "agentManager.dialog.branchBadge.default": "پیش‌فرض",
+  "agentManager.dialog.branchBadge.remote": "راه دور",
+  "agentManager.dialog.versions": "نسخه‌ها",
+  "agentManager.dialog.versionHint": "{{count}} worktree به صورت موازی اجرا خواهند شد",
+  "agentManager.dialog.compareModels": "مقایسه مدل‌ها",
+  "agentManager.dialog.compareModels.tooltip": "اجرای عامل‌ها روی مدل‌های مختلف به صورت موازی برای مقایسه نتایج",
+  "agentManager.dialog.compareModels.searchModels": "جستجوی مدل‌ها...",
+  "agentManager.dialog.compareModels.selectModels": "انتخاب مدل‌ها...",
+  "agentManager.dialog.compareModels.effort": "میزان استدلال",
+  "agentManager.dialog.compareModels.effortDefault": "پیش‌فرض",
+  "agentManager.dialog.creating": "در حال ایجاد...",
+  "agentManager.dialog.createWorktree": "ایجاد Worktree",
+  "agentManager.dialog.removeImage": "حذف تصویر",
+  "agentManager.dialog.configureWorktree": "پیکربندی Worktree جدید...",
+
+  "agentManager.diff.toggle": "تغییر وضعیت diff",
+  "agentManager.diff.openFile": "باز کردن فایل",
+  "agentManager.diff.revertFile": "بازگردانی فایل",
+  "agentManager.diff.revertSuccess": "فایل بازگردانی شد",
+  "agentManager.diff.revertError": "بازگردانی ناموفق بود",
+  "agentManager.diff.applyBranchOnly":
+    "اعمال تغییرات روی اختلاف کامل شاخه انجام می‌شود. برای اعمال، به محدوده Branch بروید.",
+  "agentManager.open.button": "باز کردن",
+  "agentManager.open.tooltip": "باز کردن این Worktree در VS Code",
+  "agentManager.apply.globalButton": "اعمال",
+  "agentManager.apply.tooltip": "اعمال تغییرات worktree انتخاب‌شده به شاخه محلی",
+  "agentManager.apply.dialogTitle": "اعمال تغییرات به شاخه محلی",
+  "agentManager.apply.confirm": "همین الان اعمال کن",
+  "agentManager.apply.selectionSummary": "{{selected}} از {{total}} فایل انتخاب‌شده",
+  "agentManager.apply.selectAll": "انتخاب همه",
+  "agentManager.apply.selectNone": "هیچ‌کدام را انتخاب نکن",
+  "agentManager.apply.checking": "در حال بررسی...",
+  "agentManager.apply.applying": "در حال اعمال...",
+  "agentManager.apply.success": "تغییرات اعمال شد",
+  "agentManager.apply.conflict": "اعمال دارای تعارض است",
+  "agentManager.apply.conflictToast": "{{count}} تعارض در {{files}} فایل. جزئیات را در Apply بررسی کنید.",
+  "agentManager.apply.error": "اعمال ناموفق بود",
+  "agentManager.apply.conflictsTitle": "تعارض‌ها",
+  "agentManager.apply.unknownFile": "فایل نامشخص",
+  "agentManager.apply.reason.index": "فایل محلی با نسخه مورد انتظار تفاوت دارد",
+  "agentManager.apply.reason.patch": "پچ به‌درستی قابل اعمال نیست",
+  "agentManager.apply.reason.contents": "خواندن محتوای فایل محلی فعلی ممکن نیست",
+  "agentManager.apply.reason.unknown": "تعارض شناسایی شد",
+  "agentManager.shortcuts.toggleDiff": "نمایش/پنهان کردن پنل diff",
+  "agentManager.shortcuts.category.quickSwitch": "تغییر سریع",
+  "agentManager.shortcuts.jumpToItem": "پرش به مورد ۱–۹",
+  "agentManager.review.sendAllToChat": "ارسال همه به چت",
+  "agentManager.review.sendAllToChatWithCount": "ارسال همه به چت ({{count}})",
+  "agentManager.review.sendAllShortcut.mac": "⌘Enter",
+  "agentManager.review.sendAllShortcut.other": "Ctrl+Enter",
+  "agentManager.review.modalTitle": "بررسی نظر",
+  "agentManager.review.inlineCount": "نظرات بررسی ({{count}})",
+  "agentManager.review.clearAll": "پاک کردن همه",
+  "agentManager.review.commentOnLine": "نظر در خط {{line}}",
+  "agentManager.review.editCommentOnLine": "ویرایش نظر در خط {{line}}",
+  "agentManager.review.commentPlaceholder": "یک نظر بگذارید...",
+  "agentManager.review.commentAction": "نظر",
+  "agentManager.review.sendToChat": "ارسال به چت",
+  "agentManager.review.metaFile": "فایل",
+  "agentManager.review.metaLine": "خط",
+  "agentManager.review.metaComment": "نظر کاربر",
+  "agentManager.review.collapsedOnly": "{{count}} جمع‌شده",
+  "agentManager.review.collapsedWithLarge": "{{collapsed}} جمع‌شده، {{large}} بزرگ",
+  "agentManager.review.largeFileCollapsed": "فایل بزرگ (جمع‌شده)",
+  "agentManager.review.image": "تصویر",
+  "agentManager.review.imageBefore": "قبل",
+  "agentManager.review.imageAfter": "بعد",
+  "agentManager.review.imageTooLarge": "تصویر برای پیش‌نمایش خیلی بزرگ است ({{size}}).",
+  "agentManager.review.imageUnreadable": "این تصویر قابل نمایش نیست.",
+  "agentManager.review.imageUnavailable": "پیش‌نمایش تصویر برای این نمونه جلسه در دسترس نیست.",
+  "agentManager.review.endOfLongDiff": "به انتها رسیدید!",
+
+  "agentManager.import.pullRequest": "Pull Request",
+  "agentManager.import.pastePrUrl": "URL درخواست PR را وارد کنید...",
+  "agentManager.import.open": "باز کردن",
+  "agentManager.import.branches": "شاخه‌ها",
+  "agentManager.import.selectBranch": "انتخاب شاخه...",
+  "agentManager.import.loading": "در حال بارگذاری...",
+  "agentManager.import.loadingBranches": "در حال بارگذاری شاخه‌ها...",
+  "agentManager.import.noMatchingBranches": "شاخه‌ای مطابق یافت نشد",
+  "agentManager.import.noBranchesFound": "هیچ شاخه‌ای یافت نشد.",
+  "agentManager.import.noBranchesHint": "یک URL درخواست ادغام را در بالا جای‌گذاری کنید یا یک worktree جدید بسازید.",
+  "agentManager.import.failed": "وارد کردن ناموفق بود",
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
index d8579c9cfd..35fadb06db 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Afficher la barre latérale",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESSIONS",
+  "agentManager.projects": "PROJETS",
+  "agentManager.project.add": "Ajouter un projet",
+  "agentManager.project.remove": "Retirer d'Agent Manager",
+  "agentManager.project.trust": "Approuver",
+  "agentManager.project.missing": "Dépôt introuvable",
   "agentManager.notGitRepo": "Ce n'est pas un dépôt git",
   "agentManager.worktree.settings": "Paramètres du Worktree",
   "agentManager.worktree.new": "Nouveau Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Déplacer vers le haut",
   "agentManager.section.moveDown": "Déplacer vers le bas",
   "agentManager.hoverCard.branch": "BRANCHE",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessions",
   "agentManager.hoverCard.files": "Fichiers",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nouvel onglet de terminal",
   "agentManager.terminal.ended": "terminal terminé — fermez l'onglet pour ignorer",
+  "agentManager.terminal.setupFailed": "échec du script de configuration",
+  "agentManager.terminal.setupFailedCode": "échec du script de configuration avec le code de sortie",
+  "agentManager.terminal.stopSetup": "Arrêter le script de configuration",
   "agentManager.terminal.connectionError": "erreur de connexion du terminal",
-  "agentManager.terminal.kill": "Tuer le terminal",
+  "agentManager.terminal.add": "Nouveau terminal",
   "agentManager.terminal.empty": "Aucun terminal ici pour l'instant",
   "agentManager.terminal.start": "Démarrer le terminal",
   "agentManager.terminal.destination": "Choisir ce que le bouton Terminal ouvre",
@@ -138,6 +147,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Rétablir le fichier",
   "agentManager.diff.revertSuccess": "Fichier rétabli",
   "agentManager.diff.revertError": "Échec du rétablissement",
+  "agentManager.diff.applyBranchOnly":
+    "Appliquer ne fonctionne que sur le diff complet de la branche. Passez à la portée Branch pour appliquer.",
   "agentManager.open.button": "Ouvrir",
   "agentManager.open.tooltip": "Ouvrir ce worktree dans VS Code",
   "agentManager.apply.globalButton": "Appliquer",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
index 1192807424..8a1d4648e2 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Mostra barra laterale",
   "agentManager.section.worktrees": "WORKTREE",
   "agentManager.section.sessions": "SESSIONI",
+  "agentManager.projects": "PROGETTI",
+  "agentManager.project.add": "Aggiungi progetto",
+  "agentManager.project.remove": "Rimuovi da Agent Manager",
+  "agentManager.project.trust": "Fidati",
+  "agentManager.project.missing": "Repository non trovata",
   "agentManager.notGitRepo": "Non è una repository git",
 
   "agentManager.worktree.settings": "Impostazioni worktree",
@@ -32,6 +37,7 @@ export const dict = {
   "agentManager.section.moveDown": "Sposta giù",
 
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessioni",
   "agentManager.hoverCard.files": "File",
@@ -62,8 +68,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nuova scheda terminale",
   "agentManager.terminal.ended": "terminale terminato - chiudi la scheda per nasconderlo",
+  "agentManager.terminal.setupFailed": "script di configurazione non riuscito",
+  "agentManager.terminal.setupFailedCode": "script di configurazione non riuscito con codice di uscita",
+  "agentManager.terminal.stopSetup": "Interrompi lo script di configurazione",
   "agentManager.terminal.connectionError": "errore di connessione del terminale",
-  "agentManager.terminal.kill": "Termina terminale",
+  "agentManager.terminal.add": "Nuovo terminale",
   "agentManager.terminal.empty": "Qui non c'è ancora un terminale",
   "agentManager.terminal.start": "Avvia terminale",
   "agentManager.terminal.destination": "Scegli cosa apre il pulsante del terminale",
@@ -144,6 +153,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Ripristina file",
   "agentManager.diff.revertSuccess": "File ripristinato",
   "agentManager.diff.revertError": "Ripristino non riuscito",
+  "agentManager.diff.applyBranchOnly":
+    "Applica funziona solo sul diff completo del branch. Passa all'ambito Branch per applicare.",
   "agentManager.open.button": "Apri",
   "agentManager.open.tooltip": "Apri questo worktree in VS Code",
   "agentManager.apply.globalButton": "Applica",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
index d855af8e15..27df39abdc 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "サイドバーを表示",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "セッション",
+  "agentManager.projects": "プロジェクト",
+  "agentManager.project.add": "プロジェクトを追加",
+  "agentManager.project.remove": "Agent Managerから削除",
+  "agentManager.project.trust": "信頼する",
+  "agentManager.project.missing": "リポジトリが見つかりません",
   "agentManager.notGitRepo": "gitリポジトリではありません",
   "agentManager.worktree.settings": "Worktree設定",
   "agentManager.worktree.new": "新しいWorktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "上に移動",
   "agentManager.section.moveDown": "下に移動",
   "agentManager.hoverCard.branch": "ブランチ",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "ベース",
   "agentManager.hoverCard.sessions": "セッション",
   "agentManager.hoverCard.files": "ファイル",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "新しいターミナルタブ",
   "agentManager.terminal.ended": "ターミナルが終了しました — タブを閉じて破棄",
+  "agentManager.terminal.setupFailed": "セットアップスクリプトが失敗しました",
+  "agentManager.terminal.setupFailedCode": "セットアップスクリプトが終了コードで失敗しました",
+  "agentManager.terminal.stopSetup": "セットアップスクリプトを停止",
   "agentManager.terminal.connectionError": "ターミナル接続エラー",
-  "agentManager.terminal.kill": "ターミナルを終了",
+  "agentManager.terminal.add": "新しいターミナル",
   "agentManager.terminal.empty": "ここにはまだターミナルがありません",
   "agentManager.terminal.start": "ターミナルを開始",
   "agentManager.terminal.destination": "ターミナルボタンで開く場所を選択",
@@ -137,6 +146,8 @@ export const dict = {
   "agentManager.diff.revertFile": "ファイルを元に戻す",
   "agentManager.diff.revertSuccess": "ファイルを元に戻しました",
   "agentManager.diff.revertError": "元に戻せませんでした",
+  "agentManager.diff.applyBranchOnly":
+    "適用はブランチ全体の差分に対してのみ利用できます。適用するにはスコープを Branch に切り替えてください。",
   "agentManager.open.button": "開く",
   "agentManager.open.tooltip": "このWorktreeをVS Codeで開く",
   "agentManager.apply.globalButton": "適用",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
index ae87aaf993..0442087391 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "사이드바 표시",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "세션",
+  "agentManager.projects": "프로젝트",
+  "agentManager.project.add": "프로젝트 추가",
+  "agentManager.project.remove": "Agent Manager에서 제거",
+  "agentManager.project.trust": "신뢰",
+  "agentManager.project.missing": "저장소를 찾을 수 없음",
   "agentManager.notGitRepo": "git 저장소가 아닙니다",
   "agentManager.worktree.settings": "Worktree 설정",
   "agentManager.worktree.new": "새 Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "위로 이동",
   "agentManager.section.moveDown": "아래로 이동",
   "agentManager.hoverCard.branch": "브랜치",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "베이스",
   "agentManager.hoverCard.sessions": "세션",
   "agentManager.hoverCard.files": "파일",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "새 터미널 탭",
   "agentManager.terminal.ended": "터미널 종료됨 — 탭을 닫아 해제",
+  "agentManager.terminal.setupFailed": "설정 스크립트 실패",
+  "agentManager.terminal.setupFailedCode": "종료 코드로 설정 스크립트 실패",
+  "agentManager.terminal.stopSetup": "설정 스크립트 중지",
   "agentManager.terminal.connectionError": "터미널 연결 오류",
-  "agentManager.terminal.kill": "터미널 종료",
+  "agentManager.terminal.add": "새 터미널",
   "agentManager.terminal.empty": "아직 여기에 터미널이 없습니다",
   "agentManager.terminal.start": "터미널 시작",
   "agentManager.terminal.destination": "터미널 버튼으로 열 위치 선택",
@@ -136,6 +145,8 @@ export const dict = {
   "agentManager.diff.revertFile": "파일 되돌리기",
   "agentManager.diff.revertSuccess": "파일이 되돌려졌습니다",
   "agentManager.diff.revertError": "되돌리기 실패",
+  "agentManager.diff.applyBranchOnly":
+    "적용은 전체 브랜치 diff에서만 작동합니다. 적용하려면 범위를 Branch로 전환하세요.",
   "agentManager.open.button": "열기",
   "agentManager.open.tooltip": "이 Worktree를 VS Code에서 열기",
   "agentManager.apply.globalButton": "적용",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
index 1965204a47..92a5e9814f 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Zijbalk tonen",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESSIES",
+  "agentManager.projects": "PROJECTEN",
+  "agentManager.project.add": "Project toevoegen",
+  "agentManager.project.remove": "Verwijderen uit Agent Manager",
+  "agentManager.project.trust": "Vertrouwen",
+  "agentManager.project.missing": "Repository niet gevonden",
   "agentManager.notGitRepo": "Geen git repository",
 
   "agentManager.worktree.settings": "Worktree instellingen",
@@ -32,6 +37,7 @@ export const dict = {
   "agentManager.section.moveDown": "Omlaag verplaatsen",
 
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Basis",
   "agentManager.hoverCard.sessions": "Sessies",
   "agentManager.hoverCard.files": "Bestanden",
@@ -61,8 +67,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nieuw terminaltabblad",
   "agentManager.terminal.ended": "terminal beëindigd — sluit tabblad om te negeren",
+  "agentManager.terminal.setupFailed": "installatiescript mislukt",
+  "agentManager.terminal.setupFailedCode": "installatiescript mislukt met exitcode",
+  "agentManager.terminal.stopSetup": "Installatiescript stoppen",
   "agentManager.terminal.connectionError": "terminalverbindingsfout",
-  "agentManager.terminal.kill": "Terminal beëindigen",
+  "agentManager.terminal.add": "Nieuwe terminal",
   "agentManager.terminal.empty": "Hier is nog geen terminal",
   "agentManager.terminal.start": "Terminal starten",
   "agentManager.terminal.destination": "Kies wat de terminalknop opent",
@@ -143,6 +152,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Bestand terugzetten",
   "agentManager.diff.revertSuccess": "Bestand teruggezet",
   "agentManager.diff.revertError": "Terugzetten mislukt",
+  "agentManager.diff.applyBranchOnly":
+    "Toepassen werkt alleen op de volledige branch-diff. Schakel naar het bereik Branch om toe te passen.",
   "agentManager.open.button": "Openen",
   "agentManager.open.tooltip": "Open deze worktree in VS Code",
   "agentManager.apply.globalButton": "Toepassen",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
index 44efed03a5..e56d09608f 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Vis sidefelt",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "ØKTER",
+  "agentManager.projects": "PROSJEKTER",
+  "agentManager.project.add": "Legg til prosjekt",
+  "agentManager.project.remove": "Fjern fra Agent Manager",
+  "agentManager.project.trust": "Stol på",
+  "agentManager.project.missing": "Repository ikke funnet",
   "agentManager.notGitRepo": "Ikke et git-repositorium",
   "agentManager.worktree.settings": "Worktree-innstillinger",
   "agentManager.worktree.new": "Nytt Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Flytt opp",
   "agentManager.section.moveDown": "Flytt ned",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Økter",
   "agentManager.hoverCard.files": "Filer",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Ny terminalfane",
   "agentManager.terminal.ended": "terminal avsluttet — lukk fanen for å avvise",
+  "agentManager.terminal.setupFailed": "oppsettskript mislyktes",
+  "agentManager.terminal.setupFailedCode": "oppsettskript mislyktes med avslutningskode",
+  "agentManager.terminal.stopSetup": "Stopp oppsettskriptet",
   "agentManager.terminal.connectionError": "tilkoblingsfeil for terminal",
-  "agentManager.terminal.kill": "Avslutt terminal",
+  "agentManager.terminal.add": "Ny terminal",
   "agentManager.terminal.empty": "Ingen terminal her ennå",
   "agentManager.terminal.start": "Start terminal",
   "agentManager.terminal.destination": "Velg hva terminalknappen åpner",
@@ -137,6 +146,7 @@ export const dict = {
   "agentManager.diff.revertFile": "Tilbakestill fil",
   "agentManager.diff.revertSuccess": "Fil tilbakestilt",
   "agentManager.diff.revertError": "Tilbakestilling feilet",
+  "agentManager.diff.applyBranchOnly": "Bruk fungerer kun på hele Branch-diffen. Bytt til Branch-omfanget for å bruke.",
   "agentManager.open.button": "Åpne",
   "agentManager.open.tooltip": "Åpne dette Worktree-et i VS Code",
   "agentManager.apply.globalButton": "Bruk",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
index 137bf34132..1071932dae 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Pokaż pasek boczny",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "SESJE",
+  "agentManager.projects": "PROJEKTY",
+  "agentManager.project.add": "Dodaj projekt",
+  "agentManager.project.remove": "Usuń z Agent Manager",
+  "agentManager.project.trust": "Zaufaj",
+  "agentManager.project.missing": "Nie znaleziono repozytorium",
   "agentManager.notGitRepo": "Nie jest repozytorium git",
   "agentManager.worktree.settings": "Ustawienia Worktree",
   "agentManager.worktree.new": "Nowy Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Przenieś w górę",
   "agentManager.section.moveDown": "Przenieś w dół",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Baza",
   "agentManager.hoverCard.sessions": "Sesje",
   "agentManager.hoverCard.files": "Pliki",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Nowa karta terminala",
   "agentManager.terminal.ended": "terminal zakończony — zamknij kartę, aby zamknąć",
+  "agentManager.terminal.setupFailed": "skrypt konfiguracji nie powiódł się",
+  "agentManager.terminal.setupFailedCode": "skrypt konfiguracji nie powiódł się z kodem wyjścia",
+  "agentManager.terminal.stopSetup": "Zatrzymaj skrypt konfiguracji",
   "agentManager.terminal.connectionError": "błąd połączenia terminala",
-  "agentManager.terminal.kill": "Zakończ terminal",
+  "agentManager.terminal.add": "Nowy terminal",
   "agentManager.terminal.empty": "Nie ma tu jeszcze terminala",
   "agentManager.terminal.start": "Uruchom terminal",
   "agentManager.terminal.destination": "Wybierz, co otwiera przycisk terminala",
@@ -137,6 +146,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Cofnij plik",
   "agentManager.diff.revertSuccess": "Plik cofnięty",
   "agentManager.diff.revertError": "Cofanie nie powiodło się",
+  "agentManager.diff.applyBranchOnly":
+    "Funkcja Zastosuj działa tylko z pełnym diffem brancha. Przełącz się na zakres Branch, aby zastosować.",
   "agentManager.open.button": "Otwórz",
   "agentManager.open.tooltip": "Otwórz ten Worktree w VS Code",
   "agentManager.apply.globalButton": "Zastosuj",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
index c0df2ab3c9..7eb79540e7 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Показать боковую панель",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "СЕССИИ",
+  "agentManager.projects": "ПРОЕКТЫ",
+  "agentManager.project.add": "Добавить проект",
+  "agentManager.project.remove": "Удалить из Agent Manager",
+  "agentManager.project.trust": "Доверять",
+  "agentManager.project.missing": "Репозиторий не найден",
   "agentManager.notGitRepo": "Не является git-репозиторием",
   "agentManager.worktree.settings": "Настройки Worktree",
   "agentManager.worktree.new": "Новый Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "Переместить вверх",
   "agentManager.section.moveDown": "Переместить вниз",
   "agentManager.hoverCard.branch": "ВЕТКА",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Основа",
   "agentManager.hoverCard.sessions": "Сессии",
   "agentManager.hoverCard.files": "Файлы",
@@ -58,8 +64,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Новая вкладка терминала",
   "agentManager.terminal.ended": "терминал завершен — закройте вкладку, чтобы скрыть",
+  "agentManager.terminal.setupFailed": "сбой скрипта настройки",
+  "agentManager.terminal.setupFailedCode": "сбой скрипта настройки с кодом выхода",
+  "agentManager.terminal.stopSetup": "Остановить скрипт настройки",
   "agentManager.terminal.connectionError": "ошибка подключения к терминалу",
-  "agentManager.terminal.kill": "Завершить терминал",
+  "agentManager.terminal.add": "Новый терминал",
   "agentManager.terminal.empty": "Здесь пока нет терминала",
   "agentManager.terminal.start": "Запустить терминал",
   "agentManager.terminal.destination": "Выберите, где будет открываться терминал",
@@ -138,6 +147,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Откатить файл",
   "agentManager.diff.revertSuccess": "Файл откатан",
   "agentManager.diff.revertError": "Ошибка отката",
+  "agentManager.diff.applyBranchOnly":
+    "Применение работает только с полным diff ветки. Чтобы применить изменения, переключитесь на область Branch.",
   "agentManager.open.button": "Открыть",
   "agentManager.open.tooltip": "Открыть этот Worktree в VS Code",
   "agentManager.apply.globalButton": "Применить",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
index 012b3776ba..2237b04a88 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "แสดงแถบด้านข้าง",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "เซสชัน",
+  "agentManager.projects": "โปรเจกต์",
+  "agentManager.project.add": "เพิ่มโปรเจกต์",
+  "agentManager.project.remove": "ลบออกจาก Agent Manager",
+  "agentManager.project.trust": "เชื่อถือ",
+  "agentManager.project.missing": "ไม่พบ Repository",
   "agentManager.notGitRepo": "ไม่ใช่ git repository",
   "agentManager.worktree.settings": "ตั้งค่า Worktree",
   "agentManager.worktree.new": "Worktree ใหม่",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "เลื่อนขึ้น",
   "agentManager.section.moveDown": "เลื่อนลง",
   "agentManager.hoverCard.branch": "BRANCH",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "ฐาน",
   "agentManager.hoverCard.sessions": "เซสชัน",
   "agentManager.hoverCard.files": "ไฟล์",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "แท็บเทอร์มินัลใหม่",
   "agentManager.terminal.ended": "เทอร์มินัลสิ้นสุด — ปิดแท็บเพื่อยกเลิก",
+  "agentManager.terminal.setupFailed": "สคริปต์ติดตั้งล้มเหลว",
+  "agentManager.terminal.setupFailedCode": "สคริปต์ติดตั้งล้มเหลวด้วยรหัสออก",
+  "agentManager.terminal.stopSetup": "หยุดสคริปต์ติดตั้ง",
   "agentManager.terminal.connectionError": "ข้อผิดพลาดการเชื่อมต่อเทอร์มินัล",
-  "agentManager.terminal.kill": "หยุดเทอร์มินัล",
+  "agentManager.terminal.add": "เทอร์มินัลใหม่",
   "agentManager.terminal.empty": "ยังไม่มีเทอร์มินัลที่นี่",
   "agentManager.terminal.start": "เริ่มเทอร์มินัล",
   "agentManager.terminal.destination": "เลือกว่าปุ่มเทอร์มินัลจะเปิดอะไร",
@@ -133,6 +142,8 @@ export const dict = {
   "agentManager.diff.revertFile": "ย้อนกลับไฟล์",
   "agentManager.diff.revertSuccess": "ย้อนกลับไฟล์แล้ว",
   "agentManager.diff.revertError": "ย้อนกลับล้มเหลว",
+  "agentManager.diff.applyBranchOnly":
+    "นำไปใช้ได้เฉพาะกับ diff ของ Branch ทั้งหมดเท่านั้น สลับไปที่ขอบเขต Branch เพื่อใช้งาน",
   "agentManager.open.button": "เปิด",
   "agentManager.open.tooltip": "เปิด Worktree นี้ใน VS Code",
   "agentManager.apply.globalButton": "นำไปใช้",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
index e18f88694b..44d0301d69 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Kenar çubuğunu göster",
   "agentManager.section.worktrees": "WORKTREE'LER",
   "agentManager.section.sessions": "OTURUMLAR",
+  "agentManager.projects": "PROJELER",
+  "agentManager.project.add": "Proje ekle",
+  "agentManager.project.remove": "Agent Manager'dan kaldır",
+  "agentManager.project.trust": "Güven",
+  "agentManager.project.missing": "Depo bulunamadı",
   "agentManager.notGitRepo": "Bir git deposu değil",
 
   "agentManager.worktree.settings": "Worktree ayarları",
@@ -32,6 +37,7 @@ export const dict = {
   "agentManager.section.moveDown": "Aşağı Taşı",
 
   "agentManager.hoverCard.branch": "DAL",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "Temel",
   "agentManager.hoverCard.sessions": "Oturumlar",
   "agentManager.hoverCard.files": "Dosyalar",
@@ -62,8 +68,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Yeni Terminal Sekmesi",
   "agentManager.terminal.ended": "terminal sona erdi — kapatmak için sekmeyi kapatın",
+  "agentManager.terminal.setupFailed": "kurulum betiği başarısız oldu",
+  "agentManager.terminal.setupFailedCode": "kurulum betiği çıkış koduyla başarısız oldu",
+  "agentManager.terminal.stopSetup": "Kurulum betiğini durdur",
   "agentManager.terminal.connectionError": "terminal bağlantı hatası",
-  "agentManager.terminal.kill": "Terminali sonlandır",
+  "agentManager.terminal.add": "Yeni terminal",
   "agentManager.terminal.empty": "Burada henüz terminal yok",
   "agentManager.terminal.start": "Terminali başlat",
   "agentManager.terminal.destination": "Terminal düğmesinin ne açacağını seçin",
@@ -144,6 +153,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Dosyayı geri al",
   "agentManager.diff.revertSuccess": "Dosya geri alındı",
   "agentManager.diff.revertError": "Geri alma başarısız",
+  "agentManager.diff.applyBranchOnly":
+    "Uygula yalnızca tam Branch diff'inde çalışır. Uygulamak için Branch kapsamına geçin.",
   "agentManager.open.button": "Aç",
   "agentManager.open.tooltip": "Bu worktree'yi VS Code'da aç",
   "agentManager.apply.globalButton": "Uygula",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
index 1c1c1cbf22..c97792074c 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "Показати бічну панель",
   "agentManager.section.worktrees": "РОБОЧІ ДЕРЕВА",
   "agentManager.section.sessions": "СЕСІЇ",
+  "agentManager.projects": "ПРОЄКТИ",
+  "agentManager.project.add": "Додати проєкт",
+  "agentManager.project.remove": "Видалити з Agent Manager",
+  "agentManager.project.trust": "Довіряти",
+  "agentManager.project.missing": "Репозиторій не знайдено",
   "agentManager.notGitRepo": "Не є git-репозиторієм",
 
   "agentManager.worktree.settings": "Налаштування робочого дерева",
@@ -32,6 +37,7 @@ export const dict = {
   "agentManager.section.moveDown": "Перемістити вниз",
 
   "agentManager.hoverCard.branch": "ГІЛКА",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "База",
   "agentManager.hoverCard.sessions": "Сесії",
   "agentManager.hoverCard.files": "Файли",
@@ -62,8 +68,11 @@ export const dict = {
 
   "agentManager.terminal.new": "Нова вкладка термінала",
   "agentManager.terminal.ended": "термінал завершено — закрийте вкладку, щоб відхилити",
+  "agentManager.terminal.setupFailed": "помилка скрипта налаштування",
+  "agentManager.terminal.setupFailedCode": "помилка скрипта налаштування з кодом виходу",
+  "agentManager.terminal.stopSetup": "Зупинити скрипт налаштування",
   "agentManager.terminal.connectionError": "помилка з'єднання термінала",
-  "agentManager.terminal.kill": "Завершити термінал",
+  "agentManager.terminal.add": "Новий термінал",
   "agentManager.terminal.empty": "Тут ще немає термінала",
   "agentManager.terminal.start": "Запустити термінал",
   "agentManager.terminal.destination": "Виберіть, що відкриватиме кнопка термінала",
@@ -145,6 +154,8 @@ export const dict = {
   "agentManager.diff.revertFile": "Скасувати зміни файлу",
   "agentManager.diff.revertSuccess": "Файл відновлено",
   "agentManager.diff.revertError": "Не вдалося відновити",
+  "agentManager.diff.applyBranchOnly":
+    "Застосування працює лише з повним diff гілки. Щоб застосувати зміни, перемкніться на область Branch.",
   "agentManager.open.button": "Відкрити",
   "agentManager.open.tooltip": "Відкрити це робоче дерево у VS Code",
   "agentManager.apply.globalButton": "Застосувати",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
index 2e0c7f5568..6cc4159d9f 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "显示侧边栏",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "会话",
+  "agentManager.projects": "项目",
+  "agentManager.project.add": "添加项目",
+  "agentManager.project.remove": "从 Agent Manager 移除",
+  "agentManager.project.trust": "信任",
+  "agentManager.project.missing": "未找到仓库",
   "agentManager.notGitRepo": "不是 git 仓库",
   "agentManager.worktree.settings": "Worktree 设置",
   "agentManager.worktree.new": "新建 Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "上移",
   "agentManager.section.moveDown": "下移",
   "agentManager.hoverCard.branch": "分支",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "基础",
   "agentManager.hoverCard.sessions": "会话",
   "agentManager.hoverCard.files": "文件",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "新建终端标签页",
   "agentManager.terminal.ended": "终端已结束 — 关闭标签页以消除",
+  "agentManager.terminal.setupFailed": "设置脚本失败",
+  "agentManager.terminal.setupFailedCode": "设置脚本失败，退出代码为",
+  "agentManager.terminal.stopSetup": "停止设置脚本",
   "agentManager.terminal.connectionError": "终端连接错误",
-  "agentManager.terminal.kill": "终止终端",
+  "agentManager.terminal.add": "新建终端",
   "agentManager.terminal.empty": "此处尚无终端",
   "agentManager.terminal.start": "启动终端",
   "agentManager.terminal.destination": "选择终端按钮的打开目标",
@@ -132,6 +141,7 @@ export const dict = {
   "agentManager.diff.revertFile": "还原文件",
   "agentManager.diff.revertSuccess": "文件已还原",
   "agentManager.diff.revertError": "还原失败",
+  "agentManager.diff.applyBranchOnly": "应用仅适用于完整的分支差异。请切换到 Branch 范围后再应用。",
   "agentManager.open.button": "打开",
   "agentManager.open.tooltip": "在 VS Code 中打开此 Worktree",
   "agentManager.apply.globalButton": "应用",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
index e4403c5aaf..25afbc3b41 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
@@ -4,6 +4,11 @@ export const dict = {
   "agentManager.sidebar.expand": "顯示側邊欄",
   "agentManager.section.worktrees": "WORKTREES",
   "agentManager.section.sessions": "工作階段",
+  "agentManager.projects": "專案",
+  "agentManager.project.add": "新增專案",
+  "agentManager.project.remove": "從 Agent Manager 移除",
+  "agentManager.project.trust": "信任",
+  "agentManager.project.missing": "找不到儲存庫",
   "agentManager.notGitRepo": "不是 git 儲存庫",
   "agentManager.worktree.settings": "Worktree 設定",
   "agentManager.worktree.new": "新建 Worktree",
@@ -30,6 +35,7 @@ export const dict = {
   "agentManager.section.moveUp": "上移",
   "agentManager.section.moveDown": "下移",
   "agentManager.hoverCard.branch": "分支",
+  "agentManager.hoverCard.worktree": "Worktree",
   "agentManager.hoverCard.base": "基底",
   "agentManager.hoverCard.sessions": "工作階段",
   "agentManager.hoverCard.files": "檔案",
@@ -57,8 +63,11 @@ export const dict = {
 
   "agentManager.terminal.new": "新增終端分頁",
   "agentManager.terminal.ended": "終端已結束 — 關閉分頁以消除",
+  "agentManager.terminal.setupFailed": "設定腳本失敗",
+  "agentManager.terminal.setupFailedCode": "設定腳本失敗，退出代碼為",
+  "agentManager.terminal.stopSetup": "停止設定腳本",
   "agentManager.terminal.connectionError": "終端連線錯誤",
-  "agentManager.terminal.kill": "終止終端機",
+  "agentManager.terminal.add": "新增終端機",
   "agentManager.terminal.empty": "此處尚無終端機",
   "agentManager.terminal.start": "啟動終端機",
   "agentManager.terminal.destination": "選擇終端機按鈕的開啟目標",
@@ -132,6 +141,7 @@ export const dict = {
   "agentManager.diff.revertFile": "還原檔案",
   "agentManager.diff.revertSuccess": "檔案已還原",
   "agentManager.diff.revertError": "還原失敗",
+  "agentManager.diff.applyBranchOnly": "套用僅適用於完整的分支差異。請切換至 Branch 範圍後再套用。",
   "agentManager.open.button": "開啟",
   "agentManager.open.tooltip": "在 VS Code 中開啟此 Worktree",
   "agentManager.apply.globalButton": "套用",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts b/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts
index a7373d9696..6fad2144f4 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts
@@ -132,3 +132,96 @@ export function focusChatSearch(reset: { history(v: boolean): void; review(v: bo
   reset.terminal()
   window.dispatchEvent(new CustomEvent("focusTranscriptSearch"))
 }
+
+/**
+ * Multi-project navigation.
+ *
+ * In multi-project mode the sidebar shows an accordion of projects; each
+ * expanded project renders its own Local item, worktrees (sections first,
+ * then ungrouped), and an unassigned-sessions list. Keyboard previous/next
+ * and numeric shortcuts must traverse every expanded project in visual
+ * order, not just the active one.
+ *
+ * Targets are project-qualified so a raw worktree/session ID never identifies
+ * an item on its own — the composite id carries the owning project.
+ */
+
+export type NavTarget =
+  | { projectId: string; kind: "local" }
+  | { projectId: string; kind: "worktree"; worktreeId: string }
+  | { projectId: string; kind: "session"; sessionId: string }
+
+export interface NavEntry {
+  /** Stable project-qualified composite id. */
+  id: string
+  target: NavTarget
+}
+
+export interface ProjectNavInput {
+  id: string
+  expanded: boolean
+  worktrees: { id: string; sectionId?: string }[]
+  sections: { id: string; collapsed: boolean }[]
+  sessionsCollapsed: boolean
+  /** Visible unassigned (root, no worktree) sessions in render order. */
+  unassigned: { id: string }[]
+}
+
+export const localNavId = (projectId: string) => `${projectId}:local`
+export const worktreeNavId = (projectId: string, worktreeId: string) => `${projectId}:wt:${worktreeId}`
+export const sessionNavId = (projectId: string, sessionId: string) => `${projectId}:sess:${sessionId}`
+
+/**
+ * Build one global visual order across expanded projects.
+ *
+ * For each expanded project (in input order): Local, then worktrees in the
+ * order the multi-project body renders them (each non-collapsed section's
+ * members, then ungrouped), then visible unassigned sessions (when the
+ * sessions section is not collapsed). Collapsed projects contribute nothing.
+ */
+export function buildProjectNavOrder(projects: ProjectNavInput[]): NavEntry[] {
+  const order: NavEntry[] = []
+  for (const p of projects) {
+    if (!p.expanded) continue
+    const pid = p.id
+    order.push({ id: localNavId(pid), target: { projectId: pid, kind: "local" } })
+    for (const sec of p.sections) {
+      if (sec.collapsed) continue
+      for (const w of p.worktrees) {
+        if (w.sectionId === sec.id) {
+          order.push({ id: worktreeNavId(pid, w.id), target: { projectId: pid, kind: "worktree", worktreeId: w.id } })
+        }
+      }
+    }
+    for (const w of p.worktrees) {
+      if (!w.sectionId) {
+        order.push({ id: worktreeNavId(pid, w.id), target: { projectId: pid, kind: "worktree", worktreeId: w.id } })
+      }
+    }
+    if (!p.sessionsCollapsed) {
+      for (const s of p.unassigned) {
+        order.push({ id: sessionNavId(pid, s.id), target: { projectId: pid, kind: "session", sessionId: s.id } })
+      }
+    }
+  }
+  return order
+}
+
+/**
+ * Resolve a previous/next step within a global nav order.
+ *
+ * `currentId` is the composite id of the active item, or undefined when
+ * nothing in the order is active. Returns the entry to activate, or
+ * undefined at the boundaries (no wrapping, matching single-project behavior).
+ */
+export function resolveProjectNav(
+  direction: "up" | "down",
+  currentId: string | undefined,
+  order: NavEntry[],
+): NavEntry | undefined {
+  if (order.length === 0) return undefined
+  const idx = currentId ? order.findIndex((e) => e.id === currentId) : -1
+  const next = direction === "up" ? idx - 1 : idx + 1
+  if (next < 0 || next >= order.length) return undefined
+  return order[next]
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project-nav.ts b/packages/kilo-vscode/webview-ui/agent-manager/project-nav.ts
new file mode 100644
index 0000000000..beae37660c
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project-nav.ts
@@ -0,0 +1,146 @@
+/** @jsxImportSource solid-js */
+
+import { createMemo, type Accessor } from "solid-js"
+import {
+  buildProjectNavOrder,
+  resolveProjectNav,
+  localNavId,
+  worktreeNavId,
+  sessionNavId,
+  type NavEntry,
+  type NavTarget,
+  LOCAL,
+} from "./navigate"
+import type { SidebarItem } from "./section-helpers"
+import type { AgentManagerStateMessage, AgentProjectSnapshot, ProjectSessionInfo } from "../src/types/messages"
+
+/**
+ * Sidebar keyboard-nav controller for the Agent Manager.
+ *
+ * Handles previous/next (⌘⌥↑/↓) and numeric-shortcut (⌘1-9) navigation across
+ * the sidebar. In multi-project mode it builds one global visual order across
+ * every expanded project — Local, worktrees (sections first, then ungrouped),
+ * and visible unassigned sessions — using stable project-qualified composite
+ * ids, and activates each target with a single atomic
+ * `agentManager.activateSelection` dispatch. In single-project mode it keeps
+ * the legacy in-process traversal over the active project's flat sidebar order.
+ *
+ * The pure order/resolution logic lives in {@link navigate.ts} so it stays
+ * solid/DOM-free and unit-testable; this module owns the reactive wiring and
+ * the activation side effects.
+ */
+export interface ProjectNavDeps {
+  multiProject: Accessor<boolean>
+  /** Legacy flat sidebar order for single-project mode (LOCAL, worktrees, sessions). */
+  sidebarOrder: Accessor<SidebarItem[]>
+  /** Legacy in-process activator for single-project mode. */
+  focus: (item: SidebarItem) => void
+  projects: Accessor<AgentProjectSnapshot[]>
+  states: Accessor<Record<string, AgentManagerStateMessage>>
+  sessions: Accessor<Record<string, ProjectSessionInfo[]>>
+  activeProjectId: Accessor<string | undefined>
+  selection: Accessor<typeof LOCAL | string | null>
+  currentSessionID: Accessor<string | undefined>
+}
+
+export interface ProjectNav {
+  step: (direction: "up" | "down") => void
+  jump: (index: number) => void
+}
+
+/** DOM selector for the sidebar element backing a nav target. */
+export const navSelector = (target: NavTarget): string => {
+  if (target.kind === "local") return `[data-sidebar-id="${target.projectId}:local"]`
+  if (target.kind === "worktree") return `[data-sidebar-id="${target.projectId}:${target.worktreeId}"]`
+  return `[data-sidebar-id="${sessionNavId(target.projectId, target.sessionId)}"]`
+}
+
+/**
+ * Create the sidebar nav controller.
+ *
+ * @param deps    Reactive inputs (signals/accessors) describing multi-project
+ *                catalog/state, the legacy single-project order/focus, and the
+ *                current selection.
+ * @param post    Sends the atomic `agentManager.activateSelection` message for
+ *                a resolved multi-project target.
+ * @param scroll  Scrolls the activated sidebar element into view.
+ */
+export function createProjectNav(
+  deps: ProjectNavDeps,
+  post: (target: NavTarget) => void,
+  scroll: (el: HTMLElement) => void,
+): ProjectNav {
+  const projectOrder = createMemo((): NavEntry[] => {
+    if (!deps.multiProject()) return []
+    const states = deps.states()
+    const live = deps.sessions()
+    return buildProjectNavOrder(
+      deps.projects().map((p) => {
+        const st = states[p.id]
+        // Until a project's state payload arrives its body shows a spinner
+        // (no Local/worktrees/sessions) — exclude it from the nav order.
+        if (!st) {
+          return { id: p.id, expanded: false, worktrees: [], sections: [], sessionsCollapsed: false, unassigned: [] }
+        }
+        return {
+          id: p.id,
+          expanded: p.expanded,
+          worktrees: (st.worktrees ?? []).map((w) => ({ id: w.id, sectionId: w.sectionId })),
+          sections: (st.sections ?? []).map((s) => ({ id: s.id, collapsed: s.collapsed })),
+          sessionsCollapsed: st.sessionsCollapsed === true,
+          unassigned: (live[p.id] ?? []).filter((s) => s.worktreeId === null).map((s) => ({ id: s.id })),
+        }
+      }),
+    )
+  })
+
+  const currentId = createMemo((): string | undefined => {
+    if (!deps.multiProject()) return undefined
+    const pid = deps.activeProjectId()
+    if (!pid) return undefined
+    const sel = deps.selection()
+    if (sel === LOCAL) return localNavId(pid)
+    if (typeof sel === "string") return worktreeNavId(pid, sel)
+    if (sel === null) {
+      const sid = deps.currentSessionID()
+      if (sid) return sessionNavId(pid, sid)
+    }
+    return undefined
+  })
+
+  const activate = (entry: NavEntry) => {
+    post(entry.target)
+    const sel = navSelector(entry.target)
+    requestAnimationFrame(() => {
+      const el = document.querySelector(sel)
+      if (el instanceof HTMLElement) scroll(el)
+    })
+  }
+
+  const step = (direction: "up" | "down") => {
+    if (deps.multiProject()) {
+      const target = resolveProjectNav(direction, currentId(), projectOrder())
+      if (target) activate(target)
+      return
+    }
+    const flat = deps.sidebarOrder()
+    if (flat.length === 0) return
+    const current = deps.selection() ?? deps.currentSessionID()
+    const idx = current ? flat.findIndex((f) => f.id === current) : -1
+    const next = direction === "up" ? idx - 1 : idx + 1
+    if (next < 0 || next >= flat.length) return
+    deps.focus(flat[next]!)
+  }
+
+  const jump = (index: number) => {
+    if (deps.multiProject()) {
+      const entry = projectOrder()[index]
+      if (entry) activate(entry)
+      return
+    }
+    const item = deps.sidebarOrder()[index]
+    if (item) deps.focus(item)
+  }
+
+  return { step, jump }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/live.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/live.ts
new file mode 100644
index 0000000000..aa582552d5
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/live.ts
@@ -0,0 +1,82 @@
+/**
+ * Per-project live stats store for the multi-project accordion.
+ *
+ * Each expanded project's own pollers push worktree/local/PR stats tagged with
+ * their projectId. This store keeps those payloads per project so every
+ * expanded accordion summary renders live data; payloads for the active
+ * project additionally flow into the shared signals the interactive body reads.
+ */
+
+import { createSignal } from "solid-js"
+import type {
+  AgentManagerLocalStatsMessage,
+  AgentManagerPRStatusMessage,
+  AgentManagerWorktreeStatsMessage,
+  ExtensionMessage,
+  LocalGitStats,
+  PRStatus,
+  ProjectSessionInfo,
+  WorktreeGitStats,
+} from "../../src/types/messages"
+
+export interface ProjectLiveDeps {
+  /** Store of the message's owning project (active store when undefined). */
+  ensure: (pid: string | undefined) => {
+    setWorktreeStats: (map: Record<string, WorktreeGitStats>) => void
+    setLocalStats: (stats: LocalGitStats) => void
+    setPrStatuses: (update: (prev: Record<string, PRStatus | null>) => Record<string, PRStatus | null>) => void
+  }
+  /** Whether the tagged project currently drives the interactive body. */
+  active: (pid: string | undefined) => boolean
+  /** Branch label side-effect for the active project's local stats. */
+  branch: (branch: string | undefined) => void
+}
+
+export function createProjectLive(deps: ProjectLiveDeps) {
+  const [stats, setStats] = createSignal<Record<string, Record<string, WorktreeGitStats>>>({})
+  const [local, setLocal] = createSignal<Record<string, LocalGitStats>>({})
+  const [prs, setPrs] = createSignal<Record<string, Record<string, PRStatus | null>>>({})
+  const [sessions, setSessions] = createSignal<Record<string, ProjectSessionInfo[]>>({})
+
+  /** Route one stats/PR message; returns true when the message was consumed. */
+  const apply = (msg: ExtensionMessage): boolean => {
+    if (msg.type === "agentManager.worktreeStats") {
+      const ev = msg as AgentManagerWorktreeStatsMessage
+      const map: Record<string, WorktreeGitStats> = {}
+      for (const s of ev.stats) map[s.worktreeId] = s
+      deps.ensure(ev.projectId).setWorktreeStats(map)
+      if (ev.projectId) setStats((prev) => ({ ...prev, [ev.projectId!]: map }))
+      return true
+    }
+    if (msg.type === "agentManager.localStats") {
+      const ev = msg as AgentManagerLocalStatsMessage
+      deps.ensure(ev.projectId).setLocalStats(ev.stats)
+      if (ev.projectId) setLocal((prev) => ({ ...prev, [ev.projectId!]: ev.stats }))
+      if (deps.active(ev.projectId)) deps.branch(ev.stats.branch)
+      return true
+    }
+    if (msg.type === "agentManager.prStatus") {
+      const ev = msg as AgentManagerPRStatusMessage
+      deps.ensure(ev.projectId).setPrStatuses((prev) => ({ ...prev, [ev.worktreeId]: ev.pr }))
+      if (ev.projectId)
+        setPrs((prev) => ({ ...prev, [ev.projectId!]: { ...prev[ev.projectId!], [ev.worktreeId]: ev.pr } }))
+      return true
+    }
+    if (msg.type === "agentManager.projectSessions") {
+      setSessions((prev) => ({ ...prev, [msg.projectId]: msg.sessions }))
+      return true
+    }
+    return false
+  }
+
+  /** Drop stores of projects that left the catalog. */
+  const prune = (ids: Set<string>) => {
+    const keep = <T>(prev: Record<string, T>) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id)))
+    setStats((prev) => keep(prev))
+    setLocal((prev) => keep(prev))
+    setPrs((prev) => keep(prev))
+    setSessions((prev) => keep(prev))
+  }
+
+  return { stats, local, prs, sessions, apply, prune }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/local-tabs.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/local-tabs.ts
new file mode 100644
index 0000000000..ea57612e34
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/local-tabs.ts
@@ -0,0 +1,51 @@
+import { createEffect, createMemo, onCleanup } from "solid-js"
+import type { SessionInfo } from "../../src/types/messages/sessions"
+
+/**
+ * Persist open tabs and the sidebar width to webview state for recovery.
+ * Debounced so a resize drag does not serialize state on every pixel.
+ */
+export function persistLocalTabs(opts: {
+  tabs: () => Record<string, string[]>
+  key: () => string
+  width: () => number
+  get: () => Record<string, unknown> | undefined
+  set: (value: Record<string, unknown>) => void
+}): void {
+  let timer: ReturnType<typeof setTimeout> | undefined
+  createEffect(() => {
+    // Read every signal eagerly so Solid tracks them as dependencies.
+    const tabs = opts.tabs()
+    const key = opts.key()
+    const width = opts.width()
+    clearTimeout(timer)
+    timer = setTimeout(() => {
+      opts.set({ ...(opts.get() ?? {}), localTabs: tabs, localSessionIDs: tabs[key] ?? [], sidebarWidth: width })
+    }, 300)
+  })
+  onCleanup(() => clearTimeout(timer))
+}
+
+/** Local sessions resolved from the session store plus pending tabs, in insertion order. */
+export function createLocalSessions(opts: {
+  ids: () => string[]
+  sessions: () => SessionInfo[]
+  pending: (id: string) => boolean
+  root: (s: SessionInfo) => boolean
+  title: () => string
+}) {
+  return createMemo((): SessionInfo[] => {
+    const lookup = new Map(opts.sessions().map((s) => [s.id, s]))
+    const result: SessionInfo[] = []
+    const now = new Date().toISOString()
+    for (const id of opts.ids()) {
+      const real = lookup.get(id)
+      if (real && opts.root(real)) {
+        result.push(real)
+        continue
+      }
+      if (opts.pending(id)) result.push({ id, title: opts.title(), createdAt: now, updatedAt: now })
+    }
+    return result
+  })
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/registry.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/registry.ts
new file mode 100644
index 0000000000..2eff7dd6c1
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/registry.ts
@@ -0,0 +1,68 @@
+import { createSignal } from "solid-js"
+import { createProjectStore, type ProjectStore } from "./store"
+
+export interface PersistedProjectTabs {
+  /** Buckets keyed by project id, as persisted by persistLocalTabs. */
+  localTabs?: Record<string, string[]>
+  /** Legacy single-project list from before per-project buckets existed. */
+  localSessionIDs?: string[]
+}
+
+/**
+ * Registry of per-project stores. Exactly one store is "active" at a time —
+ * the project whose state is currently applied — and every per-project
+ * accessor in the app goes through it, replacing the memKey/tabKey keying
+ * that mixed catalog-active and applied-project identities.
+ */
+export function createProjectRegistry(opts: { persisted: PersistedProjectTabs; activeId: () => string }) {
+  const stores = new Map<string, ProjectStore>()
+  // Bumped whenever a store is created so effects depending on the registry
+  // contents re-run (the Map itself is not reactive).
+  const [version, bump] = createSignal(0)
+
+  const migrate = (id: string): void => {
+    if (id === "single") return
+    const legacy = stores.get("single")
+    if (!legacy) return
+    if (legacy.tabs.ids().length === 0) {
+      stores.delete("single")
+      return
+    }
+    // Only consume the legacy bucket when its tabs actually moved; a project
+    // that already has its own tabs must not swallow them silently.
+    const store = stores.get(id)
+    if (!store || store.tabs.ids().length > 0) return
+    store.tabs.set(legacy.tabs.ids())
+    stores.delete("single")
+  }
+
+  const ensure = (id: string): ProjectStore => {
+    let store = stores.get(id)
+    if (!store) {
+      const persisted = opts.persisted.localTabs?.[id] ?? (id === "single" ? opts.persisted.localSessionIDs : undefined)
+      store = createProjectStore(id, { tabs: persisted })
+      stores.set(id, store)
+      bump((n) => n + 1)
+    }
+    migrate(id)
+    return store
+  }
+
+  /** The store of the project whose state is currently applied. */
+  const active = (): ProjectStore => ensure(opts.activeId())
+  const all = (): ProjectStore[] => [...stores.values()]
+
+  /** Drop stores for projects that left the catalog (keeps "single" for legacy). */
+  const prune = (ids: Set<string>): void => {
+    for (const id of [...stores.keys()]) {
+      if (id === "single") continue
+      if (!ids.has(id)) stores.delete(id)
+    }
+  }
+
+  // Materialize the legacy bucket eagerly so migration works regardless of
+  // which project is ensured first.
+  if (opts.persisted.localSessionIDs?.length) ensure("single")
+
+  return { ensure, active, all, prune, version }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/restore.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/restore.ts
new file mode 100644
index 0000000000..cf551bea4d
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/restore.ts
@@ -0,0 +1,64 @@
+/**
+ * Seamless project-switch restore for the multi-project Agent Manager.
+ *
+ * The extension persists the last selected sidebar target per project
+ * (`agentManager.state.activeTarget`). When a state payload arrives for a
+ * project the webview was not showing (project switch or initial open), this
+ * module puts the user back exactly where they left off instead of resetting
+ * to Local with a fresh "New Session" draft.
+ */
+
+import type {
+  AgentManagerStateMessage,
+  AgentManagerSidebarTarget,
+  RememberTargetMessage,
+} from "../../src/types/messages"
+import { LOCAL } from "../navigate"
+
+export interface RestoreDeps {
+  selectLocal: () => void
+  selectWorktree: (id: string) => void
+  selectSession: (id: string) => void
+  focusManaged: (worktreeId: string, sessionId: string) => void
+  setSelection: (id: string | null) => void
+  setActivePendingId: (id: string | undefined) => void
+}
+
+/** Restore `state.activeTarget` for the incoming project's state payload. */
+export function restoreProjectTarget(state: AgentManagerStateMessage, deps: RestoreDeps): void {
+  const target = state.activeTarget
+  if (!target || target.projectId !== state.projectId) return deps.selectLocal()
+  if (target.kind === "worktree" && state.worktrees.some((wt) => wt.id === target.worktreeId)) {
+    deps.setActivePendingId(undefined)
+    deps.selectWorktree(target.worktreeId)
+    return
+  }
+  if (target.kind === "session") {
+    const managed = state.sessions.find((s) => s.id === target.sessionId)
+    deps.setActivePendingId(undefined)
+    if (managed?.worktreeId && state.worktrees.some((wt) => wt.id === managed.worktreeId)) {
+      deps.focusManaged(managed.worktreeId, managed.id)
+      return
+    }
+    // Local or unmanaged live session: go to Local and select it directly.
+    deps.setSelection(LOCAL)
+    deps.selectSession(target.sessionId)
+    return
+  }
+  deps.selectLocal()
+}
+
+/** Post the current selection to the extension for per-project persistence. */
+export function rememberTarget(
+  post: (msg: RememberTargetMessage) => void,
+  projectId: string,
+  selection: string | null,
+  sessionId: string | undefined,
+): void {
+  const target: AgentManagerSidebarTarget = sessionId
+    ? { projectId, kind: "session", sessionId }
+    : selection && selection !== LOCAL
+      ? { projectId, kind: "worktree", worktreeId: selection }
+      : { projectId, kind: "local" }
+  post({ type: "agentManager.rememberTarget", projectId, target })
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/run-status.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/run-status.ts
new file mode 100644
index 0000000000..7565e952f9
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/run-status.ts
@@ -0,0 +1,18 @@
+import type { RunStatus } from "../../src/types/messages/agent-manager"
+import type { ProjectStore } from "./store"
+
+/**
+ * Route a run status emission to the store of its owning project. The
+ * extension stamps projectId on every emission in multi-project mode; without
+ * a stamp the status belongs to the active project (legacy behavior).
+ */
+export function applyRunStatus(
+  msg: { type: string },
+  deps: { ensure: (projectId: string) => ProjectStore; active: () => ProjectStore },
+): boolean {
+  if (msg.type !== "agentManager.runStatus") return false
+  const ev = msg as unknown as RunStatus & { projectId?: string }
+  const store = ev.projectId ? deps.ensure(ev.projectId) : deps.active()
+  store.setRunStatuses((prev) => ({ ...prev, [ev.worktreeId]: ev }))
+  return true
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/selection.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/selection.ts
new file mode 100644
index 0000000000..e2b9ef94b1
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/selection.ts
@@ -0,0 +1,66 @@
+import { createEffect } from "solid-js"
+import type { ExtensionMessage, ManagedSessionState } from "../../src/types/messages"
+import { LOCAL } from "../navigate"
+import { rememberTarget } from "./restore"
+
+export function applyProjectSelection(
+  msg: ExtensionMessage,
+  deps: {
+    active: (projectId: string) => boolean
+    managed: (projectId: string) => ManagedSessionState[]
+    local: (projectId: string) => void
+    worktree: (projectId: string, worktreeId: string) => void
+    session: (sessionId: string) => void
+    openTab: (sessionId: string) => void
+    managedSession: (worktreeId: string, sessionId: string) => void
+  },
+): boolean {
+  if (msg.type !== "agentManager.selectionActivated") return false
+  const target = msg.target
+  // A selection acknowledgement can arrive after the user switched again.
+  // Ignore it unless this project's catalog entry and state are both active.
+  if (!deps.active(target.projectId)) return true
+  // Scope by project like the session branch: a selection ack must never act on
+  // another project's data if it lands before that project's state push.
+  if (target.kind === "local") deps.local(target.projectId)
+  if (target.kind === "worktree") deps.worktree(target.projectId, target.worktreeId)
+  if (target.kind === "session") {
+    const session = deps.managed(target.projectId).find((item) => item.id === target.sessionId)
+    if (session?.worktreeId) deps.managedSession(session.worktreeId, target.sessionId)
+    else {
+      // An unassigned session joins the project's local tabs, mirroring what
+      // selecting it from the legacy sidebar does, before it becomes current.
+      deps.openTab(target.sessionId)
+      deps.local(target.projectId)
+      deps.session(target.sessionId)
+    }
+  }
+  return true
+}
+
+/**
+ * Persist the current selection for the applied project so switching back
+ * restores it. Skips while the catalog and applied project disagree (the
+ * switch window), and never persists a selection the project does not own.
+ */
+export function createTargetRememberer(opts: {
+  pid: () => string | undefined
+  enabled: () => boolean
+  applied: () => string | undefined
+  selection: () => string | null
+  owns: (sel: string) => boolean
+  sessionId: () => string | undefined
+  post: Parameters<typeof rememberTarget>[0]
+}): void {
+  createEffect(() => {
+    const pid = opts.pid()
+    if (!pid || !opts.enabled()) return
+    // pid flips with the catalog push, before the new project's state is
+    // applied. In that window selection() still belongs to the previous
+    // project, so persisting it would poison this project's target.
+    if (opts.applied() !== pid) return
+    const sel = opts.selection()
+    if (sel && sel !== LOCAL && !opts.owns(sel)) return
+    rememberTarget(opts.post, pid, sel, opts.sessionId())
+  })
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/sessions-live.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/sessions-live.ts
new file mode 100644
index 0000000000..4882fc8dcf
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/sessions-live.ts
@@ -0,0 +1,43 @@
+import { createMemo } from "solid-js"
+import type { ManagedSessionState } from "../../src/types/messages/agent-manager"
+import type { ProjectSessionInfo, SessionInfo } from "../../src/types/messages/sessions"
+import { isKnownRootSession } from "../navigate"
+
+/**
+ * Sidebar session lists per project. Background projects use the pushed
+ * snapshot; the active project is overlaid with the live session store so a
+ * freshly created session shows up without waiting for a backend re-list.
+ * Extras are restricted to sessions the project itself tracks (managed or
+ * open in its local tabs) so stale entries from another project's store
+ * can never bleed in after a switch.
+ */
+export function createProjectSessionsLive(opts: {
+  base: () => Record<string, ProjectSessionInfo[]>
+  pid: () => string | undefined
+  enabled: () => boolean
+  store: () => SessionInfo[]
+  managed: () => ManagedSessionState[]
+  locals: () => Set<string>
+}) {
+  return createMemo(() => {
+    const base = opts.base()
+    const pid = opts.pid()
+    if (!pid || !opts.enabled()) return base
+    const pushed = base[pid] ?? []
+    const store = opts.store()
+    if (store.length === 0) return base
+    const managed = new Map(opts.managed().map((ms) => [ms.id, ms.worktreeId]))
+    const live = new Map(store.filter(isKnownRootSession).map((item) => [item.id, item]))
+    const merged = pushed.map((item) => {
+      const fresh = live.get(item.id)
+      return fresh ? { ...fresh, worktreeId: item.worktreeId } : item
+    })
+    const known = new Set(pushed.map((item) => item.id))
+    const owned = (id: string) => managed.has(id) || opts.locals().has(id)
+    const extra = store
+      .filter((item) => isKnownRootSession(item) && !known.has(item.id) && owned(item.id))
+      .map((item) => ({ ...item, worktreeId: managed.get(item.id) ?? null }))
+    if (extra.length === 0 && merged.every((item, index) => item === pushed[index])) return base
+    return { ...base, [pid]: [...merged, ...extra] }
+  })
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/state.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/state.ts
new file mode 100644
index 0000000000..36a0b3f6df
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/state.ts
@@ -0,0 +1,56 @@
+import type { AgentManagerStateMessage, AgentProjectSnapshot } from "../../src/types/messages"
+
+/**
+ * Route project state payloads to the shared signals.
+ *
+ * On project activation the extension pushes the new project's state before
+ * the catalog marks it active, so a naive "is this the active project" gate
+ * would drop the payload entirely. The router defers such payloads and flushes
+ * them when the catalog confirms the activation, making the webview robust to
+ * either ordering (state-before-catalog or catalog-before-state).
+ */
+export function createProjectStateRouter(deps: {
+  /** Catalog entries as last pushed by the extension (empty before the first push). */
+  catalog: () => readonly AgentProjectSnapshot[]
+  /** Apply a state payload to the shared signals of the active project. */
+  apply: (state: AgentManagerStateMessage) => void
+  /** Prune live session caches for projects that left the catalog. */
+  pruneLive: (ids: Set<string>) => void
+}) {
+  /** States waiting for their project to become catalog-active before applying. */
+  const pending = new Map<string, AgentManagerStateMessage>()
+
+  /** Whether a payload for the project would apply to the shared signals right now. */
+  const isActive = (pid: string | undefined): boolean => {
+    const catalog = deps.catalog()
+    if (catalog.length === 0) return true
+    return pid !== undefined && catalog.some((p) => p.active && p.id === pid)
+  }
+
+  /** Route a state payload: apply immediately, or defer for the next catalog push. */
+  const routeState = (state: AgentManagerStateMessage): "applied" | "deferred" => {
+    if (isActive(state.projectId)) {
+      deps.apply(state)
+      return "applied"
+    }
+    if (state.projectId) pending.set(state.projectId, state)
+    return "deferred"
+  }
+
+  /**
+   * Route a catalog push. Prunes caches for removed projects, then flushes a
+   * deferred state for the newly active project, if one is waiting.
+   */
+  const routeCatalog = (projects: readonly AgentProjectSnapshot[]): void => {
+    const ids = new Set(projects.map((p) => p.id))
+    deps.pruneLive(ids)
+    for (const id of [...pending.keys()]) if (!ids.has(id)) pending.delete(id)
+    const active = projects.find((p) => p.active)?.id
+    const state = active ? pending.get(active) : undefined
+    if (!state) return
+    pending.delete(active!)
+    deps.apply(state)
+  }
+
+  return { isActive, routeState, routeCatalog }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/store.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/store.ts
new file mode 100644
index 0000000000..1cc1ca3e80
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/store.ts
@@ -0,0 +1,128 @@
+import { createSignal, type Accessor, type Setter } from "solid-js"
+import type {
+  AgentManagerStateMessage,
+  LocalGitStats,
+  ManagedSessionState,
+  PRStatus,
+  RunStatus,
+  SectionState,
+  WorktreeGitStats,
+  WorktreeState,
+} from "../../src/types/messages"
+
+export interface WorktreeBusyState {
+  reason: "setting-up" | "deleting"
+  message?: string
+  branch?: string
+}
+
+/** Local session tab ids owned by one project. */
+export function createStoreTabs(initial: string[] = []) {
+  const [ids, setIds] = createSignal<string[]>(initial)
+  const set = (next: string[] | ((prev: string[]) => string[])) => {
+    const cur = ids()
+    const value = typeof next === "function" ? next(cur) : next
+    if (value !== cur) setIds(value)
+  }
+  /** Ids safe to persist (ephemeral pending drafts removed). */
+  const durable = (pending: (id: string) => boolean) => ids().filter((id) => !pending(id))
+  return { ids, set, durable }
+}
+
+function field<T>(initial: T): [Accessor<T>, Setter<T>] {
+  const [get, set] = createSignal<T>(initial)
+  return [get, set]
+}
+
+/**
+ * Per-project state that must never be shared with other projects: sidebar
+ * inventory (worktrees, sessions, sections, orders), live data (stats, PR and
+ * run statuses, apply/busy state), local session tabs, and per-context tab
+ * memory. Worktree ids and the "local" context collide across projects, so
+ * every keyed collection here is safe only because each project owns one.
+ */
+export function createProjectStore(id: string, opts: { tabs?: string[] } = {}) {
+  const tabs = createStoreTabs(opts.tabs)
+
+  /** Last visible tab per sidebar context ("local" or a worktree id). */
+  const [memory, setMemory] = createSignal<Record<string, string>>({})
+  const tabMemory = {
+    all: memory,
+    get: (sel: string) => memory()[sel],
+    set: (sel: string, tab: string) => setMemory((prev) => (prev[sel] === tab ? prev : { ...prev, [sel]: tab })),
+  }
+
+  const [worktrees, setWorktrees] = field<WorktreeState[]>([])
+  const [managedSessions, setManagedSessions] = field<ManagedSessionState[]>([])
+  const [sections, setSections] = field<SectionState[]>([])
+  const [staleWorktreeIds, setStaleWorktreeIds] = field<Set<string>>(new Set())
+  const [tabOrder, setTabOrder] = field<Record<string, string[]>>({})
+  const [worktreeOrder, setWorktreeOrder] = field<string[]>([])
+  const [sessionsCollapsed, setSessionsCollapsed] = field<boolean | undefined>(undefined)
+  const [defaultBaseBranch, setDefaultBaseBranch] = field<string | undefined>(undefined)
+  const [runScriptConfigured, setRunScriptConfigured] = field(false)
+  const [prStatuses, setPrStatuses] = field<Record<string, PRStatus | null>>({})
+  const [runStatuses, setRunStatuses] = field<Record<string, RunStatus>>({})
+  const [worktreeStats, setWorktreeStats] = field<Record<string, WorktreeGitStats>>({})
+  const [localStats, setLocalStats] = field<LocalGitStats | undefined>(undefined)
+  const [busy, setBusy] = field<Map<string, WorktreeBusyState>>(new Map())
+
+  /** Write a project state payload into this store (data fields only). */
+  const applyState = (state: AgentManagerStateMessage): void => {
+    setWorktrees(state.worktrees)
+    setManagedSessions(state.sessions)
+    setStaleWorktreeIds(new Set(state.staleWorktreeIds ?? []))
+    setSections(state.sections ?? [])
+    if (state.tabOrder) setTabOrder(state.tabOrder)
+    if (state.worktreeOrder) setWorktreeOrder(state.worktreeOrder)
+    if ("defaultBaseBranch" in state) setDefaultBaseBranch(state.defaultBaseBranch || undefined)
+    setRunScriptConfigured(state.runScriptConfigured === true)
+    if (state.sessionsCollapsed !== undefined) setSessionsCollapsed(state.sessionsCollapsed)
+    const runs: Record<string, RunStatus> = {}
+    for (const item of state.runStatuses ?? []) runs[item.worktreeId] = item
+    setRunStatuses(runs)
+    // Reconcile busy flags with the worktree list (deleted worktrees drop out).
+    const ids = new Set(state.worktrees.map((wt) => wt.id))
+    setBusy((prev) => {
+      const next = new Map([...prev].filter(([key]) => ids.has(key)))
+      return next.size === prev.size ? prev : next
+    })
+  }
+
+  return {
+    id,
+    tabs,
+    applyState,
+    tabMemory,
+    worktrees,
+    setWorktrees,
+    managedSessions,
+    setManagedSessions,
+    sections,
+    setSections,
+    staleWorktreeIds,
+    setStaleWorktreeIds,
+    tabOrder,
+    setTabOrder,
+    worktreeOrder,
+    setWorktreeOrder,
+    sessionsCollapsed,
+    setSessionsCollapsed,
+    defaultBaseBranch,
+    setDefaultBaseBranch,
+    runScriptConfigured,
+    setRunScriptConfigured,
+    prStatuses,
+    setPrStatuses,
+    runStatuses,
+    setRunStatuses,
+    worktreeStats,
+    setWorktreeStats,
+    localStats,
+    setLocalStats,
+    busy,
+    setBusy,
+  }
+}
+
+export type ProjectStore = ReturnType<typeof createProjectStore>
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts b/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts
index 199a9b96f2..b6a237937e 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts
@@ -12,7 +12,9 @@ interface Toast {
 }
 
 export function createRevertFile(
-  currentDiffSessionId: Accessor<string | undefined>,
+  diffScopeId: Accessor<string | undefined>,
+  ctx: Accessor<string | undefined>,
+  scope: Accessor<string>,
   vscode: VsCode,
   showToast: (t: Toast) => void,
   t: (key: string) => string,
@@ -20,20 +22,21 @@ export function createRevertFile(
   const [files, setFiles] = createSignal<Record<string, Set<string>>>({})
 
   const reverting = createMemo(() => {
-    const sessionId = currentDiffSessionId()
-    if (!sessionId) return new Set<string>()
-    return files()[sessionId] ?? new Set<string>()
+    const id = diffScopeId()
+    if (!id) return new Set<string>()
+    return files()[id] ?? new Set<string>()
   })
 
   function revert(file: string) {
-    const sessionId = currentDiffSessionId()
-    if (!sessionId) return
+    const id = diffScopeId()
+    const context = ctx()
+    if (!id || !context) return
     setFiles((prev) => {
-      const set = new Set(prev[sessionId] ?? [])
+      const set = new Set(prev[id] ?? [])
       set.add(file)
-      return { ...prev, [sessionId]: set }
+      return { ...prev, [id]: set }
     })
-    vscode.postMessage({ type: "agentManager.revertWorktreeFile", sessionId, file })
+    vscode.postMessage({ type: "agentManager.revertWorktreeFile", sessionId: context, file, scope: scope() })
   }
 
   function onResult(ev: AgentManagerRevertWorktreeFileResultMessage) {
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/selection-actions.ts b/packages/kilo-vscode/webview-ui/agent-manager/selection-actions.ts
new file mode 100644
index 0000000000..0de67640ca
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/selection-actions.ts
@@ -0,0 +1,74 @@
+/**
+ * Sidebar selection actions with per-project tab memory.
+ *
+ * Extracted from AgentManagerApp (file-size cap): selecting Local or a
+ * worktree restores the last active tab of that context (session, pending
+ * draft, terminal, or review) and falls back to the first available session.
+ */
+
+import { LOCAL } from "./navigate"
+
+interface TermState {
+  hasRemembered: (sel: string, remembered: string | undefined) => boolean
+  setActiveId: (id: string | undefined) => void
+}
+
+interface SessionLike {
+  id: string
+}
+
+export interface SelectionActionDeps<T extends SessionLike> {
+  saveTabMemory: () => void
+  setReviewActive: (open: boolean) => void
+  setSelection: (id: string) => void
+  post: (msg: unknown) => void
+  tabMemory: () => Record<string, string>
+  terms: TermState
+  activateTerminal: (id: string) => void
+  setActivePendingId: (id: string | undefined) => void
+  selectSession: (id: string) => void
+  clearSession: () => void
+  resetSession: () => void
+  isPending: (id: string) => boolean
+  isReviewTab: (remembered: string | undefined, sel: string) => boolean
+}
+
+/** Select the Local context: restore its remembered tab or fall back to the first session/draft. */
+export function selectLocalAction<T extends SessionLike>(deps: SelectionActionDeps<T>, locals: T[]): void {
+  deps.saveTabMemory()
+  deps.setReviewActive(false)
+  deps.setSelection(LOCAL)
+  deps.post({ type: "agentManager.requestRepoInfo" })
+  const remembered = deps.tabMemory()[LOCAL]
+  if (deps.terms.hasRemembered(LOCAL, remembered)) return deps.activateTerminal(remembered!)
+  deps.terms.setActiveId(undefined)
+  const target = remembered ? locals.find((s) => s.id === remembered) : undefined
+  const fallback = target ?? locals[0]
+  if (fallback && !deps.isPending(fallback.id)) {
+    deps.setActivePendingId(undefined)
+    deps.selectSession(fallback.id)
+  } else {
+    deps.setActivePendingId(fallback && deps.isPending(fallback.id) ? fallback.id : undefined)
+    deps.clearSession()
+    deps.post({ type: "agentManager.showExistingLocalTerminal" })
+  }
+  deps.setReviewActive(deps.isReviewTab(remembered, LOCAL))
+}
+
+/** Select a worktree: restore its remembered tab or fall back to its first session. */
+export function selectWorktreeAction<T extends SessionLike>(
+  deps: SelectionActionDeps<T>,
+  worktreeId: string,
+  sessions: T[],
+): void {
+  deps.saveTabMemory()
+  deps.setSelection(worktreeId)
+  const remembered = deps.tabMemory()[worktreeId]
+  if (deps.terms.hasRemembered(worktreeId, remembered)) return deps.activateTerminal(remembered!)
+  deps.terms.setActiveId(undefined)
+  const target = remembered ? sessions.find((s) => s.id === remembered) : undefined
+  const fallback = target ?? sessions[0]
+  if (fallback) deps.selectSession(fallback.id)
+  else deps.resetSession()
+  deps.setReviewActive(deps.isReviewTab(remembered, worktreeId))
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/sidebar-search.ts b/packages/kilo-vscode/webview-ui/agent-manager/sidebar-search.ts
index 7be92e0b37..ddfaa13a54 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/sidebar-search.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/sidebar-search.ts
@@ -14,6 +14,7 @@ export type SidebarSearchState = "idle" | "busy" | "retry" | "waiting"
 
 type SearchItem = {
   key: string
+  projectId?: string
   title: string
   meta: string[]
   search: string
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx
index bf42185b83..772cf76e20 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx
@@ -3,44 +3,126 @@
  *
  * Lives inside the shared `.am-diff-panel-wrapper` host next to the diff
  * and PR panels, so all three inspector modes share one resize handle
- * and one width. The header intentionally reuses the `.am-diff-header`
- * structure and metrics so switching modes does not shift the chrome.
+ * and one width.
+ *
+ * A context can own several side terminals. The header is a tab strip
+ * that reuses the top tab bar's whole chrome: `SortableTerminalTab`
+ * (icon, title, X close, right-click Close / Close Others), the same
+ * `@thisbeyond/solid-dnd` reorder stack, the same overflow scrolling
+ * with edge fades, the same width freeze while tabs close, and the same
+ * arrow-key tab navigation, so a terminal behaves identically in
+ * either surface. Reorder state lives in the terminal state, so it is
+ * preserved across sidebar context switches for the webview's lifetime.
+ *
+ * The `+` action sits directly after the last tab (outside the
+ * scrolling region, like the tab bar's `am-tab-add-wrap`), so it never
+ * scrolls away and never drifts to the far edge of a wide panel. The
+ * strip stays visible even when empty so `+` is always reachable.
  *
  * Visibility is opacity-based, never unmount: the xterm render loop
  * dies when its subtree leaves the paint tree (see `render.tsx`).
  */
 
-import type { Accessor, Component } from "solid-js"
-import { Show, createEffect } from "solid-js"
-import { Icon } from "@kilocode/kilo-ui/icon"
+import type { Accessor, Component, JSX } from "solid-js"
+import { For, Show, createEffect, createSignal } from "solid-js"
+import { DragDropProvider, DragDropSensors, DragOverlay, SortableProvider, closestCenter } from "@thisbeyond/solid-dnd"
+import type { DragEvent } from "@thisbeyond/solid-dnd"
 import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Button } from "@kilocode/kilo-ui/button"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { useLanguage } from "../../src/context/language"
+import { ConstrainDragYAxis } from "../../src/components/chat/TabDnd"
+import { useTabScroll } from "../../src/utils/tab-scroll"
+import { setTabWidths } from "../../src/utils/tab-widths"
+import { createTabFocus } from "../../src/utils/tab-navigation"
 import { renderSideTerminalLayer } from "./render"
+import { SortableTerminalTab } from "./SortableTerminalTab"
 import type { TerminalStateControls } from "./state"
 
+/** Only this strip's tabs freeze; the top tab bar keeps its own widths. */
+const TABLIST = ".am-side-terminal-tablist"
+
 interface Props {
   state: TerminalStateControls
   /** Context the panel currently shows (`state.sideKey`). */
   contextKey: Accessor<string>
   /** True while the inspector is in terminal mode. */
   visible: Accessor<boolean>
-  /** Kill the terminal (or cancel its create) and hide. */
-  onClose: () => void
-  /** Empty-state action: create a side terminal for this context. */
+  /** Make a terminal the visible one in the strip. */
+  onSelect: (terminalId: string) => void
+  /** Kill one terminal. */
+  onClose: (terminalId: string) => void
+  /** Kill every terminal of this context except the given one. */
+  onCloseOthers: (terminalId: string) => void
+  /** Create a new side terminal for this context. */
   onStart: () => void
+  /** Deliberately stop a running script terminal. */
+  onStop: (terminalId: string) => void
 }
 
 export const SideTerminalPanel: Component<Props> = (props) => {
   const { t } = useLanguage()
   let panel!: HTMLElement
+  let strip!: HTMLDivElement
   createEffect(() => {
     panel.inert = !props.visible()
   })
-  const side = () => props.state.side()
-  const pending = () => props.state.pendingSide(props.contextKey()) !== undefined
+  const [dragging, setDragging] = createSignal<{ id: string; width: number } | undefined>()
+  const sides = () => props.state.sidesForContext(props.contextKey())
+  const ids = () => sides().map((term) => term.id)
+  const active = () => props.state.sideActiveFor(props.contextKey())
+  const pending = () => props.state.pendingSide(props.contextKey())
+  const scroll = useTabScroll(ids, active)
+  // Scoped to `strip` so arrow keys and focus restore never jump to a
+  // tab in the top bar, which uses the same role="tab" markup.
+  const focus = createTabFocus({ ids, select: props.onSelect, root: () => strip })
+  // Only freeze while the pointer is over the strip: the widths must
+  // survive until the pointer leaves, so the remaining X buttons stay
+  // put across repeated closes. Releasing on the next frame would undo
+  // the freeze before it is ever painted (rAF runs before paint).
+  // "Close others" needs none of this: its context menu is portaled, so
+  // the pointer is off the strip, and the survivor spans the strip anyway.
+  const freeze = () => {
+    if (strip.closest(".am-side-terminal-tabs")?.matches(":hover")) setTabWidths(true, document, TABLIST)
+  }
+  const release = () => setTabWidths(false, document, TABLIST)
+  const close = (id: string) => {
+    freeze()
+    props.onClose(id)
+    // Restore focus inside the strip only while it still owns a tab.
+    // Falling through to `focusPrompt` would pull focus into the chat
+    // composer while the panel is still open on its empty state.
+    if (ids().length > 0) focus.restore()
+  }
+  // Adding a tab shrinks every tab's equal share, so any freeze left
+  // over from a close in the same hover has to go first. `+` lives
+  // inside the strip, so no pointerleave happens between the two
+  // clicks and the surviving tabs would keep their wider pixel widths.
+  const start = () => {
+    release()
+    props.onStart()
+  }
+  const onDragStart = (event: DragEvent) => {
+    const id = event.draggable?.id
+    if (typeof id !== "string") return
+    // Pin the overlay to the tab's width: the overlay container uses
+    // min-width, so a long OSC title would otherwise overflow it and
+    // shift the visual center off the cursor (the "drag offset" bug).
+    const width = event.draggable?.layout.width ?? event.draggable?.node.getBoundingClientRect().width
+    setTabWidths(true, document, TABLIST)
+    setDragging({ id, width })
+  }
+  const onDragEnd = () => {
+    setDragging(undefined)
+    release()
+  }
+  const onDragOver = (event: DragEvent) => {
+    const from = event.draggable?.id
+    const to = event.droppable?.id
+    if (typeof from !== "string" || typeof to !== "string") return
+    props.state.reorderSideDrag(props.contextKey(), from, to)
+  }
   return (
     <section
       ref={panel}
@@ -48,31 +130,110 @@ export const SideTerminalPanel: Component<Props> = (props) => {
       aria-label={t("agentManager.tab.terminal")}
       aria-hidden={!props.visible()}
     >
-      <div class="am-diff-header">
-        <div class="am-diff-header-main">
-          <Icon name="console" size="small" />
-          <span class="am-diff-header-title">{side()?.title ?? t("agentManager.tab.terminal")}</span>
-        </div>
-        <div class="am-diff-header-actions">
-          <Tooltip value={t("agentManager.terminal.kill")} placement="bottom">
+      <div
+        class="am-side-terminal-tabs"
+        onPointerLeave={() => {
+          if (!dragging()) release()
+        }}
+      >
+        <DragDropProvider
+          onDragStart={onDragStart}
+          onDragEnd={onDragEnd}
+          onDragOver={onDragOver}
+          collisionDetector={closestCenter}
+        >
+          <DragDropSensors />
+          <ConstrainDragYAxis />
+          {/* Overflow chrome copied from the top tab bar: the list is the
+              only scrolling element, wrapped by a fade host, so the "+"
+              action stays pinned next to the last tab. */}
+          <div class="am-tab-scroll-area">
+            <div class={`am-tab-fade am-tab-fade-left ${scroll.showLeft() ? "am-tab-fade-visible" : ""}`} />
+            <div class="am-tab-list-wrap">
+              {/* role="tablist" only when tabs exist: axe
+                  aria-required-children rejects an empty tablist. */}
+              <div
+                class="am-side-terminal-tablist"
+                ref={(el) => {
+                  strip = el
+                  scroll.setRef(el)
+                }}
+                role={sides().length > 0 ? "tablist" : undefined}
+                aria-label={sides().length > 0 ? t("agentManager.tab.terminal") : undefined}
+                style={{ "--tab-count": `${sides().length}` } as JSX.CSSProperties}
+              >
+                <SortableProvider ids={ids()}>
+                  <For each={sides()}>
+                    {(term) => (
+                      <SortableTerminalTab
+                        id={term.id}
+                        label={props.state.title(term.id) ?? term.title}
+                        tooltip={props.state.title(term.id) ?? term.title}
+                        status={props.state.scriptStatus(term.id)}
+                        active={active() === term.id}
+                        role="tab"
+                        selected={active() === term.id}
+                        tabIndex={active() === term.id ? 0 : -1}
+                        onKeyDown={(event) => focus.key(term.id, event)}
+                        onSelect={() => props.onSelect(term.id)}
+                        onMiddleClick={(e: MouseEvent) => {
+                          if (e.button !== 1) return
+                          e.preventDefault()
+                          e.stopPropagation()
+                          close(term.id)
+                        }}
+                        onClose={(e: MouseEvent) => {
+                          e.stopPropagation()
+                          close(term.id)
+                        }}
+                        onCloseOthers={() => props.onCloseOthers(term.id)}
+                        onStop={(e: MouseEvent) => {
+                          e.stopPropagation()
+                          props.onStop(term.id)
+                        }}
+                      />
+                    )}
+                  </For>
+                </SortableProvider>
+              </div>
+            </div>
+            <div class={`am-tab-fade am-tab-fade-right ${scroll.showRight() ? "am-tab-fade-visible" : ""}`} />
+          </div>
+          {/* Cursor-following clone of the dragged tab (same pattern as
+              the top tab bar). The overlay is what makes the in-list
+              original use solid-dnd's slot-compensated transform, so the
+              dragged tab tracks the cursor without a jump/offset. The
+              original stays dimmed in its slot via .am-tab-dragging. */}
+          <DragOverlay>
+            <Show when={dragging()}>
+              {(tab) => (
+                <div class="am-tab am-tab-overlay" style={{ width: `${tab().width}px` }}>
+                  <span class="am-tab-label">{props.state.title(tab().id) ?? t("agentManager.tab.terminal")}</span>
+                </div>
+              )}
+            </Show>
+          </DragOverlay>
+        </DragDropProvider>
+        <div class="am-side-terminal-add">
+          <Tooltip value={t("agentManager.terminal.add")} placement="bottom">
             <IconButton
-              icon="trash"
+              icon="plus"
               size="small"
               variant="ghost"
-              aria-label={t("agentManager.terminal.kill")}
-              onClick={props.onClose}
+              aria-label={t("agentManager.terminal.add")}
+              onClick={start}
             />
           </Tooltip>
         </div>
       </div>
       {renderSideTerminalLayer({ state: props.state, contextKey: props.contextKey, visible: props.visible })}
-      <Show when={props.visible() && pending() && !side()}>
+      <Show when={props.visible() && sides().length === 0 && pending()}>
         <div class="am-side-terminal-state" role="status">
           <Spinner />
           <span>{t("common.loading")}</span>
         </div>
       </Show>
-      <Show when={props.visible() && !pending() && !side()}>
+      <Show when={props.visible() && sides().length === 0 && !pending()}>
         <div class="am-side-terminal-state">
           <span class="am-side-terminal-empty">{t("agentManager.terminal.empty")}</span>
           <Button variant="primary" size="small" onClick={props.onStart}>
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/SortableTerminalTab.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/SortableTerminalTab.tsx
index 9211b7850a..03d6fdaec8 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/SortableTerminalTab.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/SortableTerminalTab.tsx
@@ -1,24 +1,129 @@
 /**
- * Draggable tab chrome for an xterm terminal tab.
+ * Tab chrome for xterm terminals.
  *
- * Shares the same hover/tooltip/close/right-click mechanism as the
- * session and review tab variants so users get consistent navigation
- * hints and context actions regardless of tab kind.
+ * `TerminalTabChrome` is the shared visual tab: console icon, title,
+ * tooltip/keybinding hints, and the X close button — the same
+ * `am-tab*` structure the session tabs use. `SortableTerminalTab`
+ * wraps it with drag-and-drop and a right-click context menu; both the
+ * top tab bar and the side terminal panel render that wrapper, so a
+ * terminal tab behaves identically in either surface.
  */
 
 import { Component, Show, type JSX } from "solid-js"
 import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Icon } from "@kilocode/kilo-ui/icon"
+import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
 import { ContextMenu } from "@kilocode/kilo-ui/context-menu"
 import { useLanguage } from "../../src/context/language"
 import { SortableTabContainer } from "../../src/components/chat/TabDnd"
 import { parseBindingTokens } from "../keybind-tokens"
+import { terminalChrome, terminalClosable, terminalStoppable } from "./chrome"
+import type { ScriptTerminalStatus } from "./state"
+
+export const TerminalTabChrome: Component<{
+  label: string
+  tooltip: string
+  status?: ScriptTerminalStatus
+  keybind?: string
+  closeKeybind?: string
+  active: boolean
+  role?: "tab"
+  selected?: boolean
+  tabIndex?: number
+  onKeyDown?: JSX.EventHandlerUnion<HTMLDivElement, KeyboardEvent>
+  onSelect: () => void
+  onMiddleClick?: (e: MouseEvent) => void
+  onClose: (e: MouseEvent) => void
+  onStop?: (e: MouseEvent) => void
+}> = (props) => {
+  const { t } = useLanguage()
+  const chrome = () => terminalChrome(props.tooltip, props.status)
+  const icon = () => {
+    const kind = chrome().icon
+    if (kind === "success") return "check-small"
+    if (kind === "failure") return "warning"
+    return "console"
+  }
+  return (
+    <div class={`am-tab am-tab-terminal ${props.active ? "am-tab-active" : ""}`}>
+      <div
+        class="am-tab-target"
+        role={props.role}
+        aria-selected={props.selected}
+        aria-label={chrome().tooltip}
+        tabIndex={props.tabIndex}
+        onClick={props.onSelect}
+        onMouseDown={props.onMiddleClick}
+        onKeyDown={props.onKeyDown}
+      >
+        <TooltipKeybind
+          title={chrome().tooltip}
+          keybind={props.keybind ?? ""}
+          placement="bottom"
+          gutter={8}
+          class="am-tab-tooltip"
+          openDelay={0}
+        >
+          <span class="am-tab-title">
+            <span class="am-tab-icon" data-run-status={chrome().icon}>
+              <Show when={chrome().icon === "spinner"} fallback={<Icon name={icon()} size="small" />}>
+                <Spinner class="am-terminal-tab-spinner" />
+              </Show>
+            </span>
+            <span class="am-tab-label">{props.label}</span>
+          </span>
+        </TooltipKeybind>
+      </div>
+      <Show when={terminalStoppable(props.status) && props.onStop}>
+        <TooltipKeybind
+          title={t("agentManager.terminal.stopSetup")}
+          keybind=""
+          placement="top"
+          gutter={8}
+          class="am-tab-close-wrap"
+          openDelay={0}
+        >
+          <IconButton
+            icon="stop"
+            size="small"
+            variant="ghost"
+            aria-label={t("agentManager.terminal.stopSetup")}
+            tabIndex={props.active ? 0 : -1}
+            class="am-tab-close"
+            onClick={props.onStop}
+          />
+        </TooltipKeybind>
+      </Show>
+      <Show when={terminalClosable(props.status)}>
+        <TooltipKeybind
+          title={t("agentManager.tab.close")}
+          keybind={props.closeKeybind ?? ""}
+          placement="top"
+          gutter={8}
+          class="am-tab-close-wrap"
+          openDelay={0}
+        >
+          <IconButton
+            icon="close-small"
+            size="small"
+            variant="ghost"
+            aria-label={t("agentManager.tab.closeTab")}
+            tabIndex={props.active ? 0 : -1}
+            class="am-tab-close"
+            onClick={props.onClose}
+          />
+        </TooltipKeybind>
+      </Show>
+    </div>
+  )
+}
 
 export const SortableTerminalTab: Component<{
   id: string
   label: string
   tooltip: string
+  status?: ScriptTerminalStatus
   keybind?: string
   closeKeybind?: string
   active: boolean
@@ -30,57 +135,29 @@ export const SortableTerminalTab: Component<{
   onMiddleClick: (e: MouseEvent) => void
   onClose: (e: MouseEvent) => void
   onCloseOthers: () => void
+  onStop?: (e: MouseEvent) => void
 }> = (props) => {
   const { t } = useLanguage()
   return (
     <SortableTabContainer id={props.id}>
       <ContextMenu>
         <ContextMenu.Trigger as="div" style={{ display: "contents" }}>
-          <div class={`am-tab am-tab-terminal ${props.active ? "am-tab-active" : ""}`}>
-            <div
-              class="am-tab-target"
-              role={props.role}
-              aria-selected={props.selected}
-              tabIndex={props.tabIndex}
-              onClick={props.onSelect}
-              onMouseDown={props.onMiddleClick}
-              onKeyDown={props.onKeyDown}
-            >
-              <TooltipKeybind
-                title={props.tooltip}
-                keybind={props.keybind ?? ""}
-                placement="bottom"
-                gutter={8}
-                class="am-tab-tooltip"
-                openDelay={0}
-              >
-                <span class="am-tab-title">
-                  <span class="am-tab-icon">
-                    <Icon name="console" size="small" />
-                  </span>
-                  <span class="am-tab-label">{props.label}</span>
-                </span>
-              </TooltipKeybind>
-            </div>
-            <TooltipKeybind
-              title={t("agentManager.tab.close")}
-              keybind={props.closeKeybind ?? ""}
-              placement="top"
-              gutter={8}
-              class="am-tab-close-wrap"
-              openDelay={0}
-            >
-              <IconButton
-                icon="close-small"
-                size="small"
-                variant="ghost"
-                aria-label={t("agentManager.tab.closeTab")}
-                tabIndex={props.active ? 0 : -1}
-                class="am-tab-close"
-                onClick={props.onClose}
-              />
-            </TooltipKeybind>
-          </div>
+          <TerminalTabChrome
+            label={props.label}
+            tooltip={props.tooltip}
+            status={props.status}
+            keybind={props.keybind}
+            closeKeybind={props.closeKeybind}
+            active={props.active}
+            role={props.role}
+            selected={props.selected}
+            tabIndex={props.tabIndex}
+            onKeyDown={props.onKeyDown}
+            onSelect={props.onSelect}
+            onMiddleClick={props.onMiddleClick}
+            onClose={props.onClose}
+            onStop={props.onStop}
+          />
         </ContextMenu.Trigger>
         <ContextMenu.Portal>
           <ContextMenu.Content class="am-ctx-menu">
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
index 792d238586..8f82b4f383 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
@@ -20,7 +20,7 @@ import "@xterm/xterm/css/xterm.css"
 import { useVSCode } from "../../src/context/vscode"
 import { useLanguage } from "../../src/context/language"
 import { formatReviewCommentsMarkdown } from "../../src/utils/review-comment-markdown"
-import type { TerminalFont } from "./state"
+import type { ScriptTerminalStatus, TerminalFont } from "./state"
 
 interface Props {
   terminalId: string
@@ -46,6 +46,14 @@ interface Props {
    *  layer tracks this as `focusedId` so `Cmd+W` can target the
    *  terminal that actually has the cursor. */
   onFocusChange?: (focused: boolean) => void
+  /** Reports OSC window-title escape codes (`ESC ] 0/1/2 ; title BEL`)
+   *  sent by the shell or running programs — fish sets it to the active
+   *  command, oh-my-zsh to user@host:cwd, vim to the file name. The
+   *  state layer mirrors it into the tab label. */
+  onTitleChange?: (title: string) => void
+  /** Provider-owned script status (Run/Setup), used to annotate the
+   *  output when a script ends in failure. */
+  status?: () => ScriptTerminalStatus | undefined
 }
 
 /** How long the ResizeObserver waits after the last size change before
@@ -207,13 +215,42 @@ export const TerminalTab: Component<Props> = (props) => {
     host.addEventListener("focusin", onFocusIn)
     host.addEventListener("focusout", onFocusOut)
 
+    // OSC 0/1/2 window-title sequences → tab label. xterm parses and
+    // strips these itself, so this only fires for real title codes.
+    const disposeTitle = term.onTitleChange((title) => props.onTitleChange?.(title))
+
     const ws = new WebSocket(props.wsUrl)
     ws.binaryType = "arraybuffer"
     let closed = false
+    let streamed = false
+    // The failure line must not depend on event ordering: the stream can
+    // close before the exited snapshot lands (fast failures), or stay open
+    // when a background child outlives the script. Write it exactly once,
+    // from whichever signal arrives first.
+    let failureWritten = false
+    const noteFailure = () => {
+      if (failureWritten || (!streamed && !closed)) return
+      const status = props.status?.()
+      if (status?.kind !== "setup") return
+      if (status.state === "failed") {
+        failureWritten = true
+        term.writeln(`\r\n\x1b[31m[${t("agentManager.terminal.setupFailed")}]\x1b[0m`)
+        return
+      }
+      if (status.state === "exited" && status.exitCode !== 0) {
+        failureWritten = true
+        term.writeln(`\r\n\x1b[31m[${t("agentManager.terminal.setupFailedCode")} ${status.exitCode ?? "?"}]\x1b[0m`)
+      }
+    }
+    createEffect(() => {
+      props.status?.()
+      noteFailure()
+    })
     const disposeData = term.onData((data) => {
       if (ws.readyState === WebSocket.OPEN) ws.send(data)
     })
     ws.onmessage = (event) => {
+      streamed = true
       // Text frames carry PTY output; binary frames starting with 0x00
       // are control metadata (cursor position). See pty/index.ts:46.
       if (typeof event.data === "string") {
@@ -233,6 +270,7 @@ export const TerminalTab: Component<Props> = (props) => {
     ws.onclose = () => {
       if (closed) return
       closed = true
+      noteFailure()
       term.writeln(`\r\n\x1b[90m[${t("agentManager.terminal.ended")}]\x1b[0m`)
     }
 
@@ -394,6 +432,7 @@ export const TerminalTab: Component<Props> = (props) => {
       clearTimeout(resizeTimer)
       ro.disconnect()
       disposeData.dispose()
+      disposeTitle.dispose()
       try {
         ws.close()
       } catch (err) {
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/ambient.ts b/packages/kilo-vscode/webview-ui/agent-manager/terminal/ambient.ts
new file mode 100644
index 0000000000..bf0cedbdb4
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/ambient.ts
@@ -0,0 +1,82 @@
+/**
+ * Ambient setup reveal for the side terminal panel.
+ *
+ * A worktree setup script runs automatically during provisioning, so the
+ * side panel opens itself to show live progress. On a clean exit the
+ * panel hides again and restores the previous layout; failures stay
+ * visible. Any user engagement with the panel (explicit open/close,
+ * adding or closing a terminal) cancels the pending auto-hide, so user
+ * content is never pulled away. The exited Setup tab itself stays in
+ * terminal state and can be reopened anytime.
+ */
+
+import { createEffect, createSignal, type Accessor } from "solid-js"
+import type { ScriptTerminalStatus, TerminalStateControls } from "./state"
+import type { TerminalTabStateWithContext } from "./state"
+
+interface AmbientSetupDeps {
+  terms: TerminalStateControls
+  selection: Accessor<string | null>
+  sidePanel: Accessor<string | null>
+  setSidePanel(panel: null): void
+}
+
+export type AmbientDecision = "wait" | "hide" | "keep"
+
+/** Selected contexts own the detail stack; history/unassigned are exclusive. */
+export function showTerminalStack(history: boolean, selection: string | null): boolean {
+  return !history && selection !== null
+}
+
+/** Setup output owns progress/error presentation when its terminal exists. */
+export function hasSetupTerminal(selection: string | null, terminals: TerminalTabStateWithContext[]): boolean {
+  return selection !== null && terminals.some((term) => term.contextKey === selection && term.kind === "setup")
+}
+
+/**
+ * What happens to an ambiently revealed panel when the setup status
+ * changes: still running means wait, failure or a context switch means
+ * keep the panel as it is, a clean exit restores the previous layout.
+ */
+export function ambientDecision(
+  status: ScriptTerminalStatus | undefined,
+  selection: string | null,
+  contextKey: string,
+): AmbientDecision {
+  if (!status || status.state === "running" || status.state === "stopping") return "wait"
+  if (status.state !== "exited" || status.exitCode !== 0) return "keep"
+  // The user moved on to another context; the panel shows other content.
+  if (selection !== contextKey) return "keep"
+  return "hide"
+}
+
+export function createAmbientSetup(deps: AmbientSetupDeps) {
+  const [pending, setPending] = createSignal<{ contextKey: string; terminalId: string } | undefined>()
+
+  createEffect(() => {
+    const ambient = pending()
+    if (!ambient) return
+    // The terminal was removed (e.g. deliberately stopped); nothing to hide.
+    if (!deps.terms.sides().some((term) => term.id === ambient.terminalId)) {
+      setPending(undefined)
+      return
+    }
+    const decision = ambientDecision(deps.terms.scriptStatus(ambient.terminalId), deps.selection(), ambient.contextKey)
+    if (decision === "wait") return
+    setPending(undefined)
+    if (decision === "hide") deps.setSidePanel(null)
+  })
+
+  return {
+    /** Called when a running setup terminal hydrates: reveal is ambient only if the panel was closed. */
+    reveal(contextKey: string, terminalId: string): void {
+      if (deps.sidePanel() === null) setPending({ contextKey, terminalId })
+    },
+    /** User engagement with the panel cancels the pending auto-hide. */
+    cancel(): void {
+      setPending(undefined)
+    },
+    /** Test hook: the pending ambient reveal, if any. */
+    pending,
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/chrome.ts b/packages/kilo-vscode/webview-ui/agent-manager/terminal/chrome.ts
new file mode 100644
index 0000000000..0f8ced649b
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/chrome.ts
@@ -0,0 +1,42 @@
+import type { ScriptTerminalStatus } from "./state"
+
+export type TerminalChromeIcon = "console" | "spinner" | "success" | "failure"
+
+export interface TerminalChrome {
+  icon: TerminalChromeIcon
+  tooltip: string
+}
+
+/** Keep Run status in the existing tab chrome rather than adding another layout. */
+export function terminalChrome(title: string, status: ScriptTerminalStatus | undefined): TerminalChrome {
+  if (!status) return { icon: "console", tooltip: title }
+  if (status.state === "running") return { icon: "spinner", tooltip: `${title} (Running)` }
+  if (status.state === "stopping") return { icon: "spinner", tooltip: `${title} (Stopping)` }
+  if (status.state === "exited" && status.exitCode === 0)
+    return { icon: "success", tooltip: `${title} (Exited, code 0)` }
+  if (status.state === "exited")
+    return { icon: "failure", tooltip: `${title} (Exited, code ${status.exitCode ?? "unknown"})` }
+  return {
+    icon: "failure",
+    tooltip: `${title} (Failed${status.exitCode === undefined ? "" : `, code ${status.exitCode}`})`,
+  }
+}
+
+/**
+ * A running Setup script must finish (or time out) on its own: closing its
+ * tab would silently kill worktree provisioning. Run tabs stay closable
+ * because close means stop there.
+ */
+export function terminalClosable(status: ScriptTerminalStatus | undefined): boolean {
+  if (status?.kind !== "setup") return true
+  return status.state !== "running" && status.state !== "stopping"
+}
+
+/**
+ * A running Setup script can always be stopped deliberately: the stop
+ * action kills the process tree and worktree creation continues without
+ * it, which is the escape hatch for scripts that run too long.
+ */
+export function terminalStoppable(status: ScriptTerminalStatus | undefined): boolean {
+  return status?.kind === "setup" && status.state === "running"
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/index.ts b/packages/kilo-vscode/webview-ui/agent-manager/terminal/index.ts
index 6bac7cab9b..3cc82946a4 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/index.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/index.ts
@@ -23,6 +23,7 @@ export type { TerminalTabState, TerminalStateControls, TerminalHandlerDeps } fro
 export { renderTerminalTab, renderTerminalLayer, renderSideTerminalLayer } from "./render"
 export { SideTerminalPanel } from "./SideTerminalPanel"
 export { TerminalDestinationButton } from "./TerminalDestinationButton"
-export { createSideTerminal } from "./side"
+export { createSideTerminal, readSavedDestination, resolveRunScriptRequest, resolveVscodeTerminalRequest } from "./side"
 export { TerminalTab } from "./TerminalTab"
 export { SortableTerminalTab } from "./SortableTerminalTab"
+export { createAmbientSetup, hasSetupTerminal, showTerminalStack } from "./ambient"
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/render.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/render.tsx
index df304f5962..80b12d23a9 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/render.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/render.tsx
@@ -41,11 +41,14 @@ export function renderTerminalTab(deps: TerminalTabRenderDeps): JSX.Element {
   const term = deps.terms.lookup().get(deps.id)
   if (!term) return null
   const isActive = () => deps.terms.activeId() === deps.id
+  // Label and tooltip read through `terms.title` so OSC title changes
+  // (shell/program escape codes) rename the tab live.
   return (
     <SortableTerminalTab
       id={deps.id}
-      label={term.title}
-      tooltip={term.title}
+      label={deps.terms.title(deps.id) ?? term.title}
+      tooltip={deps.terms.title(deps.id) ?? term.title}
+      status={deps.terms.scriptStatus(deps.id)}
       keybind={isActive() ? "" : deps.keybind()}
       closeKeybind={deps.closeKeybind()}
       active={isActive()}
@@ -109,6 +112,7 @@ export function renderTerminalLayer(props: { state: TerminalStateControls }): JS
                   focusSerial={focusSerial(props.state, term.id)}
                   font={term.font}
                   onFocusChange={(focused) => props.state.setFocusedId(focused ? term.id : undefined)}
+                  onTitleChange={(title) => props.state.setTitle(term.id, title)}
                 />
               </div>
             )
@@ -126,7 +130,8 @@ export function renderTerminalLayer(props: { state: TerminalStateControls }): JS
  * terminal stays mounted, visibility is toggled via `opacity` /
  * `pointer-events` / `inert` only. The layer is scoped to
  * `contextKey` — side terminals from other contexts stay composed in
- * the background and never refit.
+ * the background and never refit — and within a context only the
+ * active strip tab's terminal is shown.
  */
 export function renderSideTerminalLayer(props: {
   state: TerminalStateControls
@@ -137,7 +142,10 @@ export function renderSideTerminalLayer(props: {
     <div class={`am-side-terminal-layer ${props.visible() ? "am-side-terminal-layer-active" : ""}`}>
       <For each={props.state.sides()}>
         {(term) => {
-          const active = () => props.visible() && term.contextKey === props.contextKey()
+          const active = () =>
+            props.visible() &&
+            term.contextKey === props.contextKey() &&
+            props.state.sideActiveFor(term.contextKey) === term.id
           return (
             <div class={`am-terminal-slot ${active() ? "am-terminal-slot-visible" : ""}`} inert={!active()}>
               <TerminalTab
@@ -146,7 +154,9 @@ export function renderSideTerminalLayer(props: {
                 active={active()}
                 focusSerial={focusSerial(props.state, term.id)}
                 font={term.font}
+                status={() => props.state.scriptStatus(term.id)}
                 onFocusChange={(focused) => props.state.setFocusedId(focused ? term.id : undefined)}
+                onTitleChange={(title) => props.state.setTitle(term.id, title)}
               />
             </div>
           )
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/side.ts b/packages/kilo-vscode/webview-ui/agent-manager/terminal/side.ts
index 3c7fe39145..907625dd16 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/side.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/side.ts
@@ -7,23 +7,70 @@
  * embedded terminal behaves like the diff panel: press once to reveal,
  * press again to hide. Hiding never kills the terminal — only the
  * explicit close action (or `Cmd+W` while it holds focus) does.
+ *
+ * ## Destination state ownership
+ *
+ * The VS Code setting is application-scoped, so one value is shared by
+ * every window and echoed back via `terminal.destinationChanged`
+ * whenever ANY window rewrites it. Two windows can therefore fight:
+ * picking "VS Code terminal" in worktree window B would silently flip
+ * the routing of the panel in window A. To keep each panel consistent,
+ * an explicit dropdown pick is stored per panel (webview state) and
+ * wins over remote echoes; the setting only drives panels that never
+ * picked a destination themselves (it stays the default for new ones).
  */
 
 import { createSignal } from "solid-js"
 import type { Accessor } from "solid-js"
 import type { TerminalDestination } from "../../src/types/messages/agent-manager"
+import { LOCAL } from "../navigate"
+
+/** Read the panel-local destination choice from raw webview state. */
+export function readSavedDestination(state: Record<string, unknown> | undefined): TerminalDestination | undefined {
+  const value = state?.terminalDestination
+  return value === "agentManager" || value === "vscode" ? value : undefined
+}
+
+export type VscodeTerminalRequest =
+  | { type: "agentManager.showTerminal"; sessionId: string }
+  | { type: "agentManager.showWorktreeTerminal"; worktreeId: string }
+  | { type: "agentManager.showLocalTerminal" }
+
+/** Carry the panel-local dropdown choice with every Run click. */
+export function resolveRunScriptRequest(worktreeId: string, destination: TerminalDestination) {
+  return { type: "agentManager.runScript" as const, worktreeId, destination }
+}
+
+/**
+ * Pick the message the terminal button / Focus Terminal shortcut sends
+ * when the destination is the VS Code integrated terminal. The fallback
+ * chain exists so the shortcut never dead-ends: activating a terminal
+ * tab clears the current session, and a worktree may have no sessions
+ * at all. Extracted from AgentManagerApp.tsx (max-lines cap).
+ */
+export function resolveVscodeTerminalRequest(
+  selection: string | null,
+  currentSessionID: string | undefined,
+  sessionForWorktree: (worktreeId: string) => string | undefined,
+): VscodeTerminalRequest {
+  const id = currentSessionID ?? (selection && selection !== LOCAL ? sessionForWorktree(selection) : undefined)
+  if (id) return { type: "agentManager.showTerminal", sessionId: id }
+  if (selection && selection !== LOCAL) return { type: "agentManager.showWorktreeTerminal", worktreeId: selection }
+  return { type: "agentManager.showLocalTerminal" }
+}
 
 interface Handlers {
   requestSide(): void
-  closeSide(): boolean
+  ensureSide(): void
+  closeSide(terminalId: string): boolean
 }
 
 export interface SideTerminalDeps {
   handlers: Handlers
   /** True while the right-side inspector shows the terminal. */
   visible: Accessor<boolean>
-  /** True while the side terminal itself holds DOM focus. */
-  focused: Accessor<boolean>
+  /** Id of the side terminal holding DOM focus, if any. */
+  focusedId: Accessor<string | undefined>
   /** Leave terminal mode; the terminal stays alive in the background. */
   hide: () => void
   /** Move focus back to the chat composer. */
@@ -32,10 +79,20 @@ export interface SideTerminalDeps {
   track: (button: string, surface: string, properties: Record<string, string>) => void
   /** Open or focus the VS Code integrated terminal for the active context. */
   openVscode: () => void
+  /** Panel-local choice restored from webview state, if the user ever
+   *  picked one in this panel. */
+  saved: TerminalDestination | undefined
+  /** Persist the panel-local choice so it survives webview reloads. */
+  save: (destination: TerminalDestination) => void
+  /** Platform override for tests; the workbench keybinding is Cmd on
+   *  macOS and Ctrl elsewhere, and the local fallback must match it. */
+  mac?: boolean
 }
 
 export function createSideTerminal(deps: SideTerminalDeps) {
-  const [destination, setDestination] = createSignal<TerminalDestination>("vscode")
+  const [local, setLocal] = createSignal<TerminalDestination | undefined>(deps.saved)
+  const [destination, setDestination] = createSignal<TerminalDestination>(deps.saved ?? "vscode")
+  if (deps.saved) deps.postMessage({ type: "agentManager.terminal.destinationSelected", destination: deps.saved })
 
   /**
    * Hiding while the terminal holds focus would strand the cursor on
@@ -49,7 +106,7 @@ export function createSideTerminal(deps: SideTerminalDeps) {
 
   const toggle = () => {
     if (deps.visible()) {
-      const was = deps.focused()
+      const was = deps.focusedId() !== undefined
       deps.hide()
       handoff(was)
       return
@@ -57,12 +114,22 @@ export function createSideTerminal(deps: SideTerminalDeps) {
     deps.handlers.requestSide()
   }
 
-  /** Kill the current context's side terminal (or cancel its in-flight
-   *  create) and hide the panel. */
+  /** Keep an open terminal panel useful when its worktree context changes. */
+  const syncContext = (key: string, previous: string | undefined) => {
+    if (key === previous || !deps.visible()) return
+    queueMicrotask(() => {
+      if (deps.visible()) deps.handlers.ensureSide()
+    })
+  }
+
+  /** Kill the focused side terminal (Cmd/Ctrl+W). The panel stays open
+   *  on the remaining terminals, or on the empty state when this was
+   *  the last one. */
   const close = (): boolean => {
-    const was = deps.focused()
-    const done = deps.handlers.closeSide()
-    if (done) handoff(was)
+    const id = deps.focusedId()
+    if (!id) return false
+    const done = deps.handlers.closeSide(id)
+    if (done) handoff(true)
     return done
   }
 
@@ -78,17 +145,72 @@ export function createSideTerminal(deps: SideTerminalDeps) {
   }
 
   /**
-   * Dropdown pick. Applied locally right away so the button reacts
-   * without a round trip, then persisted as a VS Code setting; the
-   * extension echoes it back via `terminal.destinationChanged`.
-   * The key is relative to the `kilo-code.new` section, matching every
-   * other `updateSetting` sender.
+   * Dropdown pick. The choice is panel-local and sticky: it is kept in
+   * webview state and beats later `terminal.destinationChanged` echoes
+   * caused by other windows rewriting the shared application-scoped
+   * setting. The provider still persists it as the default for new panels,
+   * while setup uses this panel-local value immediately.
    */
   const choose = (target: TerminalDestination) => {
     deps.track("terminal_destination", "tab_toolbar", { destination: target })
+    setLocal(target)
     setDestination(target)
-    deps.postMessage({ type: "updateSetting", key: "agentManager.terminalButtonDestination", value: target })
+    deps.save(target)
+    deps.postMessage({ type: "agentManager.terminal.destinationSelected", destination: target })
   }
 
-  return { destination, setDestination, toggle, close, openPreferred, choose }
+  /**
+   * Apply a remote default (initial `agentManager.state` payload or a
+   * live `terminal.destinationChanged` echo). Ignored once the user
+   * picked a destination in this panel — their choice wins over every
+   * echo, including ones triggered by this panel's own `choose` write.
+   */
+  const syncDefault = (target: TerminalDestination) => {
+    if (local()) return
+    setDestination(target)
+  }
+
+  /**
+   * Cmd/Ctrl+/ pressed while the webview holds DOM focus. VS Code normally
+   * forwards the keybinding to the workbench too, and the extension echoes
+   * it back as a showTerminal action message; `echo()` consumes one pending
+   * echo per press so one keypress never toggles twice while an unrelated
+   * invocation (command palette, terminal-focused press) still runs.
+   * Handling the key locally keeps the shortcut working when the
+   * forwarding path drops it (e.g. the chat prompt input is focused).
+   * The modifier matches the declared keybinding: Cmd on macOS, Ctrl
+   * elsewhere — accepting both would hijack the other platform's combo
+   * (and any user keybinding on it) without a matching workbench binding.
+   */
+  const mac = deps.mac ?? (typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent))
+  let pending = 0
+  let lastPress = 0
+  const ECHO_MS = 500
+
+  const press = (e: KeyboardEvent): boolean => {
+    const mod = mac ? e.metaKey && !e.ctrlKey : e.ctrlKey && !e.metaKey
+    if (e.key !== "/" || e.shiftKey || e.altKey || !mod) return false
+    // An echo either arrives promptly or never; drop the backlog of a
+    // dropped echo so it cannot swallow a later unrelated invocation.
+    if (Date.now() - lastPress > ECHO_MS) pending = 0
+    pending++
+    lastPress = Date.now()
+    openPreferred("keyboard_shortcut")
+    return true
+  }
+
+  /** Consumes one pending extension echo of a local `press`. The timeout is
+   *  only a safety valve for an echo that never arrives; an echo that
+   *  outlasts it is indistinguishable from a real invocation and must run. */
+  const echo = () => {
+    if (pending === 0) return false
+    if (Date.now() - lastPress > ECHO_MS) {
+      pending = 0
+      return false
+    }
+    pending--
+    return true
+  }
+
+  return { destination, syncDefault, syncContext, toggle, close, openPreferred, choose, press, echo }
 }
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/state.ts b/packages/kilo-vscode/webview-ui/agent-manager/terminal/state.ts
index 3e9fba7af1..f5b4d4003d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/state.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/state.ts
@@ -15,15 +15,24 @@
 import { createSignal } from "solid-js"
 import type { Accessor } from "solid-js"
 import { LOCAL } from "../navigate"
-import type { ExtensionMessage } from "../../src/types/messages/extension-messages"
+import type {
+  ExtensionMessage,
+  ScriptTerminalKind,
+  ScriptTerminalView,
+} from "../../src/types/messages/extension-messages"
 import type { TerminalDestination, TerminalFont, TerminalPlacement } from "../../src/types/messages/agent-manager"
 
 export type { TerminalFont }
 
 /** Prefix used for terminal tab IDs in the webview (mirrors terminal-manager.ts). */
 export const TERMINAL_PREFIX = "terminal:"
+export const SCRIPT_TERMINAL_PREFIX = "script:"
 
-export const isTerminalTabId = (id: string): boolean => id.startsWith(TERMINAL_PREFIX)
+export const isTerminalTabId = (id: string): boolean =>
+  id.startsWith(TERMINAL_PREFIX) || id.startsWith(SCRIPT_TERMINAL_PREFIX)
+
+/** Status is separate from mounted xterm records so snapshot updates never remount them. */
+export type ScriptTerminalStatus = Pick<ScriptTerminalView, "state" | "exitCode" | "kind">
 
 /** One row in `terminalsByContext`. `wsUrl` is short-lived and never persisted. */
 export interface TerminalTabState {
@@ -32,6 +41,8 @@ export interface TerminalTabState {
   wsUrl: string
   font: TerminalFont
   placement: TerminalPlacement
+  /** Provider-owned script terminal, never created through the webview create flow. */
+  kind?: ScriptTerminalKind
 }
 
 /** Terminal row enriched with the sidebar context it belongs to. Used by
@@ -50,11 +61,9 @@ export interface TerminalFocusRequest {
 }
 
 /** A create request for a side terminal that has not been answered yet.
- *  `cancelled` is set when the user closes the panel while the PTY is
- *  still starting; the late `created` answer is then closed again. */
+ *  Multiple creates can be in flight for the same context at once. */
 interface SideRequest {
   contextKey: string
-  cancelled: boolean
 }
 
 export interface TerminalStateControls {
@@ -65,6 +74,12 @@ export interface TerminalStateControls {
   remove(terminalId: string): TerminalTabStateWithContext | undefined
   /** Resolve the context key a terminal lives in, if any. */
   contextFor(terminalId: string): string | undefined
+  /** Whether a terminal belongs to a provider-owned script (Run/Setup). */
+  isScript(terminalId: string): boolean
+  /** Reactive script state, kept apart from stable xterm terminal records. */
+  scriptStatus(terminalId: string): ScriptTerminalStatus | undefined
+  /** Reconcile a complete provider-owned script terminal snapshot. Returns newly hydrated records. */
+  syncScripts(views: ScriptTerminalView[]): TerminalTabStateWithContext[]
   /** All tab terminals for the given sidebar selection. */
   forSelection(selection: string | null): TerminalTabStateWithContext[]
   /** Map of { id -> tab state } for O(1) lookup. */
@@ -75,10 +90,14 @@ export interface TerminalStateControls {
   all: Accessor<TerminalTabStateWithContext[]>
   /** Every side terminal across every context (for the side-panel layer). */
   sides: Accessor<TerminalTabStateWithContext[]>
-  /** The side terminal of the current context, if any. */
-  side: Accessor<TerminalTabStateWithContext | undefined>
-  /** The side terminal of an arbitrary context, if any. */
-  sideForContext(contextKey: string): TerminalTabStateWithContext | undefined
+  /** Every side terminal of the given context, in creation order. */
+  sidesForContext(contextKey: string): TerminalTabStateWithContext[]
+  /** Id of the active side terminal for a context. */
+  sideActiveFor(contextKey: string): string | undefined
+  /** Mark a side terminal as the visible one for its context. */
+  setSideActive(contextKey: string, terminalId: string): void
+  /** Id of the side terminal holding DOM focus in the current context, if any. */
+  sideFocusedId(): string | undefined
   /** Context key for the current sidebar selection, or `undefined` when nothing is selected. */
   currentKey: Accessor<string | undefined>
   /** Context key for the side panel: like `currentKey` but unassigned
@@ -96,6 +115,13 @@ export interface TerminalStateControls {
   requestFocus(id: string): void
   /** True when the given remembered tab id points to a live terminal for the given selection. */
   hasRemembered(selection: string | null, remembered: string | undefined): boolean
+  /** Live display title for a terminal: the OSC-provided title when the
+   *  shell/program set one, otherwise the create-time title. */
+  title(terminalId: string): string | undefined
+  /** Record an OSC title change for a terminal. Kept outside the
+   *  terminal records so `<For>` reference stability (and therefore the
+   *  mounted xterm instances) is preserved. */
+  setTitle(terminalId: string, title: string): void
   /**
    * Persist a new order for a context's terminals (webview-memory only —
    * terminals are ephemeral and never round-trip through the extension
@@ -109,12 +135,16 @@ export interface TerminalStateControls {
    * was applied, false otherwise so the caller can fall through.
    */
   reorderDrag(from: string, to: string): boolean
-  /** Request id of the in-flight side-terminal create for a context. */
-  pendingSide(contextKey: string): string | undefined
+  /**
+   * Apply a drag-over reorder within a context's side terminals (the
+   * side-panel strip). Returns true when both ends are side terminals
+   * of that context.
+   */
+  reorderSideDrag(contextKey: string, from: string, to: string): boolean
+  /** Request ids of the in-flight side-terminal creates for a context. */
+  pendingSide(contextKey: string): boolean
   /** Mark a side-terminal create as in flight for a context. */
   beginSide(contextKey: string, createId: string): void
-  /** Cancel the in-flight create; returns true when one was pending. */
-  cancelSide(contextKey: string): boolean
   /** Settle a create request; returns it so the caller can validate. */
   completeSide(createId: string): SideRequest | undefined
 }
@@ -149,10 +179,18 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
   const [activeId, setActiveId] = createSignal<string | undefined>()
   const [focusedId, setFocusedId] = createSignal<string | undefined>()
   const [focusRequest, setFocusRequest] = createSignal<TerminalFocusRequest | undefined>()
+  // OSC-provided titles, keyed by terminal id. Separate from the terminal
+  // records on purpose: replacing a record would remount its xterm via
+  // <For> reference inequality (see the module comment above).
+  const [titles, setTitles] = createSignal<Record<string, string>>({})
+  const [scripts, setScripts] = createSignal<Record<string, ScriptTerminalStatus>>({})
+  // Active side terminal per context.
+  const [actives, setActives] = createSignal<Record<string, string>>({})
   let focusSerial = 0
   // In-flight side-terminal creates, keyed both ways: per context (what
-  // the panel shows) and per request id (what the answer carries).
-  const [pending, setPending] = createSignal<Record<string, string>>({})
+  // the panel shows) and per request id (what the answer carries). A
+  // context can have several creates in flight at once.
+  const [pending, setPending] = createSignal<Record<string, string[]>>({})
   const requests = new Map<string, SideRequest>()
 
   const currentKey = (): string | undefined => {
@@ -195,8 +233,35 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     return out
   }
 
-  const sideForContext = (key: string) => terminalsByContext()[key]?.find((t) => t.placement === "side")
-  const side = () => sideForContext(sideKey())
+  const sidesForContext = (key: string) => (terminalsByContext()[key] ?? []).filter((t) => t.placement === "side")
+  const sideActiveFor = (key: string) => actives()[key]
+  const sideFocusedId = () => {
+    const id = focusedId()
+    if (!id) return undefined
+    return sidesForContext(sideKey()).some((t) => t.id === id) ? id : undefined
+  }
+
+  const setSideActive = (key: string, terminalId: string) => {
+    setActives((prev) => (prev[key] === terminalId ? prev : { ...prev, [key]: terminalId }))
+  }
+
+  const title = (terminalId: string): string | undefined => {
+    const key = contextFor(terminalId)
+    if (!key) return undefined
+    const term = terminalsByContext()[key]?.find((t) => t.id === terminalId)
+    if (!term) return undefined
+    // Script terminals always retain their semantic title, even when their
+    // command emits OSC title sequences.
+    if (term.kind) return term.title
+    return titles()[terminalId] ?? term.title
+  }
+
+  const setTitle = (terminalId: string, next: string) => {
+    if (isScript(terminalId)) return
+    const trimmed = next.trim()
+    if (!trimmed) return
+    setTitles((prev) => (prev[terminalId] === trimmed ? prev : { ...prev, [terminalId]: trimmed }))
+  }
 
   const lookup = () => new Map(current().map((t) => [t.id, t]))
 
@@ -207,6 +272,16 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     return undefined
   }
 
+  const isScript = (terminalId: string): boolean => {
+    const key = contextFor(terminalId)
+    return terminalsByContext()[key ?? ""]?.some((term) => term.id === terminalId && term.kind !== undefined) ?? false
+  }
+
+  const scriptStatus = (terminalId: string): ScriptTerminalStatus | undefined => {
+    if (!isScript(terminalId)) return undefined
+    return scripts()[terminalId]
+  }
+
   const forSelection = (sel: string | null): TerminalTabStateWithContext[] => {
     if (sel === null) return []
     const key = sel === LOCAL ? LOCAL : sel
@@ -218,9 +293,6 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     setTerminalsByContext((prev) => {
       const list = prev[key] ?? []
       if (list.some((t) => t.id === term.id)) return prev
-      // One side terminal per context; the message handler dedupes via
-      // pending requests, this guard covers stale double answers.
-      if (term.placement === "side" && list.some((t) => t.placement === "side")) return prev
       const enriched: TerminalTabStateWithContext = { ...term, contextKey: key }
       return { ...prev, [key]: [...list, enriched] }
     })
@@ -238,9 +310,128 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
       return next
     })
     if (focusedId() === terminalId) setFocusedId(undefined)
+    // A removed active side terminal hands activation to the last
+    // remaining one of its context, so the panel never shows a dead slot.
+    if (removed?.placement === "side" && actives()[key] === terminalId) {
+      const rest = sidesForContext(key)
+      setActives((prev) => {
+        const next = { ...prev }
+        if (rest.length === 0) delete next[key]
+        else next[key] = rest[rest.length - 1]!.id
+        return next
+      })
+    }
+    if (titles()[terminalId] !== undefined) {
+      setTitles((prev) => {
+        const next = { ...prev }
+        delete next[terminalId]
+        return next
+      })
+    }
+    if (removed?.kind && scripts()[terminalId] !== undefined) {
+      setScripts((prev) => {
+        const next = { ...prev }
+        delete next[terminalId]
+        return next
+      })
+    }
     return removed
   }
 
+  const syncScripts = (views: ScriptTerminalView[]): TerminalTabStateWithContext[] => {
+    const ids = new Set(views.map((view) => view.terminalId))
+    const added: TerminalTabStateWithContext[] = []
+    const removed: TerminalTabStateWithContext[] = []
+
+    setTerminalsByContext((prev) => {
+      let changed = false
+      const next: Record<string, TerminalTabStateWithContext[]> = {}
+      for (const [key, list] of Object.entries(prev)) {
+        const kept = list.filter((term) => {
+          if (term.kind === undefined || ids.has(term.id)) return true
+          removed.push(term)
+          changed = true
+          return false
+        })
+        if (kept.length > 0) next[key] = kept
+      }
+      for (const view of views) {
+        const target = view.worktreeId ?? LOCAL
+        const key = view.projectId ? `${view.projectId}:${target}` : target
+        const list = next[key] ?? []
+        if (list.some((term) => term.id === view.terminalId)) continue
+        const term: TerminalTabStateWithContext = {
+          id: view.terminalId,
+          title: view.title,
+          wsUrl: view.wsUrl,
+          font: view.font,
+          placement: "side",
+          kind: view.kind,
+          contextKey: key,
+        }
+        next[key] = [...list, term]
+        added.push(term)
+        changed = true
+      }
+      return changed ? next : prev
+    })
+
+    const states: Record<string, ScriptTerminalStatus> = {}
+    for (const view of views) {
+      const status: ScriptTerminalStatus = { state: view.state, kind: view.kind }
+      if (view.exitCode !== undefined) status.exitCode = view.exitCode
+      states[view.terminalId] = status
+    }
+    setScripts((prev) => {
+      const keys = Object.keys(states)
+      if (keys.length !== Object.keys(prev).length) return states
+      for (const id of keys) {
+        const before = prev[id]
+        const after = states[id]
+        if (before?.state !== after?.state || before?.exitCode !== after?.exitCode || before?.kind !== after?.kind)
+          return states
+      }
+      return prev
+    })
+
+    if (added.length > 0) {
+      setActives((prev) => {
+        let changed = false
+        const next = { ...prev }
+        for (const term of added) {
+          if (next[term.contextKey]) continue
+          next[term.contextKey] = term.id
+          changed = true
+        }
+        return changed ? next : prev
+      })
+    }
+
+    if (removed.length > 0) {
+      const removedIds = new Set(removed.map((term) => term.id))
+      if (focusedId() && removedIds.has(focusedId()!)) setFocusedId(undefined)
+      if (activeId() && removedIds.has(activeId()!)) setActiveId(undefined)
+      setTitles((prev) => {
+        const next = { ...prev }
+        for (const id of removedIds) delete next[id]
+        return next
+      })
+      setActives((prev) => {
+        let changed = false
+        const next = { ...prev }
+        for (const key of new Set(removed.map((term) => term.contextKey))) {
+          if (!prev[key] || !removedIds.has(prev[key]!)) continue
+          const rest = sidesForContext(key)
+          if (rest.length === 0) delete next[key]
+          else next[key] = rest[rest.length - 1]!.id
+          changed = true
+        }
+        return changed ? next : prev
+      })
+    }
+    return added
+  }
+
   const requestFocus = (id: string) => {
     focusSerial++
     setFocusRequest({ id, serial: focusSerial })
@@ -299,34 +490,58 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     return true
   }
 
-  const pendingSide = (key: string) => pending()[key]
-
-  const beginSide = (key: string, createId: string) => {
-    requests.set(createId, { contextKey: key, cancelled: false })
-    setPending((prev) => ({ ...prev, [key]: createId }))
-  }
-
-  const cancelSide = (key: string): boolean => {
-    const id = pending()[key]
-    if (!id) return false
-    const request = requests.get(id)
-    if (request) request.cancelled = true
-    setPending((prev) => {
-      const next = { ...prev }
-      delete next[key]
-      return next
+  /**
+   * Reorder the side terminals of a context by moving `from` to `to`'s
+   * position (side-panel strip drag-and-drop). Tab terminals keep their
+   * leading positions; only the side subset is reshuffled. The order
+   * lives in the same `terminalsByContext` list, so it survives sidebar
+   * context switches for the lifetime of the webview.
+   */
+  const reorderSideDrag = (key: string, from: string, to: string): boolean => {
+    const order = sidesForContext(key).map((t) => t.id)
+    const fi = order.indexOf(from)
+    const ti = order.indexOf(to)
+    if (fi === -1 || ti === -1 || fi === ti) return false
+    const next = [...order]
+    next.splice(fi, 1)
+    next.splice(ti, 0, from)
+    setTerminalsByContext((prev) => {
+      const list = prev[key]
+      if (!list || list.length === 0) return prev
+      const tabs = list.filter((t) => t.placement === "tab")
+      const sides = list.filter((t) => t.placement === "side")
+      const byId = new Map(sides.map((t) => [t.id, t]))
+      const moved: TerminalTabStateWithContext[] = []
+      for (const id of next) {
+        const t = byId.get(id)
+        if (t) moved.push(t)
+      }
+      // Fresh terminals that appeared mid-drag keep their tail position.
+      for (const t of sides) if (!moved.includes(t)) moved.push(t)
+      const ordered = [...tabs, ...moved]
+      if (ordered.length === list.length && ordered.every((t, i) => t.id === list[i]!.id)) return prev
+      return { ...prev, [key]: ordered }
     })
     return true
   }
 
+  const pendingSide = (key: string) => (pending()[key]?.length ?? 0) > 0
+
+  const beginSide = (key: string, createId: string) => {
+    requests.set(createId, { contextKey: key })
+    setPending((prev) => ({ ...prev, [key]: [...(prev[key] ?? []), createId] }))
+  }
+
   const completeSide = (createId: string): SideRequest | undefined => {
     const request = requests.get(createId)
     if (!request) return undefined
     requests.delete(createId)
     setPending((prev) => {
-      if (prev[request.contextKey] !== createId) return prev
+      const list = (prev[request.contextKey] ?? []).filter((id) => id !== createId)
+      if (list.length === (prev[request.contextKey]?.length ?? 0)) return prev
       const next = { ...prev }
-      delete next[request.contextKey]
+      if (list.length === 0) delete next[request.contextKey]
+      else next[request.contextKey] = list
       return next
     })
     return request
@@ -336,13 +551,18 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     add,
     remove,
     contextFor,
+    isScript,
+    scriptStatus,
+    syncScripts,
     forSelection,
     lookup,
     current,
     all,
     sides,
-    side,
-    sideForContext,
+    sidesForContext,
+    sideActiveFor,
+    setSideActive,
+    sideFocusedId,
     currentKey,
     sideKey,
     activeId,
@@ -352,11 +572,13 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     focusRequest,
     requestFocus,
     hasRemembered,
+    title,
+    setTitle,
     reorder,
     reorderDrag,
+    reorderSideDrag,
     pendingSide,
     beginSide,
-    cancelSide,
     completeSide,
   }
 }
@@ -376,8 +598,6 @@ export interface TerminalHandlerDeps {
   onRemove?: () => void
   /** Reveal the right-side inspector in terminal mode. */
   onShowSide: (contextKey: string) => void
-  /** Leave terminal mode without killing the terminal. */
-  onHideSide: () => void
   /** Resolve the current sidebar selection for the new-terminal helper. */
   getSelection: () => string | null
   /** Sentinel value for the LOCAL sidebar selection. */
@@ -417,33 +637,61 @@ export function createTerminalHandlers(deps: TerminalHandlerDeps) {
     })
   }
 
-  /**
-   * Reveal the side panel and create-or-focus the context's side
-   * terminal. Reuses the existing terminal when one is alive, dedupes
-   * against an in-flight create, and never touches the tab strip or
-   * the chat session.
-   */
-  const requestSide = () => {
+  const createSide = () => {
     const key = deps.state.sideKey()
-    deps.onShowSide(key)
-    const existing = deps.state.sideForContext(key)
-    if (existing) {
-      deps.state.requestFocus(existing.id)
-      return
-    }
-    if (deps.state.pendingSide(key)) return
     const id = newId()
     deps.state.beginSide(key, id)
-    const sel = deps.getSelection()
     deps.postMessage({
       type: "agentManager.terminal.create",
       createId: id,
       placement: "side",
-      worktreeId: sel === null || sel === deps.LOCAL ? null : sel,
+      worktreeId: key === deps.LOCAL ? null : key,
     })
   }
 
+  /**
+   * Always create a fresh side terminal for the current context (the
+   * panel's `+` action and empty state). Multiple creates may be in
+   * flight at once; each lands as its own tab in the panel strip.
+   */
+  const addSide = () => {
+    deps.onShowSide(deps.state.sideKey())
+    createSide()
+  }
+
+  /** Ensure the current context has a terminal without changing panel mode. */
+  const ensureSide = () => {
+    const key = deps.state.sideKey()
+    if (deps.state.sidesForContext(key).length > 0 || deps.state.pendingSide(key)) return
+    createSide()
+  }
+
+  /**
+   * Reveal the side panel and focus the context's active side terminal,
+   * creating one when the context has none. Never touches the tab strip
+   * or the chat session.
+   */
+  const requestSide = () => {
+    const key = deps.state.sideKey()
+    deps.onShowSide(key)
+    const existing = deps.state.sidesForContext(key)
+    if (existing.length > 0) {
+      const active = deps.state.sideActiveFor(key) ?? existing[existing.length - 1]!.id
+      deps.state.setSideActive(key, active)
+      deps.state.requestFocus(active)
+      return
+    }
+    ensureSide()
+  }
+
   const closeTerminal = (terminalId: string) => {
+    // Script terminals transition through a provider-owned stopping snapshot.
+    // Keep their xterm mounted until closure is confirmed by a snapshot or
+    // terminal.closed message so live output is never discarded early.
+    if (deps.state.isScript(terminalId)) {
+      deps.postMessage({ type: "agentManager.terminal.close", terminalId })
+      return
+    }
     deps.onRemove?.()
     const ids = deps.tabIds()
     const idx = ids.indexOf(terminalId)
@@ -477,19 +725,57 @@ export function createTerminalHandlers(deps: TerminalHandlerDeps) {
   }
 
   /**
-   * Kill the current context's side terminal and hide the panel. With
-   * a create still in flight, cancels it instead — the late answer is
-   * closed by the message handler.
+   * Kill one side terminal. The panel stays open on the remaining
+   * terminals (or the empty state when this was the last one) — hiding
+   * is the toggle's job, not the close button's. Active-tab fallback
+   * is handled by the state layer.
    */
-  const closeSide = () => {
-    const term = deps.state.side()
-    deps.onHideSide()
-    if (!term) return deps.state.cancelSide(deps.state.sideKey())
-    deps.state.remove(term.id)
-    deps.postMessage({ type: "agentManager.terminal.close", terminalId: term.id })
+  const closeSide = (terminalId: string): boolean => {
+    // Validate before mutating: dropping a non-side record here would
+    // unmount its xterm while the backend PTY leaks (no close sent).
+    const term = deps.state.sides().find((t) => t.id === terminalId)
+    if (!term) return false
+    if (term.kind) {
+      deps.postMessage({ type: "agentManager.terminal.close", terminalId })
+      return true
+    }
+    deps.state.remove(terminalId)
+    deps.postMessage({ type: "agentManager.terminal.close", terminalId })
     return true
   }
 
+  /**
+   * Kill every side terminal of a context except one, and make the
+   * survivor the visible tab: the side-strip counterpart of the tab
+   * bar's "Close Others".
+   */
+  const closeSideOthers = (terminalId: string) => {
+    const key = deps.state.contextFor(terminalId)
+    if (!key) return
+    for (const term of deps.state.sidesForContext(key)) {
+      if (term.id === terminalId) continue
+      closeSide(term.id)
+    }
+    deps.state.setSideActive(key, terminalId)
+    deps.state.requestFocus(terminalId)
+  }
+
+  /** Deliberately stop a running script terminal: kills its process tree. */
+  const stopSide = (terminalId: string): boolean => {
+    const term = deps.state.sides().find((t) => t.id === terminalId)
+    if (!term?.kind) return false
+    deps.postMessage({ type: "agentManager.terminal.stop", terminalId })
+    return true
+  }
+
+  /** Make a side terminal the visible one in its panel and focus it. */
+  const selectSide = (terminalId: string) => {
+    const key = deps.state.contextFor(terminalId)
+    if (!key) return
+    deps.state.setSideActive(key, terminalId)
+    deps.state.requestFocus(terminalId)
+  }
+
   const middleClick = (terminalId: string, e: MouseEvent) => {
     if (e.button !== 1) return
     e.preventDefault()
@@ -504,7 +790,21 @@ export function createTerminalHandlers(deps: TerminalHandlerDeps) {
     return true
   }
 
-  return { closeTerminal, closeSide, middleClick, activate, deactivate, requestNew, requestSide, closeActive }
+  return {
+    closeTerminal,
+    closeSide,
+    closeSideOthers,
+    stopSide,
+    selectSide,
+    middleClick,
+    activate,
+    deactivate,
+    requestNew,
+    requestSide,
+    ensureSide,
+    addSide,
+    closeActive,
+  }
 }
 
 export interface TerminalMessageHandlerDeps {
@@ -528,11 +828,14 @@ export interface TerminalMessageHandlerDeps {
   onSideError?: (contextKey: string) => void
   /** Side terminal was closed (locally or by the extension). */
   onSideClosed?: (contextKey: string) => void
+  /** A newly hydrated running script terminal belongs to the selected context. */
+  onScriptRunning?: (contextKey: string, terminalId: string) => void
   /** The destination setting changed (live settings sync). */
   onDestinationChanged?: (destination: TerminalDestination) => void
 }
 
 type CreatedMessage = Extract<ExtensionMessage, { type: "agentManager.terminal.created" }>
+type ScriptTerminalsMessage = Extract<ExtensionMessage, { type: "agentManager.scriptTerminals" }>
 
 function handleCreated(deps: TerminalMessageHandlerDeps, msg: CreatedMessage) {
   const contextKey = msg.worktreeId === null ? LOCAL : msg.worktreeId
@@ -545,14 +848,17 @@ function handleCreated(deps: TerminalMessageHandlerDeps, msg: CreatedMessage) {
   }
   if (msg.placement === "side") {
     // Side terminals are answered to a specific pending request. A
-    // missing, cancelled, or context-mismatched request means the user
-    // already moved on — close the PTY again instead of leaking it.
+    // missing or context-mismatched request means the webview was
+    // reloaded (or the context is gone) — close the PTY again instead
+    // of leaking it.
     const request = deps.state.completeSide(msg.createId)
-    if (!request || request.cancelled || request.contextKey !== contextKey) {
+    if (!request || request.contextKey !== contextKey) {
       deps.postMessage({ type: "agentManager.terminal.close", terminalId: msg.terminalId })
       return
     }
     deps.state.add(msg.worktreeId, term)
+    // The newest terminal becomes the visible one in its panel.
+    deps.state.setSideActive(contextKey, msg.terminalId)
     deps.onSideCreated?.(contextKey, msg.terminalId)
     return
   }
@@ -563,6 +869,13 @@ function handleCreated(deps: TerminalMessageHandlerDeps, msg: CreatedMessage) {
   deps.activate(msg.terminalId)
 }
 
+function handleScriptTerminals(deps: TerminalMessageHandlerDeps, msg: ScriptTerminalsMessage) {
+  const added = deps.state.syncScripts(msg.terminals)
+  for (const term of added) {
+    if (deps.state.scriptStatus(term.id)?.state === "running") deps.onScriptRunning?.(term.contextKey, term.id)
+  }
+}
+
 /**
  * Wire handlers for the inbound terminal messages. Returns a dispatcher
  * that accepts each message type and returns true if it handled the
@@ -575,6 +888,10 @@ export function createTerminalMessageHandler(deps: TerminalMessageHandlerDeps) {
       handleCreated(deps, msg)
       return true
     }
+    if (msg.type === "agentManager.scriptTerminals") {
+      handleScriptTerminals(deps, msg)
+      return true
+    }
     if (msg.type === "agentManager.terminal.closed") {
       const removed = deps.state.remove(msg.terminalId)
       if (deps.state.activeId() === msg.terminalId) deps.state.setActiveId(undefined)
@@ -583,8 +900,6 @@ export function createTerminalMessageHandler(deps: TerminalMessageHandlerDeps) {
     }
     if (msg.type === "agentManager.terminal.error") {
       const request = msg.createId ? deps.state.completeSide(msg.createId) : undefined
-      // Errors for requests the user already cancelled are noise.
-      if (request?.cancelled) return true
       if (request) deps.onSideError?.(request.contextKey)
       deps.showError(msg.message)
       return true
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts b/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts
new file mode 100644
index 0000000000..57692d649c
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts
@@ -0,0 +1,137 @@
+/**
+ * Worktree diff data for Agent Manager.
+ *
+ * Owns the per-session diff map, the panel loading flag, and the per-file
+ * pending set, plus the backend message handlers that fill them and the
+ * helpers that request individual files. Extracted from `AgentManagerApp.tsx`
+ * so the app component only routes the diff messages and reads the signals.
+ */
+
+import { createSignal, type Accessor } from "solid-js"
+import { mergeWorktreeDiffs } from "../diff-viewer/diff-state"
+import { parseDiffId } from "./diff-scope-state"
+import type { useVSCode } from "../src/context/vscode"
+import type {
+  AgentManagerWorktreeDiffFileMessage,
+  AgentManagerWorktreeDiffLoadingMessage,
+  AgentManagerWorktreeDiffMessage,
+  AgentManagerWorktreeDiffNoticeMessage,
+  WorktreeFileDiff,
+} from "../src/types/messages"
+
+/**
+ * Decompose a composite diff id (`ctx#scope`, or `ctx#session:<sid>`) into the
+ * wire fields the extension expects. Bare ids (no scope separator) parse to
+ * the default branch scope.
+ */
+export function wireDiffId(id: string) {
+  const { ctx, scope, sessionId } = parseDiffId(id)
+  return { sessionId: ctx, scope, diffSessionId: sessionId }
+}
+
+export function createWorktreeDiffs(vscode: ReturnType<typeof useVSCode>) {
+  const [diffDatas, setDiffDatas] = createSignal<Record<string, WorktreeFileDiff[]>>({})
+  const [diffLoading, setDiffLoading] = createSignal(false)
+  const [diffNotices, setDiffNotices] = createSignal<Record<string, string | undefined>>({})
+  const [diffFileLoading, setDiffFileLoading] = createSignal<Record<string, Record<string, true>>>({})
+
+  const setDiffFilePending = (sessionId: string, file: string, value: boolean) => {
+    setDiffFileLoading((prev) => {
+      const session = prev[sessionId] ?? {}
+      if (value) {
+        if (session[file]) return prev
+        return {
+          ...prev,
+          [sessionId]: { ...session, [file]: true },
+        }
+      }
+
+      if (!session[file]) return prev
+      const next = { ...session }
+      delete next[file]
+      if (Object.keys(next).length === 0) {
+        const result = { ...prev }
+        delete result[sessionId]
+        return result
+      }
+      return {
+        ...prev,
+        [sessionId]: next,
+      }
+    })
+  }
+
+  /** Lazily load a single file's full diff for the given composite diff id. */
+  const requestDiffFile = (id: string, file: string) => {
+    if (diffFileLoading()[id]?.[file]) return
+    setDiffFilePending(id, file, true)
+    vscode.postMessage({ type: "agentManager.requestWorktreeDiffFile", file, ...wireDiffId(id) })
+  }
+
+  /** Files the backend flagged as stale in a merged update need a fresh fetch. */
+  const refreshStaleDiffs = (id: string, files: Set<string>) => {
+    const loading = diffFileLoading()[id] ?? {}
+    for (const file of files) {
+      if (loading[file]) continue
+      setDiffFilePending(id, file, true)
+      vscode.postMessage({ type: "agentManager.requestWorktreeDiffFile", file, ...wireDiffId(id) })
+    }
+  }
+
+  /** Files currently being fetched for a session, for per-file spinners. */
+  const diffFileLoadingFor = (sessionId: Accessor<string | undefined>) => {
+    const id = sessionId()
+    if (!id) return new Set<string>()
+    return new Set(Object.keys(diffFileLoading()[id] ?? {}))
+  }
+
+  // Backend messages.
+
+  const onWorktreeDiff = (ev: AgentManagerWorktreeDiffMessage) => {
+    let staleFiles: Set<string> | undefined
+    setDiffDatas((prev) => {
+      const existing = prev[ev.sessionId]
+      const merged = existing ? mergeWorktreeDiffs(existing, ev.diffs) : { diffs: ev.diffs, stale: new Set<string>() }
+      staleFiles = merged.stale
+      const next = merged.diffs
+      if (existing && existing.length === next.length && existing.every((old, i) => old === next[i])) return prev
+      return { ...prev, [ev.sessionId]: next }
+    })
+    if (staleFiles) refreshStaleDiffs(ev.sessionId, staleFiles)
+  }
+
+  const onWorktreeDiffFile = (ev: AgentManagerWorktreeDiffFileMessage) => {
+    if (ev.diff) {
+      setDiffDatas((prev) => {
+        const existing = prev[ev.sessionId] ?? []
+        const next = existing.map((item) => (item.file === ev.diff!.file ? ev.diff! : item))
+        return { ...prev, [ev.sessionId]: next }
+      })
+      setDiffFilePending(ev.sessionId, ev.diff.file, false)
+      return
+    }
+    setDiffFilePending(ev.sessionId, ev.file, false)
+  }
+
+  const onWorktreeDiffLoading = (ev: AgentManagerWorktreeDiffLoadingMessage) => {
+    setDiffLoading(ev.loading)
+  }
+
+  const onWorktreeDiffNotice = (ev: AgentManagerWorktreeDiffNoticeMessage) => {
+    setDiffNotices((prev) => ({ ...prev, [ev.sessionId]: ev.notice }))
+  }
+
+  return {
+    diffDatas,
+    diffLoading,
+    setDiffLoading,
+    diffNotices,
+    requestDiffFile,
+    refreshStaleDiffs,
+    diffFileLoadingFor,
+    onWorktreeDiff,
+    onWorktreeDiffFile,
+    onWorktreeDiffLoading,
+    onWorktreeDiffNotice,
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/diff-viewer/BaseBranchPicker.tsx b/packages/kilo-vscode/webview-ui/diff-viewer/BaseBranchPicker.tsx
index 953c9c26b9..44217e02e7 100644
--- a/packages/kilo-vscode/webview-ui/diff-viewer/BaseBranchPicker.tsx
+++ b/packages/kilo-vscode/webview-ui/diff-viewer/BaseBranchPicker.tsx
@@ -96,7 +96,7 @@ export const BaseBranchPicker: Component<BaseBranchPickerProps> = (props) => {
         placement="bottom-start"
         flip
         trigger={
-          <button class="am-selector-trigger diff-base-trigger" type="button">
+          <button class="am-selector-trigger diff-inline-trigger" type="button" title={triggerLabel()}>
             <span class="am-selector-left">
               <Show when={!props.currentBranch}>
                 <Icon name="branch" size="small" />
diff --git a/packages/kilo-vscode/webview-ui/diff-viewer/DiffScopeControls.tsx b/packages/kilo-vscode/webview-ui/diff-viewer/DiffScopeControls.tsx
new file mode 100644
index 0000000000..03de2f49a1
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/diff-viewer/DiffScopeControls.tsx
@@ -0,0 +1,80 @@
+import { Show, type Component } from "solid-js"
+import type { DiffSourceDescriptor } from "../../src/diff/sources/types"
+import type { BranchInfo } from "../src/types/messages"
+import { useLanguage } from "../src/context/language"
+import { InlineSelect, type InlineOption } from "./InlineSelect"
+import { BaseBranchPicker } from "./BaseBranchPicker"
+
+interface DiffScopeControlsProps {
+  descriptors: DiffSourceDescriptor[]
+  currentId: string | undefined
+  onSelectScope: (id: string) => void
+  /** Show the base branch picker (only when the Branch scope is active). */
+  showBase: boolean
+  branches: BranchInfo[]
+  branchesLoading: boolean
+  defaultBranch: string
+  autoBase: string | undefined
+  currentBase: string | undefined
+  isAuto: boolean
+  currentBranch: string | undefined
+  onSelectBase: (branch: string | undefined) => void
+  /**
+   * Compact mode for the narrow side panel: drops the `current →` prefix and
+   * tightens the label caps so the row survives a user-shrunk panel.
+   */
+  compact?: boolean
+}
+
+/**
+ * Scope selector plus base branch picker, sized to sit inline in a diff
+ * toolbar row. Shared by the Agent Manager side panel and review tab.
+ *
+ * Note this deliberately avoids `DiffPickerHeader`: that component is a
+ * full-width header band (`margin: 8px 12px`) and using it inside a toolbar
+ * inflates the row height and misaligns against the neighboring buttons.
+ */
+export const DiffScopeControls: Component<DiffScopeControlsProps> = (props) => {
+  const { t } = useLanguage()
+
+  const options = (): InlineOption<string>[] =>
+    props.descriptors.map((desc) => ({
+      value: desc.id,
+      label: t(`diffViewer.source.${desc.type}.label`),
+      group: t(desc.group === "Session" ? "diffViewer.group.session" : "diffViewer.group.git"),
+    }))
+
+  // The trigger's tooltip explains what the active scope actually shows,
+  // reusing the per-scope descriptions the standalone picker already has.
+  const title = () => {
+    const active = props.descriptors.find((desc) => desc.id === props.currentId)
+    if (!active) return ""
+    return t(`diffViewer.source.${active.type}.tooltip`)
+  }
+
+  return (
+    <span class="diff-scope-controls" classList={{ "diff-scope-controls-compact": props.compact }}>
+      <Show when={props.descriptors.length > 0}>
+        <InlineSelect
+          options={options()}
+          value={props.currentId}
+          onSelect={props.onSelectScope}
+          title={title()}
+          compact={props.compact}
+        />
+      </Show>
+      <Show when={props.showBase}>
+        <BaseBranchPicker
+          branches={props.branches}
+          loading={props.branchesLoading}
+          defaultBranch={props.defaultBranch}
+          autoBase={props.autoBase}
+          currentBase={props.currentBase}
+          isAuto={props.isAuto}
+          currentBranch={props.compact ? undefined : props.currentBranch}
+          onSelect={props.onSelectBase}
+        />
+      </Show>
+    </span>
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/diff-viewer/FullScreenDiffView.tsx b/packages/kilo-vscode/webview-ui/diff-viewer/FullScreenDiffView.tsx
index 4ff64605f6..73ba90e60f 100644
--- a/packages/kilo-vscode/webview-ui/diff-viewer/FullScreenDiffView.tsx
+++ b/packages/kilo-vscode/webview-ui/diff-viewer/FullScreenDiffView.tsx
@@ -1,4 +1,4 @@
-import { type Component, createSignal, createMemo, createEffect, on, onCleanup, Show } from "solid-js"
+import { type Component, createSignal, createMemo, createEffect, on, onCleanup, Show, type JSXElement } from "solid-js"
 import type { VirtualizerHandle } from "virtua/solid"
 // Styles are imported by the component so every consumer (sidebar diff viewer,
 // agent manager, storybook) picks them up automatically. Keep these imports here —
@@ -65,12 +65,19 @@ import { createDiffRequests } from "./diff-requests"
 
 type DiffStyle = "unified" | "split"
 
+/** Well-known diff source notices → i18n keys (mirrors the standalone viewer). */
+const DIFF_NOTICE_KEYS: Record<string, string> = {
+  "snapshots-disabled": "diffViewer.notice.snapshotsDisabled",
+}
+
 interface FullScreenDiffViewProps {
   diffs: WorktreeFileDiff[]
   loading: boolean
   loadingFiles?: Set<string>
   sessionId?: string
   sessionKey?: string
+  /** Well-known source notice kind (e.g. "snapshots-disabled"), shown as a banner. */
+  notice?: string
   comments: ReviewComment[]
   onCommentsChange: (comments: ReviewComment[]) => void
   composer?: ReviewComposer
@@ -89,11 +96,18 @@ interface FullScreenDiffViewProps {
   canRevert?: boolean
   /** Defaults to true. Disables comment creation and "Send all" when false. */
   canComment?: boolean
+  /** Optional leading content rendered first in the toolbar's left group. */
+  lead?: JSXElement
   onClose: () => void
 }
 
 export const FullScreenDiffView: Component<FullScreenDiffViewProps> = (props) => {
   const { t } = useLanguage()
+  const noticeText = () => {
+    const n = props.notice
+    if (!n) return ""
+    return t(DIFF_NOTICE_KEYS[n] ?? n)
+  }
   const vscode = useVSCode()
   const server = useServer()
   const provider = useProvider()
@@ -541,6 +555,7 @@ export const FullScreenDiffView: Component<FullScreenDiffViewProps> = (props) =>
       {/* Toolbar */}
       <div class="am-review-toolbar">
         <div class="am-review-toolbar-left">
+          <Show when={props.lead}>{props.lead}</Show>
           <RadioGroup
             options={["unified", "split"] as const}
             current={props.diffStyle}
@@ -612,6 +627,15 @@ export const FullScreenDiffView: Component<FullScreenDiffViewProps> = (props) =>
           />
         </div>
         <div class="am-review-diff" ref={setScroller}>
+          <Show when={noticeText()}>
+            <div class="diff-viewer-notice" role="status">
+              <span class="diff-viewer-notice-icon">
+                <Icon name="warning" size="small" />
+              </span>
+              <span class="diff-viewer-notice-text">{noticeText()}</span>
+            </div>
+          </Show>
+
           <Show when={props.loading && props.diffs.length === 0}>
             <div class="am-diff-loading">
               <Spinner />
@@ -619,7 +643,7 @@ export const FullScreenDiffView: Component<FullScreenDiffViewProps> = (props) =>
             </div>
           </Show>
 
-          <Show when={!props.loading && props.diffs.length === 0}>
+          <Show when={!props.loading && props.diffs.length === 0 && !noticeText()}>
             <div class="am-diff-empty">
               <span>{t("session.review.noChanges")}</span>
             </div>
diff --git a/packages/kilo-vscode/webview-ui/diff-viewer/InlineSelect.tsx b/packages/kilo-vscode/webview-ui/diff-viewer/InlineSelect.tsx
new file mode 100644
index 0000000000..1f7945f45c
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/diff-viewer/InlineSelect.tsx
@@ -0,0 +1,127 @@
+import { type Component, For, Show, createSignal } from "solid-js"
+import { Icon } from "@kilocode/kilo-ui/icon"
+import { DeferredPopover } from "../src/components/shared/DeferredPopover"
+
+export interface InlineOption<T extends string> {
+  value: T
+  label: string
+  /** Secondary text shown right-aligned in the menu row. */
+  hint?: string
+  /** Optional group heading; consecutive options sharing a group are grouped. */
+  group?: string
+}
+
+interface InlineSelectProps<T extends string> {
+  options: InlineOption<T>[]
+  value: T | undefined
+  onSelect: (value: T) => void
+  /** Trigger icon. Omit to keep the trigger as narrow as possible. */
+  icon?: string
+  /** Accessible name / tooltip text for the trigger. */
+  title: string
+  /** Caps the trigger label width so long values ellipsize instead of pushing. */
+  compact?: boolean
+  /** Extra class on the trigger, so narrow-width rules can target one control. */
+  class?: string
+}
+
+/**
+ * Compact dropdown sized for a diff toolbar row.
+ *
+ * Deliberately not kilo-ui's `Select`: that renders an input-sized control
+ * (32px, base font) which dwarfs the ghost buttons and radio group it sits
+ * next to. This mirrors the `am-selector-trigger` markup the branch pickers
+ * use, shrunk via `.diff-inline-trigger`, so every control in the row shares
+ * one height and font size.
+ */
+export function InlineSelect<T extends string>(props: InlineSelectProps<T>) {
+  const [open, setOpen] = createSignal(false)
+
+  const current = () => props.options.find((opt) => opt.value === props.value)
+  const label = () => current()?.label ?? ""
+
+  const choose = (value: T) => {
+    props.onSelect(value)
+    setOpen(false)
+  }
+
+  // Group heading renders only when it differs from the previous option's, so
+  // callers just order their options by group.
+  const heading = (index: number) => {
+    const group = props.options[index]?.group
+    if (!group) return undefined
+    if (index === 0) return group
+    return props.options[index - 1]?.group === group ? undefined : group
+  }
+
+  return (
+    <DeferredPopover
+      open={open()}
+      onOpenChange={setOpen}
+      placement="bottom-start"
+      flip
+      portal={false}
+      deferDismiss
+      class="am-dropdown diff-inline-menu"
+      trigger={
+        <button
+          class={`am-selector-trigger diff-inline-trigger${props.class ? ` ${props.class}` : ""}`}
+          type="button"
+          title={props.title}
+        >
+          <span class="am-selector-left">
+            <Show when={props.icon}>{(name) => <Icon name={name()} size="small" />}</Show>
+            <span class="am-selector-value">{label()}</span>
+          </span>
+          <span class="am-selector-right">
+            <Icon name="selector" size="small" />
+          </span>
+        </button>
+      }
+    >
+      <div class="am-dropdown-list">
+        <For each={props.options}>
+          {(opt, index) => (
+            <>
+              <Show when={heading(index())}>{(text) => <div class="diff-inline-group">{text()}</div>}</Show>
+              <button
+                class="am-branch-item"
+                classList={{ "am-branch-item-active": opt.value === props.value }}
+                type="button"
+                onClick={() => choose(opt.value)}
+              >
+                <span class="am-branch-item-left">
+                  <span class="am-branch-item-name">{opt.label}</span>
+                </span>
+                <Show when={opt.hint}>
+                  <span class="am-branch-hint">{opt.hint}</span>
+                </Show>
+              </button>
+            </>
+          )}
+        </For>
+      </div>
+    </DeferredPopover>
+  )
+}
+
+/** Compact unified/split picker. Replaces the wide radio group in tight rows. */
+export const DiffStyleSelect: Component<{
+  value: "unified" | "split"
+  onSelect: (value: "unified" | "split") => void
+  unifiedLabel: string
+  splitLabel: string
+  title: string
+}> = (props) => (
+  <InlineSelect
+    options={[
+      { value: "unified", label: props.unifiedLabel },
+      { value: "split", label: props.splitLabel },
+    ]}
+    value={props.value}
+    onSelect={props.onSelect}
+    title={props.title}
+    class="diff-style-select"
+    compact
+  />
+)
diff --git a/packages/kilo-vscode/webview-ui/kiloclaw/context/language.tsx b/packages/kilo-vscode/webview-ui/kiloclaw/context/language.tsx
index e4e079638f..4a64ce3c7e 100644
--- a/packages/kilo-vscode/webview-ui/kiloclaw/context/language.tsx
+++ b/packages/kilo-vscode/webview-ui/kiloclaw/context/language.tsx
@@ -27,6 +27,7 @@ import { dict as tr } from "../i18n/tr"
 import { dict as zh } from "../i18n/zh"
 import { dict as uk } from "../i18n/uk"
 import { dict as zht } from "../i18n/zht"
+import { dict as fa } from "../i18n/fa"
 
 const dicts: Record<Locale, Record<string, string>> = {
   en,
@@ -49,6 +50,7 @@ const dicts: Record<Locale, Record<string, string>> = {
   uk: { ...en, ...uk },
   zh: { ...en, ...zh },
   zht: { ...en, ...zht },
+  fa: { ...en, ...fa },
 }
 
 type LanguageCtx = {
diff --git a/packages/kilo-vscode/webview-ui/kiloclaw/i18n/fa.ts b/packages/kilo-vscode/webview-ui/kiloclaw/i18n/fa.ts
new file mode 100644
index 0000000000..1c63633715
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/kiloclaw/i18n/fa.ts
@@ -0,0 +1,95 @@
+export const dict = {
+  // App
+  "kiloClaw.loading": "در حال بارگذاری KiloClaw...",
+
+  // Chat
+  "kiloClaw.chat.connecting": "در حال اتصال...",
+  "kiloClaw.chat.notRunning": "نمونه در حال اجرا نیست",
+  "kiloClaw.chat.placeholder": "پیامی بنویسید... (Enter برای ارسال)",
+  "kiloClaw.chat.online": "آنلاین",
+  "kiloClaw.chat.offline": "آفلاین",
+  "kiloClaw.chat.idle": "بیکار",
+  "kiloClaw.chat.unknown": "نامشخص",
+  "kiloClaw.chat.empty": "هنوز پیامی وجود ندارد. سلام کنید!",
+  "kiloClaw.chat.emptyWithBot": "هنوز پیامی وجود ندارد. به {bot} سلام کنید!",
+  "kiloClaw.chat.send": "ارسال",
+  "kiloClaw.chat.waitingBotStatus": "در انتظار وضعیت ربات...",
+  "kiloClaw.chat.botOffline": "ربات آفلاین است",
+
+  // Conversations
+  "kiloClaw.conversations.title": "مکالمات",
+  "kiloClaw.conversations.new": "مکالمه جدید",
+  "kiloClaw.conversations.empty": "هنوز مکالمه‌ای وجود ندارد",
+  "kiloClaw.conversations.untitled": "بدون عنوان",
+  "kiloClaw.conversations.rename": "تغییر نام",
+  "kiloClaw.conversations.leave": "خروج",
+  "kiloClaw.conversations.selectOne": "یک مکالمه را برای شروع گفتگو انتخاب کنید",
+  "kiloClaw.conversations.groupToday": "امروز",
+  "kiloClaw.conversations.groupYesterday": "دیروز",
+  "kiloClaw.conversations.groupThisWeek": "این هفته",
+  "kiloClaw.conversations.groupOlder": "قدیمی‌تر",
+
+  // Typing
+  "kiloClaw.typing.one": "{name} در حال تایپ است...",
+  "kiloClaw.typing.many": "{count} نفر در حال تایپ هستند...",
+
+  // Messages
+  "kiloClaw.message.bot": "KiloClaw",
+  "kiloClaw.message.you": "شما",
+  "kiloClaw.message.thinking": "در حال فکر کردن...",
+  "kiloClaw.message.deleted": "[پیام حذف شد]",
+  "kiloClaw.message.replyDeleted": "پیام اصلی حذف شد",
+  "kiloClaw.message.notDelivered": "ارسال نشد",
+  "kiloClaw.message.edited": "(ویرایش شده)",
+  "kiloClaw.message.reply": "پاسخ",
+  "kiloClaw.message.replyTo": "در حال پاسخ به",
+  "kiloClaw.message.cancelReply": "لغو پاسخ",
+  "kiloClaw.message.edit": "ویرایش",
+  "kiloClaw.message.delete": "حذف",
+  "kiloClaw.message.confirmDelete": "این پیام حذف شود؟",
+  "kiloClaw.message.cancel": "انصراف",
+  "kiloClaw.message.save": "ذخیره",
+  "kiloClaw.message.react": "واکنش",
+  "kiloClaw.message.removeReaction": "حذف واکنش",
+  "kiloClaw.message.copy": "کپی",
+  "kiloClaw.message.copied": "در کلیپ‌بورد کپی شد",
+  "kiloClaw.message.copyFailed": "کپی انجام نشد",
+
+  // Error
+  "kiloClaw.error.retry": "تلاش مجدد",
+
+  // Setup
+  "kiloClaw.setup.title": "KiloClaw",
+  "kiloClaw.setup.subtitle": "هوش مصنوعی شخصی برای زندگی روزمره",
+  "kiloClaw.setup.description1":
+    "KiloClaw یک هوش مصنوعی شخصی در اختیار شما قرار می‌دهد که ایمیل‌ها را می‌خواند، تقویم شما را مدیریت می‌کند، پروژه‌هایتان را رصد می‌کند و در Telegram، Slack — هر چیزی که از قبل استفاده می‌کنید — در دسترس است.",
+  "kiloClaw.setup.description2":
+    "نیازی به نصب برنامه نیست. رابط جدیدی برای یادگیری وجود ندارد. فقط مثل یک دوست برایش پیام بفرستید.",
+  "kiloClaw.setup.learnMore": "بیشتر بدانید",
+  "kiloClaw.setup.tryKiloClaw": "امتحان KiloClaw",
+
+  // Upgrade
+  "kiloClaw.upgrade.title": "KiloClaw Chat نیاز به ارتقا دارد",
+  "kiloClaw.upgrade.description1": "این نمونه قبل از فعال‌سازی چت راه‌اندازی شده است.",
+  "kiloClaw.upgrade.description2.before": "از دکمه ",
+  "kiloClaw.upgrade.description2.bold": "ارتقا به آخرین نسخه",
+  "kiloClaw.upgrade.description2.after": " در داشبورد KiloClaw برای فعال‌سازی چت زنده با ربات خود استفاده کنید.",
+  "kiloClaw.upgrade.openDashboard": "باز کردن داشبورد",
+
+  // Sidebar
+  "kiloClaw.sidebar.title": "KiloClaw",
+  "kiloClaw.sidebar.instance": "نمونه",
+  "kiloClaw.sidebar.unknown": "ناشناخته",
+  "kiloClaw.sidebar.bot": "ربات",
+  "kiloClaw.sidebar.botStatus": "وضعیت ربات",
+  "kiloClaw.sidebar.context": "زمینه",
+  "kiloClaw.sidebar.used": "استفاده‌شده",
+  "kiloClaw.sidebar.tokens": "توکن‌ها",
+  "kiloClaw.sidebar.model": "مدل",
+  "kiloClaw.sidebar.provider": "ارائه‌دهنده",
+  "kiloClaw.sidebar.details": "جزئیات",
+  "kiloClaw.sidebar.region": "منطقه",
+  "kiloClaw.sidebar.version": "نسخه",
+  "kiloClaw.sidebar.channels": "کانال‌ها",
+  "kiloClaw.sidebar.noData": "داده‌ای برای نمونه وجود ندارد",
+}
diff --git a/packages/kilo-vscode/webview-ui/src/App.tsx b/packages/kilo-vscode/webview-ui/src/App.tsx
index 1aa6768823..7fa356e848 100644
--- a/packages/kilo-vscode/webview-ui/src/App.tsx
+++ b/packages/kilo-vscode/webview-ui/src/App.tsx
@@ -1,34 +1,18 @@
 import { Component, createSignal, createMemo, Switch, Match, Show, onMount, onCleanup } from "solid-js"
-import { ThemeProvider } from "@kilocode/kilo-ui/theme"
-import { DialogProvider } from "@kilocode/kilo-ui/context/dialog"
-import { MarkedProvider } from "@kilocode/kilo-ui/context/marked"
-import { CodeComponentProvider } from "@kilocode/kilo-ui/context/code"
-import { DiffComponentProvider } from "@kilocode/kilo-ui/context/diff"
-import { FileComponentProvider } from "@kilocode/kilo-ui/context/file"
-import { Code } from "@kilocode/kilo-ui/code"
-import { Diff } from "@kilocode/kilo-ui/diff"
-import { File } from "@kilocode/kilo-ui/file"
 import { DataProvider } from "@kilocode/kilo-ui/context/data"
-import { Toast } from "@kilocode/kilo-ui/toast"
 import Settings from "./components/settings/Settings"
 import ProfileView from "./components/profile/ProfileView"
-import { VSCodeProvider, useVSCode } from "./context/vscode"
-import { ServerProvider, useServer } from "./context/server"
-import { ProviderProvider, useProvider } from "./context/provider"
-import { ConfigProvider } from "./context/config"
-import { DisplayProvider } from "./context/display"
+import { useVSCode } from "./context/vscode"
+import { useServer } from "./context/server"
+import { useProvider } from "./context/provider"
 import { WorkStyleProvider } from "./context/work-style"
-import { IndexingProvider } from "./context/indexing"
-import { AgentRequirementsProvider } from "./context/agent-requirements"
-import { MemoryProvider } from "./context/memory"
-import { SessionProvider, useSession } from "./context/session"
+import { useSession } from "./context/session"
 import { LocalTabsProvider, useLocalTabs } from "./context/local-tabs"
-import { LanguageBridge } from "./context/language-bridge"
+import { ProviderShell } from "./context/provider-shell"
 import { ChatView } from "./components/chat"
 import { SidebarEmptyState } from "./components/chat/SidebarEmptyState"
 import { registerExpandedTaskTool } from "./components/chat/TaskToolExpanded"
 import { registerVscodeToolOverrides } from "./components/chat/VscodeToolOverrides"
-import { SpeechToTextPrewarm } from "./components/speech-to-text/SpeechToTextPrewarm"
 
 // Override the upstream "task" tool renderer with the fully-expanded version
 // that shows child session parts inline in the VS Code sidebar.
@@ -37,10 +21,6 @@ registerExpandedTaskTool()
 registerVscodeToolOverrides()
 import HistoryView from "./components/history/HistoryView"
 import { MigrationWizard } from "./components/migration" // legacy-migration
-import { NotificationsProvider } from "./context/notifications"
-import { FeedbackProvider } from "./context/feedback"
-import { KiloEmbeddingModelsProvider } from "./context/kilo-embedding-models"
-import { ImageModelsProvider } from "./context/image-models"
 import type { Message as SDKMessage, Part as SDKPart } from "@kilocode/sdk/v2"
 import { cycleAgent as cycle } from "./context/session-agent"
 import "./styles/chat.css"
@@ -210,27 +190,6 @@ export const DataBridge: Component<{ children: any }> = (props) => {
   )
 }
 
-type MermaidImageEvent = CustomEvent<{ dataUrl: string; filename: string }>
-
-export const MermaidDownloadBridge: Component = () => {
-  const vscode = useVSCode()
-
-  onMount(() => {
-    const save = (event: Event) => {
-      const detail = (event as MermaidImageEvent).detail
-      if (!detail?.dataUrl || !detail.filename) return
-      event.preventDefault()
-      vscode.postMessage({ type: "saveImage", dataUrl: detail.dataUrl, filename: detail.filename })
-    }
-    window.addEventListener("kilo:save-image", save)
-    onCleanup(() => {
-      window.removeEventListener("kilo:save-image", save)
-    })
-  })
-
-  return null
-}
-
 // Inner app component that uses the contexts
 const AppContent: Component = () => {
   const [currentView, setCurrentView] = createSignal<ViewType>("newTask")
@@ -412,59 +371,21 @@ const AppContent: Component = () => {
   )
 }
 
-// Main App component with context providers
 const App: Component = () => {
   return (
-    <ThemeProvider defaultTheme="kilo-vscode">
-      <DialogProvider>
-        <VSCodeProvider>
-          <MermaidDownloadBridge />
-          <ServerProvider>
-            <LanguageBridge>
-              <MarkedProvider>
-                <DiffComponentProvider component={Diff}>
-                  <CodeComponentProvider component={Code}>
-                    <FileComponentProvider component={File}>
-                      <ProviderProvider>
-                        <ConfigProvider>
-                          <SpeechToTextPrewarm />
-                          <DisplayProvider>
-                            <WorkStyleProvider>
-                              <IndexingProvider>
-                                <KiloEmbeddingModelsProvider>
-                                  <ImageModelsProvider>
-                                    <NotificationsProvider>
-                                      <SessionProvider>
-                                        <LocalTabsProvider>
-                                          <AgentRequirementsProvider>
-                                            <MemoryProvider>
-                                              <FeedbackProvider>
-                                                <DataBridge>
-                                                  <AppContent />
-                                                </DataBridge>
-                                              </FeedbackProvider>
-                                            </MemoryProvider>
-                                          </AgentRequirementsProvider>
-                                        </LocalTabsProvider>
-                                      </SessionProvider>
-                                    </NotificationsProvider>
-                                  </ImageModelsProvider>
-                                </KiloEmbeddingModelsProvider>
-                              </IndexingProvider>
-                            </WorkStyleProvider>
-                          </DisplayProvider>
-                        </ConfigProvider>
-                      </ProviderProvider>
-                    </FileComponentProvider>
-                  </CodeComponentProvider>
-                </DiffComponentProvider>
-              </MarkedProvider>
-            </LanguageBridge>
-          </ServerProvider>
-        </VSCodeProvider>
-        <Toast.Region />
-      </DialogProvider>
-    </ThemeProvider>
+    <ProviderShell.Root>
+      <WorkStyleProvider>
+        <ProviderShell.Session>
+          <LocalTabsProvider>
+            <ProviderShell.Chat>
+              <DataBridge>
+                <AppContent />
+              </DataBridge>
+            </ProviderShell.Chat>
+          </LocalTabsProvider>
+        </ProviderShell.Session>
+      </WorkStyleProvider>
+    </ProviderShell.Root>
   )
 }
 
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
index 40e0b72876..e5aa67b906 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
@@ -70,6 +70,8 @@ import {
   type TranscriptHold,
   type TranscriptRow,
 } from "../../context/transcript-rows"
+import { PromptRail } from "./PromptRail"
+import { capacity, historyAction, promptItems, railEntries, type PromptRailItem } from "./prompt-rail"
 import { onTimelineHighlight, type TimelineHighlight } from "../../utils/timeline/highlight"
 import { useTranscriptSearch, type SearchMatch } from "../../context/transcript-search"
 import { applyTranscriptHighlights, clearTranscriptHighlights } from "./transcript-search-highlight"
@@ -164,6 +166,8 @@ export const MessageList: Component<MessageListProps> = (props) => {
   const [scrollEl, setScrollEl] = createSignal<HTMLElement>()
   const [virtualizer, setVirtualizer] = createSignal<VirtualizerHandle>()
   const [layout, setLayout] = createSignal("")
+  // Transcript height, kept reactive so the prompt rail re-caps on resize.
+  const [height, setHeight] = createSignal(0)
 
   const revert = () => session.revert() ?? undefined
   const turns = createMemo((prev: MessageTurn[] | undefined) =>
@@ -905,8 +909,8 @@ export const MessageList: Component<MessageListProps> = (props) => {
         // entirely to the precise per-occurrence check in paintHighlights,
         // which only scrolls when the exact match actually needs it.
         if (!mounted) {
-          const index = keys().indexOf(match.key)
-          if (index >= 0) {
+          const index = indexes().get(match.key)
+          if (index !== undefined) {
             virtualizer()?.scrollToIndex(index, { align: "center" })
           }
         }
@@ -942,8 +946,65 @@ export const MessageList: Component<MessageListProps> = (props) => {
   const tail = createMemo(() => partition().direct.map((row) => row.key))
   const lookup = createMemo(() => new Map(partition().direct.map((row) => [row.key, row])))
   const keys = createMemo(() => partition().virtual.map((row) => row.key))
+  const indexes = createMemo(() => new Map(keys().map((key, index) => [key, index])))
   const fingerprint = createMemo(() => rowFingerprint(keys()))
 
+  const [pending, setPending] = createSignal<{ sid: string; key: string }>()
+
+  // Scrolls the transcript to a row by key. Virtualized rows jump through
+  // the virtualizer; direct/live/queued rows are mounted, so they use
+  // scrollIntoView. Pauses auto-follow first so the jump isn't snapped back.
+  const jump = (key: string) => {
+    autoScroll.pause()
+    const index = indexes().get(key)
+    if (index !== undefined) {
+      const handle = virtualizer()
+      if (handle) {
+        setPending(undefined)
+        handle.scrollToIndex(index, { align: "start" })
+        return
+      }
+      const sid = session.currentSessionID()
+      if (sid) setPending({ sid, key })
+      return
+    }
+    const el = scrollEl()
+    const target = el?.querySelector<HTMLElement>(`[data-row-key="${CSS.escape(key)}"]`)
+    if (target) {
+      setPending(undefined)
+      target.scrollIntoView({ block: "start" })
+      return
+    }
+    const sid = session.currentSessionID()
+    if (sid) setPending({ sid, key })
+  }
+
+  // Keep unresolved targets by stable row key. Virtual rows resolve once
+  // Virtua installs its handle; direct/live rows resolve once Solid mounts
+  // their DOM node.
+  createEffect(() => {
+    const target = pending()
+    if (!target) return
+    if (target.sid !== session.currentSessionID()) {
+      setPending(undefined)
+      return
+    }
+    const index = indexes().get(target.key)
+    const handle = virtualizer()
+    if (index !== undefined && handle) {
+      setPending(undefined)
+      autoScroll.pause()
+      handle.scrollToIndex(index, { align: "start" })
+      return
+    }
+    const el = scrollEl()
+    const row = el?.querySelector<HTMLElement>(`[data-row-key="${CSS.escape(target.key)}"]`)
+    if (!row) return
+    setPending(undefined)
+    autoScroll.pause()
+    row.scrollIntoView({ block: "start" })
+  })
+
   // Clicking a bar in the task timeline scrolls the transcript to that message.
   // Jumps land instantly (no smooth animation): while pinned at the bottom, a
   // smooth scroll's initial frames sit within createAutoScroll's near-bottom
@@ -956,19 +1017,110 @@ export const MessageList: Component<MessageListProps> = (props) => {
     // actually contains the clicked part, not just the message's first chunk.
     const row = matches.find((r) => r.type === "assistant" && r.parts.some((p) => p.id === detail.partId)) ?? matches[0]
     if (!row) return
-    autoScroll.pause()
-    const index = keys().indexOf(row.key)
-    if (index >= 0) {
-      virtualizer()?.scrollToIndex(index, { align: "start" })
-      return
-    }
-    const el = scrollEl()
-    const target = el?.querySelector<HTMLElement>(`[data-row-key="${CSS.escape(row.key)}"]`)
-    target?.scrollIntoView({ block: "start" })
+    jump(row.key)
   }
   window.addEventListener("scrollToMessage", onScrollToMessage)
   onCleanup(() => window.removeEventListener("scrollToMessage", onScrollToMessage))
 
+  // Prompt rail: one tick per user prompt, positioned to the left of the
+  // readable lane, opening a card of prompt/answer previews on hover.
+  const items = createMemo(() => promptItems(rows()))
+  // Until the transcript is measured there is no height to cap against, and
+  // rendering every prompt would spill ticks past the rail on long sessions.
+  const entries = createMemo(() => railEntries(items(), capacity(height()), session.hasOlderMessages()))
+  const [activeTurn, setActiveTurn] = createSignal<string>()
+  const railActiveKey = createMemo(() => items().find((item) => item.turn === activeTurn())?.key)
+
+  const [seek, setSeek] = createSignal<{ sid: string; count: number }>()
+  let paging = false
+
+  const first = () => {
+    const item = items()[0]
+    if (!session.hasOlderMessages()) {
+      if (item) jump(item.key)
+      return
+    }
+    const sid = session.currentSessionID()
+    if (!sid || session.loadingOlderMessages()) return
+    setSeek({ sid, count: session.messages().length })
+    if (!session.loadOlderMessages()) setSeek(undefined)
+  }
+
+  // Loading the first prompt is deliberate and progressive: each completed
+  // prepend advances the existing page cursor, while hover/open remains free
+  // of network and full-history work. Stop if a request makes no progress so
+  // backend failures cannot turn into a retry loop.
+  createEffect(() => {
+    const loading = session.loadingOlderMessages()
+    const target = seek()
+    if (!target) {
+      paging = loading
+      return
+    }
+    if (target.sid !== session.currentSessionID()) {
+      paging = false
+      setSeek(undefined)
+      return
+    }
+    if (loading) {
+      paging = true
+      return
+    }
+    if (!paging) return
+    paging = false
+    const count = session.messages().length
+    const action = historyAction(target.count, count, session.hasOlderMessages())
+    if (action === "stop") {
+      const item = items()[0]
+      setSeek(undefined)
+      if (item) jump(item.key)
+      return
+    }
+    if (action === "load") {
+      setSeek({ sid: target.sid, count })
+      if (!session.loadOlderMessages()) setSeek(undefined)
+      return
+    }
+    const item = items()[0]
+    setSeek(undefined)
+    if (item) jump(item.key)
+  })
+
+  const trackActive = () => {
+    const list = items()
+    if (list.length === 0) return setActiveTurn(undefined)
+    const handle = virtualizer()
+    const offset = handle?.scrollOffset
+    if (handle && offset !== undefined && offset > 1) {
+      const row = partition().virtual[handle.findItemIndex(offset)]
+      if (row) return setActiveTurn(row.turn)
+    }
+    const el = scrollEl()
+    if (handle && el && el.scrollHeight > el.clientHeight + 1) {
+      const row = partition().virtual[0]
+      if (row) return setActiveTurn(row.turn)
+    }
+    setActiveTurn(list.at(-1)?.turn)
+  }
+  let activeFrame: number | undefined
+  const scheduleActive = () => {
+    if (activeFrame !== undefined) return
+    activeFrame = requestAnimationFrame(() => {
+      activeFrame = undefined
+      trackActive()
+    })
+  }
+  onCleanup(() => {
+    if (activeFrame !== undefined) cancelAnimationFrame(activeFrame)
+  })
+  // Re-derive the active turn whenever the transcript changes so the rail
+  // reflects a newly started turn even before any scrolling happens.
+  createEffect(() => {
+    items()
+    partition()
+    scheduleActive()
+  })
+
   // Highlights the part behind the currently hovered/focused timeline bar
   // (dispatched by TaskTimeline) so the two stay visually correlated.
   const [highlight, setHighlight] = createSignal<TimelineHighlight>()
@@ -1018,6 +1170,7 @@ export const MessageList: Component<MessageListProps> = (props) => {
   const handleScroll = () => {
     autoScroll.handleScroll()
     maybeLoadOlder()
+    scheduleActive()
     if (search.active()) scheduleHighlight()
   }
 
@@ -1026,6 +1179,7 @@ export const MessageList: Component<MessageListProps> = (props) => {
     const el = scrollEl()
     if (!el) return
     const style = getComputedStyle(el)
+    setHeight(el.clientHeight)
     setLayout(
       layoutFingerprint({
         width: Math.round(el.clientWidth),
@@ -1210,6 +1364,28 @@ export const MessageList: Component<MessageListProps> = (props) => {
         </div>
       </div>
 
+      <PromptRail
+        entries={entries}
+        items={items}
+        active={() => railActiveKey()}
+        onSelect={(item: PromptRailItem) => jump(item.key)}
+        onFirst={first}
+        onLatest={() => {
+          const item = items().at(-1)
+          if (item) jump(item.key)
+        }}
+        onLoadOlder={() => session.loadOlderMessages()}
+        onWheel={(deltaY: number) => {
+          const el = scrollEl()
+          if (el) el.scrollTop += deltaY
+        }}
+        height={height}
+        hasOlder={session.hasOlderMessages}
+        loadingOlder={session.loadingOlderMessages}
+        prepending={() => session.messageMutation() === "prepend"}
+        seeking={() => Boolean(seek())}
+      />
+
       <Show when={autoScroll.userScrolled()}>
         <button
           class="scroll-to-bottom-button"
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PromptRail.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PromptRail.tsx
new file mode 100644
index 0000000000..857e4fa634
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptRail.tsx
@@ -0,0 +1,406 @@
+/** @jsxImportSource solid-js */
+
+/**
+ * PromptRail component
+ * Thin vertical summary rail on the left edge of the transcript. Hovering or
+ * focusing opens a bounded navigator for every loaded prompt; clicking jumps
+ * the virtualized transcript without mounting the intervening rows.
+ */
+
+import { IconButton } from "@kilocode/kilo-ui/icon-button"
+import { Spinner } from "@kilocode/kilo-ui/spinner"
+import { Tooltip } from "@kilocode/kilo-ui/tooltip"
+import { For, Show, createEffect, createMemo, createSignal, onCleanup, type Accessor } from "solid-js"
+import { Portal } from "solid-js/web"
+import { VList, type VListHandle } from "virtua/solid"
+import { useLanguage } from "../../context/language"
+import { RAIL_INSET, ROW_HEIGHT, TICK_MIN, TICK_STEP, type PromptRailEntry, type PromptRailItem } from "./prompt-rail"
+
+interface PromptRailProps {
+  entries: Accessor<PromptRailEntry[]>
+  items: Accessor<PromptRailItem[]>
+  /** Row key of the item whose turn is currently at the top of the transcript. */
+  active: Accessor<string | undefined>
+  onSelect: (item: PromptRailItem) => void
+  onFirst: () => void
+  onLatest: () => void
+  onLoadOlder: () => void
+  /** Forwards wheel events so scrolling over a tick scrolls the transcript. */
+  onWheel: (deltaY: number) => void
+  /** Transcript height, used to spread the ticks. */
+  height: Accessor<number>
+  hasOlder: Accessor<boolean>
+  loadingOlder: Accessor<boolean>
+  prepending: Accessor<boolean>
+  seeking: Accessor<boolean>
+}
+
+const CLOSE_DELAY = 120
+const EDGE = 12
+const GAP = 8
+const VIRTUAL_LIMIT = 30
+const CARD_CHROME = 44
+const NEAR_TOP = 200
+
+export function PromptRail(props: PromptRailProps) {
+  const language = useLanguage()
+  const [open, setOpen] = createSignal(false)
+  const [hover, setHover] = createSignal<string>()
+  const [focused, setFocused] = createSignal<number>()
+  const [anchor, setAnchor] = createSignal<{ top: number; left: number; height: number }>()
+  let rail: HTMLElement | undefined
+  let card: HTMLDivElement | undefined
+  let list: VListHandle | undefined
+  let timer: ReturnType<typeof setTimeout> | undefined
+  let frame: number | undefined
+  let revealing = false
+
+  const items = createMemo(() => props.items())
+  const entries = createMemo(() => props.entries())
+  const virtualized = createMemo(() => items().length > VIRTUAL_LIMIT)
+  // Ticks are spread over the available height, tightening as prompts pile up
+  // but never growing past their natural step nor packing tighter than a tick
+  // can still be aimed at.
+  const step = createMemo(() => {
+    const count = entries().length
+    if (count === 0) return TICK_STEP
+    return Math.max(TICK_MIN, Math.min(TICK_STEP, Math.floor((props.height() - RAIL_INSET) / count)))
+  })
+
+  // Reaching the top of the navigator pages older history in, the same way the
+  // transcript itself loads earlier messages when scrolled near its top. Opening
+  // the card scrolls the hovered prompt into view, which would otherwise look
+  // like a scroll to the top and fetch on hover, so programmatic reveals are
+  // excluded and only scrolling the user drove pages.
+  const offset = () => (virtualized() ? (list?.scrollOffset ?? 0) : (card?.scrollTop ?? 0))
+
+  const page = (value: number) => {
+    if (revealing || value > NEAR_TOP) return
+    if (!props.hasOlder() || props.loadingOlder() || props.seeking()) return
+    props.onLoadOlder()
+  }
+
+  // Centers the card on the tick group so each row sits beside its own tick,
+  // then keeps it inside the transcript and the viewport. The rail spans the
+  // transcript exactly (top/bottom 0), so its own rect doubles as those bounds
+  // and the card never rides up over the task header or down over the composer.
+  // Before the card is mounted its height is estimated from the row count; the
+  // measured value takes over on the next frame, inside the fade-in.
+  const place = () => {
+    if (!rail) return
+    const rect = rail.getBoundingClientRect()
+    const limit = Math.max(0, Math.min(window.innerHeight - EDGE * 2, rect.height - 8))
+    if (limit === 0) return
+    const estimate = Math.min(items().length * ROW_HEIGHT + CARD_CHROME, limit)
+    const height = virtualized() ? limit : (card?.offsetHeight ?? estimate)
+    const min = Math.max(EDGE, rect.top + 4)
+    const max = Math.min(window.innerHeight - EDGE, rect.bottom - 4) - height
+    const center = rect.top + rect.height / 2 - height / 2
+    setAnchor({
+      top: max < min ? min : Math.min(Math.max(center, min), max),
+      left: rect.right + GAP,
+      height: limit,
+    })
+  }
+
+  const cancelClose = () => {
+    if (timer !== undefined) clearTimeout(timer)
+    timer = undefined
+  }
+
+  const reveal = (index: number) => {
+    if (frame !== undefined) cancelAnimationFrame(frame)
+    revealing = true
+    frame = requestAnimationFrame(() => {
+      frame = undefined
+      if (virtualized()) {
+        list?.scrollToIndex(index, { align: "center" })
+        return
+      }
+      const row = card?.querySelector<HTMLElement>(`[data-prompt-index="${index}"]`)
+      if (!row || !card) return
+      card.scrollTop = Math.max(0, row.offsetTop - card.clientHeight / 2 + row.offsetHeight / 2)
+    })
+  }
+
+  const entryItem = (entry: PromptRailEntry) => {
+    if (entry.type === "prompt") return entry.item
+    return items()[entry.type === "overflow" ? entry.index : 0]
+  }
+
+  const openCard = (index: number) => {
+    cancelClose()
+    const entry = entries()[index]
+    const item = entry && entryItem(entry)
+    setFocused(index)
+    setHover(item?.key)
+    place()
+    setOpen(true)
+    if (item) reveal(items().findIndex((candidate) => candidate.key === item.key))
+  }
+
+  const closeCard = () => {
+    cancelClose()
+    timer = setTimeout(() => {
+      setOpen(false)
+      setHover(undefined)
+    }, CLOSE_DELAY)
+  }
+
+  onCleanup(cancelClose)
+  onCleanup(() => {
+    if (frame !== undefined) cancelAnimationFrame(frame)
+  })
+
+  // Resizing the panel moves the rail out from under an open card.
+  createEffect(() => {
+    if (!open()) return
+    const onResize = () => place()
+    window.addEventListener("resize", onResize)
+    onCleanup(() => window.removeEventListener("resize", onResize))
+  })
+
+  // Re-place once the card is measurable, so rows that wrap differently than
+  // the estimate still end up centered on the ticks.
+  createEffect(() => {
+    if (!open() || !card) return
+    const frame = requestAnimationFrame(() => place())
+    onCleanup(() => cancelAnimationFrame(frame))
+  })
+
+  let seeking = false
+  createEffect(() => {
+    const next = props.seeking()
+    if (seeking && !next && !props.hasOlder()) {
+      const item = items()[0]
+      setHover(item?.key)
+      if (item) reveal(0)
+    }
+    seeking = next
+  })
+
+  const onKeyDown = (event: KeyboardEvent) => {
+    const values = entries()
+    const current = focused() ?? 0
+    if (event.key === "Escape") {
+      event.preventDefault()
+      cancelClose()
+      setOpen(false)
+      setHover(undefined)
+      return
+    }
+    if (event.key === "Enter" || event.key === " ") {
+      event.preventDefault()
+      const entry = values[current]
+      if (!entry) return
+      if (entry.type === "prompt") props.onSelect(entry.item)
+      if (entry.type === "history") props.onFirst()
+      if (entry.type === "overflow") openCard(current)
+      return
+    }
+    const next =
+      event.key === "ArrowDown"
+        ? Math.min(values.length - 1, current + 1)
+        : event.key === "ArrowUp"
+          ? Math.max(0, current - 1)
+          : event.key === "Home"
+            ? 0
+            : event.key === "End"
+              ? values.length - 1
+              : undefined
+    if (next === undefined) return
+    event.preventDefault()
+    const tick = rail?.querySelectorAll<HTMLElement>(".prompt-rail-tick")[next]
+    tick?.focus()
+    openCard(next)
+  }
+
+  const label = (item: PromptRailItem, index: number) =>
+    language.t("session.prompts.tick", { index: index + 1, total: items().length, prompt: item.prompt })
+
+  const entryLabel = (entry: PromptRailEntry) => {
+    if (entry.type === "prompt") return label(entry.item, entry.index)
+    if (entry.type === "history") return language.t("session.prompts.first")
+    return language.t("session.prompts.overflow", { count: entry.count })
+  }
+
+  const entryActive = (entry: PromptRailEntry) => {
+    if (entry.type === "prompt") return entry.item.key === props.active()
+    if (entry.type === "history") return false
+    const index = items().findIndex((item) => item.key === props.active())
+    return index >= entry.index && index < entry.index + entry.count
+  }
+
+  const selectFirst = () => {
+    const item = items()[0]
+    setHover(item?.key)
+    if (item) reveal(0)
+    props.onFirst()
+  }
+
+  const selectLatest = () => {
+    const index = items().length - 1
+    const item = items()[index]
+    setHover(item?.key)
+    if (item) reveal(index)
+    props.onLatest()
+  }
+
+  const row = (item: PromptRailItem, index: Accessor<number>) => (
+    <button
+      type="button"
+      class="prompt-rail-row"
+      classList={{ "prompt-rail-row--hover": item.key === hover() }}
+      data-prompt-index={index()}
+      aria-label={label(item, index())}
+      onMouseEnter={() => setHover(item.key)}
+      onClick={() => props.onSelect(item)}
+    >
+      <span class="prompt-rail-row-prompt" data-queued={item.queued || undefined}>
+        <Show when={item.queued}>
+          <span class="prompt-rail-row-status">{language.t("session.prompts.queued")} · </span>
+        </Show>
+        {item.prompt}
+      </span>
+      <Show when={item.answer || !item.prompt}>
+        <span class="prompt-rail-row-answer">{item.answer || language.t("session.prompts.noAnswer")}</span>
+      </Show>
+    </button>
+  )
+
+  return (
+    <Show when={entries().length >= 2}>
+      <nav
+        ref={rail}
+        class="prompt-rail"
+        aria-label={language.t("session.prompts.navLabel")}
+        style={{ "--prompt-rail-step": `${step()}px` }}
+        onMouseLeave={closeCard}
+        onFocusOut={(event) => {
+          if (card?.contains(event.relatedTarget as Node)) return
+          closeCard()
+        }}
+        onKeyDown={onKeyDown}
+        onWheel={(event) => {
+          event.preventDefault()
+          props.onWheel(event.deltaY)
+        }}
+      >
+        <For each={entries()}>
+          {(entry, index) => (
+            <button
+              type="button"
+              class="prompt-rail-tick"
+              classList={{
+                "prompt-rail-tick--active": entryActive(entry),
+                "prompt-rail-tick--open": open() && index() === focused(),
+                "prompt-rail-tick--overflow": entry.type !== "prompt",
+              }}
+              data-queued={(entry.type === "prompt" && entry.item.queued) || undefined}
+              aria-label={entryLabel(entry)}
+              tabIndex={index() === (focused() ?? 0) ? 0 : -1}
+              onMouseEnter={() => openCard(index())}
+              onFocus={() => openCard(index())}
+              onClick={() => {
+                if (entry.type === "prompt") props.onSelect(entry.item)
+                if (entry.type === "history") selectFirst()
+                if (entry.type === "overflow") openCard(index())
+              }}
+            >
+              <span class="prompt-rail-tick-line" />
+            </button>
+          )}
+        </For>
+      </nav>
+
+      <Show when={open() && anchor()}>
+        {(position) => (
+          <Portal>
+            <div
+              ref={card}
+              class="prompt-rail-card"
+              data-virtualized={virtualized() || undefined}
+              role="dialog"
+              aria-label={language.t("session.prompts.navLabel")}
+              style={{
+                top: `${position().top}px`,
+                left: `${position().left}px`,
+                "--prompt-rail-card-height": `${position().height}px`,
+              }}
+              onMouseEnter={cancelClose}
+              onMouseLeave={closeCard}
+              onWheel={(event) => {
+                // A reveal placed the list here, so any wheel from now on is the
+                // user's. Scrolling up at the very top emits no scroll event, so
+                // the intent to go further back has to be read from the wheel.
+                revealing = false
+                if (event.deltaY < 0) page(offset())
+              }}
+              onScroll={() => {
+                if (card && !virtualized()) page(card.scrollTop)
+              }}
+            >
+              <div class="prompt-rail-card-header">
+                <span class="prompt-rail-card-title">{language.t("session.prompts.navLabel")}</span>
+                <div class="prompt-rail-card-actions">
+                  <Tooltip value={language.t("session.prompts.first")} placement="top">
+                    <IconButton
+                      icon="arrow-up"
+                      label={language.t("session.prompts.first")}
+                      aria-label={language.t("session.prompts.first")}
+                      variant="ghost"
+                      size="small"
+                      disabled={props.seeking() || props.loadingOlder()}
+                      onClick={selectFirst}
+                    />
+                  </Tooltip>
+                  <Tooltip value={language.t("session.prompts.latest")} placement="top">
+                    <IconButton
+                      icon="arrow-down-to-line"
+                      label={language.t("session.prompts.latest")}
+                      aria-label={language.t("session.prompts.latest")}
+                      variant="ghost"
+                      size="small"
+                      onClick={selectLatest}
+                    />
+                  </Tooltip>
+                </div>
+              </div>
+              <Show when={props.loadingOlder() || props.seeking()}>
+                <div class="prompt-rail-loading" role="status">
+                  <Spinner />
+                  <span>{language.t("session.messages.loadingEarlier")}</span>
+                </div>
+              </Show>
+              <Show
+                when={virtualized()}
+                fallback={
+                  <div class="prompt-rail-list-static">
+                    <For each={items()}>{row}</For>
+                  </div>
+                }
+              >
+                <VList
+                  ref={(handle) => {
+                    list = handle
+                  }}
+                  class="prompt-rail-list"
+                  data={items()}
+                  itemSize={ROW_HEIGHT}
+                  bufferSize={ROW_HEIGHT * 3}
+                  shift={props.prepending()}
+                  onScroll={page}
+                  onScrollEnd={() => {
+                    revealing = false
+                  }}
+                >
+                  {row}
+                </VList>
+              </Show>
+            </div>
+          </Portal>
+        )}
+      </Show>
+    </Show>
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/QuestionDock.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/QuestionDock.tsx
index 736c6355a0..74fa8f1ba7 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/QuestionDock.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/QuestionDock.tsx
@@ -348,7 +348,9 @@ export const QuestionDock: Component<{ request: QuestionRequest }> = (props) =>
         <div data-slot="question-dock-header-content">
           <div data-slot="question-header-title">{summary()}</div>
           <Show when={store.collapsed}>
-            <div data-slot="question-collapsed-preview">{questionText()}</div>
+            <div data-slot="question-collapsed-preview" dir="auto">
+              {questionText()}
+            </div>
           </Show>
         </div>
         <div data-slot="question-header-actions" onClick={(e: MouseEvent) => e.stopPropagation()}>
@@ -391,7 +393,9 @@ export const QuestionDock: Component<{ request: QuestionRequest }> = (props) =>
       <div data-slot="question-dock-body" inert={store.collapsed || undefined}>
         <div data-slot="question-dock-body-inner">
           <Show when={!confirm()}>
-            <div data-slot="question-text">{questionText()}</div>
+            <div data-slot="question-text" dir="auto">
+              {questionText()}
+            </div>
             <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
               <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
             </Show>
@@ -419,9 +423,13 @@ export const QuestionDock: Component<{ request: QuestionRequest }> = (props) =>
                         </span>
                       </span>
                       <span data-slot="question-option-main">
-                        <span data-slot="option-label">{localized.label()}</span>
+                        <span data-slot="option-label" dir="auto">
+                          {localized.label()}
+                        </span>
                         <Show when={localized.description()}>
-                          <span data-slot="option-description">{localized.description()}</span>
+                          <span data-slot="option-description" dir="auto">
+                            {localized.description()}
+                          </span>
                         </Show>
                       </span>
                     </button>
@@ -498,8 +506,10 @@ export const QuestionDock: Component<{ request: QuestionRequest }> = (props) =>
                   const answered = () => Boolean(value())
                   return (
                     <div data-slot="review-item">
-                      <span data-slot="review-label">{tr(language.t, q.questionKey, q.question)}</span>
-                      <span data-slot="review-value" data-answered={answered()}>
+                      <span data-slot="review-label" dir="auto">
+                        {tr(language.t, q.questionKey, q.question)}
+                      </span>
+                      <span data-slot="review-value" data-answered={answered()} dir="auto">
                         {answered() ? value() : language.t("ui.question.review.notAnswered")}
                       </span>
                     </div>
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/SessionMentionPicker.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/SessionMentionPicker.tsx
index 24abafa27b..7471b99610 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/SessionMentionPicker.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/SessionMentionPicker.tsx
@@ -42,7 +42,7 @@ export function SessionMentionPicker(props: Props) {
       <List<SessionSearchItem>
         items={props.sessions}
         key={(item) => item.id}
-        filterKeys={["title"]}
+        filterKeys={["title", "worktreeName"]}
         search={{ placeholder: "Search sessions", autofocus: true }}
         onSelect={(item) => {
           if (item) props.onSelect(item)
@@ -52,6 +52,7 @@ export function SessionMentionPicker(props: Props) {
           <span class="session-mention-item">
             <Icon name="history" class="file-mention-icon" />
             <span class="session-mention-title">{item.title}</span>
+            {item.worktreeName && <span class="session-mention-worktree">{item.worktreeName}</span>}
             <span class="session-mention-time">{formatRelativeDate(new Date(item.updated).toISOString())}</span>
           </span>
         )}
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/SuggestBar.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/SuggestBar.tsx
index 2eac797698..63cc677ad6 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/SuggestBar.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/SuggestBar.tsx
@@ -30,7 +30,9 @@ export const SuggestBar: Component<{ request: SuggestionRequest }> = (props) =>
         <span data-slot="suggest-bar-icon">
           <Icon name="brain" size="small" />
         </span>
-        <span data-slot="suggest-bar-text">{props.request.text}</span>
+        <span data-slot="suggest-bar-text" dir="auto">
+          {props.request.text}
+        </span>
       </div>
       <Show when={error()}>
         <div data-slot="suggest-bar-error">
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TabDnd.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TabDnd.tsx
index 37c650a228..bd86ada3d5 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TabDnd.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TabDnd.tsx
@@ -27,13 +27,13 @@ export const ConstrainDragYAxis: Component = () => {
   return null
 }
 
-export const SortableTabContainer: ParentComponent<{ id: string }> = (props) => {
+export const SortableTabContainer: ParentComponent<{ id: string; class?: string }> = (props) => {
   const sortable = createSortable(props.id)
   void sortable
   return (
     <div
       use:sortable
-      class="am-tab-sortable"
+      class={props.class ?? "am-tab-sortable"}
       classList={{ "am-tab-dragging": sortable.isActiveDraggable }}
       data-tab-id={props.id}
     >
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/prompt-rail.ts b/packages/kilo-vscode/webview-ui/src/components/chat/prompt-rail.ts
new file mode 100644
index 0000000000..b18b76da44
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/prompt-rail.ts
@@ -0,0 +1,144 @@
+import type { Part } from "../../types/messages"
+import type { TranscriptRow } from "../../context/transcript-rows"
+
+export interface PromptRailItem {
+  key: string
+  turn: string
+  queued: boolean
+  prompt: string
+  answer: string
+}
+
+export type PromptRailEntry =
+  | { type: "prompt"; item: PromptRailItem; index: number }
+  | { type: "overflow"; count: number; index: number }
+  | { type: "history" }
+
+const PROMPT_LIMIT = 160
+const ANSWER_LIMIT = 220
+
+/**
+ * Height of the tallest card row (padding + a one-line prompt + a two-line
+ * answer). Sizes the navigator's virtualized rows; the rail's own fit cap is
+ * measured in tick spacing instead, since a tick is only a hairline.
+ */
+export const ROW_HEIGHT = 76
+/** Vertical padding reserved at the top and bottom of the rail. */
+export const RAIL_INSET = 24
+/** Natural spacing between ticks, and the tightest they are allowed to pack. */
+export const TICK_STEP = 14
+export const TICK_MIN = 7
+
+/**
+ * How many ticks fit the available transcript height. Measured in tick
+ * spacing, not card row height: a tick is a 1.5px line, so the rail holds
+ * several times more prompts than the navigator can list at once, and
+ * summarizing at the card's row count would hide prompts that have room to
+ * show. The complete prompt list lives in the bounded navigator.
+ */
+export function capacity(height: number): number {
+  return Math.floor((height - RAIL_INSET) / TICK_MIN)
+}
+
+export function historyAction(before: number, after: number, more: boolean): "stop" | "load" | "jump" {
+  if (after <= before) return "stop"
+  return more ? "load" : "jump"
+}
+
+// The card never renders markdown — user message text shows literally, and
+// assistant text should too. Code spans (inline and fenced) are dropped, and
+// link URLs / images are stripped rather than parsed (mirrors MessageList's
+// stripMarkdownLinkUrls split so bracket text inside inline code stays out,
+// not half-stripped).
+export function previewText(raw: string): string {
+  const segments = raw.split(/(```[\s\S]*?```|`[^`\n]*`)/g)
+  const text = segments.map((segment, i) => (i % 2 === 1 ? "" : stripLinks(segment))).join(" ")
+  return text
+    .replace(/^#{1,6}\s+/gm, "")
+    .replace(/^\s*[-*>+]\s+/gm, "")
+    .replace(/\s+/g, " ")
+    .trim()
+}
+
+function stripLinks(text: string) {
+  return text.replace(/!\[[^\]]*\]\([^)]*\)/g, "").replace(/\[([^\]]*)\]\([^)]*\)/g, "$1")
+}
+
+function text(parts: Part[], limit: number): string {
+  const joined = parts
+    .filter((part) => part.type === "text" && !part.synthetic && part.text.trim())
+    .map((part) => (part.type === "text" ? part.text : ""))
+    .join("\n")
+  return truncate(previewText(joined), limit)
+}
+
+function truncate(value: string, limit: number) {
+  return value.length <= limit ? value : `${value.slice(0, limit - 1)}…`
+}
+
+export function promptItems(rows: TranscriptRow[]): PromptRailItem[] {
+  const items: PromptRailItem[] = []
+  for (const row of rows) {
+    if (row.type !== "user") continue
+    items.push({ key: row.key, turn: row.turn, queued: row.queued, prompt: text(row.parts, PROMPT_LIMIT), answer: "" })
+  }
+  // Answer text is grouped by turn so one pass fills every item; assistant
+  // rows follow their user row and carry the same `turn` id.
+  let index = 0
+  for (const row of rows) {
+    if (row.type === "user") {
+      index += 1
+      continue
+    }
+    if (row.type !== "assistant" || index === 0) continue
+    const item = items[index - 1]!
+    if (item.turn !== row.turn || item.answer) continue
+    const value = text(row.parts, ANSWER_LIMIT)
+    if (value) item.answer = value
+  }
+  // A prompt can carry no text at all (image-only or file-only message). Rather
+  // than render a blank row, promote the answer into the label so the row still
+  // says something; if neither has text the card falls back to its placeholder.
+  for (const item of items) {
+    if (item.prompt || !item.answer) continue
+    item.prompt = truncate(item.answer, PROMPT_LIMIT)
+    item.answer = ""
+  }
+  return items
+}
+
+export function railEntries(items: PromptRailItem[], capacity: number, history = false): PromptRailEntry[] {
+  if (capacity < 1) return []
+  if (!history && items.length <= capacity) {
+    return items.map((item, index) => ({ type: "prompt", item, index }))
+  }
+  if (capacity === 1) {
+    if (history) return [{ type: "history" }]
+    const index = items.length - 1
+    const item = items[index]
+    return item ? [{ type: "prompt", item, index }] : []
+  }
+  if (capacity === 2) {
+    const item = items.at(-1)
+    const latest = item ? [{ type: "prompt" as const, item, index: items.length - 1 }] : []
+    if (history) return [{ type: "history" }, ...latest]
+    const first = items[0]
+    return first ? [{ type: "prompt", item: first, index: 0 }, ...latest] : latest
+  }
+
+  const count = Math.min(items.length, capacity - 2)
+  const start = items.length - count
+  const recent = items.slice(start).map((item, offset) => ({
+    type: "prompt" as const,
+    item,
+    index: start + offset,
+  }))
+  const prefix: PromptRailEntry[] = history
+    ? [{ type: "history" }]
+    : items[0]
+      ? [{ type: "prompt", item: items[0], index: 0 }]
+      : []
+  const hidden = start - (history ? 0 : 1)
+  if (hidden < 1) return [...prefix, ...recent]
+  return [...prefix, { type: "overflow", count: hidden, index: history ? 0 : 1 }, ...recent]
+}
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx
index 380f33efd9..508e835fe6 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx
@@ -17,7 +17,7 @@ import ModeEditView from "./ModeEditView"
 import ModeCreateView from "./ModeCreateView"
 import McpEditView from "./McpEditView"
 import WorkflowsTab from "./agent-behaviour/WorkflowsTab"
-import { selectedDefaultAgentValue } from "./agent-behaviour-patches"
+import { mcpConfigScope, mcpEnabledPatch, selectedDefaultAgentValue } from "./agent-behaviour-patches"
 import { parseImport, MAX_IMPORT_SIZE } from "./mode-io"
 import type { ImportError } from "./mode-io"
 
@@ -50,7 +50,7 @@ type AgentView = "list" | "create" | "edit"
 
 const AgentBehaviourTab: Component = () => {
   const language = useLanguage()
-  const { config, updateConfig } = useConfig()
+  const { config, collections, updateConfig, updateGlobalConfig, updateProjectConfig } = useConfig()
   const session = useSession()
   const dialog = useDialog()
   const vscode = useVSCode()
@@ -675,12 +675,17 @@ const AgentBehaviourTab: Component = () => {
                           <Switch
                             checked={isConnected(name)}
                             disabled={session.mcpLoading() === name}
-                            onChange={() => {
-                              if (isConnected(name)) {
-                                session.disconnectMcp(name)
-                              } else {
-                                session.connectMcp(name)
+                            onChange={(enabled: boolean) => {
+                              const scope = mcpConfigScope(name, collections())
+                              if (scope) {
+                                const update = scope === "project" ? updateProjectConfig : updateGlobalConfig
+                                update(mcpEnabledPatch(name, enabled))
                               }
+                              if (!enabled) {
+                                session.disconnectMcp(name)
+                                return
+                              }
+                              session.connectMcp(name)
                             }}
                             hideLabel
                           >
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/BrowserTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/BrowserTab.tsx
index 876a230f65..eee016f3f5 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/BrowserTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/BrowserTab.tsx
@@ -1,14 +1,32 @@
-import { Component, createSignal, onCleanup, onMount } from "solid-js"
+import { Component, Show, createSignal, onCleanup, onMount } from "solid-js"
 import { Switch } from "@kilocode/kilo-ui/switch"
 import { Card } from "@kilocode/kilo-ui/card"
 import { useVSCode } from "../../context/vscode"
 import { useLanguage } from "../../context/language"
+import { useConfig } from "../../context/config"
 import type { BrowserSettings } from "../../types/messages"
 import SettingsRow from "./SettingsRow"
 
+const Header: Component<{ title: string }> = (props) => (
+  <h4
+    style={{
+      margin: "0 0 12px",
+      "padding-bottom": "10px",
+      "border-bottom": "1px solid var(--vscode-panel-border)",
+      color: "var(--text-base, var(--vscode-foreground))",
+      "font-size": "var(--kilo-font-size-18, 18px)",
+      "font-weight": 600,
+      "line-height": "1.4",
+    }}
+  >
+    {props.title}
+  </h4>
+)
+
 const BrowserTab: Component = () => {
   const { postMessage, onMessage } = useVSCode()
   const { t } = useLanguage()
+  const { globalConfig, projectConfig, updateGlobalConfig } = useConfig()
 
   const [settings, setSettings] = createSignal<BrowserSettings>({
     enabled: false,
@@ -33,6 +51,12 @@ const BrowserTab: Component = () => {
     postMessage({ type: "updateSetting", key: `browserAutomation.${key}`, value })
   }
 
+  const updateWebsearch = (checked: boolean) => {
+    updateGlobalConfig({ web_search: checked })
+  }
+
+  const overridden = () => projectConfig().web_search !== undefined
+
   return (
     <div style={{ display: "flex", "flex-direction": "column", gap: "16px" }}>
       {/* Info text */}
@@ -52,43 +76,90 @@ const BrowserTab: Component = () => {
             "line-height": "1.5",
           }}
         >
-          {t("settings.browser.description")}
+          {t("settings.webTools.description")}
         </p>
       </div>
 
-      <Card>
-        {/* Enable toggle */}
-        <SettingsRow title={t("settings.browser.enable.title")} description={t("settings.browser.enable.description")}>
-          <Switch checked={settings().enabled} onChange={(checked: boolean) => update("enabled", checked)} hideLabel>
-            {t("settings.browser.enable.title")}
-          </Switch>
-        </SettingsRow>
-
-        {/* Use System Chrome */}
-        <SettingsRow
-          title={t("settings.browser.systemChrome.title")}
-          description={t("settings.browser.systemChrome.description")}
-        >
-          <Switch
-            checked={settings().useSystemChrome}
-            onChange={(checked: boolean) => update("useSystemChrome", checked)}
-            hideLabel
+      <div>
+        <Header title={t("settings.webTools.webSearch.title")} />
+        <Card>
+          <SettingsRow
+            title={t("settings.webTools.webSearch.enable")}
+            description={t("settings.webTools.webSearch.description")}
+            tag={() => t("settings.config.scope.global")}
+            last={!overridden()}
           >
-            {t("settings.browser.systemChrome.title")}
-          </Switch>
-        </SettingsRow>
+            <Switch checked={globalConfig().web_search ?? false} onChange={updateWebsearch} hideLabel>
+              {t("settings.webTools.webSearch.title")}
+            </Switch>
+          </SettingsRow>
+          <Show when={overridden()}>
+            <SettingsRow
+              title={t("settings.webTools.webSearch.enable")}
+              tag={() => t("settings.config.scope.local")}
+              last
+            >
+              <Switch checked={projectConfig().web_search ?? false} disabled hideLabel>
+                {`${t("settings.webTools.webSearch.title")} (${t("settings.config.scope.local")})`}
+              </Switch>
+            </SettingsRow>
+          </Show>
+        </Card>
+      </div>
 
-        {/* Headless mode */}
-        <SettingsRow
-          title={t("settings.browser.headless.title")}
-          description={t("settings.browser.headless.description")}
-          last
+      <div>
+        <Header title={t("settings.webTools.browserAutomation")} />
+        <p
+          style={{
+            margin: "0 0 12px",
+            color: "var(--vscode-descriptionForeground)",
+            "font-size": "var(--kilo-font-size-12)",
+            "line-height": "1.5",
+          }}
         >
-          <Switch checked={settings().headless} onChange={(checked: boolean) => update("headless", checked)} hideLabel>
-            {t("settings.browser.headless.title")}
-          </Switch>
-        </SettingsRow>
-      </Card>
+          {t("settings.browser.description")}
+        </p>
+        <Card>
+          {/* Enable toggle */}
+          <SettingsRow
+            title={t("settings.browser.enable.title")}
+            description={t("settings.browser.enable.description")}
+          >
+            <Switch checked={settings().enabled} onChange={(checked: boolean) => update("enabled", checked)} hideLabel>
+              {t("settings.browser.enable.title")}
+            </Switch>
+          </SettingsRow>
+
+          {/* Use System Chrome */}
+          <SettingsRow
+            title={t("settings.browser.systemChrome.title")}
+            description={t("settings.browser.systemChrome.description")}
+          >
+            <Switch
+              checked={settings().useSystemChrome}
+              onChange={(checked: boolean) => update("useSystemChrome", checked)}
+              hideLabel
+            >
+              {t("settings.browser.systemChrome.title")}
+            </Switch>
+          </SettingsRow>
+
+          {/* Headless mode */}
+          <SettingsRow
+            title={t("settings.browser.headless.title")}
+            description={t("settings.browser.headless.description")}
+            last
+          >
+            <Switch
+              checked={settings().headless}
+              onChange={(checked: boolean) => update("headless", checked)}
+              hideLabel
+            >
+              {t("settings.browser.headless.title")}
+            </Switch>
+          </SettingsRow>
+        </Card>
+      </div>
     </div>
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx
index cbd400f47b..badc9a87b5 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx
@@ -24,7 +24,7 @@ const SHARE_OPTIONS: ShareOption[] = [
 ]
 
 const ExperimentalTab: Component = () => {
-  const { config, updateConfig } = useConfig()
+  const { config, settings, updateConfig, applySetting } = useConfig()
   const language = useLanguage()
   const imageModels = useImageModels()
   const vscode = useVSCode()
@@ -251,6 +251,19 @@ const ExperimentalTab: Component = () => {
           </SettingsRow>
         </Show>
 
+        <SettingsRow
+          title={language.t("settings.experimental.multiProject.title")}
+          description={language.t("settings.experimental.multiProject.description")}
+        >
+          <Switch
+            checked={settings().multiProject === true}
+            onChange={(checked) => applySetting("multiProject", checked, "experimental.multiProject")}
+            hideLabel
+          >
+            {language.t("settings.experimental.multiProject.title")}
+          </Switch>
+        </SettingsRow>
+
         {/* MCP timeout */}
         <SettingsRow
           title={language.t("settings.experimental.mcpTimeout.title")}
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/IndexingTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/IndexingTab.tsx
index 07864b04ff..3988ec265e 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/IndexingTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/IndexingTab.tsx
@@ -12,6 +12,7 @@ import { useKiloEmbeddingModels } from "../../context/kilo-embedding-models"
 import { useLanguage } from "../../context/language"
 import { useProvider } from "../../context/provider"
 import { useServer } from "../../context/server"
+import { useVSCode } from "../../context/vscode"
 import type { IndexingConfig, IndexingProvider as ProviderId } from "../../types/messages"
 import { KILO_PROVIDER_ID } from "../../../../src/shared/provider-model"
 import SettingsRow from "./SettingsRow"
@@ -28,6 +29,7 @@ import {
 } from "./indexing-tab-state"
 
 type Option = { value: string; label: string }
+type Project = { id: string; root: string; label: string }
 type TuningKey = "searchMinScore" | "searchMaxResults" | "embeddingBatchSize" | "scannerMaxBatchRetries"
 
 const allProviders: { value: ProviderId; label: string }[] = [
@@ -92,6 +94,73 @@ function providerFields(provider: ProviderId | undefined): Array<{ key: string;
   return []
 }
 
+/** Config scope switcher plus the scope-derived enable switch. */
+const ScopeRows: Component<{
+  scope: IndexingScope
+  enabled: boolean
+  inherited: boolean
+  t: (key: string) => string
+  tag: () => string | undefined
+  onScope: (next: IndexingScope) => void
+  onEnabled: (next: boolean) => void
+}> = (props) => {
+  const scope = () => props.scope
+  const language = { t: props.t }
+  const enabled = () => props.enabled
+  const inherited = () => props.inherited
+  const changeScope = props.onScope
+  const saveEnabled = props.onEnabled
+  const tag = props.tag
+  return (
+    <>
+      <SettingsRow
+        title="Configuration scope"
+        description={
+          scope() === "global"
+            ? language.t("settings.indexing.globalEnable.description")
+            : language.t("settings.indexing.projectEnable.description")
+        }
+      >
+        <div style={{ display: "flex", gap: "8px" }}>
+          <Button
+            variant={scope() === "global" ? "primary" : "secondary"}
+            size="small"
+            onClick={() => changeScope("global")}
+          >
+            {language.t("settings.config.scope.global")}
+          </Button>
+          <Button
+            variant={scope() === "project" ? "primary" : "secondary"}
+            size="small"
+            onClick={() => changeScope("project")}
+          >
+            {language.t("settings.config.scope.local")}
+          </Button>
+        </div>
+      </SettingsRow>
+      <SettingsRow
+        title={
+          scope() === "global"
+            ? language.t("settings.indexing.globalEnable.title")
+            : language.t("settings.indexing.projectEnable.title")
+        }
+        description={
+          inherited()
+            ? `Inherited from global config (${enabled() ? "on" : "off"}) until a project value is saved.`
+            : language.t("settings.indexing.enable.description")
+        }
+        tag={tag}
+      >
+        <Switch checked={enabled()} onChange={saveEnabled} hideLabel>
+          {scope() === "global"
+            ? language.t("settings.indexing.globalEnable.title")
+            : language.t("settings.indexing.projectEnable.title")}
+        </Switch>
+      </SettingsRow>
+    </>
+  )
+}
+
 const IndexingTab: Component = () => {
   const { globalConfig, projectConfig, settings, updateGlobalConfig, updateProjectConfig, updateSetting } = useConfig()
   const indexing = useIndexing()
@@ -99,6 +168,7 @@ const IndexingTab: Component = () => {
   const language = useLanguage()
   const provider = useProvider()
   const server = useServer()
+  const vscode = useVSCode()
   const [providerDrafts, setProviderDrafts] = createSignal<Record<string, string>>({})
   const [storeDrafts, setStoreDrafts] = createSignal<Record<string, string>>({})
   const [tuningDrafts, setTuningDrafts] = createSignal<Record<string, string>>({})
@@ -112,6 +182,10 @@ const IndexingTab: Component = () => {
   const cfg = createMemo<IndexingConfig>(() => indexingConfig(scope(), globalCfg(), projectCfg()))
   const enabled = createMemo(() => indexingEnabled(scope(), globalCfg(), projectCfg()))
   const inherited = createMemo(() => indexingEnabledInherited(scope(), globalCfg(), projectCfg()))
+  const consent = createMemo(() => settings()["indexing.consent"] === true)
+  const projects = createMemo(() => (settings()["indexing.projects"] as Project[] | undefined) ?? [])
+  const projectId = createMemo(() => settings()["indexing.projectId"] as string | undefined)
+  const project = createMemo(() => projects().find((item) => item.id === projectId()))
   const inheritance = (paths: readonly (readonly string[])[]) =>
     indexingInheritance(scope(), globalCfg(), projectCfg(), paths)
   const tag = (current: IndexingScope, paths: readonly (readonly string[])[]) =>
@@ -119,6 +193,7 @@ const IndexingTab: Component = () => {
   const description = (value: string, paths: readonly (readonly string[])[]) =>
     indexingDescription(value, inheritance(paths))
   const changeScope = (next: IndexingScope) => {
+    // Blur first so a pending field edit commits against the scope it was typed in.
     const active = document.activeElement
     if (active instanceof HTMLElement) active.blur()
     setScope(next)
@@ -166,17 +241,23 @@ const IndexingTab: Component = () => {
     updateIndexing({ provider: next, model: null, dimension: null })
   }
 
-  const saveEnabled = (enabled: boolean) => {
-    if (enabled && !cfg().provider && kiloAvailable()) {
+  /** Machine-local consent for the selected project; never written to config. */
+  const saveConsent = (granted: boolean) => {
+    const id = projectId()
+    if (id) vscode.postMessage({ type: "setIndexingConsent", projectId: id, enabled: granted })
+  }
+
+  const saveEnabled = (next: boolean) => {
+    if (next && !cfg().provider && kiloAvailable()) {
       updateIndexing({
-        enabled,
+        enabled: next,
         provider: "kilo",
         model: knownKiloModel(cfg().model) ?? (kiloDefault() || null),
         dimension: null,
       })
       return
     }
-    updateIndexing({ enabled })
+    updateIndexing({ enabled: next })
   }
 
   const saveModel = (value: string) => {
@@ -276,53 +357,41 @@ const IndexingTab: Component = () => {
   const content = (_scope: IndexingScope) => (
     <div style={{ display: "flex", "flex-direction": "column", gap: "16px" }}>
       <Card>
+        <SettingsRow title="Project" description={project()?.root ?? "Select a project for indexing consent."}>
+          <Select
+            options={projects()}
+            current={project()}
+            value={(item) => item.id}
+            label={(item) => `${item.label} - ${item.root}`}
+            onSelect={(item) => item && vscode.postMessage({ type: "requestIndexingSettings", projectId: item.id })}
+            variant="secondary"
+            size="small"
+            triggerVariant="settings"
+            placeholder="Select a project"
+          />
+        </SettingsRow>
         <SettingsRow title={language.t("settings.indexing.status.title")} description={indexing.status().message}>
           <span class={`indexing-status-badge indexing-status-badge--${indexing.tone()}`}>
             {formatIndexingLabel(indexing.status())}
           </span>
         </SettingsRow>
         <SettingsRow
-          title="Configuration scope"
-          description={
-            scope() === "global"
-              ? language.t("settings.indexing.globalEnable.description")
-              : language.t("settings.indexing.projectEnable.description")
-          }
+          title={language.t("settings.indexing.enable.title")}
+          description={language.t("settings.indexing.enable.description")}
         >
-          <div style={{ display: "flex", gap: "8px" }}>
-            <Button
-              variant={scope() === "global" ? "primary" : "secondary"}
-              size="small"
-              onClick={() => changeScope("global")}
-            >
-              {language.t("settings.config.scope.global")}
-            </Button>
-            <Button
-              variant={scope() === "project" ? "primary" : "secondary"}
-              size="small"
-              onClick={() => changeScope("project")}
-            >
-              {language.t("settings.config.scope.local")}
-            </Button>
-          </div>
-        </SettingsRow>
-        <SettingsRow
-          title={
-            scope() === "global"
-              ? language.t("settings.indexing.globalEnable.title")
-              : language.t("settings.indexing.projectEnable.title")
-          }
-          description={
-            inherited()
-              ? `Inherited from global config (${enabled() ? "on" : "off"}) until a project value is saved.`
-              : language.t("settings.indexing.enable.description")
-          }
-          tag={() => tag(scope(), [["enabled"]])}
-        >
-          <Switch checked={enabled()} onChange={saveEnabled} hideLabel>
+          <Switch checked={consent()} onChange={saveConsent} hideLabel>
             {language.t("settings.indexing.enable.title")}
           </Switch>
         </SettingsRow>
+        <ScopeRows
+          scope={scope()}
+          enabled={enabled()}
+          inherited={inherited()}
+          t={language.t}
+          tag={() => tag(scope(), [["enabled"]])}
+          onScope={changeScope}
+          onEnabled={saveEnabled}
+        />
         <SettingsRow
           title={language.t("settings.indexing.showButton.title")}
           description={language.t("settings.indexing.showButton.description")}
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
index 7e67d9df60..8bd39f14a4 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
@@ -177,9 +177,9 @@ const Settings: Component<SettingsProps> = (props) => {
             <Icon name="checklist" />
             <span class="label">{language.t("settings.autoApprove.title")}</span>
           </Tabs.Trigger>
-          <Tabs.Trigger value="browser" aria-label={language.t("settings.browser.title")}>
+          <Tabs.Trigger value="browser" aria-label={language.t("settings.webTools.title")}>
             <Icon name="window-cursor" />
-            <span class="label">{language.t("settings.browser.title")}</span>
+            <span class="label">{language.t("settings.webTools.title")}</span>
           </Tabs.Trigger>
           <Tabs.Trigger value="checkpoints" aria-label={language.t("settings.checkpoints.title")}>
             <Icon name="branch" />
@@ -249,7 +249,7 @@ const Settings: Component<SettingsProps> = (props) => {
           <AutoApproveTab />
         </Tabs.Content>
         <Tabs.Content value="browser">
-          <h3>{language.t("settings.browser.title")}</h3>
+          <h3>{language.t("settings.webTools.title")}</h3>
           <BrowserTab />
         </Tabs.Content>
         <Tabs.Content value="checkpoints">
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/agent-behaviour-patches.ts b/packages/kilo-vscode/webview-ui/src/components/settings/agent-behaviour-patches.ts
index 7d031e2a22..eabc6550c5 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/agent-behaviour-patches.ts
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/agent-behaviour-patches.ts
@@ -1,3 +1,20 @@
+import type { Config, ConfigCollections } from "../../types/messages"
+
+export function mcpEnabledPatch(name: string, enabled: boolean): Partial<Config> {
+  return {
+    mcp: {
+      [name]: {
+        enabled,
+      },
+    },
+  }
+}
+
+export function mcpConfigScope(name: string, collections: ConfigCollections): "global" | "project" | undefined {
+  const source = collections.mcp?.find((entry) => entry.key === name)?.source
+  return source === "project" || source === "global" ? source : undefined
+}
+
 export function selectedDefaultAgentValue(value: string): string | null {
   return value || null
 }
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/settings-io.ts b/packages/kilo-vscode/webview-ui/src/components/settings/settings-io.ts
index d4b1949d2a..be43b46284 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/settings-io.ts
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/settings-io.ts
@@ -34,6 +34,7 @@ export const KNOWN_KEYS: ReadonlyArray<string> = [
   "compaction",
   "commit_message",
   "tools",
+  "web_search",
   "auto_collapse_reasoning",
   "terminal_command_display",
   "code_edit_display",
diff --git a/packages/kilo-vscode/webview-ui/src/context/config.tsx b/packages/kilo-vscode/webview-ui/src/context/config.tsx
index 81fd046cc6..904c5fdcdb 100644
--- a/packages/kilo-vscode/webview-ui/src/context/config.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/config.tsx
@@ -11,7 +11,13 @@
 import { createContext, useContext, createSignal, createMemo, onCleanup } from "solid-js"
 import type { ParentComponent, Accessor } from "solid-js"
 import { useVSCode } from "./vscode"
-import type { Config, ExtensionMessage, FeatureFlags } from "../types/messages"
+import type {
+  Config,
+  ConfigCollections,
+  ExtensionMessage,
+  FeatureFlags,
+  SettingsConfigBinding,
+} from "../types/messages"
 import {
   configUnsetPaths,
   deepMerge,
@@ -35,6 +41,7 @@ interface ConfigContextValue {
   config: Accessor<Config>
   globalConfig: Accessor<Config>
   projectConfig: Accessor<Config>
+  collections: Accessor<ConfigCollections>
   settings: Accessor<Record<string, unknown>>
   features: Accessor<FeatureFlags>
   loading: Accessor<boolean>
@@ -45,18 +52,39 @@ interface ConfigContextValue {
   updateGlobalConfig: (partial: Partial<Config>) => void
   updateProjectConfig: (partial: Partial<Config>) => void
   updateSetting: (key: string, value: unknown) => void
+  applySetting: (key: string, value: unknown, writeKey?: string) => void
   saveConfig: () => void
   discardConfig: () => void
 }
 
 export const ConfigContext = createContext<ConfigContextValue>()
 
+function loadedSettings(message: ExtensionMessage): Record<string, unknown> | undefined {
+  if (message.type === "autocompleteSettingsLoaded") {
+    return {
+      "autocomplete.enableAutoTrigger": message.settings.enableAutoTrigger,
+      "autocomplete.enableSmartInlineTaskKeybinding": message.settings.enableSmartInlineTaskKeybinding,
+      "autocomplete.enableChatAutocomplete": message.settings.enableChatAutocomplete,
+      "autocomplete.provider": message.settings.provider,
+      "autocomplete.model": message.settings.model,
+    }
+  }
+  if (message.type === "indexingSettingsLoaded") {
+    return { "indexing.showButtonWhenDisabled": message.settings.showButtonWhenDisabled }
+  }
+  if (message.type === "chatSettingsLoaded") {
+    return { "chat.shiftTabCyclesVariant": message.settings.shiftTabCyclesVariant }
+  }
+  if (message.type === "throughputSettingLoaded") return { showTokenThroughput: message.visible }
+}
+
 export const ConfigProvider: ParentComponent = (props) => {
   const vscode = useVSCode()
 
   const [config, setConfig] = createSignal<Config>({})
   const [globalConfig, setGlobalConfig] = createSignal<Config>({})
   const [projectConfig, setProjectConfig] = createSignal<Config>({})
+  const [collections, setCollections] = createSignal<ConfigCollections>({})
   const [settings, setSettings] = createSignal<Record<string, unknown>>({})
   const [features, setFeatures] = createSignal<FeatureFlags>({ indexing: false, sandboxControls: false })
   const [loading, setLoading] = createSignal(true)
@@ -64,6 +92,7 @@ export const ConfigProvider: ParentComponent = (props) => {
   const [globalDraft, setGlobalDraft] = createSignal<Partial<Config>>({})
   const [projectDraft, setProjectDraft] = createSignal<Partial<Config>>({})
   const [settingsDraft, setSettingsDraft] = createSignal<Record<string, unknown>>({})
+  const [bindings, setBindings] = createSignal<{ global?: SettingsConfigBinding; project?: SettingsConfigBinding }>({})
   const isDirty = createMemo(
     () =>
       has(draft() as Record<string, unknown>) ||
@@ -82,42 +111,15 @@ export const ConfigProvider: ParentComponent = (props) => {
   // Error from the most recent saveConfig() attempt, or null if no error.
   // Cleared when the user edits the draft again or starts a new save.
   const [saveError, setSaveError] = createSignal<SaveError | null>(null)
+  const updateCollections = (next: ConfigCollections | undefined) => {
+    if (next !== undefined) setCollections(next)
+  }
 
   // Register handler immediately (not in onMount) so we never miss
   // a configLoaded message that arrives before the DOM mount.
   const unsubscribe = vscode.onMessage((message: ExtensionMessage) => {
-    if (message.type === "autocompleteSettingsLoaded") {
-      mergeSettings({
-        "autocomplete.enableAutoTrigger": message.settings.enableAutoTrigger,
-        "autocomplete.enableSmartInlineTaskKeybinding": message.settings.enableSmartInlineTaskKeybinding,
-        "autocomplete.enableChatAutocomplete": message.settings.enableChatAutocomplete,
-        "autocomplete.provider": message.settings.provider,
-        "autocomplete.model": message.settings.model,
-      })
-      return
-    }
-    if (message.type === "indexingSettingsLoaded") {
-      mergeSettings({
-        "indexing.showButtonWhenDisabled": message.settings.showButtonWhenDisabled,
-      })
-      return
-    }
-    if (message.type === "chatSettingsLoaded") {
-      mergeSettings({
-        "chat.shiftTabCyclesVariant": message.settings.shiftTabCyclesVariant,
-      })
-      return
-    }
-    if (message.type === "throughputSettingLoaded") {
-      // Seed settings() so the DisplayTab Switch reflects persisted state on
-      // first open. DisplayProvider also reads this message to drive
-      // throughputVisible() for the per-message badge; both signals update
-      // from the same backend message without conflict.
-      mergeSettings({
-        showTokenThroughput: message.visible,
-      })
-      return
-    }
+    const patch = loadedSettings(message)
+    if (patch) return mergeSettings(patch)
     if (message.type === "configLoaded") {
       // Skip if a save is in-flight — a stale configLoaded must not overwrite
       // the optimistically-updated state while the write is being confirmed.
@@ -127,6 +129,7 @@ export const ConfigProvider: ParentComponent = (props) => {
       setConfig(resolveConfig(message.config, draft(), has(draft() as Record<string, unknown>)))
       setFeatures(message.features)
       setSaved(message.config)
+      setBindings(message.bindings ?? bindings())
       if (message.settings) mergeSettings(message.settings)
       if (message.globalConfig !== undefined) {
         setGlobalConfig(mergeScopedConfig(message.globalConfig, globalDraft()))
@@ -136,6 +139,7 @@ export const ConfigProvider: ParentComponent = (props) => {
         setProjectConfig(mergeScopedConfig(message.projectConfig, projectDraft()))
         setSavedProject(message.projectConfig)
       }
+      updateCollections(message.collections)
       setLoading(false)
       return
     }
@@ -163,7 +167,9 @@ export const ConfigProvider: ParentComponent = (props) => {
           setProjectConfig(message.projectConfig)
           setSavedProject(message.projectConfig)
         }
+        updateCollections(message.collections)
         setFeatures(message.features)
+        setBindings(message.bindings ?? bindings())
       } else {
         // configUpdated from a different source (e.g. PermissionDock save).
         // Re-apply the draft on top so pending settings changes are preserved.
@@ -176,22 +182,80 @@ export const ConfigProvider: ParentComponent = (props) => {
           setProjectConfig(mergeScopedConfig(message.projectConfig, projectDraft()))
           setSavedProject(message.projectConfig)
         }
+        updateCollections(message.collections)
         setFeatures(message.features)
+        setBindings(message.bindings ?? bindings())
       }
       if (message.settings) mergeSettings(message.settings)
       setSaved(message.config)
       return
     }
-    if (message.type === "configUpdateFailed") {
-      // The write was rejected (e.g. schema validation) — surface the error
-      // and keep the draft + isDirty so the user can correct and retry.
-      setSaving(false)
-      setSaveError({ message: message.message, details: message.details })
+  })
+  const unsubscribeExpired = vscode.onMessage((message: ExtensionMessage) => {
+    if (message.type !== "configBindingExpired") return
+    setBindings({})
+    if (isDirty()) {
+      setSaveError({ message: "The Settings project changed. Discard or reload before saving." })
       return
     }
+    vscode.postMessage({ type: "requestConfig" })
+  })
+  const unsubscribeFailure = vscode.onMessage((message: ExtensionMessage) => {
+    if (message.type !== "configUpdateFailed") return
+    setSaving(false)
+    if (message.completedScopes?.length) {
+      const split = splitConfigByScope(draft())
+      const remaining = message.completedScopes.includes("global")
+        ? split.project
+        : message.completedScopes.includes("project")
+          ? split.global
+          : draft()
+      setDraft(message.completedScopes.length === 2 ? {} : remaining)
+    }
+    if (message.completedScopes?.includes("global")) {
+      setGlobalDraft({})
+      if (message.globalConfig) {
+        setGlobalConfig(message.globalConfig)
+        setSavedGlobal(message.globalConfig)
+      }
+    }
+    if (message.completedScopes?.includes("project")) {
+      setProjectDraft({})
+      if (message.projectConfig) {
+        setProjectConfig(message.projectConfig)
+        setSavedProject(message.projectConfig)
+      }
+    }
+    if (message.config) {
+      setConfig(resolveConfig(message.config, draft(), has(draft() as Record<string, unknown>)))
+      setSaved(message.config)
+    }
+    if (message.bindings) setBindings(message.bindings)
+    setSaveError({ message: message.message, details: message.details })
+  })
+  const unsubscribeIndexing = vscode.onMessage((message: ExtensionMessage) => {
+    if (message.type !== "indexingSettingsLoaded") return
+    mergeSettings({
+      "indexing.showButtonWhenDisabled": message.settings.showButtonWhenDisabled,
+      "indexing.consent": message.settings.consent,
+      "indexing.projects": message.settings.projects,
+      "indexing.projectId": message.settings.projectId,
+    })
+  })
+  const unsubscribeChat = vscode.onMessage((message: ExtensionMessage) => {
+    if (message.type !== "chatSettingsLoaded") return
+    mergeSettings({
+      "chat.shiftTabCyclesVariant": message.settings.shiftTabCyclesVariant,
+    })
   })
 
-  onCleanup(unsubscribe)
+  onCleanup(() => {
+    unsubscribe()
+    unsubscribeExpired()
+    unsubscribeFailure()
+    unsubscribeIndexing()
+    unsubscribeChat()
+  })
 
   function mergeSettings(patch: Record<string, unknown>) {
     setSavedSettings((prev) => ({ ...prev, ...patch }))
@@ -257,6 +321,25 @@ export const ConfigProvider: ParentComponent = (props) => {
     setSaveError(null)
   }
 
+  /**
+   * Write a VS Code setting immediately, bypassing the save-bar draft.
+   * For app-level feature gates whose effect lives outside the settings page,
+   * where staging the change would make the control feel unresponsive.
+   * `key` is the local settings() property; `writeKey` is the VS Code
+   * configuration key when the two differ (e.g. namespaced experimental keys).
+   */
+  function applySetting(key: string, value: unknown, writeKey?: string) {
+    setSavedSettings((prev) => ({ ...prev, [key]: value }))
+    setSettings((prev) => ({ ...prev, [key]: value }))
+    setSettingsDraft((prev) => {
+      const next = { ...prev }
+      delete next[key]
+      return next
+    })
+    setSaveError(null)
+    vscode.postMessage({ type: "updateSetting", key: writeKey ?? key, value })
+  }
+
   function saveConfig() {
     const changes = draft()
     const globals = globalDraft()
@@ -294,6 +377,8 @@ export const ConfigProvider: ParentComponent = (props) => {
       projectConfig: pruneConfigSet(project) as Config,
       globalUnset: configUnsetPaths(next),
       projectUnset: configUnsetPaths(project),
+      globalBindingId: bindings().global?.id,
+      projectBindingId: bindings().project?.id,
     })
   }
 
@@ -313,6 +398,7 @@ export const ConfigProvider: ParentComponent = (props) => {
     config,
     globalConfig,
     projectConfig,
+    collections,
     settings,
     features,
     loading,
@@ -323,6 +409,7 @@ export const ConfigProvider: ParentComponent = (props) => {
     updateGlobalConfig,
     updateProjectConfig,
     updateSetting,
+    applySetting,
     saveConfig,
     discardConfig,
   }
diff --git a/packages/kilo-vscode/webview-ui/src/context/indexing.tsx b/packages/kilo-vscode/webview-ui/src/context/indexing.tsx
index cce967f7d0..44c70a6cf4 100644
--- a/packages/kilo-vscode/webview-ui/src/context/indexing.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/indexing.tsx
@@ -26,11 +26,18 @@ const IndexingContext = createContext<IndexingContextValue>()
 
 export const IndexingProvider: ParentComponent = (props) => {
   const vscode = useVSCode()
-  const { features } = useConfig()
+  const { features, settings } = useConfig()
   const [status, setStatus] = createSignal<IndexingStatus>(initial)
   const [loading, setLoading] = createSignal(true)
 
   const unsubscribe = vscode.onMessage((message: ExtensionMessage) => {
+    if (
+      message.type === "indexingStatusLoaded" &&
+      message.projectId &&
+      message.projectId !== settings()["indexing.projectId"]
+    ) {
+      return
+    }
     applyIndexingStatusMessage(message, setStatus, setLoading)
   })
 
diff --git a/packages/kilo-vscode/webview-ui/src/context/language-utils.ts b/packages/kilo-vscode/webview-ui/src/context/language-utils.ts
index af837c7e92..247a5da01e 100644
--- a/packages/kilo-vscode/webview-ui/src/context/language-utils.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/language-utils.ts
@@ -19,9 +19,10 @@ export type Locale =
   | "nl"
   | "uk"
   | "it"
+  | "fa"
 
 /** Locales that use right-to-left script. */
-export const RTL_LOCALES = new Set<Locale>(["ar"])
+export const RTL_LOCALES = new Set<Locale>(["ar", "fa"])
 
 /** Map internal locale IDs to valid BCP 47 language tags for the HTML lang attribute. */
 export const LOCALE_BCP47: Partial<Record<Locale, string>> = {
@@ -55,6 +56,7 @@ export const LOCALES: readonly Locale[] = [
   "nl",
   "uk",
   "it",
+  "fa",
 ]
 
 /**
diff --git a/packages/kilo-vscode/webview-ui/src/context/language.tsx b/packages/kilo-vscode/webview-ui/src/context/language.tsx
index 7dad79270d..709e0a05cf 100644
--- a/packages/kilo-vscode/webview-ui/src/context/language.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/language.tsx
@@ -49,6 +49,7 @@ import { dict as appTr } from "../i18n/tr"
 import { dict as appNl } from "../i18n/nl"
 import { dict as appUk } from "../i18n/uk"
 import { dict as appIt } from "../i18n/it"
+import { dict as appFa } from "../i18n/fa"
 import { dict as amEn } from "../../agent-manager/i18n/en"
 import { dict as amZh } from "../../agent-manager/i18n/zh"
 import { dict as amZht } from "../../agent-manager/i18n/zht"
@@ -69,6 +70,7 @@ import { dict as amTr } from "../../agent-manager/i18n/tr"
 import { dict as amNl } from "../../agent-manager/i18n/nl"
 import { dict as amUk } from "../../agent-manager/i18n/uk"
 import { dict as amIt } from "../../agent-manager/i18n/it"
+import { dict as amFa } from "../../agent-manager/i18n/fa"
 import { dict as kiloEn } from "@kilocode/kilo-i18n/en"
 import { dict as kiloZh } from "@kilocode/kilo-i18n/zh"
 import { dict as kiloZht } from "@kilocode/kilo-i18n/zht"
@@ -118,6 +120,7 @@ export const LOCALE_LABELS: Record<Locale, string> = {
   nl: "Nederlands",
   uk: "Українська",
   it: "Italiano",
+  fa: "فارسی",
 }
 
 // Merge 4 dict layers: app + ui + kilo + agent manager (kilo and agent manager override last)
@@ -143,6 +146,9 @@ const dicts: Record<Locale, Record<string, string>> = {
   nl: { ...base, ...appNl, ...uiNl, ...kiloNl, ...amEn, ...amNl },
   uk: { ...base, ...appUk, ...uiUk, ...kiloUk, ...amEn, ...amUk },
   it: { ...base, ...appIt, ...uiIt, ...kiloIt, ...amEn, ...amIt },
+  // Persian (Kilo fork addition). Only app + agent-manager layers are localized;
+  // the upstream ui/kilo layers fall back to English via `base`.
+  fa: { ...base, ...appFa, ...amEn, ...amFa },
 }
 
 function normalizeLocale(lang: string): Locale {
diff --git a/packages/kilo-vscode/webview-ui/src/context/provider-shell.tsx b/packages/kilo-vscode/webview-ui/src/context/provider-shell.tsx
new file mode 100644
index 0000000000..7a89205249
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/context/provider-shell.tsx
@@ -0,0 +1,96 @@
+import { onCleanup, onMount, type Component, type ParentComponent } from "solid-js"
+import { ThemeProvider } from "@kilocode/kilo-ui/theme"
+import { DialogProvider } from "@kilocode/kilo-ui/context/dialog"
+import { MarkedProvider } from "@kilocode/kilo-ui/context/marked"
+import { CodeComponentProvider } from "@kilocode/kilo-ui/context/code"
+import { DiffComponentProvider } from "@kilocode/kilo-ui/context/diff"
+import { FileComponentProvider } from "@kilocode/kilo-ui/context/file"
+import { Code } from "@kilocode/kilo-ui/code"
+import { Diff } from "@kilocode/kilo-ui/diff"
+import { File } from "@kilocode/kilo-ui/file"
+import { Toast } from "@kilocode/kilo-ui/toast"
+import { VSCodeProvider, useVSCode } from "./vscode"
+import { ServerProvider } from "./server"
+import { ProviderProvider } from "./provider"
+import { ConfigProvider } from "./config"
+import { DisplayProvider } from "./display"
+import { IndexingProvider } from "./indexing"
+import { AgentRequirementsProvider } from "./agent-requirements"
+import { MemoryProvider } from "./memory"
+import { SessionProvider } from "./session"
+import { LanguageBridge } from "./language-bridge"
+import { NotificationsProvider } from "./notifications"
+import { FeedbackProvider } from "./feedback"
+import { KiloEmbeddingModelsProvider } from "./kilo-embedding-models"
+import { ImageModelsProvider } from "./image-models"
+import { SpeechToTextPrewarm } from "../components/speech-to-text/SpeechToTextPrewarm"
+
+type MermaidImageEvent = CustomEvent<{ dataUrl: string; filename: string }>
+
+const MermaidDownloadBridge: Component = () => {
+  const vscode = useVSCode()
+
+  onMount(() => {
+    const save = (event: Event) => {
+      const detail = (event as MermaidImageEvent).detail
+      if (!detail?.dataUrl || !detail.filename) return
+      event.preventDefault()
+      vscode.postMessage({ type: "saveImage", dataUrl: detail.dataUrl, filename: detail.filename })
+    }
+    window.addEventListener("kilo:save-image", save)
+    onCleanup(() => window.removeEventListener("kilo:save-image", save))
+  })
+
+  return null
+}
+
+const Root: ParentComponent = (props) => (
+  <ThemeProvider defaultTheme="kilo-vscode">
+    <DialogProvider>
+      <VSCodeProvider>
+        <MermaidDownloadBridge />
+        <ServerProvider>
+          <LanguageBridge>
+            <MarkedProvider>
+              <DiffComponentProvider component={Diff}>
+                <CodeComponentProvider component={Code}>
+                  <FileComponentProvider component={File}>
+                    <ProviderProvider>
+                      <ConfigProvider>
+                        <SpeechToTextPrewarm />
+                        <DisplayProvider>{props.children}</DisplayProvider>
+                      </ConfigProvider>
+                    </ProviderProvider>
+                  </FileComponentProvider>
+                </CodeComponentProvider>
+              </DiffComponentProvider>
+            </MarkedProvider>
+          </LanguageBridge>
+        </ServerProvider>
+      </VSCodeProvider>
+      <Toast.Region />
+    </DialogProvider>
+  </ThemeProvider>
+)
+
+const Session: ParentComponent = (props) => (
+  <IndexingProvider>
+    <KiloEmbeddingModelsProvider>
+      <ImageModelsProvider>
+        <NotificationsProvider>
+          <SessionProvider>{props.children}</SessionProvider>
+        </NotificationsProvider>
+      </ImageModelsProvider>
+    </KiloEmbeddingModelsProvider>
+  </IndexingProvider>
+)
+
+const Chat: ParentComponent = (props) => (
+  <AgentRequirementsProvider>
+    <MemoryProvider>
+      <FeedbackProvider>{props.children}</FeedbackProvider>
+    </MemoryProvider>
+  </AgentRequirementsProvider>
+)
+
+export const ProviderShell = { Root, Session, Chat }
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-outcome.ts b/packages/kilo-vscode/webview-ui/src/context/session-outcome.ts
index e17f548ef8..eaf9b6bf76 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-outcome.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-outcome.ts
@@ -41,6 +41,9 @@ function identifiers(
 
 export function terminal(input: Input): TerminalState | undefined {
   if (!input.reason) return undefined
+  // A superseded turn handed off to a queued follow-up; it is not a premature
+  // stop, and the follow-up turn closes with its own reason afterwards.
+  if (input.reason === "superseded") return undefined
   const last = input.messages[input.messages.length - 1]
   const finish = last?.role === "assistant" ? last.finish : undefined
   const ids = identifiers(last, input.parts)
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index b279c79651..c7bad43c0a 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -291,7 +291,7 @@ interface SessionContextValue {
   createSession: () => void
   clearCurrentSession: () => void
   loadSessions: () => void
-  loadOlderMessages: () => void
+  loadOlderMessages: () => boolean
   selectSession: (id: string) => void
   deleteSession: (id: string) => void
   renameSession: (id: string, title: string) => void
@@ -2560,9 +2560,9 @@ export const SessionProvider: ParentComponent = (props) => {
 
   function loadOlderMessages() {
     const id = currentSessionID()
-    if (!id || !server.isConnected()) return
+    if (!id || !server.isConnected()) return false
     const page = pages[id] ?? emptyPageState
-    if (!page.hasMore || page.loadingOlder || page.loadingInitial || !page.before) return
+    if (!page.hasMore || page.loadingOlder || page.loadingInitial || !page.before) return false
     patchPage(id, { loadingOlder: true })
     vscode.postMessage({
       type: "loadMessages",
@@ -2571,6 +2571,7 @@ export const SessionProvider: ParentComponent = (props) => {
       before: page.before,
       limit: MESSAGE_PAGE_LIMIT,
     })
+    return true
   }
 
   // Session whose message fetch was deferred because the backend was offline at
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index 592ae22dcf..1bef1d9866 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -296,7 +296,6 @@ export const dict = {
 
   "session.tab.review": "مراجعة",
   "session.review.filesChanged": "تم تغيير {{count}} ملفات",
-  "session.review.change.other": "تغييرات",
   "session.review.loadingChanges": "جارٍ تحميل التغييرات...",
   "session.review.noChanges": "لا توجد تغييرات",
   "session.messages.loadingEarlier": "جارٍ تحميل الرسائل السابقة...",
@@ -649,7 +648,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "سلوك الوكيل",
   "settings.autoApprove.title": "الموافقة التلقائية",
-  "settings.browser.title": "المتصفح",
+  "settings.webTools.title": "أدوات الويب",
+  "settings.webTools.description": "اضبط البحث على الويب وأتمتة المتصفح.",
+  "settings.webTools.webSearch.enable": "تمكين لجميع المزوّدين",
+  "settings.webTools.browserAutomation": "أتمتة المتصفح",
+  "settings.webTools.webSearch.title": "البحث على الويب",
+  "settings.webTools.webSearch.description": "اجعل البحث على الويب متاحًا لنماذج جميع المزوّدين.",
   "settings.checkpoints.title": "نقاط التحقق",
   "settings.display.title": "العرض",
   "settings.autocomplete.title": "الإكمال التلقائي",
@@ -705,6 +709,13 @@ export const dict = {
   "session.messages.scrollToBottom": "التمرير إلى الأسفل",
   "session.messages.initializing": "جاري التهيئة...",
   "session.messages.taskStarting": "جاري البدء...",
+  "session.prompts.navLabel": "مستعرض المطالبات",
+  "session.prompts.tick": "المطالبة {{index}} من {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "لا توجد استجابة بعد",
+  "session.prompts.queued": "في قائمة الانتظار",
+  "session.prompts.first": "أول مطالبة",
+  "session.prompts.latest": "أحدث مطالبة",
+  "session.prompts.overflow": "{{count}} مطالبات سابقة",
   "session.status.writingResponse": "...جارٍ كتابة الرد",
   "session.status.retry": "جارٍ إعادة المحاولة…",
   "session.status.working": "...جارٍ العمل",
@@ -732,7 +743,7 @@ export const dict = {
 
   "prompt.placeholder.connecting": "جارٍ الاتصال بالخادم...",
   "prompt.placeholder.error": "فشل الاتصال. تحقق من لوحة الإخراج أو أعد تشغيل الإضافة.",
-  "prompt.placeholder.default": "اكتب رسالة... (Enter للإرسال، Shift+Enter لسطر جديد)",
+  "prompt.placeholder.default": "اكتب رسالة، @ للإشارة إلى الملفات... (Enter للإرسال، Shift+Enter لسطر جديد)",
 
   "context.usage.sessionCost": "تكلفة الجلسة",
   "context.usage.olderSessions": "{{count}} جلسات أقدم",
@@ -859,6 +870,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "نموذج SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "النموذج المستخدم لتقليم مخرجات الأدوات؛ افتراضيًا النموذج الصغير المكوَّن",
+  "settings.experimental.multiProject.title": "إدارة متعددة المشاريع",
+  "settings.experimental.multiProject.description":
+    "تفعيل إدارة الجلسات وأشجار العمل عبر مستودعات متعددة في Agent Manager. المستودع الحالي هو دائمًا المشروع الافتراضي.",
   "settings.experimental.mcpTimeout.title": "مهلة MCP (مللي ثانية)",
   "settings.experimental.mcpTimeout.description": "مهلة طلبات خادم MCP بالمللي ثانية",
   "settings.experimental.remote.title": "التحكم Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 03055f3543..371110cdfa 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -306,7 +306,6 @@ export const dict = {
 
   "session.tab.review": "Revisão",
   "session.review.filesChanged": "{{count}} Arquivos Alterados",
-  "session.review.change.other": "Alterações",
   "session.review.loadingChanges": "Carregando alterações...",
   "session.review.noChanges": "Sem alterações",
   "session.messages.loadingEarlier": "Carregando mensagens anteriores...",
@@ -665,7 +664,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Comportamento do Agente",
   "settings.autoApprove.title": "Aprovação Automática",
-  "settings.browser.title": "Navegador",
+  "settings.webTools.title": "Ferramentas da Web",
+  "settings.webTools.description": "Configure a pesquisa na web e a automação do navegador.",
+  "settings.webTools.webSearch.enable": "Ativar para todos os provedores",
+  "settings.webTools.browserAutomation": "Automação do navegador",
+  "settings.webTools.webSearch.title": "Pesquisa na Web",
+  "settings.webTools.webSearch.description": "Disponibilize a pesquisa na web para modelos de todos os provedores.",
   "settings.checkpoints.title": "Pontos de Verificação",
   "settings.display.title": "Exibição",
   "settings.autocomplete.title": "Autocompletar",
@@ -723,6 +727,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Rolar para o final",
   "session.messages.initializing": "O teraouiñ...",
   "session.messages.taskStarting": "O kregiñ...",
+  "session.prompts.navLabel": "Navegador de prompts",
+  "session.prompts.tick": "Prompt {{index}} de {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Sem resposta ainda",
+  "session.prompts.queued": "Na fila",
+  "session.prompts.first": "Primeiro prompt",
+  "session.prompts.latest": "Prompt mais recente",
+  "session.prompts.overflow": "{{count}} prompts anteriores",
   "session.status.writingResponse": "Escrevendo resposta…",
   "session.status.retry": "Tentando novamente…",
   "session.status.working": "Trabalhando…",
@@ -750,7 +761,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Conectando ao servidor...",
   "prompt.placeholder.error": "Conexão falhou. Verifique o painel de saída ou reinicie a extensão.",
-  "prompt.placeholder.default": "Digite uma mensagem... (Enter para enviar, Shift+Enter para nova linha)",
+  "prompt.placeholder.default":
+    "Digite uma mensagem, @ para mencionar arquivos... (Enter para enviar, Shift+Enter para nova linha)",
 
   "context.usage.sessionCost": "Custo da sessão",
   "context.usage.olderSessions": "{{count}} sessões anteriores",
@@ -889,6 +901,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Modelo do SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Modelo usado para podar as saídas das ferramentas; por padrão, o modelo pequeno configurado",
+  "settings.experimental.multiProject.title": "Agent Manager Multi-Projeto",
+  "settings.experimental.multiProject.description":
+    "Ativar gerenciamento de sessões e worktrees em múltiplos repositórios no Agent Manager. O repositório do workspace atual é sempre o projeto padrão.",
   "settings.experimental.mcpTimeout.title": "Tempo limite MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Tempo limite para solicitações do servidor MCP em milissegundos",
   "settings.experimental.remote.title": "Controle Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 5575a758b8..f99d64a55e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -304,7 +304,6 @@ export const dict = {
 
   "session.tab.review": "Pregled",
   "session.review.filesChanged": "Izmijenjeno {{count}} datoteka",
-  "session.review.change.other": "Izmjene",
   "session.review.loadingChanges": "Učitavanje izmjena...",
   "session.review.noChanges": "Nema izmjena",
 
@@ -705,7 +704,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Ponašanje agenta",
   "settings.autoApprove.title": "Automatsko odobravanje",
-  "settings.browser.title": "Preglednik",
+  "settings.webTools.title": "Web alati",
+  "settings.webTools.description": "Konfigurišite web pretragu i automatizaciju preglednika.",
+  "settings.webTools.webSearch.enable": "Omogući za sve pružaoce",
+  "settings.webTools.browserAutomation": "Automatizacija preglednika",
+  "settings.webTools.webSearch.title": "Web pretraga",
+  "settings.webTools.webSearch.description": "Omogućite web pretragu modelima svih pružalaca.",
   "settings.checkpoints.title": "Kontrolne tačke",
   "settings.display.title": "Prikaz",
   "settings.autocomplete.title": "Automatsko dovršavanje",
@@ -723,6 +727,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Pomakni se na dno",
   "session.messages.initializing": "Inicijalizacija...",
   "session.messages.taskStarting": "Pokretanje...",
+  "session.prompts.navLabel": "Navigator upita",
+  "session.prompts.tick": "Upit {{index}} od {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Još nema odgovora",
+  "session.prompts.queued": "Na čekanju",
+  "session.prompts.first": "Prvi upit",
+  "session.prompts.latest": "Najnoviji upit",
+  "session.prompts.overflow": "{{count}} ranijih upita",
   "session.status.writingResponse": "Pisanje odgovora…",
   "session.status.retry": "Ponovni pokušaj…",
   "session.status.working": "Radim…",
@@ -750,7 +761,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Povezivanje na server...",
   "prompt.placeholder.error": "Povezivanje nije uspjelo. Provjerite panel za izlaz ili ponovo pokrenite ekstenziju.",
-  "prompt.placeholder.default": "Unesite poruku... (Enter za slanje, Shift+Enter za novi red)",
+  "prompt.placeholder.default":
+    "Unesite poruku, @ za spominjanje datoteka... (Enter za slanje, Shift+Enter za novi red)",
 
   "context.usage.sessionCost": "Cijena sesije",
   "context.usage.olderSessions": "{{count}} starijih sesija",
@@ -882,6 +894,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner model",
   "settings.experimental.swePrunerModel.description":
     "Model koji se koristi za orezivanje izlaza alata; podrazumijevano konfigurisani mali model",
+  "settings.experimental.multiProject.title": "Višeprojektni Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Omogući upravljanje sesijama i worktree-ima kroz više repozitorija u Agent Manager-u. Trenutni workspace repozitorij je uvijek zadani projekat.",
   "settings.experimental.mcpTimeout.title": "MCP istek vremena (ms)",
   "settings.experimental.mcpTimeout.description": "Istek vremena za MCP server zahtjeve u milisekundama",
   "settings.experimental.remote.title": "Remote kontrola",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 90ff025087..5cc125d7a1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -303,7 +303,6 @@ export const dict = {
 
   "session.tab.review": "Gennemgang",
   "session.review.filesChanged": "{{count}} Filer ændret",
-  "session.review.change.other": "Ændringer",
   "session.review.loadingChanges": "Indlæser ændringer...",
   "session.review.noChanges": "Ingen ændringer",
   "session.messages.loadingEarlier": "Indlæser tidligere beskeder...",
@@ -703,7 +702,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Agentadfærd",
   "settings.autoApprove.title": "Automatisk godkendelse",
-  "settings.browser.title": "Browser",
+  "settings.webTools.title": "Webværktøjer",
+  "settings.webTools.description": "Konfigurer websøgning og browserautomatisering.",
+  "settings.webTools.webSearch.enable": "Aktivér for alle udbydere",
+  "settings.webTools.browserAutomation": "Browserautomatisering",
+  "settings.webTools.webSearch.title": "Websøgning",
+  "settings.webTools.webSearch.description": "Gør websøgning tilgængelig for modeller fra alle udbydere.",
   "settings.checkpoints.title": "Kontrolpunkter",
   "settings.display.title": "Visning",
   "settings.autocomplete.title": "Autofuldførelse",
@@ -721,6 +725,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Rul til bunden",
   "session.messages.initializing": "Initialiserer...",
   "session.messages.taskStarting": "Starter...",
+  "session.prompts.navLabel": "Promptnavigator",
+  "session.prompts.tick": "Prompt {{index}} af {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Intet svar endnu",
+  "session.prompts.queued": "I kø",
+  "session.prompts.first": "Første prompt",
+  "session.prompts.latest": "Seneste prompt",
+  "session.prompts.overflow": "{{count}} tidligere prompter",
   "session.status.writingResponse": "Skriver svar…",
   "session.status.retry": "Prøver igen…",
   "session.status.working": "Arbejder…",
@@ -748,7 +759,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Opretter forbindelse til server...",
   "prompt.placeholder.error": "Forbindelse mislykkedes. Tjek outputpanelet eller genstart udvidelsen.",
-  "prompt.placeholder.default": "Skriv en besked... (Enter for at sende, Shift+Enter for ny linje)",
+  "prompt.placeholder.default":
+    "Skriv en besked, @ for at nævne filer... (Enter for at sende, Shift+Enter for ny linje)",
 
   "context.usage.sessionCost": "Sessionsomkostning",
   "context.usage.olderSessions": "{{count}} ældre sessioner",
@@ -881,6 +893,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner-model",
   "settings.experimental.swePrunerModel.description":
     "Model til beskæring af værktøjsoutput; som standard den konfigurerede lille model",
+  "settings.experimental.multiProject.title": "Multi-projekt Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Aktivér styring af sessioner og worktrees på tværs af flere repositories i Agent Manager. Det nuværende workspace-repository er altid standardprojektet.",
   "settings.experimental.mcpTimeout.title": "MCP-timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout for MCP-serveranmodninger i millisekunder",
   "settings.experimental.remote.title": "Remote-styring",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 811b9ee0fd..dab2b406d1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -312,7 +312,6 @@ export const dict = {
 
   "session.tab.review": "Überprüfung",
   "session.review.filesChanged": "{{count}} Dateien geändert",
-  "session.review.change.other": "Änderungen",
   "session.review.loadingChanges": "Lade Änderungen...",
   "session.review.noChanges": "Keine Änderungen",
   "session.messages.loadingEarlier": "Lade frühere Nachrichten...",
@@ -716,7 +715,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Agentenverhalten",
   "settings.autoApprove.title": "Automatisch genehmigen",
-  "settings.browser.title": "Browser",
+  "settings.webTools.title": "Web-Tools",
+  "settings.webTools.description": "Konfigurieren Sie Websuche und Browserautomatisierung.",
+  "settings.webTools.webSearch.enable": "Für alle Anbieter aktivieren",
+  "settings.webTools.browserAutomation": "Browserautomatisierung",
+  "settings.webTools.webSearch.title": "Websuche",
+  "settings.webTools.webSearch.description": "Machen Sie die Websuche für Modelle aller Anbieter verfügbar.",
   "settings.checkpoints.title": "Prüfpunkte",
   "settings.display.title": "Anzeige",
   "settings.autocomplete.title": "Autovervollständigung",
@@ -734,6 +738,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Nach unten scrollen",
   "session.messages.initializing": "Initialisierung...",
   "session.messages.taskStarting": "Wird gestartet...",
+  "session.prompts.navLabel": "Prompt-Navigation",
+  "session.prompts.tick": "Prompt {{index}} von {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Noch keine Antwort",
+  "session.prompts.queued": "In Warteschlange",
+  "session.prompts.first": "Erster Prompt",
+  "session.prompts.latest": "Neuester Prompt",
+  "session.prompts.overflow": "{{count}} frühere Prompts",
   "session.status.writingResponse": "Antwort wird geschrieben…",
   "session.status.retry": "Erneuter Versuch…",
   "session.status.working": "Wird bearbeitet…",
@@ -762,7 +773,8 @@ export const dict = {
   "prompt.placeholder.connecting": "Verbindung zum Server wird hergestellt...",
   "prompt.placeholder.error":
     "Verbindung fehlgeschlagen. Überprüfen Sie das Ausgabepanel oder starten Sie die Erweiterung neu.",
-  "prompt.placeholder.default": "Nachricht eingeben... (Enter zum Senden, Shift+Enter für neue Zeile)",
+  "prompt.placeholder.default":
+    "Nachricht eingeben, @ um Dateien zu erwähnen... (Enter zum Senden, Shift+Enter für neue Zeile)",
 
   "context.usage.sessionCost": "Sitzungskosten",
   "context.usage.olderSessions": "{{count}} ältere Sitzungen",
@@ -903,6 +915,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner-Modell",
   "settings.experimental.swePrunerModel.description":
     "Modell zum Kürzen von Tool-Ausgaben; standardmäßig das konfigurierte Small Model",
+  "settings.experimental.multiProject.title": "Multi-Projekt Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Aktivieren Sie die Verwaltung von Sitzungen und Worktrees über mehrere Repositories im Agent Manager. Das aktuelle Workspace-Repository ist immer das Standardprojekt.",
   "settings.experimental.mcpTimeout.title": "MCP-Zeitlimit (ms)",
   "settings.experimental.mcpTimeout.description": "Zeitlimit für MCP-Server-Anfragen in Millisekunden",
   "settings.experimental.remote.title": "Remote-Steuerung",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index 7cc55121fe..3e436266dd 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -301,7 +301,6 @@ export const dict = {
 
   "session.tab.review": "Review",
   "session.review.filesChanged": "{{count}} Files Changed",
-  "session.review.change.other": "Changes",
   "session.review.loadingChanges": "Loading changes...",
   "session.review.noChanges": "No changes",
 
@@ -622,7 +621,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Agent Behaviour",
   "settings.autoApprove.title": "Auto-Approve",
-  "settings.browser.title": "Browser",
+  "settings.webTools.title": "Web Tools",
+  "settings.webTools.description": "Configure web search and browser automation.",
+  "settings.webTools.webSearch.enable": "Enable for All Providers",
+  "settings.webTools.browserAutomation": "Browser Automation",
+  "settings.webTools.webSearch.title": "Web Search",
+  "settings.webTools.webSearch.description": "Make web search available to models from all providers.",
   "settings.checkpoints.title": "Checkpoints",
   "settings.display.title": "Display",
   "settings.autocomplete.title": "Autocomplete",
@@ -675,6 +679,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Scroll to bottom",
   "session.messages.initializing": "Initializing...",
   "session.messages.taskStarting": "Starting...",
+  "session.prompts.navLabel": "Prompt navigator",
+  "session.prompts.tick": "Prompt {{index}} of {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "No response yet",
+  "session.prompts.queued": "Queued",
+  "session.prompts.first": "First prompt",
+  "session.prompts.latest": "Latest prompt",
+  "session.prompts.overflow": "{{count}} earlier prompts",
   "session.status.writingResponse": "Writing response...",
   "session.status.retry": "Retrying…",
   "session.status.working": "Working...",
@@ -724,7 +735,7 @@ export const dict = {
   "dialog.model.noProviders": "No providers",
 
   "prompt.placeholder.connecting": "Connecting to server...",
-  "prompt.placeholder.default": "Type a message... (Enter to send, Shift+Enter for new line)",
+  "prompt.placeholder.default": "Type a message, @ to mention files... (Enter to send, Shift+Enter for new line)",
   "prompt.placeholder.error": "Connection failed. Check the output panel or restart the extension.",
 
   "context.usage.sessionCost": "Session cost",
@@ -862,6 +873,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner Model",
   "settings.experimental.swePrunerModel.description":
     "Model used to skim tool outputs; defaults to the configured small model",
+  "settings.experimental.multiProject.title": "Multi-Project Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Enable managing sessions and worktrees across multiple repositories in Agent Manager. The current workspace repository is always the default project.",
   "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout for MCP server requests in milliseconds",
   "settings.experimental.remote.title": "Remote Control",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 7981f2a551..3c7cbe19ca 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -307,7 +307,6 @@ export const dict = {
 
   "session.tab.review": "Revisión",
   "session.review.filesChanged": "{{count}} Archivos Cambiados",
-  "session.review.change.other": "Cambios",
   "session.review.loadingChanges": "Cargando cambios...",
   "session.review.noChanges": "Sin cambios",
   "session.messages.loadingEarlier": "Cargando mensajes anteriores...",
@@ -710,7 +709,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Comportamiento del agente",
   "settings.autoApprove.title": "Aprobación automática",
-  "settings.browser.title": "Navegador",
+  "settings.webTools.title": "Herramientas web",
+  "settings.webTools.description": "Configura la búsqueda web y la automatización del navegador.",
+  "settings.webTools.webSearch.enable": "Habilitar para todos los proveedores",
+  "settings.webTools.browserAutomation": "Automatización del navegador",
+  "settings.webTools.webSearch.title": "Búsqueda web",
+  "settings.webTools.webSearch.description": "Permite que los modelos de todos los proveedores usen la búsqueda web.",
   "settings.checkpoints.title": "Puntos de control",
   "settings.display.title": "Pantalla",
   "settings.autocomplete.title": "Autocompletado",
@@ -728,6 +732,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Desplazar al final",
   "session.messages.initializing": "Inicializando...",
   "session.messages.taskStarting": "Iniciando...",
+  "session.prompts.navLabel": "Navegador de prompts",
+  "session.prompts.tick": "Prompt {{index}} de {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Aún no hay respuesta",
+  "session.prompts.queued": "En cola",
+  "session.prompts.first": "Primera solicitud",
+  "session.prompts.latest": "Última solicitud",
+  "session.prompts.overflow": "{{count}} solicitudes anteriores",
   "session.status.writingResponse": "Escribiendo respuesta…",
   "session.status.retry": "Reintentando…",
   "session.status.working": "Trabajando…",
@@ -755,7 +766,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Conectando al servidor...",
   "prompt.placeholder.error": "Conexión fallida. Revisa el panel de salida o reinicia la extensión.",
-  "prompt.placeholder.default": "Escribe un mensaje... (Enter para enviar, Shift+Enter para nueva línea)",
+  "prompt.placeholder.default":
+    "Escribe un mensaje, @ para mencionar archivos... (Enter para enviar, Shift+Enter para nueva línea)",
 
   "context.usage.sessionCost": "Coste de la sesión",
   "context.usage.olderSessions": "{{count}} sesiones anteriores",
@@ -892,6 +904,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Modelo de SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Modelo usado para podar las salidas de herramientas; por defecto, el modelo pequeño configurado",
+  "settings.experimental.multiProject.title": "Agent Manager Multi-Proyecto",
+  "settings.experimental.multiProject.description":
+    "Habilitar la gestión de sesiones y worktrees en múltiples repositorios en Agent Manager. El repositorio del workspace actual es siempre el proyecto predeterminado.",
   "settings.experimental.mcpTimeout.title": "Tiempo de espera MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Tiempo de espera para solicitudes del servidor MCP en milisegundos",
   "settings.experimental.remote.title": "Control Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fa.ts b/packages/kilo-vscode/webview-ui/src/i18n/fa.ts
new file mode 100644
index 0000000000..624861fa3e
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fa.ts
@@ -0,0 +1,1299 @@
+export const anacondaDesktopDict = {
+  "provider.anaconda.title.connect": "اتصال به Anaconda Desktop",
+  "provider.anaconda.title.manage": "مدیریت Anaconda Desktop",
+  "provider.anaconda.status.checking": "در حال بررسی Anaconda Desktop...",
+  "provider.anaconda.status.opening": "در حال باز کردن Anaconda Desktop...",
+  "provider.anaconda.status.syncing": "در حال به‌روزرسانی مدل‌های ارائه‌دهنده...",
+  "provider.anaconda.status.ready": "آماده اتصال",
+  "provider.anaconda.status.waiting": "در انتظار Desktop",
+  "provider.anaconda.status.attention": "نیاز به توجه",
+  "provider.anaconda.status.unavailable": "در دسترس نیست",
+  "provider.anaconda.state.unsupported": "Anaconda Desktop در {{platform}} پشتیبانی نمی‌شود.",
+  "provider.anaconda.state.notInstalled":
+    "Anaconda Desktop را روی این دستگاه نصب کنید، سپس به اینجا بازگردید. Kilo نصب‌کننده را برای شما اجرا نمی‌کند.",
+  "provider.anaconda.state.notRunning":
+    "Anaconda Desktop را باز کنید، راه‌اندازی را تکمیل کرده و وارد شوید، سپس «بررسی مجدد» را انتخاب کنید.",
+  "provider.anaconda.state.invalidConfig":
+    "راه‌اندازی Anaconda Desktop ناقص است. Desktop را باز کنید، راه‌اندازی را تکمیل کنید و در صورت نیاز آن را مجدداً راه‌اندازی کنید.",
+  "provider.anaconda.state.signedOut": "قبل از اتصال Kilo، Anaconda Desktop را باز کرده و وارد شوید.",
+  "provider.anaconda.state.unauthorized":
+    "Kilo نتوانست به Anaconda Desktop دسترسی پیدا کند. Desktop را باز کنید، دوباره وارد شوید و در صورت نیاز آن را مجدداً راه‌اندازی کنید.",
+  "provider.anaconda.state.unavailable":
+    "Anaconda Desktop هنوز پاسخ نمی‌دهد. آن را باز کنید و منتظر بمانید تا برنامه کاملاً راه‌اندازی شود.",
+  "provider.anaconda.state.noModel":
+    "در Anaconda Desktop، یک مدل تولید متن دانلود کنید. در صورت امکان مدلی با قابلیت فراخوانی ابزار انتخاب کنید، سپس سرور آن را راه‌اندازی کنید.",
+  "provider.anaconda.state.noServer_one":
+    "۱ مدل تولید متن دانلودشده در دسترس است. در Anaconda Desktop، یک سرور مدل راه‌اندازی کنید. مدل‌های دارای پشتیبانی از فراخوانی ابزار به شدت توصیه می‌شوند.",
+  "provider.anaconda.state.noServer_other":
+    "{{count}} مدل تولید متن دانلودشده در دسترس است. در Anaconda Desktop، یک سرور مدل راه‌اندازی کنید. مدل‌های دارای پشتیبانی از فراخوانی ابزار به شدت توصیه می‌شوند.",
+  "provider.anaconda.state.unhealthy":
+    "سرور استنتاج فعال هنوز سالم نیست. آن را در Anaconda Desktop بررسی کنید و در صورت نیاز سرور را مجدداً راه‌اندازی کنید.",
+  "provider.anaconda.state.ready":
+    "Kilo یک سرور تولید متن محلی سالم پیدا کرد و می‌تواند تنظیمات اتصال فعلی آن را وارد کند.",
+  "provider.anaconda.server": "سرور استنتاج فعال",
+  "provider.anaconda.context": "پنجره زمینه",
+  "provider.anaconda.contextValue": "{{count}} توکن",
+  "provider.anaconda.tools": "فراخوانی ابزار",
+  "provider.anaconda.tools.supported": "پشتیبانی می‌شود",
+  "provider.anaconda.tools.unsupported": "فعال نیست",
+  "provider.anaconda.tools.unknown": "نامشخص",
+  "provider.anaconda.warning.title": "پشتیبانی از ابزار محدود است",
+  "provider.anaconda.warning.description":
+    "این سرور فراخوانی ابزار را تأیید نمی‌کند. اقدامات عامل کدنویسی ممکن است با شکست مواجه شوند یا در دسترس نباشند. تنها در صورت پذیرش این محدودیت‌ها ادامه دهید.",
+  "provider.anaconda.action.download": "دانلود Anaconda Desktop",
+  "provider.anaconda.action.open": "باز کردن Anaconda Desktop",
+  "provider.anaconda.action.checkAgain": "بررسی مجدد",
+  "provider.anaconda.action.continue": "ادامه به هر حال",
+  "provider.anaconda.action.manage": "مدیریت / بازنشانی",
+  "provider.anaconda.toast.refreshed.title": "Anaconda Desktop بازنشانی شد",
+  "provider.anaconda.toast.refreshed.description": "سرور محلی فعال و مدل‌ها در Kilo به‌روز هستند.",
+  "settings.providers.note.anacondaDesktop": "یک مدل ارائه‌شده به‌صورت محلی توسط Anaconda Desktop را اجرا کنید.",
+  "settings.providers.tag.local": "محلی",
+} as const
+
+export const dict = {
+  ...anacondaDesktopDict,
+
+  "command.provider.connect": "اتصال به ارائه‌دهنده",
+
+  "command.session.new": "جلسه جدید",
+  "command.session.show.changes": "نمایش تغییرات",
+  "command.review.toggle": "نمایش/پنهان کردن بررسی",
+  "revert.banner.count_one": "{{count}} پیام بازگردانده شد",
+  "revert.banner.count_other": "{{count}} پیام بازگردانده شد",
+  "revert.banner.redo": "بازانجام",
+  "revert.banner.redo.all": "بازانجام همه",
+  "revert.banner.hint": "می‌توانید این تغییرات را تا زمانی که پیام جدیدی ارسال نکرده‌اید بازانجام دهید",
+  "revert.banner.workspace.snapshotsDisabled":
+    "مکالمه بازگردانده شد. تغییرات فایل بازیابی نشدند زیرا عکس‌برداری غیرفعال است.",
+  "revert.banner.workspace.unavailable":
+    "مکالمه بازگردانده شد. هیچ نقطه بازیابی فایلی موجود نبود، بنابراین تغییرات فضای کاری بازیابی نشدند.",
+  "revert.banner.workspace.legacy":
+    "مکالمه بازگردانده شد. وضعیت بازیابی فضای کاری برای این بازگردانی قدیمی‌تر در دسترس نیست.",
+  "revert.banner.workspace.enableSnapshots": "فعال‌سازی اسنپ‌شات‌ها",
+  "revert.disabled.agentBusy": "منتظر بمانید تا عامل کارش تمام شود",
+  "command.session.compact": "فشرده‌سازی جلسه",
+  "command.session.export": "صدور رونوشت جلسه",
+
+  "agentRequirements.skill.installed": "نصب شده",
+  "agentRequirements.skill.checkFailed": "بررسی مهارت ناموفق بود",
+  "agentRequirements.skill.missing": "نصب نشده",
+  "agentRequirements.mcp.connected": "متصل",
+  "agentRequirements.mcp.checkFailed": "بررسی MCP ناموفق بود",
+  "agentRequirements.mcp.missing": "متصل نیست",
+  "agentRequirements.extension.installed": "نصب شده",
+  "agentRequirements.extension.checkFailed": "بررسی افزونه VS Code ناموفق بود",
+  "agentRequirements.extension.missing": "نصب نشده",
+  "agentRequirements.extension.description": "افزونه‌های مفقود را در VS Code نصب کنید.",
+  "agentRequirements.group.skills": "مهارت‌ها",
+  "agentRequirements.group.mcps": "MCPs",
+  "agentRequirements.group.extensions": "افزونه‌های VS Code",
+  "agentRequirements.blocked.title": "پیش‌نیازهای عامل {{agent}}",
+  "agentRequirements.blocked.description": "این عامل پیش از اجرا به ابزارهای زیر نیاز دارد.",
+  "agentRequirements.prompt.blocked": "ابتدا بررسی‌های لازم را تکمیل کنید تا بتوانید از این عامل استفاده کنید",
+  "agentRequirements.action.openMarketplace": "باز کردن Marketplace",
+  "agentRequirements.error.unknownAgent": "عامل انتخاب‌شده یافت نشد.",
+  "agentRequirements.error.malformedDeclaration": "این عامل دارای اعلان پیش‌نیاز نامعتبر است.",
+  "agentRequirements.error.discoveryFailed": "Kilo نتوانست مهارت‌های موجود را بررسی کند.",
+  "agentRequirements.error.mcpStatusFailed": "Kilo نتوانست وضعیت سرور MCP را بررسی کند.",
+  "agentRequirements.error.scopeMismatch": "این بررسی نیازمندی‌های عامل دیگر فعال نیست.",
+  "agentRequirements.error.requestFailed": "Kilo نتوانست نیازمندی‌های عامل را بررسی کند.",
+
+  "dialog.provider.search.placeholder": "جستجوی ارائه‌دهندگان",
+  "dialog.provider.empty": "ارائه‌دهنده‌ای یافت نشد",
+  "dialog.provider.group.other": "سایر",
+  "dialog.provider.tag.recommended": "پیشنهادی",
+
+  "dialog.model.select.title": "انتخاب مدل",
+  "dialog.model.search.placeholder": "جستجوی مدل‌ها",
+  "dialog.model.empty": "نتیجه‌ای یافت نشد",
+  "dialog.model.select": "انتخاب",
+  "dialog.model.expand": "گسترش",
+  "dialog.model.collapse": "جمع‌کردن",
+
+  "dialog.provider.viewAll": "نمایش ارائه‌دهندگان بیشتر",
+
+  "provider.connect.title": "اتصال به {{provider}}",
+  "provider.connect.selectMethod": "روش ورود را برای {{provider}} انتخاب کنید.",
+  "provider.connect.method.apiKey": "کلید API",
+  "provider.connect.status.inProgress": "در حال احراز هویت...",
+  "provider.connect.status.waiting": "در انتظار احراز هویت...",
+  "provider.connect.status.failed": "احراز هویت ناموفق بود: {{error}}",
+  "provider.connect.apiKey.description":
+    "کلید API {{provider}} خود را وارد کنید تا حساب‌تان متصل شود و از مدل‌های {{provider}} در Kilo استفاده کنید.",
+  "provider.connect.apiKey.description.local":
+    "به سرور محلی {{provider}} خود متصل شوید. اگر سرور نیازی به کلید API ندارد، آن را خالی بگذارید (پیش‌فرض برای localhost).",
+  "provider.connect.atomicChat.description":
+    "به Atomic Chat روی دستگاه خود متصل شوید (پیش‌فرض http://127.0.0.1:1337). برای سرور محلی نیازی به کلید API نیست — Atomic Chat را راه‌اندازی کنید، یک مدل بارگذاری کنید، سپس متصل شوید.",
+  "provider.connect.apiKey.label": "کلید API {{provider}}",
+  "provider.connect.apiKey.label.optional": "کلید API {{provider}} (اختیاری)",
+  "provider.connect.apiKey.placeholder": "کلید API",
+  "provider.connect.apiKey.placeholder.optional": "برای سرور محلی خالی بگذارید",
+  "provider.connect.apiKey.required": "کلید API الزامی است",
+  "provider.connect.prompt.required": "{{field}} الزامی است",
+  "provider.connect.azure.endpointType.label": "پیکربندی endpoint Azure را انتخاب کنید",
+  "provider.connect.azure.endpointType.resourceName.label": "نام منبع",
+  "provider.connect.azure.endpointType.resourceName.hint": "نقطه پایانی را از نام منبع Azure خود بسازید",
+  "provider.connect.azure.endpointType.baseURL.label": "URL کامل نقطه پایانی",
+  "provider.connect.azure.endpointType.baseURL.hint": "از یک نقطه پایانی سفارشی Azure OpenAI استفاده کنید",
+  "provider.connect.azure.resourceName.label": "نام منبع Azure",
+  "provider.connect.azure.resourceName.placeholder": "مثلاً my-models",
+  "provider.connect.azure.baseURL.label": "URL نقطه پایانی Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "مثلاً https://my-models.openai.azure.com/openai",
+  "provider.connect.oauth.code.visit.prefix": "به ",
+  "provider.connect.oauth.code.visit.link": "این لینک",
+  "provider.connect.oauth.code.visit.suffix":
+    " مراجعه کنید تا کد مجوز خود را دریافت کرده، حساب خود را متصل کنید و از مدل‌های {{provider}} در Kilo استفاده کنید.",
+  "provider.connect.oauth.code.label": "کد مجوز {{method}}",
+  "provider.connect.oauth.code.placeholder": "کد مجوز",
+  "provider.connect.oauth.code.required": "کد مجوز الزامی است",
+  "provider.connect.oauth.auto.visit.prefix": "به ",
+  "provider.connect.oauth.auto.visit.link": "این لینک",
+  "provider.connect.oauth.auto.visit.suffix":
+    " مراجعه کنید و کد زیر را وارد کنید تا حساب خود را متصل کرده و از مدل‌های {{provider}} در Kilo استفاده کنید.",
+  "provider.connect.oauth.auto.confirmationCode": "کد تأیید",
+  "provider.connect.toast.connected.title": "{{provider}} متصل شد",
+  "provider.connect.toast.connected.description": "مدل‌های {{provider}} اکنون در دسترس هستند.",
+
+  "provider.disconnect.toast.disconnected.title": "{{provider}} قطع شد",
+  "provider.disconnect.toast.disconnected.description": "مدل‌های {{provider}} دیگر در دسترس نیستند.",
+
+  "model.tag.free": "رایگان",
+  "model.tag.dataCollected": "ممکن است داده‌ها برای آموزش استفاده شوند",
+  "model.group.auto": "مدل‌های خودکار",
+  "model.group.recommended": "پیشنهادی",
+  "model.group.favorites": "موردعلاقه‌ها",
+  "model.favorite.add": "افزودن به موردعلاقه‌ها",
+  "model.favorite.remove": "حذف از موردعلاقه‌ها",
+  "model.preview.label.released": "منتشر شده",
+  "model.preview.label.input": "ورودی",
+  "model.preview.label.output": "خروجی",
+  "model.preview.label.cached": "کش شده",
+  "model.preview.label.average": "هزینه تخمینی میانگین",
+  "model.preview.label.context": "زمینه",
+  "model.preview.group.terminalBench": "Terminal Bench 2.0",
+  "model.preview.group.autoEfficientChoices": "انتخاب‌های مدل",
+  "model.preview.label.completion": "تکمیل",
+  "model.preview.label.costAttempt": "هزینه / تلاش",
+  "model.preview.value.notSupported": "پشتیبانی نمی‌شود",
+  "model.preview.tooltip.average":
+    "میانگین هزینه تخمینی بر اساس نسبت معمول توکن‌های ورودی، خروجی و خواندن کش محاسبه می‌شود.",
+  "model.preview.badge.reasoning": "استدلال",
+  "model.preview.modality.text": "متن",
+  "model.preview.modality.image": "تصاویر",
+  "model.preview.modality.audio": "صدا",
+  "model.preview.modality.video": "ویدیو",
+  "model.preview.modality.pdf": "PDF",
+
+  "common.goBack": "بازگشت",
+  "common.loading": "در حال بارگذاری",
+  "common.cancel": "لغو",
+  "common.connect": "اتصال",
+  "common.disconnect": "قطع اتصال",
+  "common.submit": "ارسال",
+  "common.save": "ذخیره",
+  "common.saving": "در حال ذخیره...",
+  "common.default": "پیش‌فرض",
+
+  "prompt.thinking.tooltip": "میزان استدلال",
+  "prompt.action.send": "ارسال",
+  "prompt.action.send.blocked": "ابتدا به سؤال در انتظار پاسخ دهید یا آن را رد کنید",
+  "prompt.action.send.recording": "رونویسی و ارسال",
+  "prompt.action.stop": "توقف",
+  "prompt.action.enhance": "بهبود پرامپت",
+  "prompt.action.indexing": "تنظیمات ایندکس‌گذاری",
+  "prompt.action.autoApprove.enable": "فعال‌سازی تأیید خودکار",
+  "prompt.action.autoApprove.disable": "غیرفعال‌سازی تأیید خودکار",
+  "prompt.action.autoApprove.enabled": "تأیید خودکار فعال است. درخواست‌های مجوز به‌صورت خودکار تأیید می‌شوند.",
+  "prompt.action.autoApprove.disabled": "تأیید خودکار غیرفعال است. برای تأیید خودکار درخواست‌های مجوز کلیک کنید.",
+  "prompt.action.sandbox.enable": "فعال‌سازی سندباکس",
+  "prompt.action.sandbox.disable": "غیرفعال‌سازی سندباکس",
+  "prompt.action.sandbox.enabled": "سندباکس فعال است. دستورات شل عامل به پوشه‌های پروژه و Kilo محدود شده‌اند.",
+  "prompt.action.sandbox.disabled":
+    "سندباکس غیرفعال است. برای محدود کردن نوشتن دستورات شل عامل به پوشه‌های پروژه و Kilo کلیک کنید.",
+  "prompt.action.sandbox.status.enabled": "Sandbox فعال",
+  "prompt.action.sandbox.status.disabled": "Sandbox غیرفعال",
+  "prompt.action.sandbox.filesystem": "سیستم فایل",
+  "prompt.action.sandbox.network": "شبکه",
+  "prompt.action.sandbox.filesystem.restricted": "محدود",
+  "prompt.action.sandbox.network.blocked": "مسدود",
+  "prompt.action.sandbox.network.allowed": "مجاز",
+  "prompt.action.sandbox.unrestricted": "بدون محدودیت",
+  "prompt.action.sandbox.description.enabled": "نوشتن‌ها به پوشه‌های پروژه و Kilo محدود شده‌اند.",
+  "prompt.action.sandbox.description.disabled": "برای محدود کردن نوشتن در سیستم فایل و دسترسی به شبکه کلیک کنید.",
+  "prompt.action.sandbox.description.disabledNetworkAllowed":
+    "برای محدود کردن نوشتن در سیستم فایل کلیک کنید. دسترسی به شبکه طبق تنظیمات sandbox شما مجاز است.",
+  "prompt.action.resetModel": "بازنشانی مدل به حالت پیش‌فرض",
+  "prompt.action.enhanceDescription":
+    "دکمه «بهبود پرامپت» با ارائه زمینه بیشتر، توضیح یا بازنویسی، به بهتر کردن پرامپت شما کمک می‌کند. یک پرامپت تایپ کنید و دوباره روی دکمه کلیک کنید تا نحوه عملکرد آن را ببینید.",
+  "speechToText.tooltip.start": "شروع ورودی صوتی با Kilo Gateway",
+  "speechToText.tooltip.starting": "در حال راه‌اندازی میکروفون... منتظر بمانید.",
+  "speechToText.tooltip.stop": "در حال ضبط. برای توقف کلیک کنید.",
+  "speechToText.tooltip.transcribing": "در حال رونویسی... برای لغو کلیک کنید.",
+  "speechToText.tooltip.error": "ورودی صوتی ناموفق بود. برای پاک کردن کلیک کنید.",
+  "speechToText.error.title": "ورودی صوتی ناموفق بود",
+  "speechToText.error.loginRequired": "برای استفاده از ورودی صوتی وارد Kilo شوید.",
+  "speechToText.error.emptyTranscript": "هیچ گفتاری شناسایی نشد.",
+
+  "prompt.toast.promptSendFailed.title": "ارسال پرامپت ناموفق بود",
+
+  "mcp.status.connected": "متصل",
+  "mcp.status.failed": "ناموفق",
+  "mcp.status.needs_auth": "نیاز به احراز هویت",
+  "mcp.status.needs_registration": "نیاز به ثبت کلاینت",
+  "mcp.status.disabled": "غیرفعال",
+
+  "toast.session.rename.invalid.title": "عنوان جلسه نامعتبر است",
+
+  "error.startup.title": "اتصال به سرور ناموفق بود",
+
+  "error.paidModel.title": "برای استفاده از این مدل باید وارد شوید",
+  "error.paidModel.description":
+    "برای دسترسی به بیش از ۵۰۰ مدل، استفاده از اعتبار با هزینه واقعی یا استفاده از کلید خودتان، وارد شوید یا حساب کاربری بسازید.",
+  "error.paidModel.action": "ورود",
+  "error.promotionLimit.title": "برای ادامه باید ثبت‌نام کنید",
+  "error.promotionLimit.description":
+    "برای ادامه و دسترسی به ۵۰۰ مدل دیگر، رایگان ثبت‌نام کنید. تنها ۲ دقیقه طول می‌کشد و نیازی به کارت اعتباری نیست. یا بعداً برگردید.",
+  "error.promotionLimit.action": "ثبت‌نام",
+  "error.providerAuth.title": "{{provider}} شما را خارج کرد",
+  "error.providerAuth.description": "{{provider}} را دوباره متصل کنید، سپس پیام خود را مجدداً ارسال کنید.",
+  "error.providerAuth.chatgpt.title": "OpenAI شما را خارج کرد",
+  "error.providerAuth.chatgpt.description":
+    "دوباره با ChatGPT وارد شوید، سپس پیام خود را مجدداً ارسال کنید تا از مدل‌های Codex استفاده کنید.",
+
+  "notification.permission.title": "مجوز لازم است",
+  "notification.permission.titleSubagent": "مجوز مورد نیاز است (زیرعامل)",
+  "ui.permission.manageAutoApprove": "مدیریت قوانین تأیید خودکار",
+  "ui.permission.doomLoop.prompt": "حلقه احتمالی برای ابزار {{tool}} شناسایی شد. ادامه می‌دهید؟",
+  "ui.permission.doomLoop.rule": "ادامه فراخوانی‌های {{tool}}",
+  "ui.permission.rule.addToAllowed": "افزودن به لیست مجاز",
+  "ui.permission.rule.removeFromAllowed": "حذف از لیست مجاز",
+  "ui.permission.rule.addToDenied": "افزودن به لیست مسدود",
+  "ui.permission.rule.removeFromDenied": "حذف از لیست مسدود",
+  "ui.permission.toolLabel.read": "خواندن",
+  "ui.permission.toolLabel.edit": "ویرایش",
+  "ui.permission.toolLabel.write": "نوشتن",
+  "ui.permission.toolLabel.patch": "وصله",
+  "ui.permission.toolLabel.globSearch": "جستجوی Glob",
+  "ui.permission.toolLabel.grepSearch": "جستجوی Grep",
+  "ui.permission.toolLabel.webSearch": "جستجوی وب",
+  "ui.permission.toolLabel.list": "فهرست",
+  "ui.permission.toolLabel.externalDirectory": "دسترسی به پوشه خارجی",
+  "ui.permission.toolLabel.webFetch": "دریافت از وب",
+  "ui.permission.toolLabel.task": "وظیفه",
+  "ui.permission.toolLabel.skill": "مهارت",
+  "ui.permission.toolLabel.lsp": "LSP",
+  "ui.permission.toolLabel.bash": "Bash",
+  "ui.permission.toolLabel.todoRead": "خواندن Todo",
+  "ui.permission.toolLabel.todoWrite": "نوشتن Todo",
+  "ui.permission.toolLabel.codeSearch": "جستجوی کد",
+  "ui.permission.copyCommand": "کپی",
+  "ui.approval.auto": "تأیید خودکار",
+  "ui.approval.manual": "تأیید شده توسط شما",
+  "ui.approval.rule": "با قانون `{{pattern}}` از `{{permission}}` مطابقت داشت",
+  "ui.approval.source.agent": "توسط عامل {{agent}}",
+  "ui.approval.source.agent.default": "توسط عامل",
+  "ui.approval.source.global": "توسط تنظیمات سراسری شما",
+  "ui.approval.source.project": "توسط تنظیمات پروژه",
+  "ui.approval.source.yolo": "توسط حالت تأیید خودکار (YOLO)",
+  "ui.approval.source.session": "توسط قانون تأیید خودکار جلسه",
+  "ui.approval.source.default": "به‌طور پیش‌فرض",
+
+  "session.tab.review": "بررسی",
+  "session.review.filesChanged": "{{count}} فایل تغییر یافته",
+  "session.review.change.other": "تغییرات",
+  "session.review.loadingChanges": "در حال بارگذاری تغییرات...",
+  "session.review.noChanges": "بدون تغییر",
+
+  "session.messages.loadingEarlier": "در حال بارگذاری پیام‌های قبلی...",
+  "session.messages.loadEarlier": "بارگذاری پیام‌های قبلی",
+  "session.messages.loading": "در حال بارگذاری پیام‌ها...",
+
+  "common.closeTab": "بستن برگه",
+  "common.signIn": "ورود",
+  "common.dismiss": "رد کردن",
+  "common.requestFailed": "درخواست ناموفق بود",
+  "common.rename": "تغییر نام",
+  "common.delete": "حذف",
+  "common.close": "بستن",
+  "common.edit": "ویرایش",
+  "common.loadMore": "بارگذاری بیشتر",
+
+  "sidebar.settings": "تنظیمات",
+
+  "sound.option.alert01": "هشدار ۰۱",
+  "sound.option.alert02": "هشدار ۰۲",
+  "sound.option.alert03": "هشدار ۰۳",
+  "sound.option.alert04": "هشدار ۰۴",
+  "sound.option.alert05": "هشدار ۰۵",
+  "sound.option.alert06": "هشدار ۰۶",
+  "sound.option.alert07": "هشدار ۰۷",
+  "sound.option.alert08": "هشدار ۰۸",
+  "sound.option.alert09": "هشدار ۰۹",
+  "sound.option.alert10": "هشدار ۱۰",
+  "sound.option.bipbop01": "بیپ-باپ ۰۱",
+  "sound.option.bipbop02": "Bip-bop 02",
+  "sound.option.bipbop03": "Bip-bop 03",
+  "sound.option.bipbop04": "Bip-bop 04",
+  "sound.option.bipbop05": "Bip-bop 05",
+  "sound.option.bipbop06": "Bip-bop 06",
+  "sound.option.bipbop07": "Bip-bop 07",
+  "sound.option.bipbop08": "Bip-bop 08",
+  "sound.option.bipbop09": "Bip-bop 09",
+  "sound.option.bipbop10": "Bip-bop 10",
+  "sound.option.staplebops01": "Staplebops 01",
+  "sound.option.staplebops02": "Staplebops 02",
+  "sound.option.staplebops03": "Staplebops 03",
+  "sound.option.staplebops04": "Staplebops 04",
+  "sound.option.staplebops05": "Staplebops 05",
+  "sound.option.staplebops06": "Staplebops 06",
+  "sound.option.staplebops07": "Staplebops 07",
+  "sound.option.nope01": "Nope 01",
+  "sound.option.nope02": "Nope 02",
+  "sound.option.nope03": "Nope 03",
+  "sound.option.nope04": "Nope 04",
+  "sound.option.nope05": "نه ۰۵",
+  "sound.option.nope06": "نه ۰۶",
+  "sound.option.nope07": "نه ۰۷",
+  "sound.option.nope08": "نه ۰۸",
+  "sound.option.nope09": "نه ۰۹",
+  "sound.option.nope10": "نه ۱۰",
+  "sound.option.nope11": "نه ۱۱",
+  "sound.option.nope12": "نه ۱۲",
+  "sound.option.yup01": "بله ۰۱",
+  "sound.option.yup02": "بله ۰۲",
+  "sound.option.yup03": "Yup 03",
+  "sound.option.yup04": "Yup 04",
+  "sound.option.yup05": "Yup 05",
+  "sound.option.yup06": "Yup 06",
+
+  "settings.providers.title": "ارائه‌دهندگان",
+  "settings.providers.section.connected": "ارائه‌دهندگان متصل",
+  "settings.providers.connected.empty": "هیچ ارائه‌دهنده متصلی وجود ندارد",
+  "settings.providers.section.popular": "ارائه‌دهندگان محبوب",
+  "settings.providers.tag.gateway": "Gateway",
+  "settings.providers.tag.environment": "محیط",
+  "settings.providers.tag.config": "پیکربندی",
+  "settings.providers.tag.chatgpt": "ChatGPT",
+  "settings.providers.tag.custom": "سفارشی",
+  "settings.providers.tag.customProvider": "ارائه‌دهنده سفارشی",
+  "settings.providers.tag.other": "سایر",
+  "settings.providers.connected.environmentDescription": "از متغیرهای محیطی شما متصل شده است",
+  "settings.providers.action.signInChatGPT": "ورود با ChatGPT",
+  "settings.providers.custom.description": "یک ارائه‌دهنده سفارشی از طریق URL پایه اضافه کنید.",
+
+  "provider.custom.title": "ارائه‌دهنده سفارشی",
+  "provider.custom.description.prefix": "یک ارائه‌دهنده سفارشی پیکربندی کنید. به ",
+  "provider.custom.description.link": "مستندات پیکربندی ارائه‌دهنده",
+  "provider.custom.description.suffix": ".",
+  "provider.custom.field.providerID.label": "شناسه ارائه‌دهنده",
+  "provider.custom.field.providerID.placeholder": "myprovider",
+  "provider.custom.field.providerID.description": "حروف کوچک، اعداد، خط تیره یا زیرخط",
+  "provider.custom.field.name.label": "نام نمایشی",
+  "provider.custom.field.name.placeholder": "ارائه‌دهنده هوش مصنوعی من",
+  "provider.custom.field.package.label": "API ارائه‌دهنده",
+  "provider.custom.field.baseURL.label": "URL پایه",
+  "provider.custom.field.baseURL.placeholder": "https://api.myprovider.com/v1",
+  "provider.custom.field.apiKey.label": "کلید API",
+  "provider.custom.field.apiKey.placeholder": "کلید API",
+  "provider.custom.field.apiKey.description": "اختیاری. اگر احراز هویت را از طریق هدرها مدیریت می‌کنید، خالی بگذارید.",
+  "provider.custom.models.label": "مدل‌ها",
+  "provider.custom.models.id.label": "شناسه",
+  "provider.custom.models.id.placeholder": "model-id",
+  "provider.custom.models.name.label": "نام",
+  "provider.custom.models.name.placeholder": "نام نمایشی",
+  "provider.custom.models.reasoning.label": "استدلال",
+  "provider.custom.models.modalities.image": "تصویر",
+  "provider.custom.models.variants.label": "نسخه‌های متغیر",
+  "provider.custom.models.variants.add": "افزودن نسخه متغیر",
+  "provider.custom.models.variants.remove": "حذف نسخه متغیر",
+  "provider.custom.models.variants.name.label": "نام",
+  "provider.custom.models.variants.name.placeholder": "مثلاً thinking",
+  "provider.custom.models.variants.option.unset": "(تنظیم نشده)",
+  "provider.custom.models.variants.enableThinking.label": "فعال‌سازی تفکر (مثلاً Alibaba)",
+  "provider.custom.models.variants.enableThinking.placeholder": "enable_thinking",
+  "provider.custom.models.variants.enableThinking.true": "true",
+  "provider.custom.models.variants.enableThinking.false": "false",
+  "provider.custom.models.variants.thinking.label": "نوع تفکر (مثلاً Z.ai)",
+  "provider.custom.models.variants.thinking.placeholder": "thinking",
+  "provider.custom.models.variants.thinking.enabled": "فعال",
+  "provider.custom.models.variants.thinking.disabled": "غیرفعال",
+  "provider.custom.models.variants.thinking.adaptive": "تطبیقی",
+  "provider.custom.models.variants.splitReasoning.label": "تقسیم استدلال (لازم برای مثلاً MiniMax)",
+  "provider.custom.models.variants.splitReasoning.placeholder": "reasoning_split",
+  "provider.custom.models.variants.splitReasoning.true": "true",
+  "provider.custom.models.variants.splitReasoning.false": "false",
+  "provider.custom.models.variants.chatTemplateArgs.label":
+    "فعال‌سازی تفکر از طریق آرگومان‌های قالب چت (مثلاً Hugging Face)",
+  "provider.custom.models.variants.chatTemplateArgs.placeholder": "chat_template_args",
+  "provider.custom.models.variants.chatTemplateArgs.true": "true",
+  "provider.custom.models.variants.chatTemplateArgs.false": "false",
+  "provider.custom.models.variants.reasoningEffort.label": "سطح استدلال",
+  "provider.custom.models.variants.reasoningEffort.placeholder": "reasoningEffort",
+  "provider.custom.models.variants.reasoningEffort.none": "هیچ",
+  "provider.custom.models.variants.reasoningEffort.minimal": "حداقل",
+  "provider.custom.models.variants.reasoningEffort.low": "کم",
+  "provider.custom.models.variants.reasoningEffort.medium": "متوسط",
+  "provider.custom.models.variants.reasoningEffort.high": "زیاد",
+  "provider.custom.models.variants.reasoningEffort.xhigh": "xhigh",
+  "provider.custom.models.variants.outputEffort.label": "تلاش خروجی (مثلاً Anthropic)",
+  "provider.custom.models.variants.outputEffort.placeholder": "تلاش",
+  "provider.custom.models.variants.outputEffort.low": "کم",
+  "provider.custom.models.variants.outputEffort.medium": "متوسط",
+  "provider.custom.models.variants.outputEffort.high": "زیاد",
+  "provider.custom.models.variants.outputEffort.xhigh": "xhigh",
+  "provider.custom.models.variants.outputEffort.max": "حداکثر",
+  "provider.custom.models.remove": "حذف مدل",
+  "provider.custom.models.add": "افزودن مدل",
+  "provider.custom.models.fetch.authError": "احراز هویت ناموفق بود. کلید API بالا را بررسی کرده و دوباره امتحان کنید.",
+  "provider.custom.models.fetch.empty": "هیچ مدلی در این سرور یافت نشد.",
+  "provider.custom.models.fetch.added": "{{count}} مدل اضافه شد.",
+  "provider.custom.models.fetch.allExist": "تمام مدل‌های دریافت‌شده قبلاً اضافه شده‌اند.",
+  "provider.custom.models.fetch.selectAll": "انتخاب همه",
+  "provider.custom.models.fetch.deselectAll": "لغو انتخاب همه",
+  "provider.custom.models.fetch.found": "{{count}} مدل یافت شد",
+  "provider.custom.models.fetch.showing": "نمایش {{shown}} از {{total}}",
+  "provider.custom.models.fetch.search": "جستجوی مدل‌ها…",
+  "provider.custom.models.fetch.add": "افزودن {{count}} مدل",
+  "provider.custom.edit.title": "ویرایش ارائه‌دهنده",
+  "provider.custom.headers.label": "هدرها (اختیاری)",
+  "provider.custom.headers.key.label": "هدر",
+  "provider.custom.headers.key.placeholder": "Header-Name",
+  "provider.custom.headers.value.label": "مقدار",
+  "provider.custom.headers.value.placeholder": "value",
+  "provider.custom.headers.remove": "حذف هدر",
+  "provider.custom.headers.add": "افزودن هدر",
+  "provider.custom.error.providerID.required": "شناسه ارائه‌دهنده الزامی است",
+  "provider.custom.error.providerID.format": "از حروف کوچک، اعداد، خط تیره یا زیرخط استفاده کنید",
+  "provider.custom.error.providerID.exists": "این شناسه ارائه‌دهنده از قبل وجود دارد",
+  "provider.custom.error.name.required": "نام نمایشی الزامی است",
+  "provider.custom.error.baseURL.required": "URL پایه الزامی است",
+  "provider.custom.error.baseURL.format": "باید با http:// یا https:// شروع شود",
+  "provider.custom.error.required": "الزامی",
+  "provider.custom.error.duplicate": "تکراری",
+  "settings.openLocalConfig": "پیکربندی محلی",
+  "settings.openGlobalConfig": "پیکربندی سراسری",
+  "settings.config.scope.local": "محلی",
+  "settings.config.scope.global": "سراسری",
+  "settings.config.status.loaded": "بارگذاری شد",
+  "settings.config.status.loadedLegacy": "پیکربندی قدیمی بارگذاری شد",
+  "settings.config.status.notLoaded": "بارگذاری نشد",
+  "settings.config.status.create": "یافت نشد - این فایل را ایجاد کنید",
+  "settings.config.title": "باز کردن فایل پیکربندی {{scope}} Kilo",
+  "settings.config.placeholder":
+    "فایل‌های پیکربندی به ترتیب ادغام می‌شوند؛ فایل‌های علامت‌گذاری‌شده به‌عنوان بارگذاری‌شده در حال حاضر روی تنظیمات تأثیر می‌گذارند.",
+  "settings.config.noWorkspace": "یک پوشه کاری باز کنید تا فایل پیکربندی محلی Kilo را ویرایش کنید.",
+  "settings.config.openFailed": "باز کردن فایل پیکربندی {{scope}} Kilo با شکست مواجه شد: {{message}}",
+  "settings.config.source.xdg": "پیکربندی سراسری XDG",
+  "settings.config.source.homeKilo": "پیکربندی .kilo در پوشه خانگی",
+  "settings.config.source.homeKilocode": "پیکربندی .kilocode در پوشه خانگی",
+  "settings.config.source.homeOpencode": "پیکربندی .opencode در پوشه خانگی",
+  "settings.config.source.envFile": "فایل محیطی KILO_CONFIG",
+  "settings.config.source.envDir": "KILO_CONFIG_DIR",
+  "settings.config.source.envContent": "پیکربندی محیطی درون‌خطی",
+  "settings.config.source.projectKilo": "پیکربندی .kilo پروژه",
+  "settings.config.source.projectRoot": "پیکربندی ریشه پروژه",
+  "settings.config.source.projectKilocode": "پیکربندی قدیمی .kilocode",
+  "settings.config.source.projectOpencode": "پیکربندی قدیمی .opencode",
+  "settings.models.title": "مدل‌ها",
+
+  "settings.permissions.toast.updateFailed.title": "به‌روزرسانی مجوزها ناموفق بود",
+
+  "settings.permissions.tool.read.title": "خواندن",
+  "settings.permissions.tool.read.description": "خواندن یک فایل (با مسیر فایل تطابق دارد)",
+  "settings.permissions.tool.edit.title": "ویرایش",
+  "settings.permissions.tool.edit.description": "تغییر فایل‌ها، شامل ویرایش، نوشتن، وصله‌گذاری و ویرایش‌های چندگانه",
+  "settings.permissions.tool.glob.title": "Glob",
+  "settings.permissions.tool.glob.description": "تطبیق فایل‌ها با استفاده از الگوهای glob",
+  "settings.permissions.tool.grep.title": "Grep",
+  "settings.permissions.tool.grep.description": "جستجوی محتوای فایل‌ها با استفاده از عبارات منظم",
+  "settings.permissions.tool.list.title": "فهرست",
+  "settings.permissions.tool.list.description": "فهرست کردن فایل‌های درون یک پوشه",
+  "settings.permissions.tool.bash.title": "Bash",
+  "settings.permissions.tool.bash.description": "اجرای دستورات شل",
+  "settings.permissions.tool.task.title": "وظیفه",
+  "settings.permissions.tool.task.description": "راه‌اندازی زیر-عامل‌ها",
+  "settings.permissions.tool.skill.title": "مهارت",
+  "settings.permissions.tool.skill.description": "بارگذاری یک مهارت با نام",
+  "settings.permissions.tool.lsp.title": "LSP",
+  "settings.permissions.tool.lsp.description": "اجرای پرس‌وجوهای سرور زبان",
+  "settings.permissions.tool.todoread.title": "خواندن وظایف",
+  "settings.permissions.tool.todoread.description": "خواندن فهرست وظایف",
+  "settings.permissions.tool.todowrite.title": "نوشتن وظایف",
+  "settings.permissions.tool.todowrite.description": "به‌روزرسانی فهرست وظایف",
+  "settings.permissions.tool.webfetch.title": "دریافت وب",
+  "settings.permissions.tool.webfetch.description": "دریافت محتوا از یک URL",
+  "settings.permissions.tool.websearch.title": "جستجوی وب",
+  "settings.permissions.tool.websearch.description": "جستجو در وب",
+  "settings.permissions.tool.codesearch.title": "جستجوی کد",
+  "settings.permissions.tool.codesearch.description": "جستجوی کد در وب",
+  "settings.permissions.tool.external_directory.title": "پوشه خارجی",
+  "settings.permissions.tool.external_directory.description": "دسترسی به فایل‌های خارج از پوشه پروژه",
+  "settings.permissions.tool.doom_loop.title": "حلقه بی‌پایان",
+  "settings.permissions.tool.doom_loop.description": "تشخیص فراخوانی‌های تکراری ابزار با ورودی یکسان",
+
+  "session.delete.title": "حذف جلسه",
+  "session.delete.confirm": "حذف جلسه «{{name}}»؟",
+  "session.delete.button": "حذف جلسه",
+  "session.untitled": "بدون عنوان",
+  "session.current": "جلسه فعلی",
+  "session.recent": "اخیر",
+  "session.showHistory": "نمایش تاریخچه",
+  "session.history.sources": "منبع تاریخچه",
+  "session.search.placeholder": "جستجوی جلسات...",
+  "session.empty": "هنوز جلسه‌ای وجود ندارد. برای شروع مکالمه جدید روی + کلیک کنید.",
+  "session.tabs.switcher.open": "نمایش تب‌های باز",
+  "session.tabs.switcher.search": "جستجو در تب‌های باز...",
+  "session.tabs.switcher.current": "فعلی",
+  "session.tabs.switcher.pending": "جدید",
+  "session.tabs.switcher.busy": "در حال کار",
+  "session.tab.local": "محلی",
+  "session.tab.cloud": "Cloud",
+  "session.tab.worktree": "Worktree",
+  "session.cloud.repoOnly": "فقط این مخزن",
+  "session.cloud.import": "وارد کردن جلسه",
+  "feedback.button": "بازخورد و پشتیبانی",
+  "feedback.dialog.message": "خوشحال می‌شویم نظرات شما را بشنویم یا در رفع مشکلاتتان کمک کنیم.",
+  "feedback.dialog.github": "گزارش مشکل در GitHub",
+  "feedback.dialog.discord": "پیوستن به جامعه Discord ما",
+  "feedback.dialog.support": "پشتیبانی مشتریان",
+  "workStyle.onboarding.welcome": "به Kilo خوش آمدید",
+  "workStyle.onboarding.title": "نحوه کار خود را انتخاب کنید",
+  "workStyle.onboarding.settingsNote": "می‌توانید این گزینه‌ها را هر زمان در",
+  "workStyle.onboarding.settings": "تنظیمات تغییر دهید.",
+  "workStyle.toast.saved.title": "حالت با موفقیت ذخیره شد",
+  "workStyle.choice.permissions": "مجوزها",
+  "workStyle.choice.bash": "Bash",
+  "workStyle.choice.visibility": "نمایان‌پذیری",
+  "workStyle.choice.human-in-the-loop.eyebrow": "انسان در حلقه",
+  "workStyle.choice.human-in-the-loop.title": "ابتدا بررسی کنید",
+  "workStyle.choice.human-in-the-loop.description": "Kilo در حین کار مکث می‌کند و برنامه خود را به شما نشان می‌دهد.",
+  "workStyle.choice.human-in-the-loop.permissions": "قبل از ویرایش فایل‌ها یا اجرای دستورات اجازه می‌گیرد.",
+  "workStyle.choice.human-in-the-loop.bash": "هنگام اجرای تمام دستورات ترمینال اجازه می‌گیرد.",
+  "workStyle.choice.human-in-the-loop.visibility": "جزئیات کامل مکالمه، از جمله استدلال، را نمایش می‌دهد.",
+  "workStyle.choice.autonomous.eyebrow": "وقفه‌های کمتر",
+  "workStyle.choice.autonomous.title": "استقلال بالا",
+  "workStyle.choice.autonomous.description": "وقفه‌های کمتر، رابط کاربری ساده‌تر.",
+  "workStyle.choice.autonomous.permissions":
+    "بدون درخواست اجازه، فایل‌ها را ویرایش می‌کند و دستورات را در فضای کاری اجرا می‌کند.",
+  "workStyle.choice.autonomous.bash": "می‌تواند بدون تأیید، دستورات ترمینال را در فضای کاری اجرا کند.",
+  "workStyle.choice.autonomous.visibility": "جزئیات تا زمانی که آن‌ها را باز کنید، جمع‌شده باقی می‌مانند.",
+  "session.cloud.import.title": "وارد کردن جلسه",
+  "session.cloud.import.placeholder": "شناسه جلسه، URL، یا دستور kilo import",
+  "session.cloud.import.button": "وارد کردن",
+  "session.cloud.import.invalid": "فرمت شناسه جلسه نامعتبر است",
+  "session.cloud.import.legacy": "به نظر می‌رسد این یک جلسه قدیمی است که دیگر پشتیبانی نمی‌شود.",
+  "session.cloud.import.failed": "وارد کردن جلسه ابری ناموفق بود",
+
+  "deviceAuth.toast.urlCopied": "URL در کلیپ‌بورد کپی شد",
+  "deviceAuth.toast.codeCopied": "کد در کلیپ‌بورد کپی شد",
+  "deviceAuth.toast.errorCopied": "خطا در کلیپ‌بورد کپی شد",
+  "deviceAuth.status.initiating": "در حال شروع ورود...",
+  "deviceAuth.title": "ورود به Kilo Code",
+  "deviceAuth.step1": "مرحله ۱: این URL را باز کنید",
+  "deviceAuth.action.copyUrl": "کپی URL",
+  "deviceAuth.action.openBrowser": "باز کردن مرورگر",
+  "deviceAuth.qrCode.alt": "کد QR",
+  "deviceAuth.step2": "مرحله ۲: این کد را وارد کنید",
+  "deviceAuth.action.clickToCopy": "برای کپی کلیک کنید",
+  "deviceAuth.status.waiting": "در انتظار تأیید...",
+  "deviceAuth.status.success": "ورود موفقیت‌آمیز بود!",
+  "deviceAuth.status.failed": "ورود ناموفق بود",
+  "deviceAuth.status.cancelled": "ورود لغو شد",
+  "deviceAuth.action.copyError": "خطا در کپی",
+  "deviceAuth.action.showDetails": "مشاهده جزئیات",
+  "deviceAuth.action.tryAgain": "تلاش مجدد",
+  "deviceAuth.error.detailsTitle": "جزئیات خطای ورود",
+
+  "common.retry": "تلاش مجدد",
+  "common.refresh": "بازخوانی",
+  "common.reload": "بارگذاری مجدد",
+  "common.reloadDescription": "بارگذاری مجدد تنظیمات، مهارت‌ها، عوامل و دستورات از دیسک",
+
+  "profile.title": "پروفایل",
+  "profile.notLoggedIn": "وارد نشده‌اید",
+  "profile.action.login": "ورود با Kilo Code",
+  "profile.balance.title": "موجودی",
+  "profile.balance.refresh": "بازخوانی موجودی",
+  "profile.action.dashboard": "داشبورد",
+  "profile.action.topUp": "شارژ کردن",
+  "profile.pass.subscribe": "Kilo Pass را دریافت کنید تا اعتبار اضافه کنید و پاداش کسب کنید",
+  "profile.pass.bonus": "پاداش",
+  "profile.pass.renews": "تمدید می‌شود",
+  "profile.action.logout": "خروج",
+
+  "settings.agentBehaviour.title": "رفتار عامل",
+  "settings.autoApprove.title": "تأیید خودکار",
+  "settings.webTools.title": "ابزارهای وب",
+  "settings.webTools.description": "جستجوی وب و اتوماسیون مرورگر را پیکربندی کنید.",
+  "settings.webTools.webSearch.enable": "فعال‌سازی برای همه ارائه‌دهندگان",
+  "settings.webTools.browserAutomation": "اتوماسیون مرورگر",
+  "settings.webTools.webSearch.title": "جستجوی وب",
+  "settings.webTools.webSearch.description": "جستجوی وب را برای مدل‌های همه ارائه‌دهندگان در دسترس قرار دهید.",
+  "settings.checkpoints.title": "نقاط بازیابی",
+  "settings.display.title": "نمایش",
+  "settings.autocomplete.title": "تکمیل خودکار",
+  "settings.notifications.title": "اعلان‌ها",
+  "settings.context.title": "زمینه",
+  "settings.indexing.title": "ایندکس‌گذاری",
+  "settings.indexing.status.title": "وضعیت",
+  "settings.indexing.enable.title": "فعال‌سازی ایندکس‌گذاری",
+  "settings.indexing.enable.description": "ایندکس‌گذاری معنایی پایگاه کد را روشن یا خاموش کنید.",
+  "settings.indexing.showButton.title": "نمایش دکمه هنگامی که ایندکس‌گذاری خاموش است",
+  "settings.indexing.showButton.description":
+    "دکمه ایندکس‌گذاری را در زیر پرامپت هنگامی که ایندکس‌گذاری خاموش است نشان دهید. در صورت پنهان بودن، برای فعال‌سازی ایندکس‌گذاری به تنظیمات > ایندکس‌گذاری بروید.",
+  "settings.indexing.globalEnable.title": "فعال‌سازی سراسری",
+  "settings.indexing.globalEnable.description": "فهرست‌سازی را برای همه فضاهای کاری فعال کنید.",
+  "settings.indexing.projectEnable.title": "فعال‌سازی برای این پروژه",
+  "settings.indexing.projectEnable.description":
+    "هنگامی که فهرست‌سازی سراسری غیرفعال است، فهرست‌سازی را برای این فضای کاری فعال کنید.",
+  "settings.indexing.provider.title": "ارائه‌دهنده جاسازی",
+  "settings.indexing.provider.description":
+    "ارائه‌دهنده مورد استفاده برای تولید جاسازی‌ها در جستجوی معنایی را انتخاب کنید.",
+  "settings.indexing.kiloModel.title": "پیش‌تنظیم مدل Kilo",
+  "settings.indexing.kiloModel.description": "یک مدل جاسازی میزبانی‌شده توسط Kilo را انتخاب کنید.",
+  "settings.indexing.kiloSignIn.title": "ورود به Kilo الزامی است",
+  "settings.indexing.kiloSignIn.description": "برای استفاده از جاسازی‌های میزبانی‌شده، وارد Kilo شوید.",
+  "settings.indexing.model.title": "مدل جاسازی",
+  "settings.indexing.model.description": "مدل جاسازی پیش‌فرض برای ارائه‌دهنده انتخاب‌شده را بازنویسی کنید.",
+  "settings.indexing.dimension.title": "بُعد برداری",
+  "settings.indexing.dimension.description": "برای تشخیص خودکار بُعد جاسازی از مدل، خالی بگذارید.",
+  "settings.indexing.dimension.placeholder": "خودکار",
+  "settings.indexing.providerField.description": "تنظیم اتصال مخصوص ارائه‌دهنده.",
+  "settings.indexing.vectorStore.title": "فروشگاه برداری",
+  "settings.indexing.vectorStore.description": "محل ذخیره‌سازی جاسازی‌های ایندکس‌شده را انتخاب کنید.",
+  "settings.indexing.lancedbDirectory.title": "پوشه LanceDB",
+  "settings.indexing.lancedbDirectory.description": "پوشه اختیاری برای ذخیره‌گاه محلی LanceDB.",
+  "settings.indexing.lancedbDirectory.placeholder": "برای پیش‌فرض خالی بگذارید",
+  "settings.indexing.qdrantUrl.title": "آدرس URL Qdrant",
+  "settings.indexing.qdrantUrl.description": "آدرس سرور برای نمونه Qdrant.",
+  "settings.indexing.qdrantApiKey.title": "کلید API Qdrant",
+  "settings.indexing.qdrantApiKey.description": "کلید API اختیاری برای نمونه Qdrant.",
+  "settings.indexing.qdrantApiKey.placeholder": "کلید API اختیاری",
+  "settings.indexing.fileExtensions.title": "پسوندهای فایل",
+  "settings.indexing.fileExtensions.description":
+    "فهرست مجاز با جداکننده کاما. برای استفاده از پیش‌فرض‌های داخلی خالی بگذارید.",
+  "settings.indexing.fileExtensions.invalid": "پسوند نامعتبر: {{extension}}",
+  "settings.indexing.tuning.description": "پارامتر پیشرفته جستجو و دسته‌بندی.",
+  "settings.experimental.title": "آزمایشی",
+  "settings.language.title": "زبان",
+  "settings.aboutKiloCode.title": "درباره Kilo Code",
+
+  "session.messages.welcome":
+    "Kilo Code یک دستیار هوش مصنوعی برای کدنویسی است. از آن بخواهید ویژگی‌ها بسازد، باگ‌ها را رفع کند یا کدبیس شما را توضیح دهد.",
+  "session.messages.scrollToBottom": "رفتن به پایین",
+  "session.messages.initializing": "در حال راه‌اندازی...",
+  "session.messages.taskStarting": "در حال شروع...",
+  "session.prompts.navLabel": "ناوبر پرامپت",
+  "session.prompts.tick": "پرامپت {{index}} از {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "هنوز پاسخی وجود ندارد",
+  "session.prompts.queued": "در صف انتظار",
+  "session.prompts.first": "اولین پرامپت",
+  "session.prompts.latest": "آخرین پرامپت",
+  "session.prompts.overflow": "{{count}} پرامپت قبلی",
+  "session.status.writingResponse": "در حال نوشتن پاسخ...",
+  "session.status.retry": "در حال تلاش مجدد…",
+  "session.status.working": "در حال پردازش...",
+  "session.status.offline": "اتصال شبکه قطع شد — در حال اتصال مجدد...",
+  "session.outcome.incomplete": "نوبت با {{count}} کار باقی‌مانده پایان یافت.",
+  "session.outcome.limit": "پاسخ به محدودیت خروجی رسید و ممکن است ناقص باشد.",
+  "session.outcome.unknown": "پاسخ بدون دلیل پایان یافت و ممکن است ناقص باشد.",
+  "session.outcome.filtered": "ارائه‌دهنده این پاسخ را به دلیل فیلتر محتوا متوقف کرد.",
+  "session.outcome.unexpected": "پاسخ به‌طور غیرمنتظره‌ای پایان یافت و ممکن است ناقص باشد.",
+  "session.outcome.generationId": "شناسه تولید: {{id}}",
+  "session.outcome.interrupted": "نوبت قطع شد.",
+  "session.outcome.error": "نوبت با شکست مواجه شد.",
+  "session.outcome.finish": "دلیل فنی پایان: {{reason}}",
+  "session.costAlert.header": "هشدار هزینه جلسه",
+  "session.costAlert.continue": "ادامه",
+  "session.costAlert.question": "هزینه این جلسه از آستانه هشدار {{limit}} شما فراتر رفت و {{cost}} شد. ادامه می‌دهید؟",
+  "session.costAlert.stop": "توقف",
+  "sidebar.session.newSession": "جلسه جدید",
+  "sidebar.session.newSession.tooltip": "یک مکالمه تازه شروع کنید و جلسه فعلی را دست‌نخورده نگه دارید.",
+  "sidebar.session.newWorktree": "Worktree جدید",
+  "sidebar.session.newWorktree.tooltip":
+    "یک worktree گیت ایزوله ایجاد کنید تا به‌صورت امن آزمایش کنید، تغییرات را جدا نگه دارید و بدون اختلال در شاخه فعلی، جلسات موازی اجرا کنید.",
+  "sidebar.session.configureWorktree.tooltip":
+    "برای پیکربندی یک worktree جدید قبل از ایجاد آن، دیالوگ worktree در Agent Manager را باز کنید.",
+  "sidebar.session.newWorktree.from": "Worktree جدید از",
+  "sidebar.session.currentBranch": "شاخه فعلی",
+  "sidebar.session.moveToWorktree": "انتقال به Worktree",
+  "sidebar.session.moveToWorktree.tooltip.empty":
+    "این مکالمه و تغییرات محلی فعلی شما را به یک worktree اختصاصی برای کار پیگیری ایزوله منتقل کنید.",
+  "sidebar.session.moveToWorktree.tooltip.one":
+    "این مکالمه و ۱ فایل تغییریافته را به یک worktree اختصاصی برای کار پیگیری ایزوله منتقل کنید.",
+  "sidebar.session.moveToWorktree.tooltip.other":
+    "این مکالمه و {{files}} فایل تغییریافته را به یک worktree اختصاصی برای کار پیگیری ایزوله منتقل کنید.",
+  "sidebar.session.showChanges.tooltip.empty": "نمای تغییرات را برای بررسی working tree فعلی باز کنید.",
+  "sidebar.session.progress.capturing": "در حال ثبت تغییرات...",
+  "sidebar.session.progress.creating": "در حال ایجاد worktree...",
+  "sidebar.session.progress.setup": "در حال اجرای راه‌اندازی...",
+  "sidebar.session.progress.transferring": "در حال انتقال تغییرات...",
+  "sidebar.session.progress.forking": "در حال شروع جلسه...",
+  "sidebar.session.progress.failed": "ادامه در worktree با شکست مواجه شد",
+
+  "ui.sessionTurn.cancel": "لغو",
+  "ui.sessionTurn.status.thinking": "در حال فکر کردن...",
+  "ui.sessionTurn.status.consideringNextSteps": "در حال بررسی مراحل بعدی...",
+
+  "dialog.model.noProviders": "هیچ ارائه‌دهنده‌ای وجود ندارد",
+
+  "prompt.placeholder.connecting": "در حال اتصال به سرور...",
+  "prompt.placeholder.default": "پیامی بنویسید... (Enter برای ارسال، Shift+Enter برای خط جدید)",
+  "prompt.placeholder.error": "اتصال ناموفق بود. پنل خروجی را بررسی کنید یا افزونه را مجدداً راه‌اندازی کنید.",
+
+  "context.usage.sessionCost": "هزینه جلسه",
+  "context.usage.olderSessions": "{{count}} جلسه قدیمی‌تر",
+  "context.stats.thisSession": "این جلسه",
+
+  "time.today": "امروز",
+  "time.yesterday": "دیروز",
+  "time.thisWeek": "این هفته",
+  "time.thisMonth": "این ماه",
+  "time.older": "قدیمی‌تر",
+
+  "settings.aboutKiloCode.status.connected": "متصل",
+  "settings.aboutKiloCode.status.connecting": "در حال اتصال...",
+  "settings.aboutKiloCode.status.disconnected": "قطع شده",
+  "settings.aboutKiloCode.status.error": "خطا",
+  "settings.aboutKiloCode.cliServer": "سرور CLI",
+  "settings.aboutKiloCode.status.label": "وضعیت:",
+  "settings.aboutKiloCode.port.label": "پورت:",
+  "settings.aboutKiloCode.versionInfo": "اطلاعات نسخه",
+  "settings.aboutKiloCode.version.label": "نسخه:",
+  "settings.aboutKiloCode.community": "جامعه و پشتیبانی",
+  "settings.aboutKiloCode.feedback.prefix": "اگر سؤال یا بازخوردی دارید، می‌توانید یک issue در",
+  "settings.aboutKiloCode.feedback.or": "یا",
+  "settings.aboutKiloCode.support.prefix": "برای سؤالات مربوط به صورت‌حساب یا حساب کاربری، با پشتیبانی مشتریان در",
+  "settings.aboutKiloCode.resetSettings.title": "بازنشانی تنظیمات",
+  "settings.aboutKiloCode.resetSettings.description":
+    "این گزینه فقط تنظیمات مخصوص افزونه VS Code را به مقادیر پیش‌فرض بازنشانی می‌کند. تنظیمات مشترک با CLI، مانند حالت‌ها و قوانین تأیید خودکار، در پیکربندی CLI ذخیره می‌شوند و بازنشانی نخواهند شد.",
+  "settings.aboutKiloCode.resetSettings.button": "بازنشانی همه تنظیمات",
+  "settings.aboutKiloCode.resetSettings.notificationsButton": "بازنشانی اعلان‌های خوانده‌شده",
+  "settings.aboutKiloCode.settingsTransfer.title": "انتقال تنظیمات",
+  "settings.aboutKiloCode.settingsTransfer.description":
+    "تنظیمات خود را برای انتقال بین نمونه‌های VS Code صادر یا وارد کنید.",
+  "settings.aboutKiloCode.exportSettings": "صادر کردن",
+  "settings.aboutKiloCode.importSettings": "وارد کردن",
+  "settings.aboutKiloCode.importSettings.invalidJson":
+    "فایل JSON نامعتبر است. لطفاً یک فایل تنظیمات معتبر انتخاب کنید.",
+  "settings.aboutKiloCode.importSettings.invalidConfig": "فایل حاوی تنظیمات معتبر Kilo نیست.",
+  "settings.aboutKiloCode.importSettings.tooLarge":
+    "فایل بیش از حد بزرگ است. فایل‌های تنظیمات باید کمتر از ۱ مگابایت باشند.",
+  "settings.aboutKiloCode.importSettings.newerVersion":
+    "این فایل از نسخه جدیدتری از Kilo صادر شده است. برخی تنظیمات ممکن است نادیده گرفته شوند.",
+  "settings.aboutKiloCode.importSettings.success":
+    "تنظیمات وارد شد. تغییرات بالا را بررسی کنید، سپس روی ذخیره کلیک کنید.",
+
+  "settings.aboutKiloCode.telemetry.title": "تله‌متری",
+  "settings.aboutKiloCode.telemetry.description":
+    "تله‌متری توسط تنظیمات داخلی تله‌متری VS Code کنترل می‌شود. برای غیرفعال کردن آن، به Settings > Telemetry > Telemetry Level بروید و آن را روی «off» تنظیم کنید. VS Code را مجدداً راه‌اندازی کنید تا تغییر اعمال شود.",
+  "settings.aboutKiloCode.telemetry.openSettings": "باز کردن تنظیمات تله‌متری",
+
+  "settings.agentBehaviour.subtab.agents": "عوامل",
+  "settings.agentBehaviour.subtab.mcpServers": "MCP Servers",
+  "settings.agentBehaviour.subtab.rules": "قوانین",
+  "settings.agentBehaviour.subtab.workflows": "گردش‌های کاری",
+  "settings.agentBehaviour.subtab.skills": "مهارت‌ها",
+
+  "settings.browser.description":
+    "وقتی فعال است، عامل هوش مصنوعی می‌تواند با صفحات وب تعامل داشته باشد — پیمایش، کلیک، تایپ و گرفتن اسکرین‌شات. یک پنجره Chrome باز می‌شود تا بتوانید عملکرد عامل را مشاهده کنید.",
+  "settings.browser.enable.title": "فعال‌سازی اتوماسیون مرورگر",
+  "settings.browser.enable.description": "سرور Playwright MCP را با بک‌اند CLI ثبت کنید.",
+  "settings.browser.systemChrome.title": "استفاده از Chrome سیستم",
+  "settings.browser.systemChrome.description":
+    "به جای یک نمونه Chromium جداگانه، از مرورگر Chrome نصب‌شده شما استفاده کنید.",
+  "settings.browser.headless.title": "حالت Headless",
+  "settings.browser.headless.description": "در حالت headless اجرا شود (بدون پنجره مرورگر قابل مشاهده).",
+
+  "settings.language.description":
+    "زبان رابط کاربری Kilo Code را انتخاب کنید. «Auto» از زبان نمایشی VS Code شما استفاده می‌کند.",
+  "settings.language.auto": "خودکار (زبان VS Code)",
+  "settings.language.current": "فعلی:",
+
+  "common.add": "افزودن",
+
+  "settings.autocomplete.model.title": "مدل تکمیل خودکار",
+  "settings.autocomplete.model.description": "مدل مورد استفاده برای تکمیل‌های درون‌خطی کد را انتخاب کنید",
+  "settings.autocomplete.autoTrigger.title": "فعال‌سازی تکمیل‌های خودکار درون‌خطی",
+  "settings.autocomplete.autoTrigger.description": "پیشنهادهای تکمیل درون‌خطی را هنگام تایپ به‌صورت خودکار نمایش بده",
+  "settings.autocomplete.smartKeybinding.title": "فعال‌سازی میانبر هوشمند وظایف درون‌خطی",
+  "settings.autocomplete.smartKeybinding.description": "از یک میانبر هوشمند برای فعال‌سازی وظایف درون‌خطی استفاده کن",
+  "settings.autocomplete.chatAutocomplete.title": "فعال‌سازی تکمیل خودکار متن چت",
+  "settings.autocomplete.chatAutocomplete.description": "نمایش پیشنهادات تکمیل خودکار در کادر متنی چت",
+  "settings.autocomplete.modelsHint": "برای انتخاب مدل مورد استفاده در تکمیل خودکار، به تنظیمات مدل‌ها مراجعه کنید.",
+
+  "settings.notifications.sounds": "صداها",
+  "settings.notifications.enable.title": "فعال‌سازی اعلان‌های صوتی",
+  "settings.notifications.enable.description": "پخش صدا هنگام تکمیل جلسات، بروز خطا یا نیاز به ورودی شما",
+  "settings.notifications.testSound": "آزمایش",
+  "settings.notifications.sound.default": "پیش‌فرض",
+  "settings.notifications.sound.system": "سیستم",
+  "settings.notifications.sound.description":
+    "پیش‌فرض از صداهای مختلف برای تکمیل، ورودی و خطاها استفاده می‌کند. سایر گزینه‌ها از یک صدا برای همه رویدادها استفاده می‌کنند.",
+
+  "settings.experimental.share.title": "حالت اشتراک‌گذاری",
+  "settings.experimental.share.description": "نحوه رفتار اشتراک‌گذاری جلسه",
+  "settings.experimental.share.manual": "دستی",
+  "settings.experimental.share.auto": "خودکار",
+  "settings.experimental.share.disabled": "غیرفعال",
+  "settings.experimental.formatter.title": "قالب‌بند",
+  "settings.experimental.formatter.description": "فعال‌سازی قالب‌بند خودکار کد",
+  "settings.experimental.lsp.title": "LSP",
+  "settings.experimental.lsp.description": "فعال‌سازی یکپارچه‌سازی پروتکل سرور زبان",
+  "settings.experimental.batch.title": "ابزار دسته‌ای",
+  "settings.experimental.batch.description": "فعال‌سازی دسته‌بندی چندین فراخوانی ابزار",
+  "settings.experimental.codebaseSearch.title": "جستجوی پایگاه کد",
+  "settings.experimental.codebaseSearch.description":
+    "فعال‌سازی جستجوی زبان طبیعی مبتنی بر هوش مصنوعی در سراسر پایگاه کد",
+  "settings.experimental.imageGeneration.title": "تولید تصویر",
+  "settings.experimental.imageGeneration.description": "فعال‌سازی تولید تصویر با هوش مصنوعی",
+  "settings.experimental.imageGenerationModel.title": "مدل تصویر",
+  "settings.experimental.imageGenerationModel.description": "مدل تولید تصویر",
+  "settings.experimental.imageGenerationModel.placeholder": "پیش‌فرض (مسیریاب خودکار)",
+
+  "settings.models.speechToText.disabledDescription":
+    "برای استفاده از تبدیل گفتار به متن، ارائه‌دهنده Kilo را فعال کرده و وارد شوید. تبدیل گفتار به متن در حال حاضر فقط از طریق Kilo Gateway پشتیبانی می‌شود.",
+  "settings.models.speechToTextModel.title": "مدل تبدیل گفتار به متن",
+  "settings.models.speechToTextModel.description": "مدل رونویسی Kilo Gateway را برای ورودی صوتی انتخاب کنید.",
+  "settings.experimental.nativeNotebookTools.title": "ابزارهای بومی Notebook",
+  "settings.experimental.nativeNotebookTools.description":
+    "ابزارهای آزمایشی برای خواندن، ویرایش و اجرای VS Code notebooks را فعال کنید",
+  "settings.experimental.continueOnDeny.title": "ادامه در صورت رد",
+  "settings.experimental.continueOnDeny.description": "حلقه عامل را هنگام رد شدن یک مجوز ادامه دهید",
+  "settings.sandboxing.enabled.title": "Sandbox",
+  "settings.sandboxing.enabled.description":
+    "اجرای دستورات شل عامل در یک Sandbox سطح سیستم‌عامل که نوشتن را به پوشه‌های پروژه و وضعیت Kilo محدود می‌کند",
+  "settings.sandboxing.title": "Sandboxing",
+  "settings.sandboxing.network.title": "محدود کردن دسترسی شبکه",
+  "settings.sandboxing.network.description":
+    "مسدود کردن دسترسی مستقیم خروجی از دستورات مدل و ابزارهای HTTP. ابزارهای MCP محلی و راه‌دور در حین محدودیت در دسترس نیستند. ترافیک ارائه‌دهنده و هوک‌های پلاگین مورد اعتماد خارج از این محدودیت باقی می‌مانند.",
+  "settings.sandboxing.allowedHosts.title": "مقصدهای شبکه مجاز",
+  "settings.sandboxing.allowedHosts.description":
+    "مقصدهای DNS هاست و پورت برای ترافیک پروکسی HTTP و HTTPS در Sandbox. GitHub CLI و Git از طریق HTTPS معمولاً به github.com:443 و api.github.com:443 نیاز دارند. تغییرات در نشست‌های جدید اعمال می‌شوند.",
+  "settings.sandboxing.writablePaths.title": "مسیرهای قابل نوشتن اضافی",
+  "settings.sandboxing.writablePaths.description":
+    "مسیرهای فایل‌سیستم اضافی که Sandbox اجازه نوشتن به آن‌ها را می‌دهد (مثلاً /tmp، /var/log). این مسیرها هنگام فعال بودن Sandbox با مسیرهای قابل نوشتن پیش‌فرض ادغام می‌شوند.",
+  "settings.experimental.swePruner.title": "SWE-Pruner",
+  "settings.experimental.swePruner.description":
+    "فعال‌سازی SWE-Pruner: هرس آگاه از وظیفه برای خروجی‌های بزرگ ابزارهای خواندن، جستجو و پوسته، هدایت‌شده توسط یک سؤال تمرکز از عامل",
+  "settings.experimental.swePrunerModel.title": "مدل SWE-Pruner",
+  "settings.experimental.swePrunerModel.description":
+    "مدل مورد استفاده برای مرور سریع خروجی‌های ابزار؛ به‌طور پیش‌فرض از مدل کوچک پیکربندی‌شده استفاده می‌کند",
+  "settings.experimental.multiProject.title": "مدیر agent چندپروژه‌ای",
+  "settings.experimental.multiProject.description":
+    "مدیریت sessionها و worktreeها را در چند مخزن در Agent Manager فعال می‌کند. مخزن فضای کاری فعلی همیشه پروژه پیش‌فرض است.",
+  "settings.experimental.mcpTimeout.title": "زمان‌وقفه MCP (میلی‌ثانیه)",
+  "settings.experimental.mcpTimeout.description": "زمان‌وقفه برای درخواست‌های سرور MCP بر حسب میلی‌ثانیه",
+  "settings.experimental.remote.title": "کنترل از راه دور",
+  "settings.experimental.remote.description":
+    "فعال‌سازی کنترل از راه دور جلسات از طریق Kilo Cloud. این تنظیم بر CLIهای این دستگاه نیز تأثیر می‌گذارد.",
+  "settings.experimental.remote.current": "وضعیت فعلی:",
+  "settings.experimental.remote.startup": "فعال‌سازی خودکار هنگام راه‌اندازی:",
+  "settings.experimental.remote.active": "فعال",
+  "settings.experimental.remote.inactive": "غیرفعال",
+  "settings.experimental.remote.hint": "برای تغییر وضعیت از /remote در چت استفاده کنید",
+  "settings.experimental.toolToggles": "تنظیمات ابزارها",
+
+  "settings.agentBehaviour.defaultAgent.title": "عامل پیش‌فرض",
+  "settings.agentBehaviour.defaultAgent.description": "عاملی که در صورت عدم تعیین استفاده می‌شود",
+  "settings.agentBehaviour.availableAgents": "عامل‌های موجود",
+  "settings.agentBehaviour.modelOverride.title": "جایگزینی مدل",
+  "settings.agentBehaviour.modelOverride.description": "مدل پیش‌فرض این عامل را بازنویسی کنید",
+  "settings.agentBehaviour.variantOverride.title": "بازنویسی نوع",
+  "settings.agentBehaviour.variantOverride.description": "نوع مدل این عامل را بازنویسی کنید",
+  "settings.agentBehaviour.temperature.title": "دما",
+  "settings.agentBehaviour.temperature.description":
+    "کنترل می‌کند که پاسخ‌های هوش مصنوعی چقدر تصادفی باشند (۰–۲). مقادیر پایین‌تر (مثلاً ۰.۲) خروجی متمرکز و یکنواخت تولید می‌کنند. مقادیر بالاتر (مثلاً ۱.۰) پاسخ‌های متنوع‌تر و خلاقانه‌تری ایجاد می‌کنند. برای استفاده از مقدار پیش‌فرض مدل، خالی بگذارید.",
+  "settings.agentBehaviour.topP.title": "Top P",
+  "settings.agentBehaviour.topP.description":
+    "آستانه نمونه‌برداری هسته‌ای (۰–۱). انتخاب توکن‌ها را به کوچک‌ترین مجموعه‌ای محدود می‌کند که احتمال تجمعی آن به P برسد. مقادیر پایین‌تر خروجی را متمرکزتر می‌کنند؛ مقادیر بالاتر تنوع بیشتری را مجاز می‌دانند. برای استفاده از مقدار پیش‌فرض مدل، خالی بگذارید.",
+  "settings.agentBehaviour.maxSteps.title": "حداکثر مراحل",
+  "settings.agentBehaviour.maxSteps.description":
+    "حداکثر تعداد گام‌های عامل. در این محدودیت، به عامل دستور داده می‌شود که استفاده از ابزارها را متوقف کرده و پاسخ نهایی ارائه دهد. برای وظایف پیچیده چندمرحله‌ای افزایش دهید؛ برای پاسخ‌های کوتاه‌تر و قابل پیش‌بینی‌تر کاهش دهید.",
+  "settings.agentBehaviour.hidden.title": "پنهان",
+  "settings.agentBehaviour.hidden.description": "این عامل را از انتخابگر حالت در ورودی چت پنهان کنید",
+  "settings.agentBehaviour.disable.title": "غیرفعال",
+  "settings.agentBehaviour.disable.description": "این عامل را کاملاً غیرفعال کنید — در هیچ جایی نمایش داده نخواهد شد",
+  "settings.agentBehaviour.badge.hidden": "پنهان",
+  "settings.agentBehaviour.badge.disabled": "غیرفعال",
+  "settings.agentBehaviour.badge.deprecated": "منسوخ",
+  "settings.agentBehaviour.discoveredSkills": "مهارت‌های کشف‌شده",
+  "settings.agentBehaviour.noSkillsFound":
+    "هیچ مهارتی کشف نشد. مسیرهای پوشه مهارت یا URL را در زیر اضافه کنید تا مهارت‌ها در دسترس قرار گیرند.",
+  "settings.agentBehaviour.noAgentsFound": "هیچ عاملی یافت نشد.",
+  "settings.agentBehaviour.removeAgent.title": "حذف عامل",
+  "settings.agentBehaviour.removeAgent.confirm":
+    "ایجنت «{{name}}» حذف شود؟ این کار با به‌روزرسانی پیکربندی شما، ایجنت را غیرفعال می‌کند.",
+  "settings.agentBehaviour.removeAgent.button": "حذف",
+  "settings.agentBehaviour.skillPaths": "مسیرهای پوشه مهارت",
+  "settings.agentBehaviour.skillUrls": "URL های مهارت",
+  "settings.agentBehaviour.removeSkill.title": "حذف مهارت",
+  "settings.agentBehaviour.removeSkill.confirm":
+    "مهارت «{{name}}» حذف شود؟ این کار فایل‌های مهارت را از دیسک حذف می‌کند.",
+  "settings.agentBehaviour.removeSkill.button": "حذف",
+  "settings.agentBehaviour.rules.description":
+    "قوانین، فایل‌های دستورالعملی هستند که رفتار عامل را هدایت می‌کنند. این قوانین در پرامپت سیستم برای هر مکالمه گنجانده می‌شوند. برای افزودن قوانین بیشتر، مسیرهای فایل را در زیر وارد کنید.",
+  "settings.agentBehaviour.instructionFiles": "فایل‌های دستورالعمل اضافی",
+  "settings.agentBehaviour.instructionFiles.description":
+    "مسیرهای فایل‌های دستورالعمل اضافی که در پرامپت سیستم گنجانده می‌شوند",
+  "settings.agentBehaviour.claudeCompat.heading": "سازگاری با Claude Code",
+  "settings.agentBehaviour.claudeCompat.title": "بارگذاری فایل‌های Claude Code",
+  "settings.agentBehaviour.claudeCompat.description":
+    "دستورالعمل‌ها و مهارت‌های CLAUDE.md را از پوشه پیکربندی Claude Code شما در جلسات بارگذاری می‌کند. اگر می‌خواهید Kilo از دستورالعمل‌ها و مهارت‌های Claude Code شما استفاده کند، این گزینه را فعال کنید. نیاز به راه‌اندازی مجدد دارد.",
+  "settings.agentBehaviour.removeMcp.title": "حذف سرور MCP",
+  "settings.agentBehaviour.removeMcp.confirm": "سرور MCP «{{name}}» حذف شود؟ این کار آن را از پیکربندی شما حذف می‌کند.",
+  "settings.agentBehaviour.removeMcp.button": "حذف",
+  "settings.agentBehaviour.mcpDetail.command": "دستور",
+  "settings.agentBehaviour.mcpDetail.args": "آرگومان‌ها",
+  "settings.agentBehaviour.mcpDetail.env": "محیط",
+  "settings.agentBehaviour.editMcp": "ویرایش سرور MCP",
+  "settings.agentBehaviour.editMcp.transportLocal": "سرور محلی (انتقال stdio)",
+  "settings.agentBehaviour.editMcp.transportRemote": "سرور راه‌دور (انتقال SSE/HTTP)",
+  "settings.agentBehaviour.editMcp.env": "متغیرهای محیطی",
+  "settings.agentBehaviour.editMcp.env.help": "متغیرهایی که به فرآیند سرور MCP ارسال می‌شوند.",
+  "settings.agentBehaviour.addMcp.command": "دستور",
+  "settings.agentBehaviour.addMcp.command.placeholder": "مثلاً npx",
+  "settings.agentBehaviour.addMcp.args": "آرگومان‌ها",
+  "settings.agentBehaviour.addMcp.args.help": "یک آرگومان در هر خط. مسیرهای دارای فاصله عیناً حفظ می‌شوند.",
+  "settings.agentBehaviour.addMcp.args.placeholder": "مثلاً\n-y\n@modelcontextprotocol/server-filesystem\n/tmp",
+  "settings.agentBehaviour.addMcp.url": "URL سرور",
+  "settings.agentBehaviour.addMcp.url.placeholder": "مثلاً http://localhost:3000/sse",
+  "settings.agentBehaviour.mcpBrowseMarketplace": "مرور Marketplace",
+  "settings.agentBehaviour.mcpEmpty":
+    "هیچ سرور MCP پیکربندی نشده است. سرورهای MCP را در kilo.jsonc اضافه کنید، یا از agent بخواهید آن‌ها را برایتان اضافه کند.",
+  "settings.agentBehaviour.workflows.description":
+    "Workflow‌ها دستورات slash سفارشی هستند که در پیکربندی شما تعریف شده‌اند. برای فراخوانی آن‌ها /command-name را در چت تایپ کنید. دستورات در opencode.json زیر بخش 'command' پیکربندی می‌شوند.",
+  "settings.agentBehaviour.workflows.empty":
+    "هیچ دستور سفارشی پیکربندی نشده است. دستورات را به opencode.json خود اضافه کنید تا اینجا نمایش داده شوند.",
+  "settings.agentBehaviour.workflows.detail.description": "توضیحات",
+  "settings.agentBehaviour.workflows.detail.template": "قالب",
+
+  "settings.agentBehaviour.createMode": "ایجاد حالت جدید",
+  "settings.agentBehaviour.createMode.name": "نام",
+  "settings.agentBehaviour.createMode.name.placeholder": "مثلاً reviewer",
+  "settings.agentBehaviour.createMode.name.description":
+    "شناسه یکتا برای حالت. فقط از حروف کوچک، اعداد و خط تیره استفاده کنید.",
+  "settings.agentBehaviour.createMode.description": "توضیحات",
+  "settings.agentBehaviour.createMode.description.placeholder": "مثلاً کد را از نظر کیفیت و بهترین روش‌ها بررسی می‌کند",
+  "settings.agentBehaviour.createMode.description.help": "توضیح کوتاهی از عملکرد این حالت.",
+  "settings.agentBehaviour.createMode.prompt": "پرامپت سیستم",
+  "settings.agentBehaviour.createMode.prompt.placeholder":
+    "مثلاً شما یک بازبین کد هستید. بر کیفیت کد، بهترین روش‌ها و باگ‌های احتمالی تمرکز کنید.",
+  "settings.agentBehaviour.createMode.prompt.help": "دستورالعمل‌های عامل هوش مصنوعی هنگام استفاده از این حالت.",
+  "settings.agentBehaviour.createMode.button": "ایجاد",
+  "settings.agentBehaviour.createMode.cancel": "لغو",
+  "settings.agentBehaviour.createMode.nameRequired": "نام الزامی است",
+  "settings.agentBehaviour.createMode.nameInvalid":
+    "نام باید با یک حرف کوچک شروع شود و فقط شامل حروف کوچک، اعداد و خط تیره باشد",
+  "settings.agentBehaviour.createMode.nameTaken": "یک حالت با این نام از قبل وجود دارد",
+  "settings.agentBehaviour.importMode": "وارد کردن",
+  "settings.agentBehaviour.importMode.invalidName":
+    "نام حالت در فایل نامعتبر است. نام باید با یک حرف کوچک شروع شود و فقط شامل حروف کوچک، اعداد و خط تیره باشد.",
+  "settings.agentBehaviour.importMode.nameTaken": "یک حالت با این نام از قبل وجود دارد.",
+  "settings.agentBehaviour.importMode.invalidJson":
+    "فایل JSON نامعتبر است. لطفاً یک فایل تعریف عامل معتبر انتخاب کنید.",
+  "settings.agentBehaviour.importMode.tooLarge": "فایل بیش از حد بزرگ است. تعریف عامل‌ها باید کمتر از ۱ مگابایت باشند.",
+  "settings.agentBehaviour.exportMode": "صادر کردن تعریف عامل",
+  "settings.agentBehaviour.editMode": "حالت ویرایش",
+  "settings.agentBehaviour.editMode.description": "توضیحات",
+  "settings.agentBehaviour.editMode.prompt": "پرامپت سیستم",
+  "settings.agentBehaviour.editMode.save": "انجام شد",
+  "settings.agentBehaviour.editMode.back": "بازگشت به فهرست",
+  "settings.agentBehaviour.editMode.native":
+    "این یک حالت داخلی است. تعریف پایه آن قابل تغییر نیست، اما می‌توانید تنظیمات سفارشی را در زیر پیکربندی کنید.",
+  "settings.agentBehaviour.editMode.promptOverride": "پرامپت سفارشی جایگزین برای این حالت داخلی",
+  "settings.agentBehaviour.badge.subagent": "زیرعامل",
+  "settings.agentBehaviour.permissions.title": "مجوزهای محاسبه‌شده",
+  "settings.agentBehaviour.permissions.count": "{{count}} قانون",
+  "settings.agentBehaviour.permissions.effective": "مؤثر (wildcard):",
+  "settings.agentBehaviour.permissions.col.tool": "ابزار",
+  "settings.agentBehaviour.permissions.col.pattern": "الگو",
+  "settings.agentBehaviour.permissions.col.action": "عملکرد",
+  "settings.agentBehaviour.permissions.copy": "کپی مجوزها به‌صورت JSON",
+  "settings.agentBehaviour.permissions.hint":
+    "قوانین به ترتیب ارزیابی می‌شوند — آخرین قانون منطبق اعمال می‌شود. این مجموعه قوانین حل‌شده از backend CLI است.",
+
+  "settings.autoApprove.description":
+    "نحوه اجرای ابزارها را تعریف کنید. اکثر ابزارها به‌طور پیش‌فرض روی Allow هستند. doom_loop و external_directory به‌طور پیش‌فرض روی Ask هستند.",
+  "settings.autoApprove.maxCost.title": "هشدار هزینه جلسه",
+  "settings.autoApprove.maxCost.description":
+    "هنگامی که هزینه یک جلسه از این مقدار دلاری فراتر رفت، یک هشدار غیرمسدودکننده نمایش داده شود. از اعداد صحیح استفاده کنید؛ برای غیرفعال کردن خالی بگذارید.",
+  "settings.autoApprove.level.allow": "اجازه",
+  "settings.autoApprove.level.ask": "پرسش",
+  "settings.autoApprove.level.deny": "رد کردن",
+  "settings.autoApprove.wildcardLabel.commands": "همه دستورات (*)",
+  "settings.autoApprove.wildcardLabel.paths": "همه مسیرها (*)",
+  "settings.autoApprove.exceptions": "استثناها",
+  "settings.autoApprove.addCommand": "افزودن دستور",
+  "settings.autoApprove.addPath": "افزودن مسیر",
+  "settings.autoApprove.placeholder.command": "مثال: git *",
+  "settings.autoApprove.placeholder.path": "مثال: *.env",
+  "settings.autoApprove.tool.external_directory":
+    "دسترسی به فایل‌های خارج از فضای کاری. هنگام دسترسی به فایل‌های خارج از پوشه پروژه جاری فعال می‌شود.",
+  "settings.autoApprove.tool.bash": "اجرای دستورات ترمینال. اجازه اجرای دستورات شل را می‌دهد (مثلاً git status).",
+  "settings.autoApprove.tool.read": "خواندن فایل‌ها. به عامل اجازه می‌دهد فایل‌های منطبق با مسیر مشخص‌شده را بخواند.",
+  "settings.autoApprove.tool.edit":
+    "ویرایش فایل‌ها. به عامل اجازه می‌دهد فایل‌ها را ایجاد یا ویرایش کند، از جمله پچ‌ها و به‌روزرسانی‌های چندفایلی.",
+  "settings.autoApprove.tool.glob":
+    "تطبیق فایل‌ها با الگو. اجازه تطبیق فایل با استفاده از الگوهای glob را می‌دهد (مثلاً src/**/*.ts).",
+  "settings.autoApprove.tool.grep": "جستجو در محتوای فایل‌ها. اجازه جستجوی مبتنی بر regex درون فایل‌ها را می‌دهد.",
+  "settings.autoApprove.tool.list": "فهرست محتوای پوشه. اجازه مشاهده فایل‌ها و پوشه‌های داخل یک دایرکتوری را می‌دهد.",
+  "settings.autoApprove.tool.task": "راه‌اندازی زیرعامل‌ها. اجازه شروع زیرعامل‌های تخصصی برای وظایف خاص را می‌دهد.",
+  "settings.autoApprove.tool.skill":
+    "بارگذاری مهارت‌ها. اجازه بارگذاری مهارت‌های از پیش تعریف‌شده بر اساس نام را می‌دهد.",
+  "settings.autoApprove.tool.lsp": "پرس‌وجو از سرور زبان. اجازه اجرای پرس‌وجوهای LSP برای هوشمندی کد را می‌دهد.",
+  "settings.autoApprove.tool.todoreadwrite":
+    "مدیریت فهرست وظایف. اجازه خواندن و به‌روزرسانی فهرست وظایف داخلی را می‌دهد.",
+  "settings.autoApprove.tool.webfetch": "دریافت یک URL. امکان بازیابی محتوا از یک URL مشخص را فراهم می‌کند.",
+  "settings.autoApprove.tool.websearch": "جستجو در وب. امکان انجام جستجوهای خارجی در وب را فراهم می‌کند.",
+  "settings.autoApprove.tool.doom_loop":
+    "جلوگیری از اقدامات تکراری یکسان. زمانی فعال می‌شود که همان فراخوانی ابزار با ورودی یکسان تکرار شود.",
+
+  "settings.checkpoints.enable.title": "فعال‌سازی اسنپ‌شات‌ها",
+  "settings.checkpoints.enable.description":
+    "قبل از ویرایش فایل‌ها نقاط بازیابی ایجاد کنید تا بتوانید به حالت‌های قبلی بازگردید",
+
+  "settings.context.autoCompaction.title": "فشرده‌سازی خودکار",
+  "settings.context.autoCompaction.description": "قبل از رسیدن به محدودیت، زمینه را به‌طور خودکار فشرده کنید",
+  "settings.context.compaction.title": "فشرده‌سازی",
+  "settings.context.compactionLimit.title": "محدودیت فشرده‌سازی خودکار",
+  "settings.context.compactionLimit.description":
+    "زمانی فشرده‌سازی انجام شود که زمینه به این درصد از پنجره مدل برسد. برای استفاده تنها از بافر ایمنی، خالی بگذارید.",
+  "settings.context.prune.title": "حذف خروجی‌های قدیمی",
+  "settings.context.prune.description": "حذف خروجی‌های قدیمی ابزار در حین فشرده‌سازی",
+  "settings.context.watcherPatterns": "الگوهای نادیده‌گیری ناظر فایل",
+  "settings.context.watcherPatterns.description": "الگوهای Glob برای فایل‌هایی که ناظر باید نادیده بگیرد",
+  "settings.context.memory.title": "حافظه",
+  "settings.context.memory.project.title": "حافظه پروژه",
+  "settings.context.memory.autoSave.title": "ذخیره خودکار حافظه پروژه",
+  "settings.context.memory.autoSave.description":
+    "هنگامی که حافظه فعال است، اطلاعات پایدار پروژه از نوبت‌های تکمیل‌شده به‌طور خودکار ذخیره می‌شوند.",
+  "settings.context.memory.storage.title": "ذخیره‌سازی",
+  "settings.context.memory.status.notLoaded": "بارگذاری نشده",
+  "settings.context.memory.status.disabled": "غیرفعال",
+  "settings.context.memory.status.enabledTokens": "فعال - ~{{tokens}} توکن ذخیره‌شده",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "حافظه را فعال کنید تا فایل‌های حافظه پروژه ایجاد شوند.",
+  "settings.context.memory.inspect": "بررسی",
+  "chat.memory.project.disabled": "حافظه پروژه غیرفعال است",
+  "chat.memory.project.empty": "این پروژه هنوز هیچ حافظه‌ای ندارد. پس از استفاده از Kilo نمایش داده خواهد شد.",
+  "chat.memory.command.failed": "دستور حافظه ناموفق بود",
+  "chat.memory.updated": "حافظه به‌روزرسانی شد",
+  "chat.memory.rebuild": "ایندکس حافظه بازسازی شد",
+
+  "settings.commitMessage.title": "پیام Commit",
+  "settings.commitMessage.override.title": "استفاده از Prompt سفارشی",
+  "settings.commitMessage.override.description":
+    "جایگزینی Prompt پیش‌فرض پیام commit. در صورت فعال‌سازی، Prompt سفارشی شما به‌طور کامل جایگزین Prompt داخلی conventional commits می‌شود.",
+  "settings.commitMessage.prompt.title": "پرامپت سفارشی",
+  "settings.commitMessage.prompt.description":
+    "پرامپت سیستمی که هنگام تولید پیام‌های کامیت به هوش مصنوعی ارسال می‌شود. این گزینه پرامپت پیش‌فرض را به‌طور کامل جایگزین می‌کند.",
+  "settings.commitMessage.prompt.placeholder":
+    "مثال: پیام‌های کامیت را به زبان اسپانیایی و با فرمت conventional commits تولید کن. فقط پیام کامیت را برگردان.",
+
+  "settings.commitMessage.language.sync": "همگام‌سازی با زبان رابط کاربری",
+  "settings.commitMessage.language.description":
+    "زبان مورد استفاده برای پیام‌های کامیت تولیدشده توسط هوش مصنوعی را انتخاب کنید:",
+
+  "settings.display.username.title": "نام کاربری",
+  "settings.display.username.description": "نام کاربری سفارشی که در مکالمات نمایش داده می‌شود",
+  "settings.display.fontSize.title": "اندازه قلم",
+  "settings.display.fontSize.description": "اندازه قلم رابط کاربری وب‌ویو Kilo را مستقل از VS Code تنظیم کنید.",
+  "settings.display.reasoningAutoCollapse.title": "جمع‌شدن خودکار استدلال",
+  "settings.display.reasoningAutoCollapse.description":
+    "بلوک‌های استدلال را پس از اتمام نوشتن توسط عامل جمع می‌کند. برای نگه داشتن استدلال در حالت باز، این گزینه را خاموش بگذارید مگر اینکه خودتان آن را جمع کنید.",
+  "settings.display.shiftTabCycle.title": "چرخش سطح استدلال با Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "در ورودی پرامپت، Shift+Tab را فشار دهید تا به سطح تلاش استدلال بعدی بروید. برای حفظ عملکرد Shift+Tab جهت ناوبری فوکوس صفحه‌کلید، این گزینه را غیرفعال کنید.",
+  "settings.display.terminalCommand.title": "بلوک‌های دستور ترمینال",
+  "settings.display.terminalCommand.description":
+    "انتخاب کنید که بلوک‌های دستور ترمینال در حالت باز یا بسته شروع شوند.",
+  "settings.display.terminalCommand.expanded": "باز",
+  "settings.display.terminalCommand.collapsed": "بسته",
+  "settings.display.codeEdit.title": "بلوک‌های ویرایش کد",
+  "settings.display.codeEdit.description": "انتخاب کنید که بلوک‌های ویرایش کد و تفاوت در حالت باز یا بسته شروع شوند.",
+  "settings.display.codeEdit.expanded": "گسترش‌یافته",
+  "settings.display.codeEdit.collapsed": "جمع‌شده",
+  "settings.display.tokenThroughput.title": "نمایش توان عملیاتی توکن",
+  "settings.display.tokenThroughput.description":
+    "نرخ تولید متن (توکن/ثانیه) را در آخرین پیام دستیار و در سربرگ وظیفه نمایش می‌دهد. به‌طور پیش‌فرض پنهان است تا چت شلوغ نشود.",
+
+  "chat.throughput.tooltip":
+    "میانگین {{speed}} توکن/ثانیه برای این نوبت. شامل توکن‌های خروجی و استدلال می‌شود؛ زمان اجرای ابزار و انتظار را شامل نمی‌شود.",
+  "chat.throughput.tooltip.missing": "معیارهای توان عملیاتی برای این نوبت در دسترس نیست.",
+
+  "settings.providers.defaultModel.title": "مدل پیش‌فرض",
+  "settings.providers.defaultModel.description": "مدل اصلی برای مکالمات",
+  "settings.providers.smallModel.title": "مدل سبک",
+  "settings.providers.smallModel.description":
+    "مدل سبک‌وزن برای تولید عنوان، تولید پیام کامیت، بهبود پرامپت و سایر وظایف سریع",
+  "settings.providers.subagentModel.title": "مدل زیرعامل",
+  "settings.providers.subagentModel.description":
+    "مدل پیش‌فرض و میزان استدلال برای زیرعامل‌های ابزار-وظیفه. برای به ارث بردن مدل عامل فراخواننده، خالی بگذارید.",
+  "settings.models.hidePromptTraining.title": "پنهان کردن مدل‌های آموزش پرامپت",
+  "settings.models.hidePromptTraining.description":
+    "مدل‌های Kilo Gateway را که ارائه‌دهندگانشان ممکن است از پرامپت‌های شما برای آموزش استفاده کنند پنهان کنید.",
+  "settings.providers.modeModels": "مدل به ازای حالت",
+  "settings.providers.modeModels.description":
+    "مدل پیش‌فرض را برای حالت‌های خاص بازنویسی کنید. در صورت عدم تنظیم، از مدل پیش‌فرض سراسری استفاده می‌شود.",
+  "settings.providers.disabled": "ارائه‌دهندگان غیرفعال",
+  "settings.providers.disabled.description": "ارائه‌دهندگانی که از فهرست پنهان می‌شوند",
+  "settings.providers.disabled.enable": "فعال‌سازی",
+  "settings.providers.notSet": "تنظیم نشده (از پیش‌فرض سرور استفاده شود)",
+  "settings.providers.select.placeholder": "انتخاب ارائه‌دهنده...",
+
+  "dialog.model.notSet": "تنظیم نشده",
+
+  "profile.personalAccount": "حساب شخصی",
+  "profile.switchingAccount": "در حال تغییر حساب…",
+
+  // Agent Manager strings live in webview-ui/agent-manager/i18n/en.ts
+
+  "question.summary": "{{n}} از {{total}} سؤال",
+  "common.review": "بررسی",
+
+  // legacy-migration start
+  "settings.legacyMigration.link": "انتقال از نسخه قدیمی",
+  "settings.aboutKiloCode.legacyMigration.title": "انتقال از نسخه قدیمی",
+  "settings.aboutKiloCode.legacyMigration.description":
+    "تنظیمات را از نصب قبلی Kilo Code منتقل کنید، از جمله کلیدهای API ارائه‌دهنده و مدل پیش‌فرض.",
+  "settings.aboutKiloCode.rooImport.description": "تاریخچه مکالمات را از یک نصب Roo Code وارد کنید.",
+  "settings.aboutKiloCode.rooImport.button": "وارد کردن جلسات از Roo Code",
+
+  // Screen 1 — What's New
+  "migration.whatsNew.title": "تازه‌های Kilo Code",
+  "migration.whatsNew.subtitle": "افزونه را بر پایه‌ای سریع‌تر و کارآمدتر بازسازی کرده‌ایم.",
+  "migration.whatsNew.features.performance.title": "عملکرد سریع‌تر عامل",
+  "migration.whatsNew.features.performance.detail":
+    "فراخوانی ابزارهای موازی و زیرعامل‌ها به عامل شما امکان می‌دهند کارهای بیشتری را همزمان انجام دهد — تا زمان کمتری صرف نظارت کنید و زمان بیشتری برای ارسال داشته باشید.",
+  "migration.whatsNew.features.interface.title": "رابط کاربری ساده‌تر",
+  "migration.whatsNew.features.interface.detail": "حواس‌پرتی کمتر، خواندن آسان‌تر و سریع‌تر.",
+  "migration.whatsNew.features.agentManager.title": "Agent Manager",
+  "migration.whatsNew.features.agentManager.detail":
+    "یک رابط یکپارچه برای اجرای چندین عامل به‌صورت موازی، هر کدام در worktree مخصوص خود — پیشرفت را رصد کنید، بین زمینه‌ها جابه‌جا شوید و تغییرات را در یک مکان بررسی کنید.",
+  "migration.whatsNew.features.foundation.title": "پایه مشترک",
+  "migration.whatsNew.features.foundation.detail":
+    "یک هسته کوچک و کارآمد در تمام محصولات Kilo. تجربه‌ای آشنا، هر طور که انتخاب کنید کار کنید.",
+  "migration.whatsNew.blogLink": "خواندن اعلامیه کامل",
+  "migration.whatsNew.docsLink": "چه چیزی جدید است و سؤالات متداول",
+  "migration.whatsNew.continue": "ادامه",
+
+  // Screen 2 — Migrate Settings
+  "migration.migrate.title": "تنظیمات خود را منتقل کنید",
+  "migration.migrate.subtitle": "تنظیماتی از نصب قبلی شما یافتیم. این‌ها چیزهایی هستند که می‌توانیم منتقل کنیم.",
+  "migration.migrate.selectLabel": "انتخاب موارد برای انتقال",
+  "migration.migrate.chatHistory": "جلسات و تاریخچه چت",
+  "migration.migrate.button": "انتقال تنظیمات",
+  "migration.migrate.skip": "رد کردن",
+  "migration.migrate.keysDetected": "{{count}} کلید شناسایی شد",
+  "migration.migrate.serversConfigured": "{{count}} سرور پیکربندی شده",
+  "migration.migrate.modesFound": "{{count}} حالت یافت شد",
+  "migration.migrate.sessionsDetected": "{{count}} نشست شناسایی شد",
+  "migration.migrate.nothingToMigrate": "هیچ موردی برای انتقال در تنظیمات قدیمی یافت نشد.",
+
+  // Migrate — item labels (reused from old select keys)
+  "migration.select.providers": "کلیدهای API ارائه‌دهنده",
+  "migration.select.mcpServers": "سرورهای MCP",
+  "migration.select.customModes": "حالت‌ها / عوامل سفارشی",
+  "migration.select.defaultModel": "مدل پیش‌فرض",
+  "migration.select.autoApproval": "تأیید خودکار",
+  "migration.select.language": "زبان رابط کاربری",
+  "migration.select.autocomplete": "تنظیمات تکمیل خودکار",
+
+  // Migrate — completion
+  "migration.complete.summary": "{{success}} از {{total}} مورد با موفقیت منتقل شد.",
+  "migration.complete.cleanup": "حذف داده‌های تنظیمات قدیمی",
+  "migration.complete.cleanupDescription":
+    "این گزینه تنظیمات قدیمی را از حافظه VS Code حذف می‌کند. پس از این کار، امکان اجرای مجدد این انتقال وجود نخواهد داشت.",
+  "migration.complete.done": "انجام شد",
+  "migration.error.continue": "ادامه",
+  "migration.sessionSummary.title": "خلاصه:",
+  "migration.sessionSummary.copy": "کپی گزارش",
+  "migration.sessionSummary.toast.copied": "گزارش کپی شد",
+  "migration.sessionSummary.successful": "موفق",
+  "migration.sessionSummary.skipped": "رد شده",
+  "migration.sessionSummary.alreadyMigrated": "قبلاً منتقل شده",
+  "migration.sessionSummary.errored": "با خطا مواجه شد",
+  "migration.sessionSummary.none": "هیچ‌کدام",
+  "migration.forceReimport.title": "وارد کردن مجدد اجباری",
+  "migration.forceReimport.description":
+    "وارد کردن مجدد {{target}} آن‌ها را بازنویسی کرده و هر پیام جدیدی که در آن نشست‌ها ایجاد شده را حذف می‌کند.",
+  "migration.forceReimport.target.one": "این نشست",
+  "migration.forceReimport.target.many": "این {{count}} نشست",
+  "migration.forceReimport.button": "وارد کردن مجدد اجباری",
+  "migration.forceReimport.all": "وارد کردن مجدد همه",
+  "migration.forceReimport.proceed": "ادامه",
+  "migration.forceReimport.toast.started": "وارد کردن مجدد اجباری آغاز شد",
+  "migration.running.title": "انتقال در حال انجام است",
+  "migration.running.description.line1": "در حالی که هنوز نشست‌هایی در حال انتقال هستند، می‌خواهید پایان دهید.",
+  "migration.running.description.line2": "اگر اکنون خارج شوید، برخی جلسات ممکن است ناتمام بمانند.",
+  "migration.running.stay": "ماندن",
+  "migration.running.proceed": "ادامه",
+  "migration.sessionProgress.preparing": "در حال آماده‌سازی جلسه",
+  "migration.sessionProgress.storing": "در حال ذخیره جلسه",
+  "migration.sessionProgress.skipped": "جلسه رد شد",
+  "migration.sessionProgress.header": "در حال انتقال {{current}} از {{total}}",
+  "migration.sessionFormat.unknownDate": "تاریخ نامشخص",
+  "migration.sessionFormat.unknown": "نامشخص",
+  "migration.sessionFormat.unknownError": "خطای نامشخص",
+  // legacy-migration end
+
+  "error.details.show": "جزئیات",
+
+  "task.todos.progress": "{{done}}/{{total}} کار انجام شد",
+  "task.todos.allDone": "{{count}} کار انجام شد",
+
+  "settings.saveBar.unsavedChanges": "تغییرات ذخیره‌نشده",
+  "settings.saveBar.discard": "رد کردن",
+  "settings.saveBar.save": "ذخیره",
+  "settings.saveBar.saving": "در حال ذخیره…",
+  "settings.saveBar.warning.one": "یک جلسه در حال اجرا است و قطع خواهد شد",
+  "settings.saveBar.warning.many": "چند جلسه در حال اجرا هستند و قطع خواهند شد",
+  "settings.saveBar.saveAnyway": "در هر صورت ذخیره کن",
+  "settings.saveBar.cancel": "لغو",
+  "settings.saveBar.saveFailed": "ذخیره تنظیمات ممکن نشد",
+
+  "notifications.action.next": "بعدی",
+  "notifications.action.close": "بستن",
+  "notifications.action.tryModel": "امتحان {{model}}",
+  "notifications.action.tryModelGeneric": "امتحان مدل",
+
+  "diffViewer.source.workspace.label": "شاخه",
+  "diffViewer.source.workspace.tooltip":
+    "تمام تغییرات این شاخه در مقایسه با شاخه پایه. شامل فایل‌های کامیت‌نشده (staged، unstaged، untracked) و کامیت‌های محلی که هنوز در شاخه پایه نیستند.",
+  "diffViewer.source.staged.label": "آماده‌سازی‌شده",
+  "diffViewer.source.staged.tooltip":
+    "فایل‌هایی با تغییراتی که به ناحیه staging گیت اضافه کرده‌اید (`git add`)، همان‌طور که در کامیت بعدی ظاهر خواهند شد.",
+  "diffViewer.source.unstaged.label": "مرحله‌بندی‌نشده",
+  "diffViewer.source.unstaged.tooltip":
+    "فایل‌های تغییر یافته در working tree شما که هنوز stage نشده‌اند، به علاوه فایل‌های ردیابی‌نشده (جدید).",
+  "diffViewer.source.session.label": "جلسه",
+  "diffViewer.source.session.tooltip":
+    "فایل‌هایی که توسط Kilo در جلسه جاری تغییر کرده‌اند، بر اساس عکس‌های فوری هر نوبت. با شروع جلسه جدید بازنشانی می‌شود.",
+  "diffViewer.group.session": "جلسه",
+  "diffViewer.group.git": "Git",
+  "diffViewer.notice.snapshotsDisabled":
+    "عکس‌های فوری برای این مخزن غیرفعال هستند. لطفاً فایل‌های پیکربندی خود را ویرایش کنید تا تغییرات جلسه نمایش داده شوند.",
+
+  "diffViewer.baseBranch.auto": "پیش‌فرض",
+  "diffViewer.baseBranch.default": "پیش‌فرض",
+  "diffViewer.baseBranch.remote": "راه دور",
+  "diffViewer.baseBranch.search": "جستجوی شاخه‌ها",
+  "diffViewer.baseBranch.empty": "هیچ شاخه‌ای یافت نشد",
+  "diffViewer.baseBranch.loading": "در حال بارگذاری شاخه‌ها…",
+  "diffViewer.baseBranch.none": "—",
+
+  "plan.exit.ready": "طرح آماده است:",
+  "chat.search.placeholder": "جستجو در چت…",
+  "chat.search.toggle": "جستجو در چت",
+  "chat.search.matchCase": "تطابق حروف بزرگ و کوچک",
+  "chat.search.matchWholeWord": "تطابق کلمه کامل",
+  "chat.search.useRegex": "استفاده از عبارت منظم",
+  "chat.search.previousMatch": "تطابق قبلی",
+  "chat.search.nextMatch": "تطابق بعدی",
+  "chat.search.close": "بستن جستجو",
+  "chat.search.invalidRegex": "عبارت منظم نامعتبر",
+  "chat.search.noResults": "نتیجه‌ای یافت نشد",
+  "chat.search.searchingHistory": "در حال جستجو در پیام‌های قبلی…",
+}
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index 451b0a1bc6..ebae31fcca 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -306,7 +306,6 @@ export const dict = {
 
   "session.tab.review": "Revue",
   "session.review.filesChanged": "{{count}} fichiers modifiés",
-  "session.review.change.other": "Modifications",
   "session.review.loadingChanges": "Chargement des modifications...",
   "session.review.noChanges": "Aucune modification",
   "session.messages.loadingEarlier": "Chargement des messages précédents...",
@@ -716,7 +715,13 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Comportement de l'agent",
   "settings.autoApprove.title": "Approbation automatique",
-  "settings.browser.title": "Navigateur",
+  "settings.webTools.title": "Outils web",
+  "settings.webTools.description": "Configurez la recherche web et l’automatisation du navigateur.",
+  "settings.webTools.webSearch.enable": "Activer pour tous les fournisseurs",
+  "settings.webTools.browserAutomation": "Automatisation du navigateur",
+  "settings.webTools.webSearch.title": "Recherche web",
+  "settings.webTools.webSearch.description":
+    "Rendez la recherche web disponible pour les modèles de tous les fournisseurs.",
   "settings.checkpoints.title": "Points de contrôle",
   "settings.display.title": "Affichage",
   "settings.autocomplete.title": "Autocomplétion",
@@ -734,6 +739,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Défiler vers le bas",
   "session.messages.initializing": "Initialisation...",
   "session.messages.taskStarting": "Démarrage...",
+  "session.prompts.navLabel": "Navigateur de prompts",
+  "session.prompts.tick": "Prompt {{index}} sur {{total}} : {{prompt}}",
+  "session.prompts.noAnswer": "Pas encore de réponse",
+  "session.prompts.queued": "En attente",
+  "session.prompts.first": "Premier prompt",
+  "session.prompts.latest": "Dernier prompt",
+  "session.prompts.overflow": "{{count}} prompts précédents",
   "session.status.writingResponse": "Rédaction de la réponse…",
   "session.status.retry": "Nouvelle tentative…",
   "session.status.working": "En cours…",
@@ -761,7 +773,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Connexion au serveur...",
   "prompt.placeholder.error": "Échec de la connexion. Vérifiez le panneau de sortie ou redémarrez l'extension.",
-  "prompt.placeholder.default": "Tapez un message... (Entrée pour envoyer, Maj+Entrée pour un saut de ligne)",
+  "prompt.placeholder.default":
+    "Tapez un message, @ pour mentionner des fichiers... (Entrée pour envoyer, Maj+Entrée pour un saut de ligne)",
 
   "context.usage.sessionCost": "Coût de la session",
   "context.usage.olderSessions": "{{count}} sessions précédentes",
@@ -903,6 +916,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Modèle SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Modèle utilisé pour élaguer les sorties d'outils ; par défaut, le small model configuré",
+  "settings.experimental.multiProject.title": "Agent Manager Multi-Projet",
+  "settings.experimental.multiProject.description":
+    "Activer la gestion des sessions et worktrees sur plusieurs dépôts dans Agent Manager. Le dépôt de l'espace de travail actuel est toujours le projet par défaut.",
   "settings.experimental.mcpTimeout.title": "Délai MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Délai des requêtes du serveur MCP en millisecondes",
   "settings.experimental.remote.title": "Contrôle Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 066cd30098..f3db529ef4 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -219,7 +219,6 @@ export const dict = {
   "ui.approval.source.default": "per impostazione predefinita",
   "session.tab.review": "Revisione",
   "session.review.filesChanged": "{{count}} file modificati",
-  "session.review.change.other": "Modifiche",
   "session.review.loadingChanges": "Caricamento modifiche...",
   "session.review.noChanges": "Nessuna modifica",
   "session.messages.loadingEarlier": "Caricamento messaggi precedenti...",
@@ -529,7 +528,12 @@ export const dict = {
   "profile.action.logout": "Esci",
   "settings.agentBehaviour.title": "Comportamento agente",
   "settings.autoApprove.title": "Approvazione automatica",
-  "settings.browser.title": "Browser",
+  "settings.webTools.title": "Strumenti web",
+  "settings.webTools.description": "Configura la ricerca web e l'automazione del browser.",
+  "settings.webTools.webSearch.enable": "Abilita per tutti i provider",
+  "settings.webTools.browserAutomation": "Automazione del browser",
+  "settings.webTools.webSearch.title": "Ricerca web",
+  "settings.webTools.webSearch.description": "Rendi disponibile la ricerca web ai modelli di tutti i provider.",
   "settings.checkpoints.title": "Checkpoint",
   "settings.display.title": "Visualizzazione",
   "settings.autocomplete.title": "Autocompletamento",
@@ -574,6 +578,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Scorri in fondo",
   "session.messages.initializing": "Inizializzazione...",
   "session.messages.taskStarting": "Avvio...",
+  "session.prompts.navLabel": "Navigatore dei prompt",
+  "session.prompts.tick": "Prompt {{index}} di {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Nessuna risposta ancora",
+  "session.prompts.queued": "In coda",
+  "session.prompts.first": "Primo prompt",
+  "session.prompts.latest": "Ultimo prompt",
+  "session.prompts.overflow": "{{count}} prompt precedenti",
   "session.status.writingResponse": "Scrittura risposta...",
   "session.status.retry": "Riprovo...",
   "session.status.working": "Al lavoro...",
@@ -606,7 +617,8 @@ export const dict = {
   "ui.sessionTurn.status.consideringNextSteps": "Valutazione prossimi passi...",
   "dialog.model.noProviders": "Nessun provider",
   "prompt.placeholder.connecting": "Connessione al server...",
-  "prompt.placeholder.default": "Scrivi un messaggio... (Invio per inviare, Maiusc+Invio per nuova riga)",
+  "prompt.placeholder.default":
+    "Scrivi un messaggio, @ per menzionare i file... (Invio per inviare, Maiusc+Invio per nuova riga)",
   "prompt.placeholder.error": "Connessione non riuscita. Controlla il pannello output o riavvia l'estensione.",
   "context.usage.sessionCost": "Costo sessione",
   "context.usage.olderSessions": "{{count}} sessioni precedenti",
@@ -731,6 +743,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Modello SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Modello usato per potare le uscite degli strumenti; per impostazione predefinita, il modello piccolo configurato",
+  "settings.experimental.multiProject.title": "Agent Manager Multi-Progetto",
+  "settings.experimental.multiProject.description":
+    "Abilita la gestione di sessioni e worktree su più repository in Agent Manager. Il repository dell'area di lavoro corrente è sempre il progetto predefinito.",
   "settings.experimental.mcpTimeout.title": "Timeout MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout per richieste server MCP in millisecondi",
   "settings.experimental.remote.title": "Controllo remoto",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index b338abd210..85558b3f95 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -303,7 +303,6 @@ export const dict = {
 
   "session.tab.review": "レビュー",
   "session.review.filesChanged": "{{count}} ファイル変更",
-  "session.review.change.other": "変更",
   "session.review.loadingChanges": "変更を読み込み中...",
   "session.review.noChanges": "変更なし",
   "session.messages.loadingEarlier": "以前のメッセージを読み込み中...",
@@ -697,7 +696,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "エージェントの動作",
   "settings.autoApprove.title": "自動承認",
-  "settings.browser.title": "ブラウザ",
+  "settings.webTools.title": "ウェブツール",
+  "settings.webTools.description": "ウェブ検索とブラウザ自動化を設定します。",
+  "settings.webTools.webSearch.enable": "すべてのプロバイダーで有効化",
+  "settings.webTools.browserAutomation": "ブラウザ自動化",
+  "settings.webTools.webSearch.title": "ウェブ検索",
+  "settings.webTools.webSearch.description": "すべてのプロバイダーのモデルでウェブ検索を利用できるようにします。",
   "settings.checkpoints.title": "チェックポイント",
   "settings.display.title": "表示",
   "settings.autocomplete.title": "オートコンプリート",
@@ -715,6 +719,13 @@ export const dict = {
   "session.messages.scrollToBottom": "下にスクロール",
   "session.messages.initializing": "初期化中...",
   "session.messages.taskStarting": "開始中...",
+  "session.prompts.navLabel": "プロンプトナビゲーター",
+  "session.prompts.tick": "プロンプト {{index}}/{{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "まだ応答がありません",
+  "session.prompts.queued": "キューに追加済み",
+  "session.prompts.first": "最初のプロンプト",
+  "session.prompts.latest": "最新のプロンプト",
+  "session.prompts.overflow": "{{count}} 件前のプロンプト",
   "session.status.writingResponse": "応答を作成中…",
   "session.status.retry": "再試行中…",
   "session.status.working": "作業中…",
@@ -742,7 +753,7 @@ export const dict = {
 
   "prompt.placeholder.connecting": "サーバーに接続中...",
   "prompt.placeholder.error": "接続に失敗しました。出力パネルを確認するか、拡張機能を再起動してください。",
-  "prompt.placeholder.default": "メッセージを入力... (Enterで送信、Shift+Enterで改行)",
+  "prompt.placeholder.default": "メッセージを入力、@ でファイルを参照... (Enterで送信、Shift+Enterで改行)",
 
   "context.usage.sessionCost": "セッションコスト",
   "context.usage.olderSessions": "{{count}} 件の古いセッション",
@@ -875,6 +886,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner モデル",
   "settings.experimental.swePrunerModel.description":
     "ツール出力の剪定に使用するモデル。既定では設定済みのスモールモデルを使用します",
+  "settings.experimental.multiProject.title": "マルチプロジェクト Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Agent Managerで複数のリポジトリにまたがるセッションとワークツリーの管理を有効にします。現在のワークスペースリポジトリは常にデフォルトプロジェクトです。",
   "settings.experimental.mcpTimeout.title": "MCPタイムアウト（ミリ秒）",
   "settings.experimental.mcpTimeout.description": "MCPサーバーリクエストのタイムアウト（ミリ秒）",
   "settings.experimental.remote.title": "Remote コントロール",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 20fc092585..319aeb99dc 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -304,7 +304,6 @@ export const dict = {
 
   "session.tab.review": "검토",
   "session.review.filesChanged": "{{count}}개 파일 변경됨",
-  "session.review.change.other": "변경",
   "session.review.loadingChanges": "변경 사항 로드 중...",
   "session.review.noChanges": "변경 없음",
   "session.messages.loadingEarlier": "이전 메시지 로드 중...",
@@ -657,7 +656,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "에이전트 동작",
   "settings.autoApprove.title": "자동 승인",
-  "settings.browser.title": "브라우저",
+  "settings.webTools.title": "웹 도구",
+  "settings.webTools.description": "웹 검색 및 브라우저 자동화를 구성합니다.",
+  "settings.webTools.webSearch.enable": "모든 제공업체에 사용",
+  "settings.webTools.browserAutomation": "브라우저 자동화",
+  "settings.webTools.webSearch.title": "웹 검색",
+  "settings.webTools.webSearch.description": "모든 제공업체의 모델에서 웹 검색을 사용할 수 있도록 합니다.",
   "settings.checkpoints.title": "체크포인트",
   "settings.display.title": "디스플레이",
   "settings.autocomplete.title": "자동 완성",
@@ -716,6 +720,13 @@ export const dict = {
   "session.messages.scrollToBottom": "하단으로 스크롤",
   "session.messages.initializing": "초기화 중...",
   "session.messages.taskStarting": "시작 중...",
+  "session.prompts.navLabel": "프롬프트 탐색기",
+  "session.prompts.tick": "프롬프트 {{index}}/{{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "아직 응답이 없습니다",
+  "session.prompts.queued": "대기 중",
+  "session.prompts.first": "첫 번째 프롬프트",
+  "session.prompts.latest": "최신 프롬프트",
+  "session.prompts.overflow": "{{count}}개 이전 프롬프트",
   "session.status.writingResponse": "응답 작성 중...",
   "session.status.retry": "재시도 중…",
   "session.status.working": "작업 중...",
@@ -742,7 +753,7 @@ export const dict = {
 
   "prompt.placeholder.connecting": "서버에 연결 중...",
   "prompt.placeholder.error": "연결에 실패했습니다. 출력 패널을 확인하거나 확장 프로그램을 다시 시작하세요.",
-  "prompt.placeholder.default": "메시지를 입력하세요... (Enter로 전송, Shift+Enter로 줄 바꿈)",
+  "prompt.placeholder.default": "메시지를 입력하세요, @로 파일 언급... (Enter로 전송, Shift+Enter로 줄 바꿈)",
 
   "context.usage.sessionCost": "세션 비용",
   "context.usage.olderSessions": "{{count}}개의 이전 세션",
@@ -872,6 +883,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner 모델",
   "settings.experimental.swePrunerModel.description":
     "도구 출력을 정리하는 데 사용하는 모델. 기본값은 구성된 소형 모델입니다",
+  "settings.experimental.multiProject.title": "멀티 프로젝트 Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Agent Manager에서 여러 저장소에 걸친 세션과 워크트리 관리를 활성화합니다. 현재 워크스페이스 저장소는 항상 기본 프로젝트입니다.",
   "settings.experimental.mcpTimeout.title": "MCP 타임아웃 (ms)",
   "settings.experimental.mcpTimeout.description": "MCP 서버 요청의 타임아웃 시간 (밀리초)",
   "settings.experimental.remote.title": "Remote 제어",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 5f0d90da4b..bbc056094a 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -307,7 +307,6 @@ export const dict = {
 
   "session.tab.review": "Beoordelen",
   "session.review.filesChanged": "{{count}} bestanden gewijzigd",
-  "session.review.change.other": "Wijzigingen",
   "session.review.loadingChanges": "Wijzigingen laden...",
   "session.review.noChanges": "Geen wijzigingen",
 
@@ -658,7 +657,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Agent Gedrag",
   "settings.autoApprove.title": "Automatisch Goedkeuren",
-  "settings.browser.title": "Browser",
+  "settings.webTools.title": "Webtools",
+  "settings.webTools.description": "Configureer zoeken op internet en browserautomatisering.",
+  "settings.webTools.webSearch.enable": "Inschakelen voor alle providers",
+  "settings.webTools.browserAutomation": "Browserautomatisering",
+  "settings.webTools.webSearch.title": "Zoeken op internet",
+  "settings.webTools.webSearch.description": "Maak zoeken op internet beschikbaar voor modellen van alle providers.",
   "settings.checkpoints.title": "Controlepunten",
   "settings.display.title": "Weergave",
   "settings.autocomplete.title": "Automatisch Aanvullen",
@@ -713,6 +717,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Scroll naar beneden",
   "session.messages.initializing": "Initialiseren...",
   "session.messages.taskStarting": "Starten...",
+  "session.prompts.navLabel": "Promptnavigator",
+  "session.prompts.tick": "Prompt {{index}} van {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Nog geen reactie",
+  "session.prompts.queued": "In wachtrij",
+  "session.prompts.first": "Eerste prompt",
+  "session.prompts.latest": "Meest recente prompt",
+  "session.prompts.overflow": "{{count}} eerdere prompts",
   "session.status.writingResponse": "Antwoord schrijven...",
   "session.status.retry": "Opnieuw proberen...",
   "session.status.working": "Bezig...",
@@ -739,7 +750,8 @@ export const dict = {
   "dialog.model.noProviders": "Geen providers",
 
   "prompt.placeholder.connecting": "Verbinden met server...",
-  "prompt.placeholder.default": "Typ een bericht... (Enter om te verzenden, Shift+Enter voor nieuwe regel)",
+  "prompt.placeholder.default":
+    "Typ een bericht, @ om bestanden te vermelden... (Enter om te verzenden, Shift+Enter voor nieuwe regel)",
   "prompt.placeholder.error": "Verbinding mislukt. Controleer het uitvoerpaneel of herstart de extensie.",
 
   "context.usage.sessionCost": "Sessiekosten",
@@ -882,6 +894,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner-model",
   "settings.experimental.swePrunerModel.description":
     "Model dat wordt gebruikt om tooluitvoer te snoeien; standaard het geconfigureerde kleine model",
+  "settings.experimental.multiProject.title": "Multi-project Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Schakel het beheren van sessies en worktrees over meerdere repositories in Agent Manager in. De huidige workspace-repository is altijd het standaardproject.",
   "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout voor MCP-serververzoeken in milliseconden",
   "settings.experimental.remote.title": "Remote-bediening",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index f9a0d5f096..678d2b08ad 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -310,7 +310,6 @@ export const dict = {
 
   "session.tab.review": "Gjennomgang",
   "session.review.filesChanged": "{{count}} filer endret",
-  "session.review.change.other": "Endringer",
   "session.review.loadingChanges": "Laster endringer...",
   "session.review.noChanges": "Ingen endringer",
   "session.messages.loadingEarlier": "Laster inn tidligere meldinger...",
@@ -665,7 +664,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Agentoppførsel",
   "settings.autoApprove.title": "Automatisk godkjenning",
-  "settings.browser.title": "Nettleser",
+  "settings.webTools.title": "Nettverktøy",
+  "settings.webTools.description": "Konfigurer nettsøk og nettleserautomatisering.",
+  "settings.webTools.webSearch.enable": "Aktiver for alle leverandører",
+  "settings.webTools.browserAutomation": "Nettleserautomatisering",
+  "settings.webTools.webSearch.title": "Nettsøk",
+  "settings.webTools.webSearch.description": "Gjør nettsøk tilgjengelig for modeller fra alle leverandører.",
   "settings.checkpoints.title": "Kontrollpunkter",
   "settings.display.title": "Visning",
   "settings.autocomplete.title": "Autofullfør",
@@ -683,6 +687,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Rull til bunnen",
   "session.messages.initializing": "Initialiserer...",
   "session.messages.taskStarting": "Starter...",
+  "session.prompts.navLabel": "Ledetekstnavigering",
+  "session.prompts.tick": "Ledetekst {{index}} av {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Ingen svar ennå",
+  "session.prompts.queued": "I kø",
+  "session.prompts.first": "Første ledetekst",
+  "session.prompts.latest": "Siste ledetekst",
+  "session.prompts.overflow": "{{count}} tidligere ledetekster",
   "session.status.writingResponse": "Skriver svar…",
   "session.status.retry": "Prøver på nytt…",
   "session.status.working": "Arbeider…",
@@ -710,7 +721,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Kobler til server...",
   "prompt.placeholder.error": "Tilkobling mislyktes. Sjekk utdatapanelet eller start utvidelsen på nytt.",
-  "prompt.placeholder.default": "Skriv en melding... (Enter for å sende, Shift+Enter for ny linje)",
+  "prompt.placeholder.default":
+    "Skriv en melding, @ for å nevne filer... (Enter for å sende, Shift+Enter for ny linje)",
 
   "context.usage.sessionCost": "Sesjonskostnad",
   "context.usage.olderSessions": "{{count}} eldre sesjoner",
@@ -842,6 +854,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner-modell",
   "settings.experimental.swePrunerModel.description":
     "Modell som brukes til å beskjære verktøyutdata; som standard den konfigurerte lille modellen",
+  "settings.experimental.multiProject.title": "Multi-prosjekt Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Aktiver administrering av økter og worktrees på tvers av flere repositories i Agent Manager. Det nåværende workspace-repositoryet er alltid standardprosjektet.",
   "settings.experimental.mcpTimeout.title": "MCP-tidsavbrudd (ms)",
   "settings.experimental.mcpTimeout.description": "Tidsavbrudd for MCP-serverforespørsler i millisekunder",
   "settings.experimental.remote.title": "Remote-kontroll",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index 99741deb92..43ce28664c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -304,7 +304,6 @@ export const dict = {
 
   "session.tab.review": "Przegląd",
   "session.review.filesChanged": "Zmieniono {{count}} plików",
-  "session.review.change.other": "Zmiany",
   "session.review.loadingChanges": "Ładowanie zmian...",
   "session.review.noChanges": "Brak zmian",
   "session.messages.loadingEarlier": "Ładowanie wcześniejszych wiadomości...",
@@ -661,7 +660,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Zachowanie agenta",
   "settings.autoApprove.title": "Automatyczne zatwierdzanie",
-  "settings.browser.title": "Przeglądarka",
+  "settings.webTools.title": "Narzędzia internetowe",
+  "settings.webTools.description": "Skonfiguruj wyszukiwanie w sieci i automatyzację przeglądarki.",
+  "settings.webTools.webSearch.enable": "Włącz dla wszystkich dostawców",
+  "settings.webTools.browserAutomation": "Automatyzacja przeglądarki",
+  "settings.webTools.webSearch.title": "Wyszukiwanie w sieci",
+  "settings.webTools.webSearch.description": "Udostępnij wyszukiwanie w sieci modelom wszystkich dostawców.",
   "settings.checkpoints.title": "Punkty kontrolne",
   "settings.display.title": "Wyświetlanie",
   "settings.autocomplete.title": "Autouzupełnianie",
@@ -679,6 +683,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Przewiń na dół",
   "session.messages.initializing": "Inicjalizacja...",
   "session.messages.taskStarting": "Uruchamianie...",
+  "session.prompts.navLabel": "Nawigator promptów",
+  "session.prompts.tick": "Prompt {{index}} z {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Jeszcze brak odpowiedzi",
+  "session.prompts.queued": "W kolejce",
+  "session.prompts.first": "Pierwszy prompt",
+  "session.prompts.latest": "Ostatni prompt",
+  "session.prompts.overflow": "{{count}} wcześniejszych promptów",
   "session.status.writingResponse": "Pisanie odpowiedzi…",
   "session.status.retry": "Ponawianie…",
   "session.status.working": "Pracuję…",
@@ -706,7 +717,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Łączenie z serwerem...",
   "prompt.placeholder.error": "Połączenie nie powiodło się. Sprawdź panel wyjściowy lub uruchom ponownie rozszerzenie.",
-  "prompt.placeholder.default": "Wpisz wiadomość... (Enter, aby wysłać, Shift+Enter dla nowej linii)",
+  "prompt.placeholder.default":
+    "Wpisz wiadomość, @ aby wspomnieć pliki... (Enter, aby wysłać, Shift+Enter dla nowej linii)",
 
   "context.usage.sessionCost": "Koszt sesji",
   "context.usage.olderSessions": "{{count}} starszych sesji",
@@ -839,6 +851,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Model SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Model używany do przycinania wyników narzędzi; domyślnie skonfigurowany mały model",
+  "settings.experimental.multiProject.title": "Wieloprojektowy Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Włącz zarządzanie sesjami i worktree w wielu repozytoriach w Agent Managerze. Bieżące repozytorium obszaru roboczego jest zawsze projektem domyślnym.",
   "settings.experimental.mcpTimeout.title": "Limit czasu MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Limit czasu żądań serwera MCP w milisekundach",
   "settings.experimental.remote.title": "Sterowanie Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 649c5b84d1..e3c7697133 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -302,7 +302,6 @@ export const dict = {
 
   "session.tab.review": "Обзор",
   "session.review.filesChanged": "{{count}} файлов изменено",
-  "session.review.change.other": "Изменения",
   "session.review.loadingChanges": "Загрузка изменений...",
   "session.review.noChanges": "Нет изменений",
   "session.messages.loadingEarlier": "Загрузка предыдущих сообщений...",
@@ -702,7 +701,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Поведение агента",
   "settings.autoApprove.title": "Автоодобрение",
-  "settings.browser.title": "Браузер",
+  "settings.webTools.title": "Веб-инструменты",
+  "settings.webTools.description": "Настройте веб-поиск и автоматизацию браузера.",
+  "settings.webTools.webSearch.enable": "Включить для всех провайдеров",
+  "settings.webTools.browserAutomation": "Автоматизация браузера",
+  "settings.webTools.webSearch.title": "Веб-поиск",
+  "settings.webTools.webSearch.description": "Сделайте веб-поиск доступным для моделей всех провайдеров.",
   "settings.checkpoints.title": "Контрольные точки",
   "settings.display.title": "Отображение",
   "settings.autocomplete.title": "Автодополнение",
@@ -720,6 +724,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Прокрутить вниз",
   "session.messages.initializing": "Инициализация...",
   "session.messages.taskStarting": "Запуск...",
+  "session.prompts.navLabel": "Навигатор промптов",
+  "session.prompts.tick": "Промпт {{index}} из {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Ответа пока нет",
+  "session.prompts.queued": "В очереди",
+  "session.prompts.first": "Первый запрос",
+  "session.prompts.latest": "Последний запрос",
+  "session.prompts.overflow": "{{count}} предыдущих запросов",
   "session.status.writingResponse": "Пишу ответ…",
   "session.status.retry": "Повторная попытка…",
   "session.status.working": "Работаю…",
@@ -747,7 +758,8 @@ export const dict = {
 
   "prompt.placeholder.connecting": "Подключение к серверу...",
   "prompt.placeholder.error": "Не удалось подключиться. Проверьте панель вывода или перезапустите расширение.",
-  "prompt.placeholder.default": "Введите сообщение... (Enter для отправки, Shift+Enter для новой строки)",
+  "prompt.placeholder.default":
+    "Введите сообщение, @ чтобы упомянуть файлы... (Enter для отправки, Shift+Enter для новой строки)",
 
   "context.usage.sessionCost": "Стоимость сессии",
   "context.usage.olderSessions": "{{count}} предыдущих сессий",
@@ -878,6 +890,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Модель SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Модель для обрезки вывода инструментов; по умолчанию — настроенная малая модель",
+  "settings.experimental.multiProject.title": "Мультипроектный Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Включите управление сессиями и рабочими деревьями в нескольких репозиториях в Agent Manager. Текущий репозиторий рабочего пространства всегда является проектом по умолчанию.",
   "settings.experimental.mcpTimeout.title": "Таймаут MCP (мс)",
   "settings.experimental.mcpTimeout.description": "Таймаут запросов MCP-сервера в миллисекундах",
   "settings.experimental.remote.title": "Управление Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index a6f5e657ee..2d88b0ad27 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -301,7 +301,6 @@ export const dict = {
 
   "session.tab.review": "ตรวจสอบ",
   "session.review.filesChanged": "{{count}} ไฟล์ที่เปลี่ยนแปลง",
-  "session.review.change.other": "การเปลี่ยนแปลง",
   "session.review.loadingChanges": "กำลังโหลดการเปลี่ยนแปลง...",
   "session.review.noChanges": "ไม่มีการเปลี่ยนแปลง",
 
@@ -695,7 +694,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "พฤติกรรมของเอเจนต์",
   "settings.autoApprove.title": "อนุมัติอัตโนมัติ",
-  "settings.browser.title": "เบราว์เซอร์",
+  "settings.webTools.title": "เครื่องมือเว็บ",
+  "settings.webTools.description": "กำหนดค่าการค้นหาเว็บและระบบอัตโนมัติของเบราว์เซอร์",
+  "settings.webTools.webSearch.enable": "เปิดใช้สำหรับผู้ให้บริการทั้งหมด",
+  "settings.webTools.browserAutomation": "ระบบอัตโนมัติของเบราว์เซอร์",
+  "settings.webTools.webSearch.title": "ค้นหาเว็บ",
+  "settings.webTools.webSearch.description": "ทำให้โมเดลจากผู้ให้บริการทั้งหมดใช้การค้นหาเว็บได้",
   "settings.checkpoints.title": "จุดตรวจสอบ",
   "settings.display.title": "การแสดงผล",
   "settings.autocomplete.title": "เติมข้อความอัตโนมัติ",
@@ -712,6 +716,13 @@ export const dict = {
   "session.messages.scrollToBottom": "เลื่อนไปด้านล่าง",
   "session.messages.initializing": "กำลังเริ่มต้น...",
   "session.messages.taskStarting": "กำลังเริ่มทำงาน...",
+  "session.prompts.navLabel": "ตัวนำทางพรอมต์",
+  "session.prompts.tick": "พรอมต์ {{index}} จาก {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "ยังไม่มีการตอบกลับ",
+  "session.prompts.queued": "อยู่ในคิว",
+  "session.prompts.first": "พรอมต์แรก",
+  "session.prompts.latest": "พรอมต์ล่าสุด",
+  "session.prompts.overflow": "พรอมต์ก่อนหน้า {{count}} รายการ",
   "session.status.writingResponse": "กำลังเขียนคำตอบ...",
   "session.status.retry": "กำลังลองใหม่…",
   "session.status.working": "กำลังทำงาน...",
@@ -739,7 +750,7 @@ export const dict = {
 
   "prompt.placeholder.connecting": "กำลังเชื่อมต่อกับเซิร์ฟเวอร์...",
   "prompt.placeholder.error": "การเชื่อมต่อล้มเหลว ตรวจสอบแผงเอาต์พุตหรือรีสตาร์ทส่วนขยาย",
-  "prompt.placeholder.default": "พิมพ์ข้อความ... (Enter เพื่อส่ง, Shift+Enter เพื่อขึ้นบรรทัดใหม่)",
+  "prompt.placeholder.default": "พิมพ์ข้อความ, @ เพื่ออ้างถึงไฟล์... (Enter เพื่อส่ง, Shift+Enter เพื่อขึ้นบรรทัดใหม่)",
 
   "context.usage.sessionCost": "ค่าใช้จ่ายเซสชัน",
   "context.usage.olderSessions": "{{count}} เซสชันก่อนหน้า",
@@ -868,6 +879,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "โมเดล SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "โมเดลที่ใช้ตัดทอนผลลัพธ์ของเครื่องมือ ค่าเริ่มต้นคือโมเดลขนาดเล็กที่กำหนดไว้",
+  "settings.experimental.multiProject.title": "Agent Manager หลายโปรเจกต์",
+  "settings.experimental.multiProject.description":
+    "เปิดใช้งานการจัดการเซสชันและเวิร์กทรีข้ามหลาย Repository ใน Agent Manager Repository ของ workspace ปัจจุบันเป็นโปรเจกต์เริ่มต้นเสมอ",
   "settings.experimental.mcpTimeout.title": "หมดเวลา MCP (มิลลิวินาที)",
   "settings.experimental.mcpTimeout.description": "หมดเวลาสำหรับคำขอเซิร์ฟเวอร์ MCP เป็นมิลลิวินาที",
   "settings.experimental.remote.title": "การควบคุม Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index 9a9da245a6..41cab7fbd2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -302,7 +302,6 @@ export const dict = {
 
   "session.tab.review": "İnceleme",
   "session.review.filesChanged": "{{count}} Dosya Değişti",
-  "session.review.change.other": "Değişiklik",
   "session.review.loadingChanges": "Değişiklikler yükleniyor...",
   "session.review.noChanges": "Değişiklik yok",
 
@@ -653,7 +652,13 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Ajan Davranışı",
   "settings.autoApprove.title": "Otomatik Onay",
-  "settings.browser.title": "Tarayıcı",
+  "settings.webTools.title": "Web Araçları",
+  "settings.webTools.description": "Web aramasını ve tarayıcı otomasyonunu yapılandırın.",
+  "settings.webTools.webSearch.enable": "Tüm Sağlayıcılar İçin Etkinleştir",
+  "settings.webTools.browserAutomation": "Tarayıcı Otomasyonu",
+  "settings.webTools.webSearch.title": "Web Araması",
+  "settings.webTools.webSearch.description":
+    "Web aramasını tüm sağlayıcıların modelleri için kullanılabilir hale getirin.",
   "settings.checkpoints.title": "Kontrol Noktaları",
   "settings.display.title": "Görünüm",
   "settings.autocomplete.title": "Otomatik Tamamlama",
@@ -707,6 +712,13 @@ export const dict = {
   "session.messages.scrollToBottom": "En alta kaydır",
   "session.messages.initializing": "Başlatılıyor...",
   "session.messages.taskStarting": "Başlıyor...",
+  "session.prompts.navLabel": "Komut gezgini",
+  "session.prompts.tick": "Komut {{index}} / {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Henüz yanıt yok",
+  "session.prompts.queued": "Sırada",
+  "session.prompts.first": "İlk istem",
+  "session.prompts.latest": "En son istem",
+  "session.prompts.overflow": "{{count}} önceki istem",
   "session.status.writingResponse": "Yanıt yazılıyor...",
   "session.status.retry": "Yeniden deneniyor…",
   "session.status.working": "Çalışıyor...",
@@ -733,7 +745,8 @@ export const dict = {
   "dialog.model.noProviders": "Sağlayıcı yok",
 
   "prompt.placeholder.connecting": "Sunucuya bağlanılıyor...",
-  "prompt.placeholder.default": "Bir mesaj yazın... (Göndermek için Enter, yeni satır için Shift+Enter)",
+  "prompt.placeholder.default":
+    "Bir mesaj yazın, dosyaları belirtmek için @ kullanın... (Göndermek için Enter, yeni satır için Shift+Enter)",
   "prompt.placeholder.error": "Bağlantı başarısız. Çıktı panelini kontrol edin veya uzantıyı yeniden başlatın.",
 
   "context.usage.sessionCost": "Oturum maliyeti",
@@ -870,6 +883,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "SWE-Pruner Modeli",
   "settings.experimental.swePrunerModel.description":
     "Araç çıktılarını budamak için kullanılan model; varsayılan olarak yapılandırılmış küçük model",
+  "settings.experimental.multiProject.title": "Çoklu Proje Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Agent Manager'da birden fazla depo genelinde oturum ve worktree yönetimini etkinleştirin. Mevcut çalışma alanı deposu her zaman varsayılan projedir.",
   "settings.experimental.mcpTimeout.title": "MCP Zaman Aşımı (ms)",
   "settings.experimental.mcpTimeout.description": "MCP sunucu istekleri için milisaniye cinsinden zaman aşımı",
   "settings.experimental.remote.title": "Remote Kontrolü",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index f80fdf0f99..323eaeec34 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -306,7 +306,6 @@ export const dict = {
 
   "session.tab.review": "Огляд",
   "session.review.filesChanged": "{{count}} файлів змінено",
-  "session.review.change.other": "Змін",
   "session.review.loadingChanges": "Завантаження змін...",
   "session.review.noChanges": "Змін немає",
 
@@ -655,7 +654,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Поведінка агента",
   "settings.autoApprove.title": "Автоматичне схвалення",
-  "settings.browser.title": "Браузер",
+  "settings.webTools.title": "Вебінструменти",
+  "settings.webTools.description": "Налаштуйте вебпошук і автоматизацію браузера.",
+  "settings.webTools.webSearch.enable": "Увімкнути для всіх постачальників",
+  "settings.webTools.browserAutomation": "Автоматизація браузера",
+  "settings.webTools.webSearch.title": "Вебпошук",
+  "settings.webTools.webSearch.description": "Зробіть вебпошук доступним для моделей усіх постачальників.",
   "settings.checkpoints.title": "Контрольні точки",
   "settings.display.title": "Відображення",
   "settings.autocomplete.title": "Автодоповнення",
@@ -709,6 +713,13 @@ export const dict = {
   "session.messages.scrollToBottom": "Прокрутити до низу",
   "session.messages.initializing": "Ініціалізація...",
   "session.messages.taskStarting": "Запуск...",
+  "session.prompts.navLabel": "Навігатор запитів",
+  "session.prompts.tick": "Запит {{index}} з {{total}}: {{prompt}}",
+  "session.prompts.noAnswer": "Відповіді ще немає",
+  "session.prompts.queued": "У черзі",
+  "session.prompts.first": "Перший запит",
+  "session.prompts.latest": "Останній запит",
+  "session.prompts.overflow": "{{count}} попередніх запитів",
   "session.status.writingResponse": "Пишу відповідь...",
   "session.status.retry": "Повторна спроба…",
   "session.status.working": "Працює...",
@@ -735,7 +746,8 @@ export const dict = {
   "dialog.model.noProviders": "Немає провайдерів",
 
   "prompt.placeholder.connecting": "Підключення до сервера...",
-  "prompt.placeholder.default": "Напишіть повідомлення... (Enter для надсилання, Shift+Enter для нового рядка)",
+  "prompt.placeholder.default":
+    "Напишіть повідомлення, @ щоб згадати файли... (Enter для надсилання, Shift+Enter для нового рядка)",
   "prompt.placeholder.error": "Підключення не вдалося. Перевірте панель виводу або перезапустіть розширення.",
 
   "context.usage.sessionCost": "Вартість сесії",
@@ -873,6 +885,9 @@ export const dict = {
   "settings.experimental.swePrunerModel.title": "Модель SWE-Pruner",
   "settings.experimental.swePrunerModel.description":
     "Модель для обрізання виводу інструментів; за замовчуванням — налаштована мала модель",
+  "settings.experimental.multiProject.title": "Мультипроєктний Agent Manager",
+  "settings.experimental.multiProject.description":
+    "Увімкніть керування сеансами та робочими деревами в кількох репозиторіях в Agent Manager. Поточний репозиторій робочого простору завжди є проєктом за замовчуванням.",
   "settings.experimental.mcpTimeout.title": "Тайм-аут MCP (мс)",
   "settings.experimental.mcpTimeout.description": "Тайм-аут у мілісекундах для запитів до MCP-сервера",
   "settings.experimental.remote.title": "Керування Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index ae31c74807..148cb4911c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -292,7 +292,6 @@ export const dict = {
 
   "session.tab.review": "审查",
   "session.review.filesChanged": "{{count}} 个文件变更",
-  "session.review.change.other": "更改",
   "session.review.loadingChanges": "正在加载更改...",
   "session.review.noChanges": "无更改",
   "session.messages.loadingEarlier": "正在加载更早的消息...",
@@ -679,7 +678,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "智能体行为",
   "settings.autoApprove.title": "自动审批",
-  "settings.browser.title": "浏览器",
+  "settings.webTools.title": "网络工具",
+  "settings.webTools.description": "配置网页搜索和浏览器自动化。",
+  "settings.webTools.webSearch.enable": "为所有提供商启用",
+  "settings.webTools.browserAutomation": "浏览器自动化",
+  "settings.webTools.webSearch.title": "网页搜索",
+  "settings.webTools.webSearch.description": "让所有提供商的模型都可使用网页搜索。",
   "settings.checkpoints.title": "检查点",
   "settings.display.title": "显示",
   "settings.autocomplete.title": "自动补全",
@@ -696,6 +700,13 @@ export const dict = {
   "session.messages.scrollToBottom": "滚动到底部",
   "session.messages.initializing": "初始化中...",
   "session.messages.taskStarting": "启动中...",
+  "session.prompts.navLabel": "提示词导航",
+  "session.prompts.tick": "提示词 {{index}}/{{total}}：{{prompt}}",
+  "session.prompts.noAnswer": "暂无响应",
+  "session.prompts.queued": "已排队",
+  "session.prompts.first": "首个提示",
+  "session.prompts.latest": "最新提示",
+  "session.prompts.overflow": "{{count}} 个更早的提示",
   "session.status.writingResponse": "正在撰写回复…",
   "session.status.retry": "正在重试…",
   "session.status.working": "处理中…",
@@ -722,7 +733,7 @@ export const dict = {
 
   "prompt.placeholder.connecting": "正在连接服务器...",
   "prompt.placeholder.error": "连接失败。请检查输出面板或重启扩展。",
-  "prompt.placeholder.default": "输入消息... (Enter 发送，Shift+Enter 换行)",
+  "prompt.placeholder.default": "输入消息，用 @ 提及文件... (Enter 发送，Shift+Enter 换行)",
 
   "context.usage.sessionCost": "会话费用",
   "context.usage.olderSessions": "{{count}} 个较早的会话",
@@ -846,6 +857,9 @@ export const dict = {
     "启用 SWE-Pruner：根据智能体提供的聚焦问题，对读取、搜索和 shell 工具的大型输出进行任务感知裁剪",
   "settings.experimental.swePrunerModel.title": "SWE-Pruner 模型",
   "settings.experimental.swePrunerModel.description": "用于裁剪工具输出的模型;默认为已配置的小模型",
+  "settings.experimental.multiProject.title": "多项目 Agent Manager",
+  "settings.experimental.multiProject.description":
+    "在 Agent Manager 中启用跨多个仓库的会话和工作树管理。当前工作区仓库始终是默认项目。",
   "settings.experimental.mcpTimeout.title": "MCP 超时（毫秒）",
   "settings.experimental.mcpTimeout.description": "MCP 服务器请求的超时时间（毫秒）",
   "settings.experimental.remote.title": "Remote 控制",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index 097657622d..b114493e6e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -290,7 +290,6 @@ export const dict = {
 
   "session.tab.review": "審查",
   "session.review.filesChanged": "{{count}} 個檔案變更",
-  "session.review.change.other": "變更",
   "session.review.loadingChanges": "正在載入變更...",
   "session.review.noChanges": "沒有變更",
   "session.messages.loadingEarlier": "正在載入更早的訊息...",
@@ -639,7 +638,12 @@ export const dict = {
 
   "settings.agentBehaviour.title": "Agent 行為",
   "settings.autoApprove.title": "自動核准",
-  "settings.browser.title": "瀏覽器",
+  "settings.webTools.title": "網路工具",
+  "settings.webTools.description": "設定網頁搜尋和瀏覽器自動化。",
+  "settings.webTools.webSearch.enable": "為所有供應商啟用",
+  "settings.webTools.browserAutomation": "瀏覽器自動化",
+  "settings.webTools.webSearch.title": "網頁搜尋",
+  "settings.webTools.webSearch.description": "讓所有供應商的模型都可使用網頁搜尋。",
   "settings.checkpoints.title": "檢查點",
   "settings.display.title": "顯示",
   "settings.autocomplete.title": "自動完成",
@@ -656,6 +660,13 @@ export const dict = {
   "session.messages.scrollToBottom": "捲動至底部",
   "session.messages.initializing": "初始化中...",
   "session.messages.taskStarting": "啟動中...",
+  "session.prompts.navLabel": "提示詞導覽",
+  "session.prompts.tick": "提示詞 {{index}}/{{total}}：{{prompt}}",
+  "session.prompts.noAnswer": "尚無回應",
+  "session.prompts.queued": "已排入佇列",
+  "session.prompts.first": "第一個提示",
+  "session.prompts.latest": "最新提示",
+  "session.prompts.overflow": "{{count}} 個較早的提示",
   "session.status.writingResponse": "正在撰寫回覆…",
   "session.status.retry": "正在重試…",
   "session.status.working": "處理中…",
@@ -682,7 +693,7 @@ export const dict = {
 
   "prompt.placeholder.connecting": "正在連線至伺服器...",
   "prompt.placeholder.error": "連線失敗。請檢查輸出面板或重新啟動擴充功能。",
-  "prompt.placeholder.default": "輸入訊息... (Enter 送出，Shift+Enter 換行)",
+  "prompt.placeholder.default": "輸入訊息，用 @ 提及檔案... (Enter 送出，Shift+Enter 換行)",
 
   "context.usage.sessionCost": "工作階段費用",
   "context.usage.olderSessions": "{{count}} 個較早的工作階段",
@@ -806,6 +817,9 @@ export const dict = {
     "啟用 SWE-Pruner：根據智能體提供的聚焦問題，對讀取、搜尋與 shell 工具的大型輸出進行任務感知裁剪",
   "settings.experimental.swePrunerModel.title": "SWE-Pruner 模型",
   "settings.experimental.swePrunerModel.description": "用於裁剪工具輸出的模型;預設為已設定的小模型",
+  "settings.experimental.multiProject.title": "多專案 Agent Manager",
+  "settings.experimental.multiProject.description":
+    "在 Agent Manager 中啟用跨多個儲存庫的工作階段和工作樹管理。當前工作區儲存庫始終是預設專案。",
   "settings.experimental.mcpTimeout.title": "MCP 逾時（毫秒）",
   "settings.experimental.mcpTimeout.description": "MCP 伺服器請求的逾時時間（毫秒）",
   "settings.experimental.remote.title": "Remote 控制",
diff --git a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
index 18b9b4cc7f..9b6789d00c 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
@@ -59,7 +59,8 @@ type PluginSpec = string | [string, Record<string, unknown>]
 // Merged English dictionary (same merge order as the real LanguageProvider)
 const dict: Record<string, string> = { ...appEn, ...amEn, ...uiEn, ...kiloEn }
 
-function t(key: string, params?: Record<string, string | number | boolean | undefined>) {
+/** Story-local translator. Usable outside the provider tree, unlike useLanguage. */
+export function t(key: string, params?: Record<string, string | number | boolean | undefined>) {
   return resolveTemplate(dict[key] ?? key, params)
 }
 
@@ -262,7 +263,7 @@ export function mockSessionValue(overrides?: {
     createSession: noop,
     clearCurrentSession: noop,
     loadSessions: noop,
-    loadOlderMessages: noop,
+    loadOlderMessages: () => false,
     selectSession: noop,
     deleteSession: noop,
     renameSession: noop,
@@ -335,6 +336,7 @@ const ConfigWrapper: ParentComponent<{
       config: createMemo(() => cfg()),
       globalConfig: createMemo(() => (scoped ? global() : cfg())),
       projectConfig: createMemo(() => (scoped ? project() : cfg())),
+      collections: () => ({}),
       settings,
       features,
       loading: () => false,
@@ -375,6 +377,9 @@ const ConfigWrapper: ParentComponent<{
         setSettings((prev) => ({ ...prev, [key]: value }))
         setDirty(true)
       },
+      applySetting: (key: string, value: unknown, _writeKey?: string) => {
+        setSettings((prev) => ({ ...prev, [key]: value }))
+      },
       saveConfig: () => setDirty(false),
       discardConfig: () => setDirty(false),
     }
diff --git a/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
index 009b72bb17..9c465120c0 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
@@ -5,7 +5,7 @@
  */
 
 import type { Meta, StoryObj } from "storybook-solidjs-vite"
-import { StoryProviders, defaultMockData, mockSessionValue } from "./StoryProviders"
+import { StoryProviders, defaultMockData, mockSessionValue, t } from "./StoryProviders"
 import { FileTree } from "../../diff-viewer/FileTree"
 import { DiffPanel } from "../../agent-manager/DiffPanel"
 import { FullScreenDiffView } from "../../diff-viewer/FullScreenDiffView"
@@ -933,9 +933,9 @@ export const TabBarSingleTab: Story = {
 }
 
 // Side terminal panel inside the real inspector host chain, empty state —
-// no live PTY, so the start affordance renders. The header reuses the
-// .am-diff-header metrics so the a11y/screenshot baseline also guards the
-// alignment against the diff panel chrome.
+// no live PTY, so the start affordance renders. The tab strip header keeps
+// the .am-diff-header height so the a11y/screenshot baseline also guards
+// the alignment against the diff panel chrome.
 export const SideTerminalPanelEmpty: Story = {
   name: "Side terminal panel — empty",
   render: () => {
@@ -953,8 +953,53 @@ export const SideTerminalPanelEmpty: Story = {
                   state={state}
                   contextKey={() => LOCAL}
                   visible={() => true}
+                  onSelect={() => undefined}
                   onClose={() => undefined}
+                  onCloseOthers={() => undefined}
                   onStart={() => undefined}
+                  onStop={() => undefined}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </StoryProviders>
+    )
+  },
+}
+
+// Tab strip with several side terminals: the active one shows the X close
+// button, the others reveal it on hover. Terminals point at a dead port —
+// xterm renders its connection-error notice inside the panel, which keeps
+// the story self-contained without a live PTY.
+export const SideTerminalPanelTabs: Story = {
+  name: "Side terminal panel — tabs",
+  render: () => {
+    const state = createTerminalState(() => LOCAL)
+    const font = { fontFamily: "monospace", fontSize: 12 }
+    state.add(null, { id: "terminal:one", title: "Terminal 1", wsUrl: "ws://127.0.0.1:1/a", font, placement: "side" })
+    state.add(null, { id: "terminal:two", title: "Terminal 2", wsUrl: "ws://127.0.0.1:1/b", font, placement: "side" })
+    state.add(null, { id: "terminal:three", title: "Terminal 3", wsUrl: "ws://127.0.0.1:1/c", font, placement: "side" })
+    state.setSideActive(LOCAL, "terminal:two")
+    state.setTitle("terminal:two", "npm run dev")
+    return (
+      <StoryProviders noPadding>
+        <div class="am-detail-stack" style={{ height: "420px" }}>
+          <div class="am-detail-content am-detail-split">
+            <div class="am-main-pane" style={{ padding: "24px", color: "var(--text-weak)" }}>
+              Agent session stays visible beside the terminal.
+            </div>
+            <div class="am-diff-resize" style={{ width: "360px" }}>
+              <div class="am-diff-panel-wrapper">
+                <SideTerminalPanel
+                  state={state}
+                  contextKey={() => LOCAL}
+                  visible={() => true}
+                  onSelect={(id) => state.setSideActive(LOCAL, id)}
+                  onClose={() => undefined}
+                  onCloseOthers={() => undefined}
+                  onStart={() => undefined}
+                  onStop={() => undefined}
                 />
               </div>
             </div>
@@ -1146,3 +1191,150 @@ export const SidebarSearchOpen: Story = {
     )
   },
 }
+
+// ---------------------------------------------------------------------------
+// Multi-project sidebar
+// ---------------------------------------------------------------------------
+
+import { ProjectList } from "../../agent-manager/ProjectList"
+import type {
+  AgentManagerStateMessage,
+  AgentProjectSnapshot,
+  LocalGitStats,
+  ProjectSessionInfo,
+} from "../types/messages"
+
+const projectA: AgentProjectSnapshot = {
+  id: "prj-aaaa1111aaaa",
+  root: "/repos/kilocode",
+  label: "kilocode",
+  pinned: true,
+  active: true,
+  expanded: true,
+  initialized: true,
+  trusted: true,
+  missing: false,
+}
+const projectB: AgentProjectSnapshot = {
+  id: "prj-bbbb2222bbbb",
+  root: "/repos/kilo-gateway",
+  label: "kilo-gateway",
+  pinned: false,
+  active: false,
+  expanded: true,
+  initialized: true,
+  trusted: true,
+  missing: false,
+}
+
+const wt = (id: string, branch: string, label?: string): WorktreeState => ({
+  id,
+  branch,
+  path: `/repos/x/.kilo/worktrees/${id}`,
+  parentBranch: "main",
+  createdAt: "2026-07-20T10:00:00Z",
+  label,
+})
+
+const projectState = (
+  projectId: string,
+  worktrees: WorktreeState[],
+  sessions: { id: string; worktreeId: string | null }[],
+  sections: NonNullable<AgentManagerStateMessage["sections"]> = [],
+  baseBranch = "main",
+): AgentManagerStateMessage => ({
+  type: "agentManager.state",
+  projectId,
+  worktrees,
+  sessions: sessions.map((s) => ({ id: s.id, worktreeId: s.worktreeId, createdAt: "2026-07-20T10:00:00Z" })),
+  sections,
+  staleWorktreeIds: [],
+  isGitRepo: true,
+  defaultBaseBranch: baseBranch,
+  sessionsCollapsed: false,
+})
+
+const projectSession = (
+  id: string,
+  worktreeId: string | null,
+  title: string,
+  updatedAt: string,
+): ProjectSessionInfo => ({
+  id,
+  worktreeId,
+  title,
+  createdAt: "2026-07-19T09:00:00Z",
+  updatedAt,
+})
+
+const storyStats = (worktreeId: string, additions: number, deletions: number, ahead = 0): WorktreeGitStats => ({
+  worktreeId,
+  files: 3,
+  additions,
+  deletions,
+  ahead,
+  behind: 0,
+})
+
+const storyLocal = (branch: string, additions: number, deletions: number, ahead = 0, behind = 0): LocalGitStats => ({
+  branch,
+  files: 2,
+  additions,
+  deletions,
+  ahead,
+  behind,
+})
+
+export const MultiProjectSidebar: Story = {
+  name: "Project List — two expanded projects with restored controls",
+  render: () => {
+    return (
+      <StoryProviders noPadding>
+        <div style={{ display: "flex", "flex-direction": "column", "max-height": "720px", overflow: "auto" }}>
+          <ProjectList
+            projects={[projectA, projectB]}
+            states={{
+              [projectA.id]: projectState(
+                projectA.id,
+                [wt("wt-a1", "feature/project-list", "Project list UI"), wt("wt-a2", "fix/session-routing")],
+                [
+                  { id: "ses-a1", worktreeId: null },
+                  { id: "ses-a2", worktreeId: "wt-a1" },
+                ],
+              ),
+              [projectB.id]: projectState(
+                projectB.id,
+                [wt("wt-b1", "feat/gateway-routing", "Gateway routing")],
+                [{ id: "ses-b1", worktreeId: null }],
+                [{ id: "sec-b1", name: "In progress", color: null, order: 0, collapsed: false }],
+                "master",
+              ),
+            }}
+            stats={{
+              [projectA.id]: { "wt-a1": storyStats("wt-a1", 342, 87, 2), "wt-a2": storyStats("wt-a2", 18, 4) },
+              [projectB.id]: { "wt-b1": storyStats("wt-b1", 96, 12, 1) },
+            }}
+            local={{
+              [projectA.id]: storyLocal("main", 124, 33, 1),
+              [projectB.id]: storyLocal("master", 0, 0, 0, 2),
+            }}
+            prs={{ [projectA.id]: {}, [projectB.id]: {} }}
+            sessions={{
+              [projectA.id]: [
+                projectSession("ses-a1", null, "Refine project accordion layout", "2026-07-24T08:30:00Z"),
+                projectSession("ses-a2", "wt-a1", "Add per-project actions", "2026-07-23T16:10:00Z"),
+              ],
+              [projectB.id]: [projectSession("ses-b1", null, "Route stats per project", "2026-07-24T07:45:00Z")],
+            }}
+            selectedProject={projectA.id}
+            selection="local"
+            bindings={{ search: "⌘F", showShortcuts: "⌘⇧/", newWorktree: "⌘N", quickWorktree: "⌘⇧N" }}
+            t={t}
+            onSearchRef={() => {}}
+            onShortcuts={() => {}}
+          />
+        </div>
+      </StoryProviders>
+    )
+  },
+}
diff --git a/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
index 7d5e6705e9..94abfd215d 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
@@ -9,6 +9,7 @@
 
 import type { Meta, StoryObj } from "storybook-solidjs-vite"
 import type { AssistantMessage } from "@kilocode/sdk/v2"
+import { batch, createSignal } from "solid-js"
 import { StoryProviders, defaultMockData, mockSessionValue } from "./StoryProviders"
 import { ChatView } from "../components/chat/ChatView"
 import { ErrorDisplay } from "../components/chat/ErrorDisplay"
@@ -617,6 +618,167 @@ export const ChatViewReadable420: Story = {
   render: () => renderReadableChat("busy"),
 }
 
+// ---------------------------------------------------------------------------
+// PromptRail — the left-edge tick rail and its hover card
+// Several turns so the rail and card are populated: a long prompt, a short
+// low-signal follow-up, a tool-only answer (empty preview), and a queued one.
+// ---------------------------------------------------------------------------
+
+const railNow = 1_700_000_200_000
+const railTurn = (i: number, prompt: string, answer: string | undefined, queued = false) => {
+  const userID = `rail-user-${i}`
+  const assistantID = `rail-asst-${i}`
+  const messages: any[] = [{ id: userID, sessionID: SESSION_ID, role: "user", time: { created: railNow + i * 100 } }]
+  if (!queued) {
+    messages.push({
+      id: assistantID,
+      sessionID: SESSION_ID,
+      role: "assistant",
+      parentID: userID,
+      time: { created: railNow + i * 100 + 50 },
+      modelID: "claude-sonnet-4-20250514",
+      providerID: "anthropic",
+      mode: "default",
+      agent: "default",
+      path: { cwd: "/project", root: "/project" },
+    })
+  }
+  const parts: Record<string, any[]> = {
+    [userID]: [{ id: `rail-part-user-${i}`, sessionID: SESSION_ID, messageID: userID, type: "text", text: prompt }],
+  }
+  if (!queued) {
+    parts[assistantID] = answer
+      ? [{ id: `rail-part-asst-${i}`, sessionID: SESSION_ID, messageID: assistantID, type: "text", text: answer }]
+      : [
+          {
+            id: `rail-part-asst-${i}`,
+            sessionID: SESSION_ID,
+            messageID: assistantID,
+            type: "tool",
+            callID: `rail-call-${i}`,
+            tool: "bash",
+            state: {
+              status: "completed",
+              input: { command: "ls", description: "List files" },
+              output: "a.ts b.ts",
+              title: "ls",
+              metadata: {},
+              time: { start: railNow + i * 100 + 50, end: railNow + i * 100 + 80 },
+            },
+          },
+        ]
+  }
+  return { messages, parts }
+}
+
+const railTurns = [
+  railTurn(
+    1,
+    "Add a prompt navigator rail to the left edge of the chat that expands into a card of prompt and answer previews when I hover it, without shrinking the readable lane",
+    "Added PromptRail with a tick per prompt and a hover card; the lane width is untouched.",
+  ),
+  railTurn(2, "yes", "Confirmed — wiring it into MessageList next."),
+  railTurn(3, "run the tests", undefined),
+  railTurn(
+    4,
+    "now do the same in the Agent Manager chat",
+    "ChatView → MessageList is shared, so the rail appears there automatically; no Agent Manager specific code needed.",
+  ),
+  railTurn(5, "looks good, ship it", "", true),
+]
+const railMessages = railTurns.flatMap((turn) => turn.messages)
+const railParts = Object.assign({}, ...railTurns.map((turn) => turn.parts))
+const railData = {
+  ...defaultMockData,
+  message: { [SESSION_ID]: railMessages },
+  part: railParts,
+}
+
+const renderRailChat = (status: "idle" | "busy" = "idle") => {
+  const session = {
+    ...mockSessionValue({ id: SESSION_ID, status }),
+    messages: () => railMessages,
+    userMessages: () => railMessages.filter((msg) => msg.role === "user"),
+    getParts: (id: string) => railParts[id] ?? [],
+  }
+  return (
+    <StoryProviders data={railData} sessionID={SESSION_ID} status={status} noPadding>
+      <SessionContext.Provider value={session as any}>
+        <div style={{ height: "100vh", display: "flex", "flex-direction": "column" }}>
+          <ChatView />
+        </div>
+      </SessionContext.Provider>
+    </StoryProviders>
+  )
+}
+
+export const PromptRailWide: Story = {
+  name: "PromptRail - wide editor tab",
+  render: () => renderRailChat(),
+}
+
+export const PromptRailSidebar: Story = {
+  name: "PromptRail - narrow sidebar",
+  render: () => renderRailChat("busy"),
+}
+
+// Long session: more prompts than fit the transcript height, so the rail and
+// the card both cap to the newest ones that fit.
+const manyTurns = Array.from({ length: 80 }, (_, i) =>
+  railTurn(100 + i, `Prompt number ${i + 1} in a long running session`, `Answer number ${i + 1}.`),
+)
+const manyMessages = manyTurns.flatMap((turn) => turn.messages)
+const recentMessages = manyTurns.slice(-40).flatMap((turn) => turn.messages)
+const manyData = {
+  ...defaultMockData,
+  message: { [SESSION_ID]: manyMessages },
+  part: Object.assign({}, ...manyTurns.map((turn) => turn.parts)),
+}
+
+export const PromptRailManyPrompts: Story = {
+  name: "PromptRail - long session caps to what fits",
+  render: () => {
+    const [messages, setMessages] = createSignal(recentMessages)
+    const [older, setOlder] = createSignal(true)
+    const [loading, setLoading] = createSignal(false)
+    const [mutation, setMutation] = createSignal<"prepend">()
+    const load = () => {
+      if (!older() || loading()) return false
+      setLoading(true)
+      // Paging is a backend round trip, so the story keeps a short delay: the
+      // navigator's loading row is part of the behavior being shown.
+      setTimeout(() => {
+        batch(() => {
+          setMessages(manyMessages)
+          setOlder(false)
+          setMutation("prepend")
+          setLoading(false)
+        })
+      }, 300)
+      return true
+    }
+    const session = {
+      ...mockSessionValue({ id: SESSION_ID, status: "idle" }),
+      messages,
+      userMessages: () => messages().filter((msg) => msg.role === "user"),
+      getParts: (id: string) => manyData.part[id] ?? [],
+      hasOlderMessages: older,
+      loadingOlderMessages: loading,
+      messageMutation: mutation,
+      loadOlderMessages: load,
+    }
+    return (
+      <StoryProviders data={manyData} sessionID={SESSION_ID} status="idle" noPadding>
+        <SessionContext.Provider value={session as any}>
+          <div style={{ height: "100vh", display: "flex", "flex-direction": "column" }}>
+            <ChatView />
+          </div>
+        </SessionContext.Provider>
+      </StoryProviders>
+    )
+  },
+}
+
 export const MessageListToolToQueuedUserSpacing: Story = {
   name: "MessageList — queued users stay at bottom",
   render: () => {
diff --git a/packages/kilo-vscode/webview-ui/src/styles/banners.css b/packages/kilo-vscode/webview-ui/src/styles/banners.css
index e8e66675f1..edbda58d57 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/banners.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/banners.css
@@ -169,6 +169,119 @@
   align-items: center;
   gap: 6px;
   min-width: 0;
+  flex-shrink: 1;
+}
+
+/* ============================================
+   Inline diff toolbar controls (scope, base, diff style)
+   ============================================
+
+   These sit inside a toolbar row next to ghost buttons and a radio group, so
+   they must not carry header-band margins and must match the small control
+   height. `.am-selector-trigger` is a 32px full-width input-style control;
+   everything below shrinks it to a toolbar-sized chip. */
+
+.diff-scope-controls {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex-shrink: 1;
+}
+
+/* Two-class selector on purpose: `.am-selector-trigger` (agent-manager.css) is
+   a 32px full-width input-style control and loads after this file, so a single
+   `.diff-inline-trigger` class would lose the cascade tie and keep the tall
+   size. */
+.am-selector-trigger.diff-inline-trigger {
+  width: auto;
+  height: 22px;
+  gap: 4px;
+  padding: 0 6px;
+  font-size: var(--kilo-font-size-12);
+  /* Tight line box: the inherited 19.5px line-height leaves no room inside a
+     22px chip and makes inline children look like they burst out of it. */
+  line-height: 20px;
+  /* Never squeeze: shrinking these to unreadable slivers looks broken. The
+     container queries below drop whole controls instead. */
+  flex-shrink: 0;
+  min-width: 0;
+}
+
+/* The "Default" badge is sized for dropdown rows (19.5px line box + padding =
+   21.5px), which fills a 22px chip edge to edge. Shrink it so it reads as a
+   badge inside the control instead of overflowing it. */
+.am-selector-trigger.diff-inline-trigger .am-branch-badge {
+  padding: 0 4px;
+  line-height: 14px;
+  border-radius: 2px;
+}
+
+.am-selector-trigger.diff-inline-trigger .am-selector-right {
+  margin-left: 2px;
+}
+
+/* Long branch names ellipsize rather than pushing the row wider. The compact
+   variant (narrow side panel) caps tighter than the full-screen toolbar. */
+.am-selector-trigger.diff-inline-trigger .am-selector-value {
+  max-width: 160px;
+}
+
+.diff-scope-controls-compact .am-selector-trigger.diff-inline-trigger .am-selector-value {
+  max-width: 92px;
+}
+
+/* The shared `.am-dropdown` rule pins popover width to the anchor width, which
+   would make these narrow triggers open an unreadably narrow menu. */
+.diff-inline-menu[data-component="popover-content"] {
+  width: auto;
+  min-width: 200px;
+}
+
+.diff-inline-group {
+  padding: 6px 10px 2px;
+  font-size: var(--kilo-font-size-11);
+  font-weight: 500;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: var(--text-weaker);
+}
+
+/* Inline controls inside the two Agent Manager diff toolbars. They must not add
+   vertical margin: each toolbar's height is its own padding plus the tallest
+   control, so a header-band margin here would visibly grow the row (this is
+   why these rows do not reuse `[data-component="diff-picker-header"]`). */
+.am-review-toolbar-left > .diff-scope-controls,
+.am-diff-header-main > .diff-scope-controls {
+  margin: 0;
+  min-width: 0;
+  flex-shrink: 0;
+}
+
+/* ============================================
+   Narrow side panel: progressive disclosure
+   ============================================
+
+   The user can drag the diff side panel arbitrarily narrow. Flex shrinking
+   alone clips controls mid-glyph and slides them under the action buttons, so
+   whole controls are dropped instead, least important first. The scope select
+   always survives: it is the only way back out of an empty scope.
+
+   The container is declared on `.am-diff-header` in agent-manager.css (that
+   file only permits `am-`-prefixed selectors, so the `diff-`-prefixed rules
+   live here). */
+
+/* Diff style has a home in the full-screen review, so it goes before base. */
+@container am-diff-header (max-width: 470px) {
+  .am-diff-header-main .diff-style-select {
+    display: none;
+  }
+}
+
+@container am-diff-header (max-width: 390px) {
+  .am-diff-header-main .diff-base-picker {
+    display: none;
+  }
 }
 
 .diff-base-current {
@@ -193,12 +306,6 @@
   line-height: 1;
 }
 
-.diff-base-trigger {
-  height: 24px;
-  font-size: var(--kilo-font-size-12);
-  padding: 0 8px;
-}
-
 /* ============================================
    Diff Viewer Notice (e.g. snapshots disabled)
    ============================================ */
diff --git a/packages/kilo-vscode/webview-ui/src/styles/chat.css b/packages/kilo-vscode/webview-ui/src/styles/chat.css
index 9bd9a1b166..6f75206919 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/chat.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/chat.css
@@ -10,6 +10,7 @@
 @import "./search-menu.css";
 @import "./session-tabs.css";
 @import "./chat-layout.css";
+@import "./prompt-rail.css";
 @import "./banners.css";
 @import "./session-actions.css";
 @import "./welcome.css";
diff --git a/packages/kilo-vscode/webview-ui/src/styles/prompt-dropdowns.css b/packages/kilo-vscode/webview-ui/src/styles/prompt-dropdowns.css
index a87d87f9fd..70901682b7 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/prompt-dropdowns.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/prompt-dropdowns.css
@@ -138,6 +138,16 @@
   font-size: var(--kilo-font-size-11);
 }
 
+.session-mention-worktree {
+  flex-shrink: 0;
+  opacity: 0.6;
+  font-size: var(--kilo-font-size-11);
+  max-width: 40%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 /* ============================================
    Slash Command Dropdown
    ============================================ */
diff --git a/packages/kilo-vscode/webview-ui/src/styles/prompt-rail.css b/packages/kilo-vscode/webview-ui/src/styles/prompt-rail.css
new file mode 100644
index 0000000000..4bbe9a022d
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/styles/prompt-rail.css
@@ -0,0 +1,296 @@
+/* ============================================
+   Prompt Rail
+   ============================================ */
+
+.prompt-rail {
+  --prompt-rail-width: 16px;
+  --prompt-rail-gap: 8px;
+  --prompt-rail-step: 14px;
+  --prompt-rail-ease: cubic-bezier(0.22, 1, 0.36, 1);
+
+  position: absolute;
+  inset-inline-start: max(
+    0px,
+    calc(50% - var(--chat-readable-width) / 2 - var(--prompt-rail-width) - var(--prompt-rail-gap))
+  );
+  top: 0;
+  bottom: 0;
+  width: var(--prompt-rail-width);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  /* Guards the rail against ever painting outside its own column, whatever
+     the tick count or panel height. */
+  overflow: hidden;
+  padding: 12px 0;
+  pointer-events: none;
+  z-index: 2;
+  opacity: 0.5;
+  transition: opacity 0.25s var(--prompt-rail-ease);
+}
+
+.message-list-container:hover .prompt-rail,
+.prompt-rail:focus-within {
+  opacity: 1;
+}
+
+.prompt-rail-tick {
+  pointer-events: auto;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  height: var(--prompt-rail-step);
+  min-height: 4px;
+  width: 100%;
+  border: none;
+  background: none;
+  padding: 0;
+  cursor: pointer;
+  /* No outline box: the focus ring is drawn on the line itself, so a focused
+     tick reads as part of the rail instead of a rectangle floating over it. */
+  outline: none;
+}
+
+.prompt-rail-tick-line {
+  display: block;
+  height: 1.5px;
+  width: 9px;
+  border-radius: 1px;
+  background: var(--icon-base);
+  opacity: 0.7;
+  transition:
+    width 0.24s var(--prompt-rail-ease),
+    opacity 0.2s var(--prompt-rail-ease),
+    background-color 0.2s var(--prompt-rail-ease),
+    box-shadow 0.2s var(--prompt-rail-ease);
+}
+
+.prompt-rail-tick[data-queued] .prompt-rail-tick-line {
+  background: var(--icon-weaker);
+  opacity: 0.5;
+}
+
+.prompt-rail-tick--overflow .prompt-rail-tick-line {
+  width: 6px;
+  background: repeating-linear-gradient(
+    to right,
+    var(--icon-weaker) 0,
+    var(--icon-weaker) 2px,
+    transparent 2px,
+    transparent 4px
+  );
+}
+
+/* Scroll position: subtle, always-on cue. */
+.prompt-rail-tick--active .prompt-rail-tick-line {
+  width: 13px;
+  opacity: 1;
+  background: var(--icon-strong-base);
+}
+
+/* Pointer or keyboard target: the loud state, full width. */
+.prompt-rail-tick:hover .prompt-rail-tick-line,
+.prompt-rail-tick--open .prompt-rail-tick-line {
+  width: 100%;
+  height: 2px;
+  opacity: 1;
+  background: var(--icon-strong-base);
+}
+
+.prompt-rail-tick:focus-visible .prompt-rail-tick-line {
+  width: 100%;
+  height: 2px;
+  opacity: 1;
+  background: var(--icon-strong-base);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--vscode-focusBorder) 50%, transparent);
+}
+
+/* ============================================
+   Prompt Rail card
+   ============================================ */
+
+.prompt-rail-card {
+  position: fixed;
+  z-index: 1000;
+  box-sizing: border-box;
+  width: min(360px, calc(100vw - var(--prompt-rail-width, 16px) - 40px));
+  max-height: min(calc(100vh - 24px), var(--prompt-rail-card-height, calc(100vh - 24px)));
+  overflow-y: auto;
+  padding: 6px;
+  border-radius: 12px;
+  /* Reads as floating glass rather than a panel pasted over the transcript:
+     the text behind stays faintly perceptible through the blur, so the card
+     feels like it belongs to the same surface. Falls back to an opaque fill
+     where backdrop-filter is unavailable. */
+  background: color-mix(in srgb, var(--surface-float-base) 78%, transparent);
+  backdrop-filter: blur(20px) saturate(1.6);
+  -webkit-backdrop-filter: blur(20px) saturate(1.6);
+  box-shadow:
+    inset 0 0 0 1px color-mix(in srgb, var(--text-strong) 7%, transparent),
+    0 2px 6px -2px rgba(0, 0, 0, 0.22),
+    0 12px 32px -8px rgba(0, 0, 0, 0.4);
+  animation: prompt-rail-in 0.22s var(--prompt-rail-ease, cubic-bezier(0.22, 1, 0.36, 1));
+  transform-origin: left center;
+}
+
+.prompt-rail-card[data-virtualized] {
+  display: flex;
+  flex-direction: column;
+  height: min(calc(100vh - 24px), var(--prompt-rail-card-height));
+  overflow: hidden;
+  background: var(--surface-float-base);
+}
+
+.prompt-rail-card-header {
+  position: sticky;
+  top: -6px;
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  min-height: 32px;
+  padding: 4px 5px 4px 11px;
+  background: color-mix(in srgb, var(--surface-float-base) 88%, transparent);
+  backdrop-filter: blur(20px) saturate(1.6);
+  -webkit-backdrop-filter: blur(20px) saturate(1.6);
+}
+
+.prompt-rail-card-title {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--text-weak);
+  font-size: var(--kilo-font-size-11);
+  font-weight: var(--font-weight-medium, 500);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.prompt-rail-card-actions {
+  display: flex;
+  align-items: center;
+  flex: none;
+  gap: 2px;
+}
+
+.prompt-rail-loading {
+  display: flex;
+  flex: none;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 6px 0 8px;
+  color: var(--text-weaker);
+  font-size: var(--kilo-font-size-12);
+}
+
+.prompt-rail-list {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+.prompt-rail-list-static {
+  min-width: 0;
+}
+
+/* A floating popover should not paint an OS scrollbar over its own glass; the
+   rail already shows where you are in the session. */
+.prompt-rail-card,
+.prompt-rail-list {
+  scrollbar-width: none;
+}
+
+.prompt-rail-card::-webkit-scrollbar,
+.prompt-rail-list::-webkit-scrollbar {
+  display: none;
+}
+
+@supports not ((backdrop-filter: blur(1px)) or (-webkit-backdrop-filter: blur(1px))) {
+  .prompt-rail-card {
+    background: var(--surface-float-base);
+  }
+}
+
+@keyframes prompt-rail-in {
+  from {
+    opacity: 0;
+    transform: translateX(-6px) scale(0.98);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0) scale(1);
+  }
+}
+
+.prompt-rail-row {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 4px;
+  width: 100%;
+  box-sizing: border-box;
+  border: none;
+  background: none;
+  padding: 9px 11px;
+  border-radius: 8px;
+  text-align: start;
+  font: inherit;
+  cursor: pointer;
+  outline: none;
+  transition: background-color 0.16s var(--prompt-rail-ease, ease);
+}
+
+.prompt-rail-row--hover,
+.prompt-rail-row:hover {
+  background: color-mix(in srgb, var(--text-strong) 8%, transparent);
+}
+
+.prompt-rail-row:active {
+  background: color-mix(in srgb, var(--text-strong) 12%, transparent);
+}
+
+.prompt-rail-row-prompt {
+  font-size: var(--kilo-font-size-13);
+  line-height: var(--line-height-normal);
+  color: var(--text-strong);
+  font-weight: var(--font-weight-medium, 500);
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  min-width: 0;
+  width: 100%;
+}
+
+.prompt-rail-row-prompt[data-queued] {
+  color: var(--text-weak);
+}
+
+.prompt-rail-row-status {
+  color: var(--text-weaker);
+  font-weight: 400;
+}
+
+.prompt-rail-row-answer {
+  font-size: var(--kilo-font-size-12);
+  line-height: var(--line-height-large, 1.5);
+  color: var(--text-weak);
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  min-width: 0;
+  width: 100%;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .prompt-rail,
+  .prompt-rail-tick-line,
+  .prompt-rail-row {
+    transition: none;
+  }
+  .prompt-rail-card {
+    animation: none;
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/src/styles/question-dock.css b/packages/kilo-vscode/webview-ui/src/styles/question-dock.css
index 2d25d339d7..d31af72f2c 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/question-dock.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/question-dock.css
@@ -29,7 +29,8 @@
     align-items: center;
     justify-content: space-between;
     gap: 6px;
-    padding: 6px 8px 4px 12px;
+    padding-block: 6px 4px;
+    padding-inline: 12px 8px;
     cursor: pointer;
   }
 
@@ -176,7 +177,7 @@
     background-color: transparent;
     border: none;
     border-radius: 6px;
-    text-align: left;
+    text-align: start;
     width: 100%;
     cursor: pointer;
     outline: none;
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/config.ts b/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
index c10943cecc..b59633f748 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
@@ -15,6 +15,15 @@ export interface McpConfig {
   enabled?: boolean
 }
 
+export type ConfigOrigin = "project" | "global" | "system" | "default"
+
+export interface ConfigCollectionEntry {
+  key: string
+  source: ConfigOrigin
+}
+
+export type ConfigCollections = Record<string, ConfigCollectionEntry[]>
+
 export interface CommandConfig {
   template: string
   description?: string
@@ -154,6 +163,7 @@ export interface Config {
   compaction?: CompactionConfig
   commit_message?: CommitMessageConfig
   tools?: Record<string, boolean>
+  web_search?: boolean
   auto_collapse_reasoning?: boolean
   experimental?: ExperimentalConfig
   sandbox?: SandboxConfig
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
index 30a55b4de1..35d737de99 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
@@ -8,17 +8,26 @@ import type {
   CloudSessionInfo,
   Message,
   MessageLoadMode,
+  ProjectSessionInfo,
   SessionCloseReason,
   SessionInfo,
   SessionModelUsage,
   SessionUpdate,
 } from "./sessions"
+import type { AgentManagerSidebarTarget } from "./webview-messages"
 import type { PermissionRequest } from "./permissions"
 import type { AnacondaDesktopExtensionMessage } from "../../../../src/shared/anaconda-desktop-messages"
 import type { QuestionRequest, SuggestionRequest, TodoItem } from "./questions"
 import type { ModelSelection, Provider, ProviderAuthState } from "./providers"
 import type { AgentInfo, AgentRequirementResult, SkillInfo, SlashCommandInfo } from "./agents"
-import type { BrowserSettings, Config, FeatureFlags, IndexingStatus, KiloEmbeddingModelCatalog } from "./config"
+import type {
+  BrowserSettings,
+  Config,
+  ConfigCollections,
+  FeatureFlags,
+  IndexingStatus,
+  KiloEmbeddingModelCatalog,
+} from "./config"
 import type { WorkStyle, WorkStyleState } from "../../../../src/shared/work-style-presets"
 import type { KilocodeNotification, ProfileData } from "./profile"
 import type {
@@ -344,12 +353,16 @@ export interface NavigateMessage {
 export interface IndexingStatusLoadedMessage {
   type: "indexingStatusLoaded"
   status: IndexingStatus
+  projectId?: string
 }
 
 export interface IndexingSettingsLoadedMessage {
   type: "indexingSettingsLoaded"
   settings: {
     showButtonWhenDisabled: boolean
+    consent: boolean
+    projects: Array<{ id: string; root: string; label: string }>
+    projectId?: string
   }
 }
 
@@ -465,6 +478,8 @@ export interface SessionSearchItem {
   id: string
   title: string
   updated: number
+  /** Name of the worktree the session runs in, when listed across the worktree family. */
+  worktreeName?: string
 }
 
 export interface SessionSearchResultMessage {
@@ -560,14 +575,31 @@ export interface ClaudeCompatSettingLoadedMessage {
 
 export interface ExtensionSettings {
   maxCost?: number
+  multiProject?: boolean
   [key: string]: unknown
 }
 
+export interface SettingsConfigBinding {
+  id: string
+  scope: "global" | "project"
+  target: {
+    scope: "global" | "project"
+    path: string
+    revision: string
+    exists: boolean
+    writable: boolean
+    raw: Record<string, unknown>
+  }
+  project?: { id: string; root: string; generation: number; pinned: boolean }
+}
+
 export interface ConfigLoadedMessage {
   type: "configLoaded"
   config: Config
   globalConfig?: Config
   projectConfig?: Config
+  bindings?: { global?: SettingsConfigBinding; project?: SettingsConfigBinding }
+  collections?: ConfigCollections
   settings?: ExtensionSettings
   features: FeatureFlags
 }
@@ -577,6 +609,8 @@ export interface ConfigUpdatedMessage {
   config: Config
   globalConfig?: Config
   projectConfig?: Config
+  bindings?: { global?: SettingsConfigBinding; project?: SettingsConfigBinding }
+  collections?: ConfigCollections
   settings?: ExtensionSettings
   features: FeatureFlags
 }
@@ -585,6 +619,16 @@ export interface ConfigUpdateFailedMessage {
   type: "configUpdateFailed"
   message: string
   details?: string
+  completedScopes?: Array<"global" | "project">
+  config?: Config
+  globalConfig?: Config
+  projectConfig?: Config
+  bindings?: { global?: SettingsConfigBinding; project?: SettingsConfigBinding }
+}
+
+export interface ConfigBindingExpiredMessage {
+  type: "configBindingExpired"
+  reason: "project-changed" | "reconnected"
 }
 
 export interface GlobalConfigLoadedMessage {
@@ -642,6 +686,8 @@ export interface AgentManagerRepoInfoMessage {
 // Agent Manager worktree setup progress
 export interface AgentManagerWorktreeSetupMessage {
   type: "agentManager.worktreeSetup"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   status: "creating" | "starting" | "ready" | "error"
   message: string
   sessionId?: string
@@ -688,9 +734,44 @@ export interface AgentManagerStateMessage {
   runStatuses?: RunStatus[]
   runScriptConfigured?: boolean
   runScriptPath?: string
+  /** Owning project for this state payload. Absent in legacy single-project payloads. */
+  projectId?: string
+  /** Last selected sidebar target for seamless project-switch restore. */
+  activeTarget?: AgentManagerSidebarTarget
   terminalDestination?: TerminalDestination
 }
 
+// A registered Agent Manager project as shown in the sidebar
+export interface AgentProjectSnapshot {
+  id: string
+  root: string
+  label: string
+  pinned: boolean
+  active: boolean
+  expanded: boolean
+  initialized: boolean
+  trusted: boolean
+  missing: boolean
+}
+
+// Project catalog push from extension to webview
+export interface AgentManagerProjectsMessage {
+  type: "agentManager.projects"
+  multiProject: boolean
+  projects: AgentProjectSnapshot[]
+}
+
+export interface AgentManagerSelectionActivatedMessage {
+  type: "agentManager.selectionActivated"
+  target: AgentManagerSidebarTarget
+}
+
+export interface AgentManagerProjectSessionsMessage {
+  type: "agentManager.projectSessions"
+  projectId: string
+  sessions: ProjectSessionInfo[]
+}
+
 // ---------------------------------------------------------------------------
 // Agent Manager terminal messages
 // ---------------------------------------------------------------------------
@@ -733,6 +814,28 @@ export interface AgentManagerTerminalDestinationChangedMessage {
   destination: TerminalDestination
 }
 
+/** Provider-owned script terminal (Run/Setup). Full snapshots replace only these terminal kinds. */
+export type ScriptTerminalKind = "run" | "setup"
+
+export interface ScriptTerminalView {
+  terminalId: string
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
+  /** null for LOCAL, worktree id otherwise */
+  worktreeId: string | null
+  kind: ScriptTerminalKind
+  title: "Run" | "Setup"
+  wsUrl: string
+  state: "running" | "stopping" | "exited" | "failed"
+  exitCode?: number
+  font: TerminalFont
+}
+
+export interface AgentManagerScriptTerminalsMessage {
+  type: "agentManager.scriptTerminals"
+  terminals: ScriptTerminalView[]
+}
+
 export interface AgentManagerRunStatusMessage extends RunStatus {
   type: "agentManager.runStatus"
 }
@@ -818,6 +921,7 @@ export interface ModelSelectionsLoadedMessage {
 
 export interface AgentManagerBranchesMessage {
   type: "agentManager.branches"
+  projectId?: string
   branches: BranchInfo[]
   defaultBranch: string
 }
@@ -851,6 +955,13 @@ export interface AgentManagerWorktreeDiffLoadingMessage {
   loading: boolean
 }
 
+// Agent Manager: Source-level diff notice (extension → webview)
+export interface AgentManagerWorktreeDiffNoticeMessage {
+  type: "agentManager.worktreeDiffNotice"
+  sessionId: string
+  notice?: DiffViewerNotice
+}
+
 export interface AgentManagerApplyWorktreeDiffResultMessage {
   type: "agentManager.applyWorktreeDiffResult"
   worktreeId: string
@@ -868,21 +979,39 @@ export interface AgentManagerRevertWorktreeFileResultMessage {
   message: string
 }
 
+// Agent Manager: Branch picker data for a diff context (extension → webview)
+export interface AgentManagerDiffBranchesMessage {
+  type: "agentManager.diffBranches"
+  sessionId: string
+  branches: BranchInfo[]
+  defaultBranch: string
+  autoBase?: string
+  currentBase?: string
+  isAuto: boolean
+  currentBranch?: string
+}
+
 // Agent Manager: Worktree git stats push (extension → webview)
 export interface AgentManagerWorktreeStatsMessage {
   type: "agentManager.worktreeStats"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   stats: WorktreeGitStats[]
 }
 
 // Agent Manager: Local workspace git stats push (extension → webview)
 export interface AgentManagerLocalStatsMessage {
   type: "agentManager.localStats"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   stats: LocalGitStats
 }
 
 // Agent Manager: PR status push (extension → webview)
 export interface AgentManagerPRStatusMessage {
   type: "agentManager.prStatus"
+  /** Owning project; absent in single-project mode. */
+  projectId?: string
   worktreeId: string
   pr: PRStatus | null
   error?: "gh_missing" | "gh_auth" | "fetch_failed"
@@ -1195,6 +1324,7 @@ export type ExtensionMessage =
   | ConfigLoadedMessage
   | ConfigUpdatedMessage
   | ConfigUpdateFailedMessage
+  | ConfigBindingExpiredMessage
   | GlobalConfigLoadedMessage
   | NotificationSettingsLoadedMessage
   | TimelineSettingLoadedMessage
@@ -1209,6 +1339,9 @@ export type ExtensionMessage =
   | AgentManagerSessionForkedMessage
   | AgentManagerSessionClosedMessage
   | AgentManagerStateMessage
+  | AgentManagerProjectsMessage
+  | AgentManagerSelectionActivatedMessage
+  | AgentManagerProjectSessionsMessage
   | AgentManagerRunStatusMessage
   | AgentManagerKeybindingsMessage
   | AutoApproveStateMessage
@@ -1235,8 +1368,10 @@ export type ExtensionMessage =
   | AgentManagerWorktreeDiffMessage
   | AgentManagerWorktreeDiffFileMessage
   | AgentManagerWorktreeDiffLoadingMessage
+  | AgentManagerWorktreeDiffNoticeMessage
   | AgentManagerApplyWorktreeDiffResultMessage
   | AgentManagerRevertWorktreeFileResultMessage
+  | AgentManagerDiffBranchesMessage
   | AgentManagerWorktreeStatsMessage
   | AgentManagerLocalStatsMessage
   | AgentManagerPRStatusMessage
@@ -1245,6 +1380,7 @@ export type ExtensionMessage =
   | AgentManagerTerminalClosedMessage
   | AgentManagerTerminalErrorMessage
   | AgentManagerTerminalDestinationChangedMessage
+  | AgentManagerScriptTerminalsMessage
   // legacy-migration start
   | MigrationStateMessage
   | MigrationDataMessage
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts b/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts
index 90a5733027..05477b126a 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts
@@ -3,7 +3,7 @@ import type { Part, TokenUsage } from "./parts"
 
 export type SessionModelUsage = KilocodeSessionModelUsageResponse
 
-export type SessionCloseReason = "completed" | "error" | "interrupted"
+export type SessionCloseReason = "completed" | "error" | "interrupted" | "superseded"
 
 // Message structure (simplified for webview)
 export interface Message {
@@ -60,6 +60,10 @@ export interface SessionInfo {
   } | null
 }
 
+export interface ProjectSessionInfo extends SessionInfo {
+  worktreeId: string | null
+}
+
 export type SessionUpdate = Partial<SessionInfo> & Pick<SessionInfo, "id">
 
 // Cloud session info (from Kilo cloud API)
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
index 16fcfe59e5..32b2ffb445 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
@@ -4,7 +4,7 @@ import type { MessageLoadMode } from "./sessions"
 import type { PermissionFileDiff } from "./permissions"
 import type { ModelSelection, ProviderConfig } from "./providers"
 import type { Config } from "./config"
-import type { ModelAllocation, ReviewComment, TerminalPlacement } from "./agent-manager"
+import type { ModelAllocation, ReviewComment, TerminalDestination, TerminalPlacement } from "./agent-manager"
 import type { ReviewMessageData } from "../../../../src/shared/review-comments"
 import type { WorkStyle, WorkStyleState } from "../../../../src/shared/work-style-presets"
 import type { AnacondaDesktopWebviewMessage } from "../../../../src/shared/anaconda-desktop-messages"
@@ -496,6 +496,13 @@ export interface RequestIndexingStatusMessage {
 
 export interface RequestIndexingSettingsMessage {
   type: "requestIndexingSettings"
+  projectId?: string
+}
+
+export interface SetIndexingConsentMessage {
+  type: "setIndexingConsent"
+  projectId: string
+  enabled: boolean
 }
 
 export interface RequestChatSettingsMessage {
@@ -523,6 +530,8 @@ export interface UpdateConfigMessage {
   /** Project config patch written to the workspace's .kilo/kilo.jsonc or existing project config. */
   projectConfig?: Partial<Config>
   projectUnset?: string[][]
+  globalBindingId?: string
+  projectBindingId?: string
 }
 
 export interface RequestNotificationSettingsMessage {
@@ -581,6 +590,7 @@ export interface TelemetryRequest {
 // Create a new worktree (with auto-created first session)
 export interface CreateWorktreeRequest {
   type: "agentManager.createWorktree"
+  projectId?: string
   baseBranch?: string
   branchName?: string
   variant?: string
@@ -589,24 +599,28 @@ export interface CreateWorktreeRequest {
 // Delete a worktree and dissociate its sessions
 export interface DeleteWorktreeRequest {
   type: "agentManager.deleteWorktree"
+  projectId?: string
   worktreeId: string
 }
 
 // Remove a stale worktree entry from state without touching disk
 export interface RemoveStaleWorktreeRequest {
   type: "agentManager.removeStaleWorktree"
+  projectId?: string
   worktreeId: string
 }
 
 // Promote a session: create a worktree and move the session into it
 export interface PromoteSessionRequest {
   type: "agentManager.promoteSession"
+  projectId?: string
   sessionId: string
 }
 
 // Open an unassigned session locally (clear any worktree directory override)
 export interface OpenLocallyRequest {
   type: "agentManager.openLocally"
+  projectId?: string
   sessionId: string
 }
 
@@ -653,6 +667,7 @@ export interface ForgetSessionRequest {
 // Rename a worktree's display label
 export interface RenameWorktreeRequest {
   type: "agentManager.renameWorktree"
+  projectId?: string
   worktreeId: string
   label: string
 }
@@ -665,18 +680,76 @@ export interface RequestStateMessage {
   type: "agentManager.requestState"
 }
 
+// Request the current project catalog
+export interface RequestProjectsMessage {
+  type: "agentManager.requestProjects"
+}
+
+// Add a repository as a project via the host folder picker
+export interface AddProjectMessage {
+  type: "agentManager.addProject"
+}
+
+// Remove a project from the catalog (never deletes repository data)
+export interface RemoveProjectMessage {
+  type: "agentManager.removeProject"
+  projectId: string
+}
+
+// Make a project the active context
+export interface SelectProjectMessage {
+  type: "agentManager.selectProject"
+  projectId: string
+}
+
+export type AgentManagerSidebarTarget =
+  | { projectId: string; kind: "local" }
+  | { projectId: string; kind: "worktree"; worktreeId: string }
+  | { projectId: string; kind: "session"; sessionId: string }
+
+export interface ActivateSelectionMessage {
+  type: "agentManager.activateSelection"
+  target: AgentManagerSidebarTarget
+  /** Resolve the project's persisted target instead of using `target` verbatim. */
+  restore?: boolean
+}
+
+// Persist the current selection for seamless restore after switching back
+export interface RememberTargetMessage {
+  type: "agentManager.rememberTarget"
+  projectId: string
+  target: AgentManagerSidebarTarget
+}
+
+// Expand or collapse a project accordion without changing the active project
+export interface SetProjectExpandedMessage {
+  type: "agentManager.setProjectExpanded"
+  projectId: string
+  expanded: boolean
+}
+
+// Grant a project permission to run project-controlled scripts and load state
+export interface TrustProjectMessage {
+  type: "agentManager.trustProject"
+  projectId: string
+}
+
 // Configure worktree setup script
 export interface ConfigureSetupScriptRequest {
   type: "agentManager.configureSetupScript"
+  projectId?: string
 }
 
 export interface ConfigureRunScriptRequest {
   type: "agentManager.configureRunScript"
+  projectId?: string
 }
 
 export interface RunScriptRequest {
   type: "agentManager.runScript"
+  projectId?: string
   worktreeId: string
+  destination: TerminalDestination
 }
 
 export interface StopRunScriptRequest {
@@ -695,9 +768,16 @@ export interface ShowLocalTerminalRequest {
   type: "agentManager.showLocalTerminal"
 }
 
+// Show a terminal rooted at a worktree directory (worktree has no session)
+export interface ShowWorktreeTerminalRequest {
+  type: "agentManager.showWorktreeTerminal"
+  worktreeId: string
+}
+
 // Open a worktree directory in VS Code
 export interface OpenWorktreeRequest {
   type: "agentManager.openWorktree"
+  projectId?: string
   worktreeId: string
 }
 
@@ -728,6 +808,17 @@ export interface AgentManagerTerminalCloseRequest {
   terminalId: string
 }
 
+// Deliberately stop a running script terminal (kills its process tree)
+export interface AgentManagerTerminalStopRequest {
+  type: "agentManager.terminal.stop"
+  terminalId: string
+}
+
+export interface AgentManagerTerminalDestinationSelectedRequest {
+  type: "agentManager.terminal.destinationSelected"
+  destination: TerminalDestination
+}
+
 // Notify the extension of an xterm resize so it can update the backend PTY dimensions
 export interface AgentManagerTerminalResizeRequest {
   type: "agentManager.terminal.resize"
@@ -748,6 +839,7 @@ export interface AgentManagerOpenFileRequest {
 // Create multiple worktree sessions for the same prompt (multi-version mode)
 export interface CreateMultiVersionRequest {
   type: "agentManager.createMultiVersion"
+  projectId?: string
   text?: string
   name?: string
   versions: number
@@ -783,6 +875,7 @@ export interface SetWorktreeOrderRequest {
 // Persist sessions collapsed state
 export interface SetSessionsCollapsedRequest {
   type: "agentManager.setSessionsCollapsed"
+  projectId?: string
   collapsed: boolean
 }
 
@@ -806,15 +899,18 @@ export interface SetReviewMarkdownRenderRequest {
 
 export interface RequestBranchesMessage {
   type: "agentManager.requestBranches"
+  projectId?: string
 }
 
 export interface ImportFromBranchRequest {
   type: "agentManager.importFromBranch"
+  projectId?: string
   branch: string
 }
 
 export interface ImportFromPRRequest {
   type: "agentManager.importFromPR"
+  projectId?: string
   url: string
 }
 
@@ -822,18 +918,21 @@ export interface ImportFromPRRequest {
 export interface RequestWorktreeDiffMessage {
   type: "agentManager.requestWorktreeDiff"
   sessionId: string
+  scope?: string
 }
 
 export interface RequestWorktreeDiffFileMessage {
   type: "agentManager.requestWorktreeDiffFile"
   sessionId: string
   file: string
+  scope?: string
 }
 
 // Agent Manager: Start polling for live diff updates (webview → extension)
 export interface StartDiffWatchMessage {
   type: "agentManager.startDiffWatch"
   sessionId: string
+  scope?: string
 }
 
 // Agent Manager: Stop polling for diff updates (webview → extension)
@@ -841,6 +940,21 @@ export interface StopDiffWatchMessage {
   type: "agentManager.stopDiffWatch"
 }
 
+// Agent Manager: Request branch picker data for a diff context (webview → extension)
+export interface RequestDiffBranchesMessage {
+  type: "agentManager.requestDiffBranches"
+  sessionId: string
+  scope?: string
+}
+
+// Agent Manager: Set or clear the base branch override for a diff context (webview → extension)
+export interface SetDiffBaseBranchMessage {
+  type: "agentManager.setDiffBaseBranch"
+  sessionId: string
+  scope?: string
+  branch?: string
+}
+
 // Agent Manager: PR messages (webview → extension)
 export interface RefreshPRMessage {
   type: "agentManager.refreshPR"
@@ -849,6 +963,7 @@ export interface RefreshPRMessage {
 
 export interface OpenPRMessage {
   type: "agentManager.openPR"
+  projectId?: string
   worktreeId: string
 }
 
@@ -863,6 +978,7 @@ export interface RevertWorktreeFileMessage {
   type: "agentManager.revertWorktreeFile"
   sessionId: string
   file: string
+  scope?: string
 }
 
 // Variant persistence (webview → extension)
@@ -981,6 +1097,7 @@ export interface SaveImageRequest {
 // Set default base branch (webview → extension)
 export interface SetDefaultBaseBranchRequest {
   type: "agentManager.setDefaultBaseBranch"
+  projectId?: string
   branch?: string
 }
 
@@ -1158,6 +1275,7 @@ export interface ContinueInWorktreeRequest {
 // Section CRUD messages (webview → extension)
 export interface CreateSectionRequest {
   type: "agentManager.createSection"
+  projectId?: string
   name: string
   color?: string
   worktreeIds?: string[]
@@ -1165,34 +1283,40 @@ export interface CreateSectionRequest {
 
 export interface RenameSectionRequest {
   type: "agentManager.renameSection"
+  projectId?: string
   sectionId: string
   name: string
 }
 
 export interface DeleteSectionRequest {
   type: "agentManager.deleteSection"
+  projectId?: string
   sectionId: string
 }
 
 export interface SetSectionColorRequest {
   type: "agentManager.setSectionColor"
+  projectId?: string
   sectionId: string
   color: string | null
 }
 
 export interface ToggleSectionCollapsedRequest {
   type: "agentManager.toggleSectionCollapsed"
+  projectId?: string
   sectionId: string
 }
 
 export interface MoveToSectionRequest {
   type: "agentManager.moveToSection"
+  projectId?: string
   worktreeIds: string[]
   sectionId: string | null
 }
 
 export interface MoveSectionRequest {
   type: "agentManager.moveSection"
+  projectId?: string
   sectionId: string
   dir: -1 | 1
 }
@@ -1302,6 +1426,7 @@ export type WebviewMessage =
   | RequestGlobalConfigMessage
   | RequestIndexingStatusMessage
   | RequestIndexingSettingsMessage
+  | SetIndexingConsentMessage
   | RequestChatSettingsMessage
   | RequestKiloEmbeddingModelsMessage
   | UpdateConfigMessage
@@ -1330,12 +1455,21 @@ export type WebviewMessage =
   | TelemetryRequest
   | RequestRepoInfoMessage
   | RequestStateMessage
+  | RequestProjectsMessage
+  | AddProjectMessage
+  | RemoveProjectMessage
+  | SelectProjectMessage
+  | ActivateSelectionMessage
+  | RememberTargetMessage
+  | SetProjectExpandedMessage
+  | TrustProjectMessage
   | ConfigureSetupScriptRequest
   | ConfigureRunScriptRequest
   | RunScriptRequest
   | StopRunScriptRequest
   | ShowTerminalRequest
   | ShowLocalTerminalRequest
+  | ShowWorktreeTerminalRequest
   | OpenWorktreeRequest
   | CopyToClipboardRequest
   | ShowExistingLocalTerminalRequest
@@ -1358,6 +1492,8 @@ export type WebviewMessage =
   | RequestWorktreeDiffFileMessage
   | StartDiffWatchMessage
   | StopDiffWatchMessage
+  | RequestDiffBranchesMessage
+  | SetDiffBaseBranchMessage
   | RefreshPRMessage
   | OpenPRMessage
   // legacy-migration start
@@ -1434,6 +1570,8 @@ export type WebviewMessage =
   | OpenContentRequest
   | AgentManagerTerminalCreateRequest
   | AgentManagerTerminalCloseRequest
+  | AgentManagerTerminalStopRequest
+  | AgentManagerTerminalDestinationSelectedRequest
   | AgentManagerTerminalResizeRequest
   | RequestImageModelsMessage
 
diff --git a/packages/kilo-vscode/webview-ui/src/utils/config-scope.ts b/packages/kilo-vscode/webview-ui/src/utils/config-scope.ts
index d55092b85a..f6fd5a7386 100644
--- a/packages/kilo-vscode/webview-ui/src/utils/config-scope.ts
+++ b/packages/kilo-vscode/webview-ui/src/utils/config-scope.ts
@@ -4,32 +4,10 @@ import type { Config } from "../types/messages"
 // global one. Settings that are inherently per-repository (e.g. commit message
 // conventions) belong here so they don't leak across workspaces.
 const PROJECT_SCOPED_KEYS: ReadonlySet<string> = new Set(["commit_message"])
-const PROJECT_INDEXING_KEYS: ReadonlySet<string> = new Set(["enabled"])
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
-function splitIndexing(value: unknown) {
-  if (!isRecord(value)) return { global: value, project: undefined }
-  const global = Object.fromEntries(Object.entries(value).filter(([key]) => !PROJECT_INDEXING_KEYS.has(key)))
-  const project = Object.fromEntries(Object.entries(value).filter(([key]) => PROJECT_INDEXING_KEYS.has(key)))
-  return {
-    global: Object.keys(global).length > 0 ? global : undefined,
-    project: Object.keys(project).length > 0 ? project : undefined,
-  }
-}
-
 export function splitConfigByScope(draft: Partial<Config>) {
   const global: Record<string, unknown> = {}
   const project: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(draft)) {
-    if (key === "indexing") {
-      const scoped = splitIndexing(value)
-      if (scoped.global !== undefined) global[key] = scoped.global
-      if (scoped.project !== undefined) project[key] = scoped.project
-      continue
-    }
     if (PROJECT_SCOPED_KEYS.has(key)) project[key] = value
     else global[key] = value
   }
diff --git a/packages/kilo-vscode/webview-ui/src/utils/tab-widths.ts b/packages/kilo-vscode/webview-ui/src/utils/tab-widths.ts
index 9508905558..0728b4ee34 100644
--- a/packages/kilo-vscode/webview-ui/src/utils/tab-widths.ts
+++ b/packages/kilo-vscode/webview-ui/src/utils/tab-widths.ts
@@ -1,5 +1,11 @@
-export function setTabWidths(frozen: boolean, root: ParentNode = document) {
-  const list = root.querySelector(".am-tab-list")
+/**
+ * Pin tab widths while a strip mutates, so closing a tab does not reflow
+ * the remaining ones out from under the cursor. `selector` picks the
+ * strip: the agent-manager tab bar by default, or the side terminal
+ * strip, which mirrors the same chrome.
+ */
+export function setTabWidths(frozen: boolean, root: ParentNode = document, selector = ".am-tab-list") {
+  const list = root.querySelector(selector)
   if (!(list instanceof HTMLElement)) return
   list.toggleAttribute("data-tab-widths-frozen", frozen)
 
diff --git a/packages/kilo-web-ui/package.json b/packages/kilo-web-ui/package.json
index 94abbda32a..a831a4ea50 100644
--- a/packages/kilo-web-ui/package.json
+++ b/packages/kilo-web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-web-ui",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/llm/package.json b/packages/llm/package.json
index 892d40dce2..fe0a6c4e55 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "name": "@opencode-ai/llm",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/CHANGELOG.md b/packages/opencode/CHANGELOG.md
index 707c839036..13eef058d4 100644
--- a/packages/opencode/CHANGELOG.md
+++ b/packages/opencode/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @kilocode/cli
 
+## 7.4.17
+
+### Patch Changes
+
+- [#12544](https://github.com/Kilo-Org/kilocode/pull/12544) [`b8d83fb`](https://github.com/Kilo-Org/kilocode/commit/b8d83fb537040afd6632a6d893acc412395832e4) - Support adaptive thinking levels for Claude Opus and Sonnet 5 and later.
+
+- [#12587](https://github.com/Kilo-Org/kilocode/pull/12587) [`16f8e7e`](https://github.com/Kilo-Org/kilocode/commit/16f8e7ef7fbd47755395539e7df54af3baae0c63) - Keep conversations and workspace files unchanged when a checkpoint cannot be fully restored.
+
+- [#12444](https://github.com/Kilo-Org/kilocode/pull/12444) [`92076e7`](https://github.com/Kilo-Org/kilocode/commit/92076e7071084b4bf2ce87d90eb6d45a502c836c) Thanks [@IamCoder18](https://github.com/IamCoder18)! - Add a `/auto-approve` slash command in the TUI for toggling auto-approve mode, with aliases `/autoapprove`, `/approve-all`, and `/approveall`. The command dispatches the existing palette entry, so behavior matches the Ctrl+P "Enable/Disable auto-approve mode" toggle.
+
+- [#11986](https://github.com/Kilo-Org/kilocode/pull/11986) [`0abe474`](https://github.com/Kilo-Org/kilocode/commit/0abe474b6d5c5d482ce950abfd9033bf0c5af3b4) Thanks [@IamCoder18](https://github.com/IamCoder18)! - Let the Context section in the TUI session sidebar collapse and expand on header click, matching the existing collapsible pattern used by Token Usage, Models, and Terminal Bench 2.0. When collapsed, the header shows a one-line summary of percent used and total cost.
+
+- [#12601](https://github.com/Kilo-Org/kilocode/pull/12601) [`dab2e79`](https://github.com/Kilo-Org/kilocode/commit/dab2e79d6ecc24acfd8737a10dfdf8ef02765b30) - Exclude GPT-5.6 from models available through ChatGPT subscriptions while retaining access to variants such as GPT-5.6 Sol.
+
+- [#12592](https://github.com/Kilo-Org/kilocode/pull/12592) [`8c88048`](https://github.com/Kilo-Org/kilocode/commit/8c880487818728f41ffc3087d27d6ce6b4591b53) Thanks [@noobezlol](https://github.com/noobezlol)! - Keep Nix builds on the Bun version required by the repository.
+
+- [#12545](https://github.com/Kilo-Org/kilocode/pull/12545) [`b2735bf`](https://github.com/Kilo-Org/kilocode/commit/b2735bfbc9df170274a12ec4786106dacb61090f) - Fix session transcripts losing their final messages when the CLI exits — pending uploads are now flushed on shutdown and as soon as a session closes.
+
+- [#12470](https://github.com/Kilo-Org/kilocode/pull/12470) [`c0ebf98`](https://github.com/Kilo-Org/kilocode/commit/c0ebf987789ab6fa070106219ebc8c46cd0105af) Thanks [@IamCoder18](https://github.com/IamCoder18)! - Route the websearch tool's Exa requests through the Kilo proxy when signed into Kilo. The MCP-Exa transport is preserved as a fallback for users who set `EXA_API_KEY` or are not authenticated. A new `KILO_WEBSEARCH_PROVIDER=kilo-exa` env override forces the Kilo proxy path. Results are capped at 10.
+
+- [#12460](https://github.com/Kilo-Org/kilocode/pull/12460) [`51d8031`](https://github.com/Kilo-Org/kilocode/commit/51d8031c9997bd5478bcde715562169f732d04d4) - Changes from opencode v1.17.5 to v1.17.9 upstream:
+  - Core Bugfixes: Improved MCP server compatibility by declaring Kilo's supported client capabilities.
+  - Core Bugfixes: Plugin client requests now reuse the active server instead of assuming the default local port.
+  - Core Bugfixes: ACP shell tool calls now show the command and working directory from the start.
+  - Core Bugfixes: Plugin-provided shell environment variables now apply to PTY sessions.
+  - Core Bugfixes: OpenAI-compatible providers now accept MCP tool schemas that previously failed validation. (@jquense)
+  - Core Bugfixes: Cloudflare AI Gateway now receives the configured API key correctly. (@keefetang)
+  - Core Bugfixes: MCP tools without declared schema properties now work with providers that expect object properties.
+  - Core Bugfixes: Long-running MCP tools now keep their timeout alive when they report progress. (@Nomadcxx)
+  - Core Bugfixes: The MCP OAuth callback server now shuts down once authorization finishes or is cancelled.
+  - Core Bugfixes: MCP tool failures now surface the server's error text instead of a generic failure.
+  - Core Bugfixes: MCP OAuth error pages now escape provider error text correctly.
+  - Core Bugfixes: Honor configured agent step limits by forcing a final text response instead of failing mid-run.
+  - Core Bugfixes: Queue steering prompts before dismissing pending questions so the previous turn cannot resume first.
+  - Core Bugfixes: Prevent local server credentials from leaking into spawned PTY processes.
+  - Core Bugfixes: Fix Devstral model detection when provider IDs use different casing. (@Robin1987China)
+  - Core Bugfixes: Pass configured custom headers to Copilot model requests.
+  - Core Improvements: MCP servers can now receive the current workspace as a client root.
+  - Core Improvements: Session timelines load much faster and avoid flicker or scroll jumps.
+  - Core Improvements: Add `high` and `max` thinking variants for GLM-5.2 across supported providers. (@imranshaiedi-byte)
+  - Core Improvements: Stop wrapping follow-up user messages in a steering reminder so prompt caching stays effective.
+  - TUI Bugfixes: MCP debug now uses the SDK's latest protocol version.
+  - TUI Bugfixes: Only show the background subagent shortcut when the server supports it.
+  - UI Bugfixes: Render completed Mermaid blocks from diagram source instead of fenced Markdown.
+
+- [#12585](https://github.com/Kilo-Org/kilocode/pull/12585) [`a0a760e`](https://github.com/Kilo-Org/kilocode/commit/a0a760e00e915a800125f03db7e08381ddc63e2a) - Fix bash permission rules being bypassed on PowerShell for commands containing a bare `--` such as `git checkout -- <file>`. Commands the shell parser cannot parse now get checked against their raw command text instead of executing without a permission check.
+
+- [#12505](https://github.com/Kilo-Org/kilocode/pull/12505) [`bcf8b8b`](https://github.com/Kilo-Org/kilocode/commit/bcf8b8b9a852969ee842783e33a7fe32f9b3c3b8) - Emit each agent event once from `kilo run --format json`.
+
+- [#12593](https://github.com/Kilo-Org/kilocode/pull/12593) [`160b066`](https://github.com/Kilo-Org/kilocode/commit/160b06661acc5f04b21221ab6578c468325f64c5) - Prevent the VS Code backend from eagerly starting native file watchers for every Agent Manager worktree.
+
+- [#12583](https://github.com/Kilo-Org/kilocode/pull/12583) [`1310c12`](https://github.com/Kilo-Org/kilocode/commit/1310c1200ab613b316f27fe4fd59e23e262df02f) Thanks [@noobezlol](https://github.com/noobezlol)! - Keep Windows snapshot diffs parseable and preserve valid files when a stored patch is malformed.
+
+- [#12588](https://github.com/Kilo-Org/kilocode/pull/12588) [`deddf00`](https://github.com/Kilo-Org/kilocode/commit/deddf0012fe36c5bb8072f4378abd444fbd134fe) - Bound the wait for a provider's first response byte by the request timeout. A provider that accepts a request and returns headers but never sends body data now fails and retries instead of leaving the turn hanging after a tool call completes. The same `timeout` value now covers both the connection phase and the wait for the first byte as a single deadline; streaming responses that have already produced data are unaffected.
+
+- [#12514](https://github.com/Kilo-Org/kilocode/pull/12514) [`a33493e`](https://github.com/Kilo-Org/kilocode/commit/a33493e7222857a5c9f5e2c09a17312781567b3f) - Stabilize cross-platform CLI subprocess tests under constrained CI runners
+
+- [#12639](https://github.com/Kilo-Org/kilocode/pull/12639) [`8a47d8b`](https://github.com/Kilo-Org/kilocode/commit/8a47d8b78885fa8fd14c73b3aecdb57e1fc96c9c) - Stop flashing a "Turn interrupted" warning when a follow-up message is queued while the assistant is still working. The running turn now closes with a dedicated "superseded" reason instead of "interrupted" when it hands off to the queued prompt, so the premature-stop warning only appears for real interruptions.
+
 ## 7.4.16
 
 ### Minor Changes
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index ba63712656..c49f699905 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "name": "@kilocode/cli",
   "type": "module",
   "license": "MIT",
@@ -73,20 +73,20 @@
     "@ai-sdk/alibaba": "1.0.17",
     "@ai-sdk/amazon-bedrock": "4.0.112",
     "@ai-sdk/anthropic": "3.0.82",
-    "@ai-sdk/azure": "3.0.49",
+    "@ai-sdk/azure": "3.0.93",
     "@ai-sdk/cerebras": "2.0.54",
     "@ai-sdk/cohere": "3.0.27",
     "@ai-sdk/deepinfra": "2.0.41",
-    "@ai-sdk/gateway": "3.0.104",
+    "@ai-sdk/gateway": "3.0.157",
     "@ai-sdk/google": "3.0.73",
     "@ai-sdk/google-vertex": "4.0.128",
     "@ai-sdk/groq": "3.0.31",
     "@ai-sdk/mistral": "3.0.27",
-    "@ai-sdk/openai": "3.0.53",
+    "@ai-sdk/openai": "3.0.88",
     "@ai-sdk/openai-compatible": "2.0.48",
     "@ai-sdk/perplexity": "3.0.26",
-    "@ai-sdk/provider": "3.0.8",
-    "@ai-sdk/provider-utils": "4.0.23",
+    "@ai-sdk/provider": "3.0.14",
+    "@ai-sdk/provider-utils": "4.0.40",
     "@ai-sdk/togetherai": "2.0.41",
     "@ai-sdk/vercel": "2.0.39",
     "@ai-sdk/xai": "3.0.102",
diff --git a/packages/opencode/script/kilocode/npm-publish.ts b/packages/opencode/script/kilocode/npm-publish.ts
index 2744ff675e..8f07ed2e75 100644
--- a/packages/opencode/script/kilocode/npm-publish.ts
+++ b/packages/opencode/script/kilocode/npm-publish.ts
@@ -3,6 +3,10 @@ export namespace NpmPublish {
   const base = 10_000
   const jitter = 5_000
 
+  export function aliases(channel: string) {
+    return channel === "latest" ? ["rc"] : []
+  }
+
   export async function retry(input: {
     name: string
     version: string
diff --git a/packages/opencode/script/publish.ts b/packages/opencode/script/publish.ts
index bd94c7c0e3..cfc99cacab 100755
--- a/packages/opencode/script/publish.ts
+++ b/packages/opencode/script/publish.ts
@@ -16,18 +16,21 @@ async function publish(dir: string, name: string, version: string) {
   // GitHub artifact downloads can drop the executable bit, and Docker uses the
   // unpacked dist binaries directly rather than the published tarball.
   if (process.platform !== "win32") await $`chmod -R 755 .`.cwd(dir)
-  if (await published(name, version)) {
-    console.log(`already published ${name}@${version}`)
-    return
-  }
-  await $`bun pm pack`.cwd(dir)
   // kilocode_change start
-  await NpmPublish.retry({
-    name,
-    version,
-    run: () => $`npm publish *.tgz --access public --tag ${Script.channel} --provenance`.cwd(dir),
-    exists: () => published(name, version),
-  })
+  const exists = await published(name, version)
+  if (exists) {
+    console.log(`already published ${name}@${version}`)
+  }
+  if (!exists) {
+    await $`bun pm pack`.cwd(dir)
+    await NpmPublish.retry({
+      name,
+      version,
+      run: () => $`npm publish *.tgz --access public --tag ${Script.channel} --provenance`.cwd(dir),
+      exists: () => published(name, version),
+    })
+  }
+  for (const tag of NpmPublish.aliases(Script.channel)) await $`npm dist-tag add ${name}@${version} ${tag}`
   // kilocode_change end
 }
 
diff --git a/packages/opencode/src/acp/permission.ts b/packages/opencode/src/acp/permission.ts
index ba07fdf4af..b7630143c1 100644
--- a/packages/opencode/src/acp/permission.ts
+++ b/packages/opencode/src/acp/permission.ts
@@ -5,6 +5,7 @@ import { exists, readText } from "@/util/filesystem"
 import type { ACPSession } from "./session"
 import { toLocations, toToolKind, type ToolInput } from "./tool"
 import { Effect } from "effect"
+import { SkillShellPrompt } from "@/kilocode/acp/permission" // kilocode_change
 
 type PermissionEvent = Extract<Event, { type: "permission.asked" }>
 type Reply = "once" | "always" | "reject"
@@ -51,18 +52,19 @@ export class Handler {
       return
     }
 
+    const skillShell = SkillShellPrompt.is(permission.metadata) // kilocode_change - skill batches list commands and never persist
     const result = await this.input.connection
       .requestPermission({
         sessionId: permission.sessionID,
         toolCall: {
           toolCallId: permission.tool?.callID ?? permission.id,
           status: "pending",
-          title: permission.permission,
-          rawInput: permission.metadata,
+          title: skillShell ? SkillShellPrompt.title : permission.permission, // kilocode_change
+          rawInput: permission.metadata, // kilocode_change - metadata.commands carries the verbatim command list
           kind: toToolKind(permission.permission),
           locations: toLocations(permission.permission, permission.metadata),
         },
-        options: permissionOptions,
+        options: skillShell ? SkillShellPrompt.options : permissionOptions, // kilocode_change
       })
       .catch(async () => {
         await this.reply(permission.id, "reject", session.cwd)
@@ -81,14 +83,15 @@ export class Handler {
       await this.writeProposedEdit(session.id, permission.metadata).catch(() => {})
     }
 
-    await this.reply(permission.id, reply, session.cwd)
+    await this.reply(permission.id, reply, session.cwd, true) // kilocode_change - human selected via requestPermission
   }
 
-  private async reply(requestID: string, reply: Reply, directory: string) {
+  private async reply(requestID: string, reply: Reply, directory: string, interactive = false) { // kilocode_change - interactive param
     await this.input.sdk.permission.reply({
       requestID,
       reply,
       directory,
+      interactive, // kilocode_change
     })
   }
 
diff --git a/packages/opencode/src/cli/cmd/attach.ts b/packages/opencode/src/cli/cmd/attach.ts
index 2ad53976a8..3c1810be7c 100644
--- a/packages/opencode/src/cli/cmd/attach.ts
+++ b/packages/opencode/src/cli/cmd/attach.ts
@@ -1,10 +1,12 @@
 import { cmd } from "./cmd"
 import { UI } from "@/cli/ui"
-import { createKiloClient } from "@kilocode/sdk/v2" // kilocode_change
-import { importCloudSession, validateCloudFork } from "@/kilocode/cloud-session" // kilocode_change
 import { errorMessage } from "@opencode-ai/tui/util/error"
 import { validateSession } from "../tui/validate-session"
 import { ServerAuth } from "@/server/auth"
+// kilocode_change start - Kilo implementations (sdk client, cloud-session) are
+// dynamically imported inside the handler so other CLI commands don't pay their
+// module cost at startup.
+// kilocode_change end
 
 export const AttachCommand = cmd({
   command: "attach <url>",
@@ -57,6 +59,7 @@ export const AttachCommand = cmd({
     }
 
     // kilocode_change start
+    const { importCloudSession, validateCloudFork } = await import("@/kilocode/cloud-session")
     const cloudForkError = validateCloudFork(args)
     if (cloudForkError) {
       UI.error(cloudForkError)
@@ -79,6 +82,7 @@ export const AttachCommand = cmd({
     // kilocode_change start - import cloud session before TUI renders
     if (args.cloudFork && args.session) {
       UI.println("Importing session from cloud...")
+      const { createKiloClient } = await import("@kilocode/sdk/v2")
       const sdk = createKiloClient({
         baseUrl: args.url,
         directory,
diff --git a/packages/opencode/src/cli/cmd/config.ts b/packages/opencode/src/cli/cmd/config.ts
index 5ff58ff2ef..3cade4a388 100644
--- a/packages/opencode/src/cli/cmd/config.ts
+++ b/packages/opencode/src/cli/cmd/config.ts
@@ -1,11 +1,11 @@
 // kilocode_change - new file
 import { EOL } from "os"
-import { Config } from "../../config/config"
-import { AppRuntime } from "../../effect/app-runtime"
-import { bootstrap } from "../bootstrap"
 import { cmd } from "./cmd"
 import { UI } from "../ui"
 
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so implementation dependencies are imported inside the handler (same
+// deferral pattern as upstream opencode#30453).
 export const ConfigCommand = cmd({
   command: "config",
   describe: "configuration tools",
@@ -15,6 +15,9 @@ export const ConfigCommand = cmd({
         command: "check",
         describe: "check configuration for warnings and errors",
         async handler() {
+          const { bootstrap } = await import("../bootstrap")
+          const { AppRuntime } = await import("../../effect/app-runtime")
+          const { Config } = await import("../../config/config")
           await bootstrap(process.cwd(), async () => {
             const list = await AppRuntime.runPromise(Config.Service.use((svc) => svc.warnings()))
             if (list.length === 0) {
diff --git a/packages/opencode/src/cli/cmd/mcp.ts b/packages/opencode/src/cli/cmd/mcp.ts
index fb3fb492f7..02d1fea587 100644
--- a/packages/opencode/src/cli/cmd/mcp.ts
+++ b/packages/opencode/src/cli/cmd/mcp.ts
@@ -18,7 +18,7 @@ import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import path from "path"
 import { Global } from "@opencode-ai/core/global"
 import { modify, applyEdits } from "jsonc-parser"
-import { KilocodeMcpConfig } from "@/kilocode/cli/cmd/mcp" // kilocode_change
+// kilocode_change - KilocodeMcpConfig is dynamically imported in addMcpToConfig to keep startup fast
 import { Filesystem } from "@/util/filesystem"
 import { EventV2Bridge } from "@/event-v2-bridge"
 import { EventV2 } from "@opencode-ai/core/event"
@@ -447,7 +447,10 @@ async function addMcpToConfig(name: string, mcpConfig: ConfigMCPV1.Info, configP
   const edits = modify(text, ["mcp", name], mcpConfig, {
     formattingOptions: { tabSize: 2, insertSpaces: true },
   })
-  const result = KilocodeMcpConfig.format(configPath, applyEdits(text, edits)) // kilocode_change
+  // kilocode_change start - lazy import keeps the CLI startup graph light
+  const { KilocodeMcpConfig } = await import("@/kilocode/cli/cmd/mcp")
+  const result = KilocodeMcpConfig.format(configPath, applyEdits(text, edits))
+  // kilocode_change end
 
   await Filesystem.write(configPath, result)
 
diff --git a/packages/opencode/src/cli/cmd/providers.ts b/packages/opencode/src/cli/cmd/providers.ts
index 6575ac9be7..e8b2c4bae4 100644
--- a/packages/opencode/src/cli/cmd/providers.ts
+++ b/packages/opencode/src/cli/cmd/providers.ts
@@ -17,7 +17,7 @@ import { Process } from "@/util/process"
 import { errorMessage } from "@/util/error"
 import { text } from "node:stream/consumers"
 import { Effect, Option } from "effect"
-import { remove as removeAuth } from "@/kilocode/auth/remove" // kilocode_change
+// kilocode_change - @/kilocode/auth/remove is dynamically imported in the logout handler to keep startup fast
 
 type PluginAuth = NonNullable<Hooks["auth"]>
 
@@ -538,7 +538,10 @@ export const ProvidersLogoutCommand = effectCmd({
           }),
         )
     if (!provider) return yield* fail(`Unknown configured provider "${args.provider}"`)
-    yield* removeAuth(provider) // kilocode_change
+    // kilocode_change start - lazy import keeps the CLI startup graph light
+    const { remove: removeAuth } = yield* Effect.promise(() => import("@/kilocode/auth/remove"))
+    yield* removeAuth(provider)
+    // kilocode_change end
     yield* Prompt.outro("Logout successful")
   }),
 })
diff --git a/packages/opencode/src/cli/cmd/remote.ts b/packages/opencode/src/cli/cmd/remote.ts
index 1cc7ed520b..5198a00e4f 100644
--- a/packages/opencode/src/cli/cmd/remote.ts
+++ b/packages/opencode/src/cli/cmd/remote.ts
@@ -1,20 +1,23 @@
 // kilocode_change - new file
 import { cmd } from "./cmd"
-import { bootstrap } from "../bootstrap"
-import { KiloSessions } from "@/kilo-sessions/kilo-sessions"
 import { buildInstanceAdvertisement } from "@/kilo-sessions/instance-advertisement"
-import { context } from "@/project/instance-context"
-import { InstanceRuntime } from "@/project/instance-runtime"
-import { Instance } from "@/kilocode/instance"
 
 // Re-export so existing unit tests that import from this module keep working.
 export { buildInstanceAdvertisement }
 
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so implementation dependencies are imported inside the handler (same
+// deferral pattern as upstream opencode#30453).
 export const RemoteCommand = cmd({
   command: "remote",
   describe: "enable remote connection for real-time session relay",
   builder: (yargs) => yargs,
   handler: async () => {
+    const { bootstrap } = await import("../bootstrap")
+    const { KiloSessions } = await import("@/kilo-sessions/kilo-sessions")
+    const { context } = await import("@/project/instance-context")
+    const { InstanceRuntime } = await import("@/project/instance-runtime")
+    const { Instance } = await import("@/kilocode/instance")
     await bootstrap(process.cwd(), async () => {
       // kilocode_change - K1 W1: advertise this instance on the relay
       // heartbeat so the cloud side can show it as a spawn-capable instance.
diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index 56241ace1a..580cbc93ea 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -20,18 +20,15 @@ import { pathToFileURL } from "url"
 import { Effect } from "effect"
 import { UI } from "../ui"
 import { effectCmd } from "../effect-cmd"
-import { buildRunMessage } from "@/kilocode/cli/cmd/run-message" // kilocode_change
 import { EOL } from "os"
 import { Filesystem } from "@/util/filesystem"
-import { createKiloClient, type KiloClient, type Session, type ToolPart } from "@kilocode/sdk/v2"
-import { Agent } from "@/agent/agent"
-import { RuntimeFlags } from "@/effect/runtime-flags"
+import type { KiloClient, Session, ToolPart } from "@kilocode/sdk/v2"
 import { FormatError, FormatUnknownError } from "../error"
 import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "./run/runtime.stdin"
-import { importCloudSession, validateCloudFork } from "@/kilocode/cloud-session" // kilocode_change
-import { KiloRunAuto } from "@/kilocode/cli/run-auto" // kilocode_change
-import { KiloHeadless } from "@/kilocode/permission/headless" // kilocode_change
-import { KiloRun, KiloRunDaemon } from "@/kilocode/cli/cmd/run" // kilocode_change
+// kilocode_change start - Kilo implementations (createKiloClient, run-message,
+// cloud-session, run-auto, headless, KiloRun) are dynamically imported inside the
+// handler so other CLI commands don't pay their module cost at startup.
+// kilocode_change end
 
 type ModelInput = Parameters<KiloClient["session"]["prompt"]>[0]["model"]
 
@@ -266,6 +263,14 @@ export const RunCommand = effectCmd({
     const { RuntimeFlags } = yield* Effect.promise(() => import("@/effect/runtime-flags"))
     const { InstanceRef } = yield* Effect.promise(() => import("@/effect/instance-ref"))
     const { ServerAuth } = yield* Effect.promise(() => import("@/server/auth"))
+    // kilocode_change start - lazy Kilo implementations (see top-of-file note)
+    const { createKiloClient } = yield* Effect.promise(() => import("@kilocode/sdk/v2"))
+    const { buildRunMessage } = yield* Effect.promise(() => import("@/kilocode/cli/cmd/run-message"))
+    const { importCloudSession, validateCloudFork } = yield* Effect.promise(() => import("@/kilocode/cloud-session"))
+    const { KiloRunAuto } = yield* Effect.promise(() => import("@/kilocode/cli/run-auto"))
+    const { KiloHeadless } = yield* Effect.promise(() => import("@/kilocode/permission/headless"))
+    const { KiloRun, KiloRunDaemon } = yield* Effect.promise(() => import("@/kilocode/cli/cmd/run"))
+    // kilocode_change end
     const agentSvc = yield* Agent.Service
     const flags = yield* RuntimeFlags.Service
     const localInstance = yield* InstanceRef
@@ -726,6 +731,7 @@ export const RunCommand = effectCmd({
           const MAX_RETRIES = 3 // kilocode_change
           let retries = 0 // kilocode_change
           let error: string | undefined
+          let autoRejected = false // kilocode_change - plain headless auto-reject must fail the run
 
           // kilocode_change start - revert to upstream: consume native events without normalizing sync copies
           for await (const event of events.stream) {
@@ -816,8 +822,10 @@ export const RunCommand = effectCmd({
                 err = String(props.error.data.message)
               }
               error = error ? error + EOL + err : err
-              if (emit("error", { error: props.error })) continue
+              // kilocode_change start - stderr first so --format json still surfaces the diagnostic
               UI.error(err)
+              emit("error", { error: props.error })
+              // kilocode_change end
             }
 
             // kilocode_change start - reset retry budget only after resumed work becomes busy
@@ -840,6 +848,13 @@ export const RunCommand = effectCmd({
 
             if (event.type === "permission.asked") {
               const permission = event.properties
+              // kilocode_change start - skill shell batches need an interactive human decision. The server ignores
+              // non-interactive approvals, so headless runs must reject explicitly rather than leave them pending.
+              if (permission.metadata?.["skillShell"] === true) {
+                await client.permission.reply({ requestID: permission.id, reply: "reject" })
+                continue
+              }
+              // kilocode_change end
               // kilocode_change start - approve root and tracked Task child permissions in auto mode
               if (args.auto) {
                 if (!KiloRunAuto.allowed(auto, permission.sessionID)) continue
@@ -868,6 +883,7 @@ export const RunCommand = effectCmd({
                   UI.Style.TEXT_NORMAL +
                     `subagent permission requested: ${permission.permission} (${permission.patterns.join(", ")}); auto-rejecting`,
                 )
+                autoRejected = true // kilocode_change
                 await client.permission.reply({
                   requestID: permission.id,
                   reply: "reject",
@@ -889,6 +905,7 @@ export const RunCommand = effectCmd({
                   UI.Style.TEXT_NORMAL +
                     `permission requested: ${permission.permission} (${permission.patterns.join(", ")}); auto-rejecting`,
                 )
+                autoRejected = true // kilocode_change
                 await client.permission.reply({
                   requestID: permission.id,
                   reply: "reject",
@@ -915,6 +932,14 @@ export const RunCommand = effectCmd({
             }
             // kilocode_change end
           }
+          // kilocode_change start - idle must not clear an auto-rejected headless run
+          if (autoRejected) {
+            const msg = "run ended with an auto-rejected permission; pass --auto for autonomous use"
+            error = error ? error + EOL + msg : msg
+            UI.error(msg)
+            emit("error", { error: msg })
+          }
+          // kilocode_change end
           return error
         }
         const cwd = args.attach ? (directory ?? sess.directory ?? (await current(sdk))) : (directory ?? root)
diff --git a/packages/opencode/src/cli/cmd/run/footer.permission.tsx b/packages/opencode/src/cli/cmd/run/footer.permission.tsx
index 0eb412a03b..ab3ea3cc4f 100644
--- a/packages/opencode/src/cli/cmd/run/footer.permission.tsx
+++ b/packages/opencode/src/cli/cmd/run/footer.permission.tsx
@@ -141,7 +141,8 @@ export function RunPermissionBody(props: {
   const info = createMemo(() => permissionInfo(props.request))
   const ft = createMemo(() => toolFiletype(info().file))
   const narrow = createMemo(() => footerWidthPolicy(dims().width).dialog.narrow)
-  const opts = createMemo(() => permissionOptions(state().stage))
+  const skillShell = createMemo(() => props.request.metadata?.["skillShell"] === true) // kilocode_change
+  const opts = createMemo(() => permissionOptions(state().stage, skillShell())) // kilocode_change - skillShell-aware options
   const busy = createMemo(() => state().submitting)
   const title = createMemo(() => {
     if (state().stage === "always") {
@@ -165,7 +166,7 @@ export function RunPermissionBody(props: {
   })
 
   const shift = (dir: -1 | 1) => {
-    setState((prev) => permissionShift(prev, dir))
+    setState((prev) => permissionShift(prev, dir, skillShell())) // kilocode_change - skillShell-aware options
   }
 
   const submit = async (next: PermissionReply) => {
diff --git a/packages/opencode/src/cli/cmd/run/permission.shared.ts b/packages/opencode/src/cli/cmd/run/permission.shared.ts
index 2db4193696..8b0f33a241 100644
--- a/packages/opencode/src/cli/cmd/run/permission.shared.ts
+++ b/packages/opencode/src/cli/cmd/run/permission.shared.ts
@@ -77,9 +77,11 @@ export function createPermissionBodyState(requestID: string): PermissionBodyStat
   }
 }
 
-export function permissionOptions(stage: PermissionStage): PermissionOption[] {
+export function permissionOptions(stage: PermissionStage, skillShell?: boolean): PermissionOption[] { // kilocode_change - skillShell param
   if (stage === "permission") {
-    return ["once", "always", "reject"]
+    // kilocode_change start - skill-shell batches are never persisted, so no "Allow always"
+    return skillShell ? ["once", "reject"] : ["once", "always", "reject"]
+    // kilocode_change end
   }
 
   if (stage === "always") {
@@ -146,12 +148,13 @@ export function permissionReply(requestID: string, reply: PermissionReply["reply
   return {
     requestID,
     reply,
+    interactive: true, // kilocode_change - footer replies are human-driven; the server refuses non-interactive skill-shell approvals
     ...(message && message.trim() ? { message: message.trim() } : {}),
   }
 }
 
-export function permissionShift(state: PermissionBodyState, dir: -1 | 1): PermissionBodyState {
-  const list = permissionOptions(state.stage)
+export function permissionShift(state: PermissionBodyState, dir: -1 | 1, skillShell?: boolean): PermissionBodyState { // kilocode_change - skillShell param
+  const list = permissionOptions(state.stage, skillShell) // kilocode_change - skillShell-aware options
   if (list.length === 0) {
     return state
   }
diff --git a/packages/opencode/src/cli/cmd/serve.ts b/packages/opencode/src/cli/cmd/serve.ts
index cbb65e4e97..f6200bc2bb 100644
--- a/packages/opencode/src/cli/cmd/serve.ts
+++ b/packages/opencode/src/cli/cmd/serve.ts
@@ -2,9 +2,6 @@ import { Effect } from "effect"
 import { effectCmd } from "../effect-cmd"
 import { withNetworkOptions, resolveNetworkOptions } from "../network"
 import { Flag } from "@opencode-ai/core/flag/flag"
-import { InstanceRuntime } from "../../project/instance-runtime" // kilocode_change
-import { startParentWatchdog } from "../../kilocode/parent-watchdog" // kilocode_change
-import { KiloSessions } from "@/kilo-sessions/kilo-sessions" // kilocode_change
 
 export const ServeCommand = effectCmd({
   command: "serve",
@@ -31,6 +28,9 @@ export const ServeCommand = effectCmd({
 
     // kilocode_change start - graceful signal shutdown
     // yield* Effect.never
+    const { InstanceRuntime } = yield* Effect.promise(() => import("../../project/instance-runtime"))
+    const { startParentWatchdog } = yield* Effect.promise(() => import("../../kilocode/parent-watchdog"))
+    const { KiloSessions } = yield* Effect.promise(() => import("@/kilo-sessions/kilo-sessions"))
     yield* Effect.promise(
       () =>
         new Promise<void>((resolve) => {
diff --git a/packages/opencode/src/cli/cmd/tui.ts b/packages/opencode/src/cli/cmd/tui.ts
index 0bd54ed584..a02a468b47 100644
--- a/packages/opencode/src/cli/cmd/tui.ts
+++ b/packages/opencode/src/cli/cmd/tui.ts
@@ -11,11 +11,8 @@ import { withNetworkOptions, resolveNetworkOptionsNoConfig } from "@/cli/network
 import { Filesystem } from "@/util/filesystem"
 import type { GlobalEvent } from "@kilocode/sdk/v2"
 import type { EventSource } from "@opencode-ai/tui/context/sdk"
-import { importCloudSession, localSessionID, validateCloudFork } from "@/kilocode/cloud-session" // kilocode_change
-import { createKiloClient } from "@kilocode/sdk/v2" // kilocode_change
 import { writeHeapSnapshot } from "v8"
-import { KiloTuiThreadDaemon, type StartInput } from "@/kilocode/cli/cmd/tui/thread" // kilocode_change
-import { preload } from "@/kilocode/cli/cmd/tui" // kilocode_change
+import type { StartInput } from "@/kilocode/cli/cmd/tui/thread" // kilocode_change - runtime imports deferred into handlers
 import { win32InstallCtrlCGuard } from "@opencode-ai/tui/terminal-win32"
 import { validateSession } from "../tui/validate-session"
 // kilocode_change start - correlate the TUI worker with its parent process
@@ -26,7 +23,7 @@ import {
   sanitizedProcessEnv,
 } from "@opencode-ai/core/util/opencode-process"
 // kilocode_change end
-import { createParentRemoteExitBridge, type RemoteExitBridgeClient } from "@/kilocode/cli/cmd/tui/remote-exit-bridge" // kilocode_change
+import type { RemoteExitBridgeClient } from "@/kilocode/cli/cmd/tui/remote-exit-bridge" // kilocode_change - runtime import deferred
 import type { Exit } from "@opencode-ai/tui/context/exit" // kilocode_change
 
 declare global {
@@ -46,6 +43,7 @@ export async function runEmbeddedRemoteExitBridge(input: {
   done: Promise<unknown>
   timeoutMs?: number
 }) {
+  const { createParentRemoteExitBridge } = await import("@/kilocode/cli/cmd/tui/remote-exit-bridge")
   const timeoutMs = input.timeoutMs ?? 5_000
   const bridge = createParentRemoteExitBridge(input.client, input.exit)
   let ready = false
@@ -179,6 +177,12 @@ export const TuiThreadCommand = cmd({
         describe: "agent to use",
       }),
   handler: async (args) => {
+    // kilocode_change start - lazy Kilo implementations so other CLI commands
+    // don't pay their module cost at startup
+    const { importCloudSession, localSessionID, validateCloudFork } = await import("@/kilocode/cloud-session")
+    const { KiloTuiThreadDaemon } = await import("@/kilocode/cli/cmd/tui/thread")
+    const { preload } = await import("@/kilocode/cli/cmd/tui")
+    // kilocode_change end
     const unguard = win32InstallCtrlCGuard()
     const shutdown = {
       pending: undefined as Promise<void> | undefined,
@@ -205,9 +209,8 @@ export const TuiThreadCommand = cmd({
       const next = resolveThreadDirectory(args.project)
       const file = await target()
       // kilocode_change start
-      const preloads = preload(
-        typeof KILO_WORKER_PATH !== "undefined",
-        () => import.meta.resolve("@opentui/solid/preload"),
+      const preloads = preload(typeof KILO_WORKER_PATH !== "undefined", () =>
+        import.meta.resolve("@opentui/solid/preload"),
       )
       // kilocode_change end
       try {
@@ -354,6 +357,7 @@ export const TuiThreadCommand = cmd({
         // kilocode_change start - import cloud session before TUI renders
         if (args.cloudFork && args.session) {
           UI.println("Importing session from cloud...")
+          const { createKiloClient } = await import("@kilocode/sdk/v2")
           const sdk = createKiloClient({
             baseUrl: transport.url,
             fetch: transport.fetch,
diff --git a/packages/opencode/src/cli/cmd/web.ts b/packages/opencode/src/cli/cmd/web.ts
index 9b37ddf09c..36df40c8c9 100644
--- a/packages/opencode/src/cli/cmd/web.ts
+++ b/packages/opencode/src/cli/cmd/web.ts
@@ -3,7 +3,6 @@ import { UI } from "../ui"
 import { effectCmd } from "../effect-cmd"
 import { withNetworkOptions, resolveNetworkOptions } from "../network"
 import { Flag } from "@opencode-ai/core/flag/flag"
-import { InstanceRuntime } from "../../project/instance-runtime" // kilocode_change
 import open from "open"
 
 export const WebCommand = effectCmd({
@@ -33,17 +32,14 @@ export const WebCommand = effectCmd({
     }
 
     if (opts.mdns) {
-      UI.println(
-        UI.Style.TEXT_INFO_BOLD + "  mDNS:    ",
-        UI.Style.TEXT_NORMAL,
-        `${opts.mdnsDomain}:${server.port}`,
-      )
+      UI.println(UI.Style.TEXT_INFO_BOLD + "  mDNS:    ", UI.Style.TEXT_NORMAL, `${opts.mdnsDomain}:${server.port}`)
     }
 
     open(urls.local).catch(() => {})
     // kilocode_change end
 
     // kilocode_change start - graceful signal shutdown
+    const { InstanceRuntime } = yield* Effect.promise(() => import("../../project/instance-runtime"))
     yield* Effect.promise(
       () =>
         new Promise<void>((resolve) => {
diff --git a/packages/opencode/src/command/index.ts b/packages/opencode/src/command/index.ts
index 3160b15f2d..c4cffa639b 100644
--- a/packages/opencode/src/command/index.ts
+++ b/packages/opencode/src/command/index.ts
@@ -33,6 +33,7 @@ export const Info = Schema.Struct({
   agent: Schema.optional(Schema.String),
   model: Schema.optional(Schema.String),
   source: Schema.optional(Schema.Literals(["command", "mcp", "skill"])),
+  trusted: Schema.optional(Schema.Boolean), // kilocode_change - skill-sourced templates only run `!`cmd`` shell when trusted
   // Some command templates are lazy promises from MCP prompt resolution.
   template: Schema.Unknown,
   subtask: Schema.optional(Schema.Boolean),
@@ -67,6 +68,7 @@ function fromSkill(item: Skill.Info): Info {
     name: item.name,
     description: item.description,
     source: "skill",
+    trusted: item.trusted === true,
     get template() {
       return item.content
     },
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 8c396e638a..5d08de3794 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -207,6 +207,13 @@ function globalConfigFile() {
 
 function patchJsonc(input: string, patch: unknown, path: string[] = []): string {
   if (!isRecord(patch)) {
+    // kilocode_change start - jsonc-parser throws when deleting a path whose
+    // parent does not exist in the document; absent keys are already "unset"
+    if (patch === null) {
+      const tree = parseTree(input)
+      if (!tree || !findNodeAtLocation(tree, path)) return input
+    }
+    // kilocode_change end
     const edits = modify(input, path, patch === null ? undefined : patch, {
       // kilocode_change
       formattingOptions: {
@@ -1015,20 +1022,28 @@ export const layer = Layer.effect(
           Effect.gen(function* () {
             const before = (yield* readConfigFile(file)) ?? "{}"
             const patch = writableGlobal(config)
+            // Reads merge every global config file, so delete sentinels must be
+            // removed from all of them, not just the primary write target.
+            const propagated = yield* KilocodeConfig.propagateUnset({
+              fs,
+              files: KilocodeConfig.GLOBAL_CONFIG_FILES.map((name) => path.join(Global.Path.config, name)),
+              exclude: file,
+              patch,
+            })
 
             if (!file.endsWith(".jsonc")) {
               const existing = ConfigParse.schema(ConfigV1.Info, ConfigParse.jsonc(before, file), file)
               const next = KilocodeConfig.mergeConfig(writable(existing), patch)
               const serialized = JSON.stringify(next, null, 2)
-              const changed = serialized !== before
-              if (changed) yield* fs.writeFileString(file, serialized).pipe(Effect.orDie)
+              const changed = serialized !== before || propagated
+              if (serialized !== before) yield* fs.writeFileString(file, serialized).pipe(Effect.orDie)
               return { next, changed }
             }
 
             const updated = patchJsonc(before, patch)
             const next = ConfigParse.schema(ConfigV1.Info, ConfigParse.jsonc(updated, file), file)
-            const changed = updated !== before
-            if (changed) yield* fs.writeFileString(file, updated).pipe(Effect.orDie)
+            const changed = updated !== before || propagated
+            if (updated !== before) yield* fs.writeFileString(file, updated).pipe(Effect.orDie)
             return { next, changed }
           }),
           `config:global:${path.resolve(Global.Path.config)}`,
diff --git a/packages/opencode/src/effect/runtime-flags.ts b/packages/opencode/src/effect/runtime-flags.ts
index 188dc4869a..f1bf3edb26 100644
--- a/packages/opencode/src/effect/runtime-flags.ts
+++ b/packages/opencode/src/effect/runtime-flags.ts
@@ -20,6 +20,7 @@ export class Service extends ConfigService.Service<Service>()("@opencode/Runtime
   disableChannelDb: bool("KILO_DISABLE_CHANNEL_DB"), // kilocode_change
   disableEmbeddedWebUi: bool("KILO_DISABLE_EMBEDDED_WEB_UI"),
   disableExternalSkills: bool("KILO_DISABLE_EXTERNAL_SKILLS"),
+  disableSkillShell: bool("KILO_DISABLE_SKILL_SHELL"), // kilocode_change - disable shell injection in skill bodies
   disableLspDownload: bool("KILO_DISABLE_LSP_DOWNLOAD"),
   skipMigrations: bool("KILO_SKIP_MIGRATIONS"), // kilocode_change
   disableClaudeCodePrompt: Config.all({
diff --git a/packages/opencode/src/kilo-sessions/remote-sender.ts b/packages/opencode/src/kilo-sessions/remote-sender.ts
index 8af252e6dd..42a575cd80 100644
--- a/packages/opencode/src/kilo-sessions/remote-sender.ts
+++ b/packages/opencode/src/kilo-sessions/remote-sender.ts
@@ -38,6 +38,9 @@ const PermissionData = z.object({
   requestID: z.string(),
   reply: z.enum(["once", "always", "reject"]),
   message: z.string().optional(),
+  // Set by a remote human client; threads through to permission.reply so the server
+  // accepts a human approval of a skill-shell batch (non-interactive ones are refused).
+  interactive: z.boolean().optional(),
 })
 
 const SuggestionData = z.object({
diff --git a/packages/opencode/src/kilocode/acp/permission.ts b/packages/opencode/src/kilocode/acp/permission.ts
new file mode 100644
index 0000000000..7271c72ddb
--- /dev/null
+++ b/packages/opencode/src/kilocode/acp/permission.ts
@@ -0,0 +1,16 @@
+import type { PermissionOption } from "@agentclientprotocol/sdk"
+
+// Skill-shell batches list their commands in the prompt and are never persisted, so the ACP
+// prompt offers only Allow / Reject (no "Always allow") and a fixed title.
+const options: PermissionOption[] = [
+  { optionId: "once", kind: "allow_once", name: "Allow" },
+  { optionId: "reject", kind: "reject_once", name: "Reject" },
+]
+
+export const SkillShellPrompt = {
+  is(metadata: unknown) {
+    return (metadata as { skillShell?: unknown })?.skillShell === true
+  },
+  options,
+  title: "Run skill shell commands",
+}
diff --git a/packages/opencode/src/kilocode/background-process/windows-job.ts b/packages/opencode/src/kilocode/background-process/windows-job.ts
deleted file mode 100644
index 85d05b38e6..0000000000
--- a/packages/opencode/src/kilocode/background-process/windows-job.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { dlopen, ptr } from "bun:ffi"
-
-export namespace WindowsJob {
-  const LIMITS = 9
-  const MEMBERS = 3
-  const KILL_ON_CLOSE = 0x00002000
-  const PROCESS_TERMINATE = 0x0001
-  const PROCESS_SET_QUOTA = 0x0100
-  const MORE_DATA = 234
-
-  function kernel() {
-    return dlopen("kernel32.dll", {
-      CreateJobObjectW: { args: ["ptr", "ptr"], returns: "u64" },
-      SetInformationJobObject: { args: ["u64", "u32", "ptr", "u32"], returns: "i32" },
-      OpenProcess: { args: ["u32", "i32", "u32"], returns: "u64" },
-      AssignProcessToJobObject: { args: ["u64", "u64"], returns: "i32" },
-      QueryInformationJobObject: { args: ["u64", "u32", "ptr", "u32", "ptr"], returns: "i32" },
-      TerminateJobObject: { args: ["u64", "u32"], returns: "i32" },
-      CloseHandle: { args: ["u64"], returns: "i32" },
-      GetLastError: { args: [], returns: "u32" },
-    })
-  }
-
-  export function create() {
-    const lib = (() => {
-      try {
-        return kernel()
-      } catch {
-        return undefined
-      }
-    })()
-    if (!lib) return
-    const handle = lib.symbols.CreateJobObjectW(null, null)
-    if (handle === 0n) {
-      const code = lib.symbols.GetLastError()
-      lib.close()
-      throw new Error(`CreateJobObjectW failed with Windows error ${code}`)
-    }
-    const limits = new Uint8Array(144)
-    new DataView(limits.buffer).setUint32(16, KILL_ON_CLOSE, true)
-    if (lib.symbols.SetInformationJobObject(handle, LIMITS, ptr(limits), limits.byteLength) === 0) {
-      const code = lib.symbols.GetLastError()
-      lib.symbols.CloseHandle(handle)
-      lib.close()
-      throw new Error(`SetInformationJobObject failed with Windows error ${code}`)
-    }
-    let closed = false
-    return {
-      assign(pid: number) {
-        const proc = lib.symbols.OpenProcess(PROCESS_TERMINATE | PROCESS_SET_QUOTA, 0, pid)
-        if (proc === 0n) throw new Error(`OpenProcess failed with Windows error ${lib.symbols.GetLastError()}`)
-        const assigned = lib.symbols.AssignProcessToJobObject(handle, proc)
-        const code = assigned === 0 ? lib.symbols.GetLastError() : 0
-        lib.symbols.CloseHandle(proc)
-        if (assigned === 0) throw new Error(`AssignProcessToJobObject failed with Windows error ${code}`)
-      },
-      members() {
-        let size = 4 * 1024
-        while (true) {
-          const info = new Uint8Array(size)
-          const ok = lib.symbols.QueryInformationJobObject(handle, MEMBERS, ptr(info), info.byteLength, null)
-          const code = ok === 0 ? lib.symbols.GetLastError() : 0
-          const view = new DataView(info.buffer)
-          const assigned = view.getUint32(0, true)
-          const count = view.getUint32(4, true)
-          if (ok !== 0 && count === assigned) {
-            return Array.from({ length: count }, (_, index) => Number(view.getBigUint64(8 + index * 8, true)))
-          }
-          if (ok === 0 && code !== MORE_DATA) {
-            throw new Error(`QueryInformationJobObject failed with Windows error ${code}`)
-          }
-          size = Math.max(size * 2, 8 + assigned * 8)
-        }
-      },
-      terminate() {
-        if (lib.symbols.TerminateJobObject(handle, 1) === 0) {
-          throw new Error(`TerminateJobObject failed with Windows error ${lib.symbols.GetLastError()}`)
-        }
-      },
-      close() {
-        if (closed) return
-        closed = true
-        lib.symbols.CloseHandle(handle)
-        lib.close()
-      },
-    }
-  }
-}
diff --git a/packages/opencode/src/kilocode/bootstrap.ts b/packages/opencode/src/kilocode/bootstrap.ts
index 9d6f9f7a6e..0d3602c47c 100644
--- a/packages/opencode/src/kilocode/bootstrap.ts
+++ b/packages/opencode/src/kilocode/bootstrap.ts
@@ -54,6 +54,7 @@ export namespace KilocodeBootstrap {
         yield* bus.subscribeCallback(MemoryEvents.Updated, (evt) =>
           KiloToolRegistry.invalidateMemoryEnabled(evt.properties.directory),
         )
+        // Session export bootstrap.
         yield* Effect.gen(function* () {
           if (!SessionExport.enabled) return
           const anon = yield* EffectBridge.fromPromise(() =>
@@ -78,14 +79,16 @@ export namespace KilocodeBootstrap {
             Effect.sync(() => log.warn("session export bootstrap failed", { err: Cause.squash(cause) })),
           ),
         )
-        yield* EffectBridge.fromPromise(() =>
-          import("@/kilocode/indexing").then((mod) => mod.KiloIndexing.init()),
-        ).pipe(
-          Effect.catchCause((cause) =>
-            Effect.sync(() => log.warn("indexing bootstrap failed", { err: Cause.squash(cause) })),
-          ),
-          Effect.forkDetach,
-        )
+        if (process.env["KILO_PLATFORM"] !== "vscode") {
+          yield* EffectBridge.fromPromise(() =>
+            import("@/kilocode/indexing").then((mod) => mod.KiloIndexing.init()),
+          ).pipe(
+            Effect.catchCause((cause) =>
+              Effect.sync(() => log.warn("indexing bootstrap failed", { err: Cause.squash(cause) })),
+            ),
+            Effect.forkDetach,
+          )
+        }
       })
 
       return Service.of({ init })
diff --git a/packages/opencode/src/kilocode/cli/cmd/cloud.ts b/packages/opencode/src/kilocode/cli/cmd/cloud.ts
index 61b4e75bae..a9b1ad957b 100644
--- a/packages/opencode/src/kilocode/cli/cmd/cloud.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/cloud.ts
@@ -2,7 +2,11 @@ import type { Argv } from "yargs"
 import { Effect } from "effect"
 import { cmd } from "@/cli/cmd/cmd"
 import { effectCmd } from "@/cli/effect-cmd"
-import { CloudCommands } from "@/kilocode/cloud/commands"
+
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so the cloud implementation is imported inside handlers (same deferral
+// pattern as upstream opencode#30453).
+const cloud = Effect.promise(() => import("@/kilocode/cloud/commands").then((m) => m.CloudCommands))
 
 export const CloudStartCommand = effectCmd({
   command: "start",
@@ -44,6 +48,7 @@ export const CloudStartCommand = effectCmd({
         describe: "connect to the WebSocket stream and print events as JSONL",
       }),
   handler: Effect.fn("Cli.cloud.start")(function* (args) {
+    const CloudCommands = yield* cloud
     yield* CloudCommands.start({
       prompt: args.prompt,
       ...(args.repo === undefined ? {} : { repo: args.repo }),
@@ -74,6 +79,7 @@ export const CloudSendCommand = effectCmd({
         describe: "follow-up prompt for the Cloud Agent",
       }),
   handler: Effect.fn("Cli.cloud.send")(function* (args) {
+    const CloudCommands = yield* cloud
     yield* CloudCommands.send({ sessionID: args.sessionId, prompt: args.prompt })
   }),
 })
@@ -95,6 +101,7 @@ export const CloudStatusCommand = effectCmd({
         describe: "Cloud Agent message ID",
       }),
   handler: Effect.fn("Cli.cloud.status")(function* (args) {
+    const CloudCommands = yield* cloud
     yield* CloudCommands.status({ sessionID: args.sessionId, messageID: args.messageId })
   }),
 })
@@ -116,6 +123,7 @@ export const CloudResultCommand = effectCmd({
         describe: "Cloud Agent message ID",
       }),
   handler: Effect.fn("Cli.cloud.result")(function* (args) {
+    const CloudCommands = yield* cloud
     yield* CloudCommands.result({ sessionID: args.sessionId, messageID: args.messageId })
   }),
 })
diff --git a/packages/opencode/src/kilocode/cli/cmd/console.ts b/packages/opencode/src/kilocode/cli/cmd/console.ts
index ae0b9cf1c5..019ea29050 100644
--- a/packages/opencode/src/kilocode/cli/cmd/console.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/console.ts
@@ -1,14 +1,14 @@
-import open from "open"
 import type { Argv } from "yargs"
+import type { Daemon } from "@/kilocode/daemon/daemon"
 import { cmd } from "@/cli/cmd/cmd"
-import { explicitNetworkOptions, withNetworkOptions, resolveNetworkOptions } from "@/cli/network"
+import { explicitNetworkOptions, withNetworkOptions } from "@/cli/network"
 import { serverUrls } from "@/kilocode/cli/server-urls"
-import { AppRuntime } from "@/effect/app-runtime"
-import { Daemon } from "@/kilocode/daemon/daemon"
-import { warnPort } from "@/kilocode/cli/port-warning"
 import { hasDisplay } from "@/kilocode/cli/cmd/tui/util/display"
 import { StopCommand } from "@/kilocode/cli/cmd/daemon"
 
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so implementation dependencies are imported inside handlers (same
+// deferral pattern as upstream opencode#30453).
 function withCredentials(base: string, state: Daemon.State) {
   const url = new URL("/console", base)
   url.username = state.username
@@ -17,6 +17,7 @@ function withCredentials(base: string, state: Daemon.State) {
 }
 
 async function launch(url: string) {
+  const { default: open } = await import("open")
   const child = await open(url)
   await new Promise<void>((resolve, reject) => {
     const timer = setTimeout(resolve, 500)
@@ -46,9 +47,10 @@ const OpenCommand = cmd({
       type: "boolean",
     }),
   handler: async (args) => {
+    const { Daemon } = await import("@/kilocode/daemon/daemon")
+    const { warnedNetworkOptions } = await import("@/kilocode/cli/port-warning")
     const run = async (signal?: AbortSignal) => {
-      const opts = await AppRuntime.runPromise(resolveNetworkOptions(args))
-      warnPort(opts.port)
+      const opts = await warnedNetworkOptions(args)
       const daemon = await Daemon.ensure(opts, explicitNetworkOptions())
       const state = daemon.result.state
       if (!state) throw new Error("Kilo daemon did not provide connection state")
diff --git a/packages/opencode/src/kilocode/cli/cmd/daemon.ts b/packages/opencode/src/kilocode/cli/cmd/daemon.ts
index 42f1165f50..e3a0deb4ec 100644
--- a/packages/opencode/src/kilocode/cli/cmd/daemon.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/daemon.ts
@@ -1,10 +1,12 @@
 import type { Argv } from "yargs"
+import type { Daemon } from "@/kilocode/daemon/daemon"
+import type { resolveNetworkOptions } from "@/cli/network"
 import { cmd } from "@/cli/cmd/cmd"
-import { explicitNetworkOptions, withNetworkOptions, resolveNetworkOptions } from "@/cli/network"
-import { AppRuntime } from "@/effect/app-runtime"
-import { Daemon } from "@/kilocode/daemon/daemon"
-import { warnPort } from "@/kilocode/cli/port-warning"
+import { explicitNetworkOptions, withNetworkOptions } from "@/cli/network"
 
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so implementation dependencies are imported inside handlers (same
+// deferral pattern as upstream opencode#30453).
 function withJson<T>(yargs: Argv<T>) {
   return yargs.option("json", {
     describe: "print daemon details as JSON",
@@ -75,6 +77,7 @@ async function hold(enabled: boolean, json: boolean, run: (signal?: AbortSignal)
     await run()
     return
   }
+  const { Daemon } = await import("@/kilocode/daemon/daemon")
   await Daemon.foreground(async (signal) => {
     const state = await run(signal)
     if (!signal.aborted && !json) console.log("Press Ctrl+C to stop the Kilo daemon.")
@@ -82,6 +85,11 @@ async function hold(enabled: boolean, json: boolean, run: (signal?: AbortSignal)
   })
 }
 
+async function network(args: { [key: string]: unknown }) {
+  const { warnedNetworkOptions } = await import("@/kilocode/cli/port-warning")
+  return warnedNetworkOptions(args as Parameters<typeof resolveNetworkOptions>[0])
+}
+
 function start(command: string) {
   return cmd({
     command,
@@ -89,8 +97,8 @@ function start(command: string) {
     builder: (yargs) => withForeground(withJson(withNetworkOptions(yargs))),
     handler: async (args) => {
       await hold(Boolean(args.foreground), Boolean(args.json), async (signal) => {
-        const opts = await AppRuntime.runPromise(resolveNetworkOptions(args))
-        warnPort(opts.port)
+        const opts = await network(args)
+        const { Daemon } = await import("@/kilocode/daemon/daemon")
         const daemon = await Daemon.ensure(opts, explicitNetworkOptions())
         const result = daemon.result
         const state = result.state
@@ -121,6 +129,7 @@ const StatusCommand = cmd({
   describe: "show local kilo daemon status",
   builder: (yargs) => withJson(yargs),
   handler: async (args) => {
+    const { Daemon } = await import("@/kilocode/daemon/daemon")
     print(await Daemon.status(), Boolean(args.json))
   },
 })
@@ -130,6 +139,7 @@ export const StopCommand = cmd({
   describe: "stop the local kilo daemon",
   builder: (yargs) => withJson(yargs),
   handler: async (args) => {
+    const { Daemon } = await import("@/kilocode/daemon/daemon")
     const result = await Daemon.stop()
     if (args.json) {
       print(result, true)
@@ -145,8 +155,8 @@ const RestartCommand = cmd({
   builder: (yargs) => withForeground(withJson(withNetworkOptions(yargs))),
   handler: async (args) => {
     await hold(Boolean(args.foreground), Boolean(args.json), async (signal) => {
-      const opts = await AppRuntime.runPromise(resolveNetworkOptions(args))
-      warnPort(opts.port)
+      const opts = await network(args)
+      const { Daemon } = await import("@/kilocode/daemon/daemon")
       const result = await Daemon.restart(opts)
       const state = result.state
       if (!state) throw new Error("Kilo daemon did not provide process state")
diff --git a/packages/opencode/src/kilocode/cli/cmd/profile.ts b/packages/opencode/src/kilocode/cli/cmd/profile.ts
index 7119395c2f..924d4fde0f 100644
--- a/packages/opencode/src/kilocode/cli/cmd/profile.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/profile.ts
@@ -1,11 +1,23 @@
 import type { Argv } from "yargs"
+import type { Info as AuthInfo } from "../../../auth"
+import type { KilocodeBalance, KilocodeProfile } from "@kilocode/kilo-gateway"
 import { cmd } from "../../../cli/cmd/cmd"
 import { UI } from "../../../cli/ui"
-import { Auth, type Info as AuthInfo } from "../../../auth"
-import { makeRuntime } from "../../../effect/run-service"
-import { fetchBalance, fetchProfile, type KilocodeBalance, type KilocodeProfile } from "@kilocode/kilo-gateway"
 
-const runtime = makeRuntime(Auth.Service, Auth.defaultLayer)
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so the auth runtime and gateway fetches happen inside the handler (same
+// deferral pattern as upstream opencode#30453). The runtime is created lazily on
+// first use rather than at module load.
+let runtime: Awaited<ReturnType<typeof load>> | undefined
+async function load() {
+  const { Auth } = await import("../../../auth")
+  const { makeRuntime } = await import("../../../effect/run-service")
+  return makeRuntime(Auth.Service, Auth.defaultLayer)
+}
+async function stored(providerID: string) {
+  runtime ??= await load()
+  return runtime.runPromise((svc) => svc.get(providerID))
+}
 
 interface Info {
   name: string | null
@@ -64,7 +76,7 @@ export const ProfileCommand = cmd({
 })
 
 export async function handle(args: Args) {
-  const get = args.getAuth ?? ((id: string) => runtime.runPromise((svc) => svc.get(id)))
+  const get = args.getAuth ?? stored
   const auth = await get("kilo")
   const error = args.error ?? UI.error
   const exit = args.exit ?? ((code: number) => (process.exitCode = code))
@@ -75,6 +87,7 @@ export async function handle(args: Args) {
     return
   }
 
+  const { fetchBalance, fetchProfile } = await import("@kilocode/kilo-gateway")
   const org = auth.accountId ?? null
   const result = await (async () => {
     try {
diff --git a/packages/opencode/src/kilocode/cli/cmd/roll-call.ts b/packages/opencode/src/kilocode/cli/cmd/roll-call.ts
index 2c932bfde8..37b1871653 100644
--- a/packages/opencode/src/kilocode/cli/cmd/roll-call.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/roll-call.ts
@@ -1,14 +1,35 @@
 import type { Argv } from "yargs"
-import { provide } from "../../instance"
-import { Provider } from "../../../provider/provider"
+import type { Provider } from "../../../provider/provider"
+import type { generateText } from "ai"
 import { ProviderTransform } from "../../../provider/transform"
 import { cmd } from "../../../cli/cmd/cmd"
 import { UI } from "../../../cli/ui"
-import { AppRuntime } from "../../../effect/app-runtime"
-import { RuntimeFlags } from "../../../effect/runtime-flags"
-import { generateText } from "ai"
 import { randomUUID } from "crypto"
 
+// Keep the top-level import graph light: this module is registered eagerly at CLI
+// startup, so implementation dependencies (provider service, AppRuntime, the `ai`
+// SDK) are imported lazily (same deferral pattern as upstream opencode#30453).
+// Resolved once per process: roll-call's per-model path must not re-await import
+// resolution for every model.
+let cache: ReturnType<typeof loadDeps> | undefined
+function loadDeps() {
+  return Promise.all([
+    import("../../../effect/app-runtime"),
+    import("../../../provider/provider"),
+    import("../../../effect/runtime-flags"),
+    import("ai"),
+  ]).then(([runtime, provider, flags, ai]) => ({
+    AppRuntime: runtime.AppRuntime,
+    Provider: provider.Provider,
+    RuntimeFlags: flags.RuntimeFlags,
+    generateText: ai.generateText,
+  }))
+}
+function deps() {
+  cache ??= loadDeps()
+  return cache
+}
+
 const HEADERS = ["Model", "Access", "Snippet", "Latency"]
 const PADDING = 9
 
@@ -127,11 +148,13 @@ interface Result {
   errorMessage: string | null
 }
 
-function list() {
+async function list() {
+  const { AppRuntime, Provider } = await deps()
   return AppRuntime.runPromise(Provider.Service.use((svc) => svc.list()))
 }
 
-function lang(model: Provider.Model) {
+async function lang(model: Provider.Model) {
+  const { AppRuntime, Provider } = await deps()
   return AppRuntime.runPromise(Provider.Service.use((svc) => svc.getLanguage(model)))
 }
 
@@ -140,6 +163,7 @@ export function outputLimit(model: Provider.Model, outputTokenMax?: number) {
 }
 
 export async function handle(args: ArgumentsCamelCase) {
+  const { provide } = await import("../../instance")
   const load = args.list ?? list
 
   if (args.parallel < 1) {
@@ -286,6 +310,7 @@ async function call(
   start: number,
 ): Promise<Omit<Result, "model">> {
   try {
+    const { AppRuntime, RuntimeFlags, generateText } = await deps()
     const language = await lang(model)
     const sessionID = randomUUID()
     const options = ProviderTransform.options({ model, sessionID })
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/app.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/app.tsx
index b3c337c09c..543750842f 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/app.tsx
@@ -282,7 +282,10 @@ export function init() {
             ? "Disable auto-approve mode"
             : "Enable auto-approve mode"
         },
+        desc: "Toggle auto-approve for all permission prompts, saved to global config",
         category: "System",
+        slashName: "auto-approve",
+        slashAliases: ["autoapprove", "approve-all", "approveall"],
         run: async () => {
           const enabled = isAllowEverything(sync.data.config.permission)
           const result = await sdk.client.permission.allowEverything({ enable: !enabled })
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts b/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
index 2b91606c86..020d0be379 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
@@ -877,8 +877,3 @@ export function handleVisualKey(doc: VimDoc, state: VimState, input: VimKey): Vi
   state.countDigits = ""
   return { handled: true }
 }
-
-export function enterInsert(state: VimState) {
-  state.mode = "insert"
-  resetPending(state)
-}
diff --git a/packages/opencode/src/kilocode/cli/port-warning.ts b/packages/opencode/src/kilocode/cli/port-warning.ts
index afba3dd563..ff441e3912 100644
--- a/packages/opencode/src/kilocode/cli/port-warning.ts
+++ b/packages/opencode/src/kilocode/cli/port-warning.ts
@@ -1,4 +1,5 @@
 import { Daemon } from "@/kilocode/daemon/daemon"
+import type { resolveNetworkOptions } from "@/cli/network"
 
 export function warnPort(port: number) {
   if (port === 0) return
@@ -9,3 +10,14 @@ export function warnPort(port: number) {
     )
   }
 }
+
+// Shared resolve-and-warn used by the daemon and console commands so their
+// network option handling cannot drift apart. Imported lazily by callers, so
+// the AppRuntime chain is only loaded when one of those commands runs.
+export async function warnedNetworkOptions(args: Parameters<typeof resolveNetworkOptions>[0]) {
+  const { AppRuntime } = await import("@/effect/app-runtime")
+  const { resolveNetworkOptions } = await import("@/cli/network")
+  const opts = await AppRuntime.runPromise(resolveNetworkOptions(args))
+  warnPort(opts.port)
+  return opts
+}
diff --git a/packages/opencode/src/kilocode/cli/setup.ts b/packages/opencode/src/kilocode/cli/setup.ts
index 561e5c5406..e3c54c3065 100644
--- a/packages/opencode/src/kilocode/cli/setup.ts
+++ b/packages/opencode/src/kilocode/cli/setup.ts
@@ -1,14 +1,6 @@
 import type { Argv } from "yargs"
 import * as Log from "@opencode-ai/core/util/log"
-import { Global } from "@opencode-ai/core/global"
 import { InstallationBuildKind, InstallationVersion } from "@opencode-ai/core/installation/version"
-import { Telemetry } from "@kilocode/kilo-telemetry"
-import { migrateLegacyKiloAuth, ENV_FEATURE, ENV_VERSION } from "@kilocode/kilo-gateway"
-import { AppRuntime } from "@/effect/app-runtime"
-import { Config } from "@/config/config"
-import { Auth } from "@/auth"
-import { InstanceRuntime } from "@/project/instance-runtime"
-import { SessionExport } from "@/kilocode/session-export"
 import { KiloShutdown } from "@/kilocode/cli/shutdown"
 import { createHelpCommand } from "@/kilocode/help-command"
 import { KiloConsoleCommand } from "@/kilocode/cli/cmd/console"
@@ -19,8 +11,6 @@ import { DaemonCommand } from "@/kilocode/cli/cmd/daemon"
 import { DevSetupCommand, DevAliasCommand } from "@/kilocode/cli/dev-setup"
 import { RemoteCommand } from "@/cli/cmd/remote"
 import { ConfigCommand as ConfigCLICommand } from "@/cli/cmd/config"
-import { JsonMigration } from "@/kilocode/storage/json-migration"
-import { KiloLog } from "@/kilocode/log"
 
 const log = Log.create({ service: "kilocode.cli" })
 
@@ -45,6 +35,13 @@ KiloShutdown.register(async () => {
 // All Kilo-specific CLI customization lives here so the shared upstream entrypoint
 // (src/index.ts) only needs a handful of thin call-sites behind kilocode_change markers.
 // This keeps index.ts close to upstream and reduces merge conflicts on every sync.
+//
+// Startup cost note: this module is imported eagerly from src/index.ts, so its static
+// import graph must stay light. Heavy dependencies (telemetry, gateway auth migration,
+// AppRuntime, config, auth, session-export, JSON migration) are dynamically imported
+// inside the function that needs them, following the deferral pattern upstream applied
+// in opencode#30453. The registered command modules must follow the same rule: a light
+// top level, with implementation imports inside their handlers.
 export namespace KiloCli {
   // Register only the Kilo-specific commands. Upstream commands stay in index.ts's chain so
   // upstream merges that add or remove commands keep working without touching this file.
@@ -73,22 +70,35 @@ export namespace KiloCli {
   // Runs from the upstream `.middleware`, before any command handler. Env tagging is additive so
   // it never has to modify upstream's own env assignments.
   export async function bootstrap(): Promise<void> {
+    const { KiloLog } = await import("@/kilocode/log")
     await KiloLog.init()
-    if (!process.env[ENV_FEATURE]) process.env[ENV_FEATURE] = process.argv.includes("serve") ? "unknown" : "cli"
-    if (!process.env[ENV_VERSION]) process.env[ENV_VERSION] = InstallationVersion
+
+    const gateway = await import("@kilocode/kilo-gateway")
+    if (!process.env[gateway.ENV_FEATURE])
+      process.env[gateway.ENV_FEATURE] = process.argv.includes("serve") ? "unknown" : "cli"
+    if (!process.env[gateway.ENV_VERSION]) process.env[gateway.ENV_VERSION] = InstallationVersion
     process.env.KILO = "1"
 
     // Must run before AppRuntime initializes the SQLite database, or the marker
     // exists before legacy JSON can be imported.
+    const { JsonMigration } = await import("@/kilocode/storage/json-migration")
     await JsonMigration.bootstrap()
 
+    const { AppRuntime } = await import("@/effect/app-runtime")
+    const { Config } = await import("@/config/config")
     const cfg = await AppRuntime.runPromise(Config.Service.use((c) => c.getGlobal()))
+
+    const { Global } = await import("@opencode-ai/core/global")
+    const { Telemetry } = await import("@kilocode/kilo-telemetry")
     await Telemetry.init({
       dataPath: Global.Path.data,
       version: InstallationVersion,
       enabled: cfg.experimental?.openTelemetry !== false,
     })
 
+    const { Auth } = await import("@/auth")
+    const { migrateLegacyKiloAuth } = gateway
+
     // Migrate legacy Kilo CLI auth (~/.kilocode/cli/config.json) into auth.json if present.
     await migrateLegacyKiloAuth(
       async () => (await AppRuntime.runPromise(Auth.Service.use((s) => s.get("kilo")))) !== undefined,
@@ -103,12 +113,17 @@ export namespace KiloCli {
     }
 
     Telemetry.trackCliStart()
+    // Overlap the event upload with command execution so exit is not delayed by
+    // a network round trip (#10242).
+    Telemetry.flushInBackground()
   }
 
   // Runs from the `finally` block on every exit path.
   export async function shutdown(): Promise<void> {
+    const { Telemetry } = await import("@kilocode/kilo-telemetry")
     const code = typeof process.exitCode === "number" ? process.exitCode : undefined
     Telemetry.trackCliExit(code)
+    const { SessionExport } = await import("@/kilocode/session-export")
     try {
       await SessionExport.shutdown()
       // Bound telemetry shutdown so an unreachable endpoint (offline, firewall,
@@ -121,6 +136,7 @@ export namespace KiloCli {
       }
     } finally {
       await KiloShutdown.run()
+      const { InstanceRuntime } = await import("@/project/instance-runtime")
       await InstanceRuntime.disposeAllInstances() // safety net (no-op if already disposed)
     }
   }
diff --git a/packages/opencode/src/kilocode/cloud/contracts.ts b/packages/opencode/src/kilocode/cloud/contracts.ts
index a4716e547e..a78b846b8c 100644
--- a/packages/opencode/src/kilocode/cloud/contracts.ts
+++ b/packages/opencode/src/kilocode/cloud/contracts.ts
@@ -163,7 +163,6 @@ export const GetMessageResultOutputSchema = z
     }
   })
 
-export type RepositoryInput = z.infer<typeof RepositoryInputSchema>
 export type AgentStartRequest = z.infer<typeof AgentStartRequestSchema>
 export type AgentSendRequest = z.infer<typeof AgentSendRequestSchema>
 export type GetMessageResultInput = z.infer<typeof GetMessageResultInputSchema>
diff --git a/packages/opencode/src/kilocode/config/config.ts b/packages/opencode/src/kilocode/config/config.ts
index a33445494b..f98a0b8ffa 100644
--- a/packages/opencode/src/kilocode/config/config.ts
+++ b/packages/opencode/src/kilocode/config/config.ts
@@ -37,34 +37,18 @@ export namespace KilocodeConfig {
 
   // ── Config file constants ────────────────────────────────────────────
 
-  /** Kilo-specific config file names (highest-to-lowest precedence within kilo). */
-  export const KILO_CONFIG_FILES = ["kilo.jsonc", "kilo.json"] as const
-
   /** All config file names in precedence order (kilo + opencode). */
   export const ALL_CONFIG_FILES = ["kilo.jsonc", "kilo.json", "opencode.jsonc", "opencode.json"] as const
 
   /** Config directory suffixes in update-target preference order. */
   export const KILO_DIR_SUFFIXES = [".kilo", ".kilocode"] as const
 
-  /** Path patterns for resolving kilo agent names from file paths. */
-  export const AGENT_PATTERNS = ["/.kilo/agent/", "/.kilo/agents/", "/.kilocode/agent/", "/.kilocode/agents/"] as const
-
-  /** Path patterns for resolving kilo command names from file paths. */
-  export const COMMAND_PATTERNS = [
-    "/.kilo/command/",
-    "/.kilo/commands/",
-    "/.kilocode/command/",
-    "/.kilocode/commands/",
-  ] as const
-
   /**
-   * Choose the project config file that Config.update should patch.
-   *
-   * This mirrors the Kilo project-config load chain: prefer existing config files
-   * in ancestor config directories, then existing root config files, and create
-   * `.kilo/kilo.jsonc` when no project config exists yet.
+   * List every project config file the read chain can merge: config files in
+   * ancestor config directories, then root config files, in update-target
+   * preference order.
    */
-  export const projectConfigUpdateTarget = Effect.fn("KilocodeConfig.projectConfigUpdateTarget")(function* (input: {
+  export const projectConfigFiles = Effect.fn("KilocodeConfig.projectConfigFiles")(function* (input: {
     fs: FSUtil.Interface
     directory: string
     worktree?: string
@@ -75,8 +59,7 @@ export namespace KilocodeConfig {
     const roots = yield* input.fs
       .up({ targets: [...ALL_CONFIG_FILES], start: input.directory, stop: input.worktree })
       .pipe(Effect.orDie)
-    const files = [...dirs.flatMap((dir) => ALL_CONFIG_FILES.map((file) => path.join(dir, file))), ...roots]
-    return files.find((file) => existsSync(file)) ?? path.join(input.directory, ".kilo", "kilo.jsonc")
+    return [...dirs.flatMap((dir) => ALL_CONFIG_FILES.map((file) => path.join(dir, file))), ...roots]
   })
 
   export const updateProjectConfig = Effect.fn("KilocodeConfig.updateProjectConfig")(function* (input: {
@@ -89,22 +72,108 @@ export namespace KilocodeConfig {
     patch: (input: string, config: Config.Info) => string
     writable: (config: Config.Info) => Config.Info
   }) {
-    const file = yield* projectConfigUpdateTarget(input)
+    const files = yield* projectConfigFiles(input)
+    const file = files.find((item) => existsSync(item)) ?? path.join(input.directory, ".kilo", "kilo.jsonc")
     const source = yield* input.read(file)
     const before = source ?? "{}"
     const patch = input.writable(input.config)
 
     if (file.endsWith(".jsonc")) {
-      if (source === undefined && Object.keys(mergeConfig({}, patch)).length === 0) return
-      const updated = input.patch(before, patch)
-      yield* input.fs.writeWithDirs(file, updated).pipe(Effect.orDie)
-      return
+      if (!(source === undefined && Object.keys(mergeConfig({}, patch)).length === 0)) {
+        const updated = input.patch(before, patch)
+        yield* input.fs.writeWithDirs(file, updated).pipe(Effect.orDie)
+      }
+    } else {
+      const existing = input.parse(before, file)
+      const merged = mergeConfig(input.writable(existing), patch)
+      if (!(source === undefined && Object.keys(merged).length === 0)) {
+        yield* input.fs.writeWithDirs(file, JSON.stringify(merged, null, 2)).pipe(Effect.orDie)
+      }
     }
 
-    const existing = input.parse(before, file)
-    const merged = mergeConfig(input.writable(existing), patch)
-    if (source === undefined && Object.keys(merged).length === 0) return
-    yield* input.fs.writeWithDirs(file, JSON.stringify(merged, null, 2)).pipe(Effect.orDie)
+    // Reads merge every project config file, so a delete sentinel applied only
+    // to the update target leaves lower-precedence copies of the key visible.
+    yield* propagateUnset({ fs: input.fs, files, exclude: file, patch })
+  })
+
+  /** Collect the leaf paths of null delete sentinels in a config patch. */
+  export function unsetPaths(patch: unknown, prefix: string[] = []): string[][] {
+    if (!isRecord(patch)) return []
+    return Object.entries(patch).flatMap(([key, value]) => {
+      const parts = [...prefix, key]
+      if (value === null) return [parts]
+      return unsetPaths(value, parts)
+    })
+  }
+
+  const blocked = new Set(["__proto__", "constructor", "prototype"])
+
+  function sentinel(out: Record<string, unknown>, parts: string[]) {
+    const [head, ...tail] = parts
+    if (!head || blocked.has(head)) return
+    if (tail.length === 0) {
+      out[head] = null
+      return
+    }
+    const next = isRecord(out[head]) ? out[head] : {}
+    out[head] = next
+    sentinel(next, tail)
+  }
+
+  function has(input: unknown, parts: string[]) {
+    let cur = input
+    for (const part of parts) {
+      if (!isRecord(cur) || !(part in cur)) return false
+      cur = cur[part]
+    }
+    return true
+  }
+
+  /**
+   * Remove null delete-sentinel keys from every layered config file that still
+   * contains them. Reads merge all candidate files, so deleting a key from only
+   * the primary write target leaves lower-precedence copies of it visible and
+   * the "unset" appears to have no effect. Returns true when a file changed.
+   */
+  export const propagateUnset = Effect.fn("KilocodeConfig.propagateUnset")(function* (input: {
+    fs: FSUtil.Interface
+    files: readonly string[]
+    exclude: string
+    patch: Config.Info
+  }) {
+    const paths = unsetPaths(input.patch)
+    if (paths.length === 0) return false
+    let changed = false
+    for (const file of input.files) {
+      if (file === input.exclude || !existsSync(file)) continue
+      const text = yield* input.fs.readFileStringSafe(file).pipe(Effect.orDie)
+      if (!text) continue
+      const parsed = parseJsonc(text)
+      const hits = paths.filter((parts) => has(parsed, parts))
+      if (hits.length === 0) continue
+      if (file.endsWith(".jsonc")) {
+        const updated = hits.reduce(
+          (acc, parts) =>
+            applyEdits(acc, modify(acc, parts, undefined, { formattingOptions: { insertSpaces: true, tabSize: 2 } })),
+          text,
+        )
+        if (updated === text) continue
+        yield* input.fs.writeFileString(file, updated).pipe(Effect.orDie)
+        changed = true
+        continue
+      }
+      const patch = hits.reduce(
+        (acc, parts) => {
+          sentinel(acc, parts)
+          return acc
+        },
+        {} as Record<string, unknown>,
+      )
+      const next = mergeConfig(parsed as Config.Info, patch as Config.Info)
+      yield* input.fs.writeFileString(file, JSON.stringify(next, null, 2)).pipe(Effect.orDie)
+      changed = true
+    }
+    return changed
   })
 
   export function scopeIndexing(info: Config.Info, scope: "global" | "local"): Config.Info {
@@ -333,7 +402,8 @@ export namespace KilocodeConfig {
 
   // ── Bash permission migration ────────────────────────────────────────
 
-  const GLOBAL_CONFIG_FILES = ["config.json", "kilo.json", "kilo.jsonc", "opencode.json", "opencode.jsonc"]
+  /** Global config file names in read-merge order (lowest-to-highest precedence). */
+  export const GLOBAL_CONFIG_FILES = ["config.json", "kilo.json", "kilo.jsonc", "opencode.json", "opencode.jsonc"]
 
   /**
    * Migrate bash permission for existing users before config is consumed.
diff --git a/packages/opencode/src/kilocode/config/overlay.ts b/packages/opencode/src/kilocode/config/overlay.ts
index 2d576c3bce..6785e654ba 100644
--- a/packages/opencode/src/kilocode/config/overlay.ts
+++ b/packages/opencode/src/kilocode/config/overlay.ts
@@ -1,5 +1,8 @@
 import path from "path"
 import { existsSync } from "fs"
+import { access, realpath } from "fs/promises"
+import { constants } from "fs"
+import { createHash } from "crypto"
 import { Schema } from "effect"
 import z from "zod"
 import * as Log from "@opencode-ai/core/util/log"
@@ -54,16 +57,21 @@ export namespace KilocodeConfigOverlay {
     global: z.custom<Config.Info>(Schema.is(Config.Info)),
     project: z.custom<Config.Info>(Schema.is(Config.Info)),
     sources: z.array(KilocodeConfigSources.Source),
-    targets: z.object({
-      global: z.string().optional(),
-      project: z.string().optional(),
-      active: z.string().optional(),
-    }),
+    targets: z.object({ global: z.custom<Target>(), project: z.custom<Target>(), active: z.custom<Target>() }),
     fields: z.record(z.string(), Resolved),
     collections: z.record(z.string(), z.array(Resolved)),
   })
   export type Result = z.infer<typeof Result>
 
+  export type Target = {
+    scope: Scope
+    path: string
+    revision: string
+    exists: boolean
+    writable: boolean
+    raw: Record<string, unknown>
+  }
+
   export type Input = {
     directory: string
     worktree?: string
@@ -88,6 +96,7 @@ export namespace KilocodeConfigOverlay {
     ["disabled_providers"],
     ["watcher", "ignore"],
     ["instructions"],
+    ["web_search"],
     ["indexing", "enabled"],
     ["indexing", "provider"],
     ["indexing", "model"],
@@ -143,16 +152,54 @@ export namespace KilocodeConfigOverlay {
     return candidates.find((file) => existsSync(file)) ?? candidates[0]
   }
 
+  export async function target(input: { scope: Scope; directory: string; worktree?: string }): Promise<Target> {
+    const file = input.scope === "global" ? globalTarget() : await projectTarget(input)
+    const root =
+      input.scope === "global"
+        ? Global.Path.config
+        : input.worktree && input.worktree !== "/"
+          ? input.worktree
+          : input.directory
+    const [canonical, boundary] = await Promise.all([canonicalize(file), canonicalize(root)])
+    const exists = await Bun.file(file).exists()
+    const bytes = exists ? await Bun.file(file).text() : ""
+    const relative = path.relative(boundary, canonical)
+    const inside = relative === "" || (!path.isAbsolute(relative) && relative.split(path.sep)[0] !== "..")
+    const raw = exists ? ConfigParse.jsonc(bytes, canonical) : {}
+    return {
+      scope: input.scope,
+      path: canonical,
+      revision: revision(canonical, exists, bytes),
+      exists,
+      writable: inside && (await canWrite(exists ? canonical : path.dirname(canonical))),
+      raw: isRecord(raw) ? raw : {},
+    }
+  }
+
+  export function revision(file: string, exists: boolean, bytes: string) {
+    return createHash("sha256")
+      .update(file)
+      .update("\0")
+      .update(exists ? "exists" : "missing")
+      .update("\0")
+      .update(bytes)
+      .digest("hex")
+  }
+
   export async function resolve(input: Input): Promise<Result> {
     // kilocode_change start - project agents untrusted, {file:} confined to the project root; global agents trusted
     const root = input.worktree && input.worktree !== "/" ? input.worktree : input.directory
     const local = await withAgents(await project(input), await projectDirs(input), false, root)
     const global = await withAgents(input.global, globalDirs(), true)
     // kilocode_change end
+    const [globalTarget, projectTarget] = await Promise.all([
+      target({ ...input, scope: "global" }),
+      target({ ...input, scope: "project" }),
+    ])
     const targets = {
-      global: globalTarget(),
-      project: await projectTarget(input),
-      active: input.scope === "global" ? globalTarget() : await projectTarget(input),
+      global: globalTarget,
+      project: projectTarget,
+      active: input.scope === "global" ? globalTarget : projectTarget,
     }
     return {
       scope: input.scope,
@@ -366,4 +413,24 @@ export namespace KilocodeConfigOverlay {
     if (isRecord(input)) return input
     return {}
   }
+
+  async function canonicalize(file: string): Promise<string> {
+    const resolved = path.resolve(file)
+    const found = await realpath(resolved).catch(() => undefined)
+    if (found) return path.normalize(found)
+    const parent = path.dirname(resolved)
+    if (parent === resolved) return resolved
+    return path.join(await canonicalize(parent), path.basename(resolved))
+  }
+
+  async function canWrite(file: string): Promise<boolean> {
+    return access(file, constants.W_OK).then(
+      () => true,
+      async () => {
+        const parent = path.dirname(file)
+        if (parent === file) return false
+        return canWrite(parent)
+      },
+    )
+  }
 }
diff --git a/packages/opencode/src/kilocode/config/writer.ts b/packages/opencode/src/kilocode/config/writer.ts
new file mode 100644
index 0000000000..eee4a27711
--- /dev/null
+++ b/packages/opencode/src/kilocode/config/writer.ts
@@ -0,0 +1,105 @@
+import { applyEdits, findNodeAtLocation, modify, parseTree } from "jsonc-parser"
+import { mkdir, stat } from "fs/promises"
+import path from "path"
+import { Config } from "@/config/config"
+import { ConfigParse } from "@/config/parse"
+import { Filesystem } from "@/util/filesystem"
+import { isRecord } from "@/util/record"
+import { KilocodeConfigOverlay } from "./overlay"
+
+export namespace KilocodeConfigWriter {
+  export type Conflict = {
+    ok: false
+    code: "target-changed" | "revision-conflict" | "target-not-writable"
+    message: string
+    target: KilocodeConfigOverlay.Target
+  }
+
+  export type Result = { ok: true; target: KilocodeConfigOverlay.Target } | Conflict
+
+  export async function write(input: {
+    directory: string
+    worktree?: string
+    scope: KilocodeConfigOverlay.Scope
+    expected?: { path: string; revision: string }
+    set?: Record<string, unknown>
+    unset?: string[][]
+    write?: typeof Filesystem.write
+    beforeWrite?: () => Promise<void>
+  }): Promise<Result> {
+    const target = await KilocodeConfigOverlay.target(input)
+    const expected = input.expected
+    if (expected && target.path !== expected.path) {
+      return { ok: false, code: "target-changed", message: "The authoritative config target changed.", target }
+    }
+    if (expected && target.revision !== expected.revision) {
+      return { ok: false, code: "revision-conflict", message: "The config file changed since it was read.", target }
+    }
+    if (!target.writable) {
+      return {
+        ok: false,
+        code: "target-not-writable",
+        message: "The config target is outside its allowed root or is not writable.",
+        target,
+      }
+    }
+
+    const patch = KilocodeConfigOverlay.patch({ scope: input.scope, set: input.set, unset: input.unset })
+    if (Object.keys(patch).length === 0) return { ok: true, target }
+    await mkdir(path.dirname(target.path), { recursive: true })
+    await input.beforeWrite?.()
+    const checked = await KilocodeConfigOverlay.target(input)
+    if ((expected && checked.path !== expected.path) || !checked.writable) {
+      return {
+        ok: false,
+        code: "target-not-writable",
+        message: "The config target changed or escaped its allowed root.",
+        target: checked,
+      }
+    }
+    const before = checked.exists ? await Bun.file(checked.path).text() : "{}"
+    if (
+      expected &&
+      KilocodeConfigOverlay.revision(checked.path, checked.exists, checked.exists ? before : "") !== expected.revision
+    ) {
+      return {
+        ok: false,
+        code: "revision-conflict",
+        message: "The config file changed since it was read.",
+        target: checked,
+      }
+    }
+    const updated = patchJsonc(before, patch)
+    ConfigParse.schema(Config.Info, ConfigParse.jsonc(updated, checked.path), checked.path)
+    const mode = checked.exists
+      ? await stat(checked.path).then((info) => info.mode & 0o777)
+      : checked.scope === "global"
+        ? 0o600
+        : undefined
+    if (updated !== before) await (input.write ?? Filesystem.write)(checked.path, updated, mode)
+    return { ok: true, target: await KilocodeConfigOverlay.target(input) }
+  }
+
+  function patchJsonc(input: string, patch: unknown, parts: string[] = []): string {
+    if (!isRecord(patch)) {
+      return applyEdits(
+        input,
+        modify(input, parts, patch === null ? undefined : patch, {
+          formattingOptions: { insertSpaces: true, tabSize: 2 },
+        }),
+      )
+    }
+    if (parts.length > 0) {
+      const tree = parseTree(input)
+      const node = tree && findNodeAtLocation(tree, parts)
+      if (node && node.type !== "object") {
+        const replacement = parts[0] === "permission" && parts.length === 2 ? { "*": node.value, ...patch } : patch
+        return applyEdits(
+          input,
+          modify(input, parts, replacement, { formattingOptions: { insertSpaces: true, tabSize: 2 } }),
+        )
+      }
+    }
+    return Object.entries(patch).reduce((text, [key, value]) => patchJsonc(text, value, [...parts, key]), input)
+  }
+}
diff --git a/packages/opencode/src/kilocode/indexing.ts b/packages/opencode/src/kilocode/indexing.ts
index a579f7b312..b175c6d1bc 100644
--- a/packages/opencode/src/kilocode/indexing.ts
+++ b/packages/opencode/src/kilocode/indexing.ts
@@ -22,15 +22,18 @@ import { WorkspaceContext } from "@/control-plane/workspace-context"
 import { Event as IndexingEvent, Warning as IndexingWarningEvent } from "./indexing-event"
 import { indexingWarningKey, type IndexingWarning } from "./indexing-warning"
 import { IndexingWorker } from "./indexing-worker-client"
-import { LanceDBRuntime } from "./lancedb" // kilocode_change
-import { indexingWithKiloDefault, resolveKiloIndexingAuth, type KiloIndexingAuth } from "./indexing-auth" // kilocode_change
+import { LanceDBRuntime } from "./lancedb"
+import { indexingWithKiloDefault, resolveKiloIndexingAuth, type KiloIndexingAuth } from "./indexing-auth"
 import { primaryWorktree } from "./primary-worktree"
 
 const log = Log.create({ service: "kilocode-indexing" })
 const auth = makeRuntime(Auth.Service, Auth.defaultLayer)
+const consent = new Map<string, boolean>()
 const missing = () => disabledIndexingStatus("Indexing plugin is not enabled for this workspace.")
 const noWorkspace = () =>
   disabledIndexingStatus("Codebase indexing is disabled because no workspace folder is open in VS Code.")
+const noConsent = () =>
+  disabledIndexingStatus("Codebase indexing is disabled until you enable it for this project in Kilo Settings.")
 
 export const IndexingModelError = NamedError.create("IndexingModelError", {
   model: Schema.String,
@@ -236,6 +239,7 @@ export namespace KiloIndexing {
   export const Warning = IndexingWarningEvent
 
   const cache = new Map<string, Cache>()
+  const projects = new Map<string, string>()
 
   const inert = async (current: () => Status): Promise<Entry> => {
     const publish = async () => {
@@ -269,9 +273,14 @@ export namespace KiloIndexing {
     )
     const baseline = startup.baseline
     const cfg = startup.cfg
+    const project = (await AppRuntime.runPromise(primaryWorktree(dir))) ?? dir
+    projects.set(dir, project)
     if (process.env["KILO_DISABLE_CODEBASE_INDEXING"] === "vscode-no-workspace") {
       return track(hit, await inert(() => noWorkspace()))
     }
+    if (process.env["KILO_PLATFORM"] === "vscode" && !consent.get(project)) {
+      return track(hit, await inert(() => noConsent()))
+    }
     if (!hasIndexingPlugin(cfg.plugin)) {
       return track(hit, await inert(() => missing()))
     }
@@ -281,10 +290,16 @@ export namespace KiloIndexing {
     const auth = await kiloAuth(cfg)
     const globalConfig = await AppRuntime.runPromise(Config.Service.use((svc) => svc.getGlobal()))
     const global = globalConfig.indexing
-    const merged = indexingWithKiloDefault({ ...global, ...cfg.indexing }, auth)
+    const merged = indexingWithKiloDefault({ ...global, ...cfg.indexing }, auth) ?? {}
     let cfgInput: Awaited<ReturnType<typeof model>>
     try {
-      cfgInput = await model(enrichKilo(input(merged, global), auth), auth)
+      cfgInput = await model(
+        enrichKilo(
+          input({ ...merged, enabled: process.env["KILO_PLATFORM"] === "vscode" ? true : merged.enabled }, global),
+          auth,
+        ),
+        auth,
+      )
     } catch (err) {
       log.warn("indexing model resolution failed", { err })
       return track(hit, await inert(() => failed(err)))
@@ -478,6 +493,7 @@ export namespace KiloIndexing {
   registerDisposer(async (dir) => {
     const hit = cache.get(dir)
     cache.delete(dir)
+    projects.delete(dir)
     if (hit) hit.disposed = true
     if (hit?.entry) {
       await hit.entry.dispose()
@@ -493,6 +509,22 @@ export namespace KiloIndexing {
     await current.ready
   }
 
+  /** VS Code supplies machine-local project consent before indexing can start. */
+  export async function setConsent(enabled: boolean) {
+    if (process.env["KILO_PLATFORM"] !== "vscode") return
+    const dir = Instance.directory
+    const project = (await AppRuntime.runPromise(primaryWorktree(dir))) ?? dir
+    if (consent.get(project) === enabled) return
+    consent.set(project, enabled)
+    const hits = [...cache.entries()].filter(([path]) => (projects.get(path) ?? path) === project)
+    for (const [path, hit] of hits) {
+      cache.delete(path)
+      projects.delete(path)
+      hit.disposed = true
+      await hit.entry?.dispose()
+    }
+  }
+
   export async function current(): Promise<Status> {
     const entry = await hit().ready
     entry.scope(WorkspaceContext.workspaceID)
diff --git a/packages/opencode/src/kilocode/memory/turn.ts b/packages/opencode/src/kilocode/memory/turn.ts
index c41068c0e3..d9fdc79ae7 100644
--- a/packages/opencode/src/kilocode/memory/turn.ts
+++ b/packages/opencode/src/kilocode/memory/turn.ts
@@ -78,7 +78,9 @@ export namespace MemoryLifecycle {
           if (!enabled) return
           yield* MemoryTurn.close({
             sessionID: evt.properties.sessionID,
-            reason: evt.properties.reason,
+            // A superseded turn handed off to a queued follow-up after draining
+            // its step; for digest purposes it was cut short like an interrupt.
+            reason: evt.properties.reason === "superseded" ? "interrupted" : evt.properties.reason,
             sessions: input.sessions,
             summary: input.summary,
             provider: input.provider,
diff --git a/packages/opencode/src/kilocode/permission/drain.ts b/packages/opencode/src/kilocode/permission/drain.ts
index 78f960c867..499f4f83e1 100644
--- a/packages/opencode/src/kilocode/permission/drain.ts
+++ b/packages/opencode/src/kilocode/permission/drain.ts
@@ -33,6 +33,8 @@ export function drainCovered(
       // Never auto-resolve config file edit permissions
       const skill = ConfigProtection.globalSkillPattern(entry.info)
       if (ConfigProtection.isRequest(entry.info) && !skill) continue
+      // Never auto-resolve a skill shell batch; it must get an explicit reply.
+      if (entry.info.metadata?.["skillShell"] === true) continue
       const actions = entry.info.patterns.map((pattern: string) => {
         const rule = skill
           ? Permission.evaluate(entry.info.permission, skill, approved)
diff --git a/packages/opencode/src/kilocode/plan-followup.ts b/packages/opencode/src/kilocode/plan-followup.ts
index 01de704a54..a0c726f94c 100644
--- a/packages/opencode/src/kilocode/plan-followup.ts
+++ b/packages/opencode/src/kilocode/plan-followup.ts
@@ -157,7 +157,6 @@ export async function generateHandover(input: {
 export namespace PlanFollowup {
   const log = Log.create({ service: "plan.followup" })
 
-  export const PLAN_PREFIX = "Implement the following plan:"
   export const ANSWER_NEW_SESSION = "Start new session"
   export const ANSWER_CONTINUE = "Continue here"
   export const ANSWER_KEEP_REFINING = "Keep refining"
diff --git a/packages/opencode/src/kilocode/provider/error.ts b/packages/opencode/src/kilocode/provider/error.ts
index 18bc3d07c8..23b5440c74 100644
--- a/packages/opencode/src/kilocode/provider/error.ts
+++ b/packages/opencode/src/kilocode/provider/error.ts
@@ -1,5 +1,87 @@
 import type { APICallError } from "ai"
 import { ProviderV2 } from "@opencode-ai/core/provider"
+import { isRecord } from "@/util/record"
+import { z } from "zod"
+
+export type Frame = {
+  type?: unknown
+  error?: Record<string, unknown>
+} & Record<string, unknown>
+
+const payload = z.looseObject({
+  code: z.union([z.string(), z.number()]).nullish(),
+  message: z.string().nullish(),
+})
+
+// OpenAI Responses API terminal frame forwarded by @ai-sdk/openai >= 3.0.82
+const terminal = z.looseObject({
+  type: z.literal("response.failed"),
+  response: z.looseObject({ error: payload }),
+})
+
+// Envelope-less chat-completions wrapper; checked before `bare` so a
+// nested `error` record wins over bare top-level fields and gateway
+// wrappers keep the specific inner code
+const wrapper = z.looseObject({
+  type: z.undefined().optional(),
+  error: payload,
+})
+
+// Bare error object
+const bare = z.looseObject({
+  type: z.undefined().optional(),
+  code: z.union([z.string(), z.number(), z.null()]),
+  message: z.string(),
+})
+
+/**
+ * Normalize provider stream error frames that arrive without the
+ * `{ type: "error" }` envelope expected by ProviderError.parseStreamError.
+ */
+export function frame(body: unknown): Frame {
+  const failed = terminal.safeParse(body)
+  if (failed.success) return { type: "error", error: failed.data.response.error }
+  const wrapped = wrapper.safeParse(body)
+  if (wrapped.success) return { ...wrapped.data, type: "error" }
+  const direct = bare.safeParse(body)
+  if (direct.success) return { ...direct.data, type: "error", error: direct.data }
+  if (!isRecord(body)) return {}
+  return { ...body, error: isRecord(body.error) ? body.error : undefined }
+}
+
+const RETRYABLE = /rate.?limit|too.?many.?requests|rate increased too quickly|exhausted|overload|server|unavailable|timeout/i
+// Keep free-form message matching narrow: Session.retryable only applied
+// rate-limit phrases to prose; the wider pattern above is for structured
+// code/type fields only
+const RETRYABLE_TEXT = /rate increased too quickly|rate.?limit|too.?many.?requests/i
+
+// Must stay at least as permissive as the Session.retryable heuristics that
+// applied when these frames still surfaced as NamedError.Unknown, or
+// previously-retried provider errors silently become terminal
+function retryable(error: Frame["error"], message: string) {
+  const code = error?.code
+  const numeric = typeof code === "number" ? code : typeof code === "string" && code.trim() !== "" ? Number(code) : NaN
+  if (!Number.isNaN(numeric)) {
+    if (numeric === 429 || (numeric >= 500 && numeric < 600)) return true
+  } else if (typeof code === "string" && RETRYABLE.test(code)) {
+    return true
+  }
+  const type = error?.type
+  if (typeof type === "string" && RETRYABLE.test(type)) return true
+  return RETRYABLE_TEXT.test(message)
+}
+
+/**
+ * Terminal handler for normalized frames whose error code is not listed in
+ * ProviderError.parseStreamError: surface the provider message instead of
+ * falling back to a raw JSON dump. Retryable only for rate-limit and
+ * 5xx-style signals in the code, type, or message.
+ */
+export function fallback(body: Frame, responseBody: string) {
+  const message = body.error?.message
+  if (typeof message !== "string" || !message.trim()) return
+  return { type: "api_error" as const, message, isRetryable: retryable(body.error, message), responseBody }
+}
 
 const AUTH_ERROR =
   "Request had invalid authentication credentials. Expected OAuth 2 access token, login cookie or other valid authentication credential. See https://developers.google.com/identity/sign-in/web/devconsole-project."
diff --git a/packages/opencode/src/kilocode/remote-attachments.ts b/packages/opencode/src/kilocode/remote-attachments.ts
index 9008065cc9..b329dbb47d 100644
--- a/packages/opencode/src/kilocode/remote-attachments.ts
+++ b/packages/opencode/src/kilocode/remote-attachments.ts
@@ -66,7 +66,6 @@ export namespace RemoteAttachments {
     sql: "text/plain",
   }
   export const BINARY_MIME = "application/octet-stream"
-  export const TEXT_PLAIN = "text/plain"
   // Hard cap on attachment bytes (5 MB + 1 byte so the helper aborts
   // strictly when the body exceeds the agreed ceiling).
   export const MAX_BYTES = 5 * 1024 * 1024 + 1
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/background-process.ts b/packages/opencode/src/kilocode/server/httpapi/groups/background-process.ts
index e5b0dbc2dc..208cd1f021 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/background-process.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/background-process.ts
@@ -22,7 +22,6 @@ export const BackgroundProcessPaths = {
 } as const
 
 export const Params = Schema.Struct({ processID: BackgroundProcess.ID })
-export const SessionParams = Schema.Struct({ sessionID: SessionID })
 
 export const BackgroundProcessApi = HttpApi.make("background-process")
   .add(
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/config-console.ts b/packages/opencode/src/kilocode/server/httpapi/groups/config-console.ts
index 14f87f9646..1b52d4a5d9 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/config-console.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/config-console.ts
@@ -20,6 +20,14 @@ const TuiScoped = TuiScope.annotate({ default: "project" })
 const ProjectScope = Schema.Literal("project").annotate({ default: "project" })
 const Origin = Schema.Literals(["project", "global", "system", "default"])
 const UnknownRecord = Schema.Record(Schema.String, Schema.Unknown)
+const ConfigTarget = Schema.Struct({
+  scope: Scope,
+  path: Schema.String,
+  revision: Schema.String,
+  exists: Schema.Boolean,
+  writable: Schema.Boolean,
+  raw: UnknownRecord,
+})
 const ModelRef = Schema.Struct({ providerID: Schema.String, modelID: Schema.String })
 const Resolved = Schema.Struct({
   key: Schema.String,
@@ -50,10 +58,23 @@ export const ConfigOverlayQuery = Schema.Struct({
   scope: Schema.optional(Scoped),
 })
 export const ConfigOverlayPatch = Schema.Struct({
-  scope: Schema.optional(Scoped),
+  scope: Scope,
   set: Schema.optional(UnknownRecord),
   unset: Schema.optional(Schema.Array(Schema.Array(Schema.String))),
+  // Optional: clients that did not read a revision (anything but the settings
+  // page) still write unconditionally instead of failing the request.
+  expected: Schema.optional(Schema.Struct({ path: Schema.String, revision: Schema.String })),
 })
+export class ConfigOverlayConflictError extends Schema.ErrorClass<ConfigOverlayConflictError>(
+  "ConfigOverlayConflictError",
+)(
+  {
+    code: Schema.Literals(["target-changed", "revision-conflict"]),
+    message: Schema.String,
+    target: ConfigTarget,
+  },
+  { httpApiStatus: 409 },
+) {}
 export const ConfigRulesQuery = Schema.Struct({
   ...WorkspaceRoutingQueryFields,
   scope: Schema.optional(ProjectScope),
@@ -81,9 +102,9 @@ export const ConfigOverlayResponse = Schema.Struct({
   project: Config.Info,
   sources: Schema.Array(Source),
   targets: Schema.Struct({
-    global: Schema.optional(Schema.String),
-    project: Schema.optional(Schema.String),
-    active: Schema.optional(Schema.String),
+    global: ConfigTarget,
+    project: ConfigTarget,
+    active: ConfigTarget,
   }),
   fields: Schema.Record(Schema.String, Resolved),
   collections: Schema.Record(Schema.String, Schema.Array(Resolved)),
@@ -177,7 +198,8 @@ export const ConfigConsoleApi = HttpApi.make("config-console")
         HttpApiEndpoint.patch("overlayUpdate", ConfigConsolePaths.overlay, {
           query: WorkspaceRoutingQuery,
           payload: ConfigOverlayPatch,
-          success: described(Config.Info, "Effective configuration after patch"),
+          success: described(ConfigOverlayResponse, "Resolved config overlay after patch"),
+          error: ConfigOverlayConflictError,
         }).annotateMerge(
           OpenApi.annotations({
             identifier: "config.overlayUpdate",
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/indexing.ts b/packages/opencode/src/kilocode/server/httpapi/groups/indexing.ts
index 287cc0cda2..5818c5033a 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/indexing.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/indexing.ts
@@ -26,9 +26,13 @@ export const KiloEmbeddingModelCatalog = Schema.Struct({
 }).annotate({ identifier: "KiloEmbeddingModelCatalog" })
 
 const root = "/indexing"
+const IndexingConsent = Schema.Struct({
+  enabled: Schema.Boolean,
+})
 
 export const IndexingPaths = {
   status: `${root}/status`,
+  consent: `${root}/consent`,
   models: `${root}/models`,
   warnings: `${root}/warnings`,
 } as const
@@ -70,6 +74,19 @@ export const IndexingApi = HttpApi.make("indexing")
           }),
         ),
       )
+      .add(
+        HttpApiEndpoint.put("consent", IndexingPaths.consent, {
+          query: WorkspaceRoutingQuery,
+          payload: IndexingConsent,
+          success: described(IndexingStatusInfo, "Indexing status"),
+        }).annotateMerge(
+          OpenApi.annotations({
+            identifier: "indexing.consent",
+            summary: "Set indexing consent",
+            description: "Set machine-local code indexing consent for the active project.",
+          }),
+        ),
+      )
       .annotateMerge(
         OpenApi.annotations({
           title: "indexing",
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts b/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts
index 596ca4f57d..9aca9d4581 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts
@@ -219,13 +219,6 @@ export const SessionImportPaths = {
   part: `${root}/part`,
 } as const
 
-export const SessionImportPayloads = {
-  Project: ProjectSchema,
-  Session: SessionSchema,
-  Message: MessageSchema,
-  Part: PartSchema,
-} as const
-
 export const SessionImportApi = HttpApi.make("session-import")
   .add(
     HttpApiGroup.make("session-import")
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts
index 0ffd2cef99..eb528da1c2 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts
@@ -3,6 +3,7 @@ import { Auth } from "@/auth"
 import { Config } from "@/config/config"
 import * as InstanceState from "@/effect/instance-state"
 import { KilocodeConfigOverlay } from "@/kilocode/config/overlay"
+import { KilocodeConfigWriter } from "@/kilocode/config/writer"
 import { KilocodeConfigSources } from "@/kilocode/config/sources"
 import { KilocodeModelState } from "@/kilocode/config/model-state"
 import { ConfigRules } from "@/kilocode/server/routes/config-rules"
@@ -11,10 +12,13 @@ import { KilocodeTuiConfig } from "@/kilocode/tui/config"
 import { disposeAllInstancesAndEmitGlobalDisposed } from "@/server/global-lifecycle"
 import { InstanceHttpApi } from "@/server/routes/instance/httpapi/api"
 import { markInstanceForDisposal } from "@/server/routes/instance/httpapi/lifecycle"
+import { InvalidRequestError } from "@/server/routes/instance/httpapi/errors"
 import { Effect, Option } from "effect"
+import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
 import {
   ConfigModelStatePatch,
+  ConfigOverlayConflictError,
   ConfigOverlayPatch,
   ConfigOverlayQuery,
   ConfigRulesPatch,
@@ -27,6 +31,7 @@ export const configConsoleHandlers = HttpApiBuilder.group(InstanceHttpApi, "conf
     const config = yield* Config.Service
     const auth = yield* Auth.Service
     const account = yield* Account.Service
+    const flock = yield* EffectFlock.Service
 
     const overlay = Effect.fn("ConfigConsoleHttpApi.overlay")(function* (ctx: {
       query: typeof ConfigOverlayQuery.Type
@@ -69,28 +74,78 @@ export const configConsoleHandlers = HttpApiBuilder.group(InstanceHttpApi, "conf
     }) {
       const body = {
         ...ctx.payload,
-        scope: ctx.payload.scope ?? "project",
         set: ctx.payload.set ? { ...ctx.payload.set } : undefined,
         unset: ctx.payload.unset?.map((item) => [...item]),
       }
-      const patch = KilocodeConfigOverlay.patch(body)
-      if (Object.keys(patch).length === 0) {
-        if (body.scope === "global") return yield* config.getGlobal()
-        return yield* config.get()
-      }
-      if (body.scope === "global") {
-        const hot = Object.keys(patch).every((key) => key === "console")
-        const result = yield* config.updateGlobal(patch, hot ? { dispose: false } : undefined)
-        if (result.changed && !hot) {
-          yield* disposeAllInstancesAndEmitGlobalDisposed({ swallowErrors: true }).pipe(
-            Effect.catchCause(() => Effect.void),
+      const expected = body.expected ? { ...body.expected } : undefined
+      const instance = yield* InstanceState.context
+      const result = yield* flock
+        .withLock(
+          Effect.promise(() =>
+            KilocodeConfigWriter.write({
+              ...body,
+              directory: instance.directory,
+              worktree: instance.worktree,
+              expected,
+            }),
+          ),
+          `config:${body.scope}:${expected?.path ?? "target"}`,
+        )
+        .pipe(Effect.orDie)
+      if (!result.ok) {
+        if (result.code === "target-not-writable") {
+          return yield* Effect.fail(
+            new InvalidRequestError({ message: result.message, kind: result.code, field: result.target.path }),
           )
         }
-        return result.info
+        return yield* Effect.fail(
+          new ConfigOverlayConflictError({ code: result.code, message: result.message, target: result.target }),
+        )
       }
-      yield* config.update(patch)
-      yield* markInstanceForDisposal(yield* InstanceState.context)
-      return yield* config.get()
+      const patch = KilocodeConfigOverlay.patch(body)
+      const hot = body.scope === "global" && Object.keys(patch).every((key) => key === "console")
+      if (body.scope === "global") {
+        yield* config.invalidate()
+      } else {
+        yield* config.update({})
+        yield* markInstanceForDisposal(instance)
+      }
+      const all = yield* auth.all().pipe(Effect.orElseSucceed(() => ({})))
+      const active = yield* account.active().pipe(
+        Effect.map(Option.getOrUndefined),
+        Effect.orElseSucceed(() => undefined),
+      )
+      const [base, global, sources] = yield* Effect.all(
+        [
+          config.get(),
+          config.getGlobal(),
+          Effect.promise(() =>
+            KilocodeConfigSources.list({
+              directory: instance.directory,
+              worktree: instance.worktree,
+              auth: all,
+              account: active,
+            }),
+          ),
+        ],
+        { concurrency: 3 },
+      )
+      const output = yield* Effect.promise(() =>
+        KilocodeConfigOverlay.resolve({
+          directory: instance.directory,
+          worktree: instance.worktree,
+          scope: body.scope,
+          effective: base,
+          global,
+          sources: sources.sources,
+        }),
+      )
+      if (body.scope === "global" && !hot) {
+        yield* disposeAllInstancesAndEmitGlobalDisposed({ swallowErrors: true }).pipe(
+          Effect.catchCause(() => Effect.void),
+        )
+      }
+      return output
     })
 
     const sources = Effect.fn("ConfigConsoleHttpApi.sources")(function* () {
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/indexing.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/indexing.ts
index 6c51d1cdaa..83813c5a32 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/indexing.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/indexing.ts
@@ -9,6 +9,10 @@ export const indexingHandlers = HttpApiBuilder.group(InstanceHttpApi, "indexing"
     const status = Effect.fn("IndexingHttpApi.status")(function* () {
       return yield* EffectBridge.fromPromise(() => mod.KiloIndexing.current())
     })
+    const consent = Effect.fn("IndexingHttpApi.consent")(function* (ctx: { payload: { enabled: boolean } }) {
+      yield* EffectBridge.fromPromise(() => mod.KiloIndexing.setConsent(ctx.payload.enabled))
+      return yield* EffectBridge.fromPromise(() => mod.KiloIndexing.current())
+    })
     const models = Effect.fn("IndexingHttpApi.models")(function* () {
       return yield* EffectBridge.fromPromise(() => mod.KiloIndexing.models())
     })
@@ -16,6 +20,10 @@ export const indexingHandlers = HttpApiBuilder.group(InstanceHttpApi, "indexing"
       return yield* EffectBridge.fromPromise(() => mod.KiloIndexing.warnings())
     })
 
-    return handlers.handle("status", status).handle("models", models).handle("warnings", warnings)
+    return handlers
+      .handle("status", status)
+      .handle("consent", consent)
+      .handle("models", models)
+      .handle("warnings", warnings)
   }),
 )
diff --git a/packages/opencode/src/kilocode/server/httpapi/server.ts b/packages/opencode/src/kilocode/server/httpapi/server.ts
index 02e72ea4ce..5c1afeee40 100644
--- a/packages/opencode/src/kilocode/server/httpapi/server.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/server.ts
@@ -7,6 +7,7 @@ import { errorLayer } from "@/server/routes/instance/httpapi/middleware/error"
 import { fenceLayer } from "@/server/routes/instance/httpapi/middleware/fence"
 import * as AnacondaDesktop from "@/kilocode/anaconda-desktop/service"
 import { BackgroundJob } from "@/background/job"
+import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
 
 import { KiloViewers } from "@/kilocode/presence/service" // kilocode_change
 import { agentBuilderHandlers } from "./handlers/agent-builder"
@@ -66,6 +67,7 @@ export function provideListener(opts?: CorsOptions) {
     fenceLayer,
     cors,
     KiloViewers.defaultLayer, // kilocode_change
+    EffectFlock.defaultLayer,
     FetchHttpClient.layer,
     HttpServer.layerServices,
     Layer.succeed(CorsConfig)(opts),
diff --git a/packages/opencode/src/kilocode/session/event.ts b/packages/opencode/src/kilocode/session/event.ts
index 47025588a8..e8a851211e 100644
--- a/packages/opencode/src/kilocode/session/event.ts
+++ b/packages/opencode/src/kilocode/session/event.ts
@@ -2,7 +2,10 @@ import { BusEvent } from "@/bus/bus-event"
 import { MessageID, SessionID } from "@/session/schema"
 import { Schema } from "effect"
 
-const CloseReason = Schema.Literals(["completed", "error", "interrupted"])
+// "superseded": the turn handed off to a queued follow-up after draining its
+// current step. Distinct from "interrupted" so clients do not surface a
+// premature-stop warning for a deliberate queue handoff.
+const CloseReason = Schema.Literals(["completed", "error", "interrupted", "superseded"])
 
 export const KiloSessionEvent = {
   TurnOpen: BusEvent.define(
diff --git a/packages/opencode/src/kilocode/session/prompt.ts b/packages/opencode/src/kilocode/session/prompt.ts
index a1fa29b806..ee05f45358 100644
--- a/packages/opencode/src/kilocode/session/prompt.ts
+++ b/packages/opencode/src/kilocode/session/prompt.ts
@@ -1,7 +1,6 @@
 // kilocode_change - new file
 import path from "path"
 import fs from "fs/promises"
-import { StringDecoder } from "string_decoder"
 import { Cause, Effect, Exit, Fiber, Scope } from "effect"
 import { SessionID, PartID } from "@/session/schema"
 import { MessageV2 } from "@/session/message-v2"
@@ -377,25 +376,6 @@ export namespace KiloSessionPrompt {
     }
   }
 
-  /**
-   * Creates StringDecoder-based helpers for shell stdout/stderr that correctly
-   * handle multi-byte UTF-8 characters split across chunks.
-   */
-  export function createShellDecoders() {
-    const stdout = new StringDecoder("utf8")
-    const stderr = new StringDecoder("utf8")
-    return {
-      /** Decode a chunk from the given stream. */
-      write(stream: "stdout" | "stderr", chunk: Buffer) {
-        return stream === "stdout" ? stdout.write(chunk) : stderr.write(chunk)
-      },
-      /** Flush any trailing buffered bytes from both decoders. */
-      flush() {
-        return stdout.end() + stderr.end()
-      },
-    }
-  }
-
   /**
    * Ensures the plan file directory exists. Pre-checks with `Filesystem.isDir`
    * because `fs.mkdir(recursive: true)` still throws `EEXIST` on Windows
@@ -455,12 +435,6 @@ export namespace KiloSessionPrompt {
     add(`<system-reminder>\n${body}\n</system-reminder>`)
   }
 
-  /**
-   * Returns the CODE_SWITCH prompt text (plan-to-code transition).
-   * Used when switching from plan agent to code agent.
-   */
-  export const CODE_SWITCH_TEXT = CODE_SWITCH
-
   /**
    * Determines the close reason for a session turn.
    * Checks for an explicit reason first (e.g. set on error during runLoop),
diff --git a/packages/opencode/src/kilocode/skill/discovery-validate.ts b/packages/opencode/src/kilocode/skill/discovery-validate.ts
new file mode 100644
index 0000000000..1887189267
--- /dev/null
+++ b/packages/opencode/src/kilocode/skill/discovery-validate.ts
@@ -0,0 +1,45 @@
+import { posix, win32 } from "node:path"
+
+// Segment/relative-path validation for remotely-discovered skills. The remote index controls
+// skill.name and each file path, so validate them before they become cache write targets: reject
+// traversal, absolute paths, URLs, and null bytes. Mirrors core v2 SkillDiscovery.
+
+export function isSafeSegment(value: string) {
+  return (
+    value.length > 0 &&
+    value !== "." &&
+    value !== ".." &&
+    !value.includes("/") &&
+    !value.includes("\\") &&
+    !value.includes("\0")
+  )
+}
+
+export function isSafeRelativePath(value: string) {
+  const segments = value.split("/")
+  return (
+    value.length > 0 &&
+    !value.includes("\\") &&
+    !value.includes("\0") &&
+    !value.includes("?") &&
+    !value.includes("#") &&
+    !URL.canParse(value) &&
+    !posix.isAbsolute(value) &&
+    !win32.isAbsolute(value) &&
+    segments.every((segment) => {
+      try {
+        const decoded = decodeURIComponent(segment)
+        return (
+          decoded.length > 0 &&
+          decoded !== "." &&
+          decoded !== ".." &&
+          !decoded.includes("/") &&
+          !decoded.includes("\\") &&
+          !decoded.includes("\0")
+        )
+      } catch {
+        return false
+      }
+    })
+  )
+}
diff --git a/packages/opencode/src/kilocode/skill/trust.ts b/packages/opencode/src/kilocode/skill/trust.ts
new file mode 100644
index 0000000000..fbafa6e6a9
--- /dev/null
+++ b/packages/opencode/src/kilocode/skill/trust.ts
@@ -0,0 +1,28 @@
+import { realpathSync } from "fs"
+import path from "path"
+
+// A skill discovered under a trusted directory (~/.agents, ~/.claude, config dirs,
+// KILO_CONFIG_DIR) mints trust: shell execution after one approval, and unconfined
+// {env:}/{file:} substitution. Symlinks are followed during the scan, so a link from a
+// trusted dir into the current project (a commonly suggested convenience) would otherwise
+// grant project-controlled markdown that trust. Resolve the real path and drop trust when
+// it lands inside the project, so project content is never trusted regardless of symlinks.
+export function trustedInProject(match: string, projectRoot: string | undefined): boolean {
+  if (!projectRoot) return false
+  const real = (() => {
+    try {
+      return realpathSync.native(match)
+    } catch {
+      return match
+    }
+  })()
+  const root = (() => {
+    try {
+      return realpathSync.native(projectRoot)
+    } catch {
+      return projectRoot
+    }
+  })()
+  const rel = path.relative(root, real)
+  return rel === "" || (!rel.startsWith("..") && !path.isAbsolute(rel))
+}
diff --git a/packages/opencode/src/kilocode/skills/display.ts b/packages/opencode/src/kilocode/skills/display.ts
new file mode 100644
index 0000000000..dbfa54b1ce
--- /dev/null
+++ b/packages/opencode/src/kilocode/skills/display.ts
@@ -0,0 +1,35 @@
+// Markers inlined in place of a `!`cmd`` placeholder when it is not executed. Shared by the
+// skill tool (inject.ts) and the slash-command path (session/prompt.ts) so both render identically.
+export const SKILL_SHELL_DISABLED = "[skill shell execution disabled by policy]"
+export const SKILL_SHELL_UNTRUSTED = "[skill shell execution disabled for untrusted skill]"
+
+// Render a skill command for a permission prompt as a single, tamper-evident line.
+// Escape control chars (CR/LF/ESC/etc.) so a command can't repaint the terminal, and
+// bidi/format controls (U+202A-202E, U+2066-2069, U+200E/F, U+2028/9) so a Trojan-Source
+// style reorder can't make the visible text differ from what will execute.
+const CONTROL = /[\u0000-\u001f\u007f-\u009f\u200e\u200f\u2028\u2029\u202a-\u202e\u2066-\u2069]/g
+
+export function displayCommand(command: string) {
+  return command.replace(CONTROL, (ch) => {
+    if (ch === "\n") return "\\n"
+    if (ch === "\r") return "\\r"
+    if (ch === "\t") return "\\t"
+    const code = ch.charCodeAt(0)
+    return code <= 0xff ? "\\x" + code.toString(16).padStart(2, "0") : "\\u" + code.toString(16).padStart(4, "0")
+  })
+}
+
+// Presentation for a skill-shell permission prompt: the title (naming the skill when known)
+// and the verbatim, escaped commands to show. Reads metadata.commands (never the decomposed
+// patterns, which drop `cd` segments and split pipelines) so the display matches what executes.
+// Returns undefined when the request is not a skill-shell batch.
+export function skillShellPrompt(metadata: Record<string, unknown> | undefined) {
+  if (metadata?.["skillShell"] !== true) return undefined
+  const raw = metadata["commands"]
+  const commands = (Array.isArray(raw) ? raw : []).filter((c): c is string => typeof c === "string").map(displayCommand)
+  const skill = typeof metadata["skill"] === "string" ? metadata["skill"] : undefined
+  return {
+    title: skill ? `Run shell commands from skill "${skill}"?` : "Run these skill commands?",
+    commands,
+  }
+}
diff --git a/packages/opencode/src/kilocode/skills/inject.ts b/packages/opencode/src/kilocode/skills/inject.ts
new file mode 100644
index 0000000000..07f45863cf
--- /dev/null
+++ b/packages/opencode/src/kilocode/skills/inject.ts
@@ -0,0 +1,198 @@
+import { Effect } from "effect"
+import { ConfigMarkdown } from "@/config/markdown"
+import { Process } from "@/util/process"
+import { SKILL_SHELL_DISABLED, SKILL_SHELL_UNTRUSTED } from "@/kilocode/skills/display"
+import type * as Tool from "@/tool/tool"
+
+// Shell injection for skill bodies mirrors Claude's "dynamic context injection":
+// a `!`cmd`` placeholder in SKILL.md is replaced by the command's stdout before
+// the content reaches the model. Unlike the slash-command path, this runs for
+// model-initiated skill loads, so it is gated on three independent controls:
+//
+//   1. Trust: only skills from trusted sources (global ~/.claude, ~/.agents,
+//      KILO_CONFIG_DIR, and builtins) may execute. Untrusted project/downloaded
+//      skills never spawn a process.
+//   2. Kill-switch: `disabled` (KILO_DISABLE_SKILL_SHELL) turns injection off
+//      entirely, matching Claude's disableSkillShellExecution.
+//   3. Batch approval: every command in the file is decomposed with the same
+//      tree-sitter scan the bash tool uses (per sub-command patterns plus any
+//      out-of-project directories), then presented once, up front, in a single
+//      permission prompt. The `skillShell` marker forces this prompt regardless
+//      of any allow/auto-approve rule; a deny rule or plan-mode veto on any
+//      sub-command still blocks. Approve runs the batch; reject aborts the load.
+//
+// Trust and the kill-switch also gate the slash-command path (`/skill`, session/prompt.ts),
+// which is user-initiated. Batch approval (control 3) is specific to this model-initiated
+// tool path — the slash-command path is not prompted because the user invoked it directly.
+//
+// Substitution runs exactly once. Command output is inlined as plain text and is
+// never re-scanned, so a command cannot emit a `!`cmd`` placeholder that a later
+// pass would execute (second-order injection).
+
+// Execution bounds: model-initiated commands must not hang the load, blow up
+// context, or overrun the batch.
+const TIMEOUT_MS = 2 * 60 * 1000 // per-command
+const BUDGET_MS = 5 * 60 * 1000 // aggregate across the batch
+const MAX_OUTPUT_BYTES = 32 * 1024
+const MAX_COMMANDS = 32
+const LIMIT_NOTE = "[skill shell command limit reached]"
+
+export namespace SkillInject {
+  export type Decompose = (input: {
+    command: string
+    cwd: string
+    shell: string
+  }) => Effect.Effect<{ patterns: string[]; dirs: string[] }>
+
+  export type Options = {
+    content: string
+    trusted: boolean
+    disabled: boolean
+    cwd: string
+    skill: string
+    shell: string
+    ctx: Tool.Context
+    decompose: Decompose
+  }
+
+  export const render = Effect.fn("SkillInject.render")(function* (opts: Options) {
+    // Placeholders inside fenced code blocks are documentation examples, not live commands.
+    const fenced = fences(opts.content)
+    const live = ConfigMarkdown.shell(opts.content).filter((m) => !fenced(m.index))
+    if (live.length === 0) return opts.content
+
+    // Defense-in-depth ordering: policy checks first, approval gate last. `replace` only
+    // rewrites live (unfenced) placeholders; fenced ones stay as literal text.
+    const replace = (value: (command: string) => string) => rewrite(opts.content, fenced, value)
+    if (opts.disabled) return replace(() => SKILL_SHELL_DISABLED)
+    if (!opts.trusted) return replace(() => SKILL_SHELL_UNTRUSTED)
+
+    // `shell` is resolved by the caller via Shell.acceptable(cfg.shell), which
+    // rejects shells the tree-sitter bash scanner can't parse (fish/nu), keeping
+    // the parse used for the permission decision aligned with execution.
+    const shell = opts.shell
+    // Deduplicate identical commands, then cap the batch so a skill can't queue
+    // an unbounded number of processes.
+    const commands = Array.from(new Set(live.map(([, cmd]) => cmd))).slice(0, MAX_COMMANDS)
+
+    // Decompose each command into sub-command patterns + out-of-project dir globs
+    // via the shared bash scan, so plan-mode denies and external_directory checks
+    // apply per sub-command instead of matching the raw string as one glob. Also
+    // authorize the verbatim command: decomposition drops cd/set-location segments
+    // and strips chaining metacharacters, so a payload like `cd $HOME; cat secret`
+    // would otherwise slip past the metachar deny rules (`*;*`, `*|*`, `*\n*`) and
+    // hide the escape. Keeping the raw string as a pattern makes those rules fire.
+    const patterns = new Set<string>()
+    const dirs = new Set<string>()
+    for (const command of commands) {
+      patterns.add(command)
+      const scan = yield* opts.decompose({ command, cwd: opts.cwd, shell })
+      for (const pattern of scan.patterns) patterns.add(pattern)
+      for (const dir of scan.dirs) dirs.add(dir)
+    }
+
+    // Fail closed: an empty pattern set would make the bash ask below auto-approve
+    // (Permission.ask iterates patterns, so forceAsk/veto never run for an empty
+    // list). Each command contributes its verbatim string above, so this is
+    // unreachable — but abort rather than risk a silent, unprompted execution.
+    if (patterns.size === 0) return yield* Effect.die(new Error("skill shell produced no authorizable commands"))
+
+    // Single up-front approval. `patterns` are the decomposed sub-commands used for
+    // rule matching; `metadata.commands` is the verbatim per-placeholder list the
+    // prompt displays, so what is shown is exactly what runs (decomposition drops
+    // cd/set-location segments and splits pipelines, which must not hide from the
+    // user). `skillShell` forces the prompt over allow/YOLO rules; a deny/veto on
+    // any sub-command propagates as a defect and aborts.
+    const metadata = { skillShell: true, skill: opts.skill, commands }
+    if (dirs.size > 0) {
+      yield* opts.ctx.ask({
+        permission: "external_directory",
+        patterns: Array.from(dirs),
+        always: [],
+        metadata,
+      })
+    }
+    yield* opts.ctx.ask({
+      permission: "bash",
+      patterns: Array.from(patterns),
+      always: [],
+      metadata,
+    })
+
+    // Run each command in the instance directory, bounded per-command by ctx.abort (ESC)
+    // and a timeout, and across the batch by an aggregate wall-clock budget, with output
+    // truncated so it can't blow up or poison the prompt.
+    const outputs = new Map<string, string>()
+    const deadline = Date.now() + BUDGET_MS
+    for (const command of commands) {
+      if (Date.now() >= deadline) {
+        outputs.set(command, "[skill shell batch time budget exceeded]")
+        continue
+      }
+      outputs.set(command, yield* run(command, shell, opts.cwd, opts.ctx.abort))
+    }
+
+    // A placeholder that was capped out of `commands` isn't in `outputs`; mark it rather
+    // than silently inlining an empty string.
+    return replace((command) => outputs.get(command) ?? LIMIT_NOTE)
+  })
+
+  const run = Effect.fn("SkillInject.run")(function* (command: string, shell: string, cwd: string, abort: AbortSignal) {
+    const timeout = new AbortController()
+    // A cleared timer bounds the run without leaking a pending 2-minute timeout per command;
+    // ESC (ctx.abort) still kills the child via the same combined signal.
+    const signal = AbortSignal.any([abort, timeout.signal])
+    const timer = setTimeout(() => timeout.abort(), TIMEOUT_MS)
+    const result = yield* Effect.promise(() =>
+      Process.text([command], { shell, cwd, abort: signal, nothrow: true }).catch(() => undefined),
+    ).pipe(Effect.ensuring(Effect.sync(() => clearTimeout(timer))))
+
+    // With nothrow the promise resolves even when the child was killed, inlining partial
+    // stdout; detect the kill via the signals so an aborted/timed-out command is marked.
+    if (abort.aborted) return "[skill shell command aborted]"
+    if (timeout.signal.aborted) return "[skill shell command timed out]"
+    if (!result) return "[skill shell command failed]"
+    // A failing command with empty stdout would inline ""; surface a marker with any stderr.
+    if (result.code !== 0 && result.text.length === 0) {
+      const err = result.stderr.toString().trim()
+      return err ? "[skill shell command failed]\n" + truncate(err) : "[skill shell command failed]"
+    }
+    return truncate(result.text)
+  })
+
+  // Byte-accurate truncation: slice on a Buffer so a multibyte tail can't exceed the cap.
+  function truncate(text: string) {
+    const buf = Buffer.from(text)
+    if (buf.byteLength <= MAX_OUTPUT_BYTES) return text
+    return buf.toString("utf8", 0, MAX_OUTPUT_BYTES) + "\n[skill shell output truncated]"
+  }
+
+  // Rewrite only live (unfenced) placeholders in the ORIGINAL content, substituting once and
+  // never re-scanning the result, so inlined output containing `!`cmd`` stays inert and a
+  // fenced documentation example is left as literal text.
+  function rewrite(content: string, fenced: (index: number) => boolean, value: (command: string) => string) {
+    return content.replace(ConfigMarkdown.SHELL_REGEX, (match, command: string, index: number) =>
+      fenced(index) ? match : value(command),
+    )
+  }
+
+  // Return a predicate that reports whether a character offset falls inside a fenced code
+  // block (``` or ~~~), so placeholders in documentation examples are treated as inert.
+  function fences(content: string): (index: number) => boolean {
+    const ranges: Array<[number, number]> = []
+    const fence = /^[ \t]*(`{3,}|~{3,})[^\n]*$/gm
+    let open: { start: number; marker: string } | undefined
+    for (const m of content.matchAll(fence)) {
+      const marker = m[1]
+      // CommonMark: a closing fence uses the same char and is at least as long as the opener,
+      // so an inner shorter/different fence stays content. Keep the real opener length.
+      if (!open) open = { start: m.index, marker }
+      else if (marker[0] === open.marker[0] && marker.length >= open.marker.length) {
+        ranges.push([open.start, m.index + m[0].length])
+        open = undefined
+      }
+    }
+    if (open) ranges.push([open.start, content.length]) // unterminated fence runs to EOF
+    return (index: number) => ranges.some(([s, e]) => index >= s && index < e)
+  }
+}
diff --git a/packages/opencode/src/kilocode/text-stream.ts b/packages/opencode/src/kilocode/text-stream.ts
index 82f2f6cd7c..bfaabd164e 100644
--- a/packages/opencode/src/kilocode/text-stream.ts
+++ b/packages/opencode/src/kilocode/text-stream.ts
@@ -62,11 +62,6 @@ export function abortable(stream: Readable, signal?: AbortSignal) {
   return signal ? addAbortSignal(signal, stream) : stream
 }
 
-/** UTF-8 text stream backed by an already-open file. */
-export function openUtf8(open: () => Readable, signal?: AbortSignal): Readable {
-  return utf8(open, signal).stream
-}
-
 export function safeSlice(text: string, end: number) {
   const sliced = text.slice(0, end)
   const last = sliced.charCodeAt(sliced.length - 1)
diff --git a/packages/opencode/src/kilocode/tool/websearch-kilo-exa.ts b/packages/opencode/src/kilocode/tool/websearch-kilo-exa.ts
new file mode 100644
index 0000000000..1e590b6c18
--- /dev/null
+++ b/packages/opencode/src/kilocode/tool/websearch-kilo-exa.ts
@@ -0,0 +1,74 @@
+// kilocode_change - new file
+import { Duration, Effect, Schema } from "effect"
+import { HttpClient, HttpClientRequest } from "effect/unstable/http"
+import { KILO_API_BASE } from "@kilocode/kilo-gateway"
+
+export const KILO_EXA_URL = `${KILO_API_BASE}/api/exa/search`
+export const MAX_KILO_EXA_RESULTS = 10
+
+const ExaResult = Schema.Struct({
+  title: Schema.optional(Schema.String),
+  url: Schema.String,
+  publishedDate: Schema.optional(Schema.String),
+  author: Schema.optional(Schema.String),
+  highlights: Schema.optional(Schema.Array(Schema.String)),
+})
+
+const ExaResponse = Schema.Struct({
+  results: Schema.Array(ExaResult),
+})
+
+const NO_RESULTS = "No search results found. Please try a different query."
+
+const formatResults = (data: Schema.Schema.Type<typeof ExaResponse>): string => {
+  if (data.results.length === 0) return NO_RESULTS
+  return data.results
+    .map((r, i) => {
+      const head = `[${i + 1}] ${r.title ?? r.url}\n${r.url}${r.publishedDate ? ` (${r.publishedDate})` : ""}`
+      const hl = r.highlights?.length ? `\n${r.highlights.map((h) => `> ${h}`).join("\n")}` : ""
+      return `${head}${hl}`
+    })
+    .join("\n\n")
+}
+
+export type KiloExaParams = {
+  query: string
+  type?: string
+  numResults?: number
+}
+
+export const callKiloExa = Effect.fn("WebSearchKiloExa.call")(function* (
+  http: HttpClient.HttpClient,
+  params: KiloExaParams,
+  kiloToken: string,
+) {
+  const numResults = Math.min(params.numResults ?? MAX_KILO_EXA_RESULTS, MAX_KILO_EXA_RESULTS)
+  const request = yield* HttpClientRequest.post(KILO_EXA_URL).pipe(
+    HttpClientRequest.bearerToken(kiloToken),
+    HttpClientRequest.acceptJson,
+    HttpClientRequest.bodyJson({
+      query: params.query,
+      type: params.type ?? "auto",
+      numResults,
+      contents: { highlights: true },
+    }),
+  )
+  const response = yield* http.execute(request).pipe(
+    Effect.timeoutOrElse({
+      duration: Duration.seconds(25),
+      orElse: () => Effect.die(new Error("kilo exa request timed out")),
+    }),
+  )
+  const status = response.status
+  if (status === 401 || status === 403) {
+    return yield* Effect.die(new Error(`Kilo exa request unauthorized (${status}); sign in with \`kilo auth login\``))
+  }
+  if (status < 200 || status >= 300) {
+    const body = yield* response.text
+    return yield* Effect.die(new Error(`Kilo exa request failed (${status}): ${body.slice(0, 200)}`))
+  }
+  const data = yield* response.json
+  const decode = Schema.decodeUnknownEffect(ExaResponse)
+  const parsed = yield* decode(data).pipe(Effect.orDie)
+  return formatResults(parsed)
+})
diff --git a/packages/opencode/src/permission/index.ts b/packages/opencode/src/permission/index.ts
index f15feff563..9ce38c952f 100644
--- a/packages/opencode/src/permission/index.ts
+++ b/packages/opencode/src/permission/index.ts
@@ -155,6 +155,7 @@ function subset(permission: string, ruleset: Ruleset) {
 
 function covered(entry: PendingEntry, approved: Ruleset, local: Ruleset) {
   if (ConfigProtection.isRequest(entry.info)) return false
+  if (entry.info.metadata?.["skillShell"] === true) return false // kilocode_change - skill batch needs an explicit reply
   return entry.info.patterns.every((pattern) => {
     if (veto(entry.info.permission, pattern, entry.hardRuleset)) return false
     return resolve(entry.info.permission, pattern, entry.ruleset, approved, local).action === "allow"
@@ -221,6 +222,7 @@ export const layer = Layer.effect(
         : false
       // kilocode_change end
 
+      const forceAsk = request.metadata?.["skillShell"] === true // kilocode_change
       for (const pattern of request.patterns) {
         const rule = resolve(request.permission, pattern, ruleset, approved, local) // kilocode_change — include session-scoped rules
         yield* Effect.logInfo("evaluated", { permission: request.permission, pattern, action: rule })
@@ -234,6 +236,12 @@ export const layer = Layer.effect(
             ruleset: subset(request.permission, ruleset), // kilocode_change
           })
         }
+        // kilocode_change start - skill shell forces a prompt instead of honoring an allow/auto-approve rule
+        if (forceAsk) {
+          needsAsk = true
+          continue
+        }
+        // kilocode_change end
         // kilocode_change start - override "allow" to "ask" for protected config paths
         if (rule.action === "allow" && (!isProtected || trusted)) {
           approvedRule = rule // remember the winning rule so callers can explain the auto-approval
@@ -290,6 +298,18 @@ export const layer = Layer.effect(
       const existing = pending.get(input.requestID)
       if (!existing) return yield* new PermissionV1.NotFoundError({ requestID: input.requestID })
 
+      // kilocode_change start - skill-shell batches must be answered by a human; ignore machine approvals
+      // (auto-approve/YOLO clients omit `interactive`) so the prompt stays pending for a real decision.
+      // Log rather than fail silently: a genuine human client sets `interactive`, so a refused reply here
+      // means an auto-approver tried to answer — the request intentionally stays pending for a human.
+      if (existing.info.metadata?.["skillShell"] === true && input.reply !== "reject" && input.interactive !== true) {
+        yield* Effect.logWarning("skill shell approval refused: requires an interactive human reply", {
+          id: input.requestID,
+        })
+        return
+      }
+      // kilocode_change end
+
       pending.delete(input.requestID)
       yield* events.publish(Event.Replied, {
         sessionID: existing.info.sessionID,
diff --git a/packages/opencode/src/plugin/openai/codex.ts b/packages/opencode/src/plugin/openai/codex.ts
index 262882669f..5a3a6fc9f9 100644
--- a/packages/opencode/src/plugin/openai/codex.ts
+++ b/packages/opencode/src/plugin/openai/codex.ts
@@ -29,7 +29,7 @@ const ALLOWED_MODELS = new Set([
   // kilocode_change end
 ])
 // kilocode_change start
-const DISALLOWED_MODELS = new Set(["gpt-5.5-pro"])
+const DISALLOWED_MODELS = new Set(["gpt-5.5-pro", "gpt-5.6"])
 // kilocode_change end
 
 interface PkceCodes {
diff --git a/packages/opencode/src/provider/error.ts b/packages/opencode/src/provider/error.ts
index f44435e9ee..aca393a252 100644
--- a/packages/opencode/src/provider/error.ts
+++ b/packages/opencode/src/provider/error.ts
@@ -109,10 +109,13 @@ export type ParsedStreamError =
 
 export function parseStreamError(input: unknown): ParsedStreamError | undefined {
   const raw = json(input)
-  const body = typeof raw?.message === "string" ? (json(raw.message) ?? raw) : raw
-  if (!body) return
+  // kilocode_change start - unwrap response.failed frames and bare provider error objects before the envelope gate
+  const original = typeof raw?.message === "string" ? (json(raw.message) ?? raw) : raw
+  if (!original) return
 
-  const responseBody = JSON.stringify(body)
+  const responseBody = JSON.stringify(original)
+  const body = KiloError.frame(original)
+  // kilocode_change end
   if (body.type !== "error") return
 
   switch (body?.error?.code) {
@@ -164,6 +167,7 @@ export function parseStreamError(input: unknown): ParsedStreamError | undefined
         responseBody,
       }
   }
+  return KiloError.fallback(body, responseBody) // kilocode_change - render unlisted provider error codes as clean messages
 }
 
 export type ParsedAPICallError =
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/permission.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/permission.ts
index daaa43534f..b9457ffc03 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/permission.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/permission.ts
@@ -12,6 +12,7 @@ const root = "/permission"
 const ReplyPayload = Schema.Struct({
   reply: PermissionV1.Reply,
   message: Schema.optional(Schema.String),
+  interactive: Schema.optional(Schema.Boolean), // kilocode_change - human-answered flag; gates skill-shell approvals
 })
 
 // kilocode_change start
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/permission.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/permission.ts
index ce9ee63f4b..b317cd794c 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/permission.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/permission.ts
@@ -30,6 +30,7 @@ export const permissionHandlers = HttpApiBuilder.group(InstanceHttpApi, "permiss
           requestID: ctx.params.requestID,
           reply: ctx.payload.reply,
           message: ctx.payload.message,
+          interactive: ctx.payload.interactive, // kilocode_change
         })
         .pipe(
           Effect.catchTag("Permission.NotFoundError", (error) =>
diff --git a/packages/opencode/src/server/routes/instance/httpapi/server.ts b/packages/opencode/src/server/routes/instance/httpapi/server.ts
index e6e1359e56..9aef07e512 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/server.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/server.ts
@@ -3,6 +3,7 @@ import { HttpApiBuilder, OpenApi } from "effect/unstable/httpapi"
 import { HttpClient, HttpMiddleware, HttpRouter, HttpServer, HttpServerResponse } from "effect/unstable/http"
 import * as Socket from "effect/unstable/socket/Socket"
 import { FSUtil } from "@opencode-ai/core/fs-util"
+import { EffectFlock } from "@opencode-ai/core/util/effect-flock" // kilocode_change
 import * as Observability from "@opencode-ai/core/observability"
 import { Account } from "@/account/account"
 import { Agent } from "@/agent/agent"
@@ -308,6 +309,7 @@ export function createRoutes(
       KiloViewers.defaultLayer,
       SyncEvent.defaultLayer,
       // kilocode_change end
+      EffectFlock.defaultLayer, // kilocode_change
       HttpServer.layerServices,
     ]),
     Layer.provide(LayerNode.buildLayer(app)),
@@ -318,9 +320,15 @@ export function createRoutes(
 
 // kilocode_change start - keep listener routes local while application services come from AppRuntime
 export function createListenerRoutes(corsOptions?: CorsOptions) {
-  return Layer.mergeAll(rootApiRoutes, eventApiRoutes, ptyConnectApiRoutes, instanceRoutes, serverRoutes, docRoute, uiRoute).pipe(
-    provideKiloListenerRoutes(corsOptions),
-  )
+  return Layer.mergeAll(
+    rootApiRoutes,
+    eventApiRoutes,
+    ptyConnectApiRoutes,
+    instanceRoutes,
+    serverRoutes,
+    docRoute,
+    uiRoute,
+  ).pipe(provideKiloListenerRoutes(corsOptions))
 }
 // kilocode_change end
 
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index f1520cc2e6..ad3377f7dc 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -4,6 +4,7 @@ import path from "path"
 import { SessionV1 } from "@opencode-ai/core/v1/session"
 import os from "os"
 import { KiloSessionPrompt } from "@/kilocode/session/prompt" // kilocode_change
+import { SKILL_SHELL_DISABLED, SKILL_SHELL_UNTRUSTED } from "@/kilocode/skills/display" // kilocode_change
 import { KiloSessionMessageOrder } from "@/kilocode/session/message-order" // kilocode_change
 import { KiloSessionPromptQueue } from "@/kilocode/session/prompt-queue" // kilocode_change
 import { KiloSession } from "@/kilocode/session" // kilocode_change
@@ -1848,9 +1849,11 @@ export const layer = Layer.effect(
           // kilocode_change start — break out so a newer queued prompt can take over
           // instead of starting another LLM step for the now-superseded turn. The
           // current handle.process has fully drained (tokens + inline tool calls) by
-          // the time we get here, so nothing is cut off.
+          // the time we get here, so nothing is cut off. The close reason is
+          // "superseded", not "interrupted": this is a deliberate queue handoff,
+          // not a premature stop, so clients must not flash an interruption warning.
           if (KiloSessionPromptQueue.hasFollowup(sessionID)) {
-            closeReasons.set(sessionID, "interrupted")
+            closeReasons.set(sessionID, "superseded")
             return "break" as const
           }
           // kilocode_change end
@@ -2033,7 +2036,15 @@ export const layer = Layer.effect(
       }
 
       const shellMatches = ConfigMarkdown.shell(template)
-      if (shellMatches.length > 0) {
+      // kilocode_change start - skill templates run !`cmd`` only when trusted and the kill-switch is off,
+      // mirroring the skill tool's gate (the slash-command path is user-initiated, so it is not prompted).
+      const skillTemplate = cmd.source === "skill"
+      const skillShellBlocked = skillTemplate && (cmd.trusted !== true || flags.disableSkillShell)
+      if (shellMatches.length > 0 && skillShellBlocked) {
+        const note = cmd.trusted !== true ? SKILL_SHELL_UNTRUSTED : SKILL_SHELL_DISABLED
+        template = template.replace(bashRegex, () => note)
+      } else if (shellMatches.length > 0) {
+        // kilocode_change end
         const cfg = yield* config.get()
         const sh = Shell.preferred(cfg.shell)
         // kilocode_change start
diff --git a/packages/opencode/src/skill/discovery.ts b/packages/opencode/src/skill/discovery.ts
index 0495bc637d..a44127273b 100644
--- a/packages/opencode/src/skill/discovery.ts
+++ b/packages/opencode/src/skill/discovery.ts
@@ -6,6 +6,7 @@ import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } fr
 import { withTransientReadRetry } from "@/util/effect-http-client"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Global } from "@opencode-ai/core/global"
+import { isSafeSegment, isSafeRelativePath } from "@/kilocode/skill/discovery-validate" // kilocode_change
 
 const skillConcurrency = 4
 const fileConcurrency = 8
@@ -47,8 +48,10 @@ export const layer: Layer.Layer<Service, never, FSUtil.Service | Path.Path | Htt
 
     const pull = Effect.fn("Discovery.pull")(function* (url: string) {
       const base = url.endsWith("/") ? url : `${url}/`
-      const index = new URL("index.json", base).href
-      const host = base.slice(0, -1)
+      // kilocode_change start - resolve the index origin so file downloads can be pinned to it
+      const source = new URL(base)
+      const index = new URL("index.json", source).href
+      // kilocode_change end
 
       yield* Effect.logInfo("fetching index", { url: index })
 
@@ -63,33 +66,52 @@ export const layer: Layer.Layer<Service, never, FSUtil.Service | Path.Path | Htt
 
       if (!data) return []
 
-      const missing = data.skills.filter((skill) => !skill.files.includes("SKILL.md"))
-      yield* Effect.forEach(
-        missing,
-        (skill) => Effect.logWarning("skill entry missing SKILL.md", { url: index, skill: skill.name }),
-        { discard: true },
-      )
-      const list = data.skills.filter((skill) => skill.files.includes("SKILL.md"))
+      // kilocode_change start - the remote index controls skill.name and file, so validate every segment,
+      // pin file downloads to the index origin, and confine writes to the cache (mirrors core v2 SkillDiscovery)
+      const contained = (parent: string, child: string) => {
+        const rel = path.relative(parent, child)
+        return rel !== "" && !rel.startsWith("..") && !path.isAbsolute(rel)
+      }
+      const plan = (skill: IndexSkill) => {
+        if (!skill.files.includes("SKILL.md")) return "skill entry missing SKILL.md"
+        if (!isSafeSegment(skill.name)) return "skipping skill with unsafe name"
+        const root = path.join(cache, skill.name)
+        if (!contained(cache, root)) return "skipping skill with unsafe name"
+        const skillUrl = new URL(`${encodeURIComponent(skill.name)}/`, source)
+        const files: { url: string; dest: string }[] = []
+        for (const file of skill.files) {
+          if (!isSafeRelativePath(file)) return "skipping skill with unsafe file path"
+          const resource = URL.parse(file, skillUrl) ?? undefined
+          if (!resource || resource.origin !== source.origin) return "skipping skill with cross-origin file"
+          const dest = path.join(root, file)
+          if (!contained(root, dest)) return "skipping skill with unsafe file path"
+          files.push({ url: resource.href, dest })
+        }
+        return { root, files }
+      }
 
+      const planned: { root: string; files: { url: string; dest: string }[] }[] = []
+      for (const skill of data.skills) {
+        const result = plan(skill)
+        if (typeof result === "string") yield* Effect.logWarning(result, { url: index, skill: skill.name })
+        else planned.push(result)
+      }
+      // kilocode_change end
+
+      // kilocode_change start - download each validated, origin-pinned, cache-confined plan
       const dirs = yield* Effect.forEach(
-        list,
+        planned,
         (skill) =>
           Effect.gen(function* () {
-            const root = path.join(cache, skill.name)
-
-            yield* Effect.forEach(
-              skill.files,
-              (file) => download(new URL(file, `${host}/${skill.name}/`).href, path.join(root, file)),
-              {
-                concurrency: fileConcurrency,
-              },
-            )
-
-            const md = path.join(root, "SKILL.md")
-            return (yield* fs.exists(md).pipe(Effect.orDie)) ? root : null
+            yield* Effect.forEach(skill.files, (file) => download(file.url, file.dest), {
+              concurrency: fileConcurrency,
+            })
+            const md = path.join(skill.root, "SKILL.md")
+            return (yield* fs.exists(md).pipe(Effect.orDie)) ? skill.root : null
           }),
         { concurrency: skillConcurrency },
       )
+      // kilocode_change end
 
       return dirs.filter((dir): dir is string => dir !== null)
     })
diff --git a/packages/opencode/src/skill/index.ts b/packages/opencode/src/skill/index.ts
index 2477093d9f..b74dfffbd9 100644
--- a/packages/opencode/src/skill/index.ts
+++ b/packages/opencode/src/skill/index.ts
@@ -20,6 +20,7 @@ import { primaryPaths } from "../kilocode/primary-worktree" // kilocode_change
 import { Git } from "@/git" // kilocode_change
 import { isRecord } from "@/util/record"
 import { Flag } from "@opencode-ai/core/flag/flag" // kilocode_change
+import { trustedInProject } from "../kilocode/skill/trust" // kilocode_change
 
 const CLAUDE_EXTERNAL_DIR = ".claude"
 const AGENTS_EXTERNAL_DIR = ".agents"
@@ -35,6 +36,7 @@ export const Info = Schema.Struct({
   description: Schema.optional(Schema.String),
   location: Schema.String,
   content: Schema.String,
+  trusted: Schema.optional(Schema.Boolean), // kilocode_change - gate skill shell injection to trusted sources
 })
 export type Info = Schema.Schema.Type<typeof Info>
 
@@ -151,6 +153,7 @@ const add = Effect.fnUntraced(function* (state: State, match: Match, events: Eve
     description: md.data.description,
     location: match.path, // kilocode_change
     content: md.content,
+    trusted: match.trusted, // kilocode_change
   }
 })
 
@@ -158,7 +161,7 @@ const scan = Effect.fnUntraced(function* (
   state: ScanState,
   root: string,
   pattern: string,
-  opts?: { dot?: boolean; scope?: string; trusted?: boolean; root?: string; sourceRoot?: string }, // kilocode_change
+  opts?: { dot?: boolean; scope?: string; trusted?: boolean; root?: string; sourceRoot?: string; projectRoot?: string }, // kilocode_change
 ) {
   const matches = yield* Effect.tryPromise({
     try: () =>
@@ -180,12 +183,14 @@ const scan = Effect.fnUntraced(function* (
   )
 
   for (const match of matches) {
-    // kilocode_change start
+    // kilocode_change start - a trusted match whose realpath resolves inside the project (e.g. a
+    // symlink from ~/.agents/skills into the repo) must not mint trust for project-controlled content
+    const trusted = (opts?.trusted ?? false) && !trustedInProject(match, opts?.projectRoot)
     state.matches.set(match, {
       path: match,
-      trusted: opts?.trusted ?? false,
-      root: opts?.root,
-      sourceRoot: opts?.sourceRoot,
+      trusted,
+      root: trusted ? opts?.root : (opts?.root ?? opts?.projectRoot),
+      sourceRoot: trusted ? opts?.sourceRoot : (opts?.sourceRoot ?? opts?.projectRoot),
     })
     // kilocode_change end
     state.dirs.add(path.dirname(match))
@@ -213,7 +218,7 @@ const discoverSkills = Effect.fnUntraced(function* (
     for (const dir of externalDirs) {
       const root = path.join(global.home, dir)
       if (!(yield* fsys.isDir(root))) continue
-      yield* scan(state, root, EXTERNAL_SKILL_PATTERN, { dot: true, scope: "global", trusted: true }) // kilocode_change
+      yield* scan(state, root, EXTERNAL_SKILL_PATTERN, { dot: true, scope: "global", trusted: true, projectRoot }) // kilocode_change
     }
 
     // kilocode_change start
@@ -250,6 +255,7 @@ const discoverSkills = Effect.fnUntraced(function* (
       trusted,
       root: trusted ? undefined : projectRoot,
       sourceRoot: trusted ? undefined : sourceRoot,
+      projectRoot,
     })
     // kilocode_change end
   }
@@ -266,7 +272,11 @@ const discoverSkills = Effect.fnUntraced(function* (
     // kilocode_change start - trust follows the config source that declared the path, never the selected path.
     const origin = cfg.skill_path_origins?.[item]
     const trusted = origin?.trusted === true && path.isAbsolute(expanded)
-    yield* scan(state, dir, SKILL_PATTERN, { trusted, root: trusted ? undefined : (origin?.root ?? projectRoot) })
+    yield* scan(state, dir, SKILL_PATTERN, {
+      trusted,
+      root: trusted ? undefined : (origin?.root ?? projectRoot),
+      projectRoot,
+    })
     // kilocode_change end
   }
 
@@ -295,6 +305,7 @@ const loadSkills = Effect.fnUntraced(function* (
       description: skill.description,
       location: BUILTIN_LOCATION,
       content: skill.content,
+      trusted: true, // kilocode_change - builtin skills ship in the binary
     }
   }
   // kilocode_change end
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 36a5199ebe..626f88b25c 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -334,9 +334,11 @@ export const layer = Layer.effect(
     // kilocode_change end
 
     const tools: Interface["tools"] = Effect.fn("ToolRegistry.tools")(function* (input) {
+      const cfg = yield* config.get() // kilocode_change
       const filtered = (yield* all()).filter((tool) => {
         if (!KiloToolRegistry.available(tool, input.agent)) return false // kilocode_change
         if (tool.id === WebSearchTool.id) {
+          if (cfg.web_search === true) return true // kilocode_change
           return webSearchEnabled(input.providerID, { exa: flags.enableExa, parallel: flags.enableParallel })
         }
 
diff --git a/packages/opencode/src/tool/shell.ts b/packages/opencode/src/tool/shell.ts
index 27b73acae0..b011f4b3c4 100644
--- a/packages/opencode/src/tool/shell.ts
+++ b/packages/opencode/src/tool/shell.ts
@@ -433,7 +433,24 @@ export const ShellPermission = Effect.gen(function* () {
     )
   })
 
-  return { ask: check, resolve }
+  // kilocode_change start - expose the tree-sitter scan (sub-command patterns + external-dir globs) for skill-shell batching
+  const dirGlob = (dir: string) =>
+    process.platform === "win32" ? FSUtil.normalizePathPattern(path.join(dir, "*")) : path.join(dir, "*")
+  const decompose = Effect.fn("ShellTool.decompose")(function* (input: { command: string; cwd: string; shell: string }) {
+    const instance = yield* InstanceState.context
+    const ps = Shell.ps(input.shell)
+    return yield* Effect.scoped(
+      Effect.gen(function* () {
+        const tree = yield* Effect.acquireRelease(parse(input.command, ps), (tree) => Effect.sync(() => tree.delete()))
+        const scan = yield* collect(tree.rootNode, input.cwd, ps, input.shell, instance)
+        if (!containsPath(input.cwd, instance)) scan.dirs.add(input.cwd)
+        return { patterns: Array.from(scan.patterns), dirs: Array.from(scan.dirs, dirGlob) }
+      }),
+    )
+  })
+  // kilocode_change end
+
+  return { ask: check, resolve, decompose } // kilocode_change - decompose for skill-shell
 })
 // kilocode_change end
 
diff --git a/packages/opencode/src/tool/skill.ts b/packages/opencode/src/tool/skill.ts
index 4b84989504..faa949c0c9 100644
--- a/packages/opencode/src/tool/skill.ts
+++ b/packages/opencode/src/tool/skill.ts
@@ -5,6 +5,14 @@ import { Ripgrep } from "@opencode-ai/core/ripgrep"
 import { Skill } from "../skill"
 import * as Tool from "./tool"
 import DESCRIPTION from "./skill.txt"
+// kilocode_change start - gate + run shell injection in skill bodies
+import { Config } from "@/config/config"
+import { Shell } from "@opencode-ai/core/shell"
+import { InstanceState } from "@/effect/instance-state"
+import { RuntimeFlags } from "@/effect/runtime-flags"
+import { ShellPermission } from "./shell"
+import { SkillInject } from "@/kilocode/skills/inject"
+// kilocode_change end
 
 export const Parameters = Schema.Struct({
   name: Schema.String.annotate({ description: "The name of the skill from available_skills" }),
@@ -15,6 +23,9 @@ export const SkillTool = Tool.define(
   Effect.gen(function* () {
     const skill = yield* Skill.Service
     const ripgrep = yield* Ripgrep.Service
+    const flags = yield* RuntimeFlags.Service // kilocode_change
+    const permission = yield* ShellPermission // kilocode_change - decompose skill commands like the bash tool
+    const config = yield* Config.Service // kilocode_change - resolve a parseable shell for injection
 
     return {
       description: DESCRIPTION,
@@ -32,6 +43,20 @@ export const SkillTool = Tool.define(
             metadata: {},
           })
 
+          // kilocode_change start - render `!`cmd`` shell injection, gated by trust + kill-switch + batch approval
+          const cfg = yield* config.get()
+          const content = yield* SkillInject.render({
+            content: info.content,
+            trusted: info.trusted === true,
+            disabled: flags.disableSkillShell,
+            cwd: yield* InstanceState.directory,
+            skill: info.name,
+            shell: Shell.acceptable(cfg.shell),
+            ctx,
+            decompose: permission.decompose,
+          })
+          // kilocode_change end
+
           // kilocode_change start - built-in skills have no filesystem directory
           if (info.location === Skill.BUILTIN_LOCATION) {
             return {
@@ -40,7 +65,7 @@ export const SkillTool = Tool.define(
                 `<skill_content name="${info.name}">`,
                 `# Skill: ${info.name}`,
                 "",
-                info.content.trim(),
+                content.trim(), // kilocode_change
                 "</skill_content>",
               ].join("\n"),
               metadata: {
@@ -68,7 +93,7 @@ export const SkillTool = Tool.define(
               `<skill_content name="${info.name}">`,
               `# Skill: ${info.name}`,
               "",
-              info.content.trim(),
+              content.trim(), // kilocode_change
               "",
               `Base directory for this skill: ${base}`,
               "Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.",
diff --git a/packages/opencode/src/tool/websearch.ts b/packages/opencode/src/tool/websearch.ts
index 12da7fbb3a..9a812cfc62 100644
--- a/packages/opencode/src/tool/websearch.ts
+++ b/packages/opencode/src/tool/websearch.ts
@@ -1,16 +1,20 @@
-import { Effect, Schema } from "effect"
+import { Effect, Option, Schema } from "effect" // kilocode_change - Option added for kilo-exa transport dispatch
 import { HttpClient } from "effect/unstable/http"
 import * as Tool from "./tool"
 import * as McpWebSearch from "./mcp-websearch"
+import * as KiloExa from "@/kilocode/tool/websearch-kilo-exa" // kilocode_change - Kilo-REST Exa transport
 import DESCRIPTION from "./websearch.txt"
 import { checksum } from "@opencode-ai/core/util/encode"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { RuntimeFlags } from "@/effect/runtime-flags"
+import { Auth } from "@/auth" // kilocode_change - source Kilo bearer for Kilo-REST transport
+
+const MAX_RESULTS = 10 // kilocode_change - cap numResults across all transports
 
 export const Parameters = Schema.Struct({
   query: Schema.String.annotate({ description: "Websearch query" }),
   numResults: Schema.optional(Schema.Number).annotate({
-    description: "Number of search results to return (default: 8)",
+    description: "Number of search results to return (default: 8, maximum: 10)", // kilocode_change - note MAX_RESULTS cap
   }),
   livecrawl: Schema.optional(Schema.Literals(["fallback", "preferred"])).annotate({
     description:
@@ -24,12 +28,12 @@ export const Parameters = Schema.Struct({
   }),
 })
 
-const WebSearchProviderSchema = Schema.Literals(["exa", "parallel"])
+const WebSearchProviderSchema = Schema.Literals(["exa", "parallel", "kilo-exa"]) // kilocode_change - kilo-exa env override
 export type WebSearchProvider = Schema.Schema.Type<typeof WebSearchProviderSchema>
 
 export function selectWebSearchProvider(sessionID: string, flags = { exa: false, parallel: false }): WebSearchProvider {
   const override = process.env.KILO_WEBSEARCH_PROVIDER
-  if (override === "exa" || override === "parallel") return override
+  if (override === "exa" || override === "parallel" || override === "kilo-exa") return override // kilocode_change - kilo-exa env override
   if (flags.parallel) return "parallel"
   if (flags.exa) return "exa"
 
@@ -38,7 +42,7 @@ export function selectWebSearchProvider(sessionID: string, flags = { exa: false,
 
 export function webSearchProviderLabel(provider: unknown) {
   if (provider === "parallel") return "Parallel Web Search"
-  if (provider === "exa") return "Exa Web Search"
+  if (provider === "exa" || provider === "kilo-exa") return "Exa Web Search" // kilocode_change - kilo-exa shares label
   return "Web Search"
 }
 
@@ -88,7 +92,7 @@ function callProvider(
     {
       query: params.query,
       type: params.type || "auto",
-      numResults: params.numResults || 8,
+      numResults: Math.min(params.numResults || 8, MAX_RESULTS), // kilocode_change - cap at MAX_RESULTS
       livecrawl: params.livecrawl || "fallback",
       contextMaxCharacters: params.contextMaxCharacters,
     },
@@ -101,6 +105,7 @@ export const WebSearchTool = Tool.define(
   Effect.gen(function* () {
     const http = yield* HttpClient.HttpClient
     const flags = yield* RuntimeFlags.Service
+    const authSvc = yield* Auth.Service // kilocode_change - source Kilo bearer for Kilo-REST transport
 
     return {
       get description() {
@@ -114,7 +119,36 @@ export const WebSearchTool = Tool.define(
             parallel: flags.enableParallel,
           })
           const title = webSearchProviderLabel(provider)
-          yield* ctx.metadata({ title: `${title} "${params.query}"`, metadata: { provider } })
+          // kilocode_change start - Kilo-REST Exa transport
+          // Precedence:
+          //   provider="kilo-exa"          -> kilo-rest  (auth required)
+          //   provider="exa" + EXA_API_KEY -> mcp-exa-byok     (BYOK wins)
+          //   provider="exa" + Kilo auth   -> kilo-rest        (new default for authed users)
+          //   provider="exa" + no auth     -> mcp-exa-unauth   (preserves current fallback)
+          //   provider="parallel"          -> mcp-parallel     (unchanged)
+          const kiloToken = yield* Effect.gen(function* () {
+            if (provider !== "exa" && provider !== "kilo-exa") return undefined as string | undefined
+            const info = yield* authSvc.get("kilo")
+            if (!info) return undefined
+            return info.type === "api" ? info.key : info.type === "oauth" ? info.access : undefined
+          })
+          const transport =
+            provider === "kilo-exa"
+              ? "kilo-rest"
+              : provider === "parallel"
+                ? "mcp-parallel"
+                : provider === "exa" && process.env.EXA_API_KEY
+                  ? "mcp-exa-byok"
+                  : provider === "exa" && kiloToken
+                    ? "kilo-rest"
+                    : "mcp-exa-unauth"
+          // kilocode_change end
+          // kilocode_change start - add transport to metadata
+          yield* ctx.metadata({
+            title: `${title} "${params.query}"`,
+            metadata: { provider, transport },
+          })
+          // kilocode_change end
 
           yield* ctx.ask({
             permission: "websearch",
@@ -130,12 +164,26 @@ export const WebSearchTool = Tool.define(
             },
           })
 
-          const result = yield* callProvider(http, provider, params, ctx)
+          // kilocode_change start - dispatch Kilo-REST transport
+          const result = yield* transport === "kilo-rest"
+            ? kiloToken
+              ? KiloExa.callKiloExa(
+                  http,
+                  {
+                    query: params.query,
+                    type: params.type,
+                    numResults: params.numResults,
+                  },
+                  kiloToken,
+                )
+              : Effect.die(new Error("KILO_WEBSEARCH_PROVIDER=kilo-exa requires Kilo auth; run `kilo auth login`"))
+            : callProvider(http, provider, params, ctx)
+          // kilocode_change end
 
           return {
             output: result ?? "No search results found. Please try a different query.",
             title: `${title}: ${params.query}`,
-            metadata: { provider },
+            metadata: { provider, transport }, // kilocode_change - add transport
           }
         }).pipe(Effect.orDie),
     }
diff --git a/packages/opencode/test/acp/permission.test.ts b/packages/opencode/test/acp/permission.test.ts
index 080c8eeceb..f789086d37 100644
--- a/packages/opencode/test/acp/permission.test.ts
+++ b/packages/opencode/test/acp/permission.test.ts
@@ -162,7 +162,11 @@ describe("acp permissions", () => {
         { optionId: "reject", kind: "reject_once", name: "Reject" },
       ],
     })
-    expect(harness.replies).toEqual([{ requestID: "perm_1", reply: "once", directory: "/workspace" }])
+    // kilocode_change start - human selections are marked interactive
+    expect(harness.replies).toEqual([
+      { requestID: "perm_1", reply: "once", directory: "/workspace", interactive: true },
+    ])
+    // kilocode_change end
   })
 
   it("forwards external_directory metadata and locations to requestPermission", async () => {
@@ -201,6 +205,39 @@ describe("acp permissions", () => {
     })
   })
 
+  // kilocode_change start - skill shell batches surface their command list and cannot be persisted
+  it("forwards skill shell commands and omits the persist option", async () => {
+    const harness = createHarness()
+    await createSession(harness.session, "ses_a")
+
+    harness.subscription.handle(
+      permissionAsked("ses_a", "perm_skill", {
+        permission: "bash",
+        // metadata.commands carries the verbatim command list the injector sends
+        metadata: { skillShell: true, commands: ["git status", "printf hi"] },
+        tool: { messageID: "msg_1", callID: "call_1" },
+      }),
+    )
+
+    await pollUntil(() => harness.replies.length === 1, "skill shell permission was never replied")
+
+    expect(harness.requests[0]).toMatchObject({
+      toolCall: {
+        title: "Run skill shell commands",
+        rawInput: { skillShell: true, commands: ["git status", "printf hi"] },
+      },
+      // no allow_always: skill shell is never persisted
+      options: [
+        { optionId: "once", kind: "allow_once", name: "Allow" },
+        { optionId: "reject", kind: "reject_once", name: "Reject" },
+      ],
+    })
+    expect(harness.requests[0].options.some((o) => o.kind === "allow_always")).toBe(false)
+    // the human selection is marked interactive so the server accepts the approval
+    expect(harness.replies[0]).toMatchObject({ requestID: "perm_skill", reply: "once", interactive: true })
+  })
+  // kilocode_change end
+
   it("rejects non-selected outcomes", async () => {
     const harness = createHarness(() => Promise.resolve({ outcome: { outcome: "cancelled" } }))
     await createSession(harness.session, "ses_a")
diff --git a/packages/opencode/test/cli/run/permission.shared.test.ts b/packages/opencode/test/cli/run/permission.shared.test.ts
index aa843ccbbc..75eb76f2ba 100644
--- a/packages/opencode/test/cli/run/permission.shared.test.ts
+++ b/packages/opencode/test/cli/run/permission.shared.test.ts
@@ -6,6 +6,7 @@ import {
   permissionCancel,
   permissionEscape,
   permissionInfo,
+  permissionOptions, // kilocode_change
   permissionReject,
   permissionRun,
 } from "@/cli/cmd/run/permission.shared"
@@ -29,6 +30,7 @@ describe("run permission shared", () => {
     expect(out.reply).toEqual({
       requestID: "perm-1",
       reply: "once",
+      interactive: true, // kilocode_change
     })
   })
 
@@ -41,6 +43,7 @@ describe("run permission shared", () => {
     expect(permissionRun(next.state, "perm-1", "confirm").reply).toEqual({
       requestID: "perm-1",
       reply: "always",
+      interactive: true, // kilocode_change
     })
 
     expect(permissionRun(next.state, "perm-1", "cancel").state).toMatchObject({
@@ -57,6 +60,7 @@ describe("run permission shared", () => {
     expect(out).toEqual({
       requestID: "perm-1",
       reply: "reject",
+      interactive: true, // kilocode_change
       message: "use rg",
     })
 
@@ -130,6 +134,13 @@ describe("run permission shared", () => {
     })
   })
 
+  // kilocode_change start - skill-shell options
+  test("skill shell offers only Allow / Reject (never Allow always)", () => {
+    expect(permissionOptions("permission", true)).toEqual(["once", "reject"])
+    expect(permissionOptions("permission")).toEqual(["once", "always", "reject"])
+  })
+  // kilocode_change end
+
   test("formats always-allow copy for wildcard and explicit patterns", () => {
     expect(permissionAlwaysLines(req({ permission: "bash", always: ["*"] }))).toEqual([
       "This will allow bash until Kilo is restarted.",
diff --git a/packages/opencode/test/cli/run/run-process.test.ts b/packages/opencode/test/cli/run/run-process.test.ts
index 9d2d013ac0..f50ad1c796 100644
--- a/packages/opencode/test/cli/run/run-process.test.ts
+++ b/packages/opencode/test/cli/run/run-process.test.ts
@@ -47,19 +47,75 @@ describe("opencode run (non-interactive subprocess)", () => {
   // kilocode_change end
 
   // kilocode_change start
-  // Locks in the current behavior: when the LLM stream errors mid-response
-  // (the prompt was accepted, then the upstream provider failed), opencode
-  // emits a session.error event and the process exits 0 today.
-  //
-  // This is debatable — a future cleanup might flip it to exit 1. If you're
-  // changing this expectation, do it deliberately and say so in the PR.
+  // Was: "mid-stream LLM error still exits 0 today (contract lock-in)" using
+  // llm.fail(...). That fixture never published a session.error the CLI
+  // consumed (stream failure recovered as incomplete; idle with error unset),
+  // so the lock-in was locking in a false premise. Contract change: a run
+  // whose session actually errored mid-stream must exit non-zero with a
+  // stderr diagnostic naming the cause — callers (docs-sync) cannot otherwise
+  // distinguish success from a dead run and had to stop trusting exit codes.
   cliIt.live(
-    "mid-stream LLM error still exits 0 today (contract lock-in)",
+    "mid-stream session error exits nonzero with a stderr diagnostic",
     ({ llm, opencode }) =>
       Effect.gen(function* () {
-        yield* llm.fail("upstream provider exploded mid-stream")
+        yield* llm.error(400, { error: { message: "upstream provider exploded mid-stream" } })
         const result = yield* opencode.run("trigger midstream error", { timeoutMs: 30_000 })
-        expect(result.exitCode).toBe(0)
+        opencode.expectExit(result, 1)
+        expect(result.stderr).toContain("upstream provider exploded mid-stream")
+      }),
+    60_000,
+  )
+
+  cliIt.live(
+    "mid-stream session error exits nonzero with stderr diagnostic under --format json",
+    ({ llm, opencode }) =>
+      Effect.gen(function* () {
+        yield* llm.error(400, { error: { message: "upstream provider exploded mid-stream" } })
+        const result = yield* opencode.run("trigger midstream error", {
+          format: "json",
+          timeoutMs: 30_000,
+        })
+        opencode.expectExit(result, 1)
+        expect(result.stderr).toContain("upstream provider exploded mid-stream")
+        const events = opencode.parseJsonEvents(result.stdout)
+        expect(events.some((event) => event.type === "error")).toBe(true)
+      }),
+    60_000,
+  )
+
+  // Plain headless run (no --auto): CLI auto-rejects bash asks under the
+  // harness's isolated config. Any auto-reject ⇒ non-zero, even if idle.
+  cliIt.live(
+    "auto-rejected permission in plain headless run exits nonzero",
+    ({ llm, opencode }) =>
+      Effect.gen(function* () {
+        yield* llm.tool("bash", { command: "sed -n 1,5p README.md" })
+        const result = yield* opencode.run("run sed on readme", { timeoutMs: 45_000 })
+        opencode.expectExit(result, 1)
+        expect(result.stderr).toContain("permission requested: bash")
+        expect(result.stderr).toContain("auto-rejecting")
+        expect(result.stderr).toContain(
+          "run ended with an auto-rejected permission; pass --auto for autonomous use",
+        )
+      }),
+    60_000,
+  )
+
+  cliIt.live(
+    "auto-rejected permission exits nonzero with stderr diagnostic under --format json",
+    ({ llm, opencode }) =>
+      Effect.gen(function* () {
+        yield* llm.tool("bash", { command: "sed -n 1,5p README.md" })
+        const result = yield* opencode.run("run sed on readme", {
+          format: "json",
+          timeoutMs: 45_000,
+        })
+        opencode.expectExit(result, 1)
+        expect(result.stderr).toContain(
+          "run ended with an auto-rejected permission; pass --auto for autonomous use",
+        )
+        const events = opencode.parseJsonEvents(result.stdout)
+        expect(events.some((event) => event.type === "error")).toBe(true)
       }),
     60_000,
   )
@@ -76,6 +132,7 @@ describe("opencode run (non-interactive subprocess)", () => {
         yield* llm.text("structured output")
         const result = yield* opencode.run("say hi", { format: "json", extraArgs: ["--auto"] })
         opencode.expectExit(result, 0)
+        expect(result.stdout).not.toContain("auto-rejected permission")
 
         const events = opencode.parseJsonEvents(result.stdout)
         expect(events.length).toBeGreaterThan(0)
diff --git a/packages/opencode/test/kilocode/acp/permission.test.ts b/packages/opencode/test/kilocode/acp/permission.test.ts
new file mode 100644
index 0000000000..8923f365a1
--- /dev/null
+++ b/packages/opencode/test/kilocode/acp/permission.test.ts
@@ -0,0 +1,16 @@
+import { describe, expect, test } from "bun:test"
+import { SkillShellPrompt } from "@/kilocode/acp/permission"
+
+describe("SkillShellPrompt", () => {
+  test("detects the skillShell metadata flag", () => {
+    expect(SkillShellPrompt.is({ skillShell: true })).toBe(true)
+    expect(SkillShellPrompt.is({ skillShell: false })).toBe(false)
+    expect(SkillShellPrompt.is({})).toBe(false)
+    expect(SkillShellPrompt.is(undefined)).toBe(false)
+  })
+
+  test("offers only allow-once and reject, never allow-always", () => {
+    expect(SkillShellPrompt.options.map((o) => o.optionId)).toEqual(["once", "reject"])
+    expect(SkillShellPrompt.options.some((o) => o.kind === "allow_always")).toBe(false)
+  })
+})
diff --git a/packages/opencode/test/kilocode/config/config.test.ts b/packages/opencode/test/kilocode/config/config.test.ts
index dde6a6d707..0bd9ecccb4 100644
--- a/packages/opencode/test/kilocode/config/config.test.ts
+++ b/packages/opencode/test/kilocode/config/config.test.ts
@@ -151,6 +151,14 @@ describe("global config updates", () => {
   })
 })
 
+describe("kilocode web search config", () => {
+  test("accepts enabling web search for all providers", () => {
+    const config = Schema.decodeUnknownSync(Config.Info)({ web_search: true })
+
+    expect(config.web_search).toBe(true)
+  })
+})
+
 describe("kilocode indexing config", () => {
   test("ignores retired semantic indexing flags in existing configs", async () => {
     await using tmp = await tmpdir({ git: true })
@@ -468,6 +476,145 @@ describe("subagent variant overrides", () => {
   })
 })
 
+describe("unset propagation across layered config files", () => {
+  const getGlobal = () =>
+    Effect.runPromise(Config.Service.use((svc) => svc.getGlobal()).pipe(Effect.scoped, Effect.provide(layer)))
+
+  test("removes subagent_model from every global config file when unset", async () => {
+    await using globalTmp = await tmpdir()
+    const json = path.join(globalTmp.path, "kilo.json")
+    const jsonc = path.join(globalTmp.path, "kilo.jsonc")
+    const jsoncText = ["{", "  // Keep this comment.", '  "username": "marius"', "}", ""].join("\n")
+    const prev = Global.Path.config
+    ;(Global.Path as { config: string }).config = globalTmp.path
+    await clear()
+    await disposeAllInstances()
+
+    try {
+      await writeConfig(globalTmp.path, { subagent_model: "kilo/openai/gpt-5" }, "kilo.json")
+      await Filesystem.write(jsonc, jsoncText)
+
+      await saveGlobal(decode({ subagent_model: null }))
+
+      // The key must be gone from the lower-precedence kilo.json as well, or
+      // the read chain keeps resolving it and the unset appears to do nothing.
+      expect(JSON.parse(await Bun.file(json).text())).not.toHaveProperty("subagent_model")
+      // The primary target had no key, so it must remain byte-identical.
+      expect(await Bun.file(jsonc).text()).toBe(jsoncText)
+
+      await clear()
+      expect((await getGlobal()).subagent_model).toBeUndefined()
+    } finally {
+      ;(Global.Path as { config: string }).config = prev
+      await clear()
+      await disposeAllInstances()
+    }
+  })
+
+  test("removes nested sentinels from jsonc siblings while preserving comments", async () => {
+    await using globalTmp = await tmpdir()
+    const opencode = path.join(globalTmp.path, "opencode.jsonc")
+    const prev = Global.Path.config
+    ;(Global.Path as { config: string }).config = globalTmp.path
+    await clear()
+    await disposeAllInstances()
+
+    try {
+      await Filesystem.write(path.join(globalTmp.path, "kilo.jsonc"), '{ "username": "marius" }\n')
+      await Filesystem.write(
+        opencode,
+        [
+          "{",
+          "  // Preserve this comment while clearing overrides.",
+          '  "agent": {',
+          '    "explore": {',
+          '      "model": "kilo/anthropic/claude-sonnet-4-6",',
+          '      "description": "Keep me"',
+          "    }",
+          "  }",
+          "}",
+        ].join("\n"),
+      )
+
+      await saveGlobal(decode({ agent: { explore: { model: null } } }))
+
+      const written = await Bun.file(opencode).text()
+      expect(written).toContain("// Preserve this comment while clearing overrides.")
+      expect(written).not.toContain('"model"')
+      expect(written).toContain('"description": "Keep me"')
+
+      await clear()
+      expect((await getGlobal()).agent?.explore?.model).toBeUndefined()
+    } finally {
+      ;(Global.Path as { config: string }).config = prev
+      await clear()
+      await disposeAllInstances()
+    }
+  })
+
+  test("does not rewrite sibling files on set or when the key is absent", async () => {
+    await using globalTmp = await tmpdir()
+    const json = path.join(globalTmp.path, "kilo.json")
+    const jsonText = JSON.stringify({ subagent_model: "kilo/old-model", username: "marius" }, null, 2)
+    const prev = Global.Path.config
+    ;(Global.Path as { config: string }).config = globalTmp.path
+    await clear()
+    await disposeAllInstances()
+
+    try {
+      await Filesystem.write(path.join(globalTmp.path, "kilo.jsonc"), '{ "username": "marius" }\n')
+      await Filesystem.write(json, jsonText)
+
+      // Sets only write to the primary target; lower-precedence copies stay
+      // untouched and are simply shadowed by the higher-precedence value.
+      await saveGlobal(decode({ subagent_model: "kilo/new-model" }))
+      expect(await Bun.file(json).text()).toBe(jsonText)
+
+      // Unsetting an absent key must not rewrite the sibling either.
+      await saveGlobal(decode({ small_model: null }))
+      expect(await Bun.file(json).text()).toBe(jsonText)
+    } finally {
+      ;(Global.Path as { config: string }).config = prev
+      await clear()
+      await disposeAllInstances()
+    }
+  })
+
+  test("removes subagent_model from every project config file when unset", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await Filesystem.write(
+      path.join(tmp.path, ".kilo", "kilo.json"),
+      JSON.stringify({ subagent_model: "kilo/openai/gpt-5" }),
+    )
+    await Filesystem.write(path.join(tmp.path, ".kilo", "kilo.jsonc"), '{\n  "username": "keep"\n}\n')
+
+    await provideTestInstance({
+      directory: tmp.path,
+      fn: async () => {
+        await saveProject(decode({ subagent_model: null }))
+        expect((await load()).subagent_model).toBeUndefined()
+      },
+    })
+
+    const json = JSON.parse(await Bun.file(path.join(tmp.path, ".kilo", "kilo.json")).text())
+    expect(json).not.toHaveProperty("subagent_model")
+    // The primary target only gained nothing; the delete was a no-op there.
+    const jsonc = JSON.parse(await Bun.file(path.join(tmp.path, ".kilo", "kilo.jsonc")).text())
+    expect(jsonc).not.toHaveProperty("subagent_model")
+    expect(jsonc.username).toBe("keep")
+  })
+
+  test("collects null sentinel paths from nested patches", () => {
+    expect(
+      KilocodeConfig.unsetPaths({
+        subagent_model: null,
+        agent: { explore: { model: null, variant: "high" } },
+        username: "marius",
+      }),
+    ).toEqual([["subagent_model"], ["agent", "explore", "model"]])
+  })
+})
+
 describe("agent config", () => {
   test("accepts delete sentinels for agent model and variant overrides", () => {
     const patch = decode({ agent: { explore: { model: null, variant: null } } })
diff --git a/packages/opencode/test/kilocode/indexing-startup.test.ts b/packages/opencode/test/kilocode/indexing-startup.test.ts
index 108f6c33d8..f9f3366734 100644
--- a/packages/opencode/test/kilocode/indexing-startup.test.ts
+++ b/packages/opencode/test/kilocode/indexing-startup.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test"
+import { $ } from "bun"
 import { Effect } from "effect"
 import fs from "node:fs/promises"
 import path from "node:path"
@@ -79,6 +80,7 @@ const staleKilo: Partial<Config.Info> = {
 }
 const configDir = process.env["KILO_CONFIG_DIR"]
 const disabled = process.env["KILO_DISABLE_CODEBASE_INDEXING"]
+const platform = process.env["KILO_PLATFORM"]
 const error = new Error("test indexing initialization failed")
 
 function inline(directory: string, root: string, hooks: IndexingWorker.Hooks): IndexingWorker.Driver {
@@ -118,6 +120,7 @@ async function called(init: ReturnType<typeof spyOn<CodeIndexManager, "initializ
 }
 
 beforeEach(() => {
+  process.env["KILO_PLATFORM"] = "cli"
   IndexingWorker.override(inline)
 })
 
@@ -127,6 +130,8 @@ afterEach(async () => {
   else process.env["KILO_CONFIG_DIR"] = configDir
   if (disabled === undefined) delete process.env["KILO_DISABLE_CODEBASE_INDEXING"]
   else process.env["KILO_DISABLE_CODEBASE_INDEXING"] = disabled
+  if (platform === undefined) delete process.env["KILO_PLATFORM"]
+  else process.env["KILO_PLATFORM"] = platform
   global.fetch = fetch
   await disposeAllInstances()
 })
@@ -388,14 +393,17 @@ describe("indexing startup degradation", () => {
         },
       })
       expect(config.status).toBe(200)
-      await called(init)
 
-      const status = await app.request("/indexing/status", {
+      const status = await app.request("/indexing/consent", {
+        method: "PUT",
         headers: {
+          "content-type": "application/json",
           "x-kilo-directory": tmp.path,
         },
+        body: JSON.stringify({ enabled: true }),
       })
       expect(status.status).toBe(200)
+      await called(init)
 
       const body = await status.json()
       expect(body).toMatchObject({
@@ -629,6 +637,99 @@ describe("indexing startup degradation", () => {
     })
   })
 
+  test("requires explicit VS Code consent even when repository config enables indexing", async () => {
+    const created: string[] = []
+    IndexingWorker.override((directory) => {
+      created.push(directory)
+      return inline(directory, "/index", {
+        status() {},
+        telemetry() {},
+        warning() {},
+        log() {},
+        failure() {},
+      })
+    })
+
+    await using tmp = await tmpdir({ git: true, config: cfg })
+    process.env["KILO_CONFIG_DIR"] = tmp.path
+    process.env["KILO_PLATFORM"] = "vscode"
+
+    try {
+      await provideTestInstance({
+        directory: tmp.path,
+        init: Effect.promise(() => KiloIndexing.setConsent(false)),
+        fn: async () => {
+          const status = await KiloIndexing.current()
+          expect(status.state).toBe("Disabled")
+          expect(status.message).toContain("enable it for this project")
+          expect(created).toEqual([])
+        },
+      })
+    } finally {
+      process.env["KILO_PLATFORM"] = "cli"
+    }
+  })
+
+  test("shares consent across linked worktrees and revokes every project worker", async () => {
+    const created: string[] = []
+    const disposed: string[] = []
+    IndexingWorker.override((directory) => {
+      created.push(directory)
+      return {
+        async init() {
+          return {
+            state: "Standby",
+            message: "Indexing paused.",
+            processedFiles: 0,
+            totalFiles: 0,
+            percent: 0,
+          }
+        },
+        async search() {
+          return []
+        },
+        async dispose() {
+          disposed.push(directory)
+        },
+      }
+    })
+
+    await using tmp = await tmpdir({ git: true, config: cfg })
+    const worktree = path.join(path.dirname(tmp.path), `indexing-worktree-${Date.now()}`)
+    await $`git worktree add --quiet -b indexing-consent-${Date.now()} ${worktree} HEAD`.cwd(tmp.path)
+    process.env["KILO_CONFIG_DIR"] = tmp.path
+    process.env["KILO_PLATFORM"] = "vscode"
+
+    try {
+      await withTestInstance({
+        directory: tmp.path,
+        fn: async () => {
+          await KiloIndexing.setConsent(true)
+          await wait(() => KiloIndexing.current(), "Standby")
+        },
+      })
+      await withTestInstance({
+        directory: worktree,
+        fn: async () => expect((await wait(() => KiloIndexing.current(), "Standby")).state).toBe("Standby"),
+      })
+      expect(new Set(created)).toEqual(new Set([tmp.path, worktree]))
+
+      await withTestInstance({
+        directory: tmp.path,
+        fn: () => KiloIndexing.setConsent(false),
+      })
+
+      expect(new Set(disposed)).toEqual(new Set([tmp.path, worktree]))
+      await withTestInstance({
+        directory: worktree,
+        fn: async () => expect((await KiloIndexing.current()).state).toBe("Disabled"),
+      })
+    } finally {
+      process.env["KILO_PLATFORM"] = "cli"
+      await $`git worktree remove --force ${worktree}`.cwd(tmp.path).quiet()
+    }
+  }, 15_000)
+
   test("enriches Kilo provider config from env auth", async () => {
     global.fetch = (() =>
       Promise.resolve(
diff --git a/packages/opencode/test/kilocode/npm-publish.test.ts b/packages/opencode/test/kilocode/npm-publish.test.ts
index 62e9434986..33318925ce 100644
--- a/packages/opencode/test/kilocode/npm-publish.test.ts
+++ b/packages/opencode/test/kilocode/npm-publish.test.ts
@@ -1,6 +1,16 @@
 import { describe, expect, test } from "bun:test"
 import { NpmPublish } from "../../script/kilocode/npm-publish"
 
+describe("npm publish aliases", () => {
+  test("promotes stable releases to the rc channel", () => {
+    expect(NpmPublish.aliases("latest")).toEqual(["rc"])
+  })
+
+  test("does not promote prereleases", () => {
+    expect(NpmPublish.aliases("rc")).toEqual([])
+  })
+})
+
 describe("npm publish retry", () => {
   test("returns after the first successful attempt", async () => {
     const calls = { run: 0, exists: 0, sleep: 0 }
diff --git a/packages/opencode/test/kilocode/permission/skill-shell.test.ts b/packages/opencode/test/kilocode/permission/skill-shell.test.ts
new file mode 100644
index 0000000000..9f10a53349
--- /dev/null
+++ b/packages/opencode/test/kilocode/permission/skill-shell.test.ts
@@ -0,0 +1,224 @@
+import { PermissionV1 } from "@opencode-ai/core/v1/permission"
+import { expect } from "bun:test"
+import { Cause, Effect, Exit, Fiber, Layer } from "effect"
+import { EventV2Bridge } from "@/event-v2-bridge"
+import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
+import { Database } from "@opencode-ai/core/database/database"
+import { Permission } from "@/permission"
+import { InstanceBootstrap } from "@/project/bootstrap-service"
+import { InstanceStore } from "@/project/instance-store"
+import { testEffect } from "../../lib/effect"
+import { SessionID } from "@/session/schema"
+import { RuntimeFlags } from "@/effect/runtime-flags"
+import { Config } from "@/config/config"
+
+// skillShell forces a single up-front prompt over soft allow/deny/auto-approve
+// rules, but must never override a hard (plan-mode) veto, and must never be
+// auto-resolved while pending.
+
+const events = EventV2Bridge.defaultLayer
+const noopBootstrap = Layer.succeed(InstanceBootstrap.Service, InstanceBootstrap.Service.of({ run: Effect.void }))
+const env = Layer.mergeAll(
+  Permission.layer.pipe(Layer.provide(Database.defaultLayer), Layer.provide(events)),
+  events,
+  CrossSpawnSpawner.defaultLayer,
+  InstanceStore.defaultLayer.pipe(Layer.provide(noopBootstrap)),
+).pipe(Layer.provide(RuntimeFlags.layer()), Layer.provide(Config.defaultLayer))
+const it = testEffect(Layer.mergeAll(env, RuntimeFlags.layer()))
+
+const ask = (input: Parameters<Permission.Interface["ask"]>[0]) =>
+  Effect.gen(function* () {
+    return yield* (yield* Permission.Service).ask(input)
+  })
+
+const list = () =>
+  Effect.gen(function* () {
+    return yield* (yield* Permission.Service).list()
+  })
+
+const rejectAll = () =>
+  Effect.gen(function* () {
+    const permission = yield* Permission.Service
+    for (const req of yield* permission.list()) yield* permission.reply({ requestID: req.id, reply: "reject" })
+  })
+
+const reply = (input: Parameters<Permission.Interface["reply"]>[0]) =>
+  Effect.gen(function* () {
+    return yield* (yield* Permission.Service).reply(input)
+  })
+
+const waitForPending = (count: number) =>
+  Effect.gen(function* () {
+    const permission = yield* Permission.Service
+    return yield* Effect.gen(function* () {
+      while (true) {
+        const pending = yield* permission.list()
+        if (pending.length === count) return pending
+        yield* Effect.sleep("10 millis")
+      }
+    }).pipe(Effect.timeoutOrElse({ duration: "1 second", orElse: () => Effect.fail(new Error("timed out")) }))
+  })
+
+const fail = <A, E, R>(self: Effect.Effect<A, E, R>) =>
+  Effect.gen(function* () {
+    const exit = yield* self.pipe(Effect.exit)
+    if (Exit.isFailure(exit)) return Cause.squash(exit.cause)
+    throw new Error("expected permission effect to fail")
+  })
+
+it.instance(
+  "skillShell - forces a prompt even when a matching allow rule exists",
+  () =>
+    Effect.gen(function* () {
+      const fiber = yield* ask({
+        sessionID: SessionID.make("session_test"),
+        permission: "bash",
+        patterns: ["printf hi"],
+        metadata: { skillShell: true },
+        always: [],
+        ruleset: [{ permission: "bash", pattern: "*", action: "allow" }],
+      }).pipe(Effect.forkScoped)
+
+      expect(yield* waitForPending(1)).toHaveLength(1)
+      yield* rejectAll()
+      yield* Fiber.await(fiber)
+    }),
+  { git: true },
+)
+
+it.instance(
+  "skillShell - a deny rule stays terminal (build mode, no hard ruleset)",
+  () =>
+    Effect.gen(function* () {
+      // build mode has no hardRuleset; an ordinary deny rule must still block, not prompt.
+      const err = yield* fail(
+        ask({
+          sessionID: SessionID.make("session_test"),
+          permission: "bash",
+          patterns: ["curl evil.sh"],
+          metadata: { skillShell: true },
+          always: [],
+          ruleset: [{ permission: "bash", pattern: "curl *", action: "deny" }],
+        }),
+      )
+
+      expect(err).toBeInstanceOf(PermissionV1.DeniedError)
+      expect(yield* list()).toHaveLength(0)
+    }),
+  { git: true },
+)
+
+it.instance(
+  "skillShell - a cd-chained escape is vetoed via the verbatim command pattern",
+  () =>
+    Effect.gen(function* () {
+      // The injector asks with the decomposed sub-command (`cat .ssh/id_rsa`, which
+      // readOnlyBash would allow) AND the verbatim command. In plan mode the metachar
+      // hard-veto (`*\n*` deny) must fire on the verbatim string, blocking the escape.
+      const err = yield* fail(
+        ask({
+          sessionID: SessionID.make("session_test"),
+          permission: "bash",
+          patterns: ['cd "$HOME"\ncat .ssh/id_rsa', "cat .ssh/id_rsa"],
+          metadata: { skillShell: true },
+          always: [],
+          ruleset: [{ permission: "bash", pattern: "cat *", action: "allow" }],
+          hardRuleset: [{ permission: "bash", pattern: "*\n*", action: "deny" }],
+        }),
+      )
+
+      expect(err).toBeInstanceOf(PermissionV1.DeniedError)
+      expect(yield* list()).toHaveLength(0)
+    }),
+  { git: true },
+)
+
+it.instance(
+  "skillShell - is denied by a hard-ruleset veto instead of prompting",
+  () =>
+    Effect.gen(function* () {
+      const err = yield* fail(
+        ask({
+          sessionID: SessionID.make("session_test"),
+          permission: "bash",
+          patterns: ["rm -rf /"],
+          metadata: { skillShell: true },
+          always: [],
+          ruleset: [{ permission: "bash", pattern: "*", action: "allow" }],
+          hardRuleset: [{ permission: "bash", pattern: "*", action: "deny" }],
+        }),
+      )
+
+      expect(err).toBeInstanceOf(PermissionV1.DeniedError)
+      expect(yield* list()).toHaveLength(0)
+    }),
+  { git: true },
+)
+
+it.instance(
+  "skillShell - a pending batch is not auto-resolved by allowEverything",
+  () =>
+    Effect.gen(function* () {
+      const fiber = yield* ask({
+        sessionID: SessionID.make("session_test"),
+        permission: "bash",
+        patterns: ["printf hi"],
+        metadata: { skillShell: true },
+        always: [],
+        ruleset: [],
+      }).pipe(Effect.forkScoped)
+
+      expect(yield* waitForPending(1)).toHaveLength(1)
+      yield* (yield* Permission.Service).allowEverything({ enable: true })
+      // still pending: YOLO cannot silently approve a skill batch
+      expect(yield* list()).toHaveLength(1)
+      yield* rejectAll()
+      yield* Fiber.await(fiber)
+    }),
+  { git: true },
+)
+
+it.instance(
+  "skillShell - a machine approval (no interactive flag) is ignored and stays pending",
+  () =>
+    Effect.gen(function* () {
+      const fiber = yield* ask({
+        sessionID: SessionID.make("session_test"),
+        permission: "bash",
+        patterns: ["printf hi"],
+        metadata: { skillShell: true },
+        always: [],
+        ruleset: [],
+      }).pipe(Effect.forkScoped)
+
+      const [pending] = yield* waitForPending(1)
+      // An auto-approver replies without `interactive`; the server must ignore it.
+      yield* reply({ requestID: pending.id, reply: "once" })
+      expect(yield* list()).toHaveLength(1)
+      yield* rejectAll()
+      yield* Fiber.await(fiber)
+    }),
+  { git: true },
+)
+
+it.instance(
+  "skillShell - an interactive approval resolves the request",
+  () =>
+    Effect.gen(function* () {
+      const fiber = yield* ask({
+        sessionID: SessionID.make("session_test"),
+        permission: "bash",
+        patterns: ["printf hi"],
+        metadata: { skillShell: true },
+        always: [],
+        ruleset: [],
+      }).pipe(Effect.forkScoped)
+
+      const [pending] = yield* waitForPending(1)
+      yield* reply({ requestID: pending.id, reply: "once", interactive: true })
+      // human approval clears the prompt and the ask succeeds
+      expect(yield* list()).toHaveLength(0)
+      yield* Fiber.await(fiber)
+    }),
+  { git: true },
+)
diff --git a/packages/opencode/test/kilocode/provider/error.test.ts b/packages/opencode/test/kilocode/provider/error.test.ts
index 878cd52193..ebc4fa393b 100644
--- a/packages/opencode/test/kilocode/provider/error.test.ts
+++ b/packages/opencode/test/kilocode/provider/error.test.ts
@@ -78,6 +78,174 @@ describe("provider stream errors", () => {
   })
 })
 
+describe("responses api terminal frames", () => {
+  test("surfaces the provider message from a response.failed frame", () => {
+    const payload = {
+      type: "response.failed",
+      sequence_number: 8,
+      response: {
+        error: {
+          code: "rate_limit_exceeded",
+          message:
+            "openai/gpt-5.6-terra-pro is temporarily rate-limited upstream. Please retry shortly, or add your own key to accumulate your rate limits: https://openrouter.ai/settings/integrations",
+        },
+        incomplete_details: null,
+        service_tier: "auto",
+      },
+    }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe(payload.response.error.message)
+    expect(result.data.isRetryable).toBe(true)
+    expect(result.data.responseBody).toBe(JSON.stringify(payload))
+  })
+
+  test("unwraps bare chat-completions error objects", () => {
+    const payload = { code: "rate_limit_exceeded", message: "Try again in 30 seconds." }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe(payload.message)
+    expect(result.data.isRetryable).toBe(true)
+  })
+
+  test("unwraps envelope-less error wrappers", () => {
+    const payload = { error: { code: "rate_limit_exceeded", message: "Try again in 30 seconds.", type: "tokens" } }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe(payload.error.message)
+    expect(result.data.isRetryable).toBe(true)
+  })
+
+  test("prefers a nested error record over bare top-level fields", () => {
+    const payload = {
+      code: 429,
+      message: "gateway wrapper",
+      error: { code: "rate_limit_exceeded", message: "inner provider detail" },
+    }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe(payload.error.message)
+    expect(result.data.isRetryable).toBe(true)
+  })
+
+  test("surfaces messages for unlisted error codes", () => {
+    const payload = {
+      type: "response.failed",
+      response: { error: { code: "model_not_found", message: "no such model" }, incomplete_details: null },
+    }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe("no such model")
+    expect(result.data.isRetryable).toBe(false)
+  })
+
+  test("marks numeric 429 and 5xx error codes retryable", () => {
+    for (const payload of [
+      { code: 429, message: "too many requests" },
+      { code: 503, message: "service unavailable" },
+    ]) {
+      const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+      expect(MessageV2.APIError.isInstance(result)).toBe(true)
+      if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+      expect(result.data.message).toBe(payload.message)
+      expect(result.data.isRetryable).toBe(true)
+    }
+  })
+
+  test("retries exhausted and anthropic rate-limit shapes like the old heuristics", () => {
+    const exhausted = { code: "resource_exhausted", message: "quota exceeded for the day" }
+    const anthropic = {
+      type: "error",
+      error: { type: "rate_limit_error", message: "request has exceeded your per-minute rate limit" },
+    }
+    for (const payload of [exhausted, anthropic]) {
+      const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+      expect(MessageV2.APIError.isInstance(result)).toBe(true)
+      if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+      expect(result.data.isRetryable).toBe(true)
+    }
+  })
+
+  test("marks numeric-string error codes retryable", () => {
+    const payload = { code: "429", message: "slow down" }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.isRetryable).toBe(true)
+  })
+
+  test("normalizes error objects with explicit null fields", () => {
+    const payload = {
+      error: {
+        message: "The server had an error while processing your request",
+        type: "server_error",
+        param: null,
+        code: null,
+      },
+    }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe(payload.error.message)
+    expect(result.data.isRetryable).toBe(true)
+  })
+
+  test("normalizes response.failed frames with a null error code", () => {
+    const payload = {
+      type: "response.failed",
+      response: { error: { code: null, message: "mid-stream failure" }, incomplete_details: null },
+    }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.message).toBe("mid-stream failure")
+    expect(result.data.isRetryable).toBe(false)
+  })
+
+  test("does not retry terminal errors that merely mention availability", () => {
+    const payload = { code: "invalid_request", message: "The model is unavailable in your region" }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.isRetryable).toBe(false)
+  })
+
+  test("retries hyphenated rate-limit prose", () => {
+    const payload = {
+      code: "upstream_error",
+      message: "openai/gpt-5.6-terra-pro is temporarily rate-limited upstream. Please retry shortly.",
+    }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(true)
+    if (!MessageV2.APIError.isInstance(result)) throw new Error("expected APIError")
+    expect(result.data.isRetryable).toBe(true)
+  })
+
+  test("ignores response.failed frames without an error payload", () => {
+    const payload = { type: "response.failed", response: { error: null, incomplete_details: null } }
+    const result = MessageV2.fromError(payload, { providerID: ProviderV2.ID.make("openai") })
+
+    expect(MessageV2.APIError.isInstance(result)).toBe(false)
+  })
+})
+
 describe("Google Gemini authentication errors", () => {
   test("explains how to troubleshoot the rejected API key", () => {
     const error = apiError(googleAuthError, "ACCESS_TOKEN_TYPE_UNSUPPORTED")
diff --git a/packages/opencode/test/kilocode/server/config-overlay.test.ts b/packages/opencode/test/kilocode/server/config-overlay.test.ts
index d3351b0d50..134dede6ba 100644
--- a/packages/opencode/test/kilocode/server/config-overlay.test.ts
+++ b/packages/opencode/test/kilocode/server/config-overlay.test.ts
@@ -1,10 +1,12 @@
-import { afterEach, describe, expect, test } from "bun:test"
+import { afterEach, describe, expect, setDefaultTimeout, test } from "bun:test"
 import path from "path"
+import { chmod, rm, stat, symlink } from "fs/promises"
 import * as Log from "@opencode-ai/core/util/log"
 import { Global } from "@opencode-ai/core/global"
 import { Server } from "../../../src/server/server"
 import { Config } from "../../../src/config/config"
 import { KilocodeConfigOverlay } from "../../../src/kilocode/config/overlay"
+import { KilocodeConfigWriter } from "../../../src/kilocode/config/writer"
 import { Permission } from "../../../src/permission"
 import { PtyPaths } from "../../../src/server/routes/instance/httpapi/groups/pty"
 import { Filesystem } from "../../../src/util/filesystem"
@@ -12,14 +14,16 @@ import { resetDatabase } from "../../fixture/db"
 import { disposeAllInstances, tmpdir } from "../../fixture/fixture"
 
 void Log.init({ print: false })
+setDefaultTimeout(30_000)
 
 const original = Global.Path.config
 const terminal = process.platform === "win32" ? test.skip : test.serial
 
+type Target = { path: string; revision: string; exists: boolean; writable: boolean; raw: Record<string, unknown> }
 type Overlay = {
   fields: Record<string, { source: string; inherited: boolean; overridden: boolean; value?: unknown }>
   collections: Record<string, Array<{ key: string; source: string; inherited: boolean; local?: unknown }>>
-  targets: { project?: string; global?: string; active?: string }
+  targets: { project: Target; global: Target; active: Target }
 }
 type Agent = {
   name: string
@@ -30,34 +34,41 @@ afterEach(async () => {
   ;(Global.Path as { config: string }).config = original
   await disposeAllInstances()
   await resetDatabase()
-})
+}, 15_000)
 
 function req(dir: string, input: string, init?: RequestInit) {
-  return Server.Default().app.request(input, {
-    ...init,
-    headers: {
-      "x-kilo-directory": dir,
-      ...init?.headers,
-    },
-  })
+  return request(Server.Default().app, dir, input, init)
 }
 
 function app(_value: boolean) {
   return Server.Default().app
 }
 
-function request(target: ReturnType<typeof app>, dir: string | undefined, input: string, init?: RequestInit) {
+async function request(target: ReturnType<typeof app>, dir: string | undefined, input: string, init?: RequestInit) {
+  const headers = {
+    ...(dir ? { "x-kilo-directory": dir } : {}),
+    ...init?.headers,
+  }
+  const body = init?.method === "PATCH" && input === "/config/overlay" ? JSON.parse(String(init.body)) : undefined
+  const next =
+    body && !body.expected
+      ? await (async () => {
+          const scope = body.scope === "global" ? "global" : "project"
+          const response = await target.request(`/config/overlay?scope=${scope}`, { headers })
+          const overlay = (await response.json()) as Overlay
+          const expected = overlay.targets[scope]
+          return { ...body, expected: { path: expected.path, revision: expected.revision } }
+        })()
+      : body
   return target.request(input, {
     ...init,
-    headers: {
-      ...(dir ? { "x-kilo-directory": dir } : {}),
-      ...init?.headers,
-    },
+    headers,
+    body: next ? JSON.stringify(next) : init?.body,
   })
 }
 
 async function json<T>(response: Response) {
-  expect(response.status).toBe(200)
+  if (response.status !== 200) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
   return (await response.json()) as T
 }
 
@@ -77,6 +88,186 @@ async function setGlobal(dir: string, value: Config.Info) {
 }
 
 describe("config overlay routes", () => {
+  test("writes a missing project target atomically", async () => {
+    await using project = await tmpdir()
+    const target = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+
+    const result = await KilocodeConfigWriter.write({
+      scope: "project",
+      directory: project.path,
+      expected: target,
+      set: { model: "test/model" },
+    })
+
+    expect(result.ok).toBe(true)
+    expect(await Bun.file(target.path).text()).toContain('"model": "test/model"')
+  })
+
+  test("returns exact raw target data and a stable missing-file revision", async () => {
+    await using project = await tmpdir()
+    const first = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+    const second = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+
+    expect(first.exists).toBe(false)
+    expect(first.raw).toEqual({})
+    expect(first.revision).toBe(second.revision)
+
+    await Filesystem.write(first.path, '{\n  // preserved\n  "model": "test/model"\n}\n')
+    const saved = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+    expect(saved.raw).toEqual({ model: "test/model" })
+    expect(saved.revision).not.toBe(first.revision)
+  })
+
+  test("rejects a comment-only external edit with a typed revision conflict", async () => {
+    await using project = await tmpdir()
+    const before = await json<Overlay>(await req(project.path, "/config/overlay?scope=project"))
+    await Filesystem.write(before.targets.project.path, "{\n  // external edit\n}\n")
+
+    const response = await Server.Default().app.request("/config/overlay", {
+      method: "PATCH",
+      headers: { "content-type": "application/json", "x-kilo-directory": project.path },
+      body: JSON.stringify({
+        scope: "project",
+        expected: {
+          path: before.targets.project.path,
+          revision: before.targets.project.revision,
+        },
+        set: { model: "test/model" },
+      }),
+    })
+
+    expect(response.status).toBe(409)
+    expect(await response.json()).toMatchObject({ code: "revision-conflict" })
+  })
+
+  test("rejects a newly created higher-priority target", async () => {
+    await using project = await tmpdir()
+    const before = await json<Overlay>(await req(project.path, "/config/overlay?scope=project"))
+    await Filesystem.write(path.join(project.path, "kilo.json"), "{}")
+
+    const response = await Server.Default().app.request("/config/overlay", {
+      method: "PATCH",
+      headers: { "content-type": "application/json", "x-kilo-directory": project.path },
+      body: JSON.stringify({
+        scope: "project",
+        expected: {
+          path: before.targets.project.path,
+          revision: before.targets.project.revision,
+        },
+        set: { model: "test/model" },
+      }),
+    })
+
+    expect(response.status).toBe(409)
+    expect(await response.json()).toMatchObject({ code: "target-changed" })
+  })
+
+  test("allows only one concurrent writer for a revision", async () => {
+    await using project = await tmpdir()
+    const before = await json<Overlay>(await req(project.path, "/config/overlay?scope=project"))
+    const update = (model: string) =>
+      Server.Default().app.request("/config/overlay", {
+        method: "PATCH",
+        headers: { "content-type": "application/json", "x-kilo-directory": project.path },
+        body: JSON.stringify({
+          scope: "project",
+          expected: {
+            path: before.targets.project.path,
+            revision: before.targets.project.revision,
+          },
+          set: { model },
+        }),
+      })
+
+    const responses = await Promise.all([update("test/first"), update("test/second")])
+    expect(responses.map((response) => response.status).sort()).toEqual([200, 409])
+  })
+
+  test("rejects a project config target that escapes through a symlink", async () => {
+    if (process.platform === "win32") return
+    await using project = await tmpdir()
+    await using outside = await tmpdir()
+    await Filesystem.write(path.join(outside.path, "kilo.jsonc"), "{}")
+    await symlink(outside.path, path.join(project.path, ".kilo"), "dir")
+    const before = await json<Overlay>(await req(project.path, "/config/overlay?scope=project"))
+
+    const response = await Server.Default().app.request("/config/overlay", {
+      method: "PATCH",
+      headers: { "content-type": "application/json", "x-kilo-directory": project.path },
+      body: JSON.stringify({
+        scope: "project",
+        expected: {
+          path: before.targets.project.path,
+          revision: before.targets.project.revision,
+        },
+        set: { model: "test/model" },
+      }),
+    })
+
+    expect(response.status).toBe(400)
+    expect(await Bun.file(path.join(outside.path, "kilo.jsonc")).text()).not.toContain('"model"')
+  })
+
+  test("does not expose partial content when an atomic replacement fails", async () => {
+    await using project = await tmpdir()
+    const file = path.join(project.path, "kilo.jsonc")
+    await Filesystem.write(file, '{\n  "model": "test/before"\n}\n')
+    const target = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+
+    await expect(
+      KilocodeConfigWriter.write({
+        scope: "project",
+        directory: project.path,
+        expected: target,
+        set: { model: "test/after" },
+        write: async () => {
+          throw new Error("simulated replacement failure")
+        },
+      }),
+    ).rejects.toThrow("simulated replacement failure")
+    expect(await Bun.file(file).text()).toContain("test/before")
+  })
+
+  test("rechecks missing target parents before replacement", async () => {
+    if (process.platform === "win32") return
+    await using project = await tmpdir()
+    await using outside = await tmpdir()
+    const target = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+
+    const result = await KilocodeConfigWriter.write({
+      scope: "project",
+      directory: project.path,
+      expected: target,
+      set: { model: "test/model" },
+      beforeWrite: async () => {
+        await rm(path.dirname(target.path), { recursive: true })
+        await symlink(outside.path, path.dirname(target.path), "dir")
+      },
+    })
+
+    expect(result).toMatchObject({ ok: false, code: "target-not-writable" })
+    expect(await Bun.file(path.join(outside.path, "kilo.jsonc")).exists()).toBe(false)
+  })
+
+  test("preserves restrictive config file permissions", async () => {
+    if (process.platform === "win32") return
+    await using project = await tmpdir()
+    const file = path.join(project.path, "kilo.jsonc")
+    await Filesystem.write(file, "{}", 0o600)
+    await chmod(file, 0o600)
+    const target = await KilocodeConfigOverlay.target({ scope: "project", directory: project.path })
+
+    const result = await KilocodeConfigWriter.write({
+      scope: "project",
+      directory: project.path,
+      expected: target,
+      set: { model: "test/model" },
+    })
+
+    expect(result.ok).toBe(true)
+    expect((await stat(file)).mode & 0o777).toBe(0o600)
+  })
+
   test("ignores unsafe patch paths", () => {
     const patched = KilocodeConfigOverlay.patch({
       scope: "project",
@@ -141,7 +332,7 @@ describe("config overlay routes", () => {
       prompt: "kilo agent prompt",
     })
     expect(body.project.agent?.["opencode-only"]).toBeUndefined()
-    expect(body.targets.project).toBe(path.join(project.path, ".kilo", "kilo.json"))
+    expect(body.targets.project.path).toBe(path.join(project.path, ".kilo", "kilo.json"))
   })
 
   test.serial("tolerates unsafe project config instead of failing the overlay", async () => {
@@ -201,6 +392,42 @@ describe("config overlay routes", () => {
     })
   })
 
+  test.serial("resolves and reverts project websearch overrides", async () => {
+    await using global = await tmpdir()
+    await using project = await tmpdir()
+    await setGlobal(global.path, { web_search: true })
+
+    await json(
+      await req(project.path, "/config/overlay", {
+        method: "PATCH",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ scope: "project", set: { web_search: false } }),
+      }),
+    )
+    const overridden = await json<Overlay>(await req(project.path, "/config/overlay?scope=project"))
+    expect(overridden.fields.web_search).toMatchObject({
+      source: "project",
+      inherited: false,
+      overridden: true,
+      value: false,
+    })
+
+    await json(
+      await req(project.path, "/config/overlay", {
+        method: "PATCH",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ scope: "project", unset: [["web_search"]] }),
+      }),
+    )
+    const inherited = await json<Overlay>(await req(project.path, "/config/overlay?scope=project"))
+    expect(inherited.fields.web_search).toMatchObject({
+      source: "global",
+      inherited: true,
+      overridden: false,
+      value: true,
+    })
+  })
+
   test.serial("marks global indexing values inherited in project scope", async () => {
     await using global = await tmpdir()
     await using project = await tmpdir()
@@ -357,38 +584,42 @@ describe("config overlay routes", () => {
     expect(saved.mcp).toEqual({ shared: { enabled: false } })
   })
 
-  test.serial("refreshes effective config after project permission update", async () => {
-    await using global = await tmpdir()
-    await using project = await tmpdir()
-    await setGlobal(global.path, { permission: { edit: "allow" } })
+  test.serial(
+    "refreshes effective config after project permission update",
+    async () => {
+      await using global = await tmpdir()
+      await using project = await tmpdir()
+      await setGlobal(global.path, { permission: { edit: "allow" } })
 
-    const before = await json<Agent[]>(await req(project.path, "/agent"))
-    expect(Permission.evaluate("edit", "*", before.find((item) => item.name === "code")?.permission ?? []).action).toBe(
-      "allow",
-    )
+      const before = await json<Agent[]>(await req(project.path, "/agent"))
+      expect(
+        Permission.evaluate("edit", "*", before.find((item) => item.name === "code")?.permission ?? []).action,
+      ).toBe("allow")
 
-    await json(
-      await req(project.path, "/config/overlay", {
-        method: "PATCH",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({ scope: "project", set: { permission: { edit: { "*": "ask" } } } }),
-      }),
-    )
-    const body = await json<Overlay & { effective: { permission: Record<string, string | Record<string, string>> } }>(
-      await req(project.path, "/config/overlay?scope=project"),
-    )
-    const edit = body.effective.permission.edit
-    const after = await json<Agent[]>(await req(project.path, "/agent"))
+      await json(
+        await req(project.path, "/config/overlay", {
+          method: "PATCH",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ scope: "project", set: { permission: { edit: { "*": "ask" } } } }),
+        }),
+      )
+      const body = await json<Overlay & { effective: { permission: Record<string, string | Record<string, string>> } }>(
+        await req(project.path, "/config/overlay?scope=project"),
+      )
+      const edit = body.effective.permission.edit
+      const after = await json<Agent[]>(await req(project.path, "/agent"))
 
-    expect(typeof edit === "string" ? edit : edit["*"]).toBe("ask")
-    expect(Permission.evaluate("edit", "*", after.find((item) => item.name === "code")?.permission ?? []).action).toBe(
-      "ask",
-    )
-    expect(body.collections.permission.find((item) => item.key === "edit")).toMatchObject({
-      source: "project",
-      overridden: true,
-    })
-  })
+      expect(typeof edit === "string" ? edit : edit["*"]).toBe("ask")
+      expect(
+        Permission.evaluate("edit", "*", after.find((item) => item.name === "code")?.permission ?? []).action,
+      ).toBe("ask")
+      expect(body.collections.permission.find((item) => item.key === "edit")).toMatchObject({
+        source: "project",
+        overridden: true,
+      })
+    },
+    15_000,
+  )
 
   test.serial("refreshes agent permissions after global permission update", async () => {
     await using global = await tmpdir()
@@ -476,6 +707,7 @@ describe("config overlay routes", () => {
           Permission.evaluate("edit", "*", after.find((item) => item.name === "code")?.permission ?? []).action,
         ).toBe("allow")
       },
+      30_000,
     )
   }
 })
diff --git a/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts b/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts
index 8375ebf795..2e3e6c4f9c 100644
--- a/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts
+++ b/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts
@@ -218,6 +218,11 @@ export const kiloScenarios: Scenario[] = [
   http.protected.get("/indexing/status", "indexing.status").json(200, object),
   http.protected.get("/indexing/models", "indexing.models").json(200, object),
   http.protected.get("/indexing/warnings", "indexing.warnings").json(200, array),
+  http.protected
+    .put("/indexing/consent", "indexing.consent")
+    .mutating()
+    .at((ctx) => ({ path: "/indexing/consent", headers: ctx.headers(), body: { enabled: false } }))
+    .json(200, object),
   http.protected.get("/memory/status", "memory.status").json(200, (body) => {
     object(body)
     object(body.state)
@@ -751,6 +756,7 @@ export const kiloScenarios: Scenario[] = [
     .json(200, (body) => check(body === true, "telemetry enabled update should return true")),
   http.protected
     .post("/instance/reload", "instance.reload")
+    .skipValidAuthProbe()
     .mutating()
     .seeded((ctx) => ctx.session({ title: "Reload" }))
     .at((ctx) => ({
diff --git a/packages/opencode/test/kilocode/session-prompt-queue.test.ts b/packages/opencode/test/kilocode/session-prompt-queue.test.ts
index dd5f90a017..d6a6178802 100644
--- a/packages/opencode/test/kilocode/session-prompt-queue.test.ts
+++ b/packages/opencode/test/kilocode/session-prompt-queue.test.ts
@@ -549,6 +549,96 @@ describe("session prompt queue", () => {
     }
   })
 
+  test("closes a queued-handoff turn as superseded, not interrupted", async () => {
+    const ready = Promise.withResolvers<void>()
+    const release = Promise.withResolvers<void>()
+    const server = Bun.serve({
+      port: 0,
+      async fetch(req) {
+        const url = new URL(req.url)
+        if (!url.pathname.endsWith("/chat/completions")) return new Response("not found", { status: 404 })
+
+        // Hold every stream open until the follow-up prompt is queued, so
+        // runLoop deterministically takes the hasFollowup break once its
+        // current step drains. Forked title/summary calls get held too; they
+        // are Effect.ignore'd and drain once released.
+        ready.resolve()
+        const stream = reply({ text: "reply", wait: release.promise })
+        return new Response(stream, {
+          status: 200,
+          headers: { "Content-Type": "text/event-stream" },
+        })
+      },
+    })
+
+    try {
+      await using tmp = await tmpdir({
+        git: true,
+        init: async (dir) => {
+          await Bun.write(path.join(dir, "opencode.json"), JSON.stringify(providerCfg(server.url.origin)))
+        },
+      })
+
+      await provideTestInstance({
+        directory: tmp.path,
+        fn: async () =>
+          scoped(tmp.path, async (prompt) => {
+            const closed: KiloSession.CloseReason[] = []
+            const unsubscribe = Bus.subscribe(KiloSession.Event.TurnClose, (event) => {
+              closed.push(event.properties.reason)
+            })
+
+            const session = await sessions.create({ title: "Superseded close reason" })
+            const first = Effect.runPromise(
+              prompt.prompt({
+                sessionID: session.id,
+                agent: "code",
+                parts: [{ type: "text", text: "first prompt" }],
+              }),
+            )
+
+            // A request reaching the mock implies the turn loop is running
+            // (forked title/summary calls fire from step 1 of the loop).
+            await ready.promise
+            const second = Effect.runPromise(
+              prompt.prompt({
+                sessionID: session.id,
+                agent: "code",
+                parts: [{ type: "text", text: "second prompt" }],
+              }),
+            )
+
+            // Wait until the follow-up is actually queued behind the in-flight
+            // turn, then let the first stream drain so runLoop hands off.
+            await Effect.runPromise(
+              pollWithTimeout(
+                Effect.sync(() => (KiloSessionPromptQueue.hasFollowup(session.id) ? (true as const) : undefined)),
+                "follow-up prompt never queued behind the in-flight turn",
+                "3 seconds",
+              ),
+            )
+            release.resolve()
+
+            expect((await first).info.role).toBe("assistant")
+            expect((await second).info.role).toBe("assistant")
+            // Bus delivery is a microtask chain; flush a macrotask so the last
+            // TurnClose callback lands before asserting.
+            await new Promise((resolve) => setTimeout(resolve, 0))
+            unsubscribe()
+
+            expect(closed).toHaveLength(2)
+            // The first turn drained its stream cleanly and handed off to the
+            // queued follow-up; it must not look like a user interruption to
+            // clients (they flash a "Turn interrupted" warning on that reason).
+            expect(closed[0]).toBe("superseded")
+            expect(closed[1]).toBe("completed")
+          }),
+      })
+    } finally {
+      server.stop(true)
+    }
+  }, 20_000)
+
   test("bridges legacy instance context for prompts after a completed turn", async () => {
     const calls: number[] = []
     const server = Bun.serve({
diff --git a/packages/opencode/test/kilocode/skill-command-autocomplete.test.ts b/packages/opencode/test/kilocode/skill-command-autocomplete.test.ts
index f7e81a786f..50ea098b03 100644
--- a/packages/opencode/test/kilocode/skill-command-autocomplete.test.ts
+++ b/packages/opencode/test/kilocode/skill-command-autocomplete.test.ts
@@ -54,4 +54,28 @@ Skill content.
       },
     ),
   )
+
+  // The slash-command path runs a template's `!`cmd`` shell without a permission
+  // prompt, so it must only do so for trusted skills. A project-local skill is
+  // untrusted, and Command.Info carries the flag the prompt executor gates on.
+  it.live("marks project skills untrusted so their slash-command shell is disabled", () =>
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            Bun.write(
+              path.join(dir, ".kilo", "skill", "proj", "SKILL.md"),
+              `---\nname: proj\ndescription: proj.\n---\n\nRun: !\`printf hi\`\n`,
+            ),
+          )
+
+          const command = yield* Command.Service
+          const proj = yield* command.get("proj")
+
+          expect(proj?.source).toBe("skill")
+          expect(proj?.trusted).toBe(false)
+        }),
+      { git: true },
+    ),
+  )
 })
diff --git a/packages/opencode/test/kilocode/skill/discovery-validate.test.ts b/packages/opencode/test/kilocode/skill/discovery-validate.test.ts
new file mode 100644
index 0000000000..75c5dc8511
--- /dev/null
+++ b/packages/opencode/test/kilocode/skill/discovery-validate.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, test } from "bun:test"
+import { isSafeSegment, isSafeRelativePath } from "@/kilocode/skill/discovery-validate"
+
+describe("isSafeSegment", () => {
+  test("accepts a plain skill name", () => {
+    expect(isSafeSegment("git-status")).toBe(true)
+  })
+
+  test("rejects traversal, separators, empties, and null bytes", () => {
+    for (const value of ["", ".", "..", "a/b", "a\\b", "a\0b"]) {
+      expect(isSafeSegment(value)).toBe(false)
+    }
+  })
+})
+
+describe("isSafeRelativePath", () => {
+  test("accepts nested relative paths", () => {
+    expect(isSafeRelativePath("SKILL.md")).toBe(true)
+    expect(isSafeRelativePath("scripts/setup.sh")).toBe(true)
+  })
+
+  test("rejects traversal segments", () => {
+    expect(isSafeRelativePath("../evil")).toBe(false)
+    expect(isSafeRelativePath("a/../../b")).toBe(false)
+  })
+
+  test("rejects absolute paths on either platform", () => {
+    expect(isSafeRelativePath("/etc/passwd")).toBe(false)
+    expect(isSafeRelativePath("C:\\Windows")).toBe(false)
+  })
+
+  test("rejects URLs, query/fragment, backslashes, and null bytes", () => {
+    for (const value of ["http://evil.test/x", "a?b", "a#b", "a\\b", "a\0b"]) {
+      expect(isSafeRelativePath(value)).toBe(false)
+    }
+  })
+
+  test("rejects percent-encoded traversal", () => {
+    expect(isSafeRelativePath("%2e%2e/evil")).toBe(false)
+    expect(isSafeRelativePath("%2f")).toBe(false)
+  })
+})
diff --git a/packages/opencode/test/kilocode/skills/display.test.ts b/packages/opencode/test/kilocode/skills/display.test.ts
new file mode 100644
index 0000000000..1d32a2d729
--- /dev/null
+++ b/packages/opencode/test/kilocode/skills/display.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from "bun:test"
+import { displayCommand, skillShellPrompt } from "@/kilocode/skills/display"
+
+describe("displayCommand", () => {
+  it("escapes control characters so a command cannot repaint the prompt", () => {
+    // CR/ESC would otherwise let the visible text differ from what executes
+    const out = displayCommand("echo ok\r\x1b[2Krm -rf /\nnext")
+    expect(out).toBe("echo ok\\r\\x1b[2Krm -rf /\\nnext")
+    expect(out).not.toMatch(/[\u0000-\u001f]/)
+  })
+
+  it("escapes bidi/format controls so Trojan-Source reordering can't hide intent", () => {
+    // RLO (U+202E) + PDI (U+2069) would visually reorder the command in the prompt
+    const out = displayCommand("echo \u202esafe\u2069 rm -rf /")
+    expect(out).toBe("echo \\u202esafe\\u2069 rm -rf /")
+    expect(out).not.toMatch(/[\u200e\u200f\u2028\u2029\u202a-\u202e\u2066-\u2069]/)
+  })
+
+  it("leaves ordinary commands unchanged", () => {
+    expect(displayCommand("git status --short")).toBe("git status --short")
+  })
+})
+
+describe("skillShellPrompt", () => {
+  it("returns undefined when the request is not a skill-shell batch", () => {
+    expect(skillShellPrompt(undefined)).toBeUndefined()
+    expect(skillShellPrompt({ skillShell: false })).toBeUndefined()
+    expect(skillShellPrompt({})).toBeUndefined()
+  })
+
+  it("names the skill and returns verbatim, escaped commands", () => {
+    const out = skillShellPrompt({ skillShell: true, skill: "git-status", commands: ["git status", "echo \u202ex"] })
+    expect(out).toEqual({
+      title: 'Run shell commands from skill "git-status"?',
+      commands: ["git status", "echo \\u202ex"],
+    })
+  })
+
+  it("falls back to a generic title and drops non-string commands", () => {
+    const out = skillShellPrompt({ skillShell: true, commands: ["ok", 42, null] })
+    expect(out).toEqual({ title: "Run these skill commands?", commands: ["ok"] })
+  })
+})
diff --git a/packages/opencode/test/kilocode/skills/inject.test.ts b/packages/opencode/test/kilocode/skills/inject.test.ts
new file mode 100644
index 0000000000..1684695294
--- /dev/null
+++ b/packages/opencode/test/kilocode/skills/inject.test.ts
@@ -0,0 +1,355 @@
+import { PermissionV1 } from "@opencode-ai/core/v1/permission"
+import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
+import { Ripgrep } from "@opencode-ai/core/ripgrep"
+import { Shell } from "@opencode-ai/core/shell"
+import { Effect, Exit, Layer } from "effect"
+import { afterEach, describe, expect } from "bun:test"
+import fs from "fs"
+import os from "os"
+import path from "path"
+import type { Tool } from "@/tool/tool"
+import { SkillTool } from "@/tool/skill"
+import { SkillInject } from "@/kilocode/skills/inject"
+import { ToolRegistry } from "@/tool/registry"
+import { disposeAllInstances, TestInstance } from "../../fixture/fixture"
+import { SessionID, MessageID } from "@/session/schema"
+import { testEffect } from "../../lib/effect"
+
+// Global (~/.claude) skills are trusted, but Global.Service snapshots the home
+// path when its layer is built, so KILO_TEST_HOME must be set before the runtime
+// layer below is constructed — not inside a test body.
+const HOME = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "skill-inject-home-")))
+process.env.KILO_TEST_HOME = HOME
+
+const baseCtx: Omit<Tool.Context, "ask"> = {
+  sessionID: SessionID.make("ses_test"),
+  messageID: MessageID.make("msg_test"),
+  callID: "",
+  agent: "build",
+  abort: AbortSignal.any([]),
+  messages: [],
+  metadata: () => Effect.void,
+}
+
+afterEach(async () => {
+  await disposeAllInstances()
+})
+
+const it = testEffect(
+  Layer.mergeAll(ToolRegistry.defaultLayer, CrossSpawnSpawner.defaultLayer).pipe(Layer.provide(Ripgrep.defaultLayer)),
+)
+
+// Shell injection spawns real processes; skip on windows CI like the sibling suite.
+const unix = process.platform !== "win32" ? it.instance : it.instance.skip
+
+afterEach(async () => {
+  // reset discovered skills between tests by clearing the global skill dir
+  await fs.promises.rm(path.join(HOME, ".agents"), { recursive: true, force: true })
+})
+
+// Global ~/.agents skills are trusted (and, unlike ~/.claude, not gated by the
+// KILO_DISABLE_CLAUDE_CODE flag the test env sets); project .kilo skills are untrusted.
+function writeGlobalSkill(name: string, body: string) {
+  return Effect.promise(() =>
+    Bun.write(
+      path.join(HOME, ".agents", "skills", name, "SKILL.md"),
+      `---\nname: ${name}\ndescription: ${name} test skill.\n---\n\n${body}\n`,
+    ),
+  )
+}
+
+function writeProjectSkill(dir: string, name: string, body: string) {
+  return Effect.promise(() =>
+    Bun.write(
+      path.join(dir, ".kilo", "skill", name, "SKILL.md"),
+      `---\nname: ${name}\ndescription: ${name} test skill.\n---\n\n${body}\n`,
+    ),
+  )
+}
+
+function loadSkill(name: string, ask: Tool.Context["ask"]) {
+  return Effect.gen(function* () {
+    const registry = yield* ToolRegistry.Service
+    const agent = { name: "build", mode: "primary" as const, permission: [], options: {} }
+    const tool = (yield* registry.tools({
+      providerID: "opencode" as any,
+      modelID: "gpt-5" as any,
+      agent,
+    })).find((t) => t.id === SkillTool.id)
+    if (!tool) throw new Error("Skill tool not found")
+    return yield* tool.execute({ name }, { ...baseCtx, ask })
+  })
+}
+
+describe("skill shell injection", () => {
+  unix("runs the batch after a single forced approval listing every command", () =>
+    Effect.gen(function* () {
+      yield* writeGlobalSkill("trusted-shell", "A: !`printf one` B: !`printf two`")
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      const result = yield* loadSkill("trusted-shell", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      expect(result.output).toContain("A: one B: two")
+      // one skill-load ask plus exactly one batch bash ask carrying all commands
+      const bash = requests.filter((r) => r.permission === "bash")
+      expect(bash.length).toBe(1)
+      expect(bash[0].metadata?.["skillShell"]).toBe(true)
+      // patterns drive rule matching; metadata.commands is the verbatim list the prompt renders
+      expect(bash[0].patterns).toEqual(["printf one", "printf two"])
+      expect(bash[0].metadata?.["commands"]).toEqual(["printf one", "printf two"])
+    }),
+  )
+
+  unix("runs commands in the instance directory", () =>
+    Effect.gen(function* () {
+      const dir = (yield* TestInstance).directory
+      yield* writeGlobalSkill("cwd-shell", "Here: !`pwd`")
+
+      const result = yield* loadSkill("cwd-shell", () => Effect.void)
+
+      // pwd resolves to the instance dir (realpath), not the server process cwd
+      expect(result.output).toContain(path.basename(dir))
+    }),
+  )
+
+  unix("authorizes both the decomposed sub-commands and the verbatim command", () =>
+    Effect.gen(function* () {
+      // A chained placeholder is asked with per-sub-command patterns (so deny/veto
+      // rules apply to each) AND the verbatim string (so the metachar deny rules
+      // `*;*`/`*|*`/`*\n*` fire and cd/set-location escapes can't hide). The prompt
+      // still displays the verbatim placeholder.
+      yield* writeGlobalSkill("compound-shell", "Out: !`cat README.md; printf hi`")
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      yield* loadSkill("compound-shell", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      const bash = requests.filter((r) => r.permission === "bash")
+      expect(bash.length).toBe(1)
+      expect(bash[0].patterns).toContain("cat README.md")
+      expect(bash[0].patterns).toContain("printf hi")
+      // the raw chained string is authorized too, so metachar deny rules can match it
+      expect(bash[0].patterns).toContain("cat README.md; printf hi")
+      expect(bash[0].metadata?.["commands"]).toEqual(["cat README.md; printf hi"])
+    }),
+  )
+
+  unix("still prompts for a cd-only command (no empty-pattern auto-approve)", () =>
+    Effect.gen(function* () {
+      // `cd` decomposes to no sub-command patterns; without the verbatim command the
+      // bash ask would carry an empty pattern list and Permission.ask would silently
+      // auto-approve (forceAsk never runs on an empty list). The raw command keeps
+      // the prompt firing.
+      yield* writeGlobalSkill("cd-only", "Out: !`cd sub`")
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      yield* loadSkill("cd-only", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      const bash = requests.filter((r) => r.permission === "bash")
+      expect(bash.length).toBe(1)
+      expect(bash[0].patterns).toContain("cd sub")
+    }),
+  )
+
+  unix("aborts the entire skill load when the batch is rejected", () =>
+    Effect.gen(function* () {
+      yield* writeGlobalSkill("denied-shell", "Secret: !`printf leaked`")
+
+      const exit = yield* loadSkill("denied-shell", (req) =>
+        // Reject the batch. Tools wrap ctx.ask with Effect.orDie, so this reaches
+        // the injector as a defect and must abort the whole skill load.
+        req.permission === "bash"
+          ? Effect.fail(new PermissionV1.RejectedError()).pipe(Effect.orDie)
+          : Effect.void,
+      ).pipe(Effect.exit)
+
+      expect(Exit.isFailure(exit)).toBe(true)
+    }),
+  )
+
+  unix("does not run shell injection for untrusted project skills", () =>
+    Effect.gen(function* () {
+      const dir = (yield* TestInstance).directory
+      yield* writeProjectSkill(dir, "untrusted-shell", "Value: !`printf shouldnotrun`")
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      const result = yield* loadSkill("untrusted-shell", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      expect(result.output).toContain("[skill shell execution disabled for untrusted skill]")
+      expect(result.output).not.toContain("shouldnotrun")
+      // no bash permission ask because nothing was scanned or spawned
+      expect(requests.some((r) => r.permission === "bash")).toBe(false)
+    }),
+  )
+
+  unix("does not trust a global skill symlinked into the project", () =>
+    Effect.gen(function* () {
+      const dir = (yield* TestInstance).directory
+      // A SKILL.md that lives in the project, symlinked into the trusted ~/.agents/skills dir
+      // (a suggested convenience), must not mint trust for project-controlled markdown.
+      const projectSkillDir = path.join(dir, "skills", "linked")
+      yield* Effect.promise(async () => {
+        await Bun.write(
+          path.join(projectSkillDir, "SKILL.md"),
+          "---\nname: linked\ndescription: linked test skill.\n---\n\nValue: !`printf shouldnotrun`\n",
+        )
+        const linkDir = path.join(HOME, ".agents", "skills", "linked")
+        await fs.promises.mkdir(path.dirname(linkDir), { recursive: true })
+        await fs.promises.symlink(projectSkillDir, linkDir, "dir")
+      })
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      const result = yield* loadSkill("linked", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      // realpath is inside the project → treated as untrusted, no execution, no bash ask
+      expect(result.output).toContain("[skill shell execution disabled for untrusted skill]")
+      expect(result.output).not.toContain("shouldnotrun")
+      expect(requests.some((r) => r.permission === "bash")).toBe(false)
+    }),
+  )
+
+  unix("does not execute placeholders inside fenced code blocks", () =>
+    Effect.gen(function* () {
+      // The fenced placeholder is a documentation example and must stay literal; only the
+      // live one runs.
+      yield* writeGlobalSkill("fenced-shell", "Live: !`printf LIVE`\n\n```\nExample: !`printf FENCED`\n```\n")
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      const result = yield* loadSkill("fenced-shell", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      expect(result.output).toContain("Live: LIVE")
+      // the fenced example is left verbatim, not executed
+      expect(result.output).toContain("Example: !`printf FENCED`")
+      expect(result.output).not.toContain("Example: FENCED")
+      // only the live command is authorized
+      const bash = requests.filter((r) => r.permission === "bash")
+      expect(bash[0]?.patterns).toEqual(["printf LIVE"])
+    }),
+  )
+
+  unix("treats a placeholder inside a nested (```` wrapping ```) fence as inert", () =>
+    Effect.gen(function* () {
+      // The common "wrap a ``` example in a ```` fence" pattern must not execute the inner
+      // example; a shorter inner fence does not close the longer outer one.
+      const body = "Live: !`printf LIVE`\n\n````md\n```bash\nExample: !`printf FENCED`\n```\n````\n"
+      yield* writeGlobalSkill("nested-fence", body)
+
+      const requests: Array<Omit<PermissionV1.Request, "id" | "sessionID" | "tool">> = []
+      const result = yield* loadSkill("nested-fence", (req) =>
+        Effect.sync(() => {
+          requests.push(req)
+        }),
+      )
+
+      expect(result.output).toContain("Live: LIVE")
+      expect(result.output).toContain("!`printf FENCED`")
+      expect(result.output).not.toContain("Example: FENCED")
+      const bash = requests.filter((r) => r.permission === "bash")
+      expect(bash[0]?.patterns).toEqual(["printf LIVE"])
+    }),
+  )
+
+  unix("does not re-execute shell placeholders emitted by command output", () =>
+    Effect.gen(function* () {
+      // The command emits a literal placeholder `!<backtick>echo pwned<backtick>`
+      // built from octal escapes so the SKILL.md itself contains no nested
+      // backticks. If render re-scanned command output, `echo pwned` would run.
+      yield* writeGlobalSkill("nested-shell", "Out: !`printf '!\\140echo pwned\\140'`")
+
+      const result = yield* loadSkill("nested-shell", () => Effect.void)
+
+      expect(result.output).toContain("!`echo pwned`")
+      // "pwned" must appear only inside the inert placeholder, never executed alone.
+      expect(result.output).not.toMatch(/Out:\s*pwned\s*$/m)
+    }),
+  )
+
+  unix("truncates oversized command output before inlining", () =>
+    Effect.gen(function* () {
+      const dir = (yield* TestInstance).directory
+      // render directly (bypassing the tool's own output truncation) to assert the injector caps output
+      const rendered = yield* SkillInject.render({
+        content: "Out: !`yes x | head -c 65536`",
+        trusted: true,
+        disabled: false,
+        cwd: dir,
+        skill: "big-shell",
+        shell: Shell.acceptable(),
+        ctx: { ...baseCtx, ask: () => Effect.void } as Tool.Context,
+        decompose: ({ command }) => Effect.succeed({ patterns: [command], dirs: [] }),
+      })
+
+      expect(rendered).toContain("[skill shell output truncated]")
+      expect(rendered.length).toBeLessThan(40000)
+    }),
+  )
+})
+
+// The disabled (kill-switch) and untrusted branches must short-circuit before
+// asking permission or spawning. Passing an ask/spawner that throws proves
+// neither is reached.
+describe("SkillInject.render gating", () => {
+  const boom = () => {
+    throw new Error("must not be reached")
+  }
+  const ctx = { ...baseCtx, ask: () => Effect.sync(boom) } as Tool.Context
+  const decompose = (() => Effect.sync(boom)) as unknown as SkillInject.Decompose
+
+  const run = (opts: { trusted: boolean; disabled: boolean; content?: string }) =>
+    Effect.runPromise(
+      SkillInject.render({
+        content: opts.content ?? "Value: !`printf ran`",
+        trusted: opts.trusted,
+        disabled: opts.disabled,
+        cwd: "/tmp",
+        skill: "test",
+        shell: Shell.acceptable(),
+        ctx,
+        decompose,
+      }),
+    )
+
+  it.effect("kill-switch replaces every command without asking or running it", () =>
+    Effect.gen(function* () {
+      const out = yield* Effect.promise(() => run({ trusted: true, disabled: true }))
+      expect(out).toBe("Value: [skill shell execution disabled by policy]")
+    }),
+  )
+
+  it.effect("untrusted skills never ask or run their commands", () =>
+    Effect.gen(function* () {
+      const out = yield* Effect.promise(() => run({ trusted: false, disabled: false }))
+      expect(out).toBe("Value: [skill shell execution disabled for untrusted skill]")
+    }),
+  )
+
+  it.effect("content without placeholders is returned unchanged", () =>
+    Effect.gen(function* () {
+      const out = yield* Effect.promise(() => run({ trusted: true, disabled: false, content: "no commands here" }))
+      expect(out).toBe("no commands here")
+    }),
+  )
+})
diff --git a/packages/opencode/test/kilocode/tool-registry-indexing.test.ts b/packages/opencode/test/kilocode/tool-registry-indexing.test.ts
index 702446692d..6cf48f9216 100644
--- a/packages/opencode/test/kilocode/tool-registry-indexing.test.ts
+++ b/packages/opencode/test/kilocode/tool-registry-indexing.test.ts
@@ -465,6 +465,8 @@ describe("kilocode tool registry indexing", () => {
   })
 
   test("logs indexing bootstrap failures without blocking session bootstrap", async () => {
+    const platform = process.env["KILO_PLATFORM"]
+    process.env["KILO_PLATFORM"] = "cli"
     const logger = Log.create({ service: "kilocode-bootstrap" })
     const err = new Error("indexing init failed")
     const calls: string[] = []
@@ -508,6 +510,8 @@ describe("kilocode tool registry indexing", () => {
       expect(indexing).toHaveBeenCalledTimes(1)
       expect(warn).toHaveBeenCalledWith("indexing bootstrap failed", { err })
     } finally {
+      if (platform === undefined) delete process.env["KILO_PLATFORM"]
+      else process.env["KILO_PLATFORM"] = platform
       indexing.mockRestore()
       warn.mockRestore()
     }
diff --git a/packages/opencode/test/kilocode/tool/shell-signal.test.ts b/packages/opencode/test/kilocode/tool/shell-signal.test.ts
new file mode 100644
index 0000000000..e62ab3ce54
--- /dev/null
+++ b/packages/opencode/test/kilocode/tool/shell-signal.test.ts
@@ -0,0 +1,72 @@
+// Regression tests for Kilo-Org/kilocode#12677.
+//
+// A shell terminated by a signal (for example `bash -c` exec'ing a binary that
+// then segfaults) produces no numeric exit code. The spawner used to fail the
+// exit-code effect in that case, so the bash tool's race kept waiting for the
+// abort or timeout branches and the call appeared to hang. The spawner now
+// settles signal termination as the conventional 128 + signum code.
+
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import path from "path"
+import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Agent } from "../../../src/agent/agent"
+import { Config } from "../../../src/config/config"
+import { RuntimeFlags } from "../../../src/effect/runtime-flags"
+import { Plugin } from "../../../src/plugin"
+import { SessionID, MessageID } from "../../../src/session/schema"
+import { ShellTool } from "../../../src/tool/shell"
+import { Truncate } from "../../../src/tool/truncate"
+import { provideInstance, testInstanceStoreLayer } from "../../fixture/fixture"
+import { testEffect } from "../../lib/effect"
+
+const layer = Layer.mergeAll(
+  CrossSpawnSpawner.defaultLayer,
+  FSUtil.defaultLayer,
+  Plugin.defaultLayer,
+  Truncate.defaultLayer,
+  Config.defaultLayer,
+  Agent.defaultLayer,
+  RuntimeFlags.defaultLayer,
+  testInstanceStoreLayer,
+)
+const it = testEffect(layer)
+
+const ctx = {
+  sessionID: SessionID.make("ses_test"),
+  messageID: MessageID.make("msg_test"),
+  callID: "",
+  agent: "code",
+  abort: AbortSignal.any([]),
+  messages: [],
+  metadata: () => Effect.void,
+  ask: () => Effect.void,
+}
+
+const root = path.join(__dirname, "../../..")
+
+describe("shell tool signal termination", () => {
+  if (process.platform !== "win32") {
+    it.live("settles with 128 + signum when the shell dies from a signal", () =>
+      provideInstance(root)(
+        Effect.gen(function* () {
+          const tool = yield* ShellTool
+          const bash = yield* tool.init()
+          const result = yield* bash
+            .execute(
+              {
+                command: "kill -SEGV $$",
+                description: "Terminate the shell with SIGSEGV",
+                timeout: 60_000,
+              },
+              ctx,
+            )
+            .pipe(Effect.timeout("5 seconds"))
+          expect(result.metadata.exit).toBe(128 + 11)
+          expect(result.output).not.toContain("exceeding timeout")
+        }),
+      ),
+    )
+  }
+})
diff --git a/packages/opencode/test/kilocode/tool/websearch-kilo-exa.test.ts b/packages/opencode/test/kilocode/tool/websearch-kilo-exa.test.ts
new file mode 100644
index 0000000000..5756e7c671
--- /dev/null
+++ b/packages/opencode/test/kilocode/tool/websearch-kilo-exa.test.ts
@@ -0,0 +1,180 @@
+// kilocode_change - new file
+import { describe, expect, test } from "bun:test"
+import { Effect, Exit, Layer } from "effect"
+import { HttpBody, HttpClient, HttpClientResponse } from "effect/unstable/http"
+import {
+  KILO_EXA_URL,
+  MAX_KILO_EXA_RESULTS,
+  type KiloExaParams,
+  callKiloExa,
+} from "../../../src/kilocode/tool/websearch-kilo-exa"
+
+type Recorded = {
+  url?: string
+  method?: string
+  authorization?: string
+  body?: string
+}
+
+const readBody = async (body: HttpBody.HttpBody): Promise<string> => {
+  if (body._tag === "Uint8Array") return new TextDecoder().decode(body.body)
+  if (body._tag === "Raw") return JSON.stringify(body.body)
+  return ""
+}
+
+const jsonResponse = (status: number, body: unknown): Response =>
+  new Response(JSON.stringify(body), {
+    status,
+    headers: { "content-type": "application/json" },
+  })
+
+const okJson = (body: unknown) => jsonResponse(200, body)
+
+const fakeHttp = (respond: (status: number) => Response, recorded?: Recorded): HttpClient.HttpClient =>
+  HttpClient.make((request) =>
+    Effect.gen(function* () {
+      const url = request.url
+      const method = request.method
+      const authorization = request.headers["authorization"]
+      const body = yield* Effect.promise(() => readBody(request.body))
+      if (recorded) {
+        recorded.url = url
+        recorded.method = method
+        recorded.authorization = authorization
+        recorded.body = body
+      }
+      return HttpClientResponse.fromWeb(
+        request as unknown as Parameters<typeof HttpClientResponse.fromWeb>[0],
+        respond(200),
+      )
+    }),
+  )
+
+const runCall = async (
+  params: KiloExaParams,
+  respond: (status: number) => Response,
+  recorded?: Recorded,
+  kiloToken = "kilo-test-token",
+) =>
+  Effect.runPromiseExit(
+    Effect.gen(function* () {
+      const http = fakeHttp(respond, recorded)
+      return yield* callKiloExa(http, params, kiloToken)
+    }),
+  )
+
+describe("callKiloExa request shape", () => {
+  test("posts to KILO_EXA_URL with bearer token and highlights-only contents", async () => {
+    const recorded: Recorded = {}
+    const exit = await runCall({ query: "drone" }, () => okJson({ results: [] }), recorded)
+    expect(Exit.isSuccess(exit)).toBe(true)
+    expect(recorded.url).toContain("/api/exa/search")
+    expect(recorded.method).toBe("POST")
+    expect(recorded.authorization).toBe("Bearer kilo-test-token")
+    const parsed = JSON.parse(recorded.body!)
+    expect(parsed.query).toBe("drone")
+    expect(parsed.type).toBe("auto")
+    expect(parsed.numResults).toBe(MAX_KILO_EXA_RESULTS)
+    expect(parsed.contents).toEqual({ highlights: true })
+  })
+
+  test("uses caller numResults when below cap", async () => {
+    const recorded: Recorded = {}
+    await runCall({ query: "x", numResults: 3 }, () => okJson({ results: [] }), recorded)
+    expect(JSON.parse(recorded.body!).numResults).toBe(3)
+  })
+
+  test("clamps numResults at MAX_KILO_EXA_RESULTS", async () => {
+    const recorded: Recorded = {}
+    await runCall({ query: "x", numResults: 25 }, () => okJson({ results: [] }), recorded)
+    expect(JSON.parse(recorded.body!).numResults).toBe(MAX_KILO_EXA_RESULTS)
+  })
+
+  test("passes through caller type", async () => {
+    const recorded: Recorded = {}
+    await runCall({ query: "x", type: "deep" }, () => okJson({ results: [] }), recorded)
+    expect(JSON.parse(recorded.body!).type).toBe("deep")
+  })
+
+  test("KILO_EXA_URL is built from KILO_API_BASE", () => {
+    expect(KILO_EXA_URL).toMatch(/\/api\/exa\/search$/)
+  })
+})
+
+describe("callKiloExa response formatting", () => {
+  const okValue = <E>(exit: Exit.Exit<string, E>): string => {
+    if (Exit.isFailure(exit)) throw new Error("expected success")
+    return (exit as Extract<typeof exit, { _tag: "Success" }>).value as string
+  }
+
+  test("formats results with title, url, date and highlights", async () => {
+    const exit = await runCall({ query: "x" }, () =>
+      okJson({
+        results: [
+          {
+            title: "A drone",
+            url: "https://example.com/a",
+            publishedDate: "2025-01-02T00:00:00.000Z",
+            highlights: ["first", "second"],
+          },
+        ],
+      }),
+    )
+    const text = okValue(exit)
+    expect(text).toContain("[1] A drone")
+    expect(text).toContain("https://example.com/a")
+    expect(text).toContain("(2025-01-02T00:00:00.000Z)")
+    expect(text).toContain("> first")
+    expect(text).toContain("> second")
+  })
+
+  test("falls back to url when title is missing", async () => {
+    const exit = await runCall({ query: "x" }, () => okJson({ results: [{ url: "https://example.com/no-title" }] }))
+    expect(okValue(exit)).toContain("[1] https://example.com/no-title")
+  })
+
+  test("returns NO_RESULTS message on empty results", async () => {
+    const exit = await runCall({ query: "x" }, () => okJson({ results: [] }))
+    expect(okValue(exit)).toBe("No search results found. Please try a different query.")
+  })
+
+  test("ignores costDollars on the response (cost accounting out of scope)", async () => {
+    const exit = await runCall({ query: "x" }, () =>
+      okJson({
+        results: [{ url: "https://example.com" }],
+        costDollars: { total: 0.007, search: { neural: 0.007 } },
+        requestId: "req-123",
+      }),
+    )
+    expect(Exit.isSuccess(exit)).toBe(true)
+  })
+})
+
+describe("callKiloExa error handling", () => {
+  test("dies with auth-required message on 401", async () => {
+    const exit = await runCall({ query: "x" }, () => jsonResponse(401, {}))
+    expect(Exit.isFailure(exit)).toBe(true)
+    if (Exit.isSuccess(exit)) return
+    expect(String((exit as Extract<typeof exit, { _tag: "Failure" }>).cause)).toContain("unauthorized")
+    expect(String((exit as Extract<typeof exit, { _tag: "Failure" }>).cause)).toContain("kilo auth login")
+  })
+
+  test("dies with auth-required message on 403", async () => {
+    const exit = await runCall({ query: "x" }, () => jsonResponse(403, {}))
+    expect(Exit.isFailure(exit)).toBe(true)
+    if (Exit.isSuccess(exit)) return
+    expect(String((exit as Extract<typeof exit, { _tag: "Failure" }>).cause)).toContain("unauthorized")
+  })
+
+  test("dies with status code on other non-2xx", async () => {
+    const exit = await runCall({ query: "x" }, () => jsonResponse(500, { error: "boom" }))
+    expect(Exit.isFailure(exit)).toBe(true)
+    if (Exit.isSuccess(exit)) return
+    expect(String((exit as Extract<typeof exit, { _tag: "Failure" }>).cause)).toContain("500")
+  })
+
+  test("dies when response body is not valid ExaResponse shape", async () => {
+    const exit = await runCall({ query: "x" }, () => okJson({ nope: true }))
+    expect(Exit.isFailure(exit)).toBe(true)
+  })
+})
diff --git a/packages/opencode/test/plugin/codex.test.ts b/packages/opencode/test/plugin/codex.test.ts
index a40b995358..a264bd376a 100644
--- a/packages/opencode/test/plugin/codex.test.ts
+++ b/packages/opencode/test/plugin/codex.test.ts
@@ -148,6 +148,14 @@ describe("plugin.codex", () => {
             id: "gpt-5.5",
             api: { id: "gpt-5.5" },
           } as never,
+          "gpt-5.6": {
+            id: "gpt-5.6",
+            api: { id: "gpt-5.6" },
+          } as never,
+          "gpt-5.6-sol": {
+            id: "gpt-5.6-sol",
+            api: { id: "gpt-5.6-sol" },
+          } as never,
           "gpt-5.4-mini": {
             id: "gpt-5.4-mini",
             api: { id: "gpt-5.4-mini" },
@@ -164,6 +172,8 @@ describe("plugin.codex", () => {
       } as never, { auth: { type: "oauth" } } as never)
       expect(provider).not.toHaveProperty(["gpt-5.5-pro"])
       expect(provider).toHaveProperty(["gpt-5.5"])
+      expect(provider).not.toHaveProperty(["gpt-5.6"])
+      expect(provider).toHaveProperty(["gpt-5.6-sol"])
       expect(provider).toHaveProperty(["gpt-5.4-mini"])
       expect(provider).toHaveProperty(["gpt-5.1-codex"])
       expect(provider).not.toHaveProperty(["other-model"])
diff --git a/packages/opencode/test/server/httpapi-exercise/dsl.ts b/packages/opencode/test/server/httpapi-exercise/dsl.ts
index 60d41576f0..959b1a2141 100644
--- a/packages/opencode/test/server/httpapi-exercise/dsl.ts
+++ b/packages/opencode/test/server/httpapi-exercise/dsl.ts
@@ -27,6 +27,7 @@ class ScenarioBuilder<S = undefined> {
       seed: () => Effect.succeed(undefined as S),
       request: (ctx) => ({ path, headers: ctx.headers() }),
       authProbe: undefined,
+      validAuthProbe: true, // kilocode_change
       capture: "full",
       mutates: false,
       reset: true,
@@ -54,6 +55,12 @@ class ScenarioBuilder<S = undefined> {
     return this.clone({ authProbe })
   }
 
+  // kilocode_change start - blocking routes only prove they reject missing credentials so no valid request leaks into app disposal
+  skipValidAuthProbe() {
+    return this.clone({ validAuthProbe: false })
+  }
+  // kilocode_change end
+
   mutating() {
     return this.clone({ mutates: true })
   }
@@ -158,6 +165,7 @@ class ScenarioBuilder<S = undefined> {
       project: state.project,
       seed: state.seed,
       authProbe: state.authProbe,
+      validAuthProbe: state.validAuthProbe, // kilocode_change
       // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- `.seeded(...)` preserves the paired request/state type inside the builder.
       request: (ctx, seeded) => state.request({ ...ctx, state: seeded as S }),
       // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- `.seeded(...)` preserves the paired assertion/state type inside the builder.
diff --git a/packages/opencode/test/server/httpapi-exercise/index.ts b/packages/opencode/test/server/httpapi-exercise/index.ts
index f711e96e62..b33c36d7d9 100644
--- a/packages/opencode/test/server/httpapi-exercise/index.ts
+++ b/packages/opencode/test/server/httpapi-exercise/index.ts
@@ -1640,6 +1640,7 @@ const scenarios: Scenario[] = [
     .json(200, boolean, "status"),
   http.protected
     .get("/tui/control/next", "tui.control.next")
+    .skipValidAuthProbe() // kilocode_change - valid requests intentionally block waiting for queued TUI input
     .mutating()
     .seeded((ctx) => ctx.tuiRequest({ path: "/tui/exercise", body: { text: "queued" } }))
     .json(
diff --git a/packages/opencode/test/server/httpapi-exercise/runner.ts b/packages/opencode/test/server/httpapi-exercise/runner.ts
index 6ccc54b0c8..5f790e5ccf 100644
--- a/packages/opencode/test/server/httpapi-exercise/runner.ts
+++ b/packages/opencode/test/server/httpapi-exercise/runner.ts
@@ -49,6 +49,7 @@ function runAuth(scenario: ActiveScenario) {
     const result = yield* callAuthProbe(scenario, "missing")
     if (scenario.auth === "protected") {
       if (result.status !== 401) throw new Error(`auth expected 401, got ${result.status}`)
+      if (!scenario.validAuthProbe) return // kilocode_change - blocking routes skip the valid probe; a leaked valid request hangs final app disposal
       const authed = yield* callAuthProbe(scenario, "valid")
       if (authed.status === 401) throw new Error("auth rejected valid credentials")
       return
diff --git a/packages/opencode/test/server/httpapi-exercise/types.ts b/packages/opencode/test/server/httpapi-exercise/types.ts
index 3296714653..ce141603f7 100644
--- a/packages/opencode/test/server/httpapi-exercise/types.ts
+++ b/packages/opencode/test/server/httpapi-exercise/types.ts
@@ -88,6 +88,7 @@ export type ActiveScenario = {
   seed: (ctx: ScenarioContext) => Effect.Effect<unknown>
   request: (ctx: ScenarioContext, state: unknown) => RequestSpec
   authProbe: RequestSpec | undefined
+  validAuthProbe: boolean // kilocode_change
   expect: (ctx: ScenarioContext, state: unknown, result: CallResult) => Effect.Effect<void>
   compare: Comparison
   capture: CaptureMode
@@ -104,6 +105,7 @@ export type BuilderState<S> = {
   seed: (ctx: ScenarioContext) => Effect.Effect<S>
   request: (ctx: SeededContext<S>) => RequestSpec
   authProbe: RequestSpec | undefined
+  validAuthProbe: boolean // kilocode_change
   capture: CaptureMode
   mutates: boolean
   reset: boolean
diff --git a/packages/opencode/test/skill/discovery.test.ts b/packages/opencode/test/skill/discovery.test.ts
index 5dc5d5195b..f454a6b3a7 100644
--- a/packages/opencode/test/skill/discovery.test.ts
+++ b/packages/opencode/test/skill/discovery.test.ts
@@ -24,6 +24,19 @@ beforeAll(async () => {
     async fetch(req) {
       const url = new URL(req.url)
 
+      // kilocode_change start - serve a crafted index whose skill name escapes the cache via `../`
+      if (url.pathname === "/evil/index.json") {
+        return Response.json({ skills: [{ name: "../../../.agents/skills/evil", files: ["SKILL.md"] }] })
+      }
+      if (url.pathname.endsWith("/.agents/skills/evil/SKILL.md")) {
+        return new Response("---\nname: evil\ndescription: evil.\n---\npwned")
+      }
+      // A file entry pointing at another origin (exfil/arbitrary-host download) must be rejected.
+      if (url.pathname === "/cross-origin/index.json") {
+        return Response.json({ skills: [{ name: "x", files: ["SKILL.md", "https://evil.example/payload"] }] })
+      }
+      // kilocode_change end
+
       // route /.well-known/skills/* to the fixture directory
       if (url.pathname.startsWith("/.well-known/skills/")) {
         const filePath = url.pathname.replace("/.well-known/skills/", "")
@@ -114,6 +127,29 @@ describe("Discovery.pull", () => {
     }),
   )
 
+  // kilocode_change start - path-traversal in the remote index must not plant a trusted skill
+  it.live("rejects a skill name that escapes the cache directory", () =>
+    Effect.gen(function* () {
+      const fsys = yield* FSUtil.Service
+      const discovery = yield* Discovery.Service
+      const dirs = yield* discovery.pull(`http://localhost:${server.port}/evil/`)
+      // the traversal skill is skipped, nothing is planted outside the cache
+      expect(dirs).toEqual([])
+      const escaped = path.join(cacheDir, "../../../.agents/skills/evil/SKILL.md")
+      expect(yield* fsys.existsSafe(escaped)).toBe(false)
+    }),
+  )
+
+  it.live("rejects a skill file that points at another origin", () =>
+    Effect.gen(function* () {
+      const discovery = yield* Discovery.Service
+      // a file entry resolving to a different host must be dropped (no download, skill skipped)
+      const dirs = yield* discovery.pull(`http://localhost:${server.port}/cross-origin/`)
+      expect(dirs).toEqual([])
+    }),
+  )
+  // kilocode_change end
+
   it.live("caches downloaded files on second pull", () =>
     Effect.gen(function* () {
       // clear dir and downloadCount
diff --git a/packages/opencode/test/tool/__snapshots__/parameters.test.ts.snap b/packages/opencode/test/tool/__snapshots__/parameters.test.ts.snap
index f4951dfa51..368225175b 100644
--- a/packages/opencode/test/tool/__snapshots__/parameters.test.ts.snap
+++ b/packages/opencode/test/tool/__snapshots__/parameters.test.ts.snap
@@ -462,7 +462,7 @@ exports[`tool parameters JSON Schema (wire shape) websearch 1`] = `
       "type": "string",
     },
     "numResults": {
-      "description": "Number of search results to return (default: 8)",
+      "description": "Number of search results to return (default: 8, maximum: 10)",
       "type": "number",
     },
     "query": {
diff --git a/packages/opencode/test/tool/registry.test.ts b/packages/opencode/test/tool/registry.test.ts
index 842990ad2a..cb53301b1b 100644
--- a/packages/opencode/test/tool/registry.test.ts
+++ b/packages/opencode/test/tool/registry.test.ts
@@ -29,6 +29,7 @@ const configLayer = TestConfig.layer({
 type RegistryLayerOptions = {
   flags?: Partial<RuntimeFlags.Info>
   plugin?: Layer.Layer<Plugin.Service>
+  config?: Parameters<typeof TestConfig.layer>[0] // kilocode_change
 }
 
 // Fake Plugin.Service that returns a single plugin whose `tool` map contains
@@ -59,7 +60,7 @@ const root = LayerNode.group([ToolRegistry.node, Agent.node])
 const registryLayer = (opts: RegistryLayerOptions = {}) =>
   LayerNode.buildLayer(root, {
     replacements: [
-      LayerNode.replace(Config.node, configLayer),
+      LayerNode.replace(Config.node, opts.config ? TestConfig.layer(opts.config) : configLayer), // kilocode_change
       LayerNode.replace(RuntimeFlags.node, RuntimeFlags.layer(opts.flags ?? {})),
       ...(opts.plugin ? [LayerNode.replace(Plugin.node, opts.plugin)] : []),
     ],
@@ -69,6 +70,17 @@ const it = testEffect(registryLayer())
 const scout = testEffect(registryLayer({ flags: { experimentalScout: true } })) // kilocode_change
 const withBrokenPlugin = testEffect(registryLayer({ plugin: brokenPluginLayer }))
 // kilocode_change start
+const websearch = testEffect(
+  registryLayer({
+    config: {
+      get: () =>
+        Effect.succeed({
+          web_search: true,
+          provider: { openai: { options: { apiKey: "test-openai-key" } } },
+        }),
+    },
+  }),
+)
 const sandboxed = testEffect(registryLayer({ flags: { experimentalLspTool: true } }))
 // kilocode_change end
 
@@ -88,6 +100,38 @@ function sandboxProfile(): Profile {
 
 describe("tool.registry", () => {
   // kilocode_change start
+  it.instance("hides websearch for a third-party provider by default", () =>
+    Effect.gen(function* () {
+      const registry = yield* ToolRegistry.Service
+      const agent = yield* Agent.Service
+      const build = yield* agent.get("build")
+      if (!build) return yield* Effect.die(new Error("build agent not found"))
+      const tools = yield* registry.tools({
+        providerID: ProviderV2.ID.openai,
+        modelID: ModelV2.ID.make("test"),
+        agent: build,
+      })
+
+      expect(tools.map((tool) => tool.id)).not.toContain("websearch")
+    }),
+  )
+
+  websearch.instance("shows websearch for a configured third-party provider when enabled", () =>
+    Effect.gen(function* () {
+      const registry = yield* ToolRegistry.Service
+      const agent = yield* Agent.Service
+      const build = yield* agent.get("build")
+      if (!build) return yield* Effect.die(new Error("build agent not found"))
+      const tools = yield* registry.tools({
+        providerID: ProviderV2.ID.openai,
+        modelID: ModelV2.ID.make("test"),
+        agent: build,
+      })
+
+      expect(tools.map((tool) => tool.id)).toContain("websearch")
+    }),
+  )
+
   sandboxed.instance("preserves built-in network classification through production tool definition processing", () =>
     Effect.gen(function* () {
       const registry = yield* ToolRegistry.Service
diff --git a/packages/plugin-atomic-chat/package.json b/packages/plugin-atomic-chat/package.json
index e3ee0bab74..2409e9af79 100644
--- a/packages/plugin-atomic-chat/package.json
+++ b/packages/plugin-atomic-chat/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin-atomic-chat",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "description": "Kilo Code plugin for Atomic Chat: auto-detection and dynamic model discovery (OpenAI-compatible local API)",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index f68b8ce481..455be0c020 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/script/package.json b/packages/script/package.json
index 879b34567f..a4b2c4545b 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -12,6 +12,6 @@
   "exports": {
     ".": "./src/index.ts"
   },
-  "version": "7.4.16",
+  "version": "7.4.17",
   "peerDependencies": {}
 }
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 8988da2029..4446c5f1de 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/sdk",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 81f6ac2e96..8370f418b1 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -137,6 +137,8 @@ import type {
   GlobalHealthResponses,
   GlobalUpgradeErrors,
   GlobalUpgradeResponses,
+  IndexingConsentErrors,
+  IndexingConsentResponses,
   IndexingModelsErrors,
   IndexingModelsResponses,
   IndexingStatusErrors,
@@ -1762,6 +1764,10 @@ export class Config2 extends HeyApiClient {
         [key: string]: unknown
       }
       unset?: Array<Array<string>>
+      expected?: {
+        path: string
+        revision: string
+      }
     },
     options?: Options<never, ThrowOnError>,
   ) {
@@ -1775,6 +1781,7 @@ export class Config2 extends HeyApiClient {
             { in: "body", key: "scope" },
             { in: "body", key: "set" },
             { in: "body", key: "unset" },
+            { in: "body", key: "expected" },
           ],
         },
       ],
@@ -3752,6 +3759,7 @@ export class Permission extends HeyApiClient {
       workspace?: string
       reply?: "once" | "always" | "reject"
       message?: string
+      interactive?: boolean
     },
     options?: Options<never, ThrowOnError>,
   ) {
@@ -3765,6 +3773,7 @@ export class Permission extends HeyApiClient {
             { in: "query", key: "workspace" },
             { in: "body", key: "reply" },
             { in: "body", key: "message" },
+            { in: "body", key: "interactive" },
           ],
         },
       ],
@@ -6529,6 +6538,43 @@ export class Indexing extends HeyApiClient {
       ...params,
     })
   }
+
+  /**
+   * Set indexing consent
+   *
+   * Set machine-local code indexing consent for the active project.
+   */
+  public consent<ThrowOnError extends boolean = false>(
+    parameters?: {
+      directory?: string
+      workspace?: string
+      enabled?: boolean
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "query", key: "directory" },
+            { in: "query", key: "workspace" },
+            { in: "body", key: "enabled" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).put<IndexingConsentResponses, IndexingConsentErrors, ThrowOnError>({
+      url: "/indexing/consent",
+      ...options,
+      ...params,
+      headers: {
+        "Content-Type": "application/json",
+        ...options?.headers,
+        ...params.headers,
+      },
+    })
+  }
 }
 
 export class InteractiveTerminal extends HeyApiClient {
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 61953cc620..d947b97ead 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1698,6 +1698,7 @@ export type Config = {
   tools?: {
     [key: string]: boolean
   }
+  web_search?: boolean
   attachment?: AttachmentConfig
   enterprise?: {
     url?: string
@@ -2102,6 +2103,7 @@ export type Command = {
   agent?: string
   model?: string
   source?: "command" | "mcp" | "skill"
+  trusted?: boolean
   template: string
   subtask?: boolean
   hints: Array<string>
@@ -2975,9 +2977,36 @@ export type ConfigOverlayResponse = {
     reason?: string
   }>
   targets: {
-    global?: string
-    project?: string
-    active?: string
+    global: {
+      scope: "global" | "project"
+      path: string
+      revision: string
+      exists: boolean
+      writable: boolean
+      raw: {
+        [key: string]: unknown
+      }
+    }
+    project: {
+      scope: "global" | "project"
+      path: string
+      revision: string
+      exists: boolean
+      writable: boolean
+      raw: {
+        [key: string]: unknown
+      }
+    }
+    active: {
+      scope: "global" | "project"
+      path: string
+      revision: string
+      exists: boolean
+      writable: boolean
+      raw: {
+        [key: string]: unknown
+      }
+    }
   }
   fields: {
     [key: string]: {
@@ -3023,6 +3052,21 @@ export type ConfigSourcesResponse = {
   }>
 }
 
+export type ConfigOverlayConflictError = {
+  code: "target-changed" | "revision-conflict"
+  message: string
+  target: {
+    scope: "global" | "project"
+    path: string
+    revision: string
+    exists: boolean
+    writable: boolean
+    raw: {
+      [key: string]: unknown
+    }
+  }
+}
+
 export type ConfigRulesResponse = {
   scope: "project"
   target: string
@@ -3557,7 +3601,7 @@ export type EventSessionTurnClose = {
   properties: {
     sessionID: string
     parentID?: string
-    reason: "completed" | "error" | "interrupted"
+    reason: "completed" | "error" | "interrupted" | "superseded"
   }
 }
 
@@ -7717,6 +7761,7 @@ export type AppSkillsResponses = {
     description?: string
     location: string
     content: string
+    trusted?: boolean
   }>
 }
 
@@ -8628,6 +8673,7 @@ export type PermissionReplyData = {
   body?: {
     reply: "once" | "always" | "reject"
     message?: string
+    interactive?: boolean
   }
   path: {
     requestID: string
@@ -11121,11 +11167,15 @@ export type ConfigOverlayResponse2 = ConfigOverlayResponses[keyof ConfigOverlayR
 
 export type ConfigOverlayUpdateData = {
   body?: {
-    scope?: "global" | "project"
+    scope: "global" | "project"
     set?: {
       [key: string]: unknown
     }
     unset?: Array<Array<string>>
+    expected?: {
+      path: string
+      revision: string
+    }
   }
   path?: never
   query?: {
@@ -11140,15 +11190,19 @@ export type ConfigOverlayUpdateErrors = {
    * Bad request
    */
   400: BadRequestError
+  /**
+   * ConfigOverlayConflictError
+   */
+  409: ConfigOverlayConflictError
 }
 
 export type ConfigOverlayUpdateError = ConfigOverlayUpdateErrors[keyof ConfigOverlayUpdateErrors]
 
 export type ConfigOverlayUpdateResponses = {
   /**
-   * Effective configuration after patch
+   * Resolved config overlay after patch
    */
-  200: Config
+  200: ConfigOverlayResponse
 }
 
 export type ConfigOverlayUpdateResponse = ConfigOverlayUpdateResponses[keyof ConfigOverlayUpdateResponses]
@@ -11568,6 +11622,36 @@ export type IndexingModelsResponses = {
 
 export type IndexingModelsResponse = IndexingModelsResponses[keyof IndexingModelsResponses]
 
+export type IndexingConsentData = {
+  body?: {
+    enabled: boolean
+  }
+  path?: never
+  query?: {
+    directory?: string
+    workspace?: string
+  }
+  url: "/indexing/consent"
+}
+
+export type IndexingConsentErrors = {
+  /**
+   * Bad request
+   */
+  400: BadRequestError
+}
+
+export type IndexingConsentError = IndexingConsentErrors[keyof IndexingConsentErrors]
+
+export type IndexingConsentResponses = {
+  /**
+   * Indexing status
+   */
+  200: IndexingStatus
+}
+
+export type IndexingConsentResponse = IndexingConsentResponses[keyof IndexingConsentResponses]
+
 export type InstanceReloadData = {
   body?: never
   path?: never
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 53526b5f00..730ec61c4c 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -3137,6 +3137,9 @@
                       },
                       "content": {
                         "type": "string"
+                      },
+                      "trusted": {
+                        "type": "boolean"
                       }
                     },
                     "required": ["name", "location", "content"],
@@ -5312,6 +5315,9 @@
                   },
                   "message": {
                     "type": "string"
+                  },
+                  "interactive": {
+                    "type": "boolean"
                   }
                 },
                 "required": ["reply"],
@@ -11549,11 +11555,11 @@
         ],
         "responses": {
           "200": {
-            "description": "Effective configuration after patch",
+            "description": "Resolved config overlay after patch",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/Config"
+                  "$ref": "#/components/schemas/ConfigOverlayResponse"
                 }
               }
             }
@@ -11567,6 +11573,16 @@
                 }
               }
             }
+          },
+          "409": {
+            "description": "ConfigOverlayConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConfigOverlayConflictError"
+                }
+              }
+            }
           }
         },
         "description": "Apply a minimal global or project config patch, including unset paths for reverting local overrides.",
@@ -11579,8 +11595,7 @@
                 "properties": {
                   "scope": {
                     "type": "string",
-                    "enum": ["global", "project"],
-                    "default": "project"
+                    "enum": ["global", "project"]
                   },
                   "set": {
                     "type": "object"
@@ -11593,8 +11608,22 @@
                         "type": "string"
                       }
                     }
+                  },
+                  "expected": {
+                    "type": "object",
+                    "properties": {
+                      "path": {
+                        "type": "string"
+                      },
+                      "revision": {
+                        "type": "string"
+                      }
+                    },
+                    "required": ["path", "revision"],
+                    "additionalProperties": false
                   }
                 },
+                "required": ["scope"],
                 "additionalProperties": false
               }
             }
@@ -12553,6 +12582,76 @@
         ]
       }
     },
+    "/indexing/consent": {
+      "put": {
+        "tags": ["indexing"],
+        "operationId": "indexing.consent",
+        "parameters": [
+          {
+            "name": "directory",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          },
+          {
+            "name": "workspace",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Indexing status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/IndexingStatus"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BadRequestError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Set machine-local code indexing consent for the active project.",
+        "summary": "Set indexing consent",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": ["enabled"],
+                "additionalProperties": false
+              }
+            }
+          }
+        },
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.indexing.consent({\n  ...\n})"
+          }
+        ]
+      }
+    },
     "/instance/reload": {
       "post": {
         "tags": ["instance-reload"],
@@ -24496,6 +24595,15 @@
           {
             "$ref": "#/components/schemas/EventServerInstanceDisposed"
           },
+          {
+            "$ref": "#/components/schemas/EventSessionTurnOpen"
+          },
+          {
+            "$ref": "#/components/schemas/EventSessionTurnClose"
+          },
+          {
+            "$ref": "#/components/schemas/EventSessionQueueChanged"
+          },
           {
             "$ref": "#/components/schemas/EventSessionNetworkAsked"
           },
@@ -24523,12 +24631,6 @@
           {
             "$ref": "#/components/schemas/EventInteractive_terminalDeleted"
           },
-          {
-            "$ref": "#/components/schemas/EventSessionTurnOpen"
-          },
-          {
-            "$ref": "#/components/schemas/EventSessionTurnClose"
-          },
           {
             "$ref": "#/components/schemas/EventSandboxStatusChanged"
           },
@@ -24557,10 +24659,10 @@
             "$ref": "#/components/schemas/EventKilocodeNotebookCancelled"
           },
           {
-            "$ref": "#/components/schemas/EventLspClientDiagnostics"
+            "$ref": "#/components/schemas/EventKilo-sessionsRemote-status-changed"
           },
           {
-            "$ref": "#/components/schemas/EventKilo-sessionsRemote-status-changed"
+            "$ref": "#/components/schemas/EventLspClientDiagnostics"
           },
           {
             "$ref": "#/components/schemas/EventMemoryStatus1"
@@ -24818,10 +24920,10 @@
             "$ref": "#/components/schemas/EventProjectUpdated"
           },
           {
-            "$ref": "#/components/schemas/EventLspUpdated"
+            "$ref": "#/components/schemas/EventVcsBranchUpdated"
           },
           {
-            "$ref": "#/components/schemas/EventVcsBranchUpdated"
+            "$ref": "#/components/schemas/EventLspUpdated"
           },
           {
             "$ref": "#/components/schemas/EventWorkspaceReady"
@@ -26838,7 +26940,7 @@
             "type": "object",
             "properties": {
               "start": {
-                "type": "number",
+                "type": "integer",
                 "minimum": 0
               }
             },
@@ -26914,11 +27016,11 @@
             "type": "object",
             "properties": {
               "start": {
-                "type": "number",
+                "type": "integer",
                 "minimum": 0
               },
               "end": {
-                "type": "number",
+                "type": "integer",
                 "minimum": 0
               },
               "elapsed": {
@@ -27686,6 +27788,15 @@
               {
                 "$ref": "#/components/schemas/EventServerInstanceDisposed"
               },
+              {
+                "$ref": "#/components/schemas/EventSessionTurnOpen"
+              },
+              {
+                "$ref": "#/components/schemas/EventSessionTurnClose"
+              },
+              {
+                "$ref": "#/components/schemas/EventSessionQueueChanged"
+              },
               {
                 "$ref": "#/components/schemas/EventSessionNetworkAsked"
               },
@@ -27713,12 +27824,6 @@
               {
                 "$ref": "#/components/schemas/EventInteractive_terminalDeleted"
               },
-              {
-                "$ref": "#/components/schemas/EventSessionTurnOpen"
-              },
-              {
-                "$ref": "#/components/schemas/EventSessionTurnClose"
-              },
               {
                 "$ref": "#/components/schemas/EventSandboxStatusChanged"
               },
@@ -27747,10 +27852,10 @@
                 "$ref": "#/components/schemas/EventKilocodeNotebookCancelled"
               },
               {
-                "$ref": "#/components/schemas/EventLspClientDiagnostics"
+                "$ref": "#/components/schemas/EventKilo-sessionsRemote-status-changed"
               },
               {
-                "$ref": "#/components/schemas/EventKilo-sessionsRemote-status-changed"
+                "$ref": "#/components/schemas/EventLspClientDiagnostics"
               },
               {
                 "$ref": "#/components/schemas/EventMemoryStatus"
@@ -28008,10 +28113,10 @@
                 "$ref": "#/components/schemas/EventProjectUpdated"
               },
               {
-                "$ref": "#/components/schemas/EventLspUpdated"
+                "$ref": "#/components/schemas/EventVcsBranchUpdated"
               },
               {
-                "$ref": "#/components/schemas/EventVcsBranchUpdated"
+                "$ref": "#/components/schemas/EventLspUpdated"
               },
               {
                 "$ref": "#/components/schemas/EventWorkspaceReady"
@@ -29446,6 +29551,9 @@
               "type": "boolean"
             }
           },
+          "web_search": {
+            "type": "boolean"
+          },
           "attachment": {
             "$ref": "#/components/schemas/AttachmentConfig"
           },
@@ -30676,6 +30784,9 @@
             "type": "string",
             "enum": ["command", "mcp", "skill"]
           },
+          "trusted": {
+            "type": "boolean"
+          },
           "template": {
             "type": "string"
           },
@@ -33425,15 +33536,85 @@
             "type": "object",
             "properties": {
               "global": {
-                "type": "string"
+                "type": "object",
+                "properties": {
+                  "scope": {
+                    "type": "string",
+                    "enum": ["global", "project"]
+                  },
+                  "path": {
+                    "type": "string"
+                  },
+                  "revision": {
+                    "type": "string"
+                  },
+                  "exists": {
+                    "type": "boolean"
+                  },
+                  "writable": {
+                    "type": "boolean"
+                  },
+                  "raw": {
+                    "type": "object"
+                  }
+                },
+                "required": ["scope", "path", "revision", "exists", "writable", "raw"],
+                "additionalProperties": false
               },
               "project": {
-                "type": "string"
+                "type": "object",
+                "properties": {
+                  "scope": {
+                    "type": "string",
+                    "enum": ["global", "project"]
+                  },
+                  "path": {
+                    "type": "string"
+                  },
+                  "revision": {
+                    "type": "string"
+                  },
+                  "exists": {
+                    "type": "boolean"
+                  },
+                  "writable": {
+                    "type": "boolean"
+                  },
+                  "raw": {
+                    "type": "object"
+                  }
+                },
+                "required": ["scope", "path", "revision", "exists", "writable", "raw"],
+                "additionalProperties": false
               },
               "active": {
-                "type": "string"
+                "type": "object",
+                "properties": {
+                  "scope": {
+                    "type": "string",
+                    "enum": ["global", "project"]
+                  },
+                  "path": {
+                    "type": "string"
+                  },
+                  "revision": {
+                    "type": "string"
+                  },
+                  "exists": {
+                    "type": "boolean"
+                  },
+                  "writable": {
+                    "type": "boolean"
+                  },
+                  "raw": {
+                    "type": "object"
+                  }
+                },
+                "required": ["scope", "path", "revision", "exists", "writable", "raw"],
+                "additionalProperties": false
               }
             },
+            "required": ["global", "project", "active"],
             "additionalProperties": false
           },
           "fields": {
@@ -33583,6 +33764,46 @@
         "required": ["sources"],
         "additionalProperties": false
       },
+      "ConfigOverlayConflictError": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "string",
+            "enum": ["target-changed", "revision-conflict"]
+          },
+          "message": {
+            "type": "string"
+          },
+          "target": {
+            "type": "object",
+            "properties": {
+              "scope": {
+                "type": "string",
+                "enum": ["global", "project"]
+              },
+              "path": {
+                "type": "string"
+              },
+              "revision": {
+                "type": "string"
+              },
+              "exists": {
+                "type": "boolean"
+              },
+              "writable": {
+                "type": "boolean"
+              },
+              "raw": {
+                "type": "object"
+              }
+            },
+            "required": ["scope", "path", "revision", "exists", "writable", "raw"],
+            "additionalProperties": false
+          }
+        },
+        "required": ["code", "message", "target"],
+        "additionalProperties": false
+      },
       "ConfigRulesResponse": {
         "type": "object",
         "properties": {
@@ -35218,6 +35439,96 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
+      "EventSessionTurnOpen": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["session.turn.open"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "pattern": "^ses"
+              }
+            },
+            "required": ["sessionID"],
+            "additionalProperties": false
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
+      "EventSessionTurnClose": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["session.turn.close"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "pattern": "^ses"
+              },
+              "parentID": {
+                "type": "string",
+                "pattern": "^ses"
+              },
+              "reason": {
+                "type": "string",
+                "enum": ["completed", "error", "interrupted", "superseded"]
+              }
+            },
+            "required": ["sessionID", "reason"],
+            "additionalProperties": false
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
+      "EventSessionQueueChanged": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["session.queue.changed"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "pattern": "^ses"
+              },
+              "queued": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "pattern": "^msg"
+                }
+              }
+            },
+            "required": ["sessionID", "queued"],
+            "additionalProperties": false
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
       "EventSessionNetworkAsked": {
         "type": "object",
         "properties": {
@@ -35470,64 +35781,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventSessionTurnOpen": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["session.turn.open"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {
-              "sessionID": {
-                "type": "string",
-                "pattern": "^ses"
-              }
-            },
-            "required": ["sessionID"],
-            "additionalProperties": false
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
-      "EventSessionTurnClose": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["session.turn.close"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {
-              "sessionID": {
-                "type": "string",
-                "pattern": "^ses"
-              },
-              "parentID": {
-                "type": "string",
-                "pattern": "^ses"
-              },
-              "reason": {
-                "type": "string",
-                "enum": ["completed", "error", "interrupted"]
-              }
-            },
-            "required": ["sessionID", "reason"],
-            "additionalProperties": false
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
       "EventSandboxStatusChanged": {
         "type": "object",
         "properties": {
@@ -35837,33 +36090,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventLspClientDiagnostics": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["lsp.client.diagnostics"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {
-              "serverID": {
-                "type": "string"
-              },
-              "path": {
-                "type": "string"
-              }
-            },
-            "required": ["serverID", "path"],
-            "additionalProperties": false
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
       "EventKilo-sessionsRemote-status-changed": {
         "type": "object",
         "properties": {
@@ -35891,6 +36117,33 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
+      "EventLspClientDiagnostics": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["lsp.client.diagnostics"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {
+              "serverID": {
+                "type": "string"
+              },
+              "path": {
+                "type": "string"
+              }
+            },
+            "required": ["serverID", "path"],
+            "additionalProperties": false
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
       "EventMemoryStatus": {
         "type": "object",
         "properties": {
@@ -39854,24 +40107,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventLspUpdated": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["lsp.updated"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {}
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
       "EventVcsBranchUpdated": {
         "type": "object",
         "properties": {
@@ -39895,6 +40130,24 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
+      "EventLspUpdated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["lsp.updated"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {}
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
       "EventWorkspaceReady": {
         "type": "object",
         "properties": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 7458002a84..1dc884c72e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/server",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/server/src/groups/pty.ts b/packages/server/src/groups/pty.ts
index 1c07a3e32f..3e6cb4631d 100644
--- a/packages/server/src/groups/pty.ts
+++ b/packages/server/src/groups/pty.ts
@@ -10,6 +10,7 @@ import { LocationQuery, locationQueryOpenApi, LocationMiddleware } from "./locat
 export const PTY_CONNECT_TICKET_QUERY = "ticket"
 export const PTY_CONNECT_TOKEN_HEADER = "x-kilo-ticket"
 export const PTY_CONNECT_TOKEN_HEADER_VALUE = "1"
+export const PTY_REPLAY_EXITED_QUERY = "replayExited"
 
 const PTY_CONNECT_PATH = /^\/api\/pty\/[^/]+\/connect$/
 
@@ -130,7 +131,13 @@ export const PtyGroup = HttpApiGroup.make("server.pty")
           ...operation,
           parameters: [
             ...(operation.parameters ?? []),
-            ...["location[directory]", "location[workspace]", "cursor", PTY_CONNECT_TICKET_QUERY].map((name) => ({
+            ...[
+              "location[directory]",
+              "location[workspace]",
+              "cursor",
+              PTY_CONNECT_TICKET_QUERY,
+              PTY_REPLAY_EXITED_QUERY,
+            ].map((name) => ({
               in: "query",
               name,
               schema: { type: "string" },
diff --git a/packages/server/src/handlers/pty.ts b/packages/server/src/handlers/pty.ts
index a59afb3b31..bcb675e12d 100644
--- a/packages/server/src/handlers/pty.ts
+++ b/packages/server/src/handlers/pty.ts
@@ -9,7 +9,12 @@ import * as Socket from "effect/unstable/socket/Socket"
 import { Api } from "../api"
 import { CorsConfig, isAllowedRequestOrigin } from "../cors"
 import { ForbiddenError, PtyNotFoundError } from "../errors"
-import { PTY_CONNECT_TICKET_QUERY, PTY_CONNECT_TOKEN_HEADER, PTY_CONNECT_TOKEN_HEADER_VALUE } from "../groups/pty"
+import {
+  PTY_CONNECT_TICKET_QUERY,
+  PTY_CONNECT_TOKEN_HEADER,
+  PTY_CONNECT_TOKEN_HEADER_VALUE,
+  PTY_REPLAY_EXITED_QUERY,
+} from "../groups/pty"
 import { response } from "../groups/location"
 import { PtyEnvironment } from "../pty-environment"
 
@@ -178,6 +183,7 @@ export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) =>
               cursor,
               onData: (chunk) => Queue.offerUnsafe(outbox, chunk),
               onEnd: () => Queue.offerUnsafe(outbox, new Socket.CloseEvent(1000)),
+              allowExited: url.searchParams.get(PTY_REPLAY_EXITED_QUERY) === "1", // kilocode_change
             })
             .pipe(
               Effect.catchTags({
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 22fe404a5f..163306ec46 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -26,7 +26,7 @@
     "typescript": "catalog:",
     "vite": "catalog:"
   },
-  "version": "7.4.16",
+  "version": "7.4.17",
   "dependencies": {},
   "peerDependencies": {}
 }
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 344179e4d0..87fe7949af 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/tui",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/tui/src/feature-plugins/sidebar/context.tsx b/packages/tui/src/feature-plugins/sidebar/context.tsx
index e5bd16e8af..fd1c3bb39b 100644
--- a/packages/tui/src/feature-plugins/sidebar/context.tsx
+++ b/packages/tui/src/feature-plugins/sidebar/context.tsx
@@ -1,7 +1,7 @@
 import type { AssistantMessage } from "@kilocode/sdk/v2"
 import type { TuiPlugin, TuiPluginApi } from "@kilocode/plugin/tui"
 import type { BuiltinTuiPlugin } from "../builtins"
-import { createMemo } from "solid-js"
+import { createMemo, createSignal, Show } from "solid-js" // kilocode_change
 
 const id = "internal:sidebar-context"
 
@@ -11,6 +11,9 @@ const money = new Intl.NumberFormat("en-US", {
 })
 
 function View(props: { api: TuiPluginApi; session_id: string }) {
+  // kilocode_change start
+  const [open, setOpen] = createSignal(true)
+  // kilocode_change end
   const theme = () => props.api.theme.current
   const msg = createMemo(() => props.api.state.session.messages(props.session_id))
   const session = createMemo(() => props.api.state.session.get(props.session_id))
@@ -44,12 +47,25 @@ function View(props: { api: TuiPluginApi; session_id: string }) {
 
   return (
     <box>
-      <text fg={theme().text}>
-        <b>Context</b>
-      </text>
-      <text fg={theme().textMuted}>{state().tokens.toLocaleString()} tokens</text>
-      <text fg={theme().textMuted}>{state().percent ?? 0}% used</text>
-      <text fg={theme().textMuted}>{money.format(cost())} spent</text>
+      {/* kilocode_change start */}
+      <box flexDirection="row" gap={1} onMouseDown={() => setOpen((x) => !x)}>
+        <text fg={theme().text}>{open() ? "▼" : "▶"}</text>
+        <text fg={theme().text}>
+          <b>Context</b>
+          <Show when={!open()}>
+            <span style={{ fg: theme().textMuted }}>
+              {" "}
+              ({state().percent ?? 0}% · {money.format(cost())})
+            </span>
+          </Show>
+        </text>
+      </box>
+      <Show when={open()}>
+        <text fg={theme().textMuted}>{state().tokens.toLocaleString()} tokens</text>
+        <text fg={theme().textMuted}>{state().percent ?? 0}% used</text>
+        <text fg={theme().textMuted}>{money.format(cost())} spent</text>
+      </Show>
+      {/* kilocode_change end */}
     </box>
   )
 }
diff --git a/packages/tui/src/routes/session/permission.tsx b/packages/tui/src/routes/session/permission.tsx
index 6e712ccd34..17ad94972f 100644
--- a/packages/tui/src/routes/session/permission.tsx
+++ b/packages/tui/src/routes/session/permission.tsx
@@ -19,6 +19,7 @@ import { ConfigProtection } from "@/kilocode/permission/config-paths"
 import { splitDiffHunks } from "@/kilocode/tui/diff"
 import { normalizeUrls } from "@/kilocode/util/url"
 import { MemoryPermissionRegistry } from "@/kilocode/cli/cmd/tui/routes/session/memory-permission"
+import { skillShellPrompt } from "@/kilocode/skills/display"
 // kilocode_change end
 import { KILO_BASE_MODE, useBindings, useCommandShortcut } from "../../keymap"
 import { usePathFormatter } from "../../context/path-format"
@@ -192,6 +193,7 @@ export function PermissionPrompt(props: { request: PermissionRequest; directory?
               requestID: props.request.id,
               directory: props.directory,
               workspace: project.workspace.current(),
+              interactive: true, // kilocode_change - human answered this prompt
             })
           }}
         />
@@ -291,6 +293,20 @@ export function PermissionPrompt(props: { request: PermissionRequest; directory?
             }
 
             if (permission === "bash") {
+              // kilocode_change start - skill shell batches show the verbatim, escaped commands + skill title
+              const skillShell = skillShellPrompt(props.request.metadata)
+              if (skillShell) {
+                return {
+                  icon: "#",
+                  title: skillShell.title,
+                  body: (
+                    <box paddingLeft={1}>
+                      <For each={skillShell.commands}>{(cmd) => <text fg={theme.text}>{"$ " + cmd}</text>}</For>
+                    </box>
+                  ),
+                }
+              }
+              // kilocode_change end
               // kilocode_change start
               const meta = props.request.metadata ?? {}
               const desc =
@@ -446,10 +462,12 @@ export function PermissionPrompt(props: { request: PermissionRequest; directory?
             </box>
           )
 
-          // kilocode_change start - hide "Always allow" for protected Kilo configuration access
-          const options: Record<string, string> = props.request.metadata?.[ConfigProtection.DISABLE_ALWAYS_KEY]
-            ? { once: "Allow once", reject: "Reject" }
-            : { once: "Allow once", always: "Allow always", reject: "Reject" }
+          // kilocode_change start - skill shell batches are never persisted: only Allow / Reject
+          const options: Record<string, string> = props.request.metadata?.["skillShell"]
+            ? { once: "Allow", reject: "Reject" }
+            : props.request.metadata?.[ConfigProtection.DISABLE_ALWAYS_KEY]
+              ? { once: "Allow once", reject: "Reject" }
+              : { once: "Allow once", always: "Allow always", reject: "Reject" }
           // kilocode_change end
 
           const body = (
@@ -483,6 +501,7 @@ export function PermissionPrompt(props: { request: PermissionRequest; directory?
                   requestID: props.request.id,
                   directory: props.directory,
                   workspace: project.workspace.current(),
+                  interactive: true, // kilocode_change - human answered this prompt
                 })
               }}
             />
diff --git a/packages/ui/package.json b/packages/ui/package.json
index d5b27305ac..bb4a10d842 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/script/upstream/package.json b/script/upstream/package.json
index 254cd0b36e..753ce3fa52 100644
--- a/script/upstream/package.json
+++ b/script/upstream/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/upstream-merge",
-  "version": "7.4.16",
+  "version": "7.4.17",
   "private": true,
   "type": "module",
   "description": "Scripts for automating upstream opencode merges into Kilo",