From 35dd730dcc3c7160d3324eaf42e4c97120004284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Catriel=20M=C3=BCller?= <catrielmuller@gmail.com>
Date: Thu, 11 Jun 2026 23:18:42 -0300
Subject: [PATCH 1/8] feat: kilo console dialogs

---
 .../src/components/ConfirmDialog.tsx          |  22 ++-
 .../src/components/PromptDialog.tsx           |  73 +++++++++
 .../routes/projects/ProjectConsoleRoute.tsx   | 138 ++++++++++++++----
 .../kilo-console/src/styles/providers.css     |  37 ++++-
 4 files changed, 233 insertions(+), 37 deletions(-)
 create mode 100644 packages/kilo-console/src/components/PromptDialog.tsx

diff --git a/packages/kilo-console/src/components/ConfirmDialog.tsx b/packages/kilo-console/src/components/ConfirmDialog.tsx
index 6fba52e63a..2ed84f88b9 100644
--- a/packages/kilo-console/src/components/ConfirmDialog.tsx
+++ b/packages/kilo-console/src/components/ConfirmDialog.tsx
@@ -1,4 +1,4 @@
-import { Show } from "solid-js"
+import { createUniqueId, Show } from "solid-js"
 import { Button } from "@kilocode/kilo-web-ui/button"
 import { Icon } from "@kilocode/kilo-web-ui/icon"
 
@@ -14,21 +14,31 @@ type Props = {
 }
 
 export function ConfirmDialog(props: Props) {
+  const id = createUniqueId()
+  const title = `${id}-title`
+  const message = `${id}-message`
+
   return (
     <Show when={props.open}>
-      <div class="confirm-scrim">
-        <section class="confirm-dialog" role="alertdialog" aria-modal="true" aria-labelledby="confirm-title">
+      <div class="confirm-scrim" onKeyDown={(event) => event.key === "Escape" && props.onCancel()}>
+        <section
+          class="confirm-dialog"
+          role="alertdialog"
+          aria-modal="true"
+          aria-labelledby={title}
+          aria-describedby={props.message ? message : undefined}
+        >
           <div class="confirm-body">
             <div class="confirm-icon" aria-hidden="true">
               <Icon name="warning" />
             </div>
             <div>
-              <h2 id="confirm-title">{props.title}</h2>
-              <Show when={props.message}>{(text) => <p>{text()}</p>}</Show>
+              <h2 id={title}>{props.title}</h2>
+              <Show when={props.message}>{(text) => <p id={message}>{text()}</p>}</Show>
             </div>
           </div>
           <footer class="confirm-actions">
-            <Button variant="ghost" disabled={props.busy} onClick={props.onCancel}>
+            <Button variant="ghost" disabled={props.busy} onClick={props.onCancel} autofocus>
               {props.cancel ?? "Cancel"}
             </Button>
             <Button variant="primary" disabled={props.busy} onClick={props.onConfirm}>
diff --git a/packages/kilo-console/src/components/PromptDialog.tsx b/packages/kilo-console/src/components/PromptDialog.tsx
new file mode 100644
index 0000000000..dc1729e50c
--- /dev/null
+++ b/packages/kilo-console/src/components/PromptDialog.tsx
@@ -0,0 +1,73 @@
+import { Button } from "@kilocode/kilo-web-ui/button"
+import { Input } from "@kilocode/kilo-web-ui/input"
+import { createUniqueId, Show } from "solid-js"
+
+type Props = {
+  open: boolean
+  title: string
+  message?: string
+  label: string
+  value: string
+  placeholder?: string
+  confirm?: string
+  cancel?: string
+  busy?: boolean
+  onInput: (value: string) => void
+  onCancel: () => void
+  onConfirm: () => void
+}
+
+export function PromptDialog(props: Props) {
+  const id = createUniqueId()
+  const title = `${id}-title`
+  const message = `${id}-message`
+  const input = `${id}-input`
+
+  return (
+    <Show when={props.open}>
+      <div class="confirm-scrim" onKeyDown={(event) => event.key === "Escape" && props.onCancel()}>
+        <section
+          class="confirm-dialog prompt-dialog"
+          role="dialog"
+          aria-modal="true"
+          aria-labelledby={title}
+          aria-describedby={props.message ? message : undefined}
+        >
+          <form
+            class="prompt-form"
+            onSubmit={(event) => {
+              event.preventDefault()
+              props.onConfirm()
+            }}
+          >
+            <div class="prompt-body">
+              <div class="prompt-copy">
+                <h2 id={title}>{props.title}</h2>
+                <Show when={props.message}>{(text) => <p id={message}>{text()}</p>}</Show>
+              </div>
+              <label class="prompt-field" for={input}>
+                <span>{props.label}</span>
+                <Input
+                  id={input}
+                  value={props.value}
+                  placeholder={props.placeholder}
+                  disabled={props.busy}
+                  autofocus
+                  onInput={(event) => props.onInput(event.currentTarget.value)}
+                />
+              </label>
+            </div>
+            <footer class="confirm-actions">
+              <Button type="button" variant="ghost" disabled={props.busy} onClick={props.onCancel}>
+                {props.cancel ?? "Cancel"}
+              </Button>
+              <Button type="submit" variant="primary" disabled={props.busy}>
+                {props.confirm ?? "Confirm"}
+              </Button>
+            </footer>
+          </form>
+        </section>
+      </div>
+    </Show>
+  )
+}
diff --git a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
index 7f576e7fb6..3de3088e68 100644
--- a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
+++ b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
@@ -2,7 +2,9 @@ import { A, useLocation, useParams } from "@solidjs/router"
 import { createEffect, createMemo, createResource, createSignal, For, onCleanup, Show } from "solid-js"
 import { Card } from "@kilocode/kilo-web-ui/card"
 import { Icon } from "@kilocode/kilo-web-ui/icon"
+import { ConfirmDialog } from "../../components/ConfirmDialog"
 import { LoadingScreen } from "../../components/LoadingScreen"
+import { PromptDialog } from "../../components/PromptDialog"
 import {
   createProjectPty,
   createProjectWorktree,
@@ -41,6 +43,15 @@ type Context = {
   kind: "local" | "worktree"
 }
 
+type Editor =
+  | { kind: "create"; value: string }
+  | { kind: "rename"; item: Context; value: string }
+
+type Pending = {
+  kind: "delete" | "reset"
+  item: Context
+}
+
 function discoverable(search: URLSearchParams) {
   if (search.get("server")) return false
   return ui.has(window.location.port)
@@ -131,6 +142,8 @@ export function ProjectConsoleRoute() {
   const [unread, setUnread] = createSignal(new Set<string>())
   const [closing, setClosing] = createSignal(new Set<string>())
   const [labelRev, setLabelRev] = createSignal(0)
+  const [editor, setEditor] = createSignal<Editor | undefined>()
+  const [pending, setPending] = createSignal<Pending | undefined>()
   const events = { timer: undefined as number | undefined }
   const project = () => params.project ?? ""
   const query = createMemo<ProjectConsoleQuery | undefined>(() => {
@@ -322,10 +335,26 @@ export function ProjectConsoleRoute() {
   }
 
   function addWorktree() {
+    if (!projectInput()) return
+    setEditor({ kind: "create", value: "" })
+  }
+
+  function submitEditor() {
+    const state = editor()
+    if (!state) return
+    if (state.kind === "rename") {
+      const value = state.value.trim()
+      if (value) window.localStorage.setItem(labelKey(state.item.dir), value)
+      if (!value) window.localStorage.removeItem(labelKey(state.item.dir))
+      setLabelRev((revision) => revision + 1)
+      setEditor(undefined)
+      return
+    }
+
     const input = projectInput()
-    const data = snap()
-    if (!input || !data) return
-    const name = window.prompt("Worktree name") ?? undefined
+    if (!input) return
+    const name = state.value.trim() || undefined
+    setEditor(undefined)
     run("Creating worktree", async () => {
       const next = await createProjectWorktree(input, name)
       setSelected(next.directory)
@@ -395,27 +424,12 @@ export function ProjectConsoleRoute() {
 
   function renameWorktree(item: Context) {
     if (item.kind === "local") return
-    const input = window.prompt("Worktree label", displayLabel(item))
-    if (input === null) return
-    const next = input.trim()
-    if (next) window.localStorage.setItem(labelKey(item.dir), next)
-    else window.localStorage.removeItem(labelKey(item.dir))
-    setLabelRev((value) => value + 1)
+    setEditor({ kind: "rename", item, value: displayLabel(item) })
   }
 
   function removeWorktree(item: Context) {
-    const input = projectInput()
-    if (!input || item.kind === "local") return
-    if (!window.confirm(`Remove worktree ${displayLabel(item)}?`)) return
-    run("Removing worktree", async () => {
-      await removeProjectWorktree(input, item.dir)
-      window.localStorage.removeItem(labelKey(item.dir))
-      setLabelRev((value) => value + 1)
-      if (selected() === item.dir) {
-        setSelected(input.dir)
-        remember(input.dir)
-      }
-    })
+    if (!projectInput() || item.kind === "local") return
+    setPending({ kind: "delete", item })
   }
 
   function removeSelected() {
@@ -425,11 +439,60 @@ export function ProjectConsoleRoute() {
   }
 
   function resetSelected() {
-    const input = projectInput()
     const item = current()
-    if (!input || !item || item.kind === "local") return
-    if (!window.confirm(`Reset worktree ${displayLabel(item)}?`)) return
-    run("Resetting worktree", async () => resetProjectWorktree(input, item.dir))
+    if (!projectInput() || !item || item.kind === "local") return
+    setPending({ kind: "reset", item })
+  }
+
+  function confirmWorktree() {
+    const state = pending()
+    const input = projectInput()
+    if (!state || !input) return
+    setPending(undefined)
+    if (state.kind === "reset") {
+      run("Resetting worktree", async () => resetProjectWorktree(input, state.item.dir))
+      return
+    }
+
+    run("Removing worktree", async () => {
+      await removeProjectWorktree(input, state.item.dir)
+      window.localStorage.removeItem(labelKey(state.item.dir))
+      setLabelRev((revision) => revision + 1)
+      if (selected() === state.item.dir) {
+        setSelected(input.dir)
+        remember(input.dir)
+      }
+    })
+  }
+
+  function updateEditor(value: string) {
+    setEditor((state) => {
+      if (!state) return state
+      return { ...state, value }
+    })
+  }
+
+  function editorTitle() {
+    const state = editor()
+    if (!state || state.kind === "create") return "Create worktree"
+    return `Rename ${displayLabel(state.item)}`
+  }
+
+  function editorMessage() {
+    if (editor()?.kind === "rename") return "Leave the name blank to restore the generated worktree name."
+    return "Choose a recognizable name, or leave it blank to generate one automatically."
+  }
+
+  function pendingTitle() {
+    const state = pending()
+    if (!state) return ""
+    const action = state.kind === "reset" ? "Reset" : "Delete"
+    return `${action} worktree ${displayLabel(state.item)}?`
+  }
+
+  function pendingMessage() {
+    if (pending()?.kind === "reset") return "This discards all uncommitted changes in the worktree."
+    return "This removes the worktree directory and its files from the project."
   }
 
   createEffect(() => {
@@ -744,7 +807,7 @@ export function ProjectConsoleRoute() {
                 Reset
               </button>
               <button type="button" onClick={removeSelected} disabled={!!saving()}>
-                Remove
+                Delete
               </button>
             </div>
           </Show>
@@ -780,6 +843,29 @@ export function ProjectConsoleRoute() {
           <Show when={detail()}>{(item) => <pre class="project-diff-detail">{item()?.patch ?? ""}</pre>}</Show>
         </div>
       </aside>
+
+      <PromptDialog
+        open={Boolean(editor())}
+        title={editorTitle()}
+        message={editorMessage()}
+        label="Worktree name"
+        value={editor()?.value ?? ""}
+        placeholder="feature-name"
+        confirm={editor()?.kind === "rename" ? "Save" : "Create"}
+        busy={Boolean(saving())}
+        onInput={updateEditor}
+        onCancel={() => setEditor(undefined)}
+        onConfirm={submitEditor}
+      />
+      <ConfirmDialog
+        open={Boolean(pending())}
+        title={pendingTitle()}
+        message={pendingMessage()}
+        confirm={pending()?.kind === "reset" ? "Reset" : "Delete"}
+        busy={Boolean(saving())}
+        onCancel={() => setPending(undefined)}
+        onConfirm={confirmWorktree}
+      />
     </section>
   )
 }
diff --git a/packages/kilo-console/src/styles/providers.css b/packages/kilo-console/src/styles/providers.css
index 179400632e..548e16af5f 100644
--- a/packages/kilo-console/src/styles/providers.css
+++ b/packages/kilo-console/src/styles/providers.css
@@ -408,7 +408,7 @@
 }
 
 .kilo-console .confirm-dialog {
-  width: min(48rem, 100%);
+  width: min(28rem, 100%);
   overflow: hidden;
   border: 1px solid var(--border-weak-base);
   border-radius: var(--radius-lg);
@@ -435,16 +435,21 @@
   height: 3rem;
 }
 
-.kilo-console .confirm-body h2 {
+.kilo-console .confirm-body h2,
+.kilo-console .prompt-copy h2 {
   margin: 0;
   color: var(--text-strong);
-  font-size: clamp(1.15rem, 2vw, 1.35rem);
-  line-height: 1.35;
+  font-size: 0.875rem;
+  font-weight: 500;
+  line-height: 1.25rem;
 }
 
-.kilo-console .confirm-body p {
+.kilo-console .confirm-body p,
+.kilo-console .prompt-copy p {
   margin: 0.5rem 0 0;
   color: var(--text-weak);
+  font-size: 0.75rem;
+  line-height: 1.625;
 }
 
 .kilo-console .confirm-actions {
@@ -455,3 +460,25 @@
   background: color-mix(in srgb, var(--background-base) 65%, transparent);
   padding: 1rem;
 }
+
+.kilo-console .prompt-form {
+  margin: 0;
+}
+
+.kilo-console .prompt-body {
+  display: grid;
+  gap: 1rem;
+  padding: 1.5rem;
+}
+
+.kilo-console .prompt-field {
+  display: grid;
+  gap: 0.5rem;
+  color: var(--text-strong);
+  font-size: 0.75rem;
+  font-weight: 500;
+}
+
+.kilo-console .prompt-field input {
+  height: 2rem;
+}

From 9a187d5aad5c3bf90a6dac589a0b26069057c3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Catriel=20M=C3=BCller?= <catrielmuller@gmail.com>
Date: Fri, 12 Jun 2026 01:08:09 -0300
Subject: [PATCH 2/8] feat: improve Kilo Console project review

---
 .changeset/neat-worktree-dialogs.md           |   5 +
 .changeset/resize-console-context.md          |   6 +
 .changeset/rich-worktree-review.md            |   5 +
 packages/kilo-console/src/client.ts           |   5 +-
 packages/kilo-console/src/index.tsx           |   6 +
 .../kilo-console/src/layouts/ConfigLayout.tsx |   7 -
 .../src/routes/config/ConfigSidebar.tsx       |   3 +-
 .../src/routes/config/ConsoleUiRoute.tsx      | 100 +++++++++
 .../src/routes/config/sections.tsx            |  10 +
 .../src/routes/config/state/console.test.ts   |  36 +++
 .../src/routes/config/state/console.ts        |  80 +++++++
 .../routes/projects/ProjectConsoleRoute.tsx   | 209 +++++++++++++-----
 packages/kilo-console/src/styles/cli-ui.css   |  14 ++
 .../src/styles/project-console.css            | 155 +++++++------
 packages/opencode/src/config/config.ts        |  10 +
 .../test/kilocode/config/console-ui.test.ts   |  20 ++
 packages/sdk/js/src/v2/gen/types.gen.ts       |   7 +
 packages/sdk/openapi.json                     |  34 +++
 18 files changed, 587 insertions(+), 125 deletions(-)
 create mode 100644 .changeset/neat-worktree-dialogs.md
 create mode 100644 .changeset/resize-console-context.md
 create mode 100644 .changeset/rich-worktree-review.md
 create mode 100644 packages/kilo-console/src/routes/config/ConsoleUiRoute.tsx
 create mode 100644 packages/kilo-console/src/routes/config/state/console.test.ts
 create mode 100644 packages/kilo-console/src/routes/config/state/console.ts
 create mode 100644 packages/opencode/test/kilocode/config/console-ui.test.ts

diff --git a/.changeset/neat-worktree-dialogs.md b/.changeset/neat-worktree-dialogs.md
new file mode 100644
index 0000000000..b57f336d6b
--- /dev/null
+++ b/.changeset/neat-worktree-dialogs.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-console": patch
+---
+
+Replace native worktree prompts with consistent dialogs for creating, renaming, resetting, and deleting worktrees.
diff --git a/.changeset/resize-console-context.md b/.changeset/resize-console-context.md
new file mode 100644
index 0000000000..bb9dca3f1b
--- /dev/null
+++ b/.changeset/resize-console-context.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/kilo-console": patch
+"@kilocode/cli": patch
+---
+
+Configure the project context sidebar width and default diff layout from Global Settings.
diff --git a/.changeset/rich-worktree-review.md b/.changeset/rich-worktree-review.md
new file mode 100644
index 0000000000..bffd4bb44d
--- /dev/null
+++ b/.changeset/rich-worktree-review.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-console": patch
+---
+
+Review worktree changes in a richer panel with per-file stats and syntax-highlighted diffs.
diff --git a/packages/kilo-console/src/client.ts b/packages/kilo-console/src/client.ts
index 9a3eb36489..adca1648a7 100644
--- a/packages/kilo-console/src/client.ts
+++ b/packages/kilo-console/src/client.ts
@@ -52,6 +52,7 @@ export type ProjectConsoleQuery = ProjectQuery & {
 
 export type ProjectConsoleSnapshot = {
   project: ProjectItem
+  config: EffectiveConfig
   vcs: VcsInfo
   worktrees: string[]
   terminals: ProjectTerminalItem[]
@@ -439,7 +440,8 @@ export async function loadProjectConsole(input: ProjectConsoleQuery): Promise<Pr
   const project = await resolved(input)
   const query = { url: input.url, dir: project.worktree }
   const sdk = client(query)
-  const [vcs, worktrees] = await Promise.all([
+  const [config, vcs, worktrees] = await Promise.all([
+    sdk.config.overlay({ scope: "global" }),
     sdk.vcs.get({ directory: query.dir }),
     sdk.worktree.list({ directory: query.dir }),
   ])
@@ -450,6 +452,7 @@ export async function loadProjectConsole(input: ProjectConsoleQuery): Promise<Pr
 
   return {
     project,
+    config: demand("Config", config).effective,
     vcs: demand("VCS", vcs),
     worktrees: dirs,
     terminals: terminals.flat(),
diff --git a/packages/kilo-console/src/index.tsx b/packages/kilo-console/src/index.tsx
index 786f9c9cad..5b177c417a 100644
--- a/packages/kilo-console/src/index.tsx
+++ b/packages/kilo-console/src/index.tsx
@@ -14,6 +14,12 @@ if (!root) throw new Error("Missing root element")
 
 const base = import.meta.env.BASE_URL.replace(/\/$/, "")
 
+// Register the "Kilo" Pierre/shiki theme required by the diff review components
+// (Code/SessionReview). Without it the diff worker throws "resolveTheme: No valid
+// loader for Kilo" when a file is expanded. Loaded out-of-band so katex/marked stay
+// out of the initial bundle; it resolves long before a diff can be opened.
+void import("@opencode-ai/ui/context/marked")
+
 function routes() {
   return configSections.map((item) => <Route path={item.path} component={item.component} />)
 }
diff --git a/packages/kilo-console/src/layouts/ConfigLayout.tsx b/packages/kilo-console/src/layouts/ConfigLayout.tsx
index 8f779b9328..be9be5043e 100644
--- a/packages/kilo-console/src/layouts/ConfigLayout.tsx
+++ b/packages/kilo-console/src/layouts/ConfigLayout.tsx
@@ -30,13 +30,6 @@ function ConfigContent(props: { children?: JSX.Element }) {
             </Card>
           )}
         </Show>
-        <Show when={ctx.saving()}>
-          {(item) => (
-            <Card class="banner" variant="info">
-              {item()}...
-            </Card>
-          )}
-        </Show>
         <Show when={ctx.data.error}>
           <Card class="banner" variant="error">
             <strong>Dashboard request failed</strong>
diff --git a/packages/kilo-console/src/routes/config/ConfigSidebar.tsx b/packages/kilo-console/src/routes/config/ConfigSidebar.tsx
index 0a3a9c31ce..c6a282ec59 100644
--- a/packages/kilo-console/src/routes/config/ConfigSidebar.tsx
+++ b/packages/kilo-console/src/routes/config/ConfigSidebar.tsx
@@ -32,6 +32,7 @@ export function ConfigSidebar() {
   const href = (path: string) => `${path === "/" ? base() : `${base()}${path}`}${loc.search}`
   const current = (path: string) => path === active() || (path !== "/" && active().startsWith(`${path}/`))
   const group = (item: ConfigNode): item is ConfigGroup => "items" in item
+  const navigation = createMemo(() => configNav.filter((item) => !project() || !group(item) || !item.globalOnly))
 
   return (
     <aside class="config-sidebar" aria-label="Configuration sections">
@@ -42,7 +43,7 @@ export function ConfigSidebar() {
         </span>
       </div>
       <nav class="config-options">
-        <For each={configNav}>
+        <For each={navigation()}>
           {(item) => {
             if (!group(item)) {
               return (
diff --git a/packages/kilo-console/src/routes/config/ConsoleUiRoute.tsx b/packages/kilo-console/src/routes/config/ConsoleUiRoute.tsx
new file mode 100644
index 0000000000..d972686f7c
--- /dev/null
+++ b/packages/kilo-console/src/routes/config/ConsoleUiRoute.tsx
@@ -0,0 +1,100 @@
+import { Show } from "solid-js"
+import { Button } from "@kilocode/kilo-web-ui/button"
+import { Card } from "@kilocode/kilo-web-ui/card"
+import { Spinner } from "@kilocode/kilo-web-ui/spinner"
+import { CustomSelect, type SelectOption } from "../../components/CustomSelect"
+import { ConfigPage } from "./ConfigPage"
+import {
+  MAX_CONTEXT_SIDEBAR_WIDTH,
+  MIN_CONTEXT_SIDEBAR_WIDTH,
+  type ConsoleDiffStyle,
+  useConsoleUiSettings,
+} from "./state/console"
+
+const styles = [
+  { value: "unified", label: "Unified" },
+  { value: "split", label: "Split" },
+] satisfies SelectOption<ConsoleDiffStyle>[]
+
+export function ConsoleUiRoute() {
+  const state = useConsoleUiSettings()
+
+  return (
+    <ConfigPage
+      title="Console UI"
+      description="Configure the local Kilo Console interface. These preferences are saved in your user config."
+      actions={
+        <>
+          <Show when={state.configured()}>
+            <Button variant="secondary" disabled={Boolean(state.ctx.saving())} onClick={state.reset}>
+              Use default
+            </Button>
+          </Show>
+          <Button
+            variant="primary"
+            disabled={Boolean(state.ctx.saving()) || !state.dirty()}
+            aria-busy={Boolean(state.ctx.saving())}
+            onClick={state.save}
+          >
+            <Show when={state.ctx.saving()}>
+              <Spinner />
+            </Show>
+            Save
+          </Button>
+        </>
+      }
+    >
+      <div class="ui-settings">
+        <Card class="ui-card" padding={0}>
+          <header class="ui-card-header">
+            <div>
+              <h2>Project context sidebar</h2>
+              <p>Set the default width used by the Context and Changes panel in project consoles.</p>
+            </div>
+          </header>
+          <div class="ui-form">
+            <label class="ui-field">
+              <span>Sidebar width</span>
+              <input
+                type="number"
+                min={MIN_CONTEXT_SIDEBAR_WIDTH}
+                max={MAX_CONTEXT_SIDEBAR_WIDTH}
+                step="1"
+                value={state.width()}
+                onInput={(event) => state.setWidth(event.currentTarget.value)}
+              />
+              <small>
+                Width in pixels, between {MIN_CONTEXT_SIDEBAR_WIDTH} and {MAX_CONTEXT_SIDEBAR_WIDTH}. You can also
+                resize the sidebar by dragging its left edge.
+              </small>
+            </label>
+          </div>
+        </Card>
+        <Card class="ui-card" padding={0}>
+          <header class="ui-card-header">
+            <div>
+              <h2>Diff review</h2>
+              <p>Choose the default layout used when reviewing changed files in project consoles.</p>
+            </div>
+          </header>
+          <div class="ui-form">
+            <div class="ui-field">
+              <span>Diff layout</span>
+              <CustomSelect
+                class="console-diff-select"
+                label="Diff layout"
+                value={state.style()}
+                options={styles}
+                disabled={Boolean(state.ctx.saving())}
+                onSelect={state.setStyle}
+              />
+              <small>
+                Unified shows changes in one column. Split shows the original and modified file side by side.
+              </small>
+            </div>
+          </div>
+        </Card>
+      </div>
+    </ConfigPage>
+  )
+}
diff --git a/packages/kilo-console/src/routes/config/sections.tsx b/packages/kilo-console/src/routes/config/sections.tsx
index 4d7ce6547b..c2f4139066 100644
--- a/packages/kilo-console/src/routes/config/sections.tsx
+++ b/packages/kilo-console/src/routes/config/sections.tsx
@@ -3,6 +3,7 @@ import type { IconProps } from "@kilocode/kilo-web-ui/icon"
 import { AgentBuilderRoute, AgentsRoute } from "./AgentsRoute"
 import { CliNotificationsRoute } from "./CliNotificationsRoute"
 import { CliUiRoute } from "./CliUiRoute"
+import { ConsoleUiRoute } from "./ConsoleUiRoute"
 import { FormattersRoute, LspRoute } from "./FormattersRoute"
 import { IndexingRoute } from "./IndexingRoute"
 import { KeybindsRoute } from "./KeybindsRoute"
@@ -26,6 +27,7 @@ export type ConfigSection = {
 export type ConfigGroup = {
   id: string
   label: string
+  globalOnly?: boolean
   items: ConfigSection[]
 }
 
@@ -130,6 +132,14 @@ export const configNav: ConfigNode[] = [
       },
     ],
   },
+  {
+    id: "console",
+    label: "Console",
+    globalOnly: true,
+    items: [
+      { path: "/console/ui", href: "/settings/console/ui", icon: "sliders", label: "UI", component: ConsoleUiRoute },
+    ],
+  },
   {
     id: "advanced",
     label: "Advanced",
diff --git a/packages/kilo-console/src/routes/config/state/console.test.ts b/packages/kilo-console/src/routes/config/state/console.test.ts
new file mode 100644
index 0000000000..98ae950f3a
--- /dev/null
+++ b/packages/kilo-console/src/routes/config/state/console.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, test } from "bun:test"
+import {
+  DEFAULT_CONTEXT_SIDEBAR_WIDTH,
+  MAX_CONTEXT_SIDEBAR_WIDTH,
+  MIN_CONTEXT_SIDEBAR_WIDTH,
+  normalizeConsoleDiffStyle,
+  normalizeContextSidebarWidth,
+  parseContextSidebarWidth,
+} from "./console"
+
+describe("console UI config state", () => {
+  test("defaults the diff layout to unified", () => {
+    expect(normalizeConsoleDiffStyle(undefined)).toBe("unified")
+    expect(normalizeConsoleDiffStyle("unified")).toBe("unified")
+    expect(normalizeConsoleDiffStyle("split")).toBe("split")
+    expect(normalizeConsoleDiffStyle("side-by-side")).toBe("unified")
+  })
+
+  test("normalizes missing and out-of-range widths", () => {
+    expect(normalizeContextSidebarWidth(undefined)).toBe(DEFAULT_CONTEXT_SIDEBAR_WIDTH)
+    expect(normalizeContextSidebarWidth(Number.NaN)).toBe(DEFAULT_CONTEXT_SIDEBAR_WIDTH)
+    expect(normalizeContextSidebarWidth(100)).toBe(MIN_CONTEXT_SIDEBAR_WIDTH)
+    expect(normalizeContextSidebarWidth(900)).toBe(MAX_CONTEXT_SIDEBAR_WIDTH)
+    expect(normalizeContextSidebarWidth(411.6)).toBe(412)
+  })
+
+  test("accepts only integer widths within the supported range", () => {
+    expect(parseContextSidebarWidth("352")).toBe(352)
+    expect(parseContextSidebarWidth(String(MIN_CONTEXT_SIDEBAR_WIDTH))).toBe(MIN_CONTEXT_SIDEBAR_WIDTH)
+    expect(parseContextSidebarWidth(String(MAX_CONTEXT_SIDEBAR_WIDTH))).toBe(MAX_CONTEXT_SIDEBAR_WIDTH)
+    expect(parseContextSidebarWidth("249")).toBeUndefined()
+    expect(parseContextSidebarWidth("801")).toBeUndefined()
+    expect(parseContextSidebarWidth("352.5")).toBeUndefined()
+    expect(parseContextSidebarWidth("wide")).toBeUndefined()
+  })
+})
diff --git a/packages/kilo-console/src/routes/config/state/console.ts b/packages/kilo-console/src/routes/config/state/console.ts
new file mode 100644
index 0000000000..8393a7c7ac
--- /dev/null
+++ b/packages/kilo-console/src/routes/config/state/console.ts
@@ -0,0 +1,80 @@
+import { createEffect, createSignal } from "solid-js"
+import { useConfig } from "../../../context/config"
+
+export const DEFAULT_CONTEXT_SIDEBAR_WIDTH = 300
+export const MIN_CONTEXT_SIDEBAR_WIDTH = 250
+export const MAX_CONTEXT_SIDEBAR_WIDTH = 800
+export const DEFAULT_CONSOLE_DIFF_STYLE = "unified" as const
+export type ConsoleDiffStyle = "unified" | "split"
+
+export function normalizeConsoleDiffStyle(value: unknown): ConsoleDiffStyle {
+  return value === "split" ? "split" : DEFAULT_CONSOLE_DIFF_STYLE
+}
+
+export function normalizeContextSidebarWidth(value: unknown) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return DEFAULT_CONTEXT_SIDEBAR_WIDTH
+  return Math.min(MAX_CONTEXT_SIDEBAR_WIDTH, Math.max(MIN_CONTEXT_SIDEBAR_WIDTH, Math.round(value)))
+}
+
+export function parseContextSidebarWidth(value: string) {
+  const width = Number(value)
+  if (!Number.isInteger(width)) return undefined
+  if (width < MIN_CONTEXT_SIDEBAR_WIDTH || width > MAX_CONTEXT_SIDEBAR_WIDTH) return undefined
+  return width
+}
+
+export function useConsoleUiSettings() {
+  const ctx = useConfig()
+  const [width, setWidth] = createSignal(String(DEFAULT_CONTEXT_SIDEBAR_WIDTH))
+  const [style, setStyle] = createSignal<ConsoleDiffStyle>(DEFAULT_CONSOLE_DIFF_STYLE)
+  const [dirty, setDirty] = createSignal(false)
+
+  createEffect(() => {
+    if (dirty()) return
+    const config = ctx.data()?.effective.console
+    setWidth(String(normalizeContextSidebarWidth(config?.context_sidebar_width)))
+    setStyle(normalizeConsoleDiffStyle(config?.diff_style))
+  })
+
+  function save() {
+    const value = parseContextSidebarWidth(width())
+    if (value === undefined) {
+      ctx.fail(`Enter a sidebar width between ${MIN_CONTEXT_SIDEBAR_WIDTH} and ${MAX_CONTEXT_SIDEBAR_WIDTH} pixels.`)
+      return
+    }
+    ctx.patch({ console: { context_sidebar_width: value, diff_style: style() } })
+    setWidth(String(value))
+    setDirty(false)
+  }
+
+  function reset() {
+    ctx.unset([
+      ["console", "context_sidebar_width"],
+      ["console", "diff_style"],
+    ])
+    setWidth(String(DEFAULT_CONTEXT_SIDEBAR_WIDTH))
+    setStyle(DEFAULT_CONSOLE_DIFF_STYLE)
+    setDirty(false)
+  }
+
+  return {
+    ctx,
+    width,
+    setWidth: (value: string) => {
+      setWidth(value)
+      setDirty(true)
+    },
+    style,
+    setStyle: (value: string) => {
+      setStyle(normalizeConsoleDiffStyle(value))
+      setDirty(true)
+    },
+    dirty,
+    configured: () => {
+      const config = ctx.data()?.effective.console
+      return config?.context_sidebar_width !== undefined || config?.diff_style !== undefined
+    },
+    save,
+    reset,
+  }
+}
diff --git a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
index 3de3088e68..ca2bc78457 100644
--- a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
+++ b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
@@ -1,7 +1,14 @@
 import { A, useLocation, useParams } from "@solidjs/router"
-import { createEffect, createMemo, createResource, createSignal, For, onCleanup, Show } from "solid-js"
+import { createEffect, createMemo, createResource, createSignal, For, on, onCleanup, Show } from "solid-js"
+import { Badge } from "@kilocode/kilo-web-ui/badge"
+import { Button } from "@kilocode/kilo-web-ui/button"
 import { Card } from "@kilocode/kilo-web-ui/card"
 import { Icon } from "@kilocode/kilo-web-ui/icon"
+import { ResizeHandle } from "@kilocode/kilo-web-ui/resize-handle"
+import { Spinner } from "@kilocode/kilo-web-ui/spinner"
+import { File } from "@opencode-ai/ui/file"
+import { FileComponentProvider } from "@opencode-ai/ui/context/file"
+import { SessionReview, type SessionReviewDiffStyle } from "@opencode-ai/ui/session-review"
 import { ConfirmDialog } from "../../components/ConfirmDialog"
 import { LoadingScreen } from "../../components/LoadingScreen"
 import { PromptDialog } from "../../components/PromptDialog"
@@ -14,6 +21,7 @@ import {
   loadProjectConsole,
   loadProjectDiff,
   loadProjectDiffFile,
+  patchConfig,
   removeProjectPty,
   removeProjectWorktree,
   resetProjectWorktree,
@@ -23,6 +31,7 @@ import {
   viewProjectSessions,
   type ProjectConsoleEvent,
   type ProjectConsoleQuery,
+  type ProjectDiffItem,
   type ProjectTerminalItem,
   type Query,
 } from "../../client"
@@ -32,6 +41,14 @@ import {
   clearUnread as storeClearUnread,
   sessionHasUnread,
 } from "../../shared/terminal-status"
+import {
+  DEFAULT_CONSOLE_DIFF_STYLE,
+  DEFAULT_CONTEXT_SIDEBAR_WIDTH,
+  MAX_CONTEXT_SIDEBAR_WIDTH,
+  MIN_CONTEXT_SIDEBAR_WIDTH,
+  normalizeConsoleDiffStyle,
+  normalizeContextSidebarWidth,
+} from "../config/state/console"
 import { GhosttyTerminal } from "./terminal/GhosttyTerminal"
 
 const ui = new Set(["3017", "3018"])
@@ -43,9 +60,7 @@ type Context = {
   kind: "local" | "worktree"
 }
 
-type Editor =
-  | { kind: "create"; value: string }
-  | { kind: "rename"; item: Context; value: string }
+type Editor = { kind: "create"; value: string } | { kind: "rename"; item: Context; value: string }
 
 type Pending = {
   kind: "delete" | "reset"
@@ -136,7 +151,11 @@ export function ProjectConsoleRoute() {
   const [selected, setSelected] = createSignal(window.localStorage.getItem(`kilo.console.${params.project}.dir`) ?? "")
   const [active, setActive] = createSignal(window.localStorage.getItem(`kilo.console.${params.project}.pty`) ?? "")
   const [local, setLocal] = createSignal<ProjectTerminalItem[]>([])
-  const [file, setFile] = createSignal<string | undefined>()
+  const [openFiles, setOpenFiles] = createSignal<string[]>([])
+  const [details, setDetails] = createSignal<Record<string, ProjectDiffItem>>({})
+  const [infoWidth, setInfoWidth] = createSignal(DEFAULT_CONTEXT_SIDEBAR_WIDTH)
+  const [viewport, setViewport] = createSignal(window.innerWidth)
+  const [diffStyle, setDiffStyle] = createSignal<SessionReviewDiffStyle>(DEFAULT_CONSOLE_DIFF_STYLE)
   const [saving, setSaving] = createSignal<string | undefined>()
   const [failure, setFailure] = createSignal<string | undefined>()
   const [unread, setUnread] = createSignal(new Set<string>())
@@ -145,6 +164,8 @@ export function ProjectConsoleRoute() {
   const [editor, setEditor] = createSignal<Editor | undefined>()
   const [pending, setPending] = createSignal<Pending | undefined>()
   const events = { timer: undefined as number | undefined }
+  const resize = { timer: undefined as number | undefined, pending: false }
+  const detailPending = new Set<string>()
   const project = () => params.project ?? ""
   const query = createMemo<ProjectConsoleQuery | undefined>(() => {
     const target = clean(url()) || fallback()
@@ -152,6 +173,7 @@ export function ProjectConsoleRoute() {
     return { url: target, dir: "", project: project() }
   })
   const [snap, { refetch }] = createResource(query, loadProjectConsole)
+  const visibleInfoWidth = createMemo(() => Math.min(infoWidth(), maxInfoWidth()))
 
   const contexts = createMemo<Context[]>(() => {
     const data = snap()
@@ -198,11 +220,13 @@ export function ProjectConsoleRoute() {
     return { input: item, dir: item.dir }
   })
   const [diffs] = createResource(diffKey, (item) => loadProjectDiff(item.input, item.dir))
-  const detailKey = createMemo(() => {
-    const item = target()
-    const path = file()
-    if (!item || !path) return undefined
-    return { input: item, dir: item.dir, file: path }
+  // Diff summary items carry no content (patch/before/after empty); overlay full file
+  // diffs as they load so the review renders syntax-highlighted changes per file.
+  const reviewDiffs = createMemo<ProjectDiffItem[]>(() => {
+    const map = details()
+    return (diffs() ?? [])
+      .filter((item): item is ProjectDiffItem & { file: string } => typeof item.file === "string")
+      .map((item) => map[item.file] ?? item)
   })
   const terminal = createMemo(() => {
     const item = activeTerminal()
@@ -218,7 +242,6 @@ export function ProjectConsoleRoute() {
     return items
   })
   const terminalKeys = createMemo(() => Array.from(terminalMap().keys()))
-  const [detail] = createResource(detailKey, (item) => loadProjectDiffFile(item.input, item.dir, item.file))
   const settings = createMemo(() => {
     const q = search().toString()
     return `/projects/${encodeURIComponent(project())}/settings${q ? `?${q}` : ""}`
@@ -313,18 +336,67 @@ export function ProjectConsoleRoute() {
     setSelected(item.dir)
     const pty = terminalsFor(item.dir)[0]
     setActive(pty?.id ?? "")
-    setFile(undefined)
     remember(item.dir, pty?.id)
   }
 
   function selectTerminal(item: ProjectTerminalItem) {
     setSelected(item.directory)
     setActive(item.id)
-    setFile(undefined)
     clearUnread(item)
     remember(item.directory, item.id)
   }
 
+  function fetchDetail(path: string) {
+    const base = target()
+    if (!base) return
+    if (details()[path] || detailPending.has(path)) return
+    detailPending.add(path)
+    void loadProjectDiffFile(base, base.dir, path)
+      .then((item) => {
+        if (item && item.file) setDetails((prev) => ({ ...prev, [item.file!]: item }))
+      })
+      .catch((err) => console.warn("Worktree diff file:", err))
+      .finally(() => detailPending.delete(path))
+  }
+
+  function openReviewFiles(next: string[]) {
+    setOpenFiles(next)
+    for (const path of next) fetchDetail(path)
+  }
+
+  function changeDiffStyle(style: SessionReviewDiffStyle) {
+    setDiffStyle(style)
+    const base = query()
+    if (!base) return
+    void patchConfig({ url: base.url, dir: "", scope: "global" }, { console: { diff_style: style } }).catch((err) =>
+      console.warn(`Console diff style: ${errMsg(err)}`),
+    )
+  }
+
+  function resizeInfo(value: number) {
+    const width = normalizeContextSidebarWidth(value)
+    setInfoWidth(width)
+    resize.pending = true
+    if (resize.timer) window.clearTimeout(resize.timer)
+    resize.timer = window.setTimeout(() => {
+      resize.timer = undefined
+      const base = query()
+      if (!base) {
+        resize.pending = false
+        return
+      }
+      void patchConfig({ url: base.url, dir: "", scope: "global" }, { console: { context_sidebar_width: width } })
+        .catch((err) => console.warn(`Console sidebar width: ${errMsg(err)}`))
+        .finally(() => {
+          resize.pending = false
+        })
+    }, 350)
+  }
+
+  function maxInfoWidth() {
+    return Math.max(MIN_CONTEXT_SIDEBAR_WIDTH, Math.min(MAX_CONTEXT_SIDEBAR_WIDTH, viewport() - 604))
+  }
+
   function run(label: string, job: () => Promise<unknown>) {
     setSaving(label)
     setFailure(undefined)
@@ -495,11 +567,32 @@ export function ProjectConsoleRoute() {
     return "This removes the worktree directory and its files from the project."
   }
 
+  createEffect(() => {
+    const data = snap()
+    if (!data) return
+    if (!resize.pending) setInfoWidth(normalizeContextSidebarWidth(data.config.console?.context_sidebar_width))
+    setDiffStyle(normalizeConsoleDiffStyle(data.config.console?.diff_style))
+  })
+
   createEffect(() => {
     const next = search().get("server")
     if (next && next !== url()) setUrl(next)
   })
 
+  // Reset review state when the selected worktree changes so one worktree's
+  // file contents never leak into another.
+  createEffect(
+    on(
+      () => target()?.dir,
+      () => {
+        setOpenFiles([])
+        setDetails({})
+        detailPending.clear()
+      },
+      { defer: true },
+    ),
+  )
+
   createEffect(() => {
     if (!discoverable(search())) return
     void resolveServer().then((value) => {
@@ -570,8 +663,12 @@ export function ProjectConsoleRoute() {
     onCleanup(stop)
   })
 
+  const updateViewport = () => setViewport(window.innerWidth)
+  window.addEventListener("resize", updateViewport)
+
   onCleanup(() => {
     if (events.timer) window.clearTimeout(events.timer)
+    window.removeEventListener("resize", updateViewport)
   })
 
   createEffect(() => {
@@ -588,7 +685,7 @@ export function ProjectConsoleRoute() {
   })
 
   return (
-    <section class="project-console">
+    <section class="project-console" style={`--project-info-width: ${visibleInfoWidth()}px`}>
       <aside class="project-console-sidebar" aria-label="Project console sections">
         <div class="project-console-title">
           <span class="project-console-heading">
@@ -797,50 +894,62 @@ export function ProjectConsoleRoute() {
       </main>
 
       <aside class="project-console-info" aria-label="Project details">
-        <div class="project-info-card">
-          <div class="project-panel-heading">Context</div>
-          <strong>{currentLabel()}</strong>
-          <code>{current()?.dir ?? snap()?.project.worktree ?? project()}</code>
+        <ResizeHandle
+          direction="horizontal"
+          edge="start"
+          size={visibleInfoWidth()}
+          min={MIN_CONTEXT_SIDEBAR_WIDTH}
+          max={maxInfoWidth()}
+          aria-label="Resize project context sidebar"
+          onResize={resizeInfo}
+        />
+        <div class="project-info-card project-info-context">
+          <div class="project-info-context-head">
+            <span class="project-panel-heading">Context</span>
+            <Badge variant="outline">{current()?.kind === "worktree" ? "Worktree" : "Local"}</Badge>
+          </div>
+          <strong class="project-info-title">{currentLabel()}</strong>
+          <code class="project-info-path" title={current()?.dir}>
+            {current()?.dir ?? snap()?.project.worktree ?? project()}
+          </code>
           <Show when={current()?.kind === "worktree"}>
             <div class="project-info-actions">
-              <button type="button" onClick={resetSelected} disabled={!!saving()}>
+              <Button variant="secondary" size="small" onClick={resetSelected} disabled={!!saving()}>
                 Reset
-              </button>
-              <button type="button" onClick={removeSelected} disabled={!!saving()}>
+              </Button>
+              <Button variant="destructive" size="small" onClick={removeSelected} disabled={!!saving()}>
                 Delete
-              </button>
+              </Button>
             </div>
           </Show>
         </div>
-        <div class="project-info-card grow">
-          <div class="project-panel-heading">Changes</div>
-          <Show when={diffs.loading && !diffs()}>
-            <p class="empty">Loading diff...</p>
+        <div class="project-info-review">
+          <Show
+            when={!diffs.error}
+            fallback={<div class="project-review-state project-review-state-error">{errMsg(diffs.error)}</div>}
+          >
+            <Show
+              when={!(diffs.loading && !diffs())}
+              fallback={
+                <div class="project-review-state">
+                  <Spinner />
+                  <span>Loading changes…</span>
+                </div>
+              }
+            >
+              <FileComponentProvider component={File}>
+                <SessionReview
+                  diffs={reviewDiffs()}
+                  title={<span>Changes</span>}
+                  diffStyle={diffStyle()}
+                  onDiffStyleChange={changeDiffStyle}
+                  open={openFiles()}
+                  onOpenChange={openReviewFiles}
+                  empty={<div class="project-review-empty">No changes detected.</div>}
+                />
+              </FileComponentProvider>
+            </Show>
           </Show>
-          <Show when={diffs.error}>
-            <p class="empty">{errMsg(diffs.error)}</p>
-          </Show>
-          <Show when={!diffs.loading && (diffs() ?? []).length === 0 && !diffs.error}>
-            <p class="empty">No changes detected.</p>
-          </Show>
-          <div class="project-diff-list">
-            <For each={diffs() ?? []}>
-              {(item) => (
-                <button
-                  type="button"
-                  class="project-diff-row"
-                  classList={{ active: file() === item.file }}
-                  onClick={() => setFile(item.file)}
-                >
-                  <span>{item.file}</span>
-                  <small>
-                    +{item.additions} -{item.deletions}
-                  </small>
-                </button>
-              )}
-            </For>
-          </div>
-          <Show when={detail()}>{(item) => <pre class="project-diff-detail">{item()?.patch ?? ""}</pre>}</Show>
         </div>
       </aside>
 
diff --git a/packages/kilo-console/src/styles/cli-ui.css b/packages/kilo-console/src/styles/cli-ui.css
index 307e0303ac..89c066f803 100644
--- a/packages/kilo-console/src/styles/cli-ui.css
+++ b/packages/kilo-console/src/styles/cli-ui.css
@@ -8,6 +8,20 @@
   background: var(--card);
 }
 
+.kilo-console .ui-card:has(.console-diff-select[open]) {
+  position: relative;
+  z-index: 40;
+  overflow: visible;
+}
+
+.kilo-console .console-diff-select[open] {
+  z-index: 41;
+}
+
+.kilo-console .console-diff-select .models-select-menu {
+  z-index: 42;
+}
+
 .kilo-console .ui-card-header,
 .kilo-console .ui-card-footer {
   display: flex;
diff --git a/packages/kilo-console/src/styles/project-console.css b/packages/kilo-console/src/styles/project-console.css
index ba0d84c26a..d03486b018 100644
--- a/packages/kilo-console/src/styles/project-console.css
+++ b/packages/kilo-console/src/styles/project-console.css
@@ -1,6 +1,8 @@
 .kilo-console .project-console {
   display: grid;
-  grid-template-columns: 13.75rem minmax(24rem, 1fr) minmax(16rem, 22rem);
+  grid-template-columns:
+    13.75rem minmax(24rem, 1fr)
+    clamp(250px, var(--project-info-width, 300px), min(800px, calc(100vw - 37.75rem)));
   height: 100%;
   min-height: 0;
   overflow: hidden;
@@ -280,8 +282,7 @@
 
 .kilo-console .project-context span,
 .kilo-console .project-terminal-row span,
-.kilo-console .project-settings-link span,
-.kilo-console .project-diff-row span {
+.kilo-console .project-settings-link span {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -340,14 +341,6 @@
   color: var(--foreground) !important;
 }
 
-.kilo-console .project-diff-row small {
-  overflow: hidden;
-  color: var(--muted-foreground);
-  font-size: 0.6875rem;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .kilo-console .project-sidebar-bottom {
   flex: 0 0 auto;
   border-top: 1px solid var(--border);
@@ -460,27 +453,40 @@
   display: flex;
   flex-direction: column;
   gap: 0.75rem;
+  position: relative;
   overflow: hidden;
   border-left: 1px solid var(--border);
   background: var(--background);
-  padding: clamp(1rem, 2.4vw, 2rem) clamp(0.875rem, 1.8vw, 1.25rem);
+  padding: 0.875rem;
+}
+
+.kilo-console .project-console-info > [data-component="resize-handle"]::after {
+  background: var(--ring);
 }
 
 .kilo-console .project-info-card {
   display: grid;
-  gap: 0.625rem;
-  min-height: 0;
+  gap: 0.5rem;
+  flex: 0 0 auto;
   border: 1px solid var(--border);
   border-radius: var(--radius-md);
-  background: color-mix(in oklab, var(--muted) 30%, transparent);
+  background: var(--card);
   padding: 0.75rem;
 }
 
-.kilo-console .project-info-card.grow {
-  overflow: auto;
+.kilo-console .project-info-context-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.5rem;
 }
 
-.kilo-console .project-info-card strong {
+.kilo-console .project-info-context-head .project-panel-heading {
+  min-height: 0;
+  padding: 0;
+}
+
+.kilo-console .project-info-title {
   overflow: hidden;
   color: var(--foreground);
   font-size: 0.875rem;
@@ -489,7 +495,7 @@
   white-space: nowrap;
 }
 
-.kilo-console .project-info-card code {
+.kilo-console .project-info-path {
   overflow: hidden;
   color: var(--muted-foreground);
   font-family: var(--font-family-mono, monospace);
@@ -502,64 +508,81 @@
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 0.5rem;
+  margin-top: 0.125rem;
 }
 
-.kilo-console .project-info-actions button,
-.kilo-console .project-diff-row {
+.kilo-console .project-info-actions [data-component="button"] {
+  width: 100%;
+}
+
+/* Rich review panel — fills remaining height; SessionReview scrolls internally. */
+.kilo-console .project-info-review {
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+  min-height: 0;
+  overflow: hidden;
   border: 1px solid var(--border);
   border-radius: var(--radius-md);
-  background: var(--input-base);
-  color: var(--foreground);
-  cursor: pointer;
-  font: inherit;
-  padding: 0.5rem 0.625rem;
-  text-align: left;
+  background: var(--card);
 }
 
-.kilo-console .project-info-actions button:hover,
-.kilo-console .project-info-actions button:focus-visible,
-.kilo-console .project-diff-row:hover,
-.kilo-console .project-diff-row:focus-visible,
-.kilo-console .project-diff-row.active {
-  border-color: var(--ring);
-  outline: 0;
+.kilo-console .project-info-review [data-component="session-review"] {
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+  min-height: 0;
+  height: 100%;
 }
 
-.kilo-console .project-info-actions button:disabled {
-  cursor: not-allowed;
-  opacity: 0.55;
-}
-
-.kilo-console .project-diff-list {
-  display: grid;
-  gap: 0.375rem;
-}
-
-.kilo-console .project-diff-row {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) auto;
-  align-items: center;
-  gap: 0.125rem;
-}
-
-.kilo-console .project-diff-row.active {
-  background: color-mix(in oklab, var(--muted) 55%, transparent);
-}
-
-.kilo-console .project-diff-detail {
-  overflow: auto;
-  max-height: 18rem;
-  margin: 0.5rem 0 0;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-md);
-  background: var(--background-base);
-  color: var(--foreground);
-  font-family: var(--font-family-mono, monospace);
-  font-size: 0.6875rem;
-  line-height: 1.4;
+.kilo-console .project-info-review [data-slot="session-review-header"] {
+  box-sizing: border-box;
+  height: auto;
+  min-height: 2.5rem;
   padding: 0.75rem;
 }
 
+.kilo-console .project-info-review [data-slot="session-review-title"] {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  min-height: 1.25rem;
+  color: var(--text-weaker);
+  font-family: var(--font-family-sans);
+  font-size: 0.625rem;
+  font-weight: 500;
+  line-height: normal;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+}
+
+.kilo-console .project-info-review [data-slot="session-review-actions"] > [data-component="button"] {
+  width: auto;
+  min-width: 0;
+  height: 1.5rem;
+  gap: 0.25rem;
+  padding: 0 0.375rem;
+  font-size: 0.6875rem;
+}
+
+.kilo-console .project-review-state,
+.kilo-console .project-review-empty {
+  display: flex;
+  flex: 1 1 auto;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+  min-height: 0;
+  color: var(--muted-foreground);
+  font-size: 0.75rem;
+  text-align: center;
+  padding: 1rem;
+}
+
+.kilo-console .project-review-state-error {
+  color: var(--destructive, #ef4444);
+}
+
 @media (max-width: 1180px) {
   .kilo-console .project-console {
     grid-template-columns: 13.75rem minmax(0, 1fr);
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index cc3c38a99f..c1e2b1debc 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -209,6 +209,16 @@ export const Info = Schema.Struct({
     description: "Automatically collapse reasoning blocks after the agent finishes writing them",
   }),
   indexing: Schema.optional(IndexingRef).annotate({ description: "Codebase indexing configuration" }),
+  console: Schema.optional(
+    Schema.Struct({
+      context_sidebar_width: Schema.optional(
+        Schema.Number.check(Schema.isGreaterThanOrEqualTo(250), Schema.isLessThanOrEqualTo(800)),
+      ).annotate({ description: "Width of the Kilo Console project context sidebar in pixels" }),
+      diff_style: Schema.optional(Schema.Literals(["unified", "split"])).annotate({
+        description: "Default diff layout in Kilo Console project reviews",
+      }),
+    }),
+  ).annotate({ description: "Kilo Console user interface configuration" }),
   terminal_command_display: Schema.optional(Schema.Literals(["expanded", "collapsed"])).annotate({
     description: "Controls whether terminal command blocks are expanded or collapsed by default in the VS Code chat UI",
   }),
diff --git a/packages/opencode/test/kilocode/config/console-ui.test.ts b/packages/opencode/test/kilocode/config/console-ui.test.ts
new file mode 100644
index 0000000000..aeb713e425
--- /dev/null
+++ b/packages/opencode/test/kilocode/config/console-ui.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, test } from "bun:test"
+import { Schema } from "effect"
+import { Config } from "@/config/config"
+
+describe("Config.Info console UI", () => {
+  test("accepts console UI preferences", () => {
+    const config = Schema.decodeUnknownSync(Config.Info)({
+      console: { context_sidebar_width: 420, diff_style: "split" },
+    })
+
+    expect(config.console?.context_sidebar_width).toBe(420)
+    expect(config.console?.diff_style).toBe("split")
+  })
+
+  test("rejects invalid console UI preferences", () => {
+    expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: 249 } })).toThrow()
+    expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: 801 } })).toThrow()
+    expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { diff_style: "side-by-side" } })).toThrow()
+  })
+})
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index a77fd25e67..8793e151b3 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1320,6 +1320,13 @@ export type Config = {
   remote_control?: boolean
   auto_collapse_reasoning?: boolean
   indexing?: IndexingConfig
+  console?: {
+    /**
+     * Width of the Kilo Console project context sidebar in pixels
+     */
+    context_sidebar_width?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+    diff_style?: "unified" | "split"
+  }
   terminal_command_display?: "expanded" | "collapsed"
   model?: string
   small_model?: string
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 9553cb0791..8072018ce6 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -18195,6 +18195,40 @@
           "indexing": {
             "$ref": "#/components/schemas/IndexingConfig"
           },
+          "console": {
+            "type": "object",
+            "properties": {
+              "context_sidebar_width": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["NaN"]
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["Infinity"]
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["-Infinity"]
+                  },
+                  {
+                    "type": "string",
+                    "enum": ["Infinity", "-Infinity", "NaN"]
+                  }
+                ],
+                "description": "Width of the Kilo Console project context sidebar in pixels"
+              },
+              "diff_style": {
+                "type": "string",
+                "enum": ["unified", "split"]
+              }
+            },
+            "additionalProperties": false
+          },
           "terminal_command_display": {
             "type": "string",
             "enum": ["expanded", "collapsed"]

From 65e6d0c8ed53597294057d815ed4c04410421f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Catriel=20M=C3=BCller?= <catrielmuller@gmail.com>
Date: Fri, 12 Jun 2026 06:57:45 -0300
Subject: [PATCH 3/8] refactor: address comments

---
 .../routes/projects/ProjectConsoleRoute.tsx   |  1 +
 packages/opencode/src/config/config.ts        |  6 +++--
 .../test/kilocode/config/console-ui.test.ts   |  3 +++
 packages/sdk/js/src/v2/gen/types.gen.ts       |  2 +-
 packages/sdk/openapi.json                     | 24 +++----------------
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
index ca2bc78457..f4ad90840d 100644
--- a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
+++ b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
@@ -668,6 +668,7 @@ export function ProjectConsoleRoute() {
 
   onCleanup(() => {
     if (events.timer) window.clearTimeout(events.timer)
+    if (resize.timer) window.clearTimeout(resize.timer)
     window.removeEventListener("resize", updateViewport)
   })
 
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index c1e2b1debc..44ff4f4f09 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -212,8 +212,10 @@ export const Info = Schema.Struct({
   console: Schema.optional(
     Schema.Struct({
       context_sidebar_width: Schema.optional(
-        Schema.Number.check(Schema.isGreaterThanOrEqualTo(250), Schema.isLessThanOrEqualTo(800)),
-      ).annotate({ description: "Width of the Kilo Console project context sidebar in pixels" }),
+        Schema.Int.check(Schema.isBetween({ minimum: 250, maximum: 800 })).annotate({
+          description: "Width of the Kilo Console project context sidebar in pixels",
+        }),
+      ),
       diff_style: Schema.optional(Schema.Literals(["unified", "split"])).annotate({
         description: "Default diff layout in Kilo Console project reviews",
       }),
diff --git a/packages/opencode/test/kilocode/config/console-ui.test.ts b/packages/opencode/test/kilocode/config/console-ui.test.ts
index aeb713e425..9adeb10d16 100644
--- a/packages/opencode/test/kilocode/config/console-ui.test.ts
+++ b/packages/opencode/test/kilocode/config/console-ui.test.ts
@@ -15,6 +15,9 @@ describe("Config.Info console UI", () => {
   test("rejects invalid console UI preferences", () => {
     expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: 249 } })).toThrow()
     expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: 801 } })).toThrow()
+    expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: 420.5 } })).toThrow()
+    expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: Number.NaN } })).toThrow()
+    expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { context_sidebar_width: Number.POSITIVE_INFINITY } })).toThrow()
     expect(() => Schema.decodeUnknownSync(Config.Info)({ console: { diff_style: "side-by-side" } })).toThrow()
   })
 })
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 8793e151b3..af264d90b7 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1324,7 +1324,7 @@ export type Config = {
     /**
      * Width of the Kilo Console project context sidebar in pixels
      */
-    context_sidebar_width?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+    context_sidebar_width?: number
     diff_style?: "unified" | "split"
   }
   terminal_command_display?: "expanded" | "collapsed"
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 8072018ce6..4d66ec8d8b 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -18199,27 +18199,9 @@
             "type": "object",
             "properties": {
               "context_sidebar_width": {
-                "anyOf": [
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["NaN"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["Infinity"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["-Infinity"]
-                  },
-                  {
-                    "type": "string",
-                    "enum": ["Infinity", "-Infinity", "NaN"]
-                  }
-                ],
+                "type": "integer",
+                "minimum": 250,
+                "maximum": 800,
                 "description": "Width of the Kilo Console project context sidebar in pixels"
               },
               "diff_style": {

From eb4d2e6ff67b4f939e25deda1e4345e958154763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Catriel=20M=C3=BCller?= <catrielmuller@gmail.com>
Date: Fri, 12 Jun 2026 07:49:44 -0300
Subject: [PATCH 4/8] fix: fix kilo pierre theme

---
 packages/kilo-console/src/index.tsx           |   6 -
 .../kilo-vscode/webview-ui/pierre-worker.ts   |  10 +-
 packages/ui/src/context/marked.tsx            | 380 +----------------
 packages/ui/src/pierre/kilo-diff-theme.ts     | 402 ++++++++++++++++++
 packages/ui/src/pierre/worker.ts              |  11 +-
 5 files changed, 431 insertions(+), 378 deletions(-)
 create mode 100644 packages/ui/src/pierre/kilo-diff-theme.ts

diff --git a/packages/kilo-console/src/index.tsx b/packages/kilo-console/src/index.tsx
index 5b177c417a..786f9c9cad 100644
--- a/packages/kilo-console/src/index.tsx
+++ b/packages/kilo-console/src/index.tsx
@@ -14,12 +14,6 @@ if (!root) throw new Error("Missing root element")
 
 const base = import.meta.env.BASE_URL.replace(/\/$/, "")
 
-// Register the "Kilo" Pierre/shiki theme required by the diff review components
-// (Code/SessionReview). Without it the diff worker throws "resolveTheme: No valid
-// loader for Kilo" when a file is expanded. Loaded out-of-band so katex/marked stay
-// out of the initial bundle; it resolves long before a diff can be opened.
-void import("@opencode-ai/ui/context/marked")
-
 function routes() {
   return configSections.map((item) => <Route path={item.path} component={item.component} />)
 }
diff --git a/packages/kilo-vscode/webview-ui/pierre-worker.ts b/packages/kilo-vscode/webview-ui/pierre-worker.ts
index 25c126394c..4ab9aab83e 100644
--- a/packages/kilo-vscode/webview-ui/pierre-worker.ts
+++ b/packages/kilo-vscode/webview-ui/pierre-worker.ts
@@ -13,6 +13,14 @@
 // plain render. The diff wrapper still needs to keep that initial render cheap,
 // which is why review surfaces pass hunk-bounded patches instead of full files.
 import { WorkerPoolManager } from "@pierre/diffs/worker"
+import { ensureKiloDiffTheme, KILO_DIFF_THEME } from "@opencode-ai/ui/pierre/kilo-diff-theme"
+
+// Register the "Kilo" theme before any pool initializes. resolveThemes([theme])
+// runs on the main thread during initialize() and throws "resolveTheme: No valid
+// loader for Kilo" if the theme name was never registered. Registering here makes
+// the worker self-sufficient rather than depending on the markdown context module
+// having been imported first.
+ensureKiloDiffTheme()
 
 export type WorkerPoolStyle = "unified" | "split"
 
@@ -36,7 +44,7 @@ export function workerFactory(): Worker {
 function createPool(lineDiffType: "none" | "word-alt") {
   const pool = new WorkerPoolManager(
     { workerFactory, poolSize: 2 },
-    { theme: "Kilo", lineDiffType, preferredHighlighter: ENGINE },
+    { theme: KILO_DIFF_THEME, lineDiffType, preferredHighlighter: ENGINE },
   )
   void pool.initialize()
   return pool
diff --git a/packages/ui/src/context/marked.tsx b/packages/ui/src/context/marked.tsx
index 3b332802bf..b8aa0e1c5f 100644
--- a/packages/ui/src/context/marked.tsx
+++ b/packages/ui/src/context/marked.tsx
@@ -12,377 +12,17 @@ import type { MarkedExtension, TokenizerAndRendererExtension } from "marked"
 import { bundledLanguages, type BundledLanguage } from "shiki"
 import { parseFilePath } from "../file-path" // kilocode_change
 import { createSimpleContext } from "./helper"
-import { getSharedHighlighter, registerCustomTheme, ThemeRegistrationResolved } from "@pierre/diffs"
+import { getSharedHighlighter } from "@pierre/diffs"
+import { ensureKiloDiffTheme } from "../pierre/kilo-diff-theme" // kilocode_change
 
-registerCustomTheme("Kilo", () => {
-  return Promise.resolve({
-    name: "Kilo",
-    colors: {
-      "editor.background": "var(--color-background-stronger)",
-      "editor.foreground": "var(--text-base)",
-      "gitDecoration.addedResourceForeground": "var(--syntax-diff-add)",
-      "gitDecoration.deletedResourceForeground": "var(--syntax-diff-delete)",
-      // "gitDecoration.conflictingResourceForeground": "#ffca00",
-      // "gitDecoration.modifiedResourceForeground": "#1a76d4",
-      // "gitDecoration.untrackedResourceForeground": "#00cab1",
-      // "gitDecoration.ignoredResourceForeground": "#84848A",
-      // "terminal.titleForeground": "#adadb1",
-      // "terminal.titleInactiveForeground": "#84848A",
-      // "terminal.background": "#141415",
-      // "terminal.foreground": "#adadb1",
-      // "terminal.ansiBlack": "#141415",
-      // "terminal.ansiRed": "#ff2e3f",
-      // "terminal.ansiGreen": "#0dbe4e",
-      // "terminal.ansiYellow": "#ffca00",
-      // "terminal.ansiBlue": "#008cff",
-      // "terminal.ansiMagenta": "#c635e4",
-      // "terminal.ansiCyan": "#08c0ef",
-      // "terminal.ansiWhite": "#c6c6c8",
-      // "terminal.ansiBrightBlack": "#141415",
-      // "terminal.ansiBrightRed": "#ff2e3f",
-      // "terminal.ansiBrightGreen": "#0dbe4e",
-      // "terminal.ansiBrightYellow": "#ffca00",
-      // "terminal.ansiBrightBlue": "#008cff",
-      // "terminal.ansiBrightMagenta": "#c635e4",
-      // "terminal.ansiBrightCyan": "#08c0ef",
-      // "terminal.ansiBrightWhite": "#c6c6c8",
-    },
-    tokenColors: [
-      {
-        scope: ["comment", "punctuation.definition.comment", "string.comment"],
-        settings: {
-          foreground: "var(--syntax-comment)",
-        },
-      },
-      {
-        scope: ["entity.other.attribute-name"],
-        settings: {
-          foreground: "var(--syntax-property)", // maybe attribute
-        },
-      },
-      {
-        scope: ["constant", "entity.name.constant", "variable.other.constant", "variable.language", "entity"],
-        settings: {
-          foreground: "var(--syntax-constant)",
-        },
-      },
-      {
-        scope: ["entity.name", "meta.export.default", "meta.definition.variable"],
-        settings: {
-          foreground: "var(--syntax-type)",
-        },
-      },
-      {
-        scope: ["meta.object.member"],
-        settings: {
-          foreground: "var(--syntax-primitive)",
-        },
-      },
-      {
-        scope: [
-          "variable.parameter.function",
-          "meta.jsx.children",
-          "meta.block",
-          "meta.tag.attributes",
-          "entity.name.constant",
-          "meta.embedded.expression",
-          "meta.template.expression",
-          "string.other.begin.yaml",
-          "string.other.end.yaml",
-        ],
-        settings: {
-          foreground: "var(--syntax-punctuation)",
-        },
-      },
-      {
-        scope: ["entity.name.function", "support.type.primitive"],
-        settings: {
-          foreground: "var(--syntax-primitive)",
-        },
-      },
-      {
-        scope: ["support.class.component"],
-        settings: {
-          foreground: "var(--syntax-type)",
-        },
-      },
-      {
-        scope: "keyword",
-        settings: {
-          foreground: "var(--syntax-keyword)",
-        },
-      },
-      {
-        scope: [
-          "keyword.operator",
-          "storage.type.function.arrow",
-          "punctuation.separator.key-value.css",
-          "entity.name.tag.yaml",
-          "punctuation.separator.key-value.mapping.yaml",
-        ],
-        settings: {
-          foreground: "var(--syntax-operator)",
-        },
-      },
-      {
-        scope: ["storage", "storage.type"],
-        settings: {
-          foreground: "var(--syntax-keyword)",
-        },
-      },
-      {
-        scope: ["storage.modifier.package", "storage.modifier.import", "storage.type.java"],
-        settings: {
-          foreground: "var(--syntax-primitive)",
-        },
-      },
-      {
-        scope: [
-          "string",
-          "punctuation.definition.string",
-          "string punctuation.section.embedded source",
-          "entity.name.tag",
-        ],
-        settings: {
-          foreground: "var(--syntax-string)",
-        },
-      },
-      {
-        scope: "support",
-        settings: {
-          foreground: "var(--syntax-primitive)",
-        },
-      },
-      {
-        scope: ["support.type.object.module", "variable.other.object", "support.type.property-name.css"],
-        settings: {
-          foreground: "var(--syntax-object)",
-        },
-      },
-      {
-        scope: "meta.property-name",
-        settings: {
-          foreground: "var(--syntax-property)",
-        },
-      },
-      {
-        scope: "variable",
-        settings: {
-          foreground: "var(--syntax-variable)",
-        },
-      },
-      {
-        scope: "variable.other",
-        settings: {
-          foreground: "var(--syntax-variable)",
-        },
-      },
-      {
-        scope: [
-          "invalid.broken",
-          "invalid.illegal",
-          "invalid.unimplemented",
-          "invalid.deprecated",
-          "message.error",
-          "markup.deleted",
-          "meta.diff.header.from-file",
-          "punctuation.definition.deleted",
-          "brackethighlighter.unmatched",
-          "token.error-token",
-        ],
-        settings: {
-          foreground: "var(--syntax-critical)",
-        },
-      },
-      {
-        scope: "carriage-return",
-        settings: {
-          foreground: "var(--syntax-keyword)",
-        },
-      },
-      {
-        scope: "string source",
-        settings: {
-          foreground: "var(--syntax-variable)",
-        },
-      },
-      {
-        scope: "string variable",
-        settings: {
-          foreground: "var(--syntax-constant)",
-        },
-      },
-      {
-        scope: [
-          "source.regexp",
-          "string.regexp",
-          "string.regexp.character-class",
-          "string.regexp constant.character.escape",
-          "string.regexp source.ruby.embedded",
-          "string.regexp string.regexp.arbitrary-repitition",
-          "string.regexp constant.character.escape",
-        ],
-        settings: {
-          foreground: "var(--syntax-regexp)",
-        },
-      },
-      {
-        scope: "support.constant",
-        settings: {
-          foreground: "var(--syntax-primitive)",
-        },
-      },
-      {
-        scope: "support.variable",
-        settings: {
-          foreground: "var(--syntax-variable)",
-        },
-      },
-      {
-        scope: "meta.module-reference",
-        settings: {
-          foreground: "var(--syntax-info)",
-        },
-      },
-      {
-        scope: "punctuation.definition.list.begin.markdown",
-        settings: {
-          foreground: "var(--syntax-punctuation)",
-        },
-      },
-      {
-        scope: ["markup.heading", "markup.heading entity.name"],
-        settings: {
-          fontStyle: "bold",
-          foreground: "var(--syntax-info)",
-        },
-      },
-      {
-        scope: "markup.quote",
-        settings: {
-          foreground: "var(--syntax-info)",
-        },
-      },
-      {
-        scope: "markup.italic",
-        settings: {
-          fontStyle: "italic",
-          // foreground: "",
-        },
-      },
-      {
-        scope: "markup.bold",
-        settings: {
-          fontStyle: "bold",
-          foreground: "var(--text-strong)",
-        },
-      },
-      {
-        scope: [
-          "markup.raw",
-          "markup.inserted",
-          "meta.diff.header.to-file",
-          "punctuation.definition.inserted",
-          "markup.changed",
-          "punctuation.definition.changed",
-          "markup.ignored",
-          "markup.untracked",
-        ],
-        settings: {
-          foreground: "var(--text-base)",
-        },
-      },
-      {
-        scope: "meta.diff.range",
-        settings: {
-          fontStyle: "bold",
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: "meta.diff.header",
-        settings: {
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: "meta.separator",
-        settings: {
-          fontStyle: "bold",
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: "meta.output",
-        settings: {
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: "meta.export.default",
-        settings: {
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: [
-          "brackethighlighter.tag",
-          "brackethighlighter.curly",
-          "brackethighlighter.round",
-          "brackethighlighter.square",
-          "brackethighlighter.angle",
-          "brackethighlighter.quote",
-        ],
-        settings: {
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: ["constant.other.reference.link", "string.other.link"],
-        settings: {
-          fontStyle: "underline",
-          foreground: "var(--syntax-unknown)",
-        },
-      },
-      {
-        scope: "token.info-token",
-        settings: {
-          foreground: "var(--syntax-info)",
-        },
-      },
-      {
-        scope: "token.warn-token",
-        settings: {
-          foreground: "var(--syntax-warning)",
-        },
-      },
-      {
-        scope: "token.debug-token",
-        settings: {
-          foreground: "var(--syntax-info)",
-        },
-      },
-    ],
-    semanticTokenColors: {
-      comment: "var(--syntax-comment)",
-      string: "var(--syntax-string)",
-      number: "var(--syntax-constant)",
-      regexp: "var(--syntax-regexp)",
-      keyword: "var(--syntax-keyword)",
-      variable: "var(--syntax-variable)",
-      parameter: "var(--syntax-variable)",
-      property: "var(--syntax-property)",
-      function: "var(--syntax-primitive)",
-      method: "var(--syntax-primitive)",
-      type: "var(--syntax-type)",
-      class: "var(--syntax-type)",
-      namespace: "var(--syntax-type)",
-      enumMember: "var(--syntax-primitive)",
-      "variable.constant": "var(--syntax-constant)",
-      "variable.defaultLibrary": "var(--syntax-unknown)",
-    },
-  } as unknown as ThemeRegistrationResolved)
-})
+// kilocode_change start: the "Kilo" diff/highlight theme registration moved to
+// ../pierre/kilo-diff-theme so the diff worker pool can register it without
+// importing this module's katex/marked dependencies. This call keeps the markdown
+// highlighter (getSharedHighlighter, below) working. Upstream keeps an inline
+// registerCustomTheme("OpenCode", …) block here — do not restore it on merges;
+// route registration through ensureKiloDiffTheme() instead.
+ensureKiloDiffTheme()
+// kilocode_change end
 
 // kilocode_change start: double-dollar-only math rules for marked.
 const BLOCK = /^\$\$\n((?:\\[^]|[^\\])+?)\n\$\$(?:\n|$)/
diff --git a/packages/ui/src/pierre/kilo-diff-theme.ts b/packages/ui/src/pierre/kilo-diff-theme.ts
new file mode 100644
index 0000000000..7f19c3cd64
--- /dev/null
+++ b/packages/ui/src/pierre/kilo-diff-theme.ts
@@ -0,0 +1,402 @@
+// kilocode_change - new file
+import { registerCustomTheme, RegisteredCustomThemes, type ThemeRegistrationResolved } from "@pierre/diffs"
+
+// The "Kilo" Pierre/Shiki theme used by every diff review surface (Code / Diff /
+// File / SessionReview) and by markdown code highlighting. Pierre resolves the
+// theme by name when a worker pool initializes (resolveThemes(["Kilo"])) or when
+// getSharedHighlighter() attaches it; if the name was never registered it throws
+// "resolveTheme: No valid loader for Kilo".
+//
+// This registration lives next to the worker pool factory (./worker) so that it
+// is a guaranteed, synchronous precondition of using the diff machinery: every
+// diff component imports the worker factory, which calls ensureKiloDiffTheme()
+// at module load — before any WorkerPoolManager.initialize() runs. Previously the
+// registration was only a side effect of importing the (heavy, katex/marked-
+// pulling) markdown context module, which forced consumers that render diffs
+// without markdown (e.g. kilo-console) to fire a racy `void import(...)` purely to
+// register the theme. Keeping it here, free of katex/marked, lets those consumers
+// stay light while removing the race entirely.
+//
+// Upstream owns the equivalent registerCustomTheme("OpenCode", …) block inline in
+// context/marked.tsx. Do not restore that inline block on upstream merges — route
+// the registration through ensureKiloDiffTheme() instead.
+
+export const KILO_DIFF_THEME = "Kilo"
+
+// Idempotent: this is reached from both the markdown context and the diff worker
+// factory. Guard against the authoritative Pierre registry (rather than a local
+// flag) so it stays a no-op even if this module is instantiated more than once
+// across separate bundles — @pierre/diffs otherwise logs an error on duplicates.
+export function ensureKiloDiffTheme(): void {
+  if (RegisteredCustomThemes.has(KILO_DIFF_THEME)) return
+
+  registerCustomTheme(KILO_DIFF_THEME, () => {
+    return Promise.resolve({
+      name: KILO_DIFF_THEME,
+      colors: {
+        "editor.background": "var(--color-background-stronger)",
+        "editor.foreground": "var(--text-base)",
+        "gitDecoration.addedResourceForeground": "var(--syntax-diff-add)",
+        "gitDecoration.deletedResourceForeground": "var(--syntax-diff-delete)",
+        // "gitDecoration.conflictingResourceForeground": "#ffca00",
+        // "gitDecoration.modifiedResourceForeground": "#1a76d4",
+        // "gitDecoration.untrackedResourceForeground": "#00cab1",
+        // "gitDecoration.ignoredResourceForeground": "#84848A",
+        // "terminal.titleForeground": "#adadb1",
+        // "terminal.titleInactiveForeground": "#84848A",
+        // "terminal.background": "#141415",
+        // "terminal.foreground": "#adadb1",
+        // "terminal.ansiBlack": "#141415",
+        // "terminal.ansiRed": "#ff2e3f",
+        // "terminal.ansiGreen": "#0dbe4e",
+        // "terminal.ansiYellow": "#ffca00",
+        // "terminal.ansiBlue": "#008cff",
+        // "terminal.ansiMagenta": "#c635e4",
+        // "terminal.ansiCyan": "#08c0ef",
+        // "terminal.ansiWhite": "#c6c6c8",
+        // "terminal.ansiBrightBlack": "#141415",
+        // "terminal.ansiBrightRed": "#ff2e3f",
+        // "terminal.ansiBrightGreen": "#0dbe4e",
+        // "terminal.ansiBrightYellow": "#ffca00",
+        // "terminal.ansiBrightBlue": "#008cff",
+        // "terminal.ansiBrightMagenta": "#c635e4",
+        // "terminal.ansiBrightCyan": "#08c0ef",
+        // "terminal.ansiBrightWhite": "#c6c6c8",
+      },
+      tokenColors: [
+        {
+          scope: ["comment", "punctuation.definition.comment", "string.comment"],
+          settings: {
+            foreground: "var(--syntax-comment)",
+          },
+        },
+        {
+          scope: ["entity.other.attribute-name"],
+          settings: {
+            foreground: "var(--syntax-property)", // maybe attribute
+          },
+        },
+        {
+          scope: ["constant", "entity.name.constant", "variable.other.constant", "variable.language", "entity"],
+          settings: {
+            foreground: "var(--syntax-constant)",
+          },
+        },
+        {
+          scope: ["entity.name", "meta.export.default", "meta.definition.variable"],
+          settings: {
+            foreground: "var(--syntax-type)",
+          },
+        },
+        {
+          scope: ["meta.object.member"],
+          settings: {
+            foreground: "var(--syntax-primitive)",
+          },
+        },
+        {
+          scope: [
+            "variable.parameter.function",
+            "meta.jsx.children",
+            "meta.block",
+            "meta.tag.attributes",
+            "entity.name.constant",
+            "meta.embedded.expression",
+            "meta.template.expression",
+            "string.other.begin.yaml",
+            "string.other.end.yaml",
+          ],
+          settings: {
+            foreground: "var(--syntax-punctuation)",
+          },
+        },
+        {
+          scope: ["entity.name.function", "support.type.primitive"],
+          settings: {
+            foreground: "var(--syntax-primitive)",
+          },
+        },
+        {
+          scope: ["support.class.component"],
+          settings: {
+            foreground: "var(--syntax-type)",
+          },
+        },
+        {
+          scope: "keyword",
+          settings: {
+            foreground: "var(--syntax-keyword)",
+          },
+        },
+        {
+          scope: [
+            "keyword.operator",
+            "storage.type.function.arrow",
+            "punctuation.separator.key-value.css",
+            "entity.name.tag.yaml",
+            "punctuation.separator.key-value.mapping.yaml",
+          ],
+          settings: {
+            foreground: "var(--syntax-operator)",
+          },
+        },
+        {
+          scope: ["storage", "storage.type"],
+          settings: {
+            foreground: "var(--syntax-keyword)",
+          },
+        },
+        {
+          scope: ["storage.modifier.package", "storage.modifier.import", "storage.type.java"],
+          settings: {
+            foreground: "var(--syntax-primitive)",
+          },
+        },
+        {
+          scope: [
+            "string",
+            "punctuation.definition.string",
+            "string punctuation.section.embedded source",
+            "entity.name.tag",
+          ],
+          settings: {
+            foreground: "var(--syntax-string)",
+          },
+        },
+        {
+          scope: "support",
+          settings: {
+            foreground: "var(--syntax-primitive)",
+          },
+        },
+        {
+          scope: ["support.type.object.module", "variable.other.object", "support.type.property-name.css"],
+          settings: {
+            foreground: "var(--syntax-object)",
+          },
+        },
+        {
+          scope: "meta.property-name",
+          settings: {
+            foreground: "var(--syntax-property)",
+          },
+        },
+        {
+          scope: "variable",
+          settings: {
+            foreground: "var(--syntax-variable)",
+          },
+        },
+        {
+          scope: "variable.other",
+          settings: {
+            foreground: "var(--syntax-variable)",
+          },
+        },
+        {
+          scope: [
+            "invalid.broken",
+            "invalid.illegal",
+            "invalid.unimplemented",
+            "invalid.deprecated",
+            "message.error",
+            "markup.deleted",
+            "meta.diff.header.from-file",
+            "punctuation.definition.deleted",
+            "brackethighlighter.unmatched",
+            "token.error-token",
+          ],
+          settings: {
+            foreground: "var(--syntax-critical)",
+          },
+        },
+        {
+          scope: "carriage-return",
+          settings: {
+            foreground: "var(--syntax-keyword)",
+          },
+        },
+        {
+          scope: "string source",
+          settings: {
+            foreground: "var(--syntax-variable)",
+          },
+        },
+        {
+          scope: "string variable",
+          settings: {
+            foreground: "var(--syntax-constant)",
+          },
+        },
+        {
+          scope: [
+            "source.regexp",
+            "string.regexp",
+            "string.regexp.character-class",
+            "string.regexp constant.character.escape",
+            "string.regexp source.ruby.embedded",
+            "string.regexp string.regexp.arbitrary-repitition",
+            "string.regexp constant.character.escape",
+          ],
+          settings: {
+            foreground: "var(--syntax-regexp)",
+          },
+        },
+        {
+          scope: "support.constant",
+          settings: {
+            foreground: "var(--syntax-primitive)",
+          },
+        },
+        {
+          scope: "support.variable",
+          settings: {
+            foreground: "var(--syntax-variable)",
+          },
+        },
+        {
+          scope: "meta.module-reference",
+          settings: {
+            foreground: "var(--syntax-info)",
+          },
+        },
+        {
+          scope: "punctuation.definition.list.begin.markdown",
+          settings: {
+            foreground: "var(--syntax-punctuation)",
+          },
+        },
+        {
+          scope: ["markup.heading", "markup.heading entity.name"],
+          settings: {
+            fontStyle: "bold",
+            foreground: "var(--syntax-info)",
+          },
+        },
+        {
+          scope: "markup.quote",
+          settings: {
+            foreground: "var(--syntax-info)",
+          },
+        },
+        {
+          scope: "markup.italic",
+          settings: {
+            fontStyle: "italic",
+            // foreground: "",
+          },
+        },
+        {
+          scope: "markup.bold",
+          settings: {
+            fontStyle: "bold",
+            foreground: "var(--text-strong)",
+          },
+        },
+        {
+          scope: [
+            "markup.raw",
+            "markup.inserted",
+            "meta.diff.header.to-file",
+            "punctuation.definition.inserted",
+            "markup.changed",
+            "punctuation.definition.changed",
+            "markup.ignored",
+            "markup.untracked",
+          ],
+          settings: {
+            foreground: "var(--text-base)",
+          },
+        },
+        {
+          scope: "meta.diff.range",
+          settings: {
+            fontStyle: "bold",
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: "meta.diff.header",
+          settings: {
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: "meta.separator",
+          settings: {
+            fontStyle: "bold",
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: "meta.output",
+          settings: {
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: "meta.export.default",
+          settings: {
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: [
+            "brackethighlighter.tag",
+            "brackethighlighter.curly",
+            "brackethighlighter.round",
+            "brackethighlighter.square",
+            "brackethighlighter.angle",
+            "brackethighlighter.quote",
+          ],
+          settings: {
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: ["constant.other.reference.link", "string.other.link"],
+          settings: {
+            fontStyle: "underline",
+            foreground: "var(--syntax-unknown)",
+          },
+        },
+        {
+          scope: "token.info-token",
+          settings: {
+            foreground: "var(--syntax-info)",
+          },
+        },
+        {
+          scope: "token.warn-token",
+          settings: {
+            foreground: "var(--syntax-warning)",
+          },
+        },
+        {
+          scope: "token.debug-token",
+          settings: {
+            foreground: "var(--syntax-info)",
+          },
+        },
+      ],
+      semanticTokenColors: {
+        comment: "var(--syntax-comment)",
+        string: "var(--syntax-string)",
+        number: "var(--syntax-constant)",
+        regexp: "var(--syntax-regexp)",
+        keyword: "var(--syntax-keyword)",
+        variable: "var(--syntax-variable)",
+        parameter: "var(--syntax-variable)",
+        property: "var(--syntax-property)",
+        function: "var(--syntax-primitive)",
+        method: "var(--syntax-primitive)",
+        type: "var(--syntax-type)",
+        class: "var(--syntax-type)",
+        namespace: "var(--syntax-type)",
+        enumMember: "var(--syntax-primitive)",
+        "variable.constant": "var(--syntax-constant)",
+        "variable.defaultLibrary": "var(--syntax-unknown)",
+      },
+    } as unknown as ThemeRegistrationResolved)
+  })
+}
diff --git a/packages/ui/src/pierre/worker.ts b/packages/ui/src/pierre/worker.ts
index d3097e4b12..5e14823361 100644
--- a/packages/ui/src/pierre/worker.ts
+++ b/packages/ui/src/pierre/worker.ts
@@ -1,5 +1,14 @@
 import { WorkerPoolManager } from "@pierre/diffs/worker"
 import ShikiWorkerUrl from "@pierre/diffs/worker/worker.js?worker&url"
+import { ensureKiloDiffTheme, KILO_DIFF_THEME } from "./kilo-diff-theme" // kilocode_change
+
+// kilocode_change start: register the "Kilo" theme as a precondition of creating
+// any diff worker pool. resolveThemes([theme]) runs on the main thread during
+// initialize(); without the theme registered it throws "resolveTheme: No valid
+// loader for Kilo". Doing it here means every diff component (which imports this
+// factory) is covered, instead of relying on the markdown context being imported.
+ensureKiloDiffTheme()
+// kilocode_change end
 
 export type WorkerPoolStyle = "unified" | "split"
 
@@ -19,7 +28,7 @@ function createPool(lineDiffType: "none" | "word-alt") {
       poolSize: 2,
     },
     {
-      theme: "Kilo",
+      theme: KILO_DIFF_THEME, // kilocode_change
       lineDiffType,
       preferredHighlighter: "shiki-wasm",
     },

From 303b67a265a1d5ce90873f6ac09be01874f0f481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Catriel=20M=C3=BCller?= <catrielmuller@gmail.com>
Date: Fri, 12 Jun 2026 09:30:00 -0300
Subject: [PATCH 5/8] refactor: fix kilo marker

---
 packages/ui/src/context/marked.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/context/marked.tsx b/packages/ui/src/context/marked.tsx
index b8aa0e1c5f..ce91a22399 100644
--- a/packages/ui/src/context/marked.tsx
+++ b/packages/ui/src/context/marked.tsx
@@ -12,7 +12,7 @@ import type { MarkedExtension, TokenizerAndRendererExtension } from "marked"
 import { bundledLanguages, type BundledLanguage } from "shiki"
 import { parseFilePath } from "../file-path" // kilocode_change
 import { createSimpleContext } from "./helper"
-import { getSharedHighlighter } from "@pierre/diffs"
+import { getSharedHighlighter } from "@pierre/diffs" // kilocode_change
 import { ensureKiloDiffTheme } from "../pierre/kilo-diff-theme" // kilocode_change
 
 // kilocode_change start: the "Kilo" diff/highlight theme registration moved to

From 9df58d79abb0d0b6d52020524fb3c80b3e0de095 Mon Sep 17 00:00:00 2001
From: Imanol Maiztegui <imanol.mzd@gmail.com>
Date: Fri, 12 Jun 2026 15:25:10 +0200
Subject: [PATCH 6/8] fix(vscode): correct changeset package name (#11162)

---
 .changeset/terminal-integrated-font.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/terminal-integrated-font.md b/.changeset/terminal-integrated-font.md
index fae71fea10..efc164d402 100644
--- a/.changeset/terminal-integrated-font.md
+++ b/.changeset/terminal-integrated-font.md
@@ -1,5 +1,5 @@
 ---
-"kilo-vscode": patch
+"kilo-code": patch
 ---
 
 Agent Manager terminals now use `terminal.integrated.fontFamily` and `terminal.integrated.fontSize` (including Nerd Font glyphs) instead of the editor font.

From 47112090721258244d950f7092ca491c61a5a6bf Mon Sep 17 00:00:00 2001
From: "kilo-maintainer[bot]" <kilo-maintainer[bot]@users.noreply.github.com>
Date: Fri, 12 Jun 2026 13:51:52 +0000
Subject: [PATCH 7/8] release: v7.3.44

---
 .changeset/avoid-repeat-compactions.md        |  5 --
 .changeset/brave-subagents-think.md           |  5 --
 .changeset/calm-agents-keep-worktrees.md      |  5 --
 .changeset/calm-shells-timeout.md             |  5 --
 .changeset/clear-empty-models.md              |  5 --
 .changeset/clear-kilo-commands.md             |  5 --
 .changeset/default-lancedb-search.md          |  7 ---
 .changeset/dismiss-stale-permissions.md       |  5 --
 .changeset/fast-agent-snapshots.md            |  5 --
 .changeset/fast-agent-transcripts.md          |  5 --
 .changeset/fast-inline-diffs.md               |  5 --
 .changeset/fast-session-forks.md              |  7 ---
 .changeset/feat-cli-port-discovery-warning.md |  5 --
 .changeset/fresh-provider-models.md           |  5 --
 .changeset/honest-model-badges.md             |  7 ---
 .changeset/keep-error-status-inline.md        |  5 --
 .changeset/neat-worktree-dialogs.md           |  5 --
 .changeset/prevent-subagent-questions.md      |  6 --
 .changeset/quick-local-prompts.md             |  5 --
 .changeset/quick-subagent-transcripts.md      |  5 --
 .changeset/quiet-binary-diffs.md              |  5 --
 .changeset/quiet-kilo-attention.md            |  5 --
 .changeset/quiet-qdrant-warnings.md           |  5 --
 .changeset/remove-vscode-paste-summary.md     |  5 --
 .changeset/resize-console-context.md          |  6 --
 .changeset/restore-failed-question-replies.md |  7 ---
 .changeset/restore-kilo-cli-commands.md       |  5 --
 .changeset/restore-scout-codesearch.md        |  6 --
 .changeset/restore-vercel-providers.md        |  6 --
 .changeset/rich-worktree-review.md            |  5 --
 .changeset/route-shared-permissions.md        |  5 --
 .changeset/scoped-indexing-settings.md        |  6 --
 .changeset/select-custom-question-answer.md   |  5 --
 .changeset/session-patches-stay-whole.md      |  5 --
 .changeset/share-vscode-session-database.md   |  5 --
 .changeset/steady-tui-streams.md              |  5 --
 .changeset/steady-vscode-streams.md           |  5 --
 .changeset/terminal-integrated-font.md        |  5 --
 .changeset/virtual-review-files.md            |  5 --
 .changeset/warm-agent-manager-mcp.md          |  5 --
 bun.lock                                      | 40 ++++++------
 package.json                                  |  2 +-
 packages/core/package.json                    |  2 +-
 packages/extensions/zed/extension.toml        | 12 ++--
 packages/http-recorder/package.json           |  2 +-
 packages/kilo-console/package.json            |  2 +-
 packages/kilo-docs/package.json               |  2 +-
 packages/kilo-gateway/package.json            |  2 +-
 packages/kilo-i18n/package.json               |  2 +-
 packages/kilo-indexing/package.json           |  2 +-
 packages/kilo-jetbrains/package.json          |  2 +-
 packages/kilo-telemetry/package.json          |  2 +-
 packages/kilo-ui/package.json                 |  2 +-
 packages/kilo-vscode/CHANGELOG.md             | 62 +++++++++++++++++++
 packages/kilo-vscode/package.json             |  2 +-
 packages/kilo-vscode/tests/package.json       |  2 +-
 packages/kilo-web-ui/package.json             |  2 +-
 packages/llm/package.json                     |  2 +-
 packages/opencode/CHANGELOG.md                | 52 ++++++++++++++++
 packages/opencode/package.json                |  2 +-
 packages/plugin-atomic-chat/package.json      |  2 +-
 packages/plugin/package.json                  |  2 +-
 packages/script/package.json                  |  2 +-
 packages/sdk/js/package.json                  |  2 +-
 packages/storybook/package.json               |  2 +-
 packages/ui/package.json                      |  2 +-
 script/upstream/package.json                  |  2 +-
 67 files changed, 163 insertions(+), 262 deletions(-)
 delete mode 100644 .changeset/avoid-repeat-compactions.md
 delete mode 100644 .changeset/brave-subagents-think.md
 delete mode 100644 .changeset/calm-agents-keep-worktrees.md
 delete mode 100644 .changeset/calm-shells-timeout.md
 delete mode 100644 .changeset/clear-empty-models.md
 delete mode 100644 .changeset/clear-kilo-commands.md
 delete mode 100644 .changeset/default-lancedb-search.md
 delete mode 100644 .changeset/dismiss-stale-permissions.md
 delete mode 100644 .changeset/fast-agent-snapshots.md
 delete mode 100644 .changeset/fast-agent-transcripts.md
 delete mode 100644 .changeset/fast-inline-diffs.md
 delete mode 100644 .changeset/fast-session-forks.md
 delete mode 100644 .changeset/feat-cli-port-discovery-warning.md
 delete mode 100644 .changeset/fresh-provider-models.md
 delete mode 100644 .changeset/honest-model-badges.md
 delete mode 100644 .changeset/keep-error-status-inline.md
 delete mode 100644 .changeset/neat-worktree-dialogs.md
 delete mode 100644 .changeset/prevent-subagent-questions.md
 delete mode 100644 .changeset/quick-local-prompts.md
 delete mode 100644 .changeset/quick-subagent-transcripts.md
 delete mode 100644 .changeset/quiet-binary-diffs.md
 delete mode 100644 .changeset/quiet-kilo-attention.md
 delete mode 100644 .changeset/quiet-qdrant-warnings.md
 delete mode 100644 .changeset/remove-vscode-paste-summary.md
 delete mode 100644 .changeset/resize-console-context.md
 delete mode 100644 .changeset/restore-failed-question-replies.md
 delete mode 100644 .changeset/restore-kilo-cli-commands.md
 delete mode 100644 .changeset/restore-scout-codesearch.md
 delete mode 100644 .changeset/restore-vercel-providers.md
 delete mode 100644 .changeset/rich-worktree-review.md
 delete mode 100644 .changeset/route-shared-permissions.md
 delete mode 100644 .changeset/scoped-indexing-settings.md
 delete mode 100644 .changeset/select-custom-question-answer.md
 delete mode 100644 .changeset/session-patches-stay-whole.md
 delete mode 100644 .changeset/share-vscode-session-database.md
 delete mode 100644 .changeset/steady-tui-streams.md
 delete mode 100644 .changeset/steady-vscode-streams.md
 delete mode 100644 .changeset/terminal-integrated-font.md
 delete mode 100644 .changeset/virtual-review-files.md
 delete mode 100644 .changeset/warm-agent-manager-mcp.md

diff --git a/.changeset/avoid-repeat-compactions.md b/.changeset/avoid-repeat-compactions.md
deleted file mode 100644
index 11bb0a33c0..0000000000
--- a/.changeset/avoid-repeat-compactions.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Prevent unnecessary repeat auto-compactions when providers report inconsistent token totals.
diff --git a/.changeset/brave-subagents-think.md b/.changeset/brave-subagents-think.md
deleted file mode 100644
index 5d7953c99f..0000000000
--- a/.changeset/brave-subagents-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Preserve the calling model's reasoning effort when task subagents inherit that model.
diff --git a/.changeset/calm-agents-keep-worktrees.md b/.changeset/calm-agents-keep-worktrees.md
deleted file mode 100644
index 44f66ddbb1..0000000000
--- a/.changeset/calm-agents-keep-worktrees.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Preserve existing Agent Manager worktrees and use deterministic suffixes when explicit branch names collide.
diff --git a/.changeset/calm-shells-timeout.md b/.changeset/calm-shells-timeout.md
deleted file mode 100644
index 9c2e411c36..0000000000
--- a/.changeset/calm-shells-timeout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Allow hosted runtimes to cap shell command duration and explain environment-enforced timeouts.
diff --git a/.changeset/clear-empty-models.md b/.changeset/clear-empty-models.md
deleted file mode 100644
index 80956ed835..0000000000
--- a/.changeset/clear-empty-models.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Indicate when no models are available in model-not-found errors.
diff --git a/.changeset/clear-kilo-commands.md b/.changeset/clear-kilo-commands.md
deleted file mode 100644
index 3d5fcc0b55..0000000000
--- a/.changeset/clear-kilo-commands.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Group Kilo Code commands in the VS Code command palette and clarify the Open in Tab command title.
diff --git a/.changeset/default-lancedb-search.md b/.changeset/default-lancedb-search.md
deleted file mode 100644
index ef8a8153d8..0000000000
--- a/.changeset/default-lancedb-search.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@kilocode/cli": minor
-"@kilocode/kilo-indexing": minor
-"kilo-code": minor
----
-
-Use embedded LanceDB as the default semantic search vector store so indexing works without a separate Qdrant server. Existing Qdrant users and Intel Mac users can select `qdrant` with `indexing.vectorStore`.
diff --git a/.changeset/dismiss-stale-permissions.md b/.changeset/dismiss-stale-permissions.md
deleted file mode 100644
index 0c031b224b..0000000000
--- a/.changeset/dismiss-stale-permissions.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Dismiss stale permission prompts when another view has already answered them.
diff --git a/.changeset/fast-agent-snapshots.md b/.changeset/fast-agent-snapshots.md
deleted file mode 100644
index 039e35176a..0000000000
--- a/.changeset/fast-agent-snapshots.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Speed up the first Agent Manager prompt in new worktrees by seeding snapshots from the checkout's Git index.
diff --git a/.changeset/fast-agent-transcripts.md b/.changeset/fast-agent-transcripts.md
deleted file mode 100644
index 47915f465a..0000000000
--- a/.changeset/fast-agent-transcripts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep large chat transcripts responsive by mounting only viewport-visible conversation rows.
diff --git a/.changeset/fast-inline-diffs.md b/.changeset/fast-inline-diffs.md
deleted file mode 100644
index db2bb36470..0000000000
--- a/.changeset/fast-inline-diffs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Load large Agent Manager change reviews faster without deferring file previews.
diff --git a/.changeset/fast-session-forks.md b/.changeset/fast-session-forks.md
deleted file mode 100644
index c42452d0fe..0000000000
--- a/.changeset/fast-session-forks.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@kilocode/cli": patch
-"@kilocode/kilo-ui": patch
-"kilo-code": patch
----
-
-Speed up large session forks by retaining final task outcomes instead of duplicating resumable subagent histories, and load completed task details only when expanded.
diff --git a/.changeset/feat-cli-port-discovery-warning.md b/.changeset/feat-cli-port-discovery-warning.md
deleted file mode 100644
index 2cd4bbb151..0000000000
--- a/.changeset/feat-cli-port-discovery-warning.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Warn when `kilo console` or `kilo daemon` is invoked with an explicit `--port` outside the discovery range (4097–4116).
diff --git a/.changeset/fresh-provider-models.md b/.changeset/fresh-provider-models.md
deleted file mode 100644
index 5919d57f2f..0000000000
--- a/.changeset/fresh-provider-models.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Refresh connected provider model lists when the models catalog updates.
diff --git a/.changeset/honest-model-badges.md b/.changeset/honest-model-badges.md
deleted file mode 100644
index f808c5181a..0000000000
--- a/.changeset/honest-model-badges.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"kilo-code": patch
-"@kilocode/cli": patch
-"@kilocode/kilo-gateway": patch
----
-
-Show model free and prompt-training indicators only when their explicit catalog metadata is enabled.
diff --git a/.changeset/keep-error-status-inline.md b/.changeset/keep-error-status-inline.md
deleted file mode 100644
index c9af5fda82..0000000000
--- a/.changeset/keep-error-status-inline.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep HTTP status codes beside tool error titles when error details wrap.
diff --git a/.changeset/neat-worktree-dialogs.md b/.changeset/neat-worktree-dialogs.md
deleted file mode 100644
index b57f336d6b..0000000000
--- a/.changeset/neat-worktree-dialogs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-console": patch
----
-
-Replace native worktree prompts with consistent dialogs for creating, renaming, resetting, and deleting worktrees.
diff --git a/.changeset/prevent-subagent-questions.md b/.changeset/prevent-subagent-questions.md
deleted file mode 100644
index e953140748..0000000000
--- a/.changeset/prevent-subagent-questions.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Prevent task subagents from asking questions that users cannot answer from the parent session.
diff --git a/.changeset/quick-local-prompts.md b/.changeset/quick-local-prompts.md
deleted file mode 100644
index f373d57712..0000000000
--- a/.changeset/quick-local-prompts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Show the first Agent Manager Local prompt and progress indicator immediately while its session is being created.
diff --git a/.changeset/quick-subagent-transcripts.md b/.changeset/quick-subagent-transcripts.md
deleted file mode 100644
index 263ebac9ba..0000000000
--- a/.changeset/quick-subagent-transcripts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Open subagent transcripts faster while preserving live reasoning and paginating long histories.
diff --git a/.changeset/quiet-binary-diffs.md b/.changeset/quiet-binary-diffs.md
deleted file mode 100644
index 90432a14b7..0000000000
--- a/.changeset/quiet-binary-diffs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep binary and audio files collapsed in diff reviews instead of showing empty diff panels.
diff --git a/.changeset/quiet-kilo-attention.md b/.changeset/quiet-kilo-attention.md
deleted file mode 100644
index 7e55f8fd6e..0000000000
--- a/.changeset/quiet-kilo-attention.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Prevent duplicate CLI attention alerts and route Kilo prompts through the configurable notification system.
diff --git a/.changeset/quiet-qdrant-warnings.md b/.changeset/quiet-qdrant-warnings.md
deleted file mode 100644
index de8e3c200e..0000000000
--- a/.changeset/quiet-qdrant-warnings.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Stabilize code indexing workers, retry Kilo model catalog downloads, reduce progress log noise, and show indexing failures as TUI notifications instead of writing over the terminal interface.
diff --git a/.changeset/remove-vscode-paste-summary.md b/.changeset/remove-vscode-paste-summary.md
deleted file mode 100644
index 9ae0712be7..0000000000
--- a/.changeset/remove-vscode-paste-summary.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Remove the unsupported paste-summary toggle from VS Code settings.
diff --git a/.changeset/resize-console-context.md b/.changeset/resize-console-context.md
deleted file mode 100644
index bb9dca3f1b..0000000000
--- a/.changeset/resize-console-context.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/kilo-console": patch
-"@kilocode/cli": patch
----
-
-Configure the project context sidebar width and default diff layout from Global Settings.
diff --git a/.changeset/restore-failed-question-replies.md b/.changeset/restore-failed-question-replies.md
deleted file mode 100644
index 2763fda704..0000000000
--- a/.changeset/restore-failed-question-replies.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"kilo-code": patch
-"@kilocode/cli": patch
-"@kilocode/kilo-gateway": patch
----
-
-Prevent streamed tool calls from executing twice and leaving answered questions disabled in VS Code.
diff --git a/.changeset/restore-kilo-cli-commands.md b/.changeset/restore-kilo-cli-commands.md
deleted file mode 100644
index 4269666468..0000000000
--- a/.changeset/restore-kilo-cli-commands.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Restore Kilo branding, fork-specific CLI commands, and CLI lifecycle initialization after upstream merges.
diff --git a/.changeset/restore-scout-codesearch.md b/.changeset/restore-scout-codesearch.md
deleted file mode 100644
index 9e2073bc39..0000000000
--- a/.changeset/restore-scout-codesearch.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Remove the unsupported code search tool.
diff --git a/.changeset/restore-vercel-providers.md b/.changeset/restore-vercel-providers.md
deleted file mode 100644
index ada074e654..0000000000
--- a/.changeset/restore-vercel-providers.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"@kilocode/kilo-gateway": patch
----
-
-Update the Vercel AI SDK providers for Cerebras, xAI, and OpenAI-compatible endpoints.
diff --git a/.changeset/rich-worktree-review.md b/.changeset/rich-worktree-review.md
deleted file mode 100644
index bffd4bb44d..0000000000
--- a/.changeset/rich-worktree-review.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-console": patch
----
-
-Review worktree changes in a richer panel with per-file stats and syntax-highlighted diffs.
diff --git a/.changeset/route-shared-permissions.md b/.changeset/route-shared-permissions.md
deleted file mode 100644
index 5c9fbd2296..0000000000
--- a/.changeset/route-shared-permissions.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep permission approvals working when continuing or switching Agent Manager worktree sessions.
diff --git a/.changeset/scoped-indexing-settings.md b/.changeset/scoped-indexing-settings.md
deleted file mode 100644
index 7ca7c5b213..0000000000
--- a/.changeset/scoped-indexing-settings.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Support configuring code indexing separately for global and project settings in Kilo Console, the CLI TUI, and VS Code.
diff --git a/.changeset/select-custom-question-answer.md b/.changeset/select-custom-question-answer.md
deleted file mode 100644
index f48e853936..0000000000
--- a/.changeset/select-custom-question-answer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep custom-answer selection in sync and show one submit action while entering custom text.
diff --git a/.changeset/session-patches-stay-whole.md b/.changeset/session-patches-stay-whole.md
deleted file mode 100644
index 05f145ceac..0000000000
--- a/.changeset/session-patches-stay-whole.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Preserve complete session state when applying partial session updates in VS Code.
diff --git a/.changeset/share-vscode-session-database.md b/.changeset/share-vscode-session-database.md
deleted file mode 100644
index aa85b9aa04..0000000000
--- a/.changeset/share-vscode-session-database.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Restore persisted sessions across development extension branches and worktrees.
diff --git a/.changeset/steady-tui-streams.md b/.changeset/steady-tui-streams.md
deleted file mode 100644
index 65b122ba07..0000000000
--- a/.changeset/steady-tui-streams.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Restore streamed responses in the CLI TUI and move code indexing status into the session sidebar.
diff --git a/.changeset/steady-vscode-streams.md b/.changeset/steady-vscode-streams.md
deleted file mode 100644
index 22a9d544a7..0000000000
--- a/.changeset/steady-vscode-streams.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep streamed conversation content visually stable while preserving virtualized transcript history.
diff --git a/.changeset/terminal-integrated-font.md b/.changeset/terminal-integrated-font.md
deleted file mode 100644
index efc164d402..0000000000
--- a/.changeset/terminal-integrated-font.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Agent Manager terminals now use `terminal.integrated.fontFamily` and `terminal.integrated.fontSize` (including Nerd Font glyphs) instead of the editor font.
diff --git a/.changeset/virtual-review-files.md b/.changeset/virtual-review-files.md
deleted file mode 100644
index 706e7b25ce..0000000000
--- a/.changeset/virtual-review-files.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep expanded Agent Manager reviews responsive by virtualizing file rows and preserving anchored scrolling.
diff --git a/.changeset/warm-agent-manager-mcp.md b/.changeset/warm-agent-manager-mcp.md
deleted file mode 100644
index 1a052339ee..0000000000
--- a/.changeset/warm-agent-manager-mcp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Start MCP servers while Agent Manager worktree sessions initialize to reduce the delay before the first response.
diff --git a/bun.lock b/bun.lock
index 4aaf1d6a8a..b64f438b9e 100644
--- a/bun.lock
+++ b/bun.lock
@@ -33,7 +33,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -96,7 +96,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "effect": "catalog:",
@@ -109,7 +109,7 @@
     },
     "packages/kilo-console": {
       "name": "@kilocode/kilo-console",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/kilo-web-ui": "workspace:*",
         "@kilocode/sdk": "workspace:*",
@@ -131,7 +131,7 @@
     },
     "packages/kilo-docs": {
       "name": "@kilocode/kilo-docs",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@docsearch/css": "^4",
         "@docsearch/js": "^4",
@@ -161,7 +161,7 @@
     },
     "packages/kilo-gateway": {
       "name": "@kilocode/kilo-gateway",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/anthropic": "3.0.71",
@@ -198,7 +198,7 @@
     },
     "packages/kilo-i18n": {
       "name": "@kilocode/kilo-i18n",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "devDependencies": {
         "@tsconfig/node22": "catalog:",
         "@types/bun": "catalog:",
@@ -208,7 +208,7 @@
     },
     "packages/kilo-indexing": {
       "name": "@kilocode/kilo-indexing",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@aws-sdk/client-bedrock-runtime": "3.1005.0",
         "@aws-sdk/credential-provider-ini": "3.972.31",
@@ -240,11 +240,11 @@
     },
     "packages/kilo-jetbrains": {
       "name": "@kilocode/kilo-jetbrains",
-      "version": "7.3.42",
+      "version": "7.3.44",
     },
     "packages/kilo-telemetry": {
       "name": "@kilocode/kilo-telemetry",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/kilo-gateway": "workspace:*",
         "posthog-node": "4.4.0",
@@ -258,7 +258,7 @@
     },
     "packages/kilo-ui": {
       "name": "@kilocode/kilo-ui",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "0.13.11",
@@ -295,7 +295,7 @@
     },
     "packages/kilo-vscode": {
       "name": "kilo-code",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.39.0",
         "@kilocode/kilo-gateway": "workspace:*",
@@ -361,7 +361,7 @@
     },
     "packages/kilo-web-ui": {
       "name": "@kilocode/kilo-web-ui",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/kilo-ui": "workspace:*",
         "@kobalte/core": "catalog:",
@@ -376,7 +376,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@smithy/eventstream-codec": "4.2.14",
         "@smithy/util-utf8": "4.2.2",
@@ -394,7 +394,7 @@
     },
     "packages/opencode": {
       "name": "@kilocode/cli",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "bin": {
         "kilo": "./bin/kilo",
         "kilocode": "./bin/kilo",
@@ -562,7 +562,7 @@
     },
     "packages/plugin": {
       "name": "@kilocode/plugin",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "effect": "catalog:",
@@ -590,7 +590,7 @@
     },
     "packages/plugin-atomic-chat": {
       "name": "@kilocode/plugin-atomic-chat",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/plugin": "workspace:*",
       },
@@ -604,7 +604,7 @@
     },
     "packages/script": {
       "name": "@opencode-ai/script",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "semver": "^7.6.3",
       },
@@ -615,7 +615,7 @@
     },
     "packages/sdk/js": {
       "name": "@kilocode/sdk",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -630,7 +630,7 @@
     },
     "packages/storybook": {
       "name": "@opencode-ai/storybook",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "devDependencies": {
         "@opencode-ai/ui": "workspace:*",
         "@solidjs/meta": "catalog:",
@@ -653,7 +653,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "7.3.42",
+      "version": "7.3.44",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "catalog:",
diff --git a/package.json b/package.json
index 4a60f5b96d..2d917c1b84 100644
--- a/package.json
+++ b/package.json
@@ -153,6 +153,6 @@
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
     "mammoth@1.12.0": "patches/mammoth@1.12.0.patch"
   },
-  "version": "7.3.42",
+  "version": "7.3.44",
   "peerDependencies": {}
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index 399035f267..3950411e28 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index c339ebfb6e..e7407da1fc 100644
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "kilo"
 name = "Kilo"
 description = "The open source coding agent."
-version = "7.3.42"
+version = "7.3.44"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/Kilo-Org/kilocode"
@@ -11,26 +11,26 @@ name = "Kilo"
 icon = "./icons/opencode.svg"
 
 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.42/opencode-darwin-arm64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.44/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.42/opencode-darwin-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.44/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.42/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.44/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.42/opencode-linux-x64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.44/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.42/opencode-windows-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.3.44/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index f56ba06f6e..b88dfd7bf5 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "name": "@opencode-ai/http-recorder",
   "type": "module",
   "license": "MIT",
diff --git a/packages/kilo-console/package.json b/packages/kilo-console/package.json
index 597aa5389f..acfe152b57 100644
--- a/packages/kilo-console/package.json
+++ b/packages/kilo-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-console",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/kilo-docs/package.json b/packages/kilo-docs/package.json
index 6395895b0a..f9c390508e 100644
--- a/packages/kilo-docs/package.json
+++ b/packages/kilo-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-docs",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "private": true,
   "scripts": {
     "dev": "next dev --webpack --port 3002",
diff --git a/packages/kilo-gateway/package.json b/packages/kilo-gateway/package.json
index 7d0f79eaf0..60dd1290ef 100644
--- a/packages/kilo-gateway/package.json
+++ b/packages/kilo-gateway/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-gateway",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration",
diff --git a/packages/kilo-i18n/package.json b/packages/kilo-i18n/package.json
index 537801dd87..41ea52dbb1 100644
--- a/packages/kilo-i18n/package.json
+++ b/packages/kilo-i18n/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-i18n",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "description": "Kilo-specific i18n translations and overrides",
diff --git a/packages/kilo-indexing/package.json b/packages/kilo-indexing/package.json
index 387af5a105..b4ba80ac74 100644
--- a/packages/kilo-indexing/package.json
+++ b/packages/kilo-indexing/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-indexing",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "description": "Standalone indexing engine and host helpers for Kilo Code",
diff --git a/packages/kilo-jetbrains/package.json b/packages/kilo-jetbrains/package.json
index 3a26cde6a4..7be1146275 100644
--- a/packages/kilo-jetbrains/package.json
+++ b/packages/kilo-jetbrains/package.json
@@ -8,7 +8,7 @@
     "test": "./gradlew test",
     "test:ci": "bun script/test-ci.ts"
   },
-  "version": "7.3.42",
+  "version": "7.3.44",
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {}
diff --git a/packages/kilo-telemetry/package.json b/packages/kilo-telemetry/package.json
index 029717c9b7..ba62e1b15b 100644
--- a/packages/kilo-telemetry/package.json
+++ b/packages/kilo-telemetry/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-telemetry",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "description": "Telemetry for Kilo CLI - PostHog analytics integration",
diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json
index a390244285..351c233a71 100644
--- a/packages/kilo-ui/package.json
+++ b/packages/kilo-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-ui",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/kilo-vscode/CHANGELOG.md b/packages/kilo-vscode/CHANGELOG.md
index 96035f23aa..bb09c03bb3 100644
--- a/packages/kilo-vscode/CHANGELOG.md
+++ b/packages/kilo-vscode/CHANGELOG.md
@@ -1,5 +1,67 @@
 # kilo-code
 
+## 7.3.44
+
+### Minor Changes
+
+- [#11082](https://github.com/Kilo-Org/kilocode/pull/11082) [`a16e82a`](https://github.com/Kilo-Org/kilocode/commit/a16e82a77abf883c2c07c11464d50e08a518acd7) - Use embedded LanceDB as the default semantic search vector store so indexing works without a separate Qdrant server. Existing Qdrant users and Intel Mac users can select `qdrant` with `indexing.vectorStore`.
+
+### Patch Changes
+
+- [#11001](https://github.com/Kilo-Org/kilocode/pull/11001) [`b64d7e0`](https://github.com/Kilo-Org/kilocode/commit/b64d7e00953a6b99b3e41019d811a3917c465880) - Preserve existing Agent Manager worktrees and use deterministic suffixes when explicit branch names collide.
+
+- [#10084](https://github.com/Kilo-Org/kilocode/pull/10084) [`f180658`](https://github.com/Kilo-Org/kilocode/commit/f180658b99e88825f27fdd84dd34cdddb5347792) Thanks [@sylwester-liljegren](https://github.com/sylwester-liljegren)! - Group Kilo Code commands in the VS Code command palette and clarify the Open in Tab command title.
+
+- [#11118](https://github.com/Kilo-Org/kilocode/pull/11118) [`143ae8e`](https://github.com/Kilo-Org/kilocode/commit/143ae8e99205e7c8bc4743a1ff33e6ac8d456cc6) - Dismiss stale permission prompts when another view has already answered them.
+
+- [#11094](https://github.com/Kilo-Org/kilocode/pull/11094) [`4acc1f8`](https://github.com/Kilo-Org/kilocode/commit/4acc1f8bcccc48f01fc046d799f5546bff247407) - Keep large chat transcripts responsive by mounting only viewport-visible conversation rows.
+
+- [#11154](https://github.com/Kilo-Org/kilocode/pull/11154) [`9129844`](https://github.com/Kilo-Org/kilocode/commit/9129844225e2e0bc551cd91dcdbacf046992e94b) - Load large Agent Manager change reviews faster without deferring file previews.
+
+- [#11075](https://github.com/Kilo-Org/kilocode/pull/11075) [`e17ce0c`](https://github.com/Kilo-Org/kilocode/commit/e17ce0c9ecaf4cc4cad3e0fd99b28bef561705fc) - Speed up large session forks by retaining final task outcomes instead of duplicating resumable subagent histories, and load completed task details only when expanded.
+
+- [#11081](https://github.com/Kilo-Org/kilocode/pull/11081) [`9c279a1`](https://github.com/Kilo-Org/kilocode/commit/9c279a16b4a14fc117f34d7aa19e771149031931) - Show model free and prompt-training indicators only when their explicit catalog metadata is enabled.
+
+- [#11100](https://github.com/Kilo-Org/kilocode/pull/11100) [`5b38d29`](https://github.com/Kilo-Org/kilocode/commit/5b38d299c439e076857e84390a9355372190557a) - Keep HTTP status codes beside tool error titles when error details wrap.
+
+- [#11101](https://github.com/Kilo-Org/kilocode/pull/11101) [`294c532`](https://github.com/Kilo-Org/kilocode/commit/294c532f6a355b78ed86d2188891883b07e90cc8) - Prevent task subagents from asking questions that users cannot answer from the parent session.
+
+- [#11103](https://github.com/Kilo-Org/kilocode/pull/11103) [`8b2a100`](https://github.com/Kilo-Org/kilocode/commit/8b2a100084496deca171243ddd50a26fa74343f2) - Show the first Agent Manager Local prompt and progress indicator immediately while its session is being created.
+
+- [#11104](https://github.com/Kilo-Org/kilocode/pull/11104) [`514af4c`](https://github.com/Kilo-Org/kilocode/commit/514af4c36145610e22d3888b7b5836fab1351272) - Open subagent transcripts faster while preserving live reasoning and paginating long histories.
+
+- [#11151](https://github.com/Kilo-Org/kilocode/pull/11151) [`77fe7c9`](https://github.com/Kilo-Org/kilocode/commit/77fe7c9e3fee173276401ad45774e2031d394443) - Keep binary and audio files collapsed in diff reviews instead of showing empty diff panels.
+
+- [#11097](https://github.com/Kilo-Org/kilocode/pull/11097) [`f8ec1dc`](https://github.com/Kilo-Org/kilocode/commit/f8ec1dc7a8c0ab0b88d1cd14e35182adef33847a) - Remove the unsupported paste-summary toggle from VS Code settings.
+
+- [#11091](https://github.com/Kilo-Org/kilocode/pull/11091) [`57bef8a`](https://github.com/Kilo-Org/kilocode/commit/57bef8ae68793c9b627ba0400b596bf932311e17) - Prevent streamed tool calls from executing twice and leaving answered questions disabled in VS Code.
+
+- [#11031](https://github.com/Kilo-Org/kilocode/pull/11031) [`bbfd59b`](https://github.com/Kilo-Org/kilocode/commit/bbfd59b85c383277fd8db77fcfd0ec56ea1a25d8) - Remove the unsupported code search tool.
+
+- [#11133](https://github.com/Kilo-Org/kilocode/pull/11133) [`68fd8cc`](https://github.com/Kilo-Org/kilocode/commit/68fd8ccce4d0a9b6987ea9c620a072a15b924c9c) - Keep permission approvals working when continuing or switching Agent Manager worktree sessions.
+
+- [#10866](https://github.com/Kilo-Org/kilocode/pull/10866) [`d5112ed`](https://github.com/Kilo-Org/kilocode/commit/d5112edf90d33333d1064c7ab885cf0a4d92d892) - Support configuring code indexing separately for global and project settings in Kilo Console, the CLI TUI, and VS Code.
+
+- [#11051](https://github.com/Kilo-Org/kilocode/pull/11051) [`856fc66`](https://github.com/Kilo-Org/kilocode/commit/856fc6665617d0a9753bc857fcd2c745b663196f) - Keep custom-answer selection in sync and show one submit action while entering custom text.
+
+- [#11031](https://github.com/Kilo-Org/kilocode/pull/11031) [`b2798ef`](https://github.com/Kilo-Org/kilocode/commit/b2798ef41e2b7875442aacaac65397a2d2be3b74) - Preserve complete session state when applying partial session updates in VS Code.
+
+- [#11087](https://github.com/Kilo-Org/kilocode/pull/11087) [`5969a4c`](https://github.com/Kilo-Org/kilocode/commit/5969a4c210beaf3dc968a56da541cfcdd7989d84) - Restore persisted sessions across development extension branches and worktrees.
+
+- [#11153](https://github.com/Kilo-Org/kilocode/pull/11153) [`7955f86`](https://github.com/Kilo-Org/kilocode/commit/7955f865d8f05920bf6a03e8daa5193da6e6b5f9) - Keep streamed conversation content visually stable while preserving virtualized transcript history.
+
+- [#11144](https://github.com/Kilo-Org/kilocode/pull/11144) [`287f75a`](https://github.com/Kilo-Org/kilocode/commit/287f75aa2bc84d931baccfb217dda0618be07ea9) - Agent Manager terminals now use `terminal.integrated.fontFamily` and `terminal.integrated.fontSize` (including Nerd Font glyphs) instead of the editor font.
+
+- [#11154](https://github.com/Kilo-Org/kilocode/pull/11154) [`9129844`](https://github.com/Kilo-Org/kilocode/commit/9129844225e2e0bc551cd91dcdbacf046992e94b) - Keep expanded Agent Manager reviews responsive by virtualizing file rows and preserving anchored scrolling.
+
+- [#11074](https://github.com/Kilo-Org/kilocode/pull/11074) [`915ecfb`](https://github.com/Kilo-Org/kilocode/commit/915ecfbefbaf1b0a7f5876dedbca6c79008ee771) - Start MCP servers while Agent Manager worktree sessions initialize to reduce the delay before the first response.
+
+- Updated dependencies [[`a16e82a`](https://github.com/Kilo-Org/kilocode/commit/a16e82a77abf883c2c07c11464d50e08a518acd7), [`e17ce0c`](https://github.com/Kilo-Org/kilocode/commit/e17ce0c9ecaf4cc4cad3e0fd99b28bef561705fc), [`9c279a1`](https://github.com/Kilo-Org/kilocode/commit/9c279a16b4a14fc117f34d7aa19e771149031931), [`57bef8a`](https://github.com/Kilo-Org/kilocode/commit/57bef8ae68793c9b627ba0400b596bf932311e17), [`b75af0d`](https://github.com/Kilo-Org/kilocode/commit/b75af0de8865234a745f71eac03bf2bdea2271b4)]:
+  - @kilocode/kilo-indexing@7.4.0
+  - @kilocode/kilo-ui@7.3.43
+  - @kilocode/kilo-gateway@7.3.43
+  - @opencode-ai/ui@7.3.43
+
 ## 7.3.42
 
 ### Minor Changes
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index 8627c3cb17..8bb48e6b2f 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -2,7 +2,7 @@
   "name": "kilo-code",
   "displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete",
   "description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "icon": "assets/icons/logo-outline-black.png",
   "galleryBanner": {
     "color": "#FFFFFF",
diff --git a/packages/kilo-vscode/tests/package.json b/packages/kilo-vscode/tests/package.json
index 4ed02fff18..1c1e4b5959 100644
--- a/packages/kilo-vscode/tests/package.json
+++ b/packages/kilo-vscode/tests/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {}
diff --git a/packages/kilo-web-ui/package.json b/packages/kilo-web-ui/package.json
index f98be58127..11325cc5cb 100644
--- a/packages/kilo-web-ui/package.json
+++ b/packages/kilo-web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-web-ui",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/llm/package.json b/packages/llm/package.json
index d3839f53eb..1bc44a2a49 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "name": "@opencode-ai/llm",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/CHANGELOG.md b/packages/opencode/CHANGELOG.md
index 2686990139..0bbffd6ef4 100644
--- a/packages/opencode/CHANGELOG.md
+++ b/packages/opencode/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @kilocode/cli
 
+## 7.3.44
+
+### Minor Changes
+
+- [#11082](https://github.com/Kilo-Org/kilocode/pull/11082) [`a16e82a`](https://github.com/Kilo-Org/kilocode/commit/a16e82a77abf883c2c07c11464d50e08a518acd7) - Use embedded LanceDB as the default semantic search vector store so indexing works without a separate Qdrant server. Existing Qdrant users and Intel Mac users can select `qdrant` with `indexing.vectorStore`.
+
+### Patch Changes
+
+- [#10922](https://github.com/Kilo-Org/kilocode/pull/10922) [`bc3af9a`](https://github.com/Kilo-Org/kilocode/commit/bc3af9a145c8bd5f90fa0c9b22a48cceb095f8b4) - Prevent unnecessary repeat auto-compactions when providers report inconsistent token totals.
+
+- [#11160](https://github.com/Kilo-Org/kilocode/pull/11160) [`78d83c0`](https://github.com/Kilo-Org/kilocode/commit/78d83c0651d5343c0f9f877265dc5136cd7761f0) - Preserve the calling model's reasoning effort when task subagents inherit that model.
+
+- [#10478](https://github.com/Kilo-Org/kilocode/pull/10478) [`5bc8df8`](https://github.com/Kilo-Org/kilocode/commit/5bc8df843a2492d2eee01963b5a2c1a55beab56c) - Allow hosted runtimes to cap shell command duration and explain environment-enforced timeouts.
+
+- [#11085](https://github.com/Kilo-Org/kilocode/pull/11085) [`2a6596b`](https://github.com/Kilo-Org/kilocode/commit/2a6596b0c578b20ea803fa69a8427fc3e4c2e823) - Indicate when no models are available in model-not-found errors.
+
+- [#11072](https://github.com/Kilo-Org/kilocode/pull/11072) [`6920f37`](https://github.com/Kilo-Org/kilocode/commit/6920f37b77f820d9f8542d352cf60e061670933b) - Speed up the first Agent Manager prompt in new worktrees by seeding snapshots from the checkout's Git index.
+
+- [#11075](https://github.com/Kilo-Org/kilocode/pull/11075) [`e17ce0c`](https://github.com/Kilo-Org/kilocode/commit/e17ce0c9ecaf4cc4cad3e0fd99b28bef561705fc) - Speed up large session forks by retaining final task outcomes instead of duplicating resumable subagent histories, and load completed task details only when expanded.
+
+- [#11143](https://github.com/Kilo-Org/kilocode/pull/11143) [`12144cf`](https://github.com/Kilo-Org/kilocode/commit/12144cf8275200a7dd8e29cf478c39504da59b04) Thanks [@IamCoder18](https://github.com/IamCoder18)! - Warn when `kilo console` or `kilo daemon` is invoked with an explicit `--port` outside the discovery range (4097–4116).
+
+- [#11006](https://github.com/Kilo-Org/kilocode/pull/11006) [`69a0b38`](https://github.com/Kilo-Org/kilocode/commit/69a0b384e6c61d190241087f88f2be4312e7517e) - Refresh connected provider model lists when the models catalog updates.
+
+- [#11081](https://github.com/Kilo-Org/kilocode/pull/11081) [`9c279a1`](https://github.com/Kilo-Org/kilocode/commit/9c279a16b4a14fc117f34d7aa19e771149031931) - Show model free and prompt-training indicators only when their explicit catalog metadata is enabled.
+
+- [#11101](https://github.com/Kilo-Org/kilocode/pull/11101) [`294c532`](https://github.com/Kilo-Org/kilocode/commit/294c532f6a355b78ed86d2188891883b07e90cc8) - Prevent task subagents from asking questions that users cannot answer from the parent session.
+
+- [#11102](https://github.com/Kilo-Org/kilocode/pull/11102) [`8a72708`](https://github.com/Kilo-Org/kilocode/commit/8a727084ae0327fbf195149660c19d2215fb558a) - Prevent duplicate CLI attention alerts and route Kilo prompts through the configurable notification system.
+
+- [#10866](https://github.com/Kilo-Org/kilocode/pull/10866) [`d5112ed`](https://github.com/Kilo-Org/kilocode/commit/d5112edf90d33333d1064c7ab885cf0a4d92d892) - Stabilize code indexing workers, retry Kilo model catalog downloads, reduce progress log noise, and show indexing failures as TUI notifications instead of writing over the terminal interface.
+
+- [#11147](https://github.com/Kilo-Org/kilocode/pull/11147) [`9a187d5`](https://github.com/Kilo-Org/kilocode/commit/9a187d5aad5c3bf90a6dac589a0b26069057c3b0) - Configure the project context sidebar width and default diff layout from Global Settings.
+
+- [#11091](https://github.com/Kilo-Org/kilocode/pull/11091) [`57bef8a`](https://github.com/Kilo-Org/kilocode/commit/57bef8ae68793c9b627ba0400b596bf932311e17) - Prevent streamed tool calls from executing twice and leaving answered questions disabled in VS Code.
+
+- [#11139](https://github.com/Kilo-Org/kilocode/pull/11139) [`7226635`](https://github.com/Kilo-Org/kilocode/commit/72266359d497f407f951c1b468a50d3093ec9dc3) - Restore Kilo branding, fork-specific CLI commands, and CLI lifecycle initialization after upstream merges.
+
+- [#11031](https://github.com/Kilo-Org/kilocode/pull/11031) [`bbfd59b`](https://github.com/Kilo-Org/kilocode/commit/bbfd59b85c383277fd8db77fcfd0ec56ea1a25d8) - Remove the unsupported code search tool.
+
+- [#11117](https://github.com/Kilo-Org/kilocode/pull/11117) [`b75af0d`](https://github.com/Kilo-Org/kilocode/commit/b75af0de8865234a745f71eac03bf2bdea2271b4) - Update the Vercel AI SDK providers for Cerebras, xAI, and OpenAI-compatible endpoints.
+
+- [#10866](https://github.com/Kilo-Org/kilocode/pull/10866) [`d5112ed`](https://github.com/Kilo-Org/kilocode/commit/d5112edf90d33333d1064c7ab885cf0a4d92d892) - Support configuring code indexing separately for global and project settings in Kilo Console, the CLI TUI, and VS Code.
+
+- [#11031](https://github.com/Kilo-Org/kilocode/pull/11031) [`28a26b1`](https://github.com/Kilo-Org/kilocode/commit/28a26b11c133686a4656af8be21af619c919301a) - Restore streamed responses in the CLI TUI and move code indexing status into the session sidebar.
+
+- Updated dependencies [[`a16e82a`](https://github.com/Kilo-Org/kilocode/commit/a16e82a77abf883c2c07c11464d50e08a518acd7), [`9c279a1`](https://github.com/Kilo-Org/kilocode/commit/9c279a16b4a14fc117f34d7aa19e771149031931), [`57bef8a`](https://github.com/Kilo-Org/kilocode/commit/57bef8ae68793c9b627ba0400b596bf932311e17), [`b75af0d`](https://github.com/Kilo-Org/kilocode/commit/b75af0de8865234a745f71eac03bf2bdea2271b4)]:
+  - @kilocode/kilo-indexing@7.4.0
+  - @kilocode/kilo-gateway@7.3.43
+  - @kilocode/kilo-telemetry@7.3.43
+  - @opencode-ai/ui@7.3.43
+
 ## 7.3.42
 
 ### Patch Changes
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 04fbb5211b..fc8a5fd515 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "name": "@kilocode/cli",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin-atomic-chat/package.json b/packages/plugin-atomic-chat/package.json
index e4813c72ec..0cdecc9257 100644
--- a/packages/plugin-atomic-chat/package.json
+++ b/packages/plugin-atomic-chat/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin-atomic-chat",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "description": "Kilo Code plugin for Atomic Chat: auto-detection and dynamic model discovery (OpenAI-compatible local API)",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index e77a5e0f14..e10fd21b4d 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/script/package.json b/packages/script/package.json
index f9670d0504..15ccb467af 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -12,6 +12,6 @@
   "exports": {
     ".": "./src/index.ts"
   },
-  "version": "7.3.42",
+  "version": "7.3.44",
   "peerDependencies": {}
 }
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 3577389a1d..e9b31bb122 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/sdk",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index a2e2a38654..a1c214ae14 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -26,7 +26,7 @@
     "typescript": "catalog:",
     "vite": "catalog:"
   },
-  "version": "7.3.42",
+  "version": "7.3.44",
   "dependencies": {},
   "peerDependencies": {}
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index be462435c5..84c3d2c56b 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/script/upstream/package.json b/script/upstream/package.json
index 719cf12638..7aa6b8580a 100644
--- a/script/upstream/package.json
+++ b/script/upstream/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/upstream-merge",
-  "version": "7.3.42",
+  "version": "7.3.44",
   "private": true,
   "type": "module",
   "description": "Scripts for automating upstream opencode merges into Kilo",

From b90ab85c3b4ad5097fe11e431d0319f31f935d6e Mon Sep 17 00:00:00 2001
From: Johnny Eric Amancio <johnnyeric@gmail.com>
Date: Fri, 12 Jun 2026 16:18:45 +0200
Subject: [PATCH 8/8] ci: clarify auto-close reopen message (#11163)

---
 .github/workflows/kilo-auto-close.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/kilo-auto-close.yml b/.github/workflows/kilo-auto-close.yml
index 5d1ce14a3c..b28a285f93 100644
--- a/.github/workflows/kilo-auto-close.yml
+++ b/.github/workflows/kilo-auto-close.yml
@@ -212,7 +212,7 @@ jobs:
 
             for (const pr of stalePrs) {
               const issue_number = pr.number
-              const closeComment = `To stay organized pull requests are automatically closed after ${PR_DAYS_INACTIVE} days of inactivity. If the pull request is still relevant please open a new one.`
+              const closeComment = `To stay organized pull requests are automatically closed after ${PR_DAYS_INACTIVE} days of inactivity. If the pull request is still relevant please reopen it or create a fresh new one.`
 
               if (dryRun) {
                 core.info(`[dry-run] Would close PR #${issue_number} from ${pr.author?.login || 'unknown'} (last activity: ${pr.activity.date.toISOString()} via ${pr.activity.source}): ${pr.title}`)
@@ -314,7 +314,7 @@ jobs:
             let skippedIssueCount = 0
 
             for (const issue of staleIssues) {
-              const closeComment = `To stay organized issues are automatically closed after ${ISSUE_DAYS_INACTIVE} days of no activity. If the issue is still relevant please open a new one.`
+              const closeComment = `To stay organized issues are automatically closed after ${ISSUE_DAYS_INACTIVE} days of no activity. If the issue is still relevant please reopen it or create a fresh new one.`
 
               if (dryRun) {
                 core.info(`[dry-run] Would close issue #${issue.number} (last activity: ${issue.activity.toISOString()} via updated): ${issue.title}`)