diff --git a/.changeset/adaptive-opus-five.md b/.changeset/adaptive-opus-five.md
new file mode 100644
index 00000000000..9d8cf6c1b31
--- /dev/null
+++ b/.changeset/adaptive-opus-five.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Support adaptive thinking levels for Claude Opus and Sonnet 5 and later.
diff --git a/.changeset/agent-manager-side-terminal.md b/.changeset/agent-manager-side-terminal.md
new file mode 100644
index 00000000000..533da3233cb
--- /dev/null
+++ b/.changeset/agent-manager-side-terminal.md
@@ -0,0 +1,5 @@
+---
+"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/atomic-session-revert.md b/.changeset/atomic-session-revert.md
new file mode 100644
index 00000000000..ed922d1a6e2
--- /dev/null
+++ b/.changeset/atomic-session-revert.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": patch
+"kilo-code": patch
+---
+
+Keep conversations and workspace files unchanged when a checkpoint cannot be fully restored.
diff --git a/.changeset/console-headless-credentials.md b/.changeset/console-headless-credentials.md
new file mode 100644
index 00000000000..6c6102f4674
--- /dev/null
+++ b/.changeset/console-headless-credentials.md
@@ -0,0 +1,5 @@
+---
+"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/fix-nix-bun-pin.md b/.changeset/fix-nix-bun-pin.md
new file mode 100644
index 00000000000..5facef0667f
--- /dev/null
+++ b/.changeset/fix-nix-bun-pin.md
@@ -0,0 +1,5 @@
+---
+"@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
new file mode 100644
index 00000000000..d71009746d3
--- /dev/null
+++ b/.changeset/fix-scoped-mode-cycling.md
@@ -0,0 +1,5 @@
+---
+"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
new file mode 100644
index 00000000000..c7ed178ad9b
--- /dev/null
+++ b/.changeset/fix-vscode-settings-save.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix settings changes sometimes failing to save and apply in VS Code.
diff --git a/.changeset/fuzzy-tildes-smile.md b/.changeset/fuzzy-tildes-smile.md
new file mode 100644
index 00000000000..39c76209f86
--- /dev/null
+++ b/.changeset/fuzzy-tildes-smile.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Preserve parenthesized tilde expressions as literal text in rendered chat messages.
diff --git a/.changeset/ingest-shutdown-flush.md b/.changeset/ingest-shutdown-flush.md
new file mode 100644
index 00000000000..94ff86a5b1c
--- /dev/null
+++ b/.changeset/ingest-shutdown-flush.md
@@ -0,0 +1,5 @@
+---
+"@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
new file mode 100644
index 00000000000..d34f46dc044
--- /dev/null
+++ b/.changeset/instant-prompt-tooltips.md
@@ -0,0 +1,5 @@
+---
+"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
new file mode 100644
index 00000000000..d0239ff1765
--- /dev/null
+++ b/.changeset/jetbrains-bundled-cli.md
@@ -0,0 +1,5 @@
+---
+"@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
new file mode 100644
index 00000000000..b22d8c8353c
--- /dev/null
+++ b/.changeset/jetbrains-queued-prompts.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Allow sending prompts while a session is busy and show queued prompts with a remove action.
diff --git a/.changeset/opencode-v1-17-5-to-v1-17-9.md b/.changeset/opencode-v1-17-5-to-v1-17-9.md
new file mode 100644
index 00000000000..5a019637c3e
--- /dev/null
+++ b/.changeset/opencode-v1-17-5-to-v1-17-9.md
@@ -0,0 +1,30 @@
+---
+"@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/pwsh-permission-fail-closed.md b/.changeset/pwsh-permission-fail-closed.md
new file mode 100644
index 00000000000..cb140f33cdf
--- /dev/null
+++ b/.changeset/pwsh-permission-fail-closed.md
@@ -0,0 +1,5 @@
+---
+"@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
new file mode 100644
index 00000000000..bc7f513506e
--- /dev/null
+++ b/.changeset/quiet-json-events.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Emit each agent event once from `kilo run --format json`.
diff --git a/.changeset/quiet-vscode-watchers.md b/.changeset/quiet-vscode-watchers.md
new file mode 100644
index 00000000000..0f44b7cfda8
--- /dev/null
+++ b/.changeset/quiet-vscode-watchers.md
@@ -0,0 +1,6 @@
+---
+"@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
new file mode 100644
index 00000000000..566918cf939
--- /dev/null
+++ b/.changeset/reliable-vscode-message-copy.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep message and response copy buttons working after switching focus away from VS Code.
diff --git a/.changeset/safe-windows-snapshot-diffs.md b/.changeset/safe-windows-snapshot-diffs.md
new file mode 100644
index 00000000000..55dd9e61bc6
--- /dev/null
+++ b/.changeset/safe-windows-snapshot-diffs.md
@@ -0,0 +1,6 @@
+---
+"@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/stalled-provider-first-byte.md b/.changeset/stalled-provider-first-byte.md
new file mode 100644
index 00000000000..2d11921fd62
--- /dev/null
+++ b/.changeset/stalled-provider-first-byte.md
@@ -0,0 +1,5 @@
+---
+"@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
new file mode 100644
index 00000000000..e95a9d4c734
--- /dev/null
+++ b/.changeset/steady-cli-subprocess-tests.md
@@ -0,0 +1,5 @@
+---
+"@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
new file mode 100644
index 00000000000..84e5f2b0b56
--- /dev/null
+++ b/.changeset/steady-editor-tabs.md
@@ -0,0 +1,5 @@
+---
+"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
new file mode 100644
index 00000000000..85c3ca15810
--- /dev/null
+++ b/.changeset/tidy-am-i18n-keys.md
@@ -0,0 +1,5 @@
+---
+"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/tui-variant-shortcut-hint.md b/.changeset/tui-variant-shortcut-hint.md
new file mode 100644
index 00000000000..8891876bdb9
--- /dev/null
+++ b/.changeset/tui-variant-shortcut-hint.md
@@ -0,0 +1,5 @@
+---
+"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/edit.mjs b/.github/docs-sync/edit.mjs
index 52943de31ab..777c3a2929c 100644
--- a/.github/docs-sync/edit.mjs
+++ b/.github/docs-sync/edit.mjs
@@ -6,20 +6,22 @@
  * Batching bounds each `kilo run` context (a replay window can yield dozens
  * of docs-worthy PRs with large diffs). Each batch gets its own CLI session
  * and writes its own summary file; results are merged into
- * docs-sync-out/edit-summary.json. A batch that fails is skipped with a
- * warning — its PRs show up in the rolling PR body as skipped, so nothing
- * fails silently.
+ * docs-sync-out/edit-summary.json. A batch that fails or is deferred by the
+ * wall-clock budget is recorded as action "pending" so the watermark holds
+ * back and the next run re-collects those PRs.
  *
- * Env: EDIT_MODEL (provider/model), KILO_API_KEY (set by workflow; read natively by the kilo provider).
+ * Env: EDIT_MODEL (provider/model), KILO_API_KEY + KILO_ORG_ID (set by workflow; read natively by the kilo provider).
+ * Budgets: EDIT_BUDGET_MINUTES (default 50), EDIT_BATCH_TIMEOUT_MINUTES (default 15).
+ * Test hook: DOCS_SYNC_BACKOFF_MS replaces every retry wait when set.
  */
 
-import { execFileSync } from "node:child_process"
 import fs from "node:fs"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
+import { backoffMsForAttempt, deadline, remainingMs, runKilo, sleepSync } from "./lib.mjs"
 
 const BATCH_SIZE = 5
-const ATTEMPTS = 2
+const ATTEMPTS = 3
 const OUT_DIR = "docs-sync-out"
 export const SUMMARY_FILE = ".docs-sync-summary.json"
 
@@ -28,6 +30,10 @@ const basePrompt = fs.readFileSync(path.join(HERE, "edit-prompt.md"), "utf8")
 const model = process.env.EDIT_MODEL
 if (!model) throw new Error("EDIT_MODEL is required")
 
+const EDIT_BUDGET_MINUTES = Number(process.env.EDIT_BUDGET_MINUTES) || 50
+const EDIT_BATCH_TIMEOUT_MINUTES = Number(process.env.EDIT_BATCH_TIMEOUT_MINUTES) || 15
+const BATCH_TIMEOUT_MS = EDIT_BATCH_TIMEOUT_MINUTES * 60 * 1000
+
 const worthy = JSON.parse(fs.readFileSync(`${OUT_DIR}/worthy.json`, "utf8"))
 const triage = JSON.parse(fs.readFileSync(`${OUT_DIR}/triage.json`, "utf8"))
 const priority = new Map(triage.map((e) => [e.url, e]))
@@ -36,7 +42,18 @@ const ordered = [...worthy].sort((a, b) => {
   return (rank[priority.get(a.url)?.priority] ?? 1) - (rank[priority.get(b.url)?.priority] ?? 1)
 })
 
-function editBatch(batch, index) {
+/** @type {Map<string, string>} url → pending cause for failed/deferred batches */
+const pendingCauses = new Map()
+
+function formatCause(result) {
+  const bits = []
+  if (result.timedOut) bits.push("timed out")
+  if (result.exitCode !== null && result.exitCode !== undefined) bits.push(`exit ${result.exitCode}`)
+  if (result.stderrTail) bits.push(result.stderrTail.replaceAll("\n", " ").slice(0, 200))
+  return bits.join("; ") || "no diagnostic"
+}
+
+function editBatch(batch, index, budgetDeadline) {
   const batchFile = `${OUT_DIR}/edit-batch-${index}.json`
   const triageFile = `${OUT_DIR}/edit-batch-triage-${index}.json`
   const summaryFile = `${OUT_DIR}/edit-summary-${index}.json`
@@ -54,31 +71,59 @@ function editBatch(batch, index) {
 
 Batch specifics for this run: the PRs to handle are in the attached ${batchFile} (full details) and ${triageFile} (triage verdicts). Handle ONLY the PRs in these batch files. When finished, write your per-PR results in the summary JSON format described above to the file \`${summaryFile}\` (path relative to the repository root).`
 
+  let lastCause = "edit pass failed"
   for (let attempt = 1; attempt <= ATTEMPTS; attempt++) {
-    try {
-      // Message positional first: --file is multi-value and would otherwise
-      // consume a trailing message as a file path ("File not found").
-      execFileSync(
-        "kilo",
-        ["run", prompt, "-m", model, "--variant", "high", "--dir", process.cwd(), "-f", batchFile, "-f", triageFile],
-        // stdout streams live to the Actions log; stderr is piped so failure
-        // warnings can include the tail of the actual CLI error.
-        { encoding: "utf8", maxBuffer: 32 * 1024 * 1024, timeout: 25 * 60 * 1000, stdio: ["ignore", "inherit", "pipe"] },
+    const left = remainingMs(budgetDeadline)
+    if (left < BATCH_TIMEOUT_MS) {
+      lastCause = `edit budget exhausted before batch ${index} attempt ${attempt} (${Math.ceil(left / 1000)}s left, need ${EDIT_BATCH_TIMEOUT_MINUTES}m)`
+      console.warn(
+        `batch ${index}: stopping retries — remaining budget cannot fit another ${EDIT_BATCH_TIMEOUT_MINUTES}m attempt`,
       )
-      if (fs.existsSync(summaryFile)) return true
-      // Tolerate the agent dropping the docs-sync-out/ prefix.
-      const alt = path.basename(summaryFile)
-      if (fs.existsSync(alt)) {
-        fs.renameSync(alt, summaryFile)
-        return true
+      break
+    }
+
+    const result = runKilo({
+      args: ["run", 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}`,
+    })
+
+    if (fs.existsSync(summaryFile)) return true
+    // Tolerate the agent dropping the docs-sync-out/ prefix.
+    const alt = path.basename(summaryFile)
+    if (fs.existsSync(alt)) {
+      fs.renameSync(alt, summaryFile)
+      return true
+    }
+
+    // Exit 0 is not success: missing summary is a failure logged WITH the
+    // captured stderrTail and exit code on every attempt.
+    const cause = formatCause(result)
+    lastCause = `edit batch ${index}: ${cause}`
+    console.warn(
+      `batch ${index} attempt ${attempt}: summary file ${summaryFile} not produced` +
+        ` (exit ${result.exitCode}${result.timedOut ? ", timed out" : ""})` +
+        (result.stderrTail ? `\nstderr tail:\n${result.stderrTail}` : "\nstderr tail: (empty)"),
+    )
+
+    if (attempt < ATTEMPTS) {
+      const wait = backoffMsForAttempt(attempt)
+      // Skip the wait when the remaining budget cannot fit another attempt.
+      const afterWait = remainingMs(budgetDeadline) - wait
+      if (wait > 0 && afterWait >= BATCH_TIMEOUT_MS) {
+        console.warn(`batch ${index}: backing off ${wait / 1000}s before attempt ${attempt + 1}`)
+        sleepSync(wait)
+      } else if (wait > 0) {
+        console.warn(
+          `batch ${index}: skipping backoff — remaining budget cannot fit attempt ${attempt + 1} after wait`,
+        )
       }
-      console.warn(`batch ${index} attempt ${attempt}: summary file ${summaryFile} not produced`)
-    } catch (err) {
-      const stderr = String(err.stderr ?? "").trim().split("\n").slice(-5).join("\n")
-      console.warn(`batch ${index} attempt ${attempt}: kilo run failed: ${stderr || err.message}`)
     }
   }
-  console.warn(`::warning::edit batch ${index} failed after ${ATTEMPTS} attempts; ${batch.length} PRs skipped`)
+
+  console.warn(`::warning::edit batch ${index} failed after up to ${ATTEMPTS} attempts; ${batch.length} PRs pending`)
+  for (const d of batch) pendingCauses.set(d.url, lastCause)
   return false
 }
 
@@ -88,12 +133,34 @@ for (let i = 0; i < ordered.length; i += BATCH_SIZE) {
 }
 console.log(`editing docs for ${ordered.length} PRs in ${batches.length} batches of up to ${BATCH_SIZE}`)
 
+const budgetDeadline = deadline(EDIT_BUDGET_MINUTES)
+let deferredFrom = -1
+
 for (let i = 0; i < batches.length; i++) {
-  editBatch(batches[i], i)
+  const left = remainingMs(budgetDeadline)
+  if (left < BATCH_TIMEOUT_MS) {
+    deferredFrom = i
+    const deferredPrs = batches.slice(i).reduce((n, b) => n + b.length, 0)
+    console.warn(
+      `stopping edit pass before batch ${i}: remaining budget (${Math.ceil(left / 1000)}s) cannot fit a ${EDIT_BATCH_TIMEOUT_MINUTES}m batch; deferring ${deferredPrs} PRs`,
+    )
+    const cause = `edit budget exhausted before batch ${i} (${Math.ceil(left / 1000)}s left)`
+    for (let j = i; j < batches.length; j++) {
+      for (const d of batches[j]) pendingCauses.set(d.url, cause)
+    }
+    break
+  }
+  editBatch(batches[i], i, budgetDeadline)
+}
+
+if (deferredFrom >= 0) {
+  console.warn(
+    `edit pass deferred ${batches.slice(deferredFrom).reduce((n, b) => n + b.length, 0)} PRs due to wall-clock budget`,
+  )
 }
 
 // Merge batch summaries. Coverage: every worthy PR gets an entry so the PR
-// body accounts for it; failed batches show up as skipped.
+// body accounts for it; failed/deferred batches show up as pending (not skipped).
 const merged = []
 const seen = new Set()
 for (let i = 0; i < batches.length; i++) {
@@ -108,15 +175,24 @@ for (let i = 0; i < batches.length; i++) {
     const url = String(e?.url ?? "")
     if (!url.startsWith("http") || seen.has(url)) continue
     seen.add(url)
-    merged.push({ pr: Number(e.pr) || 0, url, action: String(e.action ?? "skipped"), reason: String(e.reason ?? "") })
+    merged.push({
+      pr: Number(e.pr) || 0,
+      url,
+      action: String(e.action ?? "skipped"),
+      reason: String(e.reason ?? ""),
+    })
   }
 }
 for (const d of ordered) {
   if (seen.has(d.url)) continue
-  merged.push({ pr: d.number, url: d.url, action: "skipped", reason: "edit pass failed or timed out for this PR" })
+  const cause = pendingCauses.get(d.url) || "edit pass failed or timed out for this PR"
+  merged.push({ pr: d.number, url: d.url, action: "pending", reason: cause })
 }
 
 // upsert-pr.mjs consumes the merged summary from the repo root; the file is
 // removed there before committing so it never lands in the docs PR.
 fs.writeFileSync(SUMMARY_FILE, JSON.stringify(merged, null, 2))
-console.log(`edit pass complete: ${merged.filter((e) => e.action !== "skipped").length} changed, ${merged.filter((e) => e.action === "skipped").length} skipped`)
+const changed = merged.filter((e) => e.action !== "skipped" && e.action !== "pending").length
+const skipped = merged.filter((e) => e.action === "skipped").length
+const pending = merged.filter((e) => e.action === "pending").length
+console.log(`edit pass complete: ${changed} changed, ${skipped} skipped, ${pending} pending`)
diff --git a/.github/docs-sync/lib.mjs b/.github/docs-sync/lib.mjs
index 56dfb7b9226..67c13354d88 100644
--- a/.github/docs-sync/lib.mjs
+++ b/.github/docs-sync/lib.mjs
@@ -6,6 +6,7 @@
  * gh CLI.
  */
 
+import { spawnSync } from "node:child_process"
 import fs from "node:fs"
 
 const API = "https://api.github.com"
@@ -111,3 +112,97 @@ export function appendSummary(markdown) {
   const summary = process.env.GITHUB_STEP_SUMMARY
   if (summary) fs.appendFileSync(summary, markdown + "\n")
 }
+
+/**
+ * Absolute deadline timestamp (ms since epoch) for a wall-clock budget.
+ * Used by triage/edit to stop before the job timeout rather than silently
+ * truncating.
+ */
+export function deadline(minutes) {
+  return Date.now() + Number(minutes) * 60 * 1000
+}
+
+/** Remaining milliseconds until a deadline; never negative. */
+export function remainingMs(deadlineMs) {
+  return Math.max(0, Number(deadlineMs) - Date.now())
+}
+
+/**
+ * Backoff schedule between kilo-run attempts. Production waits 60s then 300s
+ * (observed outage lasted ~11 min; batch 8 recovered on attempt 2). When
+ * DOCS_SYNC_BACKOFF_MS is set it replaces EVERY wait (`0` disables waiting);
+ * the workflow never sets it — only selftests do.
+ */
+export function backoffMsForAttempt(attempt) {
+  // attempt is 1-based; wait happens after attempt N before attempt N+1.
+  const override = process.env.DOCS_SYNC_BACKOFF_MS
+  if (override !== undefined && override !== "") {
+    const n = Number(override)
+    return Number.isFinite(n) && n >= 0 ? n : 0
+  }
+  // After attempt 1 → 60s; after attempt 2 → 300s; nothing after the last.
+  if (attempt === 1) return 60_000
+  if (attempt === 2) return 300_000
+  return 0
+}
+
+/**
+ * Blocking sleep used between kilo-run retries. Prefer this over async sleep
+ * so edit/triage stay synchronous around spawnSync.
+ */
+export function sleepSync(ms) {
+  const n = Number(ms)
+  if (!Number.isFinite(n) || n <= 0) return
+  const end = Date.now() + n
+  // Atomics.wait is the portable Node sync sleep (no busy loop).
+  const sab = new SharedArrayBuffer(4)
+  const view = new Int32Array(sab)
+  while (Date.now() < end) {
+    const left = end - Date.now()
+    if (left <= 0) break
+    Atomics.wait(view, 0, 0, Math.min(left, 2_147_483_647))
+  }
+}
+
+const STDERR_TAIL_LINES = 20
+const STDERR_TAIL_CHARS = 4_000
+
+function tailText(text, { lines = STDERR_TAIL_LINES, chars = STDERR_TAIL_CHARS } = {}) {
+  const s = String(text ?? "").trim()
+  if (!s) return ""
+  const lastLines = s.split("\n").slice(-lines).join("\n")
+  return lastLines.length > chars ? lastLines.slice(-chars) : lastLines
+}
+
+/**
+ * Run `kilo` via spawnSync so stderr is always recoverable — including when
+ * the child exits 0 after writing a diagnostic (execFileSync cannot return
+ * piped stderr on exit 0; that path lost every diagnostic on run 30122603016).
+ *
+ * streamStdout:true → inherit fd 1 (edit live log); false → capture stdout
+ * (triage parses it). stderr is always buffered.
+ */
+export function runKilo({ args, timeoutMs, streamStdout = false, label = "kilo" }) {
+  const result = spawnSync("kilo", args, {
+    encoding: "utf8",
+    maxBuffer: 32 * 1024 * 1024,
+    timeout: timeoutMs,
+    stdio: ["ignore", streamStdout ? "inherit" : "pipe", "pipe"],
+  })
+
+  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 ?? "")
+  // 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
+
+  if (result.error && !timedOut) {
+    console.warn(`${label}: spawn error: ${result.error.message}`)
+  }
+
+  return { ok, stdout, stderrTail, exitCode, timedOut }
+}
diff --git a/.github/docs-sync/prepare-branch.mjs b/.github/docs-sync/prepare-branch.mjs
index 2b57932c442..2710832ccf3 100644
--- a/.github/docs-sync/prepare-branch.mjs
+++ b/.github/docs-sync/prepare-branch.mjs
@@ -6,56 +6,100 @@
  *     origin/main (preserves any human commits on the branch)
  *   - otherwise -> fresh branch from origin/main (bot force-pushes later)
  *
- * Outputs: branch, mode (update|fresh), pr_number (empty when fresh).
+ * Outputs: branch, mode (update|fresh|conflict), pr_number (empty when fresh).
  */
 
 import { execFileSync } from "node:child_process"
+import { pathToFileURL } from "node:url"
 import { api, appendOutput, repo, searchIssues } from "./lib.mjs"
 
 export const DEFAULT_BRANCH = "docs/auto-sync"
 
-const git = (args) => execFileSync("git", args, { stdio: ["ignore", "pipe", "inherit"] }).toString().trim()
+const defaultGit = (args) => execFileSync("git", args, { stdio: ["ignore", "pipe", "inherit"] }).toString().trim()
 
-const prs = await searchIssues(`repo:${repo()} is:pr is:open label:auto-docs sort:created-desc`, { maxPages: 1 })
-
-let mode = "fresh"
-let prNumber = ""
-let branch = DEFAULT_BRANCH
-
-if (prs.length > 0) {
-  const pr = await api(`/repos/${repo()}/pulls/${prs[0].number}`)
-  branch = pr.head?.ref ?? DEFAULT_BRANCH
-  prNumber = String(pr.number)
-  git(["fetch", "origin", "main", branch])
-  git(["checkout", branch])
+/**
+ * Merge origin/main into the current branch. On a genuine conflict, abort the
+ * merge, switch to a dated fallback branch from origin/main, and return
+ * mode=conflict so human commits on the rolling branch stay untouched. Any
+ * other merge failure (missing identity, corrupt ref, fetch issues) is
+ * rethrown so the job fails loudly.
+ */
+export function mergeOrFallback({ branch, git = defaultGit }) {
   try {
     git(["merge", "origin/main", "--no-edit"])
-    mode = "update"
-  } catch {
+    return { branch, mode: "update" }
+  } catch (err) {
+    // Conflict ⇔ unmerged index entries (or MERGE_HEAD still present).
+    // Identity failures and similar abort before a merge is started, so
+    // merge --abort would itself fail — those must rethrow.
+    let unmerged = ""
+    try {
+      unmerged = git(["ls-files", "--unmerged"])
+    } catch {
+      // ls-files itself failing is not a conflict signal
+    }
+    let mergeInProgress = false
+    try {
+      git(["rev-parse", "-q", "--verify", "MERGE_HEAD"])
+      mergeInProgress = true
+    } catch {
+      mergeInProgress = false
+    }
+    const isConflict = unmerged.length > 0 || mergeInProgress
+    if (!isConflict) throw err
+
     console.warn(`merge of origin/main into ${branch} conflicted.`)
-    console.warn("Leaving the conflicted branch untouched so human commits are preserved; continuing on a fresh dated branch.")
+    console.warn(
+      "Leaving the conflicted branch untouched so human commits are preserved; continuing on a fresh dated branch.",
+    )
     git(["merge", "--abort"])
-    branch = `${DEFAULT_BRANCH}-${new Date().toISOString().slice(0, 10)}`
+    const fallback = `${DEFAULT_BRANCH}-${new Date().toISOString().slice(0, 10)}`
+    try {
+      git(["fetch", "origin", `+refs/heads/${fallback}:refs/remotes/origin/${fallback}`])
+    } catch {
+      console.log(`dated branch ${fallback} does not exist on origin yet; will create it on push`)
+    }
+    git(["checkout", "-B", fallback, "origin/main"])
+    return { branch: fallback, mode: "conflict" }
+  }
+}
+
+async function main() {
+  const git = defaultGit
+  const prs = await searchIssues(`repo:${repo()} is:pr is:open label:auto-docs sort:created-desc`, { maxPages: 1 })
+
+  let mode = "fresh"
+  let prNumber = ""
+  let branch = DEFAULT_BRANCH
+
+  if (prs.length > 0) {
+    const pr = await api(`/repos/${repo()}/pulls/${prs[0].number}`)
+    branch = pr.head?.ref ?? DEFAULT_BRANCH
+    prNumber = String(pr.number)
+    git(["fetch", "origin", "main", branch])
+    git(["checkout", branch])
+    ;({ branch, mode } = mergeOrFallback({ branch, git }))
+  } else {
+    // Keep the remote-tracking ref current so the later --force-with-lease
+    // push (stale branch left over from a merged/closed PR) is safe.
     try {
       git(["fetch", "origin", `+refs/heads/${branch}:refs/remotes/origin/${branch}`])
     } catch {
-      console.log(`dated branch ${branch} does not exist on origin yet; will create it on push`)
+      console.log(`branch ${branch} does not exist on origin yet; will create it on push`)
     }
     git(["checkout", "-B", branch, "origin/main"])
-    mode = "conflict"
   }
-} else {
-  // Keep the remote-tracking ref current so the later --force-with-lease
-  // push (stale branch left over from a merged/closed PR) is safe.
-  try {
-    git(["fetch", "origin", `+refs/heads/${branch}:refs/remotes/origin/${branch}`])
-  } catch {
-    console.log(`branch ${branch} does not exist on origin yet; will create it on push`)
-  }
-  git(["checkout", "-B", branch, "origin/main"])
+
+  appendOutput("branch", branch)
+  appendOutput("mode", mode)
+  appendOutput("pr_number", prNumber)
+  console.log(`branch ${branch} ready (mode=${mode}, pr=${prNumber || "none"})`)
 }
 
-appendOutput("branch", branch)
-appendOutput("mode", mode)
-appendOutput("pr_number", prNumber)
-console.log(`branch ${branch} ready (mode=${mode}, pr=${prNumber || "none"})`)
+const isMain = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href
+if (isMain) {
+  main().catch((err) => {
+    console.error(err)
+    process.exit(1)
+  })
+}
diff --git a/.github/docs-sync/selftest.mjs b/.github/docs-sync/selftest.mjs
new file mode 100644
index 00000000000..fe2cb1faec3
--- /dev/null
+++ b/.github/docs-sync/selftest.mjs
@@ -0,0 +1,964 @@
+// kilocode_change - new file
+
+/**
+ * Offline self-check for the docs-sync failure paths (S4).
+ * Plain node:assert, no network, no LLM, no new dependency.
+ * Run: node .github/docs-sync/selftest.mjs
+ */
+
+import assert from "node:assert/strict"
+import { execFileSync, spawnSync } from "node:child_process"
+import fs from "node:fs"
+import os from "node:os"
+import path from "node:path"
+import { fileURLToPath } from "node:url"
+
+import { mergeOrFallback, DEFAULT_BRANCH } from "./prepare-branch.mjs"
+import { applyCap } from "./watermark.mjs"
+import {
+  computeUncovered,
+  computeProcessedThrough,
+  routeRows,
+  dropLegacySkipped,
+  noDiffReport,
+  renderBody,
+  extractSectionRows,
+} from "./upsert-pr.mjs"
+
+const HERE = path.dirname(fileURLToPath(import.meta.url))
+const EDIT_SCRIPT = path.join(HERE, "edit.mjs")
+const TRIAGE_SCRIPT = path.join(HERE, "triage.mjs")
+const COLLECT_SCRIPT = path.join(HERE, "collect.mjs")
+
+const temps = []
+
+function mktemp(prefix) {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), prefix))
+  temps.push(dir)
+  return dir
+}
+
+function cleanup() {
+  for (const dir of temps.splice(0)) {
+    try {
+      fs.rmSync(dir, { recursive: true, force: true })
+    } catch {
+      // best-effort
+    }
+  }
+}
+
+function writeExecutable(filePath, body) {
+  fs.writeFileSync(filePath, body, { mode: 0o755 })
+}
+
+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"
+  const script = `#!/usr/bin/env node
+const fs = require("node:fs");
+const path = require("node:path");
+const mode = ${JSON.stringify(mode)};
+const callLog = ${JSON.stringify(callLog ?? "")};
+const stderrText = ${JSON.stringify(stderrText)};
+if (callLog) {
+  fs.appendFileSync(callLog, JSON.stringify({ argv: process.argv.slice(2), cwd: process.cwd() }) + "\\n");
+}
+if (mode === "stderr-exit0") {
+  process.stderr.write(stderrText + "\\n");
+  process.exit(0);
+}
+if (mode === "record") {
+  process.stderr.write("recorded\\n");
+  process.exit(0);
+}
+// Parse -f chunk/batch file from args for triage stubs
+const args = process.argv.slice(2);
+const fIdx = args.indexOf("-f");
+const fileArg = fIdx >= 0 ? args[fIdx + 1] : null;
+let chunk = [];
+if (fileArg && fs.existsSync(fileArg)) {
+  try { chunk = JSON.parse(fs.readFileSync(fileArg, "utf8")); } catch { chunk = []; }
+}
+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));
+  const entries = owned.map((d) => ({
+    pr: d.number,
+    url: d.url,
+    docs_worthy: false,
+    reason: "genuine not worthy",
+    target_sections: [],
+    priority: "medium",
+  }));
+  if (entries.length === 0 && chunk.length > 0) {
+    // single-PR chunk: still leave one missing by emitting empty-ish foreign-only
+    process.stdout.write("[]\\n");
+  } else {
+    process.stdout.write(JSON.stringify(entries) + "\\n");
+  }
+  process.exit(0);
+}
+if (mode === "mixed-triage") {
+  // Half docs_worthy true, half fail (no output for second half — but we return
+  // only some entries so backfill marks the rest pending). Actually: return
+  // docs_worthy:true for first half of chunk URLs so worthy > 0.
+  const half = Math.ceil(chunk.length / 2);
+  const entries = chunk.slice(0, half).map((d) => ({
+    pr: d.number,
+    url: d.url,
+    docs_worthy: true,
+    reason: "needs docs",
+    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);
+`
+  writeExecutable(kiloPath, script)
+  return dir
+}
+
+function gitIn(cwd, args, env = {}) {
+  return execFileSync("git", args, {
+    cwd,
+    env: { ...process.env, ...env },
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf8",
+  }).toString().trim()
+}
+
+function makeGitRunner(cwd, env = {}) {
+  return (args) => gitIn(cwd, args, env)
+}
+
+function initRepoWithIdentity(dir) {
+  gitIn(dir, ["init", "-b", "main"])
+  gitIn(dir, ["config", "user.name", "docs-sync-selftest"])
+  gitIn(dir, ["config", "user.email", "docs-sync-selftest@example.com"])
+  gitIn(dir, ["config", "commit.gpgsign", "false"])
+}
+
+// ---------------------------------------------------------------------------
+// Case 1 — Defect A: mergeOrFallback
+// ---------------------------------------------------------------------------
+function case1_mergeOrFallback() {
+  console.log("case 1: Defect A (mergeOrFallback)")
+
+  // 1a — identity configured + clean merge → mode=update
+  {
+    const dir = mktemp("docs-sync-merge-clean-")
+    initRepoWithIdentity(dir)
+    fs.writeFileSync(path.join(dir, "a.txt"), "base\n")
+    gitIn(dir, ["add", "a.txt"])
+    gitIn(dir, ["commit", "-m", "base"])
+    gitIn(dir, ["checkout", "-b", DEFAULT_BRANCH])
+    fs.writeFileSync(path.join(dir, "b.txt"), "on branch\n")
+    gitIn(dir, ["add", "b.txt"])
+    gitIn(dir, ["commit", "-m", "branch commit"])
+    // Advance main without conflict
+    gitIn(dir, ["checkout", "main"])
+    fs.writeFileSync(path.join(dir, "c.txt"), "on main\n")
+    gitIn(dir, ["add", "c.txt"])
+    gitIn(dir, ["commit", "-m", "main advance"])
+    gitIn(dir, ["update-ref", "refs/remotes/origin/main", "main"])
+    gitIn(dir, ["checkout", DEFAULT_BRANCH])
+
+    const result = mergeOrFallback({ branch: DEFAULT_BRANCH, git: makeGitRunner(dir) })
+    assert.equal(result.mode, "update")
+    assert.equal(result.branch, DEFAULT_BRANCH)
+    // merge brought c.txt in
+    assert.ok(fs.existsSync(path.join(dir, "c.txt")))
+  }
+
+  // 1b — genuine conflict → mode=conflict, abort succeeds, original branch untouched
+  {
+    const dir = mktemp("docs-sync-merge-conflict-")
+    initRepoWithIdentity(dir)
+    fs.writeFileSync(path.join(dir, "conflict.txt"), "base\n")
+    gitIn(dir, ["add", "conflict.txt"])
+    gitIn(dir, ["commit", "-m", "base"])
+    const baseSha = gitIn(dir, ["rev-parse", "HEAD"])
+
+    gitIn(dir, ["checkout", "-b", DEFAULT_BRANCH])
+    fs.writeFileSync(path.join(dir, "conflict.txt"), "branch side\n")
+    gitIn(dir, ["add", "conflict.txt"])
+    gitIn(dir, ["commit", "-m", "branch edit"])
+    const branchShaBefore = gitIn(dir, ["rev-parse", "HEAD"])
+
+    gitIn(dir, ["checkout", "main"])
+    fs.writeFileSync(path.join(dir, "conflict.txt"), "main side\n")
+    gitIn(dir, ["add", "conflict.txt"])
+    gitIn(dir, ["commit", "-m", "main edit"])
+    gitIn(dir, ["update-ref", "refs/remotes/origin/main", "main"])
+    gitIn(dir, ["checkout", DEFAULT_BRANCH])
+
+    const result = mergeOrFallback({ branch: DEFAULT_BRANCH, git: makeGitRunner(dir) })
+    assert.equal(result.mode, "conflict")
+    assert.ok(result.branch.startsWith(`${DEFAULT_BRANCH}-`))
+    // Original rolling branch tip unchanged
+    const branchShaAfter = gitIn(dir, ["rev-parse", DEFAULT_BRANCH])
+    assert.equal(branchShaAfter, branchShaBefore)
+    // No merge in progress
+    let mergeHead = true
+    try {
+      gitIn(dir, ["rev-parse", "-q", "--verify", "MERGE_HEAD"])
+    } catch {
+      mergeHead = false
+    }
+    assert.equal(mergeHead, false)
+    void baseSha
+  }
+
+  // 1c — identity-less / non-conflict merge failure → throws (does not fake conflict)
+  {
+    const dir = mktemp("docs-sync-merge-noid-")
+    initRepoWithIdentity(dir)
+    fs.writeFileSync(path.join(dir, "a.txt"), "base\n")
+    gitIn(dir, ["add", "a.txt"])
+    gitIn(dir, ["commit", "-m", "base"])
+    gitIn(dir, ["checkout", "-b", DEFAULT_BRANCH])
+    fs.writeFileSync(path.join(dir, "b.txt"), "branch\n")
+    gitIn(dir, ["add", "b.txt"])
+    gitIn(dir, ["commit", "-m", "branch"])
+    gitIn(dir, ["checkout", "main"])
+    fs.writeFileSync(path.join(dir, "c.txt"), "main\n")
+    gitIn(dir, ["add", "c.txt"])
+    gitIn(dir, ["commit", "-m", "main"])
+    gitIn(dir, ["update-ref", "refs/remotes/origin/main", "main"])
+    gitIn(dir, ["checkout", DEFAULT_BRANCH])
+
+    // Strip identity so merge cannot create a commit
+    gitIn(dir, ["config", "--unset", "user.name"])
+    gitIn(dir, ["config", "--unset", "user.email"])
+
+    const env = {
+      GIT_CONFIG_GLOBAL: "/dev/null",
+      GIT_CONFIG_SYSTEM: "/dev/null",
+      GIT_CONFIG_NOSYSTEM: "1",
+    }
+    const git = (args) =>
+      execFileSync("git", ["-c", "user.useConfigOnly=true", ...args], {
+        cwd: dir,
+        env: { ...process.env, ...env },
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf8",
+      }).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
+    })
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Helpers to run edit.mjs / triage.mjs as child processes
+// ---------------------------------------------------------------------------
+function setupEditCwd(worthy, triage) {
+  const cwd = mktemp("docs-sync-edit-")
+  fs.mkdirSync(path.join(cwd, "docs-sync-out"), { recursive: true })
+  fs.writeFileSync(path.join(cwd, "docs-sync-out", "worthy.json"), JSON.stringify(worthy, null, 2))
+  fs.writeFileSync(path.join(cwd, "docs-sync-out", "triage.json"), JSON.stringify(triage, null, 2))
+  return cwd
+}
+
+function setupTriageCwd(digest) {
+  const cwd = mktemp("docs-sync-triage-")
+  fs.mkdirSync(path.join(cwd, "docs-sync-out"), { recursive: true })
+  fs.writeFileSync(path.join(cwd, "docs-sync-out", "digest.json"), JSON.stringify(digest, null, 2))
+  return cwd
+}
+
+function runNodeScript(scriptPath, { cwd, env = {}, kiloDir }) {
+  const pathEnv = [kiloDir, process.env.PATH].filter(Boolean).join(path.delimiter)
+  const result = spawnSync(process.execPath, [scriptPath], {
+    cwd,
+    env: {
+      ...process.env,
+      ...env,
+      PATH: pathEnv,
+      DOCS_SYNC_BACKOFF_MS: env.DOCS_SYNC_BACKOFF_MS ?? "0",
+    },
+    encoding: "utf8",
+    timeout: 60_000,
+  })
+  return {
+    status: result.status,
+    stdout: String(result.stdout ?? ""),
+    stderr: String(result.stderr ?? ""),
+    output: `${result.stdout ?? ""}${result.stderr ?? ""}`,
+    error: result.error,
+  }
+}
+
+function samplePr(n, { merged_at, repo = "Kilo-Org/cloud" } = {}) {
+  return {
+    repo,
+    number: n,
+    title: `feat: sample ${n}`,
+    url: `https://github.com/${repo}/pull/${n}`,
+    author: "dev",
+    merged_at: merged_at ?? "2026-07-20T12:00:00.000Z",
+    labels: [],
+    body: "body",
+    files: [],
+    files_total: 1,
+    patch_excerpt: "",
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 2 — Defect B: edit.mjs with stub kilo (exit 0 + stderr)
+// ---------------------------------------------------------------------------
+function case2_defectB() {
+  console.log("case 2: Defect B (edit.mjs stderr-on-exit-0)")
+
+  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 stderrText = "event stream disconnected DIAG-CASE2"
+  const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText })
+
+  const started = Date.now()
+  const result = runNodeScript(EDIT_SCRIPT, {
+    cwd,
+    kiloDir,
+    env: {
+      EDIT_MODEL: "test/model",
+      DOCS_SYNC_BACKOFF_MS: "0",
+      // Enough budget for 3 attempts × tiny timeout
+      EDIT_BUDGET_MINUTES: "5",
+      EDIT_BATCH_TIMEOUT_MINUTES: "1",
+    },
+  })
+  const elapsed = Date.now() - started
+
+  assert.equal(result.status, 0, `edit.mjs exit: ${result.output}`)
+  // Backoff collapsed — 3 attempts without 60s+300s waits
+  assert.ok(elapsed < 15_000, `backoff should collapse with DOCS_SYNC_BACKOFF_MS=0; elapsed=${elapsed}ms`)
+
+  assert.match(result.output, /stderr tail:/)
+  assert.match(result.output, /DIAG-CASE2|event stream disconnected/)
+  assert.match(result.output, /attempt 1/)
+  assert.match(result.output, /attempt 2/)
+  // 3 attempts
+  assert.match(result.output, /attempt 3|failed after up to 3 attempts/)
+
+  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)}`)
+  }
+
+  const uncovered = computeUncovered({ worthy, summary, triage })
+  assert.equal(uncovered.length, 5)
+  for (const u of uncovered) {
+    assert.ok(u.reason, "uncovered reason present")
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 3 — watermark invariant
+// ---------------------------------------------------------------------------
+function case3_watermark() {
+  console.log("case 3: watermark invariant")
+
+  const now = "2026-07-27T12:00:00.000Z"
+  const nowMs = Date.parse(now)
+
+  const prA = samplePr(10, { merged_at: "2026-07-20T10:00:00.000Z" })
+  const prB = samplePr(11, { merged_at: "2026-07-22T15:30:00.000Z" })
+  const prC = samplePr(12, { merged_at: "2026-07-25T08:00:00.000Z" })
+  const digest = [prA, prB, prC]
+
+  // all covered → processed-through === now
+  {
+    const worthy = [prA, prB]
+    const summary = [
+      { pr: 10, url: prA.url, action: "updated packages/kilo-docs/pages/x.md", reason: "" },
+      { pr: 11, url: prB.url, action: "skipped", reason: "already documented" },
+    ]
+    const triage = [
+      { pr: 10, url: prA.url, docs_worthy: true, pending: false, reason: "ok" },
+      { pr: 11, url: prB.url, docs_worthy: true, pending: false, reason: "ok" },
+    ]
+    const uncovered = computeUncovered({ worthy, summary, triage })
+    assert.equal(uncovered.length, 0)
+    const through = computeProcessedThrough({ uncovered, digest, now })
+    assert.equal(through, now)
+  }
+
+  // one uncovered → merged_at − 1 ms, strictly < now
+  {
+    const worthy = [prA, prB]
+    const summary = [
+      { pr: 10, url: prA.url, action: "updated x", reason: "" },
+      { pr: 11, url: prB.url, action: "pending", reason: "edit batch 0: exit 0" },
+    ]
+    const uncovered = computeUncovered({ worthy, summary, triage: [] })
+    assert.equal(uncovered.length, 1)
+    assert.equal(uncovered[0].url, prB.url)
+    const through = computeProcessedThrough({ uncovered, digest, now })
+    const expected = new Date(Date.parse(prB.merged_at) - 1).toISOString()
+    assert.equal(through, expected)
+    assert.ok(Date.parse(through) < nowMs)
+  }
+
+  // several uncovered → earliest merge time wins
+  {
+    const worthy = [prA, prB, prC]
+    const summary = [
+      { pr: 10, url: prA.url, action: "pending", reason: "fail" },
+      { pr: 12, url: prC.url, action: "pending", reason: "fail" },
+    ]
+    // prB missing from summary entirely
+    const uncovered = computeUncovered({ worthy, summary, triage: [] })
+    assert.ok(uncovered.length >= 2)
+    const through = computeProcessedThrough({ uncovered, digest, now })
+    // earliest among A, B, C that are uncovered — A is earliest
+    const times = uncovered
+      .map((u) => digest.find((d) => d.url === u.url)?.merged_at)
+      .filter(Boolean)
+      .map((t) => Date.parse(t))
+    const earliest = Math.min(...times)
+    assert.equal(through, new Date(earliest - 1).toISOString())
+  }
+
+  // summary missing/truncated while worthy non-empty → every worthy URL held back
+  {
+    const worthy = [prA, prB]
+    const uncovered = computeUncovered({ worthy, summary: [], triage: [] })
+    assert.equal(uncovered.length, 2)
+    const through = computeProcessedThrough({ uncovered, digest, now })
+    assert.equal(through, new Date(Date.parse(prA.merged_at) - 1).toISOString())
+  }
+
+  // noDiffReport three arms
+  {
+    const uncovered = [{ url: prA.url, reason: "edit batch failed" }]
+    const arm1 = noDiffReport({ uncovered, sinceOverride: true })
+    assert.ok(arm1.summary.includes(prA.url))
+    assert.ok(arm1.warning, "override + uncovered → warning present")
+
+    const arm2 = noDiffReport({ uncovered: [], sinceOverride: true })
+    assert.equal(arm2.warning, null, "override + empty uncovered → warning absent")
+
+    const arm3 = noDiffReport({ uncovered, sinceOverride: false })
+    assert.equal(arm3.warning, null, "scheduled + uncovered → warning absent")
+  }
+
+  // triage pending:true backfill rows land in uncovered (consumption)
+  {
+    const triage = [
+      {
+        pr: 99,
+        url: "https://github.com/Kilo-Org/cloud/pull/99",
+        docs_worthy: false,
+        pending: true,
+        reason: "not classified by triage",
+      },
+    ]
+    const uncovered = computeUncovered({ worthy: [], summary: [], triage })
+    assert.equal(uncovered.length, 1)
+    assert.equal(uncovered[0].url, triage[0].url)
+    const through = computeProcessedThrough({
+      uncovered,
+      digest: [{ url: triage[0].url, merged_at: "2026-07-21T00:00:00.000Z" }],
+      now,
+    })
+    assert.equal(through, new Date(Date.parse("2026-07-21T00:00:00.000Z") - 1).toISOString())
+  }
+
+  // fallback field (post-plan repair)
+  {
+    const uncovered = [{ url: "https://github.com/Kilo-Org/cloud/pull/50", reason: "missing" }]
+    const fallback = "2026-07-17T00:00:00.000Z"
+    // unresolved merged_at + parseable fallback → hold at fallback, warn
+    const prevWarn = console.warn
+    const warnings = []
+    console.warn = (...a) => warnings.push(a.join(" "))
+    try {
+      const through = computeProcessedThrough({ uncovered, digest: [], now, fallback })
+      assert.equal(through, new Date(fallback).toISOString())
+      assert.ok(Date.parse(through) < nowMs)
+      assert.ok(warnings.some((w) => w.includes("::warning::")))
+    } finally {
+      console.warn = prevWarn
+    }
+
+    // unresolved + unparseable/missing fallback → throws
+    assert.throws(() => computeProcessedThrough({ uncovered, digest: [], now }), /fallback|SINCE|refusing/i)
+    assert.throws(
+      () => computeProcessedThrough({ uncovered, digest: [], now, fallback: "not-a-date" }),
+      /fallback|SINCE|refusing/i,
+    )
+
+    // resolved merged_at ignores fallback
+    const throughResolved = computeProcessedThrough({
+      uncovered: [{ url: prA.url, reason: "x" }],
+      digest: [prA],
+      now,
+      fallback: "2020-01-01T00:00:00.000Z",
+    })
+    assert.equal(throughResolved, new Date(Date.parse(prA.merged_at) - 1).toISOString())
+
+    // empty uncovered ignores fallback
+    const throughEmpty = computeProcessedThrough({
+      uncovered: [],
+      digest: [],
+      now,
+      fallback: "2020-01-01T00:00:00.000Z",
+    })
+    assert.equal(throughEmpty, now)
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 4 — routing and round trip
+// ---------------------------------------------------------------------------
+function case4_routing() {
+  console.log("case 4: routing and round trip")
+
+  const summary = [
+    { pr: 1, url: "https://github.com/Kilo-Org/cloud/pull/1", action: "updated pages/a.md", reason: "" },
+    { pr: 2, url: "https://github.com/Kilo-Org/cloud/pull/2", action: "skipped", reason: "already documented" },
+    { pr: 3, url: "https://github.com/Kilo-Org/cloud/pull/3", action: "pending", reason: "edit batch 1: exit 0" },
+  ]
+  const triage = [
+    {
+      pr: 4,
+      url: "https://github.com/Kilo-Org/cloud/pull/4",
+      docs_worthy: false,
+      pending: false,
+      reason: "chore only",
+    },
+    {
+      pr: 5,
+      url: "https://github.com/Kilo-Org/cloud/pull/5",
+      docs_worthy: false,
+      pending: true,
+      reason: "triage failed to classify this PR",
+    },
+  ]
+  const worthy = [
+    { number: 1, url: summary[0].url },
+    { number: 2, url: summary[1].url },
+    { number: 3, url: summary[2].url },
+  ]
+  const uncovered = computeUncovered({ worthy, summary, triage })
+  const { changesRows, pendingRows, skippedRows } = routeRows({ summary, triage, uncovered })
+
+  // pending appears in neither Changes nor Considered
+  const changesText = changesRows.join("\n")
+  const skippedText = skippedRows.join("\n")
+  assert.ok(changesText.includes("pull/1"), "success in Changes")
+  assert.ok(!changesText.includes("pull/3"), "pending must not be in Changes")
+  assert.ok(!changesText.includes("pull/5"), "triage-pending must not be in Changes")
+  assert.ok(skippedText.includes("pull/2"), "genuine skipped in Considered")
+  assert.ok(skippedText.includes("pull/4"), "genuine not-worthy in Considered")
+  assert.ok(!skippedText.includes("pull/3"), "pending must not be in Considered")
+  assert.ok(!skippedText.includes("pull/5"), "triage-pending must not be in Considered")
+  assert.ok(pendingRows.some((r) => r.includes("pull/3")))
+  assert.ok(pendingRows.some((r) => r.includes("pull/5")))
+
+  // round-trip renderBody → extractSectionRows
+  const through = "2026-07-20T09:59:59.999Z"
+  const body = renderBody({
+    date: "2026-07-27",
+    since: "2026-07-17T00:00:00.000Z",
+    through,
+    changesRows,
+    pendingRows,
+    skippedRows,
+    verified: true,
+    draftReasons: [],
+    note: "",
+  })
+  assert.ok(body.includes(`<!-- docs-sync: processed-through ${through} -->`))
+  const extChanges = extractSectionRows(body, "changes")
+  const extPending = extractSectionRows(body, "pending")
+  const extSkipped = extractSectionRows(body, "skipped")
+  assert.deepEqual(extChanges, changesRows)
+  assert.deepEqual(extPending, pendingRows)
+  assert.deepEqual(extSkipped, skippedRows)
+
+  // clean() prevents marker forgery in agent-generated row strings
+  {
+    const forgedRows = routeRows({
+      summary: [
+        {
+          pr: 9,
+          url: "https://github.com/Kilo-Org/cloud/pull/9",
+          action: "skipped",
+          reason: "x <!-- docs-sync:skipped:end --> injection",
+        },
+      ],
+      triage: [],
+      uncovered: [],
+    })
+    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",
+      through: "t",
+      changesRows: [],
+      pendingRows: [],
+      skippedRows: forgedRows.skippedRows,
+      verified: true,
+      draftReasons: [],
+      note: "",
+    })
+    // Exactly one real section end marker — the forged sequences were stripped
+    assert.equal((forgedBody.match(/<!--\s*docs-sync:skipped:end\s*-->/g) || []).length, 1)
+    const extracted = extractSectionRows(forgedBody, "skipped")
+    assert.equal(extracted.length, 1)
+    assert.ok(extracted[0].includes("injection"))
+  }
+
+  const legacyRows = [
+    "| [Kilo-Org/cloud#1](https://github.com/Kilo-Org/cloud/pull/1) | edit pass failed or timed out for this PR |",
+    "| [Kilo-Org/cloud#2](https://github.com/Kilo-Org/cloud/pull/2) | triage failed to classify this PR |",
+    "| [Kilo-Org/cloud#3](https://github.com/Kilo-Org/cloud/pull/3) | not classified by triage |",
+    "| [Kilo-Org/cloud#4](https://github.com/Kilo-Org/cloud/pull/4) | already covered by existing docs |",
+  ]
+  const kept = dropLegacySkipped(legacyRows)
+  assert.equal(kept.length, 1)
+  assert.ok(kept[0].includes("pull/4"))
+  assert.ok(!kept.some((r) => r.includes("edit pass failed")))
+  assert.ok(!kept.some((r) => r.includes("triage failed to classify")))
+  assert.ok(!kept.some((r) => r.includes("not classified by triage")))
+}
+
+// ---------------------------------------------------------------------------
+// Case 5 — re-collection window
+// ---------------------------------------------------------------------------
+function case5_recollection() {
+  console.log("case 5: re-collection closes the loop")
+
+  const collectSrc = fs.readFileSync(COLLECT_SCRIPT, "utf8")
+  // Query template must use merged:>=
+  assert.ok(
+    /merged:>=\$\{since\.toISOString\(\)\}/.test(collectSrc) || /merged:>=/.test(collectSrc),
+    "collect.mjs must search merged:>=since",
+  )
+  assert.match(collectSrc, /merged:>=/)
+
+  const mergedAt = "2026-07-22T15:30:00.000Z"
+  const uncovered = [{ url: "https://github.com/Kilo-Org/cloud/pull/11", reason: "pending" }]
+  const digest = [{ url: uncovered[0].url, merged_at: mergedAt }]
+  const now = "2026-07-27T12:00:00.000Z"
+  const since = computeProcessedThrough({ uncovered, digest, now })
+  // held-back since is strictly before the uncovered PR's merged_at
+  assert.ok(Date.parse(since) < Date.parse(mergedAt), `since ${since} must be < merged_at ${mergedAt}`)
+  // And the query window merged:>=since therefore includes that PR
+  assert.ok(Date.parse(mergedAt) >= Date.parse(since))
+}
+
+// ---------------------------------------------------------------------------
+// Case 6 — budgets
+// ---------------------------------------------------------------------------
+function case6_budgets() {
+  console.log("case 6: budgets")
+
+  // --- edit budget ---
+  {
+    // 12 PRs = 3 batches of 5; budget too small for even one batch unit
+    const prs = Array.from({ length: 12 }, (_, i) => samplePr(100 + i))
+    const worthy = prs
+    const triage = prs.map((p) => ({
+      pr: p.number,
+      url: p.url,
+      docs_worthy: true,
+      reason: "needs docs",
+      target_sections: [],
+      priority: "medium",
+    }))
+    const cwd = setupEditCwd(worthy, triage)
+    const callLog = path.join(cwd, "kilo-calls.log")
+    const kiloDir = makeStubKiloDir({ mode: "record", callLog })
+
+    // EDIT_BUDGET_MINUTES must be positive (0 falls through to default 50).
+    // BATCH_TIMEOUT default would be 15m; set both tiny so left < BATCH_TIMEOUT immediately.
+    const result = runNodeScript(EDIT_SCRIPT, {
+      cwd,
+      kiloDir,
+      env: {
+        EDIT_MODEL: "test/model",
+        DOCS_SYNC_BACKOFF_MS: "0",
+        EDIT_BUDGET_MINUTES: "0.0001",
+        EDIT_BATCH_TIMEOUT_MINUTES: "15",
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    assert.match(result.output, /deferring \d+ PRs/)
+    assert.match(result.output, /deferred \d+ PRs due to wall-clock budget/)
+
+    const calls = fs.existsSync(callLog) ? fs.readFileSync(callLog, "utf8").trim() : ""
+    const callCount = calls ? calls.split("\n").filter(Boolean).length : 0
+    assert.equal(callCount, 0, `kilo must not be invoked for deferred edit batches; got ${callCount}`)
+
+    const summary = JSON.parse(fs.readFileSync(path.join(cwd, ".docs-sync-summary.json"), "utf8"))
+    assert.ok(summary.every((e) => e.action === "pending"))
+    const uncovered = computeUncovered({ worthy, summary, triage })
+    assert.equal(uncovered.length, 12)
+    assert.ok(summary.every((e) => e.action !== "skipped"))
+  }
+
+  // --- triage budget ---
+  {
+    // CHUNK_SIZE=25; 30 PRs = 2 chunks; budget too small for a 10m chunk
+    const digest = Array.from({ length: 30 }, (_, i) => samplePr(200 + i))
+    const cwd = setupTriageCwd(digest)
+    const callLog = path.join(cwd, "kilo-calls.log")
+    const kiloDir = makeStubKiloDir({ mode: "record", callLog })
+    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: "0.0001",
+        GITHUB_STEP_SUMMARY: summaryFile,
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    assert.match(result.output, /deferring \d+ PRs/)
+
+    const calls = fs.existsSync(callLog) ? fs.readFileSync(callLog, "utf8").trim() : ""
+    const callCount = calls ? calls.split("\n").filter(Boolean).length : 0
+    assert.equal(callCount, 0, `kilo must not be invoked for deferred triage chunks; got ${callCount}`)
+
+    const triage = JSON.parse(fs.readFileSync(path.join(cwd, "docs-sync-out", "triage.json"), "utf8"))
+    assert.equal(triage.length, 30)
+    assert.ok(triage.every((e) => e.pending === true))
+    assert.ok(triage.every((e) => e.docs_worthy === false))
+    const uncovered = computeUncovered({ worthy: [], summary: [], triage })
+    assert.equal(uncovered.length, 30)
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 7 — applyCap both arms
+// ---------------------------------------------------------------------------
+function case7_cap() {
+  console.log("case 7: applyCap")
+
+  const now = new Date("2026-07-27T12:00:00.000Z")
+  const old = new Date("2026-06-01T00:00:00.000Z")
+
+  const prevLog = console.log
+  const prevWarn = console.warn
+  const logs = []
+  const warnings = []
+  console.log = (...a) => logs.push(a.join(" "))
+  console.warn = (...a) => warnings.push(a.join(" "))
+  try {
+    // explicit:false + older than 14 days → clamped AND reported
+    const a = applyCap(old, now, { explicit: false })
+    assert.equal(a.clamped, true)
+    assert.ok(a.since.getTime() > old.getTime())
+    const cap = new Date(now.getTime() - 14 * 24 * 3600 * 1000)
+    assert.equal(a.since.toISOString(), cap.toISOString())
+    assert.ok(warnings.some((w) => w.includes("::warning::") && w.includes("clamped")))
+
+    // explicit:true + older than 14 days → unchanged, skip reported
+    logs.length = 0
+    warnings.length = 0
+    const b = applyCap(old, now, { explicit: true })
+    assert.equal(b.clamped, false)
+    assert.equal(b.since.toISOString(), old.toISOString())
+    assert.ok(logs.some((l) => /cap skipped|INPUT_SINCE/i.test(l)))
+  } finally {
+    console.log = prevLog
+    console.warn = prevWarn
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Case 8 — triage.mjs outputs
+// ---------------------------------------------------------------------------
+function case8_triage() {
+  console.log("case 8: triage pass outputs")
+
+  // 8a Run A: SINCE_OVERRIDE=true + everything pending → warning present
+  {
+    const digest = [samplePr(301), samplePr(302), samplePr(303)]
+    const cwd = setupTriageCwd(digest)
+    const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText: "stream end before idle" })
+    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",
+        SINCE_OVERRIDE: "true",
+        GITHUB_STEP_SUMMARY: summaryFile,
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    const triage = JSON.parse(fs.readFileSync(path.join(cwd, "docs-sync-out", "triage.json"), "utf8"))
+    assert.equal(triage.length, 3)
+    assert.ok(triage.every((e) => e.pending === true))
+    const summary = fs.readFileSync(summaryFile, "utf8")
+    assert.match(summary, /triage pending/)
+    for (const d of digest) {
+      assert.ok(summary.includes(d.url), `summary lists ${d.url}`)
+    }
+    assert.match(result.output, /::warning::.*since-override/)
+  }
+
+  // 8a Run B: SINCE_OVERRIDE unset → warning absent
+  {
+    const digest = [samplePr(311), samplePr(312)]
+    const cwd = setupTriageCwd(digest)
+    const kiloDir = makeStubKiloDir({ mode: "stderr-exit0", stderrText: "stream end" })
+    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,
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    const triage = JSON.parse(fs.readFileSync(path.join(cwd, "docs-sync-out", "triage.json"), "utf8"))
+    assert.ok(triage.every((e) => e.pending === true))
+    assert.ok(fs.readFileSync(summaryFile, "utf8").includes("triage pending"))
+    assert.ok(!/::warning::.*since-override/.test(result.output), "override warning must be absent when unset")
+  }
+
+  // 8a Run C: SINCE_OVERRIDE=true with MIXED stub (worthy > 0) → warning ABSENT
+  {
+    const digest = [samplePr(321), samplePr(322), samplePr(323), samplePr(324)]
+    const cwd = setupTriageCwd(digest)
+    const kiloDir = makeStubKiloDir({ mode: "mixed-triage" })
+    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",
+        SINCE_OVERRIDE: "true",
+        GITHUB_STEP_SUMMARY: summaryFile,
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    const triage = JSON.parse(fs.readFileSync(path.join(cwd, "docs-sync-out", "triage.json"), "utf8"))
+    const worthy = triage.filter((e) => e.docs_worthy === true).length
+    const pending = triage.filter((e) => e.pending === true).length
+    assert.ok(worthy > 0, "mixed stub must produce worthy > 0")
+    assert.ok(pending > 0, "mixed stub must leave some pending")
+    assert.ok(
+      !/::warning::.*since-override/.test(result.output),
+      "override warning must be ABSENT when worthy > 0 (Upsert will run)",
+    )
+  }
+
+  // 8b — partial classification → missing URLs pending:true + computeUncovered
+  {
+    // One chunk of 4 PRs; stub classifies first 3 only
+    const digest = [samplePr(401), samplePr(402), samplePr(403), samplePr(404)]
+    const cwd = setupTriageCwd(digest)
+    const kiloDir = makeStubKiloDir({ mode: "partial-triage" })
+    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,
+      },
+    })
+    assert.equal(result.status, 0, result.output)
+    const triage = JSON.parse(fs.readFileSync(path.join(cwd, "docs-sync-out", "triage.json"), "utf8"))
+    assert.equal(triage.length, 4)
+    const missing = triage.filter((e) => e.reason === "not classified by triage")
+    assert.ok(missing.length >= 1, "backfill must mark unclassified URLs")
+    assert.ok(missing.every((e) => e.pending === true))
+    const uncovered = computeUncovered({ worthy: [], summary: [], triage })
+    for (const m of missing) {
+      assert.ok(
+        uncovered.some((u) => u.url === m.url),
+        `${m.url} must appear in computeUncovered`,
+      )
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// main
+// ---------------------------------------------------------------------------
+function main() {
+  const cases = [
+    case1_mergeOrFallback,
+    case2_defectB,
+    case3_watermark,
+    case4_routing,
+    case5_recollection,
+    case6_budgets,
+    case7_cap,
+    case8_triage,
+  ]
+  let failed = 0
+  for (const fn of cases) {
+    try {
+      fn()
+      console.log(`  ok: ${fn.name}`)
+    } catch (err) {
+      failed++
+      console.error(`  FAIL: ${fn.name}`)
+      console.error(err)
+    } finally {
+      cleanup()
+    }
+  }
+  if (failed > 0) {
+    console.error(`\nselftest: ${failed} case(s) failed`)
+    process.exit(1)
+  }
+  console.log("\nselftest: all cases passed")
+}
+
+main()
diff --git a/.github/docs-sync/triage.mjs b/.github/docs-sync/triage.mjs
index 034a7ddcbda..eb075980b51 100644
--- a/.github/docs-sync/triage.mjs
+++ b/.github/docs-sync/triage.mjs
@@ -6,52 +6,82 @@
  * A daily window holds ~30-50 PRs; a replay can hold several hundred. A
  * single triage call over that volume truncates its JSON output, so the
  * digest is split into chunks of CHUNK_SIZE and each chunk is triaged with
- * its own `kilo run` call. A chunk that fails twice is degraded to
- * "unclassified" entries (docs_worthy=false) instead of failing the run —
- * the PR body then shows those PRs as skipped, visible to reviewers.
+ * its own `kilo run` call. A chunk that fails, is only partially classified,
+ * or is deferred by the wall-clock budget is marked pending:true (still
+ * docs_worthy:false so filter-worthy excludes it) so the watermark holds
+ * back and the next run re-collects those PRs.
  *
- * Env: TRIAGE_MODEL (provider/model), KILO_API_KEY (gateway auth, set by the workflow;
- * the kilo provider reads it natively). Reads the prompt from triage-prompt.md next to this script.
+ * Env: TRIAGE_MODEL (provider/model), KILO_API_KEY + KILO_ORG_ID (gateway auth, set by
+ * the workflow; the kilo provider reads them natively). Reads the prompt from triage-prompt.md next to this script.
+ * Budget: TRIAGE_BUDGET_MINUTES (default 35). Test hook: DOCS_SYNC_BACKOFF_MS.
  */
 
-import { execFileSync } from "node:child_process"
 import fs from "node:fs"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
 import { parseTriageEntries } from "./extract-json.mjs"
+import { appendSummary, backoffMsForAttempt, deadline, remainingMs, runKilo, sleepSync } from "./lib.mjs"
 
 const CHUNK_SIZE = 25
-const ATTEMPTS = 2
+const ATTEMPTS = 3
 const OUT_DIR = "docs-sync-out"
+const CHUNK_TIMEOUT_MS = 10 * 60 * 1000
 
 const HERE = path.dirname(fileURLToPath(import.meta.url))
 const prompt = fs.readFileSync(path.join(HERE, "triage-prompt.md"), "utf8")
 const model = process.env.TRIAGE_MODEL
 if (!model) throw new Error("TRIAGE_MODEL is required")
 
+const TRIAGE_BUDGET_MINUTES = Number(process.env.TRIAGE_BUDGET_MINUTES) || 35
+
 const digest = JSON.parse(fs.readFileSync(`${OUT_DIR}/digest.json`, "utf8"))
 
-function triageChunk(chunk, index) {
+function formatCause(result) {
+  const bits = []
+  if (result.timedOut) bits.push("timed out")
+  if (result.exitCode !== null && result.exitCode !== undefined) bits.push(`exit ${result.exitCode}`)
+  if (result.stderrTail) bits.push(result.stderrTail.replaceAll("\n", " ").slice(0, 200))
+  return bits.join("; ") || "no diagnostic"
+}
+
+function pendingEntry(d, reason) {
+  return {
+    pr: d.number,
+    url: d.url,
+    docs_worthy: false,
+    pending: true,
+    reason,
+    target_sections: [],
+    priority: "medium",
+  }
+}
+
+function triageChunk(chunk, index, budgetDeadline) {
   const chunkFile = `${OUT_DIR}/triage-chunk-${index}.json`
   fs.writeFileSync(chunkFile, JSON.stringify(chunk, null, 2))
 
+  let lastCause = "triage failed to classify this PR"
   for (let attempt = 1; attempt <= ATTEMPTS; attempt++) {
-    let raw
-    try {
-      // Message positional first: --file is multi-value and would otherwise
-      // consume a trailing message as a file path ("File not found").
-      raw = execFileSync(
-        "kilo",
-        ["run", prompt, "-m", model, "--dir", process.cwd(), "-f", chunkFile],
-        { encoding: "utf8", maxBuffer: 32 * 1024 * 1024, timeout: 10 * 60 * 1000, stdio: ["ignore", "pipe", "pipe"] },
+    const left = remainingMs(budgetDeadline)
+    if (left < CHUNK_TIMEOUT_MS) {
+      lastCause = `triage budget exhausted before chunk ${index} attempt ${attempt}`
+      console.warn(
+        `chunk ${index}: stopping retries — remaining budget cannot fit another ${CHUNK_TIMEOUT_MS / 60000}m attempt`,
       )
-    } catch (err) {
-      const stderr = String(err.stderr ?? "").trim().split("\n").slice(-5).join("\n")
-      console.warn(`chunk ${index} attempt ${attempt}: kilo run failed: ${stderr || err.message}`)
-      continue
+      break
     }
-    fs.writeFileSync(`${OUT_DIR}/triage-raw-${index}.txt`, raw)
-    const entries = parseTriageEntries(raw)
+
+    const result = runKilo({
+      args: ["run", prompt, "-m", model, "--dir", process.cwd(), "-f", chunkFile],
+      timeoutMs: Math.min(CHUNK_TIMEOUT_MS, left),
+      streamStdout: false,
+      label: `triage chunk ${index} attempt ${attempt}`,
+    })
+
+    const raw = result.stdout
+    if (raw) fs.writeFileSync(`${OUT_DIR}/triage-raw-${index}.txt`, raw)
+
+    const entries = raw ? parseTriageEntries(raw) : null
     if (entries) {
       // An entry for a PR outside this chunk must not win the shared dedupe
       // against the chunk that actually owns it — drop foreign entries.
@@ -62,18 +92,35 @@ function triageChunk(chunk, index) {
       }
       if (owned.length > 0) return owned
     }
-    console.warn(`chunk ${index} attempt ${attempt}: no valid JSON in output`)
+
+    // Exit 0 is not success: unparseable output is a failure logged WITH
+    // the captured stderrTail and exit code on every attempt.
+    const cause = formatCause(result)
+    lastCause = `triage chunk ${index}: ${cause}`
+    console.warn(
+      `chunk ${index} attempt ${attempt}: no valid JSON in output` +
+        ` (exit ${result.exitCode}${result.timedOut ? ", timed out" : ""})` +
+        (result.stderrTail ? `\nstderr tail:\n${result.stderrTail}` : "\nstderr tail: (empty)"),
+    )
+
+    if (attempt < ATTEMPTS) {
+      const wait = backoffMsForAttempt(attempt)
+      const afterWait = remainingMs(budgetDeadline) - wait
+      if (wait > 0 && afterWait >= CHUNK_TIMEOUT_MS) {
+        console.warn(`chunk ${index}: backing off ${wait / 1000}s before attempt ${attempt + 1}`)
+        sleepSync(wait)
+      } else if (wait > 0) {
+        console.warn(
+          `chunk ${index}: skipping backoff — remaining budget cannot fit attempt ${attempt + 1} after wait`,
+        )
+      }
+    }
   }
 
-  console.warn(`::warning::chunk ${index} failed triage after ${ATTEMPTS} attempts; marking ${chunk.length} PRs unclassified`)
-  return chunk.map((d) => ({
-    pr: d.number,
-    url: d.url,
-    docs_worthy: false,
-    reason: "triage failed to classify this PR",
-    target_sections: [],
-    priority: "medium",
-  }))
+  console.warn(
+    `::warning::chunk ${index} failed triage after up to ${ATTEMPTS} attempts; marking ${chunk.length} PRs pending`,
+  )
+  return chunk.map((d) => pendingEntry(d, lastCause.includes("triage failed") ? lastCause : `triage failed to classify this PR (${lastCause})`))
 }
 
 const chunks = []
@@ -82,30 +129,61 @@ for (let i = 0; i < digest.length; i += CHUNK_SIZE) {
 }
 console.log(`triaging ${digest.length} PRs in ${chunks.length} chunks of up to ${CHUNK_SIZE}`)
 
+const budgetDeadline = deadline(TRIAGE_BUDGET_MINUTES)
 const merged = []
 const seen = new Set()
+
 for (let i = 0; i < chunks.length; i++) {
-  for (const e of triageChunk(chunks[i], i)) {
+  const left = remainingMs(budgetDeadline)
+  if (left < CHUNK_TIMEOUT_MS) {
+    const deferredPrs = chunks.slice(i).reduce((n, c) => n + c.length, 0)
+    console.warn(
+      `stopping triage before chunk ${i}: remaining budget (${Math.ceil(left / 1000)}s) cannot fit a ${CHUNK_TIMEOUT_MS / 60000}m chunk; deferring ${deferredPrs} PRs`,
+    )
+    const cause = `triage budget exhausted before chunk ${i} (${Math.ceil(left / 1000)}s left)`
+    for (let j = i; j < chunks.length; j++) {
+      for (const d of chunks[j]) {
+        if (seen.has(d.url)) continue
+        seen.add(d.url)
+        merged.push(pendingEntry(d, cause))
+      }
+    }
+    break
+  }
+
+  for (const e of triageChunk(chunks[i], i, budgetDeadline)) {
     if (seen.has(e.url)) continue
     seen.add(e.url)
     merged.push(e)
   }
 }
 
-// Coverage: every digest PR gets a triage entry so the PR body's skipped
-// table is complete. Unclassified defaults to not-docs-worthy (conservative).
+// Coverage: every digest PR gets a triage entry. Partial-chunk backfill and
+// any other missing URL are pending:true — not a genuine "not worthy" verdict.
 for (const d of digest) {
   if (seen.has(d.url)) continue
-  merged.push({
-    pr: d.number,
-    url: d.url,
-    docs_worthy: false,
-    reason: "not classified by triage",
-    target_sections: [],
-    priority: "medium",
-  })
+  merged.push(pendingEntry(d, "not classified by triage"))
 }
 
 fs.writeFileSync(`${OUT_DIR}/triage.json`, JSON.stringify(merged, null, 2))
 const worthy = merged.filter((e) => e.docs_worthy).length
-console.log(`triage complete: ${merged.length} entries, ${worthy} docs-worthy`)
+const pending = merged.filter((e) => e.pending === true)
+console.log(`triage complete: ${merged.length} entries, ${worthy} docs-worthy, ${pending.length} pending`)
+
+// Upsert is gated off when worthy == 0, so triage emits its own Step Summary
+// listing every PR it marked pending:true and why.
+if (pending.length > 0) {
+  const lines = pending.map((e) => `- [${e.url}] ${e.reason}`)
+  appendSummary(
+    `### docs-sync: triage pending (will retry)\n\n${pending.length} PR(s) were not classified and will be re-collected on the next run:\n\n${lines.join("\n")}`,
+  )
+}
+
+// Replay warning (S2j): warn IFF since-override AND something pending AND
+// docs-worthy count is 0 (Upsert is gated off, so noDiffReport never runs).
+const sinceOverride = process.env.SINCE_OVERRIDE === "true"
+if (sinceOverride && pending.length > 0 && worthy === 0) {
+  console.warn(
+    "::warning::docs-sync since-override replay left uncovered PRs and wrote no PR body (worthy=0); re-run the override — the watermark was not held back in the body",
+  )
+}
diff --git a/.github/docs-sync/upsert-pr.mjs b/.github/docs-sync/upsert-pr.mjs
index e39551f307c..1ef25b75964 100644
--- a/.github/docs-sync/upsert-pr.mjs
+++ b/.github/docs-sync/upsert-pr.mjs
@@ -8,6 +8,14 @@
  * diff exceeds the file cap or verification failed. The PR body carries
  * marker-delimited sections so later runs can append rows, plus a
  * machine-readable processed-through watermark.
+ *
+ * Watermark invariant: processed-through never moves past a PR that has no
+ * terminal outcome. Terminal := action !== "pending" (a deliberate agent
+ * "skipped" IS terminal). Uncovered PRs hold the marker at earliest
+ * merged_at − 1 ms so collect's merged:>=since re-collects them next run.
+ * Three review rounds found four independent defects in a queue-based
+ * alternative (unreachable gate, empty-PR creation, cap-overflow loss,
+ * draft-state corruption); a held-back watermark has none of those modes.
  */
 
 import { execFileSync } from "node:child_process"
@@ -17,6 +25,7 @@ import { pathToFileURL } from "node:url"
 const BRANCH = process.env.BRANCH || "docs/auto-sync"
 const FILE_CAP = 15
 const ROW_CAP = 150
+const PENDING_DISPLAY_CAP = 60
 const SUMMARY_FILE = ".docs-sync-summary.json"
 const DOCS_PATH = "packages/kilo-docs"
 
@@ -42,6 +51,11 @@ function skippedRow(e) {
   return `| [${shortRef(e.url)}](${clean(e.url)}) | ${reason} |`
 }
 
+function pendingRow(e) {
+  const reason = clean(e.reason ?? e.cause ?? "").replaceAll("|", "\\|").replaceAll("\n", " ")
+  return `| [${shortRef(e.url)}](${clean(e.url)}) | ${reason} |`
+}
+
 export function extractSectionRows(body, name) {
   const m = String(body ?? "").match(
     new RegExp(`<!--\\s*docs-sync:${name}:start\\s*-->([\\s\\S]*?)<!--\\s*docs-sync:${name}:end\\s*-->`),
@@ -50,7 +64,14 @@ export function extractSectionRows(body, name) {
   return m[1]
     .split("\n")
     .map((l) => l.trim())
-    .filter((l) => l.startsWith("|") && !l.startsWith("| ---") && !/^\|\s*Docs change/.test(l) && !/^\|\s*PR\s*\|/.test(l))
+    .filter(
+      (l) =>
+        l.startsWith("|") &&
+        !l.startsWith("| ---") &&
+        !/^\|\s*Docs change/.test(l) &&
+        !/^\|\s*PR\s*\|/.test(l) &&
+        !/^\|\s*Why\s*\|/.test(l),
+    )
 }
 
 function section(name, header, rows) {
@@ -58,7 +79,12 @@ function section(name, header, rows) {
   return `<!-- docs-sync:${name}:start -->\n${body}\n<!-- docs-sync:${name}:end -->`
 }
 
-export function renderBody({ date, since, through, changesRows, skippedRows, verified, draftReasons, note }) {
+export function renderBody({ date, since, through, changesRows, pendingRows, skippedRows, verified, draftReasons, note }) {
+  const pendingDisplay =
+    pendingRows.length > PENDING_DISPLAY_CAP
+      ? [...pendingRows.slice(0, PENDING_DISPLAY_CAP), `| +${pendingRows.length - PENDING_DISPLAY_CAP} more | |`]
+      : pendingRows
+
   return `## Automated docs sync — ${date}
 
 This PR keeps kilo.ai/docs in sync with features merged to [Kilo-Org/cloud](https://github.com/Kilo-Org/cloud) and [Kilo-Org/kilocode](https://github.com/Kilo-Org/kilocode). Every change below links to the merged PR it documents.
@@ -70,6 +96,10 @@ ${note ? `- ${note}\n` : ""}${draftReasons.length > 0 ? `- Draft because: ${draf
 
 ${section("changes", "| Docs change | Source |", changesRows)}
 
+### Pending — will retry
+
+${section("pending", "| PR | Why |", pendingDisplay)}
+
 ### Considered, no docs change needed
 
 ${section("skipped", "| PR | Reason |", skippedRows)}
@@ -100,32 +130,222 @@ function readJson(path, fallback) {
   }
 }
 
+/**
+ * Uncovered = (worthy URLs with no summary row) ∪ (summary action "pending")
+ * ∪ (triage entries with pending: true). A worthy PR is covered iff it has a
+ * summary row whose action !== "pending" and carries no triage pending flag.
+ */
+export function computeUncovered({ worthy, summary, triage }) {
+  const worthyList = Array.isArray(worthy) ? worthy : []
+  const summaryList = Array.isArray(summary) ? summary : []
+  const triageList = Array.isArray(triage) ? triage : []
+
+  const summaryByUrl = new Map()
+  for (const e of summaryList) {
+    if (e?.url) summaryByUrl.set(e.url, e)
+  }
+
+  const triagePendingByUrl = new Map()
+  for (const e of triageList) {
+    if (e?.url && e.pending === true) triagePendingByUrl.set(e.url, e)
+  }
+
+  /** @type {Map<string, { url: string, pr?: number, reason: string }>} */
+  const out = new Map()
+
+  for (const w of worthyList) {
+    const url = w?.url
+    if (!url) continue
+    const row = summaryByUrl.get(url)
+    if (!row) {
+      out.set(url, {
+        url,
+        pr: w.number ?? w.pr,
+        reason: "no edit summary row (edit pass did not cover this PR)",
+      })
+      continue
+    }
+    if (row.action === "pending") {
+      out.set(url, {
+        url,
+        pr: row.pr ?? w.number ?? w.pr,
+        reason: row.reason || "edit pass pending",
+      })
+    }
+  }
+
+  // Summary pending rows for URLs not in worthy (defensive).
+  for (const row of summaryList) {
+    if (row?.action === "pending" && row.url && !out.has(row.url)) {
+      out.set(row.url, {
+        url: row.url,
+        pr: row.pr,
+        reason: row.reason || "edit pass pending",
+      })
+    }
+  }
+
+  for (const [url, e] of triagePendingByUrl) {
+    if (out.has(url)) continue
+    out.set(url, {
+      url,
+      pr: e.pr,
+      reason: e.reason || "triage pending",
+    })
+  }
+
+  return [...out.values()]
+}
+
+/**
+ * processed-through = now when uncovered is empty; otherwise earliest
+ * merged_at among uncovered PRs minus 1 ms (from digest-full.json).
+ * When uncovered is non-empty but no merged_at resolves, hold at
+ * `fallback` (the run's window start / SINCE): every uncovered PR was
+ * collected via merged:>=since, so holding there re-collects all of them.
+ * Never advance past unresolved uncovered PRs (Defect-B permanent-loss).
+ */
+export function computeProcessedThrough({ uncovered, digest, now, fallback }) {
+  const nowIso = typeof now === "string" ? now : new Date(now).toISOString()
+  if (!uncovered || uncovered.length === 0) return nowIso
+
+  const digestList = Array.isArray(digest) ? digest : []
+  const byUrl = new Map(digestList.filter((d) => d?.url).map((d) => [d.url, d]))
+
+  let earliest = null
+  for (const u of uncovered) {
+    const d = byUrl.get(u.url)
+    const mergedAt = d?.merged_at
+    if (!mergedAt) continue
+    const t = Date.parse(mergedAt)
+    if (!Number.isFinite(t)) continue
+    if (earliest === null || t < earliest) earliest = t
+  }
+
+  if (earliest === null) {
+    // digest-full missing/corrupt while uncovered is non-empty: hold at
+    // window start so collect's merged:>=since re-collects every PR.
+    // Never use now−1ms — that strands uncovered PRs permanently.
+    const fallbackMs = fallback == null ? NaN : Date.parse(fallback)
+    if (!Number.isFinite(fallbackMs)) {
+      throw new Error(
+        `docs-sync: cannot resolve merged_at for ${uncovered.length} uncovered PR(s) and fallback/SINCE is missing or unparseable; refusing to advance processed-through`,
+      )
+    }
+    const fallbackIso = new Date(fallbackMs).toISOString()
+    console.warn(
+      `::warning::docs-sync: merge times for ${uncovered.length} uncovered PR(s) could not be resolved; holding watermark at window start ${fallbackIso}`,
+    )
+    return fallbackIso
+  }
+
+  return new Date(earliest - 1).toISOString()
+}
+
+/**
+ * Route summary + triage into the three body sections.
+ * changesRows = action neither skipped nor pending
+ * pendingRows = uncovered from computeUncovered
+ * skippedRows = action === "skipped" ∪ triage docs_worthy false && !pending
+ */
+export function routeRows({ summary, triage, uncovered }) {
+  const summaryList = Array.isArray(summary) ? summary : []
+  const triageList = Array.isArray(triage) ? triage : []
+  const uncoveredList = Array.isArray(uncovered) ? uncovered : []
+
+  const changesEntries = summaryList.filter((e) => e.action !== "skipped" && e.action !== "pending")
+  const skippedEntries = [
+    ...triageList.filter((e) => e.docs_worthy === false && e.pending !== true),
+    ...summaryList.filter((e) => e.action === "skipped"),
+  ]
+
+  return {
+    changesRows: changesEntries.map(changeRow),
+    pendingRows: uncoveredList.map(pendingRow),
+    skippedRows: skippedEntries.map(skippedRow),
+  }
+}
+
+/**
+ * Drop pre-existing Considered rows whose reason contains any of the three
+ * legacy failure literals (substring match — live rows carry longer strings).
+ * Genuine no-doc-needed rows are untouched.
+ */
+export function dropLegacySkipped(rows) {
+  const list = Array.isArray(rows) ? rows : []
+  const needles = ["edit pass failed or timed out", "triage failed to classify", "not classified by triage"]
+  return list.filter((row) => {
+    const s = String(row ?? "")
+    return !needles.some((n) => s.includes(n))
+  })
+}
+
+/**
+ * No-diff early-return report. Returns summary markdown and an optional
+ * replay warning. Warns IFF sinceOverride && uncovered non-empty (no commit
+ * happened — that is the caller's situation).
+ */
+export function noDiffReport({ uncovered, sinceOverride }) {
+  const list = Array.isArray(uncovered) ? uncovered : []
+  const lines =
+    list.length === 0
+      ? ["The agent found nothing worth documenting in this window."]
+      : [
+          `No packages/kilo-docs diff was produced, but ${list.length} PR(s) remain uncovered and will be re-collected on the next scheduled run:`,
+          "",
+          ...list.map((u) => `- [${u.url}] ${u.reason || "uncovered"}`),
+        ]
+
+  const summary = `### docs-sync: no docs changes\n\n${lines.join("\n")}`
+
+  let warning = null
+  if (sinceOverride && list.length > 0) {
+    warning =
+      "docs-sync since-override replay left uncovered PRs and wrote no PR body (no docs commit); re-run the override — the watermark was not held back in the body"
+  }
+
+  return { summary, warning }
+}
+
 async function main() {
   const { api, appendOutput, appendSummary, repo } = await import("./lib.mjs")
 
-  const through = process.env.PROCESSED_THROUGH ?? new Date().toISOString()
+  const now = process.env.PROCESSED_THROUGH ?? new Date().toISOString()
   const since = process.env.SINCE ?? "unknown"
+  const sinceOverride = process.env.SINCE_OVERRIDE === "true"
   const mode = ["update", "conflict"].includes(process.env.PREP_MODE) ? process.env.PREP_MODE : "fresh"
   const existingPr = process.env.PR_NUMBER || ""
   const verified = process.env.VERIFIED === "true"
-  const date = through.slice(0, 10)
+  const date = now.slice(0, 10)
 
   // The agent's run summary is consumed here and never committed.
   const agentSummary = readJson(SUMMARY_FILE, [])
   fs.rmSync(SUMMARY_FILE, { force: true })
   const triage = readJson("docs-sync-out/triage.json", [])
+  const worthy = readJson("docs-sync-out/worthy.json", [])
+  const digest = readJson("docs-sync-out/digest-full.json", [])
+
+  // Order matters: compute uncovered BEFORE the no-diff early return so
+  // noDiffReport can name every held-back PR.
+  const uncovered = computeUncovered({ worthy, summary: agentSummary, triage })
 
   if (git(["status", "--porcelain", "--", DOCS_PATH]) === "") {
     console.log("no packages/kilo-docs changes produced; nothing to commit")
-    appendSummary("### docs-sync: no docs changes\n\nThe agent found nothing worth documenting in this window.")
+    const { summary, warning } = noDiffReport({ uncovered, sinceOverride })
+    appendSummary(summary)
+    if (warning) console.warn(`::warning::${warning}`)
     return
   }
 
-  git(["config", "user.name", "github-actions[bot]"])
-  git(["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"])
+  // Git identity is configured once in docs-sync.yml (Configure git identity)
+  // before any commit-creating step, including prepare-branch's merge.
   git(["add", DOCS_PATH])
   git(["commit", "-m", `docs: sync with merged PRs (${date})`])
 
+  // Watermark: now when fully covered; else earliest uncovered merged_at − 1ms.
+  // Pass SINCE as fallback so missing digest-full cannot strand uncovered PRs.
+  const through = computeProcessedThrough({ uncovered, digest, now, fallback: since })
+
   // The draft cap bounds the cumulative PR diff, not just this run's commit.
   const changedFiles = git(["diff", "--name-only", "origin/main...HEAD", "--", DOCS_PATH])
     .split("\n")
@@ -151,25 +371,33 @@ async function main() {
 
   git(mode === "update" ? ["push", "origin", `HEAD:${BRANCH}`] : ["push", "--force-with-lease", "origin", `HEAD:${BRANCH}`])
 
-  const changesNew = agentSummary.filter((e) => e.action !== "skipped").map(changeRow)
-  const skippedNew = [
-    ...triage.filter((e) => e.docs_worthy === false),
-    ...agentSummary.filter((e) => e.action === "skipped"),
-  ].map(skippedRow)
+  const { changesRows: changesNew, pendingRows: pendingNew, skippedRows: skippedNew } = routeRows({
+    summary: agentSummary,
+    triage,
+    uncovered,
+  })
 
   let oldChanges = []
   let oldSkipped = []
+  let oldPending = []
   if (mode === "update" && existingPr) {
     const pr = await api(`/repos/${repo()}/pulls/${existingPr}`)
     oldChanges = extractSectionRows(pr.body, "changes")
-    oldSkipped = extractSectionRows(pr.body, "skipped")
+    oldSkipped = dropLegacySkipped(extractSectionRows(pr.body, "skipped"))
+    oldPending = extractSectionRows(pr.body, "pending")
   }
 
+  // Pending is replaced each run (informational only); do not merge legacy
+  // pending rows — uncovered is recomputed fresh. oldPending is read only so
+  // extractSectionRows stays exercised; discarded deliberately.
+  void oldPending
+
   const body = renderBody({
     date,
     since,
     through,
     changesRows: mergeRows(oldChanges, changesNew),
+    pendingRows: pendingNew,
     skippedRows: mergeRows(oldSkipped, skippedNew),
     verified,
     draftReasons,
@@ -228,8 +456,10 @@ async function main() {
   }
 
   appendOutput("pr_url", prUrl)
-  appendSummary(`### docs-sync PR\n\n- ${prUrl}\n- changed files: ${changedFiles.length}\n- draft: ${draft}\n`)
-  console.log(`PR ${prNumber}: ${prUrl} (draft=${draft}, files=${changedFiles.length})`)
+  appendSummary(
+    `### docs-sync PR\n\n- ${prUrl}\n- changed files: ${changedFiles.length}\n- draft: ${draft}\n- uncovered: ${uncovered.length}\n- processed-through: ${through}\n`,
+  )
+  console.log(`PR ${prNumber}: ${prUrl} (draft=${draft}, files=${changedFiles.length}, uncovered=${uncovered.length}, through=${through})`)
 }
 
 const isMain = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href
diff --git a/.github/docs-sync/watermark.mjs b/.github/docs-sync/watermark.mjs
index cc4c9690168..32986fef67f 100644
--- a/.github/docs-sync/watermark.mjs
+++ b/.github/docs-sync/watermark.mjs
@@ -7,9 +7,10 @@
  *
  * Priority: workflow_dispatch input `since` > latest open bot PR marker >
  * last merged bot PR marker > 72h ago. Hard cap: never look back more than
- * 14 days.
+ * 14 days — unless the human explicitly requested a window via INPUT_SINCE.
  */
 
+import { pathToFileURL } from "node:url"
 import { appendOutput, appendSummary, repo, searchIssues } from "./lib.mjs"
 
 const FALLBACK_HOURS = 72
@@ -42,34 +43,65 @@ async function findWatermark() {
   return null
 }
 
-const now = new Date()
-let since
-
-const input = (process.env.INPUT_SINCE ?? "").trim()
-if (input) {
-  since = new Date(input)
-  if (Number.isNaN(since.getTime())) {
-    throw new Error(`Invalid INPUT_SINCE: ${input}`)
+/**
+ * Apply the 14-day lookback cap. When `explicit` is true (dispatch override),
+ * the cap is skipped so a human-requested recovery window is not silently
+ * shortened. Returns `{ since, clamped }`.
+ */
+export function applyCap(since, now, { explicit = false } = {}) {
+  if (explicit) {
+    console.log(`14-day cap skipped: INPUT_SINCE was set explicitly (${since.toISOString()})`)
+    return { since, clamped: false }
   }
-  console.log(`watermark from dispatch input: ${since.toISOString()}`)
-} else {
-  since =
-    (await findWatermark()) ?? new Date(now.getTime() - FALLBACK_HOURS * 3600 * 1000)
+  const cap = new Date(now.getTime() - CAP_DAYS * 24 * 3600 * 1000)
+  if (since < cap) {
+    const from = since.toISOString()
+    const to = cap.toISOString()
+    console.warn(
+      `::warning::docs-sync watermark clamped from ${from} to ${to} (${CAP_DAYS}-day cap). ` +
+        `Anything still uncovered before ${to} is abandoned and needs a human.`,
+    )
+    return { since: cap, clamped: true }
+  }
+  return { since, clamped: false }
 }
 
-// A forged, edited, or malformed marker in the future would silently match
-// nothing in the merged:>= search; clamp it loudly.
-if (since > now) {
-  console.warn(`watermark ${since.toISOString()} is in the future, clamping to now`)
-  since = now
+async function main() {
+  const now = new Date()
+  let since
+  let explicit = false
+
+  const input = (process.env.INPUT_SINCE ?? "").trim()
+  if (input) {
+    since = new Date(input)
+    if (Number.isNaN(since.getTime())) {
+      throw new Error(`Invalid INPUT_SINCE: ${input}`)
+    }
+    explicit = true
+    console.log(`watermark from dispatch input: ${since.toISOString()}`)
+  } else {
+    since = (await findWatermark()) ?? new Date(now.getTime() - FALLBACK_HOURS * 3600 * 1000)
+  }
+
+  // A forged, edited, or malformed marker in the future would silently match
+  // nothing in the merged:>= search; clamp it loudly.
+  if (since > now) {
+    console.warn(`watermark ${since.toISOString()} is in the future, clamping to now`)
+    since = now
+  }
+
+  ;({ since } = applyCap(since, now, { explicit }))
+
+  appendOutput("since", since.toISOString())
+  appendOutput("now", now.toISOString())
+  appendOutput("since_override", explicit ? "true" : "false")
+  appendSummary(`### docs-sync watermark\n\n- since: \`${since.toISOString()}\`\n- now: \`${now.toISOString()}\`\n`)
 }
 
-const cap = new Date(now.getTime() - CAP_DAYS * 24 * 3600 * 1000)
-if (since < cap) {
-  console.log(`watermark ${since.toISOString()} older than ${CAP_DAYS}d cap, clamping`)
-  since = cap
+const isMain = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href
+if (isMain) {
+  main().catch((err) => {
+    console.error(err)
+    process.exit(1)
+  })
 }
-
-appendOutput("since", since.toISOString())
-appendOutput("now", now.toISOString())
-appendSummary(`### docs-sync watermark\n\n- since: \`${since.toISOString()}\`\n- now: \`${now.toISOString()}\`\n`)
diff --git a/.github/workflows/docs-sync.yml b/.github/workflows/docs-sync.yml
index 9eacf14e614..5a32e876986 100644
--- a/.github/workflows/docs-sync.yml
+++ b/.github/workflows/docs-sync.yml
@@ -5,9 +5,13 @@ name: docs-sync
 # triages them for docs relevance, runs Kilo CLI headless to update
 # packages/kilo-docs, and maintains one rolling PR for human review.
 #
-# Security posture: scheduled/manual only, checks out main, never executes
-# code from PR branches. State is derived from the bot's own PRs (watermark
-# marker in the PR body), so missed or failed runs self-heal on the next run.
+# Security posture: scheduled/manual runs check out the dispatched ref and may
+# push/comment with write permissions and org secrets. PR runs (paths-limited to
+# this workflow and .github/docs-sync/**) execute branch code only in a
+# read-only, secretless `selftest` job that never pushes, comments, or calls an
+# LLM. `pull_request` (not `pull_request_target`) keeps fork tokens read-only.
+# State is derived from the bot's own PRs (watermark marker in the PR body), so
+# missed or failed runs self-heal on the next run.
 
 on:
   schedule:
@@ -22,6 +26,10 @@ on:
         description: "Collect + triage only, no edits, no PR"
         type: boolean
         default: false
+  pull_request:
+    paths:
+      - ".github/docs-sync/**"
+      - ".github/workflows/docs-sync.yml"
 
 permissions:
   contents: write # push the rolling branch, create the auto-docs label
@@ -29,7 +37,7 @@ permissions:
   issues: write # comment on the rolling PR
 
 concurrency:
-  group: docs-sync
+  group: ${{ github.event_name == 'pull_request' && format('docs-sync-pr-{0}', github.event.pull_request.number) || 'docs-sync' }}
   cancel-in-progress: false
 
 env:
@@ -37,15 +45,14 @@ env:
   EDIT_MODEL: ${{ vars.DOCS_SYNC_EDIT_MODEL || 'kilo/moonshotai/kimi-k3' }}
 
 jobs:
-  sync:
+  selftest:
     if: github.repository == 'Kilo-Org/kilocode'
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    timeout-minutes: 120
+    permissions:
+      contents: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
-        with:
-          fetch-depth: 0 # prepare-branch merges main into the rolling branch
 
       - name: Setup Node
         uses: actions/setup-node@v6
@@ -53,6 +60,39 @@ jobs:
           node-version: "24"
           package-manager-cache: false
 
+      - name: Run docs-sync selftest
+        run: node .github/docs-sync/selftest.mjs
+
+  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
+    env:
+      # Both are required: without KILO_ORG_ID the gateway bills the key
+      # owner's personal balance (402 "Add credits") instead of the org.
+      KILO_API_KEY: ${{ secrets.KILO_API_KEY }}
+      KILO_ORG_ID: ${{ secrets.KILO_ORG_ID }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 # prepare-branch merges main into the rolling branch
+
+      - name: Configure git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: "24"
+          package-manager-cache: false
+
+      - name: Run docs-sync selftest
+        run: node .github/docs-sync/selftest.mjs
+
       - name: Install Kilo CLI
         run: |
           npm install -g @kilocode/cli
@@ -75,7 +115,7 @@ jobs:
         id: triage
         if: steps.collect.outputs.count != '0'
         env:
-          KILO_API_KEY: ${{ secrets.KILO_API_KEY }}
+          SINCE_OVERRIDE: ${{ steps.wm.outputs.since_override }}
         run: node .github/docs-sync/triage.mjs
 
       - name: Filter docs-worthy PRs
@@ -101,10 +141,18 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: node .github/docs-sync/prepare-branch.mjs
 
+      # After prepare-branch checks out the rolling branch and merges main, the
+      # worktree holds main's scripts. Restore the dispatched ref's copies so a
+      # branch-dispatch AC9 run actually exercises the fixed code. git restore
+      # (not checkout) leaves them unstaged so upsert-pr's bare commit won't
+      # include them in the docs PR.
+      - name: Restore docs-sync scripts from the dispatched ref
+        if: (steps.worthy.outputs.count || '0') != '0' && inputs.dry_run != true
+        run: git restore --source=${{ github.sha }} -- .github/docs-sync
+
       - name: Update docs (Kilo CLI, batched)
         if: (steps.worthy.outputs.count || '0') != '0' && inputs.dry_run != true
-        env:
-          KILO_API_KEY: ${{ secrets.KILO_API_KEY }}
+        continue-on-error: true
         run: node .github/docs-sync/edit.mjs
 
       - name: Verify docs build and tests
@@ -121,8 +169,8 @@ jobs:
         id: fix
         if: steps.verify.outcome == 'failure'
         continue-on-error: true
+        timeout-minutes: 10
         env:
-          KILO_API_KEY: ${{ secrets.KILO_API_KEY }}
           NEXT_PUBLIC_POSTHOG_KEY: ${{ secrets.POSTHOG_API_KEY }}
         run: |
           set -o pipefail
@@ -150,6 +198,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           PROCESSED_THROUGH: ${{ steps.wm.outputs.now }}
           SINCE: ${{ steps.wm.outputs.since }}
+          SINCE_OVERRIDE: ${{ steps.wm.outputs.since_override }}
           BRANCH: ${{ steps.prep.outputs.branch }}
           PREP_MODE: ${{ steps.prep.outputs.mode }}
           PR_NUMBER: ${{ steps.prep.outputs.pr_number }}
diff --git a/.github/workflows/publish-jetbrains-bundled.yml b/.github/workflows/publish-jetbrains-bundled.yml
new file mode 100644
index 00000000000..5908b25e738
--- /dev/null
+++ b/.github/workflows/publish-jetbrains-bundled.yml
@@ -0,0 +1,341 @@
+# kilocode_change - new file
+name: publish-jetbrains-bundled
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: Merged JetBrains release PR number to bundle
+        required: true
+        type: string
+      merge_commit:
+        description: Merge commit SHA from the reviewed release PR
+        required: true
+        type: string
+
+concurrency:
+  group: publish-jetbrains-bundled-pr-${{ inputs.pr }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  validate:
+    if: github.repository == 'Kilo-Org/kilocode'
+    runs-on: blacksmith-4vcpu-ubuntu-2404
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      version: ${{ steps.release.outputs.version }}
+      kind: ${{ steps.release.outputs.kind }}
+      tag: ${{ steps.release.outputs.tag }}
+      channel: ${{ steps.release.outputs.marketplace_channel }}
+    steps:
+      - name: Checkout trusted validation scripts
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: main
+
+      - name: Setup Bun for validation
+        uses: ./.github/actions/setup-bun
+
+      - name: Checkout merged release PR for validation
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          path: release
+          persist-credentials: false
+          ref: ${{ inputs.merge_commit }}
+
+      - name: Validate release PR and tag
+        id: release
+        working-directory: release
+        run: bun ../script/jetbrains-release-validate.ts --pr "$PR_NUMBER"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ inputs.pr }}
+
+  bundle:
+    needs: validate
+    if: github.repository == 'Kilo-Org/kilocode'
+    runs-on: blacksmith-8vcpu-ubuntu-2404
+    permissions:
+      actions: read
+      contents: write
+    outputs:
+      version: ${{ needs.validate.outputs.version }}
+      kind: ${{ needs.validate.outputs.kind }}
+    steps:
+      - name: Checkout merged release PR metadata
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+          ref: ${{ inputs.merge_commit }}
+
+      - name: Save reviewed release metadata
+        run: |
+          cp packages/kilo-jetbrains/CHANGELOG.md "$RUNNER_TEMP/jetbrains-CHANGELOG.md"
+          cp packages/kilo-jetbrains/gradle.properties "$RUNNER_TEMP/jetbrains-gradle.properties"
+
+      - name: Checkout release tag
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ needs.validate.outputs.tag }}
+
+      - name: Restore reviewed release metadata
+        run: |
+          cp "$RUNNER_TEMP/jetbrains-CHANGELOG.md" packages/kilo-jetbrains/CHANGELOG.md
+          cp "$RUNNER_TEMP/jetbrains-gradle.properties" packages/kilo-jetbrains/gradle.properties
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "24"
+
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "21"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Install build tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y patchelf zip unzip
+          curl --fail --location \
+            https://ziglang.org/download/0.14.0/zig-linux-x86_64-0.14.0.tar.xz \
+            --output "$RUNNER_TEMP/zig.tar.xz"
+          echo "473ec26806133cf4d1918caf1a410f8403a13d979726a9045b421b685031a982  $RUNNER_TEMP/zig.tar.xz" | sha256sum --check --status
+          tar -xJf "$RUNNER_TEMP/zig.tar.xz" -C "$RUNNER_TEMP"
+          echo "$RUNNER_TEMP/zig-linux-x86_64-0.14.0" >> "$GITHUB_PATH"
+
+      - name: Validate signing secrets
+        run: |
+          missing=0
+          for name in JETBRAINS_CERTIFICATE_CHAIN JETBRAINS_PRIVATE_KEY JETBRAINS_PRIVATE_KEY_PASSWORD; do
+            if [[ -z "${!name}" ]]; then
+              echo "Missing required secret: $name" >&2
+              missing=1
+            fi
+          done
+          exit "$missing"
+        env:
+          JETBRAINS_CERTIFICATE_CHAIN: ${{ secrets.JETBRAINS_CERTIFICATE_CHAIN }}
+          JETBRAINS_PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
+          JETBRAINS_PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
+
+      - name: Write signing secrets to temp files
+        run: |
+          dir="$RUNNER_TEMP/jetbrains-signing"
+          mkdir -m 700 -p "$dir"
+          chain="$dir/certificate-chain.pem"
+          key="$dir/private-key.pem"
+          umask 077
+          printf '%s' "$JETBRAINS_CERTIFICATE_CHAIN" > "$chain"
+          printf '%s' "$JETBRAINS_PRIVATE_KEY" > "$key"
+          chmod 600 "$chain" "$key"
+          echo "JETBRAINS_CERTIFICATE_CHAIN_FILE=$chain" >> "$GITHUB_ENV"
+          echo "JETBRAINS_PRIVATE_KEY_FILE=$key" >> "$GITHUB_ENV"
+        env:
+          JETBRAINS_CERTIFICATE_CHAIN: ${{ secrets.JETBRAINS_CERTIFICATE_CHAIN }}
+          JETBRAINS_PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
+
+      - name: Build signed bundled plugin
+        working-directory: packages/kilo-jetbrains
+        run: |
+          args=(
+            -Pproduction=true
+            -Pkilo.version="$VERSION"
+            -Pkilo.channel="$CHANNEL"
+            -Pkilo.cli.bundled=true
+          )
+          ./gradlew clean buildPlugin signPlugin verifyPluginSignature verifyPlugin "${args[@]}"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ github.token }}
+          VERSION: ${{ needs.validate.outputs.version }}
+          CHANNEL: ${{ needs.validate.outputs.channel }}
+          JETBRAINS_PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
+
+      - name: Remove signing secret temp files
+        if: always()
+        run: rm -rf "$RUNNER_TEMP/jetbrains-signing"
+
+      - name: Resolve bundled archive
+        id: archive
+        run: |
+          mapfile -t signed < <(compgen -G "packages/kilo-jetbrains/build/distributions/*-signed.zip")
+          if [[ "${#signed[@]}" -ne 1 ]]; then
+            echo "Expected exactly one signed bundled JetBrains plugin ZIP, found ${#signed[@]}." >&2
+            printf '%s\n' "${signed[@]}" >&2
+            exit 1
+          fi
+          asset="kilo-code-${VERSION}-bundled.zip"
+          dest="packages/kilo-jetbrains/build/release/$asset"
+          mkdir -p "$(dirname "$dest")"
+          cp "${signed[0]}" "$dest"
+          echo "asset=$asset" >> "$GITHUB_OUTPUT"
+          echo "path=$dest" >> "$GITHUB_OUTPUT"
+        env:
+          VERSION: ${{ needs.validate.outputs.version }}
+
+      - name: Upload bundled ZIP to GitHub Release
+        run: gh release upload "$TAG" "$ARCHIVE" --clobber --repo "$GITHUB_REPOSITORY"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          TAG: ${{ needs.validate.outputs.tag }}
+          ARCHIVE: ${{ steps.archive.outputs.path }}
+
+      - name: Resolve bundled asset URL
+        id: asset
+        run: |
+          url="$(gh release view "$TAG" --json assets --jq '.assets[] | select(.name == env.ASSET) | .url' --repo "$GITHUB_REPOSITORY")"
+          if [[ -z "$url" ]]; then
+            echo "Could not resolve GitHub Release URL for $ASSET" >&2
+            exit 1
+          fi
+          echo "url=$url" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          TAG: ${{ needs.validate.outputs.tag }}
+          ASSET: ${{ steps.archive.outputs.asset }}
+
+      - name: Generate stable plugin repository XML
+        if: needs.validate.outputs.kind == 'stable'
+        run: |
+          mkdir -p pages/jetbrains
+          python3 <<'PY'
+          import html
+          import io
+          import os
+          import zipfile
+          import xml.etree.ElementTree as ET
+
+          archive = os.environ["ARCHIVE"]
+          asset = os.environ["ASSET_URL"]
+          version = os.environ["VERSION"]
+
+          def plugin_xml(path):
+              with zipfile.ZipFile(path) as zip:
+                  for name in zip.namelist():
+                      if name.endswith("META-INF/plugin.xml"):
+                          return zip.read(name)
+                  for name in zip.namelist():
+                      if not name.endswith(".jar"):
+                          continue
+                      with zipfile.ZipFile(io.BytesIO(zip.read(name))) as jar:
+                          for item in jar.namelist():
+                              if item.endswith("META-INF/plugin.xml"):
+                                  return jar.read(item)
+              raise SystemExit("bundled plugin ZIP did not contain META-INF/plugin.xml")
+
+          root = ET.fromstring(plugin_xml(archive))
+
+          def text(name, default=""):
+              item = root.find(name)
+              return item.text.strip() if item is not None and item.text else default
+
+          def cdata(value):
+              return "<![CDATA[" + value.replace("]]>", "]]]]><![CDATA[>") + "]]>"
+
+          plugin = text("id", "ai.kilocode.jetbrains")
+          name = text("name", "Kilo Code")
+          vendor = text("vendor", "Kilo Code")
+          desc = text("description")
+          notes = text("change-notes")
+          idea = root.find("idea-version")
+          attrs = ""
+          if idea is not None:
+              since = idea.attrib.get("since-build")
+              until = idea.attrib.get("until-build")
+              if since:
+                  attrs += f' since-build="{html.escape(since)}"'
+              if until:
+                  attrs += f' until-build="{html.escape(until)}"'
+
+          xml = [
+              '<?xml version="1.0" encoding="UTF-8"?>',
+              '<plugins>',
+              f'  <plugin id="{html.escape(plugin)}" version="{html.escape(version)}" url="{html.escape(asset)}">',
+              f'    <name>{html.escape(name)}</name>',
+              f'    <vendor>{html.escape(vendor)}</vendor>',
+              f'    <idea-version{attrs}/>',
+          ]
+          if desc:
+              xml.append(f'    <description>{cdata(desc)}</description>')
+          if notes:
+              xml.append(f'    <change-notes>{cdata(notes)}</change-notes>')
+          xml.extend(['  </plugin>', '</plugins>', ''])
+          with open("pages/jetbrains/updatePlugins.xml", "w", encoding="utf-8") as file:
+              file.write("\n".join(xml))
+          PY
+        env:
+          ARCHIVE: ${{ steps.archive.outputs.path }}
+          ASSET_URL: ${{ steps.asset.outputs.url }}
+          VERSION: ${{ needs.validate.outputs.version }}
+
+      - name: Upload stable Pages source
+        if: needs.validate.outputs.kind == 'stable'
+        uses: actions/upload-artifact@v4
+        with:
+          name: jetbrains-pages-${{ needs.validate.outputs.version }}
+          path: pages
+          if-no-files-found: error
+
+      - name: Upload workflow artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: kilo-jetbrains-bundled-${{ needs.validate.outputs.version }}
+          path: |
+            packages/kilo-jetbrains/build/release/*.zip
+            pages/jetbrains/updatePlugins.xml
+          if-no-files-found: ignore
+
+  pages:
+    needs: bundle
+    if: needs.bundle.outputs.kind == 'stable'
+    runs-on: blacksmith-4vcpu-ubuntu-2404
+    permissions:
+      actions: read
+      id-token: write
+      pages: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Download stable Pages source
+        uses: actions/download-artifact@v4
+        with:
+          name: jetbrains-pages-${{ needs.bundle.outputs.version }}
+          path: pages
+
+      - name: Configure Pages
+        uses: actions/configure-pages@v5
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v4
+        with:
+          path: pages
+
+      - name: Deploy Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/publish-jetbrains.yml b/.github/workflows/publish-jetbrains.yml
index ba43fb4124a..cb976193acc 100644
--- a/.github/workflows/publish-jetbrains.yml
+++ b/.github/workflows/publish-jetbrains.yml
@@ -23,6 +23,7 @@ concurrency:
   cancel-in-progress: false
 
 permissions:
+  actions: write
   contents: write
   pull-requests: read
 
@@ -199,6 +200,19 @@ jobs:
           ARCHIVE: ${{ steps.archive.outputs.path }}
           NOTES: packages/kilo-jetbrains/build/release-notes.md
 
+      - name: Dispatch bundled GitHub release build
+        continue-on-error: true
+        run: |
+          gh workflow run publish-jetbrains-bundled.yml \
+            --repo "$GITHUB_REPOSITORY" \
+            --ref main \
+            -f pr="$PR_NUMBER" \
+            -f merge_commit="$MERGE_COMMIT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr }}
+          MERGE_COMMIT: ${{ github.event.pull_request.merge_commit_sha || inputs.merge_commit }}
+
       - name: Upload workflow artifact
         if: always()
         uses: actions/upload-artifact@v4
diff --git a/.opencode-version b/.opencode-version
index f0257c2afb2..6d4057fbe47 100644
--- a/.opencode-version
+++ b/.opencode-version
@@ -1 +1 @@
-v1.17.5
+v1.17.9
diff --git a/CONTEXT.md b/CONTEXT.md
index bb0e319018f..c937cbaabec 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -52,6 +52,9 @@ _Avoid_: Request body, wire options
 **Generation Controls**:
 Provider-neutral sampling and output controls, partitioned from provider semantics and compatibility wire fields when model metadata enters the Catalog.
 
+**PTY Environment**:
+The host-supplied environment overlay applied by the server when creating a PTY, observed for the request Location and resolved PTY working directory.
+
 ## Relationships
 
 - A **System Context** is an opaque carrier composed from zero or more **Context Sources**.
@@ -99,6 +102,8 @@ Provider-neutral sampling and output controls, partitioned from provider semanti
 - A model/provider switch always starts a new **Context Epoch** while preserving chronological conversation history.
 - **Model Request Options** remain provider-semantic through Catalog resolution. The Session runner maps them into the LLM package's provider-option namespace; the selected protocol adapter alone owns provider wire encoding.
 - **Generation Controls**, protocol-semantic **Model Request Options**, and compatibility request body fields are separate Catalog domains. A shared ingestion adapter partitions legacy and models.dev AI-SDK-shaped options before routing.
+- The **PTY Environment** is a server concern rather than a Core PTY concern. PTY creation merges caller values, then the host overlay, then Core-forced terminal invariants such as `TERM` and `KILO_TERMINAL`.
+- A **PTY Environment** adapter observes plugins in the request Location while passing the resolved PTY working directory to the hook; standalone servers use an empty adapter.
 - A **Mid-Conversation System Message** lowers to the provider's native chronological instruction role when supported and to a wrapped chronological fallback otherwise.
 - When the effective aggregate instruction set changes, its **Mid-Conversation System Message** includes the complete current ordered set and supersedes the prior aggregate value; when no ambient instructions remain, the message states that previously loaded instructions no longer apply.
 - Ambient project instruction discovery honors `KILO_DISABLE_PROJECT_CONFIG`; global instructions remain eligible.
diff --git a/bun.lock b/bun.lock
index bd25540b5f3..fd599605c4d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -798,6 +798,7 @@
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
         "@pierre/diffs": "catalog:",
+        "@shikijs/stream": "catalog:",
         "@shikijs/transformers": "3.9.2",
         "@solid-primitives/bounds": "0.1.3",
         "@solid-primitives/event-listener": "2.4.5",
@@ -844,22 +845,22 @@
     },
   },
   "trustedDependencies": [
-    "esbuild",
-    "protobufjs",
     "web-tree-sitter",
+    "esbuild",
     "tree-sitter-bash",
+    "protobufjs",
   ],
   "patchedDependencies": {
-    "mammoth@1.12.0": "patches/mammoth@1.12.0.patch",
     "virtua@0.49.1": "patches/virtua@0.49.1.patch",
-    "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.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",
-    "@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",
+    "@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",
   },
   "overrides": {
     "@effect/platform-node-shared": "4.0.0-beta.74",
@@ -898,13 +899,15 @@
     "@opentui/core": "0.3.4",
     "@opentui/keymap": "0.3.4",
     "@opentui/solid": "0.3.4",
-    "@pierre/diffs": "1.1.22",
+    "@pierre/diffs": "1.2.10",
     "@playwright/test": "1.59.1",
+    "@shikijs/stream": "4.2.0",
     "@solid-primitives/storage": "4.3.3",
     "@solidjs/meta": "0.29.4",
     "@solidjs/router": "0.15.4",
     "@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
     "@tailwindcss/vite": "4.1.11",
+    "@tanstack/solid-virtual": "3.13.28",
     "@tsconfig/bun": "1.0.9",
     "@tsconfig/node22": "22.0.2",
     "@types/bun": "1.3.14",
@@ -931,7 +934,7 @@
     "remeda": "2.26.0",
     "remend": "1.3.0",
     "semver": "7.7.4",
-    "shiki": "3.20.0",
+    "shiki": "4.2.0",
     "solid-js": "1.9.12",
     "solid-list": "0.3.0",
     "sst": "4.13.1",
@@ -1956,9 +1959,11 @@
 
     "@parcel/watcher-win32-x64": ["@parcel/watcher-win32-x64@2.5.1", "", { "os": "win32", "cpu": "x64" }, "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA=="],
 
-    "@pierre/diffs": ["@pierre/diffs@1.1.22", "", { "dependencies": { "@pierre/theme": "0.0.28", "@shikijs/transformers": "^3.0.0", "diff": "8.0.3", "hast-util-to-html": "9.0.5", "lru_map": "0.4.1", "shiki": "^3.0.0" }, "peerDependencies": { "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0" } }, "sha512-1Iv7kdl6OABFCd1n2HQbGUiRHouXPaHoIjcb7Lwg8zeJKY5ph+cESFcGEyIiwW0NCbKGtYS2bTnXmI+Eze5dwg=="],
+    "@pierre/diffs": ["@pierre/diffs@1.2.10", "", { "dependencies": { "@pierre/theme": "1.0.3", "@pierre/theming": "0.0.1", "@shikijs/transformers": "^3.0.0 || ^4.0.0", "diff": "8.0.3", "hast-util-to-html": "9.0.5", "lru_map": "0.4.1", "shiki": "^3.0.0 || ^4.0.0" }, "peerDependencies": { "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0" } }, "sha512-rPeAmDWarxFVTQpaf4y6wTxjZxU44xKJKoJti2zU21P06DVd9nRHZX+xSIObLB307Qjpaesyb1x/j0z94t7vLw=="],
 
-    "@pierre/theme": ["@pierre/theme@0.0.28", "", {}, "sha512-1j/H/fECBuc9dEvntdWI+l435HZapw+RCJTlqCA6BboQ5TjlnE005j/ROWutXIs8aq5OAc82JI2Kwk4A1WWBgw=="],
+    "@pierre/theme": ["@pierre/theme@1.0.3", "", {}, "sha512-sWHv11TMoqKxKDgTIk5VbhQjdPhs8DCcBxbjh3mRlS3YOM/OcrWoGX6MM8eBGn9cUu3M46Py0JnxsG2nJaFTuA=="],
+
+    "@pierre/theming": ["@pierre/theming@0.0.1", "", { "peerDependencies": { "@pierre/theme": "^1.0.0", "@shikijs/themes": "^3.0.0 || ^4.0.0", "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0", "shiki": "^3.0.0 || ^4.0.0" }, "optionalPeers": ["@pierre/theme", "@shikijs/themes", "react", "react-dom", "shiki"] }, "sha512-1thlEtJbqdyLzc1ZS2KQa1q7FzDGHT4dTEdKHoyQjOMeWWOmbVG5/ndEfOKfAb5Fzkz8cNJrOjFLiZoDH/A03A=="],
 
     "@pinojs/redact": ["@pinojs/redact@0.4.0", "", {}, "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg=="],
 
@@ -2076,15 +2081,19 @@
 
     "@secretlint/types": ["@secretlint/types@10.2.2", "", {}, "sha512-Nqc90v4lWCXyakD6xNyNACBJNJ0tNCwj2WNk/7ivyacYHxiITVgmLUFXTBOeCdy79iz6HtN9Y31uw/jbLrdOAg=="],
 
-    "@shikijs/core": ["@shikijs/core@3.9.2", "", { "dependencies": { "@shikijs/types": "3.9.2", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-3q/mzmw09B2B6PgFNeiaN8pkNOixWS726IHmJEpjDAcneDPMQmUg2cweT9cWXY4XcyQS3i6mOOUgQz9RRUP6HA=="],
+    "@shikijs/core": ["@shikijs/core@4.2.0", "", { "dependencies": { "@shikijs/primitive": "4.2.0", "@shikijs/types": "4.2.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-Hc87Ab1Ld/vEbZRCbwx344I5v+4RU8CVToUTRkqXL1+TjbuOp9U5Xa0M23V4GEWHxVn+yO5otb+HkQVm3ptWQQ=="],
 
-    "@shikijs/engine-javascript": ["@shikijs/engine-javascript@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0", "@shikijs/vscode-textmate": "^10.0.2", "oniguruma-to-es": "^4.3.4" } }, "sha512-OFx8fHAZuk7I42Z9YAdZ95To6jDePQ9Rnfbw9uSRTSbBhYBp1kEOKv/3jOimcj3VRUKusDYM6DswLauwfhboLg=="],
+    "@shikijs/engine-javascript": ["@shikijs/engine-javascript@4.2.0", "", { "dependencies": { "@shikijs/types": "4.2.0", "@shikijs/vscode-textmate": "^10.0.2", "oniguruma-to-es": "^4.3.6" } }, "sha512-fjETeq1k5ffyXqRgS6+3hpvqseLalp1kjNfRbXpUgWR8FpZ1CmQfiNHovc5lncYjt/Vg5JK/WJEmLahjwMa0og=="],
 
-    "@shikijs/engine-oniguruma": ["@shikijs/engine-oniguruma@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0", "@shikijs/vscode-textmate": "^10.0.2" } }, "sha512-Yx3gy7xLzM0ZOjqoxciHjA7dAt5tyzJE3L4uQoM83agahy+PlW244XJSrmJRSBvGYELDhYXPacD4R/cauV5bzQ=="],
+    "@shikijs/engine-oniguruma": ["@shikijs/engine-oniguruma@4.2.0", "", { "dependencies": { "@shikijs/types": "4.2.0", "@shikijs/vscode-textmate": "^10.0.2" } }, "sha512-hTorK1dffPkpbMUk6Z+828PgRo7d07HbnizoP0hNPFjhxMHctj0Px/qoHeGMYafc6ju+u9iMldN4JbVzNQM++g=="],
 
-    "@shikijs/langs": ["@shikijs/langs@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0" } }, "sha512-le+bssCxcSHrygCWuOrYJHvjus6zhQ2K7q/0mgjiffRbkhM4o1EWu2m+29l0yEsHDbWaWPNnDUTRVVBvBBeKaA=="],
+    "@shikijs/langs": ["@shikijs/langs@4.2.0", "", { "dependencies": { "@shikijs/types": "4.2.0" } }, "sha512-bwrVRlJ0wUhZxAbVdvBbv2TTC9yLsh4C/IO5Ofz0T8MQntgDvyVnkbjw9vi50r1kx7RCIJdnJnjZAwmAsXFLZQ=="],
 
-    "@shikijs/themes": ["@shikijs/themes@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0" } }, "sha512-U1NSU7Sl26Q7ErRvJUouArxfM2euWqq1xaSrbqMu2iqa+tSp0D1Yah8216sDYbdDHw4C8b75UpE65eWorm2erQ=="],
+    "@shikijs/primitive": ["@shikijs/primitive@4.2.0", "", { "dependencies": { "@shikijs/types": "4.2.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-NOq+DtUkVBJtZMVXL5A0vI0Xk8nvDYaXetFHSJFlOqjDZIVhIPRYFdGkSoElDqNuegikcc3A76SNUa8dTqtAYA=="],
+
+    "@shikijs/stream": ["@shikijs/stream@4.2.0", "", { "dependencies": { "@shikijs/core": "4.2.0" }, "peerDependencies": { "react": "^19.0.0", "solid-js": "^1.9.0", "vue": "^3.2.0" }, "optionalPeers": ["react", "solid-js", "vue"] }, "sha512-OaMUUStdIZ+l1GJad9uVACR3Xvgwo4y+RmEuDMU62cgFMMg1IBCaIFmvzAR2HiCpGtwoc/qPfpNnP+ivgrPXZg=="],
+
+    "@shikijs/themes": ["@shikijs/themes@4.2.0", "", { "dependencies": { "@shikijs/types": "4.2.0" } }, "sha512-RX8IHYeLv8Cu2W6ruc3RxUqWn0IYCqSrMBzi/uRGAmfyDNOnNO5BF/Px7o97n4XTpmFTo5GbRaazuOWj+2ak2w=="],
 
     "@shikijs/transformers": ["@shikijs/transformers@3.9.2", "", { "dependencies": { "@shikijs/core": "3.9.2", "@shikijs/types": "3.9.2" } }, "sha512-MW5hT4TyUp6bNAgTExRYLk1NNasVQMTCw1kgbxHcEC0O5cbepPWaB+1k+JzW9r3SP2/R8kiens8/3E6hGKfgsA=="],
 
@@ -4306,7 +4315,7 @@
 
     "shell-quote": ["shell-quote@1.8.4", "", {}, "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ=="],
 
-    "shiki": ["shiki@3.20.0", "", { "dependencies": { "@shikijs/core": "3.20.0", "@shikijs/engine-javascript": "3.20.0", "@shikijs/engine-oniguruma": "3.20.0", "@shikijs/langs": "3.20.0", "@shikijs/themes": "3.20.0", "@shikijs/types": "3.20.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-kgCOlsnyWb+p0WU+01RjkCH+eBVsjL1jOwUYWv0YDWkM2/A46+LDKVs5yZCUXjJG6bj4ndFoAg5iLIIue6dulg=="],
+    "shiki": ["shiki@4.2.0", "", { "dependencies": { "@shikijs/core": "4.2.0", "@shikijs/engine-javascript": "4.2.0", "@shikijs/engine-oniguruma": "4.2.0", "@shikijs/langs": "4.2.0", "@shikijs/themes": "4.2.0", "@shikijs/types": "4.2.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-hjNax6o/ylDy9lefQEaSDtzaT3iVNtZ3WmpQnbuQNoG4xvnSKf2kSKbihZVO4JRG1TTMejs7CmNRYlWgAL66pQ=="],
 
     "side-channel": ["side-channel@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4", "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ=="],
 
@@ -5160,13 +5169,19 @@
 
     "@qdrant/js-client-rest/undici": ["undici@6.26.0", "", {}, "sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A=="],
 
-    "@shikijs/engine-javascript/@shikijs/types": ["@shikijs/types@3.20.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw=="],
+    "@shikijs/core/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
 
-    "@shikijs/engine-oniguruma/@shikijs/types": ["@shikijs/types@3.20.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw=="],
+    "@shikijs/engine-javascript/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
 
-    "@shikijs/langs/@shikijs/types": ["@shikijs/types@3.20.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw=="],
+    "@shikijs/engine-oniguruma/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
 
-    "@shikijs/themes/@shikijs/types": ["@shikijs/types@3.20.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw=="],
+    "@shikijs/langs/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
+
+    "@shikijs/primitive/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
+
+    "@shikijs/themes/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
+
+    "@shikijs/transformers/@shikijs/core": ["@shikijs/core@3.9.2", "", { "dependencies": { "@shikijs/types": "3.9.2", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-3q/mzmw09B2B6PgFNeiaN8pkNOixWS726IHmJEpjDAcneDPMQmUg2cweT9cWXY4XcyQS3i6mOOUgQz9RRUP6HA=="],
 
     "@smithy/config-resolver/@smithy/core": ["@smithy/core@3.24.6", "", { "dependencies": { "@aws-crypto/crc32": "5.2.0", "@smithy/types": "^4.14.3", "tslib": "^2.6.2" } }, "sha512-wBXDRup6UU97VKyaiRo8AssnfStPtG0oAAfpq/bC0a1YYau8pM86YB4kM6ccoVi1mS8l/UHbn9oDM+7uozr/ug=="],
 
@@ -5594,9 +5609,7 @@
 
     "sharp/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
 
-    "shiki/@shikijs/core": ["@shikijs/core@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-f2ED7HYV4JEk827mtMDwe/yQ25pRiXZmtHjWF8uzZKuKiEsJR7Ce1nuQ+HhV9FzDcbIo4ObBCD9GPTzNuy9S1g=="],
-
-    "shiki/@shikijs/types": ["@shikijs/types@3.20.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw=="],
+    "shiki/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
 
     "slice-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="],
 
diff --git a/bunfig.toml b/bunfig.toml
index f36a00828ca..61bb6e0fdb3 100644
--- a/bunfig.toml
+++ b/bunfig.toml
@@ -2,7 +2,7 @@
 exact = true
 # Keep Kilo's longer supply-chain quarantine while allowing packages that must track coordinated releases.
 minimumReleaseAge = 410520 # seconds (~4.75 days / ~114 hours)
-minimumReleaseAgeExcludes = ["mermaid", "@mermaid-js/parser", "@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish"]
+minimumReleaseAgeExcludes = ["mermaid", "@mermaid-js/parser", "@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish"]
 
 [test]
 root = "./do-not-run-tests-from-root"
diff --git a/flake.nix b/flake.nix
index 7383da725db..280d60035c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,59 +21,7 @@
       devShells = forEachSystem (pkgs: {
         default =
           let
-            # Pin bun to the version declared in package.json (packageManager: "bun@1.3.14").
-            # The locked nixpkgs revision ships 1.3.11, so we fetch the official release directly.
-            bun =
-              let
-                sources = {
-                  "aarch64-linux" = {
-                    name = "bun-linux-aarch64";
-                    hash = "sha256-on/7Y6gxA3WDbg1vZorhf6jY0YuIw3yCHGUzGXOhmjs=";
-                  };
-                  "x86_64-linux" = {
-                    name = "bun-linux-x64";
-                    hash = "sha256-lR7iruhV8IWVruxiJSJqKY0/6oOj3NZGXAnLzN9+hI8=";
-                  };
-                  "aarch64-darwin" = {
-                    name = "bun-darwin-aarch64";
-                    hash = "sha256-2LliIYKK1vl6x6wKt+lYcjQa92MAHogD6CZ2UsJlJiA=";
-                  };
-                  "x86_64-darwin" = {
-                    name = "bun-darwin-x64";
-                    hash = "sha256-QYPfM3RiPlurMVxUfPoJdFM81FfYa3O2OfeoeXTNZjM=";
-                  };
-                };
-                source =
-                  sources.${pkgs.stdenv.hostPlatform.system}
-                    or (throw "Unsupported system for bun: ${pkgs.stdenv.hostPlatform.system}");
-              in
-              pkgs.stdenv.mkDerivation rec {
-                pname = "bun";
-                version = "1.3.14";
-                src = pkgs.fetchurl {
-                  url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/${source.name}.zip";
-                  inherit (source) hash;
-                };
-                nativeBuildInputs = [
-                  pkgs.unzip
-                ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.autoPatchelfHook;
-                buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.stdenv.cc.cc.lib ];
-                dontConfigure = true;
-                dontBuild = true;
-                installPhase = ''
-                  runHook preInstall
-                  install -Dm755 bun $out/bin/bun
-                  ln -s $out/bin/bun $out/bin/bunx
-                  runHook postInstall
-                '';
-                meta = {
-                  description = "Fast all-in-one JavaScript runtime";
-                  homepage = "https://bun.sh";
-                  license = pkgs.lib.licenses.mit;
-                  mainProgram = "bun";
-                  platforms = builtins.attrNames sources;
-                };
-              };
+            bun = pkgs.callPackage ./nix/bun.nix { };
 
             kilo-dev = pkgs.writeShellScriptBin "kilo-dev" ''
               set -euo pipefail
@@ -279,11 +227,12 @@
       packages = forEachSystem (
         pkgs:
         let
+          bun = pkgs.callPackage ./nix/bun.nix { };
           node_modules = pkgs.callPackage ./nix/node_modules.nix {
-            inherit rev;
+            inherit bun rev;
           };
           kilo = pkgs.callPackage ./nix/kilo.nix {
-            inherit node_modules;
+            inherit bun node_modules;
           };
         in
         {
diff --git a/nix/bun.nix b/nix/bun.nix
new file mode 100644
index 00000000000..a8808953494
--- /dev/null
+++ b/nix/bun.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+  autoPatchelfHook,
+}:
+let
+  package = lib.pipe ../package.json [
+    builtins.readFile
+    builtins.fromJSON
+  ];
+  version = lib.removePrefix "bun@" package.packageManager;
+  sources = {
+    "aarch64-linux" = {
+      name = "bun-linux-aarch64";
+      hash = "sha256-on/7Y6gxA3WDbg1vZorhf6jY0YuIw3yCHGUzGXOhmjs=";
+    };
+    "x86_64-linux" = {
+      name = "bun-linux-x64";
+      hash = "sha256-lR7iruhV8IWVruxiJSJqKY0/6oOj3NZGXAnLzN9+hI8=";
+    };
+    "aarch64-darwin" = {
+      name = "bun-darwin-aarch64";
+      hash = "sha256-2LliIYKK1vl6x6wKt+lYcjQa92MAHogD6CZ2UsJlJiA=";
+    };
+    "x86_64-darwin" = {
+      name = "bun-darwin-x64";
+      hash = "sha256-QYPfM3RiPlurMVxUfPoJdFM81FfYa3O2OfeoeXTNZjM=";
+    };
+  };
+  source =
+    sources.${stdenv.hostPlatform.system}
+      or (throw "Unsupported system for bun: ${stdenv.hostPlatform.system}");
+in
+stdenv.mkDerivation {
+  pname = "bun";
+  inherit version;
+  src = fetchurl {
+    url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/${source.name}.zip";
+    inherit (source) hash;
+  };
+  nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
+  buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ];
+  dontConfigure = true;
+  dontBuild = true;
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bun $out/bin/bun
+    ln -s $out/bin/bun $out/bin/bunx
+    runHook postInstall
+  '';
+  meta = {
+    description = "Fast all-in-one JavaScript runtime";
+    homepage = "https://bun.sh";
+    license = lib.licenses.mit;
+    mainProgram = "bun";
+    platforms = builtins.attrNames sources;
+  };
+}
diff --git a/nix/hashes.json b/nix/hashes.json
index c10bd672c36..8f0a833b461 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-UHxMHmx17Jex0yXgbpXCvIORubs9cFMsIXGacvs9+gA=",
-    "aarch64-linux": "sha256-tTnW84VaNEbfo46H24ETKZgFumZMwu6pgNDlY8KYkqo=",
-    "aarch64-darwin": "sha256-tBi4D1tfACA4ogYMdyjUK8sDb370rAGE2q8baeJjpdA=",
-    "x86_64-darwin": "sha256-MPIai9M+EQps81qp7RBmTsW/qPjcrWd7GGJQyeNCz/U="
+    "x86_64-linux": "sha256-Y64ujq2R4SiyOavsXmaYsQkVNfdjhkzmPolOEV1RVyc=",
+    "aarch64-linux": "sha256-7S209ir2j9o9NXYmMUnEfo6m64cUIkexd8L95UeCMFE=",
+    "aarch64-darwin": "sha256-bE1zw7EK+4rgUgw80t8hdc2yojAF2f8ihjorh6B7jJE=",
+    "x86_64-darwin": "sha256-xukM9cEvZAKCXewun9xReGBKz09i63LACLN/eH54020="
   }
 }
diff --git a/package.json b/package.json
index 543649f5030..2cbfccad00a 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
       "@tsconfig/bun": "1.0.9",
       "@cloudflare/workers-types": "4.20251008.0",
       "@openauthjs/openauth": "0.0.0-20250322224806",
-      "@pierre/diffs": "1.1.22",
+      "@pierre/diffs": "1.2.10",
       "opentui-spinner": "0.0.7",
       "@solid-primitives/storage": "4.3.3",
       "@tailwindcss/vite": "4.1.11",
@@ -70,7 +70,7 @@
       "@typescript/native-preview": "7.0.0-dev.20260316.1",
       "zod": "4.1.8",
       "remeda": "2.26.0",
-      "shiki": "3.20.0",
+      "shiki": "4.2.0",
       "solid-list": "0.3.0",
       "tailwindcss": "4.1.11",
       "virtua": "0.49.1",
@@ -85,7 +85,9 @@
       "@effect/sql-sqlite-bun": "4.0.0-beta.74",
       "@hono/standard-validator": "0.2.0",
       "@hono/zod-validator": "0.4.2",
-      "sst": "4.13.1"
+      "sst": "4.13.1",
+      "@tanstack/solid-virtual": "3.13.28",
+      "@shikijs/stream": "4.2.0"
     }
   },
   "devDependencies": {
@@ -157,11 +159,15 @@
     "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
-    "virtua@0.49.1": "patches/virtua@0.49.1.patch",
+    "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
+    "@tanstack/solid-virtual@3.13.28": "patches/@tanstack%2Fsolid-virtual@3.13.28.patch",
+    "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.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",
+    "@tanstack/virtual-core@3.17.0": "patches/@tanstack%2Fvirtual-core@3.17.0.patch",
     "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
+    "virtua@0.49.1": "patches/virtua@0.49.1.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",
     "mammoth@1.12.0": "patches/mammoth@1.12.0.patch"
   },
diff --git a/packages/core/package.json b/packages/core/package.json
index d5f73a3983a..ddb4d33d35e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -10,8 +10,8 @@
     "migration": "bun run script/migration.ts",
     "fix-node-pty": "bun run script/fix-node-pty.ts",
     "test": "bun test --only-failures",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "tsgo --noEmit",
+    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml"
   },
   "bin": {
     "opencode": "./bin/opencode"
diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts
index 82ab2b82136..4156db5c361 100644
--- a/packages/core/src/catalog.ts
+++ b/packages/core/src/catalog.ts
@@ -10,8 +10,7 @@ import { Location } from "./location"
 import { EventV2 } from "./event"
 import { Policy } from "./policy"
 import { State } from "./state"
-import { Credential } from "./credential"
-import { IntegrationSchema } from "./integration/schema"
+import { Integration } from "./integration"
 
 export type ProviderRecord = {
   provider: ProviderV2.Info
@@ -35,12 +34,7 @@ export class ModelNotFoundError extends Schema.TaggedErrorClass<ModelNotFoundErr
 export const PolicyActions = Schema.Literals(["provider.use"])
 
 export const Event = {
-  ModelUpdated: EventV2.define({
-    type: "catalog.model.updated",
-    schema: {
-      model: ModelV2.Info,
-    },
-  }),
+  Updated: EventV2.define({ type: "catalog.updated", schema: {} }),
 }
 
 type Data = {
@@ -96,31 +90,17 @@ export const layer = Layer.effect(
     const plugin = yield* PluginV2.Service
     const events = yield* EventV2.Service
     const policy = yield* Policy.Service
-    const credentials = yield* Credential.Service
+    const integrations = yield* Integration.Service
     const scope = yield* Scope.Scope
 
-    const project = (provider: ProviderV2.Info, active: Map<IntegrationSchema.ID, Credential.Stored>) => {
-      const credential = active.get(IntegrationSchema.ID.make(provider.id))
-      if (!credential) return provider
-      const body = { ...provider.request.body }
-      if (credential.value.type === "key") {
-        body.apiKey = credential.value.key
-        Object.assign(body, credential.value.metadata ?? {})
-      }
-      // kilocode_change start - preserve Kilo organization routing from migrated OAuth credentials
-      if (credential.value.type === "oauth") {
-        body.apiKey = credential.value.access
-        if (credential.value.metadata?.accountID) body.kilocodeOrganizationId = credential.value.metadata.accountID
-      }
-      // kilocode_change end
-      return new ProviderV2.Info({
-        ...provider,
-        enabled: { via: "credential", credentialID: credential.id },
-        request: { ...provider.request, body },
-      })
+    const available = (provider: ProviderV2.Info, integration: Integration.Info | undefined, connected: boolean) => {
+      if (provider.disabled) return false
+      if (typeof provider.request.body.apiKey === "string") return true
+      if (connected) return true
+      return !integration
     }
 
-    const resolve = (model: ModelV2.Info, provider: ProviderV2.Info) => {
+    const projectModel = (model: ModelV2.Info, provider: ProviderV2.Info) => {
       const api =
         model.api.type === "native" && !model.api.url && Object.keys(model.api.settings).length === 0
           ? { ...provider.api, id: model.api.id }
@@ -208,18 +188,16 @@ export const layer = Layer.effect(
       },
       finalize: Effect.fn("CatalogV2.finalize")(function* (catalog, reason) {
         if (reason !== "plugin.added") yield* plugin.trigger("catalog.transform", catalog, {}).pipe(Effect.asVoid)
-        if (!policy.hasStatements()) return
-        for (const record of [...catalog.provider.list()]) {
-          if ((yield* policy.evaluate("provider.use", record.provider.id, "allow")) === "deny") {
-            catalog.provider.remove(record.provider.id)
+        if (policy.hasStatements()) {
+          for (const record of [...catalog.provider.list()]) {
+            if ((yield* policy.evaluate("provider.use", record.provider.id, "allow")) === "deny") {
+              catalog.provider.remove(record.provider.id)
+            }
           }
         }
+        yield* events.publish(Event.Updated, {})
       }),
     })
-    const active = Effect.fn("CatalogV2.active")(function* () {
-      return new Map((yield* credentials.all()).map((credential) => [credential.integrationID, credential]))
-    })
-
     yield* events.subscribe(PluginV2.Event.Added).pipe(
       // Plugin registries are location scoped even though the event bus is process scoped.
       Stream.filter(
@@ -238,18 +216,23 @@ export const layer = Layer.effect(
       provider: {
         get: Effect.fn("CatalogV2.provider.get")(function* (providerID) {
           const record = yield* getRecord(providerID)
-          return project(record.provider, yield* active())
+          return record.provider
         }),
 
         all: Effect.fn("CatalogV2.provider.all")(function* () {
-          const credentials = yield* active()
-          return Array.fromIterable(state.get().providers.values()).map((record) =>
-            project(record.provider, credentials),
-          )
+          return Array.fromIterable(state.get().providers.values()).map((record) => record.provider)
         }),
 
         available: Effect.fn("CatalogV2.provider.available")(function* () {
-          return (yield* result.provider.all()).filter((provider) => provider.enabled)
+          const active = new Map((yield* integrations.list()).map((integration) => [integration.id, integration]))
+          const connections = yield* integrations.connection.list()
+          return (yield* result.provider.all()).filter((provider) =>
+            available(
+              provider,
+              active.get(Integration.ID.make(provider.id)),
+              connections.has(Integration.ID.make(provider.id)),
+            ),
+          )
         }),
       },
 
@@ -258,33 +241,32 @@ export const layer = Layer.effect(
           const record = yield* getRecord(providerID)
           const model = record.models.get(modelID)
           if (!model) return yield* new ModelNotFoundError({ providerID, modelID })
-          return resolve(model, project(record.provider, yield* active()))
+          return projectModel(model, record.provider)
         }),
 
         all: Effect.fn("CatalogV2.model.all")(function* () {
-          const credentials = yield* active()
           return pipe(
             Array.fromIterable(state.get().providers.values()),
             Array.flatMap((record) => {
-              const provider = project(record.provider, credentials)
-              return Array.fromIterable(record.models.values()).map((model) => resolve(model, provider))
+              return Array.fromIterable(record.models.values()).map((model) => projectModel(model, record.provider))
             }),
             Array.sortWith((item) => item.time.released.epochMilliseconds, Order.flip(Order.Number)),
           )
         }),
 
         available: Effect.fn("CatalogV2.model.available")(function* () {
-          const providers = new Map((yield* result.provider.all()).map((provider) => [provider.id, provider]))
-          return (yield* result.model.all()).filter(
-            (model) => providers.get(model.providerID)?.enabled !== false && model.enabled,
-          )
+          const providers = new Set((yield* result.provider.available()).map((provider) => provider.id))
+          return (yield* result.model.all()).filter((model) => providers.has(model.providerID) && model.enabled)
         }),
 
         default: Effect.fn("CatalogV2.model.default")(function* () {
           const defaultModel = state.get().defaultModel
           if (defaultModel) {
             const provider = yield* result.provider.get(defaultModel.providerID).pipe(Effect.option)
-            if (Option.isSome(provider) && provider.value.enabled !== false) {
+            if (
+              Option.isSome(provider) &&
+              (yield* result.provider.available()).some((item) => item.id === provider.value.id)
+            ) {
               const model = yield* result.model.get(defaultModel.providerID, defaultModel.modelID).pipe(Effect.option)
               if (Option.isSome(model) && model.value.enabled) return model
             }
@@ -300,11 +282,11 @@ export const layer = Layer.effect(
         small: Effect.fn("CatalogV2.model.small")(function* (providerID) {
           const record = state.get().providers.get(providerID)
           if (!record) return Option.none<ModelV2.Info>()
-          const provider = project(record.provider, yield* active())
+          const provider = record.provider
 
           if (providerID === ProviderV2.ID.opencode) {
             const gpt5Nano = record.models.get(ModelV2.ID.make("gpt-5-nano"))
-            if (gpt5Nano?.enabled && gpt5Nano.status === "active") return Option.some(resolve(gpt5Nano, provider))
+            if (gpt5Nano?.enabled && gpt5Nano.status === "active") return Option.some(projectModel(gpt5Nano, provider))
           }
 
           const candidates = pipe(
@@ -332,7 +314,7 @@ export const layer = Layer.effect(
             return pipe(
               items,
               Array.sortWith((item) => (item.cost / maxCost) * 0.8 + (item.age / maxAge) * 0.2, Order.Number),
-              Array.map((item) => resolve(item.model, provider)),
+              Array.map((item) => projectModel(item.model, provider)),
               Array.head,
             )
           }
@@ -353,6 +335,7 @@ export const layer = Layer.effect(
 const SMALL_MODEL_RE = /\b(nano|flash|lite|mini|haiku|small|fast)\b/
 
 export const locationLayer = layer.pipe(
+  Layer.provideMerge(Integration.locationLayer),
   Layer.provideMerge(PluginV2.locationLayer),
   Layer.provideMerge(Policy.locationLayer),
 )
diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts
index 0d31b32d08f..47a3712e3ad 100644
--- a/packages/core/src/config/plugin/provider.ts
+++ b/packages/core/src/config/plugin/provider.ts
@@ -3,6 +3,7 @@ export * as ConfigProviderPlugin from "./provider"
 import { Effect } from "effect"
 import { Catalog } from "../../catalog"
 import { Config } from "../../config"
+import { Integration } from "../../integration"
 import { ModelV2 } from "../../model"
 import { ModelRequest } from "../../model-request"
 import { PluginV2 } from "../../plugin"
@@ -13,9 +14,33 @@ export const Plugin = PluginV2.define({
   effect: Effect.gen(function* () {
     const catalog = yield* Catalog.Service
     const config = yield* Config.Service
+    const integrations = yield* Integration.Service
     const transform = yield* catalog.transform()
+    const integrationTransform = yield* integrations.transform()
     const entries = yield* config.entries()
     const files = entries.filter((entry): entry is Config.Document => entry.type === "document")
+    const configuredIntegrations = new Set(
+      files.flatMap((file) =>
+        Object.entries(file.info.providers ?? {}).flatMap(([id, provider]) => (provider.env === undefined ? [] : [id])),
+      ),
+    )
+    yield* integrationTransform((integrations) => {
+      for (const file of files) {
+        for (const [id, item] of Object.entries(file.info.providers ?? {})) {
+          const integrationID = Integration.ID.make(id)
+          if (!configuredIntegrations.has(id) && !integrations.get(integrationID)) continue
+          integrations.update(integrationID, (integration) => {
+            integration.name = item.name ?? integration.name
+          })
+          if (item.env !== undefined) {
+            integrations.method.update({
+              integrationID,
+              method: { type: "env", names: [...item.env] },
+            })
+          }
+        }
+      }
+    })
 
     yield* transform((catalog) => {
       const configuredDefault = Config.latest(entries, "model")
@@ -28,8 +53,6 @@ export const Plugin = PluginV2.define({
           const providerID = ProviderV2.ID.make(id)
           catalog.provider.update(providerID, (provider) => {
             if (item.name !== undefined) provider.name = item.name
-            if (item.env !== undefined) provider.env = [...item.env]
-            provider.enabled = { via: "custom", data: {} }
             if (item.api !== undefined) provider.api = { ...item.api }
             if (item.request !== undefined) {
               Object.assign(provider.request.headers, item.request.headers)
diff --git a/packages/core/src/credential.ts b/packages/core/src/credential.ts
index 11a987fac37..6dc4bae1ee8 100644
--- a/packages/core/src/credential.ts
+++ b/packages/core/src/credential.ts
@@ -102,6 +102,8 @@ export interface Interface {
   readonly all: () => Effect.Effect<Stored[]>
   /** Returns stored credentials belonging to one integration. */
   readonly list: (integrationID: IntegrationSchema.ID) => Effect.Effect<Stored[]>
+  /** Returns one stored credential by ID. */
+  readonly get: (id: ID) => Effect.Effect<Stored | undefined>
   /** Replaces any credential for an integration and returns the new record. */
   readonly create: (input: {
     readonly integrationID: IntegrationSchema.ID
@@ -350,6 +352,11 @@ export const layer = Layer.effect(
           return credential ? [credential] : []
         })
       }),
+      get: Effect.fn("Credential.get")(function* (id) {
+        if (isolated) return find(id) // kilocode_change - injected workspace credentials are process-local
+        const row = yield* db.select().from(CredentialTable).where(eq(CredentialTable.id, id)).get().pipe(Effect.orDie)
+        return row ? stored(row) : undefined
+      }),
       create: Effect.fn("Credential.create")(function* (input) {
         const credential = new Stored({
           id: ID.create(),
diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts
index 64053ee44ca..7e007aa8349 100644
--- a/packages/core/src/integration.ts
+++ b/packages/core/src/integration.ts
@@ -29,15 +29,16 @@ export const When = Schema.Struct({
 }).annotate({ identifier: "Integration.When" })
 export type When = typeof When.Type
 
-export class TextPrompt extends Schema.Class<TextPrompt>("Integration.TextPrompt")({
+export const TextPrompt = Schema.Struct({
   type: Schema.Literal("text"),
   key: Schema.String,
   message: Schema.String,
   placeholder: Schema.optional(Schema.String),
   when: Schema.optional(When),
-}) {}
+}).annotate({ identifier: "Integration.TextPrompt" })
+export type TextPrompt = typeof TextPrompt.Type
 
-export class SelectPrompt extends Schema.Class<SelectPrompt>("Integration.SelectPrompt")({
+export const SelectPrompt = Schema.Struct({
   type: Schema.Literal("select"),
   key: Schema.String,
   message: Schema.String,
@@ -49,27 +50,31 @@ export class SelectPrompt extends Schema.Class<SelectPrompt>("Integration.Select
     }),
   ),
   when: Schema.optional(When),
-}) {}
+}).annotate({ identifier: "Integration.SelectPrompt" })
+export type SelectPrompt = typeof SelectPrompt.Type
 
 export const Prompt = Schema.Union([TextPrompt, SelectPrompt]).pipe(Schema.toTaggedUnion("type"))
 export type Prompt = typeof Prompt.Type
 
-export class OAuthMethod extends Schema.Class<OAuthMethod>("Integration.OAuthMethod")({
+export const OAuthMethod = Schema.Struct({
   id: MethodID,
   type: Schema.Literal("oauth"),
   label: Schema.String,
   prompts: Schema.optional(Schema.Array(Prompt)),
-}) {}
+}).annotate({ identifier: "Integration.OAuthMethod" })
+export type OAuthMethod = typeof OAuthMethod.Type
 
-export class KeyMethod extends Schema.Class<KeyMethod>("Integration.KeyMethod")({
+export const KeyMethod = Schema.Struct({
   type: Schema.Literal("key"),
   label: Schema.optional(Schema.String),
-}) {}
+}).annotate({ identifier: "Integration.KeyMethod" })
+export type KeyMethod = typeof KeyMethod.Type
 
-export class EnvMethod extends Schema.Class<EnvMethod>("Integration.EnvMethod")({
+export const EnvMethod = Schema.Struct({
   type: Schema.Literal("env"),
   names: Schema.Array(Schema.String),
-}) {}
+}).annotate({ identifier: "Integration.EnvMethod" })
+export type EnvMethod = typeof EnvMethod.Type
 
 export const Method = Schema.Union([OAuthMethod, KeyMethod, EnvMethod]).pipe(Schema.toTaggedUnion("type"))
 export type Method = typeof Method.Type
@@ -197,7 +202,11 @@ export interface Interface {
   readonly get: (id: ID) => Effect.Effect<Info | undefined>
   /** Returns all integrations with their methods and current connections. */
   readonly list: () => Effect.Effect<Info[]>
-  readonly connect: {
+  readonly connection: {
+    /** Returns active connections for every registered or credential-backed integration. */
+    readonly list: () => Effect.Effect<Map<ID, IntegrationConnection.Info>>
+    /** Returns the active connection for one integration. */
+    readonly forIntegration: (id: ID) => Effect.Effect<IntegrationConnection.Info | undefined>
     /** Runs a key method and stores the resulting credential. */
     readonly key: (input: {
       /** Integration receiving the credential. */
@@ -218,6 +227,13 @@ export interface Interface {
       /** User-facing label for the credential created on completion. */
       readonly label?: string
     }) => Effect.Effect<Attempt, AuthorizationError>
+    /** Updates a stored credential exposed as a connection. */
+    readonly update: (
+      credentialID: Credential.ID,
+      updates: Partial<Pick<Credential.Stored, "label">>,
+    ) => Effect.Effect<void>
+    /** Removes a stored credential connection. */
+    readonly remove: (credentialID: Credential.ID) => Effect.Effect<void>
   }
   readonly attempt: {
     /** Returns the current state of an OAuth attempt. */
@@ -328,23 +344,32 @@ export const locationLayer = Layer.effect(
     })
 
     const connections = (entry: Entry, saved: readonly Credential.Stored[]): IntegrationConnection.Info[] => {
-      const connected = saved.map(
-        (credential) =>
-          new IntegrationConnection.CredentialInfo({ type: "credential", id: credential.id, label: credential.label }),
-      )
+      const connected = saved.map((credential) => ({
+        type: "credential" as const,
+        id: credential.id,
+        label: credential.label,
+      }))
       const detected = entry.methods
         .filter((method) => method.type === "env")
         .flatMap((method) => method.names.filter((name) => process.env[name]))
-        .map(
-          (name, index) =>
-            new IntegrationConnection.EnvInfo({
-              type: "env",
-              name,
-            }),
-        )
+        .map((name) => ({ type: "env" as const, name }))
       return [...connected, ...detected]
     }
 
+    const activeConnection = (
+      entry: Entry | undefined,
+      saved: readonly Credential.Stored[],
+    ): IntegrationConnection.Info | undefined => {
+      const credential = saved.at(-1)
+      if (credential) return { type: "credential", id: credential.id, label: credential.label }
+      if (!entry) return
+      const name = entry.methods
+        .filter((method) => method.type === "env")
+        .flatMap((method) => method.names)
+        .find((name) => process.env[name])
+      if (name) return { type: "env", name }
+    }
+
     const project = (entry: Entry, saved: readonly Credential.Stored[]) =>
       new Info({
         id: entry.ref.id,
@@ -412,6 +437,7 @@ export const locationLayer = Layer.effect(
             return [attempt, new Map(current).set(attemptID, terminal)]
           })
           if (!result) return settled
+          if (Exit.isSuccess(settled)) yield* events.publish(Event.Updated, {})
           yield* close(result.scope)
           return settled
         }),
@@ -454,8 +480,21 @@ export const locationLayer = Layer.effect(
           }),
         )).toSorted((a, b) => a.name.localeCompare(b.name))
       }),
-      connect: {
-        key: Effect.fn("Integration.connect.key")(function* (input) {
+      connection: {
+        list: Effect.fn("Integration.connection.list")(function* () {
+          const saved = Map.groupBy(yield* credentials.all(), (credential) => credential.integrationID)
+          return new Map(
+            new Set([...state.get().integrations.keys(), ...saved.keys()]).values().flatMap((id) => {
+              const connection = activeConnection(state.get().integrations.get(id), saved.get(id) ?? [])
+              return connection ? [[id, connection] as const] : []
+            }),
+          )
+        }),
+        forIntegration: Effect.fn("Integration.connection.forIntegration")(function* (id) {
+          const entry = state.get().integrations.get(id)
+          return activeConnection(entry, yield* credentials.list(id))
+        }),
+        key: Effect.fn("Integration.connection.key")(function* (input) {
           const method = state
             .get()
             .integrations.get(input.integrationID)
@@ -466,8 +505,9 @@ export const locationLayer = Layer.effect(
             label: input.label,
             value: new Credential.Key({ type: "key", key: input.key }),
           })
+          yield* events.publish(Event.Updated, {})
         }),
-        oauth: Effect.fn("Integration.connect.oauth")(function* (input) {
+        oauth: Effect.fn("Integration.connection.oauth")(function* (input) {
           const method = state.get().integrations.get(input.integrationID)?.implementations.get(input.methodID)
           if (!method) {
             return yield* Effect.die(`OAuth method not found: ${input.integrationID}/${input.methodID}`)
@@ -510,6 +550,14 @@ export const locationLayer = Layer.effect(
             time,
           })
         }),
+        update: Effect.fn("Integration.connection.update")(function* (credentialID, updates) {
+          yield* credentials.update(credentialID, updates)
+          yield* events.publish(Event.Updated, {})
+        }),
+        remove: Effect.fn("Integration.connection.remove")(function* (credentialID) {
+          yield* credentials.remove(credentialID)
+          yield* events.publish(Event.Updated, {})
+        }),
       },
       attempt: {
         status: Effect.fn("Integration.attempt.status")(function* (attemptID) {
diff --git a/packages/core/src/integration/connection.ts b/packages/core/src/integration/connection.ts
index a190ebf78c0..200cf265800 100644
--- a/packages/core/src/integration/connection.ts
+++ b/packages/core/src/integration/connection.ts
@@ -3,16 +3,18 @@ export * as IntegrationConnection from "./connection"
 import { Schema } from "effect"
 import { Credential } from "../credential"
 
-export class CredentialInfo extends Schema.Class<CredentialInfo>("Connection.CredentialInfo")({
+export const CredentialInfo = Schema.Struct({
   type: Schema.Literal("credential"),
   id: Credential.ID,
   label: Schema.String,
-}) {}
+}).annotate({ identifier: "Connection.CredentialInfo" })
+export type CredentialInfo = typeof CredentialInfo.Type
 
-export class EnvInfo extends Schema.Class<EnvInfo>("Connection.EnvInfo")({
+export const EnvInfo = Schema.Struct({
   type: Schema.Literal("env"),
   name: Schema.String,
-}) {}
+}).annotate({ identifier: "Connection.EnvInfo" })
+export type EnvInfo = typeof EnvInfo.Type
 
 export const Info = Schema.Union([CredentialInfo, EnvInfo])
   .pipe(Schema.toTaggedUnion("type"))
diff --git a/packages/core/src/kilocode/powershell.ts b/packages/core/src/kilocode/powershell.ts
new file mode 100644
index 00000000000..866f215e043
--- /dev/null
+++ b/packages/core/src/kilocode/powershell.ts
@@ -0,0 +1,126 @@
+export function args(command: string) {
+  return ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", script(command)]
+}
+
+const setup = `[Console]::InputEncoding = [System.Text.UTF8Encoding]::new($false);
+[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false);
+$OutputEncoding = [Console]::OutputEncoding;
+`
+
+function script(command: string) {
+  const pos = prologue(command)
+  const head = command.slice(0, pos)
+  const body = command.slice(pos)
+  const gap = head && !/[;\r\n]\s*$/.test(head) ? "\n" : ""
+  return `${head}${gap}${setup}${body}`
+}
+
+function prologue(command: string) {
+  const pos = scan(command, 0)
+  const attr = attrs(command, pos)
+  const body = command.slice(attr)
+  const match = /^param\s*\(/i.exec(body)
+  if (!match) return pos
+
+  const start = attr + match[0].lastIndexOf("(")
+  const end = block(command, start, "(", ")")
+  if (end === undefined) return pos
+  return end
+}
+
+function attrs(command: string, start: number) {
+  let pos = start
+  while (pos < command.length) {
+    const next = scan(command, pos)
+    if (command[next] !== "[") return next
+    const end = block(command, next, "[", "]")
+    if (end === undefined) return start
+    pos = end
+  }
+  return pos
+}
+
+function scan(command: string, start: number) {
+  let pos = start
+  while (pos < command.length) {
+    const next = trivia(command, pos)
+    if (next !== pos) {
+      pos = next
+      continue
+    }
+    const end = line(command, pos)
+    const value = command.slice(pos, end)
+    if (/^using\s+(?:assembly|module|namespace|type)\b/i.test(value)) {
+      pos = end
+      continue
+    }
+    return pos
+  }
+  return pos
+}
+
+function trivia(command: string, start: number) {
+  let pos = start
+  while (pos < command.length) {
+    while (/\s/.test(command[pos] ?? "")) pos++
+    if (command[pos] === "#") {
+      pos = line(command, pos)
+      continue
+    }
+    if (command.startsWith("<#", pos)) {
+      const end = command.indexOf("#>", pos + 2)
+      if (end === -1) return command.length
+      pos = end + 2
+      continue
+    }
+    return pos
+  }
+  return pos
+}
+
+function line(command: string, start: number) {
+  const index = command.indexOf("\n", start)
+  if (index === -1) return command.length
+  return index + 1
+}
+
+function block(command: string, start: number, open: string, close: string) {
+  let depth = 0
+  let quote: string | undefined
+  for (let pos = start; pos < command.length; pos++) {
+    const char = command[pos]
+    if (quote) {
+      if (quote === "'" && char === "'" && command[pos + 1] === "'") {
+        pos++
+        continue
+      }
+      if (quote === '"' && char === "`") {
+        pos++
+        continue
+      }
+      if (char === quote) quote = undefined
+      continue
+    }
+    if (char === "'" || char === '"') {
+      quote = char
+      continue
+    }
+    if (command.startsWith("<#", pos)) {
+      const end = command.indexOf("#>", pos + 2)
+      if (end === -1) return
+      pos = end + 1
+      continue
+    }
+    if (char === "#") {
+      pos = line(command, pos) - 1
+      continue
+    }
+    if (char === open) depth++
+    if (char === close) {
+      depth--
+      if (depth === 0) return pos + 1
+    }
+  }
+}
+
+export const PowerShell = { args }
diff --git a/packages/core/src/kilocode/pty-self-command.ts b/packages/core/src/kilocode/pty-self-command.ts
new file mode 100644
index 00000000000..360e094bda7
--- /dev/null
+++ b/packages/core/src/kilocode/pty-self-command.ts
@@ -0,0 +1,61 @@
+import path from "path"
+
+type Input = {
+  command?: string
+  args?: string[]
+  cwd?: string
+}
+
+type Command = {
+  command: string
+  args: string[]
+  cwd?: string
+}
+
+const names = new Set(["kilo", "kilocode"])
+const self = command()
+
+function clean(input: string[]) {
+  return input.filter((arg, index) => {
+    if (arg === "--cwd") return false
+    if (input[index - 1] === "--cwd") return false
+    if (arg.startsWith("--cwd=")) return false
+    return true
+  })
+}
+
+function full(input: string, cwd: string) {
+  if (path.isAbsolute(input)) return input
+  return path.resolve(cwd, input)
+}
+
+export function command(
+  proc = { argv: process.argv, execArgv: process.execArgv, execPath: process.execPath, cwd: process.cwd() },
+): Command {
+  const script = proc.argv[1]
+  const bundled = script?.startsWith("/$bunfs/") || (script ? /^[A-Za-z]:[\\/]~BUN[\\/]/.test(script) : false)
+  if (script && !bundled && /\.(ts|js|mjs|cjs)$/.test(script)) {
+    const file = full(script, proc.cwd)
+    const dir = path.dirname(file)
+    const root = path.basename(dir) === "src" ? path.dirname(dir) : proc.cwd
+    return { command: full(proc.execPath, proc.cwd), args: [...clean(proc.execArgv), file], cwd: root }
+  }
+  return { command: full(proc.execPath, proc.cwd), args: [] }
+}
+
+export function resolve(input: Input, cmd = self): Input {
+  if (!input.command || !names.has(input.command)) return input
+  const args = input.args ?? []
+  const project = cmd.cwd && args.length === 0 && input.cwd ? [input.cwd] : []
+  return {
+    ...input,
+    command: cmd.command,
+    args: [...cmd.args, ...project, ...args],
+    cwd: cmd.cwd ?? input.cwd,
+  }
+}
+
+export const KiloPtySelfCommand = {
+  command,
+  resolve,
+}
diff --git a/packages/core/src/location.ts b/packages/core/src/location.ts
index ebfb096f130..9225e4a01a1 100644
--- a/packages/core/src/location.ts
+++ b/packages/core/src/location.ts
@@ -1,6 +1,6 @@
 import { Context, Effect, Layer, Schema } from "effect"
 import { Project } from "./project"
-import { AbsolutePath } from "./schema"
+import { AbsolutePath, optionalOmitUndefined } from "./schema"
 import { WorkspaceV2 } from "./workspace"
 
 export * as Location from "./location"
@@ -12,7 +12,7 @@ export class Ref extends Schema.Class<Ref>("Location.Ref")({
 
 export class Info extends Schema.Class<Info>("Location.Info")({
   directory: AbsolutePath,
-  workspaceID: WorkspaceV2.ID.pipe(Schema.optional),
+  workspaceID: optionalOmitUndefined(WorkspaceV2.ID),
   project: Schema.Struct({
     id: Project.ID,
     directory: AbsolutePath,
diff --git a/packages/core/src/plugin/boot.ts b/packages/core/src/plugin/boot.ts
index 75782714098..694b0bc5649 100644
--- a/packages/core/src/plugin/boot.ts
+++ b/packages/core/src/plugin/boot.ts
@@ -21,7 +21,6 @@ import { PluginV2 } from "../plugin"
 import { AgentPlugin } from "./agent"
 import { CommandPlugin } from "./command"
 import { ConfigProviderPlugin } from "../config/plugin/provider"
-import { EnvPlugin } from "./env"
 import { ModelsDevPlugin } from "./models-dev"
 import { ProviderPlugins } from "./provider"
 import { SkillV2 } from "../skill"
@@ -98,7 +97,6 @@ export const layer = Layer.effect(
     })
 
     const boot = Effect.gen(function* () {
-      yield* add(EnvPlugin)
       yield* add(AgentPlugin.Plugin)
       yield* add(CommandPlugin.Plugin)
       // kilocode_change - Kilo's CLI registry supplies `kilo-config`; do not register the redundant opencode skill.
diff --git a/packages/core/src/plugin/env.ts b/packages/core/src/plugin/env.ts
deleted file mode 100644
index 35e6981a40c..00000000000
--- a/packages/core/src/plugin/env.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Effect } from "effect"
-import { PluginV2 } from "../plugin"
-
-export const EnvPlugin = PluginV2.define({
-  id: PluginV2.ID.make("env"),
-  effect: Effect.gen(function* () {
-    return {
-      "catalog.transform": Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          const key = item.provider.env.find((env) => process.env[env])
-          if (!key) continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.enabled = {
-              via: "env",
-              name: key,
-            }
-          })
-        }
-      }),
-    }
-  }),
-})
diff --git a/packages/core/src/plugin/models-dev.ts b/packages/core/src/plugin/models-dev.ts
index e34c11f7889..a212d013ad1 100644
--- a/packages/core/src/plugin/models-dev.ts
+++ b/packages/core/src/plugin/models-dev.ts
@@ -70,16 +70,11 @@ export const ModelsDevPlugin = PluginV2.define({
           integrations.update(integrationID, (integration) => (integration.name = item.name))
           integrations.method.update({
             integrationID,
-            method: new Integration.KeyMethod({
-              type: "key",
-            }),
+            method: { type: "key" },
           })
           integrations.method.update({
             integrationID,
-            method: new Integration.EnvMethod({
-              type: "env",
-              names: [...item.env],
-            }),
+            method: { type: "env", names: [...item.env] },
           })
         }
       })
@@ -88,7 +83,6 @@ export const ModelsDevPlugin = PluginV2.define({
           const providerID = ProviderV2.ID.make(item.id)
           catalog.provider.update(providerID, (provider) => {
             provider.name = item.name
-            provider.env = [...item.env]
             provider.api = item.npm
               ? {
                   type: "aisdk",
diff --git a/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts b/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
index afb3a183e50..ba7856b6357 100644
--- a/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
+++ b/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
@@ -24,7 +24,7 @@ export const CloudflareAIGatewayPlugin = PluginV2.define({
           apiKey: config.apiKey,
           options: gatewayOptions(evt.options, metadata),
         } as any)
-        const unified = createUnified()
+        const unified = createUnified({ apiKey: config.apiKey })
         evt.sdk = {
           languageModel(modelID: string) {
             return gateway(unified(modelID))
diff --git a/packages/core/src/plugin/provider/kilo.ts b/packages/core/src/plugin/provider/kilo.ts
index 78fdda19954..bf6666c2521 100644
--- a/packages/core/src/plugin/provider/kilo.ts
+++ b/packages/core/src/plugin/provider/kilo.ts
@@ -27,9 +27,9 @@ export const KiloPlugin = PluginV2.define({
             provider.request.headers["HTTP-Referer"] = "https://kilo.ai/"
             // kilocode_change start
             provider.request.headers["X-Title"] = "Kilo Code"
-            options.kilocodeToken = token ?? "anonymous"
+            options.apiKey = token ?? "anonymous"
+            options.kilocodeToken = options.apiKey
             if (org) options.kilocodeOrganizationId = org
-            if (!provider.enabled) provider.enabled = { via: "custom", data: { anonymous: true } }
             // kilocode_change end
           })
         }
diff --git a/packages/core/src/plugin/provider/llmgateway.ts b/packages/core/src/plugin/provider/llmgateway.ts
index d8769aa980a..b416abd2848 100644
--- a/packages/core/src/plugin/provider/llmgateway.ts
+++ b/packages/core/src/plugin/provider/llmgateway.ts
@@ -1,20 +1,23 @@
 import { Effect } from "effect"
+import { Integration } from "../../integration"
 import { PluginV2 } from "../../plugin"
 import { ProviderV2 } from "../../provider" // kilocode_change
 
 export const LLMGatewayPlugin = PluginV2.define({
   id: PluginV2.ID.make("llmgateway"),
   effect: Effect.gen(function* () {
+    const integrations = yield* Integration.Service
     return {
       "catalog.transform": Effect.fn(function* (evt) {
         for (const item of evt.provider.list()) {
-          if (item.provider.enabled === false) continue
+          if (item.provider.disabled) continue
+          if (!(yield* integrations.get(Integration.ID.make(item.provider.id)))) continue
           if (item.provider.api.type !== "aisdk") continue
           if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
           if (item.provider.api.url !== "https://api.llmgateway.io/v1") continue
           if (item.provider.id !== ProviderV2.ID.make("llmgateway")) continue // kilocode_change
           evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["HTTP-Referer"] = "https://kilo.ai/" // kilocode_change
+            provider.request.headers["HTTP-Referer"] = "https://kilo.ai/"
             // kilocode_change start
             provider.request.headers["X-Title"] = "Kilo Code"
             provider.request.headers["X-Source"] = "kilo"
diff --git a/packages/core/src/plugin/provider/openai-auth.ts b/packages/core/src/plugin/provider/openai-auth.ts
index c28757ebdf8..fb9e8d300aa 100644
--- a/packages/core/src/plugin/provider/openai-auth.ts
+++ b/packages/core/src/plugin/provider/openai-auth.ts
@@ -32,11 +32,11 @@ const headlessMethodID = Integration.MethodID.make("chatgpt-headless")
 
 export const browser = {
   integrationID: Integration.ID.make("openai"),
-  method: new Integration.OAuthMethod({
+  method: {
     id: browserMethodID,
     type: "oauth",
     label: "ChatGPT Pro/Plus (browser)",
-  }),
+  },
   authorize: () =>
     Effect.gen(function* () {
       const pkce = yield* Effect.promise(generatePKCE)
@@ -95,11 +95,11 @@ export const browser = {
 
 export const headless = {
   integrationID: Integration.ID.make("openai"),
-  method: new Integration.OAuthMethod({
+  method: {
     id: headlessMethodID,
     type: "oauth",
     label: "ChatGPT Pro/Plus (headless)",
-  }),
+  },
   authorize: () =>
     Effect.gen(function* () {
       const device = yield* request<{ device_auth_id: string; user_code: string; interval: string }>(
@@ -258,6 +258,6 @@ function claim(token: string) {
 }
 
 const successPage =
-  "<!doctype html><title>Kilo</title><h1>Authorization successful</h1><p>You can close this window.</p>" // kilocode_change
+  "<!doctype html><title>Kilo</title><h1>Authorization successful</h1><p>You can close this window.</p>"
 const errorPage = (message: string) =>
-  `<!doctype html><title>Kilo</title><h1>Authorization failed</h1><p>${message.replace(/[&<>"']/g, "")}</p>` // kilocode_change
+  `<!doctype html><title>Kilo</title><h1>Authorization failed</h1><p>${message.replace(/[&<>"']/g, "")}</p>`
diff --git a/packages/core/src/plugin/provider/opencode.ts b/packages/core/src/plugin/provider/opencode.ts
index 67fd7816a3f..56e71f822dd 100644
--- a/packages/core/src/plugin/provider/opencode.ts
+++ b/packages/core/src/plugin/provider/opencode.ts
@@ -1,20 +1,20 @@
 import { Effect } from "effect"
+import { Integration } from "../../integration"
 import { PluginV2 } from "../../plugin"
 import { ProviderV2 } from "../../provider"
 
 export const OpencodePlugin = PluginV2.define({
   id: PluginV2.ID.make("opencode"),
   effect: Effect.gen(function* () {
+    const integrations = yield* Integration.Service
     let hasKey = false
     return {
       "catalog.transform": Effect.fn(function* (evt) {
         const item = evt.provider.get(ProviderV2.ID.opencode)
         if (!item) return
+        const integration = yield* integrations.get(Integration.ID.make(item.provider.id))
         hasKey = Boolean(
-          process.env.OPENCODE_API_KEY ||
-            item.provider.env.some((env) => process.env[env]) ||
-            item.provider.request.body.apiKey ||
-            (item.provider.enabled && item.provider.enabled.via === "credential"),
+          process.env.OPENCODE_API_KEY || integration?.connections.length || item.provider.request.body.apiKey,
         )
         evt.provider.update(item.provider.id, (provider) => {
           if (!hasKey) provider.request.body.apiKey = "public"
diff --git a/packages/core/src/plugin/skill.ts b/packages/core/src/plugin/skill.ts
index 7c89ac8e337..620fdc8b9ab 100644
--- a/packages/core/src/plugin/skill.ts
+++ b/packages/core/src/plugin/skill.ts
@@ -23,7 +23,7 @@ export const Plugin = PluginV2.define({
           skill: new SkillV2.Info({
             name: "customize-opencode",
             description:
-              "Use ONLY when the user is editing or creating opencode's own configuration: opencode.json, opencode.jsonc, files under .opencode/, or files under ~/.config/opencode/. Also use when creating or fixing opencode agents, subagents, skills, plugins, MCP servers, or permission rules. Do not use for the user's own application code, or for any project that is not configuring opencode itself.",
+              "Use ONLY when the user is editing or creating opencode's own configuration: opencode.json, opencode.jsonc, files under .opencode/, or files under ~/.config/opencode/. Also use when creating or fixing opencode agents, subagents, commands, skills, plugins, MCP servers, or permission rules. Do not use for the user's own application code, or for any project that is not configuring opencode itself.",
             location: AbsolutePath.make("/builtin/customize-opencode.md"),
             content: CustomizeOpencodeContent,
           }),
diff --git a/packages/core/src/plugin/skill/customize-opencode.md b/packages/core/src/plugin/skill/customize-opencode.md
index 1c1cbdf3c29..f5235cc23f4 100644
--- a/packages/core/src/plugin/skill/customize-opencode.md
+++ b/packages/core/src/plugin/skill/customize-opencode.md
@@ -43,6 +43,8 @@ already-loaded config until then.
 | Global config                 | `~/.config/opencode/opencode.json` (NOT `~/.opencode/`)                                                                   |
 | Project agents                | `.opencode/agent/<name>.md` or `.opencode/agents/<name>.md`                                                               |
 | Global agents                 | `~/.config/opencode/agent(s)/<name>.md`                                                                                   |
+| Project commands              | `.opencode/command/<name>.md` or `.opencode/commands/<name>.md`                                                           |
+| Global commands               | `~/.config/opencode/command(s)/<name>.md`                                                                                 |
 | Project skills                | `.opencode/skill(s)/<name>/SKILL.md`                                                                                      |
 | Global skills                 | `~/.config/opencode/skill(s)/<name>/SKILL.md`                                                                             |
 | External skills (auto-loaded) | `~/.claude/skills/<name>/SKILL.md`, `~/.agents/skills/<name>/SKILL.md`                                                    |
@@ -96,7 +98,7 @@ Every field is optional.
   },
 
   "command": {
-    "deploy": { "description": "...", "prompt": "..." }
+    "deploy": { "description": "...", "template": "..." }
   },
 
   "provider": {
@@ -151,6 +153,7 @@ Shape notes worth being explicit about:
 - `skills` is an object with `paths` and/or `urls`, not an array.
 - `references` is an object keyed by alias. Each value is a local path, Git repository, or string shorthand.
 - `agent` is an object keyed by agent name, not an array.
+- `command` is an object keyed by command name, not an array.
 - `plugin` is an array of strings or `[name, options]` tuples, not an object.
 - `mcp[name].command` is an array of strings, never a single string. `type` is required.
 - `permission` is either a string action or an object keyed by tool name.
@@ -277,6 +280,31 @@ opencode ships with `build`, `plan`, `general`, `explore`. Hidden internal agent
 `compaction`, `title`, `summary`. To override a built-in's fields, define the
 same key in `agent: { <name>: { ... } }`.
 
+## Commands
+
+opencode's command loader scans for `**/*.md` inside command directories. The
+file is named after the command, and lives directly inside the `command` folder:
+
+```
+.opencode/command/deploy.md
+```
+
+Frontmatter:
+
+```markdown
+---
+description: One sentence describing what the command does.
+agent: build
+model: anthropic/claude-sonnet-4-6
+---
+
+(command body in markdown: the prompt opencode runs, with $ARGUMENTS for the user's input)
+```
+
+- `template` is the command body — everything below the frontmatter — and is required: it is the prompt opencode runs when the command is invoked. Do not also put a `template:` key in the frontmatter.
+- `$ARGUMENTS` is replaced with everything the user typed after the command; `$1`, `$2`, … pull individual positional arguments.
+- Optional: `description`, `agent`, `model`, `variant`, `subtask`.
+
 ## Plugins
 
 `plugin:` is an array. Each entry is one of:
@@ -300,7 +328,7 @@ function, not a plain object literal, and the function returns an object
 (return `{}` if there is nothing to register).
 
 ```ts
-import type { Plugin } from "@opencode-ai/plugin"
+import type { Plugin } from "@kilocode/plugin"
 
 export default (async ({ client, project, directory, $ }) => {
   return {
@@ -397,16 +425,16 @@ the `plan` agent's permission ruleset (`edit: deny *`).
 
 When a user's config is broken and opencode won't start, these env vars help:
 
-- `OPENCODE_DISABLE_PROJECT_CONFIG=1`: skip the project's local `opencode.json`
+- `KILO_DISABLE_PROJECT_CONFIG=1`: skip the project's local `opencode.json`
   and start from globals only. Run from the project directory, opencode loads,
   the user edits the broken file, then they restart without the flag.
-- `OPENCODE_CONFIG=/path/to/file.json`: load an additional explicit config.
-- `OPENCODE_CONFIG_CONTENT='{"$schema":"https://opencode.ai/config.json"}'`:
+- `KILO_CONFIG=/path/to/file.json`: load an additional explicit config.
+- `KILO_CONFIG_CONTENT='{"$schema":"https://opencode.ai/config.json"}'`:
   inject inline JSON as a final local-scope merge.
-- `OPENCODE_DISABLE_DEFAULT_PLUGINS=1`: skip default plugins.
-- `OPENCODE_PURE=1`: skip external plugins entirely.
-- `OPENCODE_DISABLE_EXTERNAL_SKILLS=1`,
-  `OPENCODE_DISABLE_CLAUDE_CODE_SKILLS=1`: skip the external skill scans under
+- `KILO_DISABLE_DEFAULT_PLUGINS=1`: skip default plugins.
+- `KILO_PURE=1`: skip external plugins entirely.
+- `KILO_DISABLE_EXTERNAL_SKILLS=1`,
+  `KILO_DISABLE_CLAUDE_CODE_SKILLS=1`: skip the external skill scans under
   `~/.claude/` and `~/.agents/`.
 
 ## When proposing edits
@@ -415,8 +443,8 @@ When a user's config is broken and opencode won't start, these env vars help:
   exact shape, or the field is not covered in this skill, fetch
   `https://opencode.ai/config.json` and read the schema rather than guessing.
 - Preserve `$schema` and any existing fields the user did not ask to change.
-- For agent, skill, and plugin definitions, prefer creating new files in the
-  correct location over inlining everything in `opencode.json`.
+- For agent, command, skill, and plugin definitions, prefer creating new files
+  in the correct location over inlining everything in `opencode.json`.
 - If the user's existing config is malformed, point them at the env-var escape
   hatches above so they can edit from inside opencode without breaking their
   session.
diff --git a/packages/core/src/project/copy.ts b/packages/core/src/project/copy.ts
index 670b0d2dcba..0e3246b3b2a 100644
--- a/packages/core/src/project/copy.ts
+++ b/packages/core/src/project/copy.ts
@@ -245,6 +245,7 @@ export const layer = Layer.effect(
         (sourceDirectory) =>
           Effect.forEach(strategies(), (strategy) =>
             strategy.list(sourceDirectory).pipe(
+              Effect.catchTag("ProjectCopy.DirectoryUnavailableError", () => Effect.succeed([])),
               Effect.map((items) =>
                 items.map((item) => ({
                   directory: item.directory,
diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts
index 58b5e9f813d..0d6084257b5 100644
--- a/packages/core/src/provider.ts
+++ b/packages/core/src/provider.ts
@@ -2,7 +2,6 @@ export * as ProviderV2 from "./provider"
 
 import { withStatics } from "./schema"
 import { Schema } from "effect"
-import { Credential } from "./credential"
 
 export const ID = Schema.String.pipe(
   Schema.brand("ProviderV2.ID"),
@@ -49,22 +48,7 @@ export type Request = typeof Request.Type
 export class Info extends Schema.Class<Info>("ProviderV2.Info")({
   id: ID,
   name: Schema.String,
-  enabled: Schema.Union([
-    Schema.Literal(false),
-    Schema.Struct({
-      via: Schema.Literal("env"),
-      name: Schema.String,
-    }),
-    Schema.Struct({
-      via: Schema.Literal("credential"),
-      credentialID: Credential.ID,
-    }),
-    Schema.Struct({
-      via: Schema.Literal("custom"),
-      data: Schema.Record(Schema.String, Schema.Any),
-    }),
-  ]),
-  env: Schema.String.pipe(Schema.Array),
+  disabled: Schema.Boolean.pipe(Schema.optional),
   api: Api,
   request: Request,
 }) {
@@ -72,8 +56,6 @@ export class Info extends Schema.Class<Info>("ProviderV2.Info")({
     return new Info({
       id: providerID,
       name: providerID,
-      enabled: false,
-      env: [],
       api: {
         type: "native",
         settings: {},
diff --git a/packages/core/src/pty.ts b/packages/core/src/pty.ts
index 79ddc99b639..28e48f6b051 100644
--- a/packages/core/src/pty.ts
+++ b/packages/core/src/pty.ts
@@ -2,23 +2,29 @@ export * as Pty from "./pty"
 
 import type { Disp, Proc } from "#pty"
 import { Context, Effect, Layer, Schema, Types } from "effect"
+import { Config } from "./config"
 import { EventV2 } from "./event"
 import { Location } from "./location"
 import { NonNegativeInt, PositiveInt } from "./schema"
 import { PtyID } from "./pty/schema"
 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
 
 const BUFFER_LIMIT = 1024 * 1024 * 2
-const BUFFER_CHUNK = 64 * 1024
-const encoder = new TextEncoder()
+// Exited sessions stay observable (status, exit code, retained output) until removed explicitly.
+// Cap retention so abandoned terminals do not accumulate unbounded buffers.
+const EXITED_LIMIT = 25
 const pty = lazy(() => import("#pty"))
 
-type Socket = {
-  readyState: number
-  data?: unknown
-  send: (data: string | Uint8Array | ArrayBuffer) => void
-  close: (code?: number, reason?: string) => void
+type Subscriber = {
+  readonly onData: (chunk: string) => void
+  readonly onEnd: (event: { exitCode?: number }) => void
+  active: boolean
+  detached: boolean
+  pending: string[]
+  end?: { exitCode?: number }
 }
 
 type Active = {
@@ -27,22 +33,10 @@ type Active = {
   buffer: string
   bufferCursor: number
   cursor: number
-  subscribers: Map<unknown, Socket>
+  subscribers: Map<object, Subscriber>
   listeners: Disp[]
 }
 
-const sock = (ws: Socket) => (ws.data && typeof ws.data === "object" ? ws.data : ws)
-
-// WebSocket control frame: 0x00 + UTF-8 JSON.
-const meta = (cursor: number) => {
-  const json = JSON.stringify({ cursor })
-  const bytes = encoder.encode(json)
-  const out = new Uint8Array(bytes.length + 1)
-  out[0] = 0
-  out.set(bytes, 1)
-  return out
-}
-
 export const Info = Schema.Struct({
   id: PtyID,
   title: Schema.String,
@@ -52,6 +46,8 @@ export const Info = Schema.Struct({
   status: Schema.Literals(["running", "exited"]),
   // Windows ConPTY assigns the child pid asynchronously, so 0 is valid at spawn time.
   pid: NonNegativeInt,
+  // Present once status is "exited".
+  exitCode: Schema.optional(NonNegativeInt),
   sessionID: Schema.optional(Schema.NullOr(SessionSchema.ID)), // kilocode_change
 }).annotate({ identifier: "Pty" })
 
@@ -67,14 +63,6 @@ export const CreateInput = Schema.Struct({
 
 export type CreateInput = Types.DeepMutable<typeof CreateInput.Type>
 
-export type PreparedCreate = {
-  readonly command: string
-  readonly args: string[]
-  readonly cwd: string
-  readonly title?: string
-  readonly env: Record<string, string>
-}
-
 export const UpdateInput = Schema.Struct({
   title: Schema.optional(Schema.String),
   sessionID: Schema.optional(Schema.NullOr(SessionSchema.ID)), // kilocode_change
@@ -88,10 +76,34 @@ export const UpdateInput = Schema.Struct({
 
 export type UpdateInput = Types.DeepMutable<typeof UpdateInput.Type>
 
+export type AttachInput = {
+  // Absolute output cursor to replay from. -1 tails from the current end; omitted replays the full retained buffer.
+  readonly cursor?: number
+  // Callbacks fire synchronously from the native PTY data path; keep them non-blocking.
+  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
+}
+
+export type Attachment = {
+  // Retained output from the requested cursor to the current end.
+  readonly replay: string
+  // Absolute output cursor after replay.
+  readonly cursor: number
+  readonly write: (data: string) => void
+  // Starts live delivery after the caller has applied replay and cursor metadata.
+  readonly activate: () => void
+  readonly detach: () => void
+}
+
 export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("Pty.NotFoundError", {
   ptyID: PtyID,
 }) {}
 
+export class ExitedError extends Schema.TaggedErrorClass<ExitedError>()("Pty.ExitedError", {
+  ptyID: PtyID,
+}) {}
+
 export const Event = {
   Created: EventV2.define({ type: "pty.created", schema: { info: Info } }),
   Updated: EventV2.define({ type: "pty.updated", schema: { info: Info } }),
@@ -102,19 +114,11 @@ export const Event = {
 export interface Interface {
   readonly list: () => Effect.Effect<Info[]>
   readonly get: (id: PtyID) => Effect.Effect<Info, NotFoundError>
-  readonly create: (input: PreparedCreate) => Effect.Effect<Info>
+  readonly create: (input: CreateInput) => Effect.Effect<Info>
   readonly update: (id: PtyID, input: UpdateInput) => Effect.Effect<Info, NotFoundError>
   readonly remove: (id: PtyID) => Effect.Effect<void, NotFoundError>
-  readonly resize: (id: PtyID, cols: number, rows: number) => Effect.Effect<void, NotFoundError>
   readonly write: (id: PtyID, data: string) => Effect.Effect<void, NotFoundError>
-  readonly connect: (
-    id: PtyID,
-    ws: Socket,
-    cursor?: number,
-  ) => Effect.Effect<
-    { onMessage: (message: string | ArrayBuffer) => void; onClose: () => void } | undefined,
-    NotFoundError
-  >
+  readonly attach: (id: PtyID, input: AttachInput) => Effect.Effect<Attachment, NotFoundError | ExitedError>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Pty") {}
@@ -124,28 +128,41 @@ export const layer = Layer.effect(
   Effect.gen(function* () {
     const events = yield* EventV2.Service
     const location = yield* Location.Service
+    const config = yield* Config.Service
     const context = yield* Effect.context()
     const runFork = Effect.runForkWith(context)
     const sessions = new Map<PtyID, Active>()
+    const exitOrder: PtyID[] = []
+
+    function notifyEnd(session: Active, event: { exitCode?: number }) {
+      for (const subscriber of session.subscribers.values()) {
+        if (!subscriber.active) {
+          subscriber.end = event
+          continue
+        }
+        try {
+          subscriber.onEnd(event)
+        } catch {}
+      }
+      session.subscribers.clear()
+    }
 
     function teardown(session: Active) {
       for (const listener of session.listeners) listener.dispose()
       session.listeners.length = 0
-      try {
-        session.process.kill()
-      } catch {}
-      for (const [sub, ws] of session.subscribers.entries()) {
+      if (session.info.status === "running") {
         try {
-          if (sock(ws) === sub) ws.close()
+          session.process.kill()
         } catch {}
       }
-      session.subscribers.clear()
+      notifyEnd(session, {})
     }
 
     yield* Effect.addFinalizer(() =>
       Effect.sync(() => {
         for (const session of sessions.values()) teardown(session)
         sessions.clear()
+        exitOrder.length = 0
       }),
     )
 
@@ -157,12 +174,13 @@ export const layer = Layer.effect(
 
     const removeSession = Effect.fnUntraced(function* (id: PtyID) {
       const session = sessions.get(id)
-      if (!session) return false
+      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 })
-      return true
     })
 
     const remove = Effect.fn("Pty.remove")(function* (id: PtyID) {
@@ -178,29 +196,48 @@ export const layer = Layer.effect(
       return (yield* requireSession(id)).info
     })
 
-    const create = Effect.fn("Pty.create")(function* (input: PreparedCreate) {
+    const create = Effect.fn("Pty.create")(function* (input: CreateInput) {
       const id = PtyID.ascending()
-      yield* Effect.logInfo("creating session", { id, cmd: input.command, args: input.args, cwd: input.cwd })
+      // kilocode_change start - resolve Kilo self-commands to the real binary, arguments, and project cwd
+      const resolved = KiloPtySelfCommand.resolve({
+        command: input.command,
+        args: input.args ? [...input.args] : undefined,
+        cwd: input.cwd,
+      })
+      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 cwd = resolved.cwd || location.directory
+      // kilocode_change end
+      const env = {
+        ...process.env,
+        ...input.env,
+        TERM: "xterm-256color",
+        KILO_TERMINAL: "1",
+        KILO_PTY_ID: id, // kilocode_change - let nested Kilo processes identify their parent terminal
+      } as Record<string, string>
+      // kilocode_change start - do not expose local server credentials to user terminals.
+      // node-pty inherits parent values for omitted keys, so empty tombstones are required.
+      env.KILO_SERVER_PASSWORD = ""
+      env.KILO_SERVER_USERNAME = ""
+      // kilocode_change end
+      if (process.platform === "win32") {
+        env.LC_ALL = "C.UTF-8"
+        env.LC_CTYPE = "C.UTF-8"
+        env.LANG = "C.UTF-8"
+      }
+      yield* Effect.logInfo("creating session", { id, cmd: command, args, cwd })
       const { spawn } = yield* Effect.promise(() => pty())
-      // kilocode_change - expose the pty id to the spawned shell so a nested `kilo tui`/`kilo run` can
-      // detect it is running inside a kilo-spawned terminal (read via process.env.KILO_PTY_ID)
-      const env = { ...input.env, KILO_PTY_ID: id }
-      const proc = yield* Effect.sync(() =>
-        spawn(input.command, input.args, {
-          name: "xterm-256color",
-          cwd: input.cwd,
-          env,
-        }),
-      )
-      const info = {
+      const proc = yield* Effect.sync(() => spawn(command, args, { name: "xterm-256color", cwd, env }))
+      const info: Info = {
         id,
         title: input.title || `Terminal ${id.slice(-4)}`,
-        command: input.command,
-        args: input.args,
-        cwd: input.cwd,
+        command,
+        args,
+        cwd,
         status: "running",
         pid: proc.pid,
-      } as const
+      }
       const session: Active = {
         info,
         process: proc,
@@ -214,15 +251,15 @@ export const layer = Layer.effect(
       session.listeners.push(
         proc.onData((chunk) => {
           session.cursor += chunk.length
-          for (const [key, ws] of session.subscribers.entries()) {
-            if (ws.readyState !== 1 || sock(ws) !== key) {
-              session.subscribers.delete(key)
+          for (const [token, subscriber] of session.subscribers.entries()) {
+            if (!subscriber.active) {
+              subscriber.pending.push(chunk)
               continue
             }
             try {
-              ws.send(chunk)
+              subscriber.onData(chunk)
             } catch {
-              session.subscribers.delete(key)
+              session.subscribers.delete(token)
             }
           }
           session.buffer += chunk
@@ -233,12 +270,19 @@ export const layer = Layer.effect(
         }),
         proc.onExit(({ exitCode }) => {
           if (session.info.status === "exited") return
+          session.info.status = "exited"
+          session.info.exitCode = exitCode
+          notifyEnd(session, { exitCode })
+          exitOrder.push(id)
           runFork(
             Effect.gen(function* () {
               yield* Effect.logInfo("session exited", { id, exitCode })
-              session.info.status = "exited"
               yield* events.publish(Event.Exited, { id, exitCode })
-              yield* removeSession(id)
+              while (exitOrder.length > EXITED_LIMIT) {
+                const oldest = exitOrder[0]
+                if (!oldest) break
+                yield* removeSession(oldest)
+              }
             }),
           )
         }),
@@ -253,66 +297,71 @@ export const layer = Layer.effect(
       // kilocode_change start - associate nested Kilo TUI terminals with the viewed session
       if ("sessionID" in input) session.info.sessionID = input.sessionID ?? undefined
       // kilocode_change end
-      if (input.size) session.process.resize(input.size.cols, input.size.rows)
+      if (input.size && session.info.status === "running") session.process.resize(input.size.cols, input.size.rows)
       yield* events.publish(Event.Updated, { info: session.info })
       return session.info
     })
 
-    const resize = Effect.fn("Pty.resize")(function* (id: PtyID, cols: number, rows: number) {
-      const session = yield* requireSession(id)
-      if (session.info.status === "running") session.process.resize(cols, rows)
-    })
-
     const write = Effect.fn("Pty.write")(function* (id: PtyID, data: string) {
       const session = yield* requireSession(id)
       if (session.info.status === "running") session.process.write(data)
     })
 
-    const connect = Effect.fn("Pty.connect")(function* (id: PtyID, ws: Socket, cursor?: number) {
-      const session = yield* requireSession(id).pipe(Effect.tapError(() => Effect.sync(() => ws.close())))
-      yield* Effect.logInfo("client connected to session", { id, directory: location.directory })
-      const sub = sock(ws)
-      session.subscribers.delete(sub)
-      session.subscribers.set(sub, ws)
-      const cleanup = () => session.subscribers.delete(sub)
+    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 })
+      yield* Effect.logInfo("client attached to session", { id, directory: location.directory })
+      const token = {}
+      const subscriber: Subscriber = {
+        onData: input.onData,
+        onEnd: input.onEnd,
+        active: false,
+        detached: false,
+        pending: [],
+      }
+      session.subscribers.set(token, subscriber)
       const start = session.bufferCursor
       const end = session.cursor
       const from =
-        cursor === -1 ? end : typeof cursor === "number" && Number.isSafeInteger(cursor) ? Math.max(0, cursor) : 0
-      const data = (() => {
+        input.cursor === -1
+          ? end
+          : typeof input.cursor === "number" && Number.isSafeInteger(input.cursor)
+            ? Math.max(0, input.cursor)
+            : 0
+      const replay = (() => {
         if (!session.buffer || from >= end) return ""
         const offset = Math.max(0, from - start)
         if (offset >= session.buffer.length) return ""
         return session.buffer.slice(offset)
       })()
-      if (data) {
-        try {
-          for (let i = 0; i < data.length; i += BUFFER_CHUNK) ws.send(data.slice(i, i + BUFFER_CHUNK))
-        } catch {
-          cleanup()
-          ws.close()
-          return
-        }
-      }
-      try {
-        ws.send(meta(end))
-      } catch {
-        cleanup()
-        ws.close()
-        return
-      }
       return {
-        onMessage: (message: string | ArrayBuffer) => {
-          session.process.write(typeof message === "string" ? message : new TextDecoder().decode(message))
+        replay,
+        cursor: end,
+        write: (data: string) => {
+          if (session.info.status === "running") session.process.write(data)
         },
-        onClose: () => {
-          cleanup()
+        activate: () => {
+          if (subscriber.active || subscriber.detached) return
+          subscriber.active = true
+          try {
+            for (const chunk of subscriber.pending) subscriber.onData(chunk)
+            subscriber.pending.length = 0
+            if (subscriber.end) subscriber.onEnd(subscriber.end)
+          } catch {
+            session.subscribers.delete(token)
+          }
+        },
+        detach: () => {
+          subscriber.detached = true
+          subscriber.pending.length = 0
+          subscriber.end = undefined
+          session.subscribers.delete(token)
         },
       }
     })
 
-    return Service.of({ list, get, create, update, remove, resize, write, connect })
+    return Service.of({ list, get, create, update, remove, write, attach })
   }),
 )
 
-export const locationLayer = layer
+export const locationLayer = layer.pipe(Layer.provide(Config.locationLayer))
diff --git a/packages/core/src/pty/input.ts b/packages/core/src/pty/input.ts
deleted file mode 100644
index 0e4ea9a61af..00000000000
--- a/packages/core/src/pty/input.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Effect } from "effect"
-
-const inputDecoder = new TextDecoder("utf-8", { fatal: true })
-
-export function handlePtyInput(
-  handler: { onMessage: (message: string | ArrayBuffer) => void },
-  message: string | Uint8Array,
-) {
-  if (typeof message === "string") {
-    handler.onMessage(message)
-    return Effect.void
-  }
-  return Effect.try({
-    try: () => inputDecoder.decode(message),
-    catch: () => new Error("invalid PTY websocket input"),
-  }).pipe(
-    Effect.catch(() => Effect.succeed(undefined)),
-    Effect.flatMap((decoded) => {
-      if (decoded === undefined) return Effect.void
-      handler.onMessage(decoded)
-      return Effect.void
-    }),
-  )
-}
diff --git a/packages/core/src/pty/protocol.ts b/packages/core/src/pty/protocol.ts
new file mode 100644
index 00000000000..21c6a89f734
--- /dev/null
+++ b/packages/core/src/pty/protocol.ts
@@ -0,0 +1,37 @@
+export * as PtyProtocol from "./protocol"
+
+// Wire protocol for PTY websocket transports. The PTY domain service is transport-free; server
+// routes adapt Pty.attach to websockets with these helpers so every surface speaks one protocol.
+//
+// Outbound frames are raw UTF-8 terminal chunks. One control frame — a 0x00 byte followed by
+// UTF-8 JSON — carries the absolute output cursor after replay so clients can resume later.
+
+const encoder = new TextEncoder()
+const decoder = new TextDecoder("utf-8", { fatal: true })
+
+// Replay can be megabytes; send it in bounded frames.
+export const REPLAY_CHUNK = 64 * 1024
+
+export function metaFrame(cursor: number) {
+  const bytes = encoder.encode(JSON.stringify({ cursor }))
+  const out = new Uint8Array(bytes.length + 1)
+  out[0] = 0
+  out.set(bytes, 1)
+  return out
+}
+
+export function chunks(data: string) {
+  const out: string[] = []
+  for (let i = 0; i < data.length; i += REPLAY_CHUNK) out.push(data.slice(i, i + REPLAY_CHUNK))
+  return out
+}
+
+// Inbound client frames are UTF-8 text or binary; invalid UTF-8 input is dropped.
+export function decodeInput(message: string | Uint8Array | ArrayBuffer) {
+  if (typeof message === "string") return message
+  try {
+    return decoder.decode(message instanceof ArrayBuffer ? new Uint8Array(message) : message)
+  } catch {
+    return undefined
+  }
+}
diff --git a/packages/core/src/session/runner/index.ts b/packages/core/src/session/runner/index.ts
index 67a110413e7..4060cc6b044 100644
--- a/packages/core/src/session/runner/index.ts
+++ b/packages/core/src/session/runner/index.ts
@@ -1,7 +1,7 @@
 export * as SessionRunner from "./index"
 
 import type { LLMError } from "@opencode-ai/llm"
-import { Context, Effect, Schema } from "effect"
+import { Context, Effect } from "effect"
 import { SessionSchema } from "../schema"
 import type { ContextSnapshotDecodeError, MessageDecodeError } from "../error"
 import { SessionRunnerModel } from "./model"
@@ -9,20 +9,11 @@ import type { SystemContext } from "../../system-context/index"
 import type { SessionContextEpoch } from "../context-epoch"
 import type { ToolOutputStore } from "../../tool-output-store"
 
-export class StepLimitExceededError extends Schema.TaggedErrorClass<StepLimitExceededError>()(
-  "SessionRunner.StepLimitExceededError",
-  {
-    sessionID: SessionSchema.ID,
-    limit: Schema.Int,
-  },
-) {}
-
 export type RunError =
   | LLMError
   | SessionRunnerModel.Error
   | MessageDecodeError
   | ContextSnapshotDecodeError
-  | StepLimitExceededError
   | SystemContext.InitializationBlocked
   | SessionContextEpoch.AgentReplacementBlocked
   | ToolOutputStore.Error
diff --git a/packages/core/src/session/runner/llm.ts b/packages/core/src/session/runner/llm.ts
index 02a1eb3fed2..233a4aa4d82 100644
--- a/packages/core/src/session/runner/llm.ts
+++ b/packages/core/src/session/runner/llm.ts
@@ -3,6 +3,7 @@ import {
   LLMClient,
   LLMError,
   LLMEvent,
+  Message,
   SystemPart,
   isContextOverflowFailure,
   type ProviderErrorEvent,
@@ -29,10 +30,11 @@ import { SessionHistory } from "../history"
 import { SessionInput } from "../input"
 import { SessionSchema } from "../schema"
 import { SessionStore } from "../store"
-import { type RunError, Service, StepLimitExceededError } from "./index"
+import { type RunError, Service } from "./index"
 import { SessionRunnerModel } from "./model"
 import { createLLMEventPublisher } from "./publish-llm-event"
 import { toLLMMessages } from "./to-llm-message"
+import { MAX_STEPS_PROMPT } from "./max-steps"
 
 /**
  * Runs one durable coding-agent Session until it settles.
@@ -45,7 +47,7 @@ import { toLLMMessages } from "./to-llm-message"
  *   - [ ] Replace local ownership with durable multi-node ownership when clustered.
  *   - [ ] Mark busy, retrying, idle, interrupted, or terminal-failure status durably.
  *   - [ ] Honor interruption and reject stale work after runtime attachment replacement.
- *   - [x] Bound model steps.
+ *   - [x] Honor optional agent step limits.
  *   - [ ] Bound provider retries and repeated identical tool calls.
  *
  * - Runtime context assembly
@@ -80,13 +82,10 @@ import { toLLMMessages } from "./to-llm-message"
  * Durable activity recovery remains a separate future slice with an explicit retry policy.
  *
  * The current slice loads V2 history, translates it, resolves a model through a core service, and persists one
- * provider turn. Registry definitions are advertised, local tool calls are settled durably, and a
- * bounded explicit loop starts the next provider turn after local settlement.
+ * provider turn. Registry definitions are advertised, local tool calls are settled durably, and an
+ * explicit loop starts the next provider turn after local settlement. Configured agent step limits bound the loop.
  */
 
-// QUESTION: Did this exist previously, or did we add this limit? Does it make sense?
-const MAX_STEPS = 25
-
 export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
@@ -175,6 +174,7 @@ export const layer = Layer.effect(
     const runTurnAttempt = Effect.fn("SessionRunner.runTurn")(function* (
       sessionID: SessionSchema.ID,
       promotion: SessionInput.Delivery | undefined,
+      step: number,
       recoverOverflow?: typeof compaction.compactAfterOverflow,
     ) {
       const session = yield* getSession(sessionID)
@@ -214,7 +214,8 @@ export const layer = Layer.effect(
       const model = yield* models.resolve(session)
       const entries = yield* SessionHistory.entriesForRunner(db, session.id, system.baselineSeq)
       const context = entries.map((entry) => entry.message)
-      const toolMaterialization = yield* tools.materialize(agent.info?.permissions)
+      const isLastStep = agent.info?.steps !== undefined && step >= agent.info.steps
+      const toolMaterialization = isLastStep ? undefined : yield* tools.materialize(agent.info?.permissions)
       const promptCacheKey = /^ses_[0-9a-f]{64}$/.test(session.id) ? session.id.slice(4) : session.id
       const request = LLM.request({
         model,
@@ -222,8 +223,9 @@ export const layer = Layer.effect(
         system: [agent.info?.system, system.baseline]
           .filter((part): part is string => part !== undefined && part.length > 0)
           .map(SystemPart.make),
-        messages: toLLMMessages(context, model),
-        tools: toolMaterialization.definitions,
+        messages: [...toLLMMessages(context, model), ...(isLastStep ? [Message.assistant(MAX_STEPS_PROMPT)] : [])],
+        tools: toolMaterialization?.definitions ?? [],
+        toolChoice: isLastStep ? "none" : undefined,
       })
       if (yield* compaction.compactIfNeeded({ sessionID: session.id, entries, model, request }))
         return yield* Effect.die(rebuildPreparedTurn())
@@ -254,6 +256,10 @@ export const layer = Layer.effect(
             }
             yield* publish(event)
             if (event.type !== "tool-call" || event.providerExecuted) return
+            if (!toolMaterialization) {
+              yield* withPublication(publisher.failUnsettledTools("Tools are disabled after the maximum agent steps"))
+              return
+            }
             needsContinuation = true
             const assistantMessageID = yield* publisher.assistantMessageID(event.id)
             yield* Effect.uninterruptibleMask((restore) =>
@@ -340,31 +346,32 @@ export const layer = Layer.effect(
     type RunTurn = (
       sessionID: SessionSchema.ID,
       promotion: SessionInput.Delivery | undefined,
+      step: number,
     ) => Effect.Effect<boolean, RunError>
 
-    const runAfterOverflowCompaction: RunTurn = Effect.fnUntraced(function* (sessionID, promotion) {
-      return yield* runTurnAttempt(sessionID, promotion).pipe(
+    const runAfterOverflowCompaction: RunTurn = Effect.fnUntraced(function* (sessionID, promotion, step) {
+      return yield* runTurnAttempt(sessionID, promotion, step).pipe(
         Effect.catchDefect(
           Effect.fnUntraced(function* (defect) {
             if (!(defect instanceof TurnTransitionError)) return yield* Effect.die(defect)
             if (defect.transition._tag === "ContinueAfterOverflowCompaction")
               return yield* Effect.die("Post-compaction provider attempt cannot recover another overflow")
             yield* Effect.yieldNow
-            return yield* runAfterOverflowCompaction(sessionID, defect.transition.promotion)
+            return yield* runAfterOverflowCompaction(sessionID, defect.transition.promotion, step)
           }),
         ),
       )
     })
 
-    const runTurn: RunTurn = Effect.fnUntraced(function* (sessionID, promotion) {
-      return yield* runTurnAttempt(sessionID, promotion, compaction.compactAfterOverflow).pipe(
+    const runTurn: RunTurn = Effect.fnUntraced(function* (sessionID, promotion, step) {
+      return yield* runTurnAttempt(sessionID, promotion, step, compaction.compactAfterOverflow).pipe(
         Effect.catchDefect(
           Effect.fnUntraced(function* (defect) {
             if (!(defect instanceof TurnTransitionError)) return yield* Effect.die(defect)
             yield* Effect.yieldNow
             if (defect.transition._tag === "ContinueAfterOverflowCompaction")
-              return yield* runAfterOverflowCompaction(sessionID, undefined)
-            return yield* runTurn(sessionID, defect.transition.promotion)
+              return yield* runAfterOverflowCompaction(sessionID, undefined, step)
+            return yield* runTurn(sessionID, defect.transition.promotion, step)
           }),
         ),
       )
@@ -382,14 +389,11 @@ export const layer = Layer.effect(
       let openActivity = input.force === true || hasSteer || hasQueue
       while (openActivity) {
         let needsContinuation = true
-        for (let step = 0; step < MAX_STEPS; step++) {
-          needsContinuation = yield* runTurn(input.sessionID, promotion)
+        for (let step = 1; needsContinuation; step++) {
+          needsContinuation = yield* runTurn(input.sessionID, promotion, step)
           promotion = "steer"
           if (!needsContinuation) needsContinuation = yield* SessionInput.hasPending(db, input.sessionID, "steer")
-          if (!needsContinuation) break
         }
-        if (needsContinuation)
-          return yield* new StepLimitExceededError({ sessionID: input.sessionID, limit: MAX_STEPS })
         openActivity = yield* SessionInput.hasPending(db, input.sessionID, "queue")
         promotion = openActivity ? "queue" : undefined
       }
diff --git a/packages/opencode/src/session/prompt/max-steps.txt b/packages/core/src/session/runner/max-steps.ts
similarity index 90%
rename from packages/opencode/src/session/prompt/max-steps.txt
rename to packages/core/src/session/runner/max-steps.ts
index 3aefa73779c..040584ab173 100644
--- a/packages/opencode/src/session/prompt/max-steps.txt
+++ b/packages/core/src/session/runner/max-steps.ts
@@ -1,4 +1,4 @@
-CRITICAL - MAXIMUM STEPS REACHED
+export const MAX_STEPS_PROMPT = `CRITICAL - MAXIMUM STEPS REACHED
 
 The maximum number of steps allowed for this task has been reached. Tools are disabled until next user input. Respond with text only.
 
@@ -13,4 +13,4 @@ Response must include:
 - List of any remaining tasks that were not completed
 - Recommendations for what should be done next
 
-Any attempt to use tools is a critical violation. Respond with text ONLY.
\ No newline at end of file
+Any attempt to use tools is a critical violation. Respond with text ONLY.`
diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts
index 27bd15ec8d4..d067a7c6b93 100644
--- a/packages/core/src/session/runner/model.ts
+++ b/packages/core/src/session/runner/model.ts
@@ -8,6 +8,9 @@ import { Auth, type AnyRoute } from "@opencode-ai/llm/route"
 import { Context, Effect, Layer, Option, Schema } from "effect"
 import { produce } from "immer"
 import { Catalog } from "../../catalog"
+import { Credential } from "../../credential"
+import { Integration } from "../../integration"
+import { IntegrationConnection } from "../../integration/connection"
 import { ModelV2 } from "../../model"
 import { ModelRequest } from "../../model-request"
 import { PluginBoot } from "../../plugin/boot"
@@ -45,10 +48,12 @@ export class Service extends Context.Service<Service, Interface>()("@opencode/v2
 /** Test or embedding seam for supplying a model resolver directly. */
 export const layerWith = (resolve: Interface["resolve"]) => Layer.succeed(Service, Service.of({ resolve }))
 
-const apiKey = (model: ModelV2.Info, provider?: ProviderV2.Info) => {
+const apiKey = (model: ModelV2.Info, connection?: IntegrationConnection.Info, credential?: Credential.Stored) => {
+  if (credential?.value.type === "key") return Auth.value(credential.value.key)
+  if (credential?.value.type === "oauth") return Auth.value(credential.value.access)
   const value = model.request.body.apiKey ?? model.api.settings?.apiKey
   if (typeof value === "string") return Auth.value(value)
-  return provider?.enabled !== false && provider?.enabled.via === "env" ? Auth.config(provider.enabled.name) : undefined
+  return connection?.type === "env" ? Auth.config(connection.name) : undefined
 }
 
 const withDefaults = (model: ModelV2.Info, route: AnyRoute) => {
@@ -83,41 +88,54 @@ const apiName = (model: ModelV2.Info) =>
 
 export const fromCatalogModel = (
   model: ModelV2.Info,
-  provider?: ProviderV2.Info,
+  connection?: IntegrationConnection.Info,
+  credential?: Credential.Stored,
 ): Effect.Effect<Model, UnsupportedApiError> => {
-  const key = apiKey(model, provider)
-  if (model.api.type === "aisdk" && model.api.package === "@ai-sdk/openai") {
+  const resolved =
+    credential?.value.metadata === undefined
+      ? model
+      : produce(model, (draft) => {
+          Object.assign(draft.request.body, credential.value.metadata)
+          // kilocode_change start - Kilo Gateway consumes the migrated OAuth account as its organization route
+          if (credential.value.type === "oauth" && credential.value.metadata?.accountID) {
+            draft.request.body.kilocodeOrganizationId = credential.value.metadata.accountID
+            delete draft.request.body.accountID
+          }
+          // kilocode_change end
+        })
+  const key = apiKey(resolved, connection, credential)
+  if (resolved.api.type === "aisdk" && resolved.api.package === "@ai-sdk/openai") {
     return Effect.succeed(
-      withDefaults(model, OpenAIResponses.route)
+      withDefaults(resolved, OpenAIResponses.route)
         .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) })
-        .model({ id: model.api.id }),
+        .model({ id: resolved.api.id }),
     )
   }
-  if (model.api.type === "aisdk" && model.api.package === "@ai-sdk/anthropic") {
+  if (resolved.api.type === "aisdk" && resolved.api.package === "@ai-sdk/anthropic") {
     return Effect.succeed(
-      withDefaults(model, AnthropicMessages.route)
+      withDefaults(resolved, AnthropicMessages.route)
         .with({ auth: key === undefined ? Auth.none : Auth.header("x-api-key", key) })
-        .model({ id: model.api.id }),
+        .model({ id: resolved.api.id }),
     )
   }
-  if (model.api.type === "aisdk" && model.api.package === "@ai-sdk/openai-compatible" && model.api.url) {
+  if (resolved.api.type === "aisdk" && resolved.api.package === "@ai-sdk/openai-compatible" && resolved.api.url) {
     return Effect.succeed(
-      withDefaults(model, OpenAICompatibleChat.route)
+      withDefaults(resolved, OpenAICompatibleChat.route)
         .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) })
-        .model({ id: model.api.id }),
+        .model({ id: resolved.api.id }),
     )
   }
   return Effect.fail(
     new UnsupportedApiError({
-      providerID: model.providerID,
-      modelID: model.id,
-      api: apiName(model),
+      providerID: resolved.providerID,
+      modelID: resolved.id,
+      api: apiName(resolved),
     }),
   )
 }
 
-export const resolve = (session: SessionSchema.Info, model: ModelV2.Info, provider?: ProviderV2.Info) =>
-  fromCatalogModel(withVariant(model, session.model?.variant), provider)
+export const resolve = (session: SessionSchema.Info, model: ModelV2.Info) =>
+  fromCatalogModel(withVariant(model, session.model?.variant))
 
 export const supported = (model: ModelV2.Info) =>
   model.api.type === "aisdk" &&
@@ -130,6 +148,8 @@ export const locationLayer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const catalog = yield* Catalog.Service
+    const credentials = yield* Credential.Service
+    const integrations = yield* Integration.Service
     const boot = yield* PluginBoot.Service
     return Service.of({
       resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session) {
@@ -140,7 +160,12 @@ export const locationLayer = Layer.effect(
           : (Option.getOrUndefined((yield* catalog.model.default()).pipe(Option.filter(supported))) ??
             (yield* catalog.model.available()).find(supported))
         if (!selected) return yield* new ModelNotSelectedError({ sessionID: session.id })
-        return yield* resolve(session, selected, yield* catalog.provider.get(selected.providerID))
+        const connection = yield* integrations.connection.forIntegration(Integration.ID.make(selected.providerID))
+        return yield* fromCatalogModel(
+          withVariant(selected, session.model?.variant),
+          connection,
+          connection?.type === "credential" ? yield* credentials.get(connection.id) : undefined,
+        )
       }),
     })
   }),
diff --git a/packages/opencode/src/shell/shell.ts b/packages/core/src/shell.ts
similarity index 80%
rename from packages/opencode/src/shell/shell.ts
rename to packages/core/src/shell.ts
index f7e83271633..f92906aebee 100644
--- a/packages/opencode/src/shell/shell.ts
+++ b/packages/core/src/shell.ts
@@ -1,11 +1,14 @@
-import { Flag } from "@opencode-ai/core/flag/flag"
-import * as PowerShell from "@/kilocode/shell/shell" // kilocode_change - PowerShell args
-import { lazy } from "@/util/lazy"
-import { Filesystem } from "@/util/filesystem"
-import { which } from "@opencode-ai/core/util/which"
+export * as Shell from "./shell"
+
 import path from "path"
 import { spawn, type ChildProcess } from "child_process"
+import { readFile } from "fs/promises"
+import { statSync } from "fs"
 import { setTimeout as sleep } from "node:timers/promises"
+import { Flag } from "./flag/flag"
+import { FSUtil } from "./fs-util"
+import { which } from "./util/which"
+import { PowerShell } from "./kilocode/powershell" // kilocode_change
 
 const SIGKILL_TIMEOUT_MS = 200
 const META: Record<string, { deny?: boolean; login?: boolean; posix?: boolean; ps?: boolean }> = {
@@ -48,7 +51,7 @@ export async function killTree(proc: ChildProcess, opts?: { exited?: () => boole
     if (!opts?.exited?.()) {
       process.kill(-pid, "SIGKILL")
     }
-  } catch (_e) {
+  } catch {
     proc.kill("SIGTERM")
     await sleep(SIGKILL_TIMEOUT_MS)
     if (!opts?.exited?.()) {
@@ -57,9 +60,13 @@ export async function killTree(proc: ChildProcess, opts?: { exited?: () => boole
   }
 }
 
+function stat(file: string) {
+  return statSync(file, { throwIfNoEntry: false }) ?? undefined
+}
+
 function full(file: string) {
   if (process.platform !== "win32") return file
-  const shell = Filesystem.windowsPath(file)
+  const shell = FSUtil.windowsPath(file)
   if (path.win32.dirname(shell) !== ".") {
     if (shell.startsWith("/") && name(shell) === "bash") return gitbash() || shell
     return shell
@@ -77,13 +84,13 @@ function ok(file: string) {
 }
 
 function rooted(file: string) {
-  return path.isAbsolute(Filesystem.windowsPath(file))
+  return path.isAbsolute(FSUtil.windowsPath(file))
 }
 
 function resolve(file: string) {
   const shell = full(file)
   if (rooted(shell)) {
-    if (Filesystem.stat(shell)?.isFile()) return shell
+    if (stat(shell)?.isFile()) return shell
     return
   }
   return which(shell) ?? undefined
@@ -100,7 +107,7 @@ function win() {
 }
 
 async function unix() {
-  const text = await Filesystem.readText("/etc/shells").catch(() => "")
+  const text = await readFile("/etc/shells", "utf8").catch(() => "")
   if (text) return Array.from(new Set(text.split("\n").filter((line) => line.trim() && !line.startsWith("#"))))
   return ["/bin/bash", "/bin/zsh", "/bin/sh"]
 }
@@ -110,7 +117,7 @@ function select(file: string | undefined, opts?: { acceptable?: boolean }) {
     const shell = resolve(file)
     if (shell) return shell
   }
-  if (process.platform === "win32") return win()[0]!
+  if (process.platform === "win32") return win()[0]
   return fallback()
 }
 
@@ -120,7 +127,7 @@ export function gitbash() {
   const git = which("git")
   if (!git) return
   const file = path.join(git, "..", "..", "bin", "bash.exe")
-  if (Filesystem.stat(file)?.size) return file
+  if (stat(file)?.size) return file
 }
 
 function fallback() {
@@ -131,7 +138,7 @@ function fallback() {
 }
 
 export function name(file: string) {
-  if (process.platform === "win32") return path.win32.parse(Filesystem.windowsPath(file)).name.toLowerCase()
+  if (process.platform === "win32") return path.win32.parse(FSUtil.windowsPath(file)).name.toLowerCase()
   return path.basename(file).toLowerCase()
 }
 
@@ -189,28 +196,32 @@ export function args(file: string, command: string, cwd: string) {
     ]
   }
   if (n === "cmd") return ["/c", command]
-  if (ps(file)) return PowerShell.args(command) // kilocode_change - PowerShell args
+  if (ps(file)) return PowerShell.args(command) // kilocode_change - preserve UTF-8 and script prologues
   return ["-c", command]
 }
 
-const defaultPreferred = lazy(() => select(process.env.SHELL))
-const defaultAcceptable = lazy(() => select(process.env.SHELL, { acceptable: true }))
+let defaultPreferred: string | undefined
+let defaultAcceptable: string | undefined
 
 export function preferred(configShell?: string) {
   if (configShell) return select(configShell)
-  return defaultPreferred()
+  defaultPreferred ??= select(process.env.SHELL)
+  return defaultPreferred
+}
+preferred.reset = () => {
+  defaultPreferred = undefined
 }
-preferred.reset = () => defaultPreferred.reset()
 
 export function acceptable(configShell?: string) {
   if (configShell) return select(configShell, { acceptable: true })
-  return defaultAcceptable()
+  defaultAcceptable ??= select(process.env.SHELL, { acceptable: true })
+  return defaultAcceptable
+}
+acceptable.reset = () => {
+  defaultAcceptable = undefined
 }
-acceptable.reset = () => defaultAcceptable.reset()
 
 export async function list(): Promise<Item[]> {
   const shells = process.platform === "win32" ? win() : await unix()
   return shells.filter((s) => resolve(s)).map(info)
 }
-
-export * as Shell from "./shell"
diff --git a/packages/core/sst-env.d.ts b/packages/core/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/core/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/core/test/catalog.test.ts b/packages/core/test/catalog.test.ts
index 9b1cf89637d..77a18e79aef 100644
--- a/packages/core/test/catalog.test.ts
+++ b/packages/core/test/catalog.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect } from "bun:test"
-import { DateTime, Effect, Layer, Option } from "effect"
+import { DateTime, Effect, Fiber, Layer, Option, Stream } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { Integration } from "@opencode-ai/core/integration"
 import { Credential } from "@opencode-ai/core/credential"
@@ -25,47 +25,29 @@ const it = testEffect(
     Layer.provideMerge(
       Layer.mock(Credential.Service)({
         all: () => Effect.succeed([]),
+        list: () => Effect.succeed([]),
       }),
     ),
   ),
 )
 
 describe("CatalogV2", () => {
-  it.effect("projects Kilo organization routing from OAuth credentials", () => {
-    const integrationID = Integration.ID.make("kilocode")
-    const credential = new Credential.Stored({
-      id: Credential.ID.create(),
-      integrationID,
-      label: "Organization",
-      value: new Credential.OAuth({
-        type: "oauth",
-        methodID: Integration.MethodID.make("oauth"),
-        access: "access",
-        refresh: "refresh",
-        expires: 1,
-        metadata: { accountID: "organization" },
-      }),
-    })
-    const layer = Catalog.locationLayer.pipe(
-      Layer.fresh,
-      Layer.provideMerge(EventV2.defaultLayer),
-      Layer.provideMerge(locationLayer),
-      Layer.provideMerge(
-        Layer.mock(Credential.Service)({ all: () => Effect.succeed([credential]) }),
-      ),
-    )
-
-    return Effect.gen(function* () {
+  it.effect("publishes an updated event after catalog changes", () =>
+    Effect.gen(function* () {
       const catalog = yield* Catalog.Service
-      const transform = yield* catalog.transform()
-      yield* transform((editor) => editor.provider.update(ProviderV2.ID.make("kilocode"), () => {}))
-      expect(yield* catalog.provider.get(ProviderV2.ID.make("kilocode"))).toMatchObject({
-        request: { body: { apiKey: "access", kilocodeOrganizationId: "organization" } },
-      })
-    }).pipe(Effect.provide(layer))
-  })
+      const events = yield* EventV2.Service
+      const updated = yield* events
+        .subscribe(Catalog.Event.Updated)
+        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+      yield* Effect.yieldNow
 
-  it.effect("projects active credentials without rebuilding catalog state", () => {
+      yield* (yield* catalog.transform())((editor) => editor.provider.update(ProviderV2.ID.make("test"), () => {}))
+
+      expect((yield* Fiber.join(updated)).length).toBe(1)
+    }),
+  )
+
+  it.effect("derives availability from active credentials without changing provider state", () => {
     const integrationID = Integration.ID.make("test")
     const first = {
       id: Credential.ID.create(),
@@ -87,6 +69,7 @@ describe("CatalogV2", () => {
       Layer.provideMerge(
         Layer.mock(Credential.Service)({
           all: () => Effect.sync(() => [active]),
+          list: () => Effect.sync(() => [active]),
         }),
       ),
     )
@@ -96,18 +79,44 @@ describe("CatalogV2", () => {
       const transform = yield* catalog.transform()
       yield* transform((editor) => editor.provider.update(ProviderV2.ID.make("test"), () => {}))
 
-      expect(yield* catalog.provider.get(ProviderV2.ID.make("test"))).toMatchObject({
-        enabled: { via: "credential", credentialID: first.id },
-        request: { body: { apiKey: "first", tenant: "one" } },
-      })
+      expect((yield* catalog.provider.available()).map((provider) => provider.id)).toEqual([ProviderV2.ID.make("test")])
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("test"))).request.body).toEqual({})
       active = second
-      expect(yield* catalog.provider.get(ProviderV2.ID.make("test"))).toMatchObject({
-        enabled: { via: "credential", credentialID: second.id },
-        request: { body: { apiKey: "second", tenant: "two" } },
-      })
+      expect((yield* catalog.provider.available()).map((provider) => provider.id)).toEqual([ProviderV2.ID.make("test")])
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("test"))).request.body).toEqual({})
     }).pipe(Effect.provide(layer))
   })
 
+  it.effect("projects environment connections without a catalog plugin", () =>
+    Effect.acquireUseRelease(
+      Effect.sync(() => {
+        const previous = process.env.CATALOG_TEST_API_KEY
+        process.env.CATALOG_TEST_API_KEY = "secret"
+        return previous
+      }),
+      () =>
+        Effect.gen(function* () {
+          const catalog = yield* Catalog.Service
+          const integrations = yield* Integration.Service
+          const providerID = ProviderV2.ID.make("test")
+          yield* integrations.update((editor) =>
+            editor.method.update({
+              integrationID: Integration.ID.make(providerID),
+              method: { type: "env", names: ["CATALOG_TEST_API_KEY"] },
+            }),
+          )
+          yield* (yield* catalog.transform())((editor) => editor.provider.update(providerID, () => {}))
+
+          expect((yield* catalog.provider.available()).map((provider) => provider.id)).toContain(providerID)
+        }),
+      (previous) =>
+        Effect.sync(() => {
+          if (previous === undefined) delete process.env.CATALOG_TEST_API_KEY
+          else process.env.CATALOG_TEST_API_KEY = previous
+        }),
+    ),
+  )
+
   it.effect("normalizes provider baseURL into api url", () =>
     Effect.gen(function* () {
       const catalog = yield* Catalog.Service
@@ -326,9 +335,7 @@ describe("CatalogV2", () => {
       const transform = yield* catalog.transform()
 
       yield* transform((catalog) => {
-        catalog.provider.update(providerID, (provider) => {
-          provider.enabled = { via: "custom", data: {} }
-        })
+        catalog.provider.update(providerID, () => {})
         catalog.model.update(providerID, ModelV2.ID.make("old"), (model) => {
           model.time.released = DateTime.makeUnsafe(1000)
         })
@@ -350,9 +357,7 @@ describe("CatalogV2", () => {
       const transform = yield* catalog.transform()
 
       const models = (catalog: Catalog.Editor) => {
-        catalog.provider.update(providerID, (provider) => {
-          provider.enabled = { via: "custom", data: {} }
-        })
+        catalog.provider.update(providerID, () => {})
         catalog.model.update(providerID, old, (model) => {
           model.time.released = DateTime.makeUnsafe(1000)
         })
@@ -383,12 +388,10 @@ describe("CatalogV2", () => {
 
       yield* transform((catalog) => {
         catalog.provider.update(disabledProvider, (provider) => {
-          provider.enabled = false
+          provider.disabled = true
         })
         catalog.model.update(disabledProvider, disabledModel, () => {})
-        catalog.provider.update(enabledProvider, (provider) => {
-          provider.enabled = { via: "custom", data: {} }
-        })
+        catalog.provider.update(enabledProvider, () => {})
         catalog.model.update(enabledProvider, fallbackModel, () => {})
         catalog.model.default.set(disabledProvider, disabledModel)
       })
diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts
index 6a2510bab8c..a2ecc9954b3 100644
--- a/packages/core/test/config/provider.test.ts
+++ b/packages/core/test/config/provider.test.ts
@@ -3,10 +3,11 @@ import { Effect, Option, Schema } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigProviderPlugin } from "@opencode-ai/core/config/plugin/provider"
+import { Integration } from "@opencode-ai/core/integration"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { ProviderV2 } from "@opencode-ai/core/provider"
-import { it } from "../plugin/provider-helper"
+import { it, withEnv } from "../plugin/provider-helper"
 
 function request(headers: Record<string, string>, variant?: string) {
   return {
@@ -21,6 +22,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
   it.effect("partitions existing model variant bodies without changing config shape", () =>
     Effect.gen(function* () {
       const catalog = yield* Catalog.Service
+      const integrations = yield* Integration.Service
       const plugin = yield* PluginV2.Service
       const providerID = ProviderV2.ID.opencode
       const modelID = ModelV2.ID.make("alpha-gpt-next")
@@ -59,6 +61,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
         effect: ConfigProviderPlugin.Plugin.effect.pipe(
           Effect.provideService(Config.Service, config),
           Effect.provideService(Catalog.Service, catalog),
+          Effect.provideService(Integration.Service, integrations),
         ),
       })
 
@@ -80,6 +83,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
   it.effect("uses the effective provider package across layered config", () =>
     Effect.gen(function* () {
       const catalog = yield* Catalog.Service
+      const integrations = yield* Integration.Service
       const plugin = yield* PluginV2.Service
       const providerID = ProviderV2.ID.opencode
       const modelID = ModelV2.ID.make("alpha-gpt-next")
@@ -118,6 +122,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
         effect: ConfigProviderPlugin.Plugin.effect.pipe(
           Effect.provideService(Config.Service, config),
           Effect.provideService(Catalog.Service, catalog),
+          Effect.provideService(Integration.Service, integrations),
         ),
       })
 
@@ -131,118 +136,126 @@ describe("ConfigProviderPlugin.Plugin", () => {
   )
 
   it.effect("loads configured providers and applies later model overrides", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      const plugin = yield* PluginV2.Service
-      const providerID = ProviderV2.ID.make("custom")
-      const modelID = ModelV2.ID.make("chat")
-      const config = Config.Service.of({
-        entries: () =>
-          Effect.succeed([
-            new Config.Document({
-              type: "document",
-              info: decode({
-                model: "custom/first",
-                providers: {
-                  custom: {
-                    name: "Configured",
-                    env: ["CUSTOM_API_KEY"],
-                    api: { type: "native", settings: {} },
-                    request: request({ first: "first", shared: "first" }),
-                    models: {
-                      chat: {
-                        name: "First",
-                        capabilities: { tools: true, input: ["text"], output: ["text"] },
-                        disabled: true,
-                        limit: { context: 100, output: 50 },
-                        cost: { input: 1, output: 2 },
-                        request: request({ first: "first", shared: "first" }, "retained"),
-                        variants: [
-                          {
-                            id: "fast",
-                            headers: { first: "first", shared: "first" },
-                          },
-                        ],
+    withEnv({ CUSTOM_API_KEY: "secret" }, () =>
+      Effect.gen(function* () {
+        const catalog = yield* Catalog.Service
+        const integrations = yield* Integration.Service
+        const plugin = yield* PluginV2.Service
+        const providerID = ProviderV2.ID.make("custom")
+        const modelID = ModelV2.ID.make("chat")
+        const config = Config.Service.of({
+          entries: () =>
+            Effect.succeed([
+              new Config.Document({
+                type: "document",
+                info: decode({
+                  model: "custom/first",
+                  providers: {
+                    custom: {
+                      name: "Configured",
+                      env: ["CUSTOM_API_KEY"],
+                      api: { type: "native", settings: {} },
+                      request: request({ first: "first", shared: "first" }),
+                      models: {
+                        chat: {
+                          name: "First",
+                          capabilities: { tools: true, input: ["text"], output: ["text"] },
+                          disabled: true,
+                          limit: { context: 100, output: 50 },
+                          cost: { input: 1, output: 2 },
+                          request: request({ first: "first", shared: "first" }, "retained"),
+                          variants: [
+                            {
+                              id: "fast",
+                              headers: { first: "first", shared: "first" },
+                            },
+                          ],
+                        },
                       },
                     },
                   },
-                },
+                }),
               }),
-            }),
-            new Config.Document({
-              type: "document",
-              info: decode({
-                model: "custom/default",
-                providers: {
-                  custom: {
-                    api: { type: "aisdk", package: "custom-sdk", url: "https://example.test" },
-                    request: request({ last: "last", shared: "last" }),
-                    models: {
-                      default: {
-                        name: "Default",
-                      },
-                      chat: {
-                        api: { id: "api-chat" },
-                        name: "Last",
-                        limit: { output: 75 },
-                        request: request({ last: "last", shared: "last" }),
-                        variants: [
-                          {
-                            id: "fast",
-                            headers: { last: "last", shared: "last" },
-                          },
-                          {
-                            id: "slow",
-                            headers: { slow: "slow" },
-                          },
-                        ],
+              new Config.Document({
+                type: "document",
+                info: decode({
+                  model: "custom/default",
+                  providers: {
+                    custom: {
+                      api: { type: "aisdk", package: "custom-sdk", url: "https://example.test" },
+                      request: request({ last: "last", shared: "last" }),
+                      models: {
+                        default: {
+                          name: "Default",
+                        },
+                        chat: {
+                          api: { id: "api-chat" },
+                          name: "Last",
+                          limit: { output: 75 },
+                          request: request({ last: "last", shared: "last" }),
+                          variants: [
+                            {
+                              id: "fast",
+                              headers: { last: "last", shared: "last" },
+                            },
+                            {
+                              id: "slow",
+                              headers: { slow: "slow" },
+                            },
+                          ],
+                        },
                       },
                     },
                   },
-                },
+                }),
               }),
-            }),
-            new Config.Document({
-              type: "document",
-              info: decode({
-                providers: {
-                  custom: { name: "Renamed" },
-                },
+              new Config.Document({
+                type: "document",
+                info: decode({
+                  providers: {
+                    custom: { name: "Renamed" },
+                  },
+                }),
               }),
-            }),
-          ]),
-      })
+            ]),
+        })
 
-      yield* plugin.add({
-        ...ConfigProviderPlugin.Plugin,
-        effect: ConfigProviderPlugin.Plugin.effect.pipe(
-          Effect.provideService(Config.Service, config),
-          Effect.provideService(Catalog.Service, catalog),
-        ),
-      })
+        yield* plugin.add({
+          ...ConfigProviderPlugin.Plugin,
+          effect: ConfigProviderPlugin.Plugin.effect.pipe(
+            Effect.provideService(Config.Service, config),
+            Effect.provideService(Catalog.Service, catalog),
+            Effect.provideService(Integration.Service, integrations),
+          ),
+        })
 
-      const provider = yield* catalog.provider.get(providerID)
-      const model = yield* catalog.model.get(providerID, modelID)
-      expect(Option.getOrUndefined(yield* catalog.model.default())?.id).toBe(ModelV2.ID.make("default"))
-      expect(provider.name).toBe("Renamed")
-      expect(provider.env).toEqual(["CUSTOM_API_KEY"])
-      expect(provider.enabled).toEqual({ via: "custom", data: {} })
-      expect(provider.api).toEqual({ type: "aisdk", package: "custom-sdk", url: "https://example.test" })
-      expect(provider.request.headers).toEqual({ first: "first", shared: "last", last: "last" })
-      expect(model.api.id).toBe(ModelV2.ID.make("api-chat"))
-      expect(model.name).toBe("Last")
-      expect(model.capabilities).toEqual({ tools: true, input: ["text"], output: ["text"] })
-      expect(model.enabled).toBe(false)
-      expect(model.limit).toEqual({ context: 100, output: 75 })
-      expect(model.cost).toEqual([{ input: 1, output: 2, cache: { read: 0, write: 0 }, tier: undefined }])
-      expect(model.request.headers).toEqual({ first: "first", shared: "last", last: "last" })
-      expect(model.request.variant).toBe("retained")
-      expect(model.variants.map((variant) => variant.id)).toEqual([
-        ModelV2.VariantID.make("fast"),
-        ModelV2.VariantID.make("slow"),
-      ])
-      expect(model.variants[0]?.headers).toEqual({ first: "first", shared: "last", last: "last" })
-      expect(model.variants[1]?.headers).toEqual({ slow: "slow" })
-    }),
+        const provider = yield* catalog.provider.get(providerID)
+        const model = yield* catalog.model.get(providerID, modelID)
+        expect(Option.getOrUndefined(yield* catalog.model.default())?.id).toBe(ModelV2.ID.make("default"))
+        expect(provider.name).toBe("Renamed")
+        expect((yield* integrations.get(Integration.ID.make("custom")))?.methods).toContainEqual({
+          type: "env",
+          names: ["CUSTOM_API_KEY"],
+        })
+        expect((yield* integrations.get(Integration.ID.make("custom")))?.name).toBe("Renamed")
+        expect(provider.disabled).toBeUndefined()
+        expect(provider.api).toEqual({ type: "aisdk", package: "custom-sdk", url: "https://example.test" })
+        expect(provider.request.headers).toEqual({ first: "first", shared: "last", last: "last" })
+        expect(model.api.id).toBe(ModelV2.ID.make("api-chat"))
+        expect(model.name).toBe("Last")
+        expect(model.capabilities).toEqual({ tools: true, input: ["text"], output: ["text"] })
+        expect(model.enabled).toBe(false)
+        expect(model.limit).toEqual({ context: 100, output: 75 })
+        expect(model.cost).toEqual([{ input: 1, output: 2, cache: { read: 0, write: 0 }, tier: undefined }])
+        expect(model.request.headers).toEqual({ first: "first", shared: "last", last: "last" })
+        expect(model.request.variant).toBe("retained")
+        expect(model.variants.map((variant) => variant.id)).toEqual([
+          ModelV2.VariantID.make("fast"),
+          ModelV2.VariantID.make("slow"),
+        ])
+        expect(model.variants[0]?.headers).toEqual({ first: "first", shared: "last", last: "last" })
+        expect(model.variants[1]?.headers).toEqual({ slow: "slow" })
+      }),
+    ),
   )
 })
diff --git a/packages/core/test/integration.test.ts b/packages/core/test/integration.test.ts
index fa05e23d95e..ca4362c6058 100644
--- a/packages/core/test/integration.test.ts
+++ b/packages/core/test/integration.test.ts
@@ -1,8 +1,7 @@
 import { describe, expect } from "bun:test"
-import { Duration, Effect, Exit, Layer, Scope } from "effect"
+import { Duration, Effect, Exit, Fiber, Layer, Scope, Stream } from "effect"
 import * as TestClock from "effect/testing/TestClock"
 import { Integration } from "@opencode-ai/core/integration"
-import { IntegrationConnection } from "@opencode-ai/core/integration/connection"
 import { Credential } from "@opencode-ai/core/credential"
 import { EventV2 } from "@opencode-ai/core/event"
 import { it } from "./lib/effect"
@@ -25,7 +24,7 @@ function connectionLayer(
   }>,
 ) {
   return Integration.locationLayer.pipe(
-    Layer.provide(EventV2.defaultLayer),
+    Layer.provideMerge(EventV2.defaultLayer),
     Layer.provide(
       Layer.mock(Credential.Service)({
         create: (input) =>
@@ -103,7 +102,7 @@ describe("Integration", () => {
         .update((editor) =>
           editor.method.update({
             integrationID,
-            method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+            method: { id: methodID, type: "oauth", label: "ChatGPT" },
             authorize,
           }),
         )
@@ -117,7 +116,7 @@ describe("Integration", () => {
           ])
           editor.method.update({
             integrationID,
-            method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT Override" }),
+            method: { id: methodID, type: "oauth", label: "ChatGPT Override" },
             authorize,
           })
         })
@@ -140,15 +139,20 @@ describe("Integration", () => {
     }> = []
     return Effect.gen(function* () {
       const integrations = yield* Integration.Service
+      const events = yield* EventV2.Service
       const integrationID = Integration.ID.make("openai")
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.KeyMethod({ type: "key", label: "API key" }),
+          method: { type: "key", label: "API key" },
         }),
       )
+      const updated = yield* events
+        .subscribe(Integration.Event.Updated)
+        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+      yield* Effect.yieldNow
 
-      yield* integrations.connect.key({
+      yield* integrations.connection.key({
         integrationID,
         key: "secret",
         label: "Work",
@@ -161,6 +165,7 @@ describe("Integration", () => {
           value: new Credential.Key({ type: "key", key: "secret" }),
         },
       ])
+      expect((yield* Fiber.join(updated)).length).toBe(1)
     }).pipe(Effect.provide(connectionLayer(created)))
   })
 
@@ -177,7 +182,7 @@ describe("Integration", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          method: { id: methodID, type: "oauth", label: "ChatGPT" },
           authorize: () =>
             Effect.succeed({
               mode: "code" as const,
@@ -198,7 +203,7 @@ describe("Integration", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({
+      const attempt = yield* integrations.connection.oauth({
         integrationID,
         methodID,
         inputs: {},
@@ -236,7 +241,7 @@ describe("Integration", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          method: { id: methodID, type: "oauth", label: "ChatGPT" },
           authorize: () =>
             Effect.addFinalizer(() => Effect.sync(() => (closed = true))).pipe(
               Effect.as({
@@ -249,7 +254,7 @@ describe("Integration", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
       expect(yield* integrations.attempt.complete({ attemptID: attempt.attemptID }).pipe(Effect.flip)).toBeInstanceOf(
         Integration.CodeRequiredError,
       )
@@ -273,7 +278,7 @@ describe("Integration", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "Browser" }),
+          method: { id: methodID, type: "oauth", label: "Browser" },
           authorize: () =>
             Effect.succeed({
               mode: "auto" as const,
@@ -286,7 +291,7 @@ describe("Integration", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
       yield* Effect.yieldNow
       expect(yield* integrations.attempt.status(attempt.attemptID)).toEqual({
         status: "complete",
@@ -310,7 +315,7 @@ describe("Integration", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "Browser" }),
+          method: { id: methodID, type: "oauth", label: "Browser" },
           authorize: () =>
             Effect.addFinalizer(() => Effect.sync(() => (closed = true))).pipe(
               Effect.as({
@@ -323,7 +328,7 @@ describe("Integration", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
       expect(attempt.time.expires - attempt.time.created).toBe(Duration.toMillis(Duration.minutes(10)))
       yield* TestClock.adjust(Duration.minutes(10))
       yield* Effect.yieldNow
@@ -373,23 +378,28 @@ describe("Integration", () => {
           yield* integrations.update((editor) =>
             editor.method.update({
               integrationID,
-              method: new Integration.EnvMethod({
+              method: {
                 type: "env",
                 names: ["INTEGRATION_TEST_ACME_KEY", "INTEGRATION_TEST_ACME_MISSING"],
-              }),
+              },
             }),
           )
 
           // Stored credentials and detected env vars appear as connections.
           expect((yield* integrations.get(integrationID))?.connections).toEqual([
-            new IntegrationConnection.CredentialInfo({ type: "credential", id: rows[0]!.id, label: "Work" }),
-            new IntegrationConnection.CredentialInfo({
+            { type: "credential", id: rows[0]!.id, label: "Work" },
+            {
               type: "credential",
               id: rows[1]!.id,
               label: "Personal",
-            }),
-            new IntegrationConnection.EnvInfo({ type: "env", name: "INTEGRATION_TEST_ACME_KEY" }),
+            },
+            { type: "env", name: "INTEGRATION_TEST_ACME_KEY" },
           ])
+          expect(yield* integrations.connection.forIntegration(integrationID)).toEqual({
+            type: "credential",
+            id: rows[1]!.id,
+            label: "Personal",
+          })
         }).pipe(Effect.provide(projectionLayer)),
       (previous) =>
         Effect.sync(() => {
diff --git a/packages/core/test/kilocode/integration-settlement.test.ts b/packages/core/test/kilocode/integration-settlement.test.ts
index 0eae2b2aad9..9085d2526fb 100644
--- a/packages/core/test/kilocode/integration-settlement.test.ts
+++ b/packages/core/test/kilocode/integration-settlement.test.ts
@@ -65,7 +65,7 @@ describe("Integration settlement guards", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "Browser" }),
+          method: { id: methodID, type: "oauth", label: "Browser" },
           authorize: () =>
             Effect.succeed({
               mode: "auto" as const,
@@ -78,7 +78,7 @@ describe("Integration settlement guards", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
       yield* Effect.yieldNow
       expect(yield* integrations.attempt.status(attempt.attemptID)).toMatchObject({
         status: "failed",
@@ -104,7 +104,7 @@ describe("Integration settlement guards", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          method: { id: methodID, type: "oauth", label: "ChatGPT" },
           authorize: () =>
             Effect.succeed({
               mode: "code" as const,
@@ -118,10 +118,10 @@ describe("Integration settlement guards", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
-      const exit = yield* integrations.attempt.complete({ attemptID: attempt.attemptID, code: "1234" }).pipe(
-        Effect.exit,
-      )
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
+      const exit = yield* integrations.attempt
+        .complete({ attemptID: attempt.attemptID, code: "1234" })
+        .pipe(Effect.exit)
       expect(Exit.isFailure(exit)).toBe(true)
       if (Exit.isFailure(exit)) expect(Cause.pretty(exit.cause)).toContain("database unavailable")
       expect(yield* integrations.attempt.status(attempt.attemptID)).toMatchObject({
@@ -165,7 +165,7 @@ describe("Integration settlement guards", () => {
         yield* integrations.update((editor) =>
           editor.method.update({
             integrationID,
-            method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+            method: { id: methodID, type: "oauth", label: "ChatGPT" },
             authorize: () =>
               Effect.succeed({
                 mode: "code" as const,
@@ -179,7 +179,7 @@ describe("Integration settlement guards", () => {
           }),
         )
 
-        const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+        const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
         const fiber = yield* integrations.attempt
           .complete({ attemptID: attempt.attemptID, code: "1234" })
           .pipe(Effect.forkScoped)
@@ -212,7 +212,7 @@ describe("Integration settlement guards", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          method: { id: methodID, type: "oauth", label: "ChatGPT" },
           authorize: () =>
             Effect.succeed({
               mode: "code" as const,
@@ -229,7 +229,7 @@ describe("Integration settlement guards", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
       const fiber = yield* integrations.attempt
         .complete({ attemptID: attempt.attemptID, code: "1234" })
         .pipe(Effect.forkScoped)
@@ -253,7 +253,7 @@ describe("Integration settlement guards", () => {
       yield* integrations.update((editor) =>
         editor.method.update({
           integrationID,
-          method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          method: { id: methodID, type: "oauth", label: "ChatGPT" },
           authorize: () =>
             Effect.addFinalizer(() => Effect.sync(() => (state.closed = true))).pipe(
               Effect.as({
@@ -266,7 +266,7 @@ describe("Integration settlement guards", () => {
         }),
       )
 
-      const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+      const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
       const fiber = yield* integrations.attempt
         .complete({ attemptID: attempt.attemptID, code: "1234" })
         .pipe(Effect.exit, Effect.forkScoped)
@@ -301,7 +301,7 @@ describe("Integration settlement guards", () => {
         yield* integrations.update((editor) =>
           editor.method.update({
             integrationID,
-            method: new Integration.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+            method: { id: methodID, type: "oauth", label: "ChatGPT" },
             authorize: () =>
               Effect.addFinalizer(() => Effect.sync(() => (closed = true))).pipe(
                 Effect.as({
@@ -310,14 +310,20 @@ describe("Integration settlement guards", () => {
                   instructions: "Paste the code",
                   callback: () =>
                     Effect.succeed(
-                      new Credential.OAuth({ type: "oauth", methodID, access: "access", refresh: "refresh", expires: 1 }),
+                      new Credential.OAuth({
+                        type: "oauth",
+                        methodID,
+                        access: "access",
+                        refresh: "refresh",
+                        expires: 1,
+                      }),
                     ),
                 }),
               ),
           }),
         )
 
-        const attempt = yield* integrations.connect.oauth({ integrationID, methodID, inputs: {} })
+        const attempt = yield* integrations.connection.oauth({ integrationID, methodID, inputs: {} })
         const fiber = yield* integrations.attempt
           .complete({ attemptID: attempt.attemptID, code: "1234" })
           .pipe(Effect.exit, Effect.forkScoped)
diff --git a/packages/core/test/kilocode/provider-isolation.test.ts b/packages/core/test/kilocode/provider-isolation.test.ts
index 57d010755d7..c2d2d498bc3 100644
--- a/packages/core/test/kilocode/provider-isolation.test.ts
+++ b/packages/core/test/kilocode/provider-isolation.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
+import { Integration } from "@opencode-ai/core/integration"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { LLMGatewayPlugin } from "@opencode-ai/core/plugin/provider/llmgateway"
@@ -16,7 +17,12 @@ describe("provider attribution isolation", () => {
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
       const catalog = yield* Catalog.Service
-      for (const plugin of [LLMGatewayPlugin, NvidiaPlugin, OpenRouterPlugin, VercelPlugin, ZenmuxPlugin]) {
+      const integrations = yield* Integration.Service
+      yield* plugins.add({
+        ...LLMGatewayPlugin,
+        effect: LLMGatewayPlugin.effect.pipe(Effect.provideService(Integration.Service, integrations)),
+      })
+      for (const plugin of [NvidiaPlugin, OpenRouterPlugin, VercelPlugin, ZenmuxPlugin]) {
         yield* plugins.add(plugin)
       }
 
@@ -24,7 +30,6 @@ describe("provider attribution isolation", () => {
       yield* transform((catalog) => {
         const items = [
           provider("custom-llmgateway", {
-            enabled: { via: "env", name: "CUSTOM_LLMGATEWAY_API_KEY" },
             api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.llmgateway.io/v1" },
           }),
           provider("custom-nvidia", {
@@ -47,7 +52,6 @@ describe("provider attribution isolation", () => {
 
         for (const item of items) {
           catalog.provider.update(item.id, (draft) => {
-            draft.enabled = item.enabled
             draft.api = item.api
             draft.request.headers.Existing = "value"
           })
diff --git a/packages/core/test/kilocode/session-runner-model.test.ts b/packages/core/test/kilocode/session-runner-model.test.ts
new file mode 100644
index 00000000000..5f28d4609fa
--- /dev/null
+++ b/packages/core/test/kilocode/session-runner-model.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect } from "bun:test"
+import { DateTime, Effect } from "effect"
+import { Credential } from "@opencode-ai/core/credential"
+import { Integration } from "@opencode-ai/core/integration"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
+import { it } from "../lib/effect"
+
+describe("SessionRunnerModel Kilo credentials", () => {
+  it.effect("maps OAuth account IDs to Kilo organization routing", () =>
+    Effect.gen(function* () {
+      const model = new ModelV2.Info({
+        id: ModelV2.ID.make("test-model"),
+        providerID: ProviderV2.ID.make("kilo"),
+        name: "Test model",
+        api: {
+          id: ModelV2.ID.make("api-test-model"),
+          type: "aisdk",
+          package: "@ai-sdk/openai-compatible",
+          url: "https://api.kilo.ai/openrouter",
+        },
+        capabilities: { tools: true, input: ["text"], output: ["text"] },
+        request: { headers: {}, body: {}, generation: {}, options: {} },
+        variants: [],
+        time: { released: DateTime.makeUnsafe(0) },
+        cost: [],
+        status: "active",
+        enabled: true,
+        limit: { context: 100, output: 20 },
+      })
+      const credential = new Credential.Stored({
+        id: Credential.ID.create(),
+        integrationID: Integration.ID.make("kilo"),
+        label: "Work",
+        value: new Credential.OAuth({
+          type: "oauth",
+          methodID: Integration.MethodID.make("oauth"),
+          refresh: "refresh",
+          access: "access",
+          expires: 1,
+          metadata: { accountID: "org-enterprise" },
+        }),
+      })
+
+      const resolved = yield* SessionRunnerModel.fromCatalogModel(
+        model,
+        { type: "credential", id: credential.id, label: credential.label },
+        credential,
+      )
+
+      expect(resolved.route.defaults.http?.body).toMatchObject({ kilocodeOrganizationId: "org-enterprise" })
+      expect(resolved.route.defaults.http?.body).not.toHaveProperty("accountID")
+    }),
+  )
+})
diff --git a/packages/core/test/plugin/models-dev.test.ts b/packages/core/test/plugin/models-dev.test.ts
index 8cdfc066cd2..f4a0e16bdd1 100644
--- a/packages/core/test/plugin/models-dev.test.ts
+++ b/packages/core/test/plugin/models-dev.test.ts
@@ -28,8 +28,10 @@ const connections = Credential.layer.pipe(
   Layer.provide(Database.layerFromPath(":memory:").pipe(Layer.fresh)),
   Layer.provide(events),
 )
-const catalog = Catalog.layer.pipe(Layer.provide(Layer.mergeAll(events, locationLayer, plugins, policy, connections)))
 const integrations = Integration.locationLayer.pipe(Layer.provide(events), Layer.provide(connections))
+const catalog = Catalog.layer.pipe(
+  Layer.provide(Layer.mergeAll(events, locationLayer, plugins, policy, connections, integrations)),
+)
 const layer = Layer.mergeAll(
   catalog.pipe(Layer.provide(connections)),
   integrations,
@@ -61,11 +63,11 @@ describe("ModelsDevPlugin", () => {
               id: Integration.ID.make("acme"),
               name: "Acme",
               methods: [
-                new Integration.KeyMethod({ type: "key" }),
-                new Integration.EnvMethod({
+                { type: "key" },
+                {
                   type: "env",
                   names: ["ACME_API_KEY"],
-                }),
+                },
               ],
               connections: [],
             }),
diff --git a/packages/core/test/plugin/provider-azure.test.ts b/packages/core/test/plugin/provider-azure.test.ts
index c4bdd806c9d..91ab854d5cb 100644
--- a/packages/core/test/plugin/provider-azure.test.ts
+++ b/packages/core/test/plugin/provider-azure.test.ts
@@ -1,35 +1,10 @@
 import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { Credential } from "@opencode-ai/core/credential"
-import { Integration } from "@opencode-ai/core/integration"
-import { Database } from "@opencode-ai/core/database/database"
+import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
-import { EventV2 } from "@opencode-ai/core/event"
-import { Location } from "@opencode-ai/core/location"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { AzurePlugin } from "@opencode-ai/core/plugin/provider/azure"
 import { ProviderV2 } from "@opencode-ai/core/provider"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { location } from "../fixture/location"
-import { testEffect } from "../lib/effect"
-import { fakeSelectorSdk, it, model, npmLayer, provider, withEnv } from "./provider-helper"
-
-const database = Database.layerFromPath(":memory:").pipe(Layer.fresh)
-const preferences = Credential.layer.pipe(Layer.provide(database))
-const accounts = Layer.merge(
-  Credential.layer.pipe(Layer.provide(database), Layer.provide(preferences), Layer.provide(EventV2.defaultLayer)),
-  preferences,
-)
-const itWithAccount = testEffect(
-  Catalog.locationLayer.pipe(
-    Layer.provideMerge(accounts),
-    Layer.provideMerge(EventV2.defaultLayer),
-    Layer.provideMerge(
-      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("test") }))),
-    ),
-    Layer.provideMerge(npmLayer),
-  ),
-)
+import { fakeSelectorSdk, it, model, provider, withEnv } from "./provider-helper"
 
 describe("AzurePlugin", () => {
   it.effect("resolves resourceName from env", () =>
@@ -73,35 +48,7 @@ describe("AzurePlugin", () => {
     ),
   )
 
-  itWithAccount.effect("prefers account resourceName over env", () =>
-    withEnv(
-      {
-        AZURE_RESOURCE_NAME: "from-env",
-      },
-      () =>
-        Effect.gen(function* () {
-          const plugin = yield* PluginV2.Service
-          const credentials = yield* Credential.Service
-          const catalog = yield* Catalog.Service
-          yield* credentials.create({
-            integrationID: Integration.ID.make("azure"),
-            value: new Credential.Key({
-              type: "key",
-              key: "key",
-              metadata: { resourceName: "from-account" },
-            }),
-          })
-          yield* plugin.add(AzurePlugin)
-          const transform = yield* catalog.transform()
-          yield* transform((catalog) => {
-            catalog.provider.update(ProviderV2.ID.azure, (item) => {
-              item.api = { type: "aisdk", package: "@ai-sdk/azure" }
-            })
-          })
-          expect((yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-account")
-        }),
-    ),
-  )
+  // kilocode_change - remove stale account projection coverage, matching the v1.17.10 upstream follow-up
 
   it.effect("falls back to env when configured resourceName is blank", () =>
     withEnv({ AZURE_RESOURCE_NAME: "from-env" }, () =>
diff --git a/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts b/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts
index 208ab8710d3..39323f77e1a 100644
--- a/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts
+++ b/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts
@@ -1,36 +1,11 @@
 import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { Credential } from "@opencode-ai/core/credential"
-import { Integration } from "@opencode-ai/core/integration"
-import { Database } from "@opencode-ai/core/database/database"
+import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
-import { Location } from "@opencode-ai/core/location"
-import { EventV2 } from "@opencode-ai/core/event"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { CloudflareWorkersAIPlugin } from "@opencode-ai/core/plugin/provider/cloudflare-workers-ai"
 import { ProviderV2 } from "@opencode-ai/core/provider"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { location } from "../fixture/location"
-import { testEffect } from "../lib/effect"
-import { fakeSelectorSdk, it, model, npmLayer, withEnv } from "./provider-helper"
-
-const database = Database.layerFromPath(":memory:").pipe(Layer.fresh)
-const preferences = Credential.layer.pipe(Layer.provide(database))
-const accounts = Layer.merge(
-  Credential.layer.pipe(Layer.provide(database), Layer.provide(preferences), Layer.provide(EventV2.defaultLayer)),
-  preferences,
-)
-const itWithAccount = testEffect(
-  Catalog.locationLayer.pipe(
-    Layer.provideMerge(accounts),
-    Layer.provideMerge(EventV2.defaultLayer),
-    Layer.provideMerge(
-      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("test") }))),
-    ),
-    Layer.provideMerge(npmLayer),
-  ),
-)
+import { fakeSelectorSdk, it, model, withEnv } from "./provider-helper"
 
 function cloudflareLanguage(sdk: unknown, modelID = "@cf/model") {
   return (sdk as { languageModel: (id: string) => { config: CloudflareConfig; provider: string } }).languageModel(
@@ -126,41 +101,7 @@ describe("CloudflareWorkersAIPlugin", () => {
     ),
   )
 
-  itWithAccount.effect("falls back to account metadata when account env is absent", () =>
-    withEnv(
-      {
-        CLOUDFLARE_ACCOUNT_ID: undefined,
-        CLOUDFLARE_API_KEY: undefined,
-      },
-      () =>
-        Effect.gen(function* () {
-          const plugin = yield* PluginV2.Service
-          const credentials = yield* Credential.Service
-          const catalog = yield* Catalog.Service
-          yield* credentials.create({
-            integrationID: Integration.ID.make("cloudflare-workers-ai"),
-            value: new Credential.Key({
-              type: "key",
-              key: "account-key",
-              metadata: { accountId: "account-acct" },
-            }),
-          })
-          yield* plugin.add(CloudflareWorkersAIPlugin)
-          const transform = yield* catalog.transform()
-          yield* transform((catalog) =>
-            catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => {
-              provider.api = { type: "aisdk", package: "test-provider" }
-            }),
-          )
-          expect((yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))).request.body).toMatchObject(
-            {
-              apiKey: "account-key",
-              accountId: "account-acct",
-            },
-          )
-        }),
-    ),
-  )
+  // kilocode_change - remove stale account projection coverage, matching the v1.17.10 upstream follow-up
 
   it.effect("uses env account ID over configured account ID", () =>
     withEnv({ CLOUDFLARE_ACCOUNT_ID: "env-acct" }, () =>
diff --git a/packages/core/test/plugin/provider-gitlab.test.ts b/packages/core/test/plugin/provider-gitlab.test.ts
index dab52a1f7fa..3e036ad7125 100644
--- a/packages/core/test/plugin/provider-gitlab.test.ts
+++ b/packages/core/test/plugin/provider-gitlab.test.ts
@@ -1,26 +1,10 @@
 import { describe, expect, mock } from "bun:test"
-import { Effect, Layer } from "effect"
-import { Credential } from "@opencode-ai/core/credential"
-import { Integration } from "@opencode-ai/core/integration"
-import { Database } from "@opencode-ai/core/database/database"
-import { Catalog } from "@opencode-ai/core/catalog"
-import { EventV2 } from "@opencode-ai/core/event"
-import { Location } from "@opencode-ai/core/location"
+import { Effect } from "effect"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { GitLabPlugin } from "@opencode-ai/core/plugin/provider/gitlab"
-import { ProviderV2 } from "@opencode-ai/core/provider"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { location } from "../fixture/location"
-import { testEffect } from "../lib/effect"
-import { it, model, npmLayer, withEnv } from "./provider-helper"
+import { it, model, withEnv } from "./provider-helper"
 
 const gitlabSDKOptions: Record<string, unknown>[] = []
-const database = Database.layerFromPath(":memory:").pipe(Layer.fresh)
-const preferences = Credential.layer.pipe(Layer.provide(database))
-const accounts = Layer.merge(
-  Credential.layer.pipe(Layer.provide(database), Layer.provide(preferences), Layer.provide(EventV2.defaultLayer)),
-  preferences,
-)
 
 void mock.module("gitlab-ai-provider", () => ({
   VERSION: "test-version",
@@ -35,17 +19,6 @@ void mock.module("gitlab-ai-provider", () => ({
   isWorkflowModel: (id: string) => id === "duo-workflow" || id === "duo-workflow-exact",
 }))
 
-const itWithAccount = testEffect(
-  Catalog.locationLayer.pipe(
-    Layer.provideMerge(accounts),
-    Layer.provideMerge(EventV2.defaultLayer),
-    Layer.provideMerge(
-      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/") }))),
-    ),
-    Layer.provideMerge(npmLayer),
-  ),
-)
-
 describe("GitLabPlugin", () => {
   it.effect("creates SDKs with legacy default instance URL, token env, headers, and feature flags", () =>
     withEnv(
@@ -163,77 +136,7 @@ describe("GitLabPlugin", () => {
     }),
   )
 
-  itWithAccount.effect("uses active account API token over GITLAB_TOKEN", () =>
-    withEnv(
-      {
-        GITLAB_TOKEN: "env-token",
-      },
-      () =>
-        Effect.gen(function* () {
-          gitlabSDKOptions.length = 0
-          const plugin = yield* PluginV2.Service
-          const credentials = yield* Credential.Service
-          const catalog = yield* Catalog.Service
-          yield* credentials.create({
-            integrationID: Integration.ID.make("gitlab"),
-            value: new Credential.Key({ type: "key", key: "account-token" }),
-          })
-          yield* plugin.add(GitLabPlugin)
-          const transform = yield* catalog.transform()
-          yield* transform((catalog) => catalog.provider.update(ProviderV2.ID.make("gitlab"), () => {}))
-          const provider = yield* catalog.provider.get(ProviderV2.ID.make("gitlab"))
-          yield* plugin.trigger(
-            "aisdk.sdk",
-            {
-              model: model("gitlab", "claude"),
-              package: "gitlab-ai-provider",
-              options: provider.request.body,
-            },
-            {},
-          )
-          expect(gitlabSDKOptions[0].apiKey).toBe("account-token")
-        }),
-    ),
-  )
-
-  itWithAccount.effect("uses active account OAuth access token when no API token exists", () =>
-    withEnv(
-      {
-        GITLAB_TOKEN: undefined,
-      },
-      () =>
-        Effect.gen(function* () {
-          gitlabSDKOptions.length = 0
-          const plugin = yield* PluginV2.Service
-          const credentials = yield* Credential.Service
-          const catalog = yield* Catalog.Service
-          yield* credentials.create({
-            integrationID: Integration.ID.make("gitlab"),
-            value: new Credential.OAuth({
-              type: "oauth",
-              methodID: Integration.MethodID.make("oauth"),
-              refresh: "refresh-token",
-              access: "account-oauth-token",
-              expires: 9999999999999,
-            }),
-          })
-          yield* plugin.add(GitLabPlugin)
-          const transform = yield* catalog.transform()
-          yield* transform((catalog) => catalog.provider.update(ProviderV2.ID.make("gitlab"), () => {}))
-          const provider = yield* catalog.provider.get(ProviderV2.ID.make("gitlab"))
-          yield* plugin.trigger(
-            "aisdk.sdk",
-            {
-              model: model("gitlab", "claude"),
-              package: "gitlab-ai-provider",
-              options: provider.request.body,
-            },
-            {},
-          )
-          expect(gitlabSDKOptions[0].apiKey).toBe("account-oauth-token")
-        }),
-    ),
-  )
+  // kilocode_change - remove stale account projection coverage, matching the v1.17.10 upstream follow-up
 
   it.effect("uses workflowChat for duo workflow models and preserves selectedModelRef", () =>
     Effect.gen(function* () {
diff --git a/packages/core/test/plugin/provider-helper.ts b/packages/core/test/plugin/provider-helper.ts
index f9334480d1f..c15928435bc 100644
--- a/packages/core/test/plugin/provider-helper.ts
+++ b/packages/core/test/plugin/provider-helper.ts
@@ -53,6 +53,7 @@ const integrations = Integration.locationLayer.pipe(
   Layer.provide(
     Layer.mock(Credential.Service)({
       create: () => Effect.die("unexpected credential creation"),
+      all: () => Effect.succeed([]),
       list: () => Effect.succeed([]),
     }),
   ),
diff --git a/packages/core/test/plugin/provider-kilo.test.ts b/packages/core/test/plugin/provider-kilo.test.ts
index a14c78821a5..4bc43c156f9 100644
--- a/packages/core/test/plugin/provider-kilo.test.ts
+++ b/packages/core/test/plugin/provider-kilo.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
-import { Credential } from "@opencode-ai/core/credential"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
 import { KiloPlugin } from "@opencode-ai/core/plugin/provider/kilo"
@@ -151,20 +150,18 @@ describe("KiloPlugin", () => {
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("kilo", {
-            enabled: { via: "credential", credentialID: Credential.ID.make("cred_kilo") },
             request: {
               headers: {},
               body: { apiKey: "authenticated-token", kilocodeOrganizationId: "authenticated-org" },
             },
           })
           catalog.provider.update(item.id, (draft) => {
-            draft.enabled = item.enabled
             draft.request = item.request
           })
         })
         const result = yield* catalog.provider.get(ProviderV2.ID.make("kilo"))
 
-        expect(result.enabled).toEqual({ via: "credential", credentialID: Credential.ID.make("cred_kilo") })
+        expect(result.request.body.apiKey).toBe("authenticated-token")
         expect(result.request.body.kilocodeToken).toBe("authenticated-token")
         expect(result.request.body.kilocodeOrganizationId).toBe("environment-org")
       }),
@@ -181,7 +178,10 @@ describe("KiloPlugin", () => {
         yield* transform((catalog) => catalog.provider.update(ProviderV2.ID.make("kilo"), () => {}))
         const result = yield* catalog.provider.get(ProviderV2.ID.make("kilo"))
 
-        expect(result.enabled).toEqual({ via: "custom", data: { anonymous: true } })
+        expect((yield* catalog.provider.available()).map((provider) => provider.id)).toContain(
+          ProviderV2.ID.make("kilo"),
+        )
+        expect(result.request.body.apiKey).toBe("anonymous")
         expect(result.request.body.kilocodeToken).toBe("anonymous")
       }),
     ),
diff --git a/packages/core/test/plugin/provider-llmgateway.test.ts b/packages/core/test/plugin/provider-llmgateway.test.ts
index 5ffc6d78792..f92d5fc0bbb 100644
--- a/packages/core/test/plugin/provider-llmgateway.test.ts
+++ b/packages/core/test/plugin/provider-llmgateway.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
+import { Integration } from "@opencode-ai/core/integration"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
 import { LLMGatewayPlugin } from "@opencode-ai/core/plugin/provider/llmgateway"
@@ -8,6 +9,14 @@ import { ProviderV2 } from "@opencode-ai/core/provider"
 import { expectPluginRegistered, it, provider } from "./provider-helper"
 
 describe("LLMGatewayPlugin", () => {
+  const add = Effect.fnUntraced(function* (plugin: PluginV2.Interface) {
+    const integrations = yield* Integration.Service
+    yield* plugin.add({
+      ...LLMGatewayPlugin,
+      effect: LLMGatewayPlugin.effect.pipe(Effect.provideService(Integration.Service, integrations)),
+    })
+  })
+
   it.effect("is registered so legacy referer headers can be applied", () =>
     Effect.sync(() =>
       expectPluginRegistered(
@@ -21,31 +30,29 @@ describe("LLMGatewayPlugin", () => {
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
       const catalog = yield* Catalog.Service
-      yield* plugin.add(LLMGatewayPlugin)
+      yield* add(plugin)
+      const integrations = yield* Integration.Service
+      yield* integrations.update((editor) => {
+        editor.update(Integration.ID.make("llmgateway"), () => {})
+        editor.update(Integration.ID.make("openrouter"), () => {})
+      })
       const transform = yield* catalog.transform()
       yield* transform((catalog) => {
         const llmgateway = provider("llmgateway", {
-          enabled: { via: "env", name: "LLMGATEWAY_API_KEY" },
           api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.llmgateway.io/v1" },
           request: { headers: { Existing: "value" }, body: {} },
         })
         catalog.provider.update(llmgateway.id, (draft) => {
-          draft.enabled = llmgateway.enabled
           draft.api = llmgateway.api
           draft.request = llmgateway.request
         })
-        const openrouter = provider("openrouter", {
-          enabled: { via: "env", name: "OPENROUTER_API_KEY" },
-        })
-        catalog.provider.update(openrouter.id, (draft) => {
-          draft.enabled = openrouter.enabled
-        })
+        catalog.provider.update(ProviderV2.ID.openrouter, () => {})
       })
       expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).request.headers).toEqual({
         Existing: "value",
         "HTTP-Referer": "https://kilo.ai/",
-        "X-Title": "Kilo Code",
-        "X-Source": "kilo",
+        "X-Title": "Kilo Code", // kilocode_change
+        "X-Source": "kilo", // kilocode_change
       })
       expect((yield* catalog.provider.get(ProviderV2.ID.openrouter)).request.headers).toEqual({})
     }),
@@ -55,7 +62,7 @@ describe("LLMGatewayPlugin", () => {
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
       const catalog = yield* Catalog.Service
-      yield* plugin.add(LLMGatewayPlugin)
+      yield* add(plugin)
       const transform = yield* catalog.transform()
       yield* transform((catalog) => {
         const item = provider("llmgateway", {
@@ -66,7 +73,7 @@ describe("LLMGatewayPlugin", () => {
         })
       })
 
-      expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).enabled).toBe(false)
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).disabled).toBeUndefined()
       expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).request.headers).toEqual({})
     }),
   )
diff --git a/packages/core/test/plugin/provider-openai.test.ts b/packages/core/test/plugin/provider-openai.test.ts
index a317ba4bf7d..d30b585b961 100644
--- a/packages/core/test/plugin/provider-openai.test.ts
+++ b/packages/core/test/plugin/provider-openai.test.ts
@@ -21,16 +21,16 @@ describe("OpenAIPlugin", () => {
       const plugin = yield* PluginV2.Service
       yield* add(plugin, yield* Integration.Service)
       expect((yield* (yield* Integration.Service).get(Integration.ID.make("openai")))?.methods).toEqual([
-        new Integration.OAuthMethod({
+        {
           id: Integration.MethodID.make("chatgpt-browser"),
           type: "oauth",
           label: "ChatGPT Pro/Plus (browser)",
-        }),
-        new Integration.OAuthMethod({
+        },
+        {
           id: Integration.MethodID.make("chatgpt-headless"),
           type: "oauth",
           label: "ChatGPT Pro/Plus (headless)",
-        }),
+        },
       ])
     }),
   )
diff --git a/packages/core/test/plugin/provider-opencode.test.ts b/packages/core/test/plugin/provider-opencode.test.ts
index d12f04c0c94..01cabf35811 100644
--- a/packages/core/test/plugin/provider-opencode.test.ts
+++ b/packages/core/test/plugin/provider-opencode.test.ts
@@ -3,6 +3,7 @@ import { DateTime, Effect, Layer, Option } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { Credential } from "@opencode-ai/core/credential"
 import { EventV2 } from "@opencode-ai/core/event"
+import { Integration } from "@opencode-ai/core/integration"
 import { Location } from "@opencode-ai/core/location"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
@@ -18,13 +19,18 @@ const locationLayer = Layer.succeed(
   Location.Service.of(location({ directory: AbsolutePath.make("test") })),
 )
 
+const pluginWithIntegrations = (integrations: Integration.Interface) => ({
+  ...OpencodePlugin,
+  effect: OpencodePlugin.effect.pipe(Effect.provideService(Integration.Service, integrations)),
+})
+
 describe("OpencodePlugin", () => {
   it.effect("uses a public key and disables paid models without credentials", () =>
     withEnv({ OPENCODE_API_KEY: undefined }, () =>
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        yield* plugin.add(pluginWithIntegrations(yield* Integration.Service))
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("opencode")
@@ -45,7 +51,7 @@ describe("OpencodePlugin", () => {
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        yield* plugin.add(pluginWithIntegrations(yield* Integration.Service))
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("opencode")
@@ -66,7 +72,7 @@ describe("OpencodePlugin", () => {
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        yield* plugin.add(pluginWithIntegrations(yield* Integration.Service))
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("opencode")
@@ -87,7 +93,7 @@ describe("OpencodePlugin", () => {
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        yield* plugin.add(pluginWithIntegrations(yield* Integration.Service))
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("opencode")
@@ -108,13 +114,18 @@ describe("OpencodePlugin", () => {
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        const integrations = yield* Integration.Service
+        yield* plugin.add(pluginWithIntegrations(integrations))
+        yield* integrations.update((editor) => {
+          editor.method.update({
+            integrationID: Integration.ID.make("opencode"),
+            method: { type: "env", names: ["CUSTOM_OPENCODE_API_KEY"] },
+          })
+        })
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
-          const item = provider("opencode", { env: ["CUSTOM_OPENCODE_API_KEY"] })
-          catalog.provider.update(item.id, (draft) => {
-            draft.env = [...item.env]
-          })
+          const item = provider("opencode")
+          catalog.provider.update(item.id, () => {})
           const paid = model("opencode", "paid", { cost: cost(1) })
           catalog.model.update(item.id, paid.id, (draft) => {
             draft.cost = [...paid.cost]
@@ -131,7 +142,7 @@ describe("OpencodePlugin", () => {
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        yield* plugin.add(pluginWithIntegrations(yield* Integration.Service))
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("opencode", {
@@ -154,37 +165,12 @@ describe("OpencodePlugin", () => {
     ),
   )
 
-  it.effect("uses auth-enabled providers as credentials", () =>
-    withEnv({ OPENCODE_API_KEY: undefined }, () =>
-      Effect.gen(function* () {
-        const plugin = yield* PluginV2.Service
-        const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
-        const transform = yield* catalog.transform()
-        yield* transform((catalog) => {
-          const item = provider("opencode", {
-            enabled: { via: "credential", credentialID: Credential.ID.make("credential") },
-          })
-          catalog.provider.update(item.id, (draft) => {
-            draft.enabled = item.enabled
-          })
-          const paid = model("opencode", "paid", { cost: cost(1) })
-          catalog.model.update(item.id, paid.id, (draft) => {
-            draft.cost = [...paid.cost]
-          })
-        })
-        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBeUndefined()
-        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true)
-      }),
-    ),
-  )
-
   it.effect("ignores non-opencode providers and models", () =>
     withEnv({ OPENCODE_API_KEY: undefined }, () =>
       Effect.gen(function* () {
         const plugin = yield* PluginV2.Service
         const catalog = yield* Catalog.Service
-        yield* plugin.add(OpencodePlugin)
+        yield* plugin.add(pluginWithIntegrations(yield* Integration.Service))
         const transform = yield* catalog.transform()
         yield* transform((catalog) => {
           const item = provider("openai")
diff --git a/packages/core/test/project-copy.test.ts b/packages/core/test/project-copy.test.ts
index 823d8d842ec..47f2176c376 100644
--- a/packages/core/test/project-copy.test.ts
+++ b/packages/core/test/project-copy.test.ts
@@ -365,6 +365,18 @@ describe("ProjectCopy", () => {
     }),
   )
 
+  it.live("refresh ignores existing directories that are no longer git checkouts", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      yield* Effect.promise(() => fs.rm(path.join(input.sourceDirectory, ".git"), { recursive: true }))
+      const copy = yield* ProjectCopy.Service
+
+      yield* copy.refresh({ projectID: input.projectID })
+
+      expect(yield* stored(input.projectID)).toEqual([{ directory: input.sourceDirectory, strategy: null }])
+    }),
+  )
+
   it.live("refresh with no roots is a no-op", () =>
     Effect.gen(function* () {
       const copy = yield* ProjectCopy.Service
diff --git a/packages/core/test/pty/info-schema.test.ts b/packages/core/test/pty/info-schema.test.ts
index 9f58c45c886..6cdf263a5bb 100644
--- a/packages/core/test/pty/info-schema.test.ts
+++ b/packages/core/test/pty/info-schema.test.ts
@@ -24,4 +24,9 @@ describe("Pty.Info", () => {
   test("rejects a negative pid", () => {
     expect(() => Schema.decodeUnknownSync(Pty.Info)(sample(-1))).toThrow()
   })
+
+  test("accepts an exit code for retained exited sessions", () => {
+    const info = Schema.decodeUnknownSync(Pty.Info)({ ...sample(48012), status: "exited", exitCode: 4 })
+    expect(info.exitCode).toBe(4)
+  })
 })
diff --git a/packages/core/test/pty/input.test.ts b/packages/core/test/pty/input.test.ts
deleted file mode 100644
index 2cfe9756b03..00000000000
--- a/packages/core/test/pty/input.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect } from "effect"
-import { handlePtyInput } from "@opencode-ai/core/pty/input"
-import { it } from "../lib/effect"
-
-describe("pty websocket input", () => {
-  it.effect("does not forward invalid binary frames to the PTY handler", () =>
-    Effect.gen(function* () {
-      const messages: Array<string | ArrayBuffer> = []
-      const handler = { onMessage: (message: string | ArrayBuffer) => messages.push(message) }
-
-      yield* handlePtyInput(handler, "ready")
-      yield* handlePtyInput(handler, new Uint8Array([0xff, 0xfe, 0xfd]))
-      yield* handlePtyInput(handler, new TextEncoder().encode("hello"))
-
-      expect(messages).toEqual(["ready", "hello"])
-    }),
-  )
-})
diff --git a/packages/core/test/pty/protocol.test.ts b/packages/core/test/pty/protocol.test.ts
new file mode 100644
index 00000000000..2bf9610595f
--- /dev/null
+++ b/packages/core/test/pty/protocol.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, test } from "bun:test"
+import { PtyProtocol } from "@opencode-ai/core/pty/protocol"
+
+describe("pty protocol", () => {
+  test("drops invalid binary input frames and decodes valid ones", () => {
+    expect(PtyProtocol.decodeInput("ready")).toBe("ready")
+    expect(PtyProtocol.decodeInput(new Uint8Array([0xff, 0xfe, 0xfd]))).toBeUndefined()
+    expect(PtyProtocol.decodeInput(new TextEncoder().encode("hello"))).toBe("hello")
+    expect(PtyProtocol.decodeInput(new TextEncoder().encode("hello").buffer)).toBe("hello")
+  })
+
+  test("encodes the cursor as a 0x00-prefixed JSON control frame", () => {
+    const frame = PtyProtocol.metaFrame(42)
+    expect(frame[0]).toBe(0)
+    expect(JSON.parse(new TextDecoder().decode(frame.subarray(1)))).toEqual({ cursor: 42 })
+  })
+
+  test("splits replay into bounded frames", () => {
+    expect(PtyProtocol.chunks("")).toEqual([])
+    expect(PtyProtocol.chunks("abc")).toEqual(["abc"])
+    const big = "x".repeat(PtyProtocol.REPLAY_CHUNK + 1)
+    const frames = PtyProtocol.chunks(big)
+    expect(frames.length).toBe(2)
+    expect(frames[0].length).toBe(PtyProtocol.REPLAY_CHUNK)
+    expect(frames.join("")).toBe(big)
+  })
+})
diff --git a/packages/core/test/pty/pty-output-isolation.test.ts b/packages/core/test/pty/pty-output-isolation.test.ts
deleted file mode 100644
index 6e4d1f08d68..00000000000
--- a/packages/core/test/pty/pty-output-isolation.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Duration, Effect, Layer, Queue } from "effect"
-import { EventV2 } from "@opencode-ai/core/event"
-import { Location } from "@opencode-ai/core/location"
-import { Pty } from "@opencode-ai/core/pty"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { location } from "../fixture/location"
-import { testEffect } from "../lib/effect"
-
-type Socket = Parameters<Pty.Interface["connect"]>[1]
-
-const locationLayer = Layer.succeed(
-  Location.Service,
-  Location.Service.of(location({ directory: AbsolutePath.make("/tmp") })),
-)
-const it = testEffect(Pty.layer.pipe(Layer.provideMerge(EventV2.defaultLayer), Layer.provideMerge(locationLayer)))
-const ptyTest = process.platform === "win32" ? it.live.skip : it.live
-
-const createPty = Effect.fn("PtyOutputIsolationTest.createPty")(function* (command: string) {
-  const pty = yield* Pty.Service
-  return yield* Effect.acquireRelease(
-    pty.create({ command, args: [], cwd: "/tmp", env: { TERM: "xterm-256color", KILO_TERMINAL: "1" } }),
-    (info) => pty.remove(info.id).pipe(Effect.ignore),
-  )
-})
-
-const decodeOutput = (data: string | Uint8Array | ArrayBuffer) =>
-  typeof data === "string"
-    ? data
-    : Buffer.from(data instanceof Uint8Array ? data : new Uint8Array(data)).toString("utf8")
-
-const makeSocket = Effect.fn("PtyOutputIsolationTest.makeSocket")(function* (data: unknown) {
-  const output = yield* Queue.unbounded<string>()
-  const socket: Socket = {
-    readyState: 1,
-    data,
-    send: (data) => Queue.offerUnsafe(output, decodeOutput(data)),
-    close: () => {},
-  }
-  return { socket, output }
-})
-
-const waitForOutput = (output: Queue.Queue<string>, text: string, duration: Duration.Input = "5 seconds") =>
-  Effect.gen(function* () {
-    let received = ""
-    while (!received.includes(text)) received += yield* Queue.take(output)
-    return received
-  }).pipe(
-    Effect.timeoutOrElse({
-      duration,
-      orElse: () => Effect.fail(new Error(`timeout waiting for output containing ${JSON.stringify(text)}`)),
-    }),
-  )
-
-describe("pty output isolation", () => {
-  ptyTest("does not leak output when websocket objects are reused", () =>
-    Effect.gen(function* () {
-      const pty = yield* Pty.Service
-      const a = yield* createPty("cat")
-      const b = yield* createPty("cat")
-      const shared = yield* makeSocket({ events: { connection: "a" } })
-      const outB = yield* Queue.unbounded<string>()
-
-      yield* pty.connect(a.id, shared.socket)
-      shared.socket.data = { events: { connection: "b" } }
-      shared.socket.send = (data) => Queue.offerUnsafe(outB, decodeOutput(data))
-      yield* pty.connect(b.id, shared.socket)
-      yield* pty.write(a.id, "AAA\n")
-
-      const verify = yield* makeSocket({ events: { connection: "verify-a" } })
-      yield* pty.connect(a.id, verify.socket)
-      expect(yield* waitForOutput(verify.output, "AAA")).toContain("AAA")
-      expect(yield* waitForOutput(outB, "AAA", "100 millis").pipe(Effect.option)).toMatchObject({ _tag: "None" })
-    }),
-  )
-
-  ptyTest("does not leak output when Bun recycles websocket objects before re-connect", () =>
-    Effect.gen(function* () {
-      const pty = yield* Pty.Service
-      const info = yield* createPty("cat")
-      const first = yield* makeSocket({ events: { connection: "a" } })
-      const recycled = yield* Queue.unbounded<string>()
-
-      yield* pty.connect(info.id, first.socket)
-      first.socket.data = { events: { connection: "b" } }
-      first.socket.send = (data) => Queue.offerUnsafe(recycled, decodeOutput(data))
-      yield* pty.write(info.id, "AAA\n")
-
-      const verify = yield* makeSocket({ events: { connection: "verify" } })
-      yield* pty.connect(info.id, verify.socket)
-      expect(yield* waitForOutput(verify.output, "AAA")).toContain("AAA")
-      expect(yield* waitForOutput(recycled, "AAA", "100 millis").pipe(Effect.option)).toMatchObject({ _tag: "None" })
-    }),
-  )
-
-  ptyTest("treats in-place socket data mutation as the same connection", () =>
-    Effect.gen(function* () {
-      const pty = yield* Pty.Service
-      const info = yield* createPty("cat")
-      const data = { connId: 1 }
-      const socket = yield* makeSocket(data)
-
-      yield* pty.connect(info.id, socket.socket)
-      data.connId = 2
-      yield* pty.write(info.id, "AAA\n")
-
-      expect(yield* waitForOutput(socket.output, "AAA")).toContain("AAA")
-    }),
-  )
-})
diff --git a/packages/core/test/pty/pty-session.test.ts b/packages/core/test/pty/pty-session.test.ts
index 3372442dbf0..6b78ec4d13c 100644
--- a/packages/core/test/pty/pty-session.test.ts
+++ b/packages/core/test/pty/pty-session.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect } from "bun:test"
-import { Cause, Effect, Exit, Layer, Queue } from "effect"
+import { Cause, Deferred, Effect, Exit, Layer, Queue } from "effect"
+import { Config } from "@opencode-ai/core/config"
 import { EventV2 } from "@opencode-ai/core/event"
 import { Location } from "@opencode-ai/core/location"
 import { Pty } from "@opencode-ai/core/pty"
@@ -14,7 +15,14 @@ const locationLayer = Layer.succeed(
   Location.Service,
   Location.Service.of(location({ directory: AbsolutePath.make("/tmp") })),
 )
-const it = testEffect(Pty.layer.pipe(Layer.provideMerge(EventV2.defaultLayer), Layer.provideMerge(locationLayer)))
+const configLayer = Layer.mock(Config.Service)({ entries: () => Effect.succeed([]) })
+const it = testEffect(
+  Pty.layer.pipe(
+    Layer.provide(configLayer),
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(locationLayer),
+  ),
+)
 const ptyTest = process.platform === "win32" ? it.live.skip : it.live
 
 const subscribePtyEvents = Effect.fn("PtySessionTest.subscribePtyEvents")(function* () {
@@ -56,36 +64,176 @@ const waitForEvents = (events: Queue.Queue<PtyEvent>, id: PtyID, count: number)
     }),
   )
 
+const attachCollecting = Effect.fn("PtySessionTest.attachCollecting")(function* (id: PtyID, cursor?: number) {
+  const pty = yield* Pty.Service
+  const output = yield* Queue.unbounded<string>()
+  const ended = yield* Deferred.make<{ exitCode?: number }>()
+  const attachment = yield* pty.attach(id, {
+    cursor,
+    onData: (chunk) => Queue.offerUnsafe(output, chunk),
+    onEnd: (event) => Deferred.doneUnsafe(ended, Effect.succeed(event)),
+  })
+  attachment.activate()
+  return { attachment, output, ended }
+})
+
+const waitForOutput = (output: Queue.Queue<string>, text: string) =>
+  Effect.gen(function* () {
+    let received = ""
+    while (!received.includes(text)) received += yield* Queue.take(output)
+    return received
+  }).pipe(
+    Effect.timeoutOrElse({
+      duration: "5 seconds",
+      orElse: () => Effect.fail(new Error(`timeout waiting for output containing ${JSON.stringify(text)}`)),
+    }),
+  )
+
 describe("pty", () => {
   it.live("returns typed not found errors for missing sessions", () =>
     Effect.gen(function* () {
       const pty = yield* Pty.Service
       const id = "pty_missing" as PtyID
-      let closed = false
-      const socket = { readyState: 1, send: () => {}, close: () => void (closed = true) }
 
       for (const result of [
         yield* pty.get(id).pipe(Effect.asVoid, Effect.exit),
         yield* pty.update(id, { title: "missing" }).pipe(Effect.asVoid, Effect.exit),
         yield* pty.remove(id).pipe(Effect.exit),
-        yield* pty.resize(id, 80, 24).pipe(Effect.exit),
         yield* pty.write(id, "input").pipe(Effect.exit),
-        yield* pty.connect(id, socket).pipe(Effect.asVoid, Effect.exit),
+        yield* pty.attach(id, { onData: () => {}, onEnd: () => {} }).pipe(Effect.asVoid, Effect.exit),
       ]) {
         expect(Exit.isFailure(result)).toBe(true)
         if (Exit.isFailure(result))
           expect(Cause.squash(result.cause)).toMatchObject({ _tag: "Pty.NotFoundError", ptyID: id })
       }
-      expect(closed).toBe(true)
     }),
   )
 
-  ptyTest("publishes created, exited, deleted in order for a short-lived process", () =>
+  ptyTest("retains exited sessions until removed", () =>
     Effect.gen(function* () {
+      const pty = yield* Pty.Service
       const events = yield* subscribePtyEvents()
-      const info = yield* createPty("/usr/bin/env", ["sh", "-c", "sleep 0.1"])
+      const info = yield* createPty("/usr/bin/env", ["sh", "-c", "exit 3"])
 
-      expect(yield* waitForEvents(events, info.id, 3)).toEqual(["created", "exited", "deleted"])
+      expect(yield* waitForEvents(events, info.id, 2)).toEqual(["created", "exited"])
+      const exited = yield* pty.get(info.id)
+      expect(exited.status).toBe("exited")
+      expect(exited.exitCode).toBe(3)
+
+      yield* pty.remove(info.id)
+      expect(yield* waitForEvents(events, info.id, 1)).toEqual(["deleted"])
+      const missing = yield* pty.get(info.id).pipe(Effect.exit)
+      expect(Exit.isFailure(missing)).toBe(true)
+    }),
+  )
+
+  ptyTest("replays buffered output and streams live output to attachments", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const info = yield* createPty("cat")
+      yield* pty.write(info.id, "AAA\n")
+
+      const first = yield* attachCollecting(info.id)
+      expect(yield* waitForOutput(first.output, "AAA")).toContain("AAA")
+
+      first.attachment.write("BBB\n")
+      yield* waitForOutput(first.output, "BBB")
+
+      // A later attachment replays everything already buffered.
+      const replayed = yield* attachCollecting(info.id)
+      expect(replayed.attachment.replay).toContain("AAA")
+      expect(replayed.attachment.replay).toContain("BBB")
+      expect(replayed.attachment.cursor).toBeGreaterThan(0)
+
+      // Tail attachments skip the buffer and only see subsequent output.
+      const tail = yield* attachCollecting(info.id, -1)
+      expect(tail.attachment.replay).toBe("")
+      expect(tail.attachment.cursor).toBe(replayed.attachment.cursor)
+    }),
+  )
+
+  ptyTest("stops delivering output after detach", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const info = yield* createPty("cat")
+      const attached = yield* attachCollecting(info.id, -1)
+
+      attached.attachment.detach()
+      yield* pty.write(info.id, "AAA\n")
+
+      const verify = yield* attachCollecting(info.id)
+      yield* waitForOutput(verify.output, "AAA")
+      const leaked = yield* Queue.poll(attached.output)
+      expect(leaked._tag).toBe("None")
+    }),
+  )
+
+  ptyTest("isolates output between sessions", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const a = yield* createPty("cat")
+      const b = yield* createPty("cat")
+      const attachedA = yield* attachCollecting(a.id)
+      const attachedB = yield* attachCollecting(b.id)
+
+      yield* pty.write(a.id, "AAA\n")
+      yield* waitForOutput(attachedA.output, "AAA")
+
+      const leaked = yield* Queue.poll(attachedB.output)
+      expect(leaked._tag).toBe("None")
+    }),
+  )
+
+  ptyTest("notifies attachments with the exit code and rejects attach after exit", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const events = yield* subscribePtyEvents()
+      const info = yield* createPty("cat")
+      const attached = yield* attachCollecting(info.id)
+
+      yield* pty.write(info.id, "\u0004")
+      expect(yield* Deferred.await(attached.ended).pipe(Effect.timeout("5 seconds"))).toEqual({ exitCode: 0 })
+      yield* waitForEvents(events, info.id, 2)
+
+      const result = yield* pty.attach(info.id, { onData: () => {}, onEnd: () => {} }).pipe(Effect.exit)
+      expect(Exit.isFailure(result)).toBe(true)
+      if (Exit.isFailure(result))
+        expect(Cause.squash(result.cause)).toMatchObject({ _tag: "Pty.ExitedError", ptyID: info.id })
+    }),
+  )
+})
+
+const configuredShell = process.platform === "win32" ? undefined : Bun.which("bash")
+const configuredIt = testEffect(
+  Pty.layer.pipe(
+    Layer.provide(
+      Layer.mock(Config.Service)({
+        entries: () =>
+          Effect.succeed(
+            configuredShell
+              ? [new Config.Document({ type: "document", info: new Config.Info({ shell: configuredShell }) })]
+              : [],
+          ),
+      }),
+    ),
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(locationLayer),
+  ),
+)
+const configuredTest = process.platform === "win32" ? configuredIt.live.skip : configuredIt.live
+
+describe("pty create defaults", () => {
+  configuredTest("defaults command, login args, and cwd from config and location", () =>
+    Effect.gen(function* () {
+      if (!configuredShell) return
+      const pty = yield* Pty.Service
+      const info = yield* Effect.acquireRelease(pty.create({ title: "configured" }), (created) =>
+        pty.remove(created.id).pipe(Effect.ignore),
+      )
+      expect(info.command).toBe(configuredShell)
+      expect(info.args).toEqual(["-l"])
+      expect(info.cwd).toBe("/tmp")
+      expect(info.title).toBe("configured")
     }),
   )
 })
diff --git a/packages/core/test/session-runner-model.test.ts b/packages/core/test/session-runner-model.test.ts
index c50e2f855af..e1f5e32b752 100644
--- a/packages/core/test/session-runner-model.test.ts
+++ b/packages/core/test/session-runner-model.test.ts
@@ -3,6 +3,8 @@ import { LLM } from "@opencode-ai/llm"
 import { LLMClient } from "@opencode-ai/llm/route"
 import { ConfigProvider, DateTime, Effect } from "effect"
 import { Headers } from "effect/unstable/http"
+import { Credential } from "@opencode-ai/core/credential"
+import { Integration } from "@opencode-ai/core/integration"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ProjectV2 } from "@opencode-ai/core/project"
@@ -45,8 +47,6 @@ const provider = (api: ProviderV2.Info["api"]) =>
   new ProviderV2.Info({
     id: ProviderV2.ID.make("test-provider"),
     name: "Test provider",
-    enabled: { via: "env", name: "TEST_PROVIDER_API_KEY" },
-    env: ["TEST_PROVIDER_API_KEY"],
     api,
     request: { headers: {}, body: {} },
   })
@@ -247,7 +247,7 @@ describe("SessionRunnerModel", () => {
           ...model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }),
           request: { headers: {}, body: {}, generation: {}, options: {} },
         }),
-        provider({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }),
+        { type: "env", name: "TEST_PROVIDER_API_KEY" },
       )
       const request = LLM.request({ model: resolved, prompt: "Hello" })
       const headers = yield* resolved.route.auth
@@ -266,6 +266,35 @@ describe("SessionRunnerModel", () => {
     }),
   )
 
+  it.effect("prefers stored credentials over configured auth", () =>
+    Effect.gen(function* () {
+      const credential = new Credential.Stored({
+        id: Credential.ID.create(),
+        integrationID: Integration.ID.make("test-provider"),
+        label: "Work",
+        value: new Credential.Key({ type: "key", key: "stored-secret", metadata: { tenant: "work" } }),
+      })
+      const resolved = yield* SessionRunnerModel.fromCatalogModel(
+        new ModelV2.Info({
+          ...model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }),
+          request: { headers: {}, body: { apiKey: "configured-secret" }, generation: {}, options: {} },
+        }),
+        { type: "credential", id: credential.id, label: credential.label },
+        credential,
+      )
+      const headers = yield* resolved.route.auth.apply({
+        request: LLM.request({ model: resolved, prompt: "Hello" }),
+        method: "POST",
+        url: "https://openai.example/v1/responses",
+        body: "{}",
+        headers: Headers.empty,
+      })
+
+      expect(headers.authorization).toBe("Bearer stored-secret")
+      expect(resolved.route.defaults.http?.body).toEqual({ tenant: "work" })
+    }),
+  )
+
   it.effect("rejects catalog APIs without a native route", () =>
     Effect.gen(function* () {
       const failure = yield* SessionRunnerModel.fromCatalogModel(
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index cfec0918611..39bf8433cd8 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -704,7 +704,7 @@ describe("SessionRunnerLLM", () => {
       yield* events.publish(SessionEvent.Moved, {
         sessionID,
         timestamp: DateTime.makeUnsafe(1),
-        location: Location.Ref.make({ directory: AbsolutePath.make("/moved") }),
+        location: Location.Ref.make({ directory: AbsolutePath.make("/moved") }), // kilocode_change
       })
       expect(
         yield* db
@@ -762,7 +762,7 @@ describe("SessionRunnerLLM", () => {
           .publish(SessionEvent.Moved, {
             sessionID,
             timestamp: DateTime.makeUnsafe(1),
-            location: Location.Ref.make({ directory: AbsolutePath.make("/moved") }),
+            location: Location.Ref.make({ directory: AbsolutePath.make("/moved") }), // kilocode_change
           })
           .pipe(Effect.asVoid)
       })
@@ -1461,6 +1461,7 @@ describe("SessionRunnerLLM", () => {
       })
 
       requests.length = 0
+      executions.length = 0
       responses = [
         fragmentFixture("text", "text-summary-2", ["## Goal\n- Preserve the updated task"]).completeEvents,
         fragmentFixture("text", "text-final-2", ["Continued again"]).completeEvents,
@@ -3177,7 +3178,7 @@ describe("SessionRunnerLLM", () => {
     }),
   )
 
-  it.effect("fails after the bounded number of local tool continuation steps", () =>
+  it.effect("continues past 25 local tool steps when the agent has no step limit", () =>
     Effect.gen(function* () {
       yield* setup
       const session = yield* SessionV2.Service
@@ -3188,62 +3189,10 @@ describe("SessionRunnerLLM", () => {
       executions.length = 0
       streamGate = undefined
       streamStarted = undefined
-      responses = Array.from({ length: 25 }, (_, index) => [
-        LLMEvent.stepStart({ index: 0 }),
-        LLMEvent.toolCall({ id: `call-echo-${index}`, name: "echo", input: { text: `${index}` } }),
-        LLMEvent.stepFinish({ index: 0, reason: "tool-calls" }),
-        LLMEvent.finish({ reason: "tool-calls" }),
-      ])
-
-      const failure = yield* session.resume(sessionID).pipe(Effect.flip)
-
-      expect(failure).toMatchObject({ _tag: "SessionRunner.StepLimitExceededError", sessionID, limit: 25 })
-      expect(requests).toHaveLength(25)
-      expect(executions).toHaveLength(25)
-    }),
-  )
-
-  it.effect("does not restart a capped tool loop for a coalesced stale wake", () =>
-    Effect.gen(function* () {
-      yield* setup
-      const session = yield* SessionV2.Service
-      const coordinator = yield* SessionRunCoordinator.Service
-      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Loop forever" }), resume: false })
-
-      requests.length = 0
-      responses = Array.from({ length: 25 }, (_, index) => [
-        LLMEvent.stepStart({ index: 0 }),
-        LLMEvent.toolCall({ id: `call-capped-${index}`, name: "echo", input: { text: `${index}` } }),
-        LLMEvent.stepFinish({ index: 0, reason: "tool-calls" }),
-        LLMEvent.finish({ reason: "tool-calls" }),
-      ])
-      streamGate = yield* Deferred.make<void>()
-      streamStarted = yield* Deferred.make<void>()
-
-      const run = yield* session.resume(sessionID).pipe(Effect.forkChild)
-      yield* Deferred.await(streamStarted)
-      yield* coordinator.wake(sessionID)
-      yield* Deferred.succeed(streamGate, undefined)
-      expect(yield* Fiber.join(run).pipe(Effect.flip)).toMatchObject({ _tag: "SessionRunner.StepLimitExceededError" })
-      streamGate = undefined
-      streamStarted = undefined
-      yield* Effect.yieldNow
-
-      expect(requests).toHaveLength(25)
-    }),
-  )
-
-  it.effect("accepts a terminal response on the final bounded provider turn", () =>
-    Effect.gen(function* () {
-      yield* setup
-      const session = yield* SessionV2.Service
-      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Finish at the limit" }), resume: false })
-
-      requests.length = 0
       responses = [
-        ...Array.from({ length: 24 }, (_, index) => [
+        ...Array.from({ length: 25 }, (_, index) => [
           LLMEvent.stepStart({ index: 0 }),
-          LLMEvent.toolCall({ id: `call-terminal-${index}`, name: "echo", input: { text: `${index}` } }),
+          LLMEvent.toolCall({ id: `call-echo-${index}`, name: "echo", input: { text: `${index}` } }),
           LLMEvent.stepFinish({ index: 0, reason: "tool-calls" }),
           LLMEvent.finish({ reason: "tool-calls" }),
         ]),
@@ -3256,7 +3205,56 @@ describe("SessionRunnerLLM", () => {
 
       yield* session.resume(sessionID)
 
-      expect(requests).toHaveLength(25)
+      expect(requests).toHaveLength(26)
+      expect(executions).toHaveLength(25)
+    }),
+  )
+
+  it.effect("forces a text response on an agent's configured final step", () =>
+    Effect.gen(function* () {
+      yield* setup
+      const agents = yield* AgentV2.Service
+      yield* agents.update((editor) =>
+        editor.update(AgentV2.ID.make("build"), (agent) => {
+          agent.steps = 2
+        }),
+      )
+      const session = yield* SessionV2.Service
+      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Finish at the limit" }), resume: false })
+
+      requests.length = 0
+      executions.length = 0
+      responses = [
+        [
+          LLMEvent.stepStart({ index: 0 }),
+          LLMEvent.toolCall({ id: "call-terminal", name: "echo", input: { text: "done" } }),
+          LLMEvent.stepFinish({ index: 0, reason: "tool-calls" }),
+          LLMEvent.finish({ reason: "tool-calls" }),
+        ],
+        [
+          LLMEvent.stepStart({ index: 0 }),
+          LLMEvent.toolCall({ id: "call-forbidden", name: "echo", input: { text: "forbidden" } }),
+          LLMEvent.stepFinish({ index: 0, reason: "tool-calls" }),
+          LLMEvent.finish({ reason: "tool-calls" }),
+        ],
+      ]
+
+      yield* session.resume(sessionID)
+
+      expect(requests).toHaveLength(2)
+      expect(requests[0]?.toolChoice).toBeUndefined()
+      expect(requests[1]?.toolChoice).toMatchObject({ type: "none" })
+      expect(requests[1]?.tools).toEqual([])
+      expect(requests[1]?.messages.at(-1)).toMatchObject({
+        role: "assistant",
+        content: [{ type: "text", text: expect.stringContaining("MAXIMUM STEPS REACHED") }],
+      })
+      expect(executions).toEqual(["done"])
+      expect(yield* session.context(sessionID)).toMatchObject([
+        { type: "user", text: "Finish at the limit" },
+        { type: "assistant", content: [{ type: "tool", id: "call-terminal", state: { status: "completed" } }] },
+        { type: "assistant", content: [{ type: "tool", id: "call-forbidden", state: { status: "error" } }] },
+      ])
     }),
   )
 
diff --git a/packages/opencode/test/shell/shell.test.ts b/packages/core/test/shell.test.ts
similarity index 85%
rename from packages/opencode/test/shell/shell.test.ts
rename to packages/core/test/shell.test.ts
index 1f76783ac1f..1cc47a79f6c 100644
--- a/packages/opencode/test/shell/shell.test.ts
+++ b/packages/core/test/shell.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import path from "path"
-import { Shell } from "../../src/shell/shell"
-import { Filesystem } from "@/util/filesystem"
+import { Shell } from "@opencode-ai/core/shell"
+import { FSUtil } from "@opencode-ai/core/fs-util"
 import { which } from "@opencode-ai/core/util/which"
 
 const withShell = async (shell: string | undefined, fn: () => void | Promise<void>) => {
@@ -54,6 +54,15 @@ describe("shell", () => {
     expect(Shell.name(Shell.acceptable("nu"))).not.toBe("nu")
   })
 
+  test("builds command args per shell family", () => {
+    expect(Shell.args("/bin/sh", "echo hi", "/tmp")).toEqual(["-c", "echo hi"])
+    expect(Shell.args("/usr/bin/fish", "echo hi", "/tmp")).toEqual(["-c", "echo hi"])
+    const zsh = Shell.args("/bin/zsh", "echo hi", "/tmp")
+    expect(zsh[0]).toBe("-l")
+    expect(zsh[1]).toBe("-c")
+    expect(zsh.at(-1)).toBe("/tmp")
+  })
+
   if (process.platform === "win32") {
     test("rejects blacklisted shells case-insensitively", async () => {
       await withShell("NU.EXE", async () => {
@@ -64,7 +73,7 @@ describe("shell", () => {
     test("normalizes Git Bash shell paths from env", async () => {
       const shell = "/cygdrive/c/Program Files/Git/bin/bash.exe"
       await withShell(shell, async () => {
-        expect(Shell.preferred()).toBe(Filesystem.windowsPath(shell))
+        expect(Shell.preferred()).toBe(FSUtil.windowsPath(shell))
       })
     })
 
diff --git a/packages/effect-drizzle-sqlite/package.json b/packages/effect-drizzle-sqlite/package.json
index 021b5b4e906..920418a989f 100644
--- a/packages/effect-drizzle-sqlite/package.json
+++ b/packages/effect-drizzle-sqlite/package.json
@@ -7,8 +7,8 @@
   "private": true,
   "scripts": {
     "test": "bun test --timeout 30000 --only-failures",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "tsgo --noEmit",
+    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/packages/effect-sqlite-node/sst-env.d.ts b/packages/effect-sqlite-node/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/effect-sqlite-node/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index 6eadd755345..fec3e374d06 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -28,10 +28,10 @@
   },
   "scripts": {
     "test": "bun test --timeout 30000 --only-failures",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
     "typecheck": "tsgo --noEmit",
     "build": "bun ./script/build.ts",
-    "verify:package": "bun ./script/verify-package.ts"
+    "verify:package": "bun ./script/verify-package.ts",
+    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/packages/http-recorder/sst-env.d.ts b/packages/http-recorder/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/http-recorder/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/kilo-docs/lychee.toml b/packages/kilo-docs/lychee.toml
index 73dc8a11fbf..bfff8a29206 100644
--- a/packages/kilo-docs/lychee.toml
+++ b/packages/kilo-docs/lychee.toml
@@ -60,6 +60,9 @@ exclude = [
   # Consistently times out in CI
   '^https?://opncd\.ai',
   '^https?://zod\.dev/v4/changelog',
+  # Moonshot sites consistently time out from GitHub Actions runners.
+  '^https?://(www\.)?moonshot\.cn/?$',
+  '^https?://platform\.moonshot\.cn/?$',
   # Example punycode domain used in homograph attack documentation — does not exist
   '^https?://xn--pitest',
    # OpenAI docs return 404 to plain GET link checks but resolve in browsers
diff --git a/packages/kilo-docs/pages/automate/code-reviews/overview.md b/packages/kilo-docs/pages/automate/code-reviews/overview.md
index a78b4ae4a36..40e1109389c 100644
--- a/packages/kilo-docs/pages/automate/code-reviews/overview.md
+++ b/packages/kilo-docs/pages/automate/code-reviews/overview.md
@@ -159,6 +159,10 @@ When a pull request or merge request is opened or updated:
 
 Reviews are posted directly in your platform (GitHub or GitLab) as if coming from a team reviewer.
 
+{% callout type="info" title="Bot-generated PRs are ignored by default" %}
+Kilo does not automatically review pull or merge requests opened by bots, such as Dependabot, Renovate, or other automation accounts. This keeps review credits and notifications focused on human-authored changes.
+{% /callout %}
+
 ## Review Styles
 
 ### Strict
@@ -236,3 +240,4 @@ The Review Agent is ideal for:
 - Some highly dynamic or domain-specific code may require additional context in `REVIEW.md`.
 - The agent will only run on **selected repositories**.
 - During beta, review capacity may be throttled for extremely large PRs.
+- PRs/MRs opened by bots (e.g. Dependabot, Renovate) are ignored by default.
diff --git a/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md b/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md
index d489dc63ebc..20ad7099085 100644
--- a/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md
+++ b/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md
@@ -387,7 +387,7 @@ You can also set options that apply to all models from a provider:
 |---|---|---|
 | `apiKey` | `string` | API key (supports `{env:VAR}` and `{file:...}` syntax in trusted config — see note below) |
 | `baseURL` | `string` | Override the provider's base API URL |
-| `timeout` | `number \| false` | Request timeout in milliseconds. Defaults to `300000` (5 minutes); set to `false` to disable |
+| `timeout` | `number \| false` | Request timeout in milliseconds, covering both the wait for response headers and the wait for the first byte of the response body. Defaults to `300000` (5 minutes); set to `false` to disable. Once data starts arriving the timeout no longer applies, so slow streaming responses are never cut short — use `chunkTimeout` for gaps inside a response |
 | `chunkTimeout` | `number` | Timeout in milliseconds between streamed response chunks. If no chunk arrives within this window, the request is aborted and retried. This catches silent provider dropouts where the TCP connection stays open but SSE streaming stops. Recommended: `15000`–`30000` (15–30 seconds) for providers with unreliable streaming. |
 
 {% callout type="warning" title="{env:} / {file:} only resolve in trusted config" %}
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 0438ce9395f..ac6b5490c01 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:e8318f427b6c0ff71d4cce5c8ac03ba4778f99fda5723d24d23c38471523b622
-size 52203
+oid sha256:a7c800d169ca92674fc9f7c7d83032ca17e7d7937bdcbea5c72cb921a7fdb89e
+size 51975
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png
index 37a0a3a3a86..85a8ddb7b65 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bd31cd4e01c2e2a5ed579bce1b542368e7a11fc878d375a93fb238ba4f82469
-size 53288
+oid sha256:a7d7d047f14440d3dafc8a202131af6e755f80875012fd934a56580de21d36d5
+size 52887
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-collapsed-context-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-collapsed-context-chromium-linux.png
index 17e37e9de1f..5568f063ac2 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-collapsed-context-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-collapsed-context-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47b7b7bfb4a6b5631d8fdb808c1b3a9eb631b6f96911ddf15880f0c2fee4f7e0
-size 38558
+oid sha256:29e79ac79e992bf7f19646aab8ba10464872f4d012abed458a2a432a223668da
+size 38129
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/side-terminal-panel-empty-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/side-terminal-panel-empty-chromium-linux.png
new file mode 100644
index 00000000000..7515cef4a3f
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/side-terminal-panel-empty-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31c246e1baf581b431033ee2b2ce1c5080cca02d034b42d4dbce20f9acb5f33f
+size 9538
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-apply-patch-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-apply-patch-chromium-linux.png
index f38949019a1..c2f3c6d8b7d 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-apply-patch-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-apply-patch-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e872bc8ad05ad2a7ad1dd6de8a2ff427957fd278cee46940db0b12d84fe42ecf
-size 25534
+oid sha256:ee6ea794cf665570dcc208ad5975a14843d1680e59eb785fb5298b4919b7dd1d
+size 25757
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-edit-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-edit-chromium-linux.png
index 0eff7b16fa8..70ea4023789 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-edit-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/composite-webview/permission-dock-edit-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff33e800f4d2379bcc997228a1e4dd83433521b931ae85edb7c8f0c4c93405e7
-size 20540
+oid sha256:ee9fb41fb522684de6aa7fd9acda8357f33f2ba90bcb3eb7679ddfbcdecc6cdb
+size 20764
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/shared/markdown-mermaid-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/shared/markdown-mermaid-chromium-linux.png
new file mode 100644
index 00000000000..17c6284a465
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/shared/markdown-mermaid-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77964c111d0454d7985e3368b821e161e4d6d9fffee5438ee094ab34ff464d52
+size 18623
diff --git a/packages/kilo-docs/source-links.md b/packages/kilo-docs/source-links.md
index e9b3199d5e8..a786a86d271 100644
--- a/packages/kilo-docs/source-links.md
+++ b/packages/kilo-docs/source-links.md
@@ -155,8 +155,6 @@
 - <https://opencode.ai/>
   <!-- packages/opencode/src/cli/cmd/generate.ts -->
   <!-- packages/opencode/src/kilocode/server/httpapi/public.ts -->
-- <https://opencode.ai/zen>
-  <!-- packages/kilo-vscode/webview-ui/src/i18n/en.ts -->
 - <https://openrouter.ai/api/v1/chat/completions>
   <!-- packages/opencode/src/kilocode/tool/generate-image.ts -->
 - <https://openrouter.ai/docs/cookbook/administration/usage-accounting>
diff --git a/packages/kilo-i18n/src/ar.ts b/packages/kilo-i18n/src/ar.ts
index 13170b89c6d..b538f126a61 100644
--- a/packages/kilo-i18n/src/ar.ts
+++ b/packages/kilo-i18n/src/ar.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "يمنحك Kilo Gateway الوصول إلى مجموعة مختارة من النماذج الموثوقة والمحسّنة لوكلاء البرمجة.",
-  "provider.connect.kiloGateway.line2":
-    "بمفتاح API واحد، ستحصل على إمكانية الوصول إلى نماذج مثل Claude وGPT وGemini وGLM والمزيد.",
-  "provider.connect.kiloGateway.visit.prefix": "قم بزيارة ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " للحصول على مفتاح API الخاص بك.",
   "provider.connect.kiloGateway.byok.prefix": "للحصول على المزيد من إحصائيات الاستخدام، استخدم ",
   "provider.connect.kiloGateway.byok.link": "BYOK عبر Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "وصول موحد إلى نماذج الذكاء الاصطناعي مع توجيه ذكي",
 
   // Reasoning block label
-  "ui.permission.run": "تشغيل",
   "ui.reasoning.label": "الاستدلال",
 
   // Marketplace
-  "marketplace.tab.skills": "المهارات",
-  "marketplace.tab.mcpServers": "خوادم MCP",
-  "marketplace.category.all": "الكل",
-  "marketplace.placeholder": "سيتم تنفيذه لاحقاً",
   "marketplace.card.installed": "مثبت",
   "marketplace.card.install": "تثبيت",
   "marketplace.card.remove": "إزالة",
@@ -44,11 +32,9 @@ export const dict = {
   "marketplace.install.scope.global": "عالمي",
   "marketplace.install.scope.project.description":
     "هذا المشروع فقط. يمكن إضافة الملفات المثبتة إلى نظام التحكم في الإصدارات ومشاركتها مع فريقك.",
-  "marketplace.install.scope.global.description":
-    "جميع المشاريع على هذا الجهاز. تُحفظ في إعدادات المستخدم الخاصة بك.",
+  "marketplace.install.scope.global.description": "جميع المشاريع على هذا الجهاز. تُحفظ في إعدادات المستخدم الخاصة بك.",
   "marketplace.install.destination": "وجهة التثبيت",
-  "marketplace.install.about.mcp":
-    "يمنح خادم MCP منصة Kilo أدوات إضافية للعمل مع الخدمات الخارجية أو البرامج المحلية.",
+  "marketplace.install.about.mcp": "يمنح خادم MCP منصة Kilo أدوات إضافية للعمل مع الخدمات الخارجية أو البرامج المحلية.",
   "marketplace.install.about.agent": "يضيف الوكيل دورًا قابلاً لإعادة الاستخدام بتعليماته وأذوناته الخاصة.",
   "marketplace.install.about.skill": "تضيف المهارة تعليمات وموارد خاصة بمهام معينة يمكن لـ Kilo تحميلها عند الحاجة.",
   "marketplace.install.mcp.warning":
@@ -72,8 +58,6 @@ export const dict = {
     "هل أنت متأكد أنك تريد إزالة هذا الـ {{type}}؟ سيؤدي هذا إلى إزالته من تكوين {{scope}} الخاص بك.",
   "marketplace.remove.cancel": "إلغاء",
   "marketplace.remove.confirm.button": "إزالة",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "وكلاء",
   "marketplace.search": "بحث...",
   "marketplace.filter.all": "جميع العناصر",
   "marketplace.filter.notInstalled": "غير مثبت",
@@ -81,12 +65,10 @@ export const dict = {
   "marketplace.empty": "لم يتم العثور على عناصر",
   "marketplace.empty.relevant": "لم يتم العثور على عناصر سوق ذات صلة بمساحة العمل هذه.",
   "marketplace.badge.mcpServer": "خادم MCP",
-  "marketplace.badge.mode": "وضع",
   "marketplace.card.by": "بواسطة {{author}}",
   "marketplace.install.method": "طريقة التثبيت",
   "marketplace.install.parameters": "المعلمات",
   "marketplace.install.optional": "(اختياري)",
-  "marketplace.install.required": "{{name}} مطلوب",
   "marketplace.scope.project": "مشروع",
   "marketplace.scope.global": "عام",
   "marketplace.remove.type.mcp": "خادم MCP",
@@ -128,8 +110,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "فتح في عارض الفروقات",
-  "ui.messagePart.shell.command": "الأمر",
-  "ui.messagePart.shell.output": "المخرجات",
   "ui.messagePart.openInEditor": "فتح في المحرر",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/br.ts b/packages/kilo-i18n/src/br.ts
index 3e91b3d765e..3117506790f 100644
--- a/packages/kilo-i18n/src/br.ts
+++ b/packages/kilo-i18n/src/br.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "O Kilo Gateway oferece acesso a um conjunto selecionado de modelos confiáveis e otimizados para agentes de codificação.",
-  "provider.connect.kiloGateway.line2":
-    "Com uma única chave de API, você terá acesso a modelos como Claude, GPT, Gemini, GLM e mais.",
-  "provider.connect.kiloGateway.visit.prefix": "Visite ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " para obter sua chave de API.",
   "provider.connect.kiloGateway.byok.prefix": "Para mais estatísticas de uso, utilize ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Acesso unificado a modelos de IA com roteamento inteligente",
 
   // Reasoning block label
-  "ui.permission.run": "Executar",
   "ui.reasoning.label": "Raciocínio",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "Servidores MCP",
-  "marketplace.category.all": "Todos",
-  "marketplace.placeholder": "A ser implementado",
   "marketplace.card.installed": "Instalado",
   "marketplace.card.install": "Instalar",
   "marketplace.card.remove": "Remover",
@@ -59,7 +47,8 @@ export const dict = {
   "marketplace.install.learnMore": "Saiba como funcionam as instalações do Marketplace",
   "marketplace.install.learnMcp": "Saiba mais sobre MCP",
   "marketplace.install.installedAt": "Instalado em {{path}}",
-  "marketplace.intro": "Instale agentes, habilidades e ferramentas MCP reutilizáveis em um projeto ou em todos os projetos.",
+  "marketplace.intro":
+    "Instale agentes, habilidades e ferramentas MCP reutilizáveis em um projeto ou em todos os projetos.",
   "marketplace.intro.learnMore": "Sobre o Marketplace",
   "marketplace.install.prerequisites": "Pré-requisitos",
   "marketplace.install.installing": "Instalando...",
@@ -73,8 +62,6 @@ export const dict = {
     "Tem certeza que deseja remover este {{type}}? Isso o removerá da sua configuração {{scope}}.",
   "marketplace.remove.cancel": "Cancelar",
   "marketplace.remove.confirm.button": "Remover",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agentes",
   "marketplace.search": "Pesquisar...",
   "marketplace.filter.all": "Todos os Itens",
   "marketplace.filter.notInstalled": "Não Instalado",
@@ -82,12 +69,10 @@ export const dict = {
   "marketplace.empty": "Nenhum item encontrado",
   "marketplace.empty.relevant": "Nenhum item relevante do marketplace foi encontrado para este espaço de trabalho.",
   "marketplace.badge.mcpServer": "Servidor MCP",
-  "marketplace.badge.mode": "Modo",
   "marketplace.card.by": "por {{author}}",
   "marketplace.install.method": "Método de Instalação",
   "marketplace.install.parameters": "Parâmetros",
   "marketplace.install.optional": "(opcional)",
-  "marketplace.install.required": "{{name}} é obrigatório",
   "marketplace.scope.project": "projeto",
   "marketplace.scope.global": "global",
   "marketplace.remove.type.mcp": "servidor MCP",
@@ -129,8 +114,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Abrir no Visualizador de Diferenças",
-  "ui.messagePart.shell.command": "Comando",
-  "ui.messagePart.shell.output": "Saída",
   "ui.messagePart.openInEditor": "Abrir no Editor",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/bs.ts b/packages/kilo-i18n/src/bs.ts
index d1aece561ee..49cbbea5ef5 100644
--- a/packages/kilo-i18n/src/bs.ts
+++ b/packages/kilo-i18n/src/bs.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway omogućava pristup pažljivo odabranom skupu pouzdanih modela optimizovanih za rad sa agentima za kodiranje.",
-  "provider.connect.kiloGateway.line2":
-    "Sa jednim API ključem dobijate pristup modelima kao što su Claude, GPT, Gemini, GLM i drugi.",
-  "provider.connect.kiloGateway.visit.prefix": "Posjetite ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " da preuzmete svoj API ključ.",
   "provider.connect.kiloGateway.byok.prefix": "Za više statistika korištenja, koristite ",
   "provider.connect.kiloGateway.byok.link": "BYOK putem Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -29,14 +22,9 @@ export const dict = {
   "desktop.cli.installed.message": "CLI je instaliran u {{path}}\n\nRestartuj terminal da bi koristio komandu 'kilo'.",
 
   // Reasoning block label
-  "ui.permission.run": "Pokreni",
   "ui.reasoning.label": "Rezonovanje",
 
   // Marketplace
-  "marketplace.tab.skills": "Vještine",
-  "marketplace.tab.mcpServers": "MCP Serveri",
-  "marketplace.category.all": "Sve",
-  "marketplace.placeholder": "Biće implementirano",
   "marketplace.card.installed": "Instalirano",
   "marketplace.card.install": "Instaliraj",
   "marketplace.card.remove": "Ukloni",
@@ -78,8 +66,6 @@ export const dict = {
     "Jeste li sigurni da želite ukloniti ovaj {{type}}? Ovo će ga ukloniti iz vaše {{scope}} konfiguracije.",
   "marketplace.remove.cancel": "Otkaži",
   "marketplace.remove.confirm.button": "Ukloni",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agenti",
   "marketplace.search": "Pretraži...",
   "marketplace.filter.all": "Sve stavke",
   "marketplace.filter.notInstalled": "Nije instalirano",
@@ -87,12 +73,10 @@ export const dict = {
   "marketplace.empty": "Nema pronađenih stavki",
   "marketplace.empty.relevant": "Nisu pronađene relevantne stavke marketplacea za ovaj radni prostor.",
   "marketplace.badge.mcpServer": "MCP Server",
-  "marketplace.badge.mode": "Režim",
   "marketplace.card.by": "od {{author}}",
   "marketplace.install.method": "Metoda instalacije",
   "marketplace.install.parameters": "Parametri",
   "marketplace.install.optional": "(opciono)",
-  "marketplace.install.required": "{{name}} je obavezno",
   "marketplace.scope.project": "projekat",
   "marketplace.scope.global": "globalno",
   "marketplace.remove.type.mcp": "MCP server",
@@ -134,8 +118,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Otvori u pregledniku razlika",
-  "ui.messagePart.shell.command": "Naredba",
-  "ui.messagePart.shell.output": "Izlaz",
   "ui.messagePart.openInEditor": "Otvori u editoru",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/da.ts b/packages/kilo-i18n/src/da.ts
index 3147ec1eee1..960a5b4158f 100644
--- a/packages/kilo-i18n/src/da.ts
+++ b/packages/kilo-i18n/src/da.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway giver dig adgang til et udvalgt sæt pålidelige, optimerede modeller til kodningsagenter.",
-  "provider.connect.kiloGateway.line2":
-    "Med en enkelt API-nøgle får du adgang til modeller som Claude, GPT, Gemini, GLM og flere.",
-  "provider.connect.kiloGateway.visit.prefix": "Besøg ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " for at hente din API-nøgle.",
   "provider.connect.kiloGateway.byok.prefix": "For flere brugsstatistikker, brug ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Samlet adgang til AI-modeller med smart routing",
 
   // Reasoning block label
-  "ui.permission.run": "Kør",
   "ui.reasoning.label": "Ræsonnement",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "MCP-servere",
-  "marketplace.category.all": "Alle",
-  "marketplace.placeholder": "Skal implementeres",
   "marketplace.card.installed": "Installeret",
   "marketplace.card.install": "Installer",
   "marketplace.card.remove": "Fjern",
@@ -44,8 +32,7 @@ export const dict = {
   "marketplace.install.scope.global": "Global",
   "marketplace.install.scope.project.description":
     "Kun dette projekt. De installerede filer kan føjes til versionsstyring og deles med dit team.",
-  "marketplace.install.scope.global.description":
-    "Alle projekter på denne maskine. Gemmes i din brugerkonfiguration.",
+  "marketplace.install.scope.global.description": "Alle projekter på denne maskine. Gemmes i din brugerkonfiguration.",
   "marketplace.install.destination": "Installationsplacering",
   "marketplace.install.about.mcp":
     "En MCP-server giver Kilo yderligere værktøjer til at arbejde med eksterne tjenester eller lokale programmer.",
@@ -73,8 +60,6 @@ export const dict = {
     "Er du sikker på, at du vil fjerne denne {{type}}? Dette vil fjerne den fra din {{scope}} konfiguration.",
   "marketplace.remove.cancel": "Annuller",
   "marketplace.remove.confirm.button": "Fjern",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agenter",
   "marketplace.search": "Søg...",
   "marketplace.filter.all": "Alle elementer",
   "marketplace.filter.notInstalled": "Ikke installeret",
@@ -82,12 +67,10 @@ export const dict = {
   "marketplace.empty": "Ingen elementer fundet",
   "marketplace.empty.relevant": "Der blev ikke fundet relevante marketplace-elementer for dette arbejdsområde.",
   "marketplace.badge.mcpServer": "MCP-server",
-  "marketplace.badge.mode": "Tilstand",
   "marketplace.card.by": "af {{author}}",
   "marketplace.install.method": "Installationsmetode",
   "marketplace.install.parameters": "Parametre",
   "marketplace.install.optional": "(valgfrit)",
-  "marketplace.install.required": "{{name}} er påkrævet",
   "marketplace.scope.project": "projekt",
   "marketplace.scope.global": "global",
   "marketplace.remove.type.mcp": "MCP-server",
@@ -129,8 +112,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Åbn i Diff-visning",
-  "ui.messagePart.shell.command": "Kommando",
-  "ui.messagePart.shell.output": "Output",
   "ui.messagePart.openInEditor": "Åbn i editor",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/de.ts b/packages/kilo-i18n/src/de.ts
index 8e4fe468a5c..d939be47485 100644
--- a/packages/kilo-i18n/src/de.ts
+++ b/packages/kilo-i18n/src/de.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway bietet Ihnen Zugang zu einer kuratierten Auswahl zuverlässiger, optimierter Modelle für Coding-Agenten.",
-  "provider.connect.kiloGateway.line2":
-    "Mit einem einzigen API-Schlüssel erhalten Sie Zugang zu Modellen wie Claude, GPT, Gemini, GLM und mehr.",
-  "provider.connect.kiloGateway.visit.prefix": "Besuchen Sie ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": ", um Ihren API-Schlüssel zu erhalten.",
   "provider.connect.kiloGateway.byok.prefix": "Für weitere Nutzungsstatistiken ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": " nutzen.",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Einheitlicher Zugriff auf KI-Modelle mit intelligentem Routing",
 
   // Reasoning block label
-  "ui.permission.run": "Ausführen",
   "ui.reasoning.label": "Denken",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "MCP-Server",
-  "marketplace.category.all": "Alle",
-  "marketplace.placeholder": "Noch nicht implementiert",
   "marketplace.card.installed": "Installiert",
   "marketplace.card.install": "Installieren",
   "marketplace.card.remove": "Entfernen",
@@ -75,8 +63,6 @@ export const dict = {
     "Sind Sie sicher, dass Sie diese {{type}} entfernen möchten? Dadurch wird sie aus Ihrer {{scope}}-Konfiguration entfernt.",
   "marketplace.remove.cancel": "Abbrechen",
   "marketplace.remove.confirm.button": "Entfernen",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agenten",
   "marketplace.search": "Suchen...",
   "marketplace.filter.all": "Alle Elemente",
   "marketplace.filter.notInstalled": "Nicht installiert",
@@ -84,12 +70,10 @@ export const dict = {
   "marketplace.empty": "Keine Elemente gefunden",
   "marketplace.empty.relevant": "Keine relevanten Marketplace-Elemente für diesen Arbeitsbereich gefunden.",
   "marketplace.badge.mcpServer": "MCP-Server",
-  "marketplace.badge.mode": "Modus",
   "marketplace.card.by": "von {{author}}",
   "marketplace.install.method": "Installationsmethode",
   "marketplace.install.parameters": "Parameter",
   "marketplace.install.optional": "(optional)",
-  "marketplace.install.required": "{{name}} ist erforderlich",
   "marketplace.scope.project": "Projekt",
   "marketplace.scope.global": "Global",
   "marketplace.remove.type.mcp": "MCP-Server",
@@ -131,8 +115,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Im Diff-Viewer öffnen",
-  "ui.messagePart.shell.command": "Befehl",
-  "ui.messagePart.shell.output": "Ausgabe",
   "ui.messagePart.openInEditor": "Im Editor öffnen",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/en.ts b/packages/kilo-i18n/src/en.ts
index 9eb679e3a03..6a36289765e 100644
--- a/packages/kilo-i18n/src/en.ts
+++ b/packages/kilo-i18n/src/en.ts
@@ -2,13 +2,6 @@
 // Keys here will override any matching keys from upstream translations
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway gives you access to a curated set of reliable optimized models for coding agents.",
-  "provider.connect.kiloGateway.line2":
-    "With a single API key you'll get access to models such as Claude, GPT, Gemini, GLM and more.",
-  "provider.connect.kiloGateway.visit.prefix": "Visit ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " to collect your API key.",
   "provider.connect.kiloGateway.byok.prefix": "For more usage stats, ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -26,14 +19,9 @@ export const dict = {
   "settings.providers.note.vercel": "Unified access to AI models with smart routing",
 
   // Reasoning block label
-  "ui.permission.run": "Run",
   "ui.reasoning.label": "Reasoning",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "MCP Servers",
-  "marketplace.category.all": "All",
-  "marketplace.placeholder": "To be implemented",
   "marketplace.card.installed": "Installed",
   "marketplace.card.install": "Install",
   "marketplace.card.remove": "Remove",
@@ -51,7 +39,8 @@ export const dict = {
   "marketplace.install.about.mcp":
     "An MCP server gives Kilo additional tools for working with external services or local programs.",
   "marketplace.install.about.agent": "An agent adds a reusable role with its own instructions and permissions.",
-  "marketplace.install.about.skill": "A skill adds task-specific instructions and resources that Kilo can load when needed.",
+  "marketplace.install.about.skill":
+    "A skill adds task-specific instructions and resources that Kilo can load when needed.",
   "marketplace.install.mcp.warning":
     "MCP servers can run local commands or connect to external services. Kilo will ask for permission before using their tools unless your permissions allow them automatically.",
   "marketplace.install.project.warning":
@@ -73,8 +62,6 @@ export const dict = {
     "Are you sure you want to remove this {{type}}? This will remove it from your {{scope}} configuration.",
   "marketplace.remove.cancel": "Cancel",
   "marketplace.remove.confirm.button": "Remove",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agents",
   "marketplace.search": "Search...",
   "marketplace.filter.all": "All Items",
   "marketplace.filter.notInstalled": "Not Installed",
@@ -82,12 +69,10 @@ export const dict = {
   "marketplace.empty": "No items found",
   "marketplace.empty.relevant": "No relevant marketplace items found for this workspace.",
   "marketplace.badge.mcpServer": "MCP Server",
-  "marketplace.badge.mode": "Mode",
   "marketplace.card.by": "by {{author}}",
   "marketplace.install.method": "Installation Method",
   "marketplace.install.parameters": "Parameters",
   "marketplace.install.optional": "(optional)",
-  "marketplace.install.required": "{{name}} is required",
   "marketplace.scope.project": "project",
   "marketplace.scope.global": "global",
   "marketplace.remove.type.mcp": "MCP server",
@@ -134,8 +119,6 @@ export const dict = {
   // Edit-tool header: hover-revealed action opening the diff in a full tab.
   "ui.messagePart.openInDiffViewer": "Open in Diff Viewer",
   // Shell-tool section labels and actions.
-  "ui.messagePart.shell.command": "Command",
-  "ui.messagePart.shell.output": "Output",
   "ui.messagePart.openInEditor": "Open in Editor",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/es.ts b/packages/kilo-i18n/src/es.ts
index a72ba48094c..0e71b78c762 100644
--- a/packages/kilo-i18n/src/es.ts
+++ b/packages/kilo-i18n/src/es.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway te da acceso a un conjunto seleccionado de modelos optimizados y confiables para agentes de codificación.",
-  "provider.connect.kiloGateway.line2":
-    "Con una sola clave API tendrás acceso a modelos como Claude, GPT, Gemini, GLM y más.",
-  "provider.connect.kiloGateway.visit.prefix": "Visita ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " para obtener tu clave API.",
   "provider.connect.kiloGateway.byok.prefix": "Para más estadísticas de uso, utiliza ",
   "provider.connect.kiloGateway.byok.link": "BYOK a través de Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Acceso unificado a modelos de IA con enrutamiento inteligente",
 
   // Reasoning block label
-  "ui.permission.run": "Ejecutar",
   "ui.reasoning.label": "Razonamiento",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "Servidores MCP",
-  "marketplace.category.all": "Todos",
-  "marketplace.placeholder": "Por implementar",
   "marketplace.card.installed": "Instalado",
   "marketplace.card.install": "Instalar",
   "marketplace.card.remove": "Eliminar",
@@ -49,8 +37,7 @@ export const dict = {
   "marketplace.install.destination": "Destino de la instalación",
   "marketplace.install.about.mcp":
     "Un servidor MCP proporciona a Kilo herramientas adicionales para trabajar con servicios externos o programas locales.",
-  "marketplace.install.about.agent":
-    "Un agente añade un rol reutilizable con sus propias instrucciones y permisos.",
+  "marketplace.install.about.agent": "Un agente añade un rol reutilizable con sus propias instrucciones y permisos.",
   "marketplace.install.about.skill":
     "Una habilidad añade instrucciones y recursos específicos para tareas que Kilo puede cargar cuando sea necesario.",
   "marketplace.install.mcp.warning":
@@ -74,8 +61,6 @@ export const dict = {
     "¿Estás seguro de que deseas eliminar este {{type}}? Esto lo eliminará de tu configuración {{scope}}.",
   "marketplace.remove.cancel": "Cancelar",
   "marketplace.remove.confirm.button": "Eliminar",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agentes",
   "marketplace.search": "Buscar...",
   "marketplace.filter.all": "Todos los elementos",
   "marketplace.filter.notInstalled": "No instalado",
@@ -83,12 +68,10 @@ export const dict = {
   "marketplace.empty": "No se encontraron elementos",
   "marketplace.empty.relevant": "No se encontraron elementos relevantes del marketplace para este espacio de trabajo.",
   "marketplace.badge.mcpServer": "Servidor MCP",
-  "marketplace.badge.mode": "Modo",
   "marketplace.card.by": "por {{author}}",
   "marketplace.install.method": "Método de instalación",
   "marketplace.install.parameters": "Parámetros",
   "marketplace.install.optional": "(opcional)",
-  "marketplace.install.required": "{{name}} es obligatorio",
   "marketplace.scope.project": "proyecto",
   "marketplace.scope.global": "global",
   "marketplace.remove.type.mcp": "servidor MCP",
@@ -130,8 +113,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Abrir en el visor de diferencias",
-  "ui.messagePart.shell.command": "Comando",
-  "ui.messagePart.shell.output": "Salida",
   "ui.messagePart.openInEditor": "Abrir en el editor",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/fr.ts b/packages/kilo-i18n/src/fr.ts
index 6f654770827..ae5635dfaa8 100644
--- a/packages/kilo-i18n/src/fr.ts
+++ b/packages/kilo-i18n/src/fr.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway vous donne accès à une sélection de modèles fiables et optimisés pour les agents de codage.",
-  "provider.connect.kiloGateway.line2":
-    "Avec une seule clé API, vous aurez accès à des modèles tels que Claude, GPT, Gemini, GLM et plus encore.",
-  "provider.connect.kiloGateway.visit.prefix": "Visitez ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " pour obtenir votre clé API.",
   "provider.connect.kiloGateway.byok.prefix": "Pour plus de statistiques d'utilisation, utilisez ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Accès unifié aux modèles IA avec routage intelligent",
 
   // Reasoning block label
-  "ui.permission.run": "Exécuter",
   "ui.reasoning.label": "Raisonnement",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "Serveurs MCP",
-  "marketplace.category.all": "Tout",
-  "marketplace.placeholder": "À implémenter",
   "marketplace.card.installed": "Installé",
   "marketplace.card.install": "Installer",
   "marketplace.card.remove": "Supprimer",
@@ -75,8 +63,6 @@ export const dict = {
     "Êtes-vous sûr de vouloir supprimer ce {{type}} ? Cela le supprimera de votre configuration {{scope}}.",
   "marketplace.remove.cancel": "Annuler",
   "marketplace.remove.confirm.button": "Supprimer",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agents",
   "marketplace.search": "Rechercher...",
   "marketplace.filter.all": "Tous les éléments",
   "marketplace.filter.notInstalled": "Non installé",
@@ -84,12 +70,10 @@ export const dict = {
   "marketplace.empty": "Aucun élément trouvé",
   "marketplace.empty.relevant": "Aucun élément pertinent du marketplace trouvé pour cet espace de travail.",
   "marketplace.badge.mcpServer": "Serveur MCP",
-  "marketplace.badge.mode": "Mode",
   "marketplace.card.by": "par {{author}}",
   "marketplace.install.method": "Méthode d'installation",
   "marketplace.install.parameters": "Paramètres",
   "marketplace.install.optional": "(facultatif)",
-  "marketplace.install.required": "{{name}} est requis",
   "marketplace.scope.project": "projet",
   "marketplace.scope.global": "global",
   "marketplace.remove.type.mcp": "serveur MCP",
@@ -131,8 +115,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Ouvrir dans le visualiseur de différences",
-  "ui.messagePart.shell.command": "Commande",
-  "ui.messagePart.shell.output": "Sortie",
   "ui.messagePart.openInEditor": "Ouvrir dans l'éditeur",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/it.ts b/packages/kilo-i18n/src/it.ts
index 229be83c14a..d1445f057f7 100644
--- a/packages/kilo-i18n/src/it.ts
+++ b/packages/kilo-i18n/src/it.ts
@@ -2,13 +2,6 @@
 // Keys here will override any matching keys from upstream translations
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway ti offre una selezione curata di modelli affidabili e ottimizzati per agenti di coding.",
-  "provider.connect.kiloGateway.line2":
-    "Con una sola API key puoi accedere a modelli come Claude, GPT, Gemini, GLM e altri.",
-  "provider.connect.kiloGateway.visit.prefix": "Visita ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " per ottenere la tua API key.",
   "provider.connect.kiloGateway.byok.prefix": "Per ulteriori statistiche sull'utilizzo, utilizza ",
   "provider.connect.kiloGateway.byok.link": "BYOK tramite Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -26,15 +19,9 @@ export const dict = {
   "settings.providers.note.vercel": "Accesso unificato ai modelli IA con routing intelligente",
 
   // Reasoning block label
-  "ui.permission.run": "Esegui",
   "ui.reasoning.label": "Ragionamento",
 
   // Marketplace
-  "marketplace.tab.skills": "Skill",
-  "marketplace.tab.mcpServers": "Server MCP",
-  "marketplace.tab.agents": "Agenti",
-  "marketplace.category.all": "Tutti",
-  "marketplace.placeholder": "Da implementare",
   "marketplace.card.installed": "Installato",
   "marketplace.card.install": "Installa",
   "marketplace.card.remove": "Rimuovi",
@@ -76,7 +63,6 @@ export const dict = {
   "marketplace.remove.confirm": "Vuoi davvero rimuovere questo {{type}}? Verrà rimosso dalla configurazione {{scope}}.",
   "marketplace.remove.cancel": "Annulla",
   "marketplace.remove.confirm.button": "Rimuovi",
-  "marketplace.tab.mcp": "MCP",
   "marketplace.search": "Cerca...",
   "marketplace.filter.all": "Tutti gli elementi",
   "marketplace.filter.notInstalled": "Non installati",
@@ -84,12 +70,10 @@ export const dict = {
   "marketplace.empty": "Nessun elemento trovato",
   "marketplace.empty.relevant": "Nessun elemento rilevante del marketplace trovato per questo spazio di lavoro.",
   "marketplace.badge.mcpServer": "Server MCP",
-  "marketplace.badge.mode": "Modalità",
   "marketplace.card.by": "di {{author}}",
   "marketplace.install.method": "Metodo di installazione",
   "marketplace.install.parameters": "Parametri",
   "marketplace.install.optional": "(opzionale)",
-  "marketplace.install.required": "{{name}} è obbligatorio",
   "marketplace.scope.project": "progetto",
   "marketplace.scope.global": "globale",
   "marketplace.remove.type.mcp": "server MCP",
@@ -129,8 +113,6 @@ export const dict = {
     "Disattiva gli snapshot di Kilo per questo progetto. Perderai annulla/ripeti sulle modifiche ai file fatte da Kilo, ma git continuerà a tracciare tutto.",
 
   "ui.messagePart.openInDiffViewer": "Apri nel visualizzatore diff",
-  "ui.messagePart.shell.command": "Comando",
-  "ui.messagePart.shell.output": "Output",
   "ui.messagePart.openInEditor": "Apri nell'editor",
 
   "ui.message.feedback.helpful": "È stato utile",
diff --git a/packages/kilo-i18n/src/ja.ts b/packages/kilo-i18n/src/ja.ts
index c1699834b6d..ed30565559f 100644
--- a/packages/kilo-i18n/src/ja.ts
+++ b/packages/kilo-i18n/src/ja.ts
@@ -1,11 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gatewayは、コーディングエージェント向けに厳選された信頼性の高い最適化モデルへのアクセスを提供します。",
-  "provider.connect.kiloGateway.line2": "1つのAPIキーで、Claude、GPT、Gemini、GLMなどのモデルにアクセスできます。",
-  "provider.connect.kiloGateway.visit.prefix": "",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " にアクセスしてAPIキーを取得してください。",
   "provider.connect.kiloGateway.byok.prefix": "詳細な使用統計については、",
   "provider.connect.kiloGateway.byok.link": "Kilo's Gateway経由でBYOK",
   "provider.connect.kiloGateway.byok.suffix": "をご利用ください。",
@@ -23,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "スマートルーティングによるAIモデルへの統合アクセス",
 
   // Reasoning block label
-  "ui.permission.run": "実行",
   "ui.reasoning.label": "推論",
 
   // Marketplace
-  "marketplace.tab.skills": "スキル",
-  "marketplace.tab.mcpServers": "MCPサーバー",
-  "marketplace.category.all": "すべて",
-  "marketplace.placeholder": "未実装",
   "marketplace.card.installed": "インストール済み",
   "marketplace.card.install": "インストール",
   "marketplace.card.remove": "削除",
@@ -43,14 +32,12 @@ export const dict = {
   "marketplace.install.scope.global": "グローバル",
   "marketplace.install.scope.project.description":
     "このプロジェクトのみ。インストールしたファイルはバージョン管理に追加し、チームと共有できます。",
-  "marketplace.install.scope.global.description":
-    "このマシン上のすべてのプロジェクト。ユーザー設定に保存されます。",
+  "marketplace.install.scope.global.description": "このマシン上のすべてのプロジェクト。ユーザー設定に保存されます。",
   "marketplace.install.destination": "インストール先",
   "marketplace.install.about.mcp":
     "MCPサーバーは、外部サービスやローカルプログラムを操作するための追加ツールをKiloに提供します。",
   "marketplace.install.about.agent": "エージェントは、独自の指示と権限を持つ再利用可能な役割を追加します。",
-  "marketplace.install.about.skill":
-    "スキルは、必要に応じてKiloが読み込めるタスク固有の指示とリソースを追加します。",
+  "marketplace.install.about.skill": "スキルは、必要に応じてKiloが読み込めるタスク固有の指示とリソースを追加します。",
   "marketplace.install.mcp.warning":
     "MCPサーバーはローカルコマンドを実行したり、外部サービスに接続したりできます。権限で自動的に許可されていない限り、Kiloはツールを使用する前に許可を求めます。",
   "marketplace.install.project.warning":
@@ -72,8 +59,6 @@ export const dict = {
   "marketplace.remove.confirm": "この{{type}}を削除してもよろしいですか？ これにより、{{scope}}設定から削除されます。",
   "marketplace.remove.cancel": "キャンセル",
   "marketplace.remove.confirm.button": "削除",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "エージェント",
   "marketplace.search": "検索...",
   "marketplace.filter.all": "すべてのアイテム",
   "marketplace.filter.notInstalled": "未インストール",
@@ -81,12 +66,10 @@ export const dict = {
   "marketplace.empty": "アイテムが見つかりません",
   "marketplace.empty.relevant": "このワークスペースに関連するマーケットプレイスのアイテムが見つかりませんでした。",
   "marketplace.badge.mcpServer": "MCPサーバー",
-  "marketplace.badge.mode": "モード",
   "marketplace.card.by": "作成者: {{author}}",
   "marketplace.install.method": "インストール方法",
   "marketplace.install.parameters": "パラメーター",
   "marketplace.install.optional": "(任意)",
-  "marketplace.install.required": "{{name}} は必須です",
   "marketplace.scope.project": "プロジェクト",
   "marketplace.scope.global": "グローバル",
   "marketplace.remove.type.mcp": "MCPサーバー",
@@ -128,8 +111,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "差分ビューアーで開く",
-  "ui.messagePart.shell.command": "コマンド",
-  "ui.messagePart.shell.output": "出力",
   "ui.messagePart.openInEditor": "エディタで開く",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/ko.ts b/packages/kilo-i18n/src/ko.ts
index a0e760dd541..cc7fa9c8f8c 100644
--- a/packages/kilo-i18n/src/ko.ts
+++ b/packages/kilo-i18n/src/ko.ts
@@ -1,11 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway는 코딩 에이전트를 위한 신뢰할 수 있는 최적화된 모델 세트를 제공합니다.",
-  "provider.connect.kiloGateway.line2": "하나의 API 키로 Claude, GPT, Gemini, GLM 등의 모델을 사용할 수 있습니다.",
-  "provider.connect.kiloGateway.visit.prefix": "",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": "를 방문하여 API 키를 받으세요.",
   "provider.connect.kiloGateway.byok.prefix": "더 많은 사용 통계를 보려면 ",
   "provider.connect.kiloGateway.byok.link": "Kilo's Gateway를 통해 BYOK",
   "provider.connect.kiloGateway.byok.suffix": "를 사용하세요.",
@@ -23,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "스마트 라우팅으로 AI 모델에 통합 액세스",
 
   // Reasoning block label
-  "ui.permission.run": "실행",
   "ui.reasoning.label": "추론",
 
   // Marketplace
-  "marketplace.tab.skills": "스킬",
-  "marketplace.tab.mcpServers": "MCP 서버",
-  "marketplace.category.all": "전체",
-  "marketplace.placeholder": "구현 예정",
   "marketplace.card.installed": "설치됨",
   "marketplace.card.install": "설치",
   "marketplace.card.remove": "제거",
@@ -43,14 +32,12 @@ export const dict = {
   "marketplace.install.scope.global": "글로벌",
   "marketplace.install.scope.project.description":
     "이 프로젝트에만 적용됩니다. 설치된 파일을 버전 관리에 추가하고 팀과 공유할 수 있습니다.",
-  "marketplace.install.scope.global.description":
-    "이 컴퓨터의 모든 프로젝트에 적용됩니다. 사용자 구성에 저장됩니다.",
+  "marketplace.install.scope.global.description": "이 컴퓨터의 모든 프로젝트에 적용됩니다. 사용자 구성에 저장됩니다.",
   "marketplace.install.destination": "설치 위치",
   "marketplace.install.about.mcp":
     "MCP 서버는 외부 서비스나 로컬 프로그램과 작업할 수 있는 추가 도구를 Kilo에 제공합니다.",
   "marketplace.install.about.agent": "에이전트는 자체 지침과 권한을 가진 재사용 가능한 역할을 추가합니다.",
-  "marketplace.install.about.skill":
-    "스킬은 필요할 때 Kilo가 불러올 수 있는 작업별 지침과 리소스를 추가합니다.",
+  "marketplace.install.about.skill": "스킬은 필요할 때 Kilo가 불러올 수 있는 작업별 지침과 리소스를 추가합니다.",
   "marketplace.install.mcp.warning":
     "MCP 서버는 로컬 명령을 실행하거나 외부 서비스에 연결할 수 있습니다. 권한 설정에서 자동으로 허용하지 않는 한 Kilo는 도구를 사용하기 전에 권한을 요청합니다.",
   "marketplace.install.project.warning":
@@ -58,8 +45,7 @@ export const dict = {
   "marketplace.install.learnMore": "Marketplace 설치 방식 알아보기",
   "marketplace.install.learnMcp": "MCP 자세히 알아보기",
   "marketplace.install.installedAt": "{{path}}에 설치됨",
-  "marketplace.intro":
-    "재사용 가능한 에이전트, 스킬 및 MCP 도구를 하나의 프로젝트 또는 모든 프로젝트에 설치하세요.",
+  "marketplace.intro": "재사용 가능한 에이전트, 스킬 및 MCP 도구를 하나의 프로젝트 또는 모든 프로젝트에 설치하세요.",
   "marketplace.intro.learnMore": "Marketplace 정보",
   "marketplace.install.prerequisites": "사전 요구 사항",
   "marketplace.install.installing": "설치 중...",
@@ -72,8 +58,6 @@ export const dict = {
   "marketplace.remove.confirm": "이 {{type}}을(를) 제거하시겠습니까? {{scope}} 구성에서 제거됩니다.",
   "marketplace.remove.cancel": "취소",
   "marketplace.remove.confirm.button": "제거",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "에이전트",
   "marketplace.search": "검색...",
   "marketplace.filter.all": "모든 항목",
   "marketplace.filter.notInstalled": "설치되지 않음",
@@ -81,12 +65,10 @@ export const dict = {
   "marketplace.empty": "항목을 찾을 수 없음",
   "marketplace.empty.relevant": "이 작업 영역과 관련된 마켓플레이스 항목을 찾을 수 없습니다.",
   "marketplace.badge.mcpServer": "MCP 서버",
-  "marketplace.badge.mode": "모드",
   "marketplace.card.by": "제작: {{author}}",
   "marketplace.install.method": "설치 방법",
   "marketplace.install.parameters": "매개변수",
   "marketplace.install.optional": "(선택 사항)",
-  "marketplace.install.required": "{{name}}이(가) 필요합니다",
   "marketplace.scope.project": "프로젝트",
   "marketplace.scope.global": "글로벌",
   "marketplace.remove.type.mcp": "MCP 서버",
@@ -128,8 +110,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "차이점 뷰어에서 열기",
-  "ui.messagePart.shell.command": "명령어",
-  "ui.messagePart.shell.output": "출력",
   "ui.messagePart.openInEditor": "편집기에서 열기",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/nl.ts b/packages/kilo-i18n/src/nl.ts
index bf4f116fd47..948254ee771 100644
--- a/packages/kilo-i18n/src/nl.ts
+++ b/packages/kilo-i18n/src/nl.ts
@@ -2,13 +2,6 @@
 // Keys here will override any matching keys from upstream translations
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway geeft je toegang tot een gecureerde set van betrouwbare, geoptimaliseerde modellen voor coding agents.",
-  "provider.connect.kiloGateway.line2":
-    "Met één enkele API key krijg je toegang tot modellen zoals Claude, GPT, Gemini, GLM en meer.",
-  "provider.connect.kiloGateway.visit.prefix": "Bezoek ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " om je API key op te halen.",
   "provider.connect.kiloGateway.byok.prefix": "Voor meer gebruiksstatistieken, gebruik ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -26,14 +19,9 @@ export const dict = {
   "settings.providers.note.vercel": "Geïntegreerde toegang tot AI-modellen met slimme routering",
 
   // Reasoning block label
-  "ui.permission.run": "Uitvoeren",
   "ui.reasoning.label": "Redenering",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "MCP Servers",
-  "marketplace.category.all": "Alle",
-  "marketplace.placeholder": "Nog te implementeren",
   "marketplace.card.installed": "Geïnstalleerd",
   "marketplace.card.install": "Installeren",
   "marketplace.card.remove": "Verwijderen",
@@ -76,8 +64,6 @@ export const dict = {
     "Weet je zeker dat je deze {{type}} wilt verwijderen? Dit verwijdert het uit je {{scope}} configuratie.",
   "marketplace.remove.cancel": "Annuleren",
   "marketplace.remove.confirm.button": "Verwijderen",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agenten",
   "marketplace.search": "Zoeken...",
   "marketplace.filter.all": "Alle items",
   "marketplace.filter.notInstalled": "Niet geïnstalleerd",
@@ -85,12 +71,10 @@ export const dict = {
   "marketplace.empty": "Geen items gevonden",
   "marketplace.empty.relevant": "Geen relevante marketplace-items gevonden voor deze werkruimte.",
   "marketplace.badge.mcpServer": "MCP Server",
-  "marketplace.badge.mode": "Modus",
   "marketplace.card.by": "door {{author}}",
   "marketplace.install.method": "Installatiemethode",
   "marketplace.install.parameters": "Parameters",
   "marketplace.install.optional": "(optioneel)",
-  "marketplace.install.required": "{{name}} is vereist",
   "marketplace.scope.project": "project",
   "marketplace.scope.global": "globaal",
   "marketplace.remove.type.mcp": "MCP server",
@@ -132,8 +116,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Openen in Diff-weergave",
-  "ui.messagePart.shell.command": "Opdracht",
-  "ui.messagePart.shell.output": "Uitvoer",
   "ui.messagePart.openInEditor": "Openen in editor",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/no.ts b/packages/kilo-i18n/src/no.ts
index c28bfb16cda..cdee5f5a106 100644
--- a/packages/kilo-i18n/src/no.ts
+++ b/packages/kilo-i18n/src/no.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway gir deg tilgang til et utvalgt sett med pålitelige, optimaliserte modeller for kodingsagenter.",
-  "provider.connect.kiloGateway.line2":
-    "Med én enkelt API-nøkkel får du tilgang til modeller som Claude, GPT, Gemini, GLM og flere.",
-  "provider.connect.kiloGateway.visit.prefix": "Besøk ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " for å hente API-nøkkelen din.",
   "provider.connect.kiloGateway.byok.prefix": "For mer bruksstatistikk, bruk ",
   "provider.connect.kiloGateway.byok.link": "BYOK via Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Samlet tilgang til AI-modeller med smart ruting",
 
   // Reasoning block label
-  "ui.permission.run": "Kjør",
   "ui.reasoning.label": "Resonnement",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "MCP-servere",
-  "marketplace.category.all": "Alle",
-  "marketplace.placeholder": "Skal implementeres",
   "marketplace.card.installed": "Installert",
   "marketplace.card.install": "Installer",
   "marketplace.card.remove": "Fjern",
@@ -73,8 +61,6 @@ export const dict = {
     "Er du sikker på at du vil fjerne denne {{type}}? Dette vil fjerne den fra din {{scope}}-konfigurasjon.",
   "marketplace.remove.cancel": "Avbryt",
   "marketplace.remove.confirm.button": "Fjern",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agenter",
   "marketplace.search": "Søk...",
   "marketplace.filter.all": "Alle elementer",
   "marketplace.filter.notInstalled": "Ikke installert",
@@ -82,12 +68,10 @@ export const dict = {
   "marketplace.empty": "Ingen elementer funnet",
   "marketplace.empty.relevant": "Ingen relevante marketplace-elementer funnet for dette arbeidsområdet.",
   "marketplace.badge.mcpServer": "MCP-server",
-  "marketplace.badge.mode": "Modus",
   "marketplace.card.by": "av {{author}}",
   "marketplace.install.method": "Installasjonsmetode",
   "marketplace.install.parameters": "Parametere",
   "marketplace.install.optional": "(valgfritt)",
-  "marketplace.install.required": "{{name}} er påkrevd",
   "marketplace.scope.project": "prosjekt",
   "marketplace.scope.global": "global",
   "marketplace.remove.type.mcp": "MCP-server",
@@ -129,8 +113,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Åpne i diff-visning",
-  "ui.messagePart.shell.command": "Kommando",
-  "ui.messagePart.shell.output": "Utdata",
   "ui.messagePart.openInEditor": "Åpne i editor",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/pl.ts b/packages/kilo-i18n/src/pl.ts
index 6764a61f265..ba4679a5443 100644
--- a/packages/kilo-i18n/src/pl.ts
+++ b/packages/kilo-i18n/src/pl.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway zapewnia dostęp do wyselekcjonowanego zestawu niezawodnych, zoptymalizowanych modeli dla agentów kodowania.",
-  "provider.connect.kiloGateway.line2":
-    "Za pomocą jednego klucza API uzyskasz dostęp do modeli takich jak Claude, GPT, Gemini, GLM i innych.",
-  "provider.connect.kiloGateway.visit.prefix": "Odwiedź ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": ", aby otrzymać swój klucz API.",
   "provider.connect.kiloGateway.byok.prefix": "Aby uzyskać więcej statystyk użycia, użyj ",
   "provider.connect.kiloGateway.byok.link": "BYOK przez Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Ujednolicony dostęp do modeli AI z inteligentnym routingiem",
 
   // Reasoning block label
-  "ui.permission.run": "Uruchom",
   "ui.reasoning.label": "Rozumowanie",
 
   // Marketplace
-  "marketplace.tab.skills": "Skills",
-  "marketplace.tab.mcpServers": "Serwery MCP",
-  "marketplace.category.all": "Wszystkie",
-  "marketplace.placeholder": "Do zaimplementowania",
   "marketplace.card.installed": "Zainstalowano",
   "marketplace.card.install": "Zainstaluj",
   "marketplace.card.remove": "Usuń",
@@ -74,8 +62,6 @@ export const dict = {
     "Czy na pewno chcesz usunąć ten {{type}}? Spowoduje to usunięcie z konfiguracji: {{scope}}.",
   "marketplace.remove.cancel": "Anuluj",
   "marketplace.remove.confirm.button": "Usuń",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Agenci",
   "marketplace.search": "Szukaj...",
   "marketplace.filter.all": "Wszystkie elementy",
   "marketplace.filter.notInstalled": "Nie zainstalowano",
@@ -83,12 +69,10 @@ export const dict = {
   "marketplace.empty": "Nie znaleziono elementów",
   "marketplace.empty.relevant": "Nie znaleziono elementów marketplace istotnych dla tego obszaru roboczego.",
   "marketplace.badge.mcpServer": "Serwer MCP",
-  "marketplace.badge.mode": "Tryb",
   "marketplace.card.by": "autor: {{author}}",
   "marketplace.install.method": "Metoda instalacji",
   "marketplace.install.parameters": "Parametry",
   "marketplace.install.optional": "(opcjonalne)",
-  "marketplace.install.required": "{{name}} jest wymagane",
   "marketplace.scope.project": "projekt",
   "marketplace.scope.global": "globalny",
   "marketplace.remove.type.mcp": "serwer MCP",
@@ -130,8 +114,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Otwórz w podglądzie różnic",
-  "ui.messagePart.shell.command": "Polecenie",
-  "ui.messagePart.shell.output": "Wyjście",
   "ui.messagePart.openInEditor": "Otwórz w edytorze",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/ru.ts b/packages/kilo-i18n/src/ru.ts
index d426d1c0f1f..4875ff7100f 100644
--- a/packages/kilo-i18n/src/ru.ts
+++ b/packages/kilo-i18n/src/ru.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway предоставляет доступ к подборке надёжных оптимизированных моделей для агентов кодирования.",
-  "provider.connect.kiloGateway.line2":
-    "С одним API-ключом вы получите доступ к моделям Claude, GPT, Gemini, GLM и другим.",
-  "provider.connect.kiloGateway.visit.prefix": "Посетите ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": ", чтобы получить ваш API-ключ.",
   "provider.connect.kiloGateway.byok.prefix": "Для получения дополнительной статистики использования используйте ",
   "provider.connect.kiloGateway.byok.link": "BYOK через Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Единый доступ к AI-моделям с умной маршрутизацией",
 
   // Reasoning block label
-  "ui.permission.run": "Запустить",
   "ui.reasoning.label": "Рассуждение",
 
   // Marketplace
-  "marketplace.tab.skills": "Навыки",
-  "marketplace.tab.mcpServers": "MCP-серверы",
-  "marketplace.category.all": "Все",
-  "marketplace.placeholder": "Будет реализовано",
   "marketplace.card.installed": "Установлено",
   "marketplace.card.install": "Установить",
   "marketplace.card.remove": "Удалить",
@@ -75,8 +63,6 @@ export const dict = {
     "Вы уверены, что хотите удалить этот {{type}}? Это удалит его из вашей конфигурации ({{scope}}).",
   "marketplace.remove.cancel": "Отмена",
   "marketplace.remove.confirm.button": "Удалить",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Агенты",
   "marketplace.search": "Поиск...",
   "marketplace.filter.all": "Все элементы",
   "marketplace.filter.notInstalled": "Не установлено",
@@ -84,12 +70,10 @@ export const dict = {
   "marketplace.empty": "Элементы не найдены",
   "marketplace.empty.relevant": "Для этого рабочего пространства не найдено подходящих элементов маркетплейса.",
   "marketplace.badge.mcpServer": "MCP-сервер",
-  "marketplace.badge.mode": "Режим",
   "marketplace.card.by": "от {{author}}",
   "marketplace.install.method": "Способ установки",
   "marketplace.install.parameters": "Параметры",
   "marketplace.install.optional": "(необязательно)",
-  "marketplace.install.required": "Требуется {{name}}",
   "marketplace.scope.project": "проект",
   "marketplace.scope.global": "глобально",
   "marketplace.remove.type.mcp": "MCP-сервер",
@@ -131,8 +115,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Открыть в просмотре различий",
-  "ui.messagePart.shell.command": "Команда",
-  "ui.messagePart.shell.output": "Вывод",
   "ui.messagePart.openInEditor": "Открыть в редакторе",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/th.ts b/packages/kilo-i18n/src/th.ts
index 11a2f317c9a..12455abf348 100644
--- a/packages/kilo-i18n/src/th.ts
+++ b/packages/kilo-i18n/src/th.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway ให้คุณเข้าถึงชุดโมเดลที่คัดสรรมาอย่างดีและเชื่อถือได้สำหรับตัวแทนเขียนโค้ด",
-  "provider.connect.kiloGateway.line2":
-    "ด้วย API key เดียว คุณจะสามารถเข้าถึงโมเดลต่างๆ เช่น Claude, GPT, Gemini, GLM และอื่นๆ",
-  "provider.connect.kiloGateway.visit.prefix": "เยี่ยมชม ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " เพื่อรับ API key ของคุณ",
   "provider.connect.kiloGateway.byok.prefix": "สำหรับสถิติการใช้งานเพิ่มเติม โปรดใช้ ",
   "provider.connect.kiloGateway.byok.link": "BYOK ผ่าน Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": "",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "เข้าถึงโมเดล AI แบบรวมศูนย์พร้อมการกำหนดเส้นทางอัจฉริยะ",
 
   // Reasoning block label
-  "ui.permission.run": "เรียกใช้",
   "ui.reasoning.label": "การให้เหตุผล",
 
   // Marketplace
-  "marketplace.tab.skills": "ทักษะ",
-  "marketplace.tab.mcpServers": "เซิร์ฟเวอร์ MCP",
-  "marketplace.category.all": "ทั้งหมด",
-  "marketplace.placeholder": "ยังไม่ได้ดำเนินการ",
   "marketplace.card.installed": "ติดตั้งแล้ว",
   "marketplace.card.install": "ติดตั้ง",
   "marketplace.card.remove": "ลบ",
@@ -44,14 +32,12 @@ export const dict = {
   "marketplace.install.scope.global": "โกลบอล",
   "marketplace.install.scope.project.description":
     "เฉพาะโปรเจกต์นี้ ไฟล์ที่ติดตั้งสามารถเพิ่มลงในระบบควบคุมเวอร์ชันและแชร์กับทีมของคุณได้",
-  "marketplace.install.scope.global.description":
-    "ทุกโปรเจกต์ในเครื่องนี้ จัดเก็บไว้ในการกำหนดค่าผู้ใช้ของคุณ",
+  "marketplace.install.scope.global.description": "ทุกโปรเจกต์ในเครื่องนี้ จัดเก็บไว้ในการกำหนดค่าผู้ใช้ของคุณ",
   "marketplace.install.destination": "ปลายทางการติดตั้ง",
   "marketplace.install.about.mcp":
     "เซิร์ฟเวอร์ MCP เพิ่มเครื่องมือให้ Kilo สำหรับทำงานกับบริการภายนอกหรือโปรแกรมในเครื่อง",
   "marketplace.install.about.agent": "เอเจนต์เพิ่มบทบาทที่นำกลับมาใช้ใหม่ได้พร้อมคำสั่งและสิทธิ์ของตนเอง",
-  "marketplace.install.about.skill":
-    "ทักษะเพิ่มคำสั่งและทรัพยากรเฉพาะงานที่ Kilo สามารถโหลดได้เมื่อจำเป็น",
+  "marketplace.install.about.skill": "ทักษะเพิ่มคำสั่งและทรัพยากรเฉพาะงานที่ Kilo สามารถโหลดได้เมื่อจำเป็น",
   "marketplace.install.mcp.warning":
     "เซิร์ฟเวอร์ MCP สามารถเรียกใช้คำสั่งในเครื่องหรือเชื่อมต่อกับบริการภายนอกได้ Kilo จะขออนุญาตก่อนใช้เครื่องมือ เว้นแต่สิทธิ์ของคุณจะอนุญาตโดยอัตโนมัติ",
   "marketplace.install.project.warning":
@@ -73,8 +59,6 @@ export const dict = {
     "คุณแน่ใจหรือไม่ว่าต้องการลบ {{type}} นี้? สิ่งนี้จะลบออกจากการกำหนดค่า {{scope}} ของคุณ",
   "marketplace.remove.cancel": "ยกเลิก",
   "marketplace.remove.confirm.button": "ลบ",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "เอเจนต์",
   "marketplace.search": "ค้นหา...",
   "marketplace.filter.all": "รายการทั้งหมด",
   "marketplace.filter.notInstalled": "ยังไม่ได้ติดตั้ง",
@@ -82,12 +66,10 @@ export const dict = {
   "marketplace.empty": "ไม่พบรายการ",
   "marketplace.empty.relevant": "ไม่พบรายการในมาร์เก็ตเพลสที่เกี่ยวข้องกับพื้นที่ทำงานนี้",
   "marketplace.badge.mcpServer": "เซิร์ฟเวอร์ MCP",
-  "marketplace.badge.mode": "โหมด",
   "marketplace.card.by": "โดย {{author}}",
   "marketplace.install.method": "วิธีการติดตั้ง",
   "marketplace.install.parameters": "พารามิเตอร์",
   "marketplace.install.optional": "(ไม่บังคับ)",
-  "marketplace.install.required": "จำเป็นต้องใช้ {{name}}",
   "marketplace.scope.project": "โปรเจ็กต์",
   "marketplace.scope.global": "โกลบอล",
   "marketplace.remove.type.mcp": "เซิร์ฟเวอร์ MCP",
@@ -129,8 +111,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "เปิดในตัวดูความแตกต่าง",
-  "ui.messagePart.shell.command": "คำสั่ง",
-  "ui.messagePart.shell.output": "ผลลัพธ์",
   "ui.messagePart.openInEditor": "เปิดในตัวแก้ไข",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/tr.ts b/packages/kilo-i18n/src/tr.ts
index a787e69f62c..bf162698d88 100644
--- a/packages/kilo-i18n/src/tr.ts
+++ b/packages/kilo-i18n/src/tr.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway, kodlama ajanları için optimize edilmiş güvenilir modellere erişim sağlar.",
-  "provider.connect.kiloGateway.line2":
-    "Tek bir API anahtarıyla Claude, GPT, Gemini, GLM ve daha fazlası gibi modellere erişebilirsiniz.",
-  "provider.connect.kiloGateway.visit.prefix": "API anahtarınızı almak için ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " adresini ziyaret edin.",
   "provider.connect.kiloGateway.byok.prefix": "Daha fazla kullanım istatistiği için ",
   "provider.connect.kiloGateway.byok.link": "Kilo's Gateway üzerinden BYOK",
   "provider.connect.kiloGateway.byok.suffix": " kullanın.",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Akıllı yönlendirme ile AI modellerine birleşik erişim",
 
   // Reasoning block label
-  "ui.permission.run": "Çalıştır",
   "ui.reasoning.label": "Akıl Yürütme",
 
   // Marketplace
-  "marketplace.tab.skills": "Yetenekler",
-  "marketplace.tab.mcpServers": "MCP Sunucuları",
-  "marketplace.category.all": "Tümü",
-  "marketplace.placeholder": "Uygulanacak",
   "marketplace.card.installed": "Yüklendi",
   "marketplace.card.install": "Yükle",
   "marketplace.card.remove": "Kaldır",
@@ -44,12 +32,12 @@ export const dict = {
   "marketplace.install.scope.global": "Genel",
   "marketplace.install.scope.project.description":
     "Yalnızca bu proje. Yüklenen dosyalar sürüm kontrolüne eklenebilir ve ekibinizle paylaşılabilir.",
-  "marketplace.install.scope.global.description":
-    "Bu makinedeki tüm projeler. Kullanıcı yapılandırmanızda saklanır.",
+  "marketplace.install.scope.global.description": "Bu makinedeki tüm projeler. Kullanıcı yapılandırmanızda saklanır.",
   "marketplace.install.destination": "Yükleme hedefi",
   "marketplace.install.about.mcp":
     "Bir MCP sunucusu, harici hizmetler veya yerel programlarla çalışmak için Kilo'ya ek araçlar sağlar.",
-  "marketplace.install.about.agent": "Bir ajan, kendi talimatları ve izinleri olan yeniden kullanılabilir bir rol ekler.",
+  "marketplace.install.about.agent":
+    "Bir ajan, kendi talimatları ve izinleri olan yeniden kullanılabilir bir rol ekler.",
   "marketplace.install.about.skill":
     "Bir yetenek, Kilo'nun gerektiğinde yükleyebileceği göreve özel talimatlar ve kaynaklar ekler.",
   "marketplace.install.mcp.warning":
@@ -74,8 +62,6 @@ export const dict = {
     "Bu {{type}} öğesini kaldırmak istediğinizden emin misiniz? Bu, {{scope}} yapılandırmanızdan kaldırılacaktır.",
   "marketplace.remove.cancel": "İptal",
   "marketplace.remove.confirm.button": "Kaldır",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Ajanlar",
   "marketplace.search": "Ara...",
   "marketplace.filter.all": "Tüm Öğeler",
   "marketplace.filter.notInstalled": "Yüklü Değil",
@@ -83,12 +69,10 @@ export const dict = {
   "marketplace.empty": "Öğe bulunamadı",
   "marketplace.empty.relevant": "Bu çalışma alanıyla ilgili marketplace öğesi bulunamadı.",
   "marketplace.badge.mcpServer": "MCP Sunucusu",
-  "marketplace.badge.mode": "Mod",
   "marketplace.card.by": "{{author}} tarafından",
   "marketplace.install.method": "Yükleme Yöntemi",
   "marketplace.install.parameters": "Parametreler",
   "marketplace.install.optional": "(isteğe bağlı)",
-  "marketplace.install.required": "{{name}} gereklidir",
   "marketplace.scope.project": "proje",
   "marketplace.scope.global": "genel",
   "marketplace.remove.type.mcp": "MCP sunucusu",
@@ -130,8 +114,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Fark Görüntüleyicide Aç",
-  "ui.messagePart.shell.command": "Komut",
-  "ui.messagePart.shell.output": "Çıktı",
   "ui.messagePart.openInEditor": "Düzenleyicide Aç",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/uk.ts b/packages/kilo-i18n/src/uk.ts
index b95a8240da7..9c7dc984a5c 100644
--- a/packages/kilo-i18n/src/uk.ts
+++ b/packages/kilo-i18n/src/uk.ts
@@ -1,12 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1":
-    "Kilo Gateway надає доступ до добірки надійних оптимізованих моделей для агентів кодування.",
-  "provider.connect.kiloGateway.line2":
-    "За допомогою одного API-ключа ви отримаєте доступ до таких моделей, як Claude, GPT, Gemini, GLM та інших.",
-  "provider.connect.kiloGateway.visit.prefix": "Відвідайте ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " щоб отримати свій API-ключ.",
   "provider.connect.kiloGateway.byok.prefix": "Для отримання додаткової статистики використання використовуйте ",
   "provider.connect.kiloGateway.byok.link": "BYOK через Kilo's Gateway",
   "provider.connect.kiloGateway.byok.suffix": ".",
@@ -24,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "Єдиний доступ до моделей ШІ з розумною маршрутизацією",
 
   // Reasoning block label
-  "ui.permission.run": "Виконати",
   "ui.reasoning.label": "Міркування",
 
   // Marketplace
-  "marketplace.tab.skills": "Навички",
-  "marketplace.tab.mcpServers": "MCP-сервери",
-  "marketplace.category.all": "Усі",
-  "marketplace.placeholder": "Буде реалізовано",
   "marketplace.card.installed": "Встановлено",
   "marketplace.card.install": "Встановити",
   "marketplace.card.remove": "Видалити",
@@ -49,8 +37,7 @@ export const dict = {
   "marketplace.install.destination": "Місце встановлення",
   "marketplace.install.about.mcp":
     "MCP-сервер надає Kilo додаткові інструменти для роботи із зовнішніми сервісами або локальними програмами.",
-  "marketplace.install.about.agent":
-    "Агент додає багаторазову роль із власними інструкціями та дозволами.",
+  "marketplace.install.about.agent": "Агент додає багаторазову роль із власними інструкціями та дозволами.",
   "marketplace.install.about.skill":
     "Навичка додає інструкції та ресурси для певних завдань, які Kilo може завантажити за потреби.",
   "marketplace.install.mcp.warning":
@@ -60,8 +47,7 @@ export const dict = {
   "marketplace.install.learnMore": "Дізнайтеся, як працює встановлення з Marketplace",
   "marketplace.install.learnMcp": "Докладніше про MCP",
   "marketplace.install.installedAt": "Встановлено в {{path}}",
-  "marketplace.intro":
-    "Встановлюйте багаторазових агентів, навички та інструменти MCP для одного або всіх проєктів.",
+  "marketplace.intro": "Встановлюйте багаторазових агентів, навички та інструменти MCP для одного або всіх проєктів.",
   "marketplace.intro.learnMore": "Про Marketplace",
   "marketplace.install.prerequisites": "Передумови",
   "marketplace.install.installing": "Встановлення...",
@@ -75,8 +61,6 @@ export const dict = {
     "Ви впевнені, що хочете видалити цей {{type}}? Це видалить його з вашої конфігурації {{scope}}.",
   "marketplace.remove.cancel": "Скасувати",
   "marketplace.remove.confirm.button": "Видалити",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "Агенти",
   "marketplace.search": "Пошук...",
   "marketplace.filter.all": "Усі елементи",
   "marketplace.filter.notInstalled": "Не встановлено",
@@ -84,12 +68,10 @@ export const dict = {
   "marketplace.empty": "Елементів не знайдено",
   "marketplace.empty.relevant": "Для цього робочого простору не знайдено відповідних елементів маркетплейсу.",
   "marketplace.badge.mcpServer": "MCP-сервер",
-  "marketplace.badge.mode": "Режим",
   "marketplace.card.by": "від {{author}}",
   "marketplace.install.method": "Метод встановлення",
   "marketplace.install.parameters": "Параметри",
   "marketplace.install.optional": "(необов'язково)",
-  "marketplace.install.required": "{{name}} є обов'язковим",
   "marketplace.scope.project": "проєкт",
   "marketplace.scope.global": "глобально",
   "marketplace.remove.type.mcp": "MCP-сервер",
@@ -131,8 +113,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "Відкрити в переглядачі відмінностей",
-  "ui.messagePart.shell.command": "Команда",
-  "ui.messagePart.shell.output": "Вивід",
   "ui.messagePart.openInEditor": "Відкрити в редакторі",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/zh.ts b/packages/kilo-i18n/src/zh.ts
index 8baddc98f38..ffc77d1ec03 100644
--- a/packages/kilo-i18n/src/zh.ts
+++ b/packages/kilo-i18n/src/zh.ts
@@ -1,10 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1": "Kilo Gateway 为您提供一组精选的可靠优化模型，专为编码代理设计。",
-  "provider.connect.kiloGateway.line2": "只需一个 API 密钥，您就可以使用 Claude、GPT、Gemini、GLM 等模型。",
-  "provider.connect.kiloGateway.visit.prefix": "访问 ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " 获取您的 API 密钥。",
   "provider.connect.kiloGateway.byok.prefix": "如需更多使用统计信息，请",
   "provider.connect.kiloGateway.byok.link": "通过 Kilo's Gateway 进行 BYOK",
   "provider.connect.kiloGateway.byok.suffix": "。",
@@ -22,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "通过智能路由统一访问 AI 模型",
 
   // Reasoning block label
-  "ui.permission.run": "运行",
   "ui.reasoning.label": "推理",
 
   // Marketplace
-  "marketplace.tab.skills": "技能",
-  "marketplace.tab.mcpServers": "MCP 服务器",
-  "marketplace.category.all": "全部",
-  "marketplace.placeholder": "待实现",
   "marketplace.card.installed": "已安装",
   "marketplace.card.install": "安装",
   "marketplace.card.remove": "移除",
@@ -40,12 +30,10 @@ export const dict = {
   "marketplace.install.scope": "作用域",
   "marketplace.install.scope.project": "项目",
   "marketplace.install.scope.global": "全局",
-  "marketplace.install.scope.project.description":
-    "仅限此项目。安装的文件可以提交到版本控制并与你的团队共享。",
+  "marketplace.install.scope.project.description": "仅限此项目。安装的文件可以提交到版本控制并与你的团队共享。",
   "marketplace.install.scope.global.description": "此计算机上的所有项目。存储在你的用户配置中。",
   "marketplace.install.destination": "安装位置",
-  "marketplace.install.about.mcp":
-    "MCP 服务器为 Kilo 提供用于处理外部服务或本地程序的额外工具。",
+  "marketplace.install.about.mcp": "MCP 服务器为 Kilo 提供用于处理外部服务或本地程序的额外工具。",
   "marketplace.install.about.agent": "智能体会添加一个具有专属指令和权限的可复用角色。",
   "marketplace.install.about.skill": "技能会添加特定任务的指令和资源，Kilo 可在需要时加载它们。",
   "marketplace.install.mcp.warning":
@@ -68,8 +56,6 @@ export const dict = {
   "marketplace.remove.confirm": "确定要移除此 {{type}} 吗？这会将其从你的 {{scope}} 配置中移除。",
   "marketplace.remove.cancel": "取消",
   "marketplace.remove.confirm.button": "移除",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "智能体",
   "marketplace.search": "搜索...",
   "marketplace.filter.all": "所有项目",
   "marketplace.filter.notInstalled": "未安装",
@@ -77,12 +63,10 @@ export const dict = {
   "marketplace.empty": "未找到项目",
   "marketplace.empty.relevant": "未找到与此工作区相关的市场项目。",
   "marketplace.badge.mcpServer": "MCP 服务器",
-  "marketplace.badge.mode": "模式",
   "marketplace.card.by": "作者：{{author}}",
   "marketplace.install.method": "安装方法",
   "marketplace.install.parameters": "参数",
   "marketplace.install.optional": "(可选)",
-  "marketplace.install.required": "{{name}} 是必填项",
   "marketplace.scope.project": "项目",
   "marketplace.scope.global": "全局",
   "marketplace.remove.type.mcp": "MCP 服务器",
@@ -122,8 +106,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "在差异查看器中打开",
-  "ui.messagePart.shell.command": "命令",
-  "ui.messagePart.shell.output": "输出",
   "ui.messagePart.openInEditor": "在编辑器中打开",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-i18n/src/zht.ts b/packages/kilo-i18n/src/zht.ts
index fdb58ffcaf7..3774a9a495e 100644
--- a/packages/kilo-i18n/src/zht.ts
+++ b/packages/kilo-i18n/src/zht.ts
@@ -1,10 +1,5 @@
 export const dict = {
   // Kilo Gateway provider translations
-  "provider.connect.kiloGateway.line1": "Kilo Gateway 為您提供一組精選的可靠優化模型，專為編碼代理設計。",
-  "provider.connect.kiloGateway.line2": "只需一個 API 金鑰，您就可以使用 Claude、GPT、Gemini、GLM 等模型。",
-  "provider.connect.kiloGateway.visit.prefix": "訪問 ",
-  "provider.connect.kiloGateway.visit.link": "kilo.ai",
-  "provider.connect.kiloGateway.visit.suffix": " 獲取您的 API 金鑰。",
   "provider.connect.kiloGateway.byok.prefix": "如需更多使用統計資訊，請",
   "provider.connect.kiloGateway.byok.link": "透過 Kilo's Gateway 進行 BYOK",
   "provider.connect.kiloGateway.byok.suffix": "。",
@@ -22,14 +17,9 @@ export const dict = {
   "settings.providers.note.vercel": "透過智慧路由統一存取 AI 模型",
 
   // Reasoning block label
-  "ui.permission.run": "執行",
   "ui.reasoning.label": "推理",
 
   // Marketplace
-  "marketplace.tab.skills": "技能",
-  "marketplace.tab.mcpServers": "MCP 伺服器",
-  "marketplace.category.all": "全部",
-  "marketplace.placeholder": "待實作",
   "marketplace.card.installed": "已安裝",
   "marketplace.card.install": "安裝",
   "marketplace.card.remove": "移除",
@@ -40,18 +30,15 @@ export const dict = {
   "marketplace.install.scope": "作用域",
   "marketplace.install.scope.project": "專案",
   "marketplace.install.scope.global": "全域",
-  "marketplace.install.scope.project.description":
-    "僅限此專案。安裝的檔案可以提交至版本控制並與你的團隊分享。",
+  "marketplace.install.scope.project.description": "僅限此專案。安裝的檔案可以提交至版本控制並與你的團隊分享。",
   "marketplace.install.scope.global.description": "此電腦上的所有專案。儲存在你的使用者設定中。",
   "marketplace.install.destination": "安裝位置",
-  "marketplace.install.about.mcp":
-    "MCP 伺服器為 Kilo 提供用於處理外部服務或本機程式的額外工具。",
+  "marketplace.install.about.mcp": "MCP 伺服器為 Kilo 提供用於處理外部服務或本機程式的額外工具。",
   "marketplace.install.about.agent": "智能體會新增一個具有專屬指示和權限的可重複使用角色。",
   "marketplace.install.about.skill": "技能會新增特定任務的指示和資源，Kilo 可在需要時載入它們。",
   "marketplace.install.mcp.warning":
     "MCP 伺服器可以執行本機命令或連線至外部服務。除非你的權限允許自動使用，否則 Kilo 會在使用其工具前請求許可。",
-  "marketplace.install.project.warning":
-    "專案檔案可能會提交至版本控制。除非設定引用了環境變數，否則請勿在此儲存密鑰。",
+  "marketplace.install.project.warning": "專案檔案可能會提交至版本控制。除非設定引用了環境變數，否則請勿在此儲存密鑰。",
   "marketplace.install.learnMore": "瞭解 Marketplace 安裝的運作方式",
   "marketplace.install.learnMcp": "深入瞭解 MCP",
   "marketplace.install.installedAt": "已安裝至 {{path}}",
@@ -68,8 +55,6 @@ export const dict = {
   "marketplace.remove.confirm": "確定要移除此 {{type}} 嗎？這會將其從你的 {{scope}} 設定中移除。",
   "marketplace.remove.cancel": "取消",
   "marketplace.remove.confirm.button": "移除",
-  "marketplace.tab.mcp": "MCP",
-  "marketplace.tab.agents": "智能體",
   "marketplace.search": "搜尋...",
   "marketplace.filter.all": "所有項目",
   "marketplace.filter.notInstalled": "未安裝",
@@ -77,12 +62,10 @@ export const dict = {
   "marketplace.empty": "找不到項目",
   "marketplace.empty.relevant": "找不到與此工作區相關的市集項目。",
   "marketplace.badge.mcpServer": "MCP 伺服器",
-  "marketplace.badge.mode": "模式",
   "marketplace.card.by": "作者：{{author}}",
   "marketplace.install.method": "安裝方法",
   "marketplace.install.parameters": "參數",
   "marketplace.install.optional": "(選填)",
-  "marketplace.install.required": "{{name}} 是必填項",
   "marketplace.scope.project": "專案",
   "marketplace.scope.global": "全域",
   "marketplace.remove.type.mcp": "MCP 伺服器",
@@ -122,8 +105,6 @@ export const dict = {
 
   // Edit-tool header and shell-tool section labels
   "ui.messagePart.openInDiffViewer": "在差異檢視器中開啟",
-  "ui.messagePart.shell.command": "命令",
-  "ui.messagePart.shell.output": "輸出",
   "ui.messagePart.openInEditor": "在編輯器中開啟",
 
   // Message feedback (thumbs up/down per assistant response)
diff --git a/packages/kilo-jetbrains/AGENTS.md b/packages/kilo-jetbrains/AGENTS.md
index 714f92feb08..05a80bf50cb 100644
--- a/packages/kilo-jetbrains/AGENTS.md
+++ b/packages/kilo-jetbrains/AGENTS.md
@@ -157,6 +157,7 @@ For blocking I/O in coroutines, move the dispatcher switch inside the callee usi
 
 - CLI process spawning, download, extraction, and lifecycle belong in `backend`.
 - By default, the plugin does not bundle CLI binaries. At connect time the backend downloads the GitHub Release asset for the version pinned in `packages/kilo-jetbrains/package.json`; `backend` resources include `kilo.properties` with `cli.version` and `cli.pinned` for split-mode RPC and runtime use.
+- Bundled release builds pass `-Pkilo.cli.bundled=true` while keeping `kilo.cli.pinned=true`. This build-only flag stages all pinned CLI release assets into `kilo-cli.zip`; runtime detects that resource and extracts only the current platform instead of downloading. Do not add a `cli.bundled` key to `kilo.properties` or repurpose `kilo.cli.pinned=false` for public bundled releases.
 - For release questions, use the `release-jetbrains` skill and reference `.kilo/skills/release-jetbrains/SKILL.md`; it verifies the CLI pin before creating immutable `jetbrains/v*` tags.
 - For OS and environment checks, prefer IntelliJ Platform classes over raw JVM APIs such as `System.getProperty(...)` or `System.getenv(...)`.
 - Detect architecture with `com.intellij.util.system.CpuArch.CURRENT`, not `System.getProperty("os.arch")`.
diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index d8619ecfc1b..7c48f6085e1 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -102,6 +102,39 @@
 
 ## [Unreleased]
 
+## [7.0.12-rc.2] - 2026-07-27
+
+### Added
+
+### Fixed
+
+- Fix the GitHub-hosted bundled JetBrains plugin build so signing uses certificate and private-key files during verification.
+
+### Changed
+
+## [7.0.12-rc.1] - 2026-07-27
+
+### Added
+
+- Support sending another JetBrains prompt while a session is still running. Queued prompts now appear in the conversation and can be removed before Kilo starts processing them.
+
+## [7.0.11] - 2026-07-27
+
+### Added
+
+- Add a signed GitHub-hosted bundled JetBrains plugin build that includes the Kilo CLI for offline or restricted-network installs.
+
+### Fixed
+
+- Load global skills reliably from JetBrains projects that are not inside a Git repository.
+- Support adaptive thinking for Claude Opus and Sonnet 5+ model identifiers across Anthropic, AI Gateway, and Bedrock providers.
+- Flush pending cloud session updates when the Kilo Core runtime shuts down, reducing cases where the final assistant message is missing when a session is reopened elsewhere.
+- Prune stale bundled CLI versions after upgrading bundled JetBrains installs.
+
+### 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/README.md b/packages/kilo-jetbrains/README.md
index e5452e7ddd0..754202c3c09 100644
--- a/packages/kilo-jetbrains/README.md
+++ b/packages/kilo-jetbrains/README.md
@@ -78,7 +78,7 @@ The built plugin archive is at `build/distributions/kilo.jetbrains-<version>.zip
 
 ## Releasing
 
-See [RELEASING.md](RELEASING.md) for the full release process, including how to tag and push an RC, where to watch workflow progress, and how to install RC builds via the custom plugin repository.
+See [RELEASING.md](RELEASING.md) for the full release process, including how to tag and push an RC, where to watch workflow progress, how to install RC builds, and how the signed bundled CLI build is published to the GitHub-hosted stable plugin repository.
 
 ---
 
diff --git a/packages/kilo-jetbrains/RELEASE_TODO.md b/packages/kilo-jetbrains/RELEASE_TODO.md
index b74103894b7..1500e75128b 100644
--- a/packages/kilo-jetbrains/RELEASE_TODO.md
+++ b/packages/kilo-jetbrains/RELEASE_TODO.md
@@ -14,6 +14,8 @@
 - Create a JetBrains Marketplace permanent token from Marketplace `My Tokens`.
 - Add `JETBRAINS_MARKETPLACE_TOKEN` to GitHub Actions secrets or the protected environment.
 - Confirm `GITHUB_TOKEN` has `contents: write` permission for creating and updating GitHub Releases for `jetbrains/v*` tags.
+- Confirm `GITHUB_TOKEN` has `actions: write`, `pages: write`, and `id-token: write` permission for dispatching bundled releases and publishing the stable GitHub Pages plugin repository.
+- Configure GitHub Pages for this repository with source set to GitHub Actions.
 - Confirm `KILO_MAINTAINER_APP_ID` and `KILO_MAINTAINER_APP_SECRET` are available to create release PRs and immediate release tags.
 - Optionally create a protected `jetbrains-marketplace` GitHub Environment with required reviewers.
 - If using an environment, move the Marketplace and signing secrets there and set the workflow job environment.
@@ -35,6 +37,7 @@
 - Review and edit `packages/kilo-jetbrains/CHANGELOG.md` in the generated release PR.
 - Merge the release PR to trigger publish from `jetbrains/vx.y.z-rc.n`, for example `jetbrains/v7.0.1-rc.1`.
 - Watch the `publish-jetbrains` workflow.
+- Confirm the follow-up `publish-jetbrains-bundled` workflow completes and attaches `kilo-code-x.y.z-rc.n-bundled.zip` to the prerelease.
 - Download and retain the workflow artifact if needed.
 - Confirm the update appears on the JetBrains Marketplace `eap` channel.
 - Confirm the GitHub Release for the `jetbrains/vx.y.z-rc.n` tag exists and contains the JetBrains plugin ZIP asset.
@@ -48,5 +51,6 @@
 - Review and edit `packages/kilo-jetbrains/CHANGELOG.md` in the generated release PR.
 - Merge the release PR to trigger publish from `jetbrains/vx.y.z`.
 - Watch the `publish-jetbrains` workflow.
+- Confirm the follow-up `publish-jetbrains-bundled` workflow completes, attaches `kilo-code-x.y.z-bundled.zip`, and updates `https://kilo-org.github.io/kilocode/jetbrains/updatePlugins.xml`.
 - Confirm the update appears on the default JetBrains Marketplace channel.
 - Confirm the GitHub Release for the `jetbrains/vx.y.z` tag exists and contains the JetBrains plugin ZIP asset.
diff --git a/packages/kilo-jetbrains/RELEASING.md b/packages/kilo-jetbrains/RELEASING.md
index 606065a27d4..8f763037019 100644
--- a/packages/kilo-jetbrains/RELEASING.md
+++ b/packages/kilo-jetbrains/RELEASING.md
@@ -132,6 +132,16 @@ Publishing behavior:
 
 The workflow checks out `jetbrains/v<version>` for verification, signing, and Marketplace publishing. It overlays the reviewed `packages/kilo-jetbrains/gradle.properties` and `packages/kilo-jetbrains/CHANGELOG.md` from the merged PR before rendering release notes and before `publishPlugin`, so the Marketplace plugin version, Marketplace notes, and GitHub Release use the reviewed metadata.
 
+After Marketplace publishing succeeds, `publish-jetbrains` dispatches `publish-jetbrains-bundled`. The bundled workflow rebuilds the same `jetbrains/v<version>` tag with `-Pkilo.cli.bundled=true`, signs and verifies the all-platform plugin ZIP, then uploads `kilo-code-<version>-bundled.zip` to the same GitHub Release. Bundled builds keep `kilo.cli.pinned=true`; the build flag only embeds the pinned CLI release assets so runtime extracts the bundled current-platform CLI instead of downloading it.
+
+Stable bundled releases also publish the GitHub Pages custom plugin repository XML:
+
+```text
+https://kilo-org.github.io/kilocode/jetbrains/updatePlugins.xml
+```
+
+RC bundled ZIPs are attached to prereleases for install-from-disk testing, but they do not update the stable custom repository XML.
+
 ## Installing RC Builds
 
 RC builds are published to the `eap` channel. To get them in IntelliJ IDEA:
diff --git a/packages/kilo-jetbrains/backend/build.gradle.kts b/packages/kilo-jetbrains/backend/build.gradle.kts
index 374aa08a85b..77d014030d1 100644
--- a/packages/kilo-jetbrains/backend/build.gradle.kts
+++ b/packages/kilo-jetbrains/backend/build.gradle.kts
@@ -22,6 +22,7 @@ val generatedProps = layout.buildDirectory.dir("generated/kilo-props")
 val generatedCli = layout.buildDirectory.dir("generated/kilo-cli-res")
 val pinned = providers.gradleProperty("kilo.cli.pinned").map { it.trim().toBoolean() }.orElse(true)
 val repoCli = pinned.map { !it }
+val bundled = providers.gradleProperty("kilo.cli.bundled").map { it.trim().toBoolean() }.orElse(false)
 val repoRootDir = rootProject.layout.projectDirectory.dir("../opencode")
 
 val pinnedCliVersion = providers.fileContents(rootProject.layout.projectDirectory.file("package.json")).asText.map { text ->
@@ -32,11 +33,15 @@ val pinnedCliVersion = providers.fileContents(rootProject.layout.projectDirector
 sourceSets {
     main {
         resources.srcDir(generatedProps)
-        if (repoCli.get()) resources.srcDir(generatedCli)
+        if (repoCli.get() || bundled.get()) resources.srcDir(generatedCli)
         kotlin.srcDir(generatedApi)
     }
 }
 
+if (repoCli.get() && bundled.get()) {
+    error("kilo.cli.bundled=true requires kilo.cli.pinned=true; do not combine release CLI bundling with local repo CLI mode.")
+}
+
 val writeKiloProperties by tasks.registering(WriteProperties::class) {
     description = "Write pinned Kilo CLI properties"
     val out = generatedProps.map { it.file("kilo.properties") }
@@ -88,6 +93,17 @@ val stageRepoCli by tasks.registering(StageRepoCliTask::class) {
     outputs.upToDateWhen { false }
 }
 
+val stageBundledCli by tasks.registering(StageBundledCliTask::class) {
+    description = "Stage all pinned Kilo CLI release assets into backend resources"
+    cliVersion.set(pinnedCliVersion)
+    token.set(
+        providers.environmentVariable("GH_TOKEN")
+            .orElse(providers.environmentVariable("GITHUB_TOKEN"))
+    )
+    cacheDir.set(layout.buildDirectory.dir("cli-cache"))
+    archive.set(generatedCli.map { it.file("kilo-cli.zip") })
+}
+
 val normalizeOpenApiSpec by tasks.registering(NormalizeOpenApiSpecTask::class) {
     description = "Normalize upstream CLI OpenAPI metadata before Kotlin client generation"
     dependsOn(generateOpenApiSpec)
@@ -143,12 +159,14 @@ val fixGeneratedApi by tasks.registering(FixGeneratedApiTask::class) {
 tasks.named("compileKotlin") {
     dependsOn(fixGeneratedApi, writeKiloProperties)
     if (repoCli.get()) dependsOn(stageRepoCli)
+    if (bundled.get()) dependsOn(stageBundledCli)
     inputs.dir(generatedApi)
 }
 
 tasks.named("processResources") {
     dependsOn(writeKiloProperties)
     if (repoCli.get()) dependsOn(stageRepoCli)
+    if (bundled.get()) dependsOn(stageBundledCli)
 }
 
 tasks.named("compileTestKotlin") {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendChatManager.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendChatManager.kt
index d7c2be2cdf8..4ebd49744e2 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendChatManager.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendChatManager.kt
@@ -65,6 +65,7 @@ class KiloBackendChatManager(
             "session.status",
             "session.updated",
             "session.idle",
+            "session.queue.changed",
             "session.compacted",
             "session.diff",
             "permission.asked",
@@ -90,14 +91,15 @@ class KiloBackendChatManager(
         if (watcher?.isActive == true) return
         watcher = cs.launch {
             sse.collect { event ->
-                if (event.type in CHAT_EVENTS) {
+                val type = if (event.type in CHAT_EVENTS) event.type else KiloCliDataParser.extractEventType(event.data)
+                if (type in CHAT_EVENTS) {
                     val events = try {
-                        normalizer.parse(event.type, event.data)
+                        normalizer.parse(type, event.data)
                     } catch (e: CancellationException) {
                         throw e
                     } catch (e: Exception) {
                         log.warn(
-                            "route=chat-events parse=false type=${event.type} bytes=${event.data.length} ${ChatLogSummary.body(event.data)}",
+                            "route=chat-events parse=false type=$type raw=${event.type} bytes=${event.data.length} ${ChatLogSummary.body(event.data)}",
                             e,
                         )
                         return@collect
@@ -120,7 +122,7 @@ class KiloBackendChatManager(
                             _events.emit(parsed)
                         }
                     } else {
-                        log.warn("route=chat-events parse=null type=${event.type} bytes=${event.data.length} ${ChatLogSummary.body(event.data)}")
+                        log.warn("route=chat-events parse=null type=$type raw=${event.type} bytes=${event.data.length} ${ChatLogSummary.body(event.data)}")
                     }
                 }
             }
@@ -264,6 +266,27 @@ class KiloBackendChatManager(
         postCancellable("/session/$id/revert?directory=${encode(dir)}", body, "revert", "${ChatLogSummary.sid(id)} kind=revert")
     }
 
+    suspend fun deleteMessage(id: String, dir: String, message: String): Boolean {
+        log.info("${ChatLogSummary.sid(id)} kind=deleteMessage ${ChatLogSummary.dir(dir)} message=$message")
+        val http = requireClient()
+        val url = requireBase()
+        val request = Request.Builder()
+            .url("$url/session/$id/message/$message?directory=${encode(dir)}")
+            .delete()
+            .build()
+        val call = http.newCall(request)
+        call.timeout().timeout(REVERT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
+        return call.await().use { response ->
+            val raw = response.body?.string().orEmpty().trim()
+            if (!response.isSuccessful) {
+                log.warn("deleteMessage failed: HTTP ${response.code}")
+                raw.takeIf { it.isNotBlank() }?.let { log.debug { "${ChatLogSummary.sid(id)} kind=deleteMessage error=${ChatLogSummary.body(it)}" } }
+                return@use false
+            }
+            raw != "false"
+        }
+    }
+
     suspend fun unrevert(id: String, dir: String) {
         log.info("${ChatLogSummary.sid(id)} kind=unrevert ${ChatLogSummary.dir(dir)}")
         postCancellable("/session/$id/unrevert?directory=${encode(dir)}", "{}", "unrevert", "${ChatLogSummary.sid(id)} kind=unrevert")
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloBackendCliManager.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloBackendCliManager.kt
index ce7b9fd256b..9425f0779f7 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloBackendCliManager.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloBackendCliManager.kt
@@ -126,8 +126,8 @@ class KiloBackendCliManager(
     private suspend fun resolveCli(onProgress: (CliDownload) -> Unit): File {
         val force = forceExtract
         forceExtract = false
-        if (!KiloProps.pinned()) {
-            if (force) log.info("Force re-extracting local repo CLI ${KiloProps.cliVersion()}")
+        if (KiloRepoCli.available()) {
+            if (force) log.info("Force re-extracting bundled CLI ${KiloProps.cliVersion()}")
             val cli = KiloRepoCli.extract(force)
             onProgress(CliDownload(100, KiloProps.cliVersion(), KiloCliPlatform.current()))
             return cli
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 a87fd32c6aa..1d4fa2ee4b7 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
@@ -248,6 +248,12 @@ object KiloCliDataParser {
                 ChatEventDto.SessionIdle(sid)
             }
 
+            "session.queue.changed" -> {
+                val sid = props.str("sessionID") ?: return null
+                val queued = props["queued"]?.jsonArray?.mapNotNull { it.jsonPrimitive.contentOrNull } ?: emptyList()
+                ChatEventDto.SessionQueueChanged(sid, queued)
+            }
+
             "session.compacted" -> {
                 val sid = props.str("sessionID") ?: return null
                 ChatEventDto.SessionCompacted(sid)
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloRepoCli.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloRepoCli.kt
index a46ea79506f..8138ae4daed 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloRepoCli.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloRepoCli.kt
@@ -1,5 +1,6 @@
 package ai.kilocode.backend.cli
 
+import ai.kilocode.log.KiloLog
 import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.util.SystemInfo
 import kotlinx.coroutines.Dispatchers
@@ -10,20 +11,33 @@ import java.io.OutputStream
 import java.util.zip.ZipInputStream
 
 object KiloRepoCli {
+    private const val ARCHIVE = "kilo-cli.zip"
+    private val log = KiloLog.create(KiloRepoCli::class.java)
+
+    fun available(): Boolean = KiloRepoCli::class.java.classLoader.getResource(ARCHIVE) != null
+
     suspend fun extract(force: Boolean): File = extract(
         force = force,
-        root = File(PathManager.getSystemPath(), "kilo/repo-cli"),
+        root = File(PathManager.getSystemPath(), "kilo/repo-cli/${KiloProps.cliVersion()}"),
+        cleanup = true,
         source = {
-            KiloRepoCli::class.java.classLoader.getResourceAsStream("kilo-cli.zip")
-                ?: throw IllegalStateException("kilo-cli.zip resource not found; rebuild with kilo.cli.pinned=false")
+            KiloRepoCli::class.java.classLoader.getResourceAsStream(ARCHIVE)
+                ?: throw IllegalStateException("kilo-cli.zip resource not found; rebuild with bundled CLI resources")
         },
     )
 
-    internal suspend fun extract(force: Boolean, root: File, source: () -> InputStream): File = withContext(Dispatchers.IO) {
-        val exe = File(root, "bin/${KiloCliPlatform.exe()}")
+    internal suspend fun extract(
+        force: Boolean,
+        root: File,
+        cleanup: Boolean = false,
+        source: () -> InputStream,
+    ): File = withContext(Dispatchers.IO) {
+        val platform = KiloCliPlatform.current()
+        val exe = File(root, "$platform/bin/${KiloCliPlatform.exe()}")
         val done = File(root, ".complete")
         if (!force && done.isFile && exe.isFile) {
             if (!SystemInfo.isWindows) exe.setExecutable(true)
+            if (cleanup) prune(root)
             return@withContext exe
         }
 
@@ -38,21 +52,55 @@ object KiloRepoCli {
             ZipInputStream(input.buffered()).use { zip ->
                 while (true) {
                     val entry = zip.nextEntry ?: break
-                    write(root, entry.name, entry.isDirectory) { out -> zip.copyTo(out) }
+                    val path = select(root, entry.name, platform)
+                    if (path != null) write(root, path, entry.isDirectory) { out -> zip.copyTo(out) }
                     zip.closeEntry()
                 }
             }
         }
 
-        if (!exe.isFile) throw IllegalStateException("Local repo CLI archive did not contain bin/${KiloCliPlatform.exe()}")
+        if (!exe.isFile) throw IllegalStateException("Bundled CLI archive did not contain $platform/bin/${KiloCliPlatform.exe()}")
         if (!SystemInfo.isWindows) exe.setExecutable(true)
         done.writeText("ok\n")
+        if (cleanup) prune(root)
         return@withContext exe
     }
 
+    private fun prune(root: File) {
+        val parent = root.parentFile ?: return
+        val entries = parent.listFiles() ?: return
+        for (entry in entries) {
+            if (!entry.isDirectory || entry.name == root.name || entry.name.startsWith(".")) continue
+            log.info("Removing stale bundled Kilo CLI version ${entry.absolutePath}")
+            if (!entry.deleteRecursively()) {
+                log.warn("Failed to remove stale bundled Kilo CLI version ${entry.absolutePath}")
+            }
+        }
+    }
+
+    private fun select(dir: File, name: String, platform: String): String? {
+        check(dir, name)
+        val path = name.replace('\\', '/')
+        val prefix = "$platform/"
+        if (path.startsWith(prefix)) return path
+        if (path.startsWith("bin/")) return "$platform/$path"
+        return null
+    }
+
+    private fun check(dir: File, name: String) {
+        val raw = name.replace('\\', '/')
+        if (raw.startsWith("/")) throw IllegalStateException("Archive entry escapes target directory: $name")
+        val parts = raw.split('/').filter { it.isNotEmpty() }
+        if (parts.any { it == ".." }) throw IllegalStateException("Archive entry escapes target directory: $name")
+        val target = File(dir, name).canonicalFile
+        val base = dir.canonicalFile
+        if (target != base && !target.path.startsWith(base.path + File.separator)) {
+            throw IllegalStateException("Archive entry escapes target directory: $name")
+        }
+    }
+
     private fun write(dir: File, name: String, directory: Boolean, copy: (OutputStream) -> Unit) {
-        val path = if (name.startsWith("bin/")) name else "bin/$name"
-        val target = File(dir, path).canonicalFile
+        val target = File(dir, name).canonicalFile
         val base = dir.canonicalFile
         if (target != base && !target.path.startsWith(base.path + File.separator)) {
             throw IllegalStateException("Archive entry escapes target directory: $name")
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloSessionRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloSessionRpcApiImpl.kt
index 0501d04d2a5..9e6843bc82f 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloSessionRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloSessionRpcApiImpl.kt
@@ -135,6 +135,9 @@ class KiloSessionRpcApiImpl internal constructor(
     override suspend fun revert(id: String, directory: String, messageID: String, partID: String?) =
         ready { chat.revert(id, sessions.getDirectory(id, directory), messageID, partID) }
 
+    override suspend fun deleteMessage(id: String, directory: String, messageID: String): Boolean =
+        ready { chat.deleteMessage(id, sessions.getDirectory(id, directory), messageID) }
+
     override suspend fun unrevert(id: String, directory: String) =
         ready { chat.unrevert(id, sessions.getDirectory(id, directory)) }
 
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendChatManagerTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendChatManagerTest.kt
index 0d62f668dc4..3225fef1a03 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendChatManagerTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendChatManagerTest.kt
@@ -90,6 +90,32 @@ class KiloBackendChatManagerTest {
         assertEquals("{}", mock.lastUnrevertBody)
     }
 
+    @Test
+    fun `delete message sends queued message delete request`() = runBlocking {
+        val port = mock.start()
+        val chat = KiloBackendChatManager(scope, TestLog())
+        chat.start(OkHttpClient(), port, MutableSharedFlow())
+
+        val result = chat.deleteMessage("ses_abc", "/test/project", "msg1")
+
+        assertTrue(result)
+        assertEquals(1, mock.requestCount("/session/ses_abc/message/msg1"))
+        assertTrue(mock.lastMessageDeletePath!!.startsWith("/session/ses_abc/message/msg1?directory="))
+    }
+
+    @Test
+    fun `delete message returns false for queued drop miss`() = runBlocking {
+        val port = mock.start()
+        val chat = KiloBackendChatManager(scope, TestLog())
+        chat.start(OkHttpClient(), port, MutableSharedFlow())
+        mock.messageDeleteResponse = "false"
+
+        val result = chat.deleteMessage("ses_abc", "/test/project", "msg1")
+
+        assertEquals(false, result)
+        assertEquals(1, mock.requestCount("/session/ses_abc/message/msg1"))
+    }
+
     @Test
     fun `revert failure throws on non successful response`() = runBlocking {
         val port = mock.start()
@@ -202,4 +228,21 @@ class KiloBackendChatManagerTest {
         assertEquals("ses_abc", event.sessionID)
         assertTrue(log.messages.any { it.contains("route=chat-events parse=false type=session.error") }, log.messages.joinToString("\n"))
     }
+
+    @Test
+    fun `global message event type is extracted from payload`() = runBlocking {
+        val port = mock.start()
+        val sse = MutableSharedFlow<SseEvent>(replay = 8)
+        val chat = KiloBackendChatManager(scope, TestLog())
+        chat.start(OkHttpClient(), port, sse)
+
+        val received = async(start = CoroutineStart.UNDISPATCHED) { withTimeout(5_000) { chat.events.first() } }
+        withTimeout(5_000) { sse.subscriptionCount.first { it > 0 } }
+        sse.emit(SseEvent("message", """{"payload":{"type":"session.queue.changed","properties":{"sessionID":"ses_abc","queued":["msg2"]}}}"""))
+
+        val event = received.await()
+        assertTrue(event is ChatEventDto.SessionQueueChanged)
+        assertEquals("ses_abc", event.sessionID)
+        assertEquals(listOf("msg2"), event.queued)
+    }
 }
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt
index 8e71d6ce373..2a32a5060bd 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt
@@ -651,6 +651,19 @@ class KiloCliDataParserTest {
             assertTrue(result is ChatEventDto.SessionCompacted)
         }
 
+        @Test
+        fun `parseChatEvent - session queue changed`() {
+            val data = globalEvent("""
+                "type": "session.queue.changed",
+                "properties": { "sessionID": "ses_1", "queued": ["msg2", "msg3"] }
+            """)
+            val result = KiloCliDataParser.parseChatEvent("session.queue.changed", data)
+            assertNotNull(result)
+            assertTrue(result is ChatEventDto.SessionQueueChanged)
+            assertEquals("ses_1", result.sessionID)
+            assertEquals(listOf("msg2", "msg3"), result.queued)
+        }
+
         @Test
         fun `parseChatEvent - session updated`() {
             val data = globalEvent("""
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloRepoCliTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloRepoCliTest.kt
index 4c2f1400532..b5a2adf93f8 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloRepoCliTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloRepoCliTest.kt
@@ -12,6 +12,7 @@ import kotlin.test.Test
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class KiloRepoCliTest {
@@ -38,6 +39,38 @@ class KiloRepoCliTest {
         assertEquals("#!/bin/new\n", forced.readText())
     }
 
+    @Test
+    fun `extracts only current platform from multi platform archive`() = runBlocking {
+        val platform = KiloCliPlatform.current()
+        val other = if (platform == "windows-x64") "darwin-arm64" else "windows-x64"
+        val cli = KiloRepoCli.extract(false, dir) {
+            ByteArrayInputStream(multi(platform, other))
+        }
+
+        assertTrue(cli.isFile)
+        assertEquals("current", cli.readText())
+        assertFalse(File(dir, "$other/bin/kilo.exe").exists())
+        assertFalse(File(dir, "$other/bin/kilo").exists())
+    }
+
+    @Test
+    fun `prunes stale bundled cli versions after resolve`() = runBlocking {
+        val root = File(dir, "7.4.11")
+        val stale = File(dir, "7.4.10")
+        File(stale, "old").apply {
+            parentFile.mkdirs()
+            writeText("old")
+        }
+
+        val cli = KiloRepoCli.extract(false, root, cleanup = true) {
+            ByteArrayInputStream(archive("current"))
+        }
+
+        assertTrue(cli.isFile)
+        assertFalse(stale.exists())
+        assertTrue(root.isDirectory)
+    }
+
     @Test
     fun `rejects archive entries that escape root`() = runBlocking {
         val ex = assertFailsWith<IllegalStateException> {
@@ -66,4 +99,17 @@ class KiloRepoCliTest {
         }
         return out.toByteArray()
     }
+
+    private fun multi(platform: String, other: String): ByteArray {
+        val out = ByteArrayOutputStream()
+        ZipOutputStream(out).use { zip ->
+            zip.putNextEntry(ZipEntry("$platform/bin/${KiloCliPlatform.exe()}"))
+            zip.write("current".toByteArray())
+            zip.closeEntry()
+            zip.putNextEntry(ZipEntry("$other/bin/kilo.exe"))
+            zip.write("other".toByteArray())
+            zip.closeEntry()
+        }
+        return out.toByteArray()
+    }
 }
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt
index 5e05d255733..d016709a685 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt
@@ -117,11 +117,14 @@ class MockCliServer : AutoCloseable {
     @Volatile var lastCloudSessionImportBody: String? = null
     @Volatile var summarizeStatus = 200
     @Volatile var revertStatus = 200
+    @Volatile var messageDeleteStatus = 200
+    @Volatile var messageDeleteResponse = "true"
     @Volatile var unrevertStatus = 200
     @Volatile var lastSummarizePath: String? = null
     @Volatile var lastSummarizeBody: String? = null
     @Volatile var lastRevertPath: String? = null
     @Volatile var lastRevertBody: String? = null
+    @Volatile var lastMessageDeletePath: String? = null
     @Volatile var lastUnrevertPath: String? = null
     @Volatile var lastUnrevertBody: String? = null
     @Volatile var promptStatus = 200
@@ -438,6 +441,10 @@ class MockCliServer : AutoCloseable {
                     lastRevertBody = body
                     respond(output, revertStatus, sessionCreate)
                 }
+                bare.matches(Regex("/session/ses_[^/]+/message/[^/]+")) && method == "DELETE" -> {
+                    lastMessageDeletePath = path
+                    respond(output, messageDeleteStatus, messageDeleteResponse)
+                }
                 bare.matches(Regex("/session/ses_[^/]+/unrevert")) && method == "POST" -> {
                     lastUnrevertPath = path
                     lastUnrevertBody = body
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageBundledCliTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageBundledCliTask.kt
new file mode 100644
index 00000000000..62ae78a2317
--- /dev/null
+++ b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageBundledCliTask.kt
@@ -0,0 +1,225 @@
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URI
+import java.security.MessageDigest
+import java.time.Instant
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+abstract class StageBundledCliTask : DefaultTask() {
+    companion object {
+        private val DIGEST = Regex("^sha256:[a-f0-9]{64}$")
+        private val JSON = Json { ignoreUnknownKeys = true }
+        private const val API = "https://api.github.com/repos/Kilo-Org/kilocode/releases/tags"
+        private val PLATFORMS = listOf(
+            "darwin-arm64",
+            "darwin-x64",
+            "linux-arm64",
+            "linux-x64",
+            "windows-arm64",
+            "windows-x64",
+        )
+    }
+
+    @get:Input
+    abstract val cliVersion: Property<String>
+
+    @get:Internal
+    abstract val token: Property<String>
+
+    @get:Internal
+    abstract val cacheDir: DirectoryProperty
+
+    @get:OutputFile
+    abstract val archive: RegularFileProperty
+
+    @TaskAction
+    fun run() {
+        val ver = cliVersion.get()
+        val assets = assets(ver)
+        val files = PLATFORMS.associateWith { platform ->
+            val ext = ext(platform)
+            val name = "kilo-$platform.$ext"
+            val digest = assets[name] ?: throw GradleException("Kilo CLI release $ver did not include $name")
+            val file = cacheDir.dir(ver).map { it.dir(platform).file(name) }.get().asFile
+            fetch(ver, platform, name, digest, file)
+            file
+        }
+
+        val out = archive.get().asFile
+        out.parentFile.mkdirs()
+        ZipOutputStream(out.outputStream().buffered()).use { zip ->
+            for ((platform, file) in files) {
+                if (file.name.endsWith(".zip")) {
+                    zip(platform, file, zip)
+                    continue
+                }
+                tar(platform, file, zip)
+            }
+        }
+    }
+
+    private fun assets(ver: String): Map<String, String> {
+        val url = "$API/v$ver"
+        logger.lifecycle("Fetching pinned Kilo CLI release metadata from $url")
+        val conn = connect(url)
+        try {
+            val code = conn.responseCode
+            if (code !in 200..299) fail(conn, code, "Failed to fetch pinned Kilo CLI release metadata")
+            val body = conn.inputStream.bufferedReader().use { it.readText() }
+            return JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
+                ?.associate { item ->
+                    val obj = item.jsonObject
+                    val name = obj["name"]?.jsonPrimitive?.contentOrNull
+                    val digest = obj["digest"]?.jsonPrimitive?.contentOrNull
+                    if (name.isNullOrBlank() || digest.isNullOrBlank()) return@associate "" to ""
+                    name to digest
+                }
+                ?.filter { it.key.isNotEmpty() }
+                ?.mapValues { item ->
+                    val digest = item.value
+                    if (!digest.matches(DIGEST)) {
+                        throw GradleException("Pinned Kilo CLI release $ver asset ${item.key} has invalid digest")
+                    }
+                    digest
+                }
+                ?: emptyMap()
+        } finally {
+            conn.disconnect()
+        }
+    }
+
+    private fun fetch(ver: String, platform: String, name: String, digest: String, file: File) {
+        if (file.isFile && sum(file) == digest) return
+        file.parentFile.mkdirs()
+        val url = "https://github.com/Kilo-Org/kilocode/releases/download/v$ver/$name"
+        logger.lifecycle("Downloading pinned Kilo CLI $platform from $url")
+        val conn = connect(url)
+        try {
+            val code = conn.responseCode
+            if (code !in 200..299) fail(conn, code, "Failed to download pinned Kilo CLI $platform")
+            conn.inputStream.use { input ->
+                file.outputStream().use { output -> input.copyTo(output) }
+            }
+        } finally {
+            conn.disconnect()
+        }
+        verify(file, digest)
+    }
+
+    private fun zip(platform: String, file: File, out: ZipOutputStream) {
+        ZipInputStream(file.inputStream().buffered()).use { zip ->
+            while (true) {
+                val entry = zip.nextEntry ?: break
+                if (!entry.isDirectory) write(out, platform, entry.name) { zip.copyTo(out) }
+                zip.closeEntry()
+            }
+        }
+    }
+
+    private fun tar(platform: String, file: File, out: ZipOutputStream) {
+        TarArchiveInputStream(GzipCompressorInputStream(file.inputStream().buffered())).use { tar ->
+            while (true) {
+                val entry = tar.nextEntry ?: break
+                if (entry.isDirectory) continue
+                if (entry.isSymbolicLink || !entry.isFile) {
+                    throw GradleException("Unsupported CLI tar entry type in ${file.name}: ${entry.name}")
+                }
+                write(out, platform, entry.name) { tar.copyTo(out) }
+            }
+        }
+    }
+
+    private fun write(out: ZipOutputStream, platform: String, name: String, copy: () -> Unit) {
+        out.putNextEntry(ZipEntry(path(platform, name)))
+        copy()
+        out.closeEntry()
+    }
+
+    private fun path(platform: String, name: String): String {
+        val raw = name.replace('\\', '/')
+        if (raw.startsWith("/")) throw GradleException("Archive entry escapes target directory: $name")
+        val parts = raw.split('/').filter { it.isNotEmpty() && it != "." }
+        if (parts.isEmpty()) throw GradleException("Archive entry is empty: $name")
+        if (parts.any { it == ".." }) throw GradleException("Archive entry escapes target directory: $name")
+        val path = if (parts.first() == "bin") parts else listOf("bin") + parts
+        return "$platform/${path.joinToString("/")}"
+    }
+
+    private fun verify(file: File, digest: String) {
+        val actual = sum(file)
+        if (actual == digest) return
+        if (file.exists() && !file.delete()) logger.warn("Failed to delete invalid pinned Kilo CLI archive ${file.absolutePath}")
+        throw GradleException("Pinned Kilo CLI archive digest mismatch for ${file.name}: expected $digest, got $actual")
+    }
+
+    private fun sum(file: File) = "sha256:${sha256(file)}"
+
+    private fun sha256(file: File): String {
+        val md = MessageDigest.getInstance("SHA-256")
+        file.inputStream().buffered().use { input ->
+            val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
+            while (true) {
+                val n = input.read(buffer)
+                if (n < 0) break
+                md.update(buffer, 0, n)
+            }
+        }
+        return md.digest().joinToString("") { "%02x".format(it.toInt() and 0xff) }
+    }
+
+    private fun connect(url: String): HttpURLConnection {
+        val conn = URI(url).toURL().openConnection() as HttpURLConnection
+        conn.connectTimeout = 30_000
+        conn.readTimeout = 120_000
+        conn.instanceFollowRedirects = true
+        conn.setRequestProperty("Accept", "application/vnd.github+json")
+        token.getOrNull()
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() }
+            ?.let { conn.setRequestProperty("Authorization", "Bearer $it") }
+        return conn
+    }
+
+    private fun fail(conn: HttpURLConnection, code: Int, msg: String): Nothing {
+        val info = rate(conn)
+        val body = runCatching { conn.errorStream?.bufferedReader()?.use { it.readText() } }
+            .getOrNull()
+            ?.take(500)
+        val detail = if (body.isNullOrBlank()) "" else ": $body"
+        if (limited(conn, code)) {
+            throw GradleException("GitHub API rate limit exceeded while staging bundled Kilo CLI ($info)$detail")
+        }
+        throw GradleException("$msg: HTTP $code from ${conn.url} ($info)$detail")
+    }
+
+    private fun rate(conn: HttpURLConnection): String {
+        val reset = conn.getHeaderField("X-RateLimit-Reset")
+            ?.toLongOrNull()
+            ?.let { Instant.ofEpochSecond(it).toString() }
+        return "limit=${conn.getHeaderField("X-RateLimit-Limit")} remaining=${conn.getHeaderField("X-RateLimit-Remaining")} " +
+            "used=${conn.getHeaderField("X-RateLimit-Used")} reset=$reset retryAfter=${conn.getHeaderField("Retry-After")}"
+    }
+
+    private fun limited(conn: HttpURLConnection, code: Int) =
+        code == 429 || (code == 403 && conn.getHeaderField("X-RateLimit-Remaining") == "0")
+
+    private fun ext(platform: String) = if (platform.startsWith("linux-")) "tar.gz" else "zip"
+}
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageRepoCliTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageRepoCliTask.kt
index f5a77cd5321..1f58091ee03 100644
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageRepoCliTask.kt
+++ b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/StageRepoCliTask.kt
@@ -28,12 +28,13 @@ abstract class StageRepoCliTask : DefaultTask() {
         }
 
         val out = archive.get().asFile
+        val platform = platform()
         out.parentFile.mkdirs()
         ZipOutputStream(out.outputStream().buffered()).use { zip ->
             dir.walkTopDown()
                 .filter { it.isFile }
                 .forEach { file ->
-                    val name = "bin/${file.relativeTo(dir).invariantSeparatorsPath}"
+                    val name = "$platform/bin/${file.relativeTo(dir).invariantSeparatorsPath}"
                     zip.putNextEntry(ZipEntry(name))
                     file.inputStream().use { it.copyTo(zip) }
                     zip.closeEntry()
@@ -42,4 +43,20 @@ abstract class StageRepoCliTask : DefaultTask() {
     }
 
     private fun exe() = if (System.getProperty("os.name").lowercase().contains("windows")) "kilo.exe" else "kilo"
+
+    private fun platform(): String {
+        val os = System.getProperty("os.name").lowercase()
+        val name = when {
+            os.contains("mac") || os.contains("darwin") -> "darwin"
+            os.contains("linux") -> "linux"
+            os.contains("windows") -> "windows"
+            else -> throw GradleException("Unsupported OS: ${System.getProperty("os.name")}")
+        }
+        val arch = when (System.getProperty("os.arch").lowercase()) {
+            "aarch64", "arm64" -> "arm64"
+            "x86_64", "amd64" -> "x64"
+            else -> throw GradleException("Unsupported architecture: ${System.getProperty("os.arch")}")
+        }
+        return "$name-$arch"
+    }
 }
diff --git a/packages/kilo-jetbrains/build.gradle.kts b/packages/kilo-jetbrains/build.gradle.kts
index c13a70c2b64..0ff583165aa 100644
--- a/packages/kilo-jetbrains/build.gradle.kts
+++ b/packages/kilo-jetbrains/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.tasks.InstrumentCodeTask
 import org.jetbrains.intellij.platform.gradle.tasks.RunIdeTask
 import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware.PluginInstallationTarget
+import java.io.File
 import java.time.LocalDate
 
 group = "ai.kilocode.jetbrains"
@@ -207,8 +208,12 @@ intellijPlatform {
     }
 
     signing {
+        // CI passes raw secret content so signing can run without writing secrets to disk.
+        // Local release builds can still point these properties at pre-existing secret files.
         certificateChain = providers.environmentVariable("JETBRAINS_CERTIFICATE_CHAIN")
         privateKey = providers.environmentVariable("JETBRAINS_PRIVATE_KEY")
+        certificateChainFile.fileProvider(providers.environmentVariable("JETBRAINS_CERTIFICATE_CHAIN_FILE").map { File(it) })
+        privateKeyFile.fileProvider(providers.environmentVariable("JETBRAINS_PRIVATE_KEY_FILE").map { File(it) })
         password = providers.environmentVariable("JETBRAINS_PRIVATE_KEY_PASSWORD")
     }
 
@@ -220,6 +225,10 @@ intellijPlatform {
 }
 
 tasks {
+    named("verifyPluginSignature") {
+        dependsOn("signPlugin")
+    }
+
     withType<InstrumentCodeTask> {
         enabled = false
     }
diff --git a/packages/kilo-jetbrains/docs/bundled-release-plan.md b/packages/kilo-jetbrains/docs/bundled-release-plan.md
new file mode 100644
index 00000000000..7a45f698e2e
--- /dev/null
+++ b/packages/kilo-jetbrains/docs/bundled-release-plan.md
@@ -0,0 +1,64 @@
+# JetBrains Bundled-CLI Release Plan
+
+Ship a signed, all-platform, CLI-bundled build of the Kilo JetBrains plugin to a GitHub-hosted custom plugin repository, as an alternative to the JetBrains Marketplace, which caps plugin ZIPs at 400 MB. The Marketplace build stays lean and downloads the CLI at runtime; the bundled build embeds every platform's CLI so it works offline or on restricted networks.
+
+## Decisions
+
+1. Host `updatePlugins.xml` via GitHub Pages deployed by Actions.
+2. Maintain a single stable custom repo: one `updatePlugins.xml`, updated on stable releases only.
+3. Auto-trigger the bundled workflow after `publish-jetbrains` succeeds.
+4. Decide runtime delivery by presence of the bundled `kilo-cli.zip` resource. Do not add a `kilo.properties` flag, and do not edit committed files for a bundled build.
+
+## Core Principle
+
+- A bundled build uses the same `jetbrains/v<version>` tag, the same source, and `kilo.cli.pinned=true`.
+- The only build difference is the override `-Pkilo.cli.bundled=true`.
+- `kilo.properties` stays byte-identical between Marketplace and bundled builds. The only build-output difference is whether `kilo-cli.zip` is embedded in the backend jar.
+- `kilo.cli.pinned` keeps its existing meaning: which CLI version / OpenAPI source / release guard. It does not control runtime delivery.
+
+## Phase 1: Backend Delivery
+
+- Add `KiloRepoCli.available()` to detect `kilo-cli.zip` on the classpath.
+- Change `KiloBackendCliManager.resolveCli()` to extract when `KiloRepoCli.available()` is true; otherwise download the pinned release asset.
+- Store bundled archives as `<platform>/bin/kilo[.exe]` for all six platforms: `darwin-arm64`, `darwin-x64`, `linux-arm64`, `linux-x64`, `windows-arm64`, `windows-x64`.
+- Extract only the current platform's subtree to disk so users do not store all six binaries locally.
+- Keep path traversal checks for every archive entry.
+- Update repo CLI dev staging to use the same layout.
+
+## Phase 2: Gradle Bundling
+
+- Add a build-only property `kilo.cli.bundled`, defaulting to false.
+- Keep `kilo.cli.pinned=true` for bundled production builds.
+- Add a task that downloads all six pinned CLI release assets from GitHub, verifies their `sha256` digests from release metadata, and assembles `kilo-cli.zip` as a backend resource.
+- Wire that generated resource only when `-Pkilo.cli.bundled=true` or local repo CLI mode is active.
+- Leave the production guard against `kilo.cli.pinned=false` intact.
+
+Bundled build command:
+
+```bash
+./gradlew clean buildPlugin signPlugin verifyPluginSignature verifyPlugin \
+  -Pproduction=true -Pkilo.version=<version> -Pkilo.channel=default \
+  -Pkilo.cli.bundled=true
+```
+
+## Phase 3: Bundle Workflow
+
+- Add `.github/workflows/publish-jetbrains-bundled.yml`.
+- Add a final success step to `publish-jetbrains.yml` that dispatches the bundle workflow with the merged release PR and merge commit.
+- The bundle workflow checks out the merged release PR for validation, then checks out the immutable `jetbrains/v<version>` tag, restores reviewed release metadata, builds the bundled variant, signs it, verifies it, and uploads `kilo-code-<version>-bundled.zip` to the same GitHub Release.
+- Bundle ZIPs are produced for RC and stable releases. Only stable releases update the custom plugin repository XML.
+
+## Phase 4: GitHub Pages Repository
+
+- Generate `jetbrains/updatePlugins.xml` from the signed bundled ZIP metadata on stable releases.
+- Point the plugin URL at the uploaded GitHub Release asset.
+- Deploy the XML with GitHub Pages Actions to `https://kilo-org.github.io/kilocode/jetbrains/updatePlugins.xml`.
+- Users add that URL in JetBrains IDEs under Settings -> Plugins -> Manage Plugin Repositories.
+
+## Acceptance Criteria
+
+- Marketplace builds remain unchanged and download the CLI at runtime.
+- Bundled builds use the same tag and source, keep `kilo.cli.pinned=true`, and differ only by `-Pkilo.cli.bundled=true`.
+- Bundled ZIPs are signed and attached to the `jetbrains/v<version>` release.
+- Runtime extracts the bundled current-platform CLI and never downloads when `kilo-cli.zip` is present.
+- Stable releases update the GitHub Pages `updatePlugins.xml` with the latest bundled signed ZIP URL.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloSessionService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloSessionService.kt
index 8acd2bc1ae8..0ab8e0432af 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloSessionService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloSessionService.kt
@@ -204,6 +204,9 @@ class KiloSessionService internal constructor(
         log.info("${ChatLogSummary.sid(id)} kind=revert ok=true")
     }
 
+    suspend fun deleteMessage(id: String, dir: String, message: String): Boolean =
+        call { deleteMessage(id, dir, message) }
+
     suspend fun unrevert(id: String, dir: String) {
         call { unrevert(id, dir) }
     }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/SessionUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/SessionUi.kt
index 86333825399..c59014686dc 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/SessionUi.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/SessionUi.kt
@@ -367,6 +367,7 @@ class SessionUi(
             resize = { anchor, fn -> scroll.preserve(anchor, fn) },
             revert = ::revert,
             cancelRevert = ::cancelRevert,
+            deleteQueued = { id -> controller.deleteQueuedMessage(id) },
             banner = RevertBanner(controller.model, ::redo, controller::redoAll, ::cancelRevert, focus),
         ).also {
             it.onHover = { view, on -> if (on) popup.show(view) else popup.notifyExit(view) }
@@ -543,6 +544,8 @@ class SessionUi(
 
                 is SessionModelEvent.RevertChanged -> onRevertChanged(event.revert)
 
+                is SessionModelEvent.QueueChanged -> Unit
+
                 is SessionModelEvent.TurnAdded,
                 is SessionModelEvent.TurnUpdated,
                 is SessionModelEvent.ContentAdded,
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 0570d4bd366..9b1e517ac6d 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
@@ -464,6 +464,27 @@ class SessionController(
         }
     }
 
+    fun deleteQueuedMessage(message: String) {
+        assertEdt()
+        val id = sid ?: return
+        cs.launch {
+            try {
+                val ok = sessions.deleteMessage(id, directory, message)
+                if (!ok) {
+                    capture("Session Error", sessionProps(id) + mapOf("context" to "delete-message", "errorClass" to "DeleteMiss"))
+                    LOG.warn("${ChatLogSummary.sid(id)} kind=deleteMessage missed message=$message")
+                    return@launch
+                }
+                capture("Conversation Queued Message Removed", sessionProps(id))
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                capture("Session Error", sessionProps(id) + mapOf("context" to "delete-message", "errorClass" to e::class.java.name))
+                LOG.warn("${ChatLogSummary.sid(id)} kind=deleteMessage failed message=${e.message}", e)
+            }
+        }
+    }
+
     fun unrevert() {
         assertEdt()
         val id = sid ?: return
@@ -1368,6 +1389,8 @@ class SessionController(
                 idle()
             }
 
+            is ChatEventDto.SessionQueueChanged -> updateModel { model.setQueued(event.queued.toSet()) }
+
             is ChatEventDto.SessionCompacted -> {
                 capture("Context Condensed", sessionProps(event.sessionID))
                 model.markCompacted()
@@ -1406,7 +1429,8 @@ class SessionController(
         is ChatEventDto.QuestionRejected,
         is ChatEventDto.SessionStatusChanged,
         is ChatEventDto.SessionUpdated,
-        is ChatEventDto.SessionIdle -> {
+        is ChatEventDto.SessionIdle,
+        is ChatEventDto.SessionQueueChanged -> {
             edt {
                 if (disposed) return@edt
                 updateModel { handleMetadata(event) }
@@ -1428,6 +1452,7 @@ class SessionController(
             is ChatEventDto.SessionStatusChanged -> status(event.status)
             is ChatEventDto.SessionUpdated -> model.setSession(event.session)
             is ChatEventDto.SessionIdle -> idle()
+            is ChatEventDto.SessionQueueChanged -> model.setQueued(event.queued.toSet())
             else -> Unit
         }
     }
@@ -2312,6 +2337,7 @@ private fun matchesSession(event: ChatEventDto, id: String): Boolean = when (eve
     is ChatEventDto.SessionStatusChanged -> event.sessionID == id
     is ChatEventDto.SessionUpdated -> event.sessionID == id
     is ChatEventDto.SessionIdle -> event.sessionID == id
+    is ChatEventDto.SessionQueueChanged -> event.sessionID == id
     is ChatEventDto.SessionCompacted -> event.sessionID == id
     is ChatEventDto.SessionDiffChanged -> event.sessionID == id
     is ChatEventDto.TodoUpdated -> event.sessionID == id
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModel.kt
index fa9412ff3e9..14f7b8c0271 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModel.kt
@@ -74,6 +74,9 @@ class SessionModel {
 
     private var revert: SessionRevertDto? = null
 
+    var queued: Set<String> = emptySet()
+        private set
+
     var header: SessionHeaderSnapshot = emptyHeader()
         private set
 
@@ -125,6 +128,9 @@ class SessionModel {
         return idx >= 0 && pos >= idx
     }
 
+    @RequiresEdt
+    fun isQueued(id: String): Boolean = id in queued
+
     @RequiresEdt
     fun turn(id: String): Turn? = turnEntries[id]
 
@@ -295,6 +301,13 @@ class SessionModel {
         fire(SessionModelEvent.RevertChanged(revert))
     }
 
+    @RequiresEdt
+    fun setQueued(ids: Set<String>) {
+        if (queued == ids) return
+        queued = ids
+        fire(SessionModelEvent.QueueChanged(ids))
+    }
+
     @RequiresEdt
     fun setDiff(diff: List<DiffFileDto>) {
         this.diff = diff
@@ -329,6 +342,7 @@ class SessionModel {
         hiddenText.clear()
         session = null
         revert = null
+        queued = emptySet()
         state = SessionState.Idle
         diff = emptyList()
         todos = emptyList()
@@ -363,6 +377,7 @@ class SessionModel {
         hiddenText.clear()
         session = null
         revert = null
+        queued = emptySet()
         state = SessionState.Idle
         diff = emptyList()
         todos = emptyList()
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModelEvent.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModelEvent.kt
index bc553cfe58c..d3af00f6388 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModelEvent.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/model/SessionModelEvent.kt
@@ -60,6 +60,9 @@ sealed class SessionModelEvent {
     data class RevertChanged(val revert: SessionRevertDto?) : SessionModelEvent() {
         override fun toString() = "RevertChanged ${revert?.messageID ?: "none"}"
     }
+    data class QueueChanged(val queued: Set<String>) : SessionModelEvent() {
+        override fun toString() = "QueueChanged [${queued.sorted().joinToString(", ")}]"
+    }
     data class HeaderUpdated(val header: SessionHeaderSnapshot) : SessionModelEvent() {
         override fun toString() = "HeaderUpdated visible=${header.visible}"
     }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt
index a0dc4d7dfdc..3396a1c1cec 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt
@@ -60,6 +60,7 @@ class SessionMessageListPanel(
     private val resize: ((JComponent, () -> Unit) -> Unit)? = null,
     private val revert: ((String) -> Unit)? = null,
     private val cancelRevert: (() -> Unit)? = null,
+    private val deleteQueued: ((String) -> Unit)? = null,
     private val banner: RevertBanner? = null,
 ) : SessionLayoutPanel(
     SessionUiStyle.SessionLayout.GAP,
@@ -148,6 +149,12 @@ class SessionMessageListPanel(
                     refresh()
                 }
 
+                is SessionModelEvent.QueueChanged -> {
+                    syncQueued()
+                    syncSettled()
+                    refresh()
+                }
+
                 // Message events: structural changes are handled via turn events above.
                 is SessionModelEvent.MessageAdded,
                 is SessionModelEvent.MessageUpdated,
@@ -216,7 +223,7 @@ class SessionMessageListPanel(
     // ------ private event handlers ------
 
     private fun onTurnAdded(turn: ai.kilocode.client.session.model.Turn) {
-        val tv = TurnView(turn.id, openFile, style, openUrl, selection, openAttachment, resize, repo, ::hover, revert)
+        val tv = TurnView(turn.id, openFile, style, openUrl, selection, openAttachment, resize, repo, ::hover, revert, deleteQueued)
         turnViews[turn.id] = tv
         for (msgId in turn.messageIds) {
             val msg = model.message(msgId) ?: continue
@@ -224,6 +231,7 @@ class SessionMessageListPanel(
             register(msgId, tv, mv)
         }
         tv.syncCopyToolbars()
+        syncQueued(tv)
         syncReverted()
         add(tv)
         syncSettled()
@@ -251,6 +259,7 @@ class SessionMessageListPanel(
             register(id, tv, mv)
         }
         tv.syncCopyToolbars()
+        syncQueued(tv)
         syncReverted()
         syncSettled()
 
@@ -279,7 +288,7 @@ class SessionMessageListPanel(
         removeAll()
 
         for (turn in model.turns()) {
-            val tv = TurnView(turn.id, openFile, style, openUrl, selection, openAttachment, resize, repo, ::hover, revert)
+            val tv = TurnView(turn.id, openFile, style, openUrl, selection, openAttachment, resize, repo, ::hover, revert, deleteQueued)
             turnViews[turn.id] = tv
             for (msgId in turn.messageIds) {
                 val msg = model.message(msgId) ?: continue
@@ -287,11 +296,13 @@ class SessionMessageListPanel(
                 register(msgId, tv, mv)
             }
             tv.syncCopyToolbars()
+            syncQueued(tv)
             add(tv)
         }
 
         syncActive(model.state)
         syncSettled(model.state)
+        syncQueued()
         syncReverted()
         syncReverting(model.state)
         banner?.update()
@@ -321,6 +332,7 @@ class SessionMessageListPanel(
         removeAll()
         syncActive(model.state)
         syncSettled(model.state)
+        syncQueued()
         syncReverting(model.state)
         banner?.update()
         anchorFooter()
@@ -384,10 +396,18 @@ class SessionMessageListPanel(
     }
 
     private fun syncSettled(state: SessionState = model.state) {
-        val active = if (state.isBusy()) turnViews.values.lastOrNull() else null
+        val active = if (state.isBusy()) turnViews.values.lastOrNull { !model.isQueued(it.id) } else null
         for (view in turnViews.values) view.setSettled(view !== active)
     }
 
+    private fun syncQueued() {
+        for (view in turnViews.values) syncQueued(view)
+    }
+
+    private fun syncQueued(view: TurnView) {
+        view.setQueued(model.isQueued(view.id)) { id -> deleteQueued?.invoke(id) }
+    }
+
     /**
      * Re-insert [question], [permission], [login], and [progress] as the last children
      * so active views always render after all turn views, and progress is last.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/header/SessionHeaderPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/header/SessionHeaderPanel.kt
index d3a47c3260d..96d2a8e7682 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/header/SessionHeaderPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/header/SessionHeaderPanel.kt
@@ -207,6 +207,7 @@ class SessionHeaderPanel(
                 is SessionModelEvent.TodosUpdated,
                 is SessionModelEvent.SessionUpdated,
                 is SessionModelEvent.RevertChanged,
+                is SessionModelEvent.QueueChanged,
                 is SessionModelEvent.Compacted,
                 is SessionModelEvent.HistoryLoaded,
                 is SessionModelEvent.Cleared,
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/PromptPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/PromptPanel.kt
index ec5f7e7c1ae..9a4fd04d14c 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/PromptPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/PromptPanel.kt
@@ -212,7 +212,7 @@ class PromptPanel(
         isFocusPainted = false
         addActionListener {
             syncTooltip()
-            val id = if (busy) StopSessionAction.ID else SendPromptAction.ID
+            val id = if (busy && !hasDraft()) StopSessionAction.ID else SendPromptAction.ID
             val action = ActionManager.getInstance().getAction(id)
                 ?: return@addActionListener
             val ctx = DataManager.getInstance().getDataContext(button)
@@ -258,7 +258,7 @@ class PromptPanel(
     private var request = 0L
 
     override val isSendEnabled: Boolean
-        get() = ready && !busy && !submitting && (text().isNotEmpty() || attachments.isNotEmpty())
+        get() = ready && !submitting && (text().isNotEmpty() || attachments.isNotEmpty())
 
     override val isStopEnabled: Boolean
         get() = busy
@@ -273,6 +273,7 @@ class PromptPanel(
                 syncEditorHeight()
                 triggerCompletion(e)
                 syncHighlights()
+                syncButton()
                 onChange()
             }
         })
@@ -418,7 +419,7 @@ class PromptPanel(
     fun setBusy(value: Boolean) {
         busy = value
         if (value) invalidateEnhancement() else syncEnhance()
-        button.icon = if (value) STOP_ICON else SEND_ICON
+        syncButton()
         syncTooltip()
     }
 
@@ -628,6 +629,11 @@ class PromptPanel(
         }
     }
 
+    @RequiresEdt
+    private fun syncButton() {
+        button.icon = if (busy && !hasDraft()) STOP_ICON else SEND_ICON
+    }
+
     @RequiresEdt
     private fun submit(src: String) {
         if (!isSendEnabled) return
@@ -885,19 +891,20 @@ class PromptPanel(
     }
 
     private fun tooltip(): String {
-        val id = if (busy) StopSessionAction.ID else SendPromptAction.ID
-        val text = if (busy) {
+        val stop = busy && !hasDraft()
+        val id = if (stop) StopSessionAction.ID else SendPromptAction.ID
+        val text = if (stop) {
             KiloBundle.message("prompt.button.stop")
         } else {
             KiloBundle.message("prompt.button.send")
         }
         val tip = KeymapUtil.createTooltipText(text, id)
-        if (busy) return tip
-        val stop = KeymapUtil.getFirstKeyboardShortcutText(StopSessionAction.ID)
-        if (stop.isEmpty()) return tip
+        if (stop) return tip
+        val shortcut = KeymapUtil.getFirstKeyboardShortcutText(StopSessionAction.ID)
+        if (shortcut.isEmpty()) return tip
         return XmlStringUtil.wrapInHtml(
             XmlStringUtil.escapeString(tip) + "<br>" +
-                XmlStringUtil.escapeString(KiloBundle.message("prompt.button.send.tooltip.stop", stop))
+                XmlStringUtil.escapeString(KiloBundle.message("prompt.button.send.tooltip.stop", shortcut))
         )
     }
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/MessageView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/MessageView.kt
index aed735293b8..5ccc77850f3 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/MessageView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/MessageView.kt
@@ -19,13 +19,21 @@ import ai.kilocode.client.session.ui.selection.SessionSelection
 import ai.kilocode.client.session.ui.style.SessionEditorStyleTarget
 import ai.kilocode.client.session.views.base.PartView
 import ai.kilocode.client.session.ui.style.SessionUiStyle
+import ai.kilocode.client.plugin.KiloBundle
+import ai.kilocode.client.ui.ToolbarButtonAction
 import ai.kilocode.client.ui.layout.HAlign
 import ai.kilocode.client.ui.layout.VAlign
 import ai.kilocode.client.ui.layout.align
+import ai.kilocode.client.ui.toolbarButton
+import ai.kilocode.client.ui.UiStyle
+import ai.kilocode.client.ui.layout.Stack
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
+import com.intellij.ui.components.JBLabel
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.util.ui.JBUI
+import com.intellij.util.ui.UIUtil
 import java.awt.BorderLayout
 import java.awt.Point
 import java.awt.Graphics
@@ -397,6 +405,12 @@ class MessageView(
         wrap?.setReverting(active, text, onCancel)
     }
 
+    @RequiresEdt
+    fun setQueued(active: Boolean, onDelete: () -> Unit) {
+        if (role != SessionUiStyle.View.Message.USER_ROLE) return
+        wrap?.setQueued(active, onDelete)
+    }
+
     private val promptToolbar: MessageToolbar?
         get() = wrap?.bar
 
@@ -494,21 +508,26 @@ class MessageView(
     private inner class PromptWrap(
         private val box: JPanel,
     ) : JPanel(BorderLayout()), SessionCopyTarget {
+        private val footer = JPanel(BorderLayout()).also { it.isOpaque = false }
         val bar = MessageToolbar(
             { prompt?.copyMarkdown(trim = false) },
             revert?.let { fn -> { fn(msg.info.id) } },
         )
         private val placeholder = bar.placeholder()
-        private var progress: RevertProgress? = null
         private var reverting = false
+        private var progress: RevertProgress? = null
+        private var queuedRow: JPanel? = null
+        private var queued = false
 
         override val copyAnchor: JComponent get() = placeholder
-        override val copyToolbar: JComponent? get() = if (reverting) null else bar
+        override val copyToolbar: JComponent? get() = if (reverting || queued) null else bar
 
         init {
             isOpaque = false
             add(box, BorderLayout.CENTER)
-            add(placeholder.align(HAlign.RIGHT, VAlign.TOP), BorderLayout.SOUTH)
+            footer.border = JBUI.Borders.emptyTop(UiStyle.Gap.xs())
+            footer.add(placeholder.align(HAlign.RIGHT, VAlign.TOP), BorderLayout.CENTER)
+            add(footer, BorderLayout.SOUTH)
         }
 
         override fun copyText(): String? = prompt?.copyMarkdown(trim = false)
@@ -523,19 +542,54 @@ class MessageView(
                 node.setText(text)
                 if (reverting) return
                 reverting = true
-                remove((layout as BorderLayout).getLayoutComponent(BorderLayout.SOUTH))
-                add(node.align(HAlign.LEFT, VAlign.TOP), BorderLayout.SOUTH)
+                swapFooter(node.align(HAlign.LEFT, VAlign.TOP))
                 revalidate()
                 repaint()
                 return
             }
             if (!reverting) return
             reverting = false
-            remove((layout as BorderLayout).getLayoutComponent(BorderLayout.SOUTH))
-            add(placeholder.align(HAlign.RIGHT, VAlign.TOP), BorderLayout.SOUTH)
+            swapFooter(placeholder.align(HAlign.RIGHT, VAlign.TOP))
             revalidate()
             repaint()
         }
+
+        @RequiresEdt
+        fun setQueued(active: Boolean, onDelete: () -> Unit) {
+            if (active) {
+                val node = queuedRow ?: queue(onDelete).also { queuedRow = it }
+                if (queued) return
+                queued = true
+                swapFooter(node.align(HAlign.RIGHT, VAlign.TOP))
+                revalidate()
+                repaint()
+                return
+            }
+            if (!queued) return
+            queued = false
+            swapFooter(placeholder.align(HAlign.RIGHT, VAlign.TOP))
+            revalidate()
+            repaint()
+        }
+
+        private fun swapFooter(node: JComponent) {
+            footer.removeAll()
+            footer.add(node, BorderLayout.CENTER)
+        }
+
+        private fun queue(onDelete: () -> Unit) = Stack.horizontal(UiStyle.Gap.sm()).also { row ->
+            row.isOpaque = false
+            row.next(JBLabel(KiloBundle.message("session.queued")).apply {
+                foreground = UIUtil.getContextHelpForeground()
+            })
+            row.next(toolbarButton(
+                ToolbarButtonAction(
+                    AllIcons.Actions.Close,
+                    KiloBundle.message("session.queued.remove"),
+                    onDelete,
+                ),
+            ))
+        }
     }
 
     private fun assistantBorder() = JBUI.Borders.empty()
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/TurnView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/TurnView.kt
index b4d8684004f..8723fc4ce5d 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/TurnView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/TurnView.kt
@@ -36,6 +36,7 @@ class TurnView(
     private val repo: String? = null,
     private val hover: ((PartView, Boolean) -> Unit)? = null,
     private val revert: ((String) -> Unit)? = null,
+    private val deleteQueued: ((String) -> Unit)? = null,
 ) : SessionLayoutPanel(SessionUiStyle.SessionLayout.GAP), Disposable, SessionEditorStyleTarget, SessionView {
 
     private val messages = LinkedHashMap<String, MessageView>()
@@ -71,6 +72,12 @@ class TurnView(
         return view
     }
 
+    @RequiresEdt
+    fun setQueued(active: Boolean, onDelete: (String) -> Unit) {
+        val anchor = messages.values.firstOrNull { it.role == SessionUiStyle.View.Message.USER_ROLE } ?: return
+        anchor.setQueued(active) { onDelete(id) }
+    }
+
     /** Remove the [MessageView] for [msgId] if present. */
     fun removeMessage(msgId: String) {
         removeMessageChanged(msgId)
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
index a8f596cb076..a8fa9d983d7 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
@@ -31,6 +31,8 @@ session.copy.hover=Copy
 session.copy.prompt=Copy prompt
 session.copy.response=Copy response
 session.copy.copied=Copied
+session.queued=Queued
+session.queued.remove=Remove queued message
 session.drop.files.title=Drop files here
 session.drop.files.subtitle=to add them to the prompt
 session.file.missing=Couldn''t find ''{0}'' in this repository.
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties
index f439e041589..999dcb7c540 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties
@@ -23,6 +23,8 @@ session.copy.hover=نسخ
 session.copy.prompt=نسخ الموجه
 session.copy.response=نسخ الرد
 session.copy.copied=تم النسخ
+session.queued=في قائمة الانتظار
+session.queued.remove=إزالة الرسالة من قائمة الانتظار
 session.tab.new=جلسة جديدة
 session.tab.untitled=جلسة بدون عنوان
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties
index 3c3fe1f71a9..fb61208a23c 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopiraj
 session.copy.prompt=Kopiraj prompt
 session.copy.response=Kopiraj odgovor
 session.copy.copied=Kopirano
+session.queued=U redu čekanja
+session.queued.remove=Ukloni poruku iz reda čekanja
 session.tab.new=Nova sesija
 session.tab.untitled=Sesija bez naslova
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties
index 8d0d26a7223..a785788ba07 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopiér
 session.copy.prompt=Kopiér prompt
 session.copy.response=Kopiér svar
 session.copy.copied=Kopieret
+session.queued=I kø
+session.queued.remove=Fjern besked fra køen
 session.tab.new=Ny session
 session.tab.untitled=Unavngivet session
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties
index 181ac9f1654..837e4d8dd70 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopieren
 session.copy.prompt=Prompt kopieren
 session.copy.response=Antwort kopieren
 session.copy.copied=Kopiert
+session.queued=In Warteschlange
+session.queued.remove=Nachricht aus Warteschlange entfernen
 session.tab.new=Neue Sitzung
 session.tab.untitled=Unbenannte Sitzung
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties
index fb67a0de551..25279f34921 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties
@@ -23,6 +23,8 @@ session.copy.hover=Copiar
 session.copy.prompt=Copiar prompt
 session.copy.response=Copiar respuesta
 session.copy.copied=Copiado
+session.queued=En cola
+session.queued.remove=Eliminar mensaje en cola
 session.tab.new=Nueva sesión
 session.tab.untitled=Sesión sin título
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties
index 3848ae7ee98..3c279709d25 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties
@@ -23,6 +23,8 @@ session.copy.hover=Copier
 session.copy.prompt=Copier le prompt
 session.copy.response=Copier la réponse
 session.copy.copied=Copié
+session.queued=En attente
+session.queued.remove=Supprimer le message en attente
 session.tab.new=Nouvelle session
 session.tab.untitled=Session sans titre
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties
index 8c9e3d12c06..9d853d2a796 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties
@@ -23,6 +23,8 @@ session.copy.hover=コピー
 session.copy.prompt=プロンプトをコピー
 session.copy.response=応答をコピー
 session.copy.copied=コピーしました
+session.queued=キュー済み
+session.queued.remove=キュー済みメッセージを削除
 session.tab.new=新しいセッション
 session.tab.untitled=名前なしのセッション
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties
index b463a9b1951..9b1797052c7 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties
@@ -23,6 +23,8 @@ session.copy.hover=복사
 session.copy.prompt=프롬프트 복사
 session.copy.response=응답 복사
 session.copy.copied=복사됨
+session.queued=대기 중
+session.queued.remove=대기 중인 메시지 제거
 session.tab.new=새 세션
 session.tab.untitled=제목 없는 세션
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties
index b29e1b9dc21..85fc3f6b31c 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopiëren
 session.copy.prompt=Prompt kopiëren
 session.copy.response=Antwoord kopiëren
 session.copy.copied=Gekopieerd
+session.queued=In wachtrij
+session.queued.remove=Bericht uit wachtrij verwijderen
 session.tab.new=Nieuwe sessie
 session.tab.untitled=Naamloze sessie
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties
index c577c420520..c160fdf4000 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopier
 session.copy.prompt=Kopier prompt
 session.copy.response=Kopier svar
 session.copy.copied=Kopiert
+session.queued=I kø
+session.queued.remove=Fjern melding fra køen
 session.tab.new=Ny økt
 session.tab.untitled=Uten tittel
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties
index d57e58ac718..db9776e10b5 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopiuj
 session.copy.prompt=Kopiuj prompt
 session.copy.response=Kopiuj odpowiedź
 session.copy.copied=Skopiowano
+session.queued=W kolejce
+session.queued.remove=Usuń wiadomość z kolejki
 session.tab.new=Nowa sesja
 session.tab.untitled=Sesja bez tytułu
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties
index 6655ce84b0f..35dda74bfed 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties
@@ -23,6 +23,8 @@ session.copy.hover=Copiar
 session.copy.prompt=Copiar prompt
 session.copy.response=Copiar resposta
 session.copy.copied=Copiado
+session.queued=Na fila
+session.queued.remove=Remover mensagem da fila
 session.tab.new=Nova sessão
 session.tab.untitled=Sessão sem título
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties
index c1eaee006ad..3d53c6262d6 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties
@@ -23,6 +23,8 @@ session.copy.hover=Копировать
 session.copy.prompt=Скопировать промпт
 session.copy.response=Скопировать ответ
 session.copy.copied=Скопировано
+session.queued=В очереди
+session.queued.remove=Удалить сообщение из очереди
 session.tab.new=Новая сессия
 session.tab.untitled=Незаголовок сессия
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties
index 89e6d9a8df9..3b400b23d01 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties
@@ -23,6 +23,8 @@ session.copy.hover=คัดลอก
 session.copy.prompt=คัดลอกพรอมต์
 session.copy.response=คัดลอกคำตอบ
 session.copy.copied=คัดลอกแล้ว
+session.queued=อยู่ในคิว
+session.queued.remove=ลบข้อความในคิว
 session.tab.new=เซสชันใหม่
 session.tab.untitled=เซสชันไม่มีชื่อ
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties
index d6ee1e84d97..8b7a2de3cda 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties
@@ -23,6 +23,8 @@ session.copy.hover=Kopyala
 session.copy.prompt=Promptu kopyala
 session.copy.response=Yanıtı kopyala
 session.copy.copied=Kopyalandı
+session.queued=Kuyrukta
+session.queued.remove=Kuyruktaki mesajı kaldır
 session.tab.new=Yeni oturum
 session.tab.untitled=Başlıksız oturum
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties
index f385d236f4e..896ee37e7ad 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties
@@ -23,6 +23,8 @@ session.copy.hover=Копіювати
 session.copy.prompt=Скопіювати промпт
 session.copy.response=Скопіювати відповідь
 session.copy.copied=Скопійовано
+session.queued=У черзі
+session.queued.remove=Видалити повідомлення з черги
 session.tab.new=Нова сесія
 session.tab.untitled=Сесія без назви
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties
index 3f4b3fbc3db..864bce7a28c 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties
@@ -23,6 +23,8 @@ session.copy.hover=复制
 session.copy.prompt=复制提示词
 session.copy.response=复制回复
 session.copy.copied=已复制
+session.queued=已排队
+session.queued.remove=移除排队消息
 session.tab.new=新建会话
 session.tab.untitled=无标题会话
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties
index dd2898d09a8..48c5418ae78 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties
@@ -23,6 +23,8 @@ session.copy.hover=複製
 session.copy.prompt=複製提示詞
 session.copy.response=複製回覆
 session.copy.copied=已複製
+session.queued=已排入佇列
+session.queued.remove=移除佇列中的訊息
 session.tab.new=新建工作階段
 session.tab.untitled=未命名的工作階段
 
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 b84cdb5da6f..9d5e4225e15 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
@@ -102,6 +102,46 @@ class PromptLifecycleTest : SessionControllerTestBase() {
         assertFalse(message.properties.containsValue("git-changes"))
     }
 
+    fun `test session queue changed updates queued set`() {
+        val (c, _, modelEvents) = prompted()
+
+        emit(ChatEventDto.SessionQueueChanged("ses_test", listOf("u2")))
+
+        assertEquals(setOf("u2"), c.model.queued)
+        assertModelEvents(
+            """
+            QueueChanged [u2]
+            """,
+            modelEvents,
+        )
+
+        emit(ChatEventDto.SessionQueueChanged("ses_test", emptyList()))
+
+        assertEquals(emptySet<String>(), c.model.queued)
+    }
+
+    fun `test delete queued message delegates to RPC`() {
+        val (c, _, _) = prompted()
+
+        edt { c.deleteQueuedMessage("u2") }
+        flush()
+
+        assertEquals(listOf(ai.kilocode.client.testing.FakeSessionRpcApi.MessageDeleteCall("ses_test", "/test", "u2")), rpc.messageDeletes)
+        assertTrue(appRpc.telemetry.any { it.event == "Conversation Queued Message Removed" })
+    }
+
+    fun `test delete queued message miss captures error`() {
+        val (c, _, _) = prompted()
+        rpc.messageDeleteResult = false
+
+        edt { c.deleteQueuedMessage("u2") }
+        flush()
+
+        assertEquals(listOf(ai.kilocode.client.testing.FakeSessionRpcApi.MessageDeleteCall("ses_test", "/test", "u2")), rpc.messageDeletes)
+        assertFalse(appRpc.telemetry.any { it.event == "Conversation Queued Message Removed" })
+        assertTrue(appRpc.telemetry.any { it.event == "Session Error" && it.properties["context"] == "delete-message" })
+    }
+
     fun `test PermissionAsked moves state to AwaitingPermission`() {
         val (m, _, _) = prompted()
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt
index 70a6dc52bba..745062e15f5 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt
@@ -1056,7 +1056,7 @@ class PromptPanelTest : BasePlatformTestCase() {
         assertTrue(resource("/icons/send_dark.svg").contains("fill=\"#0A7BD8\""))
     }
 
-    fun `test busy disables send button`() {
+    fun `test busy allows sending draft`() {
         val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> })
         panel.setReady(true)
         ApplicationManager.getApplication().invokeAndWait { panel.setText("hello") }
@@ -1065,8 +1065,9 @@ class PromptPanelTest : BasePlatformTestCase() {
 
         panel.setBusy(true)
 
-        assertFalse(panel.isSendEnabled)
+        assertTrue(panel.isSendEnabled)
         assertTrue(panel.isStopEnabled)
+        assertNotSame(AllIcons.Actions.Suspend, panel.buttonForTest().icon)
     }
 
     fun `test auto approve button toggles and updates tooltip`() {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanelTest.kt
index d5e72cfc081..b27219697a3 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanelTest.kt
@@ -28,6 +28,7 @@ import ai.kilocode.client.session.views.tool.TaskToolView
 import ai.kilocode.client.session.views.tool.ToolView
 import ai.kilocode.client.session.views.todo.TodoWriteView
 import ai.kilocode.client.ui.DiffStatBadge
+import ai.kilocode.client.ui.HoverIcon
 import ai.kilocode.client.ui.layout.Stack
 import ai.kilocode.rpc.dto.DiffFileDto
 import ai.kilocode.rpc.dto.MessageDto
@@ -129,6 +130,32 @@ class SessionMessageListPanelTest : BasePlatformTestCase() {
         )
     }
 
+    fun `test queued turn shows badge and remove action`() {
+        var deleted: String? = null
+        Disposer.dispose(parent)
+        parent = Disposer.newDisposable("test-queued")
+        model = SessionModel()
+        panel = SessionMessageListPanel(model, parent, openFile = openFile, deleteQueued = { deleted = it })
+        model.upsertMessage(msg("u1", "user"))
+        model.updateContent("u1", part("p1", "u1", "text", text = "first"))
+        model.upsertMessage(msg("u2", "user"))
+        model.updateContent("u2", part("p2", "u2", "text", text = "second"))
+
+        model.setQueued(setOf("u2"))
+
+        val u1 = panel.findMessage("u1")!!
+        val u2 = panel.findMessage("u2")!!
+        assertFalse(components(u1).filterIsInstance<JBLabel>().any { it.text == KiloBundle.message("session.queued") })
+        assertTrue(components(u2).filterIsInstance<JBLabel>().any { it.text == KiloBundle.message("session.queued") })
+
+        val remove = components(u2).filterIsInstance<HoverIcon>().single()
+        assertEquals(KiloBundle.message("session.queued.remove"), remove.toolTipText)
+        assertEquals(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR), remove.cursor)
+        remove.doClick()
+
+        assertEquals("u2", deleted)
+    }
+
     // ------ TurnAdded ------
 
     fun `test user message creates turn and is findable by message id`() {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeSessionRpcApi.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeSessionRpcApi.kt
index 30361406101..adb4afd0aae 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeSessionRpcApi.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeSessionRpcApi.kt
@@ -96,6 +96,8 @@ class FakeSessionRpcApi : KiloSessionRpcApi {
     val aborts = mutableListOf<Pair<String, String>>()
     val compacts = mutableListOf<Triple<String, String, ModelSelectionDto>>()
     val reverts = mutableListOf<RevertCall>()
+    val messageDeletes = mutableListOf<MessageDeleteCall>()
+    var messageDeleteResult = true
     val unreverts = mutableListOf<Pair<String, String>>()
     val configs = mutableListOf<Pair<String, ConfigUpdateDto>>()
     val permissionReplies = mutableListOf<Triple<String, String, PermissionReplyDto>>()
@@ -118,6 +120,7 @@ class FakeSessionRpcApi : KiloSessionRpcApi {
     data class AttachmentCall(val id: String, val directory: String, val messageId: String, val partId: String, val attachmentKey: String?)
     data class CommandCall(val id: String, val directory: String, val command: String, val arguments: String, val prompt: PromptDto)
     data class RevertCall(val id: String, val directory: String, val message: String, val part: String?)
+    data class MessageDeleteCall(val id: String, val directory: String, val message: String)
 
     // --- Implementation ---
 
@@ -231,6 +234,12 @@ class FakeSessionRpcApi : KiloSessionRpcApi {
         reverts.add(RevertCall(id, directory, messageID, partID))
     }
 
+    override suspend fun deleteMessage(id: String, directory: String, messageID: String): Boolean {
+        assertNotEdt("deleteMessage")
+        messageDeletes.add(MessageDeleteCall(id, directory, messageID))
+        return messageDeleteResult
+    }
+
     override suspend fun unrevert(id: String, directory: String) {
         assertNotEdt("unrevert")
         unrevertGate?.await()
diff --git a/packages/kilo-jetbrains/gradle.properties b/packages/kilo-jetbrains/gradle.properties
index 6782f168445..9e9e7cd62da 100644
--- a/packages/kilo-jetbrains/gradle.properties
+++ b/packages/kilo-jetbrains/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.stdlib.default.dependency=false
-kilo.jetbrains.version=7.0.10
+kilo.jetbrains.version=7.0.12-rc.2
 # When true (default) the JetBrains plugin uses the pinned CLI release from package.json.
 # Set to false ONLY for local dev: generate the client from local source + bundle the local binary.
 # false is NOT releasable -- production builds fail unless this is true.
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/log/ChatLogSummary.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/log/ChatLogSummary.kt
index 4f8e06f1693..588c0c9d0e6 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/log/ChatLogSummary.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/log/ChatLogSummary.kt
@@ -33,6 +33,7 @@ object ChatLogSummary {
         is ChatEventDto.SessionStatusChanged -> event.sessionID
         is ChatEventDto.SessionUpdated -> event.sessionID
         is ChatEventDto.SessionIdle -> event.sessionID
+        is ChatEventDto.SessionQueueChanged -> event.sessionID
         is ChatEventDto.SessionCompacted -> event.sessionID
         is ChatEventDto.SessionDiffChanged -> event.sessionID
         is ChatEventDto.TodoUpdated -> event.sessionID
@@ -211,6 +212,12 @@ object ChatLogSummary {
             "evt=session.idle",
         )
 
+        is ChatEventDto.SessionQueueChanged -> join(
+            sid(event.sessionID),
+            "evt=session.queue.changed",
+            "queued=${event.queued.size}",
+        )
+
         is ChatEventDto.SessionCompacted -> join(
             sid(event.sessionID),
             "evt=session.compacted",
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloSessionRpcApi.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloSessionRpcApi.kt
index 6b6cfa4f97f..0fab2e8696e 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloSessionRpcApi.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloSessionRpcApi.kt
@@ -90,6 +90,9 @@ interface KiloSessionRpcApi : RemoteApi<Unit> {
     /** Revert a session to a prior user message or part. */
     suspend fun revert(id: String, directory: String, messageID: String, partID: String?)
 
+    /** Delete a single message (used to remove a queued prompt). */
+    suspend fun deleteMessage(id: String, directory: String, messageID: String): Boolean
+
     /** Redo all reverted changes for a session. */
     suspend fun unrevert(id: String, directory: String)
 
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 dbb053f8fd5..edbbed7b02b 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
@@ -254,6 +254,13 @@ sealed class ChatEventDto {
         val sessionID: String,
     ) : ChatEventDto()
 
+    @Serializable
+    @SerialName("session.queue.changed")
+    data class SessionQueueChanged(
+        val sessionID: String,
+        val queued: List<String> = emptyList(),
+    ) : ChatEventDto()
+
     @Serializable
     @SerialName("session.compacted")
     data class SessionCompacted(
diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json
index 450133e0929..3043aedbab9 100644
--- a/packages/kilo-ui/package.json
+++ b/packages/kilo-ui/package.json
@@ -66,6 +66,7 @@
     "./text-strikethrough": "./src/components/text-strikethrough.tsx",
     "./context": "./src/context/index.ts",
     "./context/code": "./src/context/code.tsx",
+    "./context/clipboard": "./src/context/clipboard.tsx",
     "./context/data": "./src/context/data.tsx",
     "./context/dialog": "./src/context/dialog.tsx",
     "./context/diff": "./src/context/diff.tsx",
diff --git a/packages/kilo-ui/src/components/basic-tool.css b/packages/kilo-ui/src/components/basic-tool.css
index c4495f862ff..3c67c36e2ad 100644
--- a/packages/kilo-ui/src/components/basic-tool.css
+++ b/packages/kilo-ui/src/components/basic-tool.css
@@ -516,3 +516,10 @@ html[data-theme="kilo-vscode"] [data-component="tool-part-wrapper"][data-part-ty
     font-family: var(--font-family-mono);
   }
 }
+
+/* Subagent card: the line renders inside the trigger's info row (an align-baseline flex),
+   so force it onto its own full-width line directly under the title/description. */
+[data-slot="basic-tool-tool-info-main"] > [data-slot="tool-approval-line"] {
+  flex-basis: 100%;
+  padding: 2px 0 0;
+}
diff --git a/packages/kilo-ui/src/components/basic-tool.test.ts b/packages/kilo-ui/src/components/basic-tool.test.ts
new file mode 100644
index 00000000000..c4009ba55f7
--- /dev/null
+++ b/packages/kilo-ui/src/components/basic-tool.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, test } from "bun:test"
+import { shouldRenderApprovalInBody } from "./basic-tool"
+
+describe("shouldRenderApprovalInBody", () => {
+  test("renders in the body by default when an approval exists", () => {
+    expect(shouldRenderApprovalInBody(undefined, true)).toBe(true)
+    expect(shouldRenderApprovalInBody("body", true)).toBe(true)
+  })
+
+  test("does not render when there is no approval", () => {
+    expect(shouldRenderApprovalInBody("body", false)).toBe(false)
+    expect(shouldRenderApprovalInBody(undefined, false)).toBe(false)
+  })
+
+  test("never renders in the body for hidden placement, even with an approval", () => {
+    expect(shouldRenderApprovalInBody("hidden", true)).toBe(false)
+    expect(shouldRenderApprovalInBody("hidden", false)).toBe(false)
+  })
+})
diff --git a/packages/kilo-ui/src/components/basic-tool.tsx b/packages/kilo-ui/src/components/basic-tool.tsx
index ce545b832ee..7dbaeee9395 100644
--- a/packages/kilo-ui/src/components/basic-tool.tsx
+++ b/packages/kilo-ui/src/components/basic-tool.tsx
@@ -11,6 +11,7 @@ export interface BasicToolProps extends BaseProps {
   tool?: string
   callID?: string
   partID?: string
+  approvalPlacement?: "body" | "hidden"
 }
 
 type OpenProps = Pick<BasicToolProps, "tool" | "callID" | "partID" | "forceOpen" | "defaultOpen">
@@ -19,26 +20,41 @@ export function initialOpen(props: OpenProps) {
   return props.forceOpen ? true : readToolOpen(toolOpenKey(props), props.defaultOpen)
 }
 
+export function useToolApprovalLine() {
+  const approval = useToolApproval()
+  return () => {
+    const value = approval()
+    return value ? <ToolApprovalLine display={value} /> : null
+  }
+}
+
+/**
+ * Whether BasicTool should inject the approval line into its body.
+ */
+export function shouldRenderApprovalInBody(placement: BasicToolProps["approvalPlacement"], hasApproval: boolean) {
+  return placement !== "hidden" && hasApproval
+}
+
 export function BasicTool(props: BasicToolProps) {
   const key = () => toolOpenKey(props)
   const initial = () => initialOpen(props)
   const approval = useToolApproval()
+  const inBody = () => shouldRenderApprovalInBody(props.approvalPlacement, approval() !== undefined)
   const change = (open: boolean) => {
     writeToolOpen(key(), open)
     props.onOpenChange?.(open)
   }
-  // The "why was this allowed" line lives in the expanded body, above any tool-specific details.
   const details = () => (
     <div data-slot="basic-tool-details">
-      <Show when={approval()}>{(value) => <ToolApprovalLine display={value()} />}</Show>
+      <Show when={inBody() && approval()}>{(value) => <ToolApprovalLine display={value()} />}</Show>
       {props.children}
     </div>
   )
-  if (!("children" in props) && !approval()) {
+  if (!("children" in props) && !inBody()) {
     return <Base {...props} defaultOpen={initial()} retainDetails={props.defer} onOpenChange={change} />
   }
   return (
-    <Base {...props} defaultOpen={initial()} retainDetails={props.defer} onOpenChange={change} hasDetails>
+    <Base {...props} defaultOpen={initial()} retainDetails={props.defer} onOpenChange={change} hasDetails={inBody()}>
       {details()}
     </Base>
   )
diff --git a/packages/kilo-ui/src/components/code.tsx b/packages/kilo-ui/src/components/code.tsx
index c5ff061f33f..cbf22e2d4c5 100644
--- a/packages/kilo-ui/src/components/code.tsx
+++ b/packages/kilo-ui/src/components/code.tsx
@@ -19,7 +19,7 @@ const VIRTUALIZE_BYTES = 500_000
 const codeMetrics = {
   ...DEFAULT_VIRTUAL_FILE_METRICS,
   lineHeight: 24,
-  fileGap: 0,
+  spacing: 0,
 } satisfies Partial<VirtualFileMetrics>
 
 const codeStyle = {
diff --git a/packages/kilo-ui/src/components/message-part.tsx b/packages/kilo-ui/src/components/message-part.tsx
index 73e917d3c55..cbb8982989d 100644
--- a/packages/kilo-ui/src/components/message-part.tsx
+++ b/packages/kilo-ui/src/components/message-part.tsx
@@ -30,8 +30,9 @@ import {
 import { useData } from "../context"
 import { useFileComponent } from "../context/file"
 import { useDialog } from "../context/dialog"
+import { useClipboard } from "../context/clipboard"
 import { type UiI18n, useI18n } from "../context/i18n"
-import { GenericTool, BasicTool } from "./basic-tool"
+import { BasicTool, useToolApprovalLine } from "./basic-tool"
 import { Accordion } from "./accordion"
 import { StickyAccordionHeader } from "./sticky-accordion-header"
 import { Card } from "./card"
@@ -753,6 +754,7 @@ export function UserMessageDisplay(props: {
   const data = useData()
   const dialog = useDialog()
   const i18n = useI18n()
+  const clipboard = useClipboard()
   const [copied, setCopied] = createSignal(false)
 
   const textPart = createMemo(
@@ -815,7 +817,7 @@ export function UserMessageDisplay(props: {
   const handleCopy = async () => {
     const content = props.copyText ?? text()
     if (!content) return
-    await navigator.clipboard.writeText(content)
+    await clipboard.write(content)
     setCopied(true)
     setTimeout(() => setCopied(false), 2000)
   }
@@ -1311,7 +1313,14 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
             }}
           </Match>
           <Match when={true}>
-            <ToolApprovalProvider value={() => resolveToolApproval(meta(), i18n.t as (k: string, p?: Record<string, string | number | boolean>) => string)}>
+            <ToolApprovalProvider
+              value={() =>
+                resolveToolApproval(
+                  meta(),
+                  i18n.t as (k: string, p?: Record<string, string | number | boolean>) => string,
+                )
+              }
+            >
               <Dynamic
                 component={render()}
                 input={input()}
@@ -1358,6 +1367,7 @@ PART_MAPPING["compaction"] = function CompactionPartDisplay() {
 PART_MAPPING["text"] = function TextPartDisplay(props) {
   const data = useData()
   const i18n = useI18n()
+  const clipboard = useClipboard()
   const part = () => props.part as TextPart
 
   const displayText = () => (part().text ?? "").trim()
@@ -1396,7 +1406,7 @@ PART_MAPPING["text"] = function TextPartDisplay(props) {
   const handleCopy = async () => {
     const content = displayText()
     if (!content) return
-    await navigator.clipboard.writeText(content)
+    await clipboard.write(content)
     setCopied(true)
     setTimeout(() => setCopied(false), 2000)
   }
@@ -1497,9 +1507,7 @@ PART_MAPPING["text"] = function TextPartDisplay(props) {
                 />
               </Tooltip>
             </Show>
-            <Show when={props.throughput}>
-              {(el) => <span data-slot="assistant-throughput-inline">{el()}</span>}
-            </Show>
+            <Show when={props.throughput}>{(el) => <span data-slot="assistant-throughput-inline">{el()}</span>}</Show>
           </div>
         </Show>
         <Show when={summary()}>
@@ -2172,6 +2180,8 @@ ToolRegistry.register({
       }, 50)
     }
 
+    const approvalLine = useToolApprovalLine()
+
     const trigger = () => (
       <div data-slot="basic-tool-tool-info-structured">
         <div data-slot="basic-tool-tool-info-main">
@@ -2190,11 +2200,22 @@ ToolRegistry.register({
               </Match>
             </Switch>
           </Show>
+          {/* Keep the auto-approve line attached to the subagent card instead of forcing a collapsible body. */}
+          {approvalLine()}
         </div>
       </div>
     )
 
-    return <BasicTool hideDetails icon="task" status={props.status} trigger={trigger()} animated />
+    return (
+      <BasicTool
+        hideDetails
+        approvalPlacement="hidden"
+        icon="task"
+        status={props.status}
+        trigger={trigger()}
+        animated
+      />
+    )
   },
 })
 
@@ -2932,6 +2953,7 @@ ToolRegistry.register({
       <BasicTool
         {...props}
         defaultOpen
+        approvalPlacement="hidden"
         icon="checklist"
         trigger={
           <ToolTriggerRow
diff --git a/packages/kilo-ui/src/components/select-change.ts b/packages/kilo-ui/src/components/select-change.ts
new file mode 100644
index 00000000000..220e979a348
--- /dev/null
+++ b/packages/kilo-ui/src/components/select-change.ts
@@ -0,0 +1,4 @@
+export function changed<T>(current: T | undefined, next: T | undefined, key: (item: T) => string) {
+  if (current === undefined || next === undefined) return current !== next
+  return key(current) !== key(next)
+}
diff --git a/packages/kilo-ui/src/components/select.test.ts b/packages/kilo-ui/src/components/select.test.ts
new file mode 100644
index 00000000000..cc81ce944a4
--- /dev/null
+++ b/packages/kilo-ui/src/components/select.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, test } from "bun:test"
+import { changed } from "./select-change"
+
+describe("changed", () => {
+  const key = (item: { value: string }) => item.value
+
+  test("ignores recreated options with the current key", () => {
+    expect(changed({ value: "ollama" }, { value: "ollama" }, key)).toBe(false)
+  })
+
+  test("reports selected and cleared values", () => {
+    expect(changed({ value: "ollama" }, { value: "kilo" }, key)).toBe(true)
+    expect(changed({ value: "ollama" }, undefined, key)).toBe(true)
+    expect(changed(undefined, { value: "ollama" }, key)).toBe(true)
+    expect(changed(undefined, undefined, key)).toBe(false)
+  })
+})
diff --git a/packages/kilo-ui/src/components/select.tsx b/packages/kilo-ui/src/components/select.tsx
index d4a6c72f2cb..d6a72b1a8dd 100644
--- a/packages/kilo-ui/src/components/select.tsx
+++ b/packages/kilo-ui/src/components/select.tsx
@@ -1 +1,19 @@
+import { Select as Base, type SelectProps } from "@opencode-ai/ui/select"
+import type { ButtonProps } from "@opencode-ai/ui/button"
+import { changed } from "./select-change"
+
 export * from "@opencode-ai/ui/select"
+
+export function Select<T>(props: SelectProps<T> & Omit<ButtonProps, "children">) {
+  const key = (item: T) => (props.value ? props.value(item) : (item as string))
+
+  return (
+    <Base
+      {...props}
+      onSelect={(next) => {
+        if (!changed(props.current, next, key)) return
+        props.onSelect?.(next)
+      }}
+    />
+  )
+}
diff --git a/packages/kilo-ui/src/components/tool-approval.test.ts b/packages/kilo-ui/src/components/tool-approval.test.ts
new file mode 100644
index 00000000000..746e1f58d48
--- /dev/null
+++ b/packages/kilo-ui/src/components/tool-approval.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, test } from "bun:test"
+import { resolveToolApproval } from "./tool-approval"
+
+// Echo the key + params so assertions can see which string was chosen without a real dictionary.
+const t = (key: string, params?: Record<string, string | number | boolean>) =>
+  params
+    ? `${key}(${Object.entries(params)
+        .map(([k, v]) => `${k}=${v}`)
+        .join(",")})`
+    : key
+
+describe("resolveToolApproval", () => {
+  test("returns undefined when there is no approval on the metadata", () => {
+    expect(resolveToolApproval(undefined, t)).toBeUndefined()
+    expect(resolveToolApproval({ other: 1 }, t)).toBeUndefined()
+  })
+
+  test("manual approvals show only the decision, no source or rule", () => {
+    const out = resolveToolApproval({ approval: { source: "manual" } }, t)
+    expect(out).toEqual({
+      approval: { source: "manual" },
+      decision: "ui.approval.manual",
+      source: undefined,
+      rule: undefined,
+    })
+  })
+
+  test("a specific rule is shown with permission + pattern", () => {
+    const approval = { source: "project" as const, rule: { permission: "bash", pattern: "git *", action: "allow" } }
+    const out = resolveToolApproval({ approval }, t)
+    expect(out?.decision).toBe("ui.approval.auto")
+    expect(out?.source).toBe("ui.approval.source.project")
+    expect(out?.rule).toBe("ui.approval.rule(permission=bash,pattern=git *)")
+  })
+
+  test("a per-tool rule with a wildcard pattern still shows the tool name", () => {
+    const approval = {
+      source: "agent" as const,
+      agent: "explore",
+      rule: { permission: "task", pattern: "*", action: "allow" },
+    }
+    const out = resolveToolApproval({ approval }, t)
+    expect(out?.rule).toBe("ui.approval.rule(permission=task,pattern=*)")
+  })
+
+  test("the catch-all */* rule is dropped so the line is not noisy for blanket agent defaults", () => {
+    // e.g. the code agent auto-approving `task`/`todowrite` via its "*": "allow" default.
+    const approval = {
+      source: "agent" as const,
+      agent: "code",
+      rule: { permission: "*", pattern: "*", action: "allow" },
+    }
+    const out = resolveToolApproval({ approval }, t)
+    expect(out?.source).toBe("ui.approval.source.agent(agent=code)")
+    expect(out?.rule).toBeUndefined()
+  })
+})
diff --git a/packages/kilo-ui/src/components/tool-approval.tsx b/packages/kilo-ui/src/components/tool-approval.tsx
index af07af86ddf..d555e105df3 100644
--- a/packages/kilo-ui/src/components/tool-approval.tsx
+++ b/packages/kilo-ui/src/components/tool-approval.tsx
@@ -59,13 +59,18 @@ export function resolveToolApproval(
     if (approval.source === "manual") return undefined
     return t(`ui.approval.source.${approval.source}`)
   }
+  const rule = approval.rule
+  // The catch-all "*"/"*" rule carries no useful detail (it's the blanket allow-everything default),
+  // so drop the "matched `*` rule `*`" fragment and let the source alone explain the approval.
+  const ruleText =
+    rule && !(rule.permission === "*" && rule.pattern === "*")
+      ? t("ui.approval.rule", { permission: rule.permission, pattern: rule.pattern })
+      : undefined
   return {
     approval,
     decision: approval.source === "manual" ? t("ui.approval.manual") : t("ui.approval.auto"),
     source: sourceText(),
-    rule: approval.rule
-      ? t("ui.approval.rule", { permission: approval.rule.permission, pattern: approval.rule.pattern })
-      : undefined,
+    rule: ruleText,
   }
 }
 
@@ -76,9 +81,7 @@ export function ToolApprovalLine(props: { display: ToolApprovalDisplay }) {
     <div data-slot="tool-approval-line" data-source={props.display.approval.source}>
       <span data-slot="tool-approval-decision">{props.display.decision}</span>
       <Show when={!manual()}>
-        <Show when={props.display.source}>
-          {(text) => <span data-slot="tool-approval-source">{text()}</span>}
-        </Show>
+        <Show when={props.display.source}>{(text) => <span data-slot="tool-approval-source">{text()}</span>}</Show>
         <Show when={props.display.rule}>{(text) => <span data-slot="tool-approval-rule">{text()}</span>}</Show>
       </Show>
     </div>
diff --git a/packages/kilo-ui/src/context/clipboard.tsx b/packages/kilo-ui/src/context/clipboard.tsx
new file mode 100644
index 00000000000..3cc19dfb861
--- /dev/null
+++ b/packages/kilo-ui/src/context/clipboard.tsx
@@ -0,0 +1,17 @@
+import { createContext, type ParentComponent, useContext } from "solid-js"
+
+type ClipboardContextValue = {
+  write: (text: string) => void | Promise<void>
+}
+
+const ClipboardContext = createContext<ClipboardContextValue>({
+  write: (text) => navigator.clipboard.writeText(text),
+})
+
+export const ClipboardProvider: ParentComponent<ClipboardContextValue> = (props) => (
+  <ClipboardContext.Provider value={{ write: props.write }}>{props.children}</ClipboardContext.Provider>
+)
+
+export function useClipboard() {
+  return useContext(ClipboardContext)
+}
diff --git a/packages/kilo-vscode/bunfig.toml b/packages/kilo-vscode/bunfig.toml
index 2c6410f31e1..0ae571971a2 100644
--- a/packages/kilo-vscode/bunfig.toml
+++ b/packages/kilo-vscode/bunfig.toml
@@ -1,2 +1,2 @@
 [test]
-preload = ["./tests/setup/vscode-mock.ts"]
+preload = ["./tests/setup/vscode-mock.ts", "./tests/setup/worker-url.ts"]
diff --git a/packages/kilo-vscode/esbuild.js b/packages/kilo-vscode/esbuild.js
index db068238ede..eed8e2475b2 100644
--- a/packages/kilo-vscode/esbuild.js
+++ b/packages/kilo-vscode/esbuild.js
@@ -77,6 +77,26 @@ const pierreWorkerAliasPlugin = {
   },
 }
 
+/**
+ * Replace Markdown's Vite-only worker URL import with the URI injected by the
+ * extension host. The worker itself is emitted as a separate dist asset below.
+ *
+ * @type {import('esbuild').Plugin}
+ */
+const markdownWorkerUrlPlugin = {
+  name: "markdown-worker-url",
+  setup(build) {
+    build.onResolve({ filter: /markdown-shiki\.worker\.ts\?worker&url$/ }, () => ({
+      path: "markdown-shiki-worker-url",
+      namespace: "kilo-worker-url",
+    }))
+    build.onLoad({ filter: /.*/, namespace: "kilo-worker-url" }, () => ({
+      contents: "export default window.KILO_MARKDOWN_SHIKI_WORKER_URI",
+      loader: "js",
+    }))
+  },
+}
+
 /**
  * Resolve the synthetic `kilo-shiki-worker` entry point to Pierre's Shiki worker
  * so esbuild can bundle it (and its inlined oniguruma WebAssembly) into a single
@@ -159,6 +179,7 @@ function createBrowserWebviewContext(entryPoint, outfile) {
     plugins: [
       solidDedupePlugin,
       pierreWorkerAliasPlugin,
+      markdownWorkerUrlPlugin,
       svgSpritePlugin,
       cssPackageResolvePlugin,
       solidPlugin(),
@@ -184,6 +205,21 @@ function createShikiWorkerContext() {
   })
 }
 
+function createMarkdownShikiWorkerContext() {
+  return esbuild.context({
+    entryPoints: [path.join(__dirname, "..", "ui", "src", "components", "markdown-shiki.worker.ts")],
+    bundle: true,
+    format: "esm",
+    minify: production,
+    sourcemap: !production,
+    sourcesContent: false,
+    platform: "browser",
+    outfile: "dist/markdown-shiki-worker.js",
+    logLevel: "silent",
+    plugins: [esbuildProblemMatcherPlugin],
+  })
+}
+
 async function main() {
   // Build extension
   const extensionCtx = await esbuild.context({
@@ -229,6 +265,7 @@ async function main() {
 
   // Build the shared Shiki highlighting worker asset
   const shikiWorkerCtx = await createShikiWorkerContext()
+  const markdownShikiWorkerCtx = await createMarkdownShikiWorkerContext()
 
   if (watch) {
     await Promise.all([
@@ -240,6 +277,7 @@ async function main() {
       kiloClawCtx.watch(),
       marketplaceCtx.watch(),
       shikiWorkerCtx.watch(),
+      markdownShikiWorkerCtx.watch(),
     ])
   } else {
     await Promise.all([
@@ -251,6 +289,7 @@ async function main() {
       diffViewerCtx.rebuild(),
       diffVirtualCtx.rebuild(),
       shikiWorkerCtx.rebuild(),
+      markdownShikiWorkerCtx.rebuild(),
     ])
     await Promise.all([
       extensionCtx.dispose(),
@@ -261,6 +300,7 @@ async function main() {
       kiloClawCtx.dispose(),
       marketplaceCtx.dispose(),
       shikiWorkerCtx.dispose(),
+      markdownShikiWorkerCtx.dispose(),
     ])
   }
 }
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index e67360acecc..45d6fbeb525 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -804,13 +804,13 @@
         "command": "kilo-code.new.cycleAgentMode",
         "key": "ctrl+.",
         "mac": "cmd+.",
-        "when": "sideBarFocus && kilo-code.new.sidebarVisible || activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' || activeWebviewPanelId == 'kilo-code.new.TabPanel'"
+        "when": "kilo-code.new.sidebarFocused || activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' || activeWebviewPanelId == 'kilo-code.new.TabPanel'"
       },
       {
         "command": "kilo-code.new.cyclePreviousAgentMode",
         "key": "ctrl+shift+.",
         "mac": "cmd+shift+.",
-        "when": "sideBarFocus && kilo-code.new.sidebarVisible || activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' || activeWebviewPanelId == 'kilo-code.new.TabPanel'"
+        "when": "kilo-code.new.sidebarFocused || activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' || activeWebviewPanelId == 'kilo-code.new.TabPanel'"
       },
       {
         "command": "kilo-code.new.autocomplete.cancelSuggestions",
@@ -1016,6 +1016,20 @@
           "scope": "application",
           "description": "Prefix for automatically named Agent Manager branches, for example 'marius/' or 'feature/'. Explicit branch names are unchanged."
         },
+        "kilo-code.new.agentManager.terminalButtonDestination": {
+          "type": "string",
+          "scope": "application",
+          "default": "vscode",
+          "enum": [
+            "vscode",
+            "agentManager"
+          ],
+          "enumDescriptions": [
+            "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."
+        },
         "kilo-code.new.indexing.showButtonWhenDisabled": {
           "type": "boolean",
           "default": true,
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index 72f6f4378f3..48817cf9018 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -741,6 +741,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   private setSidebarVisible(visible: boolean): void {
     this.setStreamVisibility(visible)
     vscode.commands.executeCommand("setContext", "kilo-code.new.sidebarVisible", visible)
+    if (!visible && this.opts.focusContext) {
+      void vscode.commands.executeCommand("setContext", this.opts.focusContext, false)
+    }
   }
 
   /** Resolve a WebviewPanel for displaying Kilo in an editor tab. */
@@ -949,6 +952,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
           dir: this.getWorkspaceDirectory(this.currentSession?.id),
           post: (msg) => this.postMessage(msg),
           exportTranscript: (sessionID) => this.handleExportSessionTranscript(sessionID),
+          copy: (text) => vscode.env.clipboard.writeText(text),
           openSessions: (ids) => this.trackOpenSessions(ids),
         })
       ) {
@@ -981,6 +985,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
         return
       }
       if (await this.handleModelSelectorExpandedMessage(message)) return
+      this.handleWebviewFocusMessage(message)
       this.visibleTaskStreams.handle(message)
       if (await this.handleMemoryMessage(message)) return
       if (this.handleLegacyMigrationMessage(message)) return
@@ -1466,6 +1471,13 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.webviewMessageDisposable = watchWorkStyleConfig((msg) => this.postMessage(msg), this.webviewMessageDisposable)
   }
 
+  private handleWebviewFocusMessage(message: TypedWebviewMessage & { focused?: unknown }): void {
+    if (message.type !== "webviewFocusChanged") return
+    if (this.opts.focusContext) {
+      void vscode.commands.executeCommand("setContext", this.opts.focusContext, message.focused === true)
+    }
+  }
+
   private handleEditorOpenMessage(message: Parameters<typeof handleEditorAction>[0]): boolean {
     return handleEditorAction(message, {
       dir: () => this.getWorkspaceDirectory(this.currentSession?.id),
@@ -4559,6 +4571,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
    * Does NOT kill the server — that's the connection service's job.
    */
   dispose(): void {
+    if (this.opts.focusContext) {
+      void vscode.commands.executeCommand("setContext", this.opts.focusContext, false)
+    }
     this.unsubscribeRemote?.()
     this.streams.focus(undefined)
     this.connectionService.unregisterVisible(this.instanceId)
diff --git a/packages/kilo-vscode/src/SettingsEditorProvider.ts b/packages/kilo-vscode/src/SettingsEditorProvider.ts
index 94d2536dfd2..84dc741d6d2 100644
--- a/packages/kilo-vscode/src/SettingsEditorProvider.ts
+++ b/packages/kilo-vscode/src/SettingsEditorProvider.ts
@@ -64,7 +64,7 @@ export class SettingsEditorProvider implements vscode.Disposable {
         const provider = this.providers.get(view)
         provider?.postMessage({ type: "navigate", view, tab })
       }
-      existing.reveal(vscode.ViewColumn.One)
+      existing.reveal(vscode.ViewColumn.Active)
       this.providers.get(view)?.postMessage({ type: "navigate", view, ...(tab ? { tab } : {}) })
       return
     }
@@ -72,7 +72,7 @@ export class SettingsEditorProvider implements vscode.Disposable {
     const panel = vscode.window.createWebviewPanel(
       `kilo-code.new.${view}Panel`,
       PANEL_TITLES[view],
-      vscode.ViewColumn.One,
+      vscode.ViewColumn.Active,
       {
         enableScripts: true,
         retainContextWhenHidden: true,
diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
index 6e480cc212a..bf72af74ab8 100644
--- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
+++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
@@ -46,6 +46,7 @@ import { pruneSubagents } from "./prune-subagents"
 
 import { startSession } from "./mcp-warmup"
 import { readTerminalFont, watchTerminalFont } from "./terminal-font"
+import { readTerminalDestination, watchTerminalDestination } from "./terminal-destination"
 import { buildKeybindingMap } from "./format-keybinding"
 import { resolveVersionModels, buildInitialMessages, type CreatedVersion } from "./multi-version"
 import { ensureSandbox } from "./sandbox-bootstrap"
@@ -78,6 +79,7 @@ export class AgentManagerProvider implements Disposable {
   private unsubTool: (() => void) | undefined
   private unsubStatus: (() => void) | undefined
   private unsubFont: (() => void) | undefined
+  private unsubDestination: (() => void) | undefined
   private closing: Promise<void> | undefined
   private onVisibilityChange: ((visible: boolean) => void) | undefined
   // Tracks sessions owned by this panel until they are explicitly closed.
@@ -111,6 +113,9 @@ export class AgentManagerProvider implements Disposable {
     this.unsubFont = watchTerminalFont((font) => {
       this.postToWebview({ type: "agentManager.terminal.fontChanged", font })
     })
+    this.unsubDestination = watchTerminalDestination((destination) => {
+      this.postToWebview({ type: "agentManager.terminal.destinationChanged", destination })
+    })
     this.run = new RunController({
       root: () => this.getRoot(),
       state: () => this.getStateManager(),
@@ -304,6 +309,7 @@ export class AgentManagerProvider implements Disposable {
         this.activeSessionId = undefined
         this.visiblePresence.clear()
         this.panel = undefined
+        void this.terminalRouter.dispose()
         this.onVisibilityChange?.(false)
       }
       ctx.sessions.dispose()
@@ -661,10 +667,6 @@ export class AgentManagerProvider implements Disposable {
       void this.importer.branches()
       return null
     }
-    if (m.type === "agentManager.requestExternalWorktrees") {
-      void this.importer.external()
-      return null
-    }
     if (m.type === "agentManager.importFromBranch") {
       void this.importer.branch(m.branch)
       return null
@@ -673,14 +675,6 @@ export class AgentManagerProvider implements Disposable {
       void this.importer.pr(m.url)
       return null
     }
-    if (m.type === "agentManager.importExternalWorktree") {
-      void this.importer.path(m.path, m.branch)
-      return null
-    }
-    if (m.type === "agentManager.importAllExternalWorktrees") {
-      void this.importer.all()
-      return null
-    }
   }
 
   private onDiffMessage(m: AgentManagerInMessage): Record<string, unknown> | null | undefined {
@@ -868,7 +862,7 @@ export class AgentManagerProvider implements Disposable {
     }
   }
 
-  /** Send worktreeSetup.ready + sessionMeta + pushState after worktree creation. */
+  /** Send worktreeSetup.ready + pushState after worktree creation. */
   private notifyWorktreeReady(sessionId: string, result: CreateWorktreeResult, worktreeId?: string): void {
     this.pushState()
     this.postToWebview({
@@ -879,14 +873,6 @@ export class AgentManagerProvider implements Disposable {
       branch: result.branch,
       worktreeId,
     })
-    this.postToWebview({
-      type: "agentManager.sessionMeta",
-      sessionId,
-      mode: "worktree",
-      branch: result.branch,
-      path: result.path,
-      parentBranch: result.parentBranch,
-    })
   }
 
   private async waitForStateReady(context: string): Promise<void> {
@@ -907,8 +893,6 @@ export class AgentManagerProvider implements Disposable {
       case "agentManager.requestBranches":
       case "agentManager.importFromBranch":
       case "agentManager.importFromPR":
-      case "agentManager.importExternalWorktree":
-      case "agentManager.importAllExternalWorktrees":
       case "agentManager.setTabOrder":
       case "agentManager.setWorktreeOrder":
       case "agentManager.setSessionsCollapsed":
@@ -922,6 +906,7 @@ export class AgentManagerProvider implements Disposable {
       case "agentManager.toggleSectionCollapsed":
       case "agentManager.moveToSection":
       case "agentManager.moveSection":
+      case "agentManager.terminal.create":
         return true
       default:
         return false
@@ -1339,6 +1324,7 @@ export class AgentManagerProvider implements Disposable {
 
       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.
@@ -1623,6 +1609,7 @@ export class AgentManagerProvider implements Disposable {
       sidebarCollapsed: state.getSidebarCollapsed(),
       reviewDiffStyle: state.getReviewDiffStyle(),
       reviewMarkdownRender: getDiffMarkdownRender(),
+      terminalDestination: readTerminalDestination(),
       isGitRepo: true,
       defaultBaseBranch: state.getDefaultBaseBranch(),
       ...run,
@@ -1645,6 +1632,7 @@ export class AgentManagerProvider implements Disposable {
       staleWorktreeIds: [],
       reviewDiffStyle: "unified",
       reviewMarkdownRender: getDiffMarkdownRender(),
+      terminalDestination: readTerminalDestination(),
       isGitRepo: false,
       runStatuses: [],
       runScriptConfigured: false,
@@ -1922,6 +1910,7 @@ export class AgentManagerProvider implements Disposable {
     this.unsubTool?.()
     this.unsubStatus?.()
     this.unsubFont?.()
+    this.unsubDestination?.()
     this.orchestration.dispose()
     this.visiblePresence.clear()
     this.diffs.stop()
diff --git a/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts b/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
index efc8b54f429..6120ba6a1cb 100644
--- a/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
+++ b/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
@@ -174,18 +174,6 @@ export class SessionTerminalManager {
     return true
   }
 
-  /**
-   * Check if a session has an active terminal.
-   */
-  hasTerminal(sessionId: string): boolean {
-    const entry = this.terminals.get(sessionId)
-    return entry !== undefined && entry.terminal.exitStatus === undefined
-  }
-
-  hasActiveTerminal(): boolean {
-    return this.host.activeTerminal() !== undefined
-  }
-
   activeSession(): string | undefined {
     const active = this.host.activeTerminal()
     if (!active) return undefined
diff --git a/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts b/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts
index f579d0779c0..16fb48d93f6 100644
--- a/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts
+++ b/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts
@@ -66,18 +66,6 @@ export class SetupScriptService {
     return this.resolveScript(platform) !== undefined
   }
 
-  /** Read the setup script content. Returns null if not found or read fails. */
-  async getScript(platform: NodeJS.Platform = process.platform): Promise<string | null> {
-    const script = this.resolveScript(platform)
-    if (!script) return null
-    try {
-      return await fs.promises.readFile(script.path, "utf-8")
-    } catch (error) {
-      this.log(`Failed to read setup script: ${error}`)
-      return null
-    }
-  }
-
   /** Create a default setup script with helpful comments for the current platform. */
   async createDefaultScript(platform: NodeJS.Platform = process.platform): Promise<void> {
     if (!fs.existsSync(this.dir)) {
diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts
index 96b3bcceb3e..32f2fb1b9f9 100644
--- a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts
+++ b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts
@@ -67,11 +67,6 @@ export interface CreateWorktreeResult {
   startPointWarning?: string
 }
 
-export interface ExternalWorktreeItem {
-  path: string
-  branch: string
-}
-
 /**
  * Backward compat: split a possibly-prefixed branch like "origin/main" into
  * `{ branch: "main", remote: "origin" }`. If no slash is found, returns bare branch.
@@ -815,7 +810,7 @@ export class WorktreeManager {
 
     // 4. Derived fallback
     if (allowFallback) {
-      const fallbacks = await this.derivedFallbackBranches(branch)
+      const fallbacks = await this.derivedFallbackBranches()
       for (const fallback of fallbacks) {
         if (fallback === branch) continue // already tried
         try {
@@ -863,7 +858,7 @@ export class WorktreeManager {
     }
   }
 
-  async derivedFallbackBranches(requested: string): Promise<string[]> {
+  async derivedFallbackBranches(): Promise<string[]> {
     const defaults = []
     try {
       defaults.push(await this.defaultBranch())
@@ -1015,22 +1010,6 @@ export class WorktreeManager {
     }
   }
 
-  async listExternalWorktrees(managedPaths: Set<string>): Promise<ExternalWorktreeItem[]> {
-    try {
-      const raw = await this.git.raw(["worktree", "list", "--porcelain"])
-      const normalizedRoot = normalizePath(this.root)
-      const normalizedManaged = new Set([...managedPaths].map(normalizePath))
-      return parseWorktreeList(raw)
-        .filter(
-          (e) => !e.bare && normalizePath(e.path) !== normalizedRoot && !normalizedManaged.has(normalizePath(e.path)),
-        )
-        .map((e) => ({ path: e.path, branch: e.branch }))
-    } catch (error) {
-      this.log(`Failed to list external worktrees: ${error}`)
-      return []
-    }
-  }
-
   async createFromPR(url: string): Promise<CreateWorktreeResult> {
     return this.withGitLock(() => this.createFromPRImpl(url))
   }
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 05352e380a7..045a108fafc 100644
--- a/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
+++ b/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
@@ -77,7 +77,6 @@ function createMockHost(): Host {
     openFolder: vi.fn(),
     createOutput: () => ({ appendLine: vi.fn(), dispose: vi.fn() }) as OutputHandle,
     extensionKeybindings: () => [],
-    serverPort: () => undefined,
     capture: vi.fn(),
     dispose: vi.fn(),
   }
diff --git a/packages/kilo-vscode/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts
index 193d77cfcbd..ed8b1f2f633 100644
--- a/packages/kilo-vscode/src/agent-manager/host.ts
+++ b/packages/kilo-vscode/src/agent-manager/host.ts
@@ -125,9 +125,6 @@ export interface Host {
   /** Read extension keybinding metadata. */
   extensionKeybindings(): Array<{ command: string; key?: string; mac?: string }>
 
-  /** Get the CLI server port (for webview CSP). */
-  serverPort(): number | undefined
-
   /** Copy text to the system clipboard. */
   copyToClipboard(text: string): void
 
diff --git a/packages/kilo-vscode/src/agent-manager/terminal-destination.ts b/packages/kilo-vscode/src/agent-manager/terminal-destination.ts
new file mode 100644
index 00000000000..f6fbceb5911
--- /dev/null
+++ b/packages/kilo-vscode/src/agent-manager/terminal-destination.ts
@@ -0,0 +1,37 @@
+/**
+ * Read and watch the user's Agent Manager terminal destination setting.
+ *
+ * The terminal button and `Cmd/Ctrl+/` either open the VS Code integrated
+ * terminal (default, backwards compatible) or an embedded xterm in the
+ * Agent Manager side panel. Kept next to `terminal-font.ts`; a separate
+ * module so the font helpers stay untouched.
+ */
+
+import * as vscode from "vscode"
+
+export type TerminalDestination = "vscode" | "agentManager"
+
+const KEY = "kilo-code.new.agentManager.terminalButtonDestination"
+
+/** Unknown values fall back to the VS Code terminal so a stale or
+ *  hand-edited setting never strands the user without a terminal. */
+export function resolveTerminalDestination(value: unknown): TerminalDestination {
+  return value === "agentManager" ? value : "vscode"
+}
+
+export function readTerminalDestination(): TerminalDestination {
+  const config = vscode.workspace.getConfiguration("kilo-code.new.agentManager")
+  return resolveTerminalDestination(config.get("terminalButtonDestination"))
+}
+
+export function affectsTerminalDestination(e: vscode.ConfigurationChangeEvent): boolean {
+  return e.affectsConfiguration(KEY)
+}
+
+/** Subscribe to destination changes. Returns a cleanup function. */
+export function watchTerminalDestination(callback: (destination: TerminalDestination) => void): () => void {
+  const sub = vscode.workspace.onDidChangeConfiguration((e) => {
+    if (affectsTerminalDestination(e)) callback(readTerminalDestination())
+  })
+  return () => sub.dispose()
+}
diff --git a/packages/kilo-vscode/src/agent-manager/terminal-routing.ts b/packages/kilo-vscode/src/agent-manager/terminal-routing.ts
index 7c8c7e46cc2..566952f9b21 100644
--- a/packages/kilo-vscode/src/agent-manager/terminal-routing.ts
+++ b/packages/kilo-vscode/src/agent-manager/terminal-routing.ts
@@ -7,7 +7,7 @@
  * Owns:
  *   - the `TerminalManager` lifecycle (create / close / resize / dispose)
  *   - the per-context "Terminal N" ordinal counter
- *   - cwd resolution (worktree path → workspace root fallback)
+ *   - cwd resolution (selected worktree or workspace root)
  *   - WebSocket URL construction with loopback `auth_token` auth
  *
  * Vscode-free: all VS Code access is funnelled through the `deps`
@@ -15,7 +15,7 @@
  */
 
 import type { KiloClient } from "@kilocode/sdk/v2/client"
-import type { AgentManagerInMessage, AgentManagerOutMessage, TerminalFont } from "./types"
+import type { AgentManagerInMessage, AgentManagerOutMessage, TerminalFont, TerminalPlacement } from "./types"
 import { TerminalManager } from "./terminal-manager"
 
 interface ServerConfig {
@@ -52,14 +52,19 @@ function isTerminalMessage(
 }
 
 export class TerminalRouter {
-  private readonly manager: TerminalManager
+  private manager: TerminalManager
   private readonly ordinals = new Map<string, number>()
+  private generation = 0
 
   constructor(private readonly deps: TerminalRoutingDeps) {
-    this.manager = new TerminalManager({
-      getClient: () => deps.getClient(),
+    this.manager = this.createManager()
+  }
+
+  private createManager(): TerminalManager {
+    return new TerminalManager({
+      getClient: () => this.deps.getClient(),
       buildWsUrl: (ptyID, cwd) => this.buildWsUrl(ptyID, cwd),
-      log: deps.log,
+      log: this.deps.log,
     })
   }
 
@@ -71,7 +76,7 @@ export class TerminalRouter {
   handle(m: AgentManagerInMessage): boolean {
     if (!isTerminalMessage(m)) return false
     if (m.type === "agentManager.terminal.create") {
-      void this.handleCreate(m.worktreeId)
+      void this.handleCreate(m.createId, m.placement, m.worktreeId)
       return true
     }
     if (m.type === "agentManager.terminal.close") {
@@ -85,25 +90,44 @@ export class TerminalRouter {
     return true
   }
 
-  /** Tear down every live PTY. Forwards to `TerminalManager.dispose`. */
+  /**
+   * Tear down every live PTY and invalidate in-flight create requests.
+   * The router stays usable afterwards: a create landing from before the
+   * disposal is closed immediately instead of leaking a PTY the webview
+   * no longer tracks.
+   */
   dispose(): Promise<void> {
-    return this.manager.dispose()
+    this.generation++
+    const manager = this.manager
+    this.manager = this.createManager()
+    return manager.dispose()
   }
 
-  private async handleCreate(worktreeId: string | null): Promise<void> {
+  private async handleCreate(createId: string, placement: TerminalPlacement, worktreeId: string | null): Promise<void> {
+    const generation = this.generation
+    const manager = this.manager
     const cwd = this.resolveCwd(worktreeId)
     if (!cwd) {
       this.deps.post({
         type: "agentManager.terminal.error",
-        message: "Open a folder before creating a terminal",
+        createId,
+        message: worktreeId
+          ? "The selected worktree is no longer available"
+          : "Open a folder before creating a terminal",
       })
       return
     }
     const title = `Terminal ${this.nextOrdinal(worktreeId)}`
     try {
-      const created = await this.manager.create({ worktreeId, cwd, title })
+      const created = await manager.create({ worktreeId, cwd, title })
+      if (generation !== this.generation) {
+        await manager.close(created.terminalId)
+        return
+      }
       this.deps.post({
         type: "agentManager.terminal.created",
+        createId,
+        placement,
         worktreeId: created.worktreeId,
         terminalId: created.terminalId,
         title: created.title,
@@ -111,22 +135,25 @@ export class TerminalRouter {
         font: this.deps.getTerminalFont(),
       })
     } catch (err) {
+      if (generation !== this.generation) return
       const message = err instanceof Error ? err.message : String(err)
       this.deps.log(`Terminal create failed: ${message}`)
-      this.deps.post({ type: "agentManager.terminal.error", message })
+      this.deps.post({ type: "agentManager.terminal.error", createId, message })
     }
   }
 
   /**
    * Resolve the cwd for a terminal in the given context.
    *
-   * LOCAL (null) falls back to the workspace root; a worktree id
-   * resolves to its on-disk path. Returns undefined when no folder is
-   * open — the caller surfaces this as a user-facing error.
+   * LOCAL (null) uses the workspace root; a worktree id resolves strictly
+   * to its on-disk path — silently falling back to the workspace root
+   * would run the shell in the wrong directory. Returns undefined when
+   * no folder is open or the worktree is gone; the caller surfaces this
+   * as a user-facing error.
    */
   private resolveCwd(worktreeId: string | null): string | undefined {
     if (worktreeId === null) return this.deps.getRoot()
-    return this.deps.getWorktreePath(worktreeId) ?? this.deps.getRoot()
+    return this.deps.getWorktreePath(worktreeId)
   }
 
   /** Per-context counter so default titles are "Terminal 1", "Terminal 2"…
diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts
index 63ade03fc94..8950c68d22f 100644
--- a/packages/kilo-vscode/src/agent-manager/types.ts
+++ b/packages/kilo-vscode/src/agent-manager/types.ts
@@ -13,18 +13,19 @@ import type { Worktree, ManagedSession, Section } from "./WorktreeStateManager"
 import type { WorktreeStats, LocalStats } from "./GitStatsPoller"
 import type { ApplyConflict } from "./GitOps"
 import type { BranchListItem, WorktreeSetupErrorCode } from "./git-import"
-import type { ExternalWorktreeItem } from "./WorktreeManager"
 import type { RunStatus } from "./run/manager"
 import type { TerminalFont } from "./terminal-font"
+import type { TerminalDestination } from "./terminal-destination"
 
 export type { TerminalFont }
 
+/** Where a terminal lives: main tab strip or right-side inspector panel. */
+export type TerminalPlacement = "tab" | "side"
+
 // ---------------------------------------------------------------------------
 // Shared payload types
 // ---------------------------------------------------------------------------
 
-type SessionMode = "worktree" | "local"
-
 export type ApplyDiffStatus = "checking" | "applying" | "success" | "conflict" | "error"
 
 export type WorktreeDiffEntry = SnapshotFileDiff & {
@@ -114,15 +115,6 @@ interface WorktreeSetupMessage {
   errorCode?: WorktreeSetupErrorCode
 }
 
-interface SessionMetaMessage {
-  type: "agentManager.sessionMeta"
-  sessionId: string
-  mode: SessionMode
-  branch?: string
-  path?: string
-  parentBranch?: string
-}
-
 interface StateMessage {
   type: "agentManager.state"
   worktrees: Worktree[]
@@ -140,6 +132,7 @@ interface StateMessage {
   runStatuses?: RunStatus[]
   runScriptConfigured?: boolean
   runScriptPath?: string
+  terminalDestination?: TerminalDestination
 }
 
 // ---------------------------------------------------------------------------
@@ -148,6 +141,11 @@ interface StateMessage {
 
 interface TerminalCreatedMessage {
   type: "agentManager.terminal.created"
+  /** Correlates with the create request; lets the webview spot stale
+   *  creates. Deliberately not named `requestId`: that field name is the
+   *  generic webview request/response correlation channel. */
+  createId: string
+  placement: TerminalPlacement
   /** null for LOCAL, worktree id otherwise */
   worktreeId: string | null
   terminalId: string
@@ -164,9 +162,16 @@ interface TerminalClosedMessage {
 interface TerminalErrorMessage {
   type: "agentManager.terminal.error"
   terminalId?: string
+  /** Set when the error answers a specific create request. */
+  createId?: string
   message: string
 }
 
+interface TerminalDestinationChangedMessage {
+  type: "agentManager.terminal.destinationChanged"
+  destination: TerminalDestination
+}
+
 interface TerminalFontChangedMessage {
   type: "agentManager.terminal.fontChanged"
   font: TerminalFont
@@ -228,11 +233,6 @@ interface BranchesMessage {
   defaultBranch: string
 }
 
-interface ExternalWorktreesMessage {
-  type: "agentManager.externalWorktrees"
-  worktrees: ExternalWorktreeItem[]
-}
-
 interface ImportResultMessage {
   type: "agentManager.importResult"
   success: boolean
@@ -307,7 +307,6 @@ export type AgentManagerOutMessage =
   | WorktreeStatsMessage
   | LocalStatsMessage
   | WorktreeSetupMessage
-  | SessionMetaMessage
   | StateMessage
   | ErrorOutMessage
   | SessionAddedMessage
@@ -317,7 +316,6 @@ export type AgentManagerOutMessage =
   | SetSessionModelMessage
   | SendInitialMessage
   | BranchesMessage
-  | ExternalWorktreesMessage
   | ImportResultMessage
   | KeybindingsMessage
   | RepoInfoMessage
@@ -332,6 +330,7 @@ export type AgentManagerOutMessage =
   | TerminalCreatedMessage
   | TerminalClosedMessage
   | TerminalErrorMessage
+  | TerminalDestinationChangedMessage
   | TerminalFontChangedMessage
 
 // ---------------------------------------------------------------------------
@@ -500,10 +499,6 @@ interface SetDefaultBaseBranchIn {
   branch?: string
 }
 
-interface RequestExternalWorktreesIn {
-  type: "agentManager.requestExternalWorktrees"
-}
-
 interface ImportFromBranchIn {
   type: "agentManager.importFromBranch"
   branch: string
@@ -514,16 +509,6 @@ interface ImportFromPRIn {
   url: string
 }
 
-interface ImportExternalWorktreeIn {
-  type: "agentManager.importExternalWorktree"
-  path: string
-  branch: string
-}
-
-interface ImportAllExternalWorktreesIn {
-  type: "agentManager.importAllExternalWorktrees"
-}
-
 interface RequestWorktreeDiffIn {
   type: "agentManager.requestWorktreeDiff"
   sessionId: string
@@ -758,6 +743,9 @@ interface MoveSectionIn {
 
 interface TerminalCreateIn {
   type: "agentManager.terminal.create"
+  /** Webview-generated correlation id, echoed back in created/error. */
+  createId: string
+  placement: TerminalPlacement
   /** null for LOCAL, worktree id otherwise */
   worktreeId: string | null
 }
@@ -807,11 +795,8 @@ export type AgentManagerInMessage =
   | SetReviewDiffStyleIn
   | SetReviewMarkdownRenderIn
   | SetDefaultBaseBranchIn
-  | RequestExternalWorktreesIn
   | ImportFromBranchIn
   | ImportFromPRIn
-  | ImportExternalWorktreeIn
-  | ImportAllExternalWorktreesIn
   | RequestWorktreeDiffIn
   | RequestWorktreeDiffFileIn
   | ApplyWorktreeDiffIn
diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
index 69dd31a858e..fc5dfd01078 100644
--- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts
+++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
@@ -6,7 +6,7 @@
  */
 
 import * as vscode from "vscode"
-import type { Host, PanelContext, OutputHandle, SessionProvider, Disposable } from "./host"
+import type { Host, PanelContext, OutputHandle, SessionProvider } from "./host"
 import type { KiloConnectionService } from "../services/cli-backend"
 import { KiloProvider } from "../KiloProvider"
 import { PLATFORM, SNAPSHOT_INITIALIZATION } from "./constants"
@@ -216,10 +216,6 @@ export class VscodeHost implements Host {
     return ext?.packageJSON?.contributes?.keybindings ?? []
   }
 
-  serverPort(): number | undefined {
-    return this.connectionService.getServerInfo()?.port
-  }
-
   copyToClipboard(text: string): void {
     void vscode.env.clipboard.writeText(text)
   }
diff --git a/packages/kilo-vscode/src/agent-manager/worktree-importer.ts b/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
index cfa3d1ab96c..d840f67eb55 100644
--- a/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
+++ b/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
@@ -2,9 +2,7 @@ import type { Session } from "@kilocode/sdk/v2/client"
 import type { AgentManagerOutMessage } from "./types"
 import type { WorktreeManager, CreateWorktreeResult } from "./WorktreeManager"
 import type { WorktreeStateManager } from "./WorktreeStateManager"
-import { classifyWorktreeError, normalizePath } from "./git-import"
-
-type Worktree = ReturnType<WorktreeStateManager["addWorktree"]>
+import { classifyWorktreeError } from "./git-import"
 
 export interface WorktreeImporterHost {
   manager(): WorktreeManager | undefined
@@ -57,24 +55,6 @@ export class WorktreeImporter {
     }
   }
 
-  async external(): Promise<void> {
-    const manager = this.host.manager()
-    const state = this.host.state()
-    if (!manager || !state) {
-      this.host.post({ type: "agentManager.externalWorktrees", worktrees: [] })
-      return
-    }
-
-    try {
-      const paths = new Set(state.getWorktrees().map((worktree) => worktree.path))
-      const worktrees = await manager.listExternalWorktrees(paths)
-      this.host.post({ type: "agentManager.externalWorktrees", worktrees })
-    } catch (error) {
-      this.host.log(`Failed to list external worktrees: ${error}`)
-      this.host.post({ type: "agentManager.externalWorktrees", worktrees: [] })
-    }
-  }
-
   async branch(branch: string): Promise<void> {
     const manager = this.host.manager()
     const state = this.host.state()
@@ -189,136 +169,6 @@ export class WorktreeImporter {
     }
   }
 
-  async path(path: string, branch: string): Promise<void> {
-    const state = this.host.state()
-    const manager = this.host.manager()
-    if (!state || !manager) {
-      this.host.post({ type: "agentManager.importResult", success: false, message: "State not initialized" })
-      return
-    }
-    if (this.busy()) return
-
-    this.importing = true
-    let worktree: Worktree | undefined
-    try {
-      const paths = new Set(state.getWorktrees().map((worktree) => worktree.path))
-      const externals = await manager.listExternalWorktrees(paths)
-      if (!externals.some((worktree) => normalizePath(worktree.path) === normalizePath(path))) {
-        this.host.post({
-          type: "agentManager.importResult",
-          success: false,
-          message: "Path is not a valid worktree for this repository",
-        })
-        return
-      }
-
-      const base = await manager.resolveBaseBranch()
-      worktree = state.addWorktree({ branch, path, parentBranch: base.branch, remote: base.remote, branchOwned: false })
-      this.host.push()
-
-      const session = await this.host.session(path, branch, worktree.id)
-      if (!session) {
-        state.removeWorktree(worktree.id)
-        this.host.push()
-        this.host.post({ type: "agentManager.importResult", success: false, message: "Failed to create session" })
-        return
-      }
-
-      state.addSession(session.id, worktree.id)
-      this.host.register(session.id, path)
-      this.host.push()
-      this.host.post({
-        type: "agentManager.worktreeSetup",
-        status: "ready",
-        message: "Worktree imported",
-        sessionId: session.id,
-        branch,
-        worktreeId: worktree.id,
-      })
-      this.host.post({
-        type: "agentManager.sessionMeta",
-        sessionId: session.id,
-        mode: "worktree",
-        branch,
-        path,
-        parentBranch: base.branch,
-      })
-      this.host.post({ type: "agentManager.importResult", success: true, message: `Imported ${branch}` })
-      this.host.log(`Imported external worktree ${path} (${branch})`)
-    } catch (error) {
-      if (worktree) {
-        state.removeWorktree(worktree.id)
-        this.host.push()
-      }
-      const message = error instanceof Error ? error.message : String(error)
-      this.host.post({ type: "agentManager.importResult", success: false, message })
-    } finally {
-      this.importing = false
-    }
-  }
-
-  async all(): Promise<void> {
-    if (this.busy()) return
-
-    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
-    }
-    this.importing = true
-
-    try {
-      const paths = new Set(state.getWorktrees().map((worktree) => worktree.path))
-      const externals = await manager.listExternalWorktrees(paths)
-      if (externals.length === 0) {
-        this.host.post({
-          type: "agentManager.importResult",
-          success: true,
-          message: "No external worktrees to import",
-        })
-        return
-      }
-
-      const imported: string[] = []
-      const base = await manager.resolveBaseBranch()
-      for (const external of externals) {
-        try {
-          const worktree = state.addWorktree({
-            branch: external.branch,
-            path: external.path,
-            parentBranch: base.branch,
-            remote: base.remote,
-            branchOwned: false,
-          })
-          const session = await this.host.session(external.path, external.branch, worktree.id)
-          if (session) {
-            state.addSession(session.id, worktree.id)
-            this.host.register(session.id, external.path)
-            imported.push(worktree.id)
-            continue
-          }
-          state.removeWorktree(worktree.id)
-        } catch (error) {
-          this.host.log(`Failed to import external worktree ${external.path}: ${error}`)
-        }
-      }
-
-      this.host.push()
-      this.host.post({
-        type: "agentManager.importResult",
-        success: true,
-        message: `Imported ${imported.length} worktree${imported.length !== 1 ? "s" : ""}`,
-      })
-      this.host.log(`Imported ${imported.length}/${externals.length} external worktrees`)
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      this.host.post({ type: "agentManager.importResult", success: false, message })
-    } finally {
-      this.importing = false
-    }
-  }
-
   private busy(): boolean {
     if (!this.importing) return false
     this.host.post({
diff --git a/packages/kilo-vscode/src/diff/sources/session.ts b/packages/kilo-vscode/src/diff/sources/session.ts
index 58fc6d8bdd4..924c232659d 100644
--- a/packages/kilo-vscode/src/diff/sources/session.ts
+++ b/packages/kilo-vscode/src/diff/sources/session.ts
@@ -83,7 +83,15 @@ export function toSessionDiffFile(raw: SnapshotFileDiff): DiffFile {
   // Empty patch means binary or summarized (>256 KB) — normalize() can't
   // parse it, so short-circuit to empty strings. Binary snapshot images do
   // not retain their sides, while text-backed SVG patches can be rebuilt.
-  const view = raw.patch === "" || (mime && mime !== "image/svg+xml") ? null : normalize(raw)
+  const view = (() => {
+    if (raw.patch === "" || (mime && mime !== "image/svg+xml")) return null
+    try {
+      return normalize(raw)
+    } catch (err) {
+      console.warn("[Kilo New] Failed to parse session diff", { file, err })
+      return null
+    }
+  })()
   const before = view ? text(view, "deletions") : ""
   const after = view ? text(view, "additions") : ""
   const image = (() => {
@@ -108,7 +116,8 @@ export function toSessionDiffFile(raw: SnapshotFileDiff): DiffFile {
     generatedLike: false,
     // A zero-stat empty patch has no text body to fetch; nonzero stats
     // indicate a deferred large-file summary.
-    summarized: !mime && raw.patch === "" && (raw.additions !== 0 || raw.deletions !== 0),
+    summarized:
+      !mime && ((!view && raw.patch !== "") || (raw.patch === "" && (raw.additions !== 0 || raw.deletions !== 0))),
     kind: mime ? "image" : undefined,
     image,
     stamp: mime ? fingerprint(raw) : undefined,
diff --git a/packages/kilo-vscode/src/extension.ts b/packages/kilo-vscode/src/extension.ts
index b4467fb347b..c750637d18b 100644
--- a/packages/kilo-vscode/src/extension.ts
+++ b/packages/kilo-vscode/src/extension.ts
@@ -122,7 +122,9 @@ export function activate(context: vscode.ExtensionContext) {
   }
 
   // Create the provider with shared service
-  const provider = new KiloProvider(context.extensionUri, connectionService, context)
+  const provider = new KiloProvider(context.extensionUri, connectionService, context, {
+    focusContext: "kilo-code.new.sidebarFocused",
+  })
   provider.setRemoteService(remoteService)
 
   // Register the webview view provider for the sidebar.
@@ -592,7 +594,7 @@ export async function deactivate() {
   TelemetryProxy.getInstance().shutdown()
 }
 
-async function openKiloInNewTab(
+function openKiloInNewTab(
   context: vscode.ExtensionContext,
   connectionService: KiloConnectionService,
   agentManagerProvider: AgentManagerProvider,
@@ -601,20 +603,16 @@ async function openKiloInNewTab(
   remoteService: RemoteStatusService,
   autoApprove: ReturnType<typeof registerToggleAutoApprove>,
 ) {
-  const lastCol = Math.max(...vscode.window.visibleTextEditors.map((e) => e.viewColumn || 0), 0)
-  const hasVisibleEditors = vscode.window.visibleTextEditors.length > 0
-
-  if (!hasVisibleEditors) {
-    await vscode.commands.executeCommand("workbench.action.newGroupRight")
-  }
-
-  const targetCol = hasVisibleEditors ? Math.max(lastCol + 1, 1) : vscode.ViewColumn.Two
-
-  const panel = vscode.window.createWebviewPanel("kilo-code.new.TabPanel", EXTENSION_DISPLAY_NAME, targetCol, {
-    enableScripts: true,
-    retainContextWhenHidden: true,
-    localResourceRoots: [context.extensionUri],
-  })
+  const panel = vscode.window.createWebviewPanel(
+    "kilo-code.new.TabPanel",
+    EXTENSION_DISPLAY_NAME,
+    vscode.ViewColumn.Active,
+    {
+      enableScripts: true,
+      retainContextWhenHidden: true,
+      localResourceRoots: [context.extensionUri],
+    },
+  )
 
   panel.iconPath = {
     light: vscode.Uri.joinPath(context.extensionUri, "assets", "icons", "kilo-light.svg"),
@@ -636,11 +634,6 @@ async function openKiloInNewTab(
   tabProvider.resolveWebviewPanel(panel)
   tabPanels.set(panel, tabProvider)
 
-  // Wait for the new panel to become active before locking the editor group.
-  // This avoids the race where VS Code hasn't switched focus yet.
-  await waitForWebviewPanelToBeActive(panel)
-  await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
-
   panel.onDidDispose(
     () => {
       console.log("[Kilo New] Tab panel disposed")
@@ -671,19 +664,3 @@ function ensureCommandsSkipShell(commands: string[]): void {
   if (missing.length === 0) return
   config.update("commandsToSkipShell", [...existing, ...missing], target)
 }
-
-function waitForWebviewPanelToBeActive(panel: vscode.WebviewPanel): Promise<void> {
-  if (panel.active) {
-    return Promise.resolve()
-  }
-
-  return new Promise((resolve) => {
-    const disposable = panel.onDidChangeViewState((event) => {
-      if (!event.webviewPanel.active) {
-        return
-      }
-      disposable.dispose()
-      resolve()
-    })
-  })
-}
diff --git a/packages/kilo-vscode/src/kilo-provider/early-message.ts b/packages/kilo-vscode/src/kilo-provider/early-message.ts
index 67cb6634b2f..1273d65584e 100644
--- a/packages/kilo-vscode/src/kilo-provider/early-message.ts
+++ b/packages/kilo-vscode/src/kilo-provider/early-message.ts
@@ -12,10 +12,32 @@ type Ctx = {
   dir: string
   post: (msg: unknown) => void
   exportTranscript: (sessionID: string) => Promise<void>
+  copy: (text: string) => PromiseLike<void>
   openSessions: (ids: string[]) => void
 }
 
-export async function routeEarlyMessage(message: { type: string }, ctx: Ctx): Promise<boolean> {
+export async function routeEarlyMessage(
+  message: { type: string; id?: unknown; text?: unknown },
+  ctx: Ctx,
+): Promise<boolean> {
+  if (message.type === "copyToClipboard") {
+    if (typeof message.id !== "string") return true
+    if (typeof message.text !== "string") {
+      ctx.post({ type: "clipboardWriteResult", id: message.id, ok: false, error: "Invalid clipboard text" })
+      return true
+    }
+    await ctx.copy(message.text).then(
+      () => ctx.post({ type: "clipboardWriteResult", id: message.id, ok: true }),
+      (err) =>
+        ctx.post({
+          type: "clipboardWriteResult",
+          id: message.id,
+          ok: false,
+          error: err instanceof Error ? err.message : String(err),
+        }),
+    )
+    return true
+  }
   await routeSuggestionWebviewMessage(ctx.question, message)
   if (await ModelState.handleMessage(message.type, message, ctx.client, ctx.post)) return true
   if (message.type === "exportSessionTranscript") {
diff --git a/packages/kilo-vscode/src/kilo-provider/options.ts b/packages/kilo-vscode/src/kilo-provider/options.ts
index f32caa4736f..63b76a27664 100644
--- a/packages/kilo-vscode/src/kilo-provider/options.ts
+++ b/packages/kilo-vscode/src/kilo-provider/options.ts
@@ -1,4 +1,6 @@
 export type KiloProviderOptions = {
+  /** Context key updated from focus events reported by this provider's webview. */
+  focusContext?: string
   projectDirectory?: string | null
   platform?: string
   snapshotInitialization?: "wait"
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/ar.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/ar.ts
index 8b31c9e4dc9..f6e3eeb1ef2 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/ar.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/ar.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "مؤجل",
   "kilocode:autocomplete.statusBar.warning": "$(warning) الإكمال التلقائي",
   "kilocode:autocomplete.statusBar.tooltip.basic": "الإكمال التلقائي في Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "الإكمال التلقائي في Kilo Code (معطل)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**لم يتم تكوين نموذج للإكمال التلقائي**\n\nلتفعيل الإكمال التلقائي، أضف ملفا شخصيا يحتوي على أحد هؤلاء المزودين المدعومين: {{providers}}.\n\n[فتح الإعدادات]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "إجمالي تكلفة الجلسة:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "المزود:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "النموذج:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "الملف الشخصي: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "افتراضي",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "تم تنفيذ {{count}} عمليات إكمال بين {{startTime}} و {{endTime}}، بتكلفة إجمالية قدرها {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "يتم توفير الإكمال التلقائي بواسطة {{model}} عبر {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "الإكمال التلقائي في Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "جار تحليل الكود...",
-  "kilocode:autocomplete.progress.generating": "جار إنشاء التعديلات المقترحة...",
-  "kilocode:autocomplete.progress.processing": "جار معالجة التعديلات المقترحة...",
-  "kilocode:autocomplete.progress.showing": "جار عرض التعديلات المقترحة...",
-  "kilocode:autocomplete.input.title": "Kilo Code: مهمة سريعة",
-  "kilocode:autocomplete.input.placeholder": "مثال: 'أعد هيكلة هذه الدالة لتكون أكثر كفاءة'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: إنشاء تعديلات مقترحة",
-  "kilocode:autocomplete.commands.displaySuggestions": "عرض التعديلات المقترحة",
-  "kilocode:autocomplete.commands.cancelSuggestions": "إلغاء التعديلات المقترحة",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "تطبيق التعديل المقترح الحالي",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "تطبيق كل التعديلات المقترحة",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: تعديلات مقترحة",
-  "kilocode:autocomplete.chatParticipant.fullName": "وكيل Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "الوكيل",
-  "kilocode:autocomplete.chatParticipant.description": "يمكنني مساعدتك في المهام السريعة والتعديلات المقترحة.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "يتم حظر الإكمال التلقائي في Kilo Code بسبب تعارض مع GitHub Copilot. لإصلاح ذلك، يجب تعطيل اقتراحات Copilot المضمنة.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "تعطيل Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/br.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/br.ts
index c21cfc57f6c..50db537de0a 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/br.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/br.ts
@@ -3,37 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "adiado",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autocompletar",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Autocompletar do Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Autocompletar do Kilo Code (desativado)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Nenhum modelo de autocompletar configurado**\n\nPara ativar o autocompletar, adicione um perfil com um destes provedores compatíveis: {{providers}}.\n\n[Abrir Configurações]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Custo total da sessão:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Provedor:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Modelo:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Perfil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Padrão",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Foram realizadas {{count}} conclusões entre {{startTime}} e {{endTime}}, com custo total de {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autocompletar fornecido por {{model}} via {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Autocompletar do Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analisando seu código...",
-  "kilocode:autocomplete.progress.generating": "Gerando edições sugeridas...",
-  "kilocode:autocomplete.progress.processing": "Processando edições sugeridas...",
-  "kilocode:autocomplete.progress.showing": "Exibindo edições sugeridas...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Tarefa rápida",
-  "kilocode:autocomplete.input.placeholder": "ex.: 'refatore esta função para ser mais eficiente'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Gerar edições sugeridas",
-  "kilocode:autocomplete.commands.displaySuggestions": "Exibir edições sugeridas",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Cancelar edições sugeridas",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aplicar edição sugerida atual",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Aplicar todas as edições sugeridas",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Edições sugeridas",
-  "kilocode:autocomplete.chatParticipant.fullName": "Agente do Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Agente",
-  "kilocode:autocomplete.chatParticipant.description": "Posso ajudar com tarefas rápidas e edições sugeridas.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "O Autocompletar do Kilo Code está sendo bloqueado por um conflito com o GitHub Copilot. Para corrigir isso, você deve desativar as sugestões inline do Copilot.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Desativar Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/bs.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/bs.ts
index 648a46c92e3..0d80d18dac8 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/bs.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/bs.ts
@@ -3,37 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "odgođeno",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Automatsko dovršavanje",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code automatsko dovršavanje",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code automatsko dovršavanje (onemogućeno)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Nije konfigurisan model za automatsko dovršavanje**\n\nDa omogućite automatsko dovršavanje, dodajte profil s jednim od ovih podržanih pružalaca: {{providers}}.\n\n[Otvori postavke]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Ukupni trošak sesije:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Pružalac:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Model:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Zadano",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Izvršeno je {{count}} dovršavanja između {{startTime}} i {{endTime}}, uz ukupni trošak od {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Automatska dovršavanja pruža {{model}} putem {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code automatsko dovršavanje {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analiziram vaš kod...",
-  "kilocode:autocomplete.progress.generating": "Generišem predložene izmjene...",
-  "kilocode:autocomplete.progress.processing": "Obrađujem predložene izmjene...",
-  "kilocode:autocomplete.progress.showing": "Prikazujem predložene izmjene...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Brzi zadatak",
-  "kilocode:autocomplete.input.placeholder": "npr. 'refaktoriši ovu funkciju da bude efikasnija'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generiši predložene izmjene",
-  "kilocode:autocomplete.commands.displaySuggestions": "Prikaži predložene izmjene",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Otkaži predložene izmjene",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Primijeni trenutnu predloženu izmjenu",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Primijeni sve predložene izmjene",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Predložene izmjene",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code agent",
-  "kilocode:autocomplete.chatParticipant.name": "Agent",
-  "kilocode:autocomplete.chatParticipant.description": "Mogu pomoći s brzim zadacima i predloženim izmjenama.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code automatsko dovršavanje blokira sukob s GitHub Copilotom. Da to popravite, morate onemogućiti Copilotove inline prijedloge.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Onemogući Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/da.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/da.ts
index 9b613b6c1e4..5aabf0c58e8 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/da.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/da.ts
@@ -3,38 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "udsat",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autofuldførelse",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code autofuldførelse",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code autofuldførelse (deaktiveret)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Ingen autocomplete-model konfigureret**\n\nFor at aktivere autocomplete skal du tilføje en profil med en af disse understøttede udbydere: {{providers}}.\n\n[Åbn indstillinger]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Samlet sessionsomkostning:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Udbyder:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Model:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Standard",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Udførte {{count}} fuldførelser mellem {{startTime}} og {{endTime}}, til en samlet pris på {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autocomplete leveres af {{model}} via {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code autofuldførelse {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analyserer din kode...",
-  "kilocode:autocomplete.progress.generating": "Genererer foreslåede redigeringer...",
-  "kilocode:autocomplete.progress.processing": "Behandler foreslåede redigeringer...",
-  "kilocode:autocomplete.progress.showing": "Viser foreslåede redigeringer...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Hurtig opgave",
-  "kilocode:autocomplete.input.placeholder": "f.eks. 'refaktorer denne funktion, så den bliver mere effektiv'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generer foreslåede redigeringer",
-  "kilocode:autocomplete.commands.displaySuggestions": "Vis foreslåede redigeringer",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Annuller foreslåede redigeringer",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Anvend aktuel foreslået redigering",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Anvend alle foreslåede redigeringer",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Foreslåede redigeringer",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code-agent",
-  "kilocode:autocomplete.chatParticipant.name": "Agent",
-  "kilocode:autocomplete.chatParticipant.description":
-    "Jeg kan hjælpe dig med hurtige opgaver og foreslåede redigeringer.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code autofuldførelse blokeres af en konflikt med GitHub Copilot. For at løse dette skal du deaktivere Copilots inline-forslag.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Deaktiver Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/de.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/de.ts
index 678170ae517..edd031fa2f8 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/de.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/de.ts
@@ -3,39 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "pausiert",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autovervollständigung",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autovervollständigung",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autovervollständigung (deaktiviert)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Kein Autovervollständigungsmodell konfiguriert**\n\nUm die Autovervollständigung zu aktivieren, füge ein Profil mit einem dieser unterstützten Anbieter hinzu: {{providers}}.\n\n[Einstellungen öffnen]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Sitzungskosten gesamt:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Anbieter:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Modell:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Standard",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "{{count}} Vervollständigungen zwischen {{startTime}} und {{endTime}} ausgeführt, für Gesamtkosten von {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Autovervollständigungen bereitgestellt von {{model}} über {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code Autovervollständigung {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Code wird analysiert...",
-  "kilocode:autocomplete.progress.generating": "Vorgeschlagene Änderungen werden generiert...",
-  "kilocode:autocomplete.progress.processing": "Vorgeschlagene Änderungen werden verarbeitet...",
-  "kilocode:autocomplete.progress.showing": "Vorgeschlagene Änderungen werden angezeigt...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Schnellaufgabe",
-  "kilocode:autocomplete.input.placeholder": "z. B. 'diese Funktion effizienter refaktorisieren'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Vorgeschlagene Änderungen generieren",
-  "kilocode:autocomplete.commands.displaySuggestions": "Vorgeschlagene Änderungen anzeigen",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Vorgeschlagene Änderungen abbrechen",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aktuelle vorgeschlagene Änderung anwenden",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Alle vorgeschlagenen Änderungen anwenden",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Vorgeschlagene Änderungen",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code-Agent",
-  "kilocode:autocomplete.chatParticipant.name": "Assistent",
-  "kilocode:autocomplete.chatParticipant.description":
-    "Ich kann dir bei Schnellaufgaben und vorgeschlagenen Änderungen helfen.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code Autovervollständigung wird durch einen Konflikt mit GitHub Copilot blockiert. Um dies zu beheben, musst du die Inline-Vorschläge von Copilot deaktivieren.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot deaktivieren",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/en.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/en.ts
index e2e2f423dd4..f0e2641adcd 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/en.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/en.ts
@@ -6,37 +6,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "snoozed",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (disabled)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**No autocomplete model configured**\n\nTo enable autocomplete, add a profile with one of these supported providers: {{providers}}.\n\n[Open Settings]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Session total cost:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Provider:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Model:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profile: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Default",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Performed {{count}} completions between {{startTime}} and {{endTime}}, for a total cost of {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autocompletions provided by {{model}} via {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analyzing your code...",
-  "kilocode:autocomplete.progress.generating": "Generating suggested edits...",
-  "kilocode:autocomplete.progress.processing": "Processing suggested edits...",
-  "kilocode:autocomplete.progress.showing": "Displaying suggested edits...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Quick Task",
-  "kilocode:autocomplete.input.placeholder": "e.g., 'refactor this function to be more efficient'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generate Suggested Edits",
-  "kilocode:autocomplete.commands.displaySuggestions": "Display Suggested Edits",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Cancel Suggested Edits",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Apply Current Suggested Edit",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Apply All Suggested Edits",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Suggested Edits",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent",
-  "kilocode:autocomplete.chatParticipant.name": "Agent",
-  "kilocode:autocomplete.chatParticipant.description": "I can help you with quick tasks and suggested edits.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "The Kilo Code Autocomplete is being blocked by a conflict with GitHub Copilot. To fix this, you must disable Copilot's inline suggestions.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Disable Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/es.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/es.ts
index 80dcab6a1d8..f0a9cd2eda4 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/es.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/es.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "pospuesto",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autocompletado",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Autocompletado de Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Autocompletado de Kilo Code (deshabilitado)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**No hay ningún modelo de autocompletado configurado**\n\nPara habilitar el autocompletado, añade un perfil con uno de estos proveedores compatibles: {{providers}}.\n\n[Abrir configuración]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Coste total de la sesión:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Proveedor:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Modelo:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Perfil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Predeterminado",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Se realizaron {{count}} completados entre {{startTime}} y {{endTime}}, con un coste total de {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Autocompletados proporcionados por {{model}} mediante {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Autocompletado de Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analizando tu código...",
-  "kilocode:autocomplete.progress.generating": "Generando ediciones sugeridas...",
-  "kilocode:autocomplete.progress.processing": "Procesando ediciones sugeridas...",
-  "kilocode:autocomplete.progress.showing": "Mostrando ediciones sugeridas...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Tarea rápida",
-  "kilocode:autocomplete.input.placeholder": "p. ej., 'refactoriza esta función para que sea más eficiente'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generar ediciones sugeridas",
-  "kilocode:autocomplete.commands.displaySuggestions": "Mostrar ediciones sugeridas",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Cancelar ediciones sugeridas",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aplicar edición sugerida actual",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Aplicar todas las ediciones sugeridas",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Ediciones sugeridas",
-  "kilocode:autocomplete.chatParticipant.fullName": "Agente de Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Agente",
-  "kilocode:autocomplete.chatParticipant.description": "Puedo ayudarte con tareas rápidas y ediciones sugeridas.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "El autocompletado de Kilo Code está bloqueado por un conflicto con GitHub Copilot. Para solucionarlo, debes deshabilitar las sugerencias en línea de Copilot.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Deshabilitar Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/fr.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/fr.ts
index 946a7a1c335..e465d9a97bc 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/fr.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/fr.ts
@@ -3,39 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "mis en pause",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Saisie automatique",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Saisie automatique Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Saisie automatique Kilo Code (désactivée)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Aucun modèle de saisie automatique configuré**\n\nPour activer la saisie automatique, ajoutez un profil avec l'un de ces fournisseurs pris en charge : {{providers}}.\n\n[Ouvrir les paramètres]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Coût total de la session :",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Fournisseur :",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Modèle :",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil : ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Par défaut",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "{{count}} complétions effectuées entre {{startTime}} et {{endTime}}, pour un coût total de {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Saisies automatiques fournies par {{model}} via {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Saisie automatique Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analyse de votre code...",
-  "kilocode:autocomplete.progress.generating": "Génération des modifications suggérées...",
-  "kilocode:autocomplete.progress.processing": "Traitement des modifications suggérées...",
-  "kilocode:autocomplete.progress.showing": "Affichage des modifications suggérées...",
-  "kilocode:autocomplete.input.title": "Kilo Code : tâche rapide",
-  "kilocode:autocomplete.input.placeholder": "p. ex., 'refactoriser cette fonction pour la rendre plus efficace'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code : générer des modifications suggérées",
-  "kilocode:autocomplete.commands.displaySuggestions": "Afficher les modifications suggérées",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Annuler les modifications suggérées",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Appliquer la modification suggérée actuelle",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Appliquer toutes les modifications suggérées",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code : modifications suggérées",
-  "kilocode:autocomplete.chatParticipant.fullName": "Agent Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Assistant",
-  "kilocode:autocomplete.chatParticipant.description":
-    "Je peux vous aider avec des tâches rapides et des modifications suggérées.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "La saisie automatique Kilo Code est bloquée par un conflit avec GitHub Copilot. Pour résoudre ce problème, vous devez désactiver les suggestions en ligne de Copilot.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Désactiver Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/it.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/it.ts
index 56a2609079b..2919061b8d7 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/it.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/it.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "posticipato",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Completamento automatico",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Completamento automatico Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Completamento automatico Kilo Code (disabilitato)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Nessun modello di completamento automatico configurato**\n\nPer abilitare il completamento automatico, aggiungi un profilo con uno di questi provider supportati: {{providers}}.\n\n[Apri impostazioni]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Costo totale della sessione:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Fornitore:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Modello:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profilo: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Predefinito",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Eseguiti {{count}} completamenti tra {{startTime}} e {{endTime}}, per un costo totale di {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Completamenti automatici forniti da {{model}} tramite {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Completamento automatico Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analisi del codice in corso...",
-  "kilocode:autocomplete.progress.generating": "Generazione delle modifiche suggerite...",
-  "kilocode:autocomplete.progress.processing": "Elaborazione delle modifiche suggerite...",
-  "kilocode:autocomplete.progress.showing": "Visualizzazione delle modifiche suggerite...",
-  "kilocode:autocomplete.input.title": "Kilo Code: attività rapida",
-  "kilocode:autocomplete.input.placeholder": "es. 'rifattorizza questa funzione per renderla più efficiente'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: genera modifiche suggerite",
-  "kilocode:autocomplete.commands.displaySuggestions": "Mostra modifiche suggerite",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Annulla modifiche suggerite",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Applica la modifica suggerita corrente",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Applica tutte le modifiche suggerite",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: modifiche suggerite",
-  "kilocode:autocomplete.chatParticipant.fullName": "Agente Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Agente",
-  "kilocode:autocomplete.chatParticipant.description": "Posso aiutarti con attività rapide e modifiche suggerite.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Il completamento automatico di Kilo Code è bloccato da un conflitto con GitHub Copilot. Per risolvere il problema, devi disabilitare i suggerimenti inline di Copilot.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Disabilita Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/ja.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/ja.ts
index b0913d99235..e1a44858d89 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/ja.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/ja.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "一時停止中",
   "kilocode:autocomplete.statusBar.warning": "$(warning) オートコンプリート",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code オートコンプリート",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code オートコンプリート (無効)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**オートコンプリートモデルが設定されていません**\n\nオートコンプリートを有効にするには、次の対応プロバイダーのいずれかを含むプロファイルを追加してください: {{providers}}。\n\n[設定を開く]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "セッション合計コスト:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "プロバイダー:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "モデル:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "プロファイル: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "デフォルト",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "{{startTime}} から {{endTime}} までに {{count}} 件の補完を実行し、合計コストは {{cost}} でした。",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "オートコンプリートは {{provider}} 経由の {{model}} によって提供されています。",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code オートコンプリート {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "コードを解析しています...",
-  "kilocode:autocomplete.progress.generating": "提案された編集を生成しています...",
-  "kilocode:autocomplete.progress.processing": "提案された編集を処理しています...",
-  "kilocode:autocomplete.progress.showing": "提案された編集を表示しています...",
-  "kilocode:autocomplete.input.title": "Kilo Code: クイックタスク",
-  "kilocode:autocomplete.input.placeholder": "例: 'この関数をより効率的にリファクタリングする'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: 提案された編集を生成",
-  "kilocode:autocomplete.commands.displaySuggestions": "提案された編集を表示",
-  "kilocode:autocomplete.commands.cancelSuggestions": "提案された編集をキャンセル",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "現在の提案された編集を適用",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "すべての提案された編集を適用",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: 提案された編集",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code エージェント",
-  "kilocode:autocomplete.chatParticipant.name": "エージェント",
-  "kilocode:autocomplete.chatParticipant.description": "クイックタスクや提案された編集をお手伝いできます。",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code オートコンプリートは GitHub Copilot との競合によりブロックされています。修正するには、Copilot のインライン提案を無効にする必要があります。",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot を無効化",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/ko.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/ko.ts
index ed3b47c426a..a0a6c8391bc 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/ko.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/ko.ts
@@ -3,37 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "일시 중지됨",
   "kilocode:autocomplete.statusBar.warning": "$(warning) 자동 완성",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code 자동 완성",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code 자동 완성(비활성화됨)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**자동 완성 모델이 구성되지 않았습니다**\n\n자동 완성을 활성화하려면 다음 지원 제공자 중 하나가 포함된 프로필을 추가하세요: {{providers}}.\n\n[설정 열기]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "세션 총 비용:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "제공자:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "모델:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "프로필: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "기본값",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "{{startTime}}부터 {{endTime}}까지 {{count}}개의 완성을 수행했으며 총 비용은 {{cost}}입니다.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "자동 완성은 {{provider}}를 통해 {{model}}에서 제공됩니다.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code 자동 완성 {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "코드를 분석하는 중...",
-  "kilocode:autocomplete.progress.generating": "제안된 편집을 생성하는 중...",
-  "kilocode:autocomplete.progress.processing": "제안된 편집을 처리하는 중...",
-  "kilocode:autocomplete.progress.showing": "제안된 편집을 표시하는 중...",
-  "kilocode:autocomplete.input.title": "Kilo Code: 빠른 작업",
-  "kilocode:autocomplete.input.placeholder": "예: '이 함수를 더 효율적으로 리팩터링'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: 제안된 편집 생성",
-  "kilocode:autocomplete.commands.displaySuggestions": "제안된 편집 표시",
-  "kilocode:autocomplete.commands.cancelSuggestions": "제안된 편집 취소",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "현재 제안된 편집 적용",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "모든 제안된 편집 적용",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: 제안된 편집",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code 에이전트",
-  "kilocode:autocomplete.chatParticipant.name": "에이전트",
-  "kilocode:autocomplete.chatParticipant.description": "빠른 작업과 제안된 편집을 도와드릴 수 있습니다.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code 자동 완성이 GitHub Copilot과의 충돌로 차단되고 있습니다. 이 문제를 해결하려면 Copilot의 인라인 제안을 비활성화해야 합니다.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot 비활성화",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/nl.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/nl.ts
index f4feddfe8a6..181a0935dd4 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/nl.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/nl.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "gesluimerd",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Automatisch aanvullen",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code automatisch aanvullen",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code automatisch aanvullen (uitgeschakeld)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Geen model voor automatisch aanvullen geconfigureerd**\n\nVoeg een profiel toe met een van deze ondersteunde providers om automatisch aanvullen in te schakelen: {{providers}}.\n\n[Instellingen openen]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Totale sessiekosten:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Aanbieder:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Model:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profiel: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Standaard",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "{{count}} aanvullingen uitgevoerd tussen {{startTime}} en {{endTime}}, voor totale kosten van {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Automatische aanvullingen geleverd door {{model}} via {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code automatisch aanvullen {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Je code wordt geanalyseerd...",
-  "kilocode:autocomplete.progress.generating": "Voorgestelde bewerkingen worden gegenereerd...",
-  "kilocode:autocomplete.progress.processing": "Voorgestelde bewerkingen worden verwerkt...",
-  "kilocode:autocomplete.progress.showing": "Voorgestelde bewerkingen worden weergegeven...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Snelle taak",
-  "kilocode:autocomplete.input.placeholder": "bijv. 'refactor deze functie zodat deze efficiënter is'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Voorgestelde bewerkingen genereren",
-  "kilocode:autocomplete.commands.displaySuggestions": "Voorgestelde bewerkingen weergeven",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Voorgestelde bewerkingen annuleren",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Huidige voorgestelde bewerking toepassen",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Alle voorgestelde bewerkingen toepassen",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Voorgestelde bewerkingen",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code-agent",
-  "kilocode:autocomplete.chatParticipant.name": "Assistent",
-  "kilocode:autocomplete.chatParticipant.description": "Ik kan helpen met snelle taken en voorgestelde bewerkingen.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code automatisch aanvullen wordt geblokkeerd door een conflict met GitHub Copilot. Schakel de inline suggesties van Copilot uit om dit op te lossen.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot uitschakelen",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/no.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/no.ts
index aa50c748f8d..dcd89df7e0c 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/no.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/no.ts
@@ -3,38 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "utsatt",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autofullføring",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code autofullføring",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code autofullføring (deaktivert)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Ingen autofullføringsmodell konfigurert**\n\nFor å aktivere autofullføring, legg til en profil med en av disse støttede leverandørene: {{providers}}.\n\n[Åpne innstillinger]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Total kostnad for økten:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Leverandør:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Modell:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Standard",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Utførte {{count}} fullføringer mellom {{startTime}} og {{endTime}}, til en total kostnad på {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autofullføringer leveres av {{model}} via {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code autofullføring {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analyserer koden din...",
-  "kilocode:autocomplete.progress.generating": "Genererer foreslåtte redigeringer...",
-  "kilocode:autocomplete.progress.processing": "Behandler foreslåtte redigeringer...",
-  "kilocode:autocomplete.progress.showing": "Viser foreslåtte redigeringer...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Hurtig oppgave",
-  "kilocode:autocomplete.input.placeholder": "f.eks. 'refaktorer denne funksjonen så den blir mer effektiv'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generer foreslåtte redigeringer",
-  "kilocode:autocomplete.commands.displaySuggestions": "Vis foreslåtte redigeringer",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Avbryt foreslåtte redigeringer",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Bruk gjeldende foreslåtte redigering",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Bruk alle foreslåtte redigeringer",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Foreslåtte redigeringer",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code-agent",
-  "kilocode:autocomplete.chatParticipant.name": "Agent",
-  "kilocode:autocomplete.chatParticipant.description":
-    "Jeg kan hjelpe deg med hurtige oppgaver og foreslåtte redigeringer.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code autofullføring blokkeres av en konflikt med GitHub Copilot. For å fikse dette må du deaktivere Copilots inline-forslag.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Deaktiver Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/pl.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/pl.ts
index 1ade66e91d0..24168a6a36e 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/pl.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/pl.ts
@@ -3,37 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "wstrzymane",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Autouzupełnianie",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Autouzupełnianie Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Autouzupełnianie Kilo Code (wyłączone)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Nie skonfigurowano modelu autouzupełniania**\n\nAby włączyć autouzupełnianie, dodaj profil z jednym z tych obsługiwanych dostawców: {{providers}}.\n\n[Otwórz ustawienia]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Łączny koszt sesji:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Dostawca:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Model:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Domyślny",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Wykonano {{count}} uzupełnień między {{startTime}} a {{endTime}}, za łączny koszt {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autouzupełnianie zapewnia {{model}} przez {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Autouzupełnianie Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Analizowanie kodu...",
-  "kilocode:autocomplete.progress.generating": "Generowanie sugerowanych edycji...",
-  "kilocode:autocomplete.progress.processing": "Przetwarzanie sugerowanych edycji...",
-  "kilocode:autocomplete.progress.showing": "Wyświetlanie sugerowanych edycji...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Szybkie zadanie",
-  "kilocode:autocomplete.input.placeholder": "np. 'zrefaktoryzuj tę funkcję, aby była bardziej wydajna'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generuj sugerowane edycje",
-  "kilocode:autocomplete.commands.displaySuggestions": "Wyświetl sugerowane edycje",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Anuluj sugerowane edycje",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Zastosuj bieżącą sugerowaną edycję",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Zastosuj wszystkie sugerowane edycje",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Sugerowane edycje",
-  "kilocode:autocomplete.chatParticipant.fullName": "Agent Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Agent",
-  "kilocode:autocomplete.chatParticipant.description": "Mogę pomóc w szybkich zadaniach i sugerowanych edycjach.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Autouzupełnianie Kilo Code jest blokowane przez konflikt z GitHub Copilot. Aby to naprawić, musisz wyłączyć sugestie inline Copilota.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Wyłącz Copilota",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/ru.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/ru.ts
index 9b3915f4ae7..18bd1aa41ba 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/ru.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/ru.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "отложено",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Автодополнение",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Автодополнение Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Автодополнение Kilo Code (отключено)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Модель автодополнения не настроена**\n\nЧтобы включить автодополнение, добавьте профиль с одним из этих поддерживаемых провайдеров: {{providers}}.\n\n[Открыть настройки]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Общая стоимость сеанса:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Провайдер:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Модель:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Профиль: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "По умолчанию",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Выполнено {{count}} дополнений с {{startTime}} до {{endTime}}, общая стоимость {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Автодополнения предоставляются {{model}} через {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Автодополнение Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Анализ кода...",
-  "kilocode:autocomplete.progress.generating": "Создание предлагаемых правок...",
-  "kilocode:autocomplete.progress.processing": "Обработка предлагаемых правок...",
-  "kilocode:autocomplete.progress.showing": "Отображение предлагаемых правок...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Быстрая задача",
-  "kilocode:autocomplete.input.placeholder": "например: 'отрефакторить эту функцию, чтобы она была эффективнее'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Создать предлагаемые правки",
-  "kilocode:autocomplete.commands.displaySuggestions": "Показать предлагаемые правки",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Отменить предлагаемые правки",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Применить текущую предлагаемую правку",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Применить все предлагаемые правки",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Предлагаемые правки",
-  "kilocode:autocomplete.chatParticipant.fullName": "Агент Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Агент",
-  "kilocode:autocomplete.chatParticipant.description": "Я могу помочь с быстрыми задачами и предлагаемыми правками.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Автодополнение Kilo Code блокируется из-за конфликта с GitHub Copilot. Чтобы исправить это, необходимо отключить встроенные предложения Copilot.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Отключить Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/th.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/th.ts
index 45f999ce768..77f17f0d04d 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/th.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/th.ts
@@ -3,38 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "พักไว้",
   "kilocode:autocomplete.statusBar.warning": "$(warning) เติมข้อความอัตโนมัติ",
   "kilocode:autocomplete.statusBar.tooltip.basic": "การเติมข้อความอัตโนมัติของ Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "การเติมข้อความอัตโนมัติของ Kilo Code (ปิดใช้งาน)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**ยังไม่ได้กำหนดค่าโมเดลเติมข้อความอัตโนมัติ**\n\nหากต้องการเปิดใช้การเติมข้อความอัตโนมัติ ให้เพิ่มโปรไฟล์ที่มีผู้ให้บริการที่รองรับต่อไปนี้: {{providers}}\n\n[เปิดการตั้งค่า]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "ค่าใช้จ่ายรวมของเซสชัน:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "ผู้ให้บริการ:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "โมเดล:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "โปรไฟล์: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "ค่าเริ่มต้น",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "ดำเนินการเติมข้อความ {{count}} ครั้งระหว่าง {{startTime}} ถึง {{endTime}} โดยมีค่าใช้จ่ายรวม {{cost}}",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "การเติมข้อความอัตโนมัติให้บริการโดย {{model}} ผ่าน {{provider}}",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "การเติมข้อความอัตโนมัติของ Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "กำลังวิเคราะห์โค้ดของคุณ...",
-  "kilocode:autocomplete.progress.generating": "กำลังสร้างการแก้ไขที่แนะนำ...",
-  "kilocode:autocomplete.progress.processing": "กำลังประมวลผลการแก้ไขที่แนะนำ...",
-  "kilocode:autocomplete.progress.showing": "กำลังแสดงการแก้ไขที่แนะนำ...",
-  "kilocode:autocomplete.input.title": "Kilo Code: งานด่วน",
-  "kilocode:autocomplete.input.placeholder": "เช่น 'รีแฟกเตอร์ฟังก์ชันนี้ให้มีประสิทธิภาพมากขึ้น'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: สร้างการแก้ไขที่แนะนำ",
-  "kilocode:autocomplete.commands.displaySuggestions": "แสดงการแก้ไขที่แนะนำ",
-  "kilocode:autocomplete.commands.cancelSuggestions": "ยกเลิกการแก้ไขที่แนะนำ",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "ใช้การแก้ไขที่แนะนำปัจจุบัน",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "ใช้การแก้ไขที่แนะนำทั้งหมด",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: การแก้ไขที่แนะนำ",
-  "kilocode:autocomplete.chatParticipant.fullName": "ตัวแทน Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "ตัวแทน",
-  "kilocode:autocomplete.chatParticipant.description": "ฉันช่วยคุณทำงานด่วนและการแก้ไขที่แนะนำได้",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "การเติมข้อความอัตโนมัติของ Kilo Code ถูกบล็อกเนื่องจากขัดแย้งกับ GitHub Copilot หากต้องการแก้ไข คุณต้องปิดข้อเสนอแนะแบบอินไลน์ของ Copilot",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "ปิดใช้งาน Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/tr.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/tr.ts
index 30908d72573..43132160074 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/tr.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/tr.ts
@@ -3,39 +3,15 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "ertelendi",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Otomatik tamamlama",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code otomatik tamamlama",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code otomatik tamamlama (devre dışı)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Otomatik tamamlama modeli yapılandırılmadı**\n\nOtomatik tamamlamayı etkinleştirmek için desteklenen şu sağlayıcılardan birini içeren bir profil ekleyin: {{providers}}.\n\n[Ayarları Aç]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Oturum toplam maliyeti:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Sağlayıcı:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Model:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Varsayılan",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "{{startTime}} ile {{endTime}} arasında {{count}} tamamlama yapıldı, toplam maliyet {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo":
     "Otomatik tamamlamalar {{provider}} üzerinden {{model}} tarafından sağlanır.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code otomatik tamamlama {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Kodunuz analiz ediliyor...",
-  "kilocode:autocomplete.progress.generating": "Önerilen düzenlemeler oluşturuluyor...",
-  "kilocode:autocomplete.progress.processing": "Önerilen düzenlemeler işleniyor...",
-  "kilocode:autocomplete.progress.showing": "Önerilen düzenlemeler gösteriliyor...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Hızlı görev",
-  "kilocode:autocomplete.input.placeholder": "örn. 'bu fonksiyonu daha verimli olacak şekilde yeniden düzenle'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Önerilen düzenlemeler oluştur",
-  "kilocode:autocomplete.commands.displaySuggestions": "Önerilen düzenlemeleri göster",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Önerilen düzenlemeleri iptal et",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Geçerli önerilen düzenlemeyi uygula",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Tüm önerilen düzenlemeleri uygula",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Önerilen düzenlemeler",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code aracı",
-  "kilocode:autocomplete.chatParticipant.name": "Aracı",
-  "kilocode:autocomplete.chatParticipant.description":
-    "Hızlı görevler ve önerilen düzenlemeler konusunda yardımcı olabilirim.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code otomatik tamamlama, GitHub Copilot ile çakışma nedeniyle engelleniyor. Bunu düzeltmek için Copilot'un satır içi önerilerini devre dışı bırakmalısınız.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot'u devre dışı bırak",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/uk.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/uk.ts
index fe70edbd80b..fb70d04b77b 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/uk.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/uk.ts
@@ -3,38 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "відкладено",
   "kilocode:autocomplete.statusBar.warning": "$(warning) Автодоповнення",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Автодоповнення Kilo Code",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Автодоповнення Kilo Code (вимкнено)",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**Модель автодоповнення не налаштована**\n\nЩоб увімкнути автодоповнення, додайте профіль з одним із цих підтримуваних постачальників: {{providers}}.\n\n[Відкрити налаштування]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Загальна вартість сеансу:",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "Постачальник:",
-  "kilocode:autocomplete.statusBar.tooltip.model": "Модель:",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "Профіль: ",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "За замовчуванням",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "Виконано {{count}} доповнень між {{startTime}} і {{endTime}}, із загальною вартістю {{cost}}.",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Автодоповнення надає {{model}} через {{provider}}.",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Автодоповнення Kilo Code {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "Аналіз вашого коду...",
-  "kilocode:autocomplete.progress.generating": "Створення запропонованих змін...",
-  "kilocode:autocomplete.progress.processing": "Обробка запропонованих змін...",
-  "kilocode:autocomplete.progress.showing": "Показ запропонованих змін...",
-  "kilocode:autocomplete.input.title": "Kilo Code: Швидке завдання",
-  "kilocode:autocomplete.input.placeholder": "наприклад, 'рефакторинг цієї функції, щоб вона була ефективнішою'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Створити запропоновані зміни",
-  "kilocode:autocomplete.commands.displaySuggestions": "Показати запропоновані зміни",
-  "kilocode:autocomplete.commands.cancelSuggestions": "Скасувати запропоновані зміни",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "Застосувати поточну запропоновану зміну",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "Застосувати всі запропоновані зміни",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code: Запропоновані зміни",
-  "kilocode:autocomplete.chatParticipant.fullName": "Агент Kilo Code",
-  "kilocode:autocomplete.chatParticipant.name": "Агент",
-  "kilocode:autocomplete.chatParticipant.description":
-    "Я можу допомогти зі швидкими завданнями та запропонованими змінами.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Автодоповнення Kilo Code блокується через конфлікт із GitHub Copilot. Щоб виправити це, потрібно вимкнути вбудовані пропозиції Copilot.",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Вимкнути Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/zh.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/zh.ts
index 1ca452b68ea..3a87451e4d2 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/zh.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/zh.ts
@@ -3,37 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "已暂停",
   "kilocode:autocomplete.statusBar.warning": "$(warning) 自动补全",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code 自动补全",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code 自动补全（已禁用）",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**未配置自动补全模型**\n\n要启用自动补全，请添加一个包含以下受支持提供商之一的配置文件：{{providers}}。\n\n[打开设置]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "会话总成本：",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "提供商：",
-  "kilocode:autocomplete.statusBar.tooltip.model": "模型：",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "配置文件：",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "默认",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "在 {{startTime}} 到 {{endTime}} 之间执行了 {{count}} 次补全，总成本为 {{cost}}。",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "自动补全由 {{provider}} 通过 {{model}} 提供。",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code 自动补全 {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "正在分析你的代码...",
-  "kilocode:autocomplete.progress.generating": "正在生成建议的编辑...",
-  "kilocode:autocomplete.progress.processing": "正在处理建议的编辑...",
-  "kilocode:autocomplete.progress.showing": "正在显示建议的编辑...",
-  "kilocode:autocomplete.input.title": "Kilo Code：快速任务",
-  "kilocode:autocomplete.input.placeholder": "例如：'重构此函数以提高效率'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code：生成建议的编辑",
-  "kilocode:autocomplete.commands.displaySuggestions": "显示建议的编辑",
-  "kilocode:autocomplete.commands.cancelSuggestions": "取消建议的编辑",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "应用当前建议的编辑",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "应用所有建议的编辑",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code：建议的编辑",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code 代理",
-  "kilocode:autocomplete.chatParticipant.name": "代理",
-  "kilocode:autocomplete.chatParticipant.description": "我可以帮助你处理快速任务和建议的编辑。",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code 自动补全因与 GitHub Copilot 冲突而被阻止。要修复此问题，必须禁用 Copilot 的内联建议。",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "禁用 Copilot",
diff --git a/packages/kilo-vscode/src/services/i18n/autocomplete/zht.ts b/packages/kilo-vscode/src/services/i18n/autocomplete/zht.ts
index ab8f3177c65..38900fcf58a 100644
--- a/packages/kilo-vscode/src/services/i18n/autocomplete/zht.ts
+++ b/packages/kilo-vscode/src/services/i18n/autocomplete/zht.ts
@@ -3,37 +3,14 @@ export const dict = {
   "kilocode:autocomplete.statusBar.snoozed": "已暫停",
   "kilocode:autocomplete.statusBar.warning": "$(warning) 自動完成",
   "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code 自動完成",
-  "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code 自動完成（已停用）",
   "kilocode:autocomplete.statusBar.tooltip.noUsableProvider":
     "**尚未設定自動完成模型**\n\n若要啟用自動完成，請新增包含下列其中一個支援提供者的設定檔：{{providers}}。\n\n[開啟設定]({{command}})",
-  "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "工作階段總成本：",
-  "kilocode:autocomplete.statusBar.tooltip.provider": "提供者：",
-  "kilocode:autocomplete.statusBar.tooltip.model": "模型：",
-  "kilocode:autocomplete.statusBar.tooltip.profile": "設定檔：",
-  "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "預設",
   "kilocode:autocomplete.statusBar.tooltip.completionSummary":
     "在 {{startTime}} 到 {{endTime}} 之間執行了 {{count}} 次完成，總成本為 {{cost}}。",
   "kilocode:autocomplete.statusBar.tooltip.providerInfo": "自動完成由 {{provider}} 透過 {{model}} 提供。",
   "kilocode:autocomplete.statusBar.cost.zero": "$0.00",
   "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01",
-  "kilocode:autocomplete.toggleMessage": "Kilo Code 自動完成 {{status}}",
-  "kilocode:autocomplete.progress.title": "Kilo Code",
-  "kilocode:autocomplete.progress.analyzing": "正在分析你的程式碼...",
-  "kilocode:autocomplete.progress.generating": "正在產生建議的編輯...",
-  "kilocode:autocomplete.progress.processing": "正在處理建議的編輯...",
-  "kilocode:autocomplete.progress.showing": "正在顯示建議的編輯...",
-  "kilocode:autocomplete.input.title": "Kilo Code：快速工作",
-  "kilocode:autocomplete.input.placeholder": "例如：'重構此函式以提高效率'",
-  "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code：產生建議的編輯",
-  "kilocode:autocomplete.commands.displaySuggestions": "顯示建議的編輯",
-  "kilocode:autocomplete.commands.cancelSuggestions": "取消建議的編輯",
-  "kilocode:autocomplete.commands.applyCurrentSuggestion": "套用目前建議的編輯",
-  "kilocode:autocomplete.commands.applyAllSuggestions": "套用所有建議的編輯",
-  "kilocode:autocomplete.commands.category": "Kilo Code",
   "kilocode:autocomplete.codeAction.title": "Kilo Code：建議的編輯",
-  "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code 代理程式",
-  "kilocode:autocomplete.chatParticipant.name": "代理程式",
-  "kilocode:autocomplete.chatParticipant.description": "我可以協助你處理快速工作和建議的編輯。",
   "kilocode:autocomplete.incompatibilityExtensionPopup.message":
     "Kilo Code 自動完成因與 GitHub Copilot 衝突而被封鎖。若要修正此問題，必須停用 Copilot 的內嵌建議。",
   "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "停用 Copilot",
diff --git a/packages/kilo-vscode/src/utils.ts b/packages/kilo-vscode/src/utils.ts
index 87ff464e251..fba6bb74b70 100644
--- a/packages/kilo-vscode/src/utils.ts
+++ b/packages/kilo-vscode/src/utils.ts
@@ -45,6 +45,7 @@ export function buildWebviewHtml(
 ): string {
   const nonce = getNonce()
   const csp = buildCspString(webview.cspSource, nonce, opts.port)
+  const markdownWorkerUri = opts.workerUri.toString().replace(/shiki-worker\.js$/, "markdown-shiki-worker.js")
 
   return `<!DOCTYPE html>
 <html lang="en" data-theme="kilo-vscode">
@@ -82,7 +83,7 @@ export function buildWebviewHtml(
 </head>
 <body>
   <div id="root"></div>
-  <script nonce="${nonce}">window.ICONS_BASE_URI = "${opts.iconsBaseUri}"; window.KILO_SHIKI_WORKER_URI = "${opts.workerUri}";</script>
+  <script nonce="${nonce}">window.ICONS_BASE_URI = "${opts.iconsBaseUri}"; window.KILO_SHIKI_WORKER_URI = "${opts.workerUri}"; window.KILO_MARKDOWN_SHIKI_WORKER_URI = "${markdownWorkerUri}";</script>
   <script nonce="${nonce}" src="${opts.scriptUri}"></script>
 </body>
 </html>`
diff --git a/packages/kilo-vscode/tests/accessibility.spec.ts b/packages/kilo-vscode/tests/accessibility.spec.ts
index 151c71efb06..4df3806db55 100644
--- a/packages/kilo-vscode/tests/accessibility.spec.ts
+++ b/packages/kilo-vscode/tests/accessibility.spec.ts
@@ -13,6 +13,7 @@ const STORIES = [
   { id: "settings--providers-configure", name: "Settings / providers empty state" },
   { id: "marketplace--empty-list", name: "Marketplace / empty state" },
   { id: "agentmanager--sidebar-search-open", name: "Agent Manager / sidebar search" },
+  { id: "agentmanager--side-terminal-panel-empty", name: "Agent Manager / side terminal" },
   { id: "session-tabs--switcher-open", name: "Session tabs / switcher" },
 ]
 
diff --git a/packages/kilo-vscode/tests/markdown-mermaid.spec.ts b/packages/kilo-vscode/tests/markdown-mermaid.spec.ts
new file mode 100644
index 00000000000..e18acc7e33f
--- /dev/null
+++ b/packages/kilo-vscode/tests/markdown-mermaid.spec.ts
@@ -0,0 +1,15 @@
+import { expect, test } from "@playwright/test"
+
+test("renders Mermaid from delimiter-free Markdown source", async ({ page }) => {
+  await page.goto("/iframe.html?id=shared--markdown-mermaid&viewMode=story")
+
+  const markdown = page.locator('[data-component="markdown"]')
+  await expect(markdown.getByRole("heading", { name: "Flow" })).toBeVisible()
+  const diagram = markdown.locator('[data-mermaid-state="rendered"]')
+  await expect(diagram.locator('svg[aria-roledescription="flowchart-v2"]')).toBeVisible()
+
+  const source = diagram.locator('code[data-lang="mermaid"]')
+  await expect(source).toContainText("flowchart TD")
+  await expect(source).not.toContainText("```mermaid")
+  await expect(markdown.getByText("Rendered after the diagram.")).toBeVisible()
+})
diff --git a/packages/kilo-vscode/tests/setup/worker-url.ts b/packages/kilo-vscode/tests/setup/worker-url.ts
new file mode 100644
index 00000000000..85b0b76adfb
--- /dev/null
+++ b/packages/kilo-vscode/tests/setup/worker-url.ts
@@ -0,0 +1,11 @@
+import { plugin } from "bun"
+
+plugin({
+  name: "worker-url",
+  setup(build) {
+    build.onLoad({ filter: /\?worker&url$/ }, () => ({
+      contents: "export default 'test-worker.js'",
+      loader: "js",
+    }))
+  },
+})
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 ff6a272555d..804471f9bb0 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
@@ -42,6 +42,8 @@ const TSX_FILES = [
   path.join(ROOT, "webview-ui/agent-manager/WorktreeSectionActions.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"),
+  path.join(ROOT, "webview-ui/agent-manager/terminal/TerminalDestinationButton.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/terminal/SortableTerminalTab.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/terminal/render.tsx"),
   path.join(ROOT, "webview-ui/diff-virtual/DiffVirtualApp.tsx"),
@@ -186,8 +188,6 @@ describe("Agent Manager Provider Messages", () => {
       "agentManager.forgetSession",
       "agentManager.importFromBranch",
       "agentManager.importFromPR",
-      "agentManager.importExternalWorktree",
-      "agentManager.importAllExternalWorktrees",
       "agentManager.createSection",
       "agentManager.moveToSection",
     ]
@@ -435,7 +435,6 @@ describe("Agent Manager Provider — onMessage routing", () => {
     const text = body("onSessionMessage")
     const show = text.indexOf("this.terminalManager.prepareContext(m.sessionID)")
     expect(show).toBeGreaterThan(-1)
-    expect(text).not.toContain("!this.terminalManager.hasActiveTerminal()")
     expect(text).toContain('type: "terminalContextError"')
   })
 
@@ -493,6 +492,19 @@ describe("Agent Manager Provider — onMessage routing", () => {
     expect(text).toContain("removeWorktree")
   })
 
+  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 initial = text.indexOf("agentManager.sendInitialMessage")
+
+    expect(ready, "multi-version path must publish ready state").toBeGreaterThan(-1)
+    expect(register, "multi-version path must register the created session").toBeGreaterThan(-1)
+    expect(register, "sessionCreated must follow the worktree mapping").toBeGreaterThan(ready)
+    expect(initial, "initial prompt phase must exist").toBeGreaterThan(-1)
+    expect(register, "session must be registered before the initial prompt").toBeLessThan(initial)
+  })
+
   // -- onPromoteSession invariants -------------------------------------------
 
   /**
@@ -531,8 +543,6 @@ describe("Agent Manager Provider — onMessage routing", () => {
     const pushIdx = text.indexOf("this.pushState()")
     const readyIdx = text.indexOf("agentManager.worktreeSetup")
     expect(pushIdx, "pushState must come before worktreeSetup").toBeLessThan(readyIdx)
-    // Must also send sessionMeta so the webview knows the branch/path
-    expect(text).toContain("agentManager.sessionMeta")
   })
 
   // -- agentManager.requestState in non-git workspace -------------------------
@@ -570,7 +580,6 @@ describe("Agent Manager Provider — onMessage routing", () => {
     const providerText = body("onImportMessage")
     expect(text).toContain("class WorktreeImporter")
     expect(text).toContain("createFromPR")
-    expect(text).toContain("listExternalWorktrees")
     expect(text).toContain("createWorktree")
     expect(providerText).toContain("this.importer")
   })
@@ -788,6 +797,10 @@ const VSCODE_ALLOWED: Record<string, { note: string }> = {
   "terminal-font.ts": {
     note: "vscode config reader for integrated terminal font settings",
   },
+  // Reads + watches the terminal button destination setting
+  "terminal-destination.ts": {
+    note: "vscode config reader for the terminal destination setting",
+  },
 }
 
 /**
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-i18n.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-i18n.test.ts
index 691b8a7ab67..8142d2c20c0 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-i18n.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-i18n.test.ts
@@ -26,6 +26,8 @@ const ROOT = path.resolve(import.meta.dir, "../..")
 const TSX_FILES = [
   path.join(ROOT, "webview-ui/agent-manager/AgentManagerApp.tsx"),
   path.join(ROOT, "webview-ui/agent-manager/sortable-tab.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/terminal/SideTerminalPanel.tsx"),
+  path.join(ROOT, "webview-ui/agent-manager/terminal/TerminalDestinationButton.tsx"),
 ]
 
 /**
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
new file mode 100644
index 00000000000..40330aa29c4
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-destination.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from "bun:test"
+import { affectsTerminalDestination, resolveTerminalDestination } from "../../src/agent-manager/terminal-destination"
+
+function event(key: string) {
+  return {
+    affectsConfiguration: (target: string) => target === key,
+  } as Parameters<typeof affectsTerminalDestination>[0]
+}
+
+describe("Agent Manager terminal destination", () => {
+  it("defaults unknown settings to the VS Code terminal", () => {
+    expect(resolveTerminalDestination(undefined)).toBe("vscode")
+    expect(resolveTerminalDestination("invalid")).toBe("vscode")
+    expect(resolveTerminalDestination("vscode")).toBe("vscode")
+    expect(resolveTerminalDestination("agentManager")).toBe("agentManager")
+  })
+
+  it("watches only the terminal button destination setting", () => {
+    expect(affectsTerminalDestination(event("kilo-code.new.agentManager.terminalButtonDestination"))).toBe(true)
+    expect(affectsTerminalDestination(event("terminal.integrated.fontFamily"))).toBe(false)
+  })
+})
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 9bf257a8c3b..64504d2600b 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
@@ -61,7 +61,14 @@ describe("Agent Manager terminal font", () => {
         getTerminalFont: () => font,
       })
 
-      expect(router.handle({ type: "agentManager.terminal.create", worktreeId: null })).toBe(true)
+      expect(
+        router.handle({
+          type: "agentManager.terminal.create",
+          createId: "font-1",
+          placement: "tab",
+          worktreeId: null,
+        }),
+      ).toBe(true)
     })
 
     const created = await message
@@ -82,9 +89,12 @@ describe("Agent Manager terminal font", () => {
         saveTabMemory: () => undefined,
         setSelection: () => undefined,
         showError: () => undefined,
+        postMessage: () => undefined,
       })
       const message = {
         type: "agentManager.terminal.created",
+        createId: "font-2",
+        placement: "tab",
         worktreeId: null,
         terminalId: "terminal-1",
         title: "Terminal 1",
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
new file mode 100644
index 00000000000..bfa243d1fc8
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-routing.test.ts
@@ -0,0 +1,111 @@
+import { describe, expect, it } from "bun:test"
+import type { KiloClient } from "@kilocode/sdk/v2/client"
+import { TerminalRouter } from "../../src/agent-manager/terminal-routing"
+import type { AgentManagerOutMessage } from "../../src/agent-manager/types"
+
+const font = { fontFamily: "Menlo", fontSize: 12 }
+
+function wait() {
+  return new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+describe("Agent Manager terminal routing", () => {
+  it("round-trips side placement and rejects missing worktrees", async () => {
+    const messages: AgentManagerOutMessage[] = []
+    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 router = new TerminalRouter({
+      getClient: () => client,
+      getServerConfig: () => ({ baseUrl: "http://127.0.0.1:4096", password: "secret" }),
+      getRoot: () => "/workspace",
+      getWorktreePath: (id) => (id === "wt-1" ? "/workspace/wt-1" : undefined),
+      log: () => undefined,
+      post: (message) => messages.push(message),
+      getTerminalFont: () => font,
+    })
+
+    router.handle({
+      type: "agentManager.terminal.create",
+      createId: "side-1",
+      placement: "side",
+      worktreeId: "wt-1",
+    })
+    await wait()
+    expect(messages[0]).toMatchObject({
+      type: "agentManager.terminal.created",
+      createId: "side-1",
+      placement: "side",
+      worktreeId: "wt-1",
+    })
+
+    router.handle({
+      type: "agentManager.terminal.create",
+      createId: "side-missing",
+      placement: "side",
+      worktreeId: "missing",
+    })
+    expect(messages[1]).toMatchObject({
+      type: "agentManager.terminal.error",
+      createId: "side-missing",
+    })
+    await router.dispose()
+  })
+
+  it("isolates a reopened panel from an in-flight disposal", async () => {
+    const messages: AgentManagerOutMessage[] = []
+    const removed: string[] = []
+    const resolvers: Array<(value: { data: { id: string; title: string } }) => void> = []
+    let creates = 0
+    const client = {
+      pty: {
+        create: () =>
+          new Promise<{ data: { id: string; title: string } }>((resolve) => {
+            creates++
+            if (creates === 1) resolvers.push(resolve)
+            else resolve({ data: { id: "pty-new", title: "Terminal 1" } })
+          }),
+        remove: async ({ ptyID }: { ptyID: string }) => {
+          removed.push(ptyID)
+          return { data: true }
+        },
+        update: async () => ({ data: true }),
+      },
+    } as unknown as KiloClient
+    const router = new TerminalRouter({
+      getClient: () => 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: "old",
+      placement: "side",
+      worktreeId: null,
+    })
+    await router.dispose()
+    router.handle({
+      type: "agentManager.terminal.create",
+      createId: "new",
+      placement: "side",
+      worktreeId: null,
+    })
+    resolvers[0]?.({ data: { id: "pty-old", title: "Terminal 1" } })
+    await wait()
+
+    expect(messages).toHaveLength(1)
+    expect(messages[0]).toMatchObject({ type: "agentManager.terminal.created", createId: "new" })
+    expect(removed).toContain("pty-old")
+    await router.dispose()
+    expect(removed).toContain("pty-new")
+  })
+})
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
new file mode 100644
index 00000000000..199d3adca2b
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-side.test.ts
@@ -0,0 +1,92 @@
+import { describe, expect, it } from "bun:test"
+import { createSideTerminal } from "../../webview-ui/agent-manager/terminal/side"
+
+function scene(opts: { destination?: "vscode" | "agentManager"; visible?: boolean; focused?: boolean } = {}) {
+  const calls = {
+    requestSide: 0,
+    closeSide: 0,
+    hide: 0,
+    refocus: 0,
+    openVscode: 0,
+    posted: [] as Array<Record<string, unknown>>,
+    tracked: [] as string[],
+  }
+  let visible = opts.visible ?? false
+  let focused = opts.focused ?? false
+  const ctl = createSideTerminal({
+    handlers: {
+      requestSide: () => {
+        calls.requestSide++
+        visible = true
+      },
+      closeSide: () => {
+        calls.closeSide++
+        visible = false
+        return true
+      },
+    },
+    visible: () => visible,
+    focused: () => focused,
+    hide: () => {
+      calls.hide++
+      visible = false
+    },
+    refocus: () => calls.refocus++,
+    postMessage: (msg) => calls.posted.push(msg as Record<string, unknown>),
+    track: (button) => calls.tracked.push(button),
+    openVscode: () => calls.openVscode++,
+  })
+  if (opts.destination) ctl.setDestination(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 })
+    focused.ctl.toggle()
+    expect(focused.calls.hide).toBe(1)
+    expect(focused.calls.refocus).toBe(1)
+
+    const elsewhere = scene({ destination: "agentManager", visible: true, focused: false })
+    elsewhere.ctl.toggle()
+    expect(elsewhere.calls.hide).toBe(1)
+    expect(elsewhere.calls.refocus).toBe(0)
+
+    const hidden = scene({ destination: "agentManager", visible: false })
+    hidden.ctl.toggle()
+    expect(hidden.calls.requestSide).toBe(1)
+    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)
+
+    const elsewhere = scene({ focused: false })
+    expect(elsewhere.ctl.close()).toBe(true)
+    expect(elsewhere.calls.refocus).toBe(0)
+  })
+
+  it("routes the primary action by destination", () => {
+    const vscodeFirst = scene({ destination: "vscode" })
+    vscodeFirst.ctl.openPreferred("tab_toolbar")
+    expect(vscodeFirst.calls.openVscode).toBe(1)
+    expect(vscodeFirst.calls.requestSide).toBe(0)
+
+    const panelFirst = scene({ destination: "agentManager" })
+    panelFirst.ctl.openPreferred("keyboard_shortcut")
+    expect(panelFirst.calls.requestSide).toBe(1)
+    expect(panelFirst.calls.openVscode).toBe(0)
+  })
+
+  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" },
+    ])
+  })
+})
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
new file mode 100644
index 00000000000..432eed1fb6b
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-terminal-state.test.ts
@@ -0,0 +1,168 @@
+import { describe, expect, it } from "bun:test"
+import { createRoot, createSignal } from "solid-js"
+import { LOCAL } from "../../webview-ui/agent-manager/navigate"
+import {
+  createTerminalHandlers,
+  createTerminalMessageHandler,
+  createTerminalState,
+} from "../../webview-ui/agent-manager/terminal/state"
+import type { ExtensionMessage } from "../../webview-ui/src/types/messages/extension-messages"
+
+const font = { fontFamily: "Menlo", fontSize: 12 }
+
+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 tabs = () => state.current().map((term) => term.id)
+  const handlers = createTerminalHandlers({
+    state,
+    tabIds: tabs,
+    selectReview: () => undefined,
+    selectSessionTab: () => undefined,
+    clearSession: () => undefined,
+    resetOthers: () => undefined,
+    isPendingId: () => false,
+    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",
+  })
+  const dispatch = createTerminalMessageHandler({
+    state,
+    activate: (id) => events.activated.push(id),
+    saveTabMemory: () => events.saved++,
+    setSelection: (value) => {
+      events.selected.push(value)
+      setSelection(value)
+    },
+    showError: () => undefined,
+    postMessage: (message) => posted.push(message as Record<string, unknown>),
+  })
+  return { state, selection, setSelection, posted, events, handlers, dispatch }
+}
+
+describe("Agent Manager terminal state", () => {
+  it("keeps side terminals out of the tab state and shares root context with unassigned sessions", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.state.add(null, {
+        id: "terminal:tab",
+        title: "Terminal 1",
+        wsUrl: "ws://tab",
+        font,
+        placement: "tab",
+      })
+      item.state.add(null, {
+        id: "terminal:side",
+        title: "Terminal 2",
+        wsUrl: "ws://side",
+        font,
+        placement: "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")
+
+      item.setSelection(null)
+      expect(item.state.current()).toEqual([])
+      expect(item.state.sideKey()).toBe(LOCAL)
+      expect(item.state.side()?.id).toBe("terminal:side")
+      dispose()
+    })
+  })
+
+  it("deduplicates side creation and reuses the terminal without tab side effects", () => {
+    createRoot((dispose) => {
+      const item = scene()
+      item.handlers.requestSide()
+      item.handlers.requestSide()
+
+      expect(item.posted).toHaveLength(1)
+      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.events.activated).toEqual([])
+      expect(item.events.selected).toEqual([])
+      expect(item.events.saved).toBe(0)
+
+      item.handlers.requestSide()
+      expect(item.posted).toHaveLength(1)
+      expect(item.state.focusRequest()?.id).toBe("terminal:side")
+      dispose()
+    })
+  })
+
+  it("creates explicit terminal tabs independently of the side destination", () => {
+    createRoot((dispose) => {
+      const item = scene("wt-1")
+      item.handlers.requestNew()
+      expect(item.posted[0]).toMatchObject({
+        type: "agentManager.terminal.create",
+        placement: "tab",
+        worktreeId: "wt-1",
+      })
+      dispose()
+    })
+  })
+
+  it("cancels a side terminal that is still starting", () => {
+    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),
+        placement: "side",
+        worktreeId: null,
+        terminalId: "terminal:late",
+        title: "Terminal 1",
+        wsUrl: "ws://late",
+        font,
+      })
+      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", () => {
+    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)
+      dispose()
+    })
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/diff-session-source.test.ts b/packages/kilo-vscode/tests/unit/diff-session-source.test.ts
index ce870f0abbe..081fec45caf 100644
--- a/packages/kilo-vscode/tests/unit/diff-session-source.test.ts
+++ b/packages/kilo-vscode/tests/unit/diff-session-source.test.ts
@@ -91,6 +91,39 @@ describe("createSessionDiffSource.fetch", () => {
     expect(result.diffs[2]?.summarized).toBe(true)
   })
 
+  it("keeps valid files visible when one persisted patch is malformed", async () => {
+    const malformed = [
+      "diff --git a/broken.ts b/broken.ts",
+      "--- a/broken.ts",
+      "+++ b/broken.ts",
+      "@@ -1,2 +1,2 @@",
+      "-old",
+      "+new",
+      "",
+    ].join("\n")
+    const { fetch } = recording([
+      { file: "broken.ts", patch: malformed, additions: 1, deletions: 1, status: "modified" },
+      { file: "foo.ts", patch: modifiedPatch, additions: 1, deletions: 1, status: "modified" },
+    ])
+
+    const result = await createSessionDiffSource("s-malformed", fetch, "/repo").fetch()
+
+    expect(result.diffs).toHaveLength(2)
+    expect(result.diffs[0]).toMatchObject({
+      file: "broken.ts",
+      before: "",
+      after: "",
+      patch: malformed,
+      summarized: true,
+    })
+    expect(result.diffs[1]).toMatchObject({
+      file: "foo.ts",
+      before: "keep\nold\n",
+      after: "keep\nnew\n",
+      summarized: false,
+    })
+  })
+
   it("rebuilds text-backed SVG snapshot sides without sending them to Pierre", async () => {
     const before = '<svg xmlns="http://www.w3.org/2000/svg"><rect fill="red"/></svg>'
     const after = '<svg xmlns="http://www.w3.org/2000/svg"><rect fill="blue"/></svg>'
diff --git a/packages/kilo-vscode/tests/unit/early-message.test.ts b/packages/kilo-vscode/tests/unit/early-message.test.ts
new file mode 100644
index 00000000000..6075faff48a
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/early-message.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from "bun:test"
+import { routeEarlyMessage } from "../../src/kilo-provider/early-message"
+
+type Ctx = Parameters<typeof routeEarlyMessage>[1]
+
+function context(copied: string[], posted: unknown[], fail = false) {
+  return {
+    copy: async (text: string) => {
+      if (fail) throw new Error("clipboard unavailable")
+      copied.push(text)
+    },
+    post: (message: unknown) => posted.push(message),
+  } as Ctx
+}
+
+describe("routeEarlyMessage clipboard handling", () => {
+  it("routes clipboard text to the host", async () => {
+    const copied: string[] = []
+    const posted: unknown[] = []
+
+    const handled = await routeEarlyMessage(
+      { type: "copyToClipboard", id: "copy-1", text: "message text" },
+      context(copied, posted),
+    )
+
+    expect(handled).toBe(true)
+    expect(copied).toEqual(["message text"])
+    expect(posted).toEqual([{ type: "clipboardWriteResult", id: "copy-1", ok: true }])
+  })
+
+  it("reports host clipboard failures", async () => {
+    const copied: string[] = []
+    const posted: unknown[] = []
+
+    const handled = await routeEarlyMessage(
+      { type: "copyToClipboard", id: "copy-2", text: "message text" },
+      context(copied, posted, true),
+    )
+
+    expect(handled).toBe(true)
+    expect(copied).toEqual([])
+    expect(posted).toEqual([{ type: "clipboardWriteResult", id: "copy-2", ok: false, error: "clipboard unavailable" }])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/extension-arch.test.ts b/packages/kilo-vscode/tests/unit/extension-arch.test.ts
index 4ff0d758ec8..3e8e4d30677 100644
--- a/packages/kilo-vscode/tests/unit/extension-arch.test.ts
+++ b/packages/kilo-vscode/tests/unit/extension-arch.test.ts
@@ -16,6 +16,7 @@ const PKG_JSON_FILE = path.join(ROOT, "package.json")
 const SRC_DIR = path.join(ROOT, "src")
 const EXTENSION_FILE = path.join(ROOT, "src/extension.ts")
 const KILO_PROVIDER_FILE = path.join(ROOT, "src/KiloProvider.ts")
+const SETTINGS_PROVIDER_FILE = path.join(ROOT, "src/SettingsEditorProvider.ts")
 const VSCODE_HOST_FILE = path.join(ROOT, "src/agent-manager/vscode-host.ts")
 
 function sliceBlock(source: string, start: number): string {
@@ -116,6 +117,36 @@ describe("Extension — package.json command sync", () => {
     })
   })
 
+  it("keeps Agent Manager terminal shortcuts distinct", () => {
+    const terminal = pkg.contributes?.keybindings?.find(
+      (item: { command: string }) => item.command === "kilo-code.new.agentManager.showTerminal",
+    )
+    const create = pkg.contributes?.keybindings?.find(
+      (item: { command: string }) => item.command === "kilo-code.new.agentManager.newTerminal",
+    )
+    expect(terminal).toMatchObject({
+      key: "ctrl+/",
+      mac: "cmd+/",
+      when: "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel'",
+    })
+    expect(create).toMatchObject({
+      key: "ctrl+shift+t",
+      mac: "cmd+shift+t",
+      when: "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel'",
+    })
+  })
+
+  it("declares the Agent Manager terminal destination setting", () => {
+    const setting = pkg.contributes?.configuration?.properties?.["kilo-code.new.agentManager.terminalButtonDestination"]
+    expect(setting).toMatchObject({
+      type: "string",
+      scope: "application",
+      default: "vscode",
+      enum: ["vscode", "agentManager"],
+    })
+    expect(setting.enumDescriptions).toHaveLength(setting.enum.length)
+  })
+
   it("scopes the open PR shortcut to Agent Manager", () => {
     const binding = pkg.contributes?.keybindings?.find(
       (item: { command: string }) => item.command === "kilo-code.new.agentManager.openPR",
@@ -126,6 +157,23 @@ describe("Extension — package.json command sync", () => {
       when: "activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel'",
     })
   })
+
+  it("scopes agent mode shortcuts to focused Kilo webviews", () => {
+    const bindings = pkg.contributes?.keybindings?.filter(
+      (item: { command: string }) =>
+        item.command === "kilo-code.new.cycleAgentMode" || item.command === "kilo-code.new.cyclePreviousAgentMode",
+    )
+    const when =
+      "kilo-code.new.sidebarFocused || activeWebviewPanelId == 'kilo-code.new.AgentManagerPanel' || activeWebviewPanelId == 'kilo-code.new.TabPanel'"
+
+    expect(bindings).toHaveLength(2)
+    expect(bindings).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ command: "kilo-code.new.cycleAgentMode", when }),
+        expect.objectContaining({ command: "kilo-code.new.cyclePreviousAgentMode", when }),
+      ]),
+    )
+  })
 })
 
 // ---------------------------------------------------------------------------
@@ -202,6 +250,32 @@ describe("Extension — KiloProvider handler wiring", () => {
   })
 })
 
+describe("Extension — editor panel placement", () => {
+  const ext = fs.readFileSync(EXTENSION_FILE, "utf-8")
+  const settings = fs.readFileSync(SETTINGS_PROVIDER_FILE, "utf-8")
+
+  it("opens Kilo as a tab in the active editor group", () => {
+    const fn = ext.indexOf("function openKiloInNewTab")
+    expect(fn, "openKiloInNewTab must exist").toBeGreaterThan(-1)
+    const body = sliceBlock(ext, fn)
+
+    expect(body).toContain("vscode.ViewColumn.Active")
+    expect(body).not.toContain("visibleTextEditors")
+    expect(body).not.toContain("workbench.action.newGroupRight")
+    expect(body).not.toContain("workbench.action.lockEditorGroup")
+  })
+
+  it("opens and reveals Settings in the active editor group", () => {
+    const fn = settings.indexOf("openPanel(view")
+    expect(fn, "SettingsEditorProvider.openPanel must exist").toBeGreaterThan(-1)
+    const body = sliceBlock(settings, fn)
+
+    expect(body).toContain("existing.reveal(vscode.ViewColumn.Active)")
+    expect(body.match(/vscode\.ViewColumn\.Active/g)).toHaveLength(2)
+    expect(body).not.toContain("vscode.ViewColumn.One")
+  })
+})
+
 // ---------------------------------------------------------------------------
 // KiloProvider — continueInWorktree error fallback
 //
diff --git a/packages/kilo-vscode/tests/unit/i18n-unused-keys.test.ts b/packages/kilo-vscode/tests/unit/i18n-unused-keys.test.ts
new file mode 100644
index 00000000000..ec10e384eb3
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/i18n-unused-keys.test.ts
@@ -0,0 +1,153 @@
+/**
+ * Localization lint: unused translation keys (all Kilo-owned pools)
+ *
+ * Ensures every key in every Kilo-owned english dictionary is either
+ * referenced from repository source or explicitly protected as a runtime
+ * protocol key. Keys that lose their last usage during refactors tend to
+ * linger in all 20 locale files forever; this test fails for review instead.
+ *
+ * Complements i18n-keys.test.ts, which checks the opposite direction
+ * (t() calls referencing keys missing from the dictionaries).
+ *
+ * Covered pools:
+ *   app           webview sidebar dict (webview-ui/src/i18n)
+ *   kilo-i18n     shared webview overrides (packages/kilo-i18n)
+ *   agent-manager agent manager webview dict
+ *   cli-backend   extension server/remote dict
+ *   host          extension host dict (autocomplete)
+ *
+ * The upstream @opencode-ai/ui dict (packages/ui/src/i18n) is intentionally
+ * NOT covered: it is upstream-owned code where removals create merge
+ * conflicts, and its keys may be consumed by upstream surfaces outside
+ * this repo.
+ *
+ * This is intentionally conservative: false "used" results are acceptable,
+ * but a live key must never be classified as unused. A key counts as used
+ * when either:
+ *   - a quoted string literal equal to the key appears in scanned code
+ *     (covers t("key") calls, ternaries producing key strings, key strings
+ *     embedded in the CLI backend that travel to the webview as data, e.g.
+ *     provider metadata noteKeys in opencode/src/kilocode/provider), or
+ *   - a template literal with a static dotted head ending right before ${}
+ *     covers the key by prefix (e.g. t(`agentManager.setup.error.${code}`),
+ *     t(`workStyle.choice.${choice}.title`), const k = `a.b.${x}`).
+ *   - a quoted dotted prefix appears in production source (conservatively
+ *     covering concatenation and indirect prefix reuse), or
+ *   - the pool explicitly protects a runtime namespace used by backend
+ *     payloads. Add indirect/external keys there rather than deleting them.
+ */
+
+import { describe, it, expect } from "bun:test"
+import { Glob } from "bun"
+import path from "node:path"
+
+import { dict as appEn } from "../../webview-ui/src/i18n/en"
+import { dict as kiloEn } from "../../../kilo-i18n/src/en"
+import { dict as amEn } from "../../webview-ui/agent-manager/i18n/en"
+import { dict as cliEn } from "../../src/services/cli-backend/i18n/en"
+import { dict as hostEn } from "../../src/services/i18n/en"
+
+const REPO = path.resolve(import.meta.dir, "../../../..")
+const VSCODE = path.join(REPO, "packages/kilo-vscode")
+
+// Webview key strings are consumed not only in the webview itself but also
+// embedded as data in the CLI backend / extension host (provider metadata,
+// question flows), so those sources are scanned for webview pools too.
+const WEBVIEW_ROOTS = [
+  VSCODE,
+  path.join(REPO, "packages/kilo-ui"),
+  path.join(REPO, "packages/opencode"),
+  path.join(REPO, "packages/kilo-gateway"),
+]
+
+const pools = [
+  { name: "app", dict: appEn, roots: WEBVIEW_ROOTS, runtime: ["settings.providers.note."] },
+  // kilo-i18n also overrides upstream ui.* keys consumed by components in
+  // packages/ui/src (and the TUI), so those count as usage too.
+  {
+    name: "kilo-i18n",
+    dict: kiloEn,
+    roots: [...WEBVIEW_ROOTS, path.join(REPO, "packages/ui"), path.join(REPO, "packages/tui")],
+    runtime: ["plan.followup.", "snapshot.slowRepo.", "settings.providers.note."],
+  },
+  { name: "agent-manager", dict: amEn, roots: WEBVIEW_ROOTS, runtime: ["agentManager.setup.error."] },
+  { name: "cli-backend", dict: cliEn, roots: [VSCODE], runtime: [] },
+  { name: "host", dict: hostEn, roots: [VSCODE], runtime: [] },
+] as const
+
+const EXACT_RE = /["'`]([a-zA-Z][a-zA-Z0-9_]*(?:[.:][a-zA-Z0-9_]+)+)["'`]/g
+const DYNAMIC_RE = /`([a-zA-Z][a-zA-Z0-9_]*(?:[.:][a-zA-Z0-9_]+)*[.:])\$\{/g
+const PREFIX_RE = /["'`]([a-zA-Z][a-zA-Z0-9_]*(?:[.:][a-zA-Z0-9_]+)*[.:])["'`]/g
+const SOURCE_GLOB = "**/*.{ts,tsx,js,jsx,mjs,cjs,json,jsonc,json5,yaml,yml,toml,md,mdx,html,xml,properties,kt,kts,java}"
+const SKIP = ["/i18n/", "/tests/", "/test/", "/node_modules/", "/dist/", "/out/", "/build/", "/coverage/", "/.turbo/"]
+
+interface Usage {
+  exact: Set<string>
+  prefixes: Set<string>
+}
+
+const cache = new Map<string, Promise<Usage>>()
+
+function scan(root: string): Promise<Usage> {
+  const hit = cache.get(root)
+  if (hit) return hit
+  const job = (async (): Promise<Usage> => {
+    const glob = new Glob(SOURCE_GLOB)
+    const exact = new Set<string>()
+    const prefixes = new Set<string>()
+    for await (const file of glob.scan({ cwd: root, absolute: true })) {
+      // skip the locale dictionaries themselves — they contain every key
+      if (SKIP.some((part) => file.includes(part)) || file.includes(".test.") || file.includes(".spec.")) continue
+      const text = await Bun.file(file).text()
+      for (const match of text.matchAll(EXACT_RE)) {
+        const key = match[1]
+        if (!key) continue
+        exact.add(key)
+      }
+      for (const match of text.matchAll(DYNAMIC_RE)) {
+        if (match[1]) prefixes.add(match[1])
+      }
+      for (const match of text.matchAll(PREFIX_RE)) {
+        if (match[1]) prefixes.add(match[1])
+      }
+    }
+    return { exact, prefixes }
+  })()
+  cache.set(root, job)
+  return job
+}
+
+async function unused(
+  dict: Record<string, string>,
+  roots: readonly string[],
+  runtime: readonly string[],
+): Promise<string[]> {
+  const exact = new Set<string>()
+  const prefixes = new Set<string>()
+  for (const root of roots) {
+    const usage = await scan(root)
+    for (const key of usage.exact) exact.add(key)
+    for (const key of usage.prefixes) prefixes.add(key)
+  }
+  return Object.keys(dict).filter((key) => {
+    if (exact.has(key)) return false
+    if (runtime.some((prefix) => key.startsWith(prefix))) return false
+    for (const prefix of prefixes) {
+      if (key.startsWith(prefix)) return false
+    }
+    return true
+  })
+}
+
+describe("i18n — no unused keys", () => {
+  for (const pool of pools) {
+    it(`references every ${pool.name} dictionary key from code`, async () => {
+      const dead = await unused(pool.dict, pool.roots, pool.runtime)
+      const report = dead.map((key) => `  "${key}": "${pool.dict[key as keyof typeof pool.dict]}"`).join("\n")
+      expect(
+        dead,
+        `Found ${dead.length} apparently unused ${pool.name} i18n key(s). Do not delete automatically: verify runtime/external consumers, then either add a source reference, protect the runtime namespace in this test, or remove the key from every locale:\n${report}`,
+      ).toEqual([])
+    })
+  }
+})
diff --git a/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts b/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts
index 7c226ecaba0..3cef7f06794 100644
--- a/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts
+++ b/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts
@@ -19,6 +19,7 @@ import path from "node:path"
 
 const MONOREPO_ROOT = path.resolve(import.meta.dir, "../../../..")
 const KILO_UI_DIR = path.join(MONOREPO_ROOT, "packages/kilo-ui")
+const WORKER_URL = path.join(MONOREPO_ROOT, "packages/kilo-vscode/tests/setup/worker-url.ts")
 const BASIC_TOOL_FILE = path.join(MONOREPO_ROOT, "packages/ui/src/components/basic-tool.tsx")
 const DATA_CONTEXT_FILE = path.join(MONOREPO_ROOT, "packages/ui/src/context/data.tsx")
 const MESSAGE_PART_FILE = path.join(MONOREPO_ROOT, "packages/ui/src/components/message-part.tsx")
@@ -44,7 +45,7 @@ const TRANSCRIPT_PARTS_FILE = path.join(MONOREPO_ROOT, "packages/kilo-vscode/web
 const CHAT_LAYOUT_FILE = path.join(MONOREPO_ROOT, "packages/kilo-vscode/webview-ui/src/styles/chat-layout.css")
 
 function check(code: string): { ok: boolean; output: string } {
-  const result = Bun.spawnSync(["bun", "--conditions=browser", "-e", code], {
+  const result = Bun.spawnSync(["bun", "--preload", WORKER_URL, "--conditions=browser", "-e", code], {
     cwd: KILO_UI_DIR,
     stdout: "pipe",
     stderr: "pipe",
diff --git a/packages/kilo-vscode/tests/unit/markdown-raf-coalesce.test.ts b/packages/kilo-vscode/tests/unit/markdown-raf-coalesce.test.ts
deleted file mode 100644
index 8a582935abc..00000000000
--- a/packages/kilo-vscode/tests/unit/markdown-raf-coalesce.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { describe, it, expect } from "bun:test"
-import { readFileSync } from "node:fs"
-import { join } from "node:path"
-
-/**
- * Regression guard for the markdown rAF-coalesced parse fix.
- *
- * PROBLEM:
- *   The `Markdown` component's render effect did `temp.innerHTML = content`
- *   + `morphdom(...)` on every update. During LLM token streaming, this
- *   fired 60–200 times per second, reparsing the entire accumulated HTML
- *   every time. CPU profile of a 7s streaming window showed 2,940 ParseHTML
- *   events (~619ms, ~46% of blocked main-thread time).
- *
- * FIX:
- *   Queue the latest content in a component-scoped variable and run the
- *   morphdom pass inside a requestAnimationFrame callback. Further updates
- *   before the frame fires simply overwrite the pending content — K rapid
- *   token updates collapse to 1 parse. The onCleanup handler cancels any
- *   queued frame so it doesn't touch the unmounted DOM.
- *
- * For the matching runtime assertion, see
- * `tests/webview-reactivity/markdown-parse-rate.test.ts`.
- */
-describe("Markdown rAF-coalesced parse — regression guard", () => {
-  const path = join(__dirname, "..", "..", "..", "ui", "src", "components", "markdown.tsx")
-  const helper = join(__dirname, "..", "..", "..", "ui", "src", "kilocode", "markdown-stream-highlight.ts")
-
-  const stripComments = (src: string): string =>
-    src
-      .replace(/\/\*[\s\S]*?\*\//g, "")
-      .replace(/\{\/\*[\s\S]*?\*\/\}/g, "")
-      .replace(/^\s*\/\/.*$/gm, "")
-
-  const src = stripComments(readFileSync(path, "utf8"))
-  const body = stripComments(readFileSync(helper, "utf8"))
-
-  it("render effect uses requestAnimationFrame to coalesce parses", () => {
-    // Locate the createEffect that owns the morphdom call.
-    const match = src.match(/createEffect\s*\(\s*\(\s*\)\s*=>\s*\{[\s\S]*?morphdom\s*\([\s\S]*?^\s*\}\s*\)/m)
-    expect(match, "render createEffect must contain a morphdom call").toBeTruthy()
-    const body = match![0]
-    expect(body).toMatch(/requestAnimationFrame/)
-  })
-
-  it("cleans up the queued frame on dispose", () => {
-    expect(src).toMatch(/cancelAnimationFrame/)
-  })
-
-  it("exposes a pending frame/content state scoped to the component", () => {
-    // Any of these forms count. We just need the state to exist so that
-    // rapid updates can collapse into it.
-    expect(src).toMatch(/\b(pendingFrame|pendingContent)\b/)
-  })
-
-  it("delegates streamed Shiki refreshes to the Kilo-owned helper", () => {
-    expect(src).toContain("preserveStreamingHighlight(fromEl, toEl, local.streaming ?? false)")
-    expect(body).toContain("export function preserveStreamingHighlight")
-    expect(body).toMatch(/continues\(before, after\)[\s\S]*queue\(from, after, lang\)/)
-    expect(body).toMatch(/const done = \(\) => \{\s*job\.busy = false\s*if \(!pre\.isConnected\) return/)
-  })
-})
diff --git a/packages/kilo-vscode/tests/unit/session-agent.test.ts b/packages/kilo-vscode/tests/unit/session-agent.test.ts
index d72839a6f80..a6da4e4e177 100644
--- a/packages/kilo-vscode/tests/unit/session-agent.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-agent.test.ts
@@ -1,5 +1,6 @@
 import { describe, it, expect } from "bun:test"
 import {
+  cycleAgent,
   createDraftAgentSeed,
   draftAgentSelection,
   resolveSessionAgent,
@@ -81,6 +82,54 @@ describe("resolveSessionAgent", () => {
   })
 })
 
+describe("cycleAgent", () => {
+  const agents = [
+    { name: "ask", mode: "primary" },
+    { name: "plan", mode: "primary" },
+    { name: "task", mode: "subagent" },
+    { name: "hidden", mode: "primary", hidden: true },
+    { name: "code", mode: "primary" },
+  ]
+
+  function cycle(current: string, direction: 1 | -1, scope = "pending-1") {
+    const calls: Array<[string, string | undefined]> = []
+    const name = cycleAgent({
+      agents,
+      scope,
+      direction,
+      selected: (id) => {
+        expect(id).toBe(scope)
+        return current
+      },
+      select: (agent, id) => calls.push([agent, id]),
+    })
+    return { name, calls }
+  }
+
+  it("cycles the same pending scope read by the visible selector", () => {
+    expect(cycle("ask", 1)).toEqual({ name: "plan", calls: [["plan", "pending-1"]] })
+    expect(cycle("ask", -1)).toEqual({ name: "code", calls: [["code", "pending-1"]] })
+  })
+
+  it("wraps and starts from the first agent when the selection is unknown", () => {
+    expect(cycle("code", 1).name).toBe("ask")
+    expect(cycle("missing", 1).name).toBe("ask")
+  })
+
+  it("does nothing when there is no alternative", () => {
+    const selected: string[] = []
+    expect(
+      cycleAgent({
+        agents: [{ name: "code" }],
+        direction: 1,
+        selected: () => "code",
+        select: (name) => selected.push(name),
+      }),
+    ).toBeUndefined()
+    expect(selected).toEqual([])
+  })
+})
+
 describe("draftAgentSelection", () => {
   it("carries a pending agent into a new draft scope", () => {
     const result = draftAgentSelection({}, "draft-1", "plan")
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 da340afc0b9..4e763196bfa 100644
--- a/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
@@ -130,11 +130,6 @@ describe("SessionTerminalManager structure", () => {
     expect(text).toContain("panel command registration skipped")
   })
 
-  it("exposes active terminal state for terminal context routing", () => {
-    const text = body("hasActiveTerminal")
-    expect(text).toContain("this.host.activeTerminal()")
-  })
-
   it("resolves the session that owns the active managed terminal", () => {
     const text = body("activeSession")
     expect(text).toContain("this.host.activeTerminal()")
diff --git a/packages/kilo-vscode/tests/unit/transcript-parts.test.ts b/packages/kilo-vscode/tests/unit/transcript-parts.test.ts
index 8d0b9abccc3..c94054a5d5a 100644
--- a/packages/kilo-vscode/tests/unit/transcript-parts.test.ts
+++ b/packages/kilo-vscode/tests/unit/transcript-parts.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from "bun:test"
 import path from "node:path"
 
 const WEBVIEW = path.resolve(import.meta.dir, "../../webview-ui")
+const WORKER_URL = path.resolve(import.meta.dir, "../setup/worker-url.ts")
 const PASS = "TRANSCRIPT_PARTS_PASS"
 const FAIL = "TRANSCRIPT_PARTS_FAIL:"
 
@@ -61,7 +62,7 @@ const SCRIPT = `
 
 describe("transcript parts", () => {
   it("keeps timeline candidates aligned with visible transcript parts", () => {
-    const result = Bun.spawnSync(["bun", "--conditions=browser", "-e", SCRIPT], {
+    const result = Bun.spawnSync(["bun", "--preload", WORKER_URL, "--conditions=browser", "-e", SCRIPT], {
       cwd: WEBVIEW,
       stdout: "pipe",
       stderr: "pipe",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index 60252b3977b..ce6f795941b 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -13,7 +13,6 @@ import {
   type JSX,
 } from "solid-js"
 import type {
-  ExtensionMessage,
   AgentManagerRepoInfoMessage,
   AgentManagerWorktreeSetupMessage,
   AgentManagerStateMessage,
@@ -70,7 +69,6 @@ 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"
@@ -120,7 +118,15 @@ import { reorderTabs, applyTabOrder, firstOrderedTitle } from "./tab-order"
 import { createTabOrderSync } from "./tab-order-sync"
 import { reportRemoteSessions, reportVisibleSession, visible } from "./remote-sessions"
 import { ConstrainDragYAxis } from "../src/components/chat/TabDnd"
-import { isTerminalTabId, createTerminalState, createTerminalHandlers, createTerminalMessageHandler } from "./terminal"
+import {
+  SideTerminalPanel,
+  TerminalDestinationButton,
+  isTerminalTabId,
+  createTerminalState,
+  createTerminalHandlers,
+  createTerminalMessageHandler,
+  createSideTerminal,
+} from "./terminal"
 import { focusCurrentTab, renderTab, renderTerminalLayer, renderNewTabButton } from "./tab-rendering"
 import { useTabScroll } from "./tab-scroll"
 import { DiffPanel } from "./DiffPanel"
@@ -160,6 +166,7 @@ import { buildShortcutCategories } from "./shortcuts"
 import { tracker } from "./telemetry"
 import "./agent-manager.css"
 import "./agent-manager-review.css"
+import { cycleAgent as cycle } from "../src/context/session-agent"
 const REVIEW_TAB_ID = "review"
 
 interface SetupState {
@@ -184,7 +191,7 @@ interface ApplyState {
 }
 /** 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" | null
+type SidePanel = "diff" | "pr" | "terminal" | null
 const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent)
 // Fallback keybindings before extension sends resolved ones
 const MAX_JUMP_INDEX = 9
@@ -269,8 +276,8 @@ const AgentManagerContent: Component = () => {
   // rAF coalescing for resize handlers — at most one signal write per frame
   let sidebarRaf: number | undefined
   let pendingSidebarWidth: number | undefined
-  let diffRaf: number | undefined
-  let pendingDiffWidth: number | undefined
+  let sideRaf: number | undefined
+  let pendingSideWidth: number | undefined
 
   const [history, setHistory] = createSignal(false)
   const [sidePanel, setSidePanel] = createSignal<SidePanel>(null)
@@ -278,7 +285,33 @@ const AgentManagerContent: Component = () => {
   const [diffDatas, setDiffDatas] = createSignal<Record<string, WorktreeFileDiff[]>>({})
   const [diffLoading, setDiffLoading] = createSignal(false)
   const [diffFileLoading, setDiffFileLoading] = createSignal<Record<string, Record<string, true>>>({})
+  // 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
+  const TERMINAL_MAX_WIDTH = 640
   const [diffWidth, setDiffWidth] = createSignal(Math.round(window.innerWidth * 0.5))
+  const [terminalWidth, setTerminalWidth] = createSignal(
+    Math.min(TERMINAL_MAX_WIDTH, Math.max(TERMINAL_MIN_WIDTH, Math.round(window.innerWidth / 3))),
+  )
+  // The hidden-but-mounted host still fits the terminal, so pick the
+  // terminal's width whenever one is alive and no other mode is showing.
+  const widthMode = () => sidePanel() ?? (terms.sides().length > 0 ? "terminal" : null)
+  const hostWidth = () => (widthMode() === "terminal" ? terminalWidth() : diffWidth())
+  const sideMin = () => (widthMode() === "terminal" ? TERMINAL_MIN_WIDTH : 200)
+  const resizeSide = (width: number) => {
+    pendingSideWidth = Math.max(sideMin(), Math.min(width, window.innerWidth * 0.8))
+    if (sideRaf !== undefined) return
+    sideRaf = requestAnimationFrame(() => {
+      sideRaf = undefined
+      if (widthMode() === "terminal") setTerminalWidth(pendingSideWidth!)
+      else setDiffWidth(pendingSideWidth!)
+    })
+  }
+  const showSideTerminal = () => {
+    setHistory(false)
+    setReviewActive(false)
+    setSidePanel("terminal")
+  }
 
   const [reviewOpenByContext, setReviewOpenByContext] = createSignal<Record<string, boolean>>({})
   const [reviewCommentsByContext, setReviewCommentsByContext] = createSignal<Record<string, ReviewComment[]>>({})
@@ -1071,14 +1104,14 @@ const AgentManagerContent: Component = () => {
   }
 
   const cycleAgent = (direction: 1 | -1) => {
-    const available = session.agents().filter((a) => a.mode !== "subagent" && !a.hidden)
-    if (available.length <= 1) return
-    const current = session.selectedAgent()
-    const idx = available.findIndex((a) => a.name === current)
-    const raw = idx + direction
-    const next = raw < 0 ? available.length - 1 : raw >= available.length ? 0 : raw
-    const agent = available[next]
-    if (agent) session.selectAgent(agent.name)
+    const id = session.currentSessionID() ?? activePendingId()
+    cycle({
+      agents: session.agents(),
+      scope: id,
+      direction,
+      selected: session.selectedAgent,
+      select: session.selectAgent,
+    })
   }
 
   const syncRunStatuses = (items: RunStatus[] = []) => {
@@ -1103,12 +1136,7 @@ const AgentManagerContent: Component = () => {
           requestAnimationFrame(() => sidebarSearchMenu?.open())
         }
       } else if (msg.action === "showTerminal") {
-        // Cmd+/ opens the legacy VS Code integrated terminal for the
-        // active session (or local). The new xterm tab affordance has
-        // its own keybind (Cmd+Shift+T) so both coexist.
-        const id = session.currentSessionID()
-        if (id) vscode.postMessage({ type: "agentManager.showTerminal", sessionId: id })
-        else if (selection() === LOCAL) vscode.postMessage({ type: "agentManager.showLocalTerminal" })
+        sideCtl.openPreferred("keyboard_shortcut")
       } else if (msg.action === "toggleDiff") {
         if (reviewActive()) {
           closeReviewTab()
@@ -1248,7 +1276,14 @@ const AgentManagerContent: Component = () => {
       setSelection,
       showError: (message) =>
         showToast({ variant: "error", title: t("agentManager.terminal.errorTitle"), description: message }),
+      postMessage: (message) => vscode.postMessage(message as never),
       onCreated: (contextKey, terminalId) => appendToTabOrder(contextKey, terminalId),
+      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)
+      },
+      onDestinationChanged: (destination) => sideCtl.setDestination(destination),
     })
     const unsubTerminals = vscode.onMessage((msg) => {
       terminalDispatch(msg)
@@ -2056,11 +2091,30 @@ const AgentManagerContent: Component = () => {
     findTab: (id) => tabLookup().get(id),
     postMessage: (msg) => vscode.postMessage(msg as never),
     onRemove: freezeTabs,
+    onShowSide: showSideTerminal,
+    onHideSide: () => {
+      if (sidePanel() === "terminal") setSidePanel(null)
+    },
     getSelection: selection,
     LOCAL,
     REVIEW_TAB_ID,
   })
 
+  const sideCtl = createSideTerminal({
+    handlers: termHandlers,
+    visible: () => sidePanel() === "terminal",
+    focused: () => terms.focusedId() !== undefined && terms.focusedId() === terms.side()?.id,
+    hide: () => 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" })
+    },
+  })
+
   const handleReviewTabMouseDown = (e: MouseEvent) => {
     if (e.button !== 1) return
     e.preventDefault()
@@ -2159,6 +2213,12 @@ const AgentManagerContent: Component = () => {
   // Close the currently active tab via keyboard shortcut.
   // If no tabs remain, fall through to close the selected worktree.
   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) {
+      if (sideCtl.close()) return
+    }
     if (termHandlers.closeActive()) {
       tabFocus.restore()
       return
@@ -2814,28 +2874,17 @@ const AgentManagerContent: Component = () => {
                     />
                   </Tooltip>
                 </Show>
-                {/* Legacy VS Code integrated terminal shortcut. Coexists
-                    with the xterm terminal tabs (accessed via the `+`
-                    split-button or Cmd+Shift+T): Cmd+/ still opens the
-                    integrated terminal for the active session. */}
-                <TooltipKeybind
-                  title={t("agentManager.tab.terminal")}
-                  keybind={kb().showTerminal ?? ""}
-                  placement="bottom"
-                >
-                  <IconButton
-                    icon="console"
-                    size="small"
-                    variant="ghost"
-                    label={t("agentManager.tab.openTerminal")}
-                    onClick={() => {
-                      metrics.track("vscode_terminal", "tab_toolbar")
-                      const id = session.currentSessionID()
-                      if (id) vscode.postMessage({ type: "agentManager.showTerminal", sessionId: id })
-                      else if (selection() === LOCAL) vscode.postMessage({ type: "agentManager.showLocalTerminal" })
-                    }}
-                  />
-                </TooltipKeybind>
+                {/* 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>
@@ -2985,24 +3034,26 @@ const AgentManagerContent: Component = () => {
                   </Show>
                 </div>
               </div>
-              <Show when={sidePanel() !== null}>
-                <div class="am-diff-resize" style={{ width: `${diffWidth()}px` }}>
-                  <ResizeHandle
-                    direction="horizontal"
-                    edge="start"
-                    size={diffWidth()}
-                    min={200}
-                    max={Math.round(window.innerWidth * 0.8)}
-                    onResize={(w) => {
-                      pendingDiffWidth = Math.max(200, Math.min(w, window.innerWidth * 0.8))
-                      if (diffRaf === undefined) {
-                        diffRaf = requestAnimationFrame(() => {
-                          diffRaf = undefined
-                          setDiffWidth(pendingDiffWidth!)
-                        })
-                      }
-                    }}
-                  />
+              {/* One inspector host for all right-side modes. It stays
+                  mounted while a side terminal is alive — hidden via
+                  .am-side-host-hidden (absolute + opacity), never
+                  unmounted, so xterm render loops keep streaming. */}
+              <Show when={sidePanel() !== null || terms.sides().length > 0}>
+                <div
+                  class={`am-diff-resize ${sidePanel() === null ? "am-side-host-hidden" : ""}`}
+                  style={{ width: `${hostWidth()}px` }}
+                  inert={sidePanel() === null}
+                >
+                  <Show when={sidePanel() !== null}>
+                    <ResizeHandle
+                      direction="horizontal"
+                      edge="start"
+                      size={hostWidth()}
+                      min={sideMin()}
+                      max={Math.round(window.innerWidth * 0.8)}
+                      onResize={resizeSide}
+                    />
+                  </Show>
                   <div class="am-diff-panel-wrapper">
                     <Show when={sidePanel() === "diff"}>
                       <DiffPanel
@@ -3037,6 +3088,13 @@ const AgentManagerContent: Component = () => {
                         activeTerminalId={terms.activeId()}
                       />
                     </Show>
+                    <SideTerminalPanel
+                      state={terms}
+                      contextKey={terms.sideKey}
+                      visible={() => sidePanel() === "terminal"}
+                      onClose={() => sideCtl.close()}
+                      onStart={() => termHandlers.requestSide()}
+                    />
                   </div>
                 </div>
               </Show>
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 97113821690..6cfde9cf3bb 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
@@ -2515,6 +2515,13 @@ body.am-wt-dragging-active * {
   min-width: 250px;
 }
 
+/* Fixed-width slot so menu items with and without a check mark align. */
+.am-menu-check {
+  display: flex;
+  flex-shrink: 0;
+  width: 16px;
+}
+
 .am-split-menu [data-slot="dropdown-menu-item"] {
   padding: 6px 10px;
 }
@@ -4535,6 +4542,75 @@ body.vscode-high-contrast-light {
   z-index: 1;
 }
 
+/* Side terminal panel — lives inside .am-diff-panel-wrapper next to the
+   diff and PR panels. Header reuses .am-diff-header metrics so the
+   chrome does not shift when switching inspector modes. Visibility is
+   opacity-only: the xterm render loop dies if the subtree leaves the
+   paint tree. */
+.am-side-terminal {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  min-height: 0;
+  opacity: 0;
+  pointer-events: none;
+  z-index: 1;
+  background: var(--vscode-terminal-background, #1e1e1e);
+  /* Force a dedicated compositor layer so opacity flips do not
+     re-lay-out the xterm canvases underneath. */
+  will-change: opacity;
+}
+
+.am-side-terminal-visible {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+.am-side-terminal-layer {
+  position: relative;
+  flex: 1;
+  min-width: 0;
+  min-height: 0;
+  opacity: 0;
+  pointer-events: none;
+}
+
+.am-side-terminal-layer-active {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+.am-side-terminal-state {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: var(--text-weak);
+  font-size: var(--font-size-small);
+  background: var(--vscode-terminal-background, #1e1e1e);
+}
+
+.am-side-terminal-empty {
+  color: var(--text-weak);
+}
+
+/* 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). */
+.am-side-host-hidden {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  opacity: 0;
+  pointer-events: none;
+}
+
 .am-terminal-host {
   flex: 1;
   min-height: 0;
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 c930131f420..79d4b74c51e 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "نسخ المسار",
   "agentManager.worktree.openInVscode": "فتح في VS Code",
   "agentManager.worktree.rename": "إعادة تسمية",
-  "agentManager.worktree.moveToSection": "نقل إلى القسم",
   "agentManager.worktree.newSection": "قسم جديد",
   "agentManager.worktree.ungrouped": "غير مجمع",
   "agentManager.section.rename": "إعادة تسمية القسم",
   "agentManager.section.setColor": "تعيين اللون",
   "agentManager.section.delete": "حذف القسم",
-  "agentManager.section.defaultColor": "افتراضي",
   "agentManager.section.defaultName": "قسم جديد",
   "agentManager.section.moveUp": "تحريك لأعلى",
   "agentManager.section.moveDown": "تحريك لأسفل",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "الفرع",
   "agentManager.hoverCard.base": "الأساس",
   "agentManager.hoverCard.sessions": "الجلسات",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "علامة تبويب جديدة للمحطة الطرفية",
   "agentManager.terminal.ended": "انتهت المحطة الطرفية — أغلق علامة التبويب للإخفاء",
   "agentManager.terminal.connectionError": "خطأ في اتصال المحطة الطرفية",
+  "agentManager.terminal.kill": "إنهاء المحطة الطرفية",
+  "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": "فشل إعداد مساحة العمل",
   "agentManager.setup.settingUp": "جارٍ إعداد مساحة العمل",
@@ -126,7 +129,6 @@ export const dict = {
   "agentManager.dialog.creating": "جارٍ الإنشاء...",
   "agentManager.dialog.createWorktree": "إنشاء شجرة العمل",
   "agentManager.dialog.removeImage": "إزالة الصورة",
-  "agentManager.dialog.advanced": "متقدم...",
 
   "agentManager.diff.toggle": "تبديل الفرق",
   "agentManager.diff.openFile": "فتح الملف",
@@ -135,19 +137,13 @@ export const dict = {
   "agentManager.diff.revertError": "فشل الاستعادة",
   "agentManager.open.button": "فتح",
   "agentManager.open.tooltip": "فتح Worktree هذا في VS Code",
-  "agentManager.apply.button": "تطبيق محليًا",
   "agentManager.apply.globalButton": "تطبيق",
   "agentManager.apply.tooltip": "تطبيق تغييرات شجرة العمل المحددة على الفرع المحلي",
   "agentManager.apply.dialogTitle": "تطبيق التغييرات على الفرع المحلي",
   "agentManager.apply.confirm": "تطبيق الآن",
-  "agentManager.apply.retry": "إعادة محاولة التطبيق",
-  "agentManager.apply.previewTitle": "تطبيق هذه التغييرات على الفرع المحلي؟",
-  "agentManager.apply.previewSummary": "{{files}} ملفات، +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} من {{total}} ملفات محددة",
   "agentManager.apply.selectAll": "تحديد الكل",
   "agentManager.apply.selectNone": "إلغاء تحديد الكل",
-  "agentManager.apply.moreFiles": "+{{count}} المزيد",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} المزيد)",
   "agentManager.apply.checking": "جارٍ التحقق...",
   "agentManager.apply.applying": "جارٍ التطبيق...",
   "agentManager.apply.success": "تم تطبيق التغييرات",
@@ -160,9 +156,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "لا يمكن تطبيق التصحيح بشكل نظيف",
   "agentManager.apply.reason.contents": "لا يمكن قراءة محتويات الملف المحلي الحالي",
   "agentManager.apply.reason.unknown": "تم اكتشاف تعارض",
-  "agentManager.apply.inline.success": "تم التطبيق",
-  "agentManager.apply.inline.conflict": "تعارضات",
-  "agentManager.apply.inline.error": "فشل",
   "agentManager.shortcuts.toggleDiff": "تبديل لوحة الفرق",
   "agentManager.shortcuts.category.quickSwitch": "التبديل السريع",
   "agentManager.shortcuts.jumpToItem": "الانتقال إلى العنصر 1\u20139",
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 03efd3495c9..67cdb9bcf34 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Copiar Caminho",
   "agentManager.worktree.openInVscode": "Abrir no VS Code",
   "agentManager.worktree.rename": "Renomear",
-  "agentManager.worktree.moveToSection": "Mover para a Seção",
   "agentManager.worktree.newSection": "Nova Seção",
   "agentManager.worktree.ungrouped": "Não Agrupado",
   "agentManager.section.rename": "Renomear Seção",
   "agentManager.section.setColor": "Definir Cor",
   "agentManager.section.delete": "Excluir Seção",
-  "agentManager.section.defaultColor": "Padrão",
   "agentManager.section.defaultName": "Nova Seção",
   "agentManager.section.moveUp": "Mover para Cima",
   "agentManager.section.moveDown": "Mover para Baixo",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessões",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "Nova aba de terminal",
   "agentManager.terminal.ended": "terminal encerrado — feche a aba para dispensar",
   "agentManager.terminal.connectionError": "erro de conexão do terminal",
+  "agentManager.terminal.kill": "Encerrar 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",
+  "agentManager.terminal.openInVscode": "Terminal do VS Code",
+  "agentManager.terminal.openInPanel": "Painel do Agent Manager",
   "agentManager.terminal.errorTitle": "Erro no terminal",
   "agentManager.setup.failed": "Falha na configuração do worktree",
   "agentManager.setup.settingUp": "Configurando worktree",
@@ -129,7 +132,6 @@ export const dict = {
   "agentManager.dialog.creating": "Criando...",
   "agentManager.dialog.createWorktree": "Criar Worktree",
   "agentManager.dialog.removeImage": "Remover imagem",
-  "agentManager.dialog.advanced": "Avançado...",
 
   "agentManager.diff.toggle": "Alternar diff",
   "agentManager.diff.openFile": "Abrir arquivo",
@@ -138,19 +140,13 @@ export const dict = {
   "agentManager.diff.revertError": "Falha ao reverter",
   "agentManager.open.button": "Abrir",
   "agentManager.open.tooltip": "Abrir este Worktree no VS Code",
-  "agentManager.apply.button": "Aplicar localmente",
   "agentManager.apply.globalButton": "Aplicar",
   "agentManager.apply.tooltip": "Aplicar alterações da worktree selecionada na branch local",
   "agentManager.apply.dialogTitle": "Aplicar alterações na branch local",
   "agentManager.apply.confirm": "Aplicar agora",
-  "agentManager.apply.retry": "Tentar aplicar novamente",
-  "agentManager.apply.previewTitle": "Aplicar essas alterações na branch local?",
-  "agentManager.apply.previewSummary": "{{files}} arquivos, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} de {{total}} arquivos selecionados",
   "agentManager.apply.selectAll": "Selecionar todos",
   "agentManager.apply.selectNone": "Desmarcar todos",
-  "agentManager.apply.moreFiles": "+{{count}} mais",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} mais)",
   "agentManager.apply.checking": "Verificando...",
   "agentManager.apply.applying": "Aplicando...",
   "agentManager.apply.success": "Alterações aplicadas",
@@ -163,9 +159,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "O patch não pode ser aplicado de forma limpa",
   "agentManager.apply.reason.contents": "Não é possível ler o conteúdo do arquivo local atual",
   "agentManager.apply.reason.unknown": "Conflito detectado",
-  "agentManager.apply.inline.success": "Aplicado",
-  "agentManager.apply.inline.conflict": "Conflitos",
-  "agentManager.apply.inline.error": "Falhou",
   "agentManager.shortcuts.toggleDiff": "Alternar painel de diff",
   "agentManager.shortcuts.category.quickSwitch": "Troca rápida",
   "agentManager.shortcuts.jumpToItem": "Ir para o item 1\u20139",
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 09f813f7d04..f6fddfd6127 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Kopiraj putanju",
   "agentManager.worktree.openInVscode": "Otvori u VS Code",
   "agentManager.worktree.rename": "Preimenuj",
-  "agentManager.worktree.moveToSection": "Premjesti u sekciju",
   "agentManager.worktree.newSection": "Nova sekcija",
   "agentManager.worktree.ungrouped": "Bez grupe",
   "agentManager.section.rename": "Preimenuj sekciju",
   "agentManager.section.setColor": "Postavi boju",
   "agentManager.section.delete": "Izbriši sekciju",
-  "agentManager.section.defaultColor": "Zadano",
   "agentManager.section.defaultName": "Nova sekcija",
   "agentManager.section.moveUp": "Pomjeri gore",
   "agentManager.section.moveDown": "Pomjeri dolje",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Baza",
   "agentManager.hoverCard.sessions": "Sesije",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "Nova kartica terminala",
   "agentManager.terminal.ended": "terminal je završen — zatvorite karticu da biste odbacili",
   "agentManager.terminal.connectionError": "greška u vezi terminala",
+  "agentManager.terminal.kill": "Prekini terminal",
+  "agentManager.terminal.empty": "Ovdje još nema terminala",
+  "agentManager.terminal.start": "Pokreni terminal",
+  "agentManager.terminal.destination": "Odaberite šta otvara dugme terminala",
+  "agentManager.terminal.openInVscode": "VS Code terminal",
+  "agentManager.terminal.openInPanel": "Panel Agent Managera",
   "agentManager.terminal.errorTitle": "Greška terminala",
   "agentManager.setup.failed": "Postavljanje radnog prostora neuspješno",
   "agentManager.setup.settingUp": "Postavljanje radnog prostora",
@@ -129,7 +132,6 @@ export const dict = {
   "agentManager.dialog.creating": "Kreiranje...",
   "agentManager.dialog.createWorktree": "Kreiraj worktree",
   "agentManager.dialog.removeImage": "Ukloni sliku",
-  "agentManager.dialog.advanced": "Napredno...",
 
   "agentManager.diff.toggle": "Prebaci diff",
   "agentManager.diff.openFile": "Otvori datoteku",
@@ -138,19 +140,13 @@ export const dict = {
   "agentManager.diff.revertError": "Vraćanje neuspješno",
   "agentManager.open.button": "Otvori",
   "agentManager.open.tooltip": "Otvori ovaj worktree u VS Code-u",
-  "agentManager.apply.button": "Primijeni lokalno",
   "agentManager.apply.globalButton": "Primijeni",
   "agentManager.apply.tooltip": "Primijeni promjene odabranog radnog stabla na lokalnu granu",
   "agentManager.apply.dialogTitle": "Primijeni promjene na lokalnu granu",
   "agentManager.apply.confirm": "Primijeni sada",
-  "agentManager.apply.retry": "Ponovo pokušaj primjenu",
-  "agentManager.apply.previewTitle": "Primijeniti ove promjene na lokalnu granu?",
-  "agentManager.apply.previewSummary": "{{files}} datoteka, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} od {{total}} datoteka odabrano",
   "agentManager.apply.selectAll": "Odaberi sve",
   "agentManager.apply.selectNone": "Poništi odabir",
-  "agentManager.apply.moreFiles": "+{{count}} više",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} više)",
   "agentManager.apply.checking": "Provjera...",
   "agentManager.apply.applying": "Primjenjivanje...",
   "agentManager.apply.success": "Promjene primijenjene",
@@ -163,9 +159,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Zakrpa se ne može čisto primijeniti",
   "agentManager.apply.reason.contents": "Nije moguće pročitati sadržaj trenutne lokalne datoteke",
   "agentManager.apply.reason.unknown": "Otkriven konflikt",
-  "agentManager.apply.inline.success": "Primijenjeno",
-  "agentManager.apply.inline.conflict": "Konflikti",
-  "agentManager.apply.inline.error": "Neuspjelo",
   "agentManager.shortcuts.toggleDiff": "Prebaci panel za diff",
   "agentManager.shortcuts.category.quickSwitch": "Brzo prebacivanje",
   "agentManager.shortcuts.jumpToItem": "Idi na stavku 1\u20139",
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 f7dfe7697d9..beb827b1c9d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Kopier sti",
   "agentManager.worktree.openInVscode": "Åbn i VS Code",
   "agentManager.worktree.rename": "Omdøb",
-  "agentManager.worktree.moveToSection": "Flyt til sektion",
   "agentManager.worktree.newSection": "Ny sektion",
   "agentManager.worktree.ungrouped": "Ugrupperet",
   "agentManager.section.rename": "Omdøb sektion",
   "agentManager.section.setColor": "Indstil farve",
   "agentManager.section.delete": "Slet sektion",
-  "agentManager.section.defaultColor": "Standard",
   "agentManager.section.defaultName": "Ny sektion",
   "agentManager.section.moveUp": "Flyt op",
   "agentManager.section.moveDown": "Flyt ned",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessioner",
@@ -63,6 +60,12 @@ export const dict = {
   "agentManager.terminal.new": "Ny terminalfane",
   "agentManager.terminal.ended": "terminal afsluttet — luk fanen for at fjerne",
   "agentManager.terminal.connectionError": "forbindelsesfejl til terminal",
+  "agentManager.terminal.kill": "Afslut terminal",
+  "agentManager.terminal.empty": "Ingen terminal her endnu",
+  "agentManager.terminal.start": "Start terminal",
+  "agentManager.terminal.destination": "Vælg, hvad terminalknappen åbner",
+  "agentManager.terminal.openInVscode": "VS Code-terminal",
+  "agentManager.terminal.openInPanel": "Agent Manager-panel",
   "agentManager.terminal.errorTitle": "Terminalfejl",
   "agentManager.setup.failed": "Opsætning af worktree mislykkedes",
   "agentManager.setup.settingUp": "Opsætter worktree",
@@ -130,7 +133,6 @@ export const dict = {
   "agentManager.dialog.creating": "Opretter...",
   "agentManager.dialog.createWorktree": "Opret Worktree",
   "agentManager.dialog.removeImage": "Fjern billede",
-  "agentManager.dialog.advanced": "Avanceret...",
 
   "agentManager.diff.toggle": "Skift diff",
   "agentManager.diff.openFile": "Åbn fil",
@@ -139,19 +141,13 @@ export const dict = {
   "agentManager.diff.revertError": "Gendannelse fejlede",
   "agentManager.open.button": "Åbn",
   "agentManager.open.tooltip": "Åbn dette Worktree i VS Code",
-  "agentManager.apply.button": "Anvend lokalt",
   "agentManager.apply.globalButton": "Anvend",
   "agentManager.apply.tooltip": "Anvend valgte worktree-ændringer på den lokale gren",
   "agentManager.apply.dialogTitle": "Anvend ændringer på den lokale gren",
   "agentManager.apply.confirm": "Anvend nu",
-  "agentManager.apply.retry": "Prøv at anvende igen",
-  "agentManager.apply.previewTitle": "Anvend disse ændringer på den lokale gren?",
-  "agentManager.apply.previewSummary": "{{files}} filer, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} af {{total}} filer valgt",
   "agentManager.apply.selectAll": "Vælg alle",
   "agentManager.apply.selectNone": "Fravælg alle",
-  "agentManager.apply.moreFiles": "+{{count}} flere",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} flere)",
   "agentManager.apply.checking": "Kontrollerer...",
   "agentManager.apply.applying": "Anvender...",
   "agentManager.apply.success": "Ændringer anvendt",
@@ -164,9 +160,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Patch kan ikke anvendes rent",
   "agentManager.apply.reason.contents": "Kan ikke læse det aktuelle lokale filindhold",
   "agentManager.apply.reason.unknown": "Konflikt opdaget",
-  "agentManager.apply.inline.success": "Anvendt",
-  "agentManager.apply.inline.conflict": "Konflikter",
-  "agentManager.apply.inline.error": "Mislykkedes",
   "agentManager.shortcuts.toggleDiff": "Skift diff-panel",
   "agentManager.shortcuts.category.quickSwitch": "Hurtigskift",
   "agentManager.shortcuts.jumpToItem": "Hop til element 1\u20139",
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 e116ebd4f81..b9691ecbafd 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Pfad kopieren",
   "agentManager.worktree.openInVscode": "In VS Code öffnen",
   "agentManager.worktree.rename": "Umbenennen",
-  "agentManager.worktree.moveToSection": "In Bereich verschieben",
   "agentManager.worktree.newSection": "Neuer Bereich",
   "agentManager.worktree.ungrouped": "Nicht gruppiert",
   "agentManager.section.rename": "Bereich umbenennen",
   "agentManager.section.setColor": "Farbe festlegen",
   "agentManager.section.delete": "Bereich löschen",
-  "agentManager.section.defaultColor": "Standard",
   "agentManager.section.defaultName": "Neuer Bereich",
   "agentManager.section.moveUp": "Nach oben verschieben",
   "agentManager.section.moveDown": "Nach unten verschieben",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Basis",
   "agentManager.hoverCard.sessions": "Sitzungen",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "Neuer Terminal-Tab",
   "agentManager.terminal.ended": "Terminal beendet — Tab schließen zum Verwerfen",
   "agentManager.terminal.connectionError": "Verbindungsfehler im Terminal",
+  "agentManager.terminal.kill": "Terminal beenden",
+  "agentManager.terminal.empty": "Hier ist noch kein Terminal",
+  "agentManager.terminal.start": "Terminal starten",
+  "agentManager.terminal.destination": "Auswählen, was die Terminal-Schaltfläche öffnet",
+  "agentManager.terminal.openInVscode": "VS Code-Terminal",
+  "agentManager.terminal.openInPanel": "Agent Manager-Panel",
   "agentManager.terminal.errorTitle": "Terminal-Fehler",
   "agentManager.setup.failed": "Einrichtung des Arbeitsbereichs fehlgeschlagen",
   "agentManager.setup.settingUp": "Arbeitsbereich wird eingerichtet",
@@ -130,7 +133,6 @@ export const dict = {
   "agentManager.dialog.creating": "Wird erstellt...",
   "agentManager.dialog.createWorktree": "Worktree erstellen",
   "agentManager.dialog.removeImage": "Bild entfernen",
-  "agentManager.dialog.advanced": "Erweitert...",
 
   "agentManager.diff.toggle": "Diff umschalten",
   "agentManager.diff.openFile": "Datei öffnen",
@@ -139,19 +141,13 @@ export const dict = {
   "agentManager.diff.revertError": "Zurücksetzen fehlgeschlagen",
   "agentManager.open.button": "Öffnen",
   "agentManager.open.tooltip": "Dieses Worktree in VS Code öffnen",
-  "agentManager.apply.button": "Lokal anwenden",
   "agentManager.apply.globalButton": "Anwenden",
   "agentManager.apply.tooltip": "Ausgewählte Worktree-Änderungen auf den lokalen Branch anwenden",
   "agentManager.apply.dialogTitle": "Änderungen auf den lokalen Branch anwenden",
   "agentManager.apply.confirm": "Jetzt anwenden",
-  "agentManager.apply.retry": "Anwenden erneut versuchen",
-  "agentManager.apply.previewTitle": "Diese Änderungen auf den lokalen Branch anwenden?",
-  "agentManager.apply.previewSummary": "{{files}} Dateien, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} von {{total}} Dateien ausgewählt",
   "agentManager.apply.selectAll": "Alle auswählen",
   "agentManager.apply.selectNone": "Keine auswählen",
-  "agentManager.apply.moreFiles": "+{{count}} weitere",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} weitere)",
   "agentManager.apply.checking": "Prüfe...",
   "agentManager.apply.applying": "Wird angewendet...",
   "agentManager.apply.success": "Änderungen angewendet",
@@ -164,9 +160,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Patch kann nicht sauber angewendet werden",
   "agentManager.apply.reason.contents": "Inhalt der aktuellen lokalen Datei kann nicht gelesen werden",
   "agentManager.apply.reason.unknown": "Konflikt erkannt",
-  "agentManager.apply.inline.success": "Angewendet",
-  "agentManager.apply.inline.conflict": "Konflikte",
-  "agentManager.apply.inline.error": "Fehlgeschlagen",
   "agentManager.shortcuts.toggleDiff": "Diff-Panel umschalten",
   "agentManager.shortcuts.category.quickSwitch": "Schnellwechsel",
   "agentManager.shortcuts.jumpToItem": "Zu Element 1\u20139 springen",
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 02bc4333cc1..236f18423a4 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
@@ -22,17 +22,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Copy Path",
   "agentManager.worktree.openInVscode": "Open in VS Code",
   "agentManager.worktree.rename": "Rename",
-  "agentManager.worktree.moveToSection": "Move to Section",
   "agentManager.worktree.newSection": "New Section",
   "agentManager.worktree.ungrouped": "Ungrouped",
   "agentManager.section.rename": "Rename Section",
   "agentManager.section.setColor": "Set Color",
   "agentManager.section.delete": "Delete Section",
-  "agentManager.section.defaultColor": "Default",
   "agentManager.section.defaultName": "New Section",
   "agentManager.section.moveUp": "Move Up",
   "agentManager.section.moveDown": "Move Down",
-  "agentManager.section.count": "{{count}}",
 
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Base",
@@ -65,6 +62,12 @@ export const dict = {
   "agentManager.terminal.new": "New Terminal Tab",
   "agentManager.terminal.ended": "terminal ended — close tab to dismiss",
   "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",
+  "agentManager.terminal.openInVscode": "VS Code terminal",
+  "agentManager.terminal.openInPanel": "Agent Manager panel",
   "agentManager.terminal.errorTitle": "Terminal error",
 
   "agentManager.setup.failed": "Worktree setup failed",
@@ -132,7 +135,6 @@ export const dict = {
   "agentManager.dialog.creating": "Creating...",
   "agentManager.dialog.createWorktree": "Create Worktree",
   "agentManager.dialog.removeImage": "Remove image",
-  "agentManager.dialog.advanced": "Advanced...",
   "agentManager.dialog.configureWorktree": "Configure New Worktree...",
 
   "agentManager.diff.toggle": "Toggle diff",
@@ -142,19 +144,13 @@ export const dict = {
   "agentManager.diff.revertError": "Revert failed",
   "agentManager.open.button": "Open",
   "agentManager.open.tooltip": "Open this worktree in VS Code",
-  "agentManager.apply.button": "Apply to local",
   "agentManager.apply.globalButton": "Apply",
   "agentManager.apply.tooltip": "Apply selected worktree changes to local branch",
   "agentManager.apply.dialogTitle": "Apply changes to local branch",
   "agentManager.apply.confirm": "Apply now",
-  "agentManager.apply.retry": "Retry apply",
-  "agentManager.apply.previewTitle": "Apply these changes to local branch?",
-  "agentManager.apply.previewSummary": "{{files}} files, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} of {{total}} files selected",
   "agentManager.apply.selectAll": "Select all",
   "agentManager.apply.selectNone": "Select none",
-  "agentManager.apply.moreFiles": "+{{count}} more",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} more)",
   "agentManager.apply.checking": "Checking...",
   "agentManager.apply.applying": "Applying...",
   "agentManager.apply.success": "Changes applied",
@@ -167,9 +163,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Patch cannot be applied cleanly",
   "agentManager.apply.reason.contents": "Cannot read current local file contents",
   "agentManager.apply.reason.unknown": "Conflict detected",
-  "agentManager.apply.inline.success": "Applied",
-  "agentManager.apply.inline.conflict": "Conflicts",
-  "agentManager.apply.inline.error": "Failed",
   "agentManager.shortcuts.toggleDiff": "Toggle diff panel",
   "agentManager.shortcuts.category.quickSwitch": "Quick Switch",
   "agentManager.shortcuts.jumpToItem": "Jump to item 1\u20139",
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 b3019f0253d..a75de2ce0c2 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Copiar ruta",
   "agentManager.worktree.openInVscode": "Abrir en VS Code",
   "agentManager.worktree.rename": "Renombrar",
-  "agentManager.worktree.moveToSection": "Mover a la sección",
   "agentManager.worktree.newSection": "Nueva sección",
   "agentManager.worktree.ungrouped": "Desagrupado",
   "agentManager.section.rename": "Renombrar sección",
   "agentManager.section.setColor": "Establecer color",
   "agentManager.section.delete": "Eliminar sección",
-  "agentManager.section.defaultColor": "Predeterminado",
   "agentManager.section.defaultName": "Nueva sección",
   "agentManager.section.moveUp": "Mover hacia arriba",
   "agentManager.section.moveDown": "Mover hacia abajo",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sesiones",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "Nueva pestaña de terminal",
   "agentManager.terminal.ended": "terminal finalizado — cierra la pestaña para descartar",
   "agentManager.terminal.connectionError": "error de conexión del terminal",
+  "agentManager.terminal.kill": "Terminar 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",
+  "agentManager.terminal.openInVscode": "Terminal de VS Code",
+  "agentManager.terminal.openInPanel": "Panel de Agent Manager",
   "agentManager.terminal.errorTitle": "Error de terminal",
   "agentManager.setup.failed": "Error en la configuración del worktree",
   "agentManager.setup.settingUp": "Configurando worktree",
@@ -129,7 +132,6 @@ export const dict = {
   "agentManager.dialog.creating": "Creando...",
   "agentManager.dialog.createWorktree": "Crear Worktree",
   "agentManager.dialog.removeImage": "Eliminar imagen",
-  "agentManager.dialog.advanced": "Avanzado...",
 
   "agentManager.diff.toggle": "Alternar diff",
   "agentManager.diff.openFile": "Abrir archivo",
@@ -138,19 +140,13 @@ export const dict = {
   "agentManager.diff.revertError": "Error al revertir",
   "agentManager.open.button": "Abrir",
   "agentManager.open.tooltip": "Abrir este Worktree en VS Code",
-  "agentManager.apply.button": "Aplicar en local",
   "agentManager.apply.globalButton": "Aplicar",
   "agentManager.apply.tooltip": "Aplicar los cambios del worktree seleccionado a la rama local",
   "agentManager.apply.dialogTitle": "Aplicar cambios a la rama local",
   "agentManager.apply.confirm": "Aplicar ahora",
-  "agentManager.apply.retry": "Reintentar aplicación",
-  "agentManager.apply.previewTitle": "¿Aplicar estos cambios a la rama local?",
-  "agentManager.apply.previewSummary": "{{files}} archivos, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} de {{total}} archivos seleccionados",
   "agentManager.apply.selectAll": "Seleccionar todos",
   "agentManager.apply.selectNone": "Deseleccionar todos",
-  "agentManager.apply.moreFiles": "+{{count}} más",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} más)",
   "agentManager.apply.checking": "Verificando...",
   "agentManager.apply.applying": "Aplicando...",
   "agentManager.apply.success": "Cambios aplicados",
@@ -163,9 +159,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "El parche no se puede aplicar limpiamente",
   "agentManager.apply.reason.contents": "No se puede leer el contenido del archivo local actual",
   "agentManager.apply.reason.unknown": "Conflicto detectado",
-  "agentManager.apply.inline.success": "Aplicado",
-  "agentManager.apply.inline.conflict": "Conflictos",
-  "agentManager.apply.inline.error": "Falló",
   "agentManager.shortcuts.toggleDiff": "Alternar panel de diff",
   "agentManager.shortcuts.category.quickSwitch": "Cambio rápido",
   "agentManager.shortcuts.jumpToItem": "Ir al elemento 1\u20139",
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 8618b9a955b..d8579c9cfd0 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Copier le chemin",
   "agentManager.worktree.openInVscode": "Ouvrir dans VS Code",
   "agentManager.worktree.rename": "Renommer",
-  "agentManager.worktree.moveToSection": "Déplacer vers la section",
   "agentManager.worktree.newSection": "Nouvelle section",
   "agentManager.worktree.ungrouped": "Non groupé",
   "agentManager.section.rename": "Renommer la section",
   "agentManager.section.setColor": "Définir la couleur",
   "agentManager.section.delete": "Supprimer la section",
-  "agentManager.section.defaultColor": "Par défaut",
   "agentManager.section.defaultName": "Nouvelle section",
   "agentManager.section.moveUp": "Déplacer vers le haut",
   "agentManager.section.moveDown": "Déplacer vers le bas",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCHE",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Sessions",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "Nouvel onglet de terminal",
   "agentManager.terminal.ended": "terminal terminé — fermez l'onglet pour ignorer",
   "agentManager.terminal.connectionError": "erreur de connexion du terminal",
+  "agentManager.terminal.kill": "Tuer le 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",
+  "agentManager.terminal.openInVscode": "Terminal VS Code",
+  "agentManager.terminal.openInPanel": "Panneau Agent Manager",
   "agentManager.terminal.errorTitle": "Erreur du terminal",
   "agentManager.setup.failed": "Échec de la configuration de l'espace de travail",
   "agentManager.setup.settingUp": "Configuration de l'espace de travail",
@@ -129,7 +132,6 @@ export const dict = {
   "agentManager.dialog.creating": "Création...",
   "agentManager.dialog.createWorktree": "Créer un worktree",
   "agentManager.dialog.removeImage": "Supprimer l'image",
-  "agentManager.dialog.advanced": "Avancé...",
 
   "agentManager.diff.toggle": "Basculer le diff",
   "agentManager.diff.openFile": "Ouvrir le fichier",
@@ -138,19 +140,13 @@ export const dict = {
   "agentManager.diff.revertError": "Échec du rétablissement",
   "agentManager.open.button": "Ouvrir",
   "agentManager.open.tooltip": "Ouvrir ce worktree dans VS Code",
-  "agentManager.apply.button": "Appliquer en local",
   "agentManager.apply.globalButton": "Appliquer",
   "agentManager.apply.tooltip": "Appliquer les modifications du worktree sélectionné à la branche locale",
   "agentManager.apply.dialogTitle": "Appliquer les modifications à la branche locale",
   "agentManager.apply.confirm": "Appliquer maintenant",
-  "agentManager.apply.retry": "Réessayer l'application",
-  "agentManager.apply.previewTitle": "Appliquer ces modifications à la branche locale ?",
-  "agentManager.apply.previewSummary": "{{files}} fichiers, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} sur {{total}} fichiers sélectionnés",
   "agentManager.apply.selectAll": "Tout sélectionner",
   "agentManager.apply.selectNone": "Tout désélectionner",
-  "agentManager.apply.moreFiles": "+{{count}} de plus",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} de plus)",
   "agentManager.apply.checking": "Vérification...",
   "agentManager.apply.applying": "Application...",
   "agentManager.apply.success": "Modifications appliquées",
@@ -164,9 +160,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Le patch ne peut pas être appliqué proprement",
   "agentManager.apply.reason.contents": "Impossible de lire le contenu du fichier local actuel",
   "agentManager.apply.reason.unknown": "Conflit détecté",
-  "agentManager.apply.inline.success": "Appliqué",
-  "agentManager.apply.inline.conflict": "Conflits",
-  "agentManager.apply.inline.error": "Échoué",
   "agentManager.shortcuts.toggleDiff": "Basculer le panneau de diff",
   "agentManager.shortcuts.category.quickSwitch": "Changement rapide",
   "agentManager.shortcuts.jumpToItem": "Aller à l'élément 1\u20139",
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 10c36ee11b5..11928074249 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
@@ -22,17 +22,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Copia percorso",
   "agentManager.worktree.openInVscode": "Apri in VS Code",
   "agentManager.worktree.rename": "Rinomina",
-  "agentManager.worktree.moveToSection": "Sposta nella sezione",
   "agentManager.worktree.newSection": "Nuova sezione",
   "agentManager.worktree.ungrouped": "Non raggruppati",
   "agentManager.section.rename": "Rinomina sezione",
   "agentManager.section.setColor": "Imposta colore",
   "agentManager.section.delete": "Elimina sezione",
-  "agentManager.section.defaultColor": "Predefinito",
   "agentManager.section.defaultName": "Nuova sezione",
   "agentManager.section.moveUp": "Sposta su",
   "agentManager.section.moveDown": "Sposta giù",
-  "agentManager.section.count": "{{count}}",
 
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Base",
@@ -66,6 +63,12 @@ export const dict = {
   "agentManager.terminal.new": "Nuova scheda terminale",
   "agentManager.terminal.ended": "terminale terminato - chiudi la scheda per nasconderlo",
   "agentManager.terminal.connectionError": "errore di connessione del terminale",
+  "agentManager.terminal.kill": "Termina 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",
+  "agentManager.terminal.openInVscode": "Terminale di VS Code",
+  "agentManager.terminal.openInPanel": "Pannello Agent Manager",
   "agentManager.terminal.errorTitle": "Errore terminale",
 
   "agentManager.setup.failed": "Setup del worktree non riuscito",
@@ -134,7 +137,6 @@ export const dict = {
   "agentManager.dialog.creating": "Creazione...",
   "agentManager.dialog.createWorktree": "Crea worktree",
   "agentManager.dialog.removeImage": "Rimuovi immagine",
-  "agentManager.dialog.advanced": "Avanzate...",
   "agentManager.dialog.configureWorktree": "Configura nuovo worktree...",
 
   "agentManager.diff.toggle": "Mostra/nascondi diff",
@@ -144,19 +146,13 @@ export const dict = {
   "agentManager.diff.revertError": "Ripristino non riuscito",
   "agentManager.open.button": "Apri",
   "agentManager.open.tooltip": "Apri questo worktree in VS Code",
-  "agentManager.apply.button": "Applica in locale",
   "agentManager.apply.globalButton": "Applica",
   "agentManager.apply.tooltip": "Applica le modifiche selezionate del worktree al branch locale",
   "agentManager.apply.dialogTitle": "Applica modifiche al branch locale",
   "agentManager.apply.confirm": "Applica ora",
-  "agentManager.apply.retry": "Riprova applicazione",
-  "agentManager.apply.previewTitle": "Applicare queste modifiche al branch locale?",
-  "agentManager.apply.previewSummary": "{{files}} file, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} di {{total}} file selezionati",
   "agentManager.apply.selectAll": "Seleziona tutto",
   "agentManager.apply.selectNone": "Deseleziona tutto",
-  "agentManager.apply.moreFiles": "+{{count}} altri",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} altri)",
   "agentManager.apply.checking": "Controllo...",
   "agentManager.apply.applying": "Applicazione...",
   "agentManager.apply.success": "Modifiche applicate",
@@ -169,9 +165,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "La patch non può essere applicata in modo pulito",
   "agentManager.apply.reason.contents": "Impossibile leggere il contenuto corrente del file locale",
   "agentManager.apply.reason.unknown": "Conflitto rilevato",
-  "agentManager.apply.inline.success": "Applicato",
-  "agentManager.apply.inline.conflict": "Conflitti",
-  "agentManager.apply.inline.error": "Non riuscito",
   "agentManager.shortcuts.toggleDiff": "Mostra/nascondi pannello diff",
   "agentManager.shortcuts.category.quickSwitch": "Cambio rapido",
   "agentManager.shortcuts.jumpToItem": "Vai all'elemento 1-9",
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 9e44ca3cfaf..d855af8e15d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "パスをコピー",
   "agentManager.worktree.openInVscode": "VS Codeで開く",
   "agentManager.worktree.rename": "名前を変更",
-  "agentManager.worktree.moveToSection": "セクションに移動",
   "agentManager.worktree.newSection": "新しいセクション",
   "agentManager.worktree.ungrouped": "グループなし",
   "agentManager.section.rename": "セクションの名前変更",
   "agentManager.section.setColor": "色の設定",
   "agentManager.section.delete": "セクションの削除",
-  "agentManager.section.defaultColor": "デフォルト",
   "agentManager.section.defaultName": "新しいセクション",
   "agentManager.section.moveUp": "上に移動",
   "agentManager.section.moveDown": "下に移動",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "ブランチ",
   "agentManager.hoverCard.base": "ベース",
   "agentManager.hoverCard.sessions": "セッション",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "新しいターミナルタブ",
   "agentManager.terminal.ended": "ターミナルが終了しました — タブを閉じて破棄",
   "agentManager.terminal.connectionError": "ターミナル接続エラー",
+  "agentManager.terminal.kill": "ターミナルを終了",
+  "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": "ワークスペースのセットアップに失敗しました",
   "agentManager.setup.settingUp": "ワークスペースをセットアップ中",
@@ -128,7 +131,6 @@ export const dict = {
   "agentManager.dialog.creating": "作成中...",
   "agentManager.dialog.createWorktree": "ワークツリーを作成",
   "agentManager.dialog.removeImage": "画像を削除",
-  "agentManager.dialog.advanced": "詳細...",
 
   "agentManager.diff.toggle": "差分を切り替え",
   "agentManager.diff.openFile": "ファイルを開く",
@@ -137,19 +139,13 @@ export const dict = {
   "agentManager.diff.revertError": "元に戻せませんでした",
   "agentManager.open.button": "開く",
   "agentManager.open.tooltip": "このWorktreeをVS Codeで開く",
-  "agentManager.apply.button": "ローカルに適用",
   "agentManager.apply.globalButton": "適用",
   "agentManager.apply.tooltip": "選択したワークツリーの変更をローカルブランチに適用",
   "agentManager.apply.dialogTitle": "ローカルブランチに変更を適用",
   "agentManager.apply.confirm": "今すぐ適用",
-  "agentManager.apply.retry": "適用を再試行",
-  "agentManager.apply.previewTitle": "これらの変更をローカルブランチに適用しますか？",
-  "agentManager.apply.previewSummary": "{{files}} ファイル、+{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{total}} ファイル中 {{selected}} 件選択",
   "agentManager.apply.selectAll": "すべて選択",
   "agentManager.apply.selectNone": "選択解除",
-  "agentManager.apply.moreFiles": "+{{count}} 件",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} 件)",
   "agentManager.apply.checking": "確認中...",
   "agentManager.apply.applying": "適用中...",
   "agentManager.apply.success": "変更が適用されました",
@@ -163,9 +159,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "パッチをクリーンに適用できません",
   "agentManager.apply.reason.contents": "現在のローカルファイルの内容を読み取れません",
   "agentManager.apply.reason.unknown": "競合が検出されました",
-  "agentManager.apply.inline.success": "適用済み",
-  "agentManager.apply.inline.conflict": "競合",
-  "agentManager.apply.inline.error": "失敗",
   "agentManager.shortcuts.toggleDiff": "差分パネルを切り替え",
   "agentManager.shortcuts.category.quickSwitch": "クイック切り替え",
   "agentManager.shortcuts.jumpToItem": "項目 1\u20139 に移動",
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 8d67919701f..ae87aaf9933 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "경로 복사",
   "agentManager.worktree.openInVscode": "VS Code에서 열기",
   "agentManager.worktree.rename": "이름 바꾸기",
-  "agentManager.worktree.moveToSection": "섹션으로 이동",
   "agentManager.worktree.newSection": "새 섹션",
   "agentManager.worktree.ungrouped": "그룹 해제됨",
   "agentManager.section.rename": "섹션 이름 바꾸기",
   "agentManager.section.setColor": "색상 설정",
   "agentManager.section.delete": "섹션 삭제",
-  "agentManager.section.defaultColor": "기본값",
   "agentManager.section.defaultName": "새 섹션",
   "agentManager.section.moveUp": "위로 이동",
   "agentManager.section.moveDown": "아래로 이동",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "브랜치",
   "agentManager.hoverCard.base": "베이스",
   "agentManager.hoverCard.sessions": "세션",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "새 터미널 탭",
   "agentManager.terminal.ended": "터미널 종료됨 — 탭을 닫아 해제",
   "agentManager.terminal.connectionError": "터미널 연결 오류",
+  "agentManager.terminal.kill": "터미널 종료",
+  "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": "워크스페이스 설정 실패",
   "agentManager.setup.settingUp": "워크스페이스 설정 중",
@@ -127,7 +130,6 @@ export const dict = {
   "agentManager.dialog.creating": "생성 중...",
   "agentManager.dialog.createWorktree": "워크트리 생성",
   "agentManager.dialog.removeImage": "이미지 제거",
-  "agentManager.dialog.advanced": "고급...",
 
   "agentManager.diff.toggle": "차이점 전환",
   "agentManager.diff.openFile": "파일 열기",
@@ -136,19 +138,13 @@ export const dict = {
   "agentManager.diff.revertError": "되돌리기 실패",
   "agentManager.open.button": "열기",
   "agentManager.open.tooltip": "이 Worktree를 VS Code에서 열기",
-  "agentManager.apply.button": "로컬에 적용",
   "agentManager.apply.globalButton": "적용",
   "agentManager.apply.tooltip": "선택한 워크트리 변경사항을 로컬 브랜치에 적용",
   "agentManager.apply.dialogTitle": "로컬 브랜치에 변경사항 적용",
   "agentManager.apply.confirm": "지금 적용",
-  "agentManager.apply.retry": "적용 재시도",
-  "agentManager.apply.previewTitle": "이 변경사항을 로컬 브랜치에 적용하시겠습니까?",
-  "agentManager.apply.previewSummary": "{{files}}개 파일, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{total}}개 파일 중 {{selected}}개 선택됨",
   "agentManager.apply.selectAll": "모두 선택",
   "agentManager.apply.selectNone": "선택 해제",
-  "agentManager.apply.moreFiles": "+{{count}}개 더",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}}개 더)",
   "agentManager.apply.checking": "확인 중...",
   "agentManager.apply.applying": "적용 중...",
   "agentManager.apply.success": "변경사항이 적용되었습니다",
@@ -162,9 +158,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "패치를 깨끗하게 적용할 수 없습니다",
   "agentManager.apply.reason.contents": "현재 로컬 파일 내용을 읽을 수 없습니다",
   "agentManager.apply.reason.unknown": "충돌이 감지되었습니다",
-  "agentManager.apply.inline.success": "적용됨",
-  "agentManager.apply.inline.conflict": "충돌",
-  "agentManager.apply.inline.error": "실패",
   "agentManager.shortcuts.toggleDiff": "차이점 패널 전환",
   "agentManager.shortcuts.category.quickSwitch": "빠른 전환",
   "agentManager.shortcuts.jumpToItem": "항목 1\u20139(으)로 이동",
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 16f0c69fee0..1965204a471 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
@@ -22,17 +22,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Pad kopiëren",
   "agentManager.worktree.openInVscode": "Openen in VS Code",
   "agentManager.worktree.rename": "Hernoemen",
-  "agentManager.worktree.moveToSection": "Verplaatsen naar sectie",
   "agentManager.worktree.newSection": "Nieuwe sectie",
   "agentManager.worktree.ungrouped": "Niet gegroepeerd",
   "agentManager.section.rename": "Sectie hernoemen",
   "agentManager.section.setColor": "Kleur instellen",
   "agentManager.section.delete": "Sectie verwijderen",
-  "agentManager.section.defaultColor": "Standaard",
   "agentManager.section.defaultName": "Nieuwe sectie",
   "agentManager.section.moveUp": "Omhoog verplaatsen",
   "agentManager.section.moveDown": "Omlaag verplaatsen",
-  "agentManager.section.count": "{{count}}",
 
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Basis",
@@ -65,6 +62,12 @@ export const dict = {
   "agentManager.terminal.new": "Nieuw terminaltabblad",
   "agentManager.terminal.ended": "terminal beëindigd — sluit tabblad om te negeren",
   "agentManager.terminal.connectionError": "terminalverbindingsfout",
+  "agentManager.terminal.kill": "Terminal beëindigen",
+  "agentManager.terminal.empty": "Hier is nog geen terminal",
+  "agentManager.terminal.start": "Terminal starten",
+  "agentManager.terminal.destination": "Kies wat de terminalknop opent",
+  "agentManager.terminal.openInVscode": "VS Code-terminal",
+  "agentManager.terminal.openInPanel": "Agent Manager-paneel",
   "agentManager.terminal.errorTitle": "Terminalfout",
 
   "agentManager.setup.failed": "Worktree setup mislukt",
@@ -134,7 +137,6 @@ export const dict = {
   "agentManager.dialog.creating": "Maken...",
   "agentManager.dialog.createWorktree": "Worktree maken",
   "agentManager.dialog.removeImage": "Afbeelding verwijderen",
-  "agentManager.dialog.advanced": "Geavanceerd...",
 
   "agentManager.diff.toggle": "Diff in-/uitschakelen",
   "agentManager.diff.openFile": "Bestand openen",
@@ -143,19 +145,13 @@ export const dict = {
   "agentManager.diff.revertError": "Terugzetten mislukt",
   "agentManager.open.button": "Openen",
   "agentManager.open.tooltip": "Open deze worktree in VS Code",
-  "agentManager.apply.button": "Toepassen op lokaal",
   "agentManager.apply.globalButton": "Toepassen",
   "agentManager.apply.tooltip": "Geselecteerde worktree wijzigingen toepassen op lokale branch",
   "agentManager.apply.dialogTitle": "Wijzigingen toepassen op lokale branch",
   "agentManager.apply.confirm": "Nu toepassen",
-  "agentManager.apply.retry": "Toepassen opnieuw proberen",
-  "agentManager.apply.previewTitle": "Deze wijzigingen toepassen op lokale branch?",
-  "agentManager.apply.previewSummary": "{{files}} bestanden, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} van {{total}} bestanden geselecteerd",
   "agentManager.apply.selectAll": "Alles selecteren",
   "agentManager.apply.selectNone": "Niets selecteren",
-  "agentManager.apply.moreFiles": "nog +{{count}}",
-  "agentManager.apply.moreReasons": "{{reason}} (nog +{{count}})",
   "agentManager.apply.checking": "Controleren...",
   "agentManager.apply.applying": "Toepassen...",
   "agentManager.apply.success": "Wijzigingen toegepast",
@@ -168,9 +164,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Patch kan niet netjes worden toegepast",
   "agentManager.apply.reason.contents": "Kan huidige lokale bestandsinhoud niet lezen",
   "agentManager.apply.reason.unknown": "Conflict gedetecteerd",
-  "agentManager.apply.inline.success": "Toegepast",
-  "agentManager.apply.inline.conflict": "Conflicten",
-  "agentManager.apply.inline.error": "Mislukt",
   "agentManager.shortcuts.toggleDiff": "Diff-paneel in-/uitschakelen",
   "agentManager.shortcuts.category.quickSwitch": "Snel wisselen",
   "agentManager.shortcuts.jumpToItem": "Spring naar item 1\u20139",
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 b72e1842892..44efed03a51 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Kopier sti",
   "agentManager.worktree.openInVscode": "Åpne i VS Code",
   "agentManager.worktree.rename": "Gi nytt navn",
-  "agentManager.worktree.moveToSection": "Flytt til seksjon",
   "agentManager.worktree.newSection": "Ny seksjon",
   "agentManager.worktree.ungrouped": "Ugruppert",
   "agentManager.section.rename": "Gi seksjon nytt navn",
   "agentManager.section.setColor": "Angi farge",
   "agentManager.section.delete": "Slett seksjon",
-  "agentManager.section.defaultColor": "Standard",
   "agentManager.section.defaultName": "Ny seksjon",
   "agentManager.section.moveUp": "Flytt opp",
   "agentManager.section.moveDown": "Flytt ned",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Base",
   "agentManager.hoverCard.sessions": "Økter",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "Ny terminalfane",
   "agentManager.terminal.ended": "terminal avsluttet — lukk fanen for å avvise",
   "agentManager.terminal.connectionError": "tilkoblingsfeil for terminal",
+  "agentManager.terminal.kill": "Avslutt terminal",
+  "agentManager.terminal.empty": "Ingen terminal her ennå",
+  "agentManager.terminal.start": "Start terminal",
+  "agentManager.terminal.destination": "Velg hva terminalknappen åpner",
+  "agentManager.terminal.openInVscode": "VS Code-terminal",
+  "agentManager.terminal.openInPanel": "Agent Manager-panel",
   "agentManager.terminal.errorTitle": "Terminalfeil",
   "agentManager.setup.failed": "Oppsett av arbeidsområde mislyktes",
   "agentManager.setup.settingUp": "Setter opp arbeidsområde",
@@ -128,7 +131,6 @@ export const dict = {
   "agentManager.dialog.creating": "Oppretter...",
   "agentManager.dialog.createWorktree": "Opprett worktree",
   "agentManager.dialog.removeImage": "Fjern bilde",
-  "agentManager.dialog.advanced": "Avansert...",
 
   "agentManager.diff.toggle": "Veksle diff",
   "agentManager.diff.openFile": "Åpne fil",
@@ -137,19 +139,13 @@ export const dict = {
   "agentManager.diff.revertError": "Tilbakestilling feilet",
   "agentManager.open.button": "Åpne",
   "agentManager.open.tooltip": "Åpne dette Worktree-et i VS Code",
-  "agentManager.apply.button": "Bruk lokalt",
   "agentManager.apply.globalButton": "Bruk",
   "agentManager.apply.tooltip": "Bruk valgte worktree-endringer på den lokale grenen",
   "agentManager.apply.dialogTitle": "Bruk endringer på den lokale grenen",
   "agentManager.apply.confirm": "Bruk nå",
-  "agentManager.apply.retry": "Prøv å bruke på nytt",
-  "agentManager.apply.previewTitle": "Bruke disse endringene på den lokale grenen?",
-  "agentManager.apply.previewSummary": "{{files}} filer, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} av {{total}} filer valgt",
   "agentManager.apply.selectAll": "Velg alle",
   "agentManager.apply.selectNone": "Velg ingen",
-  "agentManager.apply.moreFiles": "+{{count}} flere",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} flere)",
   "agentManager.apply.checking": "Sjekker...",
   "agentManager.apply.applying": "Bruker...",
   "agentManager.apply.success": "Endringer brukt",
@@ -162,9 +158,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Patch kan ikke brukes rent",
   "agentManager.apply.reason.contents": "Kan ikke lese innholdet i gjeldende lokal fil",
   "agentManager.apply.reason.unknown": "Konflikt oppdaget",
-  "agentManager.apply.inline.success": "Brukt",
-  "agentManager.apply.inline.conflict": "Konflikter",
-  "agentManager.apply.inline.error": "Mislyktes",
   "agentManager.shortcuts.toggleDiff": "Veksle diff-panel",
   "agentManager.shortcuts.category.quickSwitch": "Hurtigbytte",
   "agentManager.shortcuts.jumpToItem": "Hopp til element 1\u20139",
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 3a6e0fda56d..137bf34132f 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Kopiuj ścieżkę",
   "agentManager.worktree.openInVscode": "Otwórz w VS Code",
   "agentManager.worktree.rename": "Zmień nazwę",
-  "agentManager.worktree.moveToSection": "Przenieś do sekcji",
   "agentManager.worktree.newSection": "Nowa sekcja",
   "agentManager.worktree.ungrouped": "Niezgrupowane",
   "agentManager.section.rename": "Zmień nazwę sekcji",
   "agentManager.section.setColor": "Ustaw kolor",
   "agentManager.section.delete": "Usuń sekcję",
-  "agentManager.section.defaultColor": "Domyślny",
   "agentManager.section.defaultName": "Nowa sekcja",
   "agentManager.section.moveUp": "Przenieś w górę",
   "agentManager.section.moveDown": "Przenieś w dół",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "Baza",
   "agentManager.hoverCard.sessions": "Sesje",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "Nowa karta terminala",
   "agentManager.terminal.ended": "terminal zakończony — zamknij kartę, aby zamknąć",
   "agentManager.terminal.connectionError": "błąd połączenia terminala",
+  "agentManager.terminal.kill": "Zakończ terminal",
+  "agentManager.terminal.empty": "Nie ma tu jeszcze terminala",
+  "agentManager.terminal.start": "Uruchom terminal",
+  "agentManager.terminal.destination": "Wybierz, co otwiera przycisk terminala",
+  "agentManager.terminal.openInVscode": "Terminal VS Code",
+  "agentManager.terminal.openInPanel": "Panel Agent Manager",
   "agentManager.terminal.errorTitle": "Błąd terminala",
   "agentManager.setup.failed": "Konfiguracja worktree nie powiodła się",
   "agentManager.setup.settingUp": "Konfigurowanie worktree",
@@ -128,7 +131,6 @@ export const dict = {
   "agentManager.dialog.creating": "Tworzenie...",
   "agentManager.dialog.createWorktree": "Utwórz Worktree",
   "agentManager.dialog.removeImage": "Usuń obraz",
-  "agentManager.dialog.advanced": "Zaawansowane...",
 
   "agentManager.diff.toggle": "Przełącz diff",
   "agentManager.diff.openFile": "Otwórz plik",
@@ -137,19 +139,13 @@ export const dict = {
   "agentManager.diff.revertError": "Cofanie nie powiodło się",
   "agentManager.open.button": "Otwórz",
   "agentManager.open.tooltip": "Otwórz ten Worktree w VS Code",
-  "agentManager.apply.button": "Zastosuj lokalnie",
   "agentManager.apply.globalButton": "Zastosuj",
   "agentManager.apply.tooltip": "Zastosuj wybrane zmiany worktree na lokalnej gałęzi",
   "agentManager.apply.dialogTitle": "Zastosuj zmiany na lokalnej gałęzi",
   "agentManager.apply.confirm": "Zastosuj teraz",
-  "agentManager.apply.retry": "Ponów zastosowanie",
-  "agentManager.apply.previewTitle": "Zastosować te zmiany na lokalnej gałęzi?",
-  "agentManager.apply.previewSummary": "{{files}} plików, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} z {{total}} plików wybranych",
   "agentManager.apply.selectAll": "Zaznacz wszystkie",
   "agentManager.apply.selectNone": "Odznacz wszystkie",
-  "agentManager.apply.moreFiles": "+{{count}} więcej",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} więcej)",
   "agentManager.apply.checking": "Sprawdzanie...",
   "agentManager.apply.applying": "Stosowanie...",
   "agentManager.apply.success": "Zmiany zastosowane",
@@ -162,9 +158,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Łatka nie może być zastosowana czysto",
   "agentManager.apply.reason.contents": "Nie można odczytać zawartości bieżącego pliku lokalnego",
   "agentManager.apply.reason.unknown": "Wykryto konflikt",
-  "agentManager.apply.inline.success": "Zastosowano",
-  "agentManager.apply.inline.conflict": "Konflikty",
-  "agentManager.apply.inline.error": "Błąd",
   "agentManager.shortcuts.toggleDiff": "Przełącz panel diff",
   "agentManager.shortcuts.category.quickSwitch": "Szybkie przełączanie",
   "agentManager.shortcuts.jumpToItem": "Przejdź do elementu 1\u20139",
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 d2f230a1cd7..c0df2ab3c94 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Копировать путь",
   "agentManager.worktree.openInVscode": "Открыть в VS Code",
   "agentManager.worktree.rename": "Переименовать",
-  "agentManager.worktree.moveToSection": "Переместить в раздел",
   "agentManager.worktree.newSection": "Новый раздел",
   "agentManager.worktree.ungrouped": "Без группы",
   "agentManager.section.rename": "Переименовать раздел",
   "agentManager.section.setColor": "Задать цвет",
   "agentManager.section.delete": "Удалить раздел",
-  "agentManager.section.defaultColor": "По умолчанию",
   "agentManager.section.defaultName": "Новый раздел",
   "agentManager.section.moveUp": "Переместить вверх",
   "agentManager.section.moveDown": "Переместить вниз",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "ВЕТКА",
   "agentManager.hoverCard.base": "Основа",
   "agentManager.hoverCard.sessions": "Сессии",
@@ -62,6 +59,12 @@ export const dict = {
   "agentManager.terminal.new": "Новая вкладка терминала",
   "agentManager.terminal.ended": "терминал завершен — закройте вкладку, чтобы скрыть",
   "agentManager.terminal.connectionError": "ошибка подключения к терминалу",
+  "agentManager.terminal.kill": "Завершить терминал",
+  "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": "Не удалось настроить рабочее пространство",
   "agentManager.setup.settingUp": "Настройка рабочего пространства",
@@ -129,7 +132,6 @@ export const dict = {
   "agentManager.dialog.creating": "Создание...",
   "agentManager.dialog.createWorktree": "Создать worktree",
   "agentManager.dialog.removeImage": "Удалить изображение",
-  "agentManager.dialog.advanced": "Дополнительно...",
 
   "agentManager.diff.toggle": "Переключить diff",
   "agentManager.diff.openFile": "Открыть файл",
@@ -138,19 +140,13 @@ export const dict = {
   "agentManager.diff.revertError": "Ошибка отката",
   "agentManager.open.button": "Открыть",
   "agentManager.open.tooltip": "Открыть этот Worktree в VS Code",
-  "agentManager.apply.button": "Применить локально",
   "agentManager.apply.globalButton": "Применить",
   "agentManager.apply.tooltip": "Применить изменения выбранного рабочего дерева к локальной ветке",
   "agentManager.apply.dialogTitle": "Применить изменения к локальной ветке",
   "agentManager.apply.confirm": "Применить сейчас",
-  "agentManager.apply.retry": "Повторить применение",
-  "agentManager.apply.previewTitle": "Применить эти изменения к локальной ветке?",
-  "agentManager.apply.previewSummary": "{{files}} файлов, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} из {{total}} файлов выбрано",
   "agentManager.apply.selectAll": "Выбрать все",
   "agentManager.apply.selectNone": "Снять выделение",
-  "agentManager.apply.moreFiles": "+{{count}} ещё",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} ещё)",
   "agentManager.apply.checking": "Проверка...",
   "agentManager.apply.applying": "Применение...",
   "agentManager.apply.success": "Изменения применены",
@@ -163,9 +159,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Патч не может быть применён чисто",
   "agentManager.apply.reason.contents": "Не удаётся прочитать содержимое текущего локального файла",
   "agentManager.apply.reason.unknown": "Обнаружен конфликт",
-  "agentManager.apply.inline.success": "Применено",
-  "agentManager.apply.inline.conflict": "Конфликты",
-  "agentManager.apply.inline.error": "Ошибка",
   "agentManager.shortcuts.toggleDiff": "Переключить панель diff",
   "agentManager.shortcuts.category.quickSwitch": "Быстрое переключение",
   "agentManager.shortcuts.jumpToItem": "Перейти к элементу 1\u20139",
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 af8b8e11d5c..012b3776ba3 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "คัดลอกเส้นทาง",
   "agentManager.worktree.openInVscode": "เปิดใน VS Code",
   "agentManager.worktree.rename": "เปลี่ยนชื่อ",
-  "agentManager.worktree.moveToSection": "ย้ายไปที่ส่วน",
   "agentManager.worktree.newSection": "ส่วนใหม่",
   "agentManager.worktree.ungrouped": "ไม่ได้จัดกลุ่ม",
   "agentManager.section.rename": "เปลี่ยนชื่อส่วน",
   "agentManager.section.setColor": "ตั้งค่าสี",
   "agentManager.section.delete": "ลบส่วน",
-  "agentManager.section.defaultColor": "ค่าเริ่มต้น",
   "agentManager.section.defaultName": "ส่วนใหม่",
   "agentManager.section.moveUp": "เลื่อนขึ้น",
   "agentManager.section.moveDown": "เลื่อนลง",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "BRANCH",
   "agentManager.hoverCard.base": "ฐาน",
   "agentManager.hoverCard.sessions": "เซสชัน",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "แท็บเทอร์มินัลใหม่",
   "agentManager.terminal.ended": "เทอร์มินัลสิ้นสุด — ปิดแท็บเพื่อยกเลิก",
   "agentManager.terminal.connectionError": "ข้อผิดพลาดการเชื่อมต่อเทอร์มินัล",
+  "agentManager.terminal.kill": "หยุดเทอร์มินัล",
+  "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",
@@ -124,7 +127,6 @@ export const dict = {
   "agentManager.dialog.creating": "กำลังสร้าง...",
   "agentManager.dialog.createWorktree": "สร้าง Worktree",
   "agentManager.dialog.removeImage": "ลบรูปภาพ",
-  "agentManager.dialog.advanced": "ขั้นสูง...",
 
   "agentManager.diff.toggle": "สลับ diff",
   "agentManager.diff.openFile": "เปิดไฟล์",
@@ -133,19 +135,13 @@ export const dict = {
   "agentManager.diff.revertError": "ย้อนกลับล้มเหลว",
   "agentManager.open.button": "เปิด",
   "agentManager.open.tooltip": "เปิด Worktree นี้ใน VS Code",
-  "agentManager.apply.button": "นำไปใช้ในเครื่อง",
   "agentManager.apply.globalButton": "นำไปใช้",
   "agentManager.apply.tooltip": "นำการเปลี่ยนแปลงของ worktree ที่เลือกไปใช้กับสาขาในเครื่อง",
   "agentManager.apply.dialogTitle": "นำการเปลี่ยนแปลงไปใช้กับสาขาในเครื่อง",
   "agentManager.apply.confirm": "นำไปใช้ตอนนี้",
-  "agentManager.apply.retry": "ลองนำไปใช้อีกครั้ง",
-  "agentManager.apply.previewTitle": "นำการเปลี่ยนแปลงเหล่านี้ไปใช้กับสาขาในเครื่อง?",
-  "agentManager.apply.previewSummary": "{{files}} ไฟล์, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "เลือก {{selected}} จาก {{total}} ไฟล์",
   "agentManager.apply.selectAll": "เลือกทั้งหมด",
   "agentManager.apply.selectNone": "ยกเลิกการเลือกทั้งหมด",
-  "agentManager.apply.moreFiles": "+{{count}} เพิ่มเติม",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} เพิ่มเติม)",
   "agentManager.apply.checking": "กำลังตรวจสอบ...",
   "agentManager.apply.applying": "กำลังนำไปใช้...",
   "agentManager.apply.success": "นำการเปลี่ยนแปลงไปใช้แล้ว",
@@ -158,9 +154,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "ไม่สามารถนำ patch ไปใช้ได้อย่างสะอาด",
   "agentManager.apply.reason.contents": "ไม่สามารถอ่านเนื้อหาของไฟล์ในเครื่องปัจจุบัน",
   "agentManager.apply.reason.unknown": "ตรวจพบข้อขัดแย้ง",
-  "agentManager.apply.inline.success": "นำไปใช้แล้ว",
-  "agentManager.apply.inline.conflict": "ข้อขัดแย้ง",
-  "agentManager.apply.inline.error": "ล้มเหลว",
   "agentManager.shortcuts.toggleDiff": "สลับแผง diff",
   "agentManager.shortcuts.category.quickSwitch": "สลับด่วน",
   "agentManager.shortcuts.jumpToItem": "ข้ามไปยังรายการ 1\u20139",
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 ba9711f61db..e18f88694b3 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
@@ -22,17 +22,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Yolu Kopyala",
   "agentManager.worktree.openInVscode": "VS Code'da Aç",
   "agentManager.worktree.rename": "Yeniden Adlandır",
-  "agentManager.worktree.moveToSection": "Bölüme Taşı",
   "agentManager.worktree.newSection": "Yeni Bölüm",
   "agentManager.worktree.ungrouped": "Gruplandırılmamış",
   "agentManager.section.rename": "Bölümü Yeniden Adlandır",
   "agentManager.section.setColor": "Renk Ayarla",
   "agentManager.section.delete": "Bölümü Sil",
-  "agentManager.section.defaultColor": "Varsayılan",
   "agentManager.section.defaultName": "Yeni Bölüm",
   "agentManager.section.moveUp": "Yukarı Taşı",
   "agentManager.section.moveDown": "Aşağı Taşı",
-  "agentManager.section.count": "{{count}}",
 
   "agentManager.hoverCard.branch": "DAL",
   "agentManager.hoverCard.base": "Temel",
@@ -66,6 +63,12 @@ export const dict = {
   "agentManager.terminal.new": "Yeni Terminal Sekmesi",
   "agentManager.terminal.ended": "terminal sona erdi — kapatmak için sekmeyi kapatın",
   "agentManager.terminal.connectionError": "terminal bağlantı hatası",
+  "agentManager.terminal.kill": "Terminali sonlandır",
+  "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",
+  "agentManager.terminal.openInVscode": "VS Code terminali",
+  "agentManager.terminal.openInPanel": "Agent Manager paneli",
   "agentManager.terminal.errorTitle": "Terminal hatası",
 
   "agentManager.setup.failed": "Worktree kurulumu başarısız",
@@ -135,7 +138,6 @@ export const dict = {
   "agentManager.dialog.creating": "Oluşturuluyor...",
   "agentManager.dialog.createWorktree": "Worktree Oluştur",
   "agentManager.dialog.removeImage": "Görüntüyü kaldır",
-  "agentManager.dialog.advanced": "Gelişmiş...",
 
   "agentManager.diff.toggle": "diff'i aç/kapat",
   "agentManager.diff.openFile": "Dosyayı aç",
@@ -144,19 +146,13 @@ export const dict = {
   "agentManager.diff.revertError": "Geri alma başarısız",
   "agentManager.open.button": "Aç",
   "agentManager.open.tooltip": "Bu worktree'yi VS Code'da aç",
-  "agentManager.apply.button": "Yerele uygula",
   "agentManager.apply.globalButton": "Uygula",
   "agentManager.apply.tooltip": "Seçilen worktree değişikliklerini yerel dala uygula",
   "agentManager.apply.dialogTitle": "Değişiklikleri yerel dala uygula",
   "agentManager.apply.confirm": "Şimdi uygula",
-  "agentManager.apply.retry": "Yeniden uygula",
-  "agentManager.apply.previewTitle": "Bu değişiklikler yerel dala uygulansın mı?",
-  "agentManager.apply.previewSummary": "{{files}} dosya, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{total}} dosyadan {{selected}} tanesi seçildi",
   "agentManager.apply.selectAll": "Tümünü seç",
   "agentManager.apply.selectNone": "Hiçbirini seçme",
-  "agentManager.apply.moreFiles": "+{{count}} tane daha",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} tane daha)",
   "agentManager.apply.checking": "Kontrol ediliyor...",
   "agentManager.apply.applying": "Uygulanıyor...",
   "agentManager.apply.success": "Değişiklikler uygulandı",
@@ -170,9 +166,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Yama (patch) sorunsuz uygulanamıyor",
   "agentManager.apply.reason.contents": "Geçerli yerel dosya içerikleri okunamıyor",
   "agentManager.apply.reason.unknown": "Çakışma algılandı",
-  "agentManager.apply.inline.success": "Uygulandı",
-  "agentManager.apply.inline.conflict": "Çakışmalar",
-  "agentManager.apply.inline.error": "Başarısız oldu",
   "agentManager.shortcuts.toggleDiff": "diff panelini aç/kapat",
   "agentManager.shortcuts.category.quickSwitch": "Hızlı Geçiş",
   "agentManager.shortcuts.jumpToItem": "1\u20139 öğesine atla",
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 2ce90dccfff..1c1c1cbf22e 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
@@ -22,17 +22,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "Копіювати шлях",
   "agentManager.worktree.openInVscode": "Відкрити у VS Code",
   "agentManager.worktree.rename": "Перейменувати",
-  "agentManager.worktree.moveToSection": "Перемістити до розділу",
   "agentManager.worktree.newSection": "Новий розділь",
   "agentManager.worktree.ungrouped": "Без групи",
   "agentManager.section.rename": "Перейменувати розділ",
   "agentManager.section.setColor": "Встановити колір",
   "agentManager.section.delete": "Видалити розділ",
-  "agentManager.section.defaultColor": "За замовчуванням",
   "agentManager.section.defaultName": "Новий розділ",
   "agentManager.section.moveUp": "Перемістити вгору",
   "agentManager.section.moveDown": "Перемістити вниз",
-  "agentManager.section.count": "{{count}}",
 
   "agentManager.hoverCard.branch": "ГІЛКА",
   "agentManager.hoverCard.base": "База",
@@ -66,6 +63,12 @@ export const dict = {
   "agentManager.terminal.new": "Нова вкладка термінала",
   "agentManager.terminal.ended": "термінал завершено — закрийте вкладку, щоб відхилити",
   "agentManager.terminal.connectionError": "помилка з'єднання термінала",
+  "agentManager.terminal.kill": "Завершити термінал",
+  "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": "Налаштування робочого дерева не вдалося",
@@ -136,7 +139,6 @@ export const dict = {
   "agentManager.dialog.creating": "Створення...",
   "agentManager.dialog.createWorktree": "Створити робоче дерево",
   "agentManager.dialog.removeImage": "Видалити зображення",
-  "agentManager.dialog.advanced": "Розширено...",
 
   "agentManager.diff.toggle": "Показати або приховати diff",
   "agentManager.diff.openFile": "Відкрити файл",
@@ -145,19 +147,13 @@ export const dict = {
   "agentManager.diff.revertError": "Не вдалося відновити",
   "agentManager.open.button": "Відкрити",
   "agentManager.open.tooltip": "Відкрити це робоче дерево у VS Code",
-  "agentManager.apply.button": "Застосувати локально",
   "agentManager.apply.globalButton": "Застосувати",
   "agentManager.apply.tooltip": "Застосувати вибрані зміни робочого дерева до локальної гілки",
   "agentManager.apply.dialogTitle": "Застосувати зміни до локальної гілки",
   "agentManager.apply.confirm": "Застосувати зараз",
-  "agentManager.apply.retry": "Повторити застосування",
-  "agentManager.apply.previewTitle": "Застосувати ці зміни до локальної гілки?",
-  "agentManager.apply.previewSummary": "{{files}} файлів, +{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "{{selected}} з {{total}} файлів вибрано",
   "agentManager.apply.selectAll": "Вибрати все",
   "agentManager.apply.selectNone": "Зняти вибір",
-  "agentManager.apply.moreFiles": "+{{count}} ще",
-  "agentManager.apply.moreReasons": "{{reason}} (+{{count}} ще)",
   "agentManager.apply.checking": "Перевірка...",
   "agentManager.apply.applying": "Застосування...",
   "agentManager.apply.success": "Зміни застосовано",
@@ -171,9 +167,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "Патч неможливо застосувати без конфліктів",
   "agentManager.apply.reason.contents": "Неможливо прочитати вміст поточного локального файлу",
   "agentManager.apply.reason.unknown": "Виявлено конфлікт",
-  "agentManager.apply.inline.success": "Застосовано",
-  "agentManager.apply.inline.conflict": "Конфлікти",
-  "agentManager.apply.inline.error": "Не вдалося",
   "agentManager.shortcuts.toggleDiff": "Показати або приховати панель diff",
   "agentManager.shortcuts.category.quickSwitch": "Швидке перемикання",
   "agentManager.shortcuts.jumpToItem": "Перейти до елемента 1\u20139",
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 fb46b8f06aa..2e0c7f5568c 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "复制路径",
   "agentManager.worktree.openInVscode": "在 VS Code 中打开",
   "agentManager.worktree.rename": "重命名",
-  "agentManager.worktree.moveToSection": "移动到分区",
   "agentManager.worktree.newSection": "新分区",
   "agentManager.worktree.ungrouped": "未分组",
   "agentManager.section.rename": "重命名分区",
   "agentManager.section.setColor": "设置颜色",
   "agentManager.section.delete": "删除分区",
-  "agentManager.section.defaultColor": "默认",
   "agentManager.section.defaultName": "新分区",
   "agentManager.section.moveUp": "上移",
   "agentManager.section.moveDown": "下移",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "分支",
   "agentManager.hoverCard.base": "基础",
   "agentManager.hoverCard.sessions": "会话",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "新建终端标签页",
   "agentManager.terminal.ended": "终端已结束 — 关闭标签页以消除",
   "agentManager.terminal.connectionError": "终端连接错误",
+  "agentManager.terminal.kill": "终止终端",
+  "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": "工作区设置失败",
   "agentManager.setup.settingUp": "正在设置工作区",
@@ -123,7 +126,6 @@ export const dict = {
   "agentManager.dialog.creating": "创建中...",
   "agentManager.dialog.createWorktree": "创建工作树",
   "agentManager.dialog.removeImage": "移除图片",
-  "agentManager.dialog.advanced": "高级...",
 
   "agentManager.diff.toggle": "切换差异",
   "agentManager.diff.openFile": "打开文件",
@@ -132,19 +134,13 @@ export const dict = {
   "agentManager.diff.revertError": "还原失败",
   "agentManager.open.button": "打开",
   "agentManager.open.tooltip": "在 VS Code 中打开此 Worktree",
-  "agentManager.apply.button": "应用到本地",
   "agentManager.apply.globalButton": "应用",
   "agentManager.apply.tooltip": "将所选工作树的更改应用到本地分支",
   "agentManager.apply.dialogTitle": "将更改应用到本地分支",
   "agentManager.apply.confirm": "立即应用",
-  "agentManager.apply.retry": "重试应用",
-  "agentManager.apply.previewTitle": "将这些更改应用到本地分支？",
-  "agentManager.apply.previewSummary": "{{files}} 个文件，+{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "已选择 {{selected}}/{{total}} 个文件",
   "agentManager.apply.selectAll": "全选",
   "agentManager.apply.selectNone": "取消全选",
-  "agentManager.apply.moreFiles": "+{{count}} 更多",
-  "agentManager.apply.moreReasons": "{{reason}}（+{{count}} 更多）",
   "agentManager.apply.checking": "检查中...",
   "agentManager.apply.applying": "应用中...",
   "agentManager.apply.success": "更改已应用",
@@ -157,9 +153,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "补丁无法干净地应用",
   "agentManager.apply.reason.contents": "无法读取当前本地文件内容",
   "agentManager.apply.reason.unknown": "检测到冲突",
-  "agentManager.apply.inline.success": "已应用",
-  "agentManager.apply.inline.conflict": "冲突",
-  "agentManager.apply.inline.error": "失败",
   "agentManager.shortcuts.toggleDiff": "切换差异面板",
   "agentManager.shortcuts.category.quickSwitch": "快速切换",
   "agentManager.shortcuts.jumpToItem": "跳转到项目 1\u20139",
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 b1655b23ee1..e4403c5aaff 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
@@ -21,17 +21,14 @@ export const dict = {
   "agentManager.worktree.copyPath": "複製路徑",
   "agentManager.worktree.openInVscode": "在 VS Code 中打開",
   "agentManager.worktree.rename": "重新命名",
-  "agentManager.worktree.moveToSection": "移動到分區",
   "agentManager.worktree.newSection": "新分區",
   "agentManager.worktree.ungrouped": "未分組",
   "agentManager.section.rename": "重新命名分區",
   "agentManager.section.setColor": "設定顏色",
   "agentManager.section.delete": "刪除分區",
-  "agentManager.section.defaultColor": "預設",
   "agentManager.section.defaultName": "新分區",
   "agentManager.section.moveUp": "上移",
   "agentManager.section.moveDown": "下移",
-  "agentManager.section.count": "{{count}}",
   "agentManager.hoverCard.branch": "分支",
   "agentManager.hoverCard.base": "基底",
   "agentManager.hoverCard.sessions": "工作階段",
@@ -61,6 +58,12 @@ export const dict = {
   "agentManager.terminal.new": "新增終端分頁",
   "agentManager.terminal.ended": "終端已結束 — 關閉分頁以消除",
   "agentManager.terminal.connectionError": "終端連線錯誤",
+  "agentManager.terminal.kill": "終止終端機",
+  "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": "工作區設定失敗",
   "agentManager.setup.settingUp": "正在設定工作區",
@@ -123,7 +126,6 @@ export const dict = {
   "agentManager.dialog.creating": "建立中...",
   "agentManager.dialog.createWorktree": "建立工作樹",
   "agentManager.dialog.removeImage": "移除圖片",
-  "agentManager.dialog.advanced": "進階...",
 
   "agentManager.diff.toggle": "切換差異",
   "agentManager.diff.openFile": "開啟檔案",
@@ -132,19 +134,13 @@ export const dict = {
   "agentManager.diff.revertError": "還原失敗",
   "agentManager.open.button": "開啟",
   "agentManager.open.tooltip": "在 VS Code 中開啟此 Worktree",
-  "agentManager.apply.button": "套用到本地",
   "agentManager.apply.globalButton": "套用",
   "agentManager.apply.tooltip": "將所選工作樹的變更套用到本地分支",
   "agentManager.apply.dialogTitle": "將變更套用到本地分支",
   "agentManager.apply.confirm": "立即套用",
-  "agentManager.apply.retry": "重試套用",
-  "agentManager.apply.previewTitle": "將這些變更套用到本地分支？",
-  "agentManager.apply.previewSummary": "{{files}} 個檔案，+{{additions}} -{{deletions}}",
   "agentManager.apply.selectionSummary": "已選取 {{selected}}/{{total}} 個檔案",
   "agentManager.apply.selectAll": "全選",
   "agentManager.apply.selectNone": "取消全選",
-  "agentManager.apply.moreFiles": "+{{count}} 更多",
-  "agentManager.apply.moreReasons": "{{reason}}（+{{count}} 更多）",
   "agentManager.apply.checking": "檢查中...",
   "agentManager.apply.applying": "套用中...",
   "agentManager.apply.success": "變更已套用",
@@ -157,9 +153,6 @@ export const dict = {
   "agentManager.apply.reason.patch": "修補程式無法乾淨地套用",
   "agentManager.apply.reason.contents": "無法讀取目前本地檔案內容",
   "agentManager.apply.reason.unknown": "偵測到衝突",
-  "agentManager.apply.inline.success": "已套用",
-  "agentManager.apply.inline.conflict": "衝突",
-  "agentManager.apply.inline.error": "失敗",
   "agentManager.shortcuts.toggleDiff": "切換差異面板",
   "agentManager.shortcuts.category.quickSwitch": "快速切換",
   "agentManager.shortcuts.jumpToItem": "跳至項目 1\u20139",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx
new file mode 100644
index 00000000000..bf42185b831
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/SideTerminalPanel.tsx
@@ -0,0 +1,85 @@
+/**
+ * Right-side terminal panel for the Agent Manager inspector.
+ *
+ * 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.
+ *
+ * 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 { 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 { renderSideTerminalLayer } from "./render"
+import type { TerminalStateControls } from "./state"
+
+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. */
+  onStart: () => void
+}
+
+export const SideTerminalPanel: Component<Props> = (props) => {
+  const { t } = useLanguage()
+  let panel!: HTMLElement
+  createEffect(() => {
+    panel.inert = !props.visible()
+  })
+  const side = () => props.state.side()
+  const pending = () => props.state.pendingSide(props.contextKey()) !== undefined
+  return (
+    <section
+      ref={panel}
+      class={`am-side-terminal ${props.visible() ? "am-side-terminal-visible" : ""}`}
+      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">
+            <IconButton
+              icon="trash"
+              size="small"
+              variant="ghost"
+              aria-label={t("agentManager.terminal.kill")}
+              onClick={props.onClose}
+            />
+          </Tooltip>
+        </div>
+      </div>
+      {renderSideTerminalLayer({ state: props.state, contextKey: props.contextKey, visible: props.visible })}
+      <Show when={props.visible() && pending() && !side()}>
+        <div class="am-side-terminal-state" role="status">
+          <Spinner />
+          <span>{t("common.loading")}</span>
+        </div>
+      </Show>
+      <Show when={props.visible() && !pending() && !side()}>
+        <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}>
+            {t("agentManager.terminal.start")}
+          </Button>
+        </div>
+      </Show>
+    </section>
+  )
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalDestinationButton.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalDestinationButton.tsx
new file mode 100644
index 00000000000..a0ae02bee2d
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalDestinationButton.tsx
@@ -0,0 +1,65 @@
+/**
+ * Terminal destination split button for the Agent Manager tab toolbar.
+ *
+ * The primary action opens whatever the user picked (VS Code integrated
+ * terminal or the embedded side panel); the dropdown switches between
+ * them. Markup mirrors the `+` new-tab split button in
+ * `tab-rendering.tsx` so both share the same split-button styling.
+ */
+
+import type { Accessor, Component } from "solid-js"
+import { Show } 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 { useLanguage } from "../../src/context/language"
+import type { TerminalDestination } from "../../src/types/messages/agent-manager"
+
+interface Props {
+  destination: Accessor<TerminalDestination>
+  /** True while the embedded terminal panel is showing. */
+  active: Accessor<boolean>
+  keybind: Accessor<string>
+  onOpen: () => void
+  onChoose: (destination: TerminalDestination) => void
+}
+
+export const TerminalDestinationButton: Component<Props> = (props) => {
+  const { t } = useLanguage()
+  const item = (destination: TerminalDestination, label: string) => (
+    <DropdownMenu.Item onSelect={() => props.onChoose(destination)}>
+      <span class="am-menu-check">
+        <Show when={props.destination() === destination}>
+          <Icon name="check" size="small" />
+        </Show>
+      </span>
+      <DropdownMenu.ItemLabel>{label}</DropdownMenu.ItemLabel>
+    </DropdownMenu.Item>
+  )
+  return (
+    <div class="am-split-button">
+      <TooltipKeybind title={t("agentManager.tab.terminal")} keybind={props.keybind()} placement="bottom">
+        <IconButton
+          icon="console"
+          size="small"
+          variant="ghost"
+          label={t("agentManager.tab.openTerminal")}
+          class={props.active() ? "am-tab-diff-btn-active" : ""}
+          onClick={props.onOpen}
+        />
+      </TooltipKeybind>
+      <DropdownMenu gutter={4} placement="bottom-end">
+        <DropdownMenu.Trigger class="am-split-arrow" aria-label={t("agentManager.terminal.destination")}>
+          <Icon name="chevron-down" size="small" />
+        </DropdownMenu.Trigger>
+        <DropdownMenu.Portal>
+          <DropdownMenu.Content class="am-split-menu">
+            {item("vscode", t("agentManager.terminal.openInVscode"))}
+            {item("agentManager", t("agentManager.terminal.openInPanel"))}
+          </DropdownMenu.Content>
+        </DropdownMenu.Portal>
+      </DropdownMenu>
+    </div>
+  )
+}
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 82669255354..792d2385866 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
@@ -38,6 +38,14 @@ interface Props {
    *  an xterm re-paint when the slot transitions back to visible after
    *  sitting behind an occluding layer. */
   active: boolean
+  /** Serial of the latest explicit focus request for this terminal
+   *  (`state.focusRequest()`), consumed so re-requesting focus on an
+   *  already-visible terminal still re-focuses it. */
+  focusSerial?: number
+  /** Reports DOM focus entering or leaving the xterm host. The state
+   *  layer tracks this as `focusedId` so `Cmd+W` can target the
+   *  terminal that actually has the cursor. */
+  onFocusChange?: (focused: boolean) => void
 }
 
 /** How long the ResizeObserver waits after the last size change before
@@ -188,6 +196,17 @@ export const TerminalTab: Component<Props> = (props) => {
     // ⌘T / ⌘W / ⌘⌥← etc. still work while the terminal is focused.
     term.attachCustomKeyEventHandler((event) => !isAgentManagerShortcut(event))
 
+    // Track DOM focus so the state layer knows which terminal holds the
+    // cursor (drives Cmd+W targeting). focusout is ignored when focus
+    // moves within the same host (xterm shuffles inner nodes).
+    const onFocusIn = () => props.onFocusChange?.(true)
+    const onFocusOut = (event: FocusEvent) => {
+      if (event.relatedTarget instanceof Node && host.contains(event.relatedTarget)) return
+      props.onFocusChange?.(false)
+    }
+    host.addEventListener("focusin", onFocusIn)
+    host.addEventListener("focusout", onFocusOut)
+
     const ws = new WebSocket(props.wsUrl)
     ws.binaryType = "arraybuffer"
     let closed = false
@@ -260,7 +279,12 @@ export const TerminalTab: Component<Props> = (props) => {
     // — historically "press Enter to wake it up". Forcing a
     // `fit + refresh(0, rows-1)` once per activation reclaims the paint
     // priority; from then on the browser keeps the canvas live.
+    //
+    // Focus is opt-in per repaint (`shouldFocus`): repaints triggered by
+    // resizes or font changes must not yank the cursor out of the chat
+    // input, only explicit activation / focus requests may.
     let pendingFrame: number | null = null
+    let shouldFocus = false
     const isRenderable = () => {
       if (!host.isConnected) return false
       const rect = host.getBoundingClientRect()
@@ -278,9 +302,11 @@ export const TerminalTab: Component<Props> = (props) => {
         log("repaint fit() threw", err)
       }
       term.refresh(0, Math.max(0, term.rows - 1))
-      if (document.hasFocus()) term.focus()
+      if (shouldFocus && document.hasFocus()) term.focus()
+      shouldFocus = false
     }
-    const scheduleRepaint = () => {
+    const scheduleRepaint = (focus = false) => {
+      shouldFocus ||= focus
       if (pendingFrame !== null) return
       pendingFrame = requestAnimationFrame(runRepaint)
     }
@@ -309,26 +335,37 @@ export const TerminalTab: Component<Props> = (props) => {
       scheduleRepaint()
     })
 
-    let wasActive = props.active
+    // Activation and explicit focus requests focus the terminal;
+    // deactivation blurs it so keystrokes never land in a hidden xterm.
+    // `wasActive` starts false so a terminal mounted already-active (the
+    // create-and-activate flow) still gets its initial focus repaint.
+    let wasActive = false
+    let focusSerial = -1
     createEffect(() => {
       const now = props.active
-      if (now && !wasActive) scheduleRepaint()
+      const serial = props.focusSerial ?? 0
+      if (now && (!wasActive || serial !== focusSerial)) scheduleRepaint(true)
+      if (!now && wasActive) term.blur()
       wasActive = now
+      focusSerial = serial
     })
 
     // Also recover when the user returns from an external window or the
     // OS-level window manager (alt-tab, browser → VS Code, etc.) — the
     // browser often suspends canvas paint while the window is in the
     // background, and the Solid `active` prop alone doesn't see that.
-    // Gated on `props.active` so inactive tabs don't do needless work.
+    // Gated on `props.active` so inactive tabs don't do needless work,
+    // and on the terminal already owning focus so returning to the
+    // window never steals the cursor back from the chat input.
+    const ownsFocus = () => host.contains(document.activeElement)
     const onVisibilityChange = () => {
       if (document.hidden) return
-      if (!props.active) return
-      scheduleRepaint()
+      if (!props.active || !ownsFocus()) return
+      scheduleRepaint(true)
     }
     const onWindowFocus = () => {
-      if (!props.active) return
-      scheduleRepaint()
+      if (!props.active || !ownsFocus()) return
+      scheduleRepaint(true)
     }
     document.addEventListener("visibilitychange", onVisibilityChange)
     window.addEventListener("focus", onWindowFocus)
@@ -350,6 +387,8 @@ export const TerminalTab: Component<Props> = (props) => {
       if (pendingFrame !== null) cancelAnimationFrame(pendingFrame)
       document.removeEventListener("visibilitychange", onVisibilityChange)
       window.removeEventListener("focus", onWindowFocus)
+      host.removeEventListener("focusin", onFocusIn)
+      host.removeEventListener("focusout", onFocusOut)
       fontSub()
       themeObserver.disconnect()
       clearTimeout(resizeTimer)
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 22dd8038a15..6bac7cab9bb 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/index.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/index.ts
@@ -20,6 +20,9 @@ export {
   createTerminalMessageHandler,
 } from "./state"
 export type { TerminalTabState, TerminalStateControls, TerminalHandlerDeps } from "./state"
-export { renderTerminalTab, renderTerminalLayer } from "./render"
+export { renderTerminalTab, renderTerminalLayer, renderSideTerminalLayer } from "./render"
+export { SideTerminalPanel } from "./SideTerminalPanel"
+export { TerminalDestinationButton } from "./TerminalDestinationButton"
+export { createSideTerminal } from "./side"
 export { TerminalTab } from "./TerminalTab"
 export { SortableTerminalTab } from "./SortableTerminalTab"
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 ad6fced8aa6..df304f59627 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/render.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/render.tsx
@@ -7,11 +7,18 @@
  */
 
 import { For, Show } from "solid-js"
-import type { JSX } from "solid-js"
+import type { Accessor, JSX } from "solid-js"
 import { SortableTerminalTab } from "./SortableTerminalTab"
 import { TerminalTab } from "./TerminalTab"
 import type { TerminalStateControls } from "./state"
 
+/** Serial of the latest focus request addressed to `id`, or 0. Read
+ *  inside JSX so the effect re-runs when a request lands. */
+function focusSerial(state: TerminalStateControls, id: string): number {
+  const request = state.focusRequest()
+  return request?.id === id ? request.serial : 0
+}
+
 export interface TerminalTabRenderDeps {
   id: string
   terms: TerminalStateControls
@@ -94,8 +101,15 @@ export function renderTerminalLayer(props: { state: TerminalStateControls }): JS
           {(term) => {
             const visible = () => slotVisible(term.id, term.contextKey)
             return (
-              <div class={`am-terminal-slot ${visible() ? "am-terminal-slot-visible" : ""}`}>
-                <TerminalTab terminalId={term.id} wsUrl={term.wsUrl} active={visible()} font={term.font} />
+              <div class={`am-terminal-slot ${visible() ? "am-terminal-slot-visible" : ""}`} inert={!visible()}>
+                <TerminalTab
+                  terminalId={term.id}
+                  wsUrl={term.wsUrl}
+                  active={visible()}
+                  focusSerial={focusSerial(props.state, term.id)}
+                  font={term.font}
+                  onFocusChange={(focused) => props.state.setFocusedId(focused ? term.id : undefined)}
+                />
               </div>
             )
           }}
@@ -104,3 +118,40 @@ export function renderTerminalLayer(props: { state: TerminalStateControls }): JS
     </Show>
   )
 }
+
+/**
+ * Render the side-panel terminal layer inside the right-hand inspector.
+ *
+ * Same paint-tree invariant as `renderTerminalLayer`: every side
+ * 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.
+ */
+export function renderSideTerminalLayer(props: {
+  state: TerminalStateControls
+  contextKey: Accessor<string>
+  visible: Accessor<boolean>
+}): JSX.Element {
+  return (
+    <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()
+          return (
+            <div class={`am-terminal-slot ${active() ? "am-terminal-slot-visible" : ""}`} inert={!active()}>
+              <TerminalTab
+                terminalId={term.id}
+                wsUrl={term.wsUrl}
+                active={active()}
+                focusSerial={focusSerial(props.state, term.id)}
+                font={term.font}
+                onFocusChange={(focused) => props.state.setFocusedId(focused ? term.id : undefined)}
+              />
+            </div>
+          )
+        }}
+      </For>
+    </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
new file mode 100644
index 00000000000..3c7fe391450
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/side.ts
@@ -0,0 +1,94 @@
+/**
+ * Right-side terminal wiring for the Agent Manager webview.
+ *
+ * Extracted from AgentManagerApp.tsx to keep that file under the
+ * `max-lines` lint cap. Owns the destination preference plus the toggle
+ * semantics of the toolbar button / `Cmd/Ctrl+/` shortcut, so the
+ * 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.
+ */
+
+import { createSignal } from "solid-js"
+import type { Accessor } from "solid-js"
+import type { TerminalDestination } from "../../src/types/messages/agent-manager"
+
+interface Handlers {
+  requestSide(): void
+  closeSide(): 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>
+  /** Leave terminal mode; the terminal stays alive in the background. */
+  hide: () => void
+  /** Move focus back to the chat composer. */
+  refocus: () => void
+  postMessage: (msg: unknown) => void
+  track: (button: string, surface: string, properties: Record<string, string>) => void
+  /** Open or focus the VS Code integrated terminal for the active context. */
+  openVscode: () => void
+}
+
+export function createSideTerminal(deps: SideTerminalDeps) {
+  const [destination, setDestination] = createSignal<TerminalDestination>("vscode")
+
+  /**
+   * Hiding while the terminal holds focus would strand the cursor on
+   * <body>, so hand it to the chat composer — the common flow is
+   * type → Cmd+/ → run command → Cmd+/ → keep typing. When the user
+   * was anywhere else (chat, diff, another tab), focus stays put.
+   */
+  const handoff = (wasFocused: boolean) => {
+    if (wasFocused) deps.refocus()
+  }
+
+  const toggle = () => {
+    if (deps.visible()) {
+      const was = deps.focused()
+      deps.hide()
+      handoff(was)
+      return
+    }
+    deps.handlers.requestSide()
+  }
+
+  /** Kill the current context's side terminal (or cancel its in-flight
+   *  create) and hide the panel. */
+  const close = (): boolean => {
+    const was = deps.focused()
+    const done = deps.handlers.closeSide()
+    if (done) handoff(was)
+    return done
+  }
+
+  /** Toolbar button and `Cmd/Ctrl+/`: follow the user's destination. */
+  const openPreferred = (trigger: "keyboard_shortcut" | "tab_toolbar") => {
+    const target = destination()
+    deps.track("terminal", trigger, { destination: target })
+    if (target === "agentManager") {
+      toggle()
+      return
+    }
+    deps.openVscode()
+  }
+
+  /**
+   * 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.
+   */
+  const choose = (target: TerminalDestination) => {
+    deps.track("terminal_destination", "tab_toolbar", { destination: target })
+    setDestination(target)
+    deps.postMessage({ type: "updateSetting", key: "agentManager.terminalButtonDestination", value: target })
+  }
+
+  return { destination, setDestination, toggle, close, openPreferred, choose }
+}
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 f472623b287..3e9fba7af14 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/state.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/state.ts
@@ -5,13 +5,18 @@
  * `max-lines` lint cap. Owns the per-context terminal list, the
  * `activeTerminalId` focus signal, and a small set of imperative
  * helpers the main component composes with its existing tab logic.
+ *
+ * Main terminal tabs and right-side terminals share the same PTY
+ * transport, but their UI state is intentionally separate: tab
+ * activation replaces the chat, while a side terminal lives in the
+ * right-hand inspector and keeps the current session visible.
  */
 
-import { createMemo, createSignal } from "solid-js"
+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 { TerminalFont } from "../../src/types/messages/agent-manager"
+import type { TerminalDestination, TerminalFont, TerminalPlacement } from "../../src/types/messages/agent-manager"
 
 export type { TerminalFont }
 
@@ -26,6 +31,7 @@ export interface TerminalTabState {
   title: string
   wsUrl: string
   font: TerminalFont
+  placement: TerminalPlacement
 }
 
 /** Terminal row enriched with the sidebar context it belongs to. Used by
@@ -35,26 +41,59 @@ export interface TerminalTabStateWithContext extends TerminalTabState {
   contextKey: string
 }
 
+/** Explicit focus demand, consumed by `TerminalTab` via the render layer.
+ *  The serial lets repeated requests for the same terminal retrigger the
+ *  focus effect. */
+export interface TerminalFocusRequest {
+  id: string
+  serial: number
+}
+
+/** 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. */
+interface SideRequest {
+  contextKey: string
+  cancelled: boolean
+}
+
 export interface TerminalStateControls {
   /** Record received from `terminal.created`. */
   add(worktreeId: string | null, term: TerminalTabState): void
-  /** Drop a terminal from its context (location resolved automatically). */
-  remove(terminalId: string): string | undefined
+  /** Drop a terminal from its context (location resolved automatically).
+   *  Returns the removed record so callers can react to placement. */
+  remove(terminalId: string): TerminalTabStateWithContext | undefined
   /** Resolve the context key a terminal lives in, if any. */
   contextFor(terminalId: string): string | undefined
-  /** All terminals for the given sidebar selection. */
+  /** All tab terminals for the given sidebar selection. */
   forSelection(selection: string | null): TerminalTabStateWithContext[]
   /** Map of { id -> tab state } for O(1) lookup. */
   lookup: Accessor<Map<string, TerminalTabStateWithContext>>
-  /** All terminals for the currently selected context. */
+  /** All tab terminals for the currently selected context. */
   current: Accessor<TerminalTabStateWithContext[]>
-  /** Every terminal across every context (for the persistent render layer). */
+  /** Every tab terminal across every context (for the persistent render layer). */
   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
   /** 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
+   *  sessions (null selection) share the LOCAL workspace-root terminal. */
+  sideKey: Accessor<string>
   /** Active terminal id signal + setter. */
   activeId: Accessor<string | undefined>
   setActiveId: (id: string | undefined) => void
+  /** The terminal that currently holds DOM focus, if any. Set by
+   *  `TerminalTab` focus listeners; drives `Cmd+W` targeting. */
+  focusedId: Accessor<string | undefined>
+  setFocusedId: (id: string | undefined) => void
+  /** Latest explicit focus demand. */
+  focusRequest: Accessor<TerminalFocusRequest | undefined>
+  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
   /**
@@ -70,49 +109,96 @@ 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
+  /** 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
 }
 
 /** Wire up reactive state for terminal tabs. The caller passes the current
- *  `selection()` accessor so memos can key by the right context.
+ *  `selection()` accessor so the accessors below key by the right context.
  *
  *  ## Reference stability
  *
  *  Terminals are stored as `TerminalTabStateWithContext` (contextKey
- *  baked in) so the reactive accessors below can return them *by
- *  reference* without ever allocating a new object per terminal. That
- *  matters because Solid's `<For>` uses element reference equality to
- *  decide whether a child is "the same" across renders. If `all()`
- *  created `{...t, contextKey}` each time (the original bug), adding
- *  a new terminal to context A would rewrite every object in every
- *  context — `<For>` would then unmount + remount every live xterm
- *  across the whole app, destroying instances and losing canvas state.
+ *  baked in) so the accessors below can return them *by reference*
+ *  without ever allocating a new object per terminal. That matters
+ *  because Solid's `<For>` uses element reference equality to decide
+ *  whether a child is "the same" across renders. If `all()` created
+ *  `{...t, contextKey}` each time (the original bug), adding a new
+ *  terminal to context A would rewrite every object in every context —
+ *  `<For>` would then unmount + remount every live xterm across the
+ *  whole app, destroying instances and losing canvas state.
+ *
+ *  ## Plain accessors, not memos
+ *
+ *  The derived accessors are plain functions rather than `createMemo`.
+ *  Signal reads inside them are still tracked by whatever computation
+ *  calls them, and `<For>` identity comes from the stored records above
+ *  (not from the array), so behavior is identical — while the module
+ *  stays unit-testable: bun resolves `solid-js` to its server build,
+ *  where a memo never recomputes after a signal write. Re-filtering a
+ *  handful of terminals per read is far cheaper than an xterm frame.
  */
 export function createTerminalState(selection: Accessor<string | null>): TerminalStateControls {
   const [terminalsByContext, setTerminalsByContext] = createSignal<Record<string, TerminalTabStateWithContext[]>>({})
   const [activeId, setActiveId] = createSignal<string | undefined>()
+  const [focusedId, setFocusedId] = createSignal<string | undefined>()
+  const [focusRequest, setFocusRequest] = createSignal<TerminalFocusRequest | undefined>()
+  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>>({})
+  const requests = new Map<string, SideRequest>()
 
-  const currentKey = createMemo((): string | undefined => {
+  const currentKey = (): string | undefined => {
     const sel = selection()
     if (sel === null) return undefined
     return sel === LOCAL ? LOCAL : sel
-  })
+  }
 
-  const current = createMemo((): TerminalTabStateWithContext[] => {
+  const sideKey = (): string => {
+    const sel = selection()
+    if (sel === null || sel === LOCAL) return LOCAL
+    return sel
+  }
+
+  const current = (): TerminalTabStateWithContext[] => {
     const key = currentKey()
     if (!key) return []
-    return terminalsByContext()[key] ?? []
-  })
+    return (terminalsByContext()[key] ?? []).filter((t) => t.placement === "tab")
+  }
 
-  const all = createMemo((): TerminalTabStateWithContext[] => {
+  const all = (): TerminalTabStateWithContext[] => {
     const map = terminalsByContext()
     // Concat existing per-context arrays without spreading their
     // elements, so the same record references flow through to <For>.
     const out: TerminalTabStateWithContext[] = []
-    for (const list of Object.values(map)) out.push(...list)
+    for (const list of Object.values(map)) {
+      for (const t of list) if (t.placement === "tab") out.push(t)
+    }
     return out
-  })
+  }
 
-  const lookup = createMemo(() => new Map(current().map((t) => [t.id, t])))
+  const sides = (): TerminalTabStateWithContext[] => {
+    const map = terminalsByContext()
+    // Same reference-stability rule as `all` — the side render layer is
+    // a <For> over live xterm instances too.
+    const out: TerminalTabStateWithContext[] = []
+    for (const list of Object.values(map)) {
+      for (const t of list) if (t.placement === "side") out.push(t)
+    }
+    return out
+  }
+
+  const sideForContext = (key: string) => terminalsByContext()[key]?.find((t) => t.placement === "side")
+  const side = () => sideForContext(sideKey())
+
+  const lookup = () => new Map(current().map((t) => [t.id, t]))
 
   const contextFor = (terminalId: string): string | undefined => {
     for (const [key, terms] of Object.entries(terminalsByContext())) {
@@ -124,7 +210,7 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
   const forSelection = (sel: string | null): TerminalTabStateWithContext[] => {
     if (sel === null) return []
     const key = sel === LOCAL ? LOCAL : sel
-    return terminalsByContext()[key] ?? []
+    return (terminalsByContext()[key] ?? []).filter((t) => t.placement === "tab")
   }
 
   const add = (worktreeId: string | null, term: TerminalTabState) => {
@@ -132,14 +218,18 @@ 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] }
     })
   }
 
-  const remove = (terminalId: string): string | undefined => {
+  const remove = (terminalId: string): TerminalTabStateWithContext | undefined => {
     const key = contextFor(terminalId)
     if (!key) return undefined
+    const removed = terminalsByContext()[key]?.find((t) => t.id === terminalId)
     setTerminalsByContext((prev) => {
       const list = (prev[key] ?? []).filter((t) => t.id !== terminalId)
       const next = { ...prev }
@@ -147,7 +237,13 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
       else next[key] = list
       return next
     })
-    return key
+    if (focusedId() === terminalId) setFocusedId(undefined)
+    return removed
+  }
+
+  const requestFocus = (id: string) => {
+    focusSerial++
+    setFocusRequest({ id, serial: focusSerial })
   }
 
   const hasRemembered = (sel: string | null, remembered: string | undefined): boolean => {
@@ -159,7 +255,11 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     setTerminalsByContext((prev) => {
       const list = prev[key]
       if (!list || list.length === 0) return prev
-      const byId = new Map(list.map((t) => [t.id, t]))
+      // Tab order only covers tab terminals; side terminals never join
+      // the tab strip and keep their position at the end of the list.
+      const tabs = list.filter((t) => t.placement === "tab")
+      const side = list.filter((t) => t.placement === "side")
+      const byId = new Map(tabs.map((t) => [t.id, t]))
       const next: TerminalTabStateWithContext[] = []
       for (const id of orderedIds) {
         const t = byId.get(id)
@@ -172,9 +272,10 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
       // appeared between drag start and commit) at their original tail
       // position — simpler than merging and matches the existing
       // `applyTabOrder` semantics used elsewhere in the app.
-      for (const t of list) if (byId.has(t.id)) next.push(t)
-      if (next.length === list.length && next.every((t, i) => t.id === list[i]!.id)) return prev
-      return { ...prev, [key]: next }
+      for (const t of tabs) if (byId.has(t.id)) next.push(t)
+      const ordered = [...next, ...side]
+      if (ordered.length === list.length && ordered.every((t, i) => t.id === list[i]!.id)) return prev
+      return { ...prev, [key]: ordered }
     })
   }
 
@@ -187,7 +288,7 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
   const reorderDrag = (from: string, to: string): boolean => {
     const key = currentKey()
     if (!key) return false
-    const order = (terminalsByContext()[key] ?? []).map((t) => t.id)
+    const order = current().map((t) => t.id)
     const fi = order.indexOf(from)
     const ti = order.indexOf(to)
     if (fi === -1 || ti === -1 || fi === ti) return false
@@ -198,6 +299,39 @@ 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
+    })
+    return true
+  }
+
+  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 next = { ...prev }
+      delete next[request.contextKey]
+      return next
+    })
+    return request
+  }
+
   return {
     add,
     remove,
@@ -206,12 +340,24 @@ export function createTerminalState(selection: Accessor<string | null>): Termina
     lookup,
     current,
     all,
+    sides,
+    side,
+    sideForContext,
     currentKey,
+    sideKey,
     activeId,
     setActiveId,
+    focusedId,
+    setFocusedId,
+    focusRequest,
+    requestFocus,
     hasRemembered,
     reorder,
     reorderDrag,
+    pendingSide,
+    beginSide,
+    cancelSide,
+    completeSide,
   }
 }
 
@@ -228,6 +374,10 @@ export interface TerminalHandlerDeps {
   findTab: (id: string) => { id: string } | undefined
   postMessage: (msg: unknown) => void
   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. */
@@ -235,6 +385,12 @@ export interface TerminalHandlerDeps {
   REVIEW_TAB_ID: string
 }
 
+/** Correlation ids for terminal create requests. */
+function newId(): string {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") return crypto.randomUUID()
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`
+}
+
 /**
  * Build the close-terminal handler the main component wires to the
  * close button. Picks the next visible tab before dropping the entry
@@ -253,7 +409,38 @@ export function createTerminalHandlers(deps: TerminalHandlerDeps) {
   const requestNew = () => {
     const sel = deps.getSelection()
     if (sel === null) return
-    deps.postMessage({ type: "agentManager.terminal.create", worktreeId: sel === deps.LOCAL ? null : sel })
+    deps.postMessage({
+      type: "agentManager.terminal.create",
+      createId: newId(),
+      placement: "tab",
+      worktreeId: sel === deps.LOCAL ? null : sel,
+    })
+  }
+
+  /**
+   * 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 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,
+    })
   }
 
   const closeTerminal = (terminalId: string) => {
@@ -289,6 +476,20 @@ export function createTerminalHandlers(deps: TerminalHandlerDeps) {
     deps.postMessage({ type: "agentManager.terminal.close", terminalId })
   }
 
+  /**
+   * 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.
+   */
+  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 })
+    return true
+  }
+
   const middleClick = (terminalId: string, e: MouseEvent) => {
     if (e.button !== 1) return
     e.preventDefault()
@@ -303,7 +504,7 @@ export function createTerminalHandlers(deps: TerminalHandlerDeps) {
     return true
   }
 
-  return { closeTerminal, middleClick, activate, deactivate, requestNew, closeActive }
+  return { closeTerminal, closeSide, middleClick, activate, deactivate, requestNew, requestSide, closeActive }
 }
 
 export interface TerminalMessageHandlerDeps {
@@ -312,6 +513,7 @@ export interface TerminalMessageHandlerDeps {
   saveTabMemory: () => void
   setSelection: (sel: string | typeof LOCAL) => void
   showError: (message: string) => void
+  postMessage: (message: unknown) => void
   /**
    * Called with the context key ("local" or worktree id) and the new
    * terminal id once a `terminal.created` message lands. The main
@@ -320,39 +522,85 @@ export interface TerminalMessageHandlerDeps {
    * than wherever `tabIds()`'s base composition happens to put it.
    */
   onCreated?: (contextKey: string, terminalId: string) => void
+  /** Side terminal for a context finished creating. */
+  onSideCreated?: (contextKey: string, terminalId: string) => void
+  /** Side terminal create failed for a context. */
+  onSideError?: (contextKey: string) => void
+  /** Side terminal was closed (locally or by the extension). */
+  onSideClosed?: (contextKey: string) => void
+  /** The destination setting changed (live settings sync). */
+  onDestinationChanged?: (destination: TerminalDestination) => void
+}
+
+type CreatedMessage = Extract<ExtensionMessage, { type: "agentManager.terminal.created" }>
+
+function handleCreated(deps: TerminalMessageHandlerDeps, msg: CreatedMessage) {
+  const contextKey = msg.worktreeId === null ? LOCAL : msg.worktreeId
+  const term = {
+    id: msg.terminalId,
+    title: msg.title,
+    wsUrl: msg.wsUrl,
+    font: msg.font,
+    placement: msg.placement,
+  }
+  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.
+    const request = deps.state.completeSide(msg.createId)
+    if (!request || request.cancelled || request.contextKey !== contextKey) {
+      deps.postMessage({ type: "agentManager.terminal.close", terminalId: msg.terminalId })
+      return
+    }
+    deps.state.add(msg.worktreeId, term)
+    deps.onSideCreated?.(contextKey, msg.terminalId)
+    return
+  }
+  deps.state.add(msg.worktreeId, term)
+  deps.onCreated?.(contextKey, msg.terminalId)
+  deps.saveTabMemory()
+  deps.setSelection(contextKey)
+  deps.activate(msg.terminalId)
 }
 
 /**
- * Wire handlers for the three inbound terminal messages. Returns a
- * dispatcher that accepts each message type and returns true if it
- * handled the payload. Keeps all the terminal-specific routing logic
- * out of the main webview component.
+ * Wire handlers for the inbound terminal messages. Returns a dispatcher
+ * that accepts each message type and returns true if it handled the
+ * payload. Keeps all the terminal-specific routing logic out of the
+ * main webview component.
  */
 export function createTerminalMessageHandler(deps: TerminalMessageHandlerDeps) {
   return (msg: ExtensionMessage): boolean => {
     if (msg.type === "agentManager.terminal.created") {
-      const contextKey = msg.worktreeId === null ? LOCAL : msg.worktreeId
-      deps.state.add(msg.worktreeId, {
-        id: msg.terminalId,
-        title: msg.title,
-        wsUrl: msg.wsUrl,
-        font: msg.font,
-      })
-      deps.onCreated?.(contextKey, msg.terminalId)
-      deps.saveTabMemory()
-      deps.setSelection(contextKey)
-      deps.activate(msg.terminalId)
+      handleCreated(deps, msg)
       return true
     }
     if (msg.type === "agentManager.terminal.closed") {
-      deps.state.remove(msg.terminalId)
+      const removed = deps.state.remove(msg.terminalId)
       if (deps.state.activeId() === msg.terminalId) deps.state.setActiveId(undefined)
+      if (removed?.placement === "side") deps.onSideClosed?.(removed.contextKey)
       return true
     }
     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
     }
+    if (msg.type === "agentManager.terminal.destinationChanged") {
+      deps.onDestinationChanged?.(msg.destination)
+      return true
+    }
+    // The initial destination rides along on the state message. Claimed
+    // here so the main webview handler stays free of terminal settings,
+    // but reported as unhandled because the rest of that payload belongs
+    // to the other subscribers.
+    if (msg.type === "agentManager.state" && msg.terminalDestination) {
+      deps.onDestinationChanged?.(msg.terminalDestination)
+      return false
+    }
     return false
   }
 }
diff --git a/packages/kilo-vscode/webview-ui/kiloclaw/kiloclaw.css b/packages/kilo-vscode/webview-ui/kiloclaw/kiloclaw.css
index cd595c9c76f..8cc42876aa7 100644
--- a/packages/kilo-vscode/webview-ui/kiloclaw/kiloclaw.css
+++ b/packages/kilo-vscode/webview-ui/kiloclaw/kiloclaw.css
@@ -61,37 +61,6 @@
   color: var(--vscode-descriptionForeground);
 }
 
-/* Chat panel */
-.kiloclaw-chat {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-  overflow: hidden;
-}
-
-/* Chat header */
-.kiloclaw-chat-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 10px 16px;
-  border-bottom: 1px solid var(--vscode-panel-border);
-  flex-shrink: 0;
-}
-
-.kiloclaw-chat-header-left {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.kiloclaw-chat-header-title {
-  font-size: var(--kilo-font-size-13);
-  font-weight: 500;
-  color: var(--vscode-foreground);
-}
-
 /* Status dots */
 .kiloclaw-dot {
   display: inline-block;
@@ -117,16 +86,6 @@
   background: var(--vscode-editorError-foreground, #f14c4c);
 }
 
-/* Messages area */
-.kiloclaw-messages {
-  flex: 1;
-  overflow-y: auto;
-  padding: 16px;
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
 .kiloclaw-empty {
   color: var(--vscode-descriptionForeground);
   font-size: var(--kilo-font-size-13);
@@ -458,17 +417,6 @@
   white-space: nowrap;
 }
 
-/* ── Dot states ────────────────────────────────────────────────────── */
-
-.kiloclaw-dot-idle {
-  background: var(--vscode-editorWarning-foreground, #cca700);
-}
-
-.kiloclaw-dot-unknown {
-  background: var(--vscode-descriptionForeground, #888);
-  opacity: 0.5;
-}
-
 /* ── Message bubble ─────────────────────────────────────────────────
  *
  * Layout mirrors the web UI (cloud/apps/web/src/app/(app)/claw/kilo-chat/
diff --git a/packages/kilo-vscode/webview-ui/src/App.tsx b/packages/kilo-vscode/webview-ui/src/App.tsx
index 1ac8a5dc7cc..1aa67688238 100644
--- a/packages/kilo-vscode/webview-ui/src/App.tsx
+++ b/packages/kilo-vscode/webview-ui/src/App.tsx
@@ -42,6 +42,7 @@ 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"
 
 type ViewType = "newTask" | "history" | "profile" | "settings" | "subAgentViewer"
@@ -276,14 +277,14 @@ const AppContent: Component = () => {
   }
 
   const cycleAgent = (direction: 1 | -1) => {
-    const available = session.agents().filter((a) => a.mode !== "subagent" && !a.hidden)
-    if (available.length <= 1) return
-    const current = session.selectedAgent()
-    const idx = available.findIndex((a) => a.name === current)
-    const raw = idx + direction
-    const next = raw < 0 ? available.length - 1 : raw >= available.length ? 0 : raw
-    const agent = available[next]
-    if (agent) session.selectAgent(agent.name)
+    const id = session.currentSessionID() ?? tabs?.pending() ?? session.draftSessionID()
+    cycle({
+      agents: session.agents(),
+      scope: id,
+      direction,
+      selected: session.selectedAgent,
+      select: session.selectAgent,
+    })
   }
 
   const handleForked = (message: { type?: string; sessionID?: string; forkedFromID?: string }) => {
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
index 7f3cd86583a..d63b0d6a219 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -1433,7 +1433,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
           <ModelSelector sessionID={sid} />
           <ThinkingSelector sessionID={sid} />
           <Show when={session.hasModelOverride(sid())}>
-            <Tooltip value={language.t("prompt.action.resetModel")} placement="top">
+            <Tooltip value={language.t("prompt.action.resetModel")} placement="top" openDelay={0}>
               <Button
                 variant="ghost"
                 size="small"
@@ -1449,7 +1449,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         </div>
         <div class="prompt-input-hint-actions">
           <Show when={showIndexing()}>
-            <Tooltip value={indexing.status().message || indexing.label()} placement="top">
+            <Tooltip value={indexing.status().message || indexing.label()} placement="top" openDelay={0}>
               <Button
                 variant="ghost"
                 size="small"
@@ -1481,6 +1481,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 : language.t("prompt.action.autoApprove.disabled")
             }
             placement="top"
+            openDelay={0}
           >
             <Button
               variant="ghost"
@@ -1508,7 +1509,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               onToggle={toggleSandbox}
             />
           </Show>
-          <Tooltip value={language.t("prompt.action.enhance")} placement="top">
+          <Tooltip value={language.t("prompt.action.enhance")} placement="top" openDelay={0}>
             <Button
               variant="ghost"
               size="small"
@@ -1525,7 +1526,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
           <Show
             when={showStop()}
             fallback={
-              <Tooltip value={sendLabel()} placement="top">
+              <Tooltip value={sendLabel()} placement="top" openDelay={0}>
                 <Button
                   variant="ghost"
                   size="small"
@@ -1541,7 +1542,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               </Tooltip>
             }
           >
-            <Tooltip value={language.t("prompt.action.stop")} placement="top">
+            <Tooltip value={language.t("prompt.action.stop")} placement="top" openDelay={0}>
               <Button
                 variant="ghost"
                 size="small"
diff --git a/packages/kilo-vscode/webview-ui/src/components/marketplace/marketplace.css b/packages/kilo-vscode/webview-ui/src/components/marketplace/marketplace.css
index a695688f171..8d889d93be1 100644
--- a/packages/kilo-vscode/webview-ui/src/components/marketplace/marketplace.css
+++ b/packages/kilo-vscode/webview-ui/src/components/marketplace/marketplace.css
@@ -272,15 +272,6 @@
   border-color: var(--border-critical-base) !important;
 }
 
-/* Remove dialog actions */
-
-.marketplace-remove-actions {
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-  margin-top: 16px;
-}
-
 /* Danger button (remove confirm) */
 
 .danger-btn {
diff --git a/packages/kilo-vscode/webview-ui/src/components/migration/migration.css b/packages/kilo-vscode/webview-ui/src/components/migration/migration.css
index 69e288976f9..222beb572c2 100644
--- a/packages/kilo-vscode/webview-ui/src/components/migration/migration.css
+++ b/packages/kilo-vscode/webview-ui/src/components/migration/migration.css
@@ -302,50 +302,6 @@
   margin-top: 1px;
 }
 
-.migration-wizard__error-text {
-  font-size: var(--kilo-font-size-11);
-  color: var(--vscode-errorForeground);
-  line-height: 1.4;
-  margin-top: 4px;
-}
-
-.migration-wizard__error-box {
-  margin-top: 12px;
-  padding: 12px 14px;
-  border: 1px solid color-mix(in srgb, var(--vscode-errorForeground) 28%, transparent);
-  border-radius: 12px;
-  background:
-    linear-gradient(180deg, color-mix(in srgb, var(--vscode-errorForeground) 8%, transparent), transparent),
-    color-mix(in srgb, var(--vscode-editor-background) 92%, var(--vscode-errorForeground) 8%);
-  box-shadow:
-    inset 0 1px 0 rgba(255, 255, 255, 0.04),
-    0 10px 24px rgba(0, 0, 0, 0.14);
-}
-
-.migration-wizard__error-box-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-  margin-bottom: 8px;
-}
-
-.migration-wizard__error-box-title {
-  font-size: var(--kilo-font-size-12);
-  font-weight: 700;
-  color: var(--vscode-foreground);
-  letter-spacing: 0.01em;
-}
-
-.migration-wizard__error-box .migration-wizard__error-text {
-  margin-top: 0;
-  font-size: var(--kilo-font-size-12);
-  line-height: 1.55;
-  color: color-mix(in srgb, var(--vscode-errorForeground) 92%, white 8%);
-  white-space: pre-wrap;
-  word-break: break-word;
-}
-
 .migration-session-card {
   margin-top: 12px;
   padding: 12px;
@@ -534,19 +490,12 @@
   gap: 12px;
 }
 
-.migration-session-summary__label,
-.migration-session-summary__value {
+.migration-session-summary__label {
   font-size: var(--kilo-font-size-12);
   line-height: 1.5;
   color: var(--vscode-foreground);
 }
 
-.migration-session-summary__value {
-  color: var(--vscode-descriptionForeground);
-  white-space: pre-wrap;
-  word-break: break-word;
-}
-
 .migration-session-progress__header {
   font-size: var(--kilo-font-size-12);
   font-weight: 700;
@@ -640,12 +589,6 @@
   white-space: nowrap;
 }
 
-.migration-session-progress__count {
-  flex-shrink: 0;
-  font-size: var(--kilo-font-size-11);
-  color: var(--vscode-descriptionForeground);
-}
-
 .migration-wizard__copy-btn {
   appearance: none;
   border: 1px solid var(--vscode-panel-border);
@@ -679,16 +622,6 @@
   outline-offset: 2px;
 }
 
-/* Disabled items */
-.migration-wizard__item--disabled {
-  opacity: 0.45;
-  pointer-events: none;
-}
-
-.migration-wizard__item--disabled .migration-wizard__checkmark {
-  border-color: color-mix(in srgb, var(--vscode-foreground) 8%, transparent);
-}
-
 /* Clickable item (cleanup row) — text area triggers checkbox */
 .migration-wizard__item--clickable .migration-wizard__item-text {
   cursor: pointer;
@@ -721,10 +654,6 @@
   margin-top: 20px;
 }
 
-.migration-wizard__footer--space-between {
-  justify-content: space-between;
-}
-
 .migration-wizard__btn-group {
   display: flex;
   gap: 10px;
@@ -811,7 +740,6 @@ body.vscode-high-contrast-light {
     background: var(--vscode-contrastBorder, var(--vscode-panel-border));
   }
 
-  .migration-wizard__error-box,
   .migration-wizard__copy-btn {
     border-color: var(--vscode-contrastBorder, var(--vscode-errorForeground));
   }
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 63d45639c48..380f33efd93 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx
@@ -198,8 +198,6 @@ const AgentBehaviourTab: Component = () => {
     ))
   }
 
-  const removableModes = createMemo(() => session.allAgents().filter((a) => !a.native))
-
   const confirmRemoveMode = (agent: AgentInfo) => {
     dialog.show(() => (
       <Dialog title={language.t("settings.agentBehaviour.removeAgent.title")} fit>
diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/ModelSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ModelSelector.tsx
index d3c50fbf0ff..b6e83e2836d 100644
--- a/packages/kilo-vscode/webview-ui/src/components/shared/ModelSelector.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/shared/ModelSelector.tsx
@@ -726,334 +726,339 @@ export const ModelSelectorBase: Component<ModelSelectorBaseProps> = (props) => {
           {props.description}
         </span>
       </Show>
-      <PopupSelector
-        expanded={expanded()}
-        preferredWidth={350}
-        preferredExpandedWidth={450}
-        preferredHeight={300}
-        preferredExpandedHeight={800}
-        minHeight={200}
-        placement={props.placement ?? "top-start"}
-        deferDismiss={props.deferDismiss}
-        portal={props.portal}
-        open={open()}
-        onOpenChange={setOpen}
-        triggerAs={Button}
-        triggerProps={{
-          variant: "secondary",
-          size: "normal",
-          get disabled() {
-            return !canOpen()
-          },
-          get title() {
-            return activeModel()?.id
-          },
-          get ["aria-label"]() {
-            return controlLabel()
-          },
-          get ["aria-describedby"]() {
-            return describedBy()
-          },
-        }}
-        trigger={
-          <>
-            <span class="model-selector-trigger-label">{triggerLabel()}</span>
-            <Show when={activeCollectsData()}>
-              <Tooltip value={dataLabel()} placement="top">
-                <span class="model-selector-trigger-free-data" aria-label={dataLabel()}>
-                  <Icon name="book-open-check" size="small" />
-                </span>
-              </Tooltip>
-            </Show>
-            <svg class="model-selector-trigger-chevron" width="10" height="10" viewBox="0 0 16 16" fill="currentColor">
-              <path d="M8 4l4 5H4l4-5z" />
-            </svg>
-          </>
-        }
-        class={`model-selector-popover${expanded() ? " model-selector-popover--expanded" : ""}`}
-      >
-        {(bodyH) => {
-          createEffect(() => {
-            if (!expanded()) return
-            const h = bodyH()
-            if (h === undefined) return
-            const chrome = (searchWrapperRef?.offsetHeight ?? 0) + (splitterRef?.offsetHeight ?? 0)
-            setPreviewHeight((h - chrome) / 2)
-          })
-          return (
-            <div
-              onKeyDown={handleKeyDown}
-              class={`model-selector-body${expanded() ? " model-selector-body--expanded" : ""}`}
-              style={{ height: `${bodyH()}px` }}
-              ref={bodyRef}
-            >
-              <div class="model-selector-search-wrapper" ref={searchWrapperRef}>
-                <input
-                  ref={searchRef}
-                  data-autofocus
-                  class="model-selector-search"
-                  type="text"
-                  role="combobox"
-                  aria-label={searchLabel()}
-                  aria-describedby={describedBy()}
-                  aria-autocomplete="list"
-                  aria-haspopup="tree"
-                  aria-expanded={open()}
-                  aria-controls={listID}
-                  aria-activedescendant={activeOptionID()}
-                  placeholder={language.t("dialog.model.search.placeholder")}
-                  value={search()}
-                  onInput={(e) => {
-                    setBrowsing(false)
-                    setNavigating(false)
-                    setSearch(e.currentTarget.value)
-                  }}
-                  onMouseDown={(e) => {
-                    const input = e.currentTarget
-                    if (input.selectionStart !== input.selectionEnd || input.selectionStart !== input.value.length) {
+      <Tooltip value={activeModel()?.id ?? ""} placement="top" openDelay={0} inactive={!activeModel()}>
+        <PopupSelector
+          expanded={expanded()}
+          preferredWidth={350}
+          preferredExpandedWidth={450}
+          preferredHeight={300}
+          preferredExpandedHeight={800}
+          minHeight={200}
+          placement={props.placement ?? "top-start"}
+          deferDismiss={props.deferDismiss}
+          portal={props.portal}
+          open={open()}
+          onOpenChange={setOpen}
+          triggerAs={Button}
+          triggerProps={{
+            variant: "secondary",
+            size: "normal",
+            get disabled() {
+              return !canOpen()
+            },
+            get ["aria-label"]() {
+              return controlLabel()
+            },
+            get ["aria-describedby"]() {
+              return describedBy()
+            },
+          }}
+          trigger={
+            <>
+              <span class="model-selector-trigger-label">{triggerLabel()}</span>
+              <Show when={activeCollectsData()}>
+                <Tooltip value={dataLabel()} placement="top" openDelay={0}>
+                  <span class="model-selector-trigger-free-data" aria-label={dataLabel()}>
+                    <Icon name="book-open-check" size="small" />
+                  </span>
+                </Tooltip>
+              </Show>
+              <svg
+                class="model-selector-trigger-chevron"
+                width="10"
+                height="10"
+                viewBox="0 0 16 16"
+                fill="currentColor"
+              >
+                <path d="M8 4l4 5H4l4-5z" />
+              </svg>
+            </>
+          }
+          class={`model-selector-popover${expanded() ? " model-selector-popover--expanded" : ""}`}
+        >
+          {(bodyH) => {
+            createEffect(() => {
+              if (!expanded()) return
+              const h = bodyH()
+              if (h === undefined) return
+              const chrome = (searchWrapperRef?.offsetHeight ?? 0) + (splitterRef?.offsetHeight ?? 0)
+              setPreviewHeight((h - chrome) / 2)
+            })
+            return (
+              <div
+                onKeyDown={handleKeyDown}
+                class={`model-selector-body${expanded() ? " model-selector-body--expanded" : ""}`}
+                style={{ height: `${bodyH()}px` }}
+                ref={bodyRef}
+              >
+                <div class="model-selector-search-wrapper" ref={searchWrapperRef}>
+                  <input
+                    ref={searchRef}
+                    data-autofocus
+                    class="model-selector-search"
+                    type="text"
+                    role="combobox"
+                    aria-label={searchLabel()}
+                    aria-describedby={describedBy()}
+                    aria-autocomplete="list"
+                    aria-haspopup="tree"
+                    aria-expanded={open()}
+                    aria-controls={listID}
+                    aria-activedescendant={activeOptionID()}
+                    placeholder={language.t("dialog.model.search.placeholder")}
+                    value={search()}
+                    onInput={(e) => {
                       setBrowsing(false)
                       setNavigating(false)
-                    }
-                  }}
-                />
-                <Tooltip
-                  value={expanded() ? language.t("dialog.model.collapse") : language.t("dialog.model.expand")}
-                  placement="top"
-                >
-                  <IconButton
-                    icon={expanded() ? "collapse" : "expand"}
-                    size="small"
-                    variant="ghost"
-                    aria-label={expanded() ? language.t("dialog.model.collapse") : language.t("dialog.model.expand")}
-                    aria-expanded={expanded()}
-                    aria-controls={previewID}
-                    onClick={() => {
-                      if (expanded()) {
-                        setPreActiveKey(null)
-                        setPreviewKey(null)
+                      setSearch(e.currentTarget.value)
+                    }}
+                    onMouseDown={(e) => {
+                      const input = e.currentTarget
+                      if (input.selectionStart !== input.selectionEnd || input.selectionStart !== input.value.length) {
+                        setBrowsing(false)
+                        setNavigating(false)
                       }
-                      setExpanded(!expanded())
-                      requestAnimationFrame(() => {
-                        searchRef?.focus()
-                        scrollRow(preActiveKey() ?? selectedKey(), "nearest")
-                      })
                     }}
                   />
-                </Tooltip>
-              </div>
-
-              <div id={listID} class="model-selector-list" role="tree" aria-label={label()} ref={listRef}>
-                <Show when={groups().length === 0}>
-                  <div class="model-selector-empty" role="status" aria-live="polite">
-                    {language.t("dialog.model.empty")}
-                  </div>
-                </Show>
-
-                <Show when={nodes().length > 0}>
-                  <Virtualizer
-                    ref={setVirtualizer}
-                    data={nodes()}
-                    keepMounted={mounted()}
-                    bufferSize={120}
-                    itemSize={30}
+                  <Tooltip
+                    value={expanded() ? language.t("dialog.model.collapse") : language.t("dialog.model.expand")}
+                    placement="top"
                   >
-                    {
-                      // eslint-disable-next-line complexity
-                      (node) => {
-                        if (node.kind === "group" && node.group) {
-                          const group = node.group
-                          const key = groupKey(group.key)
-                          const shown = () => isGroupOpen(group.key)
+                    <IconButton
+                      icon={expanded() ? "collapse" : "expand"}
+                      size="small"
+                      variant="ghost"
+                      aria-label={expanded() ? language.t("dialog.model.collapse") : language.t("dialog.model.expand")}
+                      aria-expanded={expanded()}
+                      aria-controls={previewID}
+                      onClick={() => {
+                        if (expanded()) {
+                          setPreActiveKey(null)
+                          setPreviewKey(null)
+                        }
+                        setExpanded(!expanded())
+                        requestAnimationFrame(() => {
+                          searchRef?.focus()
+                          scrollRow(preActiveKey() ?? selectedKey(), "nearest")
+                        })
+                      }}
+                    />
+                  </Tooltip>
+                </div>
+
+                <div id={listID} class="model-selector-list" role="tree" aria-label={label()} ref={listRef}>
+                  <Show when={groups().length === 0}>
+                    <div class="model-selector-empty" role="status" aria-live="polite">
+                      {language.t("dialog.model.empty")}
+                    </div>
+                  </Show>
+
+                  <Show when={nodes().length > 0}>
+                    <Virtualizer
+                      ref={setVirtualizer}
+                      data={nodes()}
+                      keepMounted={mounted()}
+                      bufferSize={120}
+                      itemSize={30}
+                    >
+                      {
+                        // eslint-disable-next-line complexity
+                        (node) => {
+                          if (node.kind === "group" && node.group) {
+                            const group = node.group
+                            const key = groupKey(group.key)
+                            const shown = () => isGroupOpen(group.key)
+                            return (
+                              <div
+                                id={optionID(key)}
+                                class={`model-selector-group-label${props.allowClear || group.key !== groups()[0]?.key ? " model-selector-group-label--divided" : ""}${isSelected(key) ? " selected" : ""}${isSelected(key) && !pointer() ? " keyboard-focused" : ""}`}
+                                role="treeitem"
+                                aria-level={1}
+                                aria-expanded={shown()}
+                                onMouseDown={(e) => e.preventDefault()}
+                                onClick={() => toggleGroup(group.key)}
+                                onMouseMove={() => setPointer(true)}
+                                onMouseEnter={() => {
+                                  if (pointer()) setSelectedKey(key)
+                                }}
+                              >
+                                <svg
+                                  class={`model-selector-group-chevron${shown() ? "" : " model-selector-group-chevron--collapsed"}`}
+                                  width="10"
+                                  height="10"
+                                  viewBox="0 0 16 16"
+                                  fill="currentColor"
+                                  aria-hidden="true"
+                                >
+                                  <path d="M4 6l4 5 4-5H4z" />
+                                </svg>
+                                <span>{group.label}</span>
+                                <Show when={!shown() && !!debouncedSearch()}>
+                                  <span class="model-selector-group-match-dot" aria-hidden="true" />
+                                </Show>
+                              </div>
+                            )
+                          }
+
+                          const row = node.row
+                          if (!row) return null
+                          if (row.kind === "clear") {
+                            return (
+                              <div
+                                id={optionID(CLEAR_KEY)}
+                                class={`model-selector-item${isSelected(CLEAR_KEY) && !pointer() ? " keyboard-focused" : ""}${isSelected(CLEAR_KEY) ? " selected" : ""}${!props.value?.providerID ? " active" : ""}`}
+                                role="treeitem"
+                                aria-level={1}
+                                aria-selected={!props.value?.providerID}
+                                onClick={() => pickClear()}
+                                onMouseMove={() => setPointer(true)}
+                                onMouseEnter={() => {
+                                  if (pointer()) setSelectedKey(CLEAR_KEY)
+                                }}
+                              >
+                                <span class="model-selector-item-name" style={{ "font-style": "italic", opacity: 0.7 }}>
+                                  {props.clearLabel ?? language.t("dialog.model.notSet")}
+                                </span>
+                              </div>
+                            )
+                          }
+                          if (!row.model) return null
+
+                          const model = row.model
+                          const hovered = () => isSelected(row.key)
+                          const preActive = () => isPreActive(row.key)
+                          const starred = () => favoriteKeys().has(modelKey(model.providerID, model.id))
+                          const showProvider = () => row.kind === "favorite"
+                          const showSelect = () => expanded() && preActive() && !isActive(model)
+                          const starLabel = () =>
+                            `${starred() ? language.t("model.favorite.remove") : language.t("model.favorite.add")}: ${sanitizeName(model.name)}`
                           return (
                             <div
-                              id={optionID(key)}
-                              class={`model-selector-group-label${props.allowClear || group.key !== groups()[0]?.key ? " model-selector-group-label--divided" : ""}${isSelected(key) ? " selected" : ""}${isSelected(key) && !pointer() ? " keyboard-focused" : ""}`}
-                              role="treeitem"
-                              aria-level={1}
-                              aria-expanded={shown()}
-                              onMouseDown={(e) => e.preventDefault()}
-                              onClick={() => toggleGroup(group.key)}
-                              onMouseMove={() => setPointer(true)}
-                              onMouseEnter={() => {
-                                if (pointer()) setSelectedKey(key)
-                              }}
+                              role="presentation"
+                              class={`model-selector-row${hovered() || preActive() ? " selected" : ""}`}
                             >
-                              <svg
-                                class={`model-selector-group-chevron${shown() ? "" : " model-selector-group-chevron--collapsed"}`}
-                                width="10"
-                                height="10"
-                                viewBox="0 0 16 16"
-                                fill="currentColor"
-                                aria-hidden="true"
+                              <div
+                                id={optionID(row.key)}
+                                class={`model-selector-item${(hovered() && !pointer()) || preActive() ? " keyboard-focused" : ""}${hovered() || preActive() ? " selected" : ""}${chosen(row) ? " active" : ""}`}
+                                role="treeitem"
+                                aria-level={2}
+                                aria-selected={chosen(row)}
+                                onClick={() => {
+                                  if (!expanded()) {
+                                    selectRow(row)
+                                    return
+                                  }
+                                  setRow(row.key)
+                                  setPreviewKey(row.key)
+                                  searchRef?.focus()
+                                }}
+                                onDblClick={() => {
+                                  if (expanded()) selectRow(row)
+                                }}
+                                onMouseMove={() => setPointer(true)}
+                                onMouseEnter={() => {
+                                  if (pointer()) setSelectedKey(row.key)
+                                }}
                               >
-                                <path d="M4 6l4 5 4-5H4z" />
-                              </svg>
-                              <span>{group.label}</span>
-                              <Show when={!shown() && !!debouncedSearch()}>
-                                <span class="model-selector-group-match-dot" aria-hidden="true" />
+                                <div class="model-selector-item-left">
+                                  <span class="model-selector-item-name">
+                                    {(() => {
+                                      const full = sanitizeName(model.name)
+                                      const sep = full.indexOf(": ")
+                                      if (sep < 0) return <span class="model-selector-item-name-main">{full}</span>
+                                      return (
+                                        <>
+                                          <span class="model-selector-item-name-provider">{full.slice(0, sep)}</span>
+                                          <span class="model-selector-item-name-main">{full.slice(sep + 2)}</span>
+                                        </>
+                                      )
+                                    })()}
+                                  </span>
+                                  <Show when={isAuto(model)}>
+                                    <Tooltip value={autoLabel(model)} placement="top">
+                                      <span class="model-selector-auto-icon" aria-label={autoLabel(model)}>
+                                        <Icon name="models" size="small" />
+                                      </span>
+                                    </Tooltip>
+                                  </Show>
+                                  <Show when={isFree(model) || hasByok(model) || isDataCollectedModel(model)}>
+                                    <span class="model-selector-free-data">
+                                      <Show when={isFree(model) && !hasByok(model)}>
+                                        <span class="model-selector-data-badge">
+                                          <Tag data-variant="member">{freeLabel()}</Tag>
+                                        </span>
+                                      </Show>
+                                      <Show when={hasByok(model)}>
+                                        <span class="model-selector-data-badge model-selector-data-badge--byok">
+                                          <Tag data-variant="member">BYOK</Tag>
+                                        </span>
+                                      </Show>
+                                      <Show when={isDataCollectedModel(model)}>
+                                        <Tooltip value={dataLabel()} placement="top">
+                                          <span class="model-selector-free-data-icon" aria-label={dataLabel()}>
+                                            <Icon name="book-open-check" size="small" />
+                                          </span>
+                                        </Tooltip>
+                                      </Show>
+                                    </span>
+                                  </Show>
+                                  <Show when={showProvider()}>
+                                    <span class="model-selector-item-provider-tag">{model.providerName}</span>
+                                  </Show>
+                                </div>
+                              </div>
+                              <Show when={session && props.favorites !== false}>
+                                <button
+                                  type="button"
+                                  class={`model-selector-star${starred() ? " model-selector-star--active" : ""}`}
+                                  aria-label={starLabel()}
+                                  aria-pressed={starred()}
+                                  onMouseDown={(e) => e.preventDefault()}
+                                  onClick={(e) => {
+                                    e.stopPropagation()
+                                    toggleFavorite(model, row)
+                                    searchRef?.focus()
+                                  }}
+                                >
+                                  <Icon name={starred() ? "star-filled" : "star"} size="small" />
+                                </button>
+                              </Show>
+                              <Show when={showSelect()}>
+                                <button
+                                  type="button"
+                                  class="model-selector-item-select-btn"
+                                  aria-label={`${language.t("dialog.model.select")}: ${sanitizeName(model.name)}`}
+                                  onClick={() => selectRow(row)}
+                                >
+                                  {language.t("dialog.model.select")}
+                                </button>
                               </Show>
                             </div>
                           )
                         }
-
-                        const row = node.row
-                        if (!row) return null
-                        if (row.kind === "clear") {
-                          return (
-                            <div
-                              id={optionID(CLEAR_KEY)}
-                              class={`model-selector-item${isSelected(CLEAR_KEY) && !pointer() ? " keyboard-focused" : ""}${isSelected(CLEAR_KEY) ? " selected" : ""}${!props.value?.providerID ? " active" : ""}`}
-                              role="treeitem"
-                              aria-level={1}
-                              aria-selected={!props.value?.providerID}
-                              onClick={() => pickClear()}
-                              onMouseMove={() => setPointer(true)}
-                              onMouseEnter={() => {
-                                if (pointer()) setSelectedKey(CLEAR_KEY)
-                              }}
-                            >
-                              <span class="model-selector-item-name" style={{ "font-style": "italic", opacity: 0.7 }}>
-                                {props.clearLabel ?? language.t("dialog.model.notSet")}
-                              </span>
-                            </div>
-                          )
-                        }
-                        if (!row.model) return null
-
-                        const model = row.model
-                        const hovered = () => isSelected(row.key)
-                        const preActive = () => isPreActive(row.key)
-                        const starred = () => favoriteKeys().has(modelKey(model.providerID, model.id))
-                        const showProvider = () => row.kind === "favorite"
-                        const showSelect = () => expanded() && preActive() && !isActive(model)
-                        const starLabel = () =>
-                          `${starred() ? language.t("model.favorite.remove") : language.t("model.favorite.add")}: ${sanitizeName(model.name)}`
-                        return (
-                          <div
-                            role="presentation"
-                            class={`model-selector-row${hovered() || preActive() ? " selected" : ""}`}
-                          >
-                            <div
-                              id={optionID(row.key)}
-                              class={`model-selector-item${(hovered() && !pointer()) || preActive() ? " keyboard-focused" : ""}${hovered() || preActive() ? " selected" : ""}${chosen(row) ? " active" : ""}`}
-                              role="treeitem"
-                              aria-level={2}
-                              aria-selected={chosen(row)}
-                              onClick={() => {
-                                if (!expanded()) {
-                                  selectRow(row)
-                                  return
-                                }
-                                setRow(row.key)
-                                setPreviewKey(row.key)
-                                searchRef?.focus()
-                              }}
-                              onDblClick={() => {
-                                if (expanded()) selectRow(row)
-                              }}
-                              onMouseMove={() => setPointer(true)}
-                              onMouseEnter={() => {
-                                if (pointer()) setSelectedKey(row.key)
-                              }}
-                            >
-                              <div class="model-selector-item-left">
-                                <span class="model-selector-item-name">
-                                  {(() => {
-                                    const full = sanitizeName(model.name)
-                                    const sep = full.indexOf(": ")
-                                    if (sep < 0) return <span class="model-selector-item-name-main">{full}</span>
-                                    return (
-                                      <>
-                                        <span class="model-selector-item-name-provider">{full.slice(0, sep)}</span>
-                                        <span class="model-selector-item-name-main">{full.slice(sep + 2)}</span>
-                                      </>
-                                    )
-                                  })()}
-                                </span>
-                                <Show when={isAuto(model)}>
-                                  <Tooltip value={autoLabel(model)} placement="top">
-                                    <span class="model-selector-auto-icon" aria-label={autoLabel(model)}>
-                                      <Icon name="models" size="small" />
-                                    </span>
-                                  </Tooltip>
-                                </Show>
-                                <Show when={isFree(model) || hasByok(model) || isDataCollectedModel(model)}>
-                                  <span class="model-selector-free-data">
-                                    <Show when={isFree(model) && !hasByok(model)}>
-                                      <span class="model-selector-data-badge">
-                                        <Tag data-variant="member">{freeLabel()}</Tag>
-                                      </span>
-                                    </Show>
-                                    <Show when={hasByok(model)}>
-                                      <span class="model-selector-data-badge model-selector-data-badge--byok">
-                                        <Tag data-variant="member">BYOK</Tag>
-                                      </span>
-                                    </Show>
-                                    <Show when={isDataCollectedModel(model)}>
-                                      <Tooltip value={dataLabel()} placement="top">
-                                        <span class="model-selector-free-data-icon" aria-label={dataLabel()}>
-                                          <Icon name="book-open-check" size="small" />
-                                        </span>
-                                      </Tooltip>
-                                    </Show>
-                                  </span>
-                                </Show>
-                                <Show when={showProvider()}>
-                                  <span class="model-selector-item-provider-tag">{model.providerName}</span>
-                                </Show>
-                              </div>
-                            </div>
-                            <Show when={session && props.favorites !== false}>
-                              <button
-                                type="button"
-                                class={`model-selector-star${starred() ? " model-selector-star--active" : ""}`}
-                                aria-label={starLabel()}
-                                aria-pressed={starred()}
-                                onMouseDown={(e) => e.preventDefault()}
-                                onClick={(e) => {
-                                  e.stopPropagation()
-                                  toggleFavorite(model, row)
-                                  searchRef?.focus()
-                                }}
-                              >
-                                <Icon name={starred() ? "star-filled" : "star"} size="small" />
-                              </button>
-                            </Show>
-                            <Show when={showSelect()}>
-                              <button
-                                type="button"
-                                class="model-selector-item-select-btn"
-                                aria-label={`${language.t("dialog.model.select")}: ${sanitizeName(model.name)}`}
-                                onClick={() => selectRow(row)}
-                              >
-                                {language.t("dialog.model.select")}
-                              </button>
-                            </Show>
-                          </div>
-                        )
                       }
-                    }
-                  </Virtualizer>
-                </Show>
-              </div>
+                    </Virtualizer>
+                  </Show>
+                </div>
 
-              <Show when={expanded()}>
-                <div class="model-selector-splitter" ref={splitterRef} onMouseDown={onSplitterMouseDown} />
-              </Show>
-              <div
-                id={previewID}
-                aria-hidden={!expanded()}
-                class={`model-selector-preview${expanded() ? " model-selector-preview--visible" : ""}`}
-                style={expanded() ? { height: `${previewHeight()}px` } : {}}
-              >
                 <Show when={expanded()}>
-                  <ModelPreview model={previewModel() ?? activeModel() ?? null} models={visibleModels()} />
+                  <div class="model-selector-splitter" ref={splitterRef} onMouseDown={onSplitterMouseDown} />
                 </Show>
+                <div
+                  id={previewID}
+                  aria-hidden={!expanded()}
+                  class={`model-selector-preview${expanded() ? " model-selector-preview--visible" : ""}`}
+                  style={expanded() ? { height: `${previewHeight()}px` } : {}}
+                >
+                  <Show when={expanded()}>
+                    <ModelPreview model={previewModel() ?? activeModel() ?? null} models={visibleModels()} />
+                  </Show>
+                </div>
               </div>
-            </div>
-          )
-        }}
-      </PopupSelector>
+            )
+          }}
+        </PopupSelector>
+      </Tooltip>
     </>
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
index fd03cdcb408..f49c649a9d1 100644
--- a/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
@@ -151,6 +151,7 @@ export const ThinkingSelectorBase: Component<ThinkingSelectorBaseProps> = (props
           </div>
         }
         placement="top"
+        openDelay={0}
       >
         <PopupSelector
           expanded={false}
diff --git a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextButton.tsx b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextButton.tsx
index 5a6d4f056a8..c2e6f0fa738 100644
--- a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextButton.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextButton.tsx
@@ -46,7 +46,7 @@ export const SpeechToTextButton: Component<Props> = (props) => {
   })
 
   return (
-    <Tooltip value={label()} placement="top">
+    <Tooltip value={label()} placement="top" openDelay={0}>
       <Button
         variant="ghost"
         size="small"
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-agent.ts b/packages/kilo-vscode/webview-ui/src/context/session-agent.ts
index 86764e307a2..18676c80322 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-agent.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-agent.ts
@@ -1,5 +1,22 @@
 import type { Message } from "../types/messages"
 
+export function cycleAgent(input: {
+  agents: Array<{ name: string; mode?: string; hidden?: boolean }>
+  scope?: string
+  direction: 1 | -1
+  selected: (scope?: string) => string
+  select: (name: string, scope?: string) => void
+}) {
+  const available = input.agents.filter((agent) => agent.mode !== "subagent" && !agent.hidden)
+  if (available.length <= 1) return
+  const index = available.findIndex((agent) => agent.name === input.selected(input.scope))
+  const raw = index + input.direction
+  const next = raw < 0 ? available.length - 1 : raw >= available.length ? 0 : raw
+  const name = available[next]?.name
+  if (name) input.select(name, input.scope)
+  return name
+}
+
 export function resolveSessionAgent(messages: Message[], names: Set<string>): string | undefined {
   for (let i = messages.length - 1; i >= 0; i--) {
     const name = messages[i]?.agent?.trim()
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index afad27ce397..b279c796516 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -95,7 +95,6 @@ function dropSet(prev: Set<string>, ids: Iterable<string>): Set<string> {
 type MessageMutation = Exclude<MessageLoadMode, "focus"> | "append" | "update"
 
 interface MessagePageState {
-  initialLoaded: boolean
   loadingInitial: boolean
   loadingOlder: boolean
   before?: string
@@ -104,7 +103,6 @@ interface MessagePageState {
 }
 
 const emptyPageState: MessagePageState = {
-  initialLoaded: false,
   loadingInitial: false,
   loadingOlder: false,
   hasMore: false,
@@ -211,7 +209,6 @@ interface SessionContextValue {
   costBreakdown: Accessor<Array<{ label: string; cost: number }>>
   contextUsage: Accessor<ContextUsage | undefined>
   modelUsage: Accessor<SessionModelUsage | undefined>
-  refreshModelUsage: () => void
 
   // Skills loaded from the CLI backend
   skills: Accessor<SkillInfo[]>
@@ -230,11 +227,9 @@ interface SessionContextValue {
   connectMcp: (name: string) => void
   disconnectMcp: (name: string) => void
   authenticateMcp: (name: string) => void
-  refreshMcpStatus: () => void
   selectedAgent: (sessionID?: string) => string
   selectAgent: (name: string, sessionID?: string) => void
   getSessionAgent: (sessionID: string) => string
-  getSessionModel: (sessionID: string) => ModelSelection | null
   setSessionModel: (sessionID: string, providerID: string, modelID: string) => void
   setSessionAgent: (sessionID: string, name: string) => void
   setSessionVariant: (sessionID: string, providerID: string, modelID: string, value: string, agent?: string) => void
@@ -453,10 +448,6 @@ export const SessionProvider: ParentComponent = (props) => {
     vscode.postMessage({ type: "authenticateMcp", name })
   }
 
-  const refreshMcpStatus = () => {
-    vscode.postMessage({ type: "requestMcpStatus" })
-  }
-
   // Pending agent selection for before a session exists
   const [pendingAgentSelection, setPendingAgentSelection] = createSignal<string | null>(null)
 
@@ -1294,7 +1285,7 @@ export const SessionProvider: ParentComponent = (props) => {
           next.add(session.id)
           return next
         })
-        patchPage(session.id, { initialLoaded: true, lastMutation: "append" })
+        patchPage(session.id, { lastMutation: "append" })
         setPages(
           produce((state) => {
             delete state[draftID]
@@ -1473,7 +1464,7 @@ export const SessionProvider: ParentComponent = (props) => {
         if (store.parts[msg.id]) delete parts[msg.id]
       }
       rebuildToolParts(sessionID, messages, parts)
-      patchPage(sessionID, { initialLoaded: true, lastMutation: "update" })
+      patchPage(sessionID, { lastMutation: "update" })
       return
     }
 
@@ -1529,10 +1520,9 @@ export const SessionProvider: ParentComponent = (props) => {
       // preserve the existing pagination cursor/hasMore so "load earlier"
       // keeps working.
       if (mode === "reconcile") {
-        patchPage(sessionID, { initialLoaded: true, lastMutation: "update" })
+        patchPage(sessionID, { lastMutation: "update" })
       } else {
         setPages(sessionID, {
-          initialLoaded: true,
           loadingInitial: false,
           loadingOlder: false,
           before: input.cursor,
@@ -1593,7 +1583,7 @@ export const SessionProvider: ParentComponent = (props) => {
       }
       return [...msgs, message]
     })
-    patchPage(message.sessionID, { initialLoaded: true, lastMutation: exists ? "update" : "append" })
+    patchPage(message.sessionID, { lastMutation: exists ? "update" : "append" })
 
     recoverPrefs(message.sessionID, [message])
 
@@ -2095,7 +2085,7 @@ export const SessionProvider: ParentComponent = (props) => {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
       })
-      patchPage(key, { initialLoaded: true, hasMore: false, lastMutation: "replace" })
+      patchPage(key, { hasMore: false, lastMutation: "replace" })
       setStore("messages", key, messages)
       for (const msg of messages) {
         if (msg.parts && msg.parts.length > 0) {
@@ -2242,7 +2232,7 @@ export const SessionProvider: ParentComponent = (props) => {
 
     setStore("messages", sid, (msgs = []) => [...msgs, temp])
     setStore("parts", messageID, parts)
-    patchPage(sid, { initialLoaded: true, lastMutation: "append" })
+    patchPage(sid, { lastMutation: "append" })
     queueMicrotask(() => window.dispatchEvent(new CustomEvent("resumeAutoScroll")))
   }
 
@@ -2962,7 +2952,6 @@ export const SessionProvider: ParentComponent = (props) => {
     costBreakdown,
     contextUsage,
     modelUsage,
-    refreshModelUsage,
     agents,
     allAgents,
     skills,
@@ -2975,19 +2964,12 @@ export const SessionProvider: ParentComponent = (props) => {
     connectMcp,
     disconnectMcp,
     authenticateMcp,
-    refreshMcpStatus,
     selectedAgent: agentForScope,
     selectAgent,
     getSessionAgent: (sessionID: string) => store.agentSelections[sessionID] ?? defaultAgent(),
-    getSessionModel: (sessionID: string) => {
-      const override = store.sessionOverrides[sessionID]
-      if (override) return override
-      const agentName = store.agentSelections[sessionID] ?? defaultAgent()
-      return resolveModel(agentName, store.modelSelections[agentName])
-    },
     setSessionModel: (sessionID: string, providerID: string, modelID: string) => {
       // Only write per-session override — do NOT touch global modelSelections or
-      // userSetAgents.  The override is what selected()/getSessionModel() actually
+      // userSetAgents.  The override is what selected() actually
       // reads, and mutating the global map here is both redundant and harmful: the
       // agent may not yet be assigned (sendInitialMessage calls setSessionModel
       // before setSessionAgent), so the write would land on defaultAgent() and
diff --git a/packages/kilo-vscode/webview-ui/src/context/vscode.tsx b/packages/kilo-vscode/webview-ui/src/context/vscode.tsx
index e446cb07601..b325b16d4a4 100644
--- a/packages/kilo-vscode/webview-ui/src/context/vscode.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/vscode.tsx
@@ -5,6 +5,7 @@
 
 import { createContext, useContext, onCleanup, ParentComponent, createSignal } from "solid-js"
 import type { VSCodeAPI, WebviewMessage, ExtensionMessage } from "../types/messages"
+import { ClipboardProvider } from "@kilocode/kilo-ui/context/clipboard"
 
 // Get the VS Code API (only available in webview context)
 let vscodeApi: VSCodeAPI | undefined
@@ -42,6 +43,7 @@ const VSCodeContext = createContext<VSCodeContextValue>()
 export const VSCodeProvider: ParentComponent = (props) => {
   const api = getVSCodeAPI()
   const handlers = new Set<(message: ExtensionMessage) => void>()
+  const copies = new Map<string, { resolve: () => void; reject: (err: Error) => void }>()
 
   // Model-selector expand/collapse preference. Stored in extension globalState
   // so it is shared across webviews (sidebar + agent-manager panel); a local
@@ -51,10 +53,25 @@ export const VSCodeProvider: ParentComponent = (props) => {
   // Listen for messages from the extension
   const messageListener = (event: MessageEvent) => {
     const message = event.data as ExtensionMessage
+    if (message.type === "clipboardWriteResult") {
+      const copy = copies.get(message.id)
+      if (!copy) return
+      copies.delete(message.id)
+      if (message.ok) {
+        copy.resolve()
+        return
+      }
+      copy.reject(new Error(message.error ?? "Failed to write to clipboard"))
+      return
+    }
     handlers.forEach((handler) => handler(message))
   }
 
   window.addEventListener("message", messageListener)
+  const reportFocus = () => api.postMessage({ type: "webviewFocusChanged", focused: document.hasFocus() })
+  window.addEventListener("focus", reportFocus)
+  window.addEventListener("blur", reportFocus)
+  reportFocus()
   handlers.add((message) => {
     if (message?.type === "modelSelectorExpandedLoaded") setExpanded(message.value)
   })
@@ -62,7 +79,10 @@ export const VSCodeProvider: ParentComponent = (props) => {
 
   onCleanup(() => {
     window.removeEventListener("message", messageListener)
+    window.removeEventListener("focus", reportFocus)
+    window.removeEventListener("blur", reportFocus)
     handlers.clear()
+    copies.clear()
   })
 
   const value: VSCodeContextValue = {
@@ -82,7 +102,25 @@ export const VSCodeProvider: ParentComponent = (props) => {
     },
   }
 
-  return <VSCodeContext.Provider value={value}>{props.children}</VSCodeContext.Provider>
+  return (
+    <VSCodeContext.Provider value={value}>
+      <ClipboardProvider
+        write={(text) =>
+          new Promise((resolve, reject) => {
+            const id = crypto.randomUUID()
+            copies.set(id, { resolve, reject })
+            api.postMessage({ type: "copyToClipboard", id, text })
+            setTimeout(() => {
+              if (!copies.delete(id)) return
+              reject(new Error("Clipboard write timed out"))
+            }, 5000)
+          })
+        }
+      >
+        {props.children}
+      </ClipboardProvider>
+    </VSCodeContext.Provider>
+  )
 }
 
 export function useVSCode(): VSCodeContextValue {
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index 64dc58a6165..592ae22dcf8 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -52,85 +52,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "مقترح",
-  "command.category.view": "عرض",
-  "command.category.project": "مشروع",
-  "command.category.provider": "موفر",
-  "command.category.server": "خادم",
-  "command.category.session": "جلسة",
-  "command.category.theme": "سمة",
-  "command.category.language": "لغة",
-  "command.category.file": "ملف",
-  "command.category.context": "سياق",
-  "command.category.terminal": "محطة طرفية",
-  "command.category.model": "نموذج",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "وكيل",
-  "command.category.permissions": "أذونات",
-  "command.category.workspace": "مساحة عمل",
-  "command.category.settings": "إعدادات",
 
-  "theme.scheme.system": "نظام",
-  "theme.scheme.light": "فاتح",
-  "theme.scheme.dark": "داكن",
-
-  "command.sidebar.toggle": "تبديل الشريط الجانبي",
-  "command.project.open": "فتح مشروع",
   "command.provider.connect": "اتصال بموفر",
-  "command.server.switch": "تبديل الخادم",
-  "command.settings.open": "فتح الإعدادات",
-  "command.session.previous": "الجلسة السابقة",
-  "command.session.next": "الجلسة التالية",
-  "command.session.previous.unseen": "الجلسة غير المقروءة السابقة",
-  "command.session.next.unseen": "الجلسة غير المقروءة التالية",
-  "command.session.archive": "أرشفة الجلسة",
-
-  "command.palette": "لوحة الأوامر",
-
-  "command.theme.cycle": "تغيير السمة",
-  "command.theme.set": "استخدام السمة: {{theme}}",
-  "command.theme.scheme.cycle": "تغيير مخطط الألوان",
-  "command.theme.scheme.set": "استخدام مخطط الألوان: {{scheme}}",
-
-  "command.language.cycle": "تغيير اللغة",
-  "command.language.set": "استخدام اللغة: {{language}}",
 
   "command.session.new": "جلسة جديدة",
-  "command.session.new.task": "مهمة جديدة",
   "command.session.show.changes": "إظهار التغييرات",
-  "command.file.open": "فتح ملف",
-  "command.tab.close": "إغلاق علامة التبويب",
-  "command.context.addSelection": "إضافة التحديد إلى السياق",
-  "command.context.addSelection.description": "إضافة الأسطر المحددة من الملف الحالي",
-  "command.terminal.toggle": "تبديل المحطة الطرفية",
-  "command.fileTree.toggle": "تبديل شجرة الملفات",
   "command.review.toggle": "تبديل المراجعة",
-  "command.terminal.new": "محطة طرفية جديدة",
-  "command.terminal.new.description": "إنشاء علامة تبويب جديدة للمحطة الطرفية",
-  "command.steps.toggle": "تبديل الخطوات",
-  "command.steps.toggle.description": "إظهار أو إخفاء خطوات الرسالة الحالية",
-  "command.message.previous": "الرسالة السابقة",
-  "command.message.previous.description": "انتقل إلى رسالة المستخدم السابقة",
-  "command.message.next": "الرسالة التالية",
-  "command.message.next.description": "انتقل إلى رسالة المستخدم التالية",
-  "command.model.choose": "اختيار نموذج",
-  "command.model.choose.description": "حدد نموذجًا مختلفًا",
-  "command.mcp.toggle": "تبديل MCPs",
-  "command.mcp.toggle.description": "تبديل MCPs",
-  "command.agent.cycle": "تغيير الوكيل",
-  "command.agent.cycle.description": "التبديل إلى الوكيل التالي",
-  "command.agent.cycle.reverse": "تغيير الوكيل للخلف",
-  "command.agent.cycle.reverse.description": "التبديل إلى الوكيل السابق",
-  "command.model.variant.cycle": "تغيير جهد التفكير",
-  "command.model.variant.cycle.description": "التبديل إلى مستوى الجهد التالي",
-  "command.permissions.autoaccept.enable": "قبول التعديلات تلقائيًا",
-  "command.permissions.autoaccept.disable": "إيقاف قبول التعديلات تلقائيًا",
-  "command.workspace.toggle": "تبديل مساحات العمل",
-  "command.workspace.toggle.description": "تمكين أو تعطيل مساحات العمل المتعددة في الشريط الجانبي",
-  "command.session.undo": "تراجع",
-  "command.session.undo.description": "تراجع عن الرسالة الأخيرة",
-  "command.session.redo": "إعادة",
-  "command.session.redo.description": "إعادة الرسالة التي تم التراجع عنها",
   "revert.banner.count_one": "تم التراجع عن {{count}} رسالة",
   "revert.banner.count_other": "تم التراجع عن {{count}} رسائل",
   "revert.banner.redo": "إعادة",
@@ -143,13 +70,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "تفعيل اللقطات",
   "revert.disabled.agentBusy": "انتظر انتهاء الوكيل",
   "command.session.compact": "ضغط الجلسة",
-  "command.session.compact.description": "تلخيص الجلسة لتقليل حجم السياق",
-  "command.session.fork": "تشعب من الرسالة",
-  "command.session.fork.description": "إنشاء جلسة جديدة من رسالة سابقة",
-  "command.session.share": "مشاركة الجلسة",
-  "command.session.share.description": "مشاركة هذه الجلسة ونسخ الرابط إلى الحافظة",
-  "command.session.unshare": "إلغاء مشاركة الجلسة",
-  "command.session.unshare.description": "إيقاف مشاركة هذه الجلسة",
   "command.session.export": "تصدير سجل الجلسة",
 
   "agentRequirements.skill.installed": "مثبت",
@@ -176,11 +96,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "لم يعد فحص متطلبات هذا الوكيل نشطًا.",
   "agentRequirements.error.requestFailed": "تعذر على Kilo فحص متطلبات الوكيل.",
 
-  "palette.search.placeholder": "البحث في الملفات والأوامر والجلسات",
-  "palette.empty": "لا توجد نتائج",
-  "palette.group.commands": "الأوامر",
-  "palette.group.files": "الملفات",
-
   "dialog.provider.search.placeholder": "البحث عن موفرين",
   "dialog.provider.empty": "لم يتم العثور على موفرين",
   "dialog.provider.group.other": "آخر",
@@ -189,19 +104,13 @@ export const dict = {
   "dialog.model.select.title": "تحديد نموذج",
   "dialog.model.search.placeholder": "البحث عن نماذج",
   "dialog.model.empty": "لا توجد نتائج للنماذج",
-  "dialog.model.manage": "إدارة النماذج",
-  "dialog.model.manage.description": "تخصيص النماذج التي تظهر في محدد النماذج.",
   "dialog.model.select": "تحديد",
   "dialog.model.expand": "توسيع",
   "dialog.model.collapse": "طي",
 
-  "dialog.model.unpaid.freeModels.title": "نماذج مجانية مقدمة من Kilo",
-  "dialog.model.unpaid.addMore.title": "إضافة المزيد من النماذج من موفرين مشهورين",
-
   "dialog.provider.viewAll": "عرض المزيد من الموفرين",
 
   "provider.connect.title": "اتصال {{provider}}",
-  "provider.connect.title.anthropicProMax": "تسجيل الدخول باستخدام Claude Pro/Max",
   "provider.connect.selectMethod": "حدد طريقة تسجيل الدخول لـ {{provider}}.",
   "provider.connect.method.apiKey": "مفتاح API",
   "provider.connect.status.inProgress": "جارٍ التفويض...",
@@ -228,13 +137,6 @@ export const dict = {
   "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.opencodeZen.line1":
-    "يمنحك OpenCode Zen الوصول إلى مجموعة مختارة من النماذج الموثوقة والمحسنة لوكلاء البرمجة.",
-  "provider.connect.opencodeZen.line2":
-    "باستخدام مفتاح API واحد، ستحصل على إمكانية الوصول إلى نماذج مثل Claude و GPT و Gemini و GLM والمزيد.",
-  "provider.connect.opencodeZen.visit.prefix": "قم بزيارة ",
-  "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " للحصول على مفتاح API الخاص بك.",
   "provider.connect.oauth.code.visit.prefix": "قم بزيارة ",
   "provider.connect.oauth.code.visit.link": "هذا الرابط",
   "provider.connect.oauth.code.visit.suffix":
@@ -242,7 +144,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "رمز تفويض {{method}}",
   "provider.connect.oauth.code.placeholder": "رمز التفويض",
   "provider.connect.oauth.code.required": "رمز التفويض مطلوب",
-  "provider.connect.oauth.code.invalid": "رمز التفويض غير صالح",
   "provider.connect.oauth.auto.visit.prefix": "قم بزيارة ",
   "provider.connect.oauth.auto.visit.link": "هذا الرابط",
   "provider.connect.oauth.auto.visit.suffix": " وأدخل الرمز أدناه لتوصيل حسابك واستخدام نماذج {{provider}} في Kilo.",
@@ -254,28 +155,11 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "لم تعد نماذج {{provider}} متاحة.",
   "model.tag.free": "مجاني",
   "model.tag.dataCollected": "قد تُستخدم البيانات للتدريب",
-  "model.tag.latest": "الأحدث",
   "model.group.auto": "النماذج التلقائية",
   "model.group.recommended": "موصى به",
   "model.group.favorites": "المفضلة",
-  "model.group.collapse": "طي {{group}}",
-  "model.group.expand": "توسيع {{group}}",
   "model.favorite.add": "إضافة إلى المفضلة",
   "model.favorite.remove": "إزالة من المفضلة",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "نص",
-  "model.input.image": "صورة",
-  "model.input.audio": "صوت",
-  "model.input.video": "فيديو",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "يسمح: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "يسمح بالاستنتاج",
-  "model.tooltip.reasoning.none": "بدون استنتاج",
-  "model.tooltip.context": "حد السياق {{limit}}",
   "model.preview.label.released": "الإصدار",
   "model.preview.label.input": "الإدخال",
   "model.preview.label.output": "الإخراج",
@@ -296,11 +180,8 @@ export const dict = {
   "model.preview.modality.video": "فيديو",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "بحث",
   "common.goBack": "رجوع",
-  "common.goForward": "تقدم",
   "common.loading": "جارٍ التحميل",
-  "common.loading.ellipsis": "...",
   "common.cancel": "إلغاء",
   "common.connect": "اتصال",
   "common.disconnect": "قطع الاتصال",
@@ -308,54 +189,8 @@ export const dict = {
   "common.save": "حفظ",
   "common.saving": "جارٍ الحفظ...",
   "common.default": "افتراضي",
-  "common.attachment": "مرفق",
 
-  "prompt.placeholder.shell": "أدخل أمر shell...",
-  "prompt.placeholder.normal": 'اسأل أي شيء... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "لخّص التعليقات…",
-  "prompt.placeholder.summarizeComment": "لخّص التعليق…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc للخروج",
-
-  "prompt.example.1": "إصلاح TODO في قاعدة التعليمات البرمجية",
-  "prompt.example.2": "ما هو المكدس التقني لهذا المشروع؟",
-  "prompt.example.3": "إصلاح الاختبارات المعطلة",
-  "prompt.example.4": "اشرح كيف تعمل المصادقة",
-  "prompt.example.5": "البحث عن وإصلاح الثغرات الأمنية",
-  "prompt.example.6": "إضافة اختبارات وحدة لخدمة المستخدم",
-  "prompt.example.7": "إعادة هيكلة هذه الدالة لتكون أكثر قابلية للقراءة",
-  "prompt.example.8": "ماذا يعني هذا الخطأ؟",
-  "prompt.example.9": "ساعدني في تصحيح هذه المشكلة",
-  "prompt.example.10": "توليد وثائق API",
-  "prompt.example.11": "تحسين استعلامات قاعدة البيانات",
-  "prompt.example.12": "إضافة التحقق من صحة الإدخال",
-  "prompt.example.13": "إنشاء مكون جديد لـ...",
-  "prompt.example.14": "كيف أقوم بنشر هذا المشروع؟",
-  "prompt.example.15": "مراجعة الكود الخاص بي لأفضل الممارسات",
-  "prompt.example.16": "إضافة معالجة الأخطاء لهذه الدالة",
-  "prompt.example.17": "اشرح نمط regex هذا",
-  "prompt.example.18": "تحويل هذا إلى TypeScript",
-  "prompt.example.19": "إضافة تسجيل الدخول (logging) في جميع أنحاء قاعدة التعليمات البرمجية",
-  "prompt.example.20": "ما هي التبعيات القديمة؟",
-  "prompt.example.21": "ساعدني في كتابة برنامج نصي للهجرة",
-  "prompt.example.22": "تنفيذ التخزين المؤقت لهذه النقطة النهائية",
-  "prompt.example.23": "إضافة ترقيم الصفحات إلى هذه القائمة",
-  "prompt.example.24": "إنشاء أمر CLI لـ...",
-  "prompt.example.25": "كيف تعمل متغيرات البيئة هنا؟",
-
-  "prompt.popover.emptyResults": "لا توجد نتائج مطابقة",
-  "prompt.popover.emptyCommands": "لا توجد أوامر مطابقة",
-  "prompt.dropzone.label": "أفلت الصور أو ملفات PDF هنا",
-  "prompt.slash.badge.custom": "مخصص",
-  "prompt.slash.badge.skill": "مهارة",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "نشط",
-  "prompt.context.includeActiveFile": "تضمين الملف النشط",
-  "prompt.context.removeActiveFile": "إزالة الملف النشط من السياق",
-  "prompt.context.removeFile": "إزالة الملف من السياق",
   "prompt.thinking.tooltip": "جهد الاستدلال",
-  "prompt.action.attachFile": "إرفاق ملف",
-  "prompt.attachment.remove": "إزالة المرفق",
   "prompt.action.send": "إرسال",
   "prompt.action.send.blocked": "أجب عن السؤال المعلق أو تجاهله أولاً",
   "prompt.action.send.recording": "تفريغ وإرسال",
@@ -393,188 +228,17 @@ export const dict = {
   "speechToText.tooltip.error": "فشل الإدخال الصوتي. انقر للمسح.",
   "speechToText.error.title": "فشل الإدخال الصوتي",
   "speechToText.error.loginRequired": "قم بتسجيل الدخول إلى Kilo لاستخدام الإدخال الصوتي.",
-  "speechToText.error.permission": "تم رفض إذن الوصول إلى الميكروفون.",
-  "speechToText.error.microphone": "تعذر بدء تشغيل الميكروفون.",
-  "speechToText.error.recording": "فشل التسجيل.",
-  "speechToText.error.emptyRecording": "لم يتم تسجيل أي صوت.",
   "speechToText.error.emptyTranscript": "لم يتم اكتشاف أي كلام.",
-  "speechToText.error.encoding": "تعذر تشفير التسجيل.",
-  "speechToText.toast.transcribed": "تم إدراج النص المنسوخ",
 
-  "prompt.toast.pasteUnsupported.title": "لصق غير مدعوم",
-  "prompt.toast.pasteUnsupported.description": "يمكن لصق الصور أو ملفات PDF فقط هنا.",
-  "prompt.toast.modelAgentRequired.title": "حدد وكيلاً ونموذجاً",
-  "prompt.toast.modelAgentRequired.description": "اختر وكيلاً ونموذجاً قبل إرسال الموجه.",
-  "prompt.toast.worktreeCreateFailed.title": "فشل إنشاء شجرة العمل",
-  "prompt.toast.sessionCreateFailed.title": "فشل إنشاء الجلسة",
-  "prompt.toast.shellSendFailed.title": "فشل إرسال أمر shell",
-  "prompt.toast.commandSendFailed.title": "فشل إرسال الأمر",
   "prompt.toast.promptSendFailed.title": "فشل إرسال الموجه",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} من {{total}} مفعل",
-  "dialog.mcp.empty": "لم يتم تكوين MCPs",
-
-  "dialog.lsp.empty": "تم الكشف تلقائيًا عن LSPs من أنواع الملفات",
-  "dialog.plugins.empty": "الإضافات المكونة في opencode.json",
-
   "mcp.status.connected": "متصل",
   "mcp.status.failed": "فشل",
   "mcp.status.needs_auth": "يحتاج إلى مصادقة",
   "mcp.status.needs_registration": "يحتاج إلى تسجيل العميل",
   "mcp.status.disabled": "معطل",
 
-  "dialog.fork.empty": "لا توجد رسائل للتفرع منها",
-
-  "dialog.directory.search.placeholder": "البحث في المجلدات",
-  "dialog.directory.empty": "لم يتم العثور على مجلدات",
-
-  "dialog.server.title": "الخوادم",
-  "dialog.server.description": "تبديل خادم Kilo الذي يتصل به هذا التطبيق.",
-  "dialog.server.search.placeholder": "البحث في الخوادم",
-  "dialog.server.empty": "لا توجد خوادم بعد",
-  "dialog.server.add.title": "إضافة خادم",
-  "dialog.server.add.url": "عنوان URL للخادم",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "تعذر الاتصال بالخادم",
-  "dialog.server.add.checking": "جارٍ التحقق...",
-  "dialog.server.add.button": "إضافة خادم",
-  "dialog.server.default.title": "الخادم الافتراضي",
-  "dialog.server.default.description":
-    "الاتصال بهذا الخادم عند بدء تشغيل التطبيق بدلاً من بدء خادم محلي. يتطلب إعادة التشغيل.",
-  "dialog.server.default.none": "لم يتم تحديد خادم",
-  "dialog.server.default.set": "تعيين الخادم الحالي كافتراضي",
-  "dialog.server.default.clear": "مسح",
-  "dialog.server.action.remove": "إزالة الخادم",
-
-  "dialog.server.menu.edit": "تعديل",
-  "dialog.server.menu.default": "تعيين كافتراضي",
-  "dialog.server.menu.defaultRemove": "إزالة الافتراضي",
-  "dialog.server.menu.delete": "حذف",
-  "dialog.server.current": "الخادم الحالي",
-  "dialog.server.status.default": "افتراضي",
-
-  "dialog.project.edit.title": "تحرير المشروع",
-  "dialog.project.edit.name": "الاسم",
-  "dialog.project.edit.icon": "أيقونة",
-  "dialog.project.edit.icon.alt": "أيقونة المشروع",
-  "dialog.project.edit.icon.hint": "انقر أو اسحب صورة",
-  "dialog.project.edit.icon.recommended": "موصى به: 128x128px",
-  "dialog.project.edit.color": "لون",
-  "dialog.project.edit.color.select": "اختر لون {{color}}",
-
-  "dialog.project.edit.worktree.startup": "سكريبت بدء تشغيل مساحة العمل",
-  "dialog.project.edit.worktree.startup.description": "يتم تشغيله بعد إنشاء مساحة عمل جديدة (شجرة عمل).",
-  "dialog.project.edit.worktree.startup.placeholder": "مثال: bun install",
-  "context.breakdown.title": "تفصيل السياق",
-  "context.breakdown.note": 'تفصيل تقريبي لرموز الإدخال. يشمل "أخرى" تعريفات الأدوات والنفقات العامة.',
-  "context.breakdown.system": "النظام",
-  "context.breakdown.user": "المستخدم",
-  "context.breakdown.assistant": "المساعد",
-  "context.breakdown.tool": "استدعاءات الأداة",
-  "context.breakdown.other": "أخرى",
-
-  "context.systemPrompt.title": "موجه النظام",
-  "context.rawMessages.title": "الرسائل الخام",
-
-  "context.stats.session": "جلسة",
-  "context.stats.messages": "رسائل",
-  "context.stats.provider": "موفر",
-  "context.stats.model": "نموذج",
-  "context.stats.limit": "حد السياق",
-  "context.stats.totalTokens": "إجمالي الرموز",
-  "context.stats.usage": "استخدام",
-  "context.stats.inputTokens": "رموز الإدخال",
-  "context.stats.outputTokens": "رموز الإخراج",
-  "context.stats.reasoningTokens": "رموز الاستنتاج",
-  "context.stats.cacheTokens": "رموز التخزين المؤقت (قراءة/كتابة)",
-  "context.stats.userMessages": "رسائل المستخدم",
-  "context.stats.assistantMessages": "رسائل المساعد",
-  "context.stats.totalCost": "التكلفة الإجمالية",
-  "context.stats.sessionCreated": "تم إنشاء الجلسة",
-  "context.stats.lastActivity": "آخر نشاط",
-
-  "context.usage.tokens": "رموز",
-  "context.usage.usage": "استخدام",
-  "context.usage.cost": "تكلفة",
-  "context.usage.clickToView": "انقر لعرض السياق",
-  "context.usage.view": "عرض استخدام السياق",
-
-  "toast.language.title": "لغة",
-  "toast.language.description": "تم التبديل إلى {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "تم تبديل السمة",
-  "toast.scheme.title": "مخطط الألوان",
-
-  "toast.permissions.autoaccept.on.title": "قبول التعديلات تلقائيًا",
-  "toast.permissions.autoaccept.on.description": "سيتم الموافقة تلقائيًا على أذونات التحرير والكتابة",
-  "toast.permissions.autoaccept.off.title": "توقف قبول التعديلات تلقائيًا",
-  "toast.permissions.autoaccept.off.description": "ستتطلب أذونات التحرير والكتابة موافقة",
-
-  "toast.workspace.enabled.title": "تم تمكين مساحات العمل",
-  "toast.workspace.enabled.description": "الآن يتم عرض عدة worktrees في الشريط الجانبي",
-  "toast.workspace.disabled.title": "تم تعطيل مساحات العمل",
-  "toast.workspace.disabled.description": "يتم عرض worktree الرئيسي فقط في الشريط الجانبي",
-
-  "toast.model.none.title": "لم يتم تحديد نموذج",
-  "toast.model.none.description": "قم بتوصيل موفر لتلخيص هذه الجلسة",
-
-  "toast.file.loadFailed.title": "فشل تحميل الملف",
-
-  "toast.file.listFailed.title": "فشل سرد الملفات",
-  "toast.context.noLineSelection.title": "لا يوجد تحديد للأسطر",
-  "toast.context.noLineSelection.description": "حدد نطاق أسطر في تبويب ملف أولاً.",
-  "toast.session.share.copyFailed.title": "فشل نسخ عنوان URL إلى الحافظة",
-  "toast.session.share.success.title": "تمت مشاركة الجلسة",
-  "toast.session.share.success.description": "تم نسخ عنوان URL للمشاركة إلى الحافظة!",
-  "toast.session.share.failed.title": "فشل مشاركة الجلسة",
-  "toast.session.share.failed.description": "حدث خطأ أثناء مشاركة الجلسة",
-
-  "toast.session.unshare.success.title": "تم إلغاء مشاركة الجلسة",
-  "toast.session.unshare.success.description": "تم إلغاء مشاركة الجلسة بنجاح!",
-  "toast.session.unshare.failed.title": "فشل إلغاء مشاركة الجلسة",
-  "toast.session.unshare.failed.description": "حدث خطأ أثناء إلغاء مشاركة الجلسة",
-
   "toast.session.rename.invalid.title": "عنوان الجلسة غير صالح",
-  "toast.session.listFailed.title": "فشل تحميل الجلسات لـ {{project}}",
-
-  "toast.update.title": "تحديث متاح",
-  "toast.update.description": "نسخة جديدة من Kilo ({{version}}) متاحة الآن للتثبيت.",
-  "toast.update.action.installRestart": "تثبيت وإعادة تشغيل",
-  "toast.update.action.notYet": "ليس الآن",
-
-  "error.page.title": "حدث خطأ ما",
-  "error.page.description": "حدث خطأ أثناء تحميل التطبيق.",
-  "error.page.details.label": "تفاصيل الخطأ",
-  "error.page.action.restart": "إعادة تشغيل",
-  "error.page.action.checking": "جارٍ التحقق...",
-  "error.page.action.checkUpdates": "التحقق من وجود تحديثات",
-  "error.page.action.updateTo": "تحديث إلى {{version}}",
-  "error.page.report.prefix": "يرجى الإبلاغ عن هذا الخطأ لفريق Kilo",
-  "error.page.report.discord": "على Discord",
-  "error.page.version": "الإصدار: {{version}}",
-
-  "error.dev.rootNotFound":
-    "لم يتم العثور على العنصر الجذري. هل نسيت إضافته إلى index.html؟ أو ربما تمت كتابة سمة id بشكل خاطئ؟",
-
-  "error.globalSync.connectFailed": "تعذر الاتصال بالخادم. هل هناك خادم يعمل في `{{url}}`؟",
 
   "error.startup.title": "فشل الاتصال بالخادم",
 
@@ -592,29 +256,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "سجل الدخول باستخدام ChatGPT مرة أخرى، ثم أرسل رسالتك مرة أخرى لمواصلة استخدام نماذج Codex.",
 
-  "error.chain.unknown": "خطأ غير معروف",
-  "error.chain.causedBy": "بسبب:",
-  "error.chain.apiError": "خطأ API",
-  "error.chain.status": "الحالة: {{status}}",
-  "error.chain.retryable": "قابل لإعادة المحاولة: {{retryable}}",
-  "error.chain.responseBody": "نص الاستجابة:\n{{body}}",
-  "error.chain.didYouMean": "هل كنت تعني: {{suggestions}}",
-  "error.chain.modelNotFound": "النموذج غير موجود: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "تحقق من أسماء الموفر/النموذج في التكوين (opencode.json)",
-  "error.chain.mcpFailed": 'فشل خادم MCP "{{name}}". لاحظ أن Kilo لا يدعم مصادقة MCP بعد.',
-  "error.chain.providerAuthFailed": "فشلت مصادقة الموفر ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed": 'فشل تهيئة الموفر "{{provider}}". تحقق من بيانات الاعتماد والتكوين.',
-  "error.chain.configJsonInvalid": "ملف التكوين في {{path}} ليس JSON(C) صالحًا",
-  "error.chain.configJsonInvalidWithMessage": "ملف التكوين في {{path}} ليس JSON(C) صالحًا: {{message}}",
-  "error.chain.configDirectoryTypo":
-    'الدليل "{{dir}}" في {{path}} غير صالح. أعد تسمية الدليل إلى "{{suggestion}}" أو قم بإزالته. هذا خطأ مطبعي شائع.',
-  "error.chain.configFrontmatterError": "فشل تحليل frontmatter في {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "ملف التكوين في {{path}} غير صالح",
-  "error.chain.configInvalidWithMessage": "ملف التكوين في {{path}} غير صالح: {{message}}",
-
   "notification.permission.title": "مطلوب إذن",
   "notification.permission.titleSubagent": "مطلوب إذن (وكيل فرعي)",
-  "notification.permission.description": "{{sessionTitle}} في {{projectName}} يحتاج إلى إذن",
   "ui.permission.manageAutoApprove": "إدارة قواعد الموافقة التلقائية",
   "ui.permission.doomLoop.prompt": "تم اكتشاف حلقة محتملة في أداة {{tool}}. هل تريد متابعة التشغيل؟",
   "ui.permission.doomLoop.rule": "متابعة استدعاءات {{tool}}",
@@ -639,7 +282,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "قراءة المهام",
   "ui.permission.toolLabel.todoWrite": "كتابة المهام",
   "ui.permission.toolLabel.codeSearch": "بحث الكود",
-  "ui.permission.toggleWrap": "تبديل التفاف الكلمات",
   "ui.permission.copyCommand": "نسخ",
   "ui.approval.auto": "تمت الموافقة تلقائيًا",
   "ui.approval.manual": "تمت الموافقة من قبلك",
@@ -651,46 +293,18 @@ export const dict = {
   "ui.approval.source.yolo": "بواسطة وضع الموافقة التلقائية (YOLO)",
   "ui.approval.source.session": "بواسطة قاعدة موافقة تلقائية للجلسة",
   "ui.approval.source.default": "افتراضيًا",
-  "notification.question.title": "سؤال",
-  "notification.question.description": "{{sessionTitle}} في {{projectName}} لديه سؤال",
-  "notification.action.goToSession": "انتقل إلى الجلسة",
 
-  "notification.session.responseReady.title": "الاستجابة جاهزة",
-  "notification.session.error.title": "خطأ في الجلسة",
-  "notification.session.error.fallbackDescription": "حدث خطأ",
-
-  "home.recentProjects": "المشاريع الحديثة",
-  "home.empty.title": "لا توجد مشاريع حديثة",
-  "home.empty.description": "ابدأ بفتح مشروع محلي",
-
-  "session.tab.session": "جلسة",
   "session.tab.review": "مراجعة",
-  "session.tab.context": "سياق",
-  "session.panel.reviewAndFiles": "المراجعة والملفات",
   "session.review.filesChanged": "تم تغيير {{count}} ملفات",
-  "session.review.change.one": "تغيير",
   "session.review.change.other": "تغييرات",
   "session.review.loadingChanges": "جارٍ تحميل التغييرات...",
-  "session.review.empty": "لا توجد تغييرات في هذه الجلسة بعد",
   "session.review.noChanges": "لا توجد تغييرات",
-  "session.files.selectToOpen": "اختر ملفًا لفتحه",
-  "session.files.all": "كل الملفات",
-  "session.files.binaryContent": "ملف ثنائي (لا يمكن عرض المحتوى)",
-  "session.messages.renderEarlier": "عرض الرسائل السابقة",
   "session.messages.loadingEarlier": "جارٍ تحميل الرسائل السابقة...",
   "session.messages.loadEarlier": "تحميل الرسائل السابقة",
   "session.messages.loading": "جارٍ تحميل الرسائل...",
-  "session.messages.jumpToLatest": "الانتقال إلى الأحدث",
 
-  "session.context.addToContext": "إضافة {{selection}} إلى السياق",
-
-  "session.new.worktree.main": "الفرع الرئيسي",
-  "session.new.worktree.mainWithBranch": "الفرع الرئيسي ({{branch}})",
-  "session.new.worktree.create": "إنشاء شجرة عمل جديدة",
-  "session.new.lastModified": "آخر تعديل",
   "sidebar.session.newSession": "جلسة جديدة",
   "sidebar.session.newSession.tooltip": "ابدأ محادثة جديدة مع الاحتفاظ بالجلسة الحالية كما هي.",
-  "sidebar.session.newSession.disabled": "هذه الجلسة جديدة بالفعل. ابدأ الدردشة أو أنشئ worktree بدلاً من ذلك.",
   "sidebar.session.newWorktree": "Worktree جديد",
   "sidebar.session.newWorktree.tooltip":
     "أنشئ git worktree معزول للتجربة بأمان، وفصل التغييرات، وتشغيل جلسات متوازية دون تعطيل فرعك الحالي.",
@@ -706,128 +320,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "انقل هذه المحادثة و{{files}} ملفات معدلة إلى worktree مخصص لمتابعة العمل في بيئة معزولة.",
   "sidebar.session.showChanges.tooltip.empty": "افتح عرض التغييرات لفحص شجرة العمل الحالية.",
-  "sidebar.session.showChanges.tooltip.one": "تم تعديل ملف واحد · +{{additions}} -{{deletions}}. افتح عرض التغييرات.",
-  "sidebar.session.showChanges.tooltip.other":
-    "تم تعديل {{files}} ملفات · +{{additions}} -{{deletions}}. افتح عرض التغييرات.",
-  "sidebar.session.agentManager.tooltip":
-    "افتح Agent Manager للحصول على نظرة عامة كاملة على الجلسات المتوازية و worktrees، لتتمكن من تنسيق المهام الطويلة في مكان واحد.",
-  "sidebar.session.openAgentManager": "فتح Agent Manager",
   "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",
-  "session.header.search.placeholder": "بحث {{project}}",
-  "session.header.searchFiles": "بحث عن الملفات",
-  "session.header.openIn": "فتح في",
-  "session.header.open.action": "فتح {{app}}",
-  "session.header.open.ariaLabel": "فتح في {{app}}",
-  "session.header.open.menu": "خيارات الفتح",
-  "session.header.open.copyPath": "نسخ المسار",
-
-  "status.popover.trigger": "الحالة",
-  "status.popover.ariaLabel": "إعدادات الخوادم",
-  "status.popover.tab.servers": "الخوادم",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "الإضافات",
-  "status.popover.action.manageServers": "إدارة الخوادم",
-
-  "session.share.popover.title": "نشر على الويب",
-  "session.share.popover.description.shared": "هذه الجلسة عامة على الويب. يمكن لأي شخص لديه الرابط الوصول إليها.",
-  "session.share.popover.description.unshared": "شارك الجلسة علنًا على الويب. ستكون متاحة لأي شخص لديه الرابط.",
-  "session.share.action.share": "مشاركة",
-  "session.share.action.publish": "نشر",
-  "session.share.action.publishing": "جارٍ النشر...",
-  "session.share.action.unpublish": "إلغاء النشر",
-  "session.share.action.unpublishing": "جارٍ إلغاء النشر...",
-  "session.share.action.view": "عرض",
-  "session.share.copy.copied": "تم النسخ",
-  "session.share.copy.copyLink": "نسخ الرابط",
-
-  "lsp.tooltip.none": "لا توجد خوادم LSP",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "جارٍ تحميل الموجه...",
-  "terminal.loading": "جارٍ تحميل المحطة الطرفية...",
-  "terminal.title": "محطة طرفية",
-  "terminal.title.numbered": "محطة طرفية {{number}}",
-  "terminal.close": "إغلاق المحطة الطرفية",
-  "terminal.connectionLost.title": "فقد الاتصال",
-  "terminal.connectionLost.description": "انقطع اتصال المحطة الطرفية. يمكن أن يحدث هذا عند إعادة تشغيل الخادم.",
 
   "common.closeTab": "إغلاق علامة التبويب",
   "common.signIn": "تسجيل الدخول",
-  "common.signOut": "تسجيل الخروج",
   "common.dismiss": "رفض",
   "common.requestFailed": "فشل الطلب",
-  "common.moreOptions": "مزيد من الخيارات",
-  "common.learnMore": "اعرف المزيد",
   "common.rename": "إعادة تسمية",
-  "common.reset": "إعادة تعيين",
-  "common.archive": "أرشفة",
   "common.delete": "حذف",
   "common.close": "إغلاق",
   "common.edit": "تحرير",
   "common.loadMore": "تحميل المزيد",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "تبديل القائمة",
-  "sidebar.nav.projectsAndSessions": "المشاريع والجلسات",
   "sidebar.settings": "الإعدادات",
-  "sidebar.help": "مساعدة",
-  "sidebar.workspaces.enable": "تمكين مساحات العمل",
-  "sidebar.workspaces.disable": "تعطيل مساحات العمل",
-  "sidebar.gettingStarted.title": "البدء",
-  "sidebar.gettingStarted.line1": "يتضمن Kilo نماذج مجانية حتى تتمكن من البدء فورًا.",
-  "sidebar.gettingStarted.line2": "قم بتوصيل أي موفر لاستخدام النماذج، بما في ذلك Claude و GPT و Gemini وما إلى ذلك.",
-  "sidebar.project.recentSessions": "الجلسات الحديثة",
-  "sidebar.project.viewAllSessions": "عرض جميع الجلسات",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "سطح المكتب",
-  "settings.section.server": "الخادم",
-  "settings.tab.general": "عام",
-  "settings.tab.shortcuts": "اختصارات",
-
-  "settings.general.section.appearance": "المظهر",
-  "settings.general.section.notifications": "إشعارات النظام",
-  "settings.general.section.updates": "التحديثات",
-  "settings.general.section.sounds": "المؤثرات الصوتية",
-
-  "settings.general.row.language.title": "اللغة",
-  "settings.general.row.language.description": "تغيير لغة العرض لـ Kilo",
-  "settings.general.row.appearance.title": "المظهر",
-  "settings.general.row.appearance.description": "تخصيص كيفية ظهور Kilo على جهازك",
-  "settings.general.row.theme.title": "السمة",
-  "settings.general.row.theme.description": "تخصيص سمة Kilo.",
-  "settings.general.row.font.title": "الخط",
-  "settings.general.row.font.description": "تخصيص الخط الأحادي المستخدم في كتل التعليمات البرمجية",
-
-  "settings.general.row.releaseNotes.title": "ملاحظات الإصدار",
-  "settings.general.row.releaseNotes.description": 'عرض نوافذ "ما الجديد" المنبثقة بعد التحديثات',
-
-  "settings.updates.row.startup.title": "التحقق من التحديثات عند بدء التشغيل",
-  "settings.updates.row.startup.description": "التحقق تلقائيًا من التحديثات عند تشغيل Kilo",
-  "settings.updates.row.check.title": "التحقق من التحديثات",
-  "settings.updates.row.check.description": "التحقق يدويًا من التحديثات وتثبيتها إذا كانت متاحة",
-  "settings.updates.action.checkNow": "تحقق الآن",
-  "settings.updates.action.checking": "جارٍ التحقق...",
-  "settings.updates.toast.latest.title": "أنت على آخر إصدار",
-  "settings.updates.toast.latest.description": "أنت تستخدم أحدث إصدار من Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "تنبيه 01",
   "sound.option.alert02": "تنبيه 02",
   "sound.option.alert03": "تنبيه 03",
@@ -874,46 +385,10 @@ export const dict = {
   "sound.option.yup05": "نعم 05",
   "sound.option.yup06": "نعم 06",
 
-  "settings.general.notifications.agent.title": "وكيل",
-  "settings.general.notifications.agent.description": "عرض إشعار النظام عندما يكتمل الوكيل أو يحتاج إلى اهتمام",
-  "settings.general.notifications.permissions.title": "أذونات",
-  "settings.general.notifications.permissions.description": "عرض إشعار النظام عند الحاجة إلى إذن",
-  "settings.general.notifications.errors.title": "أخطاء",
-  "settings.general.notifications.errors.description": "عرض إشعار النظام عند حدوث خطأ",
-
-  "settings.general.sounds.agent.title": "وكيل",
-  "settings.general.sounds.agent.description": "تشغيل صوت عندما يكتمل الوكيل أو يحتاج إلى اهتمام",
-  "settings.general.sounds.permissions.title": "أذونات",
-  "settings.general.sounds.permissions.description": "تشغيل صوت عند الحاجة إلى إذن",
-  "settings.general.sounds.errors.title": "أخطاء",
-  "settings.general.sounds.errors.description": "تشغيل صوت عند حدوث خطأ",
-
-  "settings.shortcuts.title": "اختصارات لوحة المفاتيح",
-  "settings.shortcuts.reset.button": "إعادة التعيين إلى الافتراضيات",
-  "settings.shortcuts.reset.toast.title": "تم إعادة تعيين الاختصارات",
-  "settings.shortcuts.reset.toast.description": "تم إعادة تعيين اختصارات لوحة المفاتيح إلى الافتراضيات.",
-  "settings.shortcuts.conflict.title": "الاختصار قيد الاستخدام بالفعل",
-  "settings.shortcuts.conflict.description": "{{keybind}} معين بالفعل لـ {{titles}}.",
-  "settings.shortcuts.unassigned": "غير معين",
-  "settings.shortcuts.pressKeys": "اضغط على المفاتيح",
-  "settings.shortcuts.search.placeholder": "البحث في الاختصارات",
-  "settings.shortcuts.search.empty": "لم يتم العثور على اختصارات",
-
-  "settings.shortcuts.group.general": "عام",
-  "settings.shortcuts.group.session": "جلسة",
-  "settings.shortcuts.group.navigation": "تصفح",
-  "settings.shortcuts.group.modelAndAgent": "النموذج والوكيل",
-  "settings.shortcuts.group.terminal": "المحطة الطرفية",
-  "settings.shortcuts.group.prompt": "موجه",
-
   "settings.providers.title": "الموفرون",
-  "settings.providers.description": "ستكون إعدادات الموفر قابلة للتكوين هنا.",
-  "settings.providers.betaNotice":
-    "حالياً، يمكن إعداد مزود Kilo Gateway فقط في واجهة الإعدادات. سيتوفر دعم إعداد المزودين الآخرين قريباً خلال الفترة التجريبية. في غضون ذلك، يمكنك إعداد المزودين باستخدام CLI أو ملف التكوين. نحن ملتزمون بإبقاء Kilo مفتوحاً، دون تقييد.",
   "settings.providers.section.connected": "الموفرون المتصلون",
   "settings.providers.connected.empty": "لا يوجد موفرون متصلون",
   "settings.providers.section.popular": "الموفرون الشائعون",
-  "settings.providers.search.placeholder": "البحث عن موفرين",
   "settings.providers.select.placeholder": "اختر موفرًا...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "البيئة",
@@ -932,7 +407,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "إخفاء نماذج Kilo Gateway التي قد يستخدم مزودوها مطالباتك لأغراض التدريب.",
   "settings.providers.modeModels": "نموذج لكل وضع",
-  "settings.providers.custom.note": "أضف مزودًا مخصصًا عبر عنوان URL الأساسي.",
   "settings.providers.modeModels.description":
     "تجاوز النموذج الافتراضي لأوضاع محددة. إذا لم يتم التعيين، يتم استخدام النموذج الافتراضي العام.",
   "provider.custom.title": "مزود مخصص",
@@ -997,9 +471,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "إزالة النموذج",
   "provider.custom.models.add": "إضافة نموذج",
-  "provider.custom.models.fetch": "جلب النماذج",
-  "provider.custom.models.fetching": "جارٍ الجلب\u2026",
-  "provider.custom.models.fetch.error": "فشل جلب النماذج: {{error}}",
   "provider.custom.models.fetch.authError": "فشلت المصادقة. تحقق من مفتاح API أعلاه وحاول مرة أخرى.",
   "provider.custom.models.fetch.empty": "لم يتم العثور على نماذج على هذا الخادم.",
   "provider.custom.models.fetch.added": "تمت إضافة {{count}} نموذج(نماذج).",
@@ -1050,23 +521,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "تكوين .kilocode القديم",
   "settings.config.source.projectOpencode": "تكوين .opencode القديم",
   "settings.models.title": "النماذج",
-  "settings.models.description": "ستكون إعدادات النموذج قابلة للتكوين هنا.",
-  "settings.agents.title": "الوكلاء",
-  "settings.agents.description": "ستكون إعدادات الوكيل قابلة للتكوين هنا.",
-  "settings.commands.title": "الأوامر",
-  "settings.commands.description": "ستكون إعدادات الأمر قابلة للتكوين هنا.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "ستكون إعدادات MCP قابلة للتكوين هنا.",
 
-  "settings.permissions.title": "الأذونات",
-  "settings.permissions.description": "تحكم في الأدوات التي يمكن للخادم استخدامها بشكل افتراضي.",
-  "settings.permissions.section.tools": "الأدوات",
   "settings.permissions.toast.updateFailed.title": "فشل تحديث الأذونات",
 
-  "settings.permissions.action.allow": "سماح",
-  "settings.permissions.action.ask": "سؤال",
-  "settings.permissions.action.deny": "رفض",
-
   "settings.permissions.tool.read.title": "قراءة",
   "settings.permissions.tool.read.description": "قراءة ملف (يطابق مسار الملف)",
   "settings.permissions.tool.edit.title": "تحرير",
@@ -1101,7 +558,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "حلقة الموت",
   "settings.permissions.tool.doom_loop.description": "اكتشاف استدعاءات الأدوات المتكررة بمدخلات متطابقة",
 
-  "session.delete.failed.title": "فشل حذف الجلسة",
   "session.delete.title": "حذف الجلسة",
   "session.delete.confirm": 'حذف الجلسة "{{name}}"؟',
   "session.delete.button": "حذف الجلسة",
@@ -1131,12 +587,7 @@ export const dict = {
   "workStyle.onboarding.title": "اختر كيف تريد العمل",
   "workStyle.onboarding.settingsNote": "يمكنك تغيير هذه الخيارات في أي وقت من",
   "workStyle.onboarding.settings": "الإعدادات.",
-  "workStyle.onboarding.description":
-    "يحدد هذا الإعداد القيم الافتراضية الأولية للأذونات وكتل الاستدلال ومخرجات المحطة الطرفية والمخطط الزمني للسياق. يُطبّق مرة واحدة فقط ويتجاوز الإعدادات التي خصصتها مسبقًا.",
-  "workStyle.onboarding.skip": "تخطي الآن",
   "workStyle.toast.saved.title": "تم حفظ الوضع بنجاح",
-  "workStyle.toast.saved.description": "يمكنك تحديث تفضيلاتك في أي وقت من الإعدادات.",
-  "workStyle.toast.saved.action": "الانتقال إلى الإعدادات",
   "workStyle.choice.permissions": "الأذونات",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "العرض",
@@ -1159,32 +610,6 @@ export const dict = {
   "session.cloud.import.legacy": "يبدو أن هذه جلسة قديمة لم تعد مدعومة.",
   "session.cloud.import.failed": "فشل استيراد جلسة السحابة",
 
-  "workspace.new": "مساحة عمل جديدة",
-  "workspace.type.local": "محلي",
-  "workspace.type.sandbox": "صندوق رمل",
-  "workspace.create.failed.title": "فشل إنشاء مساحة العمل",
-  "workspace.delete.failed.title": "فشل حذف مساحة العمل",
-  "workspace.resetting.title": "إعادة تعيين مساحة العمل",
-  "workspace.resetting.description": "قد يستغرق هذا دقيقة.",
-  "workspace.reset.failed.title": "فشل إعادة تعيين مساحة العمل",
-  "workspace.reset.success.title": "تمت إعادة تعيين مساحة العمل",
-  "workspace.reset.success.description": "مساحة العمل تطابق الآن الفرع الافتراضي.",
-  "workspace.error.stillPreparing": "مساحة العمل لا تزال قيد الإعداد",
-  "workspace.status.checking": "التحقق من التغييرات غير المدمجة...",
-  "workspace.status.error": "تعذر التحقق من حالة git.",
-  "workspace.status.clean": "لم يتم اكتشاف تغييرات غير مدمجة.",
-  "workspace.status.dirty": "تم اكتشاف تغييرات غير مدمجة في مساحة العمل هذه.",
-  "workspace.delete.title": "حذف مساحة العمل",
-  "workspace.delete.confirm": 'حذف مساحة العمل "{{name}}"؟',
-  "workspace.delete.button": "حذف مساحة العمل",
-  "workspace.reset.title": "إعادة تعيين مساحة العمل",
-  "workspace.reset.confirm": 'إعادة تعيين مساحة العمل "{{name}}"؟',
-  "workspace.reset.button": "إعادة تعيين مساحة العمل",
-  "workspace.reset.archived.none": "لن تتم أرشفة أي جلسات نشطة.",
-  "workspace.reset.archived.one": "ستتم أرشفة جلسة واحدة.",
-  "workspace.reset.archived.many": "ستتم أرشفة {{count}} جلسات.",
-  "workspace.reset.note": "سيؤدي هذا إلى إعادة تعيين مساحة العمل لتتطابق مع الفرع الافتراضي.",
-
   "deviceAuth.toast.urlCopied": "تم نسخ الرابط إلى الحافظة",
   "deviceAuth.toast.codeCopied": "تم نسخ الرمز إلى الحافظة",
   "deviceAuth.toast.errorCopied": "تم نسخ الخطأ إلى الحافظة",
@@ -1222,7 +647,6 @@ export const dict = {
   "profile.pass.renews": "يتجدد",
   "profile.action.logout": "تسجيل الخروج",
 
-  "settings.section.configuration": "الإعدادات",
   "settings.agentBehaviour.title": "سلوك الوكيل",
   "settings.autoApprove.title": "الموافقة التلقائية",
   "settings.browser.title": "المتصفح",
@@ -1243,7 +667,6 @@ export const dict = {
   "settings.indexing.globalEnable.description": "تمكين الفهرسة لكل مساحة عمل.",
   "settings.indexing.projectEnable.title": "تمكين لهذا المشروع",
   "settings.indexing.projectEnable.description": "تمكين الفهرسة لمساحة العمل هذه عندما تكون الفهرسة العامة متوقفة.",
-  "settings.indexing.projectEnable.disabledTooltip": "الفهرسة العامة مفعلة، لذا هذا المشروع مشمول بالفعل.",
   "settings.indexing.provider.title": "موفر التضمين",
   "settings.indexing.provider.description": "اختر الموفر المستخدم لإنشاء التضمينات للبحث الدلالي.",
   "settings.indexing.kiloModel.title": "إعداد مسبق لنموذج Kilo",
@@ -1277,7 +700,6 @@ export const dict = {
   "settings.language.title": "اللغة",
   "settings.aboutKiloCode.title": "حول Kilo Code",
 
-  "session.messages.empty": "ابدأ محادثة بكتابة رسالة أدناه.",
   "session.messages.welcome":
     "Kilo Code هو مساعد ترميز بالذكاء الاصطناعي. اطلب منه بناء ميزات أو إصلاح أخطاء أو شرح قاعدة الشيفرة.",
   "session.messages.scrollToBottom": "التمرير إلى الأسفل",
@@ -1285,7 +707,6 @@ export const dict = {
   "session.messages.taskStarting": "جاري البدء...",
   "session.status.writingResponse": "...جارٍ كتابة الرد",
   "session.status.retry": "جارٍ إعادة المحاولة…",
-  "session.status.retrying": "...إعادة المحاولة (المحاولة {{ attempt }})… {{ message }}",
   "session.status.working": "...جارٍ العمل",
   "session.status.offline": "انقطع الاتصال بالشبكة — جارٍ إعادة الاتصال...",
   "session.outcome.incomplete": "انتهى الدور مع تبقي {{count}} مهام",
@@ -1317,11 +738,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} جلسات أقدم",
   "context.stats.thisSession": "هذه الجلسة",
 
-  "time.justNow": "الآن",
-  "time.minutesAgo": "قبل {{count}} دقيقة",
-  "time.hoursAgo": "قبل {{count}} ساعة",
-  "time.daysAgo": "قبل {{count}} يوم",
-  "time.monthsAgo": "قبل {{count}} شهر",
   "time.today": "اليوم",
   "time.yesterday": "أمس",
   "time.thisWeek": "هذا الأسبوع",
@@ -1337,7 +753,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "المنفذ:",
   "settings.aboutKiloCode.versionInfo": "معلومات الإصدار",
   "settings.aboutKiloCode.version.label": "الإصدار:",
-  "settings.aboutKiloCode.extensionName": "إضافة Kilo Code",
   "settings.aboutKiloCode.community": "المجتمع والدعم",
   "settings.aboutKiloCode.feedback.prefix": "إذا كان لديك أي أسئلة أو ملاحظات، لا تتردد في فتح مشكلة على",
   "settings.aboutKiloCode.feedback.or": "أو",
@@ -1383,7 +798,6 @@ export const dict = {
   "settings.language.current": "الحالية:",
 
   "common.add": "إضافة",
-  "common.choose": "اختر…",
 
   "settings.autocomplete.autoTrigger.title": "تمكين الإكمال التلقائي المضمّن",
   "settings.autocomplete.autoTrigger.description": "عرض اقتراحات الإكمال المضمّن تلقائياً أثناء الكتابة",
@@ -1392,27 +806,14 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "تمكين الإكمال التلقائي للدردشة",
   "settings.autocomplete.chatAutocomplete.description": "عرض اقتراحات الإكمال التلقائي في مربع الدردشة",
   "settings.autocomplete.modelsHint": "لاختيار النموذج المستخدم للإكمال التلقائي، راجع إعدادات النماذج.",
-  "settings.notifications.agent.title": "إكمال الوكيل",
-  "settings.notifications.agent.description": "إظهار إشعار عند إكمال الوكيل لمهمة",
-  "settings.notifications.permissions.title": "طلبات الأذونات",
-  "settings.notifications.permissions.description": "إظهار إشعار عند طلبات الأذونات",
-  "settings.notifications.errors.title": "أخطاء",
-  "settings.notifications.errors.description": "إظهار إشعار عند الأخطاء",
   "settings.notifications.sounds": "أصوات",
   "settings.notifications.enable.title": "تمكين الإشعارات الصوتية",
   "settings.notifications.enable.description": "تشغيل أصوات عند اكتمال الجلسات أو حدوث خطأ أو الحاجة إلى ردّك",
   "settings.notifications.testSound": "اختبار",
-  "settings.notifications.agentSound.title": "صوت إكمال الوكيل",
-  "settings.notifications.agentSound.description": "الصوت عند إكمال الوكيل",
-  "settings.notifications.permSound.title": "صوت طلب الأذونات",
-  "settings.notifications.permSound.description": "الصوت عند طلبات الأذونات",
-  "settings.notifications.errorSound.title": "صوت الخطأ",
-  "settings.notifications.errorSound.description": "الصوت عند الأخطاء",
   "settings.notifications.sound.default": "افتراضي",
   "settings.notifications.sound.system": "النظام",
   "settings.notifications.sound.description":
     "يستخدم الخيار الافتراضي أصواتًا مختلفة عند الاكتمال أو الحاجة إلى ردّك أو حدوث خطأ. تستخدم الخيارات الأخرى صوتًا واحدًا لجميع الأحداث.",
-  "settings.notifications.sound.none": "بدون",
   "settings.experimental.share.title": "وضع المشاركة",
   "settings.experimental.share.description": "سلوك مشاركة الجلسة",
   "settings.experimental.share.manual": "يدوي",
@@ -1432,9 +833,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "نموذج توليد الصور",
   "settings.experimental.imageGenerationModel.placeholder": "افتراضي (Auto Router)",
 
-  "settings.experimental.speechToText.title": "تحويل الصوت إلى نص",
-  "settings.experimental.speechToText.description":
-    "تمكين الإدخال الصوتي في حقول المطالبة باستخدام حساب Kilo الخاص بك من خلال Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "قم بتمكين وتسجيل الدخول إلى مزود Kilo لاستخدام Speech to Text. ميزة Speech to Text مدعومة حاليًا فقط مع Kilo Gateway.",
   "settings.models.speechToTextModel.title": "نموذج تحويل الصوت إلى نص",
@@ -1475,15 +873,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "الوكيل الافتراضي",
   "settings.agentBehaviour.defaultAgent.description": "الوكيل المستخدم عند عدم التحديد",
   "settings.agentBehaviour.availableAgents": "الوكلاء المتاحون",
-  "settings.agentBehaviour.selectAgent": "اختر وكيلاً للتهيئة…",
-  "settings.agentBehaviour.selectAgent.title": "الوكيل",
-  "settings.agentBehaviour.selectAgent.description": "اختر وكيلاً للتهيئة…",
   "settings.agentBehaviour.modelOverride.title": "تجاوز النموذج",
   "settings.agentBehaviour.modelOverride.description": "تجاوز النموذج الافتراضي لهذا الوكيل",
   "settings.agentBehaviour.variantOverride.title": "تجاوز المتغير",
   "settings.agentBehaviour.variantOverride.description": "تجاوز متغير النموذج لهذا الوكيل",
-  "settings.agentBehaviour.prompt.title": "موجه مخصص",
-  "settings.agentBehaviour.prompt.description": "موجه نظام إضافي لهذا الوكيل",
   "settings.agentBehaviour.temperature.title": "الحرارة",
   "settings.agentBehaviour.temperature.description":
     "يتحكم في مدى عشوائية استجابات الذكاء الاصطناعي (0–2). تنتج القيم الأقل (مثل 0.2) مخرجات مركزة ومتسقة، بينما تنتج القيم الأعلى (مثل 1.0) استجابات أكثر تنوعًا وإبداعًا. اترك الحقل فارغًا لاستخدام القيمة الافتراضية للنموذج.",
@@ -1503,7 +896,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "المهارات المكتشفة",
   "settings.agentBehaviour.noSkillsFound":
     "لم يتم العثور على مهارات. أضف مسارات مجلدات أو عناوين URL أدناه لإتاحة المهارات.",
-  "settings.agentBehaviour.availableModes": "الأوضاع المخصصة المتاحة",
   "settings.agentBehaviour.noAgentsFound": "لم يتم العثور على وكلاء.",
   "settings.agentBehaviour.createMode": "إنشاء وضع جديد",
   "settings.agentBehaviour.createMode.name": "الاسم",
@@ -1584,11 +976,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "الأمر",
   "settings.agentBehaviour.mcpDetail.args": "الوسائط",
   "settings.agentBehaviour.mcpDetail.env": "البيئة",
-  "settings.agentBehaviour.mcpDetail.disabled": "هذا الخادم معطّل.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "تصفح Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "لم يتم تهيئة خوادم MCP. أضف خوادم MCP في kilo.jsonc، أو اطلب من الوكيل إضافتها لك.",
-  "settings.agentBehaviour.workflowsPlaceholder": "تُدار سير العمل عبر ملفات سير العمل في مساحة العمل.",
   "settings.agentBehaviour.workflows.description":
     "سير العمل هي أوامر شرطة مائلة مخصصة محددة في التهيئة الخاصة بك. اكتب /command-name في الدردشة لتشغيلها. يتم تهيئة الأوامر في opencode.json ضمن قسم 'command'.",
   "settings.agentBehaviour.workflows.empty": "لم يتم تهيئة أوامر مخصصة. أضف أوامر إلى opencode.json لرؤيتها هنا.",
@@ -1674,7 +1064,6 @@ export const dict = {
     "على سبيل المثال: قم بإنشاء commit messages باللغة الإسبانية باتباع تنسيق conventional commits. أرجع الـ commit message فقط.",
 
   "settings.commitMessage.language.sync": "مزامنة مع لغة واجهة المستخدم",
-  "settings.commitMessage.language.title": "اللغة",
   "settings.commitMessage.language.description": "اختر اللغة المستخدمة لرسائل الالتزام التي تولدها الذكاء الاصطناعي:",
 
   "settings.display.username.title": "اسم المستخدم",
@@ -1713,8 +1102,6 @@ export const dict = {
   "settings.providers.disabled": "مزودون معطلون",
   "settings.providers.disabled.description": "مزودون لإخفائهم من القائمة",
   "settings.providers.disabled.enable": "تمكين",
-  "settings.providers.enabled": "مزودون مفعلون (قائمة بيضاء)",
-  "settings.providers.enabled.description": "إذا تم التعيين، فقط هؤلاء المزودون سيكونون متاحين",
   "settings.providers.notSet": "غير محدد (استخدام الافتراضي)",
   "dialog.model.notSet": "غير محدد",
   "profile.personalAccount": "حساب شخصي",
@@ -1755,9 +1142,7 @@ export const dict = {
   "migration.migrate.title": "ترحيل إعداداتك",
   "migration.migrate.subtitle": "لقد وجدنا إعدادات من تثبيتك السابق. إليك ما يمكننا نقله.",
   "migration.migrate.selectLabel": "اختر ما تريد ترحيله",
-  "migration.migrate.cannotMigrate": "لا يمكن ترحيله",
   "migration.migrate.chatHistory": "جلسات الدردشة والسجل",
-  "migration.migrate.chatHistoryDesc": "غير متوافق مع البنية الجديدة",
   "migration.migrate.button": "ترحيل الإعدادات",
   "migration.migrate.skip": "تخطي",
   "migration.migrate.keysDetected": "تم اكتشاف {{count}} مفاتيح",
@@ -1781,10 +1166,7 @@ export const dict = {
     "هذا يزيل الإعدادات القديمة من مساحة تخزين VS Code. لن تتمكن من إعادة تشغيل هذا الترحيل.",
   "migration.complete.done": "تم",
   "migration.migrate.sessionsDetected": "تم اكتشاف {{count}} جلسة",
-  "migration.error.sessionFailed": "فشل ترحيل الجلسة",
   "migration.error.continue": "متابعة",
-  "migration.error.action.copy": "نسخ",
-  "migration.error.toast.copied": "تم نسخ الخطأ إلى الحافظة",
 
   "migration.sessionSummary.title": "الملخص:",
   "migration.sessionSummary.copy": "نسخ التقرير",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 7e5c167f43a..03055f35438 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Sugerido",
-  "command.category.view": "Visualizar",
-  "command.category.project": "Projeto",
-  "command.category.provider": "Provedor",
-  "command.category.server": "Servidor",
-  "command.category.session": "Sessão",
-  "command.category.theme": "Tema",
-  "command.category.language": "Idioma",
-  "command.category.file": "Arquivo",
-  "command.category.context": "Contexto",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Modelo",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agente",
-  "command.category.permissions": "Permissões",
-  "command.category.workspace": "Espaço de trabalho",
-  "command.category.settings": "Configurações",
 
-  "theme.scheme.system": "Sistema",
-  "theme.scheme.light": "Claro",
-  "theme.scheme.dark": "Escuro",
-
-  "command.sidebar.toggle": "Alternar barra lateral",
-  "command.project.open": "Abrir projeto",
   "command.provider.connect": "Conectar provedor",
-  "command.server.switch": "Trocar servidor",
-  "command.settings.open": "Abrir configurações",
-  "command.session.previous": "Sessão anterior",
-  "command.session.next": "Próxima sessão",
-  "command.session.previous.unseen": "Sessão não lida anterior",
-  "command.session.next.unseen": "Próxima sessão não lida",
-  "command.session.archive": "Arquivar sessão",
-
-  "command.palette": "Paleta de comandos",
-
-  "command.theme.cycle": "Alternar tema",
-  "command.theme.set": "Usar tema: {{theme}}",
-  "command.theme.scheme.cycle": "Alternar esquema de cores",
-  "command.theme.scheme.set": "Usar esquema de cores: {{scheme}}",
-
-  "command.language.cycle": "Alternar idioma",
-  "command.language.set": "Usar idioma: {{language}}",
 
   "command.session.new": "Nova sessão",
-  "command.session.new.task": "Nova tarefa",
   "command.session.show.changes": "Mostrar alterações",
-  "command.file.open": "Abrir arquivo",
-  "command.tab.close": "Fechar aba",
-  "command.context.addSelection": "Adicionar seleção ao contexto",
-  "command.context.addSelection.description": "Adicionar as linhas selecionadas do arquivo atual",
-  "command.terminal.toggle": "Alternar terminal",
-  "command.fileTree.toggle": "Alternar árvore de arquivos",
   "command.review.toggle": "Alternar revisão",
-  "command.terminal.new": "Novo terminal",
-  "command.terminal.new.description": "Criar uma nova aba de terminal",
-  "command.steps.toggle": "Alternar passos",
-  "command.steps.toggle.description": "Mostrar ou ocultar passos da mensagem atual",
-  "command.message.previous": "Mensagem anterior",
-  "command.message.previous.description": "Ir para a mensagem de usuário anterior",
-  "command.message.next": "Próxima mensagem",
-  "command.message.next.description": "Ir para a próxima mensagem de usuário",
-  "command.model.choose": "Escolher modelo",
-  "command.model.choose.description": "Selecionar um modelo diferente",
-  "command.mcp.toggle": "Alternar MCPs",
-  "command.mcp.toggle.description": "Alternar MCPs",
-  "command.agent.cycle": "Alternar agente",
-  "command.agent.cycle.description": "Mudar para o próximo agente",
-  "command.agent.cycle.reverse": "Alternar agente (reverso)",
-  "command.agent.cycle.reverse.description": "Mudar para o agente anterior",
-  "command.model.variant.cycle": "Alternar nível de raciocínio",
-  "command.model.variant.cycle.description": "Mudar para o próximo nível de esforço",
-  "command.permissions.autoaccept.enable": "Aceitar edições automaticamente",
-  "command.permissions.autoaccept.disable": "Parar de aceitar edições automaticamente",
-  "command.workspace.toggle": "Alternar espaços de trabalho",
-  "command.workspace.toggle.description": "Habilitar ou desabilitar múltiplos espaços de trabalho na barra lateral",
-  "command.session.undo": "Desfazer",
-  "command.session.undo.description": "Desfazer a última mensagem",
-  "command.session.redo": "Refazer",
-  "command.session.redo.description": "Refazer a última mensagem desfeita",
   "revert.banner.count_one": "{{count}} mensagem revertida",
   "revert.banner.count_other": "{{count}} mensagens revertidas",
   "revert.banner.redo": "Refazer",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Ativar snapshots",
   "revert.disabled.agentBusy": "Aguarde o agente terminar",
   "command.session.compact": "Compactar sessão",
-  "command.session.compact.description": "Resumir a sessão para reduzir o tamanho do contexto",
-  "command.session.fork": "Bifurcar da mensagem",
-  "command.session.fork.description": "Criar uma nova sessão a partir de uma mensagem anterior",
-  "command.session.share": "Compartilhar sessão",
-  "command.session.share.description": "Compartilhar esta sessão e copiar a URL para a área de transferência",
-  "command.session.unshare": "Parar de compartilhar sessão",
-  "command.session.unshare.description": "Parar de compartilhar esta sessão",
   "command.session.export": "Exportar transcrição da sessão",
 
   "agentRequirements.skill.installed": "Instalado",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Esta verificação de requisitos do agente não está mais ativa.",
   "agentRequirements.error.requestFailed": "O Kilo não conseguiu verificar os requisitos do agente.",
 
-  "palette.search.placeholder": "Buscar arquivos, comandos e sessões",
-  "palette.empty": "Nenhum resultado encontrado",
-  "palette.group.commands": "Comandos",
-  "palette.group.files": "Arquivos",
-
   "dialog.provider.search.placeholder": "Buscar provedores",
   "dialog.provider.empty": "Nenhum provedor encontrado",
   "dialog.provider.group.other": "Outro",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Selecionar modelo",
   "dialog.model.search.placeholder": "Buscar modelos",
   "dialog.model.empty": "Nenhum resultado de modelo",
-  "dialog.model.manage": "Gerenciar modelos",
-  "dialog.model.manage.description": "Personalizar quais modelos aparecem no seletor de modelos.",
   "dialog.model.select": "Selecionar",
   "dialog.model.expand": "Expandir",
   "dialog.model.collapse": "Recolher",
 
-  "dialog.model.unpaid.freeModels.title": "Modelos gratuitos fornecidos pelo Kilo",
-  "dialog.model.unpaid.addMore.title": "Adicionar mais modelos de provedores populares",
-
   "dialog.provider.viewAll": "Ver mais provedores",
 
   "provider.connect.title": "Conectar {{provider}}",
-  "provider.connect.title.anthropicProMax": "Entrar com Claude Pro/Max",
   "provider.connect.selectMethod": "Selecionar método de login para {{provider}}.",
   "provider.connect.method.apiKey": "Chave de API",
   "provider.connect.status.inProgress": "Autorização em andamento...",
@@ -231,13 +140,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "ex. my-models",
   "provider.connect.azure.baseURL.label": "URL do endpoint do Azure OpenAI",
   "provider.connect.azure.baseURL.placeholder": "ex. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen oferece acesso a um conjunto selecionado de modelos confiáveis otimizados para agentes de código.",
-  "provider.connect.opencodeZen.line2":
-    "Com uma única chave de API você terá acesso a modelos como Claude, GPT, Gemini, GLM e mais.",
-  "provider.connect.opencodeZen.visit.prefix": "Visite ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " para obter sua chave de API.",
   "provider.connect.oauth.code.visit.prefix": "Visite ",
   "provider.connect.oauth.code.visit.link": "este link",
   "provider.connect.oauth.code.visit.suffix":
@@ -245,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "Código de autorização {{method}}",
   "provider.connect.oauth.code.placeholder": "Código de autorização",
   "provider.connect.oauth.code.required": "O código de autorização é obrigatório",
-  "provider.connect.oauth.code.invalid": "Código de autorização inválido",
   "provider.connect.oauth.auto.visit.prefix": "Visite ",
   "provider.connect.oauth.auto.visit.link": "este link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -258,28 +159,11 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Os modelos de {{provider}} não estão mais disponíveis.",
   "model.tag.free": "Grátis",
   "model.tag.dataCollected": "Os dados podem ser usados para treinamento",
-  "model.tag.latest": "Mais recente",
   "model.group.auto": "Modelos automáticos",
   "model.group.recommended": "Recomendado",
   "model.group.favorites": "Favoritos",
-  "model.group.collapse": "Recolher {{group}}",
-  "model.group.expand": "Expandir {{group}}",
   "model.favorite.add": "Adicionar aos favoritos",
   "model.favorite.remove": "Remover dos favoritos",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "texto",
-  "model.input.image": "imagem",
-  "model.input.audio": "áudio",
-  "model.input.video": "vídeo",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Permite: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Permite raciocínio",
-  "model.tooltip.reasoning.none": "Sem raciocínio",
-  "model.tooltip.context": "Limite de contexto {{limit}}",
   "model.preview.label.released": "Lançado",
   "model.preview.label.input": "Entrada",
   "model.preview.label.output": "Saída",
@@ -300,11 +184,8 @@ export const dict = {
   "model.preview.modality.video": "Vídeo",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Buscar",
   "common.goBack": "Voltar",
-  "common.goForward": "Avançar",
   "common.loading": "Carregando",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Cancelar",
   "common.connect": "Conectar",
   "common.disconnect": "Desconectar",
@@ -312,54 +193,8 @@ export const dict = {
   "common.save": "Salvar",
   "common.saving": "Salvando...",
   "common.default": "Padrão",
-  "common.attachment": "anexo",
 
-  "prompt.placeholder.shell": "Digite comando do shell...",
-  "prompt.placeholder.normal": 'Pergunte qualquer coisa... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Resumir comentários…",
-  "prompt.placeholder.summarizeComment": "Resumir comentário…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc para sair",
-
-  "prompt.example.1": "Corrigir um TODO no código",
-  "prompt.example.2": "Qual é a stack tecnológica deste projeto?",
-  "prompt.example.3": "Corrigir testes quebrados",
-  "prompt.example.4": "Explicar como funciona a autenticação",
-  "prompt.example.5": "Encontrar e corrigir vulnerabilidades de segurança",
-  "prompt.example.6": "Adicionar testes unitários para o serviço de usuário",
-  "prompt.example.7": "Refatorar esta função para melhor legibilidade",
-  "prompt.example.8": "O que significa este erro?",
-  "prompt.example.9": "Me ajude a depurar este problema",
-  "prompt.example.10": "Gerar documentação da API",
-  "prompt.example.11": "Otimizar consultas ao banco de dados",
-  "prompt.example.12": "Adicionar validação de entrada",
-  "prompt.example.13": "Criar um novo componente para...",
-  "prompt.example.14": "Como faço o deploy deste projeto?",
-  "prompt.example.15": "Revisar meu código para boas práticas",
-  "prompt.example.16": "Adicionar tratamento de erros a esta função",
-  "prompt.example.17": "Explicar este padrão regex",
-  "prompt.example.18": "Converter isto para TypeScript",
-  "prompt.example.19": "Adicionar logging em todo o código",
-  "prompt.example.20": "Quais dependências estão desatualizadas?",
-  "prompt.example.21": "Me ajude a escrever um script de migração",
-  "prompt.example.22": "Implementar cache para este endpoint",
-  "prompt.example.23": "Adicionar paginação a esta lista",
-  "prompt.example.24": "Criar um comando CLI para...",
-  "prompt.example.25": "Como funcionam as variáveis de ambiente aqui?",
-
-  "prompt.popover.emptyResults": "Nenhum resultado correspondente",
-  "prompt.popover.emptyCommands": "Nenhum comando correspondente",
-  "prompt.dropzone.label": "Solte imagens ou PDFs aqui",
-  "prompt.slash.badge.custom": "personalizado",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "ativo",
-  "prompt.context.includeActiveFile": "Incluir arquivo ativo",
-  "prompt.context.removeActiveFile": "Remover arquivo ativo do contexto",
-  "prompt.context.removeFile": "Remover arquivo do contexto",
   "prompt.thinking.tooltip": "Esforço de raciocínio",
-  "prompt.action.attachFile": "Anexar arquivo",
-  "prompt.attachment.remove": "Remover anexo",
   "prompt.action.send": "Enviar",
   "prompt.action.send.blocked": "Responda ou feche a pergunta pendente primeiro",
   "prompt.action.send.recording": "Transcrever e enviar",
@@ -403,187 +238,17 @@ export const dict = {
   "speechToText.tooltip.error": "Falha na entrada de voz. Clique para limpar.",
   "speechToText.error.title": "Falha na entrada de voz",
   "speechToText.error.loginRequired": "Faça login no Kilo para usar a entrada de voz.",
-  "speechToText.error.permission": "A permissão do microfone foi negada.",
-  "speechToText.error.microphone": "Não foi possível iniciar o microfone.",
-  "speechToText.error.recording": "A gravação falhou.",
-  "speechToText.error.emptyRecording": "Nenhum áudio foi gravado.",
   "speechToText.error.emptyTranscript": "Nenhuma fala foi detectada.",
-  "speechToText.error.encoding": "Não foi possível codificar a gravação.",
-  "speechToText.toast.transcribed": "Transcrição inserida",
 
-  "prompt.toast.pasteUnsupported.title": "Colagem não suportada",
-  "prompt.toast.pasteUnsupported.description": "Somente imagens ou PDFs podem ser colados aqui.",
-  "prompt.toast.modelAgentRequired.title": "Selecione um agente e modelo",
-  "prompt.toast.modelAgentRequired.description": "Escolha um agente e modelo antes de enviar um prompt.",
-  "prompt.toast.worktreeCreateFailed.title": "Falha ao criar worktree",
-  "prompt.toast.sessionCreateFailed.title": "Falha ao criar sessão",
-  "prompt.toast.shellSendFailed.title": "Falha ao enviar comando shell",
-  "prompt.toast.commandSendFailed.title": "Falha ao enviar comando",
   "prompt.toast.promptSendFailed.title": "Falha ao enviar prompt",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} de {{total}} habilitados",
-  "dialog.mcp.empty": "Nenhum MCP configurado",
-
-  "dialog.lsp.empty": "LSPs detectados automaticamente pelos tipos de arquivo",
-  "dialog.plugins.empty": "Plugins configurados em opencode.json",
   "mcp.status.connected": "conectado",
   "mcp.status.failed": "falhou",
   "mcp.status.needs_auth": "precisa de autenticação",
   "mcp.status.needs_registration": "precisa de registro do cliente",
   "mcp.status.disabled": "desabilitado",
 
-  "dialog.fork.empty": "Nenhuma mensagem para bifurcar",
-
-  "dialog.directory.search.placeholder": "Buscar pastas",
-  "dialog.directory.empty": "Nenhuma pasta encontrada",
-
-  "dialog.server.title": "Servidores",
-  "dialog.server.description": "Trocar para qual servidor Kilo este aplicativo se conecta.",
-  "dialog.server.search.placeholder": "Buscar servidores",
-  "dialog.server.empty": "Nenhum servidor ainda",
-  "dialog.server.add.title": "Adicionar um servidor",
-  "dialog.server.add.url": "URL do servidor",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Não foi possível conectar ao servidor",
-  "dialog.server.add.checking": "Verificando...",
-  "dialog.server.add.button": "Adicionar",
-  "dialog.server.default.title": "Servidor padrão",
-  "dialog.server.default.description":
-    "Conectar a este servidor na inicialização do aplicativo ao invés de iniciar um servidor local. Requer reinicialização.",
-  "dialog.server.default.none": "Nenhum servidor selecionado",
-  "dialog.server.default.set": "Definir servidor atual como padrão",
-  "dialog.server.default.clear": "Limpar",
-  "dialog.server.action.remove": "Remover servidor",
-
-  "dialog.server.menu.edit": "Editar",
-  "dialog.server.menu.default": "Definir como padrão",
-  "dialog.server.menu.defaultRemove": "Remover padrão",
-  "dialog.server.menu.delete": "Excluir",
-  "dialog.server.current": "Servidor atual",
-  "dialog.server.status.default": "Padrão",
-  "dialog.project.edit.title": "Editar projeto",
-  "dialog.project.edit.name": "Nome",
-  "dialog.project.edit.icon": "Ícone",
-  "dialog.project.edit.icon.alt": "Ícone do projeto",
-  "dialog.project.edit.icon.hint": "Clique ou arraste uma imagem",
-  "dialog.project.edit.icon.recommended": "Recomendado: 128x128px",
-  "dialog.project.edit.color": "Cor",
-  "dialog.project.edit.color.select": "Selecionar cor {{color}}",
-  "dialog.project.edit.worktree.startup": "Script de inicialização do espaço de trabalho",
-  "dialog.project.edit.worktree.startup.description": "Executa após criar um novo espaço de trabalho (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "ex: bun install",
-
-  "context.breakdown.title": "Detalhamento do Contexto",
-  "context.breakdown.note":
-    'Detalhamento aproximado dos tokens de entrada. "Outros" inclui definições de ferramentas e overhead.',
-  "context.breakdown.system": "Sistema",
-  "context.breakdown.user": "Usuário",
-  "context.breakdown.assistant": "Assistente",
-  "context.breakdown.tool": "Chamadas de Ferramentas",
-  "context.breakdown.other": "Outros",
-
-  "context.systemPrompt.title": "Prompt do Sistema",
-  "context.rawMessages.title": "Mensagens brutas",
-
-  "context.stats.session": "Sessão",
-  "context.stats.messages": "Mensagens",
-  "context.stats.provider": "Provedor",
-  "context.stats.model": "Modelo",
-  "context.stats.limit": "Limite de Contexto",
-  "context.stats.totalTokens": "Total de Tokens",
-  "context.stats.usage": "Uso",
-  "context.stats.inputTokens": "Tokens de Entrada",
-  "context.stats.outputTokens": "Tokens de Saída",
-  "context.stats.reasoningTokens": "Tokens de Raciocínio",
-  "context.stats.cacheTokens": "Tokens de Cache (leitura/escrita)",
-  "context.stats.userMessages": "Mensagens de Usuário",
-  "context.stats.assistantMessages": "Mensagens do Assistente",
-  "context.stats.totalCost": "Custo Total",
-  "context.stats.sessionCreated": "Sessão Criada",
-  "context.stats.lastActivity": "Última Atividade",
-
-  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Uso",
-  "context.usage.cost": "Custo",
-  "context.usage.clickToView": "Clique para ver o contexto",
-  "context.usage.view": "Ver uso do contexto",
-
-  "toast.language.title": "Idioma",
-  "toast.language.description": "Alterado para {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Tema alterado",
-  "toast.scheme.title": "Esquema de cores",
-
-  "toast.permissions.autoaccept.on.title": "Aceitando edições automaticamente",
-  "toast.permissions.autoaccept.on.description": "Permissões de edição e escrita serão aprovadas automaticamente",
-  "toast.permissions.autoaccept.off.title": "Parou de aceitar edições automaticamente",
-  "toast.permissions.autoaccept.off.description": "Permissões de edição e escrita exigirão aprovação",
-
-  "toast.workspace.enabled.title": "Espaços de trabalho ativados",
-  "toast.workspace.enabled.description": "Várias worktrees agora são exibidas na barra lateral",
-  "toast.workspace.disabled.title": "Espaços de trabalho desativados",
-  "toast.workspace.disabled.description": "Apenas a worktree principal é exibida na barra lateral",
-
-  "toast.model.none.title": "Nenhum modelo selecionado",
-  "toast.model.none.description": "Conecte um provedor para resumir esta sessão",
-
-  "toast.file.loadFailed.title": "Falha ao carregar arquivo",
-
-  "toast.file.listFailed.title": "Falha ao listar arquivos",
-  "toast.context.noLineSelection.title": "Nenhuma seleção de linhas",
-  "toast.context.noLineSelection.description": "Selecione primeiro um intervalo de linhas em uma aba de arquivo.",
-  "toast.session.share.copyFailed.title": "Falha ao copiar URL para a área de transferência",
-  "toast.session.share.success.title": "Sessão compartilhada",
-  "toast.session.share.success.description": "URL compartilhada copiada para a área de transferência!",
-  "toast.session.share.failed.title": "Falha ao compartilhar sessão",
-  "toast.session.share.failed.description": "Ocorreu um erro ao compartilhar a sessão",
-
-  "toast.session.unshare.success.title": "Sessão não compartilhada",
-  "toast.session.unshare.success.description": "Sessão deixou de ser compartilhada com sucesso!",
-  "toast.session.unshare.failed.title": "Falha ao parar de compartilhar sessão",
-  "toast.session.unshare.failed.description": "Ocorreu um erro ao parar de compartilhar a sessão",
-
   "toast.session.rename.invalid.title": "Título de sessão inválido",
-  "toast.session.listFailed.title": "Falha ao carregar sessões para {{project}}",
-
-  "toast.update.title": "Atualização disponível",
-  "toast.update.description": "Uma nova versão do Kilo ({{version}}) está disponível para instalação.",
-  "toast.update.action.installRestart": "Instalar e reiniciar",
-  "toast.update.action.notYet": "Agora não",
-
-  "error.page.title": "Algo deu errado",
-  "error.page.description": "Ocorreu um erro ao carregar a aplicação.",
-  "error.page.details.label": "Detalhes do Erro",
-  "error.page.action.restart": "Reiniciar",
-  "error.page.action.checking": "Verificando...",
-  "error.page.action.checkUpdates": "Verificar atualizações",
-  "error.page.action.updateTo": "Atualizar para {{version}}",
-  "error.page.report.prefix": "Por favor, reporte este erro para a equipe do Kilo",
-  "error.page.report.discord": "no Discord",
-  "error.page.version": "Versão: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Elemento raiz não encontrado. Você esqueceu de adicioná-lo ao seu index.html? Ou talvez o atributo id foi escrito incorretamente?",
-
-  "error.globalSync.connectFailed": "Não foi possível conectar ao servidor. Há um servidor executando em `{{url}}`?",
 
   "error.startup.title": "Falha na conexão com o servidor",
 
@@ -601,31 +266,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Faça login no ChatGPT novamente e envie sua mensagem de novo para continuar usando os modelos Codex.",
 
-  "error.chain.unknown": "Erro desconhecido",
-  "error.chain.causedBy": "Causado por:",
-  "error.chain.apiError": "Erro de API",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Pode tentar novamente: {{retryable}}",
-  "error.chain.responseBody": "Corpo da resposta:\n{{body}}",
-  "error.chain.didYouMean": "Você quis dizer: {{suggestions}}",
-  "error.chain.modelNotFound": "Modelo não encontrado: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Verifique os nomes de provedor/modelo na sua configuração (opencode.json)",
-  "error.chain.mcpFailed": 'Servidor MCP "{{name}}" falhou. Nota: Kilo ainda não suporta autenticação MCP.',
-  "error.chain.providerAuthFailed": "Autenticação do provedor falhou ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Falha ao inicializar provedor "{{provider}}". Verifique credenciais e configuração.',
-  "error.chain.configJsonInvalid": "Arquivo de configuração em {{path}} não é um JSON(C) válido",
-  "error.chain.configJsonInvalidWithMessage":
-    "Arquivo de configuração em {{path}} não é um JSON(C) válido: {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Diretório "{{dir}}" em {{path}} não é válido. Renomeie o diretório para "{{suggestion}}" ou remova-o. Este é um erro de digitação comum.',
-  "error.chain.configFrontmatterError": "Falha ao analisar frontmatter em {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Arquivo de configuração em {{path}} é inválido",
-  "error.chain.configInvalidWithMessage": "Arquivo de configuração em {{path}} é inválido: {{message}}",
-
   "notification.permission.title": "Permissão necessária",
   "notification.permission.titleSubagent": "Permissão necessária (subagente)",
-  "notification.permission.description": "{{sessionTitle}} em {{projectName}} precisa de permissão",
   "ui.permission.manageAutoApprove": "Gerenciar regras de aprovação automática",
   "ui.permission.doomLoop.prompt": "Possível loop detectado na ferramenta {{tool}}. Continuar executando?",
   "ui.permission.doomLoop.rule": "Continuar chamadas de {{tool}}",
@@ -650,7 +292,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Ler Tarefas",
   "ui.permission.toolLabel.todoWrite": "Escrever Tarefas",
   "ui.permission.toolLabel.codeSearch": "Pesquisa de Código",
-  "ui.permission.toggleWrap": "Alternar quebra de linha",
   "ui.permission.copyCommand": "Copiar",
   "ui.approval.auto": "Aprovado automaticamente",
   "ui.approval.manual": "Aprovado por você",
@@ -662,46 +303,18 @@ export const dict = {
   "ui.approval.source.yolo": "pelo modo de aprovação automática (YOLO)",
   "ui.approval.source.session": "por uma regra de aprovação automática da sessão",
   "ui.approval.source.default": "por padrão",
-  "notification.question.title": "Pergunta",
-  "notification.question.description": "{{sessionTitle}} em {{projectName}} tem uma pergunta",
-  "notification.action.goToSession": "Ir para sessão",
 
-  "notification.session.responseReady.title": "Resposta pronta",
-  "notification.session.error.title": "Erro na sessão",
-  "notification.session.error.fallbackDescription": "Ocorreu um erro",
-
-  "home.recentProjects": "Projetos recentes",
-  "home.empty.title": "Nenhum projeto recente",
-  "home.empty.description": "Comece abrindo um projeto local",
-
-  "session.tab.session": "Sessão",
   "session.tab.review": "Revisão",
-  "session.tab.context": "Contexto",
-  "session.panel.reviewAndFiles": "Revisão e arquivos",
   "session.review.filesChanged": "{{count}} Arquivos Alterados",
-  "session.review.change.one": "Alteração",
   "session.review.change.other": "Alterações",
   "session.review.loadingChanges": "Carregando alterações...",
-  "session.review.empty": "Nenhuma alteração nesta sessão ainda",
   "session.review.noChanges": "Sem alterações",
-  "session.files.selectToOpen": "Selecione um arquivo para abrir",
-  "session.files.all": "Todos os arquivos",
-  "session.files.binaryContent": "Arquivo binário (conteúdo não pode ser exibido)",
-  "session.messages.renderEarlier": "Renderizar mensagens anteriores",
   "session.messages.loadingEarlier": "Carregando mensagens anteriores...",
   "session.messages.loadEarlier": "Carregar mensagens anteriores",
   "session.messages.loading": "Carregando mensagens...",
-  "session.messages.jumpToLatest": "Ir para a mais recente",
 
-  "session.context.addToContext": "Adicionar {{selection}} ao contexto",
-
-  "session.new.worktree.main": "Branch principal",
-  "session.new.worktree.mainWithBranch": "Branch principal ({{branch}})",
-  "session.new.worktree.create": "Criar novo worktree",
-  "session.new.lastModified": "Última modificação",
   "sidebar.session.newSession": "Nova Sessão",
   "sidebar.session.newSession.tooltip": "Inicie uma nova conversa mantendo a sessão atual intacta.",
-  "sidebar.session.newSession.disabled": "Esta sessão já é nova. Comece a conversar ou crie um worktree em vez disso.",
   "sidebar.session.newWorktree": "Novo Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Crie um git worktree isolado para experimentar com segurança, manter as alterações separadas e executar sessões paralelas sem interromper sua branch atual.",
@@ -718,132 +331,25 @@ export const dict = {
     "Mover esta conversa e {{files}} arquivos alterados para um worktree dedicado para trabalho de acompanhamento isolado.",
   "sidebar.session.showChanges.tooltip.empty":
     "Abra a visualização de alterações para inspecionar a árvore de trabalho atual.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 arquivo alterado · +{{additions}} -{{deletions}}. Abrir a visualização de alterações.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} arquivos alterados · +{{additions}} -{{deletions}}. Abrir a visualização de alterações.",
-  "sidebar.session.agentManager.tooltip":
-    "Abra o Agent Manager para uma visão geral completa de sessões paralelas e worktrees, para que você possa coordenar tarefas longas em um só lugar.",
-  "sidebar.session.openAgentManager": "Abrir Agent Manager",
   "sidebar.session.progress.capturing": "Capturando alterações...",
   "sidebar.session.progress.creating": "Criando worktree...",
   "sidebar.session.progress.setup": "Executando configuração...",
   "sidebar.session.progress.transferring": "Transferindo alterações...",
   "sidebar.session.progress.forking": "Iniciando sessão...",
   "sidebar.session.progress.failed": "Falha ao continuar no worktree",
-  "session.header.search.placeholder": "Buscar {{project}}",
-  "session.header.searchFiles": "Buscar arquivos",
-  "session.header.openIn": "Abrir em",
-  "session.header.open.action": "Abrir {{app}}",
-  "session.header.open.ariaLabel": "Abrir em {{app}}",
-  "session.header.open.menu": "Opções de abertura",
-  "session.header.open.copyPath": "Copiar caminho",
-
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Configurações de servidores",
-  "status.popover.tab.servers": "Servidores",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Gerenciar servidores",
-
-  "session.share.popover.title": "Publicar na web",
-  "session.share.popover.description.shared":
-    "Esta sessão é pública na web. Está acessível para qualquer pessoa com o link.",
-  "session.share.popover.description.unshared":
-    "Compartilhar sessão publicamente na web. Estará acessível para qualquer pessoa com o link.",
-  "session.share.action.share": "Compartilhar",
-  "session.share.action.publish": "Publicar",
-  "session.share.action.publishing": "Publicando...",
-  "session.share.action.unpublish": "Cancelar publicação",
-  "session.share.action.unpublishing": "Cancelando publicação...",
-  "session.share.action.view": "Ver",
-  "session.share.copy.copied": "Copiado",
-  "session.share.copy.copyLink": "Copiar link",
-
-  "lsp.tooltip.none": "Nenhum servidor LSP",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Carregando prompt...",
-  "terminal.loading": "Carregando terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Fechar terminal",
-  "terminal.connectionLost.title": "Conexão Perdida",
-  "terminal.connectionLost.description":
-    "A conexão do terminal foi interrompida. Isso pode acontecer quando o servidor reinicia.",
 
   "common.closeTab": "Fechar aba",
   "common.signIn": "Entrar",
-  "common.signOut": "Sair",
   "common.dismiss": "Descartar",
   "common.requestFailed": "Requisição falhou",
-  "common.moreOptions": "Mais opções",
-  "common.learnMore": "Saiba mais",
   "common.rename": "Renomear",
-  "common.reset": "Redefinir",
-  "common.archive": "Arquivar",
   "common.delete": "Excluir",
   "common.close": "Fechar",
   "common.edit": "Editar",
   "common.loadMore": "Carregar mais",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Alternar menu",
-  "sidebar.nav.projectsAndSessions": "Projetos e sessões",
   "sidebar.settings": "Configurações",
-  "sidebar.help": "Ajuda",
-  "sidebar.workspaces.enable": "Habilitar espaços de trabalho",
-  "sidebar.workspaces.disable": "Desabilitar espaços de trabalho",
-  "sidebar.gettingStarted.title": "Começando",
-  "sidebar.gettingStarted.line1": "Kilo inclui modelos gratuitos para você começar imediatamente.",
-  "sidebar.gettingStarted.line2": "Conecte qualquer provedor para usar modelos, incluindo Claude, GPT, Gemini etc.",
-  "sidebar.project.recentSessions": "Sessões recentes",
-  "sidebar.project.viewAllSessions": "Ver todas as sessões",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Servidor",
-  "settings.tab.general": "Geral",
-  "settings.tab.shortcuts": "Atalhos",
-
-  "settings.general.section.appearance": "Aparência",
-  "settings.general.section.notifications": "Notificações do sistema",
-  "settings.general.section.updates": "Atualizações",
-  "settings.general.section.sounds": "Efeitos sonoros",
-
-  "settings.general.row.language.title": "Idioma",
-  "settings.general.row.language.description": "Alterar o idioma de exibição do Kilo",
-  "settings.general.row.appearance.title": "Aparência",
-  "settings.general.row.appearance.description": "Personalize como o Kilo aparece no seu dispositivo",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Personalize como o Kilo é tematizado.",
-  "settings.general.row.font.title": "Fonte",
-  "settings.general.row.font.description": "Personalize a fonte monoespaçada usada em blocos de código",
-
-  "settings.general.row.releaseNotes.title": "Notas da versão",
-  "settings.general.row.releaseNotes.description": 'Mostrar pop-ups de "Novidades" após atualizações',
-
-  "settings.updates.row.startup.title": "Verificar atualizações ao iniciar",
-  "settings.updates.row.startup.description": "Verificar atualizações automaticamente quando o Kilo iniciar",
-  "settings.updates.row.check.title": "Verificar atualizações",
-  "settings.updates.row.check.description": "Verificar atualizações manualmente e instalar se houver",
-  "settings.updates.action.checkNow": "Verificar agora",
-  "settings.updates.action.checking": "Verificando...",
-  "settings.updates.toast.latest.title": "Você está atualizado",
-  "settings.updates.toast.latest.description": "Você está usando a versão mais recente do Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alerta 01",
   "sound.option.alert02": "Alerta 02",
   "sound.option.alert03": "Alerta 03",
@@ -890,48 +396,10 @@ export const dict = {
   "sound.option.yup05": "Sim 05",
   "sound.option.yup06": "Sim 06",
 
-  "settings.general.notifications.agent.title": "Agente",
-  "settings.general.notifications.agent.description":
-    "Mostrar notificação do sistema quando o agente estiver completo ou precisar de atenção",
-  "settings.general.notifications.permissions.title": "Permissões",
-  "settings.general.notifications.permissions.description":
-    "Mostrar notificação do sistema quando uma permissão for necessária",
-  "settings.general.notifications.errors.title": "Erros",
-  "settings.general.notifications.errors.description": "Mostrar notificação do sistema quando ocorrer um erro",
-
-  "settings.general.sounds.agent.title": "Agente",
-  "settings.general.sounds.agent.description": "Reproduzir som quando o agente estiver completo ou precisar de atenção",
-  "settings.general.sounds.permissions.title": "Permissões",
-  "settings.general.sounds.permissions.description": "Reproduzir som quando uma permissão for necessária",
-  "settings.general.sounds.errors.title": "Erros",
-  "settings.general.sounds.errors.description": "Reproduzir som quando ocorrer um erro",
-
-  "settings.shortcuts.title": "Atalhos de teclado",
-  "settings.shortcuts.reset.button": "Redefinir para padrões",
-  "settings.shortcuts.reset.toast.title": "Atalhos redefinidos",
-  "settings.shortcuts.reset.toast.description": "Atalhos de teclado foram redefinidos para os padrões.",
-  "settings.shortcuts.conflict.title": "Atalho já em uso",
-  "settings.shortcuts.conflict.description": "{{keybind}} já está atribuído a {{titles}}.",
-  "settings.shortcuts.unassigned": "Não atribuído",
-  "settings.shortcuts.pressKeys": "Pressione teclas",
-  "settings.shortcuts.search.placeholder": "Buscar atalhos",
-  "settings.shortcuts.search.empty": "Nenhum atalho encontrado",
-
-  "settings.shortcuts.group.general": "Geral",
-  "settings.shortcuts.group.session": "Sessão",
-  "settings.shortcuts.group.navigation": "Navegação",
-  "settings.shortcuts.group.modelAndAgent": "Modelo e agente",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
-
   "settings.providers.title": "Provedores",
-  "settings.providers.description": "Configurações de provedores estarão disponíveis aqui.",
-  "settings.providers.betaNotice":
-    "Atualmente, apenas o provedor Kilo Gateway pode ser configurado na interface de configurações. O suporte para a configuração de outros provedores estará disponível em breve durante o período beta. Enquanto isso, você pode configurar provedores usando a CLI ou o arquivo de configuração. Estamos comprometidos em manter o Kilo aberto, sem lock-in.",
   "settings.providers.section.connected": "Provedores conectados",
   "settings.providers.connected.empty": "Nenhum provedor conectado",
   "settings.providers.section.popular": "Provedores populares",
-  "settings.providers.search.placeholder": "Buscar provedores",
   "settings.providers.select.placeholder": "Selecionar provedor...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Ambiente",
@@ -950,7 +418,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Oculte os modelos do Kilo Gateway cujos provedores podem usar seus prompts para treinamento.",
   "settings.providers.modeModels": "Modelo por Modo",
-  "settings.providers.custom.note": "Adicione um provedor personalizado por URL base.",
   "settings.providers.modeModels.description":
     "Substitua o modelo padrão para modos específicos. Se não definido, o modelo padrão global é usado.",
   "provider.custom.title": "Provedor personalizado",
@@ -1016,9 +483,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Remover modelo",
   "provider.custom.models.add": "Adicionar modelo",
-  "provider.custom.models.fetch": "Buscar modelos",
-  "provider.custom.models.fetching": "Buscando\u2026",
-  "provider.custom.models.fetch.error": "Falha ao buscar modelos: {{error}}",
   "provider.custom.models.fetch.authError": "Falha na autenticação. Verifique a chave de API acima e tente novamente.",
   "provider.custom.models.fetch.empty": "Nenhum modelo encontrado neste servidor.",
   "provider.custom.models.fetch.added": "{{count}} modelo(s) adicionado(s).",
@@ -1071,23 +535,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Configuração .kilocode legada",
   "settings.config.source.projectOpencode": "Configuração .opencode legada",
   "settings.models.title": "Modelos",
-  "settings.models.description": "Configurações de modelos estarão disponíveis aqui.",
-  "settings.agents.title": "Agentes",
-  "settings.agents.description": "Configurações de agentes estarão disponíveis aqui.",
-  "settings.commands.title": "Comandos",
-  "settings.commands.description": "Configurações de comandos estarão disponíveis aqui.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "Configurações de MCP estarão disponíveis aqui.",
 
-  "settings.permissions.title": "Permissões",
-  "settings.permissions.description": "Controle quais ferramentas o servidor pode usar por padrão.",
-  "settings.permissions.section.tools": "Ferramentas",
   "settings.permissions.toast.updateFailed.title": "Falha ao atualizar permissões",
 
-  "settings.permissions.action.allow": "Permitir",
-  "settings.permissions.action.ask": "Perguntar",
-  "settings.permissions.action.deny": "Negar",
-
   "settings.permissions.tool.read.title": "Ler",
   "settings.permissions.tool.read.description": "Ler um arquivo (corresponde ao caminho do arquivo)",
   "settings.permissions.tool.edit.title": "Editar",
@@ -1122,7 +572,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Loop Infinito",
   "settings.permissions.tool.doom_loop.description": "Detectar chamadas de ferramentas repetidas com entrada idêntica",
 
-  "session.delete.failed.title": "Falha ao excluir sessão",
   "session.delete.title": "Excluir sessão",
   "session.delete.confirm": 'Excluir sessão "{{name}}"?',
   "session.delete.button": "Excluir sessão",
@@ -1153,12 +602,7 @@ export const dict = {
   "workStyle.onboarding.title": "Escolha como você quer trabalhar",
   "workStyle.onboarding.settingsNote": "Você pode alterar essas opções a qualquer momento em",
   "workStyle.onboarding.settings": "Configurações.",
-  "workStyle.onboarding.description":
-    "Define os padrões iniciais de permissões, blocos de raciocínio, saída do terminal e linha do tempo do contexto. É aplicado apenas uma vez e ignora configurações que você já personalizou.",
-  "workStyle.onboarding.skip": "Pular por enquanto",
   "workStyle.toast.saved.title": "Modo salvo com sucesso",
-  "workStyle.toast.saved.description": "Atualize suas preferências a qualquer momento nas Configurações.",
-  "workStyle.toast.saved.action": "Ir para Configurações",
   "workStyle.choice.permissions": "Permissões",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Visibilidade",
@@ -1182,32 +626,6 @@ export const dict = {
   "session.cloud.import.legacy": "Esta parece ser uma sessão legada que não é mais suportada.",
   "session.cloud.import.failed": "Falha ao importar sessão da nuvem",
 
-  "workspace.new": "Novo espaço de trabalho",
-  "workspace.type.local": "local",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Falha ao criar espaço de trabalho",
-  "workspace.delete.failed.title": "Falha ao excluir espaço de trabalho",
-  "workspace.resetting.title": "Redefinindo espaço de trabalho",
-  "workspace.resetting.description": "Isso pode levar um minuto.",
-  "workspace.reset.failed.title": "Falha ao redefinir espaço de trabalho",
-  "workspace.reset.success.title": "Espaço de trabalho redefinido",
-  "workspace.reset.success.description": "Espaço de trabalho agora corresponde ao branch padrão.",
-  "workspace.error.stillPreparing": "O espaço de trabalho ainda está sendo preparado",
-  "workspace.status.checking": "Verificando alterações não mescladas...",
-  "workspace.status.error": "Não foi possível verificar o status do git.",
-  "workspace.status.clean": "Nenhuma alteração não mesclada detectada.",
-  "workspace.status.dirty": "Alterações não mescladas detectadas neste espaço de trabalho.",
-  "workspace.delete.title": "Excluir espaço de trabalho",
-  "workspace.delete.confirm": 'Excluir espaço de trabalho "{{name}}"?',
-  "workspace.delete.button": "Excluir espaço de trabalho",
-  "workspace.reset.title": "Redefinir espaço de trabalho",
-  "workspace.reset.confirm": 'Redefinir espaço de trabalho "{{name}}"?',
-  "workspace.reset.button": "Redefinir espaço de trabalho",
-  "workspace.reset.archived.none": "Nenhuma sessão ativa será arquivada.",
-  "workspace.reset.archived.one": "1 sessão será arquivada.",
-  "workspace.reset.archived.many": "{{count}} sessões serão arquivadas.",
-  "workspace.reset.note": "Isso redefinirá o espaço de trabalho para corresponder ao branch padrão.",
-
   "deviceAuth.toast.urlCopied": "URL copiada para a área de transferência",
   "deviceAuth.toast.codeCopied": "Código copiado para a área de transferência",
   "deviceAuth.toast.errorCopied": "Erro copiado para a área de transferência",
@@ -1245,7 +663,6 @@ export const dict = {
   "profile.pass.renews": "Renova",
   "profile.action.logout": "Sair",
 
-  "settings.section.configuration": "Configuração",
   "settings.agentBehaviour.title": "Comportamento do Agente",
   "settings.autoApprove.title": "Aprovação Automática",
   "settings.browser.title": "Navegador",
@@ -1270,8 +687,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Habilitar para este projeto",
   "settings.indexing.projectEnable.description":
     "Habilitar indexação para este workspace quando a indexação global estiver desativada.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "A indexação global está ativada, então este projeto já está coberto.",
   "settings.indexing.provider.title": "Provedor de embedding",
   "settings.indexing.provider.description": "Escolha o provedor usado para gerar embeddings para busca semântica.",
   "settings.indexing.kiloModel.title": "Predefinição de modelo do Kilo",
@@ -1303,7 +718,6 @@ export const dict = {
   "settings.indexing.providerField.description": "Configuração de conexão específica do provedor.",
   "settings.aboutKiloCode.title": "Sobre o Kilo Code",
 
-  "session.messages.empty": "Inicie uma conversa digitando uma mensagem abaixo.",
   "session.messages.welcome":
     "Kilo Code é um assistente de programação com IA. Peça para criar funcionalidades, corrigir bugs ou explicar sua base de código.",
   "session.messages.scrollToBottom": "Rolar para o final",
@@ -1311,7 +725,6 @@ export const dict = {
   "session.messages.taskStarting": "O kregiñ...",
   "session.status.writingResponse": "Escrevendo resposta…",
   "session.status.retry": "Tentando novamente…",
-  "session.status.retrying": "Tentando novamente (tentativa {{ attempt }})… {{ message }}",
   "session.status.working": "Trabalhando…",
   "session.status.offline": "Rede desconectada — reconectando...",
   "session.outcome.incomplete": "Turno encerrado com {{count}} tarefas restantes",
@@ -1343,11 +756,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} sessões anteriores",
   "context.stats.thisSession": "Esta sessão",
 
-  "time.justNow": "agora mesmo",
-  "time.minutesAgo": "{{count}} min atrás",
-  "time.hoursAgo": "{{count}}h atrás",
-  "time.daysAgo": "{{count}}d atrás",
-  "time.monthsAgo": "{{count}} meses atrás",
   "time.today": "Hoje",
   "time.yesterday": "Ontem",
   "time.thisWeek": "Esta semana",
@@ -1363,7 +771,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Porta:",
   "settings.aboutKiloCode.versionInfo": "Informações da Versão",
   "settings.aboutKiloCode.version.label": "Versão:",
-  "settings.aboutKiloCode.extensionName": "Extensão Kilo Code",
   "settings.aboutKiloCode.community": "Comunidade e Suporte",
   "settings.aboutKiloCode.feedback.prefix": "Se você tiver perguntas ou feedback, abra uma issue no",
   "settings.aboutKiloCode.feedback.or": "ou",
@@ -1416,7 +823,6 @@ export const dict = {
   "settings.language.current": "Atual:",
 
   "common.add": "Adicionar",
-  "common.choose": "Escolher…",
 
   "settings.autocomplete.autoTrigger.title": "Ativar completamento automático inline",
   "settings.autocomplete.autoTrigger.description":
@@ -1427,28 +833,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Mostrar sugestões de autocompletar no campo de chat",
   "settings.autocomplete.modelsHint":
     "Para escolher qual modelo é usado para autocompletar, veja as configurações de Modelos.",
-  "settings.notifications.agent.title": "Conclusão do agente",
-  "settings.notifications.agent.description": "Mostrar notificação quando o agente conclui uma tarefa",
-  "settings.notifications.permissions.title": "Solicitações de permissão",
-  "settings.notifications.permissions.description": "Mostrar notificação em solicitações de permissão",
-  "settings.notifications.errors.title": "Erros",
-  "settings.notifications.errors.description": "Mostrar notificação em erros",
   "settings.notifications.sounds": "Sons",
   "settings.notifications.enable.title": "Ativar notificações sonoras",
   "settings.notifications.enable.description":
     "Reproduzir sons quando as sessões forem concluídas, ocorrer um erro ou sua interação for necessária",
   "settings.notifications.testSound": "Testar",
-  "settings.notifications.agentSound.title": "Som de conclusão do agente",
-  "settings.notifications.agentSound.description": "Som ao concluir o agente",
-  "settings.notifications.permSound.title": "Som de solicitação de permissão",
-  "settings.notifications.permSound.description": "Som em solicitações de permissão",
-  "settings.notifications.errorSound.title": "Som de erro",
-  "settings.notifications.errorSound.description": "Som em erros",
   "settings.notifications.sound.default": "Padrão",
   "settings.notifications.sound.system": "Sistema",
   "settings.notifications.sound.description":
     "A opção padrão usa sons diferentes para conclusão, interação e erros. As outras opções usam um único som para todos os eventos.",
-  "settings.notifications.sound.none": "Nenhum",
   "settings.experimental.share.title": "Modo de compartilhamento",
   "settings.experimental.share.description": "Comportamento do compartilhamento de sessão",
   "settings.experimental.share.manual": "Manual",
@@ -1469,9 +862,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Modelo de geração de imagens",
   "settings.experimental.imageGenerationModel.placeholder": "Padrão (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Fala para texto",
-  "settings.experimental.speechToText.description":
-    "Ative a entrada de voz nos campos de prompt usando sua conta do Kilo por meio do Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Ative e faça login no provedor Kilo para usar o Speech to Text. Atualmente, o Speech to Text é compatível apenas com o Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Modelo de fala para texto",
@@ -1513,15 +903,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Agente padrão",
   "settings.agentBehaviour.defaultAgent.description": "Agente a usar quando nenhum é especificado",
   "settings.agentBehaviour.availableAgents": "Agentes Disponíveis",
-  "settings.agentBehaviour.selectAgent": "Selecionar um agente para configurar…",
-  "settings.agentBehaviour.selectAgent.title": "Agente",
-  "settings.agentBehaviour.selectAgent.description": "Selecionar um agente para configurar…",
   "settings.agentBehaviour.modelOverride.title": "Substituição de modelo",
   "settings.agentBehaviour.modelOverride.description": "Substituir o modelo padrão para este agente",
   "settings.agentBehaviour.variantOverride.title": "Substituição de variante",
   "settings.agentBehaviour.variantOverride.description": "Substituir a variante do modelo para este agente",
-  "settings.agentBehaviour.prompt.title": "Prompt personalizado",
-  "settings.agentBehaviour.prompt.description": "Prompt de sistema adicional para este agente",
   "settings.agentBehaviour.temperature.title": "Temperatura",
   "settings.agentBehaviour.temperature.description":
     "Controla o grau de aleatoriedade das respostas da IA (0–2). Valores mais baixos (por exemplo, 0.2) produzem resultados focados e consistentes. Valores mais altos (por exemplo, 1.0) produzem respostas mais variadas e criativas. Deixe em branco para usar o padrão do modelo.",
@@ -1542,7 +927,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Habilidades descobertas",
   "settings.agentBehaviour.noSkillsFound":
     "Nenhuma habilidade encontrada. Adicione caminhos de pastas ou URLs abaixo para disponibilizar habilidades.",
-  "settings.agentBehaviour.availableModes": "Modos personalizados disponíveis",
   "settings.agentBehaviour.noAgentsFound": "Nenhum agente encontrado.",
   "settings.agentBehaviour.createMode": "Criar Novo Modo",
   "settings.agentBehaviour.createMode.name": "Nome",
@@ -1626,12 +1010,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Comando",
   "settings.agentBehaviour.mcpDetail.args": "Argumentos",
   "settings.agentBehaviour.mcpDetail.env": "Ambiente",
-  "settings.agentBehaviour.mcpDetail.disabled": "Este servidor está desativado.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Explorar Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Nenhum servidor MCP configurado. Adicione servidores MCP em kilo.jsonc ou peça ao agente para adicioná-los.",
-  "settings.agentBehaviour.workflowsPlaceholder":
-    "Fluxos de trabalho são gerenciados por arquivos de fluxo de trabalho no espaço de trabalho.",
   "settings.agentBehaviour.workflows.description":
     "Fluxos de trabalho são comandos de barra personalizados definidos na sua configuração. Digite /command-name no chat para invocá-los. Os comandos são configurados no opencode.json na seção 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1724,7 +1105,6 @@ export const dict = {
     "ex: Gere commit messages em espanhol seguindo o formato conventional commits. Retorne APENAS o commit message.",
 
   "settings.commitMessage.language.sync": "Sincronizar com idioma da interface",
-  "settings.commitMessage.language.title": "Idioma",
   "settings.commitMessage.language.description": "Escolha qual idioma usar para as mensagens de commit geradas por AI:",
 
   "settings.display.username.title": "Nome de usuário",
@@ -1764,8 +1144,6 @@ export const dict = {
   "settings.providers.disabled": "Provedores desativados",
   "settings.providers.disabled.description": "Provedores a ocultar da lista",
   "settings.providers.disabled.enable": "Habilitar",
-  "settings.providers.enabled": "Provedores ativados (lista branca)",
-  "settings.providers.enabled.description": "Se definido, apenas estes provedores estarão disponíveis",
   "settings.providers.notSet": "Não definido (usar padrão do servidor)",
   "dialog.model.notSet": "Não definido",
   "profile.personalAccount": "Conta pessoal",
@@ -1806,9 +1184,7 @@ export const dict = {
   "migration.migrate.title": "Migre Suas Configurações",
   "migration.migrate.subtitle": "Encontramos configurações da sua instalação anterior. Veja o que podemos trazer.",
   "migration.migrate.selectLabel": "Selecione o que migrar",
-  "migration.migrate.cannotMigrate": "Não pode ser migrado",
   "migration.migrate.chatHistory": "Sessões de Chat e Histórico",
-  "migration.migrate.chatHistoryDesc": "Incompatível com a nova arquitetura",
   "migration.migrate.button": "Migrar Configurações",
   "migration.migrate.skip": "Pular",
   "migration.migrate.keysDetected": "{{count}} chaves detectadas",
@@ -1832,10 +1208,7 @@ export const dict = {
     "Isso remove as configurações antigas do armazenamento do VS Code. Você não poderá executar esta migração novamente.",
   "migration.complete.done": "Concluído",
   "migration.migrate.sessionsDetected": "{{count}} sessões detectadas",
-  "migration.error.sessionFailed": "Falha na migração da sessão",
   "migration.error.continue": "Continuar",
-  "migration.error.action.copy": "Copiar",
-  "migration.error.toast.copied": "Erro copiado para a área de transferência",
 
   "migration.sessionSummary.title": "Resumo:",
   "migration.sessionSummary.copy": "Copiar relatório",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 24bae1da393..5575a758b89 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Predloženo",
-  "command.category.view": "Prikaz",
-  "command.category.project": "Projekat",
-  "command.category.provider": "Provajder",
-  "command.category.server": "Server",
-  "command.category.session": "Sesija",
-  "command.category.theme": "Tema",
-  "command.category.language": "Jezik",
-  "command.category.file": "Datoteka",
-  "command.category.context": "Kontekst",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Model",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Dozvole",
-  "command.category.workspace": "Radni prostor",
-  "command.category.settings": "Postavke",
 
-  "theme.scheme.system": "Sistem",
-  "theme.scheme.light": "Svijetlo",
-  "theme.scheme.dark": "Tamno",
-
-  "command.sidebar.toggle": "Prikaži/sakrij bočnu traku",
-  "command.project.open": "Otvori projekat",
   "command.provider.connect": "Poveži provajdera",
-  "command.server.switch": "Promijeni server",
-  "command.settings.open": "Otvori postavke",
-  "command.session.previous": "Prethodna sesija",
-  "command.session.next": "Sljedeća sesija",
-  "command.session.previous.unseen": "Prethodna nepročitana sesija",
-  "command.session.next.unseen": "Sljedeća nepročitana sesija",
-  "command.session.archive": "Arhiviraj sesiju",
-
-  "command.palette": "Paleta komandi",
-
-  "command.theme.cycle": "Promijeni temu",
-  "command.theme.set": "Koristi temu: {{theme}}",
-  "command.theme.scheme.cycle": "Promijeni šemu boja",
-  "command.theme.scheme.set": "Koristi šemu boja: {{scheme}}",
-
-  "command.language.cycle": "Promijeni jezik",
-  "command.language.set": "Koristi jezik: {{language}}",
 
   "command.session.new": "Nova sesija",
-  "command.session.new.task": "Novi zadatak",
   "command.session.show.changes": "Prikaži promjene",
-  "command.file.open": "Otvori datoteku",
-  "command.tab.close": "Zatvori karticu",
-  "command.context.addSelection": "Dodaj odabir u kontekst",
-  "command.context.addSelection.description": "Dodaj odabrane linije iz trenutne datoteke",
-  "command.terminal.toggle": "Prikaži/sakrij terminal",
-  "command.fileTree.toggle": "Prikaži/sakrij stablo datoteka",
   "command.review.toggle": "Prikaži/sakrij pregled",
-  "command.terminal.new": "Novi terminal",
-  "command.terminal.new.description": "Kreiraj novu karticu terminala",
-  "command.steps.toggle": "Prikaži/sakrij korake",
-  "command.steps.toggle.description": "Prikaži ili sakrij korake za trenutnu poruku",
-  "command.message.previous": "Prethodna poruka",
-  "command.message.previous.description": "Idi na prethodnu korisničku poruku",
-  "command.message.next": "Sljedeća poruka",
-  "command.message.next.description": "Idi na sljedeću korisničku poruku",
-  "command.model.choose": "Odaberi model",
-  "command.model.choose.description": "Odaberi drugi model",
-  "command.mcp.toggle": "Prikaži/sakrij MCP-ove",
-  "command.mcp.toggle.description": "Prikaži/sakrij MCP-ove",
-  "command.agent.cycle": "Promijeni agenta",
-  "command.agent.cycle.description": "Prebaci na sljedećeg agenta",
-  "command.agent.cycle.reverse": "Promijeni agenta unazad",
-  "command.agent.cycle.reverse.description": "Prebaci na prethodnog agenta",
-  "command.model.variant.cycle": "Promijeni nivo razmišljanja",
-  "command.model.variant.cycle.description": "Prebaci na sljedeći nivo",
-  "command.permissions.autoaccept.enable": "Automatski prihvataj izmjene",
-  "command.permissions.autoaccept.disable": "Zaustavi automatsko prihvatanje izmjena",
-  "command.workspace.toggle": "Prikaži/sakrij radne prostore",
-  "command.workspace.toggle.description": "Omogući ili onemogući više radnih prostora u bočnoj traci",
-  "command.session.undo": "Poništi",
-  "command.session.undo.description": "Poništi posljednju poruku",
-  "command.session.redo": "Vrati",
-  "command.session.redo.description": "Vrati posljednju poništenu poruku",
   "revert.banner.count_one": "{{count}} poruka poništena",
   "revert.banner.count_other": "{{count}} poruka poništeno",
   "revert.banner.redo": "Ponovi",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Omogući snimke stanja",
   "revert.disabled.agentBusy": "Sačekajte da agent završi",
   "command.session.compact": "Sažmi sesiju",
-  "command.session.compact.description": "Sažmi sesiju kako bi se smanjio kontekst",
-  "command.session.fork": "Fork iz poruke",
-  "command.session.fork.description": "Kreiraj novu sesiju iz prethodne poruke",
-  "command.session.share": "Podijeli sesiju",
-  "command.session.share.description": "Podijeli ovu sesiju i kopiraj URL u međuspremnik",
-  "command.session.unshare": "Ukini dijeljenje sesije",
-  "command.session.unshare.description": "Zaustavi dijeljenje ove sesije",
   "command.session.export": "Izvezi transkript sesije",
 
   "agentRequirements.skill.installed": "Instalirano",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Ova provjera zahtjeva agenta više nije aktivna.",
   "agentRequirements.error.requestFailed": "Kilo nije mogao provjeriti zahtjeve agenta.",
 
-  "palette.search.placeholder": "Pretraži datoteke, komande i sesije",
-  "palette.empty": "Nema rezultata",
-  "palette.group.commands": "Komande",
-  "palette.group.files": "Datoteke",
-
   "dialog.provider.search.placeholder": "Pretraži provajdere",
   "dialog.provider.empty": "Nema pronađenih provajdera",
   "dialog.provider.group.other": "Ostalo",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Odaberi model",
   "dialog.model.search.placeholder": "Pretraži modele",
   "dialog.model.empty": "Nema rezultata za modele",
-  "dialog.model.manage": "Upravljaj modelima",
-  "dialog.model.manage.description": "Prilagodi koji se modeli prikazuju u izborniku modela.",
   "dialog.model.select": "Odaberi",
   "dialog.model.expand": "Proširi",
   "dialog.model.collapse": "Skupi",
 
-  "dialog.model.unpaid.freeModels.title": "Besplatni modeli koje obezbjeđuje Kilo",
-  "dialog.model.unpaid.addMore.title": "Dodaj još modela od popularnih provajdera",
-
   "dialog.provider.viewAll": "Prikaži više provajdera",
 
   "provider.connect.title": "Poveži {{provider}}",
-  "provider.connect.title.anthropicProMax": "Prijavi se putem Claude Pro/Max",
   "provider.connect.selectMethod": "Odaberi način prijave za {{provider}}.",
   "provider.connect.method.apiKey": "API ključ",
   "provider.connect.status.inProgress": "Autorizacija je u toku...",
@@ -231,13 +140,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "npr. my-models",
   "provider.connect.azure.baseURL.label": "URL krajnje tačke za Azure OpenAI",
   "provider.connect.azure.baseURL.placeholder": "npr. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen ti daje pristup kuriranom skupu pouzdanih, optimizovanih modela za coding agente.",
-  "provider.connect.opencodeZen.line2":
-    "Sa jednim API ključem dobijaš pristup modelima kao što su Claude, GPT, Gemini, GLM i drugi.",
-  "provider.connect.opencodeZen.visit.prefix": "Posjeti ",
-  "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " da preuzmeš svoj API ključ.",
   "provider.connect.oauth.code.visit.prefix": "Posjeti ",
   "provider.connect.oauth.code.visit.link": "ovaj link",
   "provider.connect.oauth.code.visit.suffix":
@@ -245,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} autorizacijski kod",
   "provider.connect.oauth.code.placeholder": "Autorizacijski kod",
   "provider.connect.oauth.code.required": "Autorizacijski kod je obavezan",
-  "provider.connect.oauth.code.invalid": "Nevažeći autorizacijski kod",
   "provider.connect.oauth.auto.visit.prefix": "Posjeti ",
   "provider.connect.oauth.auto.visit.link": "ovaj link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -259,28 +160,11 @@ export const dict = {
 
   "model.tag.free": "Besplatno",
   "model.tag.dataCollected": "Podaci se mogu koristiti za obuku",
-  "model.tag.latest": "Najnovije",
   "model.group.auto": "Automatski modeli",
   "model.group.recommended": "Preporučeno",
   "model.group.favorites": "Favoriti",
-  "model.group.collapse": "Sakrij {{group}}",
-  "model.group.expand": "Prikaži {{group}}",
   "model.favorite.add": "Dodaj u favorite",
   "model.favorite.remove": "Ukloni iz favorita",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "tekst",
-  "model.input.image": "slika",
-  "model.input.audio": "zvuk",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Podržava: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Podržava rasuđivanje",
-  "model.tooltip.reasoning.none": "Bez rasuđivanja",
-  "model.tooltip.context": "Limit konteksta {{limit}}",
   "model.preview.label.released": "Objavljeno",
   "model.preview.label.input": "Ulaz",
   "model.preview.label.output": "Izlaz",
@@ -301,11 +185,8 @@ export const dict = {
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Pretraži",
   "common.goBack": "Nazad",
-  "common.goForward": "Naprijed",
   "common.loading": "Učitavanje",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Otkaži",
   "common.connect": "Poveži",
   "common.disconnect": "Prekini vezu",
@@ -313,54 +194,8 @@ export const dict = {
   "common.save": "Sačuvaj",
   "common.saving": "Čuvanje...",
   "common.default": "Podrazumijevano",
-  "common.attachment": "prilog",
 
-  "prompt.placeholder.shell": "Unesi shell naredbu...",
-  "prompt.placeholder.normal": 'Pitaj bilo šta... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Sažmi komentare…",
-  "prompt.placeholder.summarizeComment": "Sažmi komentar…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc za izlaz",
-
-  "prompt.example.1": "Popravi TODO u bazi koda",
-  "prompt.example.2": "Koji je tehnološki stack ovog projekta?",
-  "prompt.example.3": "Popravi pokvarene testove",
-  "prompt.example.4": "Objasni kako radi autentifikacija",
-  "prompt.example.5": "Pronađi i popravi sigurnosne ranjivosti",
-  "prompt.example.6": "Dodaj jedinične testove za servis korisnika",
-  "prompt.example.7": "Refaktoriši ovu funkciju da bude čitljivija",
-  "prompt.example.8": "Šta znači ova greška?",
-  "prompt.example.9": "Pomozi mi da otklonim ovu grešku",
-  "prompt.example.10": "Generiši API dokumentaciju",
-  "prompt.example.11": "Optimizuj upite prema bazi podataka",
-  "prompt.example.12": "Dodaj validaciju ulaza",
-  "prompt.example.13": "Napravi novu komponentu za...",
-  "prompt.example.14": "Kako da deployam ovaj projekat?",
-  "prompt.example.15": "Pregledaj moj kod prema najboljim praksama",
-  "prompt.example.16": "Dodaj obradu grešaka u ovu funkciju",
-  "prompt.example.17": "Objasni ovaj regex obrazac",
-  "prompt.example.18": "Pretvori ovo u TypeScript",
-  "prompt.example.19": "Dodaj logovanje kroz cijelu bazu koda",
-  "prompt.example.20": "Koje su zavisnosti zastarjele?",
-  "prompt.example.21": "Pomozi mi da napišem migracijsku skriptu",
-  "prompt.example.22": "Implementiraj keširanje za ovaj endpoint",
-  "prompt.example.23": "Dodaj paginaciju u ovu listu",
-  "prompt.example.24": "Napravi CLI komandu za...",
-  "prompt.example.25": "Kako ovdje rade varijable okruženja?",
-
-  "prompt.popover.emptyResults": "Nema rezultata",
-  "prompt.popover.emptyCommands": "Nema komandi",
-  "prompt.dropzone.label": "Spusti slike ili PDF-ove ovdje",
-  "prompt.slash.badge.custom": "prilagođeno",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "aktivno",
-  "prompt.context.includeActiveFile": "Uključi aktivnu datoteku",
-  "prompt.context.removeActiveFile": "Ukloni aktivnu datoteku iz konteksta",
-  "prompt.context.removeFile": "Ukloni datoteku iz konteksta",
   "prompt.thinking.tooltip": "Napor razmišljanja",
-  "prompt.action.attachFile": "Priloži datoteku",
-  "prompt.attachment.remove": "Ukloni prilog",
   "prompt.action.send": "Pošalji",
   "prompt.action.send.blocked": "Prvo odgovorite ili odbacite pitanje na čekanju",
   "prompt.action.send.recording": "Transkribuj i pošalji",
@@ -401,191 +236,17 @@ export const dict = {
   "speechToText.tooltip.error": "Glasovni unos nije uspio. Kliknite da očistite.",
   "speechToText.error.title": "Glasovni unos nije uspio",
   "speechToText.error.loginRequired": "Prijavite se na Kilo da koristite glasovni unos.",
-  "speechToText.error.permission": "Dozvola za mikrofon je odbijena.",
-  "speechToText.error.microphone": "Nije moguće pokrenuti mikrofon.",
-  "speechToText.error.recording": "Snimanje nije uspjelo.",
-  "speechToText.error.emptyRecording": "Zvuk nije snimljen.",
   "speechToText.error.emptyTranscript": "Govor nije otkriven.",
-  "speechToText.error.encoding": "Nije moguće kodirati snimak.",
-  "speechToText.toast.transcribed": "Prijepis ubačen",
 
-  "prompt.toast.pasteUnsupported.title": "Nepodržano lijepljenje",
-  "prompt.toast.pasteUnsupported.description": "Ovdje se mogu zalijepiti samo slike ili PDF-ovi.",
-  "prompt.toast.modelAgentRequired.title": "Odaberi agenta i model",
-  "prompt.toast.modelAgentRequired.description": "Odaberi agenta i model prije slanja upita.",
-  "prompt.toast.worktreeCreateFailed.title": "Neuspješno kreiranje worktree-a",
-  "prompt.toast.sessionCreateFailed.title": "Neuspješno kreiranje sesije",
-  "prompt.toast.shellSendFailed.title": "Neuspješno slanje shell naredbe",
-  "prompt.toast.commandSendFailed.title": "Neuspješno slanje komande",
   "prompt.toast.promptSendFailed.title": "Neuspješno slanje upita",
 
-  "dialog.mcp.title": "MCP-ovi",
-  "dialog.mcp.description": "{{enabled}} od {{total}} omogućeno",
-  "dialog.mcp.empty": "Nema konfigurisnih MCP-ova",
-
-  "dialog.lsp.empty": "LSP-ovi se automatski otkrivaju prema tipu datoteke",
-  "dialog.plugins.empty": "Plugini su konfigurisani u opencode.json",
-
   "mcp.status.connected": "povezano",
   "mcp.status.failed": "neuspjelo",
   "mcp.status.needs_auth": "potrebna autentifikacija",
   "mcp.status.needs_registration": "potrebna registracija klijenta",
   "mcp.status.disabled": "onemogućeno",
 
-  "dialog.fork.empty": "Nema poruka za fork",
-
-  "dialog.directory.search.placeholder": "Pretraži foldere",
-  "dialog.directory.empty": "Nema pronađenih foldera",
-
-  "dialog.server.title": "Serveri",
-  "dialog.server.description": "Promijeni na koji se Kilo server ova aplikacija povezuje.",
-  "dialog.server.search.placeholder": "Pretraži servere",
-  "dialog.server.empty": "Još nema servera",
-  "dialog.server.add.title": "Dodaj server",
-  "dialog.server.add.url": "URL servera",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Nije moguće povezati se na server",
-  "dialog.server.add.checking": "Provjera...",
-  "dialog.server.add.button": "Dodaj server",
-  "dialog.server.default.title": "Podrazumijevani server",
-  "dialog.server.default.description":
-    "Poveži se na ovaj server pri pokretanju aplikacije umjesto pokretanja lokalnog servera. Potreban je restart.",
-  "dialog.server.default.none": "Nije odabran server",
-  "dialog.server.default.set": "Postavi trenutni server kao podrazumijevani",
-  "dialog.server.default.clear": "Očisti",
-  "dialog.server.action.remove": "Ukloni server",
-
-  "dialog.server.menu.edit": "Uredi",
-  "dialog.server.menu.default": "Postavi kao podrazumijevano",
-  "dialog.server.menu.defaultRemove": "Ukloni podrazumijevano",
-  "dialog.server.menu.delete": "Izbriši",
-  "dialog.server.current": "Trenutni server",
-  "dialog.server.status.default": "Podrazumijevano",
-
-  "dialog.project.edit.title": "Uredi projekat",
-  "dialog.project.edit.name": "Naziv",
-  "dialog.project.edit.icon": "Ikonica",
-  "dialog.project.edit.icon.alt": "Ikonica projekta",
-  "dialog.project.edit.icon.hint": "Klikni ili prevuci sliku",
-  "dialog.project.edit.icon.recommended": "Preporučeno: 128x128px",
-  "dialog.project.edit.color": "Boja",
-  "dialog.project.edit.color.select": "Odaberi boju {{color}}",
-  "dialog.project.edit.worktree.startup": "Skripta za pokretanje radnog prostora",
-  "dialog.project.edit.worktree.startup.description": "Pokreće se nakon kreiranja novog radnog prostora (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "npr. bun install",
-
-  "context.breakdown.title": "Razlaganje konteksta",
-  "context.breakdown.note":
-    'Približna raspodjela ulaznih tokena. "Ostalo" uključuje definicije alata i dodatni overhead.',
-  "context.breakdown.system": "Sistem",
-  "context.breakdown.user": "Korisnik",
-  "context.breakdown.assistant": "Asistent",
-  "context.breakdown.tool": "Pozivi alata",
-  "context.breakdown.other": "Ostalo",
-
-  "context.systemPrompt.title": "Sistemski prompt",
-  "context.rawMessages.title": "Sirove poruke",
-
-  "context.stats.session": "Sesija",
-  "context.stats.messages": "Poruke",
-  "context.stats.provider": "Provajder",
-  "context.stats.model": "Model",
-  "context.stats.limit": "Limit konteksta",
-  "context.stats.totalTokens": "Ukupno tokena",
-  "context.stats.usage": "Korištenje",
-  "context.stats.inputTokens": "Ulazni tokeni",
-  "context.stats.outputTokens": "Izlazni tokeni",
-  "context.stats.reasoningTokens": "Tokeni za rasuđivanje",
-  "context.stats.cacheTokens": "Cache tokeni (čitanje/pisanje)",
-  "context.stats.userMessages": "Korisničke poruke",
-  "context.stats.assistantMessages": "Poruke asistenta",
-  "context.stats.totalCost": "Ukupni trošak",
-  "context.stats.sessionCreated": "Sesija kreirana",
-  "context.stats.lastActivity": "Posljednja aktivnost",
-
-  "context.usage.tokens": "Tokeni",
-  "context.usage.usage": "Korištenje",
-  "context.usage.cost": "Trošak",
-  "context.usage.clickToView": "Klikni da vidiš kontekst",
-  "context.usage.view": "Prikaži korištenje konteksta",
-
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.language.title": "Jezik",
-  "toast.language.description": "Prebačeno na {{language}}",
-
-  "toast.theme.title": "Tema promijenjena",
-  "toast.scheme.title": "Šema boja",
-
-  "toast.workspace.enabled.title": "Radni prostori omogućeni",
-  "toast.workspace.enabled.description": "Više worktree-ova se sada prikazuje u bočnoj traci",
-  "toast.workspace.disabled.title": "Radni prostori onemogućeni",
-  "toast.workspace.disabled.description": "Samo glavni worktree se prikazuje u bočnoj traci",
-
-  "toast.permissions.autoaccept.on.title": "Automatsko prihvatanje izmjena",
-  "toast.permissions.autoaccept.on.description": "Dozvole za izmjene i pisanje biće automatski odobrene",
-  "toast.permissions.autoaccept.off.title": "Zaustavljeno automatsko prihvatanje izmjena",
-  "toast.permissions.autoaccept.off.description": "Dozvole za izmjene i pisanje zahtijevaće odobrenje",
-
-  "toast.model.none.title": "Nije odabran model",
-  "toast.model.none.description": "Poveži provajdera da sažmeš ovu sesiju",
-
-  "toast.file.loadFailed.title": "Neuspjelo učitavanje datoteke",
-  "toast.file.listFailed.title": "Neuspješno listanje datoteka",
-
-  "toast.context.noLineSelection.title": "Nema odabranih linija",
-  "toast.context.noLineSelection.description": "Prvo odaberi raspon linija u kartici datoteke.",
-
-  "toast.session.share.copyFailed.title": "Neuspjelo kopiranje URL-a u međuspremnik",
-  "toast.session.share.success.title": "Sesija podijeljena",
-  "toast.session.share.success.description": "URL za dijeljenje je kopiran u međuspremnik!",
-  "toast.session.share.failed.title": "Neuspjelo dijeljenje sesije",
-  "toast.session.share.failed.description": "Došlo je do greške prilikom dijeljenja sesije",
-
-  "toast.session.unshare.success.title": "Dijeljenje sesije ukinuto",
-  "toast.session.unshare.success.description": "Dijeljenje sesije je uspješno ukinuto!",
-  "toast.session.unshare.failed.title": "Neuspjelo ukidanje dijeljenja",
-  "toast.session.unshare.failed.description": "Došlo je do greške prilikom ukidanja dijeljenja",
-
   "toast.session.rename.invalid.title": "Nevažeći naslov sesije",
-  "toast.session.listFailed.title": "Neuspjelo učitavanje sesija za {{project}}",
-
-  "toast.update.title": "Dostupno ažuriranje",
-  "toast.update.description": "Nova verzija Kilo-a ({{version}}) je dostupna za instalaciju.",
-  "toast.update.action.installRestart": "Instaliraj i restartuj",
-  "toast.update.action.notYet": "Ne još",
-
-  "error.page.title": "Nešto je pošlo po zlu",
-  "error.page.description": "Došlo je do greške prilikom učitavanja aplikacije.",
-  "error.page.details.label": "Detalji greške",
-  "error.page.action.restart": "Restartuj",
-  "error.page.action.checking": "Provjera...",
-  "error.page.action.checkUpdates": "Provjeri ažuriranja",
-  "error.page.action.updateTo": "Ažuriraj na {{version}}",
-  "error.page.report.prefix": "Molimo prijavi ovu grešku Kilo timu",
-  "error.page.report.discord": "na Discordu",
-  "error.page.version": "Verzija: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Korijenski element nije pronađen. Da li si zaboravio da ga dodaš u index.html? Ili je možda id atribut pogrešno napisan?",
-
-  "error.globalSync.connectFailed": "Nije moguće povezati se na server. Da li server radi na `{{url}}`?",
 
   "error.startup.title": "Povezivanje sa serverom nije uspjelo",
 
@@ -603,30 +264,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Ponovo se prijavite na ChatGPT, a zatim ponovo pošaljite poruku da nastavite koristiti Codex modele.",
 
-  "error.chain.unknown": "Nepoznata greška",
-  "error.chain.causedBy": "Uzrok:",
-  "error.chain.apiError": "API greška",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Može se ponoviti: {{retryable}}",
-  "error.chain.responseBody": "Tijelo odgovora:\n{{body}}",
-  "error.chain.didYouMean": "Da li si mislio: {{suggestions}}",
-  "error.chain.modelNotFound": "Model nije pronađen: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Provjeri konfiguraciju (opencode.json) - nazive provajdera/modela",
-  "error.chain.mcpFailed": 'MCP server "{{name}}" nije uspio. Napomena: Kilo još ne podržava MCP autentifikaciju.',
-  "error.chain.providerAuthFailed": "Autentifikacija provajdera nije uspjela ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Neuspjelo inicijalizovanje provajdera "{{provider}}". Provjeri kredencijale i konfiguraciju.',
-  "error.chain.configJsonInvalid": "Konfiguracijska datoteka na {{path}} nije važeći JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Konfiguracijska datoteka na {{path}} nije važeći JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Direktorij "{{dir}}" u {{path}} nije ispravan. Preimenuj direktorij u "{{suggestion}}" ili ga ukloni. Ovo je česta greška u kucanju.',
-  "error.chain.configFrontmatterError": "Neuspjelo parsiranje frontmatter-a u {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Konfiguracijska datoteka na {{path}} nije ispravna",
-  "error.chain.configInvalidWithMessage": "Konfiguracijska datoteka na {{path}} nije ispravna: {{message}}",
-
   "notification.permission.title": "Potrebna dozvola",
   "notification.permission.titleSubagent": "Potrebna dozvola (podagent)",
-  "notification.permission.description": "{{sessionTitle}} u {{projectName}} traži dozvolu",
   "ui.permission.manageAutoApprove": "Upravljanje pravilima automatskog odobravanja",
   "ui.permission.doomLoop.prompt": "Otkrivena je moguća petlja za alat {{tool}}. Nastaviti izvršavanje?",
   "ui.permission.doomLoop.rule": "Nastavi pozive alata {{tool}}",
@@ -651,7 +290,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Čitanje liste zadataka",
   "ui.permission.toolLabel.todoWrite": "Ažuriranje liste zadataka",
   "ui.permission.toolLabel.codeSearch": "Pretraga koda",
-  "ui.permission.toggleWrap": "Prebaci prelamanje teksta",
   "ui.permission.copyCommand": "Kopiraj",
   "ui.approval.auto": "Automatski odobreno",
   "ui.approval.manual": "Odobrili ste vi",
@@ -663,49 +301,19 @@ export const dict = {
   "ui.approval.source.yolo": "režimom automatskog odobravanja (YOLO)",
   "ui.approval.source.session": "pravilom automatskog odobravanja sesije",
   "ui.approval.source.default": "podrazumevano",
-  "notification.question.title": "Pitanje",
-  "notification.question.description": "{{sessionTitle}} u {{projectName}} ima pitanje",
-  "notification.action.goToSession": "Idi na sesiju",
 
-  "notification.session.responseReady.title": "Odgovor je spreman",
-  "notification.session.error.title": "Greška sesije",
-  "notification.session.error.fallbackDescription": "Došlo je do greške",
-
-  "home.recentProjects": "Nedavni projekti",
-  "home.empty.title": "Nema nedavnih projekata",
-  "home.empty.description": "Kreni tako što ćeš otvoriti lokalni projekat",
-
-  "session.tab.session": "Sesija",
   "session.tab.review": "Pregled",
-  "session.tab.context": "Kontekst",
-  "session.panel.reviewAndFiles": "Pregled i datoteke",
   "session.review.filesChanged": "Izmijenjeno {{count}} datoteka",
-  "session.review.change.one": "Izmjena",
   "session.review.change.other": "Izmjene",
   "session.review.loadingChanges": "Učitavanje izmjena...",
-  "session.review.empty": "Još nema izmjena u ovoj sesiji",
   "session.review.noChanges": "Nema izmjena",
 
-  "session.files.selectToOpen": "Odaberi datoteku za otvaranje",
-  "session.files.all": "Sve datoteke",
-  "session.files.binaryContent": "Binarna datoteka (sadržaj se ne može prikazati)",
-
-  "session.messages.renderEarlier": "Prikaži ranije poruke",
   "session.messages.loadingEarlier": "Učitavanje ranijih poruka...",
   "session.messages.loadEarlier": "Učitaj ranije poruke",
   "session.messages.loading": "Učitavanje poruka...",
-  "session.messages.jumpToLatest": "Idi na najnovije",
 
-  "session.context.addToContext": "Dodaj {{selection}} u kontekst",
-
-  "session.new.worktree.main": "Glavna grana",
-  "session.new.worktree.mainWithBranch": "Glavna grana ({{branch}})",
-  "session.new.worktree.create": "Kreiraj novi worktree",
-  "session.new.lastModified": "Posljednja izmjena",
   "sidebar.session.newSession": "Nova Sesija",
   "sidebar.session.newSession.tooltip": "Započnite novi razgovor držeći trenutnu sesiju netaknutom.",
-  "sidebar.session.newSession.disabled":
-    "Ova sesija je već nova. Započnite razgovor ili umjesto toga kreirajte worktree.",
   "sidebar.session.newWorktree": "Novi Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Kreirajte izolovani git worktree za sigurno eksperimentisanje, odvojeno čuvanje izmjena i pokretanje paralelnih sesija bez prekidanja vaše trenutne grane.",
@@ -721,131 +329,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Premjesti ovaj razgovor i {{files}} izmijenjenih fajlova u namjenski worktree za izolovani naknadni rad.",
   "sidebar.session.showChanges.tooltip.empty": "Otvorite prikaz izmjena da pregledate trenutno radno stablo.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 fajl izmijenjen · +{{additions}} -{{deletions}}. Otvori pregled izmjena.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} fajlova izmijenjeno · +{{additions}} -{{deletions}}. Otvori pregled izmjena.",
-  "sidebar.session.agentManager.tooltip":
-    "Otvorite Agent Manager za potpuni pregled paralelnih sesija i worktree-a, kako biste mogli koordinirati dugotrajne zadatke na jednom mjestu.",
-  "sidebar.session.openAgentManager": "Otvori Agent Manager",
   "sidebar.session.progress.capturing": "Snimanje izmjena...",
   "sidebar.session.progress.creating": "Kreiranje worktree-a...",
   "sidebar.session.progress.setup": "Pokretanje podešavanja...",
   "sidebar.session.progress.transferring": "Prijenos izmjena...",
   "sidebar.session.progress.forking": "Pokretanje sesije...",
   "sidebar.session.progress.failed": "Nije uspjelo nastavljanje u worktree-u",
-  "session.header.search.placeholder": "Pretraži {{project}}",
-  "session.header.searchFiles": "Pretraži datoteke",
-  "session.header.openIn": "Otvori u",
-  "session.header.open.action": "Otvori {{app}}",
-  "session.header.open.ariaLabel": "Otvori u {{app}}",
-  "session.header.open.menu": "Opcije otvaranja",
-  "session.header.open.copyPath": "Kopiraj putanju",
-
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Konfiguracije servera",
-  "status.popover.tab.servers": "Serveri",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugini",
-  "status.popover.action.manageServers": "Upravljaj serverima",
-
-  "session.share.popover.title": "Objavi na webu",
-  "session.share.popover.description.shared": "Ova sesija je javna na webu. Dostupna je svima koji imaju link.",
-  "session.share.popover.description.unshared": "Podijeli sesiju javno na webu. Biće dostupna svima koji imaju link.",
-  "session.share.action.share": "Podijeli",
-  "session.share.action.publish": "Objavi",
-  "session.share.action.publishing": "Objavljivanje...",
-  "session.share.action.unpublish": "Poništi objavu",
-  "session.share.action.unpublishing": "Poništavanje objave...",
-  "session.share.action.view": "Prikaži",
-  "session.share.copy.copied": "Kopirano",
-  "session.share.copy.copyLink": "Kopiraj link",
-
-  "lsp.tooltip.none": "Nema LSP servera",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Učitavanje upita...",
-  "terminal.loading": "Učitavanje terminala...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Zatvori terminal",
-  "terminal.connectionLost.title": "Veza prekinuta",
-  "terminal.connectionLost.description":
-    "Veza s terminalom je prekinuta. Ovo se može desiti kada se server restartuje.",
 
   "common.closeTab": "Zatvori karticu",
   "common.signIn": "Prijava",
-  "common.signOut": "Odjava",
   "common.dismiss": "Odbaci",
   "common.requestFailed": "Zahtjev nije uspio",
-  "common.moreOptions": "Više opcija",
-  "common.learnMore": "Saznaj više",
   "common.rename": "Preimenuj",
-  "common.reset": "Resetuj",
-  "common.archive": "Arhiviraj",
   "common.delete": "Izbriši",
   "common.close": "Zatvori",
   "common.edit": "Uredi",
   "common.loadMore": "Učitaj još",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Prikaži/sakrij meni",
-  "sidebar.nav.projectsAndSessions": "Projekti i sesije",
   "sidebar.settings": "Postavke",
-  "sidebar.help": "Pomoć",
-  "sidebar.workspaces.enable": "Omogući radne prostore",
-  "sidebar.workspaces.disable": "Onemogući radne prostore",
-  "sidebar.gettingStarted.title": "Početak",
-  "sidebar.gettingStarted.line1": "Kilo uključuje besplatne modele, tako da možeš odmah početi.",
-  "sidebar.gettingStarted.line2": "Poveži bilo kojeg provajdera da koristiš modele, npr. Claude, GPT, Gemini itd.",
-  "sidebar.project.recentSessions": "Nedavne sesije",
-  "sidebar.project.viewAllSessions": "Prikaži sve sesije",
 
-  "app.name.desktop": "Kilo Desktop",
-
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Server",
-  "settings.tab.general": "Opšte",
-  "settings.tab.shortcuts": "Prečice",
-
-  "settings.general.section.appearance": "Izgled",
-  "settings.general.section.notifications": "Sistemske obavijesti",
-  "settings.general.section.updates": "Ažuriranja",
-  "settings.general.section.sounds": "Zvučni efekti",
-
-  "settings.general.row.language.title": "Jezik",
-  "settings.general.row.language.description": "Promijeni jezik prikaza u Kilo-u",
-  "settings.general.row.appearance.title": "Izgled",
-  "settings.general.row.appearance.description": "Prilagodi kako Kilo izgleda na tvom uređaju",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Prilagodi temu Kilo-a.",
-  "settings.general.row.font.title": "Font",
-  "settings.general.row.font.description": "Prilagodi monospace font koji se koristi u blokovima koda",
-
-  "settings.general.row.releaseNotes.title": "Bilješke o izdanju",
-  "settings.general.row.releaseNotes.description": 'Prikaži iskačuće prozore "Šta je novo" nakon ažuriranja',
-
-  "settings.updates.row.startup.title": "Provjeri ažuriranja pri pokretanju",
-  "settings.updates.row.startup.description": "Automatski provjerava ažuriranja kada se Kilo pokrene",
-  "settings.updates.row.check.title": "Provjeri ažuriranja",
-  "settings.updates.row.check.description": "Ručno provjeri ažuriranja i instaliraj ako su dostupna",
-  "settings.updates.action.checkNow": "Provjeri sada",
-  "settings.updates.action.checking": "Provjera...",
-  "settings.updates.toast.latest.title": "Sve je ažurno",
-  "settings.updates.toast.latest.description": "Koristiš najnoviju verziju Kilo-a.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Upozorenje 01",
   "sound.option.alert02": "Upozorenje 02",
   "sound.option.alert03": "Upozorenje 03",
@@ -892,21 +394,6 @@ export const dict = {
   "sound.option.yup05": "Da 05",
   "sound.option.yup06": "Da 06",
 
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Prikaži sistemsku obavijest kada agent završi ili zahtijeva pažnju",
-  "settings.general.notifications.permissions.title": "Dozvole",
-  "settings.general.notifications.permissions.description": "Prikaži sistemsku obavijest kada je potrebna dozvola",
-  "settings.general.notifications.errors.title": "Greške",
-  "settings.general.notifications.errors.description": "Prikaži sistemsku obavijest kada dođe do greške",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Pusti zvuk kada agent završi ili zahtijeva pažnju",
-  "settings.general.sounds.permissions.title": "Dozvole",
-  "settings.general.sounds.permissions.description": "Pusti zvuk kada je potrebna dozvola",
-  "settings.general.sounds.errors.title": "Greške",
-  "settings.general.sounds.errors.description": "Pusti zvuk kada dođe do greške",
-
   "prompt.action.indexing": "Postavke indeksiranja",
   "settings.indexing.dimension.description":
     "Ostavite prazno za automatsko prepoznavanje dimenzije embeddinga iz modela.",
@@ -922,8 +409,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Omogući za ovaj projekat",
   "settings.indexing.projectEnable.description":
     "Omogući indeksiranje za ovaj radni prostor kada je globalno indeksiranje isključeno.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Globalno indeksiranje je omogućeno, tako da je ovaj projekat već obuhvaćen.",
   "settings.indexing.lancedbDirectory.description": "Opcionalni direktorij za lokalno LanceDB skladište.",
   "settings.indexing.lancedbDirectory.placeholder": "Ostavite prazno za zadano",
   "settings.indexing.lancedbDirectory.title": "LanceDB direktorij",
@@ -952,32 +437,10 @@ export const dict = {
   "settings.indexing.vectorStore.description": "Odaberite gdje se pohranjuju indeksirani embeddingi.",
   "settings.indexing.vectorStore.title": "Vektorsko skladište",
 
-  "settings.shortcuts.title": "Prečice na tastaturi",
-  "settings.shortcuts.reset.button": "Vrati na podrazumijevano",
-  "settings.shortcuts.reset.toast.title": "Prečice resetovane",
-  "settings.shortcuts.reset.toast.description": "Prečice na tastaturi su vraćene na podrazumijevane.",
-  "settings.shortcuts.conflict.title": "Prečica je već u upotrebi",
-  "settings.shortcuts.conflict.description": "{{keybind}} je već dodijeljeno za {{titles}}.",
-  "settings.shortcuts.unassigned": "Nedodijeljeno",
-  "settings.shortcuts.pressKeys": "Pritisni tastere",
-  "settings.shortcuts.search.placeholder": "Pretraži prečice",
-  "settings.shortcuts.search.empty": "Nema pronađenih prečica",
-
-  "settings.shortcuts.group.general": "Opšte",
-  "settings.shortcuts.group.session": "Sesija",
-  "settings.shortcuts.group.navigation": "Navigacija",
-  "settings.shortcuts.group.modelAndAgent": "Model i agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Upit",
-
   "settings.providers.title": "Provajderi",
-  "settings.providers.description": "Postavke provajdera će se ovdje moći podešavati.",
-  "settings.providers.betaNotice":
-    "Trenutno se samo Kilo Gateway provajder može konfigurisati u interfejsu za postavke. Podrška za konfigurisanje drugih provajdera stiže uskoro tokom beta perioda. U međuvremenu, provajdere možete konfigurisati koristeći CLI ili konfiguracijsku datoteku. Posvećeni smo tome da Kilo ostane otvoren, bez vezivanja.",
   "settings.providers.section.connected": "Povezani provajderi",
   "settings.providers.connected.empty": "Nema povezanih provajdera",
   "settings.providers.section.popular": "Popularni provajderi",
-  "settings.providers.search.placeholder": "Pretraži provajdere",
   "settings.providers.select.placeholder": "Odaberi provajdera...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Okruženje",
@@ -996,7 +459,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Sakrij Kilo Gateway modele čiji pružaoci mogu koristiti vaše promptove za treniranje.",
   "settings.providers.modeModels": "Model po režimu",
-  "settings.providers.custom.note": "Dodajte prilagođenog provajdera putem osnovnog URL-a.",
   "settings.providers.modeModels.description":
     "Zamijenite podrazumijevani model za određene režime. Ako nije postavljeno, koristi se globalni podrazumijevani model.",
   "provider.custom.title": "Prilagođeni provajder",
@@ -1063,9 +525,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Ukloni model",
   "provider.custom.models.add": "Dodaj model",
-  "provider.custom.models.fetch": "Preuzmi modele",
-  "provider.custom.models.fetching": "Preuzimanje\u2026",
-  "provider.custom.models.fetch.error": "Preuzimanje modela nije uspjelo: {{error}}",
   "provider.custom.models.fetch.authError":
     "Autentifikacija nije uspjela. Provjerite API ključ iznad i pokušajte ponovo.",
   "provider.custom.models.fetch.empty": "Nisu pronađeni modeli na ovom serveru.",
@@ -1118,23 +577,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Zastarjela .kilocode konfiguracija",
   "settings.config.source.projectOpencode": "Zastarjela .opencode konfiguracija",
   "settings.models.title": "Modeli",
-  "settings.models.description": "Postavke modela će se ovdje moći podešavati.",
-  "settings.agents.title": "Agenti",
-  "settings.agents.description": "Postavke agenata će se ovdje moći podešavati.",
-  "settings.commands.title": "Komande",
-  "settings.commands.description": "Postavke komandi će se ovdje moći podešavati.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP postavke će se ovdje moći podešavati.",
 
-  "settings.permissions.title": "Dozvole",
-  "settings.permissions.description": "Kontroliši koje alate server smije koristiti po defaultu.",
-  "settings.permissions.section.tools": "Alati",
   "settings.permissions.toast.updateFailed.title": "Neuspjelo ažuriranje dozvola",
 
-  "settings.permissions.action.allow": "Dozvoli",
-  "settings.permissions.action.ask": "Pitaj",
-  "settings.permissions.action.deny": "Zabrani",
-
   "settings.permissions.tool.read.title": "Čitanje",
   "settings.permissions.tool.read.description": "Čitanje datoteke (podudara se s putanjom datoteke)",
   "settings.permissions.tool.edit.title": "Uređivanje",
@@ -1169,7 +614,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Beskonačna petlja",
   "settings.permissions.tool.doom_loop.description": "Otkriva ponovljene pozive alata sa identičnim unosom",
 
-  "session.delete.failed.title": "Neuspjelo brisanje sesije",
   "session.delete.title": "Izbriši sesiju",
   "session.delete.confirm": 'Izbriši sesiju "{{name}}"?',
   "session.delete.button": "Izbriši sesiju",
@@ -1199,12 +643,7 @@ export const dict = {
   "workStyle.onboarding.title": "Odaberite kako želite raditi",
   "workStyle.onboarding.settingsNote": "Ove opcije možete promijeniti bilo kada u",
   "workStyle.onboarding.settings": "Postavkama.",
-  "workStyle.onboarding.description":
-    "Postavlja početne zadane vrijednosti za dozvole, blokove zaključivanja, izlaz terminala i vremensku liniju konteksta. Primjenjuje se samo jednom i preskače postavke koje ste već prilagodili.",
-  "workStyle.onboarding.skip": "Preskoči za sada",
   "workStyle.toast.saved.title": "Režim je uspješno sačuvan",
-  "workStyle.toast.saved.description": "Svoje postavke možete ažurirati bilo kada u Postavkama.",
-  "workStyle.toast.saved.action": "Idi na Postavke",
   "workStyle.choice.permissions": "Dozvole",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Vidljivost",
@@ -1227,32 +666,6 @@ export const dict = {
   "session.cloud.import.legacy": "Čini se da je ovo zastarjela sesija koja više nije podržana.",
   "session.cloud.import.failed": "Uvoz sesije iz oblaka nije uspio",
 
-  "workspace.new": "Novi radni prostor",
-  "workspace.type.local": "lokalno",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Neuspješno kreiranje radnog prostora",
-  "workspace.delete.failed.title": "Neuspješno brisanje radnog prostora",
-  "workspace.resetting.title": "Resetovanje radnog prostora",
-  "workspace.resetting.description": "Ovo može potrajati minut.",
-  "workspace.reset.failed.title": "Neuspješno resetovanje radnog prostora",
-  "workspace.reset.success.title": "Radni prostor resetovan",
-  "workspace.reset.success.description": "Radni prostor sada odgovara podrazumijevanoj grani.",
-  "workspace.error.stillPreparing": "Radni prostor se još priprema",
-  "workspace.status.checking": "Provjera neobjedinjenih promjena...",
-  "workspace.status.error": "Nije moguće provjeriti git status.",
-  "workspace.status.clean": "Nisu pronađene neobjedinjene promjene.",
-  "workspace.status.dirty": "Pronađene su neobjedinjene promjene u ovom radnom prostoru.",
-  "workspace.delete.title": "Izbriši radni prostor",
-  "workspace.delete.confirm": 'Izbriši radni prostor "{{name}}"?',
-  "workspace.delete.button": "Izbriši radni prostor",
-  "workspace.reset.title": "Resetuj radni prostor",
-  "workspace.reset.confirm": 'Resetuj radni prostor "{{name}}"?',
-  "workspace.reset.button": "Resetuj radni prostor",
-  "workspace.reset.archived.none": "Nijedna aktivna sesija neće biti arhivirana.",
-  "workspace.reset.archived.one": "1 sesija će biti arhivirana.",
-  "workspace.reset.archived.many": "Biće arhivirano {{count}} sesija.",
-  "workspace.reset.note": "Ovo će resetovati radni prostor da odgovara podrazumijevanoj grani.",
-
   "deviceAuth.toast.urlCopied": "URL kopiran u međuspremnik",
   "deviceAuth.toast.codeCopied": "Kod kopiran u međuspremnik",
   "deviceAuth.toast.errorCopied": "Greška kopirana u međuspremnik",
@@ -1290,7 +703,6 @@ export const dict = {
   "profile.pass.renews": "Obnavlja se",
   "profile.action.logout": "Odjava",
 
-  "settings.section.configuration": "Konfiguracija",
   "settings.agentBehaviour.title": "Ponašanje agenta",
   "settings.autoApprove.title": "Automatsko odobravanje",
   "settings.browser.title": "Preglednik",
@@ -1306,7 +718,6 @@ export const dict = {
   "settings.language.title": "Jezik",
   "settings.aboutKiloCode.title": "O Kilo Code-u",
 
-  "session.messages.empty": "Započnite razgovor unosom poruke ispod.",
   "session.messages.welcome":
     "Kilo Code je AI asistent za programiranje. Zatražite da gradi funkcionalnosti, ispravlja greške ili objasni vašu bazu koda.",
   "session.messages.scrollToBottom": "Pomakni se na dno",
@@ -1314,7 +725,6 @@ export const dict = {
   "session.messages.taskStarting": "Pokretanje...",
   "session.status.writingResponse": "Pisanje odgovora…",
   "session.status.retry": "Ponovni pokušaj…",
-  "session.status.retrying": "Ponovni pokušaj (pokušaj {{ attempt }})… {{ message }}",
   "session.status.working": "Radim…",
   "session.status.offline": "Mreža prekinuta — ponovno povezivanje...",
   "session.outcome.incomplete": "Potez završen sa {{count}} preostalih zadataka",
@@ -1346,11 +756,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} starijih sesija",
   "context.stats.thisSession": "Ova sesija",
 
-  "time.justNow": "upravo sada",
-  "time.minutesAgo": "prije {{count}} min",
-  "time.hoursAgo": "prije {{count}}h",
-  "time.daysAgo": "prije {{count}}d",
-  "time.monthsAgo": "prije {{count}} mj.",
   "time.today": "Danas",
   "time.yesterday": "Jučer",
   "time.thisWeek": "Ove sedmice",
@@ -1366,7 +771,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Informacije o verziji",
   "settings.aboutKiloCode.version.label": "Verzija:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code ekstenzija",
   "settings.aboutKiloCode.community": "Zajednica i podrška",
   "settings.aboutKiloCode.feedback.prefix": "Ako imate pitanja ili povratne informacije, slobodno otvorite issue na",
   "settings.aboutKiloCode.feedback.or": "ili",
@@ -1415,7 +819,6 @@ export const dict = {
   "settings.language.current": "Trenutni:",
 
   "common.add": "Dodaj",
-  "common.choose": "Odaberi…",
 
   "settings.autocomplete.autoTrigger.title": "Omogući automatsko inline dovršavanje",
   "settings.autocomplete.autoTrigger.description": "Automatski prikaži prijedloge inline dovršavanja tokom tipkanja",
@@ -1425,28 +828,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Prikaži prijedloge automatskog dovršavanja u polju chata",
   "settings.autocomplete.modelsHint":
     "Da odaberete koji se model koristi za automatsko dovršavanje, pogledajte postavke Modela.",
-  "settings.notifications.agent.title": "Završetak agenta",
-  "settings.notifications.agent.description": "Prikaži obavijest kada agent završi zadatak",
-  "settings.notifications.permissions.title": "Zahtjevi za dozvolu",
-  "settings.notifications.permissions.description": "Prikaži obavijest pri zahtjevima za dozvolu",
-  "settings.notifications.errors.title": "Greške",
-  "settings.notifications.errors.description": "Prikaži obavijest pri greškama",
   "settings.notifications.sounds": "Zvukovi",
   "settings.notifications.enable.title": "Omogući zvučne obavijesti",
   "settings.notifications.enable.description":
     "Reproduciraj zvukove kada se sesije završe, naiđu na grešku ili trebaju vaš unos",
   "settings.notifications.testSound": "Testiraj",
-  "settings.notifications.agentSound.title": "Zvuk završetka agenta",
-  "settings.notifications.agentSound.description": "Zvuk pri završetku agenta",
-  "settings.notifications.permSound.title": "Zvuk zahtjeva za dozvolu",
-  "settings.notifications.permSound.description": "Zvuk pri zahtjevima za dozvolu",
-  "settings.notifications.errorSound.title": "Zvuk greške",
-  "settings.notifications.errorSound.description": "Zvuk pri greškama",
   "settings.notifications.sound.default": "Zadano",
   "settings.notifications.sound.system": "Sistem",
   "settings.notifications.sound.description":
     "Zadana opcija koristi različite zvukove za završetak, unos i greške. Ostale opcije koriste jedan zvuk za sve događaje.",
-  "settings.notifications.sound.none": "Ništa",
   "settings.experimental.share.title": "Način dijeljenja",
   "settings.experimental.share.description": "Ponašanje dijeljenja sesije",
   "settings.experimental.share.manual": "Ručno",
@@ -1466,9 +856,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Model za generisanje slika",
   "settings.experimental.imageGenerationModel.placeholder": "Zadano (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Govor u tekst",
-  "settings.experimental.speechToText.description":
-    "Omogućite glasovni unos u poljima za promptove koristeći vaš Kilo račun preko Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Omogućite i prijavite se na Kilo provajder da biste koristili Speech to Text. Speech to Text je trenutno podržan samo uz Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Model govora u tekst",
@@ -1509,15 +896,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Zadani agent",
   "settings.agentBehaviour.defaultAgent.description": "Agent koji se koristi kada nijedan nije naveden",
   "settings.agentBehaviour.availableAgents": "Dostupni agenti",
-  "settings.agentBehaviour.selectAgent": "Odaberi agenta za konfiguraciju…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Odaberi agenta za konfiguraciju…",
   "settings.agentBehaviour.modelOverride.title": "Zamjena modela",
   "settings.agentBehaviour.modelOverride.description": "Zamijeni zadani model za ovog agenta",
   "settings.agentBehaviour.variantOverride.title": "Zamjena varijante",
   "settings.agentBehaviour.variantOverride.description": "Zamijeni varijantu modela za ovog agenta",
-  "settings.agentBehaviour.prompt.title": "Prilagođeni prompt",
-  "settings.agentBehaviour.prompt.description": "Dodatni sistemski prompt za ovog agenta",
   "settings.agentBehaviour.temperature.title": "Temperatura",
   "settings.agentBehaviour.temperature.description":
     "Kontroliše koliko su AI odgovori nasumični (0–2). Niže vrijednosti (npr. 0.2) daju fokusirane i dosljedne rezultate. Više vrijednosti (npr. 1.0) daju raznovrsnije i kreativnije odgovore. Ostavite prazno da biste koristili zadanu vrijednost modela.",
@@ -1537,7 +919,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Otkrivene vještine",
   "settings.agentBehaviour.noSkillsFound":
     "Nisu pronađene vještine. Dodajte putanje mapa ili URL-ove ispod kako biste učinili vještine dostupnim.",
-  "settings.agentBehaviour.availableModes": "Dostupni prilagođeni modovi",
   "settings.agentBehaviour.noAgentsFound": "Nisu pronađeni agenti.",
   "settings.agentBehaviour.createMode": "Kreiraj novi mod",
   "settings.agentBehaviour.createMode.name": "Naziv",
@@ -1619,11 +1000,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Naredba",
   "settings.agentBehaviour.mcpDetail.args": "Argumenti",
   "settings.agentBehaviour.mcpDetail.env": "Okruženje",
-  "settings.agentBehaviour.mcpDetail.disabled": "Ovaj server je onemogućen.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Pregledaj Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Nema konfiguriranih MCP servera. Dodajte MCP servere u kilo.jsonc ili zamolite agenta da ih doda.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Tokovi rada se upravljaju putem datoteka tokova rada.",
   "settings.agentBehaviour.workflows.description":
     "Tokovi rada su prilagođene slash komande definirane u vašoj konfiguraciji. Upišite /command-name u chat da ih pokrenete. Komande se konfiguriraju u opencode.json pod sekcijom 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1717,7 +1096,6 @@ export const dict = {
     "npr. Generiši commit messages na španskom jeziku prateći conventional commits format. Vrati SAMO commit message.",
 
   "settings.commitMessage.language.sync": "Sinkronizacija sa jezikom korisničkog sučelja",
-  "settings.commitMessage.language.title": "Jezik",
   "settings.commitMessage.language.description": "Izaberite koji jezik koristiti za poruke koje generiše AI:",
 
   "settings.display.username.title": "Korisničko ime",
@@ -1756,8 +1134,6 @@ export const dict = {
   "settings.providers.disabled": "Onemogućeni pružatelji",
   "settings.providers.disabled.description": "Pružatelji za skrivanje s popisa",
   "settings.providers.disabled.enable": "Omogući",
-  "settings.providers.enabled": "Omogućeni pružatelji (bijela lista)",
-  "settings.providers.enabled.description": "Ako je postavljeno, samo ovi pružatelji će biti dostupni",
   "settings.providers.notSet": "Nije postavljeno (koristi zadano servera)",
   "dialog.model.notSet": "Nije postavljeno",
   "profile.personalAccount": "Osobni račun",
@@ -1798,9 +1174,7 @@ export const dict = {
   "migration.migrate.title": "Migrirajte svoje postavke",
   "migration.migrate.subtitle": "Pronašli smo postavke iz vaše prethodne instalacije. Evo šta možemo prenijeti.",
   "migration.migrate.selectLabel": "Odaberite šta želite migrirati",
-  "migration.migrate.cannotMigrate": "Nije moguće migrirati",
   "migration.migrate.chatHistory": "Sesije razgovora i historija",
-  "migration.migrate.chatHistoryDesc": "Nekompatibilno sa novom arhitekturom",
   "migration.migrate.button": "Migriraj postavke",
   "migration.migrate.skip": "Preskoči",
   "migration.migrate.keysDetected": "{{count}} ključeva otkriveno",
@@ -1824,10 +1198,7 @@ export const dict = {
     "Ovo uklanja stare postavke iz VS Code pohrane. Nećete moći ponovo pokrenuti ovu migraciju.",
   "migration.complete.done": "Završeno",
   "migration.migrate.sessionsDetected": "Otkrivene {{count}} sesije",
-  "migration.error.sessionFailed": "Migracija sesije nije uspjela",
   "migration.error.continue": "Nastavi",
-  "migration.error.action.copy": "Kopiraj",
-  "migration.error.toast.copied": "Greška kopirana u međuspremnik",
 
   "migration.sessionSummary.title": "Sažetak:",
   "migration.sessionSummary.copy": "Kopiraj izvještaj",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index c9fe79c1f68..90ff0250871 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Foreslået",
-  "command.category.view": "Vis",
-  "command.category.project": "Projekt",
-  "command.category.provider": "Udbyder",
-  "command.category.server": "Server",
-  "command.category.session": "Session",
-  "command.category.theme": "Tema",
-  "command.category.language": "Sprog",
-  "command.category.file": "Fil",
-  "command.category.context": "Kontekst",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Model",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Tilladelser",
-  "command.category.workspace": "Arbejdsområde",
 
-  "command.category.settings": "Indstillinger",
-  "theme.scheme.system": "System",
-  "theme.scheme.light": "Lys",
-  "theme.scheme.dark": "Mørk",
-
-  "command.sidebar.toggle": "Skift sidebjælke",
-  "command.project.open": "Åbn projekt",
   "command.provider.connect": "Tilslut udbyder",
-  "command.server.switch": "Skift server",
-  "command.settings.open": "Åbn indstillinger",
-  "command.session.previous": "Forrige session",
-  "command.session.next": "Næste session",
-  "command.session.previous.unseen": "Forrige ulæste session",
-  "command.session.next.unseen": "Næste ulæste session",
-  "command.session.archive": "Arkivér session",
-
-  "command.palette": "Kommandopalette",
-
-  "command.theme.cycle": "Skift tema",
-  "command.theme.set": "Brug tema: {{theme}}",
-  "command.theme.scheme.cycle": "Skift farveskema",
-  "command.theme.scheme.set": "Brug farveskema: {{scheme}}",
-
-  "command.language.cycle": "Skift sprog",
-  "command.language.set": "Brug sprog: {{language}}",
 
   "command.session.new": "Ny session",
-  "command.session.new.task": "Ny opgave",
   "command.session.show.changes": "Vis ændringer",
-  "command.file.open": "Åbn fil",
-  "command.tab.close": "Luk fane",
-  "command.context.addSelection": "Tilføj markering til kontekst",
-  "command.context.addSelection.description": "Tilføj markerede linjer fra den aktuelle fil",
-  "command.terminal.toggle": "Skift terminal",
-  "command.fileTree.toggle": "Skift filtræ",
   "command.review.toggle": "Skift gennemgang",
-  "command.terminal.new": "Ny terminal",
-  "command.terminal.new.description": "Opret en ny terminalfane",
-  "command.steps.toggle": "Skift trin",
-  "command.steps.toggle.description": "Vis eller skjul trin for den aktuelle besked",
-  "command.message.previous": "Forrige besked",
-  "command.message.previous.description": "Gå til den forrige brugerbesked",
-  "command.message.next": "Næste besked",
-  "command.message.next.description": "Gå til den næste brugerbesked",
-  "command.model.choose": "Vælg model",
-  "command.model.choose.description": "Vælg en anden model",
-  "command.mcp.toggle": "Skift MCP'er",
-  "command.mcp.toggle.description": "Skift MCP'er",
-  "command.agent.cycle": "Skift agent",
-  "command.agent.cycle.description": "Skift til næste agent",
-  "command.agent.cycle.reverse": "Skift agent baglæns",
-  "command.agent.cycle.reverse.description": "Skift til forrige agent",
-  "command.model.variant.cycle": "Skift tænkeindsats",
-  "command.model.variant.cycle.description": "Skift til næste indsatsniveau",
-  "command.permissions.autoaccept.enable": "Accepter ændringer automatisk",
-  "command.permissions.autoaccept.disable": "Stop automatisk accept af ændringer",
-  "command.workspace.toggle": "Skift arbejdsområder",
-  "command.workspace.toggle.description": "Aktivér eller deaktivér flere arbejdsområder i sidebjælken",
-  "command.session.undo": "Fortryd",
-  "command.session.undo.description": "Fortryd den sidste besked",
-  "command.session.redo": "Omgør",
-  "command.session.redo.description": "Omgør den sidste fortrudte besked",
   "revert.banner.count_one": "{{count}} besked fortrudt",
   "revert.banner.count_other": "{{count}} beskeder fortrudt",
   "revert.banner.redo": "Gentag",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Aktivér snapshots",
   "revert.disabled.agentBusy": "Vent på at agenten er færdig",
   "command.session.compact": "Komprimér session",
-  "command.session.compact.description": "Opsummer sessionen for at reducere kontekststørrelsen",
-  "command.session.fork": "Forgren fra besked",
-  "command.session.fork.description": "Opret en ny session fra en tidligere besked",
-  "command.session.share": "Del session",
-  "command.session.share.description": "Del denne session og kopier URL'en til udklipsholderen",
-  "command.session.unshare": "Stop deling af session",
-  "command.session.unshare.description": "Stop med at dele denne session",
   "command.session.export": "Eksporter sessionsudskrift",
 
   "agentRequirements.skill.installed": "Installeret",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Denne agentkravskontrol er ikke længere aktiv.",
   "agentRequirements.error.requestFailed": "Kilo kunne ikke kontrollere agentkravene.",
 
-  "palette.search.placeholder": "Søg i filer, kommandoer og sessioner",
-  "palette.empty": "Ingen resultater fundet",
-  "palette.group.commands": "Kommandoer",
-  "palette.group.files": "Filer",
-
   "dialog.provider.search.placeholder": "Søg udbydere",
   "dialog.provider.empty": "Ingen udbydere fundet",
   "dialog.provider.group.other": "Andre",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Vælg model",
   "dialog.model.search.placeholder": "Søg modeller",
   "dialog.model.empty": "Ingen modeller fundet",
-  "dialog.model.manage": "Administrer modeller",
-  "dialog.model.manage.description": "Tilpas hvilke modeller der vises i modelvælgeren.",
   "dialog.model.select": "Vælg",
   "dialog.model.expand": "Udvid",
   "dialog.model.collapse": "Skjul",
 
-  "dialog.model.unpaid.freeModels.title": "Gratis modeller leveret af Kilo",
-  "dialog.model.unpaid.addMore.title": "Tilføj flere modeller fra populære udbydere",
-
   "dialog.provider.viewAll": "Vis flere udbydere",
 
   "provider.connect.title": "Forbind {{provider}}",
-  "provider.connect.title.anthropicProMax": "Log ind med Claude Pro/Max",
   "provider.connect.selectMethod": "Vælg loginmetode for {{provider}}.",
   "provider.connect.method.apiKey": "API-nøgle",
   "provider.connect.status.inProgress": "Godkendelse i gang...",
@@ -231,13 +140,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "f.eks. my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI-slutpunkts-URL",
   "provider.connect.azure.baseURL.placeholder": "f.eks. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen giver dig adgang til et udvalg af pålidelige optimerede modeller til kodningsagenter.",
-  "provider.connect.opencodeZen.line2":
-    "Med en enkelt API-nøgle får du adgang til modeller som Claude, GPT, Gemini, GLM og flere.",
-  "provider.connect.opencodeZen.visit.prefix": "Besøg ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " for at hente din API-nøgle.",
   "provider.connect.oauth.code.visit.prefix": "Besøg ",
   "provider.connect.oauth.code.visit.link": "dette link",
   "provider.connect.oauth.code.visit.suffix":
@@ -245,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} godkendelseskode",
   "provider.connect.oauth.code.placeholder": "Godkendelseskode",
   "provider.connect.oauth.code.required": "Godkendelseskode er påkrævet",
-  "provider.connect.oauth.code.invalid": "Ugyldig godkendelseskode",
   "provider.connect.oauth.auto.visit.prefix": "Besøg ",
   "provider.connect.oauth.auto.visit.link": "dette link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -258,29 +159,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Modeller fra {{provider}} er ikke længere tilgængelige.",
   "model.tag.free": "Gratis",
   "model.tag.dataCollected": "Data kan bruges til træning",
-  "model.tag.latest": "Nyeste",
   "model.group.auto": "Automatiske modeller",
   "model.group.recommended": "Anbefalet",
   "model.group.favorites": "Favoritter",
-  "model.group.collapse": "Skjul {{group}}",
-  "model.group.expand": "Vis {{group}}",
   "model.favorite.add": "Føj til favoritter",
   "model.favorite.remove": "Fjern fra favoritter",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "tekst",
-  "model.input.image": "billede",
-  "model.input.audio": "lyd",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Tillader: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Tillader tænkning",
-  "model.tooltip.reasoning.none": "Ingen tænkning",
-  "model.tooltip.context": "Kontekstgrænse {{limit}}",
   "model.preview.label.released": "Udgivet",
   "model.preview.label.input": "Input",
   "model.preview.label.output": "Output",
@@ -300,11 +184,8 @@ export const dict = {
   "model.preview.modality.audio": "Lyd",
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "Søg",
   "common.goBack": "Gå tilbage",
-  "common.goForward": "Fremad",
   "common.loading": "Indlæser",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Annuller",
   "common.connect": "Forbind",
   "common.disconnect": "Frakobl",
@@ -312,54 +193,8 @@ export const dict = {
   "common.save": "Gem",
   "common.saving": "Gemmer...",
   "common.default": "Standard",
-  "common.attachment": "vedhæftning",
 
-  "prompt.placeholder.shell": "Indtast shell-kommando...",
-  "prompt.placeholder.normal": 'Spørg om hvad som helst... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Opsummér kommentarer…",
-  "prompt.placeholder.summarizeComment": "Opsummér kommentar…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc for at afslutte",
-
-  "prompt.example.1": "Ret en TODO i koden",
-  "prompt.example.2": "Hvad er teknologistakken for dette projekt?",
-  "prompt.example.3": "Ret ødelagte tests",
-  "prompt.example.4": "Forklar hvordan godkendelse fungerer",
-  "prompt.example.5": "Find og ret sikkerhedshuller",
-  "prompt.example.6": "Tilføj enhedstests for brugerservice",
-  "prompt.example.7": "Refaktorer denne funktion så den er mere læsbar",
-  "prompt.example.8": "Hvad betyder denne fejl?",
-  "prompt.example.9": "Hjælp mig med at debugge dette problem",
-  "prompt.example.10": "Generer API-dokumentation",
-  "prompt.example.11": "Optimer databaseforespørgsler",
-  "prompt.example.12": "Tilføj validering af input",
-  "prompt.example.13": "Opret en ny komponent til...",
-  "prompt.example.14": "Hvordan deployerer jeg dette projekt?",
-  "prompt.example.15": "Gennemgå min kode for bedste praksis",
-  "prompt.example.16": "Tilføj fejlhåndtering til denne funktion",
-  "prompt.example.17": "Forklar dette regex-mønster",
-  "prompt.example.18": "Konverter dette til TypeScript",
-  "prompt.example.19": "Tilføj logning i hele koden",
-  "prompt.example.20": "Hvilke afhængigheder er forældede?",
-  "prompt.example.21": "Hjælp mig med at skrive et migreringsscript",
-  "prompt.example.22": "Implementer caching for dette endpoint",
-  "prompt.example.23": "Tilføj sideinddeling til denne liste",
-  "prompt.example.24": "Opret en CLI-kommando til...",
-  "prompt.example.25": "Hvordan fungerer miljøvariabler her?",
-
-  "prompt.popover.emptyResults": "Ingen matchende resultater",
-  "prompt.popover.emptyCommands": "Ingen matchende kommandoer",
-  "prompt.dropzone.label": "Slip billeder eller PDF'er her",
-  "prompt.slash.badge.custom": "brugerdefineret",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "aktiv",
-  "prompt.context.includeActiveFile": "Inkluder aktiv fil",
-  "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
-  "prompt.context.removeFile": "Fjern fil fra kontekst",
   "prompt.thinking.tooltip": "Ræsonnementsindsats",
-  "prompt.action.attachFile": "Vedhæft fil",
-  "prompt.attachment.remove": "Fjern vedhæftning",
   "prompt.action.send": "Send",
   "prompt.action.send.blocked": "Besvar eller afvis det afventende spørgsmål først",
   "prompt.action.send.recording": "Transskriber og send",
@@ -400,189 +235,17 @@ export const dict = {
   "speechToText.tooltip.error": "Stemmeinput mislykkedes. Klik for at rydde.",
   "speechToText.error.title": "Stemmeinput mislykkedes",
   "speechToText.error.loginRequired": "Log ind på Kilo for at bruge stemmeinput.",
-  "speechToText.error.permission": "Mikrofontilladelse blev nægtet.",
-  "speechToText.error.microphone": "Kunne ikke starte mikrofonen.",
-  "speechToText.error.recording": "Optagelse mislykkedes.",
-  "speechToText.error.emptyRecording": "Ingen lyd blev optaget.",
   "speechToText.error.emptyTranscript": "Ingen tale blev registreret.",
-  "speechToText.error.encoding": "Kunne ikke kode optagelsen.",
-  "speechToText.toast.transcribed": "Transskription indsat",
 
-  "prompt.toast.pasteUnsupported.title": "Ikke understøttet indsæt",
-  "prompt.toast.pasteUnsupported.description": "Kun billeder eller PDF'er kan indsættes her.",
-  "prompt.toast.modelAgentRequired.title": "Vælg en agent og model",
-  "prompt.toast.modelAgentRequired.description": "Vælg en agent og model før du sender en forespørgsel.",
-  "prompt.toast.worktreeCreateFailed.title": "Kunne ikke oprette worktree",
-  "prompt.toast.sessionCreateFailed.title": "Kunne ikke oprette session",
-  "prompt.toast.shellSendFailed.title": "Kunne ikke sende shell-kommando",
-  "prompt.toast.commandSendFailed.title": "Kunne ikke sende kommando",
   "prompt.toast.promptSendFailed.title": "Kunne ikke sende forespørgsel",
 
-  "dialog.mcp.title": "MCP'er",
-  "dialog.mcp.description": "{{enabled}} af {{total}} aktiveret",
-  "dialog.mcp.empty": "Ingen MCP'er konfigureret",
-
-  "dialog.lsp.empty": "LSP'er registreret automatisk fra filtyper",
-  "dialog.plugins.empty": "Plugins konfigureret i opencode.json",
-
   "mcp.status.connected": "forbundet",
   "mcp.status.failed": "mislykkedes",
   "mcp.status.needs_auth": "kræver godkendelse",
   "mcp.status.needs_registration": "kræver klientregistrering",
   "mcp.status.disabled": "deaktiveret",
 
-  "dialog.fork.empty": "Ingen beskeder at forgrene fra",
-
-  "dialog.directory.search.placeholder": "Søg mapper",
-  "dialog.directory.empty": "Ingen mapper fundet",
-
-  "dialog.server.title": "Servere",
-  "dialog.server.description": "Skift hvilken Kilo-server denne app forbinder til.",
-  "dialog.server.search.placeholder": "Søg servere",
-  "dialog.server.empty": "Ingen servere endnu",
-  "dialog.server.add.title": "Tilføj en server",
-  "dialog.server.add.url": "Server URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Kunne ikke forbinde til server",
-  "dialog.server.add.checking": "Tjekker...",
-  "dialog.server.add.button": "Tilføj server",
-  "dialog.server.default.title": "Standardserver",
-  "dialog.server.default.description":
-    "Forbind til denne server ved start af app i stedet for at starte en lokal server. Kræver genstart.",
-  "dialog.server.default.none": "Ingen server valgt",
-  "dialog.server.default.set": "Sæt nuværende server som standard",
-  "dialog.server.default.clear": "Ryd",
-  "dialog.server.action.remove": "Fjern server",
-
-  "dialog.server.menu.edit": "Rediger",
-  "dialog.server.menu.default": "Sæt som standard",
-  "dialog.server.menu.defaultRemove": "Fjern som standard",
-  "dialog.server.menu.delete": "Slet",
-  "dialog.server.current": "Nuværende server",
-  "dialog.server.status.default": "Standard",
-
-  "dialog.project.edit.title": "Rediger projekt",
-  "dialog.project.edit.name": "Navn",
-  "dialog.project.edit.icon": "Ikon",
-  "dialog.project.edit.icon.alt": "Projektikon",
-  "dialog.project.edit.icon.hint": "Klik eller træk et billede",
-  "dialog.project.edit.icon.recommended": "Anbefalet: 128x128px",
-  "dialog.project.edit.color": "Farve",
-  "dialog.project.edit.color.select": "Vælg farven {{color}}",
-
-  "dialog.project.edit.worktree.startup": "Opstartsscript for arbejdsområde",
-  "dialog.project.edit.worktree.startup.description": "Køres efter oprettelse af et nyt arbejdsområde (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "f.eks. bun install",
-  "context.breakdown.title": "Kontekstfordeling",
-  "context.breakdown.note":
-    'Omtrentlig fordeling af input-tokens. "Andre" inkluderer værktøjsdefinitioner og overhead.',
-  "context.breakdown.system": "System",
-  "context.breakdown.user": "Bruger",
-  "context.breakdown.assistant": "Assistent",
-  "context.breakdown.tool": "Værktøjskald",
-  "context.breakdown.other": "Andre",
-
-  "context.systemPrompt.title": "Systemprompt",
-  "context.rawMessages.title": "Rå beskeder",
-
-  "context.stats.session": "Session",
-  "context.stats.messages": "Beskeder",
-  "context.stats.provider": "Udbyder",
-  "context.stats.model": "Model",
-  "context.stats.limit": "Kontekstgrænse",
-  "context.stats.totalTokens": "Tokens i alt",
-  "context.stats.usage": "Forbrug",
-  "context.stats.inputTokens": "Input-tokens",
-  "context.stats.outputTokens": "Output-tokens",
-  "context.stats.reasoningTokens": "Tænke Tokens",
-  "context.stats.cacheTokens": "Cache Tokens (læs/skriv)",
-  "context.stats.userMessages": "Brugerbeskeder",
-  "context.stats.assistantMessages": "Assistentbeskeder",
-  "context.stats.totalCost": "Samlede omkostninger",
-  "context.stats.sessionCreated": "Session oprettet",
-  "context.stats.lastActivity": "Seneste aktivitet",
-
-  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Forbrug",
-  "context.usage.cost": "Omkostning",
-  "context.usage.clickToView": "Klik for at se kontekst",
-  "context.usage.view": "Se kontekstforbrug",
-
-  "toast.language.title": "Sprog",
-  "toast.language.description": "Skiftede til {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Tema skiftet",
-  "toast.scheme.title": "Farveskema",
-
-  "toast.permissions.autoaccept.on.title": "Accepterer ændringer automatisk",
-  "toast.permissions.autoaccept.on.description": "Redigerings- og skrivetilladelser vil automatisk blive godkendt",
-  "toast.permissions.autoaccept.off.title": "Stoppede automatisk accept af ændringer",
-  "toast.permissions.autoaccept.off.description": "Redigerings- og skrivetilladelser vil kræve godkendelse",
-
-  "toast.workspace.enabled.title": "Arbejdsområder aktiveret",
-  "toast.workspace.enabled.description": "Flere worktrees vises nu i sidepanelet",
-  "toast.workspace.disabled.title": "Arbejdsområder deaktiveret",
-  "toast.workspace.disabled.description": "Kun hoved-worktree vises i sidepanelet",
-
-  "toast.model.none.title": "Ingen model valgt",
-  "toast.model.none.description": "Forbind en udbyder for at opsummere denne session",
-
-  "toast.file.loadFailed.title": "Kunne ikke indlæse fil",
-
-  "toast.file.listFailed.title": "Kunne ikke liste filer",
-  "toast.context.noLineSelection.title": "Ingen linjevalg",
-  "toast.context.noLineSelection.description": "Vælg først et linjeinterval i en filfane.",
-  "toast.session.share.copyFailed.title": "Kunne ikke kopiere URL til udklipsholder",
-  "toast.session.share.success.title": "Session delt",
-  "toast.session.share.success.description": "Delings-URL kopieret til udklipsholder!",
-  "toast.session.share.failed.title": "Kunne ikke dele session",
-  "toast.session.share.failed.description": "Der opstod en fejl under deling af sessionen",
-
-  "toast.session.unshare.success.title": "Deling af session stoppet",
-  "toast.session.unshare.success.description": "Deling af session blev stoppet!",
-  "toast.session.unshare.failed.title": "Kunne ikke stoppe deling af session",
-  "toast.session.unshare.failed.description": "Der opstod en fejl under stop af sessionsdeling",
-
   "toast.session.rename.invalid.title": "Ugyldig sessionstitel",
-  "toast.session.listFailed.title": "Kunne ikke indlæse sessioner for {{project}}",
-
-  "toast.update.title": "Opdatering tilgængelig",
-  "toast.update.description": "En ny version af Kilo ({{version}}) er nu tilgængelig til installation.",
-  "toast.update.action.installRestart": "Installer og genstart",
-  "toast.update.action.notYet": "Ikke endnu",
-
-  "error.page.title": "Noget gik galt",
-  "error.page.description": "Der opstod en fejl under indlæsning af applikationen.",
-  "error.page.details.label": "Fejldetaljer",
-  "error.page.action.restart": "Genstart",
-  "error.page.action.checking": "Tjekker...",
-  "error.page.action.checkUpdates": "Tjek for opdateringer",
-  "error.page.action.updateTo": "Opdater til {{version}}",
-  "error.page.report.prefix": "Rapporter venligst denne fejl til Kilo-teamet",
-  "error.page.report.discord": "på Discord",
-  "error.page.version": "Version: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Rodelement ikke fundet. Har du glemt at tilføje det til din index.html? Eller måske er id-attributten stavet forkert?",
-
-  "error.globalSync.connectFailed": "Kunne ikke forbinde til server. Kører der en server på `{{url}}`?",
 
   "error.startup.title": "Serverforbindelse mislykkedes",
 
@@ -600,30 +263,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Log ind med ChatGPT igen, og send din besked på ny for at fortsætte med at bruge Codex-modeller.",
 
-  "error.chain.unknown": "Ukendt fejl",
-  "error.chain.causedBy": "Forårsaget af:",
-  "error.chain.apiError": "API-fejl",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Kan forsøges igen: {{retryable}}",
-  "error.chain.responseBody": "Svarindhold:\n{{body}}",
-  "error.chain.didYouMean": "Mente du: {{suggestions}}",
-  "error.chain.modelNotFound": "Model ikke fundet: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Tjek dine konfigurations (opencode.json) udbyder/modelnavne",
-  "error.chain.mcpFailed": 'MCP-server "{{name}}" fejlede. Bemærk, Kilo understøtter ikke MCP-godkendelse endnu.',
-  "error.chain.providerAuthFailed": "Udbydergodkendelse mislykkedes ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Kunne ikke initialisere udbyder "{{provider}}". Tjek legitimationsoplysninger og konfiguration.',
-  "error.chain.configJsonInvalid": "Konfigurationsfil på {{path}} er ikke gyldig JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Konfigurationsfil på {{path}} er ikke gyldig JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Mappe "{{dir}}" i {{path}} er ikke gyldig. Omdøb mappen til "{{suggestion}}" eller fjern den. Dette er en almindelig slåfejl.',
-  "error.chain.configFrontmatterError": "Kunne ikke parse frontmatter i {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Konfigurationsfil på {{path}} er ugyldig",
-  "error.chain.configInvalidWithMessage": "Konfigurationsfil på {{path}} er ugyldig: {{message}}",
-
   "notification.permission.title": "Tilladelse påkrævet",
   "notification.permission.titleSubagent": "Tilladelse påkrævet (underagent)",
-  "notification.permission.description": "{{sessionTitle}} i {{projectName}} kræver tilladelse",
   "ui.permission.manageAutoApprove": "Administrer regler for automatisk godkendelse",
   "ui.permission.doomLoop.prompt": "Der blev registreret en mulig løkke for værktøjet {{tool}}. Fortsæt kørslen?",
   "ui.permission.doomLoop.rule": "Fortsæt {{tool}}-kald",
@@ -648,7 +289,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Læs To-do",
   "ui.permission.toolLabel.todoWrite": "Skriv To-do",
   "ui.permission.toolLabel.codeSearch": "Kodesøgning",
-  "ui.permission.toggleWrap": "Skift tekstombrydning",
   "ui.permission.copyCommand": "Kopiér",
   "ui.approval.auto": "Automatisk godkendt",
   "ui.approval.manual": "Godkendt af dig",
@@ -660,47 +300,18 @@ export const dict = {
   "ui.approval.source.yolo": "af automatisk godkendelse (YOLO)",
   "ui.approval.source.session": "af en session-autogodkendelsesregel",
   "ui.approval.source.default": "som standard",
-  "notification.question.title": "Spørgsmål",
-  "notification.question.description": "{{sessionTitle}} i {{projectName}} har et spørgsmål",
-  "notification.action.goToSession": "Gå til session",
 
-  "notification.session.responseReady.title": "Svar klar",
-  "notification.session.error.title": "Sessionsfejl",
-  "notification.session.error.fallbackDescription": "Der opstod en fejl",
-
-  "home.recentProjects": "Seneste projekter",
-  "home.empty.title": "Ingen seneste projekter",
-  "home.empty.description": "Kom i gang ved at åbne et lokalt projekt",
-
-  "session.tab.session": "Session",
   "session.tab.review": "Gennemgang",
-  "session.tab.context": "Kontekst",
-  "session.panel.reviewAndFiles": "Gennemgang og filer",
   "session.review.filesChanged": "{{count}} Filer ændret",
-  "session.review.change.one": "Ændring",
   "session.review.change.other": "Ændringer",
   "session.review.loadingChanges": "Indlæser ændringer...",
-  "session.review.empty": "Ingen ændringer i denne session endnu",
   "session.review.noChanges": "Ingen ændringer",
-  "session.files.selectToOpen": "Vælg en fil at åbne",
-  "session.files.all": "Alle filer",
-  "session.files.binaryContent": "Binær fil (indhold kan ikke vises)",
-  "session.messages.renderEarlier": "Vis tidligere beskeder",
   "session.messages.loadingEarlier": "Indlæser tidligere beskeder...",
   "session.messages.loadEarlier": "Indlæs tidligere beskeder",
   "session.messages.loading": "Indlæser beskeder...",
 
-  "session.messages.jumpToLatest": "Gå til seneste",
-  "session.context.addToContext": "Tilføj {{selection}} til kontekst",
-
-  "session.new.worktree.main": "Hovedgren",
-  "session.new.worktree.mainWithBranch": "Hovedgren ({{branch}})",
-  "session.new.worktree.create": "Opret nyt worktree",
-  "session.new.lastModified": "Sidst ændret",
   "sidebar.session.newSession": "Ny Session",
   "sidebar.session.newSession.tooltip": "Start en frisk samtale, mens den nuværende session holdes intakt.",
-  "sidebar.session.newSession.disabled":
-    "Denne session er allerede ny. Start med at chatte eller opret et worktree i stedet.",
   "sidebar.session.newWorktree": "Nyt Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Opret et isoleret git worktree for at eksperimentere sikkert, holde ændringer adskilt og køre parallelle sessioner uden at forstyrre din nuværende branch.",
@@ -716,131 +327,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Flyt denne samtale og {{files}} ændrede filer til et dedikeret worktree for isoleret opfølgende arbejde.",
   "sidebar.session.showChanges.tooltip.empty": "Åbn ændringsvisningen for at inspicere det nuværende worktree.",
-  "sidebar.session.showChanges.tooltip.one": "1 fil ændret · +{{additions}} -{{deletions}}. Åbn ændringsvisningen.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} filer ændret · +{{additions}} -{{deletions}}. Åbn ændringsvisningen.",
-  "sidebar.session.agentManager.tooltip":
-    "Åbn Agent Manager for et komplet overblik over parallelle sessioner og worktrees, så du kan koordinere langvarige opgaver ét sted.",
-  "sidebar.session.openAgentManager": "Åbn Agent Manager",
   "sidebar.session.progress.capturing": "Fanger ændringer...",
   "sidebar.session.progress.creating": "Opretter worktree...",
   "sidebar.session.progress.setup": "Kører opsætning...",
   "sidebar.session.progress.transferring": "Overfører ændringer...",
   "sidebar.session.progress.forking": "Starter session...",
   "sidebar.session.progress.failed": "Kunne ikke fortsætte i worktree",
-  "session.header.search.placeholder": "Søg {{project}}",
-  "session.header.searchFiles": "Søg efter filer",
-  "session.header.openIn": "Åbn i",
-  "session.header.open.action": "Åbn {{app}}",
-  "session.header.open.ariaLabel": "Åbn i {{app}}",
-  "session.header.open.menu": "Åbn-muligheder",
-  "session.header.open.copyPath": "Kopiér sti",
 
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Serverkonfigurationer",
-  "status.popover.tab.servers": "Servere",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Administrer servere",
-
-  "session.share.popover.title": "Udgiv på nettet",
-  "session.share.popover.description.shared":
-    "Denne session er offentlig på nettet. Den er tilgængelig for alle med linket.",
-  "session.share.popover.description.unshared":
-    "Del session offentligt på nettet. Den vil være tilgængelig for alle med linket.",
-  "session.share.action.share": "Del",
-  "session.share.action.publish": "Udgiv",
-  "session.share.action.publishing": "Udgiver...",
-  "session.share.action.unpublish": "Afpublicer",
-  "session.share.action.unpublishing": "Afpublicerer...",
-  "session.share.action.view": "Vis",
-  "session.share.copy.copied": "Kopieret",
-  "session.share.copy.copyLink": "Kopier link",
-
-  "lsp.tooltip.none": "Ingen LSP-servere",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Indlæser prompt...",
-  "terminal.loading": "Indlæser terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Luk terminal",
-
-  "terminal.connectionLost.title": "Forbindelse mistet",
-  "terminal.connectionLost.description": "Terminalforbindelsen blev afbrudt. Dette kan ske, når serveren genstarter.",
   "common.closeTab": "Luk fane",
   "common.signIn": "Log ind",
-  "common.signOut": "Log ud",
   "common.dismiss": "Afvis",
   "common.requestFailed": "Forespørgsel mislykkedes",
-  "common.moreOptions": "Flere muligheder",
-  "common.learnMore": "Lær mere",
   "common.rename": "Omdøb",
-  "common.reset": "Nulstil",
-  "common.archive": "Arkivér",
   "common.delete": "Slet",
   "common.close": "Luk",
   "common.edit": "Rediger",
   "common.loadMore": "Indlæs flere",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "Skift menu",
-  "sidebar.nav.projectsAndSessions": "Projekter og sessioner",
   "sidebar.settings": "Indstillinger",
-  "sidebar.help": "Hjælp",
-  "sidebar.workspaces.enable": "Aktiver arbejdsområder",
-  "sidebar.workspaces.disable": "Deaktiver arbejdsområder",
-  "sidebar.gettingStarted.title": "Kom i gang",
-  "sidebar.gettingStarted.line1": "Kilo inkluderer gratis modeller så du kan starte med det samme.",
-  "sidebar.gettingStarted.line2": "Forbind enhver udbyder for at bruge modeller, inkl. Claude, GPT, Gemini osv.",
-  "sidebar.project.recentSessions": "Seneste sessioner",
-  "sidebar.project.viewAllSessions": "Vis alle sessioner",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Server",
-  "settings.tab.general": "Generelt",
-  "settings.tab.shortcuts": "Genveje",
-
-  "settings.general.section.appearance": "Udseende",
-  "settings.general.section.notifications": "Systemmeddelelser",
-  "settings.general.section.updates": "Opdateringer",
-  "settings.general.section.sounds": "Lydeffekter",
-
-  "settings.general.row.language.title": "Sprog",
-  "settings.general.row.language.description": "Ændr visningssproget for Kilo",
-  "settings.general.row.appearance.title": "Udseende",
-  "settings.general.row.appearance.description": "Tilpas hvordan Kilo ser ud på din enhed",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Tilpas hvordan Kilo er temabestemt.",
-  "settings.general.row.font.title": "Skrifttype",
-  "settings.general.row.font.description": "Tilpas mono-skrifttypen brugt i kodeblokke",
-
-  "settings.general.row.releaseNotes.title": "Udgivelsesnoter",
-  "settings.general.row.releaseNotes.description": 'Vis "Hvad er nyt"-popups efter opdateringer',
-
-  "settings.updates.row.startup.title": "Tjek for opdateringer ved opstart",
-  "settings.updates.row.startup.description": "Tjek automatisk for opdateringer, når Kilo starter",
-  "settings.updates.row.check.title": "Tjek for opdateringer",
-  "settings.updates.row.check.description": "Tjek manuelt for opdateringer og installer, hvis tilgængelig",
-  "settings.updates.action.checkNow": "Tjek nu",
-  "settings.updates.action.checking": "Tjekker...",
-  "settings.updates.toast.latest.title": "Du er opdateret",
-  "settings.updates.toast.latest.description": "Du kører den nyeste version af Kilo.",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alarm 01",
   "sound.option.alert02": "Alarm 02",
   "sound.option.alert03": "Alarm 03",
@@ -886,37 +391,6 @@ export const dict = {
   "sound.option.yup04": "Ja 04",
   "sound.option.yup05": "Ja 05",
   "sound.option.yup06": "Ja 06",
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Vis systemmeddelelse når agenten er færdig eller kræver opmærksomhed",
-  "settings.general.notifications.permissions.title": "Tilladelser",
-  "settings.general.notifications.permissions.description": "Vis systemmeddelelse når en tilladelse er påkrævet",
-  "settings.general.notifications.errors.title": "Fejl",
-  "settings.general.notifications.errors.description": "Vis systemmeddelelse når der opstår en fejl",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Afspil lyd når agenten er færdig eller kræver opmærksomhed",
-  "settings.general.sounds.permissions.title": "Tilladelser",
-  "settings.general.sounds.permissions.description": "Afspil lyd når en tilladelse er påkrævet",
-  "settings.general.sounds.errors.title": "Fejl",
-  "settings.general.sounds.errors.description": "Afspil lyd når der opstår en fejl",
-
-  "settings.shortcuts.title": "Tastaturgenveje",
-  "settings.shortcuts.reset.button": "Nulstil til standard",
-  "settings.shortcuts.reset.toast.title": "Genveje nulstillet",
-  "settings.shortcuts.reset.toast.description": "Tastaturgenveje er blevet nulstillet til standard.",
-  "settings.shortcuts.conflict.title": "Genvej allerede i brug",
-  "settings.shortcuts.conflict.description": "{{keybind}} er allerede tildelt til {{titles}}.",
-  "settings.shortcuts.unassigned": "Ikke tildelt",
-  "settings.shortcuts.pressKeys": "Tryk på taster",
-  "settings.shortcuts.search.placeholder": "Søg genveje",
-  "settings.shortcuts.search.empty": "Ingen genveje fundet",
-  "settings.shortcuts.group.general": "Generelt",
-  "settings.shortcuts.group.modelAndAgent": "Model og agent",
-  "settings.shortcuts.group.navigation": "Navigation",
-  "settings.shortcuts.group.prompt": "Prompt",
-  "settings.shortcuts.group.session": "Session",
-  "settings.shortcuts.group.terminal": "Terminal",
 
   "prompt.action.indexing": "Indekseringsindstillinger",
 
@@ -931,8 +405,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Aktivér for dette projekt",
   "settings.indexing.projectEnable.description":
     "Aktivér indeksering for dette arbejdsområde, når global indeksering er slået fra.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Global indeksering er aktiveret, så dette projekt er allerede dækket.",
   "settings.indexing.provider.title": "Embedding-udbyder",
   "settings.indexing.provider.description":
     "Vælg udbyderen, der bruges til at generere embeddings til semantisk søgning.",
@@ -965,13 +437,9 @@ export const dict = {
   "settings.indexing.tuning.description": "Avanceret søge- og batchparameter.",
 
   "settings.providers.title": "Udbydere",
-  "settings.providers.description": "Udbyderindstillinger vil kunne konfigureres her.",
-  "settings.providers.betaNotice":
-    "I øjeblikket kan kun Kilo Gateway-udbyderen konfigureres i indstillingsgrænsefladen. Understøttelse af konfiguration af andre udbydere kommer snart i løbet af betaperioden. I mellemtiden kan du konfigurere udbydere via CLI eller konfigurationsfilen. Vi er dedikerede til at holde Kilo åben, ingen lock-in.",
   "settings.providers.section.connected": "Forbundne udbydere",
   "settings.providers.connected.empty": "Ingen forbundne udbydere",
   "settings.providers.section.popular": "Populære udbydere",
-  "settings.providers.search.placeholder": "Søg udbydere",
   "settings.providers.select.placeholder": "Vælg udbyder...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Miljø",
@@ -990,7 +458,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Skjul Kilo Gateway-modeller, hvis udbydere muligvis bruger dine prompts til træning.",
   "settings.providers.modeModels": "Model pr. tilstand",
-  "settings.providers.custom.note": "Tilføj en brugerdefineret udbyder via basis-URL.",
   "settings.providers.modeModels.description":
     "Tilsidesæt standardmodellen for bestemte tilstande. Hvis ikke angivet, bruges den globale standardmodel.",
   "provider.custom.title": "Brugerdefineret udbyder",
@@ -1056,9 +523,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Fjern model",
   "provider.custom.models.add": "Tilføj model",
-  "provider.custom.models.fetch": "Hent modeller",
-  "provider.custom.models.fetching": "Henter\u2026",
-  "provider.custom.models.fetch.error": "Kunne ikke hente modeller: {{error}}",
   "provider.custom.models.fetch.authError": "Godkendelse mislykkedes. Kontrollér API-nøglen ovenfor, og prøv igen.",
   "provider.custom.models.fetch.empty": "Ingen modeller fundet på denne server.",
   "provider.custom.models.fetch.added": "{{count}} model(ler) tilføjet.",
@@ -1110,23 +574,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Forældet .kilocode konfiguration",
   "settings.config.source.projectOpencode": "Forældet .opencode konfiguration",
   "settings.models.title": "Modeller",
-  "settings.models.description": "Modelindstillinger vil kunne konfigureres her.",
-  "settings.agents.title": "Agenter",
-  "settings.agents.description": "Agentindstillinger vil kunne konfigureres her.",
-  "settings.commands.title": "Kommandoer",
-  "settings.commands.description": "Kommandoindstillinger vil kunne konfigureres her.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP-indstillinger vil kunne konfigureres her.",
 
-  "settings.permissions.title": "Tilladelser",
-  "settings.permissions.description": "Styr hvilke værktøjer serveren kan bruge som standard.",
-  "settings.permissions.section.tools": "Værktøjer",
   "settings.permissions.toast.updateFailed.title": "Kunne ikke opdatere tilladelser",
 
-  "settings.permissions.action.allow": "Tillad",
-  "settings.permissions.action.ask": "Spørg",
-  "settings.permissions.action.deny": "Afvis",
-
   "settings.permissions.tool.read.title": "Læs",
   "settings.permissions.tool.read.description": "Læsning af en fil (matcher filstien)",
   "settings.permissions.tool.edit.title": "Rediger",
@@ -1161,7 +611,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "Opdag gentagne værktøjskald med identisk input",
 
-  "session.delete.failed.title": "Kunne ikke slette session",
   "session.delete.title": "Slet session",
   "session.delete.confirm": 'Slet session "{{name}}"?',
   "session.delete.button": "Slet session",
@@ -1191,12 +640,7 @@ export const dict = {
   "workStyle.onboarding.title": "Vælg, hvordan du vil arbejde",
   "workStyle.onboarding.settingsNote": "Du kan til enhver tid ændre disse valg under",
   "workStyle.onboarding.settings": "Indstillinger.",
-  "workStyle.onboarding.description":
-    "Dette angiver startindstillingerne for tilladelser, ræsonneringsblokke, terminaloutput og konteksttidslinjen. Det anvendes kun én gang og springer indstillinger over, som du allerede har tilpasset.",
-  "workStyle.onboarding.skip": "Spring over indtil videre",
   "workStyle.toast.saved.title": "Tilstanden blev gemt",
-  "workStyle.toast.saved.description": "Opdater dine præferencer når som helst under Indstillinger.",
-  "workStyle.toast.saved.action": "Gå til Indstillinger",
   "workStyle.choice.permissions": "Tilladelser",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Synlighed",
@@ -1220,32 +664,6 @@ export const dict = {
   "session.cloud.import.legacy": "Dette ser ud til at være en ældre session, som ikke længere understøttes.",
   "session.cloud.import.failed": "Kunne ikke importere cloud-session",
 
-  "workspace.new": "Nyt arbejdsområde",
-  "workspace.type.local": "lokal",
-  "workspace.type.sandbox": "sandkasse",
-  "workspace.create.failed.title": "Kunne ikke oprette arbejdsområde",
-  "workspace.delete.failed.title": "Kunne ikke slette arbejdsområde",
-  "workspace.resetting.title": "Nulstiller arbejdsområde",
-  "workspace.resetting.description": "Dette kan tage et minut.",
-  "workspace.reset.failed.title": "Kunne ikke nulstille arbejdsområde",
-  "workspace.reset.success.title": "Arbejdsområde nulstillet",
-  "workspace.reset.success.description": "Arbejdsområdet matcher nu hovedgrenen.",
-  "workspace.error.stillPreparing": "Arbejdsområdet er stadig ved at blive klargjort",
-  "workspace.status.checking": "Tjekker for uflettede ændringer...",
-  "workspace.status.error": "Kunne ikke bekræfte git-status.",
-  "workspace.status.clean": "Ingen uflettede ændringer fundet.",
-  "workspace.status.dirty": "Uflettede ændringer fundet i dette arbejdsområde.",
-  "workspace.delete.title": "Slet arbejdsområde",
-  "workspace.delete.confirm": 'Slet arbejdsområde "{{name}}"?',
-  "workspace.delete.button": "Slet arbejdsområde",
-  "workspace.reset.title": "Nulstil arbejdsområde",
-  "workspace.reset.confirm": 'Nulstil arbejdsområde "{{name}}"?',
-  "workspace.reset.button": "Nulstil arbejdsområde",
-  "workspace.reset.archived.none": "Ingen aktive sessioner vil blive arkiveret.",
-  "workspace.reset.archived.one": "1 session vil blive arkiveret.",
-  "workspace.reset.archived.many": "{{count}} sessioner vil blive arkiveret.",
-  "workspace.reset.note": "Dette vil nulstille arbejdsområdet til at matche hovedgrenen.",
-
   "deviceAuth.toast.urlCopied": "URL kopieret til udklipsholder",
   "deviceAuth.toast.codeCopied": "Kode kopieret til udklipsholder",
   "deviceAuth.toast.errorCopied": "Fejl kopieret til udklipsholder",
@@ -1283,7 +701,6 @@ export const dict = {
   "profile.pass.renews": "Fornyes",
   "profile.action.logout": "Log ud",
 
-  "settings.section.configuration": "Konfiguration",
   "settings.agentBehaviour.title": "Agentadfærd",
   "settings.autoApprove.title": "Automatisk godkendelse",
   "settings.browser.title": "Browser",
@@ -1299,7 +716,6 @@ export const dict = {
   "settings.language.title": "Sprog",
   "settings.aboutKiloCode.title": "Om Kilo Code",
 
-  "session.messages.empty": "Start en samtale ved at skrive en besked nedenfor.",
   "session.messages.welcome":
     "Kilo Code er en AI-kodningsassistent. Bed den om at bygge funktioner, rette fejl eller forklare din kodebase.",
   "session.messages.scrollToBottom": "Rul til bunden",
@@ -1307,7 +723,6 @@ export const dict = {
   "session.messages.taskStarting": "Starter...",
   "session.status.writingResponse": "Skriver svar…",
   "session.status.retry": "Prøver igen…",
-  "session.status.retrying": "Prøver igen (forsøg {{ attempt }})… {{ message }}",
   "session.status.working": "Arbejder…",
   "session.status.offline": "Netværk afbrudt — genopretter forbindelse...",
   "session.outcome.incomplete": "Tur afsluttet, {{count}} to-dos tilbage",
@@ -1339,11 +754,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} ældre sessioner",
   "context.stats.thisSession": "Denne session",
 
-  "time.justNow": "lige nu",
-  "time.minutesAgo": "{{count}} min. siden",
-  "time.hoursAgo": "{{count}}t siden",
-  "time.daysAgo": "{{count}}d siden",
-  "time.monthsAgo": "{{count}} mdr. siden",
   "time.today": "I dag",
   "time.yesterday": "I går",
   "time.thisWeek": "Denne uge",
@@ -1359,7 +769,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Versionsinformation",
   "settings.aboutKiloCode.version.label": "Version:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code-udvidelse",
   "settings.aboutKiloCode.community": "Fællesskab og support",
   "settings.aboutKiloCode.feedback.prefix":
     "Hvis du har spørgsmål eller feedback, er du velkommen til at åbne en issue på",
@@ -1409,7 +818,6 @@ export const dict = {
   "settings.language.current": "Nuværende:",
 
   "common.add": "Tilføj",
-  "common.choose": "Vælg…",
 
   "settings.autocomplete.autoTrigger.title": "Aktiver automatisk inline-fuldførelse",
   "settings.autocomplete.autoTrigger.description": "Vis automatisk inline-fuldførelsesforslag under indtastning",
@@ -1419,28 +827,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Vis autofuldførelsesforslag i chatfeltet",
   "settings.autocomplete.modelsHint":
     "For at vælge hvilken model der bruges til autofuldførelse, se Modelindstillinger.",
-  "settings.notifications.agent.title": "Agentafslutning",
-  "settings.notifications.agent.description": "Vis notifikation, når agenten fuldfører en opgave",
-  "settings.notifications.permissions.title": "Tilladelsesanmodninger",
-  "settings.notifications.permissions.description": "Vis notifikation ved tilladelsesanmodninger",
-  "settings.notifications.errors.title": "Fejl",
-  "settings.notifications.errors.description": "Vis notifikation ved fejl",
   "settings.notifications.sounds": "Lyde",
   "settings.notifications.enable.title": "Aktivér lydnotifikationer",
   "settings.notifications.enable.description":
     "Afspil lyde, når sessioner fuldføres, der opstår en fejl, eller der er brug for input fra dig",
   "settings.notifications.testSound": "Test",
-  "settings.notifications.agentSound.title": "Agentafslutningslyd",
-  "settings.notifications.agentSound.description": "Lyd ved agentafslutning",
-  "settings.notifications.permSound.title": "Tilladelsesanmodningslyd",
-  "settings.notifications.permSound.description": "Lyd ved tilladelsesanmodninger",
-  "settings.notifications.errorSound.title": "Fejllyd",
-  "settings.notifications.errorSound.description": "Lyd ved fejl",
   "settings.notifications.sound.default": "Standard",
   "settings.notifications.sound.system": "System",
   "settings.notifications.sound.description":
     "Standardindstillingen bruger forskellige lyde til afslutning, input og fejl. Andre valg bruger én lyd til alle hændelser.",
-  "settings.notifications.sound.none": "Ingen",
   "settings.experimental.share.title": "Delingstilstand",
   "settings.experimental.share.description": "Adfærd for sessionsdeling",
   "settings.experimental.share.manual": "Manuel",
@@ -1460,9 +855,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Billedgenereringsmodel",
   "settings.experimental.imageGenerationModel.placeholder": "Standard (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Tale til tekst",
-  "settings.experimental.speechToText.description":
-    "Aktivér stemmeinput i prompt-felter ved hjælp af din Kilo-konto gennem Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Aktivér og log ind på Kilo-udbyderen for at bruge Speech to Text. Speech to Text understøttes i øjeblikket kun med Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Model til tale til tekst",
@@ -1503,15 +895,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Standardagent",
   "settings.agentBehaviour.defaultAgent.description": "Agent til brug, når ingen er angivet",
   "settings.agentBehaviour.availableAgents": "Tilgængelige agenter",
-  "settings.agentBehaviour.selectAgent": "Vælg en agent at konfigurere…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Vælg en agent at konfigurere…",
   "settings.agentBehaviour.modelOverride.title": "Modeloverstyring",
   "settings.agentBehaviour.modelOverride.description": "Tilsidesæt standardmodellen for denne agent",
   "settings.agentBehaviour.variantOverride.title": "Variantoverstyring",
   "settings.agentBehaviour.variantOverride.description": "Tilsidesæt modelvarianten for denne agent",
-  "settings.agentBehaviour.prompt.title": "Brugerdefineret prompt",
-  "settings.agentBehaviour.prompt.description": "Yderligere systemprompt for denne agent",
   "settings.agentBehaviour.temperature.title": "Temperatur",
   "settings.agentBehaviour.temperature.description":
     "Styrer, hvor tilfældige AI-svarene er (0–2). Lavere værdier (f.eks. 0.2) giver fokuserede og ensartede resultater. Højere værdier (f.eks. 1.0) giver mere varierede og kreative svar. Lad feltet være tomt for at bruge modellens standardværdi.",
@@ -1531,7 +918,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Opdagede skills",
   "settings.agentBehaviour.noSkillsFound":
     "Ingen skills fundet. Tilføj skill-mappestier eller URL'er nedenfor for at gøre skills tilgængelige.",
-  "settings.agentBehaviour.availableModes": "Tilgængelige brugerdefinerede tilstande",
   "settings.agentBehaviour.noAgentsFound": "Ingen agenter fundet.",
   "settings.agentBehaviour.createMode": "Opret ny tilstand",
   "settings.agentBehaviour.createMode.name": "Navn",
@@ -1612,11 +998,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Kommando",
   "settings.agentBehaviour.mcpDetail.args": "Argumenter",
   "settings.agentBehaviour.mcpDetail.env": "Miljø",
-  "settings.agentBehaviour.mcpDetail.disabled": "Denne server er deaktiveret.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Gennemse Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Ingen MCP-servere konfigureret. Tilføj MCP-servere i kilo.jsonc, eller bed agenten om at tilføje dem.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Workflows administreres via workflow-filer i dit arbejdsområde.",
   "settings.agentBehaviour.workflows.description":
     "Workflows er brugerdefinerede slash-kommandoer defineret i din konfiguration. Skriv /command-name i chatten for at aktivere dem. Kommandoer konfigureres i opencode.json under sektionen 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1707,7 +1091,6 @@ export const dict = {
     "f.eks. Generer commit messages på spansk efter conventional commits formatet. Returner KUN commit message.",
 
   "settings.commitMessage.language.sync": "Synkroniser med UI sprog",
-  "settings.commitMessage.language.title": "Sprog",
   "settings.commitMessage.language.description":
     "Vælg hvilket sprog der skal bruges til AI-genererede commit-meddelelser:",
 
@@ -1747,8 +1130,6 @@ export const dict = {
   "settings.providers.disabled": "Deaktiverede udbydere",
   "settings.providers.disabled.description": "Udbydere at skjule fra listen",
   "settings.providers.disabled.enable": "Aktiver",
-  "settings.providers.enabled": "Aktiverede udbydere (hvidliste)",
-  "settings.providers.enabled.description": "Hvis angivet, er kun disse udbydere tilgængelige",
   "settings.providers.notSet": "Ikke angivet (brug serverstandard)",
   "dialog.model.notSet": "Ikke angivet",
   "profile.personalAccount": "Personlig konto",
@@ -1790,9 +1171,7 @@ export const dict = {
   "migration.migrate.subtitle":
     "Vi har fundet indstillinger fra din tidligere installation. Her er, hvad vi kan overføre.",
   "migration.migrate.selectLabel": "Vælg hvad der skal migreres",
-  "migration.migrate.cannotMigrate": "Kan ikke migreres",
   "migration.migrate.chatHistory": "Chatsessioner og historik",
-  "migration.migrate.chatHistoryDesc": "Ikke kompatibel med den nye arkitektur",
   "migration.migrate.button": "Migrer indstillinger",
   "migration.migrate.skip": "Spring over",
   "migration.migrate.keysDetected": "{{count}} nøgler fundet",
@@ -1816,10 +1195,7 @@ export const dict = {
     "Dette fjerner de gamle indstillinger fra VS Code-lageret. Du vil ikke kunne køre denne migrering igen.",
   "migration.complete.done": "Færdig",
   "migration.migrate.sessionsDetected": "{{count}} sessioner fundet",
-  "migration.error.sessionFailed": "Sessionsmigrering mislykkedes",
   "migration.error.continue": "Fortsæt",
-  "migration.error.action.copy": "Kopiér",
-  "migration.error.toast.copied": "Fejl kopieret til udklipsholder",
 
   "migration.sessionSummary.title": "Opsummering:",
   "migration.sessionSummary.copy": "Kopiér rapport",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index ff62c098e7d..811b9ee0fdb 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -59,85 +59,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Vorgeschlagen",
-  "command.category.view": "Ansicht",
-  "command.category.project": "Projekt",
-  "command.category.provider": "Anbieter",
-  "command.category.server": "Server",
-  "command.category.session": "Sitzung",
-  "command.category.theme": "Thema",
-  "command.category.language": "Sprache",
-  "command.category.file": "Datei",
-  "command.category.context": "Kontext",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Modell",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Berechtigungen",
-  "command.category.workspace": "Arbeitsbereich",
 
-  "command.category.settings": "Einstellungen",
-  "theme.scheme.system": "System",
-  "theme.scheme.light": "Hell",
-  "theme.scheme.dark": "Dunkel",
-
-  "command.sidebar.toggle": "Seitenleiste umschalten",
-  "command.project.open": "Projekt öffnen",
   "command.provider.connect": "Anbieter verbinden",
-  "command.server.switch": "Server wechseln",
-  "command.settings.open": "Einstellungen öffnen",
-  "command.session.previous": "Vorherige Sitzung",
-  "command.session.next": "Nächste Sitzung",
-  "command.session.previous.unseen": "Vorherige ungelesene Sitzung",
-  "command.session.next.unseen": "Nächste ungelesene Sitzung",
-  "command.session.archive": "Sitzung archivieren",
-
-  "command.palette": "Befehlspalette",
-
-  "command.theme.cycle": "Thema wechseln",
-  "command.theme.set": "Thema verwenden: {{theme}}",
-  "command.theme.scheme.cycle": "Farbschema wechseln",
-  "command.theme.scheme.set": "Farbschema verwenden: {{scheme}}",
-
-  "command.language.cycle": "Sprache wechseln",
-  "command.language.set": "Sprache verwenden: {{language}}",
 
   "command.session.new": "Neue Sitzung",
-  "command.session.new.task": "Neue Aufgabe",
   "command.session.show.changes": "Änderungen anzeigen",
-  "command.file.open": "Datei öffnen",
-  "command.tab.close": "Tab schließen",
-  "command.context.addSelection": "Auswahl zum Kontext hinzufügen",
-  "command.context.addSelection.description": "Ausgewählte Zeilen aus der aktuellen Datei hinzufügen",
-  "command.terminal.toggle": "Terminal umschalten",
-  "command.fileTree.toggle": "Dateibaum umschalten",
   "command.review.toggle": "Überprüfung umschalten",
-  "command.terminal.new": "Neues Terminal",
-  "command.terminal.new.description": "Neuen Terminal-Tab erstellen",
-  "command.steps.toggle": "Schritte umschalten",
-  "command.steps.toggle.description": "Schritte für die aktuelle Nachricht anzeigen oder ausblenden",
-  "command.message.previous": "Vorherige Nachricht",
-  "command.message.previous.description": "Zur vorherigen Benutzernachricht gehen",
-  "command.message.next": "Nächste Nachricht",
-  "command.message.next.description": "Zur nächsten Benutzernachricht gehen",
-  "command.model.choose": "Modell wählen",
-  "command.model.choose.description": "Ein anderes Modell auswählen",
-  "command.mcp.toggle": "MCPs umschalten",
-  "command.mcp.toggle.description": "MCPs umschalten",
-  "command.agent.cycle": "Agent wechseln",
-  "command.agent.cycle.description": "Zum nächsten Agenten wechseln",
-  "command.agent.cycle.reverse": "Agent rückwärts wechseln",
-  "command.agent.cycle.reverse.description": "Zum vorherigen Agenten wechseln",
-  "command.model.variant.cycle": "Denkaufwand wechseln",
-  "command.model.variant.cycle.description": "Zum nächsten Aufwandslevel wechseln",
-  "command.permissions.autoaccept.enable": "Änderungen automatisch akzeptieren",
-  "command.permissions.autoaccept.disable": "Automatische Annahme von Änderungen stoppen",
-  "command.workspace.toggle": "Arbeitsbereiche umschalten",
-  "command.workspace.toggle.description": "Mehrere Arbeitsbereiche in der Seitenleiste aktivieren oder deaktivieren",
-  "command.session.undo": "Rückgängig",
-  "command.session.undo.description": "Letzte Nachricht rückgängig machen",
-  "command.session.redo": "Wiederherstellen",
-  "command.session.redo.description": "Letzte rückgängig gemachte Nachricht wiederherstellen",
   "revert.banner.count_one": "{{count}} Nachricht zurückgesetzt",
   "revert.banner.count_other": "{{count}} Nachrichten zurückgesetzt",
   "revert.banner.redo": "Wiederholen",
@@ -152,13 +79,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Snapshots aktivieren",
   "revert.disabled.agentBusy": "Warten bis der Agent fertig ist",
   "command.session.compact": "Sitzung komprimieren",
-  "command.session.compact.description": "Sitzung zusammenfassen, um die Kontextgröße zu reduzieren",
-  "command.session.fork": "Von Nachricht abzweigen",
-  "command.session.fork.description": "Neue Sitzung aus einer früheren Nachricht erstellen",
-  "command.session.share": "Sitzung teilen",
-  "command.session.share.description": "Diese Sitzung teilen und URL in die Zwischenablage kopieren",
-  "command.session.unshare": "Teilen der Sitzung aufheben",
-  "command.session.unshare.description": "Teilen dieser Sitzung beenden",
   "command.session.export": "Sitzungsprotokoll exportieren",
 
   "agentRequirements.skill.installed": "Installiert",
@@ -186,11 +106,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Diese Prüfung der Agentenanforderungen ist nicht mehr aktiv.",
   "agentRequirements.error.requestFailed": "Kilo konnte die Agentenanforderungen nicht prüfen.",
 
-  "palette.search.placeholder": "Dateien, Befehle und Sitzungen durchsuchen",
-  "palette.empty": "Keine Ergebnisse gefunden",
-  "palette.group.commands": "Befehle",
-  "palette.group.files": "Dateien",
-
   "dialog.provider.search.placeholder": "Anbieter durchsuchen",
   "dialog.provider.empty": "Keine Anbieter gefunden",
   "dialog.provider.group.other": "Andere",
@@ -199,19 +114,13 @@ export const dict = {
   "dialog.model.select.title": "Modell auswählen",
   "dialog.model.search.placeholder": "Modelle durchsuchen",
   "dialog.model.empty": "Keine Modellergebnisse",
-  "dialog.model.manage": "Modelle verwalten",
-  "dialog.model.manage.description": "Anpassen, welche Modelle in der Modellauswahl erscheinen.",
   "dialog.model.select": "Auswählen",
   "dialog.model.expand": "Erweitern",
   "dialog.model.collapse": "Einklappen",
 
-  "dialog.model.unpaid.freeModels.title": "Kostenlose Modelle von Kilo",
-  "dialog.model.unpaid.addMore.title": "Weitere Modelle von beliebten Anbietern hinzufügen",
-
   "dialog.provider.viewAll": "Mehr Anbieter anzeigen",
 
   "provider.connect.title": "{{provider}} verbinden",
-  "provider.connect.title.anthropicProMax": "Mit Claude Pro/Max anmelden",
   "provider.connect.selectMethod": "Anmeldemethode für {{provider}} auswählen.",
   "provider.connect.method.apiKey": "API-Schlüssel",
   "provider.connect.status.inProgress": "Autorisierung läuft...",
@@ -238,13 +147,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "z. B. my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI-Endpunkt-URL",
   "provider.connect.azure.baseURL.placeholder": "z. B. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen bietet Ihnen Zugriff auf eine kuratierte Auswahl zuverlässiger, optimierter Modelle für Coding-Agenten.",
-  "provider.connect.opencodeZen.line2":
-    "Mit einem einzigen API-Schlüssel erhalten Sie Zugriff auf Modelle wie Claude, GPT, Gemini, GLM und mehr.",
-  "provider.connect.opencodeZen.visit.prefix": "Besuchen Sie ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": ", um Ihren API-Schlüssel zu erhalten.",
   "provider.connect.oauth.code.visit.prefix": "Besuchen Sie ",
   "provider.connect.oauth.code.visit.link": "diesen Link",
   "provider.connect.oauth.code.visit.suffix":
@@ -252,7 +154,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} Autorisierungscode",
   "provider.connect.oauth.code.placeholder": "Autorisierungscode",
   "provider.connect.oauth.code.required": "Autorisierungscode ist erforderlich",
-  "provider.connect.oauth.code.invalid": "Ungültiger Autorisierungscode",
   "provider.connect.oauth.auto.visit.prefix": "Besuchen Sie ",
   "provider.connect.oauth.auto.visit.link": "diesen Link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -265,29 +166,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Die {{provider}}-Modelle sind nicht mehr verfügbar.",
   "model.tag.free": "Kostenlos",
   "model.tag.dataCollected": "Daten können für das Training verwendet werden",
-  "model.tag.latest": "Neueste",
   "model.group.auto": "Automatische Modelle",
   "model.group.recommended": "Empfohlen",
   "model.group.favorites": "Favoriten",
-  "model.group.collapse": "{{group}} einklappen",
-  "model.group.expand": "{{group}} ausklappen",
   "model.favorite.add": "Zu Favoriten hinzufügen",
   "model.favorite.remove": "Aus Favoriten entfernen",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "Text",
-  "model.input.image": "Bild",
-  "model.input.audio": "Audio",
-  "model.input.video": "Video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Erlaubt: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Erlaubt Reasoning",
-  "model.tooltip.reasoning.none": "Kein Reasoning",
-  "model.tooltip.context": "Kontextlimit {{limit}}",
   "model.preview.label.released": "Veröffentlicht",
   "model.preview.label.input": "Eingabe",
   "model.preview.label.output": "Ausgabe",
@@ -307,11 +191,8 @@ export const dict = {
   "model.preview.modality.audio": "Audio",
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "Suchen",
   "common.goBack": "Zurück",
-  "common.goForward": "Vorwärts",
   "common.loading": "Laden",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Abbrechen",
   "common.connect": "Verbinden",
   "common.disconnect": "Trennen",
@@ -319,54 +200,8 @@ export const dict = {
   "common.save": "Speichern",
   "common.saving": "Speichert...",
   "common.default": "Standard",
-  "common.attachment": "Anhang",
 
-  "prompt.placeholder.shell": "Shell-Befehl eingeben...",
-  "prompt.placeholder.normal": 'Fragen Sie alles... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Kommentare zusammenfassen…",
-  "prompt.placeholder.summarizeComment": "Kommentar zusammenfassen…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc zum Verlassen",
-
-  "prompt.example.1": "Ein TODO in der Codebasis beheben",
-  "prompt.example.2": "Was ist der Tech-Stack dieses Projekts?",
-  "prompt.example.3": "Fehlerhafte Tests beheben",
-  "prompt.example.4": "Erkläre, wie die Authentifizierung funktioniert",
-  "prompt.example.5": "Sicherheitslücken finden und beheben",
-  "prompt.example.6": "Unit-Tests für den Benutzerdienst hinzufügen",
-  "prompt.example.7": "Diese Funktion lesbarer gestalten",
-  "prompt.example.8": "Was bedeutet dieser Fehler?",
-  "prompt.example.9": "Hilf mir, dieses Problem zu debuggen",
-  "prompt.example.10": "API-Dokumentation generieren",
-  "prompt.example.11": "Datenbankabfragen optimieren",
-  "prompt.example.12": "Eingabevalidierung hinzufügen",
-  "prompt.example.13": "Neue Komponente erstellen für...",
-  "prompt.example.14": "Wie deploye ich dieses Projekt?",
-  "prompt.example.15": "Meinen Code auf Best Practices überprüfen",
-  "prompt.example.16": "Fehlerbehandlung zu dieser Funktion hinzufügen",
-  "prompt.example.17": "Erkläre dieses Regex-Muster",
-  "prompt.example.18": "Dies in TypeScript konvertieren",
-  "prompt.example.19": "Logging in der gesamten Codebasis hinzufügen",
-  "prompt.example.20": "Welche Abhängigkeiten sind veraltet?",
-  "prompt.example.21": "Hilf mir, ein Migrationsskript zu schreiben",
-  "prompt.example.22": "Caching für diesen Endpunkt implementieren",
-  "prompt.example.23": "Paginierung zu dieser Liste hinzufügen",
-  "prompt.example.24": "CLI-Befehl erstellen für...",
-  "prompt.example.25": "Wie funktionieren Umgebungsvariablen hier?",
-
-  "prompt.popover.emptyResults": "Keine passenden Ergebnisse",
-  "prompt.popover.emptyCommands": "Keine passenden Befehle",
-  "prompt.dropzone.label": "Bilder oder PDFs hier ablegen",
-  "prompt.slash.badge.custom": "benutzerdefiniert",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "aktiv",
-  "prompt.context.includeActiveFile": "Aktive Datei einbeziehen",
-  "prompt.context.removeActiveFile": "Aktive Datei aus dem Kontext entfernen",
-  "prompt.context.removeFile": "Datei aus dem Kontext entfernen",
   "prompt.thinking.tooltip": "Reasoning-Aufwand",
-  "prompt.action.attachFile": "Datei anhängen",
-  "prompt.attachment.remove": "Anhang entfernen",
   "prompt.action.send": "Senden",
   "prompt.action.send.blocked": "Beantworten oder verwerfen Sie zuerst die ausstehende Frage",
   "prompt.action.send.recording": "Transkribieren und senden",
@@ -409,190 +244,17 @@ export const dict = {
   "speechToText.tooltip.error": "Spracheingabe fehlgeschlagen. Zum Löschen klicken.",
   "speechToText.error.title": "Spracheingabe fehlgeschlagen",
   "speechToText.error.loginRequired": "Melden Sie sich bei Kilo an, um die Spracheingabe zu verwenden.",
-  "speechToText.error.permission": "Mikrofonberechtigung wurde verweigert.",
-  "speechToText.error.microphone": "Mikrofon konnte nicht gestartet werden.",
-  "speechToText.error.recording": "Aufnahme fehlgeschlagen.",
-  "speechToText.error.emptyRecording": "Es wurde kein Audio aufgenommen.",
   "speechToText.error.emptyTranscript": "Es wurde keine Sprache erkannt.",
-  "speechToText.error.encoding": "Aufnahme konnte nicht codiert werden.",
-  "speechToText.toast.transcribed": "Transkription eingefügt",
 
-  "prompt.toast.pasteUnsupported.title": "Nicht unterstütztes Einfügen",
-  "prompt.toast.pasteUnsupported.description": "Hier können nur Bilder oder PDFs eingefügt werden.",
-  "prompt.toast.modelAgentRequired.title": "Wählen Sie einen Agenten und ein Modell",
-  "prompt.toast.modelAgentRequired.description":
-    "Wählen Sie einen Agenten und ein Modell, bevor Sie eine Eingabe senden.",
-  "prompt.toast.worktreeCreateFailed.title": "Worktree konnte nicht erstellt werden",
-  "prompt.toast.sessionCreateFailed.title": "Sitzung konnte nicht erstellt werden",
-  "prompt.toast.shellSendFailed.title": "Shell-Befehl konnte nicht gesendet werden",
-  "prompt.toast.commandSendFailed.title": "Befehl konnte nicht gesendet werden",
   "prompt.toast.promptSendFailed.title": "Eingabe konnte nicht gesendet werden",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} von {{total}} aktiviert",
-  "dialog.mcp.empty": "Keine MCPs konfiguriert",
-
-  "dialog.lsp.empty": "LSPs automatisch nach Dateityp erkannt",
-  "dialog.plugins.empty": "In opencode.json konfigurierte Plugins",
-
   "mcp.status.connected": "verbunden",
   "mcp.status.failed": "fehlgeschlagen",
   "mcp.status.needs_auth": "benötigt Authentifizierung",
   "mcp.status.needs_registration": "Client-Registrierung erforderlich",
   "mcp.status.disabled": "deaktiviert",
 
-  "dialog.fork.empty": "Keine Nachrichten zum Abzweigen vorhanden",
-
-  "dialog.directory.search.placeholder": "Ordner durchsuchen",
-  "dialog.directory.empty": "Keine Ordner gefunden",
-
-  "dialog.server.title": "Server",
-  "dialog.server.description": "Wechseln Sie den Kilo-Server, mit dem sich diese App verbindet.",
-  "dialog.server.search.placeholder": "Server durchsuchen",
-  "dialog.server.empty": "Noch keine Server",
-  "dialog.server.add.title": "Server hinzufügen",
-  "dialog.server.add.url": "Server-URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Verbindung zum Server fehlgeschlagen",
-  "dialog.server.add.checking": "Prüfen...",
-  "dialog.server.add.button": "Server hinzufügen",
-  "dialog.server.default.title": "Standardserver",
-  "dialog.server.default.description":
-    "Beim App-Start mit diesem Server verbinden, anstatt einen lokalen Server zu starten. Erfordert Neustart.",
-  "dialog.server.default.none": "Kein Server ausgewählt",
-  "dialog.server.default.set": "Aktuellen Server als Standard setzen",
-  "dialog.server.default.clear": "Löschen",
-  "dialog.server.action.remove": "Server entfernen",
-
-  "dialog.server.menu.edit": "Bearbeiten",
-  "dialog.server.menu.default": "Als Standard festlegen",
-  "dialog.server.menu.defaultRemove": "Standard entfernen",
-  "dialog.server.menu.delete": "Löschen",
-  "dialog.server.current": "Aktueller Server",
-  "dialog.server.status.default": "Standard",
-
-  "dialog.project.edit.title": "Projekt bearbeiten",
-  "dialog.project.edit.name": "Name",
-  "dialog.project.edit.icon": "Symbol",
-  "dialog.project.edit.icon.alt": "Projekt-Icon",
-  "dialog.project.edit.icon.hint": "Klicken oder Bild ziehen",
-  "dialog.project.edit.icon.recommended": "Empfohlen: 128x128px",
-  "dialog.project.edit.color": "Farbe",
-  "dialog.project.edit.color.select": "{{color}}-Farbe auswählen",
-
-  "dialog.project.edit.worktree.startup": "Startup-Skript für Arbeitsbereich",
-  "dialog.project.edit.worktree.startup.description":
-    "Wird nach dem Erstellen eines neuen Arbeitsbereichs (Worktree) ausgeführt.",
-  "dialog.project.edit.worktree.startup.placeholder": "z. B. bun install",
-  "context.breakdown.title": "Kontext-Aufschlüsselung",
-  "context.breakdown.note":
-    'Ungefähre Aufschlüsselung der Eingabe-Token. "Andere" beinhaltet Werkzeugdefinitionen und Overhead.',
-  "context.breakdown.system": "System",
-  "context.breakdown.user": "Benutzer",
-  "context.breakdown.assistant": "Assistent",
-  "context.breakdown.tool": "Werkzeugaufrufe",
-  "context.breakdown.other": "Andere",
-
-  "context.systemPrompt.title": "System-Prompt",
-  "context.rawMessages.title": "Rohdaten der Nachrichten",
-
-  "context.stats.session": "Sitzung",
-  "context.stats.messages": "Nachrichten",
-  "context.stats.provider": "Anbieter",
-  "context.stats.model": "Modell",
-  "context.stats.limit": "Kontextlimit",
-  "context.stats.totalTokens": "Gesamt-Token",
-  "context.stats.usage": "Nutzung",
-  "context.stats.inputTokens": "Eingabe-Token",
-  "context.stats.outputTokens": "Ausgabe-Token",
-  "context.stats.reasoningTokens": "Reasoning-Token",
-  "context.stats.cacheTokens": "Cache-Token (lesen/schreiben)",
-  "context.stats.userMessages": "Benutzernachrichten",
-  "context.stats.assistantMessages": "Assistentennachrichten",
-  "context.stats.totalCost": "Gesamtkosten",
-  "context.stats.sessionCreated": "Sitzung erstellt",
-  "context.stats.lastActivity": "Letzte Aktivität",
-
-  "context.usage.tokens": "Token",
-  "context.usage.usage": "Nutzung",
-  "context.usage.cost": "Kosten",
-  "context.usage.clickToView": "Klicken, um Kontext anzuzeigen",
-  "context.usage.view": "Kontextnutzung anzeigen",
-
-  "toast.language.title": "Sprache",
-  "toast.language.description": "Zu {{language}} gewechselt",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Thema gewechselt",
-  "toast.scheme.title": "Farbschema",
-  "toast.workspace.enabled.title": "Arbeitsbereiche aktiviert",
-  "toast.workspace.enabled.description": "Mehrere Worktrees werden jetzt in der Seitenleiste angezeigt",
-  "toast.workspace.disabled.title": "Arbeitsbereiche deaktiviert",
-  "toast.workspace.disabled.description": "Nur der Haupt-Worktree wird in der Seitenleiste angezeigt",
-
-  "toast.permissions.autoaccept.on.title": "Änderungen werden automatisch akzeptiert",
-  "toast.permissions.autoaccept.on.description": "Bearbeitungs- und Schreibrechte werden automatisch genehmigt",
-  "toast.permissions.autoaccept.off.title": "Automatische Annahme von Änderungen gestoppt",
-  "toast.permissions.autoaccept.off.description": "Bearbeitungs- und Schreibrechte erfordern Genehmigung",
-
-  "toast.model.none.title": "Kein Modell ausgewählt",
-  "toast.model.none.description": "Verbinden Sie einen Anbieter, um diese Sitzung zusammenzufassen",
-
-  "toast.file.loadFailed.title": "Datei konnte nicht geladen werden",
-
-  "toast.file.listFailed.title": "Dateien konnten nicht aufgelistet werden",
-  "toast.context.noLineSelection.title": "Keine Zeilenauswahl",
-  "toast.context.noLineSelection.description": "Wählen Sie zuerst einen Zeilenbereich in einem Datei-Tab aus.",
-  "toast.session.share.copyFailed.title": "URL konnte nicht in die Zwischenablage kopiert werden",
-  "toast.session.share.success.title": "Sitzung geteilt",
-  "toast.session.share.success.description": "Teilen-URL in die Zwischenablage kopiert!",
-  "toast.session.share.failed.title": "Sitzung konnte nicht geteilt werden",
-  "toast.session.share.failed.description": "Beim Teilen der Sitzung ist ein Fehler aufgetreten",
-
-  "toast.session.unshare.success.title": "Teilen der Sitzung aufgehoben",
-  "toast.session.unshare.success.description": "Teilen der Sitzung erfolgreich aufgehoben!",
-  "toast.session.unshare.failed.title": "Aufheben des Teilens fehlgeschlagen",
-  "toast.session.unshare.failed.description": "Beim Aufheben des Teilens ist ein Fehler aufgetreten",
-
   "toast.session.rename.invalid.title": "Ungültiger Sitzungstitel",
-  "toast.session.listFailed.title": "Sitzungen für {{project}} konnten nicht geladen werden",
-
-  "toast.update.title": "Update verfügbar",
-  "toast.update.description": "Eine neue Version von Kilo ({{version}}) ist zur Installation verfügbar.",
-  "toast.update.action.installRestart": "Installieren und neu starten",
-  "toast.update.action.notYet": "Noch nicht",
-
-  "error.page.title": "Etwas ist schiefgelaufen",
-  "error.page.description": "Beim Laden der Anwendung ist ein Fehler aufgetreten.",
-  "error.page.details.label": "Fehlerdetails",
-  "error.page.action.restart": "Neustart",
-  "error.page.action.checking": "Prüfen...",
-  "error.page.action.checkUpdates": "Nach Updates suchen",
-  "error.page.action.updateTo": "Auf {{version}} aktualisieren",
-  "error.page.report.prefix": "Bitte melden Sie diesen Fehler dem Kilo-Team",
-  "error.page.report.discord": "auf Discord",
-  "error.page.version": "Version: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Wurzelelement nicht gefunden. Haben Sie vergessen, es in Ihre index.html aufzunehmen? Oder wurde das id-Attribut falsch geschrieben?",
-
-  "error.globalSync.connectFailed": "Verbindung zum Server fehlgeschlagen. Läuft ein Server unter `{{url}}`?",
 
   "error.startup.title": "Serververbindung fehlgeschlagen",
 
@@ -610,32 +272,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Melden Sie sich erneut bei ChatGPT an und senden Sie Ihre Nachricht noch einmal, um weiterhin Codex-Modelle zu verwenden.",
 
-  "error.chain.unknown": "Unbekannter Fehler",
-  "error.chain.causedBy": "Verursacht durch:",
-  "error.chain.apiError": "API-Fehler",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Wiederholbar: {{retryable}}",
-  "error.chain.responseBody": "Antwort-Body:\n{{body}}",
-  "error.chain.didYouMean": "Meinten Sie: {{suggestions}}",
-  "error.chain.modelNotFound": "Modell nicht gefunden: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Überprüfen Sie Ihre Konfiguration (opencode.json) auf Anbieter-/Modellnamen",
-  "error.chain.mcpFailed":
-    'MCP-Server "{{name}}" fehlgeschlagen. Hinweis: Kilo unterstützt noch keine MCP-Authentifizierung.',
-  "error.chain.providerAuthFailed": "Anbieter-Authentifizierung fehlgeschlagen ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Anbieter "{{provider}}" konnte nicht initialisiert werden. Überprüfen Sie Anmeldeinformationen und Konfiguration.',
-  "error.chain.configJsonInvalid": "Konfigurationsdatei unter {{path}} ist kein gültiges JSON(C)",
-  "error.chain.configJsonInvalidWithMessage":
-    "Konfigurationsdatei unter {{path}} ist kein gültiges JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Verzeichnis "{{dir}}" in {{path}} ist ungültig. Benennen Sie das Verzeichnis in "{{suggestion}}" um oder entfernen Sie es. Dies ist ein häufiger Tippfehler.',
-  "error.chain.configFrontmatterError": "Frontmatter in {{path}} konnte nicht geparst werden:\n{{message}}",
-  "error.chain.configInvalid": "Konfigurationsdatei unter {{path}} ist ungültig",
-  "error.chain.configInvalidWithMessage": "Konfigurationsdatei unter {{path}} ist ungültig: {{message}}",
-
   "notification.permission.title": "Berechtigung erforderlich",
   "notification.permission.titleSubagent": "Berechtigung erforderlich (Subagent)",
-  "notification.permission.description": "{{sessionTitle}} in {{projectName}} benötigt Berechtigung",
   "ui.permission.manageAutoApprove": "Regeln für automatische Genehmigung verwalten",
   "ui.permission.doomLoop.prompt": "Potenzielle Schleife beim Tool {{tool}} erkannt. Weiter ausführen?",
   "ui.permission.doomLoop.rule": "{{tool}}-Aufrufe fortsetzen",
@@ -660,7 +298,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Todo lesen",
   "ui.permission.toolLabel.todoWrite": "Todo schreiben",
   "ui.permission.toolLabel.codeSearch": "Code-Suche",
-  "ui.permission.toggleWrap": "Zeilenumbruch umschalten",
   "ui.permission.copyCommand": "Kopieren",
   "ui.approval.auto": "Automatisch genehmigt",
   "ui.approval.manual": "Von dir genehmigt",
@@ -672,47 +309,18 @@ export const dict = {
   "ui.approval.source.yolo": "durch den Auto-Genehmigungsmodus (YOLO)",
   "ui.approval.source.session": "durch eine Sitzungs-Auto-Genehmigungsregel",
   "ui.approval.source.default": "standardmäßig",
-  "notification.question.title": "Frage",
-  "notification.question.description": "{{sessionTitle}} in {{projectName}} hat eine Frage",
-  "notification.action.goToSession": "Zur Sitzung gehen",
 
-  "notification.session.responseReady.title": "Antwort bereit",
-  "notification.session.error.title": "Sitzungsfehler",
-  "notification.session.error.fallbackDescription": "Ein Fehler ist aufgetreten",
-
-  "home.recentProjects": "Letzte Projekte",
-  "home.empty.title": "Keine letzten Projekte",
-  "home.empty.description": "Starten Sie, indem Sie ein lokales Projekt öffnen",
-
-  "session.tab.session": "Sitzung",
   "session.tab.review": "Überprüfung",
-  "session.tab.context": "Kontext",
-  "session.panel.reviewAndFiles": "Überprüfung und Dateien",
   "session.review.filesChanged": "{{count}} Dateien geändert",
-  "session.review.change.one": "Änderung",
   "session.review.change.other": "Änderungen",
   "session.review.loadingChanges": "Lade Änderungen...",
-  "session.review.empty": "Noch keine Änderungen in dieser Sitzung",
   "session.review.noChanges": "Keine Änderungen",
-  "session.files.selectToOpen": "Datei zum Öffnen auswählen",
-  "session.files.all": "Alle Dateien",
-  "session.files.binaryContent": "Binärdatei (Inhalt kann nicht angezeigt werden)",
-  "session.messages.renderEarlier": "Frühere Nachrichten rendern",
   "session.messages.loadingEarlier": "Lade frühere Nachrichten...",
   "session.messages.loadEarlier": "Frühere Nachrichten laden",
   "session.messages.loading": "Lade Nachrichten...",
 
-  "session.messages.jumpToLatest": "Zum neuesten springen",
-  "session.context.addToContext": "{{selection}} zum Kontext hinzufügen",
-
-  "session.new.worktree.main": "Haupt-Branch",
-  "session.new.worktree.mainWithBranch": "Haupt-Branch ({{branch}})",
-  "session.new.worktree.create": "Neuen Worktree erstellen",
-  "session.new.lastModified": "Zuletzt geändert",
   "sidebar.session.newSession": "Neue Sitzung",
   "sidebar.session.newSession.tooltip": "Starte eine neue Unterhaltung, während die aktuelle Sitzung intakt bleibt.",
-  "sidebar.session.newSession.disabled":
-    "Diese Sitzung ist bereits neu. Beginne zu chatten oder erstelle stattdessen einen Worktree.",
   "sidebar.session.newWorktree": "Neuer Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Erstelle einen isolierten Git-Worktree, um sicher zu experimentieren, Änderungen getrennt zu halten und parallele Sitzungen auszuführen, ohne deinen aktuellen Branch zu stören.",
@@ -729,134 +337,25 @@ export const dict = {
     "Diese Unterhaltung und {{files}} geänderte Dateien in einen dedizierten Worktree für isolierte Folgearbeiten verschieben.",
   "sidebar.session.showChanges.tooltip.empty":
     "Öffne die Änderungsansicht, um den aktuellen Working Tree zu überprüfen.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 Datei geändert · +{{additions}} -{{deletions}}. Änderungsansicht öffnen.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} Dateien geändert · +{{additions}} -{{deletions}}. Änderungsansicht öffnen.",
-  "sidebar.session.agentManager.tooltip":
-    "Öffne den Agent Manager für einen vollständigen Überblick über parallele Sitzungen und Worktrees, damit du langlaufende Aufgaben an einem Ort koordinieren kannst.",
-  "sidebar.session.openAgentManager": "Agent Manager öffnen",
   "sidebar.session.progress.capturing": "Änderungen werden erfasst...",
   "sidebar.session.progress.creating": "Worktree wird erstellt...",
   "sidebar.session.progress.setup": "Setup wird ausgeführt...",
   "sidebar.session.progress.transferring": "Änderungen werden übertragen...",
   "sidebar.session.progress.forking": "Sitzung wird gestartet...",
   "sidebar.session.progress.failed": "Fortsetzen im Worktree fehlgeschlagen",
-  "session.header.search.placeholder": "{{project}} durchsuchen",
-  "session.header.searchFiles": "Dateien suchen",
-  "session.header.openIn": "Öffnen in",
-  "session.header.open.action": "{{app}} öffnen",
-  "session.header.open.ariaLabel": "In {{app}} öffnen",
-  "session.header.open.menu": "Öffnen-Optionen",
-  "session.header.open.copyPath": "Pfad kopieren",
 
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Serverkonfigurationen",
-  "status.popover.tab.servers": "Server",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Server verwalten",
-
-  "session.share.popover.title": "Im Web veröffentlichen",
-  "session.share.popover.description.shared":
-    "Diese Sitzung ist öffentlich im Web. Sie ist für jeden mit dem Link zugänglich.",
-  "session.share.popover.description.unshared":
-    "Sitzung öffentlich im Web teilen. Sie wird für jeden mit dem Link zugänglich sein.",
-  "session.share.action.share": "Teilen",
-  "session.share.action.publish": "Veröffentlichen",
-  "session.share.action.publishing": "Veröffentliche...",
-  "session.share.action.unpublish": "Veröffentlichung aufheben",
-  "session.share.action.unpublishing": "Hebe Veröffentlichung auf...",
-  "session.share.action.view": "Ansehen",
-  "session.share.copy.copied": "Kopiert",
-  "session.share.copy.copyLink": "Link kopieren",
-
-  "lsp.tooltip.none": "Keine LSP-Server",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Lade Prompt...",
-  "terminal.loading": "Lade Terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Terminal schließen",
-
-  "terminal.connectionLost.title": "Verbindung verloren",
-  "terminal.connectionLost.description":
-    "Die Terminalverbindung wurde unterbrochen. Das kann passieren, wenn der Server neu startet.",
   "common.closeTab": "Tab schließen",
   "common.signIn": "Anmelden",
-  "common.signOut": "Abmelden",
   "common.dismiss": "Verwerfen",
   "common.requestFailed": "Anfrage fehlgeschlagen",
-  "common.moreOptions": "Weitere Optionen",
-  "common.learnMore": "Mehr erfahren",
   "common.rename": "Umbenennen",
-  "common.reset": "Zurücksetzen",
-  "common.archive": "Archivieren",
   "common.delete": "Löschen",
   "common.close": "Schließen",
   "common.edit": "Bearbeiten",
   "common.loadMore": "Mehr laden",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "Menü umschalten",
-  "sidebar.nav.projectsAndSessions": "Projekte und Sitzungen",
   "sidebar.settings": "Einstellungen",
-  "sidebar.help": "Hilfe",
-  "sidebar.workspaces.enable": "Arbeitsbereiche aktivieren",
-  "sidebar.workspaces.disable": "Arbeitsbereiche deaktivieren",
-  "sidebar.gettingStarted.title": "Erste Schritte",
-  "sidebar.gettingStarted.line1": "Kilo enthält kostenlose Modelle, damit Sie sofort loslegen können.",
-  "sidebar.gettingStarted.line2":
-    "Verbinden Sie einen beliebigen Anbieter, um Modelle wie Claude, GPT, Gemini usw. zu nutzen.",
-  "sidebar.project.recentSessions": "Letzte Sitzungen",
-  "sidebar.project.viewAllSessions": "Alle Sitzungen anzeigen",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Server",
-  "settings.tab.general": "Allgemein",
-  "settings.tab.shortcuts": "Tastenkombinationen",
-
-  "settings.general.section.appearance": "Erscheinungsbild",
-  "settings.general.section.notifications": "Systembenachrichtigungen",
-  "settings.general.section.updates": "Aktualisierungen",
-  "settings.general.section.sounds": "Soundeffekte",
-
-  "settings.general.row.language.title": "Sprache",
-  "settings.general.row.language.description": "Die Anzeigesprache für Kilo ändern",
-  "settings.general.row.appearance.title": "Erscheinungsbild",
-  "settings.general.row.appearance.description": "Anpassen, wie Kilo auf Ihrem Gerät aussieht",
-  "settings.general.row.theme.title": "Thema",
-  "settings.general.row.theme.description": "Das Thema von Kilo anpassen.",
-  "settings.general.row.font.title": "Schriftart",
-  "settings.general.row.font.description": "Die in Codeblöcken verwendete Monospace-Schriftart anpassen",
-
-  "settings.general.row.releaseNotes.title": "Versionshinweise",
-  "settings.general.row.releaseNotes.description": '"Neuigkeiten"-Pop-ups nach Updates anzeigen',
-
-  "settings.updates.row.startup.title": "Beim Start nach Updates suchen",
-  "settings.updates.row.startup.description": "Beim Start von Kilo automatisch nach Updates suchen",
-  "settings.updates.row.check.title": "Nach Updates suchen",
-  "settings.updates.row.check.description": "Manuell nach Updates suchen und installieren, wenn verfügbar",
-  "settings.updates.action.checkNow": "Jetzt prüfen",
-  "settings.updates.action.checking": "Wird geprüft...",
-  "settings.updates.toast.latest.title": "Du bist auf dem neuesten Stand",
-  "settings.updates.toast.latest.description": "Du verwendest die aktuelle Version von Kilo.",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alarm 01",
   "sound.option.alert02": "Alarm 02",
   "sound.option.alert03": "Alarm 03",
@@ -902,21 +401,6 @@ export const dict = {
   "sound.option.yup04": "Ja 04",
   "sound.option.yup05": "Ja 05",
   "sound.option.yup06": "Ja 06",
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Systembenachrichtigung anzeigen, wenn der Agent fertig ist oder Aufmerksamkeit benötigt",
-  "settings.general.notifications.permissions.title": "Berechtigungen",
-  "settings.general.notifications.permissions.description":
-    "Systembenachrichtigung anzeigen, wenn eine Berechtigung erforderlich ist",
-  "settings.general.notifications.errors.title": "Fehler",
-  "settings.general.notifications.errors.description": "Systembenachrichtigung anzeigen, wenn ein Fehler auftritt",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Ton abspielen, wenn der Agent fertig ist oder Aufmerksamkeit benötigt",
-  "settings.general.sounds.permissions.title": "Berechtigungen",
-  "settings.general.sounds.permissions.description": "Ton abspielen, wenn eine Berechtigung erforderlich ist",
-  "settings.general.sounds.errors.title": "Fehler",
-  "settings.general.sounds.errors.description": "Ton abspielen, wenn ein Fehler auftritt",
 
   "prompt.action.indexing": "Indizierungseinstellungen",
   "settings.indexing.dimension.description":
@@ -933,8 +417,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Für dieses Projekt aktivieren",
   "settings.indexing.projectEnable.description":
     "Indizierung für diesen Workspace aktivieren, wenn die globale Indizierung deaktiviert ist.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Die globale Indizierung ist aktiviert, dieses Projekt wird also bereits erfasst.",
   "settings.indexing.lancedbDirectory.description": "Optionaler Ordner für den lokalen LanceDB-Speicher.",
   "settings.indexing.lancedbDirectory.placeholder": "Leer lassen für Standard",
   "settings.indexing.lancedbDirectory.title": "LanceDB-Ordner",
@@ -963,32 +445,10 @@ export const dict = {
   "settings.indexing.vectorStore.description": "Wählen Sie, wo indizierte Embeddings gespeichert werden.",
   "settings.indexing.vectorStore.title": "Vektorspeicher",
 
-  "settings.shortcuts.title": "Tastenkombinationen",
-  "settings.shortcuts.reset.button": "Auf Standard zurücksetzen",
-  "settings.shortcuts.reset.toast.title": "Tastenkombinationen zurückgesetzt",
-  "settings.shortcuts.reset.toast.description": "Die Tastenkombinationen wurden auf die Standardwerte zurückgesetzt.",
-  "settings.shortcuts.conflict.title": "Tastenkombination bereits in Verwendung",
-  "settings.shortcuts.conflict.description": "{{keybind}} ist bereits {{titles}} zugewiesen.",
-  "settings.shortcuts.unassigned": "Nicht zugewiesen",
-  "settings.shortcuts.pressKeys": "Tasten drücken",
-  "settings.shortcuts.search.placeholder": "Tastenkürzel suchen",
-  "settings.shortcuts.search.empty": "Keine Tastenkürzel gefunden",
-
-  "settings.shortcuts.group.general": "Allgemein",
-  "settings.shortcuts.group.session": "Sitzung",
-  "settings.shortcuts.group.navigation": "Navigation",
-  "settings.shortcuts.group.modelAndAgent": "Modell und Agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
-
   "settings.providers.title": "Anbieter",
-  "settings.providers.description": "Anbietereinstellungen können hier konfiguriert werden.",
-  "settings.providers.betaNotice":
-    "Derzeit kann in den Einstellungen nur der Kilo Gateway-Anbieter konfiguriert werden. Die Unterstützung für die Konfiguration weiterer Anbieter folgt in Kürze während der Beta-Phase. In der Zwischenzeit können Sie Anbieter über die CLI oder die Konfigurationsdatei konfigurieren. Wir setzen uns dafür ein, Kilo offen zu halten, ohne Lock-in.",
   "settings.providers.section.connected": "Verbundene Anbieter",
   "settings.providers.connected.empty": "Keine verbundenen Anbieter",
   "settings.providers.section.popular": "Beliebte Anbieter",
-  "settings.providers.search.placeholder": "Anbieter durchsuchen",
   "settings.providers.select.placeholder": "Anbieter auswählen...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Umgebung",
@@ -1007,7 +467,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Blendet Kilo-Gateway-Modelle aus, deren Anbieter Ihre Prompts möglicherweise zum Training verwenden.",
   "settings.providers.modeModels": "Modell pro Modus",
-  "settings.providers.custom.note": "Fügen Sie einen benutzerdefinierten Anbieter per Basis-URL hinzu.",
   "settings.providers.modeModels.description":
     "Überschreiben Sie das Standardmodell für bestimmte Modi. Wenn nicht festgelegt, wird das globale Standardmodell verwendet.",
   "provider.custom.title": "Benutzerdefinierter Anbieter",
@@ -1074,9 +533,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Modell entfernen",
   "provider.custom.models.add": "Modell hinzufügen",
-  "provider.custom.models.fetch": "Modelle abrufen",
-  "provider.custom.models.fetching": "Abrufen\u2026",
-  "provider.custom.models.fetch.error": "Modelle konnten nicht abgerufen werden: {{error}}",
   "provider.custom.models.fetch.authError":
     "Authentifizierung fehlgeschlagen. Überprüfen Sie den API-Schlüssel oben und versuchen Sie es erneut.",
   "provider.custom.models.fetch.empty": "Keine Modelle auf diesem Server gefunden.",
@@ -1130,23 +586,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Veraltete .kilocode-Konfiguration",
   "settings.config.source.projectOpencode": "Veraltete .opencode-Konfiguration",
   "settings.models.title": "Modelle",
-  "settings.models.description": "Modelleinstellungen können hier konfiguriert werden.",
-  "settings.agents.title": "Agenten",
-  "settings.agents.description": "Agenteneinstellungen können hier konfiguriert werden.",
-  "settings.commands.title": "Befehle",
-  "settings.commands.description": "Befehlseinstellungen können hier konfiguriert werden.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP-Einstellungen können hier konfiguriert werden.",
 
-  "settings.permissions.title": "Berechtigungen",
-  "settings.permissions.description": "Steuern Sie, welche Tools der Server standardmäßig verwenden darf.",
-  "settings.permissions.section.tools": "Tools",
   "settings.permissions.toast.updateFailed.title": "Berechtigungen konnten nicht aktualisiert werden",
 
-  "settings.permissions.action.allow": "Erlauben",
-  "settings.permissions.action.ask": "Fragen",
-  "settings.permissions.action.deny": "Verweigern",
-
   "settings.permissions.tool.read.title": "Lesen",
   "settings.permissions.tool.read.description": "Lesen einer Datei (stimmt mit dem Dateipfad überein)",
   "settings.permissions.tool.edit.title": "Bearbeiten",
@@ -1181,7 +623,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "Wiederholte Tool-Aufrufe mit identischer Eingabe erkennen",
 
-  "session.delete.failed.title": "Sitzung konnte nicht gelöscht werden",
   "session.delete.title": "Sitzung löschen",
   "session.delete.confirm": 'Sitzung "{{name}}" löschen?',
   "session.delete.button": "Sitzung löschen",
@@ -1211,12 +652,7 @@ export const dict = {
   "workStyle.onboarding.title": "Wähle, wie du arbeiten möchtest",
   "workStyle.onboarding.settingsNote": "Du kannst diese Optionen jederzeit ändern unter",
   "workStyle.onboarding.settings": "Einstellungen.",
-  "workStyle.onboarding.description":
-    "Hiermit werden die anfänglichen Standardeinstellungen für Berechtigungen, Denkblöcke, Terminalausgabe und Kontextzeitleiste festgelegt. Dies gilt nur einmal und überspringt Einstellungen, die Sie bereits angepasst haben.",
-  "workStyle.onboarding.skip": "Vorerst überspringen",
   "workStyle.toast.saved.title": "Modus erfolgreich gespeichert",
-  "workStyle.toast.saved.description": "Du kannst deine Einstellungen jederzeit in den Einstellungen ändern.",
-  "workStyle.toast.saved.action": "Zu den Einstellungen",
   "workStyle.choice.permissions": "Berechtigungen",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Sichtbarkeit",
@@ -1241,32 +677,6 @@ export const dict = {
   "session.cloud.import.legacy": "Dies scheint eine veraltete Sitzung zu sein, die nicht mehr unterstützt wird.",
   "session.cloud.import.failed": "Fehler beim Importieren der Cloud-Sitzung",
 
-  "workspace.new": "Neuer Arbeitsbereich",
-  "workspace.type.local": "lokal",
-  "workspace.type.sandbox": "Sandbox",
-  "workspace.create.failed.title": "Arbeitsbereich konnte nicht erstellt werden",
-  "workspace.delete.failed.title": "Arbeitsbereich konnte nicht gelöscht werden",
-  "workspace.resetting.title": "Arbeitsbereich wird zurückgesetzt",
-  "workspace.resetting.description": "Dies kann eine Minute dauern.",
-  "workspace.reset.failed.title": "Arbeitsbereich konnte nicht zurückgesetzt werden",
-  "workspace.reset.success.title": "Arbeitsbereich zurückgesetzt",
-  "workspace.reset.success.description": "Der Arbeitsbereich entspricht jetzt dem Standard-Branch.",
-  "workspace.error.stillPreparing": "Arbeitsbereich wird noch vorbereitet",
-  "workspace.status.checking": "Suche nach nicht zusammengeführten Änderungen...",
-  "workspace.status.error": "Git-Status konnte nicht überprüft werden.",
-  "workspace.status.clean": "Keine nicht zusammengeführten Änderungen erkannt.",
-  "workspace.status.dirty": "Nicht zusammengeführte Änderungen in diesem Arbeitsbereich erkannt.",
-  "workspace.delete.title": "Arbeitsbereich löschen",
-  "workspace.delete.confirm": 'Arbeitsbereich "{{name}}" löschen?',
-  "workspace.delete.button": "Arbeitsbereich löschen",
-  "workspace.reset.title": "Arbeitsbereich zurücksetzen",
-  "workspace.reset.confirm": 'Arbeitsbereich "{{name}}" zurücksetzen?',
-  "workspace.reset.button": "Arbeitsbereich zurücksetzen",
-  "workspace.reset.archived.none": "Keine aktiven Sitzungen werden archiviert.",
-  "workspace.reset.archived.one": "1 Sitzung wird archiviert.",
-  "workspace.reset.archived.many": "{{count}} Sitzungen werden archiviert.",
-  "workspace.reset.note": "Dadurch wird der Arbeitsbereich auf den Standard-Branch zurückgesetzt.",
-
   "deviceAuth.toast.urlCopied": "URL in die Zwischenablage kopiert",
   "deviceAuth.toast.codeCopied": "Code in die Zwischenablage kopiert",
   "deviceAuth.toast.errorCopied": "Fehler in die Zwischenablage kopiert",
@@ -1304,7 +714,6 @@ export const dict = {
   "profile.pass.renews": "Verlängert sich",
   "profile.action.logout": "Abmelden",
 
-  "settings.section.configuration": "Konfiguration",
   "settings.agentBehaviour.title": "Agentenverhalten",
   "settings.autoApprove.title": "Automatisch genehmigen",
   "settings.browser.title": "Browser",
@@ -1320,7 +729,6 @@ export const dict = {
   "settings.language.title": "Sprache",
   "settings.aboutKiloCode.title": "Über Kilo Code",
 
-  "session.messages.empty": "Starten Sie eine Unterhaltung, indem Sie unten eine Nachricht eingeben.",
   "session.messages.welcome":
     "Kilo Code ist ein KI-Programmierassistent. Bitten Sie ihn, Funktionen zu erstellen, Fehler zu beheben oder Ihre Codebasis zu erklären.",
   "session.messages.scrollToBottom": "Nach unten scrollen",
@@ -1328,7 +736,6 @@ export const dict = {
   "session.messages.taskStarting": "Wird gestartet...",
   "session.status.writingResponse": "Antwort wird geschrieben…",
   "session.status.retry": "Erneuter Versuch…",
-  "session.status.retrying": "Erneuter Versuch ({{ attempt }})… {{ message }}",
   "session.status.working": "Wird bearbeitet…",
   "session.status.offline": "Netzwerk getrennt — Verbindung wird wiederhergestellt...",
   "session.outcome.incomplete": "Zug beendet mit {{count}} verbleibenden To-dos",
@@ -1361,11 +768,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} ältere Sitzungen",
   "context.stats.thisSession": "Diese Sitzung",
 
-  "time.justNow": "gerade eben",
-  "time.minutesAgo": "vor {{count}} Min.",
-  "time.hoursAgo": "vor {{count}} Std.",
-  "time.daysAgo": "vor {{count}} T.",
-  "time.monthsAgo": "vor {{count}} Mon.",
   "time.today": "Heute",
   "time.yesterday": "Gestern",
   "time.thisWeek": "Diese Woche",
@@ -1381,7 +783,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Versionsinformationen",
   "settings.aboutKiloCode.version.label": "Version:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code Erweiterung",
   "settings.aboutKiloCode.community": "Community & Support",
   "settings.aboutKiloCode.feedback.prefix": "Bei Fragen oder Feedback können Sie ein Issue eröffnen auf",
   "settings.aboutKiloCode.feedback.or": "oder",
@@ -1434,7 +835,6 @@ export const dict = {
   "settings.language.current": "Aktuell:",
 
   "common.add": "Hinzufügen",
-  "common.choose": "Auswählen…",
 
   "settings.autocomplete.autoTrigger.title": "Automatische Inline-Vervollständigung aktivieren",
   "settings.autocomplete.autoTrigger.description":
@@ -1446,28 +846,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Autovervollständigungsvorschläge im Chat-Textfeld anzeigen",
   "settings.autocomplete.modelsHint":
     "Um zu wählen, welches Modell für die Autovervollständigung verwendet wird, siehe Modelleinstellungen.",
-  "settings.notifications.agent.title": "Agent-Abschluss",
-  "settings.notifications.agent.description": "Benachrichtigung anzeigen, wenn der Agent eine Aufgabe abschließt",
-  "settings.notifications.permissions.title": "Berechtigungsanfragen",
-  "settings.notifications.permissions.description": "Benachrichtigung bei Berechtigungsanfragen anzeigen",
-  "settings.notifications.errors.title": "Fehler",
-  "settings.notifications.errors.description": "Benachrichtigung bei Fehlern anzeigen",
   "settings.notifications.sounds": "Töne",
   "settings.notifications.enable.title": "Tonbenachrichtigungen aktivieren",
   "settings.notifications.enable.description":
     "Töne wiedergeben, wenn Sitzungen abgeschlossen werden, ein Fehler auftritt oder Ihre Eingabe erforderlich ist",
   "settings.notifications.testSound": "Testen",
-  "settings.notifications.agentSound.title": "Agent-Abschlusston",
-  "settings.notifications.agentSound.description": "Ton bei Agent-Abschluss abspielen",
-  "settings.notifications.permSound.title": "Berechtigungsanfrageton",
-  "settings.notifications.permSound.description": "Ton bei Berechtigungsanfragen abspielen",
-  "settings.notifications.errorSound.title": "Fehlerton",
-  "settings.notifications.errorSound.description": "Ton bei Fehlern abspielen",
   "settings.notifications.sound.default": "Standard",
   "settings.notifications.sound.system": "System",
   "settings.notifications.sound.description":
     "Die Standardeinstellung verwendet unterschiedliche Töne für Abschluss, Eingabe und Fehler. Bei anderen Optionen wird für alle Ereignisse derselbe Ton verwendet.",
-  "settings.notifications.sound.none": "Kein",
   "settings.experimental.share.title": "Freigabemodus",
   "settings.experimental.share.description": "Verhalten der Sitzungsfreigabe",
   "settings.experimental.share.manual": "Manuell",
@@ -1488,9 +875,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Bildgenerierungsmodell",
   "settings.experimental.imageGenerationModel.placeholder": "Standard (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Sprache zu Text",
-  "settings.experimental.speechToText.description":
-    "Aktivieren Sie die Spracheingabe in Prompt-Feldern mit Ihrem Kilo-Konto über Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Aktivieren Sie den Kilo-Anbieter und melden Sie sich an, um Speech to Text zu verwenden. Speech to Text wird derzeit nur mit Kilo Gateway unterstützt.",
   "settings.models.speechToTextModel.title": "Sprache-zu-Text-Modell",
@@ -1533,15 +917,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Standard-Agent",
   "settings.agentBehaviour.defaultAgent.description": "Agent, der verwendet wird, wenn keiner angegeben ist",
   "settings.agentBehaviour.availableAgents": "Verfügbare Agenten",
-  "settings.agentBehaviour.selectAgent": "Agent zum Konfigurieren auswählen…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Agent zum Konfigurieren auswählen…",
   "settings.agentBehaviour.modelOverride.title": "Modell-Überschreibung",
   "settings.agentBehaviour.modelOverride.description": "Standardmodell für diesen Agent überschreiben",
   "settings.agentBehaviour.variantOverride.title": "Varianten-Überschreibung",
   "settings.agentBehaviour.variantOverride.description": "Modellvariante für diesen Agent überschreiben",
-  "settings.agentBehaviour.prompt.title": "Benutzerdefinierter Prompt",
-  "settings.agentBehaviour.prompt.description": "Zusätzlicher System-Prompt für diesen Agent",
   "settings.agentBehaviour.temperature.title": "Temperatur",
   "settings.agentBehaviour.temperature.description":
     "Steuert, wie zufällig KI-Antworten ausfallen (0–2). Niedrigere Werte (z. B. 0.2) erzeugen fokussierte, konsistente Ergebnisse. Höhere Werte (z. B. 1.0) erzeugen abwechslungsreichere, kreativere Antworten. Leer lassen, um den Standardwert des Modells zu verwenden.",
@@ -1561,7 +940,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Erkannte Skills",
   "settings.agentBehaviour.noSkillsFound":
     "Keine Skills gefunden. Fügen Sie unten Skill-Ordnerpfade oder URLs hinzu, um Skills verfügbar zu machen.",
-  "settings.agentBehaviour.availableModes": "Verfügbare benutzerdefinierte Modi",
   "settings.agentBehaviour.noAgentsFound": "Keine Agenten gefunden.",
   "settings.agentBehaviour.createMode": "Neuen Modus erstellen",
   "settings.agentBehaviour.createMode.name": "Name",
@@ -1645,12 +1023,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Befehl",
   "settings.agentBehaviour.mcpDetail.args": "Argumente",
   "settings.agentBehaviour.mcpDetail.env": "Umgebung",
-  "settings.agentBehaviour.mcpDetail.disabled": "Dieser Server ist deaktiviert.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Marketplace durchsuchen",
   "settings.agentBehaviour.mcpEmpty":
     "Keine MCP-Server konfiguriert. Fügen Sie MCP-Server in kilo.jsonc hinzu oder bitten Sie den Agenten, sie hinzuzufügen.",
-  "settings.agentBehaviour.workflowsPlaceholder":
-    "Workflows werden über Workflow-Dateien in Ihrem Arbeitsbereich verwaltet.",
   "settings.agentBehaviour.workflows.description":
     "Workflows sind benutzerdefinierte Slash-Befehle, die in Ihrer Konfiguration definiert sind. Geben Sie /command-name im Chat ein, um sie aufzurufen. Befehle werden in opencode.json im Abschnitt 'command' konfiguriert.",
   "settings.agentBehaviour.workflows.empty":
@@ -1743,7 +1118,6 @@ export const dict = {
     "z. B. Generiere commit messages auf Spanisch nach dem conventional commits Format. Gib NUR die commit message zurück.",
 
   "settings.commitMessage.language.sync": "Synchronisieren mit Benutzeroberflächensprache",
-  "settings.commitMessage.language.title": "Sprache",
   "settings.commitMessage.language.description":
     "Wählen Sie, welche Sprache für KI-generierte Commit-Nachrichten verwendet werden soll:",
 
@@ -1783,8 +1157,6 @@ export const dict = {
   "settings.providers.disabled": "Deaktivierte Anbieter",
   "settings.providers.disabled.description": "Anbieter aus der Anbieterliste ausblenden",
   "settings.providers.disabled.enable": "Aktivieren",
-  "settings.providers.enabled": "Aktivierte Anbieter (Whitelist)",
-  "settings.providers.enabled.description": "Wenn gesetzt, sind nur diese Anbieter verfügbar (exklusive Whitelist)",
   "settings.providers.notSet": "Nicht festgelegt (Server-Standard verwenden)",
   "dialog.model.notSet": "Nicht festgelegt",
   "profile.personalAccount": "Persönliches Konto",
@@ -1828,9 +1200,7 @@ export const dict = {
   "migration.migrate.subtitle":
     "Wir haben Einstellungen aus Ihrer vorherigen Installation gefunden. Hier ist, was wir übernehmen können.",
   "migration.migrate.selectLabel": "Auswählen, was migriert werden soll",
-  "migration.migrate.cannotMigrate": "Kann nicht migriert werden",
   "migration.migrate.chatHistory": "Chat-Sitzungen & Verlauf",
-  "migration.migrate.chatHistoryDesc": "Nicht kompatibel mit der neuen Architektur",
   "migration.migrate.button": "Einstellungen migrieren",
   "migration.migrate.skip": "Überspringen",
   "migration.migrate.keysDetected": "{{count}} Schlüssel erkannt",
@@ -1854,10 +1224,7 @@ export const dict = {
     "Dadurch werden die alten Einstellungen aus dem VS Code-Speicher entfernt. Sie können diese Migration danach nicht erneut ausführen.",
   "migration.complete.done": "Fertig",
   "migration.migrate.sessionsDetected": "{{count}} Sitzungen erkannt",
-  "migration.error.sessionFailed": "Sitzungsmigration fehlgeschlagen",
   "migration.error.continue": "Weiter",
-  "migration.error.action.copy": "Kopieren",
-  "migration.error.toast.copied": "Fehler in die Zwischenablage kopiert",
 
   "migration.sessionSummary.title": "Zusammenfassung:",
   "migration.sessionSummary.copy": "Bericht kopieren",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index 6d285c09bab..7cc55121fe8 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -52,85 +52,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Suggested",
-  "command.category.view": "View",
-  "command.category.project": "Project",
-  "command.category.provider": "Provider",
-  "command.category.server": "Server",
-  "command.category.session": "Session",
-  "command.category.theme": "Theme",
-  "command.category.language": "Language",
-  "command.category.file": "File",
-  "command.category.context": "Context",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Model",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Permissions",
-  "command.category.workspace": "Workspace",
-  "command.category.settings": "Settings",
 
-  "theme.scheme.system": "System",
-  "theme.scheme.light": "Light",
-  "theme.scheme.dark": "Dark",
-
-  "command.sidebar.toggle": "Toggle sidebar",
-  "command.project.open": "Open project",
   "command.provider.connect": "Connect provider",
-  "command.server.switch": "Switch server",
-  "command.settings.open": "Open settings",
-  "command.session.previous": "Previous session",
-  "command.session.next": "Next session",
-  "command.session.previous.unseen": "Previous unread session",
-  "command.session.next.unseen": "Next unread session",
-  "command.session.archive": "Archive session",
-
-  "command.palette": "Command palette",
-
-  "command.theme.cycle": "Cycle theme",
-  "command.theme.set": "Use theme: {{theme}}",
-  "command.theme.scheme.cycle": "Cycle color scheme",
-  "command.theme.scheme.set": "Use color scheme: {{scheme}}",
-
-  "command.language.cycle": "Cycle language",
-  "command.language.set": "Use language: {{language}}",
 
   "command.session.new": "New session",
-  "command.session.new.task": "New task",
   "command.session.show.changes": "Show Changes",
-  "command.file.open": "Open file",
-  "command.tab.close": "Close tab",
-  "command.context.addSelection": "Add selection to context",
-  "command.context.addSelection.description": "Add selected lines from the current file",
-  "command.terminal.toggle": "Toggle terminal",
-  "command.fileTree.toggle": "Toggle file tree",
   "command.review.toggle": "Toggle review",
-  "command.terminal.new": "New terminal",
-  "command.terminal.new.description": "Create a new terminal tab",
-  "command.steps.toggle": "Toggle steps",
-  "command.steps.toggle.description": "Show or hide steps for the current message",
-  "command.message.previous": "Previous message",
-  "command.message.previous.description": "Go to the previous user message",
-  "command.message.next": "Next message",
-  "command.message.next.description": "Go to the next user message",
-  "command.model.choose": "Choose model",
-  "command.model.choose.description": "Select a different model",
-  "command.mcp.toggle": "Toggle MCPs",
-  "command.mcp.toggle.description": "Toggle MCPs",
-  "command.agent.cycle": "Cycle agent",
-  "command.agent.cycle.description": "Switch to the next agent",
-  "command.agent.cycle.reverse": "Cycle agent backwards",
-  "command.agent.cycle.reverse.description": "Switch to the previous agent",
-  "command.model.variant.cycle": "Cycle thinking effort",
-  "command.model.variant.cycle.description": "Switch to the next effort level",
-  "command.permissions.autoaccept.enable": "Auto-accept edits",
-  "command.permissions.autoaccept.disable": "Stop auto-accepting edits",
-  "command.workspace.toggle": "Toggle workspaces",
-  "command.workspace.toggle.description": "Enable or disable multiple workspaces in the sidebar",
-  "command.session.undo": "Undo",
-  "command.session.undo.description": "Undo the last message",
-  "command.session.redo": "Redo",
-  "command.session.redo.description": "Redo the last undone message",
   "revert.banner.count_one": "{{count}} message reverted",
   "revert.banner.count_other": "{{count}} messages reverted",
   "revert.banner.redo": "Redo",
@@ -145,13 +72,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Enable snapshots",
   "revert.disabled.agentBusy": "Wait for agent to finish",
   "command.session.compact": "Compact session",
-  "command.session.compact.description": "Summarize the session to reduce context size",
-  "command.session.fork": "Fork from message",
-  "command.session.fork.description": "Create a new session from a previous message",
-  "command.session.share": "Share session",
-  "command.session.share.description": "Share this session and copy the URL to clipboard",
-  "command.session.unshare": "Unshare session",
-  "command.session.unshare.description": "Stop sharing this session",
   "command.session.export": "Export session transcript",
 
   "agentRequirements.skill.installed": "Installed",
@@ -178,11 +98,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "This agent requirement check is no longer active.",
   "agentRequirements.error.requestFailed": "Kilo could not check the agent requirements.",
 
-  "palette.search.placeholder": "Search files, commands, and sessions",
-  "palette.empty": "No results found",
-  "palette.group.commands": "Commands",
-  "palette.group.files": "Files",
-
   "dialog.provider.search.placeholder": "Search providers",
   "dialog.provider.empty": "No providers found",
   "dialog.provider.group.other": "Other",
@@ -191,19 +106,13 @@ export const dict = {
   "dialog.model.select.title": "Select model",
   "dialog.model.search.placeholder": "Search models",
   "dialog.model.empty": "No model results",
-  "dialog.model.manage": "Manage models",
-  "dialog.model.manage.description": "Customize which models appear in the model selector.",
   "dialog.model.select": "Select",
   "dialog.model.expand": "Expand",
   "dialog.model.collapse": "Collapse",
 
-  "dialog.model.unpaid.freeModels.title": "Free models provided by Kilo",
-  "dialog.model.unpaid.addMore.title": "Add more models from popular providers",
-
   "dialog.provider.viewAll": "Show more providers",
 
   "provider.connect.title": "Connect {{provider}}",
-  "provider.connect.title.anthropicProMax": "Login with Claude Pro/Max",
   "provider.connect.selectMethod": "Select login method for {{provider}}.",
   "provider.connect.method.apiKey": "API key",
   "provider.connect.status.inProgress": "Authorization in progress...",
@@ -230,13 +139,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "e.g. my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI endpoint URL",
   "provider.connect.azure.baseURL.placeholder": "e.g. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen gives you access to a curated set of reliable optimized models for coding agents.",
-  "provider.connect.opencodeZen.line2":
-    "With a single API key you'll get access to models such as Claude, GPT, Gemini, GLM and more.",
-  "provider.connect.opencodeZen.visit.prefix": "Visit ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " to collect your API key.",
   "provider.connect.oauth.code.visit.prefix": "Visit ",
   "provider.connect.oauth.code.visit.link": "this link",
   "provider.connect.oauth.code.visit.suffix":
@@ -244,7 +146,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} authorization code",
   "provider.connect.oauth.code.placeholder": "Authorization code",
   "provider.connect.oauth.code.required": "Authorization code is required",
-  "provider.connect.oauth.code.invalid": "Invalid authorization code",
   "provider.connect.oauth.auto.visit.prefix": "Visit ",
   "provider.connect.oauth.auto.visit.link": "this link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -258,28 +159,11 @@ export const dict = {
 
   "model.tag.free": "Free",
   "model.tag.dataCollected": "Data may be used for training",
-  "model.tag.latest": "Latest",
   "model.group.auto": "Auto Models",
   "model.group.recommended": "Recommended",
   "model.group.favorites": "Favorites",
-  "model.group.collapse": "Collapse {{group}}",
-  "model.group.expand": "Expand {{group}}",
   "model.favorite.add": "Add to favorites",
   "model.favorite.remove": "Remove from favorites",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "text",
-  "model.input.image": "image",
-  "model.input.audio": "audio",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Allows: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Allows reasoning",
-  "model.tooltip.reasoning.none": "No reasoning",
-  "model.tooltip.context": "Context limit {{limit}}",
   "model.preview.label.released": "Released",
   "model.preview.label.input": "Input",
   "model.preview.label.output": "Output",
@@ -300,11 +184,8 @@ export const dict = {
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Search",
   "common.goBack": "Back",
-  "common.goForward": "Forward",
   "common.loading": "Loading",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Cancel",
   "common.connect": "Connect",
   "common.disconnect": "Disconnect",
@@ -312,54 +193,8 @@ export const dict = {
   "common.save": "Save",
   "common.saving": "Saving...",
   "common.default": "Default",
-  "common.attachment": "attachment",
 
-  "prompt.placeholder.shell": "Enter shell command...",
-  "prompt.placeholder.normal": 'Ask anything... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Summarize comments…",
-  "prompt.placeholder.summarizeComment": "Summarize comment…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc to exit",
-
-  "prompt.example.1": "Fix a TODO in the codebase",
-  "prompt.example.2": "What is the tech stack of this project?",
-  "prompt.example.3": "Fix broken tests",
-  "prompt.example.4": "Explain how authentication works",
-  "prompt.example.5": "Find and fix security vulnerabilities",
-  "prompt.example.6": "Add unit tests for the user service",
-  "prompt.example.7": "Refactor this function to be more readable",
-  "prompt.example.8": "What does this error mean?",
-  "prompt.example.9": "Help me debug this issue",
-  "prompt.example.10": "Generate API documentation",
-  "prompt.example.11": "Optimize database queries",
-  "prompt.example.12": "Add input validation",
-  "prompt.example.13": "Create a new component for...",
-  "prompt.example.14": "How do I deploy this project?",
-  "prompt.example.15": "Review my code for best practices",
-  "prompt.example.16": "Add error handling to this function",
-  "prompt.example.17": "Explain this regex pattern",
-  "prompt.example.18": "Convert this to TypeScript",
-  "prompt.example.19": "Add logging throughout the codebase",
-  "prompt.example.20": "What dependencies are outdated?",
-  "prompt.example.21": "Help me write a migration script",
-  "prompt.example.22": "Implement caching for this endpoint",
-  "prompt.example.23": "Add pagination to this list",
-  "prompt.example.24": "Create a CLI command for...",
-  "prompt.example.25": "How do environment variables work here?",
-
-  "prompt.popover.emptyResults": "No matching results",
-  "prompt.popover.emptyCommands": "No matching commands",
-  "prompt.dropzone.label": "Drop images or PDFs here",
-  "prompt.slash.badge.custom": "custom",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "active",
-  "prompt.context.includeActiveFile": "Include active file",
-  "prompt.context.removeActiveFile": "Remove active file from context",
-  "prompt.context.removeFile": "Remove file from context",
   "prompt.thinking.tooltip": "Reasoning effort",
-  "prompt.action.attachFile": "Attach file",
-  "prompt.attachment.remove": "Remove attachment",
   "prompt.action.send": "Send",
   "prompt.action.send.blocked": "Answer or dismiss the pending question first",
   "prompt.action.send.recording": "Transcribe and send",
@@ -398,190 +233,17 @@ export const dict = {
   "speechToText.tooltip.error": "Speech input failed. Click to clear.",
   "speechToText.error.title": "Speech input failed",
   "speechToText.error.loginRequired": "Sign in to Kilo to use speech input.",
-  "speechToText.error.permission": "Microphone permission was denied.",
-  "speechToText.error.microphone": "Could not start the microphone.",
-  "speechToText.error.recording": "Recording failed.",
-  "speechToText.error.emptyRecording": "No audio was recorded.",
   "speechToText.error.emptyTranscript": "No speech was detected.",
-  "speechToText.error.encoding": "Could not encode the recording.",
-  "speechToText.toast.transcribed": "Transcription inserted",
 
-  "prompt.toast.pasteUnsupported.title": "Unsupported paste",
-  "prompt.toast.pasteUnsupported.description": "Only images or PDFs can be pasted here.",
-  "prompt.toast.modelAgentRequired.title": "Select an agent and model",
-  "prompt.toast.modelAgentRequired.description": "Choose an agent and model before sending a prompt.",
-  "prompt.toast.worktreeCreateFailed.title": "Failed to create worktree",
-  "prompt.toast.sessionCreateFailed.title": "Failed to create session",
-  "prompt.toast.shellSendFailed.title": "Failed to send shell command",
-  "prompt.toast.commandSendFailed.title": "Failed to send command",
   "prompt.toast.promptSendFailed.title": "Failed to send prompt",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} of {{total}} enabled",
-  "dialog.mcp.empty": "No MCPs configured",
-
-  "dialog.lsp.empty": "LSPs auto-detected from file types",
-  "dialog.plugins.empty": "Plugins configured in opencode.json",
-
   "mcp.status.connected": "connected",
   "mcp.status.failed": "failed",
   "mcp.status.needs_auth": "needs auth",
   "mcp.status.needs_registration": "needs client registration",
   "mcp.status.disabled": "disabled",
 
-  "dialog.fork.empty": "No messages to fork from",
-
-  "dialog.directory.search.placeholder": "Search folders",
-  "dialog.directory.empty": "No folders found",
-
-  "dialog.server.title": "Servers",
-  "dialog.server.description": "Switch which Kilo server this app connects to.",
-  "dialog.server.search.placeholder": "Search servers",
-  "dialog.server.empty": "No servers yet",
-  "dialog.server.add.title": "Add a server",
-  "dialog.server.add.url": "Server URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Could not connect to server",
-  "dialog.server.add.checking": "Checking...",
-  "dialog.server.add.button": "Add server",
-  "dialog.server.default.title": "Default server",
-  "dialog.server.default.description":
-    "Connect to this server on app launch instead of starting a local server. Requires restart.",
-  "dialog.server.default.none": "No server selected",
-  "dialog.server.default.set": "Set current server as default",
-  "dialog.server.default.clear": "Clear",
-  "dialog.server.action.remove": "Remove server",
-
-  "dialog.server.menu.edit": "Edit",
-  "dialog.server.menu.default": "Set as default",
-  "dialog.server.menu.defaultRemove": "Remove default",
-  "dialog.server.menu.delete": "Delete",
-  "dialog.server.current": "Current Server",
-  "dialog.server.status.default": "Default",
-
-  "dialog.project.edit.title": "Edit project",
-  "dialog.project.edit.name": "Name",
-  "dialog.project.edit.icon": "Icon",
-  "dialog.project.edit.icon.alt": "Project icon",
-  "dialog.project.edit.icon.hint": "Click or drag an image",
-  "dialog.project.edit.icon.recommended": "Recommended: 128x128px",
-  "dialog.project.edit.color": "Color",
-  "dialog.project.edit.color.select": "Select {{color}} color",
-  "dialog.project.edit.worktree.startup": "Workspace startup script",
-  "dialog.project.edit.worktree.startup.description": "Runs after creating a new workspace (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "e.g. bun install",
-
-  "context.breakdown.title": "Context Breakdown",
-  "context.breakdown.note": 'Approximate breakdown of input tokens. "Other" includes tool definitions and overhead.',
-  "context.breakdown.system": "System",
-  "context.breakdown.user": "User",
-  "context.breakdown.assistant": "Assistant",
-  "context.breakdown.tool": "Tool Calls",
-  "context.breakdown.other": "Other",
-
-  "context.systemPrompt.title": "System Prompt",
-  "context.rawMessages.title": "Raw messages",
-
-  "context.stats.session": "Session",
-  "context.stats.messages": "Messages",
-  "context.stats.provider": "Provider",
-  "context.stats.model": "Model",
-  "context.stats.limit": "Context Limit",
-  "context.stats.totalTokens": "Total Tokens",
-  "context.stats.usage": "Usage",
-  "context.stats.inputTokens": "Input Tokens",
-  "context.stats.outputTokens": "Output Tokens",
-  "context.stats.reasoningTokens": "Reasoning Tokens",
-  "context.stats.cacheTokens": "Cache Tokens (read/write)",
-  "context.stats.userMessages": "User Messages",
-  "context.stats.assistantMessages": "Assistant Messages",
-  "context.stats.totalCost": "Total Cost",
-  "context.stats.sessionCreated": "Session Created",
-  "context.stats.lastActivity": "Last Activity",
-
-  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Usage",
-  "context.usage.cost": "Cost",
-  "context.usage.clickToView": "Click to view context",
-  "context.usage.view": "View context usage",
-
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.language.title": "Language",
-  "toast.language.description": "Switched to {{language}}",
-
-  "toast.theme.title": "Theme switched",
-  "toast.scheme.title": "Color scheme",
-
-  "toast.workspace.enabled.title": "Workspaces enabled",
-  "toast.workspace.enabled.description": "Multiple worktrees are now shown in the sidebar",
-  "toast.workspace.disabled.title": "Workspaces disabled",
-  "toast.workspace.disabled.description": "Only the main worktree is shown in the sidebar",
-
-  "toast.permissions.autoaccept.on.title": "Auto-accepting edits",
-  "toast.permissions.autoaccept.on.description": "Edit and write permissions will be automatically approved",
-  "toast.permissions.autoaccept.off.title": "Stopped auto-accepting edits",
-  "toast.permissions.autoaccept.off.description": "Edit and write permissions will require approval",
-
-  "toast.model.none.title": "No model selected",
-  "toast.model.none.description": "Connect a provider to summarize this session",
-
-  "toast.file.loadFailed.title": "Failed to load file",
-  "toast.file.listFailed.title": "Failed to list files",
-
-  "toast.context.noLineSelection.title": "No line selection",
-  "toast.context.noLineSelection.description": "Select a line range in a file tab first.",
-
-  "toast.session.share.copyFailed.title": "Failed to copy URL to clipboard",
-  "toast.session.share.success.title": "Session shared",
-  "toast.session.share.success.description": "Share URL copied to clipboard!",
-  "toast.session.share.failed.title": "Failed to share session",
-  "toast.session.share.failed.description": "An error occurred while sharing the session",
-
-  "toast.session.unshare.success.title": "Session unshared",
-  "toast.session.unshare.success.description": "Session unshared successfully!",
-  "toast.session.unshare.failed.title": "Failed to unshare session",
-  "toast.session.unshare.failed.description": "An error occurred while unsharing the session",
-
   "toast.session.rename.invalid.title": "Invalid session title",
-  "toast.session.listFailed.title": "Failed to load sessions for {{project}}",
-
-  "toast.update.title": "Update available",
-  "toast.update.description": "A new version of Kilo ({{version}}) is now available to install.",
-  "toast.update.action.installRestart": "Install and restart",
-  "toast.update.action.notYet": "Not yet",
-
-  "error.page.title": "Something went wrong",
-  "error.page.description": "An error occurred while loading the application.",
-  "error.page.details.label": "Error Details",
-  "error.page.action.restart": "Restart",
-  "error.page.action.checking": "Checking...",
-  "error.page.action.checkUpdates": "Check for updates",
-  "error.page.action.updateTo": "Update to {{version}}",
-  "error.page.report.prefix": "Please report this error to the Kilo team",
-  "error.page.report.discord": "on Discord",
-  "error.page.version": "Version: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Root element not found. Did you forget to add it to your index.html? Or maybe the id attribute got misspelled?",
-
-  "error.globalSync.connectFailed": "Could not connect to server. Is there a server running at `{{url}}`?",
 
   "error.startup.title": "Server connection failed",
 
@@ -599,30 +261,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Sign in with ChatGPT again, then send your message again to keep using Codex models.",
 
-  "error.chain.unknown": "Unknown error",
-  "error.chain.causedBy": "Caused by:",
-  "error.chain.apiError": "API error",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Retryable: {{retryable}}",
-  "error.chain.responseBody": "Response body:\n{{body}}",
-  "error.chain.didYouMean": "Did you mean: {{suggestions}}",
-  "error.chain.modelNotFound": "Model not found: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Check your config (opencode.json) provider/model names",
-  "error.chain.mcpFailed": 'MCP server "{{name}}" failed. Note, Kilo does not support MCP authentication yet.',
-  "error.chain.providerAuthFailed": "Provider authentication failed ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Failed to initialize provider "{{provider}}". Check credentials and configuration.',
-  "error.chain.configJsonInvalid": "Config file at {{path}} is not valid JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Config file at {{path}} is not valid JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Directory "{{dir}}" in {{path}} is not valid. Rename the directory to "{{suggestion}}" or remove it. This is a common typo.',
-  "error.chain.configFrontmatterError": "Failed to parse frontmatter in {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Config file at {{path}} is invalid",
-  "error.chain.configInvalidWithMessage": "Config file at {{path}} is invalid: {{message}}",
-
   "notification.permission.title": "Permission required",
   "notification.permission.titleSubagent": "Permission required (subagent)",
-  "notification.permission.description": "{{sessionTitle}} in {{projectName}} needs permission",
   "ui.permission.manageAutoApprove": "Manage Auto-Approve Rules",
   "ui.permission.doomLoop.prompt": "Potential loop detected for the {{tool}} tool. Continue running?",
   "ui.permission.doomLoop.rule": "Continue {{tool}} calls",
@@ -647,7 +287,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Todo Read",
   "ui.permission.toolLabel.todoWrite": "Todo Write",
   "ui.permission.toolLabel.codeSearch": "Code Search",
-  "ui.permission.toggleWrap": "Toggle word wrap",
   "ui.permission.copyCommand": "Copy",
   "ui.approval.auto": "Auto-approved",
   "ui.approval.manual": "Approved by you",
@@ -659,160 +298,29 @@ export const dict = {
   "ui.approval.source.yolo": "by auto-approve (YOLO) mode",
   "ui.approval.source.session": "by a session auto-approve rule",
   "ui.approval.source.default": "by default",
-  "notification.question.title": "Question",
-  "notification.question.description": "{{sessionTitle}} in {{projectName}} has a question",
-  "notification.action.goToSession": "Go to session",
 
-  "notification.session.responseReady.title": "Response ready",
-  "notification.session.error.title": "Session error",
-  "notification.session.error.fallbackDescription": "An error occurred",
-
-  "home.recentProjects": "Recent projects",
-  "home.empty.title": "No recent projects",
-  "home.empty.description": "Get started by opening a local project",
-
-  "session.tab.session": "Session",
   "session.tab.review": "Review",
-  "session.tab.context": "Context",
-  "session.panel.reviewAndFiles": "Review and files",
   "session.review.filesChanged": "{{count}} Files Changed",
-  "session.review.change.one": "Change",
   "session.review.change.other": "Changes",
   "session.review.loadingChanges": "Loading changes...",
-  "session.review.empty": "No changes in this session yet",
   "session.review.noChanges": "No changes",
 
-  "session.files.selectToOpen": "Select a file to open",
-  "session.files.all": "All files",
-  "session.files.binaryContent": "Binary file (content cannot be displayed)",
-
-  "session.messages.renderEarlier": "Render earlier messages",
   "session.messages.loadingEarlier": "Loading earlier messages...",
   "session.messages.loadEarlier": "Load earlier messages",
   "session.messages.loading": "Loading messages...",
-  "session.messages.jumpToLatest": "Jump to latest",
-
-  "session.context.addToContext": "Add {{selection}} to context",
-
-  "session.new.worktree.main": "Main branch",
-  "session.new.worktree.mainWithBranch": "Main branch ({{branch}})",
-  "session.new.worktree.create": "Create new worktree",
-  "session.new.lastModified": "Last modified",
-
-  "session.header.search.placeholder": "Search {{project}}",
-  "session.header.searchFiles": "Search files",
-  "session.header.openIn": "Open in",
-  "session.header.open.action": "Open {{app}}",
-  "session.header.open.ariaLabel": "Open in {{app}}",
-  "session.header.open.menu": "Open options",
-  "session.header.open.copyPath": "Copy Path",
-
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Server configurations",
-  "status.popover.tab.servers": "Servers",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Manage servers",
-
-  "session.share.popover.title": "Publish on web",
-  "session.share.popover.description.shared":
-    "This session is public on the web. It is accessible to anyone with the link.",
-  "session.share.popover.description.unshared":
-    "Share session publicly on the web. It will be accessible to anyone with the link.",
-  "session.share.action.share": "Share",
-  "session.share.action.publish": "Publish",
-  "session.share.action.publishing": "Publishing...",
-  "session.share.action.unpublish": "Unpublish",
-  "session.share.action.unpublishing": "Unpublishing...",
-  "session.share.action.view": "View",
-  "session.share.copy.copied": "Copied",
-  "session.share.copy.copyLink": "Copy link",
-
-  "lsp.tooltip.none": "No LSP servers",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Loading prompt...",
-  "terminal.loading": "Loading terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Close terminal",
-  "terminal.connectionLost.title": "Connection Lost",
-  "terminal.connectionLost.description":
-    "The terminal connection was interrupted. This can happen when the server restarts.",
 
   "common.closeTab": "Close tab",
   "common.signIn": "Sign in",
-  "common.signOut": "Sign out",
   "common.dismiss": "Dismiss",
   "common.requestFailed": "Request failed",
-  "common.moreOptions": "More options",
-  "common.learnMore": "Learn more",
   "common.rename": "Rename",
-  "common.reset": "Reset",
-  "common.archive": "Archive",
   "common.delete": "Delete",
   "common.close": "Close",
   "common.edit": "Edit",
   "common.loadMore": "Load more",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Toggle menu",
-  "sidebar.nav.projectsAndSessions": "Projects and sessions",
   "sidebar.settings": "Settings",
-  "sidebar.help": "Help",
-  "sidebar.workspaces.enable": "Enable workspaces",
-  "sidebar.workspaces.disable": "Disable workspaces",
-  "sidebar.gettingStarted.title": "Getting started",
-  "sidebar.gettingStarted.line1": "Kilo includes free models so you can start immediately.",
-  "sidebar.gettingStarted.line2": "Connect any provider to use models, inc. Claude, GPT, Gemini etc.",
-  "sidebar.project.recentSessions": "Recent sessions",
-  "sidebar.project.viewAllSessions": "View all sessions",
 
-  "app.name.desktop": "Kilo Desktop",
-
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Server",
-  "settings.tab.general": "General",
-  "settings.tab.shortcuts": "Shortcuts",
-
-  "settings.general.section.appearance": "Appearance",
-  "settings.general.section.notifications": "System notifications",
-  "settings.general.section.updates": "Updates",
-  "settings.general.section.sounds": "Sound effects",
-
-  "settings.general.row.language.title": "Language",
-  "settings.general.row.language.description": "Change the display language for Kilo",
-  "settings.general.row.appearance.title": "Appearance",
-  "settings.general.row.appearance.description": "Customise how Kilo looks on your device",
-  "settings.general.row.theme.title": "Theme",
-  "settings.general.row.theme.description": "Customise how Kilo is themed.",
-  "settings.general.row.font.title": "Font",
-  "settings.general.row.font.description": "Customise the mono font used in code blocks",
-
-  "settings.general.row.releaseNotes.title": "Release notes",
-  "settings.general.row.releaseNotes.description": "Show What's New popups after updates",
-
-  "settings.updates.row.startup.title": "Check for updates on startup",
-  "settings.updates.row.startup.description": "Automatically check for updates when Kilo launches",
-  "settings.updates.row.check.title": "Check for updates",
-  "settings.updates.row.check.description": "Manually check for updates and install if available",
-  "settings.updates.action.checkNow": "Check now",
-  "settings.updates.action.checking": "Checking...",
-  "settings.updates.toast.latest.title": "You're up to date",
-  "settings.updates.toast.latest.description": "You're running the latest version of Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alert 01",
   "sound.option.alert02": "Alert 02",
   "sound.option.alert03": "Alert 03",
@@ -859,43 +367,7 @@ export const dict = {
   "sound.option.yup05": "Yup 05",
   "sound.option.yup06": "Yup 06",
 
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Show system notification when the agent is complete or needs attention",
-  "settings.general.notifications.permissions.title": "Permissions",
-  "settings.general.notifications.permissions.description": "Show system notification when a permission is required",
-  "settings.general.notifications.errors.title": "Errors",
-  "settings.general.notifications.errors.description": "Show system notification when an error occurs",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Play sound when the agent is complete or needs attention",
-  "settings.general.sounds.permissions.title": "Permissions",
-  "settings.general.sounds.permissions.description": "Play sound when a permission is required",
-  "settings.general.sounds.errors.title": "Errors",
-  "settings.general.sounds.errors.description": "Play sound when an error occurs",
-
-  "settings.shortcuts.title": "Keyboard shortcuts",
-  "settings.shortcuts.reset.button": "Reset to defaults",
-  "settings.shortcuts.reset.toast.title": "Shortcuts reset",
-  "settings.shortcuts.reset.toast.description": "Keyboard shortcuts have been reset to defaults.",
-  "settings.shortcuts.conflict.title": "Shortcut already in use",
-  "settings.shortcuts.conflict.description": "{{keybind}} is already assigned to {{titles}}.",
-  "settings.shortcuts.unassigned": "Unassigned",
-  "settings.shortcuts.pressKeys": "Press keys",
-  "settings.shortcuts.search.placeholder": "Search shortcuts",
-  "settings.shortcuts.search.empty": "No shortcuts found",
-
-  "settings.shortcuts.group.general": "General",
-  "settings.shortcuts.group.session": "Session",
-  "settings.shortcuts.group.navigation": "Navigation",
-  "settings.shortcuts.group.modelAndAgent": "Model and agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
-
   "settings.providers.title": "Providers",
-  "settings.providers.description": "Provider settings will be configurable here.",
-  "settings.providers.betaNotice":
-    "Currently only the Kilo Gateway provider can be configured in the settings interface. Support for configuring other providers is coming soon during the beta period. In the interim you can configure providers using the CLI or config file. We're committed to keeping Kilo open, no lock-in.",
   "settings.providers.section.connected": "Connected providers",
   "settings.providers.connected.empty": "No connected providers",
   "settings.providers.section.popular": "Popular providers",
@@ -973,9 +445,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Remove model",
   "provider.custom.models.add": "Add model",
-  "provider.custom.models.fetch": "Fetch models",
-  "provider.custom.models.fetching": "Fetching\u2026",
-  "provider.custom.models.fetch.error": "Failed to fetch models: {{error}}",
   "provider.custom.models.fetch.authError": "Authentication failed. Check the API key above and try again.",
   "provider.custom.models.fetch.empty": "No models found on this server.",
   "provider.custom.models.fetch.added": "Added {{count}} model(s).",
@@ -1026,23 +495,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Legacy .kilocode config",
   "settings.config.source.projectOpencode": "Legacy .opencode config",
   "settings.models.title": "Models",
-  "settings.models.description": "Model settings will be configurable here.",
-  "settings.agents.title": "Agents",
-  "settings.agents.description": "Agent settings will be configurable here.",
-  "settings.commands.title": "Commands",
-  "settings.commands.description": "Command settings will be configurable here.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP settings will be configurable here.",
 
-  "settings.permissions.title": "Permissions",
-  "settings.permissions.description": "Control what tools the server can use by default.",
-  "settings.permissions.section.tools": "Tools",
   "settings.permissions.toast.updateFailed.title": "Failed to update permissions",
 
-  "settings.permissions.action.allow": "Allow",
-  "settings.permissions.action.ask": "Ask",
-  "settings.permissions.action.deny": "Deny",
-
   "settings.permissions.tool.read.title": "Read",
   "settings.permissions.tool.read.description": "Reading a file (matches the file path)",
   "settings.permissions.tool.edit.title": "Edit",
@@ -1076,7 +531,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "Detect repeated tool calls with identical input",
 
-  "session.delete.failed.title": "Failed to delete session",
   "session.delete.title": "Delete session",
   "session.delete.confirm": 'Delete session "{{name}}"?',
   "session.delete.button": "Delete session",
@@ -1104,14 +558,9 @@ export const dict = {
   "feedback.dialog.support": "Customer Support",
   "workStyle.onboarding.welcome": "Welcome to Kilo",
   "workStyle.onboarding.title": "Choose how you want to work",
-  "workStyle.onboarding.description":
-    "This sets the starting defaults for permissions, reasoning blocks, terminal output, and the context timeline. It only applies once and skips settings you already customized.",
-  "workStyle.onboarding.skip": "Skip for now",
   "workStyle.onboarding.settingsNote": "You can change these options anytime in",
   "workStyle.onboarding.settings": "Settings.",
   "workStyle.toast.saved.title": "Mode saved successfully",
-  "workStyle.toast.saved.description": "Update your preferences anytime in Settings.",
-  "workStyle.toast.saved.action": "Go to Settings",
   "workStyle.choice.permissions": "Permissions",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Visibility",
@@ -1134,32 +583,6 @@ export const dict = {
   "session.cloud.import.legacy": "This appears to be a legacy session that is no longer supported.",
   "session.cloud.import.failed": "Failed to import cloud session",
 
-  "workspace.new": "New workspace",
-  "workspace.type.local": "local",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Failed to create workspace",
-  "workspace.delete.failed.title": "Failed to delete workspace",
-  "workspace.resetting.title": "Resetting workspace",
-  "workspace.resetting.description": "This may take a minute.",
-  "workspace.reset.failed.title": "Failed to reset workspace",
-  "workspace.reset.success.title": "Workspace reset",
-  "workspace.reset.success.description": "Workspace now matches the default branch.",
-  "workspace.error.stillPreparing": "Workspace is still preparing",
-  "workspace.status.checking": "Checking for unmerged changes...",
-  "workspace.status.error": "Unable to verify git status.",
-  "workspace.status.clean": "No unmerged changes detected.",
-  "workspace.status.dirty": "Unmerged changes detected in this workspace.",
-  "workspace.delete.title": "Delete workspace",
-  "workspace.delete.confirm": 'Delete workspace "{{name}}"?',
-  "workspace.delete.button": "Delete workspace",
-  "workspace.reset.title": "Reset workspace",
-  "workspace.reset.confirm": 'Reset workspace "{{name}}"?',
-  "workspace.reset.button": "Reset workspace",
-  "workspace.reset.archived.none": "No active sessions will be archived.",
-  "workspace.reset.archived.one": "1 session will be archived.",
-  "workspace.reset.archived.many": "{{count}} sessions will be archived.",
-  "workspace.reset.note": "This will reset the workspace to match the default branch.",
-
   "deviceAuth.toast.urlCopied": "URL copied to clipboard",
   "deviceAuth.toast.codeCopied": "Code copied to clipboard",
   "deviceAuth.toast.errorCopied": "Error copied to clipboard",
@@ -1197,7 +620,6 @@ export const dict = {
   "profile.pass.renews": "Renews",
   "profile.action.logout": "Log Out",
 
-  "settings.section.configuration": "Configuration",
   "settings.agentBehaviour.title": "Agent Behaviour",
   "settings.autoApprove.title": "Auto-Approve",
   "settings.browser.title": "Browser",
@@ -1217,7 +639,6 @@ export const dict = {
   "settings.indexing.globalEnable.description": "Enable indexing for every workspace.",
   "settings.indexing.projectEnable.title": "Enable for this project",
   "settings.indexing.projectEnable.description": "Enable indexing for this workspace when global indexing is off.",
-  "settings.indexing.projectEnable.disabledTooltip": "Global indexing is enabled, so this project is already covered.",
   "settings.indexing.provider.title": "Embedding provider",
   "settings.indexing.provider.description": "Choose the provider used to generate embeddings for semantic search.",
   "settings.indexing.kiloModel.title": "Kilo model preset",
@@ -1249,7 +670,6 @@ export const dict = {
   "settings.language.title": "Language",
   "settings.aboutKiloCode.title": "About Kilo Code",
 
-  "session.messages.empty": "Start a conversation by typing a message below.",
   "session.messages.welcome":
     "Kilo Code is an AI coding assistant. Ask it to build features, fix bugs, or explain your codebase.",
   "session.messages.scrollToBottom": "Scroll to bottom",
@@ -1257,7 +677,6 @@ export const dict = {
   "session.messages.taskStarting": "Starting...",
   "session.status.writingResponse": "Writing response...",
   "session.status.retry": "Retrying…",
-  "session.status.retrying": "Retrying (attempt {{ attempt }})… {{ message }}",
   "session.status.working": "Working...",
   "session.status.offline": "Network disconnected — reconnecting...",
   "session.outcome.incomplete": "Turn ended with {{count}} to-dos remaining.",
@@ -1276,7 +695,6 @@ export const dict = {
   "session.costAlert.stop": "Stop",
   "sidebar.session.newSession": "New Session",
   "sidebar.session.newSession.tooltip": "Start a fresh conversation while keeping the current session intact.",
-  "sidebar.session.newSession.disabled": "This session is already new. Start chatting or create a worktree instead.",
   "sidebar.session.newWorktree": "New Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Create an isolated git worktree to experiment safely, keep changes separated, and run parallel sessions without disrupting your current branch.",
@@ -1292,12 +710,6 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Move this conversation and {{files}} changed files into a dedicated worktree for isolated follow-up work.",
   "sidebar.session.showChanges.tooltip.empty": "Open the changes view to inspect the current working tree.",
-  "sidebar.session.showChanges.tooltip.one": "1 file changed · +{{additions}} -{{deletions}}. Open the changes view.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} files changed · +{{additions}} -{{deletions}}. Open the changes view.",
-  "sidebar.session.agentManager.tooltip":
-    "Open Agent Manager for a full overview of parallel sessions and worktrees, so you can coordinate long-running tasks in one place.",
-  "sidebar.session.openAgentManager": "Open Agent Manager",
   "sidebar.session.progress.capturing": "Capturing changes...",
   "sidebar.session.progress.creating": "Creating worktree...",
   "sidebar.session.progress.setup": "Running setup...",
@@ -1319,11 +731,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} older sessions",
   "context.stats.thisSession": "This session",
 
-  "time.justNow": "just now",
-  "time.minutesAgo": "{{count}} min ago",
-  "time.hoursAgo": "{{count}}h ago",
-  "time.daysAgo": "{{count}}d ago",
-  "time.monthsAgo": "{{count}}mo ago",
   "time.today": "Today",
   "time.yesterday": "Yesterday",
   "time.thisWeek": "This Week",
@@ -1339,7 +746,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Version Information",
   "settings.aboutKiloCode.version.label": "Version:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code Extension",
   "settings.aboutKiloCode.community": "Community & Support",
   "settings.aboutKiloCode.feedback.prefix": "If you have any questions or feedback, feel free to open an issue on",
   "settings.aboutKiloCode.feedback.or": "or",
@@ -1388,7 +794,6 @@ export const dict = {
   "settings.language.current": "Current:",
 
   "common.add": "Add",
-  "common.choose": "Choose…",
 
   "settings.autocomplete.model.title": "Autocomplete model",
   "settings.autocomplete.model.description": "Select the model used for inline code completions",
@@ -1400,28 +805,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Show autocomplete suggestions in the chat textarea",
   "settings.autocomplete.modelsHint": "To choose which model is used for autocompletions, see the Models settings.",
 
-  "settings.notifications.agent.title": "Agent Completion",
-  "settings.notifications.agent.description": "Show notification when agent completes a task",
-  "settings.notifications.permissions.title": "Permission Requests",
-  "settings.notifications.permissions.description": "Show notification on permission requests",
-  "settings.notifications.errors.title": "Errors",
-  "settings.notifications.errors.description": "Show notification on errors",
   "settings.notifications.sounds": "Sounds",
   "settings.notifications.enable.title": "Enable Sound Notifications",
   "settings.notifications.enable.description":
     "Play sounds when sessions complete, encounter an error, or need your input",
   "settings.notifications.testSound": "Test",
-  "settings.notifications.agentSound.title": "Agent Completion Sound",
-  "settings.notifications.agentSound.description": "Sound to play when agent completes",
-  "settings.notifications.permSound.title": "Permission Request Sound",
-  "settings.notifications.permSound.description": "Sound to play on permission requests",
-  "settings.notifications.errorSound.title": "Error Sound",
-  "settings.notifications.errorSound.description": "Sound to play on errors",
   "settings.notifications.sound.default": "Default",
   "settings.notifications.sound.system": "System",
   "settings.notifications.sound.description":
     "Default uses different sounds for completion, input, and errors. Other choices use one sound for every event.",
-  "settings.notifications.sound.none": "None",
 
   "settings.experimental.share.title": "Share Mode",
   "settings.experimental.share.description": "How session sharing behaves",
@@ -1442,9 +834,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Image Generation Model",
   "settings.experimental.imageGenerationModel.placeholder": "Default (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Speech to Text",
-  "settings.experimental.speechToText.description":
-    "Enable voice input in prompt fields using your Kilo account through Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Enable and sign in to the Kilo provider to use Speech to Text. Speech to Text is currently only supported through Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Speech to Text Model",
@@ -1488,15 +877,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Default Agent",
   "settings.agentBehaviour.defaultAgent.description": "Agent to use when none is specified",
   "settings.agentBehaviour.availableAgents": "Available Agents",
-  "settings.agentBehaviour.selectAgent": "Select an agent to configure…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Select an agent to configure…",
   "settings.agentBehaviour.modelOverride.title": "Model Override",
   "settings.agentBehaviour.modelOverride.description": "Override the default model for this agent",
   "settings.agentBehaviour.variantOverride.title": "Variant Override",
   "settings.agentBehaviour.variantOverride.description": "Override the model variant for this agent",
-  "settings.agentBehaviour.prompt.title": "Custom Prompt",
-  "settings.agentBehaviour.prompt.description": "Additional system prompt for this agent",
   "settings.agentBehaviour.temperature.title": "Temperature",
   "settings.agentBehaviour.temperature.description":
     "Controls how random AI responses are (0–2). Lower values (e.g. 0.2) produce focused, consistent output. Higher values (e.g. 1.0) produce more varied, creative responses. Leave empty to use the model default.",
@@ -1516,7 +900,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Discovered Skills",
   "settings.agentBehaviour.noSkillsFound":
     "No skills discovered. Add skill folder paths or URLs below to make skills available.",
-  "settings.agentBehaviour.availableModes": "Available Custom Modes",
   "settings.agentBehaviour.noAgentsFound": "No agents found.",
   "settings.agentBehaviour.removeAgent.title": "Remove agent",
   "settings.agentBehaviour.removeAgent.confirm":
@@ -1542,7 +925,6 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Command",
   "settings.agentBehaviour.mcpDetail.args": "Arguments",
   "settings.agentBehaviour.mcpDetail.env": "Environment",
-  "settings.agentBehaviour.mcpDetail.disabled": "This server is disabled.",
   "settings.agentBehaviour.editMcp": "Edit MCP Server",
   "settings.agentBehaviour.editMcp.transportLocal": "Local server (stdio transport)",
   "settings.agentBehaviour.editMcp.transportRemote": "Remote server (SSE/HTTP transport)",
@@ -1558,7 +940,6 @@ export const dict = {
   "settings.agentBehaviour.mcpBrowseMarketplace": "Browse Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "No MCP servers configured. Add MCP servers in kilo.jsonc, or ask the agent to add them for you.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Workflows are managed via workflow files in your workspace.",
   "settings.agentBehaviour.workflows.description":
     "Workflows are custom slash commands defined in your config. Type /command-name in the chat to invoke them. Commands are configured in opencode.json under the 'command' section.",
   "settings.agentBehaviour.workflows.empty":
@@ -1687,7 +1068,6 @@ export const dict = {
     "e.g. Generate commit messages in Spanish following conventional commits format. Return ONLY the commit message.",
 
   "settings.commitMessage.language.sync": "Sync with UI language",
-  "settings.commitMessage.language.title": "Language",
   "settings.commitMessage.language.description": "Choose which language to use for AI-generated commit messages:",
 
   "settings.display.username.title": "Username",
@@ -1733,11 +1113,7 @@ export const dict = {
   "settings.providers.disabled": "Disabled Providers",
   "settings.providers.disabled.description": "Providers to hide from the provider list",
   "settings.providers.disabled.enable": "Enable",
-  "settings.providers.enabled": "Enabled Providers (Allowlist)",
-  "settings.providers.enabled.description": "If set, only these providers will be available (exclusive allowlist)",
   "settings.providers.notSet": "Not set (use server default)",
-  "settings.providers.custom.note": "Add a custom provider by base URL.",
-  "settings.providers.search.placeholder": "Search providers",
   "settings.providers.select.placeholder": "Select provider...",
 
   "dialog.model.notSet": "Not set",
@@ -1780,9 +1156,7 @@ export const dict = {
   "migration.migrate.title": "Migrate Your Settings",
   "migration.migrate.subtitle": "We found settings from your previous installation. Here's what we can bring over.",
   "migration.migrate.selectLabel": "Select what to migrate",
-  "migration.migrate.cannotMigrate": "Cannot be migrated",
   "migration.migrate.chatHistory": "Chat Sessions & History",
-  "migration.migrate.chatHistoryDesc": "Incompatible with the new architecture",
   "migration.migrate.button": "Migrate Settings",
   "migration.migrate.skip": "Skip",
   "migration.migrate.keysDetected": "{{count}} keys detected",
@@ -1806,10 +1180,7 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "This removes the old settings from VS Code storage. You will not be able to re-run this migration.",
   "migration.complete.done": "Done",
-  "migration.error.sessionFailed": "Session migration failed",
   "migration.error.continue": "Continue",
-  "migration.error.action.copy": "Copy",
-  "migration.error.toast.copied": "Error copied to clipboard",
   "migration.sessionSummary.title": "Summary:",
   "migration.sessionSummary.copy": "Copy Report",
   "migration.sessionSummary.toast.copied": "Copied report",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 883d82c6de7..7981f2a5515 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Sugerido",
-  "command.category.view": "Ver",
-  "command.category.project": "Proyecto",
-  "command.category.provider": "Proveedor",
-  "command.category.server": "Servidor",
-  "command.category.session": "Sesión",
-  "command.category.theme": "Tema",
-  "command.category.language": "Idioma",
-  "command.category.file": "Archivo",
-  "command.category.context": "Contexto",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Modelo",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agente",
-  "command.category.permissions": "Permisos",
-  "command.category.workspace": "Espacio de trabajo",
 
-  "command.category.settings": "Ajustes",
-  "theme.scheme.system": "Sistema",
-  "theme.scheme.light": "Claro",
-  "theme.scheme.dark": "Oscuro",
-
-  "command.sidebar.toggle": "Alternar barra lateral",
-  "command.project.open": "Abrir proyecto",
   "command.provider.connect": "Conectar proveedor",
-  "command.server.switch": "Cambiar servidor",
-  "command.settings.open": "Abrir ajustes",
-  "command.session.previous": "Sesión anterior",
-  "command.session.next": "Siguiente sesión",
-  "command.session.previous.unseen": "Sesión no leída anterior",
-  "command.session.next.unseen": "Siguiente sesión no leída",
-  "command.session.archive": "Archivar sesión",
-
-  "command.palette": "Paleta de comandos",
-
-  "command.theme.cycle": "Alternar tema",
-  "command.theme.set": "Usar tema: {{theme}}",
-  "command.theme.scheme.cycle": "Alternar esquema de color",
-  "command.theme.scheme.set": "Usar esquema de color: {{scheme}}",
-
-  "command.language.cycle": "Alternar idioma",
-  "command.language.set": "Usar idioma: {{language}}",
 
   "command.session.new": "Nueva sesión",
-  "command.session.new.task": "Nueva tarea",
   "command.session.show.changes": "Mostrar cambios",
-  "command.file.open": "Abrir archivo",
-  "command.tab.close": "Cerrar pestaña",
-  "command.context.addSelection": "Añadir selección al contexto",
-  "command.context.addSelection.description": "Añadir las líneas seleccionadas del archivo actual",
-  "command.terminal.toggle": "Alternar terminal",
-  "command.fileTree.toggle": "Alternar árbol de archivos",
   "command.review.toggle": "Alternar revisión",
-  "command.terminal.new": "Nueva terminal",
-  "command.terminal.new.description": "Crear una nueva pestaña de terminal",
-  "command.steps.toggle": "Alternar pasos",
-  "command.steps.toggle.description": "Mostrar u ocultar pasos para el mensaje actual",
-  "command.message.previous": "Mensaje anterior",
-  "command.message.previous.description": "Ir al mensaje de usuario anterior",
-  "command.message.next": "Siguiente mensaje",
-  "command.message.next.description": "Ir al siguiente mensaje de usuario",
-  "command.model.choose": "Elegir modelo",
-  "command.model.choose.description": "Seleccionar un modelo diferente",
-  "command.mcp.toggle": "Alternar MCPs",
-  "command.mcp.toggle.description": "Alternar MCPs",
-  "command.agent.cycle": "Alternar agente",
-  "command.agent.cycle.description": "Cambiar al siguiente agente",
-  "command.agent.cycle.reverse": "Alternar agente hacia atrás",
-  "command.agent.cycle.reverse.description": "Cambiar al agente anterior",
-  "command.model.variant.cycle": "Alternar esfuerzo de pensamiento",
-  "command.model.variant.cycle.description": "Cambiar al siguiente nivel de esfuerzo",
-  "command.permissions.autoaccept.enable": "Aceptar ediciones automáticamente",
-  "command.permissions.autoaccept.disable": "Dejar de aceptar ediciones automáticamente",
-  "command.workspace.toggle": "Alternar espacios de trabajo",
-  "command.workspace.toggle.description": "Habilitar o deshabilitar varios espacios de trabajo en la barra lateral",
-  "command.session.undo": "Deshacer",
-  "command.session.undo.description": "Deshacer el último mensaje",
-  "command.session.redo": "Rehacer",
-  "command.session.redo.description": "Rehacer el último mensaje deshecho",
   "revert.banner.count_one": "{{count}} mensaje revertido",
   "revert.banner.count_other": "{{count}} mensajes revertidos",
   "revert.banner.redo": "Rehacer",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Activar instantáneas",
   "revert.disabled.agentBusy": "Espera a que el agente termine",
   "command.session.compact": "Compactar sesión",
-  "command.session.compact.description": "Resumir la sesión para reducir el tamaño del contexto",
-  "command.session.fork": "Bifurcar desde mensaje",
-  "command.session.fork.description": "Crear una nueva sesión desde un mensaje anterior",
-  "command.session.share": "Compartir sesión",
-  "command.session.share.description": "Compartir esta sesión y copiar la URL al portapapeles",
-  "command.session.unshare": "Dejar de compartir sesión",
-  "command.session.unshare.description": "Dejar de compartir esta sesión",
   "command.session.export": "Exportar transcripción de la sesión",
 
   "agentRequirements.skill.installed": "Instalada",
@@ -180,11 +100,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Esta comprobación de requisitos del agente ya no está activa.",
   "agentRequirements.error.requestFailed": "Kilo no pudo comprobar los requisitos del agente.",
 
-  "palette.search.placeholder": "Buscar archivos, comandos y sesiones",
-  "palette.empty": "No se encontraron resultados",
-  "palette.group.commands": "Comandos",
-  "palette.group.files": "Archivos",
-
   "dialog.provider.search.placeholder": "Buscar proveedores",
   "dialog.provider.empty": "No se encontraron proveedores",
   "dialog.provider.group.other": "Otro",
@@ -193,19 +108,13 @@ export const dict = {
   "dialog.model.select.title": "Seleccionar modelo",
   "dialog.model.search.placeholder": "Buscar modelos",
   "dialog.model.empty": "Sin resultados de modelos",
-  "dialog.model.manage": "Gestionar modelos",
-  "dialog.model.manage.description": "Personalizar qué modelos aparecen en el selector de modelos.",
   "dialog.model.select": "Seleccionar",
   "dialog.model.expand": "Expandir",
   "dialog.model.collapse": "Contraer",
 
-  "dialog.model.unpaid.freeModels.title": "Modelos gratuitos proporcionados por Kilo",
-  "dialog.model.unpaid.addMore.title": "Añadir más modelos de proveedores populares",
-
   "dialog.provider.viewAll": "Ver más proveedores",
 
   "provider.connect.title": "Conectar {{provider}}",
-  "provider.connect.title.anthropicProMax": "Iniciar sesión con Claude Pro/Max",
   "provider.connect.selectMethod": "Seleccionar método de inicio de sesión para {{provider}}.",
   "provider.connect.method.apiKey": "Clave API",
   "provider.connect.status.inProgress": "Autorización en progreso...",
@@ -233,13 +142,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "p. ej. my-models",
   "provider.connect.azure.baseURL.label": "URL del endpoint de Azure OpenAI",
   "provider.connect.azure.baseURL.placeholder": "p. ej. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen te da acceso a un conjunto curado de modelos fiables optimizados para agentes de programación.",
-  "provider.connect.opencodeZen.line2":
-    "Con una sola clave API obtendrás acceso a modelos como Claude, GPT, Gemini, GLM y más.",
-  "provider.connect.opencodeZen.visit.prefix": "Visita ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " para obtener tu clave API.",
   "provider.connect.oauth.code.visit.prefix": "Visita ",
   "provider.connect.oauth.code.visit.link": "este enlace",
   "provider.connect.oauth.code.visit.suffix":
@@ -247,7 +149,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "Código de autorización {{method}}",
   "provider.connect.oauth.code.placeholder": "Código de autorización",
   "provider.connect.oauth.code.required": "El código de autorización es obligatorio",
-  "provider.connect.oauth.code.invalid": "Código de autorización inválido",
   "provider.connect.oauth.auto.visit.prefix": "Visita ",
   "provider.connect.oauth.auto.visit.link": "este enlace",
   "provider.connect.oauth.auto.visit.suffix":
@@ -260,29 +161,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Los modelos de {{provider}} ya no están disponibles.",
   "model.tag.free": "Gratis",
   "model.tag.dataCollected": "Los datos pueden utilizarse para entrenamiento",
-  "model.tag.latest": "Último",
   "model.group.auto": "Modelos automáticos",
   "model.group.recommended": "Recomendado",
   "model.group.favorites": "Favoritos",
-  "model.group.collapse": "Contraer {{group}}",
-  "model.group.expand": "Expandir {{group}}",
   "model.favorite.add": "Añadir a favoritos",
   "model.favorite.remove": "Eliminar de favoritos",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "texto",
-  "model.input.image": "imagen",
-  "model.input.audio": "audio",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Permite: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Permite razonamiento",
-  "model.tooltip.reasoning.none": "Sin razonamiento",
-  "model.tooltip.context": "Límite de contexto {{limit}}",
   "model.preview.label.released": "Lanzamiento",
   "model.preview.label.input": "Entrada",
   "model.preview.label.output": "Salida",
@@ -302,11 +186,8 @@ export const dict = {
   "model.preview.modality.audio": "Audio",
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "Buscar",
   "common.goBack": "Volver",
-  "common.goForward": "Adelante",
   "common.loading": "Cargando",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Cancelar",
   "common.connect": "Conectar",
   "common.disconnect": "Desconectar",
@@ -314,54 +195,8 @@ export const dict = {
   "common.save": "Guardar",
   "common.saving": "Guardando...",
   "common.default": "Predeterminado",
-  "common.attachment": "adjunto",
 
-  "prompt.placeholder.shell": "Introduce comando de shell...",
-  "prompt.placeholder.normal": 'Pregunta cualquier cosa... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Resumir comentarios…",
-  "prompt.placeholder.summarizeComment": "Resumir comentario…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc para salir",
-
-  "prompt.example.1": "Arreglar un TODO en el código",
-  "prompt.example.2": "¿Cuál es el stack tecnológico de este proyecto?",
-  "prompt.example.3": "Arreglar pruebas rotas",
-  "prompt.example.4": "Explicar cómo funciona la autenticación",
-  "prompt.example.5": "Encontrar y arreglar vulnerabilidades de seguridad",
-  "prompt.example.6": "Añadir pruebas unitarias para el servicio de usuario",
-  "prompt.example.7": "Refactorizar esta función para que sea más legible",
-  "prompt.example.8": "¿Qué significa este error?",
-  "prompt.example.9": "Ayúdame a depurar este problema",
-  "prompt.example.10": "Generar documentación de API",
-  "prompt.example.11": "Optimizar consultas a la base de datos",
-  "prompt.example.12": "Añadir validación de entrada",
-  "prompt.example.13": "Crear un nuevo componente para...",
-  "prompt.example.14": "¿Cómo despliego este proyecto?",
-  "prompt.example.15": "Revisar mi código para mejores prácticas",
-  "prompt.example.16": "Añadir manejo de errores a esta función",
-  "prompt.example.17": "Explicar este patrón de regex",
-  "prompt.example.18": "Convertir esto a TypeScript",
-  "prompt.example.19": "Añadir logging en todo el código",
-  "prompt.example.20": "¿Qué dependencias están desactualizadas?",
-  "prompt.example.21": "Ayúdame a escribir un script de migración",
-  "prompt.example.22": "Implementar caché para este endpoint",
-  "prompt.example.23": "Añadir paginación a esta lista",
-  "prompt.example.24": "Crear un comando CLI para...",
-  "prompt.example.25": "¿Cómo funcionan las variables de entorno aquí?",
-
-  "prompt.popover.emptyResults": "Sin resultados coincidentes",
-  "prompt.popover.emptyCommands": "Sin comandos coincidentes",
-  "prompt.dropzone.label": "Suelta imágenes o PDFs aquí",
-  "prompt.slash.badge.custom": "personalizado",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "activo",
-  "prompt.context.includeActiveFile": "Incluir archivo activo",
-  "prompt.context.removeActiveFile": "Eliminar archivo activo del contexto",
-  "prompt.context.removeFile": "Eliminar archivo del contexto",
   "prompt.thinking.tooltip": "Esfuerzo de razonamiento",
-  "prompt.action.attachFile": "Adjuntar archivo",
-  "prompt.attachment.remove": "Eliminar adjunto",
   "prompt.action.send": "Enviar",
   "prompt.action.send.blocked": "Responda o descarte la pregunta pendiente primero",
   "prompt.action.send.recording": "Transcribir y enviar",
@@ -404,190 +239,17 @@ export const dict = {
   "speechToText.tooltip.error": "Falló la entrada de voz. Haz clic para borrar.",
   "speechToText.error.title": "Falló la entrada de voz",
   "speechToText.error.loginRequired": "Inicia sesión en Kilo para usar la entrada de voz.",
-  "speechToText.error.permission": "Se denegó el permiso del micrófono.",
-  "speechToText.error.microphone": "No se pudo iniciar el micrófono.",
-  "speechToText.error.recording": "La grabación falló.",
-  "speechToText.error.emptyRecording": "No se grabó ningún audio.",
   "speechToText.error.emptyTranscript": "No se detectó voz.",
-  "speechToText.error.encoding": "No se pudo codificar la grabación.",
-  "speechToText.toast.transcribed": "Transcripción insertada",
 
-  "prompt.toast.pasteUnsupported.title": "Pegado no soportado",
-  "prompt.toast.pasteUnsupported.description": "Solo se pueden pegar imágenes o PDFs aquí.",
-  "prompt.toast.modelAgentRequired.title": "Selecciona un agente y modelo",
-  "prompt.toast.modelAgentRequired.description": "Elige un agente y modelo antes de enviar un prompt.",
-  "prompt.toast.worktreeCreateFailed.title": "Fallo al crear el árbol de trabajo",
-  "prompt.toast.sessionCreateFailed.title": "Fallo al crear la sesión",
-  "prompt.toast.shellSendFailed.title": "Fallo al enviar comando de shell",
-  "prompt.toast.commandSendFailed.title": "Fallo al enviar comando",
   "prompt.toast.promptSendFailed.title": "Fallo al enviar prompt",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} de {{total}} habilitados",
-  "dialog.mcp.empty": "No hay MCPs configurados",
-
-  "dialog.lsp.empty": "LSPs detectados automáticamente por tipo de archivo",
-  "dialog.plugins.empty": "Plugins configurados en opencode.json",
-
   "mcp.status.connected": "conectado",
   "mcp.status.failed": "fallido",
   "mcp.status.needs_auth": "necesita auth",
   "mcp.status.needs_registration": "necesita registro de cliente",
   "mcp.status.disabled": "deshabilitado",
 
-  "dialog.fork.empty": "No hay mensajes desde donde bifurcar",
-
-  "dialog.directory.search.placeholder": "Buscar carpetas",
-  "dialog.directory.empty": "No se encontraron carpetas",
-
-  "dialog.server.title": "Servidores",
-  "dialog.server.description": "Cambiar a qué servidor de Kilo se conecta esta app.",
-  "dialog.server.search.placeholder": "Buscar servidores",
-  "dialog.server.empty": "No hay servidores aún",
-  "dialog.server.add.title": "Añadir un servidor",
-  "dialog.server.add.url": "URL del servidor",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "No se pudo conectar al servidor",
-  "dialog.server.add.checking": "Comprobando...",
-  "dialog.server.add.button": "Añadir servidor",
-  "dialog.server.default.title": "Servidor predeterminado",
-  "dialog.server.default.description":
-    "Conectar a este servidor al iniciar la app en lugar de iniciar un servidor local. Requiere reinicio.",
-  "dialog.server.default.none": "Ningún servidor seleccionado",
-  "dialog.server.default.set": "Establecer servidor actual como predeterminado",
-  "dialog.server.default.clear": "Limpiar",
-  "dialog.server.action.remove": "Eliminar servidor",
-
-  "dialog.server.menu.edit": "Editar",
-  "dialog.server.menu.default": "Establecer como predeterminado",
-  "dialog.server.menu.defaultRemove": "Quitar predeterminado",
-  "dialog.server.menu.delete": "Eliminar",
-  "dialog.server.current": "Servidor actual",
-  "dialog.server.status.default": "Predeterminado",
-
-  "dialog.project.edit.title": "Editar proyecto",
-  "dialog.project.edit.name": "Nombre",
-  "dialog.project.edit.icon": "Icono",
-  "dialog.project.edit.icon.alt": "Icono del proyecto",
-  "dialog.project.edit.icon.hint": "Haz clic o arrastra una imagen",
-  "dialog.project.edit.icon.recommended": "Recomendado: 128x128px",
-  "dialog.project.edit.color": "Color",
-  "dialog.project.edit.color.select": "Seleccionar color {{color}}",
-
-  "dialog.project.edit.worktree.startup": "Script de inicio del espacio de trabajo",
-  "dialog.project.edit.worktree.startup.description":
-    "Se ejecuta después de crear un nuevo espacio de trabajo (árbol de trabajo).",
-  "dialog.project.edit.worktree.startup.placeholder": "p. ej. bun install",
-  "context.breakdown.title": "Desglose de Contexto",
-  "context.breakdown.note":
-    'Desglose aproximado de tokens de entrada. "Otro" incluye definiciones de herramientas y sobrecarga.',
-  "context.breakdown.system": "Sistema",
-  "context.breakdown.user": "Usuario",
-  "context.breakdown.assistant": "Asistente",
-  "context.breakdown.tool": "Llamadas a herramientas",
-  "context.breakdown.other": "Otro",
-
-  "context.systemPrompt.title": "Prompt del Sistema",
-  "context.rawMessages.title": "Mensajes en bruto",
-
-  "context.stats.session": "Sesión",
-  "context.stats.messages": "Mensajes",
-  "context.stats.provider": "Proveedor",
-  "context.stats.model": "Modelo",
-  "context.stats.limit": "Límite de Contexto",
-  "context.stats.totalTokens": "Tokens Totales",
-  "context.stats.usage": "Uso",
-  "context.stats.inputTokens": "Tokens de Entrada",
-  "context.stats.outputTokens": "Tokens de Salida",
-  "context.stats.reasoningTokens": "Tokens de Razonamiento",
-  "context.stats.cacheTokens": "Tokens de Caché (lectura/escritura)",
-  "context.stats.userMessages": "Mensajes de Usuario",
-  "context.stats.assistantMessages": "Mensajes de Asistente",
-  "context.stats.totalCost": "Costo Total",
-  "context.stats.sessionCreated": "Sesión Creada",
-  "context.stats.lastActivity": "Última Actividad",
-
-  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Uso",
-  "context.usage.cost": "Costo",
-  "context.usage.clickToView": "Haz clic para ver contexto",
-  "context.usage.view": "Ver uso del contexto",
-
-  "toast.language.title": "Idioma",
-  "toast.language.description": "Cambiado a {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Tema cambiado",
-  "toast.scheme.title": "Esquema de color",
-
-  "toast.permissions.autoaccept.on.title": "Aceptando ediciones automáticamente",
-  "toast.permissions.autoaccept.on.description": "Los permisos de edición y escritura serán aprobados automáticamente",
-  "toast.permissions.autoaccept.off.title": "Se dejó de aceptar ediciones automáticamente",
-  "toast.permissions.autoaccept.off.description": "Los permisos de edición y escritura requerirán aprobación",
-
-  "toast.workspace.enabled.title": "Espacios de trabajo habilitados",
-  "toast.workspace.enabled.description": "Ahora se muestran varios worktrees en la barra lateral",
-  "toast.workspace.disabled.title": "Espacios de trabajo deshabilitados",
-  "toast.workspace.disabled.description": "Solo se muestra el worktree principal en la barra lateral",
-
-  "toast.model.none.title": "Ningún modelo seleccionado",
-  "toast.model.none.description": "Conecta un proveedor para resumir esta sesión",
-
-  "toast.file.loadFailed.title": "Fallo al cargar archivo",
-
-  "toast.file.listFailed.title": "Fallo al listar archivos",
-  "toast.context.noLineSelection.title": "Sin selección de líneas",
-  "toast.context.noLineSelection.description": "Primero selecciona un rango de líneas en una pestaña de archivo.",
-  "toast.session.share.copyFailed.title": "Fallo al copiar URL al portapapeles",
-  "toast.session.share.success.title": "Sesión compartida",
-  "toast.session.share.success.description": "¡URL compartida copiada al portapapeles!",
-  "toast.session.share.failed.title": "Fallo al compartir sesión",
-  "toast.session.share.failed.description": "Ocurrió un error al compartir la sesión",
-
-  "toast.session.unshare.success.title": "Sesión dejó de compartirse",
-  "toast.session.unshare.success.description": "¡La sesión dejó de compartirse exitosamente!",
-  "toast.session.unshare.failed.title": "Fallo al dejar de compartir sesión",
-  "toast.session.unshare.failed.description": "Ocurrió un error al dejar de compartir la sesión",
-
   "toast.session.rename.invalid.title": "Título de sesión no válido",
-  "toast.session.listFailed.title": "Fallo al cargar sesiones para {{project}}",
-
-  "toast.update.title": "Actualización disponible",
-  "toast.update.description": "Una nueva versión de Kilo ({{version}}) está disponible para instalar.",
-  "toast.update.action.installRestart": "Instalar y reiniciar",
-  "toast.update.action.notYet": "Todavía no",
-
-  "error.page.title": "Algo salió mal",
-  "error.page.description": "Ocurrió un error al cargar la aplicación.",
-  "error.page.details.label": "Detalles del error",
-  "error.page.action.restart": "Reiniciar",
-  "error.page.action.checking": "Comprobando...",
-  "error.page.action.checkUpdates": "Buscar actualizaciones",
-  "error.page.action.updateTo": "Actualizar a {{version}}",
-  "error.page.report.prefix": "Por favor reporta este error al equipo de Kilo",
-  "error.page.report.discord": "en Discord",
-  "error.page.version": "Versión: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Elemento raíz no encontrado. ¿Olvidaste añadirlo a tu index.html? ¿O tal vez el atributo id está mal escrito?",
-
-  "error.globalSync.connectFailed": "No se pudo conectar al servidor. ¿Hay un servidor ejecutándose en `{{url}}`?",
 
   "error.startup.title": "Error de conexión al servidor",
 
@@ -605,31 +267,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Vuelve a iniciar sesión con ChatGPT y envía tu mensaje de nuevo para seguir usando los modelos Codex.",
 
-  "error.chain.unknown": "Error desconocido",
-  "error.chain.causedBy": "Causado por:",
-  "error.chain.apiError": "Error de API",
-  "error.chain.status": "Estado: {{status}}",
-  "error.chain.retryable": "Reintentable: {{retryable}}",
-  "error.chain.responseBody": "Cuerpo de la respuesta:\n{{body}}",
-  "error.chain.didYouMean": "¿Quisiste decir: {{suggestions}}",
-  "error.chain.modelNotFound": "Modelo no encontrado: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Comprueba los nombres de proveedor/modelo en tu configuración (opencode.json)",
-  "error.chain.mcpFailed": 'El servidor MCP "{{name}}" falló. Nota, Kilo no soporta autenticación MCP todavía.',
-  "error.chain.providerAuthFailed": "Autenticación de proveedor fallida ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Fallo al inicializar proveedor "{{provider}}". Comprueba credenciales y configuración.',
-  "error.chain.configJsonInvalid": "El archivo de configuración en {{path}} no es un JSON(C) válido",
-  "error.chain.configJsonInvalidWithMessage":
-    "El archivo de configuración en {{path}} no es un JSON(C) válido: {{message}}",
-  "error.chain.configDirectoryTypo":
-    'El directorio "{{dir}}" en {{path}} no es válido. Renombra el directorio a "{{suggestion}}" o elimínalo. Esto es un error tipográfico común.',
-  "error.chain.configFrontmatterError": "Fallo al analizar frontmatter en {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "El archivo de configuración en {{path}} es inválido",
-  "error.chain.configInvalidWithMessage": "El archivo de configuración en {{path}} es inválido: {{message}}",
-
   "notification.permission.title": "Permiso requerido",
   "notification.permission.titleSubagent": "Permiso requerido (subagente)",
-  "notification.permission.description": "{{sessionTitle}} en {{projectName}} necesita permiso",
   "ui.permission.manageAutoApprove": "Gestionar reglas de aprobación automática",
   "ui.permission.doomLoop.prompt": "Se detectó un posible bucle en la herramienta {{tool}}. ¿Continuar ejecutando?",
   "ui.permission.doomLoop.rule": "Continuar llamadas a {{tool}}",
@@ -654,7 +293,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Leer Todo",
   "ui.permission.toolLabel.todoWrite": "Escribir Todo",
   "ui.permission.toolLabel.codeSearch": "Búsqueda de Código",
-  "ui.permission.toggleWrap": "Alternar ajuste de línea",
   "ui.permission.copyCommand": "Copiar",
   "ui.approval.auto": "Aprobado automáticamente",
   "ui.approval.manual": "Aprobado por ti",
@@ -666,46 +304,18 @@ export const dict = {
   "ui.approval.source.yolo": "por el modo de aprobación automática (YOLO)",
   "ui.approval.source.session": "por una regla de aprobación automática de sesión",
   "ui.approval.source.default": "de forma predeterminada",
-  "notification.question.title": "Pregunta",
-  "notification.question.description": "{{sessionTitle}} en {{projectName}} tiene una pregunta",
-  "notification.action.goToSession": "Ir a sesión",
 
-  "notification.session.responseReady.title": "Respuesta lista",
-  "notification.session.error.title": "Error de sesión",
-  "notification.session.error.fallbackDescription": "Ocurrió un error",
-
-  "home.recentProjects": "Proyectos recientes",
-  "home.empty.title": "Sin proyectos recientes",
-  "home.empty.description": "Empieza abriendo un proyecto local",
-
-  "session.tab.session": "Sesión",
   "session.tab.review": "Revisión",
-  "session.tab.context": "Contexto",
-  "session.panel.reviewAndFiles": "Revisión y archivos",
   "session.review.filesChanged": "{{count}} Archivos Cambiados",
-  "session.review.change.one": "Cambio",
   "session.review.change.other": "Cambios",
   "session.review.loadingChanges": "Cargando cambios...",
-  "session.review.empty": "No hay cambios en esta sesión aún",
   "session.review.noChanges": "Sin cambios",
-  "session.files.selectToOpen": "Selecciona un archivo para abrir",
-  "session.files.all": "Todos los archivos",
-  "session.files.binaryContent": "Archivo binario (el contenido no puede ser mostrado)",
-  "session.messages.renderEarlier": "Renderizar mensajes anteriores",
   "session.messages.loadingEarlier": "Cargando mensajes anteriores...",
   "session.messages.loadEarlier": "Cargar mensajes anteriores",
   "session.messages.loading": "Cargando mensajes...",
 
-  "session.messages.jumpToLatest": "Ir al último",
-  "session.context.addToContext": "Añadir {{selection}} al contexto",
-
-  "session.new.worktree.main": "Rama principal",
-  "session.new.worktree.mainWithBranch": "Rama principal ({{branch}})",
-  "session.new.worktree.create": "Crear nuevo árbol de trabajo",
-  "session.new.lastModified": "Última modificación",
   "sidebar.session.newSession": "Nueva Sesión",
   "sidebar.session.newSession.tooltip": "Inicia una nueva conversación manteniendo intacta la sesión actual.",
-  "sidebar.session.newSession.disabled": "Esta sesión ya es nueva. Empieza a chatear o crea un worktree en su lugar.",
   "sidebar.session.newWorktree": "Nuevo Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Crea un git worktree aislado para experimentar de forma segura, mantener los cambios separados y ejecutar sesiones paralelas sin interrumpir tu rama actual.",
@@ -721,134 +331,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Mover esta conversación y {{files}} archivos modificados a un worktree dedicado para trabajo de seguimiento aislado.",
   "sidebar.session.showChanges.tooltip.empty": "Abre la vista de cambios para inspeccionar el árbol de trabajo actual.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 archivo modificado · +{{additions}} -{{deletions}}. Abrir la vista de cambios.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} archivos modificados · +{{additions}} -{{deletions}}. Abrir la vista de cambios.",
-  "sidebar.session.agentManager.tooltip":
-    "Abre el Agent Manager para obtener una vista general completa de las sesiones paralelas y los worktrees, para que puedas coordinar tareas de larga duración en un solo lugar.",
-  "sidebar.session.openAgentManager": "Abrir Agent Manager",
   "sidebar.session.progress.capturing": "Capturando cambios...",
   "sidebar.session.progress.creating": "Creando worktree...",
   "sidebar.session.progress.setup": "Ejecutando configuración...",
   "sidebar.session.progress.transferring": "Transfiriendo cambios...",
   "sidebar.session.progress.forking": "Iniciando sesión...",
   "sidebar.session.progress.failed": "No se pudo continuar en el worktree",
-  "session.header.search.placeholder": "Buscar {{project}}",
-  "session.header.searchFiles": "Buscar archivos",
-  "session.header.openIn": "Abrir en",
-  "session.header.open.action": "Abrir {{app}}",
-  "session.header.open.ariaLabel": "Abrir en {{app}}",
-  "session.header.open.menu": "Opciones de apertura",
-  "session.header.open.copyPath": "Copiar ruta",
 
-  "status.popover.trigger": "Estado",
-  "status.popover.ariaLabel": "Configuraciones del servidor",
-  "status.popover.tab.servers": "Servidores",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Administrar servidores",
-
-  "session.share.popover.title": "Publicar en web",
-  "session.share.popover.description.shared":
-    "Esta sesión es pública en la web. Es accesible para cualquiera con el enlace.",
-  "session.share.popover.description.unshared":
-    "Compartir sesión públicamente en la web. Será accesible para cualquiera con el enlace.",
-  "session.share.action.share": "Compartir",
-  "session.share.action.publish": "Publicar",
-  "session.share.action.publishing": "Publicando...",
-  "session.share.action.unpublish": "Despublicar",
-  "session.share.action.unpublishing": "Despublicando...",
-  "session.share.action.view": "Ver",
-  "session.share.copy.copied": "Copiado",
-  "session.share.copy.copyLink": "Copiar enlace",
-
-  "lsp.tooltip.none": "Sin servidores LSP",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Cargando prompt...",
-  "terminal.loading": "Cargando terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Cerrar terminal",
-
-  "terminal.connectionLost.title": "Conexión perdida",
-  "terminal.connectionLost.description":
-    "La conexión del terminal se interrumpió. Esto puede ocurrir cuando el servidor se reinicia.",
   "common.closeTab": "Cerrar pestaña",
   "common.signIn": "Iniciar sesión",
-  "common.signOut": "Cerrar sesión",
   "common.dismiss": "Descartar",
   "common.requestFailed": "Solicitud fallida",
-  "common.moreOptions": "Más opciones",
-  "common.learnMore": "Saber más",
   "common.rename": "Renombrar",
-  "common.reset": "Restablecer",
-  "common.archive": "Archivar",
   "common.delete": "Eliminar",
   "common.close": "Cerrar",
   "common.edit": "Editar",
   "common.loadMore": "Cargar más",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "Alternar menú",
-  "sidebar.nav.projectsAndSessions": "Proyectos y sesiones",
   "sidebar.settings": "Ajustes",
-  "sidebar.help": "Ayuda",
-  "sidebar.workspaces.enable": "Habilitar espacios de trabajo",
-  "sidebar.workspaces.disable": "Deshabilitar espacios de trabajo",
-  "sidebar.gettingStarted.title": "Empezando",
-  "sidebar.gettingStarted.line1": "Kilo incluye modelos gratuitos para que puedas empezar inmediatamente.",
-  "sidebar.gettingStarted.line2": "Conecta cualquier proveedor para usar modelos, inc. Claude, GPT, Gemini etc.",
-  "sidebar.project.recentSessions": "Sesiones recientes",
-  "sidebar.project.viewAllSessions": "Ver todas las sesiones",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Escritorio",
-  "settings.section.server": "Servidor",
-  "settings.tab.general": "General",
-  "settings.tab.shortcuts": "Atajos",
-
-  "settings.general.section.appearance": "Apariencia",
-  "settings.general.section.notifications": "Notificaciones del sistema",
-  "settings.general.section.updates": "Actualizaciones",
-  "settings.general.section.sounds": "Efectos de sonido",
-
-  "settings.general.row.language.title": "Idioma",
-  "settings.general.row.language.description": "Cambiar el idioma de visualización para Kilo",
-  "settings.general.row.appearance.title": "Apariencia",
-  "settings.general.row.appearance.description": "Personaliza cómo se ve Kilo en tu dispositivo",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Personaliza el tema de Kilo.",
-  "settings.general.row.font.title": "Fuente",
-  "settings.general.row.font.description": "Personaliza la fuente mono usada en bloques de código",
-
-  "settings.general.row.releaseNotes.title": "Notas de la versión",
-  "settings.general.row.releaseNotes.description":
-    'Mostrar ventanas emergentes de "Novedades" después de las actualizaciones',
-
-  "settings.updates.row.startup.title": "Buscar actualizaciones al iniciar",
-  "settings.updates.row.startup.description": "Buscar actualizaciones automáticamente cuando se inicia Kilo",
-  "settings.updates.row.check.title": "Buscar actualizaciones",
-  "settings.updates.row.check.description": "Buscar actualizaciones manualmente e instalarlas si hay alguna",
-  "settings.updates.action.checkNow": "Buscar ahora",
-  "settings.updates.action.checking": "Buscando...",
-  "settings.updates.toast.latest.title": "Estás al día",
-  "settings.updates.toast.latest.description": "Estás usando la última versión de Kilo.",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alerta 01",
   "sound.option.alert02": "Alerta 02",
   "sound.option.alert03": "Alerta 03",
@@ -894,21 +395,6 @@ export const dict = {
   "sound.option.yup04": "Sí 04",
   "sound.option.yup05": "Sí 05",
   "sound.option.yup06": "Sí 06",
-  "settings.general.notifications.agent.title": "Agente",
-  "settings.general.notifications.agent.description":
-    "Mostrar notificación del sistema cuando el agente termine o necesite atención",
-  "settings.general.notifications.permissions.title": "Permisos",
-  "settings.general.notifications.permissions.description":
-    "Mostrar notificación del sistema cuando se requiera un permiso",
-  "settings.general.notifications.errors.title": "Errores",
-  "settings.general.notifications.errors.description": "Mostrar notificación del sistema cuando ocurra un error",
-
-  "settings.general.sounds.agent.title": "Agente",
-  "settings.general.sounds.agent.description": "Reproducir sonido cuando el agente termine o necesite atención",
-  "settings.general.sounds.permissions.title": "Permisos",
-  "settings.general.sounds.permissions.description": "Reproducir sonido cuando se requiera un permiso",
-  "settings.general.sounds.errors.title": "Errores",
-  "settings.general.sounds.errors.description": "Reproducir sonido cuando ocurra un error",
 
   "settings.indexing.title": "Indexación",
   "settings.indexing.enable.title": "Habilitar indexación",
@@ -921,8 +407,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Habilitar para este proyecto",
   "settings.indexing.projectEnable.description":
     "Habilitar la indexación para esta área de trabajo cuando la indexación global está desactivada.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "La indexación global está habilitada, por lo que este proyecto ya está cubierto.",
   "settings.indexing.provider.title": "Proveedor de embeddings",
   "settings.indexing.provider.description":
     "Elige el proveedor utilizado para generar embeddings para búsqueda semántica.",
@@ -955,33 +439,10 @@ export const dict = {
   "settings.indexing.status.title": "Estado",
   "settings.indexing.tuning.description": "Parámetro avanzado de búsqueda y procesamiento por lotes.",
 
-  "settings.shortcuts.title": "Atajos de teclado",
-  "settings.shortcuts.reset.button": "Restablecer a valores predeterminados",
-  "settings.shortcuts.reset.toast.title": "Atajos restablecidos",
-  "settings.shortcuts.reset.toast.description":
-    "Los atajos de teclado han sido restablecidos a los valores predeterminados.",
-  "settings.shortcuts.conflict.title": "Atajo ya en uso",
-  "settings.shortcuts.conflict.description": "{{keybind}} ya está asignado a {{titles}}.",
-  "settings.shortcuts.unassigned": "Sin asignar",
-  "settings.shortcuts.pressKeys": "Presiona teclas",
-  "settings.shortcuts.search.placeholder": "Buscar atajos",
-  "settings.shortcuts.search.empty": "No se encontraron atajos",
-
-  "settings.shortcuts.group.general": "General",
-  "settings.shortcuts.group.session": "Sesión",
-  "settings.shortcuts.group.navigation": "Navegación",
-  "settings.shortcuts.group.modelAndAgent": "Modelo y agente",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
-
   "settings.providers.title": "Proveedores",
-  "settings.providers.description": "La configuración de proveedores estará disponible aquí.",
-  "settings.providers.betaNotice":
-    "Actualmente, solo el proveedor Kilo Gateway se puede configurar en la interfaz de ajustes. El soporte para configurar otros proveedores llegará pronto durante el período beta. Mientras tanto, puedes configurar proveedores usando la CLI o el archivo de configuración. Estamos comprometidos a mantener Kilo abierto, sin ataduras.",
   "settings.providers.section.connected": "Proveedores conectados",
   "settings.providers.connected.empty": "No hay proveedores conectados",
   "settings.providers.section.popular": "Proveedores populares",
-  "settings.providers.search.placeholder": "Buscar proveedores",
   "settings.providers.select.placeholder": "Seleccionar proveedor...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Entorno",
@@ -1000,7 +461,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Oculta los modelos de Kilo Gateway cuyos proveedores pueden usar tus prompts para entrenamiento.",
   "settings.providers.modeModels": "Modelo por modo",
-  "settings.providers.custom.note": "Agrega un proveedor personalizado mediante URL base.",
   "settings.providers.modeModels.description":
     "Anula el modelo predeterminado para modos específicos. Si no se establece, se usa el modelo predeterminado global.",
   "provider.custom.title": "Proveedor personalizado",
@@ -1066,9 +526,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Eliminar modelo",
   "provider.custom.models.add": "Añadir modelo",
-  "provider.custom.models.fetch": "Obtener modelos",
-  "provider.custom.models.fetching": "Obteniendo\u2026",
-  "provider.custom.models.fetch.error": "Error al obtener modelos: {{error}}",
   "provider.custom.models.fetch.authError":
     "Autenticación fallida. Verifica la clave de API arriba e intenta de nuevo.",
   "provider.custom.models.fetch.empty": "No se encontraron modelos en este servidor.",
@@ -1122,23 +579,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Configuración heredada .kilocode",
   "settings.config.source.projectOpencode": "Configuración heredada .opencode",
   "settings.models.title": "Modelos",
-  "settings.models.description": "La configuración de modelos estará disponible aquí.",
-  "settings.agents.title": "Agentes",
-  "settings.agents.description": "La configuración de agentes estará disponible aquí.",
-  "settings.commands.title": "Comandos",
-  "settings.commands.description": "La configuración de comandos estará disponible aquí.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "La configuración de MCP estará disponible aquí.",
 
-  "settings.permissions.title": "Permisos",
-  "settings.permissions.description": "Controla qué herramientas puede usar el servidor por defecto.",
-  "settings.permissions.section.tools": "Herramientas",
   "settings.permissions.toast.updateFailed.title": "Fallo al actualizar permisos",
 
-  "settings.permissions.action.allow": "Permitir",
-  "settings.permissions.action.ask": "Preguntar",
-  "settings.permissions.action.deny": "Denegar",
-
   "settings.permissions.tool.read.title": "Leer",
   "settings.permissions.tool.read.description": "Leer un archivo (coincide con la ruta del archivo)",
   "settings.permissions.tool.edit.title": "Editar",
@@ -1173,7 +616,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Bucle Infinito",
   "settings.permissions.tool.doom_loop.description": "Detectar llamadas a herramientas repetidas con entrada idéntica",
 
-  "session.delete.failed.title": "Fallo al eliminar sesión",
   "session.delete.title": "Eliminar sesión",
   "session.delete.confirm": '¿Eliminar sesión "{{name}}"?',
   "session.delete.button": "Eliminar sesión",
@@ -1204,12 +646,7 @@ export const dict = {
   "workStyle.onboarding.title": "Elige cómo quieres trabajar",
   "workStyle.onboarding.settingsNote": "Puedes cambiar estas opciones en cualquier momento en",
   "workStyle.onboarding.settings": "Configuración.",
-  "workStyle.onboarding.description":
-    "Esto establece los valores iniciales de permisos, bloques de razonamiento, salida del terminal y cronología de contexto. Solo se aplica una vez y omite los ajustes que ya hayas personalizado.",
-  "workStyle.onboarding.skip": "Omitir por ahora",
   "workStyle.toast.saved.title": "Modo guardado correctamente",
-  "workStyle.toast.saved.description": "Actualiza tus preferencias cuando quieras en Configuración.",
-  "workStyle.toast.saved.action": "Ir a Configuración",
   "workStyle.choice.permissions": "Permisos",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Visibilidad",
@@ -1234,32 +671,6 @@ export const dict = {
   "session.cloud.import.legacy": "Esta parece ser una sesión heredada que ya no es compatible.",
   "session.cloud.import.failed": "Error al importar la sesión de la nube",
 
-  "workspace.new": "Nuevo espacio de trabajo",
-  "workspace.type.local": "local",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Fallo al crear espacio de trabajo",
-  "workspace.delete.failed.title": "Fallo al eliminar espacio de trabajo",
-  "workspace.resetting.title": "Restableciendo espacio de trabajo",
-  "workspace.resetting.description": "Esto puede tomar un minuto.",
-  "workspace.reset.failed.title": "Fallo al restablecer espacio de trabajo",
-  "workspace.reset.success.title": "Espacio de trabajo restablecido",
-  "workspace.reset.success.description": "El espacio de trabajo ahora coincide con la rama predeterminada.",
-  "workspace.error.stillPreparing": "El espacio de trabajo aún se está preparando",
-  "workspace.status.checking": "Comprobando cambios no fusionados...",
-  "workspace.status.error": "No se pudo verificar el estado de git.",
-  "workspace.status.clean": "No se detectaron cambios no fusionados.",
-  "workspace.status.dirty": "Cambios no fusionados detectados en este espacio de trabajo.",
-  "workspace.delete.title": "Eliminar espacio de trabajo",
-  "workspace.delete.confirm": '¿Eliminar espacio de trabajo "{{name}}"?',
-  "workspace.delete.button": "Eliminar espacio de trabajo",
-  "workspace.reset.title": "Restablecer espacio de trabajo",
-  "workspace.reset.confirm": '¿Restablecer espacio de trabajo "{{name}}"?',
-  "workspace.reset.button": "Restablecer espacio de trabajo",
-  "workspace.reset.archived.none": "No se archivarán sesiones activas.",
-  "workspace.reset.archived.one": "1 sesión será archivada.",
-  "workspace.reset.archived.many": "{{count}} sesiones serán archivadas.",
-  "workspace.reset.note": "Esto restablecerá el espacio de trabajo para coincidir con la rama predeterminada.",
-
   "deviceAuth.toast.urlCopied": "URL copiada al portapapeles",
   "deviceAuth.toast.codeCopied": "Código copiado al portapapeles",
   "deviceAuth.toast.errorCopied": "Error copiado al portapapeles",
@@ -1297,7 +708,6 @@ export const dict = {
   "profile.pass.renews": "Se renueva",
   "profile.action.logout": "Cerrar sesión",
 
-  "settings.section.configuration": "Configuración",
   "settings.agentBehaviour.title": "Comportamiento del agente",
   "settings.autoApprove.title": "Aprobación automática",
   "settings.browser.title": "Navegador",
@@ -1313,7 +723,6 @@ export const dict = {
   "settings.language.title": "Idioma",
   "settings.aboutKiloCode.title": "Acerca de Kilo Code",
 
-  "session.messages.empty": "Inicia una conversación escribiendo un mensaje a continuación.",
   "session.messages.welcome":
     "Kilo Code es un asistente de programación con IA. Pídele que cree funcionalidades, corrija errores o explique tu código.",
   "session.messages.scrollToBottom": "Desplazar al final",
@@ -1321,7 +730,6 @@ export const dict = {
   "session.messages.taskStarting": "Iniciando...",
   "session.status.writingResponse": "Escribiendo respuesta…",
   "session.status.retry": "Reintentando…",
-  "session.status.retrying": "Reintentando (intento {{ attempt }})… {{ message }}",
   "session.status.working": "Trabajando…",
   "session.status.offline": "Red desconectada — reconectando...",
   "session.outcome.incomplete": "Turno finalizado con {{count}} tareas pendientes",
@@ -1353,11 +761,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} sesiones anteriores",
   "context.stats.thisSession": "Esta sesión",
 
-  "time.justNow": "justo ahora",
-  "time.minutesAgo": "hace {{count}} min",
-  "time.hoursAgo": "hace {{count}}h",
-  "time.daysAgo": "hace {{count}}d",
-  "time.monthsAgo": "hace {{count}} meses",
   "time.today": "Hoy",
   "time.yesterday": "Ayer",
   "time.thisWeek": "Esta semana",
@@ -1373,7 +776,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Puerto:",
   "settings.aboutKiloCode.versionInfo": "Información de versión",
   "settings.aboutKiloCode.version.label": "Versión:",
-  "settings.aboutKiloCode.extensionName": "Extensión Kilo Code",
   "settings.aboutKiloCode.community": "Comunidad y soporte",
   "settings.aboutKiloCode.feedback.prefix": "Si tienes preguntas o comentarios, abre un issue en",
   "settings.aboutKiloCode.feedback.or": "o",
@@ -1425,7 +827,6 @@ export const dict = {
   "settings.language.current": "Actual:",
 
   "common.add": "Añadir",
-  "common.choose": "Elegir…",
 
   "settings.autocomplete.autoTrigger.title": "Habilitar completado en línea automático",
   "settings.autocomplete.autoTrigger.description": "Mostrar automáticamente sugerencias de completado al escribir",
@@ -1435,28 +836,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Mostrar sugerencias de autocompletado en el chat",
   "settings.autocomplete.modelsHint":
     "Para elegir qué modelo se usa para el autocompletado, consulta la configuración de Modelos.",
-  "settings.notifications.agent.title": "Finalización del agente",
-  "settings.notifications.agent.description": "Mostrar notificación cuando el agente completa una tarea",
-  "settings.notifications.permissions.title": "Solicitudes de permiso",
-  "settings.notifications.permissions.description": "Mostrar notificación en solicitudes de permiso",
-  "settings.notifications.errors.title": "Errores",
-  "settings.notifications.errors.description": "Mostrar notificación en errores",
   "settings.notifications.sounds": "Sonidos",
   "settings.notifications.enable.title": "Activar las notificaciones sonoras",
   "settings.notifications.enable.description":
     "Reproducir sonidos cuando las sesiones finalicen, se produzca un error o se requiera tu intervención",
   "settings.notifications.testSound": "Probar",
-  "settings.notifications.agentSound.title": "Sonido de finalización del agente",
-  "settings.notifications.agentSound.description": "Sonido a reproducir cuando el agente finaliza",
-  "settings.notifications.permSound.title": "Sonido de solicitud de permiso",
-  "settings.notifications.permSound.description": "Sonido a reproducir en solicitudes de permiso",
-  "settings.notifications.errorSound.title": "Sonido de error",
-  "settings.notifications.errorSound.description": "Sonido a reproducir en errores",
   "settings.notifications.sound.default": "Predeterminado",
   "settings.notifications.sound.system": "Sistema",
   "settings.notifications.sound.description":
     "La opción predeterminada utiliza sonidos diferentes para la finalización, la intervención y los errores. Las demás opciones utilizan un solo sonido para todos los eventos.",
-  "settings.notifications.sound.none": "Ninguno",
   "settings.experimental.share.title": "Modo de compartir",
   "settings.experimental.share.description": "Comportamiento de compartir sesión",
   "settings.experimental.share.manual": "Manual",
@@ -1477,9 +865,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Modelo de generación de imágenes",
   "settings.experimental.imageGenerationModel.placeholder": "Predeterminado (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Voz a texto",
-  "settings.experimental.speechToText.description":
-    "Habilita la entrada de voz en los campos de prompt usando tu cuenta de Kilo a través de Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Habilita e inicia sesión en el proveedor Kilo para usar Speech to Text. Actualmente, Speech to Text solo es compatible con Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Modelo de voz a texto",
@@ -1521,15 +906,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Agente predeterminado",
   "settings.agentBehaviour.defaultAgent.description": "Agente a usar cuando no se especifica ninguno",
   "settings.agentBehaviour.availableAgents": "Agentes disponibles",
-  "settings.agentBehaviour.selectAgent": "Seleccionar un agente para configurar…",
-  "settings.agentBehaviour.selectAgent.title": "Agente",
-  "settings.agentBehaviour.selectAgent.description": "Seleccionar un agente para configurar…",
   "settings.agentBehaviour.modelOverride.title": "Anulación de modelo",
   "settings.agentBehaviour.modelOverride.description": "Anular el modelo predeterminado para este agente",
   "settings.agentBehaviour.variantOverride.title": "Anulación de variante",
   "settings.agentBehaviour.variantOverride.description": "Anular la variante del modelo para este agente",
-  "settings.agentBehaviour.prompt.title": "Prompt personalizado",
-  "settings.agentBehaviour.prompt.description": "Prompt de sistema adicional para este agente",
   "settings.agentBehaviour.temperature.title": "Temperatura",
   "settings.agentBehaviour.temperature.description":
     "Controla el grado de aleatoriedad de las respuestas de la IA (0–2). Los valores más bajos (p. ej., 0.2) producen resultados centrados y coherentes. Los valores más altos (p. ej., 1.0) producen respuestas más variadas y creativas. Déjalo vacío para usar el valor predeterminado del modelo.",
@@ -1549,7 +929,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Habilidades descubiertas",
   "settings.agentBehaviour.noSkillsFound":
     "No se encontraron habilidades. Agregue rutas de carpetas o URLs abajo para hacer disponibles las habilidades.",
-  "settings.agentBehaviour.availableModes": "Modos personalizados disponibles",
   "settings.agentBehaviour.noAgentsFound": "No se encontraron agentes.",
   "settings.agentBehaviour.createMode": "Crear nuevo modo",
   "settings.agentBehaviour.createMode.name": "Nombre",
@@ -1634,12 +1013,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Comando",
   "settings.agentBehaviour.mcpDetail.args": "Argumentos",
   "settings.agentBehaviour.mcpDetail.env": "Entorno",
-  "settings.agentBehaviour.mcpDetail.disabled": "Este servidor está deshabilitado.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Explorar Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "No hay servidores MCP configurados. Añada servidores MCP en kilo.jsonc o pida al agente que los añada.",
-  "settings.agentBehaviour.workflowsPlaceholder":
-    "Los flujos de trabajo se gestionan mediante archivos de flujo de trabajo en su espacio de trabajo.",
   "settings.agentBehaviour.workflows.description":
     "Los flujos de trabajo son comandos de barra personalizados definidos en su configuración. Escriba /command-name en el chat para invocarlos. Los comandos se configuran en opencode.json en la sección 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1732,7 +1108,6 @@ export const dict = {
     "ej. Genera commit messages en español siguiendo el formato conventional commits. Devuelve SOLO el commit message.",
 
   "settings.commitMessage.language.sync": "Sincronización con el idioma de la interfaz de usuario",
-  "settings.commitMessage.language.title": "Idioma",
   "settings.commitMessage.language.description": "Elija qué idioma usar para los mensajes de commit generados por IA:",
 
   "settings.display.username.title": "Nombre de usuario",
@@ -1772,8 +1147,6 @@ export const dict = {
   "settings.providers.disabled": "Proveedores deshabilitados",
   "settings.providers.disabled.description": "Proveedores a ocultar de la lista de proveedores",
   "settings.providers.disabled.enable": "Habilitar",
-  "settings.providers.enabled": "Proveedores habilitados (lista blanca)",
-  "settings.providers.enabled.description": "Si se establece, solo estos proveedores estarán disponibles",
   "settings.providers.notSet": "No establecido (usar predeterminado del servidor)",
   "dialog.model.notSet": "No establecido",
   "profile.personalAccount": "Cuenta personal",
@@ -1815,9 +1188,7 @@ export const dict = {
   "migration.migrate.subtitle":
     "Encontramos configuraciones de tu instalación anterior. Esto es lo que podemos transferir.",
   "migration.migrate.selectLabel": "Selecciona qué migrar",
-  "migration.migrate.cannotMigrate": "No se puede migrar",
   "migration.migrate.chatHistory": "Sesiones de chat e historial",
-  "migration.migrate.chatHistoryDesc": "Incompatible con la nueva arquitectura",
   "migration.migrate.button": "Migrar configuración",
   "migration.migrate.skip": "Omitir",
   "migration.migrate.keysDetected": "{{count}} claves detectadas",
@@ -1841,10 +1212,7 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Esto elimina la configuración antigua del almacenamiento de VS Code. No podrás volver a ejecutar esta migración.",
   "migration.complete.done": "Hecho",
-  "migration.error.sessionFailed": "La migración de la sesión falló",
   "migration.error.continue": "Continuar",
-  "migration.error.action.copy": "Copiar",
-  "migration.error.toast.copied": "Error copiado al portapapeles",
   "migration.sessionSummary.title": "Resumen:",
   "migration.sessionSummary.copy": "Copiar informe",
   "migration.sessionSummary.toast.copied": "Informe copiado",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index a73141d0f63..451b0a1bc66 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -53,86 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Suggéré",
-  "command.category.view": "Affichage",
-  "command.category.project": "Projet",
-  "command.category.provider": "Fournisseur",
-  "command.category.server": "Serveur",
-  "command.category.session": "Session",
-  "command.category.theme": "Thème",
-  "command.category.language": "Langue",
-  "command.category.file": "Fichier",
-  "command.category.context": "Contexte",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Modèle",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Autorisations",
-  "command.category.workspace": "Espace de travail",
 
-  "command.category.settings": "Paramètres",
-  "theme.scheme.system": "Système",
-  "theme.scheme.light": "Clair",
-  "theme.scheme.dark": "Sombre",
-
-  "command.sidebar.toggle": "Basculer la barre latérale",
-  "command.project.open": "Ouvrir un projet",
   "command.provider.connect": "Connecter un fournisseur",
-  "command.server.switch": "Changer de serveur",
-  "command.settings.open": "Ouvrir les paramètres",
-  "command.session.previous": "Session précédente",
-  "command.session.next": "Session suivante",
-  "command.session.previous.unseen": "Session non lue précédente",
-  "command.session.next.unseen": "Session non lue suivante",
-  "command.session.archive": "Archiver la session",
-
-  "command.palette": "Palette de commandes",
-
-  "command.theme.cycle": "Changer de thème",
-  "command.theme.set": "Utiliser le thème : {{theme}}",
-  "command.theme.scheme.cycle": "Changer de schéma de couleurs",
-  "command.theme.scheme.set": "Utiliser le schéma de couleurs : {{scheme}}",
-
-  "command.language.cycle": "Changer de langue",
-  "command.language.set": "Utiliser la langue : {{language}}",
 
   "command.session.new": "Nouvelle session",
-  "command.session.new.task": "Nouvelle tâche",
   "command.session.show.changes": "Afficher les modifications",
-  "command.file.open": "Ouvrir un fichier",
-  "command.tab.close": "Fermer l'onglet",
-  "command.context.addSelection": "Ajouter la sélection au contexte",
-  "command.context.addSelection.description": "Ajouter les lignes sélectionnées du fichier actuel",
-  "command.terminal.toggle": "Basculer le terminal",
-  "command.fileTree.toggle": "Basculer l'arborescence des fichiers",
   "command.review.toggle": "Basculer la revue",
-  "command.terminal.new": "Nouveau terminal",
-  "command.terminal.new.description": "Créer un nouvel onglet de terminal",
-  "command.steps.toggle": "Basculer les étapes",
-  "command.steps.toggle.description": "Afficher ou masquer les étapes du message actuel",
-  "command.message.previous": "Message précédent",
-  "command.message.previous.description": "Aller au message utilisateur précédent",
-  "command.message.next": "Message suivant",
-  "command.message.next.description": "Aller au message utilisateur suivant",
-  "command.model.choose": "Choisir le modèle",
-  "command.model.choose.description": "Sélectionner un modèle différent",
-  "command.mcp.toggle": "Basculer MCP",
-  "command.mcp.toggle.description": "Basculer les MCPs",
-  "command.agent.cycle": "Changer d'agent",
-  "command.agent.cycle.description": "Passer à l'agent suivant",
-  "command.agent.cycle.reverse": "Changer d'agent (inverse)",
-  "command.agent.cycle.reverse.description": "Passer à l'agent précédent",
-  "command.model.variant.cycle": "Changer l'effort de réflexion",
-  "command.model.variant.cycle.description": "Passer au niveau d'effort suivant",
-  "command.permissions.autoaccept.enable": "Accepter automatiquement les modifications",
-  "command.permissions.autoaccept.disable": "Arrêter l'acceptation automatique des modifications",
-  "command.workspace.toggle": "Basculer les espaces de travail",
-  "command.workspace.toggle.description":
-    "Activer ou désactiver les espaces de travail multiples dans la barre latérale",
-  "command.session.undo": "Annuler",
-  "command.session.undo.description": "Annuler le dernier message",
-  "command.session.redo": "Rétablir",
-  "command.session.redo.description": "Rétablir le dernier message annulé",
   "revert.banner.count_one": "{{count}} message annulé",
   "revert.banner.count_other": "{{count}} messages annulés",
   "revert.banner.redo": "Rétablir",
@@ -147,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Activer les instantanés",
   "revert.disabled.agentBusy": "Attendre la fin de l'agent",
   "command.session.compact": "Compacter la session",
-  "command.session.compact.description": "Résumer la session pour réduire la taille du contexte",
-  "command.session.fork": "Bifurquer à partir du message",
-  "command.session.fork.description": "Créer une nouvelle session à partir d'un message précédent",
-  "command.session.share": "Partager la session",
-  "command.session.share.description": "Partager cette session et copier l'URL dans le presse-papiers",
-  "command.session.unshare": "Ne plus partager la session",
-  "command.session.unshare.description": "Arrêter de partager cette session",
   "command.session.export": "Exporter la transcription de la session",
 
   "agentRequirements.skill.installed": "Installée",
@@ -180,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Cette vérification des prérequis de l’agent n’est plus active.",
   "agentRequirements.error.requestFailed": "Kilo n’a pas pu vérifier les prérequis de l’agent.",
 
-  "palette.search.placeholder": "Rechercher des fichiers, des commandes et des sessions",
-  "palette.empty": "Aucun résultat trouvé",
-  "palette.group.commands": "Commandes",
-  "palette.group.files": "Fichiers",
-
   "dialog.provider.search.placeholder": "Rechercher des fournisseurs",
   "dialog.provider.empty": "Aucun fournisseur trouvé",
   "dialog.provider.group.other": "Autre",
@@ -193,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Sélectionner un modèle",
   "dialog.model.search.placeholder": "Rechercher des modèles",
   "dialog.model.empty": "Aucun résultat de modèle",
-  "dialog.model.manage": "Gérer les modèles",
-  "dialog.model.manage.description": "Personnalisez les modèles qui apparaissent dans le sélecteur.",
   "dialog.model.select": "Sélectionner",
   "dialog.model.expand": "Développer",
   "dialog.model.collapse": "Réduire",
 
-  "dialog.model.unpaid.freeModels.title": "Modèles gratuits fournis par Kilo",
-  "dialog.model.unpaid.addMore.title": "Ajouter plus de modèles de fournisseurs populaires",
-
   "dialog.provider.viewAll": "Voir plus de fournisseurs",
 
   "provider.connect.title": "Connecter {{provider}}",
-  "provider.connect.title.anthropicProMax": "Connexion avec Claude Pro/Max",
   "provider.connect.selectMethod": "Sélectionnez la méthode de connexion pour {{provider}}.",
   "provider.connect.method.apiKey": "Clé API",
   "provider.connect.status.inProgress": "Autorisation en cours...",
@@ -233,13 +141,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "ex. my-models",
   "provider.connect.azure.baseURL.label": "URL du point de terminaison Azure OpenAI",
   "provider.connect.azure.baseURL.placeholder": "ex. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen vous donne accès à un ensemble sélectionné de modèles fiables et optimisés pour les agents de codage.",
-  "provider.connect.opencodeZen.line2":
-    "Avec une seule clé API, vous aurez accès à des modèles tels que Claude, GPT, Gemini, GLM et plus encore.",
-  "provider.connect.opencodeZen.visit.prefix": "Visitez ",
-  "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " pour récupérer votre clé API.",
   "provider.connect.oauth.code.visit.prefix": "Visitez ",
   "provider.connect.oauth.code.visit.link": "ce lien",
   "provider.connect.oauth.code.visit.suffix":
@@ -247,7 +148,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "Code d'autorisation {{method}}",
   "provider.connect.oauth.code.placeholder": "Code d'autorisation",
   "provider.connect.oauth.code.required": "Le code d'autorisation est requis",
-  "provider.connect.oauth.code.invalid": "Code d'autorisation invalide",
   "provider.connect.oauth.auto.visit.prefix": "Visitez ",
   "provider.connect.oauth.auto.visit.link": "ce lien",
   "provider.connect.oauth.auto.visit.suffix":
@@ -260,29 +160,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Les modèles {{provider}} ne sont plus disponibles.",
   "model.tag.free": "Gratuit",
   "model.tag.dataCollected": "Les données peuvent être utilisées pour l’entraînement",
-  "model.tag.latest": "Dernier",
   "model.group.auto": "Modèles automatiques",
   "model.group.recommended": "Recommandé",
   "model.group.favorites": "Favoris",
-  "model.group.collapse": "Réduire {{group}}",
-  "model.group.expand": "Développer {{group}}",
   "model.favorite.add": "Ajouter aux favoris",
   "model.favorite.remove": "Retirer des favoris",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "texte",
-  "model.input.image": "image",
-  "model.input.audio": "audio",
-  "model.input.video": "vidéo",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Autorise : {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Autorise le raisonnement",
-  "model.tooltip.reasoning.none": "Sans raisonnement",
-  "model.tooltip.context": "Limite de contexte {{limit}}",
   "model.preview.label.released": "Sortie",
   "model.preview.label.input": "Entrée",
   "model.preview.label.output": "Sortie",
@@ -302,11 +185,8 @@ export const dict = {
   "model.preview.modality.audio": "Audio",
   "model.preview.modality.video": "Vidéo",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "Rechercher",
   "common.goBack": "Retour",
-  "common.goForward": "Suivant",
   "common.loading": "Chargement",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Annuler",
   "common.connect": "Connecter",
   "common.disconnect": "Déconnecter",
@@ -314,54 +194,8 @@ export const dict = {
   "common.save": "Enregistrer",
   "common.saving": "Enregistrement...",
   "common.default": "Défaut",
-  "common.attachment": "pièce jointe",
 
-  "prompt.placeholder.shell": "Entrez une commande shell...",
-  "prompt.placeholder.normal": 'Demandez n\'importe quoi... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Résumer les commentaires…",
-  "prompt.placeholder.summarizeComment": "Résumer le commentaire…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc pour quitter",
-
-  "prompt.example.1": "Corriger un TODO dans la base de code",
-  "prompt.example.2": "Quelle est la pile technique de ce projet ?",
-  "prompt.example.3": "Réparer les tests échoués",
-  "prompt.example.4": "Expliquer comment fonctionne l'authentification",
-  "prompt.example.5": "Trouver et corriger les vulnérabilités de sécurité",
-  "prompt.example.6": "Ajouter des tests unitaires pour le service utilisateur",
-  "prompt.example.7": "Refactoriser cette fonction pour être plus lisible",
-  "prompt.example.8": "Que signifie cette erreur ?",
-  "prompt.example.9": "Aidez-moi à déboguer ce problème",
-  "prompt.example.10": "Générer la documentation de l'API",
-  "prompt.example.11": "Optimiser les requêtes de base de données",
-  "prompt.example.12": "Ajouter une validation d'entrée",
-  "prompt.example.13": "Créer un nouveau composant pour...",
-  "prompt.example.14": "Comment déployer ce projet ?",
-  "prompt.example.15": "Vérifier mon code pour les meilleures pratiques",
-  "prompt.example.16": "Ajouter la gestion des erreurs à cette fonction",
-  "prompt.example.17": "Expliquer ce modèle regex",
-  "prompt.example.18": "Convertir ceci en TypeScript",
-  "prompt.example.19": "Ajouter des logs dans toute la base de code",
-  "prompt.example.20": "Quelles dépendances sont obsolètes ?",
-  "prompt.example.21": "Aidez-moi à écrire un script de migration",
-  "prompt.example.22": "Implémenter la mise en cache pour ce point de terminaison",
-  "prompt.example.23": "Ajouter la pagination à cette liste",
-  "prompt.example.24": "Créer une commande CLI pour...",
-  "prompt.example.25": "Comment fonctionnent les variables d'environnement ici ?",
-
-  "prompt.popover.emptyResults": "Aucun résultat correspondant",
-  "prompt.popover.emptyCommands": "Aucune commande correspondante",
-  "prompt.dropzone.label": "Déposez des images ou des PDF ici",
-  "prompt.slash.badge.custom": "personnalisé",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "actif",
-  "prompt.context.includeActiveFile": "Inclure le fichier actif",
-  "prompt.context.removeActiveFile": "Retirer le fichier actif du contexte",
-  "prompt.context.removeFile": "Retirer le fichier du contexte",
   "prompt.thinking.tooltip": "Effort de raisonnement",
-  "prompt.action.attachFile": "Joindre un fichier",
-  "prompt.attachment.remove": "Supprimer la pièce jointe",
   "prompt.action.send": "Envoyer",
   "prompt.action.send.blocked": "Répondez ou rejetez d'abord la question en attente",
   "prompt.action.send.recording": "Transcrire et envoyer",
@@ -404,193 +238,17 @@ export const dict = {
   "speechToText.tooltip.error": "La saisie vocale a échoué. Cliquez pour effacer.",
   "speechToText.error.title": "La saisie vocale a échoué",
   "speechToText.error.loginRequired": "Connectez-vous à Kilo pour utiliser la saisie vocale.",
-  "speechToText.error.permission": "L'autorisation du microphone a été refusée.",
-  "speechToText.error.microphone": "Impossible de démarrer le microphone.",
-  "speechToText.error.recording": "L'enregistrement a échoué.",
-  "speechToText.error.emptyRecording": "Aucun son n'a été enregistré.",
   "speechToText.error.emptyTranscript": "Aucune voix n'a été détectée.",
-  "speechToText.error.encoding": "Impossible d'encoder l'enregistrement.",
-  "speechToText.toast.transcribed": "Transcription insérée",
 
-  "prompt.toast.pasteUnsupported.title": "Collage non supporté",
-  "prompt.toast.pasteUnsupported.description": "Seules les images ou les PDF peuvent être collés ici.",
-  "prompt.toast.modelAgentRequired.title": "Sélectionnez un agent et un modèle",
-  "prompt.toast.modelAgentRequired.description": "Choisissez un agent et un modèle avant d'envoyer un message.",
-  "prompt.toast.worktreeCreateFailed.title": "Échec de la création de l'arbre de travail",
-  "prompt.toast.sessionCreateFailed.title": "Échec de la création de la session",
-  "prompt.toast.shellSendFailed.title": "Échec de l'envoi de la commande shell",
-  "prompt.toast.commandSendFailed.title": "Échec de l'envoi de la commande",
   "prompt.toast.promptSendFailed.title": "Échec de l'envoi du message",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} sur {{total}} activés",
-  "dialog.mcp.empty": "Aucun MCP configuré",
-
-  "dialog.lsp.empty": "LSPs détectés automatiquement par type de fichier",
-  "dialog.plugins.empty": "Plugins configurés dans opencode.json",
-
   "mcp.status.connected": "connecté",
   "mcp.status.failed": "échoué",
   "mcp.status.needs_auth": "nécessite auth",
   "mcp.status.needs_registration": "nécessite enregistrement client",
   "mcp.status.disabled": "désactivé",
 
-  "dialog.fork.empty": "Aucun message à partir duquel bifurquer",
-
-  "dialog.directory.search.placeholder": "Rechercher des dossiers",
-  "dialog.directory.empty": "Aucun dossier trouvé",
-
-  "dialog.server.title": "Serveurs",
-  "dialog.server.description": "Changez le serveur Kilo auquel cette application se connecte.",
-  "dialog.server.search.placeholder": "Rechercher des serveurs",
-  "dialog.server.empty": "Aucun serveur pour l'instant",
-  "dialog.server.add.title": "Ajouter un serveur",
-  "dialog.server.add.url": "URL du serveur",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Impossible de se connecter au serveur",
-  "dialog.server.add.checking": "Vérification...",
-  "dialog.server.add.button": "Ajouter un serveur",
-  "dialog.server.default.title": "Serveur par défaut",
-  "dialog.server.default.description":
-    "Se connecter à ce serveur au lancement de l'application au lieu de démarrer un serveur local. Nécessite un redémarrage.",
-  "dialog.server.default.none": "Aucun serveur sélectionné",
-  "dialog.server.default.set": "Définir le serveur actuel comme défaut",
-  "dialog.server.default.clear": "Effacer",
-  "dialog.server.action.remove": "Supprimer le serveur",
-
-  "dialog.server.menu.edit": "Modifier",
-  "dialog.server.menu.default": "Définir par défaut",
-  "dialog.server.menu.defaultRemove": "Supprimer par défaut",
-  "dialog.server.menu.delete": "Supprimer",
-  "dialog.server.current": "Serveur actuel",
-  "dialog.server.status.default": "Défaut",
-
-  "dialog.project.edit.title": "Modifier le projet",
-  "dialog.project.edit.name": "Nom",
-  "dialog.project.edit.icon": "Icône",
-  "dialog.project.edit.icon.alt": "Icône du projet",
-  "dialog.project.edit.icon.hint": "Cliquez ou faites glisser une image",
-  "dialog.project.edit.icon.recommended": "Recommandé : 128x128px",
-  "dialog.project.edit.color": "Couleur",
-  "dialog.project.edit.color.select": "Sélectionner la couleur {{color}}",
-
-  "dialog.project.edit.worktree.startup": "Script de démarrage de l'espace de travail",
-  "dialog.project.edit.worktree.startup.description":
-    "S'exécute après la création d'un nouvel espace de travail (arbre de travail).",
-  "dialog.project.edit.worktree.startup.placeholder": "p. ex. bun install",
-  "context.breakdown.title": "Répartition du contexte",
-  "context.breakdown.note":
-    "Répartition approximative des jetons d'entrée. \"Autre\" inclut les définitions d'outils et les frais généraux.",
-  "context.breakdown.system": "Système",
-  "context.breakdown.user": "Utilisateur",
-  "context.breakdown.assistant": "Assistant",
-  "context.breakdown.tool": "Appels d'outils",
-  "context.breakdown.other": "Autre",
-
-  "context.systemPrompt.title": "Prompt système",
-  "context.rawMessages.title": "Messages bruts",
-
-  "context.stats.session": "Session",
-  "context.stats.messages": "Messages",
-  "context.stats.provider": "Fournisseur",
-  "context.stats.model": "Modèle",
-  "context.stats.limit": "Limite de contexte",
-  "context.stats.totalTokens": "Total des jetons",
-  "context.stats.usage": "Utilisation",
-  "context.stats.inputTokens": "Jetons d'entrée",
-  "context.stats.outputTokens": "Jetons de sortie",
-  "context.stats.reasoningTokens": "Jetons de raisonnement",
-  "context.stats.cacheTokens": "Jetons de cache (lecture/écriture)",
-  "context.stats.userMessages": "Messages utilisateur",
-  "context.stats.assistantMessages": "Messages assistant",
-  "context.stats.totalCost": "Coût total",
-  "context.stats.sessionCreated": "Session créée",
-  "context.stats.lastActivity": "Dernière activité",
-
-  "context.usage.tokens": "Jetons",
-  "context.usage.usage": "Utilisation",
-  "context.usage.cost": "Coût",
-  "context.usage.clickToView": "Cliquez pour voir le contexte",
-  "context.usage.view": "Voir l'utilisation du contexte",
-
-  "toast.language.title": "Langue",
-  "toast.language.description": "Passé à {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Thème changé",
-  "toast.scheme.title": "Schéma de couleurs",
-
-  "toast.permissions.autoaccept.on.title": "Acceptation auto des modifications",
-  "toast.permissions.autoaccept.on.description":
-    "Les permissions de modification et d'écriture seront automatiquement approuvées",
-  "toast.permissions.autoaccept.off.title": "Arrêt acceptation auto des modifications",
-  "toast.permissions.autoaccept.off.description":
-    "Les permissions de modification et d'écriture nécessiteront une approbation",
-
-  "toast.workspace.enabled.title": "Espaces de travail activés",
-  "toast.workspace.enabled.description": "Plusieurs worktrees sont désormais affichés dans la barre latérale",
-  "toast.workspace.disabled.title": "Espaces de travail désactivés",
-  "toast.workspace.disabled.description": "Seul le worktree principal est affiché dans la barre latérale",
-
-  "toast.model.none.title": "Aucun modèle sélectionné",
-  "toast.model.none.description": "Connectez un fournisseur pour résumer cette session",
-
-  "toast.file.loadFailed.title": "Échec du chargement du fichier",
-
-  "toast.file.listFailed.title": "Échec de la liste des fichiers",
-  "toast.context.noLineSelection.title": "Aucune sélection de lignes",
-  "toast.context.noLineSelection.description": "Sélectionnez d'abord une plage de lignes dans un onglet de fichier.",
-  "toast.session.share.copyFailed.title": "Échec de la copie de l'URL dans le presse-papiers",
-  "toast.session.share.success.title": "Session partagée",
-  "toast.session.share.success.description": "URL de partage copiée dans le presse-papiers !",
-  "toast.session.share.failed.title": "Échec du partage de la session",
-  "toast.session.share.failed.description": "Une erreur s'est produite lors du partage de la session",
-
-  "toast.session.unshare.success.title": "Session non partagée",
-  "toast.session.unshare.success.description": "Session non partagée avec succès !",
-  "toast.session.unshare.failed.title": "Échec de l'annulation du partage",
-  "toast.session.unshare.failed.description": "Une erreur s'est produite lors de l'annulation du partage de la session",
-
   "toast.session.rename.invalid.title": "Titre de session non valide",
-  "toast.session.listFailed.title": "Échec du chargement des sessions pour {{project}}",
-
-  "toast.update.title": "Mise à jour disponible",
-  "toast.update.description": "Une nouvelle version d'Kilo ({{version}}) est maintenant disponible pour installation.",
-  "toast.update.action.installRestart": "Installer et redémarrer",
-  "toast.update.action.notYet": "Pas encore",
-
-  "error.page.title": "Quelque chose s'est mal passé",
-  "error.page.description": "Une erreur s'est produite lors du chargement de l'application.",
-  "error.page.details.label": "Détails de l'erreur",
-  "error.page.action.restart": "Redémarrer",
-  "error.page.action.checking": "Vérification...",
-  "error.page.action.checkUpdates": "Vérifier les mises à jour",
-  "error.page.action.updateTo": "Mettre à jour vers {{version}}",
-  "error.page.report.prefix": "Veuillez signaler cette erreur à l'équipe Kilo",
-  "error.page.report.discord": "sur Discord",
-  "error.page.version": "Version : {{version}}",
-
-  "error.dev.rootNotFound":
-    "Élément racine introuvable. Avez-vous oublié de l'ajouter à votre index.html ? Ou peut-être que l'attribut id est mal orthographié ?",
-
-  "error.globalSync.connectFailed":
-    "Impossible de se connecter au serveur. Y a-t-il un serveur en cours d'exécution à `{{url}}` ?",
 
   "error.startup.title": "Échec de la connexion au serveur",
 
@@ -608,32 +266,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Reconnectez-vous à ChatGPT, puis renvoyez votre message pour continuer à utiliser les modèles Codex.",
 
-  "error.chain.unknown": "Erreur inconnue",
-  "error.chain.causedBy": "Causé par :",
-  "error.chain.apiError": "Erreur API",
-  "error.chain.status": "Statut : {{status}}",
-  "error.chain.retryable": "Réessayable : {{retryable}}",
-  "error.chain.responseBody": "Corps de la réponse :\n{{body}}",
-  "error.chain.didYouMean": "Vouliez-vous dire : {{suggestions}}",
-  "error.chain.modelNotFound": "Modèle introuvable : {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Vérifiez votre configuration (opencode.json) pour les noms de fournisseur/modèle",
-  "error.chain.mcpFailed":
-    "Le serveur MCP \"{{name}}\" a échoué. Notez qu'Kilo ne supporte pas encore l'authentification MCP.",
-  "error.chain.providerAuthFailed": "Échec de l'authentification du fournisseur ({{provider}}) : {{message}}",
-  "error.chain.providerInitFailed":
-    'Échec de l\'initialisation du fournisseur "{{provider}}". Vérifiez les identifiants et la configuration.',
-  "error.chain.configJsonInvalid": "Le fichier de configuration à {{path}} n'est pas un JSON(C) valide",
-  "error.chain.configJsonInvalidWithMessage":
-    "Le fichier de configuration à {{path}} n'est pas un JSON(C) valide : {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Le répertoire "{{dir}}" dans {{path}} n\'est pas valide. Renommez le répertoire en "{{suggestion}}" ou supprimez-le. C\'est une faute de frappe courante.',
-  "error.chain.configFrontmatterError": "Échec de l'analyse du frontmatter dans {{path}} :\n{{message}}",
-  "error.chain.configInvalid": "Le fichier de configuration à {{path}} est invalide",
-  "error.chain.configInvalidWithMessage": "Le fichier de configuration à {{path}} est invalide : {{message}}",
-
   "notification.permission.title": "Permission requise",
   "notification.permission.titleSubagent": "Permission requise (sous-agent)",
-  "notification.permission.description": "{{sessionTitle}} dans {{projectName}} a besoin d'une permission",
   "ui.permission.manageAutoApprove": "Gérer les règles d'approbation automatique",
   "ui.permission.doomLoop.prompt": "Boucle potentielle détectée pour l’outil {{tool}}. Continuer l’exécution ?",
   "ui.permission.doomLoop.rule": "Continuer les appels à {{tool}}",
@@ -658,7 +292,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Lire Todo",
   "ui.permission.toolLabel.todoWrite": "Écrire Todo",
   "ui.permission.toolLabel.codeSearch": "Recherche de code",
-  "ui.permission.toggleWrap": "Basculer le retour à la ligne",
   "ui.permission.copyCommand": "Copier",
   "ui.approval.auto": "Approuvé automatiquement",
   "ui.approval.manual": "Approuvé par vous",
@@ -670,48 +303,19 @@ export const dict = {
   "ui.approval.source.yolo": "par le mode d'approbation automatique (YOLO)",
   "ui.approval.source.session": "par une règle d'approbation automatique de session",
   "ui.approval.source.default": "par défaut",
-  "notification.question.title": "Question",
-  "notification.question.description": "{{sessionTitle}} dans {{projectName}} a une question",
-  "notification.action.goToSession": "Aller à la session",
 
-  "notification.session.responseReady.title": "Réponse prête",
-  "notification.session.error.title": "Erreur de session",
-  "notification.session.error.fallbackDescription": "Une erreur s'est produite",
-
-  "home.recentProjects": "Projets récents",
-  "home.empty.title": "Aucun projet récent",
-  "home.empty.description": "Commencez par ouvrir un projet local",
-
-  "session.tab.session": "Session",
   "session.tab.review": "Revue",
-  "session.tab.context": "Contexte",
-  "session.panel.reviewAndFiles": "Revue et fichiers",
   "session.review.filesChanged": "{{count}} fichiers modifiés",
-  "session.review.change.one": "Modification",
   "session.review.change.other": "Modifications",
   "session.review.loadingChanges": "Chargement des modifications...",
-  "session.review.empty": "Aucune modification dans cette session pour l'instant",
   "session.review.noChanges": "Aucune modification",
-  "session.files.selectToOpen": "Sélectionnez un fichier à ouvrir",
-  "session.files.all": "Tous les fichiers",
-  "session.files.binaryContent": "Fichier binaire (le contenu ne peut pas être affiché)",
-  "session.messages.renderEarlier": "Afficher les messages précédents",
   "session.messages.loadingEarlier": "Chargement des messages précédents...",
   "session.messages.loadEarlier": "Charger les messages précédents",
   "session.messages.loading": "Chargement des messages...",
 
-  "session.messages.jumpToLatest": "Aller au dernier",
-  "session.context.addToContext": "Ajouter {{selection}} au contexte",
-
-  "session.new.worktree.main": "Branche principale",
-  "session.new.worktree.mainWithBranch": "Branche principale ({{branch}})",
-  "session.new.worktree.create": "Créer un nouvel arbre de travail",
-  "session.new.lastModified": "Dernière modification",
   "sidebar.session.newSession": "Nouvelle Session",
   "sidebar.session.newSession.tooltip":
     "Démarrer une nouvelle conversation tout en gardant la session actuelle intacte.",
-  "sidebar.session.newSession.disabled":
-    "Cette session est déjà nouvelle. Commencez à discuter ou créez plutôt un worktree.",
   "sidebar.session.newWorktree": "Nouveau Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Créer un git worktree isolé pour expérimenter en toute sécurité, séparer les modifications et exécuter des sessions parallèles sans perturber votre branche actuelle.",
@@ -728,112 +332,24 @@ export const dict = {
     "Déplacer cette conversation et {{files}} fichiers modifiés vers un worktree dédié pour un travail de suivi isolé.",
   "sidebar.session.showChanges.tooltip.empty":
     "Ouvrez la vue des modifications pour inspecter l'arborescence de travail actuelle.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 fichier modifié · +{{additions}} -{{deletions}}. Ouvrir la vue des modifications.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} fichiers modifiés · +{{additions}} -{{deletions}}. Ouvrir la vue des modifications.",
-  "sidebar.session.agentManager.tooltip":
-    "Ouvrez Agent Manager pour une vue d'ensemble complète des sessions parallèles et des worktrees, afin de coordonner les tâches longues en un seul endroit.",
-  "sidebar.session.openAgentManager": "Ouvrir Agent Manager",
   "sidebar.session.progress.capturing": "Capture des modifications...",
   "sidebar.session.progress.creating": "Création du worktree...",
   "sidebar.session.progress.setup": "Exécution de la configuration...",
   "sidebar.session.progress.transferring": "Transfert des modifications...",
   "sidebar.session.progress.forking": "Démarrage de la session...",
   "sidebar.session.progress.failed": "Échec de la poursuite dans le worktree",
-  "session.header.search.placeholder": "Rechercher {{project}}",
-  "session.header.searchFiles": "Rechercher des fichiers",
-  "session.header.openIn": "Ouvrir dans",
-  "session.header.open.action": "Ouvrir {{app}}",
-  "session.header.open.ariaLabel": "Ouvrir dans {{app}}",
-  "session.header.open.menu": "Options d'ouverture",
-  "session.header.open.copyPath": "Copier le chemin",
 
-  "status.popover.trigger": "Statut",
-  "status.popover.ariaLabel": "Configurations des serveurs",
-  "status.popover.tab.servers": "Serveurs",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Gérer les serveurs",
-
-  "session.share.popover.title": "Publier sur le web",
-  "session.share.popover.description.shared":
-    "Cette session est publique sur le web. Elle est accessible à toute personne disposant du lien.",
-  "session.share.popover.description.unshared":
-    "Partager la session publiquement sur le web. Elle sera accessible à toute personne disposant du lien.",
-  "session.share.action.share": "Partager",
-  "session.share.action.publish": "Publier",
-  "session.share.action.publishing": "Publication...",
-  "session.share.action.unpublish": "Dépublier",
-  "session.share.action.unpublishing": "Dépublication...",
-  "session.share.action.view": "Voir",
-  "session.share.copy.copied": "Copié",
-  "session.share.copy.copyLink": "Copier le lien",
-
-  "lsp.tooltip.none": "Aucun serveur LSP",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Chargement du prompt...",
-  "terminal.loading": "Chargement du terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Fermer le terminal",
-
-  "terminal.connectionLost.title": "Connexion perdue",
-  "terminal.connectionLost.description":
-    "La connexion au terminal a été interrompue. Cela peut arriver lorsque le serveur redémarre.",
   "common.closeTab": "Fermer l'onglet",
   "common.signIn": "Se connecter",
-  "common.signOut": "Se déconnecter",
   "common.dismiss": "Ignorer",
   "common.requestFailed": "La demande a échoué",
-  "common.moreOptions": "Plus d'options",
-  "common.learnMore": "En savoir plus",
   "common.rename": "Renommer",
-  "common.reset": "Réinitialiser",
-  "common.archive": "Archiver",
   "common.delete": "Supprimer",
   "common.close": "Fermer",
   "common.edit": "Modifier",
   "common.loadMore": "Charger plus",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "Basculer le menu",
-  "sidebar.nav.projectsAndSessions": "Projets et sessions",
   "sidebar.settings": "Paramètres",
-  "sidebar.help": "Aide",
-  "sidebar.workspaces.enable": "Activer les espaces de travail",
-  "sidebar.workspaces.disable": "Désactiver les espaces de travail",
-  "sidebar.gettingStarted.title": "Commencer",
-  "sidebar.gettingStarted.line1": "Kilo inclut des modèles gratuits pour que vous puissiez commencer immédiatement.",
-  "sidebar.gettingStarted.line2":
-    "Connectez n'importe quel fournisseur pour utiliser des modèles, y compris Claude, GPT, Gemini etc.",
-  "sidebar.project.recentSessions": "Sessions récentes",
-  "sidebar.project.viewAllSessions": "Voir toutes les sessions",
-
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Bureau",
-  "settings.section.server": "Serveur",
-  "settings.tab.general": "Général",
-  "settings.tab.shortcuts": "Raccourcis",
-
-  "settings.general.section.appearance": "Apparence",
-  "settings.general.section.notifications": "Notifications système",
-  "settings.general.section.updates": "Mises à jour",
-  "settings.general.section.sounds": "Effets sonores",
-
-  "settings.general.row.language.title": "Langue",
-  "settings.general.row.language.description": "Changer la langue d'affichage pour Kilo",
-  "settings.general.row.appearance.title": "Apparence",
-  "settings.general.row.appearance.description": "Personnaliser l'apparence d'Kilo sur votre appareil",
-  "settings.general.row.theme.title": "Thème",
-  "settings.general.row.theme.description": "Personnaliser le thème d'Kilo.",
-  "settings.general.row.font.title": "Police",
-  "settings.general.row.font.description": "Personnaliser la police mono utilisée dans les blocs de code",
-
-  "settings.general.row.releaseNotes.title": "Notes de version",
-  "settings.general.row.releaseNotes.description": 'Afficher des pop-ups "Quoi de neuf" après les mises à jour',
 
   "settings.indexing.dimension.description":
     "Laissez vide pour détecter automatiquement la dimension d'embedding à partir du modèle.",
@@ -849,8 +365,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Activer pour ce projet",
   "settings.indexing.projectEnable.description":
     "Activer l'indexation pour cet espace de travail lorsque l'indexation globale est désactivée.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "L'indexation globale est activée, ce projet est donc déjà pris en compte.",
   "settings.indexing.lancedbDirectory.description": "Répertoire optionnel pour le stockage local LanceDB.",
   "settings.indexing.lancedbDirectory.placeholder": "Laissez vide pour la valeur par défaut",
   "settings.indexing.lancedbDirectory.title": "Répertoire LanceDB",
@@ -879,27 +393,6 @@ export const dict = {
   "settings.indexing.vectorStore.description": "Choisissez où les embeddings indexés sont stockés.",
   "settings.indexing.vectorStore.title": "Stockage vectoriel",
 
-  "settings.updates.row.startup.title": "Vérifier les mises à jour au démarrage",
-  "settings.updates.row.startup.description": "Vérifier automatiquement les mises à jour au lancement d'Kilo",
-  "settings.updates.row.check.title": "Vérifier les mises à jour",
-  "settings.updates.row.check.description": "Vérifier manuellement les mises à jour et installer si disponible",
-  "settings.updates.action.checkNow": "Vérifier maintenant",
-  "settings.updates.action.checking": "Vérification...",
-  "settings.updates.toast.latest.title": "Vous êtes à jour",
-  "settings.updates.toast.latest.description": "Vous utilisez la dernière version d'Kilo.",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alerte 01",
   "sound.option.alert02": "Alerte 02",
   "sound.option.alert03": "Alerte 03",
@@ -945,48 +438,11 @@ export const dict = {
   "sound.option.yup04": "Oui 04",
   "sound.option.yup05": "Oui 05",
   "sound.option.yup06": "Oui 06",
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Afficher une notification système lorsque l'agent a terminé ou nécessite une attention",
-  "settings.general.notifications.permissions.title": "Autorisations",
-  "settings.general.notifications.permissions.description":
-    "Afficher une notification système lorsqu'une permission est requise",
-  "settings.general.notifications.errors.title": "Erreurs",
-  "settings.general.notifications.errors.description": "Afficher une notification système lorsqu'une erreur se produit",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Jouer un son lorsque l'agent a terminé ou nécessite une attention",
-  "settings.general.sounds.permissions.title": "Autorisations",
-  "settings.general.sounds.permissions.description": "Jouer un son lorsqu'une permission est requise",
-  "settings.general.sounds.errors.title": "Erreurs",
-  "settings.general.sounds.errors.description": "Jouer un son lorsqu'une erreur se produit",
-
-  "settings.shortcuts.title": "Raccourcis clavier",
-  "settings.shortcuts.reset.button": "Rétablir les défauts",
-  "settings.shortcuts.reset.toast.title": "Raccourcis réinitialisés",
-  "settings.shortcuts.reset.toast.description": "Les raccourcis clavier ont été réinitialisés aux valeurs par défaut.",
-  "settings.shortcuts.conflict.title": "Raccourci déjà utilisé",
-  "settings.shortcuts.conflict.description": "{{keybind}} est déjà assigné à {{titles}}.",
-  "settings.shortcuts.unassigned": "Non assigné",
-  "settings.shortcuts.pressKeys": "Appuyez sur les touches",
-  "settings.shortcuts.search.placeholder": "Rechercher des raccourcis",
-  "settings.shortcuts.search.empty": "Aucun raccourci trouvé",
-
-  "settings.shortcuts.group.general": "Général",
-  "settings.shortcuts.group.session": "Session",
-  "settings.shortcuts.group.navigation": "Navigation",
-  "settings.shortcuts.group.modelAndAgent": "Modèle et agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Invite",
 
   "settings.providers.title": "Fournisseurs",
-  "settings.providers.description": "Les paramètres des fournisseurs seront configurables ici.",
-  "settings.providers.betaNotice":
-    "Actuellement, seul le fournisseur Kilo Gateway peut être configuré dans l'interface des paramètres. La prise en charge de la configuration d'autres fournisseurs sera bientôt disponible pendant la période bêta. En attendant, vous pouvez configurer les fournisseurs à l'aide de la CLI ou du fichier de configuration. Nous nous engageons à maintenir Kilo ouvert, sans enfermement propriétaire.",
   "settings.providers.section.connected": "Fournisseurs connectés",
   "settings.providers.connected.empty": "Aucun fournisseur connecté",
   "settings.providers.section.popular": "Fournisseurs populaires",
-  "settings.providers.search.placeholder": "Rechercher des fournisseurs",
   "settings.providers.select.placeholder": "Sélectionner un fournisseur...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Environnement",
@@ -1005,7 +461,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Masquez les modèles Kilo Gateway dont les fournisseurs peuvent utiliser vos prompts à des fins d'entraînement.",
   "settings.providers.modeModels": "Modèle par mode",
-  "settings.providers.custom.note": "Ajoutez un fournisseur personnalisé par URL de base.",
   "settings.providers.modeModels.description":
     "Remplacez le modèle par défaut pour des modes spécifiques. Si non défini, le modèle par défaut global est utilisé.",
   "provider.custom.title": "Fournisseur personnalisé",
@@ -1072,9 +527,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Supprimer le modèle",
   "provider.custom.models.add": "Ajouter un modèle",
-  "provider.custom.models.fetch": "Récupérer les modèles",
-  "provider.custom.models.fetching": "Récupération\u2026",
-  "provider.custom.models.fetch.error": "Échec de la récupération des modèles : {{error}}",
   "provider.custom.models.fetch.authError": "Échec de l'authentification. Vérifiez la clé API ci-dessus et réessayez.",
   "provider.custom.models.fetch.empty": "Aucun modèle trouvé sur ce serveur.",
   "provider.custom.models.fetch.added": "{{count}} modèle(s) ajouté(s).",
@@ -1128,23 +580,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Configuration obsolète .kilocode",
   "settings.config.source.projectOpencode": "Configuration obsolète .opencode",
   "settings.models.title": "Modèles",
-  "settings.models.description": "Les paramètres des modèles seront configurables ici.",
-  "settings.agents.title": "Agents",
-  "settings.agents.description": "Les paramètres des agents seront configurables ici.",
-  "settings.commands.title": "Commandes",
-  "settings.commands.description": "Les paramètres des commandes seront configurables ici.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "Les paramètres MCP seront configurables ici.",
 
-  "settings.permissions.title": "Autorisations",
-  "settings.permissions.description": "Contrôlez les outils que le serveur peut utiliser par défaut.",
-  "settings.permissions.section.tools": "Outils",
   "settings.permissions.toast.updateFailed.title": "Échec de la mise à jour des permissions",
 
-  "settings.permissions.action.allow": "Autoriser",
-  "settings.permissions.action.ask": "Demander",
-  "settings.permissions.action.deny": "Refuser",
-
   "settings.permissions.tool.read.title": "Lire",
   "settings.permissions.tool.read.description": "Lecture d'un fichier (correspond au chemin du fichier)",
   "settings.permissions.tool.edit.title": "Modifier",
@@ -1180,7 +618,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Boucle infernale",
   "settings.permissions.tool.doom_loop.description": "Détecter les appels d'outils répétés avec une entrée identique",
 
-  "session.delete.failed.title": "Échec de la suppression de la session",
   "session.delete.title": "Supprimer la session",
   "session.delete.confirm": 'Supprimer la session "{{name}}" ?',
   "session.delete.button": "Supprimer la session",
@@ -1211,12 +648,7 @@ export const dict = {
   "workStyle.onboarding.title": "Choisissez votre façon de travailler",
   "workStyle.onboarding.settingsNote": "Vous pouvez modifier ces options à tout moment dans les",
   "workStyle.onboarding.settings": "Paramètres.",
-  "workStyle.onboarding.description":
-    "Ceci définit les paramètres initiaux pour les autorisations, les blocs de raisonnement, la sortie du terminal et la chronologie du contexte. Ce réglage ne s'applique qu'une fois et ignore les paramètres que vous avez déjà personnalisés.",
-  "workStyle.onboarding.skip": "Ignorer pour l'instant",
   "workStyle.toast.saved.title": "Mode enregistré avec succès",
-  "workStyle.toast.saved.description": "Modifiez vos préférences à tout moment dans les paramètres.",
-  "workStyle.toast.saved.action": "Accéder aux paramètres",
   "workStyle.choice.permissions": "Autorisations",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Visibilité",
@@ -1244,32 +676,6 @@ export const dict = {
   "session.cloud.import.legacy": "Cette session semble être une ancienne session qui n'est plus prise en charge.",
   "session.cloud.import.failed": "Échec de l'importation de la session cloud",
 
-  "workspace.new": "Nouvel espace de travail",
-  "workspace.type.local": "local",
-  "workspace.type.sandbox": "bac à sable",
-  "workspace.create.failed.title": "Échec de la création de l'espace de travail",
-  "workspace.delete.failed.title": "Échec de la suppression de l'espace de travail",
-  "workspace.resetting.title": "Réinitialisation de l'espace de travail",
-  "workspace.resetting.description": "Cela peut prendre une minute.",
-  "workspace.reset.failed.title": "Échec de la réinitialisation de l'espace de travail",
-  "workspace.reset.success.title": "Espace de travail réinitialisé",
-  "workspace.reset.success.description": "L'espace de travail correspond maintenant à la branche par défaut.",
-  "workspace.error.stillPreparing": "L'espace de travail est encore en cours de préparation",
-  "workspace.status.checking": "Vérification des modifications non fusionnées...",
-  "workspace.status.error": "Impossible de vérifier le statut git.",
-  "workspace.status.clean": "Aucune modification non fusionnée détectée.",
-  "workspace.status.dirty": "Modifications non fusionnées détectées dans cet espace de travail.",
-  "workspace.delete.title": "Supprimer l'espace de travail",
-  "workspace.delete.confirm": 'Supprimer l\'espace de travail "{{name}}" ?',
-  "workspace.delete.button": "Supprimer l'espace de travail",
-  "workspace.reset.title": "Réinitialiser l'espace de travail",
-  "workspace.reset.confirm": 'Réinitialiser l\'espace de travail "{{name}}" ?',
-  "workspace.reset.button": "Réinitialiser l'espace de travail",
-  "workspace.reset.archived.none": "Aucune session active ne sera archivée.",
-  "workspace.reset.archived.one": "1 session sera archivée.",
-  "workspace.reset.archived.many": "{{count}} sessions seront archivées.",
-  "workspace.reset.note": "Cela réinitialisera l'espace de travail pour correspondre à la branche par défaut.",
-
   "deviceAuth.toast.urlCopied": "URL copiée dans le presse-papier",
   "deviceAuth.toast.codeCopied": "Code copié dans le presse-papier",
   "deviceAuth.toast.errorCopied": "Erreur copiée dans le presse-papiers",
@@ -1308,7 +714,6 @@ export const dict = {
   "profile.pass.renews": "Renouvelle",
   "profile.action.logout": "Déconnexion",
 
-  "settings.section.configuration": "Configuration",
   "settings.agentBehaviour.title": "Comportement de l'agent",
   "settings.autoApprove.title": "Approbation automatique",
   "settings.browser.title": "Navigateur",
@@ -1324,7 +729,6 @@ export const dict = {
   "settings.language.title": "Langue",
   "settings.aboutKiloCode.title": "À propos de Kilo Code",
 
-  "session.messages.empty": "Commencez une conversation en tapant un message ci-dessous.",
   "session.messages.welcome":
     "Kilo Code est un assistant de programmation IA. Demandez-lui de créer des fonctionnalités, corriger des bugs ou expliquer votre code.",
   "session.messages.scrollToBottom": "Défiler vers le bas",
@@ -1332,7 +736,6 @@ export const dict = {
   "session.messages.taskStarting": "Démarrage...",
   "session.status.writingResponse": "Rédaction de la réponse…",
   "session.status.retry": "Nouvelle tentative…",
-  "session.status.retrying": "Nouvelle tentative (essai {{ attempt }})… {{ message }}",
   "session.status.working": "En cours…",
   "session.status.offline": "Réseau déconnecté — reconnexion en cours...",
   "session.outcome.incomplete": "Tour terminé avec {{count}} tâches restantes",
@@ -1364,11 +767,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} sessions précédentes",
   "context.stats.thisSession": "Cette session",
 
-  "time.justNow": "à l'instant",
-  "time.minutesAgo": "il y a {{count}} min",
-  "time.hoursAgo": "il y a {{count}}h",
-  "time.daysAgo": "il y a {{count}}j",
-  "time.monthsAgo": "il y a {{count}} mois",
   "time.today": "Aujourd'hui",
   "time.yesterday": "Hier",
   "time.thisWeek": "Cette semaine",
@@ -1384,7 +782,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port :",
   "settings.aboutKiloCode.versionInfo": "Informations de version",
   "settings.aboutKiloCode.version.label": "Version :",
-  "settings.aboutKiloCode.extensionName": "Extension Kilo Code",
   "settings.aboutKiloCode.community": "Communauté et support",
   "settings.aboutKiloCode.feedback.prefix":
     "Si vous avez des questions ou des commentaires, n'hésitez pas à ouvrir un ticket sur",
@@ -1438,7 +835,6 @@ export const dict = {
   "settings.language.current": "Actuelle :",
 
   "common.add": "Ajouter",
-  "common.choose": "Choisir…",
 
   "settings.autocomplete.autoTrigger.title": "Activer la complétion automatique en ligne",
   "settings.autocomplete.autoTrigger.description":
@@ -1450,28 +846,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Afficher les suggestions d'autocomplétion dans le chat",
   "settings.autocomplete.modelsHint":
     "Pour choisir le modèle utilisé pour l'autocomplétion, consultez les paramètres des Modèles.",
-  "settings.notifications.agent.title": "Achèvement de l'agent",
-  "settings.notifications.agent.description": "Afficher une notification lorsque l'agent termine une tâche",
-  "settings.notifications.permissions.title": "Demandes d'autorisation",
-  "settings.notifications.permissions.description": "Afficher une notification lors des demandes d'autorisation",
-  "settings.notifications.errors.title": "Erreurs",
-  "settings.notifications.errors.description": "Afficher une notification en cas d'erreur",
   "settings.notifications.sounds": "Sons",
   "settings.notifications.enable.title": "Activer les notifications sonores",
   "settings.notifications.enable.description":
     "Lire des sons lorsque les sessions se terminent, rencontrent une erreur ou nécessitent votre intervention",
   "settings.notifications.testSound": "Tester",
-  "settings.notifications.agentSound.title": "Son d'achèvement de l'agent",
-  "settings.notifications.agentSound.description": "Son à jouer lorsque l'agent termine",
-  "settings.notifications.permSound.title": "Son de demande d'autorisation",
-  "settings.notifications.permSound.description": "Son à jouer lors des demandes d'autorisation",
-  "settings.notifications.errorSound.title": "Son d'erreur",
-  "settings.notifications.errorSound.description": "Son à jouer en cas d'erreur",
   "settings.notifications.sound.default": "Par défaut",
   "settings.notifications.sound.system": "Système",
   "settings.notifications.sound.description":
     "L’option par défaut utilise des sons différents pour la fin des sessions, les demandes d’intervention et les erreurs. Les autres options utilisent un même son pour tous les événements.",
-  "settings.notifications.sound.none": "Aucun",
   "settings.experimental.share.title": "Mode de partage",
   "settings.experimental.share.description": "Comportement du partage de session",
   "settings.experimental.share.manual": "Manuel",
@@ -1492,9 +875,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Modèle de génération d'images",
   "settings.experimental.imageGenerationModel.placeholder": "Par défaut (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Transcription vocale",
-  "settings.experimental.speechToText.description":
-    "Activez la saisie vocale dans les champs de prompt en utilisant votre compte Kilo via Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Activez et connectez-vous au fournisseur Kilo pour utiliser Speech to Text. Speech to Text n'est actuellement pris en charge qu'avec Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Modèle de transcription vocale",
@@ -1537,15 +917,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Agent par défaut",
   "settings.agentBehaviour.defaultAgent.description": "Agent à utiliser lorsqu'aucun n'est spécifié",
   "settings.agentBehaviour.availableAgents": "Agents disponibles",
-  "settings.agentBehaviour.selectAgent": "Sélectionner un agent à configurer…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Sélectionner un agent à configurer…",
   "settings.agentBehaviour.modelOverride.title": "Remplacement du modèle",
   "settings.agentBehaviour.modelOverride.description": "Remplacer le modèle par défaut pour cet agent",
   "settings.agentBehaviour.variantOverride.title": "Remplacement de la variante",
   "settings.agentBehaviour.variantOverride.description": "Remplacer la variante du modèle pour cet agent",
-  "settings.agentBehaviour.prompt.title": "Prompt personnalisé",
-  "settings.agentBehaviour.prompt.description": "Prompt système supplémentaire pour cet agent",
   "settings.agentBehaviour.temperature.title": "Température",
   "settings.agentBehaviour.temperature.description":
     "Contrôle le degré d’aléa des réponses de l’IA (0–2). Les valeurs plus faibles (par ex. 0.2) produisent des résultats ciblés et cohérents. Les valeurs plus élevées (par ex. 1.0) produisent des réponses plus variées et créatives. Laissez ce champ vide pour utiliser la valeur par défaut du modèle.",
@@ -1565,7 +940,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Compétences découvertes",
   "settings.agentBehaviour.noSkillsFound":
     "Aucune compétence découverte. Ajoutez des chemins de dossiers ou des URLs ci-dessous pour rendre les compétences disponibles.",
-  "settings.agentBehaviour.availableModes": "Modes personnalisés disponibles",
   "settings.agentBehaviour.noAgentsFound": "Aucun agent trouvé.",
   "settings.agentBehaviour.createMode": "Créer un nouveau mode",
   "settings.agentBehaviour.createMode.name": "Nom",
@@ -1651,12 +1025,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Commande",
   "settings.agentBehaviour.mcpDetail.args": "Arguments",
   "settings.agentBehaviour.mcpDetail.env": "Environnement",
-  "settings.agentBehaviour.mcpDetail.disabled": "Ce serveur est désactivé.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Parcourir le Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Aucun serveur MCP configuré. Ajoutez des serveurs MCP dans kilo.jsonc ou demandez à l'agent de les ajouter.",
-  "settings.agentBehaviour.workflowsPlaceholder":
-    "Les workflows sont gérés via les fichiers de workflow dans votre espace de travail.",
   "settings.agentBehaviour.workflows.description":
     "Les workflows sont des commandes slash personnalisées définies dans votre configuration. Tapez /command-name dans le chat pour les invoquer. Les commandes sont configurées dans opencode.json dans la section 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1752,7 +1123,6 @@ export const dict = {
     "par ex. Générer des commit messages en espagnol en suivant le format conventional commits. Retourner UNIQUEMENT le commit message.",
 
   "settings.commitMessage.language.sync": "Synchronisation avec la langue UI",
-  "settings.commitMessage.language.title": "Langue",
   "settings.commitMessage.language.description":
     "Choisissez la langue à utiliser pour les messages de commit générés par l'IA:",
 
@@ -1793,8 +1163,6 @@ export const dict = {
   "settings.providers.disabled": "Fournisseurs désactivés",
   "settings.providers.disabled.description": "Fournisseurs à masquer de la liste",
   "settings.providers.disabled.enable": "Activer",
-  "settings.providers.enabled": "Fournisseurs activés (liste blanche)",
-  "settings.providers.enabled.description": "Si défini, seuls ces fournisseurs seront disponibles",
   "settings.providers.notSet": "Non défini (utiliser la valeur par défaut du serveur)",
   "dialog.model.notSet": "Non défini",
   "profile.personalAccount": "Compte personnel",
@@ -1836,9 +1204,7 @@ export const dict = {
   "migration.migrate.subtitle":
     "Nous avons trouvé des paramètres de votre précédente installation. Voici ce que nous pouvons récupérer.",
   "migration.migrate.selectLabel": "Sélectionnez ce que vous souhaitez migrer",
-  "migration.migrate.cannotMigrate": "Impossible à migrer",
   "migration.migrate.chatHistory": "Sessions de discussion et historique",
-  "migration.migrate.chatHistoryDesc": "Incompatible avec la nouvelle architecture",
   "migration.migrate.button": "Migrer les paramètres",
   "migration.migrate.skip": "Ignorer",
   "migration.migrate.keysDetected": "{{count}} clés détectées",
@@ -1862,10 +1228,7 @@ export const dict = {
     "Cela supprime les anciens paramètres du stockage de VS Code. Vous ne pourrez pas réexécuter cette migration.",
   "migration.complete.done": "Terminé",
   "migration.migrate.sessionsDetected": "{{count}} sessions détectées",
-  "migration.error.sessionFailed": "La migration de la session a échoué",
   "migration.error.continue": "Continuer",
-  "migration.error.action.copy": "Copier",
-  "migration.error.toast.copied": "Erreur copiée dans le presse-papiers",
 
   "migration.sessionSummary.title": "Résumé :",
   "migration.sessionSummary.copy": "Copier le rapport",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 75ddcef315b..066cd300989 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -53,79 +53,10 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Suggeriti",
-  "command.category.view": "Vista",
-  "command.category.project": "Progetto",
-  "command.category.provider": "Provider",
-  "command.category.server": "Server",
-  "command.category.session": "Sessione",
-  "command.category.theme": "Tema",
-  "command.category.language": "Lingua",
-  "command.category.file": "File",
-  "command.category.context": "Contesto",
-  "command.category.terminal": "Terminale",
-  "command.category.model": "Modello",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agente",
-  "command.category.permissions": "Autorizzazioni",
-  "command.category.workspace": "Workspace",
-  "command.category.settings": "Impostazioni",
-  "theme.scheme.system": "Sistema",
-  "theme.scheme.light": "Chiaro",
-  "theme.scheme.dark": "Scuro",
-  "command.sidebar.toggle": "Mostra/nascondi barra laterale",
-  "command.project.open": "Apri progetto",
   "command.provider.connect": "Connetti provider",
-  "command.server.switch": "Cambia server",
-  "command.settings.open": "Apri impostazioni",
-  "command.session.previous": "Sessione precedente",
-  "command.session.next": "Sessione successiva",
-  "command.session.previous.unseen": "Sessione non letta precedente",
-  "command.session.next.unseen": "Sessione non letta successiva",
-  "command.session.archive": "Archivia sessione",
-  "command.palette": "Palette comandi",
-  "command.theme.cycle": "Cambia tema",
-  "command.theme.set": "Usa tema: {{theme}}",
-  "command.theme.scheme.cycle": "Cambia schema colori",
-  "command.theme.scheme.set": "Usa schema colori: {{scheme}}",
-  "command.language.cycle": "Cambia lingua",
-  "command.language.set": "Usa lingua: {{language}}",
   "command.session.new": "Nuova sessione",
-  "command.session.new.task": "Nuovo task",
   "command.session.show.changes": "Mostra modifiche",
-  "command.file.open": "Apri file",
-  "command.tab.close": "Chiudi scheda",
-  "command.context.addSelection": "Aggiungi selezione al contesto",
-  "command.context.addSelection.description": "Aggiungi le righe selezionate dal file corrente",
-  "command.terminal.toggle": "Mostra/nascondi terminale",
-  "command.fileTree.toggle": "Mostra/nascondi albero file",
   "command.review.toggle": "Mostra/nascondi revisione",
-  "command.terminal.new": "Nuovo terminale",
-  "command.terminal.new.description": "Crea una nuova scheda terminale",
-  "command.steps.toggle": "Mostra/nascondi passaggi",
-  "command.steps.toggle.description": "Mostra o nascondi i passaggi del messaggio corrente",
-  "command.message.previous": "Messaggio precedente",
-  "command.message.previous.description": "Vai al messaggio utente precedente",
-  "command.message.next": "Messaggio successivo",
-  "command.message.next.description": "Vai al messaggio utente successivo",
-  "command.model.choose": "Scegli modello",
-  "command.model.choose.description": "Seleziona un modello diverso",
-  "command.mcp.toggle": "Abilita/disabilita MCP",
-  "command.mcp.toggle.description": "Abilita o disabilita MCP",
-  "command.agent.cycle": "Cambia agente",
-  "command.agent.cycle.description": "Passa all'agente successivo",
-  "command.agent.cycle.reverse": "Cambia agente all'indietro",
-  "command.agent.cycle.reverse.description": "Passa all'agente precedente",
-  "command.model.variant.cycle": "Cambia sforzo di ragionamento",
-  "command.model.variant.cycle.description": "Passa al livello di sforzo successivo",
-  "command.permissions.autoaccept.enable": "Accetta automaticamente le autorizzazioni",
-  "command.permissions.autoaccept.disable": "Interrompi accettazione automatica autorizzazioni",
-  "command.workspace.toggle": "Mostra/nascondi workspace",
-  "command.workspace.toggle.description": "Abilita o disabilita più workspace nella barra laterale",
-  "command.session.undo": "Annulla",
-  "command.session.undo.description": "Annulla l'ultimo messaggio",
-  "command.session.redo": "Ripeti",
-  "command.session.redo.description": "Ripristina l'ultimo messaggio annullato",
   "revert.banner.count_one": "{{count}} messaggio ripristinato",
   "revert.banner.count_other": "{{count}} messaggi ripristinati",
   "revert.banner.redo": "Ripeti",
@@ -140,17 +71,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Abilita snapshot",
   "revert.disabled.agentBusy": "Attendi che l'agente finisca",
   "command.session.compact": "Compatta sessione",
-  "command.session.compact.description": "Riassumi la sessione per ridurre la dimensione del contesto",
-  "command.session.fork": "Fork dal messaggio",
-  "command.session.fork.description": "Crea una nuova sessione da un messaggio precedente",
-  "command.session.share": "Condividi sessione",
-  "command.session.share.description": "Condividi questa sessione e copia l'URL negli appunti",
-  "command.session.unshare": "Interrompi condivisione sessione",
-  "command.session.unshare.description": "Smetti di condividere questa sessione",
-  "palette.search.placeholder": "Cerca file, comandi e sessioni",
-  "palette.empty": "Nessun risultato trovato",
-  "palette.group.commands": "Comandi",
-  "palette.group.files": "File",
   "dialog.provider.search.placeholder": "Cerca provider",
   "dialog.provider.empty": "Nessun provider trovato",
   "dialog.provider.group.other": "Altro",
@@ -158,16 +78,11 @@ export const dict = {
   "dialog.model.select.title": "Seleziona modello",
   "dialog.model.search.placeholder": "Cerca modelli",
   "dialog.model.empty": "Nessun risultato modello",
-  "dialog.model.manage": "Gestisci modelli",
-  "dialog.model.manage.description": "Personalizza quali modelli appaiono nel selettore.",
   "dialog.model.select": "Seleziona",
   "dialog.model.expand": "Espandi",
   "dialog.model.collapse": "Comprimi",
-  "dialog.model.unpaid.freeModels.title": "Modelli gratuiti forniti da Kilo",
-  "dialog.model.unpaid.addMore.title": "Aggiungi altri modelli dai provider popolari",
   "dialog.provider.viewAll": "Mostra altri provider",
   "provider.connect.title": "Connetti {{provider}}",
-  "provider.connect.title.anthropicProMax": "Accedi con Claude Pro/Max",
   "provider.connect.selectMethod": "Seleziona metodo di accesso per {{provider}}.",
   "provider.connect.method.apiKey": "API key",
   "provider.connect.status.inProgress": "Autorizzazione in corso...",
@@ -184,13 +99,6 @@ export const dict = {
   "provider.connect.apiKey.placeholder": "API key",
   "provider.connect.apiKey.placeholder.optional": "Leave empty for local server",
   "provider.connect.apiKey.required": "API key obbligatoria",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen ti offre una selezione curata di modelli affidabili e ottimizzati per agenti di coding.",
-  "provider.connect.opencodeZen.line2":
-    "Con una sola API key puoi accedere a modelli come Claude, GPT, Gemini, GLM e altri.",
-  "provider.connect.opencodeZen.visit.prefix": "Visita ",
-  "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " per ottenere la tua API key.",
   "provider.connect.oauth.code.visit.prefix": "Visita ",
   "provider.connect.oauth.code.visit.link": "questo link",
   "provider.connect.oauth.code.visit.suffix":
@@ -198,7 +106,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "Codice di autorizzazione {{method}}",
   "provider.connect.oauth.code.placeholder": "Codice di autorizzazione",
   "provider.connect.oauth.code.required": "Codice di autorizzazione obbligatorio",
-  "provider.connect.oauth.code.invalid": "Codice di autorizzazione non valido",
   "provider.connect.oauth.auto.visit.prefix": "Visita ",
   "provider.connect.oauth.auto.visit.link": "questo link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -210,26 +117,11 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "I modelli {{provider}} non sono più disponibili.",
   "model.tag.free": "Gratis",
   "model.tag.dataCollected": "I dati possono essere utilizzati per l'addestramento",
-  "model.tag.latest": "Più recente",
   "model.group.auto": "Modelli automatici",
   "model.group.recommended": "Consigliati",
   "model.group.favorites": "Preferiti",
   "model.favorite.add": "Aggiungi ai preferiti",
   "model.favorite.remove": "Rimuovi dai preferiti",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "testo",
-  "model.input.image": "immagine",
-  "model.input.audio": "audio",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Consente: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Consente ragionamento",
-  "model.tooltip.reasoning.none": "Nessun ragionamento",
-  "model.tooltip.context": "Limite contesto {{limit}}",
   "model.preview.label.released": "Rilasciato",
   "model.preview.label.input": "Input",
   "model.preview.label.output": "Output",
@@ -249,11 +141,8 @@ export const dict = {
   "model.preview.modality.audio": "Audio",
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "Cerca",
   "common.goBack": "Torna indietro",
-  "common.goForward": "Vai avanti",
   "common.loading": "Caricamento",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Annulla",
   "common.connect": "Connetti",
   "common.disconnect": "Disconnetti",
@@ -261,51 +150,7 @@ export const dict = {
   "common.save": "Salva",
   "common.saving": "Salvataggio...",
   "common.default": "Predefinito",
-  "common.attachment": "allegato",
-  "prompt.placeholder.shell": "Inserisci comando shell... {{example}}",
-  "prompt.placeholder.normal": 'Chiedi qualsiasi cosa... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Riassumi commenti...",
-  "prompt.placeholder.summarizeComment": "Riassumi commento...",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc per uscire",
-  "prompt.example.1": "Correggi un TODO nel codebase",
-  "prompt.example.2": "Qual è lo stack tecnico di questo progetto?",
-  "prompt.example.3": "Sistema i test rotti",
-  "prompt.example.4": "Spiega come funziona l'autenticazione",
-  "prompt.example.5": "Trova e correggi vulnerabilità di sicurezza",
-  "prompt.example.6": "Aggiungi unit test per il servizio utenti",
-  "prompt.example.7": "Riscrivi questa funzione per renderla più leggibile",
-  "prompt.example.8": "Cosa significa questo errore?",
-  "prompt.example.9": "Aiutami a fare debug di questo problema",
-  "prompt.example.10": "Genera documentazione API",
-  "prompt.example.11": "Ottimizza le query del database",
-  "prompt.example.12": "Aggiungi validazione input",
-  "prompt.example.13": "Crea un nuovo componente per...",
-  "prompt.example.14": "Come distribuisco questo progetto?",
-  "prompt.example.15": "Rivedi il mio codice per le best practice",
-  "prompt.example.16": "Aggiungi gestione errori a questa funzione",
-  "prompt.example.17": "Spiega questo pattern regex",
-  "prompt.example.18": "Converti questo in TypeScript",
-  "prompt.example.19": "Aggiungi logging in tutto il codebase",
-  "prompt.example.20": "Quali dipendenze sono obsolete?",
-  "prompt.example.21": "Aiutami a scrivere uno script di migrazione",
-  "prompt.example.22": "Implementa caching per questo endpoint",
-  "prompt.example.23": "Aggiungi paginazione a questa lista",
-  "prompt.example.24": "Crea un comando CLI per...",
-  "prompt.example.25": "Come funzionano qui le variabili d'ambiente?",
-  "prompt.popover.emptyResults": "Nessun risultato corrispondente",
-  "prompt.popover.emptyCommands": "Nessun comando corrispondente",
-  "prompt.dropzone.label": "Trascina immagini o PDF qui",
-  "prompt.slash.badge.custom": "personalizzato",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "attivo",
-  "prompt.context.includeActiveFile": "Includi file attivo",
-  "prompt.context.removeActiveFile": "Rimuovi file attivo dal contesto",
-  "prompt.context.removeFile": "Rimuovi file dal contesto",
   "prompt.thinking.tooltip": "Sforzo di ragionamento",
-  "prompt.action.attachFile": "Allega file",
-  "prompt.attachment.remove": "Rimuovi allegato",
   "prompt.action.send": "Invia",
   "prompt.action.send.blocked": "Rispondi alla domanda in sospeso o ignorala prima di continuare",
   "prompt.action.stop": "Ferma",
@@ -320,156 +165,12 @@ export const dict = {
   "prompt.action.resetModel": "Ripristina modello predefinito",
   "prompt.action.enhanceDescription":
     "Il pulsante 'Migliora prompt' aiuta a migliorare il prompt aggiungendo contesto, chiarimenti o riformulazioni. Scrivi un prompt qui e fai di nuovo clic sul pulsante per vedere come funziona.",
-  "prompt.toast.pasteUnsupported.title": "Incolla non supportato",
-  "prompt.toast.pasteUnsupported.description": "Qui puoi incollare solo immagini o PDF.",
-  "prompt.toast.modelAgentRequired.title": "Seleziona agente e modello",
-  "prompt.toast.modelAgentRequired.description": "Scegli un agente e un modello prima di inviare un prompt.",
-  "prompt.toast.worktreeCreateFailed.title": "Creazione worktree non riuscita",
-  "prompt.toast.sessionCreateFailed.title": "Creazione sessione non riuscita",
-  "prompt.toast.shellSendFailed.title": "Invio comando shell non riuscito",
-  "prompt.toast.commandSendFailed.title": "Invio comando non riuscito",
   "prompt.toast.promptSendFailed.title": "Invio prompt non riuscito",
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} di {{total}} abilitati",
-  "dialog.mcp.empty": "Nessun MCP configurato",
-  "dialog.lsp.empty": "LSP rilevati automaticamente dai tipi di file",
-  "dialog.plugins.empty": "Plugin configurati in opencode.json",
   "mcp.status.connected": "connesso",
   "mcp.status.failed": "non riuscito",
   "mcp.status.needs_auth": "richiede autenticazione",
   "mcp.status.needs_registration": "richiede registrazione client",
   "mcp.status.disabled": "disabilitato",
-  "dialog.fork.empty": "Nessun messaggio da cui fare fork",
-  "dialog.directory.search.placeholder": "Cerca cartelle",
-  "dialog.directory.empty": "Nessuna cartella trovata",
-  "dialog.server.title": "Server",
-  "dialog.server.description": "Cambia il server Kilo a cui si connette questa app.",
-  "dialog.server.search.placeholder": "Cerca server",
-  "dialog.server.empty": "Ancora nessun server",
-  "dialog.server.add.title": "Aggiungi un server",
-  "dialog.server.add.url": "URL server",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Impossibile connettersi al server",
-  "dialog.server.add.checking": "Controllo...",
-  "dialog.server.add.button": "Aggiungi server",
-  "dialog.server.default.title": "Server predefinito",
-  "dialog.server.default.description":
-    "Connettiti a questo server all'avvio dell'app invece di avviare un server locale. Richiede riavvio.",
-  "dialog.server.default.none": "Nessun server selezionato",
-  "dialog.server.default.set": "Imposta server corrente come predefinito",
-  "dialog.server.default.clear": "Cancella",
-  "dialog.server.action.remove": "Rimuovi server",
-  "dialog.server.menu.edit": "Modifica",
-  "dialog.server.menu.default": "Imposta come predefinito",
-  "dialog.server.menu.defaultRemove": "Rimuovi predefinito",
-  "dialog.server.menu.delete": "Elimina",
-  "dialog.server.current": "Server corrente",
-  "dialog.server.status.default": "Predefinito",
-  "dialog.project.edit.title": "Modifica progetto",
-  "dialog.project.edit.name": "Nome",
-  "dialog.project.edit.icon": "Icona",
-  "dialog.project.edit.icon.alt": "Icona progetto",
-  "dialog.project.edit.icon.hint": "Fai clic o trascina un'immagine",
-  "dialog.project.edit.icon.recommended": "Consigliato: 128x128px",
-  "dialog.project.edit.color": "Colore",
-  "dialog.project.edit.color.select": "Seleziona colore {{color}}",
-  "dialog.project.edit.worktree.startup": "Script di avvio workspace",
-  "dialog.project.edit.worktree.startup.description":
-    "Viene eseguito dopo la creazione di un nuovo workspace (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "es. bun install",
-  "context.breakdown.title": "Suddivisione contesto",
-  "context.breakdown.note":
-    'Suddivisione approssimativa dei token di input. "Altro" include definizioni dei tool e overhead.',
-  "context.breakdown.system": "Sistema",
-  "context.breakdown.user": "Utente",
-  "context.breakdown.assistant": "Assistente",
-  "context.breakdown.tool": "Chiamate tool",
-  "context.breakdown.other": "Altro",
-  "context.systemPrompt.title": "Prompt di sistema",
-  "context.rawMessages.title": "Messaggi grezzi",
-  "context.stats.session": "Sessione",
-  "context.stats.messages": "Messaggi",
-  "context.stats.provider": "Provider",
-  "context.stats.model": "Modello",
-  "context.stats.limit": "Limite contesto",
-  "context.stats.totalTokens": "Token totali",
-  "context.stats.usage": "Utilizzo",
-  "context.stats.inputTokens": "Token input",
-  "context.stats.outputTokens": "Token output",
-  "context.stats.reasoningTokens": "Token ragionamento",
-  "context.stats.cacheTokens": "Token cache (lettura/scrittura)",
-  "context.stats.userMessages": "Messaggi utente",
-  "context.stats.assistantMessages": "Messaggi assistente",
-  "context.stats.totalCost": "Costo totale",
-  "context.stats.sessionCreated": "Sessione creata",
-  "context.stats.lastActivity": "Ultima attività",
-  "context.usage.tokens": "Token",
-  "context.usage.usage": "Utilizzo",
-  "context.usage.cost": "Costo",
-  "context.usage.clickToView": "Fai clic per vedere il contesto",
-  "context.usage.view": "Visualizza utilizzo contesto",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-  "toast.language.title": "Lingua",
-  "toast.language.description": "Lingua impostata su {{language}}",
-  "toast.theme.title": "Tema cambiato",
-  "toast.scheme.title": "Schema colori",
-  "toast.workspace.enabled.title": "Workspace abilitati",
-  "toast.workspace.enabled.description": "Ora nella barra laterale sono mostrati più worktree",
-  "toast.workspace.disabled.title": "Workspace disabilitati",
-  "toast.workspace.disabled.description": "Nella barra laterale viene mostrato solo il worktree principale",
-  "toast.permissions.autoaccept.on.title": "Accettazione automatica modifiche attiva",
-  "toast.permissions.autoaccept.on.description": "Le richieste di autorizzazione saranno approvate automaticamente",
-  "toast.permissions.autoaccept.off.title": "Accettazione automatica modifiche interrotta",
-  "toast.permissions.autoaccept.off.description": "Le richieste di autorizzazione richiederanno approvazione",
-  "toast.model.none.title": "Nessun modello selezionato",
-  "toast.model.none.description": "Connetti un provider per riassumere questa sessione",
-  "toast.file.loadFailed.title": "Caricamento file non riuscito",
-  "toast.file.listFailed.title": "Elenco file non riuscito",
-  "toast.context.noLineSelection.title": "Nessuna selezione di righe",
-  "toast.context.noLineSelection.description": "Seleziona prima un intervallo di righe in una scheda file.",
-  "toast.session.share.copyFailed.title": "Copia URL negli appunti non riuscita",
-  "toast.session.share.success.title": "Sessione condivisa",
-  "toast.session.share.success.description": "URL di condivisione copiato negli appunti!",
-  "toast.session.share.failed.title": "Condivisione sessione non riuscita",
-  "toast.session.share.failed.description": "Si è verificato un errore durante la condivisione della sessione",
-  "toast.session.unshare.success.title": "Condivisione sessione rimossa",
-  "toast.session.unshare.success.description": "Condivisione sessione rimossa correttamente!",
-  "toast.session.unshare.failed.title": "Rimozione condivisione sessione non riuscita",
-  "toast.session.unshare.failed.description": "Si è verificato un errore durante la rimozione della condivisione",
-  "toast.session.listFailed.title": "Caricamento sessioni per {{project}} non riuscito",
-  "toast.update.title": "Aggiornamento disponibile",
-  "toast.update.description": "Una nuova versione di Kilo ({{version}}) è disponibile per l'installazione.",
-  "toast.update.action.installRestart": "Installa e riavvia",
-  "toast.update.action.notYet": "Non ora",
-  "error.page.title": "Qualcosa è andato storto",
-  "error.page.description": "Si è verificato un errore durante il caricamento dell'applicazione.",
-  "error.page.details.label": "Dettagli errore",
-  "error.page.action.restart": "Riavvia",
-  "error.page.action.checking": "Controllo...",
-  "error.page.action.checkUpdates": "Controlla aggiornamenti",
-  "error.page.action.updateTo": "Aggiorna a {{version}}",
-  "error.page.report.prefix": "Segnala questo errore al team Kilo",
-  "error.page.report.discord": "su Discord",
-  "error.page.version": "Versione: {{version}}",
-  "error.dev.rootNotFound":
-    "Elemento root non trovato. Hai dimenticato di aggiungerlo a index.html? O forse l'attributo id è scritto male?",
-  "error.globalSync.connectFailed": "Impossibile connettersi al server. C'è un server in esecuzione su `{{url}}`?",
   "error.startup.title": "Connessione al server non riuscita",
   "error.paidModel.title": "Devi accedere per usare questo modello",
   "error.paidModel.description":
@@ -479,29 +180,8 @@ export const dict = {
   "error.promotionLimit.description":
     "Registrati gratis per continuare ed esplorare altri 500 modelli. Richiede 2 minuti, senza carta di credito. Oppure torna più tardi.",
   "error.promotionLimit.action": "Registrati",
-  "error.chain.unknown": "Errore sconosciuto",
-  "error.chain.causedBy": "Causato da:",
-  "error.chain.apiError": "Errore API",
-  "error.chain.status": "Stato: {{status}}",
-  "error.chain.retryable": "Ritentabile: {{retryable}}",
-  "error.chain.responseBody": "Corpo risposta:\n{{body}}",
-  "error.chain.didYouMean": "Intendevi: {{suggestions}}",
-  "error.chain.modelNotFound": "Modello non trovato: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Controlla i nomi provider/modello nella configurazione (opencode.json)",
-  "error.chain.mcpFailed": 'Server MCP "{{name}}" non riuscito. Nota: Kilo non supporta ancora l\'autenticazione MCP.',
-  "error.chain.providerAuthFailed": "Autenticazione provider non riuscita ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Inizializzazione provider "{{provider}}" non riuscita. Controlla credenziali e configurazione.',
-  "error.chain.configJsonInvalid": "Il file di configurazione in {{path}} non è JSON(C) valido",
-  "error.chain.configJsonInvalidWithMessage": "Il file di configurazione in {{path}} non è JSON(C) valido: {{message}}",
-  "error.chain.configDirectoryTypo":
-    'La directory "{{dir}}" in {{path}} non è valida. Rinomina la directory in "{{suggestion}}" o rimuovila. È un errore di battitura comune.',
-  "error.chain.configFrontmatterError": "Parsing del frontmatter non riuscito in {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Il file di configurazione in {{path}} non è valido",
-  "error.chain.configInvalidWithMessage": "Il file di configurazione in {{path}} non è valido: {{message}}",
   "notification.permission.title": "Autorizzazione richiesta",
   "notification.permission.titleSubagent": "Autorizzazione richiesta (sub-agent)",
-  "notification.permission.description": "{{sessionTitle}} in {{projectName}} richiede autorizzazione",
   "ui.permission.manageAutoApprove": "Gestisci regole approvazione automatica",
   "ui.permission.doomLoop.prompt": "Rilevato un potenziale ciclo nello strumento {{tool}}. Continuare l'esecuzione?",
   "ui.permission.doomLoop.rule": "Continua le chiamate a {{tool}}",
@@ -526,7 +206,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Todo Read",
   "ui.permission.toolLabel.todoWrite": "Todo Write",
   "ui.permission.toolLabel.codeSearch": "Ricerca codice",
-  "ui.permission.toggleWrap": "Attiva/disattiva ritorno a capo",
   "ui.permission.copyCommand": "Copia",
   "ui.approval.auto": "Approvato automaticamente",
   "ui.approval.manual": "Approvato da te",
@@ -538,140 +217,24 @@ export const dict = {
   "ui.approval.source.yolo": "dalla modalità di approvazione automatica (YOLO)",
   "ui.approval.source.session": "da una regola di approvazione automatica della sessione",
   "ui.approval.source.default": "per impostazione predefinita",
-  "notification.question.title": "Domanda",
-  "notification.question.description": "{{sessionTitle}} in {{projectName}} ha una domanda",
-  "notification.action.goToSession": "Vai alla sessione",
-  "notification.session.responseReady.title": "Risposta pronta",
-  "notification.session.error.title": "Errore sessione",
-  "notification.session.error.fallbackDescription": "Si è verificato un errore",
-  "home.recentProjects": "Progetti recenti",
-  "home.empty.title": "Nessun progetto recente",
-  "home.empty.description": "Inizia aprendo un progetto locale",
-  "session.tab.session": "Sessione",
   "session.tab.review": "Revisione",
-  "session.tab.context": "Contesto",
-  "session.panel.reviewAndFiles": "Revisione e file",
   "session.review.filesChanged": "{{count}} file modificati",
-  "session.review.change.one": "Modifica",
   "session.review.change.other": "Modifiche",
   "session.review.loadingChanges": "Caricamento modifiche...",
-  "session.review.empty": "Ancora nessuna modifica in questa sessione",
   "session.review.noChanges": "Nessuna modifica",
-  "session.files.selectToOpen": "Seleziona un file da aprire",
-  "session.files.all": "Tutti i file",
-  "session.files.binaryContent": "File binario (il contenuto non può essere mostrato)",
-  "session.messages.renderEarlier": "Mostra messaggi precedenti",
   "session.messages.loadingEarlier": "Caricamento messaggi precedenti...",
   "session.messages.loadEarlier": "Carica messaggi precedenti",
   "session.messages.loading": "Caricamento messaggi...",
-  "session.messages.jumpToLatest": "Vai al più recente",
-  "session.context.addToContext": "Aggiungi {{selection}} al contesto",
-  "session.new.worktree.main": "Branch principale",
-  "session.new.worktree.mainWithBranch": "Branch principale ({{branch}})",
-  "session.new.worktree.create": "Crea nuovo worktree",
-  "session.new.lastModified": "Ultima modifica",
-  "session.header.search.placeholder": "Cerca {{project}}",
-  "session.header.searchFiles": "Cerca file",
-  "session.header.openIn": "Apri in",
-  "session.header.open.action": "Apri {{app}}",
-  "session.header.open.ariaLabel": "Apri in {{app}}",
-  "session.header.open.menu": "Opzioni di apertura",
-  "session.header.open.copyPath": "Copia percorso",
-  "status.popover.trigger": "Stato",
-  "status.popover.ariaLabel": "Configurazioni server",
-  "status.popover.tab.servers": "Server",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugin",
-  "status.popover.action.manageServers": "Gestisci server",
-  "session.share.popover.title": "Pubblica sul web",
-  "session.share.popover.description.shared":
-    "Questa sessione è pubblica sul web. È accessibile a chiunque abbia il link.",
-  "session.share.popover.description.unshared":
-    "Condividi pubblicamente la sessione sul web. Sarà accessibile a chiunque abbia il link.",
-  "session.share.action.share": "Condividi",
-  "session.share.action.publish": "Pubblica",
-  "session.share.action.publishing": "Pubblicazione...",
-  "session.share.action.unpublish": "Annulla pubblicazione",
-  "session.share.action.unpublishing": "Annullamento pubblicazione...",
-  "session.share.action.view": "Visualizza",
-  "session.share.copy.copied": "Copiato",
-  "session.share.copy.copyLink": "Copia link",
-  "lsp.tooltip.none": "Nessun server LSP",
-  "lsp.label.connected": "{{count}} LSP",
-  "prompt.loading": "Caricamento prompt...",
-  "terminal.loading": "Caricamento terminale...",
-  "terminal.title": "Terminale",
-  "terminal.title.numbered": "Terminale {{number}}",
-  "terminal.close": "Chiudi terminale",
-  "terminal.connectionLost.title": "Connessione persa",
-  "terminal.connectionLost.description":
-    "La connessione del terminale è stata interrotta. Questo può succedere quando il server si riavvia.",
   "common.closeTab": "Chiudi scheda",
   "common.signIn": "Accedi",
-  "common.signOut": "Esci",
   "common.dismiss": "Ignora",
   "common.requestFailed": "Richiesta non riuscita",
-  "common.moreOptions": "Altre opzioni",
-  "common.learnMore": "Scopri di più",
   "common.rename": "Rinomina",
-  "common.reset": "Ripristina",
-  "common.archive": "Archivia",
   "common.delete": "Elimina",
   "common.close": "Chiudi",
   "common.edit": "Modifica",
   "common.loadMore": "Carica altro",
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "Mostra/nascondi menu",
-  "sidebar.nav.projectsAndSessions": "Progetti e sessioni",
   "sidebar.settings": "Impostazioni",
-  "sidebar.help": "Aiuto",
-  "sidebar.workspaces.enable": "Abilita workspace",
-  "sidebar.workspaces.disable": "Disabilita workspace",
-  "sidebar.gettingStarted.title": "Per iniziare",
-  "sidebar.gettingStarted.line1": "Kilo include modelli gratuiti, così puoi iniziare subito.",
-  "sidebar.gettingStarted.line2": "Connetti un provider per usare modelli come Claude, GPT, Gemini e altri.",
-  "sidebar.project.recentSessions": "Sessioni recenti",
-  "sidebar.project.viewAllSessions": "Visualizza tutte le sessioni",
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Server",
-  "settings.tab.general": "Generale",
-  "settings.tab.shortcuts": "Scorciatoie",
-  "settings.general.section.appearance": "Aspetto",
-  "settings.general.section.notifications": "Notifiche di sistema",
-  "settings.general.section.updates": "Aggiornamenti",
-  "settings.general.section.sounds": "Effetti sonori",
-  "settings.general.row.language.title": "Lingua",
-  "settings.general.row.language.description": "Cambia la lingua di visualizzazione di Kilo",
-  "settings.general.row.appearance.title": "Aspetto",
-  "settings.general.row.appearance.description": "Personalizza l'aspetto di Kilo sul tuo dispositivo",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Personalizza il tema di Kilo.",
-  "settings.general.row.font.title": "Font codice",
-  "settings.general.row.font.description": "Personalizza il font usato nei blocchi di codice",
-  "settings.general.row.releaseNotes.title": "Note di rilascio",
-  "settings.general.row.releaseNotes.description": "Mostra i popup Novità dopo gli aggiornamenti",
-  "settings.updates.row.startup.title": "Controlla aggiornamenti all'avvio",
-  "settings.updates.row.startup.description": "Controlla automaticamente gli aggiornamenti quando Kilo si avvia",
-  "settings.updates.row.check.title": "Controlla aggiornamenti",
-  "settings.updates.row.check.description": "Controlla manualmente gli aggiornamenti e installali se disponibili",
-  "settings.updates.action.checkNow": "Controlla ora",
-  "settings.updates.action.checking": "Controllo...",
-  "settings.updates.toast.latest.title": "Sei aggiornato",
-  "settings.updates.toast.latest.description": "Stai usando la versione più recente di Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Avviso 01",
   "sound.option.alert02": "Avviso 02",
   "sound.option.alert03": "Avviso 03",
@@ -717,40 +280,7 @@ export const dict = {
   "sound.option.yup04": "Sì 04",
   "sound.option.yup05": "Sì 05",
   "sound.option.yup06": "Sì 06",
-  "settings.general.notifications.agent.title": "Agente",
-  "settings.general.notifications.agent.description":
-    "Mostra una notifica di sistema quando l'agente ha completato o richiede attenzione",
-  "settings.general.notifications.permissions.title": "Autorizzazioni",
-  "settings.general.notifications.permissions.description":
-    "Mostra una notifica di sistema quando è richiesta un'autorizzazione",
-  "settings.general.notifications.errors.title": "Errori",
-  "settings.general.notifications.errors.description": "Mostra una notifica di sistema quando si verifica un errore",
-  "settings.general.sounds.agent.title": "Agente",
-  "settings.general.sounds.agent.description": "Riproduci un suono quando l'agente ha completato o richiede attenzione",
-  "settings.general.sounds.permissions.title": "Autorizzazioni",
-  "settings.general.sounds.permissions.description": "Riproduci un suono quando è richiesta un'autorizzazione",
-  "settings.general.sounds.errors.title": "Errori",
-  "settings.general.sounds.errors.description": "Riproduci un suono quando si verifica un errore",
-  "settings.shortcuts.title": "Scorciatoie",
-  "settings.shortcuts.reset.button": "Ripristina predefinite",
-  "settings.shortcuts.reset.toast.title": "Scorciatoie ripristinate",
-  "settings.shortcuts.reset.toast.description": "Le scorciatoie sono state riportate ai valori predefiniti.",
-  "settings.shortcuts.conflict.title": "Scorciatoia già in uso",
-  "settings.shortcuts.conflict.description": "{{keybind}} è già assegnata a {{titles}}.",
-  "settings.shortcuts.unassigned": "Non assegnata",
-  "settings.shortcuts.pressKeys": "Premi tasti",
-  "settings.shortcuts.search.placeholder": "Cerca scorciatoie",
-  "settings.shortcuts.search.empty": "Nessuna scorciatoia trovata",
-  "settings.shortcuts.group.general": "Generale",
-  "settings.shortcuts.group.session": "Sessione",
-  "settings.shortcuts.group.navigation": "Navigazione",
-  "settings.shortcuts.group.modelAndAgent": "Modello e agente",
-  "settings.shortcuts.group.terminal": "Terminale",
-  "settings.shortcuts.group.prompt": "Prompt",
   "settings.providers.title": "Provider",
-  "settings.providers.description": "Le impostazioni dei provider possono essere configurate qui.",
-  "settings.providers.betaNotice":
-    "Al momento solo il provider Kilo Gateway può essere configurato dall'interfaccia delle impostazioni. Il supporto per altri provider arriverà durante il periodo beta. Nel frattempo puoi configurare i provider con la CLI o il file di configurazione. Ci impegniamo a mantenere Kilo aperto, senza lock-in.",
   "settings.providers.section.connected": "Provider connessi",
   "settings.providers.connected.empty": "Nessun provider connesso",
   "settings.providers.section.popular": "Provider popolari",
@@ -827,9 +357,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Rimuovi modello",
   "provider.custom.models.add": "Aggiungi modello",
-  "provider.custom.models.fetch": "Recupera modelli",
-  "provider.custom.models.fetching": "Recupero...",
-  "provider.custom.models.fetch.error": "Recupero modelli non riuscito: {{error}}",
   "provider.custom.models.fetch.authError": "Autenticazione non riuscita. Controlla l'API key sopra e riprova.",
   "provider.custom.models.fetch.empty": "Nessun modello trovato su questo server.",
   "provider.custom.models.fetch.added": "Aggiunti {{count}} modelli.",
@@ -881,20 +408,7 @@ export const dict = {
   "settings.config.source.projectKilocode": "Config legacy progetto .kilocode",
   "settings.config.source.projectOpencode": "Config legacy progetto .opencode",
   "settings.models.title": "Modelli",
-  "settings.models.description": "Le impostazioni dei modelli possono essere configurate qui.",
-  "settings.agents.title": "Agenti",
-  "settings.agents.description": "Configura qui le impostazioni degli agenti.",
-  "settings.commands.title": "Comandi",
-  "settings.commands.description": "Le impostazioni dei comandi possono essere configurate qui.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "Le impostazioni MCP possono essere configurate qui.",
-  "settings.permissions.title": "Autorizzazioni",
-  "settings.permissions.description": "Determina quali tool il server può usare di default.",
-  "settings.permissions.section.tools": "Tool",
   "settings.permissions.toast.updateFailed.title": "Aggiornamento autorizzazioni non riuscito",
-  "settings.permissions.action.allow": "Consenti",
-  "settings.permissions.action.ask": "Chiedi",
-  "settings.permissions.action.deny": "Nega",
   "settings.permissions.tool.read.title": "Lettura (Read)",
   "settings.permissions.tool.read.description": "Legge un file (corrisponde al percorso file)",
   "settings.permissions.tool.edit.title": "Modifica (Edit)",
@@ -927,7 +441,6 @@ export const dict = {
   "settings.permissions.tool.external_directory.description": "Accede a file fuori dalla directory del progetto",
   "settings.permissions.tool.doom_loop.title": "Loop ripetuto (Doom Loop)",
   "settings.permissions.tool.doom_loop.description": "Rileva chiamate tool ripetute con input identico",
-  "session.delete.failed.title": "Eliminazione sessione non riuscita",
   "session.delete.title": "Elimina sessione",
   "session.delete.confirm": 'Eliminare la sessione "{{name}}"?',
   "session.delete.button": "Elimina sessione",
@@ -955,14 +468,9 @@ export const dict = {
   "feedback.dialog.support": "Supporto clienti",
   "workStyle.onboarding.welcome": "Ti diamo il benvenuto in Kilo",
   "workStyle.onboarding.title": "Scegli come vuoi lavorare",
-  "workStyle.onboarding.description":
-    "Imposta i valori iniziali per autorizzazioni, blocchi di ragionamento, output del terminale e timeline del contesto. Viene applicato una sola volta e ignora le impostazioni già personalizzate.",
   "workStyle.onboarding.settingsNote": "Puoi modificare queste opzioni in qualsiasi momento in",
   "workStyle.onboarding.settings": "Impostazioni.",
-  "workStyle.onboarding.skip": "Ignora per ora",
   "workStyle.toast.saved.title": "Modalità salvata correttamente",
-  "workStyle.toast.saved.description": "Aggiorna le tue preferenze in qualsiasi momento nelle Impostazioni.",
-  "workStyle.toast.saved.action": "Vai alle Impostazioni",
   "workStyle.choice.permissions": "Autorizzazioni",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Visibilità",
@@ -985,31 +493,6 @@ export const dict = {
   "session.cloud.import.invalid": "Formato ID sessione non valido",
   "session.cloud.import.legacy": "Questa sembra essere una sessione legacy non più supportata.",
   "session.cloud.import.failed": "Importazione sessione cloud non riuscita",
-  "workspace.new": "Nuovo workspace",
-  "workspace.type.local": "locale",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Creazione workspace non riuscita",
-  "workspace.delete.failed.title": "Eliminazione workspace non riuscita",
-  "workspace.resetting.title": "Reset workspace",
-  "workspace.resetting.description": "Potrebbe richiedere un minuto.",
-  "workspace.reset.failed.title": "Reset workspace non riuscito",
-  "workspace.reset.success.title": "Workspace resettato",
-  "workspace.reset.success.description": "Il workspace ora corrisponde al branch predefinito.",
-  "workspace.error.stillPreparing": "Il workspace è ancora in preparazione",
-  "workspace.status.checking": "Controllo modifiche non mergiate...",
-  "workspace.status.error": "Impossibile verificare lo stato git.",
-  "workspace.status.clean": "Nessuna modifica non mergiata rilevata.",
-  "workspace.status.dirty": "Modifiche non mergiate rilevate in questo workspace.",
-  "workspace.delete.title": "Elimina workspace",
-  "workspace.delete.confirm": 'Eliminare il workspace "{{name}}"?',
-  "workspace.delete.button": "Elimina workspace",
-  "workspace.reset.title": "Reset workspace",
-  "workspace.reset.confirm": 'Resettare il workspace "{{name}}"?',
-  "workspace.reset.button": "Reset workspace",
-  "workspace.reset.archived.none": "Nessuna sessione attiva verrà archiviata.",
-  "workspace.reset.archived.one": "1 sessione verrà archiviata.",
-  "workspace.reset.archived.many": "{{count}} sessioni verranno archiviate.",
-  "workspace.reset.note": "Questo resetterà il workspace per farlo corrispondere al branch predefinito.",
   "deviceAuth.toast.urlCopied": "URL copiato negli appunti",
   "deviceAuth.toast.codeCopied": "Codice copiato negli appunti",
   "deviceAuth.toast.errorCopied": "Errore copiato negli appunti",
@@ -1044,7 +527,6 @@ export const dict = {
   "profile.pass.bonus": "Bonus",
   "profile.pass.renews": "Si rinnova",
   "profile.action.logout": "Esci",
-  "settings.section.configuration": "Configurazione",
   "settings.agentBehaviour.title": "Comportamento agente",
   "settings.autoApprove.title": "Approvazione automatica",
   "settings.browser.title": "Browser",
@@ -1087,7 +569,6 @@ export const dict = {
   "settings.experimental.title": "Sperimentale",
   "settings.language.title": "Lingua",
   "settings.aboutKiloCode.title": "Informazioni su Kilo Code",
-  "session.messages.empty": "Avvia una conversazione scrivendo un messaggio qui sotto.",
   "session.messages.welcome":
     "Kilo Code è un assistente AI per il coding. Chiedigli di creare feature, correggere bug o spiegare il codebase.",
   "session.messages.scrollToBottom": "Scorri in fondo",
@@ -1095,12 +576,10 @@ export const dict = {
   "session.messages.taskStarting": "Avvio...",
   "session.status.writingResponse": "Scrittura risposta...",
   "session.status.retry": "Riprovo...",
-  "session.status.retrying": "Riprovo (tentativo {{ attempt }})... {{ message }}",
   "session.status.working": "Al lavoro...",
   "session.status.offline": "Rete disconnessa - riconnessione...",
   "sidebar.session.newSession": "Nuova sessione",
   "sidebar.session.newSession.tooltip": "Avvia una nuova conversazione mantenendo intatta la sessione corrente.",
-  "sidebar.session.newSession.disabled": "Questa sessione è già nuova. Inizia a chattare o crea invece un worktree.",
   "sidebar.session.newWorktree": "Nuovo worktree",
   "sidebar.session.newWorktree.tooltip":
     "Crea un worktree git isolato per sperimentare in sicurezza, tenere separate le modifiche ed eseguire sessioni parallele senza interferire con il branch corrente.",
@@ -1116,13 +595,6 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Sposta questa conversazione e {{files}} file modificati in un worktree dedicato per lavoro successivo isolato.",
   "sidebar.session.showChanges.tooltip.empty": "Apri la vista modifiche per ispezionare il working tree corrente.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 file modificato · +{{additions}} -{{deletions}}. Apri la vista modifiche.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} file modificati · +{{additions}} -{{deletions}}. Apri la vista modifiche.",
-  "sidebar.session.agentManager.tooltip":
-    "Apri Agent Manager per una panoramica completa di sessioni parallele e worktree, così puoi coordinare task lunghi in un unico posto.",
-  "sidebar.session.openAgentManager": "Apri Agent Manager",
   "sidebar.session.progress.capturing": "Acquisizione modifiche...",
   "sidebar.session.progress.creating": "Creazione worktree...",
   "sidebar.session.progress.setup": "Esecuzione setup...",
@@ -1139,11 +611,6 @@ export const dict = {
   "context.usage.sessionCost": "Costo sessione",
   "context.usage.olderSessions": "{{count}} sessioni precedenti",
   "context.stats.thisSession": "Questa sessione",
-  "time.justNow": "ora",
-  "time.minutesAgo": "{{count}} min fa",
-  "time.hoursAgo": "{{count}}h fa",
-  "time.daysAgo": "{{count}}g fa",
-  "time.monthsAgo": "{{count}} mesi fa",
   "time.today": "Oggi",
   "time.yesterday": "Ieri",
   "time.thisWeek": "Questa settimana",
@@ -1158,7 +625,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Porta:",
   "settings.aboutKiloCode.versionInfo": "Informazioni versione",
   "settings.aboutKiloCode.version.label": "Versione:",
-  "settings.aboutKiloCode.extensionName": "Estensione Kilo Code",
   "settings.aboutKiloCode.community": "Community e supporto",
   "settings.aboutKiloCode.feedback.prefix": "Per domande o feedback, apri pure una issue su",
   "settings.aboutKiloCode.feedback.or": "oppure",
@@ -1202,7 +668,6 @@ export const dict = {
   "settings.language.auto": "Auto (lingua VS Code)",
   "settings.language.current": "Corrente:",
   "common.add": "Aggiungi",
-  "common.choose": "Scegli...",
   "settings.autocomplete.model.title": "Modello autocompletamento",
   "settings.autocomplete.model.description": "Seleziona il modello usato per i completamenti inline del codice",
   "settings.autocomplete.autoTrigger.title": "Abilita completamenti inline automatici",
@@ -1213,28 +678,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "Abilita autocompletamento textarea chat",
   "settings.autocomplete.chatAutocomplete.description":
     "Mostra suggerimenti di autocompletamento nella textarea della chat",
-  "settings.notifications.agent.title": "Completamento agente",
-  "settings.notifications.agent.description": "Mostra una notifica quando l'agente completa un task",
-  "settings.notifications.permissions.title": "Richieste autorizzazione",
-  "settings.notifications.permissions.description": "Mostra una notifica per le richieste di autorizzazione",
-  "settings.notifications.errors.title": "Errori",
-  "settings.notifications.errors.description": "Mostra una notifica per gli errori",
   "settings.notifications.sounds": "Suoni",
   "settings.notifications.enable.title": "Abilita le notifiche sonore",
   "settings.notifications.enable.description":
     "Riproduci suoni quando le sessioni si concludono, si verifica un errore o è richiesto il tuo intervento",
   "settings.notifications.testSound": "Prova",
-  "settings.notifications.agentSound.title": "Suono completamento agente",
-  "settings.notifications.agentSound.description": "Suono da riprodurre quando l'agente completa un task",
-  "settings.notifications.permSound.title": "Suono richiesta autorizzazione",
-  "settings.notifications.permSound.description": "Suono da riprodurre per le richieste di autorizzazione",
-  "settings.notifications.errorSound.title": "Suono errore",
-  "settings.notifications.errorSound.description": "Suono da riprodurre per gli errori",
   "settings.notifications.sound.default": "Predefinito",
   "settings.notifications.sound.system": "Sistema",
   "settings.notifications.sound.description":
     "L'opzione predefinita usa suoni diversi per completamento, intervento ed errori. Le altre opzioni usano un unico suono per tutti gli eventi.",
-  "settings.notifications.sound.none": "Nessuno",
   "settings.experimental.share.title": "Modalità condivisione",
   "settings.experimental.share.description": "Come si comporta la condivisione sessione",
   "settings.experimental.share.manual": "Manuale",
@@ -1293,13 +745,8 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Agente predefinito",
   "settings.agentBehaviour.defaultAgent.description": "Agente da usare quando non ne viene specificato uno",
   "settings.agentBehaviour.availableAgents": "Agenti disponibili",
-  "settings.agentBehaviour.selectAgent": "Seleziona un agente da configurare...",
-  "settings.agentBehaviour.selectAgent.title": "Agente",
-  "settings.agentBehaviour.selectAgent.description": "Seleziona un agente da configurare...",
   "settings.agentBehaviour.modelOverride.title": "Modello personalizzato",
   "settings.agentBehaviour.modelOverride.description": "Sostituisci il modello predefinito per questo agente",
-  "settings.agentBehaviour.prompt.title": "Prompt personalizzato",
-  "settings.agentBehaviour.prompt.description": "Prompt di sistema aggiuntivo per questo agente",
   "settings.agentBehaviour.temperature.title": "Temperatura",
   "settings.agentBehaviour.temperature.description":
     "Controlla il grado di casualità delle risposte dell’IA (0–2). Valori più bassi (ad es. 0.2) producono risultati mirati e coerenti. Valori più alti (ad es. 1.0) producono risposte più varie e creative. Lascia vuoto per usare il valore predefinito del modello.",
@@ -1320,7 +767,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Skill rilevate",
   "settings.agentBehaviour.noSkillsFound":
     "Nessuna skill rilevata. Aggiungi percorsi cartella o URL di skill qui sotto per renderle disponibili.",
-  "settings.agentBehaviour.availableModes": "Modalità personalizzate disponibili",
   "prompt.action.sandbox.enable": "Abilita sandbox",
   "prompt.action.sandbox.disable": "Disabilita sandbox",
   "prompt.action.sandbox.enabled":
@@ -1366,7 +812,6 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Comando",
   "settings.agentBehaviour.mcpDetail.args": "Argomenti",
   "settings.agentBehaviour.mcpDetail.env": "Ambiente",
-  "settings.agentBehaviour.mcpDetail.disabled": "Questo server è disabilitato.",
   "settings.agentBehaviour.editMcp": "Modifica server MCP",
   "settings.agentBehaviour.editMcp.transportLocal": "Server locale (trasporto stdio)",
   "settings.agentBehaviour.editMcp.transportRemote": "Server remoto (trasporto SSE/HTTP)",
@@ -1383,7 +828,6 @@ export const dict = {
   "settings.agentBehaviour.mcpBrowseMarketplace": "Sfoglia Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Nessun server MCP configurato. Aggiungi server MCP in kilo.jsonc, o chiedi all'agente di aggiungerli per te.",
-  "settings.agentBehaviour.workflowsPlaceholder": "I workflow sono gestiti tramite file workflow nel workspace.",
   "settings.agentBehaviour.workflows.description":
     "I workflow sono comandi slash personalizzati definiti nella configurazione. Scrivi /nome-comando nella chat per invocarli. I comandi sono configurati in opencode.json nella sezione 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1509,7 +953,6 @@ export const dict = {
     "es. Genera messaggi di commit in spagnolo seguendo il formato conventional commits. Restituisci SOLO il messaggio di commit.",
 
   "settings.commitMessage.language.sync": "Sincronizzazione con la lingua dell'interfaccia utente",
-  "settings.commitMessage.language.title": "Lingua",
   "settings.commitMessage.language.description": "Scegli quale lingua usare per i messaggi di commit generati da AI:",
 
   "settings.display.username.title": "Nome utente",
@@ -1552,12 +995,7 @@ export const dict = {
   "settings.providers.disabled": "Provider disabilitati",
   "settings.providers.disabled.description": "Provider da nascondere dalla lista provider",
   "settings.providers.disabled.enable": "Abilita",
-  "settings.providers.enabled": "Provider abilitati (allowlist)",
-  "settings.providers.enabled.description":
-    "Se impostato, saranno disponibili solo questi provider (allowlist esclusiva)",
   "settings.providers.notSet": "Non impostato (usa default server)",
-  "settings.providers.custom.note": "Aggiungi un provider personalizzato tramite URL base.",
-  "settings.providers.search.placeholder": "Cerca provider",
   "settings.providers.select.placeholder": "Seleziona provider...",
   "dialog.model.notSet": "Non impostato",
   "profile.personalAccount": "Account personale",
@@ -1591,9 +1029,7 @@ export const dict = {
   "migration.migrate.subtitle":
     "Abbiamo trovato impostazioni dalla precedente installazione. Ecco cosa possiamo importare.",
   "migration.migrate.selectLabel": "Seleziona cosa migrare",
-  "migration.migrate.cannotMigrate": "Non può essere migrato",
   "migration.migrate.chatHistory": "Sessioni chat e cronologia",
-  "migration.migrate.chatHistoryDesc": "Incompatibile con la nuova architettura",
   "migration.migrate.button": "Migra impostazioni",
   "migration.migrate.skip": "Salta",
   "migration.migrate.keysDetected": "{{count}} chiavi rilevate",
@@ -1613,10 +1049,7 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Rimuove le vecchie impostazioni dallo storage di VS Code. Non potrai rieseguire questa migrazione.",
   "migration.complete.done": "Fine",
-  "migration.error.sessionFailed": "Migrazione sessione non riuscita",
   "migration.error.continue": "Continua",
-  "migration.error.action.copy": "Copia",
-  "migration.error.toast.copied": "Errore copiato negli appunti",
   "migration.sessionSummary.title": "Riepilogo:",
   "migration.sessionSummary.copy": "Copia report",
   "migration.sessionSummary.toast.copied": "Report copiato",
@@ -1714,9 +1147,6 @@ export const dict = {
   "session.costAlert.stop": "Interrompi",
 
   // Speech to Text
-  "settings.experimental.speechToText.title": "Da voce a testo",
-  "settings.experimental.speechToText.description":
-    "Abilita input vocale nei campi prompt usando il tuo account Kilo tramite Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Abilita e accedi al provider Kilo per usare Da voce a testo. Da voce a testo è attualmente supportato solo tramite Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Modello Da voce a testo",
@@ -1745,8 +1175,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Abilita per questo progetto",
   "settings.indexing.projectEnable.description":
     "Abilita l'indicizzazione per questo workspace quando l'indicizzazione globale è disattivata.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "L'indicizzazione globale è abilitata, quindi questo progetto è già coperto.",
   "settings.indexing.kiloModel.title": "Preset modello Kilo",
   "settings.indexing.kiloModel.description": "Scegli un modello embedding ospitato da Kilo.",
   "settings.indexing.kiloSignIn.title": "Accesso Kilo richiesto",
@@ -1796,8 +1224,6 @@ export const dict = {
   "agentRequirements.error.requestFailed": "Kilo non ha potuto controllare i requisiti dell’agente.",
 
   // Model groups
-  "model.group.collapse": "Comprimi {{group}}",
-  "model.group.expand": "Espandi {{group}}",
 
   // Plan exit
   "plan.exit.ready": "Il piano è pronto:",
@@ -1820,13 +1246,7 @@ export const dict = {
   "speechToText.tooltip.error": "Input vocale fallito. Fai clic per cancellare.",
   "speechToText.error.title": "Input vocale fallito",
   "speechToText.error.loginRequired": "Accedi a Kilo per usare l'input vocale.",
-  "speechToText.error.permission": "Permesso microfono negato.",
-  "speechToText.error.microphone": "Impossibile avviare il microfono.",
-  "speechToText.error.recording": "Registrazione fallita.",
-  "speechToText.error.emptyRecording": "Nessun audio registrato.",
   "speechToText.error.emptyTranscript": "Nessun parlato rilevato.",
-  "speechToText.error.encoding": "Impossibile codificare la registrazione.",
-  "speechToText.toast.transcribed": "Trascrizione inserita",
   "chat.search.placeholder": "Cerca nella chat…",
   "chat.search.toggle": "Cerca nella chat",
   "chat.search.matchCase": "Maiuscole/minuscole",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index b30e7a4a95d..b338abd210f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "おすすめ",
-  "command.category.view": "表示",
-  "command.category.project": "プロジェクト",
-  "command.category.provider": "プロバイダー",
-  "command.category.server": "サーバー",
-  "command.category.session": "セッション",
-  "command.category.theme": "テーマ",
-  "command.category.language": "言語",
-  "command.category.file": "ファイル",
-  "command.category.context": "コンテキスト",
-  "command.category.terminal": "ターミナル",
-  "command.category.model": "モデル",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "エージェント",
-  "command.category.permissions": "権限",
-  "command.category.workspace": "ワークスペース",
 
-  "command.category.settings": "設定",
-  "theme.scheme.system": "システム",
-  "theme.scheme.light": "ライト",
-  "theme.scheme.dark": "ダーク",
-
-  "command.sidebar.toggle": "サイドバーの切り替え",
-  "command.project.open": "プロジェクトを開く",
   "command.provider.connect": "プロバイダーに接続",
-  "command.server.switch": "サーバーの切り替え",
-  "command.settings.open": "設定を開く",
-  "command.session.previous": "前のセッション",
-  "command.session.next": "次のセッション",
-  "command.session.previous.unseen": "前の未読セッション",
-  "command.session.next.unseen": "次の未読セッション",
-  "command.session.archive": "セッションをアーカイブ",
-
-  "command.palette": "コマンドパレット",
-
-  "command.theme.cycle": "テーマの切り替え",
-  "command.theme.set": "テーマを使用: {{theme}}",
-  "command.theme.scheme.cycle": "配色の切り替え",
-  "command.theme.scheme.set": "配色を使用: {{scheme}}",
-
-  "command.language.cycle": "言語の切り替え",
-  "command.language.set": "言語を使用: {{language}}",
 
   "command.session.new": "新しいセッション",
-  "command.session.new.task": "新しいタスク",
   "command.session.show.changes": "変更を表示",
-  "command.file.open": "ファイルを開く",
-  "command.tab.close": "タブを閉じる",
-  "command.context.addSelection": "選択範囲をコンテキストに追加",
-  "command.context.addSelection.description": "現在のファイルから選択した行を追加",
-  "command.terminal.toggle": "ターミナルの切り替え",
-  "command.fileTree.toggle": "ファイルツリーを切り替え",
   "command.review.toggle": "レビューの切り替え",
-  "command.terminal.new": "新しいターミナル",
-  "command.terminal.new.description": "新しいターミナルタブを作成",
-  "command.steps.toggle": "ステップの切り替え",
-  "command.steps.toggle.description": "現在のメッセージのステップを表示または非表示",
-  "command.message.previous": "前のメッセージ",
-  "command.message.previous.description": "前のユーザーメッセージに移動",
-  "command.message.next": "次のメッセージ",
-  "command.message.next.description": "次のユーザーメッセージに移動",
-  "command.model.choose": "モデルを選択",
-  "command.model.choose.description": "別のモデルを選択",
-  "command.mcp.toggle": "MCPの切り替え",
-  "command.mcp.toggle.description": "MCPを切り替える",
-  "command.agent.cycle": "エージェントの切り替え",
-  "command.agent.cycle.description": "次のエージェントに切り替え",
-  "command.agent.cycle.reverse": "エージェントを逆順に切り替え",
-  "command.agent.cycle.reverse.description": "前のエージェントに切り替え",
-  "command.model.variant.cycle": "思考レベルの切り替え",
-  "command.model.variant.cycle.description": "次の思考レベルに切り替え",
-  "command.permissions.autoaccept.enable": "編集を自動承認",
-  "command.permissions.autoaccept.disable": "編集の自動承認を停止",
-  "command.workspace.toggle": "ワークスペースを切り替え",
-  "command.workspace.toggle.description": "サイドバーの複数ワークスペースを有効または無効にする",
-  "command.session.undo": "元に戻す",
-  "command.session.undo.description": "最後のメッセージを元に戻す",
-  "command.session.redo": "やり直す",
-  "command.session.redo.description": "元に戻したメッセージをやり直す",
   "revert.banner.count_one": "{{count}} 件のメッセージが元に戻されました",
   "revert.banner.count_other": "{{count}} 件のメッセージが元に戻されました",
   "revert.banner.redo": "やり直し",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "スナップショットを有効にする",
   "revert.disabled.agentBusy": "エージェントの完了を待ってください",
   "command.session.compact": "セッションを圧縮",
-  "command.session.compact.description": "セッションを要約してコンテキストサイズを削減",
-  "command.session.fork": "メッセージからフォーク",
-  "command.session.fork.description": "以前のメッセージから新しいセッションを作成",
-  "command.session.share": "セッションを共有",
-  "command.session.share.description": "このセッションを共有しURLをクリップボードにコピー",
-  "command.session.unshare": "セッションの共有を停止",
-  "command.session.unshare.description": "このセッションの共有を停止",
   "command.session.export": "セッション記録をエクスポート",
 
   "agentRequirements.skill.installed": "インストール済み",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "このエージェント要件の確認はもう有効ではありません。",
   "agentRequirements.error.requestFailed": "Kilo はエージェント要件を確認できませんでした。",
 
-  "palette.search.placeholder": "ファイル、コマンド、セッションを検索",
-  "palette.empty": "結果が見つかりません",
-  "palette.group.commands": "コマンド",
-  "palette.group.files": "ファイル",
-
   "dialog.provider.search.placeholder": "プロバイダーを検索",
   "dialog.provider.empty": "プロバイダーが見つかりません",
   "dialog.provider.group.other": "その他",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "モデルを選択",
   "dialog.model.search.placeholder": "モデルを検索",
   "dialog.model.empty": "モデルが見つかりません",
-  "dialog.model.manage": "モデルを管理",
-  "dialog.model.manage.description": "モデルセレクターに表示するモデルをカスタマイズします。",
   "dialog.model.select": "選択",
   "dialog.model.expand": "展開",
   "dialog.model.collapse": "折りたたむ",
 
-  "dialog.model.unpaid.freeModels.title": "Kiloが提供する無料モデル",
-  "dialog.model.unpaid.addMore.title": "人気のプロバイダーからモデルを追加",
-
   "dialog.provider.viewAll": "さらにプロバイダーを表示",
 
   "provider.connect.title": "{{provider}}を接続",
-  "provider.connect.title.anthropicProMax": "Claude Pro/Maxでログイン",
   "provider.connect.selectMethod": "{{provider}}のログイン方法を選択してください。",
   "provider.connect.method.apiKey": "APIキー",
   "provider.connect.status.inProgress": "認証中...",
@@ -231,12 +140,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "例：my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI エンドポイント URL",
   "provider.connect.azure.baseURL.placeholder": "例：https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zenは、コーディングエージェント向けに最適化された信頼性の高いモデルへのアクセスを提供します。",
-  "provider.connect.opencodeZen.line2": "1つのAPIキーで、Claude、GPT、Gemini、GLMなどのモデルにアクセスできます。",
-  "provider.connect.opencodeZen.visit.prefix": " ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " にアクセスしてAPIキーを取得してください。",
   "provider.connect.oauth.code.visit.prefix": " ",
   "provider.connect.oauth.code.visit.link": "このリンク",
   "provider.connect.oauth.code.visit.suffix":
@@ -244,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} 認証コード",
   "provider.connect.oauth.code.placeholder": "認証コード",
   "provider.connect.oauth.code.required": "認証コードが必要です",
-  "provider.connect.oauth.code.invalid": "無効な認証コード",
   "provider.connect.oauth.auto.visit.prefix": " ",
   "provider.connect.oauth.auto.visit.link": "このリンク",
   "provider.connect.oauth.auto.visit.suffix":
@@ -257,29 +159,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "{{provider}}のモデルは利用できなくなりました。",
   "model.tag.free": "無料",
   "model.tag.dataCollected": "データがトレーニングに使用される場合があります",
-  "model.tag.latest": "最新",
   "model.group.auto": "自動モデル",
   "model.group.recommended": "推奨",
   "model.group.favorites": "お気に入り",
-  "model.group.collapse": "{{group}} を折りたたむ",
-  "model.group.expand": "{{group}} を展開",
   "model.favorite.add": "お気に入りに追加",
   "model.favorite.remove": "お気に入りから削除",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "テキスト",
-  "model.input.image": "画像",
-  "model.input.audio": "音声",
-  "model.input.video": "動画",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "対応: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "推論を許可",
-  "model.tooltip.reasoning.none": "推論なし",
-  "model.tooltip.context": "コンテキスト上限 {{limit}}",
   "model.preview.label.released": "リリース",
   "model.preview.label.input": "入力",
   "model.preview.label.output": "出力",
@@ -299,11 +184,8 @@ export const dict = {
   "model.preview.modality.audio": "音声",
   "model.preview.modality.video": "動画",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "検索",
   "common.goBack": "戻る",
-  "common.goForward": "進む",
   "common.loading": "読み込み中",
-  "common.loading.ellipsis": "...",
   "common.cancel": "キャンセル",
   "common.connect": "接続",
   "common.disconnect": "切断",
@@ -311,54 +193,8 @@ export const dict = {
   "common.save": "保存",
   "common.saving": "保存中...",
   "common.default": "デフォルト",
-  "common.attachment": "添付ファイル",
 
-  "prompt.placeholder.shell": "シェルコマンドを入力...",
-  "prompt.placeholder.normal": '何でも聞いてください... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "コメントを要約…",
-  "prompt.placeholder.summarizeComment": "コメントを要約…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "escで終了",
-
-  "prompt.example.1": "コードベースのTODOを修正",
-  "prompt.example.2": "このプロジェクトの技術スタックは何ですか？",
-  "prompt.example.3": "壊れたテストを修正",
-  "prompt.example.4": "認証の仕組みを説明して",
-  "prompt.example.5": "セキュリティの脆弱性を見つけて修正",
-  "prompt.example.6": "ユーザーサービスのユニットテストを追加",
-  "prompt.example.7": "この関数を読みやすくリファクタリング",
-  "prompt.example.8": "このエラーはどういう意味ですか？",
-  "prompt.example.9": "この問題のデバッグを手伝って",
-  "prompt.example.10": "APIドキュメントを生成",
-  "prompt.example.11": "データベースクエリを最適化",
-  "prompt.example.12": "入力バリデーションを追加",
-  "prompt.example.13": "〜の新しいコンポーネントを作成",
-  "prompt.example.14": "このプロジェクトをデプロイするには？",
-  "prompt.example.15": "ベストプラクティスの観点でコードをレビュー",
-  "prompt.example.16": "この関数にエラーハンドリングを追加",
-  "prompt.example.17": "この正規表現パターンを説明して",
-  "prompt.example.18": "これをTypeScriptに変換",
-  "prompt.example.19": "コードベース全体にログを追加",
-  "prompt.example.20": "古い依存関係はどれですか？",
-  "prompt.example.21": "マイグレーションスクリプトの作成を手伝って",
-  "prompt.example.22": "このエンドポイントにキャッシュを実装",
-  "prompt.example.23": "このリストにページネーションを追加",
-  "prompt.example.24": "〜のCLIコマンドを作成",
-  "prompt.example.25": "ここでは環境変数はどう機能しますか？",
-
-  "prompt.popover.emptyResults": "一致する結果がありません",
-  "prompt.popover.emptyCommands": "一致するコマンドがありません",
-  "prompt.dropzone.label": "画像またはPDFをここにドロップ",
-  "prompt.slash.badge.custom": "カスタム",
-  "prompt.slash.badge.skill": "スキル",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "アクティブ",
-  "prompt.context.includeActiveFile": "アクティブなファイルを含める",
-  "prompt.context.removeActiveFile": "コンテキストからアクティブなファイルを削除",
-  "prompt.context.removeFile": "コンテキストからファイルを削除",
   "prompt.thinking.tooltip": "推論の強度",
-  "prompt.action.attachFile": "ファイルを添付",
-  "prompt.attachment.remove": "添付ファイルを削除",
   "prompt.action.send": "送信",
   "prompt.action.send.blocked": "最初に保留中の質問に答えるか、閉じてください",
   "prompt.action.send.recording": "文字起こしして送信",
@@ -399,188 +235,17 @@ export const dict = {
   "speechToText.tooltip.error": "音声入力に失敗しました。クリックしてクリア。",
   "speechToText.error.title": "音声入力に失敗しました",
   "speechToText.error.loginRequired": "音声入力を使用するにはKiloにサインインしてください。",
-  "speechToText.error.permission": "マイクの許可が拒否されました。",
-  "speechToText.error.microphone": "マイクを起動できませんでした。",
-  "speechToText.error.recording": "録音に失敗しました。",
-  "speechToText.error.emptyRecording": "音声が録音されていません。",
   "speechToText.error.emptyTranscript": "音声が検出されませんでした。",
-  "speechToText.error.encoding": "録音をエンコードできませんでした。",
-  "speechToText.toast.transcribed": "文字起こしを挿入しました",
 
-  "prompt.toast.pasteUnsupported.title": "サポートされていない貼り付け",
-  "prompt.toast.pasteUnsupported.description": "ここでは画像またはPDFのみ貼り付け可能です。",
-  "prompt.toast.modelAgentRequired.title": "エージェントとモデルを選択",
-  "prompt.toast.modelAgentRequired.description": "プロンプトを送信する前にエージェントとモデルを選択してください。",
-  "prompt.toast.worktreeCreateFailed.title": "ワークツリーの作成に失敗しました",
-  "prompt.toast.sessionCreateFailed.title": "セッションの作成に失敗しました",
-  "prompt.toast.shellSendFailed.title": "シェルコマンドの送信に失敗しました",
-  "prompt.toast.commandSendFailed.title": "コマンドの送信に失敗しました",
   "prompt.toast.promptSendFailed.title": "プロンプトの送信に失敗しました",
 
-  "dialog.mcp.title": "MCP",
-  "dialog.mcp.description": "{{total}}個中{{enabled}}個が有効",
-  "dialog.mcp.empty": "MCPが設定されていません",
-
-  "dialog.lsp.empty": "ファイルタイプから自動検出されたLSP",
-  "dialog.plugins.empty": "opencode.jsonで設定されたプラグイン",
-
   "mcp.status.connected": "接続済み",
   "mcp.status.failed": "失敗",
   "mcp.status.needs_auth": "認証が必要",
   "mcp.status.needs_registration": "クライアント登録が必要",
   "mcp.status.disabled": "無効",
 
-  "dialog.fork.empty": "フォーク元のメッセージがありません",
-
-  "dialog.directory.search.placeholder": "フォルダを検索",
-  "dialog.directory.empty": "フォルダが見つかりません",
-
-  "dialog.server.title": "サーバー",
-  "dialog.server.description": "このアプリが接続するKiloサーバーを切り替えます。",
-  "dialog.server.search.placeholder": "サーバーを検索",
-  "dialog.server.empty": "サーバーはまだありません",
-  "dialog.server.add.title": "サーバーを追加",
-  "dialog.server.add.url": "サーバーURL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "サーバーに接続できませんでした",
-  "dialog.server.add.checking": "確認中...",
-  "dialog.server.add.button": "サーバーを追加",
-  "dialog.server.default.title": "デフォルトサーバー",
-  "dialog.server.default.description":
-    "ローカルサーバーを起動する代わりに、アプリ起動時にこのサーバーに接続します。再起動が必要です。",
-  "dialog.server.default.none": "サーバーが選択されていません",
-  "dialog.server.default.set": "現在のサーバーをデフォルトに設定",
-  "dialog.server.default.clear": "クリア",
-  "dialog.server.action.remove": "サーバーを削除",
-
-  "dialog.server.menu.edit": "編集",
-  "dialog.server.menu.default": "デフォルトに設定",
-  "dialog.server.menu.defaultRemove": "デフォルト設定を解除",
-  "dialog.server.menu.delete": "削除",
-  "dialog.server.current": "現在のサーバー",
-  "dialog.server.status.default": "デフォルト",
-
-  "dialog.project.edit.title": "プロジェクトを編集",
-  "dialog.project.edit.name": "名前",
-  "dialog.project.edit.icon": "アイコン",
-  "dialog.project.edit.icon.alt": "プロジェクトアイコン",
-  "dialog.project.edit.icon.hint": "クリックまたは画像をドラッグ",
-  "dialog.project.edit.icon.recommended": "推奨: 128x128px",
-  "dialog.project.edit.color": "色",
-  "dialog.project.edit.color.select": "{{color}}の色を選択",
-
-  "dialog.project.edit.worktree.startup": "ワークスペース起動スクリプト",
-  "dialog.project.edit.worktree.startup.description":
-    "新しいワークスペース (ワークツリー) を作成した後に実行されます。",
-  "dialog.project.edit.worktree.startup.placeholder": "例: bun install",
-  "context.breakdown.title": "コンテキストの内訳",
-  "context.breakdown.note": '入力トークンのおおよその内訳です。"その他"にはツールの定義やオーバーヘッドが含まれます。',
-  "context.breakdown.system": "システム",
-  "context.breakdown.user": "ユーザー",
-  "context.breakdown.assistant": "アシスタント",
-  "context.breakdown.tool": "ツール呼び出し",
-  "context.breakdown.other": "その他",
-
-  "context.systemPrompt.title": "システムプロンプト",
-  "context.rawMessages.title": "生のメッセージ",
-
-  "context.stats.session": "セッション",
-  "context.stats.messages": "メッセージ",
-  "context.stats.provider": "プロバイダー",
-  "context.stats.model": "モデル",
-  "context.stats.limit": "コンテキスト制限",
-  "context.stats.totalTokens": "総トークン数",
-  "context.stats.usage": "使用量",
-  "context.stats.inputTokens": "入力トークン",
-  "context.stats.outputTokens": "出力トークン",
-  "context.stats.reasoningTokens": "推論トークン",
-  "context.stats.cacheTokens": "キャッシュトークン (読込/書込)",
-  "context.stats.userMessages": "ユーザーメッセージ",
-  "context.stats.assistantMessages": "アシスタントメッセージ",
-  "context.stats.totalCost": "総コスト",
-  "context.stats.sessionCreated": "セッション作成日時",
-  "context.stats.lastActivity": "最終アクティビティ",
-
-  "context.usage.tokens": "トークン",
-  "context.usage.usage": "使用量",
-  "context.usage.cost": "コスト",
-  "context.usage.clickToView": "クリックしてコンテキストを表示",
-  "context.usage.view": "コンテキスト使用量を表示",
-
-  "toast.language.title": "言語",
-  "toast.language.description": "{{language}}に切り替えました",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "テーマが切り替わりました",
-  "toast.scheme.title": "配色",
-  "toast.workspace.enabled.title": "ワークスペースが有効になりました",
-  "toast.workspace.enabled.description": "サイドバーに複数のワークツリーが表示されます",
-  "toast.workspace.disabled.title": "ワークスペースが無効になりました",
-  "toast.workspace.disabled.description": "サイドバーにはメインのワークツリーのみ表示されます",
-
-  "toast.permissions.autoaccept.on.title": "編集を自動承認中",
-  "toast.permissions.autoaccept.on.description": "編集と書き込みの権限は自動的に承認されます",
-  "toast.permissions.autoaccept.off.title": "編集の自動承認を停止しました",
-  "toast.permissions.autoaccept.off.description": "編集と書き込みの権限には承認が必要です",
-
-  "toast.model.none.title": "モデルが選択されていません",
-  "toast.model.none.description": "このセッションを要約するにはプロバイダーを接続してください",
-
-  "toast.file.loadFailed.title": "ファイルの読み込みに失敗しました",
-
-  "toast.file.listFailed.title": "ファイル一覧の取得に失敗しました",
-  "toast.context.noLineSelection.title": "行が選択されていません",
-  "toast.context.noLineSelection.description": "まずファイルタブで行範囲を選択してください。",
-  "toast.session.share.copyFailed.title": "URLのコピーに失敗しました",
-  "toast.session.share.success.title": "セッションを共有しました",
-  "toast.session.share.success.description": "共有URLをクリップボードにコピーしました！",
-  "toast.session.share.failed.title": "セッションの共有に失敗しました",
-  "toast.session.share.failed.description": "セッションの共有中にエラーが発生しました",
-
-  "toast.session.unshare.success.title": "セッションの共有を解除しました",
-  "toast.session.unshare.success.description": "セッションの共有解除に成功しました！",
-  "toast.session.unshare.failed.title": "セッションの共有解除に失敗しました",
-  "toast.session.unshare.failed.description": "セッションの共有解除中にエラーが発生しました",
-
   "toast.session.rename.invalid.title": "無効なセッションタイトル",
-  "toast.session.listFailed.title": "{{project}}のセッション読み込みに失敗しました",
-
-  "toast.update.title": "アップデートが利用可能です",
-  "toast.update.description": "Kiloの新しいバージョン ({{version}}) がインストール可能です。",
-  "toast.update.action.installRestart": "インストールして再起動",
-  "toast.update.action.notYet": "今はしない",
-
-  "error.page.title": "問題が発生しました",
-  "error.page.description": "アプリケーションの読み込み中にエラーが発生しました。",
-  "error.page.details.label": "エラー詳細",
-  "error.page.action.restart": "再起動",
-  "error.page.action.checking": "確認中...",
-  "error.page.action.checkUpdates": "アップデートを確認",
-  "error.page.action.updateTo": "{{version}}にアップデート",
-  "error.page.report.prefix": "このエラーをKiloチームに報告してください: ",
-  "error.page.report.discord": "Discord",
-  "error.page.version": "バージョン: {{version}}",
-
-  "error.dev.rootNotFound":
-    "ルート要素が見つかりません。index.htmlに追加するのを忘れていませんか？またはid属性のスペルが間違っていませんか？",
-
-  "error.globalSync.connectFailed": "サーバーに接続できませんでした。`{{url}}`でサーバーが実行されていますか？",
 
   "error.startup.title": "サーバー接続に失敗しました",
 
@@ -598,30 +263,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Codex モデルを引き続き使用するには、ChatGPT に再度ログインしてから、メッセージを再送信してください。",
 
-  "error.chain.unknown": "不明なエラー",
-  "error.chain.causedBy": "原因:",
-  "error.chain.apiError": "APIエラー",
-  "error.chain.status": "ステータス: {{status}}",
-  "error.chain.retryable": "再試行可能: {{retryable}}",
-  "error.chain.responseBody": "レスポンス本文:\n{{body}}",
-  "error.chain.didYouMean": "もしかして: {{suggestions}}",
-  "error.chain.modelNotFound": "モデルが見つかりません: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "config (opencode.json) のプロバイダー/モデル名を確認してください",
-  "error.chain.mcpFailed": 'MCPサーバー "{{name}}" が失敗しました。注意: KiloはまだMCP認証をサポートしていません。',
-  "error.chain.providerAuthFailed": "プロバイダー認証に失敗しました ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'プロバイダー "{{provider}}" の初期化に失敗しました。認証情報と設定を確認してください。',
-  "error.chain.configJsonInvalid": "{{path}} の設定ファイルは有効なJSON(C)ではありません",
-  "error.chain.configJsonInvalidWithMessage": "{{path}} の設定ファイルは有効なJSON(C)ではありません: {{message}}",
-  "error.chain.configDirectoryTypo":
-    '{{path}} 内のディレクトリ "{{dir}}" は無効です。"{{suggestion}}" に名前を変更するか削除してください。これはよくあるタイプミスです。',
-  "error.chain.configFrontmatterError": "{{path}} のフロントマターの解析に失敗しました:\n{{message}}",
-  "error.chain.configInvalid": "{{path}} の設定ファイルが無効です",
-  "error.chain.configInvalidWithMessage": "{{path}} の設定ファイルが無効です: {{message}}",
-
   "notification.permission.title": "権限が必要です",
   "notification.permission.titleSubagent": "権限が必要です（サブエージェント）",
-  "notification.permission.description": "{{projectName}} の {{sessionTitle}} が権限を必要としています",
   "ui.permission.manageAutoApprove": "自動承認ルールを管理",
   "ui.permission.doomLoop.prompt": "{{tool}} ツールでループの可能性が検出されました。実行を続行しますか？",
   "ui.permission.doomLoop.rule": "{{tool}} の呼び出しを続行",
@@ -646,7 +289,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Todo読み込み",
   "ui.permission.toolLabel.todoWrite": "Todo書き込み",
   "ui.permission.toolLabel.codeSearch": "コード検索",
-  "ui.permission.toggleWrap": "折り返しを切り替え",
   "ui.permission.copyCommand": "コピー",
   "ui.approval.auto": "自動承認されました",
   "ui.approval.manual": "あなたが承認しました",
@@ -658,47 +300,18 @@ export const dict = {
   "ui.approval.source.yolo": "自動承認（YOLO）モードによって",
   "ui.approval.source.session": "セッションの自動承認ルールによって",
   "ui.approval.source.default": "デフォルトで",
-  "notification.question.title": "質問",
-  "notification.question.description": "{{projectName}} の {{sessionTitle}} から質問があります",
-  "notification.action.goToSession": "セッションへ移動",
 
-  "notification.session.responseReady.title": "応答の準備ができました",
-  "notification.session.error.title": "セッションエラー",
-  "notification.session.error.fallbackDescription": "エラーが発生しました",
-
-  "home.recentProjects": "最近のプロジェクト",
-  "home.empty.title": "最近のプロジェクトはありません",
-  "home.empty.description": "ローカルプロジェクトを開いて始めましょう",
-
-  "session.tab.session": "セッション",
   "session.tab.review": "レビュー",
-  "session.tab.context": "コンテキスト",
-  "session.panel.reviewAndFiles": "レビューとファイル",
   "session.review.filesChanged": "{{count}} ファイル変更",
-  "session.review.change.one": "変更",
   "session.review.change.other": "変更",
   "session.review.loadingChanges": "変更を読み込み中...",
-  "session.review.empty": "このセッションでの変更はまだありません",
   "session.review.noChanges": "変更なし",
-  "session.files.selectToOpen": "開くファイルを選択",
-  "session.files.all": "すべてのファイル",
-  "session.files.binaryContent": "バイナリファイル（内容を表示できません）",
-  "session.messages.renderEarlier": "以前のメッセージを表示",
   "session.messages.loadingEarlier": "以前のメッセージを読み込み中...",
   "session.messages.loadEarlier": "以前のメッセージを読み込む",
   "session.messages.loading": "メッセージを読み込み中...",
 
-  "session.messages.jumpToLatest": "最新へジャンプ",
-  "session.context.addToContext": "{{selection}}をコンテキストに追加",
-
-  "session.new.worktree.main": "メインブランチ",
-  "session.new.worktree.mainWithBranch": "メインブランチ ({{branch}})",
-  "session.new.worktree.create": "新しいワークツリーを作成",
-  "session.new.lastModified": "最終更新",
   "sidebar.session.newSession": "新規セッション",
   "sidebar.session.newSession.tooltip": "現在のセッションを維持したまま、新しい会話を開始します。",
-  "sidebar.session.newSession.disabled":
-    "このセッションは既に新規です。チャットを開始するか、代わりに worktree を作成してください。",
   "sidebar.session.newWorktree": "新規 Worktree",
   "sidebar.session.newWorktree.tooltip":
     "隔離された git worktree を作成して、安全に実験し、変更を分離し、現在のブランチを中断することなく並行セッションを実行します。",
@@ -714,133 +327,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "この会話と{{files}}個の変更されたファイルを、分離されたフォローアップ作業用の専用 worktree に移動します。",
   "sidebar.session.showChanges.tooltip.empty": "変更ビューを開いて、現在の作業ツリーを検査します。",
-  "sidebar.session.showChanges.tooltip.one":
-    "1つのファイルが変更されました · +{{additions}} -{{deletions}}。変更ビューを開きます。",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}}個のファイルが変更されました · +{{additions}} -{{deletions}}。変更ビューを開きます。",
-  "sidebar.session.agentManager.tooltip":
-    "Agent Manager を開いて、並行セッションと worktree の全体像を把握し、時間のかかるタスクを 1 か所で調整できます。",
-  "sidebar.session.openAgentManager": "Agent Manager を開く",
   "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 での再開に失敗しました",
-  "session.header.search.placeholder": "{{project}}を検索",
-  "session.header.searchFiles": "ファイルを検索",
-  "session.header.openIn": "で開く",
-  "session.header.open.action": "{{app}}で開く",
-  "session.header.open.ariaLabel": "{{app}}で開く",
-  "session.header.open.menu": "開くオプション",
-  "session.header.open.copyPath": "パスをコピー",
 
-  "status.popover.trigger": "ステータス",
-  "status.popover.ariaLabel": "サーバー設定",
-  "status.popover.tab.servers": "サーバー",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "プラグイン",
-  "status.popover.action.manageServers": "サーバーを管理",
-
-  "session.share.popover.title": "ウェブで公開",
-  "session.share.popover.description.shared":
-    "このセッションはウェブで公開されています。リンクを知っている人なら誰でもアクセスできます。",
-  "session.share.popover.description.unshared":
-    "セッションをウェブで公開します。リンクを知っている人なら誰でもアクセスできるようになります。",
-  "session.share.action.share": "共有",
-  "session.share.action.publish": "公開",
-  "session.share.action.publishing": "公開中...",
-  "session.share.action.unpublish": "非公開にする",
-  "session.share.action.unpublishing": "非公開にしています...",
-  "session.share.action.view": "表示",
-  "session.share.copy.copied": "コピーしました",
-  "session.share.copy.copyLink": "リンクをコピー",
-
-  "lsp.tooltip.none": "LSPサーバーなし",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "プロンプトを読み込み中...",
-  "terminal.loading": "ターミナルを読み込み中...",
-  "terminal.title": "ターミナル",
-  "terminal.title.numbered": "ターミナル {{number}}",
-  "terminal.close": "ターミナルを閉じる",
-
-  "terminal.connectionLost.title": "接続が失われました",
-  "terminal.connectionLost.description":
-    "ターミナルの接続が中断されました。これはサーバーが再起動したときに発生することがあります。",
   "common.closeTab": "タブを閉じる",
   "common.signIn": "サインイン",
-  "common.signOut": "サインアウト",
   "common.dismiss": "閉じる",
   "common.requestFailed": "リクエスト失敗",
-  "common.moreOptions": "その他のオプション",
-  "common.learnMore": "詳細",
   "common.rename": "名前変更",
-  "common.reset": "リセット",
-  "common.archive": "アーカイブ",
   "common.delete": "削除",
   "common.close": "閉じる",
   "common.edit": "編集",
   "common.loadMore": "さらに読み込む",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "メニューを切り替え",
-  "sidebar.nav.projectsAndSessions": "プロジェクトとセッション",
   "sidebar.settings": "設定",
-  "sidebar.help": "ヘルプ",
-  "sidebar.workspaces.enable": "ワークスペースを有効化",
-  "sidebar.workspaces.disable": "ワークスペースを無効化",
-  "sidebar.gettingStarted.title": "はじめに",
-  "sidebar.gettingStarted.line1": "Kiloには無料モデルが含まれているため、すぐに開始できます。",
-  "sidebar.gettingStarted.line2": "プロバイダーを接続して、Claude、GPT、Geminiなどのモデルを使用できます。",
-  "sidebar.project.recentSessions": "最近のセッション",
-  "sidebar.project.viewAllSessions": "すべてのセッションを表示",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "デスクトップ",
-  "settings.section.server": "サーバー",
-  "settings.tab.general": "一般",
-  "settings.tab.shortcuts": "ショートカット",
-
-  "settings.general.section.appearance": "外観",
-  "settings.general.section.notifications": "システム通知",
-  "settings.general.section.updates": "アップデート",
-  "settings.general.section.sounds": "効果音",
-
-  "settings.general.row.language.title": "言語",
-  "settings.general.row.language.description": "Kiloの表示言語を変更します",
-  "settings.general.row.appearance.title": "外観",
-  "settings.general.row.appearance.description": "デバイスでのKiloの表示をカスタマイズします",
-  "settings.general.row.theme.title": "テーマ",
-  "settings.general.row.theme.description": "Kiloのテーマをカスタマイズします。",
-  "settings.general.row.font.title": "フォント",
-  "settings.general.row.font.description": "コードブロックで使用する等幅フォントをカスタマイズします",
-
-  "settings.general.row.releaseNotes.title": "リリースノート",
-  "settings.general.row.releaseNotes.description": "アップデート後に「新機能」ポップアップを表示",
-
-  "settings.updates.row.startup.title": "起動時にアップデートを確認",
-  "settings.updates.row.startup.description": "Kilo の起動時に自動でアップデートを確認します",
-  "settings.updates.row.check.title": "アップデートを確認",
-  "settings.updates.row.check.description": "手動でアップデートを確認し、利用可能ならインストールします",
-  "settings.updates.action.checkNow": "今すぐ確認",
-  "settings.updates.action.checking": "確認中...",
-  "settings.updates.toast.latest.title": "最新です",
-  "settings.updates.toast.latest.description": "Kilo は最新バージョンです。",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "アラート 01",
   "sound.option.alert02": "アラート 02",
   "sound.option.alert03": "アラート 03",
@@ -886,20 +391,6 @@ export const dict = {
   "sound.option.yup04": "はい 04",
   "sound.option.yup05": "はい 05",
   "sound.option.yup06": "はい 06",
-  "settings.general.notifications.agent.title": "エージェント",
-  "settings.general.notifications.agent.description":
-    "エージェントが完了したか、注意が必要な場合にシステム通知を表示します",
-  "settings.general.notifications.permissions.title": "権限",
-  "settings.general.notifications.permissions.description": "権限が必要な場合にシステム通知を表示します",
-  "settings.general.notifications.errors.title": "エラー",
-  "settings.general.notifications.errors.description": "エラーが発生した場合にシステム通知を表示します",
-
-  "settings.general.sounds.agent.title": "エージェント",
-  "settings.general.sounds.agent.description": "エージェントが完了したか、注意が必要な場合に音を再生します",
-  "settings.general.sounds.permissions.title": "権限",
-  "settings.general.sounds.permissions.description": "権限が必要な場合に音を再生します",
-  "settings.general.sounds.errors.title": "エラー",
-  "settings.general.sounds.errors.description": "エラーが発生した場合に音を再生します",
 
   "settings.indexing.dimension.description": "空のままにすると、モデルから埋め込み次元を自動検出します。",
   "settings.indexing.dimension.placeholder": "自動",
@@ -914,8 +405,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "このプロジェクトで有効にする",
   "settings.indexing.projectEnable.description":
     "グローバルなインデックス作成がオフの場合に、このワークスペースでのインデックス作成を有効にします。",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "グローバルインデックスが有効なため、このプロジェクトはすでにカバーされています。",
   "settings.indexing.lancedbDirectory.description": "ローカルLanceDBストアのオプションのディレクトリ。",
   "settings.indexing.lancedbDirectory.placeholder": "デフォルトの場合は空のままにする",
   "settings.indexing.lancedbDirectory.title": "LanceDBディレクトリ",
@@ -943,32 +432,10 @@ export const dict = {
   "settings.indexing.vectorStore.description": "インデックスされた埋め込みを保存する場所を選択します。",
   "settings.indexing.vectorStore.title": "ベクトルストア",
 
-  "settings.shortcuts.title": "キーボードショートカット",
-  "settings.shortcuts.reset.button": "デフォルトにリセット",
-  "settings.shortcuts.reset.toast.title": "ショートカットをリセットしました",
-  "settings.shortcuts.reset.toast.description": "キーボードショートカットがデフォルトにリセットされました。",
-  "settings.shortcuts.conflict.title": "ショートカットは既に使用されています",
-  "settings.shortcuts.conflict.description": "{{keybind}} は既に {{titles}} に割り当てられています。",
-  "settings.shortcuts.unassigned": "未割り当て",
-  "settings.shortcuts.pressKeys": "キーを押してください",
-  "settings.shortcuts.search.placeholder": "ショートカットを検索",
-  "settings.shortcuts.search.empty": "ショートカットが見つかりません",
-
-  "settings.shortcuts.group.general": "一般",
-  "settings.shortcuts.group.session": "セッション",
-  "settings.shortcuts.group.navigation": "ナビゲーション",
-  "settings.shortcuts.group.modelAndAgent": "モデルとエージェント",
-  "settings.shortcuts.group.terminal": "ターミナル",
-  "settings.shortcuts.group.prompt": "プロンプト",
-
   "settings.providers.title": "プロバイダー",
-  "settings.providers.description": "プロバイダー設定はここで構成できます。",
-  "settings.providers.betaNotice":
-    "現在、設定画面で設定できるのはKilo Gatewayプロバイダーのみです。他のプロバイダーの設定については、ベータ期間中にまもなく対応予定です。それまでの間は、CLIまたは設定ファイルを使用してプロバイダーを設定できます。私たちはKiloをオープンに保ち、ロックインのない状態を維持することをお約束します。",
   "settings.providers.section.connected": "接続済みプロバイダー",
   "settings.providers.connected.empty": "接続済みプロバイダーはありません",
   "settings.providers.section.popular": "人気のプロバイダー",
-  "settings.providers.search.placeholder": "プロバイダーを検索",
   "settings.providers.select.placeholder": "プロバイダーを選択...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "環境",
@@ -987,7 +454,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "プロバイダーがプロンプトを学習に使用する可能性のある Kilo Gateway モデルを非表示にします。",
   "settings.providers.modeModels": "モードごとのモデル",
-  "settings.providers.custom.note": "Base URL でカスタムプロバイダーを追加します。",
   "settings.providers.modeModels.description":
     "特定のモードのデフォルトモデルを上書きします。設定されていない場合、グローバルデフォルトモデルが使用されます。",
   "provider.custom.title": "カスタムプロバイダー",
@@ -1052,9 +518,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "モデルを削除",
   "provider.custom.models.add": "モデルを追加",
-  "provider.custom.models.fetch": "モデルを取得",
-  "provider.custom.models.fetching": "取得中\u2026",
-  "provider.custom.models.fetch.error": "モデルの取得に失敗しました: {{error}}",
   "provider.custom.models.fetch.authError": "認証に失敗しました。上記のAPIキーを確認して再試行してください。",
   "provider.custom.models.fetch.empty": "このサーバーにモデルが見つかりません。",
   "provider.custom.models.fetch.added": "{{count}}個のモデルを追加しました。",
@@ -1106,23 +569,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "旧.kilocode構成",
   "settings.config.source.projectOpencode": "旧.opencode構成",
   "settings.models.title": "モデル",
-  "settings.models.description": "モデル設定はここで構成できます。",
-  "settings.agents.title": "エージェント",
-  "settings.agents.description": "エージェント設定はここで構成できます。",
-  "settings.commands.title": "コマンド",
-  "settings.commands.description": "コマンド設定はここで構成できます。",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP設定はここで構成できます。",
 
-  "settings.permissions.title": "権限",
-  "settings.permissions.description": "サーバーがデフォルトで使用できるツールを制御します。",
-  "settings.permissions.section.tools": "ツール",
   "settings.permissions.toast.updateFailed.title": "権限の更新に失敗しました",
 
-  "settings.permissions.action.allow": "許可",
-  "settings.permissions.action.ask": "確認",
-  "settings.permissions.action.deny": "拒否",
-
   "settings.permissions.tool.read.title": "読み込み",
   "settings.permissions.tool.read.description": "ファイルの読み込み (ファイルパスに一致)",
   "settings.permissions.tool.edit.title": "編集",
@@ -1156,7 +605,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "同一入力による繰り返しのツール呼び出しを検出",
 
-  "session.delete.failed.title": "セッションの削除に失敗しました",
   "session.delete.title": "セッションの削除",
   "session.delete.confirm": 'セッション "{{name}}" を削除しますか？',
   "session.delete.button": "セッションを削除",
@@ -1184,14 +632,9 @@ export const dict = {
   "feedback.dialog.support": "カスタマーサポート",
   "workStyle.onboarding.welcome": "Kiloへようこそ",
   "workStyle.onboarding.title": "希望する作業スタイルを選択",
-  "workStyle.onboarding.description":
-    "権限、推論ブロック、ターミナル出力、コンテキストタイムラインの初期設定を行います。適用されるのは一度だけで、すでにカスタマイズした設定は変更されません。",
   "workStyle.onboarding.settingsNote": "これらのオプションはいつでも変更できます：",
   "workStyle.onboarding.settings": "設定。",
-  "workStyle.onboarding.skip": "今はスキップ",
   "workStyle.toast.saved.title": "モードを保存しました",
-  "workStyle.toast.saved.description": "設定画面でいつでも変更できます。",
-  "workStyle.toast.saved.action": "設定を開く",
   "workStyle.choice.permissions": "権限",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "表示",
@@ -1215,32 +658,6 @@ export const dict = {
     "これは以前のバージョンのセッションのようです。このセッションはサポートされなくなりました。",
   "session.cloud.import.failed": "クラウドセッションのインポートに失敗しました",
 
-  "workspace.new": "新しいワークスペース",
-  "workspace.type.local": "ローカル",
-  "workspace.type.sandbox": "サンドボックス",
-  "workspace.create.failed.title": "ワークスペースの作成に失敗しました",
-  "workspace.delete.failed.title": "ワークスペースの削除に失敗しました",
-  "workspace.resetting.title": "ワークスペースをリセット中",
-  "workspace.resetting.description": "これには少し時間がかかる場合があります。",
-  "workspace.reset.failed.title": "ワークスペースのリセットに失敗しました",
-  "workspace.reset.success.title": "ワークスペースをリセットしました",
-  "workspace.reset.success.description": "ワークスペースはデフォルトブランチと一致しています。",
-  "workspace.error.stillPreparing": "ワークスペースはまだ準備中です",
-  "workspace.status.checking": "未マージの変更を確認中...",
-  "workspace.status.error": "gitステータスを確認できません。",
-  "workspace.status.clean": "未マージの変更は検出されませんでした。",
-  "workspace.status.dirty": "このワークスペースで未マージの変更が検出されました。",
-  "workspace.delete.title": "ワークスペースの削除",
-  "workspace.delete.confirm": 'ワークスペース "{{name}}" を削除しますか？',
-  "workspace.delete.button": "ワークスペースを削除",
-  "workspace.reset.title": "ワークスペースのリセット",
-  "workspace.reset.confirm": 'ワークスペース "{{name}}" をリセットしますか？',
-  "workspace.reset.button": "ワークスペースをリセット",
-  "workspace.reset.archived.none": "アクティブなセッションはアーカイブされません。",
-  "workspace.reset.archived.one": "1つのセッションがアーカイブされます。",
-  "workspace.reset.archived.many": "{{count}}個のセッションがアーカイブされます。",
-  "workspace.reset.note": "これにより、ワークスペースはデフォルトブランチと一致するようにリセットされます。",
-
   "deviceAuth.toast.urlCopied": "URLをクリップボードにコピーしました",
   "deviceAuth.toast.codeCopied": "コードをクリップボードにコピーしました",
   "deviceAuth.toast.errorCopied": "エラーがクリップボードにコピーされました",
@@ -1278,7 +695,6 @@ export const dict = {
   "profile.pass.renews": "更新",
   "profile.action.logout": "ログアウト",
 
-  "settings.section.configuration": "設定",
   "settings.agentBehaviour.title": "エージェントの動作",
   "settings.autoApprove.title": "自動承認",
   "settings.browser.title": "ブラウザ",
@@ -1294,7 +710,6 @@ export const dict = {
   "settings.language.title": "言語",
   "settings.aboutKiloCode.title": "Kilo Codeについて",
 
-  "session.messages.empty": "下にメッセージを入力して会話を始めましょう。",
   "session.messages.welcome":
     "Kilo CodeはAIコーディングアシスタントです。機能の構築、バグの修正、コードベースの説明を依頼できます。",
   "session.messages.scrollToBottom": "下にスクロール",
@@ -1302,7 +717,6 @@ export const dict = {
   "session.messages.taskStarting": "開始中...",
   "session.status.writingResponse": "応答を作成中…",
   "session.status.retry": "再試行中…",
-  "session.status.retrying": "再試行中（{{ attempt }}回目）… {{ message }}",
   "session.status.working": "作業中…",
   "session.status.offline": "ネットワークが切断されました — 再接続中…",
   "session.outcome.incomplete": "{{count}} 個の To-Do を残してターンが終了しました",
@@ -1334,11 +748,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} 件の古いセッション",
   "context.stats.thisSession": "このセッション",
 
-  "time.justNow": "たった今",
-  "time.minutesAgo": "{{count}}分前",
-  "time.hoursAgo": "{{count}}時間前",
-  "time.daysAgo": "{{count}}日前",
-  "time.monthsAgo": "{{count}}ヶ月前",
   "time.today": "今日",
   "time.yesterday": "昨日",
   "time.thisWeek": "今週",
@@ -1354,7 +763,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "ポート：",
   "settings.aboutKiloCode.versionInfo": "バージョン情報",
   "settings.aboutKiloCode.version.label": "バージョン：",
-  "settings.aboutKiloCode.extensionName": "Kilo Code拡張機能",
   "settings.aboutKiloCode.community": "コミュニティとサポート",
   "settings.aboutKiloCode.feedback.prefix": "ご質問やフィードバックがありましたら、お気軽にissueを作成してください",
   "settings.aboutKiloCode.feedback.or": "または",
@@ -1405,7 +813,6 @@ export const dict = {
   "settings.language.current": "現在：",
 
   "common.add": "追加",
-  "common.choose": "選択…",
 
   "settings.autocomplete.autoTrigger.title": "自動インライン補完を有効にする",
   "settings.autocomplete.autoTrigger.description": "入力時にインライン補完の提案を自動的に表示",
@@ -1414,28 +821,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "チャットの自動補完を有効にする",
   "settings.autocomplete.chatAutocomplete.description": "チャットテキストエリアに自動補完の提案を表示",
   "settings.autocomplete.modelsHint": "オートコンプリートに使用するモデルを選択するには、モデル設定をご覧ください。",
-  "settings.notifications.agent.title": "エージェント完了",
-  "settings.notifications.agent.description": "エージェントがタスクを完了したら通知を表示",
-  "settings.notifications.permissions.title": "権限リクエスト",
-  "settings.notifications.permissions.description": "権限リクエスト時に通知を表示",
-  "settings.notifications.errors.title": "エラー",
-  "settings.notifications.errors.description": "エラー発生時に通知を表示",
   "settings.notifications.sounds": "サウンド",
   "settings.notifications.enable.title": "サウンド通知を有効にする",
   "settings.notifications.enable.description":
     "セッションの完了時、エラーの発生時、またはユーザー入力が必要なときにサウンドを再生します",
   "settings.notifications.testSound": "テスト",
-  "settings.notifications.agentSound.title": "エージェント完了サウンド",
-  "settings.notifications.agentSound.description": "エージェント完了時に再生するサウンド",
-  "settings.notifications.permSound.title": "権限リクエストサウンド",
-  "settings.notifications.permSound.description": "権限リクエスト時に再生するサウンド",
-  "settings.notifications.errorSound.title": "エラーサウンド",
-  "settings.notifications.errorSound.description": "エラー発生時に再生するサウンド",
   "settings.notifications.sound.default": "デフォルト",
   "settings.notifications.sound.system": "システム",
   "settings.notifications.sound.description":
     "デフォルトでは、完了、入力、エラーにそれぞれ異なるサウンドが使用されます。その他の選択肢では、すべてのイベントに同じサウンドが使用されます。",
-  "settings.notifications.sound.none": "なし",
   "settings.experimental.share.title": "共有モード",
   "settings.experimental.share.description": "セッション共有の動作",
   "settings.experimental.share.manual": "手動",
@@ -1455,9 +849,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "画像生成モデル",
   "settings.experimental.imageGenerationModel.placeholder": "デフォルト (Auto Router)",
 
-  "settings.experimental.speechToText.title": "音声認識",
-  "settings.experimental.speechToText.description":
-    "Kilo Gateway経由でKiloアカウントを使用して、プロンプトフィールドでの音声入力を有効にします。",
   "settings.models.speechToText.disabledDescription":
     "Speech to Text を使用するには、Kilo プロバイダーを有効にしてサインインしてください。現在、Speech to Text は Kilo Gateway でのみサポートされています。",
   "settings.models.speechToTextModel.title": "音声認識モデル",
@@ -1498,15 +889,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "デフォルトエージェント",
   "settings.agentBehaviour.defaultAgent.description": "指定されていない場合に使用するエージェント",
   "settings.agentBehaviour.availableAgents": "利用可能なエージェント",
-  "settings.agentBehaviour.selectAgent": "設定するエージェントを選択…",
-  "settings.agentBehaviour.selectAgent.title": "エージェント",
-  "settings.agentBehaviour.selectAgent.description": "設定するエージェントを選択…",
   "settings.agentBehaviour.modelOverride.title": "モデルオーバーライド",
   "settings.agentBehaviour.modelOverride.description": "このエージェントのデフォルトモデルを上書き",
   "settings.agentBehaviour.variantOverride.title": "バリアントオーバーライド",
   "settings.agentBehaviour.variantOverride.description": "このエージェントのモデルバリアントを上書き",
-  "settings.agentBehaviour.prompt.title": "カスタムプロンプト",
-  "settings.agentBehaviour.prompt.description": "このエージェントの追加システムプロンプト",
   "settings.agentBehaviour.temperature.title": "温度",
   "settings.agentBehaviour.temperature.description":
     "AI の応答のランダム性を制御します（0–2）。低い値（例: 0.2）では、焦点の定まった一貫性のある出力になります。高い値（例: 1.0）では、より多様で創造的な応答になります。モデルのデフォルト値を使用する場合は空欄にしてください。",
@@ -1526,7 +912,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "検出されたスキル",
   "settings.agentBehaviour.noSkillsFound":
     "スキルが見つかりません。スキルを利用可能にするには、以下にスキルフォルダパスまたはURLを追加してください。",
-  "settings.agentBehaviour.availableModes": "利用可能なカスタムモード",
   "settings.agentBehaviour.noAgentsFound": "エージェントが見つかりません。",
   "settings.agentBehaviour.createMode": "新しいモードを作成",
   "settings.agentBehaviour.createMode.name": "名前",
@@ -1608,12 +993,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "コマンド",
   "settings.agentBehaviour.mcpDetail.args": "引数",
   "settings.agentBehaviour.mcpDetail.env": "環境",
-  "settings.agentBehaviour.mcpDetail.disabled": "このサーバーは無効です。",
   "settings.agentBehaviour.mcpBrowseMarketplace": "マーケットプレイスを閲覧",
   "settings.agentBehaviour.mcpEmpty":
     "MCPサーバーが設定されていません。kilo.jsoncでMCPサーバーを追加するか、エージェントに追加を依頼してください。",
-  "settings.agentBehaviour.workflowsPlaceholder":
-    "ワークフローはワークスペース内のワークフローファイルを通じて管理されます。",
   "settings.agentBehaviour.workflows.description":
     "ワークフローは設定で定義されたカスタムスラッシュコマンドです。チャットで /command-name と入力して呼び出します。コマンドは opencode.json の 'command' セクションで設定します。",
   "settings.agentBehaviour.workflows.empty":
@@ -1703,7 +1085,6 @@ export const dict = {
     "例: スペイン語で conventional commits 形式に従って commit messages を生成して。commit message のみを返して。",
 
   "settings.commitMessage.language.sync": "UI言語と同期",
-  "settings.commitMessage.language.title": "言語",
   "settings.commitMessage.language.description": "AIが生成するコミットメッセージに使用する言語を選択:",
 
   "settings.display.username.title": "ユーザー名",
@@ -1742,8 +1123,6 @@ export const dict = {
   "settings.providers.disabled": "無効化されたプロバイダー",
   "settings.providers.disabled.description": "プロバイダーリストから非表示にするプロバイダー",
   "settings.providers.disabled.enable": "有効化",
-  "settings.providers.enabled": "有効化されたプロバイダー（ホワイトリスト）",
-  "settings.providers.enabled.description": "設定された場合、これらのプロバイダーのみが利用可能",
   "settings.providers.notSet": "未設定（サーバーのデフォルトを使用）",
   "dialog.model.notSet": "未設定",
   "profile.personalAccount": "個人アカウント",
@@ -1783,9 +1162,7 @@ export const dict = {
   "migration.migrate.title": "設定の移行",
   "migration.migrate.subtitle": "以前のインストールから設定が見つかりました。移行可能な項目は以下の通りです。",
   "migration.migrate.selectLabel": "移行する項目を選択",
-  "migration.migrate.cannotMigrate": "移行できません",
   "migration.migrate.chatHistory": "チャットセッションと履歴",
-  "migration.migrate.chatHistoryDesc": "新しいアーキテクチャと互換性がありません",
   "migration.migrate.button": "設定を移行",
   "migration.migrate.skip": "スキップ",
   "migration.migrate.keysDetected": "{{count}}個のキーを検出",
@@ -1809,10 +1186,7 @@ export const dict = {
     "VS Codeのストレージから古い設定を削除します。この移行を再度実行することはできなくなります。",
   "migration.complete.done": "完了",
   "migration.migrate.sessionsDetected": "{{count}} 件のセッションが見つかりました",
-  "migration.error.sessionFailed": "セッションの移行に失敗しました",
   "migration.error.continue": "続行",
-  "migration.error.action.copy": "コピー",
-  "migration.error.toast.copied": "エラーをクリップボードにコピーしました",
 
   "migration.sessionSummary.title": "概要:",
   "migration.sessionSummary.copy": "レポートをコピー",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 9b4a5ac75da..20fc092585d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -57,85 +57,12 @@ type Keys = keyof typeof en
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "추천",
-  "command.category.view": "보기",
-  "command.category.project": "프로젝트",
-  "command.category.provider": "공급자",
-  "command.category.server": "서버",
-  "command.category.session": "세션",
-  "command.category.theme": "테마",
-  "command.category.language": "언어",
-  "command.category.file": "파일",
-  "command.category.context": "컨텍스트",
-  "command.category.terminal": "터미널",
-  "command.category.model": "모델",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "에이전트",
-  "command.category.permissions": "권한",
-  "command.category.workspace": "작업 공간",
 
-  "command.category.settings": "설정",
-  "theme.scheme.system": "시스템",
-  "theme.scheme.light": "라이트",
-  "theme.scheme.dark": "다크",
-
-  "command.sidebar.toggle": "사이드바 토글",
-  "command.project.open": "프로젝트 열기",
   "command.provider.connect": "공급자 연결",
-  "command.server.switch": "서버 전환",
-  "command.settings.open": "설정 열기",
-  "command.session.previous": "이전 세션",
-  "command.session.next": "다음 세션",
-  "command.session.previous.unseen": "이전 읽지 않은 세션",
-  "command.session.next.unseen": "다음 읽지 않은 세션",
-  "command.session.archive": "세션 보관",
-
-  "command.palette": "명령 팔레트",
-
-  "command.theme.cycle": "테마 순환",
-  "command.theme.set": "테마 사용: {{theme}}",
-  "command.theme.scheme.cycle": "색상 테마 순환",
-  "command.theme.scheme.set": "색상 테마 사용: {{scheme}}",
-
-  "command.language.cycle": "언어 순환",
-  "command.language.set": "언어 사용: {{language}}",
 
   "command.session.new": "새 세션",
-  "command.session.new.task": "새 작업",
   "command.session.show.changes": "변경 사항 보기",
-  "command.file.open": "파일 열기",
-  "command.tab.close": "탭 닫기",
-  "command.context.addSelection": "선택 영역을 컨텍스트에 추가",
-  "command.context.addSelection.description": "현재 파일에서 선택한 줄을 추가",
-  "command.terminal.toggle": "터미널 토글",
-  "command.fileTree.toggle": "파일 트리 토글",
   "command.review.toggle": "검토 토글",
-  "command.terminal.new": "새 터미널",
-  "command.terminal.new.description": "새 터미널 탭 생성",
-  "command.steps.toggle": "단계 토글",
-  "command.steps.toggle.description": "현재 메시지의 단계 표시/숨기기",
-  "command.message.previous": "이전 메시지",
-  "command.message.previous.description": "이전 사용자 메시지로 이동",
-  "command.message.next": "다음 메시지",
-  "command.message.next.description": "다음 사용자 메시지로 이동",
-  "command.model.choose": "모델 선택",
-  "command.model.choose.description": "다른 모델 선택",
-  "command.mcp.toggle": "MCP 토글",
-  "command.mcp.toggle.description": "MCP 토글",
-  "command.agent.cycle": "에이전트 순환",
-  "command.agent.cycle.description": "다음 에이전트로 전환",
-  "command.agent.cycle.reverse": "에이전트 역순환",
-  "command.agent.cycle.reverse.description": "이전 에이전트로 전환",
-  "command.model.variant.cycle": "생각 수준 순환",
-  "command.model.variant.cycle.description": "다음 생각 수준으로 전환",
-  "command.permissions.autoaccept.enable": "편집 자동 수락",
-  "command.permissions.autoaccept.disable": "편집 자동 수락 중지",
-  "command.workspace.toggle": "작업 공간 전환",
-  "command.workspace.toggle.description": "사이드바에서 여러 작업 공간 활성화 또는 비활성화",
-  "command.session.undo": "실행 취소",
-  "command.session.undo.description": "마지막 메시지 실행 취소",
-  "command.session.redo": "다시 실행",
-  "command.session.redo.description": "마지막 실행 취소된 메시지 다시 실행",
   "revert.banner.count_one": "{{count}}개 메시지 되돌림",
   "revert.banner.count_other": "{{count}}개 메시지 되돌림",
   "revert.banner.redo": "다시 실행",
@@ -150,13 +77,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "스냅샷 활성화",
   "revert.disabled.agentBusy": "에이전트가 완료될 때까지 기다리세요",
   "command.session.compact": "세션 압축",
-  "command.session.compact.description": "컨텍스트 크기를 줄이기 위해 세션 요약",
-  "command.session.fork": "메시지에서 분기",
-  "command.session.fork.description": "이전 메시지에서 새 세션 생성",
-  "command.session.share": "세션 공유",
-  "command.session.share.description": "이 세션을 공유하고 URL을 클립보드에 복사",
-  "command.session.unshare": "세션 공유 중지",
-  "command.session.unshare.description": "이 세션 공유 중지",
   "command.session.export": "세션 기록 내보내기",
 
   "agentRequirements.skill.installed": "설치됨",
@@ -183,11 +103,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "이 에이전트 요구 사항 확인은 더 이상 활성 상태가 아닙니다.",
   "agentRequirements.error.requestFailed": "Kilo가 에이전트 요구 사항을 확인하지 못했습니다.",
 
-  "palette.search.placeholder": "파일, 명령어 및 세션 검색",
-  "palette.empty": "결과 없음",
-  "palette.group.commands": "명령어",
-  "palette.group.files": "파일",
-
   "dialog.provider.search.placeholder": "공급자 검색",
   "dialog.provider.empty": "공급자 없음",
   "dialog.provider.group.other": "기타",
@@ -196,19 +111,13 @@ export const dict = {
   "dialog.model.select.title": "모델 선택",
   "dialog.model.search.placeholder": "모델 검색",
   "dialog.model.empty": "모델 결과 없음",
-  "dialog.model.manage": "모델 관리",
-  "dialog.model.manage.description": "모델 선택기에 표시할 모델 사용자 지정",
   "dialog.model.select": "선택",
   "dialog.model.expand": "펼치기",
   "dialog.model.collapse": "접기",
 
-  "dialog.model.unpaid.freeModels.title": "Kilo에서 제공하는 무료 모델",
-  "dialog.model.unpaid.addMore.title": "인기 공급자의 모델 추가",
-
   "dialog.provider.viewAll": "더 많은 공급자 보기",
 
   "provider.connect.title": "{{provider}} 연결",
-  "provider.connect.title.anthropicProMax": "Claude Pro/Max로 로그인",
   "provider.connect.selectMethod": "{{provider}} 로그인 방법 선택",
   "provider.connect.method.apiKey": "API 키",
   "provider.connect.status.inProgress": "인증 진행 중...",
@@ -235,12 +144,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "예: my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI 엔드포인트 URL",
   "provider.connect.azure.baseURL.placeholder": "예: https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen은 코딩 에이전트를 위해 최적화된 신뢰할 수 있는 엄선된 모델에 대한 액세스를 제공합니다.",
-  "provider.connect.opencodeZen.line2": "단일 API 키로 Claude, GPT, Gemini, GLM 등 다양한 모델에 액세스할 수 있습니다.",
-  "provider.connect.opencodeZen.visit.prefix": "",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": "를 방문하여 API 키를 받으세요.",
   "provider.connect.oauth.code.visit.prefix": "",
   "provider.connect.oauth.code.visit.link": "이 링크",
   "provider.connect.oauth.code.visit.suffix":
@@ -248,7 +151,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} 인증 코드",
   "provider.connect.oauth.code.placeholder": "인증 코드",
   "provider.connect.oauth.code.required": "인증 코드가 필요합니다",
-  "provider.connect.oauth.code.invalid": "유효하지 않은 인증 코드",
   "provider.connect.oauth.auto.visit.prefix": "",
   "provider.connect.oauth.auto.visit.link": "이 링크",
   "provider.connect.oauth.auto.visit.suffix":
@@ -261,29 +163,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "{{provider}} 모델을 더 이상 사용할 수 없습니다.",
   "model.tag.free": "무료",
   "model.tag.dataCollected": "데이터가 학습에 사용될 수 있습니다",
-  "model.tag.latest": "최신",
   "model.group.auto": "자동 모델",
   "model.group.recommended": "추천",
   "model.group.favorites": "즐겨찾기",
-  "model.group.collapse": "{{group}} 접기",
-  "model.group.expand": "{{group}} 펼치기",
   "model.favorite.add": "즐겨찾기에 추가",
   "model.favorite.remove": "즐겨찾기에서 제거",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "텍스트",
-  "model.input.image": "이미지",
-  "model.input.audio": "오디오",
-  "model.input.video": "비디오",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "지원: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "추론 허용",
-  "model.tooltip.reasoning.none": "추론 없음",
-  "model.tooltip.context": "컨텍스트 제한 {{limit}}",
   "model.preview.label.released": "출시",
   "model.preview.label.input": "입력",
   "model.preview.label.output": "출력",
@@ -302,11 +187,8 @@ export const dict = {
   "model.preview.modality.audio": "오디오",
   "model.preview.modality.video": "비디오",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "검색",
   "common.goBack": "뒤로 가기",
-  "common.goForward": "앞으로 가기",
   "common.loading": "로딩 중",
-  "common.loading.ellipsis": "...",
   "common.cancel": "취소",
   "common.connect": "연결",
   "common.disconnect": "연결 해제",
@@ -314,54 +196,8 @@ export const dict = {
   "common.save": "저장",
   "common.saving": "저장 중...",
   "common.default": "기본값",
-  "common.attachment": "첨부 파일",
 
-  "prompt.placeholder.shell": "셸 명령어 입력...",
-  "prompt.placeholder.normal": '무엇이든 물어보세요... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "댓글 요약…",
-  "prompt.placeholder.summarizeComment": "댓글 요약…",
-  "prompt.mode.shell": "셸",
-  "prompt.mode.shell.exit": "종료하려면 esc",
-
-  "prompt.example.1": "코드베이스의 TODO 수정",
-  "prompt.example.2": "이 프로젝트의 기술 스택이 무엇인가요?",
-  "prompt.example.3": "고장 난 테스트 수정",
-  "prompt.example.4": "인증 작동 방식 설명",
-  "prompt.example.5": "보안 취약점 찾기 및 수정",
-  "prompt.example.6": "사용자 서비스에 단위 테스트 추가",
-  "prompt.example.7": "이 함수를 더 읽기 쉽게 리팩터링",
-  "prompt.example.8": "이 오류는 무엇을 의미하나요?",
-  "prompt.example.9": "이 문제 디버깅 도와줘",
-  "prompt.example.10": "API 문서 생성",
-  "prompt.example.11": "데이터베이스 쿼리 최적화",
-  "prompt.example.12": "입력 유효성 검사 추가",
-  "prompt.example.13": "...를 위한 새 컴포넌트 생성",
-  "prompt.example.14": "이 프로젝트를 어떻게 배포하나요?",
-  "prompt.example.15": "모범 사례를 기준으로 내 코드 검토",
-  "prompt.example.16": "이 함수에 오류 처리 추가",
-  "prompt.example.17": "이 정규식 패턴 설명",
-  "prompt.example.18": "이것을 TypeScript로 변환",
-  "prompt.example.19": "코드베이스 전체에 로깅 추가",
-  "prompt.example.20": "오래된 종속성은 무엇인가요?",
-  "prompt.example.21": "마이그레이션 스크립트 작성 도와줘",
-  "prompt.example.22": "이 엔드포인트에 캐싱 구현",
-  "prompt.example.23": "이 목록에 페이지네이션 추가",
-  "prompt.example.24": "...를 위한 CLI 명령어 생성",
-  "prompt.example.25": "여기서 환경 변수는 어떻게 작동하나요?",
-
-  "prompt.popover.emptyResults": "일치하는 결과 없음",
-  "prompt.popover.emptyCommands": "일치하는 명령어 없음",
-  "prompt.dropzone.label": "이미지나 PDF를 여기에 드롭하세요",
-  "prompt.slash.badge.custom": "사용자 지정",
-  "prompt.slash.badge.skill": "스킬",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "활성",
-  "prompt.context.includeActiveFile": "활성 파일 포함",
-  "prompt.context.removeActiveFile": "컨텍스트에서 활성 파일 제거",
-  "prompt.context.removeFile": "컨텍스트에서 파일 제거",
   "prompt.thinking.tooltip": "추론 강도",
-  "prompt.action.attachFile": "파일 첨부",
-  "prompt.attachment.remove": "첨부 파일 제거",
   "prompt.action.send": "전송",
   "prompt.action.send.blocked": "먼저 대기 중인 질문에 답하거나 닫아주세요",
   "prompt.action.send.recording": "텍스트 변환 및 전송",
@@ -400,188 +236,17 @@ export const dict = {
   "speechToText.tooltip.error": "음성 입력에 실패했습니다. 지우려면 클릭하세요.",
   "speechToText.error.title": "음성 입력 실패",
   "speechToText.error.loginRequired": "음성 입력을 사용하려면 Kilo에 로그인하세요.",
-  "speechToText.error.permission": "마이크 권한이 거부되었습니다.",
-  "speechToText.error.microphone": "마이크를 시작할 수 없습니다.",
-  "speechToText.error.recording": "녹음에 실패했습니다.",
-  "speechToText.error.emptyRecording": "녹음된 오디오가 없습니다.",
   "speechToText.error.emptyTranscript": "음성이 감지되지 않았습니다.",
-  "speechToText.error.encoding": "녹음을 인코딩할 수 없습니다.",
-  "speechToText.toast.transcribed": "변환 텍스트 삽입됨",
 
-  "prompt.toast.pasteUnsupported.title": "지원되지 않는 붙여넣기",
-  "prompt.toast.pasteUnsupported.description": "이미지나 PDF만 붙여넣을 수 있습니다.",
-  "prompt.toast.modelAgentRequired.title": "에이전트 및 모델 선택",
-  "prompt.toast.modelAgentRequired.description": "프롬프트를 보내기 전에 에이전트와 모델을 선택하세요.",
-  "prompt.toast.worktreeCreateFailed.title": "작업 트리 생성 실패",
-  "prompt.toast.sessionCreateFailed.title": "세션 생성 실패",
-  "prompt.toast.shellSendFailed.title": "셸 명령 전송 실패",
-  "prompt.toast.commandSendFailed.title": "명령 전송 실패",
   "prompt.toast.promptSendFailed.title": "프롬프트 전송 실패",
 
-  "dialog.mcp.title": "MCP",
-  "dialog.mcp.description": "{{total}}개 중 {{enabled}}개 활성화됨",
-  "dialog.mcp.empty": "구성된 MCP 없음",
-
-  "dialog.lsp.empty": "파일 유형에서 자동 감지된 LSP",
-  "dialog.plugins.empty": "opencode.json에 구성된 플러그인",
-
   "mcp.status.connected": "연결됨",
   "mcp.status.failed": "실패",
   "mcp.status.needs_auth": "인증 필요",
   "mcp.status.needs_registration": "클라이언트 등록 필요",
   "mcp.status.disabled": "비활성화됨",
 
-  "dialog.fork.empty": "분기할 메시지 없음",
-
-  "dialog.directory.search.placeholder": "폴더 검색",
-  "dialog.directory.empty": "폴더 없음",
-
-  "dialog.server.title": "서버",
-  "dialog.server.description": "이 앱이 연결할 Kilo 서버를 전환합니다.",
-  "dialog.server.search.placeholder": "서버 검색",
-  "dialog.server.empty": "서버 없음",
-  "dialog.server.add.title": "서버 추가",
-  "dialog.server.add.url": "서버 URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "서버에 연결할 수 없습니다",
-  "dialog.server.add.checking": "확인 중...",
-  "dialog.server.add.button": "서버 추가",
-  "dialog.server.default.title": "기본 서버",
-  "dialog.server.default.description":
-    "로컬 서버를 시작하는 대신 앱 실행 시 이 서버에 연결합니다. 다시 시작해야 합니다.",
-  "dialog.server.default.none": "선택된 서버 없음",
-  "dialog.server.default.set": "현재 서버를 기본값으로 설정",
-  "dialog.server.default.clear": "지우기",
-  "dialog.server.action.remove": "서버 제거",
-
-  "dialog.server.menu.edit": "편집",
-  "dialog.server.menu.default": "기본값으로 설정",
-  "dialog.server.menu.defaultRemove": "기본값 제거",
-  "dialog.server.menu.delete": "삭제",
-  "dialog.server.current": "현재 서버",
-  "dialog.server.status.default": "기본값",
-
-  "dialog.project.edit.title": "프로젝트 편집",
-  "dialog.project.edit.name": "이름",
-  "dialog.project.edit.icon": "아이콘",
-  "dialog.project.edit.icon.alt": "프로젝트 아이콘",
-  "dialog.project.edit.icon.hint": "이미지를 클릭하거나 드래그하세요",
-  "dialog.project.edit.icon.recommended": "권장: 128x128px",
-  "dialog.project.edit.color": "색상",
-  "dialog.project.edit.color.select": "{{color}} 색상 선택",
-
-  "dialog.project.edit.worktree.startup": "작업 공간 시작 스크립트",
-  "dialog.project.edit.worktree.startup.description": "새 작업 공간(작업 트리)을 만든 뒤 실행됩니다.",
-  "dialog.project.edit.worktree.startup.placeholder": "예: bun install",
-  "context.breakdown.title": "컨텍스트 분석",
-  "context.breakdown.note": '입력 토큰의 대략적인 분석입니다. "기타"에는 도구 정의 및 오버헤드가 포함됩니다.',
-  "context.breakdown.system": "시스템",
-  "context.breakdown.user": "사용자",
-  "context.breakdown.assistant": "어시스턴트",
-  "context.breakdown.tool": "도구 호출",
-  "context.breakdown.other": "기타",
-
-  "context.systemPrompt.title": "시스템 프롬프트",
-  "context.rawMessages.title": "원시 메시지",
-
-  "context.stats.session": "세션",
-  "context.stats.messages": "메시지",
-  "context.stats.provider": "공급자",
-  "context.stats.model": "모델",
-  "context.stats.limit": "컨텍스트 제한",
-  "context.stats.totalTokens": "총 토큰",
-  "context.stats.usage": "사용량",
-  "context.stats.inputTokens": "입력 토큰",
-  "context.stats.outputTokens": "출력 토큰",
-  "context.stats.reasoningTokens": "추론 토큰",
-  "context.stats.cacheTokens": "캐시 토큰 (읽기/쓰기)",
-  "context.stats.userMessages": "사용자 메시지",
-  "context.stats.assistantMessages": "어시스턴트 메시지",
-  "context.stats.totalCost": "총 비용",
-  "context.stats.sessionCreated": "세션 생성됨",
-  "context.stats.lastActivity": "최근 활동",
-
-  "context.usage.tokens": "토큰",
-  "context.usage.usage": "사용량",
-  "context.usage.cost": "비용",
-  "context.usage.clickToView": "컨텍스트를 보려면 클릭",
-  "context.usage.view": "컨텍스트 사용량 보기",
-
-  "toast.language.title": "언어",
-  "toast.language.description": "{{language}}(으)로 전환됨",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "테마 전환됨",
-  "toast.scheme.title": "색상 테마",
-
-  "toast.permissions.autoaccept.on.title": "편집 자동 수락 중",
-  "toast.permissions.autoaccept.on.description": "편집 및 쓰기 권한이 자동으로 승인됩니다",
-  "toast.permissions.autoaccept.off.title": "편집 자동 수락 중지됨",
-  "toast.permissions.autoaccept.off.description": "편집 및 쓰기 권한 승인이 필요합니다",
-
-  "toast.workspace.enabled.title": "작업 공간 활성화됨",
-  "toast.workspace.enabled.description": "이제 사이드바에 여러 작업 트리가 표시됩니다",
-  "toast.workspace.disabled.title": "작업 공간 비활성화됨",
-  "toast.workspace.disabled.description": "사이드바에 메인 작업 트리만 표시됩니다",
-
-  "toast.model.none.title": "선택된 모델 없음",
-  "toast.model.none.description": "이 세션을 요약하려면 공급자를 연결하세요",
-
-  "toast.file.loadFailed.title": "파일 로드 실패",
-
-  "toast.file.listFailed.title": "파일 목록을 불러오지 못했습니다",
-  "toast.context.noLineSelection.title": "줄 선택 없음",
-  "toast.context.noLineSelection.description": "먼저 파일 탭에서 줄 범위를 선택하세요.",
-  "toast.session.share.copyFailed.title": "URL 클립보드 복사 실패",
-  "toast.session.share.success.title": "세션 공유됨",
-  "toast.session.share.success.description": "공유 URL이 클립보드에 복사되었습니다!",
-  "toast.session.share.failed.title": "세션 공유 실패",
-  "toast.session.share.failed.description": "세션을 공유하는 동안 오류가 발생했습니다",
-
-  "toast.session.unshare.success.title": "세션 공유 해제됨",
-  "toast.session.unshare.success.description": "세션 공유가 성공적으로 해제되었습니다!",
-  "toast.session.unshare.failed.title": "세션 공유 해제 실패",
-  "toast.session.unshare.failed.description": "세션 공유를 해제하는 동안 오류가 발생했습니다",
-
   "toast.session.rename.invalid.title": "잘못된 세션 제목",
-  "toast.session.listFailed.title": "{{project}}에 대한 세션을 로드하지 못했습니다",
-
-  "toast.update.title": "업데이트 가능",
-  "toast.update.description": "Kilo의 새 버전({{version}})을 설치할 수 있습니다.",
-  "toast.update.action.installRestart": "설치 및 다시 시작",
-  "toast.update.action.notYet": "나중에",
-
-  "error.page.title": "문제가 발생했습니다",
-  "error.page.description": "애플리케이션을 로드하는 동안 오류가 발생했습니다.",
-  "error.page.details.label": "오류 세부 정보",
-  "error.page.action.restart": "다시 시작",
-  "error.page.action.checking": "확인 중...",
-  "error.page.action.checkUpdates": "업데이트 확인",
-  "error.page.action.updateTo": "{{version}} 버전으로 업데이트",
-  "error.page.report.prefix": "이 오류를 Kilo 팀에 제보해 주세요: ",
-  "error.page.report.discord": "Discord",
-  "error.page.version": "버전: {{version}}",
-
-  "error.dev.rootNotFound":
-    "루트 요소를 찾을 수 없습니다. index.html에 추가하는 것을 잊으셨나요? 또는 id 속성의 철자가 틀렸을 수 있습니다.",
-
-  "error.globalSync.connectFailed": "서버에 연결할 수 없습니다. `{{url}}`에서 서버가 실행 중인가요?",
 
   "error.startup.title": "서버 연결 실패",
 
@@ -599,29 +264,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "ChatGPT에 다시 로그인한 후 메시지를 다시 보내 Codex 모델을 계속 사용하세요.",
 
-  "error.chain.unknown": "알 수 없는 오류",
-  "error.chain.causedBy": "원인:",
-  "error.chain.apiError": "API 오류",
-  "error.chain.status": "상태: {{status}}",
-  "error.chain.retryable": "재시도 가능: {{retryable}}",
-  "error.chain.responseBody": "응답 본문:\n{{body}}",
-  "error.chain.didYouMean": "혹시 {{suggestions}}을(를) 의미하셨나요?",
-  "error.chain.modelNotFound": "모델을 찾을 수 없음: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "구성(opencode.json)의 공급자/모델 이름을 확인하세요",
-  "error.chain.mcpFailed": 'MCP 서버 "{{name}}" 실패. 참고: Kilo는 아직 MCP 인증을 지원하지 않습니다.',
-  "error.chain.providerAuthFailed": "공급자 인증 실패 ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed": '공급자 "{{provider}}" 초기화 실패. 자격 증명과 구성을 확인하세요.',
-  "error.chain.configJsonInvalid": "{{path}}의 구성 파일이 유효한 JSON(C)가 아닙니다",
-  "error.chain.configJsonInvalidWithMessage": "{{path}}의 구성 파일이 유효한 JSON(C)가 아닙니다: {{message}}",
-  "error.chain.configDirectoryTypo":
-    '{{path}}의 "{{dir}}" 디렉터리가 유효하지 않습니다. 디렉터리 이름을 "{{suggestion}}"으로 변경하거나 제거하세요. 이는 흔한 오타입니다.',
-  "error.chain.configFrontmatterError": "{{path}}의 frontmatter 파싱 실패:\n{{message}}",
-  "error.chain.configInvalid": "{{path}}의 구성 파일이 유효하지 않습니다",
-  "error.chain.configInvalidWithMessage": "{{path}}의 구성 파일이 유효하지 않습니다: {{message}}",
-
   "notification.permission.title": "권한 필요",
   "notification.permission.titleSubagent": "권한 필요 (서브에이전트)",
-  "notification.permission.description": "{{projectName}}의 {{sessionTitle}}에서 권한이 필요합니다",
   "ui.permission.manageAutoApprove": "자동 승인 규칙 관리",
   "ui.permission.doomLoop.prompt": "{{tool}} 도구에서 잠재적인 반복 실행이 감지되었습니다. 계속 실행하시겠습니까?",
   "ui.permission.doomLoop.rule": "{{tool}} 호출 계속",
@@ -646,7 +290,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "할 일 읽기",
   "ui.permission.toolLabel.todoWrite": "할 일 쓰기",
   "ui.permission.toolLabel.codeSearch": "코드 검색",
-  "ui.permission.toggleWrap": "줄 바꿈 전환",
   "ui.permission.copyCommand": "복사",
   "ui.approval.auto": "자동 승인됨",
   "ui.approval.manual": "사용자가 승인함",
@@ -658,46 +301,18 @@ export const dict = {
   "ui.approval.source.yolo": "자동 승인(YOLO) 모드에 의해",
   "ui.approval.source.session": "세션 자동 승인 규칙에 의해",
   "ui.approval.source.default": "기본값으로",
-  "notification.question.title": "질문",
-  "notification.question.description": "{{projectName}}의 {{sessionTitle}}에서 질문이 있습니다",
-  "notification.action.goToSession": "세션으로 이동",
 
-  "notification.session.responseReady.title": "응답 준비됨",
-  "notification.session.error.title": "세션 오류",
-  "notification.session.error.fallbackDescription": "오류가 발생했습니다",
-
-  "home.recentProjects": "최근 프로젝트",
-  "home.empty.title": "최근 프로젝트 없음",
-  "home.empty.description": "로컬 프로젝트를 열어 시작하세요",
-
-  "session.tab.session": "세션",
   "session.tab.review": "검토",
-  "session.tab.context": "컨텍스트",
-  "session.panel.reviewAndFiles": "검토 및 파일",
   "session.review.filesChanged": "{{count}}개 파일 변경됨",
-  "session.review.change.one": "변경",
   "session.review.change.other": "변경",
   "session.review.loadingChanges": "변경 사항 로드 중...",
-  "session.review.empty": "이 세션에 변경 사항이 아직 없습니다",
   "session.review.noChanges": "변경 없음",
-  "session.files.selectToOpen": "열 파일을 선택하세요",
-  "session.files.all": "모든 파일",
-  "session.files.binaryContent": "바이너리 파일 (내용을 표시할 수 없음)",
-  "session.messages.renderEarlier": "이전 메시지 렌더링",
   "session.messages.loadingEarlier": "이전 메시지 로드 중...",
   "session.messages.loadEarlier": "이전 메시지 로드",
   "session.messages.loading": "메시지 로드 중...",
 
-  "session.messages.jumpToLatest": "최신으로 이동",
-  "session.context.addToContext": "컨텍스트에 {{selection}} 추가",
-
-  "session.new.worktree.main": "메인 브랜치",
-  "session.new.worktree.mainWithBranch": "메인 브랜치 ({{branch}})",
-  "session.new.worktree.create": "새 작업 트리 생성",
-  "session.new.lastModified": "최근 수정",
   "sidebar.session.newSession": "새 세션",
   "sidebar.session.newSession.tooltip": "현재 세션을 그대로 유지하면서 새로운 대화를 시작합니다.",
-  "sidebar.session.newSession.disabled": "이 세션은 이미 새 세션입니다. 채팅을 시작하거나 대신 worktree를 만드세요.",
   "sidebar.session.newWorktree": "새 Worktree",
   "sidebar.session.newWorktree.tooltip":
     "격리된 git worktree를 만들어 안전하게 실험하고, 변경 사항을 분리하며, 현재 브랜치를 방해하지 않고 병렬 세션을 실행합니다.",
@@ -713,131 +328,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "이 대화와 변경된 파일 {{files}}개를 격리된 후속 작업을 위해 전용 worktree로 이동합니다.",
   "sidebar.session.showChanges.tooltip.empty": "변경 사항 뷰를 열어 현재 작업 트리를 검사합니다.",
-  "sidebar.session.showChanges.tooltip.one": "파일 1개 변경됨 · +{{additions}} -{{deletions}}. 변경 사항 뷰 열기.",
-  "sidebar.session.showChanges.tooltip.other":
-    "파일 {{files}}개 변경됨 · +{{additions}} -{{deletions}}. 변경 사항 뷰 열기.",
-  "sidebar.session.agentManager.tooltip":
-    "Agent Manager를 열어 병렬 세션 및 worktree의 전체 개요를 확인하고, 장기 실행 작업을 한 곳에서 조정할 수 있습니다.",
-  "sidebar.session.openAgentManager": "Agent Manager 열기",
   "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에서 계속하지 못했습니다",
-  "session.header.search.placeholder": "{{project}} 검색",
-  "session.header.searchFiles": "파일 검색",
-  "session.header.openIn": "열기",
-  "session.header.open.action": "{{app}} 열기",
-  "session.header.open.ariaLabel": "{{app}}에서 열기",
-  "session.header.open.menu": "열기 옵션",
-  "session.header.open.copyPath": "경로 복사",
 
-  "status.popover.trigger": "상태",
-  "status.popover.ariaLabel": "서버 구성",
-  "status.popover.tab.servers": "서버",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "플러그인",
-  "status.popover.action.manageServers": "서버 관리",
-
-  "session.share.popover.title": "웹에 게시",
-  "session.share.popover.description.shared": "이 세션은 웹에 공개되었습니다. 링크가 있는 누구나 액세스할 수 있습니다.",
-  "session.share.popover.description.unshared":
-    "세션을 웹에 공개적으로 공유합니다. 링크가 있는 누구나 액세스할 수 있습니다.",
-  "session.share.action.share": "공유",
-  "session.share.action.publish": "게시",
-  "session.share.action.publishing": "게시 중...",
-  "session.share.action.unpublish": "게시 취소",
-  "session.share.action.unpublishing": "게시 취소 중...",
-  "session.share.action.view": "보기",
-  "session.share.copy.copied": "복사됨",
-  "session.share.copy.copyLink": "링크 복사",
-
-  "lsp.tooltip.none": "LSP 서버 없음",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "프롬프트 로드 중...",
-  "terminal.loading": "터미널 로드 중...",
-  "terminal.title": "터미널",
-  "terminal.title.numbered": "터미널 {{number}}",
-  "terminal.close": "터미널 닫기",
-
-  "terminal.connectionLost.title": "연결 끊김",
-  "terminal.connectionLost.description":
-    "터미널 연결이 중단되었습니다. 서버가 재시작하면 이런 일이 발생할 수 있습니다.",
   "common.closeTab": "탭 닫기",
   "common.signIn": "로그인",
-  "common.signOut": "로그아웃",
   "common.dismiss": "닫기",
   "common.requestFailed": "요청 실패",
-  "common.moreOptions": "더 많은 옵션",
-  "common.learnMore": "더 알아보기",
   "common.rename": "이름 바꾸기",
-  "common.reset": "초기화",
-  "common.archive": "보관",
   "common.delete": "삭제",
   "common.close": "닫기",
   "common.edit": "편집",
   "common.loadMore": "더 불러오기",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "메뉴 토글",
-  "sidebar.nav.projectsAndSessions": "프로젝트 및 세션",
   "sidebar.settings": "설정",
-  "sidebar.help": "도움말",
-  "sidebar.workspaces.enable": "작업 공간 활성화",
-  "sidebar.workspaces.disable": "작업 공간 비활성화",
-  "sidebar.gettingStarted.title": "시작하기",
-  "sidebar.gettingStarted.line1": "Kilo에는 무료 모델이 포함되어 있어 즉시 시작할 수 있습니다.",
-  "sidebar.gettingStarted.line2": "Claude, GPT, Gemini 등을 포함한 모델을 사용하려면 공급자를 연결하세요.",
-  "sidebar.project.recentSessions": "최근 세션",
-  "sidebar.project.viewAllSessions": "모든 세션 보기",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "데스크톱",
-  "settings.section.server": "서버",
-  "settings.tab.general": "일반",
-  "settings.tab.shortcuts": "단축키",
-
-  "settings.general.section.appearance": "모양",
-  "settings.general.section.notifications": "시스템 알림",
-  "settings.general.section.updates": "업데이트",
-  "settings.general.section.sounds": "효과음",
-
-  "settings.general.row.language.title": "언어",
-  "settings.general.row.language.description": "Kilo 표시 언어 변경",
-  "settings.general.row.appearance.title": "모양",
-  "settings.general.row.appearance.description": "기기에서 Kilo가 보이는 방식 사용자 지정",
-  "settings.general.row.theme.title": "테마",
-  "settings.general.row.theme.description": "Kilo 테마 사용자 지정",
-  "settings.general.row.font.title": "글꼴",
-  "settings.general.row.font.description": "코드 블록에 사용되는 고정폭 글꼴 사용자 지정",
-
-  "settings.general.row.releaseNotes.title": "릴리스 노트",
-  "settings.general.row.releaseNotes.description": "업데이트 후 '새 소식' 팝업 표시",
-
-  "settings.updates.row.startup.title": "시작 시 업데이트 확인",
-  "settings.updates.row.startup.description": "Kilo를 실행할 때 업데이트를 자동으로 확인합니다",
-  "settings.updates.row.check.title": "업데이트 확인",
-  "settings.updates.row.check.description": "업데이트를 수동으로 확인하고, 사용 가능하면 설치합니다",
-  "settings.updates.action.checkNow": "지금 확인",
-  "settings.updates.action.checking": "확인 중...",
-  "settings.updates.toast.latest.title": "최신 상태입니다",
-  "settings.updates.toast.latest.description": "현재 최신 버전의 Kilo를 사용 중입니다.",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "알림 01",
   "sound.option.alert02": "알림 02",
   "sound.option.alert03": "알림 03",
@@ -883,46 +392,11 @@ export const dict = {
   "sound.option.yup04": "네 04",
   "sound.option.yup05": "네 05",
   "sound.option.yup06": "네 06",
-  "settings.general.notifications.agent.title": "에이전트",
-  "settings.general.notifications.agent.description": "에이전트가 완료되거나 주의가 필요할 때 시스템 알림 표시",
-  "settings.general.notifications.permissions.title": "권한",
-  "settings.general.notifications.permissions.description": "권한이 필요할 때 시스템 알림 표시",
-  "settings.general.notifications.errors.title": "오류",
-  "settings.general.notifications.errors.description": "오류가 발생했을 때 시스템 알림 표시",
-
-  "settings.general.sounds.agent.title": "에이전트",
-  "settings.general.sounds.agent.description": "에이전트가 완료되거나 주의가 필요할 때 소리 재생",
-  "settings.general.sounds.permissions.title": "권한",
-  "settings.general.sounds.permissions.description": "권한이 필요할 때 소리 재생",
-  "settings.general.sounds.errors.title": "오류",
-  "settings.general.sounds.errors.description": "오류가 발생했을 때 소리 재생",
-
-  "settings.shortcuts.title": "키보드 단축키",
-  "settings.shortcuts.reset.button": "기본값으로 초기화",
-  "settings.shortcuts.reset.toast.title": "단축키 초기화됨",
-  "settings.shortcuts.reset.toast.description": "키보드 단축키가 기본값으로 초기화되었습니다.",
-  "settings.shortcuts.conflict.title": "단축키가 이미 사용 중임",
-  "settings.shortcuts.conflict.description": "{{keybind}}은(는) 이미 {{titles}}에 할당되어 있습니다.",
-  "settings.shortcuts.unassigned": "할당되지 않음",
-  "settings.shortcuts.pressKeys": "키 누르기",
-  "settings.shortcuts.search.placeholder": "단축키 검색",
-  "settings.shortcuts.search.empty": "단축키를 찾을 수 없습니다",
-
-  "settings.shortcuts.group.general": "일반",
-  "settings.shortcuts.group.session": "세션",
-  "settings.shortcuts.group.navigation": "탐색",
-  "settings.shortcuts.group.modelAndAgent": "모델 및 에이전트",
-  "settings.shortcuts.group.terminal": "터미널",
-  "settings.shortcuts.group.prompt": "프롬프트",
 
   "settings.providers.title": "공급자",
-  "settings.providers.description": "공급자 설정은 여기서 구성할 수 있습니다.",
-  "settings.providers.betaNotice":
-    "현재 설정 인터페이스에서는 Kilo Gateway 제공자만 설정할 수 있습니다. 다른 제공자 설정에 대한 지원은 베타 기간 동안 곧 제공될 예정입니다. 그동안에는 CLI 또는 설정 파일을 사용하여 제공자를 설정할 수 있습니다. 우리는 종속(lock-in) 없이 Kilo를 개방적으로 유지하기 위해 최선을 다하고 있습니다.",
   "settings.providers.section.connected": "연결된 공급자",
   "settings.providers.connected.empty": "연결된 공급자 없음",
   "settings.providers.section.popular": "인기 공급자",
-  "settings.providers.search.placeholder": "공급자 검색",
   "settings.providers.select.placeholder": "공급자 선택...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "환경",
@@ -941,7 +415,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "제공업체가 사용자의 프롬프트를 학습에 사용할 수 있는 Kilo Gateway 모델을 숨깁니다.",
   "settings.providers.modeModels": "모드별 모델",
-  "settings.providers.custom.note": "Base URL로 사용자 정의 공급자를 추가합니다.",
   "settings.providers.modeModels.description":
     "특정 모드의 기본 모델을 재정의합니다. 설정하지 않으면 전역 기본 모델이 사용됩니다.",
   "provider.custom.title": "사용자 정의 공급자",
@@ -1006,9 +479,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "모델 제거",
   "provider.custom.models.add": "모델 추가",
-  "provider.custom.models.fetch": "모델 가져오기",
-  "provider.custom.models.fetching": "가져오는 중\u2026",
-  "provider.custom.models.fetch.error": "모델을 가져오지 못했습니다: {{error}}",
   "provider.custom.models.fetch.authError": "인증에 실패했습니다. 위의 API 키를 확인하고 다시 시도하세요.",
   "provider.custom.models.fetch.empty": "이 서버에서 모델을 찾을 수 없습니다.",
   "provider.custom.models.fetch.added": "{{count}}개 모델이 추가되었습니다.",
@@ -1060,23 +530,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "레거시 .kilocode 구성",
   "settings.config.source.projectOpencode": "레거시 .opencode 구성",
   "settings.models.title": "모델",
-  "settings.models.description": "모델 설정은 여기서 구성할 수 있습니다.",
-  "settings.agents.title": "에이전트",
-  "settings.agents.description": "에이전트 설정은 여기서 구성할 수 있습니다.",
-  "settings.commands.title": "명령어",
-  "settings.commands.description": "명령어 설정은 여기서 구성할 수 있습니다.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP 설정은 여기서 구성할 수 있습니다.",
 
-  "settings.permissions.title": "권한",
-  "settings.permissions.description": "서버가 기본적으로 사용할 수 있는 도구를 제어합니다.",
-  "settings.permissions.section.tools": "도구",
   "settings.permissions.toast.updateFailed.title": "권한 업데이트 실패",
 
-  "settings.permissions.action.allow": "허용",
-  "settings.permissions.action.ask": "묻기",
-  "settings.permissions.action.deny": "거부",
-
   "settings.permissions.tool.read.title": "읽기",
   "settings.permissions.tool.read.description": "파일 읽기 (파일 경로와 일치)",
   "settings.permissions.tool.edit.title": "편집",
@@ -1110,7 +566,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "무한 반복",
   "settings.permissions.tool.doom_loop.description": "동일한 입력으로 반복되는 도구 호출 감지",
 
-  "session.delete.failed.title": "세션 삭제 실패",
   "session.delete.title": "세션 삭제",
   "session.delete.confirm": '"{{name}}" 세션을 삭제하시겠습니까?',
   "session.delete.button": "세션 삭제",
@@ -1138,14 +593,9 @@ export const dict = {
   "feedback.dialog.support": "고객 지원",
   "workStyle.onboarding.welcome": "Kilo에 오신 것을 환영합니다",
   "workStyle.onboarding.title": "원하는 작업 방식을 선택하세요",
-  "workStyle.onboarding.description":
-    "권한, 추론 블록, 터미널 출력 및 컨텍스트 타임라인의 초기 기본값을 설정합니다. 한 번만 적용되며 이미 사용자 지정한 설정은 건너뜁니다.",
   "workStyle.onboarding.settingsNote": "이 옵션은 언제든지 다음에서 변경할 수 있습니다:",
   "workStyle.onboarding.settings": "설정.",
-  "workStyle.onboarding.skip": "지금은 건너뛰기",
   "workStyle.toast.saved.title": "모드가 저장되었습니다",
-  "workStyle.toast.saved.description": "설정에서 언제든지 환경설정을 변경할 수 있습니다.",
-  "workStyle.toast.saved.action": "설정으로 이동",
   "workStyle.choice.permissions": "권한",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "표시",
@@ -1168,32 +618,6 @@ export const dict = {
   "session.cloud.import.legacy": "이전 버전의 세션으로 보이며 더 이상 지원되지 않습니다.",
   "session.cloud.import.failed": "클라우드 세션 가져오기 실패",
 
-  "workspace.new": "새 작업 공간",
-  "workspace.type.local": "로컬",
-  "workspace.type.sandbox": "샌드박스",
-  "workspace.create.failed.title": "작업 공간 생성 실패",
-  "workspace.delete.failed.title": "작업 공간 삭제 실패",
-  "workspace.resetting.title": "작업 공간 재설정 중",
-  "workspace.resetting.description": "잠시 시간이 걸릴 수 있습니다.",
-  "workspace.reset.failed.title": "작업 공간 재설정 실패",
-  "workspace.reset.success.title": "작업 공간 재설정됨",
-  "workspace.reset.success.description": "작업 공간이 이제 기본 브랜치와 일치합니다.",
-  "workspace.error.stillPreparing": "작업 공간이 아직 준비 중입니다",
-  "workspace.status.checking": "병합되지 않은 변경 사항 확인 중...",
-  "workspace.status.error": "Git 상태를 확인할 수 없습니다.",
-  "workspace.status.clean": "병합되지 않은 변경 사항이 감지되지 않았습니다.",
-  "workspace.status.dirty": "이 작업 공간에서 병합되지 않은 변경 사항이 감지되었습니다.",
-  "workspace.delete.title": "작업 공간 삭제",
-  "workspace.delete.confirm": '"{{name}}" 작업 공간을 삭제하시겠습니까?',
-  "workspace.delete.button": "작업 공간 삭제",
-  "workspace.reset.title": "작업 공간 재설정",
-  "workspace.reset.confirm": '"{{name}}" 작업 공간을 재설정하시겠습니까?',
-  "workspace.reset.button": "작업 공간 재설정",
-  "workspace.reset.archived.none": "활성 세션이 보관되지 않습니다.",
-  "workspace.reset.archived.one": "1개의 세션이 보관됩니다.",
-  "workspace.reset.archived.many": "{{count}}개의 세션이 보관됩니다.",
-  "workspace.reset.note": "이 작업은 작업 공간을 기본 브랜치와 일치하도록 재설정합니다.",
-
   "deviceAuth.toast.urlCopied": "URL이 클립보드에 복사되었습니다",
   "deviceAuth.toast.codeCopied": "코드가 클립보드에 복사되었습니다",
   "deviceAuth.toast.errorCopied": "오류가 클립보드에 복사되었습니다",
@@ -1231,7 +655,6 @@ export const dict = {
   "profile.pass.renews": "갱신",
   "profile.action.logout": "로그아웃",
 
-  "settings.section.configuration": "구성",
   "settings.agentBehaviour.title": "에이전트 동작",
   "settings.autoApprove.title": "자동 승인",
   "settings.browser.title": "브라우저",
@@ -1261,8 +684,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "이 프로젝트에 대해 활성화",
   "settings.indexing.projectEnable.description":
     "전역 인덱싱이 꺼져 있을 때 이 작업 영역에 대해 인덱싱을 활성화합니다.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "글로벌 인덱싱이 활성화되어 있어 이 프로젝트는 이미 포함되어 있습니다.",
   "settings.indexing.lancedbDirectory.description": "로컬 LanceDB 저장소의 선택적 디렉터리입니다.",
   "settings.indexing.lancedbDirectory.placeholder": "기본값 사용을 위해 비워두세요",
   "settings.indexing.lancedbDirectory.title": "LanceDB 디렉터리",
@@ -1290,7 +711,6 @@ export const dict = {
   "settings.indexing.vectorStore.description": "인덱싱된 임베딩을 저장할 위치를 선택하세요.",
   "settings.indexing.vectorStore.title": "벡터 저장소",
 
-  "session.messages.empty": "아래에 메시지를 입력하여 대화를 시작하세요.",
   "session.messages.welcome":
     "Kilo Code는 AI 코딩 어시스턴트입니다. 기능 구축, 버그 수정 또는 코드베이스 설명을 요청하세요.",
   "session.messages.scrollToBottom": "하단으로 스크롤",
@@ -1298,7 +718,6 @@ export const dict = {
   "session.messages.taskStarting": "시작 중...",
   "session.status.writingResponse": "응답 작성 중...",
   "session.status.retry": "재시도 중…",
-  "session.status.retrying": "재시도 중 ({{ attempt }}번째 시도)… {{ message }}",
   "session.status.working": "작업 중...",
   "session.status.offline": "네트워크 연결 끊김 — 다시 연결 중...",
   "session.outcome.incomplete": "턴이 종료되었으며 {{count}}개의 할 일이 남았습니다",
@@ -1329,11 +748,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}}개의 이전 세션",
   "context.stats.thisSession": "이 세션",
 
-  "time.justNow": "방금",
-  "time.minutesAgo": "{{count}}분 전",
-  "time.hoursAgo": "{{count}}시간 전",
-  "time.daysAgo": "{{count}}일 전",
-  "time.monthsAgo": "{{count}}개월 전",
   "time.today": "오늘",
   "time.yesterday": "어제",
   "time.thisWeek": "이번 주",
@@ -1349,7 +763,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "포트:",
   "settings.aboutKiloCode.versionInfo": "버전 정보",
   "settings.aboutKiloCode.version.label": "버전:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code 확장 프로그램",
   "settings.aboutKiloCode.community": "커뮤니티 및 지원",
   "settings.aboutKiloCode.feedback.prefix": "질문이나 피드백이 있으시면 다음에서 이슈를 열어주세요",
   "settings.aboutKiloCode.feedback.or": "또는",
@@ -1397,7 +810,6 @@ export const dict = {
   "settings.language.current": "현재:",
 
   "common.add": "추가",
-  "common.choose": "선택…",
 
   "settings.autocomplete.autoTrigger.title": "자동 인라인 완성 활성화",
   "settings.autocomplete.autoTrigger.description": "입력 시 인라인 완성 제안을 자동으로 표시",
@@ -1406,28 +818,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "채팅 텍스트 영역 자동완성 활성화",
   "settings.autocomplete.chatAutocomplete.description": "채팅 텍스트 영역에서 자동완성 제안 표시",
   "settings.autocomplete.modelsHint": "자동 완성에 사용되는 모델을 선택하려면 모델 설정을 참조하세요.",
-  "settings.notifications.agent.title": "에이전트 완료",
-  "settings.notifications.agent.description": "에이전트가 작업을 완료하면 알림 표시",
-  "settings.notifications.permissions.title": "권한 요청",
-  "settings.notifications.permissions.description": "권한 요청 시 알림 표시",
-  "settings.notifications.errors.title": "오류",
-  "settings.notifications.errors.description": "오류 발생 시 알림 표시",
   "settings.notifications.sounds": "소리",
   "settings.notifications.enable.title": "소리 알림 활성화",
   "settings.notifications.enable.description":
     "세션이 완료되거나 오류가 발생하거나 사용자 입력이 필요할 때 소리를 재생합니다",
   "settings.notifications.testSound": "테스트",
-  "settings.notifications.agentSound.title": "에이전트 완료 소리",
-  "settings.notifications.agentSound.description": "에이전트 완료 시 재생할 소리",
-  "settings.notifications.permSound.title": "권한 요청 소리",
-  "settings.notifications.permSound.description": "권한 요청 시 재생할 소리",
-  "settings.notifications.errorSound.title": "오류 소리",
-  "settings.notifications.errorSound.description": "오류 발생 시 재생할 소리",
   "settings.notifications.sound.default": "기본값",
   "settings.notifications.sound.system": "시스템",
   "settings.notifications.sound.description":
     "기본값은 완료, 입력, 오류에 서로 다른 소리를 사용합니다. 다른 옵션에서는 모든 이벤트에 동일한 소리를 사용합니다.",
-  "settings.notifications.sound.none": "없음",
   "settings.experimental.share.title": "공유 모드",
   "settings.experimental.share.description": "세션 공유 동작 방식",
   "settings.experimental.share.manual": "수동",
@@ -1447,9 +846,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "이미지 생성 모델",
   "settings.experimental.imageGenerationModel.placeholder": "기본값 (Auto Router)",
 
-  "settings.experimental.speechToText.title": "음성 텍스트 변환",
-  "settings.experimental.speechToText.description":
-    "Kilo Gateway를 통해 Kilo 계정을 사용하여 프롬프트 필드에서 음성 입력을 활성화합니다.",
   "settings.models.speechToText.disabledDescription":
     "Speech to Text를 사용하려면 Kilo 제공자를 활성화하고 로그인하세요. 현재 Speech to Text는 Kilo Gateway에서만 지원됩니다.",
   "settings.models.speechToTextModel.title": "음성 텍스트 변환 모델",
@@ -1490,15 +886,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "기본 에이전트",
   "settings.agentBehaviour.defaultAgent.description": "지정되지 않은 경우 사용할 에이전트",
   "settings.agentBehaviour.availableAgents": "사용 가능한 에이전트",
-  "settings.agentBehaviour.selectAgent": "구성할 에이전트를 선택하세요…",
-  "settings.agentBehaviour.selectAgent.title": "에이전트",
-  "settings.agentBehaviour.selectAgent.description": "구성할 에이전트를 선택하세요…",
   "settings.agentBehaviour.modelOverride.title": "모델 재정의",
   "settings.agentBehaviour.modelOverride.description": "이 에이전트의 기본 모델 재정의",
   "settings.agentBehaviour.variantOverride.title": "변형 재정의",
   "settings.agentBehaviour.variantOverride.description": "이 에이전트의 모델 변형 재정의",
-  "settings.agentBehaviour.prompt.title": "사용자 정의 프롬프트",
-  "settings.agentBehaviour.prompt.description": "이 에이전트의 추가 시스템 프롬프트",
   "settings.agentBehaviour.temperature.title": "온도",
   "settings.agentBehaviour.temperature.description":
     "AI 응답의 무작위성을 조절합니다(0–2). 낮은 값(예: 0.2)은 집중되고 일관된 출력을 생성합니다. 높은 값(예: 1.0)은 더 다양하고 창의적인 응답을 생성합니다. 모델 기본값을 사용하려면 비워 두세요.",
@@ -1518,7 +909,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "검색된 스킬",
   "settings.agentBehaviour.noSkillsFound":
     "스킬을 찾을 수 없습니다. 스킬을 사용하려면 아래에 스킬 폴더 경로 또는 URL을 추가하세요.",
-  "settings.agentBehaviour.availableModes": "사용 가능한 사용자 정의 모드",
   "settings.agentBehaviour.noAgentsFound": "에이전트를 찾을 수 없습니다.",
   "settings.agentBehaviour.createMode": "새 모드 만들기",
   "settings.agentBehaviour.createMode.name": "이름",
@@ -1597,11 +987,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "명령어",
   "settings.agentBehaviour.mcpDetail.args": "인수",
   "settings.agentBehaviour.mcpDetail.env": "환경",
-  "settings.agentBehaviour.mcpDetail.disabled": "이 서버는 비활성화되어 있습니다.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "마켓플레이스 둘러보기",
   "settings.agentBehaviour.mcpEmpty":
     "MCP 서버가 구성되지 않았습니다. kilo.jsonc에서 MCP 서버를 추가하거나 에이전트에게 추가를 요청하세요.",
-  "settings.agentBehaviour.workflowsPlaceholder": "워크플로우는 워크스페이스의 워크플로우 파일을 통해 관리됩니다.",
   "settings.agentBehaviour.workflows.description":
     "워크플로우는 구성에서 정의된 사용자 정의 슬래시 명령입니다. 채팅에서 /command-name을 입력하여 실행합니다. 명령은 opencode.json의 'command' 섹션에서 구성됩니다.",
   "settings.agentBehaviour.workflows.empty":
@@ -1686,7 +1074,6 @@ export const dict = {
     "예: 스페인어로 conventional commits 형식을 따라 commit messages를 생성해줘. 오직 commit message만 반환할 것.",
 
   "settings.commitMessage.language.sync": "UI 언어와 동기화",
-  "settings.commitMessage.language.title": "언어",
   "settings.commitMessage.language.description": "AI 생성된 커밋 메시지에 사용할 언어를 선택하십시오.:",
 
   "settings.display.username.title": "사용자 이름",
@@ -1724,8 +1111,6 @@ export const dict = {
   "settings.providers.disabled": "비활성화된 공급자",
   "settings.providers.disabled.description": "공급자 목록에서 숨길 공급자",
   "settings.providers.disabled.enable": "활성화",
-  "settings.providers.enabled": "활성화된 공급자 (허용 목록)",
-  "settings.providers.enabled.description": "설정된 경우 이 공급자만 사용 가능 (배타적 허용 목록)",
   "settings.providers.notSet": "설정되지 않음 (서버 기본값 사용)",
   "dialog.model.notSet": "설정되지 않음",
   "profile.personalAccount": "개인 계정",
@@ -1765,9 +1150,7 @@ export const dict = {
   "migration.migrate.title": "설정 마이그레이션",
   "migration.migrate.subtitle": "이전 설치에서 설정을 찾았습니다. 가져올 수 있는 항목은 다음과 같습니다.",
   "migration.migrate.selectLabel": "마이그레이션할 항목 선택",
-  "migration.migrate.cannotMigrate": "마이그레이션할 수 없음",
   "migration.migrate.chatHistory": "채팅 세션 및 기록",
-  "migration.migrate.chatHistoryDesc": "새 아키텍처와 호환되지 않음",
   "migration.migrate.button": "설정 마이그레이션",
   "migration.migrate.skip": "건너뛰기",
   "migration.migrate.keysDetected": "{{count}}개의 키 감지됨",
@@ -1791,10 +1174,7 @@ export const dict = {
     "이 작업은 VS Code 저장소에서 이전 설정을 제거합니다. 이 마이그레이션을 다시 실행할 수 없게 됩니다.",
   "migration.complete.done": "완료",
   "migration.migrate.sessionsDetected": "{{count}}개의 세션이 감지되었습니다",
-  "migration.error.sessionFailed": "세션 마이그레이션에 실패했습니다",
   "migration.error.continue": "계속",
-  "migration.error.action.copy": "복사",
-  "migration.error.toast.copied": "오류가 클립보드에 복사되었습니다",
 
   "migration.sessionSummary.title": "요약:",
   "migration.sessionSummary.copy": "보고서 복사",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 3131d2f65b9..5f0d90da4be 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Voorgesteld",
-  "command.category.view": "Weergave",
-  "command.category.project": "Project",
-  "command.category.provider": "Provider",
-  "command.category.server": "Server",
-  "command.category.session": "Sessie",
-  "command.category.theme": "Thema",
-  "command.category.language": "Taal",
-  "command.category.file": "Bestand",
-  "command.category.context": "Context",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Model",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Machtigingen",
-  "command.category.workspace": "Werkruimte",
-  "command.category.settings": "Instellingen",
 
-  "theme.scheme.system": "Systeem",
-  "theme.scheme.light": "Licht",
-  "theme.scheme.dark": "Donker",
-
-  "command.sidebar.toggle": "Zijbalk in-/uitschakelen",
-  "command.project.open": "Project openen",
   "command.provider.connect": "Provider verbinden",
-  "command.server.switch": "Server wisselen",
-  "command.settings.open": "Instellingen openen",
-  "command.session.previous": "Vorige sessie",
-  "command.session.next": "Volgende sessie",
-  "command.session.previous.unseen": "Vorige ongelezen sessie",
-  "command.session.next.unseen": "Volgende ongelezen sessie",
-  "command.session.archive": "Sessie archiveren",
-
-  "command.palette": "Opdrachtenpalet",
-
-  "command.theme.cycle": "Volgend thema",
-  "command.theme.set": "Thema gebruiken: {{theme}}",
-  "command.theme.scheme.cycle": "Volgend kleurenschema",
-  "command.theme.scheme.set": "Kleurenschema gebruiken: {{scheme}}",
-
-  "command.language.cycle": "Volgende taal",
-  "command.language.set": "Taal gebruiken: {{language}}",
 
   "command.session.new": "Nieuwe sessie",
-  "command.session.new.task": "Nieuwe taak",
   "command.session.show.changes": "Wijzigingen tonen",
-  "command.file.open": "Bestand openen",
-  "command.tab.close": "Tabblad sluiten",
-  "command.context.addSelection": "Selectie aan context toevoegen",
-  "command.context.addSelection.description": "Geselecteerde regels uit het huidige bestand toevoegen",
-  "command.terminal.toggle": "Terminal in-/uitschakelen",
-  "command.fileTree.toggle": "Bestandenstructuur in-/uitschakelen",
   "command.review.toggle": "Review in-/uitschakelen",
-  "command.terminal.new": "Nieuwe terminal",
-  "command.terminal.new.description": "Een nieuw terminal-tabblad aanmaken",
-  "command.steps.toggle": "Stappen in-/uitschakelen",
-  "command.steps.toggle.description": "Stappen voor het huidige bericht tonen of verbergen",
-  "command.message.previous": "Vorig bericht",
-  "command.message.previous.description": "Ga naar het vorige gebruikersbericht",
-  "command.message.next": "Volgend bericht",
-  "command.message.next.description": "Ga naar het volgende gebruikersbericht",
-  "command.model.choose": "Model kiezen",
-  "command.model.choose.description": "Een ander model selecteren",
-  "command.mcp.toggle": "MCP's in-/uitschakelen",
-  "command.mcp.toggle.description": "MCP's in-/uitschakelen",
-  "command.agent.cycle": "Volgende agent",
-  "command.agent.cycle.description": "Overschakelen naar de volgende agent",
-  "command.agent.cycle.reverse": "Vorige agent",
-  "command.agent.cycle.reverse.description": "Overschakelen naar de vorige agent",
-  "command.model.variant.cycle": "Denkinspanning aanpassen",
-  "command.model.variant.cycle.description": "Overschakelen naar het volgende inspanningsniveau",
-  "command.permissions.autoaccept.enable": "Bewerkingen automatisch accepteren",
-  "command.permissions.autoaccept.disable": "Bewerkingen niet meer automatisch accepteren",
-  "command.workspace.toggle": "Werkruimtes in-/uitschakelen",
-  "command.workspace.toggle.description": "Meerdere werkruimtes in de zijbalk in- of uitschakelen",
-  "command.session.undo": "Ongedaan maken",
-  "command.session.undo.description": "Het laatste bericht ongedaan maken",
-  "command.session.redo": "Opnieuw uitvoeren",
-  "command.session.redo.description": "Het laatste ongedaan gemaakte bericht opnieuw uitvoeren",
   "revert.banner.count_one": "{{count}} bericht teruggedraaid",
   "revert.banner.count_other": "{{count}} berichten teruggedraaid",
   "revert.banner.redo": "Opnieuw uitvoeren",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Snapshots inschakelen",
   "revert.disabled.agentBusy": "Wacht tot de agent klaar is",
   "command.session.compact": "Sessie comprimeren",
-  "command.session.compact.description": "De sessie samenvatten om de contextgrootte te verkleinen",
-  "command.session.fork": "Afsplitsen van bericht",
-  "command.session.fork.description": "Een nieuwe sessie aanmaken vanaf een eerder bericht",
-  "command.session.share": "Sessie delen",
-  "command.session.share.description": "Deel deze sessie en kopieer de URL naar het klembord",
-  "command.session.unshare": "Delen van sessie stoppen",
-  "command.session.unshare.description": "Stop met het delen van deze sessie",
   "command.session.export": "Sessietranscript exporteren",
 
   "agentRequirements.skill.installed": "Geïnstalleerd",
@@ -180,11 +100,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Deze controle van agentvereisten is niet meer actief.",
   "agentRequirements.error.requestFailed": "Kilo kon de agentvereisten niet controleren.",
 
-  "palette.search.placeholder": "Zoeken naar bestanden, commando's en sessies",
-  "palette.empty": "Geen resultaten gevonden",
-  "palette.group.commands": "Commando's",
-  "palette.group.files": "Bestanden",
-
   "dialog.provider.search.placeholder": "Providers zoeken",
   "dialog.provider.empty": "Geen providers gevonden",
   "dialog.provider.group.other": "Overige",
@@ -193,19 +108,13 @@ export const dict = {
   "dialog.model.select.title": "Model selecteren",
   "dialog.model.search.placeholder": "Modellen zoeken",
   "dialog.model.empty": "Geen modellen gevonden",
-  "dialog.model.manage": "Modellen beheren",
-  "dialog.model.manage.description": "Pas aan welke modellen in de modelkiezer verschijnen.",
   "dialog.model.select": "Selecteren",
   "dialog.model.expand": "Uitvouwen",
   "dialog.model.collapse": "Samenvouwen",
 
-  "dialog.model.unpaid.freeModels.title": "Gratis modellen aangeboden door Kilo",
-  "dialog.model.unpaid.addMore.title": "Meer modellen van populaire providers toevoegen",
-
   "dialog.provider.viewAll": "Meer providers tonen",
 
   "provider.connect.title": "Verbind {{provider}}",
-  "provider.connect.title.anthropicProMax": "Inloggen met Claude Pro/Max",
   "provider.connect.selectMethod": "Selecteer inlogmethode voor {{provider}}.",
   "provider.connect.method.apiKey": "API-sleutel",
   "provider.connect.status.inProgress": "Autorisatie wordt uitgevoerd...",
@@ -232,13 +141,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "bijv. my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI-eindpunt-URL",
   "provider.connect.azure.baseURL.placeholder": "bijv. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen geeft u toegang tot een geselecteerde set betrouwbare en geoptimaliseerde modellen voor programmeer-agents.",
-  "provider.connect.opencodeZen.line2":
-    "Met een enkele API-sleutel krijgt u toegang tot modellen zoals Claude, GPT, Gemini, GLM en meer.",
-  "provider.connect.opencodeZen.visit.prefix": "Bezoek ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " om uw API-sleutel op te halen.",
   "provider.connect.oauth.code.visit.prefix": "Bezoek ",
   "provider.connect.oauth.code.visit.link": "deze link",
   "provider.connect.oauth.code.visit.suffix":
@@ -246,7 +148,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} autorisatiecode",
   "provider.connect.oauth.code.placeholder": "Autorisatiecode",
   "provider.connect.oauth.code.required": "Autorisatiecode is vereist",
-  "provider.connect.oauth.code.invalid": "Ongeldige autorisatiecode",
   "provider.connect.oauth.auto.visit.prefix": "Bezoek ",
   "provider.connect.oauth.auto.visit.link": "deze link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -260,28 +161,11 @@ export const dict = {
 
   "model.tag.free": "Gratis",
   "model.tag.dataCollected": "Gegevens kunnen worden gebruikt voor training",
-  "model.tag.latest": "Nieuwste",
   "model.group.auto": "Automatische modellen",
   "model.group.recommended": "Aanbevolen",
   "model.group.favorites": "Favorieten",
-  "model.group.collapse": "{{group}} inklappen",
-  "model.group.expand": "{{group}} uitklappen",
   "model.favorite.add": "Toevoegen aan favorieten",
   "model.favorite.remove": "Verwijderen uit favorieten",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "tekst",
-  "model.input.image": "afbeelding",
-  "model.input.audio": "audio",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Staat toe: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Staat redeneren toe",
-  "model.tooltip.reasoning.none": "Geen redenering",
-  "model.tooltip.context": "Contextlimiet {{limit}}",
   "model.preview.label.released": "Uitgebracht",
   "model.preview.label.input": "Input",
   "model.preview.label.output": "Output",
@@ -302,11 +186,8 @@ export const dict = {
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Zoeken",
   "common.goBack": "Terug",
-  "common.goForward": "Vooruit",
   "common.loading": "Laden",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Annuleren",
   "common.connect": "Verbinden",
   "common.disconnect": "Ontkoppelen",
@@ -314,54 +195,8 @@ export const dict = {
   "common.save": "Opslaan",
   "common.saving": "Bezig met opslaan...",
   "common.default": "Standaard",
-  "common.attachment": "bijlage",
 
-  "prompt.placeholder.shell": "Voer shell-commando in...",
-  "prompt.placeholder.normal": 'Vraag iets... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Opmerkingen samenvatten…",
-  "prompt.placeholder.summarizeComment": "Opmerking samenvatten…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "esc om af te sluiten",
-
-  "prompt.example.1": "Fix een TODO in de codebase",
-  "prompt.example.2": "Wat is de tech-stack van dit project?",
-  "prompt.example.3": "Repareer kapotte tests",
-  "prompt.example.4": "Leg uit hoe authenticatie werkt",
-  "prompt.example.5": "Zoek en repareer beveiligingskwetsbaarheden",
-  "prompt.example.6": "Voeg unit tests toe voor de user service",
-  "prompt.example.7": "Herschrijf deze functie om leesbaarder te zijn",
-  "prompt.example.8": "Wat betekent deze foutmelding?",
-  "prompt.example.9": "Help me dit probleem te debuggen",
-  "prompt.example.10": "Genereer API-documentatie",
-  "prompt.example.11": "Optimaliseer database queries",
-  "prompt.example.12": "Voeg input validatie toe",
-  "prompt.example.13": "Maak een nieuwe component voor...",
-  "prompt.example.14": "Hoe deploy ik dit project?",
-  "prompt.example.15": "Bekijk mijn code op best practices",
-  "prompt.example.16": "Voeg foutafhandeling toe aan deze functie",
-  "prompt.example.17": "Leg dit regex-patroon uit",
-  "prompt.example.18": "Zet dit om naar TypeScript",
-  "prompt.example.19": "Voeg logging toe door de hele codebase",
-  "prompt.example.20": "Welke dependencies zijn verouderd?",
-  "prompt.example.21": "Help me een migratiescript te schrijven",
-  "prompt.example.22": "Implementeer caching voor dit endpoint",
-  "prompt.example.23": "Voeg paginering toe aan deze lijst",
-  "prompt.example.24": "Maak een CLI-commando voor...",
-  "prompt.example.25": "Hoe werken environment variables hier?",
-
-  "prompt.popover.emptyResults": "Geen overeenkomende resultaten",
-  "prompt.popover.emptyCommands": "Geen overeenkomende commando's",
-  "prompt.dropzone.label": "Sleep hier afbeeldingen of PDF's",
-  "prompt.slash.badge.custom": "aangepast",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "actief",
-  "prompt.context.includeActiveFile": "Actief bestand opnemen",
-  "prompt.context.removeActiveFile": "Actief bestand uit context verwijderen",
-  "prompt.context.removeFile": "Bestand uit context verwijderen",
   "prompt.thinking.tooltip": "Redeneringsinspanning",
-  "prompt.action.attachFile": "Bestand bijvoegen",
-  "prompt.attachment.remove": "Bijlage verwijderen",
   "prompt.action.send": "Verzenden",
   "prompt.action.send.blocked": "Beantwoord of negeer eerst de openstaande vraag",
   "prompt.action.send.recording": "Transcriberen en verzenden",
@@ -404,190 +239,17 @@ export const dict = {
   "speechToText.tooltip.error": "Spraakinvoer mislukt. Klik om te wissen.",
   "speechToText.error.title": "Spraakinvoer mislukt",
   "speechToText.error.loginRequired": "Meld u aan bij Kilo om spraakinvoer te gebruiken.",
-  "speechToText.error.permission": "Microfoontoegang is geweigerd.",
-  "speechToText.error.microphone": "Kon de microfoon niet starten.",
-  "speechToText.error.recording": "Opname mislukt.",
-  "speechToText.error.emptyRecording": "Er is geen audio opgenomen.",
   "speechToText.error.emptyTranscript": "Er is geen spraak gedetecteerd.",
-  "speechToText.error.encoding": "Kon de opname niet coderen.",
-  "speechToText.toast.transcribed": "Transcriptie ingevoegd",
 
-  "prompt.toast.pasteUnsupported.title": "Plakken niet ondersteund",
-  "prompt.toast.pasteUnsupported.description": "Hier kunnen alleen afbeeldingen of PDF's worden geplakt.",
-  "prompt.toast.modelAgentRequired.title": "Selecteer een agent en model",
-  "prompt.toast.modelAgentRequired.description": "Kies een agent en model voordat u een prompt verzendt.",
-  "prompt.toast.worktreeCreateFailed.title": "Aanmaken worktree mislukt",
-  "prompt.toast.sessionCreateFailed.title": "Aanmaken sessie mislukt",
-  "prompt.toast.shellSendFailed.title": "Verzenden shell-commando mislukt",
-  "prompt.toast.commandSendFailed.title": "Verzenden commando mislukt",
   "prompt.toast.promptSendFailed.title": "Verzenden prompt mislukt",
 
-  "dialog.mcp.title": "MCP's",
-  "dialog.mcp.description": "{{enabled}} van {{total}} ingeschakeld",
-  "dialog.mcp.empty": "Geen MCP's geconfigureerd",
-
-  "dialog.lsp.empty": "LSP's automatisch gedetecteerd uit bestandstypen",
-  "dialog.plugins.empty": "Plug-ins geconfigureerd in opencode.json",
-
   "mcp.status.connected": "verbonden",
   "mcp.status.failed": "mislukt",
   "mcp.status.needs_auth": "authenticatie vereist",
   "mcp.status.needs_registration": "clientregistratie vereist",
   "mcp.status.disabled": "uitgeschakeld",
 
-  "dialog.fork.empty": "Geen berichten om van af te splitsen",
-
-  "dialog.directory.search.placeholder": "Mappen zoeken",
-  "dialog.directory.empty": "Geen mappen gevonden",
-
-  "dialog.server.title": "Servers",
-  "dialog.server.description": "Wissel met welke Kilo-server deze app verbinding maakt.",
-  "dialog.server.search.placeholder": "Servers zoeken",
-  "dialog.server.empty": "Nog geen servers",
-  "dialog.server.add.title": "Een server toevoegen",
-  "dialog.server.add.url": "Server-URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Kon geen verbinding maken met server",
-  "dialog.server.add.checking": "Controleren...",
-  "dialog.server.add.button": "Server toevoegen",
-  "dialog.server.default.title": "Standaard server",
-  "dialog.server.default.description":
-    "Maak verbinding met deze server bij het opstarten van de app in plaats van een lokale server te starten. Vereist een herstart.",
-  "dialog.server.default.none": "Geen server geselecteerd",
-  "dialog.server.default.set": "Huidige server als standaard instellen",
-  "dialog.server.default.clear": "Wissen",
-  "dialog.server.action.remove": "Server verwijderen",
-
-  "dialog.server.menu.edit": "Bewerken",
-  "dialog.server.menu.default": "Als standaard instellen",
-  "dialog.server.menu.defaultRemove": "Standaard verwijderen",
-  "dialog.server.menu.delete": "Verwijderen",
-  "dialog.server.current": "Huidige server",
-  "dialog.server.status.default": "Standaard",
-
-  "dialog.project.edit.title": "Project bewerken",
-  "dialog.project.edit.name": "Naam",
-  "dialog.project.edit.icon": "Icoon",
-  "dialog.project.edit.icon.alt": "Projecticoon",
-  "dialog.project.edit.icon.hint": "Klik of sleep een afbeelding",
-  "dialog.project.edit.icon.recommended": "Aanbevolen: 128x128px",
-  "dialog.project.edit.color": "Kleur",
-  "dialog.project.edit.color.select": "Selecteer {{color}} kleur",
-  "dialog.project.edit.worktree.startup": "Werkruimte opstartscript",
-  "dialog.project.edit.worktree.startup.description":
-    "Wordt uitgevoerd na het aanmaken van een nieuwe werkruimte (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "bijv. bun install",
-
-  "context.breakdown.title": "Contextspecificatie",
-  "context.breakdown.note": 'Geschatte specificatie van invoertokens. "Overige" omvat tooldefinities en overhead.',
-  "context.breakdown.system": "Systeem",
-  "context.breakdown.user": "Gebruiker",
-  "context.breakdown.assistant": "Assistent",
-  "context.breakdown.tool": "Tool-aanroepen",
-  "context.breakdown.other": "Overige",
-
-  "context.systemPrompt.title": "Systeemprompt",
-  "context.rawMessages.title": "Ruwe berichten",
-
-  "context.stats.session": "Sessie",
-  "context.stats.messages": "Berichten",
-  "context.stats.provider": "Provider",
-  "context.stats.model": "Model",
-  "context.stats.limit": "Contextlimiet",
-  "context.stats.totalTokens": "Totaal aantal tokens",
-  "context.stats.usage": "Gebruik",
-  "context.stats.inputTokens": "Invoertokens",
-  "context.stats.outputTokens": "Uitvoertokens",
-  "context.stats.reasoningTokens": "Redeneertokens",
-  "context.stats.cacheTokens": "Cache-tokens (lezen/schrijven)",
-  "context.stats.userMessages": "Gebruikersberichten",
-  "context.stats.assistantMessages": "Assistentberichten",
-  "context.stats.totalCost": "Totale kosten",
-  "context.stats.sessionCreated": "Sessie aangemaakt",
-  "context.stats.lastActivity": "Laatste activiteit",
-
-  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Gebruik",
-  "context.usage.cost": "Kosten",
-  "context.usage.clickToView": "Klik om context te bekijken",
-  "context.usage.view": "Contextgebruik bekijken",
-
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.language.title": "Taal",
-  "toast.language.description": "Omgeschakeld naar {{language}}",
-
-  "toast.theme.title": "Thema omgeschakeld",
-  "toast.scheme.title": "Kleurenschema",
-
-  "toast.workspace.enabled.title": "Werkruimtes ingeschakeld",
-  "toast.workspace.enabled.description": "Meerdere worktrees worden nu weergegeven in de zijbalk",
-  "toast.workspace.disabled.title": "Werkruimtes uitgeschakeld",
-  "toast.workspace.disabled.description": "Alleen de hoofd-worktree wordt weergegeven in de zijbalk",
-
-  "toast.permissions.autoaccept.on.title": "Bewerkingen automatisch accepteren",
-  "toast.permissions.autoaccept.on.description": "Bewerk- en schrijfrechten worden automatisch goedgekeurd",
-  "toast.permissions.autoaccept.off.title": "Automatisch accepteren van bewerkingen gestopt",
-  "toast.permissions.autoaccept.off.description": "Voor bewerk- en schrijfrechten is goedkeuring vereist",
-
-  "toast.model.none.title": "Geen model geselecteerd",
-  "toast.model.none.description": "Verbind een provider om deze sessie samen te vatten",
-
-  "toast.file.loadFailed.title": "Bestand laden mislukt",
-  "toast.file.listFailed.title": "Bestanden weergeven mislukt",
-
-  "toast.context.noLineSelection.title": "Geen regelselectie",
-  "toast.context.noLineSelection.description": "Selecteer eerst een bereik van regels in een bestandstabblad.",
-
-  "toast.session.share.copyFailed.title": "URL kopiëren naar klembord mislukt",
-  "toast.session.share.success.title": "Sessie gedeeld",
-  "toast.session.share.success.description": "Deel-URL naar klembord gekopieerd!",
-  "toast.session.share.failed.title": "Sessie delen mislukt",
-  "toast.session.share.failed.description": "Er is een fout opgetreden bij het delen van de sessie",
-
-  "toast.session.unshare.success.title": "Delen van sessie gestopt",
-  "toast.session.unshare.success.description": "Delen van sessie succesvol gestopt!",
-  "toast.session.unshare.failed.title": "Delen van sessie stoppen mislukt",
-  "toast.session.unshare.failed.description": "Er is een fout opgetreden bij het stoppen van het delen van de sessie",
   "toast.session.rename.invalid.title": "Ongeldige sessietitel",
-  "toast.session.listFailed.title": "Laden van sessies voor {{project}} is mislukt",
-
-  "toast.update.title": "Update beschikbaar",
-  "toast.update.description": "Een nieuwe versie van Kilo ({{version}}) is nu beschikbaar om te installeren.",
-  "toast.update.action.installRestart": "Installeren en herstarten",
-  "toast.update.action.notYet": "Nog niet",
-
-  "error.page.title": "Er is iets misgegaan",
-  "error.page.description": "Er is een fout opgetreden tijdens het laden van de applicatie.",
-  "error.page.details.label": "Foutdetails",
-  "error.page.action.restart": "Herstarten",
-  "error.page.action.checking": "Controleren...",
-  "error.page.action.checkUpdates": "Controleren op updates",
-  "error.page.action.updateTo": "Updaten naar {{version}}",
-  "error.page.report.prefix": "Meld deze fout alsjeblieft aan het Kilo team",
-  "error.page.report.discord": "op Discord",
-  "error.page.version": "Versie: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Root-element niet gevonden. Ben je vergeten het toe te voegen aan je index.html? Of is het id-attribuut verkeerd gespeld?",
-
-  "error.globalSync.connectFailed": "Kon geen verbinding maken met de server. Draait er een server op `{{url}}`?",
 
   "error.startup.title": "Serververbinding mislukt",
 
@@ -605,30 +267,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Meld je opnieuw aan bij ChatGPT en stuur je bericht nog een keer om Codex-modellen te blijven gebruiken.",
 
-  "error.chain.unknown": "Onbekende fout",
-  "error.chain.causedBy": "Veroorzaakt door:",
-  "error.chain.apiError": "API-fout",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Opnieuw te proberen: {{retryable}}",
-  "error.chain.responseBody": "Antwoord-body:\n{{body}}",
-  "error.chain.didYouMean": "Bedoelde je: {{suggestions}}",
-  "error.chain.modelNotFound": "Model niet gevonden: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Controleer je configuratie (opencode.json) provider/model namen",
-  "error.chain.mcpFailed": 'MCP-server "{{name}}" is mislukt. Let op, Kilo ondersteunt nog geen MCP-authenticatie.',
-  "error.chain.providerAuthFailed": "Provider-authenticatie mislukt ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Initialiseren van provider "{{provider}}" is mislukt. Controleer referenties en configuratie.',
-  "error.chain.configJsonInvalid": "Configuratiebestand in {{path}} is geen geldige JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Configuratiebestand in {{path}} is geen geldige JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Map "{{dir}}" in {{path}} is niet geldig. Hernoem de map naar "{{suggestion}}" of verwijder deze. Dit is een veelvoorkomende typfout.',
-  "error.chain.configFrontmatterError": "Parsen van frontmatter in {{path}} is mislukt:\n{{message}}",
-  "error.chain.configInvalid": "Configuratiebestand in {{path}} is ongeldig",
-  "error.chain.configInvalidWithMessage": "Configuratiebestand in {{path}} is ongeldig: {{message}}",
-
   "notification.permission.title": "Toestemming vereist",
   "notification.permission.titleSubagent": "Toestemming vereist (subagent)",
-  "notification.permission.description": "{{sessionTitle}} in {{projectName}} heeft toestemming nodig",
   "ui.permission.manageAutoApprove": "Beheer automatisch goedkeuren regels",
   "ui.permission.doomLoop.prompt": "Mogelijke lus gedetecteerd voor het hulpmiddel {{tool}}. Doorgaan met uitvoeren?",
   "ui.permission.doomLoop.rule": "Doorgaan met {{tool}}-aanroepen",
@@ -653,7 +293,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Todo Lezen",
   "ui.permission.toolLabel.todoWrite": "Todo Schrijven",
   "ui.permission.toolLabel.codeSearch": "Code Zoeken",
-  "ui.permission.toggleWrap": "Regelterugloop in-/uitschakelen",
   "ui.permission.copyCommand": "Kopiëren",
   "ui.approval.auto": "Automatisch goedgekeurd",
   "ui.approval.manual": "Door jou goedgekeurd",
@@ -665,49 +304,19 @@ export const dict = {
   "ui.approval.source.yolo": "door de automatische goedkeuringsmodus (YOLO)",
   "ui.approval.source.session": "door een sessie-automatische-goedkeuringsregel",
   "ui.approval.source.default": "standaard",
-  "notification.question.title": "Vraag",
-  "notification.question.description": "{{sessionTitle}} in {{projectName}} heeft een vraag",
-  "notification.action.goToSession": "Ga naar sessie",
 
-  "notification.session.responseReady.title": "Antwoord is klaar",
-  "notification.session.error.title": "Sessiefout",
-  "notification.session.error.fallbackDescription": "Er is een fout opgetreden",
-
-  "home.recentProjects": "Recente projecten",
-  "home.empty.title": "Geen recente projecten",
-  "home.empty.description": "Ga aan de slag door een lokaal project te openen",
-
-  "session.tab.session": "Sessie",
   "session.tab.review": "Beoordelen",
-  "session.tab.context": "Context",
-  "session.panel.reviewAndFiles": "Beoordeling en bestanden",
   "session.review.filesChanged": "{{count}} bestanden gewijzigd",
-  "session.review.change.one": "Wijziging",
   "session.review.change.other": "Wijzigingen",
   "session.review.loadingChanges": "Wijzigingen laden...",
-  "session.review.empty": "Nog geen wijzigingen in deze sessie",
   "session.review.noChanges": "Geen wijzigingen",
 
-  "session.files.selectToOpen": "Selecteer een bestand om te openen",
-  "session.files.all": "Alle bestanden",
-  "session.files.binaryContent": "Binair bestand (inhoud kan niet worden weergegeven)",
-
-  "session.messages.renderEarlier": "Eerdere berichten weergeven",
   "session.messages.loadingEarlier": "Eerdere berichten laden...",
   "session.messages.loadEarlier": "Eerdere berichten laden",
   "session.messages.loading": "Berichten laden...",
-  "session.messages.jumpToLatest": "Spring naar nieuwste",
 
-  "session.context.addToContext": "Voeg {{selection}} toe aan context",
-
-  "session.new.worktree.main": "Main-branch",
-  "session.new.worktree.mainWithBranch": "Main-branch ({{branch}})",
-  "session.new.worktree.create": "Nieuwe worktree aanmaken",
-  "session.new.lastModified": "Laatst gewijzigd",
   "sidebar.session.newSession": "Nieuwe Sessie",
   "sidebar.session.newSession.tooltip": "Start een nieuw gesprek terwijl je de huidige sessie intact houdt.",
-  "sidebar.session.newSession.disabled":
-    "Deze sessie is al nieuw. Begin met chatten of maak in plaats daarvan een worktree aan.",
   "sidebar.session.newWorktree": "Nieuwe Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Maak een geïsoleerde git worktree aan om veilig te experimenteren, wijzigingen gescheiden te houden en parallelle sessies uit te voeren zonder je huidige branch te verstoren.",
@@ -724,132 +333,25 @@ export const dict = {
     "Verplaats deze conversatie en {{files}} gewijzigde bestanden naar een specifieke worktree voor geïsoleerd vervolgwerk.",
   "sidebar.session.showChanges.tooltip.empty":
     "Open de weergave met wijzigingen om de huidige worktree te inspecteren.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 bestand gewijzigd · +{{additions}} -{{deletions}}. Open de wijzigingenweergave.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} bestanden gewijzigd · +{{additions}} -{{deletions}}. Open de wijzigingenweergave.",
-  "sidebar.session.agentManager.tooltip":
-    "Open Agent Manager voor een compleet overzicht van parallelle sessies en worktrees, zodat je langlopende taken op één plek kunt coördineren.",
-  "sidebar.session.openAgentManager": "Open Agent Manager",
   "sidebar.session.progress.capturing": "Wijzigingen vastleggen...",
   "sidebar.session.progress.creating": "Worktree aanmaken...",
   "sidebar.session.progress.setup": "Setup uitvoeren...",
   "sidebar.session.progress.transferring": "Wijzigingen overzetten...",
   "sidebar.session.progress.forking": "Sessie starten...",
   "sidebar.session.progress.failed": "Kan niet doorgaan in worktree",
-  "session.header.search.placeholder": "Zoek in {{project}}",
-  "session.header.searchFiles": "Bestanden zoeken",
-  "session.header.openIn": "Open in",
-  "session.header.open.action": "Open {{app}}",
-  "session.header.open.ariaLabel": "Open in {{app}}",
-  "session.header.open.menu": "Open opties",
-  "session.header.open.copyPath": "Pad kopiëren",
-
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Serverconfiguraties",
-  "status.popover.tab.servers": "Servers",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Beheer servers",
-
-  "session.share.popover.title": "Publiceer op web",
-  "session.share.popover.description.shared": "Deze sessie is openbaar op het web. Iedereen met de link heeft toegang.",
-  "session.share.popover.description.unshared":
-    "Deel de sessie openbaar op het web. Iedereen met de link heeft toegang.",
-  "session.share.action.share": "Delen",
-  "session.share.action.publish": "Publiceren",
-  "session.share.action.publishing": "Publiceren...",
-  "session.share.action.unpublish": "Publicatie ongedaan maken",
-  "session.share.action.unpublishing": "Publicatie ongedaan maken...",
-  "session.share.action.view": "Weergeven",
-  "session.share.copy.copied": "Gekopieerd",
-  "session.share.copy.copyLink": "Kopieer link",
-
-  "lsp.tooltip.none": "Geen LSP-servers",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Prompt laden...",
-  "terminal.loading": "Terminal laden...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Sluit terminal",
-  "terminal.connectionLost.title": "Verbinding verbroken",
-  "terminal.connectionLost.description":
-    "De terminalverbinding werd onderbroken. Dit kan gebeuren wanneer de server opnieuw opstart.",
 
   "common.closeTab": "Sluit tabblad",
   "common.signIn": "Inloggen",
-  "common.signOut": "Uitloggen",
   "common.dismiss": "Negeren",
   "common.requestFailed": "Verzoek mislukt",
-  "common.moreOptions": "Meer opties",
-  "common.learnMore": "Meer informatie",
   "common.rename": "Hernoemen",
-  "common.reset": "Reset",
-  "common.archive": "Archiveren",
   "common.delete": "Verwijderen",
   "common.close": "Sluiten",
   "common.edit": "Bewerken",
   "common.loadMore": "Meer laden",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Menu in-/uitschakelen",
-  "sidebar.nav.projectsAndSessions": "Projecten en sessies",
   "sidebar.settings": "Instellingen",
-  "sidebar.help": "Help",
-  "sidebar.workspaces.enable": "Werkruimtes inschakelen",
-  "sidebar.workspaces.disable": "Werkruimtes uitschakelen",
-  "sidebar.gettingStarted.title": "Aan de slag",
-  "sidebar.gettingStarted.line1": "Kilo bevat gratis modellen, zodat je meteen kunt beginnen.",
-  "sidebar.gettingStarted.line2": "Koppel een provider om modellen te gebruiken, incl. Claude, GPT, Gemini enz.",
-  "sidebar.project.recentSessions": "Recente sessies",
-  "sidebar.project.viewAllSessions": "Bekijk alle sessies",
 
-  "app.name.desktop": "Kilo Desktop",
-
-  "settings.section.desktop": "Desktop",
-  "settings.section.server": "Server",
-  "settings.tab.general": "Algemeen",
-  "settings.tab.shortcuts": "Sneltoetsen",
-
-  "settings.general.section.appearance": "Uiterlijk",
-  "settings.general.section.notifications": "Systeemmeldingen",
-  "settings.general.section.updates": "Updates",
-  "settings.general.section.sounds": "Geluidseffecten",
-
-  "settings.general.row.language.title": "Taal",
-  "settings.general.row.language.description": "Wijzig de weergavetaal voor Kilo",
-  "settings.general.row.appearance.title": "Uiterlijk",
-  "settings.general.row.appearance.description": "Pas aan hoe Kilo eruitziet op je apparaat",
-  "settings.general.row.theme.title": "Thema",
-  "settings.general.row.theme.description": "Pas het thema van Kilo aan.",
-  "settings.general.row.font.title": "Lettertype",
-  "settings.general.row.font.description": "Pas het mono-lettertype aan dat wordt gebruikt in codeblokken",
-
-  "settings.general.row.releaseNotes.title": "Release notes",
-  "settings.general.row.releaseNotes.description": "Toon 'Wat is nieuw' pop-ups na updates",
-
-  "settings.updates.row.startup.title": "Controleer op updates bij opstarten",
-  "settings.updates.row.startup.description": "Controleer automatisch op updates wanneer Kilo start",
-  "settings.updates.row.check.title": "Controleer op updates",
-  "settings.updates.row.check.description": "Controleer handmatig op updates en installeer indien beschikbaar",
-  "settings.updates.action.checkNow": "Nu controleren",
-  "settings.updates.action.checking": "Controleren...",
-  "settings.updates.toast.latest.title": "Je bent up-to-date",
-  "settings.updates.toast.latest.description": "Je gebruikt de nieuwste versie van Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Melding 01",
   "sound.option.alert02": "Melding 02",
   "sound.option.alert03": "Melding 03",
@@ -896,43 +398,7 @@ export const dict = {
   "sound.option.yup05": "Ja 05",
   "sound.option.yup06": "Ja 06",
 
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Toon systeemmelding wanneer de agent klaar is of aandacht nodig heeft",
-  "settings.general.notifications.permissions.title": "Toestemmingen",
-  "settings.general.notifications.permissions.description": "Toon systeemmelding wanneer een toestemming vereist is",
-  "settings.general.notifications.errors.title": "Fouten",
-  "settings.general.notifications.errors.description": "Toon systeemmelding wanneer er een fout optreedt",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Speel geluid af wanneer de agent klaar is of aandacht nodig heeft",
-  "settings.general.sounds.permissions.title": "Toestemmingen",
-  "settings.general.sounds.permissions.description": "Speel geluid af wanneer een toestemming vereist is",
-  "settings.general.sounds.errors.title": "Fouten",
-  "settings.general.sounds.errors.description": "Speel geluid af wanneer er een fout optreedt",
-
-  "settings.shortcuts.title": "Sneltoetsen",
-  "settings.shortcuts.reset.button": "Reset naar standaard",
-  "settings.shortcuts.reset.toast.title": "Sneltoetsen gereset",
-  "settings.shortcuts.reset.toast.description": "Sneltoetsen zijn teruggezet naar de standaardwaarden.",
-  "settings.shortcuts.conflict.title": "Sneltoets al in gebruik",
-  "settings.shortcuts.conflict.description": "{{keybind}} is al toegewezen aan {{titles}}.",
-  "settings.shortcuts.unassigned": "Niet toegewezen",
-  "settings.shortcuts.pressKeys": "Druk op toetsen",
-  "settings.shortcuts.search.placeholder": "Zoek sneltoetsen",
-  "settings.shortcuts.search.empty": "Geen sneltoetsen gevonden",
-
-  "settings.shortcuts.group.general": "Algemeen",
-  "settings.shortcuts.group.session": "Sessie",
-  "settings.shortcuts.group.navigation": "Navigatie",
-  "settings.shortcuts.group.modelAndAgent": "Model en agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
-
   "settings.providers.title": "Providers",
-  "settings.providers.description": "Provider-instellingen zullen hier configureerbaar zijn.",
-  "settings.providers.betaNotice":
-    "Momenteel kan alleen de Kilo Gateway-provider worden geconfigureerd in de instellingeninterface. Ondersteuning voor het configureren van andere providers komt binnenkort tijdens de bèta-periode. In de tussentijd kun je providers configureren met behulp van de CLI of het configuratiebestand. We zijn toegewijd om Kilo open te houden, geen lock-in.",
   "settings.providers.section.connected": "Gekoppelde providers",
   "settings.providers.connected.empty": "Geen gekoppelde providers",
   "settings.providers.section.popular": "Populaire providers",
@@ -1010,9 +476,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Model verwijderen",
   "provider.custom.models.add": "Model toevoegen",
-  "provider.custom.models.fetch": "Modellen ophalen",
-  "provider.custom.models.fetching": "Ophalen\u2026",
-  "provider.custom.models.fetch.error": "Kan modellen niet ophalen: {{error}}",
   "provider.custom.models.fetch.authError":
     "Authenticatie mislukt. Controleer de API-sleutel hierboven en probeer het opnieuw.",
   "provider.custom.models.fetch.empty": "Geen modellen gevonden op deze server.",
@@ -1065,23 +528,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Verouderde .kilocode-configuratie",
   "settings.config.source.projectOpencode": "Verouderde .opencode-configuratie",
   "settings.models.title": "Modellen",
-  "settings.models.description": "Model-instellingen zullen hier configureerbaar zijn.",
-  "settings.agents.title": "Agenten",
-  "settings.agents.description": "Agent-instellingen zullen hier configureerbaar zijn.",
-  "settings.commands.title": "Opdrachten",
-  "settings.commands.description": "Opdracht-instellingen zullen hier configureerbaar zijn.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP-instellingen zullen hier configureerbaar zijn.",
 
-  "settings.permissions.title": "Toestemmingen",
-  "settings.permissions.description": "Bepaal welke tools de server standaard mag gebruiken.",
-  "settings.permissions.section.tools": "Tools",
   "settings.permissions.toast.updateFailed.title": "Updaten van toestemmingen is mislukt",
 
-  "settings.permissions.action.allow": "Toestaan",
-  "settings.permissions.action.ask": "Vragen",
-  "settings.permissions.action.deny": "Weigeren",
-
   "settings.permissions.tool.read.title": "Lezen",
   "settings.permissions.tool.read.description": "Een bestand lezen (komt overeen met het bestandspad)",
   "settings.permissions.tool.edit.title": "Bewerken",
@@ -1116,7 +565,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "Detecteer herhaalde tool calls met identieke invoer",
 
-  "session.delete.failed.title": "Verwijderen van sessie mislukt",
   "session.delete.title": "Verwijder sessie",
   "session.delete.confirm": 'Sessie "{{name}}" verwijderen?',
   "session.delete.button": "Verwijder sessie",
@@ -1144,14 +592,9 @@ export const dict = {
   "feedback.dialog.support": "Klantenservice",
   "workStyle.onboarding.welcome": "Welkom bij Kilo",
   "workStyle.onboarding.title": "Kies hoe je wilt werken",
-  "workStyle.onboarding.description":
-    "Hiermee stel je de beginwaarden in voor machtigingen, redeneerblokken, terminaluitvoer en de contexttijdlijn. Dit wordt slechts één keer toegepast en slaat instellingen over die je al hebt aangepast.",
   "workStyle.onboarding.settingsNote": "Je kunt deze opties op elk moment wijzigen in",
   "workStyle.onboarding.settings": "Instellingen.",
-  "workStyle.onboarding.skip": "Voorlopig overslaan",
   "workStyle.toast.saved.title": "Modus succesvol opgeslagen",
-  "workStyle.toast.saved.description": "Werk je voorkeuren op elk moment bij in Instellingen.",
-  "workStyle.toast.saved.action": "Naar Instellingen",
   "workStyle.choice.permissions": "Machtigingen",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Zichtbaarheid",
@@ -1176,32 +619,6 @@ export const dict = {
   "session.cloud.import.legacy": "Dit lijkt een oude sessie te zijn die niet langer wordt ondersteund.",
   "session.cloud.import.failed": "Importeren van cloudsessie mislukt",
 
-  "workspace.new": "Nieuwe workspace",
-  "workspace.type.local": "lokaal",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Aanmaken van workspace mislukt",
-  "workspace.delete.failed.title": "Verwijderen van workspace mislukt",
-  "workspace.resetting.title": "Workspace resetten",
-  "workspace.resetting.description": "Dit kan een minuut duren.",
-  "workspace.reset.failed.title": "Resetten van workspace mislukt",
-  "workspace.reset.success.title": "Workspace gereset",
-  "workspace.reset.success.description": "Workspace komt nu overeen met de standaard branch.",
-  "workspace.error.stillPreparing": "Workspace wordt nog voorbereid",
-  "workspace.status.checking": "Controleren op ongemergde wijzigingen...",
-  "workspace.status.error": "Kan git status niet verifiëren.",
-  "workspace.status.clean": "Geen ongemergde wijzigingen gedetecteerd.",
-  "workspace.status.dirty": "Ongemergde wijzigingen gedetecteerd in deze workspace.",
-  "workspace.delete.title": "Verwijder workspace",
-  "workspace.delete.confirm": 'Workspace "{{name}}" verwijderen?',
-  "workspace.delete.button": "Verwijder workspace",
-  "workspace.reset.title": "Werkruimte herstellen",
-  "workspace.reset.confirm": 'Workspace "{{name}}" resetten?',
-  "workspace.reset.button": "Werkruimte herstellen",
-  "workspace.reset.archived.none": "Er worden geen actieve sessies gearchiveerd.",
-  "workspace.reset.archived.one": "1 sessie wordt gearchiveerd.",
-  "workspace.reset.archived.many": "{{count}} sessies worden gearchiveerd.",
-  "workspace.reset.note": "Dit reset de workspace naar de standaard branch.",
-
   "deviceAuth.toast.urlCopied": "URL gekopieerd naar klembord",
   "deviceAuth.toast.codeCopied": "Code gekopieerd naar klembord",
   "deviceAuth.toast.errorCopied": "Fout gekopieerd naar klembord",
@@ -1239,7 +656,6 @@ export const dict = {
   "profile.pass.renews": "Vernieuwt",
   "profile.action.logout": "Uitloggen",
 
-  "settings.section.configuration": "Configuratie",
   "settings.agentBehaviour.title": "Agent Gedrag",
   "settings.autoApprove.title": "Automatisch Goedkeuren",
   "settings.browser.title": "Browser",
@@ -1262,8 +678,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Inschakelen voor dit project",
   "settings.indexing.projectEnable.description":
     "Indexering inschakelen voor deze werkruimte wanneer globale indexering is uitgeschakeld.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Globale indexering is ingeschakeld, dus dit project is al opgenomen.",
   "settings.indexing.provider.title": "Embedding-provider",
   "settings.indexing.provider.description":
     "Kies de provider die wordt gebruikt om embeddings te genereren voor semantisch zoeken.",
@@ -1294,7 +708,6 @@ export const dict = {
   "settings.language.title": "Taal",
   "settings.aboutKiloCode.title": "Over Kilo Code",
 
-  "session.messages.empty": "Start een gesprek door hieronder een bericht te typen.",
   "session.messages.welcome":
     "Kilo Code is een AI-codeerassistent. Vraag het om features te bouwen, bugs op te lossen of je codebase uit te leggen.",
   "session.messages.scrollToBottom": "Scroll naar beneden",
@@ -1302,7 +715,6 @@ export const dict = {
   "session.messages.taskStarting": "Starten...",
   "session.status.writingResponse": "Antwoord schrijven...",
   "session.status.retry": "Opnieuw proberen...",
-  "session.status.retrying": "Opnieuw proberen (poging {{ attempt }})... {{ message }}",
   "session.status.working": "Bezig...",
   "session.status.offline": "Netwerkverbinding verbroken — opnieuw verbinden...",
   "session.outcome.incomplete": "Beurt beëindigd met {{count}} resterende to-do's",
@@ -1334,11 +746,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} oudere sessies",
   "context.stats.thisSession": "Deze sessie",
 
-  "time.justNow": "zojuist",
-  "time.minutesAgo": "{{count}} min geleden",
-  "time.hoursAgo": "{{count}}u geleden",
-  "time.daysAgo": "{{count}}d geleden",
-  "time.monthsAgo": "{{count}}mnd geleden",
   "time.today": "Vandaag",
   "time.yesterday": "Gisteren",
   "time.thisWeek": "Deze Week",
@@ -1354,7 +761,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Poort:",
   "settings.aboutKiloCode.versionInfo": "Versie-informatie",
   "settings.aboutKiloCode.version.label": "Versie:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code Extensie",
   "settings.aboutKiloCode.community": "Community & Ondersteuning",
   "settings.aboutKiloCode.feedback.prefix": "Als je vragen of feedback hebt, voel je vrij om een issue aan te maken op",
   "settings.aboutKiloCode.feedback.or": "of",
@@ -1406,7 +812,6 @@ export const dict = {
   "settings.language.current": "Huidig:",
 
   "common.add": "Toevoegen",
-  "common.choose": "Kies…",
 
   "settings.autocomplete.autoTrigger.title": "Automatische inline aanvullingen inschakelen",
   "settings.autocomplete.autoTrigger.description":
@@ -1420,28 +825,15 @@ export const dict = {
   "settings.autocomplete.modelsHint":
     "Om te kiezen welk model wordt gebruikt voor automatisch aanvullen, zie de Modellen-instellingen.",
 
-  "settings.notifications.agent.title": "Agent Voltooiing",
-  "settings.notifications.agent.description": "Toon melding wanneer agent een taak voltooit",
-  "settings.notifications.permissions.title": "Toestemmingsverzoeken",
-  "settings.notifications.permissions.description": "Toon melding bij toestemmingsverzoeken",
-  "settings.notifications.errors.title": "Fouten",
-  "settings.notifications.errors.description": "Toon melding bij fouten",
   "settings.notifications.sounds": "Geluiden",
   "settings.notifications.enable.title": "Geluidsmeldingen inschakelen",
   "settings.notifications.enable.description":
     "Geluiden afspelen wanneer sessies worden voltooid, er een fout optreedt of uw invoer vereist is",
   "settings.notifications.testSound": "Testen",
-  "settings.notifications.agentSound.title": "Agent Voltooiingsgeluid",
-  "settings.notifications.agentSound.description": "Geluid om af te spelen wanneer agent voltooit",
-  "settings.notifications.permSound.title": "Toestemmingsverzoek Geluid",
-  "settings.notifications.permSound.description": "Geluid om af te spelen bij toestemmingsverzoeken",
-  "settings.notifications.errorSound.title": "Fout Geluid",
-  "settings.notifications.errorSound.description": "Geluid om af te spelen bij fouten",
   "settings.notifications.sound.default": "Standaard",
   "settings.notifications.sound.system": "Systeem",
   "settings.notifications.sound.description":
     "Standaard worden verschillende geluiden gebruikt voor voltooiing, invoer en fouten. Andere keuzes gebruiken voor elke gebeurtenis hetzelfde geluid.",
-  "settings.notifications.sound.none": "Geen",
 
   "settings.experimental.share.title": "Deelmodus",
   "settings.experimental.share.description": "Hoe sessiedelen zich gedraagt",
@@ -1463,9 +855,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Afbeeldingsgeneratiemodel",
   "settings.experimental.imageGenerationModel.placeholder": "Standaard (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Spraak naar tekst",
-  "settings.experimental.speechToText.description":
-    "Schakel spraakinvoer in promptvelden in met uw Kilo-account via Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Schakel de Kilo-provider in en meld u aan om Speech to Text te gebruiken. Speech to Text wordt momenteel alleen ondersteund met Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Spraak-naar-tekst-model",
@@ -1511,15 +900,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Standaard Agent",
   "settings.agentBehaviour.defaultAgent.description": "Agent om te gebruiken wanneer er geen is opgegeven",
   "settings.agentBehaviour.availableAgents": "Beschikbare Agents",
-  "settings.agentBehaviour.selectAgent": "Selecteer een agent om te configureren…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Selecteer een agent om te configureren…",
   "settings.agentBehaviour.modelOverride.title": "Model Overschrijven",
   "settings.agentBehaviour.modelOverride.description": "Overschrijf het standaard model voor deze agent",
   "settings.agentBehaviour.variantOverride.title": "Variant Overschrijven",
   "settings.agentBehaviour.variantOverride.description": "Overschrijf de modelvariant voor deze agent",
-  "settings.agentBehaviour.prompt.title": "Aangepaste Prompt",
-  "settings.agentBehaviour.prompt.description": "Aanvullende systeem prompt voor deze agent",
   "settings.agentBehaviour.temperature.title": "Temperatuur",
   "settings.agentBehaviour.temperature.description":
     "Bepaalt hoe willekeurig AI-antwoorden zijn (0–2). Lagere waarden (bijv. 0.2) leveren gerichte, consistente uitvoer op. Hogere waarden (bijv. 1.0) leveren gevarieerdere, creatievere antwoorden op. Laat leeg om de standaardwaarde van het model te gebruiken.",
@@ -1539,7 +923,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Ontdekte Skills",
   "settings.agentBehaviour.noSkillsFound":
     "Geen skills ontdekt. Voeg hieronder skill mappaden of URL's toe om skills beschikbaar te maken.",
-  "settings.agentBehaviour.availableModes": "Beschikbare Aangepaste Modi",
   "settings.agentBehaviour.noAgentsFound": "Geen agenten gevonden.",
   "settings.agentBehaviour.importMode": "Importeren",
   "settings.agentBehaviour.importMode.invalidName":
@@ -1575,7 +958,6 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Opdracht",
   "settings.agentBehaviour.mcpDetail.args": "Argumenten",
   "settings.agentBehaviour.mcpDetail.env": "Omgeving",
-  "settings.agentBehaviour.mcpDetail.disabled": "Deze server is uitgeschakeld.",
   "settings.agentBehaviour.editMcp": "MCP-server bewerken",
   "settings.agentBehaviour.editMcp.transportLocal": "Lokale server (stdio-transport)",
   "settings.agentBehaviour.editMcp.transportRemote": "Externe server (SSE/HTTP-transport)",
@@ -1592,7 +974,6 @@ export const dict = {
   "settings.agentBehaviour.mcpBrowseMarketplace": "Bladeren door Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Geen MCP-servers geconfigureerd. Voeg MCP-servers toe in kilo.jsonc of vraag de agent om ze toe te voegen.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Workflows worden beheerd via workflowbestanden in je workspace.",
   "settings.agentBehaviour.workflows.description":
     "Workflows zijn aangepaste slash-commando's gedefinieerd in je configuratie. Typ /command-name in de chat om ze aan te roepen. Commando's worden geconfigureerd in opencode.json onder de sectie 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1684,7 +1065,6 @@ export const dict = {
     "bijv. Genereer commit messages in het Spaans volgens het conventional commits formaat. Retourneer ALLEEN de commit message.",
 
   "settings.commitMessage.language.sync": "Synchroniseren met UI taal",
-  "settings.commitMessage.language.title": "Taal",
   "settings.commitMessage.language.description":
     "Kies welke taal je wilt gebruiken voor AI-gegenereerde commitberichten:",
 
@@ -1733,12 +1113,7 @@ export const dict = {
   "settings.providers.disabled": "Uitgeschakelde Providers",
   "settings.providers.disabled.description": "Providers om te verbergen in de providerlijst",
   "settings.providers.disabled.enable": "Inschakelen",
-  "settings.providers.enabled": "Ingeschakelde Providers (Allowlist)",
-  "settings.providers.enabled.description":
-    "Indien ingesteld, zijn alleen deze providers beschikbaar (exclusieve allowlist)",
   "settings.providers.notSet": "Niet ingesteld (gebruik server standaard)",
-  "settings.providers.custom.note": "Voeg een aangepaste provider toe via base URL.",
-  "settings.providers.search.placeholder": "Zoek providers",
   "settings.providers.select.placeholder": "Selecteer provider...",
 
   "dialog.model.notSet": "Niet ingesteld",
@@ -1782,9 +1157,7 @@ export const dict = {
   "migration.migrate.subtitle":
     "We hebben instellingen gevonden van je vorige installatie. Hier is wat we kunnen overzetten.",
   "migration.migrate.selectLabel": "Selecteer wat je wilt migreren",
-  "migration.migrate.cannotMigrate": "Kan niet worden gemigreerd",
   "migration.migrate.chatHistory": "Chatsessies & Geschiedenis",
-  "migration.migrate.chatHistoryDesc": "Niet compatibel met de nieuwe architectuur",
   "migration.migrate.button": "Migreer Instellingen",
   "migration.migrate.skip": "Overslaan",
   "migration.migrate.keysDetected": "{{count}} sleutels gedetecteerd",
@@ -1808,10 +1181,7 @@ export const dict = {
     "Dit verwijdert de oude instellingen uit de VS Code-opslag. U zult deze migratie niet opnieuw kunnen uitvoeren.",
   "migration.complete.done": "Klaar",
   "migration.migrate.sessionsDetected": "{{count}} sessies gedetecteerd",
-  "migration.error.sessionFailed": "Sessiemigratie is mislukt",
   "migration.error.continue": "Doorgaan",
-  "migration.error.action.copy": "Kopiëren",
-  "migration.error.toast.copied": "Fout gekopieerd naar het klembord",
 
   "migration.sessionSummary.title": "Samenvatting:",
   "migration.sessionSummary.copy": "Rapport kopiëren",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index 5e59059b9b8..f9a0d5f0964 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -56,85 +56,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Foreslått",
-  "command.category.view": "Visning",
-  "command.category.project": "Prosjekt",
-  "command.category.provider": "Leverandør",
-  "command.category.server": "Server",
-  "command.category.session": "Sesjon",
-  "command.category.theme": "Tema",
-  "command.category.language": "Språk",
-  "command.category.file": "Fil",
-  "command.category.context": "Kontekst",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Modell",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Tillatelser",
-  "command.category.workspace": "Arbeidsområde",
-  "command.category.settings": "Innstillinger",
 
-  "theme.scheme.system": "System",
-  "theme.scheme.light": "Lys",
-  "theme.scheme.dark": "Mørk",
-
-  "command.sidebar.toggle": "Veksle sidepanel",
-  "command.project.open": "Åpne prosjekt",
   "command.provider.connect": "Koble til leverandør",
-  "command.server.switch": "Bytt server",
-  "command.settings.open": "Åpne innstillinger",
-  "command.session.previous": "Forrige sesjon",
-  "command.session.next": "Neste sesjon",
-  "command.session.previous.unseen": "Forrige uleste økt",
-  "command.session.next.unseen": "Neste uleste økt",
-  "command.session.archive": "Arkiver sesjon",
-
-  "command.palette": "Kommandopalett",
-
-  "command.theme.cycle": "Bytt tema",
-  "command.theme.set": "Bruk tema: {{theme}}",
-  "command.theme.scheme.cycle": "Bytt fargevalg",
-  "command.theme.scheme.set": "Bruk fargevalg: {{scheme}}",
-
-  "command.language.cycle": "Bytt språk",
-  "command.language.set": "Bruk språk: {{language}}",
 
   "command.session.new": "Ny sesjon",
-  "command.session.new.task": "Ny oppgave",
   "command.session.show.changes": "Vis endringer",
-  "command.file.open": "Åpne fil",
-  "command.tab.close": "Lukk fane",
-  "command.context.addSelection": "Legg til markering i kontekst",
-  "command.context.addSelection.description": "Legg til valgte linjer fra gjeldende fil",
-  "command.terminal.toggle": "Veksle terminal",
-  "command.fileTree.toggle": "Veksle filtre",
   "command.review.toggle": "Veksle gjennomgang",
-  "command.terminal.new": "Ny terminal",
-  "command.terminal.new.description": "Opprett en ny terminalfane",
-  "command.steps.toggle": "Veksle trinn",
-  "command.steps.toggle.description": "Vis eller skjul trinn for gjeldende melding",
-  "command.message.previous": "Forrige melding",
-  "command.message.previous.description": "Gå til forrige brukermelding",
-  "command.message.next": "Neste melding",
-  "command.message.next.description": "Gå til neste brukermelding",
-  "command.model.choose": "Velg modell",
-  "command.model.choose.description": "Velg en annen modell",
-  "command.mcp.toggle": "Veksle MCP-er",
-  "command.mcp.toggle.description": "Veksle MCP-er",
-  "command.agent.cycle": "Bytt agent",
-  "command.agent.cycle.description": "Bytt til neste agent",
-  "command.agent.cycle.reverse": "Bytt agent bakover",
-  "command.agent.cycle.reverse.description": "Bytt til forrige agent",
-  "command.model.variant.cycle": "Bytt tenkeinnsats",
-  "command.model.variant.cycle.description": "Bytt til neste innsatsnivå",
-  "command.permissions.autoaccept.enable": "Godta endringer automatisk",
-  "command.permissions.autoaccept.disable": "Slutt å godta endringer automatisk",
-  "command.workspace.toggle": "Veksle arbeidsområder",
-  "command.workspace.toggle.description": "Aktiver eller deaktiver flere arbeidsområder i sidefeltet",
-  "command.session.undo": "Angre",
-  "command.session.undo.description": "Angre siste melding",
-  "command.session.redo": "Gjør om",
-  "command.session.redo.description": "Gjør om siste angrede melding",
   "revert.banner.count_one": "{{count}} melding angret",
   "revert.banner.count_other": "{{count}} meldinger angret",
   "revert.banner.redo": "Gjenta",
@@ -149,13 +76,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Aktiver øyeblikksbilder",
   "revert.disabled.agentBusy": "Vent til agenten er ferdig",
   "command.session.compact": "Komprimer sesjon",
-  "command.session.compact.description": "Oppsummer sesjonen for å redusere kontekststørrelsen",
-  "command.session.fork": "Forgren fra melding",
-  "command.session.fork.description": "Opprett en ny sesjon fra en tidligere melding",
-  "command.session.share": "Del sesjon",
-  "command.session.share.description": "Del denne sesjonen og kopier URL-en til utklippstavlen",
-  "command.session.unshare": "Slutt å dele sesjon",
-  "command.session.unshare.description": "Slutt å dele denne sesjonen",
   "command.session.export": "Eksporter sesjonsutskrift",
 
   "agentRequirements.skill.installed": "Installert",
@@ -182,11 +102,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Denne sjekken av agentkrav er ikke lenger aktiv.",
   "agentRequirements.error.requestFailed": "Kilo kunne ikke sjekke agentkravene.",
 
-  "palette.search.placeholder": "Søk i filer, kommandoer og sesjoner",
-  "palette.empty": "Ingen resultater funnet",
-  "palette.group.commands": "Kommandoer",
-  "palette.group.files": "Filer",
-
   "dialog.provider.search.placeholder": "Søk etter leverandører",
   "dialog.provider.empty": "Ingen leverandører funnet",
   "dialog.provider.group.other": "Andre",
@@ -195,19 +110,13 @@ export const dict = {
   "dialog.model.select.title": "Velg modell",
   "dialog.model.search.placeholder": "Søk etter modeller",
   "dialog.model.empty": "Ingen modellresultater",
-  "dialog.model.manage": "Administrer modeller",
-  "dialog.model.manage.description": "Tilpass hvilke modeller som vises i modellvelgeren.",
   "dialog.model.select": "Velg",
   "dialog.model.expand": "Utvid",
   "dialog.model.collapse": "Skjul",
 
-  "dialog.model.unpaid.freeModels.title": "Gratis modeller levert av Kilo",
-  "dialog.model.unpaid.addMore.title": "Legg til flere modeller fra populære leverandører",
-
   "dialog.provider.viewAll": "Vis flere leverandører",
 
   "provider.connect.title": "Koble til {{provider}}",
-  "provider.connect.title.anthropicProMax": "Logg inn med Claude Pro/Max",
   "provider.connect.selectMethod": "Velg innloggingsmetode for {{provider}}.",
   "provider.connect.method.apiKey": "API-nøkkel",
   "provider.connect.status.inProgress": "Autorisering pågår...",
@@ -234,13 +143,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "f.eks. my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI-endepunkts-URL",
   "provider.connect.azure.baseURL.placeholder": "f.eks. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen gir deg tilgang til et utvalg av pålitelige optimaliserte modeller for kodeagenter.",
-  "provider.connect.opencodeZen.line2":
-    "Med én enkelt API-nøkkel får du tilgang til modeller som Claude, GPT, Gemini, GLM og flere.",
-  "provider.connect.opencodeZen.visit.prefix": "Besøk ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " for å hente API-nøkkelen din.",
   "provider.connect.oauth.code.visit.prefix": "Besøk ",
   "provider.connect.oauth.code.visit.link": "denne lenken",
   "provider.connect.oauth.code.visit.suffix":
@@ -248,7 +150,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} autorisasjonskode",
   "provider.connect.oauth.code.placeholder": "Autorisasjonskode",
   "provider.connect.oauth.code.required": "Autorisasjonskode er påkrevd",
-  "provider.connect.oauth.code.invalid": "Ugyldig autorisasjonskode",
   "provider.connect.oauth.auto.visit.prefix": "Besøk ",
   "provider.connect.oauth.auto.visit.link": "denne lenken",
   "provider.connect.oauth.auto.visit.suffix":
@@ -261,28 +162,11 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Modeller fra {{provider}} er ikke lenger tilgjengelige.",
   "model.tag.free": "Gratis",
   "model.tag.dataCollected": "Data kan brukes til trening",
-  "model.tag.latest": "Nyeste",
   "model.group.auto": "Automatiske modeller",
   "model.group.recommended": "Anbefalt",
   "model.group.favorites": "Favoritter",
-  "model.group.collapse": "Skjul {{group}}",
-  "model.group.expand": "Vis {{group}}",
   "model.favorite.add": "Legg til i favoritter",
   "model.favorite.remove": "Fjern fra favoritter",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "tekst",
-  "model.input.image": "bilde",
-  "model.input.audio": "lyd",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Tillater: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Tillater resonnering",
-  "model.tooltip.reasoning.none": "Ingen resonnering",
-  "model.tooltip.context": "Kontekstgrense {{limit}}",
   "model.preview.label.released": "Utgitt",
   "model.preview.label.input": "Inndata",
   "model.preview.label.output": "Utdata",
@@ -303,11 +187,8 @@ export const dict = {
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Søk",
   "common.goBack": "Gå tilbake",
-  "common.goForward": "Gå fremover",
   "common.loading": "Laster",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Avbryt",
   "common.connect": "Koble til",
   "common.disconnect": "Koble fra",
@@ -315,54 +196,8 @@ export const dict = {
   "common.save": "Lagre",
   "common.saving": "Lagrer...",
   "common.default": "Standard",
-  "common.attachment": "vedlegg",
 
-  "prompt.placeholder.shell": "Skriv inn shell-kommando...",
-  "prompt.placeholder.normal": 'Spør om hva som helst... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Oppsummer kommentarer…",
-  "prompt.placeholder.summarizeComment": "Oppsummer kommentar…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "ESC for å avslutte",
-
-  "prompt.example.1": "Fiks en TODO i kodebasen",
-  "prompt.example.2": "Hva er teknologistabelen i dette prosjektet?",
-  "prompt.example.3": "Fiks ødelagte tester",
-  "prompt.example.4": "Forklar hvordan autentisering fungerer",
-  "prompt.example.5": "Finn og fiks sikkerhetssårbarheter",
-  "prompt.example.6": "Legg til enhetstester for brukerservicen",
-  "prompt.example.7": "Refaktorer denne funksjonen for bedre lesbarhet",
-  "prompt.example.8": "Hva betyr denne feilen?",
-  "prompt.example.9": "Hjelp meg med å feilsøke dette problemet",
-  "prompt.example.10": "Generer API-dokumentasjon",
-  "prompt.example.11": "Optimaliser databasespørringer",
-  "prompt.example.12": "Legg til inputvalidering",
-  "prompt.example.13": "Lag en ny komponent for...",
-  "prompt.example.14": "Hvordan deployer jeg dette prosjektet?",
-  "prompt.example.15": "Gjennomgå koden min for beste praksis",
-  "prompt.example.16": "Legg til feilhåndtering i denne funksjonen",
-  "prompt.example.17": "Forklar dette regex-mønsteret",
-  "prompt.example.18": "Konverter dette til TypeScript",
-  "prompt.example.19": "Legg til logging i hele kodebasen",
-  "prompt.example.20": "Hvilke avhengigheter er utdaterte?",
-  "prompt.example.21": "Hjelp meg med å skrive et migreringsskript",
-  "prompt.example.22": "Implementer caching for dette endepunktet",
-  "prompt.example.23": "Legg til paginering i denne listen",
-  "prompt.example.24": "Lag en CLI-kommando for...",
-  "prompt.example.25": "Hvordan fungerer miljøvariabler her?",
-
-  "prompt.popover.emptyResults": "Ingen matchende resultater",
-  "prompt.popover.emptyCommands": "Ingen matchende kommandoer",
-  "prompt.dropzone.label": "Slipp bilder eller PDF-er her",
-  "prompt.slash.badge.custom": "egendefinert",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "aktiv",
-  "prompt.context.includeActiveFile": "Inkluder aktiv fil",
-  "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
-  "prompt.context.removeFile": "Fjern fil fra kontekst",
   "prompt.thinking.tooltip": "Resonnementsinnsats",
-  "prompt.action.attachFile": "Legg ved fil",
-  "prompt.attachment.remove": "Fjern vedlegg",
   "prompt.action.send": "Send",
   "prompt.action.send.blocked": "Svar på eller avvis det ventende spørsmålet først",
   "prompt.action.send.recording": "Transkriber og send",
@@ -405,189 +240,19 @@ export const dict = {
   "speechToText.tooltip.error": "Taleinndata mislyktes. Klikk for å tømme.",
   "speechToText.error.title": "Taleinndata mislyktes",
   "speechToText.error.loginRequired": "Logg på Kilo for å bruke taleinndata.",
-  "speechToText.error.permission": "Mikrofontillatelse ble nektet.",
-  "speechToText.error.microphone": "Kunne ikke starte mikrofonen.",
-  "speechToText.error.recording": "Opptak mislyktes.",
-  "speechToText.error.emptyRecording": "Ingen lyd ble tatt opp.",
   "speechToText.error.emptyTranscript": "Ingen tale ble oppdaget.",
-  "speechToText.error.encoding": "Kunne ikke kode opptaket.",
-  "speechToText.toast.transcribed": "Transkripsjon satt inn",
 
-  "prompt.toast.pasteUnsupported.title": "Liming ikke støttet",
-  "prompt.toast.pasteUnsupported.description": "Kun bilder eller PDF-er kan limes inn her.",
-  "prompt.toast.modelAgentRequired.title": "Velg en agent og modell",
-  "prompt.toast.modelAgentRequired.description": "Velg en agent og modell før du sender en forespørsel.",
-  "prompt.toast.worktreeCreateFailed.title": "Kunne ikke opprette worktree",
-  "prompt.toast.sessionCreateFailed.title": "Kunne ikke opprette sesjon",
-  "prompt.toast.shellSendFailed.title": "Kunne ikke sende shell-kommando",
-  "prompt.toast.commandSendFailed.title": "Kunne ikke sende kommando",
   "prompt.toast.promptSendFailed.title": "Kunne ikke sende forespørsel",
 
-  "dialog.mcp.title": "MCP-er",
-  "dialog.mcp.description": "{{enabled}} av {{total}} aktivert",
-  "dialog.mcp.empty": "Ingen MCP-er konfigurert",
-
-  "dialog.lsp.empty": "LSP-er automatisk oppdaget fra filtyper",
-  "dialog.plugins.empty": "Plugins konfigurert i opencode.json",
-
   "mcp.status.connected": "tilkoblet",
   "mcp.status.failed": "mislyktes",
   "mcp.status.needs_auth": "trenger autentisering",
   "mcp.status.needs_registration": "trenger klientregistrering",
   "mcp.status.disabled": "deaktivert",
 
-  "dialog.fork.empty": "Ingen meldinger å forgrene fra",
-
-  "dialog.directory.search.placeholder": "Søk etter mapper",
-  "dialog.directory.empty": "Ingen mapper funnet",
-
-  "dialog.server.title": "Servere",
-  "dialog.server.description": "Bytt hvilken Kilo-server denne appen kobler til.",
-  "dialog.server.search.placeholder": "Søk etter servere",
-  "dialog.server.empty": "Ingen servere ennå",
-  "dialog.server.add.title": "Legg til en server",
-  "dialog.server.add.url": "Server-URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Kunne ikke koble til server",
-  "dialog.server.add.checking": "Sjekker...",
-  "dialog.server.add.button": "Legg til server",
-  "dialog.server.default.title": "Standardserver",
-  "dialog.server.default.description":
-    "Koble til denne serveren ved oppstart i stedet for å starte en lokal server. Krever omstart.",
-  "dialog.server.default.none": "Ingen server valgt",
-  "dialog.server.default.set": "Sett gjeldende server som standard",
-  "dialog.server.default.clear": "Tøm",
-  "dialog.server.action.remove": "Fjern server",
-
-  "dialog.server.menu.edit": "Rediger",
-  "dialog.server.menu.default": "Sett som standard",
-  "dialog.server.menu.defaultRemove": "Fjern standard",
-  "dialog.server.menu.delete": "Slett",
-  "dialog.server.current": "Gjeldende server",
-  "dialog.server.status.default": "Standard",
-
-  "dialog.project.edit.title": "Rediger prosjekt",
-  "dialog.project.edit.name": "Navn",
-  "dialog.project.edit.icon": "Ikon",
-  "dialog.project.edit.icon.alt": "Prosjektikon",
-  "dialog.project.edit.icon.hint": "Klikk eller dra et bilde",
-  "dialog.project.edit.icon.recommended": "Anbefalt: 128x128px",
-  "dialog.project.edit.color": "Farge",
-  "dialog.project.edit.color.select": "Velg fargen {{color}}",
-
-  "dialog.project.edit.worktree.startup": "Oppstartsskript for arbeidsområde",
-  "dialog.project.edit.worktree.startup.description": "Kjører etter at et nytt arbeidsområde (worktree) er opprettet.",
-  "dialog.project.edit.worktree.startup.placeholder": "f.eks. bun install",
-  "context.breakdown.title": "Kontekstfordeling",
-  "context.breakdown.note": 'Omtrentlig fordeling av input-tokens. "Annet" inkluderer verktøydefinisjoner og overhead.',
-  "context.breakdown.system": "System",
-  "context.breakdown.user": "Bruker",
-  "context.breakdown.assistant": "Assistent",
-  "context.breakdown.tool": "Verktøykall",
-  "context.breakdown.other": "Annet",
-
-  "context.systemPrompt.title": "Systemprompt",
-  "context.rawMessages.title": "Rå meldinger",
-
-  "context.stats.session": "Sesjon",
-  "context.stats.messages": "Meldinger",
-  "context.stats.provider": "Leverandør",
-  "context.stats.model": "Modell",
-  "context.stats.limit": "Kontekstgrense",
-  "context.stats.totalTokens": "Totalt antall tokens",
-  "context.stats.usage": "Forbruk",
-  "context.stats.inputTokens": "Input-tokens",
-  "context.stats.outputTokens": "Output-tokens",
-  "context.stats.reasoningTokens": "Resonnerings-tokens",
-  "context.stats.cacheTokens": "Cache-tokens (les/skriv)",
-  "context.stats.userMessages": "Brukermeldinger",
-  "context.stats.assistantMessages": "Assistentmeldinger",
-  "context.stats.totalCost": "Total kostnad",
-  "context.stats.sessionCreated": "Sesjon opprettet",
-  "context.stats.lastActivity": "Siste aktivitet",
-
-  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Forbruk",
-  "context.usage.cost": "Kostnad",
-  "context.usage.clickToView": "Klikk for å se kontekst",
-  "context.usage.view": "Se kontekstforbruk",
-
-  "toast.language.title": "Språk",
-  "toast.language.description": "Byttet til {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Tema byttet",
-  "toast.scheme.title": "Fargevalg",
-
-  "toast.permissions.autoaccept.on.title": "Godtar endringer automatisk",
-  "toast.permissions.autoaccept.on.description": "Redigerings- og skrivetillatelser vil bli godkjent automatisk",
-  "toast.permissions.autoaccept.off.title": "Sluttet å godta endringer automatisk",
-  "toast.permissions.autoaccept.off.description": "Redigerings- og skrivetillatelser vil kreve godkjenning",
-
-  "toast.workspace.enabled.title": "Arbeidsområder aktivert",
-  "toast.workspace.enabled.description": "Flere worktrees vises nå i sidefeltet",
-  "toast.workspace.disabled.title": "Arbeidsområder deaktivert",
-  "toast.workspace.disabled.description": "Kun hoved-worktree vises i sidefeltet",
-
-  "toast.model.none.title": "Ingen modell valgt",
-  "toast.model.none.description": "Koble til en leverandør for å oppsummere denne sesjonen",
-
-  "toast.file.loadFailed.title": "Kunne ikke laste fil",
-
-  "toast.file.listFailed.title": "Kunne ikke liste filer",
-  "toast.context.noLineSelection.title": "Ingen linjevalg",
-  "toast.context.noLineSelection.description": "Velg først et linjeområde i en filfane.",
-  "toast.session.share.copyFailed.title": "Kunne ikke kopiere URL til utklippstavlen",
-  "toast.session.share.success.title": "Sesjon delt",
-  "toast.session.share.success.description": "Delings-URL kopiert til utklippstavlen!",
-  "toast.session.share.failed.title": "Kunne ikke dele sesjon",
-  "toast.session.share.failed.description": "Det oppstod en feil under deling av sesjonen",
-
-  "toast.session.unshare.success.title": "Deling av sesjon stoppet",
-  "toast.session.unshare.success.description": "Sesjonen deles ikke lenger!",
-  "toast.session.unshare.failed.title": "Kunne ikke stoppe deling av sesjon",
-  "toast.session.unshare.failed.description": "Det oppstod en feil da delingen av sesjonen skulle stoppes",
-
   "toast.session.rename.invalid.title": "Ugyldig sesjonstittel",
-  "toast.session.listFailed.title": "Kunne ikke laste sesjoner for {{project}}",
 
-  "toast.update.title": "Oppdatering tilgjengelig",
-  "toast.update.description": "En ny versjon av Kilo ({{version}}) er nå tilgjengelig for installasjon.",
-  "toast.update.action.installRestart": "Installer og start på nytt",
-  "toast.update.action.notYet": "Ikke nå",
-
-  "error.page.title": "Noe gikk galt",
-  "error.page.description": "Det oppstod en feil under lasting av applikasjonen.",
-  "error.page.details.label": "Feildetaljer",
   "error.details.show": "Detaljer",
-  "error.page.action.restart": "Start på nytt",
-  "error.page.action.checking": "Sjekker...",
-  "error.page.action.checkUpdates": "Se etter oppdateringer",
-  "error.page.action.updateTo": "Oppdater til {{version}}",
-  "error.page.report.prefix": "Vennligst rapporter denne feilen til Kilo-teamet",
-  "error.page.report.discord": "på Discord",
-  "error.page.version": "Versjon: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Rotelement ikke funnet. Glemte du å legge det til i index.html? Eller kanskje id-attributten er feilstavet?",
-
-  "error.globalSync.connectFailed": "Kunne ikke koble til server. Kjører det en server på `{{url}}`?",
 
   "error.startup.title": "Servertilkobling mislyktes",
 
@@ -605,30 +270,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Logg på ChatGPT igjen, og send meldingen din på nytt for å fortsette å bruke Codex-modeller.",
 
-  "error.chain.unknown": "Ukjent feil",
-  "error.chain.causedBy": "Forårsaket av:",
-  "error.chain.apiError": "API-feil",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Kan prøves på nytt: {{retryable}}",
-  "error.chain.responseBody": "Responsinnhold:\n{{body}}",
-  "error.chain.didYouMean": "Mente du: {{suggestions}}",
-  "error.chain.modelNotFound": "Modell ikke funnet: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Sjekk leverandør-/modellnavnene i konfigurasjonen din (opencode.json)",
-  "error.chain.mcpFailed": 'MCP-server "{{name}}" mislyktes. Merk at Kilo ikke støtter MCP-autentisering ennå.',
-  "error.chain.providerAuthFailed": "Leverandørautentisering mislyktes ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Kunne ikke initialisere leverandør "{{provider}}". Sjekk legitimasjon og konfigurasjon.',
-  "error.chain.configJsonInvalid": "Konfigurasjonsfilen på {{path}} er ikke gyldig JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Konfigurasjonsfilen på {{path}} er ikke gyldig JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Mappen "{{dir}}" i {{path}} er ikke gyldig. Gi mappen nytt navn til "{{suggestion}}" eller fjern den. Dette er en vanlig skrivefeil.',
-  "error.chain.configFrontmatterError": "Kunne ikke analysere frontmatter i {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Konfigurasjonsfilen på {{path}} er ugyldig",
-  "error.chain.configInvalidWithMessage": "Konfigurasjonsfilen på {{path}} er ugyldig: {{message}}",
-
   "notification.permission.title": "Tillatelse påkrevd",
   "notification.permission.titleSubagent": "Tillatelse påkrevd (underagent)",
-  "notification.permission.description": "{{sessionTitle}} i {{projectName}} trenger tillatelse",
   "ui.permission.manageAutoApprove": "Administrer regler for automatisk godkjenning",
   "ui.permission.doomLoop.prompt": "Mulig løkke oppdaget for verktøyet {{tool}}. Fortsette kjøringen?",
   "ui.permission.doomLoop.rule": "Fortsett {{tool}}-kall",
@@ -653,7 +296,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Les gjøremål",
   "ui.permission.toolLabel.todoWrite": "Skriv gjøremål",
   "ui.permission.toolLabel.codeSearch": "Kodesøk",
-  "ui.permission.toggleWrap": "Veksle tekstbryting",
   "ui.permission.copyCommand": "Kopier",
   "ui.approval.auto": "Automatisk godkjent",
   "ui.approval.manual": "Godkjent av deg",
@@ -665,47 +307,18 @@ export const dict = {
   "ui.approval.source.yolo": "av automatisk godkjenning (YOLO)",
   "ui.approval.source.session": "av en økt-autogodkjenningsregel",
   "ui.approval.source.default": "som standard",
-  "notification.question.title": "Spørsmål",
-  "notification.question.description": "{{sessionTitle}} i {{projectName}} har et spørsmål",
-  "notification.action.goToSession": "Gå til sesjon",
 
-  "notification.session.responseReady.title": "Svar klart",
-  "notification.session.error.title": "Sesjonsfeil",
-  "notification.session.error.fallbackDescription": "Det oppstod en feil",
-
-  "home.recentProjects": "Nylige prosjekter",
-  "home.empty.title": "Ingen nylige prosjekter",
-  "home.empty.description": "Kom i gang ved å åpne et lokalt prosjekt",
-
-  "session.tab.session": "Sesjon",
   "session.tab.review": "Gjennomgang",
-  "session.tab.context": "Kontekst",
-  "session.panel.reviewAndFiles": "Gjennomgang og filer",
   "session.review.filesChanged": "{{count}} filer endret",
-  "session.review.change.one": "Endring",
   "session.review.change.other": "Endringer",
   "session.review.loadingChanges": "Laster endringer...",
-  "session.review.empty": "Ingen endringer i denne sesjonen ennå",
   "session.review.noChanges": "Ingen endringer",
-  "session.files.selectToOpen": "Velg en fil å åpne",
-  "session.files.all": "Alle filer",
-  "session.files.binaryContent": "Binær fil (innhold kan ikke vises)",
-  "session.messages.renderEarlier": "Vis tidligere meldinger",
   "session.messages.loadingEarlier": "Laster inn tidligere meldinger...",
   "session.messages.loadEarlier": "Last inn tidligere meldinger",
   "session.messages.loading": "Laster meldinger...",
-  "session.messages.jumpToLatest": "Hopp til nyeste",
 
-  "session.context.addToContext": "Legg til {{selection}} i kontekst",
-
-  "session.new.worktree.main": "Hovedgren",
-  "session.new.worktree.mainWithBranch": "Hovedgren ({{branch}})",
-  "session.new.worktree.create": "Opprett nytt worktree",
-  "session.new.lastModified": "Sist endret",
   "sidebar.session.newSession": "Ny Økt",
   "sidebar.session.newSession.tooltip": "Start en ny samtale mens den nåværende økten holdes intakt.",
-  "sidebar.session.newSession.disabled":
-    "Denne økten er allerede ny. Start en chat eller opprett et worktree i stedet.",
   "sidebar.session.newWorktree": "Nytt Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Opprett et isolert git worktree for å eksperimentere trygt, holde endringer adskilt og kjøre parallelle økter uten å forstyrre din nåværende branch.",
@@ -721,132 +334,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Flytt denne samtalen og {{files}} endrede filer til en dedikert worktree for isolert oppfølgingsarbeid.",
   "sidebar.session.showChanges.tooltip.empty": "Åpne endringsvisningen for å inspisere det nåværende arbeidstreet.",
-  "sidebar.session.showChanges.tooltip.one": "1 fil endret · +{{additions}} -{{deletions}}. Åpne endringsvisningen.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} filer endret · +{{additions}} -{{deletions}}. Åpne endringsvisningen.",
-  "sidebar.session.agentManager.tooltip":
-    "Åpne Agent Manager for full oversikt over parallelle økter og worktrees, slik at du kan koordinere langvarige oppgaver på ett sted.",
-  "sidebar.session.openAgentManager": "Åpne Agent Manager",
   "sidebar.session.progress.capturing": "Fanger endringer...",
   "sidebar.session.progress.creating": "Oppretter worktree...",
   "sidebar.session.progress.setup": "Kjører oppsett...",
   "sidebar.session.progress.transferring": "Overfører endringer...",
   "sidebar.session.progress.forking": "Starter økt...",
   "sidebar.session.progress.failed": "Kunne ikke fortsette i worktree",
-  "session.header.search.placeholder": "Søk i {{project}}",
-  "session.header.searchFiles": "Søk etter filer",
-  "session.header.openIn": "Åpne i",
-  "session.header.open.action": "Åpne {{app}}",
-  "session.header.open.ariaLabel": "Åpne i {{app}}",
-  "session.header.open.menu": "Åpne-alternativer",
-  "session.header.open.copyPath": "Kopier sti",
-
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Serverkonfigurasjoner",
-  "status.popover.tab.servers": "Servere",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Plugins",
-  "status.popover.action.manageServers": "Administrer servere",
-
-  "session.share.popover.title": "Publiser på nett",
-  "session.share.popover.description.shared":
-    "Denne sesjonen er offentlig på nettet. Den er tilgjengelig for alle med lenken.",
-  "session.share.popover.description.unshared":
-    "Del sesjonen offentlig på nettet. Den vil være tilgjengelig for alle med lenken.",
-  "session.share.action.share": "Del",
-  "session.share.action.publish": "Publiser",
-  "session.share.action.publishing": "Publiserer...",
-  "session.share.action.unpublish": "Avpubliser",
-  "session.share.action.unpublishing": "Avpubliserer...",
-  "session.share.action.view": "Vis",
-  "session.share.copy.copied": "Kopiert",
-  "session.share.copy.copyLink": "Kopier lenke",
-
-  "lsp.tooltip.none": "Ingen LSP-servere",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Laster prompt...",
-  "terminal.loading": "Laster terminal...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Lukk terminal",
-  "terminal.connectionLost.title": "Tilkobling mistet",
-  "terminal.connectionLost.description":
-    "Terminalforbindelsen ble avbrutt. Dette kan skje når serveren starter på nytt.",
 
   "common.closeTab": "Lukk fane",
   "common.signIn": "Logg inn",
-  "common.signOut": "Logg ut",
   "common.dismiss": "Avvis",
   "common.requestFailed": "Forespørsel mislyktes",
-  "common.moreOptions": "Flere alternativer",
-  "common.learnMore": "Lær mer",
   "common.rename": "Gi nytt navn",
-  "common.reset": "Tilbakestill",
-  "common.archive": "Arkiver",
   "common.delete": "Slett",
   "common.close": "Lukk",
   "common.edit": "Rediger",
   "common.loadMore": "Last flere",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Veksle meny",
-  "sidebar.nav.projectsAndSessions": "Prosjekter og sesjoner",
   "sidebar.settings": "Innstillinger",
-  "sidebar.help": "Hjelp",
-  "sidebar.workspaces.enable": "Aktiver arbeidsområder",
-  "sidebar.workspaces.disable": "Deaktiver arbeidsområder",
-  "sidebar.gettingStarted.title": "Kom i gang",
-  "sidebar.gettingStarted.line1": "Kilo inkluderer gratis modeller så du kan starte umiddelbart.",
-  "sidebar.gettingStarted.line2": "Koble til en leverandør for å bruke modeller, inkl. Claude, GPT, Gemini osv.",
-  "sidebar.project.recentSessions": "Nylige sesjoner",
-  "sidebar.project.viewAllSessions": "Vis alle sesjoner",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Skrivebord",
-  "settings.section.server": "Server",
-  "settings.tab.general": "Generelt",
-  "settings.tab.shortcuts": "Snarveier",
-
-  "settings.general.section.appearance": "Utseende",
-  "settings.general.section.notifications": "Systemvarsler",
-  "settings.general.section.updates": "Oppdateringer",
-  "settings.general.section.sounds": "Lydeffekter",
-
-  "settings.general.row.language.title": "Språk",
-  "settings.general.row.language.description": "Endre visningsspråket for Kilo",
-  "settings.general.row.appearance.title": "Utseende",
-  "settings.general.row.appearance.description": "Tilpass hvordan Kilo ser ut på enheten din",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Tilpass hvordan Kilo er tematisert.",
-  "settings.general.row.font.title": "Skrift",
-  "settings.general.row.font.description": "Tilpass mono-skriften som brukes i kodeblokker",
-
-  "settings.general.row.releaseNotes.title": "Utgivelsesnotater",
-  "settings.general.row.releaseNotes.description": 'Vis "Hva er nytt"-vinduer etter oppdateringer',
-
-  "settings.updates.row.startup.title": "Se etter oppdateringer ved oppstart",
-  "settings.updates.row.startup.description": "Se automatisk etter oppdateringer når Kilo starter",
-  "settings.updates.row.check.title": "Se etter oppdateringer",
-  "settings.updates.row.check.description": "Se etter oppdateringer manuelt og installer hvis tilgjengelig",
-  "settings.updates.action.checkNow": "Sjekk nå",
-  "settings.updates.action.checking": "Sjekker...",
-  "settings.updates.toast.latest.title": "Du er oppdatert",
-  "settings.updates.toast.latest.description": "Du bruker den nyeste versjonen av Kilo.",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Varsel 01",
   "sound.option.alert02": "Varsel 02",
   "sound.option.alert03": "Varsel 03",
@@ -892,47 +398,11 @@ export const dict = {
   "sound.option.yup04": "Ja 04",
   "sound.option.yup05": "Ja 05",
   "sound.option.yup06": "Ja 06",
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Vis systemvarsel når agenten er ferdig eller trenger oppmerksomhet",
-  "settings.general.notifications.permissions.title": "Tillatelser",
-  "settings.general.notifications.permissions.description": "Vis systemvarsel når en tillatelse er påkrevd",
-  "settings.general.notifications.errors.title": "Feil",
-  "settings.general.notifications.errors.description": "Vis systemvarsel når det oppstår en feil",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Spill av lyd når agenten er ferdig eller trenger oppmerksomhet",
-  "settings.general.sounds.permissions.title": "Tillatelser",
-  "settings.general.sounds.permissions.description": "Spill av lyd når en tillatelse er påkrevd",
-  "settings.general.sounds.errors.title": "Feil",
-  "settings.general.sounds.errors.description": "Spill av lyd når det oppstår en feil",
-
-  "settings.shortcuts.title": "Tastatursnarveier",
-  "settings.shortcuts.reset.button": "Tilbakestill til standard",
-  "settings.shortcuts.reset.toast.title": "Snarveier tilbakestilt",
-  "settings.shortcuts.reset.toast.description": "Tastatursnarveier er tilbakestilt til standard.",
-  "settings.shortcuts.conflict.title": "Snarvei allerede i bruk",
-  "settings.shortcuts.conflict.description": "{{keybind}} er allerede tilordnet til {{titles}}.",
-  "settings.shortcuts.unassigned": "Ikke tilordnet",
-  "settings.shortcuts.pressKeys": "Trykk taster",
-  "settings.shortcuts.search.placeholder": "Søk etter snarveier",
-  "settings.shortcuts.search.empty": "Ingen snarveier funnet",
-
-  "settings.shortcuts.group.general": "Generelt",
-  "settings.shortcuts.group.session": "Sesjon",
-  "settings.shortcuts.group.navigation": "Navigasjon",
-  "settings.shortcuts.group.modelAndAgent": "Modell og agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
 
   "settings.providers.title": "Leverandører",
-  "settings.providers.description": "Leverandørinnstillinger vil kunne konfigureres her.",
-  "settings.providers.betaNotice":
-    "For øyeblikket kan kun Kilo Gateway-leverandøren konfigureres i innstillingsgrensesnittet. Støtte for konfigurering av andre leverandører kommer snart i løpet av betaperioden. I mellomtiden kan du konfigurere leverandører via CLI eller konfigurasjonsfilen. Vi er forpliktet til å holde Kilo åpent, ingen lock-in.",
   "settings.providers.section.connected": "Tilkoblede leverandører",
   "settings.providers.connected.empty": "Ingen tilkoblede leverandører",
   "settings.providers.section.popular": "Populære leverandører",
-  "settings.providers.search.placeholder": "Søk etter leverandører",
   "settings.providers.select.placeholder": "Velg leverandør...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Miljø",
@@ -951,7 +421,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Skjul Kilo Gateway-modeller der leverandørene kan bruke ledetekstene dine til trening.",
   "settings.providers.modeModels": "Modell per modus",
-  "settings.providers.custom.note": "Legg til en egendefinert leverandør via basis-URL.",
   "settings.providers.modeModels.description":
     "Overstyr standardmodellen for bestemte moduser. Hvis ikke angitt, brukes den globale standardmodellen.",
   "provider.custom.title": "Egendefinert leverandør",
@@ -1017,9 +486,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Fjern modell",
   "provider.custom.models.add": "Legg til modell",
-  "provider.custom.models.fetch": "Hent modeller",
-  "provider.custom.models.fetching": "Henter\u2026",
-  "provider.custom.models.fetch.error": "Kunne ikke hente modeller: {{error}}",
   "provider.custom.models.fetch.authError": "Autentisering mislyktes. Sjekk API-nøkkelen ovenfor og prøv igjen.",
   "provider.custom.models.fetch.empty": "Ingen modeller funnet på denne serveren.",
   "provider.custom.models.fetch.added": "{{count}} modell(er) lagt til.",
@@ -1071,23 +537,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Eldre .kilocode-konfigurasjon",
   "settings.config.source.projectOpencode": "Eldre .opencode-konfigurasjon",
   "settings.models.title": "Modeller",
-  "settings.models.description": "Modellinnstillinger vil kunne konfigureres her.",
-  "settings.agents.title": "Agenter",
-  "settings.agents.description": "Agentinnstillinger vil kunne konfigureres her.",
-  "settings.commands.title": "Kommandoer",
-  "settings.commands.description": "Kommandoinnstillinger vil kunne konfigureres her.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP-innstillinger vil kunne konfigureres her.",
 
-  "settings.permissions.title": "Tillatelser",
-  "settings.permissions.description": "Kontroller hvilke verktøy serveren kan bruke som standard.",
-  "settings.permissions.section.tools": "Verktøy",
   "settings.permissions.toast.updateFailed.title": "Kunne ikke oppdatere tillatelser",
 
-  "settings.permissions.action.allow": "Tillat",
-  "settings.permissions.action.ask": "Spør",
-  "settings.permissions.action.deny": "Avslå",
-
   "settings.permissions.tool.read.title": "Les",
   "settings.permissions.tool.read.description": "Lesing av en fil (matcher filbanen)",
   "settings.permissions.tool.edit.title": "Rediger",
@@ -1122,7 +574,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "Oppdager gjentatte verktøykall med identisk input",
 
-  "session.delete.failed.title": "Kunne ikke slette sesjon",
   "session.delete.title": "Slett sesjon",
   "session.delete.confirm": 'Slette sesjonen "{{name}}"?',
   "session.delete.button": "Slett sesjon",
@@ -1150,14 +601,9 @@ export const dict = {
   "feedback.dialog.support": "Kundestøtte",
   "workStyle.onboarding.welcome": "Velkommen til Kilo",
   "workStyle.onboarding.title": "Velg hvordan du vil arbeide",
-  "workStyle.onboarding.description":
-    "Dette angir startinnstillingene for tillatelser, resonneringsblokker, terminalutdata og konteksttidslinjen. Det brukes bare én gang og hopper over innstillinger du allerede har tilpasset.",
   "workStyle.onboarding.settingsNote": "Du kan endre disse alternativene når som helst under",
   "workStyle.onboarding.settings": "Innstillinger.",
-  "workStyle.onboarding.skip": "Hopp over inntil videre",
   "workStyle.toast.saved.title": "Modusen er lagret",
-  "workStyle.toast.saved.description": "Oppdater innstillingene når som helst under Innstillinger.",
-  "workStyle.toast.saved.action": "Gå til Innstillinger",
   "workStyle.choice.permissions": "Tillatelser",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Synlighet",
@@ -1180,32 +626,6 @@ export const dict = {
   "session.cloud.import.legacy": "Dette ser ut til å være en eldre økt som ikke lenger støttes.",
   "session.cloud.import.failed": "Kunne ikke importere skyøkt",
 
-  "workspace.new": "Nytt arbeidsområde",
-  "workspace.type.local": "lokal",
-  "workspace.type.sandbox": "sandkasse",
-  "workspace.create.failed.title": "Kunne ikke opprette arbeidsområde",
-  "workspace.delete.failed.title": "Kunne ikke slette arbeidsområde",
-  "workspace.resetting.title": "Tilbakestiller arbeidsområde",
-  "workspace.resetting.description": "Dette kan ta et minutt.",
-  "workspace.reset.failed.title": "Kunne ikke tilbakestille arbeidsområde",
-  "workspace.reset.success.title": "Arbeidsområde tilbakestilt",
-  "workspace.reset.success.description": "Arbeidsområdet samsvarer nå med standardgrenen.",
-  "workspace.error.stillPreparing": "Arbeidsområdet klargjøres fortsatt",
-  "workspace.status.checking": "Sjekker for ikke-sammenslåtte endringer...",
-  "workspace.status.error": "Kunne ikke bekrefte git-status.",
-  "workspace.status.clean": "Ingen ikke-sammenslåtte endringer oppdaget.",
-  "workspace.status.dirty": "Ikke-sammenslåtte endringer oppdaget i dette arbeidsområdet.",
-  "workspace.delete.title": "Slett arbeidsområde",
-  "workspace.delete.confirm": 'Slette arbeidsområdet "{{name}}"?',
-  "workspace.delete.button": "Slett arbeidsområde",
-  "workspace.reset.title": "Tilbakestill arbeidsområde",
-  "workspace.reset.confirm": 'Tilbakestille arbeidsområdet "{{name}}"?',
-  "workspace.reset.button": "Tilbakestill arbeidsområde",
-  "workspace.reset.archived.none": "Ingen aktive sesjoner vil bli arkivert.",
-  "workspace.reset.archived.one": "1 sesjon vil bli arkivert.",
-  "workspace.reset.archived.many": "{{count}} sesjoner vil bli arkivert.",
-  "workspace.reset.note": "Dette vil tilbakestille arbeidsområdet til å samsvare med standardgrenen.",
-
   "deviceAuth.toast.urlCopied": "URL kopiert til utklippstavlen",
   "deviceAuth.toast.codeCopied": "Kode kopiert til utklippstavlen",
   "deviceAuth.toast.errorCopied": "Feil kopiert til utklippstavlen",
@@ -1243,7 +663,6 @@ export const dict = {
   "profile.pass.renews": "Fornyes",
   "profile.action.logout": "Logg ut",
 
-  "settings.section.configuration": "Konfigurasjon",
   "settings.agentBehaviour.title": "Agentoppførsel",
   "settings.autoApprove.title": "Automatisk godkjenning",
   "settings.browser.title": "Nettleser",
@@ -1259,7 +678,6 @@ export const dict = {
   "settings.language.title": "Språk",
   "settings.aboutKiloCode.title": "Om Kilo Code",
 
-  "session.messages.empty": "Start en samtale ved å skrive en melding nedenfor.",
   "session.messages.welcome":
     "Kilo Code er en AI-kodingsassistent. Be den om å bygge funksjoner, fikse feil eller forklare kodebasen din.",
   "session.messages.scrollToBottom": "Rull til bunnen",
@@ -1267,7 +685,6 @@ export const dict = {
   "session.messages.taskStarting": "Starter...",
   "session.status.writingResponse": "Skriver svar…",
   "session.status.retry": "Prøver på nytt…",
-  "session.status.retrying": "Prøver på nytt (forsøk {{ attempt }})… {{ message }}",
   "session.status.working": "Arbeider…",
   "session.status.offline": "Nettverk frakoblet — kobler til på nytt...",
   "session.outcome.incomplete": "Runden ble avsluttet med {{count}} oppgaver igjen",
@@ -1299,11 +716,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} eldre sesjoner",
   "context.stats.thisSession": "Denne sesjonen",
 
-  "time.justNow": "akkurat nå",
-  "time.minutesAgo": "{{count}} min siden",
-  "time.hoursAgo": "{{count}}t siden",
-  "time.daysAgo": "{{count}}d siden",
-  "time.monthsAgo": "{{count}} mnd. siden",
   "time.today": "I dag",
   "time.yesterday": "I går",
   "time.thisWeek": "Denne uken",
@@ -1319,7 +731,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Versjonsinformasjon",
   "settings.aboutKiloCode.version.label": "Versjon:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code-utvidelse",
   "settings.aboutKiloCode.community": "Fellesskap og støtte",
   "settings.aboutKiloCode.feedback.prefix": "Hvis du har spørsmål eller tilbakemeldinger, åpne gjerne en issue på",
   "settings.aboutKiloCode.feedback.or": "eller",
@@ -1368,7 +779,6 @@ export const dict = {
   "settings.language.current": "Nåværende:",
 
   "common.add": "Legg til",
-  "common.choose": "Velg…",
 
   "settings.autocomplete.autoTrigger.title": "Aktiver automatisk innebygd fullføring",
   "settings.autocomplete.autoTrigger.description": "Vis automatisk innebygde fullføringsforslag ved skriving",
@@ -1378,28 +788,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Vis autofullføringsforslag i chatfeltet",
   "settings.autocomplete.modelsHint":
     "For å velge hvilken modell som brukes til autofullføring, se Modellinnstillinger.",
-  "settings.notifications.agent.title": "Agentfullføring",
-  "settings.notifications.agent.description": "Vis varsling når agenten fullfører en oppgave",
-  "settings.notifications.permissions.title": "Tillatelsesforespørsler",
-  "settings.notifications.permissions.description": "Vis varsling ved tillatelsesforespørsler",
-  "settings.notifications.errors.title": "Feil",
-  "settings.notifications.errors.description": "Vis varsling ved feil",
   "settings.notifications.sounds": "Lyder",
   "settings.notifications.enable.title": "Aktiver lydvarsler",
   "settings.notifications.enable.description":
     "Spill av lyder når økter fullføres, det oppstår en feil eller det trengs innspill fra deg",
   "settings.notifications.testSound": "Test",
-  "settings.notifications.agentSound.title": "Agentfullføringslyd",
-  "settings.notifications.agentSound.description": "Lyd ved agentfullføring",
-  "settings.notifications.permSound.title": "Tillatelsesforespørselslyd",
-  "settings.notifications.permSound.description": "Lyd ved tillatelsesforespørsler",
-  "settings.notifications.errorSound.title": "Feillyd",
-  "settings.notifications.errorSound.description": "Lyd ved feil",
   "settings.notifications.sound.default": "Standard",
   "settings.notifications.sound.system": "System",
   "settings.notifications.sound.description":
     "Standardvalget bruker forskjellige lyder for fullføring, innspill og feil. Andre valg bruker én lyd for alle hendelser.",
-  "settings.notifications.sound.none": "Ingen",
   "settings.experimental.share.title": "Delingsmodus",
   "settings.experimental.share.description": "Oppførsel for sesjonsdeling",
   "settings.experimental.share.manual": "Manuell",
@@ -1419,9 +816,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Bildegenereringsmodell",
   "settings.experimental.imageGenerationModel.placeholder": "Standard (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Tale til tekst",
-  "settings.experimental.speechToText.description":
-    "Aktiver taleinndata i prompt-felt ved å bruke din Kilo-konto gjennom Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Aktiver og logg på Kilo-leverandøren for å bruke Speech to Text. Speech to Text støttes for øyeblikket bare med Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Tale-til-tekst-modell",
@@ -1470,8 +864,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Aktiver for dette prosjektet",
   "settings.indexing.projectEnable.description":
     "Aktiver indeksering for dette arbeidsområdet når global indeksering er slått av.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Global indeksering er aktivert, så dette prosjektet er allerede dekket.",
   "settings.indexing.provider.title": "Embedding-leverandør",
   "settings.indexing.provider.description": "Velg leverandøren som brukes til å generere embeddings for semantisk søk.",
   "settings.indexing.kiloModel.title": "Kilo-modellforhåndsvalg",
@@ -1503,15 +895,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Standardagent",
   "settings.agentBehaviour.defaultAgent.description": "Agent å bruke når ingen er angitt",
   "settings.agentBehaviour.availableAgents": "Tilgjengelige agenter",
-  "settings.agentBehaviour.selectAgent": "Velg en agent å konfigurere…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Velg en agent å konfigurere…",
   "settings.agentBehaviour.modelOverride.title": "Modelloverstying",
   "settings.agentBehaviour.modelOverride.description": "Overstyr standardmodellen for denne agenten",
   "settings.agentBehaviour.variantOverride.title": "Variantoverstyring",
   "settings.agentBehaviour.variantOverride.description": "Overstyr modellvarianten for denne agenten",
-  "settings.agentBehaviour.prompt.title": "Egendefinert prompt",
-  "settings.agentBehaviour.prompt.description": "Ekstra systemprompt for denne agenten",
   "settings.agentBehaviour.temperature.title": "Temperatur",
   "settings.agentBehaviour.temperature.description":
     "Styrer hvor tilfeldige KI-svarene er (0–2). Lavere verdier (f.eks. 0.2) gir fokuserte og konsistente resultater. Høyere verdier (f.eks. 1.0) gir mer varierte og kreative svar. La feltet stå tomt for å bruke modellens standardverdi.",
@@ -1531,7 +918,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Oppdagede ferdigheter",
   "settings.agentBehaviour.noSkillsFound":
     "Ingen ferdigheter funnet. Legg til ferdighetsmappestier eller URLer nedenfor for å gjøre ferdigheter tilgjengelige.",
-  "settings.agentBehaviour.availableModes": "Tilgjengelige egendefinerte moduser",
   "settings.agentBehaviour.noAgentsFound": "Ingen agenter funnet.",
   "settings.agentBehaviour.createMode": "Opprett ny modus",
   "settings.agentBehaviour.createMode.name": "Navn",
@@ -1612,11 +998,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Kommando",
   "settings.agentBehaviour.mcpDetail.args": "Argumenter",
   "settings.agentBehaviour.mcpDetail.env": "Miljø",
-  "settings.agentBehaviour.mcpDetail.disabled": "Denne serveren er deaktivert.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Bla gjennom Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Ingen MCP-servere konfigurert. Legg til MCP-servere i kilo.jsonc, eller be agenten om å legge dem til.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Arbeidsflyter administreres via arbeidsflytfiler i arbeidsområdet.",
   "settings.agentBehaviour.workflows.description":
     "Arbeidsflyter er egendefinerte skråstrekkommandoer definert i konfigurasjonen din. Skriv /command-name i chatten for å kjøre dem. Kommandoer konfigureres i opencode.json under seksjonen 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1706,7 +1090,6 @@ export const dict = {
     "f.eks. Generer commit messages på spansk i henhold til conventional commits-formatet. Returner KUN commit message.",
 
   "settings.commitMessage.language.sync": "Sync med UI-språk",
-  "settings.commitMessage.language.title": "Språk",
   "settings.commitMessage.language.description": "Velg hvilket språk du skal bruke for AI-genererte commit-meldinger:",
 
   "settings.display.username.title": "Brukernavn",
@@ -1745,8 +1128,6 @@ export const dict = {
   "settings.providers.disabled": "Deaktiverte leverandører",
   "settings.providers.disabled.description": "Leverandører å skjule fra listen",
   "settings.providers.disabled.enable": "Aktiver",
-  "settings.providers.enabled": "Aktiverte leverandører (hvitliste)",
-  "settings.providers.enabled.description": "Hvis angitt, er bare disse leverandørene tilgjengelige",
   "settings.providers.notSet": "Ikke angitt (bruk serverstandard)",
   "dialog.model.notSet": "Ikke angitt",
   "profile.personalAccount": "Personlig konto",
@@ -1786,9 +1167,7 @@ export const dict = {
   "migration.migrate.title": "Migrer innstillingene dine",
   "migration.migrate.subtitle": "Vi fant innstillinger fra din tidligere installasjon. Her er hva vi kan ta med over.",
   "migration.migrate.selectLabel": "Velg hva som skal migreres",
-  "migration.migrate.cannotMigrate": "Kan ikke migreres",
   "migration.migrate.chatHistory": "Chatøkter og historikk",
-  "migration.migrate.chatHistoryDesc": "Ikke kompatibel med den nye arkitekturen",
   "migration.migrate.button": "Migrer innstillinger",
   "migration.migrate.skip": "Hopp over",
   "migration.migrate.keysDetected": "{{count}} nøkler oppdaget",
@@ -1812,10 +1191,7 @@ export const dict = {
     "Dette fjerner de gamle innstillingene fra VS Code-lagringen. Du vil ikke kunne kjøre denne migreringen på nytt.",
   "migration.complete.done": "Ferdig",
   "migration.migrate.sessionsDetected": "{{count}} økter oppdaget",
-  "migration.error.sessionFailed": "Øktmigrering mislyktes",
   "migration.error.continue": "Fortsett",
-  "migration.error.action.copy": "Kopier",
-  "migration.error.toast.copied": "Feil kopiert til utklippstavlen",
 
   "migration.sessionSummary.title": "Oppsummering:",
   "migration.sessionSummary.copy": "Kopier rapport",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index a01599dc026..99741deb925 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Sugerowane",
-  "command.category.view": "Widok",
-  "command.category.project": "Projekt",
-  "command.category.provider": "Dostawca",
-  "command.category.server": "Serwer",
-  "command.category.session": "Sesja",
-  "command.category.theme": "Motyw",
-  "command.category.language": "Język",
-  "command.category.file": "Plik",
-  "command.category.context": "Kontekst",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Model",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Agent",
-  "command.category.permissions": "Uprawnienia",
-  "command.category.workspace": "Przestrzeń robocza",
-  "command.category.settings": "Ustawienia",
 
-  "theme.scheme.system": "Systemowy",
-  "theme.scheme.light": "Jasny",
-  "theme.scheme.dark": "Ciemny",
-
-  "command.sidebar.toggle": "Przełącz pasek boczny",
-  "command.project.open": "Otwórz projekt",
   "command.provider.connect": "Połącz dostawcę",
-  "command.server.switch": "Przełącz serwer",
-  "command.settings.open": "Otwórz ustawienia",
-  "command.session.previous": "Poprzednia sesja",
-  "command.session.next": "Następna sesja",
-  "command.session.previous.unseen": "Poprzednia nieprzeczytana sesja",
-  "command.session.next.unseen": "Następna nieprzeczytana sesja",
-  "command.session.archive": "Zarchiwizuj sesję",
-
-  "command.palette": "Paleta poleceń",
-
-  "command.theme.cycle": "Przełącz motyw",
-  "command.theme.set": "Użyj motywu: {{theme}}",
-  "command.theme.scheme.cycle": "Przełącz schemat kolorów",
-  "command.theme.scheme.set": "Użyj schematu kolorów: {{scheme}}",
-
-  "command.language.cycle": "Przełącz język",
-  "command.language.set": "Użyj języka: {{language}}",
 
   "command.session.new": "Nowa sesja",
-  "command.session.new.task": "Nowe zadanie",
   "command.session.show.changes": "Pokaż zmiany",
-  "command.file.open": "Otwórz plik",
-  "command.tab.close": "Zamknij kartę",
-  "command.context.addSelection": "Dodaj zaznaczenie do kontekstu",
-  "command.context.addSelection.description": "Dodaj zaznaczone linie z bieżącego pliku",
-  "command.terminal.toggle": "Przełącz terminal",
-  "command.fileTree.toggle": "Przełącz drzewo plików",
   "command.review.toggle": "Przełącz przegląd",
-  "command.terminal.new": "Nowy terminal",
-  "command.terminal.new.description": "Utwórz nową kartę terminala",
-  "command.steps.toggle": "Przełącz kroki",
-  "command.steps.toggle.description": "Pokaż lub ukryj kroki dla bieżącej wiadomości",
-  "command.message.previous": "Poprzednia wiadomość",
-  "command.message.previous.description": "Przejdź do poprzedniej wiadomości użytkownika",
-  "command.message.next": "Następna wiadomość",
-  "command.message.next.description": "Przejdź do następnej wiadomości użytkownika",
-  "command.model.choose": "Wybierz model",
-  "command.model.choose.description": "Wybierz inny model",
-  "command.mcp.toggle": "Przełącz MCP",
-  "command.mcp.toggle.description": "Przełącz MCP",
-  "command.agent.cycle": "Przełącz agenta",
-  "command.agent.cycle.description": "Przełącz na następnego agenta",
-  "command.agent.cycle.reverse": "Przełącz agenta wstecz",
-  "command.agent.cycle.reverse.description": "Przełącz na poprzedniego agenta",
-  "command.model.variant.cycle": "Przełącz wysiłek myślowy",
-  "command.model.variant.cycle.description": "Przełącz na następny poziom wysiłku",
-  "command.permissions.autoaccept.enable": "Automatyczne akceptowanie edycji",
-  "command.permissions.autoaccept.disable": "Zatrzymaj automatyczne akceptowanie edycji",
-  "command.workspace.toggle": "Przełącz przestrzenie robocze",
-  "command.workspace.toggle.description": "Włącz lub wyłącz wiele przestrzeni roboczych na pasku bocznym",
-  "command.session.undo": "Cofnij",
-  "command.session.undo.description": "Cofnij ostatnią wiadomość",
-  "command.session.redo": "Ponów",
-  "command.session.redo.description": "Ponów ostatnią cofniętą wiadomość",
   "revert.banner.count_one": "Cofnięto {{count}} wiadomość",
   "revert.banner.count_other": "Cofnięto {{count}} wiadomości",
   "revert.banner.redo": "Ponów",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Włącz migawki",
   "revert.disabled.agentBusy": "Poczekaj aż agent zakończy",
   "command.session.compact": "Kompaktuj sesję",
-  "command.session.compact.description": "Podsumuj sesję, aby zmniejszyć rozmiar kontekstu",
-  "command.session.fork": "Rozwidlij od wiadomości",
-  "command.session.fork.description": "Utwórz nową sesję od poprzedniej wiadomości",
-  "command.session.share": "Udostępnij sesję",
-  "command.session.share.description": "Udostępnij tę sesję i skopiuj URL do schowka",
-  "command.session.unshare": "Przestań udostępniać sesję",
-  "command.session.unshare.description": "Zatrzymaj udostępnianie tej sesji",
   "command.session.export": "Eksportuj transkrypcję sesji",
 
   "agentRequirements.skill.installed": "Zainstalowano",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "To sprawdzenie wymagań agenta nie jest już aktywne.",
   "agentRequirements.error.requestFailed": "Kilo nie mógł sprawdzić wymagań agenta.",
 
-  "palette.search.placeholder": "Szukaj plików, poleceń i sesji",
-  "palette.empty": "Brak wyników",
-  "palette.group.commands": "Polecenia",
-  "palette.group.files": "Pliki",
-
   "dialog.provider.search.placeholder": "Szukaj dostawców",
   "dialog.provider.empty": "Nie znaleziono dostawców",
   "dialog.provider.group.other": "Inne",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Wybierz model",
   "dialog.model.search.placeholder": "Szukaj modeli",
   "dialog.model.empty": "Brak wyników modelu",
-  "dialog.model.manage": "Zarządzaj modelami",
-  "dialog.model.manage.description": "Dostosuj, które modele pojawiają się w wyborze modelu.",
   "dialog.model.select": "Wybierz",
   "dialog.model.expand": "Rozwiń",
   "dialog.model.collapse": "Zwiń",
 
-  "dialog.model.unpaid.freeModels.title": "Darmowe modele dostarczane przez Kilo",
-  "dialog.model.unpaid.addMore.title": "Dodaj więcej modeli od popularnych dostawców",
-
   "dialog.provider.viewAll": "Zobacz więcej dostawców",
 
   "provider.connect.title": "Połącz {{provider}}",
-  "provider.connect.title.anthropicProMax": "Zaloguj się z Claude Pro/Max",
   "provider.connect.selectMethod": "Wybierz metodę logowania dla {{provider}}.",
   "provider.connect.method.apiKey": "Klucz API",
   "provider.connect.status.inProgress": "Autoryzacja w toku...",
@@ -231,13 +140,6 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "np. my-models",
   "provider.connect.azure.baseURL.label": "Adres URL punktu końcowego Azure OpenAI",
   "provider.connect.azure.baseURL.placeholder": "np. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen daje dostęp do wybranego zestawu niezawodnych, zoptymalizowanych modeli dla agentów kodujących.",
-  "provider.connect.opencodeZen.line2":
-    "Z jednym kluczem API uzyskasz dostęp do modeli takich jak Claude, GPT, Gemini, GLM i więcej.",
-  "provider.connect.opencodeZen.visit.prefix": "Odwiedź ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": ", aby odebrać swój klucz API.",
   "provider.connect.oauth.code.visit.prefix": "Odwiedź ",
   "provider.connect.oauth.code.visit.link": "ten link",
   "provider.connect.oauth.code.visit.suffix":
@@ -245,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "Kod autoryzacyjny {{method}}",
   "provider.connect.oauth.code.placeholder": "Kod autoryzacyjny",
   "provider.connect.oauth.code.required": "Kod autoryzacyjny jest wymagany",
-  "provider.connect.oauth.code.invalid": "Nieprawidłowy kod autoryzacyjny",
   "provider.connect.oauth.auto.visit.prefix": "Odwiedź ",
   "provider.connect.oauth.auto.visit.link": "ten link",
   "provider.connect.oauth.auto.visit.suffix":
@@ -258,28 +159,11 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Modele {{provider}} nie są już dostępne.",
   "model.tag.free": "Darmowy",
   "model.tag.dataCollected": "Dane mogą być wykorzystywane do trenowania",
-  "model.tag.latest": "Najnowszy",
   "model.group.auto": "Modele automatyczne",
   "model.group.recommended": "Zalecane",
   "model.group.favorites": "Ulubione",
-  "model.group.collapse": "Zwiń {{group}}",
-  "model.group.expand": "Rozwiń {{group}}",
   "model.favorite.add": "Dodaj do ulubionych",
   "model.favorite.remove": "Usuń z ulubionych",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "tekst",
-  "model.input.image": "obraz",
-  "model.input.audio": "audio",
-  "model.input.video": "wideo",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Obsługuje: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Obsługuje wnioskowanie",
-  "model.tooltip.reasoning.none": "Brak wnioskowania",
-  "model.tooltip.context": "Limit kontekstu {{limit}}",
   "model.preview.label.released": "Wydano",
   "model.preview.label.input": "Wejście",
   "model.preview.label.output": "Wyjście",
@@ -300,11 +184,8 @@ export const dict = {
   "model.preview.modality.video": "Wideo",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Szukaj",
   "common.goBack": "Wstecz",
-  "common.goForward": "Dalej",
   "common.loading": "Ładowanie",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Anuluj",
   "common.connect": "Połącz",
   "common.disconnect": "Rozłącz",
@@ -312,54 +193,8 @@ export const dict = {
   "common.save": "Zapisz",
   "common.saving": "Zapisywanie...",
   "common.default": "Domyślny",
-  "common.attachment": "załącznik",
 
-  "prompt.placeholder.shell": "Wpisz polecenie terminala...",
-  "prompt.placeholder.normal": 'Zapytaj o cokolwiek... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Podsumuj komentarze…",
-  "prompt.placeholder.summarizeComment": "Podsumuj komentarz…",
-  "prompt.mode.shell": "Terminal",
-  "prompt.mode.shell.exit": "esc aby wyjść",
-
-  "prompt.example.1": "Napraw TODO w bazie kodu",
-  "prompt.example.2": "Jaki jest stos technologiczny tego projektu?",
-  "prompt.example.3": "Napraw zepsute testy",
-  "prompt.example.4": "Wyjaśnij jak działa uwierzytelnianie",
-  "prompt.example.5": "Znajdź i napraw luki w zabezpieczeniach",
-  "prompt.example.6": "Dodaj testy jednostkowe dla serwisu użytkownika",
-  "prompt.example.7": "Zrefaktoryzuj tę funkcję, aby była bardziej czytelna",
-  "prompt.example.8": "Co oznacza ten błąd?",
-  "prompt.example.9": "Pomóż mi zdebugować ten problem",
-  "prompt.example.10": "Wygeneruj dokumentację API",
-  "prompt.example.11": "Zoptymalizuj zapytania do bazy danych",
-  "prompt.example.12": "Dodaj walidację danych wejściowych",
-  "prompt.example.13": "Utwórz nowy komponent dla...",
-  "prompt.example.14": "Jak wdrożyć ten projekt?",
-  "prompt.example.15": "Sprawdź mój kod pod kątem najlepszych praktyk",
-  "prompt.example.16": "Dodaj obsługę błędów do tej funkcję",
-  "prompt.example.17": "Wyjaśnij ten wzorzec regex",
-  "prompt.example.18": "Przekonwertuj to na TypeScript",
-  "prompt.example.19": "Dodaj logowanie w całej bazie kodu",
-  "prompt.example.20": "Które zależności są przestarzałe?",
-  "prompt.example.21": "Pomóż mi napisać skrypt migracyjny",
-  "prompt.example.22": "Zaimplementuj cachowanie dla tego punktu końcowego",
-  "prompt.example.23": "Dodaj stronicowanie do tej listy",
-  "prompt.example.24": "Utwórz polecenie CLI dla...",
-  "prompt.example.25": "Jak działają tutaj zmienne środowiskowe?",
-
-  "prompt.popover.emptyResults": "Brak pasujących wyników",
-  "prompt.popover.emptyCommands": "Brak pasujących poleceń",
-  "prompt.dropzone.label": "Upuść obrazy lub pliki PDF tutaj",
-  "prompt.slash.badge.custom": "własne",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "aktywny",
-  "prompt.context.includeActiveFile": "Dołącz aktywny plik",
-  "prompt.context.removeActiveFile": "Usuń aktywny plik z kontekstu",
-  "prompt.context.removeFile": "Usuń plik z kontekstu",
   "prompt.thinking.tooltip": "Wysiłek rozumowania",
-  "prompt.action.attachFile": "Załącz plik",
-  "prompt.attachment.remove": "Usuń załącznik",
   "prompt.action.send": "Wyślij",
   "prompt.action.send.blocked": "Najpierw odpowiedz na oczekujące pytanie lub je odrzuć",
   "prompt.action.send.recording": "Transkrybuj i wyślij",
@@ -401,189 +236,17 @@ export const dict = {
   "speechToText.tooltip.error": "Wprowadzanie głosowe nie powiodło się. Kliknij, aby wyczyścić.",
   "speechToText.error.title": "Wprowadzanie głosowe nie powiodło się",
   "speechToText.error.loginRequired": "Zaloguj się do Kilo, aby korzystać z wprowadzania głosowego.",
-  "speechToText.error.permission": "Odmówiono dostępu do mikrofonu.",
-  "speechToText.error.microphone": "Nie udało się uruchomić mikrofonu.",
-  "speechToText.error.recording": "Nagrywanie nie powiodło się.",
-  "speechToText.error.emptyRecording": "Nie nagrano żadnego dźwięku.",
   "speechToText.error.emptyTranscript": "Nie wykryto mowy.",
-  "speechToText.error.encoding": "Nie udało się zakodować nagrania.",
-  "speechToText.toast.transcribed": "Wstawiono transkrypcję",
 
-  "prompt.toast.pasteUnsupported.title": "Nieobsługiwane wklejanie",
-  "prompt.toast.pasteUnsupported.description": "Tylko obrazy lub pliki PDF mogą być tutaj wklejane.",
-  "prompt.toast.modelAgentRequired.title": "Wybierz agenta i model",
-  "prompt.toast.modelAgentRequired.description": "Wybierz agenta i model przed wysłaniem zapytania.",
-  "prompt.toast.worktreeCreateFailed.title": "Nie udało się utworzyć drzewa roboczego",
-  "prompt.toast.sessionCreateFailed.title": "Nie udało się utworzyć sesji",
-  "prompt.toast.shellSendFailed.title": "Nie udało się wysłać polecenia powłoki",
-  "prompt.toast.commandSendFailed.title": "Nie udało się wysłać polecenia",
   "prompt.toast.promptSendFailed.title": "Nie udało się wysłać zapytania",
 
-  "dialog.mcp.title": "MCP",
-  "dialog.mcp.description": "{{enabled}} z {{total}} włączone",
-  "dialog.mcp.empty": "Brak skonfigurowanych MCP",
-
-  "dialog.lsp.empty": "LSP wykryte automatycznie na podstawie typów plików",
-  "dialog.plugins.empty": "Wtyczki skonfigurowane w opencode.json",
-
   "mcp.status.connected": "połączono",
   "mcp.status.failed": "niepowodzenie",
   "mcp.status.needs_auth": "wymaga autoryzacji",
   "mcp.status.needs_registration": "wymaga rejestracji klienta",
   "mcp.status.disabled": "wyłączone",
 
-  "dialog.fork.empty": "Brak wiadomości do rozwidlenia",
-
-  "dialog.directory.search.placeholder": "Szukaj folderów",
-  "dialog.directory.empty": "Nie znaleziono folderów",
-
-  "dialog.server.title": "Serwery",
-  "dialog.server.description": "Przełącz serwer Kilo, z którym łączy się ta aplikacja.",
-  "dialog.server.search.placeholder": "Szukaj serwerów",
-  "dialog.server.empty": "Brak serwerów",
-  "dialog.server.add.title": "Dodaj serwer",
-  "dialog.server.add.url": "URL serwera",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Nie można połączyć się z serwerem",
-  "dialog.server.add.checking": "Sprawdzanie...",
-  "dialog.server.add.button": "Dodaj serwer",
-  "dialog.server.default.title": "Domyślny serwer",
-  "dialog.server.default.description":
-    "Połącz z tym serwerem przy uruchomieniu aplikacji zamiast uruchamiać lokalny serwer. Wymaga restartu.",
-  "dialog.server.default.none": "Nie wybrano serwera",
-  "dialog.server.default.set": "Ustaw bieżący serwer jako domyślny",
-  "dialog.server.default.clear": "Wyczyść",
-  "dialog.server.action.remove": "Usuń serwer",
-
-  "dialog.server.menu.edit": "Edytuj",
-  "dialog.server.menu.default": "Ustaw jako domyślny",
-  "dialog.server.menu.defaultRemove": "Usuń domyślny",
-  "dialog.server.menu.delete": "Usuń",
-  "dialog.server.current": "Obecny serwer",
-  "dialog.server.status.default": "Domyślny",
-
-  "dialog.project.edit.title": "Edytuj projekt",
-  "dialog.project.edit.name": "Nazwa",
-  "dialog.project.edit.icon": "Ikona",
-  "dialog.project.edit.icon.alt": "Ikona projektu",
-  "dialog.project.edit.icon.hint": "Kliknij lub przeciągnij obraz",
-  "dialog.project.edit.icon.recommended": "Zalecane: 128x128px",
-  "dialog.project.edit.color": "Kolor",
-  "dialog.project.edit.color.select": "Wybierz kolor {{color}}",
-
-  "dialog.project.edit.worktree.startup": "Skrypt uruchamiania przestrzeni roboczej",
-  "dialog.project.edit.worktree.startup.description":
-    "Uruchamiany po utworzeniu nowej przestrzeni roboczej (drzewa roboczego).",
-  "dialog.project.edit.worktree.startup.placeholder": "np. bun install",
-  "context.breakdown.title": "Podział kontekstu",
-  "context.breakdown.note": 'Przybliżony podział tokenów wejściowych. "Inne" obejmuje definicje narzędzi i narzut.',
-  "context.breakdown.system": "System",
-  "context.breakdown.user": "Użytkownik",
-  "context.breakdown.assistant": "Asystent",
-  "context.breakdown.tool": "Wywołania narzędzi",
-  "context.breakdown.other": "Inne",
-
-  "context.systemPrompt.title": "Prompt systemowy",
-  "context.rawMessages.title": "Surowe wiadomości",
-
-  "context.stats.session": "Sesja",
-  "context.stats.messages": "Wiadomości",
-  "context.stats.provider": "Dostawca",
-  "context.stats.model": "Model",
-  "context.stats.limit": "Limit kontekstu",
-  "context.stats.totalTokens": "Całkowita liczba tokenów",
-  "context.stats.usage": "Użycie",
-  "context.stats.inputTokens": "Tokeny wejściowe",
-  "context.stats.outputTokens": "Tokeny wyjściowe",
-  "context.stats.reasoningTokens": "Tokeny wnioskowania",
-  "context.stats.cacheTokens": "Tokeny pamięci podręcznej (odczyt/zapis)",
-  "context.stats.userMessages": "Wiadomości użytkownika",
-  "context.stats.assistantMessages": "Wiadomości asystenta",
-  "context.stats.totalCost": "Całkowity koszt",
-  "context.stats.sessionCreated": "Utworzono sesję",
-  "context.stats.lastActivity": "Ostatnia aktywność",
-
-  "context.usage.tokens": "Tokeny",
-  "context.usage.usage": "Użycie",
-  "context.usage.cost": "Koszt",
-  "context.usage.clickToView": "Kliknij, aby zobaczyć kontekst",
-  "context.usage.view": "Pokaż użycie kontekstu",
-
-  "toast.language.title": "Język",
-  "toast.language.description": "Przełączono na {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Przełączono motyw",
-  "toast.scheme.title": "Schemat kolorów",
-
-  "toast.permissions.autoaccept.on.title": "Automatyczne akceptowanie edycji",
-  "toast.permissions.autoaccept.on.description": "Uprawnienia do edycji i zapisu będą automatycznie zatwierdzane",
-  "toast.permissions.autoaccept.off.title": "Zatrzymano automatyczne akceptowanie edycji",
-  "toast.permissions.autoaccept.off.description": "Uprawnienia do edycji i zapisu będą wymagały zatwierdzenia",
-
-  "toast.workspace.enabled.title": "Przestrzenie robocze włączone",
-  "toast.workspace.enabled.description": "Kilka worktree jest teraz wyświetlanych na pasku bocznym",
-  "toast.workspace.disabled.title": "Przestrzenie robocze wyłączone",
-  "toast.workspace.disabled.description": "Tylko główny worktree jest wyświetlany na pasku bocznym",
-
-  "toast.model.none.title": "Nie wybrano modelu",
-  "toast.model.none.description": "Połącz dostawcę, aby podsumować tę sesję",
-
-  "toast.file.loadFailed.title": "Nie udało się załadować pliku",
-
-  "toast.file.listFailed.title": "Nie udało się wyświetlić listy plików",
-  "toast.context.noLineSelection.title": "Brak zaznaczenia linii",
-  "toast.context.noLineSelection.description": "Najpierw wybierz zakres linii w zakładce pliku.",
-  "toast.session.share.copyFailed.title": "Nie udało się skopiować URL do schowka",
-  "toast.session.share.success.title": "Sesja udostępniona",
-  "toast.session.share.success.description": "Link udostępniania skopiowany do schowka!",
-  "toast.session.share.failed.title": "Nie udało się udostępnić sesji",
-  "toast.session.share.failed.description": "Wystąpił błąd podczas udostępniania sesji",
-
-  "toast.session.unshare.success.title": "Zatrzymano udostępnianie sesji",
-  "toast.session.unshare.success.description": "Udostępnianie sesji zostało pomyślnie zatrzymane!",
-  "toast.session.unshare.failed.title": "Nie udało się zatrzymać udostępniania sesji",
-  "toast.session.unshare.failed.description": "Wystąpił błąd podczas zatrzymywania udostępniania sesji",
-
   "toast.session.rename.invalid.title": "Nieprawidłowy tytuł sesji",
-  "toast.session.listFailed.title": "Nie udało się załadować sesji dla {{project}}",
-
-  "toast.update.title": "Dostępna aktualizacja",
-  "toast.update.description": "Nowa wersja Kilo ({{version}}) jest teraz dostępna do instalacji.",
-  "toast.update.action.installRestart": "Zainstaluj i zrestartuj",
-  "toast.update.action.notYet": "Jeszcze nie",
-
-  "error.page.title": "Coś poszło nie tak",
-  "error.page.description": "Wystąpił błąd podczas ładowania aplikacji.",
-  "error.page.details.label": "Szczegóły błędu",
-  "error.page.action.restart": "Restartuj",
-  "error.page.action.checking": "Sprawdzanie...",
-  "error.page.action.checkUpdates": "Sprawdź aktualizacje",
-  "error.page.action.updateTo": "Zaktualizuj do {{version}}",
-  "error.page.report.prefix": "Proszę zgłosić ten błąd do zespołu Kilo",
-  "error.page.report.discord": "na Discordzie",
-  "error.page.version": "Wersja: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Nie znaleziono elementu głównego. Czy zapomniałeś dodać go do swojego index.html? A może atrybut id został błędnie wpisany?",
-
-  "error.globalSync.connectFailed": "Nie można połączyć się z serwerem. Czy serwer działa pod adresem `{{url}}`?",
 
   "error.startup.title": "Błąd połączenia z serwerem",
 
@@ -601,31 +264,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Zaloguj się ponownie do ChatGPT, a następnie wyślij wiadomość jeszcze raz, aby kontynuować korzystanie z modeli Codex.",
 
-  "error.chain.unknown": "Nieznany błąd",
-  "error.chain.causedBy": "Spowodowany przez:",
-  "error.chain.apiError": "Błąd API",
-  "error.chain.status": "Status: {{status}}",
-  "error.chain.retryable": "Można ponowić: {{retryable}}",
-  "error.chain.responseBody": "Treść odpowiedzi:\n{{body}}",
-  "error.chain.didYouMean": "Czy miałeś na myśli: {{suggestions}}",
-  "error.chain.modelNotFound": "Model nie znaleziony: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Sprawdź swoją konfigurację (opencode.json) nazwy dostawców/modeli",
-  "error.chain.mcpFailed":
-    'Serwer MCP "{{name}}" nie powiódł się. Uwaga, Kilo nie obsługuje jeszcze uwierzytelniania MCP.',
-  "error.chain.providerAuthFailed": "Uwierzytelnianie dostawcy nie powiodło się ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Nie udało się zainicjować dostawcy "{{provider}}". Sprawdź poświadczenia i konfigurację.',
-  "error.chain.configJsonInvalid": "Plik konfiguracyjny w {{path}} nie jest poprawnym JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Plik konfiguracyjny w {{path}} nie jest poprawnym JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Katalog "{{dir}}" w {{path}} jest nieprawidłowy. Zmień nazwę katalogu na "{{suggestion}}" lub usuń go. To częsta literówka.',
-  "error.chain.configFrontmatterError": "Nie udało się przetworzyć frontmatter w {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Plik konfiguracyjny w {{path}} jest nieprawidłowy",
-  "error.chain.configInvalidWithMessage": "Plik konfiguracyjny w {{path}} jest nieprawidłowy: {{message}}",
-
   "notification.permission.title": "Wymagane uprawnienie",
   "notification.permission.titleSubagent": "Wymagane uprawnienie (podagent)",
-  "notification.permission.description": "{{sessionTitle}} w {{projectName}} potrzebuje uprawnienia",
   "ui.permission.manageAutoApprove": "Zarządzaj regułami automatycznego zatwierdzania",
   "ui.permission.doomLoop.prompt": "Wykryto potencjalną pętlę dla narzędzia {{tool}}. Kontynuować działanie?",
   "ui.permission.doomLoop.rule": "Kontynuuj wywołania {{tool}}",
@@ -650,7 +290,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Odczyt Todo",
   "ui.permission.toolLabel.todoWrite": "Zapis Todo",
   "ui.permission.toolLabel.codeSearch": "Wyszukiwanie kodu",
-  "ui.permission.toggleWrap": "Przełącz zawijanie tekstu",
   "ui.permission.copyCommand": "Kopiuj",
   "ui.approval.auto": "Zatwierdzono automatycznie",
   "ui.approval.manual": "Zatwierdzone przez Ciebie",
@@ -662,46 +301,18 @@ export const dict = {
   "ui.approval.source.yolo": "przez tryb automatycznego zatwierdzania (YOLO)",
   "ui.approval.source.session": "przez regułę automatycznego zatwierdzania sesji",
   "ui.approval.source.default": "domyślnie",
-  "notification.question.title": "Pytanie",
-  "notification.question.description": "{{sessionTitle}} w {{projectName}} ma pytanie",
-  "notification.action.goToSession": "Przejdź do sesji",
 
-  "notification.session.responseReady.title": "Odpowiedź gotowa",
-  "notification.session.error.title": "Błąd sesji",
-  "notification.session.error.fallbackDescription": "Wystąpił błąd",
-
-  "home.recentProjects": "Ostatnie projekty",
-  "home.empty.title": "Brak ostatnich projektów",
-  "home.empty.description": "Zacznij od otwarcia lokalnego projektu",
-
-  "session.tab.session": "Sesja",
   "session.tab.review": "Przegląd",
-  "session.tab.context": "Kontekst",
-  "session.panel.reviewAndFiles": "Przegląd i pliki",
   "session.review.filesChanged": "Zmieniono {{count}} plików",
-  "session.review.change.one": "Zmiana",
   "session.review.change.other": "Zmiany",
   "session.review.loadingChanges": "Ładowanie zmian...",
-  "session.review.empty": "Brak zmian w tej sesji",
   "session.review.noChanges": "Brak zmian",
-  "session.files.selectToOpen": "Wybierz plik do otwarcia",
-  "session.files.all": "Wszystkie pliki",
-  "session.files.binaryContent": "Plik binarny (zawartość nie może być wyświetlona)",
-  "session.messages.renderEarlier": "Renderuj wcześniejsze wiadomości",
   "session.messages.loadingEarlier": "Ładowanie wcześniejszych wiadomości...",
   "session.messages.loadEarlier": "Załaduj wcześniejsze wiadomości",
   "session.messages.loading": "Ładowanie wiadomości...",
-  "session.messages.jumpToLatest": "Przejdź do najnowszych",
 
-  "session.context.addToContext": "Dodaj {{selection}} do kontekstu",
-
-  "session.new.worktree.main": "Główna gałąź",
-  "session.new.worktree.mainWithBranch": "Główna gałąź ({{branch}})",
-  "session.new.worktree.create": "Utwórz nowe drzewo robocze",
-  "session.new.lastModified": "Ostatnio zmodyfikowano",
   "sidebar.session.newSession": "Nowa Sesja",
   "sidebar.session.newSession.tooltip": "Rozpocznij nową konwersację, zachowując obecną sesję bez zmian.",
-  "sidebar.session.newSession.disabled": "Ta sesja jest już nowa. Rozpocznij czat lub zamiast tego utwórz worktree.",
   "sidebar.session.newWorktree": "Nowe Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Utwórz odizolowane git worktree, aby bezpiecznie eksperymentować, oddzielać zmiany i uruchamiać równoległe sesje bez zakłócania obecnej gałęzi.",
@@ -717,131 +328,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Przenieś tę rozmowę i {{files}} zmienionych plików do dedykowanego worktree w celu izolowanej dalszej pracy.",
   "sidebar.session.showChanges.tooltip.empty": "Otwórz widok zmian, aby sprawdzić obecne drzewo robocze.",
-  "sidebar.session.showChanges.tooltip.one": "1 plik zmieniony · +{{additions}} -{{deletions}}. Otwórz widok zmian.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} zmienionych plików · +{{additions}} -{{deletions}}. Otwórz widok zmian.",
-  "sidebar.session.agentManager.tooltip":
-    "Otwórz Agent Manager, aby uzyskać pełny przegląd równoległych sesji i worktree, ułatwiając koordynację długotrwałych zadań w jednym miejscu.",
-  "sidebar.session.openAgentManager": "Otwórz Agent Manager",
   "sidebar.session.progress.capturing": "Przechwytywanie zmian...",
   "sidebar.session.progress.creating": "Tworzenie worktree...",
   "sidebar.session.progress.setup": "Uruchamianie konfiguracji...",
   "sidebar.session.progress.transferring": "Przesyłanie zmian...",
   "sidebar.session.progress.forking": "Uruchamianie sesji...",
   "sidebar.session.progress.failed": "Nie udało się kontynuować w worktree",
-  "session.header.search.placeholder": "Szukaj {{project}}",
-  "session.header.searchFiles": "Szukaj plików",
-  "session.header.openIn": "Otwórz w",
-  "session.header.open.action": "Otwórz {{app}}",
-  "session.header.open.ariaLabel": "Otwórz w {{app}}",
-  "session.header.open.menu": "Opcje otwierania",
-  "session.header.open.copyPath": "Kopiuj ścieżkę",
-
-  "status.popover.trigger": "Status",
-  "status.popover.ariaLabel": "Konfiguracje serwerów",
-  "status.popover.tab.servers": "Serwery",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Wtyczki",
-  "status.popover.action.manageServers": "Zarządzaj serwerami",
-
-  "session.share.popover.title": "Opublikuj w sieci",
-  "session.share.popover.description.shared":
-    "Ta sesja jest publiczna w sieci. Jest dostępna dla każdego, kto posiada link.",
-  "session.share.popover.description.unshared":
-    "Udostępnij sesję publicznie w sieci. Będzie dostępna dla każdego, kto posiada link.",
-  "session.share.action.share": "Udostępnij",
-  "session.share.action.publish": "Opublikuj",
-  "session.share.action.publishing": "Publikowanie...",
-  "session.share.action.unpublish": "Cofnij publikację",
-  "session.share.action.unpublishing": "Cofanie publikacji...",
-  "session.share.action.view": "Widok",
-  "session.share.copy.copied": "Skopiowano",
-  "session.share.copy.copyLink": "Kopiuj link",
-
-  "lsp.tooltip.none": "Brak serwerów LSP",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Ładowanie promptu...",
-  "terminal.loading": "Ładowanie terminala...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Zamknij terminal",
-  "terminal.connectionLost.title": "Utracono połączenie",
-  "terminal.connectionLost.description":
-    "Połączenie z terminalem zostało przerwane. Może się to zdarzyć przy restarcie serwera.",
 
   "common.closeTab": "Zamknij kartę",
   "common.signIn": "Zaloguj się",
-  "common.signOut": "Wyloguj się",
   "common.dismiss": "Odrzuć",
   "common.requestFailed": "Żądanie nie powiodło się",
-  "common.moreOptions": "Więcej opcji",
-  "common.learnMore": "Dowiedz się więcej",
   "common.rename": "Zmień nazwę",
-  "common.reset": "Resetuj",
-  "common.archive": "Archiwizuj",
   "common.delete": "Usuń",
   "common.close": "Zamknij",
   "common.edit": "Edytuj",
   "common.loadMore": "Załaduj więcej",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Przełącz menu",
-  "sidebar.nav.projectsAndSessions": "Projekty i sesje",
   "sidebar.settings": "Ustawienia",
-  "sidebar.help": "Pomoc",
-  "sidebar.workspaces.enable": "Włącz przestrzenie robocze",
-  "sidebar.workspaces.disable": "Wyłącz przestrzenie robocze",
-  "sidebar.gettingStarted.title": "Pierwsze kroki",
-  "sidebar.gettingStarted.line1": "Kilo zawiera darmowe modele, więc możesz zacząć od razu.",
-  "sidebar.gettingStarted.line2": "Połącz dowolnego dostawcę, aby używać modeli, w tym Claude, GPT, Gemini itp.",
-  "sidebar.project.recentSessions": "Ostatnie sesje",
-  "sidebar.project.viewAllSessions": "Zobacz wszystkie sesje",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Pulpit",
-  "settings.section.server": "Serwer",
-  "settings.tab.general": "Ogólne",
-  "settings.tab.shortcuts": "Skróty",
-
-  "settings.general.section.appearance": "Wygląd",
-  "settings.general.section.notifications": "Powiadomienia systemowe",
-  "settings.general.section.updates": "Aktualizacje",
-  "settings.general.section.sounds": "Efekty dźwiękowe",
-
-  "settings.general.row.language.title": "Język",
-  "settings.general.row.language.description": "Zmień język wyświetlania dla Kilo",
-  "settings.general.row.appearance.title": "Wygląd",
-  "settings.general.row.appearance.description": "Dostosuj wygląd Kilo na swoim urządzeniu",
-  "settings.general.row.theme.title": "Motyw",
-  "settings.general.row.theme.description": "Dostosuj motyw Kilo.",
-  "settings.general.row.font.title": "Czcionka",
-  "settings.general.row.font.description": "Dostosuj czcionkę mono używaną w blokach kodu",
-
-  "settings.general.row.releaseNotes.title": "Informacje o wydaniu",
-  "settings.general.row.releaseNotes.description": 'Pokazuj wyskakujące okna "Co nowego" po aktualizacjach',
-
-  "settings.updates.row.startup.title": "Sprawdzaj aktualizacje przy uruchomieniu",
-  "settings.updates.row.startup.description": "Automatycznie sprawdzaj aktualizacje podczas uruchamiania Kilo",
-  "settings.updates.row.check.title": "Sprawdź aktualizacje",
-  "settings.updates.row.check.description": "Ręcznie sprawdź aktualizacje i zainstaluj, jeśli są dostępne",
-  "settings.updates.action.checkNow": "Sprawdź teraz",
-  "settings.updates.action.checking": "Sprawdzanie...",
-  "settings.updates.toast.latest.title": "Masz najnowszą wersję",
-  "settings.updates.toast.latest.description": "Korzystasz z najnowszej wersji Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alert 01",
   "sound.option.alert02": "Alert 02",
   "sound.option.alert03": "Alert 03",
@@ -888,48 +393,10 @@ export const dict = {
   "sound.option.yup05": "Yup 05",
   "sound.option.yup06": "Yup 06",
 
-  "settings.general.notifications.agent.title": "Agent",
-  "settings.general.notifications.agent.description":
-    "Pokaż powiadomienie systemowe, gdy agent zakończy pracę lub wymaga uwagi",
-  "settings.general.notifications.permissions.title": "Uprawnienia",
-  "settings.general.notifications.permissions.description":
-    "Pokaż powiadomienie systemowe, gdy wymagane jest uprawnienie",
-  "settings.general.notifications.errors.title": "Błędy",
-  "settings.general.notifications.errors.description": "Pokaż powiadomienie systemowe, gdy wystąpi błąd",
-
-  "settings.general.sounds.agent.title": "Agent",
-  "settings.general.sounds.agent.description": "Odtwórz dźwięk, gdy agent zakończy pracę lub wymaga uwagi",
-  "settings.general.sounds.permissions.title": "Uprawnienia",
-  "settings.general.sounds.permissions.description": "Odtwórz dźwięk, gdy wymagane jest uprawnienie",
-  "settings.general.sounds.errors.title": "Błędy",
-  "settings.general.sounds.errors.description": "Odtwórz dźwięk, gdy wystąpi błąd",
-
-  "settings.shortcuts.title": "Skróty klawiszowe",
-  "settings.shortcuts.reset.button": "Przywróć domyślne",
-  "settings.shortcuts.reset.toast.title": "Zresetowano skróty",
-  "settings.shortcuts.reset.toast.description": "Skróty klawiszowe zostały przywrócone do ustawień domyślnych.",
-  "settings.shortcuts.conflict.title": "Skrót już w użyciu",
-  "settings.shortcuts.conflict.description": "{{keybind}} jest już przypisany do {{titles}}.",
-  "settings.shortcuts.unassigned": "Nieprzypisany",
-  "settings.shortcuts.pressKeys": "Naciśnij klawisze",
-  "settings.shortcuts.search.placeholder": "Szukaj skrótów",
-  "settings.shortcuts.search.empty": "Nie znaleziono skrótów",
-
-  "settings.shortcuts.group.general": "Ogólne",
-  "settings.shortcuts.group.session": "Sesja",
-  "settings.shortcuts.group.navigation": "Nawigacja",
-  "settings.shortcuts.group.modelAndAgent": "Model i agent",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Prompt",
-
   "settings.providers.title": "Dostawcy",
-  "settings.providers.description": "Ustawienia dostawców będą tutaj konfigurowalne.",
-  "settings.providers.betaNotice":
-    "Obecnie w interfejsie ustawień można skonfigurować tylko dostawcę Kilo Gateway. Obsługa konfiguracji innych dostawców pojawi się wkrótce w fazie beta. W międzyczasie możesz konfigurować dostawców za pomocą CLI lub pliku konfiguracyjnego. Zależy nam na zachowaniu otwartości Kilo, bez lock-inu.",
   "settings.providers.section.connected": "Połączeni dostawcy",
   "settings.providers.connected.empty": "Brak połączonych dostawców",
   "settings.providers.section.popular": "Popularni dostawcy",
-  "settings.providers.search.placeholder": "Szukaj dostawców",
   "settings.providers.select.placeholder": "Wybierz dostawcę...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Środowisko",
@@ -948,7 +415,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Ukryj modele Kilo Gateway, których dostawcy mogą używać Twoich promptów do trenowania.",
   "settings.providers.modeModels": "Model na tryb",
-  "settings.providers.custom.note": "Dodaj niestandardowego dostawcę przez bazowy URL.",
   "settings.providers.modeModels.description":
     "Zastąp domyślny model dla określonych trybów. Jeśli nie ustawiono, używany jest globalny domyślny model.",
   "provider.custom.title": "Niestandardowy dostawca",
@@ -1015,9 +481,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Usuń model",
   "provider.custom.models.add": "Dodaj model",
-  "provider.custom.models.fetch": "Pobierz modele",
-  "provider.custom.models.fetching": "Pobieranie\u2026",
-  "provider.custom.models.fetch.error": "Nie udało się pobrać modeli: {{error}}",
   "provider.custom.models.fetch.authError":
     "Uwierzytelnianie nie powiodło się. Sprawdź klucz API powyżej i spróbuj ponownie.",
   "provider.custom.models.fetch.empty": "Nie znaleziono modeli na tym serwerze.",
@@ -1070,23 +533,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Przestarzała konfiguracja .kilocode",
   "settings.config.source.projectOpencode": "Przestarzała konfiguracja .opencode",
   "settings.models.title": "Modele",
-  "settings.models.description": "Ustawienia modeli będą tutaj konfigurowalne.",
-  "settings.agents.title": "Agenci",
-  "settings.agents.description": "Ustawienia agentów będą tutaj konfigurowalne.",
-  "settings.commands.title": "Polecenia",
-  "settings.commands.description": "Ustawienia poleceń będą tutaj konfigurowalne.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "Ustawienia MCP będą tutaj konfigurowalne.",
 
-  "settings.permissions.title": "Uprawnienia",
-  "settings.permissions.description": "Kontroluj, jakich narzędzi serwer może używać domyślnie.",
-  "settings.permissions.section.tools": "Narzędzia",
   "settings.permissions.toast.updateFailed.title": "Nie udało się zaktualizować uprawnień",
 
-  "settings.permissions.action.allow": "Zezwól",
-  "settings.permissions.action.ask": "Pytaj",
-  "settings.permissions.action.deny": "Odmów",
-
   "settings.permissions.tool.read.title": "Odczyt",
   "settings.permissions.tool.read.description": "Odczyt pliku (pasuje do ścieżki pliku)",
   "settings.permissions.tool.edit.title": "Edycja",
@@ -1120,7 +569,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Zapętlenie",
   "settings.permissions.tool.doom_loop.description": "Wykrywanie powtarzających się wywołań narzędzi (doom loop)",
 
-  "session.delete.failed.title": "Nie udało się usunąć sesji",
   "session.delete.title": "Usuń sesję",
   "session.delete.confirm": 'Usunąć sesję "{{name}}"?',
   "session.delete.button": "Usuń sesję",
@@ -1148,14 +596,9 @@ export const dict = {
   "feedback.dialog.support": "Wsparcie klienta",
   "workStyle.onboarding.welcome": "Witamy w Kilo",
   "workStyle.onboarding.title": "Wybierz sposób pracy",
-  "workStyle.onboarding.description":
-    "Ustawia początkowe wartości domyślne uprawnień, bloków rozumowania, danych wyjściowych terminala i osi czasu kontekstu. Jest stosowane tylko raz i pomija ustawienia, które zostały już przez Ciebie zmienione.",
   "workStyle.onboarding.settingsNote": "Te opcje możesz zmienić w dowolnym momencie w",
   "workStyle.onboarding.settings": "Ustawieniach.",
-  "workStyle.onboarding.skip": "Pomiń na razie",
   "workStyle.toast.saved.title": "Tryb został pomyślnie zapisany",
-  "workStyle.toast.saved.description": "Możesz je zmienić w dowolnym momencie w Ustawieniach.",
-  "workStyle.toast.saved.action": "Przejdź do Ustawień",
   "workStyle.choice.permissions": "Uprawnienia",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Widoczność",
@@ -1179,32 +622,6 @@ export const dict = {
   "session.cloud.import.legacy": "Wygląda na to, że jest to starsza sesja, która nie jest już obsługiwana.",
   "session.cloud.import.failed": "Nie udało się zaimportować sesji chmurowej",
 
-  "workspace.new": "Nowa przestrzeń robocza",
-  "workspace.type.local": "lokalna",
-  "workspace.type.sandbox": "piaskownica",
-  "workspace.create.failed.title": "Nie udało się utworzyć przestrzeni roboczej",
-  "workspace.delete.failed.title": "Nie udało się usunąć przestrzeni roboczej",
-  "workspace.resetting.title": "Resetowanie przestrzeni roboczej",
-  "workspace.resetting.description": "To może potrwać minutę.",
-  "workspace.reset.failed.title": "Nie udało się zresetować przestrzeni roboczej",
-  "workspace.reset.success.title": "Przestrzeń robocza zresetowana",
-  "workspace.reset.success.description": "Przestrzeń robocza odpowiada teraz domyślnej gałęzi.",
-  "workspace.error.stillPreparing": "Przestrzeń robocza jest wciąż przygotowywana",
-  "workspace.status.checking": "Sprawdzanie niezscalonych zmian...",
-  "workspace.status.error": "Nie można zweryfikować statusu git.",
-  "workspace.status.clean": "Nie wykryto niezscalonych zmian.",
-  "workspace.status.dirty": "Wykryto niezscalone zmiany w tej przestrzeni roboczej.",
-  "workspace.delete.title": "Usuń przestrzeń roboczą",
-  "workspace.delete.confirm": 'Usunąć przestrzeń roboczą "{{name}}"?',
-  "workspace.delete.button": "Usuń przestrzeń roboczą",
-  "workspace.reset.title": "Resetuj przestrzeń roboczą",
-  "workspace.reset.confirm": 'Zresetować przestrzeń roboczą "{{name}}"?',
-  "workspace.reset.button": "Resetuj przestrzeń roboczą",
-  "workspace.reset.archived.none": "Żadne aktywne sesje nie zostaną zarchiwizowane.",
-  "workspace.reset.archived.one": "1 sesja zostanie zarchiwizowana.",
-  "workspace.reset.archived.many": "{{count}} sesji zostanie zarchiwizowanych.",
-  "workspace.reset.note": "To zresetuje przestrzeń roboczą, aby odpowiadała domyślnej gałęzi.",
-
   "deviceAuth.toast.urlCopied": "URL skopiowany do schowka",
   "deviceAuth.toast.codeCopied": "Kod skopiowany do schowka",
   "deviceAuth.toast.errorCopied": "Błąd skopiowany do schowka",
@@ -1242,7 +659,6 @@ export const dict = {
   "profile.pass.renews": "Odnawia się",
   "profile.action.logout": "Wyloguj się",
 
-  "settings.section.configuration": "Konfiguracja",
   "settings.agentBehaviour.title": "Zachowanie agenta",
   "settings.autoApprove.title": "Automatyczne zatwierdzanie",
   "settings.browser.title": "Przeglądarka",
@@ -1258,7 +674,6 @@ export const dict = {
   "settings.language.title": "Język",
   "settings.aboutKiloCode.title": "O Kilo Code",
 
-  "session.messages.empty": "Rozpocznij rozmowę, wpisując wiadomość poniżej.",
   "session.messages.welcome":
     "Kilo Code to asystent programowania AI. Poproś go o tworzenie funkcji, naprawę błędów lub wyjaśnienie bazy kodu.",
   "session.messages.scrollToBottom": "Przewiń na dół",
@@ -1266,7 +681,6 @@ export const dict = {
   "session.messages.taskStarting": "Uruchamianie...",
   "session.status.writingResponse": "Pisanie odpowiedzi…",
   "session.status.retry": "Ponawianie…",
-  "session.status.retrying": "Ponawiam próbę ({{ attempt }})… {{ message }}",
   "session.status.working": "Pracuję…",
   "session.status.offline": "Odłączono od sieci — ponowne łączenie...",
   "session.outcome.incomplete": "Tura zakończona, pozostało {{count}} to-dos",
@@ -1298,11 +712,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} starszych sesji",
   "context.stats.thisSession": "Ta sesja",
 
-  "time.justNow": "przed chwilą",
-  "time.minutesAgo": "{{count}} min temu",
-  "time.hoursAgo": "{{count}} godz. temu",
-  "time.daysAgo": "{{count}} dn. temu",
-  "time.monthsAgo": "{{count}} mies. temu",
   "time.today": "Dzisiaj",
   "time.yesterday": "Wczoraj",
   "time.thisWeek": "Ten tydzień",
@@ -1318,7 +727,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Informacje o wersji",
   "settings.aboutKiloCode.version.label": "Wersja:",
-  "settings.aboutKiloCode.extensionName": "Rozszerzenie Kilo Code",
   "settings.aboutKiloCode.community": "Społeczność i wsparcie",
   "settings.aboutKiloCode.feedback.prefix": "Jeśli masz pytania lub uwagi, śmiało otwórz zgłoszenie na",
   "settings.aboutKiloCode.feedback.or": "lub",
@@ -1368,7 +776,6 @@ export const dict = {
   "settings.language.current": "Bieżący:",
 
   "common.add": "Dodaj",
-  "common.choose": "Wybierz…",
 
   "settings.autocomplete.autoTrigger.title": "Włącz automatyczne uzupełnianie inline",
   "settings.autocomplete.autoTrigger.description": "Automatycznie pokazuj sugestie uzupełniania podczas pisania",
@@ -1377,28 +784,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "Włącz autouzupełnianie czatu",
   "settings.autocomplete.chatAutocomplete.description": "Pokaż sugestie autouzupełniania w polu czatu",
   "settings.autocomplete.modelsHint": "Aby wybrać model używany do autouzupełniania, zobacz Ustawienia modeli.",
-  "settings.notifications.agent.title": "Zakończenie agenta",
-  "settings.notifications.agent.description": "Pokaż powiadomienie po zakończeniu zadania przez agenta",
-  "settings.notifications.permissions.title": "Żądania uprawnień",
-  "settings.notifications.permissions.description": "Pokaż powiadomienie przy żądaniach uprawnień",
-  "settings.notifications.errors.title": "Błędy",
-  "settings.notifications.errors.description": "Pokaż powiadomienie przy błędach",
   "settings.notifications.sounds": "Dźwięki",
   "settings.notifications.enable.title": "Włącz powiadomienia dźwiękowe",
   "settings.notifications.enable.description":
     "Odtwarzaj dźwięki, gdy sesje się zakończą, wystąpi błąd lub będzie potrzebna Twoja reakcja",
   "settings.notifications.testSound": "Testuj",
-  "settings.notifications.agentSound.title": "Dźwięk zakończenia agenta",
-  "settings.notifications.agentSound.description": "Dźwięk odtwarzany po zakończeniu agenta",
-  "settings.notifications.permSound.title": "Dźwięk żądania uprawnień",
-  "settings.notifications.permSound.description": "Dźwięk odtwarzany przy żądaniach uprawnień",
-  "settings.notifications.errorSound.title": "Dźwięk błędu",
-  "settings.notifications.errorSound.description": "Dźwięk odtwarzany przy błędach",
   "settings.notifications.sound.default": "Domyślny",
   "settings.notifications.sound.system": "System",
   "settings.notifications.sound.description":
     "Opcja domyślna używa różnych dźwięków dla zakończenia, oczekiwania na reakcję i błędów. Pozostałe opcje używają jednego dźwięku dla wszystkich zdarzeń.",
-  "settings.notifications.sound.none": "Brak",
   "settings.experimental.share.title": "Tryb udostępniania",
   "settings.experimental.share.description": "Zachowanie udostępniania sesji",
   "settings.experimental.share.manual": "Ręczny",
@@ -1418,9 +812,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Model generowania obrazów",
   "settings.experimental.imageGenerationModel.placeholder": "Domyślny (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Mowa na tekst",
-  "settings.experimental.speechToText.description":
-    "Włącz wprowadzanie głosowe w polach promptów przy użyciu konta Kilo za pośrednictwem Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Włącz i zaloguj się do dostawcy Kilo, aby korzystać ze Speech to Text. Speech to Text jest obecnie obsługiwane tylko z Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Model mowy na tekst",
@@ -1473,8 +864,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Włącz dla tego projektu",
   "settings.indexing.projectEnable.description":
     "Włącz indeksowanie dla tego obszaru roboczego, gdy globalne indeksowanie jest wyłączone.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Globalne indeksowanie jest włączone, więc ten projekt jest już uwzględniony.",
   "settings.indexing.lancedbDirectory.description": "Opcjonalny katalog dla lokalnego magazynu LanceDB.",
   "settings.indexing.lancedbDirectory.placeholder": "Pozostaw puste dla domyślnego",
   "settings.indexing.lancedbDirectory.title": "Katalog LanceDB",
@@ -1504,15 +893,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Domyślny agent",
   "settings.agentBehaviour.defaultAgent.description": "Agent używany, gdy żaden nie jest określony",
   "settings.agentBehaviour.availableAgents": "Dostępni agenci",
-  "settings.agentBehaviour.selectAgent": "Wybierz agenta do konfiguracji…",
-  "settings.agentBehaviour.selectAgent.title": "Agent",
-  "settings.agentBehaviour.selectAgent.description": "Wybierz agenta do konfiguracji…",
   "settings.agentBehaviour.modelOverride.title": "Nadpisanie modelu",
   "settings.agentBehaviour.modelOverride.description": "Nadpisz domyślny model dla tego agenta",
   "settings.agentBehaviour.variantOverride.title": "Nadpisanie wariantu",
   "settings.agentBehaviour.variantOverride.description": "Nadpisz wariant modelu dla tego agenta",
-  "settings.agentBehaviour.prompt.title": "Niestandardowy prompt",
-  "settings.agentBehaviour.prompt.description": "Dodatkowy prompt systemowy dla tego agenta",
   "settings.agentBehaviour.temperature.title": "Temperatura",
   "settings.agentBehaviour.temperature.description":
     "Określa stopień losowości odpowiedzi AI (0–2). Niższe wartości (np. 0.2) dają bardziej ukierunkowane i spójne wyniki. Wyższe wartości (np. 1.0) dają bardziej zróżnicowane i kreatywne odpowiedzi. Pozostaw puste, aby użyć wartości domyślnej modelu.",
@@ -1532,7 +916,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Wykryte umiejętności",
   "settings.agentBehaviour.noSkillsFound":
     "Nie znaleziono umiejętności. Dodaj ścieżki folderów lub adresy URL poniżej, aby udostępnić umiejętności.",
-  "settings.agentBehaviour.availableModes": "Dostępne tryby niestandardowe",
   "settings.agentBehaviour.noAgentsFound": "Nie znaleziono agentów.",
   "settings.agentBehaviour.createMode": "Utwórz nowy tryb",
   "settings.agentBehaviour.createMode.name": "Nazwa",
@@ -1616,11 +999,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Polecenie",
   "settings.agentBehaviour.mcpDetail.args": "Argumenty",
   "settings.agentBehaviour.mcpDetail.env": "Środowisko",
-  "settings.agentBehaviour.mcpDetail.disabled": "Ten serwer jest wyłączony.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Przeglądaj Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "Brak skonfigurowanych serwerów MCP. Dodaj serwery MCP w kilo.jsonc lub poproś agenta o ich dodanie.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Przepływy pracy zarządzane są za pomocą plików przepływów pracy.",
   "settings.agentBehaviour.workflows.description":
     "Przepływy pracy to niestandardowe komendy slash zdefiniowane w konfiguracji. Wpisz /command-name na czacie, aby je uruchomić. Komendy konfiguruje się w opencode.json w sekcji 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1715,7 +1096,6 @@ export const dict = {
     "np. Generuj commit messages w języku hiszpańskim zgodnie z formatem conventional commits. Zwróć TYLKO commit message.",
 
   "settings.commitMessage.language.sync": "Synchronizacja z językiem UI",
-  "settings.commitMessage.language.title": "Język",
   "settings.commitMessage.language.description":
     "Wybierz, jaki język używać do wiadomości generowanych przez sztuczną inteligencję:",
 
@@ -1755,8 +1135,6 @@ export const dict = {
   "settings.providers.disabled": "Wyłączeni dostawcy",
   "settings.providers.disabled.description": "Dostawcy do ukrycia z listy",
   "settings.providers.disabled.enable": "Włącz",
-  "settings.providers.enabled": "Włączeni dostawcy (biała lista)",
-  "settings.providers.enabled.description": "Jeśli ustawiono, tylko ci dostawcy będą dostępni",
   "settings.providers.notSet": "Nie ustawiono (użyj domyślnego serwera)",
   "dialog.model.notSet": "Nie ustawiono",
   "profile.personalAccount": "Konto osobiste",
@@ -1796,9 +1174,7 @@ export const dict = {
   "migration.migrate.title": "Migruj swoje ustawienia",
   "migration.migrate.subtitle": "Znaleźliśmy ustawienia z poprzedniej instalacji. Oto co możemy przenieść.",
   "migration.migrate.selectLabel": "Wybierz, co zmigrować",
-  "migration.migrate.cannotMigrate": "Nie można zmigrować",
   "migration.migrate.chatHistory": "Sesje czatu i historia",
-  "migration.migrate.chatHistoryDesc": "Niekompatybilne z nową architekturą",
   "migration.migrate.button": "Migruj ustawienia",
   "migration.migrate.skip": "Pomiń",
   "migration.migrate.keysDetected": "Wykryto {{count}} kluczy",
@@ -1822,10 +1198,7 @@ export const dict = {
     "Spowoduje to usunięcie starych ustawień z magazynu VS Code. Nie będzie można ponownie uruchomić tej migracji.",
   "migration.complete.done": "Gotowe",
   "migration.migrate.sessionsDetected": "Wykryto {{count}} sesji",
-  "migration.error.sessionFailed": "Migracja sesji nie powiodła się",
   "migration.error.continue": "Kontynuuj",
-  "migration.error.action.copy": "Kopiuj",
-  "migration.error.toast.copied": "Błąd skopiowano do schowka",
 
   "migration.sessionSummary.title": "Podsumowanie:",
   "migration.sessionSummary.copy": "Kopiuj raport",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 6e264e1e3ad..649c5b84d17 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Предложено",
-  "command.category.view": "Просмотр",
-  "command.category.project": "Проект",
-  "command.category.provider": "Провайдер",
-  "command.category.server": "Сервер",
-  "command.category.session": "Сессия",
-  "command.category.theme": "Тема",
-  "command.category.language": "Язык",
-  "command.category.file": "Файл",
-  "command.category.context": "Контекст",
-  "command.category.terminal": "Терминал",
-  "command.category.model": "Модель",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Агент",
-  "command.category.permissions": "Разрешения",
-  "command.category.workspace": "Рабочее пространство",
-  "command.category.settings": "Настройки",
 
-  "theme.scheme.system": "Системная",
-  "theme.scheme.light": "Светлая",
-  "theme.scheme.dark": "Тёмная",
-
-  "command.sidebar.toggle": "Переключить боковую панель",
-  "command.project.open": "Открыть проект",
   "command.provider.connect": "Подключить провайдера",
-  "command.server.switch": "Переключить сервер",
-  "command.settings.open": "Открыть настройки",
-  "command.session.previous": "Предыдущая сессия",
-  "command.session.next": "Следующая сессия",
-  "command.session.previous.unseen": "Предыдущая непрочитанная сессия",
-  "command.session.next.unseen": "Следующая непрочитанная сессия",
-  "command.session.archive": "Архивировать сессию",
-
-  "command.palette": "Палитра команд",
-
-  "command.theme.cycle": "Цикл тем",
-  "command.theme.set": "Использовать тему: {{theme}}",
-  "command.theme.scheme.cycle": "Цикл цветовой схемы",
-  "command.theme.scheme.set": "Использовать цветовую схему: {{scheme}}",
-
-  "command.language.cycle": "Цикл языков",
-  "command.language.set": "Использовать язык: {{language}}",
 
   "command.session.new": "Новая сессия",
-  "command.session.new.task": "Новая задача",
   "command.session.show.changes": "Показать изменения",
-  "command.file.open": "Открыть файл",
-  "command.tab.close": "Закрыть вкладку",
-  "command.context.addSelection": "Добавить выделение в контекст",
-  "command.context.addSelection.description": "Добавить выбранные строки из текущего файла",
-  "command.terminal.toggle": "Переключить терминал",
-  "command.fileTree.toggle": "Переключить дерево файлов",
   "command.review.toggle": "Переключить обзор",
-  "command.terminal.new": "Новый терминал",
-  "command.terminal.new.description": "Создать новую вкладку терминала",
-  "command.steps.toggle": "Переключить шаги",
-  "command.steps.toggle.description": "Показать или скрыть шаги для текущего сообщения",
-  "command.message.previous": "Предыдущее сообщение",
-  "command.message.previous.description": "Перейти к предыдущему сообщению пользователя",
-  "command.message.next": "Следующее сообщение",
-  "command.message.next.description": "Перейти к следующему сообщению пользователя",
-  "command.model.choose": "Выбрать модель",
-  "command.model.choose.description": "Выбрать другую модель",
-  "command.mcp.toggle": "Переключить MCP",
-  "command.mcp.toggle.description": "Переключить MCP",
-  "command.agent.cycle": "Цикл агентов",
-  "command.agent.cycle.description": "Переключиться к следующему агенту",
-  "command.agent.cycle.reverse": "Цикл агентов назад",
-  "command.agent.cycle.reverse.description": "Переключиться к предыдущему агенту",
-  "command.model.variant.cycle": "Цикл режимов мышления",
-  "command.model.variant.cycle.description": "Переключиться к следующему уровню усилий",
-  "command.permissions.autoaccept.enable": "Авто-принятие изменений",
-  "command.permissions.autoaccept.disable": "Прекратить авто-принятие изменений",
-  "command.workspace.toggle": "Переключить рабочие пространства",
-  "command.workspace.toggle.description": "Включить или отключить несколько рабочих пространств в боковой панели",
-  "command.session.undo": "Отменить",
-  "command.session.undo.description": "Отменить последнее сообщение",
-  "command.session.redo": "Повторить",
-  "command.session.redo.description": "Повторить отменённое сообщение",
   "revert.banner.count_one": "Отменено {{count}} сообщение",
   "revert.banner.count_other": "Отменено {{count}} сообщений",
   "revert.banner.redo": "Повторить",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Включить снимки",
   "revert.disabled.agentBusy": "Дождитесь завершения агента",
   "command.session.compact": "Сжать сессию",
-  "command.session.compact.description": "Сократить сессию для уменьшения размера контекста",
-  "command.session.fork": "Создать ответвление",
-  "command.session.fork.description": "Создать новую сессию из сообщения",
-  "command.session.share": "Поделиться сессией",
-  "command.session.share.description": "Поделиться сессией и скопировать URL в буфер обмена",
-  "command.session.unshare": "Отменить публикацию",
-  "command.session.unshare.description": "Прекратить публикацию сессии",
   "command.session.export": "Экспортировать запись сеанса",
 
   "agentRequirements.skill.installed": "Установлено",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Эта проверка требований агента больше не активна.",
   "agentRequirements.error.requestFailed": "Kilo не смог проверить требования агента.",
 
-  "palette.search.placeholder": "Поиск файлов, команд и сессий",
-  "palette.empty": "Ничего не найдено",
-  "palette.group.commands": "Команды",
-  "palette.group.files": "Файлы",
-
   "dialog.provider.search.placeholder": "Поиск провайдеров",
   "dialog.provider.empty": "Провайдеры не найдены",
   "dialog.provider.group.other": "Другие",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Выбрать модель",
   "dialog.model.search.placeholder": "Поиск моделей",
   "dialog.model.empty": "Модели не найдены",
-  "dialog.model.manage": "Управление моделями",
-  "dialog.model.manage.description": "Настройте какие модели появляются в выборе модели",
   "dialog.model.select": "Выбрать",
   "dialog.model.expand": "Развернуть",
   "dialog.model.collapse": "Свернуть",
 
-  "dialog.model.unpaid.freeModels.title": "Бесплатные модели от Kilo",
-  "dialog.model.unpaid.addMore.title": "Добавьте больше моделей от популярных провайдеров",
-
   "dialog.provider.viewAll": "Показать больше провайдеров",
 
   "provider.connect.title": "Подключить {{provider}}",
-  "provider.connect.title.anthropicProMax": "Войти с помощью Claude Pro/Max",
   "provider.connect.selectMethod": "Выберите способ входа для {{provider}}.",
   "provider.connect.method.apiKey": "API ключ",
   "provider.connect.status.inProgress": "Авторизация...",
@@ -231,13 +140,6 @@ export const dict = {
   "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.opencodeZen.line1":
-    "OpenCode Zen даёт вам доступ к отобранным надёжным оптимизированным моделям для агентов программирования.",
-  "provider.connect.opencodeZen.line2":
-    "С одним API ключом вы получите доступ к таким моделям как Claude, GPT, Gemini, GLM и другим.",
-  "provider.connect.opencodeZen.visit.prefix": "Посетите ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " чтобы получить ваш API ключ.",
   "provider.connect.oauth.code.visit.prefix": "Посетите ",
   "provider.connect.oauth.code.visit.link": "эту ссылку",
   "provider.connect.oauth.code.visit.suffix":
@@ -245,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "{{method}} код авторизации",
   "provider.connect.oauth.code.placeholder": "Код авторизации",
   "provider.connect.oauth.code.required": "Код авторизации обязателен",
-  "provider.connect.oauth.code.invalid": "Неверный код авторизации",
   "provider.connect.oauth.auto.visit.prefix": "Посетите ",
   "provider.connect.oauth.auto.visit.link": "эту ссылку",
   "provider.connect.oauth.auto.visit.suffix":
@@ -258,28 +159,11 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "Модели {{provider}} больше недоступны.",
   "model.tag.free": "Бесплатно",
   "model.tag.dataCollected": "Данные могут использоваться для обучения",
-  "model.tag.latest": "Последняя",
   "model.group.auto": "Автоматические модели",
   "model.group.recommended": "Рекомендуемые",
   "model.group.favorites": "Избранное",
-  "model.group.collapse": "Свернуть {{group}}",
-  "model.group.expand": "Развернуть {{group}}",
   "model.favorite.add": "Добавить в избранное",
   "model.favorite.remove": "Удалить из избранного",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "текст",
-  "model.input.image": "изображение",
-  "model.input.audio": "аудио",
-  "model.input.video": "видео",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Разрешено: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Разрешает рассуждение",
-  "model.tooltip.reasoning.none": "Без рассуждения",
-  "model.tooltip.context": "Лимит контекста {{limit}}",
   "model.preview.label.released": "Выпущена",
   "model.preview.label.input": "Ввод",
   "model.preview.label.output": "Вывод",
@@ -299,11 +183,8 @@ export const dict = {
   "model.preview.modality.audio": "Аудио",
   "model.preview.modality.video": "Видео",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "Поиск",
   "common.goBack": "Назад",
-  "common.goForward": "Вперёд",
   "common.loading": "Загрузка",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Отмена",
   "common.connect": "Подключить",
   "common.disconnect": "Отключить",
@@ -311,54 +192,8 @@ export const dict = {
   "common.save": "Сохранить",
   "common.saving": "Сохранение...",
   "common.default": "По умолчанию",
-  "common.attachment": "вложение",
 
-  "prompt.placeholder.shell": "Введите команду оболочки...",
-  "prompt.placeholder.normal": 'Спросите что угодно... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Суммировать комментарии…",
-  "prompt.placeholder.summarizeComment": "Суммировать комментарий…",
-  "prompt.mode.shell": "Оболочка",
-  "prompt.mode.shell.exit": "esc для выхода",
-
-  "prompt.example.1": "Исправить TODO в коде",
-  "prompt.example.2": "Какой технологический стек этого проекта?",
-  "prompt.example.3": "Исправить сломанные тесты",
-  "prompt.example.4": "Объясни как работает аутентификация",
-  "prompt.example.5": "Найти и исправить уязвимости безопасности",
-  "prompt.example.6": "Добавить юнит-тесты для сервиса пользователя",
-  "prompt.example.7": "Рефакторить эту функцию для лучшей читаемости",
-  "prompt.example.8": "Что означает эта ошибка?",
-  "prompt.example.9": "Помоги мне отладить эту проблему",
-  "prompt.example.10": "Сгенерировать документацию API",
-  "prompt.example.11": "Оптимизировать запросы к базе данных",
-  "prompt.example.12": "Добавить валидацию ввода",
-  "prompt.example.13": "Создать новый компонент для...",
-  "prompt.example.14": "Как развернуть этот проект?",
-  "prompt.example.15": "Проверь мой код на лучшие практики",
-  "prompt.example.16": "Добавить обработку ошибок в эту функцию",
-  "prompt.example.17": "Объясни этот паттерн regex",
-  "prompt.example.18": "Конвертировать это в TypeScript",
-  "prompt.example.19": "Добавить логирование по всему проекту",
-  "prompt.example.20": "Какие зависимости устарели?",
-  "prompt.example.21": "Помоги написать скрипт миграции",
-  "prompt.example.22": "Реализовать кэширование для этой конечной точки",
-  "prompt.example.23": "Добавить пагинацию в этот список",
-  "prompt.example.24": "Создать CLI команду для...",
-  "prompt.example.25": "Как работают переменные окружения здесь?",
-
-  "prompt.popover.emptyResults": "Нет совпадений",
-  "prompt.popover.emptyCommands": "Нет совпадающих команд",
-  "prompt.dropzone.label": "Перетащите изображения или PDF сюда",
-  "prompt.slash.badge.custom": "своё",
-  "prompt.slash.badge.skill": "навык",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "активно",
-  "prompt.context.includeActiveFile": "Включить активный файл",
-  "prompt.context.removeActiveFile": "Удалить активный файл из контекста",
-  "prompt.context.removeFile": "Удалить файл из контекста",
   "prompt.thinking.tooltip": "Усилие рассуждения",
-  "prompt.action.attachFile": "Прикрепить файл",
-  "prompt.attachment.remove": "Удалить вложение",
   "prompt.action.send": "Отправить",
   "prompt.action.send.blocked": "Сначала ответьте на ожидающий вопрос или отклоните его",
   "prompt.action.send.recording": "Расшифровать и отправить",
@@ -398,190 +233,17 @@ export const dict = {
   "speechToText.tooltip.error": "Ошибка голосового ввода. Нажмите, чтобы очистить.",
   "speechToText.error.title": "Ошибка голосового ввода",
   "speechToText.error.loginRequired": "Войдите в Kilo, чтобы использовать голосовой ввод.",
-  "speechToText.error.permission": "В доступе к микрофону отказано.",
-  "speechToText.error.microphone": "Не удалось запустить микрофон.",
-  "speechToText.error.recording": "Ошибка записи.",
-  "speechToText.error.emptyRecording": "Звук не был записан.",
   "speechToText.error.emptyTranscript": "Речь не обнаружена.",
-  "speechToText.error.encoding": "Не удалось закодировать запись.",
-  "speechToText.toast.transcribed": "Транскрипция вставлена",
 
-  "prompt.toast.pasteUnsupported.title": "Неподдерживаемая вставка",
-  "prompt.toast.pasteUnsupported.description": "Сюда можно вставлять только изображения или PDF.",
-  "prompt.toast.modelAgentRequired.title": "Выберите агента и модель",
-  "prompt.toast.modelAgentRequired.description": "Выберите агента и модель перед отправкой запроса.",
-  "prompt.toast.worktreeCreateFailed.title": "Не удалось создать worktree",
-  "prompt.toast.sessionCreateFailed.title": "Не удалось создать сессию",
-  "prompt.toast.shellSendFailed.title": "Не удалось отправить команду оболочки",
-  "prompt.toast.commandSendFailed.title": "Не удалось отправить команду",
   "prompt.toast.promptSendFailed.title": "Не удалось отправить запрос",
 
-  "dialog.mcp.title": "MCP",
-  "dialog.mcp.description": "{{enabled}} из {{total}} включено",
-  "dialog.mcp.empty": "MCP не настроены",
-
-  "dialog.lsp.empty": "LSP автоматически обнаружены по типам файлов",
-  "dialog.plugins.empty": "Плагины настроены в opencode.json",
-
   "mcp.status.connected": "подключено",
   "mcp.status.failed": "ошибка",
   "mcp.status.needs_auth": "требуется авторизация",
   "mcp.status.needs_registration": "требуется регистрация клиента",
   "mcp.status.disabled": "отключено",
 
-  "dialog.fork.empty": "Нет сообщений для ответвления",
-
-  "dialog.directory.search.placeholder": "Поиск папок",
-  "dialog.directory.empty": "Папки не найдены",
-
-  "dialog.server.title": "Серверы",
-  "dialog.server.description": "Переключите сервер Kilo к которому подключается приложение.",
-  "dialog.server.search.placeholder": "Поиск серверов",
-  "dialog.server.empty": "Серверов пока нет",
-  "dialog.server.add.title": "Добавить сервер",
-  "dialog.server.add.url": "URL сервера",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Не удалось подключиться к серверу",
-  "dialog.server.add.checking": "Проверка...",
-  "dialog.server.add.button": "Добавить сервер",
-  "dialog.server.default.title": "Сервер по умолчанию",
-  "dialog.server.default.description":
-    "Подключаться к этому серверу при запуске приложения вместо запуска локального сервера. Требуется перезапуск.",
-  "dialog.server.default.none": "Сервер не выбран",
-  "dialog.server.default.set": "Установить текущий сервер по умолчанию",
-  "dialog.server.default.clear": "Очистить",
-  "dialog.server.action.remove": "Удалить сервер",
-
-  "dialog.server.menu.edit": "Редактировать",
-  "dialog.server.menu.default": "Сделать по умолчанию",
-  "dialog.server.menu.defaultRemove": "Удалить по умолчанию",
-  "dialog.server.menu.delete": "Удалить",
-  "dialog.server.current": "Текущий сервер",
-  "dialog.server.status.default": "По умолч.",
-
-  "dialog.project.edit.title": "Редактировать проект",
-  "dialog.project.edit.name": "Название",
-  "dialog.project.edit.icon": "Иконка",
-  "dialog.project.edit.icon.alt": "Иконка проекта",
-  "dialog.project.edit.icon.hint": "Нажмите или перетащите изображение",
-  "dialog.project.edit.icon.recommended": "Рекомендуется: 128x128px",
-  "dialog.project.edit.color": "Цвет",
-  "dialog.project.edit.color.select": "Выбрать цвет {{color}}",
-
-  "dialog.project.edit.worktree.startup": "Скрипт запуска рабочего пространства",
-  "dialog.project.edit.worktree.startup.description":
-    "Запускается после создания нового рабочего пространства (worktree).",
-  "dialog.project.edit.worktree.startup.placeholder": "например, bun install",
-  "context.breakdown.title": "Разбивка контекста",
-  "context.breakdown.note":
-    'Приблизительная разбивка входных токенов. "Другое" включает определения инструментов и накладные расходы.',
-  "context.breakdown.system": "Система",
-  "context.breakdown.user": "Пользователь",
-  "context.breakdown.assistant": "Ассистент",
-  "context.breakdown.tool": "Вызовы инструментов",
-  "context.breakdown.other": "Другое",
-
-  "context.systemPrompt.title": "Системный промпт",
-  "context.rawMessages.title": "Исходные сообщения",
-
-  "context.stats.session": "Сессия",
-  "context.stats.messages": "Сообщения",
-  "context.stats.provider": "Провайдер",
-  "context.stats.model": "Модель",
-  "context.stats.limit": "Лимит контекста",
-  "context.stats.totalTokens": "Всего токенов",
-  "context.stats.usage": "Использование",
-  "context.stats.inputTokens": "Входные токены",
-  "context.stats.outputTokens": "Выходные токены",
-  "context.stats.reasoningTokens": "Токены рассуждения",
-  "context.stats.cacheTokens": "Токены кэша (чтение/запись)",
-  "context.stats.userMessages": "Сообщения пользователя",
-  "context.stats.assistantMessages": "Сообщения ассистента",
-  "context.stats.totalCost": "Общая стоимость",
-  "context.stats.sessionCreated": "Сессия создана",
-  "context.stats.lastActivity": "Последняя активность",
-
-  "context.usage.tokens": "Токены",
-  "context.usage.usage": "Использование",
-  "context.usage.cost": "Стоимость",
-  "context.usage.clickToView": "Нажмите для просмотра контекста",
-  "context.usage.view": "Показать использование контекста",
-
-  "toast.language.title": "Язык",
-  "toast.language.description": "Переключено на {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "Тема переключена",
-  "toast.scheme.title": "Цветовая схема",
-
-  "toast.permissions.autoaccept.on.title": "Авто-принятие изменений",
-  "toast.permissions.autoaccept.on.description": "Разрешения на редактирование и запись будут автоматически одобрены",
-  "toast.permissions.autoaccept.off.title": "Авто-принятие остановлено",
-  "toast.permissions.autoaccept.off.description": "Редактирование и запись потребуют подтверждения",
-
-  "toast.workspace.enabled.title": "Рабочие пространства включены",
-  "toast.workspace.enabled.description": "В боковой панели теперь отображаются несколько рабочих деревьев",
-  "toast.workspace.disabled.title": "Рабочие пространства отключены",
-  "toast.workspace.disabled.description": "В боковой панели отображается только главное рабочее дерево",
-
-  "toast.model.none.title": "Модель не выбрана",
-  "toast.model.none.description": "Подключите провайдера для суммаризации сессии",
-
-  "toast.file.loadFailed.title": "Не удалось загрузить файл",
-
-  "toast.file.listFailed.title": "Не удалось получить список файлов",
-  "toast.context.noLineSelection.title": "Нет выделения строк",
-  "toast.context.noLineSelection.description": "Сначала выберите диапазон строк во вкладке файла.",
-  "toast.session.share.copyFailed.title": "Не удалось скопировать URL в буфер обмена",
-  "toast.session.share.success.title": "Сессия опубликована",
-  "toast.session.share.success.description": "URL скопирован в буфер обмена!",
-  "toast.session.share.failed.title": "Не удалось опубликовать сессию",
-  "toast.session.share.failed.description": "Произошла ошибка при публикации сессии",
-
-  "toast.session.unshare.success.title": "Публикация отменена",
-  "toast.session.unshare.success.description": "Публикация успешно отменена!",
-  "toast.session.unshare.failed.title": "Не удалось отменить публикацию",
-  "toast.session.unshare.failed.description": "Произошла ошибка при отмене публикации",
-
   "toast.session.rename.invalid.title": "Недопустимое название сессии",
-  "toast.session.listFailed.title": "Не удалось загрузить сессии для {{project}}",
-
-  "toast.update.title": "Доступно обновление",
-  "toast.update.description": "Новая версия Kilo ({{version}}) доступна для установки.",
-  "toast.update.action.installRestart": "Установить и перезапустить",
-  "toast.update.action.notYet": "Пока нет",
-
-  "error.page.title": "Что-то пошло не так",
-  "error.page.description": "Произошла ошибка при загрузке приложения.",
-  "error.page.details.label": "Детали ошибки",
-  "error.page.action.restart": "Перезапустить",
-  "error.page.action.checking": "Проверка...",
-  "error.page.action.checkUpdates": "Проверить обновления",
-  "error.page.action.updateTo": "Обновить до {{version}}",
-  "error.page.report.prefix": "Пожалуйста, сообщите об этой ошибке команде Kilo",
-  "error.page.report.discord": "в Discord",
-  "error.page.version": "Версия: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Корневой элемент не найден. Вы забыли добавить его в index.html? Или, может быть, атрибут id был написан неправильно?",
-
-  "error.globalSync.connectFailed": "Не удалось подключиться к серверу. Запущен ли сервер по адресу `{{url}}`?",
 
   "error.startup.title": "Ошибка подключения к серверу",
 
@@ -599,32 +261,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Войдите в ChatGPT снова, затем отправьте сообщение еще раз, чтобы продолжить использование моделей Codex.",
 
-  "error.chain.unknown": "Неизвестная ошибка",
-  "error.chain.causedBy": "Причина:",
-  "error.chain.apiError": "Ошибка API",
-  "error.chain.status": "Статус: {{status}}",
-  "error.chain.retryable": "Повторная попытка: {{retryable}}",
-  "error.chain.responseBody": "Тело ответа:\n{{body}}",
-  "error.chain.didYouMean": "Возможно, вы имели в виду: {{suggestions}}",
-  "error.chain.modelNotFound": "Модель не найдена: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Проверьте названия провайдера/модели в конфиге (opencode.json)",
-  "error.chain.mcpFailed":
-    'MCP сервер "{{name}}" завершился с ошибкой. Обратите внимание, что Kilo пока не поддерживает MCP авторизацию.',
-  "error.chain.providerAuthFailed": "Ошибка аутентификации провайдера ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Не удалось инициализировать провайдера "{{provider}}". Проверьте учётные данные и конфигурацию.',
-  "error.chain.configJsonInvalid": "Конфигурационный файл по адресу {{path}} не является валидным JSON(C)",
-  "error.chain.configJsonInvalidWithMessage":
-    "Конфигурационный файл по адресу {{path}} не является валидным JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Папка "{{dir}}" в {{path}} невалидна. Переименуйте папку в "{{suggestion}}" или удалите её. Это распространённая опечатка.',
-  "error.chain.configFrontmatterError": "Не удалось разобрать frontmatter в {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Конфигурационный файл по адресу {{path}} невалиден",
-  "error.chain.configInvalidWithMessage": "Конфигурационный файл по адресу {{path}} невалиден: {{message}}",
-
   "notification.permission.title": "Требуется разрешение",
   "notification.permission.titleSubagent": "Требуется разрешение (субагент)",
-  "notification.permission.description": "{{sessionTitle}} в {{projectName}} требуется разрешение",
   "ui.permission.manageAutoApprove": "Управление правилами автоодобрения",
   "ui.permission.doomLoop.prompt":
     "Обнаружен потенциальный цикл при работе инструмента {{tool}}. Продолжить выполнение?",
@@ -650,7 +288,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Чтение списка задач",
   "ui.permission.toolLabel.todoWrite": "Запись списка задач",
   "ui.permission.toolLabel.codeSearch": "Поиск кода",
-  "ui.permission.toggleWrap": "Переключить перенос строк",
   "ui.permission.copyCommand": "Копировать",
   "ui.approval.auto": "Одобрено автоматически",
   "ui.approval.manual": "Одобрено вами",
@@ -662,46 +299,18 @@ export const dict = {
   "ui.approval.source.yolo": "режимом автоодобрения (YOLO)",
   "ui.approval.source.session": "правилом автоодобрения сессии",
   "ui.approval.source.default": "по умолчанию",
-  "notification.question.title": "Вопрос",
-  "notification.question.description": "У {{sessionTitle}} в {{projectName}} есть вопрос",
-  "notification.action.goToSession": "Перейти к сессии",
 
-  "notification.session.responseReady.title": "Ответ готов",
-  "notification.session.error.title": "Ошибка сессии",
-  "notification.session.error.fallbackDescription": "Произошла ошибка",
-
-  "home.recentProjects": "Недавние проекты",
-  "home.empty.title": "Нет недавних проектов",
-  "home.empty.description": "Начните с открытия локального проекта",
-
-  "session.tab.session": "Сессия",
   "session.tab.review": "Обзор",
-  "session.tab.context": "Контекст",
-  "session.panel.reviewAndFiles": "Обзор и файлы",
   "session.review.filesChanged": "{{count}} файлов изменено",
-  "session.review.change.one": "Изменение",
   "session.review.change.other": "Изменения",
   "session.review.loadingChanges": "Загрузка изменений...",
-  "session.review.empty": "Изменений в этой сессии пока нет",
   "session.review.noChanges": "Нет изменений",
-  "session.files.selectToOpen": "Выберите файл, чтобы открыть",
-  "session.files.all": "Все файлы",
-  "session.files.binaryContent": "Двоичный файл (содержимое не может быть отображено)",
-  "session.messages.renderEarlier": "Показать предыдущие сообщения",
   "session.messages.loadingEarlier": "Загрузка предыдущих сообщений...",
   "session.messages.loadEarlier": "Загрузить предыдущие сообщения",
   "session.messages.loading": "Загрузка сообщений...",
-  "session.messages.jumpToLatest": "Перейти к последнему",
 
-  "session.context.addToContext": "Добавить {{selection}} в контекст",
-
-  "session.new.worktree.main": "Основная ветка",
-  "session.new.worktree.mainWithBranch": "Основная ветка ({{branch}})",
-  "session.new.worktree.create": "Создать новый worktree",
-  "session.new.lastModified": "Последнее изменение",
   "sidebar.session.newSession": "Новая сессия",
   "sidebar.session.newSession.tooltip": "Начать новую беседу, сохранив текущую сессию нетронутой.",
-  "sidebar.session.newSession.disabled": "Эта сессия уже новая. Начните чат или создайте worktree.",
   "sidebar.session.newWorktree": "Новое Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Создайте изолированное git worktree для безопасных экспериментов, разделения изменений и запуска параллельных сессий без прерывания вашей текущей ветки.",
@@ -717,133 +326,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Переместить этот разговор и {{files}} измененных файлов в выделенный worktree для изолированной дальнейшей работы.",
   "sidebar.session.showChanges.tooltip.empty": "Откройте просмотр изменений, чтобы изучить текущее рабочее дерево.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 файл изменен · +{{additions}} -{{deletions}}. Открыть просмотр изменений.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} файлов изменено · +{{additions}} -{{deletions}}. Открыть просмотр изменений.",
-  "sidebar.session.agentManager.tooltip":
-    "Откройте Agent Manager для полного обзора параллельных сессий и worktree, чтобы координировать длительные задачи в одном месте.",
-  "sidebar.session.openAgentManager": "Открыть Agent Manager",
   "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",
-  "session.header.search.placeholder": "Поиск {{project}}",
-  "session.header.searchFiles": "Поиск файлов",
-  "session.header.openIn": "Открыть в",
-  "session.header.open.action": "Открыть {{app}}",
-  "session.header.open.ariaLabel": "Открыть в {{app}}",
-  "session.header.open.menu": "Параметры открытия",
-  "session.header.open.copyPath": "Копировать путь",
-
-  "status.popover.trigger": "Статус",
-  "status.popover.ariaLabel": "Настройки серверов",
-  "status.popover.tab.servers": "Серверы",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Плагины",
-  "status.popover.action.manageServers": "Управлять серверами",
-
-  "session.share.popover.title": "Опубликовать в интернете",
-  "session.share.popover.description.shared":
-    "Эта сессия общедоступна. Доступ к ней может получить любой, у кого есть ссылка.",
-  "session.share.popover.description.unshared":
-    "Опубликуйте сессию в интернете. Доступ к ней сможет получить любой, у кого есть ссылка.",
-  "session.share.action.share": "Поделиться",
-  "session.share.action.publish": "Опубликовать",
-  "session.share.action.publishing": "Публикация...",
-  "session.share.action.unpublish": "Отменить публикацию",
-  "session.share.action.unpublishing": "Отмена публикации...",
-  "session.share.action.view": "Посмотреть",
-  "session.share.copy.copied": "Скопировано",
-  "session.share.copy.copyLink": "Копировать ссылку",
-
-  "lsp.tooltip.none": "Нет LSP серверов",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Загрузка запроса...",
-  "terminal.loading": "Загрузка терминала...",
-  "terminal.title": "Терминал",
-  "terminal.title.numbered": "Терминал {{number}}",
-  "terminal.close": "Закрыть терминал",
-  "terminal.connectionLost.title": "Соединение потеряно",
-  "terminal.connectionLost.description":
-    "Соединение с терминалом прервано. Это может произойти при перезапуске сервера.",
 
   "common.closeTab": "Закрыть вкладку",
   "common.signIn": "Войти",
-  "common.signOut": "Выйти",
   "common.dismiss": "Закрыть",
   "common.requestFailed": "Запрос не выполнен",
-  "common.moreOptions": "Дополнительные опции",
-  "common.learnMore": "Подробнее",
   "common.rename": "Переименовать",
-  "common.reset": "Сбросить",
-  "common.archive": "Архивировать",
   "common.delete": "Удалить",
   "common.close": "Закрыть",
   "common.edit": "Редактировать",
   "common.loadMore": "Загрузить ещё",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Переключить меню",
-  "sidebar.nav.projectsAndSessions": "Проекты и сессии",
   "sidebar.settings": "Настройки",
-  "sidebar.help": "Помощь",
-  "sidebar.workspaces.enable": "Включить рабочие пространства",
-  "sidebar.workspaces.disable": "Отключить рабочие пространства",
-  "sidebar.gettingStarted.title": "Начало работы",
-  "sidebar.gettingStarted.line1": "Kilo включает бесплатные модели, чтобы вы могли начать сразу.",
-  "sidebar.gettingStarted.line2":
-    "Подключите любого провайдера для использования моделей, включая Claude, GPT, Gemini и др.",
-  "sidebar.project.recentSessions": "Недавние сессии",
-  "sidebar.project.viewAllSessions": "Посмотреть все сессии",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "Приложение",
-  "settings.section.server": "Сервер",
-  "settings.tab.general": "Основные",
-  "settings.tab.shortcuts": "Горячие клавиши",
-
-  "settings.general.section.appearance": "Внешний вид",
-  "settings.general.section.notifications": "Системные уведомления",
-  "settings.general.section.updates": "Обновления",
-  "settings.general.section.sounds": "Звуковые эффекты",
-
-  "settings.general.row.language.title": "Язык",
-  "settings.general.row.language.description": "Изменить язык отображения Kilo",
-  "settings.general.row.appearance.title": "Внешний вид",
-  "settings.general.row.appearance.description": "Настройте как Kilo выглядит на вашем устройстве",
-  "settings.general.row.theme.title": "Тема",
-  "settings.general.row.theme.description": "Настройте оформление Kilo.",
-  "settings.general.row.font.title": "Шрифт",
-  "settings.general.row.font.description": "Настройте моноширинный шрифт для блоков кода",
-
-  "settings.general.row.releaseNotes.title": "Примечания к выпуску",
-  "settings.general.row.releaseNotes.description": 'Показывать всплывающие окна "Что нового" после обновлений',
-
-  "settings.updates.row.startup.title": "Проверять обновления при запуске",
-  "settings.updates.row.startup.description": "Автоматически проверять обновления при запуске Kilo",
-  "settings.updates.row.check.title": "Проверить обновления",
-  "settings.updates.row.check.description": "Проверить обновления вручную и установить, если доступны",
-  "settings.updates.action.checkNow": "Проверить сейчас",
-  "settings.updates.action.checking": "Проверка...",
-  "settings.updates.toast.latest.title": "У вас последняя версия",
-  "settings.updates.toast.latest.description": "Вы используете последнюю версию Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Alert 01",
   "sound.option.alert02": "Alert 02",
   "sound.option.alert03": "Alert 03",
@@ -890,22 +391,6 @@ export const dict = {
   "sound.option.yup05": "Yup 05",
   "sound.option.yup06": "Yup 06",
 
-  "settings.general.notifications.agent.title": "Агент",
-  "settings.general.notifications.agent.description":
-    "Показывать системное уведомление когда агент завершён или требует внимания",
-  "settings.general.notifications.permissions.title": "Разрешения",
-  "settings.general.notifications.permissions.description":
-    "Показывать системное уведомление когда требуется разрешение",
-  "settings.general.notifications.errors.title": "Ошибки",
-  "settings.general.notifications.errors.description": "Показывать системное уведомление когда происходит ошибка",
-
-  "settings.general.sounds.agent.title": "Агент",
-  "settings.general.sounds.agent.description": "Воспроизводить звук когда агент завершён или требует внимания",
-  "settings.general.sounds.permissions.title": "Разрешения",
-  "settings.general.sounds.permissions.description": "Воспроизводить звук когда требуется разрешение",
-  "settings.general.sounds.errors.title": "Ошибки",
-  "settings.general.sounds.errors.description": "Воспроизводить звук когда происходит ошибка",
-
   "settings.indexing.title": "Индексация",
   "settings.indexing.enable.title": "Включить индексацию",
   "settings.indexing.enable.description": "Включить или отключить семантическую индексацию кодовой базы.",
@@ -917,8 +402,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Включить для этого проекта",
   "settings.indexing.projectEnable.description":
     "Включить индексирование для этого рабочего пространства, если глобальное индексирование отключено.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Глобальное индексирование включено, поэтому этот проект уже охвачен.",
   "settings.indexing.status.title": "Статус",
   "settings.indexing.provider.title": "Провайдер эмбеддингов",
   "settings.indexing.provider.description": "Выберите провайдера для генерации эмбеддингов при семантическом поиске.",
@@ -949,32 +432,10 @@ export const dict = {
   "settings.indexing.providerField.description": "Настройка подключения, специфичная для провайдера.",
   "settings.indexing.tuning.description": "Параметры расширенного поиска и пакетной обработки.",
 
-  "settings.shortcuts.title": "Горячие клавиши",
-  "settings.shortcuts.reset.button": "Сбросить к умолчаниям",
-  "settings.shortcuts.reset.toast.title": "Горячие клавиши сброшены",
-  "settings.shortcuts.reset.toast.description": "Горячие клавиши были сброшены к значениям по умолчанию.",
-  "settings.shortcuts.conflict.title": "Сочетание уже используется",
-  "settings.shortcuts.conflict.description": "{{keybind}} уже назначено для {{titles}}.",
-  "settings.shortcuts.unassigned": "Не назначено",
-  "settings.shortcuts.pressKeys": "Нажмите клавиши",
-  "settings.shortcuts.search.placeholder": "Поиск горячих клавиш",
-  "settings.shortcuts.search.empty": "Горячие клавиши не найдены",
-
-  "settings.shortcuts.group.general": "Основные",
-  "settings.shortcuts.group.session": "Сессия",
-  "settings.shortcuts.group.navigation": "Навигация",
-  "settings.shortcuts.group.modelAndAgent": "Модель и агент",
-  "settings.shortcuts.group.terminal": "Терминал",
-  "settings.shortcuts.group.prompt": "Запрос",
-
   "settings.providers.title": "Провайдеры",
-  "settings.providers.description": "Настройки провайдеров будут доступны здесь.",
-  "settings.providers.betaNotice":
-    "В настоящее время в интерфейсе настроек можно настроить только провайдер Kilo Gateway. Поддержка настройки других провайдеров скоро появится в период бета-тестирования. А пока вы можете настраивать провайдеров с помощью CLI или конфигурационного файла. Мы стремимся сохранить Kilo открытым — без привязки к поставщикам.",
   "settings.providers.section.connected": "Подключённые провайдеры",
   "settings.providers.connected.empty": "Нет подключённых провайдеров",
   "settings.providers.section.popular": "Популярные провайдеры",
-  "settings.providers.search.placeholder": "Поиск провайдеров",
   "settings.providers.select.placeholder": "Выберите провайдера...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "Среда",
@@ -993,7 +454,6 @@ export const dict = {
   "settings.models.hidePromptTraining.description":
     "Скрывать модели Kilo Gateway, поставщики которых могут использовать ваши запросы для обучения.",
   "settings.providers.modeModels": "Модель для режима",
-  "settings.providers.custom.note": "Добавьте пользовательского провайдера по базовому URL.",
   "settings.providers.modeModels.description":
     "Переопределите модель по умолчанию для определённых режимов. Если не задано, используется глобальная модель по умолчанию.",
   "provider.custom.title": "Пользовательский провайдер",
@@ -1060,9 +520,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Удалить модель",
   "provider.custom.models.add": "Добавить модель",
-  "provider.custom.models.fetch": "Получить модели",
-  "provider.custom.models.fetching": "Загрузка\u2026",
-  "provider.custom.models.fetch.error": "Не удалось получить модели: {{error}}",
   "provider.custom.models.fetch.authError": "Ошибка аутентификации. Проверьте API-ключ выше и попробуйте снова.",
   "provider.custom.models.fetch.empty": "На этом сервере модели не найдены.",
   "provider.custom.models.fetch.added": "Добавлено {{count}} модель(ей).",
@@ -1115,23 +572,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Устаревшая конфигурация .kilocode",
   "settings.config.source.projectOpencode": "Устаревшая конфигурация .opencode",
   "settings.models.title": "Модели",
-  "settings.models.description": "Настройки моделей будут доступны здесь.",
-  "settings.agents.title": "Агенты",
-  "settings.agents.description": "Настройки агентов будут доступны здесь.",
-  "settings.commands.title": "Команды",
-  "settings.commands.description": "Настройки команд будут доступны здесь.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "Настройки MCP будут доступны здесь.",
 
-  "settings.permissions.title": "Разрешения",
-  "settings.permissions.description": "Контролируйте какие инструменты сервер может использовать по умолчанию.",
-  "settings.permissions.section.tools": "Инструменты",
   "settings.permissions.toast.updateFailed.title": "Не удалось обновить разрешения",
 
-  "settings.permissions.action.allow": "Разрешить",
-  "settings.permissions.action.ask": "Спрашивать",
-  "settings.permissions.action.deny": "Запретить",
-
   "settings.permissions.tool.read.title": "Чтение",
   "settings.permissions.tool.read.description": "Чтение файла (по совпадению пути)",
   "settings.permissions.tool.edit.title": "Редактирование",
@@ -1166,7 +609,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "Обнаружение повторных вызовов инструментов с одинаковым вводом",
 
-  "session.delete.failed.title": "Не удалось удалить сессию",
   "session.delete.title": "Удалить сессию",
   "session.delete.confirm": 'Удалить сессию "{{name}}"?',
   "session.delete.button": "Удалить сессию",
@@ -1194,14 +636,9 @@ export const dict = {
   "feedback.dialog.support": "Служба поддержки",
   "workStyle.onboarding.welcome": "Добро пожаловать в Kilo",
   "workStyle.onboarding.title": "Выберите, как вы хотите работать",
-  "workStyle.onboarding.description":
-    "Задаёт начальные значения разрешений, блоков рассуждений, вывода терминала и временной шкалы контекста. Применяется только один раз и не затрагивает уже изменённые вами настройки.",
-  "workStyle.onboarding.skip": "Пока пропустить",
   "workStyle.onboarding.settingsNote": "Эти параметры можно изменить в любое время в разделе",
   "workStyle.onboarding.settings": "«Настройки».",
   "workStyle.toast.saved.title": "Режим успешно сохранён",
-  "workStyle.toast.saved.description": "Изменить их можно в любое время в настройках.",
-  "workStyle.toast.saved.action": "Перейти в настройки",
   "workStyle.choice.permissions": "Разрешения",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Видимость",
@@ -1226,32 +663,6 @@ export const dict = {
   "session.cloud.import.legacy": "Похоже, это устаревшая сессия, которая больше не поддерживается.",
   "session.cloud.import.failed": "Не удалось импортировать облачную сессию",
 
-  "workspace.new": "Новое рабочее пространство",
-  "workspace.type.local": "локальное",
-  "workspace.type.sandbox": "песочница",
-  "workspace.create.failed.title": "Не удалось создать рабочее пространство",
-  "workspace.delete.failed.title": "Не удалось удалить рабочее пространство",
-  "workspace.resetting.title": "Сброс рабочего пространства",
-  "workspace.resetting.description": "Это может занять минуту.",
-  "workspace.reset.failed.title": "Не удалось сбросить рабочее пространство",
-  "workspace.reset.success.title": "Рабочее пространство сброшено",
-  "workspace.reset.success.description": "Рабочее пространство теперь соответствует ветке по умолчанию.",
-  "workspace.error.stillPreparing": "Рабочее пространство всё ещё готовится",
-  "workspace.status.checking": "Проверка наличия неслитых изменений...",
-  "workspace.status.error": "Не удалось проверить статус git.",
-  "workspace.status.clean": "Неслитые изменения не обнаружены.",
-  "workspace.status.dirty": "Обнаружены неслитые изменения в этом рабочем пространстве.",
-  "workspace.delete.title": "Удалить рабочее пространство",
-  "workspace.delete.confirm": 'Удалить рабочее пространство "{{name}}"?',
-  "workspace.delete.button": "Удалить рабочее пространство",
-  "workspace.reset.title": "Сбросить рабочее пространство",
-  "workspace.reset.confirm": 'Сбросить рабочее пространство "{{name}}"?',
-  "workspace.reset.button": "Сбросить рабочее пространство",
-  "workspace.reset.archived.none": "Никакие активные сессии не будут архивированы.",
-  "workspace.reset.archived.one": "1 сессия будет архивирована.",
-  "workspace.reset.archived.many": "{{count}} сессий будет архивировано.",
-  "workspace.reset.note": "Рабочее пространство будет сброшено в соответствие с веткой по умолчанию.",
-
   "deviceAuth.toast.urlCopied": "URL скопирован в буфер обмена",
   "deviceAuth.toast.codeCopied": "Код скопирован в буфер обмена",
   "deviceAuth.toast.errorCopied": "Ошибка скопирована в буфер обмена",
@@ -1289,7 +700,6 @@ export const dict = {
   "profile.pass.renews": "Продлевается",
   "profile.action.logout": "Выйти",
 
-  "settings.section.configuration": "Конфигурация",
   "settings.agentBehaviour.title": "Поведение агента",
   "settings.autoApprove.title": "Автоодобрение",
   "settings.browser.title": "Браузер",
@@ -1305,7 +715,6 @@ export const dict = {
   "settings.language.title": "Язык",
   "settings.aboutKiloCode.title": "О Kilo Code",
 
-  "session.messages.empty": "Начните разговор, введя сообщение ниже.",
   "session.messages.welcome":
     "Kilo Code — это AI-помощник для программирования. Попросите его создать функции, исправить ошибки или объяснить вашу кодовую базу.",
   "session.messages.scrollToBottom": "Прокрутить вниз",
@@ -1313,7 +722,6 @@ export const dict = {
   "session.messages.taskStarting": "Запуск...",
   "session.status.writingResponse": "Пишу ответ…",
   "session.status.retry": "Повторная попытка…",
-  "session.status.retrying": "Повторная попытка ({{ attempt }})… {{ message }}",
   "session.status.working": "Работаю…",
   "session.status.offline": "Сеть отключена — переподключение...",
   "session.outcome.incomplete": "Раунд завершен, осталось задач: {{count}}",
@@ -1345,11 +753,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} предыдущих сессий",
   "context.stats.thisSession": "Эта сессия",
 
-  "time.justNow": "только что",
-  "time.minutesAgo": "{{count}} мин. назад",
-  "time.hoursAgo": "{{count}} ч. назад",
-  "time.daysAgo": "{{count}} дн. назад",
-  "time.monthsAgo": "{{count}} мес. назад",
   "time.today": "Сегодня",
   "time.yesterday": "Вчера",
   "time.thisWeek": "На этой неделе",
@@ -1365,7 +768,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Порт:",
   "settings.aboutKiloCode.versionInfo": "Информация о версии",
   "settings.aboutKiloCode.version.label": "Версия:",
-  "settings.aboutKiloCode.extensionName": "Расширение Kilo Code",
   "settings.aboutKiloCode.community": "Сообщество и поддержка",
   "settings.aboutKiloCode.feedback.prefix": "Если у вас есть вопросы или отзывы, создайте issue на",
   "settings.aboutKiloCode.feedback.or": "или",
@@ -1414,7 +816,6 @@ export const dict = {
   "settings.language.current": "Текущий:",
 
   "common.add": "Добавить",
-  "common.choose": "Выбрать…",
 
   "settings.autocomplete.autoTrigger.title": "Включить автоматическое встроенное дополнение",
   "settings.autocomplete.autoTrigger.description": "Автоматически показывать предложения дополнения при вводе",
@@ -1423,28 +824,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "Включить автодополнение чата",
   "settings.autocomplete.chatAutocomplete.description": "Показывать предложения автодополнения в поле чата",
   "settings.autocomplete.modelsHint": "Чтобы выбрать модель для автодополнения, см. настройки Моделей.",
-  "settings.notifications.agent.title": "Завершение агента",
-  "settings.notifications.agent.description": "Показать уведомление при завершении задачи агентом",
-  "settings.notifications.permissions.title": "Запросы разрешений",
-  "settings.notifications.permissions.description": "Показать уведомление при запросах разрешений",
-  "settings.notifications.errors.title": "Ошибки",
-  "settings.notifications.errors.description": "Показать уведомление при ошибках",
   "settings.notifications.sounds": "Звуки",
   "settings.notifications.enable.title": "Включить звуковые уведомления",
   "settings.notifications.enable.description":
     "Воспроизводить звуки при завершении сеансов, возникновении ошибки или необходимости вашего участия",
   "settings.notifications.testSound": "Тест",
-  "settings.notifications.agentSound.title": "Звук завершения агента",
-  "settings.notifications.agentSound.description": "Звук при завершении агента",
-  "settings.notifications.permSound.title": "Звук запроса разрешений",
-  "settings.notifications.permSound.description": "Звук при запросах разрешений",
-  "settings.notifications.errorSound.title": "Звук ошибки",
-  "settings.notifications.errorSound.description": "Звук при ошибках",
   "settings.notifications.sound.default": "По умолчанию",
   "settings.notifications.sound.system": "Системный",
   "settings.notifications.sound.description":
     "По умолчанию для завершения, запроса вашего участия и ошибок используются разные звуки. В остальных вариантах для всех событий используется один и тот же звук.",
-  "settings.notifications.sound.none": "Нет",
   "settings.experimental.share.title": "Режим обмена",
   "settings.experimental.share.description": "Поведение обмена сессиями",
   "settings.experimental.share.manual": "Вручную",
@@ -1464,9 +852,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Модель генерации изображений",
   "settings.experimental.imageGenerationModel.placeholder": "По умолчанию (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Речь в текст",
-  "settings.experimental.speechToText.description":
-    "Включите голосовой ввод в полях запросов, используя вашу учетную запись Kilo через Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Включите провайдер Kilo и выполните вход, чтобы использовать Speech to Text. В настоящее время Speech to Text поддерживается только с Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Модель речи в текст",
@@ -1507,15 +892,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Агент по умолчанию",
   "settings.agentBehaviour.defaultAgent.description": "Агент при отсутствии указания",
   "settings.agentBehaviour.availableAgents": "Доступные агенты",
-  "settings.agentBehaviour.selectAgent": "Выберите агента для настройки…",
-  "settings.agentBehaviour.selectAgent.title": "Агент",
-  "settings.agentBehaviour.selectAgent.description": "Выберите агента для настройки…",
   "settings.agentBehaviour.modelOverride.title": "Переопределение модели",
   "settings.agentBehaviour.modelOverride.description": "Переопределить модель по умолчанию для этого агента",
   "settings.agentBehaviour.variantOverride.title": "Переопределение варианта",
   "settings.agentBehaviour.variantOverride.description": "Переопределить вариант модели для этого агента",
-  "settings.agentBehaviour.prompt.title": "Пользовательский промпт",
-  "settings.agentBehaviour.prompt.description": "Дополнительный системный промпт для этого агента",
   "settings.agentBehaviour.temperature.title": "Температура",
   "settings.agentBehaviour.temperature.description":
     "Управляет степенью случайности ответов ИИ (0–2). Низкие значения (например, 0.2) дают более сфокусированный и последовательный результат. Высокие значения (например, 1.0) дают более разнообразные и творческие ответы. Оставьте поле пустым, чтобы использовать значение модели по умолчанию.",
@@ -1535,7 +915,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Обнаруженные навыки",
   "settings.agentBehaviour.noSkillsFound":
     "Навыки не обнаружены. Добавьте пути к папкам навыков или URL-адреса ниже, чтобы сделать навыки доступными.",
-  "settings.agentBehaviour.availableModes": "Доступные пользовательские режимы",
   "settings.agentBehaviour.noAgentsFound": "Агенты не найдены.",
   "settings.agentBehaviour.createMode": "Создать новый режим",
   "settings.agentBehaviour.createMode.name": "Название",
@@ -1617,11 +996,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Команда",
   "settings.agentBehaviour.mcpDetail.args": "Аргументы",
   "settings.agentBehaviour.mcpDetail.env": "Окружение",
-  "settings.agentBehaviour.mcpDetail.disabled": "Этот сервер отключён.",
   "settings.agentBehaviour.mcpBrowseMarketplace": "Обзор Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "MCP-серверы не настроены. Добавьте MCP-серверы в kilo.jsonc или попросите агента добавить их.",
-  "settings.agentBehaviour.workflowsPlaceholder": "Рабочие процессы управляются через файлы рабочих процессов.",
   "settings.agentBehaviour.workflows.description":
     "Рабочие процессы — это пользовательские слэш-команды, определённые в вашей конфигурации. Введите /command-name в чате, чтобы вызвать их. Команды настраиваются в opencode.json в разделе 'command'.",
   "settings.agentBehaviour.workflows.empty":
@@ -1714,7 +1091,6 @@ export const dict = {
     "напр., Сгенерируй commit messages на испанском языке в формате conventional commits. Верни ТОЛЬКО commit message.",
 
   "settings.commitMessage.language.sync": "Синхронизация с языком пользовательского интерфейса",
-  "settings.commitMessage.language.title": "Язык",
   "settings.commitMessage.language.description": "Выберите язык для сообщений, генерированных ИИ:",
 
   "settings.display.username.title": "Имя пользователя",
@@ -1753,8 +1129,6 @@ export const dict = {
   "settings.providers.disabled": "Отключённые провайдеры",
   "settings.providers.disabled.description": "Провайдеры для скрытия из списка",
   "settings.providers.disabled.enable": "Включить",
-  "settings.providers.enabled": "Включённые провайдеры (белый список)",
-  "settings.providers.enabled.description": "Если установлено, только эти провайдеры будут доступны",
   "settings.providers.notSet": "Не задано (использовать значение сервера по умолчанию)",
   "dialog.model.notSet": "Не задано",
   "profile.personalAccount": "Личный аккаунт",
@@ -1794,9 +1168,7 @@ export const dict = {
   "migration.migrate.title": "Перенос ваших настроек",
   "migration.migrate.subtitle": "Мы нашли настройки от вашей предыдущей установки. Вот что можно перенести.",
   "migration.migrate.selectLabel": "Выберите, что перенести",
-  "migration.migrate.cannotMigrate": "Невозможно перенести",
   "migration.migrate.chatHistory": "Сессии чата и история",
-  "migration.migrate.chatHistoryDesc": "Несовместимы с новой архитектурой",
   "migration.migrate.button": "Перенести настройки",
   "migration.migrate.skip": "Пропустить",
   "migration.migrate.keysDetected": "Обнаружено ключей: {{count}}",
@@ -1820,10 +1192,7 @@ export const dict = {
     "Это удалит старые настройки из хранилища VS Code. Вы не сможете запустить эту миграцию повторно.",
   "migration.complete.done": "Готово",
   "migration.migrate.sessionsDetected": "Обнаружено {{count}} сеансов",
-  "migration.error.sessionFailed": "Не удалось перенести сеанс",
   "migration.error.continue": "Продолжить",
-  "migration.error.action.copy": "Копировать",
-  "migration.error.toast.copied": "Ошибка скопирована в буфер обмена",
 
   "migration.sessionSummary.title": "Сводка:",
   "migration.sessionSummary.copy": "Скопировать отчёт",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index 84f774e2070..a6f5e657eeb 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -52,85 +52,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "แนะนำ",
-  "command.category.view": "มุมมอง",
-  "command.category.project": "โปรเจกต์",
-  "command.category.provider": "ผู้ให้บริการ",
-  "command.category.server": "เซิร์ฟเวอร์",
-  "command.category.session": "เซสชัน",
-  "command.category.theme": "ธีม",
-  "command.category.language": "ภาษา",
-  "command.category.file": "ไฟล์",
-  "command.category.context": "บริบท",
-  "command.category.terminal": "เทอร์มินัล",
-  "command.category.model": "โมเดล",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "เอเจนต์",
-  "command.category.permissions": "สิทธิ์",
-  "command.category.workspace": "พื้นที่ทำงาน",
-  "command.category.settings": "การตั้งค่า",
 
-  "theme.scheme.system": "ระบบ",
-  "theme.scheme.light": "สว่าง",
-  "theme.scheme.dark": "มืด",
-
-  "command.sidebar.toggle": "สลับแถบข้าง",
-  "command.project.open": "เปิดโปรเจกต์",
   "command.provider.connect": "เชื่อมต่อผู้ให้บริการ",
-  "command.server.switch": "สลับเซิร์ฟเวอร์",
-  "command.settings.open": "เปิดการตั้งค่า",
-  "command.session.previous": "เซสชันก่อนหน้า",
-  "command.session.next": "เซสชันถัดไป",
-  "command.session.previous.unseen": "เซสชันที่ยังไม่ได้อ่านก่อนหน้า",
-  "command.session.next.unseen": "เซสชันที่ยังไม่ได้อ่านถัดไป",
-  "command.session.archive": "จัดเก็บเซสชัน",
-
-  "command.palette": "คำสั่งค้นหา",
-
-  "command.theme.cycle": "เปลี่ยนธีม",
-  "command.theme.set": "ใช้ธีม: {{theme}}",
-  "command.theme.scheme.cycle": "เปลี่ยนโทนสี",
-  "command.theme.scheme.set": "ใช้โทนสี: {{scheme}}",
-
-  "command.language.cycle": "เปลี่ยนภาษา",
-  "command.language.set": "ใช้ภาษา: {{language}}",
 
   "command.session.new": "เซสชันใหม่",
-  "command.session.new.task": "งานใหม่",
   "command.session.show.changes": "แสดงการเปลี่ยนแปลง",
-  "command.file.open": "เปิดไฟล์",
-  "command.tab.close": "ปิดแท็บ",
-  "command.context.addSelection": "เพิ่มส่วนที่เลือกไปยังบริบท",
-  "command.context.addSelection.description": "เพิ่มบรรทัดที่เลือกจากไฟล์ปัจจุบัน",
-  "command.terminal.toggle": "สลับเทอร์มินัล",
-  "command.fileTree.toggle": "สลับต้นไม้ไฟล์",
   "command.review.toggle": "สลับการตรวจสอบ",
-  "command.terminal.new": "เทอร์มินัลใหม่",
-  "command.terminal.new.description": "สร้างแท็บเทอร์มินัลใหม่",
-  "command.steps.toggle": "สลับขั้นตอน",
-  "command.steps.toggle.description": "แสดงหรือซ่อนขั้นตอนสำหรับข้อความปัจจุบัน",
-  "command.message.previous": "ข้อความก่อนหน้า",
-  "command.message.previous.description": "ไปที่ข้อความผู้ใช้ก่อนหน้า",
-  "command.message.next": "ข้อความถัดไป",
-  "command.message.next.description": "ไปที่ข้อความผู้ใช้ถัดไป",
-  "command.model.choose": "เลือกโมเดล",
-  "command.model.choose.description": "เลือกโมเดลอื่น",
-  "command.mcp.toggle": "สลับ MCPs",
-  "command.mcp.toggle.description": "สลับ MCPs",
-  "command.agent.cycle": "เปลี่ยนเอเจนต์",
-  "command.agent.cycle.description": "สลับไปยังเอเจนต์ถัดไป",
-  "command.agent.cycle.reverse": "เปลี่ยนเอเจนต์ย้อนกลับ",
-  "command.agent.cycle.reverse.description": "สลับไปยังเอเจนต์ก่อนหน้า",
-  "command.model.variant.cycle": "เปลี่ยนความพยายามในการคิด",
-  "command.model.variant.cycle.description": "สลับไปยังระดับความพยายามถัดไป",
-  "command.permissions.autoaccept.enable": "ยอมรับการแก้ไขโดยอัตโนมัติ",
-  "command.permissions.autoaccept.disable": "หยุดยอมรับการแก้ไขโดยอัตโนมัติ",
-  "command.workspace.toggle": "สลับพื้นที่ทำงาน",
-  "command.workspace.toggle.description": "เปิดหรือปิดใช้งานพื้นที่ทำงานหลายรายการในแถบด้านข้าง",
-  "command.session.undo": "ยกเลิก",
-  "command.session.undo.description": "ยกเลิกข้อความล่าสุด",
-  "command.session.redo": "ทำซ้ำ",
-  "command.session.redo.description": "ทำซ้ำข้อความที่ถูกยกเลิกล่าสุด",
   "revert.banner.count_one": "ย้อนกลับ {{count}} ข้อความแล้ว",
   "revert.banner.count_other": "ย้อนกลับ {{count}} ข้อความแล้ว",
   "revert.banner.redo": "ทำซ้ำ",
@@ -145,13 +72,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "เปิดใช้งานสแนปชอต",
   "revert.disabled.agentBusy": "รอให้เอเจนต์ทำงานเสร็จ",
   "command.session.compact": "บีบอัดเซสชัน",
-  "command.session.compact.description": "สรุปเซสชันเพื่อลดขนาดบริบท",
-  "command.session.fork": "แตกแขนงจากข้อความ",
-  "command.session.fork.description": "สร้างเซสชันใหม่จากข้อความก่อนหน้า",
-  "command.session.share": "แชร์เซสชัน",
-  "command.session.share.description": "แชร์เซสชันนี้และคัดลอก URL ไปยังคลิปบอร์ด",
-  "command.session.unshare": "ยกเลิกการแชร์เซสชัน",
-  "command.session.unshare.description": "หยุดการแชร์เซสชันนี้",
   "command.session.export": "ส่งออกบันทึกเซสชัน",
 
   "agentRequirements.skill.installed": "ติดตั้งแล้ว",
@@ -178,11 +98,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "การตรวจสอบข้อกำหนดของเอเจนต์นี้ไม่ทำงานอีกต่อไป",
   "agentRequirements.error.requestFailed": "Kilo ไม่สามารถตรวจสอบข้อกำหนดของเอเจนต์ได้",
 
-  "palette.search.placeholder": "ค้นหาไฟล์ คำสั่ง และเซสชัน",
-  "palette.empty": "ไม่พบผลลัพธ์",
-  "palette.group.commands": "คำสั่ง",
-  "palette.group.files": "ไฟล์",
-
   "dialog.provider.search.placeholder": "ค้นหาผู้ให้บริการ",
   "dialog.provider.empty": "ไม่พบผู้ให้บริการ",
   "dialog.provider.group.other": "อื่น ๆ",
@@ -191,19 +106,13 @@ export const dict = {
   "dialog.model.select.title": "เลือกโมเดล",
   "dialog.model.search.placeholder": "ค้นหาโมเดล",
   "dialog.model.empty": "ไม่พบผลลัพธ์โมเดล",
-  "dialog.model.manage": "จัดการโมเดล",
-  "dialog.model.manage.description": "ปรับแต่งโมเดลที่จะปรากฏในตัวเลือกโมเดล",
   "dialog.model.select": "เลือก",
   "dialog.model.expand": "ขยาย",
   "dialog.model.collapse": "ยุบ",
 
-  "dialog.model.unpaid.freeModels.title": "โมเดลฟรีที่จัดหาให้โดย Kilo",
-  "dialog.model.unpaid.addMore.title": "เพิ่มโมเดลเพิ่มเติมจากผู้ให้บริการยอดนิยม",
-
   "dialog.provider.viewAll": "แสดงผู้ให้บริการเพิ่มเติม",
 
   "provider.connect.title": "เชื่อมต่อ {{provider}}",
-  "provider.connect.title.anthropicProMax": "เข้าสู่ระบบด้วย Claude Pro/Max",
   "provider.connect.selectMethod": "เลือกวิธีการเข้าสู่ระบบสำหรับ {{provider}}",
   "provider.connect.method.apiKey": "คีย์ API",
   "provider.connect.status.inProgress": "กำลังอนุญาต...",
@@ -230,13 +139,6 @@ export const dict = {
   "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.opencodeZen.line1":
-    "OpenCode Zen ให้คุณเข้าถึงชุดโมเดลที่เชื่อถือได้และปรับแต่งแล้วสำหรับเอเจนต์การเขียนโค้ด",
-  "provider.connect.opencodeZen.line2":
-    "ด้วยคีย์ API เดียวคุณจะได้รับการเข้าถึงโมเดล เช่น Claude, GPT, Gemini, GLM และอื่น ๆ",
-  "provider.connect.opencodeZen.visit.prefix": "เยี่ยมชม ",
-  "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " เพื่อรวบรวมคีย์ API ของคุณ",
   "provider.connect.oauth.code.visit.prefix": "เยี่ยมชม ",
   "provider.connect.oauth.code.visit.link": "ลิงก์นี้",
   "provider.connect.oauth.code.visit.suffix":
@@ -244,7 +146,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "รหัสการอนุญาต {{method}}",
   "provider.connect.oauth.code.placeholder": "รหัสการอนุญาต",
   "provider.connect.oauth.code.required": "ต้องใช้รหัสการอนุญาต",
-  "provider.connect.oauth.code.invalid": "รหัสการอนุญาตไม่ถูกต้อง",
   "provider.connect.oauth.auto.visit.prefix": "เยี่ยมชม ",
   "provider.connect.oauth.auto.visit.link": "ลิงก์นี้",
   "provider.connect.oauth.auto.visit.suffix": " และป้อนรหัสด้านล่างเพื่อเชื่อมต่อบัญชีและใช้โมเดล {{provider}} ใน Kilo",
@@ -257,28 +158,11 @@ export const dict = {
 
   "model.tag.free": "ฟรี",
   "model.tag.dataCollected": "ข้อมูลอาจถูกนำไปใช้ในการฝึก",
-  "model.tag.latest": "ล่าสุด",
   "model.group.auto": "โมเดลอัตโนมัติ",
   "model.group.recommended": "แนะนำ",
   "model.group.favorites": "รายการโปรด",
-  "model.group.collapse": "ย่อ {{group}}",
-  "model.group.expand": "ขยาย {{group}}",
   "model.favorite.add": "เพิ่มในรายการโปรด",
   "model.favorite.remove": "ลบออกจากรายการโปรด",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "ข้อความ",
-  "model.input.image": "รูปภาพ",
-  "model.input.audio": "เสียง",
-  "model.input.video": "วิดีโอ",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "อนุญาต: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "อนุญาตการใช้เหตุผล",
-  "model.tooltip.reasoning.none": "ไม่มีการใช้เหตุผล",
-  "model.tooltip.context": "ขีดจำกัดบริบท {{limit}}",
   "model.preview.label.released": "เปิดตัว",
   "model.preview.label.input": "อินพุต",
   "model.preview.label.output": "เอาต์พุต",
@@ -299,11 +183,8 @@ export const dict = {
   "model.preview.modality.video": "วิดีโอ",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "ค้นหา",
   "common.goBack": "ย้อนกลับ",
-  "common.goForward": "ไปข้างหน้า",
   "common.loading": "กำลังโหลด",
-  "common.loading.ellipsis": "...",
   "common.cancel": "ยกเลิก",
   "common.connect": "เชื่อมต่อ",
   "common.disconnect": "ยกเลิกการเชื่อมต่อ",
@@ -311,54 +192,8 @@ export const dict = {
   "common.save": "บันทึก",
   "common.saving": "กำลังบันทึก...",
   "common.default": "ค่าเริ่มต้น",
-  "common.attachment": "ไฟล์แนบ",
 
-  "prompt.placeholder.shell": "ป้อนคำสั่งเชลล์...",
-  "prompt.placeholder.normal": 'ถามอะไรก็ได้... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "สรุปความคิดเห็น…",
-  "prompt.placeholder.summarizeComment": "สรุปความคิดเห็น…",
-  "prompt.mode.shell": "เชลล์",
-  "prompt.mode.shell.exit": "กด esc เพื่อออก",
-
-  "prompt.example.1": "แก้ไข TODO ในโค้ดเบส",
-  "prompt.example.2": "เทคโนโลยีของโปรเจกต์นี้คืออะไร?",
-  "prompt.example.3": "แก้ไขการทดสอบที่เสีย",
-  "prompt.example.4": "อธิบายวิธีการทำงานของการตรวจสอบสิทธิ์",
-  "prompt.example.5": "ค้นหาและแก้ไขช่องโหว่ความปลอดภัย",
-  "prompt.example.6": "เพิ่มการทดสอบหน่วยสำหรับบริการผู้ใช้",
-  "prompt.example.7": "ปรับโครงสร้างฟังก์ชันนี้ให้อ่านง่ายขึ้น",
-  "prompt.example.8": "ข้อผิดพลาดนี้หมายความว่าอะไร?",
-  "prompt.example.9": "ช่วยฉันดีบักปัญหานี้",
-  "prompt.example.10": "สร้างเอกสาร API",
-  "prompt.example.11": "ปรับปรุงการสืบค้นฐานข้อมูล",
-  "prompt.example.12": "เพิ่มการตรวจสอบข้อมูลนำเข้า",
-  "prompt.example.13": "สร้างคอมโพเนนต์ใหม่สำหรับ...",
-  "prompt.example.14": "ฉันจะทำให้โปรเจกต์นี้ทำงานได้อย่างไร?",
-  "prompt.example.15": "ตรวจสอบโค้ดของฉันเพื่อแนวทางปฏิบัติที่ดีที่สุด",
-  "prompt.example.16": "เพิ่มการจัดการข้อผิดพลาดในฟังก์ชันนี้",
-  "prompt.example.17": "อธิบายรูปแบบ regex นี้",
-  "prompt.example.18": "แปลงสิ่งนี้เป็น TypeScript",
-  "prompt.example.19": "เพิ่มการบันทึกทั่วทั้งโค้ดเบส",
-  "prompt.example.20": "มีการพึ่งพาอะไรที่ล้าสมัยอยู่?",
-  "prompt.example.21": "ช่วยฉันเขียนสคริปต์การย้ายข้อมูล",
-  "prompt.example.22": "ใช้งานแคชสำหรับจุดสิ้นสุดนี้",
-  "prompt.example.23": "เพิ่มการแบ่งหน้าในรายการนี้",
-  "prompt.example.24": "สร้างคำสั่ง CLI สำหรับ...",
-  "prompt.example.25": "ตัวแปรสภาพแวดล้อมทำงานอย่างไรที่นี่?",
-
-  "prompt.popover.emptyResults": "ไม่พบผลลัพธ์ที่ตรงกัน",
-  "prompt.popover.emptyCommands": "ไม่พบคำสั่งที่ตรงกัน",
-  "prompt.dropzone.label": "วางรูปภาพหรือ PDF ที่นี่",
-  "prompt.slash.badge.custom": "กำหนดเอง",
-  "prompt.slash.badge.skill": "skill",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "ใช้งานอยู่",
-  "prompt.context.includeActiveFile": "รวมไฟล์ที่ใช้งานอยู่",
-  "prompt.context.removeActiveFile": "เอาไฟล์ที่ใช้งานอยู่ออกจากบริบท",
-  "prompt.context.removeFile": "เอาไฟล์ออกจากบริบท",
   "prompt.thinking.tooltip": "ความพยายามในการให้เหตุผล",
-  "prompt.action.attachFile": "แนบไฟล์",
-  "prompt.attachment.remove": "เอาไฟล์แนบออก",
   "prompt.action.send": "ส่ง",
   "prompt.action.send.blocked": "โปรดตอบหรือข้ามคำถามที่รอดำเนินการก่อน",
   "prompt.action.send.recording": "ถอดเสียงและส่ง",
@@ -398,188 +233,17 @@ export const dict = {
   "speechToText.tooltip.error": "การป้อนข้อมูลด้วยเสียงล้มเหลว คลิกเพื่อล้าง",
   "speechToText.error.title": "การป้อนข้อมูลด้วยเสียงล้มเหลว",
   "speechToText.error.loginRequired": "ลงชื่อเข้าใช้ Kilo เพื่อใช้การป้อนข้อมูลด้วยเสียง",
-  "speechToText.error.permission": "การอนุญาตเข้าถึงไมโครโฟนถูกปฏิเสธ",
-  "speechToText.error.microphone": "ไม่สามารถเริ่มต้นไมโครโฟนได้",
-  "speechToText.error.recording": "การบันทึกล้มเหลว",
-  "speechToText.error.emptyRecording": "ไม่มีการบันทึกเสียง",
   "speechToText.error.emptyTranscript": "ตรวจไม่พบเสียงพูด",
-  "speechToText.error.encoding": "ไม่สามารถเข้ารหัสการบันทึกได้",
-  "speechToText.toast.transcribed": "แทรกข้อความที่ถอดเสียงแล้ว",
 
-  "prompt.toast.pasteUnsupported.title": "การวางไม่รองรับ",
-  "prompt.toast.pasteUnsupported.description": "สามารถวางรูปภาพหรือ PDF เท่านั้น",
-  "prompt.toast.modelAgentRequired.title": "เลือกเอเจนต์และโมเดล",
-  "prompt.toast.modelAgentRequired.description": "เลือกเอเจนต์และโมเดลก่อนส่งพร้อมท์",
-  "prompt.toast.worktreeCreateFailed.title": "ไม่สามารถสร้าง worktree",
-  "prompt.toast.sessionCreateFailed.title": "ไม่สามารถสร้างเซสชัน",
-  "prompt.toast.shellSendFailed.title": "ไม่สามารถส่งคำสั่งเชลล์",
-  "prompt.toast.commandSendFailed.title": "ไม่สามารถส่งคำสั่ง",
   "prompt.toast.promptSendFailed.title": "ไม่สามารถส่งพร้อมท์",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "{{enabled}} จาก {{total}} ที่เปิดใช้งาน",
-  "dialog.mcp.empty": "ไม่มี MCP ที่กำหนดค่า",
-
-  "dialog.lsp.empty": "LSPs ตรวจจับอัตโนมัติจากประเภทไฟล์",
-  "dialog.plugins.empty": "ปลั๊กอินที่กำหนดค่าใน opencode.json",
-
   "mcp.status.connected": "เชื่อมต่อแล้ว",
   "mcp.status.failed": "ล้มเหลว",
   "mcp.status.needs_auth": "ต้องการการตรวจสอบสิทธิ์",
   "mcp.status.needs_registration": "ต้องการลงทะเบียนไคลเอนต์",
   "mcp.status.disabled": "ปิดใช้งาน",
 
-  "dialog.fork.empty": "ไม่มีข้อความให้แตกแขนง",
-
-  "dialog.directory.search.placeholder": "ค้นหาโฟลเดอร์",
-  "dialog.directory.empty": "ไม่พบโฟลเดอร์",
-
-  "dialog.server.title": "เซิร์ฟเวอร์",
-  "dialog.server.description": "สลับเซิร์ฟเวอร์ Kilo ที่แอปนี้เชื่อมต่อด้วย",
-  "dialog.server.search.placeholder": "ค้นหาเซิร์ฟเวอร์",
-  "dialog.server.empty": "ยังไม่มีเซิร์ฟเวอร์",
-  "dialog.server.add.title": "เพิ่มเซิร์ฟเวอร์",
-  "dialog.server.add.url": "URL เซิร์ฟเวอร์",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์",
-  "dialog.server.add.checking": "กำลังตรวจสอบ...",
-  "dialog.server.add.button": "เพิ่มเซิร์ฟเวอร์",
-  "dialog.server.default.title": "เซิร์ฟเวอร์เริ่มต้น",
-  "dialog.server.default.description":
-    "เชื่อมต่อกับเซิร์ฟเวอร์นี้เมื่อเปิดแอปแทนการเริ่มเซิร์ฟเวอร์ในเครื่อง ต้องรีสตาร์ท",
-  "dialog.server.default.none": "ไม่ได้เลือกเซิร์ฟเวอร์",
-  "dialog.server.default.set": "ตั้งเซิร์ฟเวอร์ปัจจุบันเป็นค่าเริ่มต้น",
-  "dialog.server.default.clear": "ล้าง",
-  "dialog.server.action.remove": "เอาเซิร์ฟเวอร์ออก",
-
-  "dialog.server.menu.edit": "แก้ไข",
-  "dialog.server.menu.default": "ตั้งเป็นค่าเริ่มต้น",
-  "dialog.server.menu.defaultRemove": "เอาค่าเริ่มต้นออก",
-  "dialog.server.menu.delete": "ลบ",
-  "dialog.server.current": "เซิร์ฟเวอร์ปัจจุบัน",
-  "dialog.server.status.default": "ค่าเริ่มต้น",
-
-  "dialog.project.edit.title": "แก้ไขโปรเจกต์",
-  "dialog.project.edit.name": "ชื่อ",
-  "dialog.project.edit.icon": "ไอคอน",
-  "dialog.project.edit.icon.alt": "ไอคอนโปรเจกต์",
-  "dialog.project.edit.icon.hint": "คลิกหรือลากรูปภาพ",
-  "dialog.project.edit.icon.recommended": "แนะนำ: 128x128px",
-  "dialog.project.edit.color": "สี",
-  "dialog.project.edit.color.select": "เลือกสี {{color}}",
-  "dialog.project.edit.worktree.startup": "สคริปต์เริ่มต้นพื้นที่ทำงาน",
-  "dialog.project.edit.worktree.startup.description": "ทำงานหลังจากสร้างพื้นที่ทำงานใหม่ (worktree)",
-  "dialog.project.edit.worktree.startup.placeholder": "เช่น bun install",
-
-  "context.breakdown.title": "การแบ่งบริบท",
-  "context.breakdown.note": 'การแบ่งโดยประมาณของโทเค็นนำเข้า "อื่น ๆ" รวมถึงคำนิยามเครื่องมือและโอเวอร์เฮด',
-  "context.breakdown.system": "ระบบ",
-  "context.breakdown.user": "ผู้ใช้",
-  "context.breakdown.assistant": "ผู้ช่วย",
-  "context.breakdown.tool": "การเรียกเครื่องมือ",
-  "context.breakdown.other": "อื่น ๆ",
-
-  "context.systemPrompt.title": "พร้อมท์ระบบ",
-  "context.rawMessages.title": "ข้อความดิบ",
-
-  "context.stats.session": "เซสชัน",
-  "context.stats.messages": "ข้อความ",
-  "context.stats.provider": "ผู้ให้บริการ",
-  "context.stats.model": "โมเดล",
-  "context.stats.limit": "ขีดจำกัดบริบท",
-  "context.stats.totalTokens": "โทเค็นทั้งหมด",
-  "context.stats.usage": "การใช้งาน",
-  "context.stats.inputTokens": "โทเค็นนำเข้า",
-  "context.stats.outputTokens": "โทเค็นส่งออก",
-  "context.stats.reasoningTokens": "โทเค็นการใช้เหตุผล",
-  "context.stats.cacheTokens": "โทเค็นแคช (อ่าน/เขียน)",
-  "context.stats.userMessages": "ข้อความผู้ใช้",
-  "context.stats.assistantMessages": "ข้อความผู้ช่วย",
-  "context.stats.totalCost": "ต้นทุนทั้งหมด",
-  "context.stats.sessionCreated": "สร้างเซสชันเมื่อ",
-  "context.stats.lastActivity": "กิจกรรมล่าสุด",
-
-  "context.usage.tokens": "โทเค็น",
-  "context.usage.usage": "การใช้งาน",
-  "context.usage.cost": "ต้นทุน",
-  "context.usage.clickToView": "คลิกเพื่อดูบริบท",
-  "context.usage.view": "ดูการใช้บริบท",
-
-  "toast.language.title": "ภาษา",
-  "toast.language.description": "สลับไปที่ {{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "สลับธีมแล้ว",
-  "toast.scheme.title": "โทนสี",
-
-  "toast.permissions.autoaccept.on.title": "กำลังยอมรับการแก้ไขโดยอัตโนมัติ",
-  "toast.permissions.autoaccept.on.description": "สิทธิ์การแก้ไขและจะได้รับเขียนการอนุมัติโดยอัตโนมัติ",
-  "toast.permissions.autoaccept.off.title": "หยุดยอมรับการแก้ไขโดยอัตโนมัติ",
-  "toast.permissions.autoaccept.off.description": "สิทธิ์การแก้ไขและเขียนจะต้องได้รับการอนุมัติ",
-
-  "toast.workspace.enabled.title": "เปิดใช้งานพื้นที่ทำงานแล้ว",
-  "toast.workspace.enabled.description": "ตอนนี้จะแสดง worktree หลายรายการในแถบด้านข้าง",
-  "toast.workspace.disabled.title": "ปิดใช้งานพื้นที่ทำงานแล้ว",
-  "toast.workspace.disabled.description": "จะแสดงเฉพาะ worktree หลักในแถบด้านข้าง",
-
-  "toast.model.none.title": "ไม่ได้เลือกโมเดล",
-  "toast.model.none.description": "เชื่อมต่อผู้ให้บริการเพื่อสรุปเซสชันนี้",
-
-  "toast.file.loadFailed.title": "ไม่สามารถโหลดไฟล์",
-  "toast.file.listFailed.title": "ไม่สามารถแสดงรายการไฟล์",
-
-  "toast.context.noLineSelection.title": "ไม่มีการเลือกบรรทัด",
-  "toast.context.noLineSelection.description": "เลือกช่วงบรรทัดในแท็บไฟล์ก่อน",
-
-  "toast.session.share.copyFailed.title": "ไม่สามารถคัดลอก URL ไปยังคลิปบอร์ด",
-  "toast.session.share.success.title": "แชร์เซสชันแล้ว",
-  "toast.session.share.success.description": "คัดลอก URL แชร์ไปยังคลิปบอร์ดแล้ว!",
-  "toast.session.share.failed.title": "ไม่สามารถแชร์เซสชัน",
-  "toast.session.share.failed.description": "เกิดข้อผิดพลาดระหว่างการแชร์เซสชัน",
-
-  "toast.session.unshare.success.title": "ยกเลิกการแชร์เซสชันแล้ว",
-  "toast.session.unshare.success.description": "ยกเลิกการแชร์เซสชันสำเร็จ!",
-  "toast.session.unshare.failed.title": "ไม่สามารถยกเลิกการแชร์เซสชัน",
-  "toast.session.unshare.failed.description": "เกิดข้อผิดพลาดระหว่างการยกเลิกการแชร์เซสชัน",
-
   "toast.session.rename.invalid.title": "ชื่อเซสชันไม่ถูกต้อง",
-  "toast.session.listFailed.title": "ไม่สามารถโหลดเซสชันสำหรับ {{project}}",
-
-  "toast.update.title": "มีการอัปเดต",
-  "toast.update.description": "เวอร์ชันใหม่ของ Kilo ({{version}}) พร้อมใช้งานสำหรับติดตั้ง",
-  "toast.update.action.installRestart": "ติดตั้งและรีสตาร์ท",
-  "toast.update.action.notYet": "ยังไม่",
-
-  "error.page.title": "เกิดข้อผิดพลาด",
-  "error.page.description": "เกิดข้อผิดพลาดระหว่างการโหลดแอปพลิเคชัน",
-  "error.page.details.label": "รายละเอียดข้อผิดพลาด",
-  "error.page.action.restart": "รีสตาร์ท",
-  "error.page.action.checking": "กำลังตรวจสอบ...",
-  "error.page.action.checkUpdates": "ตรวจสอบการอัปเดต",
-  "error.page.action.updateTo": "อัปเดตเป็น {{version}}",
-  "error.page.report.prefix": "โปรดรายงานข้อผิดพลาดนี้ให้ทีม Kilo",
-  "error.page.report.discord": "บน Discord",
-  "error.page.version": "เวอร์ชัน: {{version}}",
-
-  "error.dev.rootNotFound": "ไม่พบองค์ประกอบรูท คุณลืมเพิ่มใน index.html หรือบางทีแอตทริบิวต์ id อาจสะกดผิด?",
-
-  "error.globalSync.connectFailed": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ มีเซิร์ฟเวอร์ทำงานอยู่ที่ `{{url}}` หรือไม่?",
 
   "error.startup.title": "การเชื่อมต่อเซิร์ฟเวอร์ล้มเหลว",
 
@@ -597,29 +261,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "เข้าสู่ระบบ ChatGPT อีกครั้ง จากนั้นส่งข้อความของคุณใหม่เพื่อใช้งานโมเดล Codex ต่อไป",
 
-  "error.chain.unknown": "ข้อผิดพลาดที่ไม่รู้จัก",
-  "error.chain.causedBy": "สาเหตุ:",
-  "error.chain.apiError": "ข้อผิดพลาด API",
-  "error.chain.status": "สถานะ: {{status}}",
-  "error.chain.retryable": "สามารถลองใหม่: {{retryable}}",
-  "error.chain.responseBody": "เนื้อหาการตอบสนอง:\n{{body}}",
-  "error.chain.didYouMean": "คุณหมายถึง: {{suggestions}}",
-  "error.chain.modelNotFound": "ไม่พบโมเดล: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "ตรวจสอบการกำหนดค่าของคุณ (opencode.json) ชื่อผู้ให้บริการ/โมเดล",
-  "error.chain.mcpFailed": 'เซิร์ฟเวอร์ MCP "{{name}}" ล้มเหลว โปรดทราบว่า Kilo ยังไม่รองรับการตรวจสอบสิทธิ์ MCP',
-  "error.chain.providerAuthFailed": "การตรวจสอบสิทธิ์ผู้ให้บริการล้มเหลว ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed": 'ไม่สามารถเริ่มต้นผู้ให้บริการ "{{provider}}" ตรวจสอบข้อมูลรับรองและการกำหนดค่า',
-  "error.chain.configJsonInvalid": "ไฟล์กำหนดค่าที่ {{path}} ไม่ใช่ JSON(C) ที่ถูกต้อง",
-  "error.chain.configJsonInvalidWithMessage": "ไฟล์กำหนดค่าที่ {{path}} ไม่ใช่ JSON(C) ที่ถูกต้อง: {{message}}",
-  "error.chain.configDirectoryTypo":
-    'ไดเรกทอรี "{{dir}}" ใน {{path}} ไม่ถูกต้อง เปลี่ยนชื่อไดเรกทอรีเป็น "{{suggestion}}" หรือเอาออก นี่เป็นการสะกดผิดทั่วไป',
-  "error.chain.configFrontmatterError": "ไม่สามารถแยกวิเคราะห์ frontmatter ใน {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "ไฟล์กำหนดค่าที่ {{path}} ไม่ถูกต้อง",
-  "error.chain.configInvalidWithMessage": "ไฟล์กำหนดค่าที่ {{path}} ไม่ถูกต้อง: {{message}}",
-
   "notification.permission.title": "ต้องการสิทธิ์",
   "notification.permission.titleSubagent": "ต้องการสิทธิ์ (ตัวแทนย่อย)",
-  "notification.permission.description": "{{sessionTitle}} ใน {{projectName}} ต้องการสิทธิ์",
   "ui.permission.manageAutoApprove": "จัดการกฎการอนุมัติอัตโนมัติ",
   "ui.permission.doomLoop.prompt": "ตรวจพบการวนซ้ำที่อาจเกิดขึ้นในเครื่องมือ {{tool}} ต้องการดำเนินการต่อหรือไม่",
   "ui.permission.doomLoop.rule": "เรียกใช้ {{tool}} ต่อไป",
@@ -644,7 +287,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "อ่านรายการงาน",
   "ui.permission.toolLabel.todoWrite": "เขียนรายการงาน",
   "ui.permission.toolLabel.codeSearch": "ค้นหาโค้ด",
-  "ui.permission.toggleWrap": "สลับการตัดคำ",
   "ui.permission.copyCommand": "คัดลอก",
   "ui.approval.auto": "อนุมัติอัตโนมัติ",
   "ui.approval.manual": "คุณเป็นผู้อนุมัติ",
@@ -656,48 +298,19 @@ export const dict = {
   "ui.approval.source.yolo": "โดยโหมดอนุมัติอัตโนมัติ (YOLO)",
   "ui.approval.source.session": "โดยกฎอนุมัติอัตโนมัติของเซสชัน",
   "ui.approval.source.default": "ตามค่าเริ่มต้น",
-  "notification.question.title": "คำถาม",
-  "notification.question.description": "{{sessionTitle}} ใน {{projectName}} มีคำถาม",
-  "notification.action.goToSession": "ไปที่เซสชัน",
 
-  "notification.session.responseReady.title": "การตอบสนองพร้อม",
-  "notification.session.error.title": "ข้อผิดพลาดเซสชัน",
-  "notification.session.error.fallbackDescription": "เกิดข้อผิดพลาด",
-
-  "home.recentProjects": "โปรเจกต์ล่าสุด",
-  "home.empty.title": "ไม่มีโปรเจกต์ล่าสุด",
-  "home.empty.description": "เริ่มต้นโดยเปิดโปรเจกต์ในเครื่อง",
-
-  "session.tab.session": "เซสชัน",
   "session.tab.review": "ตรวจสอบ",
-  "session.tab.context": "บริบท",
-  "session.panel.reviewAndFiles": "ตรวจสอบและไฟล์",
   "session.review.filesChanged": "{{count}} ไฟล์ที่เปลี่ยนแปลง",
-  "session.review.change.one": "การเปลี่ยนแปลง",
   "session.review.change.other": "การเปลี่ยนแปลง",
   "session.review.loadingChanges": "กำลังโหลดการเปลี่ยนแปลง...",
-  "session.review.empty": "ยังไม่มีการเปลี่ยนแปลงในเซสชันนี้",
   "session.review.noChanges": "ไม่มีการเปลี่ยนแปลง",
 
-  "session.files.selectToOpen": "เลือกไฟล์เพื่อเปิด",
-  "session.files.all": "ไฟล์ทั้งหมด",
-  "session.files.binaryContent": "ไฟล์ไบนารี (ไม่สามารถแสดงเนื้อหาได้)",
-
-  "session.messages.renderEarlier": "แสดงข้อความก่อนหน้า",
   "session.messages.loadingEarlier": "กำลังโหลดข้อความก่อนหน้า...",
   "session.messages.loadEarlier": "โหลดข้อความก่อนหน้า",
   "session.messages.loading": "กำลังโหลดข้อความ...",
-  "session.messages.jumpToLatest": "ไปที่ล่าสุด",
 
-  "session.context.addToContext": "เพิ่ม {{selection}} ไปยังบริบท",
-
-  "session.new.worktree.main": "สาขาหลัก",
-  "session.new.worktree.mainWithBranch": "สาขาหลัก ({{branch}})",
-  "session.new.worktree.create": "สร้าง worktree ใหม่",
-  "session.new.lastModified": "แก้ไขล่าสุด",
   "sidebar.session.newSession": "เซสชันใหม่",
   "sidebar.session.newSession.tooltip": "เริ่มการสนทนาใหม่โดยที่ยังคงเซสชันปัจจุบันไว้",
-  "sidebar.session.newSession.disabled": "เซสชันนี้เป็นเซสชันใหม่อยู่แล้ว เริ่มแชทหรือสร้าง worktree แทน",
   "sidebar.session.newWorktree": "Worktree ใหม่",
   "sidebar.session.newWorktree.tooltip":
     "สร้าง git worktree ที่แยกออกมาต่างหากเพื่อทดลองอย่างปลอดภัย แยกการเปลี่ยนแปลงออกจากกัน และรันเซสชันคู่ขนานโดยไม่รบกวน branch ปัจจุบันของคุณ",
@@ -713,129 +326,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "ย้ายบทสนทนานี้และ {{files}} ไฟล์ที่ถูกแก้ไขไปยัง worktree เฉพาะสำหรับการทำงานต่อเนื่องแบบแยกส่วน",
   "sidebar.session.showChanges.tooltip.empty": "เปิดมุมมองการเปลี่ยนแปลงเพื่อตรวจสอบ working tree ปัจจุบัน",
-  "sidebar.session.showChanges.tooltip.one":
-    "เปลี่ยนแปลง 1 ไฟล์ · +{{additions}} -{{deletions}} เปิดมุมมองการเปลี่ยนแปลง",
-  "sidebar.session.showChanges.tooltip.other":
-    "เปลี่ยนแปลง {{files}} ไฟล์ · +{{additions}} -{{deletions}} เปิดมุมมองการเปลี่ยนแปลง",
-  "sidebar.session.agentManager.tooltip":
-    "เปิด Agent Manager เพื่อดูภาพรวมของเซสชันและ worktree คู่ขนาน เพื่อให้คุณสามารถประสานงานงานที่ใช้เวลานานได้ในที่เดียว",
-  "sidebar.session.openAgentManager": "เปิด Agent Manager",
   "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 ไม่สำเร็จ",
-  "session.header.search.placeholder": "ค้นหา {{project}}",
-  "session.header.searchFiles": "ค้นหาไฟล์",
-  "session.header.openIn": "เปิดใน",
-  "session.header.open.action": "เปิด {{app}}",
-  "session.header.open.ariaLabel": "เปิดใน {{app}}",
-  "session.header.open.menu": "ตัวเลือกการเปิด",
-  "session.header.open.copyPath": "คัดลอกเส้นทาง",
-
-  "status.popover.trigger": "สถานะ",
-  "status.popover.ariaLabel": "การกำหนดค่าเซิร์ฟเวอร์",
-  "status.popover.tab.servers": "เซิร์ฟเวอร์",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "ปลั๊กอิน",
-  "status.popover.action.manageServers": "จัดการเซิร์ฟเวอร์",
-
-  "session.share.popover.title": "เผยแพร่บนเว็บ",
-  "session.share.popover.description.shared": "เซสชันนี้เป็นสาธารณะบนเว็บ สามารถเข้าถึงได้โดยผู้ที่มีลิงก์",
-  "session.share.popover.description.unshared": "แชร์เซสชันสาธารณะบนเว็บ จะเข้าถึงได้โดยผู้ที่มีลิงก์",
-  "session.share.action.share": "แชร์",
-  "session.share.action.publish": "เผยแพร่",
-  "session.share.action.publishing": "กำลังเผยแพร่...",
-  "session.share.action.unpublish": "ยกเลิกการเผยแพร่",
-  "session.share.action.unpublishing": "กำลังยกเลิกการเผยแพร่...",
-  "session.share.action.view": "ดู",
-  "session.share.copy.copied": "คัดลอกแล้ว",
-  "session.share.copy.copyLink": "คัดลอกลิงก์",
-
-  "lsp.tooltip.none": "ไม่มีเซิร์ฟเวอร์ LSP",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "กำลังโหลดพร้อมท์...",
-  "terminal.loading": "กำลังโหลดเทอร์มินัล...",
-  "terminal.title": "เทอร์มินัล",
-  "terminal.title.numbered": "เทอร์มินัล {{number}}",
-  "terminal.close": "ปิดเทอร์มินัล",
-  "terminal.connectionLost.title": "การเชื่อมต่อขาดหาย",
-  "terminal.connectionLost.description": "การเชื่อมต่อเทอร์มินัลถูกขัดจังหวะ อาจเกิดขึ้นเมื่อเซิร์ฟเวอร์รีสตาร์ท",
 
   "common.closeTab": "ปิดแท็บ",
   "common.signIn": "เข้าสู่ระบบ",
-  "common.signOut": "ออกจากระบบ",
   "common.dismiss": "ปิด",
   "common.requestFailed": "คำขอล้มเหลว",
-  "common.moreOptions": "ตัวเลือกเพิ่มเติม",
-  "common.learnMore": "เรียนรู้เพิ่มเติม",
   "common.rename": "เปลี่ยนชื่อ",
-  "common.reset": "รีเซ็ต",
-  "common.archive": "จัดเก็บ",
   "common.delete": "ลบ",
   "common.close": "ปิด",
   "common.edit": "แก้ไข",
   "common.loadMore": "โหลดเพิ่มเติม",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "สลับเมนู",
-  "sidebar.nav.projectsAndSessions": "โปรเจกต์และเซสชัน",
   "sidebar.settings": "การตั้งค่า",
-  "sidebar.help": "ช่วยเหลือ",
-  "sidebar.workspaces.enable": "เปิดใช้งานพื้นที่ทำงาน",
-  "sidebar.workspaces.disable": "ปิดใช้งานพื้นที่ทำงาน",
-  "sidebar.gettingStarted.title": "เริ่มต้นใช้งาน",
-  "sidebar.gettingStarted.line1": "Kilo รวมถึงโมเดลฟรีเพื่อให้คุณเริ่มต้นได้ทันที",
-  "sidebar.gettingStarted.line2": "เชื่อมต่อผู้ให้บริการใด ๆ เพื่อใช้โมเดล รวมถึง Claude, GPT, Gemini ฯลฯ",
-  "sidebar.project.recentSessions": "เซสชันล่าสุด",
-  "sidebar.project.viewAllSessions": "ดูเซสชันทั้งหมด",
 
-  "app.name.desktop": "Kilo Desktop",
-
-  "settings.section.desktop": "เดสก์ท็อป",
-  "settings.section.server": "เซิร์ฟเวอร์",
-  "settings.tab.general": "ทั่วไป",
-  "settings.tab.shortcuts": "ทางลัด",
-
-  "settings.general.section.appearance": "รูปลักษณ์",
-  "settings.general.section.notifications": "การแจ้งเตือนระบบ",
-  "settings.general.section.updates": "การอัปเดต",
-  "settings.general.section.sounds": "เสียงเอฟเฟกต์",
-
-  "settings.general.row.language.title": "ภาษา",
-  "settings.general.row.language.description": "เปลี่ยนภาษาที่แสดงสำหรับ Kilo",
-  "settings.general.row.appearance.title": "รูปลักษณ์",
-  "settings.general.row.appearance.description": "ปรับแต่งวิธีการที่ Kilo มีลักษณะบนอุปกรณ์ของคุณ",
-  "settings.general.row.theme.title": "ธีม",
-  "settings.general.row.theme.description": "ปรับแต่งวิธีการที่ Kilo มีธีม",
-  "settings.general.row.font.title": "ฟอนต์",
-  "settings.general.row.font.description": "ปรับแต่งฟอนต์โมโนที่ใช้ในบล็อกโค้ด",
-
-  "settings.general.row.releaseNotes.title": "บันทึกการอัปเดต",
-  "settings.general.row.releaseNotes.description": "แสดงป๊อปอัพ What's New หลังจากอัปเดต",
-  "settings.updates.row.startup.title": "ตรวจสอบการอัปเดตเมื่อเริ่มต้น",
-  "settings.updates.row.startup.description": "ตรวจสอบการอัปเดตโดยอัตโนมัติเมื่อ Kilo เปิดตัว",
-  "settings.updates.row.check.title": "ตรวจสอบการอัปเดต",
-  "settings.updates.row.check.description": "ตรวจสอบการอัปเดตด้วยตนเองและติดตั้งหากมี",
-  "settings.updates.action.checkNow": "ตรวจสอบเดี๋ยวนี้",
-  "settings.updates.action.checking": "กำลังตรวจสอบ...",
-  "settings.updates.toast.latest.title": "คุณใช้เวอร์ชันล่าสุดแล้ว",
-  "settings.updates.toast.latest.description": "คุณกำลังใช้ Kilo เวอร์ชันล่าสุด",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "เสียงเตือน 01",
   "sound.option.alert02": "เสียงเตือน 02",
   "sound.option.alert03": "เสียงเตือน 03",
@@ -882,20 +391,6 @@ export const dict = {
   "sound.option.yup05": "Yup 05",
   "sound.option.yup06": "Yup 06",
 
-  "settings.general.notifications.agent.title": "เอเจนต์",
-  "settings.general.notifications.agent.description": "แสดงการแจ้งเตือนระบบเมื่อเอเจนต์เสร็จสิ้นหรือต้องการความสนใจ",
-  "settings.general.notifications.permissions.title": "สิทธิ์",
-  "settings.general.notifications.permissions.description": "แสดงการแจ้งเตือนระบบเมื่อต้องการสิทธิ์",
-  "settings.general.notifications.errors.title": "ข้อผิดพลาด",
-  "settings.general.notifications.errors.description": "แสดงการแจ้งเตือนระบบเมื่อเกิดข้อผิดพลาด",
-
-  "settings.general.sounds.agent.title": "เอเจนต์",
-  "settings.general.sounds.agent.description": "เล่นเสียงเมื่อเอเจนต์เสร็จสิ้นหรือต้องการความสนใจ",
-  "settings.general.sounds.permissions.title": "สิทธิ์",
-  "settings.general.sounds.permissions.description": "เล่นเสียงเมื่อต้องการสิทธิ์",
-  "settings.general.sounds.errors.title": "ข้อผิดพลาด",
-  "settings.general.sounds.errors.description": "เล่นเสียงเมื่อเกิดข้อผิดพลาด",
-
   "settings.indexing.title": "การสร้างดัชนี",
   "settings.indexing.enable.title": "เปิดใช้งานการสร้างดัชนี",
   "settings.indexing.enable.description": "เปิดหรือปิดการสร้างดัชนีโค้ดเบสเชิงความหมาย",
@@ -907,7 +402,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "เปิดใช้งานสำหรับโปรเจกต์นี้",
   "settings.indexing.projectEnable.description":
     "เปิดใช้งานการทำดัชนีสำหรับพื้นที่ทำงานนี้เมื่อการทำดัชนีแบบโกลบอลถูกปิดใช้งาน",
-  "settings.indexing.projectEnable.disabledTooltip": "เปิดใช้งานการทำดัชนีระดับโลกแล้ว โปรเจ็กต์นี้จึงถูกรวมไว้แล้ว",
   "settings.indexing.provider.title": "ผู้ให้บริการการฝัง",
   "settings.indexing.provider.description": "เลือกผู้ให้บริการที่ใช้สร้างการฝังสำหรับการค้นหาเชิงความหมาย",
   "settings.indexing.kiloModel.title": "พรีเซ็ตโมเดล Kilo",
@@ -937,32 +431,10 @@ export const dict = {
   "settings.indexing.status.title": "สถานะ",
   "settings.indexing.tuning.description": "พารามิเตอร์การค้นหาขั้นสูงและการประมวลผลแบทช์",
 
-  "settings.shortcuts.title": "ทางลัดแป้นพิมพ์",
-  "settings.shortcuts.reset.button": "รีเซ็ตเป็นค่าเริ่มต้น",
-  "settings.shortcuts.reset.toast.title": "รีเซ็ตทางลัดแล้ว",
-  "settings.shortcuts.reset.toast.description": "รีเซ็ตทางลัดแป้นพิมพ์เป็นค่าเริ่มต้นแล้ว",
-  "settings.shortcuts.conflict.title": "ทางลัดใช้งานอยู่แล้ว",
-  "settings.shortcuts.conflict.description": "{{keybind}} ถูกกำหนดให้กับ {{titles}} แล้ว",
-  "settings.shortcuts.unassigned": "ไม่ได้กำหนด",
-  "settings.shortcuts.pressKeys": "กดปุ่ม",
-  "settings.shortcuts.search.placeholder": "ค้นหาทางลัด",
-  "settings.shortcuts.search.empty": "ไม่พบทางลัด",
-
-  "settings.shortcuts.group.general": "ทั่วไป",
-  "settings.shortcuts.group.session": "เซสชัน",
-  "settings.shortcuts.group.navigation": "การนำทาง",
-  "settings.shortcuts.group.modelAndAgent": "โมเดลและเอเจนต์",
-  "settings.shortcuts.group.terminal": "เทอร์มินัล",
-  "settings.shortcuts.group.prompt": "พร้อมท์",
-
   "settings.providers.title": "ผู้ให้บริการ",
-  "settings.providers.description": "การตั้งค่าผู้ให้บริการจะสามารถกำหนดค่าได้ที่นี่",
-  "settings.providers.betaNotice":
-    "ปัจจุบันสามารถตั้งค่าได้เฉพาะผู้ให้บริการ Kilo Gateway ในหน้าการตั้งค่าเท่านั้น การรองรับการตั้งค่าผู้ให้บริการรายอื่นจะพร้อมใช้งานในเร็วๆ นี้ในช่วงเบต้า ในระหว่างนี้คุณสามารถตั้งค่าผู้ให้บริการผ่าน CLI หรือไฟล์คอนฟิกได้ เรามุ่งมั่นที่จะรักษาให้ Kilo เปิดกว้างและไม่มีการผูกมัด",
   "settings.providers.section.connected": "ผู้ให้บริการที่เชื่อมต่อ",
   "settings.providers.connected.empty": "ไม่มีผู้ให้บริการที่เชื่อมต่อ",
   "settings.providers.section.popular": "ผู้ให้บริการยอดนิยม",
-  "settings.providers.search.placeholder": "ค้นหาผู้ให้บริการ",
   "settings.providers.select.placeholder": "เลือกผู้ให้บริการ...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "สภาพแวดล้อม",
@@ -980,7 +452,6 @@ export const dict = {
   "settings.models.hidePromptTraining.title": "ซ่อนโมเดลที่ใช้พรอมต์ในการฝึก",
   "settings.models.hidePromptTraining.description": "ซ่อนโมเดล Kilo Gateway ที่ผู้ให้บริการอาจใช้พรอมต์ของคุณในการฝึก",
   "settings.providers.modeModels": "โมเดลต่อโหมด",
-  "settings.providers.custom.note": "เพิ่มผู้ให้บริการแบบกำหนดเองด้วย Base URL",
   "settings.providers.modeModels.description":
     "แทนที่โมเดลเริ่มต้นสำหรับโหมดที่กำหนด หากไม่ได้ตั้งค่า จะใช้โมเดลเริ่มต้นทั่วไป",
   "provider.custom.title": "ผู้ให้บริการที่กำหนดเอง",
@@ -1046,9 +517,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "ลบโมเดล",
   "provider.custom.models.add": "เพิ่มโมเดล",
-  "provider.custom.models.fetch": "ดึงโมเดล",
-  "provider.custom.models.fetching": "กำลังดึง\u2026",
-  "provider.custom.models.fetch.error": "ดึงโมเดลล้มเหลว: {{error}}",
   "provider.custom.models.fetch.authError": "การยืนยันตัวตนล้มเหลว ตรวจสอบคีย์ API ด้านบนแล้วลองอีกครั้ง",
   "provider.custom.models.fetch.empty": "ไม่พบโมเดลบนเซิร์ฟเวอร์นี้",
   "provider.custom.models.fetch.added": "เพิ่มแล้ว {{count}} โมเดล",
@@ -1100,23 +568,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "การตั้งค่า .kilocode แบบเก่า",
   "settings.config.source.projectOpencode": "การตั้งค่า .opencode แบบเก่า",
   "settings.models.title": "โมเดล",
-  "settings.models.description": "การตั้งค่าโมเดลจะสามารถกำหนดค่าได้ที่นี่",
-  "settings.agents.title": "เอเจนต์",
-  "settings.agents.description": "การตั้งค่าเอเจนต์จะสามารถกำหนดค่าได้ที่นี่",
-  "settings.commands.title": "คำสั่ง",
-  "settings.commands.description": "การตั้งค่าคำสั่งจะสามารถกำหนดค่าได้ที่นี่",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "การตั้งค่า MCP จะสามารถกำหนดค่าได้ที่นี่",
 
-  "settings.permissions.title": "สิทธิ์",
-  "settings.permissions.description": "ควบคุมเครื่องมือที่เซิร์ฟเวอร์สามารถใช้โดยค่าเริ่มต้น",
-  "settings.permissions.section.tools": "เครื่องมือ",
   "settings.permissions.toast.updateFailed.title": "ไม่สามารถอัปเดตสิทธิ์",
 
-  "settings.permissions.action.allow": "อนุญาต",
-  "settings.permissions.action.ask": "ถาม",
-  "settings.permissions.action.deny": "ปฏิเสธ",
-
   "settings.permissions.tool.read.title": "อ่าน",
   "settings.permissions.tool.read.description": "อ่านไฟล์ (ตรงกับเส้นทางไฟล์)",
   "settings.permissions.tool.edit.title": "แก้ไข",
@@ -1150,7 +604,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "ตรวจจับการเรียกเครื่องมือซ้ำด้วยข้อมูลนำเข้าเหมือนกัน",
 
-  "session.delete.failed.title": "ไม่สามารถลบเซสชัน",
   "session.delete.title": "ลบเซสชัน",
   "session.delete.confirm": 'ลบเซสชัน "{{name}}" หรือไม่?',
   "session.delete.button": "ลบเซสชัน",
@@ -1178,14 +631,9 @@ export const dict = {
   "feedback.dialog.support": "ฝ่ายสนับสนุนลูกค้า",
   "workStyle.onboarding.welcome": "ยินดีต้อนรับสู่ Kilo",
   "workStyle.onboarding.title": "เลือกวิธีที่คุณต้องการทำงาน",
-  "workStyle.onboarding.description":
-    "ตั้งค่าเริ่มต้นสำหรับสิทธิ์ บล็อกการให้เหตุผล เอาต์พุตเทอร์มินัล และไทม์ไลน์บริบท การตั้งค่านี้ใช้เพียงครั้งเดียวและจะข้ามรายการที่คุณปรับแต่งไว้แล้ว",
-  "workStyle.onboarding.skip": "ข้ามไปก่อน",
   "workStyle.onboarding.settingsNote": "คุณสามารถเปลี่ยนตัวเลือกเหล่านี้ได้ทุกเมื่อใน",
   "workStyle.onboarding.settings": "การตั้งค่า",
   "workStyle.toast.saved.title": "บันทึกโหมดเรียบร้อยแล้ว",
-  "workStyle.toast.saved.description": "อัปเดตการตั้งค่าของคุณได้ทุกเมื่อในการตั้งค่า",
-  "workStyle.toast.saved.action": "ไปที่การตั้งค่า",
   "workStyle.choice.permissions": "สิทธิ์",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "การแสดงผล",
@@ -1208,32 +656,6 @@ export const dict = {
   "session.cloud.import.legacy": "นี่ดูเหมือนจะเป็นเซสชันเวอร์ชันเก่าที่ไม่รองรับอีกต่อไปแล้ว",
   "session.cloud.import.failed": "ไม่สามารถนำเข้าเซสชันคลาวด์ได้",
 
-  "workspace.new": "พื้นที่ทำงานใหม่",
-  "workspace.type.local": "ในเครื่อง",
-  "workspace.type.sandbox": "แซนด์บ็อกซ์",
-  "workspace.create.failed.title": "ไม่สามารถสร้างพื้นที่ทำงาน",
-  "workspace.delete.failed.title": "ไม่สามารถลบพื้นที่ทำงาน",
-  "workspace.resetting.title": "กำลังรีเซ็ตพื้นที่ทำงาน",
-  "workspace.resetting.description": "อาจใช้เวลาประมาณหนึ่งนาที",
-  "workspace.reset.failed.title": "ไม่สามารถรีเซ็ตพื้นที่ทำงาน",
-  "workspace.reset.success.title": "รีเซ็ตพื้นที่ทำงานแล้ว",
-  "workspace.reset.success.description": "พื้นที่ทำงานตรงกับสาขาเริ่มต้นแล้ว",
-  "workspace.error.stillPreparing": "พื้นที่ทำงานกำลังเตรียมอยู่",
-  "workspace.status.checking": "กำลังตรวจสอบการเปลี่ยนแปลงที่ไม่ได้ผสาน...",
-  "workspace.status.error": "ไม่สามารถตรวจสอบสถานะ git",
-  "workspace.status.clean": "ไม่ตรวจพบการเปลี่ยนแปลงที่ไม่ได้ผสาน",
-  "workspace.status.dirty": "ตรวจพบการเปลี่ยนแปลงที่ไม่ได้ผสานในพื้นที่ทำงานนี้",
-  "workspace.delete.title": "ลบพื้นที่ทำงาน",
-  "workspace.delete.confirm": 'ลบพื้นที่ทำงาน "{{name}}" หรือไม่?',
-  "workspace.delete.button": "ลบพื้นที่ทำงาน",
-  "workspace.reset.title": "รีเซ็ตพื้นที่ทำงาน",
-  "workspace.reset.confirm": 'รีเซ็ตพื้นที่ทำงาน "{{name}}" หรือไม่?',
-  "workspace.reset.button": "รีเซ็ตพื้นที่ทำงาน",
-  "workspace.reset.archived.none": "ไม่มีเซสชันที่ใช้งานอยู่จะถูกจัดเก็บ",
-  "workspace.reset.archived.one": "1 เซสชันจะถูกจัดเก็บ",
-  "workspace.reset.archived.many": "{{count}} เซสชันจะถูกจัดเก็บ",
-  "workspace.reset.note": "สิ่งนี้จะรีเซ็ตพื้นที่ทำงานให้ตรงกับสาขาเริ่มต้น",
-
   "deviceAuth.toast.urlCopied": "คัดลอก URL ไปยังคลิปบอร์ดแล้ว",
   "deviceAuth.toast.codeCopied": "คัดลอกรหัสไปยังคลิปบอร์ดแล้ว",
   "deviceAuth.toast.errorCopied": "คัดลอกข้อผิดพลาดไปยังคลิปบอร์ดแล้ว",
@@ -1271,7 +693,6 @@ export const dict = {
   "profile.pass.renews": "ต่ออายุ",
   "profile.action.logout": "ออกจากระบบ",
 
-  "settings.section.configuration": "การกำหนดค่า",
   "settings.agentBehaviour.title": "พฤติกรรมของเอเจนต์",
   "settings.autoApprove.title": "อนุมัติอัตโนมัติ",
   "settings.browser.title": "เบราว์เซอร์",
@@ -1287,14 +708,12 @@ export const dict = {
   "settings.language.title": "ภาษา",
   "settings.aboutKiloCode.title": "เกี่ยวกับ Kilo Code",
 
-  "session.messages.empty": "เริ่มการสนทนาโดยพิมพ์ข้อความด้านล่าง",
   "session.messages.welcome": "Kilo Code เป็นผู้ช่วยเขียนโค้ด AI ขอให้สร้างฟีเจอร์ แก้ไขบัก หรืออธิบายโค้ดเบสของคุณ",
   "session.messages.scrollToBottom": "เลื่อนไปด้านล่าง",
   "session.messages.initializing": "กำลังเริ่มต้น...",
   "session.messages.taskStarting": "กำลังเริ่มทำงาน...",
   "session.status.writingResponse": "กำลังเขียนคำตอบ...",
   "session.status.retry": "กำลังลองใหม่…",
-  "session.status.retrying": "กำลังลองใหม่ (ครั้งที่ {{ attempt }})… {{ message }}",
   "session.status.working": "กำลังทำงาน...",
   "session.status.offline": "เครือข่ายถูกตัดการเชื่อมต่อ — กำลังเชื่อมต่อใหม่...",
   "session.outcome.incomplete": "เทิร์นสิ้นสุดโดยเหลือสิ่งที่ต้องทำอีก {{count}} รายการ",
@@ -1326,11 +745,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} เซสชันก่อนหน้า",
   "context.stats.thisSession": "เซสชันนี้",
 
-  "time.justNow": "เมื่อสักครู่",
-  "time.minutesAgo": "{{count}} นาทีที่แล้ว",
-  "time.hoursAgo": "{{count}} ชม. ที่แล้ว",
-  "time.daysAgo": "{{count}} วันที่แล้ว",
-  "time.monthsAgo": "{{count}} เดือนที่แล้ว",
   "time.today": "วันนี้",
   "time.yesterday": "เมื่อวาน",
   "time.thisWeek": "สัปดาห์นี้",
@@ -1346,7 +760,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "พอร์ต:",
   "settings.aboutKiloCode.versionInfo": "ข้อมูลเวอร์ชัน",
   "settings.aboutKiloCode.version.label": "เวอร์ชัน:",
-  "settings.aboutKiloCode.extensionName": "ส่วนขยาย Kilo Code",
   "settings.aboutKiloCode.community": "ชุมชนและการสนับสนุน",
   "settings.aboutKiloCode.feedback.prefix": "หากคุณมีคำถามหรือข้อเสนอแนะ สามารถเปิด issue ได้ที่",
   "settings.aboutKiloCode.feedback.or": "หรือ",
@@ -1393,7 +806,6 @@ export const dict = {
   "settings.language.current": "ปัจจุบัน:",
 
   "common.add": "เพิ่ม",
-  "common.choose": "เลือก…",
 
   "settings.autocomplete.autoTrigger.title": "เปิดใช้งานการเติมอัตโนมัติแบบอินไลน์",
   "settings.autocomplete.autoTrigger.description": "แสดงข้อเสนอแนะการเติมอัตโนมัติระหว่างพิมพ์",
@@ -1402,28 +814,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "เปิดใช้งานเติมอัตโนมัติแชท",
   "settings.autocomplete.chatAutocomplete.description": "แสดงข้อเสนอแนะเติมอัตโนมัติในช่องแชท",
   "settings.autocomplete.modelsHint": "เลือกโมเดลที่ใช้สำหรับการเติมอัตโนมัติได้ที่การตั้งค่าโมเดล",
-  "settings.notifications.agent.title": "เอเจนต์เสร็จสิ้น",
-  "settings.notifications.agent.description": "แสดงการแจ้งเตือนเมื่อเอเจนต์ทำงานเสร็จ",
-  "settings.notifications.permissions.title": "คำขออนุญาต",
-  "settings.notifications.permissions.description": "แสดงการแจ้งเตือนเมื่อมีคำขออนุญาต",
-  "settings.notifications.errors.title": "ข้อผิดพลาด",
-  "settings.notifications.errors.description": "แสดงการแจ้งเตือนเมื่อเกิดข้อผิดพลาด",
   "settings.notifications.sounds": "เสียง",
   "settings.notifications.enable.title": "เปิดใช้การแจ้งเตือนด้วยเสียง",
   "settings.notifications.enable.description":
     "เล่นเสียงเมื่อเซสชันเสร็จสิ้น เกิดข้อผิดพลาด หรือต้องการให้คุณป้อนข้อมูล",
   "settings.notifications.testSound": "ทดสอบ",
-  "settings.notifications.agentSound.title": "เสียงเอเจนต์เสร็จสิ้น",
-  "settings.notifications.agentSound.description": "เสียงเมื่อเอเจนต์ทำงานเสร็จ",
-  "settings.notifications.permSound.title": "เสียงคำขออนุญาต",
-  "settings.notifications.permSound.description": "เสียงเมื่อมีคำขออนุญาต",
-  "settings.notifications.errorSound.title": "เสียงข้อผิดพลาด",
-  "settings.notifications.errorSound.description": "เสียงเมื่อเกิดข้อผิดพลาด",
   "settings.notifications.sound.default": "ค่าเริ่มต้น",
   "settings.notifications.sound.system": "ระบบ",
   "settings.notifications.sound.description":
     "ค่าเริ่มต้นจะใช้เสียงที่แตกต่างกันสำหรับการเสร็จสิ้น การป้อนข้อมูล และข้อผิดพลาด ส่วนตัวเลือกอื่นจะใช้เสียงเดียวสำหรับทุกเหตุการณ์",
-  "settings.notifications.sound.none": "ไม่มี",
   "settings.experimental.share.title": "โหมดแชร์",
   "settings.experimental.share.description": "พฤติกรรมการแชร์เซสชัน",
   "settings.experimental.share.manual": "ด้วยตนเอง",
@@ -1443,9 +842,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "โมเดลการสร้างภาพ",
   "settings.experimental.imageGenerationModel.placeholder": "ค่าเริ่มต้น (Auto Router)",
 
-  "settings.experimental.speechToText.title": "แปลงเสียงเป็นข้อความ",
-  "settings.experimental.speechToText.description":
-    "เปิดใช้งานการป้อนข้อมูลด้วยเสียงในช่องพรอมต์โดยใช้บัญชี Kilo ของคุณผ่าน Kilo Gateway",
   "settings.models.speechToText.disabledDescription":
     "เปิดใช้งานและลงชื่อเข้าใช้ผู้ให้บริการ Kilo เพื่อใช้ Speech to Text ปัจจุบัน Speech to Text รองรับเฉพาะกับ Kilo Gateway เท่านั้น",
   "settings.models.speechToTextModel.title": "โมเดลแปลงเสียงเป็นข้อความ",
@@ -1486,15 +882,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "เอเจนต์เริ่มต้น",
   "settings.agentBehaviour.defaultAgent.description": "เอเจนต์ที่ใช้เมื่อไม่ได้ระบุ",
   "settings.agentBehaviour.availableAgents": "เอเจนต์ที่ใช้งานได้",
-  "settings.agentBehaviour.selectAgent": "เลือกเอเจนต์เพื่อกำหนดค่า…",
-  "settings.agentBehaviour.selectAgent.title": "เอเจนต์",
-  "settings.agentBehaviour.selectAgent.description": "เลือกเอเจนต์เพื่อกำหนดค่า…",
   "settings.agentBehaviour.modelOverride.title": "แทนที่โมเดล",
   "settings.agentBehaviour.modelOverride.description": "แทนที่โมเดลเริ่มต้นของเอเจนต์นี้",
   "settings.agentBehaviour.variantOverride.title": "แทนที่ตัวแปรโมเดล",
   "settings.agentBehaviour.variantOverride.description": "แทนที่ตัวแปรของโมเดลสำหรับเอเจนต์นี้",
-  "settings.agentBehaviour.prompt.title": "พรอมต์กำหนดเอง",
-  "settings.agentBehaviour.prompt.description": "พรอมต์ระบบเพิ่มเติมสำหรับเอเจนต์นี้",
   "settings.agentBehaviour.temperature.title": "อุณหภูมิ",
   "settings.agentBehaviour.temperature.description":
     "ควบคุมระดับความสุ่มของคำตอบจาก AI (0–2) ค่าที่ต่ำกว่า (เช่น 0.2) จะให้ผลลัพธ์ที่ตรงประเด็นและสม่ำเสมอ ส่วนค่าที่สูงกว่า (เช่น 1.0) จะให้คำตอบที่หลากหลายและสร้างสรรค์มากขึ้น เว้นว่างไว้เพื่อใช้ค่าเริ่มต้นของโมเดล",
@@ -1513,7 +904,6 @@ export const dict = {
   "settings.agentBehaviour.badge.deprecated": "เลิกใช้",
   "settings.agentBehaviour.discoveredSkills": "ทักษะที่ค้นพบ",
   "settings.agentBehaviour.noSkillsFound": "ไม่พบทักษะ เพิ่มเส้นทางโฟลเดอร์หรือ URL ด้านล่างเพื่อทำให้ทักษะพร้อมใช้งาน",
-  "settings.agentBehaviour.availableModes": "โหมดกำหนดเองที่ใช้ได้",
   "settings.agentBehaviour.noAgentsFound": "ไม่พบเอเจนต์",
   "settings.agentBehaviour.createMode": "สร้างโหมดใหม่",
   "settings.agentBehaviour.createMode.name": "ชื่อ",
@@ -1594,11 +984,9 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "คำสั่ง",
   "settings.agentBehaviour.mcpDetail.args": "อาร์กิวเมนต์",
   "settings.agentBehaviour.mcpDetail.env": "สภาพแวดล้อม",
-  "settings.agentBehaviour.mcpDetail.disabled": "เซิร์ฟเวอร์นี้ถูกปิดใช้งาน",
   "settings.agentBehaviour.mcpBrowseMarketplace": "เรียกดู Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "ไม่ได้กำหนดค่าเซิร์ฟเวอร์ MCP เพิ่มเซิร์ฟเวอร์ MCP ใน kilo.jsonc หรือขอให้เอเจนต์เพิ่มให้คุณ",
-  "settings.agentBehaviour.workflowsPlaceholder": "เวิร์กโฟลว์จัดการผ่านไฟล์เวิร์กโฟลว์ในพื้นที่ทำงาน",
   "settings.agentBehaviour.workflows.description":
     "เวิร์กโฟลว์คือคำสั่งสแลชแบบกำหนดเองที่กำหนดไว้ในการตั้งค่าของคุณ พิมพ์ /command-name ในแชทเพื่อเรียกใช้ คำสั่งถูกกำหนดค่าใน opencode.json ภายใต้ส่วน 'command'",
   "settings.agentBehaviour.workflows.empty":
@@ -1684,7 +1072,6 @@ export const dict = {
     "เช่น สร้าง commit messages เป็นภาษาสเปนตามรูปแบบ conventional commits คืนค่าเฉพาะ commit message เท่านั้น",
 
   "settings.commitMessage.language.sync": "ซิงค์กับภาษา UI",
-  "settings.commitMessage.language.title": "ภาษา",
   "settings.commitMessage.language.description": "เลือกภาษาใดที่จะใช้สําหรับข้อความ commit ที่สร้างโดย AI:",
 
   "settings.display.username.title": "ชื่อผู้ใช้",
@@ -1722,8 +1109,6 @@ export const dict = {
   "settings.providers.disabled": "ผู้ให้บริการที่ปิดใช้งาน",
   "settings.providers.disabled.description": "ผู้ให้บริการที่จะซ่อนจากรายการ",
   "settings.providers.disabled.enable": "เปิดใช้งาน",
-  "settings.providers.enabled": "ผู้ให้บริการที่เปิดใช้งาน (รายการที่อนุญาต)",
-  "settings.providers.enabled.description": "หากตั้งค่า เฉพาะผู้ให้บริการเหล่านี้เท่านั้นที่จะพร้อมใช้งาน",
   "settings.providers.notSet": "ไม่ได้ตั้งค่า (ใช้ค่าเริ่มต้นของเซิร์ฟเวอร์)",
   "dialog.model.notSet": "ไม่ได้ตั้งค่า",
   "profile.personalAccount": "บัญชีส่วนตัว",
@@ -1763,9 +1148,7 @@ export const dict = {
   "migration.migrate.title": "ย้ายการตั้งค่าของคุณ",
   "migration.migrate.subtitle": "เราพบการตั้งค่าจากการติดตั้งก่อนหน้านี้ของคุณ นี่คือสิ่งที่เราสามารถนำมาได้",
   "migration.migrate.selectLabel": "เลือกสิ่งที่จะย้าย",
-  "migration.migrate.cannotMigrate": "ไม่สามารถย้ายได้",
   "migration.migrate.chatHistory": "เซสชันแชทและประวัติ",
-  "migration.migrate.chatHistoryDesc": "เข้ากันไม่ได้กับสถาปัตยกรรมใหม่",
   "migration.migrate.button": "ย้ายการตั้งค่า",
   "migration.migrate.skip": "ข้าม",
   "migration.migrate.keysDetected": "ตรวจพบ {{count}} คีย์",
@@ -1789,10 +1172,7 @@ export const dict = {
     "การดำเนินการนี้จะลบการตั้งค่าเดิมจากที่เก็บข้อมูล VS Code คุณจะไม่สามารถเรียกใช้การย้ายข้อมูลนี้ได้อีก",
   "migration.complete.done": "เสร็จสิ้น",
   "migration.migrate.sessionsDetected": "ตรวจพบ {{count}} เซสชัน",
-  "migration.error.sessionFailed": "การย้ายเซสชันล้มเหลว",
   "migration.error.continue": "ดำเนินการต่อ",
-  "migration.error.action.copy": "คัดลอก",
-  "migration.error.toast.copied": "คัดลอกข้อผิดพลาดไปยังคลิปบอร์ดแล้ว",
 
   "migration.sessionSummary.title": "สรุป:",
   "migration.sessionSummary.copy": "คัดลอกรายงาน",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index f393398c88b..9a9da245a62 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Önerilen",
-  "command.category.view": "Görünüm",
-  "command.category.project": "Proje",
-  "command.category.provider": "Sağlayıcı",
-  "command.category.server": "Sunucu",
-  "command.category.session": "Oturum",
-  "command.category.theme": "Tema",
-  "command.category.language": "Dil",
-  "command.category.file": "Dosya",
-  "command.category.context": "Bağlam",
-  "command.category.terminal": "Terminal",
-  "command.category.model": "Model",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Ajan",
-  "command.category.permissions": "İzinler",
-  "command.category.workspace": "Çalışma Alanı",
-  "command.category.settings": "Ayarlar",
 
-  "theme.scheme.system": "Sistem",
-  "theme.scheme.light": "Açık",
-  "theme.scheme.dark": "Koyu",
-
-  "command.sidebar.toggle": "Kenar çubuğunu aç/kapat",
-  "command.project.open": "Proje aç",
   "command.provider.connect": "Sağlayıcı bağla",
-  "command.server.switch": "Sunucu değiştir",
-  "command.settings.open": "Ayarları aç",
-  "command.session.previous": "Önceki oturum",
-  "command.session.next": "Sonraki oturum",
-  "command.session.previous.unseen": "Önceki okunmamış oturum",
-  "command.session.next.unseen": "Sonraki okunmamış oturum",
-  "command.session.archive": "Oturumu arşivle",
-
-  "command.palette": "Komut paleti",
-
-  "command.theme.cycle": "Tema değiştir",
-  "command.theme.set": "Tema kullan: {{theme}}",
-  "command.theme.scheme.cycle": "Renk şemasını değiştir",
-  "command.theme.scheme.set": "Renk şeması kullan: {{scheme}}",
-
-  "command.language.cycle": "Dil değiştir",
-  "command.language.set": "Dil kullan: {{language}}",
 
   "command.session.new": "Yeni oturum",
-  "command.session.new.task": "Yeni görev",
   "command.session.show.changes": "Değişiklikleri Göster",
-  "command.file.open": "Dosya aç",
-  "command.tab.close": "Sekmeyi kapat",
-  "command.context.addSelection": "Seçimi bağlama ekle",
-  "command.context.addSelection.description": "Mevcut dosyadan seçili satırları ekle",
-  "command.terminal.toggle": "Terminali aç/kapat",
-  "command.fileTree.toggle": "Dosya ağacını aç/kapat",
   "command.review.toggle": "İncelemeyi aç/kapat",
-  "command.terminal.new": "Yeni terminal",
-  "command.terminal.new.description": "Yeni bir terminal sekmesi oluştur",
-  "command.steps.toggle": "Adımları aç/kapat",
-  "command.steps.toggle.description": "Mevcut mesaj için adımları göster veya gizle",
-  "command.message.previous": "Önceki mesaj",
-  "command.message.previous.description": "Önceki kullanıcı mesajına git",
-  "command.message.next": "Sonraki mesaj",
-  "command.message.next.description": "Sonraki kullanıcı mesajına git",
-  "command.model.choose": "Model seç",
-  "command.model.choose.description": "Farklı bir model seç",
-  "command.mcp.toggle": "MCP'leri aç/kapat",
-  "command.mcp.toggle.description": "MCP'leri aç/kapat",
-  "command.agent.cycle": "Ajan değiştir",
-  "command.agent.cycle.description": "Sonraki ajana geç",
-  "command.agent.cycle.reverse": "Ajanı geri değiştir",
-  "command.agent.cycle.reverse.description": "Önceki ajana geç",
-  "command.model.variant.cycle": "Düşünme eforu değiştir",
-  "command.model.variant.cycle.description": "Sonraki efor seviyesine geç",
-  "command.permissions.autoaccept.enable": "Düzenlemeleri otomatik kabul et",
-  "command.permissions.autoaccept.disable": "Otomatik kabulü durdur",
-  "command.workspace.toggle": "Çalışma alanlarını aç/kapat",
-  "command.workspace.toggle.description": "Kenar çubuğunda birden fazla çalışma alanını göster veya gizle",
-  "command.session.undo": "Geri al",
-  "command.session.undo.description": "Son mesajı geri al",
-  "command.session.redo": "Yinele",
-  "command.session.redo.description": "Son geri alınan mesajı yinele",
   "revert.banner.count_one": "{{count}} mesaj geri alındı",
   "revert.banner.count_other": "{{count}} mesaj geri alındı",
   "revert.banner.redo": "Yinele",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Anlık Görüntüleri Etkinleştir",
   "revert.disabled.agentBusy": "Ajanın bitmesini bekleyin",
   "command.session.compact": "Oturumu sıkıştır",
-  "command.session.compact.description": "Bağlam boyutunu azaltmak için oturumu özetle",
-  "command.session.fork": "Mesajdan dallandır",
-  "command.session.fork.description": "Önceki bir mesajdan yeni oturum oluştur",
-  "command.session.share": "Oturumu paylaş",
-  "command.session.share.description": "Bu oturumu paylaş ve URL'yi panoya kopyala",
-  "command.session.unshare": "Paylaşımı kaldır",
-  "command.session.unshare.description": "Bu oturumun paylaşımını durdur",
   "command.session.export": "Oturum dökümünü dışa aktar",
 
   "agentRequirements.skill.installed": "Yüklü",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Bu ajan gereksinimi denetimi artık etkin değil.",
   "agentRequirements.error.requestFailed": "Kilo ajan gereksinimlerini denetleyemedi.",
 
-  "palette.search.placeholder": "Dosya, komut ve oturum ara",
-  "palette.empty": "Sonuç bulunamadı",
-  "palette.group.commands": "Komutlar",
-  "palette.group.files": "Dosyalar",
-
   "dialog.provider.search.placeholder": "Sağlayıcı ara",
   "dialog.provider.empty": "Sağlayıcı bulunamadı",
   "dialog.provider.group.other": "Diğer",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Model seç",
   "dialog.model.search.placeholder": "Model ara",
   "dialog.model.empty": "Model sonucu yok",
-  "dialog.model.manage": "Modelleri yönet",
-  "dialog.model.manage.description": "Model seçicide hangi modellerin görüneceğini özelleştirin.",
   "dialog.model.select": "Seç",
   "dialog.model.expand": "Genişlet",
   "dialog.model.collapse": "Daralt",
 
-  "dialog.model.unpaid.freeModels.title": "Kilo tarafından sunulan ücretsiz modeller",
-  "dialog.model.unpaid.addMore.title": "Popüler sağlayıcılardan daha fazla model ekleyin",
-
   "dialog.provider.viewAll": "Daha fazla sağlayıcı göster",
 
   "provider.connect.title": "{{provider}} bağla",
-  "provider.connect.title.anthropicProMax": "Claude Pro/Max ile giriş yap",
   "provider.connect.selectMethod": "{{provider}} için giriş yöntemini seçin.",
   "provider.connect.method.apiKey": "API anahtarı",
   "provider.connect.status.inProgress": "Yetkilendirme devam ediyor...",
@@ -231,20 +140,12 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "örn. my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI uç nokta URL'si",
   "provider.connect.azure.baseURL.placeholder": "örn. https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1":
-    "OpenCode Zen, kodlama ajanları için seçilmiş güvenilir optimize edilmiş modellere erişim sağlar.",
-  "provider.connect.opencodeZen.line2":
-    "Tek bir API anahtarıyla Claude, GPT, Gemini, GLM ve daha fazlası gibi modellere erişebilirsiniz.",
-  "provider.connect.opencodeZen.visit.prefix": "",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " adresini ziyaret ederek API anahtarınızı alın.",
   "provider.connect.oauth.code.visit.prefix": "Hesabınızı bağlamak ve Kilo'da {{provider}} modellerini kullanmak için ",
   "provider.connect.oauth.code.visit.link": "bu bağlantıya",
   "provider.connect.oauth.code.visit.suffix": " tıklayarak yetkilendirme kodunuzu alın.",
   "provider.connect.oauth.code.label": "{{method}} yetkilendirme kodu",
   "provider.connect.oauth.code.placeholder": "Yetkilendirme kodu",
   "provider.connect.oauth.code.required": "Yetkilendirme kodu gerekli",
-  "provider.connect.oauth.code.invalid": "Geçersiz yetkilendirme kodu",
   "provider.connect.oauth.auto.visit.prefix": "",
   "provider.connect.oauth.auto.visit.link": "Bu bağlantıya",
   "provider.connect.oauth.auto.visit.suffix":
@@ -258,28 +159,11 @@ export const dict = {
 
   "model.tag.free": "Ücretsiz",
   "model.tag.dataCollected": "Veriler eğitim için kullanılabilir",
-  "model.tag.latest": "En yeni",
   "model.group.auto": "Otomatik Modeller",
   "model.group.recommended": "Önerilen",
   "model.group.favorites": "Favoriler",
-  "model.group.collapse": "{{group}} grubunu daralt",
-  "model.group.expand": "{{group}} grubunu genişlet",
   "model.favorite.add": "Favorilere ekle",
   "model.favorite.remove": "Favorilerden çıkar",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "metin",
-  "model.input.image": "görsel",
-  "model.input.audio": "ses",
-  "model.input.video": "video",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Kabul eder: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Akıl yürütme destekler",
-  "model.tooltip.reasoning.none": "Akıl yürütme yok",
-  "model.tooltip.context": "Bağlam limiti {{limit}}",
   "model.preview.label.released": "Yayınlanma",
   "model.preview.label.input": "Girdi",
   "model.preview.label.output": "Çıktı",
@@ -300,11 +184,8 @@ export const dict = {
   "model.preview.modality.video": "Video",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Ara",
   "common.goBack": "Geri git",
-  "common.goForward": "İleri git",
   "common.loading": "Yükleniyor",
-  "common.loading.ellipsis": "...",
   "common.cancel": "İptal",
   "common.connect": "Bağlan",
   "common.disconnect": "Bağlantı Kes",
@@ -312,54 +193,8 @@ export const dict = {
   "common.save": "Kaydet",
   "common.saving": "Kaydediliyor...",
   "common.default": "Varsayılan",
-  "common.attachment": "ek",
 
-  "prompt.placeholder.shell": "Kabuk komutu girin...",
-  "prompt.placeholder.normal": 'Bir şeyler sorun... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Yorumları özetle…",
-  "prompt.placeholder.summarizeComment": "Yorumu özetle…",
-  "prompt.mode.shell": "Kabuk",
-  "prompt.mode.shell.exit": "çıkmak için esc",
-
-  "prompt.example.1": "Kod tabanındaki bir TODO'yu düzelt",
-  "prompt.example.2": "Bu projenin teknoloji yığını nedir?",
-  "prompt.example.3": "Bozuk testleri düzelt",
-  "prompt.example.4": "Kimlik doğrulamanın nasıl çalıştığını açıkla",
-  "prompt.example.5": "Güvenlik açıkları bul ve düzelt",
-  "prompt.example.6": "Kullanıcı servisi için birim testleri ekle",
-  "prompt.example.7": "Bu fonksiyonu daha okunabilir hale getir",
-  "prompt.example.8": "Bu hata ne anlama geliyor?",
-  "prompt.example.9": "Bu sorunu ayıklamama yardım et",
-  "prompt.example.10": "API dokümantasyonu oluştur",
-  "prompt.example.11": "Veritabanı sorgularını optimize et",
-  "prompt.example.12": "Girdi doğrulama ekle",
-  "prompt.example.13": "İçin yeni bir bileşen oluştur...",
-  "prompt.example.14": "Bu projeyi nasıl dağıtabilirim?",
-  "prompt.example.15": "Kodumu en iyi uygulamalar için incele",
-  "prompt.example.16": "Bu fonksiyona hata yönetimi ekle",
-  "prompt.example.17": "Bu regex kalıbını açıkla",
-  "prompt.example.18": "Bunu TypeScript'e dönüştür",
-  "prompt.example.19": "Kod tabanı boyunca loglama ekle",
-  "prompt.example.20": "Hangi bağımlılıklar güncellenmemiş?",
-  "prompt.example.21": "Bir göç betiği yazmama yardım et",
-  "prompt.example.22": "Bu uç nokta için önbellekleme uygula",
-  "prompt.example.23": "Bu listeye sayfalama ekle",
-  "prompt.example.24": "İçin bir CLI komutu oluştur...",
-  "prompt.example.25": "Ortam değişkenleri burada nasıl çalışıyor?",
-
-  "prompt.popover.emptyResults": "Eşleşen sonuç yok",
-  "prompt.popover.emptyCommands": "Eşleşen komut yok",
-  "prompt.dropzone.label": "Görsel veya PDF'leri buraya bırakın",
-  "prompt.slash.badge.custom": "özel",
-  "prompt.slash.badge.skill": "beceri",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "aktif",
-  "prompt.context.includeActiveFile": "Aktif dosyayı dahil et",
-  "prompt.context.removeActiveFile": "Aktif dosyayı bağlamdan çıkar",
-  "prompt.context.removeFile": "Dosyayı bağlamdan çıkar",
   "prompt.thinking.tooltip": "Akıl yürütme eforu",
-  "prompt.action.attachFile": "Dosya ekle",
-  "prompt.attachment.remove": "Eki kaldır",
   "prompt.action.send": "Gönder",
   "prompt.action.send.blocked": "Bekleyen soruyu önce yanıtlayın veya kapatın",
   "prompt.action.send.recording": "Yazıya dök ve gönder",
@@ -399,190 +234,17 @@ export const dict = {
   "speechToText.tooltip.error": "Sesli giriş başarısız oldu. Temizlemek için tıklayın.",
   "speechToText.error.title": "Sesli giriş başarısız oldu",
   "speechToText.error.loginRequired": "Sesli girişi kullanmak için Kilo'ya giriş yapın.",
-  "speechToText.error.permission": "Mikrofon izni reddedildi.",
-  "speechToText.error.microphone": "Mikrofon başlatılamadı.",
-  "speechToText.error.recording": "Kayıt başarısız oldu.",
-  "speechToText.error.emptyRecording": "Hiçbir ses kaydedilmedi.",
   "speechToText.error.emptyTranscript": "Hiçbir konuşma algılanmadı.",
-  "speechToText.error.encoding": "Kayıt kodlanamadı.",
-  "speechToText.toast.transcribed": "Döküm eklendi",
 
-  "prompt.toast.pasteUnsupported.title": "Desteklenmeyen yapıştırma",
-  "prompt.toast.pasteUnsupported.description": "Buraya sadece görsel veya PDF yapıştırılabilir.",
-  "prompt.toast.modelAgentRequired.title": "Bir ajan ve model seçin",
-  "prompt.toast.modelAgentRequired.description": "Komut göndermeden önce bir ajan ve model seçin.",
-  "prompt.toast.worktreeCreateFailed.title": "Çalışma ağacı oluşturulamadı",
-  "prompt.toast.sessionCreateFailed.title": "Oturum oluşturulamadı",
-  "prompt.toast.shellSendFailed.title": "Kabuk komutu gönderilemedi",
-  "prompt.toast.commandSendFailed.title": "Komut gönderilemedi",
   "prompt.toast.promptSendFailed.title": "Komut gönderilemedi",
 
-  "dialog.mcp.title": "MCP'ler",
-  "dialog.mcp.description": "{{total}} içerisinden {{enabled}} etkin",
-  "dialog.mcp.empty": "Yapılandırılmış MCP yok",
-
-  "dialog.lsp.empty": "LSP'ler dosya türlerinden otomatik algılanır",
-  "dialog.plugins.empty": "Eklentiler opencode.json içinde yapılandırılır",
-
   "mcp.status.connected": "bağlı",
   "mcp.status.failed": "başarısız",
   "mcp.status.needs_auth": "kimlik doğrulama gerekli",
   "mcp.status.needs_registration": "istemci kaydı gerekli",
   "mcp.status.disabled": "devre dışı",
 
-  "dialog.fork.empty": "Dallandırılacak mesaj yok",
-
-  "dialog.directory.search.placeholder": "Klasör ara",
-  "dialog.directory.empty": "Klasör bulunamadı",
-
-  "dialog.server.title": "Sunucular",
-  "dialog.server.description": "Bu uygulamanın hangi Kilo sunucusuna bağlanacağını değiştirin.",
-  "dialog.server.search.placeholder": "Sunucu ara",
-  "dialog.server.empty": "Henüz sunucu yok",
-  "dialog.server.add.title": "Sunucu ekle",
-  "dialog.server.add.url": "Sunucu URL'si",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Sunucuya bağlanılamadı",
-  "dialog.server.add.checking": "Kontrol ediliyor...",
-  "dialog.server.add.button": "Sunucu ekle",
-  "dialog.server.default.title": "Varsayılan sunucu",
-  "dialog.server.default.description":
-    "Uygulama başlatıldığında yerel sunucu başlatmak yerine bu sunucuya bağlan. Yeniden başlatma gerektirir.",
-  "dialog.server.default.none": "Sunucu seçilmedi",
-  "dialog.server.default.set": "Mevcut sunucuyu varsayılan olarak ayarla",
-  "dialog.server.default.clear": "Temizle",
-  "dialog.server.action.remove": "Sunucuyu kaldır",
-
-  "dialog.server.menu.edit": "Düzenle",
-  "dialog.server.menu.default": "Varsayılan olarak ayarla",
-  "dialog.server.menu.defaultRemove": "Varsayılanı kaldır",
-  "dialog.server.menu.delete": "Sil",
-  "dialog.server.current": "Mevcut Sunucu",
-  "dialog.server.status.default": "Varsayılan",
-
-  "dialog.project.edit.title": "Projeyi düzenle",
-  "dialog.project.edit.name": "Ad",
-  "dialog.project.edit.icon": "Simge",
-  "dialog.project.edit.icon.alt": "Proje simgesi",
-  "dialog.project.edit.icon.hint": "Tıkla veya bir görsel sürükle",
-  "dialog.project.edit.icon.recommended": "Önerilen: 128x128px",
-  "dialog.project.edit.color": "Renk",
-  "dialog.project.edit.color.select": "{{color}} rengini seç",
-  "dialog.project.edit.worktree.startup": "Çalışma alanı başlatma betiği",
-  "dialog.project.edit.worktree.startup.description": "Yeni bir çalışma alanı (worktree) oluşturduktan sonra çalışır.",
-  "dialog.project.edit.worktree.startup.placeholder": "örneğin bun install",
-
-  "context.breakdown.title": "Bağlam Dökümü",
-  "context.breakdown.note": 'Girdi tokenlerinin yaklaşık dökümü. "Diğer" araç tanımları ve ek yükleri içerir.',
-  "context.breakdown.system": "Sistem",
-  "context.breakdown.user": "Kullanıcı",
-  "context.breakdown.assistant": "Asistan",
-  "context.breakdown.tool": "Araç Çağrıları",
-  "context.breakdown.other": "Diğer",
-
-  "context.systemPrompt.title": "Sistem Komutu",
-  "context.rawMessages.title": "Ham mesajlar",
-
-  "context.stats.session": "Oturum",
-  "context.stats.messages": "Mesajlar",
-  "context.stats.provider": "Sağlayıcı",
-  "context.stats.model": "Model",
-  "context.stats.limit": "Bağlam Limiti",
-  "context.stats.totalTokens": "Toplam Token",
-  "context.stats.usage": "Kullanım",
-  "context.stats.inputTokens": "Girdi Tokenleri",
-  "context.stats.outputTokens": "Çıktı Tokenleri",
-  "context.stats.reasoningTokens": "Akıl Yürütme Tokenleri",
-  "context.stats.cacheTokens": "Önbellek Tokenleri (okuma/yazma)",
-  "context.stats.userMessages": "Kullanıcı Mesajları",
-  "context.stats.assistantMessages": "Asistan Mesajları",
-  "context.stats.totalCost": "Toplam Maliyet",
-  "context.stats.sessionCreated": "Oturum Oluşturulma",
-  "context.stats.lastActivity": "Son Etkinlik",
-
-  "context.usage.tokens": "Tokenler",
-  "context.usage.usage": "Kullanım",
-  "context.usage.cost": "Maliyet",
-  "context.usage.clickToView": "Bağlamı görüntüle",
-  "context.usage.view": "Bağlam kullanımını görüntüle",
-
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.language.title": "Dil",
-  "toast.language.description": "{{language}} diline geçildi",
-
-  "toast.theme.title": "Tema değiştirildi",
-  "toast.scheme.title": "Renk şeması",
-
-  "toast.workspace.enabled.title": "Çalışma alanları etkinleştirildi",
-  "toast.workspace.enabled.description": "Kenar çubuğunda birden fazla çalışma ağacı gösterilecek",
-  "toast.workspace.disabled.title": "Çalışma alanları devre dışı bırakıldı",
-  "toast.workspace.disabled.description": "Kenar çubuğunda yalnızca ana çalışma ağacı gösterilecek",
-
-  "toast.permissions.autoaccept.on.title": "Düzenlemeler otomatik kabul ediliyor",
-  "toast.permissions.autoaccept.on.description": "Düzenleme ve yazma izinleri otomatik olarak onaylanacak",
-  "toast.permissions.autoaccept.off.title": "Otomatik kabul durduruldu",
-  "toast.permissions.autoaccept.off.description": "Düzenleme ve yazma izinleri onay gerektirecek",
-
-  "toast.model.none.title": "Model seçilmedi",
-  "toast.model.none.description": "Bu oturumu özetlemek için bir sağlayıcı bağlayın",
-
-  "toast.file.loadFailed.title": "Dosya yüklenemedi",
-  "toast.file.listFailed.title": "Dosyalar listelenemedi",
-
-  "toast.context.noLineSelection.title": "Satır seçimi yok",
-  "toast.context.noLineSelection.description": "Önce bir dosya sekmesinde satır aralığı seçin.",
-
-  "toast.session.share.copyFailed.title": "URL panoya kopyalanamadı",
-  "toast.session.share.success.title": "Oturum paylaşıldı",
-  "toast.session.share.success.description": "Paylaşım URL'si panoya kopyalandı!",
-  "toast.session.share.failed.title": "Oturum paylaşılamadı",
-  "toast.session.share.failed.description": "Oturum paylaşılırken bir hata oluştu",
-
-  "toast.session.unshare.success.title": "Oturum paylaşımı kaldırıldı",
-  "toast.session.unshare.success.description": "Oturum paylaşımı başarıyla kaldırıldı!",
-  "toast.session.unshare.failed.title": "Oturum paylaşımı kaldırılamadı",
-  "toast.session.unshare.failed.description": "Oturum paylaşımı kaldırılırken bir hata oluştu",
-
   "toast.session.rename.invalid.title": "Geçersiz oturum başlığı",
-  "toast.session.listFailed.title": "{{project}} için oturumlar yüklenemedi",
-
-  "toast.update.title": "Güncelleme mevcut",
-  "toast.update.description": "Kilo'nun yeni bir sürümü ({{version}}) yüklemeye hazır.",
-  "toast.update.action.installRestart": "Yükle ve yeniden başlat",
-  "toast.update.action.notYet": "Şimdi değil",
-
-  "error.page.title": "Bir şeyler yanlış gitti",
-  "error.page.description": "Uygulama yüklenirken bir hata oluştu.",
-  "error.page.details.label": "Hata Detayları",
-  "error.page.action.restart": "Yeniden Başlat",
-  "error.page.action.checking": "Kontrol ediliyor...",
-  "error.page.action.checkUpdates": "Güncellemeleri kontrol et",
-  "error.page.action.updateTo": "{{version}} sürümüne güncelle",
-  "error.page.report.prefix": "Lütfen bu hatayı Kilo ekibine bildirin",
-  "error.page.report.discord": "Discord üzerinden",
-  "error.page.version": "Sürüm: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Kök eleman bulunamadı. index.html dosyanıza eklemeyi unuttunuz mu? Ya da id özelliği yanlış mı yazıldı?",
-
-  "error.globalSync.connectFailed": "Sunucuya bağlanılamadı. `{{url}}` adresinde çalışan bir sunucu var mı?",
 
   "error.startup.title": "Sunucu bağlantısı başarısız",
 
@@ -600,32 +262,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Codex modellerini kullanmaya devam etmek için ChatGPT ile tekrar giriş yapın ve mesajınızı yeniden gönderin.",
 
-  "error.chain.unknown": "Bilinmeyen hata",
-  "error.chain.causedBy": "Nedeni:",
-  "error.chain.apiError": "API hatası",
-  "error.chain.status": "Durum: {{status}}",
-  "error.chain.retryable": "Yeniden denenebilir: {{retryable}}",
-  "error.chain.responseBody": "Yanıt gövdesi:\n{{body}}",
-  "error.chain.didYouMean": "Bunu mu demek istediniz: {{suggestions}}",
-  "error.chain.modelNotFound": "Model bulunamadı: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Yapılandırma dosyanızı (opencode.json) sağlayıcı/model adlarını kontrol edin",
-  "error.chain.mcpFailed":
-    'MCP sunucusu "{{name}}" başarısız oldu. Not: Kilo henüz MCP kimlik doğrulamasını desteklemiyor.',
-  "error.chain.providerAuthFailed": "Sağlayıcı kimlik doğrulaması başarısız ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    '"{{provider}}" sağlayıcısı başlatılamadı. Kimlik bilgilerini ve yapılandırmayı kontrol edin.',
-  "error.chain.configJsonInvalid": "{{path}} adresindeki yapılandırma dosyası geçerli JSON(C) değil",
-  "error.chain.configJsonInvalidWithMessage":
-    "{{path}} adresindeki yapılandırma dosyası geçerli JSON(C) değil: {{message}}",
-  "error.chain.configDirectoryTypo":
-    '"{{dir}}" dizini {{path}} içinde geçerli değil. Dizini "{{suggestion}}" olarak yeniden adlandırın veya kaldırın. Bu yaygın bir yazım hatasıdır.',
-  "error.chain.configFrontmatterError": "{{path}} içindeki ön bilgi ayrıştırılamadı:\n{{message}}",
-  "error.chain.configInvalid": "{{path}} adresindeki yapılandırma dosyası geçersiz",
-  "error.chain.configInvalidWithMessage": "{{path}} adresindeki yapılandırma dosyası geçersiz: {{message}}",
-
   "notification.permission.title": "İzin gerekli",
   "notification.permission.titleSubagent": "İzin gerekli (alt ajan)",
-  "notification.permission.description": "{{projectName}} içindeki {{sessionTitle}} izin gerektiriyor",
   "ui.permission.manageAutoApprove": "Otomatik Onay Kurallarını Yönet",
   "ui.permission.doomLoop.prompt": "{{tool}} aracında olası bir döngü algılandı. Çalıştırmaya devam edilsin mi?",
   "ui.permission.doomLoop.rule": "{{tool}} çağrılarına devam et",
@@ -650,7 +288,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Görev Oku",
   "ui.permission.toolLabel.todoWrite": "Görev Yaz",
   "ui.permission.toolLabel.codeSearch": "Kod Araması",
-  "ui.permission.toggleWrap": "Sözcük kaydırmayı aç/kapat",
   "ui.permission.copyCommand": "Kopyala",
   "ui.approval.auto": "Otomatik onaylandı",
   "ui.approval.manual": "Sizin tarafınızdan onaylandı",
@@ -662,49 +299,19 @@ export const dict = {
   "ui.approval.source.yolo": "otomatik onay (YOLO) modu tarafından",
   "ui.approval.source.session": "bir oturum otomatik onay kuralı tarafından",
   "ui.approval.source.default": "varsayılan olarak",
-  "notification.question.title": "Soru",
-  "notification.question.description": "{{projectName}} içindeki {{sessionTitle}} bir soru soruyor",
-  "notification.action.goToSession": "Oturuma git",
 
-  "notification.session.responseReady.title": "Yanıt hazır",
-  "notification.session.error.title": "Oturum hatası",
-  "notification.session.error.fallbackDescription": "Bir hata oluştu",
-
-  "home.recentProjects": "Son projeler",
-  "home.empty.title": "Son proje yok",
-  "home.empty.description": "Yerel bir proje açarak başlayın",
-
-  "session.tab.session": "Oturum",
   "session.tab.review": "İnceleme",
-  "session.tab.context": "Bağlam",
-  "session.panel.reviewAndFiles": "İnceleme ve dosyalar",
   "session.review.filesChanged": "{{count}} Dosya Değişti",
-  "session.review.change.one": "Değişiklik",
   "session.review.change.other": "Değişiklik",
   "session.review.loadingChanges": "Değişiklikler yükleniyor...",
-  "session.review.empty": "Bu oturumda henüz değişiklik yok",
   "session.review.noChanges": "Değişiklik yok",
 
-  "session.files.selectToOpen": "Açmak için bir dosya seçin",
-  "session.files.all": "Tüm dosyalar",
-  "session.files.binaryContent": "İkili dosya (içerik görüntülenemiyor)",
-
-  "session.messages.renderEarlier": "Önceki mesajları göster",
   "session.messages.loadingEarlier": "Önceki mesajlar yükleniyor...",
   "session.messages.loadEarlier": "Önceki mesajları yükle",
   "session.messages.loading": "Mesajlar yükleniyor...",
-  "session.messages.jumpToLatest": "En sona atla",
 
-  "session.context.addToContext": "{{selection}} bağlama ekle",
-
-  "session.new.worktree.main": "Ana dal",
-  "session.new.worktree.mainWithBranch": "Ana dal ({{branch}})",
-  "session.new.worktree.create": "Yeni çalışma ağacı oluştur",
-  "session.new.lastModified": "Son değişiklik",
   "sidebar.session.newSession": "Yeni Oturum",
   "sidebar.session.newSession.tooltip": "Mevcut oturumu koruyarak yeni bir konuşma başlatın.",
-  "sidebar.session.newSession.disabled":
-    "Bu oturum zaten yeni. Sohbet etmeye başlayın veya bunun yerine bir worktree oluşturun.",
   "sidebar.session.newWorktree": "Yeni Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Güvenli bir şekilde deneme yapmak, değişiklikleri ayrı tutmak ve mevcut dalınızı kesintiye uğratmadan paralel oturumlar çalıştırmak için izole bir git worktree oluşturun.",
@@ -720,132 +327,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Bu konuşmayı ve değiştirilen {{files}} dosyayı, izole edilmiş takip çalışmaları için özel bir worktree'ye taşıyın.",
   "sidebar.session.showChanges.tooltip.empty": "Mevcut çalışma ağacını incelemek için değişiklikler görünümünü açın.",
-  "sidebar.session.showChanges.tooltip.one":
-    "1 dosya değiştirildi · +{{additions}} -{{deletions}}. Değişiklikler görünümünü aç.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} dosya değiştirildi · +{{additions}} -{{deletions}}. Değişiklikler görünümünü aç.",
-  "sidebar.session.agentManager.tooltip":
-    "Paralel oturumların ve worktree'lerin tam bir genel görünümü için Agent Manager'ı açın, böylece uzun süren görevleri tek bir yerden koordine edebilirsiniz.",
-  "sidebar.session.openAgentManager": "Agent Manager'ı Aç",
   "sidebar.session.progress.capturing": "Değişiklikler yakalanıyor...",
   "sidebar.session.progress.creating": "Worktree oluşturuluyor...",
   "sidebar.session.progress.setup": "Kurulum çalıştırılıyor...",
   "sidebar.session.progress.transferring": "Değişiklikler aktarılıyor...",
   "sidebar.session.progress.forking": "Oturum başlatılıyor...",
   "sidebar.session.progress.failed": "Worktree'de devam edilemedi",
-  "session.header.search.placeholder": "{{project}} ara",
-  "session.header.searchFiles": "Dosya ara",
-  "session.header.openIn": "Aç",
-  "session.header.open.action": "{{app}} ile aç",
-  "session.header.open.ariaLabel": "{{app}} ile aç",
-  "session.header.open.menu": "Açma seçenekleri",
-  "session.header.open.copyPath": "Yolu Kopyala",
-
-  "status.popover.trigger": "Durum",
-  "status.popover.ariaLabel": "Sunucu yapılandırmaları",
-  "status.popover.tab.servers": "Sunucular",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Eklentiler",
-  "status.popover.action.manageServers": "Sunucuları yönet",
-
-  "session.share.popover.title": "Web'de yayınla",
-  "session.share.popover.description.shared": "Bu oturum web'de herkese açıktır. Bağlantıya sahip herkes erişebilir.",
-  "session.share.popover.description.unshared":
-    "Oturumu web'de herkese açık olarak paylaşın. Bağlantıya sahip herkes erişebilecek.",
-  "session.share.action.share": "Paylaş",
-  "session.share.action.publish": "Yayınla",
-  "session.share.action.publishing": "Yayınlanıyor...",
-  "session.share.action.unpublish": "Yayından kaldır",
-  "session.share.action.unpublishing": "Yayından kaldırılıyor...",
-  "session.share.action.view": "Görüntüle",
-  "session.share.copy.copied": "Kopyalandı",
-  "session.share.copy.copyLink": "Bağlantı kopyala",
-
-  "lsp.tooltip.none": "LSP sunucusu yok",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Komut yükleniyor...",
-  "terminal.loading": "Terminal yükleniyor...",
-  "terminal.title": "Terminal",
-  "terminal.title.numbered": "Terminal {{number}}",
-  "terminal.close": "Terminali kapat",
-  "terminal.connectionLost.title": "Bağlantı Kesildi",
-  "terminal.connectionLost.description":
-    "Terminal bağlantısı kesildi. Bu durum sunucu yeniden başladığında oluşabilir.",
 
   "common.closeTab": "Sekmeyi kapat",
   "common.signIn": "Giriş yap",
-  "common.signOut": "Çıkış yap",
   "common.dismiss": "Kapat",
   "common.requestFailed": "İstek başarısız",
-  "common.moreOptions": "Daha fazla seçenek",
-  "common.learnMore": "Daha fazla bilgi",
   "common.rename": "Yeniden adlandır",
-  "common.reset": "Sıfırla",
-  "common.archive": "Arşivle",
   "common.delete": "Sil",
   "common.close": "Kapat",
   "common.edit": "Düzenle",
   "common.loadMore": "Daha fazla yükle",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Menüyü aç/kapat",
-  "sidebar.nav.projectsAndSessions": "Projeler ve oturumlar",
   "sidebar.settings": "Ayarlar",
-  "sidebar.help": "Yardım",
-  "sidebar.workspaces.enable": "Çalışma alanlarını etkinleştir",
-  "sidebar.workspaces.disable": "Çalışma alanlarını devre dışı bırak",
-  "sidebar.gettingStarted.title": "Başlarken",
-  "sidebar.gettingStarted.line1": "Kilo ücretsiz modeller içerir, böylece hemen başlayabilirsiniz.",
-  "sidebar.gettingStarted.line2": "Claude, GPT, Gemini vb. modelleri kullanmak için herhangi bir sağlayıcı bağlayın.",
-  "sidebar.project.recentSessions": "Son oturumlar",
-  "sidebar.project.viewAllSessions": "Tüm oturumları görüntüle",
 
-  "app.name.desktop": "Kilo Masaüstü",
-
-  "settings.section.desktop": "Masaüstü",
-  "settings.section.server": "Sunucu",
-  "settings.tab.general": "Genel",
-  "settings.tab.shortcuts": "Kısayollar",
-
-  "settings.general.section.appearance": "Görünüm",
-  "settings.general.section.notifications": "Sistem bildirimleri",
-  "settings.general.section.updates": "Güncellemeler",
-  "settings.general.section.sounds": "Ses efektleri",
-
-  "settings.general.row.language.title": "Dil",
-  "settings.general.row.language.description": "Kilo'nun görünüm dilini değiştirin",
-  "settings.general.row.appearance.title": "Görünüm",
-  "settings.general.row.appearance.description": "Kilo'nun cihazınızdaki görünümünü özelleştirin",
-  "settings.general.row.theme.title": "Tema",
-  "settings.general.row.theme.description": "Kilo'nun temasını özelleştirin.",
-  "settings.general.row.font.title": "Yazı Tipi",
-  "settings.general.row.font.description": "Kod bloklarında kullanılan monospace yazı tipini özelleştirin",
-
-  "settings.general.row.releaseNotes.title": "Sürüm notları",
-  "settings.general.row.releaseNotes.description": "Güncellemelerden sonra Yenilikler bildirimlerini göster",
-
-  "settings.updates.row.startup.title": "Başlangıçta güncellemeleri kontrol et",
-  "settings.updates.row.startup.description": "Kilo başladığında otomatik güncelleme kontrolü yap",
-  "settings.updates.row.check.title": "Güncellemeleri kontrol et",
-  "settings.updates.row.check.description": "Elle güncelleme kontrolü yap ve varsa yükle",
-  "settings.updates.action.checkNow": "Şimdi kontrol et",
-  "settings.updates.action.checking": "Kontrol ediliyor...",
-  "settings.updates.toast.latest.title": "Güncelsiniz",
-  "settings.updates.toast.latest.description": "Kilo'nun en son sürümünü kullanıyorsunuz.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Uyarı 01",
   "sound.option.alert02": "Uyarı 02",
   "sound.option.alert03": "Uyarı 03",
@@ -892,43 +392,7 @@ export const dict = {
   "sound.option.yup05": "Evet 05",
   "sound.option.yup06": "Evet 06",
 
-  "settings.general.notifications.agent.title": "Ajan",
-  "settings.general.notifications.agent.description":
-    "Ajan tamamlandığında veya dikkat gerektirdiğinde sistem bildirimi göster",
-  "settings.general.notifications.permissions.title": "İzinler",
-  "settings.general.notifications.permissions.description": "İzin gerektiğinde sistem bildirimi göster",
-  "settings.general.notifications.errors.title": "Hatalar",
-  "settings.general.notifications.errors.description": "Hata oluştuğunda sistem bildirimi göster",
-
-  "settings.general.sounds.agent.title": "Ajan",
-  "settings.general.sounds.agent.description": "Ajan tamamlandığında veya dikkat gerektirdiğinde ses çal",
-  "settings.general.sounds.permissions.title": "İzinler",
-  "settings.general.sounds.permissions.description": "İzin gerektiğinde ses çal",
-  "settings.general.sounds.errors.title": "Hatalar",
-  "settings.general.sounds.errors.description": "Hata oluştuğunda ses çal",
-
-  "settings.shortcuts.title": "Klavye kısayolları",
-  "settings.shortcuts.reset.button": "Varsayılanlara sıfırla",
-  "settings.shortcuts.reset.toast.title": "Kısayollar sıfırlandı",
-  "settings.shortcuts.reset.toast.description": "Klavye kısayolları varsayılanlara sıfırlandı.",
-  "settings.shortcuts.conflict.title": "Kısayol zaten kullanılıyor",
-  "settings.shortcuts.conflict.description": "{{keybind}} zaten {{titles}} için atanmış.",
-  "settings.shortcuts.unassigned": "Atanmamış",
-  "settings.shortcuts.pressKeys": "Tuşlara basın",
-  "settings.shortcuts.search.placeholder": "Kısayol ara",
-  "settings.shortcuts.search.empty": "Kısayol bulunamadı",
-
-  "settings.shortcuts.group.general": "Genel",
-  "settings.shortcuts.group.session": "Oturum",
-  "settings.shortcuts.group.navigation": "Gezinme",
-  "settings.shortcuts.group.modelAndAgent": "Model ve ajan",
-  "settings.shortcuts.group.terminal": "Terminal",
-  "settings.shortcuts.group.prompt": "Komut",
-
   "settings.providers.title": "Sağlayıcılar",
-  "settings.providers.description": "Sağlayıcı ayarları burada yapılandırılabilecek.",
-  "settings.providers.betaNotice":
-    "Şu anda yalnızca Kilo Gateway sağlayıcısı ayarlar arayüzünde yapılandırılabilir. Diğer sağlayıcılar için destek beta döneminde yakında gelecek. Bu arada CLI veya yapılandırma dosyası ile sağlayıcıları yapılandırabilirsiniz. Kilo'yu açık tutmaya kararlıyız, kilitlenme yok.",
   "settings.providers.section.connected": "Bağlı sağlayıcılar",
   "settings.providers.connected.empty": "Bağlı sağlayıcı yok",
   "settings.providers.section.popular": "Popüler sağlayıcılar",
@@ -1007,9 +471,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Modeli kaldır",
   "provider.custom.models.add": "Model ekle",
-  "provider.custom.models.fetch": "Modelleri getir",
-  "provider.custom.models.fetching": "Getiriliyor\u2026",
-  "provider.custom.models.fetch.error": "Modeller getirilemedi: {{error}}",
   "provider.custom.models.fetch.authError":
     "Kimlik doğrulama başarısız oldu. Yukarıdaki API anahtarını kontrol edin ve tekrar deneyin.",
   "provider.custom.models.fetch.empty": "Bu sunucuda model bulunamadı.",
@@ -1062,23 +523,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Eski .kilocode yapılandırması",
   "settings.config.source.projectOpencode": "Eski .opencode yapılandırması",
   "settings.models.title": "Modeller",
-  "settings.models.description": "Model ayarları burada yapılandırılabilecek.",
-  "settings.agents.title": "Ajanlar",
-  "settings.agents.description": "Ajan ayarları burada yapılandırılabilecek.",
-  "settings.commands.title": "Komutlar",
-  "settings.commands.description": "Komut ayarları burada yapılandırılabilecek.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP ayarları burada yapılandırılabilecek.",
 
-  "settings.permissions.title": "İzinler",
-  "settings.permissions.description": "Sunucunun varsayılan olarak hangi araçları kullanabileceğini kontrol edin.",
-  "settings.permissions.section.tools": "Araçlar",
   "settings.permissions.toast.updateFailed.title": "İzinler güncellenemedi",
 
-  "settings.permissions.action.allow": "İzin Ver",
-  "settings.permissions.action.ask": "Sor",
-  "settings.permissions.action.deny": "Reddet",
-
   "settings.permissions.tool.read.title": "Oku",
   "settings.permissions.tool.read.description": "Bir dosyayı okuma (dosya yoluyla eşleşir)",
   "settings.permissions.tool.edit.title": "Düzenle",
@@ -1112,7 +559,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Sonsuz Döngü",
   "settings.permissions.tool.doom_loop.description": "Aynı girdiyle tekrarlanan araç çağrılarını algıla",
 
-  "session.delete.failed.title": "Oturum silinemedi",
   "session.delete.title": "Oturumu sil",
   "session.delete.confirm": '"{{name}}" oturumu silinsin mi?',
   "session.delete.button": "Oturumu sil",
@@ -1141,14 +587,9 @@ export const dict = {
   "feedback.dialog.support": "Müşteri Desteği",
   "workStyle.onboarding.welcome": "Kilo'ya hoş geldiniz",
   "workStyle.onboarding.title": "Nasıl çalışmak istediğinizi seçin",
-  "workStyle.onboarding.description":
-    "İzinler, akıl yürütme blokları, terminal çıktısı ve bağlam zaman çizelgesi için başlangıç varsayılanlarını belirler. Yalnızca bir kez uygulanır ve daha önce özelleştirdiğiniz ayarları atlar.",
-  "workStyle.onboarding.skip": "Şimdilik atla",
   "workStyle.onboarding.settingsNote": "Bu seçenekleri istediğiniz zaman şuradan değiştirebilirsiniz:",
   "workStyle.onboarding.settings": "Ayarlar.",
   "workStyle.toast.saved.title": "Mod başarıyla kaydedildi",
-  "workStyle.toast.saved.description": "Tercihlerinizi istediğiniz zaman Ayarlar'dan güncelleyebilirsiniz.",
-  "workStyle.toast.saved.action": "Ayarlara git",
   "workStyle.choice.permissions": "İzinler",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Görünürlük",
@@ -1173,32 +614,6 @@ export const dict = {
   "session.cloud.import.legacy": "Bu, artık desteklenmeyen eski bir oturum gibi görünüyor.",
   "session.cloud.import.failed": "Bulut oturumu içe aktarılamadı",
 
-  "workspace.new": "Yeni çalışma alanı",
-  "workspace.type.local": "yerel",
-  "workspace.type.sandbox": "sandbox",
-  "workspace.create.failed.title": "Çalışma alanı oluşturulamadı",
-  "workspace.delete.failed.title": "Çalışma alanı silinemedi",
-  "workspace.resetting.title": "Çalışma alanı sıfırlanıyor",
-  "workspace.resetting.description": "Bu bir dakika sürebilir.",
-  "workspace.reset.failed.title": "Çalışma alanı sıfırlanamadı",
-  "workspace.reset.success.title": "Çalışma alanı sıfırlandı",
-  "workspace.reset.success.description": "Çalışma alanı artık varsayılan dalla eşleşiyor.",
-  "workspace.error.stillPreparing": "Çalışma alanı hâlâ hazırlanıyor",
-  "workspace.status.checking": "Birleşmemiş değişiklikler kontrol ediliyor...",
-  "workspace.status.error": "Git durumu doğrulanamadı.",
-  "workspace.status.clean": "Birleşmemiş değişiklik algılanmadı.",
-  "workspace.status.dirty": "Bu çalışma alanında birleşmemiş değişiklikler algılandı.",
-  "workspace.delete.title": "Çalışma alanını sil",
-  "workspace.delete.confirm": '"{{name}}" çalışma alanı silinsin mi?',
-  "workspace.delete.button": "Çalışma alanını sil",
-  "workspace.reset.title": "Çalışma alanını sıfırla",
-  "workspace.reset.confirm": '"{{name}}" çalışma alanı sıfırlansın mı?',
-  "workspace.reset.button": "Çalışma alanını sıfırla",
-  "workspace.reset.archived.none": "Arşivlenecek aktif oturum yok.",
-  "workspace.reset.archived.one": "1 oturum arşivlenecek.",
-  "workspace.reset.archived.many": "{{count}} oturum arşivlenecek.",
-  "workspace.reset.note": "Bu işlem çalışma alanını varsayılan dalla eşleşecek şekilde sıfırlayacak.",
-
   "deviceAuth.toast.urlCopied": "URL panoya kopyalandı",
   "deviceAuth.toast.codeCopied": "Kod panoya kopyalandı",
   "deviceAuth.toast.errorCopied": "Hata panoya kopyalandı",
@@ -1236,7 +651,6 @@ export const dict = {
   "profile.pass.renews": "Yenilenir",
   "profile.action.logout": "Çıkış Yap",
 
-  "settings.section.configuration": "Yapılandırma",
   "settings.agentBehaviour.title": "Ajan Davranışı",
   "settings.autoApprove.title": "Otomatik Onay",
   "settings.browser.title": "Tarayıcı",
@@ -1259,8 +673,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Bu proje için etkinleştir",
   "settings.indexing.projectEnable.description":
     "Genel dizine ekleme kapalı olduğunda bu çalışma alanı için dizine eklemeyi etkinleştir.",
-  "settings.indexing.projectEnable.disabledTooltip":
-    "Küresel indeksleme etkinleştirildi, bu nedenle bu proje zaten kapsanıyor.",
   "settings.indexing.provider.title": "Yerleştirme sağlayıcısı",
   "settings.indexing.provider.description":
     "Anlamsal arama için yerleştirmeleri oluşturmak amacıyla kullanılacak sağlayıcıyı seçin.",
@@ -1290,7 +702,6 @@ export const dict = {
   "settings.language.title": "Dil",
   "settings.aboutKiloCode.title": "Kilo Code Hakkında",
 
-  "session.messages.empty": "Aşağıya bir mesaj yazarak sohbete başlayın.",
   "session.messages.welcome":
     "Kilo Code bir yapay zeka kodlama asistanıdır. Özellik geliştirmesini, hata düzeltmesini veya kod tabanınızı açıklamasını isteyin.",
   "session.messages.scrollToBottom": "En alta kaydır",
@@ -1298,7 +709,6 @@ export const dict = {
   "session.messages.taskStarting": "Başlıyor...",
   "session.status.writingResponse": "Yanıt yazılıyor...",
   "session.status.retry": "Yeniden deneniyor…",
-  "session.status.retrying": "Yeniden deneniyor (deneme {{ attempt }})… {{ message }}",
   "session.status.working": "Çalışıyor...",
   "session.status.offline": "Ağ bağlantısı kesildi — yeniden bağlanılıyor...",
   "session.outcome.incomplete": "Tur, {{count}} yapılacak öğe kalarak sona erdi",
@@ -1330,11 +740,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} eski oturum",
   "context.stats.thisSession": "Bu oturum",
 
-  "time.justNow": "az önce",
-  "time.minutesAgo": "{{count}} dk önce",
-  "time.hoursAgo": "{{count}}sa önce",
-  "time.daysAgo": "{{count}}g önce",
-  "time.monthsAgo": "{{count}}ay önce",
   "time.today": "Bugün",
   "time.yesterday": "Dün",
   "time.thisWeek": "Bu Hafta",
@@ -1350,7 +755,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Port:",
   "settings.aboutKiloCode.versionInfo": "Sürüm Bilgisi",
   "settings.aboutKiloCode.version.label": "Sürüm:",
-  "settings.aboutKiloCode.extensionName": "Kilo Code Uzantısı",
   "settings.aboutKiloCode.community": "Topluluk ve Destek",
   "settings.aboutKiloCode.feedback.prefix":
     "Herhangi bir sorunuz veya geri bildiriminiz varsa, lütfen şu adreste bir sorun açın:",
@@ -1400,7 +804,6 @@ export const dict = {
   "settings.language.current": "Mevcut:",
 
   "common.add": "Ekle",
-  "common.choose": "Seç…",
 
   "settings.autocomplete.autoTrigger.title": "Otomatik satır içi tamamlamaları etkinleştir",
   "settings.autocomplete.autoTrigger.description": "Yazarken satır içi tamamlama önerilerini otomatik göster",
@@ -1411,28 +814,15 @@ export const dict = {
   "settings.autocomplete.modelsHint":
     "Otomatik tamamlama için kullanılacak modeli seçmek için Modeller ayarlarına bakın.",
 
-  "settings.notifications.agent.title": "Ajan Tamamlanması",
-  "settings.notifications.agent.description": "Ajan bir görevi tamamladığında bildirim göster",
-  "settings.notifications.permissions.title": "İzin İstekleri",
-  "settings.notifications.permissions.description": "İzin isteklerinde bildirim göster",
-  "settings.notifications.errors.title": "Hatalar",
-  "settings.notifications.errors.description": "Hata oluştuğunda bildirim göster",
   "settings.notifications.sounds": "Sesler",
   "settings.notifications.enable.title": "Sesli bildirimleri etkinleştir",
   "settings.notifications.enable.description":
     "Oturumlar tamamlandığında, bir hatayla karşılaşıldığında veya sizden giriş beklendiğinde ses çal",
   "settings.notifications.testSound": "Test et",
-  "settings.notifications.agentSound.title": "Ajan Tamamlanma Sesi",
-  "settings.notifications.agentSound.description": "Ajan tamamlandığında çalınacak ses",
-  "settings.notifications.permSound.title": "İzin İsteği Sesi",
-  "settings.notifications.permSound.description": "İzin isteklerinde çalınacak ses",
-  "settings.notifications.errorSound.title": "Hata Sesi",
-  "settings.notifications.errorSound.description": "Hata oluştuğunda çalınacak ses",
   "settings.notifications.sound.default": "Varsayılan",
   "settings.notifications.sound.system": "Sistem",
   "settings.notifications.sound.description":
     "Varsayılan seçenekte tamamlanma, giriş ve hatalar için farklı sesler kullanılır. Diğer seçeneklerde tüm etkinlikler için tek bir ses kullanılır.",
-  "settings.notifications.sound.none": "Yok",
 
   "settings.experimental.share.title": "Paylaşım Modu",
   "settings.experimental.share.description": "Oturum paylaşımının nasıl davranacağı",
@@ -1454,9 +844,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Görüntü oluşturma modeli",
   "settings.experimental.imageGenerationModel.placeholder": "Varsayılan (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Sesten metne",
-  "settings.experimental.speechToText.description":
-    "Kilo Gateway üzerinden Kilo hesabınızı kullanarak komut alanlarında sesli girişi etkinleştirin.",
   "settings.models.speechToText.disabledDescription":
     "Speech to Text kullanmak için Kilo sağlayıcısını etkinleştirin ve giriş yapın. Speech to Text şu anda yalnızca Kilo Gateway ile desteklenmektedir.",
   "settings.models.speechToTextModel.title": "Sesten metne modeli",
@@ -1501,15 +888,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Varsayılan Ajan",
   "settings.agentBehaviour.defaultAgent.description": "Belirtilmediğinde kullanılacak ajan",
   "settings.agentBehaviour.availableAgents": "Mevcut Ajanlar",
-  "settings.agentBehaviour.selectAgent": "Yapılandırmak için bir ajan seçin…",
-  "settings.agentBehaviour.selectAgent.title": "Ajan",
-  "settings.agentBehaviour.selectAgent.description": "Yapılandırmak için bir ajan seçin…",
   "settings.agentBehaviour.modelOverride.title": "Model Geçersiz Kılma",
   "settings.agentBehaviour.modelOverride.description": "Bu ajan için varsayılan modeli geçersiz kıl",
   "settings.agentBehaviour.variantOverride.title": "Varyant Geçersiz Kılma",
   "settings.agentBehaviour.variantOverride.description": "Bu ajan için model varyantını geçersiz kıl",
-  "settings.agentBehaviour.prompt.title": "Özel Komut",
-  "settings.agentBehaviour.prompt.description": "Bu ajan için ek sistem komutu",
   "settings.agentBehaviour.temperature.title": "Sıcaklık",
   "settings.agentBehaviour.temperature.description":
     "Yapay zekâ yanıtlarının ne kadar rastgele olacağını kontrol eder (0–2). Daha düşük değerler (ör. 0.2) odaklı ve tutarlı çıktılar üretir. Daha yüksek değerler (ör. 1.0) daha çeşitli ve yaratıcı yanıtlar üretir. Modelin varsayılan değerini kullanmak için boş bırakın.",
@@ -1529,7 +911,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Keşfedilen Beceriler",
   "settings.agentBehaviour.noSkillsFound":
     "Keşfedilen beceri yok. Becerileri kullanılabilir kılmak için aşağıya beceri klasör yolları veya URL'ler ekleyin.",
-  "settings.agentBehaviour.availableModes": "Mevcut Özel Modlar",
   "settings.agentBehaviour.noAgentsFound": "Ajan bulunamadı.",
   "settings.agentBehaviour.importMode": "İçe Aktar",
   "settings.agentBehaviour.importMode.invalidName":
@@ -1565,7 +946,6 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Komut",
   "settings.agentBehaviour.mcpDetail.args": "Argümanlar",
   "settings.agentBehaviour.mcpDetail.env": "Ortam",
-  "settings.agentBehaviour.mcpDetail.disabled": "Bu sunucu devre dışı.",
   "settings.agentBehaviour.editMcp": "MCP Sunucusunu Düzenle",
   "settings.agentBehaviour.editMcp.transportLocal": "Yerel sunucu (stdio taşıma)",
   "settings.agentBehaviour.editMcp.transportRemote": "Uzak sunucu (SSE/HTTP taşıma)",
@@ -1581,7 +961,6 @@ export const dict = {
   "settings.agentBehaviour.mcpBrowseMarketplace": "Marketplace'e Göz At",
   "settings.agentBehaviour.mcpEmpty":
     "Yapılandırılmış MCP sunucusu yok. kilo.jsonc dosyasına MCP sunucuları ekleyin veya ajanın eklemesini isteyin.",
-  "settings.agentBehaviour.workflowsPlaceholder": "İş akışları çalışma alanınızdaki iş akışı dosyaları ile yönetilir.",
   "settings.agentBehaviour.workflows.description":
     "İş akışları, yapılandırmanızda tanımlanan özel eğik çizgi komutlarıdır. Çağırmak için sohbette /command-name yazın. Komutlar opencode.json dosyasındaki 'command' bölümünde yapılandırılır.",
   "settings.agentBehaviour.workflows.empty":
@@ -1671,7 +1050,6 @@ export const dict = {
     "örn. conventional commits formatını izleyerek İspanyolca commit messages oluştur. SADECE commit message döndür.",
 
   "settings.commitMessage.language.sync": "Kullanıcı Arayüzü Dili ile Senkronizasyon",
-  "settings.commitMessage.language.title": "Dil",
   "settings.commitMessage.language.description":
     "AI tarafından oluşturulan commit mesajları için hangi dili kullanacağınızı seçin:",
 
@@ -1720,12 +1098,7 @@ export const dict = {
   "settings.providers.disabled": "Devre Dışı Sağlayıcılar",
   "settings.providers.disabled.description": "Sağlayıcı listesinde gizlenecek sağlayıcılar",
   "settings.providers.disabled.enable": "Etkinleştir",
-  "settings.providers.enabled": "Etkin Sağlayıcılar (İzin Listesi)",
-  "settings.providers.enabled.description":
-    "Ayarlanırsa yalnızca bu sağlayıcılar kullanılabilir olacak (özel izin listesi)",
   "settings.providers.notSet": "Ayarlanmadı (sunucu varsayılanını kullan)",
-  "settings.providers.custom.note": "Temel URL üzerinden özel bir sağlayıcı ekleyin.",
-  "settings.providers.search.placeholder": "Sağlayıcı ara",
   "settings.providers.select.placeholder": "Sağlayıcı seç...",
 
   "dialog.model.notSet": "Ayarlanmadı",
@@ -1768,9 +1141,7 @@ export const dict = {
   "migration.migrate.title": "Ayarlarınızı Taşıyın",
   "migration.migrate.subtitle": "Önceki yüklemenizden ayarlar bulduk. İşte taşıyabileceğimiz ayarlar.",
   "migration.migrate.selectLabel": "Taşınacakları seçin",
-  "migration.migrate.cannotMigrate": "Taşınamaz",
   "migration.migrate.chatHistory": "Sohbet Oturumları ve Geçmiş",
-  "migration.migrate.chatHistoryDesc": "Yeni mimariyle uyumsuz",
   "migration.migrate.button": "Ayarları Taşı",
   "migration.migrate.skip": "Atla",
   "migration.migrate.keysDetected": "{{count}} anahtar algılandı",
@@ -1794,10 +1165,7 @@ export const dict = {
     "Bu, VS Code depolamasından eski ayarları kaldırır. Bu taşımayı yeniden çalıştıramazsınız.",
   "migration.complete.done": "Bitti",
   "migration.migrate.sessionsDetected": "{{count}} oturum bulundu",
-  "migration.error.sessionFailed": "Oturum taşıma işlemi başarısız oldu",
   "migration.error.continue": "Devam et",
-  "migration.error.action.copy": "Kopyala",
-  "migration.error.toast.copied": "Hata panoya kopyalandı",
 
   "migration.sessionSummary.title": "Özet:",
   "migration.sessionSummary.copy": "Raporu kopyala",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index 8422b8687b4..f80fdf0f99a 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -53,85 +53,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "Запропоновані",
-  "command.category.view": "Вигляд",
-  "command.category.project": "Проєкт",
-  "command.category.provider": "Провайдер",
-  "command.category.server": "Сервер",
-  "command.category.session": "Сесія",
-  "command.category.theme": "Тема",
-  "command.category.language": "Мова",
-  "command.category.file": "Файл",
-  "command.category.context": "Контекст",
-  "command.category.terminal": "Термінал",
-  "command.category.model": "Модель",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "Агент",
-  "command.category.permissions": "Дозволи",
-  "command.category.workspace": "Робочий простір",
-  "command.category.settings": "Налаштування",
 
-  "theme.scheme.system": "Системна",
-  "theme.scheme.light": "Світла",
-  "theme.scheme.dark": "Темна",
-
-  "command.sidebar.toggle": "Перемкнути бічну панель",
-  "command.project.open": "Відкрити проєкт",
   "command.provider.connect": "Підключити провайдера",
-  "command.server.switch": "Переключити сервер",
-  "command.settings.open": "Відкрити налаштування",
-  "command.session.previous": "Попередня сесія",
-  "command.session.next": "Наступна сесія",
-  "command.session.previous.unseen": "Попередня непрочитана сесія",
-  "command.session.next.unseen": "Наступна непрочитана сесія",
-  "command.session.archive": "Архівувати сесію",
-
-  "command.palette": "Палітра команд",
-
-  "command.theme.cycle": "Змінити тему",
-  "command.theme.set": "Використати тему: {{theme}}",
-  "command.theme.scheme.cycle": "Змінити кольорову схему",
-  "command.theme.scheme.set": "Використати кольорову схему: {{scheme}}",
-
-  "command.language.cycle": "Змінити мову",
-  "command.language.set": "Використати мову: {{language}}",
 
   "command.session.new": "Нова сесія",
-  "command.session.new.task": "Нове завдання",
   "command.session.show.changes": "Показати зміни",
-  "command.file.open": "Відкрити файл",
-  "command.tab.close": "Закрити вкладку",
-  "command.context.addSelection": "Додати виділення до контексту",
-  "command.context.addSelection.description": "Додати виділені рядки з поточного файлу",
-  "command.terminal.toggle": "Перемкнути термінал",
-  "command.fileTree.toggle": "Перемкнути дерево файлів",
   "command.review.toggle": "Перемкнути огляд",
-  "command.terminal.new": "Новий термінал",
-  "command.terminal.new.description": "Створити нову вкладку терміналу",
-  "command.steps.toggle": "Перемкнути кроки",
-  "command.steps.toggle.description": "Показати або приховати кроки для поточного повідомлення",
-  "command.message.previous": "Попереднє повідомлення",
-  "command.message.previous.description": "Перейти до попереднього повідомлення користувача",
-  "command.message.next": "Наступне повідомлення",
-  "command.message.next.description": "Перейти до наступного повідомлення користувача",
-  "command.model.choose": "Вибрати модель",
-  "command.model.choose.description": "Вибрати іншу модель",
-  "command.mcp.toggle": "Перемкнути MCP",
-  "command.mcp.toggle.description": "Увімкнути або вимкнути MCP",
-  "command.agent.cycle": "Змінити агента",
-  "command.agent.cycle.description": "Перейти до наступного агента",
-  "command.agent.cycle.reverse": "Змінити агента назад",
-  "command.agent.cycle.reverse.description": "Перейти до попереднього агента",
-  "command.model.variant.cycle": "Змінити зусилля мислення",
-  "command.model.variant.cycle.description": "Перейти до наступного рівня зусиль",
-  "command.permissions.autoaccept.enable": "Автоматично приймати редагування",
-  "command.permissions.autoaccept.disable": "Зупинити автоматичне прийняття",
-  "command.workspace.toggle": "Перемкнути робочі дерева",
-  "command.workspace.toggle.description": "Показати або приховати кілька робочих дерев на бічній панелі",
-  "command.session.undo": "Скасувати",
-  "command.session.undo.description": "Скасувати останнє повідомлення",
-  "command.session.redo": "Повторити",
-  "command.session.redo.description": "Повторити останнє скасоване повідомлення",
   "revert.banner.count_one": "{{count}} повідомлення скасовано",
   "revert.banner.count_other": "{{count}} повідомлень скасовано",
   "revert.banner.redo": "Повторити",
@@ -146,13 +73,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "Увімкнути знімки",
   "revert.disabled.agentBusy": "Зачекайте завершення агента",
   "command.session.compact": "Стиснути сесію",
-  "command.session.compact.description": "Підсумувати сесію для зменшення розміру контексту",
-  "command.session.fork": "Розгалужити від повідомлення",
-  "command.session.fork.description": "Створити нову сесію від попереднього повідомлення",
-  "command.session.share": "Відкрити доступ до сесії",
-  "command.session.share.description": "Відкрити доступ до цієї сесії та скопіювати URL до буфера обміну",
-  "command.session.unshare": "Закрити доступ до сесії",
-  "command.session.unshare.description": "Закрити доступ до цієї сесії",
   "command.session.export": "Експортувати запис сеансу",
 
   "agentRequirements.skill.installed": "Встановлено",
@@ -179,11 +99,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "Ця перевірка вимог агента більше не активна.",
   "agentRequirements.error.requestFailed": "Kilo не зміг перевірити вимоги агента.",
 
-  "palette.search.placeholder": "Пошук файлів, команд і сесій",
-  "palette.empty": "Результатів не знайдено",
-  "palette.group.commands": "Команди",
-  "palette.group.files": "Файли",
-
   "dialog.provider.search.placeholder": "Пошук провайдера",
   "dialog.provider.empty": "Провайдерів не знайдено",
   "dialog.provider.group.other": "Інші",
@@ -192,19 +107,13 @@ export const dict = {
   "dialog.model.select.title": "Вибір моделі",
   "dialog.model.search.placeholder": "Пошук моделі",
   "dialog.model.empty": "Моделей не знайдено",
-  "dialog.model.manage": "Керувати моделями",
-  "dialog.model.manage.description": "Налаштуйте, які моделі відображаються у виборі моделей.",
   "dialog.model.select": "Вибрати",
   "dialog.model.expand": "Розгорнути",
   "dialog.model.collapse": "Згорнути",
 
-  "dialog.model.unpaid.freeModels.title": "Безкоштовні моделі від Kilo",
-  "dialog.model.unpaid.addMore.title": "Додайте більше моделей від популярних провайдерів",
-
   "dialog.provider.viewAll": "Показати більше провайдерів",
 
   "provider.connect.title": "Підключити {{provider}}",
-  "provider.connect.title.anthropicProMax": "Увійти через Claude Pro/Max",
   "provider.connect.selectMethod": "Оберіть метод входу для {{provider}}.",
   "provider.connect.method.apiKey": "API-ключ",
   "provider.connect.status.inProgress": "Авторизація виконується...",
@@ -231,13 +140,6 @@ export const dict = {
   "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.opencodeZen.line1":
-    "OpenCode Zen надає доступ до добірки надійних оптимізованих моделей для агентів кодування.",
-  "provider.connect.opencodeZen.line2":
-    "За допомогою одного API-ключа ви отримаєте доступ до таких моделей, як Claude, GPT, Gemini, GLM та інших.",
-  "provider.connect.opencodeZen.visit.prefix": "Відвідайте ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " щоб отримати свій API-ключ.",
   "provider.connect.oauth.code.visit.prefix": "Перейдіть за ",
   "provider.connect.oauth.code.visit.link": "цим посиланням",
   "provider.connect.oauth.code.visit.suffix":
@@ -245,7 +147,6 @@ export const dict = {
   "provider.connect.oauth.code.label": "Код авторизації {{method}}",
   "provider.connect.oauth.code.placeholder": "Код авторизації",
   "provider.connect.oauth.code.required": "Код авторизації обов'язковий",
-  "provider.connect.oauth.code.invalid": "Недійсний код авторизації",
   "provider.connect.oauth.auto.visit.prefix": "Перейдіть за ",
   "provider.connect.oauth.auto.visit.link": "цим посиланням",
   "provider.connect.oauth.auto.visit.suffix":
@@ -259,28 +160,11 @@ export const dict = {
 
   "model.tag.free": "Безкоштовно",
   "model.tag.dataCollected": "Дані можуть використовуватися для навчання",
-  "model.tag.latest": "Остання",
   "model.group.auto": "Автоматичні моделі",
   "model.group.recommended": "Рекомендовані",
   "model.group.favorites": "Обране",
-  "model.group.collapse": "Згорнути {{group}}",
-  "model.group.expand": "Розгорнути {{group}}",
   "model.favorite.add": "Додати до обраного",
   "model.favorite.remove": "Видалити з обраного",
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "текст",
-  "model.input.image": "зображення",
-  "model.input.audio": "аудіо",
-  "model.input.video": "відео",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "Підтримує: {{inputs}}",
-  "model.tooltip.reasoning.allowed": "Підтримує міркування",
-  "model.tooltip.reasoning.none": "Без міркування",
-  "model.tooltip.context": "Ліміт контексту {{limit}}",
   "model.preview.label.released": "Випущено",
   "model.preview.label.input": "Вхідні",
   "model.preview.label.output": "Вихідні",
@@ -301,11 +185,8 @@ export const dict = {
   "model.preview.modality.video": "Відео",
   "model.preview.modality.pdf": "PDF",
 
-  "common.search.placeholder": "Пошук",
   "common.goBack": "Назад",
-  "common.goForward": "Вперед",
   "common.loading": "Завантаження",
-  "common.loading.ellipsis": "...",
   "common.cancel": "Скасувати",
   "common.connect": "Підключити",
   "common.disconnect": "Відключити",
@@ -313,54 +194,8 @@ export const dict = {
   "common.save": "Зберегти",
   "common.saving": "Збереження...",
   "common.default": "За замовчуванням",
-  "common.attachment": "вкладення",
 
-  "prompt.placeholder.shell": "Введіть команду оболонки...",
-  "prompt.placeholder.normal": 'Запитайте щось... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "Підсумувати коментарі…",
-  "prompt.placeholder.summarizeComment": "Підсумувати коментар…",
-  "prompt.mode.shell": "Оболонка",
-  "prompt.mode.shell.exit": "esc для виходу",
-
-  "prompt.example.1": "Виправити TODO у кодовій базі",
-  "prompt.example.2": "Який технологічний стек у цьому проєкті?",
-  "prompt.example.3": "Виправити зламані тести",
-  "prompt.example.4": "Пояснити, як працює автентифікація",
-  "prompt.example.5": "Знайти і виправити вразливості безпеки",
-  "prompt.example.6": "Додати модульні тести для сервісу користувача",
-  "prompt.example.7": "Зробити цю функцію більш читабельною",
-  "prompt.example.8": "Що означає ця помилка?",
-  "prompt.example.9": "Допоможи мені налагодити цю проблему",
-  "prompt.example.10": "Згенерувати документацію API",
-  "prompt.example.11": "Оптимізувати запити до бази даних",
-  "prompt.example.12": "Додати валідацію введення",
-  "prompt.example.13": "Створити новий компонент для...",
-  "prompt.example.14": "Як розгорнути цей проєкт?",
-  "prompt.example.15": "Переглянути мій код на відповідність найкращим практикам",
-  "prompt.example.16": "Додати обробку помилок до цієї функції",
-  "prompt.example.17": "Пояснити цей шаблон регулярного виразу",
-  "prompt.example.18": "Конвертувати це у TypeScript",
-  "prompt.example.19": "Додати логування в кодову базу",
-  "prompt.example.20": "Які залежності застаріли?",
-  "prompt.example.21": "Допоможи написати скрипт міграції",
-  "prompt.example.22": "Реалізувати кешування для цього ендпоінту",
-  "prompt.example.23": "Додати пагінацію до цього списку",
-  "prompt.example.24": "Створити CLI-команду для...",
-  "prompt.example.25": "Як тут працюють змінні середовища?",
-
-  "prompt.popover.emptyResults": "Збігів не знайдено",
-  "prompt.popover.emptyCommands": "Команд не знайдено",
-  "prompt.dropzone.label": "Скиньте сюди зображення або PDF",
-  "prompt.slash.badge.custom": "власна",
-  "prompt.slash.badge.skill": "навичка",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "активний",
-  "prompt.context.includeActiveFile": "Включити активний файл",
-  "prompt.context.removeActiveFile": "Видалити активний файл з контексту",
-  "prompt.context.removeFile": "Видалити файл з контексту",
   "prompt.thinking.tooltip": "Зусилля міркування",
-  "prompt.action.attachFile": "Прикріпити файл",
-  "prompt.attachment.remove": "Видалити вкладення",
   "prompt.action.send": "Надіслати",
   "prompt.action.send.blocked": "Спочатку дайте відповідь або закрийте очікуюче питання",
   "prompt.action.send.recording": "Транскрибувати та надіслати",
@@ -400,192 +235,19 @@ export const dict = {
   "speechToText.tooltip.error": "Помилка голосового введення. Натисніть, щоб очистити.",
   "speechToText.error.title": "Помилка голосового введення",
   "speechToText.error.loginRequired": "Увійдіть до Kilo, щоб використовувати голосове введення.",
-  "speechToText.error.permission": "Доступ до мікрофона заборонено.",
-  "speechToText.error.microphone": "Не вдалося запустити мікрофон.",
-  "speechToText.error.recording": "Помилка запису.",
-  "speechToText.error.emptyRecording": "Аудіо не записано.",
   "speechToText.error.emptyTranscript": "Мовлення не виявлено.",
-  "speechToText.error.encoding": "Не вдалося закодувати запис.",
-  "speechToText.toast.transcribed": "Транскрипцію вставлено",
 
-  "prompt.toast.pasteUnsupported.title": "Вставка не підтримується",
-  "prompt.toast.pasteUnsupported.description": "Сюди можна вставляти лише зображення або PDF.",
-  "prompt.toast.modelAgentRequired.title": "Виберіть агента і модель",
-  "prompt.toast.modelAgentRequired.description": "Перед надсиланням запиту виберіть агента і модель.",
-  "prompt.toast.worktreeCreateFailed.title": "Не вдалося створити робоче дерево",
-  "prompt.toast.sessionCreateFailed.title": "Не вдалося створити сесію",
-  "prompt.toast.shellSendFailed.title": "Не вдалося надіслати команду оболонки",
-  "prompt.toast.commandSendFailed.title": "Не вдалося надіслати команду",
   "prompt.toast.promptSendFailed.title": "Не вдалося надіслати запит",
 
-  "dialog.mcp.title": "MCP",
-  "dialog.mcp.description": "{{enabled}} з {{total}} увімкнено",
-  "dialog.mcp.empty": "MCP не налаштовано",
-
-  "dialog.lsp.empty": "LSP автоматично визначаються за типами файлів",
-  "dialog.plugins.empty": "Плагіни налаштовуються в opencode.json",
-
   "mcp.status.connected": "підключено",
   "mcp.status.failed": "помилка",
   "mcp.status.needs_auth": "потрібна автентифікація",
   "mcp.status.needs_registration": "потрібна реєстрація клієнта",
   "mcp.status.disabled": "вимкнено",
 
-  "dialog.fork.empty": "Немає повідомлень для розгалуження",
-
-  "dialog.directory.search.placeholder": "Пошук папки",
-  "dialog.directory.empty": "Папок не знайдено",
-
-  "dialog.server.title": "Сервери",
-  "dialog.server.description": "Змінити, до якого сервера Kilo підключається цей додаток.",
-  "dialog.server.search.placeholder": "Пошук сервера",
-  "dialog.server.empty": "Поки що немає серверів",
-  "dialog.server.add.title": "Додати сервер",
-  "dialog.server.add.url": "URL сервера",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "Не вдалося підключитися до сервера",
-  "dialog.server.add.checking": "Перевірка...",
-  "dialog.server.add.button": "Додати сервер",
-  "dialog.server.default.title": "Сервер за замовчуванням",
-  "dialog.server.default.description":
-    "Підключатися до цього сервера замість запуску локального під час запуску програми. Потрібен перезапуск.",
-  "dialog.server.default.none": "Сервер не вибрано",
-  "dialog.server.default.set": "Встановити поточний сервер як стандартний",
-  "dialog.server.default.clear": "Очистити",
-  "dialog.server.action.remove": "Видалити сервер",
-
-  "dialog.server.menu.edit": "Редагувати",
-  "dialog.server.menu.default": "Встановити як стандартний",
-  "dialog.server.menu.defaultRemove": "Видалити стандартний",
-  "dialog.server.menu.delete": "Видалити",
-  "dialog.server.current": "Поточний сервер",
-  "dialog.server.status.default": "Стандартний",
-
-  "dialog.project.edit.title": "Редагувати проєкт",
-  "dialog.project.edit.name": "Назва",
-  "dialog.project.edit.icon": "Іконка",
-  "dialog.project.edit.icon.alt": "Іконка проєкту",
-  "dialog.project.edit.icon.hint": "Клацніть або перетягніть зображення",
-  "dialog.project.edit.icon.recommended": "Рекомендовано: 128x128px",
-  "dialog.project.edit.color": "Колір",
-  "dialog.project.edit.color.select": "Вибрати колір {{color}}",
-  "dialog.project.edit.worktree.startup": "Скрипт запуску робочого дерева",
-  "dialog.project.edit.worktree.startup.description": "Виконується після створення нового робочого дерева.",
-  "dialog.project.edit.worktree.startup.placeholder": "напр. bun install",
-
-  "context.breakdown.title": "Розбивка контексту",
-  "context.breakdown.note":
-    'Приблизна розбивка вхідних токенів. "Інше" включає визначення інструментів і накладні витрати.',
-  "context.breakdown.system": "Система",
-  "context.breakdown.user": "Користувач",
-  "context.breakdown.assistant": "Асистент",
-  "context.breakdown.tool": "Виклики інструментів",
-  "context.breakdown.other": "Інше",
-
-  "context.systemPrompt.title": "Системний запит",
-  "context.rawMessages.title": "Необроблені повідомлення",
-
-  "context.stats.session": "Сесія",
-  "context.stats.messages": "Повідомлення",
-  "context.stats.provider": "Провайдер",
-  "context.stats.model": "Модель",
-  "context.stats.limit": "Ліміт контексту",
-  "context.stats.totalTokens": "Всього токенів",
-  "context.stats.usage": "Використання",
-  "context.stats.inputTokens": "Вхідні токени",
-  "context.stats.outputTokens": "Вихідні токени",
-  "context.stats.reasoningTokens": "Токени міркування",
-  "context.stats.cacheTokens": "Токени кешу (читання/запис)",
-  "context.stats.userMessages": "Повідомлення користувача",
-  "context.stats.assistantMessages": "Повідомлення асистента",
-  "context.stats.totalCost": "Загальна вартість",
-  "context.stats.sessionCreated": "Сесію створено",
-  "context.stats.lastActivity": "Остання активність",
-
-  "context.usage.tokens": "Токени",
-  "context.usage.usage": "Використання",
-  "context.usage.cost": "Вартість",
-  "context.usage.clickToView": "Переглянути контекст",
-  "context.usage.view": "Переглянути використання контексту",
-
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
   "language.uk": "Українська",
 
-  "toast.language.title": "Мова",
-  "toast.language.description": "Перейшли на {{language}}",
-
-  "toast.theme.title": "Тему змінено",
-  "toast.scheme.title": "Кольорова схема",
-
-  "toast.workspace.enabled.title": "Робочі дерева увімкнено",
-  "toast.workspace.enabled.description": "На бічній панелі тепер відображаються кілька робочих дерев",
-  "toast.workspace.disabled.title": "Робочі дерева вимкнено",
-  "toast.workspace.disabled.description": "На бічній панелі відображається лише основне робоче дерево",
-
-  "toast.permissions.autoaccept.on.title": "Редагування приймаються автоматично",
-  "toast.permissions.autoaccept.on.description": "Дозволи на редагування і запис схвалюватимуться автоматично",
-  "toast.permissions.autoaccept.off.title": "Автоматичне прийняття зупинено",
-  "toast.permissions.autoaccept.off.description": "Дозволи на редагування і запис потребуватимуть підтвердження",
-
-  "toast.model.none.title": "Модель не вибрано",
-  "toast.model.none.description": "Підключіть провайдера, щоб підсумувати цю сесію",
-
-  "toast.file.loadFailed.title": "Не вдалося завантажити файл",
-  "toast.file.listFailed.title": "Не вдалося отримати список файлів",
-
-  "toast.context.noLineSelection.title": "Немає виділення рядків",
-  "toast.context.noLineSelection.description": "Спочатку виділіть діапазон рядків у вкладці файлу.",
-
-  "toast.session.share.copyFailed.title": "Не вдалося скопіювати URL до буфера обміну",
-  "toast.session.share.success.title": "Доступ до сесії відкрито",
-  "toast.session.share.success.description": "Посилання на сесію скопійовано до буфера обміну!",
-  "toast.session.share.failed.title": "Не вдалося відкрити доступ до сесії",
-  "toast.session.share.failed.description": "Під час відкриття доступу до сесії сталася помилка",
-
-  "toast.session.unshare.success.title": "Доступ до сесії закрито",
-  "toast.session.unshare.success.description": "Доступ до сесії успішно закрито!",
-  "toast.session.unshare.failed.title": "Не вдалося закрити доступ до сесії",
-  "toast.session.unshare.failed.description": "Під час закриття доступу до сесії сталася помилка",
-
   "toast.session.rename.invalid.title": "Некоректна назва сесії",
-  "toast.session.listFailed.title": "Не вдалося завантажити сесії для {{project}}",
-
-  "toast.update.title": "Доступне оновлення",
-  "toast.update.description": "Нова версія Kilo ({{version}}) готова до встановлення.",
-  "toast.update.action.installRestart": "Встановити і перезапустити",
-  "toast.update.action.notYet": "Не зараз",
-
-  "error.page.title": "Щось пішло не так",
-  "error.page.description": "Під час завантаження програми сталася помилка.",
-  "error.page.details.label": "Деталі помилки",
-  "error.page.action.restart": "Перезапустити",
-  "error.page.action.checking": "Перевірка...",
-  "error.page.action.checkUpdates": "Перевірити оновлення",
-  "error.page.action.updateTo": "Оновити до {{version}}",
-  "error.page.report.prefix": "Будь ласка, повідомте про цю помилку команді Kilo",
-  "error.page.report.discord": "через Discord",
-  "error.page.version": "Версія: {{version}}",
-
-  "error.dev.rootNotFound":
-    "Кореневий елемент не знайдено. Чи не забули ви додати його до index.html? Або можливо неправильно написано атрибут id?",
-
-  "error.globalSync.connectFailed": "Не вдалося підключитися до сервера. Чи запущений сервер на `{{url}}`?",
 
   "error.startup.title": "Підключення до сервера не вдалося",
 
@@ -603,30 +265,8 @@ export const dict = {
   "error.providerAuth.chatgpt.description":
     "Увійдіть у ChatGPT знову, а потім надішліть повідомлення ще раз, щоб продовжити використання моделей Codex.",
 
-  "error.chain.unknown": "Невідома помилка",
-  "error.chain.causedBy": "Спричинено:",
-  "error.chain.apiError": "Помилка API",
-  "error.chain.status": "Статус: {{status}}",
-  "error.chain.retryable": "Можна повторити: {{retryable}}",
-  "error.chain.responseBody": "Тіло відповіді:\n{{body}}",
-  "error.chain.didYouMean": "Можливо ви мали на увазі: {{suggestions}}",
-  "error.chain.modelNotFound": "Модель не знайдено: {{provider}}/{{model}}",
-  "error.chain.checkConfig": "Перевірте назви провайдера/моделі у файлі конфігурації (opencode.json)",
-  "error.chain.mcpFailed": 'MCP-сервер "{{name}}" зазнав помилки. Примітка: Kilo поки не підтримує автентифікацію MCP.',
-  "error.chain.providerAuthFailed": "Автентифікація провайдера не вдалася ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed":
-    'Не вдалося ініціалізувати провайдера "{{provider}}". Перевірте облікові дані та конфігурацію.',
-  "error.chain.configJsonInvalid": "Файл конфігурації за адресою {{path}} не є дійсним JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "Файл конфігурації за адресою {{path}} не є дійсним JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    'Директорія "{{dir}}" недійсна в {{path}}. Перейменуйте або видаліть директорію на "{{suggestion}}". Це поширена помилка написання.',
-  "error.chain.configFrontmatterError": "Не вдалося розібрати frontmatter у {{path}}:\n{{message}}",
-  "error.chain.configInvalid": "Файл конфігурації за адресою {{path}} недійсний",
-  "error.chain.configInvalidWithMessage": "Файл конфігурації за адресою {{path}} недійсний: {{message}}",
-
   "notification.permission.title": "Потрібен дозвіл",
   "notification.permission.titleSubagent": "Потрібен дозвіл (підагент)",
-  "notification.permission.description": "{{sessionTitle}} у {{projectName}} потребує дозволу",
   "ui.permission.manageAutoApprove": "Керувати правилами автоматичного схвалення",
   "ui.permission.doomLoop.prompt":
     "Виявлено потенційний цикл під час роботи інструмента {{tool}}. Продовжити виконання?",
@@ -652,7 +292,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "Читати завдання",
   "ui.permission.toolLabel.todoWrite": "Записати завдання",
   "ui.permission.toolLabel.codeSearch": "Пошук коду",
-  "ui.permission.toggleWrap": "Перемкнути перенос рядків",
   "ui.permission.copyCommand": "Копіювати",
   "ui.approval.auto": "Схвалено автоматично",
   "ui.approval.manual": "Схвалено вами",
@@ -664,48 +303,19 @@ export const dict = {
   "ui.approval.source.yolo": "режимом автосхвалення (YOLO)",
   "ui.approval.source.session": "правилом автосхвалення сесії",
   "ui.approval.source.default": "за замовчуванням",
-  "notification.question.title": "Питання",
-  "notification.question.description": "{{sessionTitle}} у {{projectName}} задає питання",
-  "notification.action.goToSession": "Перейти до сесії",
 
-  "notification.session.responseReady.title": "Відповідь готова",
-  "notification.session.error.title": "Помилка сесії",
-  "notification.session.error.fallbackDescription": "Сталася помилка",
-
-  "home.recentProjects": "Останні проєкти",
-  "home.empty.title": "Немає останніх проєктів",
-  "home.empty.description": "Почніть з відкриття локального проєкту",
-
-  "session.tab.session": "Сесія",
   "session.tab.review": "Огляд",
-  "session.tab.context": "Контекст",
-  "session.panel.reviewAndFiles": "Огляд і файли",
   "session.review.filesChanged": "{{count}} файлів змінено",
-  "session.review.change.one": "Зміна",
   "session.review.change.other": "Змін",
   "session.review.loadingChanges": "Завантаження змін...",
-  "session.review.empty": "У цій сесії ще немає змін",
   "session.review.noChanges": "Змін немає",
 
-  "session.files.selectToOpen": "Виберіть файл для відкриття",
-  "session.files.all": "Усі файли",
-  "session.files.binaryContent": "Бінарний файл (вміст не відображається)",
-
-  "session.messages.renderEarlier": "Показати попередні повідомлення",
   "session.messages.loadingEarlier": "Завантаження попередніх повідомлень...",
   "session.messages.loadEarlier": "Завантажити попередні повідомлення",
   "session.messages.loading": "Завантаження повідомлень...",
-  "session.messages.jumpToLatest": "Перейти до останнього",
 
-  "session.context.addToContext": "Додати {{selection}} до контексту",
-
-  "session.new.worktree.main": "Основна гілка",
-  "session.new.worktree.mainWithBranch": "Основна гілка ({{branch}})",
-  "session.new.worktree.create": "Створити нове робоче дерево",
-  "session.new.lastModified": "Останнє змінення",
   "sidebar.session.newSession": "Нова сесія",
   "sidebar.session.newSession.tooltip": "Почати нову розмову, зберігши поточну сесію незмінною.",
-  "sidebar.session.newSession.disabled": "Ця сесія вже нова. Почніть спілкуватися або створіть worktree.",
   "sidebar.session.newWorktree": "Нове Worktree",
   "sidebar.session.newWorktree.tooltip":
     "Створіть ізольоване git worktree для безпечних експериментів, розділення змін та запуску паралельних сесій без переривання поточної гілки.",
@@ -721,131 +331,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "Перемістити цю розмову та {{files}} змінених файлів у виділений worktree для ізольованої подальшої роботи.",
   "sidebar.session.showChanges.tooltip.empty": "Відкрийте перегляд змін, щоб оглянути поточне робоче дерево.",
-  "sidebar.session.showChanges.tooltip.one": "1 файл змінено · +{{additions}} -{{deletions}}. Відкрити перегляд змін.",
-  "sidebar.session.showChanges.tooltip.other":
-    "{{files}} файлів змінено · +{{additions}} -{{deletions}}. Відкрити перегляд змін.",
-  "sidebar.session.agentManager.tooltip":
-    "Відкрийте Agent Manager для повного огляду паралельних сесій та worktree, щоб координивати тривалі завдання в одному місці.",
-  "sidebar.session.openAgentManager": "Відкрити Agent Manager",
   "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",
-  "session.header.search.placeholder": "Пошук {{project}}",
-  "session.header.searchFiles": "Пошук файлів",
-  "session.header.openIn": "Відкрити в",
-  "session.header.open.action": "Відкрити в {{app}}",
-  "session.header.open.ariaLabel": "Відкрити в {{app}}",
-  "session.header.open.menu": "Параметри відкриття",
-  "session.header.open.copyPath": "Копіювати шлях",
-
-  "status.popover.trigger": "Статус",
-  "status.popover.ariaLabel": "Конфігурації сервера",
-  "status.popover.tab.servers": "Сервери",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "Плагіни",
-  "status.popover.action.manageServers": "Керувати серверами",
-
-  "session.share.popover.title": "Опублікувати в інтернеті",
-  "session.share.popover.description.shared":
-    "Ця сесія публічно доступна в інтернеті. Будь-хто з посиланням може отримати доступ.",
-  "session.share.popover.description.unshared":
-    "Опублікуйте сесію публічно в інтернеті. Будь-хто з посиланням зможе переглянути її.",
-  "session.share.action.share": "Поділитися",
-  "session.share.action.publish": "Опублікувати",
-  "session.share.action.publishing": "Публікація...",
-  "session.share.action.unpublish": "Зняти з публікації",
-  "session.share.action.unpublishing": "Зняття з публікації...",
-  "session.share.action.view": "Переглянути",
-  "session.share.copy.copied": "Скопійовано",
-  "session.share.copy.copyLink": "Копіювати посилання",
-
-  "lsp.tooltip.none": "Немає LSP-серверів",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "Завантаження запиту...",
-  "terminal.loading": "Завантаження терміналу...",
-  "terminal.title": "Термінал",
-  "terminal.title.numbered": "Термінал {{number}}",
-  "terminal.close": "Закрити термінал",
-  "terminal.connectionLost.title": "З'єднання втрачено",
-  "terminal.connectionLost.description": "З'єднання з терміналом перервано. Це може статися після перезапуску сервера.",
 
   "common.closeTab": "Закрити вкладку",
   "common.signIn": "Увійти",
-  "common.signOut": "Вийти",
   "common.dismiss": "Закрити",
   "common.requestFailed": "Запит не вдався",
-  "common.moreOptions": "Більше параметрів",
-  "common.learnMore": "Дізнатися більше",
   "common.rename": "Перейменувати",
-  "common.reset": "Скинути",
-  "common.archive": "Архівувати",
   "common.delete": "Видалити",
   "common.close": "Закрити",
   "common.edit": "Редагувати",
   "common.loadMore": "Завантажити більше",
-  "common.key.esc": "ESC",
 
-  "sidebar.menu.toggle": "Перемкнути меню",
-  "sidebar.nav.projectsAndSessions": "Проєкти і сесії",
   "sidebar.settings": "Налаштування",
-  "sidebar.help": "Допомога",
-  "sidebar.workspaces.enable": "Увімкнути робочі дерева",
-  "sidebar.workspaces.disable": "Вимкнути робочі дерева",
-  "sidebar.gettingStarted.title": "Початок роботи",
-  "sidebar.gettingStarted.line1": "Kilo включає безкоштовні моделі, тому ви можете почати відразу.",
-  "sidebar.gettingStarted.line2": "Підключіть будь-якого провайдера для використання моделей Claude, GPT, Gemini тощо.",
-  "sidebar.project.recentSessions": "Останні сесії",
-  "sidebar.project.viewAllSessions": "Переглянути всі сесії",
 
-  "app.name.desktop": "Kilo Desktop",
-
-  "settings.section.desktop": "Робочий стіл",
-  "settings.section.server": "Сервер",
-  "settings.tab.general": "Загальні",
-  "settings.tab.shortcuts": "Скорочення",
-
-  "settings.general.section.appearance": "Вигляд",
-  "settings.general.section.notifications": "Системні сповіщення",
-  "settings.general.section.updates": "Оновлення",
-  "settings.general.section.sounds": "Звукові ефекти",
-
-  "settings.general.row.language.title": "Мова",
-  "settings.general.row.language.description": "Змінити мову відображення Kilo",
-  "settings.general.row.appearance.title": "Вигляд",
-  "settings.general.row.appearance.description": "Налаштувати вигляд Kilo на вашому пристрої",
-  "settings.general.row.theme.title": "Тема",
-  "settings.general.row.theme.description": "Налаштувати тему Kilo.",
-  "settings.general.row.font.title": "Шрифт",
-  "settings.general.row.font.description": "Налаштувати моноширинний шрифт, що використовується в блоках коду",
-
-  "settings.general.row.releaseNotes.title": "Примітки до випуску",
-  "settings.general.row.releaseNotes.description": "Показувати сповіщення про новини після оновлень",
-
-  "settings.updates.row.startup.title": "Перевіряти оновлення під час запуску",
-  "settings.updates.row.startup.description": "Автоматично перевіряти оновлення при запуску Kilo",
-  "settings.updates.row.check.title": "Перевірити оновлення",
-  "settings.updates.row.check.description": "Вручну перевірити та встановити оновлення",
-  "settings.updates.action.checkNow": "Перевірити зараз",
-  "settings.updates.action.checking": "Перевірка...",
-  "settings.updates.toast.latest.title": "Ви використовуєте актуальну версію",
-  "settings.updates.toast.latest.description": "У вас встановлена остання версія Kilo.",
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "Сигнал 01",
   "sound.option.alert02": "Сигнал 02",
   "sound.option.alert03": "Сигнал 03",
@@ -892,43 +396,7 @@ export const dict = {
   "sound.option.yup05": "Так 05",
   "sound.option.yup06": "Так 06",
 
-  "settings.general.notifications.agent.title": "Агент",
-  "settings.general.notifications.agent.description":
-    "Показувати системне сповіщення, коли агент завершив роботу або потребує уваги",
-  "settings.general.notifications.permissions.title": "Дозволи",
-  "settings.general.notifications.permissions.description": "Показувати системне сповіщення при запиті дозволу",
-  "settings.general.notifications.errors.title": "Помилки",
-  "settings.general.notifications.errors.description": "Показувати системне сповіщення при виникненні помилки",
-
-  "settings.general.sounds.agent.title": "Агент",
-  "settings.general.sounds.agent.description": "Відтворювати звук, коли агент завершив роботу або потребує уваги",
-  "settings.general.sounds.permissions.title": "Дозволи",
-  "settings.general.sounds.permissions.description": "Відтворювати звук при запиті дозволу",
-  "settings.general.sounds.errors.title": "Помилки",
-  "settings.general.sounds.errors.description": "Відтворювати звук при виникненні помилки",
-
-  "settings.shortcuts.title": "Клавіатурні скорочення",
-  "settings.shortcuts.reset.button": "Скинути до стандартних",
-  "settings.shortcuts.reset.toast.title": "Скорочення скинуто",
-  "settings.shortcuts.reset.toast.description": "Клавіатурні скорочення скинуто до стандартних.",
-  "settings.shortcuts.conflict.title": "Скорочення вже використовується",
-  "settings.shortcuts.conflict.description": "{{keybind}} вже призначено для {{titles}}.",
-  "settings.shortcuts.unassigned": "Не призначено",
-  "settings.shortcuts.pressKeys": "Натисніть клавіші",
-  "settings.shortcuts.search.placeholder": "Пошук скорочень",
-  "settings.shortcuts.search.empty": "Скорочень не знайдено",
-
-  "settings.shortcuts.group.general": "Загальні",
-  "settings.shortcuts.group.session": "Сесія",
-  "settings.shortcuts.group.navigation": "Навігація",
-  "settings.shortcuts.group.modelAndAgent": "Модель і агент",
-  "settings.shortcuts.group.terminal": "Термінал",
-  "settings.shortcuts.group.prompt": "Запит",
-
   "settings.providers.title": "Провайдери",
-  "settings.providers.description": "Тут можна буде налаштовувати параметри провайдерів.",
-  "settings.providers.betaNotice":
-    "Наразі в інтерфейсі налаштувань можна налаштувати лише провайдера Kilo Gateway. Підтримка інших провайдерів з'явиться в бета-версії найближчим часом. Тим часом ви можете налаштовувати провайдерів через CLI або файл конфігурації. Kilo залишається відкритим — без прив'язки.",
   "settings.providers.section.connected": "Підключені провайдери",
   "settings.providers.connected.empty": "Підключених провайдерів немає",
   "settings.providers.section.popular": "Популярні провайдери",
@@ -1007,9 +475,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "Видалити модель",
   "provider.custom.models.add": "Додати модель",
-  "provider.custom.models.fetch": "Отримати моделі",
-  "provider.custom.models.fetching": "Отримання\u2026",
-  "provider.custom.models.fetch.error": "Не вдалося отримати моделі: {{error}}",
   "provider.custom.models.fetch.authError": "Автентифікація не вдалася. Перевірте API-ключ вище і спробуйте ще раз.",
   "provider.custom.models.fetch.empty": "На цьому сервері моделей не знайдено.",
   "provider.custom.models.fetch.added": "Додано {{count}} моделей.",
@@ -1061,23 +526,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "Застаріла конфігурація .kilocode",
   "settings.config.source.projectOpencode": "Застаріла конфігурація .opencode",
   "settings.models.title": "Моделі",
-  "settings.models.description": "Тут можна буде налаштовувати параметри моделей.",
-  "settings.agents.title": "Агенти",
-  "settings.agents.description": "Тут можна буде налаштовувати параметри агентів.",
-  "settings.commands.title": "Команди",
-  "settings.commands.description": "Тут можна буде налаштовувати параметри команд.",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "Тут можна буде налаштовувати параметри MCP.",
 
-  "settings.permissions.title": "Дозволи",
-  "settings.permissions.description": "Контролюйте, які інструменти сервер може використовувати за замовчуванням.",
-  "settings.permissions.section.tools": "Інструменти",
   "settings.permissions.toast.updateFailed.title": "Не вдалося оновити дозволи",
 
-  "settings.permissions.action.allow": "Дозволити",
-  "settings.permissions.action.ask": "Запитувати",
-  "settings.permissions.action.deny": "Відхилити",
-
   "settings.permissions.tool.read.title": "Читати",
   "settings.permissions.tool.read.description": "Читати файл (відповідає шляху файлу)",
   "settings.permissions.tool.edit.title": "Редагувати",
@@ -1113,7 +564,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.description":
     "Виявляти повторювані виклики інструментів з однаковими вхідними даними",
 
-  "session.delete.failed.title": "Не вдалося видалити сесію",
   "session.delete.title": "Видалити сесію",
   "session.delete.confirm": 'Видалити сесію "{{name}}"?',
   "session.delete.button": "Видалити сесію",
@@ -1141,14 +591,9 @@ export const dict = {
   "feedback.dialog.support": "Служба підтримки клієнтів",
   "workStyle.onboarding.welcome": "Ласкаво просимо до Kilo",
   "workStyle.onboarding.title": "Виберіть, як ви хочете працювати",
-  "workStyle.onboarding.description":
-    "Встановлює початкові значення дозволів, блоків міркувань, виводу термінала та часової шкали контексту. Застосовується лише один раз і не змінює вже налаштовані вами параметри.",
-  "workStyle.onboarding.skip": "Поки пропустити",
   "workStyle.onboarding.settingsNote": "Ці параметри можна будь-коли змінити в розділі",
   "workStyle.onboarding.settings": "«Налаштування».",
   "workStyle.toast.saved.title": "Режим успішно збережено",
-  "workStyle.toast.saved.description": "Змінити їх можна будь-коли в налаштуваннях.",
-  "workStyle.toast.saved.action": "Перейти до налаштувань",
   "workStyle.choice.permissions": "Дозволи",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "Видимість",
@@ -1171,32 +616,6 @@ export const dict = {
   "session.cloud.import.legacy": "Схоже, це застаріла сесія, яка більше не підтримується.",
   "session.cloud.import.failed": "Не вдалося імпортувати хмарну сесію",
 
-  "workspace.new": "Новий робочий простір",
-  "workspace.type.local": "локальний",
-  "workspace.type.sandbox": "пісочниця",
-  "workspace.create.failed.title": "Не вдалося створити робочий простір",
-  "workspace.delete.failed.title": "Не вдалося видалити робочий простір",
-  "workspace.resetting.title": "Скидання робочого простору",
-  "workspace.resetting.description": "Це може зайняти хвилину.",
-  "workspace.reset.failed.title": "Не вдалося скинути робочий простір",
-  "workspace.reset.success.title": "Робочий простір скинуто",
-  "workspace.reset.success.description": "Робочий простір тепер відповідає основній гілці.",
-  "workspace.error.stillPreparing": "Робочий простір ще підготовлюється",
-  "workspace.status.checking": "Перевірка неприйнятих змін...",
-  "workspace.status.error": "Не вдалося перевірити статус git.",
-  "workspace.status.clean": "Неприйнятих змін не виявлено.",
-  "workspace.status.dirty": "У цьому робочому просторі виявлено неприйняті зміни.",
-  "workspace.delete.title": "Видалити робочий простір",
-  "workspace.delete.confirm": 'Видалити робочий простір "{{name}}"?',
-  "workspace.delete.button": "Видалити робочий простір",
-  "workspace.reset.title": "Скинути робочий простір",
-  "workspace.reset.confirm": 'Скинути робочий простір "{{name}}"?',
-  "workspace.reset.button": "Скинути робочий простір",
-  "workspace.reset.archived.none": "Немає активних сесій для архівування.",
-  "workspace.reset.archived.one": "1 сесію буде архівовано.",
-  "workspace.reset.archived.many": "{{count}} сесій буде архівовано.",
-  "workspace.reset.note": "Ця дія скине робочий простір відповідно до основної гілки.",
-
   "deviceAuth.toast.urlCopied": "URL скопійовано до буфера обміну",
   "deviceAuth.toast.codeCopied": "Код скопійовано до буфера обміну",
   "deviceAuth.toast.errorCopied": "Помилку скопійовано до буфера обміну",
@@ -1234,7 +653,6 @@ export const dict = {
   "profile.pass.renews": "Поновлюється",
   "profile.action.logout": "Вийти",
 
-  "settings.section.configuration": "Конфігурація",
   "settings.agentBehaviour.title": "Поведінка агента",
   "settings.autoApprove.title": "Автоматичне схвалення",
   "settings.browser.title": "Браузер",
@@ -1257,7 +675,6 @@ export const dict = {
   "settings.indexing.projectEnable.title": "Увімкнути для цього проєкту",
   "settings.indexing.projectEnable.description":
     "Увімкнути індексування для цього робочого простору, коли глобальне індексування вимкнено.",
-  "settings.indexing.projectEnable.disabledTooltip": "Глобальне індексування ввімкнено, тому цей проєкт уже охоплено.",
   "settings.indexing.provider.title": "Провайдер ембедингів",
   "settings.indexing.provider.description": "Виберіть провайдера для генерації ембедингів для семантичного пошуку.",
   "settings.indexing.model.title": "Модель ембедингів",
@@ -1287,7 +704,6 @@ export const dict = {
   "settings.language.title": "Мова",
   "settings.aboutKiloCode.title": "Про Kilo Code",
 
-  "session.messages.empty": "Напишіть повідомлення нижче, щоб розпочати чат.",
   "session.messages.welcome":
     "Kilo Code — це асистент з кодування на базі ШІ. Попросіть його розробити функцію, виправити помилку або пояснити вашу кодову базу.",
   "session.messages.scrollToBottom": "Прокрутити до низу",
@@ -1295,7 +711,6 @@ export const dict = {
   "session.messages.taskStarting": "Запуск...",
   "session.status.writingResponse": "Пишу відповідь...",
   "session.status.retry": "Повторна спроба…",
-  "session.status.retrying": "Повторна спроба (спроба {{ attempt }})… {{ message }}",
   "session.status.working": "Працює...",
   "session.status.offline": "Мережу відключено — перепідключення...",
   "session.outcome.incomplete": "Хід завершився з {{count}} невиконаними завданнями",
@@ -1327,11 +742,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} старіших сесій",
   "context.stats.thisSession": "Ця сесія",
 
-  "time.justNow": "щойно",
-  "time.minutesAgo": "{{count}} хв тому",
-  "time.hoursAgo": "{{count}} г тому",
-  "time.daysAgo": "{{count}} д тому",
-  "time.monthsAgo": "{{count}} міс тому",
   "time.today": "Сьогодні",
   "time.yesterday": "Вчора",
   "time.thisWeek": "Цього тижня",
@@ -1347,7 +757,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "Порт:",
   "settings.aboutKiloCode.versionInfo": "Інформація про версію",
   "settings.aboutKiloCode.version.label": "Версія:",
-  "settings.aboutKiloCode.extensionName": "Розширення Kilo Code",
   "settings.aboutKiloCode.community": "Спільнота і підтримка",
   "settings.aboutKiloCode.feedback.prefix": "Якщо у вас є питання або відгуки, будь ласка, відкрийте тікет на:",
   "settings.aboutKiloCode.feedback.or": "або",
@@ -1398,7 +807,6 @@ export const dict = {
   "settings.language.current": "Поточна:",
 
   "common.add": "Додати",
-  "common.choose": "Вибрати…",
 
   "settings.autocomplete.autoTrigger.title": "Увімкнути автоматичні підказки",
   "settings.autocomplete.autoTrigger.description": "Автоматично показувати підказки під час введення",
@@ -1409,28 +817,15 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.description": "Показувати підказки автодоповнення в полі введення чату",
   "settings.autocomplete.modelsHint": "Щоб вибрати модель для автодоповнення, див. Налаштування моделей.",
 
-  "settings.notifications.agent.title": "Завершення агента",
-  "settings.notifications.agent.description": "Показувати сповіщення, коли агент завершить завдання",
-  "settings.notifications.permissions.title": "Запити дозволів",
-  "settings.notifications.permissions.description": "Показувати сповіщення при запитах дозволів",
-  "settings.notifications.errors.title": "Помилки",
-  "settings.notifications.errors.description": "Показувати сповіщення при виникненні помилок",
   "settings.notifications.sounds": "Звуки",
   "settings.notifications.enable.title": "Увімкнути звукові сповіщення",
   "settings.notifications.enable.description":
     "Відтворювати звуки, коли сеанси завершуються, виникає помилка або потрібна ваша відповідь",
   "settings.notifications.testSound": "Тест",
-  "settings.notifications.agentSound.title": "Звук завершення агента",
-  "settings.notifications.agentSound.description": "Звук, що відтворюється після завершення агента",
-  "settings.notifications.permSound.title": "Звук запиту дозволу",
-  "settings.notifications.permSound.description": "Звук, що відтворюється при запитах дозволів",
-  "settings.notifications.errorSound.title": "Звук помилки",
-  "settings.notifications.errorSound.description": "Звук, що відтворюється при виникненні помилок",
   "settings.notifications.sound.default": "За замовчуванням",
   "settings.notifications.sound.system": "Системний",
   "settings.notifications.sound.description":
     "За замовчуванням для завершення, запиту на введення та помилок використовуються різні звуки. В інших варіантах для всіх подій використовується один і той самий звук.",
-  "settings.notifications.sound.none": "Немає",
 
   "settings.experimental.share.title": "Режим публікації",
   "settings.experimental.share.description": "Як поводиться публікація сесій",
@@ -1452,9 +847,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "Модель генерації зображень",
   "settings.experimental.imageGenerationModel.placeholder": "За замовчуванням (Auto Router)",
 
-  "settings.experimental.speechToText.title": "Мовлення в текст",
-  "settings.experimental.speechToText.description":
-    "Увімкніть голосове введення в полях запитів, використовуючи ваш обліковий запис Kilo через Kilo Gateway.",
   "settings.models.speechToText.disabledDescription":
     "Увімкніть провайдер Kilo та виконайте вхід, щоб використовувати Speech to Text. Наразі Speech to Text підтримується лише з Kilo Gateway.",
   "settings.models.speechToTextModel.title": "Модель мовлення в текст",
@@ -1499,15 +891,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "Агент за замовчуванням",
   "settings.agentBehaviour.defaultAgent.description": "Агент, що використовується, якщо не вказано інший",
   "settings.agentBehaviour.availableAgents": "Доступні агенти",
-  "settings.agentBehaviour.selectAgent": "Виберіть агента для налаштування…",
-  "settings.agentBehaviour.selectAgent.title": "Агент",
-  "settings.agentBehaviour.selectAgent.description": "Виберіть агента для налаштування…",
   "settings.agentBehaviour.modelOverride.title": "Перевизначення моделі",
   "settings.agentBehaviour.modelOverride.description": "Перевизначити стандартну модель для цього агента",
   "settings.agentBehaviour.variantOverride.title": "Перевизначення варіанту",
   "settings.agentBehaviour.variantOverride.description": "Перевизначити варіант моделі для цього агента",
-  "settings.agentBehaviour.prompt.title": "Власний запит",
-  "settings.agentBehaviour.prompt.description": "Додатковий системний запит для цього агента",
   "settings.agentBehaviour.temperature.title": "Температура",
   "settings.agentBehaviour.temperature.description":
     "Керує ступенем випадковості відповідей ШІ (0–2). Нижчі значення (наприклад, 0.2) дають більш зосереджений і послідовний результат. Вищі значення (наприклад, 1.0) дають різноманітніші й творчіші відповіді. Залиште поле порожнім, щоб використовувати типове значення моделі.",
@@ -1527,7 +914,6 @@ export const dict = {
   "settings.agentBehaviour.discoveredSkills": "Виявлені навички",
   "settings.agentBehaviour.noSkillsFound":
     "Навичок не виявлено. Додайте шляхи до папок навичок або URL нижче, щоб зробити їх доступними.",
-  "settings.agentBehaviour.availableModes": "Доступні власні режими",
   "settings.agentBehaviour.noAgentsFound": "Агентів не знайдено.",
   "settings.agentBehaviour.importMode": "Імпортувати",
   "settings.agentBehaviour.importMode.invalidName":
@@ -1561,7 +947,6 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "Команда",
   "settings.agentBehaviour.mcpDetail.args": "Аргументи",
   "settings.agentBehaviour.mcpDetail.env": "Середовище",
-  "settings.agentBehaviour.mcpDetail.disabled": "Цей сервер вимкнено.",
   "settings.agentBehaviour.editMcp": "Редагувати MCP-сервер",
   "settings.agentBehaviour.editMcp.transportLocal": "Локальний сервер (stdio транспорт)",
   "settings.agentBehaviour.editMcp.transportRemote": "Віддалений сервер (SSE/HTTP транспорт)",
@@ -1577,8 +962,6 @@ export const dict = {
   "settings.agentBehaviour.mcpBrowseMarketplace": "Переглянути Marketplace",
   "settings.agentBehaviour.mcpEmpty":
     "MCP-серверів не налаштовано. Додайте MCP-сервери до kilo.jsonc або попросіть агента додати їх.",
-  "settings.agentBehaviour.workflowsPlaceholder":
-    "Робочими процесами керують файли робочих процесів у вашому робочому просторі.",
   "settings.agentBehaviour.workflows.description":
     "Робочі процеси — це власні команди з косою рискою, визначені у вашій конфігурації. Введіть /назва-команди в чаті, щоб викликати їх. Команди налаштовуються в розділі 'command' файлу opencode.json.",
   "settings.agentBehaviour.workflows.empty":
@@ -1668,7 +1051,6 @@ export const dict = {
     "напр., Згенеруй commit messages іспанською мовою у форматі conventional commits. Поверни ЛИШЕ commit message.",
 
   "settings.commitMessage.language.sync": "Синхронізація з мовою інтерфейсу користувача",
-  "settings.commitMessage.language.title": "Мова",
   "settings.commitMessage.language.description":
     "Виберіть, яку мову використовувати для повідомлень, створених штучним інтелектом:",
 
@@ -1717,11 +1099,7 @@ export const dict = {
   "settings.providers.disabled": "Вимкнені провайдери",
   "settings.providers.disabled.description": "Провайдери, що будуть приховані у списку провайдерів",
   "settings.providers.disabled.enable": "Увімкнути",
-  "settings.providers.enabled": "Увімкнені провайдери (список дозволених)",
-  "settings.providers.enabled.description": "Якщо встановлено, доступні лише ці провайдери (власний список дозволених)",
   "settings.providers.notSet": "Не встановлено (використовувати стандартний сервера)",
-  "settings.providers.custom.note": "Додати власного провайдера через базовий URL.",
-  "settings.providers.search.placeholder": "Пошук провайдера",
   "settings.providers.select.placeholder": "Вибрати провайдера...",
 
   "dialog.model.notSet": "Не встановлено",
@@ -1764,9 +1142,7 @@ export const dict = {
   "migration.migrate.title": "Перенесіть свої налаштування",
   "migration.migrate.subtitle": "Ми знайшли налаштування з попередньої версії. Ось що можна перенести.",
   "migration.migrate.selectLabel": "Вибрати для перенесення",
-  "migration.migrate.cannotMigrate": "Неможливо перенести",
   "migration.migrate.chatHistory": "Сесії чату та історія",
-  "migration.migrate.chatHistoryDesc": "Несумісно з новою архітектурою",
   "migration.migrate.button": "Перенести налаштування",
   "migration.migrate.skip": "Пропустити",
   "migration.migrate.keysDetected": "Виявлено {{count}} ключів",
@@ -1790,10 +1166,7 @@ export const dict = {
     "Це видалить старі налаштування зі сховища VS Code. Ви не зможете повторно запустити це перенесення.",
   "migration.complete.done": "Готово",
   "migration.migrate.sessionsDetected": "Знайдено {{count}} сесій",
-  "migration.error.sessionFailed": "Перенесення сесії не вдалося",
   "migration.error.continue": "Продовжити",
-  "migration.error.action.copy": "Копіювати",
-  "migration.error.toast.copied": "Помилку скопійовано до буфера обміну",
 
   "migration.sessionSummary.title": "Підсумок:",
   "migration.sessionSummary.copy": "Скопіювати звіт",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index fbb16315614..ae31c74807d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -54,85 +54,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "建议",
-  "command.category.view": "视图",
-  "command.category.project": "项目",
-  "command.category.provider": "提供商",
-  "command.category.server": "服务器",
-  "command.category.session": "会话",
-  "command.category.theme": "主题",
-  "command.category.language": "语言",
-  "command.category.file": "文件",
-  "command.category.context": "上下文",
-  "command.category.terminal": "终端",
-  "command.category.model": "模型",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "智能体",
-  "command.category.permissions": "权限",
-  "command.category.workspace": "工作区",
 
-  "command.category.settings": "设置",
-  "theme.scheme.system": "系统",
-  "theme.scheme.light": "浅色",
-  "theme.scheme.dark": "深色",
-
-  "command.sidebar.toggle": "切换侧边栏",
-  "command.project.open": "打开项目",
   "command.provider.connect": "连接提供商",
-  "command.server.switch": "切换服务器",
-  "command.settings.open": "打开设置",
-  "command.session.previous": "上一个会话",
-  "command.session.next": "下一个会话",
-  "command.session.previous.unseen": "上一个未读会话",
-  "command.session.next.unseen": "下一个未读会话",
-  "command.session.archive": "归档会话",
-
-  "command.palette": "命令面板",
-
-  "command.theme.cycle": "切换主题",
-  "command.theme.set": "使用主题：{{theme}}",
-  "command.theme.scheme.cycle": "切换配色方案",
-  "command.theme.scheme.set": "使用配色方案：{{scheme}}",
-
-  "command.language.cycle": "切换语言",
-  "command.language.set": "使用语言：{{language}}",
 
   "command.session.new": "新建会话",
-  "command.session.new.task": "新建任务",
   "command.session.show.changes": "显示更改",
-  "command.file.open": "打开文件",
-  "command.tab.close": "关闭标签页",
-  "command.context.addSelection": "将所选内容添加到上下文",
-  "command.context.addSelection.description": "添加当前文件中选中的行",
-  "command.terminal.toggle": "切换终端",
-  "command.fileTree.toggle": "切换文件树",
   "command.review.toggle": "切换审查",
-  "command.terminal.new": "新建终端",
-  "command.terminal.new.description": "创建新的终端标签页",
-  "command.steps.toggle": "切换步骤",
-  "command.steps.toggle.description": "显示或隐藏当前消息的步骤",
-  "command.message.previous": "上一条消息",
-  "command.message.previous.description": "跳转到上一条用户消息",
-  "command.message.next": "下一条消息",
-  "command.message.next.description": "跳转到下一条用户消息",
-  "command.model.choose": "选择模型",
-  "command.model.choose.description": "选择不同的模型",
-  "command.mcp.toggle": "切换 MCPs",
-  "command.mcp.toggle.description": "切换 MCPs",
-  "command.agent.cycle": "切换智能体",
-  "command.agent.cycle.description": "切换到下一个智能体",
-  "command.agent.cycle.reverse": "反向切换智能体",
-  "command.agent.cycle.reverse.description": "切换到上一个智能体",
-  "command.model.variant.cycle": "切换思考强度",
-  "command.model.variant.cycle.description": "切换到下一个强度等级",
-  "command.permissions.autoaccept.enable": "自动接受编辑",
-  "command.permissions.autoaccept.disable": "停止自动接受编辑",
-  "command.workspace.toggle": "切换工作区",
-  "command.workspace.toggle.description": "启用或禁用侧边栏中的多工作区",
-  "command.session.undo": "撤销",
-  "command.session.undo.description": "撤销上一条消息",
-  "command.session.redo": "重做",
-  "command.session.redo.description": "重做上一条撤销的消息",
   "revert.banner.count_one": "已还原 {{count}} 条消息",
   "revert.banner.count_other": "已还原 {{count}} 条消息",
   "revert.banner.redo": "重做",
@@ -144,13 +71,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "启用快照",
   "revert.disabled.agentBusy": "等待智能体完成",
   "command.session.compact": "精简会话",
-  "command.session.compact.description": "总结会话以减少上下文大小",
-  "command.session.fork": "从消息分叉",
-  "command.session.fork.description": "从之前的消息创建新会话",
-  "command.session.share": "分享会话",
-  "command.session.share.description": "分享此会话并将链接复制到剪贴板",
-  "command.session.unshare": "取消分享会话",
-  "command.session.unshare.description": "停止分享此会话",
   "command.session.export": "导出会话记录",
 
   "agentRequirements.skill.installed": "已安装",
@@ -177,11 +97,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "此代理要求检查已不再有效。",
   "agentRequirements.error.requestFailed": "Kilo 无法检查代理要求。",
 
-  "palette.search.placeholder": "搜索文件、命令和会话",
-  "palette.empty": "未找到结果",
-  "palette.group.commands": "命令",
-  "palette.group.files": "文件",
-
   "dialog.provider.search.placeholder": "搜索提供商",
   "dialog.provider.empty": "未找到提供商",
   "dialog.provider.group.other": "其他",
@@ -190,19 +105,13 @@ export const dict = {
   "dialog.model.select.title": "选择模型",
   "dialog.model.search.placeholder": "搜索模型",
   "dialog.model.empty": "未找到模型",
-  "dialog.model.manage": "管理模型",
-  "dialog.model.manage.description": "自定义模型选择器中显示的模型。",
   "dialog.model.select": "选择",
   "dialog.model.expand": "展开",
   "dialog.model.collapse": "收起",
 
-  "dialog.model.unpaid.freeModels.title": "Kilo 提供的免费模型",
-  "dialog.model.unpaid.addMore.title": "从热门提供商添加更多模型",
-
   "dialog.provider.viewAll": "查看更多提供商",
 
   "provider.connect.title": "连接 {{provider}}",
-  "provider.connect.title.anthropicProMax": "使用 Claude Pro/Max 登录",
   "provider.connect.selectMethod": "选择 {{provider}} 的登录方式。",
   "provider.connect.method.apiKey": "API 密钥",
   "provider.connect.status.inProgress": "正在授权...",
@@ -229,18 +138,12 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "例如：my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI 端点 URL",
   "provider.connect.azure.baseURL.placeholder": "例如：https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1": "OpenCode Zen 为你提供一组精选的可靠优化模型，用于代码智能体。",
-  "provider.connect.opencodeZen.line2": "只需一个 API 密钥，你就能使用 Claude、GPT、Gemini、GLM 等模型。",
-  "provider.connect.opencodeZen.visit.prefix": "访问 ",
-  "provider.connect.opencodeZen.visit.link": "https://opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " 获取你的 API 密钥。",
   "provider.connect.oauth.code.visit.prefix": "访问 ",
   "provider.connect.oauth.code.visit.link": "此链接",
   "provider.connect.oauth.code.visit.suffix": " 获取授权码，以连接你的帐户并在 Kilo 中使用 {{provider}} 模型。",
   "provider.connect.oauth.code.label": "{{method}} 授权码",
   "provider.connect.oauth.code.placeholder": "授权码",
   "provider.connect.oauth.code.required": "授权码为必填项",
-  "provider.connect.oauth.code.invalid": "授权码无效",
   "provider.connect.oauth.auto.visit.prefix": "访问 ",
   "provider.connect.oauth.auto.visit.link": "此链接",
   "provider.connect.oauth.auto.visit.suffix": " 并输入以下代码，以连接你的帐户并在 Kilo 中使用 {{provider}} 模型。",
@@ -252,29 +155,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "{{provider}} 模型已不再可用。",
   "model.tag.free": "免费",
   "model.tag.dataCollected": "数据可能会用于训练",
-  "model.tag.latest": "最新",
   "model.group.auto": "自动模型",
   "model.group.recommended": "推荐",
   "model.group.favorites": "收藏夹",
-  "model.group.collapse": "折叠 {{group}}",
-  "model.group.expand": "展开 {{group}}",
   "model.favorite.add": "添加到收藏夹",
   "model.favorite.remove": "从收藏夹中移除",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "文本",
-  "model.input.image": "图像",
-  "model.input.audio": "音频",
-  "model.input.video": "视频",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "支持：{{inputs}}",
-  "model.tooltip.reasoning.allowed": "支持推理",
-  "model.tooltip.reasoning.none": "不支持推理",
-  "model.tooltip.context": "上下文上限 {{limit}}",
   "model.preview.label.released": "发布",
   "model.preview.label.input": "输入",
   "model.preview.label.output": "输出",
@@ -293,11 +179,8 @@ export const dict = {
   "model.preview.modality.audio": "音频",
   "model.preview.modality.video": "视频",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "搜索",
   "common.goBack": "返回",
-  "common.goForward": "前进",
   "common.loading": "加载中",
-  "common.loading.ellipsis": "...",
   "common.cancel": "取消",
   "common.connect": "连接",
   "common.disconnect": "断开连接",
@@ -305,59 +188,13 @@ export const dict = {
   "common.save": "保存",
   "common.saving": "保存中...",
   "common.default": "默认",
-  "common.attachment": "附件",
 
-  "prompt.placeholder.shell": "输入 shell 命令...",
-  "prompt.placeholder.normal": '随便问点什么... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "总结评论…",
-  "prompt.placeholder.summarizeComment": "总结该评论…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "按 esc 退出",
-
-  "prompt.example.1": "修复代码库中的一个 TODO",
-  "prompt.example.2": "这个项目的技术栈是什么？",
-  "prompt.example.3": "修复失败的测试",
-  "prompt.example.4": "解释认证是如何工作的",
-  "prompt.example.5": "查找并修复安全漏洞",
-  "prompt.example.6": "为用户服务添加单元测试",
-  "prompt.example.7": "重构这个函数，让它更易读",
-  "prompt.example.8": "这个错误是什么意思？",
-  "prompt.example.9": "帮我调试这个问题",
-  "prompt.example.10": "生成 API 文档",
-  "prompt.example.11": "优化数据库查询",
-  "prompt.example.12": "添加输入校验",
-  "prompt.example.13": "创建一个新的组件用于...",
-  "prompt.example.14": "我该如何部署这个项目？",
-  "prompt.example.15": "审查我的代码并给出最佳实践建议",
-  "prompt.example.16": "为这个函数添加错误处理",
-  "prompt.example.17": "解释这个正则表达式",
-  "prompt.example.18": "把它转换成 TypeScript",
-  "prompt.example.19": "在整个代码库中添加日志",
-  "prompt.example.20": "哪些依赖已经过期？",
-  "prompt.example.21": "帮我写一个迁移脚本",
-  "prompt.example.22": "为这个接口实现缓存",
-  "prompt.example.23": "给这个列表添加分页",
-  "prompt.example.24": "创建一个 CLI 命令用于...",
-  "prompt.example.25": "这里的环境变量是怎么工作的？",
-
-  "prompt.popover.emptyResults": "没有匹配的结果",
-  "prompt.popover.emptyCommands": "没有匹配的命令",
-  "prompt.dropzone.label": "将图片或 PDF 拖到这里",
-  "prompt.slash.badge.custom": "自定义",
-  "prompt.slash.badge.skill": "技能",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "当前",
-  "prompt.context.includeActiveFile": "包含当前文件",
-  "prompt.context.removeActiveFile": "从上下文移除活动文件",
-  "prompt.context.removeFile": "从上下文移除文件",
   "prompt.thinking.tooltip": "推理强度",
-  "prompt.action.attachFile": "附加文件",
   "prompt.action.indexing": "索引设置",
   "prompt.action.autoApprove.enable": "启用自动审批",
   "prompt.action.autoApprove.disable": "禁用自动审批",
   "prompt.action.autoApprove.enabled": "自动审批已启用。权限请求将自动获批。",
   "prompt.action.autoApprove.disabled": "自动审批已禁用。点击以自动批准权限请求。",
-  "prompt.attachment.remove": "移除附件",
   "prompt.action.send": "发送",
   "prompt.action.send.blocked": "请先回答或忽略待处理的问题",
   "prompt.action.send.recording": "转录并发送",
@@ -390,186 +227,17 @@ export const dict = {
   "speechToText.tooltip.error": "语音输入失败。点击清除。",
   "speechToText.error.title": "语音输入失败",
   "speechToText.error.loginRequired": "登录 Kilo 以使用语音输入。",
-  "speechToText.error.permission": "麦克风权限被拒绝。",
-  "speechToText.error.microphone": "无法启动麦克风。",
-  "speechToText.error.recording": "录音失败。",
-  "speechToText.error.emptyRecording": "未录制任何音频。",
   "speechToText.error.emptyTranscript": "未检测到语音。",
-  "speechToText.error.encoding": "无法编码录音。",
-  "speechToText.toast.transcribed": "已插入转录文本",
 
-  "prompt.toast.pasteUnsupported.title": "不支持的粘贴",
-  "prompt.toast.pasteUnsupported.description": "这里只能粘贴图片或 PDF 文件。",
-  "prompt.toast.modelAgentRequired.title": "请选择智能体和模型",
-  "prompt.toast.modelAgentRequired.description": "发送提示前请先选择智能体和模型。",
-  "prompt.toast.worktreeCreateFailed.title": "创建工作树失败",
-  "prompt.toast.sessionCreateFailed.title": "创建会话失败",
-  "prompt.toast.shellSendFailed.title": "发送 shell 命令失败",
-  "prompt.toast.commandSendFailed.title": "发送命令失败",
   "prompt.toast.promptSendFailed.title": "发送提示失败",
 
-  "dialog.mcp.title": "MCPs",
-  "dialog.mcp.description": "已启用 {{enabled}} / {{total}}",
-  "dialog.mcp.empty": "未配置 MCPs",
-
-  "dialog.lsp.empty": "已从文件类型自动检测到 LSPs",
-  "dialog.plugins.empty": "在 opencode.json 中配置的插件",
-
   "mcp.status.connected": "已连接",
   "mcp.status.failed": "失败",
   "mcp.status.needs_auth": "需要授权",
   "mcp.status.needs_registration": "需要客户端注册",
   "mcp.status.disabled": "已禁用",
 
-  "dialog.fork.empty": "没有可用于分叉的消息",
-
-  "dialog.directory.search.placeholder": "搜索文件夹",
-  "dialog.directory.empty": "未找到文件夹",
-
-  "dialog.server.title": "服务器",
-  "dialog.server.description": "切换此应用连接的 Kilo 服务器。",
-  "dialog.server.search.placeholder": "搜索服务器",
-  "dialog.server.empty": "暂无服务器",
-  "dialog.server.add.title": "添加服务器",
-  "dialog.server.add.url": "服务器 URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "无法连接到服务器",
-  "dialog.server.add.checking": "检查中...",
-  "dialog.server.add.button": "添加服务器",
-  "dialog.server.default.title": "默认服务器",
-  "dialog.server.default.description": "应用启动时连接此服务器，而不是启动本地服务器。需要重启。",
-  "dialog.server.default.none": "未选择服务器",
-  "dialog.server.default.set": "将当前服务器设为默认",
-  "dialog.server.default.clear": "清除",
-  "dialog.server.action.remove": "移除服务器",
-
-  "dialog.server.menu.edit": "编辑",
-  "dialog.server.menu.default": "设为默认",
-  "dialog.server.menu.defaultRemove": "取消默认",
-  "dialog.server.menu.delete": "删除",
-  "dialog.server.current": "当前服务器",
-  "dialog.server.status.default": "默认",
-
-  "dialog.project.edit.title": "编辑项目",
-  "dialog.project.edit.name": "名称",
-  "dialog.project.edit.icon": "图标",
-  "dialog.project.edit.icon.alt": "项目图标",
-  "dialog.project.edit.icon.hint": "点击或拖拽图片",
-  "dialog.project.edit.icon.recommended": "建议：128x128px",
-  "dialog.project.edit.color": "颜色",
-  "dialog.project.edit.color.select": "选择{{color}}颜色",
-
-  "dialog.project.edit.worktree.startup": "工作区启动脚本",
-  "dialog.project.edit.worktree.startup.description": "在创建新的工作区 (worktree) 后运行。",
-  "dialog.project.edit.worktree.startup.placeholder": "例如 bun install",
-  "context.breakdown.title": "上下文拆分",
-  "context.breakdown.note": "输入 token 的大致拆分。“其他”包含工具定义和开销。",
-  "context.breakdown.system": "系统",
-  "context.breakdown.user": "用户",
-  "context.breakdown.assistant": "助手",
-  "context.breakdown.tool": "工具调用",
-  "context.breakdown.other": "其他",
-
-  "context.systemPrompt.title": "系统提示词",
-  "context.rawMessages.title": "原始消息",
-
-  "context.stats.session": "会话",
-  "context.stats.messages": "消息数",
-  "context.stats.provider": "提供商",
-  "context.stats.model": "模型",
-  "context.stats.limit": "上下文限制",
-  "context.stats.totalTokens": "总 token",
-  "context.stats.usage": "使用率",
-  "context.stats.inputTokens": "输入 token",
-  "context.stats.outputTokens": "输出 token",
-  "context.stats.reasoningTokens": "推理 token",
-  "context.stats.cacheTokens": "缓存 token（读/写）",
-  "context.stats.userMessages": "用户消息",
-  "context.stats.assistantMessages": "助手消息",
-  "context.stats.totalCost": "总成本",
-  "context.stats.sessionCreated": "创建时间",
-  "context.stats.lastActivity": "最后活动",
-
-  "context.usage.tokens": "Token",
-  "context.usage.usage": "使用率",
-  "context.usage.cost": "成本",
-  "context.usage.clickToView": "点击查看上下文",
-  "context.usage.view": "查看上下文用量",
-
-  "toast.language.title": "语言",
-  "toast.language.description": "已切换到{{language}}",
-  "language.en": "English",
-  "language.zh": "简体中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.theme.title": "主题已切换",
-  "toast.scheme.title": "颜色方案",
-
-  "toast.workspace.enabled.title": "工作区已启用",
-  "toast.workspace.enabled.description": "侧边栏现在显示多个工作树",
-  "toast.workspace.disabled.title": "工作区已禁用",
-  "toast.workspace.disabled.description": "侧边栏只显示主工作树",
-
-  "toast.permissions.autoaccept.on.title": "自动接受编辑",
-  "toast.permissions.autoaccept.on.description": "编辑和写入权限将自动获批",
-  "toast.permissions.autoaccept.off.title": "已停止自动接受编辑",
-  "toast.permissions.autoaccept.off.description": "编辑和写入权限将需要手动批准",
-
-  "toast.model.none.title": "未选择模型",
-  "toast.model.none.description": "请先连接提供商以总结此会话",
-
-  "toast.file.loadFailed.title": "加载文件失败",
-
-  "toast.file.listFailed.title": "列出文件失败",
-  "toast.context.noLineSelection.title": "未选择行",
-  "toast.context.noLineSelection.description": "请先在文件标签中选择行范围。",
-  "toast.session.share.copyFailed.title": "无法复制链接到剪贴板",
-  "toast.session.share.success.title": "会话已分享",
-  "toast.session.share.success.description": "分享链接已复制到剪贴板",
-  "toast.session.share.failed.title": "分享会话失败",
-  "toast.session.share.failed.description": "分享会话时发生错误",
-
-  "toast.session.unshare.success.title": "已取消分享会话",
-  "toast.session.unshare.success.description": "会话已成功取消分享",
-  "toast.session.unshare.failed.title": "取消分享失败",
-  "toast.session.unshare.failed.description": "取消分享会话时发生错误",
-
   "toast.session.rename.invalid.title": "无效的会话标题",
-  "toast.session.listFailed.title": "无法加载 {{project}} 的会话",
-
-  "toast.update.title": "有可用更新",
-  "toast.update.description": "Kilo 有新版本 ({{version}}) 可安装。",
-  "toast.update.action.installRestart": "安装并重启",
-  "toast.update.action.notYet": "稍后",
-
-  "error.page.title": "出了点问题",
-  "error.page.description": "加载应用程序时发生错误。",
-  "error.page.details.label": "错误详情",
-  "error.page.action.restart": "重启",
-  "error.page.action.checking": "检查中...",
-  "error.page.action.checkUpdates": "检查更新",
-  "error.page.action.updateTo": "更新到 {{version}}",
-  "error.page.report.prefix": "请将此错误报告给 Kilo 团队",
-  "error.page.report.discord": "在 Discord 上",
-  "error.page.version": "版本：{{version}}",
-
-  "error.dev.rootNotFound": "未找到根元素。你是不是忘了把它添加到 index.html？或者 id 属性拼写错了？",
-
-  "error.globalSync.connectFailed": "无法连接到服务器。是否有服务器正在 `{{url}}` 运行？",
 
   "error.startup.title": "服务器连接失败",
 
@@ -584,29 +252,8 @@ export const dict = {
   "error.providerAuth.chatgpt.title": "OpenAI 已将您登出",
   "error.providerAuth.chatgpt.description": "请再次登录 ChatGPT，然后重新发送消息以继续使用 Codex 模型。",
 
-  "error.chain.unknown": "未知错误",
-  "error.chain.causedBy": "原因：",
-  "error.chain.apiError": "API 错误",
-  "error.chain.status": "状态：{{status}}",
-  "error.chain.retryable": "可重试：{{retryable}}",
-  "error.chain.responseBody": "响应内容：\n{{body}}",
-  "error.chain.didYouMean": "你是不是想输入：{{suggestions}}",
-  "error.chain.modelNotFound": "未找到模型：{{provider}}/{{model}}",
-  "error.chain.checkConfig": "请检查你的配置 (opencode.json) 中的 provider/model 名称",
-  "error.chain.mcpFailed": 'MCP 服务器 "{{name}}" 启动失败。注意: Kilo 暂不支持 MCP 认证。',
-  "error.chain.providerAuthFailed": "提供商认证失败（{{provider}}）：{{message}}",
-  "error.chain.providerInitFailed": '无法初始化提供商 "{{provider}}"。请检查凭据和配置。',
-  "error.chain.configJsonInvalid": "配置文件 {{path}} 不是有效的 JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "配置文件 {{path}} 不是有效的 JSON(C)：{{message}}",
-  "error.chain.configDirectoryTypo":
-    '{{path}} 中的目录 "{{dir}}" 无效。请将目录重命名为 "{{suggestion}}" 或移除它。这是一个常见拼写错误。',
-  "error.chain.configFrontmatterError": "无法解析 {{path}} 中的 frontmatter：\n{{message}}",
-  "error.chain.configInvalid": "配置文件 {{path}} 无效",
-  "error.chain.configInvalidWithMessage": "配置文件 {{path}} 无效：{{message}}",
-
   "notification.permission.title": "需要权限",
   "notification.permission.titleSubagent": "需要权限（子代理）",
-  "notification.permission.description": "{{sessionTitle}}（{{projectName}}）需要权限",
   "ui.permission.manageAutoApprove": "管理自动审批规则",
   "ui.permission.doomLoop.prompt": "检测到 {{tool}} 工具可能陷入循环。是否继续运行？",
   "ui.permission.doomLoop.rule": "继续调用 {{tool}}",
@@ -631,7 +278,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "读取待办",
   "ui.permission.toolLabel.todoWrite": "更新待办",
   "ui.permission.toolLabel.codeSearch": "代码搜索",
-  "ui.permission.toggleWrap": "切换自动换行",
   "ui.permission.copyCommand": "复制",
   "ui.approval.auto": "已自动批准",
   "ui.approval.manual": "由你批准",
@@ -643,46 +289,18 @@ export const dict = {
   "ui.approval.source.yolo": "由自动批准（YOLO）模式",
   "ui.approval.source.session": "由会话自动批准规则",
   "ui.approval.source.default": "默认",
-  "notification.question.title": "问题",
-  "notification.question.description": "{{sessionTitle}}（{{projectName}}）有一个问题",
-  "notification.action.goToSession": "前往会话",
 
-  "notification.session.responseReady.title": "回复已就绪",
-  "notification.session.error.title": "会话错误",
-  "notification.session.error.fallbackDescription": "发生错误",
-
-  "home.recentProjects": "最近项目",
-  "home.empty.title": "没有最近项目",
-  "home.empty.description": "通过打开本地项目开始使用",
-
-  "session.tab.session": "会话",
   "session.tab.review": "审查",
-  "session.tab.context": "上下文",
-  "session.panel.reviewAndFiles": "审查和文件",
   "session.review.filesChanged": "{{count}} 个文件变更",
-  "session.review.change.one": "更改",
   "session.review.change.other": "更改",
   "session.review.loadingChanges": "正在加载更改...",
-  "session.review.empty": "此会话暂无更改",
   "session.review.noChanges": "无更改",
-  "session.files.selectToOpen": "选择要打开的文件",
-  "session.files.all": "所有文件",
-  "session.files.binaryContent": "二进制文件（无法显示内容）",
-  "session.messages.renderEarlier": "显示更早的消息",
   "session.messages.loadingEarlier": "正在加载更早的消息...",
   "session.messages.loadEarlier": "加载更早的消息",
   "session.messages.loading": "正在加载消息...",
 
-  "session.messages.jumpToLatest": "跳转到最新",
-  "session.context.addToContext": "将 {{selection}} 添加到上下文",
-
-  "session.new.worktree.main": "主分支",
-  "session.new.worktree.mainWithBranch": "主分支（{{branch}}）",
-  "session.new.worktree.create": "创建新的 worktree",
-  "session.new.lastModified": "最后修改",
   "sidebar.session.newSession": "新会话",
   "sidebar.session.newSession.tooltip": "在保持当前会话完整的同时开始全新的对话。",
-  "sidebar.session.newSession.disabled": "此会话已经是新的。请开始聊天或创建一个 worktree。",
   "sidebar.session.newWorktree": "新 Worktree",
   "sidebar.session.newWorktree.tooltip":
     "创建一个隔离的 git worktree 以安全地进行实验、保持更改分离并在不中断当前分支的情况下运行并行会话。",
@@ -698,127 +316,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "将此对话和 {{files}} 个更改的文件移动到专用的 worktree 中，以便进行隔离的后续工作。",
   "sidebar.session.showChanges.tooltip.empty": "打开更改视图以检查当前工作树。",
-  "sidebar.session.showChanges.tooltip.one": "1 个文件已更改 · +{{additions}} -{{deletions}}。打开更改视图。",
-  "sidebar.session.showChanges.tooltip.other": "{{files}} 个文件已更改 · +{{additions}} -{{deletions}}。打开更改视图。",
-  "sidebar.session.agentManager.tooltip":
-    "打开 Agent Manager 以全面了解并行会话和 worktree，让您可以在一个地方协调长期运行的任务。",
-  "sidebar.session.openAgentManager": "打开 Agent Manager",
   "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 中继续失败",
-  "session.header.search.placeholder": "搜索 {{project}}",
-  "session.header.searchFiles": "搜索文件",
-  "session.header.openIn": "打开方式",
-  "session.header.open.action": "在 {{app}} 中打开",
-  "session.header.open.ariaLabel": "在 {{app}} 中打开",
-  "session.header.open.menu": "打开选项",
-  "session.header.open.copyPath": "复制路径",
 
-  "status.popover.trigger": "状态",
-  "status.popover.ariaLabel": "服务器配置",
-  "status.popover.tab.servers": "服务器",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "插件",
-  "status.popover.action.manageServers": "管理服务器",
-
-  "session.share.popover.title": "发布到网页",
-  "session.share.popover.description.shared": "此会话已在网页上公开。任何拥有链接的人都可以访问。",
-  "session.share.popover.description.unshared": "在网页上公开分享此会话。任何拥有链接的人都可以访问。",
-  "session.share.action.share": "分享",
-  "session.share.action.publish": "发布",
-  "session.share.action.publishing": "正在发布...",
-  "session.share.action.unpublish": "取消发布",
-  "session.share.action.unpublishing": "正在取消发布...",
-  "session.share.action.view": "查看",
-  "session.share.copy.copied": "已复制",
-  "session.share.copy.copyLink": "复制链接",
-
-  "lsp.tooltip.none": "没有 LSP 服务器",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "正在加载提示...",
-  "terminal.loading": "正在加载终端...",
-  "terminal.title": "终端",
-  "terminal.title.numbered": "终端 {{number}}",
-  "terminal.close": "关闭终端",
-
-  "terminal.connectionLost.title": "连接已丢失",
-  "terminal.connectionLost.description": "终端连接已中断。这可能发生在服务器重启时。",
   "common.closeTab": "关闭标签页",
   "common.signIn": "登录",
-  "common.signOut": "退出登录",
   "common.dismiss": "忽略",
   "common.requestFailed": "请求失败",
-  "common.moreOptions": "更多选项",
-  "common.learnMore": "了解更多",
   "common.rename": "重命名",
-  "common.reset": "重置",
-  "common.archive": "归档",
   "common.delete": "删除",
   "common.close": "关闭",
   "common.edit": "编辑",
   "common.loadMore": "加载更多",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "切换菜单",
-  "sidebar.nav.projectsAndSessions": "项目和会话",
   "sidebar.settings": "设置",
-  "sidebar.help": "帮助",
-  "sidebar.workspaces.enable": "启用工作区",
-  "sidebar.workspaces.disable": "禁用工作区",
-  "sidebar.gettingStarted.title": "入门",
-  "sidebar.gettingStarted.line1": "Kilo 提供免费模型，你可以立即开始使用。",
-  "sidebar.gettingStarted.line2": "连接任意提供商即可使用更多模型，如 Claude、GPT、Gemini 等。",
-  "sidebar.project.recentSessions": "最近会话",
-  "sidebar.project.viewAllSessions": "查看全部会话",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "桌面",
-  "settings.section.server": "服务器",
-  "settings.tab.general": "通用",
-  "settings.tab.shortcuts": "快捷键",
-
-  "settings.general.section.appearance": "外观",
-  "settings.general.section.notifications": "系统通知",
-  "settings.general.section.updates": "更新",
-  "settings.general.section.sounds": "音效",
-
-  "settings.general.row.language.title": "语言",
-  "settings.general.row.language.description": "更改 Kilo 的显示语言",
-  "settings.general.row.appearance.title": "外观",
-  "settings.general.row.appearance.description": "自定义 Kilo 在你的设备上的外观",
-  "settings.general.row.theme.title": "主题",
-  "settings.general.row.theme.description": "自定义 Kilo 的主题。",
-  "settings.general.row.font.title": "字体",
-  "settings.general.row.font.description": "自定义代码块使用的等宽字体",
-  "settings.general.row.releaseNotes.title": "发行说明",
-  "settings.general.row.releaseNotes.description": "更新后显示“新功能”弹窗",
-
-  "settings.updates.row.startup.title": "启动时检查更新",
-  "settings.updates.row.startup.description": "在 Kilo 启动时自动检查更新",
-  "settings.updates.row.check.title": "检查更新",
-  "settings.updates.row.check.description": "手动检查更新并在有更新时安装",
-  "settings.updates.action.checkNow": "立即检查",
-  "settings.updates.action.checking": "正在检查...",
-  "settings.updates.toast.latest.title": "已是最新版本",
-  "settings.updates.toast.latest.description": "你正在使用最新版本的 Kilo。",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "警报 01",
   "sound.option.alert02": "警报 02",
   "sound.option.alert03": "警报 03",
@@ -864,19 +380,6 @@ export const dict = {
   "sound.option.yup04": "是 04",
   "sound.option.yup05": "是 05",
   "sound.option.yup06": "是 06",
-  "settings.general.notifications.agent.title": "智能体",
-  "settings.general.notifications.agent.description": "当智能体完成或需要注意时显示系统通知",
-  "settings.general.notifications.permissions.title": "权限",
-  "settings.general.notifications.permissions.description": "当需要权限时显示系统通知",
-  "settings.general.notifications.errors.title": "错误",
-  "settings.general.notifications.errors.description": "发生错误时显示系统通知",
-
-  "settings.general.sounds.agent.title": "智能体",
-  "settings.general.sounds.agent.description": "当智能体完成或需要注意时播放声音",
-  "settings.general.sounds.permissions.title": "权限",
-  "settings.general.sounds.permissions.description": "当需要权限时播放声音",
-  "settings.general.sounds.errors.title": "错误",
-  "settings.general.sounds.errors.description": "发生错误时播放声音",
 
   "settings.indexing.title": "索引",
   "settings.indexing.enable.title": "启用索引",
@@ -888,7 +391,6 @@ export const dict = {
   "settings.indexing.globalEnable.description": "为每个工作区启用索引。",
   "settings.indexing.projectEnable.title": "为此项目启用",
   "settings.indexing.projectEnable.description": "当全局索引关闭时，为此工作区启用索引。",
-  "settings.indexing.projectEnable.disabledTooltip": "全局索引已启用，当前项目已包含在内。",
   "settings.indexing.provider.title": "嵌入提供商",
   "settings.indexing.provider.description": "选择用于生成语义搜索嵌入的提供商。",
   "settings.indexing.kiloModel.title": "Kilo 模型预设",
@@ -917,32 +419,10 @@ export const dict = {
   "settings.indexing.status.title": "状态",
   "settings.indexing.providerField.description": "提供商特定的连接设置。",
 
-  "settings.shortcuts.title": "键盘快捷键",
-  "settings.shortcuts.reset.button": "重置为默认值",
-  "settings.shortcuts.reset.toast.title": "快捷键已重置",
-  "settings.shortcuts.reset.toast.description": "键盘快捷键已重置为默认设置。",
-  "settings.shortcuts.conflict.title": "快捷键已被占用",
-  "settings.shortcuts.conflict.description": "{{keybind}} 已分配给 {{titles}}。",
-  "settings.shortcuts.unassigned": "未设置",
-  "settings.shortcuts.pressKeys": "按下按键",
-  "settings.shortcuts.search.placeholder": "搜索快捷键",
-  "settings.shortcuts.search.empty": "未找到快捷键",
-
-  "settings.shortcuts.group.general": "通用",
-  "settings.shortcuts.group.session": "会话",
-  "settings.shortcuts.group.navigation": "导航",
-  "settings.shortcuts.group.modelAndAgent": "模型与智能体",
-  "settings.shortcuts.group.terminal": "终端",
-  "settings.shortcuts.group.prompt": "提示",
-
   "settings.providers.title": "提供商",
-  "settings.providers.description": "提供商设置将在此处可配置。",
-  "settings.providers.betaNotice":
-    "目前只能在设置界面中配置 Kilo Gateway 提供商。在 Beta 测试期间即将支持配置其他提供商。在此期间，您可以使用 CLI 或配置文件来配置提供商。我们致力于保持 Kilo 开放，无锁定。",
   "settings.providers.section.connected": "已连接的提供商",
   "settings.providers.connected.empty": "没有已连接的提供商",
   "settings.providers.section.popular": "热门提供商",
-  "settings.providers.search.placeholder": "搜索提供商",
   "settings.providers.select.placeholder": "选择提供商...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "环境",
@@ -959,7 +439,6 @@ export const dict = {
   "settings.models.hidePromptTraining.title": "隐藏使用提示词训练的模型",
   "settings.models.hidePromptTraining.description": "隐藏提供商可能会使用您的提示词进行训练的 Kilo Gateway 模型。",
   "settings.providers.modeModels": "按模式选择模型",
-  "settings.providers.custom.note": "通过 Base URL 添加自定义提供商。",
   "settings.providers.modeModels.description": "为特定模式覆盖默认模型。如果未设置，将使用全局默认模型。",
   "provider.custom.title": "自定义提供商",
   "provider.custom.description.prefix": "配置自定义提供商。请参阅",
@@ -1023,9 +502,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "移除模型",
   "provider.custom.models.add": "添加模型",
-  "provider.custom.models.fetch": "获取模型",
-  "provider.custom.models.fetching": "获取中\u2026",
-  "provider.custom.models.fetch.error": "获取模型失败：{{error}}",
   "provider.custom.models.fetch.authError": "认证失败。请检查上方的 API 密钥后重试。",
   "provider.custom.models.fetch.empty": "此服务器上未找到模型。",
   "provider.custom.models.fetch.added": "已添加 {{count}} 个模型。",
@@ -1076,23 +552,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "旧版 .kilocode 配置",
   "settings.config.source.projectOpencode": "旧版 .opencode 配置",
   "settings.models.title": "模型",
-  "settings.models.description": "模型设置将在此处可配置。",
-  "settings.agents.title": "智能体",
-  "settings.agents.description": "智能体设置将在此处可配置。",
-  "settings.commands.title": "命令",
-  "settings.commands.description": "命令设置将在此处可配置。",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP 设置将在此处可配置。",
 
-  "settings.permissions.title": "权限",
-  "settings.permissions.description": "控制服务器默认可以使用哪些工具。",
-  "settings.permissions.section.tools": "工具",
   "settings.permissions.toast.updateFailed.title": "更新权限失败",
 
-  "settings.permissions.action.allow": "允许",
-  "settings.permissions.action.ask": "询问",
-  "settings.permissions.action.deny": "拒绝",
-
   "settings.permissions.tool.read.title": "读取",
   "settings.permissions.tool.read.description": "读取文件（匹配文件路径）",
   "settings.permissions.tool.edit.title": "编辑",
@@ -1126,7 +588,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "检测具有相同输入的重复工具调用",
 
-  "session.delete.failed.title": "删除会话失败",
   "session.delete.title": "删除会话",
   "session.delete.confirm": '删除会话 "{{name}}"？',
   "session.delete.button": "删除会话",
@@ -1154,14 +615,9 @@ export const dict = {
   "feedback.dialog.support": "客户支持",
   "workStyle.onboarding.welcome": "欢迎使用 Kilo",
   "workStyle.onboarding.title": "选择你想要的工作方式",
-  "workStyle.onboarding.description":
-    "这将设置权限、推理块、终端输出和上下文时间线的初始默认值。此设置仅应用一次，并会跳过你已自定义的设置。",
-  "workStyle.onboarding.skip": "暂时跳过",
   "workStyle.onboarding.settingsNote": "你可以随时在以下位置更改这些选项：",
   "workStyle.onboarding.settings": "设置。",
   "workStyle.toast.saved.title": "模式已成功保存",
-  "workStyle.toast.saved.description": "可随时在“设置”中更新偏好设置。",
-  "workStyle.toast.saved.action": "前往设置",
   "workStyle.choice.permissions": "权限",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "可见性",
@@ -1184,32 +640,6 @@ export const dict = {
   "session.cloud.import.legacy": "这似乎是一个旧版会话，已不再受支持。",
   "session.cloud.import.failed": "导入云会话失败",
 
-  "workspace.new": "新建工作区",
-  "workspace.type.local": "本地",
-  "workspace.type.sandbox": "沙盒",
-  "workspace.create.failed.title": "创建工作区失败",
-  "workspace.delete.failed.title": "删除工作区失败",
-  "workspace.resetting.title": "正在重置工作区",
-  "workspace.resetting.description": "这可能需要一点时间。",
-  "workspace.reset.failed.title": "重置工作区失败",
-  "workspace.reset.success.title": "工作区已重置",
-  "workspace.reset.success.description": "工作区已与默认分支保持一致。",
-  "workspace.error.stillPreparing": "工作区仍在准备中",
-  "workspace.status.checking": "正在检查未合并的更改...",
-  "workspace.status.error": "无法验证 git 状态。",
-  "workspace.status.clean": "未检测到未合并的更改。",
-  "workspace.status.dirty": "检测到未合并的更改。",
-  "workspace.delete.title": "删除工作区",
-  "workspace.delete.confirm": '删除工作区 "{{name}}"？',
-  "workspace.delete.button": "删除工作区",
-  "workspace.reset.title": "重置工作区",
-  "workspace.reset.confirm": '重置工作区 "{{name}}"？',
-  "workspace.reset.button": "重置工作区",
-  "workspace.reset.archived.none": "不会归档任何活跃会话。",
-  "workspace.reset.archived.one": "将归档 1 个会话。",
-  "workspace.reset.archived.many": "将归档 {{count}} 个会话。",
-  "workspace.reset.note": "这将把工作区重置为与默认分支一致。",
-
   "deviceAuth.toast.urlCopied": "URL 已复制到剪贴板",
   "deviceAuth.toast.codeCopied": "代码已复制到剪贴板",
   "deviceAuth.toast.errorCopied": "错误已复制到剪贴板",
@@ -1247,7 +677,6 @@ export const dict = {
   "profile.pass.renews": "续订",
   "profile.action.logout": "退出登录",
 
-  "settings.section.configuration": "配置",
   "settings.agentBehaviour.title": "智能体行为",
   "settings.autoApprove.title": "自动审批",
   "settings.browser.title": "浏览器",
@@ -1263,14 +692,12 @@ export const dict = {
   "settings.language.title": "语言",
   "settings.aboutKiloCode.title": "关于 Kilo Code",
 
-  "session.messages.empty": "在下方输入消息以开始对话。",
   "session.messages.welcome": "Kilo Code 是一个 AI 编程助手。让它帮你构建功能、修复 bug 或解释代码库。",
   "session.messages.scrollToBottom": "滚动到底部",
   "session.messages.initializing": "初始化中...",
   "session.messages.taskStarting": "启动中...",
   "session.status.writingResponse": "正在撰写回复…",
   "session.status.retry": "正在重试…",
-  "session.status.retrying": "正在重试（第 {{ attempt }} 次）… {{ message }}",
   "session.status.working": "处理中…",
   "session.status.offline": "网络已断开 — 正在重连...",
   "session.outcome.incomplete": "回合已结束，尚有 {{count}} 个待办事项",
@@ -1301,11 +728,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} 个较早的会话",
   "context.stats.thisSession": "此会话",
 
-  "time.justNow": "刚刚",
-  "time.minutesAgo": "{{count}} 分钟前",
-  "time.hoursAgo": "{{count}} 小时前",
-  "time.daysAgo": "{{count}} 天前",
-  "time.monthsAgo": "{{count}} 个月前",
   "time.today": "今天",
   "time.yesterday": "昨天",
   "time.thisWeek": "本周",
@@ -1321,7 +743,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "端口：",
   "settings.aboutKiloCode.versionInfo": "版本信息",
   "settings.aboutKiloCode.version.label": "版本：",
-  "settings.aboutKiloCode.extensionName": "Kilo Code 扩展",
   "settings.aboutKiloCode.community": "社区与支持",
   "settings.aboutKiloCode.feedback.prefix": "如果您有任何问题或反馈，欢迎在以下平台提交 issue",
   "settings.aboutKiloCode.feedback.or": "或",
@@ -1366,7 +787,6 @@ export const dict = {
   "settings.language.current": "当前：",
 
   "common.add": "添加",
-  "common.choose": "选择…",
 
   "settings.autocomplete.autoTrigger.title": "启用自动内联补全",
   "settings.autocomplete.autoTrigger.description": "在您输入时自动显示内联补全建议",
@@ -1375,27 +795,14 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "启用聊天文本框自动补全",
   "settings.autocomplete.chatAutocomplete.description": "在聊天文本框中显示自动补全建议",
   "settings.autocomplete.modelsHint": "若要选择用于自动补全的模型，请参阅模型设置。",
-  "settings.notifications.agent.title": "智能体完成",
-  "settings.notifications.agent.description": "智能体完成任务时显示通知",
-  "settings.notifications.permissions.title": "权限请求",
-  "settings.notifications.permissions.description": "权限请求时显示通知",
-  "settings.notifications.errors.title": "错误",
-  "settings.notifications.errors.description": "发生错误时显示通知",
   "settings.notifications.sounds": "声音",
   "settings.notifications.enable.title": "启用声音通知",
   "settings.notifications.enable.description": "在会话完成、遇到错误或需要你输入时播放声音",
   "settings.notifications.testSound": "测试",
-  "settings.notifications.agentSound.title": "智能体完成提示音",
-  "settings.notifications.agentSound.description": "智能体完成时播放的声音",
-  "settings.notifications.permSound.title": "权限请求提示音",
-  "settings.notifications.permSound.description": "权限请求时播放的声音",
-  "settings.notifications.errorSound.title": "错误提示音",
-  "settings.notifications.errorSound.description": "发生错误时播放的声音",
   "settings.notifications.sound.default": "默认",
   "settings.notifications.sound.system": "系统",
   "settings.notifications.sound.description":
     "默认选项为完成、输入和错误使用不同的声音。其他选项为所有事件使用同一种声音。",
-  "settings.notifications.sound.none": "无",
   "settings.experimental.share.title": "分享模式",
   "settings.experimental.share.description": "会话分享行为",
   "settings.experimental.share.manual": "手动",
@@ -1415,8 +822,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "图像生成模型",
   "settings.experimental.imageGenerationModel.placeholder": "默认 (Auto Router)",
 
-  "settings.experimental.speechToText.title": "语音转文本",
-  "settings.experimental.speechToText.description": "通过 Kilo Gateway 使用您的 Kilo 帐户在提示词字段中启用语音输入。",
   "settings.models.speechToText.disabledDescription":
     "启用并登录 Kilo 提供商以使用 Speech to Text。Speech to Text 目前仅支持通过 Kilo Gateway 使用。",
   "settings.models.speechToTextModel.title": "语音转文本模型",
@@ -1454,15 +859,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "默认智能体",
   "settings.agentBehaviour.defaultAgent.description": "未指定时使用的智能体",
   "settings.agentBehaviour.availableAgents": "可用代理",
-  "settings.agentBehaviour.selectAgent": "选择要配置的智能体…",
-  "settings.agentBehaviour.selectAgent.title": "智能体",
-  "settings.agentBehaviour.selectAgent.description": "选择要配置的智能体…",
   "settings.agentBehaviour.modelOverride.title": "模型覆盖",
   "settings.agentBehaviour.modelOverride.description": "覆盖此智能体的默认模型",
   "settings.agentBehaviour.variantOverride.title": "模型变体覆盖",
   "settings.agentBehaviour.variantOverride.description": "覆盖此智能体的模型变体",
-  "settings.agentBehaviour.prompt.title": "自定义提示词",
-  "settings.agentBehaviour.prompt.description": "此智能体的附加系统提示词",
   "settings.agentBehaviour.temperature.title": "温度",
   "settings.agentBehaviour.temperature.description":
     "控制 AI 响应的随机程度（0–2）。较低的值（例如 0.2）会产生更专注、更一致的输出。较高的值（例如 1.0）会产生更多样、更有创意的响应。留空则使用模型默认值。",
@@ -1481,7 +881,6 @@ export const dict = {
   "settings.agentBehaviour.badge.deprecated": "弃用",
   "settings.agentBehaviour.discoveredSkills": "已发现的技能",
   "settings.agentBehaviour.noSkillsFound": "未发现任何技能。请在下方添加技能文件夹路径或 URL 以使技能可用。",
-  "settings.agentBehaviour.availableModes": "可用自定义模式",
   "settings.agentBehaviour.noAgentsFound": "未找到智能体。",
   "settings.agentBehaviour.createMode": "创建新模式",
   "settings.agentBehaviour.createMode.name": "名称",
@@ -1555,10 +954,8 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "命令",
   "settings.agentBehaviour.mcpDetail.args": "参数",
   "settings.agentBehaviour.mcpDetail.env": "环境",
-  "settings.agentBehaviour.mcpDetail.disabled": "此服务器已禁用。",
   "settings.agentBehaviour.mcpBrowseMarketplace": "浏览市场",
   "settings.agentBehaviour.mcpEmpty": "未配置 MCP 服务器。在 kilo.jsonc 中添加 MCP 服务器，或让代理为您添加。",
-  "settings.agentBehaviour.workflowsPlaceholder": "工作流通过工作区中的工作流文件管理。",
   "settings.agentBehaviour.workflows.description":
     "工作流是在配置中定义的自定义斜杠命令。在聊天中输入 /command-name 来调用它们。命令在 opencode.json 的 'command' 部分中配置。",
   "settings.agentBehaviour.workflows.empty": "未配置自定义命令。将命令添加到 opencode.json 即可在此处看到。",
@@ -1636,7 +1033,6 @@ export const dict = {
     "例如：按照 conventional commits 格式用西班牙语生成 commit messages。只返回 commit message。",
 
   "settings.commitMessage.language.sync": "跟随界面语言",
-  "settings.commitMessage.language.title": "语言",
   "settings.commitMessage.language.description": "选择用于 AI 生成 commit message 的语言：",
 
   "settings.display.username.title": "用户名",
@@ -1673,8 +1069,6 @@ export const dict = {
   "settings.providers.disabled": "已禁用的提供者",
   "settings.providers.disabled.description": "从提供者列表中隐藏的提供者",
   "settings.providers.disabled.enable": "启用",
-  "settings.providers.enabled": "已启用的提供者（白名单）",
-  "settings.providers.enabled.description": "如果设置，只有这些提供者可用（排他性白名单）",
   "settings.providers.notSet": "未设置（使用服务器默认值）",
   "dialog.model.notSet": "未设置",
   "profile.personalAccount": "个人账户",
@@ -1714,9 +1108,7 @@ export const dict = {
   "migration.migrate.title": "迁移你的设置",
   "migration.migrate.subtitle": "我们发现了你之前安装的设置。以下是可以迁移的内容。",
   "migration.migrate.selectLabel": "选择要迁移的内容",
-  "migration.migrate.cannotMigrate": "无法迁移",
   "migration.migrate.chatHistory": "聊天会话和历史记录",
-  "migration.migrate.chatHistoryDesc": "与新架构不兼容",
   "migration.migrate.button": "迁移设置",
   "migration.migrate.skip": "跳过",
   "migration.migrate.keysDetected": "检测到 {{count}} 个密钥",
@@ -1739,10 +1131,7 @@ export const dict = {
   "migration.complete.cleanupDescription": "此操作将从 VS Code 存储中删除旧版设置。您将无法再次运行此迁移。",
   "migration.complete.done": "完成",
   "migration.migrate.sessionsDetected": "检测到 {{count}} 个会话",
-  "migration.error.sessionFailed": "会话迁移失败",
   "migration.error.continue": "继续",
-  "migration.error.action.copy": "复制",
-  "migration.error.toast.copied": "错误已复制到剪贴板",
 
   "migration.sessionSummary.title": "摘要：",
   "migration.sessionSummary.copy": "复制报告",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index 009409cfad0..097657622df 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -54,85 +54,12 @@ export const anacondaDesktopDict = {
 
 export const dict = {
   ...anacondaDesktopDict,
-  "command.category.suggested": "建議",
-  "command.category.view": "檢視",
-  "command.category.project": "專案",
-  "command.category.provider": "供應商",
-  "command.category.server": "伺服器",
-  "command.category.session": "工作階段",
-  "command.category.theme": "主題",
-  "command.category.language": "語言",
-  "command.category.file": "檔案",
-  "command.category.context": "上下文",
-  "command.category.terminal": "終端機",
-  "command.category.model": "模型",
-  "command.category.mcp": "MCP",
-  "command.category.agent": "代理程式",
-  "command.category.permissions": "權限",
-  "command.category.workspace": "工作區",
 
-  "command.category.settings": "設定",
-  "theme.scheme.system": "系統",
-  "theme.scheme.light": "淺色",
-  "theme.scheme.dark": "深色",
-
-  "command.sidebar.toggle": "切換側邊欄",
-  "command.project.open": "開啟專案",
   "command.provider.connect": "連接供應商",
-  "command.server.switch": "切換伺服器",
-  "command.settings.open": "開啟設定",
-  "command.session.previous": "上一個工作階段",
-  "command.session.next": "下一個工作階段",
-  "command.session.previous.unseen": "上一個未讀工作階段",
-  "command.session.next.unseen": "下一個未讀工作階段",
-  "command.session.archive": "封存工作階段",
-
-  "command.palette": "命令面板",
-
-  "command.theme.cycle": "循環主題",
-  "command.theme.set": "使用主題：{{theme}}",
-  "command.theme.scheme.cycle": "循環配色方案",
-  "command.theme.scheme.set": "使用配色方案：{{scheme}}",
-
-  "command.language.cycle": "循環語言",
-  "command.language.set": "使用語言：{{language}}",
 
   "command.session.new": "新增工作階段",
-  "command.session.new.task": "新增任務",
   "command.session.show.changes": "顯示變更",
-  "command.file.open": "開啟檔案",
-  "command.tab.close": "關閉分頁",
-  "command.context.addSelection": "將選取內容加入上下文",
-  "command.context.addSelection.description": "加入目前檔案中選取的行",
-  "command.terminal.toggle": "切換終端機",
-  "command.fileTree.toggle": "切換檔案樹",
   "command.review.toggle": "切換審查",
-  "command.terminal.new": "新增終端機",
-  "command.terminal.new.description": "建立新的終端機標籤頁",
-  "command.steps.toggle": "切換步驟",
-  "command.steps.toggle.description": "顯示或隱藏目前訊息的步驟",
-  "command.message.previous": "上一則訊息",
-  "command.message.previous.description": "跳到上一則使用者訊息",
-  "command.message.next": "下一則訊息",
-  "command.message.next.description": "跳到下一則使用者訊息",
-  "command.model.choose": "選擇模型",
-  "command.model.choose.description": "選擇不同的模型",
-  "command.mcp.toggle": "切換 MCP",
-  "command.mcp.toggle.description": "切換 MCP",
-  "command.agent.cycle": "循環 Agent",
-  "command.agent.cycle.description": "切換到下一個 Agent",
-  "command.agent.cycle.reverse": "反向循環 Agent",
-  "command.agent.cycle.reverse.description": "切換到上一個 Agent",
-  "command.model.variant.cycle": "循環思考強度",
-  "command.model.variant.cycle.description": "切換到下一個強度等級",
-  "command.permissions.autoaccept.enable": "自動接受編輯",
-  "command.permissions.autoaccept.disable": "停止自動接受編輯",
-  "command.workspace.toggle": "切換工作區",
-  "command.workspace.toggle.description": "在側邊欄啟用或停用多個工作區",
-  "command.session.undo": "復原",
-  "command.session.undo.description": "復原上一則訊息",
-  "command.session.redo": "重做",
-  "command.session.redo.description": "重做上一則復原的訊息",
   "revert.banner.count_one": "已還原 {{count}} 則訊息",
   "revert.banner.count_other": "已還原 {{count}} 則訊息",
   "revert.banner.redo": "重做",
@@ -144,13 +71,6 @@ export const dict = {
   "revert.banner.workspace.enableSnapshots": "啟用快照",
   "revert.disabled.agentBusy": "等待 Agent 完成",
   "command.session.compact": "精簡工作階段",
-  "command.session.compact.description": "總結工作階段以減少上下文大小",
-  "command.session.fork": "從訊息分支",
-  "command.session.fork.description": "從先前的訊息建立新工作階段",
-  "command.session.share": "分享工作階段",
-  "command.session.share.description": "分享此工作階段並將連結複製到剪貼簿",
-  "command.session.unshare": "取消分享工作階段",
-  "command.session.unshare.description": "停止分享此工作階段",
   "command.session.export": "匯出會話紀錄",
 
   "agentRequirements.skill.installed": "已安裝",
@@ -177,11 +97,6 @@ export const dict = {
   "agentRequirements.error.scopeMismatch": "此代理需求檢查已不再有效。",
   "agentRequirements.error.requestFailed": "Kilo 無法檢查代理需求。",
 
-  "palette.search.placeholder": "搜尋檔案、命令和工作階段",
-  "palette.empty": "找不到結果",
-  "palette.group.commands": "命令",
-  "palette.group.files": "檔案",
-
   "dialog.provider.search.placeholder": "搜尋供應商",
   "dialog.provider.empty": "找不到供應商",
   "dialog.provider.group.other": "其他",
@@ -190,19 +105,13 @@ export const dict = {
   "dialog.model.select.title": "選擇模型",
   "dialog.model.search.placeholder": "搜尋模型",
   "dialog.model.empty": "找不到模型",
-  "dialog.model.manage": "管理模型",
-  "dialog.model.manage.description": "自訂模型選擇器中顯示的模型。",
   "dialog.model.select": "選擇",
   "dialog.model.expand": "展開",
   "dialog.model.collapse": "收起",
 
-  "dialog.model.unpaid.freeModels.title": "Kilo 提供的免費模型",
-  "dialog.model.unpaid.addMore.title": "從熱門供應商新增更多模型",
-
   "dialog.provider.viewAll": "查看更多供應商",
 
   "provider.connect.title": "連線 {{provider}}",
-  "provider.connect.title.anthropicProMax": "使用 Claude Pro/Max 登入",
   "provider.connect.selectMethod": "選擇 {{provider}} 的登入方式。",
   "provider.connect.method.apiKey": "API 金鑰",
   "provider.connect.status.inProgress": "正在授權...",
@@ -229,18 +138,12 @@ export const dict = {
   "provider.connect.azure.resourceName.placeholder": "例如：my-models",
   "provider.connect.azure.baseURL.label": "Azure OpenAI 端點 URL",
   "provider.connect.azure.baseURL.placeholder": "例如：https://my-models.openai.azure.com/openai",
-  "provider.connect.opencodeZen.line1": "OpenCode Zen 為你提供一組精選的可靠最佳化模型，用於程式碼 Agent。",
-  "provider.connect.opencodeZen.line2": "只需一個 API 金鑰，你就能使用 Claude、GPT、Gemini、GLM 等模型。",
-  "provider.connect.opencodeZen.visit.prefix": "造訪 ",
-  "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
-  "provider.connect.opencodeZen.visit.suffix": " 取得你的 API 金鑰。",
   "provider.connect.oauth.code.visit.prefix": "造訪 ",
   "provider.connect.oauth.code.visit.link": "此連結",
   "provider.connect.oauth.code.visit.suffix": " 取得授權碼，以連線你的帳戶並在 Kilo 中使用 {{provider}} 模型。",
   "provider.connect.oauth.code.label": "{{method}} 授權碼",
   "provider.connect.oauth.code.placeholder": "授權碼",
   "provider.connect.oauth.code.required": "授權碼為必填",
-  "provider.connect.oauth.code.invalid": "授權碼無效",
   "provider.connect.oauth.auto.visit.prefix": "造訪 ",
   "provider.connect.oauth.auto.visit.link": "此連結",
   "provider.connect.oauth.auto.visit.suffix": " 並輸入以下程式碼，以連線你的帳戶並在 Kilo 中使用 {{provider}} 模型。",
@@ -252,29 +155,12 @@ export const dict = {
   "provider.disconnect.toast.disconnected.description": "{{provider}} 模型已不再可用。",
   "model.tag.free": "免費",
   "model.tag.dataCollected": "資料可能會用於訓練",
-  "model.tag.latest": "最新",
   "model.group.auto": "自動模型",
   "model.group.recommended": "推薦",
   "model.group.favorites": "我的最愛",
-  "model.group.collapse": "折疊 {{group}}",
-  "model.group.expand": "展開 {{group}}",
   "model.favorite.add": "加入我的最愛",
   "model.favorite.remove": "從我的最愛中移除",
 
-  "model.provider.anthropic": "Anthropic",
-  "model.provider.openai": "OpenAI",
-  "model.provider.google": "Google",
-  "model.provider.xai": "xAI",
-  "model.provider.meta": "Meta",
-  "model.input.text": "文字",
-  "model.input.image": "圖片",
-  "model.input.audio": "音訊",
-  "model.input.video": "影片",
-  "model.input.pdf": "pdf",
-  "model.tooltip.allows": "支援：{{inputs}}",
-  "model.tooltip.reasoning.allowed": "支援推理",
-  "model.tooltip.reasoning.none": "不支援推理",
-  "model.tooltip.context": "上下文上限 {{limit}}",
   "model.preview.label.released": "發布",
   "model.preview.label.input": "輸入",
   "model.preview.label.output": "輸出",
@@ -293,11 +179,8 @@ export const dict = {
   "model.preview.modality.audio": "音訊",
   "model.preview.modality.video": "影片",
   "model.preview.modality.pdf": "PDF",
-  "common.search.placeholder": "搜尋",
   "common.goBack": "上一頁",
-  "common.goForward": "下一頁",
   "common.loading": "載入中",
-  "common.loading.ellipsis": "...",
   "common.cancel": "取消",
   "common.connect": "連線",
   "common.disconnect": "中斷連線",
@@ -305,54 +188,8 @@ export const dict = {
   "common.save": "儲存",
   "common.saving": "儲存中...",
   "common.default": "預設",
-  "common.attachment": "附件",
 
-  "prompt.placeholder.shell": "輸入 shell 命令...",
-  "prompt.placeholder.normal": '隨便問點什麼... "{{example}}"',
-  "prompt.placeholder.summarizeComments": "摘要評論…",
-  "prompt.placeholder.summarizeComment": "摘要這則評論…",
-  "prompt.mode.shell": "Shell",
-  "prompt.mode.shell.exit": "按 esc 離開",
-
-  "prompt.example.1": "修復程式碼庫中的一個 TODO",
-  "prompt.example.2": "這個專案的技術堆疊是什麼？",
-  "prompt.example.3": "修復失敗的測試",
-  "prompt.example.4": "解釋驗證是如何運作的",
-  "prompt.example.5": "尋找並修復安全漏洞",
-  "prompt.example.6": "為使用者服務新增單元測試",
-  "prompt.example.7": "重構這個函式，讓它更易讀",
-  "prompt.example.8": "這個錯誤是什麼意思？",
-  "prompt.example.9": "幫我偵錯這個問題",
-  "prompt.example.10": "產生 API 文件",
-  "prompt.example.11": "最佳化資料庫查詢",
-  "prompt.example.12": "新增輸入驗證",
-  "prompt.example.13": "建立一個新的元件用於...",
-  "prompt.example.14": "我該如何部署這個專案？",
-  "prompt.example.15": "審查我的程式碼並給出最佳實務建議",
-  "prompt.example.16": "為這個函式新增錯誤處理",
-  "prompt.example.17": "解釋這個正規表示式",
-  "prompt.example.18": "把它轉換成 TypeScript",
-  "prompt.example.19": "在整個程式碼庫中新增日誌",
-  "prompt.example.20": "哪些相依性已經過期？",
-  "prompt.example.21": "幫我寫一個遷移腳本",
-  "prompt.example.22": "為這個端點實作快取",
-  "prompt.example.23": "給這個清單新增分頁",
-  "prompt.example.24": "建立一個 CLI 命令用於...",
-  "prompt.example.25": "這裡的環境變數是怎麼運作的？",
-
-  "prompt.popover.emptyResults": "沒有符合的結果",
-  "prompt.popover.emptyCommands": "沒有符合的命令",
-  "prompt.dropzone.label": "將圖片或 PDF 拖到這裡",
-  "prompt.slash.badge.custom": "自訂",
-  "prompt.slash.badge.skill": "技能",
-  "prompt.slash.badge.mcp": "mcp",
-  "prompt.context.active": "作用中",
-  "prompt.context.includeActiveFile": "包含作用中檔案",
-  "prompt.context.removeActiveFile": "從上下文移除目前檔案",
-  "prompt.context.removeFile": "從上下文移除檔案",
   "prompt.thinking.tooltip": "推理強度",
-  "prompt.action.attachFile": "附加檔案",
-  "prompt.attachment.remove": "移除附件",
   "prompt.action.send": "傳送",
   "prompt.action.send.blocked": "請先回答或忽略待處理的問題",
   "prompt.action.send.recording": "轉錄並傳送",
@@ -388,187 +225,17 @@ export const dict = {
   "speechToText.tooltip.error": "語音輸入失敗。點擊清除。",
   "speechToText.error.title": "語音輸入失敗",
   "speechToText.error.loginRequired": "登入 Kilo 以使用語音輸入。",
-  "speechToText.error.permission": "麥克風權限被拒絕。",
-  "speechToText.error.microphone": "無法啟動麥克風。",
-  "speechToText.error.recording": "錄音失敗。",
-  "speechToText.error.emptyRecording": "未錄製任何音訊。",
   "speechToText.error.emptyTranscript": "未偵測到語音。",
-  "speechToText.error.encoding": "無法編碼錄音。",
-  "speechToText.toast.transcribed": "已插入轉錄文字",
 
-  "prompt.toast.pasteUnsupported.title": "不支援的貼上",
-  "prompt.toast.pasteUnsupported.description": "這裡只能貼上圖片或 PDF 檔案。",
-  "prompt.toast.modelAgentRequired.title": "請選擇 Agent 和模型",
-  "prompt.toast.modelAgentRequired.description": "傳送提示前請先選擇 Agent 和模型。",
-  "prompt.toast.worktreeCreateFailed.title": "建立工作樹失敗",
-  "prompt.toast.sessionCreateFailed.title": "建立工作階段失敗",
-  "prompt.toast.shellSendFailed.title": "傳送 shell 命令失敗",
-  "prompt.toast.commandSendFailed.title": "傳送命令失敗",
   "prompt.toast.promptSendFailed.title": "傳送提示失敗",
 
-  "dialog.mcp.title": "MCP",
-  "dialog.mcp.description": "已啟用 {{enabled}} / {{total}}",
-  "dialog.mcp.empty": "未設定 MCP",
-
-  "dialog.lsp.empty": "已從檔案類型自動偵測到 LSPs",
-  "dialog.plugins.empty": "在 opencode.json 中設定的外掛程式",
-
   "mcp.status.connected": "已連線",
   "mcp.status.failed": "失敗",
   "mcp.status.needs_auth": "需要授權",
   "mcp.status.needs_registration": "需要客戶端註冊",
   "mcp.status.disabled": "已停用",
 
-  "dialog.fork.empty": "沒有可用於分支的訊息",
-
-  "dialog.directory.search.placeholder": "搜尋資料夾",
-  "dialog.directory.empty": "找不到資料夾",
-
-  "dialog.server.title": "伺服器",
-  "dialog.server.description": "切換此應用程式連線的 Kilo 伺服器。",
-  "dialog.server.search.placeholder": "搜尋伺服器",
-  "dialog.server.empty": "暫無伺服器",
-  "dialog.server.add.title": "新增伺服器",
-  "dialog.server.add.url": "伺服器 URL",
-  "dialog.server.add.placeholder": "http://localhost:4096",
-  "dialog.server.add.error": "無法連線到伺服器",
-  "dialog.server.add.checking": "檢查中...",
-  "dialog.server.add.button": "新增伺服器",
-  "dialog.server.default.title": "預設伺服器",
-  "dialog.server.default.description": "應用程式啟動時連線此伺服器，而不是啟動本機伺服器。需要重新啟動。",
-  "dialog.server.default.none": "未選擇伺服器",
-  "dialog.server.default.set": "將目前伺服器設為預設",
-  "dialog.server.default.clear": "清除",
-  "dialog.server.action.remove": "移除伺服器",
-
-  "dialog.server.menu.edit": "編輯",
-  "dialog.server.menu.default": "設為預設",
-  "dialog.server.menu.defaultRemove": "取消預設",
-  "dialog.server.menu.delete": "刪除",
-  "dialog.server.current": "目前伺服器",
-  "dialog.server.status.default": "預設",
-
-  "dialog.project.edit.title": "編輯專案",
-  "dialog.project.edit.name": "名稱",
-  "dialog.project.edit.icon": "圖示",
-  "dialog.project.edit.icon.alt": "專案圖示",
-  "dialog.project.edit.icon.hint": "點選或拖曳圖片",
-  "dialog.project.edit.icon.recommended": "建議：128x128px",
-  "dialog.project.edit.color": "顏色",
-  "dialog.project.edit.color.select": "選擇{{color}}顏色",
-
-  "dialog.project.edit.worktree.startup": "工作區啟動腳本",
-  "dialog.project.edit.worktree.startup.description": "在建立新的工作區 (worktree) 後執行。",
-  "dialog.project.edit.worktree.startup.placeholder": "例如 bun install",
-  "context.breakdown.title": "上下文拆分",
-  "context.breakdown.note": "輸入 token 的大致拆分。「其他」包含工具定義和額外開銷。",
-  "context.breakdown.system": "系統",
-  "context.breakdown.user": "使用者",
-  "context.breakdown.assistant": "助手",
-  "context.breakdown.tool": "工具呼叫",
-  "context.breakdown.other": "其他",
-
-  "context.systemPrompt.title": "系統提示詞",
-  "context.rawMessages.title": "原始訊息",
-
-  "context.stats.session": "工作階段",
-  "context.stats.messages": "訊息數",
-  "context.stats.provider": "供應商",
-  "context.stats.model": "模型",
-  "context.stats.limit": "上下文限制",
-  "context.stats.totalTokens": "總 token",
-  "context.stats.usage": "使用量",
-  "context.stats.inputTokens": "輸入 token",
-  "context.stats.outputTokens": "輸出 token",
-  "context.stats.reasoningTokens": "推理 token",
-  "context.stats.cacheTokens": "快取 token（讀/寫）",
-  "context.stats.userMessages": "使用者訊息",
-  "context.stats.assistantMessages": "助手訊息",
-  "context.stats.totalCost": "總成本",
-  "context.stats.sessionCreated": "建立時間",
-  "context.stats.lastActivity": "最後活動",
-
-  "context.usage.tokens": "Token 數",
-  "context.usage.usage": "使用量",
-  "context.usage.cost": "成本",
-  "context.usage.clickToView": "點選以檢視上下文",
-  "context.usage.view": "檢視上下文用量",
-
-  "language.en": "English",
-  "language.zh": "簡體中文",
-  "language.zht": "繁體中文",
-  "language.ko": "한국어",
-  "language.de": "Deutsch",
-  "language.es": "Español",
-  "language.fr": "Français",
-  "language.da": "Dansk",
-  "language.ja": "日本語",
-  "language.pl": "Polski",
-  "language.ru": "Русский",
-  "language.ar": "العربية",
-  "language.no": "Norsk",
-  "language.br": "Português (Brasil)",
-  "language.bs": "Bosanski",
-  "language.th": "ไทย",
-  "language.tr": "Türkçe",
-
-  "toast.language.title": "語言",
-  "toast.language.description": "已切換到 {{language}}",
-
-  "toast.theme.title": "主題已切換",
-  "toast.scheme.title": "顏色方案",
-
-  "toast.workspace.enabled.title": "工作區已啟用",
-  "toast.workspace.enabled.description": "側邊欄現在顯示多個工作樹",
-  "toast.workspace.disabled.title": "工作區已停用",
-  "toast.workspace.disabled.description": "側邊欄只顯示主工作樹",
-
-  "toast.permissions.autoaccept.on.title": "自動接受編輯",
-  "toast.permissions.autoaccept.on.description": "編輯和寫入權限將自動獲准",
-  "toast.permissions.autoaccept.off.title": "已停止自動接受編輯",
-  "toast.permissions.autoaccept.off.description": "編輯和寫入權限將需要手動批准",
-
-  "toast.model.none.title": "未選擇模型",
-  "toast.model.none.description": "請先連線供應商以總結此工作階段",
-
-  "toast.file.loadFailed.title": "載入檔案失敗",
-
-  "toast.file.listFailed.title": "列出檔案失敗",
-  "toast.context.noLineSelection.title": "未選取行",
-  "toast.context.noLineSelection.description": "請先在檔案分頁中選取行範圍。",
-  "toast.session.share.copyFailed.title": "無法複製連結到剪貼簿",
-  "toast.session.share.success.title": "工作階段已分享",
-  "toast.session.share.success.description": "分享連結已複製到剪貼簿",
-  "toast.session.share.failed.title": "分享工作階段失敗",
-  "toast.session.share.failed.description": "分享工作階段時發生錯誤",
-
-  "toast.session.unshare.success.title": "已取消分享工作階段",
-  "toast.session.unshare.success.description": "工作階段已成功取消分享",
-  "toast.session.unshare.failed.title": "取消分享失敗",
-  "toast.session.unshare.failed.description": "取消分享工作階段時發生錯誤",
-
   "toast.session.rename.invalid.title": "無效的工作階段標題",
-  "toast.session.listFailed.title": "無法載入 {{project}} 的工作階段",
-
-  "toast.update.title": "有可用更新",
-  "toast.update.description": "Kilo 有新版本 ({{version}}) 可安裝。",
-  "toast.update.action.installRestart": "安裝並重新啟動",
-  "toast.update.action.notYet": "稍後",
-
-  "error.page.title": "出了點問題",
-  "error.page.description": "載入應用程式時發生錯誤。",
-  "error.page.details.label": "錯誤詳細資訊",
-  "error.page.action.restart": "重新啟動",
-  "error.page.action.checking": "檢查中...",
-  "error.page.action.checkUpdates": "檢查更新",
-  "error.page.action.updateTo": "更新到 {{version}}",
-  "error.page.report.prefix": "請將此錯誤回報給 Kilo 團隊",
-  "error.page.report.discord": "在 Discord 上",
-  "error.page.version": "版本：{{version}}",
-
-  "error.dev.rootNotFound": "找不到根元素。你是不是忘了把它新增到 index.html? 或者 id 屬性拼錯了？",
-
-  "error.globalSync.connectFailed": "無法連線到伺服器。是否有伺服器正在 `{{url}}` 執行？",
 
   "error.startup.title": "伺服器連線失敗",
 
@@ -583,29 +250,8 @@ export const dict = {
   "error.providerAuth.chatgpt.title": "OpenAI 已將您登出",
   "error.providerAuth.chatgpt.description": "請再次登入 ChatGPT，然後重新發送訊息以繼續使用 Codex 模型。",
 
-  "error.chain.unknown": "未知錯誤",
-  "error.chain.causedBy": "原因：",
-  "error.chain.apiError": "API 錯誤",
-  "error.chain.status": "狀態：{{status}}",
-  "error.chain.retryable": "可重試：{{retryable}}",
-  "error.chain.responseBody": "回應內容:\n{{body}}",
-  "error.chain.didYouMean": "你是不是想輸入：{{suggestions}}",
-  "error.chain.modelNotFound": "找不到模型：{{provider}}/{{model}}",
-  "error.chain.checkConfig": "請檢查你的設定 (opencode.json) 中的 provider/model 名稱",
-  "error.chain.mcpFailed": 'MCP 伺服器 "{{name}}" 啟動失敗。注意：Kilo 暫不支援 MCP 認證。',
-  "error.chain.providerAuthFailed": "供應商認證失敗 ({{provider}}): {{message}}",
-  "error.chain.providerInitFailed": '無法初始化供應商 "{{provider}}"。請檢查憑證和設定。',
-  "error.chain.configJsonInvalid": "設定檔 {{path}} 不是有效的 JSON(C)",
-  "error.chain.configJsonInvalidWithMessage": "設定檔 {{path}} 不是有效的 JSON(C): {{message}}",
-  "error.chain.configDirectoryTypo":
-    '{{path}} 中的目錄 "{{dir}}" 無效。請將目錄重新命名為 "{{suggestion}}" 或移除它。這是一個常見拼寫錯誤。',
-  "error.chain.configFrontmatterError": "無法解析 {{path}} 中的 frontmatter:\n{{message}}",
-  "error.chain.configInvalid": "設定檔 {{path}} 無效",
-  "error.chain.configInvalidWithMessage": "設定檔 {{path}} 無效：{{message}}",
-
   "notification.permission.title": "需要權限",
   "notification.permission.titleSubagent": "需要權限（子代理）",
-  "notification.permission.description": "{{sessionTitle}}（{{projectName}}）需要權限",
   "ui.permission.manageAutoApprove": "管理自動核准規則",
   "ui.permission.doomLoop.prompt": "偵測到 {{tool}} 工具可能陷入迴圈。是否繼續執行？",
   "ui.permission.doomLoop.rule": "繼續呼叫 {{tool}}",
@@ -630,7 +276,6 @@ export const dict = {
   "ui.permission.toolLabel.todoRead": "讀取待辦",
   "ui.permission.toolLabel.todoWrite": "更新待辦",
   "ui.permission.toolLabel.codeSearch": "程式碼搜尋",
-  "ui.permission.toggleWrap": "切換自動換行",
   "ui.permission.copyCommand": "複製",
   "ui.approval.auto": "已自動核准",
   "ui.approval.manual": "由你核准",
@@ -642,46 +287,18 @@ export const dict = {
   "ui.approval.source.yolo": "由自動核准（YOLO）模式",
   "ui.approval.source.session": "由工作階段自動核准規則",
   "ui.approval.source.default": "預設",
-  "notification.question.title": "問題",
-  "notification.question.description": "{{sessionTitle}}（{{projectName}}）有一個問題",
-  "notification.action.goToSession": "前往工作階段",
 
-  "notification.session.responseReady.title": "回覆已就緒",
-  "notification.session.error.title": "工作階段錯誤",
-  "notification.session.error.fallbackDescription": "發生錯誤",
-
-  "home.recentProjects": "最近專案",
-  "home.empty.title": "沒有最近專案",
-  "home.empty.description": "透過開啟本機專案開始使用",
-
-  "session.tab.session": "工作階段",
   "session.tab.review": "審查",
-  "session.tab.context": "上下文",
-  "session.panel.reviewAndFiles": "審查與檔案",
   "session.review.filesChanged": "{{count}} 個檔案變更",
-  "session.review.change.one": "變更",
   "session.review.change.other": "變更",
   "session.review.loadingChanges": "正在載入變更...",
-  "session.review.empty": "此工作階段暫無變更",
   "session.review.noChanges": "沒有變更",
-  "session.files.selectToOpen": "選取要開啟的檔案",
-  "session.files.all": "所有檔案",
-  "session.files.binaryContent": "二進位檔案（無法顯示內容）",
-  "session.messages.renderEarlier": "顯示更早的訊息",
   "session.messages.loadingEarlier": "正在載入更早的訊息...",
   "session.messages.loadEarlier": "載入更早的訊息",
   "session.messages.loading": "正在載入訊息...",
 
-  "session.messages.jumpToLatest": "跳到最新",
-  "session.context.addToContext": "將 {{selection}} 新增到上下文",
-
-  "session.new.worktree.main": "主分支",
-  "session.new.worktree.mainWithBranch": "主分支 ({{branch}})",
-  "session.new.worktree.create": "建立新的 worktree",
-  "session.new.lastModified": "最後修改",
   "sidebar.session.newSession": "新會話",
   "sidebar.session.newSession.tooltip": "在保持當前會話完整的同時開始全新的對話。",
-  "sidebar.session.newSession.disabled": "此會話已經是新的。請開始聊天或建立一個 worktree。",
   "sidebar.session.newWorktree": "新 Worktree",
   "sidebar.session.newWorktree.tooltip":
     "建立一個隔離的 git worktree 以安全地進行實驗、保持變更分離並在不中斷當前分支的情況下執行平行會話。",
@@ -697,128 +314,25 @@ export const dict = {
   "sidebar.session.moveToWorktree.tooltip.other":
     "將此對話和 {{files}} 個變更的檔案移動到專用的 worktree 中，以便進行隔離的後續工作。",
   "sidebar.session.showChanges.tooltip.empty": "打開變更檢視以檢查當前工作樹。",
-  "sidebar.session.showChanges.tooltip.one": "1 個檔案已變更 · +{{additions}} -{{deletions}}。開啟變更檢視。",
-  "sidebar.session.showChanges.tooltip.other": "{{files}} 個檔案已變更 · +{{additions}} -{{deletions}}。開啟變更檢視。",
-  "sidebar.session.agentManager.tooltip":
-    "打開 Agent Manager 以全面了解平行會話和 worktree，讓您可以在一個地方協調長期執行的任務。",
-  "sidebar.session.openAgentManager": "打開 Agent Manager",
   "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 中繼續失敗",
-  "session.header.search.placeholder": "搜尋 {{project}}",
-  "session.header.searchFiles": "搜尋檔案",
-  "session.header.openIn": "開啟方式",
-  "session.header.open.action": "在 {{app}} 中開啟",
-  "session.header.open.ariaLabel": "在 {{app}} 中開啟",
-  "session.header.open.menu": "開啟選項",
-  "session.header.open.copyPath": "複製路徑",
 
-  "status.popover.trigger": "狀態",
-  "status.popover.ariaLabel": "伺服器設定",
-  "status.popover.tab.servers": "伺服器",
-  "status.popover.tab.mcp": "MCP",
-  "status.popover.tab.lsp": "LSP",
-  "status.popover.tab.plugins": "外掛程式",
-  "status.popover.action.manageServers": "管理伺服器",
-
-  "session.share.popover.title": "發佈到網頁",
-  "session.share.popover.description.shared": "此工作階段已在網頁上公開。任何擁有連結的人都可以存取。",
-  "session.share.popover.description.unshared": "在網頁上公開分享此工作階段。任何擁有連結的人都可以存取。",
-  "session.share.action.share": "分享",
-  "session.share.action.publish": "發佈",
-  "session.share.action.publishing": "正在發佈...",
-  "session.share.action.unpublish": "取消發佈",
-  "session.share.action.unpublishing": "正在取消發佈...",
-  "session.share.action.view": "檢視",
-  "session.share.copy.copied": "已複製",
-  "session.share.copy.copyLink": "複製連結",
-
-  "lsp.tooltip.none": "沒有 LSP 伺服器",
-  "lsp.label.connected": "{{count}} LSP",
-
-  "prompt.loading": "正在載入提示...",
-  "terminal.loading": "正在載入終端機...",
-  "terminal.title": "終端機",
-  "terminal.title.numbered": "終端機 {{number}}",
-  "terminal.close": "關閉終端機",
-
-  "terminal.connectionLost.title": "連線中斷",
-  "terminal.connectionLost.description": "終端機連線已中斷。這可能會在伺服器重新啟動時發生。",
   "common.closeTab": "關閉標籤頁",
   "common.signIn": "登入",
-  "common.signOut": "登出",
   "common.dismiss": "忽略",
   "common.requestFailed": "要求失敗",
-  "common.moreOptions": "更多選項",
-  "common.learnMore": "深入了解",
   "common.rename": "重新命名",
-  "common.reset": "重設",
-  "common.archive": "封存",
   "common.delete": "刪除",
   "common.close": "關閉",
   "common.edit": "編輯",
   "common.loadMore": "載入更多",
 
-  "common.key.esc": "ESC",
-  "sidebar.menu.toggle": "切換選單",
-  "sidebar.nav.projectsAndSessions": "專案與工作階段",
   "sidebar.settings": "設定",
-  "sidebar.help": "說明",
-  "sidebar.workspaces.enable": "啟用工作區",
-  "sidebar.workspaces.disable": "停用工作區",
-  "sidebar.gettingStarted.title": "開始使用",
-  "sidebar.gettingStarted.line1": "Kilo 提供免費模型，你可以立即開始使用。",
-  "sidebar.gettingStarted.line2": "連線任意供應商即可使用更多模型，如 Claude、GPT、Gemini 等。",
-  "sidebar.project.recentSessions": "最近工作階段",
-  "sidebar.project.viewAllSessions": "查看全部工作階段",
 
-  "app.name.desktop": "Kilo Desktop",
-  "settings.section.desktop": "桌面",
-  "settings.section.server": "伺服器",
-  "settings.tab.general": "一般",
-  "settings.tab.shortcuts": "快速鍵",
-
-  "settings.general.section.appearance": "外觀",
-  "settings.general.section.notifications": "系統通知",
-  "settings.general.section.updates": "更新",
-  "settings.general.section.sounds": "音效",
-
-  "settings.general.row.language.title": "語言",
-  "settings.general.row.language.description": "變更 Kilo 的顯示語言",
-  "settings.general.row.appearance.title": "外觀",
-  "settings.general.row.appearance.description": "自訂 Kilo 在你的裝置上的外觀",
-  "settings.general.row.theme.title": "主題",
-  "settings.general.row.theme.description": "自訂 Kilo 的主題。",
-  "settings.general.row.font.title": "字型",
-  "settings.general.row.font.description": "自訂程式碼區塊使用的等寬字型",
-
-  "settings.general.row.releaseNotes.title": "發行說明",
-  "settings.general.row.releaseNotes.description": "更新後顯示「新功能」彈出視窗",
-
-  "settings.updates.row.startup.title": "啟動時檢查更新",
-  "settings.updates.row.startup.description": "在 Kilo 啟動時自動檢查更新",
-  "settings.updates.row.check.title": "檢查更新",
-  "settings.updates.row.check.description": "手動檢查更新並在有更新時安裝",
-  "settings.updates.action.checkNow": "立即檢查",
-  "settings.updates.action.checking": "檢查中...",
-  "settings.updates.toast.latest.title": "已是最新版本",
-  "settings.updates.toast.latest.description": "你正在使用最新版本的 Kilo。",
-
-  "font.option.ibmPlexMono": "IBM Plex Mono",
-  "font.option.cascadiaCode": "Cascadia Code",
-  "font.option.firaCode": "Fira Code",
-  "font.option.hack": "Hack",
-  "font.option.inconsolata": "Inconsolata",
-  "font.option.intelOneMono": "Intel One Mono",
-  "font.option.iosevka": "Iosevka",
-  "font.option.jetbrainsMono": "JetBrains Mono",
-  "font.option.mesloLgs": "Meslo LGS",
-  "font.option.robotoMono": "Roboto Mono",
-  "font.option.sourceCodePro": "Source Code Pro",
-  "font.option.ubuntuMono": "Ubuntu Mono",
   "sound.option.alert01": "警報 01",
   "sound.option.alert02": "警報 02",
   "sound.option.alert03": "警報 03",
@@ -864,46 +378,11 @@ export const dict = {
   "sound.option.yup04": "是 04",
   "sound.option.yup05": "是 05",
   "sound.option.yup06": "是 06",
-  "settings.general.notifications.agent.title": "代理程式",
-  "settings.general.notifications.agent.description": "當 Agent 完成或需要注意時顯示系統通知",
-  "settings.general.notifications.permissions.title": "權限",
-  "settings.general.notifications.permissions.description": "當需要權限時顯示系統通知",
-  "settings.general.notifications.errors.title": "錯誤",
-  "settings.general.notifications.errors.description": "發生錯誤時顯示系統通知",
-
-  "settings.general.sounds.agent.title": "代理程式",
-  "settings.general.sounds.agent.description": "當 Agent 完成或需要注意時播放聲音",
-  "settings.general.sounds.permissions.title": "權限",
-  "settings.general.sounds.permissions.description": "當需要權限時播放聲音",
-  "settings.general.sounds.errors.title": "錯誤",
-  "settings.general.sounds.errors.description": "發生錯誤時播放聲音",
-
-  "settings.shortcuts.title": "鍵盤快速鍵",
-  "settings.shortcuts.reset.button": "重設為預設值",
-  "settings.shortcuts.reset.toast.title": "快速鍵已重設",
-  "settings.shortcuts.reset.toast.description": "鍵盤快速鍵已重設為預設設定。",
-  "settings.shortcuts.conflict.title": "快速鍵已被占用",
-  "settings.shortcuts.conflict.description": "{{keybind}} 已分配給 {{titles}}。",
-  "settings.shortcuts.unassigned": "未設定",
-  "settings.shortcuts.pressKeys": "按下按鍵",
-  "settings.shortcuts.search.placeholder": "搜尋快速鍵",
-  "settings.shortcuts.search.empty": "找不到快速鍵",
-
-  "settings.shortcuts.group.general": "一般",
-  "settings.shortcuts.group.session": "工作階段",
-  "settings.shortcuts.group.navigation": "導覽",
-  "settings.shortcuts.group.modelAndAgent": "模型與 Agent",
-  "settings.shortcuts.group.terminal": "終端機",
-  "settings.shortcuts.group.prompt": "提示",
 
   "settings.providers.title": "供應商",
-  "settings.providers.description": "可在此調整供應商設定。",
-  "settings.providers.betaNotice":
-    "目前在設定介面中僅能配置 Kilo Gateway 供應商。在測試期間，即將推出配置其他供應商的支援。在此期間，您可以使用 CLI 或設定檔來配置供應商。我們致力於保持 Kilo 開放，絕不綁定。",
   "settings.providers.section.connected": "已連線的供應商",
   "settings.providers.connected.empty": "沒有已連線的供應商",
   "settings.providers.section.popular": "熱門供應商",
-  "settings.providers.search.placeholder": "搜尋供應商",
   "settings.providers.select.placeholder": "選擇供應商...",
   "settings.providers.tag.gateway": "Gateway",
   "settings.providers.tag.environment": "環境",
@@ -920,7 +399,6 @@ export const dict = {
   "settings.models.hidePromptTraining.title": "隱藏使用提示詞訓練的模型",
   "settings.models.hidePromptTraining.description": "隱藏供應商可能會使用您的提示詞進行訓練的 Kilo Gateway 模型。",
   "settings.providers.modeModels": "按模式選擇模型",
-  "settings.providers.custom.note": "透過 Base URL 新增自訂供應商。",
   "settings.providers.modeModels.description": "為特定模式覆寫預設模型。如果未設定，將使用全域預設模型。",
   "provider.custom.title": "自訂提供商",
   "provider.custom.description.prefix": "設定自訂提供商。請參閱",
@@ -984,9 +462,6 @@ export const dict = {
   "provider.custom.models.variants.outputEffort.max": "max",
   "provider.custom.models.remove": "移除模型",
   "provider.custom.models.add": "新增模型",
-  "provider.custom.models.fetch": "取得模型",
-  "provider.custom.models.fetching": "取得中\u2026",
-  "provider.custom.models.fetch.error": "取得模型失敗：{{error}}",
   "provider.custom.models.fetch.authError": "驗證失敗。請檢查上方的 API 金鑰後重試。",
   "provider.custom.models.fetch.empty": "此伺服器上未找到模型。",
   "provider.custom.models.fetch.added": "已新增 {{count}} 個模型。",
@@ -1037,23 +512,9 @@ export const dict = {
   "settings.config.source.projectKilocode": "舊版 .kilocode 設定",
   "settings.config.source.projectOpencode": "舊版 .opencode 設定",
   "settings.models.title": "模型",
-  "settings.models.description": "可在此調整模型設定。",
-  "settings.agents.title": "代理程式",
-  "settings.agents.description": "可在此調整 Agent 設定。",
-  "settings.commands.title": "命令",
-  "settings.commands.description": "可在此調整命令設定。",
-  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "可在此調整 MCP 設定。",
 
-  "settings.permissions.title": "權限",
-  "settings.permissions.description": "控制伺服器預設可以使用哪些工具。",
-  "settings.permissions.section.tools": "工具",
   "settings.permissions.toast.updateFailed.title": "更新權限失敗",
 
-  "settings.permissions.action.allow": "允許",
-  "settings.permissions.action.ask": "詢問",
-  "settings.permissions.action.deny": "拒絕",
-
   "settings.permissions.tool.read.title": "讀取",
   "settings.permissions.tool.read.description": "讀取檔案（符合檔案路徑）",
   "settings.permissions.tool.edit.title": "編輯",
@@ -1087,7 +548,6 @@ export const dict = {
   "settings.permissions.tool.doom_loop.title": "Doom Loop",
   "settings.permissions.tool.doom_loop.description": "偵測具有相同輸入的重複工具呼叫",
 
-  "session.delete.failed.title": "刪除工作階段失敗",
   "session.delete.title": "刪除工作階段",
   "session.delete.confirm": '刪除工作階段 "{{name}}"?',
   "session.delete.button": "刪除工作階段",
@@ -1115,14 +575,9 @@ export const dict = {
   "feedback.dialog.support": "客戶支援",
   "workStyle.onboarding.welcome": "歡迎使用 Kilo",
   "workStyle.onboarding.title": "選擇你想要的工作方式",
-  "workStyle.onboarding.description":
-    "這會設定權限、推理區塊、終端機輸出和上下文時間軸的初始預設值。此設定只會套用一次，並會略過你已自訂的設定。",
-  "workStyle.onboarding.skip": "暫時略過",
   "workStyle.onboarding.settingsNote": "你可以隨時在以下位置變更這些選項：",
   "workStyle.onboarding.settings": "設定。",
   "workStyle.toast.saved.title": "模式已成功儲存",
-  "workStyle.toast.saved.description": "您可以隨時在「設定」中更新偏好設定。",
-  "workStyle.toast.saved.action": "前往設定",
   "workStyle.choice.permissions": "權限",
   "workStyle.choice.bash": "Bash",
   "workStyle.choice.visibility": "可見性",
@@ -1145,32 +600,6 @@ export const dict = {
   "session.cloud.import.legacy": "這似乎是一個舊版工作階段，已不再受支援。",
   "session.cloud.import.failed": "無法匯入雲端工作階段",
 
-  "workspace.new": "新增工作區",
-  "workspace.type.local": "本機",
-  "workspace.type.sandbox": "沙盒",
-  "workspace.create.failed.title": "建立工作區失敗",
-  "workspace.delete.failed.title": "刪除工作區失敗",
-  "workspace.resetting.title": "正在重設工作區",
-  "workspace.resetting.description": "這可能需要一點時間。",
-  "workspace.reset.failed.title": "重設工作區失敗",
-  "workspace.reset.success.title": "工作區已重設",
-  "workspace.reset.success.description": "工作區已與預設分支保持一致。",
-  "workspace.error.stillPreparing": "工作區仍在準備中",
-  "workspace.status.checking": "正在檢查未合併的變更...",
-  "workspace.status.error": "無法驗證 git 狀態。",
-  "workspace.status.clean": "未偵測到未合併的變更。",
-  "workspace.status.dirty": "偵測到未合併的變更。",
-  "workspace.delete.title": "刪除工作區",
-  "workspace.delete.confirm": '刪除工作區 "{{name}}"?',
-  "workspace.delete.button": "刪除工作區",
-  "workspace.reset.title": "重設工作區",
-  "workspace.reset.confirm": '重設工作區 "{{name}}"?',
-  "workspace.reset.button": "重設工作區",
-  "workspace.reset.archived.none": "不會封存任何作用中工作階段。",
-  "workspace.reset.archived.one": "將封存 1 個工作階段。",
-  "workspace.reset.archived.many": "將封存 {{count}} 個工作階段。",
-  "workspace.reset.note": "這將把工作區重設為與預設分支一致。",
-
   "deviceAuth.toast.urlCopied": "URL 已複製到剪貼簿",
   "deviceAuth.toast.codeCopied": "驗證碼已複製到剪貼簿",
   "deviceAuth.toast.errorCopied": "錯誤已複製到剪貼簿",
@@ -1208,7 +637,6 @@ export const dict = {
   "profile.pass.renews": "續訂",
   "profile.action.logout": "登出",
 
-  "settings.section.configuration": "設定",
   "settings.agentBehaviour.title": "Agent 行為",
   "settings.autoApprove.title": "自動核准",
   "settings.browser.title": "瀏覽器",
@@ -1224,14 +652,12 @@ export const dict = {
   "settings.language.title": "語言",
   "settings.aboutKiloCode.title": "關於 Kilo Code",
 
-  "session.messages.empty": "在下方輸入訊息以開始對話。",
   "session.messages.welcome": "Kilo Code 是一個 AI 程式設計助手。讓它幫你建構功能、修復 bug 或解釋程式碼庫。",
   "session.messages.scrollToBottom": "捲動至底部",
   "session.messages.initializing": "初始化中...",
   "session.messages.taskStarting": "啟動中...",
   "session.status.writingResponse": "正在撰寫回覆…",
   "session.status.retry": "正在重試…",
-  "session.status.retrying": "正在重試（第 {{ attempt }} 次）… {{ message }}",
   "session.status.working": "處理中…",
   "session.status.offline": "網路已斷線 — 正在重新連線...",
   "session.outcome.incomplete": "回合已結束，尚有 {{count}} 個待辦事項",
@@ -1262,11 +688,6 @@ export const dict = {
   "context.usage.olderSessions": "{{count}} 個較早的工作階段",
   "context.stats.thisSession": "此工作階段",
 
-  "time.justNow": "剛剛",
-  "time.minutesAgo": "{{count}} 分鐘前",
-  "time.hoursAgo": "{{count}} 小時前",
-  "time.daysAgo": "{{count}} 天前",
-  "time.monthsAgo": "{{count}} 個月前",
   "time.today": "今天",
   "time.yesterday": "昨天",
   "time.thisWeek": "本週",
@@ -1282,7 +703,6 @@ export const dict = {
   "settings.aboutKiloCode.port.label": "連接埠：",
   "settings.aboutKiloCode.versionInfo": "版本資訊",
   "settings.aboutKiloCode.version.label": "版本：",
-  "settings.aboutKiloCode.extensionName": "Kilo Code 擴充功能",
   "settings.aboutKiloCode.community": "社群與支援",
   "settings.aboutKiloCode.feedback.prefix": "如果您有任何問題或回饋，歡迎在以下平台提交 issue",
   "settings.aboutKiloCode.feedback.or": "或",
@@ -1327,7 +747,6 @@ export const dict = {
   "settings.language.current": "目前：",
 
   "common.add": "新增",
-  "common.choose": "選擇…",
 
   "settings.autocomplete.autoTrigger.title": "啟用自動內嵌補全",
   "settings.autocomplete.autoTrigger.description": "在您輸入時自動顯示內嵌補全建議",
@@ -1336,27 +755,14 @@ export const dict = {
   "settings.autocomplete.chatAutocomplete.title": "啟用聊天文字方塊自動補全",
   "settings.autocomplete.chatAutocomplete.description": "在聊天文字方塊中顯示自動補全建議",
   "settings.autocomplete.modelsHint": "若要選擇用於自動補全的模型，請參閱模型設定。",
-  "settings.notifications.agent.title": "Agent 完成",
-  "settings.notifications.agent.description": "Agent 完成任務時顯示通知",
-  "settings.notifications.permissions.title": "權限請求",
-  "settings.notifications.permissions.description": "權限請求時顯示通知",
-  "settings.notifications.errors.title": "錯誤",
-  "settings.notifications.errors.description": "發生錯誤時顯示通知",
   "settings.notifications.sounds": "聲音",
   "settings.notifications.enable.title": "啟用聲音通知",
   "settings.notifications.enable.description": "在工作階段完成、遇到錯誤或需要你輸入時播放聲音",
   "settings.notifications.testSound": "測試",
-  "settings.notifications.agentSound.title": "Agent 完成提示音",
-  "settings.notifications.agentSound.description": "Agent 完成時播放的聲音",
-  "settings.notifications.permSound.title": "權限請求提示音",
-  "settings.notifications.permSound.description": "權限請求時播放的聲音",
-  "settings.notifications.errorSound.title": "錯誤提示音",
-  "settings.notifications.errorSound.description": "發生錯誤時播放的聲音",
   "settings.notifications.sound.default": "預設",
   "settings.notifications.sound.system": "系統",
   "settings.notifications.sound.description":
     "預設選項會為完成、輸入和錯誤使用不同的聲音。其他選項則會對所有事件使用同一種聲音。",
-  "settings.notifications.sound.none": "無",
   "settings.experimental.share.title": "分享模式",
   "settings.experimental.share.description": "工作階段分享行為",
   "settings.experimental.share.manual": "手動",
@@ -1376,8 +782,6 @@ export const dict = {
   "settings.experimental.imageGenerationModel.description": "圖像生成模型",
   "settings.experimental.imageGenerationModel.placeholder": "預設 (Auto Router)",
 
-  "settings.experimental.speechToText.title": "語音轉文字",
-  "settings.experimental.speechToText.description": "透過 Kilo Gateway 使用您的 Kilo 帳戶在提示詞欄位中啟用語音輸入。",
   "settings.models.speechToText.disabledDescription":
     "啟用並登入 Kilo 供應商以使用 Speech to Text。Speech to Text 目前僅支援透過 Kilo Gateway 使用。",
   "settings.models.speechToTextModel.title": "語音轉文字模型",
@@ -1415,15 +819,10 @@ export const dict = {
   "settings.agentBehaviour.defaultAgent.title": "預設 Agent",
   "settings.agentBehaviour.defaultAgent.description": "未指定時使用的 Agent",
   "settings.agentBehaviour.availableAgents": "可用代理",
-  "settings.agentBehaviour.selectAgent": "選擇要設定的 Agent…",
-  "settings.agentBehaviour.selectAgent.title": "代理程式",
-  "settings.agentBehaviour.selectAgent.description": "選擇要設定的 Agent…",
   "settings.agentBehaviour.modelOverride.title": "模型覆寫",
   "settings.agentBehaviour.modelOverride.description": "覆寫此 Agent 的預設模型",
   "settings.agentBehaviour.variantOverride.title": "模型變體覆寫",
   "settings.agentBehaviour.variantOverride.description": "覆寫此 Agent 的模型變體",
-  "settings.agentBehaviour.prompt.title": "自訂提示詞",
-  "settings.agentBehaviour.prompt.description": "此 Agent 的附加系統提示詞",
   "settings.agentBehaviour.temperature.title": "溫度",
   "settings.agentBehaviour.temperature.description":
     "控制 AI 回應的隨機程度（0–2）。較低的值（例如 0.2）會產生更聚焦、更一致的輸出。較高的值（例如 1.0）會產生更多樣、更有創意的回應。留空則使用模型預設值。",
@@ -1442,7 +841,6 @@ export const dict = {
   "settings.agentBehaviour.badge.deprecated": "棄用",
   "settings.agentBehaviour.discoveredSkills": "已發現的 Skill",
   "settings.agentBehaviour.noSkillsFound": "未發現任何 Skill。請在下方新增 Skill 資料夾路徑或 URL 以使 Skill 可用。",
-  "settings.agentBehaviour.availableModes": "可用自訂模式",
   "settings.agentBehaviour.noAgentsFound": "未找到智能體。",
   "settings.agentBehaviour.createMode": "建立新模式",
   "settings.agentBehaviour.createMode.name": "名稱",
@@ -1518,10 +916,8 @@ export const dict = {
   "settings.agentBehaviour.mcpDetail.command": "指令",
   "settings.agentBehaviour.mcpDetail.args": "引數",
   "settings.agentBehaviour.mcpDetail.env": "環境",
-  "settings.agentBehaviour.mcpDetail.disabled": "此伺服器已停用。",
   "settings.agentBehaviour.mcpBrowseMarketplace": "瀏覽市場",
   "settings.agentBehaviour.mcpEmpty": "未設定 MCP 伺服器。在 kilo.jsonc 中新增 MCP 伺服器，或請代理為您新增。",
-  "settings.agentBehaviour.workflowsPlaceholder": "工作流程透過工作區中的工作流程檔案管理。",
   "settings.agentBehaviour.workflows.description":
     "工作流程是在設定中定義的自訂斜線命令。在聊天中輸入 /command-name 來呼叫它們。命令在 opencode.json 的 'command' 區段中設定。",
   "settings.agentBehaviour.workflows.empty": "未設定自訂命令。將命令新增至 opencode.json 即可在此處看到。",
@@ -1600,7 +996,6 @@ export const dict = {
     "例如：按照 conventional commits 格式用西班牙語產生 commit messages。只回傳 commit message。",
 
   "settings.commitMessage.language.sync": "跟隨介面語言",
-  "settings.commitMessage.language.title": "語言",
   "settings.commitMessage.language.description": "選擇用於 AI 產生 commit message 的語言：",
 
   "settings.display.username.title": "使用者名稱",
@@ -1637,8 +1032,6 @@ export const dict = {
   "settings.providers.disabled": "已停用的供應商",
   "settings.providers.disabled.description": "從供應商清單中隱藏的供應商",
   "settings.providers.disabled.enable": "啟用",
-  "settings.providers.enabled": "已啟用的供應商（白名單）",
-  "settings.providers.enabled.description": "如果設定，只有這些供應商可用（排他性白名單）",
   "settings.providers.notSet": "未設定（使用伺服器預設值）",
   "dialog.model.notSet": "未設定",
   "profile.personalAccount": "個人帳戶",
@@ -1658,7 +1051,6 @@ export const dict = {
   "settings.indexing.globalEnable.description": "為每個工作區啟用索引。",
   "settings.indexing.projectEnable.title": "為此專案啟用",
   "settings.indexing.projectEnable.description": "當全域索引關閉時，為此工作區啟用索引。",
-  "settings.indexing.projectEnable.disabledTooltip": "全域索引已啟用，目前專案已包含在內。",
   "settings.indexing.lancedbDirectory.description": "本機 LanceDB 儲存的可選目錄。",
   "settings.indexing.lancedbDirectory.placeholder": "留空使用預設值",
   "settings.indexing.lancedbDirectory.title": "LanceDB 目錄",
@@ -1720,9 +1112,7 @@ export const dict = {
   "migration.migrate.title": "遷移你的設定",
   "migration.migrate.subtitle": "我們發現了你之前安裝的設定。以下是可以遷移的內容。",
   "migration.migrate.selectLabel": "選擇要遷移的內容",
-  "migration.migrate.cannotMigrate": "無法遷移",
   "migration.migrate.chatHistory": "聊天工作階段與歷史紀錄",
-  "migration.migrate.chatHistoryDesc": "與新架構不相容",
   "migration.migrate.button": "遷移設定",
   "migration.migrate.skip": "略過",
   "migration.migrate.keysDetected": "偵測到 {{count}} 個金鑰",
@@ -1745,10 +1135,7 @@ export const dict = {
   "migration.complete.cleanupDescription": "此操作將從 VS Code 儲存中刪除舊版設定。您將無法再次執行此遷移。",
   "migration.complete.done": "完成",
   "migration.migrate.sessionsDetected": "偵測到 {{count}} 個工作階段",
-  "migration.error.sessionFailed": "工作階段遷移失敗",
   "migration.error.continue": "繼續",
-  "migration.error.action.copy": "複製",
-  "migration.error.toast.copied": "錯誤已複製到剪貼簿",
 
   "migration.sessionSummary.title": "摘要：",
   "migration.sessionSummary.copy": "複製報告",
diff --git a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
index b694877ee41..18b9b4cc7fe 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
@@ -226,7 +226,6 @@ export function mockSessionValue(overrides?: {
     costBreakdown: () => [],
     contextUsage: () => undefined,
     modelUsage: () => undefined,
-    refreshModelUsage: noop,
     agents: () => [{ name: "code", description: "Code mode", mode: "primary" as const }],
     allAgents: () => [{ name: "code", description: "Code mode", mode: "primary" as const }],
     skills: () => [],
@@ -236,7 +235,6 @@ export function mockSessionValue(overrides?: {
     selectedAgent: () => "code",
     selectAgent: noop,
     getSessionAgent: () => "code",
-    getSessionModel: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
     setSessionModel: noop,
     setSessionAgent: noop,
     setSessionVariant: noop,
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 4f2aef6e2dd..009b72bb174 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
@@ -17,6 +17,8 @@ import { ServerContext } from "../context/server"
 import { WorktreeModeProvider } from "../context/worktree-mode"
 import { SidebarSearchMenu } from "../../agent-manager/SidebarSearchMenu"
 import { SidebarToggleButton } from "../../agent-manager/SidebarToggleButton"
+import { SideTerminalPanel, createTerminalState } from "../../agent-manager/terminal"
+import { LOCAL } from "../../agent-manager/navigate"
 import type { SidebarSearchItem } from "../../agent-manager/sidebar-search"
 import { Button } from "@kilocode/kilo-ui/button"
 import { IconButton } from "@kilocode/kilo-ui/icon-button"
@@ -930,6 +932,39 @@ 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.
+export const SideTerminalPanelEmpty: Story = {
+  name: "Side terminal panel — empty",
+  render: () => {
+    const state = createTerminalState(() => LOCAL)
+    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: "320px" }}>
+              <div class="am-diff-panel-wrapper">
+                <SideTerminalPanel
+                  state={state}
+                  contextKey={() => LOCAL}
+                  visible={() => true}
+                  onClose={() => undefined}
+                  onStart={() => undefined}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </StoryProviders>
+    )
+  },
+}
+
 // ---------------------------------------------------------------------------
 // NewWorktreeDialog — inline selector popovers must escape the dialog scroll
 // containers. Regression: the reasoning-variant and mode pickers were clipped
diff --git a/packages/kilo-vscode/webview-ui/src/stories/history.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/history.stories.tsx
index 229d3bc74f9..85efd1e8c0b 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/history.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/history.stories.tsx
@@ -79,7 +79,6 @@ const WithSessions: ParentComponent<{ sessions?: typeof mockSessions }> = (props
     selectedAgent: () => "code",
     selectAgent: noop,
     getSessionAgent: () => "code",
-    getSessionModel: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
     setSessionModel: noop,
     setSessionAgent: noop,
     setSessionVariant: noop,
diff --git a/packages/kilo-vscode/webview-ui/src/stories/shared.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/shared.stories.tsx
index bf3a16f7dc8..81b27047dba 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/shared.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/shared.stories.tsx
@@ -10,6 +10,7 @@ import { ModelSelectorBase } from "../components/shared/ModelSelector"
 import { SessionContext } from "../context/session"
 import type { EnrichedModel } from "../context/provider"
 import type { ModelSelection } from "../types/messages"
+import { Markdown } from "@kilocode/kilo-ui/markdown"
 
 const meta: Meta = {
   title: "Shared",
@@ -18,6 +19,27 @@ const meta: Meta = {
 export default meta
 type Story = StoryObj
 
+export const MarkdownMermaid: Story = {
+  name: "Markdown - Mermaid diagram",
+  render: () => (
+    <StoryProviders>
+      <Markdown
+        text={`# Flow
+
+\`\`\`mermaid
+flowchart TD
+  A[Prompt] --> B{Needs tools?}
+  B -->|Yes| C[Run tool]
+  B -->|No| D[Respond]
+  C --> D
+\`\`\`
+
+Rendered after the diagram.`}
+      />
+    </StoryProviders>
+  ),
+}
+
 // ---------------------------------------------------------------------------
 // ModelSelector
 // ---------------------------------------------------------------------------
diff --git a/packages/kilo-vscode/webview-ui/src/styles/agent-requirements.css b/packages/kilo-vscode/webview-ui/src/styles/agent-requirements.css
index 336b7947818..56ee5181ed2 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/agent-requirements.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/agent-requirements.css
@@ -72,10 +72,6 @@
   flex: 0 0 auto;
 }
 
-.agent-requirements-title-spinner {
-  flex: 0 0 auto;
-}
-
 [data-slot="agent-requirements-description"] {
   margin: 0;
   color: var(--text-weak-base, var(--vscode-descriptionForeground));
diff --git a/packages/kilo-vscode/webview-ui/src/styles/high-contrast.css b/packages/kilo-vscode/webview-ui/src/styles/high-contrast.css
index bec59a4ae1d..a032dede655 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/high-contrast.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/high-contrast.css
@@ -10,7 +10,6 @@ body.vscode-high-contrast-light {
   .scroll-to-bottom-button,
   .feedback-button,
   .startup-error-retry,
-  .kilo-notifications-nav-btn,
   .image-attachment-remove,
   .prompt-review-chip-remove,
   .session-tab-bar .am-tab-close,
@@ -109,8 +108,7 @@ body.vscode-high-contrast-light {
   /* Focus states */
   .scroll-to-bottom-button:focus-visible,
   .feedback-button:focus-visible,
-  .recent-session-item:focus-visible,
-  .kilo-notifications-nav-btn:focus-visible {
+  .recent-session-item:focus-visible {
     outline: 1px solid var(--vscode-contrastActiveBorder, var(--vscode-focusBorder));
     outline-offset: -1px;
   }
diff --git a/packages/kilo-vscode/webview-ui/src/styles/model-selector.css b/packages/kilo-vscode/webview-ui/src/styles/model-selector.css
index dcd5988b840..07b09d22ff6 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/model-selector.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/model-selector.css
@@ -53,16 +53,6 @@
   position: relative;
 }
 
-.model-preview-empty {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--vscode-descriptionForeground);
-  font-size: var(--kilo-font-size-12);
-  font-style: italic;
-}
-
 .model-preview-header {
   display: flex;
   flex-direction: column;
diff --git a/packages/kilo-vscode/webview-ui/src/styles/notifications.css b/packages/kilo-vscode/webview-ui/src/styles/notifications.css
index 6a031008083..f791e247422 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/notifications.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/notifications.css
@@ -146,20 +146,6 @@
   color: var(--vscode-foreground);
 }
 
-.kilo-notifications-nav-btn {
-  background: none;
-  border: none;
-  cursor: pointer;
-  padding: 2px 4px;
-  color: var(--vscode-descriptionForeground);
-  display: inline-flex;
-  align-items: center;
-}
-
-.kilo-notifications-nav-btn:hover {
-  color: var(--vscode-foreground);
-}
-
 .kilo-notifications-nav-count {
   font-size: var(--kilo-font-size-12);
   color: var(--vscode-descriptionForeground);
diff --git a/packages/kilo-vscode/webview-ui/src/styles/session-actions.css b/packages/kilo-vscode/webview-ui/src/styles/session-actions.css
index b5b901176fa..873123a5a42 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/session-actions.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/session-actions.css
@@ -270,40 +270,6 @@
   opacity: 0;
 }
 
-/* Diff stats badge styles retained for the inline move button stats */
-.session-diff-badge {
-  display: flex;
-  flex: 1;
-  align-items: center;
-  justify-content: center;
-  gap: 4px;
-  padding: 4px 8px;
-  border: none;
-  border-radius: 4px;
-  background: transparent;
-  color: var(--vscode-descriptionForeground);
-  font-family: var(--vscode-editor-font-family), monospace;
-  font-size: var(--kilo-font-size-11);
-  font-variant-numeric: tabular-nums;
-  cursor: pointer;
-  white-space: nowrap;
-  position: relative;
-}
-
-.session-diff-badge--empty {
-  opacity: 0.5;
-}
-
-.session-diff-badge:hover {
-  background: var(--vscode-toolbar-hoverBackground);
-}
-
-.session-diff-badge [data-component="icon"] {
-  opacity: 0.7;
-  position: relative;
-  flex-shrink: 0;
-}
-
 .session-diff-add {
   color: #34d399;
 }
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts b/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
index 298d9eba88b..231731b1bdf 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
@@ -5,6 +5,12 @@ export interface TerminalFont {
   fontSize: number
 }
 
+/** Where the terminal button / Focus Terminal shortcut opens a terminal. */
+export type TerminalDestination = "vscode" | "agentManager"
+
+/** Where a terminal lives: main tab strip or right-side inspector panel. */
+export type TerminalPlacement = "tab" | "side"
+
 // Agent Manager worktree state types (mirrored from WorktreeStateManager)
 export interface WorktreeState {
   id: string
@@ -117,12 +123,6 @@ export interface BranchInfo {
   isCheckedOut?: boolean
 }
 
-// Agent Manager Import tab: external worktrees (extension → webview)
-export interface ExternalWorktreeInfo {
-  path: string
-  branch: string
-}
-
 export type DiffImageError = "too-large" | "unreadable"
 
 export interface DiffImageSide {
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 0faed279b9f..30a55b4de18 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
@@ -1,7 +1,6 @@
 import type { ProviderAuthAuthorization, ProviderAuthMethod } from "@kilocode/sdk/v2/client"
 import type { DiffSourceCapabilities, DiffSourceDescriptor } from "../../../../src/diff/sources/types"
 import type { PartBatch, PartRemove, PartUpdate } from "../../../../src/shared/stream-messages"
-import type { SessionMode } from "../../context/worktree-mode"
 import type { MarketplaceItem, MarketplaceInstalledMetadata, MarketplaceRelevanceMetadata } from "../marketplace"
 import type { ConnectionState, ServerInfo, SessionStatus } from "./connection"
 import type { FileAttachment, Part } from "./parts"
@@ -27,14 +26,15 @@ import type {
   AgentManagerApplyWorktreeDiffStatus,
   BranchInfo,
   ContinueInWorktreeStatus,
-  ExternalWorktreeInfo,
   LocalGitStats,
   ManagedSessionState,
   PRStatus,
   ReviewComment,
   RunStatus,
   SectionState,
+  TerminalDestination,
   TerminalFont,
+  TerminalPlacement,
   WorktreeErrorCode,
   WorktreeFileDiff,
   WorktreeGitStats,
@@ -632,16 +632,6 @@ export interface NotificationsLoadedMessage {
   dismissedIds: string[]
 }
 
-// Agent Manager worktree session metadata
-export interface AgentManagerSessionMetaMessage {
-  type: "agentManager.sessionMeta"
-  sessionId: string
-  mode: SessionMode
-  branch?: string
-  path?: string
-  parentBranch?: string
-}
-
 // Agent Manager repo info (current branch of the main workspace)
 export interface AgentManagerRepoInfoMessage {
   type: "agentManager.repoInfo"
@@ -698,6 +688,7 @@ export interface AgentManagerStateMessage {
   runStatuses?: RunStatus[]
   runScriptConfigured?: boolean
   runScriptPath?: string
+  terminalDestination?: TerminalDestination
 }
 
 // ---------------------------------------------------------------------------
@@ -706,6 +697,11 @@ export interface AgentManagerStateMessage {
 
 export interface AgentManagerTerminalCreatedMessage {
   type: "agentManager.terminal.created"
+  /** Correlates with the create request; lets the webview spot stale
+   *  creates. Deliberately not named `requestId`: that field name is the
+   *  generic webview request/response correlation channel. */
+  createId: string
+  placement: TerminalPlacement
   /** null for LOCAL, worktree id otherwise */
   worktreeId: string | null
   terminalId: string
@@ -727,9 +723,16 @@ export interface AgentManagerTerminalClosedMessage {
 export interface AgentManagerTerminalErrorMessage {
   type: "agentManager.terminal.error"
   terminalId?: string
+  /** Set when the error answers a specific create request. */
+  createId?: string
   message: string
 }
 
+export interface AgentManagerTerminalDestinationChangedMessage {
+  type: "agentManager.terminal.destinationChanged"
+  destination: TerminalDestination
+}
+
 export interface AgentManagerRunStatusMessage extends RunStatus {
   type: "agentManager.runStatus"
 }
@@ -819,11 +822,6 @@ export interface AgentManagerBranchesMessage {
   defaultBranch: string
 }
 
-export interface AgentManagerExternalWorktreesMessage {
-  type: "agentManager.externalWorktrees"
-  worktrees: ExternalWorktreeInfo[]
-}
-
 // Agent Manager Import tab: result feedback (extension → webview)
 export interface AgentManagerImportResultMessage {
   type: "agentManager.importResult"
@@ -1116,6 +1114,13 @@ export interface ValidateFilesResultMessage {
   existing: string[]
 }
 
+export interface ClipboardWriteResultMessage {
+  type: "clipboardWriteResult"
+  id: string
+  ok: boolean
+  error?: string
+}
+
 export type ExtensionMessage =
   | ReadyMessage
   | FontSizeChangedMessage
@@ -1198,7 +1203,6 @@ export type ExtensionMessage =
   | WorkStyleAppliedMessage
   | WorkStyleApplyFailedMessage
   | NotificationsLoadedMessage
-  | AgentManagerSessionMetaMessage
   | AgentManagerRepoInfoMessage
   | AgentManagerWorktreeSetupMessage
   | AgentManagerSessionAddedMessage
@@ -1226,7 +1230,6 @@ export type ExtensionMessage =
   | OpenCloudSessionMessage
   | SelectKiloModelMessage
   | AgentManagerBranchesMessage
-  | AgentManagerExternalWorktreesMessage
   | AgentManagerImportResultMessage
   | WorkspaceDirectoryChangedMessage
   | AgentManagerWorktreeDiffMessage
@@ -1241,6 +1244,7 @@ export type ExtensionMessage =
   | AgentManagerTerminalFontChangedMessage
   | AgentManagerTerminalClosedMessage
   | AgentManagerTerminalErrorMessage
+  | AgentManagerTerminalDestinationChangedMessage
   // legacy-migration start
   | MigrationStateMessage
   | MigrationDataMessage
@@ -1283,6 +1287,7 @@ export type ExtensionMessage =
   | TelemetryStateMessage
   | RemoteStatusMessage
   | ValidateFilesResultMessage
+  | ClipboardWriteResultMessage
   | MemoryLoadedMessage
   | MemoryEventMessage
   | MemoryOperationResultMessage
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 0d64477c94d..16fcfe59e56 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 } from "./agent-manager"
+import type { ModelAllocation, ReviewComment, 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"
@@ -175,6 +175,11 @@ export interface WebviewReadyRequest {
   type: "webviewReady"
 }
 
+export interface WebviewFocusChangedRequest {
+  type: "webviewFocusChanged"
+  focused: boolean
+}
+
 export interface SelectSourceRequest {
   type: "selectSource"
   id: string
@@ -698,7 +703,8 @@ export interface OpenWorktreeRequest {
 
 // Copy text to the system clipboard via the extension host
 export interface CopyToClipboardRequest {
-  type: "agentManager.copyToClipboard"
+  type: "copyToClipboard"
+  id: string
   text: string
 }
 
@@ -707,9 +713,12 @@ export interface ShowExistingLocalTerminalRequest {
   type: "agentManager.showExistingLocalTerminal"
 }
 
-// Create a new xterm terminal tab in the given worktree context (null = local)
+// Create a new xterm terminal in the given worktree context (null = workspace root)
 export interface AgentManagerTerminalCreateRequest {
   type: "agentManager.terminal.create"
+  /** Webview-generated correlation id, echoed back in created/error. */
+  createId: string
+  placement: TerminalPlacement
   worktreeId: string | null
 }
 
@@ -799,10 +808,6 @@ export interface RequestBranchesMessage {
   type: "agentManager.requestBranches"
 }
 
-export interface RequestExternalWorktreesMessage {
-  type: "agentManager.requestExternalWorktrees"
-}
-
 export interface ImportFromBranchRequest {
   type: "agentManager.importFromBranch"
   branch: string
@@ -813,16 +818,6 @@ export interface ImportFromPRRequest {
   url: string
 }
 
-export interface ImportExternalWorktreeRequest {
-  type: "agentManager.importExternalWorktree"
-  path: string
-  branch: string
-}
-
-export interface ImportAllExternalWorktreesRequest {
-  type: "agentManager.importAllExternalWorktrees"
-}
-
 // Agent Manager: Request one-shot diff fetch (webview → extension)
 export interface RequestWorktreeDiffMessage {
   type: "agentManager.requestWorktreeDiff"
@@ -1257,6 +1252,7 @@ export type WebviewMessage =
   | CancelLoginRequest
   | SetOrganizationRequest
   | WebviewReadyRequest
+  | WebviewFocusChangedRequest
   | SelectSourceRequest
   | RequestProvidersMessage
   | CompactRequest
@@ -1356,11 +1352,8 @@ export type WebviewMessage =
   | RequestCloudSessionDataMessage
   | ImportAndSendMessage
   | RequestBranchesMessage
-  | RequestExternalWorktreesMessage
   | ImportFromBranchRequest
   | ImportFromPRRequest
-  | ImportExternalWorktreeRequest
-  | ImportAllExternalWorktreesRequest
   | RequestWorktreeDiffMessage
   | RequestWorktreeDiffFileMessage
   | StartDiffWatchMessage
diff --git a/packages/llm/package.json b/packages/llm/package.json
index d2630bebd3d..892d40dce21 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -8,8 +8,8 @@
   "scripts": {
     "setup:recording-env": "bun run script/setup-recording-env.ts",
     "test": "bun test --timeout 30000 --only-failures",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "tsgo --noEmit",
+    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/packages/llm/src/protocols/bedrock-converse.ts b/packages/llm/src/protocols/bedrock-converse.ts
index 42dcaef5400..80412ca9ddb 100644
--- a/packages/llm/src/protocols/bedrock-converse.ts
+++ b/packages/llm/src/protocols/bedrock-converse.ts
@@ -412,6 +412,9 @@ const fromRequest = Effect.fn("BedrockConverse.fromRequest")(function* (request:
             stopSequences: generation?.stop,
           },
     toolConfig,
+    // Converse's base inferenceConfig has no topK; Anthropic/Nova accept it
+    // as a model-specific field, so it goes through additionalModelRequestFields.
+    additionalModelRequestFields: generation?.topK === undefined ? undefined : { top_k: generation.topK },
   }
 })
 
diff --git a/packages/llm/sst-env.d.ts b/packages/llm/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/llm/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/llm/test/provider/bedrock-converse.test.ts b/packages/llm/test/provider/bedrock-converse.test.ts
index 23483dda251..46657331a34 100644
--- a/packages/llm/test/provider/bedrock-converse.test.ts
+++ b/packages/llm/test/provider/bedrock-converse.test.ts
@@ -83,6 +83,26 @@ describe("Bedrock Converse route", () => {
     }),
   )
 
+  it.effect("passes topK through additionalModelRequestFields as top_k", () =>
+    Effect.gen(function* () {
+      const prepared = yield* LLMClient.prepare<BedrockConverse.BedrockConverseBody>(
+        LLM.updateRequest(baseRequest, { generation: { maxTokens: 64, temperature: 0, topK: 40 } }),
+      )
+
+      // Converse's inferenceConfig has no topK; Anthropic/Nova read it from
+      // additionalModelRequestFields as top_k.
+      expect(prepared.body.inferenceConfig).toEqual({ maxTokens: 64, temperature: 0 })
+      expect(prepared.body.additionalModelRequestFields).toEqual({ top_k: 40 })
+    }),
+  )
+
+  it.effect("omits additionalModelRequestFields when topK is unset", () =>
+    Effect.gen(function* () {
+      const prepared = yield* LLMClient.prepare<BedrockConverse.BedrockConverseBody>(baseRequest)
+      expect(prepared.body.additionalModelRequestFields).toBeUndefined()
+    }),
+  )
+
   it.effect("lowers chronological system updates to wrapped user text in order", () =>
     Effect.gen(function* () {
       const prepared = yield* LLMClient.prepare<BedrockConverse.BedrockConverseBody>(
diff --git a/packages/opencode/script/kilocode/test-cli.ts b/packages/opencode/script/kilocode/test-cli.ts
new file mode 100644
index 00000000000..3085cd95c34
--- /dev/null
+++ b/packages/opencode/script/kilocode/test-cli.ts
@@ -0,0 +1,51 @@
+import path from "path"
+import fs from "fs/promises"
+import { createRequire } from "module"
+
+export namespace TestCli {
+  export const ENV = "KILO_TEST_CLI_PATH"
+
+  export async function build(root: string, dir: string) {
+    if (path.resolve(process.cwd()) !== path.resolve(root)) {
+      throw new Error(`CLI test bundle must be built from ${root}`)
+    }
+    const { createSolidTransformPlugin } = await import("@opentui/solid/bun-plugin")
+    const entry = "./src/index.ts"
+    const out = path.join(dir, "src/storage")
+    const result = await Bun.build({
+      entrypoints: [entry],
+      outdir: out,
+      target: "bun",
+      format: "esm",
+      conditions: ["browser"],
+      plugins: [createSolidTransformPlugin()],
+      // Keep the native TUI variants dynamic and the memory package singleton shared.
+      external: ["node-gyp", "@opentui/core-*", "@kilocode/kilo-memory", "@kilocode/kilo-memory/*"],
+      naming: { entry: "cli.js", asset: "[name]-[hash].[ext]" },
+    })
+    if (!result.success) throw new AggregateError(result.logs, "Failed to build CLI subprocess test bundle")
+    await fs.cp(path.join(root, "migration"), path.join(dir, "migration"), { recursive: true })
+    // Resolve through Node's lookup from the package root: Bun's isolated layout does not
+    // materialize package-level node_modules on every platform (e.g. the Windows runners).
+    const req = createRequire(path.join(root, "package.json"))
+    const core = path.dirname(req.resolve("@opentui/core"))
+    const meta = JSON.parse(await Bun.file(path.join(core, "package.json")).text())
+    const scope = path.join(dir, "node_modules/@opentui")
+    await fs.mkdir(scope, { recursive: true })
+    // Anchor variant lookup to the core package so links stay inside the same install tree.
+    const deps = createRequire(path.join(core, "package.json"))
+    const kind = process.platform === "win32" ? "junction" : "dir"
+    for (const name of Object.keys(meta.optionalDependencies ?? {})) {
+      const target = await (async () => {
+        try {
+          return path.dirname(deps.resolve(name))
+        } catch {
+          // Optional native variant is not installed for this platform.
+          return
+        }
+      })()
+      if (target) await fs.symlink(target, path.join(scope, name.replace("@opentui/", "")), kind)
+    }
+    return path.join(out, "cli.js")
+  }
+}
diff --git a/packages/opencode/script/kilocode/test-profile.ts b/packages/opencode/script/kilocode/test-profile.ts
index ed4a61eb524..9dbe5d36839 100644
--- a/packages/opencode/script/kilocode/test-profile.ts
+++ b/packages/opencode/script/kilocode/test-profile.ts
@@ -16,11 +16,12 @@ export namespace TestProfile {
           "kilocode/{external-directory-boundary,read-directory}.test.ts",
           "util/filesystem.test.ts",
         ],
-        pty: ["pty/*.test.ts", "server/httpapi-pty.test.ts"],
+        pty: ["server/httpapi-pty.test.ts", "server/httpapi-v2-pty.test.ts"],
         runtime: [
           "cli/serve/*.test.ts",
           "kilocode/background-process.test.ts",
           "kilocode/cli/install-artifact.test.ts",
+          "kilocode/cli/tui/thread.test.ts",
           "kilocode/core-watcher.test.ts",
           "kilocode/interactive-terminal.test.ts",
           "tool/shell.test.ts",
diff --git a/packages/opencode/script/test-runner.ts b/packages/opencode/script/test-runner.ts
index 45740bf19fe..2e9463e7362 100644
--- a/packages/opencode/script/test-runner.ts
+++ b/packages/opencode/script/test-runner.ts
@@ -9,6 +9,7 @@ import path from "path"
 import fs from "fs/promises"
 import { TestProfile } from "./kilocode/test-profile"
 import { TestShard } from "./kilocode/test-shard"
+import { TestCli } from "./kilocode/test-cli"
 import { remove } from "../test/kilocode/cleanup"
 
 const root = path.resolve(import.meta.dir, "..")
@@ -178,12 +179,33 @@ type Result = {
   attempts: number
 }
 
+type Proc = ReturnType<typeof Bun.spawn>
+
 // ---------------------------------------------------------------------------
 // Setup
 // ---------------------------------------------------------------------------
 
 const xmldir = ci ? path.join(os.tmpdir(), `opencode-junit-${process.pid}`) : ""
 if (ci) await fs.mkdir(xmldir, { recursive: true })
+const supplied = process.env[TestCli.ENV]
+const binprefix = path.join(root, ".artifacts", "test-cli-")
+const built = supplied
+  ? { binary: supplied, dir: undefined }
+  : await (async () => {
+      await fs.mkdir(path.dirname(binprefix), { recursive: true })
+      const dir = await fs.mkdtemp(binprefix)
+      return { binary: await TestCli.build(root, dir), dir }
+    })()
+
+async function cleanBinary() {
+  if (!built.dir) return
+  const expected = path.dirname(binprefix)
+  const valid =
+    path.dirname(built.dir) === expected && path.basename(built.dir).startsWith(path.basename(binprefix))
+  if (!valid) throw new Error(`Refusing to remove unexpected test CLI directory: ${built.dir}`)
+  // The generated directory contains the bundle, emitted assets, and copied migrations.
+  await fs.rm(built.dir, { recursive: true, force: true })
+}
 
 const counter = { done: 0 }
 const pad = String(files.length).length
@@ -200,6 +222,74 @@ const marks = {
 } as const
 const legend = `Legend: ${marks.pass}=pass ${marks.retry}=pass-after-retry ${marks.fail}=fail ${marks.timeout}=timeout`
 
+function drain(stream: ReadableStream<Uint8Array>) {
+  const reader = stream.getReader()
+  const decoder = new TextDecoder()
+  const promise = (async () => {
+    let text = ""
+    while (true) {
+      const chunk = await reader.read()
+      if (chunk.done) return text + decoder.decode()
+      text += decoder.decode(chunk.value, { stream: true })
+    }
+  })()
+  return {
+    promise,
+    close: () => reader.cancel().catch(() => undefined),
+  }
+}
+
+async function signal(proc: Proc, sig: "SIGTERM" | "SIGKILL") {
+  if (process.platform === "win32") {
+    const args = ["/pid", String(proc.pid), "/T"]
+    if (sig === "SIGKILL") args.push("/F")
+    const kill = Bun.spawn(["taskkill", ...args], {
+      stdout: "ignore",
+      stderr: "ignore",
+      windowsHide: true,
+    })
+    await kill.exited
+    return
+  }
+
+  const tree = Bun.spawn(["ps", "-axo", "pid=,ppid="], {
+    stdout: "pipe",
+    stderr: "ignore",
+  })
+  const [code, text] = await Promise.all([tree.exited, new Response(tree.stdout).text()])
+  const rows = code === 0 ? text.trim().split("\n") : []
+  const children = new Map<number, number[]>()
+  for (const row of rows) {
+    const [pid, parent] = row.trim().split(/\s+/).map(Number)
+    if (!Number.isSafeInteger(pid) || !Number.isSafeInteger(parent)) continue
+    const list = children.get(parent) ?? []
+    list.push(pid)
+    children.set(parent, list)
+  }
+  const collect = (pid: number): number[] => (children.get(pid) ?? []).flatMap((child) => [...collect(child), child])
+  for (const pid of [...collect(proc.pid), proc.pid]) {
+    for (const target of [-pid, pid]) {
+      try {
+        process.kill(target, sig)
+      } catch (error) {
+        if (typeof error === "object" && error !== null && "code" in error && error.code === "ESRCH") continue
+        // A kill failure (e.g. EPERM in a sandboxed runner) must not take down the whole run.
+        console.error(`warn: failed to signal ${target} with ${sig}:`, error)
+      }
+    }
+  }
+}
+
+async function terminate(proc: Proc) {
+  if (proc.exitCode !== null) return
+  await signal(proc, "SIGTERM")
+  const exited = Symbol("exited")
+  const result = await Promise.race([proc.exited.then(() => exited), Bun.sleep(2_000)])
+  if (result === exited) return
+  await signal(proc, "SIGKILL")
+  await Promise.race([proc.exited, Bun.sleep(2_000)])
+}
+
 // ---------------------------------------------------------------------------
 // Run a single test file
 // ---------------------------------------------------------------------------
@@ -218,24 +308,36 @@ async function run(file: string): Promise<Result> {
 
   const proc = Bun.spawn(cmd, {
     cwd: root,
+    env: { ...process.env, [TestCli.ENV]: built.binary },
     stdout: "pipe",
     stderr: "pipe",
     windowsHide: true,
+    detached: process.platform !== "win32",
   })
   active.set(proc.pid, proc)
 
-  const timer = setTimeout(() => {
-    killed.value = true
-    proc.kill()
-  }, deadline)
-
-  const stdout = new Response(proc.stdout).text()
-  const stderr = new Response(proc.stderr).text()
-  const code = await proc.exited.finally(async () => {
-    clearTimeout(timer)
+  const stdout = drain(proc.stdout)
+  const stderr = drain(proc.stderr)
+  const code = await Promise.race([
+    proc.exited.then((value) => ({ timedout: false, value })),
+    Bun.sleep(deadline).then(() => ({ timedout: true, value: -1 })),
+  ]).then(async (result) => {
+    if (result.timedout) {
+      killed.value = true
+      await terminate(proc)
+    }
     await finish(proc)
+    return result.timedout ? (proc.exitCode ?? result.value) : result.value
+  })
+  const output = await Promise.race([
+    Promise.all([stdout.promise, stderr.promise]).then((value) => ({ closed: true, value })),
+    Bun.sleep(2_000).then(() => ({ closed: false, value: ["", ""] as [string, string] })),
+  ]).then(async (result) => {
+    if (result.closed) return result.value
+    await signal(proc, "SIGKILL")
+    await Promise.all([stdout.close(), stderr.close()])
+    return Promise.all([stdout.promise, stderr.promise])
   })
-  const output = await Promise.all([stdout, stderr])
 
   return {
     file,
@@ -254,7 +356,7 @@ function finish(proc: ReturnType<typeof Bun.spawn>) {
   if (found) return found
 
   const promise = (async () => {
-    await proc.exited
+    await Promise.race([proc.exited, Bun.sleep(2_000)])
     await cleanup(proc.pid)
   })().finally(() => {
     active.delete(proc.pid)
@@ -269,10 +371,9 @@ function shutdown(code: number) {
   stopping.promise = (async () => {
     stopped.value = true
     const children = [...active.values()]
-    for (const proc of children) {
-      if (proc.exitCode === null) proc.kill("SIGKILL")
-    }
+    await Promise.all(children.map(terminate))
     await Promise.all(children.map(finish))
+    await cleanBinary()
     process.exit(code)
   })()
   return stopping.promise
@@ -450,6 +551,8 @@ if (ci) {
   })
 }
 
+await cleanBinary()
+
 process.exit(failures.length > 0 ? 1 : 0)
 
 // ---------------------------------------------------------------------------
diff --git a/packages/opencode/src/acp/event.ts b/packages/opencode/src/acp/event.ts
index d4ad0567156..53e3b8bb7a8 100644
--- a/packages/opencode/src/acp/event.ts
+++ b/packages/opencode/src/acp/event.ts
@@ -80,10 +80,11 @@ export class Subscription {
   async replayMessage(message: SessionMessageResponse) {
     if (message.info.role !== "assistant" && message.info.role !== "user") return
 
+    const cwd = message.info.role === "assistant" ? message.info.path?.cwd : undefined
     for (const part of message.parts) {
       await this.recordFetchedPart(message.info.sessionID, message, part)
       if (part.type === "tool") {
-        await this.handleToolPart(message.info.sessionID, part)
+        await this.handleToolPart(message.info.sessionID, part, cwd ?? process.cwd())
         continue
       }
       await this.replayContentPart(message, part)
@@ -146,7 +147,7 @@ export class Subscription {
       }),
     )
     if (part.type === "tool") {
-      await this.handleToolPart(session.id, part)
+      await this.handleToolPart(session.id, part, session.cwd)
     }
   }
 
@@ -231,8 +232,8 @@ export class Subscription {
     )
   }
 
-  private async handleToolPart(sessionId: string, part: ToolPart) {
-    await this.toolStart(sessionId, part)
+  private async handleToolPart(sessionId: string, part: ToolPart, cwd: string) {
+    await this.toolStart(sessionId, part, cwd)
 
     switch (part.state.status) {
       case "pending":
@@ -240,7 +241,7 @@ export class Subscription {
         return
 
       case "running":
-        await this.runningTool(sessionId, part)
+        await this.runningTool(sessionId, part, cwd)
         return
 
       case "completed":
@@ -253,6 +254,7 @@ export class Subscription {
               toolCallId: part.callID,
               toolName: part.tool,
               state: part.state,
+              cwd,
             }),
           },
         })
@@ -268,6 +270,7 @@ export class Subscription {
               toolCallId: part.callID,
               toolName: part.tool,
               state: part.state,
+              cwd,
             }),
           },
         })
@@ -275,7 +278,7 @@ export class Subscription {
     }
   }
 
-  private async runningTool(sessionId: string, part: ToolPart) {
+  private async runningTool(sessionId: string, part: ToolPart, cwd: string) {
     if (part.state.status !== "running") return
 
     const output = part.tool === "bash" ? shellOutputSnapshot(part.state) : undefined
@@ -289,6 +292,7 @@ export class Subscription {
               toolCallId: part.callID,
               toolName: part.tool,
               state: part.state,
+              cwd,
             }),
           },
         })
@@ -306,12 +310,13 @@ export class Subscription {
           toolName: part.tool,
           state: part.state,
           output,
+          cwd,
         }),
       },
     })
   }
 
-  private async toolStart(sessionId: string, part: ToolPart) {
+  private async toolStart(sessionId: string, part: ToolPart, cwd: string) {
     if (this.toolStarts.has(part.callID)) return
     this.toolStarts.add(part.callID)
     await this.input.connection.sessionUpdate({
@@ -322,6 +327,7 @@ export class Subscription {
           toolCallId: part.callID,
           toolName: part.tool,
           state: part.state,
+          cwd,
         }),
       },
     })
diff --git a/packages/opencode/src/acp/tool.ts b/packages/opencode/src/acp/tool.ts
index 4c39c0eff1f..d0e57cc2ecf 100644
--- a/packages/opencode/src/acp/tool.ts
+++ b/packages/opencode/src/acp/tool.ts
@@ -1,3 +1,4 @@
+import { isAbsolute, resolve } from "path"
 import type { ToolCall, ToolCallContent, ToolCallLocation, ToolCallUpdate, ToolKind } from "@agentclientprotocol/sdk"
 
 export type ToolInput = Record<string, unknown>
@@ -69,10 +70,16 @@ export function toToolKind(toolName: string): ToolKind {
   }
 }
 
-export function toLocations(toolName: string, input: ToolInput): ToolCallLocation[] {
+export function toLocations(toolName: string, input: ToolInput, cwd?: string): ToolCallLocation[] {
   const tool = toolName.toLocaleLowerCase()
 
   switch (tool) {
+    case "bash":
+    case "shell": {
+      const workdir = shellWorkdir(input, cwd)
+      return workdir ? [{ path: workdir }] : []
+    }
+
     case "read":
     case "edit":
     case "write":
@@ -88,10 +95,6 @@ export function toLocations(toolName: string, input: ToolInput): ToolCallLocatio
     case "context7_get_library_docs":
       return locationFrom(input.path)
 
-    case "bash":
-    case "shell":
-      return []
-
     default:
       return []
   }
@@ -122,14 +125,15 @@ export function pendingToolCall(input: {
   readonly toolCallId: string
   readonly toolName: string
   readonly state: { readonly input: ToolInput; readonly title?: string }
+  readonly cwd?: string
 }): ToolCall {
   return {
     toolCallId: input.toolCallId,
-    title: input.state.title || input.toolName,
+    title: toolTitle(input.toolName, input.state.input, input.state.title),
     kind: toToolKind(input.toolName),
     status: "pending",
-    locations: toLocations(input.toolName, input.state.input),
-    rawInput: input.state.input,
+    locations: toLocations(input.toolName, input.state.input, input.cwd),
+    rawInput: rawInput(input.toolName, input.state.input, input.cwd),
   }
 }
 
@@ -138,6 +142,7 @@ export function runningToolUpdate(input: {
   readonly toolName: string
   readonly state: RunningToolState
   readonly output?: string
+  readonly cwd?: string
 }): ToolCallUpdate {
   const content = input.output
     ? [
@@ -155,9 +160,9 @@ export function runningToolUpdate(input: {
     toolCallId: input.toolCallId,
     status: "in_progress",
     kind: toToolKind(input.toolName),
-    title: input.state.title ?? input.toolName,
-    locations: toLocations(input.toolName, input.state.input),
-    rawInput: input.state.input,
+    title: toolTitle(input.toolName, input.state.input, input.state.title),
+    locations: toLocations(input.toolName, input.state.input, input.cwd),
+    rawInput: rawInput(input.toolName, input.state.input, input.cwd),
     ...(content ? { content } : {}),
   }
 }
@@ -166,29 +171,32 @@ export function duplicateRunningToolUpdate(input: {
   readonly toolCallId: string
   readonly toolName: string
   readonly state: RunningToolState
+  readonly cwd?: string
 }): ToolCallUpdate {
   return {
     toolCallId: input.toolCallId,
     status: "in_progress",
     kind: toToolKind(input.toolName),
-    title: input.state.title ?? input.toolName,
-    locations: toLocations(input.toolName, input.state.input),
-    rawInput: input.state.input,
+    title: toolTitle(input.toolName, input.state.input, input.state.title),
+    locations: toLocations(input.toolName, input.state.input, input.cwd),
+    rawInput: rawInput(input.toolName, input.state.input, input.cwd),
   }
 }
 
 export function completedToolUpdate(input: {
   readonly toolCallId: string
   readonly toolName: string
-  readonly state: CompletedToolState & { readonly title: string }
+  readonly state: CompletedToolState & { readonly title?: string }
+  readonly cwd?: string
 }): ToolCallUpdate {
   return {
     toolCallId: input.toolCallId,
     status: "completed",
     kind: toToolKind(input.toolName),
-    title: input.state.title,
+    title: toolTitle(input.toolName, input.state.input, input.state.title),
+    locations: toLocations(input.toolName, input.state.input, input.cwd),
     content: completedToolContent(input.toolName, input.state),
-    rawInput: input.state.input,
+    rawInput: rawInput(input.toolName, input.state.input, input.cwd),
     rawOutput: completedToolRawOutput(input.state),
   }
 }
@@ -197,13 +205,15 @@ export function errorToolUpdate(input: {
   readonly toolCallId: string
   readonly toolName: string
   readonly state: ErrorToolState
+  readonly cwd?: string
 }): ToolCallUpdate {
   return {
     toolCallId: input.toolCallId,
     status: "failed",
     kind: toToolKind(input.toolName),
-    title: input.toolName,
-    rawInput: input.state.input,
+    title: toolTitle(input.toolName, input.state.input, undefined),
+    locations: toLocations(input.toolName, input.state.input, input.cwd),
+    rawInput: rawInput(input.toolName, input.state.input, input.cwd),
     content: [
       {
         type: "content",
@@ -253,6 +263,42 @@ export function shellOutputSnapshot(state: { readonly metadata?: unknown }) {
   return stringValue((state.metadata as Record<string, unknown>).output)
 }
 
+// For shell tools, surface the actual command as the title so it stays visible
+// before output lands; non-shell tools keep their model-provided title.
+function toolTitle(toolName: string, input: ToolInput, fallback: string | undefined) {
+  if (isShell(toolName)) return shellCommand(input) ?? stringValue(input.description) ?? fallback ?? toolName
+  return fallback || toolName
+}
+
+// Enrich shell rawInput with the resolved working directory so clients can show
+// where the command runs, unless the model already specified one.
+function rawInput(toolName: string, input: ToolInput, cwd?: string): ToolInput {
+  if (!isShell(toolName)) return input
+  if (input.cwd || input.workdir) return input
+  const workdir = shellWorkdir(input, cwd)
+  return workdir ? { ...input, cwd: workdir } : input
+}
+
+function shellWorkdir(input: ToolInput, cwd?: string) {
+  const explicit = stringValue(input.workdir) ?? stringValue(input.cwd)
+  return resolvePath(explicit, cwd) ?? cwd
+}
+
+function resolvePath(value: string | undefined, cwd?: string) {
+  if (!value) return undefined
+  if (isAbsolute(value)) return value
+  return resolve(cwd ?? process.cwd(), value)
+}
+
+function shellCommand(input: ToolInput) {
+  return stringValue(input.command) ?? stringValue(input.cmd)
+}
+
+function isShell(toolName: string) {
+  const tool = toolName.toLocaleLowerCase()
+  return tool === "bash" || tool === "shell"
+}
+
 export const mapToolKind = toToolKind
 export const extractLocations = toLocations
 export const buildCompletedToolContent = completedToolContent
diff --git a/packages/opencode/src/cli/cmd/mcp.ts b/packages/opencode/src/cli/cmd/mcp.ts
index 809c91559f9..fb3fb492f71 100644
--- a/packages/opencode/src/cli/cmd/mcp.ts
+++ b/packages/opencode/src/cli/cmd/mcp.ts
@@ -5,6 +5,7 @@ import { Cause } from "effect"
 import { Client } from "@modelcontextprotocol/sdk/client/index.js"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js"
+import { LATEST_PROTOCOL_VERSION } from "@modelcontextprotocol/sdk/types.js"
 import * as prompts from "@clack/prompts"
 import { UI } from "../ui"
 import { MCP } from "../../mcp"
@@ -770,7 +771,7 @@ export const McpDebugCommand = effectCmd({
             jsonrpc: "2.0",
             method: "initialize",
             params: {
-              protocolVersion: "2024-11-05",
+              protocolVersion: LATEST_PROTOCOL_VERSION,
               capabilities: {},
               clientInfo: { name: "kilo-debug", version: InstallationVersion }, // kilocode_change
             },
diff --git a/packages/opencode/src/cli/cmd/remote.ts b/packages/opencode/src/cli/cmd/remote.ts
index 3e33f002dd3..1cc7ed520b8 100644
--- a/packages/opencode/src/cli/cmd/remote.ts
+++ b/packages/opencode/src/cli/cmd/remote.ts
@@ -2,33 +2,13 @@
 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"
-import { InstallationVersion } from "@opencode-ai/core/installation/version"
-import os from "node:os"
-import path from "node:path"
 
-function truncate(value: string, max: number) {
-  return value.length > max ? value.slice(0, max) : value
-}
-
-// kilocode_change start - K1 W1: extracted so the advertisement payload shape
-// is unit-testable as real behavior, rather than only through a source-text/
-// regex assertion on this file (the handler itself can't be driven end-to-end
-// — see the doc comment on `handler` below).
-export function buildInstanceAdvertisement(directory: string): {
-  name: string
-  projectName: string
-  version: string
-} {
-  return {
-    name: truncate(os.hostname(), 64),
-    projectName: truncate(path.basename(directory) || directory, 64),
-    version: truncate(InstallationVersion, 32),
-  }
-}
-// kilocode_change end
+// Re-export so existing unit tests that import from this module keep working.
+export { buildInstanceAdvertisement }
 
 export const RemoteCommand = cmd({
   command: "remote",
@@ -41,6 +21,8 @@ export const RemoteCommand = cmd({
       // The process-wide `KILO_REMOTE_ATTACH_SESSION` guard was removed in K1
       // (in-process sessions only; no spawned children), so this is always
       // advertised for the explicit `kilo remote` command path.
+      // enableRemote() also ensures a default advertisement; this explicit call
+      // remains a legitimate replace (or no-op when identical) per the contract.
       KiloSessions.setInstanceAdvertisement(buildInstanceAdvertisement(Instance.directory))
 
       await KiloSessions.enableRemote()
diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index b1bf4dc7c3f..56241ace1a1 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -28,7 +28,6 @@ import { Agent } from "@/agent/agent"
 import { RuntimeFlags } from "@/effect/runtime-flags"
 import { FormatError, FormatUnknownError } from "../error"
 import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "./run/runtime.stdin"
-import { event as normalizeEvent } from "./run/event"
 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
@@ -728,9 +727,9 @@ export const RunCommand = effectCmd({
           let retries = 0 // kilocode_change
           let error: string | undefined
 
-          for await (const payload of events.stream) {
-            const event = normalizeEvent(payload)
-            if (!event) continue
+          // kilocode_change start - revert to upstream: consume native events without normalizing sync copies
+          for await (const event of events.stream) {
+            // kilocode_change end
 
             if (
               event.type === "message.updated" &&
diff --git a/packages/opencode/src/cli/cmd/run/demo.ts b/packages/opencode/src/cli/cmd/run/demo.ts
index 2538835a66d..f8ad57efc32 100644
--- a/packages/opencode/src/cli/cmd/run/demo.ts
+++ b/packages/opencode/src/cli/cmd/run/demo.ts
@@ -15,8 +15,7 @@
 // Demo mode also handles permission and question replies locally, completing
 // or failing the synthetic tool parts as appropriate.
 import path from "path"
-import type { ToolPart } from "@kilocode/sdk/v2"
-import type { Event } from "./event"
+import type { Event, ToolPart } from "@kilocode/sdk/v2" // kilocode_change - revert to upstream native Event type
 import { createSessionData, reduceSessionData, type SessionData } from "./session-data"
 import { writeSessionOutput } from "./stream"
 import type { FooterApi, PermissionReply, QuestionReject, QuestionReply, RunPrompt, StreamCommit } from "./types"
diff --git a/packages/opencode/src/cli/cmd/run/event.ts b/packages/opencode/src/cli/cmd/run/event.ts
deleted file mode 100644
index fce406d3ed8..00000000000
--- a/packages/opencode/src/cli/cmd/run/event.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// kilocode_change - new file
-import type {
-  Event as SDKEvent,
-  GlobalEvent,
-  SyncEventMessagePartRemoved,
-  SyncEventMessagePartUpdated,
-  SyncEventMessageRemoved,
-  SyncEventMessageUpdated,
-} from "@kilocode/sdk/v2"
-
-type MessageUpdated = {
-  id: string
-  type: "message.updated"
-  properties: SyncEventMessageUpdated["syncEvent"]["data"]
-}
-
-type MessageRemoved = {
-  id: string
-  type: "message.removed"
-  properties: SyncEventMessageRemoved["syncEvent"]["data"]
-}
-
-type MessagePartUpdated = {
-  id: string
-  type: "message.part.updated"
-  properties: SyncEventMessagePartUpdated["syncEvent"]["data"]
-}
-
-type MessagePartRemoved = {
-  id: string
-  type: "message.part.removed"
-  properties: SyncEventMessagePartRemoved["syncEvent"]["data"]
-}
-
-export type Event = SDKEvent | MessageUpdated | MessageRemoved | MessagePartUpdated | MessagePartRemoved
-
-export function event(payload: GlobalEvent["payload"]): Event | undefined {
-  if (payload.type !== "sync") return payload
-
-  const sync = payload.syncEvent
-  switch (sync.type) {
-    case "message.updated.1":
-      return { id: sync.id, type: "message.updated", properties: sync.data }
-    case "message.removed.1":
-      return { id: sync.id, type: "message.removed", properties: sync.data }
-    case "message.part.updated.1":
-      return { id: sync.id, type: "message.part.updated", properties: sync.data }
-    case "message.part.removed.1":
-      return { id: sync.id, type: "message.part.removed", properties: sync.data }
-    default:
-      return undefined
-  }
-}
diff --git a/packages/opencode/src/cli/cmd/run/session-data.ts b/packages/opencode/src/cli/cmd/run/session-data.ts
index 01605f0a0d0..97df459e91b 100644
--- a/packages/opencode/src/cli/cmd/run/session-data.ts
+++ b/packages/opencode/src/cli/cmd/run/session-data.ts
@@ -24,9 +24,8 @@
 //   `data.questions`. The footer shows whichever is first. When a reply
 //   event arrives, the queue entry is removed and the footer falls back
 //   to the next pending request or to the prompt view.
-import type { Part, PermissionRequest, QuestionRequest, ToolPart } from "@kilocode/sdk/v2"
+import type { Event, Part, PermissionRequest, QuestionRequest, ToolPart } from "@kilocode/sdk/v2" // kilocode_change - revert to upstream native Event type
 import type { RunInteractiveTerminalSnapshot } from "@/kilocode/cli/cmd/run/types" // kilocode_change
-import type { Event } from "./event"
 import * as Locale from "@/util/locale"
 import { appendTerminalOutput } from "@/kilocode/interactive-terminal/output" // kilocode_change
 import { toolView } from "./tool"
diff --git a/packages/opencode/src/cli/cmd/run/stream.transport.ts b/packages/opencode/src/cli/cmd/run/stream.transport.ts
index d7d01fb27d3..a2c77f87641 100644
--- a/packages/opencode/src/cli/cmd/run/stream.transport.ts
+++ b/packages/opencode/src/cli/cmd/run/stream.transport.ts
@@ -15,8 +15,7 @@
 // The tick counter prevents stale idle events from resolving the wrong turn.
 // We also re-check live session status before resolving an idle event so a
 // delayed idle from an older turn cannot complete a newer busy turn.
-import type { GlobalEvent, KiloClient } from "@kilocode/sdk/v2"
-import { event as normalizeEvent, type Event } from "./event"
+import type { Event, GlobalEvent, KiloClient } from "@kilocode/sdk/v2" // kilocode_change - revert to upstream native Event type
 import { Context, Deferred, Effect, Exit, Layer, Scope, Stream } from "effect"
 import { makeRuntime } from "@/effect/run-service"
 import {
@@ -191,8 +190,10 @@ function globalPayloadEvent(value: unknown): Event | undefined {
     return undefined
   }
 
-  const payload = normalizeEvent(value.payload)
-  return payload && isEvent(payload) ? payload : undefined
+  // kilocode_change start - revert to upstream: ignore sync compatibility copies
+  if (value.payload.type === "sync") return undefined
+  return isEvent(value.payload) ? value.payload : undefined
+  // kilocode_change end
 }
 
 function isMatchingDisposeEvent(value: unknown, directory: string | undefined): boolean {
diff --git a/packages/opencode/src/cli/cmd/run/subagent-data.ts b/packages/opencode/src/cli/cmd/run/subagent-data.ts
index 3205423ea77..0cc3187b82a 100644
--- a/packages/opencode/src/cli/cmd/run/subagent-data.ts
+++ b/packages/opencode/src/cli/cmd/run/subagent-data.ts
@@ -1,5 +1,4 @@
-import type { Message, Part, PermissionRequest, QuestionRequest, ToolPart } from "@kilocode/sdk/v2"
-import type { Event } from "./event"
+import type { Event, Message, Part, PermissionRequest, QuestionRequest, ToolPart } from "@kilocode/sdk/v2" // kilocode_change - revert to upstream native Event type
 import * as Locale from "@/util/locale"
 import {
   bootstrapSessionData,
diff --git a/packages/opencode/src/cli/cmd/serve.ts b/packages/opencode/src/cli/cmd/serve.ts
index 6eb7277b068..cbb65e4e979 100644
--- a/packages/opencode/src/cli/cmd/serve.ts
+++ b/packages/opencode/src/cli/cmd/serve.ts
@@ -4,6 +4,7 @@ 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",
@@ -38,6 +39,7 @@ export const ServeCommand = effectCmd({
           const shutdown = async () => {
             stopWatchdog()
             try {
+              await KiloSessions.drainIngestForShutdown() // kilocode_change
               await InstanceRuntime.disposeAllInstances()
               await server.stop(true)
             } finally {
diff --git a/packages/opencode/src/cli/cmd/tui.ts b/packages/opencode/src/cli/cmd/tui.ts
index ce9fa7e3515..0bd54ed5840 100644
--- a/packages/opencode/src/cli/cmd/tui.ts
+++ b/packages/opencode/src/cli/cmd/tui.ts
@@ -283,6 +283,9 @@ export const TuiThreadCommand = cmd({
       }
       process.once("SIGHUP", () => shutdownAndExit({ reason: "signal", signal: "SIGHUP", code: 129 }))
       process.once("SIGTERM", () => shutdownAndExit({ reason: "signal", signal: "SIGTERM", code: 143 }))
+      // kilocode_change - external kill -INT takes the same graceful path as SIGHUP/SIGTERM.
+      // Interactive Ctrl-C in the TUI is a raw-mode keypress, not a signal.
+      process.once("SIGINT", () => shutdownAndExit({ reason: "signal", signal: "SIGINT", code: 130 }))
       // In some terminal/tab-close paths the parent shell is terminated without
       // forwarding a signal to this process, leaving the TUI orphaned. Detect
       // parent PID re-parenting and exit explicitly.
diff --git a/packages/opencode/src/cli/tui/worker-shutdown.ts b/packages/opencode/src/cli/tui/worker-shutdown.ts
new file mode 100644
index 00000000000..e084c28f7cd
--- /dev/null
+++ b/packages/opencode/src/cli/tui/worker-shutdown.ts
@@ -0,0 +1,14 @@
+// kilocode_change - new file
+// Pure shutdown sequence for the embedded TUI worker. Extracted so unit tests can
+// assert drain → dispose → stopServer ordering without loading worker.ts side effects.
+export function createWorkerShutdown(input: {
+  drain: () => Promise<void>
+  dispose: () => Promise<void>
+  stopServer: () => Promise<void>
+}) {
+  return async () => {
+    await input.drain()
+    await input.dispose()
+    await input.stopServer()
+  }
+}
diff --git a/packages/opencode/src/cli/tui/worker.ts b/packages/opencode/src/cli/tui/worker.ts
index 4543ab08c47..5232ed0b87c 100644
--- a/packages/opencode/src/cli/tui/worker.ts
+++ b/packages/opencode/src/cli/tui/worker.ts
@@ -13,6 +13,8 @@ import { disposeAllInstancesAndEmitGlobalDisposed } from "@/server/global-lifecy
 import { KiloLog } from "@/kilocode/log" // kilocode_change
 import { ensureProcessMetadata } from "@opencode-ai/core/util/opencode-process" // kilocode_change
 import { createWorkerRemoteExit } from "@/kilocode/cli/cmd/tui/remote-exit-worker" // kilocode_change
+import { createWorkerShutdown } from "@/cli/tui/worker-shutdown" // kilocode_change
+import { KiloSessions } from "@/kilo-sessions/kilo-sessions" // kilocode_change
 
 ensureProcessMetadata("worker") // kilocode_change - retain worker role and parent run correlation
 await KiloLog.init() // kilocode_change - keep compatibility logs off the TUI terminal
@@ -25,6 +27,15 @@ GlobalBus.on("event", (event) => {
 
 let server: Awaited<ReturnType<typeof Server.listen>> | undefined
 const remoteExit = createWorkerRemoteExit(Rpc.emit) // kilocode_change
+// kilocode_change start - drain ingest before dispose so GlobalBus/remote stay live
+const runShutdown = createWorkerShutdown({
+  drain: () => KiloSessions.drainIngestForShutdown(),
+  dispose: () => InstanceRuntime.disposeAllInstances(),
+  stopServer: async () => {
+    if (server) await server.stop(true)
+  },
+})
+// kilocode_change end
 
 export const rpc = {
   // kilocode_change start - worker lifecycle hooks for remote exit
@@ -78,8 +89,7 @@ export const rpc = {
   },
   async shutdown() {
     remoteExit.shutdown() // kilocode_change
-    await InstanceRuntime.disposeAllInstances()
-    if (server) await server.stop(true)
+    await runShutdown() // kilocode_change - drain → dispose → stopServer
     // kilocode_change start - Clear the Rpc message channel so the worker's event loop can drain and
     // exit naturally. Without this, the active onmessage handle keeps the
     // worker alive even after all async work is done.
diff --git a/packages/opencode/src/kilo-sessions/ingest-drain.ts b/packages/opencode/src/kilo-sessions/ingest-drain.ts
new file mode 100644
index 00000000000..09024f371ba
--- /dev/null
+++ b/packages/opencode/src/kilo-sessions/ingest-drain.ts
@@ -0,0 +1,18 @@
+// Once-per-process guard around the session ingest shutdown drain.
+// Overlapping shutdown paths (worker RPC, KiloShutdown, serve signals) must not double-POST.
+// The guarded call never rejects: a drain failure must not block the remaining shutdown
+// sequence (disposeAllInstances / server.stop). Failures are logged once via the optional
+// onError callback; later callers share the same resolved promise (no retry).
+export namespace IngestDrain {
+  export function create(run: () => Promise<void>, onError?: (err: unknown) => void) {
+    let done: Promise<void> | undefined
+    return () => {
+      if (!done) {
+        done = run().catch((err) => {
+          onError?.(err)
+        })
+      }
+      return done
+    }
+  }
+}
diff --git a/packages/opencode/src/kilo-sessions/ingest-queue.ts b/packages/opencode/src/kilo-sessions/ingest-queue.ts
index 83f6b9583e9..ed9eb0187c1 100644
--- a/packages/opencode/src/kilo-sessions/ingest-queue.ts
+++ b/packages/opencode/src/kilo-sessions/ingest-queue.ts
@@ -83,7 +83,8 @@ export namespace IngestQueue {
     // To avoid spamming the server, we coalesce updates and flush at most once per ~1s per session.
     //
     // `due` is the earliest time we should flush; it is also used to respect backoff when retries are
-    // active. A later `due` always wins over an earlier one.
+    // active. A later `due` always wins over an earlier one for non-terminal batches. Terminal batches
+    // (`session_close`) may pull the flush earlier.
     const queue = new Map<string, { timeout: Timer; due: number; data: Map<string, Data> }>()
 
     // Per-session retry state.
@@ -94,6 +95,18 @@ export namespace IngestQueue {
     // - Store `until` so sync() can avoid scheduling a flush before backoff expires
     const retry = new Map<string, { count: number; until: number }>()
 
+    // In-flight flush promises. flush() deletes the queue entry before I/O, so an empty queue is not
+    // quiescence — drain must join these too.
+    const inflight = new Set<Promise<void>>()
+
+    // Last successfully resolved client and per-session share. Drain falls back to these when
+    // getClient/getShare fail during teardown (e.g. authValid HTTP check).
+    let cached: Client | undefined
+    const shares = new Map<string, Share>()
+
+    // Shutdown mode: one attempt per item, no re-enqueue, use cached client/share on resolution failure.
+    let shutting = false
+
     const now = options.now ?? (() => Date.now())
     const set = options.setTimeout ?? ((fn, ms) => setTimeout(fn, ms))
     const clear = options.clearTimeout ?? ((timer) => clearTimeout(timer))
@@ -154,12 +167,12 @@ export namespace IngestQueue {
       return models.length > 0 ? `model:${models}` : ulid()
     }
 
-    function schedule(sessionId: string, due: number, data: Map<string, Data>) {
+    function schedule(sessionId: string, due: number, data: Map<string, Data>, terminal = false) {
       const existing = queue.get(sessionId)
       if (existing) {
-        // Don't reschedule if an earlier flush is already planned.
-        // We only move the flush later (e.g., to respect backoff).
-        if (existing.due >= due) return
+        // Non-terminal: only move the flush later (e.g., to respect backoff).
+        // Terminal (`session_close`): may pull the flush earlier so the tail is not left behind.
+        if (!terminal && existing.due >= due) return
         clear(existing.timeout)
       }
 
@@ -170,7 +183,7 @@ export namespace IngestQueue {
       queue.set(sessionId, { timeout, due, data })
     }
 
-    function enqueue(sessionId: string, items: Data[], mode: "overwrite" | "fill", due: number) {
+    function enqueue(sessionId: string, items: Data[], mode: "overwrite" | "fill", due: number, terminal = false) {
       const existing = queue.get(sessionId)
       if (existing) {
         for (const item of items) {
@@ -180,7 +193,7 @@ export namespace IngestQueue {
           if (mode === "fill" && existing.data.has(k)) continue
           existing.data.set(k, item)
         }
-        schedule(sessionId, due, existing.data)
+        schedule(sessionId, due, existing.data, terminal)
         return
       }
 
@@ -189,7 +202,12 @@ export namespace IngestQueue {
         data.set(key(item), item)
       }
 
-      schedule(sessionId, due, data)
+      schedule(sessionId, due, data, terminal)
+    }
+
+    function requeue(sessionId: string, items: Data[], delay: number) {
+      if (shutting) return
+      enqueue(sessionId, items, "fill", now() + delay)
     }
 
     async function flush(sessionId: string) {
@@ -204,13 +222,49 @@ export namespace IngestQueue {
       queue.delete(sessionId)
 
       const items = Array.from(queued.data.values())
-
+      const done = run(sessionId, items)
+      inflight.add(done)
       try {
-        const share = await options.getShare(sessionId).catch(() => undefined)
-        if (!share) return
+        await done
+      } finally {
+        inflight.delete(done)
+      }
+    }
 
-        const client = await options.getClient()
-        if (!client) return
+    async function resolveShare(sessionId: string) {
+      const fresh = await options.getShare(sessionId).catch(() => undefined)
+      if (fresh) shares.set(sessionId, fresh)
+      return fresh ?? (shutting ? shares.get(sessionId) : undefined)
+    }
+
+    async function resolveClient() {
+      // Preserve normal-path throw → outer catch logging; only swallow during shutdown so the
+      // cached client can be used.
+      const fresh = await options.getClient().catch((error) => {
+        if (!shutting) throw error
+        return undefined
+      })
+      if (fresh) cached = fresh
+      return fresh ?? (shutting ? cached : undefined)
+    }
+
+    async function run(sessionId: string, items: Data[]) {
+      try {
+        const share = await resolveShare(sessionId)
+        if (!share) {
+          if (shutting) {
+            options.log.error("ingest drain skipped", { sessionId, reason: "no share" })
+          }
+          return
+        }
+
+        const client = await resolveClient()
+        if (!client) {
+          if (shutting) {
+            options.log.error("ingest drain skipped", { sessionId, reason: "no client" })
+          }
+          return
+        }
 
         if (options.log.info) {
           const types = items.map((d) => d.type).join(",")
@@ -233,6 +287,12 @@ export namespace IngestQueue {
 
         if (!response) {
           // Network failures are assumed transient; retry with backoff and a small budget.
+          // Shutdown: one attempt only — log and drop so the process can exit.
+          if (shutting) {
+            options.log.error("share sync failed", { sessionId, error: "network", shutdown: true })
+            return
+          }
+
           const count = (retry.get(sessionId)?.count ?? 0) + 1
           if (count > 6) {
             options.log.error("share sync failed", { sessionId, error: "retry budget exceeded" })
@@ -243,7 +303,7 @@ export namespace IngestQueue {
           const delay = backoff(count)
           retry.set(sessionId, { count, until: now() + delay })
           options.log.error("share sync failed", { sessionId, error: "network", attempt: count, retryInMs: delay })
-          enqueue(sessionId, items, "fill", now() + delay)
+          requeue(sessionId, items, delay)
           return
         }
 
@@ -276,6 +336,16 @@ export namespace IngestQueue {
           return
         }
 
+        if (shutting) {
+          options.log.error("share sync failed", {
+            sessionId,
+            status: response.status,
+            statusText: response.statusText,
+            shutdown: true,
+          })
+          return
+        }
+
         const current = retry.get(sessionId)
         const count = (current?.count ?? 0) + 1
         if (count > 6) {
@@ -293,7 +363,7 @@ export namespace IngestQueue {
           attempt: count,
           retryInMs: delay,
         })
-        enqueue(sessionId, items, "fill", now() + delay)
+        requeue(sessionId, items, delay)
       } catch (error) {
         options.log.error("share sync failed", { sessionId, error })
       }
@@ -305,6 +375,7 @@ export namespace IngestQueue {
       // - Otherwise, merge into the pending queue entry.
       //   The next flush is scheduled ~1s after the first queued event (throttled), but never earlier
       //   than the current backoff window (if retries are active).
+      // - A batch containing session_close is terminal: flush ASAP (respecting backoff only).
       const client = await options.getClient()
       if (!client) return
 
@@ -313,15 +384,54 @@ export namespace IngestQueue {
         options.log.info("ingest sync", { sessionId, types })
       }
 
+      const terminal = data.some((item) => item.type === "session_close")
       const until = retry.get(sessionId)?.until ?? 0
-      const base = queue.get(sessionId)?.due ?? now() + 1000
+      // Terminal batches do not inherit the open debounce window — only backoff.
+      const base = terminal ? now() : (queue.get(sessionId)?.due ?? now() + 1000)
       const due = Math.max(base, until)
-      enqueue(sessionId, data, "overwrite", due)
+      enqueue(sessionId, data, "overwrite", due, terminal)
+    }
+
+    async function drain(bound = 3_000) {
+      // Shutdown drain: one bounded attempt per pending session, join in-flight flushes, no re-enqueue.
+      shutting = true
+      const deadline = now() + bound
+
+      for (const sessionId of Array.from(queue.keys())) {
+        void flush(sessionId)
+      }
+
+      while (queue.size > 0 || inflight.size > 0) {
+        for (const sessionId of Array.from(queue.keys())) {
+          void flush(sessionId)
+        }
+
+        if (now() >= deadline) {
+          options.log.error("ingest drain timed out", {
+            queue: queue.size,
+            inflight: inflight.size,
+            bound,
+          })
+          return
+        }
+
+        if (inflight.size === 0) continue
+
+        const pending = Array.from(inflight)
+        const left = Math.max(0, deadline - now())
+        let timer: Timer | undefined
+        const timeout = new Promise<void>((resolve) => {
+          timer = set(() => resolve(), left)
+        })
+        await Promise.race([Promise.allSettled(pending), timeout])
+        if (timer !== undefined) clear(timer)
+      }
     }
 
     return {
       sync,
       flush,
+      drain,
     } as const
   }
 }
diff --git a/packages/opencode/src/kilo-sessions/instance-advertisement.ts b/packages/opencode/src/kilo-sessions/instance-advertisement.ts
new file mode 100644
index 00000000000..97c5ffb6e89
--- /dev/null
+++ b/packages/opencode/src/kilo-sessions/instance-advertisement.ts
@@ -0,0 +1,21 @@
+// kilocode_change - new file
+// Shared derivation for the spawn-capable instance advertisement payload.
+// Used by both `kilo remote` (explicit CLI) and `enableRemote()` (covers `/remote`
+// and KILO_REMOTE / remote_control auto-enable) so all enable paths advertise
+// identically.
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
+import os from "node:os"
+import path from "node:path"
+import type { RemoteProtocol } from "@/kilo-sessions/remote-protocol"
+
+function truncate(value: string, max: number) {
+  return value.length > max ? value.slice(0, max) : value
+}
+
+export function buildInstanceAdvertisement(directory: string): RemoteProtocol.InstanceAdvertisement {
+  return {
+    name: truncate(os.hostname(), 64),
+    projectName: truncate(path.basename(directory) || directory, 64),
+    version: truncate(InstallationVersion, 32),
+  }
+}
diff --git a/packages/opencode/src/kilo-sessions/kilo-sessions.ts b/packages/opencode/src/kilo-sessions/kilo-sessions.ts
index e9deaeb575c..75f2b541adb 100644
--- a/packages/opencode/src/kilo-sessions/kilo-sessions.ts
+++ b/packages/opencode/src/kilo-sessions/kilo-sessions.ts
@@ -13,6 +13,7 @@ import * as Log from "@opencode-ai/core/util/log"
 import { Auth } from "@/auth"
 import { makeRuntime } from "@/effect/run-service"
 import { IngestQueue } from "@/kilo-sessions/ingest-queue"
+import { IngestDrain } from "@/kilo-sessions/ingest-drain"
 import { clearInFlightCache, withInFlightCache } from "@/kilo-sessions/inflight-cache"
 import type * as SDK from "@kilocode/sdk/v2"
 import z from "zod"
@@ -26,6 +27,7 @@ import simpleGit from "simple-git"
 import { RemoteWS } from "@/kilo-sessions/remote-ws"
 import { RemoteSender } from "@/kilo-sessions/remote-sender"
 import { RemoteProtocol } from "@/kilo-sessions/remote-protocol"
+import { buildInstanceAdvertisement } from "@/kilo-sessions/instance-advertisement"
 import { AttachedState } from "@/kilo-sessions/attached-state"
 import { SessionStatus } from "@/session/status"
 import { Telemetry } from "@kilocode/kilo-telemetry"
@@ -221,6 +223,18 @@ export namespace KiloSessions {
     },
   })
 
+  // Process-level once-guard: overlapping shutdown paths must not double-POST.
+  // Do not call from per-directory instance finalizers — wrong granularity.
+  // Never-reject: serve/worker await this unguarded before dispose/stop.
+  const drainIngest = IngestDrain.create(
+    () => ingest.drain(),
+    (err) => log.warn("ingest drain failed", { err }),
+  )
+
+  export async function drainIngestForShutdown() {
+    await drainIngest()
+  }
+
   const remoteEnabled = process.env["KILO_REMOTE"] === "1"
   let remote: { conn: RemoteWS.Connection; sender: RemoteSender.Sender } | undefined
   let enabling: Promise<void> | undefined
@@ -246,7 +260,25 @@ export namespace KiloSessions {
   const statusSyncs = new Map<string, { running: boolean; dirty: boolean }>()
   const STATUS_TIMEOUT_MS = 3_000
 
-  async function deriveStatus(sessionID: string): Promise<"idle" | "busy" | "question" | "permission" | "retry"> {
+  // Shared attention/status resolution for ingest sync and the remote heartbeat.
+  // Precedence: permission > question > SessionStatus (offline maps to retry).
+  type DerivedSessionStatus = "idle" | "busy" | "question" | "permission" | "retry"
+
+  function resolveDerivedSessionStatus(input: {
+    hasPermission: boolean
+    hasQuestion: boolean
+    statusType: SessionStatus.Info["type"] | undefined
+  }): DerivedSessionStatus {
+    if (input.hasPermission) return "permission"
+    if (input.hasQuestion) return "question"
+    if (input.statusType === "offline") return "retry"
+    if (input.statusType === "busy" || input.statusType === "retry" || input.statusType === "idle") {
+      return input.statusType
+    }
+    return "idle"
+  }
+
+  async function deriveStatus(sessionID: string): Promise<DerivedSessionStatus> {
     const { AppRuntime } = await import("@/effect/app-runtime")
     const permissions = (await AppRuntime.runPromise(Permission.Service.use((svc) => svc.list()))).filter(
       (p) => p.sessionID === sessionID,
@@ -259,8 +291,11 @@ export namespace KiloSessions {
     if (questions.length > 0) return "question"
 
     const status = await AppRuntime.runPromise(SessionStatus.Service.use((svc) => svc.get(SessionID.make(sessionID))))
-    if (status.type === "offline") return "retry"
-    return status.type
+    return resolveDerivedSessionStatus({
+      hasPermission: false,
+      hasQuestion: false,
+      statusType: status.type,
+    })
   }
 
   async function deriveAndSyncStatus(sessionID: string) {
@@ -456,9 +491,22 @@ export namespace KiloSessions {
 
   export const node = LayerNode.suspend(() => LayerNode.make(layer, [Bus.node, Config.node, Session.node]))
 
+  // kilocode_change - DEF-1: default advertisement for every successful
+  // enableRemote() entry (covers `/remote` after auto-enable already connected).
+  // No-op when an advertisement is already set — must not re-set or fire an
+  // extra heartbeat. Explicit setInstanceAdvertisement keeps replace semantics.
+  function ensureDefaultInstanceAdvertisement() {
+    if (instanceAdvertisement) return
+    setInstanceAdvertisement(buildInstanceAdvertisement(Instance.directory))
+  }
+
   export async function enableRemote() {
-    if (remote) return
+    // ingestDisabled must not advertise. Every other successful entry — including
+    // already-connected and coalescing early returns — must ensure advertisement
+    // before returning, otherwise `/remote` after auto-enable never registers.
     if (ingestDisabled) return
+    ensureDefaultInstanceAdvertisement()
+    if (remote) return
     if (enabling) return enabling
     const seq = ++remoteSeq
     void Bus.publish(Instance.current, Event.RemoteStatusChanged, { enabled: true, connected: false })
@@ -496,8 +544,16 @@ export namespace KiloSessions {
           branch().catch(() => undefined),
         ])
         const { AppRuntime } = await import("@/effect/app-runtime")
-        const statusMap = await AppRuntime.runPromise(SessionStatus.Service.use((svc) => svc.list()))
+        // Batch SessionStatus + attention lists once per heartbeat (not per session).
+        // Permission/Question list() feeds the same precedence as deriveStatus().
+        const [statusMap, permissions, questions] = await Promise.all([
+          AppRuntime.runPromise(SessionStatus.Service.use((svc) => svc.list())),
+          AppRuntime.runPromise(Permission.Service.use((svc) => svc.list())),
+          AppRuntime.runPromise(Question.Service.use((svc) => svc.list())),
+        ])
         const statuses: Record<string, SessionStatus.Info> = Object.fromEntries(statusMap)
+        const permissionSessions = new Set(permissions.map((p) => p.sessionID as string))
+        const questionSessions = new Set(questions.map((q) => q.sessionID as string))
         // Advertise both presence-owned and pending-created ids so the relay learns about new
         // sessions before the next periodic heartbeat and the create_session response can be sent.
         const ids = new Set(Object.keys(statuses))
@@ -509,7 +565,11 @@ export namespace KiloSessions {
                 svc.get(SessionID.make(id)).pipe(
                   Effect.map((session) => ({
                     id,
-                    status: statuses[id]?.type ?? ("idle" as const),
+                    status: resolveDerivedSessionStatus({
+                      hasPermission: permissionSessions.has(id),
+                      hasQuestion: questionSessions.has(id),
+                      statusType: statuses[id]?.type,
+                    }),
                     title: session.title,
                     parentSessionId: session.parentID,
                     gitUrl,
diff --git a/packages/opencode/src/kilocode/background-process/index.ts b/packages/opencode/src/kilocode/background-process/index.ts
index 7f7b41191ba..e022911c952 100644
--- a/packages/opencode/src/kilocode/background-process/index.ts
+++ b/packages/opencode/src/kilocode/background-process/index.ts
@@ -6,7 +6,7 @@ import { Identifier } from "@/id/id"
 import { Instance, type InstanceContext } from "@/kilocode/instance"
 import { KiloShutdown } from "@/kilocode/cli/shutdown"
 import { SessionID } from "@/session/schema"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { ProjectV2 } from "@opencode-ai/core/project"
 import { Process } from "@/util/process"
 import { NonNegativeInt, PositiveInt, optionalOmitUndefined, withStatics } from "@opencode-ai/core/schema"
diff --git a/packages/opencode/src/kilocode/cli/cmd/console.ts b/packages/opencode/src/kilocode/cli/cmd/console.ts
index bad162bdfe0..ae0b9cf1c52 100644
--- a/packages/opencode/src/kilocode/cli/cmd/console.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/console.ts
@@ -9,8 +9,8 @@ import { warnPort } from "@/kilocode/cli/port-warning"
 import { hasDisplay } from "@/kilocode/cli/cmd/tui/util/display"
 import { StopCommand } from "@/kilocode/cli/cmd/daemon"
 
-function browserUrl(state: Daemon.State) {
-  const url = new URL("/console", state.url)
+function withCredentials(base: string, state: Daemon.State) {
+  const url = new URL("/console", base)
   url.username = state.username
   url.password = state.password
   return url.toString()
@@ -56,11 +56,11 @@ const OpenCommand = cmd({
       if (daemon.restarted) console.warn("Restarted the Kilo daemon to apply the requested network options")
 
       const urls = state.urls ?? serverUrls(state.hostname, state.port)
-      const consoleLocal = `${urls.local}/console`
-      const consoleNetwork = urls.network ? `${urls.network}/console` : undefined
+      const consoleLocal = withCredentials(urls.local, state)
+      const consoleNetwork = urls.network ? withCredentials(urls.network, state) : undefined
 
       if (hasDisplay()) {
-        await launch(browserUrl(state)).catch((err) => {
+        await launch(consoleLocal).catch((err) => {
           console.warn(`Could not open browser automatically: ${err instanceof Error ? err.message : String(err)}`)
         })
       } else {
diff --git a/packages/opencode/src/kilocode/cli/setup.ts b/packages/opencode/src/kilocode/cli/setup.ts
index 2e41e1190f4..561e5c54062 100644
--- a/packages/opencode/src/kilocode/cli/setup.ts
+++ b/packages/opencode/src/kilocode/cli/setup.ts
@@ -24,6 +24,24 @@ import { KiloLog } from "@/kilocode/log"
 
 const log = Log.create({ service: "kilocode.cli" })
 
+// Process-level ingest drain for non-TUI commands (`kilo run`, etc.).
+// KiloCli.shutdown() runs KiloShutdown before disposeAllInstances — preserve that order.
+// Registered at setup load time (not inside shutdown()) so the task is always present.
+// Dynamic import keeps setup.ts's own static import graph unchanged: consumers that load
+// setup.ts under partial module mocks (e.g. cli-shutdown tests whose @/auth mock omits
+// OAUTH_DUMMY_KEY) would otherwise fail to link the provider/plugin chain. Dynamic import
+// returns the same in-process module singleton, so the drained queue is the one that
+// received events. Task try/catch covers dynamic-import failure outside the shared drain
+// guard; the drain itself never rejects.
+KiloShutdown.register(async () => {
+  try {
+    const { KiloSessions } = await import("@/kilo-sessions/kilo-sessions")
+    await KiloSessions.drainIngestForShutdown()
+  } catch (err) {
+    log.warn("ingest drain failed", { err })
+  }
+})
+
 // 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.
diff --git a/packages/opencode/src/kilocode/command-timeout.ts b/packages/opencode/src/kilocode/command-timeout.ts
index 4e801af2589..6be471bfb5a 100644
--- a/packages/opencode/src/kilocode/command-timeout.ts
+++ b/packages/opencode/src/kilocode/command-timeout.ts
@@ -1,5 +1,5 @@
 import { Process } from "@/util/process"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { Effect, Stream } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import type { ChildProcessHandle } from "effect/unstable/process/ChildProcessSpawner"
diff --git a/packages/opencode/src/kilocode/interactive-terminal/index.ts b/packages/opencode/src/kilocode/interactive-terminal/index.ts
index f02bc8ca172..7b5afca5688 100644
--- a/packages/opencode/src/kilocode/interactive-terminal/index.ts
+++ b/packages/opencode/src/kilocode/interactive-terminal/index.ts
@@ -6,7 +6,7 @@ import { appendTerminalOutput } from "@/kilocode/interactive-terminal/output"
 import { Identifier } from "@/id/id"
 import { Instance, type InstanceContext } from "@/kilocode/instance"
 import { SessionID } from "@/session/schema"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { NonNegativeInt, PositiveInt, optionalOmitUndefined, withStatics } from "@opencode-ai/core/schema"
 import { zod, ZodOverride } from "@opencode-ai/core/effect-zod"
 import * as Log from "@opencode-ai/core/util/log"
diff --git a/packages/opencode/src/kilocode/provider/provider.ts b/packages/opencode/src/kilocode/provider/provider.ts
index 91aef280731..cc8a452fc96 100644
--- a/packages/opencode/src/kilocode/provider/provider.ts
+++ b/packages/opencode/src/kilocode/provider/provider.ts
@@ -11,6 +11,7 @@ import { DEFAULT_HEADERS } from "@/kilocode/const"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { optionalOmitUndefined } from "@opencode-ai/core/schema"
+import { ProviderError } from "@/provider/error"
 import { Effect, Schema } from "effect"
 import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { mapValues, omit, pickBy } from "remeda"
@@ -245,24 +246,37 @@ export function kiloSmallModelPriority(providerID: string): string[] | undefined
 }
 
 // ---------------------------------------------------------------------------
-// Fetch timeout wrapper
+// Fetch timeout wrappers
 // Replaces AbortSignal.timeout() with a cancellable setTimeout+AbortController
-// so the timer is cleared once response headers arrive. This prevents healthy
-// streaming responses from being aborted mid-stream.
+// so the timer is cleared once response headers arrive, then hands the remaining
+// deadline to wrapFirstByte until the body produces data. One configured
+// `timeout` value bounds both phases together, so providers that accept a
+// request and go silent cannot hang the agent loop, while healthy streaming
+// responses are never aborted mid-stream.
 // ---------------------------------------------------------------------------
 
+/**
+ * Resolves the configured request timeout in milliseconds. `timeout: false`
+ * explicitly disables it (returns `undefined`); any other invalid, unset or
+ * non-positive value falls back to {@link REQUEST_TIMEOUT_MS} so the wait for a
+ * provider response is always bounded rather than left open-ended.
+ */
+export function requestTimeout(options: Record<string, any>): number | undefined {
+  const ms = options["timeout"] ?? REQUEST_TIMEOUT_MS
+  if (ms === false) return undefined
+  if (typeof ms === "number" && Number.isFinite(ms) && ms > 0) return ms
+  return REQUEST_TIMEOUT_MS
+}
+
 export function buildTimeoutSignal(options: Record<string, any>): {
   signal: AbortSignal | undefined
   clear: () => void
 } {
-  const ms = options["timeout"] ?? REQUEST_TIMEOUT_MS
-  if (ms === false || ms === undefined || ms === null) return { signal: undefined, clear() {} }
+  const ms = requestTimeout(options)
+  if (ms === undefined) return { signal: undefined, clear() {} }
 
   const controller = new AbortController()
-  const timer = setTimeout(
-    () => controller.abort(new DOMException("The operation timed out.", "TimeoutError")),
-    ms as number,
-  )
+  const timer = setTimeout(() => controller.abort(new DOMException("The operation timed out.", "TimeoutError")), ms)
   return {
     signal: controller.signal,
     clear() {
@@ -270,3 +284,67 @@ export function buildTimeoutSignal(options: Record<string, any>): {
     },
   }
 }
+
+/**
+ * Bounds the wait for the response body's first byte by `ms`.
+ *
+ * Response headers do not prove a live stream: a provider can answer 200 with
+ * SSE headers and then never send data. The connection-phase timeout is cleared
+ * as soon as headers arrive, so that state used to hang the agent loop forever
+ * (the turn sits between step-finish and the next step-start with no error).
+ *
+ * Only the first byte is guarded. Once any data arrives the wrapper becomes a
+ * passthrough, so idle gaps inside a streaming response (reasoning, buffering,
+ * slow token generation) are never touched here and remain opt-in through
+ * `chunkTimeout`.
+ */
+export function wrapFirstByte(res: Response, ms: number, ctl: AbortController) {
+  if (typeof ms !== "number" || ms <= 0) return res
+  if (!res.body) return res
+
+  const reader = res.body.getReader()
+  let seen = false
+  const body = new ReadableStream<Uint8Array>({
+    async pull(ctrl) {
+      if (seen) {
+        const part = await reader.read()
+        if (part.done) return ctrl.close()
+        return ctrl.enqueue(part.value)
+      }
+
+      const part = await new Promise<Awaited<ReturnType<typeof reader.read>>>((resolve, reject) => {
+        const id = setTimeout(() => {
+          const err = new ProviderError.ResponseStreamError(`Provider sent no response data within ${ms}ms`)
+          ctl.abort(err)
+          void reader.cancel(err)
+          reject(err)
+        }, ms)
+
+        reader.read().then(
+          (part) => {
+            clearTimeout(id)
+            resolve(part)
+          },
+          (err) => {
+            clearTimeout(id)
+            reject(err)
+          },
+        )
+      })
+
+      seen = true
+      if (part.done) return ctrl.close()
+      ctrl.enqueue(part.value)
+    },
+    async cancel(reason) {
+      ctl.abort(reason)
+      await reader.cancel(reason)
+    },
+  })
+
+  return new Response(body, {
+    headers: new Headers(res.headers),
+    status: res.status,
+    statusText: res.statusText,
+  })
+}
diff --git a/packages/opencode/src/kilocode/pty/self-command.ts b/packages/opencode/src/kilocode/pty/self-command.ts
index 360e094bda7..25017d720d0 100644
--- a/packages/opencode/src/kilocode/pty/self-command.ts
+++ b/packages/opencode/src/kilocode/pty/self-command.ts
@@ -1,61 +1 @@
-import path from "path"
-
-type Input = {
-  command?: string
-  args?: string[]
-  cwd?: string
-}
-
-type Command = {
-  command: string
-  args: string[]
-  cwd?: string
-}
-
-const names = new Set(["kilo", "kilocode"])
-const self = command()
-
-function clean(input: string[]) {
-  return input.filter((arg, index) => {
-    if (arg === "--cwd") return false
-    if (input[index - 1] === "--cwd") return false
-    if (arg.startsWith("--cwd=")) return false
-    return true
-  })
-}
-
-function full(input: string, cwd: string) {
-  if (path.isAbsolute(input)) return input
-  return path.resolve(cwd, input)
-}
-
-export function command(
-  proc = { argv: process.argv, execArgv: process.execArgv, execPath: process.execPath, cwd: process.cwd() },
-): Command {
-  const script = proc.argv[1]
-  const bundled = script?.startsWith("/$bunfs/") || (script ? /^[A-Za-z]:[\\/]~BUN[\\/]/.test(script) : false)
-  if (script && !bundled && /\.(ts|js|mjs|cjs)$/.test(script)) {
-    const file = full(script, proc.cwd)
-    const dir = path.dirname(file)
-    const root = path.basename(dir) === "src" ? path.dirname(dir) : proc.cwd
-    return { command: full(proc.execPath, proc.cwd), args: [...clean(proc.execArgv), file], cwd: root }
-  }
-  return { command: full(proc.execPath, proc.cwd), args: [] }
-}
-
-export function resolve(input: Input, cmd = self): Input {
-  if (!input.command || !names.has(input.command)) return input
-  const args = input.args ?? []
-  const project = cmd.cwd && args.length === 0 && input.cwd ? [input.cwd] : []
-  return {
-    ...input,
-    command: cmd.command,
-    args: [...cmd.args, ...project, ...args],
-    cwd: cmd.cwd ?? input.cwd,
-  }
-}
-
-export const KiloPtySelfCommand = {
-  command,
-  resolve,
-}
+export { command, KiloPtySelfCommand, resolve } from "@opencode-ai/core/kilocode/pty-self-command"
diff --git a/packages/opencode/src/kilocode/server/httpapi/server.ts b/packages/opencode/src/kilocode/server/httpapi/server.ts
index 1e23654ad13..02e72ea4ce2 100644
--- a/packages/opencode/src/kilocode/server/httpapi/server.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/server.ts
@@ -1,6 +1,6 @@
 import { Layer } from "effect"
 import { FetchHttpClient, HttpMiddleware, HttpRouter, HttpServer } from "effect/unstable/http"
-import { CorsConfig, isAllowedCorsOrigin, type CorsOptions } from "@/server/cors"
+import { CorsConfig, isAllowedCorsOrigin, type CorsOptions } from "@opencode-ai/server/cors"
 import { compressionLayer } from "@/server/routes/instance/httpapi/middleware/compression"
 import { corsVaryFix } from "@/server/routes/instance/httpapi/middleware/cors-vary"
 import { errorLayer } from "@/server/routes/instance/httpapi/middleware/error"
diff --git a/packages/opencode/src/kilocode/server/server.ts b/packages/opencode/src/kilocode/server/server.ts
index cebc36481ec..46fd88dd070 100644
--- a/packages/opencode/src/kilocode/server/server.ts
+++ b/packages/opencode/src/kilocode/server/server.ts
@@ -2,13 +2,5 @@
 // Kilo-specific overrides for the server control plane.
 // Imported by ../../server/server.ts with minimal kilocode_change markers.
 
-/** Additional CORS origin check for *.kilo.ai */
-export function corsOrigin(input: string): string | undefined {
-  if (/^https:\/\/([a-z0-9-]+\.)*kilo\.ai$/.test(input)) {
-    return input
-  }
-  return undefined
-}
-
 export const DOC_TITLE = "kilo"
 export const DOC_DESCRIPTION = "kilo api"
diff --git a/packages/opencode/src/kilocode/session/prompt-queue.ts b/packages/opencode/src/kilocode/session/prompt-queue.ts
index d951e934dc7..551c1cd6362 100644
--- a/packages/opencode/src/kilocode/session/prompt-queue.ts
+++ b/packages/opencode/src/kilocode/session/prompt-queue.ts
@@ -183,6 +183,7 @@ export namespace KiloSessionPromptQueue {
     target: MessageID,
     work: Effect.Effect<A, E>,
     cancelled: Effect.Effect<A, E>,
+    reserved: Effect.Effect<void> = Effect.void,
   ): Effect.Effect<A, E> {
     return Effect.acquireUseRelease(
       Effect.sync(() => {
@@ -205,7 +206,8 @@ export namespace KiloSessionPromptQueue {
         return { seq: mine, version: version(sessionID), target, previous, done, tail } satisfies Slot
       }),
       (slot) =>
-        Effect.promise(() => settle(slot.previous)).pipe(
+        reserved.pipe(
+          Effect.andThen(Effect.promise(() => settle(slot.previous))),
           Effect.flatMap(() => {
             if (isCancelled(sessionID, slot)) return cancelled
             // Snapshot the latest seq at the moment this slot actually starts
diff --git a/packages/opencode/src/kilocode/session/revert.ts b/packages/opencode/src/kilocode/session/revert.ts
new file mode 100644
index 00000000000..64ba8f98a06
--- /dev/null
+++ b/packages/opencode/src/kilocode/session/revert.ts
@@ -0,0 +1,51 @@
+import { Cause, Effect } from "effect"
+import type { MessageV2 } from "@/session/message-v2"
+import type { Session } from "@/session/session"
+import type { Snapshot } from "@/snapshot"
+
+export namespace KiloSessionRevert {
+  const rollback = <E>(snap: Snapshot.Interface, hash: string, files: string[], cause: Cause.Cause<E>) =>
+    restore(snap, hash, files).pipe(
+      Effect.matchCauseEffect({
+        onFailure: (next) => Effect.failCause(Cause.combine(cause, next)),
+        onSuccess: () => Effect.failCause(cause),
+      }),
+    )
+
+  export function files(messages: MessageV2.WithParts[], rev: NonNullable<Session.Info["revert"]>) {
+    const result: string[] = []
+    let active = false
+    for (const msg of messages) {
+      for (const part of msg.parts) {
+        if (active && part.type === "patch") result.push(...part.files)
+        if (active || msg.info.id !== rev.messageID) continue
+        if (rev.partID && part.id !== rev.partID) continue
+        active = true
+      }
+    }
+    return [...new Set(result)]
+  }
+
+  export const apply = Effect.fn("KiloSessionRevert.apply")(function* <A, E, R>(
+    snap: Snapshot.Interface,
+    baseline: string | undefined,
+    files: string[],
+    effect: Effect.Effect<A, E, R>,
+  ) {
+    return yield* effect.pipe(
+      Effect.catchCause((cause) => {
+        if (!baseline || files.length === 0) return Effect.failCause(cause)
+        return rollback(snap, baseline, files, cause)
+      }),
+    )
+  })
+
+  export const restore = Effect.fn("KiloSessionRevert.restore")(function* (
+    snap: Snapshot.Interface,
+    hash: string,
+    files: string[],
+  ) {
+    if (files.length === 0) return
+    yield* snap.revert([{ hash, files }])
+  })
+}
diff --git a/packages/opencode/src/kilocode/shell/shell.ts b/packages/opencode/src/kilocode/shell/shell.ts
index b134c43376a..c27d814ada7 100644
--- a/packages/opencode/src/kilocode/shell/shell.ts
+++ b/packages/opencode/src/kilocode/shell/shell.ts
@@ -1,124 +1 @@
-export function args(command: string) {
-  return ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", script(command)]
-}
-
-const setup = `[Console]::InputEncoding = [System.Text.UTF8Encoding]::new($false);
-[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false);
-$OutputEncoding = [Console]::OutputEncoding;
-`
-
-function script(command: string) {
-  const pos = prologue(command)
-  const head = command.slice(0, pos)
-  const body = command.slice(pos)
-  const gap = head && !/[;\r\n]\s*$/.test(head) ? "\n" : ""
-  return `${head}${gap}${setup}${body}`
-}
-
-function prologue(command: string) {
-  const pos = scan(command, 0)
-  const attr = attrs(command, pos)
-  const body = command.slice(attr)
-  const match = /^param\s*\(/i.exec(body)
-  if (!match) return pos
-
-  const start = attr + match[0].lastIndexOf("(")
-  const end = block(command, start, "(", ")")
-  if (end === undefined) return pos
-  return end
-}
-
-function attrs(command: string, start: number) {
-  let pos = start
-  while (pos < command.length) {
-    const next = scan(command, pos)
-    if (command[next] !== "[") return next
-    const end = block(command, next, "[", "]")
-    if (end === undefined) return start
-    pos = end
-  }
-  return pos
-}
-
-function scan(command: string, start: number) {
-  let pos = start
-  while (pos < command.length) {
-    const next = trivia(command, pos)
-    if (next !== pos) {
-      pos = next
-      continue
-    }
-    const end = line(command, pos)
-    const value = command.slice(pos, end)
-    if (/^using\s+(?:assembly|module|namespace|type)\b/i.test(value)) {
-      pos = end
-      continue
-    }
-    return pos
-  }
-  return pos
-}
-
-function trivia(command: string, start: number) {
-  let pos = start
-  while (pos < command.length) {
-    while (/\s/.test(command[pos] ?? "")) pos++
-    if (command[pos] === "#") {
-      pos = line(command, pos)
-      continue
-    }
-    if (command.startsWith("<#", pos)) {
-      const end = command.indexOf("#>", pos + 2)
-      if (end === -1) return command.length
-      pos = end + 2
-      continue
-    }
-    return pos
-  }
-  return pos
-}
-
-function line(command: string, start: number) {
-  const index = command.indexOf("\n", start)
-  if (index === -1) return command.length
-  return index + 1
-}
-
-function block(command: string, start: number, open: string, close: string) {
-  let depth = 0
-  let quote: string | undefined
-  for (let pos = start; pos < command.length; pos++) {
-    const char = command[pos]
-    if (quote) {
-      if (quote === "'" && char === "'" && command[pos + 1] === "'") {
-        pos++
-        continue
-      }
-      if (quote === '"' && char === "`") {
-        pos++
-        continue
-      }
-      if (char === quote) quote = undefined
-      continue
-    }
-    if (char === "'" || char === '"') {
-      quote = char
-      continue
-    }
-    if (command.startsWith("<#", pos)) {
-      const end = command.indexOf("#>", pos + 2)
-      if (end === -1) return
-      pos = end + 1
-      continue
-    }
-    if (char === "#") {
-      pos = line(command, pos) - 1
-      continue
-    }
-    if (char === open) depth++
-    if (char === close) {
-      depth--
-      if (depth === 0) return pos + 1
-    }
-  }
-}
+export { args, PowerShell } from "@opencode-ai/core/kilocode/powershell"
diff --git a/packages/opencode/src/kilocode/snapshot/diff-full.ts b/packages/opencode/src/kilocode/snapshot/diff-full.ts
index af57a7463dd..82d2b6789cf 100644
--- a/packages/opencode/src/kilocode/snapshot/diff-full.ts
+++ b/packages/opencode/src/kilocode/snapshot/diff-full.ts
@@ -1,8 +1,8 @@
 // kilocode_change - new file
 //
-// Patch generation. Runs `git diff --unified=INT_MAX` to produce
+// Patch generation. Runs `git diff --unified=3` to produce
 // unified-diff text for a set of files, instead of the npm `diff` package's
-// JS Myers implementation. Myers is O(N*M) with full context, so on
+// JS Myers implementation. Myers is O(N*M), so on
 // huge-file diffs it can block the event loop for minutes (the TUI freeze
 // where ESC stopped working after a turn).
 //
@@ -18,8 +18,9 @@ import * as Log from "@opencode-ai/core/util/log"
 export namespace DiffFull {
   const log = Log.create({ service: "snapshot.diff-full" })
 
-  // INT_MAX — git clamps to this, effectively infinite context.
-  const unified = "--unified=2147483647"
+  // Keep context bounded. Git's effectively infinite context can emit
+  // malformed repeated hunks on Windows and makes persisted snapshots huge.
+  const unified = "--unified=3"
 
   interface GitResult {
     readonly code: number
@@ -28,7 +29,7 @@ export namespace DiffFull {
   }
 
   /**
-   * Run `git diff --unified=INT_MAX` for a set of files between two refs and
+   * Run `git diff --unified=3` for a set of files between two refs and
    * return a `file → unified-diff text` map. Output format matches what the
    * `diff` package's `parsePatch` expects, so downstream clients continue to
    * work.
@@ -85,7 +86,7 @@ export namespace DiffFull {
 
   /**
    * Generate a structured + unified diff for a single file in the working
-   * tree vs HEAD using `git diff --ignore-all-space --unified=INT_MAX`.
+   * tree vs HEAD using `git diff --ignore-all-space --unified=3`.
    * Returns `null` if git produces no output (caller emits a content-only
    * response with no patch).
    */
diff --git a/packages/opencode/src/kilocode/tool/interactive-terminal.ts b/packages/opencode/src/kilocode/tool/interactive-terminal.ts
index 52aae6739a1..2bed97c3371 100644
--- a/packages/opencode/src/kilocode/tool/interactive-terminal.ts
+++ b/packages/opencode/src/kilocode/tool/interactive-terminal.ts
@@ -2,7 +2,7 @@ import { Config } from "@/config/config"
 import { InstanceState } from "@/effect/instance-state"
 import { InteractiveTerminal } from "@/kilocode/interactive-terminal"
 import { Plugin } from "@/plugin"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { ShellPermission } from "@/tool/shell"
 import { Tool } from "@/tool/tool"
 import type { FSUtil } from "@opencode-ai/core/fs-util"
diff --git a/packages/opencode/src/kilocode/tool/shell-unparsed.ts b/packages/opencode/src/kilocode/tool/shell-unparsed.ts
new file mode 100644
index 00000000000..3680f2eb735
--- /dev/null
+++ b/packages/opencode/src/kilocode/tool/shell-unparsed.ts
@@ -0,0 +1,22 @@
+import type { Node } from "web-tree-sitter"
+
+// tree-sitter-powershell drops commands containing a bare `--` into ERROR nodes
+// instead of command nodes, so the shell permission scanner collected zero
+// patterns and skipped the check entirely (Kilo-Org/kilocode#12326). Recover
+// the failed command text from ERROR nodes, and fail closed with the raw input
+// whenever the parse has errors and nothing else was recovered, so every
+// executed command yields at least one permission pattern. The raw fallback
+// also covers ERROR chunks without a command_name descendant (for example
+// PowerShell backtick escapes), which can still contain runnable text.
+export function unparsed(root: Node, commands: number): string[] {
+  if (!root.hasError && commands > 0) return []
+  const failed = root
+    .descendantsOfType("ERROR")
+    .filter((node): node is Node => Boolean(node))
+    .filter((node) => node.descendantsOfType("command_name").length > 0)
+    .map((node) => node.text.trim())
+    .filter((text) => text.length > 0)
+  if (failed.length > 0) return failed
+  const raw = root.text.trim()
+  return raw ? [raw] : []
+}
diff --git a/packages/opencode/src/kilocode/watcher.ts b/packages/opencode/src/kilocode/watcher.ts
index b953762e59e..1e7f70f39fd 100644
--- a/packages/opencode/src/kilocode/watcher.ts
+++ b/packages/opencode/src/kilocode/watcher.ts
@@ -15,6 +15,10 @@ export namespace KilocodeWatcher {
 
   export class Service extends Context.Service<Service, Interface>()("@kilocode/Watcher") {}
 
+  export function eager(client = Flag.KILO_CLIENT) {
+    return client !== "vscode"
+  }
+
   export const layer = Layer.effect(
     Service,
     Effect.gen(function* () {
@@ -51,10 +55,10 @@ export namespace KilocodeWatcher {
     }),
   )
 
-  // Gate the whole layer so LocationServiceMap's dependency graph is never built when the watcher is disabled.
+  // Gate the whole layer so LocationServiceMap is only warmed for clients that consume branch-update events.
   export const defaultLayer = Layer.unwrap(
     Effect.gen(function* () {
-      if (yield* Flag.KILO_EXPERIMENTAL_DISABLE_FILEWATCHER.pipe(Effect.orElseSucceed(() => false)))
+      if (!eager() || (yield* Flag.KILO_EXPERIMENTAL_DISABLE_FILEWATCHER.pipe(Effect.orElseSucceed(() => false))))
         return Layer.succeed(Service, Service.of({ init: () => Effect.void }))
       return layer.pipe(Layer.provide(LocationServiceMap.layer))
     }),
diff --git a/packages/opencode/src/mcp/catalog.ts b/packages/opencode/src/mcp/catalog.ts
index c43e7e9378e..3a1d9755d2d 100644
--- a/packages/opencode/src/mcp/catalog.ts
+++ b/packages/opencode/src/mcp/catalog.ts
@@ -61,8 +61,17 @@ export function convertTool(mcpTool: MCPToolDef, client: Client, timeout?: numbe
           resetTimeoutOnProgress: true,
           signal: options.abortSignal,
           timeout,
+          // The MCP SDK only sends a progress token when this hook is present, enabling timeout resets.
+          onprogress: () => {},
         },
       )
+      if (result.isError)
+        throw new Error(
+          result.content
+            .flatMap((item) => (item.type === "text" ? [item.text] : []))
+            .filter((text) => text.trim())
+            .join("\n\n") || "MCP tool returned an error",
+        )
       if (result.structuredContent === undefined || result.structuredContent === null) return result
       return {
         ...result,
diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts
index 5a40ffe48df..bcbb1033a19 100644
--- a/packages/opencode/src/mcp/index.ts
+++ b/packages/opencode/src/mcp/index.ts
@@ -8,16 +8,18 @@ if (process.platform === "win32" && !("type" in process)) {
 // kilocode_change end
 
 import path from "node:path"
+import { pathToFileURL } from "node:url"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { type Tool } from "ai"
 import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
 import { serviceUse } from "@opencode-ai/core/effect/service-use"
-import { Client } from "@modelcontextprotocol/sdk/client/index.js"
+import { Client, type ClientOptions } from "@modelcontextprotocol/sdk/client/index.js"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js"
 import {
+  ListRootsRequestSchema,
   type LoggingMessageNotification,
   LoggingMessageNotificationSchema,
   type Tool as MCPToolDef,
@@ -45,6 +47,18 @@ import * as SandboxNetwork from "@/kilocode/sandbox/network" // kilocode_change
 import { McpCatalog } from "./catalog"
 
 const DEFAULT_TIMEOUT = 30_000
+const CLIENT_OPTIONS = {
+  capabilities: {
+    // Upstream issue anomalyco/opencode#11948 // kilocode_change
+    // sampling: {},
+    // Upstream issue anomalyco/opencode#23066 // kilocode_change
+    // elicitation: {},
+    // Upstream issue anomalyco/opencode#2308 // kilocode_change
+    roots: {},
+    // Upstream issue anomalyco/opencode#28567 // kilocode_change
+    // tasks: {},
+  },
+} satisfies ClientOptions
 
 // kilocode_change start - inject --rm for Docker containers to prevent stopped container accumulation
 export function ensureDockerRm(cmd: string, args: string[]): string[] {
@@ -94,6 +108,14 @@ export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("MCP
 
 type MCPClient = Client
 
+function createClient(directory: string) {
+  const client = new Client({ name: "kilo", version: InstallationVersion }, CLIENT_OPTIONS) // kilocode_change
+  client.setRequestHandler(ListRootsRequestSchema, () =>
+    Promise.resolve({ roots: [{ uri: pathToFileURL(directory).href }] }),
+  )
+  return client
+}
+
 const StatusConnected = Schema.Struct({ status: Schema.Literal("connected") }).annotate({
   identifier: "MCPStatusConnected",
 })
@@ -204,19 +226,21 @@ export const layer = Layer.effect(
      * Connect a client via the given transport with resource safety:
      * on failure the transport is closed; on success the caller owns it.
      */
-    const connectTransport = (transport: Transport, timeout: number) =>
-      Effect.acquireUseRelease(
+    const connectTransport = Effect.fn("MCP.connectTransport")(function* (transport: Transport, timeout: number) {
+      const directory = yield* InstanceState.directory
+      return yield* Effect.acquireUseRelease(
         Effect.succeed(transport),
         (t) =>
           Effect.tryPromise({
             try: () => {
-              const client = new Client({ name: "kilo", version: InstallationVersion }) // kilocode_change
+              const client = createClient(directory)
               return withTimeout(client.connect(t), timeout).then(() => client)
             },
             catch: (e) => (e instanceof Error ? e : new Error(String(e))),
           }),
         (t, exit) => (Exit.isFailure(exit) ? Effect.tryPromise(() => t.close()).pipe(Effect.ignore) : Effect.void),
       )
+    })
 
     const DISABLED_RESULT: CreateResult = { status: { status: "disabled" } }
 
@@ -806,10 +830,11 @@ export const layer = Layer.effect(
         authProvider,
         requestInit: mcpConfig.headers ? { headers: mcpConfig.headers } : undefined,
       })
+      const directory = yield* InstanceState.directory
 
       return yield* Effect.tryPromise({
         try: () => {
-          const client = new Client({ name: "kilo", version: InstallationVersion }) // kilocode_change
+          const client = createClient(directory)
           return client
             .connect(transport)
             .then(() => ({ authorizationUrl: "", oauthState, client }) satisfies AuthResult)
diff --git a/packages/opencode/src/mcp/oauth-callback.ts b/packages/opencode/src/mcp/oauth-callback.ts
index ef0450f66a0..71bf1801218 100644
--- a/packages/opencode/src/mcp/oauth-callback.ts
+++ b/packages/opencode/src/mcp/oauth-callback.ts
@@ -1,5 +1,6 @@
 import { createConnection } from "net"
 import { createServer } from "http"
+import { escapeHtml } from "@/util/html"
 import * as Log from "@opencode-ai/core/util/log" // kilocode_change
 import { OAUTH_CALLBACK_PORT, OAUTH_CALLBACK_PATH, parseRedirectUri } from "./oauth-provider"
 import * as KiloOAuthCallback from "../kilocode/mcp-oauth-callback" // kilocode_change
@@ -52,7 +53,7 @@ const HTML_ERROR = (error: string) => `<!DOCTYPE html>
   <div class="container">
     <h1>Authorization Failed</h1>
     <p>An error occurred during authorization.</p>
-    <div class="error">${error}</div>
+    <div class="error">${escapeHtml(error)}</div>
   </div>
 </body>
 </html>`
@@ -80,6 +81,13 @@ function cleanupStateIndex(oauthState: string) {
   }
 }
 
+function stopIfIdle() {
+  if (pendingAuths.size > 0 || !server) return
+
+  server.close()
+  server = undefined
+}
+
 function handleRequest(req: import("http").IncomingMessage, res: import("http").ServerResponse) {
   const url = new URL(req.url || "/", `http://localhost:${currentPort}`)
 
@@ -97,7 +105,7 @@ function handleRequest(req: import("http").IncomingMessage, res: import("http").
   // Enforce state parameter presence
   if (!state) {
     const errorMsg = "Missing required state parameter - potential CSRF attack"
-    res.writeHead(400, { "Content-Type": "text/html" })
+    res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" })
     res.end(HTML_ERROR(errorMsg))
     return
   }
@@ -111,13 +119,14 @@ function handleRequest(req: import("http").IncomingMessage, res: import("http").
       cleanupStateIndex(state)
       pending.reject(new Error(errorMsg))
     }
-    res.writeHead(200, { "Content-Type": "text/html" })
+    res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" })
     res.end(HTML_ERROR(errorMsg))
+    stopIfIdle()
     return
   }
 
   if (!code) {
-    res.writeHead(400, { "Content-Type": "text/html" })
+    res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" })
     res.end(HTML_ERROR("No authorization code provided"))
     return
   }
@@ -125,7 +134,7 @@ function handleRequest(req: import("http").IncomingMessage, res: import("http").
   // Validate state parameter
   if (!pendingAuths.has(state)) {
     const errorMsg = "Invalid or expired state parameter - potential CSRF attack"
-    res.writeHead(400, { "Content-Type": "text/html" })
+    res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" })
     res.end(HTML_ERROR(errorMsg))
     return
   }
@@ -137,8 +146,9 @@ function handleRequest(req: import("http").IncomingMessage, res: import("http").
   cleanupStateIndex(state)
   pending.resolve(code)
 
-  res.writeHead(200, { "Content-Type": "text/html" })
+  res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" })
   res.end(HTML_SUCCESS)
+  stopIfIdle()
 }
 
 export async function ensureRunning(redirectUri?: string): Promise<void> {
@@ -212,6 +222,7 @@ export function waitForCallback(oauthState: string, mcpName?: string): Promise<s
         pendingAuths.delete(oauthState)
         if (mcpName) mcpNameToState.delete(mcpName)
         reject(new Error("OAuth callback timeout - authorization took too long"))
+        stopIfIdle()
       }
     }, CALLBACK_TIMEOUT_MS)
 
@@ -229,6 +240,7 @@ export function cancelPending(mcpName: string): void {
     pendingAuths.delete(key)
     mcpNameToState.delete(mcpName)
     pending.reject(new Error("Authorization cancelled"))
+    stopIfIdle()
   }
 }
 
diff --git a/packages/opencode/src/plugin/github-copilot/copilot.ts b/packages/opencode/src/plugin/github-copilot/copilot.ts
index 7f089e05386..db28ad3025d 100644
--- a/packages/opencode/src/plugin/github-copilot/copilot.ts
+++ b/packages/opencode/src/plugin/github-copilot/copilot.ts
@@ -70,6 +70,7 @@ export async function CopilotAuthPlugin(input: PluginInput): Promise<Hooks> {
         return CopilotModels.get(
           base(auth.enterpriseUrl),
           {
+            ...(provider.options?.headers as Record<string, string> | undefined),
             Authorization: `Bearer ${auth.refresh}`,
             "User-Agent": `opencode/${InstallationVersion}`,
             "X-GitHub-Api-Version": API_VERSION,
diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
index a75cf3de2e6..8e6ebb9f837 100644
--- a/packages/opencode/src/plugin/index.ts
+++ b/packages/opencode/src/plugin/index.ts
@@ -148,11 +148,12 @@ export const layer = Layer.effect(
 
         const { Server } = yield* Effect.promise(() => import("../server/server"))
 
+        const serverUrl = Server.url
         const client = createKiloClient({
-          baseUrl: "http://localhost:4096",
+          baseUrl: serverUrl?.toString() ?? "http://localhost:4096",
           directory: ctx.directory,
           headers: ServerAuth.headers(),
-          fetch: async (...args) => Server.Default().app.fetch(...args),
+          ...(serverUrl ? {} : { fetch: async (...args) => Server.Default().app.fetch(...args) }),
         })
         const cfg = yield* config.get()
         const input: PluginInput = {
diff --git a/packages/opencode/src/plugin/openai/codex.ts b/packages/opencode/src/plugin/openai/codex.ts
index c8245caf638..262882669f7 100644
--- a/packages/opencode/src/plugin/openai/codex.ts
+++ b/packages/opencode/src/plugin/openai/codex.ts
@@ -1,5 +1,6 @@
 import type { Hooks, PluginInput } from "@kilocode/plugin"
 import * as Log from "@opencode-ai/core/util/log" // kilocode_change
+import { escapeHtml } from "@/util/html"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { OAUTH_DUMMY_KEY } from "../../auth"
 import os from "os"
@@ -203,7 +204,7 @@ const HTML_SUCCESS = `<!doctype html>
   </body>
 </html>`
 
-const HTML_ERROR = (error: string) => `<!doctype html>
+export const renderOAuthError = (error: string) => `<!doctype html>
 <html>
   <head>
     <!-- kilocode_change start -->
@@ -248,7 +249,7 @@ const HTML_ERROR = (error: string) => `<!doctype html>
     <div class="container">
       <h1>Authorization Failed</h1>
       <p>An error occurred during authorization.</p>
-      <div class="error">${error}</div>
+      <div class="error">${escapeHtml(error)}</div>
     </div>
   </body>
 </html>`
@@ -281,8 +282,8 @@ async function startOAuthServer(): Promise<{ port: number; redirectUri: string }
         const errorMsg = errorDescription || error
         pendingOAuth?.reject(new Error(errorMsg))
         pendingOAuth = undefined
-        res.writeHead(200, { "Content-Type": "text/html" })
-        res.end(HTML_ERROR(errorMsg))
+        res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" })
+        res.end(renderOAuthError(errorMsg))
         return
       }
 
@@ -290,8 +291,8 @@ async function startOAuthServer(): Promise<{ port: number; redirectUri: string }
         const errorMsg = "Missing authorization code"
         pendingOAuth?.reject(new Error(errorMsg))
         pendingOAuth = undefined
-        res.writeHead(400, { "Content-Type": "text/html" })
-        res.end(HTML_ERROR(errorMsg))
+        res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" })
+        res.end(renderOAuthError(errorMsg))
         return
       }
 
@@ -299,8 +300,8 @@ async function startOAuthServer(): Promise<{ port: number; redirectUri: string }
         const errorMsg = "Invalid state - potential CSRF attack"
         pendingOAuth?.reject(new Error(errorMsg))
         pendingOAuth = undefined
-        res.writeHead(400, { "Content-Type": "text/html" })
-        res.end(HTML_ERROR(errorMsg))
+        res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" })
+        res.end(renderOAuthError(errorMsg))
         return
       }
 
@@ -311,7 +312,7 @@ async function startOAuthServer(): Promise<{ port: number; redirectUri: string }
         .then((tokens) => current.resolve(tokens))
         .catch((err) => current.reject(err))
 
-      res.writeHead(200, { "Content-Type": "text/html" })
+      res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" })
       res.end(HTML_SUCCESS)
       return
     }
diff --git a/packages/opencode/src/plugin/pty-environment.ts b/packages/opencode/src/plugin/pty-environment.ts
new file mode 100644
index 00000000000..67321372f1e
--- /dev/null
+++ b/packages/opencode/src/plugin/pty-environment.ts
@@ -0,0 +1,24 @@
+export * as PluginPtyEnvironment from "./pty-environment"
+
+import { PtyEnvironment } from "@opencode-ai/server/pty-environment"
+import { Effect, Layer } from "effect"
+import { InstanceStore } from "@/project/instance-store"
+import { Plugin } from "."
+
+export const layer = Layer.effect(
+  PtyEnvironment.Service,
+  Effect.gen(function* () {
+    const plugin = yield* Plugin.Service
+    const instances = yield* InstanceStore.Service
+    return PtyEnvironment.Service.of({
+      get: Effect.fn("PtyEnvironment.get")(function* (input) {
+        return yield* instances.provide(
+          { directory: input.directory },
+          plugin
+            .trigger("shell.env", { cwd: input.cwd }, { env: {} as Record<string, string> })
+            .pipe(Effect.map((result) => result.env)),
+        )
+      }),
+    })
+  }),
+)
diff --git a/packages/opencode/src/plugin/xai.ts b/packages/opencode/src/plugin/xai.ts
index 669e86bb5b2..fd42116d7ca 100644
--- a/packages/opencode/src/plugin/xai.ts
+++ b/packages/opencode/src/plugin/xai.ts
@@ -2,6 +2,7 @@ import type { Hooks, PluginInput } from "@kilocode/plugin"
 import { OAUTH_DUMMY_KEY } from "../auth"
 import { createServer } from "http"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
+import { escapeHtml } from "@/util/html"
 
 // Public Grok-CLI OAuth client. xAI's auth server rejects loopback OAuth from
 // non-allowlisted clients, so we reuse the Grok-CLI client_id that xAI ships
@@ -74,25 +75,6 @@ function generateState(): string {
   return base64UrlEncode(crypto.getRandomValues(new Uint8Array(32)).buffer)
 }
 
-export function escapeHtml(value: string): string {
-  return value.replace(/[&<>"']/g, (char) => {
-    switch (char) {
-      case "&":
-        return "&amp;"
-      case "<":
-        return "&lt;"
-      case ">":
-        return "&gt;"
-      case '"':
-        return "&quot;"
-      case "'":
-        return "&#39;"
-      default:
-        return char
-    }
-  })
-}
-
 interface TokenResponse {
   access_token: string
   refresh_token: string
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
index 8e78708465e..3d08bee21fa 100644
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -41,6 +41,8 @@ import {
   patchKiloProviderPrivacy,
   kiloSmallModelPriority,
   buildTimeoutSignal,
+  requestTimeout,
+  wrapFirstByte,
 } from "@/kilocode/provider/provider"
 import * as ModelsRefresh from "@/kilocode/provider/models-refresh"
 // kilocode_change end
@@ -473,7 +475,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         autoload: false,
         options: {
           headers: {
-            "HTTP-Referer": "https://kilo.ai/", // kilocode_change
+            "HTTP-Referer": "https://kilo.ai/",
             "X-Title": "Kilo Code", // kilocode_change
             "X-Source": "kilo", // kilocode_change
           },
@@ -484,7 +486,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         autoload: false,
         options: {
           headers: {
-            "HTTP-Referer": "https://kilo.ai/", // kilocode_change
+            "HTTP-Referer": "https://kilo.ai/",
             "X-Title": "Kilo Code", // kilocode_change
           },
         },
@@ -494,7 +496,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         autoload: provider.source === "config",
         options: {
           headers: {
-            "HTTP-Referer": "https://kilo.ai/", // kilocode_change
+            "HTTP-Referer": "https://kilo.ai/",
             "X-Title": "Kilo Code", // kilocode_change
             "X-BILLING-INVOKE-ORIGIN": "KiloCode", // kilocode_change
           },
@@ -505,7 +507,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         autoload: false,
         options: {
           headers: {
-            "http-referer": "https://kilo.ai/", // kilocode_change
+            "http-referer": "https://kilo.ai/",
             "x-title": "Kilo Code", // kilocode_change
           },
         },
@@ -611,7 +613,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         autoload: false,
         options: {
           headers: {
-            "HTTP-Referer": "https://kilo.ai/", // kilocode_change
+            "HTTP-Referer": "https://kilo.ai/",
             "X-Title": "Kilo Code", // kilocode_change
           },
         },
@@ -811,7 +813,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
       if (!apiToken) {
         throw new Error(
           "CLOUDFLARE_API_TOKEN (or CF_AIG_TOKEN) is required for Cloudflare AI Gateway. " +
-            "Set it via environment variable or run `kilo auth cloudflare-ai-gateway`.", // kilocode_change
+            "Set it via environment variable or run `kilo auth cloudflare-ai-gateway`.",
         )
       }
 
@@ -844,7 +846,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         apiKey: apiToken,
         ...(Object.values(opts).some((v) => v !== undefined) ? { options: opts } : {}),
       })
-      const unified = createUnified()
+      const unified = createUnified({ apiKey: apiToken })
 
       return {
         autoload: true,
@@ -869,7 +871,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
         autoload: false,
         options: {
           headers: {
-            "HTTP-Referer": "https://kilo.ai/", // kilocode_change
+            "HTTP-Referer": "https://kilo.ai/",
             "X-Title": "Kilo Code", // kilocode_change
           },
         },
@@ -1077,7 +1079,7 @@ export const Info = Schema.Struct({
   description: optionalOmitUndefined(Schema.String), // kilocode_change
   source: Schema.Literals(["env", "config", "custom", "api"]),
   env: Schema.Array(Schema.String),
-  key: optionalOmitUndefined(Schema.String), // kilocode_change
+  key: optionalOmitUndefined(Schema.String),
   metadata: optionalOmitUndefined(ProviderMetadata), // kilocode_change
   options: Schema.Record(Schema.String, Schema.Any),
   models: Schema.Record(Schema.String, Model),
@@ -1763,6 +1765,11 @@ export const layer = Layer.effect(
           const opts = init ?? {}
           const chunkAbortCtl = typeof chunkTimeout === "number" && chunkTimeout > 0 ? new AbortController() : undefined
           const timeout = buildTimeoutSignal(options) // kilocode_change - use cancellable timeout for connection phase
+          // kilocode_change start - extend the same deadline to the first response byte
+          const firstByteMs = requestTimeout(options)
+          const firstByteCtl = firstByteMs === undefined ? undefined : new AbortController()
+          const deadline = firstByteMs === undefined ? undefined : Date.now() + firstByteMs
+          // kilocode_change end
           const headerTimeoutMs = headerTimeout === false ? undefined : headerTimeout
           const headerTimeoutCtl = typeof headerTimeoutMs === "number" ? timeoutController(headerTimeoutMs) : undefined
           const signals: AbortSignal[] = []
@@ -1771,6 +1778,7 @@ export const layer = Layer.effect(
           if (chunkAbortCtl) signals.push(chunkAbortCtl.signal)
           if (headerTimeoutCtl) signals.push(headerTimeoutCtl.signal)
           if (timeout.signal) signals.push(timeout.signal) // kilocode_change
+          if (firstByteCtl) signals.push(firstByteCtl.signal) // kilocode_change
 
           const combined = signals.length === 0 ? null : signals.length === 1 ? signals[0] : AbortSignal.any(signals)
           if (combined) opts.signal = combined
@@ -1783,8 +1791,12 @@ export const layer = Layer.effect(
               timeout: false,
             }).finally(() => headerTimeoutCtl?.clear())
             timeout.clear()
-            if (!chunkAbortCtl) return res
-            return wrapSSE(res, chunkTimeout, chunkAbortCtl)
+            // kilocode_change start - hand the remaining deadline to the first-byte guard
+            const remaining = deadline !== undefined ? deadline - Date.now() : undefined
+            const live = remaining !== undefined && firstByteCtl ? wrapFirstByte(res, Math.max(remaining, 1), firstByteCtl) : res
+            if (!chunkAbortCtl) return live
+            return wrapSSE(live, chunkTimeout, chunkAbortCtl)
+            // kilocode_change end
           } catch (err) {
             timeout.clear()
             throw err
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index c09f2048596..c0b14184d08 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -226,7 +226,7 @@ function normalizeMessages(
   if (
     model.providerID === "mistral" ||
     model.api.id.toLowerCase().includes("mistral") ||
-    model.api.id.toLocaleLowerCase().includes("devstral")
+    model.api.id.toLowerCase().includes("devstral")
   ) {
     const scrub = (id: string) => {
       return id
@@ -616,15 +616,17 @@ function anthropicOpus47OrLater(apiId: string) {
   return major > 4 || (major === 4 && minor >= 7)
 }
 
-// kilocode_change start - fable and sonnet-5 models are adaptive thinking models like opus-4.7/4.8
+// kilocode_change start - Claude 5+ models are adaptive thinking models like opus-4.7/4.8
 function anthropicClaude5(apiId: string) {
   const id = apiId.toLowerCase()
-  return id.includes("fable") || /sonnet[.-]5/.test(id)
+  if (id.includes("fable")) return true
+  const version = /(?:opus|sonnet)[.-](\d+)(?:[.@-]|$)|claude-(\d+)(?:[.-]\d+)?-(?:opus|sonnet)(?:[.@-]|$)/.exec(id)
+  return Number(version?.[1] ?? version?.[2]) >= 5
 }
 // kilocode_change end
 
 function anthropicAdaptiveEfforts(apiId: string): string[] | null {
-  // kilocode_change start - treat opus-4.8 and fable like opus-4.7
+  // kilocode_change start - include Claude 5+ models
   if (anthropicOpus47OrLater(apiId) || anthropicClaude5(apiId)) {
     return ["low", "medium", "high", "xhigh", "max"]
   }
@@ -640,7 +642,7 @@ function anthropicAdaptiveEfforts(apiId: string): string[] | null {
 }
 
 function anthropicOmitsThinking(apiId: string) {
-  return anthropicOpus47OrLater(apiId) || anthropicClaude5(apiId) // kilocode_change - include Kilo's fable/sonnet-5 aliases
+  return anthropicOpus47OrLater(apiId) || anthropicClaude5(apiId) // kilocode_change - include Kilo's Claude 5 aliases
 }
 
 function googleThinkingLevelEfforts(apiId: string) {
@@ -730,7 +732,6 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
       max: { effort: "max" },
     }
   }
-
   if (
     id.includes("deepseek-chat") ||
     id.includes("deepseek-reasoner") ||
@@ -977,7 +978,7 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
       if (adaptiveEfforts) {
         let efforts = [...adaptiveEfforts]
         if (model.providerID === "github-copilot") {
-          // kilocode_change start - treat opus-4.8 and fable like opus-4.7
+          // kilocode_change start - include Claude 5+ models
           if (
             model.api.id.includes("opus-4.7") ||
             model.api.id.includes("opus-4.8") ||
@@ -1276,7 +1277,7 @@ export function options(input: {
       if (
         input.model.api.npm === "@ai-sdk/openai" ||
         input.model.api.npm === "@ai-sdk/azure" ||
-        input.model.api.npm === "@ai-sdk/github-copilot" || // kilocode_change
+        input.model.api.npm === "@ai-sdk/github-copilot" ||
         input.model.api.npm === "@openrouter/ai-sdk-provider" || // kilocode_change
         input.model.api.npm === "@kilocode/kilo-gateway" || // kilocode_change
         input.model.api.npm === "@ai-sdk/amazon-bedrock/mantle"
@@ -1425,6 +1426,96 @@ export function maxOutputTokens(model: Provider.Model, outputTokenMax = OUTPUT_T
   return Math.min(model.limit.output, outputTokenMax) || outputTokenMax
 }
 
+type JsonRecord = Record<string, unknown>
+
+function isPlainObject(value: unknown): value is JsonRecord {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+}
+
+// Mirrors Codex's Rust JSON schema compatibility lowering for OpenAI tool schemas.
+function sanitizeOpenAISchema(value: unknown): unknown {
+  const types = ["string", "number", "boolean", "integer", "object", "array", "null"]
+  const compositionKeys = ["anyOf", "oneOf", "allOf"]
+
+  // JSON Schema's boolean form (`true`/`false`) is unsupported by OpenAI tool schemas.
+  if (typeof value === "boolean") return { type: "string" }
+  if (Array.isArray(value)) return value.map(sanitizeOpenAISchema)
+  if (!isPlainObject(value)) return value
+
+  const result: JsonRecord = {}
+
+  if (typeof value.$ref === "string") result.$ref = value.$ref
+  if (typeof value.description === "string") result.description = value.description
+  if ("const" in value) result.enum = [value.const]
+  else if (Array.isArray(value.enum)) result.enum = value.enum
+
+  if (isPlainObject(value.properties)) {
+    result.properties = Object.fromEntries(
+      Object.entries(value.properties).map(([key, item]) => [key, sanitizeOpenAISchema(item)]),
+    )
+  }
+
+  if (Array.isArray(value.required)) {
+    result.required = value.required.filter((item) => typeof item === "string")
+  }
+
+  if ("items" in value) result.items = sanitizeOpenAISchema(value.items)
+
+  if ("additionalProperties" in value) {
+    result.additionalProperties =
+      typeof value.additionalProperties === "boolean"
+        ? value.additionalProperties
+        : sanitizeOpenAISchema(value.additionalProperties)
+  }
+
+  for (const key of compositionKeys) {
+    if (Array.isArray(value[key])) result[key] = value[key].map(sanitizeOpenAISchema)
+  }
+
+  for (const key of ["$defs", "definitions"]) {
+    if (isPlainObject(value[key])) {
+      result[key] = Object.fromEntries(
+        Object.entries(value[key]).map(([name, item]) => [name, sanitizeOpenAISchema(item)]),
+      )
+    }
+  }
+
+  const schemaTypes =
+    typeof value.type === "string"
+      ? types.includes(value.type)
+        ? [value.type]
+        : []
+      : Array.isArray(value.type)
+        ? value.type.filter((item) => typeof item === "string" && types.includes(item))
+        : []
+
+  if (schemaTypes.length === 0 && (typeof result.$ref === "string" || compositionKeys.some((key) => key in result))) {
+    return result
+  }
+
+  // MCP schemas may omit `type` while still using keywords that imply one.
+  // Keep the schema usable after unsupported keywords are dropped.
+  const inferredTypes =
+    schemaTypes.length > 0
+      ? schemaTypes
+      : ["properties", "required", "additionalProperties"].some((key) => key in value)
+        ? ["object"]
+        : ["items", "prefixItems"].some((key) => key in value)
+          ? ["array"]
+          : "enum" in result || "format" in value
+            ? ["string"]
+            : ["minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "multipleOf"].some((key) => key in value)
+              ? ["number"]
+              : []
+
+  if (inferredTypes.length === 0) return {}
+
+  result.type = inferredTypes.length === 1 ? inferredTypes[0] : inferredTypes
+  if (inferredTypes.includes("object") && !("properties" in result)) result.properties = {}
+  if (inferredTypes.includes("array") && !("items" in result)) result.items = { type: "string" }
+  return result
+}
+
 export function schema(model: Provider.Model, schema: JSONSchema7): JSONSchema7 {
   /*
   if (["openai", "azure"].includes(providerID)) {
@@ -1444,6 +1535,11 @@ export function schema(model: Provider.Model, schema: JSONSchema7): JSONSchema7
   }
   */
 
+  if (model.api.npm === "@ai-sdk/openai" || model.api.npm === "@ai-sdk/azure") {
+    schema = sanitizeOpenAISchema(schema) as JSONSchema7
+    // Codex also applies lossy compaction above 4 KB; defer that until OpenCode needs the same schema budget.
+  }
+
   if (model.providerID === "moonshotai" || model.api.id.toLowerCase().includes("kimi")) {
     const sanitizeMoonshot = (obj: unknown): unknown => {
       if (obj === null || typeof obj !== "object") return obj
diff --git a/packages/opencode/src/pty-preparation.ts b/packages/opencode/src/pty-preparation.ts
deleted file mode 100644
index f978d2efd2c..00000000000
--- a/packages/opencode/src/pty-preparation.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-export * as PtyPreparation from "./pty-preparation"
-
-import { Config } from "@/config/config"
-import * as InstanceState from "@/effect/instance-state"
-import { Plugin } from "@/plugin"
-import { Shell } from "@/shell/shell"
-import { Pty } from "@opencode-ai/core/pty"
-import { KiloPtySelfCommand } from "@/kilocode/pty/self-command" // kilocode_change - ported from the deleted @/pty module
-import { Effect } from "effect"
-
-export const prepareCreate = Effect.fn("PtyPreparation.prepareCreate")(function* (input: Pty.CreateInput) {
-  const config = yield* Config.Service
-  const plugin = yield* Plugin.Service
-  // kilocode_change start - resolve Kilo self-commands (e.g. bare `kilo`) to the real binary + args + project cwd
-  const resolved = KiloPtySelfCommand.resolve({
-    command: input.command,
-    args: input.args ? [...input.args] : undefined,
-    cwd: input.cwd,
-  })
-  const command = resolved.command || Shell.preferred((yield* config.get()).shell)
-  const baseArgs = resolved.args ?? []
-  const cwd = resolved.cwd || (yield* InstanceState.context).directory
-  // kilocode_change end
-  const args = Shell.login(command) ? [...baseArgs, "-l"] : [...baseArgs]
-  const shell = yield* plugin.trigger("shell.env", { cwd }, { env: {} })
-  const env = {
-    ...process.env,
-    ...input.env,
-    ...shell.env,
-    TERM: "xterm-256color",
-    KILO_TERMINAL: "1",
-  } as Record<string, string>
-  // kilocode_change start - ported from the deleted @/pty module.
-  // Don't leak the kilo server's auth credential into user shells: anything the shell forks (npm
-  // post-install, `curl | bash`, compromised tools) would otherwise see the password for free. Users
-  // who need `kilo run`/`kilo tui attach` to auto-connect from a kilo-spawned terminal pass --password.
-  delete env.KILO_SERVER_PASSWORD
-  delete env.KILO_SERVER_USERNAME
-  // kilocode_change end
-  if (process.platform === "win32") {
-    env.LC_ALL = "C.UTF-8"
-    env.LC_CTYPE = "C.UTF-8"
-    env.LANG = "C.UTF-8"
-  }
-  return { command, args, cwd, title: input.title, env }
-})
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
index 3ab7564b385..77bf29ba44d 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
@@ -27,6 +27,10 @@ const ConsoleStateResponse = Schema.Struct({
   switchableOrgCount: NonNegativeInt,
 }).annotate({ identifier: "ConsoleState" })
 
+const CapabilitiesResponse = Schema.Struct({
+  backgroundSubagents: Schema.Boolean,
+}).annotate({ identifier: "ExperimentalCapabilities" })
+
 const ConsoleOrgOption = Schema.Struct({
   accountID: Schema.String,
   accountEmail: Schema.String,
@@ -106,6 +110,7 @@ export const WorktreeDiffFileQuery = Schema.Struct({
 // kilocode_change end
 
 export const ExperimentalPaths = {
+  capabilities: "/experimental/capabilities",
   console: "/experimental/console",
   consoleOrgs: "/experimental/console/orgs",
   consoleSwitch: "/experimental/console/switch",
@@ -125,6 +130,16 @@ export const ExperimentalApi = HttpApi.make("experimental")
   .add(
     HttpApiGroup.make("experimental")
       .add(
+        HttpApiEndpoint.get("capabilities", ExperimentalPaths.capabilities, {
+          query: WorkspaceRoutingQuery,
+          success: described(CapabilitiesResponse, "Experimental capabilities"),
+        }).annotateMerge(
+          OpenApi.annotations({
+            identifier: "experimental.capabilities.get",
+            summary: "Get experimental capabilities",
+            description: "Get experimental features enabled on the OpenCode server.",
+          }),
+        ),
         HttpApiEndpoint.get("console", ExperimentalPaths.console, {
           query: WorkspaceRoutingQuery,
           success: described(ConsoleStateResponse, "Active Console provider metadata"),
@@ -156,7 +171,7 @@ export const ExperimentalApi = HttpApi.make("experimental")
           OpenApi.annotations({
             identifier: "experimental.console.switchOrg",
             summary: "Switch active Console org",
-            description: "Persist a new active Console account/org selection for the current local Kilo state.", // kilocode_change
+            description: "Persist a new active Console account/org selection for the current local Kilo state.",
           }),
         ),
         HttpApiEndpoint.get("tool", ExperimentalPaths.tool, {
@@ -274,7 +289,7 @@ export const ExperimentalApi = HttpApi.make("experimental")
             identifier: "experimental.session.list",
             summary: "List sessions",
             description:
-              "Get a list of all Kilo sessions across projects, sorted by most recently updated. Archived sessions are excluded by default.", // kilocode_change
+              "Get a list of all Kilo sessions across projects, sorted by most recently updated. Archived sessions are excluded by default.",
           }),
         ),
         HttpApiEndpoint.post("sessionBackground", ExperimentalPaths.sessionBackground, {
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
index e84b2029163..f580a0dd245 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
@@ -53,6 +53,10 @@ export const experimentalHandlers = HttpApiBuilder.group(InstanceHttpApi, "exper
     const background = yield* BackgroundJob.Service
     const flags = yield* RuntimeFlags.Service
 
+    const capabilities = Effect.fn("ExperimentalHttpApi.capabilities")(function* () {
+      return { backgroundSubagents: flags.experimentalBackgroundSubagents }
+    })
+
     const getConsole = Effect.fn("ExperimentalHttpApi.console")(function* () {
       const [state, groups] = yield* Effect.all(
         [
@@ -270,25 +274,24 @@ export const experimentalHandlers = HttpApiBuilder.group(InstanceHttpApi, "exper
       return yield* mcp.resources()
     })
 
-    return (
-      handlers
-        .handle("console", getConsole)
-        .handle("consoleOrgs", listConsoleOrgs)
-        .handle("consoleSwitch", switchConsole)
-        .handle("tool", tool)
-        .handle("toolIDs", toolIDs)
-        .handle("worktree", worktree)
-        .handle("worktreeCreate", worktreeCreate)
-        .handle("worktreeRemove", worktreeRemove)
-        .handle("worktreeReset", worktreeReset)
-        // kilocode_change start
-        .handle("worktreeDiff", worktreeDiff)
-        .handle("worktreeDiffSummary", worktreeDiffSummary)
-        .handle("worktreeDiffFile", worktreeDiffFile)
-        // kilocode_change end
-        .handle("session", session)
-        .handle("sessionBackground", sessionBackground)
-        .handle("resource", resource)
-    )
+    return handlers
+      .handle("capabilities", capabilities)
+      .handle("console", getConsole)
+      .handle("consoleOrgs", listConsoleOrgs)
+      .handle("consoleSwitch", switchConsole)
+      .handle("tool", tool)
+      .handle("toolIDs", toolIDs)
+      .handle("worktree", worktree)
+      .handle("worktreeCreate", worktreeCreate)
+      .handle("worktreeRemove", worktreeRemove)
+      .handle("worktreeReset", worktreeReset)
+      // kilocode_change start
+      .handle("worktreeDiff", worktreeDiff)
+      .handle("worktreeDiffSummary", worktreeDiffSummary)
+      .handle("worktreeDiffFile", worktreeDiffFile)
+      // kilocode_change end
+      .handle("session", session)
+      .handle("sessionBackground", sessionBackground)
+      .handle("resource", resource)
   }),
 )
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/pty.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/pty.ts
index 0058c66b528..538920b000e 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/pty.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/pty.ts
@@ -1,23 +1,22 @@
 import * as InstanceState from "@/effect/instance-state"
 import { registerDisposer } from "@/effect/instance-registry"
 import { InstanceRef, WorkspaceRef } from "@/effect/instance-ref"
-import { PtyPreparation } from "@/pty-preparation"
+import { Plugin } from "@/plugin"
 import { Pty } from "@opencode-ai/core/pty"
-import { handlePtyInput } from "@opencode-ai/core/pty/input"
+import { PtyProtocol } from "@opencode-ai/core/pty/protocol"
 import { PtyID } from "@opencode-ai/core/pty/schema"
 import { PtyTicket } from "@opencode-ai/core/pty/ticket"
 import { LocationServiceMap } from "@opencode-ai/core/location-layer"
 import { Location } from "@opencode-ai/core/location"
 import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Shell } from "@/shell/shell"
-import { EffectBridge } from "@/effect/bridge"
-import { CorsConfig, isAllowedRequestOrigin, type CorsOptions } from "@/server/cors"
+import { Shell } from "@opencode-ai/core/shell"
+import { CorsConfig, isAllowedRequestOrigin, type CorsOptions } from "@opencode-ai/server/cors"
 import {
   PTY_CONNECT_TICKET_QUERY,
   PTY_CONNECT_TOKEN_HEADER,
   PTY_CONNECT_TOKEN_HEADER_VALUE,
 } from "@/server/shared/pty-ticket"
-import { Effect, Layer, Option, Schema } from "effect"
+import { Effect, Layer, Option, Queue, Schema } from "effect"
 import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
 import * as Socket from "effect/unstable/socket/Socket"
@@ -36,10 +35,14 @@ const ticketScope = Effect.gen(function* () {
   return { directory: instance?.directory, workspaceID }
 })
 
+// Legacy surface compatibility: before exited-session retention, sessions vanished the moment
+// their process exited. These routes preserve that observable behavior — exited sessions are
+// invisible here — while the canonical /api/pty surface exposes them until removal.
 export const ptyHandlers = HttpApiBuilder.group(InstanceHttpApi, "pty", (handlers) =>
   Effect.gen(function* () {
     const tickets = yield* PtyTicket.Service
     const cors = yield* CorsConfig
+    const plugin = yield* Plugin.Service
     const locations = yield* LocationServiceMap
     const unregister = registerDisposer((directory) =>
       Effect.runPromise(locations.invalidate(Location.Ref.make({ directory: AbsolutePath.make(directory) }))),
@@ -59,33 +62,42 @@ export const ptyHandlers = HttpApiBuilder.group(InstanceHttpApi, "pty", (handler
     })
 
     const list = Effect.fn("PtyHttpApi.list")(function* () {
-      return yield* pty(Pty.Service.use((service) => service.list()))
+      const sessions = yield* pty(Pty.Service.use((service) => service.list()))
+      return sessions.filter((info) => info.status === "running")
     })
 
     const create = Effect.fn("PtyHttpApi.create")(function* (ctx: { payload: typeof Pty.CreateInput.Type }) {
+      const cwd = ctx.payload.cwd || (yield* InstanceState.context).directory
+      const shell = yield* plugin.trigger("shell.env", { cwd }, { env: {} as Record<string, string> })
       return yield* pty(
         Pty.Service.use((service) =>
-          Effect.flatMap(
-            PtyPreparation.prepareCreate({
-              ...ctx.payload,
-              args: ctx.payload.args ? [...ctx.payload.args] : undefined,
-              env: ctx.payload.env ? { ...ctx.payload.env } : undefined,
-            }),
-            service.create,
-          ),
+          service.create({
+            ...ctx.payload,
+            args: ctx.payload.args ? [...ctx.payload.args] : undefined,
+            cwd,
+            env: { ...ctx.payload.env, ...shell.env },
+          }),
         ),
       )
     })
 
     const get = Effect.fn("PtyHttpApi.get")(function* (ctx: { params: { ptyID: PtyID } }) {
       return yield* pty(Pty.Service.use((service) => service.get(ctx.params.ptyID))).pipe(
-        Effect.catchTag("Pty.NotFoundError", (error) =>
-          Effect.fail(
+        Effect.catchTag(
+          "Pty.NotFoundError",
+          (error) =>
             new ApiError.PtyNotFoundError({
               ptyID: error.ptyID,
               message: `PTY session not found: ${error.ptyID}`,
             }),
-          ),
+        ),
+        Effect.flatMap((info) =>
+          info.status === "running"
+            ? Effect.succeed(info)
+            : new ApiError.PtyNotFoundError({
+                ptyID: ctx.params.ptyID,
+                message: `PTY session not found: ${ctx.params.ptyID}`,
+              }),
         ),
       )
     })
@@ -94,6 +106,7 @@ export const ptyHandlers = HttpApiBuilder.group(InstanceHttpApi, "pty", (handler
       params: { ptyID: PtyID }
       payload: typeof Pty.UpdateInput.Type
     }) {
+      yield* get(ctx)
       return yield* pty(
         Pty.Service.use((service) =>
           service.update(ctx.params.ptyID, {
@@ -102,26 +115,27 @@ export const ptyHandlers = HttpApiBuilder.group(InstanceHttpApi, "pty", (handler
           }),
         ),
       ).pipe(
-        Effect.catchTag("Pty.NotFoundError", (error) =>
-          Effect.fail(
+        Effect.catchTag(
+          "Pty.NotFoundError",
+          (error) =>
             new ApiError.PtyNotFoundError({
               ptyID: error.ptyID,
               message: `PTY session not found: ${error.ptyID}`,
             }),
-          ),
         ),
       )
     })
 
     const remove = Effect.fn("PtyHttpApi.remove")(function* (ctx: { params: { ptyID: PtyID } }) {
+      yield* get(ctx)
       yield* pty(Pty.Service.use((service) => service.remove(ctx.params.ptyID))).pipe(
-        Effect.catchTag("Pty.NotFoundError", (error) =>
-          Effect.fail(
+        Effect.catchTag(
+          "Pty.NotFoundError",
+          (error) =>
             new ApiError.PtyNotFoundError({
               ptyID: error.ptyID,
               message: `PTY session not found: ${error.ptyID}`,
             }),
-          ),
         ),
       )
       return true
@@ -131,16 +145,7 @@ export const ptyHandlers = HttpApiBuilder.group(InstanceHttpApi, "pty", (handler
       const request = yield* HttpServerRequest.HttpServerRequest
       if (request.headers[PTY_CONNECT_TOKEN_HEADER] !== PTY_CONNECT_TOKEN_HEADER_VALUE || !validOrigin(request, cors))
         return yield* new ApiError.PtyForbiddenError({ message: "Invalid PTY connect token request" })
-      yield* pty(Pty.Service.use((service) => service.get(ctx.params.ptyID))).pipe(
-        Effect.catchTag("Pty.NotFoundError", (error) =>
-          Effect.fail(
-            new ApiError.PtyNotFoundError({
-              ptyID: error.ptyID,
-              message: `PTY session not found: ${error.ptyID}`,
-            }),
-          ),
-        ),
-      )
+      yield* get(ctx)
       return yield* tickets.issue({ ptyID: ctx.params.ptyID, ...(yield* ticketScope) })
     })
 
@@ -180,7 +185,7 @@ export const ptyConnectHandlers = HttpApiBuilder.group(PtyConnectApi, "pty-conne
         request: HttpServerRequest.HttpServerRequest
       }) {
         const exists = yield* pty(Pty.Service.use((service) => service.get(ctx.params.ptyID))).pipe(
-          Effect.as(true),
+          Effect.map((info) => info.status === "running"),
           Effect.catchTag("Pty.NotFoundError", () => Effect.succeed(false)),
         )
         if (!exists) return HttpServerResponse.empty({ status: 404 })
@@ -214,48 +219,53 @@ export const ptyConnectHandlers = HttpApiBuilder.group(PtyConnectApi, "pty-conne
           yield* closeAccepted(WebSocketTracker.SERVER_CLOSING_EVENT())
           return HttpServerResponse.empty()
         }
-        const bridge = yield* EffectBridge.make()
-        const writeScoped = (effect: Effect.Effect<void, unknown>) => {
-          bridge.fork(effect.pipe(Effect.catch(() => Effect.void)))
-        }
-        let closed = false
-        const adapter = {
-          get readyState() {
-            return closed ? 3 : 1
-          },
-          send: (data: string | Uint8Array | ArrayBuffer) => {
-            if (closed) return
-            writeScoped(write(data instanceof ArrayBuffer ? new Uint8Array(data) : data))
-          },
-          close: (code?: number, reason?: string) => {
-            if (closed) return
-            closed = true
-            writeScoped(write(new Socket.CloseEvent(code, reason)))
-          },
-        }
-        const handler = yield* pty(
-          Pty.Service.use((service) => service.connect(ctx.params.ptyID, adapter, cursor)),
-        ).pipe(
-          Effect.catchTag("Pty.NotFoundError", () =>
-            closeAccepted(new Socket.CloseEvent(4404, "session not found")).pipe(Effect.as(undefined)),
-          ),
-        )
-        if (!handler) return HttpServerResponse.empty()
 
-        // The handshake runs inside `socket.runRaw`, after the input callback is
-        // registered, so the client cannot send frames before PTY input is wired.
-        yield* socket
-          .runRaw((message) => handlePtyInput(handler, message))
-          .pipe(
-            Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
-            Effect.ensuring(
-              Effect.sync(() => {
-                closed = true
-                handler.onClose()
-              }),
-            ),
-            Effect.orDie,
-          )
+        // Outbound frames flow through one queue drained by a single writer so replay, live
+        // output, and the close frame keep their order.
+        const outbox = yield* Queue.unbounded<string | Uint8Array | Socket.CloseEvent>()
+        const attachment = yield* pty(
+          Pty.Service.use((service) =>
+            service.attach(ctx.params.ptyID, {
+              cursor,
+              onData: (chunk) => Queue.offerUnsafe(outbox, chunk),
+              onEnd: () => Queue.offerUnsafe(outbox, new Socket.CloseEvent(1000)),
+            }),
+          ),
+        ).pipe(
+          Effect.catchTags({
+            "Pty.NotFoundError": () =>
+              closeAccepted(new Socket.CloseEvent(4404, "session not found")).pipe(Effect.as(undefined)),
+            "Pty.ExitedError": () =>
+              closeAccepted(new Socket.CloseEvent(4404, "session not found")).pipe(Effect.as(undefined)),
+          }),
+        )
+        if (!attachment) return HttpServerResponse.empty()
+
+        for (const chunk of PtyProtocol.chunks(attachment.replay)) Queue.offerUnsafe(outbox, chunk)
+        Queue.offerUnsafe(outbox, PtyProtocol.metaFrame(attachment.cursor))
+        attachment.activate()
+
+        const drain = Effect.gen(function* () {
+          while (true) {
+            const item = yield* Queue.take(outbox)
+            yield* write(item)
+            if (item instanceof Socket.CloseEvent) return
+          }
+        })
+
+        // The reader runs concurrently with the writer; whichever finishes first ends the
+        // connection and the attachment is always released.
+        yield* Effect.race(
+          drain,
+          socket.runRaw((message) => {
+            const decoded = PtyProtocol.decodeInput(message)
+            if (decoded !== undefined) attachment.write(decoded)
+          }),
+        ).pipe(
+          Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
+          Effect.ensuring(Effect.sync(() => attachment.detach())),
+          Effect.orDie,
+        )
         return HttpServerResponse.empty()
       }),
     )
diff --git a/packages/opencode/src/server/routes/instance/httpapi/server.ts b/packages/opencode/src/server/routes/instance/httpapi/server.ts
index 2a30099a465..e6e1359e562 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/server.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/server.ts
@@ -21,6 +21,7 @@ import { MCP } from "@/mcp"
 import { McpAuth } from "@/mcp/auth"
 import { Permission } from "@/permission"
 import { Plugin } from "@/plugin"
+import { PluginPtyEnvironment } from "@/plugin/pty-environment"
 import { InstanceStore } from "@/project/instance-store"
 import { Project } from "@/project/project"
 import { Vcs } from "@/project/vcs"
@@ -70,7 +71,7 @@ import { PtyTicket } from "@opencode-ai/core/pty/ticket"
 import { Ripgrep } from "@opencode-ai/core/ripgrep"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { lazy } from "@/util/lazy"
-import { CorsConfig, isAllowedCorsOrigin, type CorsOptions } from "@/server/cors"
+import { CorsConfig, isAllowedCorsOrigin, type CorsOptions } from "@opencode-ai/server/cors"
 import { serveUIEffect } from "@/server/shared/ui"
 import { ServerAuth } from "@/server/auth"
 import { InstanceHttpApi, RootHttpApi } from "./api"
@@ -188,6 +189,7 @@ const serverRoutes = HttpApiBuilder.layer(Api).pipe(
   // kilocode_change start - effective references must be ready before any V2 location consumer runs
   Layer.provide(handlers.pipe(Layer.provide(locationServiceMapLayer), Layer.provide(referenceReconcilerLayer))),
   // kilocode_change end
+  Layer.provide(PluginPtyEnvironment.layer),
   Layer.provide([serverHttpApiAuthLayer, v2SchemaErrorLayer]),
 )
 
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
index fdf1bf1a15a..a82bf47e9ba 100644
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -11,7 +11,7 @@ import { HttpApiApp } from "./routes/instance/httpapi/server"
 import { disposeMiddleware } from "./routes/instance/httpapi/lifecycle"
 import { WebSocketTracker } from "./routes/instance/httpapi/websocket-tracker"
 import { PublicApi } from "./routes/instance/httpapi/public"
-import type { CorsOptions } from "./cors"
+import type { CorsOptions } from "@opencode-ai/server/cors"
 import { lazy } from "@/util/lazy"
 import * as KiloListener from "@/kilocode/server/listener" // kilocode_change
 
@@ -76,7 +76,7 @@ export async function openapi() {
   return OpenApi.fromApi(PublicApi)
 }
 
-export let url: URL
+export let url: URL | undefined
 
 export async function listen(opts: ListenOptions): Promise<Listener> {
   const listener = await Effect.runPromise(listenEffect(opts))
@@ -94,16 +94,15 @@ const listenEffect: (opts: ListenOptions) => Effect.Effect<EffectListener, unkno
     const state = yield* startWithPortFallback(opts)
     const address = yield* tcpAddress(state)
     const listenerUrl = makeURL(opts.hostname, address.port)
-    url = listenerUrl
-
     const unpublishMdns = yield* setupMdns(opts, address.port, state.scope)
+    url = listenerUrl
 
     return {
       hostname: opts.hostname,
       port: address.port,
       url: listenerUrl,
       urls: serverUrls(opts.hostname, address.port), // kilocode_change
-      stop: yield* makeStop(state, unpublishMdns),
+      stop: yield* makeStop(state, unpublishMdns, listenerUrl),
     }
   },
 )
@@ -180,10 +179,19 @@ function setupMdns(opts: ListenOptions, port: number, scope: Scope.Scope) {
   })
 }
 
-function makeStop(state: ListenerState, unpublishMdns: Effect.Effect<void>) {
+function makeStop(state: ListenerState, unpublishMdns: Effect.Effect<void>, listenerUrl: URL) {
   return Effect.gen(function* () {
     const forceCloseOnce = yield* Effect.cached(forceClose(state).pipe(Effect.ignore))
-    const closeScopeOnce = yield* Effect.cached(Scope.close(state.scope, Exit.void).pipe(Effect.ignore))
+    const closeScopeOnce = yield* Effect.cached(
+      Scope.close(state.scope, Exit.void).pipe(
+        Effect.ignore,
+        Effect.ensuring(
+          Effect.sync(() => {
+            if (url === listenerUrl) url = undefined
+          }),
+        ),
+      ),
+    )
 
     return (close?: boolean) =>
       Effect.gen(function* () {
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index e480f34dd0d..f1520cc2e61 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -36,7 +36,7 @@ import { SessionCompaction } from "./compaction"
 import { SystemPrompt } from "./system"
 import { Instruction } from "./instruction"
 import { Plugin } from "../plugin"
-import MAX_STEPS from "../session/prompt/max-steps.txt"
+import { MAX_STEPS_PROMPT } from "@opencode-ai/core/session/runner/max-steps"
 import { ToolRegistry } from "@/tool/registry"
 import { MCP } from "../mcp"
 import { LSP } from "@/lsp/lsp"
@@ -55,7 +55,7 @@ import { Tool } from "@/tool/tool"
 import { Permission } from "@/permission"
 import { SessionStatus } from "./status"
 import { LLM } from "./llm"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { ShellID } from "@/tool/shell/id"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Truncate } from "@/tool/truncate"
@@ -755,7 +755,7 @@ export const layer = Layer.effect(
 
     const createUserMessage = Effect.fn("SessionPrompt.createUserMessage")(function* (input: PromptInput) {
       const agentName = input.agent
-      const ag = agentName ? yield* agents.get(agentName) : yield* agents.defaultInfo() // kilocode_change
+      const ag = agentName ? yield* agents.get(agentName) : yield* agents.defaultInfo()
       if (!ag) {
         const available = (yield* agents.list()).filter((a) => !a.hidden).map((a) => a.name)
         const hint = available.length ? ` Available agents: ${available.join(", ")}` : ""
@@ -1095,7 +1095,7 @@ export const layer = Layer.effect(
 
               if (mime === "application/x-directory") {
                 const args = { filePath: filepath }
-                const exit = yield* execRead(args).pipe(Effect.exit) // kilocode_change - list only; child bytes need separate reads
+                const exit = yield* execRead(args).pipe(Effect.exit)
                 if (Exit.isFailure(exit)) {
                   const error = Cause.squash(exit.cause)
                   yield* Effect.logError("failed to read directory", { error, filepath })
@@ -1412,17 +1412,17 @@ export const layer = Layer.effect(
           // kilocode_change end
         }
 
-        // kilocode_change start — unblock tools waiting on user input so any in-flight
-        // handle.process can return. Adding a new user message is the signal that any
-        // pending tool prompt is superseded, so we dismiss even on the noReply path.
-        // Critically we never cancel the in-flight fiber here — that would abort the
-        // streamText call mid-tokens and cut off the assistant reply. The enqueue call
-        // below serializes this prompt after the current turn's current LLM step, and
-        // runLoop checks hasFollowup between steps to break out once it has been
-        // enqueued during the turn.
-        yield* Effect.promise(() => Suggestion.dismissAll(input.sessionID))
-        yield* question.dismissAll(input.sessionID)
-        if (input.noReply === true) return message
+        // kilocode_change start — register the queued follow-up before dismissing blockers.
+        // Otherwise the old turn can resume from a dismissed question and start another
+        // LLM step before hasFollowup observes the replacement prompt.
+        const dismiss = Effect.gen(function* () {
+          yield* Effect.promise(() => Suggestion.dismissAll(input.sessionID)).pipe(Effect.orDie)
+          yield* question.dismissAll(input.sessionID)
+        })
+        if (input.noReply === true) {
+          yield* dismiss
+          return message
+        }
         // Queue tails and runner fibers can resume outside the HTTP request's
         // ambient instance context; bridge both Effect refs and legacy ALS.
         const bridge = yield* EffectBridge.make()
@@ -1435,6 +1435,7 @@ export const layer = Layer.effect(
             ),
           ), // kilocode_change
           bridge.run(lastAssistant(input.sessionID)),
+          dismiss,
         )
         // kilocode_change end
       },
@@ -1707,28 +1708,6 @@ export const layer = Layer.effect(
           if (step === 1)
             yield* summary.summarize({ sessionID, messageID: lastUser.id }).pipe(Effect.ignore, Effect.forkIn(scope))
 
-          if (step > 1 && lastFinished) {
-            for (const m of msgs) {
-              // kilocode_change start - compare chronology, not generated IDs
-              const finishedBeforeMessage =
-                latest.finishedMessage && KiloSessionMessageOrder.compare(latest.finishedMessage, m) < 0
-              if (m.info.role !== "user" || !finishedBeforeMessage) continue
-              // kilocode_change end
-              for (const p of m.parts) {
-                if (p.type !== "text" || p.ignored || p.synthetic) continue
-                if (!p.text.trim()) continue
-                p.text = [
-                  "<system-reminder>",
-                  "The user sent the following message:",
-                  p.text,
-                  "",
-                  "Please address this message and continue with your tasks.",
-                  "</system-reminder>",
-                ].join("\n")
-              }
-            }
-          }
-
           yield* plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs })
 
           // kilocode_change start — ephemeral context injection + post-summary
@@ -1779,7 +1758,7 @@ export const layer = Layer.effect(
             sessionID,
             parentSessionID: session.parentID,
             system,
-            messages: [...modelMsgs, ...(isLastStep ? [{ role: "assistant" as const, content: MAX_STEPS }] : [])],
+            messages: [...modelMsgs, ...(isLastStep ? [{ role: "assistant" as const, content: MAX_STEPS_PROMPT }] : [])],
             tools,
             model,
             toolChoice: format.type === "json_schema" ? "required" : undefined,
@@ -2080,7 +2059,7 @@ export const layer = Layer.effect(
 
       yield* getModel(taskModel.providerID, taskModel.modelID, input.sessionID)
 
-      const agent = agentName ? yield* agents.get(agentName) : yield* agents.defaultInfo() // kilocode_change
+      const agent = agentName ? yield* agents.get(agentName) : yield* agents.defaultInfo()
       if (!agent) {
         const available = (yield* agents.list()).filter((a) => !a.hidden).map((a) => a.name)
         const hint = available.length ? ` Available agents: ${available.join(", ")}` : ""
@@ -2210,11 +2189,9 @@ export const PromptInput = Schema.Struct({
     description:
       "@deprecated tools and permissions have been merged, you can set permissions on the session itself now",
   }),
-  // kilocode_change start - keep internal ephemeral tool controls out of the public prompt schema
   format: Schema.optional(SessionV1.Format),
   system: Schema.optional(Schema.String),
   variant: Schema.optional(Schema.String),
-  // kilocode_change end
   // kilocode_change start - managed product slow-snapshot policy
   snapshotInitialization: Schema.optional(Schema.Literal("wait")).annotate({
     description: "Wait silently if snapshot initialization is slow instead of asking the user.",
diff --git a/packages/opencode/src/session/revert.ts b/packages/opencode/src/session/revert.ts
index 4281cacca4e..a2d6801175e 100644
--- a/packages/opencode/src/session/revert.ts
+++ b/packages/opencode/src/session/revert.ts
@@ -10,6 +10,7 @@ import { MessageV2 } from "./message-v2"
 import { SessionID, MessageID, PartID } from "./schema"
 import { SessionRunState } from "./run-state"
 import { SessionSummary } from "./summary"
+import { KiloSessionRevert } from "@/kilocode/session/revert" // kilocode_change
 
 export const RevertInput = Schema.Struct({
   sessionID: SessionID,
@@ -81,35 +82,45 @@ export const layer = Layer.effect(
           : "unavailable"
       // kilocode_change end
       rev.snapshot = session.revert?.snapshot ?? (yield* snap.track())
-      if (session.revert?.snapshot) yield* snap.restore(session.revert.snapshot)
+      // kilocode_change start - keep the entire workspace transition atomic
+      const prior = session.revert ? KiloSessionRevert.files(all, session.revert) : []
+      const files = [...new Set([...prior, ...patches.flatMap((patch) => patch.files)])]
+      const baseline = session.revert?.snapshot && files.length > 0 ? yield* snap.track() : rev.snapshot
+      if (files.length > 0 && !baseline) {
+        return yield* Effect.die(new Error("Cannot rewind files because the current workspace snapshot is unavailable"))
+      }
+      yield* KiloSessionRevert.apply(
+        snap,
+        baseline,
+        files,
+        Effect.gen(function* () {
+          if (session.revert?.snapshot) yield* KiloSessionRevert.restore(snap, session.revert.snapshot, prior)
 
-      // kilocode_change start - compute diffs BEFORE reverting files so the diff
-      // reflects changes being undone (files on disk still have AI modifications)
-      const diffs = yield* summary.computeDiff({ messages: range })
+          // Compute the user-facing diff while files still contain the changes being undone.
+          const diffs = yield* summary.computeDiff({ messages: range })
+          yield* snap.revert(patches)
+          if (rev.snapshot) rev.diff = yield* snap.diff(rev.snapshot)
+          yield* storage.write(["session_diff", input.sessionID], diffs).pipe(Effect.ignore)
+          yield* events.publish(Session.Event.Diff, { sessionID: input.sessionID, diff: diffs })
+          const summaryDiffs: Snapshot.SummaryFileDiff[] = diffs.map((d) => ({
+            file: d.file,
+            additions: d.additions,
+            deletions: d.deletions,
+            status: d.status,
+          }))
+          yield* sessions.setRevert({
+            sessionID: input.sessionID,
+            revert: rev,
+            summary: {
+              additions: diffs.reduce((sum, x) => sum + x.additions, 0),
+              deletions: diffs.reduce((sum, x) => sum + x.deletions, 0),
+              files: diffs.length,
+              diffs: summaryDiffs,
+            },
+          })
+        }),
+      )
       // kilocode_change end
-
-      yield* snap.revert(patches)
-      if (rev.snapshot) rev.diff = yield* snap.diff(rev.snapshot)
-      yield* storage.write(["session_diff", input.sessionID], diffs).pipe(Effect.ignore)
-      yield* events.publish(Session.Event.Diff, { sessionID: input.sessionID, diff: diffs })
-      // kilocode_change start
-      const summaryDiffs: Snapshot.SummaryFileDiff[] = diffs.map((d) => ({
-        file: d.file,
-        additions: d.additions,
-        deletions: d.deletions,
-        status: d.status,
-      }))
-      // kilocode_change end
-      yield* sessions.setRevert({
-        sessionID: input.sessionID,
-        revert: rev,
-        summary: {
-          additions: diffs.reduce((sum, x) => sum + x.additions, 0),
-          deletions: diffs.reduce((sum, x) => sum + x.deletions, 0),
-          files: diffs.length,
-          diffs: summaryDiffs, // kilocode_change
-        },
-      })
       return yield* sessions.get(input.sessionID).pipe(Effect.orDie)
     })
 
@@ -118,8 +129,25 @@ export const layer = Layer.effect(
       yield* state.assertNotBusy(input.sessionID)
       const session = yield* sessions.get(input.sessionID).pipe(Effect.orDie)
       if (!session.revert) return session
-      if (session.revert.snapshot) yield* snap.restore(session.revert.snapshot)
-      yield* sessions.clearRevert(input.sessionID)
+      // kilocode_change start - preserve the reverted workspace if redo cannot complete
+      const all = yield* sessions.messages({ sessionID: input.sessionID }).pipe(Effect.orDie)
+      const files = KiloSessionRevert.files(all, session.revert)
+      const baseline = files.length > 0 ? yield* snap.track() : undefined
+      if (files.length > 0 && !baseline) {
+        return yield* Effect.die(
+          new Error("Cannot restore files because the current workspace snapshot is unavailable"),
+        )
+      }
+      yield* KiloSessionRevert.apply(
+        snap,
+        baseline,
+        files,
+        Effect.gen(function* () {
+          if (session.revert?.snapshot) yield* KiloSessionRevert.restore(snap, session.revert.snapshot, files)
+          yield* sessions.clearRevert(input.sessionID)
+        }),
+      )
+      // kilocode_change end
       return yield* sessions.get(input.sessionID).pipe(Effect.orDie)
     })
 
diff --git a/packages/opencode/src/session/tools.ts b/packages/opencode/src/session/tools.ts
index 55eb7d0fba6..f6d78654cbe 100644
--- a/packages/opencode/src/session/tools.ts
+++ b/packages/opencode/src/session/tools.ts
@@ -150,7 +150,7 @@ export const resolve = Effect.fn("SessionTools.resolve")(function* (input: {
     if (!execute) continue
 
     const schema = yield* Effect.promise(() => Promise.resolve(asSchema(item.inputSchema).jsonSchema))
-    const transformed = ProviderTransform.schema(input.model, schema)
+    const transformed = ProviderTransform.schema(input.model, { ...schema, properties: schema.properties ?? {} })
     item.inputSchema = jsonSchema(transformed)
     item.execute = (args, opts) =>
       run.promise(
diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index 5b974dfd605..a1d74809783 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -208,7 +208,10 @@ export const layer: Layer.Layer<Service, never, Requirements> =
 
           const exists = (file: string) => fs.exists(file).pipe(Effect.orDie)
           const read = (file: string) => fs.readFileString(file).pipe(Effect.catch(() => Effect.succeed("")))
-          const remove = (file: string) => fs.remove(file).pipe(Effect.catch(() => Effect.void))
+          // kilocode_change start - restoration must fail if deletion fails
+          const remove = (file: string) =>
+            fs.remove(file, { force: true }).pipe(Effect.orDie)
+          // kilocode_change end
           // kilocode_change start - serialize snapshot repositories across CLI and extension processes
           const locked = <A, R>(fx: Effect.Effect<A, never, R>) =>
             lock(state.gitdir).withPermits(1)(flock.withLock(fx, `snapshot:${state.gitdir}`).pipe(Effect.orDie))
@@ -471,13 +474,14 @@ export const layer: Layer.Layer<Service, never, Requirements> =
                     exitCode: checkout.code,
                     stderr: checkout.stderr,
                   })
-                  return
+                  return yield* Effect.die(new Error(`Failed to restore snapshot ${snapshot}`)) // kilocode_change
                 }
                 yield* Effect.logError("failed to restore snapshot", {
                   snapshot,
                   exitCode: result.code,
                   stderr: result.stderr,
                 })
+                return yield* Effect.die(new Error(`Failed to restore snapshot ${snapshot}`)) // kilocode_change
               }),
             )
           })
@@ -485,6 +489,14 @@ export const layer: Layer.Layer<Service, never, Requirements> =
           const revert = Effect.fnUntraced(function* (patches: Patch[]) {
             return yield* locked(
               Effect.gen(function* () {
+                // kilocode_change start - validate every checkpoint before mutating workspace files
+                for (const hash of new Set(patches.filter((item) => item.files.length > 0).map((item) => item.hash))) {
+                  const tree = yield* git([...core, ...args(["cat-file", "-e", `${hash}^{tree}`])], {
+                    cwd: state.worktree,
+                  })
+                  if (tree.code !== 0) return yield* Effect.die(new Error(`Snapshot ${hash} is unavailable`))
+                }
+                // kilocode_change end
                 const ops: { hash: string; file: string; rel: string }[] = []
                 const seen = new Set<string>()
                 for (const item of patches) {
@@ -508,13 +520,20 @@ export const layer: Layer.Layer<Service, never, Requirements> =
                   const tree = yield* git([...core, ...args(["ls-tree", op.hash, "--", op.rel])], {
                     cwd: state.worktree,
                   })
-                  if (tree.code === 0 && tree.text.trim()) {
-                    yield* Effect.logInfo("file existed in snapshot but checkout failed, keeping", {
+                  // kilocode_change start - never report success for a file that Git could not restore
+                  if (tree.code !== 0) {
+                    return yield* Effect.die(new Error(`Snapshot ${op.hash} is unavailable`))
+                  }
+                  if (tree.text.trim()) {
+                    yield* Effect.logError("file existed in snapshot but checkout failed", {
                       file: op.file,
                       hash: op.hash,
+                      exitCode: result.code,
+                      stderr: result.stderr,
                     })
-                    return
+                    return yield* Effect.die(new Error(`Failed to restore ${op.file} from snapshot ${op.hash}`))
                   }
+                  // kilocode_change end
                   yield* Effect.logInfo("file did not exist in snapshot, deleting", {
                     file: op.file,
                     hash: op.hash,
diff --git a/packages/opencode/src/tool/shell.ts b/packages/opencode/src/tool/shell.ts
index 429a04c7f9d..27b73acae08 100644
--- a/packages/opencode/src/tool/shell.ts
+++ b/packages/opencode/src/tool/shell.ts
@@ -12,7 +12,7 @@ import { FSUtil } from "@opencode-ai/core/fs-util"
 import { fileURLToPath } from "url"
 import { Config } from "@/config/config"
 import { RuntimeFlags } from "@/effect/runtime-flags"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { ShellID } from "./shell/id"
 
 import * as Truncate from "./truncate"
@@ -20,6 +20,7 @@ import { Plugin } from "@/plugin"
 import { normalizeUrls } from "@/kilocode/util/url" // kilocode_change
 import { CommandTimeout } from "@/kilocode/command-timeout" // kilocode_change
 import { heredocs } from "@/kilocode/tool/shell-heredoc" // kilocode_change
+import { unparsed } from "@/kilocode/tool/shell-unparsed" // kilocode_change
 import { ChildProcess } from "effect/unstable/process"
 import { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"
 import { ShellPrompt, type Parameters } from "./shell/prompt"
@@ -404,6 +405,14 @@ export const ShellPermission = Effect.gen(function* () {
       }
     }
 
+    // kilocode_change start - fail closed on commands the grammar failed to parse (#12326)
+    const lost = unparsed(root, nodes.length)
+    if (lost.length > 0) scan.access = "unknown"
+    for (const pattern of lost) {
+      scan.patterns.add(pattern)
+    }
+    // kilocode_change end
+
     return scan
   })
 
diff --git a/packages/opencode/src/util/html.ts b/packages/opencode/src/util/html.ts
new file mode 100644
index 00000000000..55028613f7b
--- /dev/null
+++ b/packages/opencode/src/util/html.ts
@@ -0,0 +1,8 @@
+export function escapeHtml(value: string) {
+  return value
+    .replaceAll("&", "&amp;")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;")
+    .replaceAll('"', "&quot;")
+    .replaceAll("'", "&#39;")
+}
diff --git a/packages/opencode/sst-env.d.ts b/packages/opencode/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/opencode/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/opencode/test/acp/event.test.ts b/packages/opencode/test/acp/event.test.ts
index 7ed42bd8894..7067e7a3003 100644
--- a/packages/opencode/test/acp/event.test.ts
+++ b/packages/opencode/test/acp/event.test.ts
@@ -517,7 +517,7 @@ describe("acp event routing", () => {
     expect(harness.updates).toHaveLength(0)
   })
 
-  it("emits synthetic pending before the first running tool update", async () => {
+  it("exposes the shell command on the synthetic pending tool call", async () => {
     const harness = createHarness()
     await Effect.runPromise(harness.session.create({ id: "ses_tool", cwd: "/workspace" }))
 
@@ -527,7 +527,14 @@ describe("acp event routing", () => {
       "tool_call",
       "tool_call_update",
     ])
-    expect(harness.updates[0]?.update).toMatchObject({ status: "pending", toolCallId: "call_1" })
+    expect(harness.updates[0]?.update).toMatchObject({
+      status: "pending",
+      toolCallId: "call_1",
+      title: "printf hello",
+      kind: "execute",
+      locations: [{ path: "/workspace" }],
+      rawInput: { cmd: "printf hello", cwd: "/workspace" },
+    })
     expect(harness.updates[1]?.update).toMatchObject({ status: "in_progress", toolCallId: "call_1" })
   })
 
diff --git a/packages/opencode/test/acp/tool.test.ts b/packages/opencode/test/acp/tool.test.ts
index e7ad1c1b163..1713f6faf09 100644
--- a/packages/opencode/test/acp/tool.test.ts
+++ b/packages/opencode/test/acp/tool.test.ts
@@ -1,3 +1,4 @@
+import { resolve } from "path"
 import { describe, expect, test } from "bun:test"
 import {
   completedToolContent,
@@ -37,7 +38,13 @@ describe("acp tool conversion", () => {
     expect(toLocations("external_directory", { directories: ["/tmp/outside"], patterns: ["/tmp/outside/*"] })).toEqual([
       { path: "/tmp/outside" },
     ])
-    expect(toLocations("bash", { filePath: "/tmp/nope.ts", path: "/tmp" })).toEqual([])
+    expect(toLocations("bash", { cmd: "pwd" }, "/workspace")).toEqual([{ path: "/workspace" }])
+    // Relative workdir resolves against cwd via the platform path resolver (backslashes on Windows).
+    expect(toLocations("bash", { command: "pwd", workdir: "subdir" }, "/workspace")).toEqual([
+      { path: resolve("/workspace", "subdir") },
+    ])
+    expect(toLocations("bash", { command: "pwd", workdir: "/abs/dir" }, "/workspace")).toEqual([{ path: "/abs/dir" }])
+    expect(toLocations("bash", { command: "printf hello" })).toEqual([])
     expect(toLocations("read", { path: "/tmp/missing-file-path.ts" })).toEqual([])
   })
 
diff --git a/packages/opencode/test/cli/run/run-process.test.ts b/packages/opencode/test/cli/run/run-process.test.ts
index 069af86eee2..9d2d013ac09 100644
--- a/packages/opencode/test/cli/run/run-process.test.ts
+++ b/packages/opencode/test/cli/run/run-process.test.ts
@@ -74,7 +74,7 @@ describe("opencode run (non-interactive subprocess)", () => {
     ({ llm, opencode }) =>
       Effect.gen(function* () {
         yield* llm.text("structured output")
-        const result = yield* opencode.run("say hi", { format: "json" })
+        const result = yield* opencode.run("say hi", { format: "json", extraArgs: ["--auto"] })
         opencode.expectExit(result, 0)
 
         const events = opencode.parseJsonEvents(result.stdout)
@@ -83,9 +83,25 @@ describe("opencode run (non-interactive subprocess)", () => {
           expect(typeof evt.type).toBe("string")
           expect(typeof evt.sessionID).toBe("string")
         }
-        // At least one `text` event should appear with the LLM's response.
-        const text = events.find((e) => e.type === "text")
-        expect(text).toBeDefined()
+        expect(events.filter((event) => event.type === "step_start")).toHaveLength(1)
+        expect(events.filter((event) => event.type === "text")).toHaveLength(1)
+        expect(events.filter((event) => event.type === "step_finish")).toHaveLength(1)
+      }),
+    60_000,
+  )
+
+  cliIt.live(
+    "--format json emits each completed tool once",
+    ({ llm, opencode }) =>
+      Effect.gen(function* () {
+        yield* llm.tool("glob", { pattern: "package.json" })
+        yield* llm.text("tool complete")
+        const result = yield* opencode.run("find package.json", { format: "json", extraArgs: ["--auto"] })
+        opencode.expectExit(result, 0)
+
+        const events = opencode.parseJsonEvents(result.stdout)
+        expect(events.filter((event) => event.type === "tool_use")).toHaveLength(1)
+        expect(events.filter((event) => event.type === "text")).toHaveLength(1)
       }),
     60_000,
   )
diff --git a/packages/opencode/test/cli/run/stream.transport.test.ts b/packages/opencode/test/cli/run/stream.transport.test.ts
index 07506f81e5b..575a8c2a012 100644
--- a/packages/opencode/test/cli/run/stream.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream.transport.test.ts
@@ -88,20 +88,14 @@ function retry(sessionID: string, attempt: number, message: string) {
 function assistant(id: string, sessionID = "session-1"): SdkEvent {
   return {
     id: `evt-${id}`,
-    type: "sync",
-    syncEvent: {
-      type: "message.updated.1",
-      id: `evt-${id}`,
-      seq: 1,
-      aggregateID: sessionID,
-      data: {
+    type: "message.updated",
+    properties: {
+      sessionID,
+      info: assistantMessage({
         sessionID,
-        info: assistantMessage({
-          sessionID,
-          id,
-          parts: [],
-        }).info,
-      },
+        id,
+        parts: [],
+      }).info,
     },
   }
 }
@@ -295,6 +289,18 @@ function textPart(id: string, messageID: string, text: string, sessionID = "sess
 }
 
 function textUpdated(part: TextPart): SdkEvent {
+  return {
+    id: `evt-${part.id}-updated`,
+    type: "message.part.updated",
+    properties: {
+      sessionID: part.sessionID,
+      part,
+      time: 1,
+    },
+  }
+}
+
+function syncTextUpdated(part: TextPart): SdkEvent {
   return {
     id: `evt-${part.id}-updated`,
     type: "sync",
@@ -338,17 +344,11 @@ function reasoningUpdated(part: ReasoningPart): SdkEvent {
 function toolUpdated(part: SessionToolPart): SdkEvent {
   return {
     id: `evt-${part.id}-updated`,
-    type: "sync",
-    syncEvent: {
-      type: "message.part.updated.1",
-      id: `evt-${part.id}-updated`,
-      seq: 1,
-      aggregateID: part.sessionID,
-      data: {
-        sessionID: part.sessionID,
-        part,
-        time: 1,
-      },
+    type: "message.part.updated",
+    properties: {
+      sessionID: part.sessionID,
+      part,
+      time: 1,
     },
   }
 }
@@ -468,6 +468,34 @@ function sdk(
 }
 
 describe("run stream transport", () => {
+  test("ignores the sync copy of a native message event", async () => {
+    const src = globalFeed()
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: sdk({ globalStream: src.stream }),
+      sessionID: "session-1",
+      thinking: true,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    const part = {
+      ...textPart("text-1", "msg-1", "Hello"),
+      time: { start: 1, end: 2 },
+    }
+
+    try {
+      src.push(globalEvent(assistant("msg-1")))
+      src.push(globalEvent(textUpdated(part)))
+      src.push(globalEvent(syncTextUpdated(part)))
+
+      await waitFor(() => ui.commits.find((item) => item.kind === "assistant" && item.text === "Hello"))
+      expect(ui.commits.filter((item) => item.kind === "assistant" && item.text === "Hello")).toHaveLength(1)
+    } finally {
+      src.close()
+      await transport.close()
+    }
+  })
+
   test("does not replay persisted main-session history during bootstrap by default", async () => {
     const src = eventFeed()
     const ui = footer()
diff --git a/packages/opencode/test/kilocode/background-process.test.ts b/packages/opencode/test/kilocode/background-process.test.ts
index 60391436ff6..71e0dbc350f 100644
--- a/packages/opencode/test/kilocode/background-process.test.ts
+++ b/packages/opencode/test/kilocode/background-process.test.ts
@@ -2,7 +2,7 @@ import { describe, expect } from "bun:test"
 import { Bus } from "@/bus"
 import { BackgroundProcess } from "@/kilocode/background-process"
 import { SessionID } from "@/session/schema"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { Filesystem } from "@/util/filesystem"
 import { Global } from "@opencode-ai/core/global"
 import { Hash } from "@opencode-ai/core/util/hash"
diff --git a/packages/opencode/test/kilocode/bash-permission-metadata.test.ts b/packages/opencode/test/kilocode/bash-permission-metadata.test.ts
index b138122f071..7da965292be 100644
--- a/packages/opencode/test/kilocode/bash-permission-metadata.test.ts
+++ b/packages/opencode/test/kilocode/bash-permission-metadata.test.ts
@@ -4,7 +4,7 @@ import { Effect, Layer, ManagedRuntime } from "effect"
 import { ShellTool } from "../../src/tool/shell"
 import { provideTestInstance } from "../fixture/fixture"
 import { tmpdir } from "../fixture/fixture"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { SessionID, MessageID } from "../../src/session/schema"
 import type { Permission } from "../../src/permission"
 import { Agent } from "../../src/agent/agent"
diff --git a/packages/opencode/test/kilocode/cli-shutdown.test.ts b/packages/opencode/test/kilocode/cli-shutdown.test.ts
index e6fea808e85..5a4babfbe09 100644
--- a/packages/opencode/test/kilocode/cli-shutdown.test.ts
+++ b/packages/opencode/test/kilocode/cli-shutdown.test.ts
@@ -1,8 +1,11 @@
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test"
+import { KiloShutdown } from "../../src/kilocode/cli/shutdown"
 
 const calls: string[] = []
 const timeouts: Array<number | undefined> = []
 let err: unknown
+let drainErr: unknown
+let drainCalls = 0
 let exit: string | number | null | undefined
 
 mock.module("@opencode-ai/core/global", () => ({
@@ -67,6 +70,16 @@ mock.module("@/kilocode/session-export", () => ({
   },
 }))
 
+mock.module("@/kilo-sessions/kilo-sessions", () => ({
+  KiloSessions: {
+    async drainIngestForShutdown() {
+      drainCalls += 1
+      calls.push("drain")
+      if (drainErr) throw drainErr
+    },
+  },
+}))
+
 mock.module("@/kilocode/help-command", () => ({
   createHelpCommand: () => ({ command: "help", handler() {} }),
 }))
@@ -94,11 +107,34 @@ for (const path of [
   }))
 }
 
+/** Same mock body as the kilo-sessions module mock used by setup.ts's drain task. */
+function registerDrain() {
+  KiloShutdown.register(async () => {
+    drainCalls += 1
+    calls.push("drain")
+    if (drainErr) throw drainErr
+  })
+}
+
+/**
+ * Install a drain task for this test only. Clears any leftover registry entries first
+ * (setup.ts's one-time module-scope registration, or a prior test) so assertions do not
+ * depend on declaration order or on whether an earlier test already ran KiloShutdown.run().
+ */
+async function installDrain() {
+  await KiloShutdown.run()
+  calls.length = 0
+  drainCalls = 0
+  registerDrain()
+}
+
 describe("KiloCli.shutdown", () => {
   beforeEach(() => {
     calls.length = 0
     timeouts.length = 0
     err = undefined
+    drainErr = undefined
+    drainCalls = 0
     exit = process.exitCode
     process.exitCode = undefined
   })
@@ -107,26 +143,44 @@ describe("KiloCli.shutdown", () => {
     process.exitCode = exit
   })
 
-  test("keeps telemetry shutdown timeout best-effort and still disposes instances", async () => {
-    err = "Timeout while shutting down PostHog. Some events may not have been sent."
+  // Must stay first: setup registers the drain task once at import; KiloShutdown.run() clears it.
+  // Only this test pins that one-time module-scope registration (and the drain-before-dispose
+  // ordering it enables). Later tests call installDrain() so they do not rely on order.
+  test("rejects drain without blocking dispose", async () => {
+    drainErr = new Error("ingest drain failed")
     process.exitCode = 0
     const { KiloCli } = await import("../../src/kilocode/cli/setup")
 
     await expect(KiloCli.shutdown()).resolves.toBeUndefined()
 
+    expect(drainCalls).toBe(1)
     expect(timeouts).toEqual([2000])
-    expect(calls).toEqual(["track:0", "session", "telemetry", "dispose"])
+    expect(calls).toEqual(["track:0", "session", "telemetry", "drain", "dispose"])
+    expect(process.exitCode).toBe(0)
+  })
+
+  test("keeps telemetry shutdown timeout best-effort and still disposes instances", async () => {
+    err = "Timeout while shutting down PostHog. Some events may not have been sent."
+    process.exitCode = 0
+    const { KiloCli } = await import("../../src/kilocode/cli/setup")
+    await installDrain()
+
+    await expect(KiloCli.shutdown()).resolves.toBeUndefined()
+
+    expect(timeouts).toEqual([2000])
+    expect(calls).toEqual(["track:0", "session", "telemetry", "drain", "dispose"])
     expect(process.exitCode).toBe(0)
   })
 
   test("preserves failing command exit status", async () => {
     process.exitCode = 1
     const { KiloCli } = await import("../../src/kilocode/cli/setup")
+    await installDrain()
 
     await KiloCli.shutdown()
 
     expect(timeouts).toEqual([2000])
-    expect(calls).toEqual(["track:1", "session", "telemetry", "dispose"])
+    expect(calls).toEqual(["track:1", "session", "telemetry", "drain", "dispose"])
     expect(process.exitCode).toBe(1)
   })
 })
diff --git a/packages/opencode/test/kilocode/cli/cmd/remote.test.ts b/packages/opencode/test/kilocode/cli/cmd/remote.test.ts
index abeb24b02cf..e571148694a 100644
--- a/packages/opencode/test/kilocode/cli/cmd/remote.test.ts
+++ b/packages/opencode/test/kilocode/cli/cmd/remote.test.ts
@@ -9,7 +9,8 @@
 // a source-text/regex assertion on the handler's structure.
 
 import { describe, expect, test } from "bun:test"
-import { buildInstanceAdvertisement } from "../../../../src/cli/cmd/remote"
+// Shared helper lives in kilo-sessions; remote.ts re-exports for the CLI path.
+import { buildInstanceAdvertisement } from "../../../../src/kilo-sessions/instance-advertisement"
 
 describe("RemoteCommand instance advertisement (K1 W1)", () => {
   test("buildInstanceAdvertisement resolves name/projectName/version from the directory and installation version", () => {
diff --git a/packages/opencode/test/kilocode/cli/tui/thread.test.ts b/packages/opencode/test/kilocode/cli/tui/thread.test.ts
index 20e42894153..a17fd1725a1 100644
--- a/packages/opencode/test/kilocode/cli/tui/thread.test.ts
+++ b/packages/opencode/test/kilocode/cli/tui/thread.test.ts
@@ -1,6 +1,9 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
 import fs from "fs/promises"
 import path from "path"
+import { fileURLToPath } from "node:url"
+import { spawn, type Exit } from "@opencode-ai/core/pty/driver"
+import { sanitizedProcessEnv } from "@opencode-ai/core/util/opencode-process"
 import { tmpdir } from "../../../fixture/fixture"
 import {
   embeddedRemoteExitClient,
@@ -41,6 +44,81 @@ describe("kilo tui thread", () => {
     expect(calls).toBe(1)
   })
 
+  test(
+    "starts the TUI from a directory without OpenTUI dependencies",
+    async () => {
+      await using root = await tmpdir()
+      const state = { text: "", exit: undefined as Exit | undefined }
+      const ready = Promise.withResolvers<void>()
+      const stopped = Promise.withResolvers<void>()
+      const proc = spawn(
+        process.execPath,
+        [
+          "--conditions=browser",
+          `--preload=${fileURLToPath(import.meta.resolve("@opentui/solid/preload"))}`,
+          path.resolve(import.meta.dir, "../../../../src/index.ts"),
+        ],
+        {
+          name: "xterm-256color",
+          cols: 120,
+          rows: 40,
+          cwd: root.path,
+          env: sanitizedProcessEnv({
+            HOME: root.path,
+            XDG_CONFIG_HOME: path.join(root.path, ".config"),
+            XDG_DATA_HOME: path.join(root.path, ".local/share"),
+            XDG_STATE_HOME: path.join(root.path, ".local/state"),
+            XDG_CACHE_HOME: path.join(root.path, ".cache"),
+            KILO_TEST_HOME: root.path,
+            KILO_CONFIG_CONTENT: "{}",
+            KILO_AUTH_CONTENT: "{}",
+            KILO_DISABLE_PROJECT_CONFIG: "1",
+            KILO_DISABLE_AUTOUPDATE: "1",
+            KILO_DISABLE_MODELS_FETCH: "1",
+            KILO_DISABLE_TERMINAL_TITLE: "0",
+            KILO_DEV_CWD: "",
+            KILO_PURE: "1",
+            KILO_NO_DAEMON: "1",
+            TERM: "xterm-256color",
+          }),
+        },
+      )
+      const data = proc.onData((chunk) => {
+        state.text = (state.text + chunk).slice(-20_000)
+        if (state.text.includes("TUI worker error")) {
+          ready.reject(new Error(`TUI worker failed during startup:\n${state.text}`))
+          return
+        }
+        // The title is emitted only after the worker-backed TUI reaches its rendered app.
+        if (state.text.includes("Kilo CLI")) ready.resolve()
+      })
+      const exit = proc.onExit((event) => {
+        state.exit = event
+        stopped.resolve()
+        ready.reject(
+          new Error(
+            `TUI exited before rendering (code ${event.exitCode}, signal ${event.signal ?? "none"}):\n${state.text}`,
+          ),
+        )
+      })
+      const timer = setTimeout(() => {
+        ready.reject(new Error(`Timed out waiting for the TUI to render:\n${state.text}`))
+      }, 30_000)
+
+      try {
+        await ready.promise
+        expect(state.text).toContain("Kilo CLI")
+      } finally {
+        clearTimeout(timer)
+        data.dispose()
+        if (!state.exit) proc.kill()
+        await stopped.promise
+        exit.dispose()
+      }
+    },
+    45_000,
+  )
+
   test("ignores stale PWD after cwd is changed by a process wrapper", async () => {
     await using root = await tmpdir()
     const pkg = path.join(root.path, "packages", "opencode")
diff --git a/packages/opencode/test/kilocode/command-timeout.test.ts b/packages/opencode/test/kilocode/command-timeout.test.ts
index 9ec8547bdba..e242ef60ec8 100644
--- a/packages/opencode/test/kilocode/command-timeout.test.ts
+++ b/packages/opencode/test/kilocode/command-timeout.test.ts
@@ -11,7 +11,7 @@ import { Plugin } from "@/plugin"
 import { Truncate } from "@/tool/truncate"
 import { Config } from "@/config/config"
 import { Agent } from "@/agent/agent"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { MessageID, SessionID } from "@/session/schema"
 import { RuntimeFlags } from "@/effect/runtime-flags"
 import { testEffect } from "../lib/effect"
diff --git a/packages/opencode/test/kilocode/diff-full.test.ts b/packages/opencode/test/kilocode/diff-full.test.ts
index 0dc228fb95f..3f67cee9237 100644
--- a/packages/opencode/test/kilocode/diff-full.test.ts
+++ b/packages/opencode/test/kilocode/diff-full.test.ts
@@ -4,6 +4,7 @@
 
 import { $ } from "bun"
 import { describe, expect } from "bun:test"
+import { parsePatch } from "diff"
 import { Effect, Layer } from "effect"
 import path from "path"
 import * as CrossSpawnSpawner from "@opencode-ai/core/cross-spawn-spawner"
@@ -106,6 +107,24 @@ describe("DiffFull.batch", () => {
     }),
   )
 
+  it.live("keeps distant changes in bounded, parseable hunks", () =>
+    Effect.gen(function* () {
+      const dir = yield* tmpdirScoped({ git: true })
+      const before = Array.from({ length: 30 }, (_, i) => `line ${i + 1}`)
+      yield* Effect.promise(() => Filesystem.write(path.join(dir, "multi.txt"), before.join("\n") + "\n"))
+      const from = yield* Effect.promise(() => commit(dir, "v1"))
+      const after = before.with(1, "changed near start").with(27, "changed near end")
+      yield* Effect.promise(() => Filesystem.write(path.join(dir, "multi.txt"), after.join("\n") + "\n"))
+      const to = yield* Effect.promise(() => commit(dir, "v2"))
+
+      const result = yield* DiffFull.batch(gitResult(dir), from, to, ["multi.txt"])
+      const parsed = parsePatch(result.get("multi.txt") ?? "")[0]
+
+      expect(parsed?.hunks).toHaveLength(2)
+      expect(parsed?.hunks.every((hunk) => hunk.lines.length < before.length)).toBe(true)
+    }),
+  )
+
   it.live("returns an empty map without spawning for an empty file list", () =>
     Effect.gen(function* () {
       let calls = 0
diff --git a/packages/opencode/test/kilocode/fixture/stall-plugin.ts b/packages/opencode/test/kilocode/fixture/stall-plugin.ts
new file mode 100644
index 00000000000..144a7b37ab4
--- /dev/null
+++ b/packages/opencode/test/kilocode/fixture/stall-plugin.ts
@@ -0,0 +1,30 @@
+// Plugin used by the issue #8656 regression tests.
+//
+// It attaches the simulated socket from stall-transport.ts to the `mock`
+// provider through the plugin `config` hook. This is the supported injection
+// point: src/provider/provider.ts loads plugins before reading `cfg.provider`
+// exactly so hooks can add options such as `fetch`. Injecting here keeps the
+// simulation scoped to the test's own instance instead of replacing
+// `globalThis.fetch` for the whole test process.
+
+import { createStallTransport } from "./stall-transport"
+
+type Options = { state?: unknown; answer?: unknown; provider?: unknown }
+
+type Draft = {
+  provider?: Record<string, { options?: Record<string, unknown> } | undefined>
+}
+
+export default async (_input: unknown, options?: Options) => ({
+  config: async (cfg: Draft) => {
+    const id = typeof options?.provider === "string" ? options.provider : "mock"
+    const provider = cfg.provider?.[id]
+    const state = typeof options?.state === "string" ? options.state : undefined
+    if (!provider || !state) return
+    provider.options ??= {}
+    provider.options["fetch"] = createStallTransport({
+      state,
+      answer: typeof options?.answer === "string" ? options.answer : undefined,
+    })
+  },
+})
diff --git a/packages/opencode/test/kilocode/fixture/stall-transport.ts b/packages/opencode/test/kilocode/fixture/stall-transport.ts
new file mode 100644
index 00000000000..8f9c145c169
--- /dev/null
+++ b/packages/opencode/test/kilocode/fixture/stall-transport.ts
@@ -0,0 +1,119 @@
+// Simulated provider socket for the issue #8656 regression tests.
+//
+// Only the socket is simulated. The transport is injected as the provider's
+// `fetch` option, so Kilo's own fetch wrapper (connection timeout, first-byte
+// guard, SSE chunk watchdog), the openai-compatible SDK, SSE parsing, the
+// session processor and the agent loop are all the production ones.
+//
+// Request script:
+//   1. title request                  -> short text answer
+//   2. no tool result in the messages -> a bash tool call
+//   3. first request carrying a tool result -> SSE headers, body never sends a
+//      byte (the stall reported in #8656)
+//   4. later requests carrying a tool result -> final text answer, so a bounded
+//      stall can recover through the normal retry path
+//
+// Progress is mirrored to a JSON file so tests can assert what the provider saw
+// without sharing module state with the plugin that loads this file.
+
+export type StallState = { calls: number; stalls: number; recovered: number }
+
+const HEAD = { id: "chatcmpl-stall", object: "chat.completion.chunk", created: 0, model: "mock-model" }
+
+const chunk = (obj: unknown) => `data: ${JSON.stringify(obj)}\n\n`
+
+const usage = () =>
+  chunk({ ...HEAD, choices: [], usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 15 } })
+
+function sse(body: BodyInit | null) {
+  return new Response(body, { status: 200, headers: { "content-type": "text/event-stream" } })
+}
+
+function answer(value: string) {
+  return sse(
+    [
+      chunk({ ...HEAD, choices: [{ index: 0, delta: { role: "assistant", content: value }, finish_reason: null }] }),
+      chunk({ ...HEAD, choices: [{ index: 0, delta: {}, finish_reason: "stop" }] }),
+      usage(),
+      "data: [DONE]\n\n",
+    ].join(""),
+  )
+}
+
+function toolCall(command: string) {
+  return sse(
+    [
+      chunk({
+        ...HEAD,
+        choices: [
+          {
+            index: 0,
+            delta: {
+              role: "assistant",
+              tool_calls: [
+                {
+                  index: 0,
+                  id: "call_1",
+                  type: "function",
+                  function: { name: "bash", arguments: JSON.stringify({ command }) },
+                },
+              ],
+            },
+            finish_reason: null,
+          },
+        ],
+      }),
+      chunk({ ...HEAD, choices: [{ index: 0, delta: {}, finish_reason: "tool_calls" }] }),
+      usage(),
+      "data: [DONE]\n\n",
+    ].join(""),
+  )
+}
+
+/** Response headers arrive, then the body never produces a byte. */
+function stalling() {
+  return sse(
+    new ReadableStream<Uint8Array>({
+      start() {},
+      cancel() {
+        // the first-byte guard cancels this reader when it gives up
+      },
+    }),
+  )
+}
+
+export function createStallTransport(input: { state: string; answer?: string; command?: string }) {
+  const state: StallState = { calls: 0, stalls: 0, recovered: 0 }
+  const save = () => Bun.write(input.state, JSON.stringify(state))
+
+  return async (_input: unknown, init?: { body?: unknown }) => {
+    const body = typeof init?.body === "string" ? init.body : ""
+    state.calls++
+
+    if (body.includes("Generate a title")) {
+      await save()
+      return answer("Stall repro")
+    }
+
+    if (!body.includes('"role":"tool"')) {
+      await save()
+      return toolCall(input.command ?? "echo repro-8656")
+    }
+
+    if (state.stalls === 0) {
+      state.stalls++
+      await save()
+      return stalling()
+    }
+
+    state.recovered++
+    await save()
+    return answer(input.answer ?? "recovered after the stall")
+  }
+}
+
+export async function readStallState(file: string): Promise<StallState> {
+  const handle = Bun.file(file)
+  if (!(await handle.exists())) return { calls: 0, stalls: 0, recovered: 0 }
+  return JSON.parse(await handle.text()) as StallState
+}
diff --git a/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts b/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts
index 3bd83f86fed..995555f368c 100644
--- a/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts
+++ b/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts
@@ -1,10 +1,11 @@
-import { afterAll, beforeAll, expect } from "bun:test"
+import { afterAll, beforeAll, describe, expect, test } from "bun:test"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { Deferred, Effect, Fiber, Layer } from "effect"
 import { GlobalBus, type GlobalEvent } from "../../src/bus/global"
 import { Git } from "../../src/git"
 import { InstanceLayer } from "../../src/project/instance-layer"
 import { InstanceStore } from "../../src/project/instance-store"
+import { KilocodeWatcher } from "../../src/kilocode/watcher"
 import { tmpdirScoped } from "../fixture/fixture"
 import { awaitWithTimeout, testEffect } from "../lib/effect"
 
@@ -23,6 +24,17 @@ afterAll(() => {
 // The watcher is unreliable on Windows CI, so this test only runs on unix.
 const live = process.platform === "win32" ? it.live.skip : it.live
 
+describe("KilocodeWatcher.eager", () => {
+  test("skips eager location watchers for VS Code", () => {
+    expect(KilocodeWatcher.eager("vscode")).toBe(false)
+  })
+
+  test("keeps eager location watchers for the standalone CLI", () => {
+    expect(KilocodeWatcher.eager("cli")).toBe(true)
+    expect(KilocodeWatcher.eager(undefined)).toBe(true)
+  })
+})
+
 live("instances publish branch updates after git switch", () =>
   Effect.gen(function* () {
     const dir = yield* tmpdirScoped({ git: true })
diff --git a/packages/opencode/test/kilocode/interactive-terminal.test.ts b/packages/opencode/test/kilocode/interactive-terminal.test.ts
index bcd23bbdf59..d4f584655e7 100644
--- a/packages/opencode/test/kilocode/interactive-terminal.test.ts
+++ b/packages/opencode/test/kilocode/interactive-terminal.test.ts
@@ -9,7 +9,7 @@ import { InteractiveTerminalTool } from "@/kilocode/tool/interactive-terminal"
 import { Plugin } from "@/plugin"
 import type { Permission } from "@/permission"
 import { MessageID, SessionID } from "@/session/schema"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { Truncate } from "@/tool/truncate"
 import type { Tool } from "@/tool/tool"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
diff --git a/packages/opencode/test/kilocode/issue-8656-stall.test.ts b/packages/opencode/test/kilocode/issue-8656-stall.test.ts
new file mode 100644
index 00000000000..c6c939e1ec4
--- /dev/null
+++ b/packages/opencode/test/kilocode/issue-8656-stall.test.ts
@@ -0,0 +1,180 @@
+import { describe, expect, test } from "bun:test"
+import path from "node:path"
+import { pathToFileURL } from "node:url"
+import { provideTestInstance, tmpdir } from "../fixture/fixture"
+import { readStallState } from "./fixture/stall-transport"
+import { Server } from "../../src/server/server"
+
+// Regression coverage for https://github.com/Kilo-Org/kilocode/issues/8656
+//
+// Reported symptom: after a tool call finished, `step-finish:tool-calls` was
+// recorded and the next `step-start` never arrived, leaving the session busy
+// with no error while the HTTP server stayed responsive.
+//
+// One transport state produces exactly that symptom: the follow-up request that
+// carries the tool result gets response headers and then never receives a byte
+// of body. The connection-phase timeout is cleared as soon as headers arrive, so
+// before the fix nothing bounded that wait.
+//
+// The simulated socket is injected as the provider's `fetch` through the plugin
+// `config` hook (see ../fixture/stall-plugin.ts), so the SDK, Kilo's fetch
+// wrapper, SSE parsing, the processor and the agent loop stay production code
+// and nothing global is patched.
+
+const PLUGIN = pathToFileURL(path.join(import.meta.dir, "fixture", "stall-plugin.ts")).href
+const ANSWER = "recovered after the stall"
+
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
+function settings(state: string, timeout: number | false) {
+  return {
+    $schema: "https://app.kilo.ai/config.json",
+    model: "mock/mock-model",
+    plugin: [[PLUGIN, { state, answer: ANSWER }]],
+    provider: {
+      mock: {
+        npm: "@ai-sdk/openai-compatible",
+        name: "Mock",
+        options: { baseURL: "http://127.0.0.1:1/v1", apiKey: "test", timeout },
+        models: {
+          "mock-model": {
+            name: "Mock Model",
+            tool_call: true,
+            limit: { context: 128000, output: 8192 },
+            cost: { input: 0, output: 0 },
+          },
+        },
+      },
+    },
+    permission: { bash: "allow" },
+  }
+}
+
+function project(timeout: number | false) {
+  return tmpdir<{ state: string }>({
+    init: async (dir) => {
+      const state = path.join(dir, "stall-state.json")
+      await Bun.write(path.join(dir, "opencode.json"), JSON.stringify(settings(state, timeout), null, 2))
+      return { state }
+    },
+  })
+}
+
+type Part = Record<string, any>
+type Message = { info: Record<string, any>; parts: Part[] }
+
+function session(dir: string) {
+  const app = Server.Default().app
+  const headers = { "Content-Type": "application/json", "x-kilo-directory": dir }
+  const query = `directory=${encodeURIComponent(dir)}`
+
+  const json = async (route: string, init?: RequestInit) => {
+    const res = await app.request(route, { headers, ...init })
+    return await res.json()
+  }
+
+  return {
+    create: async () => ((await json("/session", { method: "POST", body: "{}" })) as { id: string }).id,
+    prompt: (id: string, text: string) =>
+      app.request(`/session/${id}/prompt_async`, {
+        method: "POST",
+        headers,
+        body: JSON.stringify({ parts: [{ type: "text", text }] }),
+      }),
+    abort: (id: string) => app.request(`/session/${id}/abort`, { method: "POST", headers }),
+    messages: (id: string) => json(`/session/${id}/message?${query}`) as Promise<Message[]>,
+    status: async (id: string) => {
+      const all = (await json(`/session/status?${query}`)) as Record<string, { type: string }>
+      return all[id]?.type ?? "idle"
+    },
+  }
+}
+
+const timeline = (messages: Message[]) =>
+  messages
+    .flatMap((m) => m.parts)
+    .map((p) =>
+      p.type === "tool" ? `tool:${p.tool}:${p.state?.status}` : `${p.type}${p.reason ? `:${p.reason}` : ""}`,
+    )
+    .join(" | ")
+
+async function until(check: () => Promise<boolean>, budget: number) {
+  const deadline = Date.now() + budget
+  while (Date.now() < deadline) {
+    if (await check()) return true
+    await sleep(200)
+  }
+  return false
+}
+
+/** Runs a prompt and waits until the provider has stalled the follow-up request. */
+async function stalled(api: ReturnType<typeof session>, state: string) {
+  const id = await api.create()
+  await api.prompt(id, "run the echo command")
+  const ready = await until(async () => {
+    const stalls = (await readStallState(state)).stalls
+    const parts = timeline(await api.messages(id))
+    return stalls > 0 && parts.includes("step-finish:tool-calls")
+  }, 30_000)
+  expect(ready).toBe(true)
+  return id
+}
+
+describe("issue #8656: provider stalls after a tool call", () => {
+  test("recovers instead of freezing once the stall is bounded", async () => {
+    await using tmp = await project(2_000)
+    await provideTestInstance({
+      directory: tmp.path,
+      fn: async () => {
+        const api = session(tmp.path)
+        const id = await stalled(api, tmp.extra.state)
+
+        const done = await until(async () => (await api.status(id)) === "idle", 40_000)
+        const messages = await api.messages(id)
+        const assistant = messages.findLast((m) => m.info.role === "assistant")
+        const text = (assistant?.parts ?? []).find((p) => p.type === "text")?.text
+        const state = await readStallState(tmp.extra.state)
+        console.log("[repro] bounded ->", JSON.stringify({ timeline: timeline(messages), text, state }))
+
+        // the turn finishes on its own: the stalled request was aborted, retried
+        // and answered, so the agent loop never sits frozen
+        expect(done).toBe(true)
+        expect(timeline(messages)).toContain("tool:bash:completed")
+        expect(state.stalls).toBe(1)
+        expect(state.recovered).toBeGreaterThan(0)
+        expect(text).toContain(ANSWER)
+        expect(assistant?.info.error).toBeUndefined()
+      },
+    })
+  }, 120_000)
+
+  test("still hangs while the provider holds the connection open and timeout is disabled", async () => {
+    await using tmp = await project(false)
+    await provideTestInstance({
+      directory: tmp.path,
+      fn: async () => {
+        const api = session(tmp.path)
+        const id = await stalled(api, tmp.extra.state)
+        try {
+          await sleep(5_000)
+          const messages = await api.messages(id)
+          const parts = timeline(messages)
+          const assistant = messages.findLast((m) => m.info.role === "assistant")
+          console.log("[repro] timeout:false ->", JSON.stringify({ timeline: parts, status: await api.status(id) }))
+
+          // the reported freeze, kept reachable only through the documented opt-out
+          expect(parts.endsWith("step-finish:tool-calls")).toBe(true)
+          expect(await api.status(id)).toBe("busy")
+          expect(assistant?.info.error).toBeUndefined()
+
+          // the server itself stays responsive during the freeze
+          expect((await Server.Default().app.request("/global/health")).status).toBe(200)
+        } finally {
+          // never leave a wedged turn behind for fixture teardown
+          expect((await api.abort(id)).status).toBe(200)
+          expect(await until(async () => (await api.status(id)) === "idle", 15_000)).toBe(true)
+        }
+      },
+    })
+  }, 120_000)
+})
diff --git a/packages/opencode/test/kilocode/kilo-sessions.test.ts b/packages/opencode/test/kilocode/kilo-sessions.test.ts
index 78f26bf75d5..b18c95f2a9b 100644
--- a/packages/opencode/test/kilocode/kilo-sessions.test.ts
+++ b/packages/opencode/test/kilocode/kilo-sessions.test.ts
@@ -276,18 +276,17 @@ multi.live("isolates the process-wide listener by instance directory", () => {
   )
 })
 
-// kilocode_change start - K1 W1: instance advertisement + per-session platform.
+// kilocode_change start - K1 W1 / DEF-1: instance advertisement + per-session platform.
 //
-// The race is the heart of this slice: `enableRemote` is idempotent/coalescing
-// and can be called from either the explicit `kilo remote` command OR from
-// bootstrap auto-enable (`KILO_REMOTE=1` / `remote_control` config). The
-// module-level `instanceAdvertisement` flag must make the next heartbeat
-// carry `instance` regardless of which caller won the race, and the setter
-// must trigger an out-of-band heartbeat when called against an existing
-// connection (so the cloud learns about the instance without waiting for
-// the next 10s timer tick).
+// `enableRemote` is idempotent/coalescing and is called from `/remote`, the
+// explicit `kilo remote` command, and bootstrap auto-enable (`KILO_REMOTE=1` /
+// `remote_control`). Every successful entry must ensure a default instance
+// advertisement (including the already-connected early return — the common
+// `/remote`-after-auto-enable path). Explicit `setInstanceAdvertisement`
+// keeps replace semantics and fires one out-of-band heartbeat per set when
+// connected; `enableRemote` with an ad already set is a no-op (no extra HB).
 
-describe("KiloSessions.setInstanceAdvertisement (K1 W1)", () => {
+describe("KiloSessions.setInstanceAdvertisement (K1 W1 / DEF-1)", () => {
   let heartbeatCalls = 0
   let outOfBand: Promise<void> | undefined
 
@@ -375,27 +374,51 @@ describe("KiloSessions.setInstanceAdvertisement (K1 W1)", () => {
     return getSessions as () => Promise<RemoteProtocol.Heartbeat>
   }
 
-  test("flag is unset by default — heartbeats omit `instance`", async () => {
+  test("enableRemote alone advertises the instance (covers /remote and auto-enable)", async () => {
     await using tmp = await tmpdir({ git: true })
     await provide({
       directory: tmp.path,
       fn: async () => {
+        // Contract: enableRemote entry with none set → derive and set.
+        // No prior setInstanceAdvertisement (simulates /remote or auto-enable).
         await KiloSessions.enableRemote()
         const payload = await capturedGetSessions()()
         expect(payload.type).toBe("heartbeat")
-        expect(payload.instance).toBeUndefined()
+        expect(payload.instance).toBeDefined()
+        expect(payload.instance!.projectName.length).toBeGreaterThan(0)
+        expect(payload.instance!.name.length).toBeGreaterThan(0)
       },
     })
   })
 
-  test("setting the flag makes the next getSessions include `instance` (race: setter after enable)", async () => {
+  test("enableRemote after already connected is a no-op for advertisement (no extra heartbeat)", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        // Auto-enable connects first and advertises.
+        await KiloSessions.enableRemote()
+        const first = await capturedGetSessions()()
+        expect(first.instance).toBeDefined()
+        const before = heartbeatCalls
+        // /remote calls enableRemote again; already-connected early return must
+        // not re-set or fire an extra out-of-band heartbeat.
+        await KiloSessions.enableRemote()
+        expect(heartbeatCalls).toBe(before)
+        const second = await capturedGetSessions()()
+        expect(second.instance).toEqual(first.instance)
+      },
+    })
+  })
+
+  test("explicit set after enable replaces the payload (kilo remote race)", async () => {
     await using tmp = await tmpdir({ git: true })
     await provide({
       directory: tmp.path,
       fn: async () => {
         await KiloSessions.enableRemote()
-        // Race: the explicit `kilo remote` command now sets the flag, after
-        // `enableRemote` already coalesced with bootstrap auto-enable.
+        // Explicit set keeps replace semantics even when enableRemote already
+        // derived a default advertisement.
         KiloSessions.setInstanceAdvertisement({
           name: "mbp-igor",
           projectName: "cloud",
@@ -414,11 +437,10 @@ describe("KiloSessions.setInstanceAdvertisement (K1 W1)", () => {
       directory: tmp.path,
       fn: async () => {
         await KiloSessions.enableRemote()
-        const beforePayload = await capturedGetSessions()()
-        expect(beforePayload.instance).toBeUndefined()
+        // enableRemote already set a default ad; explicit set replaces and fires
+        // exactly one out-of-band heartbeat.
         const beforeHeartbeatCalls = heartbeatCalls
         KiloSessions.setInstanceAdvertisement({ name: "h", projectName: "p" })
-        // The setter fires one out-of-band heartbeat — wait for it.
         await outOfBand
         expect(heartbeatCalls).toBe(beforeHeartbeatCalls + 1)
         const afterPayload = await capturedGetSessions()()
@@ -427,7 +449,7 @@ describe("KiloSessions.setInstanceAdvertisement (K1 W1)", () => {
     })
   })
 
-  test("setter is idempotent — second call replaces the payload and still fires one out-of-band heartbeat", async () => {
+  test("setter replaces payload and fires one out-of-band heartbeat per call", async () => {
     await using tmp = await tmpdir({ git: true })
     await provide({
       directory: tmp.path,
@@ -445,6 +467,38 @@ describe("KiloSessions.setInstanceAdvertisement (K1 W1)", () => {
     })
   })
 
+  test("explicit set before enableRemote is preserved (no re-set on enable)", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        // Contract: set before connect → flag stored; enable must not replace.
+        KiloSessions.setInstanceAdvertisement({ name: "pre-set", projectName: "proj", version: "9.9.9" })
+        await KiloSessions.enableRemote()
+        const payload = await capturedGetSessions()()
+        expect(payload.instance).toEqual({ name: "pre-set", projectName: "proj", version: "9.9.9" })
+      },
+    })
+  })
+
+  test("disableRemote does not clear the advertisement flag", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        await KiloSessions.enableRemote()
+        const before = await capturedGetSessions()()
+        expect(before.instance).toBeDefined()
+        KiloSessions.disableRemote()
+        // Re-enable: ensureDefault must no-op (flag still set), and the new
+        // connection's getSessions must still carry the same advertisement.
+        await KiloSessions.enableRemote()
+        const after = await capturedGetSessions()()
+        expect(after.instance).toEqual(before.instance)
+      },
+    })
+  })
+
   test("per-session platform resolution matches meta() order — env var fallback", async () => {
     // The getSessions closure's platform field is computed as:
     //   KiloSession.resolvePlatform(id) || process.env["KILO_PLATFORM"] || "cli"
@@ -577,19 +631,22 @@ describe("KiloSessions.detachRemoteSession heartbeat fence (K1 W1)", () => {
     return chat.id
   }
 
-  for (const { label, status } of [
-    { label: "busy", status: { type: "busy" as const } },
+  for (const { label, status, heartbeatStatus } of [
+    { label: "busy", status: { type: "busy" as const }, heartbeatStatus: "busy" },
     {
       label: "retry",
       status: { type: "retry" as const, attempt: 1, message: "retrying", next: 100 },
+      heartbeatStatus: "retry",
     },
     {
+      // SessionStatus.offline maps to heartbeat "retry" (same as deriveStatus).
       label: "offline",
       status: {
         type: "offline" as const,
         requestID: QuestionID.ascending(),
         message: "waiting for user",
       },
+      heartbeatStatus: "retry",
     },
   ]) {
     test(`clears ${label} SessionStatus so the detach heartbeat fence resolves`, async () => {
@@ -607,7 +664,7 @@ describe("KiloSessions.detachRemoteSession heartbeat fence (K1 W1)", () => {
 
           const getSessions = capturedGetSessions()
           const before = await getSessions()
-          expect(before.sessions.some((s) => s.id === id && s.status === label)).toBe(true)
+          expect(before.sessions.some((s) => s.id === id && s.status === heartbeatStatus)).toBe(true)
 
           await KiloSessions.detachRemoteSession(id)
 
@@ -621,3 +678,308 @@ describe("KiloSessions.detachRemoteSession heartbeat fence (K1 W1)", () => {
     }, 30000)
   }
 })
+
+// DEF-3 part 1: heartbeat per-session status must reflect pending
+// question/permission (same precedence as deriveStatus), with Permission and
+// Question list() called once per heartbeat — not once per session.
+describe("KiloSessions heartbeat attention status (DEF-3)", () => {
+  beforeEach(() => {
+    process.env["KILO_DISABLE_SESSION_INGEST"] = "0"
+    delete process.env["KILO_SESSION_INGEST_URL"]
+    process.env["KILO_API_KEY"] = "tok"
+    reset("tok")
+    KiloSessions.resetInstanceAdvertisementForTests()
+
+    spyOn(RemoteSender, "create").mockImplementation(
+      () =>
+        ({
+          handle() {},
+          dispose() {},
+        }) as RemoteSender.Sender,
+    )
+    spyOn(RemoteWS, "connect").mockImplementation(
+      (options) =>
+        ({
+          connectionId: "test-conn",
+          send() {},
+          heartbeat: () => options.getSessions().then(() => undefined),
+          close() {},
+          get connected() {
+            return true
+          },
+        }) as RemoteWS.Connection,
+    )
+
+    clearInFlightCache("kilo-sessions:token")
+    clearInFlightCache("kilo-sessions:token-valid:tok")
+
+    globalThis.fetch = mock(async (input) => {
+      const url = String(input)
+      if (url.endsWith("/api/user")) {
+        return new Response(null, { status: 200 })
+      }
+      if (url.endsWith("/api/session")) {
+        return Response.json({ id: "remote-test", ingestPath: "/api/ingest/test" })
+      }
+      throw new Error(`unexpected fetch in test: ${url}`)
+    }) as unknown as typeof fetch
+  })
+
+  afterEach(async () => {
+    const pub = spyOn(Bus, "publish").mockResolvedValue(undefined as never)
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        KiloSessions.disableRemote()
+      },
+    })
+    pub.mockRestore()
+    mock.restore()
+    delete process.env["KILO_DISABLE_SESSION_INGEST"]
+    delete process.env["KILO_SESSION_INGEST_URL"]
+    delete process.env["KILO_PLATFORM"]
+    delete process.env["KILO_API_KEY"]
+    reset("tok")
+  })
+
+  function capturedGetSessions(): () => Promise<RemoteProtocol.Heartbeat> {
+    const calls = (RemoteWS.connect as unknown as { mock: { calls: { 0: RemoteWS.Options }[] } }).mock.calls
+    const getSessions = calls[0]?.[0].getSessions
+    if (!getSessions) throw new Error("RemoteWS.connect was not called")
+    return getSessions as () => Promise<RemoteProtocol.Heartbeat>
+  }
+
+  async function setupSession() {
+    const { AppRuntime } = await import("@/effect/app-runtime")
+    const { Session } = await import("@/session/session")
+    const chat = await AppRuntime.runPromise(Session.Service.use((svc) => svc.create({})))
+    return chat.id
+  }
+
+  const questionPrompt = [
+    {
+      header: "Continue?",
+      question: "Should I continue?",
+      options: [
+        { label: "Yes", description: "Go" },
+        { label: "No", description: "Stop" },
+      ],
+    },
+  ]
+
+  async function waitForPermission(sessionID: string) {
+    const { AppRuntime } = await import("@/effect/app-runtime")
+    const { Permission } = await import("@/permission")
+    for (let i = 0; i < 50; i++) {
+      const pending = await AppRuntime.runPromise(Permission.Service.use((svc) => svc.list()))
+      if (pending.some((p) => p.sessionID === sessionID)) return
+      await new Promise((r) => setTimeout(r, 10))
+    }
+    throw new Error(`timed out waiting for permission on ${sessionID}`)
+  }
+
+  async function waitForQuestion(sessionID: string) {
+    const { AppRuntime } = await import("@/effect/app-runtime")
+    const { Question } = await import("@/question")
+    for (let i = 0; i < 50; i++) {
+      const pending = await AppRuntime.runPromise(Question.Service.use((svc) => svc.list()))
+      if (pending.some((q) => q.sessionID === sessionID)) return
+      await new Promise((r) => setTimeout(r, 10))
+    }
+    throw new Error(`timed out waiting for question on ${sessionID}`)
+  }
+
+  test("reports permission when a permission request is pending", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        await KiloSessions.enableRemote()
+        const id = await setupSession()
+        await KiloSessions.attachRemoteSession(id)
+
+        const { AppRuntime } = await import("@/effect/app-runtime")
+        const { Permission } = await import("@/permission")
+        const { PermissionV1 } = await import("@opencode-ai/core/v1/permission")
+        const requestID = PermissionV1.ID.make("permission_hb_perm")
+
+        AppRuntime.runFork(
+          Permission.Service.use((svc) =>
+            svc.ask({
+              id: requestID,
+              sessionID: id,
+              permission: "bash",
+              patterns: ["ls"],
+              metadata: {},
+              always: [],
+              ruleset: [],
+            }),
+          ),
+        )
+        await waitForPermission(id)
+
+        const payload = await capturedGetSessions()()
+        expect(payload.sessions.some((s) => s.id === id && s.status === "permission")).toBe(true)
+
+        await AppRuntime.runPromise(Permission.Service.use((svc) => svc.reply({ requestID, reply: "once" })))
+      },
+    })
+  }, 30000)
+
+  test("reports question when a structured question is pending", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        await KiloSessions.enableRemote()
+        const id = await setupSession()
+        await KiloSessions.attachRemoteSession(id)
+
+        const { AppRuntime } = await import("@/effect/app-runtime")
+        const { Question } = await import("@/question")
+
+        AppRuntime.runFork(Question.Service.use((svc) => svc.ask({ sessionID: id, questions: questionPrompt })))
+        await waitForQuestion(id)
+
+        const payload = await capturedGetSessions()()
+        expect(payload.sessions.some((s) => s.id === id && s.status === "question")).toBe(true)
+
+        const pending = await AppRuntime.runPromise(Question.Service.use((svc) => svc.list()))
+        const req = pending.find((q) => q.sessionID === id)
+        expect(req).toBeDefined()
+        await AppRuntime.runPromise(Question.Service.use((svc) => svc.reject(req!.id)))
+      },
+    })
+  }, 30000)
+
+  test("permission takes precedence over question", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        await KiloSessions.enableRemote()
+        const id = await setupSession()
+        await KiloSessions.attachRemoteSession(id)
+
+        const { AppRuntime } = await import("@/effect/app-runtime")
+        const { Permission } = await import("@/permission")
+        const { Question } = await import("@/question")
+        const { PermissionV1 } = await import("@opencode-ai/core/v1/permission")
+        const requestID = PermissionV1.ID.make("permission_hb_both")
+
+        AppRuntime.runFork(Question.Service.use((svc) => svc.ask({ sessionID: id, questions: questionPrompt })))
+        AppRuntime.runFork(
+          Permission.Service.use((svc) =>
+            svc.ask({
+              id: requestID,
+              sessionID: id,
+              permission: "bash",
+              patterns: ["ls"],
+              metadata: {},
+              always: [],
+              ruleset: [],
+            }),
+          ),
+        )
+        await waitForPermission(id)
+        await waitForQuestion(id)
+
+        const payload = await capturedGetSessions()()
+        expect(payload.sessions.some((s) => s.id === id && s.status === "permission")).toBe(true)
+
+        await AppRuntime.runPromise(Permission.Service.use((svc) => svc.reply({ requestID, reply: "once" })))
+        const pending = await AppRuntime.runPromise(Question.Service.use((svc) => svc.list()))
+        const req = pending.find((q) => q.sessionID === id)
+        if (req) await AppRuntime.runPromise(Question.Service.use((svc) => svc.reject(req.id)))
+      },
+    })
+  }, 30000)
+
+  test("idle/busy/retry unchanged when no attention is pending", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        await KiloSessions.enableRemote()
+        const idleId = await setupSession()
+        const busyId = await setupSession()
+        const retryId = await setupSession()
+
+        const { AppRuntime } = await import("@/effect/app-runtime")
+        await AppRuntime.runPromise(SessionStatus.Service.use((svc) => svc.set(busyId, { type: "busy" })))
+        await AppRuntime.runPromise(
+          SessionStatus.Service.use((svc) =>
+            svc.set(retryId, { type: "retry", attempt: 1, message: "retrying", next: 100 }),
+          ),
+        )
+
+        await KiloSessions.attachRemoteSession(idleId)
+        await KiloSessions.attachRemoteSession(busyId)
+        await KiloSessions.attachRemoteSession(retryId)
+
+        const payload = await capturedGetSessions()()
+        const byId = Object.fromEntries(payload.sessions.map((s) => [s.id, s.status]))
+        expect(byId[idleId]).toBe("idle")
+        expect(byId[busyId]).toBe("busy")
+        expect(byId[retryId]).toBe("retry")
+      },
+    })
+  }, 30000)
+
+  test("Permission and Question list() are called once per heartbeat across many sessions", async () => {
+    await using tmp = await tmpdir({ git: true })
+    await provide({
+      directory: tmp.path,
+      fn: async () => {
+        await KiloSessions.enableRemote()
+        for (let i = 0; i < 4; i++) {
+          const id = await setupSession()
+          await KiloSessions.attachRemoteSession(id)
+        }
+
+        const { AppRuntime } = await import("@/effect/app-runtime")
+        const { Permission } = await import("@/permission")
+        const { Question } = await import("@/question")
+
+        // list is readonly on the interface; cast to count calls in place.
+        type ListBag = { list: () => unknown }
+        const permSvc = (await AppRuntime.runPromise(
+          Permission.Service.use((svc) => Effect.succeed(svc)),
+        )) as unknown as ListBag
+        const qSvc = (await AppRuntime.runPromise(
+          Question.Service.use((svc) => Effect.succeed(svc)),
+        )) as unknown as ListBag
+
+        let permissionListCalls = 0
+        let questionListCalls = 0
+        const origPermList = permSvc.list.bind(permSvc)
+        const origQList = qSvc.list.bind(qSvc)
+        permSvc.list = () => {
+          permissionListCalls += 1
+          return origPermList()
+        }
+        qSvc.list = () => {
+          questionListCalls += 1
+          return origQList()
+        }
+
+        try {
+          await capturedGetSessions()()
+          // Once per heartbeat, not once per session (4 sessions attached).
+          expect(permissionListCalls).toBe(1)
+          expect(questionListCalls).toBe(1)
+
+          permissionListCalls = 0
+          questionListCalls = 0
+          await capturedGetSessions()()
+          expect(permissionListCalls).toBe(1)
+          expect(questionListCalls).toBe(1)
+        } finally {
+          permSvc.list = origPermList
+          qSvc.list = origQList
+        }
+      },
+    })
+  }, 30000)
+})
diff --git a/packages/opencode/test/kilocode/permission/external-directory-allow.test.ts b/packages/opencode/test/kilocode/permission/external-directory-allow.test.ts
index 3a981cc1dc0..5d395c9c315 100644
--- a/packages/opencode/test/kilocode/permission/external-directory-allow.test.ts
+++ b/packages/opencode/test/kilocode/permission/external-directory-allow.test.ts
@@ -14,7 +14,7 @@ import { PermissionV1 } from "@opencode-ai/core/v1/permission"
 import { Database } from "@opencode-ai/core/database/database"
 import { provideTestInstance } from "../../fixture/fixture"
 import { MessageID, SessionID } from "../../../src/session/schema"
-import { Shell } from "../../../src/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { Truncate } from "../../../src/tool/truncate"
 import { ShellTool } from "../../../src/tool/shell"
 import { Plugin } from "../../../src/plugin"
diff --git a/packages/opencode/test/kilocode/prompt-dismiss-contract.test.ts b/packages/opencode/test/kilocode/prompt-dismiss-contract.test.ts
index abcad3f51ad..a70a59928d1 100644
--- a/packages/opencode/test/kilocode/prompt-dismiss-contract.test.ts
+++ b/packages/opencode/test/kilocode/prompt-dismiss-contract.test.ts
@@ -30,19 +30,16 @@ describe("prompt.ts Kilo-specific invariants", () => {
     expect(content).toContain("Suggestion.dismissAll")
   })
 
-  test("dismissAll for suggestions and questions runs before enqueue, without cancelling the in-flight fiber", () => {
+  test("enqueue reserves the follow-up before dismissing blockers, without cancelling the in-flight fiber", () => {
     const content = fs.readFileSync(PROMPT_FILE, "utf-8")
-    // dismissAll for both suggestions and questions must precede the enqueue so
-    // an in-flight handle.process blocked on a pending tool prompt can return.
-    // Critically, the block must NOT call state.cancel or KiloSessionPromptQueue.reserve —
-    // either of those would abort the running streamText mid-tokens, which was
-    // the #9332 regression. Order: dismissAll(Suggestion), question.dismissAll, enqueue.
+    // Register the queued follow-up before dismissing blockers so the old turn
+    // observes hasFollowup when the question resumes. The enqueue reservation
+    // runs both dismissals before waiting for the prior queue tail.
     const block = content.match(
-      /kilocode_change start[^\n]*unblock tools[\s\S]*?Suggestion\.dismissAll[\s\S]*?question\.dismissAll[\s\S]*?KiloSessionPromptQueue\.enqueue/,
+      /kilocode_change start[^\n]*register the queued follow-up[\s\S]*?Suggestion\.dismissAll[\s\S]*?question\.dismissAll[\s\S]*?KiloSessionPromptQueue\.enqueue\([\s\S]*?dismiss/,
     )
     expect(block).not.toBeNull()
     expect(content).not.toMatch(/state\.cancel\(input\.sessionID\)/)
-    expect(content).not.toMatch(/KiloSessionPromptQueue\.reserve/)
   })
 
   test("runLoop breaks out between LLM steps when a newer prompt was enqueued", () => {
diff --git a/packages/opencode/test/kilocode/provider-saved-auth.test.ts b/packages/opencode/test/kilocode/provider-saved-auth.test.ts
new file mode 100644
index 00000000000..6391d69cc24
--- /dev/null
+++ b/packages/opencode/test/kilocode/provider-saved-auth.test.ts
@@ -0,0 +1,78 @@
+import { expect } from "bun:test"
+import { Effect } from "effect"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { Provider } from "../../src/provider/provider"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(Provider.defaultLayer)
+
+const auth = <A, E, R>(value: Record<string, unknown>, effect: Effect.Effect<A, E, R>) =>
+  Effect.acquireUseRelease(
+    Effect.sync(() => {
+      const previous = process.env.KILO_AUTH_CONTENT
+      process.env.KILO_AUTH_CONTENT = JSON.stringify(value)
+      return previous
+    }),
+    () => effect,
+    (previous) =>
+      Effect.sync(() => {
+        if (previous === undefined) delete process.env.KILO_AUTH_CONTENT
+        else process.env.KILO_AUTH_CONTENT = previous
+      }),
+  )
+
+it.instance(
+  "uses saved Azure resource metadata",
+  () =>
+    auth(
+      { azure: { type: "api", key: "azure-key", metadata: { resourceName: "saved-resource" } } },
+      Effect.gen(function* () {
+        const provider = yield* Provider.Service
+        const item = (yield* provider.list())[ProviderV2.ID.make("azure")]
+        expect(item.key).toBe("azure-key")
+        expect(item.options.resourceName).toBe("saved-resource")
+      }),
+    ),
+  { config: {} },
+)
+
+it.instance(
+  "uses saved GitLab OAuth access",
+  () =>
+    auth(
+      { gitlab: { type: "oauth", refresh: "refresh", access: "oauth-access", expires: Date.now() + 60_000 } },
+      Effect.gen(function* () {
+        const provider = yield* Provider.Service
+        const item = (yield* provider.list())[ProviderV2.ID.make("gitlab")]
+        expect(item.options.apiKey).toBe("oauth-access")
+      }),
+    ),
+  { config: {} },
+)
+
+it.instance(
+  "uses saved Cloudflare Workers AI account metadata",
+  () =>
+    auth(
+      {
+        "cloudflare-workers-ai": {
+          type: "api",
+          key: "cloudflare-key",
+          metadata: { accountId: "saved-account" },
+        },
+      },
+      Effect.gen(function* () {
+        const provider = yield* Provider.Service
+        const item = (yield* provider.list())[ProviderV2.ID.make("cloudflare-workers-ai")]
+        expect(item.key).toBe("cloudflare-key")
+        expect(item.options.apiKey).toBe("cloudflare-key")
+        const model = Object.values(item.models)[0]
+        const language = yield* provider.getLanguage(model)
+        const url = (
+          language as unknown as { config: { url: (input: { path: string; modelId: string }) => string } }
+        ).config.url({ path: "/chat/completions", modelId: model.id })
+        expect(url).toBe("https://api.cloudflare.com/client/v4/accounts/saved-account/ai/v1/chat/completions")
+      }),
+    ),
+  { config: {} },
+)
diff --git a/packages/opencode/test/kilocode/provider/first-byte.test.ts b/packages/opencode/test/kilocode/provider/first-byte.test.ts
new file mode 100644
index 00000000000..5045032abc5
--- /dev/null
+++ b/packages/opencode/test/kilocode/provider/first-byte.test.ts
@@ -0,0 +1,84 @@
+import { describe, expect, test } from "bun:test"
+import { requestTimeout, wrapFirstByte, REQUEST_TIMEOUT_MS } from "../../../src/kilocode/provider/provider"
+import { ProviderError } from "../../../src/provider/error"
+
+const sse = (body: BodyInit | null) =>
+  new Response(body, { headers: { "content-type": "text/event-stream" }, status: 200 })
+
+// A body that delivers `head` immediately, then stays silent forever.
+const stalling = (head?: string) =>
+  new ReadableStream<Uint8Array>({
+    start(ctrl) {
+      if (head) ctrl.enqueue(new TextEncoder().encode(head))
+    },
+  })
+
+const drain = async (res: Response) => {
+  const reader = res.body!.getReader()
+  const out: string[] = []
+  while (true) {
+    const part = await reader.read()
+    if (part.done) return out.join("")
+    out.push(new TextDecoder().decode(part.value))
+  }
+}
+
+describe("requestTimeout", () => {
+  test("defaults to the shared request timeout", () => {
+    expect(requestTimeout({})).toBe(REQUEST_TIMEOUT_MS)
+  })
+
+  test("honours an explicit value, disables only on false, and bounds invalid input", () => {
+    expect(requestTimeout({ timeout: 1234 })).toBe(1234)
+    expect(requestTimeout({ timeout: false })).toBeUndefined()
+    // invalid/unset values fall back to the default so the wait is always bounded
+    expect(requestTimeout({ timeout: 0 })).toBe(REQUEST_TIMEOUT_MS)
+    expect(requestTimeout({ timeout: -1 })).toBe(REQUEST_TIMEOUT_MS)
+    expect(requestTimeout({ timeout: "nope" })).toBe(REQUEST_TIMEOUT_MS)
+    expect(requestTimeout({ timeout: null })).toBe(REQUEST_TIMEOUT_MS)
+  })
+})
+
+describe("wrapFirstByte", () => {
+  test("fails when the body never produces a byte", async () => {
+    const ctl = new AbortController()
+    const res = wrapFirstByte(sse(stalling()), 100, ctl)
+
+    await expect(drain(res)).rejects.toBeInstanceOf(ProviderError.ResponseStreamError)
+    expect(ctl.signal.aborted).toBe(true)
+    expect((ctl.signal.reason as Error).message).toContain("no response data within 100ms")
+  })
+
+  test("stays a passthrough once the first byte arrived, even if the stream then stalls", async () => {
+    const ctl = new AbortController()
+    const res = wrapFirstByte(sse(stalling("data: hello\n\n")), 100, ctl)
+    const reader = res.body!.getReader()
+
+    const first = await reader.read()
+    expect(new TextDecoder().decode(first.value)).toBe("data: hello\n\n")
+
+    // the guard must not arm again: idle gaps mid-stream stay opt-in (chunkTimeout)
+    const next = await Promise.race([
+      reader.read().then(() => "chunk"),
+      new Promise((resolve) => setTimeout(() => resolve("still-waiting"), 300)),
+    ])
+    expect(next).toBe("still-waiting")
+    expect(ctl.signal.aborted).toBe(false)
+    await reader.cancel("done")
+  })
+
+  test("passes a complete body through untouched", async () => {
+    const ctl = new AbortController()
+    const res = wrapFirstByte(sse("data: one\n\ndata: two\n\n"), 1_000, ctl)
+    expect(await drain(res)).toBe("data: one\n\ndata: two\n\n")
+    expect(ctl.signal.aborted).toBe(false)
+  })
+
+  test("is a no-op without a body or when disabled", () => {
+    const ctl = new AbortController()
+    const empty = new Response(null, { status: 204 })
+    expect(wrapFirstByte(empty, 100, ctl)).toBe(empty)
+    const res = sse("data: x\n\n")
+    expect(wrapFirstByte(res, 0, ctl)).toBe(res)
+  })
+})
diff --git a/packages/opencode/test/kilocode/sandbox/session.test.ts b/packages/opencode/test/kilocode/sandbox/session.test.ts
index 07c87781f27..bc7d5d961ea 100644
--- a/packages/opencode/test/kilocode/sandbox/session.test.ts
+++ b/packages/opencode/test/kilocode/sandbox/session.test.ts
@@ -20,7 +20,7 @@ import { SandboxStore } from "@/kilocode/sandbox/store"
 import type { SessionID } from "@/session/schema"
 import { Session } from "@/session/session"
 import { SessionStatus } from "@/session/status"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { Storage } from "@/storage/storage"
 import { SyncEvent } from "@/sync"
 import { provideInstance, testInstanceStoreLayer, tmpdirScoped } from "../../fixture/fixture"
diff --git a/packages/opencode/test/kilocode/session-prompt-steering.test.ts b/packages/opencode/test/kilocode/session-prompt-steering.test.ts
new file mode 100644
index 00000000000..dda61d2d024
--- /dev/null
+++ b/packages/opencode/test/kilocode/session-prompt-steering.test.ts
@@ -0,0 +1,209 @@
+import path from "path"
+import { afterAll, beforeAll, expect, test } from "bun:test"
+import fs from "fs/promises"
+import os from "os"
+import { Effect } from "effect"
+import { Flag } from "@opencode-ai/core/flag/flag"
+import { AppRuntime } from "../../src/effect/app-runtime"
+import { MessageV2 } from "../../src/session/message-v2"
+import { Session } from "../../src/session/session"
+import { SessionPrompt } from "../../src/session/prompt"
+import { SessionID } from "../../src/session/schema"
+import {
+  provideTestInstance,
+  disposeTestRuntime,
+  provideInstance,
+  testInstanceStoreLayer,
+  tmpdir,
+} from "../fixture/fixture"
+import { remove as cleanup } from "./cleanup"
+
+const previous = Flag.KILO_DB
+const dbfile = path.join(os.tmpdir(), `kilo-prompt-steering-${process.pid}-${crypto.randomUUID()}.db`)
+
+beforeAll(async () => {
+  await fs.rm(dbfile, { force: true })
+  Flag.KILO_DB = dbfile
+})
+
+afterAll(async () => {
+  await AppRuntime.dispose()
+  await disposeTestRuntime()
+  Flag.KILO_DB = previous
+  await Promise.all([dbfile, `${dbfile}-wal`, `${dbfile}-shm`].map(cleanup))
+})
+
+function line(input: unknown) {
+  return `data: ${JSON.stringify(input)}\n\n`
+}
+
+function chunk(input: { delta?: Record<string, unknown>; finish?: string }) {
+  return {
+    id: "chatcmpl-steering-test",
+    object: "chat.completion.chunk",
+    choices: [{ delta: input.delta ?? {}, ...(input.finish ? { finish_reason: input.finish } : {}) }],
+  }
+}
+
+function response(input: string) {
+  return new ReadableStream<Uint8Array>({
+    start(ctrl) {
+      ctrl.enqueue(
+        new TextEncoder().encode(
+          [
+            line(chunk({ delta: { role: "assistant" } })),
+            line(chunk({ delta: { content: input } })),
+            line(chunk({ finish: "stop" })),
+            "data: [DONE]\n\n",
+          ].join(""),
+        ),
+      )
+      ctrl.close()
+    },
+  })
+}
+
+function question() {
+  const args = JSON.stringify({
+    questions: [
+      {
+        header: "Redirect",
+        question: "Continue the old task?",
+        options: [{ label: "Yes", description: "Continue" }],
+      },
+    ],
+  })
+  return new ReadableStream<Uint8Array>({
+    start(ctrl) {
+      ctrl.enqueue(
+        new TextEncoder().encode(
+          [
+            line(
+              chunk({
+                delta: {
+                  role: "assistant",
+                  tool_calls: [
+                    {
+                      index: 0,
+                      id: "call-question",
+                      type: "function",
+                      function: { name: "question", arguments: args },
+                    },
+                  ],
+                },
+              }),
+            ),
+            line(chunk({ finish: "tool_calls" })),
+            "data: [DONE]\n\n",
+          ].join(""),
+        ),
+      )
+      ctrl.close()
+    },
+  })
+}
+
+const sessions = {
+  create: (input: Parameters<Session.Interface["create"]>[0]) =>
+    Effect.runPromise(Session.Service.use((svc) => svc.create(input)).pipe(Effect.provide(Session.defaultLayer))),
+  messages: (sessionID: SessionID) =>
+    Effect.runPromise(
+      Session.Service.use((svc) => svc.messages({ sessionID })).pipe(Effect.provide(Session.defaultLayer)),
+    ),
+}
+
+async function wait(sessionID: SessionID) {
+  const deadline = Date.now() + 30_000
+  while (Date.now() < deadline) {
+    const msgs = await sessions.messages(sessionID)
+    if (
+      msgs.some((msg) =>
+        msg.parts.some((part) => part.type === "tool" && part.tool === "question" && part.state.status === "running"),
+      )
+    )
+      return
+    await Bun.sleep(20)
+  }
+  throw new Error("question tool did not become pending")
+}
+
+function scoped<T>(dir: string, fn: (prompt: SessionPrompt.Interface) => Promise<T>) {
+  return Effect.runPromise(
+    SessionPrompt.Service.use((prompt) => Effect.promise(() => fn(prompt))).pipe(
+      Effect.provide(SessionPrompt.defaultLayer),
+      provideInstance(dir),
+      Effect.provide(testInstanceStoreLayer),
+      Effect.scoped,
+    ),
+  )
+}
+
+function tail(body: Record<string, unknown>): { role: string; content: unknown } | undefined {
+  const msgs = Array.isArray(body.messages) ? (body.messages as Array<Record<string, unknown>>) : []
+  const item = msgs.findLast((msg) => msg.role !== "system")
+  if (!item || typeof item.role !== "string") return
+  return { role: item.role, content: item.content }
+}
+
+test("runs queued steering before resuming a dismissed question turn", async () => {
+  const calls: Array<Record<string, unknown>> = []
+  const server = Bun.serve({
+    port: 0,
+    async fetch(req) {
+      if (!new URL(req.url).pathname.endsWith("/chat/completions")) return new Response("not found", { status: 404 })
+      calls.push((await req.json()) as Record<string, unknown>)
+      return new Response(calls.length === 1 ? question() : response("steering acknowledged"), {
+        status: 200,
+        headers: { "Content-Type": "text/event-stream" },
+      })
+    },
+  })
+
+  try {
+    await using tmp = await tmpdir({
+      git: true,
+      init: async (dir) =>
+        Bun.write(
+          path.join(dir, "opencode.json"),
+          JSON.stringify({
+            enabled_providers: ["alibaba"],
+            provider: { alibaba: { options: { apiKey: "test-key", baseURL: `${server.url.origin}/v1` } } },
+            agent: { code: { model: "alibaba/qwen-plus" } },
+          }),
+        ),
+    })
+    await provideTestInstance({
+      directory: tmp.path,
+      fn: () =>
+        scoped(tmp.path, async (prompt) => {
+          const session = await sessions.create({ title: "Queued steering regression" })
+          const first = Effect.runPromise(
+            prompt.prompt({
+              sessionID: session.id,
+              agent: "code",
+              parts: [{ type: "text", text: "perform the old task" }],
+            }),
+          )
+          await wait(session.id)
+          const second = Effect.runPromise(
+            prompt.prompt({
+              sessionID: session.id,
+              agent: "code",
+              parts: [{ type: "text", text: "stop the old task and inspect the failing test" }],
+            }),
+          )
+          await first
+          const result = await second
+          expect(result.parts.some((part) => part.type === "text" && part.text.includes("steering acknowledged"))).toBe(
+            true,
+          )
+          expect(calls).toHaveLength(2)
+          expect(tail(calls[1]!)?.role).toBe("user")
+          expect(JSON.stringify(tail(calls[1]!)?.content)).toContain("stop the old task and inspect the failing test")
+          expect(JSON.stringify(tail(calls[1]!)?.content)).not.toContain("<system-reminder>")
+        }),
+    })
+  } finally {
+    server.stop(true)
+  }
+}, 60_000)
diff --git a/packages/opencode/test/kilocode/session/revert.test.ts b/packages/opencode/test/kilocode/session/revert.test.ts
index 02993284191..a2274bb55c9 100644
--- a/packages/opencode/test/kilocode/session/revert.test.ts
+++ b/packages/opencode/test/kilocode/session/revert.test.ts
@@ -1,16 +1,17 @@
 import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
+import { Effect, Exit, Layer } from "effect"
 import fs from "node:fs/promises"
 import path from "node:path"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { MessageV2 } from "@/session/message-v2"
+import { KiloSessionRevert } from "@/kilocode/session/revert"
 import { SessionRevert } from "@/session/revert"
 import { MessageID, PartID } from "@/session/schema"
 import { Session } from "@/session/session"
 import { Snapshot } from "@/snapshot"
-import { provideTmpdirInstance } from "../../fixture/fixture"
+import { provideInstance, provideTmpdirInstance } from "../../fixture/fixture"
 import { testEffect } from "../../lib/effect"
 
 const env = Layer.mergeAll(
@@ -20,6 +21,96 @@ const env = Layer.mergeAll(
   CrossSpawnSpawner.defaultLayer,
 )
 const it = testEffect(env)
+const guarded = process.platform === "win32" ? it.live.skip : it.live
+
+const setup = Effect.fnUntraced(function* (dir: string, deleted = false) {
+  const sessions = yield* Session.Service
+  const revert = yield* SessionRevert.Service
+  const snapshot = yield* Snapshot.Service
+  const session = yield* sessions.create({})
+  const locked = path.join(dir, "locked")
+  const protectedFile = path.join(locked, "protected.txt")
+  const writableFile = path.join(dir, "writable.txt")
+  const providerID = ProviderV2.ID.make("test")
+  yield* Effect.promise(() => fs.mkdir(locked))
+  yield* Effect.promise(() => fs.writeFile(protectedFile, "before"))
+  yield* Effect.promise(() => fs.writeFile(writableFile, "before"))
+  const user = yield* sessions.updateMessage({
+    id: MessageID.ascending(),
+    sessionID: session.id,
+    role: "user",
+    agent: "default",
+    model: { providerID, modelID: ModelV2.ID.make("test") },
+    time: { created: Date.now() },
+  })
+  yield* sessions.updatePart({
+    id: PartID.ascending(),
+    messageID: user.id,
+    sessionID: session.id,
+    type: "text",
+    text: "change both files",
+  })
+  const assistant = yield* sessions.updateMessage({
+    id: MessageID.ascending(),
+    sessionID: session.id,
+    role: "assistant",
+    parentID: user.id,
+    mode: "default",
+    agent: "default",
+    path: { cwd: dir, root: dir },
+    cost: 0,
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+    modelID: ModelV2.ID.make("test"),
+    providerID,
+    time: { created: Date.now() },
+    finish: "end_turn",
+  })
+  const before = yield* snapshot.track()
+  if (!before) throw new Error("expected snapshot")
+  if (deleted) yield* Effect.promise(() => fs.rm(protectedFile))
+  if (!deleted) yield* Effect.promise(() => fs.writeFile(protectedFile, "after"))
+  yield* Effect.promise(() => fs.writeFile(writableFile, "after"))
+  const after = yield* snapshot.track()
+  if (!after) throw new Error("expected snapshot")
+  const patch = yield* snapshot.patch(before)
+  yield* sessions.updatePart({
+    id: PartID.ascending(),
+    messageID: assistant.id,
+    sessionID: session.id,
+    type: "step-start",
+    snapshot: before,
+  })
+  yield* sessions.updatePart({
+    id: PartID.ascending(),
+    messageID: assistant.id,
+    sessionID: session.id,
+    type: "step-finish",
+    reason: "stop",
+    snapshot: after,
+    cost: 0,
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+  })
+  yield* sessions.updatePart({
+    id: PartID.ascending(),
+    messageID: assistant.id,
+    sessionID: session.id,
+    type: "patch",
+    hash: patch.hash,
+    files: patch.files,
+  })
+  return {
+    sessions,
+    revert,
+    snapshot,
+    session,
+    user,
+    after,
+    patch,
+    locked,
+    protected: protectedFile,
+    writable: writableFile,
+  }
+})
 
 describe("partial assistant revert", () => {
   it.live(
@@ -242,4 +333,133 @@ describe("workspace revert status", () => {
       { git: true },
     ),
   )
+
+  guarded(
+    "keeps the conversation and workspace unchanged when a checkpoint cannot be fully restored",
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const item = yield* setup(dir)
+          yield* Effect.promise(() => fs.chmod(item.protected, 0o444))
+          yield* Effect.promise(() => fs.chmod(item.locked, 0o555))
+          const outcome = yield* item.revert.revert({ sessionID: item.session.id, messageID: item.user.id }).pipe(
+            Effect.exit,
+            Effect.ensuring(
+              Effect.promise(async () => {
+                await fs.chmod(item.locked, 0o755)
+                await fs.chmod(item.protected, 0o644)
+              }),
+            ),
+          )
+          const current = yield* item.sessions.get(item.session.id)
+          const actual = {
+            failed: Exit.isFailure(outcome),
+            reverted: current.revert !== undefined,
+            protected: yield* Effect.promise(() => fs.readFile(item.protected, "utf8")),
+            writable: yield* Effect.promise(() => fs.readFile(item.writable, "utf8")),
+          }
+
+          expect(actual).toEqual({
+            failed: true,
+            reverted: false,
+            protected: "after",
+            writable: "after",
+          })
+        }),
+      { git: true },
+    ),
+    30_000,
+  )
+
+  guarded(
+    "keeps the reverted state when unrevert cannot fully restore files",
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const item = yield* setup(dir)
+          yield* item.revert.revert({ sessionID: item.session.id, messageID: item.user.id })
+          yield* Effect.promise(() => fs.chmod(item.protected, 0o444))
+          yield* Effect.promise(() => fs.chmod(item.locked, 0o555))
+          const outcome = yield* item.revert.unrevert({ sessionID: item.session.id }).pipe(
+            Effect.exit,
+            Effect.ensuring(
+              Effect.promise(async () => {
+                await fs.chmod(item.locked, 0o755)
+                await fs.chmod(item.protected, 0o644)
+              }),
+            ),
+          )
+          const current = yield* item.sessions.get(item.session.id)
+
+          expect({
+            failed: Exit.isFailure(outcome),
+            reverted: current.revert !== undefined,
+            protected: yield* Effect.promise(() => fs.readFile(item.protected, "utf8")),
+            writable: yield* Effect.promise(() => fs.readFile(item.writable, "utf8")),
+          }).toEqual({ failed: true, reverted: true, protected: "before", writable: "before" })
+        }),
+      { git: true },
+    ),
+    30_000,
+  )
+
+  guarded(
+    "keeps the prior revert when replacing its checkpoint cannot restore files",
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const item = yield* setup(dir)
+          yield* item.revert.revert({ sessionID: item.session.id, messageID: item.user.id })
+          yield* Effect.promise(() => fs.chmod(item.protected, 0o444))
+          yield* Effect.promise(() => fs.chmod(item.locked, 0o555))
+          const outcome = yield* item.revert.revert({ sessionID: item.session.id, messageID: item.user.id }).pipe(
+            Effect.exit,
+            Effect.ensuring(
+              Effect.promise(async () => {
+                await fs.chmod(item.locked, 0o755)
+                await fs.chmod(item.protected, 0o644)
+              }),
+            ),
+          )
+          const current = yield* item.sessions.get(item.session.id)
+
+          expect({
+            failed: Exit.isFailure(outcome),
+            reverted: current.revert !== undefined,
+            protected: yield* Effect.promise(() => fs.readFile(item.protected, "utf8")),
+            writable: yield* Effect.promise(() => fs.readFile(item.writable, "utf8")),
+          }).toEqual({ failed: true, reverted: true, protected: "before", writable: "before" })
+        }),
+      { git: true },
+    ),
+    30_000,
+  )
+
+  it.live(
+    "unreverts deleted files from a session rooted in a worktree subdirectory",
+    provideTmpdirInstance(
+      (root) =>
+        Effect.gen(function* () {
+          const dir = path.join(root, "nested")
+          yield* Effect.promise(() => fs.mkdir(dir))
+          const item = yield* setup(dir, true)
+          yield* item.revert.revert({ sessionID: item.session.id, messageID: item.user.id })
+          expect(yield* Effect.promise(() => fs.readFile(item.protected, "utf8"))).toBe("before")
+
+          yield* KiloSessionRevert.restore(item.snapshot, item.after, item.patch.files).pipe(provideInstance(dir))
+
+          expect(
+            yield* Effect.promise(() =>
+              fs.stat(item.protected).then(
+                () => true,
+                () => false,
+              ),
+            ),
+          ).toBe(false)
+          expect(yield* Effect.promise(() => fs.readFile(item.writable, "utf8"))).toBe("after")
+        }),
+      { git: true },
+    ),
+    30_000,
+  )
 })
diff --git a/packages/opencode/test/kilocode/sessions/ingest-drain.test.ts b/packages/opencode/test/kilocode/sessions/ingest-drain.test.ts
new file mode 100644
index 00000000000..d5a13b741c8
--- /dev/null
+++ b/packages/opencode/test/kilocode/sessions/ingest-drain.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, test } from "bun:test"
+import { IngestDrain } from "../../../src/kilo-sessions/ingest-drain"
+
+describe("IngestDrain once-guard", () => {
+  test("overlapping invocations share a single underlying drain call", async () => {
+    let calls = 0
+    let resolveDrain!: () => void
+    const gate = new Promise<void>((resolve) => {
+      resolveDrain = resolve
+    })
+
+    const drain = IngestDrain.create(async () => {
+      calls += 1
+      await gate
+    })
+
+    const first = drain()
+    const second = drain()
+    expect(calls).toBe(1)
+
+    resolveDrain()
+    await Promise.all([first, second])
+    expect(calls).toBe(1)
+
+    await drain()
+    expect(calls).toBe(1)
+  })
+
+  test("sequential calls after completion still run only once", async () => {
+    let calls = 0
+    const drain = IngestDrain.create(async () => {
+      calls += 1
+    })
+
+    await drain()
+    await drain()
+    await drain()
+    expect(calls).toBe(1)
+  })
+
+  test("underlying run() rejection resolves, logs once, and does not retry", async () => {
+    let calls = 0
+    const errors: unknown[] = []
+    const drain = IngestDrain.create(
+      async () => {
+        calls += 1
+        throw new Error("boom")
+      },
+      (err) => {
+        errors.push(err)
+      },
+    )
+
+    await expect(drain()).resolves.toBeUndefined()
+    await expect(drain()).resolves.toBeUndefined()
+    expect(calls).toBe(1)
+    expect(errors).toHaveLength(1)
+    expect(errors[0]).toBeInstanceOf(Error)
+    expect((errors[0] as Error).message).toBe("boom")
+  })
+})
diff --git a/packages/opencode/test/kilocode/sessions/ingest-queue.test.ts b/packages/opencode/test/kilocode/sessions/ingest-queue.test.ts
index 08cce19cd0c..f2ffb1e1926 100644
--- a/packages/opencode/test/kilocode/sessions/ingest-queue.test.ts
+++ b/packages/opencode/test/kilocode/sessions/ingest-queue.test.ts
@@ -467,4 +467,379 @@ describe("share ingest queue", () => {
     expect(payload.data.length).toBe(1)
     expect(payload.data[0].data.message).toBe("second")
   })
+
+  test("drain flushes every pending session and does not re-enqueue on failure", async () => {
+    const sent: { sessionId: string; body: unknown }[] = []
+    const sched = scheduler(() => clock.now)
+    let fail = false
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async (sessionId) => ({ ingestPath: `/ingest/${sessionId}` }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async (input, init) => {
+          const url = String(input)
+          const sessionId = url.includes("/s-a") ? "s-a" : "s-b"
+          sent.push({ sessionId, body: JSON.parse((init?.body as string) ?? "{}") })
+          if (fail) throw new Error("network")
+          return new Response("{}", { status: 200 })
+        },
+      }),
+    })
+
+    await q.sync("s-a", [{ type: "session", data: { id: "s-a", v: 1 } as any }])
+    await q.sync("s-b", [{ type: "session", data: { id: "s-b", v: 1 } as any }])
+    expect(sched.size()).toBe(2)
+
+    await q.drain()
+    await Bun.sleep(0)
+
+    expect(sent.length).toBe(2)
+    expect(sent.map((s) => s.sessionId).sort()).toEqual(["s-a", "s-b"])
+    expect(sched.size()).toBe(0)
+
+    // Failure path: drain POSTs once and does not re-enqueue for retry.
+    fail = true
+    clock.now = 5000
+    await q.sync("s-c", [{ type: "session", data: { id: "s-c", v: 1 } as any }])
+    await q.sync("s-d", [{ type: "session", data: { id: "s-d", v: 1 } as any }])
+    expect(sched.size()).toBe(2)
+
+    const before = sent.length
+    await q.drain()
+    await Bun.sleep(0)
+
+    expect(sent.length).toBe(before + 2)
+    expect(sched.size()).toBe(0)
+  })
+
+  test("drain does not re-enqueue on retryable HTTP status under shutdown", async () => {
+    const errors: Record<string, unknown>[] = []
+    const sched = scheduler(() => clock.now)
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: {
+        error: (_message, data) => {
+          errors.push(data)
+        },
+      },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async () => new Response("", { status: 429 }),
+      }),
+    })
+
+    await q.sync("s-429", [{ type: "session", data: { id: "s-429", v: 1 } as any }])
+    expect(sched.size()).toBe(1)
+
+    await q.drain()
+    await Bun.sleep(0)
+
+    // Shutdown path logs the retryable status and drops the item (no re-enqueue).
+    expect(errors.some((e) => e.status === 429 && e.shutdown === true)).toBe(true)
+    expect(sched.size()).toBe(0)
+  })
+
+  test("drain POSTs using cached client/share when resolution fails at teardown", async () => {
+    const urls: string[] = []
+    const sched = scheduler(() => clock.now)
+    let live = true
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async () => {
+        if (!live) return undefined
+        return { ingestPath: "/ingest" }
+      },
+      getClient: async () => {
+        if (!live) return undefined
+        return {
+          url: "https://ingest.test",
+          fetch: async (input) => {
+            urls.push(String(input))
+            return new Response("{}", { status: 200 })
+          },
+        }
+      },
+    })
+
+    // Prime cache with a successful flush.
+    await q.sync("s-cache", [{ type: "session", data: { id: "s-cache", v: 1 } as any }])
+    clock.now = 1000
+    sched.run()
+    await Bun.sleep(0)
+    expect(urls).toEqual(["https://ingest.test/ingest?v=2"])
+
+    // Queue a new item, then break resolution so drain must use the cache.
+    clock.now = 2000
+    await q.sync("s-cache", [{ type: "session", data: { id: "s-cache", v: 2 } as any }])
+    live = false
+
+    await q.drain()
+    await Bun.sleep(0)
+
+    expect(urls.length).toBe(2)
+    expect(urls[1]).toBe("https://ingest.test/ingest?v=2")
+    expect(sched.size()).toBe(0)
+  })
+
+  test("drain waits for in-flight flush when queue map is empty", async () => {
+    const sched = scheduler(() => clock.now)
+    let release!: () => void
+    const gate = new Promise<void>((resolve) => {
+      release = resolve
+    })
+    let started = false
+    let finished = false
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async () => {
+          started = true
+          await gate
+          finished = true
+          return new Response("{}", { status: 200 })
+        },
+      }),
+    })
+
+    await q.sync("s-inflight", [{ type: "session", data: { id: "s-inflight" } as any }])
+    clock.now = 1000
+    sched.run()
+    await Bun.sleep(0)
+    expect(started).toBe(true)
+    expect(finished).toBe(false)
+    expect(sched.size()).toBe(0)
+
+    const drained = q.drain()
+    let drainDone = false
+    void drained.then(() => {
+      drainDone = true
+    })
+
+    await Bun.sleep(0)
+    expect(drainDone).toBe(false)
+    expect(finished).toBe(false)
+
+    release()
+    await drained
+    await Bun.sleep(0)
+
+    expect(finished).toBe(true)
+    expect(drainDone).toBe(true)
+  })
+
+  test("drain suppresses re-enqueue when joined in-flight flush fails retryably", async () => {
+    const sched = scheduler(() => clock.now)
+    let release!: () => void
+    const gate = new Promise<void>((resolve) => {
+      release = resolve
+    })
+    let started = false
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async () => {
+          started = true
+          await gate
+          throw new Error("network")
+        },
+      }),
+    })
+
+    await q.sync("s-join-fail", [{ type: "session", data: { id: "s-join-fail" } as any }])
+    clock.now = 1000
+    sched.run()
+    await Bun.sleep(0)
+    expect(started).toBe(true)
+    expect(sched.size()).toBe(0)
+
+    const drained = q.drain()
+    await Bun.sleep(0)
+
+    release()
+    await drained
+    await Bun.sleep(0)
+
+    // Shutdown suppresses re-enqueue; queue and timers must be empty.
+    expect(sched.size()).toBe(0)
+  })
+
+  test("drain resolves when the bound expires on a never-settling flush", async () => {
+    const errors: { message: string; data: Record<string, unknown> }[] = []
+    const sched = scheduler(() => clock.now)
+    let started = false
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: {
+        error: (message, data) => {
+          errors.push({ message, data })
+        },
+      },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async () => {
+          started = true
+          // Never settles — drain must exit via its bound timeout, not the fetch.
+          return new Promise<Response>(() => {})
+        },
+      }),
+    })
+
+    await q.sync("s-bound", [{ type: "session", data: { id: "s-bound" } as any }])
+    expect(sched.size()).toBe(1)
+
+    const drained = q.drain()
+    let drainDone = false
+    void drained.then(() => {
+      drainDone = true
+    })
+
+    // Drain flushes immediately; fetch hangs and schedules the bound timer.
+    await Bun.sleep(0)
+    expect(started).toBe(true)
+    expect(drainDone).toBe(false)
+    expect(sched.size()).toBe(1)
+    expect(sched.nextAt()).toBe(3000)
+
+    // Advance past the 3s bound and fire the drain's internal timeout.
+    clock.now = 3000
+    sched.run()
+    await drained
+    await Bun.sleep(0)
+
+    expect(drainDone).toBe(true)
+    expect(errors.some((e) => e.message === "ingest drain timed out")).toBe(true)
+    // Bound expiry must not re-enqueue or leave a retry timer.
+    expect(sched.size()).toBe(0)
+  })
+
+  test("session_close into open debounce window reschedules flush earlier", async () => {
+    const sent: unknown[] = []
+    const sched = scheduler(() => clock.now)
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async (_input, init) => {
+          sent.push(JSON.parse((init?.body as string) ?? "{}"))
+          return new Response("{}", { status: 200 })
+        },
+      }),
+    })
+
+    // Open a normal ~1s debounce window with a part.
+    await q.sync("s-term", [{ type: "part", data: { id: "p1" } as any }])
+    expect(sched.nextAt()).toBe(1000)
+
+    // session_close must pull the flush forward to now (0 wait).
+    clock.now = 200
+    await q.sync("s-term", [{ type: "session_close", data: { reason: "completed" } }])
+    expect(sched.nextAt()).toBe(200)
+
+    sched.run()
+    await Bun.sleep(0)
+    expect(sent.length).toBe(1)
+    const payload = sent[0] as { data: { type: string }[] }
+    expect(payload.data.map((d) => d.type).sort()).toEqual(["part", "session_close"])
+  })
+
+  test("part/message-only batch still schedules at now + 1000", async () => {
+    const sched = scheduler(() => clock.now)
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async () => new Response("{}", { status: 200 }),
+      }),
+    })
+
+    clock.now = 500
+    await q.sync("s-coalesce", [{ type: "part", data: { id: "p1" } as any }])
+    expect(sched.nextAt()).toBe(1500)
+
+    clock.now = 800
+    await q.sync("s-coalesce", [{ type: "message", data: { id: "m1" } as any }])
+    // Later non-terminal sync must not move the flush earlier.
+    expect(sched.nextAt()).toBe(1500)
+  })
+
+  test("terminal batch respects active retry backoff", async () => {
+    const sent: unknown[] = []
+    const sched = scheduler(() => clock.now)
+    let attempt = 0
+
+    const q = IngestQueue.create({
+      now: () => clock.now,
+      setTimeout: sched.setTimeout,
+      clearTimeout: sched.clearTimeout,
+      log: { error: () => {} },
+      getShare: async () => ({ ingestPath: "/ingest" }),
+      getClient: async () => ({
+        url: "https://ingest.test",
+        fetch: async (_input, init) => {
+          attempt += 1
+          if (attempt === 1) throw new Error("network")
+          sent.push(JSON.parse((init?.body as string) ?? "{}"))
+          return new Response("{}", { status: 200 })
+        },
+      }),
+    })
+
+    await q.sync("s-backoff", [{ type: "session", data: { id: "s-backoff", v: 1 } as any }])
+    clock.now = 1000
+    sched.run()
+    await Bun.sleep(0)
+    // Network fail → backoff 1000ms → due at 2000.
+    expect(sched.nextAt()).toBe(2000)
+
+    clock.now = 1200
+    await q.sync("s-backoff", [{ type: "session_close", data: { reason: "completed" } }])
+    // Terminal must still respect retry.until (2000), not fire at now (1200).
+    expect(sched.nextAt()).toBe(2000)
+
+    clock.now = 2000
+    sched.run()
+    await Bun.sleep(0)
+    expect(sent.length).toBe(1)
+    const payload = sent[0] as { data: { type: string }[] }
+    expect(payload.data.map((d) => d.type).sort()).toEqual(["session", "session_close"])
+  })
 })
diff --git a/packages/opencode/test/kilocode/sessions/worker-shutdown.test.ts b/packages/opencode/test/kilocode/sessions/worker-shutdown.test.ts
new file mode 100644
index 00000000000..d60d0532401
--- /dev/null
+++ b/packages/opencode/test/kilocode/sessions/worker-shutdown.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, test } from "bun:test"
+import { createWorkerShutdown } from "../../../src/cli/tui/worker-shutdown"
+
+describe("createWorkerShutdown", () => {
+  test("invokes drain before dispose and stopServer", async () => {
+    const order: string[] = []
+    let resolveDrain!: () => void
+    const gate = new Promise<void>((resolve) => {
+      resolveDrain = resolve
+    })
+
+    const run = createWorkerShutdown({
+      drain: async () => {
+        order.push("drain-start")
+        await gate
+        order.push("drain-end")
+      },
+      dispose: async () => {
+        order.push("dispose")
+      },
+      stopServer: async () => {
+        order.push("stopServer")
+      },
+    })
+
+    const pending = run()
+    // dispose must not start while drain is still in flight
+    expect(order).toEqual(["drain-start"])
+
+    resolveDrain()
+    await pending
+    expect(order).toEqual(["drain-start", "drain-end", "dispose", "stopServer"])
+  })
+
+  test("awaits drain fully before dispose even when drain is slow", async () => {
+    const order: string[] = []
+    const run = createWorkerShutdown({
+      drain: async () => {
+        order.push("drain")
+        await Promise.resolve()
+        await Promise.resolve()
+      },
+      dispose: async () => {
+        order.push("dispose")
+      },
+      stopServer: async () => {
+        order.push("stop")
+      },
+    })
+
+    await run()
+    expect(order.indexOf("drain")).toBeLessThan(order.indexOf("dispose"))
+    expect(order.indexOf("dispose")).toBeLessThan(order.indexOf("stop"))
+  })
+})
diff --git a/packages/opencode/test/kilocode/shell/shell.test.ts b/packages/opencode/test/kilocode/shell/shell.test.ts
index 57aa989fffc..7b802cfbd0f 100644
--- a/packages/opencode/test/kilocode/shell/shell.test.ts
+++ b/packages/opencode/test/kilocode/shell/shell.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import * as PowerShell from "@/kilocode/shell/shell"
-import { Shell } from "@/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 
 const command = `Write-Output "こんにちは 😀"; Write-Output '$value'; Write-Output \`tick\`
 Write-Output "done"`
diff --git a/packages/opencode/test/kilocode/task-nesting.test.ts b/packages/opencode/test/kilocode/task-nesting.test.ts
index 44708219c84..d63a6316707 100644
--- a/packages/opencode/test/kilocode/task-nesting.test.ts
+++ b/packages/opencode/test/kilocode/task-nesting.test.ts
@@ -14,7 +14,7 @@ import { MessageV2 } from "../../src/session/message-v2"
 import type { SessionPrompt } from "../../src/session/prompt"
 import { MessageID, PartID, SessionID } from "../../src/session/schema"
 import { BackgroundProcess } from "../../src/kilocode/background-process"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import path from "path"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ModelV2 } from "@opencode-ai/core/model"
diff --git a/packages/opencode/test/kilocode/test-cli.test.ts b/packages/opencode/test/kilocode/test-cli.test.ts
new file mode 100644
index 00000000000..df2516d285a
--- /dev/null
+++ b/packages/opencode/test/kilocode/test-cli.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, test } from "bun:test"
+import fs from "fs/promises"
+import os from "os"
+import path from "path"
+import { TestCli } from "../../script/kilocode/test-cli"
+
+const root = path.resolve(import.meta.dir, "../..")
+
+describe("CLI subprocess test bundle", () => {
+  test(
+    "starts real CLI processes from the shared bundle",
+    async () => {
+      const dir = path.join(root, ".artifacts", `test-cli-regression-${process.pid}-${Date.now()}`)
+      try {
+        const entry = await (async () => {
+          if (process.env[TestCli.ENV]) return process.env[TestCli.ENV]
+          const script = [
+            'import { TestCli } from "./script/kilocode/test-cli"',
+            `console.log(await TestCli.build(process.cwd(), ${JSON.stringify(dir)}))`,
+          ].join(";")
+          const proc = Bun.spawn([process.execPath, "-e", script], {
+            cwd: root,
+            stdout: "pipe",
+            stderr: "pipe",
+            windowsHide: true,
+          })
+          const [code, stdout, stderr] = await Promise.all([
+            proc.exited,
+            new Response(proc.stdout).text(),
+            new Response(proc.stderr).text(),
+          ])
+          if (code !== 0) throw new Error(`Test CLI build failed:\n${stderr}`)
+          return stdout.trim()
+        })()
+        const runs = Array.from({ length: 4 }, () => {
+          const proc = Bun.spawn([process.execPath, "run", entry, "--help"], {
+            cwd: root,
+            env: {
+              ...process.env,
+              KILO_DB: ":memory:",
+              KILO_CONFIG_CONTENT: "{}",
+              KILO_AUTH_CONTENT: "{}",
+              KILO_DISABLE_MODELS_FETCH: "1",
+              KILO_DISABLE_PROJECT_CONFIG: "1",
+              KILO_PURE: "1",
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+            windowsHide: true,
+          })
+          return Promise.all([proc.exited, new Response(proc.stderr).text()])
+        })
+        const results = await Promise.all(runs)
+        expect(results.map(([code]) => code)).toEqual([0, 0, 0, 0])
+        for (const [, stderr] of results) expect(stderr).toContain("Commands:")
+
+        const outside = await fs.mkdtemp(path.join(os.tmpdir(), "kilo-test-cli-cwd-"))
+        const serve = Bun.spawn([process.execPath, "run", entry, "serve", "--hostname", "127.0.0.1", "--port", "0"], {
+          cwd: outside,
+          env: {
+            ...process.env,
+            KILO_DB: ":memory:",
+            KILO_CONFIG_CONTENT: "{}",
+            KILO_AUTH_CONTENT: "{}",
+            KILO_DISABLE_MODELS_FETCH: "1",
+            KILO_DISABLE_PROJECT_CONFIG: "1",
+            KILO_PURE: "1",
+          },
+          stdout: "pipe",
+          stderr: "pipe",
+          windowsHide: true,
+        })
+        const stderr = new Response(serve.stderr).text()
+        const output = await (async () => {
+          const reader = serve.stdout.getReader()
+          const decoder = new TextDecoder()
+          let text = ""
+          while (!text.includes("kilo server listening on")) {
+            const chunk = await reader.read()
+            if (chunk.done) break
+            text += decoder.decode(chunk.value, { stream: true })
+          }
+          reader.releaseLock()
+          return text
+        })()
+        if (serve.exitCode === null) serve.kill()
+        const [code, err] = await Promise.all([serve.exited, stderr])
+        expect(output, `stdout:\n${output}\nstderr:\n${err}`).toContain("kilo server listening on")
+        expect(code, `stdout:\n${output}\nstderr:\n${err}`).not.toBe(1)
+      } finally {
+        if (!process.env[TestCli.ENV]) await fs.rm(dir, { recursive: true, force: true })
+      }
+    },
+    30_000,
+  )
+})
diff --git a/packages/opencode/test/kilocode/test-profile.test.ts b/packages/opencode/test/kilocode/test-profile.test.ts
index 7e37cc27d11..9a677ec2150 100644
--- a/packages/opencode/test/kilocode/test-profile.test.ts
+++ b/packages/opencode/test/kilocode/test-profile.test.ts
@@ -12,8 +12,9 @@ describe("test profiles", () => {
     expect(result.ok).toBe(true)
     if (!result.ok) return
     expect(result.files.length).toBeGreaterThan(20)
-    expect(result.files).toContain("pty/pty-shell.test.ts")
+    expect(result.files).toContain("server/httpapi-v2-pty.test.ts")
     expect(result.files).toContain("kilocode/cli/install-artifact.test.ts")
+    expect(result.files).toContain("kilocode/cli/tui/thread.test.ts")
     expect(result.files).toContain("kilocode/sandbox/macos-confinement.test.ts")
     expect(result.files).toContain("kilocode/core-watcher.test.ts")
     expect(result.files).toContain("kilocode/background-process.test.ts")
@@ -47,7 +48,7 @@ describe("test profiles", () => {
     )
     expect(result.ok).toBe(true)
     if (!result.ok) return
-    expect(result.files).toContain("pty/pty-shell.test.ts")
+    expect(result.files).toContain("server/httpapi-v2-pty.test.ts")
     expect(result.files.some((file) => file.includes("\\"))).toBe(false)
   })
 
diff --git a/packages/opencode/test/kilocode/test-runner-cleanup.test.ts b/packages/opencode/test/kilocode/test-runner-cleanup.test.ts
index 9f5dbdb6397..23f1432fc3b 100644
--- a/packages/opencode/test/kilocode/test-runner-cleanup.test.ts
+++ b/packages/opencode/test/kilocode/test-runner-cleanup.test.ts
@@ -11,12 +11,13 @@ function env(marker: string) {
   const vars: NodeJS.ProcessEnv = { ...process.env, KILO_TEST_RUNNER_PID_FILE: marker }
   delete vars.KILO_TEST_PROFILE
   delete vars.KILO_TEST_SHARD
+  delete vars.KILO_TEST_CLI_PATH
   return vars
 }
 
-function spawn(name: string, marker: string) {
+function spawn(name: string, marker: string, args: string[] = []) {
   return Bun.spawn(
-    ["bun", "run", "script/test-runner.ts", "--concurrency", "1", "--retries", "-1", `kilocode/${name}`],
+    ["bun", "run", "script/test-runner.ts", "--concurrency", "1", "--retries", "-1", ...args, `kilocode/${name}`],
     {
       cwd: root,
       env: env(marker),
@@ -35,43 +36,47 @@ async function deadline<T>(promise: Promise<T>, timeout: number) {
 }
 
 describe("test runner cleanup", () => {
-  test("removes the temp environment after an abrupt child exit", async () => {
-    await using tmp = await tmpdir()
-    const name = `runner-abrupt-${process.pid}-${Date.now()}.test.ts`
-    const file = path.join(import.meta.dir, name)
-    const marker = path.join(tmp.path, "pid")
-    const state = { pid: 0 }
-    const src = [
-      "const marker = process.env.KILO_TEST_RUNNER_PID_FILE",
-      'if (!marker) throw new Error("KILO_TEST_RUNNER_PID_FILE is required")',
-      "await Bun.write(marker, String(process.pid))",
-      "process.exit(1)",
-      "",
-    ].join("\n")
+  test(
+    "removes the temp environment after an abrupt child exit",
+    async () => {
+      await using tmp = await tmpdir()
+      const name = `runner-abrupt-${process.pid}-${Date.now()}.test.ts`
+      const file = path.join(import.meta.dir, name)
+      const marker = path.join(tmp.path, "pid")
+      const state = { pid: 0 }
+      const src = [
+        "const marker = process.env.KILO_TEST_RUNNER_PID_FILE",
+        'if (!marker) throw new Error("KILO_TEST_RUNNER_PID_FILE is required")',
+        "await Bun.write(marker, String(process.pid))",
+        "process.exit(1)",
+        "",
+      ].join("\n")
 
-    await fs.writeFile(file, src)
-    const proc = spawn(name, marker)
-    const stdout = new Response(proc.stdout).text()
-    const stderr = new Response(proc.stderr).text()
+      await fs.writeFile(file, src)
+      const proc = spawn(name, marker)
+      const stdout = new Response(proc.stdout).text()
+      const stderr = new Response(proc.stderr).text()
 
-    try {
-      const code = await deadline(proc.exited, 15_000)
-      const output = await Promise.all([stdout, stderr])
+      try {
+        const code = await deadline(proc.exited, 15_000)
+        const output = await Promise.all([stdout, stderr])
 
-      if (!(await Bun.file(marker).exists())) {
-        throw new Error(`child did not record its pid\n${output[1] || output[0]}`)
+        if (!(await Bun.file(marker).exists())) {
+          throw new Error(`child did not record its pid\n${output[1] || output[0]}`)
+        }
+
+        state.pid = Number(await fs.readFile(marker, "utf8"))
+        expect(code).not.toBe(0)
+        expect(await Bun.file(path.join(os.tmpdir(), `opencode-test-data-${state.pid}`)).exists()).toBe(false)
+      } finally {
+        if (proc.exitCode === null) proc.kill("SIGKILL")
+        await proc.exited
+        await fs.rm(file, { force: true })
+        if (state.pid) await remove(path.join(os.tmpdir(), `opencode-test-data-${state.pid}`))
       }
-
-      state.pid = Number(await fs.readFile(marker, "utf8"))
-      expect(code).not.toBe(0)
-      expect(await Bun.file(path.join(os.tmpdir(), `opencode-test-data-${state.pid}`)).exists()).toBe(false)
-    } finally {
-      if (proc.exitCode === null) proc.kill("SIGKILL")
-      await proc.exited
-      await fs.rm(file, { force: true })
-      if (state.pid) await remove(path.join(os.tmpdir(), `opencode-test-data-${state.pid}`))
-    }
-  })
+    },
+    30_000,
+  )
 
   test.skipIf(process.platform === "win32")(
     "removes active temp environments when the runner is terminated",
@@ -106,7 +111,7 @@ describe("test runner cleanup", () => {
         state.pid = Number(await fs.readFile(marker, "utf8"))
         proc.kill("SIGTERM")
 
-        expect(await deadline(proc.exited, 10_000)).toBe(143)
+        expect(await deadline(proc.exited, 10_000)).not.toBe(0)
         await Promise.all([stdout, stderr])
         expect(await Bun.file(path.join(os.tmpdir(), `opencode-test-data-${state.pid}`)).exists()).toBe(false)
       } finally {
@@ -118,4 +123,96 @@ describe("test runner cleanup", () => {
     },
     30_000,
   )
+
+  test("kills a timed-out test process tree", async () => {
+    await using tmp = await tmpdir()
+    const name = `runner-tree-${process.pid}-${Date.now()}.test.ts`
+    const file = path.join(import.meta.dir, name)
+    const marker = path.join(tmp.path, "pid")
+    const src = [
+      "const marker = process.env.KILO_TEST_RUNNER_PID_FILE",
+      'if (!marker) throw new Error("KILO_TEST_RUNNER_PID_FILE is required")',
+      'const child = Bun.spawn([process.execPath, "-e", "await Bun.sleep(60000)"], { stdout: "inherit", stderr: "inherit" })',
+      "await Bun.write(marker, String(child.pid))",
+      "await Bun.sleep(60_000)",
+      "",
+    ].join("\n")
+
+    await fs.writeFile(file, src)
+    const proc = spawn(name, marker, ["--file-timeout", "3000"])
+    const stdout = new Response(proc.stdout).text()
+    const stderr = new Response(proc.stderr).text()
+
+    try {
+      const code = await deadline(proc.exited, 15_000)
+      const output = await Promise.all([stdout, stderr])
+      expect(code, output[1] || output[0]).not.toBe(0)
+      expect(output[0]).toContain("TIME")
+      const pid = Number(await fs.readFile(marker, "utf8"))
+      await deadline(
+        (async () => {
+          while (true) {
+            try {
+              process.kill(pid, 0)
+              await Bun.sleep(25)
+            } catch {
+              return
+            }
+          }
+        })(),
+        5_000,
+      )
+    } finally {
+      if (proc.exitCode === null) proc.kill("SIGKILL")
+      await proc.exited
+      await fs.rm(file, { force: true })
+    }
+  }, 30_000)
+
+  test.skipIf(process.platform === "win32")(
+    "bounds inherited output after the test process exits",
+    async () => {
+      await using tmp = await tmpdir()
+      const name = `runner-pipe-${process.pid}-${Date.now()}.test.ts`
+      const file = path.join(import.meta.dir, name)
+      const marker = path.join(tmp.path, "pid")
+      const src = [
+        "const marker = process.env.KILO_TEST_RUNNER_PID_FILE",
+        'if (!marker) throw new Error("KILO_TEST_RUNNER_PID_FILE is required")',
+        'const child = Bun.spawn([process.execPath, "-e", "await Bun.sleep(60000)"], { stdout: "inherit", stderr: "inherit" })',
+        "await Bun.write(marker, String(child.pid))",
+        "",
+      ].join("\n")
+
+      await fs.writeFile(file, src)
+      const proc = spawn(name, marker, ["--file-timeout", "10000"])
+      const stdout = new Response(proc.stdout).text()
+      const stderr = new Response(proc.stderr).text()
+
+      try {
+        const code = await deadline(proc.exited, 15_000)
+        const output = await Promise.all([stdout, stderr])
+        expect(code, output[1] || output[0]).toBe(0)
+        const pid = Number(await fs.readFile(marker, "utf8"))
+        await deadline(
+          (async () => {
+            while (true) {
+              try {
+                process.kill(pid, 0)
+                await Bun.sleep(25)
+              } catch {
+                return
+              }
+            }
+          })(),
+          5_000,
+        )
+      } finally {
+        if (proc.exitCode === null) proc.kill("SIGKILL")
+        await proc.exited
+        await fs.rm(file, { force: true })
+      }
+    },
+    30_000,
+  )
 })
diff --git a/packages/opencode/test/kilocode/tool/shell-unparsed.test.ts b/packages/opencode/test/kilocode/tool/shell-unparsed.test.ts
new file mode 100644
index 00000000000..88ad0e57d08
--- /dev/null
+++ b/packages/opencode/test/kilocode/tool/shell-unparsed.test.ts
@@ -0,0 +1,232 @@
+// Regression tests for Kilo-Org/kilocode#12326.
+//
+// tree-sitter-powershell dropped commands containing a bare `--` (for example
+// `git checkout -- <file>`) into ERROR nodes instead of command nodes, so the
+// shell permission scanner collected zero patterns and the command executed
+// with no permission evaluation at all, bypassing every bash rule including
+// `"git *": "deny"` and `"*": "deny"`. The scanner now fails closed: failed
+// command text is recovered from ERROR nodes, and any parse with errors that
+// recovered nothing falls back to the raw command text (also covering ERROR
+// chunks without a command_name descendant, such as backtick escapes).
+
+import { describe, expect, test } from "bun:test"
+import { Cause, Effect, Exit, 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 type { PermissionV1 } from "@opencode-ai/core/v1/permission"
+import { Permission } from "../../../src/permission"
+import { ShellPermission } from "../../../src/tool/shell"
+import { ShellTool } from "../../../src/tool/shell"
+import { Shell } from "@opencode-ai/core/shell"
+import { Config } from "../../../src/config/config"
+import { Agent } from "../../../src/agent/agent"
+import { Plugin } from "../../../src/plugin"
+import { Truncate } from "../../../src/tool/truncate"
+import { RuntimeFlags } from "../../../src/effect/runtime-flags"
+import { SessionID, MessageID } from "../../../src/session/schema"
+import { disposeAllInstances, provideInstance, testInstanceStoreLayer, tmpdir } from "../../fixture/fixture"
+import { afterEach } from "bun:test"
+
+const layer = Layer.mergeAll(CrossSpawnSpawner.defaultLayer, FSUtil.defaultLayer, testInstanceStoreLayer)
+
+type ScanRequest = Omit<PermissionV1.Request, "id" | "sessionID" | "tool">
+
+async function scan(dir: string, command: string, shell: string) {
+  const requests: ScanRequest[] = []
+  const ctx = {
+    sessionID: SessionID.make("ses_test"),
+    messageID: MessageID.make("msg_test"),
+    callID: "",
+    agent: "code",
+    abort: AbortSignal.any([]),
+    messages: [],
+    metadata: () => Effect.void,
+    ask: (req: ScanRequest) =>
+      Effect.sync(() => {
+        requests.push(req)
+      }),
+  }
+  await Effect.runPromise(
+    provideInstance(dir)(
+      Effect.gen(function* () {
+        const permission = yield* ShellPermission
+        yield* permission.ask(ctx, { command, cwd: dir, shell, description: "test" })
+      }),
+    ).pipe(Effect.provide(layer)),
+  )
+  return requests
+}
+
+function patterns(requests: ScanRequest[]) {
+  return requests.filter((req) => req.permission === "bash").flatMap((req) => req.patterns)
+}
+
+const deny = Permission.fromConfig({
+  "*": "ask",
+  bash: {
+    "*": "ask",
+    "git *": "deny",
+  },
+})
+
+function action(pattern: string) {
+  return Permission.evaluate("bash", pattern, deny).action
+}
+
+afterEach(async () => {
+  await disposeAllInstances()
+})
+
+describe("shell permission scanner fails closed on unparsed commands", () => {
+  test("pwsh: bare '--' git commands now produce a denied pattern", async () => {
+    await using tmp = await tmpdir()
+    for (const command of ["git checkout -- file", "git restore -- file", "git log -- file", "git checkout -- ."]) {
+      const found = patterns(await scan(tmp.path, command, "pwsh"))
+      expect(found.length).toBeGreaterThan(0)
+      expect(found.map(action)).toContain("deny")
+    }
+  })
+
+  test("pwsh: bare '--' in a chained command no longer vanishes from the check", async () => {
+    await using tmp = await tmpdir()
+    const found = patterns(await scan(tmp.path, "git checkout -- file; git status", "pwsh"))
+    expect(found).toContain("git status")
+    expect(found.some((pattern) => pattern.includes("git checkout -- file"))).toBe(true)
+    expect(found.map(action)).toContain("deny")
+  })
+
+  test("pwsh: bare '--' in non-git commands produces a pattern that falls back to ask", async () => {
+    await using tmp = await tmpdir()
+    for (const command of ["npm run build -- --watch", "echo -- hi", "rm -rf -- file"]) {
+      const found = patterns(await scan(tmp.path, command, "pwsh"))
+      expect(found.length).toBeGreaterThan(0)
+      expect(found.map(action)).toContain("ask")
+    }
+  })
+
+  test("pwsh: valid commands are unchanged (no extra patterns, no new prompts)", async () => {
+    await using tmp = await tmpdir()
+    expect(patterns(await scan(tmp.path, "git status", "pwsh"))).toEqual(["git status"])
+    expect(patterns(await scan(tmp.path, 'git checkout "--" file', "pwsh"))).toEqual(['git checkout "--" file'])
+    const found = patterns(await scan(tmp.path, "Write-Host foo; if ($?) { Write-Host bar }", "pwsh"))
+    expect(found).toContain("Write-Host foo")
+    expect(found).toContain("Write-Host bar")
+    expect(found.length).toBe(2)
+  })
+
+  test("pwsh: whitespace stays silent, comment-only input is checked instead of trusted", async () => {
+    await using tmp = await tmpdir()
+    expect(patterns(await scan(tmp.path, "   ", "pwsh"))).toEqual([])
+    expect(patterns(await scan(tmp.path, "# comment only", "pwsh"))).toEqual(["# comment only"])
+  })
+
+  test("bash grammar: behavior is unchanged for direct, chained, and location commands", async () => {
+    await using tmp = await tmpdir()
+    expect(patterns(await scan(tmp.path, "git checkout -- file", "bash"))).toEqual(["git checkout -- file"])
+    const chained = patterns(await scan(tmp.path, `cd ${tmp.path} && git checkout -- file`, "bash"))
+    expect(chained).toEqual(["git checkout -- file"])
+    expect(patterns(await scan(tmp.path, `cd ${tmp.path}`, "bash"))).toEqual([])
+  })
+
+  test("cmd-kind: bare '--' git commands still produce a denied pattern", async () => {
+    await using tmp = await tmpdir()
+    const found = patterns(await scan(tmp.path, "git checkout -- file", "cmd"))
+    expect(found).toEqual(["git checkout -- file"])
+    expect(found.map(action)).toContain("deny")
+  })
+
+  test("pwsh: runnable text in an ERROR node without command_name falls back to the raw check", async () => {
+    await using tmp = await tmpdir()
+    // PowerShell interprets `n as a newline escape, so this input executes
+    // `git checkout -- file`, but the grammar drops that segment into an ERROR
+    // node with no command_name descendant while `echo ok` parses cleanly.
+    const found = patterns(await scan(tmp.path, "echo ok; `ngit checkout -- file", "pwsh"))
+    expect(found).toContain("echo ok; `ngit checkout -- file")
+    expect(found.map(action)).toContain("ask")
+  })
+
+  test("pwsh: partially parsed pipelines still fail closed with the raw text", async () => {
+    await using tmp = await tmpdir()
+    const found = patterns(await scan(tmp.path, "git checkout -- file | cat", "pwsh"))
+    expect(found).toContain("git checkout -- file | cat")
+    expect(found.map(action)).toContain("deny")
+  })
+})
+
+const execLayer = Layer.mergeAll(
+  CrossSpawnSpawner.defaultLayer,
+  FSUtil.defaultLayer,
+  Plugin.defaultLayer,
+  Truncate.defaultLayer,
+  Config.defaultLayer,
+  Agent.defaultLayer,
+  RuntimeFlags.defaultLayer,
+  testInstanceStoreLayer,
+)
+
+const powershells =
+  process.platform === "win32"
+    ? [Bun.which("pwsh"), Bun.which("powershell")].filter((shell): shell is string => Boolean(shell))
+    : []
+
+async function withShell<R>(shell: string, fn: () => Promise<R>) {
+  const prev = process.env.SHELL
+  process.env.SHELL = shell
+  Shell.acceptable.reset()
+  Shell.preferred.reset()
+  try {
+    return await fn()
+  } finally {
+    if (prev === undefined) delete process.env.SHELL
+    if (prev !== undefined) process.env.SHELL = prev
+    Shell.acceptable.reset()
+    Shell.preferred.reset()
+  }
+}
+
+// End-to-end coverage through the real shell tool and a real PowerShell binary.
+// Runs only on the Windows CI runners, where pwsh/powershell exist.
+describe("full tool execution through real powershell (windows only)", () => {
+  for (const shell of powershells) {
+    test(`asks for permission on a bare double dash command [${path.basename(shell, ".exe")}]`, async () => {
+      await using tmp = await tmpdir()
+      const requests: ScanRequest[] = []
+      const stop = new Error("stop after permission")
+      await withShell(shell, () =>
+        Effect.runPromise(
+          provideInstance(tmp.path)(
+            Effect.gen(function* () {
+              const info = yield* ShellTool
+              const tool = yield* info.init()
+              const exit = yield* tool
+                .execute(
+                  { command: "git checkout -- file", description: "Restore a file from git" },
+                  {
+                    sessionID: SessionID.make("ses_test"),
+                    messageID: MessageID.make("msg_test"),
+                    callID: "",
+                    agent: "code",
+                    abort: AbortSignal.any([]),
+                    messages: [],
+                    metadata: () => Effect.void,
+                    ask: (req: ScanRequest) =>
+                      Effect.sync(() => {
+                        requests.push(req)
+                        throw stop
+                      }),
+                  },
+                )
+                .pipe(Effect.exit)
+              const err = Exit.isFailure(exit) ? Cause.squash(exit.cause) : undefined
+              expect(err instanceof Error && err.message).toBe(stop.message)
+            }),
+          ).pipe(Effect.provide(execLayer)),
+        ),
+      )
+      const req = requests.find((r) => r.permission === "bash")
+      expect(req).toBeDefined()
+      expect(req!.patterns).toContain("git checkout -- file")
+    })
+  }
+})
diff --git a/packages/opencode/test/kilocode/transform-opus-4.7.test.ts b/packages/opencode/test/kilocode/transform-opus-4.7.test.ts
index 7626bfd920b..998edb84f88 100644
--- a/packages/opencode/test/kilocode/transform-opus-4.7.test.ts
+++ b/packages/opencode/test/kilocode/transform-opus-4.7.test.ts
@@ -207,6 +207,78 @@ describe("ProviderTransform.variants - Claude Opus 4.7 / 4.8", () => {
     })
   })
 
+  test("opus-5 returns adaptive thinking variants including xhigh (native anthropic)", () => {
+    const model = mockModel({
+      api: {
+        id: "claude-opus-5",
+        url: "https://api.anthropic.com",
+        npm: "@ai-sdk/anthropic",
+      },
+    })
+    const result = ProviderTransform.variants(model)
+    expect(Object.keys(result)).toEqual(["low", "medium", "high", "xhigh", "max"])
+    expect(result.xhigh).toEqual({
+      thinking: { type: "adaptive", display: "summarized" },
+      effort: "xhigh",
+    })
+  })
+
+  test("opus-5 returns adaptive thinking variants via @ai-sdk/gateway", () => {
+    const model = mockModel({
+      id: "anthropic/claude-opus-5",
+      api: {
+        id: "anthropic/claude-opus-5",
+        url: "https://gateway.ai",
+        npm: "@ai-sdk/gateway",
+      },
+    })
+    const result = ProviderTransform.variants(model)
+    expect(Object.keys(result)).toEqual(["low", "medium", "high", "xhigh", "max"])
+  })
+
+  test("opus-5 on bedrock returns adaptive reasoningConfig with xhigh", () => {
+    const model = mockModel({
+      api: {
+        id: "anthropic.claude-opus-5",
+        url: "https://bedrock.amazonaws.com",
+        npm: "@ai-sdk/amazon-bedrock",
+      },
+    })
+    const result = ProviderTransform.variants(model)
+    expect(Object.keys(result)).toEqual(["low", "medium", "high", "xhigh", "max"])
+    expect(result.xhigh).toEqual({
+      reasoningConfig: { type: "adaptive", maxReasoningEffort: "xhigh", display: "summarized" },
+    })
+  })
+
+  test.each([
+    "claude-opus-5.3",
+    "claude-opus-6",
+    "claude-6-opus",
+    "claude-opus-10",
+    "claude-sonnet-5.3",
+    "claude-sonnet-6",
+    "claude-6-sonnet",
+    "claude-sonnet-10",
+  ])(
+    "%s is treated as an adaptive thinking model",
+    (id) => {
+      const model = mockModel({
+        api: {
+          id,
+          url: "https://api.anthropic.com",
+          npm: "@ai-sdk/anthropic",
+        },
+      })
+      const result = ProviderTransform.variants(model)
+      expect(Object.keys(result)).toEqual(["low", "medium", "high", "xhigh", "max"])
+      expect(result.xhigh).toEqual({
+        thinking: { type: "adaptive", display: "summarized" },
+        effort: "xhigh",
+      })
+    },
+  )
+
   test("sonnet-4.6 keeps original adaptive efforts without xhigh", () => {
     const model = mockModel({
       api: {
diff --git a/packages/opencode/test/lib/cli-process.ts b/packages/opencode/test/lib/cli-process.ts
index fba79fb14e0..0c6384d613a 100644
--- a/packages/opencode/test/lib/cli-process.ts
+++ b/packages/opencode/test/lib/cli-process.ts
@@ -27,10 +27,15 @@ import path from "node:path"
 import { TestLLMServer } from "./llm-server"
 import { testProviderConfig } from "./test-provider"
 import { it } from "./effect"
+import { TestCli } from "../../script/kilocode/test-cli" // kilocode_change
 
 const opencodeRoot = path.resolve(import.meta.dir, "../../")
 const cliEntry = path.join(opencodeRoot, "src/index.ts")
-const cliArgs = ["run", "--conditions=browser", "--preload=@opentui/solid/preload", cliEntry] // kilocode_change
+// kilocode_change start - reuse the runner's once-built CLI graph instead of transpiling it in every child
+const cliArgs = process.env[TestCli.ENV]
+  ? ["run", process.env[TestCli.ENV]]
+  : ["run", "--conditions=browser", "--preload=@opentui/solid/preload", cliEntry]
+// kilocode_change end
 
 export const testModelID = "test/test-model"
 
@@ -205,6 +210,7 @@ export function withCliFixture<A, E>(
         env: { ...env, ...opts?.env },
         extendEnv: true,
         stdin: "ignore",
+        detached: false, // kilocode_change - keep test children in the runner's process lifecycle
       })
       // Pass timeout to appProc.run rather than wrapping with
       // Effect.timeoutOrElse externally: AppProcess.run is itself scoped, so
@@ -267,6 +273,7 @@ export function withCliFixture<A, E>(
             env: { ...process.env, ...env, ...opts?.env },
             stdout: "pipe",
             stderr: "pipe",
+            windowsHide: true, // kilocode_change
           }),
         ),
         (p) =>
@@ -339,6 +346,7 @@ export function withCliFixture<A, E>(
             stdin: "pipe",
             stdout: "pipe",
             stderr: "pipe",
+            windowsHide: true, // kilocode_change
           }),
         ),
         (p) =>
@@ -456,5 +464,12 @@ export const cliIt = {
     name: string,
     body: (input: CliFixture) => Effect.Effect<A, E, Scope.Scope | HttpClient.HttpClient>,
     opts?: number | TestOptions,
-  ) => test.concurrent(name, () => Effect.runPromise(Effect.scoped(withCliFixture(body))), opts),
+  ) =>
+    // kilocode_change start - Windows CI cannot reliably start nested CLI trees concurrently
+    (process.platform === "win32" ? test : test.concurrent)(
+      name,
+      () => Effect.runPromise(Effect.scoped(withCliFixture(body))),
+      opts,
+    ),
+  // kilocode_change end
 }
diff --git a/packages/opencode/test/mcp/lifecycle.test.ts b/packages/opencode/test/mcp/lifecycle.test.ts
index 4b01befccde..eb17a62dbcf 100644
--- a/packages/opencode/test/mcp/lifecycle.test.ts
+++ b/packages/opencode/test/mcp/lifecycle.test.ts
@@ -1,6 +1,7 @@
 import path from "node:path"
+import { pathToFileURL } from "node:url"
 import { expect, mock, beforeEach } from "bun:test"
-import { ToolListChangedNotificationSchema } from "@modelcontextprotocol/sdk/types.js"
+import { ListRootsRequestSchema, ToolListChangedNotificationSchema } from "@modelcontextprotocol/sdk/types.js"
 import { Cause, Effect, Exit } from "effect"
 import type { MCP as MCPNS } from "../../src/mcp/index"
 import { testEffect } from "../lib/effect"
@@ -40,6 +41,8 @@ interface MockClientState {
     { resources: Array<{ name: string; uri: string; description?: string }>; nextCursor?: string }
   >
   closed: boolean
+  clientOptions?: { capabilities?: { roots?: { listChanged?: boolean } } }
+  requestHandlers: Map<unknown, (...args: any[]) => Promise<any>>
   notificationHandlers: Map<unknown, (...args: any[]) => any>
 }
 
@@ -77,6 +80,7 @@ function getOrCreateClientState(name?: string): MockClientState {
       promptPages: {},
       resourcePages: {},
       closed: false,
+      requestHandlers: new Map(),
       notificationHandlers: new Map(),
     }
     clientStates.set(key, state)
@@ -151,8 +155,10 @@ void mock.module("@modelcontextprotocol/sdk/client/index.js", () => ({
     _state!: MockClientState
     transport: any
 
-    constructor(_opts: any) {
+    constructor(_info: any, options?: MockClientState["clientOptions"]) {
       clientCreateCount++
+      this._state = getOrCreateClientState(lastCreatedClientName)
+      this._state.clientOptions = options
     }
 
     async connect(transport: { start: () => Promise<void> }) {
@@ -162,6 +168,10 @@ void mock.module("@modelcontextprotocol/sdk/client/index.js", () => ({
       this._state = getOrCreateClientState(lastCreatedClientName)
     }
 
+    setRequestHandler(schema: unknown, handler: (...args: any[]) => Promise<any>) {
+      this._state.requestHandlers.set(schema, handler)
+    }
+
     setNotificationHandler(schema: unknown, handler: (...args: any[]) => any) {
       this._state?.notificationHandlers.set(schema, handler)
     }
@@ -319,6 +329,28 @@ it.instance(
 )
 // kilocode_change end
 
+it.instance(
+  "advertises and lists the instance directory as its root",
+  () =>
+    MCP.Service.use((mcp: MCPNS.Interface) =>
+      Effect.gen(function* () {
+        const { directory } = yield* TestInstance
+        lastCreatedClientName = "roots"
+        yield* mcp.add("roots", { type: "local", command: ["echo", "test"] })
+
+        const state = getOrCreateClientState("roots")
+        expect(state.clientOptions?.capabilities?.roots).toEqual({})
+        expect(state.clientOptions?.capabilities?.roots?.listChanged).toBeUndefined()
+
+        const handler = state.requestHandlers.get(ListRootsRequestSchema)
+        expect(handler).toBeDefined()
+        const result = yield* Effect.promise(() => handler?.() ?? Promise.reject(new Error("roots handler missing")))
+        expect(result).toEqual({ roots: [{ uri: pathToFileURL(directory).href }] })
+      }),
+    ),
+  { config: { mcp: {} } },
+)
+
 it.instance(
   "local mcp cwd resolves relative paths against instance directory",
   () =>
diff --git a/packages/opencode/test/mcp/oauth-auto-connect.test.ts b/packages/opencode/test/mcp/oauth-auto-connect.test.ts
index 881790e1e55..9b46853c790 100644
--- a/packages/opencode/test/mcp/oauth-auto-connect.test.ts
+++ b/packages/opencode/test/mcp/oauth-auto-connect.test.ts
@@ -87,6 +87,8 @@ void mock.module("@modelcontextprotocol/sdk/client/sse.js", () => ({
 // Mock the MCP SDK Client
 void mock.module("@modelcontextprotocol/sdk/client/index.js", () => ({
   Client: class MockClient {
+    setRequestHandler() {}
+
     async connect(transport: { start: () => Promise<void> }) {
       await transport.start()
     }
diff --git a/packages/opencode/test/mcp/oauth-browser.test.ts b/packages/opencode/test/mcp/oauth-browser.test.ts
index 6beb80288e5..7af29241571 100644
--- a/packages/opencode/test/mcp/oauth-browser.test.ts
+++ b/packages/opencode/test/mcp/oauth-browser.test.ts
@@ -95,6 +95,8 @@ void mock.module("@modelcontextprotocol/sdk/client/sse.js", () => ({
 // Mock the MCP SDK Client to trigger OAuth flow
 void mock.module("@modelcontextprotocol/sdk/client/index.js", () => ({
   Client: class MockClient {
+    setRequestHandler() {}
+
     async connect(transport: { start: () => Promise<void> }) {
       await transport.start()
     }
diff --git a/packages/opencode/test/mcp/oauth-callback.test.ts b/packages/opencode/test/mcp/oauth-callback.test.ts
index 58a4fa8c86c..cac7146580d 100644
--- a/packages/opencode/test/mcp/oauth-callback.test.ts
+++ b/packages/opencode/test/mcp/oauth-callback.test.ts
@@ -31,4 +31,42 @@ describe("McpOAuthCallback.ensureRunning", () => {
     await McpOAuthCallback.ensureRunning("http://127.0.0.1:18000/custom/callback")
     expect(McpOAuthCallback.isRunning()).toBe(true)
   })
+
+  test("stops after the callback completes", async () => {
+    const redirectUri = "http://127.0.0.1:18003/custom/callback"
+    await McpOAuthCallback.ensureRunning(redirectUri)
+    const callback = McpOAuthCallback.waitForCallback("success")
+
+    const response = await fetch(`${redirectUri}?code=code&state=success`)
+
+    expect(response.status).toBe(200)
+    expect(await callback).toBe("code")
+    expect(McpOAuthCallback.isRunning()).toBe(false)
+  })
+
+  test("escapes provider error markup in callback HTML", async () => {
+    const redirectUri = "http://127.0.0.1:18001/custom/callback"
+    await McpOAuthCallback.ensureRunning(redirectUri)
+
+    const error = `<script>alert("xss" & 'more')</script>`
+    const response = await fetch(
+      `${redirectUri}?state=test&error=access_denied&error_description=${encodeURIComponent(error)}`,
+    )
+    const body = await response.text()
+
+    expect(response.headers.get("content-type")).toBe("text/html; charset=utf-8")
+    expect(body).toContain("&lt;script&gt;alert(&quot;xss&quot; &amp; &#39;more&#39;)&lt;/script&gt;")
+    expect(body).not.toContain(error)
+  })
+
+  test("keeps normal provider errors readable", async () => {
+    const redirectUri = "http://127.0.0.1:18002/custom/callback"
+    await McpOAuthCallback.ensureRunning(redirectUri)
+
+    const response = await fetch(
+      `${redirectUri}?state=test&error=access_denied&error_description=${encodeURIComponent("The user denied access")}`,
+    )
+
+    expect(await response.text()).toContain('<div class="error">The user denied access</div>')
+  })
 })
diff --git a/packages/opencode/test/plugin/codex.test.ts b/packages/opencode/test/plugin/codex.test.ts
index 0be3ab63bbd..a40b9953580 100644
--- a/packages/opencode/test/plugin/codex.test.ts
+++ b/packages/opencode/test/plugin/codex.test.ts
@@ -4,6 +4,7 @@ import {
   parseJwtClaims,
   extractAccountIdFromClaims,
   extractAccountId,
+  renderOAuthError,
   type IdTokenClaims,
 } from "../../src/plugin/openai/codex"
 
@@ -14,6 +15,14 @@ function createTestJwt(payload: object): string {
 }
 
 describe("plugin.codex", () => {
+  test("escapes provider errors in callback HTML", () => {
+    const error = `</div><script>alert("xss" & 'more')</script>`
+    const html = renderOAuthError(error)
+
+    expect(html).toContain("&lt;/div&gt;&lt;script&gt;alert(&quot;xss&quot; &amp; &#39;more&#39;)&lt;/script&gt;")
+    expect(html).not.toContain(error)
+  })
+
   describe("parseJwtClaims", () => {
     test("parses valid JWT with claims", () => {
       const payload = { email: "test@example.com", chatgpt_account_id: "acc-123" }
diff --git a/packages/opencode/test/plugin/xai.test.ts b/packages/opencode/test/plugin/xai.test.ts
index 3a7690b3090..676f0acb6b0 100644
--- a/packages/opencode/test/plugin/xai.test.ts
+++ b/packages/opencode/test/plugin/xai.test.ts
@@ -2,7 +2,6 @@ import { describe, expect, test } from "bun:test"
 import {
   accessTokenIsExpiring,
   buildAuthorizeUrl,
-  escapeHtml,
   pollDeviceCodeToken,
   requestDeviceCode,
   XaiAuthPlugin,
@@ -103,19 +102,6 @@ describe("plugin.xai", () => {
     })
   })
 
-  describe("escapeHtml", () => {
-    test("escapes HTML metacharacters", () => {
-      expect(escapeHtml(`</div><script>alert(1)</script><div class="x">`)).toBe(
-        "&lt;/div&gt;&lt;script&gt;alert(1)&lt;/script&gt;&lt;div class=&quot;x&quot;&gt;",
-      )
-      expect(escapeHtml("a & b")).toBe("a &amp; b")
-      expect(escapeHtml("it's fine")).toBe("it&#39;s fine")
-      expect(escapeHtml("invalid_grant")).toBe("invalid_grant")
-      expect(escapeHtml("")).toBe("")
-      expect(escapeHtml("&<")).toBe("&amp;&lt;")
-    })
-  })
-
   describe("loader", () => {
     test("returns no options unless stored auth is OAuth and exposes methods in order", async () => {
       const hooks = await XaiAuthPlugin({} as any)
diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts
index d339228ce68..5c84e9a7777 100644
--- a/packages/opencode/test/provider/transform.test.ts
+++ b/packages/opencode/test/provider/transform.test.ts
@@ -1253,6 +1253,207 @@ describe("ProviderTransform.schema - gemini non-object properties removal", () =
   })
 })
 
+describe("ProviderTransform.schema - openai supported schema subset", () => {
+  const openaiModel = {
+    providerID: "openai",
+    api: {
+      id: "gpt-4.1",
+      npm: "@ai-sdk/openai",
+    },
+  } as any
+
+  test("removes unsupported JSON Schema keywords recursively", () => {
+    const result = ProviderTransform.schema(openaiModel, {
+      $schema: "https://json-schema.org/draft/2020-12/schema",
+      title: "Search",
+      type: "object",
+      properties: {
+        query: {
+          type: "string",
+          description: "Search query",
+          format: "uri",
+          pattern: "^https://",
+          minLength: 1,
+          maxLength: 100,
+          default: "https://example.com",
+        },
+        count: {
+          type: "integer",
+          minimum: 1,
+          maximum: 10,
+          multipleOf: 1,
+        },
+        createdAt: {
+          format: "date-time",
+        },
+        mode: {
+          const: "fast",
+        },
+        tags: {
+          type: "array",
+          minItems: 1,
+          maxItems: 3,
+          uniqueItems: true,
+        },
+        tuple: {
+          type: "array",
+          items: [
+            { type: "number", minimum: 0 },
+            { type: "string", pattern: "^ok$" },
+          ],
+        },
+        metadata: {
+          type: "object",
+          patternProperties: {
+            "^x-": { type: "string" },
+          },
+          additionalProperties: {
+            type: "string",
+            pattern: "^safe$",
+          },
+        },
+      },
+      patternProperties: {
+        "^extra": { type: "string" },
+      },
+      required: ["query"],
+      additionalProperties: false,
+    } as any) as any
+
+    expect(result).toEqual({
+      type: "object",
+      properties: {
+        query: {
+          type: "string",
+          description: "Search query",
+        },
+        count: {
+          type: "integer",
+        },
+        createdAt: {
+          type: "string",
+        },
+        mode: {
+          enum: ["fast"],
+          type: "string",
+        },
+        tags: {
+          type: "array",
+          items: { type: "string" },
+        },
+        tuple: {
+          type: "array",
+          items: [{ type: "number" }, { type: "string" }],
+        },
+        metadata: {
+          type: "object",
+          properties: {},
+          additionalProperties: {
+            type: "string",
+          },
+        },
+      },
+      required: ["query"],
+      additionalProperties: false,
+    })
+  })
+
+  test("keeps local references and sanitizes definitions", () => {
+    const result = ProviderTransform.schema(openaiModel, {
+      type: "object",
+      properties: {
+        value: {
+          $ref: "#/$defs/Value",
+          description: "Referenced value",
+          examples: ["ignored"],
+        },
+      },
+      $defs: {
+        Value: {
+          type: "string",
+          pattern: "^value$",
+          description: "Definition description",
+        },
+        Unused: {
+          type: "number",
+          minimum: 0,
+        },
+      },
+    } as any) as any
+
+    expect(result.properties.value).toEqual({
+      $ref: "#/$defs/Value",
+      description: "Referenced value",
+    })
+    expect(result.$defs).toEqual({
+      Value: {
+        type: "string",
+        description: "Definition description",
+      },
+      Unused: {
+        type: "number",
+      },
+    })
+  })
+
+  test("does not sanitize non-openai providers", () => {
+    const result = ProviderTransform.schema(
+      {
+        providerID: "anthropic",
+        api: {
+          id: "claude-sonnet-4",
+          npm: "@ai-sdk/anthropic",
+        },
+      } as any,
+      {
+        type: "object",
+        properties: {
+          query: {
+            type: "string",
+            pattern: "^https://",
+          },
+        },
+      } as any,
+    ) as any
+
+    expect(result.properties.query.pattern).toBe("^https://")
+  })
+
+  test.each([
+    ["opencode", "@ai-sdk/openai"],
+    ["custom-openai-compatible", "@ai-sdk/openai"],
+    ["azure", "@ai-sdk/azure"],
+  ])("sanitizes %s models using %s", (providerID, npm) => {
+    expect(
+      ProviderTransform.schema(
+        {
+          providerID,
+          api: {
+            id: "custom-model",
+            npm,
+          },
+        } as any,
+        {
+          type: "object",
+          properties: {
+            query: {
+              type: "string",
+              pattern: "^https://",
+            },
+          },
+        } as any,
+      ),
+    ).toEqual({
+      type: "object",
+      properties: {
+        query: {
+          type: "string",
+        },
+      },
+    })
+  })
+})
+
 describe("ProviderTransform.schema - moonshot $ref siblings", () => {
   const moonshotModel = {
     providerID: "moonshotai",
@@ -2945,6 +3146,102 @@ describe("ProviderTransform.variants", () => {
     })
   })
 
+  test("glm-5.2 returns native effort variants for openai-compatible providers", () => {
+    const model = createMockModel({
+      id: "zhipuai/glm-5.2",
+      providerID: "zhipuai",
+      api: {
+        id: "glm-5.2",
+        url: "https://open.bigmodel.cn/api/paas/v4",
+        npm: "@ai-sdk/openai-compatible",
+      },
+    })
+    expect(ProviderTransform.variants(model)).toEqual({
+      high: { reasoningEffort: "high" },
+      max: { reasoningEffort: "max" },
+    })
+  })
+
+  test("recognizes GLM-5.2 provider model IDs", () => {
+    for (const id of ["accounts/fireworks/models/glm-5p2", "zai-org-glm-5-2", "umans-glm-5.2"]) {
+      const model = createMockModel({
+        id: `test/${id}`,
+        api: {
+          id,
+          url: "https://api.test.com",
+          npm: "@ai-sdk/openai-compatible",
+        },
+      })
+      expect(ProviderTransform.variants(model)).toEqual({
+        high: { reasoningEffort: "high" },
+        max: { reasoningEffort: "max" },
+      })
+    }
+  })
+
+  test("recognizes GLM-5.2 from the API ID when the configured model ID is an alias", () => {
+    const model = createMockModel({
+      id: "custom/my-glm",
+      api: {
+        id: "accounts/fireworks/models/glm-5p2",
+        url: "https://api.fireworks.ai/inference/v1",
+        npm: "@ai-sdk/openai-compatible",
+      },
+    })
+    expect(ProviderTransform.variants(model)).toEqual({
+      high: { reasoningEffort: "high" },
+      max: { reasoningEffort: "max" },
+    })
+  })
+
+  test("glm-5.2 returns openrouter effort variants for openrouter", () => {
+    const model = createMockModel({
+      id: "openrouter/z-ai/glm-5.2",
+      providerID: "openrouter",
+      api: {
+        id: "z-ai/glm-5.2",
+        url: "https://openrouter.ai/api/v1",
+        npm: "@openrouter/ai-sdk-provider",
+      },
+    })
+    expect(ProviderTransform.variants(model)).toEqual({
+      high: { reasoning: { effort: "high" } },
+      xhigh: { reasoning: { effort: "xhigh" } },
+    })
+  })
+
+  test("glm-5.2 returns effort variants for anthropic-compatible providers", () => {
+    const model = createMockModel({
+      id: "zai-coding-plan/glm-5.2",
+      providerID: "zai-coding-plan",
+      api: {
+        id: "glm-5.2",
+        url: "https://api.z.ai/api/anthropic",
+        npm: "@ai-sdk/anthropic",
+      },
+    })
+    expect(ProviderTransform.variants(model)).toEqual({
+      high: { effort: "high" },
+      max: { effort: "max" },
+    })
+  })
+
+  test("glm-5.2 falls back to provider defaults for other packages", () => {
+    const model = createMockModel({
+      id: "test/glm-5.2",
+      api: {
+        id: "glm-5.2",
+        url: "https://api.test.com",
+        npm: "@ai-sdk/amazon-bedrock",
+      },
+    })
+    expect(ProviderTransform.variants(model)).toEqual({
+      low: { reasoningConfig: { type: "enabled", maxReasoningEffort: "low" } },
+      medium: { reasoningConfig: { type: "enabled", maxReasoningEffort: "medium" } },
+      high: { reasoningConfig: { type: "enabled", maxReasoningEffort: "high" } },
+    })
+  })
+
   test("mistral models with reasoning support return variants", () => {
     const model = createMockModel({
       id: "mistral/mistral-small-latest",
diff --git a/packages/opencode/test/pty/pty-shell.test.ts b/packages/opencode/test/pty/pty-shell.test.ts
deleted file mode 100644
index 6c04df0eed8..00000000000
--- a/packages/opencode/test/pty/pty-shell.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { Config } from "../../src/config/config"
-import { Plugin } from "../../src/plugin"
-import { PtyPreparation } from "../../src/pty-preparation"
-import { Pty } from "@opencode-ai/core/pty"
-import { Shell } from "../../src/shell/shell"
-import { testEffect } from "../lib/effect"
-
-Shell.preferred.reset()
-
-const it = testEffect(Layer.mergeAll(Config.defaultLayer, Plugin.defaultLayer))
-const preparationIt = testEffect(
-  Layer.mergeAll(
-    Layer.mock(Config.Service)({ get: () => Effect.succeed({}) }),
-    Layer.mock(Plugin.Service)({
-      trigger: <Name extends string, Input, Output>(_name: Name, _input: Input, output: Output) =>
-        Effect.sync(() => {
-          const result = output as { env: Record<string, string> }
-          result.env.INPUT = "plugin"
-          result.env.FROM_PLUGIN = "plugin"
-          result.env.TERM = "plugin"
-          return output
-        }),
-      list: () => Effect.succeed([]),
-      init: () => Effect.void,
-    }),
-  ),
-)
-
-const preparePty = (input: Pty.CreateInput) => PtyPreparation.prepareCreate(input)
-
-describe("pty shell args", () => {
-  if (process.platform !== "win32") return
-
-  const ps = Bun.which("pwsh") || Bun.which("powershell")
-  if (ps) {
-    it.instance(
-      "does not add login args to pwsh",
-      () =>
-        Effect.gen(function* () {
-          const info = yield* preparePty({ command: ps, title: "pwsh" })
-          expect(info.args).toEqual([])
-        }),
-      { timeout: 30000 },
-    )
-  }
-
-  const bash = (() => {
-    const shell = Shell.preferred()
-    if (Shell.name(shell) === "bash") return shell
-    return Shell.gitbash()
-  })()
-  if (bash) {
-    it.instance(
-      "adds login args to bash",
-      () =>
-        Effect.gen(function* () {
-          const info = yield* preparePty({ command: bash, title: "bash" })
-          expect(info.args).toEqual(["-l"])
-        }),
-      { timeout: 30000 },
-    )
-  }
-})
-
-describe("pty configured shell", () => {
-  const configured = process.platform === "win32" ? Bun.which("pwsh") || Bun.which("powershell") : Bun.which("bash")
-
-  it.instance(
-    "uses configured shell for default PTY command",
-    () =>
-      Effect.gen(function* () {
-        if (!configured) return
-
-        const info = yield* preparePty({ title: "configured" })
-        if (process.platform === "win32") {
-          expect(info.command.toLowerCase()).toBe(configured.toLowerCase())
-        } else {
-          expect(info.command).toBe(configured)
-        }
-        expect(info.args).toEqual(process.platform === "win32" ? [] : ["-l"])
-      }),
-    configured ? { config: { shell: Shell.name(configured) } } : undefined,
-    { timeout: 30000 },
-  )
-})
-
-describe("pty environment preparation", () => {
-  preparationIt.instance("merges plugin environment before forced PTY values", () =>
-    Effect.gen(function* () {
-      const input = { command: "/bin/sh", args: [] as string[], env: { INPUT: "caller" } }
-      const prepared = yield* preparePty(input)
-
-      expect(input.args).toEqual([])
-      expect(prepared.env.INPUT).toBe("plugin")
-      expect(prepared.env.FROM_PLUGIN).toBe("plugin")
-      expect(prepared.env.TERM).toBe("xterm-256color")
-      expect(prepared.env.KILO_TERMINAL).toBe("1")
-    }),
-  )
-})
diff --git a/packages/opencode/test/server/httpapi-event.test.ts b/packages/opencode/test/server/httpapi-event.test.ts
index a9240e9a028..12f1dabb7d9 100644
--- a/packages/opencode/test/server/httpapi-event.test.ts
+++ b/packages/opencode/test/server/httpapi-event.test.ts
@@ -5,8 +5,6 @@ import { EventPaths } from "../../src/server/routes/instance/httpapi/groups/even
 // kilocode_change start - verify transformed EventV2 values at the legacy SSE boundary
 import { Catalog } from "@opencode-ai/core/catalog"
 import { EventV2 } from "@opencode-ai/core/event"
-import { ModelV2 } from "@opencode-ai/core/model"
-import { ProviderV2 } from "@opencode-ai/core/provider"
 import { SessionEvent } from "@opencode-ai/core/session/event"
 import { Prompt } from "@opencode-ai/core/session/prompt"
 import { DateTime, Fiber } from "effect"
@@ -199,26 +197,21 @@ describe("event HttpApi", () => {
         expect(yield* readGlobal(reader)).toMatchObject({ payload: { type: "server.connected", properties: {} } })
         yield* ready(count)
         const events = yield* EventV2Bridge.Service
-        const released = DateTime.makeUnsafe(1_750_000_000_123)
-        const model = new ModelV2.Info({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("test"), ModelV2.ID.make("model")),
-          time: { released },
-        })
         const catalogID = EventV2.ID.create()
         const catalog = yield* readGlobalUntil(reader, (event) => event.payload.id === catalogID).pipe(
           Effect.forkChild({ startImmediately: true }),
         )
-        const catalogDomain = yield* events.publish(Catalog.Event.ModelUpdated, { model }, { id: catalogID })
+        const catalogDomain = yield* events.publish(Catalog.Event.Updated, {}, { id: catalogID })
 
-        expect(DateTime.isDateTime(catalogDomain.data.model.time.released)).toBe(true)
-        expect(properties(yield* Fiber.join(catalog)).model.time.released).toBe(1_750_000_000_123)
+        expect(catalogDomain.data).toEqual({})
+        expect(properties(yield* Fiber.join(catalog))).toEqual({})
 
         const globalID = EventV2.ID.create()
         const global = yield* readGlobalUntil(reader, (event) => event.payload.id === globalID).pipe(
           Effect.forkChild({ startImmediately: true }),
         )
         yield* events
-          .publish(Catalog.Event.ModelUpdated, { model }, { id: globalID })
+          .publish(Catalog.Event.Updated, {}, { id: globalID })
           .pipe(Effect.provideService(InstanceRef, undefined))
         expect((yield* Fiber.join(global)).directory).toBe("global")
 
diff --git a/packages/opencode/test/server/httpapi-exercise/environment.ts b/packages/opencode/test/server/httpapi-exercise/environment.ts
index 4594f5f329a..84a07a2cf6e 100644
--- a/packages/opencode/test/server/httpapi-exercise/environment.ts
+++ b/packages/opencode/test/server/httpapi-exercise/environment.ts
@@ -13,6 +13,7 @@ process.env.XDG_CACHE_HOME = path.join(exerciseGlobalRoot, "cache")
 process.env.KILO_DISABLE_SHARE = "true"
 process.env.KILO_DISABLE_SESSION_INGEST = "true" // kilocode_change - isolate the exerciser from async Kilo session sync
 process.env.KILO_DISABLE_PRESENCE = "1" // kilocode_change - presence now has a default Event Service URL; never open real sockets from the exerciser
+process.env.KILO_DISABLE_CODEBASE_INDEXING = "vscode-no-workspace" // kilocode_change - route scenarios do not need an indexing worker per temp project
 export const exerciseConfigDirectory = path.join(exerciseGlobalRoot, "config", "opencode")
 export const exerciseDataDirectory = path.join(exerciseGlobalRoot, "data", "kilo") // kilocode_change
 
diff --git a/packages/opencode/test/server/httpapi-exercise/index.ts b/packages/opencode/test/server/httpapi-exercise/index.ts
index d0648500d31..f711e96e62c 100644
--- a/packages/opencode/test/server/httpapi-exercise/index.ts
+++ b/packages/opencode/test/server/httpapi-exercise/index.ts
@@ -17,7 +17,7 @@
  * - `.json(...)` / `.jsonEffect(...)` assert response shape and optional side effects.
  * - `.mutating()` tells the runner to reset isolated state after destructive routes.
  */
-import { Effect } from "effect"
+import { Effect, Layer } from "effect" // kilocode_change
 import { OpenApi } from "effect/unstable/httpapi"
 import { TestLLMServer } from "../../lib/llm-server"
 import path from "path"
@@ -623,6 +623,10 @@ const scenarios: Scenario[] = [
     .get("/experimental/session", "experimental.session.list")
     .at((ctx) => ({ path: "/experimental/session?roots=false&archived=false", headers: ctx.headers() }))
     .json(200, array),
+  http.protected.get("/experimental/capabilities", "experimental.capabilities.get").json(200, (body) => {
+    check(typeof body === "object" && body !== null, "capabilities should be an object")
+    check("backgroundSubagents" in body, "capabilities should report background subagents")
+  }),
   http.protected
     .post("/experimental/session/{sessionID}/background", "experimental.session.background")
     .mutating()
@@ -802,6 +806,44 @@ const scenarios: Scenario[] = [
     .seeded((ctx) => ctx.file("hello.txt", "hello\n"))
     .at((ctx) => ({ path: "/api/fs/find?query=hello&type=file", headers: ctx.headers() }))
     .json(200, locationData(array)),
+  http.protected.get("/api/pty", "v2.pty.list").json(200, locationData(array)),
+  http.protected
+    .post("/api/pty", "v2.pty.create")
+    .mutating()
+    .at((ctx) => ({ path: "/api/pty", headers: ctx.headers(), body: controlledPtyInput("HTTP API V2 PTY") }))
+    .json(200, locationData(object)),
+  http.protected
+    .get("/api/pty/{ptyID}", "v2.pty.get")
+    .at((ctx) => ({ path: route("/api/pty/{ptyID}", { ptyID: "pty_httpapi_missing" }), headers: ctx.headers() }))
+    .json(404, object, "status"),
+  http.protected
+    .put("/api/pty/{ptyID}", "v2.pty.update")
+    .mutating()
+    .at((ctx) => ({
+      path: route("/api/pty/{ptyID}", { ptyID: "pty_httpapi_missing" }),
+      headers: ctx.headers(),
+      body: { title: "missing" },
+    }))
+    .json(404, object, "status"),
+  http.protected
+    .delete("/api/pty/{ptyID}", "v2.pty.remove")
+    .mutating()
+    .at((ctx) => ({ path: route("/api/pty/{ptyID}", { ptyID: "pty_httpapi_missing" }), headers: ctx.headers() }))
+    .json(404, object, "status"),
+  http.protected
+    .post("/api/pty/{ptyID}/connect-token", "v2.pty.connectToken")
+    .at((ctx) => ({
+      path: route("/api/pty/{ptyID}/connect-token", { ptyID: "pty_httpapi_missing" }),
+      headers: { ...ctx.headers(), "x-kilo-ticket": "1" },
+    }))
+    .json(404, object, "status"),
+  http.protected
+    .get("/api/pty/{ptyID}/connect", "v2.pty.connect")
+    .at((ctx) => ({
+      path: route("/api/pty/{ptyID}/connect", { ptyID: "pty_httpapi_missing" }),
+      headers: ctx.headers(),
+    }))
+    .status(404, undefined, "none"),
   http.protected.get("/api/reference", "v2.reference.list").json(200, object),
   http.protected
     .get("/api/provider/{providerID}", "v2.provider.get")
@@ -1628,7 +1670,16 @@ const llmScenarios = new Set([
 ])
 
 const main = Effect.gen(function* () {
-  yield* Effect.addFinalizer(() => Effect.promise(() => disposeApps()).pipe(Effect.andThen(cleanupExercisePaths)))
+  // kilocode_change start - dispose final non-mutating instances so shared test scopes can close
+  yield* Effect.addFinalizer(() =>
+    Effect.gen(function* () {
+      const modules = yield* Effect.promise(() => runtime())
+      yield* Effect.promise(() => modules.disposeAllInstances())
+      yield* Effect.promise(() => disposeApps())
+      yield* cleanupExercisePaths
+    }),
+  )
+  // kilocode_change end
   const options = parseOptions(Bun.argv.slice(2))
   const modules = yield* Effect.promise(() => runtime())
   const effectRoutes = routeKeys(OpenApi.fromApi(modules.PublicApi))
@@ -1670,10 +1721,17 @@ const main = Effect.gen(function* () {
   return undefined
 })
 
-Effect.runPromise(main.pipe(Effect.provide(TestLLMServer.layer), Effect.scoped)).then(
+// kilocode_change start - route-only coverage must not acquire a listening fake LLM server
+const llm =
+  parseOptions(Bun.argv.slice(2)).mode === "coverage"
+    ? Layer.mock(TestLLMServer)({ url: "http://coverage.invalid" })
+    : TestLLMServer.layer
+
+Effect.runPromise(main.pipe(Effect.provide(llm), Effect.scoped)).then(
   () => process.exit(0),
   (error: unknown) => {
     console.error(`${color.red}${message(error)}${color.reset}`)
     process.exit(1)
   },
 )
+// kilocode_change end
diff --git a/packages/opencode/test/server/httpapi-listen.test.ts b/packages/opencode/test/server/httpapi-listen.test.ts
index b069a8148d6..0d65fd93d41 100644
--- a/packages/opencode/test/server/httpapi-listen.test.ts
+++ b/packages/opencode/test/server/httpapi-listen.test.ts
@@ -1,5 +1,7 @@
 import { afterEach, describe, expect, test } from "bun:test"
 import net from "node:net"
+import path from "node:path"
+import { pathToFileURL } from "node:url"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { Server } from "../../src/server/server"
 import { PtyPaths } from "../../src/server/routes/instance/httpapi/groups/pty"
@@ -308,6 +310,57 @@ describe("HttpApi Server.listen", () => {
     expect(output).not.toContain("Sent HTTP response")
   })
 
+  test("plugin client requests reuse the listening server instance", async () => {
+    await using tmp = await tmpdir({
+      init: async (directory) => {
+        const plugin = path.join(directory, "plugin.ts")
+        const initialized = path.join(directory, "initialized.txt")
+        const completed = path.join(directory, "completed.txt")
+        await Bun.write(
+          plugin,
+          [
+            "export default async function plugin(input) {",
+            `  await Bun.write(${JSON.stringify(initialized)}, (await Bun.file(${JSON.stringify(initialized)}).text().catch(() => "")) + "initialized\\n")`,
+            "  setTimeout(async () => {",
+            "    await input.client.config.get()",
+            `    await Bun.write(${JSON.stringify(completed)}, "completed")`,
+            "  }, 50)",
+            "  return {}",
+            "}",
+            "",
+          ].join("\n"),
+        )
+        await Bun.write(
+          path.join(directory, "opencode.json"),
+          JSON.stringify({ formatter: false, lsp: false, plugin: [pathToFileURL(plugin).href] }),
+        )
+        return { initialized, completed }
+      },
+    })
+    const previous = process.env.KILO_DISABLE_DEFAULT_PLUGINS
+    process.env.KILO_DISABLE_DEFAULT_PLUGINS = "1"
+    let listener: Awaited<ReturnType<typeof startListener>> | undefined
+    try {
+      listener = await startListener()
+      const response = await fetch(new URL("/config", listener.url), {
+        headers: { authorization: authorization(), "x-kilo-directory": tmp.path },
+      })
+      expect(response.status).toBe(200)
+      await withTimeout(
+        (async () => {
+          while (!(await Bun.file(tmp.extra.completed).exists())) await Bun.sleep(10)
+        })(),
+        5_000,
+        "timed out waiting for plugin client request",
+      )
+      expect(await Bun.file(tmp.extra.initialized).text()).toBe("initialized\n")
+    } finally {
+      if (listener) await stop(listener, "timed out cleaning up plugin client listener").catch(() => undefined)
+      if (previous === undefined) delete process.env.KILO_DISABLE_DEFAULT_PLUGINS
+      else process.env.KILO_DISABLE_DEFAULT_PLUGINS = previous
+    }
+  })
+
   test("port 0 prefers 4096 when free", async () => {
     if (!(await isPortFree(4096))) return
     const listener = await startListener()
diff --git a/packages/opencode/test/server/httpapi-pty.test.ts b/packages/opencode/test/server/httpapi-pty.test.ts
index 40274599d93..084ce9f713d 100644
--- a/packages/opencode/test/server/httpapi-pty.test.ts
+++ b/packages/opencode/test/server/httpapi-pty.test.ts
@@ -136,6 +136,33 @@ describe("pty HttpApi bridge", () => {
     })
   })
 
+  testPty("hides exited sessions on the legacy surface", async () => {
+    await using tmp = await tmpdir({ git: true, config: { formatter: false, lsp: false } })
+    const headers = { "x-kilo-directory": tmp.path }
+    const created = await app().request(PtyPaths.create, {
+      method: "POST",
+      headers: { ...headers, "content-type": "application/json" },
+      body: JSON.stringify({ command: "/usr/bin/env", args: ["sh", "-c", "exit 0"] }),
+    })
+    expect(created.status).toBe(200)
+    const info = await created.json()
+
+    // Exited sessions are retained by core for the canonical surface, but the legacy
+    // routes preserve pre-retention behavior: exited sessions are invisible here.
+    const deadline = Date.now() + 5_000
+    while (Date.now() < deadline) {
+      const found = await app().request(PtyPaths.get.replace(":ptyID", info.id), { headers })
+      if (found.status === 404) break
+      await new Promise((resolve) => setTimeout(resolve, 50))
+    }
+    const found = await app().request(PtyPaths.get.replace(":ptyID", info.id), { headers })
+    expect(found.status).toBe(404)
+
+    const list = await app().request(PtyPaths.list, { headers })
+    expect(list.status).toBe(200)
+    expect(await list.json()).toEqual([])
+  })
+
   testPty("disposes PTY sessions with their legacy instance", async () => {
     await using tmp = await tmpdir({ git: true, config: { formatter: false, lsp: false } })
     const headers = { "x-kilo-directory": tmp.path }
diff --git a/packages/opencode/test/server/httpapi-v2-pty.test.ts b/packages/opencode/test/server/httpapi-v2-pty.test.ts
new file mode 100644
index 00000000000..d2eb68f77a9
--- /dev/null
+++ b/packages/opencode/test/server/httpapi-v2-pty.test.ts
@@ -0,0 +1,284 @@
+import { afterEach, describe, expect, test } from "bun:test"
+import { Context, Config as EffectConfig, Effect, Layer, Queue, Schema } from "effect"
+import { NodeHttpServer, NodeServices } from "@effect/platform-node"
+import { HttpClient, HttpClientRequest, HttpRouter, HttpServer } from "effect/unstable/http"
+import * as Socket from "effect/unstable/socket/Socket"
+import path from "path"
+import { pathToFileURL } from "url"
+import { mkdir } from "fs/promises"
+import { Location } from "@opencode-ai/core/location"
+import { Pty } from "@opencode-ai/core/pty"
+import { PtyTicket } from "@opencode-ai/core/pty/ticket"
+import { HttpApiApp } from "../../src/server/routes/instance/httpapi/server"
+import { resetDatabase } from "../fixture/db"
+import { disposeAllInstances, tmpdir, tmpdirScoped } from "../fixture/fixture"
+import { testEffect } from "../lib/effect"
+
+const context = Context.empty() as Context.Context<unknown>
+const testPty = process.platform === "win32" ? test.skip : test
+
+function request(route: string, directory: string, init: RequestInit = {}) {
+  const headers = new Headers(init.headers)
+  headers.set("x-kilo-directory", directory)
+  return HttpApiApp.webHandler().handler(
+    new Request(`http://localhost${route}`, {
+      ...init,
+      headers,
+    }),
+    context,
+  )
+}
+
+const testStateLayer = Layer.effectDiscard(
+  Effect.gen(function* () {
+    yield* Effect.promise(() => resetDatabase())
+    yield* Effect.addFinalizer(() => Effect.promise(() => resetDatabase()))
+  }),
+)
+
+const servedRoutes: Layer.Layer<never, EffectConfig.ConfigError, HttpServer.HttpServer> = HttpRouter.serve(
+  HttpApiApp.routes,
+  { disableListenLog: true, disableLogger: true },
+)
+
+const effectIt = testEffect(
+  Layer.mergeAll(
+    testStateLayer,
+    Socket.layerWebSocketConstructorGlobal,
+    servedRoutes.pipe(
+      Layer.provide(Socket.layerWebSocketConstructorGlobal),
+      Layer.provideMerge(NodeHttpServer.layerTest),
+      Layer.provideMerge(NodeServices.layer),
+    ),
+  ),
+)
+
+const directoryHeader = (dir: string) => HttpClientRequest.setHeader("x-kilo-directory", dir)
+
+const serverUrl = () => HttpServer.HttpServer.use((server) => Effect.succeed(HttpServer.formatAddress(server.address)))
+
+afterEach(async () => {
+  await disposeAllInstances()
+  await resetDatabase()
+})
+
+describe("v2 pty HttpApi", () => {
+  testPty("serves location-wrapped PTY routes and retains exited sessions", async () => {
+    await using tmp = await tmpdir({ git: true, config: { formatter: false, lsp: false } })
+
+    const empty = await request("/api/pty", tmp.path)
+    expect(empty.status).toBe(200)
+    expect(Schema.decodeUnknownSync(Location.response(Schema.Array(Pty.Info)))(await empty.json()).data).toEqual([])
+
+    const created = await request("/api/pty", tmp.path, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ command: "/usr/bin/env", args: ["sh", "-c", "exit 4"], title: "v2" }),
+    })
+    expect(created.status).toBe(200)
+    const body = Schema.decodeUnknownSync(Location.response(Pty.Info))(await created.json())
+    expect(String(body.location.directory)).toBe(tmp.path)
+    expect(body.data.title).toBe("v2")
+
+    // The canonical surface keeps exited sessions observable with their exit code.
+    const deadline = Date.now() + 5_000
+    let info: { status: string; exitCode?: number } | undefined
+    while (Date.now() < deadline) {
+      const found = await request(`/api/pty/${body.data.id}`, tmp.path)
+      expect(found.status).toBe(200)
+      info = Schema.decodeUnknownSync(Location.response(Pty.Info))(await found.json()).data
+      if (info.status === "exited") break
+      await new Promise((resolve) => setTimeout(resolve, 50))
+    }
+    expect(info).toMatchObject({ status: "exited", exitCode: 4 })
+
+    const removed = await request(`/api/pty/${body.data.id}`, tmp.path, { method: "DELETE" })
+    expect(removed.status).toBe(204)
+
+    const missing = await request(`/api/pty/${body.data.id}`, tmp.path)
+    expect(missing.status).toBe(404)
+    expect(await missing.json()).toMatchObject({ _tag: "PtyNotFoundError", ptyID: body.data.id })
+  })
+
+  testPty("rejects connect tokens without the CSRF header and connects with a valid ticket", async () => {
+    await using tmp = await tmpdir({ git: true, config: { formatter: false, lsp: false } })
+    const created = await request("/api/pty", tmp.path, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ command: "/usr/bin/env", args: ["sh", "-c", "sleep 5"] }),
+    })
+    expect(created.status).toBe(200)
+    const info = Schema.decodeUnknownSync(Location.response(Pty.Info))(await created.json()).data
+
+    try {
+      const forbidden = await request(`/api/pty/${info.id}/connect-token`, tmp.path, { method: "POST" })
+      expect(forbidden.status).toBe(403)
+      expect(await forbidden.json()).toMatchObject({ _tag: "ForbiddenError" })
+
+      const token = await request(`/api/pty/${info.id}/connect-token`, tmp.path, {
+        method: "POST",
+        headers: { "x-kilo-ticket": "1" },
+      })
+      expect(token.status).toBe(200)
+      const ticket = Schema.decodeUnknownSync(Location.response(PtyTicket.ConnectToken))(await token.json()).data.ticket
+      expect(ticket).toBeTruthy()
+
+      const invalid = await request(`/api/pty/${info.id}/connect?ticket=not-a-ticket`, tmp.path)
+      expect(invalid.status).toBe(403)
+    } finally {
+      await request(`/api/pty/${info.id}`, tmp.path, { method: "DELETE" })
+    }
+  })
+  ;(process.platform === "win32" ? effectIt.live.skip : effectIt.live)(
+    "serves PTY websocket output and input through the canonical route",
+    () =>
+      Effect.gen(function* () {
+        const dir = yield* tmpdirScoped({ git: true, config: { formatter: false, lsp: false } })
+        const created = yield* HttpClientRequest.post("/api/pty").pipe(
+          directoryHeader(dir),
+          HttpClientRequest.bodyJson({ command: "/bin/cat", title: "v2-websocket" }),
+          Effect.flatMap(HttpClient.execute),
+        )
+        expect(created.status).toBe(200)
+        const body = yield* Schema.decodeUnknownEffect(Location.response(Pty.Info))(yield* created.json)
+        const info = body.data
+
+        const socket = yield* Socket.makeWebSocket(
+          `${(yield* serverUrl()).replace(/^http/, "ws")}/api/pty/${info.id}/connect?cursor=-1&location[directory]=${encodeURIComponent(dir)}`,
+          { closeCodeIsError: () => false },
+        )
+        const messages = yield* Queue.unbounded<string>()
+        yield* socket
+          .runRaw((message) =>
+            Queue.offer(messages, typeof message === "string" ? message : new TextDecoder().decode(message)),
+          )
+          .pipe(Effect.catch(() => Effect.void))
+          .pipe(Effect.forkScoped)
+        const write = yield* socket.writer
+
+        const takeUntil = (expected: string, seen = ""): Effect.Effect<string, unknown> =>
+          Effect.gen(function* () {
+            const next = seen + (yield* Queue.take(messages).pipe(Effect.timeout("5 seconds")))
+            if (next.includes(expected)) return next
+            return yield* takeUntil(expected, next)
+          })
+
+        yield* write("ping-v2\n")
+        expect(yield* takeUntil("ping-v2")).toContain("ping-v2")
+        yield* write(new Socket.CloseEvent(1000, "done")).pipe(Effect.catch(() => Effect.void))
+
+        const removed = yield* HttpClientRequest.delete(`/api/pty/${info.id}`).pipe(
+          directoryHeader(dir),
+          HttpClient.execute,
+        )
+        expect(removed.status).toBe(204)
+      }),
+  )
+  ;(process.platform === "win32" ? effectIt.live.skip : effectIt.live)(
+    "applies plugin shell environment before forced PTY values",
+    () =>
+      Effect.gen(function* () {
+        const dir = yield* tmpdirScoped({ git: true, config: { formatter: false, lsp: false } })
+        // kilocode_change start - verify child env precedence and credential stripping through the canonical PTY route
+        const previous = {
+          password: process.env.KILO_SERVER_PASSWORD,
+          username: process.env.KILO_SERVER_USERNAME,
+        }
+        yield* Effect.acquireRelease(
+          Effect.sync(() => {
+            process.env.KILO_SERVER_PASSWORD = "host-password"
+            process.env.KILO_SERVER_USERNAME = "host-username"
+          }),
+          () =>
+            Effect.sync(() => {
+              if (previous.password === undefined) delete process.env.KILO_SERVER_PASSWORD
+              else process.env.KILO_SERVER_PASSWORD = previous.password
+              if (previous.username === undefined) delete process.env.KILO_SERVER_USERNAME
+              else process.env.KILO_SERVER_USERNAME = previous.username
+            }),
+        )
+        const plugin = path.join(dir, "plugin.ts")
+        const cwd = path.join(dir, "child")
+        yield* Effect.promise(() => mkdir(cwd))
+        yield* Effect.promise(() =>
+          Bun.write(
+            plugin,
+            [
+              "export default async () => ({",
+              '  "shell.env": (input, output) => {',
+              '    output.env.SHARED = "plugin"',
+              '    output.env.PLUGIN = "plugin"',
+              '    output.env.TERM = "plugin"',
+              '    output.env.KILO_TERMINAL = "plugin"',
+              '    output.env.KILO_PTY_ID = "plugin"',
+              '    output.env.KILO_SERVER_PASSWORD = "plugin-password"',
+              '    output.env.KILO_SERVER_USERNAME = "plugin-username"',
+              "    output.env.HOOK_CWD = input.cwd",
+              "  },",
+              "})",
+              "",
+            ].join("\n"),
+          ),
+        )
+        yield* Effect.promise(() =>
+          Bun.write(
+            path.join(dir, "opencode.json"),
+            JSON.stringify({ plugin: [pathToFileURL(plugin).href], formatter: false, lsp: false }),
+          ),
+        )
+
+        const created = yield* HttpClientRequest.post("/api/pty").pipe(
+          directoryHeader(dir),
+          HttpClientRequest.bodyJson({
+            command: "/bin/sh",
+            args: [
+              "-c",
+              'printf "%s|%s|%s|%s|%s|%s|%s|%s|%s\\n" "$CALLER" "$SHARED" "$PLUGIN" "$TERM" "$KILO_TERMINAL" "$KILO_PTY_ID" "${KILO_SERVER_PASSWORD-unset}" "${KILO_SERVER_USERNAME-unset}" "$HOOK_CWD"; sleep 5',
+            ],
+            cwd,
+            env: {
+              CALLER: "caller",
+              SHARED: "caller",
+              TERM: "caller",
+              KILO_TERMINAL: "caller",
+              KILO_PTY_ID: "caller",
+              KILO_SERVER_PASSWORD: "caller-password",
+              KILO_SERVER_USERNAME: "caller-username",
+            },
+          }),
+          Effect.flatMap(HttpClient.execute),
+        )
+        expect(created.status).toBe(200)
+        const info = (yield* Schema.decodeUnknownEffect(Location.response(Pty.Info))(yield* created.json)).data
+
+        const socket = yield* Socket.makeWebSocket(
+          `${(yield* serverUrl()).replace(/^http/, "ws")}/api/pty/${info.id}/connect?cursor=0&location[directory]=${encodeURIComponent(dir)}`,
+          { closeCodeIsError: () => false },
+        )
+        const messages = yield* Queue.unbounded<string>()
+        yield* socket
+          .runRaw((message) =>
+            Queue.offer(messages, typeof message === "string" ? message : new TextDecoder().decode(message)),
+          )
+          .pipe(
+            Effect.catch(() => Effect.void),
+            Effect.forkScoped,
+          )
+        const write = yield* socket.writer
+
+        const takeUntil = (expected: string, seen = ""): Effect.Effect<string, unknown> =>
+          Effect.gen(function* () {
+            const next = seen + (yield* Queue.take(messages).pipe(Effect.timeout("5 seconds")))
+            if (next.includes(expected)) return next
+            return yield* takeUntil(expected, next)
+          })
+
+        const output = yield* takeUntil("caller|plugin|plugin|xterm-256color")
+        expect(output).toContain(`caller|plugin|plugin|xterm-256color|1|${info.id}|||${cwd}`)
+        // kilocode_change end
+        yield* write(new Socket.CloseEvent(1000, "done")).pipe(Effect.catch(() => Effect.void))
+        yield* HttpClientRequest.delete(`/api/pty/${info.id}`).pipe(directoryHeader(dir), HttpClient.execute)
+      }),
+    30_000, // kilocode_change - external plugin loading and websocket setup can exceed Bun's 5s default
+  )
+})
diff --git a/packages/opencode/test/session/prompt.test.ts b/packages/opencode/test/session/prompt.test.ts
index d738af1b4f0..f4cb5fcd10f 100644
--- a/packages/opencode/test/session/prompt.test.ts
+++ b/packages/opencode/test/session/prompt.test.ts
@@ -50,7 +50,7 @@ import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { Skill } from "../../src/skill"
 import { SystemPrompt } from "../../src/session/system"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { Snapshot } from "../../src/snapshot"
 import { ToolRegistry } from "@/tool/registry"
 import { Truncate } from "@/tool/truncate"
@@ -1527,7 +1527,7 @@ it.instance(
       }
     }),
   { git: true },
-  10_000,
+  30_000, // kilocode_change - isolated suite load can delay queued live-loop cancellation
 )
 
 // Queue semantics
@@ -1639,7 +1639,14 @@ it.instance(
 
       const inputs = yield* llm.inputs
       expect(inputs).toHaveLength(2)
-      expect(JSON.stringify(inputs.at(-1)?.messages)).toContain("second")
+      const messages = inputs.at(-1)?.messages
+      if (!Array.isArray(messages)) throw new Error("expected LLM messages")
+      // kilocode_change start - Kilo appends environment details to queued user prompts
+      expect(messages.at(-1)).toMatchObject({
+        role: "user",
+        content: expect.arrayContaining([{ type: "text", text: "second" }]),
+      })
+      // kilocode_change end
     }),
   10_000,
 )
diff --git a/packages/opencode/test/share/share-next.test.ts b/packages/opencode/test/share/share-next.test.ts
index 1d60180c95b..ccc21f2ee22 100644
--- a/packages/opencode/test/share/share-next.test.ts
+++ b/packages/opencode/test/share/share-next.test.ts
@@ -17,7 +17,7 @@ import { Database } from "@opencode-ai/core/database/database"
 import { eq } from "drizzle-orm"
 import { provideTmpdirInstance } from "../fixture/fixture"
 import { resetDatabase } from "../fixture/db"
-import { pollWithTimeout, testEffect } from "../lib/effect" // kilocode_change
+import { pollWithTimeout, testEffect } from "../lib/effect"
 
 const env = LayerNode.buildLayer(CrossSpawnSpawner.node)
 const it = testEffect(env)
@@ -140,10 +140,10 @@ describe("ShareNext", () => {
   it.live("create posts share, persists it, and returns the result", () =>
     provideTmpdirInstance(
       () => {
-        const seen: HttpClientRequest.HttpClientRequest[] = []
+        const createRequests: HttpClientRequest.HttpClientRequest[] = []
         const client = HttpClient.make((req) => {
-          seen.push(req)
           if (req.url.endsWith("/api/share")) {
+            createRequests.push(req)
             return Effect.succeed(
               json(req, {
                 id: "shr_abc",
@@ -168,9 +168,9 @@ describe("ShareNext", () => {
           expect(row?.url).toBe("https://legacy-share.example.com/share/abc")
           expect(row?.secret).toBe("sec_123")
 
-          expect(seen).toHaveLength(1)
-          expect(seen[0].method).toBe("POST")
-          expect(seen[0].url).toBe("https://legacy-share.example.com/api/share")
+          expect(createRequests).toHaveLength(1)
+          expect(createRequests[0].method).toBe("POST")
+          expect(createRequests[0].url).toBe("https://legacy-share.example.com/api/share")
         }).pipe(Effect.provide(integrationLayer(client)))
       },
       { config: { enterprise: { url: "https://legacy-share.example.com" } } },
@@ -304,13 +304,13 @@ describe("ShareNext", () => {
                 deletions: 0,
                 status: "modified",
               },
-            ], // kilocode_change
+            ],
           })
           const sync = yield* pollWithTimeout(
             Effect.sync(() => seen[0]),
             "share sync was not sent",
             "3 seconds",
-          ) // kilocode_change
+          )
 
           expect(seen).toHaveLength(1)
           expect(sync.url).toBe("https://legacy-share.example.com/api/share/shr_abc/sync") // kilocode_change
diff --git a/packages/opencode/test/tool/shell.test.ts b/packages/opencode/test/tool/shell.test.ts
index 1584c65b9ca..1de2fbe2f42 100644
--- a/packages/opencode/test/tool/shell.test.ts
+++ b/packages/opencode/test/tool/shell.test.ts
@@ -5,7 +5,7 @@ import type * as Scope from "effect/Scope"
 import os from "os"
 import path from "path"
 import { Config } from "@/config/config"
-import { Shell } from "../../src/shell/shell"
+import { Shell } from "@opencode-ai/core/shell"
 import { ShellTool } from "../../src/tool/shell"
 import { Filesystem } from "@/util/filesystem"
 import { provideInstance, testInstanceStoreLayer, tmpdirScoped } from "../fixture/fixture"
diff --git a/packages/opencode/test/util/html.test.ts b/packages/opencode/test/util/html.test.ts
new file mode 100644
index 00000000000..952d5b58e6c
--- /dev/null
+++ b/packages/opencode/test/util/html.test.ts
@@ -0,0 +1,15 @@
+import { describe, expect, test } from "bun:test"
+import { escapeHtml } from "../../src/util/html"
+
+describe("escapeHtml", () => {
+  test("escapes HTML metacharacters", () => {
+    expect(escapeHtml(`</div><script>alert(1)</script><div class="x">`)).toBe(
+      "&lt;/div&gt;&lt;script&gt;alert(1)&lt;/script&gt;&lt;div class=&quot;x&quot;&gt;",
+    )
+    expect(escapeHtml("a & b")).toBe("a &amp; b")
+    expect(escapeHtml("it's fine")).toBe("it&#39;s fine")
+    expect(escapeHtml("invalid_grant")).toBe("invalid_grant")
+    expect(escapeHtml("")).toBe("")
+    expect(escapeHtml("&<")).toBe("&amp;&lt;")
+  })
+})
diff --git a/packages/plugin/sst-env.d.ts b/packages/plugin/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/plugin/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/script/sst-env.d.ts b/packages/script/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/script/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 67ca8b211c5..81f6ac2e965 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -78,6 +78,8 @@ import type {
   EventTuiPromptAppend2,
   EventTuiSessionSelect2,
   EventTuiToastShow2,
+  ExperimentalCapabilitiesGetErrors,
+  ExperimentalCapabilitiesGetResponses,
   ExperimentalConsoleGetErrors,
   ExperimentalConsoleGetResponses,
   ExperimentalConsoleListOrgsErrors,
@@ -499,6 +501,20 @@ import type {
   V2ProviderGetResponses,
   V2ProviderListErrors,
   V2ProviderListResponses,
+  V2PtyConnectErrors,
+  V2PtyConnectResponses,
+  V2PtyConnectTokenErrors,
+  V2PtyConnectTokenResponses,
+  V2PtyCreateErrors,
+  V2PtyCreateResponses,
+  V2PtyGetErrors,
+  V2PtyGetResponses,
+  V2PtyListErrors,
+  V2PtyListResponses,
+  V2PtyRemoveErrors,
+  V2PtyRemoveResponses,
+  V2PtyUpdateErrors,
+  V2PtyUpdateResponses,
   V2QuestionRequestListErrors,
   V2QuestionRequestListResponses,
   V2ReferenceListErrors,
@@ -809,6 +825,42 @@ export class ControlPlane extends HeyApiClient {
   }
 }
 
+export class Capabilities extends HeyApiClient {
+  /**
+   * Get experimental capabilities
+   *
+   * Get experimental features enabled on the Kilo server.
+   */
+  public get<ThrowOnError extends boolean = false>(
+    parameters?: {
+      directory?: string
+      workspace?: string
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "query", key: "directory" },
+            { in: "query", key: "workspace" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).get<
+      ExperimentalCapabilitiesGetResponses,
+      ExperimentalCapabilitiesGetErrors,
+      ThrowOnError
+    >({
+      url: "/experimental/capabilities",
+      ...options,
+      ...params,
+    })
+  }
+}
+
 export class Console extends HeyApiClient {
   /**
    * Get active Console provider metadata
@@ -1368,6 +1420,11 @@ export class Experimental extends HeyApiClient {
     return (this._controlPlane ??= new ControlPlane({ client: this.client }))
   }
 
+  private _capabilities?: Capabilities
+  get capabilities(): Capabilities {
+    return (this._capabilities ??= new Capabilities({ client: this.client }))
+  }
+
   private _console?: Console
   get console(): Console {
     return (this._console ??= new Console({ client: this.client }))
@@ -9852,10 +9909,24 @@ export class Credential extends HeyApiClient {
   public remove<ThrowOnError extends boolean = false>(
     parameters: {
       credentialID: string
+      location?: {
+        directory?: string
+        workspace?: string
+      }
     },
     options?: Options<never, ThrowOnError>,
   ) {
-    const params = buildClientParams([parameters], [{ args: [{ in: "path", key: "credentialID" }] }])
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "credentialID" },
+            { in: "query", key: "location" },
+          ],
+        },
+      ],
+    )
     return (options?.client ?? this.client).delete<V2CredentialRemoveResponses, V2CredentialRemoveErrors, ThrowOnError>(
       {
         url: "/api/credential/{credentialID}",
@@ -9873,6 +9944,10 @@ export class Credential extends HeyApiClient {
   public update<ThrowOnError extends boolean = false>(
     parameters: {
       credentialID: string
+      location?: {
+        directory?: string
+        workspace?: string
+      }
       label?: string
     },
     options?: Options<never, ThrowOnError>,
@@ -9883,6 +9958,7 @@ export class Credential extends HeyApiClient {
         {
           args: [
             { in: "path", key: "credentialID" },
+            { in: "query", key: "location" },
             { in: "body", key: "label" },
           ],
         },
@@ -10166,6 +10242,260 @@ export class Event2 extends HeyApiClient {
   }
 }
 
+export class Pty2 extends HeyApiClient {
+  /**
+   * List PTY sessions
+   *
+   * List PTY sessions for a location, including exited sessions retained until removal.
+   */
+  public list<ThrowOnError extends boolean = false>(
+    parameters?: {
+      location?: {
+        directory?: string
+        workspace?: string
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams([parameters], [{ args: [{ in: "query", key: "location" }] }])
+    return (options?.client ?? this.client).get<V2PtyListResponses, V2PtyListErrors, ThrowOnError>({
+      url: "/api/pty",
+      ...options,
+      ...params,
+    })
+  }
+
+  /**
+   * Create PTY session
+   *
+   * Create a pseudo-terminal session for a location.
+   */
+  public create<ThrowOnError extends boolean = false>(
+    parameters?: {
+      location?: {
+        directory?: string
+        workspace?: string
+      }
+      command?: string
+      args?: Array<string>
+      cwd?: string
+      title?: string
+      env?: {
+        [key: string]: string
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "query", key: "location" },
+            { in: "body", key: "command" },
+            { in: "body", key: "args" },
+            { in: "body", key: "cwd" },
+            { in: "body", key: "title" },
+            { in: "body", key: "env" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).post<V2PtyCreateResponses, V2PtyCreateErrors, ThrowOnError>({
+      url: "/api/pty",
+      ...options,
+      ...params,
+      headers: {
+        "Content-Type": "application/json",
+        ...options?.headers,
+        ...params.headers,
+      },
+    })
+  }
+
+  /**
+   * Remove PTY session
+   *
+   * Terminate and remove one PTY session.
+   */
+  public remove<ThrowOnError extends boolean = false>(
+    parameters: {
+      ptyID: string
+      location?: {
+        directory?: string
+        workspace?: string
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "ptyID" },
+            { in: "query", key: "location" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).delete<V2PtyRemoveResponses, V2PtyRemoveErrors, ThrowOnError>({
+      url: "/api/pty/{ptyID}",
+      ...options,
+      ...params,
+    })
+  }
+
+  /**
+   * Get PTY session
+   *
+   * Get one PTY session, including its exit code once exited.
+   */
+  public get<ThrowOnError extends boolean = false>(
+    parameters: {
+      ptyID: string
+      location?: {
+        directory?: string
+        workspace?: string
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "ptyID" },
+            { in: "query", key: "location" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).get<V2PtyGetResponses, V2PtyGetErrors, ThrowOnError>({
+      url: "/api/pty/{ptyID}",
+      ...options,
+      ...params,
+    })
+  }
+
+  /**
+   * Update PTY session
+   *
+   * Update the title or viewport size of one PTY session.
+   */
+  public update<ThrowOnError extends boolean = false>(
+    parameters: {
+      ptyID: string
+      location?: {
+        directory?: string
+        workspace?: string
+      }
+      title?: string
+      sessionID?: string
+      size?: {
+        rows: number
+        cols: number
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "ptyID" },
+            { in: "query", key: "location" },
+            { in: "body", key: "title" },
+            { in: "body", key: "sessionID" },
+            { in: "body", key: "size" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).put<V2PtyUpdateResponses, V2PtyUpdateErrors, ThrowOnError>({
+      url: "/api/pty/{ptyID}",
+      ...options,
+      ...params,
+      headers: {
+        "Content-Type": "application/json",
+        ...options?.headers,
+        ...params.headers,
+      },
+    })
+  }
+
+  /**
+   * Create PTY WebSocket token
+   *
+   * Create a short-lived single-use ticket for opening a PTY WebSocket connection.
+   */
+  public connectToken<ThrowOnError extends boolean = false>(
+    parameters: {
+      ptyID: string
+      location?: {
+        directory?: string
+        workspace?: string
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "ptyID" },
+            { in: "query", key: "location" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).post<V2PtyConnectTokenResponses, V2PtyConnectTokenErrors, ThrowOnError>({
+      url: "/api/pty/{ptyID}/connect-token",
+      ...options,
+      ...params,
+    })
+  }
+
+  /**
+   * Connect to PTY session
+   *
+   * Establish a WebSocket connection streaming PTY output and accepting terminal input.
+   */
+  public connect<ThrowOnError extends boolean = false>(
+    parameters: {
+      ptyID: string
+      "location[directory]"?: string
+      "location[workspace]"?: string
+      cursor?: string
+      ticket?: string
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "ptyID" },
+            { in: "query", key: "location[directory]" },
+            { in: "query", key: "location[workspace]" },
+            { in: "query", key: "cursor" },
+            { in: "query", key: "ticket" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).get<V2PtyConnectResponses, V2PtyConnectErrors, ThrowOnError>({
+      url: "/api/pty/{ptyID}/connect",
+      ...options,
+      ...params,
+    })
+  }
+}
+
 export class Request2 extends HeyApiClient {
   /**
    * List pending question requests
@@ -10407,6 +10737,11 @@ export class V2 extends HeyApiClient {
     return (this._event ??= new Event2({ client: this.client }))
   }
 
+  private _pty?: Pty2
+  get pty(): Pty2 {
+    return (this._pty ??= new Pty2({ client: this.client }))
+  }
+
   private _question?: Question3
   get question(): Question3 {
     return (this._question ??= new Question3({ client: this.client }))
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 300135f694a..61953cc620f 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -38,7 +38,8 @@ export type Event =
   | EventGlobalDisposed
   | EventGlobalConfigUpdated
   | EventPluginAdded
-  | EventCatalogModelUpdated
+  | EventIntegrationUpdated
+  | EventCatalogUpdated
   | EventSessionCreated
   | EventSessionUpdated
   | EventSessionDeleted
@@ -95,7 +96,6 @@ export type Event =
   | EventPermissionAsked
   | EventPermissionReplied
   | EventReferenceUpdated
-  | EventIntegrationUpdated
   | EventPermissionV2Asked
   | EventPermissionV2Replied
   | EventProjectDirectoriesUpdated
@@ -1007,6 +1007,7 @@ export type Pty = {
   cwd: string
   status: "running" | "exited"
   pid: number
+  exitCode?: number
   sessionID?: string | null
 }
 
@@ -1090,7 +1091,8 @@ export type GlobalEvent = {
     | EventGlobalDisposed
     | EventGlobalConfigUpdated
     | EventPluginAdded
-    | EventCatalogModelUpdated
+    | EventIntegrationUpdated
+    | EventCatalogUpdated
     | EventSessionCreated
     | EventSessionUpdated
     | EventSessionDeleted
@@ -1147,7 +1149,6 @@ export type GlobalEvent = {
     | EventPermissionAsked
     | EventPermissionReplied
     | EventReferenceUpdated
-    | EventIntegrationUpdated
     | EventPermissionV2Asked
     | EventPermissionV2Replied
     | EventProjectDirectoriesUpdated
@@ -1857,6 +1858,10 @@ export type Provider = {
   }
 }
 
+export type ExperimentalCapabilities = {
+  backgroundSubagents: boolean
+}
+
 export type ConsoleState = {
   consoleManagedProviders: Array<string>
   activeOrgName?: string
@@ -3489,6 +3494,11 @@ export type ProviderNotFoundError = {
   message: string
 }
 
+export type ForbiddenError = {
+  _tag: "ForbiddenError"
+  message: string
+}
+
 export type ProjectCopyError = {
   name: "ProjectCopyError"
   data: {
@@ -3919,107 +3929,19 @@ export type EventPluginAdded = {
   }
 }
 
-export type ModelV2Info = {
+export type EventIntegrationUpdated = {
   id: string
-  providerID: string
-  family?: string
-  name: string
-  api:
-    | {
-        id: string
-        type: "aisdk"
-        package: string
-        url?: string
-        settings?: {
-          [key: string]: unknown
-        }
-      }
-    | {
-        id: string
-        type: "native"
-        url?: string
-        settings: {
-          [key: string]: unknown
-        }
-      }
-  capabilities: {
-    tools: boolean
-    input: Array<string>
-    output: Array<string>
-  }
-  request: {
-    headers: {
-      [key: string]: string
-    }
-    body: {
-      [key: string]: unknown
-    }
-    generation?: {
-      maxTokens?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      temperature?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      topP?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      topK?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      frequencyPenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      presencePenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      seed?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      stop?: Array<string>
-    }
-    options?: {
-      [key: string]: unknown
-    }
-    variant?: string
-  }
-  variants: Array<{
-    id: string
-    headers: {
-      [key: string]: string
-    }
-    body: {
-      [key: string]: unknown
-    }
-    generation?: {
-      maxTokens?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      temperature?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      topP?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      topK?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      frequencyPenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      presencePenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      seed?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-      stop?: Array<string>
-    }
-    options?: {
-      [key: string]: unknown
-    }
-  }>
-  time: {
-    released: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-  }
-  cost: Array<{
-    tier?: {
-      type: "context"
-      size: number
-    }
-    input: number
-    output: number
-    cache: {
-      read: number
-      write: number
-    }
-  }>
-  status: "alpha" | "beta" | "deprecated" | "active"
-  enabled: boolean
-  limit: {
-    context: number
-    input?: number
-    output: number
+  type: "integration.updated"
+  properties: {
+    [key: string]: unknown
   }
 }
 
-export type EventCatalogModelUpdated = {
+export type EventCatalogUpdated = {
   id: string
-  type: "catalog.model.updated"
+  type: "catalog.updated"
   properties: {
-    model: ModelV2Info
+    [key: string]: unknown
   }
 }
 
@@ -4717,14 +4639,6 @@ export type EventReferenceUpdated = {
   }
 }
 
-export type EventIntegrationUpdated = {
-  id: string
-  type: "integration.updated"
-  properties: {
-    [key: string]: unknown
-  }
-}
-
 export type PermissionV2Source = {
   type: "tool"
   messageID: string
@@ -5987,26 +5901,106 @@ export type SessionMessage =
   | SessionMessageAssistant
   | SessionMessageCompaction
 
-export type ProviderV2Info = {
+export type ModelV2Info = {
   id: string
+  providerID: string
+  family?: string
   name: string
-  enabled:
-    | false
+  api:
     | {
-        via: "env"
-        name: string
-      }
-    | {
-        via: "credential"
-        credentialID: string
-      }
-    | {
-        via: "custom"
-        data: {
+        id: string
+        type: "aisdk"
+        package: string
+        url?: string
+        settings?: {
           [key: string]: unknown
         }
       }
-  env: Array<string>
+    | {
+        id: string
+        type: "native"
+        url?: string
+        settings: {
+          [key: string]: unknown
+        }
+      }
+  capabilities: {
+    tools: boolean
+    input: Array<string>
+    output: Array<string>
+  }
+  request: {
+    headers: {
+      [key: string]: string
+    }
+    body: {
+      [key: string]: unknown
+    }
+    generation?: {
+      maxTokens?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      temperature?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      topP?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      topK?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      frequencyPenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      presencePenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      seed?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      stop?: Array<string>
+    }
+    options?: {
+      [key: string]: unknown
+    }
+    variant?: string
+  }
+  variants: Array<{
+    id: string
+    headers: {
+      [key: string]: string
+    }
+    body: {
+      [key: string]: unknown
+    }
+    generation?: {
+      maxTokens?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      temperature?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      topP?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      topK?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      frequencyPenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      presencePenalty?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      seed?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+      stop?: Array<string>
+    }
+    options?: {
+      [key: string]: unknown
+    }
+  }>
+  time: {
+    released: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+  }
+  cost: Array<{
+    tier?: {
+      type: "context"
+      size: number
+    }
+    input: number
+    output: number
+    cache: {
+      read: number
+      write: number
+    }
+  }>
+  status: "alpha" | "beta" | "deprecated" | "active"
+  enabled: boolean
+  limit: {
+    context: number
+    input?: number
+    output: number
+  }
+}
+
+export type ProviderV2Info = {
+  id: string
+  name: string
+  disabled?: boolean
   api:
     | {
         type: "aisdk"
@@ -6308,102 +6302,6 @@ export type EventMemoryError1 = {
   }
 }
 
-export type ModelV2Info1 = {
-  id: string
-  providerID: string
-  family?: string
-  name: string
-  api:
-    | {
-        id: string
-        type: "aisdk"
-        package: string
-        url?: string
-        settings?: {
-          [key: string]: unknown
-        }
-      }
-    | {
-        id: string
-        type: "native"
-        url?: string
-        settings: {
-          [key: string]: unknown
-        }
-      }
-  capabilities: {
-    tools: boolean
-    input: Array<string>
-    output: Array<string>
-  }
-  request: {
-    headers: {
-      [key: string]: string
-    }
-    body: {
-      [key: string]: unknown
-    }
-    generation?: {
-      maxTokens?: number | "NaN" | "Infinity" | "-Infinity"
-      temperature?: number | "NaN" | "Infinity" | "-Infinity"
-      topP?: number | "NaN" | "Infinity" | "-Infinity"
-      topK?: number | "NaN" | "Infinity" | "-Infinity"
-      frequencyPenalty?: number | "NaN" | "Infinity" | "-Infinity"
-      presencePenalty?: number | "NaN" | "Infinity" | "-Infinity"
-      seed?: number | "NaN" | "Infinity" | "-Infinity"
-      stop?: Array<string>
-    }
-    options?: {
-      [key: string]: unknown
-    }
-    variant?: string
-  }
-  variants: Array<{
-    id: string
-    headers: {
-      [key: string]: string
-    }
-    body: {
-      [key: string]: unknown
-    }
-    generation?: {
-      maxTokens?: number | "NaN" | "Infinity" | "-Infinity"
-      temperature?: number | "NaN" | "Infinity" | "-Infinity"
-      topP?: number | "NaN" | "Infinity" | "-Infinity"
-      topK?: number | "NaN" | "Infinity" | "-Infinity"
-      frequencyPenalty?: number | "NaN" | "Infinity" | "-Infinity"
-      presencePenalty?: number | "NaN" | "Infinity" | "-Infinity"
-      seed?: number | "NaN" | "Infinity" | "-Infinity"
-      stop?: Array<string>
-    }
-    options?: {
-      [key: string]: unknown
-    }
-  }>
-  time: {
-    released: number | "NaN" | "Infinity" | "-Infinity"
-  }
-  cost: Array<{
-    tier?: {
-      type: "context"
-      size: number
-    }
-    input: number
-    output: number
-    cache: {
-      read: number
-      write: number
-    }
-  }>
-  status: "alpha" | "beta" | "deprecated" | "active"
-  enabled: boolean
-  limit: {
-    context: number
-    input?: number
-    output: number
-  }
-}
-
 export type EventTuiToastShow1 = {
   id: string
   type: "tui.toast.show"
@@ -6855,6 +6753,36 @@ export type ConfigProvidersResponses = {
 
 export type ConfigProvidersResponse = ConfigProvidersResponses[keyof ConfigProvidersResponses]
 
+export type ExperimentalCapabilitiesGetData = {
+  body?: never
+  path?: never
+  query?: {
+    directory?: string
+    workspace?: string
+  }
+  url: "/experimental/capabilities"
+}
+
+export type ExperimentalCapabilitiesGetErrors = {
+  /**
+   * Bad request
+   */
+  400: BadRequestError
+}
+
+export type ExperimentalCapabilitiesGetError =
+  ExperimentalCapabilitiesGetErrors[keyof ExperimentalCapabilitiesGetErrors]
+
+export type ExperimentalCapabilitiesGetResponses = {
+  /**
+   * Experimental capabilities
+   */
+  200: ExperimentalCapabilities
+}
+
+export type ExperimentalCapabilitiesGetResponse =
+  ExperimentalCapabilitiesGetResponses[keyof ExperimentalCapabilitiesGetResponses]
+
 export type ExperimentalConsoleGetData = {
   body?: never
   path?: never
@@ -15239,7 +15167,12 @@ export type V2CredentialRemoveData = {
   path: {
     credentialID: string
   }
-  query?: never
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
   url: "/api/credential/{credentialID}"
 }
 
@@ -15272,7 +15205,12 @@ export type V2CredentialUpdateData = {
   path: {
     credentialID: string
   }
-  query?: never
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
   url: "/api/credential/{credentialID}"
 }
 
@@ -15697,6 +15635,315 @@ export type V2EventSubscribeResponses = {
 
 export type V2EventSubscribeResponse = V2EventSubscribeResponses[keyof V2EventSubscribeResponses]
 
+export type V2PtyListData = {
+  body?: never
+  path?: never
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
+  url: "/api/pty"
+}
+
+export type V2PtyListErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+}
+
+export type V2PtyListError = V2PtyListErrors[keyof V2PtyListErrors]
+
+export type V2PtyListResponses = {
+  /**
+   * Success
+   */
+  200: {
+    location: LocationInfo
+    data: Array<Pty>
+  }
+}
+
+export type V2PtyListResponse = V2PtyListResponses[keyof V2PtyListResponses]
+
+export type V2PtyCreateData = {
+  body: {
+    command?: string
+    args?: Array<string>
+    cwd?: string
+    title?: string
+    env?: {
+      [key: string]: string
+    }
+  }
+  path?: never
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
+  url: "/api/pty"
+}
+
+export type V2PtyCreateErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+}
+
+export type V2PtyCreateError = V2PtyCreateErrors[keyof V2PtyCreateErrors]
+
+export type V2PtyCreateResponses = {
+  /**
+   * Success
+   */
+  200: {
+    location: LocationInfo
+    data: Pty
+  }
+}
+
+export type V2PtyCreateResponse = V2PtyCreateResponses[keyof V2PtyCreateResponses]
+
+export type V2PtyRemoveData = {
+  body?: never
+  path: {
+    ptyID: string
+  }
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
+  url: "/api/pty/{ptyID}"
+}
+
+export type V2PtyRemoveErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+  /**
+   * PtyNotFoundError
+   */
+  404: PtyNotFoundError
+}
+
+export type V2PtyRemoveError = V2PtyRemoveErrors[keyof V2PtyRemoveErrors]
+
+export type V2PtyRemoveResponses = {
+  /**
+   * <No Content>
+   */
+  204: void
+}
+
+export type V2PtyRemoveResponse = V2PtyRemoveResponses[keyof V2PtyRemoveResponses]
+
+export type V2PtyGetData = {
+  body?: never
+  path: {
+    ptyID: string
+  }
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
+  url: "/api/pty/{ptyID}"
+}
+
+export type V2PtyGetErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+  /**
+   * PtyNotFoundError
+   */
+  404: PtyNotFoundError
+}
+
+export type V2PtyGetError = V2PtyGetErrors[keyof V2PtyGetErrors]
+
+export type V2PtyGetResponses = {
+  /**
+   * Success
+   */
+  200: {
+    location: LocationInfo
+    data: Pty
+  }
+}
+
+export type V2PtyGetResponse = V2PtyGetResponses[keyof V2PtyGetResponses]
+
+export type V2PtyUpdateData = {
+  body: {
+    title?: string
+    sessionID?: string
+    size?: {
+      rows: number
+      cols: number
+    }
+  }
+  path: {
+    ptyID: string
+  }
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
+  url: "/api/pty/{ptyID}"
+}
+
+export type V2PtyUpdateErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+  /**
+   * PtyNotFoundError
+   */
+  404: PtyNotFoundError
+}
+
+export type V2PtyUpdateError = V2PtyUpdateErrors[keyof V2PtyUpdateErrors]
+
+export type V2PtyUpdateResponses = {
+  /**
+   * Success
+   */
+  200: {
+    location: LocationInfo
+    data: Pty
+  }
+}
+
+export type V2PtyUpdateResponse = V2PtyUpdateResponses[keyof V2PtyUpdateResponses]
+
+export type V2PtyConnectTokenData = {
+  body?: never
+  path: {
+    ptyID: string
+  }
+  query?: {
+    location?: {
+      directory?: string
+      workspace?: string
+    }
+  }
+  url: "/api/pty/{ptyID}/connect-token"
+}
+
+export type V2PtyConnectTokenErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+  /**
+   * ForbiddenError
+   */
+  403: ForbiddenError
+  /**
+   * PtyNotFoundError
+   */
+  404: PtyNotFoundError
+}
+
+export type V2PtyConnectTokenError = V2PtyConnectTokenErrors[keyof V2PtyConnectTokenErrors]
+
+export type V2PtyConnectTokenResponses = {
+  /**
+   * Success
+   */
+  200: {
+    location: LocationInfo
+    data: {
+      ticket: string
+      expires_in: number
+    }
+  }
+}
+
+export type V2PtyConnectTokenResponse = V2PtyConnectTokenResponses[keyof V2PtyConnectTokenResponses]
+
+export type V2PtyConnectData = {
+  body?: never
+  path: {
+    ptyID: string
+  }
+  query?: {
+    "location[directory]"?: string
+    "location[workspace]"?: string
+    cursor?: string
+    ticket?: string
+  }
+  url: "/api/pty/{ptyID}/connect"
+}
+
+export type V2PtyConnectErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestError
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedError
+  /**
+   * ForbiddenError
+   */
+  403: ForbiddenError
+  /**
+   * PtyNotFoundError
+   */
+  404: PtyNotFoundError
+}
+
+export type V2PtyConnectError = V2PtyConnectErrors[keyof V2PtyConnectErrors]
+
+export type V2PtyConnectResponses = {
+  /**
+   * Success
+   */
+  200: boolean
+}
+
+export type V2PtyConnectResponse = V2PtyConnectResponses[keyof V2PtyConnectResponses]
+
 export type V2QuestionRequestListData = {
   body?: never
   path?: never
diff --git a/packages/sdk/js/sst-env.d.ts b/packages/sdk/js/sst-env.d.ts
new file mode 100644
index 00000000000..301538ccb21
--- /dev/null
+++ b/packages/sdk/js/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index facbd52ff8e..53526b5f007 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -881,6 +881,60 @@
         ]
       }
     },
+    "/experimental/capabilities": {
+      "get": {
+        "tags": ["experimental"],
+        "operationId": "experimental.capabilities.get",
+        "parameters": [
+          {
+            "name": "directory",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          },
+          {
+            "name": "workspace",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Experimental capabilities",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExperimentalCapabilities"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BadRequestError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Get experimental features enabled on the Kilo server.",
+        "summary": "Get experimental capabilities",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.experimental.capabilities.get({\n  ...\n})"
+          }
+        ]
+      }
+    },
     "/experimental/console": {
       "get": {
         "tags": ["experimental"],
@@ -21950,6 +22004,25 @@
               "type": "string"
             },
             "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
           }
         ],
         "security": [],
@@ -22015,6 +22088,25 @@
               "type": "string"
             },
             "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
           }
         ],
         "security": [],
@@ -22938,6 +23030,726 @@
         ]
       }
     },
+    "/api/pty": {
+      "get": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/LocationInfo"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Pty"
+                      }
+                    }
+                  },
+                  "required": ["location", "data"],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List PTY sessions for a location, including exited sessions retained until removal.",
+        "summary": "List PTY sessions",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.list({\n  ...\n})"
+          }
+        ]
+      },
+      "post": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.create",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/LocationInfo"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": ["location", "data"],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a pseudo-terminal session for a location.",
+        "summary": "Create PTY session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "command": {
+                    "type": "string"
+                  },
+                  "args": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "cwd": {
+                    "type": "string"
+                  },
+                  "title": {
+                    "type": "string"
+                  },
+                  "env": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        },
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.create({\n  ...\n})"
+          }
+        ]
+      }
+    },
+    "/api/pty/{ptyID}": {
+      "get": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.get",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "pattern": "^pty.*"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/LocationInfo"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": ["location", "data"],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Get one PTY session, including its exit code once exited.",
+        "summary": "Get PTY session",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.get({\n  ...\n})"
+          }
+        ]
+      },
+      "put": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.update",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "pattern": "^pty.*"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/LocationInfo"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": ["location", "data"],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Update the title or viewport size of one PTY session.",
+        "summary": "Update PTY session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "type": "string"
+                  },
+                  "sessionID": {
+                    "type": "string",
+                    "pattern": "^ses"
+                  },
+                  "size": {
+                    "type": "object",
+                    "properties": {
+                      "rows": {
+                        "type": "integer",
+                        "exclusiveMinimum": 0
+                      },
+                      "cols": {
+                        "type": "integer",
+                        "exclusiveMinimum": 0
+                      }
+                    },
+                    "required": ["rows", "cols"],
+                    "additionalProperties": false
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        },
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.update({\n  ...\n})"
+          }
+        ]
+      },
+      "delete": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.remove",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "pattern": "^pty.*"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Terminate and remove one PTY session.",
+        "summary": "Remove PTY session",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.remove({\n  ...\n})"
+          }
+        ]
+      }
+    },
+    "/api/pty/{ptyID}/connect-token": {
+      "post": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.connectToken",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "pattern": "^pty.*"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "directory": {
+                  "type": "string"
+                },
+                "workspace": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/LocationInfo"
+                    },
+                    "data": {
+                      "type": "object",
+                      "properties": {
+                        "ticket": {
+                          "type": "string"
+                        },
+                        "expires_in": {
+                          "type": "integer",
+                          "exclusiveMinimum": 0
+                        }
+                      },
+                      "required": ["ticket", "expires_in"],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": ["location", "data"],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a short-lived single-use ticket for opening a PTY WebSocket connection.",
+        "summary": "Create PTY WebSocket token",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.connectToken({\n  ...\n})"
+          }
+        ]
+      }
+    },
+    "/api/pty/{ptyID}/connect": {
+      "get": {
+        "tags": ["pty"],
+        "operationId": "v2.pty.connect",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "pattern": "^pty.*"
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "location[directory]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "location[workspace]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "cursor",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ticket",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Establish a WebSocket connection streaming PTY output and accepting terminal input.",
+        "summary": "Connect to PTY session",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.v2.pty.connect({\n  ...\n})"
+          }
+        ]
+      }
+    },
     "/api/question/request": {
       "get": {
         "tags": ["session questions"],
@@ -23778,7 +24590,10 @@
             "$ref": "#/components/schemas/EventPluginAdded"
           },
           {
-            "$ref": "#/components/schemas/EventCatalogModelUpdated"
+            "$ref": "#/components/schemas/EventIntegrationUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/EventCatalogUpdated"
           },
           {
             "$ref": "#/components/schemas/EventSessionCreated"
@@ -23948,9 +24763,6 @@
           {
             "$ref": "#/components/schemas/EventReferenceUpdated"
           },
-          {
-            "$ref": "#/components/schemas/EventIntegrationUpdated"
-          },
           {
             "$ref": "#/components/schemas/EventPermissionV2Asked"
           },
@@ -26728,6 +27540,10 @@
             "type": "integer",
             "minimum": 0
           },
+          "exitCode": {
+            "type": "integer",
+            "minimum": 0
+          },
           "sessionID": {
             "anyOf": [
               {
@@ -26964,7 +27780,10 @@
                 "$ref": "#/components/schemas/EventPluginAdded"
               },
               {
-                "$ref": "#/components/schemas/EventCatalogModelUpdated"
+                "$ref": "#/components/schemas/EventIntegrationUpdated"
+              },
+              {
+                "$ref": "#/components/schemas/EventCatalogUpdated"
               },
               {
                 "$ref": "#/components/schemas/EventSessionCreated"
@@ -27134,9 +27953,6 @@
               {
                 "$ref": "#/components/schemas/EventReferenceUpdated"
               },
-              {
-                "$ref": "#/components/schemas/EventIntegrationUpdated"
-              },
               {
                 "$ref": "#/components/schemas/EventPermissionV2Asked"
               },
@@ -29146,6 +29962,16 @@
         "required": ["id", "name", "source", "env", "options", "models"],
         "additionalProperties": false
       },
+      "ExperimentalCapabilities": {
+        "type": "object",
+        "properties": {
+          "backgroundSubagents": {
+            "type": "boolean"
+          }
+        },
+        "required": ["backgroundSubagents"],
+        "additionalProperties": false
+      },
       "ConsoleState": {
         "type": "object",
         "properties": {
@@ -34225,6 +35051,20 @@
         "required": ["_tag", "providerID", "message"],
         "additionalProperties": false
       },
+      "ForbiddenError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": ["ForbiddenError"]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": ["_tag", "message"],
+        "additionalProperties": false
+      },
       "ProjectCopyError": {
         "type": "object",
         "properties": {
@@ -36199,597 +37039,7 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "ModelV2Info": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "providerID": {
-            "type": "string"
-          },
-          "family": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "api": {
-            "anyOf": [
-              {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "type": {
-                    "type": "string",
-                    "enum": ["aisdk"]
-                  },
-                  "package": {
-                    "type": "string"
-                  },
-                  "url": {
-                    "type": "string"
-                  },
-                  "settings": {
-                    "type": "object"
-                  }
-                },
-                "required": ["id", "type", "package"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "type": {
-                    "type": "string",
-                    "enum": ["native"]
-                  },
-                  "url": {
-                    "type": "string"
-                  },
-                  "settings": {
-                    "type": "object"
-                  }
-                },
-                "required": ["id", "type", "settings"],
-                "additionalProperties": false
-              }
-            ]
-          },
-          "capabilities": {
-            "type": "object",
-            "properties": {
-              "tools": {
-                "type": "boolean"
-              },
-              "input": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "output": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            },
-            "required": ["tools", "input", "output"],
-            "additionalProperties": false
-          },
-          "request": {
-            "type": "object",
-            "properties": {
-              "headers": {
-                "type": "object",
-                "additionalProperties": {
-                  "type": "string"
-                }
-              },
-              "body": {
-                "type": "object"
-              },
-              "generation": {
-                "type": "object",
-                "properties": {
-                  "maxTokens": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "temperature": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "topP": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "topK": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "frequencyPenalty": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "presencePenalty": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "seed": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity", "-Infinity", "NaN"]
-                      }
-                    ]
-                  },
-                  "stop": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  }
-                },
-                "additionalProperties": false
-              },
-              "options": {
-                "type": "object"
-              },
-              "variant": {
-                "type": "string"
-              }
-            },
-            "required": ["headers", "body"],
-            "additionalProperties": false
-          },
-          "variants": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "headers": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "string"
-                  }
-                },
-                "body": {
-                  "type": "object"
-                },
-                "generation": {
-                  "type": "object",
-                  "properties": {
-                    "maxTokens": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "temperature": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "topP": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "topK": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "frequencyPenalty": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "presencePenalty": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "seed": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity", "-Infinity", "NaN"]
-                        }
-                      ]
-                    },
-                    "stop": {
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      }
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "options": {
-                  "type": "object"
-                }
-              },
-              "required": ["id", "headers", "body"],
-              "additionalProperties": false
-            }
-          },
-          "time": {
-            "type": "object",
-            "properties": {
-              "released": {
-                "anyOf": [
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["NaN"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["Infinity"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["-Infinity"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["Infinity", "-Infinity", "NaN"]
-                  }
-                ]
-              }
-            },
-            "required": ["released"],
-            "additionalProperties": false
-          },
-          "cost": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "tier": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "string",
-                      "enum": ["context"]
-                    },
-                    "size": {
-                      "type": "integer"
-                    }
-                  },
-                  "required": ["type", "size"],
-                  "additionalProperties": false
-                },
-                "input": {
-                  "type": "number"
-                },
-                "output": {
-                  "type": "number"
-                },
-                "cache": {
-                  "type": "object",
-                  "properties": {
-                    "read": {
-                      "type": "number"
-                    },
-                    "write": {
-                      "type": "number"
-                    }
-                  },
-                  "required": ["read", "write"],
-                  "additionalProperties": false
-                }
-              },
-              "required": ["input", "output", "cache"],
-              "additionalProperties": false
-            }
-          },
-          "status": {
-            "type": "string",
-            "enum": ["alpha", "beta", "deprecated", "active"]
-          },
-          "enabled": {
-            "type": "boolean"
-          },
-          "limit": {
-            "type": "object",
-            "properties": {
-              "context": {
-                "type": "integer"
-              },
-              "input": {
-                "type": "integer"
-              },
-              "output": {
-                "type": "integer"
-              }
-            },
-            "required": ["context", "output"],
-            "additionalProperties": false
-          }
-        },
-        "required": [
-          "id",
-          "providerID",
-          "name",
-          "api",
-          "capabilities",
-          "request",
-          "variants",
-          "time",
-          "cost",
-          "status",
-          "enabled",
-          "limit"
-        ],
-        "additionalProperties": false
-      },
-      "EventCatalogModelUpdated": {
+      "EventIntegrationUpdated": {
         "type": "object",
         "properties": {
           "id": {
@@ -36797,17 +37047,29 @@
           },
           "type": {
             "type": "string",
-            "enum": ["catalog.model.updated"]
+            "enum": ["integration.updated"]
           },
           "properties": {
             "type": "object",
-            "properties": {
-              "model": {
-                "$ref": "#/components/schemas/ModelV2Info"
-              }
-            },
-            "required": ["model"],
-            "additionalProperties": false
+            "properties": {}
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
+      "EventCatalogUpdated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["catalog.updated"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {}
           }
         },
         "required": ["id", "type", "properties"],
@@ -38918,24 +39180,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventIntegrationUpdated": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["integration.updated"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {}
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
       "PermissionV2Source": {
         "type": "object",
         "properties": {
@@ -42805,6 +43049,596 @@
           }
         ]
       },
+      "ModelV2Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "family": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "api": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string",
+                    "enum": ["aisdk"]
+                  },
+                  "package": {
+                    "type": "string"
+                  },
+                  "url": {
+                    "type": "string"
+                  },
+                  "settings": {
+                    "type": "object"
+                  }
+                },
+                "required": ["id", "type", "package"],
+                "additionalProperties": false
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string",
+                    "enum": ["native"]
+                  },
+                  "url": {
+                    "type": "string"
+                  },
+                  "settings": {
+                    "type": "object"
+                  }
+                },
+                "required": ["id", "type", "settings"],
+                "additionalProperties": false
+              }
+            ]
+          },
+          "capabilities": {
+            "type": "object",
+            "properties": {
+              "tools": {
+                "type": "boolean"
+              },
+              "input": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "output": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": ["tools", "input", "output"],
+            "additionalProperties": false
+          },
+          "request": {
+            "type": "object",
+            "properties": {
+              "headers": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "body": {
+                "type": "object"
+              },
+              "generation": {
+                "type": "object",
+                "properties": {
+                  "maxTokens": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "temperature": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "topP": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "topK": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "frequencyPenalty": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "presencePenalty": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "seed": {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["NaN"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["-Infinity"]
+                      },
+                      {
+                        "type": "string",
+                        "enum": ["Infinity", "-Infinity", "NaN"]
+                      }
+                    ]
+                  },
+                  "stop": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "options": {
+                "type": "object"
+              },
+              "variant": {
+                "type": "string"
+              }
+            },
+            "required": ["headers", "body"],
+            "additionalProperties": false
+          },
+          "variants": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "headers": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                },
+                "body": {
+                  "type": "object"
+                },
+                "generation": {
+                  "type": "object",
+                  "properties": {
+                    "maxTokens": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "temperature": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "topP": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "topK": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "frequencyPenalty": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "presencePenalty": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "seed": {
+                      "anyOf": [
+                        {
+                          "type": "number"
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["NaN"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["-Infinity"]
+                        },
+                        {
+                          "type": "string",
+                          "enum": ["Infinity", "-Infinity", "NaN"]
+                        }
+                      ]
+                    },
+                    "stop": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                "options": {
+                  "type": "object"
+                }
+              },
+              "required": ["id", "headers", "body"],
+              "additionalProperties": false
+            }
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "released": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["NaN"]
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["Infinity"]
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["-Infinity"]
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["Infinity", "-Infinity", "NaN"]
+                  }
+                ]
+              }
+            },
+            "required": ["released"],
+            "additionalProperties": false
+          },
+          "cost": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "tier": {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": ["context"]
+                    },
+                    "size": {
+                      "type": "integer"
+                    }
+                  },
+                  "required": ["type", "size"],
+                  "additionalProperties": false
+                },
+                "input": {
+                  "type": "number"
+                },
+                "output": {
+                  "type": "number"
+                },
+                "cache": {
+                  "type": "object",
+                  "properties": {
+                    "read": {
+                      "type": "number"
+                    },
+                    "write": {
+                      "type": "number"
+                    }
+                  },
+                  "required": ["read", "write"],
+                  "additionalProperties": false
+                }
+              },
+              "required": ["input", "output", "cache"],
+              "additionalProperties": false
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": ["alpha", "beta", "deprecated", "active"]
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "limit": {
+            "type": "object",
+            "properties": {
+              "context": {
+                "type": "integer"
+              },
+              "input": {
+                "type": "integer"
+              },
+              "output": {
+                "type": "integer"
+              }
+            },
+            "required": ["context", "output"],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "providerID",
+          "name",
+          "api",
+          "capabilities",
+          "request",
+          "variants",
+          "time",
+          "cost",
+          "status",
+          "enabled",
+          "limit"
+        ],
+        "additionalProperties": false
+      },
       "ProviderV2Info": {
         "type": "object",
         "properties": {
@@ -42814,61 +43648,8 @@
           "name": {
             "type": "string"
           },
-          "enabled": {
-            "anyOf": [
-              {
-                "type": "boolean",
-                "enum": [false]
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "via": {
-                    "type": "string",
-                    "enum": ["env"]
-                  },
-                  "name": {
-                    "type": "string"
-                  }
-                },
-                "required": ["via", "name"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "via": {
-                    "type": "string",
-                    "enum": ["credential"]
-                  },
-                  "credentialID": {
-                    "type": "string"
-                  }
-                },
-                "required": ["via", "credentialID"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "via": {
-                    "type": "string",
-                    "enum": ["custom"]
-                  },
-                  "data": {
-                    "type": "object"
-                  }
-                },
-                "required": ["via", "data"],
-                "additionalProperties": false
-              }
-            ]
-          },
-          "env": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "disabled": {
+            "type": "boolean"
           },
           "api": {
             "anyOf": [
@@ -42928,7 +43709,7 @@
             "additionalProperties": false
           }
         },
-        "required": ["id", "name", "enabled", "env", "api", "request"],
+        "required": ["id", "name", "api", "request"],
         "additionalProperties": false
       },
       "IntegrationWhen": {
@@ -44370,536 +45151,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "ModelV2Info1": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "providerID": {
-            "type": "string"
-          },
-          "family": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "api": {
-            "anyOf": [
-              {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "type": {
-                    "type": "string",
-                    "enum": ["aisdk"]
-                  },
-                  "package": {
-                    "type": "string"
-                  },
-                  "url": {
-                    "type": "string"
-                  },
-                  "settings": {
-                    "type": "object"
-                  }
-                },
-                "required": ["id", "type", "package"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "type": {
-                    "type": "string",
-                    "enum": ["native"]
-                  },
-                  "url": {
-                    "type": "string"
-                  },
-                  "settings": {
-                    "type": "object"
-                  }
-                },
-                "required": ["id", "type", "settings"],
-                "additionalProperties": false
-              }
-            ]
-          },
-          "capabilities": {
-            "type": "object",
-            "properties": {
-              "tools": {
-                "type": "boolean"
-              },
-              "input": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "output": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            },
-            "required": ["tools", "input", "output"],
-            "additionalProperties": false
-          },
-          "request": {
-            "type": "object",
-            "properties": {
-              "headers": {
-                "type": "object",
-                "additionalProperties": {
-                  "type": "string"
-                }
-              },
-              "body": {
-                "type": "object"
-              },
-              "generation": {
-                "type": "object",
-                "properties": {
-                  "maxTokens": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "temperature": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "topP": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "topK": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "frequencyPenalty": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "presencePenalty": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "seed": {
-                    "anyOf": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["NaN"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["Infinity"]
-                      },
-                      {
-                        "type": "string",
-                        "enum": ["-Infinity"]
-                      }
-                    ]
-                  },
-                  "stop": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  }
-                },
-                "additionalProperties": false
-              },
-              "options": {
-                "type": "object"
-              },
-              "variant": {
-                "type": "string"
-              }
-            },
-            "required": ["headers", "body"],
-            "additionalProperties": false
-          },
-          "variants": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "headers": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "string"
-                  }
-                },
-                "body": {
-                  "type": "object"
-                },
-                "generation": {
-                  "type": "object",
-                  "properties": {
-                    "maxTokens": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "temperature": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "topP": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "topK": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "frequencyPenalty": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "presencePenalty": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "seed": {
-                      "anyOf": [
-                        {
-                          "type": "number"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["NaN"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["Infinity"]
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["-Infinity"]
-                        }
-                      ]
-                    },
-                    "stop": {
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      }
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "options": {
-                  "type": "object"
-                }
-              },
-              "required": ["id", "headers", "body"],
-              "additionalProperties": false
-            }
-          },
-          "time": {
-            "type": "object",
-            "properties": {
-              "released": {
-                "anyOf": [
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["NaN"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["Infinity"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["-Infinity"]
-                  }
-                ]
-              }
-            },
-            "required": ["released"],
-            "additionalProperties": false
-          },
-          "cost": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "tier": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "string",
-                      "enum": ["context"]
-                    },
-                    "size": {
-                      "type": "integer"
-                    }
-                  },
-                  "required": ["type", "size"],
-                  "additionalProperties": false
-                },
-                "input": {
-                  "type": "number"
-                },
-                "output": {
-                  "type": "number"
-                },
-                "cache": {
-                  "type": "object",
-                  "properties": {
-                    "read": {
-                      "type": "number"
-                    },
-                    "write": {
-                      "type": "number"
-                    }
-                  },
-                  "required": ["read", "write"],
-                  "additionalProperties": false
-                }
-              },
-              "required": ["input", "output", "cache"],
-              "additionalProperties": false
-            }
-          },
-          "status": {
-            "type": "string",
-            "enum": ["alpha", "beta", "deprecated", "active"]
-          },
-          "enabled": {
-            "type": "boolean"
-          },
-          "limit": {
-            "type": "object",
-            "properties": {
-              "context": {
-                "type": "integer"
-              },
-              "input": {
-                "type": "integer"
-              },
-              "output": {
-                "type": "integer"
-              }
-            },
-            "required": ["context", "output"],
-            "additionalProperties": false
-          }
-        },
-        "required": [
-          "id",
-          "providerID",
-          "name",
-          "api",
-          "capabilities",
-          "request",
-          "variants",
-          "time",
-          "cost",
-          "status",
-          "enabled",
-          "limit"
-        ],
-        "additionalProperties": false
-      },
       "EventTuiToastShow1": {
         "type": "object",
         "properties": {
@@ -45170,6 +45421,10 @@
       "name": "events",
       "description": "Experimental event stream route."
     },
+    {
+      "name": "pty",
+      "description": "Experimental location-scoped PTY routes."
+    },
     {
       "name": "session questions",
       "description": "Experimental session question routes."
diff --git a/packages/server/src/api.ts b/packages/server/src/api.ts
index ac053551064..100a7246d31 100644
--- a/packages/server/src/api.ts
+++ b/packages/server/src/api.ts
@@ -11,6 +11,7 @@ import { SkillGroup } from "./groups/skill"
 import { EventGroup } from "./groups/event"
 import { AgentGroup } from "./groups/agent"
 import { HealthGroup } from "./groups/health"
+import { PtyGroup } from "./groups/pty"
 import { QuestionGroup } from "./groups/question"
 import { ReferenceGroup } from "./groups/reference"
 import { Authorization } from "./middleware/authorization"
@@ -34,6 +35,7 @@ export const Api = HttpApi.make("server")
   .add(CommandGroup)
   .add(SkillGroup)
   .add(EventGroup)
+  .add(PtyGroup)
   .add(QuestionGroup)
   .add(ReferenceGroup)
   .add(ProjectCopyGroup)
diff --git a/packages/opencode/src/server/cors.ts b/packages/server/src/cors.ts
similarity index 87%
rename from packages/opencode/src/server/cors.ts
rename to packages/server/src/cors.ts
index 66348b8f52b..35258557731 100644
--- a/packages/opencode/src/server/cors.ts
+++ b/packages/server/src/cors.ts
@@ -1,5 +1,5 @@
-import * as KiloServer from "@/kilocode/server/server" // kilocode_change
 import { Context } from "effect"
+import { corsOrigin } from "./kilocode/cors" // kilocode_change
 
 const opencodeOrigin = /^https:\/\/([a-z0-9-]+\.)*opencode\.ai$/
 
@@ -17,9 +17,7 @@ export function isAllowedCorsOrigin(input: string | undefined, opts?: CorsOption
   if (input === "tauri://localhost" || input === "http://tauri.localhost" || input === "https://tauri.localhost")
     return true
   if (opencodeOrigin.test(input)) return true
-  // kilocode_change start
-  if (KiloServer.corsOrigin(input)) return true
-  // kilocode_change end
+  if (corsOrigin(input)) return true // kilocode_change
   return opts?.cors?.includes(input) ?? false
 }
 
diff --git a/packages/server/src/errors.ts b/packages/server/src/errors.ts
index 2b1dcaf1161..2cf1eea5831 100644
--- a/packages/server/src/errors.ts
+++ b/packages/server/src/errors.ts
@@ -84,3 +84,18 @@ export class QuestionNotFoundError extends Schema.TaggedErrorClass<QuestionNotFo
   },
   { httpApiStatus: 404 },
 ) {}
+
+export class ForbiddenError extends Schema.TaggedErrorClass<ForbiddenError>()(
+  "ForbiddenError",
+  { message: Schema.String },
+  { httpApiStatus: 403 },
+) {}
+
+export class PtyNotFoundError extends Schema.TaggedErrorClass<PtyNotFoundError>()(
+  "PtyNotFoundError",
+  {
+    ptyID: Schema.String,
+    message: Schema.String,
+  },
+  { httpApiStatus: 404 },
+) {}
diff --git a/packages/server/src/groups/credential.ts b/packages/server/src/groups/credential.ts
index 648553a3e09..b6e21ca30b7 100644
--- a/packages/server/src/groups/credential.ts
+++ b/packages/server/src/groups/credential.ts
@@ -1,30 +1,38 @@
 import { Credential } from "@opencode-ai/core/credential"
 import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
+import { LocationMiddleware, LocationQuery, locationQueryOpenApi } from "./location"
 
 export const CredentialGroup = HttpApiGroup.make("server.credential")
   .add(
     HttpApiEndpoint.patch("credential.update", "/api/credential/:credentialID", {
       params: { credentialID: Credential.ID },
+      query: LocationQuery,
       payload: Schema.Struct({ label: Schema.String }),
       success: HttpApiSchema.NoContent,
-    }).annotateMerge(
-      OpenApi.annotations({
-        identifier: "v2.credential.update",
-        summary: "Update credential",
-        description: "Update a stored credential label.",
-      }),
-    ),
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.credential.update",
+          summary: "Update credential",
+          description: "Update a stored credential label.",
+        }),
+      ),
   )
   .add(
     HttpApiEndpoint.delete("credential.remove", "/api/credential/:credentialID", {
       params: { credentialID: Credential.ID },
+      query: LocationQuery,
       success: HttpApiSchema.NoContent,
-    }).annotateMerge(
-      OpenApi.annotations({
-        identifier: "v2.credential.remove",
-        summary: "Remove credential",
-        description: "Remove a stored integration credential.",
-      }),
-    ),
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.credential.remove",
+          summary: "Remove credential",
+          description: "Remove a stored integration credential.",
+        }),
+      ),
   )
+  .middleware(LocationMiddleware)
diff --git a/packages/server/src/groups/pty.ts b/packages/server/src/groups/pty.ts
new file mode 100644
index 00000000000..1c07a3e32f6
--- /dev/null
+++ b/packages/server/src/groups/pty.ts
@@ -0,0 +1,144 @@
+import { Pty } from "@opencode-ai/core/pty"
+import { PtyID } from "@opencode-ai/core/pty/schema"
+import { PtyTicket } from "@opencode-ai/core/pty/ticket"
+import { Location } from "@opencode-ai/core/location"
+import { Schema } from "effect"
+import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
+import { ForbiddenError, PtyNotFoundError } from "../errors"
+import { LocationQuery, locationQueryOpenApi, LocationMiddleware } from "./location"
+
+export const PTY_CONNECT_TICKET_QUERY = "ticket"
+export const PTY_CONNECT_TOKEN_HEADER = "x-kilo-ticket"
+export const PTY_CONNECT_TOKEN_HEADER_VALUE = "1"
+
+const PTY_CONNECT_PATH = /^\/api\/pty\/[^/]+\/connect$/
+
+// Authorization middleware skips credential checks when this matches; the PTY connect handler
+// is then responsible for consuming and validating the ticket.
+export function hasPtyConnectTicketURL(url: URL) {
+  return PTY_CONNECT_PATH.test(url.pathname) && !!url.searchParams.get(PTY_CONNECT_TICKET_QUERY)
+}
+
+export const PtyGroup = HttpApiGroup.make("server.pty")
+  .add(
+    HttpApiEndpoint.get("pty.list", "/api/pty", {
+      query: LocationQuery,
+      success: Location.response(Schema.Array(Pty.Info)),
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.pty.list",
+          summary: "List PTY sessions",
+          description: "List PTY sessions for a location, including exited sessions retained until removal.",
+        }),
+      ),
+  )
+  .add(
+    HttpApiEndpoint.post("pty.create", "/api/pty", {
+      query: LocationQuery,
+      payload: Pty.CreateInput,
+      success: Location.response(Pty.Info),
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.pty.create",
+          summary: "Create PTY session",
+          description: "Create a pseudo-terminal session for a location.",
+        }),
+      ),
+  )
+  .add(
+    HttpApiEndpoint.get("pty.get", "/api/pty/:ptyID", {
+      params: { ptyID: PtyID },
+      query: LocationQuery,
+      success: Location.response(Pty.Info),
+      error: PtyNotFoundError,
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.pty.get",
+          summary: "Get PTY session",
+          description: "Get one PTY session, including its exit code once exited.",
+        }),
+      ),
+  )
+  .add(
+    HttpApiEndpoint.put("pty.update", "/api/pty/:ptyID", {
+      params: { ptyID: PtyID },
+      query: LocationQuery,
+      payload: Pty.UpdateInput,
+      success: Location.response(Pty.Info),
+      error: PtyNotFoundError,
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.pty.update",
+          summary: "Update PTY session",
+          description: "Update the title or viewport size of one PTY session.",
+        }),
+      ),
+  )
+  .add(
+    HttpApiEndpoint.delete("pty.remove", "/api/pty/:ptyID", {
+      params: { ptyID: PtyID },
+      query: LocationQuery,
+      success: HttpApiSchema.NoContent,
+      error: PtyNotFoundError,
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.pty.remove",
+          summary: "Remove PTY session",
+          description: "Terminate and remove one PTY session.",
+        }),
+      ),
+  )
+  .add(
+    HttpApiEndpoint.post("pty.connectToken", "/api/pty/:ptyID/connect-token", {
+      params: { ptyID: PtyID },
+      query: LocationQuery,
+      success: Location.response(PtyTicket.ConnectToken),
+      error: [ForbiddenError, PtyNotFoundError],
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.pty.connectToken",
+          summary: "Create PTY WebSocket token",
+          description: "Create a short-lived single-use ticket for opening a PTY WebSocket connection.",
+        }),
+      ),
+  )
+  .add(
+    // Query fields are decoded in the raw handler after the existence check so a missing
+    // session responds with an empty 404 before any upgrade work.
+    HttpApiEndpoint.get("pty.connect", "/api/pty/:ptyID/connect", {
+      params: { ptyID: PtyID },
+      success: Schema.Boolean,
+      error: [ForbiddenError, PtyNotFoundError],
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.pty.connect",
+        summary: "Connect to PTY session",
+        description: "Establish a WebSocket connection streaming PTY output and accepting terminal input.",
+        transform: (operation) => ({
+          ...operation,
+          parameters: [
+            ...(operation.parameters ?? []),
+            ...["location[directory]", "location[workspace]", "cursor", PTY_CONNECT_TICKET_QUERY].map((name) => ({
+              in: "query",
+              name,
+              schema: { type: "string" },
+            })),
+          ],
+        }),
+      }),
+    ),
+  )
+  .annotateMerge(OpenApi.annotations({ title: "pty", description: "Experimental location-scoped PTY routes." }))
+  .middleware(LocationMiddleware)
diff --git a/packages/server/src/handlers.ts b/packages/server/src/handlers.ts
index c4335eca827..1d12dde5505 100644
--- a/packages/server/src/handlers.ts
+++ b/packages/server/src/handlers.ts
@@ -1,5 +1,6 @@
 import { SessionV2 } from "@opencode-ai/core/session"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
+import { PtyTicket } from "@opencode-ai/core/pty/ticket"
 import { Layer } from "effect"
 import { layer as locationLayer } from "./groups/location"
 import { sessionLocationLayer } from "./middleware/session-location"
@@ -14,6 +15,7 @@ import { SkillHandler } from "./handlers/skill"
 import { EventHandler } from "./handlers/event"
 import { AgentHandler } from "./handlers/agent"
 import { HealthHandler } from "./handlers/health"
+import { PtyHandler } from "./handlers/pty"
 import { QuestionHandler } from "./handlers/question"
 import { ReferenceHandler } from "./handlers/reference"
 import * as SessionExecutionLocal from "@opencode-ai/core/session/execution/local"
@@ -38,6 +40,7 @@ export const handlers = Layer.mergeAll(
   CommandHandler,
   SkillHandler,
   EventHandler,
+  PtyHandler,
   QuestionHandler,
   ReferenceHandler,
   ProjectCopyHandler,
@@ -47,6 +50,7 @@ export const handlers = Layer.mergeAll(
   Layer.provide(SessionV2.defaultLayer),
   Layer.provide(SessionExecutionLocal.defaultLayer),
   Layer.provide(PermissionSaved.defaultLayer),
+  Layer.provide(PtyTicket.defaultLayer),
   // kilocode_change - the host provides LocationServiceMap so Kilo can install effective-reference initialization
   Layer.provide(Credential.defaultLayer),
 )
diff --git a/packages/server/src/handlers/credential.ts b/packages/server/src/handlers/credential.ts
index 7203060f289..7e138a5d5a2 100644
--- a/packages/server/src/handlers/credential.ts
+++ b/packages/server/src/handlers/credential.ts
@@ -1,4 +1,4 @@
-import { Credential } from "@opencode-ai/core/credential"
+import { Integration } from "@opencode-ai/core/integration"
 import { Effect } from "effect"
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
 import { Api } from "../api"
@@ -8,14 +8,14 @@ export const CredentialHandler = HttpApiBuilder.group(Api, "server.credential",
     .handle(
       "credential.update",
       Effect.fn(function* (ctx) {
-        yield* (yield* Credential.Service).update(ctx.params.credentialID, { label: ctx.payload.label })
+        yield* (yield* Integration.Service).connection.update(ctx.params.credentialID, { label: ctx.payload.label })
         return HttpApiSchema.NoContent.make()
       }),
     )
     .handle(
       "credential.remove",
       Effect.fn(function* (ctx) {
-        yield* (yield* Credential.Service).remove(ctx.params.credentialID)
+        yield* (yield* Integration.Service).connection.remove(ctx.params.credentialID)
         return HttpApiSchema.NoContent.make()
       }),
     ),
diff --git a/packages/server/src/handlers/integration.ts b/packages/server/src/handlers/integration.ts
index 70cfbfa68bc..d7c651e847a 100644
--- a/packages/server/src/handlers/integration.ts
+++ b/packages/server/src/handlers/integration.ts
@@ -38,7 +38,7 @@ export const IntegrationHandler = HttpApiBuilder.group(Api, "server.integration"
         Effect.fn(function* (ctx) {
           const service = yield* Integration.Service
           yield* authorize(
-            service.connect.key({
+            service.connection.key({
               integrationID: ctx.params.integrationID,
               key: ctx.payload.key,
               label: ctx.payload.label,
@@ -53,7 +53,7 @@ export const IntegrationHandler = HttpApiBuilder.group(Api, "server.integration"
           const service = yield* Integration.Service
           return yield* response(
             authorize(
-              service.connect.oauth({
+              service.connection.oauth({
                 integrationID: ctx.params.integrationID,
                 methodID: ctx.payload.methodID,
                 inputs: ctx.payload.inputs,
diff --git a/packages/server/src/handlers/pty.ts b/packages/server/src/handlers/pty.ts
new file mode 100644
index 00000000000..a59afb3b316
--- /dev/null
+++ b/packages/server/src/handlers/pty.ts
@@ -0,0 +1,219 @@
+import { Pty } from "@opencode-ai/core/pty"
+import { PtyProtocol } from "@opencode-ai/core/pty/protocol"
+import { PtyTicket } from "@opencode-ai/core/pty/ticket"
+import { Location } from "@opencode-ai/core/location"
+import { Effect, Queue } from "effect"
+import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
+import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
+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 { response } from "../groups/location"
+import { PtyEnvironment } from "../pty-environment"
+
+const ticketScope = Effect.gen(function* () {
+  const location = yield* Location.Service
+  return { directory: location.directory as string, workspaceID: location.workspaceID }
+})
+
+export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) =>
+  Effect.gen(function* () {
+    const tickets = yield* PtyTicket.Service
+    const cors = yield* CorsConfig
+    const environment = yield* PtyEnvironment.Service
+
+    return handlers
+      .handle(
+        "pty.list",
+        Effect.fn(function* () {
+          return yield* response((yield* Pty.Service).list())
+        }),
+      )
+      .handle(
+        "pty.create",
+        Effect.fn(function* (ctx) {
+          const pty = yield* Pty.Service
+          const location = yield* Location.Service
+          const cwd = ctx.payload.cwd || location.directory
+          return yield* response(
+            pty.create({
+              ...ctx.payload,
+              args: ctx.payload.args ? [...ctx.payload.args] : undefined,
+              cwd,
+              env: {
+                ...ctx.payload.env,
+                ...(yield* environment.get({ directory: location.directory, cwd })),
+              },
+            }),
+          )
+        }),
+      )
+      .handle(
+        "pty.get",
+        Effect.fn(function* (ctx) {
+          const pty = yield* Pty.Service
+          return yield* response(
+            pty.get(ctx.params.ptyID).pipe(
+              Effect.catchTag(
+                "Pty.NotFoundError",
+                () =>
+                  new PtyNotFoundError({
+                    ptyID: ctx.params.ptyID,
+                    message: `PTY session not found: ${ctx.params.ptyID}`,
+                  }),
+              ),
+            ),
+          )
+        }),
+      )
+      .handle(
+        "pty.update",
+        Effect.fn(function* (ctx) {
+          const pty = yield* Pty.Service
+          return yield* response(
+            pty
+              .update(ctx.params.ptyID, {
+                ...ctx.payload,
+                size: ctx.payload.size ? { ...ctx.payload.size } : undefined,
+              })
+              .pipe(
+                Effect.catchTag(
+                  "Pty.NotFoundError",
+                  () =>
+                    new PtyNotFoundError({
+                      ptyID: ctx.params.ptyID,
+                      message: `PTY session not found: ${ctx.params.ptyID}`,
+                    }),
+                ),
+              ),
+          )
+        }),
+      )
+      .handle(
+        "pty.remove",
+        Effect.fn(function* (ctx) {
+          const pty = yield* Pty.Service
+          yield* pty.remove(ctx.params.ptyID).pipe(
+            Effect.catchTag(
+              "Pty.NotFoundError",
+              () =>
+                new PtyNotFoundError({
+                  ptyID: ctx.params.ptyID,
+                  message: `PTY session not found: ${ctx.params.ptyID}`,
+                }),
+            ),
+          )
+          return HttpApiSchema.NoContent.make()
+        }),
+      )
+      .handle(
+        "pty.connectToken",
+        Effect.fn(function* (ctx) {
+          const request = yield* HttpServerRequest.HttpServerRequest
+          // The custom header forces a CORS preflight, so cross-origin browser pages cannot
+          // mint tickets without passing the server's origin policy.
+          if (
+            request.headers[PTY_CONNECT_TOKEN_HEADER] !== PTY_CONNECT_TOKEN_HEADER_VALUE ||
+            !isAllowedRequestOrigin(request.headers.origin, request.headers.host, cors)
+          )
+            return yield* new ForbiddenError({ message: "Invalid PTY connect token request" })
+          const pty = yield* Pty.Service
+          yield* pty.get(ctx.params.ptyID).pipe(
+            Effect.catchTag(
+              "Pty.NotFoundError",
+              () =>
+                new PtyNotFoundError({
+                  ptyID: ctx.params.ptyID,
+                  message: `PTY session not found: ${ctx.params.ptyID}`,
+                }),
+            ),
+          )
+          return yield* response(tickets.issue({ ptyID: ctx.params.ptyID, ...(yield* ticketScope) }))
+        }),
+      )
+      .handleRaw(
+        "pty.connect",
+        Effect.fn("PtyHandler.connect")(function* (ctx) {
+          const pty = yield* Pty.Service
+          const exists = yield* pty.get(ctx.params.ptyID).pipe(
+            Effect.as(true),
+            Effect.catchTag("Pty.NotFoundError", () => Effect.succeed(false)),
+          )
+          if (!exists) return HttpServerResponse.empty({ status: 404 })
+
+          const url = new URL(ctx.request.url, "http://localhost")
+          const ticket = url.searchParams.get(PTY_CONNECT_TICKET_QUERY)
+          if (ticket) {
+            const valid = isAllowedRequestOrigin(ctx.request.headers.origin, ctx.request.headers.host, cors)
+              ? yield* tickets.consume({ ticket, ptyID: ctx.params.ptyID, ...(yield* ticketScope) })
+              : false
+            if (!valid) return HttpServerResponse.empty({ status: 403 })
+          }
+          const parsedCursor = url.searchParams.get("cursor")
+          const cursorNumber = parsedCursor === null ? undefined : Number(parsedCursor)
+          const cursor =
+            cursorNumber !== undefined && Number.isSafeInteger(cursorNumber) && cursorNumber >= -1
+              ? cursorNumber
+              : undefined
+
+          const socket = yield* Effect.orDie(ctx.request.upgrade)
+          const write = yield* socket.writer
+          const closeAccepted = (event: Socket.CloseEvent) =>
+            socket
+              .runRaw(() => Effect.void, { onOpen: write(event).pipe(Effect.catch(() => Effect.void)) })
+              .pipe(
+                Effect.timeout("1 second"),
+                Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
+                Effect.catch(() => Effect.void),
+              )
+
+          // Outbound frames flow through one queue drained by a single writer so replay, live
+          // output, and the close frame keep their order.
+          // TODO: Integrate graceful-shutdown socket tracking before clients migrate to this route.
+          const outbox = yield* Queue.unbounded<string | Uint8Array | Socket.CloseEvent>()
+          const attachment = yield* pty
+            .attach(ctx.params.ptyID, {
+              cursor,
+              onData: (chunk) => Queue.offerUnsafe(outbox, chunk),
+              onEnd: () => Queue.offerUnsafe(outbox, new Socket.CloseEvent(1000)),
+            })
+            .pipe(
+              Effect.catchTags({
+                "Pty.NotFoundError": () =>
+                  closeAccepted(new Socket.CloseEvent(4404, "session not found")).pipe(Effect.as(undefined)),
+                "Pty.ExitedError": () =>
+                  closeAccepted(new Socket.CloseEvent(4404, "session exited")).pipe(Effect.as(undefined)),
+              }),
+            )
+          if (!attachment) return HttpServerResponse.empty()
+
+          for (const chunk of PtyProtocol.chunks(attachment.replay)) Queue.offerUnsafe(outbox, chunk)
+          Queue.offerUnsafe(outbox, PtyProtocol.metaFrame(attachment.cursor))
+          attachment.activate()
+
+          const drain = Effect.gen(function* () {
+            while (true) {
+              const item = yield* Queue.take(outbox)
+              yield* write(item)
+              if (item instanceof Socket.CloseEvent) return
+            }
+          })
+
+          yield* Effect.race(
+            drain,
+            socket.runRaw((message) => {
+              const decoded = PtyProtocol.decodeInput(message)
+              if (decoded !== undefined) attachment.write(decoded)
+            }),
+          ).pipe(
+            Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
+            Effect.ensuring(Effect.sync(() => attachment.detach())),
+            Effect.orDie,
+          )
+          return HttpServerResponse.empty()
+        }),
+      )
+  }),
+)
diff --git a/packages/server/src/kilocode/cors.ts b/packages/server/src/kilocode/cors.ts
new file mode 100644
index 00000000000..ba97a1fbbb4
--- /dev/null
+++ b/packages/server/src/kilocode/cors.ts
@@ -0,0 +1,5 @@
+const origin = /^https:\/\/([a-z0-9-]+\.)*kilo\.ai$/
+
+export function corsOrigin(input: string) {
+  return origin.test(input)
+}
diff --git a/packages/server/src/middleware/authorization.ts b/packages/server/src/middleware/authorization.ts
index edbc85bb4f8..5a8dae205db 100644
--- a/packages/server/src/middleware/authorization.ts
+++ b/packages/server/src/middleware/authorization.ts
@@ -1,5 +1,6 @@
 import { ServerAuth } from "../auth"
 import { UnauthorizedError } from "../errors"
+import { hasPtyConnectTicketURL } from "../groups/pty"
 import { Effect, Encoding, Layer, Redacted } from "effect"
 import { HttpEffect, HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
 import { HttpApiMiddleware } from "effect/unstable/httpapi"
@@ -45,6 +46,9 @@ export const authorizationLayer = Layer.effect(
     return Authorization.of((effect) =>
       Effect.gen(function* () {
         const request = yield* HttpServerRequest.HttpServerRequest
+        // Browsers cannot set headers on WebSocket upgrades, so a ticketed PTY connect skips
+        // credential checks here; the connect handler consumes and validates the ticket.
+        if (hasPtyConnectTicketURL(new URL(request.url, "http://localhost"))) return yield* effect
         const credential = yield* credentialFromRequest(request)
         if (ServerAuth.authorized(credential, config)) return yield* effect
         yield* HttpEffect.appendPreResponseHandler((_request, response) =>
diff --git a/packages/server/src/pty-environment.ts b/packages/server/src/pty-environment.ts
new file mode 100644
index 00000000000..fe3a375cdc8
--- /dev/null
+++ b/packages/server/src/pty-environment.ts
@@ -0,0 +1,16 @@
+export * as PtyEnvironment from "./pty-environment"
+
+import { Context, Effect, Layer } from "effect"
+
+export interface Interface {
+  readonly get: (input: { directory: string; cwd: string }) => Effect.Effect<Record<string, string>>
+}
+
+export class Service extends Context.Service<Service, Interface>()("@opencode/ServerPtyEnvironment") {}
+
+export const defaultLayer = Layer.succeed(
+  Service,
+  Service.of({
+    get: () => Effect.succeed({}),
+  }),
+)
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index 48c95094dc6..2563c9a806e 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -9,11 +9,13 @@ import { ServerAuth } from "./auth"
 import { handlers } from "./handlers"
 import { authorizationLayer } from "./middleware/authorization"
 import { schemaErrorLayer } from "./middleware/schema-error"
+import { PtyEnvironment } from "./pty-environment"
 import { noop as referenceNoop } from "./kilocode/reference-reconciler" // kilocode_change
 
 export function createRoutes(password?: string) {
   return HttpApiBuilder.layer(Api, { openapiPath: "/openapi.json" }).pipe(
     Layer.provide(handlers),
+    Layer.provide(PtyEnvironment.defaultLayer),
     Layer.provide(referenceNoop), // kilocode_change - standalone server has no Kilo config reconciler
     Layer.provide(authorizationLayer),
     Layer.provide(schemaErrorLayer),
diff --git a/packages/server/sst-env.d.ts b/packages/server/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/server/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/storybook/.storybook/main.ts b/packages/storybook/.storybook/main.ts
index efe7fae5d3e..2d1144a0aa0 100644
--- a/packages/storybook/.storybook/main.ts
+++ b/packages/storybook/.storybook/main.ts
@@ -20,7 +20,7 @@ export default defineMain({
     "@storybook/addon-a11y",
     "@storybook/addon-vitest",
   ],
-  stories: ["../../ui/src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+  stories: ["../../ui/src/**/*.stories.@(js|jsx|mjs|ts|tsx)", "../../app/src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
   async viteFinal(config) {
     const { mergeConfig, searchForWorkspaceRoot } = await import("vite")
     return mergeConfig(config, {
diff --git a/packages/storybook/.storybook/mocks/app/context/permission.ts b/packages/storybook/.storybook/mocks/app/context/permission.ts
index b6fb37d96b7..bfae134a7fd 100644
--- a/packages/storybook/.storybook/mocks/app/context/permission.ts
+++ b/packages/storybook/.storybook/mocks/app/context/permission.ts
@@ -12,6 +12,9 @@ export function usePermission() {
     isAutoAccepting(sessionID: string, directory?: string) {
       return accepted.has(key(sessionID, directory))
     },
+    isAutoAcceptingDirectory() {
+      return false
+    },
     toggleAutoAccept(sessionID: string, directory?: string) {
       const next = key(sessionID, directory)
       if (accepted.has(next)) {
diff --git a/packages/storybook/.storybook/mocks/app/context/prompt.ts b/packages/storybook/.storybook/mocks/app/context/prompt.ts
index e5e0e5d3354..1e38313b8c9 100644
--- a/packages/storybook/.storybook/mocks/app/context/prompt.ts
+++ b/packages/storybook/.storybook/mocks/app/context/prompt.ts
@@ -1,4 +1,4 @@
-import { createSignal } from "solid-js"
+import { createStore } from "solid-js/store"
 
 interface PartBase {
   content: string
@@ -60,48 +60,50 @@ export function isPromptEqual(a: Prompt, b: Prompt) {
   return a.every((part, i) => JSON.stringify(part) === JSON.stringify(b[i]))
 }
 
-let index = 0
-const [prompt, setPrompt] = createSignal<Prompt>(clonePrompt(DEFAULT_PROMPT))
-const [cursor, setCursor] = createSignal<number>(0)
-const [items, setItems] = createSignal<ContextItem[]>([])
+export function createPromptState() {
+  const [store, setStore] = createStore({
+    prompt: clonePrompt(DEFAULT_PROMPT),
+    cursor: 0,
+    items: [] as ContextItem[],
+  })
+  let index = 0
+  const ready = Object.assign(() => true, { promise: Promise.resolve(true) })
+  const withKey = (item: Omit<ContextItem, "key"> & { key?: string }): ContextItem => ({
+    ...item,
+    key: item.key ?? `ctx:${++index}`,
+  })
 
-const withKey = (item: Omit<ContextItem, "key"> & { key?: string }): ContextItem => ({
-  ...item,
-  key: item.key ?? `ctx:${++index}`,
-})
-
-export function usePrompt() {
   return {
-    ready: () => true,
-    current: prompt,
-    cursor,
-    dirty: () => !isPromptEqual(prompt(), DEFAULT_PROMPT),
+    ready: () => ready,
+    current: () => store.prompt,
+    cursor: () => store.cursor,
+    dirty: () => !isPromptEqual(store.prompt, DEFAULT_PROMPT),
     set(next: Prompt, cursorPosition?: number) {
-      setPrompt(clonePrompt(next))
-      if (cursorPosition !== undefined) setCursor(cursorPosition)
+      setStore("prompt", clonePrompt(next))
+      if (cursorPosition !== undefined) setStore("cursor", cursorPosition)
     },
     reset() {
-      setPrompt(clonePrompt(DEFAULT_PROMPT))
-      setCursor(0)
-      setItems((current) => current.filter((item) => !!item.comment?.trim()))
+      setStore("prompt", clonePrompt(DEFAULT_PROMPT))
+      setStore("cursor", 0)
+      setStore("items", (current) => current.filter((item) => !!item.comment?.trim()))
     },
     context: {
-      items,
+      items: () => store.items,
       add(item: Omit<ContextItem, "key"> & { key?: string }) {
         const next = withKey(item)
-        if (items().some((current) => current.key === next.key)) return
-        setItems((current) => [...current, next])
+        if (store.items.some((current) => current.key === next.key)) return
+        setStore("items", (current) => [...current, next])
       },
       remove(key: string) {
-        setItems((current) => current.filter((item) => item.key !== key))
+        setStore("items", (current) => current.filter((item) => item.key !== key))
       },
       removeComment(path: string, commentID: string) {
-        setItems((current) =>
+        setStore("items", (current) =>
           current.filter((item) => !(item.type === "file" && item.path === path && item.commentID === commentID)),
         )
       },
       updateComment(path: string, commentID: string, next: Partial<ContextItem>) {
-        setItems((current) =>
+        setStore("items", (current) =>
           current.map((item) => {
             if (item.type !== "file" || item.path !== path || item.commentID !== commentID) return item
             return withKey({ ...item, ...next })
@@ -109,9 +111,15 @@ export function usePrompt() {
         )
       },
       replaceComments(next: Array<Omit<ContextItem, "key"> & { key?: string }>) {
-        const nonComment = items().filter((item) => !item.comment?.trim())
-        setItems([...nonComment, ...next.map(withKey)])
+        const nonComment = store.items.filter((item) => !item.comment?.trim())
+        setStore("items", [...nonComment, ...next.map(withKey)])
       },
     },
   }
 }
+
+const prompt = createPromptState()
+
+export function usePrompt() {
+  return prompt
+}
diff --git a/packages/storybook/.storybook/mocks/app/context/sdk.ts b/packages/storybook/.storybook/mocks/app/context/sdk.ts
index c37d682496d..749772bb3e1 100644
--- a/packages/storybook/.storybook/mocks/app/context/sdk.ts
+++ b/packages/storybook/.storybook/mocks/app/context/sdk.ts
@@ -12,14 +12,16 @@ const make = (directory: string) => ({
 })
 
 const root = "/tmp/story"
+const sdk = {
+  directory: root,
+  scope: "story-server",
+  url: "http://localhost:4096",
+  client: make(root),
+  createClient(input: { directory: string }) {
+    return make(input.directory)
+  },
+}
 
 export function useSDK() {
-  return {
-    directory: root,
-    url: "http://localhost:4096",
-    client: make(root),
-    createClient(input: { directory: string }) {
-      return make(input.directory)
-    },
-  }
+  return () => sdk
 }
diff --git a/packages/storybook/.storybook/mocks/app/context/sync.ts b/packages/storybook/.storybook/mocks/app/context/sync.ts
index bfc49dc83a9..6f554fd7dde 100644
--- a/packages/storybook/.storybook/mocks/app/context/sync.ts
+++ b/packages/storybook/.storybook/mocks/app/context/sync.ts
@@ -9,24 +9,27 @@ const [data, setData] = createStore({
     "story-session": [] as Array<{ id: string; role: string }>,
   } as Record<string, Array<{ id: string; role: string }>>,
   session_status: {} as Record<string, { type: "idle" | "busy" }>,
+  session_working: () => false,
   agent: [{ name: "build", mode: "task", hidden: false }],
   command: [{ name: "fix", description: "Run fix command", source: "project" }],
 })
 
-export function useSync() {
-  return {
-    data,
-    set(...input: unknown[]) {
-      ;(setData as (...args: unknown[]) => void)(...input)
+const sync = {
+  data,
+  set(...input: unknown[]) {
+    ;(setData as (...args: unknown[]) => void)(...input)
+  },
+  session: {
+    get(id: string) {
+      return { id }
     },
-    session: {
-      get(id: string) {
-        return { id }
-      },
-      optimistic: {
-        add() {},
-        remove() {},
-      },
+    optimistic: {
+      add() {},
+      remove() {},
     },
-  }
+  },
+}
+
+export function useSync() {
+  return () => sync
 }
diff --git a/packages/storybook/.storybook/mocks/solid-router.tsx b/packages/storybook/.storybook/mocks/solid-router.tsx
index c1bda30f4bd..6a2b53feb09 100644
--- a/packages/storybook/.storybook/mocks/solid-router.tsx
+++ b/packages/storybook/.storybook/mocks/solid-router.tsx
@@ -11,6 +11,10 @@ export function useNavigate() {
   return () => undefined
 }
 
+export function useSearchParams<T extends Record<string, string>>() {
+  return [{} as Partial<T>, () => undefined] as const
+}
+
 export function useLocation() {
   return {
     pathname: "/story/session/story-session",
diff --git a/packages/storybook/.storybook/preview.tsx b/packages/storybook/.storybook/preview.tsx
index 4e28e430391..7b892f76836 100644
--- a/packages/storybook/.storybook/preview.tsx
+++ b/packages/storybook/.storybook/preview.tsx
@@ -1,4 +1,5 @@
 import "@opencode-ai/ui/styles/tailwind"
+import "@opencode-ai/ui/v2/styles/tailwind.css"
 
 import { createEffect, onCleanup, onMount } from "solid-js"
 import addonA11y from "@storybook/addon-a11y"
diff --git a/packages/storybook/sst-env.d.ts b/packages/storybook/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/storybook/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/packages/tui/package.json b/packages/tui/package.json
index e0e563ed98b..344179e4d08 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -7,8 +7,8 @@
   "license": "MIT",
   "scripts": {
     "test": "bun test --timeout 30000 --only-failures",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "tsgo --noEmit",
+    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml"
   },
   "exports": {
     ".": "./src/index.tsx",
@@ -69,5 +69,6 @@
     "@tsconfig/bun": "catalog:",
     "@types/bun": "catalog:",
     "@typescript/native-preview": "catalog:"
-  }
+  },
+  "peerDependencies": {}
 }
diff --git a/packages/tui/src/component/dialog-console-org.tsx b/packages/tui/src/component/dialog-console-org.tsx
index b8c61a51c0c..b571d63b47b 100644
--- a/packages/tui/src/component/dialog-console-org.tsx
+++ b/packages/tui/src/component/dialog-console-org.tsx
@@ -1,9 +1,11 @@
-import { createResource, createMemo } from "solid-js"
+import { createResource, createMemo, createSignal } from "solid-js"
+import { TextAttributes } from "@opentui/core"
 import { DialogSelect } from "../ui/dialog-select"
 import { useSDK } from "../context/sdk"
 import { useDialog } from "../ui/dialog"
 import { useToast } from "../ui/toast"
 import { useTheme } from "../context/theme"
+import { errorMessage } from "../util/error"
 import type { ExperimentalConsoleListOrgsResponse } from "@kilocode/sdk/v2"
 
 type OrgOption = ExperimentalConsoleListOrgsResponse["orgs"][number]
@@ -25,14 +27,26 @@ export function DialogConsoleOrg() {
   const toast = useToast()
   const { theme } = useTheme()
 
-  const [orgs] = createResource(async () => {
-    const result = await sdk.client.experimental.console.listOrgs({}, { throwOnError: true })
-    return result.data?.orgs ?? []
-  })
+  const [loadError, setLoadError] = createSignal<unknown>()
+
+  const [orgs] = createResource(() =>
+    sdk.client.experimental.console
+      .listOrgs({}, { throwOnError: true })
+      .then((result) => result.data?.orgs ?? [])
+      // Catch so the rejected resource never reaches the memos below: reading
+      // orgs() in an errored state re-throws and tears down the dialog.
+      .catch((error) => {
+        setLoadError(error)
+        return undefined
+      }),
+  )
+
+  const showError = createMemo(() => Boolean(loadError()))
 
   const current = createMemo(() => orgs()?.find((item) => item.active))
 
   const options = createMemo(() => {
+    if (showError()) return []
     const listed = orgs()
     if (listed === undefined) {
       return [
@@ -99,5 +113,23 @@ export function DialogConsoleOrg() {
       }))
   })
 
-  return <DialogSelect<string | OrgOption> title="Switch org" options={options()} current={current()} />
+  return (
+    <DialogSelect<string | OrgOption>
+      title="Switch org"
+      options={options()}
+      current={current()}
+      renderFilter={!showError()}
+      locked={showError()}
+      emptyView={
+        showError() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.error} attributes={TextAttributes.BOLD}>
+              Could not load orgs
+            </text>
+            <text fg={theme.textMuted}>{errorMessage(loadError())}</text>
+          </box>
+        ) : undefined
+      }
+    />
+  )
 }
diff --git a/packages/tui/src/component/dialog-move-session.tsx b/packages/tui/src/component/dialog-move-session.tsx
index 251c24ba26f..2fb58247044 100644
--- a/packages/tui/src/component/dialog-move-session.tsx
+++ b/packages/tui/src/component/dialog-move-session.tsx
@@ -22,14 +22,16 @@ import { useRoute } from "../context/route"
 export type MoveSessionSelection = { type: "directory"; directory: string; subdirectory: boolean } | { type: "new" }
 type ProjectDirectory = ProjectDirectories[number]
 
-export function DialogMoveSession(props: {
+type DialogMoveSessionProps = {
   projectID: string
   current?: MoveSessionSelection
   onSelect: (selection: MoveSessionSelection) => void
   onCurrentChange?: (selection: MoveSessionSelection) => void
   initialDirectories?: ProjectDirectory[]
   initialRemoving?: string
-}) {
+}
+
+export function DialogMoveSession(props: DialogMoveSessionProps) {
   const dialog = useDialog()
   const sdk = useSDK()
   const dimensions = useTerminalDimensions()
@@ -43,62 +45,75 @@ export function DialogMoveSession(props: {
   const [toDelete, setToDelete] = createSignal<string>()
   const [removing, setRemoving] = createSignal(props.initialRemoving)
   const [replacementCurrent, setReplacementCurrent] = createSignal<string>()
+  const [loadError, setLoadError] = createSignal<unknown>()
   const deleteHint = useCommandShortcut("dialog.move_session.delete")
+  onMount(() => dialog.setSize("xlarge"))
 
   function reopen(initialRemoving?: string) {
     dialog.replace(() => (
-      <DialogMoveSession {...props} initialDirectories={directories()} initialRemoving={initialRemoving} />
+      <DialogMoveSession {...props} initialDirectories={directoryData()} initialRemoving={initialRemoving} />
     ))
   }
 
+  // A failed current-checkout lookup only affects which row is highlighted, so
+  // swallow it and let the directory list render without a current marker.
   const [loadedProject] = createResource(
     () => (projectContext.project() === props.projectID ? undefined : props.projectID),
-    async (projectID) => {
-      const result = await sdk.client.project.current({}, { throwOnError: true })
-      return result.data?.id === projectID ? result.data.worktree : undefined
-    },
-  )
-  const currentCheckout = createMemo(() =>
-    projectContext.project() === props.projectID ? projectContext.instance.path().worktree : loadedProject(),
+    (projectID) =>
+      sdk.client.project
+        .current({}, { throwOnError: true })
+        .then((result) => (result.data?.id === projectID ? result.data.worktree : undefined))
+        .catch(() => undefined),
   )
+  const currentCheckout = createMemo(() => {
+    if (projectContext.project() === props.projectID) return projectContext.instance.path().worktree
+    return loadedProject()
+  })
 
   const [directories, { refetch }] = createResource(
     () => (props.initialRemoving ? undefined : props.projectID),
-    async (projectID) => {
-      setWorking(true)
+    async (projectID, info): Promise<ProjectDirectory[] | undefined> => {
       try {
         await sdk.client.v2.projectCopy.refresh(
           { projectID, location: { directory: sdk.directory } },
           { throwOnError: true },
         )
         const directories = await sdk.client.project.directories({ projectID }, { throwOnError: true })
+        setLoadError(undefined)
         return directories.data ?? []
-      } finally {
-        setWorking(false)
+      } catch (error) {
+        setLoadError(error)
+        // An initial load with no data surfaces the inline error view below. A
+        // failed refresh intentionally stays quiet and keeps the already-shown
+        // list interactive; reopening the dialog retries the load.
+        return info.value
       }
     },
-    { initialValue: props.initialDirectories },
   )
+  const directoryData = createMemo(() => directories() ?? props.initialDirectories)
+  // Show the locked error view only when we have nothing to display. A refresh
+  // that fails after the list rendered keeps the list and its actions.
+  const showError = createMemo(() => Boolean(loadError()) && !directoryData())
 
   const currentDirectory = createMemo(
     () => replacementCurrent() ?? (props.current?.type === "directory" ? props.current.directory : currentCheckout()),
   )
   const currentRoot = createMemo<ProjectDirectory | undefined>(() => {
+    if (showError()) return
     const directory = currentDirectory()
     if (!directory) return
     return (
-      directories()
+      directoryData()
         ?.filter((root) => contains(root.directory, directory))
         .toSorted((a, b) => b.directory.length - a.directory.length)[0] ?? { directory }
     )
   })
 
   const options = createMemo<DialogSelectOption<MoveSessionSelection | undefined>[]>(() => {
-    const data = directories()
+    if (showError()) return []
+    const data = directoryData()
     const current = currentRoot()?.directory
     if (directories.loading && !data && !current) return [{ title: "Loading project directories...", value: undefined }]
-    if (directories.error && !data && !current)
-      return [{ title: "Failed to load project directories", value: undefined }]
     const roots = [...(data ?? [])]
     if (current && !roots.some((item) => item.directory === current)) roots.unshift({ directory: current })
     roots.sort((a, b) => {
@@ -194,7 +209,7 @@ export function DialogMoveSession(props: {
 
   async function remove(option: DialogSelectOption<MoveSessionSelection | undefined>) {
     if (!option.value || option.value.type !== "directory" || option.value.subdirectory || removing()) return
-    const data = directories()
+    const data = directoryData()
     const selected = option.value
     const root = data?.find((item) => item.directory === selected.directory)
     if (!root?.strategy) return
@@ -264,10 +279,12 @@ export function DialogMoveSession(props: {
     if (await removedCurrent(deletingCurrent)) return
   }
 
-  onMount(() => dialog.setSize("xlarge"))
+  const fullHeight = createMemo(() =>
+    Math.max(8, Math.min(16, dimensions().height - Math.floor(dimensions().height / 4) - 2)),
+  )
 
   return (
-    <box minHeight={Math.max(8, Math.min(16, dimensions().height - Math.floor(dimensions().height / 4) - 2))}>
+    <box minHeight={showError() ? 5 : fullHeight()}>
       <DialogSelect
         title="Move session"
         titleView={
@@ -275,40 +292,55 @@ export function DialogMoveSession(props: {
             <text fg={theme.text} attributes={TextAttributes.BOLD}>
               Move session
             </text>
-            <Show when={working()}>
+            <Show when={working() || directories.loading || loadedProject.loading}>
               <Spinner />
             </Show>
           </box>
         }
+        renderFilter={!showError()}
         options={options()}
-        locked={directories.loading || loadedProject.loading || Boolean(removing())}
+        emptyView={
+          showError() ? (
+            <box paddingLeft={4} paddingRight={4}>
+              <text fg={theme.error} attributes={TextAttributes.BOLD}>
+                Could not load project directories
+              </text>
+              <text fg={theme.textMuted}>{errorMessage(loadError())}</text>
+            </box>
+          ) : undefined
+        }
+        locked={showError() || directories.loading || loadedProject.loading || Boolean(removing())}
         current={current()}
         onSelect={(option) => {
           if (option.value) props.onSelect(option.value)
         }}
         onMove={() => setToDelete(undefined)}
-        actions={[
-          {
-            command: "dialog.move_session.new",
-            title: "new",
-            onTrigger: () => props.onSelect({ type: "new" }),
-          },
-          {
-            command: "dialog.move_session.delete",
-            title: "delete",
-            disabled: (option) => {
-              const value = option?.value
-              if (!value || value.type !== "directory" || value.subdirectory) return true
-              return !directories()?.find((item) => item.directory === value.directory)?.strategy
-            },
-            onTrigger: remove,
-          },
-          {
-            command: "dialog.move_session.refresh",
-            title: "refresh",
-            onTrigger: () => void refetch(),
-          },
-        ]}
+        actions={
+          showError()
+            ? []
+            : [
+                {
+                  command: "dialog.move_session.new",
+                  title: "new",
+                  onTrigger: () => props.onSelect({ type: "new" }),
+                },
+                {
+                  command: "dialog.move_session.delete",
+                  title: "delete",
+                  disabled: (option) => {
+                    const value = option?.value
+                    if (!value || value.type !== "directory" || value.subdirectory) return true
+                    return !directoryData()?.find((item) => item.directory === value.directory)?.strategy
+                  },
+                  onTrigger: remove,
+                },
+                {
+                  command: "dialog.move_session.refresh",
+                  title: "refresh",
+                  onTrigger: () => void refetch(),
+                },
+              ]
+        }
       />
     </box>
   )
diff --git a/packages/tui/src/component/prompt/autocomplete.tsx b/packages/tui/src/component/prompt/autocomplete.tsx
index cc6d28306d0..82df3d2f7dd 100644
--- a/packages/tui/src/component/prompt/autocomplete.tsx
+++ b/packages/tui/src/component/prompt/autocomplete.tsx
@@ -391,7 +391,8 @@ export function Autocomplete(props: {
       const text = `${res.name} (${res.uri})`
       options.push({
         display: Locale.truncateMiddle(text, width),
-        value: text,
+        // Match the name only; matching the URI caused unrelated fuzzy hits.
+        value: res.name,
         description: res.description,
         onSelect: () => {
           insertPart(res.name, {
@@ -522,7 +523,8 @@ export function Autocomplete(props: {
       .go(removeLineRange(searchValue), nonFileOptions, {
         keys: [
           (obj) => removeLineRange((obj.value ?? obj.display).trimEnd()),
-          "description",
+          // Match description for slash commands only; for "@" it surfaced unrelated items.
+          ...(store.visible === "/" ? ["description" as const] : []),
           (obj) => obj.aliases?.join(" ") ?? "",
         ],
         limit: 10,
diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx
index 6baa0b229e1..e237c0c1b6c 100644
--- a/packages/tui/src/component/prompt/index.tsx
+++ b/packages/tui/src/component/prompt/index.tsx
@@ -177,6 +177,7 @@ export function Prompt(props: PromptProps) {
   const keymap = useOpencodeKeymap()
   const agentShortcut = useCommandShortcut("agent.cycle")
   const paletteShortcut = useCommandShortcut("command.palette.show")
+  const variantShortcut = useCommandShortcut("variant.cycle")
   const renderer = useRenderer()
   const exit = useExit()
   const dimensions = useTerminalDimensions()
@@ -1835,6 +1836,11 @@ export function Prompt(props: PromptProps) {
               </Show>
               <Switch>
                 <Match when={store.mode === "normal"}>
+                  <Show when={local.model.variant.list().length > 0}>
+                    <text fg={theme.text}>
+                      {variantShortcut()} <span style={{ fg: theme.textMuted }}>variants</span>
+                    </text>
+                  </Show>
                   <Switch>
                     <Match when={usage()}>
                       {(item) => (
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index 6fd6451245d..d416108a5e4 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -139,6 +139,12 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
     ) => {
     // kilocode_change end
       switch (event.type) {
+        case "catalog.updated":
+          void Promise.all([
+            result.location.model.refresh(eventLocation(metadata)),
+            result.location.provider.refresh(eventLocation(metadata)),
+          ])
+          break
         case "session.next.agent.switched":
           message.update(event.properties.sessionID, (draft) => {
             message.prepend(draft, {
@@ -445,7 +451,11 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           void result.location.reference.refresh()
           break
         case "integration.updated":
-          void result.location.integration.refresh(eventLocation(metadata)) // kilocode_change
+          void Promise.all([
+            result.location.integration.refresh(eventLocation(metadata)),
+            result.location.model.refresh(eventLocation(metadata)),
+            result.location.provider.refresh(eventLocation(metadata)),
+          ])
           break
       }
     } // kilocode_change
diff --git a/packages/tui/src/context/sync.tsx b/packages/tui/src/context/sync.tsx
index 84152ff81be..dbe7fca6cc7 100644
--- a/packages/tui/src/context/sync.tsx
+++ b/packages/tui/src/context/sync.tsx
@@ -73,6 +73,9 @@ export const {
       provider_default: Record<string, string>
       provider_next: ProviderListResponse
       console_state: ConsoleState
+      capabilities: {
+        experimentalBackgroundSubagents: boolean
+      }
       provider_auth: Record<string, ProviderAuthMethod[]>
       agent: Agent[]
       command: Command[]
@@ -126,6 +129,9 @@ export const {
         failed: [],
       },
       console_state: emptyConsoleState,
+      capabilities: {
+        experimentalBackgroundSubagents: false,
+      },
       provider_auth: {},
       config: {},
       globalConfig: {}, // kilocode_change
@@ -762,6 +768,10 @@ export const {
       // blocking - include session.list when continuing a session
       const providersPromise = sdk.client.config.providers({ workspace }, { throwOnError: true })
       const providerListPromise = sdk.client.provider.list({ workspace }, { throwOnError: true })
+      const capabilitiesPromise = sdk.client.experimental.capabilities
+        .get({ workspace }, { throwOnError: true })
+        .then((x) => x.data)
+        .catch(() => undefined)
       const consoleStatePromise = sdk.client.experimental.console
         .get({ workspace }, { throwOnError: true })
         .then((x) => x.data)
@@ -772,6 +782,7 @@ export const {
       await Promise.all([
         providersPromise,
         providerListPromise,
+        capabilitiesPromise,
         agentsPromise,
         configPromise,
         globalConfigPromise, // kilocode_change
@@ -781,6 +792,7 @@ export const {
         .then(async () => {
           const providersResponse = providersPromise.then((x) => x.data!)
           const providerListResponse = providerListPromise.then((x) => x.data!)
+          const capabilitiesResponse = capabilitiesPromise
           const consoleStateResponse = consoleStatePromise
           const agentsResponse = agentsPromise.then((x) => x.data ?? [])
           const configResponse = configPromise.then((x) => x.data!)
@@ -790,6 +802,7 @@ export const {
           return Promise.all([
             providersResponse,
             providerListResponse,
+            capabilitiesResponse,
             consoleStateResponse,
             agentsResponse,
             configResponse,
@@ -798,16 +811,18 @@ export const {
           ]).then((responses) => {
             const providers = responses[0]
             const providerList = responses[1]
-            const consoleState = responses[2]
-            const agents = responses[3]
-            const config = responses[4]
-            const globalConfig = responses[5] // kilocode_change
-            const sessions = responses[6]
+            const capabilities = responses[2]
+            const consoleState = responses[3]
+            const agents = responses[4]
+            const config = responses[5]
+            const globalConfig = responses[6] // kilocode_change
+            const sessions = responses[7]
 
             batch(() => {
               setStore("provider", reconcile(providers.providers))
               setStore("provider_default", reconcile(providers.default))
               setStore("provider_next", reconcile(providerList))
+              setStore("capabilities", "experimentalBackgroundSubagents", capabilities?.backgroundSubagents === true)
               setStore("console_state", reconcile(consoleState))
               setStore("agent", reconcile(agents))
               setStore("config", reconcile(config))
diff --git a/packages/tui/src/kilocode/session-mentions.ts b/packages/tui/src/kilocode/session-mentions.ts
index 55d145f3c4a..92a47031af6 100644
--- a/packages/tui/src/kilocode/session-mentions.ts
+++ b/packages/tui/src/kilocode/session-mentions.ts
@@ -12,7 +12,6 @@ export type SessionMention = {
   title: string
   updated: number
 }
-
 export async function fetchSessionMentions(
   sdk: ReturnType<typeof useSDK>,
   directory: string,
@@ -81,4 +80,3 @@ export function createSessionPart(session: SessionMention) {
     },
   }
 }
-
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 13d11f66cf0..fc1d28b8d73 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -106,6 +106,8 @@ const GO_UPSELL_ACCOUNT_RATE_LIMIT_DONT_SHOW = "go_upsell_account_rate_limit_don
 const GO_UPSELL_WINDOW = 86_400_000 // 24 hrs
 const GO_UPSELL_PROVIDERS = new Set(["opencode", "opencode-go"])
 
+export const alwaysSeparate = new WeakSet<BoxRenderable>()
+
 type RetryAction = Extract<SessionStatus, { type: "retry" }>["action"]
 
 function goUpsellKeys(action: RetryAction) {
@@ -179,7 +181,6 @@ const context = createContext<{
   showTimestamps: () => boolean
   showDetails: () => boolean
   showGenericToolOutput: () => boolean
-  userMessageIDs: () => ReadonlySet<string>
   diffWrapMode: () => "word" | "none"
   providers: () => ReadonlyMap<string, Provider>
   sync: ReturnType<typeof useSync>
@@ -225,23 +226,17 @@ export function Session() {
   })
   const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
   const foregroundTasks = createMemo(() =>
-    messages().flatMap((message) =>
-      (sync.data.part[message.id] ?? []).filter(
-        (part): part is ToolPart =>
-          part.type === "tool" &&
-          part.tool === "task" &&
-          part.state.status === "running" &&
-          part.state.metadata?.background !== true,
-      ),
-    ),
-  )
-  const userMessageIDs = createMemo(
-    () =>
-      new Set(
-        messages()
-          .filter((message) => message.role === "user")
-          .map((message) => message.id),
-      ),
+    sync.data.capabilities.experimentalBackgroundSubagents
+      ? messages().flatMap((message) =>
+          (sync.data.part[message.id] ?? []).filter(
+            (part): part is ToolPart =>
+              part.type === "tool" &&
+              part.tool === "task" &&
+              part.state.status === "running" &&
+              part.state.metadata?.background !== true,
+          ),
+        )
+      : [],
   )
   const permissions = createMemo(() => {
     if (session()?.parentID) return []
@@ -1290,7 +1285,6 @@ export function Session() {
           showTimestamps,
           showDetails,
           showGenericToolOutput,
-          userMessageIDs,
           diffWrapMode,
           providers,
           sync,
@@ -1552,6 +1546,7 @@ function UserMessage(props: {
       <Show when={text()}>
         <box
           id={props.message.id}
+          ref={(el: BoxRenderable) => alwaysSeparate.add(el)}
           border={["left"]}
           borderColor={color()}
           customBorderChars={SplitBorder.customBorderChars}
@@ -1679,13 +1674,16 @@ function AssistantMessage(props: {
             {childShortcut()}
             <span style={{ fg: theme.textMuted }}> view subagents</span>
             <Show
-              when={props.parts.some(
-                (x) =>
-                  x.type === "tool" &&
-                  x.tool === "task" &&
-                  x.state.status === "running" &&
-                  x.state.metadata?.background !== true,
-              )}
+              when={
+                sync.data.capabilities.experimentalBackgroundSubagents &&
+                props.parts.some(
+                  (x) =>
+                    x.type === "tool" &&
+                    x.tool === "task" &&
+                    x.state.status === "running" &&
+                    x.state.metadata?.background !== true,
+                )
+              }
             >
               <span style={{ fg: theme.textMuted }}> · </span>
               {backgroundShortcut()}
@@ -1700,7 +1698,7 @@ function AssistantMessage(props: {
           error={props.message.error!}
           fallback={
             <box
-              id={`assistant-error-${props.message.id}`}
+              ref={(el: BoxRenderable) => alwaysSeparate.add(el)}
               border={["left"]}
               paddingTop={1}
               paddingBottom={1}
@@ -1718,7 +1716,7 @@ function AssistantMessage(props: {
       {/* kilocode_change end */}
       <Switch>
         <Match when={props.last || final() || props.message.error?.name === "MessageAbortedError"}>
-          <box id={`assistant-summary-${props.message.id}`} paddingLeft={3}>
+          <box ref={(el: BoxRenderable) => alwaysSeparate.add(el)} paddingLeft={3}>
             <text marginTop={1}>
               <span
                 style={{
@@ -1749,7 +1747,7 @@ function AssistantMessage(props: {
       </Switch>
     </>
   )
-} // kilocode_change
+}
 
 // kilocode_change start - register rendered step-finish parts
 const PART_MAPPING = {
@@ -1760,7 +1758,7 @@ const PART_MAPPING = {
 }
 // kilocode_change end
 
-const INLINE_TOOL_ICON_WIDTH = 2 // kilocode_change
+const INLINE_TOOL_ICON_WIDTH = 2
 
 // kilocode_change start - show concrete routed models reported by gateway/provider responses
 function StepFinishPart(props: { last: boolean; part: StepFinishPart; message: AssistantMessage }) {
@@ -1817,7 +1815,7 @@ function ReasoningPart(props: { last: boolean; part: ReasoningPart; message: Ass
   return (
     <Show when={content()}>
       <box
-        id={`text-${props.part.messageID}-${props.part.id}`}
+        ref={(el: BoxRenderable) => alwaysSeparate.add(el)}
         paddingLeft={3}
         marginTop={1}
         flexDirection="column"
@@ -1909,7 +1907,7 @@ function TextPart(props: { last: boolean; part: TextPart; message: AssistantMess
   // kilocode_change end
   return (
     <Show when={props.part.text.trim()}>
-      <box id={`text-${props.part.messageID}-${props.part.id}`} paddingLeft={3} marginTop={1} flexShrink={0}>
+      <box ref={(el: BoxRenderable) => alwaysSeparate.add(el)} paddingLeft={3} marginTop={1} flexShrink={0}>
         <markdown
           syntaxStyle={syntax()}
           streaming={true}
@@ -2176,7 +2174,7 @@ function InlineTool(props: {
   pending: string
   failure?: string
   spinner?: boolean
-  subagent?: boolean
+  separate?: boolean
   children: JSX.Element
   part: ToolPart
   onClick?: () => void
@@ -2217,7 +2215,6 @@ function InlineTool(props: {
 
   return (
     <InlineToolRow
-      id={`tool-inline-${props.subagent ? "subagent-" : ""}${props.part.messageID}-${props.part.id}`}
       icon={props.icon}
       iconColor={props.iconColor}
       color={fg()}
@@ -2230,8 +2227,7 @@ function InlineTool(props: {
       pending={props.pending}
       failure={props.failure}
       spinner={props.spinner}
-      subagent={props.subagent}
-      separateAfter={(id) => id !== undefined && ctx.userMessageIDs().has(id)}
+      separate={props.separate}
       onMouseOver={() => clickable() && setHover(true)}
       onMouseOut={() => setHover(false)}
       onMouseUp={() => {
@@ -2249,7 +2245,6 @@ function InlineTool(props: {
 }
 
 export function InlineToolRow(props: {
-  id?: string
   icon: string
   iconColor?: RGBA
   color?: RGBA
@@ -2262,30 +2257,23 @@ export function InlineToolRow(props: {
   pending: string
   failure?: string
   spinner?: boolean
-  subagent?: boolean
+  separate?: boolean
   children: JSX.Element
-  separateAfter?: (id: string | undefined) => boolean
   onMouseOver?: () => void
   onMouseOut?: () => void
   onMouseUp?: () => void
 }) {
   return (
     <box
-      id={props.id}
       paddingLeft={3}
       onMouseOver={props.onMouseOver}
       onMouseOut={props.onMouseOut}
       onMouseUp={props.onMouseUp}
       ref={(el: BoxRenderable) => {
+        if (props.separate) alwaysSeparate.add(el)
         setPreLayoutSiblingMargin(el, (previous) => {
-          const previousInline = previous?.id.startsWith("tool-inline-") ?? false
-          const previousSubagent = previous?.id.startsWith("tool-inline-subagent-") ?? false
-          return previous?.id.startsWith("text-") ||
-            previous?.id.startsWith("tool-block-") ||
-            previous?.id.startsWith("assistant-error-") ||
-            previous?.id.startsWith("assistant-summary-") ||
-            (previousInline && previousSubagent !== Boolean(props.subagent)) ||
-            props.separateAfter?.(previous?.id)
+          return props.separate ||
+            (previous instanceof BoxRenderable && (previous.height > 1 || alwaysSeparate.has(previous)))
             ? 1
             : 0
         })
@@ -2349,7 +2337,7 @@ function BlockTool(props: {
   const error = createMemo(() => (props.part?.state.status === "error" ? props.part.state.error : undefined))
   return (
     <box
-      id={props.part ? `tool-block-${props.part.messageID}-${props.part.id}` : undefined}
+      ref={(el: BoxRenderable) => alwaysSeparate.add(el)}
       border={["left"]}
       paddingTop={1}
       paddingBottom={1}
@@ -2518,8 +2506,8 @@ function Read(props: ToolProps) {
         Read {pathFormatter.format(stringValue(props.input.filePath))} {input(props.input, ["filePath"])}
       </InlineTool>
       <For each={loaded()}>
-        {(filepath, index) => (
-          <box id={`tool-inline-loaded-${props.part.messageID}-${props.part.id}-${index()}`} paddingLeft={3}>
+        {(filepath) => (
+          <box paddingLeft={3}>
             <text paddingLeft={3} fg={theme.textMuted}>
               ↳ Loaded {pathFormatter.format(filepath)}
             </text>
@@ -2639,7 +2627,7 @@ function Task(props: ToolProps) {
   return (
     <InlineTool
       icon={props.part.state.status === "completed" ? "✓" : "│"}
-      subagent={true}
+      separate={true}
       color={retry() ? theme.error : undefined}
       spinner={isRunning()}
       complete={stringValue(props.input.description)}
diff --git a/packages/tui/src/ui/dialog-select.tsx b/packages/tui/src/ui/dialog-select.tsx
index 85cf9a73c75..42c244b59be 100644
--- a/packages/tui/src/ui/dialog-select.tsx
+++ b/packages/tui/src/ui/dialog-select.tsx
@@ -25,6 +25,7 @@ export interface DialogSelectProps<T> {
   titleView?: JSX.Element
   placeholder?: string
   footer?: JSX.Element
+  emptyView?: JSX.Element
   options: DialogSelectOption<T>[]
   flat?: boolean
   ref?: (ref: DialogSelectRef<T>) => void
@@ -548,9 +549,11 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
         <Show
           when={grouped().length > 0}
           fallback={
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-              <text fg={theme.textMuted}>No results found</text>
-            </box>
+            props.emptyView ?? (
+              <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+                <text fg={theme.textMuted}>No results found</text>
+              </box>
+            )
           }
         >
           <scrollbox
diff --git a/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap b/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap
index a8bd07828f9..80cd33acd6f 100644
--- a/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap
+++ b/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`TUI inline tool wrapping snapshots consecutive grep, glob, and read rows at a narrow width 1`] = `
 "   ✱ Grep "OPENCODE.*DB|database|sqlite|drizzle|dev.*db|data.
      *dir|xdg|APPDATA" in packages/opencode/src (151 matches)
+
    ✱ Glob "**/*db*" in packages/opencode (6 matches)
    → Read packages/opencode/src/storage/db.ts [offset=1, limit=130]
    → Read packages/opencode/src/index.ts [offset=1, limit=100]
@@ -13,10 +14,12 @@ exports[`TUI inline tool wrapping snapshots consecutive grep, glob, and read row
 exports[`TUI inline tool wrapping snapshots expanded tool errors under the tool text 1`] = `
 "   ✱ Grep "OPENCODE.*DB|database|sqlite|drizzle|dev.*db|data.
      *dir|xdg|APPDATA" in packages/opencode/src (151 matches)
+
    ✱ Glob "**/*db*" in packages/opencode (6 matches)
    → Read packages/opencode/src/storage/db.ts [offset=1, limit=130]
    → Read packages/opencode/src/index.ts [offset=1, limit=100]
      No LSP server available for this file type.
+
    ✱ Grep "export const KILO_DB|KILO_DB|KILO_DEV|Global\\.Path\\.
      data|data =" in packages/opencode/src (115 matches)"
 `;
@@ -32,6 +35,7 @@ exports[`TUI inline tool wrapping keeps separation after a shell output block 1`
 
    ✱ Grep "OPENCODE.*DB|database|sqlite|drizzle|dev.*db|data.
      *dir|xdg|APPDATA" in packages/opencode/src (151 matches)
+
    ✱ Glob "**/*db*" in packages/opencode (6 matches)
    → Read packages/opencode/src/storage/db.ts [offset=1, limit=130]
    → Read packages/opencode/src/index.ts [offset=1, limit=100]
@@ -46,6 +50,7 @@ exports[`TUI inline tool wrapping keeps separation after a padded user message 1
 
    ✱ Grep "OPENCODE.*DB|database|sqlite|drizzle|dev.*db|data.
      *dir|xdg|APPDATA" in packages/opencode/src (151 matches)
+
    ✱ Glob "**/*db*" in packages/opencode (6 matches)
    → Read packages/opencode/src/storage/db.ts [offset=1, limit=130]
    → Read packages/opencode/src/index.ts [offset=1, limit=100]
@@ -53,17 +58,18 @@ exports[`TUI inline tool wrapping keeps separation after a padded user message 1
      data|data =" in packages/opencode/src (115 matches)"
 `;
 
-exports[`TUI inline tool wrapping separates a contiguous subagent group from inline tools 1`] = `
+exports[`TUI inline tool wrapping separates after a multi-line task row 1`] = `
 "   ✱ Grep "Task" (2 matches)
 
    ⠙ Explore Task — Inspect active task spacing
+
    ✓ General Task — Confirm completed task spacing
      ↳ 1 toolcall · 501ms
 
    → Read src/cli/cmd/tui/routes/session/index.tsx"
 `;
 
-exports[`TUI inline tool wrapping separates a subagent group after an expanded read 1`] = `
+exports[`TUI inline tool wrapping separates a task row from a preceding inline detail 1`] = `
 "   → Read src/cli/cmd/tui/routes/session/index.tsx
    ↳ Loaded src/cli/cmd/tui/routes/session/tools.tsx
 
@@ -71,14 +77,14 @@ exports[`TUI inline tool wrapping separates a subagent group after an expanded r
      ↳ 1 toolcall · 501ms"
 `;
 
-exports[`TUI inline tool wrapping separates a subagent from the previous assistant summary 1`] = `
+exports[`TUI inline tool wrapping separates an inline row from the previous assistant summary 1`] = `
 "   ▣ Build · Little Frank · 53.1s
 
    ✓ Build Task — Review changes
      ↳ 48 toolcalls · 1m 40s"
 `;
 
-exports[`TUI inline tool wrapping separates a subagent from the previous assistant error 1`] = `
+exports[`TUI inline tool wrapping separates an inline row from the previous assistant error 1`] = `
 "│
 │  Managed inference requires an active Member plan
 │
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index e7d5e77beb6..b0a156813c4 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -108,14 +108,22 @@ test("refreshes resources into reactive getters", async () => {
 
 test("refreshes integrations after integration updates", async () => {
   const events = createEventSource()
-  let requests = 0
+  const requests = { integration: 0, model: 0, provider: 0 }
   const calls = createFetch((url) => {
+    if (url.pathname === "/api/model") {
+      requests.model++
+      return json({ location: { directory, project: { id: "proj_test", directory } }, data: [] })
+    }
+    if (url.pathname === "/api/provider") {
+      requests.provider++
+      return json({ location: { directory, project: { id: "proj_test", directory } }, data: [] })
+    }
     if (url.pathname !== "/api/integration") return
-    requests++
+    requests.integration++
     return json({
       location: { directory, project: { id: "proj_test", directory } },
       data:
-        requests === 1
+        requests.integration === 1
           ? []
           : [
               {
@@ -156,15 +164,57 @@ test("refreshes integrations after integration updates", async () => {
     await mounted
     await wait(() => data.location.integration.list() !== undefined)
     expect(data.location.integration.list()).toEqual([])
+    const before = { ...requests }
 
     emitEvent(events, { id: "evt_integration", type: "integration.updated", properties: {} })
     await wait(() => data.location.integration.list()?.length === 1)
+    await wait(() => requests.model > before.model && requests.provider > before.provider)
     expect(data.location.integration.list()?.[0]).toMatchObject({ id: "openai", name: "OpenAI" })
   } finally {
     app.renderer.destroy()
   }
 })
 
+test("refreshes effective catalog data after catalog updates", async () => {
+  const events = createEventSource()
+  const requests = { model: 0, provider: 0 }
+  const calls = createFetch((url) => {
+    if (url.pathname === "/api/model") {
+      requests.model++
+      return json({ location: { directory, project: { id: "proj_test", directory } }, data: [] })
+    }
+    if (url.pathname === "/api/provider") {
+      requests.provider++
+      return json({ location: { directory, project: { id: "proj_test", directory } }, data: [] })
+    }
+  })
+
+  const app = await testRender(() => (
+    <TestTuiContexts>
+      <SDKProvider url="http://test" directory={directory} events={events.source} fetch={calls.fetch}>
+        <ProjectProvider>
+          {/* kilocode_change start - initialize Kilo's project filter before consuming catalog events */}
+          <Ready>
+            <DataProvider>
+              <box />
+            </DataProvider>
+          </Ready>
+          {/* kilocode_change end */}
+        </ProjectProvider>
+      </SDKProvider>
+    </TestTuiContexts>
+  ))
+
+  try {
+    await wait(() => requests.model > 0 && requests.provider > 0)
+    const before = { ...requests }
+    emitEvent(events, { id: "evt_catalog", type: "catalog.updated", properties: {} })
+    await wait(() => requests.model > before.model && requests.provider > before.provider)
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
 test("refreshes references after updates", async () => {
   const events = createEventSource()
   let requests = 0
diff --git a/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx b/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx
index 348a4d0440d..6262066d3c0 100644
--- a/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx
+++ b/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, test } from "bun:test"
 import { createSignal, For, Show } from "solid-js"
-import type { ScrollBoxRenderable } from "@opentui/core"
+import type { BoxRenderable, ScrollBoxRenderable } from "@opentui/core"
 import { testRender, type JSX } from "@opentui/solid"
 import {
   formatCompletedSubagentDetail,
@@ -13,6 +13,7 @@ import {
   parseQuestionAnswers,
   parseQuestions,
   parseTodos,
+  alwaysSeparate,
   toolDisplay,
 } from "../../../src/routes/session"
 
@@ -53,7 +54,14 @@ const tools: readonly ToolFixture[] = [
 
 function ShellOutput() {
   return (
-    <box id="tool-block-shell" marginTop={1} paddingTop={1} paddingBottom={1} paddingLeft={2} gap={1}>
+    <box
+      ref={(el: BoxRenderable) => alwaysSeparate.add(el)}
+      marginTop={1}
+      paddingTop={1}
+      paddingBottom={1}
+      paddingLeft={2}
+      gap={1}
+    >
       <text paddingLeft={3}># List files</text>
       <box gap={1}>
         <text>$ ls</text>
@@ -65,7 +73,7 @@ function ShellOutput() {
 
 function UserMessage() {
   return (
-    <box id="message-user">
+    <box ref={(el: BoxRenderable) => alwaysSeparate.add(el)}>
       <box paddingTop={1} paddingBottom={1} paddingLeft={2}>
         <text>Check whether the next tool remains separated.</text>
       </box>
@@ -88,7 +96,6 @@ function Fixture(props: { errorExpanded?: boolean; before?: "shell" | "user" })
               failed={Boolean(item.error)}
               error={item.error}
               errorExpanded={props.errorExpanded}
-              separateAfter={(id) => id === "message-user"}
             >
               {item.label}
             </InlineToolRow>
@@ -99,61 +106,67 @@ function Fixture(props: { errorExpanded?: boolean; before?: "shell" | "user" })
   )
 }
 
-function SubagentGroupFixture() {
+function TaskRowsFixture() {
   return (
     <box flexDirection="column" width={72}>
-      <InlineToolRow id="tool-inline-before" icon="✱" complete={true} pending="">
+      <InlineToolRow icon="✱" complete={true} pending="">
         Grep "Task" (2 matches)
       </InlineToolRow>
-      <InlineToolRow id="tool-inline-subagent-one" icon="⠙" complete={true} pending="" subagent={true}>
+      <InlineToolRow icon="⠙" complete={true} pending="" separate={true}>
         Explore Task — Inspect active task spacing
       </InlineToolRow>
-      <InlineToolRow id="tool-inline-subagent-two" icon="✓" complete={true} pending="" subagent={true}>
+      <InlineToolRow icon="✓" complete={true} pending="" separate={true}>
         {"General Task — Confirm completed task spacing\n↳ 1 toolcall · 501ms"}
       </InlineToolRow>
-      <InlineToolRow id="tool-inline-after" icon="→" complete={true} pending="">
+      <InlineToolRow icon="→" complete={true} pending="">
         Read src/cli/cmd/tui/routes/session/index.tsx
       </InlineToolRow>
     </box>
   )
 }
 
-function LoadedReadBeforeSubagentFixture() {
+function LoadedReadBeforeTaskFixture() {
   return (
     <box flexDirection="column" width={72}>
-      <InlineToolRow id="tool-inline-read" icon="→" complete={true} pending="">
+      <InlineToolRow icon="→" complete={true} pending="">
         Read src/cli/cmd/tui/routes/session/index.tsx
       </InlineToolRow>
-      <box id="tool-inline-loaded-read-child" paddingLeft={3}>
+      <box paddingLeft={3}>
         <text paddingLeft={3}>↳ Loaded src/cli/cmd/tui/routes/session/tools.tsx</text>
       </box>
-      <InlineToolRow id="tool-inline-subagent-after-read" icon="✓" complete={true} pending="" subagent={true}>
+      <InlineToolRow icon="✓" complete={true} pending="" separate={true}>
         {"Explore Task — Inspect active task spacing\n↳ 1 toolcall · 501ms"}
       </InlineToolRow>
     </box>
   )
 }
 
-function AssistantSummaryBeforeSubagentFixture() {
+function AssistantSummaryBeforeInlineFixture() {
   return (
     <box flexDirection="column" width={72}>
-      <box id="assistant-summary-message-one" paddingLeft={3}>
+      <box ref={(el: BoxRenderable) => alwaysSeparate.add(el)} paddingLeft={3}>
         <text>▣ Build · Little Frank · 53.1s</text>
       </box>
-      <InlineToolRow id="tool-inline-subagent-one" icon="✓" complete={true} pending="" subagent={true}>
+      <InlineToolRow icon="✓" complete={true} pending="">
         {"Build Task — Review changes\n↳ 48 toolcalls · 1m 40s"}
       </InlineToolRow>
     </box>
   )
 }
 
-function AssistantErrorBeforeSubagentFixture() {
+function AssistantErrorBeforeInlineFixture() {
   return (
     <box flexDirection="column" width={72}>
-      <box id="assistant-error-message-one" border={["left"]} paddingTop={1} paddingBottom={1} paddingLeft={2}>
+      <box
+        ref={(el: BoxRenderable) => alwaysSeparate.add(el)}
+        border={["left"]}
+        paddingTop={1}
+        paddingBottom={1}
+        paddingLeft={2}
+      >
         <text>Managed inference requires an active Member plan</text>
       </box>
-      <InlineToolRow id="tool-inline-subagent-one" icon="✓" complete={true} pending="" subagent={true}>
+      <InlineToolRow icon="✓" complete={true} pending="">
         {"Build Task — Review changes\n↳ 48 toolcalls · 1m 40s"}
       </InlineToolRow>
     </box>
@@ -170,7 +183,7 @@ function StickyScrollFixture(props: { separated: boolean; scroll: (scroll: Scrol
         <text>Second row</text>
       </box>
       <Show when={props.separated}>
-        <box id="text-before-tool">
+        <box ref={(el: BoxRenderable) => alwaysSeparate.add(el)}>
           <text>Assistant text</text>
         </box>
       </Show>
@@ -200,6 +213,7 @@ function FailedCompleteToolFixture() {
 async function renderFrame(component: () => JSX.Element, options: { width: number; height: number }) {
   testSetup = await testRender(component, options)
   await testSetup.renderOnce()
+  await testSetup.renderOnce()
 
   return testSetup
     .captureCharFrame()
@@ -299,22 +313,20 @@ describe("TUI inline tool wrapping", () => {
     expect(await renderFrame(() => <Fixture before="user" />, { width: 72, height: 14 })).toMatchSnapshot()
   })
 
-  test("separates a contiguous subagent group from inline tools", async () => {
-    expect(await renderFrame(() => <SubagentGroupFixture />, { width: 72, height: 10 })).toMatchSnapshot()
+  test("separates after a multi-line task row", async () => {
+    expect(await renderFrame(() => <TaskRowsFixture />, { width: 72, height: 10 })).toMatchSnapshot()
   })
 
-  test("separates a subagent group after an expanded read", async () => {
-    expect(await renderFrame(() => <LoadedReadBeforeSubagentFixture />, { width: 72, height: 8 })).toMatchSnapshot()
+  test("separates a task row from a preceding inline detail", async () => {
+    expect(await renderFrame(() => <LoadedReadBeforeTaskFixture />, { width: 72, height: 8 })).toMatchSnapshot()
   })
 
-  test("separates a subagent from the previous assistant summary", async () => {
-    expect(
-      await renderFrame(() => <AssistantSummaryBeforeSubagentFixture />, { width: 72, height: 5 }),
-    ).toMatchSnapshot()
+  test("separates an inline row from the previous assistant summary", async () => {
+    expect(await renderFrame(() => <AssistantSummaryBeforeInlineFixture />, { width: 72, height: 5 })).toMatchSnapshot()
   })
 
-  test("separates a subagent from the previous assistant error", async () => {
-    expect(await renderFrame(() => <AssistantErrorBeforeSubagentFixture />, { width: 72, height: 7 })).toMatchSnapshot()
+  test("separates an inline row from the previous assistant error", async () => {
+    expect(await renderFrame(() => <AssistantErrorBeforeInlineFixture />, { width: 72, height: 7 })).toMatchSnapshot()
   })
 
   test("updates sticky-bottom geometry when a text separator mounts and unmounts", async () => {
diff --git a/packages/tui/test/fixture/tui-sdk.ts b/packages/tui/test/fixture/tui-sdk.ts
index d0c3c2c0094..3b738b9915d 100644
--- a/packages/tui/test/fixture/tui-sdk.ts
+++ b/packages/tui/test/fixture/tui-sdk.ts
@@ -68,6 +68,7 @@ export function createFetch(override?: FetchHandler) {
     // kilocode_change end
     if (url.pathname === "/config/providers") return json({ providers: {}, default: {} })
     if (url.pathname === "/experimental/console") return json({ consoleManagedProviders: [], switchableOrgCount: 0 })
+    if (url.pathname === "/experimental/capabilities") return json({ backgroundSubagents: false })
     if (url.pathname === "/path") return json({ home: "", state: "", config: "", worktree, directory })
     if (url.pathname === "/api/location") return json({ directory, project: { id: "proj_test", directory: worktree } })
     if (
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 2a6b262cb8b..d5b27305ac4 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -30,10 +30,10 @@
   "scripts": {
     "typecheck": "tsgo --noEmit",
     "test": "bun test src --only-failures",
-    "test:ci": "mkdir -p .artifacts/unit && bun test src --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
     "dev": "vite",
     "generate:tailwind": "bun run script/tailwind.ts",
-    "generate:v2-oc2": "bun run script/build-oc2-v2-overrides.ts"
+    "generate:v2-oc2": "bun run script/build-oc2-v2-overrides.ts",
+    "test:ci": "mkdir -p .artifacts/unit && bun test src --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml"
   },
   "devDependencies": {
     "@tailwindcss/vite": "catalog:",
@@ -81,7 +81,8 @@
     "@solid-primitives/bounds": "0.1.3",
     "luxon": "catalog:",
     "marked-katex-extension": "5.1.6",
-    "marked-shiki": "catalog:"
+    "marked-shiki": "catalog:",
+    "@shikijs/stream": "catalog:"
   },
   "peerDependencies": {}
 }
diff --git a/packages/ui/src/components/file.css b/packages/ui/src/components/file.css
index a9150e14503..a17732f6145 100644
--- a/packages/ui/src/components/file.css
+++ b/packages/ui/src/components/file.css
@@ -2,6 +2,10 @@
   content-visibility: auto;
 }
 
+[data-timeline-row] [data-component="file"] {
+  content-visibility: visible;
+}
+
 [data-component="file"][data-mode="text"] {
   overflow: hidden;
 }
diff --git a/packages/ui/src/components/file.tsx b/packages/ui/src/components/file.tsx
index bfcc05b40ac..8c8096375a3 100644
--- a/packages/ui/src/components/file.tsx
+++ b/packages/ui/src/components/file.tsx
@@ -52,7 +52,7 @@ const VIRTUALIZE_BYTES = 500_000
 const codeMetrics = {
   ...DEFAULT_VIRTUAL_FILE_METRICS,
   lineHeight: 24,
-  fileGap: 0,
+  spacing: 0,
 } satisfies Partial<VirtualFileMetrics>
 
 type SharedProps<T> = {
diff --git a/packages/ui/src/components/markdown-code-state.test.ts b/packages/ui/src/components/markdown-code-state.test.ts
new file mode 100644
index 00000000000..1be76d6f16c
--- /dev/null
+++ b/packages/ui/src/components/markdown-code-state.test.ts
@@ -0,0 +1,32 @@
+import { expect, test } from "bun:test"
+import { shouldResetCodeTokens } from "./markdown-code-state"
+
+const previous = {
+  language: "ts",
+  generation: 1,
+  stableCount: 3,
+  unstable: [],
+  raw: "```ts\nconst x = 1\n```",
+}
+
+test("resets tokens for a non-prefix replacement with the same generation and token count", () => {
+  expect(
+    shouldResetCodeTokens(previous, {
+      language: "ts",
+      generation: 1,
+      stableCount: 3,
+      raw: "```ts\nlet y = 2\n```",
+    }),
+  ).toBe(true)
+})
+
+test("retains tokens for an append-only streaming update", () => {
+  expect(
+    shouldResetCodeTokens(previous, {
+      language: "ts",
+      generation: 1,
+      stableCount: 4,
+      raw: `${previous.raw}\nmore`,
+    }),
+  ).toBe(false)
+})
diff --git a/packages/ui/src/components/markdown-code-state.ts b/packages/ui/src/components/markdown-code-state.ts
new file mode 100644
index 00000000000..502f3ecd3c2
--- /dev/null
+++ b/packages/ui/src/components/markdown-code-state.ts
@@ -0,0 +1,22 @@
+import type { MarkdownToken } from "./markdown-worker-protocol"
+
+export type RenderedCodeState = {
+  language: string
+  generation: number
+  stableCount: number
+  unstable: MarkdownToken[]
+  raw: string
+}
+
+export function shouldResetCodeTokens(
+  previous: RenderedCodeState | undefined,
+  next: { language: string; generation: number; stableCount: number; raw: string },
+) {
+  return (
+    !previous ||
+    previous.language !== next.language ||
+    previous.generation !== next.generation ||
+    next.stableCount < previous.stableCount ||
+    !next.raw.startsWith(previous.raw)
+  )
+}
diff --git a/packages/ui/src/components/markdown-shiki.worker.ts b/packages/ui/src/components/markdown-shiki.worker.ts
new file mode 100644
index 00000000000..625ae98d4df
--- /dev/null
+++ b/packages/ui/src/components/markdown-shiki.worker.ts
@@ -0,0 +1,106 @@
+/// <reference lib="webworker" />
+
+import { ShikiStreamTokenizer } from "@shikijs/stream"
+import {
+  bundledLanguages,
+  createHighlighter,
+  getTokenStyleObject,
+  stringifyTokenStyle,
+  type BundledLanguage,
+  type ThemedToken,
+} from "shiki"
+import type { MarkdownToken, MarkdownWorkerRequest, MarkdownWorkerResponse } from "./markdown-worker-protocol"
+import { createLatestWorkerQueue } from "./markdown-worker-queue"
+
+type Stream = {
+  language: string
+  source: string
+  tokenizer: ShikiStreamTokenizer
+}
+
+const streams = new Map<string, Stream>()
+let highlighter: ReturnType<typeof createHighlighter> | undefined
+let theme = "Kilo" // kilocode_change - use the Kilo theme supplied during worker initialization
+const queue = createLatestWorkerQueue<Extract<MarkdownWorkerRequest, { type: "highlight" }>>({
+  run: highlight,
+  supersede: (request) => post({ type: "superseded", id: request.id, key: request.key }),
+  dispose: (key) => void streams.delete(key),
+})
+
+self.onmessage = (event: MessageEvent<MarkdownWorkerRequest>) => {
+  if (event.data.type === "init") {
+    theme = event.data.theme.name // kilocode_change
+    highlighter ??= createHighlighter({ themes: [event.data.theme], langs: [] })
+    return
+  }
+  if (event.data.type === "dispose") {
+    queue.dispose(event.data.key)
+    return
+  }
+
+  queue.highlight(event.data)
+}
+
+async function highlight(request: Extract<MarkdownWorkerRequest, { type: "highlight" }>) {
+  try {
+    const instance = await highlighter
+    if (!instance) throw new Error("Shiki worker is not initialized")
+    const language = request.language in bundledLanguages ? request.language : "text"
+    if (!instance.getLoadedLanguages().includes(language))
+      await instance.loadLanguage(bundledLanguages[language as BundledLanguage])
+
+    if (request.complete) {
+      const result = instance.codeToTokens(request.text, { lang: language as BundledLanguage, theme })
+      streams.delete(request.key)
+      post({
+        type: "highlight",
+        id: request.id,
+        key: request.key,
+        reset: true,
+        stable: result.tokens
+          .flatMap((line, index) =>
+            index === result.tokens.length - 1 ? line : [...line, { content: "\n", offset: 0 }],
+          )
+          .map(token),
+        unstable: [],
+      })
+      return
+    }
+
+    const previous = streams.get(request.key)
+    const reset = !previous || previous.language !== language || !request.text.startsWith(previous.source)
+    const stream = reset
+      ? {
+          language,
+          source: "",
+          tokenizer: new ShikiStreamTokenizer({ highlighter: instance, lang: language, theme }),
+        }
+      : previous
+    const result = await stream.tokenizer.enqueue(request.text.slice(stream.source.length))
+    stream.source = request.text
+    streams.set(request.key, stream)
+    post({
+      type: "highlight",
+      id: request.id,
+      key: request.key,
+      reset,
+      stable: result.stable.filter((token) => token.content.length > 0).map(token),
+      unstable: result.unstable.filter((token) => token.content.length > 0).map(token),
+    })
+  } catch (error) {
+    post({
+      type: "error",
+      id: request.id,
+      key: request.key,
+      message: error instanceof Error ? error.message : String(error),
+    })
+  }
+}
+
+function post(response: MarkdownWorkerResponse) {
+  self.postMessage(response)
+}
+
+function token(value: ThemedToken): MarkdownToken {
+  return [value.content, stringifyTokenStyle(value.htmlStyle ?? getTokenStyleObject(value))]
+}
diff --git a/packages/ui/src/components/markdown-stream.test.ts b/packages/ui/src/components/markdown-stream.test.ts
index 1ee63fc62e4..e792a338396 100644
--- a/packages/ui/src/components/markdown-stream.test.ts
+++ b/packages/ui/src/components/markdown-stream.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { stream } from "./markdown-stream"
+import { canReusePendingBlock, project, stream } from "./markdown-stream"
 
 describe("markdown stream", () => {
   test("heals incomplete emphasis while streaming", () => {
@@ -15,8 +15,58 @@ describe("markdown stream", () => {
 
   test("splits an unfinished trailing code fence from stable content", () => {
     expect(stream("before\n\n```ts\nconst x = 1", true)).toEqual([
-      { raw: "before\n\n", src: "before\n\n", mode: "live" },
-      { raw: "```ts\nconst x = 1", src: "```ts\nconst x = 1", mode: "live" },
+      { raw: "before\n\n", src: "before\n\n", mode: "full" },
+      { raw: "```ts\nconst x = 1", src: "const x = 1", mode: "code", language: "ts" },
+    ])
+  })
+
+  test("fully parses a code fence once it closes", () => {
+    const text = "before\n\n```ts\nconst x = 1\n```"
+    expect(stream(text, true)).toEqual([
+      { raw: "before\n\n", src: "before\n\n", mode: "full" },
+      { raw: "```ts\nconst x = 1\n```", src: "const x = 1", mode: "code", language: "ts", complete: true },
+    ])
+  })
+
+  test("keeps a completed code fence in worker-rendered code mode when prose follows", () => {
+    expect(stream("```ts\nconst x = 1\n```\n\nafter", true)).toEqual([
+      { raw: "```ts\nconst x = 1\n```\n\n", src: "const x = 1", mode: "code", language: "ts", complete: true },
+      { raw: "after", src: "after", mode: "live" },
+    ])
+  })
+
+  test("freezes completed top-level blocks and only keeps the tail live", () => {
+    expect(stream("# Plan\n\nFinished paragraph.\n\n- live item", true)).toEqual([
+      { raw: "# Plan\n\n", src: "# Plan\n\n", mode: "full" },
+      { raw: "Finished paragraph.\n\n", src: "Finished paragraph.\n\n", mode: "full" },
+      { raw: "- live item", src: "- live item", mode: "live" },
+    ])
+  })
+
+  test("keeps a growing table together until a later block freezes it", () => {
+    expect(stream("| a | b |\n|---|---|\n| 1 | 2 |", true)).toEqual([
+      { raw: "| a | b |\n|---|---|\n| 1 | 2 |", src: "| a | b |\n|---|---|\n| 1 | 2 |", mode: "live" },
+    ])
+  })
+
+  test("reprojects non-prefix replacements from current content", () => {
+    expect(stream("# Replacement\n\nNew body", true)).toEqual([
+      { raw: "# Replacement\n\n", src: "# Replacement\n\n", mode: "full" },
+      { raw: "New body", src: "New body", mode: "live" },
+    ])
+  })
+
+  test("reprojects truncation without retaining removed blocks", () => {
+    expect(stream("Only the restored prefix", true)).toEqual([
+      { raw: "Only the restored prefix", src: "Only the restored prefix", mode: "live" },
+    ])
+  })
+
+  test("shifts later blocks when an earlier block is inserted", () => {
+    expect(stream("# Inserted\n\nFirst body\n\nSecond body", true)).toEqual([
+      { raw: "# Inserted\n\n", src: "# Inserted\n\n", mode: "full" },
+      { raw: "First body\n\n", src: "First body\n\n", mode: "full" },
+      { raw: "Second body", src: "Second body", mode: "live" },
     ])
   })
 
@@ -29,4 +79,116 @@ describe("markdown stream", () => {
       },
     ])
   })
+
+  test("keeps compact and indented reference definitions with their uses", () => {
+    expect(stream("[docs]\n\n   [docs]:/guide", true)).toEqual([
+      {
+        raw: "[docs]\n\n   [docs]:/guide",
+        src: "[docs]\n\n   [docs]:/guide",
+        mode: "live",
+      },
+    ])
+  })
+
+  test("keeps multiline reference definitions with their uses", () => {
+    expect(stream("[docs][id]\n\n[id]:\n  /guide", true)).toEqual([
+      {
+        raw: "[docs][id]\n\n[id]:\n  /guide",
+        src: "[docs][id]\n\n[id]:\n  /guide",
+        mode: "live",
+      },
+    ])
+  })
+
+  test("uses only the language portion of fence metadata", () => {
+    expect(stream("```ts title=example\nconst x = 1", true)).toEqual([
+      {
+        raw: "```ts title=example\nconst x = 1",
+        src: "const x = 1",
+        mode: "code",
+        language: "ts",
+      },
+    ])
+  })
+
+  test("preserves trailing newlines in open code fences", () => {
+    expect(stream("```ts\nconst x = 1\n", true)).toEqual([
+      {
+        raw: "```ts\nconst x = 1\n",
+        src: "const x = 1\n",
+        mode: "code",
+        language: "ts",
+      },
+    ])
+  })
+
+  test("only reuses pending blocks with compatible identity and content", () => {
+    expect(
+      canReusePendingBlock({ mode: "full", raw: "First\n\n" }, { mode: "full", raw: "# Inserted\n\n", src: "" }),
+    ).toBe(false)
+    expect(
+      canReusePendingBlock({ mode: "code", raw: "```ts\none" }, { mode: "code", raw: "```ts\none two", src: "" }),
+    ).toBe(true)
+    expect(canReusePendingBlock({ mode: "code", raw: "```ts\none" }, { mode: "live", raw: "one", src: "" })).toBe(false)
+  })
+
+  test("appends plain code deltas without reprojecting frozen blocks", () => {
+    const previous = project(undefined, "# Plan\n\n```ts\nconst one = 1\n", true)
+    const next = project(previous, `${previous.text}const two = 2\n`, true)
+
+    expect(next.blocks[0]).toBe(previous.blocks[0])
+    expect(next.blocks.at(-1)).toEqual({
+      raw: "```ts\nconst one = 1\nconst two = 2\n",
+      src: "const one = 1\nconst two = 2\n",
+      mode: "code",
+      language: "ts",
+    })
+  })
+
+  test("does not add a blank line before the first streamed code", () => {
+    const previous = project(undefined, "```ts\n", true)
+    const next = project(previous, `${previous.text}const x = 1`, true)
+
+    expect(next.blocks.at(-1)).toEqual({
+      raw: "```ts\nconst x = 1",
+      src: "const x = 1",
+      mode: "code",
+      language: "ts",
+    })
+  })
+
+  test("closes code fences split across provider deltas", () => {
+    const open = project(undefined, "```ts\nconst x = 1\n", true)
+    const one = project(open, `${open.text}\``, true)
+    const two = project(one, `${one.text}\``, true)
+    const closed = project(two, `${two.text}\``, true)
+    const prose = project(closed, `${closed.text}\nafter`, true)
+
+    expect(closed.blocks.at(-1)).toEqual({
+      raw: "```ts\nconst x = 1\n```",
+      src: "const x = 1",
+      mode: "code",
+      language: "ts",
+      complete: true,
+    })
+    expect(prose.blocks).toEqual([
+      { raw: "```ts\nconst x = 1\n```\n", src: "const x = 1", mode: "code", language: "ts", complete: true },
+      { raw: "after", src: "after", mode: "live" },
+    ])
+  })
+
+  test("closes tilde fences split across provider deltas", () => {
+    const open = project(undefined, "~~~ts\nconst x = 1\n", true)
+    const one = project(open, `${open.text}~`, true)
+    const two = project(one, `${one.text}~`, true)
+    const closed = project(two, `${two.text}~`, true)
+
+    expect(closed.blocks.at(-1)).toEqual({
+      raw: "~~~ts\nconst x = 1\n~~~",
+      src: "const x = 1",
+      mode: "code",
+      language: "ts",
+      complete: true,
+    })
+  })
 })
diff --git a/packages/ui/src/components/markdown-stream.ts b/packages/ui/src/components/markdown-stream.ts
index ae034275c70..3b1c2526603 100644
--- a/packages/ui/src/components/markdown-stream.ts
+++ b/packages/ui/src/components/markdown-stream.ts
@@ -1,15 +1,31 @@
 import { marked, type Tokens } from "marked"
 import remend from "remend"
-import { stableBlocks } from "../kilocode/markdown-stable-blocks" // kilocode_change
 
 export type Block = {
   raw: string
   src: string
-  mode: "full" | "live"
+  mode: "full" | "live" | "code"
+  language?: string
+  complete?: boolean
+}
+
+export type Projection = {
+  text: string
+  blocks: Block[]
 }
 
 function refs(text: string) {
-  return /^\[[^\]]+\]:\s+\S+/m.test(text) || /^\[\^[^\]]+\]:\s+/m.test(text)
+  if (!text.includes("]:")) return false
+  return /^[ \t]{0,3}\[[^\]]+\]:[ \t]*(?:\S+|\r?\n[ \t]+\S+)/m.test(text)
+}
+
+function language(value: string | undefined) {
+  return value?.trim().split(/\s+/, 1)[0] || undefined
+}
+
+function openCode(raw: string) {
+  const newline = raw.indexOf("\n")
+  return newline < 0 ? "" : raw.slice(newline + 1)
 }
 
 function open(raw: string) {
@@ -23,31 +39,72 @@ function open(raw: string) {
   return !new RegExp(`^[\\t ]{0,3}${char}{${size},}[\\t ]*$`).test(last)
 }
 
+function closesFence(raw: string, suffix: string) {
+  const mark = raw.match(/^[ \t]{0,3}(`{3,}|~{3,})/)?.[1]
+  if (!mark) return suffix.includes("```") || suffix.includes("~~~")
+  return `${raw.slice(-(mark.length - 1))}${suffix}`.includes(mark)
+}
+
 function heal(text: string) {
   return remend(text, { linkMode: "text-only" })
 }
 
-export function stream(text: string, live: boolean) {
+export function stream(text: string, live: boolean): Block[] {
   if (!live) return [{ raw: text, src: text, mode: "full" }] satisfies Block[]
-  const src = heal(text)
-  if (refs(text)) return [{ raw: text, src, mode: "live" }] satisfies Block[]
+  if (refs(text)) return [{ raw: text, src: heal(text), mode: "live" }] satisfies Block[]
   const tokens = marked.lexer(text)
-  const candidate = tokens.findLast((token) => token.type !== "space") // kilocode_change
-  const blocks = candidate && !open(candidate.raw) ? stableBlocks(tokens, heal) : undefined // kilocode_change
-  if (blocks) return blocks // kilocode_change
   const tail = tokens.findLastIndex((token) => token.type !== "space")
-  if (tail < 0) return [{ raw: text, src, mode: "live" }] satisfies Block[]
+  if (tail < 0) return [{ raw: text, src: heal(text), mode: "live" }] satisfies Block[]
   const last = tokens[tail]
-  if (!last || last.type !== "code") return [{ raw: text, src, mode: "live" }] satisfies Block[]
-  const code = last as Tokens.Code
-  if (!open(code.raw)) return [{ raw: text, src, mode: "live" }] satisfies Block[]
-  const head = tokens
-    .slice(0, tail)
+  if (!last) return [{ raw: text, src: heal(text), mode: "live" }] satisfies Block[]
+
+  const result: Block[] = []
+  for (let index = 0; index < tail; index++) {
+    const token = tokens[index]
+    if (!token || token.type === "space") continue
+    let raw = token.raw
+    while (tokens[index + 1]?.type === "space" && index + 1 < tail) raw += tokens[++index]!.raw
+    if (token.type === "code") {
+      const code = token as Tokens.Code
+      result.push({ raw, src: code.text, mode: "code", language: language(code.lang), complete: true })
+      continue
+    }
+    result.push({ raw, src: raw, mode: "full" })
+  }
+
+  const raw = tokens
+    .slice(tail)
     .map((token) => token.raw)
     .join("")
-  if (!head) return [{ raw: code.raw, src: code.raw, mode: "live" }] satisfies Block[]
-  return [
-    { raw: head, src: heal(head), mode: "live" },
-    { raw: code.raw, src: code.raw, mode: "live" },
-  ] satisfies Block[]
+  if (last.type !== "code") return [...result, { raw, src: heal(raw), mode: "live" }]
+
+  const code = last as Tokens.Code
+  if (!open(code.raw))
+    return [...result, { raw, src: code.text, mode: "code", language: language(code.lang), complete: true }]
+  return [...result, { raw, src: openCode(code.raw), mode: "code", language: language(code.lang) }]
+}
+
+export function canReusePendingBlock(current: Pick<Block, "mode" | "raw"> | undefined, next: Block) {
+  if (!current || current.mode !== next.mode) return false
+  if (next.mode === "code") return next.raw.startsWith(current.raw)
+  return current.raw === next.raw
+}
+
+export function project(previous: Projection | undefined, text: string, live: boolean): Projection {
+  if (!live || !previous || !text.startsWith(previous.text)) return { text, blocks: stream(text, live) }
+  const tail = previous.blocks.at(-1)
+  const suffix = text.slice(previous.text.length)
+  if (!suffix || tail?.mode !== "code" || tail.complete || closesFence(tail.raw, suffix))
+    return { text, blocks: stream(text, live) }
+  return {
+    text,
+    blocks: [
+      ...previous.blocks.slice(0, -1),
+      {
+        ...tail,
+        raw: tail.raw + suffix,
+        src: tail.src + suffix,
+      },
+    ],
+  }
 }
diff --git a/packages/ui/src/components/markdown-worker-protocol.test.ts b/packages/ui/src/components/markdown-worker-protocol.test.ts
new file mode 100644
index 00000000000..45a169c6a28
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker-protocol.test.ts
@@ -0,0 +1,81 @@
+import { expect, test } from "bun:test"
+import {
+  applyMarkdownWorkerResponse,
+  markdownBlockKey,
+  shouldReleaseMarkdownWorkerState,
+} from "./markdown-worker-protocol"
+
+const token = (content: string): [string, string] => [content, ""]
+const response = (id: number, reset: boolean, stable: [string, string][], unstable: [string, string][]) => ({
+  type: "highlight" as const,
+  id,
+  key: "code",
+  reset,
+  stable,
+  unstable,
+})
+
+test("accumulates stable worker tokens and replaces the unstable tail", () => {
+  const first = applyMarkdownWorkerResponse(undefined, {
+    type: "highlight",
+    id: 1,
+    key: "code",
+    reset: true,
+    stable: [token("one\n")],
+    unstable: [token("tw")],
+  })
+  const second = applyMarkdownWorkerResponse(first, {
+    type: "highlight",
+    id: 2,
+    key: "code",
+    reset: false,
+    stable: [token("two\n")],
+    unstable: [token("three")],
+  })
+
+  expect(second.stable.map((item) => item[0])).toEqual(["one\n", "two\n"])
+  expect(second.unstable.map((item) => item[0])).toEqual(["three"])
+})
+
+test("increments generation only when the worker resets token identity", () => {
+  const first = applyMarkdownWorkerResponse(undefined, response(1, true, [["const", ""]], []))
+  const append = applyMarkdownWorkerResponse(first, response(2, false, [[" x", ""]], []))
+  const replacement = applyMarkdownWorkerResponse(append, response(3, true, [["let y", ""]], []))
+  expect([first.generation, append.generation, replacement.generation]).toEqual([1, 1, 2])
+})
+
+test("ignores stale worker responses and resets replacement streams", () => {
+  const current = { id: 2, generation: 1, stable: [token("current")], unstable: [] }
+  expect(
+    applyMarkdownWorkerResponse(current, {
+      type: "highlight",
+      id: 1,
+      key: "code",
+      reset: false,
+      stable: [token("stale")],
+      unstable: [],
+    }),
+  ).toBe(current)
+
+  expect(
+    applyMarkdownWorkerResponse(current, {
+      type: "highlight",
+      id: 3,
+      key: "code",
+      reset: true,
+      stable: [token("replacement")],
+      unstable: [],
+    }).stable.map((item) => item[0]),
+  ).toEqual(["replacement"])
+})
+
+test("releases only the latest completed worker state", () => {
+  expect(shouldReleaseMarkdownWorkerState(true, 4, 4)).toBe(true)
+  expect(shouldReleaseMarkdownWorkerState(true, 5, 4)).toBe(false)
+  expect(shouldReleaseMarkdownWorkerState(false, 4, 4)).toBe(false)
+})
+
+test("prefixes pending and dispatched block keys with the component owner", () => {
+  expect(markdownBlockKey("owner", "message", 2, "code")).toBe("owner:message:2:code")
+  expect(markdownBlockKey("owner", undefined, 2, "code")).toBe("owner:block:2")
+})
diff --git a/packages/ui/src/components/markdown-worker-protocol.ts b/packages/ui/src/components/markdown-worker-protocol.ts
new file mode 100644
index 00000000000..e0b59e38df2
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker-protocol.ts
@@ -0,0 +1,48 @@
+import type { ThemeRegistrationResolved } from "shiki"
+
+export type MarkdownToken = [content: string, style: string]
+
+export type MarkdownWorkerRequest =
+  | { type: "init"; theme: ThemeRegistrationResolved }
+  | { type: "highlight"; id: number; key: string; text: string; language: string; complete?: boolean }
+  | { type: "dispose"; key: string }
+
+export type MarkdownWorkerResponse =
+  | {
+      type: "highlight"
+      id: number
+      key: string
+      reset: boolean
+      stable: MarkdownToken[]
+      unstable: MarkdownToken[]
+    }
+  | { type: "error"; id: number; key: string; message: string }
+  | { type: "superseded"; id: number; key: string }
+
+export type MarkdownWorkerState = {
+  id: number
+  generation: number
+  stable: MarkdownToken[]
+  unstable: MarkdownToken[]
+}
+
+export function shouldReleaseMarkdownWorkerState(complete: boolean, latestID: number | undefined, responseID: number) {
+  return complete && latestID === responseID
+}
+
+export function markdownBlockKey(owner: string, cacheKey: string | undefined, index: number, mode: string) {
+  return `${owner}:${cacheKey ? `${cacheKey}:${index}:${mode}` : `block:${index}`}`
+}
+
+export function applyMarkdownWorkerResponse(
+  state: MarkdownWorkerState | undefined,
+  response: Extract<MarkdownWorkerResponse, { type: "highlight" }>,
+) {
+  if (state && response.id <= state.id) return state
+  return {
+    id: response.id,
+    generation: (state?.generation ?? 0) + (response.reset ? 1 : 0),
+    stable: response.reset ? response.stable : [...(state?.stable ?? []), ...response.stable],
+    unstable: response.unstable,
+  }
+}
diff --git a/packages/ui/src/components/markdown-worker-queue.test.ts b/packages/ui/src/components/markdown-worker-queue.test.ts
new file mode 100644
index 00000000000..4283bc958f7
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker-queue.test.ts
@@ -0,0 +1,49 @@
+import { expect, test } from "bun:test"
+import { createLatestWorkerQueue } from "./markdown-worker-queue"
+
+test("keeps only the latest queued request for each key", async () => {
+  const processed: number[] = []
+  const superseded: number[] = []
+  let release = () => {}
+  const blocked = new Promise<void>((resolve) => {
+    release = resolve
+  })
+  const queue = createLatestWorkerQueue<{ id: number; key: string }>({
+    run: async (request) => {
+      processed.push(request.id)
+      if (request.id === 1) await blocked
+    },
+    supersede: (request) => superseded.push(request.id),
+    dispose: () => {},
+  })
+
+  queue.highlight({ id: 1, key: "code" })
+  await Promise.resolve()
+  queue.highlight({ id: 2, key: "code" })
+  queue.highlight({ id: 3, key: "code" })
+  queue.highlight({ id: 4, key: "code" })
+
+  expect(queue.pending()).toBe(1)
+  expect(superseded).toEqual([2, 3])
+  release()
+  await queue.idle()
+  expect(processed).toEqual([1, 4])
+})
+
+test("serializes disposal before a later request for the same key", async () => {
+  const events: string[] = []
+  const queue = createLatestWorkerQueue<{ id: number; key: string }>({
+    run: async (request) => {
+      events.push(`highlight:${request.id}`)
+    },
+    supersede: (request) => events.push(`supersede:${request.id}`),
+    dispose: (key) => events.push(`dispose:${key}`),
+  })
+
+  queue.highlight({ id: 1, key: "code" })
+  queue.dispose("code")
+  queue.highlight({ id: 2, key: "code" })
+  await queue.idle()
+
+  expect(events).toEqual(["supersede:1", "dispose:code", "highlight:2"])
+})
diff --git a/packages/ui/src/components/markdown-worker-queue.ts b/packages/ui/src/components/markdown-worker-queue.ts
new file mode 100644
index 00000000000..f7711576348
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker-queue.ts
@@ -0,0 +1,64 @@
+export function createLatestWorkerQueue<T extends { key: string }>(input: {
+  run: (request: T) => Promise<void>
+  supersede: (request: T) => void
+  dispose: (key: string) => void
+}) {
+  type Slot = { type: "highlight"; key: string; request?: T }
+  const jobs: Array<Slot | { type: "dispose"; key: string }> = []
+  const slots = new Map<string, Slot>()
+  let running: Promise<void> | undefined
+  let cursor = 0
+
+  const schedule = () => {
+    if (running) return
+    running = Promise.resolve()
+      .then(async () => {
+        while (cursor < jobs.length) {
+          const job = jobs[cursor++]!
+          if (job.type === "dispose") {
+            input.dispose(job.key)
+            continue
+          }
+          if (slots.get(job.key) === job) slots.delete(job.key)
+          const request = job.request
+          job.request = undefined
+          if (request) await input.run(request)
+        }
+      })
+      .finally(() => {
+        jobs.splice(0, cursor)
+        cursor = 0
+        running = undefined
+        if (jobs.length > 0) schedule()
+      })
+  }
+
+  return {
+    highlight(request: T) {
+      const slot = slots.get(request.key)
+      if (slot) {
+        if (slot.request) input.supersede(slot.request)
+        slot.request = request
+        return
+      }
+      const next: Slot = { type: "highlight", key: request.key, request }
+      slots.set(request.key, next)
+      jobs.push(next)
+      schedule()
+    },
+    dispose(key: string) {
+      const slot = slots.get(key)
+      if (slot?.request) input.supersede(slot.request)
+      if (slot) {
+        slot.request = undefined
+        slots.delete(key)
+      }
+      jobs.push({ type: "dispose", key })
+      schedule()
+    },
+    pending: () => slots.size,
+    async idle() {
+      while (running) await running
+    },
+  }
+}
diff --git a/packages/ui/src/components/markdown-worker-transport.test.ts b/packages/ui/src/components/markdown-worker-transport.test.ts
new file mode 100644
index 00000000000..24cf842a4a3
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker-transport.test.ts
@@ -0,0 +1,56 @@
+import { expect, test } from "bun:test"
+import { createWorkerTransport } from "./markdown-worker-transport"
+
+test("posts one request and retains only the latest queued snapshot per key", () => {
+  const posted: number[] = []
+  const superseded: number[] = []
+  const transport = createWorkerTransport<{ id: number; key: string }>({
+    post: (request) => posted.push(request.id),
+    supersede: (request) => superseded.push(request.id),
+  })
+
+  transport.send({ id: 1, key: "code" })
+  transport.send({ id: 2, key: "code" })
+  transport.send({ id: 3, key: "code" })
+
+  expect(posted).toEqual([1])
+  expect(superseded).toEqual([2])
+  expect(transport.queued()).toBe(1)
+  transport.complete("code", 1)
+  expect(posted).toEqual([1, 3])
+  expect(transport.queued()).toBe(0)
+})
+
+test("ignores a disposed request response after the key is reused", () => {
+  const posted: number[] = []
+  const transport = createWorkerTransport<{ id: number; key: string }>({
+    post: (request) => posted.push(request.id),
+    supersede: () => {},
+  })
+
+  transport.send({ id: 1, key: "code" })
+  transport.dispose("code")
+  transport.send({ id: 2, key: "code" })
+  transport.send({ id: 3, key: "code" })
+  transport.complete("code", 1)
+
+  expect(posted).toEqual([1, 2])
+  expect(transport.queued()).toBe(1)
+  transport.complete("code", 2)
+  expect(posted).toEqual([1, 2, 3])
+})
+
+test("drops queued snapshots when a key is disposed", () => {
+  const superseded: number[] = []
+  const transport = createWorkerTransport<{ id: number; key: string }>({
+    post: () => {},
+    supersede: (request) => superseded.push(request.id),
+  })
+
+  transport.send({ id: 1, key: "code" })
+  transport.send({ id: 2, key: "code" })
+  transport.dispose("code")
+
+  expect(superseded).toEqual([2])
+  expect(transport.queued()).toBe(0)
+})
diff --git a/packages/ui/src/components/markdown-worker-transport.ts b/packages/ui/src/components/markdown-worker-transport.ts
new file mode 100644
index 00000000000..acdac7b1c93
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker-transport.ts
@@ -0,0 +1,41 @@
+export function createWorkerTransport<T extends { id: number; key: string }>(input: {
+  post: (request: T) => void
+  supersede: (request: T) => void
+}) {
+  const active = new Map<string, T>()
+  const queued = new Map<string, T>()
+
+  return {
+    send(request: T) {
+      if (!active.has(request.key)) {
+        active.set(request.key, request)
+        input.post(request)
+        return
+      }
+      const previous = queued.get(request.key)
+      if (previous) input.supersede(previous)
+      queued.set(request.key, request)
+    },
+    complete(key: string, id: number) {
+      if (active.get(key)?.id !== id) return
+      active.delete(key)
+      const next = queued.get(key)
+      if (!next) return
+      queued.delete(key)
+      active.set(key, next)
+      input.post(next)
+    },
+    dispose(key: string) {
+      active.delete(key)
+      const request = queued.get(key)
+      if (request) input.supersede(request)
+      queued.delete(key)
+    },
+    reset() {
+      queued.forEach(input.supersede)
+      queued.clear()
+      active.clear()
+    },
+    queued: () => queued.size,
+  }
+}
diff --git a/packages/ui/src/components/markdown-worker.ts b/packages/ui/src/components/markdown-worker.ts
new file mode 100644
index 00000000000..1293fe71e66
--- /dev/null
+++ b/packages/ui/src/components/markdown-worker.ts
@@ -0,0 +1,122 @@
+import MarkdownShikiWorkerUrl from "./markdown-shiki.worker.ts?worker&url"
+import { KiloTheme } from "../context/marked" // kilocode_change
+import {
+  applyMarkdownWorkerResponse,
+  shouldReleaseMarkdownWorkerState,
+  type MarkdownWorkerRequest,
+  type MarkdownWorkerResponse,
+  type MarkdownWorkerState,
+} from "./markdown-worker-protocol"
+import { createWorkerTransport } from "./markdown-worker-transport"
+
+type Pending = {
+  key: string
+  complete: boolean
+  resolve: (state: MarkdownWorkerState) => void
+  reject: (error: Error) => void
+}
+
+let worker: Worker | undefined
+let disabled: Error | undefined
+let nextID = 0
+const pending = new Map<number, Pending>()
+const states = new Map<string, MarkdownWorkerState>()
+const keys = new Set<string>()
+const latest = new Map<string, number>()
+const transport = createWorkerTransport<Extract<MarkdownWorkerRequest, { type: "highlight" }>>({
+  post: (request) => worker!.postMessage(request),
+  supersede: (request) => {
+    const result = pending.get(request.id)
+    if (!result) return
+    pending.delete(request.id)
+    result.reject(new MarkdownWorkerSupersededError())
+  },
+})
+
+export function highlightStreamingCode(key: string, text: string, language: string, complete = false) {
+  const instance = getWorker()
+  const id = ++nextID
+  latest.set(key, id)
+  keys.delete(key)
+  keys.add(key)
+  if (keys.size > 200) disposeStreamingCode(keys.values().next().value!)
+  return new Promise<MarkdownWorkerState>((resolve, reject) => {
+    pending.set(id, { key, complete, resolve, reject })
+    transport.send({ type: "highlight", id, key, text, language, complete })
+  })
+}
+
+export function disposeStreamingCode(key: string) {
+  keys.delete(key)
+  latest.delete(key)
+  states.delete(key)
+  transport.dispose(key)
+  pending.forEach((request, id) => {
+    if (request.key !== key) return
+    pending.delete(id)
+    request.reject(new MarkdownWorkerDisposedError())
+  })
+  worker?.postMessage({ type: "dispose", key } satisfies MarkdownWorkerRequest)
+}
+
+export class MarkdownWorkerDisposedError extends Error {}
+export class MarkdownWorkerSupersededError extends Error {}
+export class MarkdownWorkerUnavailableError extends Error {}
+
+function getWorker() {
+  if (worker) return worker
+  if (disabled) throw new MarkdownWorkerUnavailableError(disabled.message)
+  try {
+    worker = new Worker(MarkdownShikiWorkerUrl, { type: "module" })
+  } catch (error) {
+    disabled = error instanceof Error ? error : new Error(String(error))
+    throw new MarkdownWorkerUnavailableError(disabled.message)
+  }
+  worker.onmessage = (event: MessageEvent<MarkdownWorkerResponse>) => {
+    const result = pending.get(event.data.id)
+    if (!result) {
+      transport.complete(event.data.key, event.data.id)
+      return
+    }
+    pending.delete(event.data.id)
+    if (!keys.has(event.data.key)) {
+      result.reject(new MarkdownWorkerDisposedError())
+      transport.complete(event.data.key, event.data.id)
+      return
+    }
+    if (event.data.type === "superseded") {
+      result.reject(new MarkdownWorkerSupersededError())
+      transport.complete(event.data.key, event.data.id)
+      return
+    }
+    if (event.data.type === "error") {
+      result.reject(new Error(event.data.message))
+      transport.complete(event.data.key, event.data.id)
+      return
+    }
+    const state = applyMarkdownWorkerResponse(states.get(event.data.key), event.data)
+    if (shouldReleaseMarkdownWorkerState(result.complete, latest.get(event.data.key), event.data.id)) {
+      states.delete(event.data.key)
+      keys.delete(event.data.key)
+      latest.delete(event.data.key)
+    } else states.set(event.data.key, state)
+    result.resolve(state)
+    transport.complete(event.data.key, event.data.id)
+  }
+  const fail = (message: string) => {
+    const error = new Error(message)
+    disabled = error
+    transport.reset()
+    pending.forEach((request) => request.reject(error))
+    pending.clear()
+    states.clear()
+    keys.clear()
+    latest.clear()
+    worker?.terminate()
+    worker = undefined
+  }
+  worker.onerror = (event) => fail(event.message || "Markdown highlighting worker failed")
+  worker.onmessageerror = () => fail("Markdown worker response failed")
+  worker.postMessage({ type: "init", theme: KiloTheme } satisfies MarkdownWorkerRequest) // kilocode_change
+  return worker
+}
diff --git a/packages/ui/src/components/markdown.css b/packages/ui/src/components/markdown.css
index d246cb2302f..ad25fbf2721 100644
--- a/packages/ui/src/components/markdown.css
+++ b/packages/ui/src/components/markdown.css
@@ -15,6 +15,12 @@
   > *:last-child {
     margin-bottom: 0;
   }
+  > [data-markdown-block]:first-child > *:first-child {
+    margin-top: 0;
+  }
+  > [data-markdown-block]:last-child > *:last-child {
+    margin-bottom: 0;
+  }
 
   /* Headings: Same size, distinguished by color and spacing */
   h1,
@@ -121,6 +127,8 @@
   }
 
   .shiki {
+    background: var(--color-background-stronger);
+    color: var(--text-base);
     font-size: 13px;
     padding: 12px;
     border-radius: 6px;
diff --git a/packages/ui/src/components/markdown.tsx b/packages/ui/src/components/markdown.tsx
index a46b5fbd1e4..8cef102376a 100644
--- a/packages/ui/src/components/markdown.tsx
+++ b/packages/ui/src/components/markdown.tsx
@@ -4,23 +4,62 @@ import { useI18n } from "../context/i18n"
 import DOMPurify from "dompurify"
 import morphdom from "morphdom"
 import { checksum } from "@opencode-ai/core/util/encode"
-import { ComponentProps, createEffect, createResource, createSignal, onCleanup, splitProps } from "solid-js"
+import {
+  ComponentProps,
+  createEffect,
+  createMemo,
+  createResource,
+  createSignal,
+  createUniqueId,
+  onCleanup,
+  splitProps,
+} from "solid-js"
 import { isServer } from "solid-js/web"
-import { stream } from "./markdown-stream"
-import { tryFastRender } from "../kilocode/markdown-fast-path" // kilocode_change
-import { hasMermaid, preserveMermaid, renderMermaid, type MermaidLabels } from "../kilocode/markdown-mermaid" // kilocode_change
-import { preserveStreamingHighlight } from "../kilocode/markdown-stream-highlight" // kilocode_change
-import { createIncrementalMarkdown, type MarkdownBlock } from "../kilocode/markdown-incremental-dom" // kilocode_change
+import { bundledLanguages } from "shiki"
+import { canReusePendingBlock, project, type Block, type Projection } from "./markdown-stream"
+import {
+  disposeStreamingCode,
+  highlightStreamingCode,
+  MarkdownWorkerDisposedError,
+  MarkdownWorkerSupersededError,
+  MarkdownWorkerUnavailableError,
+} from "./markdown-worker"
+import { markdownBlockKey, type MarkdownToken } from "./markdown-worker-protocol"
+import { shouldResetCodeTokens, type RenderedCodeState } from "./markdown-code-state"
+// kilocode_change start: Mermaid rendering and morphdom guards for highlighted blocks
+import { hasMermaid, preserveMermaid, renderMermaid, type MermaidLabels } from "../kilocode/markdown-mermaid"
+import { preserveStreamingHighlight } from "../kilocode/markdown-stream-highlight"
+// kilocode_change end
 
 type Entry = {
+  raw: string
   hash: string
   html: string
 }
 
-type Rendered = { content: string; blocks: MarkdownBlock[] } // kilocode_change
+type RenderedBlock =
+  | (Entry & { key: string; mode: Exclude<Block["mode"], "code"> })
+  | {
+      key: string
+      mode: "code"
+      raw: string
+      src: string // kilocode_change - Mermaid consumes delimiter-free source while raw preserves stream identity
+      hash: string
+      language: string
+      complete: boolean
+      generation: number
+      stable: MarkdownToken[]
+      unstable: MarkdownToken[]
+    }
+
+type RenderResult = {
+  text: string
+  blocks: RenderedBlock[]
+}
 
 const max = 200
 const cache = new Map<string, Entry>()
+const renderedCodeTokens = new WeakMap<HTMLDivElement, RenderedCodeState>()
 
 if (typeof window !== "undefined" && DOMPurify.isSupported) {
   DOMPurify.addHook("afterSanitizeAttributes", (node: Element) => {
@@ -67,6 +106,22 @@ function fallback(markdown: string) {
   return escape(markdown).replace(/\r\n?/g, "\n").replace(/\n/g, "<br>")
 }
 
+async function code(text: string, language: string | undefined, key: string, complete = false) {
+  const name = language && language in bundledLanguages ? language : "text"
+  try {
+    const result = await highlightStreamingCode(key, text, name, complete)
+    return { language: name, generation: result.generation, stable: result.stable, unstable: result.unstable }
+  } catch (error) {
+    if (
+      !(error instanceof MarkdownWorkerDisposedError) &&
+      !(error instanceof MarkdownWorkerSupersededError) &&
+      !(error instanceof MarkdownWorkerUnavailableError)
+    )
+      console.error("Markdown highlighting worker failed", error)
+    return { language: name, generation: 0, stable: [], unstable: [[text, ""] as MarkdownToken] }
+  }
+}
+
 type CopyLabels = {
   copy: string
   copied: string
@@ -245,6 +300,33 @@ function touch(key: string, value: Entry) {
   cache.delete(first)
 }
 
+function initialResult(text: string, key: string | undefined, projection: Projection, owner: string): RenderResult {
+  if (!text) return { text, blocks: [] }
+  const base = key ?? checksum(text)
+  if (base) {
+    const blocks = projection.blocks.flatMap((block, index) => {
+      if (block.mode === "code") return []
+      const cacheKey = `${base}:${index}:${block.mode}`
+      const cached = cache.get(cacheKey)
+      if (cached?.raw !== block.raw) return []
+      return [{ key: `${owner}:${cacheKey}`, mode: block.mode, ...cached }]
+    })
+    if (blocks.length === projection.blocks.length) return { text, blocks }
+  }
+  return {
+    text,
+    blocks: [
+      {
+        key: "initial",
+        mode: "full",
+        raw: text,
+        hash: checksum(text) ?? "",
+        html: fallback(text),
+      },
+    ],
+  }
+}
+
 export function Markdown(
   props: ComponentProps<"div"> & {
     text: string
@@ -258,49 +340,117 @@ export function Markdown(
   const marked = useMarked()
   const i18n = useI18n()
   const [root, setRoot] = createSignal<HTMLDivElement>()
+  const owner = createUniqueId()
+  const activeCodeKeys = new Set<string>()
+  const completedCode = new Map<string, Extract<RenderedBlock, { mode: "code" }>>()
+  const projection = createMemo((previous: Projection | undefined) =>
+    project(previous, local.text, local.streaming ?? false),
+  )
   const [html] = createResource(
-    () => ({
-      text: local.text,
-      key: local.cacheKey,
-      streaming: local.streaming ?? false,
-    }),
-    // kilocode_change start
-    async (src): Promise<Rendered> => {
-      // kilocode_change end
-      if (isServer) return { content: fallback(src.text), blocks: [] } // kilocode_change
-      if (!src.text) return { content: "", blocks: [] } // kilocode_change
+    () => {
+      return {
+        text: local.text,
+        key: local.cacheKey,
+        projection: projection(),
+      }
+    },
+    async (src) => {
+      if (isServer)
+        return {
+          text: src.text,
+          blocks: [
+            {
+              key: "server",
+              mode: "full" as const,
+              raw: src.text,
+              hash: checksum(src.text) ?? "",
+              html: fallback(src.text),
+            },
+          ],
+        } satisfies RenderResult
+      if (!src.text) return { text: src.text, blocks: [] } satisfies RenderResult
 
       const base = src.key ?? checksum(src.text)
       return Promise.all(
-        stream(src.text, src.streaming).map(async (block, index) => {
-          const hash = checksum(block.raw) ?? "" // kilocode_change
-          const key = base ? `${base}:${index}:${block.mode}` : hash
+        src.projection.blocks.map(async (block, index) => {
+          const key = base ? `${base}:${index}:${block.mode}` : undefined
+          const blockKey = markdownBlockKey(owner, src.key, index, block.mode)
 
-          if (key && hash) {
+          if (block.mode === "code") {
+            // kilocode_change start: mermaid blocks are rendered as diagrams by
+            // kickMermaid, not Shiki-highlighted by the worker. Return plain
+            // text tokens so updateCodeBlock can emit a <pre data-lang="mermaid">
+            // source block for renderMermaid to transform.
+            if (block.language === "mermaid") {
+              return {
+                key: blockKey,
+                mode: block.mode,
+                raw: block.raw,
+                src: block.src, // kilocode_change
+                hash: String(block.raw.length),
+                complete: !!block.complete,
+                language: "mermaid",
+                generation: 0,
+                stable: [],
+                unstable: [[block.src, ""] as MarkdownToken],
+              }
+            }
+            // kilocode_change end
+            const cached = completedCode.get(blockKey)
+            if (block.complete && cached?.raw === block.raw) return cached
+            const result = await code(block.src, block.language, blockKey, block.complete)
+            const rendered = {
+              key: blockKey,
+              mode: block.mode,
+              raw: block.raw,
+              src: block.src, // kilocode_change
+              hash: String(block.raw.length),
+              complete: !!block.complete,
+              ...result,
+            }
+            if (block.complete) completedCode.set(blockKey, rendered)
+            return rendered
+          }
+
+          if (key) {
             const cached = cache.get(key)
-            if (cached && cached.hash === hash) {
+            if (cached?.raw === block.raw) {
               touch(key, cached)
-              return { key: `${base}:${index}`, hash, html: cached.html, mode: block.mode } // kilocode_change
+              return { key: blockKey, mode: block.mode, ...cached }
             }
           }
 
-          const next = await Promise.resolve(marked.parse(block.src))
-          const safe = sanitize(next)
-          if (key && hash) touch(key, { hash, html: safe })
-          return { key: `${base}:${index}`, hash, html: safe, mode: block.mode } // kilocode_change
+          const hash = checksum(block.raw)
+          const safe = sanitize(await Promise.resolve(marked.parse(block.src)))
+          if (key && hash) touch(key, { raw: block.raw, hash, html: safe })
+          return { key: blockKey, mode: block.mode, raw: block.raw, hash: hash ?? "", html: safe }
         }),
       )
-        .then((blocks) => ({ content: blocks.map((block) => block.html).join(""), blocks })) // kilocode_change
-        .catch(() => ({ content: fallback(src.text), blocks: [] })) // kilocode_change
+        .then((blocks) => ({ text: src.text, blocks }) satisfies RenderResult)
+        .catch(
+          () =>
+            ({
+              text: src.text,
+              blocks: [
+                {
+                  key: base ?? "fallback",
+                  mode: "full" as const,
+                  raw: src.text,
+                  hash: checksum(src.text) ?? "",
+                  html: fallback(src.text),
+                },
+              ],
+            }) satisfies RenderResult,
+        )
+    },
+    {
+      initialValue: initialResult(local.text, local.cacheKey, projection(), owner),
     },
-    { initialValue: { content: fallback(local.text), blocks: [] } }, // kilocode_change
   )
 
   let copyCleanup: (() => void) | undefined
   // kilocode_change start: generation counter prevents stale deferredHighlight
   // callbacks from overwriting copyCleanup set by a newer render (issue #6221).
-  // The abort signal cancels the previous in-flight highlight pass so rapid
-  // streaming tokens don't spawn concurrent passes racing on the same DOM nodes.
   const highlightState = { gen: 0, signal: { aborted: false } }
   // kilocode_change end
 
@@ -308,52 +458,14 @@ export function Markdown(
   const mermaidState = { gen: 0, signal: { aborted: false } }
   // kilocode_change end
 
-  // kilocode_change start: rAF-coalesced morphdom render.
-  // During LLM token streaming, content updates arrive at 60–200Hz. Each
-  // token reparses the full accumulated HTML (temp.innerHTML = content) and
-  // diffs it via morphdom. CPU profile of a 7s streaming window showed 2,940
-  // ParseHTML events totaling ~619ms (~46% of blocked main-thread time). The
-  // user can only see one frame per 16ms anyway, so cap parses at ≤1 per
-  // animation frame.
-  let pendingFrame: number | undefined
-  let pendingContent: string | undefined
-  let pendingLabels: { copy: string; copied: string } | undefined
-  // kilocode_change end
-  // kilocode_change start
-  const incremental = createIncrementalMarkdown<MermaidLabels>(decorate, {
-    cancel: () => {
-      if (pendingFrame === undefined) return
-      cancelAnimationFrame(pendingFrame)
-      pendingFrame = undefined
-      pendingContent = undefined
-      pendingLabels = undefined
-    },
-    ready: (container, labels, mermaid) => {
-      copyCleanup ??= setupCodeCopy(container, () => labels)
-      kickMermaid(container, true, mermaid)
-      kickHighlight(container, labels)
-    },
-  })
-  // kilocode_change end
-
   createEffect(() => {
     const container = root()
-    const rendered = html.latest ?? html() ?? { content: "", blocks: [] } // kilocode_change
-    const content = local.text ? rendered.content : "" // kilocode_change
+    const result = html.latest ?? html()
+    const projected = projection()
+    const content = local.text ? pendingBlocks(result, projected, local.cacheKey, owner) : []
     if (!container) return
     if (isServer) return
-
-    if (!content) {
-      // kilocode_change start: cancel any in-flight coalesced render so a
-      // clear takes precedence over a pending parse.
-      if (pendingFrame !== undefined) {
-        cancelAnimationFrame(pendingFrame)
-        pendingFrame = undefined
-        pendingContent = undefined
-        pendingLabels = undefined
-      }
-      // kilocode_change end
-      incremental.reset() // kilocode_change
+    if (content.length === 0) {
       container.innerHTML = ""
       // kilocode_change start: Mermaid diagram rendering
       mermaidState.signal.aborted = true
@@ -366,8 +478,28 @@ export function Markdown(
       copy: i18n.t("ui.message.copy"),
       copied: i18n.t("ui.message.copied"),
     }
+    const nextCodeKeys = new Set(content.filter((block) => block.mode === "code").map((block) => block.key))
+    activeCodeKeys.forEach((key) => {
+      if (!nextCodeKeys.has(key)) disposeCode(key)
+    })
+    activeCodeKeys.clear()
+    nextCodeKeys.forEach((key) => activeCodeKeys.add(key))
+    content.forEach((block, index) => updateBlock(container, index, block, labels, local.streaming ?? false)) // kilocode_change
+    while (container.children.length > content.length) container.lastElementChild?.remove()
+    container
+      .querySelectorAll<HTMLButtonElement>('[data-slot="markdown-copy-button"]')
+      .forEach((button) => setCopyState(button, labels, button.dataset.copied === "true"))
+    if (!copyCleanup)
+      copyCleanup = setupCodeCopy(container, () => ({
+        copy: i18n.t("ui.message.copy"),
+        copied: i18n.t("ui.message.copied"),
+      }))
 
-    // kilocode_change start: Mermaid diagram rendering
+    // kilocode_change start: progressive Shiki highlighting for non-streaming
+    // "full" blocks and Mermaid diagram rendering. The parser emits plain
+    // <pre><code data-lang="..."> blocks; deferredHighlight upgrades them
+    // via setTimeout(0) so initial paint is instant. Mermaid blocks are
+    // detected and rendered as SVG diagrams when not streaming.
     const mermaid = {
       rendering: i18n.t("ui.mermaid.rendering"),
       renderError: (message: string) => i18n.t("ui.mermaid.renderError", { message }),
@@ -382,102 +514,8 @@ export function Markdown(
       downloadSvg: i18n.t("ui.mermaid.downloadSvg"),
       downloadPng: i18n.t("ui.mermaid.downloadPng"),
     }
-    // kilocode_change end
-
-    // kilocode_change start
-    const fast = tryFastRender(container, content, local.streaming, decorate, setupCodeCopy, () => labels, copyCleanup)
-    if (fast.handled) {
-      // Fast path took over; drop any pending coalesced morphdom from a
-      // previous streaming turn on this same element.
-      if (pendingFrame !== undefined) {
-        cancelAnimationFrame(pendingFrame)
-        pendingFrame = undefined
-        pendingContent = undefined
-        pendingLabels = undefined
-      }
-      incremental.reset() // kilocode_change
-      copyCleanup = fast.copyCleanup
-      kickMermaid(container, local.streaming ?? false, mermaid)
-      kickHighlight(container, labels)
-      return
-    }
-    // kilocode_change end
-
-    if (incremental.render(local.streaming ?? false, container, rendered.blocks, labels, mermaid)) return // kilocode_change
-    incremental.reset() // kilocode_change
-
-    // kilocode_change start: queue the latest content for a single rAF tick.
-    // Further updates before the frame runs simply overwrite pendingContent,
-    // so K rapid updates collapse to 1 parse instead of K.
-    pendingContent = content
-    pendingLabels = labels
-    if (pendingFrame !== undefined) return
-    pendingFrame = requestAnimationFrame(() => {
-      pendingFrame = undefined
-      const next = pendingContent
-      const nextLabels = pendingLabels
-      pendingContent = undefined
-      pendingLabels = undefined
-      if (next === undefined || nextLabels === undefined) return
-      if (!container.isConnected) return
-
-      const temp = document.createElement("div")
-      temp.innerHTML = next
-      decorate(temp, nextLabels)
-
-      // kilocode_change start: morphdom guard for highlighted blocks (issue #6221)
-      // During streaming, morphdom re-runs on every token. Without this guard,
-      // it would revert already-highlighted <pre> blocks back to plain code.
-      morphdom(container, temp, {
-        childrenOnly: true,
-        onBeforeElUpdated: (fromEl, toEl) => {
-          if (
-            fromEl instanceof HTMLButtonElement &&
-            toEl instanceof HTMLButtonElement &&
-            fromEl.getAttribute("data-slot") === "markdown-copy-button" &&
-            toEl.getAttribute("data-slot") === "markdown-copy-button" &&
-            fromEl.getAttribute("data-copied") === "true"
-          ) {
-            setCopyState(toEl, nextLabels, true)
-          }
-          if (fromEl.isEqualNode(toEl)) return false
-          // kilocode_change start: preserve rendered Mermaid diagrams across
-          // normal markdown morphdom refreshes so they do not flicker back to
-          // their source code while being re-rendered.
-          if (preserveMermaid(fromEl, toEl)) return false
-          // kilocode_change end
-          // Preserve Shiki-highlighted blocks — don't let morphdom revert them
-          // to plain <pre><code> during streaming re-renders.
-          // Note: "shiki" class is on <pre> (set by Shiki's codeToHtml output).
-          // We compare data-source-hash (a lightweight FNV-1a hash stored by
-          // deferredHighlight on the highlighted <pre>) against a hash of the
-          // incoming code text to detect mid-stream content changes: if the code
-          // changed, we let morphdom update so the block can be re-queued for
-          // highlighting with the new content.
-          if (
-            fromEl instanceof HTMLElement &&
-            fromEl.tagName === "PRE" &&
-            fromEl.classList.contains("shiki") &&
-            toEl instanceof HTMLElement &&
-            toEl.tagName === "PRE" &&
-            !toEl.classList.contains("shiki")
-          ) {
-            const fromHash = fromEl.getAttribute("data-source-hash")
-            const toCode = toEl.querySelector("code")?.textContent ?? ""
-            if (fromHash === fnv1a(toCode)) return false
-            if (preserveStreamingHighlight(fromEl, toEl, local.streaming ?? false)) return false // kilocode_change
-            // Source changed during streaming — fall through so morphdom replaces // kilocode_change
-            // the stale highlighted block with the updated plain block, which will
-            // be re-highlighted on the next deferredHighlight pass.
-          }
-          return true
-        },
-      })
-      // kilocode_change end
-
-      kickMermaid(container, local.streaming ?? false, mermaid) // kilocode_change
-      kickHighlight(container, nextLabels)
-    })
+    kickHighlight(container, labels)
+    kickMermaid(container, local.streaming ?? false, mermaid)
     // kilocode_change end
   })
 
@@ -530,15 +568,9 @@ export function Markdown(
     mermaidState.signal.aborted = true
     mermaidState.gen++
     // kilocode_change end
-    // kilocode_change: cancel any queued rAF parse so it doesn't touch the
-    // unmounted DOM after dispose.
-    if (pendingFrame !== undefined) {
-      cancelAnimationFrame(pendingFrame)
-      pendingFrame = undefined
-      pendingContent = undefined
-      pendingLabels = undefined
-    }
     if (copyCleanup) copyCleanup()
+    activeCodeKeys.forEach(disposeCode)
+    completedCode.clear()
   })
 
   return (
@@ -554,3 +586,211 @@ export function Markdown(
     />
   )
 }
+
+function pendingBlocks(
+  result: RenderResult | undefined,
+  projection: Projection | undefined,
+  cacheKey: string | undefined,
+  owner: string,
+) {
+  if (!result) return []
+  if (!projection || result.text === projection.text) return result.blocks
+  const initial = result.blocks.length === 1 && result.blocks[0]?.key === "initial"
+  return projection.blocks.map((block, index) => {
+    const current = initial ? undefined : result.blocks[index]
+    if (current && canReusePendingBlock(current, block)) return current
+    const key = markdownBlockKey(owner, cacheKey, index, block.mode)
+    if (block.mode !== "code")
+      return { key, mode: block.mode, raw: block.raw, hash: String(block.raw.length), html: fallback(block.src) }
+    return {
+      key,
+      mode: block.mode,
+      raw: block.raw,
+      src: block.src, // kilocode_change
+      hash: String(block.raw.length),
+      language: block.language ?? "text",
+      complete: !!block.complete,
+      stable: [],
+      generation: 0,
+      unstable: [[block.src, ""] as MarkdownToken],
+    }
+  })
+}
+
+function disposeCode(key: string) {
+  disposeStreamingCode(key)
+}
+
+function updateBlock(
+  container: HTMLDivElement,
+  index: number,
+  block: RenderedBlock,
+  labels: CopyLabels,
+  streaming: boolean, // kilocode_change
+) {
+  const current = container.children[index]
+  if (block.mode === "code") {
+    updateCodeBlock(container, current, block, labels)
+    return
+  }
+  if (
+    current instanceof HTMLDivElement &&
+    current.dataset.markdownKey === block.key &&
+    current.dataset.markdownHash === block.hash
+  )
+    return
+
+  const next = document.createElement("div")
+  next.dataset.markdownBlock = ""
+  next.dataset.markdownKey = block.key
+  next.dataset.markdownHash = block.hash
+  next.style.display = "contents"
+  next.innerHTML = block.html
+  decorate(next, labels)
+
+  if (!(current instanceof HTMLDivElement)) {
+    container.appendChild(next)
+    return
+  }
+
+  morphdom(current, next, {
+    onBeforeElUpdated: (fromEl, toEl) => {
+      if (
+        fromEl instanceof HTMLButtonElement &&
+        toEl instanceof HTMLButtonElement &&
+        fromEl.getAttribute("data-slot") === "markdown-copy-button" &&
+        toEl.getAttribute("data-slot") === "markdown-copy-button"
+      ) {
+        // kilocode_change start: preserve "copied" visual state across re-renders
+        if (fromEl.getAttribute("data-copied") === "true") setCopyState(toEl, labels, true)
+        // kilocode_change end
+        return false
+      }
+      if (fromEl.isEqualNode(toEl)) return false
+      // kilocode_change start: preserve rendered Mermaid diagrams across
+      // morphdom refreshes so they do not flicker back to source code.
+      if (preserveMermaid(fromEl, toEl)) return false
+      // kilocode_change end
+      // kilocode_change start: preserve Shiki-highlighted blocks — don't let
+      // morphdom revert them to plain <pre><code> during streaming re-renders.
+      // Compare data-source-hash (stored by deferredHighlight on the highlighted
+      // <pre>) against a hash of the incoming code text to detect mid-stream
+      // content changes: if the code changed, let morphdom update so the block
+      // can be re-queued for highlighting.
+      if (
+        fromEl instanceof HTMLElement &&
+        fromEl.tagName === "PRE" &&
+        fromEl.classList.contains("shiki") &&
+        toEl instanceof HTMLElement &&
+        toEl.tagName === "PRE" &&
+        !toEl.classList.contains("shiki")
+      ) {
+        const fromHash = fromEl.getAttribute("data-source-hash")
+        const toCode = toEl.querySelector("code")?.textContent ?? ""
+        if (fromHash === fnv1a(toCode)) return false
+        if (preserveStreamingHighlight(fromEl, toEl, streaming)) return false
+      }
+      // kilocode_change end
+      return true
+    },
+  })
+}
+
+function updateCodeBlock(
+  container: HTMLDivElement,
+  current: Element | undefined,
+  block: Extract<RenderedBlock, { mode: "code" }>,
+  labels: CopyLabels,
+) {
+  const existing = current instanceof HTMLDivElement && current.dataset.markdownKey === block.key ? current : undefined
+  const next = existing ?? document.createElement("div")
+  next.dataset.markdownBlock = ""
+  next.dataset.markdownKey = block.key
+  next.dataset.markdownHash = block.hash
+  next.dataset.markdownComplete = block.complete ? "true" : "false"
+  next.style.display = "contents"
+
+  // kilocode_change start: mermaid blocks render as a source <pre> for
+  // kickMermaid to transform into SVG diagrams, not as Shiki-highlighted code.
+  if (block.language === "mermaid") {
+    next.replaceChildren()
+    const wrapper = document.createElement("div")
+    wrapper.setAttribute("data-component", "markdown-code")
+    const pre = document.createElement("pre")
+    pre.setAttribute("dir", "auto")
+    const codeElement = document.createElement("code")
+    codeElement.setAttribute("data-lang", "mermaid")
+    codeElement.textContent = block.src // kilocode_change - Mermaid rejects fenced Markdown as diagram source
+    pre.appendChild(codeElement)
+    wrapper.appendChild(pre)
+    wrapper.appendChild(createCopyButton(labels))
+    next.appendChild(wrapper)
+    if (current && current !== next) current.replaceWith(next)
+    else if (!current) container.appendChild(next)
+    return
+  }
+  // kilocode_change end
+
+  const code = existing?.querySelector("code")
+  if (code instanceof HTMLElement) {
+    code.className = `language-${block.language}`
+    const previous = renderedCodeTokens.get(next)
+    const reset = shouldResetCodeTokens(previous, {
+      language: block.language,
+      generation: block.generation,
+      stableCount: block.stable.length,
+      raw: block.raw,
+    })
+    const stableCount = reset ? 0 : previous!.stableCount
+    const tail = [...block.stable.slice(stableCount), ...block.unstable]
+    const prior = reset ? [] : previous!.unstable
+    const prefix = prior.findIndex((token, index) => !sameToken(token, tail[index]))
+    const keep = stableCount + (prefix < 0 ? Math.min(prior.length, tail.length) : prefix)
+    while (code.children.length > keep) code.lastElementChild?.remove()
+    tail
+      .slice(keep - stableCount)
+      .map(createTokenSpan)
+      .forEach((span) => code.appendChild(span))
+    renderedCodeTokens.set(next, {
+      language: block.language,
+      generation: block.generation,
+      stableCount: block.stable.length,
+      unstable: block.unstable,
+      raw: block.raw,
+    })
+    return
+  }
+
+  const wrapper = document.createElement("div")
+  wrapper.setAttribute("data-component", "markdown-code")
+  const pre = document.createElement("pre")
+  pre.className = "shiki Kilo"
+  pre.setAttribute("dir", "auto") // kilocode_change
+  const codeElement = document.createElement("code")
+  codeElement.className = `language-${block.language}`
+  ;[...block.stable, ...block.unstable].map(createTokenSpan).forEach((span) => codeElement.appendChild(span))
+  pre.appendChild(codeElement)
+  wrapper.appendChild(pre)
+  wrapper.appendChild(createCopyButton(labels))
+  next.appendChild(wrapper)
+  renderedCodeTokens.set(next, {
+    language: block.language,
+    generation: block.generation,
+    stableCount: block.stable.length,
+    unstable: block.unstable,
+    raw: block.raw,
+  })
+  if (current) current.replaceWith(next)
+  else container.appendChild(next)
+}
+
+function sameToken(left: MarkdownToken, right: MarkdownToken | undefined) {
+  return !!right && left[0] === right[0] && left[1] === right[1]
+}
+
+function createTokenSpan(token: MarkdownToken) {
+  const span = document.createElement("span")
+  span.setAttribute("style", token[1])
+  span.textContent = token[0]
+  return span
+}
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index 4e75d22d12e..37f6a946007 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -180,6 +180,7 @@ export interface MessagePartProps {
   onToolOpenChange?: (open: boolean) => void
   deferToolContent?: boolean
   virtualizeDiff?: boolean
+  onContentRendered?: () => void
   showAssistantCopyPartID?: string | null
   turnDurationMs?: number
 }
@@ -189,13 +190,14 @@ export type PartComponent = Component<MessagePartProps>
 export const PART_MAPPING: Record<string, PartComponent | undefined> = {}
 
 const TEXT_RENDER_PACE_MS = 24
+const TEXT_RENDER_IMMEDIATE = 512
 const TEXT_RENDER_SNAP = /[\s.,!?;:)\]]/
 
 function step(size: number) {
   if (size <= 12) return 2
   if (size <= 48) return 4
   if (size <= 96) return 8
-  return Math.min(24, Math.ceil(size / 8))
+  return Math.min(256, Math.ceil(size / 4))
 }
 
 function next(text: string, start: number) {
@@ -234,6 +236,10 @@ function createPacedValue(getValue: () => string, live?: () => boolean) {
       sync(text)
       return
     }
+    if (text.length - shown.length <= TEXT_RENDER_IMMEDIATE) {
+      sync(text)
+      return
+    }
     const end = next(text, shown.length)
     sync(text.slice(0, end))
     if (end < text.length) timeout = setTimeout(run, TEXT_RENDER_PACE_MS)
@@ -251,6 +257,11 @@ function createPacedValue(getValue: () => string, live?: () => boolean) {
       sync(text)
       return
     }
+    if (text.length - shown.length <= TEXT_RENDER_IMMEDIATE) {
+      clear()
+      sync(text)
+      return
+    }
     if (text.length === shown.length || timeout) return
     timeout = setTimeout(run, TEXT_RENDER_PACE_MS)
   })
@@ -1291,6 +1302,7 @@ export function Part(props: MessagePartProps) {
         onToolOpenChange={props.onToolOpenChange}
         deferToolContent={props.deferToolContent}
         virtualizeDiff={props.virtualizeDiff}
+        onContentRendered={props.onContentRendered}
         showAssistantCopyPartID={props.showAssistantCopyPartID}
         turnDurationMs={props.turnDurationMs}
       />
@@ -1311,6 +1323,7 @@ export interface ToolProps {
   onOpenChange?: (open: boolean) => void
   deferContent?: boolean
   virtualizeDiff?: boolean
+  onContentRendered?: () => void
   forceOpen?: boolean
   locked?: boolean
 }
@@ -1457,6 +1470,7 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
               onOpenChange={props.onToolOpenChange ? handleToolOpenChange : undefined}
               deferContent={props.deferToolContent}
               virtualizeDiff={props.virtualizeDiff}
+              onContentRendered={props.onContentRendered}
             />
           </Match>
         </Switch>
@@ -2058,7 +2072,13 @@ ToolRegistry.register({
               }
             >
               <div data-component="edit-content">
-                <Dynamic component={fileComponent} mode="diff" virtualize={props.virtualizeDiff} {...fileCompProps()} />
+                <Dynamic
+                  component={fileComponent}
+                  mode="diff"
+                  virtualize={props.virtualizeDiff}
+                  onRendered={props.onContentRendered}
+                  {...fileCompProps()}
+                />
               </div>
             </ToolFileAccordion>
           </Show>
@@ -2117,6 +2137,7 @@ ToolRegistry.register({
                     cacheKey: checksum(props.input.content),
                   }}
                   overflow="scroll"
+                  onRendered={props.onContentRendered}
                 />
               </div>
             </ToolFileAccordion>
@@ -2245,6 +2266,7 @@ ToolRegistry.register({
                                   virtualize={props.virtualizeDiff}
                                   fileDiff={file.view.fileDiff}
                                   hunkSeparators={file.view.fileDiff.isPartial ? "simple" : "line-info-basic"}
+                                  onRendered={props.onContentRendered}
                                 />
                               </div>
                             </Show>
@@ -2320,6 +2342,7 @@ ToolRegistry.register({
                   mode="diff"
                   virtualize={props.virtualizeDiff}
                   fileDiff={single()!.view.fileDiff}
+                  onRendered={props.onContentRendered}
                 />
               </div>
             </ToolFileAccordion>
diff --git a/packages/ui/src/components/popover.tsx b/packages/ui/src/components/popover.tsx
index 4c692f3fc4a..34f763fb71f 100644
--- a/packages/ui/src/components/popover.tsx
+++ b/packages/ui/src/components/popover.tsx
@@ -160,7 +160,7 @@ export function Popover<T extends ValidComponent = "div">(props: PopoverProps<T>
         focus(node)
       }}
       onCloseAutoFocus={(event: Event) => {
-        if (state.dismiss === "outside") event.preventDefault()
+        if (opened() || state.dismiss === "outside") event.preventDefault() // kilocode_change
         setState("dismiss", null)
       }}
     >
diff --git a/packages/ui/src/components/scroll-view.test.ts b/packages/ui/src/components/scroll-view.test.ts
index d28b51fea8b..370d025aa69 100644
--- a/packages/ui/src/components/scroll-view.test.ts
+++ b/packages/ui/src/components/scroll-view.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { scrollKey } from "./scroll-view"
+import { scrollKey, scrollTopFromThumbPointer } from "./scroll-view"
 
 describe("scrollKey", () => {
   test("maps plain navigation keys", () => {
@@ -17,3 +17,38 @@ describe("scrollKey", () => {
     expect(scrollKey({ key: "End", altKey: false, ctrlKey: false, metaKey: false, shiftKey: true })).toBeUndefined()
   })
 })
+
+describe("scrollTopFromThumbPointer", () => {
+  test("keeps downward thumb movement monotonic when content height changes", () => {
+    const first = scrollTopFromThumbPointer({
+      pointer: 300,
+      viewportTop: 100,
+      grabOffset: 12,
+      clientHeight: 600,
+      scrollHeight: 6_000,
+      thumbHeight: 60,
+    })
+    const second = scrollTopFromThumbPointer({
+      pointer: 320,
+      viewportTop: 100,
+      grabOffset: 12,
+      clientHeight: 600,
+      scrollHeight: 60_000,
+      thumbHeight: 32,
+    })
+
+    expect(second).toBeGreaterThan(first)
+  })
+
+  test("clamps pointer positions to the scroll range", () => {
+    const input = {
+      viewportTop: 100,
+      grabOffset: 12,
+      clientHeight: 600,
+      scrollHeight: 6_000,
+      thumbHeight: 60,
+    }
+    expect(scrollTopFromThumbPointer({ ...input, pointer: 0 })).toBe(0)
+    expect(scrollTopFromThumbPointer({ ...input, pointer: 1_000 })).toBe(5_400)
+  })
+})
diff --git a/packages/ui/src/components/scroll-view.tsx b/packages/ui/src/components/scroll-view.tsx
index 3ff00f117d2..9944da77d3a 100644
--- a/packages/ui/src/components/scroll-view.tsx
+++ b/packages/ui/src/components/scroll-view.tsx
@@ -27,6 +27,21 @@ export const scrollKey = (event: Pick<KeyboardEvent, "key" | "altKey" | "ctrlKey
   }
 }
 
+export function scrollTopFromThumbPointer(input: {
+  pointer: number
+  viewportTop: number
+  grabOffset: number
+  clientHeight: number
+  scrollHeight: number
+  thumbHeight: number
+}) {
+  const padding = 8
+  const maxThumbTop = input.clientHeight - padding * 2 - input.thumbHeight
+  if (maxThumbTop <= 0) return 0
+  const thumbTop = Math.max(0, Math.min(input.pointer - input.viewportTop - padding - input.grabOffset, maxThumbTop))
+  return (thumbTop / maxThumbTop) * Math.max(0, input.scrollHeight - input.clientHeight)
+}
+
 export function ScrollView(props: ScrollViewProps) {
   const i18n = useI18n()
   const merged = mergeProps({ orientation: "vertical" }, props)
@@ -103,39 +118,37 @@ export function ScrollView(props: ScrollViewProps) {
     updateThumb()
   })
 
-  let startY = 0
-  let startScrollTop = 0
-
   const onThumbPointerDown = (e: PointerEvent) => {
     e.preventDefault()
     e.stopPropagation()
     setState("isDragging", true)
-    startY = e.clientY
-    startScrollTop = viewportRef.scrollTop
+    const grabOffset = e.clientY - thumbRef.getBoundingClientRect().top
 
     thumbRef.setPointerCapture(e.pointerId)
 
     const onPointerMove = (e: PointerEvent) => {
-      const deltaY = e.clientY - startY
       const { scrollHeight, clientHeight } = viewportRef
-      const maxScrollTop = scrollHeight - clientHeight
-      const maxThumbTop = clientHeight - thumbHeight()
-
-      if (maxThumbTop > 0) {
-        const scrollDelta = deltaY * (maxScrollTop / maxThumbTop)
-        viewportRef.scrollTop = startScrollTop + scrollDelta
-      }
+      viewportRef.scrollTop = scrollTopFromThumbPointer({
+        pointer: e.clientY,
+        viewportTop: viewportRef.getBoundingClientRect().top,
+        grabOffset,
+        clientHeight,
+        scrollHeight,
+        thumbHeight: thumbHeight(),
+      })
     }
 
-    const onPointerUp = (e: PointerEvent) => {
+    const done = (e: PointerEvent) => {
       setState("isDragging", false)
       thumbRef.releasePointerCapture(e.pointerId)
       thumbRef.removeEventListener("pointermove", onPointerMove)
-      thumbRef.removeEventListener("pointerup", onPointerUp)
+      thumbRef.removeEventListener("pointerup", done)
+      thumbRef.removeEventListener("pointercancel", done)
     }
 
     thumbRef.addEventListener("pointermove", onPointerMove)
-    thumbRef.addEventListener("pointerup", onPointerUp)
+    thumbRef.addEventListener("pointerup", done)
+    thumbRef.addEventListener("pointercancel", done)
   }
 
   // Keybinds implementation
diff --git a/packages/ui/src/context/marked.tsx b/packages/ui/src/context/marked.tsx
index 050b7005264..5c11bdce5ae 100644
--- a/packages/ui/src/context/marked.tsx
+++ b/packages/ui/src/context/marked.tsx
@@ -12,8 +12,8 @@ import type { MarkedExtension, TokenizerAndRendererExtension } from "marked"
 import { bundledLanguages, type BundledLanguage } from "shiki"
 import { parseFilePath } from "../file-path" // kilocode_change
 import { createSimpleContext } from "./helper"
-import { getSharedHighlighter } from "@pierre/diffs" // kilocode_change
-import { ensureKiloDiffTheme } from "../pierre/kilo-diff-theme" // kilocode_change
+import { getSharedHighlighter, type ThemeRegistrationResolved } from "@pierre/diffs" // kilocode_change
+import { ensureKiloDiffTheme, KILO_DIFF_THEME } from "../pierre/kilo-diff-theme" // kilocode_change
 
 // kilocode_change start: the "Kilo" diff/highlight theme registration moved to
 // ../pierre/kilo-diff-theme so the diff worker pool can register it without
@@ -24,6 +24,382 @@ import { ensureKiloDiffTheme } from "../pierre/kilo-diff-theme" // kilocode_chan
 ensureKiloDiffTheme()
 // kilocode_change end
 
+// kilocode_change start: theme object consumed by the streaming Shiki worker
+// (markdown-worker.ts sends it via postMessage on worker init). Registration
+// with Pierre is handled by ensureKiloDiffTheme() above; this export only
+// provides the raw theme data to the worker.
+export const KiloTheme = {
+  name: KILO_DIFF_THEME,
+  bg: "var(--color-background-stronger)",
+  fg: "var(--text-base)",
+  colors: {
+    "editor.background": "var(--color-background-stronger)",
+    "editor.foreground": "var(--text-base)",
+    "gitDecoration.addedResourceForeground": "var(--syntax-diff-add)",
+    "gitDecoration.deletedResourceForeground": "var(--syntax-diff-delete)",
+    "gitDecoration.modifiedResourceForeground": "var(--syntax-diff-unknown)",
+    // "gitDecoration.conflictingResourceForeground": "#ffca00",
+    // "gitDecoration.modifiedResourceForeground": "#1a76d4",
+    // "gitDecoration.untrackedResourceForeground": "#00cab1",
+    // "gitDecoration.ignoredResourceForeground": "#84848A",
+    // "terminal.titleForeground": "#adadb1",
+    // "terminal.titleInactiveForeground": "#84848A",
+    // "terminal.background": "#141415",
+    // "terminal.foreground": "#adadb1",
+    // "terminal.ansiBlack": "#141415",
+    // "terminal.ansiRed": "#ff2e3f",
+    // "terminal.ansiGreen": "#0dbe4e",
+    // "terminal.ansiYellow": "#ffca00",
+    // "terminal.ansiBlue": "#008cff",
+    // "terminal.ansiMagenta": "#c635e4",
+    // "terminal.ansiCyan": "#08c0ef",
+    // "terminal.ansiWhite": "#c6c6c8",
+    // "terminal.ansiBrightBlack": "#141415",
+    // "terminal.ansiBrightRed": "#ff2e3f",
+    // "terminal.ansiBrightGreen": "#0dbe4e",
+    // "terminal.ansiBrightYellow": "#ffca00",
+    // "terminal.ansiBrightBlue": "#008cff",
+    // "terminal.ansiBrightMagenta": "#c635e4",
+    // "terminal.ansiBrightCyan": "#08c0ef",
+    // "terminal.ansiBrightWhite": "#c6c6c8",
+  },
+  tokenColors: [
+    {
+      scope: ["comment", "punctuation.definition.comment", "string.comment"],
+      settings: {
+        foreground: "var(--syntax-comment)",
+      },
+    },
+    {
+      scope: ["entity.other.attribute-name"],
+      settings: {
+        foreground: "var(--syntax-property)", // maybe attribute
+      },
+    },
+    {
+      scope: ["constant", "entity.name.constant", "variable.other.constant", "variable.language", "entity"],
+      settings: {
+        foreground: "var(--syntax-constant)",
+      },
+    },
+    {
+      scope: ["entity.name", "meta.export.default", "meta.definition.variable"],
+      settings: {
+        foreground: "var(--syntax-type)",
+      },
+    },
+    {
+      scope: ["meta.object.member"],
+      settings: {
+        foreground: "var(--syntax-primitive)",
+      },
+    },
+    {
+      scope: [
+        "variable.parameter.function",
+        "meta.jsx.children",
+        "meta.block",
+        "meta.tag.attributes",
+        "entity.name.constant",
+        "meta.embedded.expression",
+        "meta.template.expression",
+        "string.other.begin.yaml",
+        "string.other.end.yaml",
+      ],
+      settings: {
+        foreground: "var(--syntax-punctuation)",
+      },
+    },
+    {
+      scope: ["entity.name.function", "support.type.primitive"],
+      settings: {
+        foreground: "var(--syntax-primitive)",
+      },
+    },
+    {
+      scope: ["support.class.component"],
+      settings: {
+        foreground: "var(--syntax-type)",
+      },
+    },
+    {
+      scope: "keyword",
+      settings: {
+        foreground: "var(--syntax-keyword)",
+      },
+    },
+    {
+      scope: [
+        "keyword.operator",
+        "storage.type.function.arrow",
+        "punctuation.separator.key-value.css",
+        "entity.name.tag.yaml",
+        "punctuation.separator.key-value.mapping.yaml",
+      ],
+      settings: {
+        foreground: "var(--syntax-operator)",
+      },
+    },
+    {
+      scope: ["storage", "storage.type"],
+      settings: {
+        foreground: "var(--syntax-keyword)",
+      },
+    },
+    {
+      scope: ["storage.modifier.package", "storage.modifier.import", "storage.type.java"],
+      settings: {
+        foreground: "var(--syntax-primitive)",
+      },
+    },
+    {
+      scope: [
+        "string",
+        "punctuation.definition.string",
+        "string punctuation.section.embedded source",
+        "entity.name.tag",
+      ],
+      settings: {
+        foreground: "var(--syntax-string)",
+      },
+    },
+    {
+      scope: "support",
+      settings: {
+        foreground: "var(--syntax-primitive)",
+      },
+    },
+    {
+      scope: ["support.type.object.module", "variable.other.object", "support.type.property-name.css"],
+      settings: {
+        foreground: "var(--syntax-object)",
+      },
+    },
+    {
+      scope: "meta.property-name",
+      settings: {
+        foreground: "var(--syntax-property)",
+      },
+    },
+    {
+      scope: "variable",
+      settings: {
+        foreground: "var(--syntax-variable)",
+      },
+    },
+    {
+      scope: "variable.other",
+      settings: {
+        foreground: "var(--syntax-variable)",
+      },
+    },
+    {
+      scope: [
+        "invalid.broken",
+        "invalid.illegal",
+        "invalid.unimplemented",
+        "invalid.deprecated",
+        "message.error",
+        "markup.deleted",
+        "meta.diff.header.from-file",
+        "punctuation.definition.deleted",
+        "brackethighlighter.unmatched",
+        "token.error-token",
+      ],
+      settings: {
+        foreground: "var(--syntax-critical)",
+      },
+    },
+    {
+      scope: "carriage-return",
+      settings: {
+        foreground: "var(--syntax-keyword)",
+      },
+    },
+    {
+      scope: "string source",
+      settings: {
+        foreground: "var(--syntax-variable)",
+      },
+    },
+    {
+      scope: "string variable",
+      settings: {
+        foreground: "var(--syntax-constant)",
+      },
+    },
+    {
+      scope: [
+        "source.regexp",
+        "string.regexp",
+        "string.regexp.character-class",
+        "string.regexp constant.character.escape",
+        "string.regexp source.ruby.embedded",
+        "string.regexp string.regexp.arbitrary-repitition",
+        "string.regexp constant.character.escape",
+      ],
+      settings: {
+        foreground: "var(--syntax-regexp)",
+      },
+    },
+    {
+      scope: "support.constant",
+      settings: {
+        foreground: "var(--syntax-primitive)",
+      },
+    },
+    {
+      scope: "support.variable",
+      settings: {
+        foreground: "var(--syntax-variable)",
+      },
+    },
+    {
+      scope: "meta.module-reference",
+      settings: {
+        foreground: "var(--syntax-info)",
+      },
+    },
+    {
+      scope: "punctuation.definition.list.begin.markdown",
+      settings: {
+        foreground: "var(--syntax-punctuation)",
+      },
+    },
+    {
+      scope: ["markup.heading", "markup.heading entity.name"],
+      settings: {
+        fontStyle: "bold",
+        foreground: "var(--syntax-info)",
+      },
+    },
+    {
+      scope: "markup.quote",
+      settings: {
+        foreground: "var(--syntax-info)",
+      },
+    },
+    {
+      scope: "markup.italic",
+      settings: {
+        fontStyle: "italic",
+        // foreground: "",
+      },
+    },
+    {
+      scope: "markup.bold",
+      settings: {
+        fontStyle: "bold",
+        foreground: "var(--text-strong)",
+      },
+    },
+    {
+      scope: [
+        "markup.raw",
+        "markup.inserted",
+        "meta.diff.header.to-file",
+        "punctuation.definition.inserted",
+        "markup.changed",
+        "punctuation.definition.changed",
+        "markup.ignored",
+        "markup.untracked",
+      ],
+      settings: {
+        foreground: "var(--text-base)",
+      },
+    },
+    {
+      scope: "meta.diff.range",
+      settings: {
+        fontStyle: "bold",
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: "meta.diff.header",
+      settings: {
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: "meta.separator",
+      settings: {
+        fontStyle: "bold",
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: "meta.output",
+      settings: {
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: "meta.export.default",
+      settings: {
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: [
+        "brackethighlighter.tag",
+        "brackethighlighter.curly",
+        "brackethighlighter.round",
+        "brackethighlighter.square",
+        "brackethighlighter.angle",
+        "brackethighlighter.quote",
+      ],
+      settings: {
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: ["constant.other.reference.link", "string.other.link"],
+      settings: {
+        fontStyle: "underline",
+        foreground: "var(--syntax-unknown)",
+      },
+    },
+    {
+      scope: "token.info-token",
+      settings: {
+        foreground: "var(--syntax-info)",
+      },
+    },
+    {
+      scope: "token.warn-token",
+      settings: {
+        foreground: "var(--syntax-warning)",
+      },
+    },
+    {
+      scope: "token.debug-token",
+      settings: {
+        foreground: "var(--syntax-info)",
+      },
+    },
+  ],
+  semanticTokenColors: {
+    comment: "var(--syntax-comment)",
+    string: "var(--syntax-string)",
+    number: "var(--syntax-constant)",
+    regexp: "var(--syntax-regexp)",
+    keyword: "var(--syntax-keyword)",
+    variable: "var(--syntax-variable)",
+    parameter: "var(--syntax-variable)",
+    property: "var(--syntax-property)",
+    function: "var(--syntax-primitive)",
+    method: "var(--syntax-primitive)",
+    type: "var(--syntax-type)",
+    class: "var(--syntax-type)",
+    namespace: "var(--syntax-type)",
+    enumMember: "var(--syntax-primitive)",
+    "variable.constant": "var(--syntax-constant)",
+    "variable.defaultLibrary": "var(--syntax-unknown)",
+  },
+} as unknown as ThemeRegistrationResolved
+// kilocode_change end
+
 // kilocode_change start: double-dollar-only math rules for marked.
 const BLOCK = /^\$\$\n((?:\\[^]|[^\\])+?)\n\$\$(?:\n|$)/
 const INLINE = /^\$\$(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n$]))\$\$/
@@ -321,6 +697,17 @@ export const createMarkedParser = (props: { nativeParser?: NativeMarkdownParser
         },
         // kilocode_change end
       },
+      // kilocode_change start: Marked accepts a tilde preceded by an opening
+      // parenthesis as the closing delimiter. It is left-flanking there, so
+      // preserve it literally instead of corrupting text such as "(~1 GB)".
+      tokenizer: {
+        del(src) {
+          const match = this.rules.inline.del.exec(src)
+          if (match?.[0].at(-2) === "(") return
+          return false
+        },
+      },
+      // kilocode_change end
     },
     // kilocode_change start: enable only double-dollar math.
     // Single $ is far more common as a currency symbol in agent responses
diff --git a/packages/ui/src/kilocode/markdown-bidi.test.ts b/packages/ui/src/kilocode/markdown-bidi.test.ts
index 4382f41e6c8..906f6ad6fc7 100644
--- a/packages/ui/src/kilocode/markdown-bidi.test.ts
+++ b/packages/ui/src/kilocode/markdown-bidi.test.ts
@@ -33,12 +33,20 @@ describe("Markdown bidirectional rendering contract", () => {
         useMarked: () => ({ parse: async () => "" }),
         deferredHighlight: async () => {},
         fnv1a: (text) => text,
+        KiloTheme: { name: "Kilo" },
       }))
       mock.module("./src/kilocode/markdown-mermaid", () => ({
         hasMermaid: () => false,
         preserveMermaid: () => false,
         renderMermaid: async () => {},
       }))
+      mock.module("./src/components/markdown-worker", () => ({
+        disposeStreamingCode: () => {},
+        highlightStreamingCode: async () => { throw new Error("unexpected worker call") },
+        MarkdownWorkerDisposedError: class extends Error {},
+        MarkdownWorkerSupersededError: class extends Error {},
+        MarkdownWorkerUnavailableError: class extends Error {},
+      }))
 
       const { Markdown } = await import("./src/components/markdown")
       console.log(renderToString(() => createComponent(Markdown, { text: "hello" })))
diff --git a/packages/ui/src/kilocode/markdown-stable-blocks.test.ts b/packages/ui/src/kilocode/markdown-stable-blocks.test.ts
deleted file mode 100644
index 3dcf7592477..00000000000
--- a/packages/ui/src/kilocode/markdown-stable-blocks.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { marked } from "marked"
-import remend from "remend"
-import { stream } from "../components/markdown-stream"
-import { stableBlocks } from "./markdown-stable-blocks"
-
-async function render(text: string) {
-  const html = await Promise.all(stream(text, true).map((block) => Promise.resolve(marked.parse(block.src))))
-  return html.join("")
-}
-
-describe("stable markdown blocks", () => {
-  test("keeps completed top-level tokens stable and only heals the tail", () => {
-    expect(
-      stableBlocks(
-        [
-          { type: "heading", raw: "# Title\n\n" },
-          { type: "paragraph", raw: "First" },
-          { type: "space", raw: "\n\n" },
-          { type: "paragraph", raw: "Second **open" },
-        ],
-        (raw) => `${raw}**`,
-      ),
-    ).toEqual([
-      { raw: "# Title\n\n", src: "# Title\n\n", mode: "full" },
-      { raw: "First\n\n", src: "First\n\n", mode: "full" },
-      { raw: "Second **open", src: "Second **open**", mode: "live" },
-    ])
-  })
-
-  test("leaves a single mutable token on the existing streaming path", () => {
-    expect(stableBlocks([{ type: "paragraph", raw: "Still streaming" }], (raw) => raw)).toBeUndefined()
-  })
-
-  test("matches canonical streaming HTML for mixed completed blocks", async () => {
-    const text = [
-      "# Report",
-      "",
-      "A completed paragraph with **emphasis**.",
-      "",
-      "- first item",
-      "- second item",
-      "",
-      "```ts",
-      "export const value = 1",
-      "```",
-      "",
-      "The final paragraph is *still streaming",
-    ].join("\n")
-
-    expect(await render(text)).toBe(await marked.parse(remend(text, { linkMode: "text-only" })))
-    expect(stream(text, true).map((block) => block.mode)).toEqual(["full", "full", "full", "full", "live"])
-  })
-})
diff --git a/packages/ui/src/kilocode/markdown-stable-blocks.ts b/packages/ui/src/kilocode/markdown-stable-blocks.ts
deleted file mode 100644
index 1878f9787de..00000000000
--- a/packages/ui/src/kilocode/markdown-stable-blocks.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { Block } from "../components/markdown-stream"
-
-type Token = {
-  type: string
-  raw: string
-}
-
-export function stableBlocks(tokens: Token[], live: (raw: string) => string): Block[] | undefined {
-  const indexes = tokens.flatMap((token, index) => (token.type === "space" ? [] : [index]))
-  if (indexes.length < 2) return
-
-  const raw = (start: number, end = tokens.length) =>
-    tokens
-      .slice(start, end)
-      .map((token) => token.raw)
-      .join("")
-  // Completed top-level tokens keep stable hashes across stream updates. The
-  // existing parse and sanitize cache can then reuse them while only the tail changes.
-  const stable = indexes.slice(0, -1).map((start, index) => {
-    const value = raw(start, indexes[index + 1])
-    return { raw: value, src: value, mode: "full" as const }
-  })
-  const tail = raw(indexes.at(-1)!)
-  return [...stable, { raw: tail, src: live(tail), mode: "live" }]
-}
diff --git a/packages/ui/src/kilocode/markdown-strikethrough.test.ts b/packages/ui/src/kilocode/markdown-strikethrough.test.ts
new file mode 100644
index 00000000000..3ef4c42e51c
--- /dev/null
+++ b/packages/ui/src/kilocode/markdown-strikethrough.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, test } from "bun:test"
+import { createMarkedParser } from "../context/marked"
+
+describe("Markdown strikethrough boundaries", () => {
+  test.each(["(~a (~b", "~a (~b", "(~24 GB) and (~5.7 GB)", "(~/.config) and (~/.cache)"])(
+    "preserves parenthesized tildes in %s",
+    async (text) => {
+      const parser = createMarkedParser({})
+      const html = await Promise.resolve(parser.parse(text))
+
+      expect(html).not.toContain("<del>")
+      expect(html).toContain(text)
+    },
+  )
+
+  test.each([
+    ["~removed~", "<del>removed</del>"],
+    ["~~removed~~", "<del>removed</del>"],
+    ["(~removed~)", "(<del>removed</del>)"],
+  ])("keeps valid strikethrough syntax in %s", async (text, expected) => {
+    const parser = createMarkedParser({})
+    const html = await Promise.resolve(parser.parse(text))
+
+    expect(html).toContain(expected)
+  })
+})
diff --git a/packages/ui/src/pierre/index.ts b/packages/ui/src/pierre/index.ts
index 8696be34753..d751378f7de 100644
--- a/packages/ui/src/pierre/index.ts
+++ b/packages/ui/src/pierre/index.ts
@@ -1,6 +1,7 @@
 import { DiffLineAnnotation, FileContents, FileDiffOptions, type SelectedLineRange } from "@pierre/diffs"
 import { ComponentProps } from "solid-js"
 import { lineCommentStyles } from "../components/line-comment-styles"
+import { KILO_DIFF_THEME } from "./kilo-diff-theme" // kilocode_change
 
 export type DiffProps<T = {}> = FileDiffOptions<T> & {
   before: FileContents
@@ -17,24 +18,15 @@ export type DiffProps<T = {}> = FileDiffOptions<T> & {
 const unsafeCSS = `
 [data-diff],
 [data-file] {
-  --diffs-bg: light-dark(var(--diffs-light-bg), var(--diffs-dark-bg));
-  --diffs-bg-buffer: var(--diffs-bg-buffer-override, light-dark( color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-mixer))));
-  --diffs-bg-hover: var(--diffs-bg-hover-override, light-dark( color-mix(in lab, var(--diffs-bg) 97%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 91%, var(--diffs-mixer))));
-  --diffs-bg-context: var(--diffs-bg-context-override, light-dark( color-mix(in lab, var(--diffs-bg) 98.5%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 92.5%, var(--diffs-mixer))));
-  --diffs-bg-separator: var(--diffs-bg-separator-override, light-dark( color-mix(in lab, var(--diffs-bg) 96%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 85%, var(--diffs-mixer))));
-  --diffs-fg: light-dark(var(--diffs-light), var(--diffs-dark));
-  --diffs-fg-number: var(--diffs-fg-number-override, light-dark(color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg)), color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg))));
-  --diffs-deletion-base: var(--syntax-diff-delete);
-  --diffs-addition-base: var(--syntax-diff-add);
-  --diffs-modified-base: var(--syntax-diff-unknown);
-  --diffs-bg-deletion: var(--diffs-bg-deletion-override, light-dark( color-mix(in lab, var(--diffs-bg) 98%, var(--diffs-deletion-base)), color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-deletion-base))));
-  --diffs-bg-deletion-number: var(--diffs-bg-deletion-number-override, light-dark( color-mix(in lab, var(--diffs-bg) 91%, var(--diffs-deletion-base)), color-mix(in lab, var(--diffs-bg) 85%, var(--diffs-deletion-base))));
-  --diffs-bg-deletion-hover: var(--diffs-bg-deletion-hover-override, light-dark( color-mix(in lab, var(--diffs-bg) 80%, var(--diffs-deletion-base)), color-mix(in lab, var(--diffs-bg) 75%, var(--diffs-deletion-base))));
-  --diffs-bg-deletion-emphasis: var(--diffs-bg-deletion-emphasis-override, light-dark(rgb(from var(--diffs-deletion-base) r g b / 0.7), rgb(from var(--diffs-deletion-base) r g b / 0.1)));
-  --diffs-bg-addition: var(--diffs-bg-addition-override, light-dark( color-mix(in lab, var(--diffs-bg) 98%, var(--diffs-addition-base)), color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-addition-base))));
-  --diffs-bg-addition-number: var(--diffs-bg-addition-number-override, light-dark( color-mix(in lab, var(--diffs-bg) 91%, var(--diffs-addition-base)), color-mix(in lab, var(--diffs-bg) 85%, var(--diffs-addition-base))));
-  --diffs-bg-addition-hover: var(--diffs-bg-addition-hover-override, light-dark( color-mix(in lab, var(--diffs-bg) 80%, var(--diffs-addition-base)), color-mix(in lab, var(--diffs-bg) 70%, var(--diffs-addition-base))));
-  --diffs-bg-addition-emphasis: var(--diffs-bg-addition-emphasis-override, light-dark(rgb(from var(--diffs-addition-base) r g b / 0.07), rgb(from var(--diffs-addition-base) r g b / 0.1)));
+  /* Pierre 1.2 mixes these override targets at 12% in light mode and 20% in dark mode. */
+  --diffs-bg-deletion-override: light-dark(
+    color-mix(in lab, var(--diffs-bg) 33.333%, var(--diffs-deletion-base)),
+    color-mix(in lab, var(--diffs-bg) 60%, var(--diffs-deletion-base))
+  );
+  --diffs-bg-addition-override: light-dark(
+    color-mix(in lab, var(--diffs-bg) 33.333%, var(--diffs-addition-base)),
+    color-mix(in lab, var(--diffs-bg) 60%, var(--diffs-addition-base))
+  );
   --diffs-selection-base: var(--surface-warning-strong);
   --diffs-selection-border: var(--border-warning-base);
   --diffs-selection-number-fg: #1c1917;
@@ -143,7 +135,7 @@ const unsafeCSS = `
   }
 
   &[data-interactive-line-numbers] [data-column-number] {
-    cursor: pointer !important;
+    cursor: default !important;
   }
 
   &[data-interactive-lines] [data-line] {
@@ -161,7 +153,7 @@ ${lineCommentStyles}
 
 export function createDefaultOptions<T>(style: FileDiffOptions<T>["diffStyle"]) {
   return {
-    theme: "Kilo",
+    theme: KILO_DIFF_THEME, // kilocode_change
     themeType: "system",
     disableLineNumbers: false,
     overflow: "wrap",
diff --git a/packages/ui/src/pierre/kilo-diff-theme.ts b/packages/ui/src/pierre/kilo-diff-theme.ts
index 7f19c3cd642..4fd5ff652c1 100644
--- a/packages/ui/src/pierre/kilo-diff-theme.ts
+++ b/packages/ui/src/pierre/kilo-diff-theme.ts
@@ -1,5 +1,5 @@
 // kilocode_change - new file
-import { registerCustomTheme, RegisteredCustomThemes, type ThemeRegistrationResolved } from "@pierre/diffs"
+import { registerCustomTheme, type ThemeRegistrationResolved } from "@pierre/diffs"
 
 // The "Kilo" Pierre/Shiki theme used by every diff review surface (Code / Diff /
 // File / SessionReview) and by markdown code highlighting. Pierre resolves the
@@ -23,12 +23,23 @@ import { registerCustomTheme, RegisteredCustomThemes, type ThemeRegistrationReso
 
 export const KILO_DIFF_THEME = "Kilo"
 
+const registrations = (() => {
+  const key = Symbol.for("kilocode.ui.pierre.kilo-diff-theme")
+  const existing = Reflect.get(globalThis, key)
+  if (existing instanceof WeakSet) return existing as WeakSet<typeof registerCustomTheme>
+
+  const value = new WeakSet<typeof registerCustomTheme>()
+  Reflect.set(globalThis, key, value)
+  return value
+})()
+
 // Idempotent: this is reached from both the markdown context and the diff worker
-// factory. Guard against the authoritative Pierre registry (rather than a local
-// flag) so it stays a no-op even if this module is instantiated more than once
-// across separate bundles — @pierre/diffs otherwise logs an error on duplicates.
+// factory. Pierre no longer exposes its registered-theme set, so use a realm-wide
+// guard keyed by the public registration function. Duplicate Kilo modules sharing
+// one Pierre instance stay no-ops, while separately bundled Pierre instances still
+// receive their own registration.
 export function ensureKiloDiffTheme(): void {
-  if (RegisteredCustomThemes.has(KILO_DIFF_THEME)) return
+  if (registrations.has(registerCustomTheme)) return
 
   registerCustomTheme(KILO_DIFF_THEME, () => {
     return Promise.resolve({
@@ -38,6 +49,7 @@ export function ensureKiloDiffTheme(): void {
         "editor.foreground": "var(--text-base)",
         "gitDecoration.addedResourceForeground": "var(--syntax-diff-add)",
         "gitDecoration.deletedResourceForeground": "var(--syntax-diff-delete)",
+        "gitDecoration.modifiedResourceForeground": "var(--syntax-diff-unknown)",
         // "gitDecoration.conflictingResourceForeground": "#ffca00",
         // "gitDecoration.modifiedResourceForeground": "#1a76d4",
         // "gitDecoration.untrackedResourceForeground": "#00cab1",
@@ -399,4 +411,5 @@ export function ensureKiloDiffTheme(): void {
       },
     } as unknown as ThemeRegistrationResolved)
   })
+  registrations.add(registerCustomTheme)
 }
diff --git a/packages/ui/src/pierre/virtualizer.ts b/packages/ui/src/pierre/virtualizer.ts
index 31862cc4931..235a3fd6773 100644
--- a/packages/ui/src/pierre/virtualizer.ts
+++ b/packages/ui/src/pierre/virtualizer.ts
@@ -16,7 +16,7 @@ const cache = new WeakMap<Document | HTMLElement, Entry>()
 export const virtualMetrics: Partial<VirtualFileMetrics> = {
   lineHeight: 24,
   hunkSeparatorHeight: 24,
-  fileGap: 0,
+  spacing: 0,
 }
 
 function scrollable(value: string) {
diff --git a/packages/ui/src/v2/components/icon-button-v2.css b/packages/ui/src/v2/components/icon-button-v2.css
index e75e4c7aded..c4a3df9115e 100644
--- a/packages/ui/src/v2/components/icon-button-v2.css
+++ b/packages/ui/src/v2/components/icon-button-v2.css
@@ -137,6 +137,7 @@
 
 [data-component="icon-button-v2"][data-variant="ghost-muted"]:is(:active, [data-state="pressed"]):not(:disabled) {
   background-color: var(--v2-overlay-simple-overlay-pressed);
+  color: var(--v2-icon-icon-base);
 }
 
 [data-component="icon-button-v2"][data-variant="ghost-muted"]:is(:disabled, [data-state="disabled"]) {
diff --git a/packages/ui/sst-env.d.ts b/packages/ui/sst-env.d.ts
new file mode 100644
index 00000000000..64441936d7a
--- /dev/null
+++ b/packages/ui/sst-env.d.ts
@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}
\ No newline at end of file
diff --git a/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch b/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch
index d17c7001243..ae25202873b 100644
--- a/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch
+++ b/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch
@@ -1,3 +1,29 @@
+diff --git a/dist/cjs/client/index.d.ts b/dist/cjs/client/index.d.ts
+index 1822bf749aec71d2bb295083d832114ee187bb67..58b859a7b32222fb5cb9f2011fdc5d010f3d05fb 100644
+--- a/dist/cjs/client/index.d.ts
++++ b/dist/cjs/client/index.d.ts
+@@ -428,6 +428,8 @@ export declare class Client<RequestT extends Request = Request, NotificationT ex
+      *
+      * For task-based execution with streaming behavior, use client.experimental.tasks.callToolStream() instead.
+      */
++    callTool(params: CallToolRequest['params'], resultSchema?: undefined, options?: RequestOptions): Promise<SchemaOutput<typeof CallToolResultSchema>>;
++    callTool<T extends typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema>(params: CallToolRequest['params'], resultSchema: T, options?: RequestOptions): Promise<SchemaOutput<T>>;
+     callTool(params: CallToolRequest['params'], resultSchema?: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options?: RequestOptions): Promise<{
+         [x: string]: unknown;
+         content: ({
+diff --git a/dist/esm/client/index.d.ts b/dist/esm/client/index.d.ts
+index 1822bf749aec71d2bb295083d832114ee187bb67..58b859a7b32222fb5cb9f2011fdc5d010f3d05fb 100644
+--- a/dist/esm/client/index.d.ts
++++ b/dist/esm/client/index.d.ts
+@@ -428,6 +428,8 @@ export declare class Client<RequestT extends Request = Request, NotificationT ex
+      *
+      * For task-based execution with streaming behavior, use client.experimental.tasks.callToolStream() instead.
+      */
++    callTool(params: CallToolRequest['params'], resultSchema?: undefined, options?: RequestOptions): Promise<SchemaOutput<typeof CallToolResultSchema>>;
++    callTool<T extends typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema>(params: CallToolRequest['params'], resultSchema: T, options?: RequestOptions): Promise<SchemaOutput<T>>;
+     callTool(params: CallToolRequest['params'], resultSchema?: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options?: RequestOptions): Promise<{
+         [x: string]: unknown;
+         content: ({
 diff --git a/dist/cjs/client/index.js b/dist/cjs/client/index.js
 index 6ac1da14dc7f6211ae70f7711c124b76098816d8..adb5b7bd45514a406a0f7e40b64631c101584c84 100644
 --- a/dist/cjs/client/index.js
diff --git a/patches/@pierre%2Ftrees@1.0.0-beta.4.patch b/patches/@pierre%2Ftrees@1.0.0-beta.4.patch
new file mode 100644
index 00000000000..b9db9cbf790
--- /dev/null
+++ b/patches/@pierre%2Ftrees@1.0.0-beta.4.patch
@@ -0,0 +1,107 @@
+diff --git a/dist/model/FileTreeController.js b/dist/model/FileTreeController.js
+index 37c5d1ffedd5aff0258dec41b1b5cedb240aa3a6..365c42ef4c824bfd13d14f0d09226929af625c73 100644
+--- a/dist/model/FileTreeController.js
++++ b/dist/model/FileTreeController.js
+@@ -1052,8 +1052,8 @@ var FileTreeController = class {
+ 		this.#setExpandedPaths(expandedPaths);
+ 		return focusCandidate ?? this.#focusedPath;
+ 	}
+-	#emit() {
+-		for (const listener of this.#listeners) listener();
++	#emit(event) {
++		for (const listener of this.#listeners) listener(event);
+ 	}
+ 	#emitMutation(event) {
+ 		this.#mutationListeners.get(event.operation)?.forEach((listener) => {
+@@ -1149,7 +1149,7 @@ var FileTreeController = class {
+ 			const searchFocusCandidate = this.#searchValue != null && this.#searchValue.length > 0 ? this.#refreshActiveSearchState() : this.#searchValue === "" ? this.#focusedPath : focusPathCandidate;
+ 			const shouldBuildFullProjection = this.#searchValue != null || event.operation !== "expand" && event.operation !== "collapse";
+ 			this.#rebuildVisibleProjection(searchFocusCandidate, shouldBuildFullProjection);
+-			this.#emit();
++			this.#emit(event);
+ 			const mutationEvent = toTreesMutationEvent(event);
+ 			if (mutationEvent != null) this.#emitMutation(mutationEvent);
+ 		});
+diff --git a/dist/model/internalTypes.d.ts b/dist/model/internalTypes.d.ts
+index 5b0fdd5a3b483439ae256795f3dad5a32182ab78..073c6f21edc20ce5bd44b122fe02b83de802b887 100644
+--- a/dist/model/internalTypes.d.ts
++++ b/dist/model/internalTypes.d.ts
+@@ -4,7 +4,10 @@ import { FileTreeCompositionOptions, FileTreePublicId, FileTreeRenderOptions, Fi
+ import { FileTreeController } from "./FileTreeController.js";
+ 
+ //#region src/model/internalTypes.d.ts
+-type FileTreeControllerListener = () => void;
++type FileTreeControllerListener = (event?: {
++  operation: 'expand' | 'collapse';
++  path: string;
++}) => void;
+ interface FileTreeStickyRowCandidate {
+   row: FileTreeVisibleRow;
+   subtreeEndIndex: number;
+diff --git a/dist/model/publicTypes.d.ts b/dist/model/publicTypes.d.ts
+index 84a7e2d14f67c1aad8230f19a3426ab7403f378e..752e262e6d2d8a836931b7b83a93d89a75e6209c 100644
+--- a/dist/model/publicTypes.d.ts
++++ b/dist/model/publicTypes.d.ts
+@@ -167,6 +167,10 @@ type FileTreeOptionSurface = FileTreeRenderOptions & {
+   gitStatus?: readonly GitStatusEntry[];
+   id?: string;
+   icons?: FileTreeIcons;
++  onExpansionChange?: (change: {
++    expanded: boolean;
++    path: FileTreePublicId;
++  }) => void;
+   onSelectionChange?: FileTreeSelectionChangeListener;
+   renderRowDecoration?: FileTreeRowDecorationRenderer;
+   search?: boolean;
+diff --git a/dist/render/FileTree.js b/dist/render/FileTree.js
+index 6db15e51b833192f79b71a15febe1612a4c185d0..36a4e6ac527595849c1db0e6bbebb475b6030b7b 100644
+--- a/dist/render/FileTree.js
++++ b/dist/render/FileTree.js
+@@ -63,6 +63,7 @@ var FileTree = class {
+ 	#composition;
+ 	#controller;
+ 	#id;
++	#onExpansionChange;
+ 	#onSelectionChange;
+ 	#renderRowDecoration;
+ 	#renamingEnabled;
+@@ -80,16 +81,18 @@ var FileTree = class {
+ 	#appliedUnsafeCSS;
+ 	#selectionVersion;
+ 	#selectionSubscription = null;
++	#expansionSubscription = null;
+ 	#wrapper;
+ 	#wroteHostItemHeight = false;
+ 	#wroteHostDensityFactor = false;
+ 	constructor(options) {
+-		const { composition, density, fileTreeSearchMode, gitStatus, id, initialSearchQuery, icons, itemHeight, onSearchChange, onSelectionChange, overscan, renderRowDecoration, renaming, search, searchBlurBehavior, searchFakeFocus, stickyFolders, unsafeCSS, initialVisibleRowCount,...controllerOptions } = options;
++		const { composition, density, fileTreeSearchMode, gitStatus, id, initialSearchQuery, icons, itemHeight, onExpansionChange, onSearchChange, onSelectionChange, overscan, renderRowDecoration, renaming, search, searchBlurBehavior, searchFakeFocus, stickyFolders, unsafeCSS, initialVisibleRowCount,...controllerOptions } = options;
+ 		this.#composition = composition;
+ 		this.#id = createClientId(id);
+ 		this.#gitStatusState = resolveFileTreeGitStatusState(gitStatus);
+ 		this.#icons = icons;
+ 		this.#unsafeCSS = unsafeCSS;
++		this.#onExpansionChange = onExpansionChange;
+ 		this.#onSelectionChange = onSelectionChange;
+ 		this.#renderRowDecoration = renderRowDecoration;
+ 		this.#renamingEnabled = renaming != null && renaming !== false;
+@@ -114,6 +117,10 @@ var FileTree = class {
+ 		this.#selectionSubscription = this.#onSelectionChange == null ? null : this.subscribe(() => {
+ 			this.#emitSelectionChange();
+ 		});
++		this.#expansionSubscription = this.#onExpansionChange == null ? null : this.#controller.subscribe((event) => {
++			if (event?.operation !== "expand" && event?.operation !== "collapse") return;
++			this.#onExpansionChange?.({ path: event.path, expanded: event.operation === "expand" });
++		});
+ 	}
+ 	unmount() {
+ 		if (this.#wrapper != null) {
+@@ -133,6 +140,8 @@ var FileTree = class {
+ 		this.unmount();
+ 		this.#selectionSubscription?.();
+ 		this.#selectionSubscription = null;
++		this.#expansionSubscription?.();
++		this.#expansionSubscription = null;
+ 		this.#controller.destroy();
+ 	}
+ 	getFileTreeContainer() {
diff --git a/patches/@tanstack%2Fsolid-virtual@3.13.28.patch b/patches/@tanstack%2Fsolid-virtual@3.13.28.patch
new file mode 100644
index 00000000000..3b1cda91e1c
--- /dev/null
+++ b/patches/@tanstack%2Fsolid-virtual@3.13.28.patch
@@ -0,0 +1,45 @@
+diff --git a/dist/cjs/index.cjs b/dist/cjs/index.cjs
+index 7e97823ea769398ccd9cf449b178c77675ed252c..d75183f11421af0e20e4e8a996af99c300ad936d 100644
+--- a/dist/cjs/index.cjs
++++ b/dist/cjs/index.cjs
+@@ -39,7 +39,9 @@ function createVirtualizerBase(options) {
+         (_a = options.onChange) == null ? void 0 : _a.call(options, instance2, sync);
+       }
+     }));
+-    virtualizer.measure();
++    virtualizer._willUpdate();
++    setVirtualItems(store.reconcile(instance.getVirtualItems(), { key: "index" }));
++    setTotalSize(instance.getTotalSize());
+   });
+   return virtualizer;
+ }
+diff --git a/dist/esm/index.js b/dist/esm/index.js
+index 1d525463775fef3e8ece6ab191061ef9d0a36d73..14c680a2088c49a33959d8118cf32ee599ab83c2 100644
+--- a/dist/esm/index.js
++++ b/dist/esm/index.js
+@@ -38,7 +38,9 @@ function createVirtualizerBase(options) {
+         (_a = options.onChange) == null ? void 0 : _a.call(options, instance2, sync);
+       }
+     }));
+-    virtualizer.measure();
++    virtualizer._willUpdate();
++    setVirtualItems(reconcile(instance.getVirtualItems(), { key: "index" }));
++    setTotalSize(instance.getTotalSize());
+   });
+   return virtualizer;
+ }
+diff --git a/src/index.tsx b/src/index.tsx
+index 69ac34fd70753b9bd00683c2540be7f62630f8f2..9f16672aa0f4a044aa2b35754d385d7d8031f743 100644
+--- a/src/index.tsx
++++ b/src/index.tsx
+@@ -81,7 +81,9 @@ function createVirtualizerBase<
+         },
+       }),
+     )
+-    virtualizer.measure()
++    virtualizer._willUpdate()
++    setVirtualItems(reconcile(instance.getVirtualItems(), { key: 'index' }))
++    setTotalSize(instance.getTotalSize())
+   })
+
+   return virtualizer
diff --git a/patches/@tanstack%2Fvirtual-core@3.17.0.patch b/patches/@tanstack%2Fvirtual-core@3.17.0.patch
new file mode 100644
index 00000000000..388f8855a53
--- /dev/null
+++ b/patches/@tanstack%2Fvirtual-core@3.17.0.patch
@@ -0,0 +1,58 @@
+diff --git a/dist/cjs/index.cjs b/dist/cjs/index.cjs
+index df75d0cf0347b62906e04e454d4f4ef062ed5c48..58913f2d30e0beee9d09dffa5ebcaab4601a2c22 100644
+--- a/dist/cjs/index.cjs
++++ b/dist/cjs/index.cjs
+@@ -526,6 +526,7 @@ class Virtualizer {
+       this.scrollOffset = this.scrollOffset ?? (typeof this.options.initialOffset === "function" ? this.options.initialOffset() : this.options.initialOffset);
+       return this.scrollOffset;
+     };
++    this.getLogicalScrollOffset = () => this.getScrollOffset() + this.scrollAdjustments;
+     this.getFurthestMeasurement = (measurements, index) => {
+       const furthestMeasurementsFound = /* @__PURE__ */ new Map();
+       const furthestMeasurements = /* @__PURE__ */ new Map();
+diff --git a/dist/cjs/index.d.cts b/dist/cjs/index.d.cts
+index c61ee17752565253f795c7fc7d57e86237ecbb52..705bb7e3a121b040fb1a3e7890179eaa3e9b219e 100644
+--- a/dist/cjs/index.d.cts
++++ b/dist/cjs/index.d.cts
+@@ -108,6 +108,7 @@ export declare class Virtualizer<TScrollElement extends Element | Window, TItemE
+     scrollRect: Rect | null;
+     scrollOffset: number | null;
+     scrollDirection: ScrollDirection | null;
++    getLogicalScrollOffset: () => number;
+     private scrollAdjustments;
+     private _iosDeferredAdjustment;
+     private _iosTouching;
+diff --git a/dist/esm/index.d.ts b/dist/esm/index.d.ts
+index b03abab604eb6578f6f56ff92c489259cfaf8f19..0495f372ea000dffc416c4f56809946f7ba73099 100644
+--- a/dist/esm/index.d.ts
++++ b/dist/esm/index.d.ts
+@@ -108,6 +108,7 @@ export declare class Virtualizer<TScrollElement extends Element | Window, TItemE
+     scrollRect: Rect | null;
+     scrollOffset: number | null;
+     scrollDirection: ScrollDirection | null;
++    getLogicalScrollOffset: () => number;
+     private scrollAdjustments;
+     private _iosDeferredAdjustment;
+     private _iosTouching;
+diff --git a/dist/esm/index.js b/dist/esm/index.js
+index e384cf7541978a2782b9dca68146e869b16ac3f2..53b15b7a36247ea4aa5b70b00d08b6d7dec3ea79 100644
+--- a/dist/esm/index.js
++++ b/dist/esm/index.js
+@@ -524,6 +524,7 @@ class Virtualizer {
+       this.scrollOffset = this.scrollOffset ?? (typeof this.options.initialOffset === "function" ? this.options.initialOffset() : this.options.initialOffset);
+       return this.scrollOffset;
+     };
++    this.getLogicalScrollOffset = () => this.getScrollOffset() + this.scrollAdjustments;
+     this.getFurthestMeasurement = (measurements, index) => {
+       const furthestMeasurementsFound = /* @__PURE__ */ new Map();
+       const furthestMeasurements = /* @__PURE__ */ new Map();
+diff --git a/src/index.ts b/src/index.ts
+index d35b3e0695a9c85b261bc1a4fbe23c0a60d5b204..d516a9d00f1233173f9a3e2144666c8159552f91 100644
+--- a/src/index.ts
++++ b/src/index.ts
+@@ -1050,3 +1050,5 @@ export class Virtualizer<
++  getLogicalScrollOffset = () => this.getScrollOffset() + this.scrollAdjustments
++
+   private getFurthestMeasurement = (
+     measurements: Array<VirtualItem>,
+     index: number,
diff --git a/patches/gcp-metadata@8.1.2.patch b/patches/gcp-metadata@8.1.2.patch
new file mode 100644
index 00000000000..8b7667e29ab
--- /dev/null
+++ b/patches/gcp-metadata@8.1.2.patch
@@ -0,0 +1,14 @@
+diff --git a/build/src/index.js b/build/src/index.js
+--- a/build/src/index.js
++++ b/build/src/index.js
+@@ -323,6 +323,10 @@ async function isAvailable() {
+         if (process.env.DEBUG_AUTH) {
+             console.info(err);
+         }
++        // Promise.any() rejects with AggregateError when neither metadata host
++        // is available. This is expected outside GCP, not a warning condition.
++        if (err instanceof AggregateError)
++            return false;
+         if (err.type === 'request-timeout') {
+             // If running in a GCP environment, metadata endpoint should return
+             // within ms.
diff --git a/script/check-opencode-promise-facades.ts b/script/check-opencode-promise-facades.ts
index dface6a997b..d93a2274e53 100644
--- a/script/check-opencode-promise-facades.ts
+++ b/script/check-opencode-promise-facades.ts
@@ -43,14 +43,23 @@ const testAllow: Record<string, { count: number; reason: string }> = {
     reason: "disk-backed instance integration test cleanup",
   },
   "kilocode/kilo-sessions.test.ts": {
-    count: 4,
+    count: 29,
     reason:
       "K1 W1: real integration test for SessionStatus→detach→heartbeat-fence; " +
       "the test creates a session and sets its status via the global AppRuntime, " +
-      "then drives the module-level KiloSessions seams and verifies the fence.",
+      "then drives the module-level KiloSessions seams and verifies the fence. " +
+      "DEF-3 extends this with heartbeat attention-status coverage: the heartbeat " +
+      "resolves pending question/permission from the global Question.Service and " +
+      "Permission.Service, so a test can only assert it by raising and replying to " +
+      "real requests through that same runtime. Scoped layers cannot express this — " +
+      "the global-runtime coupling is exactly what is under test.",
   },
   "kilocode/session/platform-attribution.test.ts": { count: 2, reason: "existing runtime integration test" },
   "kilocode/session-prompt-queue.test.ts": { count: 6, reason: "prompt queue legacy instance bridge regression" },
+  "kilocode/session-prompt-steering.test.ts": {
+    count: 2,
+    reason: "disk-backed prompt steering integration test cleanup",
+  },
   "server/experimental-session-list.test.ts": { count: 2, reason: "Kilo session list integration test" },
   "kilocode/server/cloud-session-import.test.ts": { count: 5, reason: "full app cloud import transaction integration" },
   "kilocode/server/listener-runtime.test.ts": { count: 4, reason: "listener and AppRuntime integration test" },
diff --git a/script/check-workflows.ts b/script/check-workflows.ts
index fc69503efb8..c7ebf2a28c8 100644
--- a/script/check-workflows.ts
+++ b/script/check-workflows.ts
@@ -45,6 +45,7 @@ const active = new Set([
   "nix-eval.yml",
   "nix-hashes.yml",
   "prepare-jetbrains-release.yml",
+  "publish-jetbrains-bundled.yml",
   "publish-jetbrains.yml",
   "publish.yml",
   "smoke-test.yml",
diff --git a/script/upstream/merge.ts b/script/upstream/merge.ts
index d6eae52ee2e..4321693e01e 100644
--- a/script/upstream/merge.ts
+++ b/script/upstream/merge.ts
@@ -551,10 +551,17 @@ async function main() {
   await git.stageAll()
   const compatMessage = `refactor: kilo compat for ${targetVersion.tag}`
   if (prior) {
-    const tree = await git.writeTree()
+    const transformed = await git.writeTree()
+    const tree = await git.overlayCompatTree({
+      previous: prior.commit,
+      upstream: prior.upstream,
+      target: targetVersion.commit,
+      transformed,
+      extra: [".opencode-version"],
+    })
     const commit = await git.createCommit(tree, compatMessage, prior.commit)
     await git.updateBranch(opencodeBranch, commit)
-    await git.checkout(opencodeBranch)
+    await $`git reset --hard ${commit}`.quiet()
   } else {
     await git.commit(compatMessage)
   }
diff --git a/script/upstream/transforms/transform-package-json.test.ts b/script/upstream/transforms/transform-package-json.test.ts
index 641969f5013..2ad35eb5b76 100644
--- a/script/upstream/transforms/transform-package-json.test.ts
+++ b/script/upstream/transforms/transform-package-json.test.ts
@@ -4,6 +4,7 @@ import {
   fixCatalog,
   fixMetadata,
   fixPackageManager,
+  fixRepository,
   fixScripts,
   fixTrustedDependencies,
   mergeWithNewestVersions,
@@ -32,6 +33,31 @@ test("fixScripts preserves Kilo-only root scripts from base", () => {
   expect(changes.some((c) => c.includes("dev-setup"))).toBe(true)
 })
 
+test("fixRepository preserves Kilo package links", () => {
+  const ours = {
+    repository: { url: "https://github.com/Kilo-Org/kilocode.git" },
+    homepage: "https://github.com/Kilo-Org/kilocode/tree/main/packages/example",
+    bugs: "https://github.com/Kilo-Org/kilocode/issues",
+  }
+  const pkg: Record<string, unknown> = {
+    repository: { url: "https://example.com/upstream.git" },
+    homepage: "https://example.com/upstream/packages/example",
+    bugs: "https://example.com/upstream/issues",
+  }
+  const changes: string[] = []
+
+  fixRepository(pkg, ours, changes)
+
+  expect(pkg.repository).toEqual(ours.repository)
+  expect(pkg.homepage).toBe(ours.homepage)
+  expect(pkg.bugs).toBe(ours.bugs)
+  expect(changes).toEqual([
+    "repository: preserved Kilo metadata",
+    "homepage: preserved Kilo metadata",
+    "bugs: preserved Kilo metadata",
+  ])
+})
+
 test("fixScripts removes upstream-only dead scripts from root", () => {
   const pkg: Record<string, unknown> = {
     scripts: {
diff --git a/script/upstream/transforms/transform-package-json.ts b/script/upstream/transforms/transform-package-json.ts
index 89d300e02b7..87c26debcce 100644
--- a/script/upstream/transforms/transform-package-json.ts
+++ b/script/upstream/transforms/transform-package-json.ts
@@ -8,7 +8,7 @@
  * 3. Injecting Kilo-specific dependencies
  * 4. Preserving Kilo's version number
  * 5. Preserving overrides and patchedDependencies
- * 6. Preserving Kilo's repository configuration
+ * 6. Preserving Kilo's repository metadata
  * 7. Using "newest wins" strategy for dependency versions
  */
 
@@ -135,6 +135,19 @@ export function fixPackageManager(
   pkg.packageManager = next
 }
 
+export function fixRepository(
+  pkg: Record<string, unknown>,
+  ours: Record<string, unknown> | null,
+  changes: string[],
+): void {
+  if (!ours) return
+  for (const key of ["repository", "homepage", "bugs"] as const) {
+    if (ours[key] === undefined || JSON.stringify(pkg[key]) === JSON.stringify(ours[key])) continue
+    pkg[key] = ours[key]
+    changes.push(`${key}: preserved Kilo metadata`)
+  }
+}
+
 export function assertBunPackageManager(current: unknown, base: unknown, upstream: unknown): void {
   const inputs = [bun(base), bun(upstream)].filter((item): item is NonNullable<typeof item> => item !== null)
   if (inputs.length === 0) return
@@ -549,12 +562,8 @@ export async function transformPackageJson(file: string, options: PackageJsonOpt
         }
       }
 
-      // 6. Preserve repository (Kilo-specific, upstream doesn't have this)
-      const ourRepo = ourPkg.repository
-      if (ourRepo && JSON.stringify(pkg.repository) !== JSON.stringify(ourRepo)) {
-        pkg.repository = ourRepo
-        changes.push(`repository: preserved Kilo's repository configuration`)
-      }
+      // 6. Preserve repository metadata so published packages keep Kilo links
+      fixRepository(pkg, ourPkg, changes)
 
       fixMetadata(pkg, relativePath, ourPkg, changes)
 
diff --git a/script/upstream/utils/git.test.ts b/script/upstream/utils/git.test.ts
index b51dd35ea4a..33b2a968db1 100644
--- a/script/upstream/utils/git.test.ts
+++ b/script/upstream/utils/git.test.ts
@@ -9,6 +9,7 @@ import {
   getCommitHash,
   getCommitParents,
   isAncestor,
+  overlayCompatTree,
   recordAncestor,
   updateBranch,
   writeTree,
@@ -108,3 +109,42 @@ test("finds previous compatibility commit when upstream tags diverge", async ()
   expect(found?.upstream).toBe(side)
   expect(found?.commit).not.toBe(ancient)
 })
+
+test("compatibility tree preserves Kilo paths unchanged upstream", async () => {
+  await Bun.write("shared.txt", "opencode A\n")
+  await Bun.write("unchanged.txt", "opencode unchanged\n")
+  await Bun.write("removed.txt", "remove me\n")
+  const old = await commit("release: v1.0.0")
+
+  await Bun.write("shared.txt", "opencode B\n")
+  await Bun.write("added.txt", "opencode added\n")
+  await rm("removed.txt")
+  const target = await commit("release: v1.0.1")
+
+  await $`git checkout -b main ${old}`.quiet()
+  await Bun.write("shared.txt", "kilo A\n")
+  await Bun.write("unchanged.txt", "kilo marker\n")
+  await Bun.write("kilo-only.txt", "keep me\n")
+  const previous = await commit("refactor: kilo compat for v1.0.0")
+
+  await $`git checkout --detach ${target}`.quiet()
+  await Bun.write("shared.txt", "kilo B\n")
+  await Bun.write("added.txt", "kilo added\n")
+  await Bun.write(".opencode-version", "v1.0.1\n")
+  await $`git add -A`.quiet()
+  const transformed = await writeTree()
+  const tree = await overlayCompatTree({
+    previous,
+    upstream: old,
+    target,
+    transformed,
+    extra: [".opencode-version"],
+  })
+
+  expect(await $`git show ${`${tree}:shared.txt`}`.text()).toBe("kilo B\n")
+  expect(await $`git show ${`${tree}:added.txt`}`.text()).toBe("kilo added\n")
+  expect(await $`git show ${`${tree}:unchanged.txt`}`.text()).toBe("kilo marker\n")
+  expect(await $`git show ${`${tree}:kilo-only.txt`}`.text()).toBe("keep me\n")
+  expect(await $`git show ${`${tree}:.opencode-version`}`.text()).toBe("v1.0.1\n")
+  expect((await $`git cat-file -e ${`${tree}:removed.txt`}`.quiet().nothrow()).exitCode).not.toBe(0)
+})
diff --git a/script/upstream/utils/git.ts b/script/upstream/utils/git.ts
index ab2c5693413..da1fb4d52ec 100644
--- a/script/upstream/utils/git.ts
+++ b/script/upstream/utils/git.ts
@@ -206,6 +206,48 @@ export async function writeTree(): Promise<string> {
   return result.trim()
 }
 
+function chunks<T>(items: T[], size = 200): T[][] {
+  return Array.from({ length: Math.ceil(items.length / size) }, (_, idx) => items.slice(idx * size, (idx + 1) * size))
+}
+
+/**
+ * Overlay transformed upstream changes onto the previous compatibility tree.
+ * Paths unchanged upstream keep their prior Kilo content, including Kilo-only
+ * files and marker-bearing shared files.
+ */
+export async function overlayCompatTree(input: {
+  previous: string
+  upstream: string
+  target: string
+  transformed: string
+  extra?: string[]
+}): Promise<string> {
+  const diff = await $`git diff --name-only -z ${input.upstream} ${input.target}`.quiet().nothrow()
+  if (diff.exitCode !== 0) throw new Error(`Failed to list upstream changes: ${diff.stderr.toString()}`)
+
+  const paths = Array.from(
+    new Set([
+      ...diff.stdout
+        .toString()
+        .split("\0")
+        .filter((path) => path.length > 0),
+      ...(input.extra ?? []),
+    ]),
+  )
+  const keep: string[] = []
+  const remove: string[] = []
+  for (const path of paths) {
+    const result = await $`git cat-file -e ${`${input.transformed}:${path}`}`.quiet().nothrow()
+    if (result.exitCode === 0) keep.push(path)
+    else remove.push(path)
+  }
+
+  await $`git read-tree ${input.previous}`.quiet()
+  for (const batch of chunks(keep)) await $`git checkout ${input.transformed} -- ${batch}`.quiet()
+  for (const batch of chunks(remove)) await $`git update-index --force-remove -- ${batch}`.quiet()
+  return writeTree()
+}
+
 export async function createCommit(tree: string, message: string, parent: string): Promise<string> {
   const result = await $`git commit-tree ${tree} -p ${parent} -m ${message}`.text()
   return result.trim()