From 6ad16cd86924cc5400bf1a02ec1007d9f896559c Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Fri, 3 Jul 2026 16:32:25 +0200
Subject: [PATCH 01/68] feat(vscode): prewarm microphone capture before showing
 voice input as recording

---
 .changeset/warm-speech-capture.md             |   5 +
 .../kilo-vscode/src/services/input-tools.ts   |   6 +
 .../kilo-vscode/src/speech-to-text/capture.ts |  24 +++-
 .../tests/unit/speech-to-text-prewarm.test.ts | 104 ++++++++++++++++++
 .../tests/unit/use-speech-to-text.test.ts     |  56 ++++++++++
 .../agent-manager/AgentManagerApp.tsx         |   2 +
 .../webview-ui/diff-viewer/DiffViewerApp.tsx  |   2 +
 packages/kilo-vscode/webview-ui/src/App.tsx   |   2 +
 .../speech-to-text/SpeechToTextButton.tsx     |  19 +++-
 .../speech-to-text/SpeechToTextPrewarm.tsx    |  20 ++++
 .../speech-to-text/useSpeechToText.ts         |   7 +-
 .../kilo-vscode/webview-ui/src/i18n/ar.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/br.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/bs.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/da.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/de.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/en.ts     |   3 +-
 .../kilo-vscode/webview-ui/src/i18n/es.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/fr.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/it.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/ja.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/ko.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/nl.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/no.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/pl.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/ru.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/th.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/tr.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/uk.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/zh.ts     |   1 +
 .../kilo-vscode/webview-ui/src/i18n/zht.ts    |   1 +
 .../src/types/messages/webview-messages.ts    |   5 +
 32 files changed, 264 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/warm-speech-capture.md
 create mode 100644 packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts
 create mode 100644 packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextPrewarm.tsx

diff --git a/.changeset/warm-speech-capture.md b/.changeset/warm-speech-capture.md
new file mode 100644
index 0000000000..64d9be64cc
--- /dev/null
+++ b/.changeset/warm-speech-capture.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Wait for microphone capture to start before showing voice input as recording.
diff --git a/packages/kilo-vscode/src/services/input-tools.ts b/packages/kilo-vscode/src/services/input-tools.ts
index 7d722b684e..23479bbf20 100644
--- a/packages/kilo-vscode/src/services/input-tools.ts
+++ b/packages/kilo-vscode/src/services/input-tools.ts
@@ -1,6 +1,7 @@
 import type { KiloConnectionService } from "./cli-backend/connection-service"
 import { routeAutocompleteMessage } from "./autocomplete/settings"
 import { handleSpeechToTextCancel, handleSpeechToTextStart, handleSpeechToTextStop } from "../speech-to-text/handler"
+import { prewarmSpeechCapture } from "../speech-to-text/capture"
 
 type Msg = {
   type: string
@@ -18,6 +19,11 @@ type Ctx = {
 export async function routeInputToolMessage(message: Msg, ctx: Ctx): Promise<boolean> {
   if (await routeAutocompleteMessage(message, ctx.post)) return true
 
+  if (message.type === "speechToTextPrewarm") {
+    void prewarmSpeechCapture().catch((err) => console.warn("[Kilo New] Speech capture prewarm failed:", err))
+    return true
+  }
+
   if (message.type === "speechToTextStart") {
     if (!message.requestId) return true
     handleSpeechToTextStart(
diff --git a/packages/kilo-vscode/src/speech-to-text/capture.ts b/packages/kilo-vscode/src/speech-to-text/capture.ts
index 03efa67aaf..a2d61885bc 100644
--- a/packages/kilo-vscode/src/speech-to-text/capture.ts
+++ b/packages/kilo-vscode/src/speech-to-text/capture.ts
@@ -36,13 +36,18 @@ type Args = {
 
 let active: Recording | undefined
 let starting: string | undefined
+let ffmpeg: Promise<string> | undefined
+
+export async function prewarmSpeechCapture(): Promise<void> {
+  await resolveFFmpeg()
+}
 
 export async function startSpeechCapture(input: Input): Promise<boolean> {
   if (active || starting) throw new Error("Speech recording is already in progress")
 
   starting = input.requestId
   try {
-    const bin = await findFFmpeg()
+    const bin = await resolveFFmpeg()
     const file = path.join(os.tmpdir(), `kilo-stt-${process.pid}-${Date.now()}.wav`)
     const state = await startWithArgs(bin, file, input, await inputArgSets(bin))
     return !state.stopped
@@ -229,6 +234,23 @@ function requireActive(requestId: string): Recording {
   return active
 }
 
+async function resolveFFmpeg(): Promise<string> {
+  if (ffmpeg) {
+    const bin = await ffmpeg
+    if (!path.isAbsolute(bin) || existsSync(bin)) return bin
+    ffmpeg = undefined
+  }
+
+  const task = findFFmpeg()
+  ffmpeg = task
+  try {
+    return await task
+  } catch (err) {
+    if (ffmpeg === task) ffmpeg = undefined
+    throw err
+  }
+}
+
 async function findFFmpeg(): Promise<string> {
   const paths = [
     process.env.KILO_FFMPEG_PATH,
diff --git a/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts b/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts
new file mode 100644
index 0000000000..48288a0c53
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts
@@ -0,0 +1,104 @@
+import { describe, expect, it } from "bun:test"
+import path from "node:path"
+
+// Run from webview-ui so the child transpiles JSX with solid-js (its tsconfig sets
+// jsxImportSource: solid-js). The package root tsconfig has no jsx setting, which makes
+// bun fall back to react/jsx-dev-runtime and fail whenever react isn't hoisted nearby.
+const WEBVIEW = path.resolve(import.meta.dir, "../../webview-ui")
+
+// solid-js effects only run under the browser export condition, so the component has to be
+// exercised in a child process resolved with `--conditions=browser`. The child prints an
+// explicit PASS/FAIL sentinel: a FAIL means the prewarm logic is wrong (fail immediately),
+// while any other non-zero exit is a transient spawn failure under load and is retried so
+// the suite stays deterministic.
+const PASS = "PREWARM_PASS"
+const FAIL = "PREWARM_FAIL:"
+
+const SCRIPT = `
+  import { Window } from "happy-dom"
+
+  const window = new Window()
+  globalThis.window = window
+  globalThis.document = window.document
+  globalThis.Node = window.Node
+
+  const sent = []
+  globalThis.acquireVsCodeApi = () => ({
+    postMessage: (message) => sent.push(message),
+    getState: () => undefined,
+    setState: () => {},
+  })
+
+  const { createComponent, createSignal } = await import("solid-js")
+  const { render } = await import("solid-js/web")
+  const { ConfigContext } = await import("./src/context/config.tsx")
+  const { ProviderContext } = await import("./src/context/provider.tsx")
+  const { SpeechToTextPrewarm } = await import(
+    "./src/components/speech-to-text/SpeechToTextPrewarm.tsx"
+  )
+
+  const fail = (reason) => {
+    console.log("${FAIL}" + reason)
+    process.exit(2)
+  }
+
+  const [config, setConfig] = createSignal({ disabled_providers: ["kilo"] })
+  const [auth, setAuth] = createSignal({})
+  const root = document.createElement("div")
+  const dispose = render(
+    () =>
+      createComponent(ProviderContext.Provider, {
+        value: { authStates: auth },
+        get children() {
+          return createComponent(ConfigContext.Provider, {
+            value: { config },
+            get children() {
+              return createComponent(SpeechToTextPrewarm, {})
+            },
+          })
+        },
+      }),
+    root,
+  )
+
+  if (sent.length !== 0) fail("prewarmed without Kilo access")
+  setAuth({ kilo: "api" })
+  if (sent.length !== 0) fail("prewarmed while Kilo was disabled")
+  setConfig({})
+  if (sent.length !== 1 || sent[0]?.type !== "speechToTextPrewarm") {
+    fail("did not prewarm after Kilo access became available")
+  }
+  setAuth({ kilo: "oauth" })
+  if (sent.length !== 1) fail("prewarmed more than once")
+  dispose()
+  console.log("${PASS}")
+`
+
+describe("speech-to-text prewarm", () => {
+  it("starts only after Kilo speech access becomes available", () => {
+    const attempts = 3
+    const failures: string[] = []
+
+    for (let attempt = 1; attempt <= attempts; attempt++) {
+      const result = Bun.spawnSync(["bun", "--conditions=browser", "-e", SCRIPT], {
+        cwd: WEBVIEW,
+        stdout: "pipe",
+        stderr: "pipe",
+      })
+      const output = result.stdout.toString() + result.stderr.toString()
+
+      if (output.includes(PASS)) return
+
+      const logic = output.indexOf(FAIL)
+      // A FAIL sentinel is a real assertion failure in the prewarm logic — surface it now.
+      if (logic !== -1) {
+        expect.unreachable(output.slice(logic + FAIL.length).split("\n")[0]?.trim())
+      }
+
+      // Otherwise the child died before it could run (starved/transient spawn) — retry.
+      failures.push(`attempt ${attempt} exit ${result.exitCode}: ${output.trim() || "<no output>"}`)
+    }
+
+    expect.unreachable(`prewarm child never reported success:\n${failures.join("\n")}`)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/use-speech-to-text.test.ts b/packages/kilo-vscode/tests/unit/use-speech-to-text.test.ts
index ae28f0b417..3b406e9cdd 100644
--- a/packages/kilo-vscode/tests/unit/use-speech-to-text.test.ts
+++ b/packages/kilo-vscode/tests/unit/use-speech-to-text.test.ts
@@ -41,6 +41,59 @@ function setup() {
 }
 
 describe("useSpeechToText", () => {
+  it("waits for microphone readiness before reporting recording", () => {
+    const ctx = setup()
+
+    ctx.speech.start({ model: "scribe", insert: () => {} })
+    const start = ctx.sent[0]
+    if (start?.type !== "speechToTextStart") throw new Error("speech start message missing")
+
+    expect(ctx.speech.state()).toBe("starting")
+    expect(ctx.speech.active()).toBe(true)
+
+    ctx.fire({ type: "speechToTextStarted", requestId: "another-request" })
+    expect(ctx.speech.state()).toBe("starting")
+
+    ctx.fire({ type: "speechToTextStarted", requestId: start.requestId })
+    expect(ctx.speech.state()).toBe("recording")
+    ctx.dispose()
+  })
+
+  it("does not stop or start another recording while the microphone is starting", () => {
+    const ctx = setup()
+
+    ctx.speech.start({ model: "scribe", insert: () => {} })
+    const start = ctx.sent[0]
+    if (start?.type !== "speechToTextStart") throw new Error("speech start message missing")
+
+    ctx.speech.stop()
+    ctx.speech.start({ model: "other", insert: () => {} })
+    expect(ctx.speech.state()).toBe("starting")
+    expect(ctx.sent).toEqual([start])
+
+    ctx.fire({ type: "speechToTextStarted", requestId: start.requestId })
+    ctx.speech.stop()
+    expect(ctx.speech.state()).toBe("transcribing")
+    expect(ctx.sent[1]).toEqual({ type: "speechToTextStop", requestId: start.requestId })
+    ctx.dispose()
+  })
+
+  it("cancels a pending microphone startup and ignores its late acknowledgement", () => {
+    const ctx = setup()
+
+    ctx.speech.start({ model: "scribe", insert: () => {} })
+    const start = ctx.sent[0]
+    if (start?.type !== "speechToTextStart") throw new Error("speech start message missing")
+
+    ctx.speech.cancel()
+    expect(ctx.sent[1]).toEqual({ type: "speechToTextCancel", requestId: start.requestId })
+    expect(ctx.speech.state()).toBe("idle")
+
+    ctx.fire({ type: "speechToTextStarted", requestId: start.requestId })
+    expect(ctx.speech.state()).toBe("idle")
+    ctx.dispose()
+  })
+
   it("offers sign-in when stored credentials stop authenticating", () => {
     const ctx = setup()
 
@@ -70,6 +123,7 @@ describe("useSpeechToText", () => {
     ctx.speech.start({ model: "scribe", insert: (value) => text.push(value) })
     const start = ctx.sent[0]
     if (start?.type !== "speechToTextStart") throw new Error("speech start message missing")
+    ctx.fire({ type: "speechToTextStarted", requestId: start.requestId })
 
     ctx.speech.stop({ done: () => done++ })
     ctx.fire({ type: "speechToTextResult", requestId: start.requestId, text: "Recorded prompt" })
@@ -87,6 +141,7 @@ describe("useSpeechToText", () => {
     ctx.speech.start({ model: "scribe", insert: () => {} })
     const start = ctx.sent[0]
     if (start?.type !== "speechToTextStart") throw new Error("speech start message missing")
+    ctx.fire({ type: "speechToTextStarted", requestId: start.requestId })
 
     ctx.speech.stop({ done: () => done++ })
     ctx.speech.cancel()
@@ -105,6 +160,7 @@ describe("useSpeechToText", () => {
     ctx.speech.start({ model: "scribe", insert: (value) => text.push(value) })
     const start = ctx.sent[0]
     if (start?.type !== "speechToTextStart") throw new Error("speech start message missing")
+    ctx.fire({ type: "speechToTextStarted", requestId: start.requestId })
 
     ctx.speech.stop({ done: () => done++, ready: () => false })
     ctx.fire({ type: "speechToTextResult", requestId: start.requestId, text: "Keep as draft" })
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index a092686fcb..1363d949cf 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -83,6 +83,7 @@ import { FeedbackProvider } from "../src/context/feedback"
 import { SessionProvider, useSession } from "../src/context/session"
 import { WorktreeModeProvider } from "../src/context/worktree-mode"
 import { ChatView } from "../src/components/chat"
+import { SpeechToTextPrewarm } from "../src/components/speech-to-text/SpeechToTextPrewarm"
 import HistoryView from "../src/components/history/HistoryView"
 import { NewWorktreeDialog } from "./NewWorktreeDialog"
 import { DataBridge, MermaidDownloadBridge } from "../src/App"
@@ -3131,6 +3132,7 @@ export const AgentManagerApp: Component = () => {
                     <FileComponentProvider component={File}>
                       <ProviderProvider>
                         <ConfigProvider>
+                          <SpeechToTextPrewarm />
                           <DisplayProvider>
                             <IndexingProvider>
                               <KiloEmbeddingModelsProvider>
diff --git a/packages/kilo-vscode/webview-ui/diff-viewer/DiffViewerApp.tsx b/packages/kilo-vscode/webview-ui/diff-viewer/DiffViewerApp.tsx
index a60338c62c..5ab642292e 100644
--- a/packages/kilo-vscode/webview-ui/diff-viewer/DiffViewerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/diff-viewer/DiffViewerApp.tsx
@@ -23,6 +23,7 @@ import type { DiffSourceCapabilities, DiffSourceDescriptor } from "../../src/dif
 import type { DiffViewerNotice } from "../src/types/messages/extension-messages"
 import { DiffPickerHeader } from "./DiffPickerHeader"
 import { BaseBranchPicker } from "./BaseBranchPicker"
+import { SpeechToTextPrewarm } from "../src/components/speech-to-text/SpeechToTextPrewarm"
 
 const NOTICE_KEYS: Record<DiffViewerNotice, string> = {
   "snapshots-disabled": "diffViewer.notice.snapshotsDisabled",
@@ -305,6 +306,7 @@ export const DiffViewerApp: Component = () => {
           <ServerProvider>
             <ProviderProvider>
               <ConfigProvider>
+                <SpeechToTextPrewarm />
                 <DiffViewerShell />
               </ConfigProvider>
             </ProviderProvider>
diff --git a/packages/kilo-vscode/webview-ui/src/App.tsx b/packages/kilo-vscode/webview-ui/src/App.tsx
index de57030df6..d47cf5d952 100644
--- a/packages/kilo-vscode/webview-ui/src/App.tsx
+++ b/packages/kilo-vscode/webview-ui/src/App.tsx
@@ -25,6 +25,7 @@ import { ChatView } from "./components/chat"
 import { SidebarEmptyState } from "./components/chat/SidebarEmptyState"
 import { registerExpandedTaskTool } from "./components/chat/TaskToolExpanded"
 import { registerVscodeToolOverrides } from "./components/chat/VscodeToolOverrides"
+import { SpeechToTextPrewarm } from "./components/speech-to-text/SpeechToTextPrewarm"
 
 // Override the upstream "task" tool renderer with the fully-expanded version
 // that shows child session parts inline in the VS Code sidebar.
@@ -378,6 +379,7 @@ const App: Component = () => {
                     <FileComponentProvider component={File}>
                       <ProviderProvider>
                         <ConfigProvider>
+                          <SpeechToTextPrewarm />
                           <DisplayProvider>
                             <WorkStyleProvider>
                               <IndexingProvider>
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 3da53666ec..ade6048443 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
@@ -1,7 +1,7 @@
 import { Button } from "@kilocode/kilo-ui/button"
 import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
-import type { Component } from "solid-js"
+import { onCleanup, type Component } from "solid-js"
 import type { SpeechToText } from "./useSpeechToText"
 
 type Props = {
@@ -12,8 +12,10 @@ type Props = {
 }
 
 export const SpeechToTextButton: Component<Props> = (props) => {
-  const disabled = () => !!props.disabled
+  const unavailable = () => !!props.disabled && props.speech.state() === "idle"
+  const busy = () => props.speech.state() === "starting" || props.speech.state() === "transcribing"
   const label = () => {
+    if (props.speech.state() === "starting") return props.label("speechToText.tooltip.starting")
     if (props.speech.state() === "recording") return props.label("speechToText.tooltip.stop")
     if (props.speech.state() === "transcribing") return props.label("speechToText.tooltip.transcribing")
     if (props.speech.state() === "error") return props.speech.error() || props.label("speechToText.tooltip.error")
@@ -21,6 +23,7 @@ export const SpeechToTextButton: Component<Props> = (props) => {
   }
 
   const click = () => {
+    if (props.speech.state() === "starting") return
     if (props.speech.state() === "recording") {
       props.speech.stop()
       return
@@ -33,22 +36,28 @@ export const SpeechToTextButton: Component<Props> = (props) => {
       props.speech.clear()
       return
     }
-    if (disabled()) return
+    if (unavailable()) return
     props.start()
   }
 
+  onCleanup(() => {
+    if (props.speech.active()) props.speech.cancel()
+  })
+
   return (
     <Tooltip value={label()} placement="top">
       <Button
         variant="ghost"
         size="small"
         onClick={click}
-        disabled={disabled()}
+        disabled={unavailable()}
         aria-label={label()}
+        aria-disabled={unavailable() || props.speech.state() === "starting"}
+        aria-busy={busy()}
         aria-pressed={props.speech.state() === "recording"}
         class={`prompt-speech-button prompt-speech-button--${props.speech.state()}`}
       >
-        {props.speech.state() === "transcribing" ? (
+        {busy() ? (
           <Spinner style={{ width: "16px", height: "16px" }} />
         ) : (
           <svg class="prompt-speech-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">
diff --git a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextPrewarm.tsx b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextPrewarm.tsx
new file mode 100644
index 0000000000..5b05b49a4c
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/SpeechToTextPrewarm.tsx
@@ -0,0 +1,20 @@
+import { createEffect, type Component } from "solid-js"
+import { useConfig } from "../../context/config"
+import { useProvider } from "../../context/provider"
+import { getVSCodeAPI } from "../../context/vscode"
+import { canUseSpeechToText } from "./availability"
+
+export const SpeechToTextPrewarm: Component = () => {
+  const vscode = getVSCodeAPI()
+  const provider = useProvider()
+  const { config } = useConfig()
+  let prepared = false
+
+  createEffect(() => {
+    if (prepared || !canUseSpeechToText(config(), provider.authStates())) return
+    prepared = true
+    vscode.postMessage({ type: "speechToTextPrewarm" })
+  })
+
+  return null
+}
diff --git a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/useSpeechToText.ts b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/useSpeechToText.ts
index 7deb0c0672..db5b518bc9 100644
--- a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/useSpeechToText.ts
+++ b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/useSpeechToText.ts
@@ -16,7 +16,7 @@ type Lang = {
   t: (key: string) => string
 }
 
-export type SpeechState = "idle" | "recording" | "transcribing" | "error"
+export type SpeechState = "idle" | "starting" | "recording" | "transcribing" | "error"
 
 export type InsertTranscript = (text: string) => void
 
@@ -43,7 +43,7 @@ export type SpeechToText = {
 export function useSpeechToText(vscode: VSCode, server: Server, lang: Lang): SpeechToText {
   const [state, setState] = createSignal<SpeechState>("idle")
   const [error, setError] = createSignal<string | undefined>()
-  const active = () => state() === "recording" || state() === "transcribing"
+  const active = () => state() === "starting" || state() === "recording" || state() === "transcribing"
   const prefix = globalThis.crypto?.randomUUID?.() ?? `stt-${Math.random().toString(36).slice(2)}`
 
   let request = ""
@@ -57,6 +57,7 @@ export function useSpeechToText(vscode: VSCode, server: Server, lang: Lang): Spe
     if (msg.requestId !== request) return
 
     if (msg.type === "speechToTextStarted") {
+      if (state() !== "starting") return
       setState("recording")
       return
     }
@@ -103,7 +104,7 @@ export function useSpeechToText(vscode: VSCode, server: Server, lang: Lang): Spe
 
     counter++
     request = `${prefix}-${counter}`
-    setState("recording")
+    setState("starting")
     vscode.postMessage({
       type: "speechToTextStart",
       requestId: request,
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index fd2c265e91..0797c867d2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -302,6 +302,7 @@ export const dict = {
     "انقر لتقييد الكتابة في نظام الملفات. يظل الوصول إلى الشبكة مسموحًا وفق إعدادات sandbox.",
 
   "speechToText.tooltip.start": "بدء الإدخال الصوتي باستخدام Kilo Gateway",
+  "speechToText.tooltip.starting": "جارٍ تشغيل الميكروفون... يُرجى الانتظار قبل التحدث.",
   "speechToText.tooltip.stop": "إيقاف التقاط الصوت",
   "speechToText.tooltip.transcribing": "جاري تحويل الصوت إلى نص... انقر للإلغاء.",
   "speechToText.tooltip.error": "فشل الإدخال الصوتي. انقر للمسح.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index d0378e8c7b..f2bf6781f5 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -309,6 +309,7 @@ export const dict = {
     "Clique para restringir as operações de escrita no sistema de arquivos. O acesso à rede continua permitido pelas configurações do sandbox.",
 
   "speechToText.tooltip.start": "Iniciar entrada de voz com o Kilo Gateway",
+  "speechToText.tooltip.starting": "Iniciando o microfone... Aguarde antes de falar.",
   "speechToText.tooltip.stop": "Parar captura",
   "speechToText.tooltip.transcribing": "Transcrevendo... Clique para cancelar.",
   "speechToText.tooltip.error": "Falha na entrada de voz. Clique para limpar.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index de1e41dbf8..414579de5c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -307,6 +307,7 @@ export const dict = {
     "Kliknite da ograničite pisanje u datotečni sistem. Pristup mreži ostaje dozvoljen prema vašim sandbox postavkama.",
 
   "speechToText.tooltip.start": "Započni glasovni unos sa Kilo Gateway",
+  "speechToText.tooltip.starting": "Pokretanje mikrofona... Sačekajte prije nego što progovorite.",
   "speechToText.tooltip.stop": "Zaustavi hvatanje zvuka",
   "speechToText.tooltip.transcribing": "Prepisivanje... Kliknite da otkažete.",
   "speechToText.tooltip.error": "Glasovni unos nije uspio. Kliknite da očistite.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index dee2237b79..6e905b2ffa 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -306,6 +306,7 @@ export const dict = {
     "Klik for at begrænse skriveadgang til filsystemet. Netværksadgang er fortsat tilladt ifølge dine sandboxindstillinger.",
 
   "speechToText.tooltip.start": "Start stemmeinput med Kilo Gateway",
+  "speechToText.tooltip.starting": "Starter mikrofonen... Vent med at tale.",
   "speechToText.tooltip.stop": "Stop lydoptagelse",
   "speechToText.tooltip.transcribing": "Transskriberer... Klik for at annullere.",
   "speechToText.tooltip.error": "Stemmeinput mislykkedes. Klik for at rydde.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index fb6b30e846..f8f1ea3fab 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -312,6 +312,7 @@ export const dict = {
     "Klicken, um Schreibvorgänge im Dateisystem einzuschränken. Der Netzwerkzugriff bleibt gemäß deinen Sandbox-Einstellungen erlaubt.",
 
   "speechToText.tooltip.start": "Spracheingabe mit Kilo Gateway starten",
+  "speechToText.tooltip.starting": "Mikrofon wird gestartet... Bitte noch nicht sprechen.",
   "speechToText.tooltip.stop": "Audioerfassung beenden",
   "speechToText.tooltip.transcribing": "Transkribieren... Zum Abbrechen klicken.",
   "speechToText.tooltip.error": "Spracheingabe fehlgeschlagen. Zum Löschen klicken.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index 7cc617f8ea..0e3c78224b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -305,7 +305,8 @@ export const dict = {
   "prompt.action.enhanceDescription":
     "The 'Enhance Prompt' button helps improve your prompt by providing additional context, clarification, or rephrasing. Try typing a prompt in here and clicking the button again to see how it works.",
   "speechToText.tooltip.start": "Start voice input with Kilo Gateway",
-  "speechToText.tooltip.stop": "Stop capturing",
+  "speechToText.tooltip.starting": "Starting microphone... Wait to speak.",
+  "speechToText.tooltip.stop": "Recording. Click to stop.",
   "speechToText.tooltip.transcribing": "Transcribing... Click to cancel.",
   "speechToText.tooltip.error": "Speech input failed. Click to clear.",
   "speechToText.error.title": "Speech input failed",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 2a383c61f9..d073de6ffb 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -309,6 +309,7 @@ export const dict = {
     "Haz clic para restringir las escrituras en el sistema de archivos. El acceso a la red seguirá permitido según la configuración de tu sandbox.",
 
   "speechToText.tooltip.start": "Iniciar entrada de voz con Kilo Gateway",
+  "speechToText.tooltip.starting": "Iniciando el micrófono... Espera antes de hablar.",
   "speechToText.tooltip.stop": "Detener captura",
   "speechToText.tooltip.transcribing": "Transcribiendo... Haz clic para cancelar.",
   "speechToText.tooltip.error": "Falló la entrada de voz. Haz clic para borrar.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index 78d031b278..41e97207f2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -310,6 +310,7 @@ export const dict = {
     "Cliquez pour restreindre les écritures dans le système de fichiers. L'accès au réseau reste autorisé par vos paramètres de sandbox.",
 
   "speechToText.tooltip.start": "Démarrer la saisie vocale avec Kilo Gateway",
+  "speechToText.tooltip.starting": "Démarrage du microphone... Attendez avant de parler.",
   "speechToText.tooltip.stop": "Arrêter la capture audio",
   "speechToText.tooltip.transcribing": "Transcription en cours... Cliquez pour annuler.",
   "speechToText.tooltip.error": "La saisie vocale a échoué. Cliquez pour effacer.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 190ee91011..82a3d3306f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -1631,6 +1631,7 @@ export const dict = {
 
   // Speech to Text tooltips and errors
   "speechToText.tooltip.start": "Avvia input vocale con Kilo Gateway",
+  "speechToText.tooltip.starting": "Avvio del microfono... Attendi prima di parlare.",
   "speechToText.tooltip.stop": "Interrompi acquisizione",
   "speechToText.tooltip.transcribing": "Trascrizione... Fai clic per annullare.",
   "speechToText.tooltip.error": "Input vocale fallito. Fai clic per cancellare.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index c813407f60..dc0919df9e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -305,6 +305,7 @@ export const dict = {
     "クリックすると、ファイルシステムへの書き込みを制限します。サンドボックス設定により、ネットワークアクセスは引き続き許可されます。",
 
   "speechToText.tooltip.start": "Kilo Gatewayで音声入力を開始",
+  "speechToText.tooltip.starting": "マイクを起動中... まだ話さないでください。",
   "speechToText.tooltip.stop": "音声キャプチャを停止",
   "speechToText.tooltip.transcribing": "文字起こし中... クリックしてキャンセル。",
   "speechToText.tooltip.error": "音声入力に失敗しました。クリックしてクリア。",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 454b473130..7270432896 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -306,6 +306,7 @@ export const dict = {
     "클릭하면 파일 시스템 쓰기를 제한합니다. 샌드박스 설정에 따라 네트워크 액세스는 계속 허용됩니다.",
 
   "speechToText.tooltip.start": "Kilo Gateway로 음성 입력 시작",
+  "speechToText.tooltip.starting": "마이크를 시작하는 중... 잠시 후 말씀해 주세요.",
   "speechToText.tooltip.stop": "음성 캡처 중지",
   "speechToText.tooltip.transcribing": "변환 중... 취소하려면 클릭하세요.",
   "speechToText.tooltip.error": "음성 입력에 실패했습니다. 지우려면 클릭하세요.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 827c863f5a..0cb4160c92 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -309,6 +309,7 @@ export const dict = {
     "Klik om schrijfbewerkingen in het bestandssysteem te beperken. Netwerktoegang blijft toegestaan volgens je sandboxinstellingen.",
 
   "speechToText.tooltip.start": "Spraakinvoer starten met Kilo Gateway",
+  "speechToText.tooltip.starting": "Microfoon wordt gestart... Wacht nog even met spreken.",
   "speechToText.tooltip.stop": "Audio vastleggen stoppen",
   "speechToText.tooltip.transcribing": "Transcriberen... Klik om te annuleren.",
   "speechToText.tooltip.error": "Spraakinvoer mislukt. Klik om te wissen.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index e988e09c01..4a49a2457b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -311,6 +311,7 @@ export const dict = {
     "Klikk for å begrense skrivetilgang til filsystemet. Nettverkstilgang er fortsatt tillatt av sandbox-innstillingene dine.",
 
   "speechToText.tooltip.start": "Start taleinndata med Kilo Gateway",
+  "speechToText.tooltip.starting": "Starter mikrofonen... Vent med å snakke.",
   "speechToText.tooltip.stop": "Stopp lydfangst",
   "speechToText.tooltip.transcribing": "Transkriberer... Klikk for å avbryte.",
   "speechToText.tooltip.error": "Taleinndata mislyktes. Klikk for å tømme.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index 1e55d7debe..fa0bf9b209 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -307,6 +307,7 @@ export const dict = {
     "Kliknij, aby ograniczyć zapisy w systemie plików. Ustawienia sandboxa nadal zezwalają na dostęp do sieci.",
 
   "speechToText.tooltip.start": "Rozpocznij wprowadzanie głosowe z Kilo Gateway",
+  "speechToText.tooltip.starting": "Uruchamianie mikrofonu... Poczekaj, zanim zaczniesz mówić.",
   "speechToText.tooltip.stop": "Zatrzymaj przechwytywanie dźwięku",
   "speechToText.tooltip.transcribing": "Transkrybowanie... Kliknij, aby anulować.",
   "speechToText.tooltip.error": "Wprowadzanie głosowe nie powiodło się. Kliknij, aby wyczyścić.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 156d818f3d..cf3a4cb3e7 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -304,6 +304,7 @@ export const dict = {
     "Нажмите, чтобы ограничить запись в файловую систему. Доступ к сети останется разрешённым согласно настройкам песочницы.",
 
   "speechToText.tooltip.start": "Начать голосовой ввод с Kilo Gateway",
+  "speechToText.tooltip.starting": "Запуск микрофона... Пока не говорите.",
   "speechToText.tooltip.stop": "Остановить захват звука",
   "speechToText.tooltip.transcribing": "Распознавание... Нажмите для отмены.",
   "speechToText.tooltip.error": "Ошибка голосового ввода. Нажмите, чтобы очистить.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index a1e6079680..c8a8180b60 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -305,6 +305,7 @@ export const dict = {
     "คลิกเพื่อจำกัดการเขียนในระบบไฟล์ การตั้งค่า sandbox ของคุณยังคงอนุญาตให้เข้าถึงเครือข่าย",
 
   "speechToText.tooltip.start": "เริ่มการป้อนข้อมูลด้วยเสียงด้วย Kilo Gateway",
+  "speechToText.tooltip.starting": "กำลังเริ่มไมโครโฟน... โปรดรอก่อนพูด",
   "speechToText.tooltip.stop": "หยุดจับเสียง",
   "speechToText.tooltip.transcribing": "กำลังถอดเสียง... คลิกเพื่อยกเลิก",
   "speechToText.tooltip.error": "การป้อนข้อมูลด้วยเสียงล้มเหลว คลิกเพื่อล้าง",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index b2c3b68958..ef8582bb9d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -305,6 +305,7 @@ export const dict = {
     "Dosya sistemi yazma işlemlerini kısıtlamak için tıklayın. Sandbox ayarlarınız ağ erişimine izin vermeye devam ediyor.",
 
   "speechToText.tooltip.start": "Kilo Gateway ile sesli girişi başlatın",
+  "speechToText.tooltip.starting": "Mikrofon başlatılıyor... Henüz konuşmayın.",
   "speechToText.tooltip.stop": "Ses yakalamayı durdur",
   "speechToText.tooltip.transcribing": "Metne dönüştürülüyor... İptal etmek için tıklayın.",
   "speechToText.tooltip.error": "Sesli giriş başarısız oldu. Temizlemek için tıklayın.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index 28c61a41b1..b048e83e59 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -306,6 +306,7 @@ export const dict = {
     "Натисніть, щоб обмежити запис у файлову систему. Доступ до мережі залишиться дозволеним відповідно до налаштувань пісочниці.",
 
   "speechToText.tooltip.start": "Почати голосове введення з Kilo Gateway",
+  "speechToText.tooltip.starting": "Запуск мікрофона... Поки що не говоріть.",
   "speechToText.tooltip.stop": "Зупинити захоплення звуку",
   "speechToText.tooltip.transcribing": "Транскрибування... Натисніть, щоб скасувати.",
   "speechToText.tooltip.error": "Помилка голосового введення. Натисніть, щоб очистити.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index 7767c601c7..7af877d4cd 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -302,6 +302,7 @@ export const dict = {
     "点击以限制文件系统写入。根据你的沙盒设置，网络访问仍然允许。",
 
   "speechToText.tooltip.start": "使用 Kilo Gateway 开始语音输入",
+  "speechToText.tooltip.starting": "正在启动麦克风... 请稍后再说。",
   "speechToText.tooltip.stop": "停止捕获音频",
   "speechToText.tooltip.transcribing": "正在转录... 点击取消。",
   "speechToText.tooltip.error": "语音输入失败。点击清除。",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index fba8e44d91..6e5492c940 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -300,6 +300,7 @@ export const dict = {
   "prompt.action.sandbox.description.disabledNetworkAllowed": "點擊以限制檔案系統寫入。沙盒設定仍允許網路存取。",
 
   "speechToText.tooltip.start": "使用 Kilo Gateway 開始語音輸入",
+  "speechToText.tooltip.starting": "正在啟動麥克風... 請稍後再說。",
   "speechToText.tooltip.stop": "停止擷取音訊",
   "speechToText.tooltip.transcribing": "正在轉錄... 點擊取消。",
   "speechToText.tooltip.error": "語音輸入失敗。點擊清除。",
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 2b12b3ed3c..9ef7ed656c 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
@@ -339,6 +339,10 @@ export interface RequestChatCompletionMessage {
   requestId: string
 }
 
+export interface SpeechToTextPrewarmMessage {
+  type: "speechToTextPrewarm"
+}
+
 export interface SpeechToTextStartMessage {
   type: "speechToTextStart"
   requestId: string
@@ -1171,6 +1175,7 @@ export type WebviewMessage =
   | ExportSessionTranscriptRequest
   | RequestAutocompleteSettingsMessage
   | RequestChatCompletionMessage
+  | SpeechToTextPrewarmMessage
   | SpeechToTextStartMessage
   | SpeechToTextStopMessage
   | SpeechToTextCancelMessage

From 3d16f29520646461101d4059789b2639e3fcb46a Mon Sep 17 00:00:00 2001
From: Mohammad Javad Naderi <mjnaderi@gmail.com>
Date: Sat, 4 Jul 2026 10:28:27 +0330
Subject: [PATCH 02/68] fix(vscode): allow shrinking prompt mention selections

---
 .changeset/prompt-mention-selection.md        |  5 ++
 .../tests/unit/use-file-mention.test.ts       | 86 +++++++++++++++++--
 .../webview-ui/src/hooks/useFileMention.ts    | 20 ++++-
 3 files changed, 101 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/prompt-mention-selection.md

diff --git a/.changeset/prompt-mention-selection.md b/.changeset/prompt-mention-selection.md
new file mode 100644
index 0000000000..f1a1c09c08
--- /dev/null
+++ b/.changeset/prompt-mention-selection.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Allow Shift+Arrow selections in the prompt input to shrink back across file mentions.
diff --git a/packages/kilo-vscode/tests/unit/use-file-mention.test.ts b/packages/kilo-vscode/tests/unit/use-file-mention.test.ts
index cb06763a7d..6fe5f692a0 100644
--- a/packages/kilo-vscode/tests/unit/use-file-mention.test.ts
+++ b/packages/kilo-vscode/tests/unit/use-file-mention.test.ts
@@ -5,19 +5,29 @@ import type { ExtensionMessage, WebviewMessage } from "../../webview-ui/src/type
 
 const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
 
-function textarea(value: string, cursor: number, dir: "ltr" | "rtl") {
-  const state = { cursor }
+function textarea(
+  value: string,
+  cursor: number,
+  dir: "ltr" | "rtl",
+  selection?: { end: number; direction: SelectionDirection },
+) {
+  const state = { start: cursor, end: selection?.end ?? cursor, direction: selection?.direction ?? "none" }
   return {
     value,
     get selectionStart() {
-      return state.cursor
+      return state.start
     },
     get selectionEnd() {
-      return state.cursor
+      return state.end
+    },
+    get selectionDirection() {
+      return state.direction
     },
     matches: (selector: string) => selector === `:dir(${dir})`,
-    setSelectionRange: (start: number) => {
-      state.cursor = start
+    setSelectionRange: (start: number, end = start, direction: SelectionDirection = "none") => {
+      state.start = start
+      state.end = end
+      state.direction = direction
     },
   } as unknown as HTMLTextAreaElement
 }
@@ -272,4 +282,68 @@ describe("useFileMention", () => {
 
     dispose.fn?.()
   })
+
+  it("shrinks a left-to-right shift selection across a mention", async () => {
+    const ctx = {
+      postMessage: () => {},
+      onMessage: () => () => {},
+    }
+
+    const dispose: { fn?: () => void } = {}
+    const mention = createRoot((root) => {
+      dispose.fn = root
+      return useFileMention(ctx, undefined, () => false)
+    })
+
+    const path = "README.md"
+    const text = `A @${path} B`
+    const start = text.indexOf("@")
+    const end = start + path.length + 1
+    mention.addPaths([path], "/repo")
+
+    const input = textarea(text, end - 1, "ltr", { end: text.length, direction: "backward" })
+    mention.snapSelection(input)
+    expect(input.selectionStart).toBe(start)
+    expect(input.selectionEnd).toBe(text.length)
+
+    input.setSelectionRange(start + 1, text.length, "backward")
+    mention.snapSelection(input)
+    expect(input.selectionStart).toBe(end)
+    expect(input.selectionEnd).toBe(text.length)
+    expect(input.selectionDirection).toBe("backward")
+
+    dispose.fn?.()
+  })
+
+  it("shrinks a right-to-left shift selection across a mention", async () => {
+    const ctx = {
+      postMessage: () => {},
+      onMessage: () => () => {},
+    }
+
+    const dispose: { fn?: () => void } = {}
+    const mention = createRoot((root) => {
+      dispose.fn = root
+      return useFileMention(ctx, undefined, () => false)
+    })
+
+    const path = "README.md"
+    const text = `ی @${path} س`
+    const start = text.indexOf("@")
+    const end = start + path.length + 1
+    mention.addPaths([path], "/repo")
+
+    const input = textarea(text, end - 1, "rtl", { end: text.length, direction: "backward" })
+    mention.snapSelection(input)
+    expect(input.selectionStart).toBe(start)
+    expect(input.selectionEnd).toBe(text.length)
+
+    input.setSelectionRange(start + 1, text.length, "backward")
+    mention.snapSelection(input)
+    expect(input.selectionStart).toBe(end)
+    expect(input.selectionEnd).toBe(text.length)
+    expect(input.selectionDirection).toBe("backward")
+
+    dispose.fn?.()
+  })
 })
diff --git a/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts b/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts
index cc9ca92def..fbc2a97f1d 100644
--- a/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts
+++ b/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts
@@ -299,11 +299,16 @@ export function useFileMention(
   }
 
   let snapping = false
+  let last: { start: number; end: number } | undefined
   const snapSelection = (textarea: HTMLTextAreaElement): void => {
     if (snapping) return
     const start = textarea.selectionStart
     const end = textarea.selectionEnd
-    if (start === end) return // cursor, not a selection
+    const dir = textarea.selectionDirection
+    if (start === end) {
+      last = undefined
+      return // cursor, not a selection
+    }
 
     const val = textarea.value
     const paths = mentionedPaths()
@@ -311,16 +316,23 @@ export function useFileMention(
     let snappedEnd = end
 
     const startRange = findMentionRange(val, start, paths)
-    if (startRange) snapped = startRange.start
+    if (startRange) {
+      const shrink = dir === "backward" && last?.start === startRange.start && last.end === end
+      snapped = shrink ? startRange.end : startRange.start
+    }
 
     const endRange = findMentionRange(val, end, paths)
-    if (endRange) snappedEnd = endRange.end
+    if (endRange) {
+      const shrink = dir === "forward" && last?.start === start && last.end === endRange.end
+      snappedEnd = shrink ? endRange.start : endRange.end
+    }
 
     if (snapped !== start || snappedEnd !== end) {
       snapping = true
-      textarea.setSelectionRange(snapped, snappedEnd, textarea.selectionDirection)
+      textarea.setSelectionRange(snapped, snappedEnd, dir)
       snapping = false
     }
+    last = { start: snapped, end: snappedEnd }
   }
 
   const seedFromText = (text: string) => {

From dc99ae8f794b1bd63e0553cfa362769a63d60877 Mon Sep 17 00:00:00 2001
From: Christiaan Arnoldus <christiaan.arnoldus@outlook.com>
Date: Mon, 6 Jul 2026 15:55:31 +0200
Subject: [PATCH 03/68] fix(cli): route fable model aliases

---
 packages/opencode/src/kilocode/session/routed-model.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opencode/src/kilocode/session/routed-model.ts b/packages/opencode/src/kilocode/session/routed-model.ts
index a9ca56e177..eace803049 100644
--- a/packages/opencode/src/kilocode/session/routed-model.ts
+++ b/packages/opencode/src/kilocode/session/routed-model.ts
@@ -47,7 +47,7 @@ export namespace KiloRoutedModel {
     input: { providerID: ProviderID; modelID: string; selected?: string },
   ) {
     if (input.providerID !== ProviderID.kilo) return undefined
-    if (!input.modelID.startsWith("kilo-auto/")) return undefined
+    if (!input.modelID.startsWith("kilo-auto/") && !input.modelID.includes("fable")) return undefined
     const model = read(meta, input.providerID)
     if (!model) return undefined
     if (model.modelID === input.modelID || model.modelID === input.selected) return undefined

From 2746e69a138189ba7d6aba1f8e78c619cb60794b Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 15:06:23 -0400
Subject: [PATCH 04/68] feat(jetbrains): download CLI releases at runtime

---
 .changeset/jetbrains-download-cli.md          |   5 +
 packages/kilo-jetbrains/.gitignore            |   5 +
 packages/kilo-jetbrains/AGENTS.md             |  21 +--
 packages/kilo-jetbrains/README.md             |  21 +--
 .../kilo-jetbrains/backend/build.gradle.kts   |  62 +++----
 .../ai/kilocode/backend/app/KiloAppState.kt   |   1 +
 .../backend/app/KiloBackendAppService.kt      |   9 +-
 .../app/KiloBackendConnectionService.kt       |  13 +-
 .../backend/app/KiloBackendSessionManager.kt  |  10 +-
 .../ai/kilocode/backend/cli/CliServer.kt      |   8 +-
 .../backend/cli/KiloBackendCliManager.kt      |  74 +-------
 .../kilocode/backend/cli/KiloCliDownloader.kt | 129 ++++++++++++++
 .../kilocode/backend/cli/KiloCliPlatform.kt   |  26 +++
 .../ai/kilocode/backend/cli/KiloProps.kt      |  16 ++
 .../kilocode/backend/rpc/KiloAppRpcApiImpl.kt |  17 +-
 .../kilocode/backend/app/KiloAppStateTest.kt  |   1 +
 .../backend/app/KiloBackendAppServiceTest.kt  |  48 ++++-
 .../backend/app/KiloConnectionServiceTest.kt  |  43 ++++-
 .../backend/cli/KiloCliDownloaderTest.kt      | 104 +++++++++++
 .../kilocode/backend/testing/FakeCliServer.kt |   7 +-
 .../build-tasks/build.gradle.kts              |   1 +
 .../src/main/kotlin/BuildTasksPlugin.kt       |   4 +-
 .../src/main/kotlin/CheckCliTask.kt           |  59 ------
 .../main/kotlin/GenerateOpenApiSpecTask.kt    | 168 ++++++++++++------
 .../src/main/kotlin/PrepareLocalCliTask.kt    | 139 ---------------
 packages/kilo-jetbrains/build.gradle.kts      |  14 +-
 .../ai/kilocode/client/app/KiloAppService.kt  |  28 ++-
 .../ai/kilocode/client/session/SessionUi.kt   |   7 +
 .../session/controller/SessionController.kt   |   8 +
 .../controller/SessionControllerEvent.kt      |   4 +
 .../client/session/ui/ConnectionPanel.kt      |  18 ++
 .../session/ui/empty/EmptySessionPanel.kt     |  23 ++-
 .../settings/profile/LoggedOutProfileUi.kt    |   2 +-
 .../client/settings/profile/ProfileUi.kt      |   2 +-
 .../resources/messages/KiloBundle.properties  |   3 +
 .../client/session/ui/ConnectionPanelTest.kt  |  14 ++
 .../session/ui/EmptySessionPanelTest.kt       |  17 ++
 .../kilocode/client/testing/FakeAppRpcApi.kt  |   6 +
 .../kilo-jetbrains/gradle/libs.versions.toml  |   2 +
 .../kilo-jetbrains/script/build-version.sh    |  10 +-
 packages/kilo-jetbrains/script/build.ts       | 117 +-----------
 .../kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt   |   3 +
 .../ai/kilocode/rpc/dto/KiloAppStateDto.kt    |   4 +
 43 files changed, 725 insertions(+), 548 deletions(-)
 create mode 100644 .changeset/jetbrains-download-cli.md
 create mode 100644 packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
 create mode 100644 packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliPlatform.kt
 create mode 100644 packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloProps.kt
 create mode 100644 packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
 delete mode 100644 packages/kilo-jetbrains/build-tasks/src/main/kotlin/CheckCliTask.kt
 delete mode 100644 packages/kilo-jetbrains/build-tasks/src/main/kotlin/PrepareLocalCliTask.kt

diff --git a/.changeset/jetbrains-download-cli.md b/.changeset/jetbrains-download-cli.md
new file mode 100644
index 0000000000..013e629935
--- /dev/null
+++ b/.changeset/jetbrains-download-cli.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Download the pinned Kilo CLI release at connect time instead of bundling CLI binaries in the plugin.
diff --git a/packages/kilo-jetbrains/.gitignore b/packages/kilo-jetbrains/.gitignore
index e44cae7a20..27ac8545f7 100644
--- a/packages/kilo-jetbrains/.gitignore
+++ b/packages/kilo-jetbrains/.gitignore
@@ -16,3 +16,8 @@ bin/
 **/.kotlin/
 **/bin/
 !gradle/wrapper/gradle-wrapper.jar
+
+# Downloaded CLI artifacts
+**/cli-cache/
+kilo-*.zip
+kilo-*.tar.gz
diff --git a/packages/kilo-jetbrains/AGENTS.md b/packages/kilo-jetbrains/AGENTS.md
index 5374daaa28..05dbd6c0d1 100644
--- a/packages/kilo-jetbrains/AGENTS.md
+++ b/packages/kilo-jetbrains/AGENTS.md
@@ -14,7 +14,7 @@
 
 - `plugin.xml` `<content>` entries ↔ module XML descriptors (`kilo.jetbrains.{shared,frontend,backend}.xml`)
 - Service classes ↔ `<applicationService>`/`<projectService>` entries in the corresponding module XML
-- `script/build.ts` platform list ↔ `backend/build.gradle.kts` `requiredPlatforms` list
+- `packages/kilo-jetbrains/package.json` version ↔ GitHub CLI release tag consumed by the backend downloader
 
 ## IntelliJ Platform Source Lookup
 
@@ -153,7 +153,9 @@ For blocking I/O in coroutines, move the dispatcher switch inside the callee usi
 
 ## CLI Integration
 
-- CLI process spawning, extraction, and lifecycle belong in `backend`.
+- CLI process spawning, download, extraction, and lifecycle belong in `backend`.
+- 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` for split-mode RPC and runtime use.
+- The generated API client is produced from the pinned release binary by running `kilo generate` during the Gradle OpenAPI generation task.
 - 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")`.
 - Detect OS with `com.intellij.openapi.util.SystemInfo.isMac` / `isLinux` / `isWindows`.
@@ -187,22 +189,21 @@ For blocking I/O in coroutines, move the dispatcher switch inside the callee usi
 
 ## Build and Verification
 
-- **Marketplace version build**: Use `script/build-version.sh <version>` from `packages/kilo-jetbrains/` to clean, prepare production CLI binaries, build, sign, and verify the JetBrains Marketplace plugin ZIP. Pass `--skip-verification` only when explicitly needed.
+- **Marketplace version build**: Use `script/build-version.sh <version>` from `packages/kilo-jetbrains/` to clean, build, sign, and verify the JetBrains Marketplace plugin ZIP. Pass `--skip-verification` only when explicitly needed.
 - **Test version build**: If the user asks for a JetBrains test build, still require a version and use `script/build-version.sh <version> --skip-signing --skip-verification` from `packages/kilo-jetbrains/` so no signing secrets are needed. Add `--skip-clean` only when the user wants a faster incremental test build.
 - **Typecheck**: `bun run typecheck` or `./gradlew typecheck` from `packages/kilo-jetbrains/` — compiles all Kotlin sources including the generated API client. Does NOT require CLI binaries.
-- **Full build**: `bun run build` from `packages/kilo-jetbrains/` (prepares CLI binaries + runs Gradle `buildPlugin`).
-- **Gradle only**: `./gradlew buildPlugin` from `packages/kilo-jetbrains/` (requires CLI binaries already present in `backend/build/generated/cli/`; run `bun run build --prepare-cli` first).
+- **Full build**: `bun run build` from `packages/kilo-jetbrains/` (runs Gradle `buildPlugin`).
+- **Gradle only**: `./gradlew buildPlugin` from `packages/kilo-jetbrains/`.
 - **Java checks**: Do not run `java -version` as a routine preflight. Gradle commands already fail clearly when Java is missing or incompatible; check Java only when diagnosing that failure mode.
 - **Via Turbo**: `bun turbo build --filter=@kilocode/kilo-jetbrains` from repo root.
-- **Run split mode**: `./gradlew --no-configuration-cache runIdeSplitMode` or the checked-in `Run IDE (Split Mode)` configuration — launches backend and frontend locally and prepares the local-platform CLI binary automatically. Emulate latency via the Split Mode widget (requires internal mode: `-Didea.is.internal=true`).
-- **Run split backend**: `./gradlew --no-configuration-cache runIdeBackend` — prepares the local-platform CLI binary automatically; if it exits shortly after startup, check for an orphaned Java process from a previous backend run and kill it before restarting.
+- **Run split mode**: `./gradlew --no-configuration-cache runIdeSplitMode` or the checked-in `Run IDE (Split Mode)` configuration — launches backend and frontend locally. Emulate latency via the Split Mode widget (requires internal mode: `-Didea.is.internal=true`).
+- **Run split backend**: `./gradlew --no-configuration-cache runIdeBackend` — if it exits shortly after startup, check for an orphaned Java process from a previous backend run and kill it before restarting.
 - **Run in monolithic sandbox**: `./gradlew runIde` — launches sandboxed IntelliJ with the plugin. Does NOT build CLI binaries.
 
 ### CLI/SDK Change Awareness
 
-- JetBrains runtime behavior depends on the bundled CLI artifact under `backend/build/generated/cli/`; Gradle-only tasks and sandbox runs do not rebuild it.
-- If there are relevant changes outside `packages/kilo-jetbrains/` in the CLI (`packages/opencode/`) or SDK/API generation paths (`packages/sdk/js/`, server endpoints, OpenAPI outputs), warn the user that the JetBrains run may be using stale generated CLI or SDK artifacts.
-- Do not regenerate or rebuild those artifacts automatically just because such changes exist. Ask the user whether to refresh them first, typically with `bun run build --prepare-cli` from `packages/kilo-jetbrains/` for CLI artifacts and `./script/generate.ts` from the repo root for server/API SDK changes.
+- JetBrains runtime behavior depends on the downloaded CLI release pinned by `packages/kilo-jetbrains/package.json`; local `packages/opencode/` changes are not used unless published and pinned.
+- If there are relevant server/API changes outside `packages/kilo-jetbrains/`, warn the user that JetBrains may need a newly published/pinned CLI release and regenerated SDK artifacts.
 
 ## UI Guidelines
 
diff --git a/packages/kilo-jetbrains/README.md b/packages/kilo-jetbrains/README.md
index 78978d6633..d35a08a806 100644
--- a/packages/kilo-jetbrains/README.md
+++ b/packages/kilo-jetbrains/README.md
@@ -10,7 +10,7 @@ To try the v7 Early Access Program plugin, follow the [JetBrains EAP installatio
 
 ### Prerequisites
 
-- **Bun** -- used to build CLI binaries and run build scripts
+- **Bun** -- used to run package build scripts
 - **JDK 21+** -- required by Gradle and the IntelliJ Platform SDK. Check with `java -version`. The preferred way to install is via [SDKMAN](https://sdkman.io/install):
 
   ```bash
@@ -34,7 +34,7 @@ When working in a git worktree (e.g. via the Agent Manager), run `bun install` f
 bun install
 ```
 
-This installs Node dependencies required by the build scripts, including `script/build.ts` which prepares CLI binaries.
+This installs Node dependencies required by the build scripts.
 
 ---
 
@@ -52,7 +52,7 @@ From `packages/kilo-jetbrains/`:
 bun run build
 ```
 
-This builds the CLI binary for your current OS/arch only, copies it into the backend module resources, and runs `./gradlew buildPlugin`. The plugin archive is output to `build/distributions/`.
+This builds the plugin without bundling CLI binaries. The backend downloads the pinned Kilo CLI release for the host platform at connect time. The plugin archive is output to `build/distributions/`.
 
 Or via Turbo from the repo root:
 
@@ -70,7 +70,7 @@ From `packages/kilo-jetbrains/`:
 bun run build:production
 ```
 
-This builds CLI binaries for all 6 desktop platforms (darwin-arm64, darwin-x64, linux-arm64, linux-x64, windows-x64, windows-arm64), copies them all into the backend jar, and fails if any are missing. Gradle also validates all platforms are present via `-Pproduction=true`.
+This builds the plugin without bundling CLI binaries. The backend downloads the pinned Kilo CLI release for the host platform at connect time.
 
 The built plugin archive is at `build/distributions/kilo.jetbrains-<version>.zip`. This zip can be installed in any JetBrains IDE via **Settings > Plugins > Install Plugin from Disk**.
 
@@ -84,15 +84,15 @@ See [RELEASING.md](RELEASING.md) for the full release process, including how to
 
 ## Run the plugin
 
-Use the checked-in `Run IDE (Split Mode)` run configuration (or `./gradlew --no-configuration-cache runIdeSplitMode` from `packages/kilo-jetbrains/`) to launch the backend and frontend halves of a local split-mode sandbox. The task prepares the local-platform CLI binary automatically when `backend/build/generated/cli/cli/` does not contain the expected binary.
+Use the checked-in `Run IDE (Split Mode)` run configuration (or `./gradlew --no-configuration-cache runIdeSplitMode` from `packages/kilo-jetbrains/`) to launch the backend and frontend halves of a local split-mode sandbox. The backend downloads the pinned CLI release on first connect.
 
-Use `runIde` only when you need a monolithic sandboxed IntelliJ instance. `runIde` does not prepare the CLI binary automatically, so run `bun run build --prepare-cli` from `packages/kilo-jetbrains/` first to copy the local-platform binary into `backend/build/generated/cli/cli/`.
+Use `runIde` only when you need a monolithic sandboxed IntelliJ instance.
 
-Production packaging still requires running `bun run build:production` so all platform binaries are present.
+Production packaging uses `bun run build:production` and still downloads the host CLI at runtime.
 
 ### Run the split backend
 
-Use the checked-in `Run IDE (Backend)` run configuration (or `./gradlew --no-configuration-cache runIdeBackend`) to launch just the backend half of a split-mode session. It prepares the local-platform CLI binary automatically when `backend/build/generated/cli/cli/` does not contain the expected binary.
+Use the checked-in `Run IDE (Backend)` run configuration (or `./gradlew --no-configuration-cache runIdeBackend`) to launch just the backend half of a split-mode session.
 
 If `Run IDE (Backend)` exits shortly after startup, check for an orphaned Java process from a previous backend run and kill it before restarting the backend.
 
@@ -107,7 +107,6 @@ All properties below are passed with `-P` on the Gradle command line or in the r
 | `kilo.splitModeServerPort` | `0` | Backend split-mode server port. `0` or omitted lets the IntelliJ Platform Gradle Plugin pick a free port when the task runs. |
 | `kilo.dev.storage.isolated` | `false` | When `true`, CLI runs with `XDG_*_HOME` pointing to `.kilo-dev/` in the worktree root, fully isolating dev storage from your real Kilo installation. Enabled by default in the checked-in split-mode run configurations. |
 | `kilo.dev.worktree.root` | monorepo root | Worktree root used to resolve `.kilo-dev/`. Auto-detected from the Gradle project directory; override only when the auto-detection is wrong. |
-| `kilo.bun.path` | `bun` on `$PATH` | Absolute path to Bun. Set this when IntelliJ-launched Gradle cannot find Bun automatically. |
 
 The checked-in IDE run configurations pass `--no-configuration-cache` because the IntelliJ Platform Gradle Plugin run-IDE tasks are not configuration-cache compatible in this setup.
 They also pass `--purge-old-log-directories` so stale sandbox logs do not hide the current backend and frontend `kilo-dev.log` files.
@@ -195,9 +194,7 @@ For direct local packaging, run:
 bun run build
 ```
 
-This prepares the local CLI binary and then runs `./gradlew buildPlugin`.
-
-If you run `./gradlew buildPlugin` directly, Gradle verifies CLI binaries are present but does not build them first. Run `bun run build --prepare-cli` beforehand if the binaries are missing.
+This runs `./gradlew buildPlugin`.
 
 For production verification:
 
diff --git a/packages/kilo-jetbrains/backend/build.gradle.kts b/packages/kilo-jetbrains/backend/build.gradle.kts
index 8139adcb75..65da6183ab 100644
--- a/packages/kilo-jetbrains/backend/build.gradle.kts
+++ b/packages/kilo-jetbrains/backend/build.gradle.kts
@@ -1,4 +1,5 @@
 import normalization.NormalizeOpenApiSpecTask
+import org.gradle.api.tasks.WriteProperties
 
 plugins {
     alias(libs.plugins.rpc)
@@ -15,18 +16,32 @@ kotlin {
 val generatedApi = layout.buildDirectory.dir("generated/openapi/src/main/kotlin")
 val rawSpec = layout.buildDirectory.file("generated/openapi-spec/openapi.raw.json")
 val generatedSpec = layout.buildDirectory.file("generated/openapi-spec/openapi.json")
+val generatedProps = layout.buildDirectory.dir("generated/kilo-props")
+
+val pinnedCliVersion = providers.provider {
+    val text = rootProject.layout.projectDirectory.file("package.json").asFile.readText()
+    Regex("\"version\"\\s*:\\s*\"([^\"]+)\"").find(text)?.groupValues?.get(1)
+        ?: error("Could not read version from package.json")
+}
 
 sourceSets {
     main {
-        resources.srcDir(layout.buildDirectory.dir("generated/cli"))
+        resources.srcDir(generatedProps)
         kotlin.srcDir(generatedApi)
     }
 }
 
+val writeKiloProperties by tasks.registering(WriteProperties::class) {
+    description = "Write pinned Kilo CLI properties"
+    val out = generatedProps.map { it.file("kilo.properties") }
+    destinationFile.set(out)
+    property("cli.version", pinnedCliVersion)
+}
+
 val generateOpenApiSpec by tasks.registering(GenerateOpenApiSpecTask::class) {
     description = "Generate CLI OpenAPI spec into the build directory"
-    opencodeDir.set(rootProject.layout.projectDirectory.dir("../opencode"))
-    serverSrcDir.set(rootProject.layout.projectDirectory.dir("../opencode/src/server"))
+    cliVersion.set(pinnedCliVersion)
+    cacheDir.set(layout.buildDirectory.dir("cli-cache"))
     spec.set(rawSpec)
 }
 
@@ -83,49 +98,19 @@ val fixGeneratedApi by tasks.registering(FixGeneratedApiTask::class) {
 }
 
 tasks.named("compileKotlin") {
-    dependsOn(fixGeneratedApi)
+    dependsOn(fixGeneratedApi, writeKiloProperties)
     inputs.dir(generatedApi)
 }
 
+tasks.named("processResources") {
+    dependsOn(writeKiloProperties)
+}
+
 tasks.named("compileTestKotlin") {
     dependsOn(fixGeneratedApi)
     inputs.dir(generatedApi)
 }
 
-val cliDir = layout.buildDirectory.dir("generated/cli/cli")
-val production = providers.gradleProperty("production").map { it.toBoolean() }.orElse(false)
-
-val prepareLocalCli by tasks.registering(PrepareLocalCliTask::class) {
-    description = "Prepare the local-platform CLI binary for JetBrains backend runs"
-    root.set(rootProject.layout.projectDirectory)
-    dir.set(cliDir)
-    bunPath.convention(
-        providers.gradleProperty("kilo.bun.path")
-            .orElse(providers.environmentVariable("BUN_EXE"))
-    )
-}
-
-val requiredPlatforms = listOf(
-    "darwin-arm64",
-    "darwin-x64",
-    "linux-arm64",
-    "linux-x64",
-    "windows-x64",
-    "windows-arm64",
-)
-
-val prod = production
-val checkCli by tasks.registering(CheckCliTask::class) {
-    description = "Verify CLI binaries exist before packaging"
-    dir.set(cliDir)
-    this.production.set(prod)
-    platforms.set(requiredPlatforms)
-}
-
-// CLI binaries are verified only at packaging time (buildPlugin), not at
-// processResources time, so that Kotlin compile and tests work without binaries.
-// Wire checkCli to buildPlugin in the root build.gradle.kts instead.
-
 dependencies {
     intellijPlatform {
         intellijIdea(libs.versions.intellij.platform)
@@ -137,6 +122,7 @@ dependencies {
     implementation(project(":shared"))
     implementation(libs.okhttp)
     implementation(libs.okhttp.sse)
+    implementation(libs.commons.compress)
     implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.okhttp.mockwebserver)
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt
index d6e1c67c08..275fca284a 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt
@@ -14,6 +14,7 @@ import ai.kilocode.rpc.dto.ConfigDto
  */
 sealed class KiloAppState {
     data object Disconnected : KiloAppState()
+    data class Downloading(val percent: Int, val version: String, val platform: String) : KiloAppState()
     data object Connecting : KiloAppState()
     data class Loading(val progress: LoadProgress) : KiloAppState()
     data class MigrationRequired(val detection: LegacyMigrationDetection) : KiloAppState()
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
index e692df9ca6..5b3cefd0b7 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
@@ -146,7 +146,7 @@ class KiloBackendAppService private constructor(
     suspend fun connect() {
         mutex.withLock {
             val current = _appState.value
-            if (current is KiloAppState.Ready || current is KiloAppState.Connecting || current is KiloAppState.Loading || current is KiloAppState.MigrationRequired) return
+            if (current is KiloAppState.Ready || current is KiloAppState.Downloading || current is KiloAppState.Connecting || current is KiloAppState.Loading || current is KiloAppState.MigrationRequired) return
             ensureWatcher()
             connection.connect()
         }
@@ -179,6 +179,7 @@ class KiloBackendAppService private constructor(
                     ensureWatcher()
                     connection.connect()
                 }
+                is KiloAppState.Downloading,
                 KiloAppState.Connecting,
                 is KiloAppState.Loading -> Unit
                 is KiloAppState.MigrationRequired -> {
@@ -231,10 +232,11 @@ class KiloBackendAppService private constructor(
         when (_appState.value) {
             is KiloAppState.Ready -> return
             is KiloAppState.MigrationRequired -> throw IllegalStateException("Migration required")
+            is KiloAppState.Downloading,
             is KiloAppState.Loading,
             KiloAppState.Connecting -> {
                 val state = withTimeoutOrNull(timeoutMs) {
-                    appState.first { it !is KiloAppState.Loading && it !is KiloAppState.Connecting }
+                    appState.first { it !is KiloAppState.Downloading && it !is KiloAppState.Loading && it !is KiloAppState.Connecting }
                 }
                 when (state) {
                     is KiloAppState.Ready -> return
@@ -292,7 +294,7 @@ class KiloBackendAppService private constructor(
     private suspend fun reconnect() {
         mutex.withLock {
             val current = _appState.value
-            if (current is KiloAppState.Ready || current is KiloAppState.Loading || current is KiloAppState.MigrationRequired) {
+            if (current is KiloAppState.Ready || current is KiloAppState.Downloading || current is KiloAppState.Loading || current is KiloAppState.MigrationRequired) {
                 log.info("reconnect: already ${current::class.simpleName} — skipping")
                 return
             }
@@ -307,6 +309,7 @@ class KiloBackendAppService private constructor(
             connection.state.collect { next ->
                 when (next) {
                     ConnectionState.Disconnected -> _appState.value = KiloAppState.Disconnected
+                    is ConnectionState.Downloading -> _appState.value = KiloAppState.Downloading(next.percent, next.version, next.platform)
                     ConnectionState.Connecting -> _appState.value = KiloAppState.Connecting
                     is ConnectionState.Connected -> {
                         load()
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt
index aa4300c4c4..bce451fc1e 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt
@@ -1,8 +1,8 @@
 package ai.kilocode.backend.app
 
+import ai.kilocode.backend.cli.CliServer
 import ai.kilocode.backend.cli.KiloBackendHttpClients
 import ai.kilocode.backend.cli.KiloCliDataParser
-import ai.kilocode.backend.cli.CliServer
 import ai.kilocode.log.ChatLogSummary
 import ai.kilocode.log.KiloLog
 import ai.kilocode.jetbrains.api.client.DefaultApi
@@ -32,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference
 
 sealed class ConnectionState {
     data object Disconnected : ConnectionState()
+    data class Downloading(val percent: Int, val version: String, val platform: String) : ConnectionState()
     data object Connecting : ConnectionState()
     data class Connected(val port: Int, val password: String) : ConnectionState()
     data class Error(val message: String, val details: String? = null) : ConnectionState()
@@ -144,7 +145,7 @@ class KiloConnectionService(
     }
 
     /**
-     * Kill the CLI process, re-extract the binary from JAR, and restart.
+     * Kill the CLI process, re-download the binary, and restart.
      *
      * Called under [KiloBackendAppService]'s mutex.
      */
@@ -153,7 +154,7 @@ class KiloConnectionService(
         teardown()
         log.info("reinstall: teardown complete — setting forceExtract flag")
         server.forceExtract = true
-        log.info("reinstall: spawning new CLI process (binary will be re-extracted)")
+        log.info("reinstall: spawning new CLI process (binary will be re-downloaded)")
         open()
         log.info("reinstall: open() returned — CLI process started with fresh binary")
     }
@@ -190,7 +191,10 @@ class KiloConnectionService(
 
         setState(ConnectionState.Connecting)
 
-        val result = server.init()
+        val result = server.init(
+            onProgress = { item -> setState(ConnectionState.Downloading(item.percent, item.version, item.platform)) },
+            onResolved = { setState(ConnectionState.Connecting) },
+        )
 
         if (result is CliServer.State.Error) {
             setState(ConnectionState.Error(result.message, result.details))
@@ -198,6 +202,7 @@ class KiloConnectionService(
         }
 
         val ready = result as CliServer.State.Ready
+        setState(ConnectionState.Connecting)
         port = ready.port
         password = ready.password
 
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
index e124accafc..51dbab9728 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
@@ -292,15 +292,15 @@ class KiloBackendSessionManager(
         title = s.title,
         version = s.version,
         time = SessionTimeDto(
-            created = s.time.created.toDouble(),
-            updated = s.time.updated.toDouble(),
+            created = s.time.created?.toDouble() ?: 0.0,
+            updated = s.time.updated?.toDouble() ?: 0.0,
             archived = s.time.archived,
         ),
         summary = s.summary?.let {
             SessionSummaryDto(
-                additions = it.additions.safeInt(),
-                deletions = it.deletions.safeInt(),
-                files = it.files.safeInt(),
+                additions = it.additions?.safeInt() ?: 0,
+                deletions = it.deletions?.safeInt() ?: 0,
+                files = it.files?.safeInt() ?: 0,
             )
         },
     )
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/CliServer.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/CliServer.kt
index f36f917acb..f0418d926a 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/CliServer.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/CliServer.kt
@@ -13,8 +13,14 @@ interface CliServer {
 
     var forceExtract: Boolean
     fun process(): Process?
-    suspend fun init(): State
+    suspend fun init(onProgress: (CliDownload) -> Unit = {}, onResolved: () -> Unit = {}): State
     fun exited(proc: Process)
     fun stop()
     fun dispose()
 }
+
+data class CliDownload(
+    val percent: Int,
+    val version: String,
+    val platform: String,
+)
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 a8cfdb07a3..fe8dcb992c 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
@@ -5,8 +5,6 @@ import ai.kilocode.backend.dev.KiloDevMode
 import ai.kilocode.log.KiloLog
 import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.PathManager
-import com.intellij.openapi.util.SystemInfo
-import com.intellij.util.system.CpuArch
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
@@ -20,7 +18,7 @@ import java.util.concurrent.TimeUnit
 /**
  * Manages the Kilo CLI binary lifecycle.
  *
- * Extracts the bundled CLI from JAR resources into IntelliJ's system directory,
+ * Downloads the pinned CLI into IntelliJ's system directory,
  * spawns `kilo serve --port 0`, and exposes the result as [State].
  *
  * Concurrency is handled by the owning [KiloBackendAppService] — all public
@@ -50,9 +48,10 @@ class KiloBackendCliManager(
 
     override fun process(): Process? = process
 
-    override suspend fun init(): CliServer.State {
+    override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit): CliServer.State {
         return try {
-            val path = extractCli()
+            val path = resolveCli(onProgress)
+            onResolved()
             log.info("CLI binary path: ${path.absolutePath} (size=${path.length()} bytes)")
             withTimeout(STARTUP_TIMEOUT_MS) {
                 spawn(path)
@@ -84,51 +83,11 @@ class KiloBackendCliManager(
         cleanup(proc, "stop()")
     }
 
-    private fun extractCli(): File {
-        val platform = platform()
-        val exe = if (SystemInfo.isWindows) "kilo.exe" else "kilo"
-        val target = File(PathManager.getSystemPath(), "kilo/bin/$exe")
-        val worker = File(target.parentFile, "kilo-sandbox-mutation-worker.js")
-
-        if (forceExtract) {
-            log.info("Force re-extracting CLI resources under ${target.parentFile.absolutePath}")
-            if (target.exists()) target.delete()
-            if (worker.exists()) worker.delete()
-            forceExtract = false
-        }
-
-        extractResource("cli/$platform/$exe", target, executable = true)
-        if (worker.exists()) worker.delete()
-        extractResource("cli/$platform/kilo-sandbox-mutation-worker.js", worker, executable = false)
-        return target
-    }
-
-    private fun extractResource(resource: String, target: File, executable: Boolean) {
-        val loader = javaClass.classLoader
-        val url = loader.getResource(resource)
-            ?: throw IllegalStateException("CLI resource not found in JAR resources at $resource")
-
-        val size = url.openConnection().contentLengthLong
-        if (size >= 0 && target.exists() && target.length() == size) {
-            log.info("CLI resource up-to-date at ${target.absolutePath}")
-            if (executable && !SystemInfo.isWindows) {
-                target.setExecutable(true)
-            }
-            return
-        }
-
-        log.info("Extracting CLI resource to ${target.absolutePath}")
-        target.parentFile.mkdirs()
-
-        url.openStream().use { input ->
-            target.outputStream().use { output ->
-                input.copyTo(output)
-            }
-        }
-
-        if (executable && !SystemInfo.isWindows) {
-            target.setExecutable(true)
-        }
+    private suspend fun resolveCli(onProgress: (CliDownload) -> Unit): File {
+        val force = forceExtract
+        forceExtract = false
+        if (force) log.info("Force re-downloading CLI ${KiloProps.cliVersion()}")
+        return KiloCliDownloader(log = log).resolve(KiloProps.cliVersion(), force, onProgress)
     }
 
     // Must be called from a background thread — devStorageEnv() performs blocking I/O (mkdirs).
@@ -267,21 +226,6 @@ class KiloBackendCliManager(
         runCatching { proc.outputStream.close() }.onFailure { log.info("CLI stdin stream close skipped: ${it.message}") }
     }
 
-    private fun platform(): String {
-        val os = when {
-            SystemInfo.isMac -> "darwin"
-            SystemInfo.isLinux -> "linux"
-            SystemInfo.isWindows -> "windows"
-            else -> throw IllegalStateException("Unsupported OS: ${System.getProperty("os.name")}")
-        }
-        val arch = when (CpuArch.CURRENT) {
-            CpuArch.ARM64 -> "arm64"
-            CpuArch.X86_64 -> "x64"
-            else -> throw IllegalStateException("Unsupported architecture: ${CpuArch.CURRENT}")
-        }
-        return "$os-$arch"
-    }
-
     private fun generatePassword(): String {
         val bytes = ByteArray(32)
         SecureRandom().nextBytes(bytes)
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
new file mode 100644
index 0000000000..22cdf29277
--- /dev/null
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -0,0 +1,129 @@
+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
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
+import java.io.File
+import java.util.zip.ZipInputStream
+import kotlin.math.roundToInt
+
+class KiloCliDownloader(
+    private val http: OkHttpClient = OkHttpClient(),
+    private val log: KiloLog = KiloLog.create(KiloCliDownloader::class.java),
+    private val root: File = File(PathManager.getSystemPath(), "kilo/cli"),
+    private val baseUrl: String = "https://github.com/Kilo-Org/kilocode/releases/download",
+) {
+    suspend fun resolve(version: String, force: Boolean = false, onProgress: (CliDownload) -> Unit = {}): File =
+        withContext(Dispatchers.IO) {
+            val platform = KiloCliPlatform.current()
+            val dir = File(File(root, version), platform)
+            val exe = File(dir, "bin/${KiloCliPlatform.exe()}")
+            val done = File(dir, ".complete")
+
+            if (force && dir.exists()) {
+                log.info("Deleting cached CLI $version under ${dir.absolutePath}")
+                dir.deleteRecursively()
+            }
+
+            if (exe.isFile && done.isFile) {
+                log.info("Using cached Kilo CLI $version for $platform at ${exe.absolutePath}")
+                if (!SystemInfo.isWindows) exe.setExecutable(true)
+                return@withContext exe
+            }
+
+            log.info("Kilo CLI $version for $platform is not cached; downloading new release into ${dir.absolutePath}")
+            dir.mkdirs()
+            val ext = KiloCliPlatform.archive(platform)
+            val archive = File(dir, "kilo-$platform.$ext")
+            onProgress(CliDownload(0, version, platform))
+            download(version, platform, ext, archive, onProgress)
+            log.info("Downloaded Kilo CLI $version for $platform to ${archive.absolutePath} (size=${archive.length()} bytes)")
+            extract(archive, dir)
+            if (!exe.isFile) throw IllegalStateException("Downloaded CLI archive did not contain bin/${KiloCliPlatform.exe()}")
+            if (!SystemInfo.isWindows) exe.setExecutable(true)
+            done.writeText("ok\n")
+            onProgress(CliDownload(100, version, platform))
+            exe
+        }
+
+    private fun download(version: String, platform: String, ext: String, file: File, onProgress: (CliDownload) -> Unit) {
+        val url = url(version, platform, ext)
+        log.info("Downloading Kilo CLI $version for $platform from $url")
+        val request = Request.Builder().url(url).build()
+        http.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) {
+                throw IllegalStateException("Failed to download Kilo CLI $version for $platform: HTTP ${response.code}")
+            }
+            val body = response.body ?: throw IllegalStateException("Failed to download Kilo CLI $version: empty response body")
+            val total = body.contentLength()
+            var read = 0L
+            var last = 0
+            file.outputStream().use { output ->
+                body.byteStream().use { input ->
+                    val buffer = ByteArray(8 * 1024)
+                    while (true) {
+                        val n = input.read(buffer)
+                        if (n < 0) break
+                        output.write(buffer, 0, n)
+                        read += n
+                        if (total > 0) {
+                            val pct = ((read.toDouble() / total.toDouble()) * 100.0).roundToInt().coerceIn(0, 100)
+                            if (pct != last) {
+                                last = pct
+                                onProgress(CliDownload(pct, version, platform))
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun extract(file: File, dir: File) {
+        log.info("Extracting Kilo CLI archive ${file.absolutePath}")
+        if (file.name.endsWith(".zip")) {
+            ZipInputStream(file.inputStream().buffered()).use { zip ->
+                while (true) {
+                    val entry = zip.nextEntry ?: break
+                    write(dir, entry.name, entry.isDirectory) { out -> zip.copyTo(out) }
+                    zip.closeEntry()
+                }
+            }
+            return
+        }
+
+        TarArchiveInputStream(GzipCompressorInputStream(file.inputStream().buffered())).use { tar ->
+            while (true) {
+                val entry = tar.nextEntry ?: break
+                write(dir, entry.name, entry.isDirectory) { out -> tar.copyTo(out) }
+            }
+        }
+    }
+
+    private fun write(dir: File, name: String, directory: Boolean, copy: (java.io.OutputStream) -> Unit) {
+        val path = if (name.startsWith("bin/")) name else "bin/$name"
+        val target = File(dir, path).canonicalFile
+        val base = dir.canonicalFile
+        if (target != base && !target.path.startsWith(base.path + File.separator)) {
+            throw IllegalStateException("Archive entry escapes target directory: $name")
+        }
+        if (directory) {
+            target.mkdirs()
+            return
+        }
+        target.parentFile.mkdirs()
+        target.outputStream().use(copy)
+        if (!SystemInfo.isWindows && (target.name == "kilo" || target.name == "bwrap")) {
+            target.setExecutable(true)
+        }
+    }
+
+    private fun url(version: String, platform: String, ext: String) =
+        "${baseUrl.trimEnd('/')}/v$version/kilo-$platform.$ext"
+}
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliPlatform.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliPlatform.kt
new file mode 100644
index 0000000000..86b494da6a
--- /dev/null
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliPlatform.kt
@@ -0,0 +1,26 @@
+package ai.kilocode.backend.cli
+
+import com.intellij.openapi.util.SystemInfo
+import com.intellij.util.system.CpuArch
+
+internal object KiloCliPlatform {
+    fun current(): String {
+        val os = when {
+            SystemInfo.isMac -> "darwin"
+            SystemInfo.isLinux -> "linux"
+            SystemInfo.isWindows -> "windows"
+            else -> throw IllegalStateException("Unsupported OS: ${System.getProperty("os.name")}")
+        }
+        val arch = when (CpuArch.CURRENT) {
+            CpuArch.ARM64 -> "arm64"
+            CpuArch.X86_64 -> "x64"
+            else -> throw IllegalStateException("Unsupported architecture: ${CpuArch.CURRENT}")
+        }
+        return "$os-$arch"
+    }
+
+    fun exe(): String = if (SystemInfo.isWindows) "kilo.exe" else "kilo"
+
+    fun archive(platform: String = current()): String =
+        if (platform.startsWith("linux-")) "tar.gz" else "zip"
+}
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloProps.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloProps.kt
new file mode 100644
index 0000000000..888a18f6ce
--- /dev/null
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloProps.kt
@@ -0,0 +1,16 @@
+package ai.kilocode.backend.cli
+
+import java.util.Properties
+
+object KiloProps {
+    private val props by lazy {
+        val stream = KiloProps::class.java.classLoader.getResourceAsStream("kilo.properties")
+            ?: throw IllegalStateException("kilo.properties resource not found")
+        stream.use {
+            Properties().apply { load(it) }
+        }
+    }
+
+    fun cliVersion(): String = props.getProperty("cli.version")
+        ?: throw IllegalStateException("cli.version missing from kilo.properties")
+}
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
index b593cb5dba..5c2691a6b1 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
@@ -9,6 +9,7 @@ import ai.kilocode.backend.app.ConfigWarning
 import ai.kilocode.backend.app.LoadError
 import ai.kilocode.backend.app.LoadProgress
 import ai.kilocode.backend.app.ProfileResult
+import ai.kilocode.backend.cli.KiloProps
 import ai.kilocode.jetbrains.api.model.KiloProfile200Response
 import ai.kilocode.rpc.dto.ConfigPatchDto
 import ai.kilocode.rpc.KiloAppRpcApi
@@ -51,6 +52,8 @@ class KiloAppRpcApiImpl : KiloAppRpcApi {
 
     override suspend fun health(): HealthDto = app.health()
 
+    override suspend fun cliVersion(): String = KiloProps.cliVersion()
+
     override suspend fun retry() = app.retry()
 
     override suspend fun restart() = app.restart()
@@ -109,6 +112,12 @@ class KiloAppRpcApiImpl : KiloAppRpcApi {
 internal fun appStateDto(state: KiloAppState): KiloAppStateDto =
     when (state) {
         KiloAppState.Disconnected -> KiloAppStateDto(KiloAppStatusDto.DISCONNECTED)
+        is KiloAppState.Downloading -> KiloAppStateDto(
+            status = KiloAppStatusDto.DOWNLOADING,
+            downloadPercent = state.percent,
+            downloadVersion = state.version,
+            downloadPlatform = state.platform,
+        )
         KiloAppState.Connecting -> KiloAppStateDto(KiloAppStatusDto.CONNECTING)
         is KiloAppState.Loading -> KiloAppStateDto(
             status = KiloAppStatusDto.LOADING,
@@ -143,12 +152,12 @@ internal fun profileDto(p: KiloProfile200Response): ProfileDto = ProfileDto(
     organizations = p.profile.organizations.orEmpty().map { org ->
         ProfileOrganizationDto(id = org.id, name = org.name, role = org.role)
     },
-    balance = p.balance?.let { ProfileBalanceDto(balance = it.balance) },
+    balance = p.balance?.let { ProfileBalanceDto(balance = it.balance ?: 0.0) },
     kiloPass = p.kiloPass?.let {
         ProfileKiloPassDto(
-            currentPeriodBaseCreditsUsd = it.currentPeriodBaseCreditsUsd,
-            currentPeriodUsageUsd = it.currentPeriodUsageUsd,
-            currentPeriodBonusCreditsUsd = it.currentPeriodBonusCreditsUsd,
+            currentPeriodBaseCreditsUsd = it.currentPeriodBaseCreditsUsd ?: 0.0,
+            currentPeriodUsageUsd = it.currentPeriodUsageUsd ?: 0.0,
+            currentPeriodBonusCreditsUsd = it.currentPeriodBonusCreditsUsd ?: 0.0,
             nextBillingAt = it.nextBillingAt,
         )
     },
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloAppStateTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloAppStateTest.kt
index 25bb6779ea..b7c4f73f4c 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloAppStateTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloAppStateTest.kt
@@ -39,6 +39,7 @@ class KiloAppStateTest {
     @Test
     fun `KiloAppState sealed subtypes are distinct`() {
         assertIs<KiloAppState.Disconnected>(KiloAppState.Disconnected)
+        assertIs<KiloAppState.Downloading>(KiloAppState.Downloading(42, "1.2.3", "darwin-arm64"))
         assertIs<KiloAppState.Connecting>(KiloAppState.Connecting)
         assertIs<KiloAppState.Loading>(KiloAppState.Loading(LoadProgress()))
         assertIs<KiloAppState.Error>(KiloAppState.Error("fail"))
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
index 7ba64fec23..ee9e145a7b 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
@@ -3,18 +3,21 @@ package ai.kilocode.backend.app
 import ai.kilocode.backend.app.KiloAppState
 import ai.kilocode.backend.app.KiloBackendAppService
 import ai.kilocode.backend.cli.CliServer
+import ai.kilocode.backend.cli.CliDownload
 import ai.kilocode.backend.rpc.appStateDto
 import ai.kilocode.backend.testing.FakeCliServer
 import ai.kilocode.backend.testing.MockCliServer
 import ai.kilocode.backend.testing.TestLog
 import ai.kilocode.rpc.dto.AgentConfigPatchDto
 import ai.kilocode.rpc.dto.ConfigPatchDto
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import kotlinx.coroutines.withTimeoutOrNull
@@ -67,7 +70,8 @@ class KiloBackendAppServiceTest {
 
         override fun process(): Process? = null
 
-        override suspend fun init(): CliServer.State {
+        override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit): CliServer.State {
+            onResolved()
             if (starts.getAndIncrement() == 0) {
                 val socket = ServerSocket(0)
                 srv = socket
@@ -102,6 +106,46 @@ class KiloBackendAppServiceTest {
         assertNotNull(ready.data.notifications)
     }
 
+    @Test
+    fun `download progress maps to app state before ready`() = runBlocking {
+        val resolved = CompletableDeferred<Unit>()
+        val ready = CompletableDeferred<Unit>()
+        val server = object : CliServer {
+            override var forceExtract = false
+            override fun process(): Process? = null
+            override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit): CliServer.State {
+                onProgress(CliDownload(37, "1.2.3", "darwin-arm64"))
+                resolved.await()
+                onResolved()
+                ready.await()
+                return CliServer.State.Ready(mock.start(), mock.password)
+            }
+            override fun exited(proc: Process) {}
+            override fun stop() {}
+            override fun dispose() {}
+        }
+        val svc = KiloBackendAppService.create(scope, server, log)
+        val job = scope.launch { svc.connect() }
+
+        val downloading = withTimeout(5_000) {
+            svc.appState.first { it is KiloAppState.Downloading }
+        }
+        assertEquals(KiloAppState.Downloading(37, "1.2.3", "darwin-arm64"), downloading)
+        val dto = appStateDto(downloading)
+        assertEquals(37, dto.downloadPercent)
+        assertEquals("1.2.3", dto.downloadVersion)
+        assertEquals("darwin-arm64", dto.downloadPlatform)
+
+        resolved.complete(Unit)
+        withTimeout(5_000) {
+            svc.appState.first { it == KiloAppState.Connecting }
+        }
+
+        ready.complete(Unit)
+        ready(svc)
+        job.join()
+    }
+
     @Test
     fun `shutdown for unload clears runtime and disposes server once`() = runBlocking {
         val server = FakeCliServer(mock)
@@ -389,7 +433,7 @@ class KiloBackendAppServiceTest {
         val failing = object : ai.kilocode.backend.cli.CliServer {
             override var forceExtract = false
             override fun process(): Process? = null
-            override suspend fun init() = ai.kilocode.backend.cli.CliServer.State.Error(
+            override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit) = ai.kilocode.backend.cli.CliServer.State.Error(
                 message = "CLI startup failed",
                 details = "stderr: missing dependency",
             )
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt
index 335b91e2e8..34cef9fecd 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt
@@ -1,12 +1,14 @@
 package ai.kilocode.backend.app
 
 import ai.kilocode.backend.cli.CliServer
+import ai.kilocode.backend.cli.CliDownload
 import ai.kilocode.backend.app.ConnectionState
 import ai.kilocode.backend.app.KiloConnectionService
 import ai.kilocode.backend.testing.FakeCliServer
 import ai.kilocode.backend.testing.MockCliServer
 import ai.kilocode.backend.testing.TestLog
 import ai.kilocode.log.KiloLog
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
@@ -78,6 +80,45 @@ class KiloConnectionServiceTest {
         assertTrue(svc.api != null)
     }
 
+    @Test
+    fun `connect reports downloading then connecting before ready`() = runBlocking {
+        val resolved = CompletableDeferred<Unit>()
+        val ready = CompletableDeferred<Unit>()
+        val server = object : CliServer {
+            override var forceExtract = false
+            override fun process(): Process? = null
+            override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit): CliServer.State {
+                onProgress(CliDownload(42, "1.2.3", "darwin-arm64"))
+                resolved.await()
+                onResolved()
+                ready.await()
+                return CliServer.State.Ready(mock.start(), mock.password)
+            }
+            override fun exited(proc: Process) {}
+            override fun stop() {}
+            override fun dispose() {}
+        }
+        val svc = KiloConnectionService(scope, server, {}, log)
+        val job = scope.launch { svc.connect() }
+
+        val downloading = withTimeout(5_000) {
+            svc.state.first { it is ConnectionState.Downloading }
+        }
+        assertEquals(ConnectionState.Downloading(42, "1.2.3", "darwin-arm64"), downloading)
+
+        resolved.complete(Unit)
+        withTimeout(5_000) {
+            svc.state.first { it == ConnectionState.Connecting }
+        }
+
+        ready.complete(Unit)
+        mock.awaitSseConnection()
+        withTimeout(5_000) {
+            svc.state.first { it is ConnectionState.Connected }
+        }
+        job.join()
+    }
+
     @Test
     fun `SSE events are emitted`() = runBlocking {
         val svc = KiloConnectionService(scope, fake, {}, log)
@@ -189,7 +230,7 @@ class KiloConnectionServiceTest {
         val failing = object : CliServer {
             override var forceExtract = false
             override fun process(): Process? = null
-            override suspend fun init() = CliServer.State.Error("binary not found", "stderr line 1\nstderr line 2")
+            override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit) = CliServer.State.Error("binary not found", "stderr line 1\nstderr line 2")
             override fun exited(proc: Process) {}
             override fun stop() {}
             override fun dispose() {}
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
new file mode 100644
index 0000000000..a62a4bb387
--- /dev/null
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
@@ -0,0 +1,104 @@
+package ai.kilocode.backend.cli
+
+import ai.kilocode.backend.testing.TestLog
+import kotlinx.coroutines.runBlocking
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
+import org.junit.jupiter.api.io.TempDir
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+import kotlin.test.Test
+import kotlin.test.assertContains
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class KiloCliDownloaderTest {
+    @TempDir
+    lateinit var dir: File
+
+    @Test
+    fun `downloads extracts and caches pinned cli`() = runBlocking {
+        MockWebServer().use { server ->
+            val bytes = archive()
+            server.enqueue(MockResponse().setResponseCode(200).setBody(okio.Buffer().write(bytes)))
+            val seen = mutableListOf<CliDownload>()
+            val log = TestLog()
+            val cli = KiloCliDownloader(
+                log = log,
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+            ).resolve("1.2.3", onProgress = { seen.add(it) })
+
+            assertTrue(cli.isFile)
+            assertEquals(File(File(dir, "1.2.3"), KiloCliPlatform.current()).absolutePath, cli.parentFile.parentFile.absolutePath)
+            assertEquals("#!/bin/sh\n", cli.readText())
+            assertTrue(File(cli.parentFile, "kilo-sandbox-mutation-worker.js").isFile)
+            assertEquals("/release/v1.2.3/kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}", server.takeRequest().path)
+            assertEquals(CliDownload(0, "1.2.3", KiloCliPlatform.current()), seen.first())
+            assertTrue(seen.any { it.percent == 100 && it.version == "1.2.3" && it.platform == KiloCliPlatform.current() })
+            assertContains(log.messages, "INFO: Kilo CLI 1.2.3 for ${KiloCliPlatform.current()} is not cached; downloading new release into ${cli.parentFile.parentFile.absolutePath}")
+
+            val cachedProgress = mutableListOf<CliDownload>()
+            val cached = KiloCliDownloader(
+                log = log,
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+            ).resolve("1.2.3", onProgress = { cachedProgress.add(it) })
+            assertEquals(cli.absolutePath, cached.absolutePath)
+            assertEquals(1, server.requestCount)
+            assertTrue(cachedProgress.isEmpty())
+            assertContains(log.messages, "INFO: Using cached Kilo CLI 1.2.3 for ${KiloCliPlatform.current()} at ${cli.absolutePath}")
+
+            server.enqueue(MockResponse().setResponseCode(200).setBody(okio.Buffer().write(bytes)))
+            val forced = KiloCliDownloader(
+                log = log,
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+            ).resolve("1.2.3", force = true)
+            assertEquals(cli.absolutePath, forced.absolutePath)
+            assertEquals(2, server.requestCount)
+        }
+    }
+
+    private fun archive(): ByteArray {
+        val files = mapOf(
+            "bin/${KiloCliPlatform.exe()}" to "#!/bin/sh\n".toByteArray(),
+            "bin/kilo-sandbox-mutation-worker.js" to "worker\n".toByteArray(),
+        )
+        if (KiloCliPlatform.archive() == "zip") return zip(files)
+        return tar(files)
+    }
+
+    private fun zip(files: Map<String, ByteArray>): ByteArray {
+        val out = ByteArrayOutputStream()
+        ZipOutputStream(out).use { zip ->
+            files.forEach { entry ->
+                zip.putNextEntry(ZipEntry(entry.key))
+                zip.write(entry.value)
+                zip.closeEntry()
+            }
+        }
+        return out.toByteArray()
+    }
+
+    private fun tar(files: Map<String, ByteArray>): ByteArray {
+        val out = ByteArrayOutputStream()
+        GzipCompressorOutputStream(out).use { gzip ->
+            TarArchiveOutputStream(gzip).use { tar ->
+                files.forEach { entry ->
+                    val item = TarArchiveEntry(entry.key)
+                    item.size = entry.value.size.toLong()
+                    tar.putArchiveEntry(item)
+                    tar.write(entry.value)
+                    tar.closeArchiveEntry()
+                }
+            }
+        }
+        return out.toByteArray()
+    }
+}
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt
index aa29477ff9..e6eeca253d 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt
@@ -1,6 +1,7 @@
 package ai.kilocode.backend.testing
 
 import ai.kilocode.backend.cli.CliServer
+import ai.kilocode.backend.cli.CliDownload
 
 /**
  * Fake [CliServer] that delegates to a [MockCliServer] instead of
@@ -20,8 +21,10 @@ class FakeCliServer(private val mock: MockCliServer) : CliServer {
 
     override fun process(): Process? = null
 
-    override suspend fun init(): CliServer.State =
-        CliServer.State.Ready(mock.start(), mock.password)
+    override suspend fun init(onProgress: (CliDownload) -> Unit, onResolved: () -> Unit): CliServer.State {
+        onResolved()
+        return CliServer.State.Ready(mock.start(), mock.password)
+    }
 
     override fun exited(proc: Process) {}
 
diff --git a/packages/kilo-jetbrains/build-tasks/build.gradle.kts b/packages/kilo-jetbrains/build-tasks/build.gradle.kts
index d288253836..1fd055a01d 100644
--- a/packages/kilo-jetbrains/build-tasks/build.gradle.kts
+++ b/packages/kilo-jetbrains/build-tasks/build.gradle.kts
@@ -8,6 +8,7 @@ repositories {
 
 dependencies {
     implementation(libs.kotlinx.serialization.json)
+    implementation(libs.commons.compress)
     testImplementation(kotlin("test"))
 }
 
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/BuildTasksPlugin.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/BuildTasksPlugin.kt
index ad42d56f55..1c25aaec60 100644
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/BuildTasksPlugin.kt
+++ b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/BuildTasksPlugin.kt
@@ -7,8 +7,8 @@ import org.gradle.api.Project
  * `id("build-tasks")` resolves in `backend/build.gradle.kts`.
  *
  * The real value lives in the custom task classes this composite build
- * provides: [NormalizeOpenApiSpecTask], [FixGeneratedApiTask],
- * [PrepareLocalCliTask], and [CheckCliTask].
+ * provides: [NormalizeOpenApiSpecTask], [FixGeneratedApiTask], and
+ * [GenerateOpenApiSpecTask].
  */
 class BuildTasksPlugin : Plugin<Project> {
     override fun apply(target: Project) {}
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/CheckCliTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/CheckCliTask.kt
deleted file mode 100644
index dffe15e516..0000000000
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/CheckCliTask.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.ListProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
-import org.gradle.api.tasks.TaskAction
-import java.io.File
-
-/**
- * Verify that CLI binaries exist before packaging the plugin.
- * In production mode, all platform binaries must be present.
- * In dev mode, only the current platform binary is required.
- *
- * CLI binaries must be prepared separately before packaging:
- *   Local:      bun run build          (from packages/kilo-jetbrains/)
- *   Production: bun run build:production
- */
-abstract class CheckCliTask : DefaultTask() {
-    @get:InputDirectory
-    @get:Optional
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val dir: DirectoryProperty
-
-    @get:Input
-    abstract val production: Property<Boolean>
-
-    @get:Input
-    abstract val platforms: ListProperty<String>
-
-    @TaskAction
-    fun run() {
-        val resolved = dir.get().asFile
-        if (!resolved.exists() || resolved.listFiles()?.isEmpty() != false) {
-            throw GradleException(
-                "CLI binaries not found at ${resolved.absolutePath}.\n" +
-                "Run 'bun run build' from packages/kilo-jetbrains/ to build CLI and plugin together."
-            )
-        }
-        if (production.get()) {
-            val missing = platforms.get().filter { platform ->
-                val d = File(resolved, platform)
-                val exe = if (platform.startsWith("windows")) "kilo.exe" else "kilo"
-                !File(d, exe).exists()
-            }
-            if (missing.isNotEmpty()) {
-                throw GradleException(
-                    "Production build requires all platform CLI binaries.\n" +
-                    "Missing: ${missing.joinToString(", ")}\n" +
-                    "Run 'bun run build:production' to build all platforms."
-                )
-            }
-        }
-    }
-}
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
index f594d0f06b..aebd99feee 100644
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
+++ b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
@@ -1,50 +1,32 @@
+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.tasks.InputDirectory
+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.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
-import javax.inject.Inject
 import org.gradle.process.ExecOperations
 import java.io.ByteArrayOutputStream
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URI
+import java.util.zip.ZipInputStream
+import javax.inject.Inject
 
 /**
- * Generates the CLI OpenAPI spec into the build directory so the JetBrains
- * Gradle build is self-contained and does not mutate the tracked
- * packages/sdk/openapi.json.
- *
- * Runs `bun dev generate` from the opencode package directory and captures
- * stdout to [spec]. stderr is captured separately and included in the error
- * message on failure.
- *
- * Gradle up-to-date tracking is scoped to [serverSrcDir] (the opencode server
- * source) to avoid busting the cache on unrelated changes to dist/, node_modules/,
- * etc.
+ * Generates the CLI OpenAPI spec from the pinned release binary.
  */
 abstract class GenerateOpenApiSpecTask : DefaultTask() {
+    @get:Input
+    abstract val cliVersion: Property<String>
 
-    /**
-     * The server source directory inside the opencode package — the only files
-     * that affect the OpenAPI output. Scoped to `src/server/` to avoid busting
-     * the Gradle up-to-date check on unrelated file changes (dist/, node_modules/).
-     */
-    @get:InputDirectory
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val serverSrcDir: DirectoryProperty
-
-    /**
-     * Root of the `packages/opencode/` package — the working directory for bun.
-     * Marked @Internal because it is not itself a Gradle input; only [serverSrcDir]
-     * (a subdirectory) participates in up-to-date checking.
-     */
     @get:Internal
-    abstract val opencodeDir: DirectoryProperty
+    abstract val cacheDir: DirectoryProperty
 
-    /** Destination file for the generated openapi.json. */
     @get:OutputFile
     abstract val spec: RegularFileProperty
 
@@ -53,52 +35,122 @@ abstract class GenerateOpenApiSpecTask : DefaultTask() {
 
     @TaskAction
     fun run() {
+        val kilo = resolve()
         val out = ByteArrayOutputStream()
         val err = ByteArrayOutputStream()
         val result = exec.exec {
-            workingDir = opencodeDir.get().asFile
-            commandLine(findBun(), "run", "--conditions=browser", "./src/index.ts", "generate")
+            commandLine(kilo.absolutePath, "generate")
             standardOutput = out
             errorOutput = err
             isIgnoreExitValue = true
         }
         if (result.exitValue != 0) {
             throw GradleException(
-                "bun dev generate failed with exit code ${result.exitValue}.\n" +
-                err.toString(Charsets.UTF_8).take(2000)
+                "kilo generate failed with exit code ${result.exitValue}.\n" +
+                    err.toString(Charsets.UTF_8).take(2000)
             )
         }
         val json = out.toString(Charsets.UTF_8)
         if (!json.trimStart().startsWith("{")) {
             throw GradleException(
-                "bun dev generate did not produce JSON.\n" +
-                "stdout: ${json.take(200)}\n" +
-                "stderr: ${err.toString(Charsets.UTF_8).take(500)}"
+                "kilo generate did not produce JSON.\n" +
+                    "stdout: ${json.take(200)}\n" +
+                    "stderr: ${err.toString(Charsets.UTF_8).take(500)}"
             )
         }
         spec.get().asFile.also { it.parentFile.mkdirs() }.writeText(json)
     }
 
-    private fun findBun(): String {
-        val which = runCatching {
-            ProcessBuilder("which", "bun")
-                .redirectErrorStream(true)
-                .start()
-                .inputStream.bufferedReader().readLine()?.trim()
-        }.getOrNull()
-        if (which != null && java.io.File(which).isFile) return which
-
-        val home = System.getProperty("user.home")
-        val candidates = listOf(
-            "$home/.bun/bin/bun",
-            "/opt/homebrew/bin/bun",
-            "/usr/local/bin/bun",
-            "$home/.nvm/current/bin/bun",
-        )
-        for (path in candidates) {
-            val f = java.io.File(path)
-            if (f.isFile && f.canExecute()) return f.absolutePath
+    private fun resolve(): File {
+        val version = cliVersion.get()
+        val platform = platform()
+        val ext = if (platform.startsWith("linux-")) "tar.gz" else "zip"
+        val dir = cacheDir.dir(version).map { it.dir(platform) }.get().asFile
+        val exe = File(dir, "bin/${exe()}")
+        val done = File(dir, ".complete")
+        if (exe.isFile && done.isFile) {
+            if (!windows()) exe.setExecutable(true)
+            return exe
         }
-        return "bun"
+        dir.mkdirs()
+        val archive = File(dir, "kilo-$platform.$ext")
+        download("https://github.com/Kilo-Org/kilocode/releases/download/v$version/kilo-$platform.$ext", archive)
+        extract(archive, dir)
+        if (!exe.isFile) throw GradleException("Downloaded CLI archive did not contain bin/${exe()}")
+        if (!windows()) exe.setExecutable(true)
+        done.writeText("ok\n")
+        return exe
     }
+
+    private fun download(url: String, file: File) {
+        logger.lifecycle("Downloading pinned Kilo CLI from $url")
+        val conn = URI(url).toURL().openConnection() as HttpURLConnection
+        conn.connectTimeout = 30_000
+        conn.readTimeout = 120_000
+        conn.instanceFollowRedirects = true
+        try {
+            val code = conn.responseCode
+            if (code !in 200..299) throw GradleException("Failed to download pinned Kilo CLI: HTTP $code from $url")
+            conn.inputStream.use { input ->
+                file.outputStream().use { output -> input.copyTo(output) }
+            }
+        } finally {
+            conn.disconnect()
+        }
+    }
+
+    private fun extract(file: File, dir: File) {
+        if (file.name.endsWith(".zip")) {
+            ZipInputStream(file.inputStream().buffered()).use { zip ->
+                while (true) {
+                    val entry = zip.nextEntry ?: break
+                    write(dir, entry.name, entry.isDirectory) { out -> zip.copyTo(out) }
+                    zip.closeEntry()
+                }
+            }
+            return
+        }
+        TarArchiveInputStream(GzipCompressorInputStream(file.inputStream().buffered())).use { tar ->
+            while (true) {
+                val entry = tar.nextEntry ?: break
+                write(dir, entry.name, entry.isDirectory) { out -> tar.copyTo(out) }
+            }
+        }
+    }
+
+    private fun write(dir: File, name: String, directory: Boolean, copy: (java.io.OutputStream) -> Unit) {
+        val path = if (name.startsWith("bin/")) name else "bin/$name"
+        val target = File(dir, path).canonicalFile
+        val base = dir.canonicalFile
+        if (target != base && !target.path.startsWith(base.path + File.separator)) {
+            throw GradleException("Archive entry escapes target directory: $name")
+        }
+        if (directory) {
+            target.mkdirs()
+            return
+        }
+        target.parentFile.mkdirs()
+        target.outputStream().use(copy)
+        if (!windows() && (target.name == "kilo" || target.name == "bwrap")) target.setExecutable(true)
+    }
+
+    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"
+    }
+
+    private fun exe() = if (windows()) "kilo.exe" else "kilo"
+
+    private fun windows() = System.getProperty("os.name").lowercase().contains("windows")
 }
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/PrepareLocalCliTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/PrepareLocalCliTask.kt
deleted file mode 100644
index dc1501154f..0000000000
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/PrepareLocalCliTask.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-import org.gradle.process.ExecOperations
-import org.gradle.work.DisableCachingByDefault
-import java.io.File
-import javax.inject.Inject
-
-/**
- * Prepare the local-platform CLI binary for JetBrains backend runs.
- *
- * Runs `bun run build --prepare-cli` from the [root] project directory when
- * the expected current-platform binary is absent from [dir]. Skips
- * immediately when the binary already exists.
- *
- * Bun is found in the following priority order:
- * 1. Explicit `-Pkilo.bun.path=...` Gradle property (forwarded via [bunPath])
- * 2. `BUN_EXE` environment variable (absolute path to the bun executable)
- * 3. `BUN_INSTALL/bin/bun` (from `BUN_INSTALL` environment variable)
- * 4. Each entry on `PATH`
- * 5. Common install locations (`~/.bun/bin`, `/opt/homebrew/bin`, `/usr/local/bin`)
- *
- * After Bun finishes, the task verifies the expected binary exists so that Rosetta / architecture
- * mismatches surface with a clear error message.
- */
-@DisableCachingByDefault(because = "Local developer bootstrap task that shells out to Bun")
-abstract class PrepareLocalCliTask : DefaultTask() {
-    @get:Internal
-    abstract val root: DirectoryProperty
-
-    @get:OutputDirectory
-    abstract val dir: DirectoryProperty
-
-    @get:Input
-    @get:Optional
-    abstract val bunPath: Property<String>
-
-    @get:Inject
-    abstract val exec: ExecOperations
-
-    @TaskAction
-    fun run() {
-        val expected = binary()
-        if (expected.exists()) {
-            logger.lifecycle("CLI binary already exists at ${expected.absolutePath}")
-            return
-        }
-
-        val bun = findBun()
-        logger.lifecycle("Preparing local CLI binary with ${bun.absolutePath}")
-        val result = exec.exec {
-            workingDir = root.get().asFile
-            executable = bun.absolutePath
-            args("run", "build", "--prepare-cli")
-            isIgnoreExitValue = true
-        }
-
-        if (result.exitValue != 0) {
-            throw GradleException("bun run build --prepare-cli failed with exit code ${result.exitValue}")
-        }
-
-        if (!expected.exists()) {
-            throw GradleException(
-                "Expected CLI binary was not created at ${expected.absolutePath}. " +
-                    "This can happen if Bun and Gradle are running under different architectures."
-            )
-        }
-    }
-
-    private fun binary(): File {
-        return File(File(dir.get().asFile, platform()), exe())
-    }
-
-    private fun platform(): String {
-        return "${os()}-${arch()}"
-    }
-
-    private fun os(): String {
-        val name = System.getProperty("os.name").lowercase()
-        if ("mac" in name || "darwin" in name) return "darwin"
-        if ("linux" in name) return "linux"
-        if ("windows" in name) return "windows"
-        throw GradleException("Unsupported OS for JetBrains CLI binary: $name")
-    }
-
-    private fun arch(): String {
-        return when (val value = System.getProperty("os.arch").lowercase()) {
-            "aarch64", "arm64" -> "arm64"
-            "x86_64", "amd64" -> "x64"
-            else -> throw GradleException("Unsupported architecture for JetBrains CLI binary: $value")
-        }
-    }
-
-    private fun exe(): String {
-        if (os() == "windows") return "kilo.exe"
-        return "kilo"
-    }
-
-    private fun findBun(): File {
-        val configured = bunPath.orNull?.trim()?.takeIf { it.isNotEmpty() }
-        if (configured != null) return requireBun(File(configured))
-
-        val names = if (os() == "windows") listOf("bun.exe", "bun.cmd", "bun.bat") else listOf("bun")
-        val candidates = mutableListOf<File>()
-
-        System.getenv("BUN_EXE")?.trim()?.takeIf { it.isNotEmpty() }?.let { candidates.add(File(it)) }
-        System.getenv("BUN_INSTALL")?.trim()?.takeIf { it.isNotEmpty() }?.let { install ->
-            candidates.addAll(names.map { File(File(install, "bin"), it) })
-        }
-        System.getenv("PATH")?.split(File.pathSeparator)?.forEach { entry ->
-            candidates.addAll(names.map { File(entry, it) })
-        }
-
-        val home = System.getProperty("user.home")
-        candidates.addAll(names.map { File(File(home, ".bun/bin"), it) })
-        candidates.addAll(names.map { File("/opt/homebrew/bin", it) })
-        candidates.addAll(names.map { File("/usr/local/bin", it) })
-
-        return candidates.firstOrNull(::usable)
-            ?: throw GradleException("Could not find Bun. Install Bun or pass -Pkilo.bun.path=/absolute/path/to/bun.")
-    }
-
-    private fun requireBun(file: File): File {
-        if (usable(file)) return file
-        throw GradleException("Configured Bun executable is not usable: ${file.absolutePath}")
-    }
-
-    private fun usable(file: File): Boolean {
-        if (!file.isFile) return false
-        if (os() == "windows") return true
-        return file.canExecute()
-    }
-}
diff --git a/packages/kilo-jetbrains/build.gradle.kts b/packages/kilo-jetbrains/build.gradle.kts
index 50c07ca004..0b0a136e62 100644
--- a/packages/kilo-jetbrains/build.gradle.kts
+++ b/packages/kilo-jetbrains/build.gradle.kts
@@ -221,7 +221,6 @@ tasks {
 
     runIdeBackend {
         splitModeServerPort.set(splitPort)
-        dependsOn(":backend:prepareLocalCli")
         dependsOn(":backend:processResources")
     }
 
@@ -231,17 +230,12 @@ tasks {
 
     runIdeSplitMode {
         splitModeServerPort.set(splitPort)
-        dependsOn(":backend:prepareLocalCli")
         dependsOn(":backend:processResources")
     }
 }
 
-project(":backend").tasks.named("processResources") {
-    mustRunAfter(":backend:prepareLocalCli")
-}
-
 // Compile-only typecheck: verifies Kotlin compiles (including generated API client)
-// without running processResources, CLI binary prep, or buildPlugin.
+// without running buildPlugin.
 tasks.register("typecheck") {
     dependsOn(
         ":shared:compileKotlin",
@@ -252,12 +246,6 @@ tasks.register("typecheck") {
     )
 }
 
-// CLI binaries must be present before packaging. Wire the check here (not in
-// :backend:processResources) so compile/test tasks work without CLI binaries.
-tasks.named("buildPlugin") {
-    dependsOn(":backend:checkCli")
-}
-
 tasks.named<JavaExec>("runIde") {
     dependsOn(":backend:processResources")
     jvmArgumentProviders += CommandLineArgumentProvider {
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
index d18532b739..2ef806cfa9 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
@@ -131,17 +131,29 @@ class KiloAppService internal constructor(
         cs.launch { reinstall() }
     }
 
-    /** Fetch the CLI version and cache it. Call once after connection is established. */
-    fun fetchVersionAsync() {
+    suspend fun cliVersion(): String? = try {
+        call { cliVersion() }
+    } catch (e: Exception) {
+        LOG.warn("cliVersion failed", e)
+        null
+    }
+
+    /** Fetch the pinned CLI version and cache it. */
+    fun fetchVersionAsync(done: (String?) -> Unit = {}) {
+        version?.let {
+            done(it)
+            return
+        }
         cs.launch {
-            LOG.info("fetchVersion: requesting health check")
-            val dto = health()
-            if (dto == null) {
-                LOG.warn("fetchVersion: health check returned null — version not available")
+            LOG.info("fetchVersion: requesting CLI version")
+            val text = cliVersion()
+            if (text == null) {
+                done(null)
                 return@launch
             }
-            version = dto.version
-            LOG.info("fetchVersion: CLI version is ${dto.version}")
+            version = text
+            done(text)
+            LOG.info("fetchVersion: CLI version is $text")
         }
     }
 
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 2e7945cd4e..08e8faaede 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
@@ -485,8 +485,14 @@ class SessionUi(
                         activity = { manager?.activity() ?: sessions.activity() },
                         titles = { manager?.titles().orEmpty() },
                         timers = timers,
+                        cliVersion = app.version,
                     )
                     empty = panel
+                    app.fetchVersionAsync { version ->
+                        ApplicationManager.getApplication().invokeLater {
+                            if (!disposed && empty === panel) panel.setCliVersion(version)
+                        }
+                    }
                     scroll.show(panel.view)
                 }
 
@@ -497,6 +503,7 @@ class SessionUi(
 
                 is SessionControllerEvent.AppChanged -> {
                     prompt.setReady(controller.model.isReady())
+                    empty?.setCliVersion(app.version)
                 }
 
                 is SessionControllerEvent.WorkspaceChanged -> {
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 f7b3e9a540..e50b9c760a 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
@@ -1833,6 +1833,14 @@ class SessionController(
             )
         }
 
+        if (app.status == KiloAppStatusDto.DOWNLOADING) {
+            return SessionControllerEvent.ConnectionChanged.ShowDownloading(
+                app.downloadPercent ?: 0,
+                app.downloadVersion,
+                app.downloadPlatform,
+            )
+        }
+
         if (workspace.status == KiloWorkspaceStatusDto.ERROR) {
             return SessionControllerEvent.ConnectionChanged.ShowError(
                 KiloBundle.message("session.connection.error.workspace"),
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionControllerEvent.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionControllerEvent.kt
index 50f644fe32..c6a4985b28 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionControllerEvent.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionControllerEvent.kt
@@ -63,6 +63,10 @@ sealed class SessionControllerEvent {
             override fun toString() = "ConnectionChanged connecting"
         }
 
+        data class ShowDownloading(val percent: Int, val version: String? = null, val platform: String? = null) : ConnectionChanged() {
+            override fun toString() = "ConnectionChanged downloading $percent"
+        }
+
         data class ShowError(val summary: String, val detail: String?, val source: String = "app") : ConnectionChanged() {
             override fun toString() = "ConnectionChanged error $source"
         }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ConnectionPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ConnectionPanel.kt
index ed563da884..2aaf2acf71 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ConnectionPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ConnectionPanel.kt
@@ -120,6 +120,8 @@ class ConnectionPanel(
 
             is SessionControllerEvent.ConnectionChanged.ShowConnecting -> showConnecting()
 
+            is SessionControllerEvent.ConnectionChanged.ShowDownloading -> showDownloading(event.percent, event.version, event.platform)
+
             is SessionControllerEvent.ConnectionChanged.ShowError -> {
                 showError(event.summary, event.detail)
                 showPanel()
@@ -145,6 +147,22 @@ class ConnectionPanel(
         showPanel()
     }
 
+    private fun showDownloading(percent: Int, version: String?, platform: String?) {
+        label.foreground = UiStyle.Colors.weak()
+        val pct = percent.coerceIn(0, 100)
+        label.text = if (version != null && platform != null) {
+            KiloBundle.message("session.connection.downloading.version", version, platform, pct)
+        } else {
+            KiloBundle.message("session.connection.downloading", pct)
+        }
+        detail = null
+        expanded = false
+        toggle.isVisible = false
+        retry.isVisible = false
+        renderDetails()
+        showPanel()
+    }
+
     private fun showError(text: String, detail: String?) {
         label.foreground = UiStyle.Colors.errorLabelForeground()
         label.text = text
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt
index f277884c26..c8b7a7cdc5 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt
@@ -55,6 +55,7 @@ class EmptySessionPanel(
     private val titles: () -> Map<String, String> = { emptyMap() },
     private val browse: (String) -> Unit = BrowserUtil::browse,
     private val timers: UiTimerSource = UiTimers,
+    cliVersion: String? = null,
 ) : BorderLayoutPanel(), Disposable, SessionEditorStyleTarget {
     val view: Align = align(HAlign.CENTER, VAlign.CENTER)
 
@@ -73,6 +74,13 @@ class EmptySessionPanel(
         setAllowAutoWrapping(true)
     }
 
+    private val versionLabel = JBLabel().apply {
+        foreground = UIUtil.getContextHelpForeground()
+        font = com.intellij.util.ui.JBFont.small()
+        horizontalAlignment = JBLabel.CENTER
+        isVisible = false
+    }
+
     private val description = object : BorderLayoutPanel() {
         override fun getPreferredSize(): Dimension {
             val size = super.getPreferredSize()
@@ -112,11 +120,15 @@ class EmptySessionPanel(
         ).apply {
             horizontalAlignment = JBLabel.CENTER
         }
+        val logoBlock = Stack.vertical(gap = UiStyle.Gap.xs())
+            .next(logo)
+            .next(versionLabel)
         val header = BorderLayoutPanel(0, gap).apply {
             isOpaque = false
-            add(logo, BorderLayout.NORTH)
+            add(logoBlock, BorderLayout.NORTH)
             add(description.align(HAlign.CENTER, VAlign.CENTER), BorderLayout.CENTER)
         }
+        setCliVersion(cliVersion)
 
         val south = BorderLayoutPanel().apply {
             isOpaque = false
@@ -158,6 +170,15 @@ class EmptySessionPanel(
 
     internal fun feedbackContent(open: (String) -> Unit = {}): JComponent = EmptySessionFeedback.content(open)
 
+    @RequiresEdt
+    fun setCliVersion(version: String?) {
+        val text = version?.takeIf { it.isNotBlank() }
+        versionLabel.text = text?.let { KiloBundle.message("session.empty.cliVersion", it) }.orEmpty()
+        versionLabel.isVisible = text != null
+        revalidate()
+        repaint()
+    }
+
     internal fun feedbackUrls() = EmptySessionFeedback.urls()
 
     internal fun showHistoryBorderPainted() = historyButton.isBorderPainted
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedOutProfileUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedOutProfileUi.kt
index 6324247efa..e71ce3b7e3 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedOutProfileUi.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedOutProfileUi.kt
@@ -181,7 +181,7 @@ internal class LoggedOutProfileUi(
     }
 
     private fun resolveMode(status: KiloAppStatusDto, login: LoginState): OutMode = when {
-        status == KiloAppStatusDto.DISCONNECTED || status == KiloAppStatusDto.CONNECTING || status == KiloAppStatusDto.MIGRATION_REQUIRED -> OutMode.CONNECTING
+        status == KiloAppStatusDto.DISCONNECTED || status == KiloAppStatusDto.DOWNLOADING || status == KiloAppStatusDto.CONNECTING || status == KiloAppStatusDto.MIGRATION_REQUIRED -> OutMode.CONNECTING
         status == KiloAppStatusDto.ERROR -> OutMode.APP_ERROR
         login is LoginState.Initiating -> OutMode.INITIATING
         login is LoginState.Pending -> OutMode.AUTH
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/ProfileUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/ProfileUi.kt
index 8e942bdd99..eaeed04cd6 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/ProfileUi.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/ProfileUi.kt
@@ -163,7 +163,7 @@ internal class ProfileUi(
         val p = prof
         // When loading/connecting and already showing the logged-in card, stay on it to
         // avoid focus loss during reconnects, initial loads, and org switches.
-        val transientLoad = s == KiloAppStatusDto.CONNECTING || s == KiloAppStatusDto.LOADING || s == KiloAppStatusDto.MIGRATION_REQUIRED
+        val transientLoad = s == KiloAppStatusDto.DOWNLOADING || s == KiloAppStatusDto.CONNECTING || s == KiloAppStatusDto.LOADING || s == KiloAppStatusDto.MIGRATION_REQUIRED
         if (transientLoad && shown == Card.LOGGED_IN) return Card.LOGGED_IN
         return when {
             s == KiloAppStatusDto.DISCONNECTED || transientLoad -> Card.LOGGED_OUT
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 c64398d56e..00285f7666 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
@@ -1,6 +1,8 @@
 common.delete=Delete
 
 session.connection.connecting=Loading...
+session.connection.downloading=Downloading Kilo CLI… {0}%
+session.connection.downloading.version=Downloading Kilo CLI v{0} ({1})… {2}%
 session.connection.error.app=Connection failed
 session.connection.error.workspace=Workspace loading failed
 session.connection.error.unknown=Unknown error
@@ -10,6 +12,7 @@ session.connection.warning.config=Configuration warnings
 notification.group.kilo=Kilo Code
 
 session.empty.welcome=Kilo Code is an AI coding assistant. Ask it to build features, fix bugs, or explain your codebase.
+session.empty.cliVersion=Kilo CLI v{0}
 session.account.balance=Balance: {0}
 session.account.switcher=Switch account
 session.empty.loading=Loading...
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt
index deb5a8d94e..f969235bb9 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt
@@ -1,5 +1,6 @@
 package ai.kilocode.client.session.ui
 
+import ai.kilocode.client.plugin.KiloBundle
 import ai.kilocode.client.session.controller.SessionController
 import ai.kilocode.client.session.controller.SessionControllerEvent
 import ai.kilocode.client.session.controller.SessionControllerTestBase
@@ -35,6 +36,19 @@ class ConnectionPanelTest : SessionControllerTestBase() {
         assertFalse(panel.retryVisible())
     }
 
+    fun `test downloading hides retry and details`() {
+        edt {
+            panel.onEvent(SessionControllerEvent.ConnectionChanged.ShowDownloading(42, "1.2.3", "darwin-arm64"))
+        }
+
+        assertTrue(panel.isVisible)
+        assertEquals(KiloBundle.message("session.connection.downloading.version", "1.2.3", "darwin-arm64", 42), panel.summaryText())
+        assertEquals("", panel.detailsText())
+        assertFalse(panel.toggleVisible())
+        assertFalse(panel.detailsVisible())
+        assertFalse(panel.retryVisible())
+    }
+
     fun `test app error starts collapsed and expands details`() {
         edt {
             panel.onEvent(SessionControllerEvent.ConnectionChanged.ShowError(
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt
index d0c6f0b0ea..6f362a0449 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt
@@ -138,6 +138,23 @@ class EmptySessionPanelTest : BasePlatformTestCase() {
         )
     }
 
+    fun `test cli version line updates`() {
+        val panel = panel()
+        val text = KiloBundle.message("session.empty.cliVersion", "1.2.3")
+
+        panel.setCliVersion("1.2.3")
+        val label = UIUtil.uiTraverser(panel)
+            .filter(JBLabel::class.java)
+            .first { it.text == text }
+
+        assertTrue(label.isVisible)
+
+        panel.setCliVersion(null)
+
+        assertEquals("", label.text)
+        assertFalse(label.isVisible)
+    }
+
     fun `test selecting recent session does not open it`() {
         val panel = panel(listOf(session("ses_1"), session("ses_2")))
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
index fc6cb674ca..546ba6e55f 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
@@ -31,6 +31,7 @@ class FakeAppRpcApi : KiloAppRpcApi {
 
     val state = MutableStateFlow(KiloAppStateDto(KiloAppStatusDto.DISCONNECTED))
     var health = HealthDto(healthy = true, version = "1.0.0")
+    var cliVersion = "1.0.0"
     var models = ModelStateDto()
     val selections = mutableListOf<ModelSelectionUpdateDto>()
     val cleared = mutableListOf<String>()
@@ -67,6 +68,11 @@ class FakeAppRpcApi : KiloAppRpcApi {
         return health
     }
 
+    override suspend fun cliVersion(): String {
+        assertNotEdt("cliVersion")
+        return cliVersion
+    }
+
     override suspend fun retry() {
         assertNotEdt("retry")
         retries += 1
diff --git a/packages/kilo-jetbrains/gradle/libs.versions.toml b/packages/kilo-jetbrains/gradle/libs.versions.toml
index 2cfb8872e1..15b48416fe 100644
--- a/packages/kilo-jetbrains/gradle/libs.versions.toml
+++ b/packages/kilo-jetbrains/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ detekt = "1.23.8"
 commonmark = "0.28.0"
 zxing = "3.5.3"
 changelog = "2.5.0"
+commons-compress = "1.28.0"
 
 [libraries]
 commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark" }
@@ -23,6 +24,7 @@ okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.10.2" }
 zxing-core = { module = "com.google.zxing:core", version.ref = "zxing" }
+commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" }
 
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
diff --git a/packages/kilo-jetbrains/script/build-version.sh b/packages/kilo-jetbrains/script/build-version.sh
index ff34420240..4cd0c7663d 100755
--- a/packages/kilo-jetbrains/script/build-version.sh
+++ b/packages/kilo-jetbrains/script/build-version.sh
@@ -6,7 +6,7 @@ usage() {
 Usage: $0 <version> [options]
 
 Builds the JetBrains plugin for a version without creating or validating a git tag.
-By default this runs a clean build, prepares production CLI binaries, signs the ZIP, and verifies it.
+By default this runs a clean build, signs the ZIP, and verifies it.
 
 Version:
   x.y.z or x.y.z-rc.n, with an optional leading v.
@@ -75,7 +75,6 @@ fi
 
 script="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 plugin="$(cd "${script}/.." && pwd)"
-cli="$(cd "${plugin}/../opencode" && pwd)"
 secrets="${HOME}/.secrets/jetbrains"
 chain="${secrets}/chain.crt"
 key="${secrets}/private.pem"
@@ -87,11 +86,6 @@ if [[ ! -d "$plugin" ]]; then
   exit 1
 fi
 
-if [[ ! -f "${cli}/package.json" ]]; then
-  echo "Expected CLI package at $cli" >&2
-  exit 1
-fi
-
 if [[ "$sign" == "1" ]]; then
   for file in "$chain" "$key" "$pass"; do
     if [[ ! -s "$file" ]]; then
@@ -117,8 +111,6 @@ if [[ "$clean" == "1" ]]; then
   ./gradlew clean
 fi
 
-rm -rf "${cli}/dist"
-KILO_VERSION="$version" KILO_CHANNEL=rc bun "${plugin}/script/build.ts" --production --prepare-cli
 ./gradlew buildPlugin -Pproduction=true -Pkilo.version="$version" -Pkilo.channel=eap
 
 if [[ "$sign" == "1" ]]; then
diff --git a/packages/kilo-jetbrains/script/build.ts b/packages/kilo-jetbrains/script/build.ts
index 666040cc6c..27cc3cb49a 100644
--- a/packages/kilo-jetbrains/script/build.ts
+++ b/packages/kilo-jetbrains/script/build.ts
@@ -4,124 +4,24 @@
  * Build the Kilo JetBrains plugin.
  *
  * Usage:
- *   bun script/build.ts               # Local build — only current platform binary required
- *   bun script/build.ts --production  # Production build — all 6 platform binaries required
- *   bun script/build.ts --prepare-cli # Only prepare local CLI resources for Gradle
+ *   bun script/build.ts               # Local plugin build
+ *   bun script/build.ts --production  # Production plugin build
  *
- * Steps:
- * 1. Builds CLI binaries (or uses prebuilt ones from dist/).
- *    Local: builds only current platform (--single).
- *    Production: builds all platforms.
- * 2. Copies them and the Kilo sandbox mutation worker into backend/build/generated/cli/cli/{os}/
- *    so they end up inside the backend jar at /cli/{os}/.
- * 3. Invokes Gradle to build the plugin.
+ * The JetBrains plugin no longer bundles CLI binaries. Runtime downloads the
+ * pinned release from GitHub using packages/kilo-jetbrains/package.json version.
  */
 
 import { $ } from "bun"
-import { join, relative } from "node:path"
-import { existsSync, mkdirSync, chmodSync, cpSync, rmSync } from "node:fs"
+import { join } from "node:path"
 
 const production = process.argv.includes("--production")
-const cliOnly = process.argv.includes("--prepare-cli")
-
 const root = join(import.meta.dir, "..")
-const packages = join(root, "..")
-const opencodeDir = join(packages, "opencode")
-const distDir = join(opencodeDir, "dist")
-const cliDir = join(root, "backend", "build", "generated", "cli", "cli")
-
-/** All desktop platforms. */
-const platforms = [
-  { os: "darwin-arm64", exe: "kilo" },
-  { os: "darwin-x64", exe: "kilo" },
-  { os: "linux-arm64", exe: "kilo" },
-  { os: "linux-x64", exe: "kilo" },
-  { os: "windows-x64", exe: "kilo.exe" },
-  { os: "windows-arm64", exe: "kilo.exe" },
-] as const
-
-function localPlatformTag(): string {
-  const os = process.platform === "win32" ? "windows" : process.platform
-  return `${os}-${process.arch}`
-}
+const gradlew = process.platform === "win32" ? "gradlew.bat" : "./gradlew"
 
 function log(msg: string) {
   console.log(`[jetbrains-build] ${msg}`)
 }
 
-function distBinPath(os: string, exe: string): string {
-  return join(distDir, `@kilocode/cli-${os}`, "bin", exe)
-}
-
-function hasArtifacts(os: string, exe: string): boolean {
-  return existsSync(distBinPath(os, exe)) && existsSync(distBinPath(os, "kilo-sandbox-mutation-worker.js"))
-}
-
-function hasDist(): boolean {
-  if (production) {
-    return platforms.every((p) => hasArtifacts(p.os, p.exe))
-  }
-  const tag = localPlatformTag()
-  const local = platforms.find((p) => p.os === tag)
-  return local ? hasArtifacts(local.os, local.exe) : false
-}
-
-async function prepareCli() {
-  const mode = production ? "production" : "local"
-  log(`Mode: ${mode}`)
-
-  if (!hasDist()) {
-    log("Building CLI binaries via opencode...")
-    if (!existsSync(join(opencodeDir, "package.json"))) {
-      throw new Error(`Expected opencode package at ${opencodeDir}`)
-    }
-    const args = production ? [] : ["--single"]
-    await $`bun run build ${args}`.cwd(opencodeDir)
-  } else {
-    log("Found prebuilt CLI binaries in opencode/dist/, skipping CLI build")
-  }
-
-  if (existsSync(cliDir)) {
-    rmSync(cliDir, { recursive: true })
-  }
-
-  const missing: string[] = []
-  let copied = 0
-  for (const p of platforms) {
-    const src = distBinPath(p.os, p.exe)
-    const worker = distBinPath(p.os, "kilo-sandbox-mutation-worker.js")
-    if (!existsSync(src) || !existsSync(worker)) {
-      missing.push(p.os)
-      continue
-    }
-
-    const dir = join(cliDir, p.os)
-    mkdirSync(dir, { recursive: true })
-    const dest = join(dir, p.exe)
-    cpSync(src, dest)
-    cpSync(worker, join(dir, "kilo-sandbox-mutation-worker.js"))
-    chmodSync(dest, 0o755)
-    copied++
-    log(`Copied ${relative(root, src)} and Kilo sandbox mutation worker -> ${relative(root, dir)}`)
-  }
-
-  if (copied === 0) {
-    throw new Error("No CLI binaries were copied — the build cannot proceed")
-  }
-
-  if (production && missing.length > 0) {
-    throw new Error(`Production build requires all platform binaries. Missing: ${missing.join(", ")}`)
-  }
-
-  if (missing.length > 0) {
-    log(`Skipped ${missing.length} platforms (not needed for local build): ${missing.join(", ")}`)
-  }
-
-  log(`Copied ${copied}/${platforms.length} platform binaries`)
-}
-
-const gradlew = process.platform === "win32" ? "gradlew.bat" : "./gradlew"
-
 async function buildPlugin() {
   log("Building JetBrains plugin via Gradle...")
   const args = production ? ["-Pproduction=true"] : []
@@ -130,10 +30,7 @@ async function buildPlugin() {
 }
 
 try {
-  await prepareCli()
-  if (!cliOnly) {
-    await buildPlugin()
-  }
+  await buildPlugin()
 } catch (err) {
   console.error(`[jetbrains-build] ERROR: ${err instanceof Error ? err.message : String(err)}`)
   process.exit(1)
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt
index fa1bb85079..91f43499ca 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt
@@ -39,6 +39,9 @@ interface KiloAppRpcApi : RemoteApi<Unit> {
     /** One-shot health check against /global/health. */
     suspend fun health(): HealthDto
 
+    /** Pinned CLI version bundled in backend resources. */
+    suspend fun cliVersion(): String
+
     /** Retry app connection or loading after a failure. */
     suspend fun retry()
 
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
index cbc72c6db7..ab1ec2c261 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
@@ -6,6 +6,7 @@ import kotlinx.serialization.SerialName
 @Serializable
 enum class KiloAppStatusDto {
     DISCONNECTED,
+    DOWNLOADING,
     CONNECTING,
     LOADING,
     MIGRATION_REQUIRED,
@@ -173,6 +174,9 @@ data class KiloAppStateDto(
     val error: String? = null,
     val errors: List<LoadErrorDto> = emptyList(),
     val progress: LoadProgressDto? = null,
+    val downloadPercent: Int? = null,
+    val downloadVersion: String? = null,
+    val downloadPlatform: String? = null,
     val warnings: List<ConfigWarningDto> = emptyList(),
     val config: ConfigDto? = null,
     val profile: ProfileDto? = null,

From 891a7a5847935a8319faa892226a5683c2e01e30 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 15:44:16 -0400
Subject: [PATCH 05/68] feat(jetbrains): show Core runtime info

---
 .changeset/jetbrains-download-cli.md          |  2 +-
 .../kilocode/backend/rpc/KiloAppRpcApiImpl.kt |  3 +
 .../kilocode/client/actions/CoreInfoAction.kt | 27 +++++++++
 .../ai/kilocode/client/app/KiloAppService.kt  | 59 ++++++++++++-------
 .../ai/kilocode/client/session/SessionUi.kt   |  7 ---
 .../session/ui/empty/EmptySessionPanel.kt     | 23 +-------
 .../resources/kilo.jetbrains.frontend.xml     |  7 ++-
 .../resources/messages/KiloBundle.properties  | 22 +++----
 .../messages/KiloBundle_ar.properties         | 12 ++--
 .../messages/KiloBundle_bs.properties         | 12 ++--
 .../messages/KiloBundle_da.properties         | 12 ++--
 .../messages/KiloBundle_de.properties         | 12 ++--
 .../messages/KiloBundle_es.properties         | 12 ++--
 .../messages/KiloBundle_fr.properties         | 12 ++--
 .../messages/KiloBundle_ja.properties         | 12 ++--
 .../messages/KiloBundle_ko.properties         | 12 ++--
 .../messages/KiloBundle_nl.properties         | 12 ++--
 .../messages/KiloBundle_no.properties         | 12 ++--
 .../messages/KiloBundle_pl.properties         | 12 ++--
 .../messages/KiloBundle_pt_BR.properties      | 12 ++--
 .../messages/KiloBundle_ru.properties         | 12 ++--
 .../messages/KiloBundle_th.properties         | 12 ++--
 .../messages/KiloBundle_tr.properties         | 12 ++--
 .../messages/KiloBundle_uk.properties         | 12 ++--
 .../messages/KiloBundle_zh_CN.properties      | 12 ++--
 .../messages/KiloBundle_zh_TW.properties      | 12 ++--
 .../client/actions/KiloRecoveryActionsTest.kt | 40 +++++++++++--
 .../client/session/ui/ConnectionPanelTest.kt  |  5 +-
 .../session/ui/EmptySessionPanelTest.kt       | 17 ------
 .../kilocode/client/testing/FakeAppRpcApi.kt  |  6 ++
 .../kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt   |  9 ++-
 31 files changed, 245 insertions(+), 198 deletions(-)
 create mode 100644 packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/actions/CoreInfoAction.kt

diff --git a/.changeset/jetbrains-download-cli.md b/.changeset/jetbrains-download-cli.md
index 013e629935..8885c1a880 100644
--- a/.changeset/jetbrains-download-cli.md
+++ b/.changeset/jetbrains-download-cli.md
@@ -2,4 +2,4 @@
 "@kilocode/kilo-jetbrains": patch
 ---
 
-Download the pinned Kilo CLI release at connect time instead of bundling CLI binaries in the plugin.
+Download the pinned Kilo Core release at connect time instead of bundling Core binaries in the plugin.
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
index 5c2691a6b1..a68352daa5 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
@@ -9,6 +9,7 @@ import ai.kilocode.backend.app.ConfigWarning
 import ai.kilocode.backend.app.LoadError
 import ai.kilocode.backend.app.LoadProgress
 import ai.kilocode.backend.app.ProfileResult
+import ai.kilocode.backend.cli.KiloCliPlatform
 import ai.kilocode.backend.cli.KiloProps
 import ai.kilocode.jetbrains.api.model.KiloProfile200Response
 import ai.kilocode.rpc.dto.ConfigPatchDto
@@ -54,6 +55,8 @@ class KiloAppRpcApiImpl : KiloAppRpcApi {
 
     override suspend fun cliVersion(): String = KiloProps.cliVersion()
 
+    override suspend fun cliPlatform(): String = KiloCliPlatform.current()
+
     override suspend fun retry() = app.retry()
 
     override suspend fun restart() = app.restart()
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/actions/CoreInfoAction.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/actions/CoreInfoAction.kt
new file mode 100644
index 0000000000..1bad925ec0
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/actions/CoreInfoAction.kt
@@ -0,0 +1,27 @@
+package ai.kilocode.client.actions
+
+import ai.kilocode.client.app.KiloAppService
+import ai.kilocode.client.plugin.KiloBundle
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
+import com.intellij.openapi.project.DumbAware
+
+class CoreInfoAction : AnAction(), DumbAware {
+    override fun actionPerformed(e: AnActionEvent) = Unit
+
+    override fun update(e: AnActionEvent) {
+        val app = service<KiloAppService>()
+        val info = app.core
+        if (info == null) app.fetchCoreInfoAsync()
+        e.presentation.text = info?.let {
+            KiloBundle.message("action.Kilo.CoreInfo.text", it.version, it.platform)
+        } ?: KiloBundle.message("action.Kilo.CoreInfo.loading")
+        e.presentation.description = KiloBundle.message("action.Kilo.CoreInfo.description")
+        e.presentation.isEnabled = false
+        e.presentation.isVisible = true
+    }
+
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
+}
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
index 2ef806cfa9..7edea34c4a 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
@@ -27,7 +27,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
 /**
- * App-level frontend service for Kilo CLI interaction.
+ * App-level frontend service for Kilo Core interaction.
  *
  * Communicates with the backend via [KiloAppRpcApi]. All operations
  * are app-scoped — no project context is needed.
@@ -47,10 +47,13 @@ class KiloAppService internal constructor(
 
     private val started = AtomicBoolean(false)
 
-    /** CLI version string from the last successful health check, or null if unknown. */
+    /** Core version and platform from the backend, or null if unknown. */
     @Volatile
-    var version: String? = null
-        private set
+    private var info: CoreInfo? = null
+
+    val core: CoreInfo? get() = info
+
+    val version: String? get() = info?.version
 
     internal val _state = MutableStateFlow(init)
     val state: StateFlow<KiloAppStateDto> = _state.asStateFlow()
@@ -80,6 +83,9 @@ class KiloAppService internal constructor(
 
     private fun onState(state: KiloAppStateDto) {
         _state.value = state
+        val version = state.downloadVersion
+        val platform = state.downloadPlatform
+        if (version != null && platform != null) info = CoreInfo(version, platform)
         if (state.status == KiloAppStatusDto.READY) refreshModelFavoritesAsync()
     }
 
@@ -96,20 +102,20 @@ class KiloAppService internal constructor(
         call { retry() }
     }
 
-    /** Kill the CLI process and restart it. */
+    /** Kill the Core process and restart it. */
     suspend fun restart() {
         LOG.info("restart: resetting state and sending RPC")
         started.set(false)
-        version = null
+        info = null
         call { restart() }
         LOG.info("restart: RPC returned — backend restart complete")
     }
 
-    /** Kill the CLI process, re-extract the binary, and restart. */
+    /** Kill the Core process, re-download the binary, and restart. */
     suspend fun reinstall() {
         LOG.info("reinstall: resetting state and sending RPC")
         started.set(false)
-        version = null
+        info = null
         call { reinstall() }
         LOG.info("reinstall: RPC returned — backend reinstall complete")
     }
@@ -131,32 +137,41 @@ class KiloAppService internal constructor(
         cs.launch { reinstall() }
     }
 
-    suspend fun cliVersion(): String? = try {
-        call { cliVersion() }
+    suspend fun coreInfo(): CoreInfo? = try {
+        val next = CoreInfo(
+            version = call { cliVersion() },
+            platform = call { cliPlatform() },
+        )
+        info = next
+        next
     } catch (e: Exception) {
-        LOG.warn("cliVersion failed", e)
+        LOG.warn("core info failed", e)
         null
     }
 
-    /** Fetch the pinned CLI version and cache it. */
-    fun fetchVersionAsync(done: (String?) -> Unit = {}) {
-        version?.let {
+    /** Fetch the pinned Core version and platform and cache it. */
+    fun fetchCoreInfoAsync(done: (CoreInfo?) -> Unit = {}) {
+        info?.let {
             done(it)
             return
         }
         cs.launch {
-            LOG.info("fetchVersion: requesting CLI version")
-            val text = cliVersion()
-            if (text == null) {
+            LOG.info("fetchCoreInfo: requesting Core version and platform")
+            val next = coreInfo()
+            if (next == null) {
                 done(null)
                 return@launch
             }
-            version = text
-            done(text)
-            LOG.info("fetchVersion: CLI version is $text")
+            done(next)
+            LOG.info("fetchCoreInfo: Core version is ${next.version} (${next.platform})")
         }
     }
 
+    /** Fetch the pinned Core version and cache it. */
+    fun fetchVersionAsync(done: (String?) -> Unit = {}) {
+        fetchCoreInfoAsync { done(it?.version) }
+    }
+
     fun refreshModelFavoritesAsync() {
         cs.launch {
             try {
@@ -310,7 +325,7 @@ class KiloAppService internal constructor(
     fun watch(fn: (KiloAppStateDto) -> Unit): Job {
         return cs.launch {
             state.collect { next ->
-                if (next.status == KiloAppStatusDto.READY) fetchVersionAsync()
+                if (next.status == KiloAppStatusDto.READY) fetchCoreInfoAsync()
                 fn(next)
             }
         }
@@ -325,6 +340,8 @@ class KiloAppService internal constructor(
     }
 }
 
+data class CoreInfo(val version: String, val platform: String)
+
 private fun summary(patch: ConfigPatchDto): String {
     val values = patch.values.keys.sorted().joinToString(",").ifEmpty { "none" }
     return "values=$values agents=${patch.agents.size}"
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 08e8faaede..2e7945cd4e 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
@@ -485,14 +485,8 @@ class SessionUi(
                         activity = { manager?.activity() ?: sessions.activity() },
                         titles = { manager?.titles().orEmpty() },
                         timers = timers,
-                        cliVersion = app.version,
                     )
                     empty = panel
-                    app.fetchVersionAsync { version ->
-                        ApplicationManager.getApplication().invokeLater {
-                            if (!disposed && empty === panel) panel.setCliVersion(version)
-                        }
-                    }
                     scroll.show(panel.view)
                 }
 
@@ -503,7 +497,6 @@ class SessionUi(
 
                 is SessionControllerEvent.AppChanged -> {
                     prompt.setReady(controller.model.isReady())
-                    empty?.setCliVersion(app.version)
                 }
 
                 is SessionControllerEvent.WorkspaceChanged -> {
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt
index c8b7a7cdc5..f277884c26 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/empty/EmptySessionPanel.kt
@@ -55,7 +55,6 @@ class EmptySessionPanel(
     private val titles: () -> Map<String, String> = { emptyMap() },
     private val browse: (String) -> Unit = BrowserUtil::browse,
     private val timers: UiTimerSource = UiTimers,
-    cliVersion: String? = null,
 ) : BorderLayoutPanel(), Disposable, SessionEditorStyleTarget {
     val view: Align = align(HAlign.CENTER, VAlign.CENTER)
 
@@ -74,13 +73,6 @@ class EmptySessionPanel(
         setAllowAutoWrapping(true)
     }
 
-    private val versionLabel = JBLabel().apply {
-        foreground = UIUtil.getContextHelpForeground()
-        font = com.intellij.util.ui.JBFont.small()
-        horizontalAlignment = JBLabel.CENTER
-        isVisible = false
-    }
-
     private val description = object : BorderLayoutPanel() {
         override fun getPreferredSize(): Dimension {
             val size = super.getPreferredSize()
@@ -120,15 +112,11 @@ class EmptySessionPanel(
         ).apply {
             horizontalAlignment = JBLabel.CENTER
         }
-        val logoBlock = Stack.vertical(gap = UiStyle.Gap.xs())
-            .next(logo)
-            .next(versionLabel)
         val header = BorderLayoutPanel(0, gap).apply {
             isOpaque = false
-            add(logoBlock, BorderLayout.NORTH)
+            add(logo, BorderLayout.NORTH)
             add(description.align(HAlign.CENTER, VAlign.CENTER), BorderLayout.CENTER)
         }
-        setCliVersion(cliVersion)
 
         val south = BorderLayoutPanel().apply {
             isOpaque = false
@@ -170,15 +158,6 @@ class EmptySessionPanel(
 
     internal fun feedbackContent(open: (String) -> Unit = {}): JComponent = EmptySessionFeedback.content(open)
 
-    @RequiresEdt
-    fun setCliVersion(version: String?) {
-        val text = version?.takeIf { it.isNotBlank() }
-        versionLabel.text = text?.let { KiloBundle.message("session.empty.cliVersion", it) }.orEmpty()
-        versionLabel.isVisible = text != null
-        revalidate()
-        repaint()
-    }
-
     internal fun feedbackUrls() = EmptySessionFeedback.urls()
 
     internal fun showHistoryBorderPainted() = historyButton.isBorderPainted
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml b/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml
index ecb2986f96..1d913645b2 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml
@@ -105,6 +105,9 @@
         <action id="Kilo.Reinstall"
                 class="ai.kilocode.client.actions.ReinstallKiloAction"/>
 
+        <action id="Kilo.CoreInfo"
+                class="ai.kilocode.client.actions.CoreInfoAction"/>
+
         <action id="Kilo.OpenSettings"
                 class="ai.kilocode.client.actions.OpenSettingsAction"/>
 
@@ -114,9 +117,11 @@
         <action id="Kilo.OpenGlobalConfig"
                 class="ai.kilocode.client.actions.OpenGlobalConfigAction"/>
 
-        <group id="Kilo.CliGroup" text="CLI" popup="true">
+        <group id="Kilo.CliGroup" text="Core" popup="true">
             <reference ref="Kilo.Restart"/>
             <reference ref="Kilo.Reinstall"/>
+            <separator/>
+            <reference ref="Kilo.CoreInfo"/>
         </group>
 
         <group id="Kilo.OpenConfigGroup" text="Config Files" popup="true">
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 00285f7666..718b30439f 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
@@ -1,8 +1,8 @@
 common.delete=Delete
 
 session.connection.connecting=Loading...
-session.connection.downloading=Downloading Kilo CLI… {0}%
-session.connection.downloading.version=Downloading Kilo CLI v{0} ({1})… {2}%
+session.connection.downloading=Downloading Kilo Core… {0}%
+session.connection.downloading.version=Downloading Kilo Core v{0} ({1})… {2}%
 session.connection.error.app=Connection failed
 session.connection.error.workspace=Workspace loading failed
 session.connection.error.unknown=Unknown error
@@ -12,7 +12,6 @@ session.connection.warning.config=Configuration warnings
 notification.group.kilo=Kilo Code
 
 session.empty.welcome=Kilo Code is an AI coding assistant. Ask it to build features, fix bugs, or explain your codebase.
-session.empty.cliVersion=Kilo CLI v{0}
 session.account.balance=Balance: {0}
 session.account.switcher=Switch account
 session.empty.loading=Loading...
@@ -282,7 +281,7 @@ action.Kilo.ToolWindowToolbar.text=Kilo Toolbar
 settings.kilo.displayName=Kilo Code
 settings.kilo.description=Configure Kilo Code AI coding assistant features and account settings.
 settings.cli.unavailable.title=Kilo Code is not connected
-settings.cli.unavailable.message=Settings are available after Kilo Code connects to the CLI. If this does not resolve, restart the IDE or the Kilo CLI and try again.
+settings.cli.unavailable.message=Settings are available after Kilo Code connects to Core. If this does not resolve, restart the IDE or Kilo Core and try again.
 settings.models.displayName=Models
 settings.providers.displayName=Providers
 settings.agentBehavior.displayName=Agent Behavior
@@ -539,14 +538,17 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 action.Kilo.Restart.text=Restart
-action.Kilo.Restart.cli.text=Restart CLI
-action.Kilo.Restart.description=Kill and restart the CLI process
+action.Kilo.Restart.cli.text=Restart Core
+action.Kilo.Restart.description=Kill and restart the Core process
 action.Kilo.Reinstall.text=Reinstall
-action.Kilo.Reinstall.cli.text=Reinstall CLI
-action.Kilo.Reinstall.description=Re-extract the CLI binary and restart
+action.Kilo.Reinstall.cli.text=Reinstall Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
+action.Kilo.CoreInfo.text=Core v{0} • Architecture: {1}
+action.Kilo.CoreInfo.loading=Core details loading...
+action.Kilo.CoreInfo.description=Kilo Core version and architecture
 action.Kilo.Session.Open.text=Open
 action.Kilo.Session.Open.description=Open the selected session
 action.Kilo.Session.Rename.text=Rename
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 080f53bf16..54a06c1725 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=إيقاف جلسة Kilo الحالية
 action.Kilo.SettingsGroup.text=الإعدادات
 action.Kilo.SettingsGroup.description=إعدادات Kilo Code
 action.Kilo.Restart.text=إعادة تشغيل Kilo
-action.Kilo.Restart.cli.text=إعادة تشغيل CLI
-action.Kilo.Restart.description=إنهاء عملية CLI وإعادة تشغيلها
+action.Kilo.Restart.cli.text=إعادة تشغيل Core
+action.Kilo.Restart.description=إنهاء عملية Core وإعادة تشغيلها
 action.Kilo.Reinstall.text=إعادة تثبيت Kilo
-action.Kilo.Reinstall.cli.text=إعادة تثبيت CLI
-action.Kilo.Reinstall.description=استخراج CLI مجدداً وإعادة التشغيل
+action.Kilo.Reinstall.cli.text=إعادة تثبيت Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=فتح
 action.Kilo.Session.Open.description=فتح الجلسة المحددة
 action.Kilo.Session.Rename.text=إعادة تسمية
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 a68d6dd079..8589d3cc66 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Zaustavi trenutnu Kilo sesiju
 action.Kilo.SettingsGroup.text=Postavke
 action.Kilo.SettingsGroup.description=Postavke Kilo Code
 action.Kilo.Restart.text=Ponovo pokrenite Kilo
-action.Kilo.Restart.cli.text=Ponovo pokrenite CLI
-action.Kilo.Restart.description=Ugasite i ponovo pokrenite CLI proces
+action.Kilo.Restart.cli.text=Ponovo pokrenite Core
+action.Kilo.Restart.description=Ugasite i ponovo pokrenite Core proces
 action.Kilo.Reinstall.text=Ponovo instalirajte Kilo
-action.Kilo.Reinstall.cli.text=Ponovo instalirajte CLI
-action.Kilo.Reinstall.description=Ponovo raspakirajte CLI binarnu datoteku i ponovo pokrenite
+action.Kilo.Reinstall.cli.text=Ponovo instalirajte Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Otvori
 action.Kilo.Session.Open.description=Otvorite odabranu sesiju
 action.Kilo.Session.Rename.text=Preimenuj
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 d2d1ed7e20..b14a7d7f37 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Stop den aktuelle Kilo-session
 action.Kilo.SettingsGroup.text=Indstillinger
 action.Kilo.SettingsGroup.description=Kilo Code-indstillinger
 action.Kilo.Restart.text=Genstart Kilo
-action.Kilo.Restart.cli.text=Genstart CLI
-action.Kilo.Restart.description=Afslut og genstart CLI-processen
+action.Kilo.Restart.cli.text=Genstart Core
+action.Kilo.Restart.description=Afslut og genstart Core-processen
 action.Kilo.Reinstall.text=Geninstaller Kilo
-action.Kilo.Reinstall.cli.text=Geninstaller CLI
-action.Kilo.Reinstall.description=Udpak CLI-binærfilen igen og genstart
+action.Kilo.Reinstall.cli.text=Geninstaller Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Åbn
 action.Kilo.Session.Open.description=Åbn den valgte session
 action.Kilo.Session.Rename.text=Omdøb
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 7a7a691fef..508372e425 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Aktuelle Kilo-Sitzung stoppen
 action.Kilo.SettingsGroup.text=Einstellungen
 action.Kilo.SettingsGroup.description=Kilo Code Einstellungen
 action.Kilo.Restart.text=Kilo neu starten
-action.Kilo.Restart.cli.text=CLI neu starten
-action.Kilo.Restart.description=CLI-Prozess beenden und neu starten
+action.Kilo.Restart.cli.text=Core neu starten
+action.Kilo.Restart.description=Core-Prozess beenden und neu starten
 action.Kilo.Reinstall.text=Kilo neu installieren
-action.Kilo.Reinstall.cli.text=CLI neu installieren
-action.Kilo.Reinstall.description=CLI-Binärdatei neu extrahieren und neu starten
+action.Kilo.Reinstall.cli.text=Core neu installieren
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Öffnen
 action.Kilo.Session.Open.description=Ausgewählte Sitzung öffnen
 action.Kilo.Session.Rename.text=Umbenennen
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 baddfdc224..eaae1f4cbf 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Detener la sesión actual de Kilo
 action.Kilo.SettingsGroup.text=Configuración
 action.Kilo.SettingsGroup.description=Configuración de Kilo Code
 action.Kilo.Restart.text=Reiniciar Kilo
-action.Kilo.Restart.cli.text=Reiniciar CLI
-action.Kilo.Restart.description=Terminar y reiniciar el proceso CLI
+action.Kilo.Restart.cli.text=Reiniciar Core
+action.Kilo.Restart.description=Terminar y reiniciar el proceso Core
 action.Kilo.Reinstall.text=Reinstalar Kilo
-action.Kilo.Reinstall.cli.text=Reinstalar CLI
-action.Kilo.Reinstall.description=Reextraer el binario CLI y reiniciar
+action.Kilo.Reinstall.cli.text=Reinstalar Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Abrir
 action.Kilo.Session.Open.description=Abrir la sesión seleccionada
 action.Kilo.Session.Rename.text=Renombrar
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 1d938db28e..ba0795ca4e 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Arrêter la session Kilo actuelle
 action.Kilo.SettingsGroup.text=Paramètres
 action.Kilo.SettingsGroup.description=Paramètres de Kilo Code
 action.Kilo.Restart.text=Redémarrer Kilo
-action.Kilo.Restart.cli.text=Redémarrer CLI
-action.Kilo.Restart.description=Tuer et redémarrer le processus CLI
+action.Kilo.Restart.cli.text=Redémarrer Core
+action.Kilo.Restart.description=Tuer et redémarrer le processus Core
 action.Kilo.Reinstall.text=Réinstaller Kilo
-action.Kilo.Reinstall.cli.text=Réinstaller CLI
-action.Kilo.Reinstall.description=Réextraire le binaire CLI et redémarrer
+action.Kilo.Reinstall.cli.text=Réinstaller Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Ouvrir
 action.Kilo.Session.Open.description=Ouvrir la session sélectionnée
 action.Kilo.Session.Rename.text=Renommer
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 3912f106aa..360e312498 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=現在のKiloセッションを停止
 action.Kilo.SettingsGroup.text=設定
 action.Kilo.SettingsGroup.description=Kilo Codeの設定
 action.Kilo.Restart.text=Kiloを再起動
-action.Kilo.Restart.cli.text=CLIを再起動
-action.Kilo.Restart.description=CLIプロセスを終了して再起動
+action.Kilo.Restart.cli.text=Coreを再起動
+action.Kilo.Restart.description=Coreプロセスを終了して再起動
 action.Kilo.Reinstall.text=Kiloを再インストール
-action.Kilo.Reinstall.cli.text=CLIを再インストール
-action.Kilo.Reinstall.description=CLIバイナリを再展開して再起動
+action.Kilo.Reinstall.cli.text=Coreを再インストール
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=開く
 action.Kilo.Session.Open.description=選択したセッションを開く
 action.Kilo.Session.Rename.text=変名
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 82d758dce1..970ddaf16d 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=현재 Kilo 세션 정지
 action.Kilo.SettingsGroup.text=설정
 action.Kilo.SettingsGroup.description=Kilo Code 설정
 action.Kilo.Restart.text=Kilo 재시작
-action.Kilo.Restart.cli.text=CLI 재시작
-action.Kilo.Restart.description=CLI 프로세스 종료 후 재시작
+action.Kilo.Restart.cli.text=Core 재시작
+action.Kilo.Restart.description=Core 프로세스 종료 후 재시작
 action.Kilo.Reinstall.text=Kilo 재설치
-action.Kilo.Reinstall.cli.text=CLI 재설치
-action.Kilo.Reinstall.description=CLI 바이너리 재추출 후 재시작
+action.Kilo.Reinstall.cli.text=Core 재설치
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=열기
 action.Kilo.Session.Open.description=선택한 세션 열기
 action.Kilo.Session.Rename.text=이름 바꾸기
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 72e2813f19..7e19e9aee2 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Huidige Kilo-sessie stoppen
 action.Kilo.SettingsGroup.text=Instellingen
 action.Kilo.SettingsGroup.description=Kilo Code-instellingen
 action.Kilo.Restart.text=Kilo herstarten
-action.Kilo.Restart.cli.text=CLI herstarten
-action.Kilo.Restart.description=CLI-proces beëindigen en herstarten
+action.Kilo.Restart.cli.text=Core herstarten
+action.Kilo.Restart.description=Core-proces beëindigen en herstarten
 action.Kilo.Reinstall.text=Kilo herinstalleren
-action.Kilo.Reinstall.cli.text=CLI herinstalleren
-action.Kilo.Reinstall.description=CLI-binair opnieuw uitpakken en herstarten
+action.Kilo.Reinstall.cli.text=Core herinstalleren
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Openen
 action.Kilo.Session.Open.description=Geselecteerde sessie openen
 action.Kilo.Session.Rename.text=Hernoemen
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 77052f9367..d55e8a0166 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
@@ -139,11 +139,11 @@ action.Kilo.StopSession.description=Stopp gjeldende Kilo-økt
 action.Kilo.SettingsGroup.text=Innstillinger
 action.Kilo.SettingsGroup.description=Kilo Code-innstillinger
 action.Kilo.Restart.text=Start Kilo på nytt
-action.Kilo.Restart.cli.text=Start CLI på nytt
-action.Kilo.Restart.description=Avslutt og start CLI-prosessen på nytt
+action.Kilo.Restart.cli.text=Start Core på nytt
+action.Kilo.Restart.description=Avslutt og start Core-prosessen på nytt
 action.Kilo.Reinstall.text=Installer Kilo på nytt
-action.Kilo.Reinstall.cli.text=Installer CLI på nytt
-action.Kilo.Reinstall.description=Pakk ut CLI-binærfilen på nytt og start på nytt
+action.Kilo.Reinstall.cli.text=Installer Core på nytt
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Åpne
 action.Kilo.Session.Open.description=Åpne valgt økt
 action.Kilo.Session.Rename.text=Gi nytt navn
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 171ac2d824..dfa0f2442d 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
@@ -139,11 +139,11 @@ action.Kilo.StopSession.description=Zatrzymaj bieżącą sesję Kilo
 action.Kilo.SettingsGroup.text=Ustawienia
 action.Kilo.SettingsGroup.description=Ustawienia Kilo Code
 action.Kilo.Restart.text=Uruchom ponownie Kilo
-action.Kilo.Restart.cli.text=Uruchom ponownie CLI
-action.Kilo.Restart.description=Zakończ i uruchom ponownie proces CLI
+action.Kilo.Restart.cli.text=Uruchom ponownie Core
+action.Kilo.Restart.description=Zakończ i uruchom ponownie proces Core
 action.Kilo.Reinstall.text=Zainstaluj ponownie Kilo
-action.Kilo.Reinstall.cli.text=Zainstaluj ponownie CLI
-action.Kilo.Reinstall.description=Ponownie wyodrębnij plik binarny CLI i uruchom ponownie
+action.Kilo.Reinstall.cli.text=Zainstaluj ponownie Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Otwórz
 action.Kilo.Session.Open.description=Otwórz wybraną sesję
 action.Kilo.Session.Rename.text=Zmień nazwę
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 cec8cecbdd..aac69eaae9 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
@@ -139,11 +139,11 @@ action.Kilo.StopSession.description=Parar a sessão atual do Kilo
 action.Kilo.SettingsGroup.text=Configurações
 action.Kilo.SettingsGroup.description=Configurações do Kilo Code
 action.Kilo.Restart.text=Reiniciar Kilo
-action.Kilo.Restart.cli.text=Reiniciar CLI
-action.Kilo.Restart.description=Encerrar e reiniciar o processo CLI
+action.Kilo.Restart.cli.text=Reiniciar Core
+action.Kilo.Restart.description=Encerrar e reiniciar o processo Core
 action.Kilo.Reinstall.text=Reinstalar Kilo
-action.Kilo.Reinstall.cli.text=Reinstalar CLI
-action.Kilo.Reinstall.description=Reextrair o binário CLI e reiniciar
+action.Kilo.Reinstall.cli.text=Reinstalar Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Abrir
 action.Kilo.Session.Open.description=Abrir a sessão selecionada
 action.Kilo.Session.Rename.text=Renomear
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 f9528d1e32..edf8aea4b5 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
@@ -139,11 +139,11 @@ action.Kilo.StopSession.description=Остановить текущую сесс
 action.Kilo.SettingsGroup.text=Настройки
 action.Kilo.SettingsGroup.description=Настройки Kilo Code
 action.Kilo.Restart.text=Перезапустить Kilo
-action.Kilo.Restart.cli.text=Перезапустить CLI
-action.Kilo.Restart.description=Завершить и перезапустить CLI-процесс
+action.Kilo.Restart.cli.text=Перезапустить Core
+action.Kilo.Restart.description=Завершить и перезапустить Core-процесс
 action.Kilo.Reinstall.text=Переустановить Kilo
-action.Kilo.Reinstall.cli.text=Переустановить CLI
-action.Kilo.Reinstall.description=Переизвлечь CLI-бинарник и перезапустить
+action.Kilo.Reinstall.cli.text=Переустановить Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Открыть
 action.Kilo.Session.Open.description=Открыть выбранную сессию
 action.Kilo.Session.Rename.text=Переименовать
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 c07d2fe693..192fbafa39 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
@@ -139,11 +139,11 @@ action.Kilo.StopSession.description=หยุดเซสชัน Kilo ปั
 action.Kilo.SettingsGroup.text=การตั้งค่า
 action.Kilo.SettingsGroup.description=การตั้งค่า Kilo Code
 action.Kilo.Restart.text=รีสตาร์ต Kilo
-action.Kilo.Restart.cli.text=รีสตาร์ต CLI
-action.Kilo.Restart.description=สิ้นสุดและรีสตาร์ตกระบวนการ CLI
+action.Kilo.Restart.cli.text=รีสตาร์ต Core
+action.Kilo.Restart.description=สิ้นสุดและรีสตาร์ตกระบวนการ Core
 action.Kilo.Reinstall.text=ติดตั้ง Kilo ใหม่
-action.Kilo.Reinstall.cli.text=ติดตั้ง CLI ใหม่
-action.Kilo.Reinstall.description=แตกไฟล์ไบนารี CLI อีกครั้งและรีสตาร์ต
+action.Kilo.Reinstall.cli.text=ติดตั้ง Core ใหม่
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=เปิด
 action.Kilo.Session.Open.description=เปิดเซสชันที่เลือก
 action.Kilo.Session.Rename.text=เปลี่ยนชื่อ
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 ed9646acac..3976303b09 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
@@ -139,11 +139,11 @@ action.Kilo.StopSession.description=Geçerli Kilo oturumunu durdur
 action.Kilo.SettingsGroup.text=Ayarlar
 action.Kilo.SettingsGroup.description=Kilo Code ayarları
 action.Kilo.Restart.text=Kilo’yu yeniden başlat
-action.Kilo.Restart.cli.text=CLI’yi yeniden başlat
-action.Kilo.Restart.description=CLI sürecini sonlandır ve yeniden başlat
+action.Kilo.Restart.cli.text=Core’yi yeniden başlat
+action.Kilo.Restart.description=Core sürecini sonlandır ve yeniden başlat
 action.Kilo.Reinstall.text=Kilo’yu yeniden yükle
-action.Kilo.Reinstall.cli.text=CLI’yi yeniden yükle
-action.Kilo.Reinstall.description=CLI ikili dosyasını yeniden çıkar ve yeniden başlat
+action.Kilo.Reinstall.cli.text=Core’yi yeniden yükle
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Aç
 action.Kilo.Session.Open.description=Seçilen oturumu aç
 action.Kilo.Session.Rename.text=Yeniden adlandır
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 7b6911cf73..6594c293af 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=Зупинити поточну сесію K
 action.Kilo.SettingsGroup.text=Налаштування
 action.Kilo.SettingsGroup.description=Налаштування Kilo Code
 action.Kilo.Restart.text=Перезапустити Kilo
-action.Kilo.Restart.cli.text=Перезапустити CLI
-action.Kilo.Restart.description=Завершити і перезапустити CLI-процес
+action.Kilo.Restart.cli.text=Перезапустити Core
+action.Kilo.Restart.description=Завершити і перезапустити Core-процес
 action.Kilo.Reinstall.text=Перевстановити Kilo
-action.Kilo.Reinstall.cli.text=Перевстановити CLI
-action.Kilo.Reinstall.description=Перерозпакувати CLI-бінарний файл і перезапустити
+action.Kilo.Reinstall.cli.text=Перевстановити Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=Відкрити
 action.Kilo.Session.Open.description=Відкрити вибрану сесію
 action.Kilo.Session.Rename.text=Перейменувати
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 eedfaf9fa9..959b9c8c9d 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=停止当前 Kilo 会话
 action.Kilo.SettingsGroup.text=设置
 action.Kilo.SettingsGroup.description=Kilo Code 设置
 action.Kilo.Restart.text=重启 Kilo
-action.Kilo.Restart.cli.text=重启 CLI
-action.Kilo.Restart.description=终止并重启 CLI 进程
+action.Kilo.Restart.cli.text=重启 Core
+action.Kilo.Restart.description=终止并重启 Core 进程
 action.Kilo.Reinstall.text=重新安装 Kilo
-action.Kilo.Reinstall.cli.text=重新安装 CLI
-action.Kilo.Reinstall.description=重新解压 CLI 二进制文件并重启
+action.Kilo.Reinstall.cli.text=重新安装 Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=打开
 action.Kilo.Session.Open.description=打开所选会话
 action.Kilo.Session.Rename.text=重命名
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
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 6021a8790a..b9e0268c87 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
@@ -134,11 +134,11 @@ action.Kilo.StopSession.description=停止目前的 Kilo 工作階段
 action.Kilo.SettingsGroup.text=設定
 action.Kilo.SettingsGroup.description=Kilo Code 設定
 action.Kilo.Restart.text=重啟 Kilo
-action.Kilo.Restart.cli.text=重啟 CLI
-action.Kilo.Restart.description=終止並重啟 CLI 程序
+action.Kilo.Restart.cli.text=重啟 Core
+action.Kilo.Restart.description=終止並重啟 Core 程序
 action.Kilo.Reinstall.text=重新安裝 Kilo
-action.Kilo.Reinstall.cli.text=重新安裝 CLI
-action.Kilo.Reinstall.description=重新解壓縮 CLI 二進位檔案並重啟
+action.Kilo.Reinstall.cli.text=重新安裝 Core
+action.Kilo.Reinstall.description=Download a fresh Core binary and restart
 action.Kilo.Session.Open.text=開啟
 action.Kilo.Session.Open.description=開啟所選工作階段
 action.Kilo.Session.Rename.text=重命名
@@ -310,8 +310,8 @@ action.Kilo.OpenGlobalConfig.text=Open: global {0}
 action.Kilo.CreateGlobalConfig.text=Create: global {0}
 action.Kilo.OpenGlobalConfig.description=Open or create the global Kilo config file
 action.Kilo.OpenConfig.failed=Failed to open Kilo config file
-action.Kilo.CliGroup.text=CLI
-action.Kilo.CliGroup.description=Kilo CLI actions
+action.Kilo.CliGroup.text=Core
+action.Kilo.CliGroup.description=Kilo Core actions
 settings.agentBehavior.agents.import.title=Import Agent Definition
 settings.agentBehavior.agents.import.description=Choose a .agent.json file exported from Kilo Code.
 settings.agentBehavior.agents.import.progress=Importing agent definition...
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/actions/KiloRecoveryActionsTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/actions/KiloRecoveryActionsTest.kt
index 14b0d61e4e..8629fa1c76 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/actions/KiloRecoveryActionsTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/actions/KiloRecoveryActionsTest.kt
@@ -1,8 +1,10 @@
 package ai.kilocode.client.actions
 
+import ai.kilocode.client.app.KiloAppService
 import ai.kilocode.client.app.KiloWorkspaceService
 import ai.kilocode.client.app.Workspace
 import ai.kilocode.client.session.SessionManager
+import ai.kilocode.client.testing.FakeAppRpcApi
 import ai.kilocode.client.testing.FakeWorkspaceRpcApi
 import ai.kilocode.rpc.dto.ConfigTargetDto
 import ai.kilocode.rpc.dto.KiloWorkspaceStateDto
@@ -30,11 +32,18 @@ import kotlinx.coroutines.withTimeout
 class KiloRecoveryActionsTest : BasePlatformTestCase() {
     private lateinit var scope: CoroutineScope
     private lateinit var rpc: FakeWorkspaceRpcApi
+    private lateinit var appRpc: FakeAppRpcApi
 
     override fun setUp() {
         super.setUp()
         scope = CoroutineScope(SupervisorJob())
         rpc = FakeWorkspaceRpcApi()
+        appRpc = FakeAppRpcApi()
+        ApplicationManager.getApplication().replaceService(
+            KiloAppService::class.java,
+            KiloAppService(scope, appRpc),
+            testRootDisposable,
+        )
         ApplicationManager.getApplication().replaceService(
             KiloWorkspaceService::class.java,
             KiloWorkspaceService(scope, rpc),
@@ -68,38 +77,55 @@ class KiloRecoveryActionsTest : BasePlatformTestCase() {
         assertTrue("Reinstall should force-enable recovery action", event.presentation.isEnabled)
     }
 
-    fun `test restart action adds cli suffix in connection retry popup`() {
+    fun `test restart action adds core suffix in connection retry popup`() {
         val action = RestartKiloAction()
         val event = event(action, place = KiloActionPlaces.connectionRetryPopup())
 
         update(action, event)
 
-        assertEquals("Restart CLI", event.presentation.text)
+        assertEquals("Restart Core", event.presentation.text)
     }
 
-    fun `test reinstall action adds cli suffix in connection retry popup`() {
+    fun `test reinstall action adds core suffix in connection retry popup`() {
         val action = ReinstallKiloAction()
         val event = event(action, place = KiloActionPlaces.connectionRetryPopup())
 
         update(action, event)
 
-        assertEquals("Reinstall CLI", event.presentation.text)
+        assertEquals("Reinstall Core", event.presentation.text)
     }
 
-    fun `test cli group has visible menu text`() {
+    fun `test core group has visible menu text and info action`() {
         val xml = requireNotNull(javaClass.classLoader.getResourceAsStream("kilo.jetbrains.frontend.xml"))
             .bufferedReader()
             .use { it.readText() }
 
-        assertTrue(xml.contains("<group id=\"Kilo.CliGroup\" text=\"CLI\" popup=\"true\">"))
+        assertTrue(xml.contains("<group id=\"Kilo.CliGroup\" text=\"Core\" popup=\"true\">"))
         assertTrue(xml.contains("<reference ref=\"Kilo.Restart\"/>"))
         assertTrue(xml.contains("<reference ref=\"Kilo.Reinstall\"/>"))
+        assertTrue(xml.contains("<reference ref=\"Kilo.CoreInfo\"/>"))
         assertTrue(xml.contains("<group id=\"Kilo.OpenConfigGroup\" text=\"Config Files\" popup=\"true\">"))
         assertTrue(xml.contains("<reference ref=\"Kilo.OpenConfigGroup\"/>"))
         assertFalse(xml.contains("<action id=\"Kilo.ShowProfile\""))
         assertFalse(xml.contains("<reference ref=\"Kilo.ShowProfile\"/>"))
     }
 
+    fun `test core info action shows version and architecture`() {
+        appRpc.cliVersion = "1.2.3"
+        appRpc.cliPlatform = "darwin-arm64"
+        ApplicationManager.getApplication().executeOnPooledThread {
+            runBlocking { app().coreInfo() }
+        }.get()
+        val action = CoreInfoAction()
+        val event = event(action)
+
+        update(action, event)
+
+        assertFalse(event.presentation.isEnabled)
+        assertTrue(event.presentation.isVisible)
+        assertEquals("Core v1.2.3 • Architecture: darwin-arm64", event.presentation.text)
+    }
+
     fun `test local config action says open when target exists`() {
         rpc.localConfigPath = "/test/.kilo/kilo.jsonc"
         rpc.localConfigDisplayPath = "~/.kilo/kilo.jsonc"
@@ -311,6 +337,8 @@ class KiloRecoveryActionsTest : BasePlatformTestCase() {
 
     private fun service(): KiloWorkspaceService = ApplicationManager.getApplication().getService(KiloWorkspaceService::class.java)
 
+    private fun app(): KiloAppService = ApplicationManager.getApplication().getService(KiloAppService::class.java)
+
     private fun cacheGlobal(target: ConfigTargetDto) {
         val field = KiloWorkspaceService::class.java.getDeclaredField("globalConfig")
         field.isAccessible = true
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt
index f969235bb9..e7253e5867 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ConnectionPanelTest.kt
@@ -94,7 +94,7 @@ class ConnectionPanelTest : SessionControllerTestBase() {
         assertEquals("Try again", panel.retryText())
     }
 
-    fun `test retry popup group uses cli recovery actions`() {
+    fun `test retry popup group uses core recovery actions`() {
         edt {
             panel.onEvent(SessionControllerEvent.ConnectionChanged.ShowError("CLI startup failed", null))
         }
@@ -104,9 +104,10 @@ class ConnectionPanelTest : SessionControllerTestBase() {
 
         assertTrue(panel.retryVisible())
         assertEquals("Kilo.CliGroup", ConnectionPanel.CLI_GROUP_ID)
-        assertTrue(xml.contains("<group id=\"Kilo.CliGroup\" text=\"CLI\" popup=\"true\">"))
+        assertTrue(xml.contains("<group id=\"Kilo.CliGroup\" text=\"Core\" popup=\"true\">"))
         assertTrue(xml.contains("<reference ref=\"Kilo.Restart\"/>"))
         assertTrue(xml.contains("<reference ref=\"Kilo.Reinstall\"/>"))
+        assertTrue(xml.contains("<reference ref=\"Kilo.CoreInfo\"/>"))
     }
 
     fun `test ready warnings show collapsed banner with retry`() {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt
index 6f362a0449..d0c6f0b0ea 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/EmptySessionPanelTest.kt
@@ -138,23 +138,6 @@ class EmptySessionPanelTest : BasePlatformTestCase() {
         )
     }
 
-    fun `test cli version line updates`() {
-        val panel = panel()
-        val text = KiloBundle.message("session.empty.cliVersion", "1.2.3")
-
-        panel.setCliVersion("1.2.3")
-        val label = UIUtil.uiTraverser(panel)
-            .filter(JBLabel::class.java)
-            .first { it.text == text }
-
-        assertTrue(label.isVisible)
-
-        panel.setCliVersion(null)
-
-        assertEquals("", label.text)
-        assertFalse(label.isVisible)
-    }
-
     fun `test selecting recent session does not open it`() {
         val panel = panel(listOf(session("ses_1"), session("ses_2")))
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
index 546ba6e55f..bc67e9f2d8 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
@@ -32,6 +32,7 @@ class FakeAppRpcApi : KiloAppRpcApi {
     val state = MutableStateFlow(KiloAppStateDto(KiloAppStatusDto.DISCONNECTED))
     var health = HealthDto(healthy = true, version = "1.0.0")
     var cliVersion = "1.0.0"
+    var cliPlatform = "darwin-arm64"
     var models = ModelStateDto()
     val selections = mutableListOf<ModelSelectionUpdateDto>()
     val cleared = mutableListOf<String>()
@@ -73,6 +74,11 @@ class FakeAppRpcApi : KiloAppRpcApi {
         return cliVersion
     }
 
+    override suspend fun cliPlatform(): String {
+        assertNotEdt("cliPlatform")
+        return cliPlatform
+    }
+
     override suspend fun retry() {
         assertNotEdt("retry")
         retries += 1
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt
index 91f43499ca..e05b4c3bdf 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAppRpcApi.kt
@@ -39,16 +39,19 @@ interface KiloAppRpcApi : RemoteApi<Unit> {
     /** One-shot health check against /global/health. */
     suspend fun health(): HealthDto
 
-    /** Pinned CLI version bundled in backend resources. */
+    /** Pinned Core version bundled in backend resources. */
     suspend fun cliVersion(): String
 
+    /** Core platform downloaded by the backend process. */
+    suspend fun cliPlatform(): String
+
     /** Retry app connection or loading after a failure. */
     suspend fun retry()
 
-    /** Kill the CLI process and restart it. */
+    /** Kill the Core process and restart it. */
     suspend fun restart()
 
-    /** Kill the CLI process, re-extract the binary, and restart. */
+    /** Kill the Core process, re-download the binary, and restart. */
     suspend fun reinstall()
 
     /** Load persisted CLI model state such as favorites. */

From a435baedaca3055c5b34983f979c64fe1a136614 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 16:10:38 -0400
Subject: [PATCH 06/68] fix(jetbrains): address runtime CLI review feedback

---
 .changeset/jetbrains-download-cli.md          |  2 +-
 .../kilo-jetbrains/backend/build.gradle.kts   |  3 +-
 .../backend/app/KiloBackendAppService.kt      |  2 +-
 .../backend/app/KiloBackendSessionManager.kt  | 14 ++-
 .../kilocode/backend/cli/KiloCliDownloader.kt | 97 ++++++++++++++++---
 .../kilocode/backend/rpc/KiloAppRpcApiImpl.kt | 11 ++-
 .../backend/app/KiloBackendAppServiceTest.kt  | 30 +++++-
 .../backend/cli/KiloCliDownloaderTest.kt      | 60 +++++++++++-
 .../workspace/KiloBackendWorkspaceTest.kt     | 14 +++
 .../main/kotlin/GenerateOpenApiSpecTask.kt    | 77 ++++++++++++++-
 .../ai/kilocode/client/app/KiloAppService.kt  |  2 +-
 11 files changed, 277 insertions(+), 35 deletions(-)

diff --git a/.changeset/jetbrains-download-cli.md b/.changeset/jetbrains-download-cli.md
index 8885c1a880..82f2b3bb0b 100644
--- a/.changeset/jetbrains-download-cli.md
+++ b/.changeset/jetbrains-download-cli.md
@@ -2,4 +2,4 @@
 "@kilocode/kilo-jetbrains": patch
 ---
 
-Download the pinned Kilo Core release at connect time instead of bundling Core binaries in the plugin.
+Reduce JetBrains plugin size by downloading the Kilo Core release on first connect.
diff --git a/packages/kilo-jetbrains/backend/build.gradle.kts b/packages/kilo-jetbrains/backend/build.gradle.kts
index 65da6183ab..f666039987 100644
--- a/packages/kilo-jetbrains/backend/build.gradle.kts
+++ b/packages/kilo-jetbrains/backend/build.gradle.kts
@@ -18,8 +18,7 @@ val rawSpec = layout.buildDirectory.file("generated/openapi-spec/openapi.raw.jso
 val generatedSpec = layout.buildDirectory.file("generated/openapi-spec/openapi.json")
 val generatedProps = layout.buildDirectory.dir("generated/kilo-props")
 
-val pinnedCliVersion = providers.provider {
-    val text = rootProject.layout.projectDirectory.file("package.json").asFile.readText()
+val pinnedCliVersion = providers.fileContents(rootProject.layout.projectDirectory.file("package.json")).asText.map { text ->
     Regex("\"version\"\\s*:\\s*\"([^\"]+)\"").find(text)?.groupValues?.get(1)
         ?: error("Could not read version from package.json")
 }
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
index 5b3cefd0b7..c815f95444 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
@@ -97,7 +97,7 @@ class KiloBackendAppService private constructor(
         private const val MAX_RETRIES = 3
         private const val RETRY_DELAY_MS = 1000L
         private const val APP_LOAD_TIMEOUT_MS = 30_000L
-        private const val READY_TIMEOUT_MS = 5_000L
+        private const val READY_TIMEOUT_MS = 120_000L
 
         /** Test factory — no IntelliJ deps needed. */
         internal fun create(
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
index 51dbab9728..9df08f4723 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
@@ -271,8 +271,8 @@ class KiloBackendSessionManager(
         title = s.title,
         version = s.version,
         time = SessionTimeDto(
-            created = s.time.created.toDouble(),
-            updated = s.time.updated.toDouble(),
+            created = time(s.id, "created", s.time.created),
+            updated = time(s.id, "updated", s.time.updated),
             archived = s.time.archived,
         ),
         summary = s.summary?.let {
@@ -292,8 +292,8 @@ class KiloBackendSessionManager(
         title = s.title,
         version = s.version,
         time = SessionTimeDto(
-            created = s.time.created?.toDouble() ?: 0.0,
-            updated = s.time.updated?.toDouble() ?: 0.0,
+            created = time(s.id, "created", s.time.created),
+            updated = time(s.id, "updated", s.time.updated),
             archived = s.time.archived,
         ),
         summary = s.summary?.let {
@@ -315,6 +315,12 @@ class KiloBackendSessionManager(
 
     private fun encode(value: String) = java.net.URLEncoder.encode(value, Charsets.UTF_8)
 
+    private fun time(id: String, field: String, value: Number?): Double {
+        if (value != null) return value.toDouble()
+        log.warn("Session $id missing $field timestamp; defaulting to 0.0")
+        return 0.0
+    }
+
     private fun escape(value: String) = buildString {
         for (c in value) {
             when (c) {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
index 22cdf29277..b0e75d4248 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -5,53 +5,104 @@ import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.util.SystemInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+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 okhttp3.OkHttpClient
 import okhttp3.Request
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
 import java.io.File
+import java.security.MessageDigest
+import java.util.concurrent.TimeUnit
 import java.util.zip.ZipInputStream
 import kotlin.math.roundToInt
 
 class KiloCliDownloader(
-    private val http: OkHttpClient = OkHttpClient(),
+    private val http: OkHttpClient = OkHttpClient.Builder()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(120, TimeUnit.SECONDS)
+        .writeTimeout(120, TimeUnit.SECONDS)
+        .build(),
     private val log: KiloLog = KiloLog.create(KiloCliDownloader::class.java),
     private val root: File = File(PathManager.getSystemPath(), "kilo/cli"),
     private val baseUrl: String = "https://github.com/Kilo-Org/kilocode/releases/download",
+    private val api: String = "https://api.github.com/repos/Kilo-Org/kilocode/releases/tags",
 ) {
+    companion object {
+        private val DIGEST = Regex("^sha256:[a-f0-9]{64}$")
+        private val JSON = Json { ignoreUnknownKeys = true }
+    }
+
     suspend fun resolve(version: String, force: Boolean = false, onProgress: (CliDownload) -> Unit = {}): File =
         withContext(Dispatchers.IO) {
             val platform = KiloCliPlatform.current()
             val dir = File(File(root, version), platform)
             val exe = File(dir, "bin/${KiloCliPlatform.exe()}")
             val done = File(dir, ".complete")
+            val cached = done.takeIf { it.isFile }?.readText()?.trim()
+            val ext = KiloCliPlatform.archive(platform)
+            val archive = File(dir, "kilo-$platform.$ext")
 
-            if (force && dir.exists()) {
-                log.info("Deleting cached CLI $version under ${dir.absolutePath}")
-                dir.deleteRecursively()
-            }
-
-            if (exe.isFile && done.isFile) {
+            if (!force && exe.isFile && cached != null && cached.matches(DIGEST) && matches(archive, cached)) {
                 log.info("Using cached Kilo CLI $version for $platform at ${exe.absolutePath}")
                 if (!SystemInfo.isWindows) exe.setExecutable(true)
                 return@withContext exe
             }
 
+            val digest = asset(version, platform, ext)
+
+            if (dir.exists()) {
+                log.info("Deleting cached CLI $version under ${dir.absolutePath}")
+                if (!dir.deleteRecursively()) {
+                    throw IllegalStateException("Failed to delete cached Kilo CLI $version under ${dir.absolutePath}")
+                }
+            }
+
+            if (!dir.isDirectory && !dir.mkdirs()) {
+                throw IllegalStateException("Failed to create Kilo CLI cache directory ${dir.absolutePath}")
+            }
+
             log.info("Kilo CLI $version for $platform is not cached; downloading new release into ${dir.absolutePath}")
-            dir.mkdirs()
-            val ext = KiloCliPlatform.archive(platform)
-            val archive = File(dir, "kilo-$platform.$ext")
             onProgress(CliDownload(0, version, platform))
             download(version, platform, ext, archive, onProgress)
+            verify(archive, digest)
             log.info("Downloaded Kilo CLI $version for $platform to ${archive.absolutePath} (size=${archive.length()} bytes)")
             extract(archive, dir)
             if (!exe.isFile) throw IllegalStateException("Downloaded CLI archive did not contain bin/${KiloCliPlatform.exe()}")
             if (!SystemInfo.isWindows) exe.setExecutable(true)
-            done.writeText("ok\n")
+            done.writeText("$digest\n")
             onProgress(CliDownload(100, version, platform))
             exe
         }
 
+    private fun asset(version: String, platform: String, ext: String): String {
+        val name = "kilo-$platform.$ext"
+        val url = "${api.trimEnd('/')}/v$version"
+        log.info("Fetching Kilo CLI release metadata for $version from $url")
+        val request = Request.Builder()
+            .url(url)
+            .header("Accept", "application/vnd.github+json")
+            .build()
+        http.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) {
+                throw IllegalStateException("Failed to fetch Kilo CLI release metadata for $version: HTTP ${response.code}")
+            }
+            val body = response.body?.string()
+                ?: throw IllegalStateException("Failed to fetch Kilo CLI release metadata for $version: empty response body")
+            val digest = JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
+                ?.firstOrNull { it.jsonObject["name"]?.jsonPrimitive?.contentOrNull == name }
+                ?.jsonObject?.get("digest")?.jsonPrimitive?.contentOrNull
+                ?: throw IllegalStateException("Kilo CLI release $version did not include $name")
+            if (!digest.matches(DIGEST)) {
+                throw IllegalStateException("Kilo CLI release $version asset $name has invalid digest")
+            }
+            return digest
+        }
+    }
+
     private fun download(version: String, platform: String, ext: String, file: File, onProgress: (CliDownload) -> Unit) {
         val url = url(version, platform, ext)
         log.info("Downloading Kilo CLI $version for $platform from $url")
@@ -85,6 +136,30 @@ class KiloCliDownloader(
         }
     }
 
+    private fun verify(file: File, digest: String) {
+        val actual = sum(file)
+        if (actual == digest) return
+        if (file.exists() && !file.delete()) log.warn("Failed to delete invalid Kilo CLI archive ${file.absolutePath}")
+        throw IllegalStateException("Kilo CLI archive digest mismatch for ${file.name}: expected $digest, got $actual")
+    }
+
+    private fun matches(file: File, digest: String) = file.isFile && sum(file) == digest
+
+    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 extract(file: File, dir: File) {
         log.info("Extracting Kilo CLI archive ${file.absolutePath}")
         if (file.name.endsWith(".zip")) {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
index a68352daa5..4516ef39cc 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
@@ -155,12 +155,15 @@ internal fun profileDto(p: KiloProfile200Response): ProfileDto = ProfileDto(
     organizations = p.profile.organizations.orEmpty().map { org ->
         ProfileOrganizationDto(id = org.id, name = org.name, role = org.role)
     },
-    balance = p.balance?.let { ProfileBalanceDto(balance = it.balance ?: 0.0) },
+    balance = p.balance?.balance?.let { ProfileBalanceDto(balance = it) },
     kiloPass = p.kiloPass?.let {
+        val base = it.currentPeriodBaseCreditsUsd ?: return@let null
+        val usage = it.currentPeriodUsageUsd ?: return@let null
+        val bonus = it.currentPeriodBonusCreditsUsd ?: return@let null
         ProfileKiloPassDto(
-            currentPeriodBaseCreditsUsd = it.currentPeriodBaseCreditsUsd ?: 0.0,
-            currentPeriodUsageUsd = it.currentPeriodUsageUsd ?: 0.0,
-            currentPeriodBonusCreditsUsd = it.currentPeriodBonusCreditsUsd ?: 0.0,
+            currentPeriodBaseCreditsUsd = base,
+            currentPeriodUsageUsd = usage,
+            currentPeriodBonusCreditsUsd = bonus,
             nextBillingAt = it.nextBillingAt,
         )
     },
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
index ee9e145a7b..c3e97c8f76 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
@@ -109,7 +109,7 @@ class KiloBackendAppServiceTest {
     @Test
     fun `download progress maps to app state before ready`() = runBlocking {
         val resolved = CompletableDeferred<Unit>()
-        val ready = CompletableDeferred<Unit>()
+        val signal = CompletableDeferred<Unit>()
         val server = object : CliServer {
             override var forceExtract = false
             override fun process(): Process? = null
@@ -117,7 +117,7 @@ class KiloBackendAppServiceTest {
                 onProgress(CliDownload(37, "1.2.3", "darwin-arm64"))
                 resolved.await()
                 onResolved()
-                ready.await()
+                signal.await()
                 return CliServer.State.Ready(mock.start(), mock.password)
             }
             override fun exited(proc: Process) {}
@@ -141,7 +141,7 @@ class KiloBackendAppServiceTest {
             svc.appState.first { it == KiloAppState.Connecting }
         }
 
-        ready.complete(Unit)
+        signal.complete(Unit)
         ready(svc)
         job.join()
     }
@@ -852,6 +852,30 @@ class KiloBackendAppServiceTest {
         assertEquals("org_1", dto.profile?.currentOrgId)
     }
 
+    @Test
+    fun `ready dto hides unknown profile amounts`() = runBlocking {
+        mock.profile = """{
+            "profile":{"email":"alice@test.com","name":"Alice"},
+            "balance":{"balance":null},
+            "kiloPass":{
+                "currentPeriodBaseCreditsUsd":null,
+                "currentPeriodUsageUsd":null,
+                "currentPeriodBonusCreditsUsd":null,
+                "nextBillingAt":null
+            },
+            "currentOrgId":null
+        }""".trimIndent()
+        val svc = create()
+        svc.connect()
+
+        ready(svc)
+
+        val dto = appStateDto(svc.appState.value)
+        assertEquals("alice@test.com", dto.profile?.email)
+        assertNull(dto.profile?.balance)
+        assertNull(dto.profile?.kiloPass)
+    }
+
     @Test
     fun `refresh profile updates ready dto profile`() = runBlocking {
         mock.profile = """{"profile":{"email":"alice@test.com","name":"Alice"},"balance":null,"currentOrgId":null}"""
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
index a62a4bb387..eea3cda1c5 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
@@ -4,17 +4,21 @@ import ai.kilocode.backend.testing.TestLog
 import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
+import okio.Buffer
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
 import org.junit.jupiter.api.io.TempDir
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.security.MessageDigest
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 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 KiloCliDownloaderTest {
@@ -25,19 +29,22 @@ class KiloCliDownloaderTest {
     fun `downloads extracts and caches pinned cli`() = runBlocking {
         MockWebServer().use { server ->
             val bytes = archive()
-            server.enqueue(MockResponse().setResponseCode(200).setBody(okio.Buffer().write(bytes)))
+            server.enqueue(metadata(bytes))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
             val seen = mutableListOf<CliDownload>()
             val log = TestLog()
             val cli = KiloCliDownloader(
                 log = log,
                 root = dir,
                 baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
             ).resolve("1.2.3", onProgress = { seen.add(it) })
 
             assertTrue(cli.isFile)
             assertEquals(File(File(dir, "1.2.3"), KiloCliPlatform.current()).absolutePath, cli.parentFile.parentFile.absolutePath)
             assertEquals("#!/bin/sh\n", cli.readText())
             assertTrue(File(cli.parentFile, "kilo-sandbox-mutation-worker.js").isFile)
+            assertEquals("/api/v1.2.3", server.takeRequest().path)
             assertEquals("/release/v1.2.3/kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}", server.takeRequest().path)
             assertEquals(CliDownload(0, "1.2.3", KiloCliPlatform.current()), seen.first())
             assertTrue(seen.any { it.percent == 100 && it.version == "1.2.3" && it.platform == KiloCliPlatform.current() })
@@ -48,20 +55,55 @@ class KiloCliDownloaderTest {
                 log = log,
                 root = dir,
                 baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
             ).resolve("1.2.3", onProgress = { cachedProgress.add(it) })
             assertEquals(cli.absolutePath, cached.absolutePath)
-            assertEquals(1, server.requestCount)
+            assertEquals(2, server.requestCount)
             assertTrue(cachedProgress.isEmpty())
             assertContains(log.messages, "INFO: Using cached Kilo CLI 1.2.3 for ${KiloCliPlatform.current()} at ${cli.absolutePath}")
 
-            server.enqueue(MockResponse().setResponseCode(200).setBody(okio.Buffer().write(bytes)))
+            File(cli.parentFile.parentFile, ".complete").writeText("ok\n")
+            server.enqueue(metadata(bytes))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
+            val stale = KiloCliDownloader(
+                log = log,
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
+            ).resolve("1.2.3")
+            assertEquals(cli.absolutePath, stale.absolutePath)
+            assertEquals(4, server.requestCount)
+
+            server.enqueue(metadata(bytes))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
             val forced = KiloCliDownloader(
                 log = log,
                 root = dir,
                 baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
             ).resolve("1.2.3", force = true)
             assertEquals(cli.absolutePath, forced.absolutePath)
-            assertEquals(2, server.requestCount)
+            assertEquals(6, server.requestCount)
+        }
+    }
+
+    @Test
+    fun `rejects cli archive with mismatched digest`() = runBlocking {
+        MockWebServer().use { server ->
+            val bytes = archive()
+            server.enqueue(metadata("sha256:${sha256("different".toByteArray())}"))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
+
+            val ex = assertFailsWith<IllegalStateException> {
+                KiloCliDownloader(
+                    root = dir,
+                    baseUrl = server.url("/release").toString(),
+                    api = server.url("/api").toString(),
+                ).resolve("1.2.3")
+            }
+
+            assertContains(ex.message.orEmpty(), "digest mismatch")
+            assertFalse(File(File(File(dir, "1.2.3"), KiloCliPlatform.current()), ".complete").exists())
         }
     }
 
@@ -74,6 +116,16 @@ class KiloCliDownloaderTest {
         return tar(files)
     }
 
+    private fun metadata(bytes: ByteArray) = metadata("sha256:${sha256(bytes)}")
+
+    private fun metadata(digest: String) = MockResponse().setResponseCode(200).setBody(
+        """{"assets":[{"name":"kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}","digest":"$digest"}]}"""
+    )
+
+    private fun sha256(bytes: ByteArray): String = MessageDigest.getInstance("SHA-256")
+        .digest(bytes)
+        .joinToString("") { "%02x".format(it.toInt() and 0xff) }
+
     private fun zip(files: Map<String, ByteArray>): ByteArray {
         val out = ByteArrayOutputStream()
         ZipOutputStream(out).use { zip ->
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspaceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspaceTest.kt
index 8107264e80..817c8ca4af 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspaceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspaceTest.kt
@@ -404,6 +404,20 @@ class KiloBackendWorkspaceTest {
         assertEquals("ses_1", result.sessions[0].id)
     }
 
+    @Test
+    fun `workspace maps missing session timestamps to zero`() = runBlocking {
+        mock.sessions = """[
+            {"id":"ses_1","slug":"s","projectID":"p","directory":"/test/project","title":"T","version":"1","time":{"created":null,"updated":null}}
+        ]"""
+        val app = setup()
+        val ws = ready(app)
+        loaded(ws)
+
+        val session = ws.sessions().sessions.single()
+        assertEquals(0.0, session.time.created)
+        assertEquals(0.0, session.time.updated)
+    }
+
     @Test
     fun `workspace creates session in its directory`() = runBlocking {
         mock.sessionCreate = """{"id":"ses_new","slug":"n","projectID":"p","directory":"/test/project","title":"New","version":"1","time":{"created":1,"updated":1}}"""
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
index aebd99feee..0d1d65ecb8 100644
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
+++ b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
@@ -1,3 +1,8 @@
+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
@@ -14,6 +19,7 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.net.HttpURLConnection
 import java.net.URI
+import java.security.MessageDigest
 import java.util.zip.ZipInputStream
 import javax.inject.Inject
 
@@ -21,6 +27,12 @@ import javax.inject.Inject
  * Generates the CLI OpenAPI spec from the pinned release binary.
  */
 abstract class GenerateOpenApiSpecTask : 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"
+    }
+
     @get:Input
     abstract val cliVersion: Property<String>
 
@@ -68,20 +80,53 @@ abstract class GenerateOpenApiSpecTask : DefaultTask() {
         val dir = cacheDir.dir(version).map { it.dir(platform) }.get().asFile
         val exe = File(dir, "bin/${exe()}")
         val done = File(dir, ".complete")
-        if (exe.isFile && done.isFile) {
+        val cached = done.takeIf { it.isFile }?.readText()?.trim()
+        val archive = File(dir, "kilo-$platform.$ext")
+        if (exe.isFile && cached != null && cached.matches(DIGEST) && matches(archive, cached)) {
             if (!windows()) exe.setExecutable(true)
             return exe
         }
-        dir.mkdirs()
-        val archive = File(dir, "kilo-$platform.$ext")
+
+        val name = "kilo-$platform.$ext"
+        val digest = asset(version, name)
+        if (dir.exists() && !dir.deleteRecursively()) {
+            throw GradleException("Failed to delete cached pinned Kilo CLI under ${dir.absolutePath}")
+        }
+        if (!dir.isDirectory && !dir.mkdirs()) {
+            throw GradleException("Failed to create pinned Kilo CLI cache directory ${dir.absolutePath}")
+        }
         download("https://github.com/Kilo-Org/kilocode/releases/download/v$version/kilo-$platform.$ext", archive)
+        verify(archive, digest)
         extract(archive, dir)
         if (!exe.isFile) throw GradleException("Downloaded CLI archive did not contain bin/${exe()}")
         if (!windows()) exe.setExecutable(true)
-        done.writeText("ok\n")
+        done.writeText("$digest\n")
         return exe
     }
 
+    private fun asset(version: String, name: String): String {
+        val url = "$API/v$version"
+        logger.lifecycle("Fetching pinned Kilo CLI release metadata from $url")
+        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")
+        try {
+            val code = conn.responseCode
+            if (code !in 200..299) throw GradleException("Failed to fetch pinned Kilo CLI release metadata: HTTP $code from $url")
+            val body = conn.inputStream.bufferedReader().use { it.readText() }
+            val digest = JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
+                ?.firstOrNull { it.jsonObject["name"]?.jsonPrimitive?.contentOrNull == name }
+                ?.jsonObject?.get("digest")?.jsonPrimitive?.contentOrNull
+                ?: throw GradleException("Pinned Kilo CLI release $version did not include $name")
+            if (!digest.matches(DIGEST)) throw GradleException("Pinned Kilo CLI release $version asset $name has invalid digest")
+            return digest
+        } finally {
+            conn.disconnect()
+        }
+    }
+
     private fun download(url: String, file: File) {
         logger.lifecycle("Downloading pinned Kilo CLI from $url")
         val conn = URI(url).toURL().openConnection() as HttpURLConnection
@@ -99,6 +144,30 @@ abstract class GenerateOpenApiSpecTask : DefaultTask() {
         }
     }
 
+    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 matches(file: File, digest: String) = file.isFile && sum(file) == digest
+
+    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 extract(file: File, dir: File) {
         if (file.name.endsWith(".zip")) {
             ZipInputStream(file.inputStream().buffered()).use { zip ->
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
index 7edea34c4a..35db7427dd 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
@@ -82,10 +82,10 @@ class KiloAppService internal constructor(
     }
 
     private fun onState(state: KiloAppStateDto) {
-        _state.value = state
         val version = state.downloadVersion
         val platform = state.downloadPlatform
         if (version != null && platform != null) info = CoreInfo(version, platform)
+        _state.value = state
         if (state.status == KiloAppStatusDto.READY) refreshModelFavoritesAsync()
     }
 

From 4fff14dc2995f45cb7f97bce34f1a37e3b0283c5 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 16:58:43 -0400
Subject: [PATCH 07/68] fix(jetbrains): align runtime CLI download release flow

---
 .github/workflows/publish-jetbrains.yml       | 10 +-----
 .kilo/skills/release-jetbrains/SKILL.md       | 35 ++++++++++++++++++-
 CONTRIBUTING.md                               |  4 +--
 .../architecture/jetbrains-plugin.md          |  4 +--
 packages/kilo-jetbrains/AGENTS.md             |  4 +--
 packages/kilo-jetbrains/RELEASING.md          |  2 ++
 .../kilo-jetbrains/backend/build.gradle.kts   |  4 +++
 .../kilocode/backend/cli/KiloCliDownloader.kt | 28 ++++++++++++++-
 .../backend/cli/KiloCliDownloaderTest.kt      | 33 +++++++++++++++++
 .../main/kotlin/GenerateOpenApiSpecTask.kt    | 33 ++++++++++++++++-
 10 files changed, 139 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/publish-jetbrains.yml b/.github/workflows/publish-jetbrains.yml
index a5d7b51576..ba43fb4124 100644
--- a/.github/workflows/publish-jetbrains.yml
+++ b/.github/workflows/publish-jetbrains.yml
@@ -125,19 +125,11 @@ jobs:
           JETBRAINS_PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
           JETBRAINS_PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
 
-      - name: Prepare CLI resources
-        working-directory: packages/kilo-jetbrains
-        run: bun script/build.ts --production --prepare-cli
-        env:
-          KILO_VERSION: ${{ steps.release.outputs.version }}
-          KILO_CHANNEL: ${{ steps.release.outputs.cli_channel }}
-          GH_TOKEN: ${{ github.token }}
-          GH_REPO: ${{ github.repository }}
-
       - name: Verify plugin
         working-directory: packages/kilo-jetbrains
         run: ./gradlew verifyPlugin -Pproduction=true -Pkilo.channel="$CHANNEL"
         env:
+          GH_TOKEN: ${{ github.token }}
           VERSION: ${{ steps.release.outputs.version }}
           CHANNEL: ${{ steps.release.outputs.marketplace_channel }}
 
diff --git a/.kilo/skills/release-jetbrains/SKILL.md b/.kilo/skills/release-jetbrains/SKILL.md
index c84718e439..b34ec79c85 100644
--- a/.kilo/skills/release-jetbrains/SKILL.md
+++ b/.kilo/skills/release-jetbrains/SKILL.md
@@ -34,7 +34,40 @@ Accepted specs:
 | `x.y.z-rc.n` | Explicit RC release. |
 | `x.y.z` | Explicit stable release. |
 
-Show the resolved `version`, `kind`, and default `fromTagDefault` to the user and ask for confirmation before continuing.
+Show the resolved `version`, `kind`, and default `fromTagDefault` to the user.
+
+## CLI Pin Verification
+
+Before dispatching prepare, verify the JetBrains plugin is pinned to the intended Kilo Core release. The plugin downloads the CLI version from `packages/kilo-jetbrains/package.json`, not from the JetBrains plugin version.
+
+Read the pinned CLI version:
+
+```bash
+bun -e 'const p=require("./packages/kilo-jetbrains/package.json"); console.log(p.version)'
+```
+
+Verify the matching GitHub Release exists and includes every runtime asset the backend may download:
+
+```bash
+cli_version="7.4.1"
+gh release view "v${cli_version}" --repo Kilo-Org/kilocode --json assets \
+  --jq '.assets[].name' | sort
+```
+
+Expected assets:
+
+```text
+kilo-darwin-arm64.zip
+kilo-darwin-x64.zip
+kilo-linux-arm64.tar.gz
+kilo-linux-x64.tar.gz
+kilo-windows-arm64.zip
+kilo-windows-x64.zip
+```
+
+If the pin is stale or the release assets are missing, stop and ask the user to update `packages/kilo-jetbrains/package.json` on `main` before dispatching prepare. The prepare workflow tags `origin/main`, so the pin must already be reviewed and merged before the release tag is created.
+
+Show the resolved JetBrains plugin version, release kind, default `fromTagDefault`, pinned CLI version, and CLI release asset status to the user, then ask for confirmation before continuing.
 
 ## Prepare Workflow
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 61ee8f2e57..d78e6dd9e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -126,10 +126,10 @@ Requires Java 21 (see [Prerequisites](#prerequisites)). From `packages/kilo-jetb
 ```bash
 ./gradlew typecheck    # Compile-check all Kotlin sources
 ./gradlew test         # Run all tests (backend + frontend)
-./gradlew --no-configuration-cache runIdeSplitMode  # Launch local split-mode sandbox and prepare the CLI
+./gradlew --no-configuration-cache runIdeSplitMode  # Launch local split-mode sandbox; backend downloads the pinned CLI
 ```
 
-Use `./gradlew runIde` only for a monolithic sandbox; prepare the CLI first with `bun run build --prepare-cli`.
+Use `./gradlew runIde` only for a monolithic sandbox. JetBrains dev runs do not build or bundle CLI binaries; the backend downloads the pinned release at connect time.
 
 Or via the root turbo filter to run only JetBrains checks from the repo root:
 
diff --git a/packages/kilo-docs/pages/contributing/architecture/jetbrains-plugin.md b/packages/kilo-docs/pages/contributing/architecture/jetbrains-plugin.md
index bbfa42efc4..cc537bd4c9 100644
--- a/packages/kilo-docs/pages/contributing/architecture/jetbrains-plugin.md
+++ b/packages/kilo-docs/pages/contributing/architecture/jetbrains-plugin.md
@@ -131,10 +131,10 @@ JetBrains Kotlin toolchain is Java 21. Gradle commands report missing or incompa
 | Typecheck | `./gradlew typecheck` |
 | Tests | `./gradlew test` |
 | Full plugin build | `bun run build` |
-| Gradle plugin assembly with prepared CLI binaries | `./gradlew buildPlugin` |
+| Gradle plugin assembly with pinned CLI download | `./gradlew buildPlugin` |
 | Split-mode sandbox | `./gradlew --no-configuration-cache runIdeSplitMode` |
 | Split backend sandbox | `./gradlew --no-configuration-cache runIdeBackend` |
-| Monolithic sandbox IDE | `./gradlew runIde` after `bun run build --prepare-cli` |
+| Monolithic sandbox IDE | `./gradlew runIde` |
 
 Run `Plugin DevKit | Code | Frontend and Backend API Usage` inspection when moving code across split boundary.
 
diff --git a/packages/kilo-jetbrains/AGENTS.md b/packages/kilo-jetbrains/AGENTS.md
index 05dbd6c0d1..323b158f6d 100644
--- a/packages/kilo-jetbrains/AGENTS.md
+++ b/packages/kilo-jetbrains/AGENTS.md
@@ -191,14 +191,14 @@ For blocking I/O in coroutines, move the dispatcher switch inside the callee usi
 
 - **Marketplace version build**: Use `script/build-version.sh <version>` from `packages/kilo-jetbrains/` to clean, build, sign, and verify the JetBrains Marketplace plugin ZIP. Pass `--skip-verification` only when explicitly needed.
 - **Test version build**: If the user asks for a JetBrains test build, still require a version and use `script/build-version.sh <version> --skip-signing --skip-verification` from `packages/kilo-jetbrains/` so no signing secrets are needed. Add `--skip-clean` only when the user wants a faster incremental test build.
-- **Typecheck**: `bun run typecheck` or `./gradlew typecheck` from `packages/kilo-jetbrains/` — compiles all Kotlin sources including the generated API client. Does NOT require CLI binaries.
+- **Typecheck**: `bun run typecheck` or `./gradlew typecheck` from `packages/kilo-jetbrains/` — compiles all Kotlin sources including the generated API client. A cold build downloads the pinned CLI release via `generateOpenApiSpec` and needs network access; Gradle-cached incremental runs skip the download. It does not bundle per-platform CLI binaries.
 - **Full build**: `bun run build` from `packages/kilo-jetbrains/` (runs Gradle `buildPlugin`).
 - **Gradle only**: `./gradlew buildPlugin` from `packages/kilo-jetbrains/`.
 - **Java checks**: Do not run `java -version` as a routine preflight. Gradle commands already fail clearly when Java is missing or incompatible; check Java only when diagnosing that failure mode.
 - **Via Turbo**: `bun turbo build --filter=@kilocode/kilo-jetbrains` from repo root.
 - **Run split mode**: `./gradlew --no-configuration-cache runIdeSplitMode` or the checked-in `Run IDE (Split Mode)` configuration — launches backend and frontend locally. Emulate latency via the Split Mode widget (requires internal mode: `-Didea.is.internal=true`).
 - **Run split backend**: `./gradlew --no-configuration-cache runIdeBackend` — if it exits shortly after startup, check for an orphaned Java process from a previous backend run and kill it before restarting.
-- **Run in monolithic sandbox**: `./gradlew runIde` — launches sandboxed IntelliJ with the plugin. Does NOT build CLI binaries.
+- **Run in monolithic sandbox**: `./gradlew runIde` — launches sandboxed IntelliJ with the plugin. Does not build or bundle CLI binaries; the backend downloads the pinned release at connect time.
 
 ### CLI/SDK Change Awareness
 
diff --git a/packages/kilo-jetbrains/RELEASING.md b/packages/kilo-jetbrains/RELEASING.md
index 47d65e0f5c..a9e844b86a 100644
--- a/packages/kilo-jetbrains/RELEASING.md
+++ b/packages/kilo-jetbrains/RELEASING.md
@@ -8,6 +8,8 @@ The published code comes from `jetbrains/v<version>`. Marketplace and GitHub rel
 
 Maintainers can use the Kilo `release-jetbrains` skill to drive this process from a version request such as `next rc` or an explicit version. The skill resolves and confirms the version, dispatches and watches the prepare workflow, helps produce a filtered human-readable JetBrains/CLI changelog draft, commits the reviewed changelog to the release PR, and watches publishing after the PR is merged.
 
+JetBrains plugin builds and runtime downloads use the Kilo Core version pinned in `packages/kilo-jetbrains/package.json`, so verify that pin points at a published `v<version>` release before creating the release tag.
+
 The skill lives at `.kilo/skills/release-jetbrains/SKILL.md`. It does not move or recreate release tags, and merge permission is only required if the user explicitly asks the skill to merge the release PR automatically.
 
 ## Create Release Tag And PR
diff --git a/packages/kilo-jetbrains/backend/build.gradle.kts b/packages/kilo-jetbrains/backend/build.gradle.kts
index f666039987..7421a38b88 100644
--- a/packages/kilo-jetbrains/backend/build.gradle.kts
+++ b/packages/kilo-jetbrains/backend/build.gradle.kts
@@ -40,6 +40,10 @@ val writeKiloProperties by tasks.registering(WriteProperties::class) {
 val generateOpenApiSpec by tasks.registering(GenerateOpenApiSpecTask::class) {
     description = "Generate CLI OpenAPI spec into the build directory"
     cliVersion.set(pinnedCliVersion)
+    token.set(
+        providers.environmentVariable("GH_TOKEN")
+            .orElse(providers.environmentVariable("GITHUB_TOKEN"))
+    )
     cacheDir.set(layout.buildDirectory.dir("cli-cache"))
     spec.set(rawSpec)
 }
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
index b0e75d4248..73630a7d20 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -12,10 +12,12 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okhttp3.Response
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
 import java.io.File
 import java.security.MessageDigest
+import java.time.Instant
 import java.util.concurrent.TimeUnit
 import java.util.zip.ZipInputStream
 import kotlin.math.roundToInt
@@ -88,8 +90,21 @@ class KiloCliDownloader(
             .build()
         http.newCall(request).execute().use { response ->
             if (!response.isSuccessful) {
-                throw IllegalStateException("Failed to fetch Kilo CLI release metadata for $version: HTTP ${response.code}")
+                val info = rate(response)
+                val body = runCatching { response.body?.string() }.getOrNull()?.take(500)
+                val detail = if (body.isNullOrBlank()) "" else ": $body"
+                if (limited(response)) {
+                    log.warn("GitHub API rate limit hit fetching Kilo CLI $version metadata from $url ($info)$detail")
+                    throw IllegalStateException(
+                        "GitHub API rate limit exceeded while resolving Kilo CLI $version ($info)$detail"
+                    )
+                }
+                log.warn("Failed to fetch Kilo CLI $version metadata from $url: HTTP ${response.code} ($info)$detail")
+                throw IllegalStateException(
+                    "Failed to fetch Kilo CLI release metadata for $version: HTTP ${response.code} ($info)$detail"
+                )
             }
+            log.debug { "GitHub metadata OK for Kilo CLI $version (${rate(response)})" }
             val body = response.body?.string()
                 ?: throw IllegalStateException("Failed to fetch Kilo CLI release metadata for $version: empty response body")
             val digest = JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
@@ -103,6 +118,17 @@ class KiloCliDownloader(
         }
     }
 
+    private fun rate(response: Response): String {
+        val reset = response.header("X-RateLimit-Reset")
+            ?.toLongOrNull()
+            ?.let { Instant.ofEpochSecond(it).toString() }
+        return "limit=${response.header("X-RateLimit-Limit")} remaining=${response.header("X-RateLimit-Remaining")} " +
+            "used=${response.header("X-RateLimit-Used")} reset=$reset retryAfter=${response.header("Retry-After")}"
+    }
+
+    private fun limited(response: Response) =
+        response.code == 429 || (response.code == 403 && response.header("X-RateLimit-Remaining") == "0")
+
     private fun download(version: String, platform: String, ext: String, file: File, onProgress: (CliDownload) -> Unit) {
         val url = url(version, platform, ext)
         log.info("Downloading Kilo CLI $version for $platform from $url")
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
index eea3cda1c5..6a2e94bc02 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
@@ -107,6 +107,39 @@ class KiloCliDownloaderTest {
         }
     }
 
+    @Test
+    fun `reports github api rate limits while resolving metadata`() = runBlocking {
+        MockWebServer().use { server ->
+            val reset = 1_800_000_000L
+            server.enqueue(
+                MockResponse()
+                    .setResponseCode(403)
+                    .setHeader("X-RateLimit-Limit", "60")
+                    .setHeader("X-RateLimit-Remaining", "0")
+                    .setHeader("X-RateLimit-Used", "60")
+                    .setHeader("X-RateLimit-Reset", reset.toString())
+                    .setBody("API rate limit exceeded")
+            )
+            val log = TestLog()
+
+            val ex = assertFailsWith<IllegalStateException> {
+                KiloCliDownloader(
+                    log = log,
+                    root = dir,
+                    baseUrl = server.url("/release").toString(),
+                    api = server.url("/api").toString(),
+                ).resolve("1.2.3")
+            }
+
+            assertContains(ex.message.orEmpty(), "GitHub API rate limit exceeded")
+            assertContains(ex.message.orEmpty(), "remaining=0")
+            assertContains(ex.message.orEmpty(), "reset=2027-01-15T08:00:00Z")
+            assertTrue(log.messages.any { it.contains("GitHub API rate limit hit") && it.contains("remaining=0") })
+            assertEquals("/api/v1.2.3", server.takeRequest().path)
+            assertEquals(1, server.requestCount)
+        }
+    }
+
     private fun archive(): ByteArray {
         val files = mapOf(
             "bin/${KiloCliPlatform.exe()}" to "#!/bin/sh\n".toByteArray(),
diff --git a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
index 0d1d65ecb8..de463945f8 100644
--- a/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
+++ b/packages/kilo-jetbrains/build-tasks/src/main/kotlin/GenerateOpenApiSpecTask.kt
@@ -20,6 +20,7 @@ import java.io.File
 import java.net.HttpURLConnection
 import java.net.URI
 import java.security.MessageDigest
+import java.time.Instant
 import java.util.zip.ZipInputStream
 import javax.inject.Inject
 
@@ -36,6 +37,9 @@ abstract class GenerateOpenApiSpecTask : DefaultTask() {
     @get:Input
     abstract val cliVersion: Property<String>
 
+    @get:Internal
+    abstract val token: Property<String>
+
     @get:Internal
     abstract val cacheDir: DirectoryProperty
 
@@ -112,9 +116,25 @@ abstract class GenerateOpenApiSpecTask : DefaultTask() {
         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") }
         try {
             val code = conn.responseCode
-            if (code !in 200..299) throw GradleException("Failed to fetch pinned Kilo CLI release metadata: HTTP $code from $url")
+            if (code !in 200..299) {
+                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 fetching pinned Kilo CLI release metadata ($info)$detail"
+                    )
+                }
+                throw GradleException("Failed to fetch pinned Kilo CLI release metadata: HTTP $code from $url ($info)$detail")
+            }
             val body = conn.inputStream.bufferedReader().use { it.readText() }
             val digest = JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
                 ?.firstOrNull { it.jsonObject["name"]?.jsonPrimitive?.contentOrNull == name }
@@ -127,6 +147,17 @@ abstract class GenerateOpenApiSpecTask : DefaultTask() {
         }
     }
 
+    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 download(url: String, file: File) {
         logger.lifecycle("Downloading pinned Kilo CLI from $url")
         val conn = URI(url).toURL().openConnection() as HttpURLConnection

From 33ddc728ac5b2ca1db41f33396e612d30f8059ec Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 17:01:18 -0400
Subject: [PATCH 08/68] fix(jetbrains): avoid hashing cached CLI archive

---
 .../main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
index 73630a7d20..f7a6e06381 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -48,7 +48,7 @@ class KiloCliDownloader(
             val ext = KiloCliPlatform.archive(platform)
             val archive = File(dir, "kilo-$platform.$ext")
 
-            if (!force && exe.isFile && cached != null && cached.matches(DIGEST) && matches(archive, cached)) {
+            if (!force && exe.isFile && cached != null && cached.matches(DIGEST)) {
                 log.info("Using cached Kilo CLI $version for $platform at ${exe.absolutePath}")
                 if (!SystemInfo.isWindows) exe.setExecutable(true)
                 return@withContext exe
@@ -169,8 +169,6 @@ class KiloCliDownloader(
         throw IllegalStateException("Kilo CLI archive digest mismatch for ${file.name}: expected $digest, got $actual")
     }
 
-    private fun matches(file: File, digest: String) = file.isFile && sum(file) == digest
-
     private fun sum(file: File) = "sha256:${sha256(file)}"
 
     private fun sha256(file: File): String {

From 6e19d5ca5a2393d32b50b94e1e09c26a54c1014b Mon Sep 17 00:00:00 2001
From: Emilie Schario <emilie.schario@gmail.com>
Date: Mon, 6 Jul 2026 21:47:40 -0400
Subject: [PATCH 09/68] docs(kilo-docs): add documentation style guide

---
 packages/kilo-docs/AGENTS.md      |   4 +
 packages/kilo-docs/STYLE_GUIDE.md | 205 ++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 packages/kilo-docs/STYLE_GUIDE.md

diff --git a/packages/kilo-docs/AGENTS.md b/packages/kilo-docs/AGENTS.md
index 5bab0319bd..9d338f8e07 100644
--- a/packages/kilo-docs/AGENTS.md
+++ b/packages/kilo-docs/AGENTS.md
@@ -74,6 +74,10 @@ Use the Markdoc codicon tag format:
 
 ## Documentation Guidelines
 
+### Style Guide
+
+Before writing documentation, review `packages/kilo-docs/STYLE_GUIDE.md` for voice, tone, and formatting conventions.
+
 ### Adding New Pages
 
 1. Create your page in the appropriate directory under `pages/`
diff --git a/packages/kilo-docs/STYLE_GUIDE.md b/packages/kilo-docs/STYLE_GUIDE.md
new file mode 100644
index 0000000000..de3be388ee
--- /dev/null
+++ b/packages/kilo-docs/STYLE_GUIDE.md
@@ -0,0 +1,205 @@
+---
+title: "Documentation Style Guide"
+description: "Guidelines for writing Kilo Code documentation"
+---
+
+# Documentation Style Guide
+
+This guide covers writing, formatting, and structuring documentation for the Kilo Code docs site.
+
+## Voice and Tone
+
+Kilo Code documentation should be:
+
+- **Clear and direct** - Cut unnecessary words. Prefer active voice.
+- **Helpful, not salesy** - Focus on what users can do, not just what's possible.
+- **Consistent** - Use the same terminology and phrasing across pages.
+- **Friendly but professional** - Write as a knowledgeable teammate explaining concepts.
+
+### Do
+
+- Write in the second person ("you")
+- Use present tense
+- Be specific: "Run `kilo run` to execute a task" not "You can run kilo run"
+
+### Don't
+
+- Use marketing fluff or hype language
+- Write in passive voice when active is clearer
+- Assume prior knowledge not explicitly stated
+
+## Headings
+
+- Use sentence case for heading text
+- Start with the most important word
+- One heading per section
+- Use heading levels logically (don't skip from H2 to H4)
+
+```markdown
+## Installing Kilo Code
+
+### VS Code Extension
+
+### CLI
+```
+
+## Procedures
+
+Use numbered lists for step-by-step instructions. Each step should be a complete action.
+
+```markdown
+1. Open VS Code
+2. Go to Extensions (Ctrl+Shift+X / Cmd+Shift+X)
+3. Search for "Kilo Code"
+4. Click the dropdown arrow next to **Install** and select **Install Pre-Release Version**
+```
+
+### Procedural tips
+
+- Include keyboard shortcuts in parentheses
+- Use present tense
+- Start each step with a verb
+- Don't number sub-steps; use nested lists instead
+
+## Callouts
+
+Use callouts to highlight important information. Choose the right type:
+
+| Type | Use for |
+|---|---|
+| `note` | General information users should know |
+| `tip` | Helpful shortcuts or best practices |
+| `info` | Context or background information |
+| `warning` | Potential problems or important cautions |
+| `danger` | Critical warnings that could cause data loss |
+| `generic` | Content without a specific visual treatment |
+
+```markdown
+{% callout type="tip" %}
+**The easiest way to configure Kilo is to ask the agent.** Just tell the agent what you want.
+{% /callout %}
+```
+
+## Cross-References
+
+- Use absolute paths starting from `/docs/` for internal links
+- Don't include `.md` extensions
+- Use descriptive link text, not "click here"
+
+```markdown
+Good: [Quickstart Guide](/docs/getting-started/quickstart)
+
+Bad: [Click here](/docs/getting-started/quickstart)
+```
+
+## Code Examples
+
+- Use fenced code blocks with language specified
+- Include comments in code where helpful
+- Show realistic, working examples
+- Use `kilo run` for CLI examples, not hypothetical commands
+
+```markdown
+```bash
+kilo run "create a utils.py file with a function that adds two numbers"
+```
+```
+
+### Code in prose
+
+Use backticks for inline code, file references, and commands:
+
+- `kilo.jsonc` for configuration files
+- `Ctrl+Shift+X` for keyboard shortcuts
+- `src/utils.ts` for file paths
+
+## Markdoc Conventions
+
+### Images
+
+Use the Markdoc image tag format:
+
+```markdown
+{% image src="/docs/img/kilo-provider/connected-accounts.png" alt="Connect account screen" width="800" caption="Connect account screen" /%}
+```
+
+**Image path rules:**
+- Always include `/docs` prefix
+- Use generated screenshots from `packages/kilo-docs/public/img/screenshot-tests/` when available
+- Write descriptive alt text for accessibility
+
+### Tables
+
+Use compact markdown tables without padding:
+
+```markdown
+| Command | What it runs |
+|---|---|
+| `kilo serve` | The prod CLI on `$PATH`. |
+```
+
+### Tabs
+
+Use tabs for platform-specific content:
+
+```markdown
+{% tabs %}
+{% tab label="VS Code" %}
+
+Content for VS Code
+
+{% /tab %}
+{% tab label="CLI" %}
+
+Content for CLI
+
+{% /tab %}
+{% /tabs %}
+```
+
+### Mermaid Diagrams
+
+Use fenced `mermaid` blocks for architecture diagrams:
+
+```markdown
+```mermaid
+flowchart LR
+  A --> B
+```
+```
+
+## LLM-Generated Docs
+
+This documentation site is maintained with AI assistance. When reviewing or editing:
+
+- Verify technical accuracy manually
+- Ensure examples actually work
+- Check that terminology is consistent
+- Don't accept generated content without review
+
+## Terminology
+
+Use consistent terms throughout:
+
+| Term | Use for |
+|---|---|
+| Kilo Code | The product name |
+| kilo CLI | The command-line interface |
+| VS Code extension | The VS Code extension |
+| JetBrains plugin | The JetBrains IDE plugin |
+| `kilo serve` | The local HTTP server |
+| `kilo run` | The headless execution command |
+| agent | The AI assistant |
+
+## Navigation
+
+- Add new pages to the appropriate nav file in `lib/nav/`
+- Update `lib/nav/index.ts` to export the new nav section
+- Navigation files are organized by section (e.g., `getting-started.ts`, `code-with-ai.ts`)
+
+## Documentation Lifecycle
+
+- Follow the branch naming convention: `docs/description-of-change`
+- For documentation-only changes, create branches with the `docs/` prefix
+- Update navigation when adding or removing pages
+- Add redirects in `previous-docs-redirects.js` when moving or removing pages
\ No newline at end of file

From 6388f4b5becb48f33fb024eee162715cb95b51c1 Mon Sep 17 00:00:00 2001
From: Emilie Schario <emilie.schario@gmail.com>
Date: Mon, 6 Jul 2026 21:49:57 -0400
Subject: [PATCH 10/68] docs(kilo-docs): improve navigation structure

- Remove AI Providers link from Getting Started Configuration (has own section)
- Remove self-referencing subLinks throughout nav files
- Separate AI Adoption Dashboard into its own section in Collaborate
- Reduce redundant navigation entries for cleaner UX
---
 packages/kilo-docs/lib/nav/automate.ts        |  3 --
 packages/kilo-docs/lib/nav/code-with-ai.ts    | 15 ++++----
 packages/kilo-docs/lib/nav/collaborate.ts     | 37 +++++++++----------
 packages/kilo-docs/lib/nav/getting-started.ts |  6 ++-
 packages/kilo-docs/lib/nav/kiloclaw.ts        |  4 --
 5 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/packages/kilo-docs/lib/nav/automate.ts b/packages/kilo-docs/lib/nav/automate.ts
index 1a106a8722..9a7a87ef52 100644
--- a/packages/kilo-docs/lib/nav/automate.ts
+++ b/packages/kilo-docs/lib/nav/automate.ts
@@ -10,7 +10,6 @@ export const AutomateNav: NavSection[] = [
         href: "/automate/code-reviews/overview",
         children: "Code Reviews",
         subLinks: [
-          { href: "/automate/code-reviews/overview", children: "Overview" },
           { href: "/automate/code-reviews/github", children: "GitHub" },
           { href: "/automate/code-reviews/gitlab", children: "GitLab" },
         ],
@@ -19,7 +18,6 @@ export const AutomateNav: NavSection[] = [
         href: "/automate/agent-manager",
         children: "Agent Manager",
         subLinks: [
-          { href: "/automate/agent-manager", children: "Reference" },
           { href: "/automate/agent-manager-workflows", children: "Workflows" },
         ],
       },
@@ -42,7 +40,6 @@ export const AutomateNav: NavSection[] = [
         href: "/automate/mcp/overview",
         children: "MCP",
         subLinks: [
-          { href: "/automate/mcp/overview", children: "MCP Overview" },
           {
             href: "/automate/mcp/using-in-kilo-code",
             children: "Using MCP in Kilo Code",
diff --git a/packages/kilo-docs/lib/nav/code-with-ai.ts b/packages/kilo-docs/lib/nav/code-with-ai.ts
index 4b998fca3e..d20653901b 100644
--- a/packages/kilo-docs/lib/nav/code-with-ai.ts
+++ b/packages/kilo-docs/lib/nav/code-with-ai.ts
@@ -8,7 +8,7 @@ export const CodeWithAiNav: NavSection[] = [
       {
         href: "/code-with-ai/platforms/vscode",
         children: "VS Code Extension",
-        subLinks: [{ href: "/code-with-ai/platforms/vscode/whats-new", children: "What's New" }],
+        subLinks: [{ href: "/code-with-ai/platforms/vscode/whats-new", children: "Whats New" }],
       },
       {
         href: "/code-with-ai/platforms/jetbrains",
@@ -30,6 +30,11 @@ export const CodeWithAiNav: NavSection[] = [
       },
       { href: "/code-with-ai/platforms/cloud-agent", children: "Cloud Agent" },
       { href: "/code-with-ai/platforms/mobile", children: "Mobile Apps" },
+    ],
+  },
+  {
+    title: "Features",
+    links: [
       { href: "/code-with-ai/app-builder", children: "App Builder" },
       {
         href: "/code-with-ai/gastown",
@@ -80,7 +85,6 @@ export const CodeWithAiNav: NavSection[] = [
         href: "/code-with-ai/agents/using-agents",
         children: "Agents",
         subLinks: [
-          { href: "/code-with-ai/agents/using-agents", children: "Using Agents" },
           {
             href: "/code-with-ai/agents/orchestrator-mode",
             children: "Orchestrator Mode",
@@ -89,7 +93,6 @@ export const CodeWithAiNav: NavSection[] = [
       },
     ],
   },
-
   {
     title: "Productivity Tools",
     links: [
@@ -113,11 +116,7 @@ export const CodeWithAiNav: NavSection[] = [
         href: "/code-with-ai/features/browser-use",
         children: "Agent Behavior",
         subLinks: [
-          { href: "/code-with-ai/features/browser-use", children: "Browser Use" },
-          {
-            href: "/code-with-ai/features/task-todo-list",
-            children: "Task Todo List",
-          },
+          { href: "/code-with-ai/features/task-todo-list", children: "Task Todo List" },
           { href: "/code-with-ai/features/checkpoints", children: "Checkpoints" },
           { href: "/code-with-ai/features/file-encoding", children: "File Encoding" },
         ],
diff --git a/packages/kilo-docs/lib/nav/collaborate.ts b/packages/kilo-docs/lib/nav/collaborate.ts
index a8ae1b34ca..16514384c9 100644
--- a/packages/kilo-docs/lib/nav/collaborate.ts
+++ b/packages/kilo-docs/lib/nav/collaborate.ts
@@ -27,27 +27,26 @@ export const CollaborateNav: NavSection[] = [
       },
       { href: "/collaborate/teams/billing", children: "Billing" },
       { href: "/collaborate/teams/analytics", children: "Analytics" },
+    ],
+  },
+  {
+    title: "AI Adoption Dashboard",
+    links: [
       {
         href: "/collaborate/adoption-dashboard/overview",
-        children: "AI Adoption Dashboard",
-        subLinks: [
-          {
-            href: "/collaborate/adoption-dashboard/overview",
-            children: "Overview",
-          },
-          {
-            href: "/collaborate/adoption-dashboard/understanding-your-score",
-            children: "Understanding Your Score",
-          },
-          {
-            href: "/collaborate/adoption-dashboard/improving-your-score",
-            children: "Improving Your Score",
-          },
-          {
-            href: "/collaborate/adoption-dashboard/for-team-leads",
-            children: "For Team Leads",
-          },
-        ],
+        children: "Overview",
+      },
+      {
+        href: "/collaborate/adoption-dashboard/understanding-your-score",
+        children: "Understanding Your Score",
+      },
+      {
+        href: "/collaborate/adoption-dashboard/improving-your-score",
+        children: "Improving Your Score",
+      },
+      {
+        href: "/collaborate/adoption-dashboard/for-team-leads",
+        children: "For Team Leads",
       },
     ],
   },
diff --git a/packages/kilo-docs/lib/nav/getting-started.ts b/packages/kilo-docs/lib/nav/getting-started.ts
index 6da808b23a..763177a8ff 100644
--- a/packages/kilo-docs/lib/nav/getting-started.ts
+++ b/packages/kilo-docs/lib/nav/getting-started.ts
@@ -24,7 +24,6 @@ export const GettingStartedNav: NavSection[] = [
         href: "/getting-started/byok",
         children: "Bring Your Own Key (BYOK)",
       },
-      { href: "/ai-providers", children: "AI Providers" },
       {
         href: "/getting-started/settings",
         children: "Settings",
@@ -34,7 +33,10 @@ export const GettingStartedNav: NavSection[] = [
         ],
       },
       { href: "/getting-started/adding-credits", children: "Adding Credits" },
-      { href: "/getting-started/rate-limits-and-costs", children: "Cost Efficiency & Model Selection" },
+      {
+        href: "/getting-started/rate-limits-and-costs",
+        children: "Cost Efficiency & Model Selection",
+      },
       { href: "/getting-started/cost-controls-and-usage-safeguards", children: "Cost Controls and Usage Safeguards" },
     ],
   },
diff --git a/packages/kilo-docs/lib/nav/kiloclaw.ts b/packages/kilo-docs/lib/nav/kiloclaw.ts
index d7bed669f1..d880fcf6d9 100644
--- a/packages/kilo-docs/lib/nav/kiloclaw.ts
+++ b/packages/kilo-docs/lib/nav/kiloclaw.ts
@@ -12,7 +12,6 @@ export const KiloClawNav: NavSection[] = [
         href: "/kiloclaw/control-ui/overview",
         children: "Control UI",
         subLinks: [
-          { href: "/kiloclaw/control-ui/overview", children: "Overview" },
           { href: "/kiloclaw/control-ui/changing-models", children: "Changing Models" },
           { href: "/kiloclaw/control-ui/exec-approvals", children: "Exec Approvals" },
           { href: "/kiloclaw/control-ui/version-pinning", children: "Version Pinning" },
@@ -22,7 +21,6 @@ export const KiloClawNav: NavSection[] = [
         href: "/kiloclaw/chat-platforms",
         children: "Chat Platforms",
         subLinks: [
-          { href: "/kiloclaw/chat-platforms", children: "Overview" },
           { href: "/kiloclaw/chat-platforms/telegram", children: "Telegram" },
           { href: "/kiloclaw/chat-platforms/discord", children: "Discord" },
           { href: "/kiloclaw/chat-platforms/slack", children: "Slack" },
@@ -32,7 +30,6 @@ export const KiloClawNav: NavSection[] = [
         href: "/kiloclaw/development-tools",
         children: "Integrations",
         subLinks: [
-          { href: "/kiloclaw/development-tools", children: "Overview" },
           { href: "/kiloclaw/development-tools/github", children: "GitHub" },
           { href: "/kiloclaw/development-tools/google", children: "Google Workspace" },
           { href: "/kiloclaw/development-tools/linear", children: "Linear" },
@@ -47,7 +44,6 @@ export const KiloClawNav: NavSection[] = [
         href: "/kiloclaw/triggers",
         children: "Triggers",
         subLinks: [
-          { href: "/kiloclaw/triggers", children: "Overview" },
           { href: "/kiloclaw/triggers/webhooks", children: "Webhooks" },
           { href: "/kiloclaw/triggers/scheduled", children: "Scheduled" },
         ],

From 0d27eb17fdb695d2f0f151c17169334966f7ad73 Mon Sep 17 00:00:00 2001
From: trim21 <i@trim21.me>
Date: Tue, 7 Jul 2026 12:42:42 +0800
Subject: [PATCH 11/68] feat(sandbox): add configurable writable paths option

Add experimental.sandbox_writable_paths config option that allows users
to specify additional filesystem paths the sandbox permits writes to.
These paths are merged with the default writable paths when the sandbox
is active.

CLI: new config field + policy integration
VS Code: list input UI in the Sandboxing settings tab
---
 .../src/components/settings/SandboxingTab.tsx | 90 ++++++++++++++++++-
 .../kilo-vscode/webview-ui/src/i18n/en.ts     |  3 +
 .../webview-ui/src/types/messages/config.ts   |  1 +
 packages/opencode/src/config/config.ts        |  4 +
 .../opencode/src/kilocode/sandbox/policy.ts   | 11 ++-
 5 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
index e67ec17c7a..6e69d7b14d 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
@@ -1,16 +1,44 @@
-import { Component, createMemo } from "solid-js"
+import { Component, For, createMemo, createSignal } from "solid-js"
 import { Card } from "@kilocode/kilo-ui/card"
 import { Switch } from "@kilocode/kilo-ui/switch"
+import { TextField } from "@kilocode/kilo-ui/text-field"
+import { Button } from "@kilocode/kilo-ui/button"
+import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { useConfig } from "../../context/config"
 import { useLanguage } from "../../context/language"
 import SettingsRow from "./SettingsRow"
 
 const description = "sandbox-network-description"
+const writablePathsDescription = "sandbox-writable-paths-description"
 
 const SandboxingTab: Component = () => {
   const { config, updateConfig } = useConfig()
   const language = useLanguage()
   const experimental = createMemo(() => config().experimental ?? {})
+  const [newPath, setNewPath] = createSignal("")
+
+  const writablePaths = () => experimental().sandbox_writable_paths ?? []
+
+  const addPath = () => {
+    const value = newPath().trim()
+    if (!value) return
+    const current = [...writablePaths()]
+    if (!current.includes(value)) {
+      current.push(value)
+      updateConfig({
+        experimental: { ...experimental(), sandbox_writable_paths: current },
+      })
+    }
+    setNewPath("")
+  }
+
+  const removePath = (index: number) => {
+    const current = [...writablePaths()]
+    current.splice(index, 1)
+    updateConfig({
+      experimental: { ...experimental(), sandbox_writable_paths: current },
+    })
+  }
 
   return (
     <Card>
@@ -18,7 +46,6 @@ const SandboxingTab: Component = () => {
         title={language.t("settings.sandboxing.network.title")}
         description={language.t("settings.sandboxing.network.description")}
         descriptionId={description}
-        last
       >
         <Switch
           checked={experimental().sandbox_restrict_network !== false}
@@ -36,6 +63,65 @@ const SandboxingTab: Component = () => {
           {language.t("settings.sandboxing.network.title")}
         </Switch>
       </SettingsRow>
+
+      <SettingsRow
+        title={language.t("settings.sandboxing.writablePaths.title")}
+        description={language.t("settings.sandboxing.writablePaths.description")}
+        descriptionId={writablePathsDescription}
+        last
+      >
+        <div style={{ width: "100%" }}>
+          <div
+            style={{
+              display: "flex",
+              gap: "8px",
+              "align-items": "center",
+              padding: "8px 0",
+              "border-bottom": writablePaths().length > 0 ? "1px solid var(--border-weak-base)" : "none",
+            }}
+          >
+            <div style={{ flex: 1 }}>
+              <TextField
+                value={newPath()}
+                placeholder="/tmp"
+                onChange={(val) => setNewPath(val)}
+                onKeyDown={(e: KeyboardEvent) => {
+                  if (e.key === "Enter") addPath()
+                }}
+                hideLabel
+                label={language.t("settings.sandboxing.writablePaths.title")}
+              />
+            </div>
+            <Button variant="secondary" onClick={addPath}>
+              {language.t("common.add")}
+            </Button>
+          </div>
+          <For each={writablePaths()}>
+            {(path, index) => (
+              <div
+                style={{
+                  display: "flex",
+                  "align-items": "center",
+                  "justify-content": "space-between",
+                  padding: "6px 0",
+                  "border-bottom":
+                    index() < writablePaths().length - 1 ? "1px solid var(--border-weak-base)" : "none",
+                }}
+              >
+                <span
+                  style={{
+                    "font-family": "var(--vscode-editor-font-family, monospace)",
+                    "font-size": "var(--kilo-font-size-12)",
+                  }}
+                >
+                  {path}
+                </span>
+                <IconButton size="small" variant="ghost" icon="close" onClick={() => removePath(index())} />
+              </div>
+            )}
+          </For>
+        </div>
+      </SettingsRow>
     </Card>
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index d4435bcf03..a15b691327 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -1422,6 +1422,9 @@ export const dict = {
   "settings.sandboxing.network.title": "Restrict Network Access",
   "settings.sandboxing.network.description":
     "Block outbound network access from model-originated commands and HTTP tools. Local MCP servers and plugin hooks run outside this restriction. Provider and model inference traffic remains available.",
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout for MCP server requests in milliseconds",
   "settings.experimental.remote.title": "Remote Control",
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/config.ts b/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
index 8ceed88a13..cf7fefb2cf 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
@@ -48,6 +48,7 @@ export interface ExperimentalConfig {
   mcp_timeout?: number
   sandbox?: boolean
   sandbox_restrict_network?: boolean
+  sandbox_writable_paths?: string[]
 }
 
 export interface CommitMessageConfig {
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index be259ff3d9..eae0c08f1c 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -418,6 +418,10 @@ export const Info = Schema.Struct({
         description:
           "Restrict outbound network access for model-originated commands and first-party HTTP tools; local MCP servers and plugin hooks are not covered (default: true)",
       }),
+      sandbox_writable_paths: Schema.optional(Schema.mutable(Schema.Array(Schema.String))).annotate({
+        description:
+          "Additional filesystem paths the sandbox allows writes to (e.g. ['/tmp', '/var/log']). These are merged with the default writable paths when the sandbox is active.",
+      }),
       // kilocode_change end
       mcp_timeout: Schema.optional(PositiveInt).annotate({
         description: "Timeout in milliseconds for model context protocol (MCP) requests",
diff --git a/packages/opencode/src/kilocode/sandbox/policy.ts b/packages/opencode/src/kilocode/sandbox/policy.ts
index c02d66e5bc..ad0611db72 100644
--- a/packages/opencode/src/kilocode/sandbox/policy.ts
+++ b/packages/opencode/src/kilocode/sandbox/policy.ts
@@ -92,7 +92,11 @@ function isolated(ctx: InstanceContext) {
   return linked(path.resolve(ctx.directory), path.resolve(ctx.worktree))
 }
 
-export function profile(ctx: InstanceContext, mode: Profile["network"]["mode"] = "deny"): Profile {
+export function profile(
+  ctx: InstanceContext,
+  mode: Profile["network"]["mode"] = "deny",
+  extraWritable?: readonly string[],
+): Profile {
   const project = isolated(ctx)
     ? [ctx.directory]
     : ctx.directory === ctx.worktree
@@ -108,6 +112,7 @@ export function profile(ctx: InstanceContext, mode: Profile["network"]["mode"] =
     Global.Path.bin,
     Global.Path.log,
     Global.Path.repos,
+    ...(extraWritable ?? []),
   ].map(root)
   return {
     filesystem: {
@@ -297,7 +302,9 @@ function execute<A, E, R>(sessionID: SessionID, effect: Effect.Effect<A, E, R>)
     const current = yield* snapshot(sessionID)
     const support = backendSupport({ mode: current.state.mode, allowedHosts: [] })
     if (!current.state.enabled || !support.available) return yield* unrestricted(effect)
-    return yield* runSandbox(profile(yield* InstanceState.context, current.state.mode), effect)
+    const cfg = yield* (yield* Config.Service).get()
+    const extraWritable = cfg.experimental?.sandbox_writable_paths
+    return yield* runSandbox(profile(yield* InstanceState.context, current.state.mode, extraWritable), effect)
   })
 }
 

From 1fc36e2e83e911af25aab780082f0c07f8593889 Mon Sep 17 00:00:00 2001
From: trim21 <i@trim21.me>
Date: Tue, 7 Jul 2026 12:54:27 +0800
Subject: [PATCH 12/68] fix(i18n): translate sandbox writable paths for zh/zht
 and add keys to all locales

---
 packages/kilo-vscode/webview-ui/src/i18n/ar.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/br.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/bs.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/da.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/de.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/es.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/fr.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/it.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/ja.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/ko.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/nl.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/no.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/pl.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/ru.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/th.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/tr.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/uk.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/zh.ts  | 4 ++++
 packages/kilo-vscode/webview-ui/src/i18n/zht.ts | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index a87c8ac9b6..62c7b7bce9 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -1411,6 +1411,10 @@ export const dict = {
   "settings.sandboxing.network.title": "تقييد الوصول إلى الشبكة",
   "settings.sandboxing.network.description":
     "احظر الوصول الصادر إلى الشبكة من الأوامر الصادرة عن النموذج وأدوات HTTP. تعمل خوادم MCP المحلية وخطافات المكونات الإضافية خارج هذا التقييد. تظل حركة مرور استدلال الموفّر والنموذج متاحة.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "مهلة MCP (مللي ثانية)",
   "settings.experimental.mcpTimeout.description": "مهلة طلبات خادم MCP بالمللي ثانية",
   "settings.experimental.remote.title": "التحكم Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 5daf082020..531b64e519 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -1447,6 +1447,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Restringir acesso à rede",
   "settings.sandboxing.network.description":
     "Bloqueie o acesso de saída à rede para comandos originados pelo modelo e ferramentas HTTP. Servidores MCP locais e hooks de plugins são executados fora dessa restrição. O tráfego de inferência de provedores e modelos permanece disponível.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Tempo limite MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Tempo limite para solicitações do servidor MCP em milissegundos",
   "settings.experimental.remote.title": "Controle Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index a5a894c7f0..08eac42dbb 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -1443,6 +1443,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Ograniči pristup mreži",
   "settings.sandboxing.network.description":
     "Blokiraj odlazni mrežni pristup za naredbe koje potiču od modela i HTTP alate. Lokalni MCP serveri i hookovi dodataka izvršavaju se izvan ovog ograničenja. Saobraćaj za inferenciju pružatelja i modela ostaje dostupan.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP istek vremena (ms)",
   "settings.experimental.mcpTimeout.description": "Istek vremena za MCP server zahtjeve u milisekundama",
   "settings.experimental.remote.title": "Remote kontrola",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 14b21e2ab8..8084198a5c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -1437,6 +1437,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Begræns netværksadgang",
   "settings.sandboxing.network.description":
     "Bloker udgående netværksadgang fra kommandoer, der stammer fra modellen, og HTTP-værktøjer. Lokale MCP-servere og plugin-hooks er ikke underlagt denne begrænsning. Inferenstrafik til udbydere og modeller er fortsat tilgængelig.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP-timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout for MCP-serveranmodninger i millisekunder",
   "settings.experimental.remote.title": "Remote-styring",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 7c3ebe2962..e250600c9f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -1467,6 +1467,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Netzwerkzugriff einschränken",
   "settings.sandboxing.network.description":
     "Blockiert den ausgehenden Netzwerkzugriff für vom Modell initiierte Befehle und HTTP-Tools. Lokale MCP-Server und Plugin-Hooks sind von dieser Einschränkung ausgenommen. Anbieter- und Modellinferenzdatenverkehr bleibt verfügbar.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP-Zeitlimit (ms)",
   "settings.experimental.mcpTimeout.description": "Zeitlimit für MCP-Server-Anfragen in Millisekunden",
   "settings.experimental.remote.title": "Remote-Steuerung",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index a5bf4b39bd..11a1c4eb7c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -1455,6 +1455,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Restringir el acceso a la red",
   "settings.sandboxing.network.description":
     "Bloquea el acceso saliente a la red para los comandos iniciados por el modelo y las herramientas HTTP. Los servidores MCP locales y los hooks de plugins no están sujetos a esta restricción. El tráfico de proveedores y de inferencia de modelos sigue estando disponible.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Tiempo de espera MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Tiempo de espera para solicitudes del servidor MCP en milisegundos",
   "settings.experimental.remote.title": "Control Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index e793315324..a5cbfe1fff 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1470,6 +1470,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Restreindre l'accès au réseau",
   "settings.sandboxing.network.description":
     "Bloquer l'accès réseau sortant des commandes provenant du modèle et des outils HTTP. Les serveurs MCP locaux et les hooks de plugin ne sont pas soumis à cette restriction. Le trafic d'inférence des fournisseurs et des modèles reste disponible.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Délai MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Délai des requêtes du serveur MCP en millisecondes",
   "settings.experimental.remote.title": "Contrôle Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 5e1079426a..0af26debd7 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -1229,6 +1229,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Limita l'accesso alla rete",
   "settings.sandboxing.network.description":
     "Blocca l'accesso in uscita alla rete per i comandi avviati dal modello e gli strumenti HTTP. I server MCP locali e gli hook dei plugin operano al di fuori di questa restrizione. Il traffico verso i provider e per l'inferenza dei modelli rimane disponibile.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Timeout MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout per richieste server MCP in millisecondi",
   "settings.experimental.remote.title": "Controllo remoto",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 5483784d61..480fc818ee 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -1432,6 +1432,10 @@ export const dict = {
   "settings.sandboxing.network.title": "ネットワークアクセスを制限",
   "settings.sandboxing.network.description":
     "モデルから発行されたコマンドと HTTP ツールによる外部ネットワークアクセスをブロックします。ローカル MCP サーバーとプラグインフックは、この制限の対象外です。プロバイダーおよびモデルへの推論通信は引き続き利用できます。",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCPタイムアウト（ミリ秒）",
   "settings.experimental.mcpTimeout.description": "MCPサーバーリクエストのタイムアウト（ミリ秒）",
   "settings.experimental.remote.title": "Remote コントロール",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 1c68d5d743..592d78f9ff 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -1424,6 +1424,10 @@ export const dict = {
   "settings.sandboxing.network.title": "네트워크 액세스 제한",
   "settings.sandboxing.network.description":
     "모델이 실행한 명령과 HTTP 도구의 아웃바운드 네트워크 액세스를 차단합니다. 로컬 MCP 서버와 플러그인 훅에는 이 제한이 적용되지 않습니다. 공급자 및 모델 추론 트래픽은 계속 사용할 수 있습니다.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP 타임아웃 (ms)",
   "settings.experimental.mcpTimeout.description": "MCP 서버 요청의 타임아웃 시간 (밀리초)",
   "settings.experimental.remote.title": "Remote 제어",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 845b5d5a16..2ad81ecb59 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -1441,6 +1441,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Netwerktoegang beperken",
   "settings.sandboxing.network.description":
     "Blokkeer uitgaande netwerktoegang voor door het model geïnitieerde opdrachten en HTTP-tools. Lokale MCP-servers en plugin-hooks vallen buiten deze beperking. Netwerkverkeer voor providers en modelinferentie blijft beschikbaar.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout voor MCP-serververzoeken in milliseconden",
   "settings.experimental.remote.title": "Remote-bediening",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index 775d9dc7e6..a6fb9502cb 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -1400,6 +1400,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Begrens nettverkstilgang",
   "settings.sandboxing.network.description":
     "Blokker utgående nettverkstilgang fra kommandoer generert av modellen og HTTP-verktøy. Lokale MCP-servere og programtilleggskroker kjører utenfor denne begrensningen. Trafikk for leverandør- og modellinferens forblir tilgjengelig.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP-tidsavbrudd (ms)",
   "settings.experimental.mcpTimeout.description": "Tidsavbrudd for MCP-serverforespørsler i millisekunder",
   "settings.experimental.remote.title": "Remote-kontroll",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index d3fa876fb7..4c580f8b68 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -1400,6 +1400,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Ogranicz dostęp do sieci",
   "settings.sandboxing.network.description":
     "Blokuj wychodzący dostęp do sieci z poleceń pochodzących od modelu i narzędzi HTTP. Lokalne serwery MCP i hooki wtyczek nie podlegają temu ograniczeniu. Ruch do dostawców i modeli na potrzeby wnioskowania pozostaje dostępny.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Limit czasu MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Limit czasu żądań serwera MCP w milisekundach",
   "settings.experimental.remote.title": "Sterowanie Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 6f616a81d8..f2abffcf8b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -1441,6 +1441,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Ограничить доступ к сети",
   "settings.sandboxing.network.description":
     "Блокировать исходящий доступ к сети для команд, инициированных моделью, и HTTP-инструментов. Локальные серверы MCP и хуки плагинов не подпадают под это ограничение. Трафик к провайдерам и моделям для инференса остаётся доступным.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Таймаут MCP (мс)",
   "settings.experimental.mcpTimeout.description": "Таймаут запросов MCP-сервера в миллисекундах",
   "settings.experimental.remote.title": "Управление Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index e5ec7f48ed..360857fba2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -1420,6 +1420,10 @@ export const dict = {
   "settings.sandboxing.network.title": "จำกัดการเข้าถึงเครือข่าย",
   "settings.sandboxing.network.description":
     "บล็อกการเข้าถึงเครือข่ายขาออกจากคำสั่งที่มาจากโมเดลและเครื่องมือ HTTP เซิร์ฟเวอร์ MCP ภายในเครื่องและฮุกของปลั๊กอินทำงานอยู่นอกข้อจำกัดนี้ การรับส่งข้อมูลสำหรับการอนุมานของผู้ให้บริการและโมเดลยังคงใช้งานได้",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "หมดเวลา MCP (มิลลิวินาที)",
   "settings.experimental.mcpTimeout.description": "หมดเวลาสำหรับคำขอเซิร์ฟเวอร์ MCP เป็นมิลลิวินาที",
   "settings.experimental.remote.title": "การควบคุม Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index e57d018906..9337af1b82 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -1431,6 +1431,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Ağ Erişimini Kısıtla",
   "settings.sandboxing.network.description":
     "Model tarafından başlatılan komutların ve HTTP araçlarının giden ağ erişimini engelleyin. Yerel MCP sunucuları ve eklenti kancaları bu kısıtlamanın dışında çalışır. Sağlayıcı ve model çıkarım trafiği kullanılabilir durumda kalır.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "MCP Zaman Aşımı (ms)",
   "settings.experimental.mcpTimeout.description": "MCP sunucu istekleri için milisaniye cinsinden zaman aşımı",
   "settings.experimental.remote.title": "Remote Kontrolü",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index 06c0f00dfa..bd849a94b4 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -1429,6 +1429,10 @@ export const dict = {
   "settings.sandboxing.network.title": "Обмежити доступ до мережі",
   "settings.sandboxing.network.description":
     "Блокуйте вихідний доступ до мережі для команд, ініційованих моделлю, та HTTP-інструментів. Локальні MCP-сервери й хуки плагінів працюють поза цим обмеженням. Трафік провайдерів та інференсу моделей залишається доступним.",
+
+  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.description":
+    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
   "settings.experimental.mcpTimeout.title": "Тайм-аут MCP (мс)",
   "settings.experimental.mcpTimeout.description": "Тайм-аут у мілісекундах для запитів до MCP-сервера",
   "settings.experimental.remote.title": "Керування Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index 3f0eafa95e..cf9dd5844e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -1394,6 +1394,10 @@ export const dict = {
   "settings.sandboxing.network.title": "限制网络访问",
   "settings.sandboxing.network.description":
     "阻止模型发起的命令和 HTTP 工具进行出站网络访问。本地 MCP 服务器和插件钩子不受此限制。提供商和模型推理流量仍然可用。",
+
+  "settings.sandboxing.writablePaths.title": "额外可写路径",
+  "settings.sandboxing.writablePaths.description":
+    "沙盒允许写入的额外文件系统路径（例如 /tmp、/var/log）。沙盒启用后，这些路径会与默认可写路径合并。",
   "settings.experimental.mcpTimeout.title": "MCP 超时（毫秒）",
   "settings.experimental.mcpTimeout.description": "MCP 服务器请求的超时时间（毫秒）",
   "settings.experimental.remote.title": "Remote 控制",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index d50689f1f7..16e14f70e2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -1358,6 +1358,10 @@ export const dict = {
   "settings.sandboxing.network.title": "限制網路存取",
   "settings.sandboxing.network.description":
     "封鎖模型發起的命令和 HTTP 工具的對外網路存取。本機 MCP 伺服器和外掛程式鉤子不受此限制。供應商與模型推論流量仍然可用。",
+
+  "settings.sandboxing.writablePaths.title": "額外可寫路徑",
+  "settings.sandboxing.writablePaths.description":
+    "沙盒允許寫入的額外檔案系統路徑（例如 /tmp、/var/log）。沙盒啟用後，這些路徑會與預設可寫路徑合併。",
   "settings.experimental.mcpTimeout.title": "MCP 逾時（毫秒）",
   "settings.experimental.mcpTimeout.description": "MCP 伺服器請求的逾時時間（毫秒）",
   "settings.experimental.remote.title": "Remote 控制",

From 889e2f4358042250d87817b41d085a20a7c24a9b Mon Sep 17 00:00:00 2001
From: trim21 <i@trim21.me>
Date: Tue, 7 Jul 2026 12:58:44 +0800
Subject: [PATCH 13/68] style: fix prettier formatting for SandboxingTab

---
 .../webview-ui/src/components/settings/SandboxingTab.tsx      | 3 +--
 packages/kilo-vscode/webview-ui/src/i18n/ar.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/br.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/bs.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/da.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/de.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/es.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/fr.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/it.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/ja.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/ko.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/nl.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/no.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/pl.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/ru.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/th.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/tr.ts                | 4 ++--
 packages/kilo-vscode/webview-ui/src/i18n/uk.ts                | 4 ++--
 18 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
index 6e69d7b14d..74f6e656fa 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
@@ -104,8 +104,7 @@ const SandboxingTab: Component = () => {
                   "align-items": "center",
                   "justify-content": "space-between",
                   padding: "6px 0",
-                  "border-bottom":
-                    index() < writablePaths().length - 1 ? "1px solid var(--border-weak-base)" : "none",
+                  "border-bottom": index() < writablePaths().length - 1 ? "1px solid var(--border-weak-base)" : "none",
                 }}
               >
                 <span
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index 62c7b7bce9..baee50a803 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -1412,9 +1412,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "احظر الوصول الصادر إلى الشبكة من الأوامر الصادرة عن النموذج وأدوات HTTP. تعمل خوادم MCP المحلية وخطافات المكونات الإضافية خارج هذا التقييد. تظل حركة مرور استدلال الموفّر والنموذج متاحة.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "مسارات قابلة للكتابة إضافية",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "مسارات نظام ملفات إضافية يسمح صندوق الرمل بالكتابة إليها (مثل /tmp، /var/log). يتم دمجها مع مسارات الكتابة الافتراضية عندما يكون صندوق الرمل نشطًا.",
   "settings.experimental.mcpTimeout.title": "مهلة MCP (مللي ثانية)",
   "settings.experimental.mcpTimeout.description": "مهلة طلبات خادم MCP بالمللي ثانية",
   "settings.experimental.remote.title": "التحكم Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 531b64e519..8534959943 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -1448,9 +1448,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Bloqueie o acesso de saída à rede para comandos originados pelo modelo e ferramentas HTTP. Servidores MCP locais e hooks de plugins são executados fora dessa restrição. O tráfego de inferência de provedores e modelos permanece disponível.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Caminhos graváveis adicionais",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Caminhos adicionais do sistema de arquivos onde o sandbox permite gravação (por exemplo, /tmp, /var/log). Eles são mesclados com os caminhos graváveis padrão quando o sandbox está ativo.",
   "settings.experimental.mcpTimeout.title": "Tempo limite MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Tempo limite para solicitações do servidor MCP em milissegundos",
   "settings.experimental.remote.title": "Controle Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 08eac42dbb..e19307b6e5 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -1444,9 +1444,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Blokiraj odlazni mrežni pristup za naredbe koje potiču od modela i HTTP alate. Lokalni MCP serveri i hookovi dodataka izvršavaju se izvan ovog ograničenja. Saobraćaj za inferenciju pružatelja i modela ostaje dostupan.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Dodatne upisive putanje",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Dodatne putanje sistema datoteka u koje sandbox dozvoljava upis (npr. /tmp, /var/log). Spajaju se sa zadanim upisivim putanjama kada je sandbox aktivan.",
   "settings.experimental.mcpTimeout.title": "MCP istek vremena (ms)",
   "settings.experimental.mcpTimeout.description": "Istek vremena za MCP server zahtjeve u milisekundama",
   "settings.experimental.remote.title": "Remote kontrola",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 8084198a5c..7eede94256 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -1438,9 +1438,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Bloker udgående netværksadgang fra kommandoer, der stammer fra modellen, og HTTP-værktøjer. Lokale MCP-servere og plugin-hooks er ikke underlagt denne begrænsning. Inferenstrafik til udbydere og modeller er fortsat tilgængelig.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Yderligere skrivbare stier",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Yderligere filsystemstier, som sandkassen tillader skrivning til (f.eks. /tmp, /var/log). Disse flettes med de standardskrivbare stier, når sandkassen er aktiv.",
   "settings.experimental.mcpTimeout.title": "MCP-timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout for MCP-serveranmodninger i millisekunder",
   "settings.experimental.remote.title": "Remote-styring",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index e250600c9f..3a08e1c4a1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -1468,9 +1468,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Blockiert den ausgehenden Netzwerkzugriff für vom Modell initiierte Befehle und HTTP-Tools. Lokale MCP-Server und Plugin-Hooks sind von dieser Einschränkung ausgenommen. Anbieter- und Modellinferenzdatenverkehr bleibt verfügbar.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Zusätzliche schreibbare Pfade",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Zusätzliche Dateisystempfade, in die die Sandbox Schreibvorgänge erlaubt (z. B. /tmp, /var/log). Diese werden mit den Standard-Schreibpfaden zusammengeführt, wenn die Sandbox aktiv ist.",
   "settings.experimental.mcpTimeout.title": "MCP-Zeitlimit (ms)",
   "settings.experimental.mcpTimeout.description": "Zeitlimit für MCP-Server-Anfragen in Millisekunden",
   "settings.experimental.remote.title": "Remote-Steuerung",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 11a1c4eb7c..7cc948d78b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -1456,9 +1456,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Bloquea el acceso saliente a la red para los comandos iniciados por el modelo y las herramientas HTTP. Los servidores MCP locales y los hooks de plugins no están sujetos a esta restricción. El tráfico de proveedores y de inferencia de modelos sigue estando disponible.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Rutas de escritura adicionales",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Rutas del sistema de archivos adicionales donde el sandbox permite escritura (por ej., /tmp, /var/log). Se combinan con las rutas de escritura predeterminadas cuando el sandbox está activo.",
   "settings.experimental.mcpTimeout.title": "Tiempo de espera MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Tiempo de espera para solicitudes del servidor MCP en milisegundos",
   "settings.experimental.remote.title": "Control Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index a5cbfe1fff..147ac38996 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1471,9 +1471,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Bloquer l'accès réseau sortant des commandes provenant du modèle et des outils HTTP. Les serveurs MCP locaux et les hooks de plugin ne sont pas soumis à cette restriction. Le trafic d'inférence des fournisseurs et des modèles reste disponible.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Chemins en écriture supplémentaires",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Chemins système supplémentaires autorisés en écriture par le bac à sable (par ex. /tmp, /var/log). Ils sont fusionnés avec les chemins en écriture par défaut lorsque le bac à sable est actif.",
   "settings.experimental.mcpTimeout.title": "Délai MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Délai des requêtes du serveur MCP en millisecondes",
   "settings.experimental.remote.title": "Contrôle Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 0af26debd7..d8bba5c4fa 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -1230,9 +1230,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Blocca l'accesso in uscita alla rete per i comandi avviati dal modello e gli strumenti HTTP. I server MCP locali e gli hook dei plugin operano al di fuori di questa restrizione. Il traffico verso i provider e per l'inferenza dei modelli rimane disponibile.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Percorsi di scrittura aggiuntivi",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Percorsi aggiuntivi del file system in cui la sandbox consente la scrittura (es. /tmp, /var/log). Vengono uniti con i percorsi di scrittura predefiniti quando la sandbox è attiva.",
   "settings.experimental.mcpTimeout.title": "Timeout MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout per richieste server MCP in millisecondi",
   "settings.experimental.remote.title": "Controllo remoto",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 480fc818ee..41fc11fcb4 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -1433,9 +1433,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "モデルから発行されたコマンドと HTTP ツールによる外部ネットワークアクセスをブロックします。ローカル MCP サーバーとプラグインフックは、この制限の対象外です。プロバイダーおよびモデルへの推論通信は引き続き利用できます。",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "追加の書き込み可能パス",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "サンドボックスでの書き込みを許可する追加のファイルシステムパス（例: /tmp、/var/log）。サンドボックス有効時、デフォルトの書き込み可能パスと統合されます。",
   "settings.experimental.mcpTimeout.title": "MCPタイムアウト（ミリ秒）",
   "settings.experimental.mcpTimeout.description": "MCPサーバーリクエストのタイムアウト（ミリ秒）",
   "settings.experimental.remote.title": "Remote コントロール",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 592d78f9ff..81153b3fcc 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -1425,9 +1425,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "모델이 실행한 명령과 HTTP 도구의 아웃바운드 네트워크 액세스를 차단합니다. 로컬 MCP 서버와 플러그인 훅에는 이 제한이 적용되지 않습니다. 공급자 및 모델 추론 트래픽은 계속 사용할 수 있습니다.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "추가 쓰기 가능 경로",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "샌드박스에서 쓰기를 허용하는 추가 파일시스템 경로(예: /tmp, /var/log). 샌드박스가 활성화되면 기본 쓰기 가능 경로와 병합됩니다.",
   "settings.experimental.mcpTimeout.title": "MCP 타임아웃 (ms)",
   "settings.experimental.mcpTimeout.description": "MCP 서버 요청의 타임아웃 시간 (밀리초)",
   "settings.experimental.remote.title": "Remote 제어",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 2ad81ecb59..83c566430e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -1442,9 +1442,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Blokkeer uitgaande netwerktoegang voor door het model geïnitieerde opdrachten en HTTP-tools. Lokale MCP-servers en plugin-hooks vallen buiten deze beperking. Netwerkverkeer voor providers en modelinferentie blijft beschikbaar.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Extra schrijfbare paden",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Extra bestandssysteempaden waar de sandbox schrijftoestemming voor geeft (bijv. /tmp, /var/log). Deze worden samengevoegd met de standaard schrijfbare paden wanneer de sandbox actief is.",
   "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)",
   "settings.experimental.mcpTimeout.description": "Timeout voor MCP-serververzoeken in milliseconden",
   "settings.experimental.remote.title": "Remote-bediening",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index a6fb9502cb..f8b0e4be38 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -1401,9 +1401,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Blokker utgående nettverkstilgang fra kommandoer generert av modellen og HTTP-verktøy. Lokale MCP-servere og programtilleggskroker kjører utenfor denne begrensningen. Trafikk for leverandør- og modellinferens forblir tilgjengelig.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Ytterligere skrivbare baner",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Ytterligere filsystembaner som sandkassen tillater skriving til (f.eks. /tmp, /var/log). Disse flettes med de standardskrivbare banene når sandkassen er aktiv.",
   "settings.experimental.mcpTimeout.title": "MCP-tidsavbrudd (ms)",
   "settings.experimental.mcpTimeout.description": "Tidsavbrudd for MCP-serverforespørsler i millisekunder",
   "settings.experimental.remote.title": "Remote-kontroll",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index 4c580f8b68..5e2b6da255 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -1401,9 +1401,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Blokuj wychodzący dostęp do sieci z poleceń pochodzących od modelu i narzędzi HTTP. Lokalne serwery MCP i hooki wtyczek nie podlegają temu ograniczeniu. Ruch do dostawców i modeli na potrzeby wnioskowania pozostaje dostępny.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Dodatkowe ścieżki zapisu",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Dodatkowe ścieżki systemu plików, do których sandbox zezwala na zapis (np. /tmp, /var/log). Są one łączone z domyślnymi ścieżkami zapisu, gdy sandbox jest aktywny.",
   "settings.experimental.mcpTimeout.title": "Limit czasu MCP (ms)",
   "settings.experimental.mcpTimeout.description": "Limit czasu żądań serwera MCP w milisekundach",
   "settings.experimental.remote.title": "Sterowanie Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index f2abffcf8b..de3a1992cb 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -1442,9 +1442,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Блокировать исходящий доступ к сети для команд, инициированных моделью, и HTTP-инструментов. Локальные серверы MCP и хуки плагинов не подпадают под это ограничение. Трафик к провайдерам и моделям для инференса остаётся доступным.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Дополнительные пути для записи",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Дополнительные пути файловой системы, в которые разрешена запись в песочнице (например, /tmp, /var/log). Они объединяются с путями записи по умолчанию при активной песочнице.",
   "settings.experimental.mcpTimeout.title": "Таймаут MCP (мс)",
   "settings.experimental.mcpTimeout.description": "Таймаут запросов MCP-сервера в миллисекундах",
   "settings.experimental.remote.title": "Управление Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index 360857fba2..ccbaa5de85 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -1421,9 +1421,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "บล็อกการเข้าถึงเครือข่ายขาออกจากคำสั่งที่มาจากโมเดลและเครื่องมือ HTTP เซิร์ฟเวอร์ MCP ภายในเครื่องและฮุกของปลั๊กอินทำงานอยู่นอกข้อจำกัดนี้ การรับส่งข้อมูลสำหรับการอนุมานของผู้ให้บริการและโมเดลยังคงใช้งานได้",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "เส้นทางที่เขียนได้เพิ่มเติม",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "เส้นทางระบบไฟล์เพิ่มเติมที่แซนด์บ็อกซ์อนุญาตให้เขียนได้ (เช่น /tmp, /var/log) จะถูกรวมเข้ากับเส้นทางที่เขียนได้เริ่มต้นเมื่อแซนด์บ็อกซ์เปิดใช้งาน",
   "settings.experimental.mcpTimeout.title": "หมดเวลา MCP (มิลลิวินาที)",
   "settings.experimental.mcpTimeout.description": "หมดเวลาสำหรับคำขอเซิร์ฟเวอร์ MCP เป็นมิลลิวินาที",
   "settings.experimental.remote.title": "การควบคุม Remote",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index 9337af1b82..aa5a10d19e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -1432,9 +1432,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Model tarafından başlatılan komutların ve HTTP araçlarının giden ağ erişimini engelleyin. Yerel MCP sunucuları ve eklenti kancaları bu kısıtlamanın dışında çalışır. Sağlayıcı ve model çıkarım trafiği kullanılabilir durumda kalır.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Ek Yazılabilir Yollar",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Sandığın yazılmasına izin veren ek dosya sistemi yolları (ör. /tmp, /var/log). Sandık etkinken varsayılan yazılabilir yollarla birleştirilir.",
   "settings.experimental.mcpTimeout.title": "MCP Zaman Aşımı (ms)",
   "settings.experimental.mcpTimeout.description": "MCP sunucu istekleri için milisaniye cinsinden zaman aşımı",
   "settings.experimental.remote.title": "Remote Kontrolü",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index bd849a94b4..3e903edcd1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -1430,9 +1430,9 @@ export const dict = {
   "settings.sandboxing.network.description":
     "Блокуйте вихідний доступ до мережі для команд, ініційованих моделлю, та HTTP-інструментів. Локальні MCP-сервери й хуки плагінів працюють поза цим обмеженням. Трафік провайдерів та інференсу моделей залишається доступним.",
 
-  "settings.sandboxing.writablePaths.title": "Additional Writable Paths",
+  "settings.sandboxing.writablePaths.title": "Додаткові шляхи для запису",
   "settings.sandboxing.writablePaths.description":
-    "Extra filesystem paths the sandbox allows writes to (e.g. /tmp, /var/log). These are merged with the default writable paths when the sandbox is active.",
+    "Додаткові шляхи файлової системи, у які дозволено запис у пісочниці (наприклад, /tmp, /var/log). Вони об'єднуються зі шляхами запису за замовчуванням, коли пісочниця активна.",
   "settings.experimental.mcpTimeout.title": "Тайм-аут MCP (мс)",
   "settings.experimental.mcpTimeout.description": "Тайм-аут у мілісекундах для запитів до MCP-сервера",
   "settings.experimental.remote.title": "Керування Remote",

From 61b9e0935cb3314acdabb4d3237b95395bfffb06 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 11:30:13 +0200
Subject: [PATCH 14/68] fix(cli): honor cloud-selected Kilo organization

---
 .changeset/selected-organization-default.md   |  6 +++++
 packages/kilo-gateway/src/api/profile.ts      |  2 ++
 packages/kilo-gateway/src/server/handlers.ts  | 19 ++++++++++---
 packages/kilo-gateway/src/server/routes.ts    |  1 +
 packages/kilo-gateway/src/types.ts            |  1 +
 .../src/services/cli-backend/types.ts         |  1 +
 .../webview-ui/src/types/messages/profile.ts  |  1 +
 .../server/httpapi/groups/kilo-gateway.ts     |  1 +
 .../server/httpapi/handlers/kilo-gateway.ts   | 27 ++++++++++++++++---
 .../kilocode/server/httpapi-public.test.ts    |  1 +
 packages/sdk/js/src/v2/gen/types.gen.ts       |  1 +
 packages/sdk/openapi.json                     |  3 +++
 12 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/selected-organization-default.md

diff --git a/.changeset/selected-organization-default.md b/.changeset/selected-organization-default.md
new file mode 100644
index 0000000000..1f4c262b29
--- /dev/null
+++ b/.changeset/selected-organization-default.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": patch
+"@kilocode/kilo-gateway": patch
+---
+
+Use the cloud-selected organization as the active Kilo account when provided.
diff --git a/packages/kilo-gateway/src/api/profile.ts b/packages/kilo-gateway/src/api/profile.ts
index aa717a64c4..ae7d46eeed 100644
--- a/packages/kilo-gateway/src/api/profile.ts
+++ b/packages/kilo-gateway/src/api/profile.ts
@@ -25,6 +25,7 @@ export async function fetchProfile(token: string): Promise<KilocodeProfile> {
     email?: string
     name?: string
     organizations?: Organization[]
+    selectedOrganizationId?: string | null
   }
   // Backend returns { user: { email, name, ... }, organizations }
   // Transform to flat KilocodeProfile structure
@@ -32,6 +33,7 @@ export async function fetchProfile(token: string): Promise<KilocodeProfile> {
     email: data.user?.email ?? data.email ?? "",
     name: data.user?.name ?? data.name,
     organizations: data.organizations,
+    selectedOrganizationId: data.selectedOrganizationId ?? undefined,
   }
 }
 
diff --git a/packages/kilo-gateway/src/server/handlers.ts b/packages/kilo-gateway/src/server/handlers.ts
index 167bfbf4db..ebf5aa3734 100644
--- a/packages/kilo-gateway/src/server/handlers.ts
+++ b/packages/kilo-gateway/src/server/handlers.ts
@@ -68,12 +68,25 @@ export async function getProfile(auth: AuthStore): Promise<KiloProfileResult> {
   const info = await auth.get("kilo")
   if (!info || info.type !== "oauth") throw new UnauthorizedError("Not authenticated with Kilo Gateway")
 
-  const currentOrgId = info.accountId ?? null
-  const [profile, balance, kiloPass] = await Promise.all([
+  const [profile, kiloPass] = await Promise.all([
     fetchProfile(info.access),
-    fetchBalance(info.access, currentOrgId ?? undefined),
     fetchKiloPassState(info.access),
   ])
+
+  const selected = profile.selectedOrganizationId
+  const valid = selected && profile.organizations?.some((org) => org.id === selected) ? selected : undefined
+  const currentOrgId = valid ?? info.accountId ?? null
+  if (valid && valid !== info.accountId) {
+    await auth.set("kilo", {
+      type: "oauth",
+      refresh: info.refresh,
+      access: info.access,
+      expires: info.expires,
+      accountId: valid,
+    })
+  }
+
+  const balance = await fetchBalance(info.access, currentOrgId ?? undefined)
   return { profile, balance, kiloPass, currentOrgId }
 }
 
diff --git a/packages/kilo-gateway/src/server/routes.ts b/packages/kilo-gateway/src/server/routes.ts
index 40fb57937c..cc60ecc62c 100644
--- a/packages/kilo-gateway/src/server/routes.ts
+++ b/packages/kilo-gateway/src/server/routes.ts
@@ -101,6 +101,7 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {
     email: z.string(),
     name: z.string().optional(),
     organizations: z.array(Organization).optional(),
+    selectedOrganizationId: z.string().optional(),
   })
 
   const Balance = z.object({
diff --git a/packages/kilo-gateway/src/types.ts b/packages/kilo-gateway/src/types.ts
index 801464966b..c9014f1bc2 100644
--- a/packages/kilo-gateway/src/types.ts
+++ b/packages/kilo-gateway/src/types.ts
@@ -27,6 +27,7 @@ export interface KilocodeProfile {
   email: string
   name?: string
   organizations?: Organization[]
+  selectedOrganizationId?: string
 }
 
 export interface KilocodeBalance {
diff --git a/packages/kilo-vscode/src/services/cli-backend/types.ts b/packages/kilo-vscode/src/services/cli-backend/types.ts
index b675500454..99f52c80d3 100644
--- a/packages/kilo-vscode/src/services/cli-backend/types.ts
+++ b/packages/kilo-vscode/src/services/cli-backend/types.ts
@@ -31,6 +31,7 @@ export interface KilocodeProfile {
   email: string
   name?: string
   organizations?: KilocodeOrganization[]
+  selectedOrganizationId?: string
 }
 
 export interface KilocodeBalance {
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts b/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts
index 6b05d3fb51..2d2a845a2b 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts
@@ -30,6 +30,7 @@ export interface ProfileData {
     email: string
     name?: string
     organizations?: Array<{ id: string; name: string; role: string }>
+    selectedOrganizationId?: string
   }
   balance: KilocodeBalance | null
   kiloPass: KiloPassState | null
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts
index f807b480bd..8f255191b0 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts
@@ -21,6 +21,7 @@ export const Profile = Schema.Struct({
   email: Schema.String,
   name: Schema.optional(Schema.String),
   organizations: Schema.optional(Schema.Array(Organization)),
+  selectedOrganizationId: Schema.optional(Schema.String),
 })
 
 export const Balance = Schema.Struct({
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
index dc37a5628a..334a819276 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
@@ -67,16 +67,37 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
       const info = yield* auth.get("kilo").pipe(Effect.mapError(() => new HttpApiError.BadRequest({})))
       if (!info || info.type !== "oauth") return yield* Effect.fail(new HttpApiError.Unauthorized({}))
 
-      const currentOrgId = info.accountId ?? null
-      const [profile, balance, kiloPass] = yield* Effect.tryPromise({
+      const [profile, kiloPass] = yield* Effect.tryPromise({
         try: () =>
           Promise.all([
             fetchProfile(info.access),
-            fetchBalance(info.access, currentOrgId ?? undefined),
             fetchKiloPassState(info.access),
           ]),
         catch: () => new HttpApiError.BadRequest({}),
       })
+
+      const selected = profile.selectedOrganizationId
+      const valid = selected && profile.organizations?.some((org) => org.id === selected) ? selected : undefined
+      const currentOrgId = valid ?? info.accountId ?? null
+      if (valid && valid !== info.accountId) {
+        yield* auth
+          .set("kilo", {
+            type: "oauth",
+            refresh: info.refresh,
+            access: info.access,
+            expires: info.expires,
+            accountId: valid,
+          })
+          .pipe(Effect.mapError(() => new HttpApiError.BadRequest({})))
+        yield* cache.clear("kilo")
+        clearModesCache()
+        yield* store.disposeAll().pipe(Effect.mapError(() => new HttpApiError.BadRequest({})))
+      }
+
+      const balance = yield* Effect.tryPromise({
+        try: () => fetchBalance(info.access, currentOrgId ?? undefined),
+        catch: () => new HttpApiError.BadRequest({}),
+      })
       return { profile, balance, kiloPass, currentOrgId }
     })
 
diff --git a/packages/opencode/test/kilocode/server/httpapi-public.test.ts b/packages/opencode/test/kilocode/server/httpapi-public.test.ts
index 66cf90a7ec..3adc9c77ee 100644
--- a/packages/opencode/test/kilocode/server/httpapi-public.test.ts
+++ b/packages/opencode/test/kilocode/server/httpapi-public.test.ts
@@ -189,6 +189,7 @@ describe("Kilo PublicApi OpenAPI contract", () => {
     const profile = response(KiloGatewayPaths.profile)?.properties
     expect(profile?.balance).toEqual({ anyOf: [expect.objectContaining({ type: "object" }), { type: "null" }] })
     expect(profile?.kiloPass).toEqual({ anyOf: [expect.objectContaining({ type: "object" }), { type: "null" }] })
+    expect(profile?.profile?.properties?.selectedOrganizationId).toEqual({ type: "string" })
     const pass = profile?.kiloPass?.anyOf?.find((item) => item.type === "object")?.properties
     expect(pass?.nextBillingAt).toEqual({ anyOf: [{ type: "string" }, { type: "null" }] })
     expect(profile?.currentOrgId).toEqual({ anyOf: [{ type: "string" }, { type: "null" }] })
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 5282b260f4..e7a7c7c3f9 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -10787,6 +10787,7 @@ export type KiloProfileResponses = {
         name: string
         role: string
       }>
+      selectedOrganizationId?: string
     }
     balance: {
       balance: number
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 267d53bb1d..b1bb912b56 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -13509,6 +13509,9 @@
                             "required": ["id", "name", "role"],
                             "additionalProperties": false
                           }
+                        },
+                        "selectedOrganizationId": {
+                          "type": "string"
                         }
                       },
                       "required": ["email"],

From 81213b9f251286fb87d677c8af3dba304efea136 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 11:46:34 +0200
Subject: [PATCH 15/68] fix: respect unavailable personal Kilo accounts

---
 .changeset/selected-organization-default.md   |  2 +-
 packages/kilo-gateway/src/api/profile.ts      |  2 ++
 packages/kilo-gateway/src/server/routes.ts    |  1 +
 packages/kilo-gateway/src/tui/helpers.ts      | 17 ++++++++-----
 packages/kilo-gateway/src/types.ts            |  1 +
 .../kilocode/backend/rpc/KiloAppRpcApiImpl.kt |  1 +
 .../backend/app/KiloBackendAppServiceTest.kt  |  2 ++
 .../ui/account/SessionAccountOverlay.kt       |  5 ++--
 .../settings/profile/LoggedInProfileUi.kt     |  7 +++---
 .../ui/account/SessionAccountOverlayTest.kt   | 18 +++++++++++++
 .../ai/kilocode/rpc/dto/KiloAppStateDto.kt    |  1 +
 .../src/services/cli-backend/types.ts         |  1 +
 .../src/components/profile/ProfileView.tsx    | 25 +++++++++++++++----
 .../src/components/shared/AccountSwitcher.tsx | 23 +++++++++--------
 .../webview-ui/src/types/messages/profile.ts  |  1 +
 .../components/dialog-kilo-auto-method.tsx    | 11 ++++----
 .../components/dialog-kilo-organization.tsx   |  3 ++-
 .../components/dialog-kilo-team-select.tsx    |  7 +++++-
 .../opencode/src/kilocode/kilo-commands.tsx   |  1 +
 .../server/httpapi/groups/kilo-gateway.ts     |  1 +
 .../kilocode/server/httpapi-public.test.ts    |  1 +
 packages/sdk/js/src/v2/gen/types.gen.ts       |  1 +
 packages/sdk/openapi.json                     |  3 +++
 23 files changed, 100 insertions(+), 35 deletions(-)

diff --git a/.changeset/selected-organization-default.md b/.changeset/selected-organization-default.md
index 1f4c262b29..78a9cec07c 100644
--- a/.changeset/selected-organization-default.md
+++ b/.changeset/selected-organization-default.md
@@ -3,4 +3,4 @@
 "@kilocode/kilo-gateway": patch
 ---
 
-Use the cloud-selected organization as the active Kilo account when provided.
+Use cloud account preferences to select the active Kilo organization and hide unavailable personal accounts.
diff --git a/packages/kilo-gateway/src/api/profile.ts b/packages/kilo-gateway/src/api/profile.ts
index ae7d46eeed..fb3413ddf8 100644
--- a/packages/kilo-gateway/src/api/profile.ts
+++ b/packages/kilo-gateway/src/api/profile.ts
@@ -26,6 +26,7 @@ export async function fetchProfile(token: string): Promise<KilocodeProfile> {
     name?: string
     organizations?: Organization[]
     selectedOrganizationId?: string | null
+    hasPersonalAccount?: boolean | null
   }
   // Backend returns { user: { email, name, ... }, organizations }
   // Transform to flat KilocodeProfile structure
@@ -34,6 +35,7 @@ export async function fetchProfile(token: string): Promise<KilocodeProfile> {
     name: data.user?.name ?? data.name,
     organizations: data.organizations,
     selectedOrganizationId: data.selectedOrganizationId ?? undefined,
+    hasPersonalAccount: data.hasPersonalAccount ?? undefined,
   }
 }
 
diff --git a/packages/kilo-gateway/src/server/routes.ts b/packages/kilo-gateway/src/server/routes.ts
index cc60ecc62c..177674cd18 100644
--- a/packages/kilo-gateway/src/server/routes.ts
+++ b/packages/kilo-gateway/src/server/routes.ts
@@ -102,6 +102,7 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {
     name: z.string().optional(),
     organizations: z.array(Organization).optional(),
     selectedOrganizationId: z.string().optional(),
+    hasPersonalAccount: z.boolean().optional(),
   })
 
   const Balance = z.object({
diff --git a/packages/kilo-gateway/src/tui/helpers.ts b/packages/kilo-gateway/src/tui/helpers.ts
index 6884312e49..cc7a72311a 100644
--- a/packages/kilo-gateway/src/tui/helpers.ts
+++ b/packages/kilo-gateway/src/tui/helpers.ts
@@ -56,6 +56,7 @@ export function formatProfileInfo(
 export function getOrganizationOptions(
   organizations: Organization[],
   currentOrgId?: string,
+  hasPersonalAccount = true,
 ): Array<{
   title: string
   value: string | null
@@ -63,12 +64,16 @@ export function getOrganizationOptions(
   category: string
 }> {
   return [
-    {
-      title: "Personal Account",
-      value: null,
-      description: !currentOrgId ? "→ (current)" : undefined,
-      category: "Accounts",
-    },
+    ...(hasPersonalAccount
+      ? [
+          {
+            title: "Personal Account",
+            value: null,
+            description: !currentOrgId ? "→ (current)" : undefined,
+            category: "Accounts",
+          },
+        ]
+      : []),
     ...organizations.map((org) => ({
       title: org.name,
       value: org.id,
diff --git a/packages/kilo-gateway/src/types.ts b/packages/kilo-gateway/src/types.ts
index c9014f1bc2..3100b1e630 100644
--- a/packages/kilo-gateway/src/types.ts
+++ b/packages/kilo-gateway/src/types.ts
@@ -28,6 +28,7 @@ export interface KilocodeProfile {
   name?: string
   organizations?: Organization[]
   selectedOrganizationId?: string
+  hasPersonalAccount?: boolean
 }
 
 export interface KilocodeBalance {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
index b593cb5dba..5e02bbb881 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
@@ -143,6 +143,7 @@ internal fun profileDto(p: KiloProfile200Response): ProfileDto = ProfileDto(
     organizations = p.profile.organizations.orEmpty().map { org ->
         ProfileOrganizationDto(id = org.id, name = org.name, role = org.role)
     },
+    hasPersonalAccount = p.profile.hasPersonalAccount ?: true,
     balance = p.balance?.let { ProfileBalanceDto(balance = it.balance) },
     kiloPass = p.kiloPass?.let {
         ProfileKiloPassDto(
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
index 7ba64fec23..5cb922a1d3 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
@@ -790,6 +790,7 @@ class KiloBackendAppServiceTest {
             "profile":{
                 "email":"alice@test.com",
                 "name":"Alice",
+                "hasPersonalAccount":false,
                 "organizations":[{"id":"org_1","name":"Acme","role":"ADMIN"}]
             },
             "balance":{"balance":42.5},
@@ -804,6 +805,7 @@ class KiloBackendAppServiceTest {
         assertEquals("alice@test.com", dto.profile?.email)
         assertEquals("Alice", dto.profile?.name)
         assertEquals("ADMIN", dto.profile?.organizations?.firstOrNull()?.role)
+        assertFalse(dto.profile?.hasPersonalAccount ?: true)
         assertEquals(42.5, dto.profile?.balance?.balance)
         assertEquals("org_1", dto.profile?.currentOrgId)
     }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlay.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlay.kt
index 82a0429911..7a05e01202 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlay.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlay.kt
@@ -124,7 +124,8 @@ internal class SessionAccountOverlay(
         var layout = false
 
         val orgs = prof.organizations
-        val next = listOf(AccountChoice(null, KiloBundle.message("profile.personalAccount"))) +
+        val personal = prof.hasPersonalAccount
+        val next = (if (personal) listOf(AccountChoice(null, KiloBundle.message("profile.personalAccount"))) else emptyList()) +
             orgs.map { org -> AccountChoice(org.id, org.name) }
         if (next != choices) {
             choices = next
@@ -133,7 +134,7 @@ internal class SessionAccountOverlay(
 
         if (currentOrgId != prof.currentOrgId) currentOrgId = prof.currentOrgId
 
-        val activeId = if (switching) target else prof.currentOrgId
+        val activeId = if (switching) target else prof.currentOrgId ?: if (personal) null else orgs.firstOrNull()?.id
         val active = choices.firstOrNull { it.org == activeId } ?: choices.firstOrNull()
         val title = "${active?.title ?: " "} ▾"
         if (picker.text != title) {
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedInProfileUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedInProfileUi.kt
index 520aa26ae7..63fa8589d6 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedInProfileUi.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedInProfileUi.kt
@@ -331,12 +331,11 @@ internal class LoggedInProfileUi(
     @RequiresEdt
     private fun applyOrganizations(profile: ProfileDto) {
         val orgs = profile.organizations
-        val keys: List<Pair<String?, String>> = listOf(null to KiloBundle.message("profile.personalAccount")) +
+        val personal = profile.hasPersonalAccount
+        val keys: List<Pair<String?, String>> = (if (personal) listOf(null to KiloBundle.message("profile.personalAccount")) else emptyList()) +
                 orgs.map { it.id to it.name }
 
-        val target = profile.currentOrgId
-            ?.let { id -> orgs.indexOfFirst { it.id == id }.takeIf { it >= 0 }?.plus(1) }
-            ?: 0
+        val target = keys.indexOfFirst { it.first == profile.currentOrgId }.takeIf { it >= 0 } ?: 0
 
         currentOrgId = profile.currentOrgId
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlayTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlayTest.kt
index 4aaa851181..428f682fb6 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlayTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/account/SessionAccountOverlayTest.kt
@@ -42,10 +42,12 @@ class SessionAccountOverlayTest : SessionControllerTestBase() {
         organizations: List<ProfileOrganizationDto> = emptyList(),
         balance: ProfileBalanceDto? = null,
         currentOrgId: String? = null,
+        hasPersonalAccount: Boolean = true,
     ) = ProfileDto(
         email = email,
         name = name,
         organizations = organizations,
+        hasPersonalAccount = hasPersonalAccount,
         balance = balance,
         currentOrgId = currentOrgId,
     )
@@ -106,6 +108,22 @@ class SessionAccountOverlayTest : SessionControllerTestBase() {
         }
     }
 
+    fun `test profile without personal account hides personal choice`() {
+        val acme = org("org_1", "Acme", "MEMBER")
+        val prof = profile(
+            email = "user@example.com",
+            organizations = listOf(acme),
+            currentOrgId = "org_1",
+            hasPersonalAccount = false,
+        )
+        show(snap(prof))
+        edt {
+            assertEquals("Acme", panel.accountTitle())
+            assertEquals(1, panel.choiceCount())
+            assertEquals(0, panel.selectedIndex())
+        }
+    }
+
     // --- test 4: programmatic update does not call select callback ---
 
     fun `test programmatic update does not call select callback`() {
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
index cbc72c6db7..9fe4d903c5 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
@@ -155,6 +155,7 @@ data class ProfileDto(
     val email: String,
     val name: String? = null,
     val organizations: List<ProfileOrganizationDto> = emptyList(),
+    val hasPersonalAccount: Boolean = true,
     val balance: ProfileBalanceDto? = null,
     val kiloPass: ProfileKiloPassDto? = null,
     val currentOrgId: String? = null,
diff --git a/packages/kilo-vscode/src/services/cli-backend/types.ts b/packages/kilo-vscode/src/services/cli-backend/types.ts
index 99f52c80d3..9ff83a941f 100644
--- a/packages/kilo-vscode/src/services/cli-backend/types.ts
+++ b/packages/kilo-vscode/src/services/cli-backend/types.ts
@@ -32,6 +32,7 @@ export interface KilocodeProfile {
   name?: string
   organizations?: KilocodeOrganization[]
   selectedOrganizationId?: string
+  hasPersonalAccount?: boolean
 }
 
 export interface KilocodeBalance {
diff --git a/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
index 05c1cb1bcc..e108724703 100644
--- a/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
@@ -65,20 +65,23 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
   const orgOptions = createMemo<OrgOption[]>(() => {
     const orgs = props.profileData?.profile.organizations ?? []
     if (orgs.length === 0) return []
+    const personal = props.profileData?.profile.hasPersonalAccount !== false
     return [
-      { value: PERSONAL, label: language.t("profile.personalAccount") },
+      ...(personal ? [{ value: PERSONAL, label: language.t("profile.personalAccount") }] : []),
       ...orgs.map((org) => ({ value: org.id, label: org.name, description: org.role })),
     ]
   })
 
   const currentOrg = createMemo(() => {
-    const id = props.profileData?.currentOrgId ?? PERSONAL
+    const personal = props.profileData?.profile.hasPersonalAccount !== false
+    const id = props.profileData?.currentOrgId ?? (personal ? PERSONAL : orgOptions()[0]?.value)
     return orgOptions().find((o) => o.value === id)
   })
 
   const selectOrg = (option: OrgOption | undefined) => {
     if (!option) return
-    const current = props.profileData?.currentOrgId ?? PERSONAL
+    const personal = props.profileData?.profile.hasPersonalAccount !== false
+    const current = props.profileData?.currentOrgId ?? (personal ? PERSONAL : orgOptions()[0]?.value)
     if (option.value === current) return
     setTarget(option.value)
     vscode.postMessage({
@@ -258,7 +261,13 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
                     </div>
 
                     {/* Kilo Pass is part of personal credits, so only show it on the personal account */}
-                    <Show when={(data().currentOrgId ?? null) === null ? data().kiloPass : null}>
+                    <Show
+                      when={
+                        (data().currentOrgId ?? null) === null && data().profile.hasPersonalAccount !== false
+                          ? data().kiloPass
+                          : null
+                      }
+                    >
                       {(pass) => (
                         <div
                           style={{
@@ -331,7 +340,13 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
                     </Show>
 
                     {/* No active Kilo Pass on the personal account — nudge to subscribe */}
-                    <Show when={(data().currentOrgId ?? null) === null && !data().kiloPass}>
+                    <Show
+                      when={
+                        (data().currentOrgId ?? null) === null &&
+                        data().profile.hasPersonalAccount !== false &&
+                        !data().kiloPass
+                      }
+                    >
                       <div
                         style={{
                           "border-top": "1px solid var(--border-weak-base)",
diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/AccountSwitcher.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/AccountSwitcher.tsx
index 8d71ea7e89..3b3e12b2de 100644
--- a/packages/kilo-vscode/webview-ui/src/components/shared/AccountSwitcher.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/shared/AccountSwitcher.tsx
@@ -24,8 +24,9 @@ export const AccountSwitcher: Component<{ class?: string }> = (props) => {
 
   const profile = () => server.profileData()
   const orgs = () => profile()?.profile.organizations ?? []
+  const personal = () => profile()?.profile.hasPersonalAccount !== false
   const visible = () => !!profile() && orgs().length > 0
-  const current = () => profile()?.currentOrgId ?? PERSONAL
+  const current = () => profile()?.currentOrgId ?? (personal() ? PERSONAL : (orgs()[0]?.id ?? PERSONAL))
 
   const selected = createMemo(() => {
     const id = current()
@@ -119,15 +120,17 @@ export const AccountSwitcher: Component<{ class?: string }> = (props) => {
 
         <Show when={open() && !switching()}>
           <div class="account-switcher-dropdown" role="listbox" aria-label="Account">
-            <button
-              type="button"
-              role="option"
-              aria-selected={current() === PERSONAL}
-              class="account-switcher-item"
-              onClick={() => pick(null)}
-            >
-              <span class="account-switcher-item-name">{language.t("profile.personalAccount")}</span>
-            </button>
+            <Show when={personal()}>
+              <button
+                type="button"
+                role="option"
+                aria-selected={current() === PERSONAL}
+                class="account-switcher-item"
+                onClick={() => pick(null)}
+              >
+                <span class="account-switcher-item-name">{language.t("profile.personalAccount")}</span>
+              </button>
+            </Show>
             <For each={orgs()}>
               {(org) => (
                 <button
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts b/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts
index 2d2a845a2b..f378bb4e4b 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/profile.ts
@@ -31,6 +31,7 @@ export interface ProfileData {
     name?: string
     organizations?: Array<{ id: string; name: string; role: string }>
     selectedOrganizationId?: string
+    hasPersonalAccount?: boolean
   }
   balance: KilocodeBalance | null
   kiloPass: KiloPassState | null
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
index 529274ffd9..533571d02e 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
@@ -83,11 +83,12 @@ export function KiloAutoMethod(props: KiloAutoMethodProps) {
         await sync.bootstrap()
 
         dialog.replace(() => (
-          <DialogKiloOrganization
-            organizations={profile.organizations!}
-            userEmail={profile.email}
-            providerID={props.providerID}
-            useSDK={props.useSDK}
+            <DialogKiloOrganization
+              organizations={profile.organizations!}
+              userEmail={profile.email}
+              providerID={props.providerID}
+              hasPersonalAccount={profile.hasPersonalAccount !== false}
+              useSDK={props.useSDK}
             useTheme={props.useTheme}
             DialogModel={props.DialogModel}
           />
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx
index 877ed17ddc..3979bdab7a 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx
@@ -21,6 +21,7 @@ interface DialogKiloOrganizationProps {
   organizations: Organization[]
   userEmail: string
   providerID: string
+  hasPersonalAccount?: boolean
   useSDK: () => UseSDK
   useTheme: () => UseTheme
   DialogModel: DialogModel
@@ -33,7 +34,7 @@ export function DialogKiloOrganization(props: DialogKiloOrganizationProps) {
   const toast = useToast()
 
   // Get formatted options with current markers
-  const options = getOrganizationOptions(props.organizations)
+  const options = getOrganizationOptions(props.organizations, undefined, props.hasPersonalAccount !== false)
 
   // Pre-select first organization (user requirement)
   const defaultSelection = getDefaultOrganizationSelection(props.organizations)
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx
index 2fe5c5feda..f2fba00109 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx
@@ -12,12 +12,17 @@ import { getOrganizationOptions } from "@kilocode/kilo-gateway/tui"
 interface DialogKiloTeamSelectProps {
   organizations: Organization[]
   currentOrgId?: string | null
+  hasPersonalAccount?: boolean
   onSelect: (orgId: string | null) => Promise<void>
 }
 
 export function DialogKiloTeamSelect(props: DialogKiloTeamSelectProps) {
   // Get formatted options with current markers
-  const options = getOrganizationOptions(props.organizations, props.currentOrgId || undefined)
+  const options = getOrganizationOptions(
+    props.organizations,
+    props.currentOrgId || undefined,
+    props.hasPersonalAccount !== false,
+  )
 
   return (
     <DialogSelect
diff --git a/packages/opencode/src/kilocode/kilo-commands.tsx b/packages/opencode/src/kilocode/kilo-commands.tsx
index 964cf87f49..58bb3e8de2 100644
--- a/packages/opencode/src/kilocode/kilo-commands.tsx
+++ b/packages/opencode/src/kilocode/kilo-commands.tsx
@@ -218,6 +218,7 @@ export function registerKiloCommands(useSDK: () => UseSDK) {
               <DialogKiloTeamSelect
                 organizations={profile.organizations!}
                 currentOrgId={currentOrgId}
+                hasPersonalAccount={profile.hasPersonalAccount !== false}
                 onSelect={async (orgId) => {
                   try {
                     // Switch to team immediately using server endpoint
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts
index 8f255191b0..e2f8e17437 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/kilo-gateway.ts
@@ -22,6 +22,7 @@ export const Profile = Schema.Struct({
   name: Schema.optional(Schema.String),
   organizations: Schema.optional(Schema.Array(Organization)),
   selectedOrganizationId: Schema.optional(Schema.String),
+  hasPersonalAccount: Schema.optional(Schema.Boolean),
 })
 
 export const Balance = Schema.Struct({
diff --git a/packages/opencode/test/kilocode/server/httpapi-public.test.ts b/packages/opencode/test/kilocode/server/httpapi-public.test.ts
index 3adc9c77ee..f856de5faf 100644
--- a/packages/opencode/test/kilocode/server/httpapi-public.test.ts
+++ b/packages/opencode/test/kilocode/server/httpapi-public.test.ts
@@ -190,6 +190,7 @@ describe("Kilo PublicApi OpenAPI contract", () => {
     expect(profile?.balance).toEqual({ anyOf: [expect.objectContaining({ type: "object" }), { type: "null" }] })
     expect(profile?.kiloPass).toEqual({ anyOf: [expect.objectContaining({ type: "object" }), { type: "null" }] })
     expect(profile?.profile?.properties?.selectedOrganizationId).toEqual({ type: "string" })
+    expect(profile?.profile?.properties?.hasPersonalAccount).toEqual({ type: "boolean" })
     const pass = profile?.kiloPass?.anyOf?.find((item) => item.type === "object")?.properties
     expect(pass?.nextBillingAt).toEqual({ anyOf: [{ type: "string" }, { type: "null" }] })
     expect(profile?.currentOrgId).toEqual({ anyOf: [{ type: "string" }, { type: "null" }] })
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index e7a7c7c3f9..b0572bfa50 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -10788,6 +10788,7 @@ export type KiloProfileResponses = {
         role: string
       }>
       selectedOrganizationId?: string
+      hasPersonalAccount?: boolean
     }
     balance: {
       balance: number
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index b1bb912b56..8ba53e251a 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -13512,6 +13512,9 @@
                         },
                         "selectedOrganizationId": {
                           "type": "string"
+                        },
+                        "hasPersonalAccount": {
+                          "type": "boolean"
                         }
                       },
                       "required": ["email"],

From e4630696740d0965a8ef950a423b8b77d26463dc Mon Sep 17 00:00:00 2001
From: trim21 <i@trim21.me>
Date: Tue, 7 Jul 2026 18:05:53 +0800
Subject: [PATCH 16/68] fix(sandbox): expand ~ in writable paths and restrict
 to global config only

- Expand leading ~ to os.homedir() in execute() before passing paths
  to the sandbox profile, so ~/tmp resolves correctly.
- Strip sandbox_writable_paths from project-scoped config overlays.
  A repo kilo.json must not be able to widen the sandbox beyond the
  user's global config intent.
---
 packages/opencode/src/config/config.ts           | 6 ++++++
 packages/opencode/src/kilocode/sandbox/policy.ts | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index eae0c08f1c..f243357d38 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -759,6 +759,12 @@ export const layer = Layer.effect(
         // kilocode_change start
         const merge = Effect.fnUntraced(function* (source: string, next: Info, kind?: ConfigPlugin.Scope) {
           const scope = kind ?? (yield* pluginScopeForSource(source))
+          // sandbox_writable_paths is a security-sensitive sandbox setting that must only come from
+          // global config. A project kilo.json can otherwise widen the sandbox beyond the user's intent.
+          if (scope === "local" && next.experimental?.sandbox_writable_paths) {
+            const { sandbox_writable_paths: _, ...rest } = next.experimental
+            next = { ...next, experimental: { ...next.experimental, ...rest, sandbox_writable_paths: undefined } }
+          }
           const scoped = KilocodeConfig.scopeIndexing(next, scope)
           result = mergeConfigConcatArrays(result, scoped)
           return yield* mergePluginOrigins(source, scoped.plugin, scope)
diff --git a/packages/opencode/src/kilocode/sandbox/policy.ts b/packages/opencode/src/kilocode/sandbox/policy.ts
index ad0611db72..72fbb6654c 100644
--- a/packages/opencode/src/kilocode/sandbox/policy.ts
+++ b/packages/opencode/src/kilocode/sandbox/policy.ts
@@ -1,4 +1,5 @@
 import { readFileSync, statSync } from "node:fs"
+import os from "node:os"
 import path from "node:path"
 import { Effect, Semaphore } from "effect"
 import { Global } from "@opencode-ai/core/global"
@@ -303,7 +304,8 @@ function execute<A, E, R>(sessionID: SessionID, effect: Effect.Effect<A, E, R>)
     const support = backendSupport({ mode: current.state.mode, allowedHosts: [] })
     if (!current.state.enabled || !support.available) return yield* unrestricted(effect)
     const cfg = yield* (yield* Config.Service).get()
-    const extraWritable = cfg.experimental?.sandbox_writable_paths
+    const raw = cfg.experimental?.sandbox_writable_paths
+    const extraWritable = raw?.map((p) => (p.startsWith("~") ? path.join(os.homedir(), p.slice(1)) : p))
     return yield* runSandbox(profile(yield* InstanceState.context, current.state.mode, extraWritable), effect)
   })
 }

From 22352124d6ee112c4b1b321c50f139a1e97cea98 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 12:30:00 +0200
Subject: [PATCH 17/68] style(vscode): format speech-to-text prewarm test

---
 .../kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts b/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts
index 48288a0c53..db91dde8f7 100644
--- a/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts
+++ b/packages/kilo-vscode/tests/unit/speech-to-text-prewarm.test.ts
@@ -92,7 +92,12 @@ describe("speech-to-text prewarm", () => {
       const logic = output.indexOf(FAIL)
       // A FAIL sentinel is a real assertion failure in the prewarm logic — surface it now.
       if (logic !== -1) {
-        expect.unreachable(output.slice(logic + FAIL.length).split("\n")[0]?.trim())
+        expect.unreachable(
+          output
+            .slice(logic + FAIL.length)
+            .split("\n")[0]
+            ?.trim(),
+        )
       }
 
       // Otherwise the child died before it could run (starved/transient spawn) — retry.

From af6bbd8c9f48b0bf47e1ba4cf6f0f12476ba176b Mon Sep 17 00:00:00 2001
From: Trim21 <trim21.me@gmail.com>
Date: Tue, 7 Jul 2026 18:26:48 +0800
Subject: [PATCH 18/68] Update packages/opencode/src/config/config.ts

Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
---
 packages/opencode/src/config/config.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index f243357d38..4b241d3691 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -759,12 +759,9 @@ export const layer = Layer.effect(
         // kilocode_change start
         const merge = Effect.fnUntraced(function* (source: string, next: Info, kind?: ConfigPlugin.Scope) {
           const scope = kind ?? (yield* pluginScopeForSource(source))
-          // sandbox_writable_paths is a security-sensitive sandbox setting that must only come from
-          // global config. A project kilo.json can otherwise widen the sandbox beyond the user's intent.
-          if (scope === "local" && next.experimental?.sandbox_writable_paths) {
-            const { sandbox_writable_paths: _, ...rest } = next.experimental
-            next = { ...next, experimental: { ...next.experimental, ...rest, sandbox_writable_paths: undefined } }
-          }
+          // sandbox_writable_paths is security-sensitive — only global config may set it.
+          // A project kilo.json must not widen the sandbox beyond the user's intent.
+          if (scope === "local") delete next.experimental?.sandbox_writable_paths
           const scoped = KilocodeConfig.scopeIndexing(next, scope)
           result = mergeConfigConcatArrays(result, scoped)
           return yield* mergePluginOrigins(source, scoped.plugin, scope)

From cef3dc7ae8a7ef7f26e36fb690af5014b542b7bb Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 12:38:12 +0200
Subject: [PATCH 19/68] feat: add /reload action to reboot the instance from
 disk

Reboots the per-directory instance, reloading config, skills, agents,
commands, and MCP prompts changed on disk without restarting the
server. Sessions and history are preserved; only the per-directory
instance caches are torn down and rebuilt.

Server: POST /instance/reload wraps the existing atomic
InstanceStore.reload path (the same one project.git.init uses). The
rebuild completes before the 200 response, so clients can refetch with
no race. Returns 409 ConflictError while a session is actively
running. Emits the existing server.instance.disposed SSE event, which
the TUI and extension already use to auto-refetch.

CLI: /reload palette command calls the endpoint; the TUI already
bootstraps on server.instance.disposed.

Extension: /reload slash command, a reload button in the task header
and settings panel, and a Kilo Code: Reload Config and Skills command
palette entry. The handler clears the command cache and reuses
reloadAfterAuthChange to re-fetch config, providers, agents, skills,
and commands. Reload targets the current session's directory so Agent
Manager worktree sessions reload their own worktree instance rather
than the workspace root.

SDK: regenerate so client.instance.reload is available to external
integrations.
---
 .changeset/reload-instance.md                 |  6 ++
 packages/kilo-vscode/package.json             |  5 ++
 packages/kilo-vscode/src/KiloProvider.ts      | 33 +++++++
 packages/kilo-vscode/src/extension.ts         |  6 ++
 .../src/components/chat/TaskHeader.tsx        |  9 ++
 .../src/components/settings/Settings.tsx      |  8 ++
 .../webview-ui/src/hooks/useSlashCommand.ts   |  8 ++
 .../kilo-vscode/webview-ui/src/i18n/en.ts     |  1 +
 .../src/types/messages/webview-messages.ts    |  5 ++
 .../src/cli/cmd/tui/plugin/internal.ts        |  2 +
 .../opencode/src/kilocode/plugins/reload.tsx  | 30 +++++++
 .../server/httpapi/groups/instance-reload.ts  | 49 +++++++++++
 .../httpapi/handlers/instance-reload.ts       | 40 +++++++++
 .../src/kilocode/server/httpapi/server.ts     |  2 +
 .../src/server/routes/instance/httpapi/api.ts |  2 +
 .../test/kilocode/instance-reload.test.ts     | 43 ++++++++++
 packages/sdk/js/src/v2/gen/sdk.gen.ts         | 32 +++++++
 packages/sdk/js/src/v2/gen/types.gen.ts       | 38 ++++++++
 packages/sdk/openapi.json                     | 86 +++++++++++++++++++
 19 files changed, 405 insertions(+)
 create mode 100644 .changeset/reload-instance.md
 create mode 100644 packages/opencode/src/kilocode/plugins/reload.tsx
 create mode 100644 packages/opencode/src/kilocode/server/httpapi/groups/instance-reload.ts
 create mode 100644 packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts
 create mode 100644 packages/opencode/test/kilocode/instance-reload.test.ts

diff --git a/.changeset/reload-instance.md b/.changeset/reload-instance.md
new file mode 100644
index 0000000000..010c58c61e
--- /dev/null
+++ b/.changeset/reload-instance.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": minor
+"kilo-code": minor
+---
+
+Add a reload action that reboots the per-directory instance, picking up config, skills, agents, commands, and MCP prompts changed on disk. Sessions and history are preserved. Surfaces: `/reload` in the CLI palette and editor chat, a reload button in the task header and settings panel, the `Kilo Code: Reload Config and Skills` command, and a `POST /instance/reload` HTTP endpoint. The endpoint returns 409 while a session is actively running.
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index f91fb383f1..ada2fcae6a 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -422,6 +422,11 @@
         "command": "kilo-code.new.takeHeapSnapshot",
         "title": "Take Heap Snapshot",
         "category": "Kilo Code"
+      },
+      {
+        "command": "kilo-code.new.reload",
+        "title": "Reload Config and Skills",
+        "category": "Kilo Code"
       }
     ],
     "submenus": [
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index 2d85c39ac2..c044c6f637 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -1075,6 +1075,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
             console.error("[Kilo New] KiloProvider: ❌ Retry connection failed:", e),
           )
           break
+        case "reload":
+          this.handleReload().catch((e) => console.error("[Kilo New] KiloProvider: Reload failed:", e))
+          break
         case "openSubAgentViewer":
           vscode.commands.executeCommand("kilo-code.new.openSubAgentViewer", message.sessionID, message.title)
           break
@@ -3608,6 +3611,36 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     ])
   }
 
+  /** Reload config, skills, agents, and commands from disk by rebooting the instance. */
+  private async handleReload(): Promise<void> {
+    if (!this.client) {
+      console.warn("[Kilo New] handleReload: no client connection")
+      return
+    }
+    const dir = this.getWorkspaceDirectory(this.currentSession?.id)
+    try {
+      await this.client.instance.reload({ directory: dir }, { throwOnError: true })
+    } catch (err: any) {
+      const status = err?.response?.status
+      if (status === 409) {
+        vscode.window.showWarningMessage(
+          "Cannot reload while a session is running. Wait for it to finish or abort it first.",
+        )
+      } else {
+        console.error("[Kilo New] handleReload: reload endpoint failed:", err)
+        vscode.window.showErrorMessage("Reload failed. See extension logs for details.")
+      }
+      return
+    }
+    this.clearCommandsCache()
+    await this.reloadAfterAuthChange()
+  }
+
+  /** Public reload entry point for VS Code commands. */
+  async reload(): Promise<void> {
+    return this.handleReload()
+  }
+
   private mapSyncEventToWebviewMessage(event: LegacySyncEvent) {
     switch (event.type) {
       case "message.updated": {
diff --git a/packages/kilo-vscode/src/extension.ts b/packages/kilo-vscode/src/extension.ts
index 27472ec9c5..8539bf4d47 100644
--- a/packages/kilo-vscode/src/extension.ts
+++ b/packages/kilo-vscode/src/extension.ts
@@ -530,6 +530,12 @@ export function activate(context: vscode.ExtensionContext) {
 
   registerHeapSnapshot(context, connectionService)
 
+  context.subscriptions.push(
+    vscode.commands.registerCommand("kilo-code.new.reload", () => {
+      provider.reload().catch((e) => console.error("[Kilo New] reload command failed:", e))
+    }),
+  )
+
   // Register code actions (editor context menus, terminal context menus, keyboard shortcuts)
   registerCodeActions(context, provider, agentManagerProvider)
   registerTerminalActions(context, provider, agentManagerProvider)
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
index 96ac022f93..cd43ce3280 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
@@ -212,6 +212,15 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
                 aria-label={language.t("command.session.compact")}
               />
             </Tooltip>
+            <Tooltip value={language.t("common.reload")} placement="bottom">
+              <IconButton
+                icon="reset"
+                size="small"
+                variant="ghost"
+                onClick={() => vscode.postMessage({ type: "reload" })}
+                aria-label={language.t("common.reload")}
+              />
+            </Tooltip>
           </Show>
           <Show when={hasMessages()}>
             <button
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
index 2ec4c32d94..9564a0fe75 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
@@ -143,6 +143,14 @@ const Settings: Component<SettingsProps> = (props) => {
         <Button variant="secondary" size="small" icon="edit" onClick={() => open("global")}>
           {language.t("settings.openGlobalConfig")}
         </Button>
+        <Button
+          variant="secondary"
+          size="small"
+          icon="reset"
+          onClick={() => vscode.postMessage({ type: "reload" })}
+        >
+          {language.t("common.reload")}
+        </Button>
       </div>
 
       {/* Settings tabs */}
diff --git a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts
index 0ee4d79232..b7a95fd62b 100644
--- a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts
+++ b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts
@@ -158,6 +158,14 @@ export function useSlashCommand(
       action: sandbox.action,
       enabled: sandbox.enabled,
     },
+    {
+      name: "reload",
+      description: "Reload config, skills, agents, and commands from disk",
+      hints: ["refresh"],
+      action: () => {
+        vscode.postMessage({ type: "reload" })
+      },
+    },
   ]
 
   const excluded = () => {
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index d4435bcf03..823fe3232b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -1156,6 +1156,7 @@ export const dict = {
 
   "common.retry": "Retry",
   "common.refresh": "Refresh",
+  "common.reload": "Reload",
 
   "profile.title": "Profile",
   "profile.notLoggedIn": "Not logged in",
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 6bf6ea39e9..cc4fa03261 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
@@ -924,6 +924,10 @@ export interface RetryConnectionRequest {
   type: "retryConnection"
 }
 
+export interface ReloadRequest {
+  type: "reload"
+}
+
 // Open a sub-agent session in a read-only editor panel
 export interface OpenSubAgentViewerRequest {
   type: "openSubAgentViewer"
@@ -1333,6 +1337,7 @@ export type WebviewMessage =
   | DiffViewerSetBaseBranchRequest
   | DiffVirtualSetMarkdownRenderRequest
   | RetryConnectionRequest
+  | ReloadRequest
   | OpenSubAgentViewerRequest
   | PreviewImageRequest
   | SaveImageRequest
diff --git a/packages/opencode/src/cli/cmd/tui/plugin/internal.ts b/packages/opencode/src/cli/cmd/tui/plugin/internal.ts
index 1b9481664b..343bb5eeb3 100644
--- a/packages/opencode/src/cli/cmd/tui/plugin/internal.ts
+++ b/packages/opencode/src/cli/cmd/tui/plugin/internal.ts
@@ -15,6 +15,7 @@ import KiloSidebarPr from "@/kilocode/plugins/sidebar-pr"
 import KiloSidebarUsage from "@/kilocode/plugins/sidebar-usage"
 import KiloSandbox from "@/kilocode/plugins/sandbox"
 import KiloRemote from "@/kilocode/plugins/remote"
+import KiloReload from "@/kilocode/plugins/reload"
 // kilocode_change end
 import SidebarContext from "../feature-plugins/sidebar/context"
 import SidebarMcp from "../feature-plugins/sidebar/mcp"
@@ -54,6 +55,7 @@ export function internalTuiPlugins(flags: Pick<RuntimeFlags.Info, "experimentalE
     KiloSidebarUsage, // kilocode_change
     KiloSandbox, // kilocode_change
     KiloRemote, // kilocode_change
+    KiloReload, // kilocode_change
     HomeFooter,
     HomeTips,
     SidebarContext,
diff --git a/packages/opencode/src/kilocode/plugins/reload.tsx b/packages/opencode/src/kilocode/plugins/reload.tsx
new file mode 100644
index 0000000000..d40782b9f4
--- /dev/null
+++ b/packages/opencode/src/kilocode/plugins/reload.tsx
@@ -0,0 +1,30 @@
+import type { TuiPlugin, TuiPluginModule } from "@kilocode/plugin/tui"
+
+const id = "internal:reload"
+
+const tui: TuiPlugin = async (api) => {
+  api.keymap.registerLayer({
+    commands: [
+      {
+        namespace: "palette",
+        name: "app.reload",
+        title: "Reload",
+        desc: "Reload config, skills, agents, and commands from disk",
+        category: "System",
+        slashName: "reload",
+        async run() {
+          try {
+            await api.client.instance.reload({}, { throwOnError: true })
+            api.ui.toast({ message: "Reloaded", variant: "success" })
+          } catch (err) {
+            api.ui.toast({ message: String(err), variant: "error", duration: 5000 })
+          }
+        },
+      },
+    ],
+  })
+}
+
+const plugin: TuiPluginModule & { id: string } = { id, tui }
+
+export default plugin
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/instance-reload.ts b/packages/opencode/src/kilocode/server/httpapi/groups/instance-reload.ts
new file mode 100644
index 0000000000..64d04a598d
--- /dev/null
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/instance-reload.ts
@@ -0,0 +1,49 @@
+import { Authorization } from "@/server/routes/instance/httpapi/middleware/authorization"
+import { InstanceContextMiddleware } from "@/server/routes/instance/httpapi/middleware/instance-context"
+import {
+  WorkspaceRoutingMiddleware,
+  WorkspaceRoutingQuery,
+} from "@/server/routes/instance/httpapi/middleware/workspace-routing"
+import { described } from "@/server/routes/instance/httpapi/groups/metadata"
+import { ConflictError } from "@/server/routes/instance/httpapi/errors"
+import { Schema } from "effect"
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
+
+export const ReloadPaths = {
+  reload: "/instance/reload",
+} as const
+
+export const InstanceReloadApi = HttpApi.make("instance-reload")
+  .add(
+    HttpApiGroup.make("instance-reload")
+      .add(
+        HttpApiEndpoint.post("reload", ReloadPaths.reload, {
+          query: WorkspaceRoutingQuery,
+          success: described(Schema.Boolean, "Instance reloaded"),
+          error: ConflictError,
+        }).annotateMerge(
+          OpenApi.annotations({
+            identifier: "instance.reload",
+            summary: "Reload instance",
+            description:
+              "Atomically dispose and reboot the current Kilo instance, reloading config, skills, agents, commands, and MCP prompts from disk. Returns 409 if a session is actively running.",
+          }),
+        ),
+      )
+      .annotateMerge(
+        OpenApi.annotations({
+          title: "instance-reload",
+          description: "Kilo instance reload route.",
+        }),
+      )
+      .middleware(InstanceContextMiddleware)
+      .middleware(WorkspaceRoutingMiddleware)
+      .middleware(Authorization),
+  )
+  .annotateMerge(
+    OpenApi.annotations({
+      title: "kilo HttpApi",
+      version: "0.0.1",
+      description: "Kilo HttpApi surface.",
+    }),
+  )
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts
new file mode 100644
index 0000000000..db95453a2a
--- /dev/null
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts
@@ -0,0 +1,40 @@
+import * as InstanceState from "@/effect/instance-state"
+import { SessionStatus } from "@/session/status"
+import { ConflictError } from "@/server/routes/instance/httpapi/errors"
+import { markInstanceForReload } from "@/server/routes/instance/httpapi/lifecycle"
+import { InstanceHttpApi } from "@/server/routes/instance/httpapi/api"
+import { Effect } from "effect"
+import { HttpApiBuilder } from "effect/unstable/httpapi"
+import type { SessionID } from "@/session/schema"
+
+export function hasBusySession(statuses: Map<SessionID, SessionStatus.Info>): boolean {
+  for (const info of statuses.values()) {
+    if (info.type === "busy") return true
+  }
+  return false
+}
+
+export const instanceReloadHandlers = HttpApiBuilder.group(InstanceHttpApi, "instance-reload", (handlers) =>
+  Effect.gen(function* () {
+    const status = yield* SessionStatus.Service
+
+    const reload = Effect.fn("InstanceReloadHttpApi.reload")(function* () {
+      const ctx = yield* InstanceState.context
+      if (hasBusySession(yield* status.list())) {
+        return yield* Effect.fail(
+          new ConflictError({
+            message: "Cannot reload while a session is running. Wait for it to finish or abort it first.",
+          }),
+        )
+      }
+      yield* markInstanceForReload(ctx, {
+        directory: ctx.directory,
+        worktree: ctx.worktree,
+        project: ctx.project,
+      })
+      return true
+    })
+
+    return handlers.handle("reload", reload)
+  }),
+)
diff --git a/packages/opencode/src/kilocode/server/httpapi/server.ts b/packages/opencode/src/kilocode/server/httpapi/server.ts
index 9681c31d19..a6bd9210c8 100644
--- a/packages/opencode/src/kilocode/server/httpapi/server.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/server.ts
@@ -15,6 +15,7 @@ import { commitMessageHandlers } from "./handlers/commit-message"
 import { configConsoleHandlers } from "./handlers/config-console"
 import { enhancePromptHandlers } from "./handlers/enhance-prompt"
 import { indexingHandlers } from "./handlers/indexing"
+import { instanceReloadHandlers } from "./handlers/instance-reload"
 import { interactiveTerminalHandlers } from "./handlers/interactive-terminal"
 import { kiloGatewayHandlers } from "./handlers/kilo-gateway"
 import { kilocodeHandlers } from "./handlers/kilocode"
@@ -35,6 +36,7 @@ export const provide = Layer.provide([
   configConsoleHandlers,
   enhancePromptHandlers,
   indexingHandlers,
+  instanceReloadHandlers,
   interactiveTerminalHandlers,
   kiloGatewayHandlers,
   kilocodeHandlers,
diff --git a/packages/opencode/src/server/routes/instance/httpapi/api.ts b/packages/opencode/src/server/routes/instance/httpapi/api.ts
index 984f9097c3..ab1edae6be 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/api.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/api.ts
@@ -28,6 +28,7 @@ import { BackgroundProcessApi } from "@/kilocode/server/httpapi/groups/backgroun
 import { ConfigConsoleApi } from "@/kilocode/server/httpapi/groups/config-console"
 import { EnhancePromptApi } from "@/kilocode/server/httpapi/groups/enhance-prompt"
 import { IndexingApi } from "@/kilocode/server/httpapi/groups/indexing"
+import { InstanceReloadApi } from "@/kilocode/server/httpapi/groups/instance-reload"
 import { InteractiveTerminalApi } from "@/kilocode/server/httpapi/groups/interactive-terminal"
 import { KiloGatewayApi } from "@/kilocode/server/httpapi/groups/kilo-gateway"
 import { KilocodeApi } from "@/kilocode/server/httpapi/groups/kilocode"
@@ -76,6 +77,7 @@ export const InstanceHttpApi = HttpApi.make("opencode-instance")
   .addHttpApi(ConfigConsoleApi)
   .addHttpApi(EnhancePromptApi)
   .addHttpApi(IndexingApi)
+  .addHttpApi(InstanceReloadApi)
   .addHttpApi(InteractiveTerminalApi)
   .addHttpApi(KiloGatewayApi)
   .addHttpApi(KilocodeApi)
diff --git a/packages/opencode/test/kilocode/instance-reload.test.ts b/packages/opencode/test/kilocode/instance-reload.test.ts
new file mode 100644
index 0000000000..b537811bcc
--- /dev/null
+++ b/packages/opencode/test/kilocode/instance-reload.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from "bun:test"
+import { hasBusySession } from "@/kilocode/server/httpapi/handlers/instance-reload"
+import type { SessionStatus } from "@/session/status"
+import { SessionID } from "@/session/schema"
+
+const entries = (items: [string, SessionStatus.Info][]) =>
+  items.map(([k, v]) => [k as SessionID, v] as [SessionID, SessionStatus.Info])
+
+describe("instance-reload hasBusySession", () => {
+  it("returns false for an empty map", () => {
+    expect(hasBusySession(new Map(entries([])))).toBe(false)
+  })
+
+  it("returns false when all sessions are idle", () => {
+    expect(
+      hasBusySession(
+        new Map(
+          entries([
+            ["s1", { type: "idle" }],
+            ["s2", { type: "idle" }],
+          ]),
+        ),
+      ),
+    ).toBe(false)
+  })
+
+  it("returns true when any session is busy", () => {
+    expect(
+      hasBusySession(
+        new Map(
+          entries([
+            ["s1", { type: "idle" }],
+            ["s2", { type: "busy" }],
+          ]),
+        ),
+      ),
+    ).toBe(true)
+  })
+
+  it("returns true when the only session is busy", () => {
+    expect(hasBusySession(new Map(entries([["s1", { type: "busy" }]])))).toBe(true)
+  })
+})
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index c315c6edc8..fd6e3cfc52 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -134,6 +134,8 @@ import type {
   IndexingWarningsResponses,
   InstanceDisposeErrors,
   InstanceDisposeResponses,
+  InstanceReloadErrors,
+  InstanceReloadResponses,
   InteractiveTerminalCloseErrors,
   InteractiveTerminalCloseResponses,
   InteractiveTerminalGetErrors,
@@ -2257,6 +2259,36 @@ export class Instance extends HeyApiClient {
       ...params,
     })
   }
+
+  /**
+   * Reload instance
+   *
+   * Atomically dispose and reboot the current Kilo instance, reloading config, skills, agents, commands, and MCP prompts from disk. Returns 409 if a session is actively running.
+   */
+  public reload<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).post<InstanceReloadResponses, InstanceReloadErrors, ThrowOnError>({
+      url: "/instance/reload",
+      ...options,
+      ...params,
+    })
+  }
 }
 
 export class Path extends HeyApiClient {
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 5282b260f4..05b86ba1d5 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -2571,6 +2571,12 @@ export type KiloEmbeddingModelCatalog = {
   }
 }
 
+export type ConflictError = {
+  _tag: "ConflictError"
+  message: string
+  resource?: string
+}
+
 export type InteractiveTerminalSnapshot = {
   info: InteractiveTerminalInfo
   output: string
@@ -10588,6 +10594,38 @@ export type IndexingModelsResponses = {
 
 export type IndexingModelsResponse = IndexingModelsResponses[keyof IndexingModelsResponses]
 
+export type InstanceReloadData = {
+  body?: never
+  path?: never
+  query?: {
+    directory?: string
+    workspace?: string
+  }
+  url: "/instance/reload"
+}
+
+export type InstanceReloadErrors = {
+  /**
+   * Bad request
+   */
+  400: BadRequestError
+  /**
+   * ConflictError
+   */
+  409: ConflictError
+}
+
+export type InstanceReloadError = InstanceReloadErrors[keyof InstanceReloadErrors]
+
+export type InstanceReloadResponses = {
+  /**
+   * Instance reloaded
+   */
+  200: boolean
+}
+
+export type InstanceReloadResponse = InstanceReloadResponses[keyof InstanceReloadResponses]
+
 export type InteractiveTerminalListData = {
   body?: never
   path?: never
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 267d53bb1d..e99bbffe08 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -13085,6 +13085,71 @@
         ]
       }
     },
+    "/instance/reload": {
+      "post": {
+        "tags": ["instance-reload"],
+        "operationId": "instance.reload",
+        "parameters": [
+          {
+            "name": "directory",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          },
+          {
+            "name": "workspace",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Instance reloaded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean",
+                  "description": "Instance reloaded"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BadRequestError"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Atomically dispose and reboot the current Kilo instance, reloading config, skills, agents, commands, and MCP prompts from disk. Returns 409 if a session is actively running.",
+        "summary": "Reload instance",
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createKiloClient } from \"@kilocode/sdk\"\n\nconst client = createKiloClient()\nawait client.instance.reload({\n  ...\n})"
+          }
+        ]
+      }
+    },
     "/interactive-terminal": {
       "get": {
         "tags": ["interactive-terminal"],
@@ -27801,6 +27866,23 @@
         "required": ["defaultModel", "models", "aliases"],
         "additionalProperties": false
       },
+      "ConflictError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": ["ConflictError"]
+          },
+          "message": {
+            "type": "string"
+          },
+          "resource": {
+            "type": "string"
+          }
+        },
+        "required": ["_tag", "message"],
+        "additionalProperties": false
+      },
       "InteractiveTerminalSnapshot": {
         "type": "object",
         "properties": {
@@ -36967,6 +37049,10 @@
       "name": "indexing",
       "description": "Kilo indexing routes."
     },
+    {
+      "name": "instance-reload",
+      "description": "Kilo instance reload route."
+    },
     {
       "name": "interactive-terminal",
       "description": "Kilo human-driven interactive terminal routes."

From 64deacf66c59224b7c54a8995ed1540424d8e18a Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 12:45:11 +0200
Subject: [PATCH 20/68] feat: translate common.reload, use circular reload
 icon, add tooltip

- Add common.reload translations for all 18 non-English locales
- Add a circular reload icon to kilo-ui's icon map (the standard
  two-arrow refresh symbol) and use it on both the task header and
  settings reload buttons instead of the reset (undo) icon
- Add a tooltip to the settings reload button reusing common.reload,
  matching the existing tooltip on the task header button
---
 packages/kilo-ui/src/components/icon.tsx          |  4 ++++
 .../webview-ui/src/components/chat/TaskHeader.tsx |  2 +-
 .../src/components/settings/Settings.tsx          | 15 +++++++--------
 packages/kilo-vscode/webview-ui/src/i18n/ar.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/br.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/bs.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/da.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/de.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/es.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/fr.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/it.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/ja.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/ko.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/nl.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/no.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/pl.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/ru.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/th.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/tr.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/uk.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/zh.ts    |  1 +
 packages/kilo-vscode/webview-ui/src/i18n/zht.ts   |  1 +
 22 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/packages/kilo-ui/src/components/icon.tsx b/packages/kilo-ui/src/components/icon.tsx
index 773d17d1f5..87172ed841 100644
--- a/packages/kilo-ui/src/components/icon.tsx
+++ b/packages/kilo-ui/src/components/icon.tsx
@@ -42,6 +42,10 @@ const icons: Record<string, { path: string; viewBox: string }> = {
     viewBox: "0 0 16 16",
     path: `<path d="M14 4.27051C14.5999 4.62053 15 5.26009 15 6V11C15 13.21 13.21 15 11 15H6C5.26009 15 4.62053 14.5999 4.27051 14H11C12.65 14 14 12.65 14 11V4.27051Z" fill="currentColor"/><path d="M9.5 7C9.776 7 10 7.224 10 7.5C10 7.776 9.776 8 9.5 8H5.5C5.224 8 5 7.776 5 7.5C5 7.224 5.224 7 5.5 7H9.5Z" fill="currentColor"/><path fill-rule="evenodd" clip-rule="evenodd" d="M11 2C12.103 2 13 2.897 13 4V11C13 12.103 12.103 13 11 13H4C2.897 13 2 12.103 2 11V4C2 2.897 2.897 2 4 2H11ZM4 3C3.449 3 3 3.449 3 4V11C3 11.552 3.449 12 4 12H11C11.551 12 12 11.552 12 11V4C12 3.449 11.551 3 11 3H4Z" fill="currentColor"/>`,
   },
+  reload: {
+    viewBox: "0 0 24 24",
+    path: `<path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/><path d="M21 3v5h-5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/><path d="M3 21v-5h5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>`,
+  },
 }
 
 type Name = keyof typeof icons
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
index cd43ce3280..cccaa7ab72 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
@@ -214,7 +214,7 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
             </Tooltip>
             <Tooltip value={language.t("common.reload")} placement="bottom">
               <IconButton
-                icon="reset"
+                icon="reload"
                 size="small"
                 variant="ghost"
                 onClick={() => vscode.postMessage({ type: "reload" })}
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
index 9564a0fe75..e65e7005ed 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
@@ -2,6 +2,7 @@ import { Component, createSignal, createEffect, createMemo, on, Show } from "sol
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Tabs } from "@kilocode/kilo-ui/tabs"
 import { Button } from "@kilocode/kilo-ui/button"
+import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { showToast } from "@kilocode/kilo-ui/toast"
 import { useVSCode } from "../../context/vscode"
 import { useLanguage } from "../../context/language"
@@ -143,14 +144,12 @@ const Settings: Component<SettingsProps> = (props) => {
         <Button variant="secondary" size="small" icon="edit" onClick={() => open("global")}>
           {language.t("settings.openGlobalConfig")}
         </Button>
-        <Button
-          variant="secondary"
-          size="small"
-          icon="reset"
-          onClick={() => vscode.postMessage({ type: "reload" })}
-        >
-          {language.t("common.reload")}
-        </Button>
+        <Tooltip value={language.t("common.reload")} placement="bottom">
+          <Button variant="secondary" size="small" onClick={() => vscode.postMessage({ type: "reload" })}>
+            <Icon name="reload" size="small" />
+            {language.t("common.reload")}
+          </Button>
+        </Tooltip>
       </div>
 
       {/* Settings tabs */}
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index a87c8ac9b6..29504be472 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -1183,6 +1183,7 @@ export const dict = {
 
   "common.retry": "إعادة المحاولة",
   "common.refresh": "تحديث",
+  "common.reload": "إعادة التحميل",
 
   "profile.title": "الملف الشخصي",
   "profile.notLoggedIn": "لم يتم تسجيل الدخول",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 5daf082020..c19f9f4aa1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -1204,6 +1204,7 @@ export const dict = {
 
   "common.retry": "Tentar novamente",
   "common.refresh": "Atualizar",
+  "common.reload": "Recarregar",
 
   "profile.title": "Perfil",
   "profile.notLoggedIn": "Não conectado",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index a5a894c7f0..5aa114866a 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -1245,6 +1245,7 @@ export const dict = {
 
   "common.retry": "Pokušaj ponovo",
   "common.refresh": "Osvježi",
+  "common.reload": "Učitaj ponovo",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Niste prijavljeni",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 14b21e2ab8..8a8c840097 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -1238,6 +1238,7 @@ export const dict = {
 
   "common.retry": "Prøv igen",
   "common.refresh": "Opdatér",
+  "common.reload": "Genindlæs",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Ikke logget ind",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 7c3ebe2962..8e2eb24669 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -1259,6 +1259,7 @@ export const dict = {
 
   "common.retry": "Erneut versuchen",
   "common.refresh": "Aktualisieren",
+  "common.reload": "Neu laden",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Nicht angemeldet",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index a5bf4b39bd..58221c028d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -1252,6 +1252,7 @@ export const dict = {
 
   "common.retry": "Reintentar",
   "common.refresh": "Actualizar",
+  "common.reload": "Recargar",
 
   "profile.title": "Perfil",
   "profile.notLoggedIn": "No conectado",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index e793315324..df7e722b0b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1262,6 +1262,7 @@ export const dict = {
 
   "common.retry": "Réessayer",
   "common.refresh": "Actualiser",
+  "common.reload": "Recharger",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Non connecté",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 5e1079426a..dba78c79c9 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -1006,6 +1006,7 @@ export const dict = {
   "deviceAuth.error.detailsTitle": "Dettagli errore accesso",
   "common.retry": "Riprova",
   "common.refresh": "Aggiorna",
+  "common.reload": "Ricarica",
   "profile.title": "Profilo",
   "profile.notLoggedIn": "Accesso non effettuato",
   "profile.action.login": "Accedi con Kilo Code",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 5483784d61..e51d83a2ea 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -1233,6 +1233,7 @@ export const dict = {
 
   "common.retry": "再試行",
   "common.refresh": "更新",
+  "common.reload": "再読み込み",
 
   "profile.title": "プロフィール",
   "profile.notLoggedIn": "ログインしていません",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 1c68d5d743..d07c77309f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -1190,6 +1190,7 @@ export const dict = {
 
   "common.retry": "재시도",
   "common.refresh": "새로고침",
+  "common.reload": "새로고침",
 
   "profile.title": "프로필",
   "profile.notLoggedIn": "로그인하지 않음",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 845b5d5a16..968029377c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -1198,6 +1198,7 @@ export const dict = {
 
   "common.retry": "Opnieuw proberen",
   "common.refresh": "Vernieuwen",
+  "common.reload": "Herladen",
 
   "profile.title": "Profiel",
   "profile.notLoggedIn": "Niet ingelogd",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index 775d9dc7e6..f31d7ad458 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -1202,6 +1202,7 @@ export const dict = {
 
   "common.retry": "Prøv igjen",
   "common.refresh": "Oppdater",
+  "common.reload": "Last inn på nytt",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Ikke pålogget",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index d3fa876fb7..91201db107 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -1201,6 +1201,7 @@ export const dict = {
 
   "common.retry": "Ponów",
   "common.refresh": "Odśwież",
+  "common.reload": "Przeładuj",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Nie zalogowano",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 6f616a81d8..1655da1576 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -1244,6 +1244,7 @@ export const dict = {
 
   "common.retry": "Повторить",
   "common.refresh": "Обновить",
+  "common.reload": "Перезагрузить",
 
   "profile.title": "Профиль",
   "profile.notLoggedIn": "Не авторизован",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index e5ec7f48ed..ade94cd672 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -1226,6 +1226,7 @@ export const dict = {
 
   "common.retry": "ลองอีกครั้ง",
   "common.refresh": "รีเฟรช",
+  "common.reload": "โหลดใหม่",
 
   "profile.title": "โปรไฟล์",
   "profile.notLoggedIn": "ยังไม่ได้เข้าสู่ระบบ",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index e57d018906..a0e4038b14 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -1195,6 +1195,7 @@ export const dict = {
 
   "common.retry": "Tekrar Dene",
   "common.refresh": "Yenile",
+  "common.reload": "Yeniden yükle",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Giriş yapılmadı",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index 06c0f00dfa..d0609a1dea 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -1193,6 +1193,7 @@ export const dict = {
 
   "common.retry": "Спробувати ще раз",
   "common.refresh": "Оновити",
+  "common.reload": "Перезавантажити",
 
   "profile.title": "Профіль",
   "profile.notLoggedIn": "Не увійшов",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index 3f0eafa95e..50a25a2ede 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -1206,6 +1206,7 @@ export const dict = {
 
   "common.retry": "重试",
   "common.refresh": "刷新",
+  "common.reload": "重新加载",
 
   "profile.title": "个人资料",
   "profile.notLoggedIn": "未登录",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index d50689f1f7..3659703f72 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -1170,6 +1170,7 @@ export const dict = {
 
   "common.retry": "重試",
   "common.refresh": "重新整理",
+  "common.reload": "重新載入",
 
   "profile.title": "個人資料",
   "profile.notLoggedIn": "尚未登入",

From 1c31d7ea4925fd9993bb127abe67b6cfeee06f32 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 13:22:30 +0200
Subject: [PATCH 21/68] fix: address review feedback on reload handler

- Block reload for retry and offline session states, not just busy
  (hasActiveSession rejects any non-idle state)
- Close TOCTOU race by calling store.reload inline instead of deferring
  to a pre-response handler, so the busy check and reload run in the
  same effect
- Avoid double-firing reloadAfterAuthChange: only call it eagerly for
  worktree sessions where the SSE directory check won't match; for the
  workspace root the existing SSE handler already fires it
- Replace err: any with unknown + narrowing
- Add in-flight guard to the CLI /reload plugin to prevent overlapping
  reloads from rapid double-invocation
- Remove the TaskHeader reload button (redundant with /reload slash
  command, avoids chat visual regression baseline churn)
---
 packages/kilo-vscode/src/KiloProvider.ts      | 11 ++++--
 .../src/components/chat/TaskHeader.tsx        |  9 -----
 .../opencode/src/kilocode/plugins/reload.tsx  |  5 +++
 .../httpapi/handlers/instance-reload.ts       | 11 +++---
 .../test/kilocode/instance-reload.test.ts     | 38 +++++++++++++++----
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index c044c6f637..8358930f05 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -3620,8 +3620,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     const dir = this.getWorkspaceDirectory(this.currentSession?.id)
     try {
       await this.client.instance.reload({ directory: dir }, { throwOnError: true })
-    } catch (err: any) {
-      const status = err?.response?.status
+    } catch (err) {
+      const status =
+        err && typeof err === "object" && "response" in err
+          ? (err as { response?: { status?: number } }).response?.status
+          : undefined
       if (status === 409) {
         vscode.window.showWarningMessage(
           "Cannot reload while a session is running. Wait for it to finish or abort it first.",
@@ -3633,7 +3636,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
       return
     }
     this.clearCommandsCache()
-    await this.reloadAfterAuthChange()
+    if (!sameDirectory(dir, this.getWorkspaceDirectory())) {
+      await this.reloadAfterAuthChange()
+    }
   }
 
   /** Public reload entry point for VS Code commands. */
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
index cccaa7ab72..96ac022f93 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
@@ -212,15 +212,6 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
                 aria-label={language.t("command.session.compact")}
               />
             </Tooltip>
-            <Tooltip value={language.t("common.reload")} placement="bottom">
-              <IconButton
-                icon="reload"
-                size="small"
-                variant="ghost"
-                onClick={() => vscode.postMessage({ type: "reload" })}
-                aria-label={language.t("common.reload")}
-              />
-            </Tooltip>
           </Show>
           <Show when={hasMessages()}>
             <button
diff --git a/packages/opencode/src/kilocode/plugins/reload.tsx b/packages/opencode/src/kilocode/plugins/reload.tsx
index d40782b9f4..420a4fee16 100644
--- a/packages/opencode/src/kilocode/plugins/reload.tsx
+++ b/packages/opencode/src/kilocode/plugins/reload.tsx
@@ -3,6 +3,7 @@ import type { TuiPlugin, TuiPluginModule } from "@kilocode/plugin/tui"
 const id = "internal:reload"
 
 const tui: TuiPlugin = async (api) => {
+  let pending = false
   api.keymap.registerLayer({
     commands: [
       {
@@ -13,11 +14,15 @@ const tui: TuiPlugin = async (api) => {
         category: "System",
         slashName: "reload",
         async run() {
+          if (pending) return
+          pending = true
           try {
             await api.client.instance.reload({}, { throwOnError: true })
             api.ui.toast({ message: "Reloaded", variant: "success" })
           } catch (err) {
             api.ui.toast({ message: String(err), variant: "error", duration: 5000 })
+          } finally {
+            pending = false
           }
         },
       },
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts
index db95453a2a..4532b945f7 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/instance-reload.ts
@@ -1,15 +1,15 @@
 import * as InstanceState from "@/effect/instance-state"
+import { InstanceStore } from "@/project/instance-store"
 import { SessionStatus } from "@/session/status"
 import { ConflictError } from "@/server/routes/instance/httpapi/errors"
-import { markInstanceForReload } from "@/server/routes/instance/httpapi/lifecycle"
 import { InstanceHttpApi } from "@/server/routes/instance/httpapi/api"
 import { Effect } from "effect"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
 import type { SessionID } from "@/session/schema"
 
-export function hasBusySession(statuses: Map<SessionID, SessionStatus.Info>): boolean {
+export function hasActiveSession(statuses: Map<SessionID, SessionStatus.Info>): boolean {
   for (const info of statuses.values()) {
-    if (info.type === "busy") return true
+    if (info.type !== "idle") return true
   }
   return false
 }
@@ -17,17 +17,18 @@ export function hasBusySession(statuses: Map<SessionID, SessionStatus.Info>): bo
 export const instanceReloadHandlers = HttpApiBuilder.group(InstanceHttpApi, "instance-reload", (handlers) =>
   Effect.gen(function* () {
     const status = yield* SessionStatus.Service
+    const store = yield* InstanceStore.Service
 
     const reload = Effect.fn("InstanceReloadHttpApi.reload")(function* () {
       const ctx = yield* InstanceState.context
-      if (hasBusySession(yield* status.list())) {
+      if (hasActiveSession(yield* status.list())) {
         return yield* Effect.fail(
           new ConflictError({
             message: "Cannot reload while a session is running. Wait for it to finish or abort it first.",
           }),
         )
       }
-      yield* markInstanceForReload(ctx, {
+      yield* store.reload({
         directory: ctx.directory,
         worktree: ctx.worktree,
         project: ctx.project,
diff --git a/packages/opencode/test/kilocode/instance-reload.test.ts b/packages/opencode/test/kilocode/instance-reload.test.ts
index b537811bcc..9d31a287ce 100644
--- a/packages/opencode/test/kilocode/instance-reload.test.ts
+++ b/packages/opencode/test/kilocode/instance-reload.test.ts
@@ -1,19 +1,19 @@
 import { describe, expect, it } from "bun:test"
-import { hasBusySession } from "@/kilocode/server/httpapi/handlers/instance-reload"
+import { hasActiveSession } from "@/kilocode/server/httpapi/handlers/instance-reload"
 import type { SessionStatus } from "@/session/status"
 import { SessionID } from "@/session/schema"
 
 const entries = (items: [string, SessionStatus.Info][]) =>
   items.map(([k, v]) => [k as SessionID, v] as [SessionID, SessionStatus.Info])
 
-describe("instance-reload hasBusySession", () => {
+describe("instance-reload hasActiveSession", () => {
   it("returns false for an empty map", () => {
-    expect(hasBusySession(new Map(entries([])))).toBe(false)
+    expect(hasActiveSession(new Map(entries([])))).toBe(false)
   })
 
   it("returns false when all sessions are idle", () => {
     expect(
-      hasBusySession(
+      hasActiveSession(
         new Map(
           entries([
             ["s1", { type: "idle" }],
@@ -24,9 +24,9 @@ describe("instance-reload hasBusySession", () => {
     ).toBe(false)
   })
 
-  it("returns true when any session is busy", () => {
+  it("returns true when a session is busy", () => {
     expect(
-      hasBusySession(
+      hasActiveSession(
         new Map(
           entries([
             ["s1", { type: "idle" }],
@@ -37,7 +37,29 @@ describe("instance-reload hasBusySession", () => {
     ).toBe(true)
   })
 
-  it("returns true when the only session is busy", () => {
-    expect(hasBusySession(new Map(entries([["s1", { type: "busy" }]])))).toBe(true)
+  it("returns true when a session is retrying", () => {
+    expect(
+      hasActiveSession(
+        new Map(
+          entries([
+            ["s1", { type: "idle" }],
+            ["s2", { type: "retry", attempt: 1, message: "retrying", next: 0 }],
+          ]),
+        ),
+      ),
+    ).toBe(true)
+  })
+
+  it("returns true when a session is offline", () => {
+    expect(
+      hasActiveSession(
+        new Map(
+          entries([
+            ["s1", { type: "idle" }],
+            ["s2", { type: "offline", requestID: "q1" as never, message: "waiting" }],
+          ]),
+        ),
+      ),
+    ).toBe(true)
   })
 })

From 75d88ba94e231ffb39b3d30c08393e9f3d9cb9f6 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 13:33:05 +0200
Subject: [PATCH 22/68] fix: use translatable tooltip text for reload button

Add common.reloadDescription i18n key with full-sentence translations
for all 19 locales and use it for the settings reload button tooltip
instead of the redundant title text.
---
 .../kilo-vscode/webview-ui/src/components/settings/Settings.tsx | 2 +-
 packages/kilo-vscode/webview-ui/src/i18n/ar.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/br.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/bs.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/da.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/de.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/en.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/es.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/fr.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/it.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/ja.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/ko.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/nl.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/no.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/pl.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/ru.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/th.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/tr.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/uk.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/zh.ts                  | 1 +
 packages/kilo-vscode/webview-ui/src/i18n/zht.ts                 | 1 +
 21 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
index e65e7005ed..836bf29af8 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
@@ -144,7 +144,7 @@ const Settings: Component<SettingsProps> = (props) => {
         <Button variant="secondary" size="small" icon="edit" onClick={() => open("global")}>
           {language.t("settings.openGlobalConfig")}
         </Button>
-        <Tooltip value={language.t("common.reload")} placement="bottom">
+        <Tooltip value={language.t("common.reloadDescription")} placement="bottom">
           <Button variant="secondary" size="small" onClick={() => vscode.postMessage({ type: "reload" })}>
             <Icon name="reload" size="small" />
             {language.t("common.reload")}
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index 29504be472..28f58a0b5c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -1184,6 +1184,7 @@ export const dict = {
   "common.retry": "إعادة المحاولة",
   "common.refresh": "تحديث",
   "common.reload": "إعادة التحميل",
+  "common.reloadDescription": "إعادة تحميل التكوين والمهارات والوكلاء والأوامر من القرص",
 
   "profile.title": "الملف الشخصي",
   "profile.notLoggedIn": "لم يتم تسجيل الدخول",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index c19f9f4aa1..839069cbaf 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -1205,6 +1205,7 @@ export const dict = {
   "common.retry": "Tentar novamente",
   "common.refresh": "Atualizar",
   "common.reload": "Recarregar",
+  "common.reloadDescription": "Recarregar configuração, habilidades, agentes e comandos do disco",
 
   "profile.title": "Perfil",
   "profile.notLoggedIn": "Não conectado",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 5aa114866a..05a3924b0b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -1246,6 +1246,7 @@ export const dict = {
   "common.retry": "Pokušaj ponovo",
   "common.refresh": "Osvježi",
   "common.reload": "Učitaj ponovo",
+  "common.reloadDescription": "Učitaj ponovo konfiguraciju, vještine, agente i naredbe s diska",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Niste prijavljeni",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 8a8c840097..3a1138dd99 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -1239,6 +1239,7 @@ export const dict = {
   "common.retry": "Prøv igen",
   "common.refresh": "Opdatér",
   "common.reload": "Genindlæs",
+  "common.reloadDescription": "Genindlæs konfiguration, færdigheder, agenter og kommandoer fra disken",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Ikke logget ind",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 8e2eb24669..9bd25a5ab9 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -1260,6 +1260,7 @@ export const dict = {
   "common.retry": "Erneut versuchen",
   "common.refresh": "Aktualisieren",
   "common.reload": "Neu laden",
+  "common.reloadDescription": "Konfiguration, Skills, Agents und Befehle vom Datenträger neu laden",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Nicht angemeldet",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index 823fe3232b..fa4607cd58 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -1157,6 +1157,7 @@ export const dict = {
   "common.retry": "Retry",
   "common.refresh": "Refresh",
   "common.reload": "Reload",
+  "common.reloadDescription": "Reload config, skills, agents, and commands from disk",
 
   "profile.title": "Profile",
   "profile.notLoggedIn": "Not logged in",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 58221c028d..25a58bd61b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -1253,6 +1253,7 @@ export const dict = {
   "common.retry": "Reintentar",
   "common.refresh": "Actualizar",
   "common.reload": "Recargar",
+  "common.reloadDescription": "Recargar configuración, habilidades, agentes y comandos desde el disco",
 
   "profile.title": "Perfil",
   "profile.notLoggedIn": "No conectado",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index df7e722b0b..14dfa38010 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1263,6 +1263,7 @@ export const dict = {
   "common.retry": "Réessayer",
   "common.refresh": "Actualiser",
   "common.reload": "Recharger",
+  "common.reloadDescription": "Recharger la configuration, les compétences, les agents et les commandes depuis le disque",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Non connecté",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index dba78c79c9..8388dd4583 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -1007,6 +1007,7 @@ export const dict = {
   "common.retry": "Riprova",
   "common.refresh": "Aggiorna",
   "common.reload": "Ricarica",
+  "common.reloadDescription": "Ricarica configurazione, competenze, agenti e comandi dal disco",
   "profile.title": "Profilo",
   "profile.notLoggedIn": "Accesso non effettuato",
   "profile.action.login": "Accedi con Kilo Code",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index e51d83a2ea..9db02ea54f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -1234,6 +1234,7 @@ export const dict = {
   "common.retry": "再試行",
   "common.refresh": "更新",
   "common.reload": "再読み込み",
+  "common.reloadDescription": "ディスクから設定、スキル、エージェント、コマンドを再読み込みします",
 
   "profile.title": "プロフィール",
   "profile.notLoggedIn": "ログインしていません",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index d07c77309f..ee9d93113f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -1191,6 +1191,7 @@ export const dict = {
   "common.retry": "재시도",
   "common.refresh": "새로고침",
   "common.reload": "새로고침",
+  "common.reloadDescription": "디스크에서 구성, 스킬, 에이전트 및 명령을 새로고침합니다",
 
   "profile.title": "프로필",
   "profile.notLoggedIn": "로그인하지 않음",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 968029377c..1838a59453 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -1199,6 +1199,7 @@ export const dict = {
   "common.retry": "Opnieuw proberen",
   "common.refresh": "Vernieuwen",
   "common.reload": "Herladen",
+  "common.reloadDescription": "Herlaad configuratie, vaardigheden, agents en opdrachten vanaf schijf",
 
   "profile.title": "Profiel",
   "profile.notLoggedIn": "Niet ingelogd",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index f31d7ad458..51652b670e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -1203,6 +1203,7 @@ export const dict = {
   "common.retry": "Prøv igjen",
   "common.refresh": "Oppdater",
   "common.reload": "Last inn på nytt",
+  "common.reloadDescription": "Last inn konfigurasjon, ferdigheter, agenter og kommandoer fra disk på nytt",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Ikke pålogget",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index 91201db107..af234579df 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -1202,6 +1202,7 @@ export const dict = {
   "common.retry": "Ponów",
   "common.refresh": "Odśwież",
   "common.reload": "Przeładuj",
+  "common.reloadDescription": "Przeładuj konfigurację, umiejętności, agentów i polecenia z dysku",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Nie zalogowano",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 1655da1576..af2ef5a120 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -1245,6 +1245,7 @@ export const dict = {
   "common.retry": "Повторить",
   "common.refresh": "Обновить",
   "common.reload": "Перезагрузить",
+  "common.reloadDescription": "Перезагрузить конфигурацию, навыки, агентов и команды с диска",
 
   "profile.title": "Профиль",
   "profile.notLoggedIn": "Не авторизован",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index ade94cd672..64cf3b4e8d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -1227,6 +1227,7 @@ export const dict = {
   "common.retry": "ลองอีกครั้ง",
   "common.refresh": "รีเฟรช",
   "common.reload": "โหลดใหม่",
+  "common.reloadDescription": "โหลดการตั้งค่า ทักษะ เอเจนต์ และคำสั่งจากดิสก์ใหม่",
 
   "profile.title": "โปรไฟล์",
   "profile.notLoggedIn": "ยังไม่ได้เข้าสู่ระบบ",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index a0e4038b14..ad124be0d3 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -1196,6 +1196,7 @@ export const dict = {
   "common.retry": "Tekrar Dene",
   "common.refresh": "Yenile",
   "common.reload": "Yeniden yükle",
+  "common.reloadDescription": "Diskten yapılandırma, yetenekler, ajanlar ve komutları yeniden yükle",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Giriş yapılmadı",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index d0609a1dea..fa4bb2ddf5 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -1194,6 +1194,7 @@ export const dict = {
   "common.retry": "Спробувати ще раз",
   "common.refresh": "Оновити",
   "common.reload": "Перезавантажити",
+  "common.reloadDescription": "Перезавантажити конфігурацію, навички, агентів та команди з диска",
 
   "profile.title": "Профіль",
   "profile.notLoggedIn": "Не увійшов",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index 50a25a2ede..af5e0fdf87 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -1207,6 +1207,7 @@ export const dict = {
   "common.retry": "重试",
   "common.refresh": "刷新",
   "common.reload": "重新加载",
+  "common.reloadDescription": "重新加载磁盘上的配置、技能、智能体和命令",
 
   "profile.title": "个人资料",
   "profile.notLoggedIn": "未登录",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index 3659703f72..0e703d8618 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -1171,6 +1171,7 @@ export const dict = {
   "common.retry": "重試",
   "common.refresh": "重新整理",
   "common.reload": "重新載入",
+  "common.reloadDescription": "重新載入磁碟上的設定、技能、智慧代理和命令",
 
   "profile.title": "個人資料",
   "profile.notLoggedIn": "尚未登入",

From b617d36af49d6ceab8f38c38b8eebf0969684013 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 13:39:49 +0200
Subject: [PATCH 23/68] style: format fr.ts reloadDescription to satisfy
 prettier

---
 packages/kilo-vscode/webview-ui/src/i18n/fr.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index 14dfa38010..f60ca11a50 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1263,7 +1263,8 @@ export const dict = {
   "common.retry": "Réessayer",
   "common.refresh": "Actualiser",
   "common.reload": "Recharger",
-  "common.reloadDescription": "Recharger la configuration, les compétences, les agents et les commandes depuis le disque",
+  "common.reloadDescription":
+    "Recharger la configuration, les compétences, les agents et les commandes depuis le disque",
 
   "profile.title": "Profil",
   "profile.notLoggedIn": "Non connecté",

From 683b06b0f852046761b80bcef22592170b7cb0f7 Mon Sep 17 00:00:00 2001
From: Emilie Lima Schario <14057155+emilieschario@users.noreply.github.com>
Date: Tue, 7 Jul 2026 07:47:34 -0400
Subject: [PATCH 24/68] Update packages/kilo-docs/lib/nav/code-with-ai.ts

Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
---
 packages/kilo-docs/lib/nav/code-with-ai.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kilo-docs/lib/nav/code-with-ai.ts b/packages/kilo-docs/lib/nav/code-with-ai.ts
index d20653901b..c8a8c0a223 100644
--- a/packages/kilo-docs/lib/nav/code-with-ai.ts
+++ b/packages/kilo-docs/lib/nav/code-with-ai.ts
@@ -8,7 +8,7 @@ export const CodeWithAiNav: NavSection[] = [
       {
         href: "/code-with-ai/platforms/vscode",
         children: "VS Code Extension",
-        subLinks: [{ href: "/code-with-ai/platforms/vscode/whats-new", children: "Whats New" }],
+        subLinks: [{ href: "/code-with-ai/platforms/vscode/whats-new", children: "What's New" }],
       },
       {
         href: "/code-with-ai/platforms/jetbrains",

From c0b2a24a256c3f007bd53520234578282eb36e58 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 13:48:15 +0200
Subject: [PATCH 25/68] docs: document /reload command and update skills doc

Add /reload to the CLI System Commands table and update the skills
documentation to mention /reload as an alternative to starting a new
session for picking up skill changes.
---
 packages/kilo-docs/pages/code-with-ai/platforms/cli.md | 1 +
 packages/kilo-docs/pages/customize/skills.md           | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
index 9e68a71bdd..137af4b2bf 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
@@ -117,6 +117,7 @@ For detailed help on every command and subcommand, see the [CLI Command Referenc
 | `/status` | - | View status |
 | `/themes` | - | Switch theme |
 | `/help` | - | Show help |
+| `/reload` | - | Reload config, skills, agents, and commands from disk |
 | `/editor` | - | Open external editor |
 | `/exit` | `/quit`, `/q` | Exit the app |
 
diff --git a/packages/kilo-docs/pages/customize/skills.md b/packages/kilo-docs/pages/customize/skills.md
index ba63b3621d..7eafca68f8 100644
--- a/packages/kilo-docs/pages/customize/skills.md
+++ b/packages/kilo-docs/pages/customize/skills.md
@@ -232,7 +232,7 @@ Skills are discovered when a session starts. The CLI scans all configured skill
 - In the **CLI**: Skills are loaded when you start a new session or run `kilo run`
 - In the **VS Code extension**: Skills are loaded when the extension connects to the CLI server
 
-Skills are re-scanned at the start of each new session. To pick up newly added or modified skills, start a new session.
+Skills are re-scanned at the start of each new session. To pick up newly added or modified skills without starting a new session, use `/reload`.
 
 {% /tab %}
 {% tab label="CLI" %}
@@ -242,7 +242,7 @@ Skills are discovered when a session starts. The CLI scans all configured skill
 - In the **CLI**: Skills are loaded when you start a new session or run `kilo run`
 - In the **VS Code extension**: Skills are loaded when the extension connects to the CLI server
 
-Skills are re-scanned at the start of each new session. To pick up newly added or modified skills, start a new session.
+Skills are re-scanned at the start of each new session. To pick up newly added or modified skills without starting a new session, use `/reload`.
 
 {% /tab %}
 {% /tabs %}
@@ -430,7 +430,7 @@ The new platform does not have a marketplace UI yet. You can find and share skil
 
 1. **Verify frontmatter**: Ensure `name` and `description` are present in the YAML frontmatter. The `name` does not need to match the directory name but should be unique across all loaded skills.
 
-2. **Start a new session**: Skills are scanned at session start. Begin a new session to pick up changes.
+2. **Reload or start a new session**: Use `/reload` to pick up changes without losing your current session, or start a new session.
 
 3. **Check file location**: Ensure `SKILL.md` is directly inside the skill directory (e.g., `.kilo/skills/my-skill/SKILL.md`), not nested further.
 
@@ -441,7 +441,7 @@ The new platform does not have a marketplace UI yet. You can find and share skil
 
 1. **Verify frontmatter**: Ensure `name` and `description` are present in the YAML frontmatter. The `name` does not need to match the directory name but should be unique across all loaded skills.
 
-2. **Start a new session**: Skills are scanned at session start. Begin a new session to pick up changes.
+2. **Reload or start a new session**: Use `/reload` to pick up changes without losing your current session, or start a new session.
 
 3. **Check file location**: Ensure `SKILL.md` is directly inside the skill directory (e.g., `.kilo/skills/my-skill/SKILL.md`), not nested further.
 

From 648fa2fb24832d87e10b2fd1dd6617a7e1195ec1 Mon Sep 17 00:00:00 2001
From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 11:50:01 +0000
Subject: [PATCH 26/68] docs: fix nested code fence delimiters in
 STYLE_GUIDE.md

---
 packages/kilo-docs/STYLE_GUIDE.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/kilo-docs/STYLE_GUIDE.md b/packages/kilo-docs/STYLE_GUIDE.md
index de3be388ee..205b36932a 100644
--- a/packages/kilo-docs/STYLE_GUIDE.md
+++ b/packages/kilo-docs/STYLE_GUIDE.md
@@ -99,11 +99,11 @@ Bad: [Click here](/docs/getting-started/quickstart)
 - Show realistic, working examples
 - Use `kilo run` for CLI examples, not hypothetical commands
 
-```markdown
+````markdown
 ```bash
 kilo run "create a utils.py file with a function that adds two numbers"
 ```
-```
+````
 
 ### Code in prose
 
@@ -161,12 +161,12 @@ Content for CLI
 
 Use fenced `mermaid` blocks for architecture diagrams:
 
-```markdown
+````markdown
 ```mermaid
 flowchart LR
   A --> B
 ```
-```
+````
 
 ## LLM-Generated Docs
 

From 13f00fce1476aba82036dcdb787b063c8e954d75 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 13:51:22 +0200
Subject: [PATCH 27/68] fix(vscode): address speech-to-text review findings

---
 packages/kilo-vscode/src/services/input-tools.ts            | 2 +-
 packages/kilo-vscode/src/speech-to-text/capture.ts          | 6 +++---
 .../src/components/speech-to-text/SpeechToTextButton.tsx    | 5 +++--
 packages/kilo-vscode/webview-ui/src/styles/prompt-input.css | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/kilo-vscode/src/services/input-tools.ts b/packages/kilo-vscode/src/services/input-tools.ts
index 23479bbf20..76157c11ff 100644
--- a/packages/kilo-vscode/src/services/input-tools.ts
+++ b/packages/kilo-vscode/src/services/input-tools.ts
@@ -20,7 +20,7 @@ export async function routeInputToolMessage(message: Msg, ctx: Ctx): Promise<boo
   if (await routeAutocompleteMessage(message, ctx.post)) return true
 
   if (message.type === "speechToTextPrewarm") {
-    void prewarmSpeechCapture().catch((err) => console.warn("[Kilo New] Speech capture prewarm failed:", err))
+    void prewarmSpeechCapture().catch((err: unknown) => console.warn("[Kilo New] Speech capture prewarm failed:", err))
     return true
   }
 
diff --git a/packages/kilo-vscode/src/speech-to-text/capture.ts b/packages/kilo-vscode/src/speech-to-text/capture.ts
index a2d61885bc..6250c0822c 100644
--- a/packages/kilo-vscode/src/speech-to-text/capture.ts
+++ b/packages/kilo-vscode/src/speech-to-text/capture.ts
@@ -235,10 +235,10 @@ function requireActive(requestId: string): Recording {
 }
 
 async function resolveFFmpeg(): Promise<string> {
-  if (ffmpeg) {
-    const bin = await ffmpeg
+  const cached = ffmpeg
+  if (cached) {
+    const bin = await cached
     if (!path.isAbsolute(bin) || existsSync(bin)) return bin
-    ffmpeg = undefined
   }
 
   const task = findFFmpeg()
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 ade6048443..5a6d4f056a 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
@@ -13,6 +13,7 @@ type Props = {
 
 export const SpeechToTextButton: Component<Props> = (props) => {
   const unavailable = () => !!props.disabled && props.speech.state() === "idle"
+  const locked = () => unavailable() || props.speech.state() === "starting"
   const busy = () => props.speech.state() === "starting" || props.speech.state() === "transcribing"
   const label = () => {
     if (props.speech.state() === "starting") return props.label("speechToText.tooltip.starting")
@@ -50,9 +51,9 @@ export const SpeechToTextButton: Component<Props> = (props) => {
         variant="ghost"
         size="small"
         onClick={click}
-        disabled={unavailable()}
+        disabled={locked()}
         aria-label={label()}
-        aria-disabled={unavailable() || props.speech.state() === "starting"}
+        aria-disabled={locked()}
         aria-busy={busy()}
         aria-pressed={props.speech.state() === "recording"}
         class={`prompt-speech-button prompt-speech-button--${props.speech.state()}`}
diff --git a/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css b/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css
index 7720913275..3188bf86c9 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css
@@ -654,6 +654,11 @@
   }
 }
 
+.prompt-speech-button--starting {
+  cursor: progress;
+  opacity: 0.7;
+}
+
 .prompt-speech-button--recording::after {
   content: "";
   position: absolute;

From b1d004d568c78a6431787ffe7b109a6b037f2229 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 13:54:38 +0200
Subject: [PATCH 28/68] fix: avoid profile sync side effects

---
 packages/kilo-gateway/src/server/handlers.ts  | 11 ++++----
 packages/kilo-gateway/src/tui/helpers.ts      |  3 ++-
 .../src/components/profile/ProfileView.tsx    | 26 +++++++++----------
 .../server/httpapi/handlers/kilo-gateway.ts   | 26 ++++++++-----------
 4 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/packages/kilo-gateway/src/server/handlers.ts b/packages/kilo-gateway/src/server/handlers.ts
index ebf5aa3734..97f176ac81 100644
--- a/packages/kilo-gateway/src/server/handlers.ts
+++ b/packages/kilo-gateway/src/server/handlers.ts
@@ -74,16 +74,17 @@ export async function getProfile(auth: AuthStore): Promise<KiloProfileResult> {
   ])
 
   const selected = profile.selectedOrganizationId
-  const valid = selected && profile.organizations?.some((org) => org.id === selected) ? selected : undefined
-  const currentOrgId = valid ?? info.accountId ?? null
-  if (valid && valid !== info.accountId) {
+  const orgs = profile.organizations ?? []
+  const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
+  const currentOrgId = info.accountId ?? valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined) ?? null
+  if (currentOrgId && !info.accountId) {
     await auth.set("kilo", {
       type: "oauth",
       refresh: info.refresh,
       access: info.access,
       expires: info.expires,
-      accountId: valid,
-    })
+      accountId: currentOrgId,
+    }).catch((err) => console.warn("Failed to persist cloud account selection:", err))
   }
 
   const balance = await fetchBalance(info.access, currentOrgId ?? undefined)
diff --git a/packages/kilo-gateway/src/tui/helpers.ts b/packages/kilo-gateway/src/tui/helpers.ts
index cc7a72311a..f57f2e944c 100644
--- a/packages/kilo-gateway/src/tui/helpers.ts
+++ b/packages/kilo-gateway/src/tui/helpers.ts
@@ -63,8 +63,9 @@ export function getOrganizationOptions(
   description?: string
   category: string
 }> {
+  const personal = hasPersonalAccount || organizations.length === 0
   return [
-    ...(hasPersonalAccount
+    ...(personal
       ? [
           {
             title: "Personal Account",
diff --git a/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
index e108724703..bed2bfbc98 100644
--- a/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
@@ -55,13 +55,6 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
     setTarget(null)
   })
 
-  const switching = createMemo(() => {
-    const t = target()
-    if (t === null) return false
-    const current = props.profileData?.currentOrgId ?? PERSONAL
-    return current !== t
-  })
-
   const orgOptions = createMemo<OrgOption[]>(() => {
     const orgs = props.profileData?.profile.organizations ?? []
     if (orgs.length === 0) return []
@@ -72,17 +65,24 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
     ]
   })
 
-  const currentOrg = createMemo(() => {
+  const currentId = createMemo(() => {
     const personal = props.profileData?.profile.hasPersonalAccount !== false
-    const id = props.profileData?.currentOrgId ?? (personal ? PERSONAL : orgOptions()[0]?.value)
-    return orgOptions().find((o) => o.value === id)
+    return props.profileData?.currentOrgId ?? (personal ? PERSONAL : orgOptions()[0]?.value)
+  })
+
+  const switching = createMemo(() => {
+    const t = target()
+    if (t === null) return false
+    return currentId() !== t
+  })
+
+  const currentOrg = createMemo(() => {
+    return orgOptions().find((o) => o.value === currentId())
   })
 
   const selectOrg = (option: OrgOption | undefined) => {
     if (!option) return
-    const personal = props.profileData?.profile.hasPersonalAccount !== false
-    const current = props.profileData?.currentOrgId ?? (personal ? PERSONAL : orgOptions()[0]?.value)
-    if (option.value === current) return
+    if (option.value === currentId()) return
     setTarget(option.value)
     vscode.postMessage({
       type: "setOrganization",
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
index 334a819276..dd98e09f0f 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
@@ -77,21 +77,17 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
       })
 
       const selected = profile.selectedOrganizationId
-      const valid = selected && profile.organizations?.some((org) => org.id === selected) ? selected : undefined
-      const currentOrgId = valid ?? info.accountId ?? null
-      if (valid && valid !== info.accountId) {
-        yield* auth
-          .set("kilo", {
-            type: "oauth",
-            refresh: info.refresh,
-            access: info.access,
-            expires: info.expires,
-            accountId: valid,
-          })
-          .pipe(Effect.mapError(() => new HttpApiError.BadRequest({})))
-        yield* cache.clear("kilo")
-        clearModesCache()
-        yield* store.disposeAll().pipe(Effect.mapError(() => new HttpApiError.BadRequest({})))
+      const orgs = profile.organizations ?? []
+      const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
+      const currentOrgId = info.accountId ?? valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined) ?? null
+      if (currentOrgId && !info.accountId) {
+        yield* auth.set("kilo", {
+          type: "oauth",
+          refresh: info.refresh,
+          access: info.access,
+          expires: info.expires,
+          accountId: currentOrgId,
+        }).pipe(Effect.catch((err) => Effect.sync(() => log.warn("failed to persist cloud account selection", { err }))))
       }
 
       const balance = yield* Effect.tryPromise({

From 552167fc33dc1af7d587a40bc31ebd3347d80304 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 14:08:03 +0200
Subject: [PATCH 29/68] fix: preserve manual Kilo account selection

---
 packages/kilo-gateway/src/server/handlers.ts           | 10 +++++++---
 packages/opencode/src/auth/index.ts                    |  1 +
 .../kilocode/server/httpapi/handlers/kilo-gateway.ts   |  8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/kilo-gateway/src/server/handlers.ts b/packages/kilo-gateway/src/server/handlers.ts
index 97f176ac81..ac8b5d2907 100644
--- a/packages/kilo-gateway/src/server/handlers.ts
+++ b/packages/kilo-gateway/src/server/handlers.ts
@@ -8,7 +8,7 @@ import { buildKiloHeaders } from "../headers.js"
 
 export type KiloAuth =
   | { type: "api"; key: string }
-  | { type: "oauth"; access: string; refresh: string; expires: number; accountId?: string }
+  | { type: "oauth"; access: string; refresh: string; expires: number; accountId?: string; accountSelection?: "cloud" | "manual" }
   | { type: "wellknown"; key: string; token: string }
 
 export interface KiloProfileResult {
@@ -76,14 +76,17 @@ export async function getProfile(auth: AuthStore): Promise<KiloProfileResult> {
   const selected = profile.selectedOrganizationId
   const orgs = profile.organizations ?? []
   const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
-  const currentOrgId = info.accountId ?? valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined) ?? null
-  if (currentOrgId && !info.accountId) {
+  const cloud = valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
+  const local = info.accountSelection === "cloud" ? undefined : info.accountId
+  const currentOrgId = info.accountSelection === "manual" ? (info.accountId ?? null) : (local ?? cloud ?? info.accountId ?? null)
+  if (currentOrgId && !local && info.accountSelection !== "manual" && currentOrgId !== info.accountId) {
     await auth.set("kilo", {
       type: "oauth",
       refresh: info.refresh,
       access: info.access,
       expires: info.expires,
       accountId: currentOrgId,
+      accountSelection: "cloud",
     }).catch((err) => console.warn("Failed to persist cloud account selection:", err))
   }
 
@@ -112,6 +115,7 @@ export async function setOrganization(deps: OrganizationDeps, organizationId: st
     access: info.access,
     expires: info.expires,
     ...(organizationId && { accountId: organizationId }),
+    accountSelection: "manual",
   })
 
   await deps.clear()
diff --git a/packages/opencode/src/auth/index.ts b/packages/opencode/src/auth/index.ts
index de4375add8..a8d502296a 100644
--- a/packages/opencode/src/auth/index.ts
+++ b/packages/opencode/src/auth/index.ts
@@ -17,6 +17,7 @@ export class Oauth extends Schema.Class<Oauth>("OAuth")({
   access: Schema.String,
   expires: NonNegativeInt,
   accountId: Schema.optional(Schema.String),
+  accountSelection: Schema.optional(Schema.Literals(["cloud", "manual"])), // kilocode_change
   enterpriseUrl: Schema.optional(Schema.String),
 }) {}
 
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
index dd98e09f0f..bd610d3595 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
@@ -79,14 +79,17 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
       const selected = profile.selectedOrganizationId
       const orgs = profile.organizations ?? []
       const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
-      const currentOrgId = info.accountId ?? valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined) ?? null
-      if (currentOrgId && !info.accountId) {
+      const cloud = valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
+      const local = info.accountSelection === "cloud" ? undefined : info.accountId
+      const currentOrgId = info.accountSelection === "manual" ? (info.accountId ?? null) : (local ?? cloud ?? info.accountId ?? null)
+      if (currentOrgId && !local && info.accountSelection !== "manual" && currentOrgId !== info.accountId) {
         yield* auth.set("kilo", {
           type: "oauth",
           refresh: info.refresh,
           access: info.access,
           expires: info.expires,
           accountId: currentOrgId,
+          accountSelection: "cloud",
         }).pipe(Effect.catch((err) => Effect.sync(() => log.warn("failed to persist cloud account selection", { err }))))
       }
 
@@ -353,6 +356,7 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
           access: info.access,
           expires: info.expires,
           ...(ctx.payload.organizationId && { accountId: ctx.payload.organizationId }),
+          accountSelection: "manual",
         })
         .pipe(Effect.mapError(() => new HttpApiError.Unauthorized({})))
 

From a5df5bc8e4bfca64c3846955d781ae67edcbb186 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 14:20:30 +0200
Subject: [PATCH 30/68] fix(vscode): prevent selector popover clipping in new
 worktree dialog

The New Worktree dialog renders model, reasoning-variant, and mode pickers
inline (portal=false) so clicks aren't swallowed by the modal overlay. The
CSS overflow escape hatch that lets an open popover break out of the dialog's
scroll containers keyed only on model-selector-popover, so the variant and
mode dropdowns added later were clipped by .am-nv-dialog-content and the
prompt container.

Generalize the :has() rules to any popover-content inside the dialog. Popover
content unmounts on close, so the override only applies while a dropdown is open.

Add a visual-regression story (NewWorktreeDialog with the variant dropdown
open) that reproduces the clipping without the fix and covers all inline
pickers going forward.
---
 .changeset/am-dialog-popover-clipping.md      |  5 +++
 .../agent-manager/agent-manager.css           |  9 +++--
 .../src/stories/agent-manager.stories.tsx     | 39 +++++++++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/am-dialog-popover-clipping.md

diff --git a/.changeset/am-dialog-popover-clipping.md b/.changeset/am-dialog-popover-clipping.md
new file mode 100644
index 0000000000..66fc980375
--- /dev/null
+++ b/.changeset/am-dialog-popover-clipping.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix the reasoning-variant and mode dropdowns being clipped inside the New Worktree dialog. The dialog's scroll-container overflow escape now covers all inline selector popovers, not just the model picker, so dropdowns render fully above the prompt input.
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 4007ad8b9e..173f327709 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
@@ -2709,10 +2709,11 @@ body.am-wt-dragging-active * {
   overflow-y: auto;
 }
 
-.am-nv-dialog .am-prompt-input-container:has([class~="model-selector-popover"][data-component="popover-content"]),
-.am-nv-dialog-content:has([class~="model-selector-popover"][data-component="popover-content"]),
-[data-component="dialog"]:has(.am-nv-dialog [class~="model-selector-popover"][data-component="popover-content"])
-  [data-slot="dialog-body"] {
+/* While any inline (non-portaled) selector popover is open, let it escape the
+   dialog's scroll containers. Covers model, thinking-variant, and mode pickers. */
+.am-nv-dialog .am-prompt-input-container:has([data-component="popover-content"]),
+.am-nv-dialog-content:has([data-component="popover-content"]),
+[data-component="dialog"]:has(.am-nv-dialog [data-component="popover-content"]) [data-slot="dialog-body"] {
   overflow: visible;
 }
 
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 fbad72deba..b35303e127 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
@@ -10,6 +10,8 @@ import { FileTree } from "../../diff-viewer/FileTree"
 import { DiffPanel } from "../../agent-manager/DiffPanel"
 import { FullScreenDiffView } from "../../diff-viewer/FullScreenDiffView"
 import { WorktreeItem } from "../../agent-manager/WorktreeItem"
+import { NewWorktreeDialog } from "../../agent-manager/NewWorktreeDialog"
+import { useDialog } from "@kilocode/kilo-ui/context/dialog"
 import { ChatView } from "../components/chat/ChatView"
 import { registerVscodeToolOverrides } from "../components/chat/VscodeToolOverrides"
 import { SessionContext } from "../context/session"
@@ -929,6 +931,43 @@ export const TabBarSingleTab: Story = {
   ),
 }
 
+// ---------------------------------------------------------------------------
+// NewWorktreeDialog — variant dropdown must escape the dialog scroll containers
+// (regression: inline popovers were clipped by .am-nv-dialog-content overflow)
+// ---------------------------------------------------------------------------
+
+const NewWorktreeVariantOpener = () => {
+  const dialog = useDialog()
+  const open = () => {
+    if (document.querySelector("[data-component='popover-content']")) return
+    window.dispatchEvent(new CustomEvent("openVariantPicker"))
+    requestAnimationFrame(open)
+  }
+  onMount(() => {
+    dialog.show(() => <NewWorktreeDialog onClose={() => {}} />)
+    requestAnimationFrame(open)
+  })
+  return null
+}
+
+export const NewWorktreeVariantDropdown1280: Story = {
+  name: "NewWorktreeDialog — variant dropdown open",
+  parameters: { layout: "fullscreen" },
+  render: () => {
+    const session = {
+      ...mockSessionValue(),
+      configModel: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
+    }
+    return (
+      <StoryProviders noPadding>
+        <SessionContext.Provider value={session as any}>
+          <NewWorktreeVariantOpener />
+        </SessionContext.Provider>
+      </StoryProviders>
+    )
+  },
+}
+
 const searchSection = { id: "polish", name: "Polish", color: "Blue", order: 0, collapsed: false }
 const slackedSection = { id: "slacked", name: "SLACKED", color: "Yellow", order: 1, collapsed: false }
 const sidebarSearchItems: SidebarSearchItem[] = [

From 4ab34f1f4cd11f6c9defc1c63d6c0237cad57fec Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 14:33:06 +0200
Subject: [PATCH 31/68] test: add /instance/reload scenario to httpapi exercise

The coverage mode requires every documented endpoint to have a
scenario. Without this, test:httpapi fails with a missing scenario
for the new /instance/reload route.
---
 .../test/kilocode/server/httpapi-exercise-scenarios.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts b/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts
index abd201fff7..061f268b62 100644
--- a/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts
+++ b/packages/opencode/test/kilocode/server/httpapi-exercise-scenarios.ts
@@ -682,4 +682,14 @@ export const kiloScenarios: Scenario[] = [
     .post("/telemetry/setEnabled", "telemetry.setEnabled")
     .at((ctx) => ({ path: "/telemetry/setEnabled", headers: ctx.headers(), body: { enabled: true } }))
     .json(200, (body) => check(body === true, "telemetry enabled update should return true")),
+  http.protected
+    .post("/instance/reload", "instance.reload")
+    .mutating()
+    .seeded((ctx) => ctx.session({ title: "Reload" }))
+    .at((ctx) => ({
+      path: `/instance/reload?directory=${encodeURIComponent(directory(ctx))}`,
+      headers: ctx.headers(),
+      body: {},
+    }))
+    .json(200, (body) => check(body === true, "instance reload should return true")),
 ]

From 053b037f87ed0f29fadc6b93168184e961126a7a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 12:35:27 +0000
Subject: [PATCH 32/68] chore: update kilo-vscode visual regression baselines

---
 .../settings/sandboxing-panel-chromium-linux.png              | 4 ++--
 .../settings/settings-panel-chromium-linux.png                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/sandboxing-panel-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/sandboxing-panel-chromium-linux.png
index 8cde4b3acf..6d462eb5f3 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/sandboxing-panel-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/sandboxing-panel-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a817c2b87e1d7b28a7c28deaa8fd8d1e9c51aa2daabda1a2de4a0db0a33fcc17
-size 27768
+oid sha256:ea36a9604fbc773d2312289f46205221e607a927b0d302b1d9a5e6bdc1d80308
+size 28888
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/settings-panel-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/settings-panel-chromium-linux.png
index 545366bac0..c880062098 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/settings-panel-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/settings/settings-panel-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4dbd3be2cdf72a789c17076afa73ddeb2eacbe201ace8d8a2657eb95b23a413
-size 53851
+oid sha256:1ee158333ea6c4478f6c167eac878bdc5969fce47ba9f68a1e731fd9035e9e49
+size 52312

From e29196c949897d56efa9923e8655301635c26d66 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 14:35:34 +0200
Subject: [PATCH 33/68] feat(sandbox): widen writable-paths settings input and
 add coverage

Widen the Additional Writable Paths input in the Sandboxing settings tab
so long filesystem paths are readable while typing, reusing the existing
wide-input variant without affecting the network toggle row.

Add tests for the sandbox_writable_paths behavior: real sandbox
enforcement that configured extra paths become writable while unlisted
paths and .git stay denied, and a config-scope test confirming the
setting is honored from global config only and dropped from project
config.
---
 .../sandbox-writable-paths-input-width.md     |   5 +
 .../src/components/settings/SandboxingTab.tsx | 110 +++++++++---------
 .../test/kilocode/config/config.test.ts       |  35 ++++++
 .../test/kilocode/sandbox/policy.test.ts      |  30 +++++
 4 files changed, 127 insertions(+), 53 deletions(-)
 create mode 100644 .changeset/sandbox-writable-paths-input-width.md

diff --git a/.changeset/sandbox-writable-paths-input-width.md b/.changeset/sandbox-writable-paths-input-width.md
new file mode 100644
index 0000000000..b48de18dcb
--- /dev/null
+++ b/.changeset/sandbox-writable-paths-input-width.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Widen the Additional Writable Paths input in the Sandboxing settings so longer filesystem paths are easier to read while typing.
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
index 74f6e656fa..8ec16cb396 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/SandboxingTab.tsx
@@ -64,63 +64,67 @@ const SandboxingTab: Component = () => {
         </Switch>
       </SettingsRow>
 
-      <SettingsRow
-        title={language.t("settings.sandboxing.writablePaths.title")}
-        description={language.t("settings.sandboxing.writablePaths.description")}
-        descriptionId={writablePathsDescription}
-        last
-      >
-        <div style={{ width: "100%" }}>
-          <div
-            style={{
-              display: "flex",
-              gap: "8px",
-              "align-items": "center",
-              padding: "8px 0",
-              "border-bottom": writablePaths().length > 0 ? "1px solid var(--border-weak-base)" : "none",
-            }}
-          >
-            <div style={{ flex: 1 }}>
-              <TextField
-                value={newPath()}
-                placeholder="/tmp"
-                onChange={(val) => setNewPath(val)}
-                onKeyDown={(e: KeyboardEvent) => {
-                  if (e.key === "Enter") addPath()
-                }}
-                hideLabel
-                label={language.t("settings.sandboxing.writablePaths.title")}
-              />
+      {/* wide-input widens the input column so long filesystem paths are readable */}
+      <div data-variant="wide-input">
+        <SettingsRow
+          title={language.t("settings.sandboxing.writablePaths.title")}
+          description={language.t("settings.sandboxing.writablePaths.description")}
+          descriptionId={writablePathsDescription}
+          last
+        >
+          <div style={{ width: "100%" }}>
+            <div
+              style={{
+                display: "flex",
+                gap: "8px",
+                "align-items": "center",
+                padding: "8px 0",
+                "border-bottom": writablePaths().length > 0 ? "1px solid var(--border-weak-base)" : "none",
+              }}
+            >
+              <div style={{ flex: 1 }}>
+                <TextField
+                  value={newPath()}
+                  placeholder="/tmp"
+                  onChange={(val) => setNewPath(val)}
+                  onKeyDown={(e: KeyboardEvent) => {
+                    if (e.key === "Enter") addPath()
+                  }}
+                  hideLabel
+                  label={language.t("settings.sandboxing.writablePaths.title")}
+                />
+              </div>
+              <Button variant="secondary" onClick={addPath}>
+                {language.t("common.add")}
+              </Button>
             </div>
-            <Button variant="secondary" onClick={addPath}>
-              {language.t("common.add")}
-            </Button>
-          </div>
-          <For each={writablePaths()}>
-            {(path, index) => (
-              <div
-                style={{
-                  display: "flex",
-                  "align-items": "center",
-                  "justify-content": "space-between",
-                  padding: "6px 0",
-                  "border-bottom": index() < writablePaths().length - 1 ? "1px solid var(--border-weak-base)" : "none",
-                }}
-              >
-                <span
+            <For each={writablePaths()}>
+              {(path, index) => (
+                <div
                   style={{
-                    "font-family": "var(--vscode-editor-font-family, monospace)",
-                    "font-size": "var(--kilo-font-size-12)",
+                    display: "flex",
+                    "align-items": "center",
+                    "justify-content": "space-between",
+                    padding: "6px 0",
+                    "border-bottom":
+                      index() < writablePaths().length - 1 ? "1px solid var(--border-weak-base)" : "none",
                   }}
                 >
-                  {path}
-                </span>
-                <IconButton size="small" variant="ghost" icon="close" onClick={() => removePath(index())} />
-              </div>
-            )}
-          </For>
-        </div>
-      </SettingsRow>
+                  <span
+                    style={{
+                      "font-family": "var(--vscode-editor-font-family, monospace)",
+                      "font-size": "var(--kilo-font-size-12)",
+                    }}
+                  >
+                    {path}
+                  </span>
+                  <IconButton size="small" variant="ghost" icon="close" onClick={() => removePath(index())} />
+                </div>
+              )}
+            </For>
+          </div>
+        </SettingsRow>
+      </div>
     </Card>
   )
 }
diff --git a/packages/opencode/test/kilocode/config/config.test.ts b/packages/opencode/test/kilocode/config/config.test.ts
index e405398721..467282a346 100644
--- a/packages/opencode/test/kilocode/config/config.test.ts
+++ b/packages/opencode/test/kilocode/config/config.test.ts
@@ -242,6 +242,41 @@ describe("kilocode indexing config", () => {
   })
 })
 
+describe("kilocode sandbox writable paths config", () => {
+  test("honors sandbox_writable_paths from global config only, ignoring project config", async () => {
+    await using globalTmp = await tmpdir()
+    await using tmp = await tmpdir({ git: true })
+
+    const prev = Global.Path.config
+    ;(Global.Path as { config: string }).config = globalTmp.path
+    await clear()
+    await disposeAllInstances()
+
+    try {
+      await writeConfig(globalTmp.path, {
+        $schema: "https://app.kilo.ai/config.json",
+        experimental: { sandbox_writable_paths: ["/tmp/global"] },
+      })
+      // A project kilo.json must not widen the sandbox: its writable paths are dropped at merge time.
+      await writeConfig(tmp.path, {
+        experimental: { sandbox_writable_paths: ["/tmp/project"] },
+      })
+
+      await provideTestInstance({
+        directory: tmp.path,
+        fn: async () => {
+          const config = await load()
+          expect(config.experimental?.sandbox_writable_paths).toEqual(["/tmp/global"])
+        },
+      })
+    } finally {
+      ;(Global.Path as { config: string }).config = prev
+      await clear()
+      await disposeAllInstances()
+    }
+  })
+})
+
 describe("custom provider model config", () => {
   test("persists and removes reasoning across a global config reload", async () => {
     await using globalTmp = await tmpdir()
diff --git a/packages/opencode/test/kilocode/sandbox/policy.test.ts b/packages/opencode/test/kilocode/sandbox/policy.test.ts
index 0352352699..240c1e1f38 100644
--- a/packages/opencode/test/kilocode/sandbox/policy.test.ts
+++ b/packages/opencode/test/kilocode/sandbox/policy.test.ts
@@ -234,4 +234,34 @@ describe("sandbox policy", () => {
     expect(roots(ctx)).not.toContain(dirs.approved)
     expect(Exit.isFailure(result)).toBe(true)
   })
+
+  test("makes configured extra writable paths writable while unlisted paths stay denied", async () => {
+    await using tmp = await fixture()
+    const dirs = tmp.extra
+    const ctx = context(dirs.a, dirs.a, dirs)
+    const policy = profile(ctx, "deny", [dirs.approved])
+    const result = await Effect.runPromise(
+      Effect.all({
+        extra: runSandbox(policy, assertWrite(path.join(dirs.approved, "allowed.txt")).pipe(Effect.exit)),
+        other: runSandbox(policy, assertWrite(path.join(dirs.b, "denied.txt")).pipe(Effect.exit)),
+      }),
+    )
+
+    expect(policy.filesystem.allowWrite.map((rule) => rule.path)).toContain(dirs.approved)
+    expect(roots(ctx)).not.toContain(dirs.approved)
+    expect(Exit.isSuccess(result.extra)).toBe(true)
+    expect(Exit.isFailure(result.other)).toBe(true)
+  })
+
+  test("keeps .git denied inside a configured extra writable path", async () => {
+    await using tmp = await fixture()
+    const dirs = tmp.extra
+    const ctx = context(dirs.a, dirs.a, dirs)
+    const policy = profile(ctx, "deny", [dirs.approved])
+    const result = await Effect.runPromise(
+      runSandbox(policy, assertWrite(path.join(dirs.approved, ".git", "config")).pipe(Effect.exit)),
+    )
+
+    expect(Exit.isFailure(result)).toBe(true)
+  })
 })

From d70977fd92dba79a52176a1a7ddaa4cd11a7de00 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 14:38:02 +0200
Subject: [PATCH 34/68] test: cover Kilo account selection defaults

---
 packages/kilo-gateway/src/index.ts            |  1 +
 packages/kilo-gateway/src/server/handlers.ts  | 36 +++++++----
 .../kilo-gateway/test/server/handlers.test.ts | 59 +++++++++++++++++++
 .../src/components/profile/ProfileView.tsx    |  8 +--
 .../components/dialog-kilo-auto-method.tsx    | 12 ++--
 .../server/httpapi/handlers/kilo-gateway.ts   | 16 ++---
 6 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 packages/kilo-gateway/test/server/handlers.test.ts

diff --git a/packages/kilo-gateway/src/index.ts b/packages/kilo-gateway/src/index.ts
index 850047c4dd..034902c614 100644
--- a/packages/kilo-gateway/src/index.ts
+++ b/packages/kilo-gateway/src/index.ts
@@ -75,6 +75,7 @@ export {
   getCloudSessions,
   getNotifications,
   getProfile,
+  resolveProfileOrganization,
   getToken,
   normalizeClawStatus,
   setOrganization,
diff --git a/packages/kilo-gateway/src/server/handlers.ts b/packages/kilo-gateway/src/server/handlers.ts
index ac8b5d2907..dc0a5424fd 100644
--- a/packages/kilo-gateway/src/server/handlers.ts
+++ b/packages/kilo-gateway/src/server/handlers.ts
@@ -36,6 +36,11 @@ export interface OrganizationDeps {
   dispose(): Promise<void>
 }
 
+export interface OrganizationResolution {
+  currentOrgId: string | null
+  persistOrgId: string | null
+}
+
 export interface CloudSessionsInput {
   cursor?: string
   limit?: number
@@ -64,6 +69,22 @@ export function getOrganizationId(auth: KiloAuth | undefined) {
   return undefined
 }
 
+export function resolveProfileOrganization(profile: KilocodeProfile, auth: Extract<KiloAuth, { type: "oauth" }>): OrganizationResolution {
+  const selected = profile.selectedOrganizationId
+  const orgs = profile.organizations ?? []
+  const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
+  const cloud = valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
+  if (auth.accountSelection === "manual" && (auth.accountId || profile.hasPersonalAccount !== false)) {
+    return { currentOrgId: auth.accountId ?? null, persistOrgId: null }
+  }
+
+  const local = auth.accountSelection === "cloud" ? undefined : auth.accountId
+  const currentOrgId = local ?? cloud ?? auth.accountId ?? null
+  const invalid = auth.accountSelection === "manual" && !auth.accountId && profile.hasPersonalAccount === false
+  const persistOrgId = currentOrgId && !local && (auth.accountSelection !== "manual" || invalid) && currentOrgId !== auth.accountId ? currentOrgId : null
+  return { currentOrgId, persistOrgId }
+}
+
 export async function getProfile(auth: AuthStore): Promise<KiloProfileResult> {
   const info = await auth.get("kilo")
   if (!info || info.type !== "oauth") throw new UnauthorizedError("Not authenticated with Kilo Gateway")
@@ -73,25 +94,20 @@ export async function getProfile(auth: AuthStore): Promise<KiloProfileResult> {
     fetchKiloPassState(info.access),
   ])
 
-  const selected = profile.selectedOrganizationId
-  const orgs = profile.organizations ?? []
-  const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
-  const cloud = valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
-  const local = info.accountSelection === "cloud" ? undefined : info.accountId
-  const currentOrgId = info.accountSelection === "manual" ? (info.accountId ?? null) : (local ?? cloud ?? info.accountId ?? null)
-  if (currentOrgId && !local && info.accountSelection !== "manual" && currentOrgId !== info.accountId) {
+  const org = resolveProfileOrganization(profile, info)
+  if (org.persistOrgId) {
     await auth.set("kilo", {
       type: "oauth",
       refresh: info.refresh,
       access: info.access,
       expires: info.expires,
-      accountId: currentOrgId,
+      accountId: org.persistOrgId,
       accountSelection: "cloud",
     }).catch((err) => console.warn("Failed to persist cloud account selection:", err))
   }
 
-  const balance = await fetchBalance(info.access, currentOrgId ?? undefined)
-  return { profile, balance, kiloPass, currentOrgId }
+  const balance = await fetchBalance(info.access, org.currentOrgId ?? undefined)
+  return { profile, balance, kiloPass, currentOrgId: org.currentOrgId }
 }
 
 export async function getNotifications(auth: AuthStore) {
diff --git a/packages/kilo-gateway/test/server/handlers.test.ts b/packages/kilo-gateway/test/server/handlers.test.ts
new file mode 100644
index 0000000000..0b888c9ca8
--- /dev/null
+++ b/packages/kilo-gateway/test/server/handlers.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, test } from "bun:test"
+import { resolveProfileOrganization, type KiloAuth } from "../../src/server/handlers.js"
+import type { KilocodeProfile } from "../../src/types.js"
+
+const oauth = (input: Partial<Extract<KiloAuth, { type: "oauth" }>> = {}): Extract<KiloAuth, { type: "oauth" }> => ({
+  type: "oauth",
+  access: "token",
+  refresh: "token",
+  expires: 1,
+  ...input,
+})
+
+const profile = (input: Partial<KilocodeProfile> = {}): KilocodeProfile => ({
+  email: "user@example.com",
+  organizations: [{ id: "org_1", name: "Acme", role: "MEMBER" }],
+  ...input,
+})
+
+describe("resolveProfileOrganization", () => {
+  test("uses cloud selected organization only when no local selection exists", () => {
+    expect(resolveProfileOrganization(profile({ selectedOrganizationId: "org_1" }), oauth())).toEqual({
+      currentOrgId: "org_1",
+      persistOrgId: "org_1",
+    })
+  })
+
+  test("preserves a manual organization selection over the cloud default", () => {
+    expect(
+      resolveProfileOrganization(
+        profile({
+          selectedOrganizationId: "org_1",
+          organizations: [
+            { id: "org_1", name: "Acme", role: "MEMBER" },
+            { id: "org_2", name: "Beta", role: "MEMBER" },
+          ],
+        }),
+        oauth({ accountId: "org_2", accountSelection: "manual" }),
+      ),
+    ).toEqual({ currentOrgId: "org_2", persistOrgId: null })
+  })
+
+  test("preserves explicit personal selection when personal is available", () => {
+    expect(
+      resolveProfileOrganization(
+        profile({ selectedOrganizationId: "org_1", hasPersonalAccount: true }),
+        oauth({ accountSelection: "manual" }),
+      ),
+    ).toEqual({ currentOrgId: null, persistOrgId: null })
+  })
+
+  test("uses the first organization when personal is unavailable and no valid cloud selection exists", () => {
+    expect(
+      resolveProfileOrganization(
+        profile({ selectedOrganizationId: "missing", hasPersonalAccount: false }),
+        oauth({ accountSelection: "manual" }),
+      ),
+    ).toEqual({ currentOrgId: "org_1", persistOrgId: "org_1" })
+  })
+})
diff --git a/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
index bed2bfbc98..436784c75c 100644
--- a/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
@@ -44,6 +44,8 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
   const language = useLanguage()
   const [target, setTarget] = createSignal<string | null>(null)
 
+  const personal = createMemo(() => props.profileData?.profile.hasPersonalAccount !== false)
+
   // Always fetch fresh profile+balance when navigating to this view
   onMount(() => {
     vscode.postMessage({ type: "refreshProfile" })
@@ -58,16 +60,14 @@ const ProfileView: Component<ProfileViewProps> = (props) => {
   const orgOptions = createMemo<OrgOption[]>(() => {
     const orgs = props.profileData?.profile.organizations ?? []
     if (orgs.length === 0) return []
-    const personal = props.profileData?.profile.hasPersonalAccount !== false
     return [
-      ...(personal ? [{ value: PERSONAL, label: language.t("profile.personalAccount") }] : []),
+      ...(personal() ? [{ value: PERSONAL, label: language.t("profile.personalAccount") }] : []),
       ...orgs.map((org) => ({ value: org.id, label: org.name, description: org.role })),
     ]
   })
 
   const currentId = createMemo(() => {
-    const personal = props.profileData?.profile.hasPersonalAccount !== false
-    return props.profileData?.currentOrgId ?? (personal ? PERSONAL : orgOptions()[0]?.value)
+    return props.profileData?.currentOrgId ?? (personal() ? PERSONAL : orgOptions()[0]?.value)
   })
 
   const switching = createMemo(() => {
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
index 533571d02e..239ea52eec 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
@@ -83,12 +83,12 @@ export function KiloAutoMethod(props: KiloAutoMethodProps) {
         await sync.bootstrap()
 
         dialog.replace(() => (
-            <DialogKiloOrganization
-              organizations={profile.organizations!}
-              userEmail={profile.email}
-              providerID={props.providerID}
-              hasPersonalAccount={profile.hasPersonalAccount !== false}
-              useSDK={props.useSDK}
+          <DialogKiloOrganization
+            organizations={profile.organizations!}
+            userEmail={profile.email}
+            providerID={props.providerID}
+            hasPersonalAccount={profile.hasPersonalAccount !== false}
+            useSDK={props.useSDK}
             useTheme={props.useTheme}
             DialogModel={props.DialogModel}
           />
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
index bd610d3595..7e4d9968c3 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
@@ -7,6 +7,7 @@ import {
   getToken,
   importSessionToDb,
   normalizeClawStatus,
+  resolveProfileOrganization,
 } from "@kilocode/kilo-gateway"
 import {
   HEADER_FEATURE,
@@ -76,28 +77,23 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
         catch: () => new HttpApiError.BadRequest({}),
       })
 
-      const selected = profile.selectedOrganizationId
-      const orgs = profile.organizations ?? []
-      const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
-      const cloud = valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
-      const local = info.accountSelection === "cloud" ? undefined : info.accountId
-      const currentOrgId = info.accountSelection === "manual" ? (info.accountId ?? null) : (local ?? cloud ?? info.accountId ?? null)
-      if (currentOrgId && !local && info.accountSelection !== "manual" && currentOrgId !== info.accountId) {
+      const org = resolveProfileOrganization(profile, info)
+      if (org.persistOrgId) {
         yield* auth.set("kilo", {
           type: "oauth",
           refresh: info.refresh,
           access: info.access,
           expires: info.expires,
-          accountId: currentOrgId,
+          accountId: org.persistOrgId,
           accountSelection: "cloud",
         }).pipe(Effect.catch((err) => Effect.sync(() => log.warn("failed to persist cloud account selection", { err }))))
       }
 
       const balance = yield* Effect.tryPromise({
-        try: () => fetchBalance(info.access, currentOrgId ?? undefined),
+        try: () => fetchBalance(info.access, org.currentOrgId ?? undefined),
         catch: () => new HttpApiError.BadRequest({}),
       })
-      return { profile, balance, kiloPass, currentOrgId }
+      return { profile, balance, kiloPass, currentOrgId: org.currentOrgId }
     })
 
     const authStatus = Effect.fn("KiloGatewayHttpApi.authStatus")(function* () {

From 21848889cdee0f0e485780bd2fd97be1cc68ef61 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 14:41:05 +0200
Subject: [PATCH 35/68] feat(vscode): render read-tool images inline in chat
 view

The read tool already produces base64 data URL attachments for image
files and threads them through SSE into the webview part store, but the
tool renderer never received them. Thread part.state.attachments into
ToolProps and render image attachments inline below the read tool card,
reusing the existing user-attachment image pattern with click-to-open
preview. No backend, schema, or SDK changes needed.
---
 .changeset/inline-read-images.md              |  5 ++++
 .../kilo-ui/src/components/message-part.css   | 29 +++++++++++++++++++
 .../kilo-ui/src/components/message-part.tsx   | 25 ++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 .changeset/inline-read-images.md

diff --git a/.changeset/inline-read-images.md b/.changeset/inline-read-images.md
new file mode 100644
index 0000000000..7d4a511f0d
--- /dev/null
+++ b/.changeset/inline-read-images.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Render images inline in the chat view when the agent reads an image file. Images appear below the read tool card and can be clicked to open a full-size preview.
diff --git a/packages/kilo-ui/src/components/message-part.css b/packages/kilo-ui/src/components/message-part.css
index 5a3fd732da..d55bc2c4ce 100644
--- a/packages/kilo-ui/src/components/message-part.css
+++ b/packages/kilo-ui/src/components/message-part.css
@@ -412,6 +412,35 @@ html[data-theme="kilo-vscode"] [data-component="bash-output"] {
   margin-bottom: 0px;
 }
 
+[data-slot="tool-read-images"] {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  padding-top: 8px;
+  max-width: min(100%, 64ch);
+}
+
+[data-slot="tool-read-image"] {
+  max-width: 200px;
+  max-height: 200px;
+  border-radius: var(--radius-sm, 6px);
+  overflow: hidden;
+  border: 1px solid var(--border-weak-base);
+  cursor: pointer;
+  transition: border-color 0.15s ease;
+
+  &:hover {
+    border-color: var(--border-strong-base);
+  }
+}
+
+[data-slot="tool-read-image-img"] {
+  display: block;
+  max-width: 100%;
+  max-height: 200px;
+  object-fit: contain;
+}
+
 [data-component="todos"] {
   [data-slot="message-part-todo-hidden"] {
     padding: 2px 0 2px 28px;
diff --git a/packages/kilo-ui/src/components/message-part.tsx b/packages/kilo-ui/src/components/message-part.tsx
index 7fca610608..a5ab17ed51 100644
--- a/packages/kilo-ui/src/components/message-part.tsx
+++ b/packages/kilo-ui/src/components/message-part.tsx
@@ -995,6 +995,7 @@ export interface ToolProps {
   callID?: string
   output?: string
   status?: string
+  attachments?: FilePart[]
   hideDetails?: boolean
   defaultOpen?: boolean
   forceOpen?: boolean
@@ -1243,6 +1244,8 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
               // @ts-expect-error
               output={part.state.output}
               status={part.state.status}
+              // @ts-expect-error
+              attachments={part.state.attachments}
               hideDetails={props.hideDetails}
               defaultOpen={props.defaultOpen}
               animate
@@ -1746,6 +1749,7 @@ ToolRegistry.register({
   render(props) {
     const data = useData()
     const i18n = useI18n()
+    const dialog = useDialog()
     const args: string[] = []
     if (props.input.offset) args.push("offset=" + props.input.offset)
     if (props.input.limit) args.push("limit=" + props.input.limit)
@@ -1755,6 +1759,10 @@ ToolRegistry.register({
       return value.filter((p): p is string => typeof p === "string")
     })
     const pending = createMemo(() => busy(props.status))
+    const images = createMemo(() =>
+      (props.attachments ?? []).filter((f) => f.mime.startsWith("image/") && f.url),
+    )
+    const preview = (url: string, alt?: string) => dialog.show(() => <ImagePreview src={url} alt={alt} />)
     return (
       <>
         <BasicTool
@@ -1783,6 +1791,23 @@ ToolRegistry.register({
             />
           )}
         </For>
+        <Show when={images().length > 0}>
+          <div data-slot="tool-read-images">
+            <For each={images()}>
+              {(file) => (
+                <div data-slot="tool-read-image" onClick={() => preview(file.url, file.filename)}>
+                  <img
+                    data-slot="tool-read-image-img"
+                    src={file.url}
+                    alt={file.filename ?? i18n.t("ui.message.attachment.alt")}
+                    loading="lazy"
+                    decoding="async"
+                  />
+                </div>
+              )}
+            </For>
+          </div>
+        </Show>
       </>
     )
   },

From 0ab3702cf706bd2b50dc528871f773a0182cca0d Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 14:35:14 +0200
Subject: [PATCH 36/68] fix(vscode): render variant dropdown story inline for
 visual regression

The dialog.show() approach portaled the dialog to document.body (outside
#storybook-root), and Kobalte's modal set aria-hidden on #storybook-root,
causing Playwright's toHaveScreenshot to time out (element not visible).

Replace with an inline fixture that reproduces the real CSS clipping chain:
.am-nv-dialog > .am-nv-dialog-content > .am-prompt-input-container (position:
relative, overflow: hidden from agent-manager.css) with the real inline
ThinkingSelectorBase (portal={false}). The variant picker opens upward; with
the overflow escape fix the popover renders fully above the container, without
it floating-ui repositions the popover lower. The screenshot baseline captures
the fixed state and catches any regression.
---
 .../src/stories/agent-manager.stories.tsx     | 70 +++++++++++++------
 1 file changed, 48 insertions(+), 22 deletions(-)

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 b35303e127..4f2aef6e2d 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
@@ -10,8 +10,6 @@ import { FileTree } from "../../diff-viewer/FileTree"
 import { DiffPanel } from "../../agent-manager/DiffPanel"
 import { FullScreenDiffView } from "../../diff-viewer/FullScreenDiffView"
 import { WorktreeItem } from "../../agent-manager/WorktreeItem"
-import { NewWorktreeDialog } from "../../agent-manager/NewWorktreeDialog"
-import { useDialog } from "@kilocode/kilo-ui/context/dialog"
 import { ChatView } from "../components/chat/ChatView"
 import { registerVscodeToolOverrides } from "../components/chat/VscodeToolOverrides"
 import { SessionContext } from "../context/session"
@@ -25,6 +23,7 @@ import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
 import { ContextMenu } from "@kilocode/kilo-ui/context-menu"
+import { ThinkingSelectorBase } from "../components/shared/ThinkingSelector"
 import { createSignal, onCleanup, onMount, type JSX } from "solid-js"
 import type { WorktreeFileDiff, WorktreeState, WorktreeGitStats, PRStatus } from "../types/messages"
 import type { ReviewComment } from "../../diff-viewer/review-comments"
@@ -932,40 +931,67 @@ export const TabBarSingleTab: Story = {
 }
 
 // ---------------------------------------------------------------------------
-// NewWorktreeDialog — variant dropdown must escape the dialog scroll containers
-// (regression: inline popovers were clipped by .am-nv-dialog-content overflow)
+// NewWorktreeDialog — inline selector popovers must escape the dialog scroll
+// containers. Regression: the reasoning-variant and mode pickers were clipped
+// by .am-nv-dialog-content (overflow-y: auto) and .am-prompt-input-container
+// (overflow: hidden) because the overflow escape hatch only covered the model
+// picker. This fixture reproduces the real clipping chain (same CSS classes +
+// the real inline ThinkingSelectorBase with portal={false}) so a screenshot
+// baseline catches any future regression. Rendered inline (no dialog portal)
+// because the visual-regression harness screenshots #storybook-root.
 // ---------------------------------------------------------------------------
 
-const NewWorktreeVariantOpener = () => {
-  const dialog = useDialog()
+const VariantPickerOpener = () => {
+  let frame = 0
+  let attempts = 0
   const open = () => {
     if (document.querySelector("[data-component='popover-content']")) return
+    if (attempts++ >= 120) return
     window.dispatchEvent(new CustomEvent("openVariantPicker"))
-    requestAnimationFrame(open)
+    frame = requestAnimationFrame(open)
   }
   onMount(() => {
-    dialog.show(() => <NewWorktreeDialog onClose={() => {}} />)
-    requestAnimationFrame(open)
+    frame = requestAnimationFrame(open)
   })
+  onCleanup(() => cancelAnimationFrame(frame))
   return null
 }
 
 export const NewWorktreeVariantDropdown1280: Story = {
   name: "NewWorktreeDialog — variant dropdown open",
   parameters: { layout: "fullscreen" },
-  render: () => {
-    const session = {
-      ...mockSessionValue(),
-      configModel: () => ({ providerID: "kilo", modelID: "anthropic/claude-sonnet-4-6" }),
-    }
-    return (
-      <StoryProviders noPadding>
-        <SessionContext.Provider value={session as any}>
-          <NewWorktreeVariantOpener />
-        </SessionContext.Provider>
-      </StoryProviders>
-    )
-  },
+  render: () => (
+    <StoryProviders noPadding>
+      {/* Filler pushes the prompt container to the bottom of the dialog content.
+          The variant popover opens upward from the trigger, extending above the
+          container's top edge. Without the overflow escape fix, .am-prompt-input-container
+          (overflow: hidden + position: relative) clips the top of the popover. */}
+      <div style={{ height: "100vh", display: "flex", "flex-direction": "column" }}>
+        <div class="am-nv-dialog">
+          <div class="am-nv-dialog-content">
+            <div style={{ height: "500px", "flex-shrink": 0 }} />
+            <div
+              class="prompt-input-container am-prompt-input-container"
+              style={{ position: "relative", "flex-shrink": 0 }}
+            >
+              <div class="prompt-input-hint">
+                <div class="prompt-input-hint-selectors">
+                  <ThinkingSelectorBase
+                    variants={["low", "medium", "high"]}
+                    value="low"
+                    onSelect={() => {}}
+                    portal={false}
+                    deferDismiss
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <VariantPickerOpener />
+    </StoryProviders>
+  ),
 }
 
 const searchSection = { id: "polish", name: "Polish", color: "Blue", order: 0, collapsed: false }

From 62c41e21c6cff2ef9686de5ef678de33173c54bc Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 08:48:21 -0400
Subject: [PATCH 37/68] fix(jetbrains): prune old CLI binaries from the
 download cache

Each pinned CLI version was cached under the IDE system dir forever, so old versions accumulated across plugin updates. After a version resolves successfully, delete every other cached version and drop the downloaded archive after extraction. Reinstall still deletes and re-downloads the active version.
---
 .changeset/jetbrains-prune-old-cli.md         |  5 ++
 .../kilocode/backend/cli/KiloCliDownloader.kt | 22 +++++++++
 .../backend/cli/KiloCliDownloaderTest.kt      | 46 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 .changeset/jetbrains-prune-old-cli.md

diff --git a/.changeset/jetbrains-prune-old-cli.md b/.changeset/jetbrains-prune-old-cli.md
new file mode 100644
index 0000000000..07600c3f7e
--- /dev/null
+++ b/.changeset/jetbrains-prune-old-cli.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Remove old JetBrains CLI binaries so they no longer accumulate in the IDE cache. Only the active version is kept, the downloaded archive is deleted after extraction, and reinstalling re-downloads a fresh binary.
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
index f7a6e06381..b50204f2ed 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -51,6 +51,7 @@ class KiloCliDownloader(
             if (!force && exe.isFile && cached != null && cached.matches(DIGEST)) {
                 log.info("Using cached Kilo CLI $version for $platform at ${exe.absolutePath}")
                 if (!SystemInfo.isWindows) exe.setExecutable(true)
+                prune(version)
                 return@withContext exe
             }
 
@@ -75,8 +76,12 @@ class KiloCliDownloader(
             extract(archive, dir)
             if (!exe.isFile) throw IllegalStateException("Downloaded CLI archive did not contain bin/${KiloCliPlatform.exe()}")
             if (!SystemInfo.isWindows) exe.setExecutable(true)
+            if (archive.exists() && !archive.delete()) {
+                log.warn("Failed to delete extracted Kilo CLI archive ${archive.absolutePath}")
+            }
             done.writeText("$digest\n")
             onProgress(CliDownload(100, version, platform))
+            prune(version)
             exe
         }
 
@@ -223,6 +228,23 @@ class KiloCliDownloader(
         }
     }
 
+    /**
+     * Delete every cached CLI version under [root] except [keep]. Each plugin update pins a new
+     * CLI version, so without this old versions would accumulate in the IDE system directory
+     * indefinitely. Runs only after the active version resolved successfully so a failed download
+     * never wipes the last working copy.
+     */
+    private fun prune(keep: String) {
+        val entries = root.listFiles() ?: return
+        for (entry in entries) {
+            if (!entry.isDirectory || entry.name == keep) continue
+            log.info("Removing stale Kilo CLI version ${entry.absolutePath}")
+            if (!entry.deleteRecursively()) {
+                log.warn("Failed to remove stale Kilo CLI version ${entry.absolutePath}")
+            }
+        }
+    }
+
     private fun url(version: String, platform: String, ext: String) =
         "${baseUrl.trimEnd('/')}/v$version/kilo-$platform.$ext"
 }
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
index 6a2e94bc02..b2cc0369ef 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
@@ -87,6 +87,52 @@ class KiloCliDownloaderTest {
         }
     }
 
+    @Test
+    fun `prunes stale versions and removes the extracted archive`() = runBlocking {
+        MockWebServer().use { server ->
+            val stale = File(File(dir, "0.0.1"), KiloCliPlatform.current())
+            assertTrue(stale.mkdirs())
+            File(stale, "leftover").writeText("old")
+
+            val bytes = archive()
+            server.enqueue(metadata(bytes))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
+            val cli = KiloCliDownloader(
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
+            ).resolve("1.2.3")
+
+            assertTrue(cli.isFile)
+            assertFalse(File(dir, "0.0.1").exists())
+            val archived = File(cli.parentFile.parentFile, "kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}")
+            assertFalse(archived.exists())
+        }
+    }
+
+    @Test
+    fun `forced resolve re-downloads and keeps only the active version`() = runBlocking {
+        MockWebServer().use { server ->
+            val bytes = archive()
+            repeat(2) {
+                server.enqueue(metadata(bytes))
+                server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
+            }
+            val cli = KiloCliDownloader(
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
+            )
+            cli.resolve("1.2.3")
+            assertEquals(2, server.requestCount)
+
+            val forced = cli.resolve("1.2.3", force = true)
+            assertTrue(forced.isFile)
+            assertEquals(4, server.requestCount)
+            assertEquals(listOf("1.2.3"), dir.listFiles()?.filter { it.isDirectory }?.map { it.name })
+        }
+    }
+
     @Test
     fun `rejects cli archive with mismatched digest`() = runBlocking {
         MockWebServer().use { server ->

From a659bb2571bd5f7b52eceadbb42a975fe31aa7c1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 12:50:04 +0000
Subject: [PATCH 38/68] chore: update kilo-vscode visual regression baselines

---
 .../new-worktree-variant-dropdown-1280-chromium-linux.png      | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/new-worktree-variant-dropdown-1280-chromium-linux.png

diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/new-worktree-variant-dropdown-1280-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/new-worktree-variant-dropdown-1280-chromium-linux.png
new file mode 100644
index 0000000000..2b594d86ac
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/new-worktree-variant-dropdown-1280-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f7edbc1bf6f10260626bf21406bb02e32dc17bf969c83e8b56251c50f755a1f
+size 7737

From bd29b94d20bb6639d55f6ac009c793f6e313030d Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 08:52:25 -0400
Subject: [PATCH 39/68] fix(jetbrains): report exact CLI release resolution
 failure

The collapsed metadata lookup threw a misleading "did not include" error whether the asset was absent, had no digest, or had a malformed digest. Split into distinct, logged messages so the actual cause is clear, including the nullable-digest case where GitHub has not published a checksum.
---
 .../kilocode/backend/cli/KiloCliDownloader.kt | 21 +++++++--
 .../backend/cli/KiloCliDownloaderTest.kt      | 46 +++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
index b50204f2ed..269331e13c 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -85,6 +85,11 @@ class KiloCliDownloader(
             exe
         }
 
+    private fun fail(message: String): Nothing {
+        log.warn(message)
+        throw IllegalStateException(message)
+    }
+
     private fun asset(version: String, platform: String, ext: String): String {
         val name = "kilo-$platform.$ext"
         val url = "${api.trimEnd('/')}/v$version"
@@ -112,12 +117,18 @@ class KiloCliDownloader(
             log.debug { "GitHub metadata OK for Kilo CLI $version (${rate(response)})" }
             val body = response.body?.string()
                 ?: throw IllegalStateException("Failed to fetch Kilo CLI release metadata for $version: empty response body")
-            val digest = JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
-                ?.firstOrNull { it.jsonObject["name"]?.jsonPrimitive?.contentOrNull == name }
-                ?.jsonObject?.get("digest")?.jsonPrimitive?.contentOrNull
-                ?: throw IllegalStateException("Kilo CLI release $version did not include $name")
+            val assets = JSON.parseToJsonElement(body).jsonObject["assets"]?.jsonArray
+            val entry = assets?.firstOrNull { it.jsonObject["name"]?.jsonPrimitive?.contentOrNull == name }
+            if (entry == null) {
+                val names = assets?.mapNotNull { it.jsonObject["name"]?.jsonPrimitive?.contentOrNull }?.joinToString(", ")
+                fail("Kilo CLI release $version has no asset named $name (available assets: ${names ?: "none"})")
+            }
+            val digest = entry.jsonObject["digest"]?.jsonPrimitive?.contentOrNull
+            if (digest == null) {
+                fail("Kilo CLI release $version asset $name has no digest yet; GitHub has not published a SHA-256 checksum for it")
+            }
             if (!digest.matches(DIGEST)) {
-                throw IllegalStateException("Kilo CLI release $version asset $name has invalid digest")
+                fail("Kilo CLI release $version asset $name has a malformed digest '$digest'; expected sha256:<64 hex chars>")
             }
             return digest
         }
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
index b2cc0369ef..face684e5f 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
@@ -153,6 +153,52 @@ class KiloCliDownloaderTest {
         }
     }
 
+    @Test
+    fun `fails clearly and logs when the release has no matching asset`() = runBlocking {
+        MockWebServer().use { server ->
+            server.enqueue(
+                MockResponse().setResponseCode(200).setBody(
+                    """{"assets":[{"name":"other.zip","digest":"sha256:${"a".repeat(64)}"}]}"""
+                )
+            )
+            val log = TestLog()
+            val ex = assertFailsWith<IllegalStateException> {
+                KiloCliDownloader(
+                    log = log,
+                    root = dir,
+                    baseUrl = server.url("/release").toString(),
+                    api = server.url("/api").toString(),
+                ).resolve("1.2.3")
+            }
+            val name = "kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}"
+            assertContains(ex.message.orEmpty(), "has no asset named $name")
+            assertContains(ex.message.orEmpty(), "other.zip")
+            assertTrue(log.messages.any { it.contains("has no asset named $name") })
+        }
+    }
+
+    @Test
+    fun `fails clearly and logs when the asset has no digest`() = runBlocking {
+        MockWebServer().use { server ->
+            server.enqueue(
+                MockResponse().setResponseCode(200).setBody(
+                    """{"assets":[{"name":"kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}"}]}"""
+                )
+            )
+            val log = TestLog()
+            val ex = assertFailsWith<IllegalStateException> {
+                KiloCliDownloader(
+                    log = log,
+                    root = dir,
+                    baseUrl = server.url("/release").toString(),
+                    api = server.url("/api").toString(),
+                ).resolve("1.2.3")
+            }
+            assertContains(ex.message.orEmpty(), "has no digest yet")
+            assertTrue(log.messages.any { it.contains("has no digest yet") })
+        }
+    }
+
     @Test
     fun `reports github api rate limits while resolving metadata`() = runBlocking {
         MockWebServer().use { server ->

From b0348cbc01438f603f767117ca6f2e15370e099e Mon Sep 17 00:00:00 2001
From: Johnny Eric Amancio <johnnyeric@gmail.com>
Date: Tue, 7 Jul 2026 15:44:24 +0200
Subject: [PATCH 40/68] feat(vscode): integrate project memory into the
 extension (#11954)

* feat(vscode): integrate project memory into the extension

Wire the kilo-memory system into the VS Code extension host and webview,
building on the shared client helpers and /memory command catalog in
@kilocode/kilo-memory.

Extension host:
- KiloProviderMemory bridges the SDK memory client (status/show/enable/
  disable/configure/rebuild/remember/correct/forget/purge, plus status
  and edit) with serialized operations and a small per-directory cache
- memory.status/updated/error events fan out to the active and tracked
  sessions and refresh the webview
- showMemory / toggleMemory commands, routed through the sidebar provider
  or the Agent Manager panel depending on which is active

Webview:
- MemoryProvider context, memory status controls in the Context settings
  tab, task-header and assistant-message affordances, and the /memory
  prompt command (help/show/operation) driven by the shared catalog
- message types and i18n strings across all locales

* fix(vscode): address memory PR review suggestions

- serialize toggleMemory's status pre-check via KiloProviderMemory.toggle()
  so rapid toggles can't double-apply the same operation
- collapse duplicate enabled/active memos in memory context
- extract shared formatCompactCount util (was triplicated K/M formatter)
- drop dead reject handler in serial() and never-produced member from
  MemoryOperationResultMessage.result union

* fix(memory): audit cleanups: inspect accuracy, shared marker decoder, dead i18n key

* chore: update kilo-vscode visual regression baselines

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/kilo-memory-vscode.md              |   5 +
 bun.lock                                      |   1 +
 ...task-header-with-memory-chromium-linux.png |   3 +
 packages/kilo-memory/src/marker-meta.ts       |   5 +-
 packages/kilo-memory/test/decisions.test.ts   |  14 +
 packages/kilo-vscode/package.json             |  11 +
 packages/kilo-vscode/src/KiloProvider.ts      |  77 +++
 .../src/agent-manager/AgentManagerProvider.ts |  60 ++-
 .../kilo-vscode/src/agent-manager/host.ts     |   2 +
 .../src/agent-manager/vscode-host.ts          |   2 +
 packages/kilo-vscode/src/extension.ts         |  20 +
 .../kilo-vscode/src/kilo-provider/memory.ts   | 483 ++++++++++++++++++
 .../kilo-vscode/tests/setup/vscode-mock.ts    |   6 +
 .../agent-manager-memory-commands.test.ts     | 102 ++++
 .../unit/kilo-provider-memory-events.test.ts  | 183 +++++++
 .../tests/unit/kilo-provider-memory.test.ts   | 212 ++++++++
 .../tests/unit/memory-command.test.ts         |  68 +++
 .../agent-manager/AgentManagerApp.tsx         |  17 +-
 packages/kilo-vscode/webview-ui/src/App.tsx   |  13 +-
 .../src/components/chat/AssistantMessage.tsx  |  64 +++
 .../src/components/chat/ContextProgress.tsx   |   7 +-
 .../src/components/chat/PromptInput.tsx       |  55 ++
 .../src/components/chat/TaskHeader.tsx        |  77 +++
 .../src/components/chat/TaskUsage.tsx         |   7 +-
 .../src/components/settings/ContextTab.tsx    |  80 ++-
 .../webview-ui/src/context/memory.tsx         | 220 ++++++++
 .../kilo-vscode/webview-ui/src/i18n/ar.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/br.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/bs.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/da.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/de.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/en.ts     |  36 ++
 .../kilo-vscode/webview-ui/src/i18n/es.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/fr.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/it.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/ja.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/ko.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/nl.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/no.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/pl.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/ru.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/th.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/tr.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/uk.ts     |  37 ++
 .../kilo-vscode/webview-ui/src/i18n/zh.ts     |  36 ++
 .../kilo-vscode/webview-ui/src/i18n/zht.ts    |  36 ++
 .../webview-ui/src/stories/StoryProviders.tsx |  51 +-
 .../webview-ui/src/stories/chat.stories.tsx   |  47 ++
 .../webview-ui/src/styles/chat-layout.css     |   8 +
 .../webview-ui/src/styles/task-header.css     |  36 ++
 .../src/types/messages/extension-messages.ts  |   4 +
 .../webview-ui/src/types/messages/index.ts    |   1 +
 .../webview-ui/src/types/messages/memory.ts   | 103 ++++
 .../src/types/messages/webview-messages.ts    |   5 +
 .../webview-ui/src/utils/format.ts            |   8 +
 .../webview-ui/src/utils/memory-command.ts    |  11 +
 56 files changed, 2752 insertions(+), 53 deletions(-)
 create mode 100644 .changeset/kilo-memory-vscode.md
 create mode 100644 packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png
 create mode 100644 packages/kilo-vscode/src/kilo-provider/memory.ts
 create mode 100644 packages/kilo-vscode/tests/unit/agent-manager-memory-commands.test.ts
 create mode 100644 packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts
 create mode 100644 packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts
 create mode 100644 packages/kilo-vscode/tests/unit/memory-command.test.ts
 create mode 100644 packages/kilo-vscode/webview-ui/src/context/memory.tsx
 create mode 100644 packages/kilo-vscode/webview-ui/src/types/messages/memory.ts
 create mode 100644 packages/kilo-vscode/webview-ui/src/utils/format.ts
 create mode 100644 packages/kilo-vscode/webview-ui/src/utils/memory-command.ts

diff --git a/.changeset/kilo-memory-vscode.md b/.changeset/kilo-memory-vscode.md
new file mode 100644
index 0000000000..6dc668d915
--- /dev/null
+++ b/.changeset/kilo-memory-vscode.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Integrate project memory into the VS Code extension: memory status and controls in the Context settings tab, task-header and assistant-message affordances, the `/memory` prompt command, and Show/Toggle Project Memory command-palette entries.
diff --git a/bun.lock b/bun.lock
index a1f8b9ef20..e0c5b1329c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -338,6 +338,7 @@
         "@kilocode/kilo-gateway": "workspace:*",
         "@kilocode/kilo-i18n": "workspace:*",
         "@kilocode/kilo-indexing": "workspace:*",
+        "@kilocode/kilo-memory": "workspace:*",
         "@kilocode/kilo-ui": "workspace:*",
         "@kilocode/plugin": "workspace:*",
         "@kilocode/sdk": "workspace:*",
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png
new file mode 100644
index 0000000000..1ae814a650
--- /dev/null
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92cf06c01b19386f2041e378a08afdaf880fdc5c3e19132350fbda05684dbeec
+size 5775
diff --git a/packages/kilo-memory/src/marker-meta.ts b/packages/kilo-memory/src/marker-meta.ts
index 727b147da4..b2db71714f 100644
--- a/packages/kilo-memory/src/marker-meta.ts
+++ b/packages/kilo-memory/src/marker-meta.ts
@@ -20,6 +20,7 @@ export namespace MemoryMarkerMeta {
     type: Type
     tokens: number
     count: number
+    files: string[]
   }
 
   export function metadata(marker: Info) {
@@ -30,7 +31,6 @@ export namespace MemoryMarkerMeta {
         tokens: marker.tokens,
         count: marker.count,
         files: marker.files,
-        sources: marker.files,
       },
     }
   }
@@ -89,13 +89,14 @@ export namespace MemoryMarkerMeta {
       const value = meta as { type?: unknown; tokens?: unknown; count?: unknown; files?: unknown; sources?: unknown }
       const type = value.type === "startup" ? "startup" : "recall"
       const tokens = typeof value.tokens === "number" ? value.tokens : 0
+      // `sources` fallback covers parts persisted before the key was dropped from metadata().
       const files = Array.isArray(value.files)
         ? value.files.filter((item) => typeof item === "string")
         : Array.isArray(value.sources)
           ? value.sources.filter((item) => typeof item === "string")
           : []
       const count = typeof value.count === "number" ? value.count : files.length
-      return { type, tokens, count }
+      return { type, tokens, count, files }
     }
     return undefined
   }
diff --git a/packages/kilo-memory/test/decisions.test.ts b/packages/kilo-memory/test/decisions.test.ts
index f75731af0d..c5eb563ebd 100644
--- a/packages/kilo-memory/test/decisions.test.ts
+++ b/packages/kilo-memory/test/decisions.test.ts
@@ -162,6 +162,20 @@ describe("memory marker metadata", () => {
       type: "recall",
       tokens: 4,
       count: 2,
+      files: ["project.md", "environment.md"],
+    })
+  })
+
+  test("decodes legacy metadata that only carries sources", () => {
+    expect(
+      MemoryMarkerMeta.fromParts([
+        { type: "text", metadata: { kiloMemory: { type: "startup", tokens: 3, sources: ["project.md"] } } },
+      ]),
+    ).toEqual({
+      type: "startup",
+      tokens: 3,
+      count: 1,
+      files: ["project.md"],
     })
   })
 
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index ada2fcae6a..b24e746306 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -195,6 +195,16 @@
         "title": "Migrate Settings from Legacy Version",
         "category": "Kilo Code"
       },
+      {
+        "command": "kilo-code.new.showMemory",
+        "title": "Show Project Memory",
+        "category": "Kilo Code"
+      },
+      {
+        "command": "kilo-code.new.toggleMemory",
+        "title": "Toggle Project Memory",
+        "category": "Kilo Code"
+      },
       {
         "command": "kilo-code.new.autocomplete.generateSuggestions",
         "title": "Generate Suggested Edits",
@@ -1147,6 +1157,7 @@
     "@kilocode/kilo-gateway": "workspace:*",
     "@kilocode/kilo-i18n": "workspace:*",
     "@kilocode/kilo-indexing": "workspace:*",
+    "@kilocode/kilo-memory": "workspace:*",
     "@kilocode/kilo-ui": "workspace:*",
     "@kilocode/plugin": "workspace:*",
     "@kilocode/sdk": "workspace:*",
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index 8358930f05..f9199c6e22 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -138,6 +138,7 @@ import {
 import { fetchAndSendPendingSuggestions } from "./kilo-provider/handlers/suggestion"
 import { nativeTitle } from "./kilo-provider/native-tab-title"
 import { parseReview, reviewMetadata, type ReviewMessageData } from "./shared/review-comments"
+import { KiloProviderMemory } from "./kilo-provider/memory"
 
 import {
   buildActionContext,
@@ -386,6 +387,14 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   private readonly confirmations = new MessageConfirmation()
   private readonly costs = new MaxCostNudge()
   private readonly activeAlerts = new Map<string, number>() // sid -> limit currently shown in UI
+  private readonly memory = new KiloProviderMemory({
+    client: () => this.client ?? undefined,
+    session: () => this.currentSession ?? undefined,
+    // Honor disabled project scope (null in a multi-root panel): no workspace fallback,
+    // so memory operations never silently target an arbitrary folder.
+    dir: (sessionID) => this.getProjectDirectory(sessionID),
+    post: (message) => this.postMessage(message),
+  })
   private unsubscribeEvent: (() => void) | null = null
   private unsubscribeState: (() => void) | null = null
   /** Cached migration data so migration doesn't re-read from disk/SecretStorage. */ // legacy-migration
@@ -931,6 +940,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
       }
       if (await this.handleModelSelectorExpandedMessage(message)) return
       this.visibleTaskStreams.handle(message)
+      if (await this.handleMemoryMessage(message)) return
       switch (message.type) {
         case "webviewReady":
           console.log("[Kilo New] KiloProvider: ✅ webviewReady received")
@@ -1515,6 +1525,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
 
           // Remote status events are global and should always pass through
           if (event.type === "kilo-sessions.remote-status-changed") return true
+          if (event.type === "memory.status" || event.type === "memory.updated" || event.type === "memory.error")
+            return true
           const sessionId = this.resolveEventSessionId(event)
 
           // message.part.* events are always session-scoped; drop if session unknown.
@@ -1659,6 +1671,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
         this.fetchAndSendConfig(),
         this.fetchAndSendIndexingStatus(),
         this.fetchAndSendNotifications(),
+        this.memory.fetch(),
         this.seedSessionStatusMap(),
       ])
       this.cachedGitRepo = await hasGit(this.client!, this.getWorkspaceDirectory())
@@ -2390,6 +2403,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
   }
 
+  private async handleMemoryMessage(message: Record<string, unknown>): Promise<boolean> {
+    return this.memory.handle(message)
+  }
+
   /**
    * Fetch backend config and send to webview.
    */
@@ -3762,6 +3779,48 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
       return
     }
 
+    if (event.type === "memory.status" || event.type === "memory.updated" || event.type === "memory.error") {
+      const props = event.properties as { sessionID?: unknown; detail?: unknown; reason?: unknown }
+      const eventSessionID = typeof props.sessionID === "string" ? props.sessionID : undefined
+      const active = this.currentSession?.id
+      const local =
+        !directory || sameDirectory(directory, this.getProjectDirectory(active) ?? this.getWorkspaceDirectory(active))
+      const trackedById = Boolean(eventSessionID && this.trackedSessionIds.has(eventSessionID))
+      // Directory-scoped events (enable/disable/rebuild/configure/purge) carry no
+      // sessionID, so also match any tracked session sharing the event directory —
+      // e.g. a non-active Agent Manager tab on the same worktree.
+      const trackedByDir = directory
+        ? [...this.sessionDirectories.entries()]
+            .filter(([sid, dir]) => this.trackedSessionIds.has(sid) && sameDirectory(directory, dir))
+            .map(([sid]) => sid)
+        : []
+      const tracked = trackedById || trackedByDir.length > 0
+      if (!local && !tracked) return
+      if (trackedById && eventSessionID && directory) this.trackDirectory(eventSessionID, directory)
+      const targets = new Set<string | undefined>()
+      if (trackedById && eventSessionID) targets.add(eventSessionID)
+      for (const sid of trackedByDir) targets.add(sid)
+      if (local && active) targets.add(active)
+      if (targets.size === 0 && local) targets.add(undefined)
+      const detail =
+        props.detail && typeof props.detail === "object"
+          ? props.detail
+          : event.type === "memory.error" && typeof props.reason === "string"
+            ? { type: "error", message: props.reason, reason: props.reason }
+            : undefined
+      for (const sessionID of targets) {
+        if (detail) {
+          this.postMessage({
+            type: "memoryEvent",
+            sessionID,
+            detail,
+          })
+        }
+        void this.memory.fetch(sessionID, false)
+      }
+      return
+    }
+
     // Drop session events from other projects before any tracking logic.
     // This must come first: the trackedSessionIds guard below would otherwise
     // let a foreign session through if it was accidentally tracked.
@@ -4007,6 +4066,22 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.flushPendingReviewComments()
   }
 
+  public async showMemory(sessionID?: string): Promise<void> {
+    await this.memory.show(sessionID ?? this.currentSession?.id)
+  }
+
+  public async toggleMemory(sessionID?: string): Promise<void> {
+    try {
+      const operation = await this.memory.toggle(sessionID ?? this.currentSession?.id)
+      if (operation) {
+        void vscode.window.showInformationMessage(`Project memory ${operation === "enable" ? "enabled" : "disabled"}.`)
+      }
+    } catch (error) {
+      console.error("[Kilo New] KiloProvider: Failed to toggle memory:", error)
+      void vscode.window.showErrorMessage(getErrorMessage(error) || "Failed to toggle memory")
+    }
+  }
+
   private flushPendingReviewComments(): void {
     if (!this.webview || !this.isWebviewReady || this.pendingReviewComments.length === 0) return
 
@@ -4298,6 +4373,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.visibleTaskStreams.clear()
     this.streams.dispose()
     this.isWebviewReady = false
+    // Release any waitForReady() awaiters so their callers don't hang after disposal.
+    this.readyResolvers.splice(0).forEach((r) => r())
     this.promptRecoveryQueued = false
     clearNetworkWaits(this.trackedSessionIds)
     this.trackedSessionIds.clear()
diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
index e906a76607..837af5ae74 100644
--- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
+++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
@@ -1804,6 +1804,60 @@ export class AgentManagerProvider implements Disposable {
     return this.panel?.active === true
   }
 
+  private async waitForPanel(panel: PanelContext, promise: Promise<void>): Promise<boolean> {
+    const done = promise.then(() => true)
+    let sub: Disposable | undefined
+    const disposed = new Promise<false>((resolve) => {
+      sub = panel.onDidDispose(() => {
+        sub?.dispose()
+        resolve(false)
+      })
+    })
+    void done.finally(() => sub?.dispose())
+    const ok = await Promise.race([done, disposed])
+    return ok && this.panel === panel
+  }
+
+  private waitForPanelReady(panel: PanelContext): Promise<boolean> {
+    return this.waitForPanel(panel, panel.waitForReady())
+  }
+
+  private waitForPanelActive(panel: PanelContext): Promise<boolean> {
+    return this.waitForPanel(panel, panel.waitForActive())
+  }
+
+  public async showMemory(): Promise<void> {
+    const panel = this.panel
+    const sid = this.activeSessionId
+    if (!panel || !sid) {
+      this.host.showError("No active Agent Manager session")
+      return
+    }
+    if (!(await this.waitForPanelReady(panel))) return
+    if (this.activeSessionId !== sid) return
+    try {
+      await panel.sessions.showMemory(sid)
+    } catch (error) {
+      this.host.showError(getErrorMessage(error) || "Failed to show memory")
+    }
+  }
+
+  public async toggleMemory(): Promise<void> {
+    const panel = this.panel
+    const sid = this.activeSessionId
+    if (!panel || !sid) {
+      this.host.showError("No active Agent Manager session")
+      return
+    }
+    if (!(await this.waitForPanelReady(panel))) return
+    if (this.activeSessionId !== sid) return
+    try {
+      await panel.sessions.toggleMemory(sid)
+    } catch (error) {
+      this.host.showError(getErrorMessage(error) || "Failed to toggle memory")
+    }
+  }
+
   /** Expose worktree session→directory mappings for the auto-approve toggle. */
   public getSessionDirectories(): ReadonlyMap<string, string> {
     return this.panel?.sessions.getSessionDirectories() ?? new Map()
@@ -1869,7 +1923,7 @@ export class AgentManagerProvider implements Disposable {
     this.openPanel()
     const panel = this.panel
     if (!panel) return
-    await panel.waitForReady()
+    if (!(await this.waitForPanelReady(panel))) return
     await this.waitForStateReady("createFromSidebar")
     await this.onCreateWorktree(baseBranch, branchName)
   }
@@ -1878,8 +1932,8 @@ export class AgentManagerProvider implements Disposable {
     this.openPanel()
     const panel = this.panel
     if (!panel) return
-    await panel.waitForActive()
-    await panel.waitForReady()
+    if (!(await this.waitForPanelActive(panel))) return
+    if (!(await this.waitForPanelReady(panel))) return
     await this.waitForStateReady("openAdvancedWorktree")
     queueMicrotask(() => this.postToWebview({ type: "action", action: "advancedWorktree" }))
   }
diff --git a/packages/kilo-vscode/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts
index 2d9b4f6bf4..fc5be00112 100644
--- a/packages/kilo-vscode/src/agent-manager/host.ts
+++ b/packages/kilo-vscode/src/agent-manager/host.ts
@@ -44,6 +44,8 @@ export interface SessionProvider {
    *  The callback receives the new session and its directory so the Agent Manager
    *  can route it to the correct worktree instead of LOCAL. */
   onFollowupAdopted(cb: (session: Session, directory: string) => void): void
+  showMemory(sessionID?: string): Promise<void>
+  toggleMemory(sessionID?: string): Promise<void>
   dispose(): void
 }
 
diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
index 79d8821879..24d9640877 100644
--- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts
+++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
@@ -119,6 +119,8 @@ export class VscodeHost implements Host {
       registerSession: (s) => provider.registerSession(s),
       recoverPendingPrompts: () => provider.recoverPendingPrompts(),
       onFollowupAdopted: (cb) => provider.onFollowupAdopted(cb),
+      showMemory: (id) => provider.showMemory(id),
+      toggleMemory: (id) => provider.toggleMemory(id),
       dispose: () => provider.dispose(),
     }
 
diff --git a/packages/kilo-vscode/src/extension.ts b/packages/kilo-vscode/src/extension.ts
index 8539bf4d47..3e3aebd125 100644
--- a/packages/kilo-vscode/src/extension.ts
+++ b/packages/kilo-vscode/src/extension.ts
@@ -398,6 +398,26 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand("kilo-code.new.openIndexingSettings", () => {
       settingsEditorProvider.openPanel("settings", "indexing")
     }),
+    vscode.commands.registerCommand("kilo-code.new.showMemory", async () => {
+      if (agentManagerProvider.isActive()) {
+        await agentManagerProvider.showMemory()
+        return
+      }
+      const target = activeTabProvider() ?? provider
+      if (target === provider) await vscode.commands.executeCommand("kilo-code.SidebarProvider.focus")
+      await target.waitForReady()
+      await target.showMemory()
+    }),
+    vscode.commands.registerCommand("kilo-code.new.toggleMemory", async () => {
+      if (agentManagerProvider.isActive()) {
+        await agentManagerProvider.toggleMemory()
+        return
+      }
+      const target = activeTabProvider() ?? provider
+      if (target === provider) await vscode.commands.executeCommand("kilo-code.SidebarProvider.focus")
+      await target.waitForReady()
+      await target.toggleMemory()
+    }),
     // legacy-migration start
     vscode.commands.registerCommand("kilo-code.new.openMigrationWizard", () => {
       provider.postMessage({ type: "migrationState", needed: true, source: "legacy" })
diff --git a/packages/kilo-vscode/src/kilo-provider/memory.ts b/packages/kilo-vscode/src/kilo-provider/memory.ts
new file mode 100644
index 0000000000..fc0988bd98
--- /dev/null
+++ b/packages/kilo-vscode/src/kilo-provider/memory.ts
@@ -0,0 +1,483 @@
+import * as vscode from "vscode"
+import * as path from "node:path"
+import {
+  isMemoryOperation,
+  isMemoryPromptOperation,
+  type MemoryOperation,
+  type MemoryPromptOperation,
+} from "@kilocode/kilo-memory/commands"
+import { MemorySchema } from "@kilocode/kilo-memory/schema"
+import type { KiloClient, Session } from "@kilocode/sdk/v2/client"
+import { retry } from "../services/cli-backend/retry"
+import { getErrorMessage } from "../kilo-provider-utils"
+
+type MemorySourceFile = MemorySchema.Source
+type MemoryApi = KiloClient["memory"]
+const CACHE_LIMIT = 8
+const NO_PROJECT = "No active project for memory. Open a file in the target folder to manage its memory."
+
+export type KiloProviderMemoryMessage = {
+  operation: MemoryOperation
+  sessionID?: string
+  mode?: "status" | "on" | "off"
+  confirm?: boolean
+  text?: string
+  query?: string
+  key?: string
+  file?: MemorySourceFile
+  section?: string
+}
+
+export type KiloProviderMemoryInput = {
+  client(): KiloClient | undefined
+  session(): Session | undefined
+  /** Project directory for memory operations, or undefined when project scope is disabled. */
+  dir(sessionID?: string): string | undefined
+  post(message: unknown): void
+}
+
+function file(value: unknown): MemorySourceFile | undefined {
+  return MemorySchema.source(value)
+}
+
+function operation(value: unknown): MemoryOperation | undefined {
+  return isMemoryOperation(value) ? value : undefined
+}
+
+function mode(value: unknown) {
+  if (value === "status" || value === "on" || value === "off") return value
+  return undefined
+}
+
+function memory(client: KiloClient | undefined): MemoryApi | undefined {
+  return (client as { memory?: MemoryApi } | undefined)?.memory
+}
+
+function request(input: Record<string, unknown>): { value: KiloProviderMemoryMessage } | { error: string } {
+  const op = operation(input.operation)
+  if (!op) return { error: "Unknown memory operation" }
+  const source = file(input.file)
+  if (input.file !== undefined && !source) return { error: "Invalid memory source file" }
+  return {
+    value: {
+      operation: op,
+      sessionID: typeof input.sessionID === "string" ? input.sessionID : undefined,
+      mode: mode(input.mode),
+      confirm: input.confirm === true,
+      text: typeof input.text === "string" ? input.text : undefined,
+      query: typeof input.query === "string" ? input.query : undefined,
+      key: typeof input.key === "string" ? input.key : undefined,
+      file: source,
+      section: typeof input.section === "string" ? input.section : undefined,
+    },
+  }
+}
+
+export class KiloProviderMemory {
+  private readonly cached = new Map<string, unknown>()
+  private tail = Promise.resolve()
+
+  constructor(private readonly input: KiloProviderMemoryInput) {}
+
+  private cache(dir: string, msg: unknown) {
+    this.cached.delete(dir)
+    this.cached.set(dir, msg)
+    while (this.cached.size > CACHE_LIMIT) {
+      const key = this.cached.keys().next().value
+      if (typeof key !== "string") return
+      this.cached.delete(key)
+    }
+  }
+
+  private serial<T>(fn: () => Promise<T>) {
+    // this.tail is always reassigned below to a never-rejecting promise, so it
+    // never settles rejected — a single fulfillment handler is sufficient.
+    const next = this.tail.then(fn)
+    this.tail = next.then(
+      () => undefined,
+      () => undefined,
+    )
+    return next
+  }
+
+  async handle(message: Record<string, unknown>): Promise<boolean> {
+    if (message.type === "requestMemory") {
+      this.fetch(
+        typeof message.sessionID === "string" ? message.sessionID : undefined,
+        message.includeSources === true,
+      ).catch((err: unknown) => console.error("[Kilo New] fetchAndSendMemory failed:", err))
+      return true
+    }
+    if (message.type === "memoryShow") {
+      await this.show(typeof message.sessionID === "string" ? message.sessionID : undefined)
+      return true
+    }
+    if (message.type === "memoryOperation") {
+      const parsed = request(message)
+      if ("error" in parsed) {
+        this.input.post({
+          type: "memoryOperationResult",
+          operation: typeof message.operation === "string" ? message.operation : "unknown",
+          sessionID: typeof message.sessionID === "string" ? message.sessionID : undefined,
+          ok: false,
+          error: parsed.error,
+        })
+        return true
+      }
+      await this.run(parsed.value)
+      return true
+    }
+    if (message.type === "memoryPrompt") {
+      const op = isMemoryPromptOperation(message.operation) ? message.operation : undefined
+      if (!op) return true
+      await this.prompt(op, typeof message.sessionID === "string" ? message.sessionID : undefined)
+      return true
+    }
+    return false
+  }
+
+  fetch(sessionID?: string, includeSources = false): Promise<void> {
+    return this.serial(() => this.load(sessionID, includeSources))
+  }
+
+  /** Resolves once the serialized operation queue has drained. */
+  idle(): Promise<void> {
+    return this.tail
+  }
+
+  private async load(sessionID?: string, includeSources = false): Promise<void> {
+    try {
+      const directory = this.input.dir(sessionID ?? this.input.session()?.id)
+      const client = this.input.client()
+      if (!client) {
+        const cached = directory ? this.cached.get(directory) : undefined
+        if (cached && typeof cached === "object" && !Array.isArray(cached)) this.input.post({ ...cached, sessionID })
+        else this.input.post({ type: "memoryLoaded", sessionID, error: "Not connected to CLI backend" })
+        return
+      }
+
+      const api = memory(client)
+      if (!api) {
+        this.input.post({ type: "memoryLoaded", sessionID, error: "Memory unavailable in CLI backend" })
+        return
+      }
+
+      if (!directory) {
+        this.input.post({ type: "memoryLoaded", sessionID, error: NO_PROJECT })
+        return
+      }
+
+      const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
+      const show = includeSources
+        ? (await retry(() => api.show({ directory }, { throwOnError: true }))).data
+        : undefined
+      const msg = {
+        type: "memoryLoaded",
+        sessionID,
+        status,
+        ...(show ? { show } : {}),
+      }
+      this.cache(directory, msg)
+      this.input.post(msg)
+    } catch (err) {
+      console.error("[Kilo New] KiloProvider: Failed to fetch memory:", err)
+      this.input.post({
+        type: "memoryLoaded",
+        sessionID,
+        error: getErrorMessage(err) || "Failed to load memory",
+      })
+    }
+  }
+
+  async prompt(value: MemoryPromptOperation, sessionID?: string): Promise<void> {
+    const title = value === "remember" ? "Remember in project memory" : "Forget project memory"
+    const placeHolder = value === "remember" ? "Project fact, command, or correction" : "Text to remove"
+    const text = await vscode.window.showInputBox({ title, placeHolder, ignoreFocusOut: true })
+    if (!text?.trim()) {
+      // Clear the webview's pending state for this action when the input is dismissed.
+      this.input.post({ type: "memoryOperationResult", operation: value, sessionID, ok: true })
+      return
+    }
+    await this.run({
+      operation: value,
+      sessionID,
+      ...(value === "remember" ? { text: text.trim() } : { query: text.trim() }),
+    })
+  }
+
+  show(sessionID?: string): Promise<void> {
+    return this.serial(() => this.doShow(sessionID))
+  }
+
+  private async doShow(sessionID?: string): Promise<void> {
+    const client = this.input.client()
+    if (!client) {
+      this.input.post({
+        type: "memoryLoaded",
+        sessionID,
+        error: "Not connected to CLI backend",
+      })
+      return
+    }
+
+    const api = memory(client)
+
+    if (!api) {
+      this.input.post({
+        type: "memoryLoaded",
+        sessionID,
+        error: "Memory unavailable in CLI backend",
+      })
+      return
+    }
+
+    try {
+      const directory = this.input.dir(sessionID ?? this.input.session()?.id)
+      if (!directory) {
+        this.input.post({ type: "memoryLoaded", sessionID, error: NO_PROJECT })
+        return
+      }
+      const { data: show } = await retry(() => api.show({ directory }, { throwOnError: true }))
+      const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
+      const current = sessionID ?? this.input.session()?.id
+      const startup =
+        current && status.state.stats.lastInjectedSessionID === current ? status.state.stats.lastInjectedTokens : 0
+      const content = [
+        "# Kilo Memory",
+        "",
+        `Root: ${show.root}`,
+        `Enabled: ${show.state.enabled ? "yes" : "no"}`,
+        `Auto-save: ${show.state.autoConsolidate ? "on" : "off"}`,
+        `Startup context: ${show.state.autoInject ? "on" : "off"}`,
+        `Stored index tokens: ${status.index.estimatedTokens}`,
+        `Startup context tokens for this session: ${startup}`,
+        `Last auto-save model usage: ${status.state.stats.lastConsolidationTokens} tokens`,
+        "",
+        "## project.md",
+        show.sources.project.trim(),
+        "",
+        "## environment.md",
+        show.sources.environment.trim(),
+        "",
+        "## corrections.md",
+        show.sources.corrections.trim(),
+        "",
+        "## index.kmem",
+        show.index.trim(),
+        "",
+        "## items",
+        show.items.trim(),
+        "",
+        "## changes",
+        show.changes.trim(),
+        "",
+        "## decisions.jsonl",
+        show.decisions.trim(),
+        "",
+      ].join("\n")
+      await vscode.workspace
+        .openTextDocument({ content, language: "markdown" })
+        .then((doc) => vscode.window.showTextDocument(doc, { preview: true }))
+      const msg = {
+        type: "memoryLoaded",
+        sessionID,
+        status,
+        show,
+      }
+      this.cache(directory, msg)
+      this.input.post(msg)
+    } catch (err) {
+      console.error("[Kilo New] KiloProvider: Failed to show memory:", err)
+      this.input.post({
+        type: "memoryLoaded",
+        sessionID,
+        error: getErrorMessage(err) || "Failed to show memory",
+      })
+    }
+  }
+
+  run(message: KiloProviderMemoryMessage): Promise<boolean> {
+    return this.serial(() => this.execute(message))
+  }
+
+  /**
+   * Serialized status read + enable/disable, so two rapid toggles can't both
+   * read the same pre-toggle state and apply the same operation twice.
+   * Returns the applied operation, or undefined when it failed (the failure is
+   * already posted to the webview by execute()).
+   */
+  toggle(sessionID?: string): Promise<MemoryOperation | undefined> {
+    return this.serial(async () => {
+      const client = this.input.client()
+      if (!client) throw new Error("Not connected to CLI backend")
+      const api = memory(client)
+      if (!api) throw new Error("Memory unavailable in CLI backend")
+      const directory = this.input.dir(sessionID ?? this.input.session()?.id)
+      if (!directory) throw new Error(NO_PROJECT)
+      const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
+      const operation = status.state.enabled ? "disable" : "enable"
+      return (await this.execute({ operation, sessionID })) ? operation : undefined
+    })
+  }
+
+  private async execute(message: KiloProviderMemoryMessage): Promise<boolean> {
+    const client = this.input.client()
+    if (!client) {
+      this.input.post({
+        type: "memoryOperationResult",
+        operation: message.operation,
+        sessionID: message.sessionID,
+        ok: false,
+        error: "Not connected to CLI backend",
+      })
+      return false
+    }
+
+    const api = memory(client)
+    if (!api) {
+      this.input.post({
+        type: "memoryOperationResult",
+        operation: message.operation,
+        sessionID: message.sessionID,
+        ok: false,
+        error: "Memory unavailable in CLI backend",
+      })
+      return false
+    }
+
+    try {
+      const directory = this.input.dir(message.sessionID ?? this.input.session()?.id)
+      if (!directory) {
+        this.input.post({
+          type: "memoryOperationResult",
+          operation: message.operation,
+          sessionID: message.sessionID,
+          ok: false,
+          error: NO_PROJECT,
+        })
+        return false
+      }
+      const data = await this.action(api, directory, message)
+      const refreshed = await Promise.all([
+        retry(() => api.status({ directory }, { throwOnError: true })),
+        retry(() => api.show({ directory }, { throwOnError: true })),
+      ]).catch((err: unknown) => {
+        console.warn("[Kilo New] Memory changed but refresh failed:", err)
+        return undefined
+      })
+      const status = refreshed?.[0].data
+      const show = refreshed?.[1].data
+      const result = {
+        type: "memoryOperationResult",
+        operation: message.operation,
+        sessionID: message.sessionID,
+        ok: true,
+        ...(status ? { status } : {}),
+        ...(show ? { show } : {}),
+        result: data,
+      }
+      this.input.post(result)
+      if (status && show) {
+        const loaded = {
+          type: "memoryLoaded",
+          sessionID: message.sessionID,
+          status,
+          show,
+        }
+        this.cache(directory, loaded)
+        this.input.post(loaded)
+      } else {
+        // Mutation succeeded but the refresh failed: drop the now-stale cached
+        // entry so a later offline read doesn't report pre-mutation state.
+        this.cached.delete(directory)
+      }
+      return true
+    } catch (err) {
+      console.error("[Kilo New] KiloProvider: Failed memory operation:", err)
+      this.input.post({
+        type: "memoryOperationResult",
+        operation: message.operation,
+        sessionID: message.sessionID,
+        ok: false,
+        error: getErrorMessage(err) || "Memory operation failed",
+      })
+      return false
+    }
+  }
+
+  private async action(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
+    const op = message.operation
+    if (op === "enable") return (await api.enable({ directory }, { throwOnError: true })).data
+    if (op === "status") return (await api.status({ directory }, { throwOnError: true })).data
+    if (op === "edit") return this.edit(api, directory)
+    if (op === "disable") return (await api.disable({ directory }, { throwOnError: true })).data
+    if (op === "rebuild") return (await api.rebuild({ directory }, { throwOnError: true })).data
+    if (op === "purge") return this.purge(api, directory, message)
+    if (op === "auto") return this.auto(api, directory, message)
+    if (op === "remember") return this.remember(api, directory, message)
+    if (op === "correct") return this.correct(api, directory, message)
+    return this.forget(api, directory, message)
+  }
+
+  private async remember(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
+    const text = message.text?.trim()
+    if (!text) throw new Error("Memory text is required")
+    return (
+      await api.remember(
+        {
+          directory,
+          text,
+          key: message.key,
+          file: message.file,
+          section: message.section,
+          sessionID: message.sessionID,
+        },
+        { throwOnError: true },
+      )
+    ).data
+  }
+
+  private async correct(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
+    const text = message.text?.trim()
+    if (!text) throw new Error("Correction text is required")
+    return (
+      await api.correct(
+        {
+          directory,
+          text,
+          key: message.key,
+          sessionID: message.sessionID,
+        },
+        { throwOnError: true },
+      )
+    ).data
+  }
+
+  private async forget(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
+    const query = message.query?.trim()
+    if (!query) throw new Error("Forget query is required")
+    return (await api.forget({ directory, query, sessionID: message.sessionID }, { throwOnError: true })).data
+  }
+
+  private async edit(api: MemoryApi, directory: string) {
+    const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
+    if (!status.state.enabled) throw new Error("Memory is disabled. Run /memory on first.")
+    const uri = vscode.Uri.file(path.join(status.root, "project.md"))
+    const doc = await vscode.workspace.openTextDocument(uri)
+    await vscode.window.showTextDocument(doc, { preview: false })
+    return status
+  }
+
+  private async purge(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
+    if (message.confirm !== true) throw new Error("Memory purge requires confirmation")
+    return (await api.purge({ directory, confirm: true }, { throwOnError: true })).data
+  }
+
+  private async auto(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
+    if (message.mode === "status") return (await retry(() => api.status({ directory }, { throwOnError: true }))).data
+    if (message.mode === "on" || message.mode === "off") {
+      return (await api.configure({ directory, autoConsolidate: message.mode === "on" }, { throwOnError: true })).data
+    }
+    throw new Error("Auto-save mode is required")
+  }
+}
diff --git a/packages/kilo-vscode/tests/setup/vscode-mock.ts b/packages/kilo-vscode/tests/setup/vscode-mock.ts
index 5cb1d09741..d85485821f 100644
--- a/packages/kilo-vscode/tests/setup/vscode-mock.ts
+++ b/packages/kilo-vscode/tests/setup/vscode-mock.ts
@@ -50,8 +50,13 @@ const mockVscode = {
     notebookDocuments: [] as Array<unknown>,
     onDidOpenTextDocument: () => ({ dispose: noop }),
     onDidChangeTextDocument: () => ({ dispose: noop }),
+    onDidSaveTextDocument: () => ({ dispose: noop }),
     onDidCloseTextDocument: () => ({ dispose: noop }),
     onDidChangeConfiguration: () => ({ dispose: noop }),
+    openTextDocument: async (input: { content?: string; language?: string }) => ({
+      getText: () => input.content ?? "",
+      languageId: input.language ?? "plaintext",
+    }),
     getConfiguration: () => ({
       get: <T>(_key: string, value?: T) => value,
       update: async () => {},
@@ -81,6 +86,7 @@ const mockVscode = {
     tabGroups: { all: [] },
     showTextDocument: async () => {},
     showInformationMessage: async () => undefined,
+    showErrorMessage: async () => undefined,
     showWarningMessage: async () => undefined,
     createTerminal: () => ({ show: noop, sendText: noop, dispose: noop }),
     createOutputChannel: () => ({
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-memory-commands.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-memory-commands.test.ts
new file mode 100644
index 0000000000..1ac5616097
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/agent-manager-memory-commands.test.ts
@@ -0,0 +1,102 @@
+import { describe, expect, it, mock } from "bun:test"
+
+const { AgentManagerProvider } = await import("../../src/agent-manager/AgentManagerProvider")
+
+type Manager = {
+  host: { showError: (message: string) => void }
+  panel:
+    | {
+        waitForReady: () => Promise<void>
+        onDidDispose: (cb: () => void) => { dispose: () => void }
+        sessions: {
+          showMemory: (sessionID?: string) => Promise<void>
+          toggleMemory: (sessionID?: string) => Promise<void>
+        }
+      }
+    | undefined
+  activeSessionId: string | undefined
+  showMemory: () => Promise<void>
+  toggleMemory: () => Promise<void>
+}
+
+function deferred() {
+  let done: (() => void) | undefined
+  const promise = new Promise<void>((resolve) => {
+    done = resolve
+  })
+  return {
+    promise,
+    resolve: () => done?.(),
+  }
+}
+
+function manager() {
+  const calls: unknown[] = []
+  const disposers: Array<() => void> = []
+  const item = Object.create(AgentManagerProvider.prototype) as Manager
+  item.host = { showError: mock((message) => calls.push(["error", message])) }
+  item.panel = {
+    waitForReady: mock(async () => calls.push("ready")),
+    onDidDispose: mock((cb) => {
+      disposers.push(cb)
+      return { dispose: mock(() => {}) }
+    }),
+    sessions: {
+      showMemory: mock(async (sessionID) => calls.push(["show", sessionID])),
+      toggleMemory: mock(async (sessionID) => calls.push(["toggle", sessionID])),
+    },
+  }
+  item.activeSessionId = "ses_agent_manager"
+  return {
+    item,
+    calls,
+    dispose: () => {
+      for (const cb of disposers) cb()
+    },
+  }
+}
+
+describe("AgentManagerProvider memory commands", () => {
+  it("routes memory commands to the active Agent Manager session", async () => {
+    const ctx = manager()
+
+    await ctx.item.showMemory()
+    await ctx.item.toggleMemory()
+
+    expect(ctx.calls).toEqual(["ready", ["show", "ses_agent_manager"], "ready", ["toggle", "ses_agent_manager"]])
+  })
+
+  it("does not fall back when Agent Manager has no active session", async () => {
+    const ctx = manager()
+    ctx.item.activeSessionId = undefined
+
+    await ctx.item.showMemory()
+
+    expect(ctx.calls).toEqual([["error", "No active Agent Manager session"]])
+  })
+
+  it("does not hang when the panel is disposed before it is ready", async () => {
+    const ctx = manager()
+    const wait = deferred()
+    ctx.item.panel!.waitForReady = mock(() => wait.promise)
+
+    const pending = ctx.item.showMemory()
+    ctx.dispose()
+    await pending
+
+    expect(ctx.calls).toEqual([])
+  })
+
+  it("does not target a stale session after readiness resolves", async () => {
+    const ctx = manager()
+    const wait = deferred()
+    ctx.item.panel!.waitForReady = mock(() => wait.promise)
+
+    const pending = ctx.item.toggleMemory()
+    ctx.item.activeSessionId = "ses_other"
+    wait.resolve()
+    await pending
+
+    expect(ctx.calls).toEqual([])
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts
new file mode 100644
index 0000000000..f4f417fad0
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts
@@ -0,0 +1,183 @@
+import { describe, expect, it } from "bun:test"
+import type { KiloClient } from "@kilocode/sdk/v2/client"
+
+// vscode mock is provided by the shared preload (tests/setup/vscode-mock.ts)
+const { KiloProvider } = await import("../../src/KiloProvider")
+
+type Internals = {
+  currentSession: { id: string } | null
+  trackedSessionIds: Set<string>
+  webview: { postMessage(message: unknown): Promise<unknown> } | null
+  handleEvent(event: unknown, directory?: string): void
+  memory: { idle(): Promise<void> }
+}
+
+function status(root: string) {
+  return {
+    root: `${root}/.kilo/memory`,
+    state: {
+      enabled: true,
+      autoConsolidate: true,
+      stats: {
+        lastInjectedSessionID: "",
+        lastInjectedTokens: 0,
+        lastOperationCount: 0,
+      },
+    },
+    index: { estimatedTokens: 0 },
+  }
+}
+
+function show(root: string) {
+  return {
+    root: `${root}/.kilo/memory`,
+    state: status(root).state,
+    sources: { project: "", environment: "", corrections: "" },
+    index: "",
+    items: "",
+    changes: "",
+    decisions: "",
+  }
+}
+
+describe("KiloProvider memory events", () => {
+  it("routes tracked background memory events to their session directory", async () => {
+    const calls: string[] = []
+    const posts: unknown[] = []
+    const client = {
+      memory: {
+        status: async (input: { directory: string }) => {
+          calls.push(input.directory)
+          return { data: status(input.directory) }
+        },
+      },
+    } as unknown as KiloClient
+    const provider = new KiloProvider(
+      {} as never,
+      {
+        getClient: () => client,
+      } as never,
+    )
+    const item = provider as unknown as Internals
+    item.webview = { postMessage: async (message) => posts.push(message) }
+    item.currentSession = { id: "ses_active" }
+    item.trackedSessionIds.add("ses_active")
+    item.trackedSessionIds.add("ses_bg")
+    provider.setSessionDirectory("ses_bg", "/worktree")
+
+    item.handleEvent(
+      {
+        type: "memory.updated",
+        properties: {
+          sessionID: "ses_bg",
+          detail: { type: "saved", message: "Saved project memory" },
+        },
+      },
+      "/worktree",
+    )
+    await item.memory.idle()
+
+    expect(posts).toContainEqual({
+      type: "memoryEvent",
+      sessionID: "ses_bg",
+      detail: { type: "saved", message: "Saved project memory" },
+    })
+    expect(posts).toContainEqual(expect.objectContaining({ type: "memoryLoaded", sessionID: "ses_bg" }))
+    expect(posts).not.toContainEqual(expect.objectContaining({ type: "memoryEvent", sessionID: "ses_active" }))
+    expect(calls).toEqual(["/worktree"])
+  })
+
+  it("also refreshes the active session for same-directory memory events", async () => {
+    const calls: string[] = []
+    const posts: unknown[] = []
+    const client = {
+      memory: {
+        status: async (input: { directory: string }) => {
+          calls.push(input.directory)
+          return { data: status(input.directory) }
+        },
+      },
+    } as unknown as KiloClient
+    const provider = new KiloProvider(
+      {} as never,
+      {
+        getClient: () => client,
+      } as never,
+    )
+    const item = provider as unknown as Internals
+    item.webview = { postMessage: async (message) => posts.push(message) }
+    item.currentSession = { id: "ses_active" }
+    item.trackedSessionIds.add("ses_active")
+    item.trackedSessionIds.add("ses_bg")
+    provider.setSessionDirectory("ses_active", "/repo")
+    provider.setSessionDirectory("ses_bg", "/repo")
+
+    item.handleEvent(
+      {
+        type: "memory.updated",
+        properties: {
+          sessionID: "ses_bg",
+          detail: { type: "saved", message: "Saved project memory" },
+        },
+      },
+      "/repo",
+    )
+    await item.memory.idle()
+
+    expect(posts).toContainEqual({
+      type: "memoryEvent",
+      sessionID: "ses_bg",
+      detail: { type: "saved", message: "Saved project memory" },
+    })
+    expect(posts).toContainEqual({
+      type: "memoryEvent",
+      sessionID: "ses_active",
+      detail: { type: "saved", message: "Saved project memory" },
+    })
+    expect(posts).toContainEqual(expect.objectContaining({ type: "memoryLoaded", sessionID: "ses_bg" }))
+    expect(posts).toContainEqual(expect.objectContaining({ type: "memoryLoaded", sessionID: "ses_active" }))
+    expect(calls).toEqual(["/repo", "/repo"])
+  })
+
+  it("uses the project directory when toggling memory", async () => {
+    const calls: unknown[] = []
+    const client = {
+      memory: {
+        status: async (input: { directory: string }) => {
+          calls.push(["status", input.directory])
+          return { data: status(input.directory) }
+        },
+        disable: async (input: { directory: string }) => {
+          calls.push(["disable", input.directory])
+          return { data: { root: `${input.directory}/.kilo/memory`, state: status(input.directory).state } }
+        },
+        show: async (input: { directory: string }) => {
+          calls.push(["show", input.directory])
+          return { data: show(input.directory) }
+        },
+      },
+    } as unknown as KiloClient
+    const posts: unknown[] = []
+    const provider = new KiloProvider(
+      {} as never,
+      {
+        getClient: () => client,
+      } as never,
+      undefined,
+      { projectDirectory: "/repo/project" },
+    )
+    const item = provider as unknown as Internals
+    item.webview = { postMessage: async (message) => posts.push(message) }
+    item.currentSession = { id: "ses_active" }
+
+    await provider.toggleMemory("ses_active")
+
+    expect(calls).toEqual([
+      ["status", "/repo/project"],
+      ["disable", "/repo/project"],
+      ["status", "/repo/project"],
+      ["show", "/repo/project"],
+    ])
+    expect(posts).toContainEqual(expect.objectContaining({ type: "memoryLoaded", sessionID: "ses_active" }))
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts
new file mode 100644
index 0000000000..3630e80790
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts
@@ -0,0 +1,212 @@
+import { describe, expect, it } from "bun:test"
+import type { KiloClient } from "@kilocode/sdk/v2/client"
+import { KiloProviderMemory } from "../../src/kilo-provider/memory"
+
+function subject(client: KiloClient | undefined) {
+  const posts: unknown[] = []
+  const memory = new KiloProviderMemory({
+    client: () => client,
+    session: () => undefined,
+    dir: () => "/repo",
+    post: (message) => posts.push(message),
+  })
+  return { memory, posts }
+}
+
+function status(root: string) {
+  return {
+    root: `${root}/.kilo/memory`,
+    state: {
+      enabled: true,
+      autoConsolidate: true,
+      stats: {
+        lastInjectedSessionID: "",
+        lastInjectedTokens: 0,
+        lastOperationCount: 0,
+      },
+    },
+    index: { estimatedTokens: 0 },
+  }
+}
+
+function show(root: string) {
+  return {
+    root: `${root}/.kilo/memory`,
+    state: status(root).state,
+    sources: { project: "", environment: "", corrections: "" },
+    index: "",
+    items: "",
+    changes: "",
+    decisions: "",
+  }
+}
+
+describe("KiloProviderMemory", () => {
+  it("handles clients without memory endpoints gracefully", async () => {
+    const item = subject({} as KiloClient)
+
+    await item.memory.fetch("ses_memoryless")
+    await item.memory.show("ses_memoryless")
+    await item.memory.run({ operation: "enable", sessionID: "ses_memoryless" })
+
+    expect(item.posts).toEqual([
+      {
+        type: "memoryLoaded",
+        sessionID: "ses_memoryless",
+        error: "Memory unavailable in CLI backend",
+      },
+      {
+        type: "memoryLoaded",
+        sessionID: "ses_memoryless",
+        error: "Memory unavailable in CLI backend",
+      },
+      {
+        type: "memoryOperationResult",
+        operation: "enable",
+        sessionID: "ses_memoryless",
+        ok: false,
+        error: "Memory unavailable in CLI backend",
+      },
+    ])
+  })
+
+  it("posts a load error when no client or cache exists", async () => {
+    const item = subject(undefined)
+
+    await item.memory.fetch("ses_disconnected")
+
+    expect(item.posts).toEqual([
+      {
+        type: "memoryLoaded",
+        sessionID: "ses_disconnected",
+        error: "Not connected to CLI backend",
+      },
+    ])
+  })
+
+  it("evicts older cached memory payloads", async () => {
+    let client: KiloClient | undefined
+    const posts: unknown[] = []
+    const item = new KiloProviderMemory({
+      client: () => client,
+      session: () => undefined,
+      dir: (sid) => `/repo/${sid ?? "current"}`,
+      post: (message) => posts.push(message),
+    })
+    client = {
+      memory: {
+        status: async (input: { directory: string }) => ({ data: status(input.directory) }),
+        show: async (input: { directory: string }) => ({ data: show(input.directory) }),
+      },
+    } as unknown as KiloClient
+
+    for (let i = 0; i < 9; i++) {
+      await item.show(`ses_${i}`)
+    }
+
+    posts.length = 0
+    client = undefined
+    await item.fetch("ses_0")
+    await item.fetch("ses_8")
+
+    expect(posts[0]).toEqual({
+      type: "memoryLoaded",
+      sessionID: "ses_0",
+      error: "Not connected to CLI backend",
+    })
+    expect(posts[1]).toMatchObject({
+      type: "memoryLoaded",
+      sessionID: "ses_8",
+      show: { root: "/repo/ses_8/.kilo/memory" },
+    })
+  })
+
+  it("does not send ignored placement fields to correction endpoint", async () => {
+    const calls: unknown[] = []
+    const state = status("/repo")
+    const view = show("/repo")
+    const item = subject({
+      memory: {
+        correct: async (input: unknown) => {
+          calls.push(input)
+          return { data: { operationCount: 1, added: 1, removed: 0, skipped: [], index: { tokens: 0 } } }
+        },
+        status: async () => ({ data: state }),
+        show: async () => ({ data: view }),
+      },
+    } as unknown as KiloClient)
+
+    await item.memory.run({
+      operation: "correct",
+      sessionID: "ses_correct",
+      text: "Prefer corrections.",
+      key: "correction_key",
+      file: "project.md",
+      section: "Facts",
+    })
+
+    expect(calls).toEqual([
+      {
+        directory: "/repo",
+        text: "Prefer corrections.",
+        key: "correction_key",
+        sessionID: "ses_correct",
+      },
+    ])
+  })
+
+  it("routes status operations without mutating memory", async () => {
+    const calls: string[] = []
+    const state = status("/repo")
+    const view = show("/repo")
+    const item = subject({
+      memory: {
+        status: async () => {
+          calls.push("status")
+          return { data: state }
+        },
+        show: async () => {
+          calls.push("show")
+          return { data: view }
+        },
+      },
+    } as unknown as KiloClient)
+
+    await item.memory.run({ operation: "status", sessionID: "ses_memory" })
+
+    expect(calls).toEqual(["status", "status", "show"])
+    expect(item.posts).toContainEqual(
+      expect.objectContaining({ type: "memoryOperationResult", operation: "status", ok: true }),
+    )
+  })
+
+  it("routes auto-save and purge operations with explicit payloads", async () => {
+    const calls: unknown[] = []
+    const state = status("/repo")
+    const view = show("/repo")
+    state.state.autoConsolidate = false
+    const item = subject({
+      memory: {
+        configure: async (input: unknown) => {
+          calls.push(["configure", input])
+          return { data: { root: "/repo/.kilo/memory", state: state.state } }
+        },
+        purge: async (input: unknown) => {
+          calls.push(["purge", input])
+          return { data: { root: "/repo/.kilo/memory", purged: true } }
+        },
+        status: async () => ({ data: state }),
+        show: async () => ({ data: view }),
+      },
+    } as unknown as KiloClient)
+
+    await item.memory.run({ operation: "auto", mode: "off", sessionID: "ses_memory" })
+    await item.memory.run({ operation: "purge", confirm: true, sessionID: "ses_memory" })
+
+    expect(calls).toEqual([
+      ["configure", { directory: "/repo", autoConsolidate: false }],
+      ["purge", { directory: "/repo", confirm: true }],
+    ])
+    expect(item.posts.filter((post) => (post as { type?: string }).type === "memoryOperationResult")).toHaveLength(2)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/memory-command.test.ts b/packages/kilo-vscode/tests/unit/memory-command.test.ts
new file mode 100644
index 0000000000..1bd1df1e5d
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/memory-command.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it } from "bun:test"
+import { parseMemoryCommand, type ParsedMemoryCommand } from "../../webview-ui/src/utils/memory-command"
+
+type MemoryOperation =
+  | "enable"
+  | "status"
+  | "edit"
+  | "disable"
+  | "rebuild"
+  | "remember"
+  | "correct"
+  | "forget"
+  | "purge"
+  | "auto"
+type Case = {
+  name: string
+  input: string
+  result: "none" | "help" | "show" | "operation" | "usage"
+  operation?: MemoryOperation
+  mode?: "status" | "on" | "off"
+  confirm?: boolean
+  text?: string
+  query?: string
+  reason?: string
+}
+
+const cases = (await Bun.file(
+  new URL("../../../kilo-memory/test/command-cases.json", import.meta.url),
+).json()) as Case[]
+
+function expected(item: Case): ParsedMemoryCommand | undefined {
+  if (item.result === "none") return
+  if (item.result === "help") return { kind: "help" }
+  if (item.result === "show") return { kind: "show" }
+  if (item.result === "usage") return { kind: "usage", reason: item.reason ?? "" }
+  if (!item.operation) throw new Error(`Missing operation for fixture: ${item.name}`)
+  if (item.operation === "remember" || item.operation === "correct") {
+    if (!item.text) throw new Error(`Missing text for fixture: ${item.name}`)
+    return { kind: "operation", operation: item.operation, text: item.text }
+  }
+  if (item.operation === "forget") {
+    if (!item.query) throw new Error(`Missing query for fixture: ${item.name}`)
+    return { kind: "operation", operation: item.operation, query: item.query }
+  }
+  if (item.operation === "auto") {
+    if (!item.mode) throw new Error(`Missing mode for fixture: ${item.name}`)
+    return { kind: "operation", operation: item.operation, mode: item.mode }
+  }
+  if (item.operation === "purge") {
+    if (item.confirm !== true) throw new Error(`Missing confirmation for fixture: ${item.name}`)
+    return { kind: "operation", operation: item.operation, confirm: true }
+  }
+  return { kind: "operation", operation: item.operation }
+}
+
+describe("parseMemoryCommand", () => {
+  it("matches shared command fixtures", () => {
+    for (const item of cases) {
+      const parsed = parseMemoryCommand(item.input)
+      if (item.result === "usage") {
+        expect(parsed?.kind, item.name).toBe("usage")
+        expect(parsed && "reason" in parsed ? parsed.reason : "", item.name).toContain(item.reason ?? "")
+        continue
+      }
+      expect(parsed, item.name).toEqual(expected(item))
+    }
+  })
+})
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index a02d0e9dc4..b85a96390d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -80,6 +80,7 @@ import { DisplayProvider } from "../src/context/display"
 import { KiloEmbeddingModelsProvider } from "../src/context/kilo-embedding-models"
 import { NotificationsProvider } from "../src/context/notifications"
 import { FeedbackProvider } from "../src/context/feedback"
+import { MemoryProvider } from "../src/context/memory"
 import { SessionProvider, useSession } from "../src/context/session"
 import { AgentRequirementsProvider } from "../src/context/agent-requirements"
 import { WorktreeModeProvider } from "../src/context/worktree-mode"
@@ -3140,13 +3141,15 @@ export const AgentManagerApp: Component = () => {
                                 <NotificationsProvider>
                                   <SessionProvider>
                                     <AgentRequirementsProvider>
-                                      <FeedbackProvider>
-                                        <WorktreeModeProvider>
-                                          <DataBridge>
-                                            <AgentManagerContent />
-                                          </DataBridge>
-                                        </WorktreeModeProvider>
-                                      </FeedbackProvider>
+                                      <MemoryProvider>
+                                        <FeedbackProvider>
+                                          <WorktreeModeProvider>
+                                            <DataBridge>
+                                              <AgentManagerContent />
+                                            </DataBridge>
+                                          </WorktreeModeProvider>
+                                        </FeedbackProvider>
+                                      </MemoryProvider>
                                     </AgentRequirementsProvider>
                                   </SessionProvider>
                                 </NotificationsProvider>
diff --git a/packages/kilo-vscode/webview-ui/src/App.tsx b/packages/kilo-vscode/webview-ui/src/App.tsx
index 358fc0cd8e..64e4b94eb3 100644
--- a/packages/kilo-vscode/webview-ui/src/App.tsx
+++ b/packages/kilo-vscode/webview-ui/src/App.tsx
@@ -20,6 +20,7 @@ import { DisplayProvider } from "./context/display"
 import { WorkStyleProvider } from "./context/work-style"
 import { IndexingProvider } from "./context/indexing"
 import { AgentRequirementsProvider } from "./context/agent-requirements"
+import { MemoryProvider } from "./context/memory"
 import { SessionProvider, useSession } from "./context/session"
 import { LanguageBridge } from "./context/language-bridge"
 import { ChatView } from "./components/chat"
@@ -418,11 +419,13 @@ const App: Component = () => {
                                   <NotificationsProvider>
                                     <SessionProvider>
                                       <AgentRequirementsProvider>
-                                        <FeedbackProvider>
-                                          <DataBridge>
-                                            <AppContent />
-                                          </DataBridge>
-                                        </FeedbackProvider>
+                                        <MemoryProvider>
+                                          <FeedbackProvider>
+                                            <DataBridge>
+                                              <AppContent />
+                                            </DataBridge>
+                                          </FeedbackProvider>
+                                        </MemoryProvider>
                                       </AgentRequirementsProvider>
                                     </SessionProvider>
                                   </NotificationsProvider>
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
index adb44b6071..b87ce38294 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
@@ -11,6 +11,7 @@ import { Component, For, Show, createMemo } from "solid-js"
 import { Dynamic } from "solid-js/web"
 import { Part, PART_MAPPING, ToolRegistry } from "@kilocode/kilo-ui/message-part"
 import type { MessageFeedbackControls } from "@kilocode/kilo-ui/message-part"
+import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import type {
   AssistantMessage as SDKAssistantMessage,
   Part as SDKPart,
@@ -22,9 +23,11 @@ import { useSession } from "../../context/session"
 import { useDisplay } from "../../context/display"
 import { useConfig } from "../../context/config"
 import { useLanguage } from "../../context/language"
+import { useMemory } from "../../context/memory"
 import { useServer } from "../../context/server"
 import { snapshotProgress } from "../../context/session-utils"
 import { planDisplayPath } from "../../utils/plan-path"
+import { MemoryMarkerMeta } from "@kilocode/kilo-memory/marker-meta"
 import { QuestionDock } from "./QuestionDock"
 import { SuggestBar } from "./SuggestBar"
 
@@ -131,6 +134,8 @@ type ToolStateProps = {
   status?: string
 }
 
+type MemoryItem = MemoryMarkerMeta.Decoded
+
 function TodoToolCard(props: { part: ToolPart }) {
   const render = ToolRegistry.render(props.part.tool)
   const state = () => props.part.state as ToolStateProps
@@ -183,6 +188,8 @@ export const AssistantMessage: Component<AssistantMessageProps> = (props) => {
   const data = useData()
   const session = useSession()
   const display = useDisplay()
+  const mem = useMemory()
+  const language = useLanguage()
   const { config } = useConfig()
   const open = createMemo(() => config().terminal_command_display !== "collapsed")
   const edit = createMemo(() => config().code_edit_display === "expanded")
@@ -198,6 +205,54 @@ export const AssistantMessage: Component<AssistantMessageProps> = (props) => {
       return !!matchToolRequest(part, "question", session.questions())
     })
   })
+  const meta = createMemo(() =>
+    MemoryMarkerMeta.fromParts((props.parts ?? data.store.part?.[props.message.id] ?? []) as MemoryMarkerMeta.Part[]),
+  )
+  const fmt = (value: number) => value.toLocaleString(language.locale())
+  const count = (item: MemoryItem) => fmt(item.count)
+  const tokens = (item: MemoryItem) => fmt(item.tokens)
+  const label = (item: MemoryItem) =>
+    item.type === "startup" ? language.t("chat.memory.badge.injected") : language.t("chat.memory.badge.recalled")
+  const detail = (item: MemoryItem) =>
+    item.type === "startup"
+      ? language.t("chat.memory.badge.startupCtx")
+      : language.t("chat.memory.badge.items", { count: count(item) })
+  const tip = (item: MemoryItem) => {
+    const err = mem.error()
+    if (err) return <span>{err}</span>
+    const status = mem.status()
+    if (!status) return <span>{language.t("chat.memory.status.loading")}</span>
+    const ops = status.state.stats.lastOperationCount
+    const total = mem.totalTokens().toLocaleString(language.locale())
+    return (
+      <div style={{ "text-align": "left", "white-space": "normal", "max-width": "280px" }}>
+        <div>
+          {item.type === "startup"
+            ? language.t("chat.memory.session.tokens", { tokens: tokens(item) })
+            : language.t("chat.memory.badge.recalledDetail", { count: count(item), tokens: tokens(item) })}
+        </div>
+        <div>{language.t("chat.memory.total.tokens", { tokens: total })}</div>
+        <div>
+          {!status.state.enabled
+            ? language.t("chat.memory.project.disabled")
+            : language.t("chat.memory.project.enabled")}
+        </div>
+        <Show when={ops > 0}>
+          <div>
+            {language.t("chat.memory.savedOperations", {
+              count: ops.toLocaleString(language.locale()),
+            })}
+          </div>
+        </Show>
+        <Show when={mem.show()?.changes}>
+          <div>{mem.show()!.changes.split("\n").filter(Boolean).slice(-1)[0]}</div>
+        </Show>
+        <Show when={item.files.length > 0}>
+          <div>{language.t("chat.memory.badge.files", { files: item.files.join(", ") })}</div>
+        </Show>
+      </div>
+    )
+  }
 
   return (
     <>
@@ -290,6 +345,15 @@ export const AssistantMessage: Component<AssistantMessageProps> = (props) => {
           )
         }}
       </For>
+      <Show when={mem.enabled() && meta()}>
+        {(item) => (
+          <Tooltip value={tip(item())} placement="top">
+            <div data-component="assistant-memory-badge">
+              {label(item())} · {detail(item())} · {language.t("chat.memory.badge.tokens", { tokens: tokens(item()) })}
+            </div>
+          </Tooltip>
+        )}
+      </Show>
     </>
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/ContextProgress.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/ContextProgress.tsx
index b066d05982..69a311a59a 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/ContextProgress.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/ContextProgress.tsx
@@ -13,12 +13,7 @@ import { Component, createMemo, Show } from "solid-js"
 import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { useSession } from "../../context/session"
 import { useProvider } from "../../context/provider"
-
-function fmt(n: number): string {
-  if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`
-  if (n >= 1_000) return `${(n / 1_000).toFixed(1)}K`
-  return String(n)
-}
+import { formatCompactCount as fmt } from "../../utils/format"
 
 export const ContextProgress: Component = () => {
   const session = useSession()
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 d9c346cb4b..1593dadf0c 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -61,6 +61,8 @@ import { drafts, imageDrafts, reviewDrafts } from "../../utils/draft-store"
 import { ReviewComments } from "./ReviewComments"
 import { partReview, reviewBody } from "../../../../src/shared/review-comments"
 import { isEnterKeyCommitNotIme } from "../../utils/ime-enter"
+import { MEMORY_USAGE, parseMemoryCommand } from "../../utils/memory-command"
+import { useMemory } from "../../context/memory"
 
 const scrolls = new Map<string, number>()
 function mergeReviewComments(current: ReviewComment[], incoming: ReviewComment[]): ReviewComment[] {
@@ -91,6 +93,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
   const provider = useProvider()
   const language = useLanguage()
   const vscode = useVSCode()
+  const projectMemory = useMemory()
   const sid = () => session.currentSessionID() ?? props.pendingSessionID ?? session.draftSessionID() ?? undefined
   const ctx = () => {
     const id = props.boxId
@@ -936,9 +939,61 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     transcribeAndSend()
   }
 
+  const runMemory = (memory: NonNullable<ReturnType<typeof parseMemoryCommand>>) => {
+    if (memory.kind === "usage") {
+      showToast({ variant: "error", title: language.t("chat.memory.command.failed"), description: memory.reason })
+      return false
+    }
+    if (memory.kind === "help") {
+      showToast({ variant: "default", title: "/memory", description: MEMORY_USAGE })
+      return true
+    }
+    if (isDisabled() || speech.active() || terminal.pending() || git.pending() || props.blocked?.()) return false
+    const status = projectMemory.status()
+    if (
+      memory.kind === "operation" &&
+      (memory.operation === "remember" || memory.operation === "correct" || memory.operation === "forget") &&
+      status &&
+      !status.state.enabled
+    ) {
+      showToast({ variant: "error", title: language.t("chat.memory.project.disabled") })
+      return false
+    }
+    if (memory.kind === "show") vscode.postMessage({ type: "memoryShow", sessionID: sid() })
+    if (memory.kind === "operation") {
+      vscode.postMessage({
+        type: "memoryOperation",
+        operation: memory.operation,
+        sessionID: sid(),
+        ...(memory.operation === "auto" ? { mode: memory.mode } : {}),
+        ...(memory.operation === "purge" ? { confirm: memory.confirm } : {}),
+        ...(memory.operation === "remember" || memory.operation === "correct" ? { text: memory.text } : {}),
+        ...(memory.operation === "forget" ? { query: memory.query } : {}),
+      })
+    }
+    return true
+  }
+
   const handleSend = async () => {
     const draft = text().trim()
 
+    const memory = parseMemoryCommand(draft)
+    if (memory) {
+      if (!runMemory(memory)) return
+      history.append(draft)
+      setText("")
+      clearReviewComments()
+      imageAttach.clear()
+      mention.closeMention()
+      slash.close()
+      drafts.delete(draftKey())
+      reviewDrafts.delete(draftKey())
+      imageDrafts.delete(draftKey())
+      scrolls.delete(draftKey())
+      if (textareaRef) textareaRef.style.height = "auto"
+      return
+    }
+
     // Detect slash command (hoisted for both client and server command checks).
     // Prioritize exact name matches over hint/alias matches so that a server
     // command named e.g. "continue" is not hijacked by a client alias.
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
index 96ac022f93..468fe45d5a 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
@@ -14,6 +14,7 @@ import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Checkbox } from "@kilocode/kilo-ui/checkbox"
 import { useSession } from "../../context/session"
+import { useMemory } from "../../context/memory"
 import { calcTokenUsage, collapseCostBreakdown } from "../../context/session-utils"
 import { useLanguage } from "../../context/language"
 import { useVSCode } from "../../context/vscode"
@@ -24,6 +25,7 @@ import { hasModelUsage, tokenSummary } from "../../context/model-usage"
 import { SessionRenameEditor } from "../shared/SessionRenameEditor"
 import { target as todoTarget } from "../../context/todo-revert"
 import type { Part, TodoItem, ExtensionMessage } from "../../types/messages"
+import { formatCompactCount } from "../../utils/format"
 
 interface TaskHeaderProps {
   readonly?: boolean
@@ -31,6 +33,7 @@ interface TaskHeaderProps {
 
 export const TaskHeader: Component<TaskHeaderProps> = (props) => {
   const session = useSession()
+  const memory = useMemory()
   const language = useLanguage()
 
   const title = createMemo(() => session.currentSession()?.title ?? language.t("command.session.new"))
@@ -83,6 +86,17 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
     return false
   })
 
+  const memoryLabel = createMemo(() => {
+    const count = memory.sessionTokens()
+    return count > 0
+      ? language.t("chat.memory.label", { tokens: formatCompactCount(count) })
+      : language.t("chat.memory.on")
+  })
+
+  const memoryTooltip = createMemo(() =>
+    language.t("chat.memory.session.tokens", { tokens: formatCompactCount(memory.sessionTokens()) }),
+  )
+
   const vscode = useVSCode()
   const [expanded, setExpanded] = createSignal(true)
 
@@ -235,6 +249,69 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
           <Show when={tokens()}>{(tk) => <TaskUsage tokens={tk()} usage={session.modelUsage()} />}</Show>
         </div>
       </Show>
+      <Show when={memory.enabled()}>
+        <div data-slot="task-header-memory">
+          <Tooltip value={memoryTooltip()} placement="bottom" class="task-header-memory-tooltip">
+            <span data-slot="task-header-memory-status">
+              <Icon name="brain" size="small" />
+              <span>{memoryLabel()}</span>
+            </span>
+          </Tooltip>
+          <span data-slot="task-header-memory-actions">
+            <Tooltip value={language.t("chat.memory.inspect")} placement="bottom">
+              <IconButton
+                icon="eye"
+                size="small"
+                variant="ghost"
+                disabled={memory.loading() || memory.pending()}
+                onClick={() => memory.showMemory()}
+                aria-label={language.t("chat.memory.inspect")}
+              />
+            </Tooltip>
+            <Tooltip value={language.t("chat.memory.remember")} placement="bottom">
+              <IconButton
+                icon="plus-small"
+                size="small"
+                variant="ghost"
+                disabled={memory.pending() || !memory.enabled()}
+                onClick={() => memory.remember()}
+                aria-label={language.t("chat.memory.remember")}
+              />
+            </Tooltip>
+            <Tooltip value={language.t("chat.memory.forget")} placement="bottom">
+              <IconButton
+                icon="trash"
+                size="small"
+                variant="ghost"
+                disabled={memory.pending() || !memory.enabled()}
+                onClick={() => memory.forget()}
+                aria-label={language.t("chat.memory.forget")}
+              />
+            </Tooltip>
+            <Tooltip value={language.t("chat.memory.rebuild")} placement="bottom">
+              <IconButton
+                icon="reset"
+                size="small"
+                variant="ghost"
+                disabled={memory.pending() || !memory.enabled()}
+                onClick={() => memory.rebuild()}
+                aria-label={language.t("chat.memory.rebuild")}
+              />
+            </Tooltip>
+            {/* Strip only mounts when enabled, so this is always the disable action; re-enable lives in Settings > Context. */}
+            <Tooltip value={language.t("chat.memory.disable")} placement="bottom">
+              <IconButton
+                icon="circle-ban-sign"
+                size="small"
+                variant="ghost"
+                disabled={memory.pending()}
+                onClick={() => memory.disable()}
+                aria-label={language.t("chat.memory.disable")}
+              />
+            </Tooltip>
+          </span>
+        </div>
+      </Show>
       <Show when={hasTodos()}>
         <div data-component="task-header-todos">
           <button
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskUsage.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskUsage.tsx
index c63434c00b..67f2acac92 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskUsage.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskUsage.tsx
@@ -6,6 +6,7 @@ import { useLanguage } from "../../context/language"
 import { useProvider } from "../../context/provider"
 import type { SessionModelUsage } from "../../types/messages"
 import { groupModelUsage, modelUsageName, type TokenSummary } from "../../context/model-usage"
+import { formatCompactCount } from "../../utils/format"
 
 interface TaskUsageProps {
   tokens: TokenSummary
@@ -27,11 +28,7 @@ export const TaskUsage: Component<TaskUsageProps> = (props) => {
       }),
   )
 
-  const number = (value: number) => {
-    if (value >= 1_000_000) return `${(value / 1_000_000).toFixed(1)}M`
-    if (value >= 1_000) return `${(value / 1_000).toFixed(1)}K`
-    return String(value)
-  }
+  const number = formatCompactCount
   const count = (value: number) => value.toLocaleString(language.locale())
   const cost = (input: number) => {
     const value = Math.max(0, Number.isFinite(input) ? input : 0)
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx
index 878d260e39..5e6607212e 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx
@@ -1,4 +1,4 @@
-import { Component, For, createSignal } from "solid-js"
+import { Component, For, Show, createSignal } from "solid-js"
 import { Switch } from "@kilocode/kilo-ui/switch"
 import { TextField } from "@kilocode/kilo-ui/text-field"
 import { Card } from "@kilocode/kilo-ui/card"
@@ -7,10 +7,12 @@ import { IconButton } from "@kilocode/kilo-ui/icon-button"
 
 import { useConfig } from "../../context/config"
 import { useLanguage } from "../../context/language"
+import { useMemory } from "../../context/memory"
 import SettingsRow from "./SettingsRow"
 
 const ContextTab: Component = () => {
   const { config, updateConfig } = useConfig()
+  const memory = useMemory()
   const language = useLanguage()
   const [newPattern, setNewPattern] = createSignal("")
 
@@ -50,9 +52,85 @@ const ContextTab: Component = () => {
     updateConfig({ watcher: { ignore: current } })
   }
 
+  const memoryStats = () => {
+    const status = memory.status()
+    if (!status) return language.t("settings.context.memory.status.notLoaded")
+    if (!status.state.enabled) return language.t("settings.context.memory.status.disabled")
+    const tokens = status.index.estimatedTokens.toLocaleString(language.locale())
+    const session = memory.sessionTokens().toLocaleString(language.locale())
+    const ops = status.state.stats.lastOperationCount.toLocaleString(language.locale())
+    return language.t("settings.context.memory.status.enabledTokensOps", { session, tokens, ops })
+  }
+
   return (
     <div>
+      <h4 style={{ "margin-top": "0", "margin-bottom": "8px" }}>{language.t("settings.context.memory.title")}</h4>
+      <Card>
+        <SettingsRow title={language.t("settings.context.memory.project.title")} description={memoryStats()}>
+          <Switch
+            checked={memory.enabled()}
+            onChange={(checked) => (checked ? memory.enable() : memory.disable())}
+            hideLabel
+            disabled={memory.pending()}
+          >
+            {language.t("settings.context.memory.project.title")}
+          </Switch>
+        </SettingsRow>
+        <SettingsRow
+          title={language.t("settings.context.memory.autoSave.title")}
+          description={language.t("settings.context.memory.autoSave.description")}
+        >
+          <Switch
+            checked={memory.status()?.state.autoConsolidate ?? true}
+            onChange={(checked) => memory.auto(checked ? "on" : "off")}
+            hideLabel
+            disabled={memory.pending() || !memory.status()}
+          >
+            {language.t("settings.context.memory.autoSave.title")}
+          </Switch>
+        </SettingsRow>
+        <SettingsRow
+          title={language.t("settings.context.memory.index.title")}
+          description={
+            memory.enabled()
+              ? language.t("settings.context.memory.index.path", { path: memory.status()!.root })
+              : language.t("settings.context.memory.index.enable")
+          }
+          last
+        >
+          <div style={{ display: "flex", gap: "6px", "align-items": "center" }}>
+            <Button variant="secondary" size="small" icon="eye" onClick={() => memory.showMemory()}>
+              {language.t("settings.context.memory.inspect")}
+            </Button>
+            <IconButton
+              size="small"
+              variant="ghost"
+              icon="reset"
+              disabled={memory.pending()}
+              onClick={() => memory.rebuild()}
+              aria-label={language.t("settings.context.memory.rebuild")}
+            />
+          </div>
+        </SettingsRow>
+        <Show when={memory.error()}>
+          {(err) => (
+            <div
+              style={{
+                padding: "8px 12px",
+                color: "var(--vscode-errorForeground)",
+                "font-size": "var(--kilo-font-size-12)",
+              }}
+            >
+              {err()}
+            </div>
+          )}
+        </Show>
+      </Card>
+
       {/* Compaction settings */}
+      <h4 style={{ "margin-top": "16px", "margin-bottom": "8px" }}>
+        {language.t("settings.context.compaction.title")}
+      </h4>
       <Card>
         <SettingsRow
           title={language.t("settings.context.autoCompaction.title")}
diff --git a/packages/kilo-vscode/webview-ui/src/context/memory.tsx b/packages/kilo-vscode/webview-ui/src/context/memory.tsx
new file mode 100644
index 0000000000..a5070184aa
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/context/memory.tsx
@@ -0,0 +1,220 @@
+import { createContext, createEffect, createMemo, createSignal, onCleanup, useContext } from "solid-js"
+import type { Accessor, ParentComponent } from "solid-js"
+import { useServer } from "./server"
+import { useSession } from "./session"
+import { useVSCode } from "./vscode"
+import { useLanguage } from "./language"
+import { showToast } from "@kilocode/kilo-ui/toast"
+import type { MemoryShowResponse, MemoryStatusResponse } from "@kilocode/sdk/v2"
+import type { ExtensionMessage } from "../types/messages"
+
+export interface MemoryContextValue {
+  status: Accessor<MemoryStatusResponse | undefined>
+  show: Accessor<MemoryShowResponse | undefined>
+  loading: Accessor<boolean>
+  pending: Accessor<boolean>
+  error: Accessor<string | undefined>
+  enabled: Accessor<boolean>
+  sessionTokens: Accessor<number>
+  totalTokens: Accessor<number>
+  refresh: (includeSources?: boolean) => void
+  showMemory: () => void
+  enable: () => void
+  disable: () => void
+  auto: (mode: "on" | "off") => void
+  rebuild: () => void
+  remember: () => void
+  forget: () => void
+}
+
+export const MemoryContext = createContext<MemoryContextValue>()
+const EVENT_DEDUPE_MS = 1000
+
+export const MemoryProvider: ParentComponent = (props) => {
+  const vscode = useVSCode()
+  const server = useServer()
+  const session = useSession()
+  const language = useLanguage()
+  const [status, setStatus] = createSignal<MemoryStatusResponse | undefined>()
+  const [show, setShow] = createSignal<MemoryShowResponse | undefined>()
+  const [loading, setLoading] = createSignal(false)
+  const [pending, setPending] = createSignal<string | undefined>()
+  const [error, setError] = createSignal<string | undefined>()
+
+  const id = () => session.currentSessionID()
+  const key = (sid?: string) => sid ?? ""
+  const current = (sid?: string) => {
+    if (!sid) return true
+    // A response can be addressed to a draft session that hasn't been promoted to
+    // currentSessionID yet (PromptInput posts with the draft id), so match both.
+    return sid === id() || sid === session.draftSessionID()
+  }
+  let last: { key: string; time: number } | undefined
+  let scope = ""
+
+  const clear = () => {
+    setStatus(undefined)
+    setShow(undefined)
+    setError(undefined)
+    setPending(undefined)
+    last = undefined
+  }
+
+  const refresh = (includeSources = false) => {
+    if (!server.isConnected()) return
+    setLoading(true)
+    setError(undefined)
+    vscode.postMessage({ type: "requestMemory", sessionID: id(), includeSources })
+  }
+
+  const operation = (op: "enable" | "disable" | "rebuild") => {
+    if (!server.isConnected()) return
+    setPending(key(id()))
+    setError(undefined)
+    vscode.postMessage({ type: "memoryOperation", operation: op, sessionID: id() })
+  }
+
+  const auto = (mode: "on" | "off") => {
+    if (!server.isConnected()) return
+    setPending(key(id()))
+    setError(undefined)
+    vscode.postMessage({ type: "memoryOperation", operation: "auto", mode, sessionID: id() })
+  }
+
+  const prompt = (op: "remember" | "forget") => {
+    if (!server.isConnected()) return
+    setPending(key(id()))
+    setError(undefined)
+    vscode.postMessage({ type: "memoryPrompt", operation: op, sessionID: id() })
+  }
+
+  const showMemory = () => {
+    if (!server.isConnected()) return
+    setLoading(true)
+    setError(undefined)
+    vscode.postMessage({ type: "memoryShow", sessionID: id() })
+  }
+
+  const event = (message: Extract<ExtensionMessage, { type: "memoryEvent" }>) => {
+    if (!current(message.sessionID)) return
+    if (message.detail.type === "skipped") return
+    if (!message.detail.message) return
+    const dedupeKey = `${message.sessionID ?? ""}:${message.detail.type ?? ""}:${message.detail.message}`
+    const now = Date.now()
+    if (last?.key === dedupeKey && now - last.time < EVENT_DEDUPE_MS) return
+    last = { key: dedupeKey, time: now }
+    showToast({
+      ...(message.detail.type === "saved"
+        ? { variant: "success" as const }
+        : message.detail.type === "error"
+          ? { variant: "error" as const }
+          : {}),
+      title: message.detail.message,
+    })
+  }
+
+  const loaded = (message: Extract<ExtensionMessage, { type: "memoryLoaded" }>) => {
+    if (!current(message.sessionID)) return
+    setLoading(false)
+    if (message.error) {
+      setError(message.error)
+      setStatus(undefined)
+      setShow(undefined)
+      return
+    }
+    if (message.status) setStatus(message.status)
+    if (message.show) setShow(message.show)
+    setError(undefined)
+  }
+
+  const done = (message: Extract<ExtensionMessage, { type: "memoryOperationResult" }>) => {
+    if (pending() === key(message.sessionID)) setPending(undefined)
+    if (!current(message.sessionID)) return
+    setLoading(false)
+    if (!message.ok) {
+      const err = message.error ?? language.t("chat.memory.command.failed")
+      setError(err)
+      showToast({ variant: "error", title: err })
+      return
+    }
+    if (message.status) setStatus(message.status)
+    if (message.show) setShow(message.show)
+    setError(undefined)
+  }
+
+  const receive = (message: ExtensionMessage) => {
+    if (message.type === "memoryEvent") {
+      event(message)
+      return
+    }
+    if (message.type === "memoryLoaded") {
+      loaded(message)
+      return
+    }
+    if (message.type === "memoryOperationResult") {
+      done(message)
+      return
+    }
+    if (message.type === "extensionDataReady" && server.isConnected() && !status()) refresh(false)
+  }
+
+  const unsubscribe = vscode.onMessage(receive)
+
+  onCleanup(unsubscribe)
+
+  createEffect(() => {
+    const sid = id()
+    const dir = server.workspaceDirectory()
+    const connected = server.isConnected()
+    const next = `${connected ? "1" : "0"}:${sid ?? ""}:${dir ?? ""}`
+    if (scope !== next) {
+      scope = next
+      clear()
+    }
+    if (!connected) {
+      setLoading(false)
+      return
+    }
+    refresh(false)
+  })
+
+  const sessionTokens = (snapshot?: MemoryStatusResponse) => {
+    const sid = id()
+    if (!snapshot?.state.enabled) return 0
+    if (!sid || snapshot.state.stats.lastInjectedSessionID !== sid) return 0
+    return snapshot.state.stats.lastInjectedTokens
+  }
+
+  const total = createMemo(() => status()?.index.estimatedTokens ?? 0)
+
+  const sessionTotal = createMemo(() => sessionTokens(status()))
+
+  const value: MemoryContextValue = {
+    status,
+    show,
+    loading,
+    pending: createMemo(() => pending() === key(id())),
+    error,
+    enabled: createMemo(() => status()?.state.enabled ?? false),
+    sessionTokens: sessionTotal,
+    totalTokens: total,
+    refresh,
+    showMemory,
+    enable: () => operation("enable"),
+    disable: () => operation("disable"),
+    auto,
+    rebuild: () => operation("rebuild"),
+    remember: () => prompt("remember"),
+    forget: () => prompt("forget"),
+  }
+
+  return <MemoryContext.Provider value={value}>{props.children}</MemoryContext.Provider>
+}
+
+export function useMemory(): MemoryContextValue {
+  const context = useContext(MemoryContext)
+  if (!context) {
+    throw new Error("useMemory must be used within a MemoryProvider")
+  }
+  return context
+}
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index 5a66075adc..9dd3f6eb34 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -1590,6 +1590,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "إنشاء نقاط فحص قبل تحرير الملفات",
   "settings.context.autoCompaction.title": "ضغط تلقائي",
   "settings.context.autoCompaction.description": "ضغط السياق تلقائياً قبل أن يصل إلى الحد",
+  "settings.context.compaction.title": "الضغط",
   "settings.context.compactionLimit.title": "حد الضغط التلقائي",
   "settings.context.compactionLimit.description":
     "اضغط عندما يصل السياق إلى هذه النسبة المئوية من نافذة النموذج. اتركه فارغاً لاستخدام هامش الأمان فقط.",
@@ -1598,6 +1599,42 @@ export const dict = {
   "settings.context.watcherPatterns": "أنماط تجاهل مراقب الملفات",
   "settings.context.watcherPatterns.description": "أنماط glob للملفات التي يجب على المراقب تجاهلها",
 
+  "settings.context.memory.title": "الذاكرة",
+  "settings.context.memory.project.title": "ذاكرة المشروع",
+  "settings.context.memory.autoSave.title": "حفظ ذاكرة المشروع تلقائيًا",
+  "settings.context.memory.autoSave.description":
+    "حفظ حقائق المشروع الدائمة تلقائيًا من الجولات المكتملة عند تفعيل الذاكرة.",
+  "settings.context.memory.index.title": "فهرس الذاكرة",
+  "settings.context.memory.status.notLoaded": "غير محمّلة",
+  "settings.context.memory.status.disabled": "معطّلة",
+  "settings.context.memory.status.enabledTokensOps":
+    "مفعّلة - ~{{session}} رموز سياق بدء التشغيل في هذه الجلسة - ~{{tokens}} رموز في الفهرس المخزّن - آخر عملية {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "فعّل الذاكرة لإنشاء ملفات ذاكرة المشروع.",
+  "settings.context.memory.inspect": "فحص",
+  "settings.context.memory.rebuild": "إعادة بناء فهرس الذاكرة",
+  "chat.memory.on": "الذاكرة مفعّلة",
+  "chat.memory.label": "الذاكرة · {{tokens}} رمز",
+  "chat.memory.status.loading": "جارٍ تحميل حالة الذاكرة",
+  "chat.memory.session.tokens": "سياق بدء التشغيل في هذه الجلسة: {{tokens}} رموز",
+  "chat.memory.total.tokens": "الفهرس المخزّن: {{tokens}} رموز",
+  "chat.memory.project.enabled": "ذاكرة المشروع مفعّلة",
+  "chat.memory.project.disabled": "ذاكرة المشروع معطّلة",
+  "chat.memory.command.failed": "فشل أمر الذاكرة",
+  "chat.memory.savedOperations": "آخر عملية ذاكرة: {{count}} عمليات",
+  "chat.memory.inspect": "فحص الذاكرة",
+  "chat.memory.remember": "تذكّر",
+  "chat.memory.forget": "انسَ",
+  "chat.memory.rebuild": "إعادة بناء الفهرس",
+  "chat.memory.disable": "تعطيل الذاكرة",
+  "chat.memory.badge.injected": "تم حقن الذاكرة",
+  "chat.memory.badge.recalled": "تم استدعاء الذاكرة",
+  "chat.memory.badge.startupCtx": "سياق البدء",
+  "chat.memory.badge.items": "{{count}} عناصر",
+  "chat.memory.badge.tokens": "{{tokens}} رموز",
+  "chat.memory.badge.recalledDetail": "تم استدعاء الذاكرة: {{count}} عناصر - {{tokens}} رموز",
+  "chat.memory.badge.files": "ملفات الذاكرة: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "استخدام prompt مخصص",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index f738a64eae..8f7c0867cd 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -1638,6 +1638,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Criar pontos de verificação antes de editar arquivos",
   "settings.context.autoCompaction.title": "Compactação automática",
   "settings.context.autoCompaction.description": "Compactar automaticamente o contexto antes que atinja o limite",
+  "settings.context.compaction.title": "Compactação",
   "settings.context.compactionLimit.title": "Limite de compactação automática",
   "settings.context.compactionLimit.description":
     "Compacte quando o contexto atingir esta porcentagem da janela do modelo. Deixe em branco para usar apenas a margem de segurança.",
@@ -1646,6 +1647,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Padrões de ignorar do observador",
   "settings.context.watcherPatterns.description": "Padrões glob para arquivos que o observador deve ignorar",
 
+  "settings.context.memory.title": "Memória",
+  "settings.context.memory.project.title": "Memória do projeto",
+  "settings.context.memory.autoSave.title": "Salvar memória do projeto automaticamente",
+  "settings.context.memory.autoSave.description":
+    "Salva automaticamente fatos duradouros do projeto a partir de turnos concluídos quando a memória está ativada.",
+  "settings.context.memory.index.title": "Índice da memória",
+  "settings.context.memory.status.notLoaded": "Não carregada",
+  "settings.context.memory.status.disabled": "Desativada",
+  "settings.context.memory.status.enabledTokensOps":
+    "Ativada - ~{{session}} tokens de contexto inicial nesta sessão - ~{{tokens}} tokens no índice armazenado - última op. {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Ative a memória para criar arquivos de memória do projeto.",
+  "settings.context.memory.inspect": "Inspecionar",
+  "settings.context.memory.rebuild": "Reconstruir índice da memória",
+  "chat.memory.on": "Memória ligada",
+  "chat.memory.label": "Memória · {{tokens}} tokens",
+  "chat.memory.status.loading": "Carregando status da memória",
+  "chat.memory.session.tokens": "Contexto inicial desta sessão: {{tokens}} tokens",
+  "chat.memory.total.tokens": "Índice armazenado: {{tokens}} tokens",
+  "chat.memory.project.enabled": "Memória do projeto ativada",
+  "chat.memory.project.disabled": "Memória do projeto desativada",
+  "chat.memory.command.failed": "Comando de memória falhou",
+  "chat.memory.savedOperations": "Última operação de memória: {{count}} ops",
+  "chat.memory.inspect": "Inspecionar memória",
+  "chat.memory.remember": "Lembrar",
+  "chat.memory.forget": "Esquecer",
+  "chat.memory.rebuild": "Reconstruir índice",
+  "chat.memory.disable": "Desativar memória",
+  "chat.memory.badge.injected": "Memória injetada",
+  "chat.memory.badge.recalled": "Memória recuperada",
+  "chat.memory.badge.startupCtx": "ctx inicial",
+  "chat.memory.badge.items": "{{count}} itens",
+  "chat.memory.badge.tokens": "{{tokens}} tokens",
+  "chat.memory.badge.recalledDetail": "Memória recuperada: {{count}} itens - {{tokens}} tokens",
+  "chat.memory.badge.files": "Arquivos de memória: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Usar prompt personalizado",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 13674b2f11..96d098fd3e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -1631,6 +1631,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Kreiraj kontrolne točke prije uređivanja datoteka",
   "settings.context.autoCompaction.title": "Automatska kompresija",
   "settings.context.autoCompaction.description": "Automatski komprimiraj kontekst prije nego dostigne limit",
+  "settings.context.compaction.title": "Kompresija",
   "settings.context.compactionLimit.title": "Limit automatske kompresije",
   "settings.context.compactionLimit.description":
     "Komprimiraj kada kontekst dostigne ovaj procenat prozora modela. Ostavite prazno da koristite samo sigurnosnu rezervu.",
@@ -1639,6 +1640,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Uzorci ignoriranja za promatrač datoteka",
   "settings.context.watcherPatterns.description": "Glob uzorci za datoteke koje promatrač treba ignorirati",
 
+  "settings.context.memory.title": "Memorija",
+  "settings.context.memory.project.title": "Memorija projekta",
+  "settings.context.memory.autoSave.title": "Automatsko spremanje memorije projekta",
+  "settings.context.memory.autoSave.description":
+    "Automatski sprema trajne činjenice projekta iz završenih koraka kada je memorija uključena.",
+  "settings.context.memory.index.title": "Indeks memorije",
+  "settings.context.memory.status.notLoaded": "Nije učitana",
+  "settings.context.memory.status.disabled": "Onemogućena",
+  "settings.context.memory.status.enabledTokensOps":
+    "Omogućena - ~{{session}} tokena početnog konteksta u ovoj sesiji - ~{{tokens}} tokena spremljenog indeksa - zadnja op. {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Omogućite memoriju za kreiranje datoteka memorije projekta.",
+  "settings.context.memory.inspect": "Pregledaj",
+  "settings.context.memory.rebuild": "Ponovo izgradi indeks memorije",
+  "chat.memory.on": "Memorija uključena",
+  "chat.memory.label": "Memorija · {{tokens}} tokena",
+  "chat.memory.status.loading": "Učitavanje statusa memorije",
+  "chat.memory.session.tokens": "Početni kontekst ove sesije: {{tokens}} tokena",
+  "chat.memory.total.tokens": "Spremljeni indeks: {{tokens}} tokena",
+  "chat.memory.project.enabled": "Memorija projekta omogućena",
+  "chat.memory.project.disabled": "Memorija projekta onemogućena",
+  "chat.memory.command.failed": "Komanda memorije nije uspjela",
+  "chat.memory.savedOperations": "Zadnja operacija memorije: {{count}} op.",
+  "chat.memory.inspect": "Pregledaj memoriju",
+  "chat.memory.remember": "Zapamti",
+  "chat.memory.forget": "Zaboravi",
+  "chat.memory.rebuild": "Ponovo izgradi indeks",
+  "chat.memory.disable": "Onemogući memoriju",
+  "chat.memory.badge.injected": "Memorija ubačena",
+  "chat.memory.badge.recalled": "Memorija opozvana",
+  "chat.memory.badge.startupCtx": "početni ctx",
+  "chat.memory.badge.items": "{{count}} stavki",
+  "chat.memory.badge.tokens": "{{tokens}} tokena",
+  "chat.memory.badge.recalledDetail": "Memorija opozvana: {{count}} stavki - {{tokens}} tokena",
+  "chat.memory.badge.files": "Datoteke memorije: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Koristi prilagođeni prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index c68095f7b6..c9ac7fe483 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -1621,6 +1621,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Opret kontrolpunkter før filredigeringer",
   "settings.context.autoCompaction.title": "Automatisk komprimering",
   "settings.context.autoCompaction.description": "Komprimér automatisk kontekst, før den når grænsen",
+  "settings.context.compaction.title": "Komprimering",
   "settings.context.compactionLimit.title": "Grænse for automatisk komprimering",
   "settings.context.compactionLimit.description":
     "Komprimér, når konteksten når denne procentdel af modelvinduet. Lad feltet være tomt for kun at bruge sikkerhedsbufferen.",
@@ -1629,6 +1630,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Filvagt-ignormønstre",
   "settings.context.watcherPatterns.description": "Glob-mønstre for filer, som vagten skal ignorere",
 
+  "settings.context.memory.title": "Hukommelse",
+  "settings.context.memory.project.title": "Projekthukommelse",
+  "settings.context.memory.autoSave.title": "Gem projekthukommelse automatisk",
+  "settings.context.memory.autoSave.description":
+    "Gemmer automatisk varige projektfakta fra afsluttede ture, når hukommelse er aktiveret.",
+  "settings.context.memory.index.title": "Hukommelsesindeks",
+  "settings.context.memory.status.notLoaded": "Ikke indlæst",
+  "settings.context.memory.status.disabled": "Deaktiveret",
+  "settings.context.memory.status.enabledTokensOps":
+    "Aktiveret - ~{{session}} opstartstokens i denne session - ~{{tokens}} tokens i gemt indeks - seneste handling {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Aktivér hukommelse for at oprette projektets hukommelsesfiler.",
+  "settings.context.memory.inspect": "Inspicér",
+  "settings.context.memory.rebuild": "Genopbyg hukommelsesindeks",
+  "chat.memory.on": "Hukommelse til",
+  "chat.memory.label": "Hukommelse · {{tokens}} tokens",
+  "chat.memory.status.loading": "Indlæser hukommelsesstatus",
+  "chat.memory.session.tokens": "Opstartskontekst i denne session: {{tokens}} tokens",
+  "chat.memory.total.tokens": "Gemt indeks: {{tokens}} tokens",
+  "chat.memory.project.enabled": "Projekthukommelse aktiveret",
+  "chat.memory.project.disabled": "Projekthukommelse deaktiveret",
+  "chat.memory.command.failed": "Hukommelseskommando mislykkedes",
+  "chat.memory.savedOperations": "Seneste hukommelseshandling: {{count}} handlinger",
+  "chat.memory.inspect": "Inspicér hukommelse",
+  "chat.memory.remember": "Husk",
+  "chat.memory.forget": "Glem",
+  "chat.memory.rebuild": "Genopbyg indeks",
+  "chat.memory.disable": "Deaktivér hukommelse",
+  "chat.memory.badge.injected": "Hukommelse injiceret",
+  "chat.memory.badge.recalled": "Hukommelse genkaldt",
+  "chat.memory.badge.startupCtx": "opstartsctx",
+  "chat.memory.badge.items": "{{count}} elementer",
+  "chat.memory.badge.tokens": "{{tokens}} tokens",
+  "chat.memory.badge.recalledDetail": "Hukommelse genkaldt: {{count}} elementer - {{tokens}} tokens",
+  "chat.memory.badge.files": "Hukommelsesfiler: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Brug brugerdefineret prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 5748b0116f..7a22c29c89 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -1657,6 +1657,7 @@ export const dict = {
     "Prüfpunkte vor Dateibearbeitungen erstellen, um vorherige Zustände wiederherstellen zu können",
   "settings.context.autoCompaction.title": "Automatische Komprimierung",
   "settings.context.autoCompaction.description": "Kontext automatisch komprimieren, bevor er das Limit erreicht",
+  "settings.context.compaction.title": "Komprimierung",
   "settings.context.compactionLimit.title": "Limit für automatische Komprimierung",
   "settings.context.compactionLimit.description":
     "Komprimieren, wenn der Kontext diesen Prozentsatz des Modellfensters erreicht. Leer lassen, um nur den Sicherheitspuffer zu verwenden.",
@@ -1665,6 +1666,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Datei-Watcher-Ignorierungsmuster",
   "settings.context.watcherPatterns.description": "Glob-Muster für Dateien, die der Watcher ignorieren soll",
 
+  "settings.context.memory.title": "Speicher",
+  "settings.context.memory.project.title": "Projektspeicher",
+  "settings.context.memory.autoSave.title": "Projektspeicher automatisch speichern",
+  "settings.context.memory.autoSave.description":
+    "Dauerhafte Projektfakten aus abgeschlossenen Durchläufen automatisch speichern, wenn Speicher aktiviert ist.",
+  "settings.context.memory.index.title": "Speicherindex",
+  "settings.context.memory.status.notLoaded": "Nicht geladen",
+  "settings.context.memory.status.disabled": "Deaktiviert",
+  "settings.context.memory.status.enabledTokensOps":
+    "Aktiviert - ~{{session}} Startkontext-Tokens in dieser Sitzung - ~{{tokens}} Tokens im gespeicherten Index - letzte Operation {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Aktivieren Sie den Speicher, um Projektspeicherdateien zu erstellen.",
+  "settings.context.memory.inspect": "Prüfen",
+  "settings.context.memory.rebuild": "Speicherindex neu erstellen",
+  "chat.memory.on": "Speicher an",
+  "chat.memory.label": "Speicher · {{tokens}} Tokens",
+  "chat.memory.status.loading": "Speicherstatus wird geladen",
+  "chat.memory.session.tokens": "Startkontext dieser Sitzung: {{tokens}} Tokens",
+  "chat.memory.total.tokens": "Gespeicherter Index: {{tokens}} Tokens",
+  "chat.memory.project.enabled": "Projektspeicher aktiviert",
+  "chat.memory.project.disabled": "Projektspeicher deaktiviert",
+  "chat.memory.command.failed": "Speicherbefehl fehlgeschlagen",
+  "chat.memory.savedOperations": "Letzte Speicheroperation: {{count}} Vorgänge",
+  "chat.memory.inspect": "Speicher prüfen",
+  "chat.memory.remember": "Merken",
+  "chat.memory.forget": "Vergessen",
+  "chat.memory.rebuild": "Index neu erstellen",
+  "chat.memory.disable": "Speicher deaktivieren",
+  "chat.memory.badge.injected": "Speicher eingefügt",
+  "chat.memory.badge.recalled": "Speicher abgerufen",
+  "chat.memory.badge.startupCtx": "Startkontext",
+  "chat.memory.badge.items": "{{count}} Elemente",
+  "chat.memory.badge.tokens": "{{tokens}} Tokens",
+  "chat.memory.badge.recalledDetail": "Speicher abgerufen: {{count}} Elemente - {{tokens}} Tokens",
+  "chat.memory.badge.files": "Speicherdateien: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Benutzerdefinierten prompt verwenden",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index c379dd5c76..ae7a17800b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -1602,6 +1602,7 @@ export const dict = {
 
   "settings.context.autoCompaction.title": "Auto Compaction",
   "settings.context.autoCompaction.description": "Automatically compact context before it reaches the limit",
+  "settings.context.compaction.title": "Compaction",
   "settings.context.compactionLimit.title": "Auto Compaction Limit",
   "settings.context.compactionLimit.description":
     "Compact when context reaches this percentage of the model window. Leave blank to use the safety buffer only.",
@@ -1609,6 +1610,41 @@ export const dict = {
   "settings.context.prune.description": "Remove old tool outputs during compaction",
   "settings.context.watcherPatterns": "File Watcher Ignore Patterns",
   "settings.context.watcherPatterns.description": "Glob patterns for files the watcher should ignore",
+  "settings.context.memory.title": "Memory",
+  "settings.context.memory.project.title": "Project memory",
+  "settings.context.memory.autoSave.title": "Auto-save project memory",
+  "settings.context.memory.autoSave.description":
+    "Automatically save durable project facts from completed turns when memory is enabled.",
+  "settings.context.memory.index.title": "Memory index",
+  "settings.context.memory.status.notLoaded": "Not loaded",
+  "settings.context.memory.status.disabled": "Disabled",
+  "settings.context.memory.status.enabledTokensOps":
+    "Enabled - ~{{session}} startup tokens this session - ~{{tokens}} stored index tokens - last op {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Enable memory to create project memory files.",
+  "settings.context.memory.inspect": "Inspect",
+  "settings.context.memory.rebuild": "Rebuild memory index",
+  "chat.memory.on": "Memory on",
+  "chat.memory.label": "Memory · {{tokens}} tokens",
+  "chat.memory.status.loading": "Memory status loading",
+  "chat.memory.session.tokens": "Startup context this session: {{tokens}} tokens",
+  "chat.memory.total.tokens": "Stored index: {{tokens}} tokens",
+  "chat.memory.project.enabled": "Project memory enabled",
+  "chat.memory.project.disabled": "Project memory disabled",
+  "chat.memory.command.failed": "Memory command failed",
+  "chat.memory.savedOperations": "Last memory operation: {{count}} ops",
+  "chat.memory.inspect": "Inspect memory",
+  "chat.memory.remember": "Remember",
+  "chat.memory.forget": "Forget",
+  "chat.memory.rebuild": "Rebuild index",
+  "chat.memory.disable": "Disable memory",
+  "chat.memory.badge.injected": "Memory injected",
+  "chat.memory.badge.recalled": "Memory recalled",
+  "chat.memory.badge.startupCtx": "startup ctx",
+  "chat.memory.badge.items": "{{count}} items",
+  "chat.memory.badge.tokens": "{{tokens}} tokens",
+  "chat.memory.badge.recalledDetail": "Memory recalled: {{count}} items - {{tokens}} tokens",
+  "chat.memory.badge.files": "Memory files: {{files}}",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Use Custom Prompt",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 5188521433..bdeaf5939a 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -1646,6 +1646,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Crear puntos de control antes de editar archivos",
   "settings.context.autoCompaction.title": "Compactación automática",
   "settings.context.autoCompaction.description": "Compactar automáticamente el contexto antes de que alcance el límite",
+  "settings.context.compaction.title": "Compactación",
   "settings.context.compactionLimit.title": "Límite de compactación automática",
   "settings.context.compactionLimit.description":
     "Compactar cuando el contexto alcance este porcentaje de la ventana del modelo. Déjalo en blanco para usar solo el búfer de seguridad.",
@@ -1654,6 +1655,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Patrones de ignorar del observador",
   "settings.context.watcherPatterns.description": "Patrones glob para archivos que el observador debe ignorar",
 
+  "settings.context.memory.title": "Memoria",
+  "settings.context.memory.project.title": "Memoria del proyecto",
+  "settings.context.memory.autoSave.title": "Guardado automático de memoria del proyecto",
+  "settings.context.memory.autoSave.description":
+    "Guardar automáticamente hechos duraderos del proyecto desde turnos completados cuando la memoria está activada.",
+  "settings.context.memory.index.title": "Índice de memoria",
+  "settings.context.memory.status.notLoaded": "No cargada",
+  "settings.context.memory.status.disabled": "Desactivada",
+  "settings.context.memory.status.enabledTokensOps":
+    "Activada - ~{{session}} tokens de contexto inicial en esta sesión - ~{{tokens}} tokens del índice almacenado - última op. {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Activa la memoria para crear archivos de memoria del proyecto.",
+  "settings.context.memory.inspect": "Inspeccionar",
+  "settings.context.memory.rebuild": "Reconstruir índice de memoria",
+  "chat.memory.on": "Memoria activada",
+  "chat.memory.label": "Memoria · {{tokens}} tokens",
+  "chat.memory.status.loading": "Cargando estado de la memoria",
+  "chat.memory.session.tokens": "Contexto inicial de esta sesión: {{tokens}} tokens",
+  "chat.memory.total.tokens": "Índice almacenado: {{tokens}} tokens",
+  "chat.memory.project.enabled": "Memoria del proyecto activada",
+  "chat.memory.project.disabled": "Memoria del proyecto desactivada",
+  "chat.memory.command.failed": "Error en el comando de memoria",
+  "chat.memory.savedOperations": "Última operación de memoria: {{count}} ops",
+  "chat.memory.inspect": "Inspeccionar memoria",
+  "chat.memory.remember": "Recordar",
+  "chat.memory.forget": "Olvidar",
+  "chat.memory.rebuild": "Reconstruir índice",
+  "chat.memory.disable": "Desactivar memoria",
+  "chat.memory.badge.injected": "Memoria inyectada",
+  "chat.memory.badge.recalled": "Memoria recuperada",
+  "chat.memory.badge.startupCtx": "ctx inicial",
+  "chat.memory.badge.items": "{{count}} elementos",
+  "chat.memory.badge.tokens": "{{tokens}} tokens",
+  "chat.memory.badge.recalledDetail": "Memoria recuperada: {{count}} elementos - {{tokens}} tokens",
+  "chat.memory.badge.files": "Archivos de memoria: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Usar prompt personalizado",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index f05e4c68fb..95fff423ce 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1666,6 +1666,7 @@ export const dict = {
   "settings.context.autoCompaction.title": "Compaction automatique",
   "settings.context.autoCompaction.description":
     "Compacter automatiquement le contexte avant qu'il n'atteigne la limite",
+  "settings.context.compaction.title": "Compactage",
   "settings.context.compactionLimit.title": "Limite de compactage automatique",
   "settings.context.compactionLimit.description":
     "Compacter lorsque le contexte atteint ce pourcentage de la fenêtre du modèle. Laissez vide pour utiliser uniquement la marge de sécurité.",
@@ -1674,6 +1675,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Motifs d'ignorance de l'observateur",
   "settings.context.watcherPatterns.description": "Motifs glob pour les fichiers que l'observateur doit ignorer",
 
+  "settings.context.memory.title": "Mémoire",
+  "settings.context.memory.project.title": "Mémoire du projet",
+  "settings.context.memory.autoSave.title": "Enregistrement automatique de la mémoire du projet",
+  "settings.context.memory.autoSave.description":
+    "Enregistrer automatiquement les faits durables du projet à partir des tours terminés lorsque la mémoire est activée.",
+  "settings.context.memory.index.title": "Index de mémoire",
+  "settings.context.memory.status.notLoaded": "Non chargée",
+  "settings.context.memory.status.disabled": "Désactivée",
+  "settings.context.memory.status.enabledTokensOps":
+    "Activée - ~{{session}} tokens de contexte initial dans cette session - ~{{tokens}} tokens dans l’index stocké - dernière opération {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Activez la mémoire pour créer les fichiers de mémoire du projet.",
+  "settings.context.memory.inspect": "Inspecter",
+  "settings.context.memory.rebuild": "Reconstruire l’index de mémoire",
+  "chat.memory.on": "Mémoire activée",
+  "chat.memory.label": "Mémoire · {{tokens}} tokens",
+  "chat.memory.status.loading": "Chargement de l’état de la mémoire",
+  "chat.memory.session.tokens": "Contexte initial de cette session : {{tokens}} tokens",
+  "chat.memory.total.tokens": "Index stocké : {{tokens}} tokens",
+  "chat.memory.project.enabled": "Mémoire du projet activée",
+  "chat.memory.project.disabled": "Mémoire du projet désactivée",
+  "chat.memory.command.failed": "La commande de mémoire a échoué",
+  "chat.memory.savedOperations": "Dernière opération de mémoire : {{count}} ops",
+  "chat.memory.inspect": "Inspecter la mémoire",
+  "chat.memory.remember": "Mémoriser",
+  "chat.memory.forget": "Oublier",
+  "chat.memory.rebuild": "Reconstruire l’index",
+  "chat.memory.disable": "Désactiver la mémoire",
+  "chat.memory.badge.injected": "Mémoire injectée",
+  "chat.memory.badge.recalled": "Mémoire rappelée",
+  "chat.memory.badge.startupCtx": "ctx initial",
+  "chat.memory.badge.items": "{{count}} éléments",
+  "chat.memory.badge.tokens": "{{tokens}} tokens",
+  "chat.memory.badge.recalledDetail": "Mémoire rappelée : {{count}} éléments - {{tokens}} tokens",
+  "chat.memory.badge.files": "Fichiers mémoire : {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Utiliser un prompt personnalisé",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index d37b19b83c..9291b14d1b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -1428,10 +1428,47 @@ export const dict = {
     "Crea checkpoint prima delle modifiche ai file così puoi ripristinare stati precedenti",
   "settings.context.autoCompaction.title": "Compattazione automatica",
   "settings.context.autoCompaction.description": "Compatta automaticamente il contesto quando è pieno",
+  "settings.context.compaction.title": "Compattazione",
   "settings.context.prune.title": "Riduci output vecchi",
   "settings.context.prune.description": "Rimuovi output tool vecchi durante la compattazione",
   "settings.context.watcherPatterns": "Pattern ignore file watcher",
   "settings.context.watcherPatterns.description": "Pattern glob per file che il watcher deve ignorare",
+  "settings.context.memory.title": "Memoria",
+  "settings.context.memory.project.title": "Memoria del progetto",
+  "settings.context.memory.autoSave.title": "Salvataggio automatico memoria progetto",
+  "settings.context.memory.autoSave.description":
+    "Salva automaticamente fatti durevoli del progetto dai turni completati quando la memoria è attiva.",
+  "settings.context.memory.index.title": "Indice della memoria",
+  "settings.context.memory.status.notLoaded": "Non caricata",
+  "settings.context.memory.status.disabled": "Disattivata",
+  "settings.context.memory.status.enabledTokensOps":
+    "Attivata - ~{{session}} token di contesto iniziale in questa sessione - ~{{tokens}} token nell’indice salvato - ultima operazione {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Attiva la memoria per creare i file di memoria del progetto.",
+  "settings.context.memory.inspect": "Ispeziona",
+  "settings.context.memory.rebuild": "Ricostruisci indice della memoria",
+  "chat.memory.on": "Memoria attivata",
+  "chat.memory.label": "Memoria · {{tokens}} token",
+  "chat.memory.status.loading": "Caricamento stato memoria",
+  "chat.memory.session.tokens": "Contesto iniziale di questa sessione: {{tokens}} token",
+  "chat.memory.total.tokens": "Indice salvato: {{tokens}} token",
+  "chat.memory.project.enabled": "Memoria del progetto attivata",
+  "chat.memory.project.disabled": "Memoria del progetto disattivata",
+  "chat.memory.command.failed": "Comando memoria non riuscito",
+  "chat.memory.savedOperations": "Ultima operazione di memoria: {{count}} ops",
+  "chat.memory.inspect": "Ispeziona memoria",
+  "chat.memory.remember": "Ricorda",
+  "chat.memory.forget": "Dimentica",
+  "chat.memory.rebuild": "Ricostruisci indice",
+  "chat.memory.disable": "Disattiva memoria",
+  "chat.memory.badge.injected": "Memoria iniettata",
+  "chat.memory.badge.recalled": "Memoria richiamata",
+  "chat.memory.badge.startupCtx": "ctx iniziale",
+  "chat.memory.badge.items": "{{count}} elementi",
+  "chat.memory.badge.tokens": "{{tokens}} token",
+  "chat.memory.badge.recalledDetail": "Memoria richiamata: {{count}} elementi - {{tokens}} token",
+  "chat.memory.badge.files": "File di memoria: {{files}}",
+
   "settings.commitMessage.title": "Messaggio commit",
   "settings.commitMessage.override.title": "Usa prompt personalizzato",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 9b807d5d00..bc8570701a 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -1617,6 +1617,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "ファイル編集前にチェックポイントを作成して以前の状態を復元可能にする",
   "settings.context.autoCompaction.title": "自動圧縮",
   "settings.context.autoCompaction.description": "コンテキストが上限に達する前に自動的に圧縮",
+  "settings.context.compaction.title": "圧縮",
   "settings.context.compactionLimit.title": "自動圧縮の上限",
   "settings.context.compactionLimit.description":
     "コンテキストがモデルウィンドウのこの割合に達したら圧縮します。安全バッファーのみを使用するには空欄のままにしてください。",
@@ -1625,6 +1626,42 @@ export const dict = {
   "settings.context.watcherPatterns": "ファイルウォッチャー無視パターン",
   "settings.context.watcherPatterns.description": "ウォッチャーが無視すべきファイルのglobパターン",
 
+  "settings.context.memory.title": "メモリ",
+  "settings.context.memory.project.title": "プロジェクトメモリ",
+  "settings.context.memory.autoSave.title": "プロジェクトメモリを自動保存",
+  "settings.context.memory.autoSave.description":
+    "メモリが有効なとき、完了したターンから永続的なプロジェクト情報を自動保存します。",
+  "settings.context.memory.index.title": "メモリインデックス",
+  "settings.context.memory.status.notLoaded": "未読み込み",
+  "settings.context.memory.status.disabled": "無効",
+  "settings.context.memory.status.enabledTokensOps":
+    "有効 - このセッションの起動コンテキスト ~{{session}} トークン - 保存済みインデックス ~{{tokens}} トークン - 最後の操作 {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "メモリを有効にしてプロジェクトメモリファイルを作成します。",
+  "settings.context.memory.inspect": "検査",
+  "settings.context.memory.rebuild": "メモリインデックスを再構築",
+  "chat.memory.on": "メモリ オン",
+  "chat.memory.label": "メモリ · {{tokens}} トークン",
+  "chat.memory.status.loading": "メモリ状態を読み込み中",
+  "chat.memory.session.tokens": "このセッションの起動コンテキスト: {{tokens}} トークン",
+  "chat.memory.total.tokens": "保存済みインデックス: {{tokens}} トークン",
+  "chat.memory.project.enabled": "プロジェクトメモリが有効です",
+  "chat.memory.project.disabled": "プロジェクトメモリが無効です",
+  "chat.memory.command.failed": "メモリコマンドに失敗しました",
+  "chat.memory.savedOperations": "最後のメモリ操作: {{count}} 件",
+  "chat.memory.inspect": "メモリを検査",
+  "chat.memory.remember": "記憶",
+  "chat.memory.forget": "忘れる",
+  "chat.memory.rebuild": "インデックスを再構築",
+  "chat.memory.disable": "メモリを無効化",
+  "chat.memory.badge.injected": "メモリを注入しました",
+  "chat.memory.badge.recalled": "メモリを呼び出しました",
+  "chat.memory.badge.startupCtx": "起動ctx",
+  "chat.memory.badge.items": "{{count}} 件",
+  "chat.memory.badge.tokens": "{{tokens}} トークン",
+  "chat.memory.badge.recalledDetail": "メモリを呼び出しました: {{count}} 件 - {{tokens}} トークン",
+  "chat.memory.badge.files": "メモリファイル: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "カスタム prompt を使用",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 203f58d32b..92c95acdab 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -1600,6 +1600,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "파일 편집 전 체크포인트를 생성하여 이전 상태를 복원할 수 있습니다",
   "settings.context.autoCompaction.title": "자동 압축",
   "settings.context.autoCompaction.description": "컨텍스트가 한도에 도달하기 전에 자동으로 압축",
+  "settings.context.compaction.title": "압축",
   "settings.context.compactionLimit.title": "자동 압축 한도",
   "settings.context.compactionLimit.description":
     "컨텍스트가 모델 창의 이 비율에 도달하면 압축합니다. 안전 버퍼만 사용하려면 비워 두세요.",
@@ -1608,6 +1609,42 @@ export const dict = {
   "settings.context.watcherPatterns": "파일 감시자 무시 패턴",
   "settings.context.watcherPatterns.description": "감시자가 무시해야 할 파일의 글로브 패턴",
 
+  "settings.context.memory.title": "메모리",
+  "settings.context.memory.project.title": "프로젝트 메모리",
+  "settings.context.memory.autoSave.title": "프로젝트 메모리 자동 저장",
+  "settings.context.memory.autoSave.description":
+    "메모리가 활성화되면 완료된 턴에서 지속적인 프로젝트 사실을 자동으로 저장합니다.",
+  "settings.context.memory.index.title": "메모리 인덱스",
+  "settings.context.memory.status.notLoaded": "로드되지 않음",
+  "settings.context.memory.status.disabled": "비활성화됨",
+  "settings.context.memory.status.enabledTokensOps":
+    "활성화됨 - 이 세션의 시작 컨텍스트 ~{{session}} 토큰 - 저장된 인덱스 ~{{tokens}} 토큰 - 마지막 작업 {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "메모리를 활성화하여 프로젝트 메모리 파일을 만듭니다.",
+  "settings.context.memory.inspect": "검사",
+  "settings.context.memory.rebuild": "메모리 인덱스 다시 빌드",
+  "chat.memory.on": "메모리 켜짐",
+  "chat.memory.label": "메모리 · {{tokens}} 토큰",
+  "chat.memory.status.loading": "메모리 상태 로드 중",
+  "chat.memory.session.tokens": "이 세션의 시작 컨텍스트: {{tokens}} 토큰",
+  "chat.memory.total.tokens": "저장된 인덱스: {{tokens}} 토큰",
+  "chat.memory.project.enabled": "프로젝트 메모리 활성화됨",
+  "chat.memory.project.disabled": "프로젝트 메모리 비활성화됨",
+  "chat.memory.command.failed": "메모리 명령 실패",
+  "chat.memory.savedOperations": "마지막 메모리 작업: {{count}}개 작업",
+  "chat.memory.inspect": "메모리 검사",
+  "chat.memory.remember": "기억",
+  "chat.memory.forget": "잊기",
+  "chat.memory.rebuild": "인덱스 다시 빌드",
+  "chat.memory.disable": "메모리 비활성화",
+  "chat.memory.badge.injected": "메모리 주입됨",
+  "chat.memory.badge.recalled": "메모리 불러옴",
+  "chat.memory.badge.startupCtx": "시작 ctx",
+  "chat.memory.badge.items": "{{count}}개 항목",
+  "chat.memory.badge.tokens": "{{tokens}} 토큰",
+  "chat.memory.badge.recalledDetail": "메모리 불러옴: {{count}}개 항목 - {{tokens}} 토큰",
+  "chat.memory.badge.files": "메모리 파일: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "사용자 지정 prompt 사용",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 136df47605..5f93bd1575 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -1598,6 +1598,7 @@ export const dict = {
 
   "settings.context.autoCompaction.title": "Automatische Compactie",
   "settings.context.autoCompaction.description": "Context automatisch compacteren voordat deze de limiet bereikt",
+  "settings.context.compaction.title": "Compactie",
   "settings.context.compactionLimit.title": "Limiet voor automatisch compacteren",
   "settings.context.compactionLimit.description":
     "Compacteer wanneer de context dit percentage van het modelvenster bereikt. Laat leeg om alleen de veiligheidsbuffer te gebruiken.",
@@ -1606,6 +1607,42 @@ export const dict = {
   "settings.context.watcherPatterns": "File Watcher Negeer Patronen",
   "settings.context.watcherPatterns.description": "Glob-patronen voor bestanden die de watcher moet negeren",
 
+  "settings.context.memory.title": "Geheugen",
+  "settings.context.memory.project.title": "Projectgeheugen",
+  "settings.context.memory.autoSave.title": "Projectgeheugen automatisch opslaan",
+  "settings.context.memory.autoSave.description":
+    "Sla duurzame projectfeiten automatisch op uit voltooide beurten wanneer geheugen is ingeschakeld.",
+  "settings.context.memory.index.title": "Geheugenindex",
+  "settings.context.memory.status.notLoaded": "Niet geladen",
+  "settings.context.memory.status.disabled": "Uitgeschakeld",
+  "settings.context.memory.status.enabledTokensOps":
+    "Ingeschakeld - ~{{session}} startcontexttokens in deze sessie - ~{{tokens}} tokens in opgeslagen index - laatste bewerking {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Schakel geheugen in om projectgeheugenbestanden te maken.",
+  "settings.context.memory.inspect": "Inspecteren",
+  "settings.context.memory.rebuild": "Geheugenindex opnieuw opbouwen",
+  "chat.memory.on": "Geheugen aan",
+  "chat.memory.label": "Geheugen · {{tokens}} tokens",
+  "chat.memory.status.loading": "Geheugenstatus laden",
+  "chat.memory.session.tokens": "Startcontext deze sessie: {{tokens}} tokens",
+  "chat.memory.total.tokens": "Opgeslagen index: {{tokens}} tokens",
+  "chat.memory.project.enabled": "Projectgeheugen ingeschakeld",
+  "chat.memory.project.disabled": "Projectgeheugen uitgeschakeld",
+  "chat.memory.command.failed": "Geheugenopdracht mislukt",
+  "chat.memory.savedOperations": "Laatste geheugenbewerking: {{count}} bewerkingen",
+  "chat.memory.inspect": "Geheugen inspecteren",
+  "chat.memory.remember": "Onthouden",
+  "chat.memory.forget": "Vergeten",
+  "chat.memory.rebuild": "Index opnieuw opbouwen",
+  "chat.memory.disable": "Geheugen uitschakelen",
+  "chat.memory.badge.injected": "Geheugen geïnjecteerd",
+  "chat.memory.badge.recalled": "Geheugen opgehaald",
+  "chat.memory.badge.startupCtx": "startctx",
+  "chat.memory.badge.items": "{{count}} items",
+  "chat.memory.badge.tokens": "{{tokens}} tokens",
+  "chat.memory.badge.recalledDetail": "Geheugen opgehaald: {{count}} items - {{tokens}} tokens",
+  "chat.memory.badge.files": "Geheugenbestanden: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Aangepaste prompt gebruiken",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index f568a6f3d2..6e5c43cdc5 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -1620,6 +1620,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Opprett kontrollpunkter før filredigeringer",
   "settings.context.autoCompaction.title": "Automatisk komprimering",
   "settings.context.autoCompaction.description": "Komprimer automatisk kontekst før den når grensen",
+  "settings.context.compaction.title": "Komprimering",
   "settings.context.compactionLimit.title": "Grense for automatisk komprimering",
   "settings.context.compactionLimit.description":
     "Komprimer når konteksten når denne prosentandelen av modellvinduet. La stå tomt for å bare bruke sikkerhetsbufferen.",
@@ -1628,6 +1629,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Filvakt-ignormønstre",
   "settings.context.watcherPatterns.description": "Glob-mønstre for filer som vakten skal ignorere",
 
+  "settings.context.memory.title": "Minne",
+  "settings.context.memory.project.title": "Prosjektminne",
+  "settings.context.memory.autoSave.title": "Lagre prosjektminne automatisk",
+  "settings.context.memory.autoSave.description":
+    "Lagrer varige prosjektfakta automatisk fra fullførte turer når minne er aktivert.",
+  "settings.context.memory.index.title": "Minneindeks",
+  "settings.context.memory.status.notLoaded": "Ikke lastet",
+  "settings.context.memory.status.disabled": "Deaktivert",
+  "settings.context.memory.status.enabledTokensOps":
+    "Aktivert - ~{{session}} oppstartstokener i denne økten - ~{{tokens}} tokener i lagret indeks - siste operasjon {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Aktiver minne for å opprette prosjektets minnefiler.",
+  "settings.context.memory.inspect": "Inspiser",
+  "settings.context.memory.rebuild": "Bygg minneindeks på nytt",
+  "chat.memory.on": "Minne på",
+  "chat.memory.label": "Minne · {{tokens}} tokens",
+  "chat.memory.status.loading": "Laster minnestatus",
+  "chat.memory.session.tokens": "Oppstartskontekst denne økten: {{tokens}} tokener",
+  "chat.memory.total.tokens": "Lagret indeks: {{tokens}} tokener",
+  "chat.memory.project.enabled": "Prosjektminne aktivert",
+  "chat.memory.project.disabled": "Prosjektminne deaktivert",
+  "chat.memory.command.failed": "Minnekommando mislyktes",
+  "chat.memory.savedOperations": "Siste minneoperasjon: {{count}} operasjoner",
+  "chat.memory.inspect": "Inspiser minne",
+  "chat.memory.remember": "Husk",
+  "chat.memory.forget": "Glem",
+  "chat.memory.rebuild": "Bygg indeks på nytt",
+  "chat.memory.disable": "Deaktiver minne",
+  "chat.memory.badge.injected": "Minne injisert",
+  "chat.memory.badge.recalled": "Minne hentet",
+  "chat.memory.badge.startupCtx": "oppstartsctx",
+  "chat.memory.badge.items": "{{count}} elementer",
+  "chat.memory.badge.tokens": "{{tokens}} tokener",
+  "chat.memory.badge.recalledDetail": "Minne hentet: {{count}} elementer - {{tokens}} tokener",
+  "chat.memory.badge.files": "Minnefiler: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Bruk egendefinert prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index cac6e6766e..f7513a620e 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -1629,6 +1629,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Twórz punkty kontrolne przed edycją plików",
   "settings.context.autoCompaction.title": "Automatyczna kompakcja",
   "settings.context.autoCompaction.description": "Automatycznie kompaktuj kontekst, zanim osiągnie limit",
+  "settings.context.compaction.title": "Kompaktowanie",
   "settings.context.compactionLimit.title": "Limit automatycznego kompaktowania",
   "settings.context.compactionLimit.description":
     "Kompaktuj, gdy kontekst osiągnie ten procent okna modelu. Pozostaw puste, aby używać tylko bufora bezpieczeństwa.",
@@ -1637,6 +1638,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Wzorce ignorowania obserwatora plików",
   "settings.context.watcherPatterns.description": "Wzorce glob dla plików do ignorowania",
 
+  "settings.context.memory.title": "Pamięć",
+  "settings.context.memory.project.title": "Pamięć projektu",
+  "settings.context.memory.autoSave.title": "Automatycznie zapisuj pamięć projektu",
+  "settings.context.memory.autoSave.description":
+    "Automatycznie zapisuje trwałe fakty projektu z zakończonych tur, gdy pamięć jest włączona.",
+  "settings.context.memory.index.title": "Indeks pamięci",
+  "settings.context.memory.status.notLoaded": "Nie wczytano",
+  "settings.context.memory.status.disabled": "Wyłączona",
+  "settings.context.memory.status.enabledTokensOps":
+    "Włączona - ~{{session}} tokenów kontekstu startowego w tej sesji - ~{{tokens}} tokenów w zapisanym indeksie - ostatnia operacja {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Włącz pamięć, aby utworzyć pliki pamięci projektu.",
+  "settings.context.memory.inspect": "Sprawdź",
+  "settings.context.memory.rebuild": "Odbuduj indeks pamięci",
+  "chat.memory.on": "Pamięć włączona",
+  "chat.memory.label": "Pamięć · {{tokens}} tokenów",
+  "chat.memory.status.loading": "Ładowanie stanu pamięci",
+  "chat.memory.session.tokens": "Kontekst startowy tej sesji: {{tokens}} tokenów",
+  "chat.memory.total.tokens": "Zapisany indeks: {{tokens}} tokenów",
+  "chat.memory.project.enabled": "Pamięć projektu włączona",
+  "chat.memory.project.disabled": "Pamięć projektu wyłączona",
+  "chat.memory.command.failed": "Polecenie pamięci nie powiodło się",
+  "chat.memory.savedOperations": "Ostatnia operacja pamięci: {{count}} operacji",
+  "chat.memory.inspect": "Sprawdź pamięć",
+  "chat.memory.remember": "Zapamiętaj",
+  "chat.memory.forget": "Zapomnij",
+  "chat.memory.rebuild": "Odbuduj indeks",
+  "chat.memory.disable": "Wyłącz pamięć",
+  "chat.memory.badge.injected": "Pamięć wstrzyknięta",
+  "chat.memory.badge.recalled": "Pamięć przywołana",
+  "chat.memory.badge.startupCtx": "ctx startowy",
+  "chat.memory.badge.items": "{{count}} elementów",
+  "chat.memory.badge.tokens": "{{tokens}} tokenów",
+  "chat.memory.badge.recalledDetail": "Pamięć przywołana: {{count}} elementów - {{tokens}} tokenów",
+  "chat.memory.badge.files": "Pliki pamięci: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Użyj niestandardowego prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 09820f33d4..6087656085 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -1628,6 +1628,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "Создавать контрольные точки перед редактированием файлов",
   "settings.context.autoCompaction.title": "Автоматическое сжатие",
   "settings.context.autoCompaction.description": "Автоматически сжимать контекст до достижения лимита",
+  "settings.context.compaction.title": "Сжатие",
   "settings.context.compactionLimit.title": "Лимит автоматического сжатия",
   "settings.context.compactionLimit.description":
     "Сжимать, когда контекст достигает этого процента окна модели. Оставьте пустым, чтобы использовать только буфер безопасности.",
@@ -1636,6 +1637,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Шаблоны игнорирования наблюдателя файлов",
   "settings.context.watcherPatterns.description": "Glob-шаблоны для файлов, которые наблюдатель должен игнорировать",
 
+  "settings.context.memory.title": "Память",
+  "settings.context.memory.project.title": "Память проекта",
+  "settings.context.memory.autoSave.title": "Автосохранение памяти проекта",
+  "settings.context.memory.autoSave.description":
+    "Автоматически сохраняет устойчивые факты проекта из завершённых ходов, когда память включена.",
+  "settings.context.memory.index.title": "Индекс памяти",
+  "settings.context.memory.status.notLoaded": "Не загружена",
+  "settings.context.memory.status.disabled": "Отключена",
+  "settings.context.memory.status.enabledTokensOps":
+    "Включена - ~{{session}} токенов начального контекста в этой сессии - ~{{tokens}} токенов в сохранённом индексе - последняя операция {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Включите память, чтобы создать файлы памяти проекта.",
+  "settings.context.memory.inspect": "Проверить",
+  "settings.context.memory.rebuild": "Перестроить индекс памяти",
+  "chat.memory.on": "Память включена",
+  "chat.memory.label": "Память · {{tokens}} токенов",
+  "chat.memory.status.loading": "Загрузка состояния памяти",
+  "chat.memory.session.tokens": "Начальный контекст этой сессии: {{tokens}} токенов",
+  "chat.memory.total.tokens": "Сохранённый индекс: {{tokens}} токенов",
+  "chat.memory.project.enabled": "Память проекта включена",
+  "chat.memory.project.disabled": "Память проекта отключена",
+  "chat.memory.command.failed": "Команда памяти не выполнена",
+  "chat.memory.savedOperations": "Последняя операция памяти: {{count}} операций",
+  "chat.memory.inspect": "Проверить память",
+  "chat.memory.remember": "Запомнить",
+  "chat.memory.forget": "Забыть",
+  "chat.memory.rebuild": "Перестроить индекс",
+  "chat.memory.disable": "Отключить память",
+  "chat.memory.badge.injected": "Память внедрена",
+  "chat.memory.badge.recalled": "Память извлечена",
+  "chat.memory.badge.startupCtx": "начальный ctx",
+  "chat.memory.badge.items": "{{count}} элементов",
+  "chat.memory.badge.tokens": "{{tokens}} токенов",
+  "chat.memory.badge.recalledDetail": "Память извлечена: {{count}} элементов - {{tokens}} токенов",
+  "chat.memory.badge.files": "Файлы памяти: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Использовать пользовательский prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index 1bda1a2b38..75cbec15a1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -1598,6 +1598,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "สร้างจุดตรวจก่อนแก้ไขไฟล์",
   "settings.context.autoCompaction.title": "การบีบอัดอัตโนมัติ",
   "settings.context.autoCompaction.description": "บีบอัดบริบทอัตโนมัติก่อนถึงขีดจำกัด",
+  "settings.context.compaction.title": "การบีบอัด",
   "settings.context.compactionLimit.title": "ขีดจำกัดการบีบอัดอัตโนมัติ",
   "settings.context.compactionLimit.description":
     "บีบอัดเมื่อบริบทถึงเปอร์เซ็นต์นี้ของหน้าต่างโมเดล เว้นว่างไว้เพื่อใช้เฉพาะบัฟเฟอร์ความปลอดภัย",
@@ -1606,6 +1607,42 @@ export const dict = {
   "settings.context.watcherPatterns": "รูปแบบการละเว้นตัวเฝ้าดูไฟล์",
   "settings.context.watcherPatterns.description": "รูปแบบ glob สำหรับไฟล์ที่ตัวเฝ้าดูควรละเว้น",
 
+  "settings.context.memory.title": "ความจำ",
+  "settings.context.memory.project.title": "ความจำของโปรเจกต์",
+  "settings.context.memory.autoSave.title": "บันทึกความจำของโปรเจกต์อัตโนมัติ",
+  "settings.context.memory.autoSave.description":
+    "บันทึกข้อเท็จจริงถาวรของโปรเจกต์จากรอบที่เสร็จแล้วโดยอัตโนมัติเมื่อเปิดใช้ความจำ",
+  "settings.context.memory.index.title": "ดัชนีความจำ",
+  "settings.context.memory.status.notLoaded": "ยังไม่ได้โหลด",
+  "settings.context.memory.status.disabled": "ปิดใช้งาน",
+  "settings.context.memory.status.enabledTokensOps":
+    "เปิดใช้งาน - ~{{session}} โทเค็นบริบทเริ่มต้นในเซสชันนี้ - ~{{tokens}} โทเค็นในดัชนีที่บันทึกไว้ - การทำงานล่าสุด {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "เปิดใช้ความจำเพื่อสร้างไฟล์ความจำของโปรเจกต์",
+  "settings.context.memory.inspect": "ตรวจสอบ",
+  "settings.context.memory.rebuild": "สร้างดัชนีความจำใหม่",
+  "chat.memory.on": "เปิดความจำ",
+  "chat.memory.label": "ความจำ · {{tokens}} โทเค็น",
+  "chat.memory.status.loading": "กำลังโหลดสถานะความจำ",
+  "chat.memory.session.tokens": "บริบทเริ่มต้นของเซสชันนี้: {{tokens}} โทเค็น",
+  "chat.memory.total.tokens": "ดัชนีที่บันทึกไว้: {{tokens}} โทเค็น",
+  "chat.memory.project.enabled": "เปิดใช้ความจำของโปรเจกต์แล้ว",
+  "chat.memory.project.disabled": "ปิดใช้ความจำของโปรเจกต์แล้ว",
+  "chat.memory.command.failed": "คำสั่งความจำล้มเหลว",
+  "chat.memory.savedOperations": "การทำงานความจำล่าสุด: {{count}} รายการ",
+  "chat.memory.inspect": "ตรวจสอบความจำ",
+  "chat.memory.remember": "จำ",
+  "chat.memory.forget": "ลืม",
+  "chat.memory.rebuild": "สร้างดัชนีใหม่",
+  "chat.memory.disable": "ปิดใช้ความจำ",
+  "chat.memory.badge.injected": "แทรกความจำแล้ว",
+  "chat.memory.badge.recalled": "เรียกคืนความจำแล้ว",
+  "chat.memory.badge.startupCtx": "ctx เริ่มต้น",
+  "chat.memory.badge.items": "{{count}} รายการ",
+  "chat.memory.badge.tokens": "{{tokens}} โทเค็น",
+  "chat.memory.badge.recalledDetail": "เรียกคืนความจำแล้ว: {{count}} รายการ - {{tokens}} โทเค็น",
+  "chat.memory.badge.files": "ไฟล์ความจำ: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "ใช้ prompt แบบกำหนดเอง",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index 4ea7408914..0b9bb8900b 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -1585,6 +1585,7 @@ export const dict = {
 
   "settings.context.autoCompaction.title": "Otomatik Sıkıştırma",
   "settings.context.autoCompaction.description": "Bağlam sınıra ulaşmadan önce otomatik olarak sıkıştır",
+  "settings.context.compaction.title": "Sıkıştırma",
   "settings.context.compactionLimit.title": "Otomatik sıkıştırma sınırı",
   "settings.context.compactionLimit.description":
     "Bağlam model penceresinin bu yüzdesine ulaştığında sıkıştır. Yalnızca güvenlik tamponunu kullanmak için boş bırakın.",
@@ -1593,6 +1594,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Dosya İzleyici Yok Sayma Kalıpları",
   "settings.context.watcherPatterns.description": "İzleyicinin yok sayması gereken dosyalar için glob kalıpları",
 
+  "settings.context.memory.title": "Bellek",
+  "settings.context.memory.project.title": "Proje belleği",
+  "settings.context.memory.autoSave.title": "Proje belleğini otomatik kaydet",
+  "settings.context.memory.autoSave.description":
+    "Bellek açıkken tamamlanan turlardan kalıcı proje gerçeklerini otomatik olarak kaydeder.",
+  "settings.context.memory.index.title": "Bellek indeksi",
+  "settings.context.memory.status.notLoaded": "Yüklenmedi",
+  "settings.context.memory.status.disabled": "Devre dışı",
+  "settings.context.memory.status.enabledTokensOps":
+    "Etkin - bu oturumda ~{{session}} başlangıç bağlamı tokenı - depolanan indekste ~{{tokens}} token - son işlem {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Proje belleği dosyalarını oluşturmak için belleği etkinleştirin.",
+  "settings.context.memory.inspect": "İncele",
+  "settings.context.memory.rebuild": "Bellek indeksini yeniden oluştur",
+  "chat.memory.on": "Bellek açık",
+  "chat.memory.label": "Bellek · {{tokens}} token",
+  "chat.memory.status.loading": "Bellek durumu yükleniyor",
+  "chat.memory.session.tokens": "Bu oturumdaki başlangıç bağlamı: {{tokens}} token",
+  "chat.memory.total.tokens": "Depolanan indeks: {{tokens}} token",
+  "chat.memory.project.enabled": "Proje belleği etkin",
+  "chat.memory.project.disabled": "Proje belleği devre dışı",
+  "chat.memory.command.failed": "Bellek komutu başarısız oldu",
+  "chat.memory.savedOperations": "Son bellek işlemi: {{count}} işlem",
+  "chat.memory.inspect": "Belleği incele",
+  "chat.memory.remember": "Hatırla",
+  "chat.memory.forget": "Unut",
+  "chat.memory.rebuild": "İndeksi yeniden oluştur",
+  "chat.memory.disable": "Belleği devre dışı bırak",
+  "chat.memory.badge.injected": "Bellek eklendi",
+  "chat.memory.badge.recalled": "Bellek geri çağrıldı",
+  "chat.memory.badge.startupCtx": "başlangıç ctx",
+  "chat.memory.badge.items": "{{count}} öğe",
+  "chat.memory.badge.tokens": "{{tokens}} token",
+  "chat.memory.badge.recalledDetail": "Bellek geri çağrıldı: {{count}} öğe - {{tokens}} token",
+  "chat.memory.badge.files": "Bellek dosyaları: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Özel prompt Kullan",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index d59d2b1d57..cfb0d8e646 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -1582,6 +1582,7 @@ export const dict = {
 
   "settings.context.autoCompaction.title": "Автоматичне стиснення",
   "settings.context.autoCompaction.description": "Автоматично стискати контекст до досягнення ліміту",
+  "settings.context.compaction.title": "Стискання",
   "settings.context.compactionLimit.title": "Ліміт автоматичного стискання",
   "settings.context.compactionLimit.description":
     "Стискати, коли контекст досягає цього відсотка вікна моделі. Залиште порожнім, щоб використовувати лише буфер безпеки.",
@@ -1590,6 +1591,42 @@ export const dict = {
   "settings.context.watcherPatterns": "Шаблони ігнорування спостерігача файлів",
   "settings.context.watcherPatterns.description": "Glob-шаблони для файлів, які спостерігач має ігнорувати",
 
+  "settings.context.memory.title": "Пам’ять",
+  "settings.context.memory.project.title": "Пам’ять проєкту",
+  "settings.context.memory.autoSave.title": "Автозбереження пам’яті проєкту",
+  "settings.context.memory.autoSave.description":
+    "Автоматично зберігає сталі факти проєкту із завершених ходів, коли пам’ять увімкнено.",
+  "settings.context.memory.index.title": "Індекс пам’яті",
+  "settings.context.memory.status.notLoaded": "Не завантажено",
+  "settings.context.memory.status.disabled": "Вимкнено",
+  "settings.context.memory.status.enabledTokensOps":
+    "Увімкнено - ~{{session}} токенів стартового контексту в цій сесії - ~{{tokens}} токенів у збереженому індексі - остання операція {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "Увімкніть пам’ять, щоб створити файли пам’яті проєкту.",
+  "settings.context.memory.inspect": "Перевірити",
+  "settings.context.memory.rebuild": "Перебудувати індекс пам’яті",
+  "chat.memory.on": "Пам’ять увімкнено",
+  "chat.memory.label": "Пам’ять · {{tokens}} токенів",
+  "chat.memory.status.loading": "Завантаження стану пам’яті",
+  "chat.memory.session.tokens": "Стартовий контекст цієї сесії: {{tokens}} токенів",
+  "chat.memory.total.tokens": "Збережений індекс: {{tokens}} токенів",
+  "chat.memory.project.enabled": "Пам’ять проєкту увімкнено",
+  "chat.memory.project.disabled": "Пам’ять проєкту вимкнено",
+  "chat.memory.command.failed": "Команду пам’яті не виконано",
+  "chat.memory.savedOperations": "Остання операція пам’яті: {{count}} операцій",
+  "chat.memory.inspect": "Перевірити пам’ять",
+  "chat.memory.remember": "Запам’ятати",
+  "chat.memory.forget": "Забути",
+  "chat.memory.rebuild": "Перебудувати індекс",
+  "chat.memory.disable": "Вимкнути пам’ять",
+  "chat.memory.badge.injected": "Пам’ять додано",
+  "chat.memory.badge.recalled": "Пам’ять відновлено",
+  "chat.memory.badge.startupCtx": "стартовий ctx",
+  "chat.memory.badge.items": "{{count}} елементів",
+  "chat.memory.badge.tokens": "{{tokens}} токенів",
+  "chat.memory.badge.recalledDetail": "Пам’ять відновлено: {{count}} елементів - {{tokens}} токенів",
+  "chat.memory.badge.files": "Файли пам’яті: {{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Використовувати власний prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index 987d2f2ccb..1d07cf0ed7 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -1557,6 +1557,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "在文件编辑前创建检查点，以便恢复之前的状态",
   "settings.context.autoCompaction.title": "自动压缩",
   "settings.context.autoCompaction.description": "在上下文达到限制前自动压缩",
+  "settings.context.compaction.title": "压缩",
   "settings.context.compactionLimit.title": "自动压缩限制",
   "settings.context.compactionLimit.description": "当上下文达到模型窗口的此百分比时进行压缩。留空则仅使用安全缓冲区。",
   "settings.context.prune.title": "修剪旧输出",
@@ -1564,6 +1565,41 @@ export const dict = {
   "settings.context.watcherPatterns": "文件监视器忽略模式",
   "settings.context.watcherPatterns.description": "监视器应忽略的文件的 glob 模式",
 
+  "settings.context.memory.title": "记忆",
+  "settings.context.memory.project.title": "项目记忆",
+  "settings.context.memory.autoSave.title": "自动保存项目记忆",
+  "settings.context.memory.autoSave.description": "启用记忆时，自动从已完成轮次保存持久项目事实。",
+  "settings.context.memory.index.title": "记忆索引",
+  "settings.context.memory.status.notLoaded": "未加载",
+  "settings.context.memory.status.disabled": "已禁用",
+  "settings.context.memory.status.enabledTokensOps":
+    "已启用 - 本会话启动上下文约 {{session}} 个 token - 已存储索引约 {{tokens}} 个 token - 上次操作 {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "启用记忆以创建项目记忆文件。",
+  "settings.context.memory.inspect": "检查",
+  "settings.context.memory.rebuild": "重建记忆索引",
+  "chat.memory.on": "记忆开启",
+  "chat.memory.label": "记忆 · {{tokens}} 个 token",
+  "chat.memory.status.loading": "正在加载记忆状态",
+  "chat.memory.session.tokens": "本会话启动上下文：{{tokens}} 个 token",
+  "chat.memory.total.tokens": "已存储索引：{{tokens}} 个 token",
+  "chat.memory.project.enabled": "项目记忆已启用",
+  "chat.memory.project.disabled": "项目记忆已禁用",
+  "chat.memory.command.failed": "记忆命令失败",
+  "chat.memory.savedOperations": "上次记忆操作：{{count}} 次操作",
+  "chat.memory.inspect": "检查记忆",
+  "chat.memory.remember": "记住",
+  "chat.memory.forget": "忘记",
+  "chat.memory.rebuild": "重建索引",
+  "chat.memory.disable": "禁用记忆",
+  "chat.memory.badge.injected": "已注入记忆",
+  "chat.memory.badge.recalled": "已召回记忆",
+  "chat.memory.badge.startupCtx": "启动 ctx",
+  "chat.memory.badge.items": "{{count}} 项",
+  "chat.memory.badge.tokens": "{{tokens}} 个 token",
+  "chat.memory.badge.recalledDetail": "已召回记忆：{{count}} 项 - {{tokens}} 个 token",
+  "chat.memory.badge.files": "记忆文件：{{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "使用自定义 prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index f596429f96..e5d49f7fbe 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -1524,6 +1524,7 @@ export const dict = {
   "settings.checkpoints.enable.description": "在檔案編輯前建立檢查點，以便恢復之前的狀態",
   "settings.context.autoCompaction.title": "自動壓縮",
   "settings.context.autoCompaction.description": "在上下文達到限制前自動壓縮",
+  "settings.context.compaction.title": "壓縮",
   "settings.context.compactionLimit.title": "自動壓縮限制",
   "settings.context.compactionLimit.description": "當上下文達到模型視窗的此百分比時進行壓縮。留空則僅使用安全緩衝區。",
   "settings.context.prune.title": "修剪舊輸出",
@@ -1531,6 +1532,41 @@ export const dict = {
   "settings.context.watcherPatterns": "檔案監視器忽略模式",
   "settings.context.watcherPatterns.description": "監視器應忽略的檔案的 glob 模式",
 
+  "settings.context.memory.title": "記憶",
+  "settings.context.memory.project.title": "專案記憶",
+  "settings.context.memory.autoSave.title": "自動儲存專案記憶",
+  "settings.context.memory.autoSave.description": "啟用記憶時，自動從已完成回合儲存持久專案事實。",
+  "settings.context.memory.index.title": "記憶索引",
+  "settings.context.memory.status.notLoaded": "未載入",
+  "settings.context.memory.status.disabled": "已停用",
+  "settings.context.memory.status.enabledTokensOps":
+    "已啟用 - 此工作階段啟動內容約 {{session}} 個 token - 已儲存索引約 {{tokens}} 個 token - 上次操作 {{ops}}",
+  "settings.context.memory.index.path": "{{path}}/index.kmem",
+  "settings.context.memory.index.enable": "啟用記憶以建立專案記憶檔案。",
+  "settings.context.memory.inspect": "檢查",
+  "settings.context.memory.rebuild": "重建記憶索引",
+  "chat.memory.on": "記憶開啟",
+  "chat.memory.label": "記憶 · {{tokens}} 個 token",
+  "chat.memory.status.loading": "正在載入記憶狀態",
+  "chat.memory.session.tokens": "此工作階段啟動內容：{{tokens}} 個 token",
+  "chat.memory.total.tokens": "已儲存索引：{{tokens}} 個 token",
+  "chat.memory.project.enabled": "專案記憶已啟用",
+  "chat.memory.project.disabled": "專案記憶已停用",
+  "chat.memory.command.failed": "記憶命令失敗",
+  "chat.memory.savedOperations": "上次記憶操作：{{count}} 次操作",
+  "chat.memory.inspect": "檢查記憶",
+  "chat.memory.remember": "記住",
+  "chat.memory.forget": "忘記",
+  "chat.memory.rebuild": "重建索引",
+  "chat.memory.disable": "停用記憶",
+  "chat.memory.badge.injected": "已注入記憶",
+  "chat.memory.badge.recalled": "已召回記憶",
+  "chat.memory.badge.startupCtx": "啟動 ctx",
+  "chat.memory.badge.items": "{{count}} 項",
+  "chat.memory.badge.tokens": "{{tokens}} 個 token",
+  "chat.memory.badge.recalledDetail": "已召回記憶：{{count}} 項 - {{tokens}} 個 token",
+  "chat.memory.badge.files": "記憶檔案：{{files}}",
+
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "使用自訂 prompt",
   "settings.commitMessage.override.description":
diff --git a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
index 71bd4db4f3..03dfa684a6 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
@@ -34,6 +34,7 @@ import { NotificationsContext } from "../context/notifications"
 import { LanguageContext } from "../context/language"
 import { IndexingProvider } from "../context/indexing"
 import { KiloEmbeddingModelsProvider } from "../context/kilo-embedding-models"
+import { MemoryProvider } from "../context/memory"
 import { dict as uiEn } from "@kilocode/kilo-ui/i18n/en"
 import { dict as appEn } from "../i18n/en"
 import { dict as amEn } from "../../agent-manager/i18n/en"
@@ -439,30 +440,32 @@ export const StoryProviders: ParentComponent<StoryProvidersProps> = (props) => {
                       <NotificationsContext.Provider value={notifications}>
                         <SessionContext.Provider value={session as any}>
                           <AgentRequirementsContext.Provider value={requirements}>
-                            <IndexingProvider>
-                              <KiloEmbeddingModelsProvider>
-                                <DataProvider
-                                  data={data()}
-                                  directory="/project/"
-                                  onOpenDiff={props.onOpenDiff}
-                                  onOpenFile={props.onOpenFile}
-                                >
-                                  <DiffComponentProvider component={Diff}>
-                                    <CodeComponentProvider component={Code}>
-                                      <FileComponentProvider component={File}>
-                                        <MarkedProvider>
-                                          {props.noPadding ? (
-                                            props.children
-                                          ) : (
-                                            <div style={{ padding: "12px" }}>{props.children}</div>
-                                          )}
-                                        </MarkedProvider>
-                                      </FileComponentProvider>
-                                    </CodeComponentProvider>
-                                  </DiffComponentProvider>
-                                </DataProvider>
-                              </KiloEmbeddingModelsProvider>
-                            </IndexingProvider>
+                            <MemoryProvider>
+                              <IndexingProvider>
+                                <KiloEmbeddingModelsProvider>
+                                  <DataProvider
+                                    data={data()}
+                                    directory="/project/"
+                                    onOpenDiff={props.onOpenDiff}
+                                    onOpenFile={props.onOpenFile}
+                                  >
+                                    <DiffComponentProvider component={Diff}>
+                                      <CodeComponentProvider component={Code}>
+                                        <FileComponentProvider component={File}>
+                                          <MarkedProvider>
+                                            {props.noPadding ? (
+                                              props.children
+                                            ) : (
+                                              <div style={{ padding: "12px" }}>{props.children}</div>
+                                            )}
+                                          </MarkedProvider>
+                                        </FileComponentProvider>
+                                      </CodeComponentProvider>
+                                    </DiffComponentProvider>
+                                  </DataProvider>
+                                </KiloEmbeddingModelsProvider>
+                              </IndexingProvider>
+                            </MemoryProvider>
                           </AgentRequirementsContext.Provider>
                         </SessionContext.Provider>
                       </NotificationsContext.Provider>
diff --git a/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
index 7d5e6705e9..4ede4db139 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
@@ -20,6 +20,7 @@ import { MessageList } from "../components/chat/MessageList"
 import { VscodeUserMessage } from "../components/chat/VscodeUserMessage"
 import { TurnOutcome } from "../components/shared/TurnOutcome"
 import { SessionContext } from "../context/session"
+import { MemoryContext, type MemoryContextValue } from "../context/memory"
 import { ProviderContext } from "../context/provider"
 import { ServerContext } from "../context/server"
 import { WorktreeModeProvider } from "../context/worktree-mode"
@@ -988,6 +989,52 @@ export const TaskHeaderWithTodosAllDone: Story = {
   },
 }
 
+const mockMemory: MemoryContextValue = {
+  status: () => ({}) as any,
+  show: () => undefined,
+  loading: () => false,
+  pending: () => false,
+  error: () => undefined,
+  enabled: () => true,
+  sessionTokens: () => 533,
+  totalTokens: () => 12_400,
+  refresh: () => {},
+  showMemory: () => {},
+  enable: () => {},
+  disable: () => {},
+  auto: () => {},
+  rebuild: () => {},
+  remember: () => {},
+  forget: () => {},
+}
+
+export const TaskHeaderWithMemory: Story = {
+  name: "TaskHeader — with memory enabled",
+  render: () => {
+    const session = {
+      ...mockSessionValue({ id: SESSION_ID, status: "idle" }),
+      messages: () => [{ id: "msg-001" }] as any[],
+      currentSession: () => ({
+        id: SESSION_ID,
+        title: "Integrate project memory",
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+      }),
+    }
+    return (
+      <StoryProviders sessionID={SESSION_ID} status="idle" noPadding>
+        <SessionContext.Provider value={session as any}>
+          <MemoryContext.Provider value={mockMemory}>
+            <div style={{ width: "380px" }}>
+              <TaskHeader />
+            </div>
+          </MemoryContext.Provider>
+        </SessionContext.Provider>
+      </StoryProviders>
+    )
+  },
+}
+
 const usageTokens = { input: 25_900_000, output: 52_000, reasoning: 4_100, cache: { read: 10_500_000, write: 80_000 } }
 const usageData = {
   sessionIDs: [SESSION_ID, "story-subagent-001"],
diff --git a/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css b/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css
index dcb17a5a6a..670cbd07e6 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css
@@ -228,6 +228,14 @@
   width: 100%;
 }
 
+[data-component="assistant-memory-badge"] {
+  align-self: flex-start;
+  color: var(--vscode-descriptionForeground);
+  font-family: var(--font-family-sans);
+  font-size: var(--font-size-small);
+  line-height: var(--line-height-normal);
+}
+
 .vscode-session-turn-diffs {
   width: 100%;
 }
diff --git a/packages/kilo-vscode/webview-ui/src/styles/task-header.css b/packages/kilo-vscode/webview-ui/src/styles/task-header.css
index 61151d7f5f..c64587fe08 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/task-header.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/task-header.css
@@ -353,6 +353,42 @@
   font-variant-numeric: tabular-nums;
 }
 
+[data-slot="task-header-memory"] {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 0 8px;
+  font-size: var(--kilo-font-size-11);
+  color: var(--vscode-descriptionForeground);
+  min-width: 0;
+}
+
+/* Passed to the shared Tooltip via its `class` prop (no data-slot API), so the trigger stretches. */
+.task-header-memory-tooltip {
+  display: inline-flex;
+  flex: 1;
+  min-width: 0;
+}
+
+[data-slot="task-header-memory-status"] {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--vscode-foreground);
+}
+
+[data-slot="task-header-memory-actions"] {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  flex-shrink: 0;
+}
+
 /* Expand toggle */
 [data-slot="task-header-expand"] {
   all: unset;
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 75aa20b8aa..8dee79be45 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
@@ -47,6 +47,7 @@ import type {
   MigrationSessionProgressMessage,
   MigrationStateMessage,
 } from "./migration"
+import type { MemoryEventMessage, MemoryLoadedMessage, MemoryOperationResultMessage } from "./memory"
 
 // ============================================
 // Messages FROM extension TO webview
@@ -1218,3 +1219,6 @@ export type ExtensionMessage =
   | TelemetryStateMessage
   | RemoteStatusMessage
   | ValidateFilesResultMessage
+  | MemoryLoadedMessage
+  | MemoryEventMessage
+  | MemoryOperationResultMessage
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/index.ts b/packages/kilo-vscode/webview-ui/src/types/messages/index.ts
index f74b20db68..0a8a6bcfe7 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/index.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/index.ts
@@ -13,5 +13,6 @@ export * from "./config"
 export * from "./profile"
 export * from "./agent-manager"
 export * from "./migration"
+export * from "./memory"
 export * from "./extension-messages"
 export * from "./webview-messages"
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts b/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts
new file mode 100644
index 0000000000..022dd73c08
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts
@@ -0,0 +1,103 @@
+import type {
+  MemoryCorrectResponse,
+  MemoryConfigureResponse,
+  MemoryDisableResponse,
+  MemoryEnableResponse,
+  MemoryForgetResponse,
+  MemoryPurgeResponse,
+  MemoryRememberResponse,
+  MemoryRebuildResponse,
+  MemoryShowResponse,
+  MemoryStatusResponse,
+} from "@kilocode/sdk/v2"
+import type {
+  MemoryOperation as SharedMemoryOperation,
+  MemoryPromptOperation as SharedMemoryPromptOperation,
+} from "@kilocode/kilo-memory/commands"
+import type { MemorySchema } from "@kilocode/kilo-memory/schema"
+
+export type MemorySourceFile = MemorySchema.Source
+
+export type MemoryOperation = SharedMemoryOperation
+
+export type MemoryResultOperation = MemoryOperation
+
+export type MemoryPromptOperation = SharedMemoryPromptOperation
+
+export type MemoryOperationResponse =
+  | MemoryEnableResponse
+  | MemoryConfigureResponse
+  | MemoryDisableResponse
+  | MemoryStatusResponse
+  | MemoryRebuildResponse
+  | MemoryRememberResponse
+  | MemoryCorrectResponse
+  | MemoryForgetResponse
+  | MemoryPurgeResponse
+
+export interface MemoryLoadedMessage {
+  type: "memoryLoaded"
+  sessionID?: string
+  status?: MemoryStatusResponse
+  show?: MemoryShowResponse
+  error?: string
+}
+
+export interface MemoryEventDetail {
+  type?: "saved" | "skipped" | "recalled" | "error"
+  message?: string
+  reason?: string
+  duplicateOf?: string
+  tokens?: number
+  operationCount?: number
+  skippedCount?: number
+  sources?: string[]
+  files?: string[]
+}
+
+export interface MemoryEventMessage {
+  type: "memoryEvent"
+  sessionID?: string
+  detail: MemoryEventDetail
+}
+
+export interface MemoryOperationResultMessage {
+  type: "memoryOperationResult"
+  operation: MemoryResultOperation
+  sessionID?: string
+  ok: boolean
+  status?: MemoryStatusResponse
+  show?: MemoryShowResponse
+  result?: MemoryOperationResponse
+  error?: string
+}
+
+export interface RequestMemoryMessage {
+  type: "requestMemory"
+  sessionID?: string
+  includeSources?: boolean
+}
+
+export interface MemoryShowMessage {
+  type: "memoryShow"
+  sessionID?: string
+}
+
+export interface MemoryOperationMessage {
+  type: "memoryOperation"
+  operation: MemoryOperation
+  sessionID?: string
+  mode?: "status" | "on" | "off"
+  confirm?: boolean
+  text?: string
+  query?: string
+  key?: string
+  file?: MemorySourceFile
+  section?: string
+}
+
+export interface MemoryPromptMessage {
+  type: "memoryPrompt"
+  operation: MemoryPromptOperation
+  sessionID?: string
+}
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 5652ca59fb..3946fff8df 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
@@ -15,6 +15,7 @@ import type {
   SkipLegacyMigrationMessage,
   StartMigrationMessage,
 } from "./migration"
+import type { MemoryShowMessage, MemoryOperationMessage, MemoryPromptMessage, RequestMemoryMessage } from "./memory"
 
 // ============================================
 // Messages FROM webview TO extension
@@ -1379,6 +1380,10 @@ export type WebviewMessage =
   | SetRemoteEnabledMessage
   | RequestRemoteStatusMessage
   | ContinueInWorktreeRequest
+  | RequestMemoryMessage
+  | MemoryShowMessage
+  | MemoryOperationMessage
+  | MemoryPromptMessage
   | CreateSectionRequest
   | RenameSectionRequest
   | DeleteSectionRequest
diff --git a/packages/kilo-vscode/webview-ui/src/utils/format.ts b/packages/kilo-vscode/webview-ui/src/utils/format.ts
new file mode 100644
index 0000000000..38d1f1cb3d
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/utils/format.ts
@@ -0,0 +1,8 @@
+/** Compact K/M formatting for token counts, e.g. 1234 -> "1.2K". */
+export function formatCompactCount(n: number): string {
+  // Thresholds account for toFixed(1) rounding up at the unit boundary, so e.g.
+  // 999_950 renders "1.0M" rather than "1000.0K".
+  if (n >= 999_950) return `${(n / 1_000_000).toFixed(1)}M`
+  if (n >= 1_000) return `${(n / 1_000).toFixed(1)}K`
+  return String(n)
+}
diff --git a/packages/kilo-vscode/webview-ui/src/utils/memory-command.ts b/packages/kilo-vscode/webview-ui/src/utils/memory-command.ts
new file mode 100644
index 0000000000..68c18f50bd
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/utils/memory-command.ts
@@ -0,0 +1,11 @@
+import { MEMORY_USAGE, parseMemoryCommand as parse } from "@kilocode/kilo-memory/commands"
+import type { ParsedMemoryCommand as SharedMemoryCommand } from "@kilocode/kilo-memory/commands"
+
+export type ParsedMemoryCommand = SharedMemoryCommand
+export { MEMORY_USAGE }
+
+export function parseMemoryCommand(input: string): ParsedMemoryCommand | undefined {
+  const parsed = parse(input)
+  if (parsed?.kind !== "usage") return parsed
+  return { ...parsed, reason: `${parsed.reason}\n${MEMORY_USAGE}` }
+}

From 251cc9fe567a58080e5e1ce0789993907d48f88e Mon Sep 17 00:00:00 2001
From: "kilo-maintainer[bot]" <kilo-maintainer[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 13:48:06 +0000
Subject: [PATCH 41/68] release(jetbrains): v7.0.2-rc.1

---
 packages/kilo-jetbrains/CHANGELOG.md      | 24 +++++++++++++++++++++++
 packages/kilo-jetbrains/gradle.properties |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index 082d91d37d..d438d7269d 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -152,6 +152,30 @@
 
 ## [Unreleased]
 
+## [7.0.2-rc.1] - 2026-07-07
+
+### Added
+- feat(cli): add vim modal editing to the prompt input by @drye in https://github.com/Kilo-Org/kilocode/pull/11428
+- feat(sandbox): add configurable writable paths option by @trim21 in https://github.com/Kilo-Org/kilocode/pull/11995
+- feat(vscode): prewarm microphone capture before showing voice input as recording by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12001
+- feat: add /reload action to reboot the instance from disk by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12004
+- feat(vscode): render read-tool images inline in chat view by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12010
+- feat(jetbrains): download pinned Kilo Core releases at runtime by @kirillk in https://github.com/Kilo-Org/kilocode/pull/11975
+- feat(vscode): integrate project memory into the extension by @johnnyeric in https://github.com/Kilo-Org/kilocode/pull/11954
+
+### Fixed
+- fix(cli): import cloud sessions before validation by @maphew in https://github.com/Kilo-Org/kilocode/pull/11223
+- fix(vscode): show routed model name for auto-routed free sessions by @kilo-code-bot[bot] in https://github.com/Kilo-Org/kilocode/pull/12000
+- fix(cli): block file/env references in untrusted project config by @markijbema in https://github.com/Kilo-Org/kilocode/pull/11886
+- fix(vscode): prevent selector popover clipping in new worktree dialog by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12007
+
+### Changed
+- release(jetbrains): v7.0.1 by @kilo-maintainer[bot] in https://github.com/Kilo-Org/kilocode/pull/11971
+- CLI - Show Remote Badge In TUI Prompt by @eshurakov in https://github.com/Kilo-Org/kilocode/pull/11976
+- docs: add deprecation notice to App Builder page by @eshurakov in https://github.com/Kilo-Org/kilocode/pull/11997
+- Show actually used models when using fable by @chrarnoldus in https://github.com/Kilo-Org/kilocode/pull/11969
+
+
 ## [7.0.1] - 2026-07-06
 
 ### Added
diff --git a/packages/kilo-jetbrains/gradle.properties b/packages/kilo-jetbrains/gradle.properties
index 437f551148..23aa553936 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.1
+kilo.jetbrains.version=7.0.2-rc.1
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m

From 497819684494e1608054b8b5ee55cadf87a7b2ed Mon Sep 17 00:00:00 2001
From: Kirill Kalishev <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 09:55:32 -0400
Subject: [PATCH 42/68] docs(jetbrains): edit changelog for v7.0.2-rc.1

---
 packages/kilo-jetbrains/CHANGELOG.md | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index d438d7269d..dd47ea6971 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -155,26 +155,7 @@
 ## [7.0.2-rc.1] - 2026-07-07
 
 ### Added
-- feat(cli): add vim modal editing to the prompt input by @drye in https://github.com/Kilo-Org/kilocode/pull/11428
-- feat(sandbox): add configurable writable paths option by @trim21 in https://github.com/Kilo-Org/kilocode/pull/11995
-- feat(vscode): prewarm microphone capture before showing voice input as recording by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12001
-- feat: add /reload action to reboot the instance from disk by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12004
-- feat(vscode): render read-tool images inline in chat view by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12010
-- feat(jetbrains): download pinned Kilo Core releases at runtime by @kirillk in https://github.com/Kilo-Org/kilocode/pull/11975
-- feat(vscode): integrate project memory into the extension by @johnnyeric in https://github.com/Kilo-Org/kilocode/pull/11954
-
-### Fixed
-- fix(cli): import cloud sessions before validation by @maphew in https://github.com/Kilo-Org/kilocode/pull/11223
-- fix(vscode): show routed model name for auto-routed free sessions by @kilo-code-bot[bot] in https://github.com/Kilo-Org/kilocode/pull/12000
-- fix(cli): block file/env references in untrusted project config by @markijbema in https://github.com/Kilo-Org/kilocode/pull/11886
-- fix(vscode): prevent selector popover clipping in new worktree dialog by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12007
-
-### Changed
-- release(jetbrains): v7.0.1 by @kilo-maintainer[bot] in https://github.com/Kilo-Org/kilocode/pull/11971
-- CLI - Show Remote Badge In TUI Prompt by @eshurakov in https://github.com/Kilo-Org/kilocode/pull/11976
-- docs: add deprecation notice to App Builder page by @eshurakov in https://github.com/Kilo-Org/kilocode/pull/11997
-- Show actually used models when using fable by @chrarnoldus in https://github.com/Kilo-Org/kilocode/pull/11969
-
+- Download the pinned Kilo Core release at runtime instead of bundling every CLI binary in the JetBrains plugin, keeping the Marketplace package smaller while still verifying downloaded artifacts.
 
 ## [7.0.1] - 2026-07-06
 

From f3d4e493e80d313300ac3458d19027cc4e376617 Mon Sep 17 00:00:00 2001
From: "kilo-maintainer[bot]" <kilo-maintainer[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 14:01:04 +0000
Subject: [PATCH 43/68] chore: update nix node_modules hashes

---
 nix/hashes.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/hashes.json b/nix/hashes.json
index 6790015e90..387012efc6 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-jTNTUFR9PuOqU3HVmA9tWR6E07O+LgQyubZOvQOxZ5I=",
-    "aarch64-linux": "sha256-afSECQ+kAsWirSpUAPe8sVcsal4Cu37MBWG/klc5I4Q=",
-    "aarch64-darwin": "sha256-z2LNeKVnKu95c6W2vl1x0qHTmZK9nwJlneurDibLjYw=",
-    "x86_64-darwin": "sha256-9dRFffouzJNfewnMm9Hm0FgIbYeUMBgv9mJUEwlSZS0="
+    "x86_64-linux": "sha256-5/NgXEBhaNEEqIz9GVCXxQaLJwkqWXAAZOPoa6GyHTI=",
+    "aarch64-linux": "sha256-qt7PKn0SAhDCcYtXRY9+1TBp9x3Far7kK24jhUzoMf8=",
+    "aarch64-darwin": "sha256-3FN/i3chx01S52lAv0tjxVtRpUlPkIfInphpq+69uWA=",
+    "x86_64-darwin": "sha256-+rOacJLx+qOCRGW4F+AjvFcc9XUE2biB0BRSy3dTWGI="
   }
 }

From 837c61570bb3eb087508da508d772de239685590 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 16:02:34 +0200
Subject: [PATCH 44/68] fix(vscode): show sandbox tooltip immediately on hover

---
 .../webview-ui/src/components/shared/SandboxButton.tsx     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/SandboxButton.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/SandboxButton.tsx
index a8de4cfed2..2e307cb8c3 100644
--- a/packages/kilo-vscode/webview-ui/src/components/shared/SandboxButton.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/shared/SandboxButton.tsx
@@ -69,7 +69,12 @@ export const SandboxButtonBase: Component<SandboxButtonBaseProps> = (props) => {
         language.t(props.enabled ? "prompt.action.sandbox.enabled" : "prompt.action.sandbox.disabled"))
 
   return (
-    <Tooltip value={tooltip()} contentClass={unavailable() ? undefined : props.tooltipClass} placement="top">
+    <Tooltip
+      value={tooltip()}
+      contentClass={unavailable() ? undefined : props.tooltipClass}
+      placement="top"
+      openDelay={0}
+    >
       <Button
         variant="ghost"
         size="small"

From 7ea26b0ed5e0991844e672c94878cf9d164bf80f Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 16:46:34 +0200
Subject: [PATCH 45/68] refactor: apply cloud org as login-time default

---
 packages/kilo-gateway/src/api/profile.ts      | 15 +++++
 .../kilo-gateway/src/auth/device-auth-tui.ts  | 14 +++--
 packages/kilo-gateway/src/index.ts            |  2 +-
 packages/kilo-gateway/src/server/handlers.ts  | 44 ++------------
 .../kilo-gateway/test/api/profile.test.ts     | 52 ++++++++++++++++
 .../kilo-gateway/test/server/handlers.test.ts | 59 -------------------
 packages/opencode/src/auth/index.ts           |  1 -
 .../server/httpapi/handlers/kilo-gateway.ts   | 25 ++------
 8 files changed, 85 insertions(+), 127 deletions(-)
 create mode 100644 packages/kilo-gateway/test/api/profile.test.ts
 delete mode 100644 packages/kilo-gateway/test/server/handlers.test.ts

diff --git a/packages/kilo-gateway/src/api/profile.ts b/packages/kilo-gateway/src/api/profile.ts
index fb3413ddf8..0540af4eef 100644
--- a/packages/kilo-gateway/src/api/profile.ts
+++ b/packages/kilo-gateway/src/api/profile.ts
@@ -44,6 +44,21 @@ export async function fetchProfile(token: string): Promise<KilocodeProfile> {
  */
 export const getKiloProfile = fetchProfile
 
+/**
+ * Resolve the organization a fresh login should default to.
+ *
+ * Applied once at login time (not on every profile fetch): prefer the cloud's
+ * validated `selectedOrganizationId`, and fall back to the first organization
+ * when the account has no personal account to sit on. Returns `undefined` to
+ * mean "personal account".
+ */
+export function defaultOrganizationId(profile: KilocodeProfile): string | undefined {
+  const orgs = profile.organizations ?? []
+  const selected = profile.selectedOrganizationId
+  const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
+  return valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
+}
+
 /**
  * Fetch user balance from Kilo API
  * @param token - Authentication token
diff --git a/packages/kilo-gateway/src/auth/device-auth-tui.ts b/packages/kilo-gateway/src/auth/device-auth-tui.ts
index 466aca7baa..3e150b4f78 100644
--- a/packages/kilo-gateway/src/auth/device-auth-tui.ts
+++ b/packages/kilo-gateway/src/auth/device-auth-tui.ts
@@ -1,7 +1,7 @@
 import { execFile } from "child_process"
 import type { DeviceAuthInitiateResponse, DeviceAuthPollResponse } from "../types.js"
 import { poll } from "./polling.js"
-import { getKiloProfile, getKiloDefaultModel } from "../api/profile.js"
+import { getKiloProfile, getKiloDefaultModel, defaultOrganizationId } from "../api/profile.js"
 import { KILO_API_BASE, POLL_INTERVAL_MS } from "../api/constants.js"
 import type { AuthOuathResult } from "@kilocode/plugin"
 
@@ -127,13 +127,14 @@ export async function authenticateWithDeviceAuthTUI(inputs?: Record<string, stri
 
       const token = result.token
 
-      // For TUI version, complete with personal account by default
-      // Organization selection is handled by TUI after this callback completes
-      // The TUI will fetch the profile separately and show organization dialog if needed
-      const organizationId = undefined
+      // Apply the cloud-selected organization as the login-time default.
+      // After this, the stored accountId is authoritative; the user can switch
+      // freely and profile fetches never re-derive it from the cloud.
+      const profile = await getKiloProfile(token).catch(() => undefined)
+      const organizationId = profile ? defaultOrganizationId(profile) : undefined
 
       // Fetch default model
-      const model = await getKiloDefaultModel(token, organizationId)
+      await getKiloDefaultModel(token, organizationId)
 
       // Return success with OAuth credentials
       return {
@@ -142,6 +143,7 @@ export async function authenticateWithDeviceAuthTUI(inputs?: Record<string, stri
         refresh: token,
         access: token,
         expires: Date.now() + 365 * 24 * 60 * 60 * 1000, // 1 year
+        ...(organizationId && { accountId: organizationId }),
       }
     },
   }
diff --git a/packages/kilo-gateway/src/index.ts b/packages/kilo-gateway/src/index.ts
index 034902c614..4f62a6ceff 100644
--- a/packages/kilo-gateway/src/index.ts
+++ b/packages/kilo-gateway/src/index.ts
@@ -29,6 +29,7 @@ export {
   fetchProfileWithBalance,
   fetchDefaultModel,
   getKiloProfile,
+  defaultOrganizationId,
   getKiloBalance,
   getKiloDefaultModel,
   promptOrganizationSelection,
@@ -75,7 +76,6 @@ export {
   getCloudSessions,
   getNotifications,
   getProfile,
-  resolveProfileOrganization,
   getToken,
   normalizeClawStatus,
   setOrganization,
diff --git a/packages/kilo-gateway/src/server/handlers.ts b/packages/kilo-gateway/src/server/handlers.ts
index dc0a5424fd..167bfbf4db 100644
--- a/packages/kilo-gateway/src/server/handlers.ts
+++ b/packages/kilo-gateway/src/server/handlers.ts
@@ -8,7 +8,7 @@ import { buildKiloHeaders } from "../headers.js"
 
 export type KiloAuth =
   | { type: "api"; key: string }
-  | { type: "oauth"; access: string; refresh: string; expires: number; accountId?: string; accountSelection?: "cloud" | "manual" }
+  | { type: "oauth"; access: string; refresh: string; expires: number; accountId?: string }
   | { type: "wellknown"; key: string; token: string }
 
 export interface KiloProfileResult {
@@ -36,11 +36,6 @@ export interface OrganizationDeps {
   dispose(): Promise<void>
 }
 
-export interface OrganizationResolution {
-  currentOrgId: string | null
-  persistOrgId: string | null
-}
-
 export interface CloudSessionsInput {
   cursor?: string
   limit?: number
@@ -69,45 +64,17 @@ export function getOrganizationId(auth: KiloAuth | undefined) {
   return undefined
 }
 
-export function resolveProfileOrganization(profile: KilocodeProfile, auth: Extract<KiloAuth, { type: "oauth" }>): OrganizationResolution {
-  const selected = profile.selectedOrganizationId
-  const orgs = profile.organizations ?? []
-  const valid = selected && orgs.some((org) => org.id === selected) ? selected : undefined
-  const cloud = valid ?? (profile.hasPersonalAccount === false ? orgs[0]?.id : undefined)
-  if (auth.accountSelection === "manual" && (auth.accountId || profile.hasPersonalAccount !== false)) {
-    return { currentOrgId: auth.accountId ?? null, persistOrgId: null }
-  }
-
-  const local = auth.accountSelection === "cloud" ? undefined : auth.accountId
-  const currentOrgId = local ?? cloud ?? auth.accountId ?? null
-  const invalid = auth.accountSelection === "manual" && !auth.accountId && profile.hasPersonalAccount === false
-  const persistOrgId = currentOrgId && !local && (auth.accountSelection !== "manual" || invalid) && currentOrgId !== auth.accountId ? currentOrgId : null
-  return { currentOrgId, persistOrgId }
-}
-
 export async function getProfile(auth: AuthStore): Promise<KiloProfileResult> {
   const info = await auth.get("kilo")
   if (!info || info.type !== "oauth") throw new UnauthorizedError("Not authenticated with Kilo Gateway")
 
-  const [profile, kiloPass] = await Promise.all([
+  const currentOrgId = info.accountId ?? null
+  const [profile, balance, kiloPass] = await Promise.all([
     fetchProfile(info.access),
+    fetchBalance(info.access, currentOrgId ?? undefined),
     fetchKiloPassState(info.access),
   ])
-
-  const org = resolveProfileOrganization(profile, info)
-  if (org.persistOrgId) {
-    await auth.set("kilo", {
-      type: "oauth",
-      refresh: info.refresh,
-      access: info.access,
-      expires: info.expires,
-      accountId: org.persistOrgId,
-      accountSelection: "cloud",
-    }).catch((err) => console.warn("Failed to persist cloud account selection:", err))
-  }
-
-  const balance = await fetchBalance(info.access, org.currentOrgId ?? undefined)
-  return { profile, balance, kiloPass, currentOrgId: org.currentOrgId }
+  return { profile, balance, kiloPass, currentOrgId }
 }
 
 export async function getNotifications(auth: AuthStore) {
@@ -131,7 +98,6 @@ export async function setOrganization(deps: OrganizationDeps, organizationId: st
     access: info.access,
     expires: info.expires,
     ...(organizationId && { accountId: organizationId }),
-    accountSelection: "manual",
   })
 
   await deps.clear()
diff --git a/packages/kilo-gateway/test/api/profile.test.ts b/packages/kilo-gateway/test/api/profile.test.ts
new file mode 100644
index 0000000000..5ae6b2aaf5
--- /dev/null
+++ b/packages/kilo-gateway/test/api/profile.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, test } from "bun:test"
+import { defaultOrganizationId } from "../../src/api/profile.js"
+import type { KilocodeProfile } from "../../src/types.js"
+
+const profile = (input: Partial<KilocodeProfile> = {}): KilocodeProfile => ({
+  email: "user@example.com",
+  organizations: [{ id: "org_1", name: "Acme", role: "MEMBER" }],
+  ...input,
+})
+
+describe("defaultOrganizationId", () => {
+  test("defaults to the cloud selected organization", () => {
+    expect(defaultOrganizationId(profile({ selectedOrganizationId: "org_1" }))).toBe("org_1")
+  })
+
+  test("defaults to personal when there is no cloud selection", () => {
+    expect(defaultOrganizationId(profile())).toBeUndefined()
+  })
+
+  test("ignores a cloud selection that is not one of the user's organizations", () => {
+    expect(defaultOrganizationId(profile({ selectedOrganizationId: "missing" }))).toBeUndefined()
+  })
+
+  test("falls back to the first organization when there is no personal account", () => {
+    expect(
+      defaultOrganizationId(
+        profile({
+          hasPersonalAccount: false,
+          organizations: [
+            { id: "org_1", name: "Acme", role: "MEMBER" },
+            { id: "org_2", name: "Beta", role: "MEMBER" },
+          ],
+        }),
+      ),
+    ).toBe("org_1")
+  })
+
+  test("prefers a valid cloud selection over the first-organization fallback", () => {
+    expect(
+      defaultOrganizationId(
+        profile({
+          selectedOrganizationId: "org_2",
+          hasPersonalAccount: false,
+          organizations: [
+            { id: "org_1", name: "Acme", role: "MEMBER" },
+            { id: "org_2", name: "Beta", role: "MEMBER" },
+          ],
+        }),
+      ),
+    ).toBe("org_2")
+  })
+})
diff --git a/packages/kilo-gateway/test/server/handlers.test.ts b/packages/kilo-gateway/test/server/handlers.test.ts
deleted file mode 100644
index 0b888c9ca8..0000000000
--- a/packages/kilo-gateway/test/server/handlers.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { resolveProfileOrganization, type KiloAuth } from "../../src/server/handlers.js"
-import type { KilocodeProfile } from "../../src/types.js"
-
-const oauth = (input: Partial<Extract<KiloAuth, { type: "oauth" }>> = {}): Extract<KiloAuth, { type: "oauth" }> => ({
-  type: "oauth",
-  access: "token",
-  refresh: "token",
-  expires: 1,
-  ...input,
-})
-
-const profile = (input: Partial<KilocodeProfile> = {}): KilocodeProfile => ({
-  email: "user@example.com",
-  organizations: [{ id: "org_1", name: "Acme", role: "MEMBER" }],
-  ...input,
-})
-
-describe("resolveProfileOrganization", () => {
-  test("uses cloud selected organization only when no local selection exists", () => {
-    expect(resolveProfileOrganization(profile({ selectedOrganizationId: "org_1" }), oauth())).toEqual({
-      currentOrgId: "org_1",
-      persistOrgId: "org_1",
-    })
-  })
-
-  test("preserves a manual organization selection over the cloud default", () => {
-    expect(
-      resolveProfileOrganization(
-        profile({
-          selectedOrganizationId: "org_1",
-          organizations: [
-            { id: "org_1", name: "Acme", role: "MEMBER" },
-            { id: "org_2", name: "Beta", role: "MEMBER" },
-          ],
-        }),
-        oauth({ accountId: "org_2", accountSelection: "manual" }),
-      ),
-    ).toEqual({ currentOrgId: "org_2", persistOrgId: null })
-  })
-
-  test("preserves explicit personal selection when personal is available", () => {
-    expect(
-      resolveProfileOrganization(
-        profile({ selectedOrganizationId: "org_1", hasPersonalAccount: true }),
-        oauth({ accountSelection: "manual" }),
-      ),
-    ).toEqual({ currentOrgId: null, persistOrgId: null })
-  })
-
-  test("uses the first organization when personal is unavailable and no valid cloud selection exists", () => {
-    expect(
-      resolveProfileOrganization(
-        profile({ selectedOrganizationId: "missing", hasPersonalAccount: false }),
-        oauth({ accountSelection: "manual" }),
-      ),
-    ).toEqual({ currentOrgId: "org_1", persistOrgId: "org_1" })
-  })
-})
diff --git a/packages/opencode/src/auth/index.ts b/packages/opencode/src/auth/index.ts
index a8d502296a..de4375add8 100644
--- a/packages/opencode/src/auth/index.ts
+++ b/packages/opencode/src/auth/index.ts
@@ -17,7 +17,6 @@ export class Oauth extends Schema.Class<Oauth>("OAuth")({
   access: Schema.String,
   expires: NonNegativeInt,
   accountId: Schema.optional(Schema.String),
-  accountSelection: Schema.optional(Schema.Literals(["cloud", "manual"])), // kilocode_change
   enterpriseUrl: Schema.optional(Schema.String),
 }) {}
 
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
index 7e4d9968c3..dc37a5628a 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/kilo-gateway.ts
@@ -7,7 +7,6 @@ import {
   getToken,
   importSessionToDb,
   normalizeClawStatus,
-  resolveProfileOrganization,
 } from "@kilocode/kilo-gateway"
 import {
   HEADER_FEATURE,
@@ -68,32 +67,17 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
       const info = yield* auth.get("kilo").pipe(Effect.mapError(() => new HttpApiError.BadRequest({})))
       if (!info || info.type !== "oauth") return yield* Effect.fail(new HttpApiError.Unauthorized({}))
 
-      const [profile, kiloPass] = yield* Effect.tryPromise({
+      const currentOrgId = info.accountId ?? null
+      const [profile, balance, kiloPass] = yield* Effect.tryPromise({
         try: () =>
           Promise.all([
             fetchProfile(info.access),
+            fetchBalance(info.access, currentOrgId ?? undefined),
             fetchKiloPassState(info.access),
           ]),
         catch: () => new HttpApiError.BadRequest({}),
       })
-
-      const org = resolveProfileOrganization(profile, info)
-      if (org.persistOrgId) {
-        yield* auth.set("kilo", {
-          type: "oauth",
-          refresh: info.refresh,
-          access: info.access,
-          expires: info.expires,
-          accountId: org.persistOrgId,
-          accountSelection: "cloud",
-        }).pipe(Effect.catch((err) => Effect.sync(() => log.warn("failed to persist cloud account selection", { err }))))
-      }
-
-      const balance = yield* Effect.tryPromise({
-        try: () => fetchBalance(info.access, org.currentOrgId ?? undefined),
-        catch: () => new HttpApiError.BadRequest({}),
-      })
-      return { profile, balance, kiloPass, currentOrgId: org.currentOrgId }
+      return { profile, balance, kiloPass, currentOrgId }
     })
 
     const authStatus = Effect.fn("KiloGatewayHttpApi.authStatus")(function* () {
@@ -352,7 +336,6 @@ export const kiloGatewayHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilo",
           access: info.access,
           expires: info.expires,
           ...(ctx.payload.organizationId && { accountId: ctx.payload.organizationId }),
-          accountSelection: "manual",
         })
         .pipe(Effect.mapError(() => new HttpApiError.Unauthorized({})))
 

From 130b2568153f18be73744b85249f7ca0ab7d8e4e Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Tue, 7 Jul 2026 14:37:23 +0200
Subject: [PATCH 46/68] fix(vscode): preserve mode on first send

---
 .changeset/vscode-first-send-agent-scope.md   |  5 ++
 .../tests/unit/prompt-send-contract.test.ts   | 39 ++++++++-
 .../tests/unit/session-agent.test.ts          | 86 ++++++++++++++++++-
 .../webview-ui/src/context/session-agent.ts   | 30 +++++++
 .../webview-ui/src/context/session.tsx        | 27 +++++-
 5 files changed, 181 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/vscode-first-send-agent-scope.md

diff --git a/.changeset/vscode-first-send-agent-scope.md b/.changeset/vscode-first-send-agent-scope.md
new file mode 100644
index 0000000000..9cf8af712b
--- /dev/null
+++ b/.changeset/vscode-first-send-agent-scope.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Preserve the selected mode when sending the first message in a new VS Code task so the chosen model is paired with the correct agent instructions.
diff --git a/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts b/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
index 0aee37e70b..8163cf4aed 100644
--- a/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
+++ b/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
@@ -213,12 +213,47 @@ describe("sendMessage / sendCommand draft id contract", () => {
     // from ":pending:<id>" to ":session:<newSessionId>". The user loses the
     // typed message and the new session starts empty.
     const body = extractFunctionBody(source, "sendMessage")
-    expect(body).toMatch(/!sid && !draftID \? crypto\.randomUUID\(\) : draftID/)
+    expect(body).toContain("const fresh = !sid && !draftID")
+    expect(body).toMatch(/const effectiveDraftID = fresh \? crypto\.randomUUID\(\) : draftID/)
   })
 
   it("sendCommand mints a draftID when there is no current session and none was supplied", () => {
     const body = extractFunctionBody(source, "sendCommand")
-    expect(body).toMatch(/!sid && !draftID \? crypto\.randomUUID\(\) : draftID/)
+    expect(body).toContain("const fresh = !sid && !draftID")
+    expect(body).toMatch(/const effectiveDraftID = fresh \? crypto\.randomUUID\(\) : draftID/)
+  })
+
+  it("sendMessage seeds the pending agent before resolving the draft-scoped agent", () => {
+    // Fresh draft IDs are created after ModeSwitcher stored the selected mode in
+    // pendingAgentSelection(). The draft scope must inherit that pending agent
+    // before promptAgent(scope) runs, otherwise the first send pairs the selected
+    // model with the default agent's system prompt.
+    const body = extractFunctionBody(source, "sendMessage")
+    expect(body).toMatch(
+      /if \(fresh && effectiveDraftID\) agentDrafts\.seed\(effectiveDraftID\)[\s\S]*const agent = promptAgent\(scope\)/,
+    )
+  })
+
+  it("sendCommand seeds the pending agent before resolving the draft-scoped agent", () => {
+    const body = extractFunctionBody(source, "sendCommand")
+    expect(body).toMatch(
+      /if \(fresh && effectiveDraftID\) agentDrafts\.seed\(effectiveDraftID\)[\s\S]*const agent = promptAgent\(scope\)/,
+    )
+  })
+
+  it("does not clear a newer pending agent when a seeded draft is promoted", () => {
+    const body = extractFunctionBody(source, "handleSessionCreated")
+    const draftBlock = body.match(/if \(draftID\) \{([\s\S]*?)\} else if/)
+    expect(draftBlock).not.toBeNull()
+    expect(draftBlock![1]).not.toContain("setPendingAgentSelection(null)")
+  })
+
+  it("prunes seeded draft agents only after the draft is abandoned", () => {
+    const failed = extractFunctionBody(source, "handleSendMessageFailed")
+    expect(source).toMatch(/const agentDrafts = createDraftAgentSeed/)
+    expect(source).toContain("active: (draft) => !!submissionMap[draft]")
+    expect(failed).toContain("draftSessionID() !== message.draftID")
+    expect(failed).toContain("agentDrafts.prune(message.draftID)")
   })
 })
 
diff --git a/packages/kilo-vscode/tests/unit/session-agent.test.ts b/packages/kilo-vscode/tests/unit/session-agent.test.ts
index 9535e0f095..d72839a6f8 100644
--- a/packages/kilo-vscode/tests/unit/session-agent.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-agent.test.ts
@@ -1,5 +1,9 @@
 import { describe, it, expect } from "bun:test"
-import { resolveSessionAgent } from "../../webview-ui/src/context/session-agent"
+import {
+  createDraftAgentSeed,
+  draftAgentSelection,
+  resolveSessionAgent,
+} from "../../webview-ui/src/context/session-agent"
 import type { Message } from "../../webview-ui/src/types/messages"
 
 function makeMessage(overrides: Partial<Message> = {}): Message {
@@ -76,3 +80,83 @@ describe("resolveSessionAgent", () => {
     expect(result).toBeUndefined()
   })
 })
+
+describe("draftAgentSelection", () => {
+  it("carries a pending agent into a new draft scope", () => {
+    const result = draftAgentSelection({}, "draft-1", "plan")
+
+    expect(result).toBe("plan")
+  })
+
+  it("does not overwrite an existing draft agent", () => {
+    const result = draftAgentSelection({ "draft-1": "code" }, "draft-1", "plan")
+
+    expect(result).toBeUndefined()
+  })
+
+  it("ignores missing pending agents", () => {
+    const result = draftAgentSelection({}, "draft-1", null)
+
+    expect(result).toBeUndefined()
+  })
+})
+
+describe("createDraftAgentSeed", () => {
+  it("seeds and prunes abandoned draft agents", () => {
+    const selections: Record<string, string> = {}
+    const seed = createDraftAgentSeed({
+      selections: () => selections,
+      pending: () => "plan",
+      active: () => false,
+      set: (draft, agent) => {
+        selections[draft] = agent
+      },
+      drop: (draft) => {
+        delete selections[draft]
+      },
+    })
+
+    seed.seed("draft-1")
+    expect(selections["draft-1"]).toBe("plan")
+
+    seed.prune("draft-1")
+    expect(selections["draft-1"]).toBeUndefined()
+  })
+
+  it("keeps active drafts available for retry", () => {
+    const selections: Record<string, string> = {}
+    const seed = createDraftAgentSeed({
+      selections: () => selections,
+      pending: () => "code",
+      active: () => true,
+      set: (draft, agent) => {
+        selections[draft] = agent
+      },
+      drop: (draft) => {
+        delete selections[draft]
+      },
+    })
+
+    seed.seed("draft-1")
+    seed.prune("draft-1")
+
+    expect(selections["draft-1"]).toBe("code")
+  })
+
+  it("promotes drafts without dropping the migrated agent", () => {
+    const dropped: string[] = []
+    const seed = createDraftAgentSeed({
+      selections: () => ({}),
+      pending: () => "ask",
+      active: () => false,
+      set: () => {},
+      drop: (draft) => dropped.push(draft),
+    })
+
+    seed.seed("draft-1")
+    seed.promote("draft-1")
+    seed.prune("draft-1")
+
+    expect(dropped).toEqual([])
+  })
+})
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 2c7dcf4bfd..86764e307a 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-agent.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-agent.ts
@@ -8,3 +8,33 @@ export function resolveSessionAgent(messages: Message[], names: Set<string>): st
     return name
   }
 }
+
+export function draftAgentSelection(selections: Record<string, string>, draft: string, pending: string | null) {
+  if (selections[draft]) return undefined
+  return pending ?? undefined
+}
+
+export function createDraftAgentSeed(opts: {
+  selections: () => Record<string, string>
+  pending: () => string | null
+  active: (draft: string) => boolean
+  set: (draft: string, agent: string) => void
+  drop: (draft: string) => void
+}) {
+  const seeded = new Set<string>()
+  return {
+    seed(draft: string) {
+      const agent = draftAgentSelection(opts.selections(), draft, opts.pending())
+      if (!agent) return
+      opts.set(draft, agent)
+      seeded.add(draft)
+    },
+    promote(draft: string) {
+      seeded.delete(draft)
+    },
+    prune(draft?: string) {
+      if (!draft || opts.active(draft) || !seeded.delete(draft)) return
+      opts.drop(draft)
+    },
+  }
+}
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index 4336c85a2c..81b6f4f8ec 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -80,6 +80,7 @@ import { deleteDraftsForSession } from "../utils/draft-store"
 import { createAbortState } from "./abort-state"
 import { clearIfOn, createCloudPrune } from "./session-cloud-prune"
 import { isSameSessionTree } from "./model-usage"
+import { createDraftAgentSeed } from "./session-agent"
 
 const RECENT_LIMIT = 5
 const MESSAGE_PAGE_LIMIT = 80
@@ -555,7 +556,17 @@ export const SessionProvider: ParentComponent = (props) => {
     if (sessionID) return store.agentSelections[sessionID] ?? defaultAgent()
     return selectedAgentName()
   }
-
+  const agentDrafts = createDraftAgentSeed({
+    selections: () => store.agentSelections,
+    pending: pendingAgentSelection,
+    active: (draft) => !!submissionMap[draft],
+    set: (draft, agent) => setStore("agentSelections", draft, agent),
+    drop: (draft) =>
+      setStore(
+        "agentSelections",
+        produce((agents) => void delete agents[draft]),
+      ),
+  })
   const agentNames = createMemo(() => new Set(agents().map((agent) => agent.name)))
 
   const { pendingCloudPrune, prune: pruneCloudOrphans } = createCloudPrune((m) => setStore("parts", produce(m)), stash)
@@ -1319,6 +1330,7 @@ export const SessionProvider: ParentComponent = (props) => {
             for (const key of sessionVariantKeys(variants, draftID)) delete variants[key]
           }),
         )
+        agentDrafts.promote(draftID)
       } else if (pendingAgent && !store.agentSelections[session.id]) {
         setStore("agentSelections", session.id, pendingAgent)
         setPendingAgentSelection(null)
@@ -1835,6 +1847,7 @@ export const SessionProvider: ParentComponent = (props) => {
     })
 
     if (!message.sessionID && message.draftID) {
+      if (draftSessionID() !== message.draftID) agentDrafts.prune(message.draftID)
       setDraftSessionID(message.draftID)
     }
   }
@@ -2256,8 +2269,10 @@ export const SessionProvider: ParentComponent = (props) => {
       dismissQuestion(q.id)
     }
 
-    const effectiveDraftID = !sid && !draftID ? crypto.randomUUID() : draftID
+    const fresh = !sid && !draftID
+    const effectiveDraftID = fresh ? crypto.randomUUID() : draftID
     const scope = effectiveDraftID ?? sid
+    if (fresh && effectiveDraftID) agentDrafts.seed(effectiveDraftID)
     if (scope) {
       clearClose(scope)
       addOptimistic(scope, messageID, text, files, review)
@@ -2328,8 +2343,10 @@ export const SessionProvider: ParentComponent = (props) => {
       dismissQuestion(q.id)
     }
 
-    const effectiveDraftID = !sid && !draftID ? crypto.randomUUID() : draftID
+    const fresh = !sid && !draftID
+    const effectiveDraftID = fresh ? crypto.randomUUID() : draftID
     const scope = effectiveDraftID ?? sid
+    if (fresh && effectiveDraftID) agentDrafts.seed(effectiveDraftID)
     if (scope) {
       clearClose(scope)
       addOptimistic(scope, messageID, `/${command} ${args}`.trim(), files)
@@ -2500,11 +2517,13 @@ export const SessionProvider: ParentComponent = (props) => {
     }
 
     // Reset agent selection to default for the new session (model overrides persist)
+    agentDrafts.prune(draftSessionID())
     setPendingAgentSelection(defaultAgent())
     vscode.postMessage({ type: "createSession" })
   }
 
   function clearCurrentSession() {
+    agentDrafts.prune(draftSessionID())
     setUserClearedSession(true)
     setCurrentSessionID(undefined)
     setDraftSessionID(undefined)
@@ -2553,6 +2572,7 @@ export const SessionProvider: ParentComponent = (props) => {
     // they update even while disconnected. Bailing out here when not connected
     // froze the chat on the previous session while the side diff (resolved from
     // the worktree selection) still moved (the reported "only the diff changes").
+    agentDrafts.prune(draftSessionID())
     setCurrentSessionID(id)
     setDraftSessionID(id)
     setUserClearedSession(false)
@@ -2599,6 +2619,7 @@ export const SessionProvider: ParentComponent = (props) => {
       return
     }
     const key = `cloud:${cloudSessionId}`
+    agentDrafts.prune(draftSessionID())
     setCloudPreviewId(cloudSessionId)
     setCurrentSessionID(key)
     setDraftSessionID(key)

From 49dd6d4951726d126e0ce6be67547d4d432f3aa3 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 17:20:22 +0200
Subject: [PATCH 47/68] fix(jetbrains): default hasPersonalAccount until CLI
 release exposes it

---
 .../main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt | 5 ++++-
 .../ai/kilocode/backend/app/KiloBackendAppServiceTest.kt     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
index f2d023a0bf..58e929dcd7 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
@@ -155,7 +155,10 @@ internal fun profileDto(p: KiloProfile200Response): ProfileDto = ProfileDto(
     organizations = p.profile.organizations.orEmpty().map { org ->
         ProfileOrganizationDto(id = org.id, name = org.name, role = org.role)
     },
-    hasPersonalAccount = p.profile.hasPersonalAccount ?: true,
+    // The pinned CLI release does not expose hasPersonalAccount yet, so default to
+    // showing the personal account. Flip back to p.profile.hasPersonalAccount once a
+    // CLI release ships the field.
+    hasPersonalAccount = true,
     balance = p.balance?.balance?.let { ProfileBalanceDto(balance = it) },
     kiloPass = p.kiloPass?.let {
         val base = it.currentPeriodBaseCreditsUsd ?: return@let null
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
index a82dcdc53a..d99c80fb55 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
@@ -834,7 +834,6 @@ class KiloBackendAppServiceTest {
             "profile":{
                 "email":"alice@test.com",
                 "name":"Alice",
-                "hasPersonalAccount":false,
                 "organizations":[{"id":"org_1","name":"Acme","role":"ADMIN"}]
             },
             "balance":{"balance":42.5},
@@ -849,7 +848,8 @@ class KiloBackendAppServiceTest {
         assertEquals("alice@test.com", dto.profile?.email)
         assertEquals("Alice", dto.profile?.name)
         assertEquals("ADMIN", dto.profile?.organizations?.firstOrNull()?.role)
-        assertFalse(dto.profile?.hasPersonalAccount ?: true)
+        // The pinned CLI does not expose hasPersonalAccount yet; the mapper defaults it to true.
+        assertTrue(dto.profile?.hasPersonalAccount ?: false)
         assertEquals(42.5, dto.profile?.balance?.balance)
         assertEquals("org_1", dto.profile?.currentOrgId)
     }

From 8f57194af683f5985506b88e04ac7fe84bce6659 Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 7 Jul 2026 17:29:38 +0200
Subject: [PATCH 48/68] chore(vscode): raise session.tsx max-lines cap

---
 packages/kilo-vscode/eslint.config.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-vscode/eslint.config.mjs b/packages/kilo-vscode/eslint.config.mjs
index b36ae0fd19..d19df68b45 100644
--- a/packages/kilo-vscode/eslint.config.mjs
+++ b/packages/kilo-vscode/eslint.config.mjs
@@ -73,7 +73,10 @@ export default [
   },
   {
     files: ["webview-ui/src/context/session.tsx"],
-    rules: { complexity: ["error", 31] },
+    // Raised from the default 3000 as this session context grew past the cap
+    // after upstream merges; kept as a targeted override rather than loosening
+    // the global limit.
+    rules: { complexity: ["error", 31], "max-lines": ["error", 3100] },
   },
   {
     files: ["src/services/autocomplete/classic-auto-complete/AutocompleteInlineCompletionProvider.ts"],

From 5c41d65fe4295537eeeb70fcb020a2dd8fa47648 Mon Sep 17 00:00:00 2001
From: Mohammad Javad Naderi <mjnaderi@gmail.com>
Date: Tue, 7 Jul 2026 18:59:44 +0330
Subject: [PATCH 49/68] fix(vscode): handle multiline bidi prompt input
 (#12006)

* fix(vscode): handle multiline bidi prompt input

* fix(vscode): resolve pending prompt arrow snaps

* fix(vscode): compact session draft-agent seeding under max-lines

Revert the stylistic `const fresh` introduced by #12009 to the inline
ternary at both send sites so session.tsx drops back under the 3000-line
max-lines lint cap (3001 -> 2999). The draft-agent seeding contract is
preserved: a draftID is minted when there is no session, and the pending
agent is seeded before promptAgent(scope) resolves.

Update the two prompt-send-contract assertions to the compacted shape.

---------

Co-authored-by: Marius <marius@kilocode.ai>
---
 .changeset/fix-prompt-bidi-multiline.md       |  5 ++
 .../unit/prompt-input-bidirectional.test.ts   |  4 ++
 .../tests/unit/prompt-send-contract.test.ts   | 10 ++-
 .../tests/unit/use-file-mention.test.ts       | 69 ++++++++++++++++---
 .../webview-ui/src/context/session.tsx        | 10 ++-
 .../webview-ui/src/hooks/useFileMention.ts    | 55 ++++++++++-----
 .../webview-ui/src/styles/prompt-input.css    |  2 +
 7 files changed, 116 insertions(+), 39 deletions(-)
 create mode 100644 .changeset/fix-prompt-bidi-multiline.md

diff --git a/.changeset/fix-prompt-bidi-multiline.md b/.changeset/fix-prompt-bidi-multiline.md
new file mode 100644
index 0000000000..c20e46b5e0
--- /dev/null
+++ b/.changeset/fix-prompt-bidi-multiline.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix multiline bidirectional prompt input rendering and file mention arrow navigation.
diff --git a/packages/kilo-vscode/tests/unit/prompt-input-bidirectional.test.ts b/packages/kilo-vscode/tests/unit/prompt-input-bidirectional.test.ts
index bffa6a1456..c736e8fd57 100644
--- a/packages/kilo-vscode/tests/unit/prompt-input-bidirectional.test.ts
+++ b/packages/kilo-vscode/tests/unit/prompt-input-bidirectional.test.ts
@@ -4,13 +4,17 @@ import { join } from "node:path"
 
 const path = join(__dirname, "..", "..", "webview-ui", "src", "components", "chat", "PromptInput.tsx")
 const src = readFileSync(path, "utf8")
+const cssPath = join(__dirname, "..", "..", "webview-ui", "src", "styles", "prompt-input.css")
+const css = readFileSync(cssPath, "utf8")
 
 describe("PromptInput bidirectional text support", () => {
   it("lets the textarea and visible overlay resolve text direction automatically", () => {
     const overlay = src.match(/<div class="prompt-input-highlight-overlay"[\s\S]*?>/)?.[0]
+    const overlayCss = css.match(/\.prompt-input-highlight-overlay\s*{[^}]*}/)?.[0]
     const input = src.match(/<textarea[\s\S]*?\n\s*\/>/)?.[0]
 
     expect(overlay).toContain('dir="auto"')
+    expect(overlayCss).toContain("unicode-bidi: plaintext")
     expect(input).toContain('class="prompt-input"')
     expect(input).toContain('dir="auto"')
   })
diff --git a/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts b/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
index 8163cf4aed..cc79151a3e 100644
--- a/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
+++ b/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
@@ -213,14 +213,12 @@ describe("sendMessage / sendCommand draft id contract", () => {
     // from ":pending:<id>" to ":session:<newSessionId>". The user loses the
     // typed message and the new session starts empty.
     const body = extractFunctionBody(source, "sendMessage")
-    expect(body).toContain("const fresh = !sid && !draftID")
-    expect(body).toMatch(/const effectiveDraftID = fresh \? crypto\.randomUUID\(\) : draftID/)
+    expect(body).toMatch(/const effectiveDraftID = !sid && !draftID \? crypto\.randomUUID\(\) : draftID/)
   })
 
   it("sendCommand mints a draftID when there is no current session and none was supplied", () => {
     const body = extractFunctionBody(source, "sendCommand")
-    expect(body).toContain("const fresh = !sid && !draftID")
-    expect(body).toMatch(/const effectiveDraftID = fresh \? crypto\.randomUUID\(\) : draftID/)
+    expect(body).toMatch(/const effectiveDraftID = !sid && !draftID \? crypto\.randomUUID\(\) : draftID/)
   })
 
   it("sendMessage seeds the pending agent before resolving the draft-scoped agent", () => {
@@ -230,14 +228,14 @@ describe("sendMessage / sendCommand draft id contract", () => {
     // model with the default agent's system prompt.
     const body = extractFunctionBody(source, "sendMessage")
     expect(body).toMatch(
-      /if \(fresh && effectiveDraftID\) agentDrafts\.seed\(effectiveDraftID\)[\s\S]*const agent = promptAgent\(scope\)/,
+      /if \(!sid && !draftID && effectiveDraftID\) agentDrafts\.seed\(effectiveDraftID\)[\s\S]*const agent = promptAgent\(scope\)/,
     )
   })
 
   it("sendCommand seeds the pending agent before resolving the draft-scoped agent", () => {
     const body = extractFunctionBody(source, "sendCommand")
     expect(body).toMatch(
-      /if \(fresh && effectiveDraftID\) agentDrafts\.seed\(effectiveDraftID\)[\s\S]*const agent = promptAgent\(scope\)/,
+      /if \(!sid && !draftID && effectiveDraftID\) agentDrafts\.seed\(effectiveDraftID\)[\s\S]*const agent = promptAgent\(scope\)/,
     )
   })
 
diff --git a/packages/kilo-vscode/tests/unit/use-file-mention.test.ts b/packages/kilo-vscode/tests/unit/use-file-mention.test.ts
index 6fe5f692a0..3d8027e18a 100644
--- a/packages/kilo-vscode/tests/unit/use-file-mention.test.ts
+++ b/packages/kilo-vscode/tests/unit/use-file-mention.test.ts
@@ -225,7 +225,7 @@ describe("useFileMention", () => {
     dispose.fn?.()
   })
 
-  it("keeps mention block arrow navigation aligned with left-to-right prompt direction", async () => {
+  it("snaps a native forward caret move over a mention", async () => {
     const ctx = {
       postMessage: () => {},
       onMessage: () => () => {},
@@ -242,19 +242,27 @@ describe("useFileMention", () => {
 
     const right = key("ArrowRight")
     const input = textarea(text, "See ".length, "ltr")
-    expect(mention.handleArrowKey(right.event, input)).toBe(true)
+    expect(mention.handleArrowKey(right.event, input)).toBe(false)
+    expect(right.state.prevented).toBe(0)
+
+    const positionAfterArrowRight = "See @".length
+    input.setSelectionRange(positionAfterArrowRight, positionAfterArrowRight)
+    await wait(0)
     expect(input.selectionStart).toBe("See @src/main.ts".length)
-    expect(right.state.prevented).toBe(1)
 
     const left = key("ArrowLeft")
-    expect(mention.handleArrowKey(left.event, input)).toBe(true)
+    expect(mention.handleArrowKey(left.event, input)).toBe(false)
+    expect(left.state.prevented).toBe(0)
+
+    const positionAfterArrowLeft = "See @src/main.t".length
+    input.setSelectionRange(positionAfterArrowLeft, positionAfterArrowLeft)
+    await wait(0)
     expect(input.selectionStart).toBe("See ".length)
-    expect(left.state.prevented).toBe(1)
 
     dispose.fn?.()
   })
 
-  it("keeps mention block arrow navigation aligned for right-to-left languages", async () => {
+  it("snaps a native right-to-left caret move over a mention", async () => {
     const ctx = {
       postMessage: () => {},
       onMessage: () => () => {},
@@ -271,14 +279,55 @@ describe("useFileMention", () => {
 
     const left = key("ArrowLeft")
     const input = textarea(text, "فایل ".length, "rtl")
-    expect(mention.handleArrowKey(left.event, input)).toBe(true)
+    expect(mention.handleArrowKey(left.event, input)).toBe(false)
+    expect(left.state.prevented).toBe(0)
+
+    const positionAfterArrowLeft = "فایل @".length
+    input.setSelectionRange(positionAfterArrowLeft, positionAfterArrowLeft)
+    await wait(0)
     expect(input.selectionStart).toBe("فایل @src/main.ts".length)
-    expect(left.state.prevented).toBe(1)
 
     const right = key("ArrowRight")
-    expect(mention.handleArrowKey(right.event, input)).toBe(true)
+    expect(mention.handleArrowKey(right.event, input)).toBe(false)
+    expect(right.state.prevented).toBe(0)
+
+    const positionAfterArrowRight = "فایل @src/main.t".length
+    input.setSelectionRange(positionAfterArrowRight, positionAfterArrowRight)
+    await wait(0)
     expect(input.selectionStart).toBe("فایل ".length)
-    expect(right.state.prevented).toBe(1)
+
+    dispose.fn?.()
+  })
+
+  it("resolves a pending arrow snap before the next native arrow move", async () => {
+    const ctx = {
+      postMessage: () => {},
+      onMessage: () => () => {},
+    }
+
+    const dispose: { fn?: () => void } = {}
+    const mention = createRoot((root) => {
+      dispose.fn = root
+      return useFileMention(ctx, undefined, () => false)
+    })
+
+    const text = "See @src/main.ts now"
+    mention.addPaths(["src/main.ts"], "/repo")
+
+    const right = key("ArrowRight")
+    const input = textarea(text, "See ".length, "ltr")
+    expect(mention.handleArrowKey(right.event, input)).toBe(false)
+
+    const pos = "See @".length
+    input.setSelectionRange(pos, pos)
+    expect(mention.handleArrowKey(right.event, input)).toBe(false)
+
+    const end = "See @src/main.ts".length
+    expect(input.selectionStart).toBe(end)
+
+    input.setSelectionRange(end + 1, end + 1)
+    await wait(0)
+    expect(input.selectionStart).toBe(end + 1)
 
     dispose.fn?.()
   })
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index 81b6f4f8ec..e419bd6493 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -2269,10 +2269,9 @@ export const SessionProvider: ParentComponent = (props) => {
       dismissQuestion(q.id)
     }
 
-    const fresh = !sid && !draftID
-    const effectiveDraftID = fresh ? crypto.randomUUID() : draftID
+    const effectiveDraftID = !sid && !draftID ? crypto.randomUUID() : draftID
     const scope = effectiveDraftID ?? sid
-    if (fresh && effectiveDraftID) agentDrafts.seed(effectiveDraftID)
+    if (!sid && !draftID && effectiveDraftID) agentDrafts.seed(effectiveDraftID)
     if (scope) {
       clearClose(scope)
       addOptimistic(scope, messageID, text, files, review)
@@ -2343,10 +2342,9 @@ export const SessionProvider: ParentComponent = (props) => {
       dismissQuestion(q.id)
     }
 
-    const fresh = !sid && !draftID
-    const effectiveDraftID = fresh ? crypto.randomUUID() : draftID
+    const effectiveDraftID = !sid && !draftID ? crypto.randomUUID() : draftID
     const scope = effectiveDraftID ?? sid
-    if (fresh && effectiveDraftID) agentDrafts.seed(effectiveDraftID)
+    if (!sid && !draftID && effectiveDraftID) agentDrafts.seed(effectiveDraftID)
     if (scope) {
       clearClose(scope)
       addOptimistic(scope, messageID, `/${command} ${args}`.trim(), files)
diff --git a/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts b/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts
index fbc2a97f1d..b23a507851 100644
--- a/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts
+++ b/packages/kilo-vscode/webview-ui/src/hooks/useFileMention.ts
@@ -15,12 +15,6 @@ import {
 
 const FILE_SEARCH_DEBOUNCE_MS = 150
 
-const rtl = (textarea: HTMLTextAreaElement): boolean => {
-  if (textarea.matches(":dir(rtl)")) return true
-  if (textarea.matches(":dir(ltr)")) return false
-  return getComputedStyle(textarea).direction === "rtl"
-}
-
 interface VSCodeContext {
   postMessage: (message: WebviewMessage) => void
   onMessage: (handler: (message: ExtensionMessage) => void) => () => void
@@ -89,6 +83,7 @@ export function useFileMention(
 
   let fileSearchTimer: ReturnType<typeof setTimeout> | undefined
   let fileSearchCounter = 0
+  let pendingArrowSnap: { timer: ReturnType<typeof setTimeout>; prevValue: string; prevPosition: number } | undefined
 
   const showMention = () => mentionQuery() !== null
 
@@ -109,6 +104,7 @@ export function useFileMention(
   onCleanup(() => {
     unsubscribe()
     if (fileSearchTimer) clearTimeout(fileSearchTimer)
+    if (pendingArrowSnap) clearTimeout(pendingArrowSnap.timer)
   })
 
   const requestFileSearch = (query: string) => {
@@ -278,24 +274,49 @@ export function useFileMention(
     return true
   }
 
+  const resolvePendingArrowSnap = (textarea: HTMLTextAreaElement) => {
+    const pending = pendingArrowSnap
+    if (!pending) return
+
+    clearTimeout(pending.timer)
+    pendingArrowSnap = undefined
+
+    if (textarea.value !== pending.prevValue) return
+    const start = textarea.selectionStart ?? 0
+    const end = textarea.selectionEnd ?? 0
+    if (start !== end) return
+
+    if (start === pending.prevPosition) return
+
+    const range = findMentionRange(pending.prevValue, start, mentionedPaths())
+    if (!range) return
+
+    const pos = start > pending.prevPosition ? range.end : range.start
+    if (pos === start) return
+
+    textarea.setSelectionRange(pos, pos)
+  }
+
   const handleArrowKey = (e: KeyboardEvent, textarea: HTMLTextAreaElement | undefined): boolean => {
-    if ((e.key !== "ArrowLeft" && e.key !== "ArrowRight") || !textarea) return false
+    if (!textarea) return false
+    resolvePendingArrowSnap(textarea)
+
+    if (e.key !== "ArrowLeft" && e.key !== "ArrowRight") return false
     // Don't interfere with selection (Shift) or word/line navigation (Ctrl/Cmd/Alt)
     if (e.shiftKey || e.ctrlKey || e.metaKey || e.altKey) return false
-    const cursor = textarea.selectionStart ?? 0
     // Only when there's no active selection
     if (textarea.selectionStart !== textarea.selectionEnd) return false
 
-    const forward = e.key === (rtl(textarea) ? "ArrowLeft" : "ArrowRight")
-    // Check where the cursor WOULD land after the native move
-    const next = forward ? cursor + 1 : cursor - 1
-    const range = findMentionRange(textarea.value, next, mentionedPaths())
-    if (!range) return false
+    const prevPosition = textarea.selectionStart ?? 0
+    const prevValue = textarea.value
 
-    e.preventDefault()
-    const pos = forward ? range.end : range.start
-    textarea.setSelectionRange(pos, pos)
-    return true
+    // Let the textarea perform its native bidi-aware caret move,
+    // then read the updated selection and snap only if it landed inside a mention.
+    const timer = setTimeout(() => {
+      resolvePendingArrowSnap(textarea)
+    }, 0)
+    pendingArrowSnap = { timer, prevValue, prevPosition }
+    return false
   }
 
   let snapping = false
diff --git a/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css b/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css
index 3188bf86c9..6d11c7f577 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/prompt-input.css
@@ -374,6 +374,8 @@
   font-size: var(--font-size-base);
   line-height: 1.4;
   white-space: pre-wrap;
+  /* Match textarea plaintext bidi behavior for each hard-newline paragraph. */
+  unicode-bidi: plaintext;
   word-wrap: break-word;
   overflow-x: hidden;
   overflow-y: auto;

From 36343ea1a6b5efceafc7fca1bde81ae0a4aa53c7 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 16:02:19 -0400
Subject: [PATCH 50/68] fix(jetbrains): show retry status in session footer

---
 .changeset/jetbrains-retry-status-footer.md   |  5 ++
 .../ai/kilocode/client/session/SessionUi.kt   |  2 +-
 .../session/controller/SessionController.kt   |  3 +-
 .../client/session/ui/ProgressPanel.kt        | 27 +++++++-
 .../resources/messages/KiloBundle.properties  |  3 +-
 .../client/session/SessionUiLayoutTest.kt     | 61 ++++++++++++++++---
 .../controller/ProgressTrackingTest.kt        | 48 +++++++++++++++
 .../client/session/ui/ProgressPanelTest.kt    | 58 ++++++++++++++++--
 8 files changed, 189 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/jetbrains-retry-status-footer.md

diff --git a/.changeset/jetbrains-retry-status-footer.md b/.changeset/jetbrains-retry-status-footer.md
new file mode 100644
index 0000000000..04a3db4de9
--- /dev/null
+++ b/.changeset/jetbrains-retry-status-footer.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show provider retry and usage-limit status in the JetBrains chat footer while keeping the conversation visible.
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 2e7945cd4e..1a565f221d 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
@@ -605,8 +605,8 @@ class SessionUi(
     }
 
     private fun body(state: SessionState): JPanel {
-        if (state is SessionState.Retry || state is SessionState.Offline) return progressBody
         if (controller.model.showSession) return messageBody
+        if (state is SessionState.Retry || state is SessionState.Offline) return progressBody
         if (state is SessionState.Loading) return progressBody
         return blankBody
     }
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 e50b9c760a..468c4b8bf0 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
@@ -1094,7 +1094,8 @@ class SessionController(
                 } else {
                     snapshots.remove(key)
                 }
-                if (model.state is SessionState.Busy) {
+                val s = model.state
+                if (s is SessionState.Busy || s is SessionState.Retry || s is SessionState.Offline) {
                     model.setState(SessionState.Busy(status()))
                 }
                 if (child != null) trackChild(key, child)
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt
index 5a9d6d757c..3372ccfc8a 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt
@@ -1,5 +1,6 @@
 package ai.kilocode.client.session.ui
 
+import ai.kilocode.client.plugin.KiloBundle
 import ai.kilocode.client.session.model.SessionModel
 import ai.kilocode.client.session.model.SessionModelEvent
 import ai.kilocode.client.session.model.SessionState
@@ -20,6 +21,8 @@ import com.intellij.util.ui.JBUI
  *
  * Reacts to [SessionModelEvent.StateChanged]:
  * - [SessionState.Busy] → shows an animated spinner and [SessionState.Busy.text]
+ * - [SessionState.Retry] → shows an animated spinner and retry detail
+ * - [SessionState.Offline] → shows offline detail without a spinner
  * - Any other state -> hidden
  *
  * Owned by [SessionMessageListPanel], which always re-anchors it as the last child so it
@@ -33,6 +36,7 @@ class ProgressPanel(
     private val label = JBLabel().apply {
         foreground = UiStyle.Colors.weak()
     }
+    private val spinner = JBLabel(AnimatedIcon.Default())
 
     init {
         isOpaque = false
@@ -45,7 +49,7 @@ class ProgressPanel(
         )
         applyStyle(SessionEditorStyle.current())
 
-        next(JBLabel(AnimatedIcon.Default()))
+        next(spinner)
         next(label)
 
         model.addListener(parent) { event ->
@@ -59,17 +63,36 @@ class ProgressPanel(
     private fun onState(state: SessionState) {
         when (state) {
             is SessionState.Busy -> {
+                spinner.isVisible = true
                 label.text = state.text
                 label.foreground = UiStyle.Colors.weak()
                 isVisible = true
             }
-            is SessionState.Loading -> isVisible = false
+            is SessionState.Retry -> {
+                spinner.isVisible = true
+                label.text = retryText(state)
+                label.foreground = UiStyle.Colors.warningLabelForeground()
+                isVisible = true
+            }
+            is SessionState.Offline -> {
+                spinner.isVisible = false
+                label.text = state.message.ifBlank { KiloBundle.message("session.status.offline") }
+                label.foreground = UiStyle.Colors.errorLabelForeground()
+                isVisible = true
+            }
             else -> isVisible = false
         }
         revalidate()
         repaint()
     }
 
+    private fun retryText(state: SessionState.Retry): String {
+        val base = state.message.ifBlank { KiloBundle.message("session.status.retry") }
+        return if (state.attempt > 0) {
+            KiloBundle.message("session.status.retry.attempt", base, state.attempt)
+        } else base
+    }
+
     override fun applyStyle(style: SessionEditorStyle) {
         label.font = style.regularFont
         revalidate()
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 718b30439f..3009e298b6 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
@@ -88,7 +88,8 @@ session.status.searching.codebase=Searching codebase…
 session.status.searching.web=Searching web…
 session.status.editing=Making edits…
 session.status.commands=Running commands…
-session.status.retry=Retrying connection...
+session.status.retry=Retrying…
+session.status.retry.attempt={0} (attempt {1})
 session.status.offline=Connection offline
 
 session.part.reasoning=Reasoning
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
index e470948dea..fda1cf8b0a 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
@@ -296,25 +296,27 @@ class SessionUiLayoutTest : SessionUiTestBase() {
         assertSame(find<SessionMessageListPanel>(ui), scrollView())
     }
 
-    fun `test retry status renders in loading panel instead of message body`() {
+    fun `test retry status keeps transcript and shows message in footer`() {
         rpc.history.addAll(history(1))
         ui = newUi(id = "ses_test")
         settle()
 
-        controller().model.setState(SessionState.Retry("Cannot connect to API", attempt = 2, next = 1_234L))
+        controller().model.setState(SessionState.Retry("The usage limit has been reached", attempt = 4, next = 0L))
         layout()
 
-        val panel = find<LoadingPanel>(ui)
+        val panel = find<SessionMessageListPanel>(ui)
         assertSame(panel, scrollView())
-        assertEquals("Cannot connect to API", panel.labelText())
+        assertTrue(panel.progress.isVisible)
+        assertEquals("The usage limit has been reached (attempt 4)", panel.progress.labelText())
 
         controller().model.setState(SessionState.Idle)
         layout()
 
-        assertSame(find<SessionMessageListPanel>(ui), scrollView())
+        assertSame(panel, scrollView())
+        assertFalse(panel.progress.isVisible)
     }
 
-    fun `test offline status renders in loading panel with fallback`() {
+    fun `test offline status keeps transcript and shows message in footer`() {
         rpc.history.addAll(history(1))
         ui = newUi(id = "ses_test")
         settle()
@@ -322,9 +324,52 @@ class SessionUiLayoutTest : SessionUiTestBase() {
         controller().model.setState(SessionState.Offline("", requestId = "req1"))
         layout()
 
-        val panel = find<LoadingPanel>(ui)
+        val panel = find<SessionMessageListPanel>(ui)
         assertSame(panel, scrollView())
-        assertEquals("Connection offline", panel.labelText())
+        assertTrue(panel.progress.isVisible)
+        assertEquals("Connection offline", panel.progress.labelText())
+    }
+
+    fun `test retry before transcript shows loading panel`() {
+        ui = newUi(displayMs = 1_000)
+
+        controller().model.setState(SessionState.Retry("The usage limit has been reached", attempt = 4, next = 0L))
+        layout()
+
+        assertSame(find<LoadingPanel>(ui), scrollView())
+    }
+
+    fun `test retry offline churn retains transcript panel and footer`() {
+        rpc.history.addAll(history(1))
+        ui = newUi(id = "ses_test")
+        settle()
+
+        val panel = find<SessionMessageListPanel>(ui)
+        val progress = panel.progress
+        val count = panel.componentCount
+
+        repeat(100) { i ->
+            controller().model.setState(SessionState.Retry("Rate limited", attempt = i + 1, next = 0L))
+            layout()
+            assertSame(panel, scrollView())
+            assertSame(progress, panel.progress)
+            assertEquals(count, panel.componentCount)
+            assertTrue(panel.progress.isVisible)
+
+            controller().model.setState(SessionState.Offline("Connection offline", requestId = "req$i"))
+            layout()
+            assertSame(panel, scrollView())
+            assertSame(progress, panel.progress)
+            assertEquals(count, panel.componentCount)
+            assertTrue(panel.progress.isVisible)
+
+            controller().model.setState(SessionState.Idle)
+            layout()
+            assertSame(panel, scrollView())
+            assertSame(progress, panel.progress)
+            assertEquals(count, panel.componentCount)
+            assertFalse(panel.progress.isVisible)
+        }
     }
 
     fun `test empty explicit session id shows message body`() {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/ProgressTrackingTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/ProgressTrackingTest.kt
index dbe7c98d4e..df346f1590 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/ProgressTrackingTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/controller/ProgressTrackingTest.kt
@@ -5,6 +5,7 @@ import ai.kilocode.client.session.model.SessionState
 import ai.kilocode.client.session.model.StepFinish
 import ai.kilocode.rpc.dto.ChatEventDto
 import ai.kilocode.rpc.dto.MessageErrorDto
+import ai.kilocode.rpc.dto.SessionStatusDto
 
 /**
  * Verifies that:
@@ -158,4 +159,51 @@ class ProgressTrackingTest : SessionControllerTestBase() {
         val text = (last!!.state as SessionState.Busy).text
         assertTrue(text.contains("Running", ignoreCase = true))
     }
+
+    fun `test PartUpdated clears Retry back to Busy`() {
+        val (m, _, _) = prompted()
+
+        emit(ChatEventDto.SessionStatusChanged(
+            "ses_test",
+            SessionStatusDto("retry", "The usage limit has been reached", attempt = 4, next = 0L),
+        ))
+        assertTrue(m.model.state is SessionState.Retry)
+
+        emit(ChatEventDto.MessageUpdated("ses_test", msg("msg1", "ses_test", "assistant")))
+        emit(ChatEventDto.PartUpdated("ses_test", part("p1", "ses_test", "msg1", "text", text = "hello")))
+
+        assertSession(
+            """
+            assistant#msg1
+            text#p1:
+              hello
+
+            [code] [kilo/gpt-5] [busy] [writing response]
+            """,
+            m,
+        )
+    }
+
+    fun `test PartUpdated clears Offline back to Busy`() {
+        val (m, _, _) = prompted()
+
+        emit(ChatEventDto.SessionStatusChanged(
+            "ses_test",
+            SessionStatusDto("offline", "Connection offline", requestID = "req1"),
+        ))
+        assertTrue(m.model.state is SessionState.Offline)
+
+        emit(ChatEventDto.MessageUpdated("ses_test", msg("msg1", "ses_test", "assistant")))
+        emit(ChatEventDto.PartUpdated("ses_test", part("p1", "ses_test", "msg1", "tool", tool = "bash")))
+
+        assertSession(
+            """
+            assistant#msg1
+            tool#p1 bash [PENDING]
+
+            [code] [kilo/gpt-5] [busy] [running commands]
+            """,
+            m,
+        )
+    }
 }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ProgressPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ProgressPanelTest.kt
index 7974709b08..4cd7efa388 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ProgressPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/ProgressPanelTest.kt
@@ -1,5 +1,6 @@
 package ai.kilocode.client.session.ui
 
+import ai.kilocode.client.plugin.KiloBundle
 import ai.kilocode.client.session.model.Permission
 import ai.kilocode.client.session.model.PermissionMeta
 import ai.kilocode.client.session.model.SessionModel
@@ -72,16 +73,61 @@ class ProgressPanelTest : BasePlatformTestCase() {
         assertEquals("Writing response\u2026", panel.labelText())
     }
 
-    fun `test panel hides on Retry`() {
-        model.setState(SessionState.Retry("Cannot connect to API", attempt = 2, next = 1_234L))
+    fun `test panel shows on Retry with message and attempt`() {
+        model.setState(SessionState.Retry("The usage limit has been reached", attempt = 4, next = 0L))
 
-        assertFalse(panel.isVisible)
+        assertTrue(panel.isVisible)
+        assertTrue(spinner().isVisible)
+        assertEquals("The usage limit has been reached (attempt 4)", panel.labelText())
     }
 
-    fun `test panel hides on Offline`() {
+    fun `test panel shows on Offline`() {
         model.setState(SessionState.Offline("Computer appears offline", requestId = "req1"))
 
-        assertFalse(panel.isVisible)
+        assertTrue(panel.isVisible)
+        assertFalse(spinner().isVisible)
+        assertEquals("Computer appears offline", panel.labelText())
+    }
+
+    fun `test retry falls back to generic message when blank`() {
+        model.setState(SessionState.Retry("", attempt = 0, next = 0L))
+
+        assertTrue(panel.isVisible)
+        assertEquals(KiloBundle.message("session.status.retry"), panel.labelText())
+    }
+
+    fun `test retry without attempt omits attempt suffix`() {
+        model.setState(SessionState.Retry("Rate limited", attempt = 0, next = 0L))
+
+        assertTrue(panel.isVisible)
+        assertEquals("Rate limited", panel.labelText())
+    }
+
+    fun `test state churn retains footer components`() {
+        val count = panel.componentCount
+        val icon = panel.components[0]
+        val text = panel.components[1]
+
+        repeat(500) { i ->
+            model.setState(SessionState.Busy("Thinking $i"))
+            model.setState(SessionState.Retry("Rate limited", attempt = i + 1, next = 0L))
+            model.setState(SessionState.Offline("Computer appears offline", requestId = "req$i"))
+            model.setState(SessionState.Idle)
+
+            assertEquals(count, panel.componentCount)
+            assertSame(icon, panel.components[0])
+            assertSame(text, panel.components[1])
+        }
+    }
+
+    fun `test disposing parent removes model listener`() {
+        model.setState(SessionState.Busy("Thinking"))
+        Disposer.dispose(parent)
+
+        model.setState(SessionState.Retry("Rate limited", attempt = 1, next = 0L))
+
+        assertEquals("Thinking", panel.labelText())
+        parent = Disposer.newDisposable("test replacement")
     }
 
     fun `test panel hides on Error state`() {
@@ -108,4 +154,6 @@ class ProgressPanelTest : BasePlatformTestCase() {
         always = emptyList(),
         meta = PermissionMeta(raw = emptyMap()),
     )
+
+    private fun spinner() = panel.components[0]
 }

From b015e8d6908891925e21f7935a62c8de76e0c654 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 16:17:49 -0400
Subject: [PATCH 51/68] fix(jetbrains): loosen todo item spacing

---
 .../session/views/todo/TodoListPanel.kt       |  2 +-
 .../session/views/todo/TodoWriteViewTest.kt   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/todo/TodoListPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/todo/TodoListPanel.kt
index 7005a6eda0..63e2317606 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/todo/TodoListPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/todo/TodoListPanel.kt
@@ -22,7 +22,7 @@ class TodoListPanel(
     todos: List<TodoDto> = emptyList(),
     private var before: Int = 0,
     private var after: Int = 0,
-) : Stack(StackAxis.VERTICAL) {
+) : Stack(StackAxis.VERTICAL, JBUI.scale(SessionUiStyle.View.Layout.GAP)) {
 
     private var items = todos
     private var style = SessionEditorStyle.current()
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/todo/TodoWriteViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/todo/TodoWriteViewTest.kt
index b4af0eba89..28be9b3e76 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/todo/TodoWriteViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/todo/TodoWriteViewTest.kt
@@ -7,9 +7,11 @@ import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.session.views.base.PrimarySessionPartView
 import ai.kilocode.client.ui.UiStyle
+import ai.kilocode.client.ui.layout.Stack
 import ai.kilocode.rpc.dto.TodoDto
 import ai.kilocode.rpc.dto.TodoViewDto
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.util.ui.JBUI
 import java.awt.BorderLayout
 import java.awt.Color
 import javax.swing.JPanel
@@ -99,6 +101,23 @@ class TodoWriteViewTest : BasePlatformTestCase() {
         assertEquals(UiStyle.Gap.pad(), ins.right)
     }
 
+    fun `test todo rows use session view gap`() {
+        val view = TodoWriteView(tool("todowrite", ToolExecState.COMPLETED).also {
+            it.todos = listOf(
+                TodoDto("First", "pending", "medium"),
+                TodoDto("Second", "pending", "medium"),
+            )
+        })
+        val body = view.components.filterIsInstance<TodoListPanel>().single()
+
+        body.setSize(300, body.preferredSize.height)
+        body.doLayout()
+
+        val rows = body.components.filterIsInstance<Stack>().filter { it.isVisible }
+        val gap = rows[1].y - (rows[0].y + rows[0].height)
+        assertEquals(JBUI.scale(SessionUiStyle.View.Layout.GAP), gap)
+    }
+
     fun `test compact view renders hidden labels and visible rows`() {
         val view = TodoWriteView(tool("todowrite", ToolExecState.COMPLETED).also {
             it.todos = listOf(

From 9b93726135e92104cba5cb44d50b5189abfff3af Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 16:58:08 -0400
Subject: [PATCH 52/68] fix(jetbrains): tighten history panel scrolling

---
 .changeset/jetbrains-history-scroll.md        |  5 ++
 .../session/history/HistoryListRenderer.kt    | 16 +++--
 .../client/session/history/HistoryPanel.kt    | 15 +++--
 .../session/history/HistoryControllerTest.kt  | 65 +++++++++++++++++++
 4 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/jetbrains-history-scroll.md

diff --git a/.changeset/jetbrains-history-scroll.md b/.changeset/jetbrains-history-scroll.md
new file mode 100644
index 0000000000..118979a767
--- /dev/null
+++ b/.changeset/jetbrains-history-scroll.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Keep JetBrains local and cloud history timestamps visible without horizontal scrolling.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryListRenderer.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryListRenderer.kt
index a3265f2c1c..12971f4e69 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryListRenderer.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryListRenderer.kt
@@ -13,7 +13,6 @@ import com.intellij.util.ui.EmptyIcon
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import java.awt.BorderLayout
-import java.awt.FlowLayout
 import java.awt.Point
 import java.awt.Rectangle
 import java.awt.Component
@@ -68,11 +67,11 @@ internal open class HistoryRenderer<T : HistoryItem>(
         verticalAlignment = SwingConstants.CENTER
         border = JBUI.Borders.emptyLeft(JBUI.CurrentTheme.ActionsList.elementIconGap())
     }
-    private val head = JPanel(FlowLayout(FlowLayout.LEFT, 0, 0)).apply {
-        add(title)
-        add(badge)
+    private val head = JPanel(BorderLayout(UiStyle.Gap.xs(), 0)).apply {
+        add(title, BorderLayout.CENTER)
+        add(badge, BorderLayout.EAST)
     }
-    private val main = JPanel(BorderLayout()).apply {
+    private val main = JPanel(BorderLayout(UiStyle.Gap.md(), 0)).apply {
         add(head, BorderLayout.CENTER)
         add(time, BorderLayout.EAST)
     }
@@ -86,7 +85,12 @@ internal open class HistoryRenderer<T : HistoryItem>(
     init {
         isOpaque = true
         top.isOpaque = true
-        row.border = JBUI.Borders.empty(UiStyle.Gap.lg(), UiStyle.Gap.lg(), UiStyle.Gap.lg(), UiStyle.Gap.lg())
+        row.border = JBUI.Borders.empty(
+            UiStyle.Gap.lg(),
+            UiStyle.Gap.lg(),
+            UiStyle.Gap.lg(),
+            UiStyle.Gap.lg(),
+        )
         UiStyle.Components.transparent(row, main, head, title, badge, time, del)
         wrap.setContent(row)
         add(top, BorderLayout.NORTH)
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt
index 3d969a291e..b1999f3b80 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt
@@ -50,6 +50,7 @@ import javax.swing.JComponent
 import javax.swing.JList
 import javax.swing.KeyStroke
 import javax.swing.ListSelectionModel
+import javax.swing.ScrollPaneConstants
 import javax.swing.SwingUtilities
 import javax.swing.event.DocumentEvent
 import javax.swing.event.ListDataEvent
@@ -101,7 +102,7 @@ class HistoryPanel(
 
     init {
         Disposer.register(parent, this)
-        border = JBUI.Borders.empty(UiStyle.Gap.lg())
+        border = JBUI.Borders.empty(UiStyle.Gap.lg(), UiStyle.Gap.lg(), UiStyle.Gap.lg(), 0)
         more.addActionListener { controller.loadMoreCloud() }
         bind(localList, controller.local)
         bind(cloudList, controller.cloud)
@@ -207,11 +208,13 @@ class HistoryPanel(
                 if (list === cloudList) {
                     add(repoOnly, BorderLayout.SOUTH)
                 }
+                border = JBUI.Borders.emptyRight(UiStyle.Gap.lg())
             }
             add(north, BorderLayout.NORTH)
             add(JBScrollPane(list).apply {
                 border = JBUI.Borders.empty()
-                viewportBorder = JBUI.Borders.empty()
+                viewportBorder = JBUI.Borders.emptyRight(UiStyle.Gap.lg())
+                horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
             }, BorderLayout.CENTER)
             footer?.let {
                 add(Centerizer(it, Centerizer.TYPE.HORIZONTAL).apply {
@@ -221,7 +224,7 @@ class HistoryPanel(
         }
     }
 
-    private fun localList() = JBList(controller.local).apply {
+    private fun localList() = HistoryList(controller.local).apply {
         selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION
         isFocusable = true
         cellRenderer = LocalHistoryRenderer(controller.local, { snapshot.activity }, { snapshot.titles })
@@ -249,7 +252,7 @@ class HistoryPanel(
         ScrollingUtil.installActions(this)
     }
 
-    private fun cloudList() = JBList(controller.cloud).apply {
+    private fun cloudList() = HistoryList(controller.cloud).apply {
         selectionMode = ListSelectionModel.SINGLE_SELECTION
         isFocusable = true
         cellRenderer = CloudHistoryRenderer(controller.cloud) { snapshot.activity }
@@ -548,6 +551,10 @@ class HistoryPanel(
         }
     }
 
+    private class HistoryList<T : HistoryItem>(model: HistoryModel<T>) : JBList<T>(model) {
+        override fun getScrollableTracksViewportWidth() = true
+    }
+
     internal fun showingLoading() = !controller.local.loaded && !controller.cloud.loaded && (controller.local.loading || controller.cloud.loading)
 
     private companion object {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt
index 3ccfb9de9a..ef476010ec 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt
@@ -9,6 +9,7 @@ import ai.kilocode.client.session.SessionActivityKind
 import ai.kilocode.client.session.SessionRef
 import ai.kilocode.client.testing.FakeSessionRpcApi
 import ai.kilocode.client.testing.FakeWorkspaceRpcApi
+import ai.kilocode.client.ui.UiStyle
 import ai.kilocode.rpc.dto.CloudSessionDto
 import ai.kilocode.rpc.dto.KiloWorkspaceStateDto
 import ai.kilocode.rpc.dto.KiloWorkspaceStatusDto
@@ -19,12 +20,18 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.util.Disposer
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.ui.SearchTextField
+import com.intellij.ui.SimpleColoredComponent
+import com.intellij.ui.components.JBLabel
+import com.intellij.ui.components.JBList
+import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.ui.UIUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
+import java.awt.BorderLayout
 import java.awt.Cursor
 import java.awt.event.KeyEvent
 import java.time.Instant
@@ -34,6 +41,7 @@ import java.time.temporal.ChronoUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.swing.JComponent
 import javax.swing.KeyStroke
+import javax.swing.ScrollPaneConstants
 import javax.swing.event.ListDataEvent
 import javax.swing.event.ListDataListener
 
@@ -200,6 +208,30 @@ class HistoryControllerTest : BasePlatformTestCase() {
         assertFalse(renderer.runningVisible())
     }
 
+    fun `test history renderer uses trailing time with squeezable title`() {
+        val item = LocalHistoryItem(session("ses_1", "Long ".repeat(80)))
+        val controller = controller()
+        controller.local.replace(listOf(item))
+        val renderer = LocalHistoryRenderer(controller.local)
+        val view = renderer.getListCellRendererComponent(javax.swing.JList(arrayOf(item)), item, 0, false, false)
+
+        val title = UIUtil.uiTraverser(view).filter(SimpleColoredComponent::class.java).firstOrNull() ?: error("missing title")
+        val head = title.parent
+        assertTrue(head.layout is BorderLayout)
+        assertSame(title, (head.layout as BorderLayout).getLayoutComponent(BorderLayout.CENTER))
+
+        val time = UIUtil.uiTraverser(view).filter(JBLabel::class.java)
+            .first { it.text == HistoryTime.relative(item) }
+        val main = time.parent
+        assertTrue(main.layout is BorderLayout)
+        assertSame(time, (main.layout as BorderLayout).getLayoutComponent(BorderLayout.EAST))
+
+        val row = main.parent as JComponent
+        val ins = row.border.getBorderInsets(row)
+        assertEquals(ins.left, ins.right)
+        assertEquals(UiStyle.Gap.lg(), ins.right)
+    }
+
     fun `test history panel sync updates running badges`() {
         rpc.listed += session("ses_1", "Local One")
         val panel = HistoryPanel(parent, controller())
@@ -291,6 +323,19 @@ class HistoryControllerTest : BasePlatformTestCase() {
         assertEquals(1, panel.itemCount())
     }
 
+    fun `test history panels do not scroll horizontally`() {
+        rpc.listed += session("ses_1", "Local ".repeat(80))
+        rpc.cloud += cloud("cloud_1", "Cloud ".repeat(80))
+        val panel = HistoryPanel(parent, controller())
+        flush()
+
+        assertNoHorizontalScroll(panel)
+        panel.clickCloud()
+        flush()
+
+        assertNoHorizontalScroll(panel)
+    }
+
     fun `test panel shows back button with tabs`() {
         val panel = HistoryPanel(parent, controller())
         flush()
@@ -854,6 +899,26 @@ class HistoryControllerTest : BasePlatformTestCase() {
         override fun openSession(ref: SessionRef) {}
     }
 
+    private fun assertNoHorizontalScroll(panel: HistoryPanel) {
+        assertEquals(0, panel.component.insets.right)
+
+        val searches = UIUtil.uiTraverser(panel.component).filter(SearchTextField::class.java).toList()
+        assertTrue(searches.isNotEmpty())
+        assertTrue(searches.all { inset(it.parent as JComponent) == UiStyle.Gap.lg() })
+
+        val scrolls = UIUtil.uiTraverser(panel.component).filter(JBScrollPane::class.java).toList()
+            .filter { it.viewport.view is JBList<*> }
+        assertTrue(scrolls.isNotEmpty())
+        assertTrue(scrolls.all { it.horizontalScrollBarPolicy == ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER })
+        assertTrue(scrolls.all { it.viewportBorder.getBorderInsets(it).right == UiStyle.Gap.lg() })
+
+        val lists = UIUtil.uiTraverser(panel.component).filter(JBList::class.java).toList()
+        assertTrue(lists.isNotEmpty())
+        assertTrue(lists.all { it.getScrollableTracksViewportWidth() })
+    }
+
+    private fun inset(component: JComponent) = component.border.getBorderInsets(component).right
+
     private fun collect(controller: HistoryController): MutableList<String> {
         val events = mutableListOf<String>()
         val listener = object : ListDataListener {

From 121cb952001cb9ee11bbb536ee9f7a55a40c3001 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 17:03:13 -0400
Subject: [PATCH 53/68] fix(jetbrains): center history back button

---
 .../ai/kilocode/client/session/history/HistoryPanel.kt   | 9 +++++----
 .../client/session/history/HistoryControllerTest.kt      | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt
index b1999f3b80..f521687e4d 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryPanel.kt
@@ -6,7 +6,9 @@ import ai.kilocode.client.session.ui.LoadingPanel
 import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.ui.UiStyle
 import ai.kilocode.client.ui.HoverIcon
-import ai.kilocode.client.ui.iconButton
+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.util.UiTimerSource
 import ai.kilocode.client.util.UiTimers
 import com.intellij.icons.AllIcons
@@ -186,7 +188,7 @@ class HistoryPanel(
         )
     }
 
-    private fun back(): BorderLayoutPanel {
+    private fun back(): JComponent {
         val label = KiloBundle.message("history.back")
         val btn = HoverIcon().apply {
             icon = AllIcons.Actions.Back
@@ -195,8 +197,7 @@ class HistoryPanel(
             cursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)
             addActionListener { nav() }
         }
-        return BorderLayoutPanel().apply {
-            add(btn, BorderLayout.WEST)
+        return btn.align(HAlign.LEFT, VAlign.CENTER).apply {
             border = JBUI.Borders.emptyRight(UiStyle.Gap.lg())
         }
     }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt
index ef476010ec..48fda09847 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/history/HistoryControllerTest.kt
@@ -10,6 +10,8 @@ import ai.kilocode.client.session.SessionRef
 import ai.kilocode.client.testing.FakeSessionRpcApi
 import ai.kilocode.client.testing.FakeWorkspaceRpcApi
 import ai.kilocode.client.ui.UiStyle
+import ai.kilocode.client.ui.HoverIcon
+import ai.kilocode.client.ui.layout.Align
 import ai.kilocode.rpc.dto.CloudSessionDto
 import ai.kilocode.rpc.dto.KiloWorkspaceStateDto
 import ai.kilocode.rpc.dto.KiloWorkspaceStatusDto
@@ -341,6 +343,11 @@ class HistoryControllerTest : BasePlatformTestCase() {
         flush()
 
         assertEquals(KiloBundle.message("history.back"), panel.backText())
+        val backs = UIUtil.uiTraverser(panel.component).filter(HoverIcon::class.java)
+            .filter { it.toolTipText == KiloBundle.message("history.back") }
+            .toList()
+        assertTrue(backs.isNotEmpty())
+        assertTrue(backs.all { it.parent is Align })
 
         panel.clickCloud()
         flush()

From d378ebf2e2fcb541ce7ebc4fec013b5d6cf04dcd Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 6 Jul 2026 17:17:52 -0400
Subject: [PATCH 54/68] fix(jetbrains): polish question response editor

---
 .../jetbrains-question-custom-editor.md       |  5 ++++
 .../views/question/QuestionResultView.kt      |  1 +
 .../session/views/question/QuestionView.kt    |  2 ++
 .../session/views/QuestionResultViewTest.kt   | 18 +++++++++++++
 .../client/session/views/QuestionViewTest.kt  | 26 +++++++++++++++++++
 5 files changed, 52 insertions(+)
 create mode 100644 .changeset/jetbrains-question-custom-editor.md

diff --git a/.changeset/jetbrains-question-custom-editor.md b/.changeset/jetbrains-question-custom-editor.md
new file mode 100644
index 0000000000..404154c446
--- /dev/null
+++ b/.changeset/jetbrains-question-custom-editor.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve JetBrains question response editing and answer spacing.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionResultView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionResultView.kt
index 0b50d79826..6cfa9164eb 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionResultView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionResultView.kt
@@ -216,6 +216,7 @@ class QuestionResultView(tool: Tool, private val selection: SessionSelection? =
 
             val qText = makeText(q, UiStyle.Colors.weak(), false)
             qText.alignmentX = Component.LEFT_ALIGNMENT
+            qText.border = JBUI.Borders.emptyBottom(UiStyle.Gap.xs())
             row.add(qText)
 
             val joined = result.answers.getOrNull(i)?.joinToString(", ").orEmpty()
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionView.kt
index eb6d0b329a..097a7eed9a 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/question/QuestionView.kt
@@ -490,6 +490,7 @@ class QuestionView(
     private fun buildCustomEditor(): SessionEditorTextField {
         val ed = SessionEditorTextField(project, selection = selection)
         ed.border = JBUI.Borders.empty()
+        ed.setFontInheritedFromLAF(false)
         ed.setPlaceholder(KiloBundle.message("session.question.custom.placeholder"))
         ed.setShowPlaceholderWhenFocused(true)
         ed.setOneLineMode(false)
@@ -502,6 +503,7 @@ class QuestionView(
             ex.scrollPane.background = style.editorScheme.defaultBackground
             ex.scrollPane.viewport.background = style.editorScheme.defaultBackground
             ex.settings.isUseSoftWraps = true
+            ex.settings.isPaintSoftWraps = false
             ex.settings.isAdditionalPageAtBottom = false
             ex.scrollPane.horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
         }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionResultViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionResultViewTest.kt
index 4a3675637d..cfed8dcef3 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionResultViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionResultViewTest.kt
@@ -7,7 +7,9 @@ import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.session.views.question.QuestionResultView
 import ai.kilocode.client.session.views.tool.ToolView
+import ai.kilocode.client.ui.UiStyle
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.ui.components.JBTextArea
 import java.awt.Color
 import java.awt.Component
 import java.awt.Container
@@ -104,6 +106,22 @@ class QuestionResultViewTest : BasePlatformTestCase() {
         assertTrue(view.bodyText().contains("Manual verification, Unit tests"))
     }
 
+    fun `test answer rows keep standard gap after question text`() {
+        val view = QuestionResultView(completedTool(
+            input = mapOf("questions" to """[{"question":"Q1"}]"""),
+            metadata = mapOf("answers" to """[["A1"]]"""),
+        ))
+
+        view.toggle()
+        val root = view.node(0)
+        val body = root.node(1)
+        val row = body.node(0)
+        val text = row.components[0] as JBTextArea
+        val ins = text.border.getBorderInsets(text)
+
+        assertEquals(UiStyle.Gap.xs(), ins.bottom)
+    }
+
     fun `test label shows count of non-empty answers`() {
         val tool = completedTool(
             input = mapOf("questions" to """[{"question":"Q1"},{"question":"Q2"}]"""),
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionViewTest.kt
index 9305d3114a..e2591ece67 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/QuestionViewTest.kt
@@ -17,6 +17,7 @@ import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBRadioButton
 import com.intellij.ui.components.JBTextArea
+import com.intellij.util.ui.UIUtil
 import java.awt.BorderLayout
 import java.awt.Component
 import java.awt.Container
@@ -24,6 +25,7 @@ import kotlin.math.abs
 import javax.swing.AbstractButton
 import javax.swing.JButton
 import javax.swing.JComponent
+import javax.swing.ScrollPaneConstants
 import javax.swing.SwingUtilities
 
 @Suppress("UnstableApiUsage")
@@ -269,6 +271,30 @@ class QuestionViewTest : BasePlatformTestCase() {
         assertEquals("hint should use hintFont", style.hintFont, hint.font)
     }
 
+    fun `test custom answer editor uses prompt text styling`() {
+        view.show(customSingleQuestion("q_custom_style"))
+
+        findAll<JBRadioButton>(view).first { it.actionCommand == "" }.doClick()
+        val field = findAll<EditorTextField>(view).first()
+        view.addNotify()
+        try {
+            layout(view)
+            UIUtil.dispatchAllInvocationEvents()
+            val editor = field.getEditor(true) ?: error("missing editor")
+            val style = SessionEditorStyle.current()
+
+            assertEquals(style.transcriptFont, field.font)
+            assertEquals(style.transcriptFont.fontName, editor.colorsScheme.editorFontName)
+            assertEquals(style.transcriptFont.size, editor.colorsScheme.editorFontSize)
+            assertEquals(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER, editor.scrollPane.horizontalScrollBarPolicy)
+            assertTrue(editor.settings.isUseSoftWraps)
+            assertFalse(editor.settings.isPaintSoftWraps)
+        } finally {
+            view.hideView()
+            view.removeNotify()
+        }
+    }
+
     // ------ multi-question navigation ------
 
     fun `test multi question shows one question at a time and navigates`() {

From 01418017f9d73d02c2deac4d8289d473d4547e54 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 09:01:28 -0400
Subject: [PATCH 55/68] feat(jetbrains): auto-collapse and preview reasoning
 blocks

Auto-collapse streaming reasoning when it finishes unless the user pinned the state, releasing the inner markdown editors to avoid leaks. Keep the in-place expanded body capped at 5 lines and add a hover preview popup capped at 10 lines for collapsed reasoning.
---
 .changeset/jetbrains-reasoning-view.md        |   5 +
 .../client/session/ui/style/SessionUiStyle.kt |   1 +
 .../client/session/views/ReasoningView.kt     | 107 ++++++++++++++
 .../views/base/AbstractSessionPartView.kt     |  12 ++
 .../session/views/ReasoningViewStressTest.kt  |   7 +-
 .../client/session/views/ReasoningViewTest.kt | 131 +++++++++++++++++-
 .../ai/kilocode/client/ui/UiStyleTest.kt      |   5 +-
 7 files changed, 263 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/jetbrains-reasoning-view.md

diff --git a/.changeset/jetbrains-reasoning-view.md b/.changeset/jetbrains-reasoning-view.md
new file mode 100644
index 0000000000..e10fa89168
--- /dev/null
+++ b/.changeset/jetbrains-reasoning-view.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Auto-collapse JetBrains reasoning blocks when they finish streaming, keep manual expand/collapse choices, and preview collapsed reasoning on hover.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
index 5071f431b6..b896f4f961 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
@@ -108,6 +108,7 @@ object SessionUiStyle {
         /** Reasoning block preview sizing. */
         object Reasoning {
             const val BODY_LINES = 5
+            const val POPUP_LINES = 10
             const val HEADER_VERTICAL_PADDING = 5
             const val BODY_VERTICAL_PADDING = 4
             const val BODY_HORIZONTAL_PADDING = 8
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt
index 1b01027e57..c895a38c7f 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt
@@ -7,10 +7,13 @@ import ai.kilocode.client.session.SessionFileOpener
 import ai.kilocode.client.session.openSessionLink
 import ai.kilocode.client.session.model.Content
 import ai.kilocode.client.session.model.Reasoning
+import ai.kilocode.client.session.ui.popup.HeaderPopupBody
+import ai.kilocode.client.session.ui.popup.HeaderPopupRequest
 import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.session.ui.selection.SessionSelection
 import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.session.views.base.SecondarySessionPartView
+import ai.kilocode.client.telemetry.Telemetry
 import ai.kilocode.client.ui.UiStyle
 import ai.kilocode.client.ui.md.MdView
 import ai.kilocode.client.ui.md.MdViewFactory
@@ -20,9 +23,11 @@ import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.util.ui.JBUI
 import java.awt.BorderLayout
+import java.awt.Container
 import java.awt.Dimension
 import java.awt.Font
 import java.awt.Rectangle
+import javax.swing.JComponent
 import javax.swing.JPanel
 import javax.swing.ScrollPaneConstants
 import javax.swing.Scrollable
@@ -63,6 +68,7 @@ class ReasoningView(
     private var done = reasoning.done
     private var registered = false
     private var following = false
+    private var pinned = false
 
     init {
         row.border = JBUI.Borders.empty(
@@ -100,6 +106,7 @@ class ReasoningView(
         var changed = false
         val next = content.content.toString()
         val follow = tailVisible()
+        val finishing = !done && content.done
         if (done != content.done) {
             done = content.done
             changed = true
@@ -112,10 +119,30 @@ class ReasoningView(
             }
             changed = true
         }
+        if (finishing && !pinned) {
+            changed = collapse() || changed
+            changed = releaseBody() || changed
+        }
         changed = sync() || changed
         if (changed) refresh()
     }
 
+    /** Detaches and disposes the markdown body so its editors are released when reasoning finishes. */
+    @RequiresEdt
+    private fun releaseBody(): Boolean {
+        if (!parts.bodyCreated()) return false
+        val detached = discardBody()
+        Disposer.dispose(parts.md(openFile, openUrl))
+        parts.reset()
+        registered = false
+        return detached
+    }
+
+    @RequiresEdt
+    override fun userToggled() {
+        pinned = true
+    }
+
     @RequiresEdt
     override fun appendDelta(delta: String) {
         if (delta.isEmpty()) return
@@ -150,6 +177,15 @@ class ReasoningView(
     @RequiresEdt
     internal fun bodyScrollBottom() = parts.scrollOrNull?.verticalScrollBar?.let { it.maximum - it.visibleAmount } ?: 0
 
+    @RequiresEdt
+    override fun headerPopup(): HeaderPopupRequest? {
+        if (isExpanded()) return null
+        val text = source.takeIf { it.isNotBlank() } ?: return null
+        return HeaderPopupRequest(row, build = { buildPopupBody(text) }) {
+            Telemetry.send("Header Popup Shown", mapOf("surface" to "session", "part" to "reasoning"))
+        }
+    }
+
     @RequiresEdt
     override fun applyStyle(style: SessionEditorStyle) {
         this.style = style
@@ -235,6 +271,38 @@ class ReasoningView(
         Disposer.register(this, md)
     }
 
+    @RequiresEdt
+    private fun buildPopupBody(text: String): HeaderPopupBody {
+        val md = MdViewFactory.create(style, null).apply {
+            addLinkListener { openSessionLink(it, openFile, openUrl) }
+        }
+        md.applyStyle(style)
+        md.font = style.smallEditorFont.deriveFont(Font.ITALIC)
+        md.codeFont = style.editorFamily
+        md.foreground = UiStyle.Colors.weak()
+        md.background = style.editorBackground
+        md.component.border = JBUI.Borders.empty()
+        md.set(text)
+        val panel = TrackPanel().apply {
+            isOpaque = true
+            background = style.editorBackground
+            border = JBUI.Borders.empty(
+                JBUI.scale(SessionUiStyle.View.Reasoning.BODY_VERTICAL_PADDING),
+                JBUI.scale(SessionUiStyle.View.Reasoning.BODY_HORIZONTAL_PADDING),
+            )
+            add(md.component, BorderLayout.CENTER)
+        }
+        val scroll = JBScrollPane(panel).apply {
+            border = JBUI.Borders.empty()
+            isOpaque = true
+            background = style.editorBackground
+            viewport.background = style.editorBackground
+            horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+            verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
+        }
+        return HeaderPopupBody(ReasoningPopupPanel(scroll, md), md, style.editorBackground)
+    }
+
     private fun bodyMaxHeight(): Int {
         if (!parts.bodyCreated()) return 0
         val md = md
@@ -280,6 +348,10 @@ class ReasoningParts(
 
     fun bodyCreated() = body != null
 
+    fun reset() {
+        body = null
+    }
+
     fun md(openFile: SessionFileOpener, openUrl: (String) -> Unit): MdView = body(openFile, openUrl).md
 
     fun scroll(openFile: SessionFileOpener, openUrl: (String) -> Unit): JBScrollPane = body(openFile, openUrl).scroll
@@ -344,3 +416,38 @@ class TrackPanel : JPanel(BorderLayout()), Scrollable {
         direction: Int,
     ) = visibleRect.height
 }
+
+private class ReasoningPopupPanel(
+    child: JComponent,
+    private val md: MdView,
+) : JPanel(BorderLayout()) {
+    init {
+        // Transparent so the balloon fill (editor background) shows uniformly behind the content.
+        isOpaque = false
+        add(child, BorderLayout.CENTER)
+    }
+
+    override fun getPreferredSize(): Dimension {
+        val size = super.getPreferredSize()
+        val cap = JBUI.scale(SessionUiStyle.View.Popup.MAX_WIDTH)
+        val width = maxOf(contentWidth(this), size.width).coerceAtMost(cap)
+        val height = md.component.getFontMetrics(md.font).height * SessionUiStyle.View.Reasoning.POPUP_LINES +
+            JBUI.scale(SessionUiStyle.View.Layout.BODY_EXTRA_HEIGHT)
+        return Dimension(width, minOf(size.height, height))
+    }
+}
+
+private fun contentWidth(root: Container): Int {
+    var max = 0
+    for (child in root.components) {
+        if (child is JBScrollPane) {
+            val view = child.viewport.view as? JComponent
+            val content = view?.preferredSize?.width ?: 0
+            val insets = child.insets
+            val viewport = child.viewportBorder?.getBorderInsets(child) ?: JBUI.emptyInsets()
+            max = maxOf(max, content + insets.left + insets.right + viewport.left + viewport.right)
+        }
+        if (child is Container) max = maxOf(max, contentWidth(child))
+    }
+    return max
+}
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/base/AbstractSessionPartView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/base/AbstractSessionPartView.kt
index df67cbbca6..6e252b4364 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/base/AbstractSessionPartView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/base/AbstractSessionPartView.kt
@@ -67,10 +67,13 @@ abstract class AbstractSessionPartView(
         if (!expandable || !arrow.isVisible) return
         val changed = toggleLocal()
         if (!changed) return
+        userToggled()
         syncArrow()
         refresh()
     }
 
+    protected open fun userToggled() {}
+
     open fun expand(): Boolean {
         if (!expandable) return false
         if (isExpanded()) return false
@@ -89,6 +92,15 @@ abstract class AbstractSessionPartView(
 
     protected fun bodyComponent(): JComponent = body()
 
+    /** Detaches and forgets the cached body so the next expansion builds a fresh one. */
+    protected fun discardBody(): Boolean {
+        val item = body ?: return false
+        val attached = item.parent === this
+        if (attached) remove(item)
+        body = null
+        return attached
+    }
+
     private fun toggleLocal(): Boolean {
         val fn = resize ?: return toggleBody()
         val expanded = isExpanded()
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewStressTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewStressTest.kt
index d9f1ac10f1..763764f004 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewStressTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewStressTest.kt
@@ -33,7 +33,12 @@ class ReasoningViewStressTest : BasePlatformTestCase() {
         assertEquals(count, panel(view).componentCount)
 
         view.update(reasoning("r1", done = true, text = view.markdown() + "```"))
-        assertTrue(view.bodyVisible())
+        assertFalse(view.bodyVisible())
+        assertFalse(view.bodyCreated())
+        drainEdt()
+
+        assertEquals(base, EditorFactory.getInstance().allEditors.size)
+
         Disposer.dispose(view)
         drainEdt()
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt
index e718bdcc8b..520427eeec 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt
@@ -4,6 +4,8 @@ import ai.kilocode.client.session.model.Reasoning
 import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.session.views.base.SecondarySessionPartView
+import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.util.Disposer
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.ui.JBUI
@@ -11,6 +13,7 @@ import com.intellij.util.ui.UIUtil
 import java.awt.Component
 import java.awt.Container
 import javax.swing.Icon
+import javax.swing.JComponent
 import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.ScrollPaneConstants
@@ -59,16 +62,37 @@ class ReasoningViewTest : BasePlatformTestCase() {
         assertEquals("one\ntwo\nthree\nfour", view.markdown())
     }
 
-    fun `test live reasoning stays expanded when marked done`() {
+    fun `test live reasoning auto-collapses and releases body when marked done`() {
         val view = ReasoningView(reasoning("p1", done = false, text = "one\ntwo\nthree\nfour"))
 
         assertTrue(view.isExpanded())
+        assertTrue(view.bodyCreated())
 
         view.update(reasoning("p1", done = true, text = "one\ntwo\nthree\nfour"))
 
+        assertFalse(view.isExpanded())
+        assertFalse(view.bodyVisible())
+        assertFalse(view.bodyCreated())
+
+        view.toggle()
+
         assertTrue(view.isExpanded())
         assertTrue(view.bodyVisible())
         assertTrue(view.bodyCreated())
+        assertEquals("one\ntwo\nthree\nfour", view.markdown())
+    }
+
+    fun `test auto-collapse releases streaming reasoning editors`() {
+        val base = EditorFactory.getInstance().allEditors.size
+
+        repeat(20) { i ->
+            val view = ReasoningView(reasoning("p$i", done = false, text = "```kotlin\nval x = $i\n```"))
+            popupEditors(view.md.component).forEach { it.getEditor(true) }
+            view.update(reasoning("p$i", done = true, text = "```kotlin\nval x = $i\n```"))
+        }
+        UIUtil.dispatchAllInvocationEvents()
+
+        assertEquals(base, EditorFactory.getInstance().allEditors.size)
     }
 
     fun `test manually expanded finished reasoning stays open on update`() {
@@ -91,6 +115,39 @@ class ReasoningViewTest : BasePlatformTestCase() {
         assertFalse(view.isExpanded())
     }
 
+    fun `test manual collapse during stream stays collapsed when marked done`() {
+        val view = ReasoningView(reasoning("p1", done = false, text = "one\ntwo"))
+
+        view.toggle()
+        view.update(reasoning("p1", done = true, text = "one\ntwo\nthree"))
+
+        assertFalse(view.isExpanded())
+        assertFalse(view.bodyVisible())
+        assertEquals("one\ntwo\nthree", view.markdown())
+    }
+
+    fun `test manual expand during stream stays open when marked done`() {
+        val view = ReasoningView(reasoning("p1", done = false, text = "one\ntwo"))
+
+        view.toggle()
+        view.toggle()
+        view.update(reasoning("p1", done = true, text = "one\ntwo\nthree"))
+
+        assertTrue(view.isExpanded())
+        assertTrue(view.bodyVisible())
+        assertEquals("one\ntwo\nthree", view.markdown())
+    }
+
+    fun `test unpinned appended reasoning auto-collapses when marked done`() {
+        val view = ReasoningView(reasoning("p1", done = false, text = "one"))
+
+        view.appendDelta("\ntwo")
+        view.update(reasoning("p1", done = true, text = "one\ntwo"))
+
+        assertFalse(view.isExpanded())
+        assertFalse(view.bodyVisible())
+    }
+
     fun `test collapsed reasoning stays collapsed on update`() {
         val view = ReasoningView(reasoning("p1", done = true, text = "one\ntwo"))
         view.update(reasoning("p1", done = true, text = "one\ntwo\nthree"))
@@ -200,15 +257,63 @@ class ReasoningViewTest : BasePlatformTestCase() {
         assertTrue(view.headerFont().size < style.editorSize)
     }
 
-    fun `test expanded reasoning body is capped to five rows`() {
+    fun `test expanded reasoning body is capped to configured rows`() {
         val view = ReasoningView(reasoning("p1", done = false, text = (1..20).joinToString("\n") { "line $it" }))
         val taller = ReasoningView(reasoning("p2", done = false, text = (1..200).joinToString("\n") { "line $it" }))
 
-        assertEquals(5, view.bodyMaxRows())
+        assertEquals(SessionUiStyle.View.Reasoning.BODY_LINES, view.bodyMaxRows())
         assertTrue(view.preferredSize.height > 0)
         assertEquals(view.preferredSize.height, taller.preferredSize.height)
     }
 
+    fun `test reasoning header popup is available only when collapsed with content`() {
+        val expanded = ReasoningView(reasoning("p1", done = false, text = "one"))
+        val blank = ReasoningView(reasoning("p2", done = true, text = ""))
+        val collapsed = ReasoningView(reasoning("p3", done = true, text = "one\ntwo"))
+
+        assertNull(expanded.headerPopup())
+        assertNull(blank.headerPopup())
+        assertNotNull(collapsed.headerPopup())
+
+        collapsed.toggle()
+
+        assertNull(collapsed.headerPopup())
+    }
+
+    fun `test reasoning header popup body is capped to reasoning preview rows`() {
+        val view = ReasoningView(reasoning("p1", done = true, text = (1..60).joinToString("\n") { "line $it" }))
+        val body = view.headerPopup()!!.build()
+
+        try {
+            val scroll = popupScrollPanes(body.component).first()
+            val panel = scroll.viewport.view as JPanel
+            val md = panel.components.filterIsInstance<JComponent>().single()
+            val line = md.getFontMetrics(md.font).height
+            val max = line * SessionUiStyle.View.Reasoning.POPUP_LINES +
+                JBUI.scale(SessionUiStyle.View.Layout.BODY_EXTRA_HEIGHT)
+
+            assertTrue(body.component.preferredSize.width in 1..JBUI.scale(SessionUiStyle.View.Popup.MAX_WIDTH))
+            assertTrue(body.component.preferredSize.height > 0)
+            assertTrue(body.component.preferredSize.height <= max)
+        } finally {
+            Disposer.dispose(body.disposable)
+        }
+    }
+
+    fun `test reasoning header popup editors are disposed after churn`() {
+        val base = EditorFactory.getInstance().allEditors.size
+        val view = ReasoningView(reasoning("p1", done = true, text = "```kotlin\nprintln(1)\n```"))
+
+        repeat(20) {
+            val body = view.headerPopup()!!.build()
+            popupEditors(body.component).forEach { it.getEditor(true) }
+            Disposer.dispose(body.disposable)
+        }
+        UIUtil.dispatchAllInvocationEvents()
+
+        assertEquals(base, EditorFactory.getInstance().allEditors.size)
+    }
+
     fun `test appended reasoning scrolls nested body to bottom`() {
         val view = ReasoningView(reasoning("p1", done = false, text = (1..20).joinToString("\n") { "line $it" }))
         view.setSize(300, 80)
@@ -302,6 +407,26 @@ class ReasoningViewTest : BasePlatformTestCase() {
         return found
     }
 
+    private fun popupEditors(root: JComponent): List<com.intellij.ui.EditorTextField> {
+        val found = mutableListOf<com.intellij.ui.EditorTextField>()
+        fun visit(component: JComponent) {
+            if (component is com.intellij.ui.EditorTextField) found.add(component)
+            component.components.filterIsInstance<JComponent>().forEach(::visit)
+        }
+        visit(root)
+        return found
+    }
+
+    private fun popupScrollPanes(root: JComponent): List<JBScrollPane> {
+        val found = mutableListOf<JBScrollPane>()
+        fun visit(component: JComponent) {
+            if (component is JBScrollPane) found.add(component)
+            component.components.filterIsInstance<JComponent>().forEach(::visit)
+        }
+        visit(root)
+        return found
+    }
+
     private fun collect(component: Component, found: MutableList<Icon>) {
         if (component is JLabel) component.icon?.let(found::add)
         if (component is Container) component.components.forEach { collect(it, found) }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt
index b3702301c9..ae83811171 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt
@@ -43,6 +43,9 @@ class UiStyleTest : BasePlatformTestCase() {
         assertTrue(JBUI.scale(SessionUiStyle.View.Layout.VERTICAL_PADDING) > 0)
         assertTrue(JBUI.scale(SessionUiStyle.View.Layout.HORIZONTAL_PADDING) > 0)
         assertTrue(SessionUiStyle.View.Tool.BODY_LINES > 0)
-        assertTrue(SessionUiStyle.View.Reasoning.BODY_LINES > 0)
+        assertEquals(5, SessionUiStyle.View.Reasoning.BODY_LINES)
+        assertEquals(10, SessionUiStyle.View.Reasoning.POPUP_LINES)
+        assertTrue(SessionUiStyle.View.Reasoning.POPUP_LINES != SessionUiStyle.View.Popup.MAX_LINES)
+        assertTrue(SessionUiStyle.View.Reasoning.POPUP_LINES != SessionUiStyle.View.Reasoning.BODY_LINES)
     }
 }

From 05751163892490171eeb2c0f7e9836389e9e428e Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Fri, 3 Jul 2026 16:32:25 +0200
Subject: [PATCH 56/68] feat(vscode): prewarm microphone capture before showing
 voice input as recording

---
 packages/kilo-vscode/src/speech-to-text/capture.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/kilo-vscode/src/speech-to-text/capture.ts b/packages/kilo-vscode/src/speech-to-text/capture.ts
index 6250c0822c..761d01dc59 100644
--- a/packages/kilo-vscode/src/speech-to-text/capture.ts
+++ b/packages/kilo-vscode/src/speech-to-text/capture.ts
@@ -239,6 +239,7 @@ async function resolveFFmpeg(): Promise<string> {
   if (cached) {
     const bin = await cached
     if (!path.isAbsolute(bin) || existsSync(bin)) return bin
+    if (ffmpeg === cached) ffmpeg = undefined
   }
 
   const task = findFFmpeg()

From 74cb69e9e8a9b317e12150f091314bbecc876343 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 09:01:28 -0400
Subject: [PATCH 57/68] feat(jetbrains): auto-collapse and preview reasoning
 blocks

Auto-collapse streaming reasoning when it finishes unless the user pinned the state, releasing the inner markdown editors to avoid leaks. Keep the in-place expanded body capped at 5 lines and add a hover preview popup capped at 10 lines for collapsed reasoning.
---
 .changeset/jetbrains-history-scroll.md         | 5 -----
 .changeset/jetbrains-question-custom-editor.md | 5 -----
 .changeset/jetbrains-retry-status-footer.md    | 5 -----
 3 files changed, 15 deletions(-)
 delete mode 100644 .changeset/jetbrains-history-scroll.md
 delete mode 100644 .changeset/jetbrains-question-custom-editor.md
 delete mode 100644 .changeset/jetbrains-retry-status-footer.md

diff --git a/.changeset/jetbrains-history-scroll.md b/.changeset/jetbrains-history-scroll.md
deleted file mode 100644
index 118979a767..0000000000
--- a/.changeset/jetbrains-history-scroll.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-jetbrains": patch
----
-
-Keep JetBrains local and cloud history timestamps visible without horizontal scrolling.
diff --git a/.changeset/jetbrains-question-custom-editor.md b/.changeset/jetbrains-question-custom-editor.md
deleted file mode 100644
index 404154c446..0000000000
--- a/.changeset/jetbrains-question-custom-editor.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-jetbrains": patch
----
-
-Improve JetBrains question response editing and answer spacing.
diff --git a/.changeset/jetbrains-retry-status-footer.md b/.changeset/jetbrains-retry-status-footer.md
deleted file mode 100644
index 04a3db4de9..0000000000
--- a/.changeset/jetbrains-retry-status-footer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-jetbrains": patch
----
-
-Show provider retry and usage-limit status in the JetBrains chat footer while keeping the conversation visible.

From 71c2970c69371d9d99ac1f6977e490f6a5de81e5 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 10:52:18 -0400
Subject: [PATCH 58/68] fix(jetbrains): cap header popup previews

---
 .changeset/jetbrains-popup-preview-size.md    |  5 ++
 .../client/session/ui/popup/HeaderPopup.kt    | 63 ++++++++++++++++++-
 .../client/session/ui/style/SessionUiStyle.kt |  6 --
 .../client/session/views/ReasoningView.kt     | 39 +-----------
 .../session/views/tool/ShellToolView.kt       | 36 +----------
 .../client/session/views/ReasoningViewTest.kt | 15 ++---
 .../client/session/views/ShellToolViewTest.kt |  3 +-
 .../ai/kilocode/client/ui/UiStyleTest.kt      |  3 -
 8 files changed, 76 insertions(+), 94 deletions(-)
 create mode 100644 .changeset/jetbrains-popup-preview-size.md

diff --git a/.changeset/jetbrains-popup-preview-size.md b/.changeset/jetbrains-popup-preview-size.md
new file mode 100644
index 0000000000..89ca4ae7a3
--- /dev/null
+++ b/.changeset/jetbrains-popup-preview-size.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Cap JetBrains reasoning and shell hover previews to a compact popup size.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/popup/HeaderPopup.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/popup/HeaderPopup.kt
index e4dc866554..a0e0daf0a5 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/popup/HeaderPopup.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/popup/HeaderPopup.kt
@@ -1,8 +1,14 @@
 package ai.kilocode.client.session.ui.popup
 
 import com.intellij.openapi.Disposable
+import com.intellij.util.ui.JBUI
+import java.awt.BorderLayout
 import java.awt.Color
+import java.awt.Container
+import java.awt.Dimension
 import javax.swing.JComponent
+import javax.swing.JEditorPane
+import javax.swing.JPanel
 
 class HeaderPopupRequest(
     val anchor: JComponent,
@@ -11,7 +17,60 @@ class HeaderPopupRequest(
 )
 
 class HeaderPopupBody(
-    val component: JComponent,
+    component: JComponent,
     val disposable: Disposable,
     val background: Color,
-)
+) {
+    val component: JComponent = HeaderPopupPanel(component)
+}
+
+private class HeaderPopupPanel(private val child: JComponent) : JPanel(BorderLayout()) {
+    init {
+        // Transparent so the balloon fill shows uniformly behind nested popup content.
+        isOpaque = false
+        add(child, BorderLayout.CENTER)
+    }
+
+    override fun getPreferredSize(): Dimension {
+        val size = super.getPreferredSize()
+        val cap = JBUI.scale(350)
+        val width = size.width.takeIf { it > 0 }?.coerceAtMost(cap) ?: cap
+        fit(child, width)
+        val height = super.getPreferredSize().height.coerceAtMost(JBUI.scale(450))
+        return Dimension(width, height)
+    }
+
+    private fun fit(item: JComponent, width: Int) {
+        if (width <= 0) return
+        // JBHtmlPane derives wrapped preferred height from the current width, not just HTML content.
+        item.setSize(width, Short.MAX_VALUE.toInt())
+        layout(item, width)
+        reset(item)
+    }
+
+    private fun layout(item: Container, width: Int) {
+        if (item is JEditorPane) {
+            item.preferredSize = null
+            item.setSize(width, Short.MAX_VALUE.toInt())
+            item.preferredSize = Dimension(width, item.preferredSize.height)
+            item.size = item.preferredSize
+            return
+        }
+        item.doLayout()
+        val insets = item.insets
+        val inner = (width - insets.left - insets.right).coerceAtLeast(0)
+        for (child in item.components) {
+            val nested = child as? Container ?: continue
+            val next = child.width.takeIf { it > 0 }?.coerceAtMost(inner) ?: inner
+            layout(nested, next)
+        }
+    }
+
+    private fun reset(item: Container) {
+        item.invalidate()
+        for (child in item.components) {
+            val nested = child as? Container ?: continue
+            reset(nested)
+        }
+    }
+}
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
index b896f4f961..f509c93a92 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
@@ -108,7 +108,6 @@ object SessionUiStyle {
         /** Reasoning block preview sizing. */
         object Reasoning {
             const val BODY_LINES = 5
-            const val POPUP_LINES = 10
             const val HEADER_VERTICAL_PADDING = 5
             const val BODY_VERTICAL_PADDING = 4
             const val BODY_HORIZONTAL_PADDING = 8
@@ -153,11 +152,6 @@ object SessionUiStyle {
             fun topPadding(): Int = VIEWPORT_TOP_PADDING
         }
 
-        object Popup {
-            const val MAX_LINES = 15
-            const val MAX_WIDTH = 520
-        }
-
         /** Permission session-view command preview limits. */
         object Permission {
             const val COMMAND_LINES = 3
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt
index c895a38c7f..01c2e9fa9c 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/ReasoningView.kt
@@ -23,11 +23,9 @@ import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.util.ui.JBUI
 import java.awt.BorderLayout
-import java.awt.Container
 import java.awt.Dimension
 import java.awt.Font
 import java.awt.Rectangle
-import javax.swing.JComponent
 import javax.swing.JPanel
 import javax.swing.ScrollPaneConstants
 import javax.swing.Scrollable
@@ -300,7 +298,7 @@ class ReasoningView(
             horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
             verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
         }
-        return HeaderPopupBody(ReasoningPopupPanel(scroll, md), md, style.editorBackground)
+        return HeaderPopupBody(scroll, md, style.editorBackground)
     }
 
     private fun bodyMaxHeight(): Int {
@@ -416,38 +414,3 @@ class TrackPanel : JPanel(BorderLayout()), Scrollable {
         direction: Int,
     ) = visibleRect.height
 }
-
-private class ReasoningPopupPanel(
-    child: JComponent,
-    private val md: MdView,
-) : JPanel(BorderLayout()) {
-    init {
-        // Transparent so the balloon fill (editor background) shows uniformly behind the content.
-        isOpaque = false
-        add(child, BorderLayout.CENTER)
-    }
-
-    override fun getPreferredSize(): Dimension {
-        val size = super.getPreferredSize()
-        val cap = JBUI.scale(SessionUiStyle.View.Popup.MAX_WIDTH)
-        val width = maxOf(contentWidth(this), size.width).coerceAtMost(cap)
-        val height = md.component.getFontMetrics(md.font).height * SessionUiStyle.View.Reasoning.POPUP_LINES +
-            JBUI.scale(SessionUiStyle.View.Layout.BODY_EXTRA_HEIGHT)
-        return Dimension(width, minOf(size.height, height))
-    }
-}
-
-private fun contentWidth(root: Container): Int {
-    var max = 0
-    for (child in root.components) {
-        if (child is JBScrollPane) {
-            val view = child.viewport.view as? JComponent
-            val content = view?.preferredSize?.width ?: 0
-            val insets = child.insets
-            val viewport = child.viewportBorder?.getBorderInsets(child) ?: JBUI.emptyInsets()
-            max = maxOf(max, content + insets.left + insets.right + viewport.left + viewport.right)
-        }
-        if (child is Container) max = maxOf(max, contentWidth(child))
-    }
-    return max
-}
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt
index fd1db6ec17..9828d91a27 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt
@@ -25,8 +25,6 @@ import com.intellij.ui.components.JBHtmlPane
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.util.ui.JBUI
-import java.awt.BorderLayout
-import java.awt.Container
 import java.awt.Dimension
 import javax.swing.JComponent
 import javax.swing.JPanel
@@ -196,7 +194,6 @@ class ShellToolView(
             MdCodeBlockFactory.default(
                 MdCodeBlockOptions(
                     border = MdCodeBlockBorder.None,
-                    maxLines = SessionUiStyle.View.Popup.MAX_LINES,
                     verticalPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                     editorOnly = true,
                 ),
@@ -211,7 +208,7 @@ class ShellToolView(
         md.component.border = JBUI.Borders.empty()
         md.set(popupMd(formatCommand(cmd)))
         padPopup(md.component)
-        return HeaderPopupBody(PopupPanel(md.component), md, style.editorBackground)
+        return HeaderPopupBody(md.component, md, style.editorBackground)
     }
 
     override fun dumpLabel() = "ShellToolView#$contentId(${labelText()})"
@@ -237,37 +234,6 @@ private fun padPopup(root: JComponent) {
 
 private fun grow(size: Dimension, pad: Int) = Dimension(size.width, size.height + pad)
 
-private class PopupPanel(child: JComponent) : JPanel(BorderLayout()) {
-    init {
-        // Transparent so the balloon fill (editor background) shows uniformly behind the content.
-        isOpaque = false
-        add(child, BorderLayout.CENTER)
-    }
-
-    override fun getPreferredSize(): Dimension {
-        // The markdown code block reports a preferred width of 0 so transcript layout can stretch it.
-        // A balloon has no such constraint, so derive the natural content width and cap it instead.
-        val size = super.getPreferredSize()
-        val width = contentWidth(this).coerceAtMost(JBUI.scale(SessionUiStyle.View.Popup.MAX_WIDTH))
-        return Dimension(maxOf(width, size.width), size.height)
-    }
-}
-
-private fun contentWidth(root: Container): Int {
-    var max = 0
-    for (child in root.components) {
-        if (child is JBScrollPane) {
-            val view = child.viewport.view as? JComponent
-            val content = view?.preferredSize?.width ?: 0
-            val insets = child.insets
-            val viewport = child.viewportBorder?.getBorderInsets(child) ?: JBUI.emptyInsets()
-            max = maxOf(max, content + insets.left + insets.right + viewport.left + viewport.right)
-        }
-        if (child is Container) max = maxOf(max, contentWidth(child))
-    }
-    return max
-}
-
 class ShellHolder(
     private val tool: Tool,
     private val selection: SessionSelection?,
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt
index 520427eeec..63972f05ab 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ReasoningViewTest.kt
@@ -280,21 +280,18 @@ class ReasoningViewTest : BasePlatformTestCase() {
         assertNull(collapsed.headerPopup())
     }
 
-    fun `test reasoning header popup body is capped to reasoning preview rows`() {
-        val view = ReasoningView(reasoning("p1", done = true, text = (1..60).joinToString("\n") { "line $it" }))
+    fun `test reasoning header popup body is capped to popup size`() {
+        val text = (1..400).joinToString(" ") { "reasoning" }
+        val view = ReasoningView(reasoning("p1", done = true, text = text))
         val body = view.headerPopup()!!.build()
 
         try {
             val scroll = popupScrollPanes(body.component).first()
             val panel = scroll.viewport.view as JPanel
-            val md = panel.components.filterIsInstance<JComponent>().single()
-            val line = md.getFontMetrics(md.font).height
-            val max = line * SessionUiStyle.View.Reasoning.POPUP_LINES +
-                JBUI.scale(SessionUiStyle.View.Layout.BODY_EXTRA_HEIGHT)
 
-            assertTrue(body.component.preferredSize.width in 1..JBUI.scale(SessionUiStyle.View.Popup.MAX_WIDTH))
-            assertTrue(body.component.preferredSize.height > 0)
-            assertTrue(body.component.preferredSize.height <= max)
+            assertEquals(1, panel.components.filterIsInstance<JComponent>().size)
+            assertTrue(body.component.preferredSize.width in 1..JBUI.scale(350))
+            assertEquals(JBUI.scale(450), body.component.preferredSize.height)
         } finally {
             Disposer.dispose(body.disposable)
         }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt
index b7817c62ab..d903534f45 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt
@@ -417,8 +417,9 @@ class ShellToolViewTest : BasePlatformTestCase() {
             assertTrue(field.preferredSize.height - border.top >= editor.lineHeight * lines)
             assertTrue(field.minimumSize.height - border.top >= editor.lineHeight * lines)
             assertTrue(pane.preferredSize.height >= field.preferredSize.height + pad.top + pad.bottom)
-            assertTrue(body.component.preferredSize.width in 1..JBUI.scale(SessionUiStyle.View.Popup.MAX_WIDTH))
+            assertTrue(body.component.preferredSize.width in 1..JBUI.scale(350))
             assertTrue(body.component.preferredSize.height > 0)
+            assertTrue(body.component.preferredSize.height <= JBUI.scale(450))
         } finally {
             Disposer.dispose(body.disposable)
         }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt
index ae83811171..384f53b9c2 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/UiStyleTest.kt
@@ -44,8 +44,5 @@ class UiStyleTest : BasePlatformTestCase() {
         assertTrue(JBUI.scale(SessionUiStyle.View.Layout.HORIZONTAL_PADDING) > 0)
         assertTrue(SessionUiStyle.View.Tool.BODY_LINES > 0)
         assertEquals(5, SessionUiStyle.View.Reasoning.BODY_LINES)
-        assertEquals(10, SessionUiStyle.View.Reasoning.POPUP_LINES)
-        assertTrue(SessionUiStyle.View.Reasoning.POPUP_LINES != SessionUiStyle.View.Popup.MAX_LINES)
-        assertTrue(SessionUiStyle.View.Reasoning.POPUP_LINES != SessionUiStyle.View.Reasoning.BODY_LINES)
     }
 }

From f837a7eed39314d57763f34838ca6db6b84bb472 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 11:21:46 -0400
Subject: [PATCH 59/68] fix(jetbrains): hide focused prompt separator

---
 .../jetbrains-prompt-focus-separator.md       |  5 ++++
 .../client/session/ui/prompt/PromptPanel.kt   | 26 ++++++++++++++++---
 .../client/session/ui/PromptPanelTest.kt      |  6 +++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/jetbrains-prompt-focus-separator.md

diff --git a/.changeset/jetbrains-prompt-focus-separator.md b/.changeset/jetbrains-prompt-focus-separator.md
new file mode 100644
index 0000000000..35a014a4d5
--- /dev/null
+++ b/.changeset/jetbrains-prompt-focus-separator.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Hide the JetBrains prompt separator while the prompt is focused.
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 19db08ab22..617313ed8c 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
@@ -133,6 +133,7 @@ class PromptPanel(
     var onAutoApproveToggle: (Boolean) -> Unit = {}
     var onFileDrag: (Boolean) -> Unit = {}
     private var style = SessionEditorStyle.current()
+    private var focused = false
     private val shell = BorderLayoutPanel().apply {
         isOpaque = true
         border = JBUI.Borders.empty(
@@ -198,11 +199,11 @@ class PromptPanel(
             })
             ed.contentComponent.addFocusListener(object : FocusAdapter() {
                 override fun focusGained(e: FocusEvent) {
-                    repaint()
+                    syncFocus(true)
                 }
 
                 override fun focusLost(e: FocusEvent) {
-                    repaint()
+                    syncFocus(false)
                 }
             })
         }
@@ -301,8 +302,27 @@ class PromptPanel(
 
     override fun updateUI() {
         super.updateUI()
+        syncBorder()
+    }
+
+    private fun syncFocus(value: Boolean) {
+        if (focused == value) {
+            repaint()
+            return
+        }
+        focused = value
+        syncBorder()
+        revalidate()
+        repaint()
+    }
+
+    private fun syncBorder() {
         border = JBUI.Borders.compound(
-            JBUI.Borders.customLineTop(SessionUiStyle.View.Prompt.separator()),
+            if (focused) {
+                JBUI.Borders.emptyTop(JBUI.scale(1))
+            } else {
+                JBUI.Borders.customLineTop(SessionUiStyle.View.Prompt.separator())
+            },
             JBUI.Borders.empty(),
         )
     }
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 a4838926a4..08cf19e6b3 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
@@ -80,6 +80,7 @@ import java.awt.KeyboardFocusManager
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.StringSelection
 import java.awt.datatransfer.Transferable
+import java.awt.event.FocusEvent
 import java.awt.event.MouseEvent
 import java.awt.image.BufferedImage
 import java.io.ByteArrayOutputStream
@@ -161,10 +162,15 @@ class PromptPanelTest : BasePlatformTestCase() {
         val focus = TestFocusManager()
         KeyboardFocusManager.setCurrentKeyboardFocusManager(focus)
         try {
+            assertEquals(SessionUiStyle.View.Prompt.separator().rgb, paint(panel, panel.width / 2, 0).rgb)
             assertTrue(JBUI.CurrentTheme.Focus.focusColor().rgb != paint(panel, panel.width / 2, 1).rgb)
 
             focus.focus(editor.contentComponent)
+            editor.contentComponent.focusListeners.forEach {
+                it.focusGained(FocusEvent(editor.contentComponent, FocusEvent.FOCUS_GAINED))
+            }
 
+            assertTrue(SessionUiStyle.View.Prompt.separator().rgb != paint(panel, panel.width / 2, 0).rgb)
             assertEquals(JBUI.CurrentTheme.Focus.focusColor().rgb, paint(panel, panel.width / 2, 1).rgb)
         } finally {
             KeyboardFocusManager.setCurrentKeyboardFocusManager(current)

From b909d77b63a6dcf6554d0a1202c1885d47891f40 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 11:42:01 -0400
Subject: [PATCH 60/68] fix(jetbrains): disable prompt spellcheck

---
 .changeset/jetbrains-prompt-spellcheck.md     |  5 ++++
 .../client/session/ui/prompt/PromptPanel.kt   |  2 ++
 .../client/session/ui/PromptPanelTest.kt      | 24 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 .changeset/jetbrains-prompt-spellcheck.md

diff --git a/.changeset/jetbrains-prompt-spellcheck.md b/.changeset/jetbrains-prompt-spellcheck.md
new file mode 100644
index 0000000000..bf39458d37
--- /dev/null
+++ b/.changeset/jetbrains-prompt-spellcheck.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Disable spellchecking in the JetBrains prompt input.
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 617313ed8c..6f826046e3 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
@@ -42,6 +42,7 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
+import com.intellij.openapi.editor.SpellCheckingEditorCustomizationProvider
 import com.intellij.openapi.editor.colors.CodeInsightColors
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.editor.event.CaretEvent
@@ -178,6 +179,7 @@ class PromptPanel(
             ed.settings.isUseSoftWraps = true
             ed.settings.isPaintSoftWraps = false
             ed.settings.isAdditionalPageAtBottom = false
+            SpellCheckingEditorCustomizationProvider.getInstance().getDisabledCustomization()?.customize(ed)
             ed.putUserData(PROMPT_ATTACHMENT_PASTE_HANDLER_KEY, PromptAttachmentPasteHandler { processPaste(it) })
             ed.scrollPane.verticalScrollBarPolicy =
                 ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
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 08cf19e6b3..d89bf04998 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
@@ -48,8 +48,10 @@ import com.intellij.openapi.command.undo.UndoManager
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.editor.SpellCheckingEditorCustomizationProvider
 import com.intellij.openapi.editor.actions.PasteAction
 import com.intellij.openapi.editor.colors.CodeInsightColors
+import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.ide.CopyPasteManager
 import com.intellij.openapi.fileTypes.PlainTextFileType
@@ -57,8 +59,10 @@ import com.intellij.openapi.fileTypes.PlainTextLanguage
 import com.intellij.openapi.keymap.KeymapUtil
 import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.testFramework.replaceService
 import com.intellij.ui.AnimatedIcon
 import com.intellij.ui.EditorTextField
+import com.intellij.ui.EditorCustomization
 import com.intellij.ui.LanguageTextField
 import com.intellij.ui.components.JBLabel
 import com.intellij.util.Producer
@@ -151,6 +155,26 @@ class PromptPanelTest : BasePlatformTestCase() {
         assertFalse(hasFloatingToolbar(editor.component))
     }
 
+    fun `test prompt editor disables spellchecking`() {
+        var applied: EditorEx? = null
+        val provider = object : SpellCheckingEditorCustomizationProvider() {
+            override fun getDisabledCustomization(): EditorCustomization {
+                return EditorCustomization { ed -> applied = ed }
+            }
+        }
+        ApplicationManager.getApplication().replaceService(
+            SpellCheckingEditorCustomizationProvider::class.java,
+            provider,
+            testRootDisposable,
+        )
+        val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> })
+
+        realize(panel, 260, 400)
+        val editor = (panel.defaultFocusedComponent as EditorTextField).getEditor(false)!!
+
+        assertSame(editor, applied)
+    }
+
     fun `test prompt focus outline follows editor focus`() {
         val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> })
         realize(panel, 260, 400)

From 76e4eb8a1690adaed5537b9d51538f2694f70062 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 12:04:32 -0400
Subject: [PATCH 61/68] fix(jetbrains): align session ui colors

---
 .changeset/jetbrains-progress-foreground.md   |  5 ++++
 .changeset/jetbrains-session-background.md    |  5 ++++
 .../ai/kilocode/client/session/SessionUi.kt   |  7 ++---
 .../client/session/scroll/SessionScroll.kt    |  8 ++---
 .../client/session/ui/ProgressPanel.kt        | 12 ++++++--
 .../session/ui/SessionMessageListPanel.kt     |  4 +--
 .../client/session/SessionUiLayoutTest.kt     | 29 +++++++++++++++++++
 7 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/jetbrains-progress-foreground.md
 create mode 100644 .changeset/jetbrains-session-background.md

diff --git a/.changeset/jetbrains-progress-foreground.md b/.changeset/jetbrains-progress-foreground.md
new file mode 100644
index 0000000000..2cf3f47eeb
--- /dev/null
+++ b/.changeset/jetbrains-progress-foreground.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Match the JetBrains progress text color to transcript text.
diff --git a/.changeset/jetbrains-session-background.md b/.changeset/jetbrains-session-background.md
new file mode 100644
index 0000000000..7b76c7ba61
--- /dev/null
+++ b/.changeset/jetbrains-session-background.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Use the session background across the JetBrains chat view from initial render.
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 1a565f221d..8777b78cee 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
@@ -201,11 +201,11 @@ class SessionUi(
         Disposer.register(this, popup)
         buildUi()
         Disposer.register(this, selection)
+        applyStyle(style)
         scroll.show(body(controller.model.state))
         bindUi()
         bindStyle()
         bindMigration()
-        applyStyle(style)
         onStateChanged(controller.model.state)
         loaded?.let(::finishOpen)
     }
@@ -307,9 +307,7 @@ class SessionUi(
 
         sessionContent = JPanel(BorderLayout())
 
-        blankBody = JPanel(BorderLayout()).apply {
-            isOpaque = false
-        }
+        blankBody = JPanel(BorderLayout())
 
         load = LoadingPanel()
         progressBody = load
@@ -786,6 +784,7 @@ class SessionUi(
         editorTheme = style.editorScheme
         colorTheme = UIManager.getLookAndFeel()
         background = style.editorBackground
+        root.background = style.editorBackground
         root.content.background = style.editorBackground
         sessionContent.background = style.editorBackground
         blankBody.background = style.editorBackground
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/scroll/SessionScroll.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/scroll/SessionScroll.kt
index 424cfeb62a..dd891fa1cc 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/scroll/SessionScroll.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/scroll/SessionScroll.kt
@@ -5,7 +5,6 @@ import ai.kilocode.client.session.ui.SessionMessageListPanel
 import ai.kilocode.client.session.ui.SessionRootPanel
 import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.session.ui.style.SessionEditorStyleTarget
-import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.ui.UiStyle
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.ui.components.JBLabel
@@ -35,6 +34,8 @@ internal class SessionScroll(
         private const val FOLLOW_PASSES = 6
     }
 
+    private var style = SessionEditorStyle.current()
+
     val component = JBScrollPane(body).apply {
         border = JBUI.Borders.empty()
         verticalScrollBarPolicy = JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED
@@ -46,7 +47,6 @@ internal class SessionScroll(
     val view: JComponent? get() = component.viewport.view as? JComponent
     var onScroll: (() -> Unit)? = null
 
-    private var style = SessionEditorStyle.current()
     private var tail = true
     private var auto = false
     private var opening = false
@@ -202,8 +202,8 @@ internal class SessionScroll(
     @RequiresEdt
     fun applyStyle(style: SessionEditorStyle) {
         this.style = style
-        component.background = SessionUiStyle.Transcript.bgColor()
-        component.viewport.background = SessionUiStyle.Transcript.bgColor()
+        component.background = style.editorBackground
+        component.viewport.background = style.editorBackground
         syncIcon()
         messages.applyStyle(style)
         val view = component.viewport.view
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt
index 3372ccfc8a..bbc44bd12c 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/ProgressPanel.kt
@@ -33,8 +33,10 @@ class ProgressPanel(
     parent: Disposable,
 ) : Stack(StackAxis.HORIZONTAL, UiStyle.Gap.md()), SessionEditorStyleTarget {
 
+    private var style = SessionEditorStyle.current()
+    private var state: SessionState = SessionState.Idle
     private val label = JBLabel().apply {
-        foreground = UiStyle.Colors.weak()
+        foreground = style.editorForeground
     }
     private val spinner = JBLabel(AnimatedIcon.Default())
 
@@ -60,12 +62,16 @@ class ProgressPanel(
     /** Exposed for test assertions. */
     fun labelText(): String = label.text
 
+    /** Exposed for test assertions. */
+    fun labelForeground() = label.foreground
+
     private fun onState(state: SessionState) {
+        this.state = state
         when (state) {
             is SessionState.Busy -> {
                 spinner.isVisible = true
                 label.text = state.text
-                label.foreground = UiStyle.Colors.weak()
+                label.foreground = style.editorForeground
                 isVisible = true
             }
             is SessionState.Retry -> {
@@ -94,7 +100,9 @@ class ProgressPanel(
     }
 
     override fun applyStyle(style: SessionEditorStyle) {
+        this.style = style
         label.font = style.regularFont
+        if (state is SessionState.Busy) label.foreground = style.editorForeground
         revalidate()
         repaint()
     }
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 9d0c9186e5..7bed451f95 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
@@ -82,8 +82,8 @@ class SessionMessageListPanel(
 
     init {
         isOpaque = true
-        background = SessionUiStyle.Transcript.bgColor()
         Disposer.register(parent, this)
+        applyStyle(style)
 
         model.addListener(parent) { event ->
             when (event) {
@@ -385,7 +385,7 @@ class SessionMessageListPanel(
 
     override fun applyStyle(style: SessionEditorStyle) {
         this.style = style
-        background = SessionUiStyle.Transcript.bgColor()
+        background = style.editorBackground
         for (view in turnViews.values) view.applyStyle(style)
         question?.applyStyle(style)
         permission?.applyStyle(style)
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
index fda1cf8b0a..4e89fe1f5c 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
@@ -15,6 +15,7 @@ import ai.kilocode.client.session.ui.prompt.PromptPanel
 import ai.kilocode.client.session.ui.account.SessionAccountOverlay
 import ai.kilocode.client.session.ui.SessionMessageListPanel
 import ai.kilocode.client.session.ui.SessionRootPanel
+import ai.kilocode.client.session.ui.style.SessionEditorStyle
 import ai.kilocode.client.session.ui.header.SessionHeaderPanel
 import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.session.controller.SessionControllerEvent
@@ -45,6 +46,21 @@ class SessionUiLayoutTest : SessionUiTestBase() {
         assertFalse(root.blocker.isVisible)
     }
 
+    fun `test session surfaces use session background from initial render`() {
+        val bg = SessionEditorStyle.current().editorBackground
+        val root = find<SessionRootPanel>(ui)
+        val pane = scrollComponent() as JBScrollPane
+
+        assertEquals(bg, ui.background)
+        assertEquals(bg, root.content.background)
+        assertEquals(bg, pane.background)
+        assertEquals(bg, pane.viewport.background)
+
+        showMessages()
+
+        assertEquals(bg, find<SessionMessageListPanel>(ui).background)
+    }
+
     fun `test prompt is docked and connection is overlaid`() {
         val root = find<SessionRootPanel>(ui)
         val connection = find<ConnectionPanel>(ui)
@@ -330,6 +346,19 @@ class SessionUiLayoutTest : SessionUiTestBase() {
         assertEquals("Connection offline", panel.progress.labelText())
     }
 
+    fun `test busy progress footer uses transcript foreground`() {
+        rpc.history.addAll(history(1))
+        ui = newUi(id = "ses_test")
+        settle()
+
+        controller().model.setState(SessionState.Busy("Considering next steps..."))
+        layout()
+
+        val panel = find<SessionMessageListPanel>(ui)
+        assertTrue(panel.progress.isVisible)
+        assertEquals(SessionEditorStyle.current().editorForeground, panel.progress.labelForeground())
+    }
+
     fun `test retry before transcript shows loading panel`() {
         ui = newUi(displayMs = 1_000)
 

From e70b4fa9b9879a6477033ffc7440e79e68eee60c Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 13:00:36 -0400
Subject: [PATCH 62/68] fix(jetbrains): refine session padding

---
 .changeset/jetbrains-code-block-inset.md       |  5 +++++
 .changeset/jetbrains-prompt-input-inset.md     |  5 +++++
 .../client/session/ui/prompt/PromptPanel.kt    |  7 ++++++-
 .../client/session/ui/style/SessionUiStyle.kt  | 11 ++++++++---
 .../client/session/views/tool/ShellToolView.kt |  2 +-
 .../client/session/ui/PromptPanelTest.kt       | 12 ++++++++++++
 .../session/ui/SessionMessageListPanelTest.kt  | 13 +++++++++++++
 .../client/session/views/ShellToolViewTest.kt  |  7 +++----
 .../kilocode/client/ui/md/MdViewHybridTest.kt  | 18 ++++++++++++------
 9 files changed, 65 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/jetbrains-code-block-inset.md
 create mode 100644 .changeset/jetbrains-prompt-input-inset.md

diff --git a/.changeset/jetbrains-code-block-inset.md b/.changeset/jetbrains-code-block-inset.md
new file mode 100644
index 0000000000..3e843b5922
--- /dev/null
+++ b/.changeset/jetbrains-code-block-inset.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve JetBrains session and code block padding alignment.
diff --git a/.changeset/jetbrains-prompt-input-inset.md b/.changeset/jetbrains-prompt-input-inset.md
new file mode 100644
index 0000000000..443bbd6866
--- /dev/null
+++ b/.changeset/jetbrains-prompt-input-inset.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Balance JetBrains prompt input text padding.
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 6f826046e3..233e075c40 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
@@ -172,7 +172,12 @@ class PromptPanel(
             style.applyTranscriptToEditor(ed)
             ed.setBorder(JBUI.Borders.empty())
             ed.scrollPane.border = JBUI.Borders.empty()
-            ed.scrollPane.viewportBorder = JBUI.Borders.empty()
+            ed.scrollPane.viewportBorder = JBUI.Borders.empty(
+                0,
+                JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+                0,
+                JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+            )
             ed.backgroundColor = style.editorScheme.defaultBackground
             ed.scrollPane.background = style.editorScheme.defaultBackground
             ed.scrollPane.viewport.background = style.editorScheme.defaultBackground
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
index f509c93a92..afd24afe2f 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
@@ -16,8 +16,13 @@ object SessionUiStyle {
     /** Geometry for the transcript list and its scroll behavior. */
     object SessionLayout {
         const val GAP = 3
-        val InnerInsets = Insets(UiStyle.Gap.md(), UiStyle.Gap.md(), UiStyle.Gap.sm(), UiStyle.Gap.sm())
         const val TRANSCRIPT_SCROLLBAR_PADDING = 10
+        val InnerInsets = Insets(
+            UiStyle.Gap.md(),
+            UiStyle.Gap.sm() + TRANSCRIPT_SCROLLBAR_PADDING,
+            UiStyle.Gap.sm(),
+            UiStyle.Gap.sm(),
+        )
         const val USER_PROMPT_INDENT = 100
         const val SCROLL_INCREMENT = 48
     }
@@ -144,12 +149,12 @@ object SessionUiStyle {
             const val MIN_ROWS = 1
             const val BORDER_WIDTH = 1
             const val VIEWPORT_TOP_PADDING = 6
-            const val VIEWPORT_HORIZONTAL_PADDING = 8
+            const val VIEWPORT_HORIZONTAL_PADDING = Layout.HORIZONTAL_PADDING
             const val VIEWPORT_BOTTOM_PADDING = 6
             const val SCROLLBAR_HEIGHT = 12
             const val WIDTH_PADDING = 16
 
-            fun topPadding(): Int = VIEWPORT_TOP_PADDING
+            fun topPadding(): Int = VIEWPORT_TOP_PADDING + UiStyle.Gap.lg()
         }
 
         /** Permission session-view command preview limits. */
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt
index 9828d91a27..a08b54a8a7 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/views/tool/ShellToolView.kt
@@ -305,7 +305,7 @@ class ShellBody(
     private fun styleShell() {
         val root = md.component as? JPanel ?: return
         root.components.filterIsInstance<JBHtmlPane>().forEach {
-            it.border = JBUI.Borders.emptyLeft(JBUI.scale(SessionUiStyle.View.Code.VIEWPORT_HORIZONTAL_PADDING))
+            it.border = JBUI.Borders.emptyLeft(SessionUiStyle.View.Code.VIEWPORT_HORIZONTAL_PADDING)
         }
     }
 
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 d89bf04998..fa1f42d9ea 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
@@ -175,6 +175,18 @@ class PromptPanelTest : BasePlatformTestCase() {
         assertSame(editor, applied)
     }
 
+    fun `test prompt editor horizontal insets match top padding`() {
+        val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> })
+
+        realize(panel, 260, 400)
+        val editor = (panel.defaultFocusedComponent as EditorTextField).getEditor(false)!!
+        val ins = editor.scrollPane.viewportBorder.getBorderInsets(editor.scrollPane)
+        val pad = JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING)
+
+        assertEquals(pad, ins.left)
+        assertEquals(pad, ins.right)
+    }
+
     fun `test prompt focus outline follows editor focus`() {
         val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> })
         realize(panel, 260, 400)
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 13b9740f41..ceecd76baa 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
@@ -19,6 +19,7 @@ import ai.kilocode.client.session.views.question.QuestionView
 import ai.kilocode.client.session.views.MessageToolbar
 import ai.kilocode.client.session.views.MessageView
 import ai.kilocode.client.session.views.TextView
+import ai.kilocode.client.session.views.TurnView
 import ai.kilocode.client.session.views.base.PartView
 import ai.kilocode.client.session.views.tool.TaskToolView
 import ai.kilocode.client.session.views.tool.ToolView
@@ -82,6 +83,18 @@ class SessionMessageListPanelTest : BasePlatformTestCase() {
         assertEquals("", panel.dump())
     }
 
+    fun `test transcript content has symmetric side padding`() {
+        model.upsertMessage(msg("a1", "assistant"))
+
+        panel.setSize(600, 400)
+        panel.doLayout()
+        val turn = panel.components.first { it is TurnView }
+        val left = turn.x
+        val right = panel.width - turn.x - turn.width
+
+        assertEquals(right, left)
+    }
+
     // ------ 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/session/views/ShellToolViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt
index d903534f45..f9f05fd33d 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/views/ShellToolViewTest.kt
@@ -328,7 +328,7 @@ class ShellToolViewTest : BasePlatformTestCase() {
         assertEquals(2, panes.size)
         labels.forEach {
             val label = it.border?.getBorderInsets(it)
-            assertEquals(JBUI.scale(SessionUiStyle.View.Code.VIEWPORT_HORIZONTAL_PADDING), label?.left ?: 0)
+            assertEquals(JBUI.scale(SessionUiStyle.View.Layout.HORIZONTAL_PADDING), label?.left ?: 0)
             assertEquals(0, label?.right ?: 0)
         }
         panes.forEach {
@@ -347,8 +347,7 @@ class ShellToolViewTest : BasePlatformTestCase() {
         val output = (1..30).joinToString("\n") { "line $it" }
         val view = track(ShellToolView(tool().also { it.output = output }))
         view.toggle()
-        val root = view.mdComponent()!!
-        val pane = root.components.filterIsInstance<JBScrollPane>().single()
+        val pane = view.mdComponent()!!.components.filterIsInstance<JBScrollPane>().single()
         val editor = view.codeEditors().single()
         val nested = editor.getEditor(true)!!.scrollPane
         val line = editor.getEditor(true)!!.lineHeight
@@ -408,7 +407,7 @@ class ShellToolViewTest : BasePlatformTestCase() {
             val editor = field.getEditor(true)!!
             val lines = field.text.lines().size
             assertEquals(
-                SessionUiStyle.View.Code.VIEWPORT_TOP_PADDING,
+                SessionUiStyle.View.Code.topPadding(),
                 pad.top,
             )
             assertEquals(SessionUiStyle.View.Code.VIEWPORT_BOTTOM_PADDING, pad.bottom)
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/md/MdViewHybridTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/md/MdViewHybridTest.kt
index b80b748961..e78d86f878 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/md/MdViewHybridTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/ui/md/MdViewHybridTest.kt
@@ -122,25 +122,31 @@ class MdViewHybridTest : BasePlatformTestCase() {
         assertTrue(pane.preferredSize.height >= line * 3)
     }
 
-    fun `test fenced code block has symmetric content padding with horizontal scrollbar`() {
+    fun `test fenced code block balances content padding with horizontal scrollbar`() {
         view.set("```kotlin\n${"x".repeat(500)}\n```")
         val pane = scrolls().single()
         val pad = pane.viewportBorder.getBorderInsets(pane)
 
-        assertEquals(SessionUiStyle.View.Code.VIEWPORT_TOP_PADDING, pad.top)
+        assertEquals(SessionUiStyle.View.Code.topPadding(), pad.top)
+        assertEquals(SessionUiStyle.View.Layout.HORIZONTAL_PADDING, pad.left)
         assertEquals(SessionUiStyle.View.Code.VIEWPORT_BOTTOM_PADDING, pad.bottom)
-        assertEquals(pad.top, pad.bottom)
+        assertEquals(SessionUiStyle.View.Layout.HORIZONTAL_PADDING, pad.right)
+        assertTrue(pad.top > pad.bottom)
+        assertTrue(pad.top < pad.bottom + SessionUiStyle.View.Code.SCROLLBAR_HEIGHT)
         assertTrue(pane.horizontalScrollBar.preferredSize.height > 0)
     }
 
-    fun `test short code block keeps symmetric content padding`() {
+    fun `test short code block keeps balanced content padding`() {
         view.set("```text\n[ALICE, ANNA]\n```")
         val pane = scrolls().single()
         val pad = pane.viewportBorder.getBorderInsets(pane)
 
-        assertEquals(SessionUiStyle.View.Code.VIEWPORT_TOP_PADDING, pad.top)
+        assertEquals(SessionUiStyle.View.Code.topPadding(), pad.top)
+        assertEquals(SessionUiStyle.View.Layout.HORIZONTAL_PADDING, pad.left)
         assertEquals(SessionUiStyle.View.Code.VIEWPORT_BOTTOM_PADDING, pad.bottom)
-        assertEquals(pad.top, pad.bottom)
+        assertEquals(SessionUiStyle.View.Layout.HORIZONTAL_PADDING, pad.right)
+        assertTrue(pad.top > pad.bottom)
+        assertTrue(pad.top < pad.bottom + SessionUiStyle.View.Code.SCROLLBAR_HEIGHT)
     }
 
     fun `test fenced code block height is not capped`() {

From 1f9e6a493d726c549ab2aa8046be4777c7c1990f Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 13:45:43 -0400
Subject: [PATCH 63/68] fix(jetbrains): use shell env for CLI PATH

---
 .changeset/jetbrains-shell-env-path.md                   | 5 +++++
 .../ai/kilocode/backend/cli/KiloBackendCliManager.kt     | 5 +++--
 .../kilocode/backend/cli/KiloBackendCliManagerEnvTest.kt | 9 +++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/jetbrains-shell-env-path.md

diff --git a/.changeset/jetbrains-shell-env-path.md b/.changeset/jetbrains-shell-env-path.md
new file mode 100644
index 0000000000..8af2da4320
--- /dev/null
+++ b/.changeset/jetbrains-shell-env-path.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Fix the JetBrains plugin finding shell-installed tools like bun and gh when launched from Finder or Dock.
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 fe8dcb992c..301142da9f 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
@@ -5,6 +5,7 @@ import ai.kilocode.backend.dev.KiloDevMode
 import ai.kilocode.log.KiloLog
 import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.PathManager
+import com.intellij.util.EnvironmentUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
@@ -91,7 +92,7 @@ class KiloBackendCliManager(
     }
 
     // Must be called from a background thread — devStorageEnv() performs blocking I/O (mkdirs).
-    internal fun buildEnv(pwd: String, base: Map<String, String> = System.getenv()): Map<String, String> =
+    internal fun buildEnv(pwd: String, base: Map<String, String> = EnvironmentUtil.getEnvironmentMap()): Map<String, String> =
         buildKiloCliEnv(pwd, base, log)
 
     private suspend fun spawn(cli: File): CliServer.State =
@@ -238,7 +239,7 @@ private const val DEFAULT_CONFIG = """{"permission":{"edit":"ask","bash":"ask"}}
 // Must be called from a background thread — devStorageEnv() performs blocking I/O (mkdirs).
 internal fun buildKiloCliEnv(
     pwd: String,
-    base: Map<String, String> = System.getenv(),
+    base: Map<String, String> = EnvironmentUtil.getEnvironmentMap(),
     log: KiloLog = KiloLog.create(KiloBackendCliManager::class.java),
 ): Map<String, String> = buildMap {
     putAll(base)
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloBackendCliManagerEnvTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloBackendCliManagerEnvTest.kt
index 339dc9542d..9024ce3561 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloBackendCliManagerEnvTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloBackendCliManagerEnvTest.kt
@@ -79,6 +79,15 @@ class KiloBackendCliManagerEnvTest {
         assertEquals(cfg, env["KILO_CONFIG_CONTENT"])
     }
 
+    @Test
+    fun `isolation disabled - base PATH is preserved`() {
+        val path = "/opt/homebrew/bin:/usr/bin"
+
+        val env = manager.buildEnv("pwd123", mapOf("PATH" to path))
+
+        assertEquals(path, env["PATH"])
+    }
+
     @Test
     fun `isolation disabled - no XDG storage overrides are injected`() {
         val env = manager.buildEnv("pwd123", emptyMap())

From 6fa48a8bbd32c35363160ca53fd51efe9241b7b3 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 14:06:42 -0400
Subject: [PATCH 64/68] fix: address review feedback

---
 .../code-with-ai/agents/custom-models.md      |   4 +-
 .../pages/code-with-ai/platforms/cli.md       |   4 +-
 .../kilocode/backend/cli/KiloCliDownloader.kt | 138 +++++++++++++-----
 .../backend/cli/KiloCliDownloaderTest.kt      |  57 ++++++--
 .../ai/kilocode/client/app/KiloAppService.kt  |  40 +++--
 .../client/session/ui/prompt/PromptPanel.kt   |   4 +-
 .../client/session/ui/style/SessionUiStyle.kt |   2 +
 .../kilocode/client/app/KiloAppServiceTest.kt |  44 ++++++
 .../client/session/ui/PromptPanelTest.kt      |   4 +-
 .../kilocode/client/testing/FakeAppRpcApi.kt  |  11 ++
 .../tests/unit/config-scope.test.ts           |  15 ++
 .../tests/unit/speech-to-text-button.test.ts  |  30 ++++
 .../src/components/chat/PromptInput.tsx       |   2 +-
 .../speech-to-text/SpeechToTextButton.tsx     |   5 +-
 .../speech-to-text/speech-cleanup.ts          |   5 +
 .../src/cli/cmd/tui/routes/session/index.tsx  |   5 +-
 .../cli/cmd/tui/component/prompt/vim.ts       |   2 +-
 .../tui/routes/session/routed-model-meta.tsx  |   4 +-
 .../src/kilocode/session/routed-model.ts      |   7 +-
 .../kilocode/cli/cmd/tui/prompt/vim.test.ts   |  22 +++
 .../test/kilocode/config/config.test.ts       |  45 ++++++
 .../kilocode/session-routed-model.test.ts     |  27 +++-
 22 files changed, 397 insertions(+), 80 deletions(-)
 create mode 100644 packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts
 create mode 100644 packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts

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 d489dc63eb..065672280e 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
@@ -390,8 +390,8 @@ You can also set options that apply to all models from a provider:
 | `timeout` | `number \| false` | Request timeout in milliseconds. Defaults to `300000` (5 minutes); set to `false` to disable |
 | `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" %}
-`{env:VAR}` and `{file:...}` references in `apiKey` (or any option) are resolved **only** when the config lives in a trusted location: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** resolve `{env:VAR}` — the reference is ignored and a warning is logged, so a provider configured this way in a repo will not authenticate. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` just by being opened. `{file:...}` still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected. Keep provider credentials in your global config.
+{% callout type="warning" title="{env:} requires trusted config; {file:} is project-confined" %}
+`{env:VAR}` references in `apiKey` (or any option) resolve **only** when the config lives in a trusted location: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** resolve `{env:VAR}`; if one appears anywhere in that file, Kilo drops the entire file's config and logs a warning, so unrelated settings in the same file stop applying too. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` just by being opened. `{file:...}` works in trusted config and still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected. Keep provider credentials in your global config.
 {% /callout %}
 
 ## Filtering Available Models
diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
index d785539288..be2bafc75d 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
@@ -465,8 +465,8 @@ Use `{env:VARIABLE_NAME}` syntax in config files to reference environment variab
 }
 ```
 
-{% callout type="warning" title="Only works in trusted config" %}
-`{env:VAR}` (and `{file:...}`) references are resolved **only** in trusted config: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** use `{env:VAR}` — the reference is ignored and a warning is logged. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` simply by being opened. `{file:...}` still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected.
+{% callout type="warning" title="{env:} requires trusted config; {file:} is project-confined" %}
+`{env:VAR}` references resolve **only** in trusted config: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** use `{env:VAR}`; if one appears anywhere in that file, Kilo drops the entire file's config and logs a warning, so unrelated settings in the same file stop applying too. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` simply by being opened. `{file:...}` works in trusted config and still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected.
 {% /callout %}
 
 For full details on all configuration options including compaction, file watchers, plugins, and experimental features, see the [OpenCode Config documentation](https://opencode.ai/docs/config).
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
index 269331e13c..181d114efc 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDownloader.kt
@@ -16,8 +16,10 @@ import okhttp3.Response
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
 import java.io.File
+import java.io.RandomAccessFile
 import java.security.MessageDigest
 import java.time.Instant
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 import java.util.zip.ZipInputStream
 import kotlin.math.roundToInt
@@ -36,55 +38,113 @@ class KiloCliDownloader(
     companion object {
         private val DIGEST = Regex("^sha256:[a-f0-9]{64}$")
         private val JSON = Json { ignoreUnknownKeys = true }
+        private val LOCKS = ConcurrentHashMap<String, Any>()
     }
 
     suspend fun resolve(version: String, force: Boolean = false, onProgress: (CliDownload) -> Unit = {}): File =
         withContext(Dispatchers.IO) {
-            val platform = KiloCliPlatform.current()
-            val dir = File(File(root, version), platform)
-            val exe = File(dir, "bin/${KiloCliPlatform.exe()}")
-            val done = File(dir, ".complete")
-            val cached = done.takeIf { it.isFile }?.readText()?.trim()
-            val ext = KiloCliPlatform.archive(platform)
-            val archive = File(dir, "kilo-$platform.$ext")
+            locked {
+                val platform = KiloCliPlatform.current()
+                val dir = File(File(root, version), platform)
+                val exe = File(dir, "bin/${KiloCliPlatform.exe()}")
+                val done = File(dir, ".complete")
+                val ext = KiloCliPlatform.archive(platform)
 
-            if (!force && exe.isFile && cached != null && cached.matches(DIGEST)) {
-                log.info("Using cached Kilo CLI $version for $platform at ${exe.absolutePath}")
-                if (!SystemInfo.isWindows) exe.setExecutable(true)
-                prune(version)
-                return@withContext exe
-            }
+                if (!force) {
+                    cached(version, platform, exe, done)?.let { return@locked it }
+                }
 
-            val digest = asset(version, platform, ext)
+                val digest = asset(version, platform, ext)
+                val stage = stage(version, platform)
+                try {
+                    val archive = File(stage, "kilo-$platform.$ext")
+                    val staged = File(stage, "bin/${KiloCliPlatform.exe()}")
+                    val complete = File(stage, ".complete")
 
-            if (dir.exists()) {
-                log.info("Deleting cached CLI $version under ${dir.absolutePath}")
-                if (!dir.deleteRecursively()) {
-                    throw IllegalStateException("Failed to delete cached Kilo CLI $version under ${dir.absolutePath}")
+                    log.info(
+                        "Kilo CLI $version for $platform is not cached; downloading new release into ${stage.absolutePath}"
+                    )
+                    onProgress(CliDownload(0, version, platform))
+                    download(version, platform, ext, archive, onProgress)
+                    verify(archive, digest)
+                    log.info(
+                        "Downloaded Kilo CLI $version for $platform to ${archive.absolutePath} (size=${archive.length()} bytes)"
+                    )
+                    extract(archive, stage)
+                    if (!staged.isFile) {
+                        throw IllegalStateException("Downloaded CLI archive did not contain bin/${KiloCliPlatform.exe()}")
+                    }
+                    if (!SystemInfo.isWindows) staged.setExecutable(true)
+                    if (archive.exists() && !archive.delete()) {
+                        log.warn("Failed to delete extracted Kilo CLI archive ${archive.absolutePath}")
+                    }
+                    complete.writeText("$digest\n")
+                    replace(dir, stage)
+                    onProgress(CliDownload(100, version, platform))
+                    prune(version)
+                    exe
+                } finally {
+                    if (stage.exists() && !stage.deleteRecursively()) {
+                        log.warn("Failed to delete staged Kilo CLI download ${stage.absolutePath}")
+                    }
                 }
             }
-
-            if (!dir.isDirectory && !dir.mkdirs()) {
-                throw IllegalStateException("Failed to create Kilo CLI cache directory ${dir.absolutePath}")
-            }
-
-            log.info("Kilo CLI $version for $platform is not cached; downloading new release into ${dir.absolutePath}")
-            onProgress(CliDownload(0, version, platform))
-            download(version, platform, ext, archive, onProgress)
-            verify(archive, digest)
-            log.info("Downloaded Kilo CLI $version for $platform to ${archive.absolutePath} (size=${archive.length()} bytes)")
-            extract(archive, dir)
-            if (!exe.isFile) throw IllegalStateException("Downloaded CLI archive did not contain bin/${KiloCliPlatform.exe()}")
-            if (!SystemInfo.isWindows) exe.setExecutable(true)
-            if (archive.exists() && !archive.delete()) {
-                log.warn("Failed to delete extracted Kilo CLI archive ${archive.absolutePath}")
-            }
-            done.writeText("$digest\n")
-            onProgress(CliDownload(100, version, platform))
-            prune(version)
-            exe
         }
 
+    private fun cached(version: String, platform: String, exe: File, done: File): File? {
+        val digest = done.takeIf { it.isFile }?.readText()?.trim()
+        if (!exe.isFile || digest == null || !digest.matches(DIGEST)) return null
+        log.info("Using cached Kilo CLI $version for $platform at ${exe.absolutePath}")
+        if (!SystemInfo.isWindows) exe.setExecutable(true)
+        prune(version)
+        return exe
+    }
+
+    private fun <T> locked(block: () -> T): T {
+        if (!root.isDirectory && !root.mkdirs()) {
+            throw IllegalStateException("Failed to create Kilo CLI cache root ${root.absolutePath}")
+        }
+        val file = File(root, ".lock").canonicalFile
+        val mutex = LOCKS.computeIfAbsent(file.absolutePath) { Any() }
+        return synchronized(mutex) {
+            RandomAccessFile(file, "rw").channel.use { channel ->
+                channel.lock().use { block() }
+            }
+        }
+    }
+
+    private fun stage(version: String, platform: String): File {
+        val tmp = File(root, ".tmp")
+        val dir = File(tmp, "$version-$platform-${System.nanoTime()}")
+        if (!dir.isDirectory && !dir.mkdirs()) {
+            throw IllegalStateException("Failed to create Kilo CLI staging directory ${dir.absolutePath}")
+        }
+        return dir
+    }
+
+    private fun replace(dir: File, stage: File) {
+        val parent = dir.parentFile
+        if (!parent.isDirectory && !parent.mkdirs()) {
+            throw IllegalStateException("Failed to create Kilo CLI cache directory ${parent.absolutePath}")
+        }
+
+        val backup = File(parent, ".${dir.name}.backup-${System.nanoTime()}")
+        if (dir.exists() && !dir.renameTo(backup)) {
+            throw IllegalStateException("Failed to move existing Kilo CLI cache ${dir.absolutePath} aside")
+        }
+        if (stage.renameTo(dir)) {
+            if (backup.exists() && !backup.deleteRecursively()) {
+                log.warn("Failed to delete previous Kilo CLI cache ${backup.absolutePath}")
+            }
+            return
+        }
+
+        if (backup.exists() && !backup.renameTo(dir)) {
+            log.warn("Failed to restore previous Kilo CLI cache ${backup.absolutePath} to ${dir.absolutePath}")
+        }
+        throw IllegalStateException("Failed to install Kilo CLI cache ${stage.absolutePath} to ${dir.absolutePath}")
+    }
+
     private fun fail(message: String): Nothing {
         log.warn(message)
         throw IllegalStateException(message)
@@ -248,7 +308,7 @@ class KiloCliDownloader(
     private fun prune(keep: String) {
         val entries = root.listFiles() ?: return
         for (entry in entries) {
-            if (!entry.isDirectory || entry.name == keep) continue
+            if (!entry.isDirectory || entry.name == keep || entry.name.startsWith(".")) continue
             log.info("Removing stale Kilo CLI version ${entry.absolutePath}")
             if (!entry.deleteRecursively()) {
                 log.warn("Failed to remove stale Kilo CLI version ${entry.absolutePath}")
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
index face684e5f..1c4d3131c0 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDownloaderTest.kt
@@ -48,7 +48,12 @@ class KiloCliDownloaderTest {
             assertEquals("/release/v1.2.3/kilo-${KiloCliPlatform.current()}.${KiloCliPlatform.archive()}", server.takeRequest().path)
             assertEquals(CliDownload(0, "1.2.3", KiloCliPlatform.current()), seen.first())
             assertTrue(seen.any { it.percent == 100 && it.version == "1.2.3" && it.platform == KiloCliPlatform.current() })
-            assertContains(log.messages, "INFO: Kilo CLI 1.2.3 for ${KiloCliPlatform.current()} is not cached; downloading new release into ${cli.parentFile.parentFile.absolutePath}")
+            assertTrue(
+                log.messages.any {
+                    it.startsWith("INFO: Kilo CLI 1.2.3 for ${KiloCliPlatform.current()} is not cached; downloading new release into ") &&
+                        it.contains("/.tmp/")
+                }
+            )
 
             val cachedProgress = mutableListOf<CliDownload>()
             val cached = KiloCliDownloader(
@@ -113,23 +118,55 @@ class KiloCliDownloaderTest {
     @Test
     fun `forced resolve re-downloads and keeps only the active version`() = runBlocking {
         MockWebServer().use { server ->
-            val bytes = archive()
-            repeat(2) {
-                server.enqueue(metadata(bytes))
-                server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
-            }
+            val first = archive("#!/bin/old\n")
+            val next = archive("#!/bin/new\n")
+            server.enqueue(metadata(first))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(first)))
+            server.enqueue(metadata(next))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(next)))
             val cli = KiloCliDownloader(
                 root = dir,
                 baseUrl = server.url("/release").toString(),
                 api = server.url("/api").toString(),
             )
-            cli.resolve("1.2.3")
+            val old = cli.resolve("1.2.3")
+            assertEquals("#!/bin/old\n", old.readText())
             assertEquals(2, server.requestCount)
 
             val forced = cli.resolve("1.2.3", force = true)
             assertTrue(forced.isFile)
+            assertEquals("#!/bin/new\n", forced.readText())
             assertEquals(4, server.requestCount)
-            assertEquals(listOf("1.2.3"), dir.listFiles()?.filter { it.isDirectory }?.map { it.name })
+            assertEquals(listOf("1.2.3"), dir.listFiles()?.filter { it.isDirectory && !it.name.startsWith(".") }?.map { it.name })
+        }
+    }
+
+    @Test
+    fun `forced resolve keeps the existing cli when download fails`() = runBlocking {
+        MockWebServer().use { server ->
+            val bytes = archive("#!/bin/old\n")
+            server.enqueue(metadata(bytes))
+            server.enqueue(MockResponse().setResponseCode(200).setBody(Buffer().write(bytes)))
+            server.enqueue(metadata(bytes))
+            server.enqueue(MockResponse().setResponseCode(503).setBody("unavailable"))
+
+            val cli = KiloCliDownloader(
+                root = dir,
+                baseUrl = server.url("/release").toString(),
+                api = server.url("/api").toString(),
+            ).resolve("1.2.3")
+            val ex = assertFailsWith<IllegalStateException> {
+                KiloCliDownloader(
+                    root = dir,
+                    baseUrl = server.url("/release").toString(),
+                    api = server.url("/api").toString(),
+                ).resolve("1.2.3", force = true)
+            }
+
+            assertContains(ex.message.orEmpty(), "Failed to download")
+            assertTrue(cli.isFile)
+            assertEquals("#!/bin/old\n", cli.readText())
+            assertTrue(File(cli.parentFile.parentFile, ".complete").isFile)
         }
     }
 
@@ -232,9 +269,9 @@ class KiloCliDownloaderTest {
         }
     }
 
-    private fun archive(): ByteArray {
+    private fun archive(script: String = "#!/bin/sh\n"): ByteArray {
         val files = mapOf(
-            "bin/${KiloCliPlatform.exe()}" to "#!/bin/sh\n".toByteArray(),
+            "bin/${KiloCliPlatform.exe()}" to script.toByteArray(),
             "bin/kilo-sandbox-mutation-worker.js" to "worker\n".toByteArray(),
         )
         if (KiloCliPlatform.archive() == "zip") return zip(files)
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
index 35db7427dd..b24e42f992 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt
@@ -50,6 +50,9 @@ class KiloAppService internal constructor(
     /** Core version and platform from the backend, or null if unknown. */
     @Volatile
     private var info: CoreInfo? = null
+    private val coreLock = Any()
+    private val coreDone = mutableListOf<(CoreInfo?) -> Unit>()
+    private var coreJob: Job? = null
 
     val core: CoreInfo? get() = info
 
@@ -151,18 +154,37 @@ class KiloAppService internal constructor(
 
     /** Fetch the pinned Core version and platform and cache it. */
     fun fetchCoreInfoAsync(done: (CoreInfo?) -> Unit = {}) {
-        info?.let {
-            done(it)
+        val cached = info
+        if (cached != null) {
+            done(cached)
             return
         }
-        cs.launch {
-            LOG.info("fetchCoreInfo: requesting Core version and platform")
-            val next = coreInfo()
-            if (next == null) {
-                done(null)
-                return@launch
+
+        synchronized(coreLock) {
+            val current = info
+            if (current != null) {
+                done(current)
+                return
             }
-            done(next)
+            coreDone.add(done)
+            if (coreJob != null) return
+            coreJob = cs.launch {
+                fetchCoreInfo()
+            }
+        }
+    }
+
+    private suspend fun fetchCoreInfo() {
+        LOG.info("fetchCoreInfo: requesting Core version and platform")
+        val next = coreInfo()
+        val list = synchronized(coreLock) {
+            val items = coreDone.toList()
+            coreDone.clear()
+            coreJob = null
+            items
+        }
+        list.forEach { it(next) }
+        if (next != null) {
             LOG.info("fetchCoreInfo: Core version is ${next.version} (${next.platform})")
         }
     }
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 233e075c40..ff04e16a26 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
@@ -174,9 +174,9 @@ class PromptPanel(
             ed.scrollPane.border = JBUI.Borders.empty()
             ed.scrollPane.viewportBorder = JBUI.Borders.empty(
                 0,
-                JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+                JBUI.scale(SessionUiStyle.View.Prompt.EDITOR_HORIZONTAL_INSET),
                 0,
-                JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+                JBUI.scale(SessionUiStyle.View.Prompt.EDITOR_HORIZONTAL_INSET),
             )
             ed.backgroundColor = style.editorScheme.defaultBackground
             ed.scrollPane.background = style.editorScheme.defaultBackground
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
index afd24afe2f..95e3b494af 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
@@ -78,6 +78,8 @@ object SessionUiStyle {
             const val CONTROL_GAP = 4
             const val SHELL_VERTICAL_PADDING = 6
             const val SHELL_HORIZONTAL_PADDING = 8
+            // Horizontal editor inset intentionally matches vertical shell padding to balance text and chrome.
+            const val EDITOR_HORIZONTAL_INSET = SHELL_VERTICAL_PADDING
 
             fun separator(): Color = JBColor.namedColor(
                 "EditorTabs.underTabsBorderColor",
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAppServiceTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAppServiceTest.kt
index abfe104f09..35086670ee 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAppServiceTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAppServiceTest.kt
@@ -7,11 +7,14 @@ import ai.kilocode.rpc.dto.ProfileBalanceDto
 import ai.kilocode.rpc.dto.ProfileDto
 import ai.kilocode.rpc.dto.ProfileOrganizationDto
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.yield
+import kotlinx.coroutines.withTimeout
 
 /**
  * Service-level tests for [KiloAppService] profile/login/logout/org operations.
@@ -49,6 +52,47 @@ class KiloAppServiceTest : BasePlatformTestCase() {
         currentOrgId: String? = null,
     ) = ProfileDto(email = email, name = name, organizations = orgs, balance = balance, currentOrgId = currentOrgId)
 
+    private suspend fun waitUntil(done: () -> Boolean) {
+        withTimeout(5_000) {
+            while (!done()) yield()
+        }
+    }
+
+    fun `test fetchCoreInfoAsync dedupes in flight requests`() = runBlocking(Dispatchers.Default) {
+        rpc.cliInfoGate = CompletableDeferred()
+        val seen = mutableListOf<CoreInfo?>()
+
+        app.fetchCoreInfoAsync { seen.add(it) }
+        app.fetchCoreInfoAsync { seen.add(it) }
+        waitUntil { rpc.cliVersionCalls == 1 }
+
+        assertEquals(1, rpc.cliVersionCalls)
+        assertEquals(0, rpc.cliPlatformCalls)
+        rpc.cliInfoGate!!.complete(Unit)
+        waitUntil { seen.size == 2 }
+
+        assertEquals(1, rpc.cliVersionCalls)
+        assertEquals(1, rpc.cliPlatformCalls)
+        assertEquals(listOf(CoreInfo("1.0.0", "darwin-arm64"), CoreInfo("1.0.0", "darwin-arm64")), seen)
+    }
+
+    fun `test fetchCoreInfoAsync retries after failure`() = runBlocking(Dispatchers.Default) {
+        val seen = mutableListOf<CoreInfo?>()
+        rpc.cliInfoError = RuntimeException("core failed")
+
+        app.fetchCoreInfoAsync { seen.add(it) }
+        waitUntil { seen.size == 1 }
+
+        assertNull(seen.single())
+        assertNull(app.core)
+        rpc.cliInfoError = null
+        app.fetchCoreInfoAsync { seen.add(it) }
+        waitUntil { seen.size == 2 }
+
+        assertEquals(CoreInfo("1.0.0", "darwin-arm64"), seen.last())
+        assertEquals(2, rpc.cliVersionCalls)
+    }
+
     // ------ refreshProfile ------
 
     fun `test refreshProfile updates app state profile on success`() = runBlocking(Dispatchers.Default) {
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 fa1f42d9ea..c1ae8e54c4 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
@@ -175,13 +175,13 @@ class PromptPanelTest : BasePlatformTestCase() {
         assertSame(editor, applied)
     }
 
-    fun `test prompt editor horizontal insets match top padding`() {
+    fun `test prompt editor horizontal insets use dedicated prompt inset`() {
         val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> })
 
         realize(panel, 260, 400)
         val editor = (panel.defaultFocusedComponent as EditorTextField).getEditor(false)!!
         val ins = editor.scrollPane.viewportBorder.getBorderInsets(editor.scrollPane)
-        val pad = JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING)
+        val pad = JBUI.scale(SessionUiStyle.View.Prompt.EDITOR_HORIZONTAL_INSET)
 
         assertEquals(pad, ins.left)
         assertEquals(pad, ins.right)
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
index bc67e9f2d8..ed6e3e928f 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
@@ -33,6 +33,12 @@ class FakeAppRpcApi : KiloAppRpcApi {
     var health = HealthDto(healthy = true, version = "1.0.0")
     var cliVersion = "1.0.0"
     var cliPlatform = "darwin-arm64"
+    var cliInfoGate: CompletableDeferred<Unit>? = null
+    var cliInfoError: Exception? = null
+    var cliVersionCalls = 0
+        private set
+    var cliPlatformCalls = 0
+        private set
     var models = ModelStateDto()
     val selections = mutableListOf<ModelSelectionUpdateDto>()
     val cleared = mutableListOf<String>()
@@ -71,11 +77,16 @@ class FakeAppRpcApi : KiloAppRpcApi {
 
     override suspend fun cliVersion(): String {
         assertNotEdt("cliVersion")
+        cliVersionCalls += 1
+        cliInfoGate?.await()
+        cliInfoError?.let { throw it }
         return cliVersion
     }
 
     override suspend fun cliPlatform(): String {
         assertNotEdt("cliPlatform")
+        cliPlatformCalls += 1
+        cliInfoError?.let { throw it }
         return cliPlatform
     }
 
diff --git a/packages/kilo-vscode/tests/unit/config-scope.test.ts b/packages/kilo-vscode/tests/unit/config-scope.test.ts
index eca588a5d1..aee2c488ce 100644
--- a/packages/kilo-vscode/tests/unit/config-scope.test.ts
+++ b/packages/kilo-vscode/tests/unit/config-scope.test.ts
@@ -47,4 +47,19 @@ describe("splitConfigByScope", () => {
     })
     expect(split.project).toEqual({})
   })
+
+  it("writes sandbox writable paths to global config", () => {
+    const split = splitConfigByScope({
+      experimental: {
+        sandbox_writable_paths: ["/tmp/kilo"],
+      },
+    })
+
+    expect(split.global).toEqual({
+      experimental: {
+        sandbox_writable_paths: ["/tmp/kilo"],
+      },
+    })
+    expect(split.project).toEqual({})
+  })
 })
diff --git a/packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts b/packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts
new file mode 100644
index 0000000000..56db776d55
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from "bun:test"
+import { cleanupSpeechCapture } from "../../webview-ui/src/components/speech-to-text/speech-cleanup"
+
+describe("speech-to-text button", () => {
+  it("cancels active capture on component cleanup", () => {
+    let cancels = 0
+
+    cleanupSpeechCapture({
+      active: () => true,
+      cancel: () => {
+        cancels += 1
+      },
+    })
+
+    expect(cancels).toBe(1)
+  })
+
+  it("does not cancel idle capture on component cleanup", () => {
+    let cancels = 0
+
+    cleanupSpeechCapture({
+      active: () => false,
+      cancel: () => {
+        cancels += 1
+      },
+    })
+
+    expect(cancels).toBe(0)
+  })
+})
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 1593dadf0c..0298535f8a 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -1394,7 +1394,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               <WandSparkles size={16} class={enhancing() ? "enhance-spinner" : ""} />
             </Button>
           </Tooltip>
-          <Show when={canUseSpeech()}>
+          <Show when={canUseSpeech() || speech.active()}>
             <SpeechToTextButton speech={speech} disabled={isDisabled()} start={startSpeech} label={language.t} />
           </Show>
           <Show
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 5a6d4f056a..b62d7cc9ac 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
@@ -3,6 +3,7 @@ import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { onCleanup, type Component } from "solid-js"
 import type { SpeechToText } from "./useSpeechToText"
+import { cleanupSpeechCapture } from "./speech-cleanup"
 
 type Props = {
   speech: SpeechToText
@@ -41,9 +42,7 @@ export const SpeechToTextButton: Component<Props> = (props) => {
     props.start()
   }
 
-  onCleanup(() => {
-    if (props.speech.active()) props.speech.cancel()
-  })
+  onCleanup(() => cleanupSpeechCapture(props.speech))
 
   return (
     <Tooltip value={label()} placement="top">
diff --git a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts
new file mode 100644
index 0000000000..fa97233f3e
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts
@@ -0,0 +1,5 @@
+import type { SpeechToText } from "./useSpeechToText"
+
+export function cleanupSpeechCapture(speech: Pick<SpeechToText, "active" | "cancel">) {
+  if (speech.active()) speech.cancel()
+}
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 9b3c279fea..f14577ce02 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1738,11 +1738,8 @@ function StepFinishPart(props: { last: boolean; part: StepFinishPart; message: A
   const { theme } = useTheme()
   const info = useContext(RoutedModelMeta.Context)
   const routed = createMemo(() => {
-    if (props.message.providerID !== "kilo") return undefined
-    if (!props.message.modelID.startsWith("kilo-auto/")) return undefined
     const model = props.part.model
-    if (!model) return undefined
-    if (model.providerID === props.message.providerID && model.modelID === props.message.modelID) return undefined
+    if (!RoutedModelMeta.routed(model, props.message)) return undefined
     return RoutedModelMeta.label(ctx.providers(), model)
   })
   const consumed = createMemo(() => info().consumed.has(props.part.id))
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts b/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
index 2b91606c86..ad1d0b58d9 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
@@ -299,7 +299,7 @@ function resolveMotion(text: string, pos: number, key: string, count: number, aw
     case "$": {
       let t = pos
       for (let i = 0; i < reps; i++) t = lineEnd(text, lineEnd(text, t) + (i === 0 ? 0 : 1))
-      return { target: lineEnd(text, t), inclusive: true, linewise: false }
+      return { target: Math.max(lineStart(text, t), lineEnd(text, t) - 1), inclusive: true, linewise: false }
     }
     case "G": {
       let target = 0
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx
index 61b964b270..12179aba52 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx
@@ -39,10 +39,10 @@ export namespace RoutedModelMeta {
     return KiloRoutedModel.displayName(text)
   }
 
-  function routed(model: StepFinishPart["model"], message: Message) {
+  export function routed(model: StepFinishPart["model"], message: Message) {
     if (!model) return undefined
     if (message.providerID !== "kilo") return undefined
-    if (!message.modelID.startsWith("kilo-auto/")) return undefined
+    if (!KiloRoutedModel.routedSelection(message.modelID)) return undefined
     if (model.providerID === message.providerID && model.modelID === message.modelID) return undefined
     return model
   }
diff --git a/packages/opencode/src/kilocode/session/routed-model.ts b/packages/opencode/src/kilocode/session/routed-model.ts
index eace803049..ba474dad40 100644
--- a/packages/opencode/src/kilocode/session/routed-model.ts
+++ b/packages/opencode/src/kilocode/session/routed-model.ts
@@ -47,10 +47,15 @@ export namespace KiloRoutedModel {
     input: { providerID: ProviderID; modelID: string; selected?: string },
   ) {
     if (input.providerID !== ProviderID.kilo) return undefined
-    if (!input.modelID.startsWith("kilo-auto/") && !input.modelID.includes("fable")) return undefined
+    if (!routedSelection(input.modelID)) return undefined
     const model = read(meta, input.providerID)
     if (!model) return undefined
     if (model.modelID === input.modelID || model.modelID === input.selected) return undefined
     return model
   }
+
+  export function routedSelection(modelID: string) {
+    const id = modelID.trim()
+    return id.startsWith("kilo-auto/") || /(?:^|[/.])claude-fable(?:[-.:/]|$)/.test(id)
+  }
 }
diff --git a/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts b/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts
index 43a2330d61..878ffed953 100644
--- a/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts
+++ b/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts
@@ -199,6 +199,28 @@ describe("vim edits", () => {
     expect(doc.text).toBe("bar baz")
   })
 
+  test("d$ deletes line content without consuming the newline", () => {
+    const doc = new MockDoc("abc\ndef", 0)
+    const state = createVimState("normal")
+    feed(doc, state, "d$")
+    expect(doc.text).toBe("\ndef")
+  })
+
+  test("c$ changes line content without consuming the newline", () => {
+    const doc = new MockDoc("abc\ndef", 0)
+    const state = createVimState("normal")
+    feed(doc, state, "c$")
+    expect(doc.text).toBe("\ndef")
+    expect(state.mode).toBe("insert")
+  })
+
+  test("y$ yanks line content without the newline", () => {
+    const doc = new MockDoc("abc\ndef", 0)
+    const state = createVimState("normal")
+    feed(doc, state, "y$")
+    expect(state.register).toEqual({ text: "abc", linewise: false })
+  })
+
   test("dd deletes the current line", () => {
     const doc = new MockDoc("one\ntwo\nthree", 4)
     const state = createVimState("normal")
diff --git a/packages/opencode/test/kilocode/config/config.test.ts b/packages/opencode/test/kilocode/config/config.test.ts
index 467282a346..b8a41edcc6 100644
--- a/packages/opencode/test/kilocode/config/config.test.ts
+++ b/packages/opencode/test/kilocode/config/config.test.ts
@@ -243,6 +243,51 @@ describe("kilocode indexing config", () => {
 })
 
 describe("kilocode sandbox writable paths config", () => {
+  test("honors sandbox_writable_paths from global config", async () => {
+    await using globalTmp = await tmpdir()
+    await using tmp = await tmpdir({ git: true })
+
+    const prev = Global.Path.config
+    ;(Global.Path as { config: string }).config = globalTmp.path
+    await clear()
+    await disposeAllInstances()
+
+    try {
+      await writeConfig(globalTmp.path, {
+        $schema: "https://app.kilo.ai/config.json",
+        experimental: { sandbox_writable_paths: ["/tmp/global"] },
+      })
+
+      await provideTestInstance({
+        directory: tmp.path,
+        fn: async () => {
+          const config = await load()
+          expect(config.experimental?.sandbox_writable_paths).toEqual(["/tmp/global"])
+        },
+      })
+    } finally {
+      ;(Global.Path as { config: string }).config = prev
+      await clear()
+      await disposeAllInstances()
+    }
+  })
+
+  test("drops sandbox_writable_paths from project config", async () => {
+    await using tmp = await tmpdir({ git: true })
+
+    await writeConfig(tmp.path, {
+      experimental: { sandbox_writable_paths: ["/tmp/project"] },
+    })
+
+    await provideTestInstance({
+      directory: tmp.path,
+      fn: async () => {
+        const config = await load()
+        expect(config.experimental?.sandbox_writable_paths).toBeUndefined()
+      },
+    })
+  })
+
   test("honors sandbox_writable_paths from global config only, ignoring project config", async () => {
     await using globalTmp = await tmpdir()
     await using tmp = await tmpdir({ git: true })
diff --git a/packages/opencode/test/kilocode/session-routed-model.test.ts b/packages/opencode/test/kilocode/session-routed-model.test.ts
index 64981bad90..de86c5af4b 100644
--- a/packages/opencode/test/kilocode/session-routed-model.test.ts
+++ b/packages/opencode/test/kilocode/session-routed-model.test.ts
@@ -103,7 +103,7 @@ describe("session routed model", () => {
     expect(KiloRoutedModel.displayName("o3")).toBe("o3")
   })
 
-  test("shows compact labels only for Kilo auto selections", () => {
+  test("shows compact labels only for routed Kilo selections", () => {
     const model = { providerID: "openai", modelID: "gpt-5.5" }
     const parts = [reason, finish(model)]
 
@@ -115,6 +115,13 @@ describe("session routed model", () => {
     expect(routed.footer).toBe("gpt-5.5")
     expect(routed.consumed.has("finish")).toBe(true)
 
+    const fable = RoutedModelMeta.info(undefined, parts, false, {
+      providerID: "kilo",
+      modelID: "anthropic/claude-fable-5",
+    })
+    expect(fable.labels.get("reasoning")).toBe("gpt-5.5")
+    expect(fable.footer).toBe("gpt-5.5")
+
     const explicit = RoutedModelMeta.info(undefined, parts, false, {
       providerID: "openai",
       modelID: "gpt-5.5",
@@ -169,7 +176,7 @@ describe("session routed model", () => {
     expect(routed.consumed.has("last")).toBe(false)
   })
 
-  test("reads routed model only for selected Kilo auto models", () => {
+  test("reads routed model only for selected Kilo routed models", () => {
     const meta = { kilocode: { routedModelID: "openai/gpt-5.5-20260423" } }
 
     expect(
@@ -182,6 +189,22 @@ describe("session routed model", () => {
       modelID: ModelID.make("openai/gpt-5.5-20260423"),
     })
 
+    expect(
+      KiloRoutedModel.readAuto(meta, {
+        providerID: ProviderID.kilo,
+        modelID: "anthropic.claude-fable-5",
+      }),
+    ).toEqual({
+      providerID: ProviderID.kilo,
+      modelID: ModelID.make("openai/gpt-5.5-20260423"),
+    })
+
+    expect(
+      KiloRoutedModel.readAuto(meta, {
+        providerID: ProviderID.kilo,
+        modelID: "openai/affable-model",
+      }),
+    ).toBeUndefined()
     expect(
       KiloRoutedModel.readAuto(meta, {
         providerID: ProviderID.kilo,

From cb329c6bdb4be807f25206079e915400cae976b6 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 14:13:35 -0400
Subject: [PATCH 65/68] chore: drop unrelated review fixes

---
 .../code-with-ai/agents/custom-models.md      |  4 +-
 .../pages/code-with-ai/platforms/cli.md       |  4 +-
 .../tests/unit/config-scope.test.ts           | 15 -------
 .../tests/unit/speech-to-text-button.test.ts  | 30 -------------
 .../src/components/chat/PromptInput.tsx       |  2 +-
 .../speech-to-text/SpeechToTextButton.tsx     |  5 ++-
 .../speech-to-text/speech-cleanup.ts          |  5 ---
 .../src/cli/cmd/tui/routes/session/index.tsx  |  5 ++-
 .../cli/cmd/tui/component/prompt/vim.ts       |  2 +-
 .../tui/routes/session/routed-model-meta.tsx  |  4 +-
 .../src/kilocode/session/routed-model.ts      |  7 +--
 .../kilocode/cli/cmd/tui/prompt/vim.test.ts   | 22 ---------
 .../test/kilocode/config/config.test.ts       | 45 -------------------
 .../kilocode/session-routed-model.test.ts     | 27 +----------
 14 files changed, 18 insertions(+), 159 deletions(-)
 delete mode 100644 packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts
 delete mode 100644 packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts

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 065672280e..d489dc63eb 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
@@ -390,8 +390,8 @@ You can also set options that apply to all models from a provider:
 | `timeout` | `number \| false` | Request timeout in milliseconds. Defaults to `300000` (5 minutes); set to `false` to disable |
 | `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:} requires trusted config; {file:} is project-confined" %}
-`{env:VAR}` references in `apiKey` (or any option) resolve **only** when the config lives in a trusted location: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** resolve `{env:VAR}`; if one appears anywhere in that file, Kilo drops the entire file's config and logs a warning, so unrelated settings in the same file stop applying too. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` just by being opened. `{file:...}` works in trusted config and still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected. Keep provider credentials in your global config.
+{% callout type="warning" title="{env:} / {file:} only resolve in trusted config" %}
+`{env:VAR}` and `{file:...}` references in `apiKey` (or any option) are resolved **only** when the config lives in a trusted location: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** resolve `{env:VAR}` — the reference is ignored and a warning is logged, so a provider configured this way in a repo will not authenticate. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` just by being opened. `{file:...}` still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected. Keep provider credentials in your global config.
 {% /callout %}
 
 ## Filtering Available Models
diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
index be2bafc75d..d785539288 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md
@@ -465,8 +465,8 @@ Use `{env:VARIABLE_NAME}` syntax in config files to reference environment variab
 }
 ```
 
-{% callout type="warning" title="{env:} requires trusted config; {file:} is project-confined" %}
-`{env:VAR}` references resolve **only** in trusted config: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** use `{env:VAR}`; if one appears anywhere in that file, Kilo drops the entire file's config and logs a warning, so unrelated settings in the same file stop applying too. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` simply by being opened. `{file:...}` works in trusted config and still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected.
+{% callout type="warning" title="Only works in trusted config" %}
+`{env:VAR}` (and `{file:...}`) references are resolved **only** in trusted config: your global config (`~/.config/kilo`), a config passed via `KILO_CONFIG` / `KILO_CONFIG_CONTENT`, or organization/MDM-managed config. A project-level `kilo.json` / `opencode.json` committed to a repository **cannot** use `{env:VAR}` — the reference is ignored and a warning is logged. This prevents a malicious repository from exfiltrating your secrets to an attacker-controlled `baseURL` simply by being opened. `{file:...}` still works in project config, but only for files that resolve inside the project root — references that leave it (absolute paths outside the root, `../` traversal, and symlink escapes) are rejected.
 {% /callout %}
 
 For full details on all configuration options including compaction, file watchers, plugins, and experimental features, see the [OpenCode Config documentation](https://opencode.ai/docs/config).
diff --git a/packages/kilo-vscode/tests/unit/config-scope.test.ts b/packages/kilo-vscode/tests/unit/config-scope.test.ts
index aee2c488ce..eca588a5d1 100644
--- a/packages/kilo-vscode/tests/unit/config-scope.test.ts
+++ b/packages/kilo-vscode/tests/unit/config-scope.test.ts
@@ -47,19 +47,4 @@ describe("splitConfigByScope", () => {
     })
     expect(split.project).toEqual({})
   })
-
-  it("writes sandbox writable paths to global config", () => {
-    const split = splitConfigByScope({
-      experimental: {
-        sandbox_writable_paths: ["/tmp/kilo"],
-      },
-    })
-
-    expect(split.global).toEqual({
-      experimental: {
-        sandbox_writable_paths: ["/tmp/kilo"],
-      },
-    })
-    expect(split.project).toEqual({})
-  })
 })
diff --git a/packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts b/packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts
deleted file mode 100644
index 56db776d55..0000000000
--- a/packages/kilo-vscode/tests/unit/speech-to-text-button.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { describe, expect, it } from "bun:test"
-import { cleanupSpeechCapture } from "../../webview-ui/src/components/speech-to-text/speech-cleanup"
-
-describe("speech-to-text button", () => {
-  it("cancels active capture on component cleanup", () => {
-    let cancels = 0
-
-    cleanupSpeechCapture({
-      active: () => true,
-      cancel: () => {
-        cancels += 1
-      },
-    })
-
-    expect(cancels).toBe(1)
-  })
-
-  it("does not cancel idle capture on component cleanup", () => {
-    let cancels = 0
-
-    cleanupSpeechCapture({
-      active: () => false,
-      cancel: () => {
-        cancels += 1
-      },
-    })
-
-    expect(cancels).toBe(0)
-  })
-})
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 0298535f8a..1593dadf0c 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -1394,7 +1394,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               <WandSparkles size={16} class={enhancing() ? "enhance-spinner" : ""} />
             </Button>
           </Tooltip>
-          <Show when={canUseSpeech() || speech.active()}>
+          <Show when={canUseSpeech()}>
             <SpeechToTextButton speech={speech} disabled={isDisabled()} start={startSpeech} label={language.t} />
           </Show>
           <Show
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 b62d7cc9ac..5a6d4f056a 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
@@ -3,7 +3,6 @@ import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { onCleanup, type Component } from "solid-js"
 import type { SpeechToText } from "./useSpeechToText"
-import { cleanupSpeechCapture } from "./speech-cleanup"
 
 type Props = {
   speech: SpeechToText
@@ -42,7 +41,9 @@ export const SpeechToTextButton: Component<Props> = (props) => {
     props.start()
   }
 
-  onCleanup(() => cleanupSpeechCapture(props.speech))
+  onCleanup(() => {
+    if (props.speech.active()) props.speech.cancel()
+  })
 
   return (
     <Tooltip value={label()} placement="top">
diff --git a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts b/packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts
deleted file mode 100644
index fa97233f3e..0000000000
--- a/packages/kilo-vscode/webview-ui/src/components/speech-to-text/speech-cleanup.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { SpeechToText } from "./useSpeechToText"
-
-export function cleanupSpeechCapture(speech: Pick<SpeechToText, "active" | "cancel">) {
-  if (speech.active()) speech.cancel()
-}
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index f14577ce02..9b3c279fea 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1738,8 +1738,11 @@ function StepFinishPart(props: { last: boolean; part: StepFinishPart; message: A
   const { theme } = useTheme()
   const info = useContext(RoutedModelMeta.Context)
   const routed = createMemo(() => {
+    if (props.message.providerID !== "kilo") return undefined
+    if (!props.message.modelID.startsWith("kilo-auto/")) return undefined
     const model = props.part.model
-    if (!RoutedModelMeta.routed(model, props.message)) return undefined
+    if (!model) return undefined
+    if (model.providerID === props.message.providerID && model.modelID === props.message.modelID) return undefined
     return RoutedModelMeta.label(ctx.providers(), model)
   })
   const consumed = createMemo(() => info().consumed.has(props.part.id))
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts b/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
index ad1d0b58d9..2b91606c86 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/component/prompt/vim.ts
@@ -299,7 +299,7 @@ function resolveMotion(text: string, pos: number, key: string, count: number, aw
     case "$": {
       let t = pos
       for (let i = 0; i < reps; i++) t = lineEnd(text, lineEnd(text, t) + (i === 0 ? 0 : 1))
-      return { target: Math.max(lineStart(text, t), lineEnd(text, t) - 1), inclusive: true, linewise: false }
+      return { target: lineEnd(text, t), inclusive: true, linewise: false }
     }
     case "G": {
       let target = 0
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx
index 12179aba52..61b964b270 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/routed-model-meta.tsx
@@ -39,10 +39,10 @@ export namespace RoutedModelMeta {
     return KiloRoutedModel.displayName(text)
   }
 
-  export function routed(model: StepFinishPart["model"], message: Message) {
+  function routed(model: StepFinishPart["model"], message: Message) {
     if (!model) return undefined
     if (message.providerID !== "kilo") return undefined
-    if (!KiloRoutedModel.routedSelection(message.modelID)) return undefined
+    if (!message.modelID.startsWith("kilo-auto/")) return undefined
     if (model.providerID === message.providerID && model.modelID === message.modelID) return undefined
     return model
   }
diff --git a/packages/opencode/src/kilocode/session/routed-model.ts b/packages/opencode/src/kilocode/session/routed-model.ts
index ba474dad40..eace803049 100644
--- a/packages/opencode/src/kilocode/session/routed-model.ts
+++ b/packages/opencode/src/kilocode/session/routed-model.ts
@@ -47,15 +47,10 @@ export namespace KiloRoutedModel {
     input: { providerID: ProviderID; modelID: string; selected?: string },
   ) {
     if (input.providerID !== ProviderID.kilo) return undefined
-    if (!routedSelection(input.modelID)) return undefined
+    if (!input.modelID.startsWith("kilo-auto/") && !input.modelID.includes("fable")) return undefined
     const model = read(meta, input.providerID)
     if (!model) return undefined
     if (model.modelID === input.modelID || model.modelID === input.selected) return undefined
     return model
   }
-
-  export function routedSelection(modelID: string) {
-    const id = modelID.trim()
-    return id.startsWith("kilo-auto/") || /(?:^|[/.])claude-fable(?:[-.:/]|$)/.test(id)
-  }
 }
diff --git a/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts b/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts
index 878ffed953..43a2330d61 100644
--- a/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts
+++ b/packages/opencode/test/kilocode/cli/cmd/tui/prompt/vim.test.ts
@@ -199,28 +199,6 @@ describe("vim edits", () => {
     expect(doc.text).toBe("bar baz")
   })
 
-  test("d$ deletes line content without consuming the newline", () => {
-    const doc = new MockDoc("abc\ndef", 0)
-    const state = createVimState("normal")
-    feed(doc, state, "d$")
-    expect(doc.text).toBe("\ndef")
-  })
-
-  test("c$ changes line content without consuming the newline", () => {
-    const doc = new MockDoc("abc\ndef", 0)
-    const state = createVimState("normal")
-    feed(doc, state, "c$")
-    expect(doc.text).toBe("\ndef")
-    expect(state.mode).toBe("insert")
-  })
-
-  test("y$ yanks line content without the newline", () => {
-    const doc = new MockDoc("abc\ndef", 0)
-    const state = createVimState("normal")
-    feed(doc, state, "y$")
-    expect(state.register).toEqual({ text: "abc", linewise: false })
-  })
-
   test("dd deletes the current line", () => {
     const doc = new MockDoc("one\ntwo\nthree", 4)
     const state = createVimState("normal")
diff --git a/packages/opencode/test/kilocode/config/config.test.ts b/packages/opencode/test/kilocode/config/config.test.ts
index b8a41edcc6..467282a346 100644
--- a/packages/opencode/test/kilocode/config/config.test.ts
+++ b/packages/opencode/test/kilocode/config/config.test.ts
@@ -243,51 +243,6 @@ describe("kilocode indexing config", () => {
 })
 
 describe("kilocode sandbox writable paths config", () => {
-  test("honors sandbox_writable_paths from global config", async () => {
-    await using globalTmp = await tmpdir()
-    await using tmp = await tmpdir({ git: true })
-
-    const prev = Global.Path.config
-    ;(Global.Path as { config: string }).config = globalTmp.path
-    await clear()
-    await disposeAllInstances()
-
-    try {
-      await writeConfig(globalTmp.path, {
-        $schema: "https://app.kilo.ai/config.json",
-        experimental: { sandbox_writable_paths: ["/tmp/global"] },
-      })
-
-      await provideTestInstance({
-        directory: tmp.path,
-        fn: async () => {
-          const config = await load()
-          expect(config.experimental?.sandbox_writable_paths).toEqual(["/tmp/global"])
-        },
-      })
-    } finally {
-      ;(Global.Path as { config: string }).config = prev
-      await clear()
-      await disposeAllInstances()
-    }
-  })
-
-  test("drops sandbox_writable_paths from project config", async () => {
-    await using tmp = await tmpdir({ git: true })
-
-    await writeConfig(tmp.path, {
-      experimental: { sandbox_writable_paths: ["/tmp/project"] },
-    })
-
-    await provideTestInstance({
-      directory: tmp.path,
-      fn: async () => {
-        const config = await load()
-        expect(config.experimental?.sandbox_writable_paths).toBeUndefined()
-      },
-    })
-  })
-
   test("honors sandbox_writable_paths from global config only, ignoring project config", async () => {
     await using globalTmp = await tmpdir()
     await using tmp = await tmpdir({ git: true })
diff --git a/packages/opencode/test/kilocode/session-routed-model.test.ts b/packages/opencode/test/kilocode/session-routed-model.test.ts
index de86c5af4b..64981bad90 100644
--- a/packages/opencode/test/kilocode/session-routed-model.test.ts
+++ b/packages/opencode/test/kilocode/session-routed-model.test.ts
@@ -103,7 +103,7 @@ describe("session routed model", () => {
     expect(KiloRoutedModel.displayName("o3")).toBe("o3")
   })
 
-  test("shows compact labels only for routed Kilo selections", () => {
+  test("shows compact labels only for Kilo auto selections", () => {
     const model = { providerID: "openai", modelID: "gpt-5.5" }
     const parts = [reason, finish(model)]
 
@@ -115,13 +115,6 @@ describe("session routed model", () => {
     expect(routed.footer).toBe("gpt-5.5")
     expect(routed.consumed.has("finish")).toBe(true)
 
-    const fable = RoutedModelMeta.info(undefined, parts, false, {
-      providerID: "kilo",
-      modelID: "anthropic/claude-fable-5",
-    })
-    expect(fable.labels.get("reasoning")).toBe("gpt-5.5")
-    expect(fable.footer).toBe("gpt-5.5")
-
     const explicit = RoutedModelMeta.info(undefined, parts, false, {
       providerID: "openai",
       modelID: "gpt-5.5",
@@ -176,7 +169,7 @@ describe("session routed model", () => {
     expect(routed.consumed.has("last")).toBe(false)
   })
 
-  test("reads routed model only for selected Kilo routed models", () => {
+  test("reads routed model only for selected Kilo auto models", () => {
     const meta = { kilocode: { routedModelID: "openai/gpt-5.5-20260423" } }
 
     expect(
@@ -189,22 +182,6 @@ describe("session routed model", () => {
       modelID: ModelID.make("openai/gpt-5.5-20260423"),
     })
 
-    expect(
-      KiloRoutedModel.readAuto(meta, {
-        providerID: ProviderID.kilo,
-        modelID: "anthropic.claude-fable-5",
-      }),
-    ).toEqual({
-      providerID: ProviderID.kilo,
-      modelID: ModelID.make("openai/gpt-5.5-20260423"),
-    })
-
-    expect(
-      KiloRoutedModel.readAuto(meta, {
-        providerID: ProviderID.kilo,
-        modelID: "openai/affable-model",
-      }),
-    ).toBeUndefined()
     expect(
       KiloRoutedModel.readAuto(meta, {
         providerID: ProviderID.kilo,

From 23bba412ff3623a2b69e69cf2af62d8e65451e7f Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 14:29:37 -0400
Subject: [PATCH 66/68] chore: drop speech capture change

---
 packages/kilo-vscode/src/speech-to-text/capture.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kilo-vscode/src/speech-to-text/capture.ts b/packages/kilo-vscode/src/speech-to-text/capture.ts
index 761d01dc59..6250c0822c 100644
--- a/packages/kilo-vscode/src/speech-to-text/capture.ts
+++ b/packages/kilo-vscode/src/speech-to-text/capture.ts
@@ -239,7 +239,6 @@ async function resolveFFmpeg(): Promise<string> {
   if (cached) {
     const bin = await cached
     if (!path.isAbsolute(bin) || existsSync(bin)) return bin
-    if (ffmpeg === cached) ffmpeg = undefined
   }
 
   const task = findFFmpeg()

From 0aa3574b44bf4a030f14adcc12df66cf0b13b894 Mon Sep 17 00:00:00 2001
From: "kilo-maintainer[bot]" <kilo-maintainer[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 18:58:54 +0000
Subject: [PATCH 67/68] release(jetbrains): v7.0.2-rc.2

---
 packages/kilo-jetbrains/CHANGELOG.md      | 17 +++++++++++++++++
 packages/kilo-jetbrains/gradle.properties |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index dd47ea6971..023076fae9 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -152,6 +152,23 @@
 
 ## [Unreleased]
 
+## [7.0.2-rc.2] - 2026-07-07
+
+### Added
+- feat(sandbox): widen writable-paths settings input and add coverage by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12008
+- feat(jetbrains): polish chat UI and bundled CLI runtime flow by @kirillk in https://github.com/Kilo-Org/kilocode/pull/11978
+
+### Fixed
+- fix(vscode): show sandbox tooltip immediately on hover by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12012
+- fix(vscode): preserve mode on first send by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12009
+- fix(vscode): allow shrinking prompt mention selections by @mjnaderi in https://github.com/Kilo-Org/kilocode/pull/11936
+- fix(vscode): handle multiline bidi prompt input by @mjnaderi in https://github.com/Kilo-Org/kilocode/pull/12006
+- fix: honor Kilo cloud account preferences by @markijbema in https://github.com/Kilo-Org/kilocode/pull/11999
+
+### Changed
+- release(jetbrains): v7.0.2-rc.1 by @kilo-maintainer[bot] in https://github.com/Kilo-Org/kilocode/pull/12011
+
+
 ## [7.0.2-rc.1] - 2026-07-07
 
 ### Added
diff --git a/packages/kilo-jetbrains/gradle.properties b/packages/kilo-jetbrains/gradle.properties
index 23aa553936..c93a93d6ea 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.2-rc.1
+kilo.jetbrains.version=7.0.2-rc.2
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m

From af9f15c98c01c3bc591979eea0d729c1946a309b Mon Sep 17 00:00:00 2001
From: Kirill Kalishev <kirillk@kilocode.ai>
Date: Tue, 7 Jul 2026 15:17:28 -0400
Subject: [PATCH 68/68] docs(jetbrains): edit changelog for v7.0.2-rc.2

---
 packages/kilo-jetbrains/CHANGELOG.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index 023076fae9..1a48e5dda1 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -155,19 +155,17 @@
 ## [7.0.2-rc.2] - 2026-07-07
 
 ### Added
-- feat(sandbox): widen writable-paths settings input and add coverage by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12008
-- feat(jetbrains): polish chat UI and bundled CLI runtime flow by @kirillk in https://github.com/Kilo-Org/kilocode/pull/11978
+- Show compact previews for collapsed reasoning blocks so long assistant reasoning stays readable without taking over the transcript.
+- Add clearer Kilo Core runtime information and diagnostics for release download failures.
 
 ### Fixed
-- fix(vscode): show sandbox tooltip immediately on hover by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12012
-- fix(vscode): preserve mode on first send by @marius-kilocode in https://github.com/Kilo-Org/kilocode/pull/12009
-- fix(vscode): allow shrinking prompt mention selections by @mjnaderi in https://github.com/Kilo-Org/kilocode/pull/11936
-- fix(vscode): handle multiline bidi prompt input by @mjnaderi in https://github.com/Kilo-Org/kilocode/pull/12006
-- fix: honor Kilo cloud account preferences by @markijbema in https://github.com/Kilo-Org/kilocode/pull/11999
+- Resolve the CLI executable using the user's shell environment so custom PATH setups work when sessions start from JetBrains.
+- Keep retry and offline status visible in the session footer while preserving transcript context.
+- Prevent oversized header popups by capping preview content.
 
 ### Changed
-- release(jetbrains): v7.0.2-rc.1 by @kilo-maintainer[bot] in https://github.com/Kilo-Org/kilocode/pull/12011
-
+- Download the required Kilo Core release at runtime and prune stale cached runtime binaries automatically.
+- Polish JetBrains chat spacing, prompt input behavior, question/todo layout, history scrolling, code block padding, and session background colors.
 
 ## [7.0.2-rc.1] - 2026-07-07