diff --git a/.changeset/fix-session-scope-toggle.md b/.changeset/fix-session-scope-toggle.md
new file mode 100644
index 00000000000..38396df275e
--- /dev/null
+++ b/.changeset/fix-session-scope-toggle.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Show current-worktree sessions by default in the TUI sessions dialog and keep all/current scope toggling working when a scope has no sessions.
diff --git a/.changeset/list-agent-manager-worktrees.md b/.changeset/list-agent-manager-worktrees.md
new file mode 100644
index 00000000000..2e15a890ad3
--- /dev/null
+++ b/.changeset/list-agent-manager-worktrees.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Show Agent Manager and other Git worktrees in the Kilo Console project view.
diff --git a/.changeset/preserve-console-review-expansion.md b/.changeset/preserve-console-review-expansion.md
new file mode 100644
index 00000000000..3b7f19283af
--- /dev/null
+++ b/.changeset/preserve-console-review-expansion.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Keep expanded Kilo Console file diffs open while resizing the context sidebar.
diff --git a/.changeset/preserve-console-terminals.md b/.changeset/preserve-console-terminals.md
new file mode 100644
index 00000000000..476e44608f8
--- /dev/null
+++ b/.changeset/preserve-console-terminals.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Keep Kilo Console terminal sessions open when changing diff layout and other console preferences.
diff --git a/flake.nix b/flake.nix
index 56438ab332e..7383da725db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,8 +76,11 @@
               };
 
             kilo-dev = pkgs.writeShellScriptBin "kilo-dev" ''
-                cd "$KILO_ROOT"
-              exec ${bun}/bin/bun dev "$@"
+              set -euo pipefail
+
+              : "''${KILO_ROOT:?KILO_ROOT is not set. Enter the flake dev shell from the repo root.}"
+              export KILO_DEV_CWD="$PWD"
+              exec ${bun}/bin/bun --cwd "$KILO_ROOT/packages/opencode" --conditions=browser ./src/index.ts "$@"
             '';
 
             kilo-install-bin = pkgs.writeShellScriptBin "kilo-install" ''
diff --git a/packages/kilo-console/src/client.ts b/packages/kilo-console/src/client.ts
index adca1648a7b..37b3822b2f6 100644
--- a/packages/kilo-console/src/client.ts
+++ b/packages/kilo-console/src/client.ts
@@ -29,6 +29,7 @@ import type {
   VcsInfo,
   Worktree,
   WorktreeDiffItem,
+  WorktreeListResponse,
 } from "@kilocode/sdk/v2/client"
 
 export type Scope = "global" | "project"
@@ -54,7 +55,7 @@ export type ProjectConsoleSnapshot = {
   project: ProjectItem
   config: EffectiveConfig
   vcs: VcsInfo
-  worktrees: string[]
+  worktrees: WorktreeListResponse
   terminals: ProjectTerminalItem[]
 }
 
@@ -447,7 +448,7 @@ export async function loadProjectConsole(input: ProjectConsoleQuery): Promise<Pr
   ])
   const dirs = demand("Worktrees", worktrees)
   const terminals = await Promise.all(
-    [query.dir, ...dirs].map((dir) => loadProjectTerminals({ url: input.url, dir }, dir)),
+    [query.dir, ...dirs.map((item) => item.directory)].map((dir) => loadProjectTerminals({ url: input.url, dir }, dir)),
   )
 
   return {
diff --git a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
index f4ad90840d8..b4d9e09955b 100644
--- a/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
+++ b/packages/kilo-console/src/routes/projects/ProjectConsoleRoute.tsx
@@ -58,6 +58,7 @@ type Context = {
   dir: string
   label: string
   kind: "local" | "worktree"
+  managed: boolean
 }
 
 type Editor = { kind: "create"; value: string } | { kind: "rename"; item: Context; value: string }
@@ -135,6 +136,7 @@ function refreshEvent(event: ProjectConsoleEvent) {
   if (type.startsWith("permission.")) return true
   if (type.startsWith("question.")) return true
   if (type.startsWith("message.")) return true
+  if (type === "global.config.updated") return true
   return false
 }
 
@@ -179,8 +181,14 @@ export function ProjectConsoleRoute() {
     const data = snap()
     if (!data) return []
     return [
-      { id: "local", dir: data.project.worktree, label: "Local", kind: "local" },
-      ...data.worktrees.map((dir) => ({ id: dir, dir, label: title(dir), kind: "worktree" as const })),
+      { id: "local", dir: data.project.worktree, label: "Local", kind: "local", managed: false },
+      ...data.worktrees.map((item) => ({
+        id: item.directory,
+        dir: item.directory,
+        label: title(item.directory),
+        kind: "worktree" as const,
+        managed: item.managed,
+      })),
     ]
   })
   const terminals = createMemo(() => {
@@ -499,8 +507,12 @@ export function ProjectConsoleRoute() {
     setEditor({ kind: "rename", item, value: displayLabel(item) })
   }
 
+  function canManage(item: Context | undefined) {
+    return item?.kind === "worktree" && item.managed
+  }
+
   function removeWorktree(item: Context) {
-    if (!projectInput() || item.kind === "local") return
+    if (!projectInput() || !canManage(item)) return
     setPending({ kind: "delete", item })
   }
 
@@ -512,7 +524,7 @@ export function ProjectConsoleRoute() {
 
   function resetSelected() {
     const item = current()
-    if (!projectInput() || !item || item.kind === "local") return
+    if (!projectInput() || !canManage(item)) return
     setPending({ kind: "reset", item })
   }
 
@@ -653,11 +665,14 @@ export function ProjectConsoleRoute() {
     const base = query()
     const data = snap()
     if (!base || !data) return
-    const dirs = new Set([data.project.worktree, ...data.worktrees])
+    const dirs = new Set([data.project.worktree, ...data.worktrees.map((item) => item.directory)])
     const stop = subscribeProjectEvents({ url: base.url, dir: data.project.worktree }, (event) => {
       if (event.directory !== "global" && !dirs.has(event.directory)) return
       const id = eventSession(event)
       if (id && messageEvent(event)) markUnread(id)
+      // Terminal fitting emits pty.updated for every width change. Ignore those refreshes while
+      // dragging so the controlled review accordion keeps its expanded files mounted.
+      if (resize.pending && eventType(event) === "pty.updated") return
       if (refreshEvent(event)) scheduleRefetch()
     })
     onCleanup(stop)
@@ -765,19 +780,21 @@ export function ProjectConsoleRoute() {
                           >
                             <Icon name="edit" size="small" />
                           </button>
-                          <button
-                            type="button"
-                            class="project-inline-action danger"
-                            onClick={(event) => {
-                              event.stopPropagation()
-                              removeWorktree(item)
-                            }}
-                            disabled={!!saving()}
-                            title={`Delete ${displayLabel(item)}`}
-                            aria-label={`Delete ${displayLabel(item)}`}
-                          >
-                            <Icon name="trash" size="small" />
-                          </button>
+                          <Show when={item.managed}>
+                            <button
+                              type="button"
+                              class="project-inline-action danger"
+                              onClick={(event) => {
+                                event.stopPropagation()
+                                removeWorktree(item)
+                              }}
+                              disabled={!!saving()}
+                              title={`Delete ${displayLabel(item)}`}
+                              aria-label={`Delete ${displayLabel(item)}`}
+                            >
+                              <Icon name="trash" size="small" />
+                            </button>
+                          </Show>
                         </Show>
                       </div>
                     </div>
@@ -913,7 +930,7 @@ export function ProjectConsoleRoute() {
           <code class="project-info-path" title={current()?.dir}>
             {current()?.dir ?? snap()?.project.worktree ?? project()}
           </code>
-          <Show when={current()?.kind === "worktree"}>
+          <Show when={canManage(current())}>
             <div class="project-info-actions">
               <Button variant="secondary" size="small" onClick={resetSelected} disabled={!!saving()}>
                 Reset
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx
index 1be189658c8..b42966dd8ed 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx
@@ -14,7 +14,6 @@ import { createDebouncedSignal } from "../util/signal"
 import { useToast } from "../ui/toast"
 import { openWorkspaceSelect, type WorkspaceSelection, warpWorkspaceSession } from "./dialog-workspace-create"
 import { Spinner } from "./spinner"
-import path from "path" // kilocode_change
 import { errorMessage } from "@/util/error"
 import { DialogSessionDeleteFailed } from "./dialog-session-delete-failed"
 import { WorkspaceLabel } from "./workspace-label"
@@ -31,7 +30,7 @@ export function DialogSessionList() {
   const toast = useToast()
   const [toDelete, setToDelete] = createSignal<string>()
   const [search, setSearch] = createDebouncedSignal("", 150)
-  const [global, setGlobal] = createSignal(true) // kilocode_change - show all worktrees by default
+  const [global, setGlobal] = createSignal(false) // kilocode_change - show current worktree by default
   const deleteHint = useCommandShortcut("session.delete")
   const quickSwitch1 = useCommandShortcut("session.quick_switch.1")
   const quickSwitch9 = useCommandShortcut("session.quick_switch.9")
@@ -39,15 +38,17 @@ export function DialogSessionList() {
   // kilocode_change start - always fetch from experimental endpoint (returns GlobalSession with worktree info)
   // TODO: extend /experimental/session to accept `scope`/`path` so this dialog can respect the
   // upstream `session_directory_filter_enabled` KV toggle (via sync.session.query()) while
-  // keeping worktree grouping. Currently the toggle has no effect here.
+  // keeping worktree grouping.
   const [searchResults, searchActions] = createResource(
-    () => search(),
-    async (query) => {
+    () => ({ query: search(), global: global(), directory: project.instance.directory() }), // kilocode_change
+    async (input) => {
       const result = await sdk.client.experimental.session.list(
         {
-          search: query || undefined,
+          search: input.query || undefined,
           roots: true,
           worktrees: true,
+          current: input.global ? undefined : "true",
+          directory: input.global ? undefined : input.directory || undefined,
           limit: 30,
         },
         { throwOnError: true },
@@ -59,15 +60,7 @@ export function DialogSessionList() {
 
   const currentSessionID = createMemo(() => (route.data.type === "session" ? route.data.sessionID : undefined))
 
-  // kilocode_change start - client-side worktree filtering when global is off
-  const sessions = createMemo(() => {
-    const all = searchResults() ?? []
-    if (global()) return all
-    const root = project.instance.path().worktree
-    if (!root || root === "/") return all
-    return all.filter((s) => s.directory === root || s.directory.startsWith(root + path.sep))
-  })
-  // kilocode_change end
+  const sessions = createMemo(() => searchResults() ?? []) // kilocode_change - endpoint applies worktree scope
 
   function recover(session: NonNullable<ReturnType<typeof sessions>[number]>) {
     const workspace = project.workspace.get(session.workspaceID!)
@@ -154,8 +147,6 @@ export function DialogSessionList() {
       .map((x) => x.id)
   }
 
-  const [browseOrder] = createSignal<string[]>(orderByRecency(sync.data.session))
-
   const quickSwitchHint = createMemo(() => {
     const first = quickSwitch1()
     const last = quickSwitch9()
@@ -176,8 +167,7 @@ export function DialogSessionList() {
         .map((x) => [x.id, x]),
     )
 
-    const searchResult = searchResults()
-    const displayOrder = searchResult ? orderByRecency(searchResult) : browseOrder()
+    const displayOrder = orderByRecency(sessions()) // kilocode_change - respect current scope
 
     const pinned = local.session.pinned().filter((id) => sessionMap.has(id))
     const pinnedSet = new Set(pinned)
@@ -335,6 +325,7 @@ export function DialogSessionList() {
         {
           command: "session.scope.toggle",
           title: global() ? "current" : "all",
+          requiresSelection: false,
           onTrigger: async () => {
             setToDelete(undefined)
             setGlobal((v) => !v)
diff --git a/packages/opencode/src/cli/cmd/tui/thread.ts b/packages/opencode/src/cli/cmd/tui/thread.ts
index 0a8c34865cc..e4fd896dfd0 100644
--- a/packages/opencode/src/cli/cmd/tui/thread.ts
+++ b/packages/opencode/src/cli/cmd/tui/thread.ts
@@ -84,12 +84,17 @@ async function input(value?: string) {
 }
 
 export function resolveThreadDirectory(project?: string, envPWD = process.env.PWD, cwd = process.cwd()) {
-  // kilocode_change start - ignore stale PWD from wrappers such as `bun --cwd`
+  // kilocode_change start - ignore stale PWD from wrappers such as `bun --cwd`, except kilo-dev's caller cwd
+  const dev = process.env.KILO_DEV_CWD
   const real = Filesystem.resolve(cwd)
-  const root = envPWD && Filesystem.resolve(envPWD) === real ? Filesystem.resolve(envPWD) : real
+  const root = dev
+    ? Filesystem.resolve(dev)
+    : envPWD && Filesystem.resolve(envPWD) === real
+      ? Filesystem.resolve(envPWD)
+      : real
   // kilocode_change end
   if (project) return Filesystem.resolve(path.isAbsolute(project) ? project : path.join(root, project))
-  return real // kilocode_change
+  return dev ? root : real // kilocode_change
 }
 
 export const TuiThreadCommand = cmd({
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index 700735d38cb..a211155ce4c 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -31,13 +31,7 @@ export interface DialogSelectProps<T> {
   onSelect?: (option: DialogSelectOption<T>) => void
   skipFilter?: boolean
   renderFilter?: boolean
-  actions?: {
-    command: string
-    title: string
-    side?: "left" | "right"
-    disabled?: boolean
-    onTrigger: (option: DialogSelectOption<T>) => void
-  }[]
+  actions?: DialogSelectAction<T>[] // kilocode_change - supports actions without a selected option
   footerHints?: {
     title: string
     label: string
@@ -47,6 +41,27 @@ export interface DialogSelectProps<T> {
   current?: T
 }
 
+// kilocode_change start - support list-level actions when no option is selected
+type DialogSelectActionBase = {
+  command: string
+  title: string
+  side?: "left" | "right"
+  disabled?: boolean
+}
+
+type DialogSelectAction<T> = DialogSelectActionBase &
+  (
+    | {
+        requiresSelection?: true
+        onTrigger: (option: DialogSelectOption<T>) => void
+      }
+    | {
+        requiresSelection: false
+        onTrigger: () => void
+      }
+  )
+// kilocode_change end
+
 export interface DialogSelectOption<T = any> {
   title: string
   value: T
@@ -303,6 +318,12 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
           category: "Dialog",
           run() {
             setStore("input", "keyboard")
+            // kilocode_change start - allow actions such as scope toggles on empty lists
+            if (item.requiresSelection === false) {
+              item.onTrigger()
+              return
+            }
+            // kilocode_change end
             const option = selected()
             if (!option) return
             item.onTrigger(option)
diff --git a/packages/opencode/src/effect/bridge.ts b/packages/opencode/src/effect/bridge.ts
index 46ba454d374..c608d839741 100644
--- a/packages/opencode/src/effect/bridge.ts
+++ b/packages/opencode/src/effect/bridge.ts
@@ -34,7 +34,8 @@ function captureSync() {
 export const bind = <Args extends readonly unknown[], Result>(fn: (...args: Args) => Result) => {
   const captured = captureSync()
   return (...args: Args) =>
-    restore(captured.instance, captured.workspace, () => // kilocode_change
+    restore(captured.instance, captured.workspace, () =>
+      // kilocode_change
       Effect.runSync(
         attachWith(
           Effect.sync(() => fn(...args)),
diff --git a/packages/opencode/src/installation/index.ts b/packages/opencode/src/installation/index.ts
index d262663f64f..6a8ef1e3d1a 100644
--- a/packages/opencode/src/installation/index.ts
+++ b/packages/opencode/src/installation/index.ts
@@ -12,7 +12,13 @@ import semver from "semver"
 import { InstallationChannel, InstallationVersion } from "@opencode-ai/core/installation/version"
 import { NpmConfig } from "@opencode-ai/core/npm-config"
 // kilocode_change start
-import { Brew as KiloBrew, Choco as KiloChoco, Npm as KiloNpm, Release as KiloRelease, Scoop as KiloScoop } from "@/kilocode/installation"
+import {
+  Brew as KiloBrew,
+  Choco as KiloChoco,
+  Npm as KiloNpm,
+  Release as KiloRelease,
+  Scoop as KiloScoop,
+} from "@/kilocode/installation"
 // kilocode_change end
 
 const log = Log.create({ service: "installation" })
@@ -224,7 +230,13 @@ export const layer: Layer.Layer<Service, never, HttpClient.HttpClient | AppProce
           return data.versions.stable
         }
 
-        if (detectedMethod === "npm" || detectedMethod === "yarn" || detectedMethod === "bun" || detectedMethod === "pnpm") { // kilocode_change
+        if (
+          detectedMethod === "npm" ||
+          detectedMethod === "yarn" ||
+          detectedMethod === "bun" ||
+          detectedMethod === "pnpm"
+        ) {
+          // kilocode_change
           const response = yield* httpOk.execute(
             HttpClientRequest.get(
               `${yield* NpmConfig.registry(process.cwd())}/${KiloNpm.path}/${InstallationChannel}`, // kilocode_change
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts
index 36796f1a6e9..0ffd2cef995 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/config-console.ts
@@ -79,8 +79,9 @@ export const configConsoleHandlers = HttpApiBuilder.group(InstanceHttpApi, "conf
         return yield* config.get()
       }
       if (body.scope === "global") {
-        const result = yield* config.updateGlobal(patch)
-        if (result.changed) {
+        const hot = Object.keys(patch).every((key) => key === "console")
+        const result = yield* config.updateGlobal(patch, hot ? { dispose: false } : undefined)
+        if (result.changed && !hot) {
           yield* disposeAllInstancesAndEmitGlobalDisposed({ swallowErrors: true }).pipe(
             Effect.catchCause(() => Effect.void),
           )
diff --git a/packages/opencode/src/kilocode/session/compaction-chunks.ts b/packages/opencode/src/kilocode/session/compaction-chunks.ts
index ea0b49cff94..e040d874709 100644
--- a/packages/opencode/src/kilocode/session/compaction-chunks.ts
+++ b/packages/opencode/src/kilocode/session/compaction-chunks.ts
@@ -63,12 +63,7 @@ export namespace KiloCompactionChunks {
     return input.result === "stop" && input.error?.name === "ContextOverflowError"
   }
 
-  export function needed(input: {
-    cfg: Config.Info
-    model: Provider.Model
-    tokens: number
-    outputTokenMax?: number
-  }) {
+  export function needed(input: { cfg: Config.Info; model: Provider.Model; tokens: number; outputTokenMax?: number }) {
     const mdl = model(input.model, input.outputTokenMax)
     // Apply 1.3x multiplier to token estimate to compensate for Token.estimate
     // under-counting actual provider tokenizer counts by ~15-30%.
diff --git a/packages/opencode/src/kilocode/session/index.ts b/packages/opencode/src/kilocode/session/index.ts
index 086db38c0a8..3899296bcc3 100644
--- a/packages/opencode/src/kilocode/session/index.ts
+++ b/packages/opencode/src/kilocode/session/index.ts
@@ -17,6 +17,7 @@ import type { Provider } from "@/provider/provider"
 import { zod as toZod } from "@opencode-ai/core/effect-zod"
 import { ENV_FEATURE } from "@kilocode/kilo-gateway"
 import { fn } from "@/kilocode/fn"
+import path from "path"
 
 export namespace KiloSession {
   const log = Log.create({ service: "session.kilo" })
@@ -316,6 +317,7 @@ export namespace KiloSession {
     projectID?: string
     directory?: string
     directories?: string[]
+    currentDirectory?: string
     roots?: boolean
     start?: number
     cursor?: number
@@ -360,6 +362,19 @@ export namespace KiloSession {
 
     const limit = input.limit ?? 100
     const dirs = [...new Set((input.directories ?? []).map((dir) => Filesystem.resolve(dir)))]
+    const sorted = [...dirs].sort((a, b) => b.length - a.length)
+    const worktree = (dir: string) => {
+      for (const root of sorted) {
+        if (!Filesystem.contains(root, dir)) continue
+        const rel = path.relative(root, dir)
+        const parts = rel.split(path.sep)
+        if ((parts[0] === ".kilo" || parts[0] === ".kilocode") && parts[1] === "worktrees" && parts[2]) {
+          return path.join(root, parts[0], parts[1], parts[2])
+        }
+        return root
+      }
+    }
+    const current = input.currentDirectory ? worktree(Filesystem.resolve(input.currentDirectory)) : undefined
 
     const rows = Database.use((db) => {
       const query =
@@ -377,7 +392,10 @@ export namespace KiloSession {
       dirs.length > 0
         ? rows.filter((row) => {
             const dir = Filesystem.resolve(row.directory)
-            return dirs.some((root) => Filesystem.contains(root, dir))
+            const root = worktree(dir)
+            if (!root) return false
+            if (input.currentDirectory) return root === current
+            return true
           })
         : rows
 
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
index 5edc8bbc1c2..e89229dc391 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/experimental.ts
@@ -55,7 +55,11 @@ export const ToolListQuery = Schema.Struct({
   model: ModelID,
 })
 
-const WorktreeList = Schema.Array(Schema.String)
+// kilocode_change start
+const WorktreeList = Schema.Array(
+  Schema.Struct({ directory: Schema.String, managed: Schema.Boolean }).annotate({ identifier: "WorktreeListItem" }),
+)
+// kilocode_change end
 const WorktreeErrorName = Schema.Union([
   Schema.Literal("WorktreeNotGitError"),
   Schema.Literal("WorktreeNameGenerationFailedError"),
@@ -77,6 +81,7 @@ export const SessionListQuery = Schema.Struct({
   // kilocode_change start
   projectID: Schema.optional(Schema.String),
   worktrees: Schema.optional(QueryBoolean),
+  current: Schema.optional(QueryBoolean),
   // kilocode_change end
   roots: Schema.optional(QueryBoolean),
   start: Schema.optional(Schema.NumberFromString),
@@ -176,13 +181,13 @@ export const ExperimentalApi = HttpApi.make("experimental")
         ),
         HttpApiEndpoint.get("worktree", ExperimentalPaths.worktree, {
           query: WorkspaceRoutingQuery,
-          success: described(WorktreeList, "List of worktree directories"),
+          success: described(WorktreeList, "List of worktrees"), // kilocode_change
           error: WorktreeApiError,
         }).annotateMerge(
           OpenApi.annotations({
             identifier: "worktree.list",
             summary: "List worktrees",
-            description: "List all sandbox worktrees for the current project.",
+            description: "List all git worktrees for the current project and whether Kilo manages them.", // kilocode_change
           }),
         ),
         HttpApiEndpoint.post("worktreeCreate", ExperimentalPaths.worktree, {
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/instance.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/instance.ts
index 1f3c841298b..511a831c056 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/instance.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/instance.ts
@@ -75,8 +75,7 @@ export const InstanceApi = HttpApi.make("instance")
           OpenApi.annotations({
             identifier: "path.get",
             summary: "Get paths",
-            description:
-              "Retrieve the current working directory and related path information for the Kilo instance.", // kilocode_change
+            description: "Retrieve the current working directory and related path information for the Kilo instance.", // kilocode_change
           }),
         ),
         HttpApiEndpoint.get("vcs", InstancePaths.vcs, {
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
index 383fb80fe00..35b361e922e 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts
@@ -112,10 +112,20 @@ export const experimentalHandlers = HttpApiBuilder.group(InstanceHttpApi, "exper
       return yield* registry.ids()
     })
 
+    // kilocode_change start - discover Agent Manager and external git worktrees
     const worktree = Effect.fn("ExperimentalHttpApi.worktree")(function* () {
       const ctx = yield* InstanceState.context
-      return yield* project.sandboxes(ctx.project.id)
+      const managed = new Set((yield* project.sandboxes(ctx.project.id)).map((dir) => Filesystem.resolve(dir)))
+      return yield* mapWorktreeError(worktreeSvc.list()).pipe(
+        Effect.map((items) =>
+          items.map((item) => ({
+            directory: item.directory,
+            managed: managed.has(Filesystem.resolve(item.directory)),
+          })),
+        ),
+      )
     })
+    // kilocode_change end
 
     const worktreeCreate = Effect.fn("ExperimentalHttpApi.worktreeCreate")(function* (ctx: {
       payload: Worktree.CreateInput | undefined
@@ -192,14 +202,18 @@ export const experimentalHandlers = HttpApiBuilder.group(InstanceHttpApi, "exper
       // kilocode_change start
       const state = yield* InstanceState.context
       const projectID = ctx.query.worktrees && !ctx.query.projectID ? state.project.id : ctx.query.projectID
-      const directories = ctx.query.worktrees ? yield* WorktreeFamily.list() : undefined
-      const sorted = directories ? [...directories].sort((a, b) => b.length - a.length) : undefined
+      const roots = ctx.query.worktrees ? yield* WorktreeFamily.list() : undefined
+      const directory = ctx.query.current ? ctx.query.directory : undefined
+      const sorted = roots ? [...roots].sort((a, b) => b.length - a.length) : undefined
+      const current = sorted && directory ? sorted.find((dir) => Filesystem.contains(dir, directory)) : undefined
       // kilocode_change end
+      if (roots && directory && !current) return HttpServerResponse.jsonUnsafe([]) // kilocode_change
       const sessions = Array.from(
         Session.listGlobal({
           projectID, // kilocode_change
           directory: ctx.query.worktrees ? undefined : ctx.query.directory, // kilocode_change
-          directories, // kilocode_change
+          directories: roots, // kilocode_change
+          currentDirectory: directory, // kilocode_change
           roots: ctx.query.roots,
           start: ctx.query.start,
           cursor: ctx.query.cursor,
diff --git a/packages/opencode/src/session/compaction.ts b/packages/opencode/src/session/compaction.ts
index 379e41f0bf4..b4246512197 100644
--- a/packages/opencode/src/session/compaction.ts
+++ b/packages/opencode/src/session/compaction.ts
@@ -144,7 +144,8 @@ function buildPrompt(input: { previousSummary?: string; context: string[] }) {
   return [anchor, SUMMARY_TEMPLATE, ...input.context].join("\n\n")
 }
 
-function preserveRecentBudget(input: { cfg: Config.Info; model: Provider.Model; outputTokenMax?: number }) { // kilocode_change
+function preserveRecentBudget(input: { cfg: Config.Info; model: Provider.Model; outputTokenMax?: number }) {
+  // kilocode_change
   return (
     input.cfg.compaction?.preserve_recent_tokens ??
     Math.min(MAX_PRESERVE_RECENT_TOKENS, Math.max(MIN_PRESERVE_RECENT_TOKENS, Math.floor(usable(input) * 0.25)))
@@ -522,7 +523,8 @@ export const layer = Layer.effect(
         })
       }
 
-      if (fallback === "continue" && input.auto) { // kilocode_change
+      if (fallback === "continue" && input.auto) {
+        // kilocode_change
         if (replay) {
           // kilocode_change start - compact oversized replay turns instead of looping into replay overflow
           replay = yield* KiloCompactionChunks.replay({
diff --git a/packages/opencode/src/session/session.ts b/packages/opencode/src/session/session.ts
index 30a14fb56e7..aa9eb83f401 100644
--- a/packages/opencode/src/session/session.ts
+++ b/packages/opencode/src/session/session.ts
@@ -1027,6 +1027,7 @@ export function* listGlobal(input?: {
   projectID?: string
   directory?: string
   directories?: string[]
+  currentDirectory?: string
   roots?: boolean
   start?: number
   cursor?: number
diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index d288165587a..b8957f34795 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -185,7 +185,7 @@ export const layer: Layer.Layer<Service, never, Requirements> =
             files: string[],
             opts?: { env?: Record<string, string>; root?: boolean },
           ) {
-          // kilocode_change end
+            // kilocode_change end
             if (!files.length) return
             // kilocode_change start
             // A new root snapshot covers the full worktree, so a single pathspec avoids
@@ -245,7 +245,8 @@ export const layer: Layer.Layer<Service, never, Requirements> =
             yield* fs.writeFileString(target, text ? `${text}\n` : "").pipe(Effect.orDie)
           })
 
-          const add = Effect.fnUntraced(function* (opts?: { env?: Record<string, string>; root?: boolean }) { // kilocode_change
+          const add = Effect.fnUntraced(function* (opts?: { env?: Record<string, string>; root?: boolean }) {
+            // kilocode_change
             yield* sync()
             const [diff, other] = yield* Effect.all(
               [
@@ -348,7 +349,8 @@ export const layer: Layer.Layer<Service, never, Requirements> =
             )
           })
 
-          const track = Effect.fnUntraced(function* (opts?: Parameters<Interface["track"]>[0]) { // kilocode_change
+          const track = Effect.fnUntraced(function* (opts?: Parameters<Interface["track"]>[0]) {
+            // kilocode_change
             return yield* locked(
               Effect.gen(function* () {
                 if (!(yield* enabled())) return
diff --git a/packages/opencode/src/storage/db.ts b/packages/opencode/src/storage/db.ts
index 2bd256bc510..7ecf8a0790c 100644
--- a/packages/opencode/src/storage/db.ts
+++ b/packages/opencode/src/storage/db.ts
@@ -30,9 +30,12 @@ const readRuntimeFlags = () =>
 
 export function getChannelPath(flags: Pick<DatabaseFlags, "disableChannelDb"> = readRuntimeFlags()) {
   if (["latest", "beta", "prod"].includes(InstallationChannel) || flags.disableChannelDb)
-    return path.join(Global.Path.data, "kilo.db")
+    return path.join(Global.Path.data, "kilo.db") // kilocode_change
   const safe = InstallationChannel.replace(/[^a-zA-Z0-9._-]/g, "-")
-  return path.join(Global.Path.data, `opencode-${safe}.db`)
+  const next = path.join(Global.Path.data, `kilo-${safe}.db`) // kilocode_change
+  const prev = path.join(Global.Path.data, `opencode-${safe}.db`) // kilocode_change
+  if (!existsSync(next) && existsSync(prev)) return prev // kilocode_change
+  return next // kilocode_change
 }
 
 export const getPath = (flags?: Pick<DatabaseFlags, "disableChannelDb">) => {
diff --git a/packages/opencode/src/tool/shell.ts b/packages/opencode/src/tool/shell.ts
index efa2adc294b..55d9a7bc123 100644
--- a/packages/opencode/src/tool/shell.ts
+++ b/packages/opencode/src/tool/shell.ts
@@ -312,7 +312,8 @@ const ask = Effect.fn("ShellTool.ask")(function* (
 
 function cmd(shell: string, command: string, cwd: string, env: NodeJS.ProcessEnv) {
   if (process.platform === "win32" && Shell.ps(shell)) {
-    return ChildProcess.make(shell, Shell.args(shell, command, cwd), { // kilocode_change - encoded PowerShell args
+    return ChildProcess.make(shell, Shell.args(shell, command, cwd), {
+      // kilocode_change - encoded PowerShell args
       cwd,
       env,
       stdin: "ignore",
diff --git a/packages/opencode/src/tool/warpgrep.ts b/packages/opencode/src/tool/warpgrep.ts
index 1336fbddfc0..81efd3f4cb4 100644
--- a/packages/opencode/src/tool/warpgrep.ts
+++ b/packages/opencode/src/tool/warpgrep.ts
@@ -61,7 +61,8 @@ export const CodebaseSearchTool = Tool.define(
               "Codebase search unavailable: free period ended. Set MORPH_API_KEY to continue. Get your key at https://www.morphllm.com/"
             if (isAuthOrRateLimit) {
               yield* Effect.promise(() =>
-                Bus.publish(Instance.current, TuiEvent.ToastShow, { // kilocode_change
+                Bus.publish(Instance.current, TuiEvent.ToastShow, {
+                  // kilocode_change
                   title: "Codebase Search Unavailable",
                   message: "Free period has ended. Set MORPH_API_KEY to continue. Get your key at morphllm.com",
                   variant: "error",
diff --git a/packages/opencode/test/cli/cmd/tui/attention.test.ts b/packages/opencode/test/cli/cmd/tui/attention.test.ts
index 10b1ee6d500..e37fa1f3819 100644
--- a/packages/opencode/test/cli/cmd/tui/attention.test.ts
+++ b/packages/opencode/test/cli/cmd/tui/attention.test.ts
@@ -184,7 +184,8 @@ describe("createTuiAttention", () => {
     const attention = createTuiAttention({ renderer, config: config(), audio: new FakeAudioEngine() })
     renderer.emit("blur")
 
-    expect(await attention.notify({ title: "Kilo", message: "hello", sound: false })).toEqual({ // kilocode_change
+    expect(await attention.notify({ title: "Kilo", message: "hello", sound: false })).toEqual({
+      // kilocode_change
       ok: true,
       notification: true,
       sound: false,
diff --git a/packages/opencode/test/kilocode/cli/tui/thread.test.ts b/packages/opencode/test/kilocode/cli/tui/thread.test.ts
index 5cb6e89fe3d..ba692626ca8 100644
--- a/packages/opencode/test/kilocode/cli/tui/thread.test.ts
+++ b/packages/opencode/test/kilocode/cli/tui/thread.test.ts
@@ -12,4 +12,20 @@ describe("kilo tui thread", () => {
 
     expect(resolveThreadDirectory(".", root.path, pkg)).toBe(pkg)
   })
+
+  test("uses kilo-dev caller directory when running through package cwd", async () => {
+    await using root = await tmpdir()
+    const pkg = path.join(root.path, "packages", "opencode")
+    await fs.mkdir(pkg, { recursive: true })
+
+    const prev = process.env.KILO_DEV_CWD
+    process.env.KILO_DEV_CWD = root.path
+    try {
+      expect(resolveThreadDirectory(".", root.path, pkg)).toBe(root.path)
+      expect(resolveThreadDirectory(undefined, root.path, pkg)).toBe(root.path)
+    } finally {
+      if (prev === undefined) delete process.env.KILO_DEV_CWD
+      else process.env.KILO_DEV_CWD = prev
+    }
+  })
 })
diff --git a/packages/opencode/test/kilocode/server/config-overlay.test.ts b/packages/opencode/test/kilocode/server/config-overlay.test.ts
index a92aa17808d..5ff6a891ee2 100644
--- a/packages/opencode/test/kilocode/server/config-overlay.test.ts
+++ b/packages/opencode/test/kilocode/server/config-overlay.test.ts
@@ -6,12 +6,14 @@ import { Server } from "../../../src/server/server"
 import { Config } from "../../../src/config/config"
 import { KilocodeConfigOverlay } from "../../../src/kilocode/config/overlay"
 import { Permission } from "../../../src/permission"
+import { PtyPaths } from "../../../src/server/routes/instance/httpapi/groups/pty"
 import { resetDatabase } from "../../fixture/db"
 import { disposeAllInstances, tmpdir } from "../../fixture/fixture"
 
 void Log.init({ print: false })
 
 const original = Global.Path.config
+const terminal = process.platform === "win32" ? test.skip : test.serial
 
 type Overlay = {
   fields: Record<string, { source: string; inherited: boolean; overridden: boolean; value?: unknown }>
@@ -323,6 +325,35 @@ describe("config overlay routes", () => {
     )
   })
 
+  terminal("preserves active terminals after updating global console preferences", async () => {
+    await using global = await tmpdir()
+    await using project = await tmpdir()
+    ;(Global.Path as { config: string }).config = global.path
+    const headers = { "x-kilo-directory": project.path }
+    const created = await Server.Default().app.request(PtyPaths.create, {
+      method: "POST",
+      headers: { ...headers, "content-type": "application/json" },
+      body: JSON.stringify({ command: "/usr/bin/env", args: ["sh", "-c", "sleep 30"], title: "console" }),
+    })
+    const info = await json<{ id: string }>(created)
+
+    try {
+      await json(
+        await request(Server.Default().app, undefined, "/config/overlay", {
+          method: "PATCH",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ scope: "global", set: { console: { diff_style: "split" } } }),
+        }),
+      )
+
+      const found = await Server.Default().app.request(PtyPaths.get.replace(":ptyID", info.id), { headers })
+      expect(found.status).toBe(200)
+      expect(await found.json()).toMatchObject({ id: info.id, title: "console", status: "running" })
+    } finally {
+      await Server.Default().app.request(PtyPaths.remove.replace(":ptyID", info.id), { method: "DELETE", headers })
+    }
+  })
+
   for (const value of [false, true]) {
     test.serial(
       `${value ? "httpapi" : "legacy"} global overlay update refreshes existing project instances without a project directory`,
diff --git a/packages/opencode/test/kilocode/server/worktree-list.test.ts b/packages/opencode/test/kilocode/server/worktree-list.test.ts
new file mode 100644
index 00000000000..cb6c526dd93
--- /dev/null
+++ b/packages/opencode/test/kilocode/server/worktree-list.test.ts
@@ -0,0 +1,68 @@
+import { $ } from "bun"
+import { describe, expect } from "bun:test"
+import path from "path"
+import { Effect, Layer, Schema } from "effect"
+import { HttpRouter } from "effect/unstable/http"
+import { Flag } from "@opencode-ai/core/flag/flag"
+import { HttpApiApp } from "../../../src/server/routes/instance/httpapi/server"
+import { ExperimentalPaths } from "../../../src/server/routes/instance/httpapi/groups/experimental"
+import { resetDatabase } from "../../fixture/db"
+import { TestInstance } from "../../fixture/fixture"
+import { testEffect } from "../../lib/effect"
+
+const state = Layer.effectDiscard(
+  Effect.gen(function* () {
+    const original = Flag.KILO_EXPERIMENTAL_WORKSPACES
+    Flag.KILO_EXPERIMENTAL_WORKSPACES = true
+    yield* Effect.addFinalizer(() =>
+      Effect.promise(async () => {
+        Flag.KILO_EXPERIMENTAL_WORKSPACES = original
+        await resetDatabase()
+      }),
+    )
+  }),
+)
+
+const it = testEffect(state)
+const run = process.platform === "win32" ? it.instance.skip : it.instance
+
+type Server = ReturnType<typeof HttpRouter.toWebHandler>
+
+function serve() {
+  return Effect.acquireRelease(
+    Effect.sync(() => HttpRouter.toWebHandler(HttpApiApp.routes, { disableLogger: true })),
+    (server) => Effect.promise(() => server.dispose()).pipe(Effect.ignore),
+  )
+}
+
+function request(server: Server, input: string) {
+  return Effect.promise(() => server.handler(new Request(new URL(input, "http://localhost")), HttpApiApp.context))
+}
+
+describe("Kilo Console worktree listing", () => {
+  run(
+    "lists worktrees created by Agent Manager",
+    () =>
+      Effect.gen(function* () {
+        const test = yield* TestInstance
+        const server = yield* serve()
+        const directory = path.join(test.directory, ".kilo", "worktrees", "console-list")
+        yield* Effect.promise(() =>
+          $`git worktree add --quiet -b console-list ${directory} HEAD`.cwd(test.directory).quiet(),
+        )
+
+        const response = yield* request(
+          server,
+          `${ExperimentalPaths.worktree}?directory=${encodeURIComponent(test.directory)}`,
+        )
+        expect(response.status).toBe(200)
+        const worktrees = Schema.decodeUnknownSync(
+          Schema.Array(Schema.Struct({ directory: Schema.String, managed: Schema.Boolean })),
+        )(yield* Effect.promise(() => response.json()))
+
+        expect(worktrees).toContainEqual({ directory, managed: false })
+        expect(worktrees.map((item) => item.directory)).not.toContain(test.directory)
+      }),
+    { git: true },
+  )
+})
diff --git a/packages/opencode/test/kilocode/storage/db.test.ts b/packages/opencode/test/kilocode/storage/db.test.ts
new file mode 100644
index 00000000000..6df91c65cf2
--- /dev/null
+++ b/packages/opencode/test/kilocode/storage/db.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, test } from "bun:test"
+import path from "path"
+import { Global } from "@opencode-ai/core/global"
+import { InstallationChannel } from "@opencode-ai/core/installation/version"
+import { Database } from "../../../src/storage/db"
+import { tmpdir } from "../../fixture/fixture"
+
+const custom = ["latest", "beta", "prod"].includes(InstallationChannel) ? test.skip : test
+
+describe("kilo channel database paths", () => {
+  custom("falls back to the old opencode channel database", async () => {
+    await using dir = await tmpdir()
+    const data = Global.Path.data
+    ;(Global.Path as { data: string }).data = dir.path
+
+    try {
+      const safe = InstallationChannel.replace(/[^a-zA-Z0-9._-]/g, "-")
+      const old = path.join(dir.path, `opencode-${safe}.db`)
+      await Bun.write(old, "")
+
+      expect(Database.getChannelPath({ disableChannelDb: false })).toBe(old)
+    } finally {
+      ;(Global.Path as { data: string }).data = data
+    }
+  })
+})
diff --git a/packages/opencode/test/server/experimental-session-list.test.ts b/packages/opencode/test/server/experimental-session-list.test.ts
index c4f01d8494d..2462de36446 100644
--- a/packages/opencode/test/server/experimental-session-list.test.ts
+++ b/packages/opencode/test/server/experimental-session-list.test.ts
@@ -156,4 +156,112 @@ describe("experimental.session.list", () => {
       await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow()
     }
   })
+
+  test("current=true narrows worktrees to the directory containing worktree", async () => {
+    await using first = await tmpdir({ git: true })
+    const worktree = path.join(first.path, "..", path.basename(first.path) + "-worktree")
+
+    try {
+      await $`git worktree add ${worktree} -b test-branch-current-${Date.now()}`.cwd(first.path).quiet()
+
+      try {
+        const { Server } = await import("../../src/server/server")
+
+        const branch = await withTestInstance({
+          directory: worktree,
+          fn: (ctx) => create("worktree-session", ctx),
+        })
+
+        const root = await withTestInstance({
+          directory: first.path,
+          fn: async (ctx) => ({
+            app: Server.Default().app,
+            project: await Server.Default().app.request("/project/current", {
+              headers: { "x-kilo-directory": first.path },
+            }),
+            session: await create("root-session", ctx),
+          }),
+        })
+
+        const app = root.app
+        const project = await root.project.json()
+        const cwd = path.join(worktree, "packages", "opencode")
+        const response = await app.request(
+          `/experimental/session?projectID=${encodeURIComponent(project.id)}&roots=true&worktrees=true&current=true&directory=${encodeURIComponent(cwd)}`,
+          {
+            headers: { "x-kilo-directory": first.path },
+          },
+        )
+
+        expect(response.status).toBe(200)
+        const body = await response.json()
+        const ids = body.map((item: { id: string }) => item.id)
+
+        expect(ids).toContain(branch.id)
+        expect(ids).not.toContain(root.session.id)
+      } finally {
+        mock.restore()
+      }
+    } finally {
+      await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow()
+    }
+  })
+
+  test("current=true excludes Agent Manager worktrees from the root worktree", async () => {
+    await using first = await tmpdir({ git: true })
+    const worktree = path.join(first.path, ".kilo", "worktrees", "nested-current")
+
+    try {
+      await $`git worktree add --quiet -b test-branch-nested-current-${Date.now()} ${worktree} HEAD`.cwd(first.path)
+
+      try {
+        const { Server } = await import("../../src/server/server")
+
+        const branch = await withTestInstance({
+          directory: worktree,
+          fn: (ctx) => create("worktree-session", ctx),
+        })
+
+        const root = await withTestInstance({
+          directory: first.path,
+          fn: async (ctx) => ({
+            app: Server.Default().app,
+            project: await Server.Default().app.request("/project/current", {
+              headers: { "x-kilo-directory": first.path },
+            }),
+            session: await create("root-session", ctx),
+          }),
+        })
+
+        const app = root.app
+        const project = await root.project.json()
+        const all = await app.request(
+          `/experimental/session?projectID=${encodeURIComponent(project.id)}&roots=true&worktrees=true&directory=${encodeURIComponent(first.path)}`,
+          {
+            headers: { "x-kilo-directory": first.path },
+          },
+        )
+        const current = await app.request(
+          `/experimental/session?projectID=${encodeURIComponent(project.id)}&roots=true&worktrees=true&current=true&directory=${encodeURIComponent(first.path)}`,
+          {
+            headers: { "x-kilo-directory": first.path },
+          },
+        )
+
+        expect(all.status).toBe(200)
+        expect(current.status).toBe(200)
+        const allIds = (await all.json()).map((item: { id: string }) => item.id)
+        const currentIds = (await current.json()).map((item: { id: string }) => item.id)
+
+        expect(allIds).toContain(root.session.id)
+        expect(allIds).toContain(branch.id)
+        expect(currentIds).toContain(root.session.id)
+        expect(currentIds).not.toContain(branch.id)
+      } finally {
+        mock.restore()
+      }
+    } finally {
+      await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow()
+    }
+  })
 })
diff --git a/packages/opencode/test/server/httpapi-config.test.ts b/packages/opencode/test/server/httpapi-config.test.ts
index 018b4bb773c..e3d0fbbe2bf 100644
--- a/packages/opencode/test/server/httpapi-config.test.ts
+++ b/packages/opencode/test/server/httpapi-config.test.ts
@@ -59,7 +59,8 @@ describe("config HttpApi", () => {
         lsp: false,
       })
       yield* Fiber.join(disposed)
-      expect(yield* Effect.promise(() => Bun.file(path.join(tmp.path, "opencode.json")).json())).toMatchObject({ // kilocode_change
+      expect(yield* Effect.promise(() => Bun.file(path.join(tmp.path, "opencode.json")).json())).toMatchObject({
+        // kilocode_change
         username: "patched-user",
         formatter: false,
         lsp: false,
diff --git a/packages/opencode/test/server/httpapi-event.test.ts b/packages/opencode/test/server/httpapi-event.test.ts
index 20d9d521263..7fa66b54b3c 100644
--- a/packages/opencode/test/server/httpapi-event.test.ts
+++ b/packages/opencode/test/server/httpapi-event.test.ts
@@ -230,8 +230,7 @@ describe("event HttpApi", () => {
       const sessionID = SessionID.make("ses_event_encoding")
       const session = readGlobalUntil(
         reader,
-        (event) =>
-          event.payload.type === SessionEvent.Text.Delta.type && properties(event).sessionID === sessionID,
+        (event) => event.payload.type === SessionEvent.Text.Delta.type && properties(event).sessionID === sessionID,
       )
       const sessionDomain = await AppRuntime.runPromise(
         EventV2.Service.use((events) =>
diff --git a/packages/opencode/test/server/httpapi-experimental.test.ts b/packages/opencode/test/server/httpapi-experimental.test.ts
index a5e47ea7bca..723ce1b885b 100644
--- a/packages/opencode/test/server/httpapi-experimental.test.ts
+++ b/packages/opencode/test/server/httpapi-experimental.test.ts
@@ -271,7 +271,7 @@ describe("experimental HttpApi", () => {
           Effect.gen(function* () {
             const listed = yield* request(ExperimentalPaths.worktree, tmp.directory)
             expect(listed.status).toBe(200)
-            expect(yield* json(listed)).toContain(info.directory)
+            expect(yield* json(listed)).toContainEqual({ directory: info.directory, managed: true }) // kilocode_change
 
             const reset = yield* request(ExperimentalPaths.worktreeReset, tmp.directory, {
               method: "POST",
diff --git a/packages/opencode/test/share/share-next.test.ts b/packages/opencode/test/share/share-next.test.ts
index 6609c0acfc0..5261d1a331d 100644
--- a/packages/opencode/test/share/share-next.test.ts
+++ b/packages/opencode/test/share/share-next.test.ts
@@ -317,12 +317,17 @@ describe("ShareNext", () => {
               },
             ], // kilocode_change
           })
-          const sync = yield* pollWithTimeout(Effect.sync(() => seen[0]), "share sync was not sent", "3 seconds") // kilocode_change
+          const sync = yield* pollWithTimeout(
+            Effect.sync(() => seen[0]),
+            "share sync was not sent",
+            "3 seconds",
+          ) // kilocode_change
 
           expect(seen).toHaveLength(1)
           expect(sync.url).toBe("https://legacy-share.example.com/api/share/shr_abc/sync") // kilocode_change
 
-          const body = JSON.parse(sync.body) as { // kilocode_change
+          const body = JSON.parse(sync.body) as {
+            // kilocode_change
             secret: string
             data: Array<{
               type: string
diff --git a/packages/opencode/test/storage/db.test.ts b/packages/opencode/test/storage/db.test.ts
index 0004310aa12..47b7d2d3f1e 100644
--- a/packages/opencode/test/storage/db.test.ts
+++ b/packages/opencode/test/storage/db.test.ts
@@ -13,7 +13,7 @@ describe("Database.getChannelPath", () => {
       const flags = yield* RuntimeFlags.Service
       const expected = ["latest", "beta", "prod"].includes(InstallationChannel)
         ? path.join(Global.Path.data, "kilo.db")
-        : path.join(Global.Path.data, `opencode-${InstallationChannel.replace(/[^a-zA-Z0-9._-]/g, "-")}.db`)
+        : path.join(Global.Path.data, `kilo-${InstallationChannel.replace(/[^a-zA-Z0-9._-]/g, "-")}.db`) // kilocode_change
 
       expect(Database.getChannelPath(flags)).toBe(expected)
     }).pipe(Effect.provide(RuntimeFlags.layer())),
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 0a1652757f1..636cd78b170 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -1195,6 +1195,7 @@ export class Session extends HeyApiClient {
       workspace?: string
       projectID?: string
       worktrees?: boolean
+      current?: "true" | "false"
       roots?: boolean | "true" | "false"
       start?: number
       cursor?: number
@@ -1213,6 +1214,7 @@ export class Session extends HeyApiClient {
             { in: "query", key: "workspace" },
             { in: "query", key: "projectID" },
             { in: "query", key: "worktrees" },
+            { in: "query", key: "current" },
             { in: "query", key: "roots" },
             { in: "query", key: "start" },
             { in: "query", key: "cursor" },
@@ -1649,7 +1651,7 @@ export class Worktree extends HeyApiClient {
   /**
    * List worktrees
    *
-   * List all sandbox worktrees for the current project.
+   * List all git worktrees for the current project and whether Kilo manages them.
    */
   public list<ThrowOnError extends boolean = false>(
     parameters?: {
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 914f4bb7ebd..e211d832229 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1639,6 +1639,11 @@ export type ToolList = Array<ToolListItem>
 
 export type ToolIds = Array<string>
 
+export type WorktreeListItem = {
+  directory: string
+  managed: boolean
+}
+
 export type WorktreeError = {
   name:
     | "WorktreeNotGitError"
@@ -4776,9 +4781,9 @@ export type WorktreeListError = WorktreeListErrors[keyof WorktreeListErrors]
 
 export type WorktreeListResponses = {
   /**
-   * List of worktree directories
+   * List of worktrees
    */
-  200: Array<string>
+  200: Array<WorktreeListItem>
 }
 
 export type WorktreeListResponse = WorktreeListResponses[keyof WorktreeListResponses]
@@ -4935,6 +4940,7 @@ export type ExperimentalSessionListData = {
     workspace?: string
     projectID?: string
     worktrees?: boolean
+    current?: "true" | "false"
     roots?: boolean | "true" | "false"
     start?: number
     cursor?: number
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 9e4e318453d..f35837d4b13 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -1062,15 +1062,15 @@
         ],
         "responses": {
           "200": {
-            "description": "List of worktree directories",
+            "description": "List of worktrees",
             "content": {
               "application/json": {
                 "schema": {
                   "type": "array",
                   "items": {
-                    "type": "string"
+                    "$ref": "#/components/schemas/WorktreeListItem"
                   },
-                  "description": "List of worktree directories"
+                  "description": "List of worktrees"
                 }
               }
             }
@@ -1086,7 +1086,7 @@
             }
           }
         },
-        "description": "List all sandbox worktrees for the current project.",
+        "description": "List all git worktrees for the current project and whether Kilo manages them.",
         "summary": "List worktrees",
         "x-codeSamples": [
           {
@@ -1522,6 +1522,15 @@
             },
             "required": false
           },
+          {
+            "name": "current",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "enum": ["true", "false"]
+            },
+            "required": false
+          },
           {
             "name": "roots",
             "in": "query",
@@ -12756,7 +12765,7 @@
             }
           }
         },
-        "description": "Remove a skill by deleting its directory from disk and clearing it from cache.",
+        "description": "Remove a skill by deleting its manifest from disk and clearing it from cache.",
         "summary": "Remove a skill",
         "requestBody": {
           "content": {
@@ -14436,9 +14445,6 @@
     "schemas": {
       "Event": {
         "anyOf": [
-          {
-            "$ref": "#/components/schemas/EventServerInstanceDisposed"
-          },
           {
             "$ref": "#/components/schemas/EventServerConnected"
           },
@@ -14449,37 +14455,49 @@
             "$ref": "#/components/schemas/EventGlobalConfigUpdated"
           },
           {
-            "$ref": "#/components/schemas/EventFileEdited"
+            "$ref": "#/components/schemas/Event.tui.prompt.append"
           },
           {
-            "$ref": "#/components/schemas/EventFileWatcherUpdated"
+            "$ref": "#/components/schemas/Event.tui.command.execute"
           },
           {
-            "$ref": "#/components/schemas/EventQuestionAsked"
+            "$ref": "#/components/schemas/EventTuiToastShow1"
           },
           {
-            "$ref": "#/components/schemas/EventQuestionReplied"
+            "$ref": "#/components/schemas/Event.tui.session.select"
           },
           {
-            "$ref": "#/components/schemas/EventQuestionRejected"
+            "$ref": "#/components/schemas/EventKilocodeAgent_managerStart"
           },
           {
-            "$ref": "#/components/schemas/EventLspClientDiagnostics"
+            "$ref": "#/components/schemas/EventIndexingStatus"
           },
           {
-            "$ref": "#/components/schemas/EventLspUpdated"
+            "$ref": "#/components/schemas/EventIndexingWarning"
           },
           {
-            "$ref": "#/components/schemas/Event.tui.prompt.append"
+            "$ref": "#/components/schemas/EventServerInstanceDisposed"
           },
           {
-            "$ref": "#/components/schemas/Event.tui.command.execute"
+            "$ref": "#/components/schemas/EventFileEdited"
           },
           {
-            "$ref": "#/components/schemas/EventTuiToastShow1"
+            "$ref": "#/components/schemas/EventFileWatcherUpdated"
           },
           {
-            "$ref": "#/components/schemas/Event.tui.session.select"
+            "$ref": "#/components/schemas/EventQuestionAsked"
+          },
+          {
+            "$ref": "#/components/schemas/EventQuestionReplied"
+          },
+          {
+            "$ref": "#/components/schemas/EventQuestionRejected"
+          },
+          {
+            "$ref": "#/components/schemas/EventLspClientDiagnostics"
+          },
+          {
+            "$ref": "#/components/schemas/EventLspUpdated"
           },
           {
             "$ref": "#/components/schemas/EventMcpToolsChanged"
@@ -14553,9 +14571,6 @@
           {
             "$ref": "#/components/schemas/EventSessionCompacted"
           },
-          {
-            "$ref": "#/components/schemas/EventKilocodeAgent_managerStart"
-          },
           {
             "$ref": "#/components/schemas/EventVcsBranchUpdated"
           },
@@ -14694,12 +14709,6 @@
           {
             "$ref": "#/components/schemas/EventSessionNextCompactionEnded"
           },
-          {
-            "$ref": "#/components/schemas/EventIndexingStatus"
-          },
-          {
-            "$ref": "#/components/schemas/EventIndexingWarning"
-          },
           {
             "$ref": "#/components/schemas/EventCatalogModelUpdated"
           },
@@ -14860,148 +14869,6 @@
           }
         ]
       },
-      "QuestionOption": {
-        "type": "object",
-        "properties": {
-          "label": {
-            "type": "string",
-            "description": "Display text (1-5 words, concise)"
-          },
-          "description": {
-            "type": "string",
-            "description": "Explanation of choice"
-          },
-          "labelKey": {
-            "type": "string"
-          },
-          "descriptionKey": {
-            "type": "string"
-          },
-          "mode": {
-            "type": "string"
-          }
-        },
-        "required": ["label", "description"],
-        "additionalProperties": false
-      },
-      "QuestionInfo": {
-        "type": "object",
-        "properties": {
-          "question": {
-            "type": "string",
-            "description": "Complete question"
-          },
-          "header": {
-            "type": "string",
-            "description": "Very short label (max 30 chars)"
-          },
-          "options": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/QuestionOption"
-            },
-            "description": "Available choices"
-          },
-          "multiple": {
-            "type": "boolean"
-          },
-          "questionKey": {
-            "type": "string"
-          },
-          "headerKey": {
-            "type": "string"
-          },
-          "custom": {
-            "type": "boolean"
-          }
-        },
-        "required": ["question", "header", "options"],
-        "additionalProperties": false
-      },
-      "QuestionTool": {
-        "type": "object",
-        "properties": {
-          "messageID": {
-            "type": "string",
-            "pattern": "^msg"
-          },
-          "callID": {
-            "type": "string"
-          }
-        },
-        "required": ["messageID", "callID"],
-        "additionalProperties": false
-      },
-      "QuestionRequest": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string",
-            "pattern": "^que"
-          },
-          "sessionID": {
-            "type": "string",
-            "pattern": "^ses"
-          },
-          "questions": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/QuestionInfo"
-            },
-            "description": "Questions to ask"
-          },
-          "blocking": {
-            "type": "boolean"
-          },
-          "tool": {
-            "$ref": "#/components/schemas/QuestionTool"
-          }
-        },
-        "required": ["id", "sessionID", "questions"],
-        "additionalProperties": false
-      },
-      "QuestionAnswer": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
-      },
-      "QuestionReplied": {
-        "type": "object",
-        "properties": {
-          "sessionID": {
-            "type": "string",
-            "pattern": "^ses"
-          },
-          "requestID": {
-            "type": "string",
-            "pattern": "^que"
-          },
-          "answers": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/QuestionAnswer"
-            }
-          }
-        },
-        "required": ["sessionID", "requestID", "answers"],
-        "additionalProperties": false
-      },
-      "QuestionRejected": {
-        "type": "object",
-        "properties": {
-          "sessionID": {
-            "type": "string",
-            "pattern": "^ses"
-          },
-          "requestID": {
-            "type": "string",
-            "pattern": "^que"
-          }
-        },
-        "required": ["sessionID", "requestID"],
-        "additionalProperties": false
-      },
       "Event.tui.prompt.append": {
         "type": "object",
         "properties": {
@@ -15136,58 +15003,244 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "SessionNetworkWait": {
+      "IndexingStatusState": {
+        "type": "string",
+        "enum": ["Disabled", "In Progress", "Complete", "Error", "Standby"]
+      },
+      "IndexingStatus": {
         "type": "object",
         "properties": {
-          "id": {
-            "type": "string",
-            "pattern": "^que"
-          },
-          "sessionID": {
-            "type": "string",
-            "pattern": "^ses"
+          "state": {
+            "$ref": "#/components/schemas/IndexingStatusState"
           },
           "message": {
             "type": "string"
           },
-          "restored": {
-            "type": "boolean"
+          "processedFiles": {
+            "type": "integer",
+            "minimum": 0
           },
-          "time": {
-            "type": "object",
-            "properties": {
-              "created": {
-                "type": "number"
-              },
-              "restored": {
-                "type": "number"
-              }
-            },
-            "required": ["created"],
-            "additionalProperties": false
+          "totalFiles": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "percent": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 100
           }
         },
-        "required": ["id", "sessionID", "message", "restored", "time"],
+        "required": ["state", "message", "processedFiles", "totalFiles", "percent"],
         "additionalProperties": false
       },
-      "PermissionRequest": {
+      "IndexingWarning": {
         "type": "object",
         "properties": {
-          "id": {
-            "type": "string",
-            "pattern": "^per"
-          },
-          "sessionID": {
+          "code": {
             "type": "string",
-            "pattern": "^ses"
+            "enum": ["qdrant.version-incompatible", "qdrant.version-unavailable"]
           },
-          "permission": {
+          "message": {
             "type": "string"
-          },
-          "patterns": {
-            "type": "array",
-            "items": {
-              "type": "string"
+          }
+        },
+        "required": ["code", "message"],
+        "additionalProperties": false
+      },
+      "QuestionOption": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string",
+            "description": "Display text (1-5 words, concise)"
+          },
+          "description": {
+            "type": "string",
+            "description": "Explanation of choice"
+          },
+          "labelKey": {
+            "type": "string"
+          },
+          "descriptionKey": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string"
+          }
+        },
+        "required": ["label", "description"],
+        "additionalProperties": false
+      },
+      "QuestionInfo": {
+        "type": "object",
+        "properties": {
+          "question": {
+            "type": "string",
+            "description": "Complete question"
+          },
+          "header": {
+            "type": "string",
+            "description": "Very short label (max 30 chars)"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionOption"
+            },
+            "description": "Available choices"
+          },
+          "multiple": {
+            "type": "boolean"
+          },
+          "questionKey": {
+            "type": "string"
+          },
+          "headerKey": {
+            "type": "string"
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": ["question", "header", "options"],
+        "additionalProperties": false
+      },
+      "QuestionTool": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string",
+            "pattern": "^msg"
+          },
+          "callID": {
+            "type": "string"
+          }
+        },
+        "required": ["messageID", "callID"],
+        "additionalProperties": false
+      },
+      "QuestionRequest": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "pattern": "^que"
+          },
+          "sessionID": {
+            "type": "string",
+            "pattern": "^ses"
+          },
+          "questions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionInfo"
+            },
+            "description": "Questions to ask"
+          },
+          "blocking": {
+            "type": "boolean"
+          },
+          "tool": {
+            "$ref": "#/components/schemas/QuestionTool"
+          }
+        },
+        "required": ["id", "sessionID", "questions"],
+        "additionalProperties": false
+      },
+      "QuestionAnswer": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "QuestionReplied": {
+        "type": "object",
+        "properties": {
+          "sessionID": {
+            "type": "string",
+            "pattern": "^ses"
+          },
+          "requestID": {
+            "type": "string",
+            "pattern": "^que"
+          },
+          "answers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionAnswer"
+            }
+          }
+        },
+        "required": ["sessionID", "requestID", "answers"],
+        "additionalProperties": false
+      },
+      "QuestionRejected": {
+        "type": "object",
+        "properties": {
+          "sessionID": {
+            "type": "string",
+            "pattern": "^ses"
+          },
+          "requestID": {
+            "type": "string",
+            "pattern": "^que"
+          }
+        },
+        "required": ["sessionID", "requestID"],
+        "additionalProperties": false
+      },
+      "SessionNetworkWait": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "pattern": "^que"
+          },
+          "sessionID": {
+            "type": "string",
+            "pattern": "^ses"
+          },
+          "message": {
+            "type": "string"
+          },
+          "restored": {
+            "type": "boolean"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "restored": {
+                "type": "number"
+              }
+            },
+            "required": ["created"],
+            "additionalProperties": false
+          }
+        },
+        "required": ["id", "sessionID", "message", "restored", "time"],
+        "additionalProperties": false
+      },
+      "PermissionRequest": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "pattern": "^per"
+          },
+          "sessionID": {
+            "type": "string",
+            "pattern": "^ses"
+          },
+          "permission": {
+            "type": "string"
+          },
+          "patterns": {
+            "type": "array",
+            "items": {
+              "type": "string"
             }
           },
           "metadata": {
@@ -17102,50 +17155,6 @@
         "required": ["text"],
         "additionalProperties": false
       },
-      "IndexingStatusState": {
-        "type": "string",
-        "enum": ["Disabled", "In Progress", "Complete", "Error", "Standby"]
-      },
-      "IndexingStatus": {
-        "type": "object",
-        "properties": {
-          "state": {
-            "$ref": "#/components/schemas/IndexingStatusState"
-          },
-          "message": {
-            "type": "string"
-          },
-          "processedFiles": {
-            "type": "integer",
-            "minimum": 0
-          },
-          "totalFiles": {
-            "type": "integer",
-            "minimum": 0
-          },
-          "percent": {
-            "type": "integer",
-            "minimum": 0,
-            "maximum": 100
-          }
-        },
-        "required": ["state", "message", "processedFiles", "totalFiles", "percent"],
-        "additionalProperties": false
-      },
-      "IndexingWarning": {
-        "type": "object",
-        "properties": {
-          "code": {
-            "type": "string",
-            "enum": ["qdrant.version-incompatible", "qdrant.version-unavailable"]
-          },
-          "message": {
-            "type": "string"
-          }
-        },
-        "required": ["code", "message"],
-        "additionalProperties": false
-      },
       "GlobalEvent": {
         "type": "object",
         "properties": {
@@ -17161,16 +17170,37 @@
           "payload": {
             "anyOf": [
               {
-                "$ref": "#/components/schemas/EventServerInstanceDisposed"
+                "$ref": "#/components/schemas/EventServerConnected"
               },
               {
-                "$ref": "#/components/schemas/EventServerConnected"
+                "$ref": "#/components/schemas/EventGlobalDisposed"
+              },
+              {
+                "$ref": "#/components/schemas/EventGlobalConfigUpdated"
+              },
+              {
+                "$ref": "#/components/schemas/Event.tui.prompt.append"
+              },
+              {
+                "$ref": "#/components/schemas/Event.tui.command.execute"
+              },
+              {
+                "$ref": "#/components/schemas/Event.tui.toast.show"
+              },
+              {
+                "$ref": "#/components/schemas/Event.tui.session.select"
+              },
+              {
+                "$ref": "#/components/schemas/EventKilocodeAgent_managerStart"
+              },
+              {
+                "$ref": "#/components/schemas/EventIndexingStatus"
               },
               {
-                "$ref": "#/components/schemas/EventGlobalDisposed"
+                "$ref": "#/components/schemas/EventIndexingWarning"
               },
               {
-                "$ref": "#/components/schemas/EventGlobalConfigUpdated"
+                "$ref": "#/components/schemas/EventServerInstanceDisposed"
               },
               {
                 "$ref": "#/components/schemas/EventFileEdited"
@@ -17193,18 +17223,6 @@
               {
                 "$ref": "#/components/schemas/EventLspUpdated"
               },
-              {
-                "$ref": "#/components/schemas/Event.tui.prompt.append"
-              },
-              {
-                "$ref": "#/components/schemas/Event.tui.command.execute"
-              },
-              {
-                "$ref": "#/components/schemas/Event.tui.toast.show"
-              },
-              {
-                "$ref": "#/components/schemas/Event.tui.session.select"
-              },
               {
                 "$ref": "#/components/schemas/EventMcpToolsChanged"
               },
@@ -17277,9 +17295,6 @@
               {
                 "$ref": "#/components/schemas/EventSessionCompacted"
               },
-              {
-                "$ref": "#/components/schemas/EventKilocodeAgent_managerStart"
-              },
               {
                 "$ref": "#/components/schemas/EventVcsBranchUpdated"
               },
@@ -17418,12 +17433,6 @@
               {
                 "$ref": "#/components/schemas/EventSessionNextCompactionEnded"
               },
-              {
-                "$ref": "#/components/schemas/EventIndexingStatus"
-              },
-              {
-                "$ref": "#/components/schemas/EventIndexingWarning"
-              },
               {
                 "$ref": "#/components/schemas/EventCatalogModelUpdated"
               },
@@ -19309,6 +19318,19 @@
           "type": "string"
         }
       },
+      "WorktreeListItem": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "managed": {
+            "type": "boolean"
+          }
+        },
+        "required": ["directory", "managed"],
+        "additionalProperties": false
+      },
       "WorktreeError": {
         "type": "object",
         "properties": {
@@ -23177,7 +23199,7 @@
         "required": ["type", "name", "id", "seq", "aggregateID", "data"],
         "additionalProperties": false
       },
-      "EventServerInstanceDisposed": {
+      "EventServerConnected": {
         "type": "object",
         "properties": {
           "id": {
@@ -23185,23 +23207,108 @@
           },
           "type": {
             "type": "string",
-            "enum": ["server.instance.disposed"]
+            "enum": ["server.connected"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {}
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
+      "EventGlobalDisposed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["global.disposed"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {}
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
+      "EventGlobalConfigUpdated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["global.config.updated"]
+          },
+          "properties": {
+            "type": "object",
+            "properties": {}
+          }
+        },
+        "required": ["id", "type", "properties"],
+        "additionalProperties": false
+      },
+      "EventKilocodeAgent_managerStart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["kilocode.agent_manager.start"]
           },
           "properties": {
             "type": "object",
             "properties": {
-              "directory": {
+              "requestID": {
                 "type": "string"
+              },
+              "sessionID": {
+                "type": "string",
+                "pattern": "^ses"
+              },
+              "mode": {
+                "type": "string",
+                "enum": ["worktree", "local"]
+              },
+              "versions": {
+                "type": "boolean"
+              },
+              "tasks": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "prompt": {
+                      "type": "string"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "branchName": {
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                "minItems": 1,
+                "maxItems": 20
               }
             },
-            "required": ["directory"],
+            "required": ["requestID", "sessionID", "mode", "tasks"],
             "additionalProperties": false
           }
         },
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventServerConnected": {
+      "EventIndexingStatus": {
         "type": "object",
         "properties": {
           "id": {
@@ -23209,17 +23316,23 @@
           },
           "type": {
             "type": "string",
-            "enum": ["server.connected"]
+            "enum": ["indexing.status"]
           },
           "properties": {
             "type": "object",
-            "properties": {}
+            "properties": {
+              "status": {
+                "$ref": "#/components/schemas/IndexingStatus"
+              }
+            },
+            "required": ["status"],
+            "additionalProperties": false
           }
         },
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventGlobalDisposed": {
+      "EventIndexingWarning": {
         "type": "object",
         "properties": {
           "id": {
@@ -23227,17 +23340,16 @@
           },
           "type": {
             "type": "string",
-            "enum": ["global.disposed"]
+            "enum": ["indexing.warning"]
           },
           "properties": {
-            "type": "object",
-            "properties": {}
+            "$ref": "#/components/schemas/IndexingWarning"
           }
         },
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventGlobalConfigUpdated": {
+      "EventServerInstanceDisposed": {
         "type": "object",
         "properties": {
           "id": {
@@ -23245,11 +23357,17 @@
           },
           "type": {
             "type": "string",
-            "enum": ["global.config.updated"]
+            "enum": ["server.instance.disposed"]
           },
           "properties": {
             "type": "object",
-            "properties": {}
+            "properties": {
+              "directory": {
+                "type": "string"
+              }
+            },
+            "required": ["directory"],
+            "additionalProperties": false
           }
         },
         "required": ["id", "type", "properties"],
@@ -24094,61 +24212,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventKilocodeAgent_managerStart": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["kilocode.agent_manager.start"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {
-              "requestID": {
-                "type": "string"
-              },
-              "sessionID": {
-                "type": "string",
-                "pattern": "^ses"
-              },
-              "mode": {
-                "type": "string",
-                "enum": ["worktree", "local"]
-              },
-              "versions": {
-                "type": "boolean"
-              },
-              "tasks": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "prompt": {
-                      "type": "string"
-                    },
-                    "name": {
-                      "type": "string"
-                    },
-                    "branchName": {
-                      "type": "string"
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "minItems": 1,
-                "maxItems": 20
-              }
-            },
-            "required": ["requestID", "sessionID", "mode", "tasks"],
-            "additionalProperties": false
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
       "EventVcsBranchUpdated": {
         "type": "object",
         "properties": {
@@ -25826,47 +25889,6 @@
         "required": ["id", "type", "properties"],
         "additionalProperties": false
       },
-      "EventIndexingStatus": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["indexing.status"]
-          },
-          "properties": {
-            "type": "object",
-            "properties": {
-              "status": {
-                "$ref": "#/components/schemas/IndexingStatus"
-              }
-            },
-            "required": ["status"],
-            "additionalProperties": false
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
-      "EventIndexingWarning": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": ["indexing.warning"]
-          },
-          "properties": {
-            "$ref": "#/components/schemas/IndexingWarning"
-          }
-        },
-        "required": ["id", "type", "properties"],
-        "additionalProperties": false
-      },
       "ModelV2Info": {
         "type": "object",
         "properties": {
diff --git a/packages/ui/src/components/markdown.tsx b/packages/ui/src/components/markdown.tsx
index 675fef4f141..c757af3e2cb 100644
--- a/packages/ui/src/components/markdown.tsx
+++ b/packages/ui/src/components/markdown.tsx
@@ -264,7 +264,8 @@ export function Markdown(
       key: local.cacheKey,
       streaming: local.streaming ?? false,
     }),
-    async (src): Promise<Rendered> => { // kilocode_change
+    async (src): Promise<Rendered> => {
+      // kilocode_change
       if (isServer) return { content: fallback(src.text), blocks: [] } // kilocode_change
       if (!src.text) return { content: "", blocks: [] } // kilocode_change
 
diff --git a/packages/ui/src/components/provider-icons/sprite.svg b/packages/ui/src/components/provider-icons/sprite.svg
index 190d2d8661b..32592999bca 100644
--- a/packages/ui/src/components/provider-icons/sprite.svg
+++ b/packages/ui/src/components/provider-icons/sprite.svg
@@ -1860,13 +1860,11 @@ OjAwvs/J9QAAACh0RVh0ZGF0ZTp0aW1lc3RhbXAAMjAyNi0wMy0yNVQwODowMToxNyswMDowMOna
       ></path>
     </symbol>
     <symbol viewBox="0 0 200 200" id="atomic-chat">
-      <g fill="currentColor">
-        <rect x="83" y="15" width="34" height="170" rx="17"></rect>
-        <rect x="83" y="15" width="34" height="170" rx="17" transform="rotate(45 100 100)"></rect>
-        <rect x="83" y="15" width="34" height="170" rx="17" transform="rotate(90 100 100)"></rect>
-        <rect x="83" y="15" width="34" height="170" rx="17" transform="rotate(135 100 100)"></rect>
-        <rect x="83" y="5" width="34" height="190" rx="17" transform="rotate(45 100 100)"></rect>
-      </g>
+      <image
+        width="200"
+        height="200"
+        xlink:href="data:image/png;base64,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"
+      ></image>
     </symbol>
     <symbol viewBox="0 0 40 40" id="anthropic">
       <path
diff --git a/packages/ui/src/components/provider-icons/types.ts b/packages/ui/src/components/provider-icons/types.ts
index bb4e24a2859..d73b912f817 100644
--- a/packages/ui/src/components/provider-icons/types.ts
+++ b/packages/ui/src/components/provider-icons/types.ts
@@ -110,7 +110,7 @@ export const iconNames = [
   "bailing",
   "azure",
   "azure-cognitive-services",
-  "atomic-chat", // kilocode_change
+  "atomic-chat",
   "anthropic",
   "amazon-bedrock",
   "alibaba",