+
+
{item}
}
diff --git a/packages/app/src/pages/layout/sidebar-project.tsx b/packages/app/src/pages/layout/sidebar-project.tsx
index 2528264561..aff0645dd8 100644
--- a/packages/app/src/pages/layout/sidebar-project.tsx
+++ b/packages/app/src/pages/layout/sidebar-project.tsx
@@ -23,6 +23,7 @@ export type ProjectSidebarContext = {
onProjectMouseEnter: (worktree: string, event: MouseEvent) => void
onProjectMouseLeave: (worktree: string) => void
onProjectFocus: (worktree: string) => void
+ onHoverOpenChanged: (worktree: string, hovered: boolean) => void
navigateToProject: (directory: string) => void
openSidebar: () => void
closeProject: (directory: string) => void
@@ -109,8 +110,14 @@ const ProjectTile = (props: {
"bg-surface-base-hover border border-border-weak-base": !props.selected() && props.active(),
}}
onPointerDown={(event) => {
+ if (event.button === 0 && !event.ctrlKey) {
+ props.setOpen(false)
+ props.setSuppressHover(true)
+ return
+ }
if (!props.overlay()) return
if (event.button !== 2 && !(event.button === 0 && event.ctrlKey)) return
+ props.setOpen(false)
props.setSuppressHover(true)
event.preventDefault()
}}
@@ -130,12 +137,11 @@ const ProjectTile = (props: {
props.onProjectFocus(props.project.worktree)
}}
onClick={() => {
+ props.setOpen(false)
if (props.selected()) {
- props.setSuppressHover(true)
layout.sidebar.toggle()
return
}
- props.setSuppressHover(false)
props.navigateToProject(props.project.worktree)
}}
onBlur={() => props.setOpen(false)}
@@ -192,7 +198,6 @@ const ProjectPreviewPanel = (props: {
projectChildren: Accessor>
workspaceSessions: (directory: string) => ReturnType
workspaceChildren: (directory: string) => Map
- setOpen: (value: boolean) => void
ctx: ProjectSidebarContext
language: ReturnType
}): JSX.Element => (
@@ -259,7 +264,7 @@ const ProjectPreviewPanel = (props: {
class="flex w-full text-left justify-start text-text-base px-2 hover:bg-transparent active:bg-transparent"
onClick={() => {
props.ctx.openSidebar()
- props.setOpen(false)
+ props.ctx.onHoverOpenChanged(props.project.worktree, false)
if (props.selected()) return
props.ctx.navigateToProject(props.project.worktree)
}}
@@ -284,28 +289,16 @@ export const SortableProject = (props: {
const workspaceEnabled = createMemo(() => props.ctx.workspacesEnabled(props.project))
const dirs = createMemo(() => props.ctx.workspaceIds(props.project))
const [state, setState] = createStore({
- open: false,
menu: false,
suppressHover: false,
})
+ const isHoverProject = () => props.ctx.hoverProject() === props.project.worktree
const preview = createMemo(() => !props.mobile && props.ctx.sidebarOpened())
const overlay = createMemo(() => !props.mobile && !props.ctx.sidebarOpened())
- const active = createMemo(
- () => state.menu || (preview() ? state.open : overlay() && props.ctx.hoverProject() === props.project.worktree),
- )
+ const active = createMemo(() => state.menu || (preview() ? isHoverProject() : overlay() && isHoverProject()))
- createEffect(() => {
- if (preview()) return
- if (!state.open) return
- setState("open", false)
- })
-
- createEffect(() => {
- if (!selected()) return
- if (!state.open) return
- setState("open", false)
- })
+ const hoverOpen = () => isHoverProject() && preview() && !selected() && !state.menu
const label = (directory: string) => {
const [data] = globalSync.child(directory, { bootstrap: false })
@@ -346,7 +339,7 @@ export const SortableProject = (props: {
workspacesEnabled={props.ctx.workspacesEnabled}
closeProject={props.ctx.closeProject}
setMenu={(value) => setState("menu", value)}
- setOpen={(value) => setState("open", value)}
+ setOpen={(value) => props.ctx.onHoverOpenChanged(props.project.worktree, value)}
setSuppressHover={(value) => setState("suppressHover", value)}
language={language}
/>
@@ -357,7 +350,7 @@ export const SortableProject = (props: {
{
if (state.menu) return
if (value && state.suppressHover) return
- setState("open", value)
+ props.ctx.onHoverOpenChanged(props.project.worktree, value)
if (value) props.ctx.setHoverSession(undefined)
}}
>
@@ -381,7 +374,6 @@ export const SortableProject = (props: {
projectChildren={projectChildren}
workspaceSessions={workspaceSessions}
workspaceChildren={workspaceChildren}
- setOpen={(value) => setState("open", value)}
ctx={props.ctx}
language={language}
/>
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 513c522e97..0cbe4d8b46 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -42,7 +42,13 @@ import { useSync } from "@/context/sync"
import { useTerminal } from "@/context/terminal"
import { type FollowupDraft, sendFollowupDraft } from "@/components/prompt-input/submit"
import { createSessionComposerState, SessionComposerRegion } from "@/pages/session/composer"
-import { createOpenReviewFile, createSessionTabs, createSizing, focusTerminalById } from "@/pages/session/helpers"
+import {
+ createOpenReviewFile,
+ createSessionTabs,
+ createSizing,
+ focusTerminalById,
+ shouldFocusTerminalOnKeyDown,
+} from "@/pages/session/helpers"
import { MessageTimeline } from "@/pages/session/message-timeline"
import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
import { useSessionLayout } from "@/pages/session/session-layout"
@@ -241,14 +247,19 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
if (added <= 0) return
if (growth <= 0) return
+
+ if (opts?.prefetch) {
+ const current = turnStart()
+ preserveScroll(() => setTurnStart(current + growth))
+ return
+ }
+
if (turnStart() !== start) return
- const reveal = !opts?.prefetch
const currentRendered = renderedUserMessages().length
const base = Math.max(beforeRendered, currentRendered)
- const target = reveal ? Math.min(afterVisible, base + turnBatch) : base
- const nextStart = Math.max(0, afterVisible - target)
- preserveScroll(() => setTurnStart(nextStart))
+ const target = Math.min(afterVisible, base + turnBatch)
+ preserveScroll(() => setTurnStart(Math.max(0, afterVisible - target)))
}
const onScrollerScroll = () => {
@@ -950,7 +961,7 @@ export default function Page() {
// Prefer the open terminal over the composer when it can take focus
if (view().terminal.opened()) {
const id = terminal.active()
- if (id && focusTerminalById(id)) return
+ if (id && shouldFocusTerminalOnKeyDown(event) && focusTerminalById(id)) return
}
// Only treat explicit scroll keys as potential "user scroll" gestures.
@@ -1273,8 +1284,6 @@ export default function Page() {
on(
() => sdk.directory,
() => {
- void file.tree.list("")
-
const tab = activeFileTab()
if (!tab) return
const path = file.pathFromTab(tab)
@@ -1729,6 +1738,9 @@ export default function Page() {
sessionID: () => params.id,
messagesReady,
visibleUserMessages,
+ historyMore,
+ historyLoading,
+ loadMore: (sessionID) => sync.session.history.loadMore(sessionID),
turnStart: historyWindow.turnStart,
currentMessageId: () => store.messageId,
pendingMessage: () => ui.pendingMessage,
@@ -1800,7 +1812,7 @@ export default function Page() {
-
+
{
@@ -86,6 +87,26 @@ describe("focusTerminalById", () => {
})
})
+describe("shouldFocusTerminalOnKeyDown", () => {
+ test("skips pure modifier keys", () => {
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Meta", metaKey: true }))).toBe(false)
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Control", ctrlKey: true }))).toBe(false)
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Alt", altKey: true }))).toBe(false)
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Shift", shiftKey: true }))).toBe(false)
+ })
+
+ test("skips shortcut key combos", () => {
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "c", metaKey: true }))).toBe(false)
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "c", ctrlKey: true }))).toBe(false)
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "ArrowLeft", altKey: true }))).toBe(false)
+ })
+
+ test("keeps plain typing focused on terminal", () => {
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "a" }))).toBe(true)
+ expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "A", shiftKey: true }))).toBe(true)
+ })
+})
+
describe("getTabReorderIndex", () => {
test("returns target index for valid drag reorder", () => {
expect(getTabReorderIndex(["a", "b", "c"], "a", "c")).toBe(2)
diff --git a/packages/app/src/pages/session/helpers.ts b/packages/app/src/pages/session/helpers.ts
index c3571f3ffc..7e2c1ccf7b 100644
--- a/packages/app/src/pages/session/helpers.ts
+++ b/packages/app/src/pages/session/helpers.ts
@@ -93,6 +93,13 @@ export const focusTerminalById = (id: string) => {
return true
}
+const skip = new Set(["Alt", "Control", "Meta", "Shift"])
+
+export const shouldFocusTerminalOnKeyDown = (event: Pick) => {
+ if (skip.has(event.key)) return false
+ return !(event.ctrlKey || event.metaKey || event.altKey)
+}
+
export const createOpenReviewFile = (input: {
showAllFiles: () => void
tabForPath: (path: string) => string
diff --git a/packages/app/src/pages/session/message-timeline.tsx b/packages/app/src/pages/session/message-timeline.tsx
index 401e3cd812..e6c3d0c1d4 100644
--- a/packages/app/src/pages/session/message-timeline.tsx
+++ b/packages/app/src/pages/session/message-timeline.tsx
@@ -1,4 +1,4 @@
-import { For, createEffect, createMemo, on, onCleanup, Show, Index, type JSX } from "solid-js"
+import { For, createEffect, createMemo, on, onCleanup, Show, Index, type JSX, createSignal } from "solid-js"
import { createStore, produce } from "solid-js/store"
import { useNavigate } from "@solidjs/router"
import { useMutation } from "@tanstack/solid-query"
@@ -30,6 +30,7 @@ import { useSDK } from "@/context/sdk"
import { useSync } from "@/context/sync"
import { messageAgentColor } from "@/utils/agent"
import { parseCommentNote, readCommentMetadata } from "@/utils/comment-note"
+import { makeTimer } from "@solid-primitives/timer"
type MessageComment = {
path: string
@@ -250,38 +251,21 @@ export function MessageTimeline(props: {
const working = createMemo(() => !!pending() || sessionStatus().type !== "idle")
const tint = createMemo(() => messageAgentColor(sessionMessages(), sync.data.agent))
- const [slot, setSlot] = createStore({
- open: false,
- show: false,
- fade: false,
+ const [timeoutDone, setTimeoutDone] = createSignal(true)
+
+ const workingStatus = createMemo<"hidden" | "showing" | "hiding">((prev) => {
+ if (working()) return "showing"
+ if (prev === "showing" || !timeoutDone()) return "hiding"
+ return "hidden"
})
- let f: number | undefined
- const clear = () => {
- if (f !== undefined) window.clearTimeout(f)
- f = undefined
- }
+ createEffect(() => {
+ if (workingStatus() !== "hiding") return
+
+ setTimeoutDone(false)
+ makeTimer(() => setTimeoutDone(true), 260, setTimeout)
+ })
- onCleanup(clear)
- createEffect(
- on(
- working,
- (on, prev) => {
- clear()
- if (on) {
- setSlot({ open: true, show: true, fade: false })
- return
- }
- if (prev) {
- setSlot({ open: false, show: true, fade: true })
- f = window.setTimeout(() => setSlot({ show: false, fade: false }), 260)
- return
- }
- setSlot({ open: false, show: false, fade: false })
- },
- { defer: true },
- ),
- )
const activeMessageID = createMemo(() => {
const parentID = pending()?.parentID
if (parentID) {
@@ -676,17 +660,15 @@ export function MessageTimeline(props: {
-
+
@@ -912,7 +894,6 @@ export function MessageTimeline(props: {
-
{
const active = createMemo(() => activeMessageID() === messageID)
const comments = createMemo(() => messageComments(sync.data.part[messageID] ?? []), [], {
- equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),
+ equals: (a, b) =>
+ a.length === b.length &&
+ a.every(
+ (c, i) =>
+ c.path === b[i].path &&
+ c.comment === b[i].comment &&
+ c.selection?.startLine === b[i].selection?.startLine &&
+ c.selection?.endLine === b[i].selection?.endLine,
+ ),
})
const commentCount = createMemo(() => comments().length)
return (
@@ -998,6 +987,7 @@ export function MessageTimeline(props: {
{
props.size.touch()
layout.fileTree.resize(width)
}}
- onCollapse={layout.fileTree.close}
/>
diff --git a/packages/app/src/pages/session/use-session-commands.tsx b/packages/app/src/pages/session/use-session-commands.tsx
index cdb07f84ac..aecc33f9ff 100644
--- a/packages/app/src/pages/session/use-session-commands.tsx
+++ b/packages/app/src/pages/session/use-session-commands.tsx
@@ -255,7 +255,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
id: "file.open",
title: language.t("command.file.open"),
description: language.t("palette.search.placeholder"),
- keybind: "mod+p",
+ keybind: "mod+k,mod+p",
slash: "open",
onSelect: () => dialog.show(() =>
),
}),
diff --git a/packages/app/src/pages/session/use-session-hash-scroll.ts b/packages/app/src/pages/session/use-session-hash-scroll.ts
index fe13be6bda..474e2ad321 100644
--- a/packages/app/src/pages/session/use-session-hash-scroll.ts
+++ b/packages/app/src/pages/session/use-session-hash-scroll.ts
@@ -8,6 +8,9 @@ export const useSessionHashScroll = (input: {
sessionID: () => string | undefined
messagesReady: () => boolean
visibleUserMessages: () => UserMessage[]
+ historyMore: () => boolean
+ historyLoading: () => boolean
+ loadMore: (sessionID: string) => Promise
turnStart: () => number
currentMessageId: () => string | undefined
pendingMessage: () => string | undefined
@@ -181,6 +184,21 @@ export const useSessionHashScroll = (input: {
queue(() => scrollToMessage(msg, "auto"))
})
+ createEffect(() => {
+ const sessionID = input.sessionID()
+ if (!sessionID || !input.messagesReady()) return
+
+ visibleUserMessages()
+
+ let targetId = input.pendingMessage()
+ if (!targetId && !clearing) targetId = messageIdFromHash(location.hash)
+ if (!targetId) return
+ if (messageById().has(targetId)) return
+ if (!input.historyMore() || input.historyLoading()) return
+
+ void input.loadMore(sessionID)
+ })
+
onMount(() => {
if (typeof window !== "undefined" && "scrollRestoration" in window.history) {
window.history.scrollRestoration = "manual"
diff --git a/packages/app/src/utils/prompt.test.ts b/packages/app/src/utils/prompt.test.ts
new file mode 100644
index 0000000000..04768dde05
--- /dev/null
+++ b/packages/app/src/utils/prompt.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, test } from "bun:test"
+import type { Part } from "@kilocode/sdk/v2"
+import { extractPromptFromParts } from "./prompt"
+
+describe("extractPromptFromParts", () => {
+ test("restores multiple uploaded attachments", () => {
+ const parts = [
+ {
+ id: "text_1",
+ type: "text",
+ text: "check these",
+ sessionID: "ses_1",
+ messageID: "msg_1",
+ },
+ {
+ id: "file_1",
+ type: "file",
+ mime: "image/png",
+ url: "data:image/png;base64,AAA",
+ filename: "a.png",
+ sessionID: "ses_1",
+ messageID: "msg_1",
+ },
+ {
+ id: "file_2",
+ type: "file",
+ mime: "application/pdf",
+ url: "data:application/pdf;base64,BBB",
+ filename: "b.pdf",
+ sessionID: "ses_1",
+ messageID: "msg_1",
+ },
+ ] satisfies Part[]
+
+ const result = extractPromptFromParts(parts)
+
+ expect(result).toHaveLength(3)
+ expect(result[0]).toMatchObject({ type: "text", content: "check these" })
+ expect(result.slice(1)).toMatchObject([
+ { type: "image", filename: "a.png", mime: "image/png", dataUrl: "data:image/png;base64,AAA" },
+ { type: "image", filename: "b.pdf", mime: "application/pdf", dataUrl: "data:application/pdf;base64,BBB" },
+ ])
+ })
+})
diff --git a/packages/app/src/utils/server-health.ts b/packages/app/src/utils/server-health.ts
index 45a323c7be..a13fd34ef7 100644
--- a/packages/app/src/utils/server-health.ts
+++ b/packages/app/src/utils/server-health.ts
@@ -14,6 +14,15 @@ interface CheckServerHealthOptions {
const defaultTimeoutMs = 3000
const defaultRetryCount = 2
const defaultRetryDelayMs = 100
+const cacheMs = 750
+const healthCache = new Map<
+ string,
+ { at: number; done: boolean; fetch: typeof globalThis.fetch; promise: Promise }
+>()
+
+function cacheKey(server: ServerConnection.HttpBase) {
+ return `${server.url}\n${server.username ?? ""}\n${server.password ?? ""}`
+}
function timeoutSignal(timeoutMs: number) {
const timeout = (AbortSignal as unknown as { timeout?: (ms: number) => AbortSignal }).timeout
@@ -87,5 +96,18 @@ export function useCheckServerHealth() {
const platform = usePlatform()
const fetcher = platform.fetch ?? globalThis.fetch
- return (http: ServerConnection.HttpBase) => checkServerHealth(http, fetcher)
+ return (http: ServerConnection.HttpBase) => {
+ const key = cacheKey(http)
+ const hit = healthCache.get(key)
+ const now = Date.now()
+ if (hit && hit.fetch === fetcher && (!hit.done || now - hit.at < cacheMs)) return hit.promise
+ const promise = checkServerHealth(http, fetcher).finally(() => {
+ const next = healthCache.get(key)
+ if (!next || next.promise !== promise) return
+ next.done = true
+ next.at = Date.now()
+ })
+ healthCache.set(key, { at: now, done: false, fetch: fetcher, promise })
+ return promise
+ }
}
diff --git a/packages/app/src/utils/sound.ts b/packages/app/src/utils/sound.ts
index 6dea812ec8..78e5a0c565 100644
--- a/packages/app/src/utils/sound.ts
+++ b/packages/app/src/utils/sound.ts
@@ -1,106 +1,89 @@
-import alert01 from "@opencode-ai/ui/audio/alert-01.aac"
-import alert02 from "@opencode-ai/ui/audio/alert-02.aac"
-import alert03 from "@opencode-ai/ui/audio/alert-03.aac"
-import alert04 from "@opencode-ai/ui/audio/alert-04.aac"
-import alert05 from "@opencode-ai/ui/audio/alert-05.aac"
-import alert06 from "@opencode-ai/ui/audio/alert-06.aac"
-import alert07 from "@opencode-ai/ui/audio/alert-07.aac"
-import alert08 from "@opencode-ai/ui/audio/alert-08.aac"
-import alert09 from "@opencode-ai/ui/audio/alert-09.aac"
-import alert10 from "@opencode-ai/ui/audio/alert-10.aac"
-import bipbop01 from "@opencode-ai/ui/audio/bip-bop-01.aac"
-import bipbop02 from "@opencode-ai/ui/audio/bip-bop-02.aac"
-import bipbop03 from "@opencode-ai/ui/audio/bip-bop-03.aac"
-import bipbop04 from "@opencode-ai/ui/audio/bip-bop-04.aac"
-import bipbop05 from "@opencode-ai/ui/audio/bip-bop-05.aac"
-import bipbop06 from "@opencode-ai/ui/audio/bip-bop-06.aac"
-import bipbop07 from "@opencode-ai/ui/audio/bip-bop-07.aac"
-import bipbop08 from "@opencode-ai/ui/audio/bip-bop-08.aac"
-import bipbop09 from "@opencode-ai/ui/audio/bip-bop-09.aac"
-import bipbop10 from "@opencode-ai/ui/audio/bip-bop-10.aac"
-import nope01 from "@opencode-ai/ui/audio/nope-01.aac"
-import nope02 from "@opencode-ai/ui/audio/nope-02.aac"
-import nope03 from "@opencode-ai/ui/audio/nope-03.aac"
-import nope04 from "@opencode-ai/ui/audio/nope-04.aac"
-import nope05 from "@opencode-ai/ui/audio/nope-05.aac"
-import nope06 from "@opencode-ai/ui/audio/nope-06.aac"
-import nope07 from "@opencode-ai/ui/audio/nope-07.aac"
-import nope08 from "@opencode-ai/ui/audio/nope-08.aac"
-import nope09 from "@opencode-ai/ui/audio/nope-09.aac"
-import nope10 from "@opencode-ai/ui/audio/nope-10.aac"
-import nope11 from "@opencode-ai/ui/audio/nope-11.aac"
-import nope12 from "@opencode-ai/ui/audio/nope-12.aac"
-import staplebops01 from "@opencode-ai/ui/audio/staplebops-01.aac"
-import staplebops02 from "@opencode-ai/ui/audio/staplebops-02.aac"
-import staplebops03 from "@opencode-ai/ui/audio/staplebops-03.aac"
-import staplebops04 from "@opencode-ai/ui/audio/staplebops-04.aac"
-import staplebops05 from "@opencode-ai/ui/audio/staplebops-05.aac"
-import staplebops06 from "@opencode-ai/ui/audio/staplebops-06.aac"
-import staplebops07 from "@opencode-ai/ui/audio/staplebops-07.aac"
-import yup01 from "@opencode-ai/ui/audio/yup-01.aac"
-import yup02 from "@opencode-ai/ui/audio/yup-02.aac"
-import yup03 from "@opencode-ai/ui/audio/yup-03.aac"
-import yup04 from "@opencode-ai/ui/audio/yup-04.aac"
-import yup05 from "@opencode-ai/ui/audio/yup-05.aac"
-import yup06 from "@opencode-ai/ui/audio/yup-06.aac"
+let files: Record Promise> | undefined
+let loads: Record Promise> | undefined
+
+function getFiles() {
+ if (files) return files
+ files = import.meta.glob("../../../ui/src/assets/audio/*.aac", { import: "default" }) as Record<
+ string,
+ () => Promise
+ >
+ return files
+}
export const SOUND_OPTIONS = [
- { id: "alert-01", label: "sound.option.alert01", src: alert01 },
- { id: "alert-02", label: "sound.option.alert02", src: alert02 },
- { id: "alert-03", label: "sound.option.alert03", src: alert03 },
- { id: "alert-04", label: "sound.option.alert04", src: alert04 },
- { id: "alert-05", label: "sound.option.alert05", src: alert05 },
- { id: "alert-06", label: "sound.option.alert06", src: alert06 },
- { id: "alert-07", label: "sound.option.alert07", src: alert07 },
- { id: "alert-08", label: "sound.option.alert08", src: alert08 },
- { id: "alert-09", label: "sound.option.alert09", src: alert09 },
- { id: "alert-10", label: "sound.option.alert10", src: alert10 },
- { id: "bip-bop-01", label: "sound.option.bipbop01", src: bipbop01 },
- { id: "bip-bop-02", label: "sound.option.bipbop02", src: bipbop02 },
- { id: "bip-bop-03", label: "sound.option.bipbop03", src: bipbop03 },
- { id: "bip-bop-04", label: "sound.option.bipbop04", src: bipbop04 },
- { id: "bip-bop-05", label: "sound.option.bipbop05", src: bipbop05 },
- { id: "bip-bop-06", label: "sound.option.bipbop06", src: bipbop06 },
- { id: "bip-bop-07", label: "sound.option.bipbop07", src: bipbop07 },
- { id: "bip-bop-08", label: "sound.option.bipbop08", src: bipbop08 },
- { id: "bip-bop-09", label: "sound.option.bipbop09", src: bipbop09 },
- { id: "bip-bop-10", label: "sound.option.bipbop10", src: bipbop10 },
- { id: "staplebops-01", label: "sound.option.staplebops01", src: staplebops01 },
- { id: "staplebops-02", label: "sound.option.staplebops02", src: staplebops02 },
- { id: "staplebops-03", label: "sound.option.staplebops03", src: staplebops03 },
- { id: "staplebops-04", label: "sound.option.staplebops04", src: staplebops04 },
- { id: "staplebops-05", label: "sound.option.staplebops05", src: staplebops05 },
- { id: "staplebops-06", label: "sound.option.staplebops06", src: staplebops06 },
- { id: "staplebops-07", label: "sound.option.staplebops07", src: staplebops07 },
- { id: "nope-01", label: "sound.option.nope01", src: nope01 },
- { id: "nope-02", label: "sound.option.nope02", src: nope02 },
- { id: "nope-03", label: "sound.option.nope03", src: nope03 },
- { id: "nope-04", label: "sound.option.nope04", src: nope04 },
- { id: "nope-05", label: "sound.option.nope05", src: nope05 },
- { id: "nope-06", label: "sound.option.nope06", src: nope06 },
- { id: "nope-07", label: "sound.option.nope07", src: nope07 },
- { id: "nope-08", label: "sound.option.nope08", src: nope08 },
- { id: "nope-09", label: "sound.option.nope09", src: nope09 },
- { id: "nope-10", label: "sound.option.nope10", src: nope10 },
- { id: "nope-11", label: "sound.option.nope11", src: nope11 },
- { id: "nope-12", label: "sound.option.nope12", src: nope12 },
- { id: "yup-01", label: "sound.option.yup01", src: yup01 },
- { id: "yup-02", label: "sound.option.yup02", src: yup02 },
- { id: "yup-03", label: "sound.option.yup03", src: yup03 },
- { id: "yup-04", label: "sound.option.yup04", src: yup04 },
- { id: "yup-05", label: "sound.option.yup05", src: yup05 },
- { id: "yup-06", label: "sound.option.yup06", src: yup06 },
+ { id: "alert-01", label: "sound.option.alert01" },
+ { id: "alert-02", label: "sound.option.alert02" },
+ { id: "alert-03", label: "sound.option.alert03" },
+ { id: "alert-04", label: "sound.option.alert04" },
+ { id: "alert-05", label: "sound.option.alert05" },
+ { id: "alert-06", label: "sound.option.alert06" },
+ { id: "alert-07", label: "sound.option.alert07" },
+ { id: "alert-08", label: "sound.option.alert08" },
+ { id: "alert-09", label: "sound.option.alert09" },
+ { id: "alert-10", label: "sound.option.alert10" },
+ { id: "bip-bop-01", label: "sound.option.bipbop01" },
+ { id: "bip-bop-02", label: "sound.option.bipbop02" },
+ { id: "bip-bop-03", label: "sound.option.bipbop03" },
+ { id: "bip-bop-04", label: "sound.option.bipbop04" },
+ { id: "bip-bop-05", label: "sound.option.bipbop05" },
+ { id: "bip-bop-06", label: "sound.option.bipbop06" },
+ { id: "bip-bop-07", label: "sound.option.bipbop07" },
+ { id: "bip-bop-08", label: "sound.option.bipbop08" },
+ { id: "bip-bop-09", label: "sound.option.bipbop09" },
+ { id: "bip-bop-10", label: "sound.option.bipbop10" },
+ { id: "staplebops-01", label: "sound.option.staplebops01" },
+ { id: "staplebops-02", label: "sound.option.staplebops02" },
+ { id: "staplebops-03", label: "sound.option.staplebops03" },
+ { id: "staplebops-04", label: "sound.option.staplebops04" },
+ { id: "staplebops-05", label: "sound.option.staplebops05" },
+ { id: "staplebops-06", label: "sound.option.staplebops06" },
+ { id: "staplebops-07", label: "sound.option.staplebops07" },
+ { id: "nope-01", label: "sound.option.nope01" },
+ { id: "nope-02", label: "sound.option.nope02" },
+ { id: "nope-03", label: "sound.option.nope03" },
+ { id: "nope-04", label: "sound.option.nope04" },
+ { id: "nope-05", label: "sound.option.nope05" },
+ { id: "nope-06", label: "sound.option.nope06" },
+ { id: "nope-07", label: "sound.option.nope07" },
+ { id: "nope-08", label: "sound.option.nope08" },
+ { id: "nope-09", label: "sound.option.nope09" },
+ { id: "nope-10", label: "sound.option.nope10" },
+ { id: "nope-11", label: "sound.option.nope11" },
+ { id: "nope-12", label: "sound.option.nope12" },
+ { id: "yup-01", label: "sound.option.yup01" },
+ { id: "yup-02", label: "sound.option.yup02" },
+ { id: "yup-03", label: "sound.option.yup03" },
+ { id: "yup-04", label: "sound.option.yup04" },
+ { id: "yup-05", label: "sound.option.yup05" },
+ { id: "yup-06", label: "sound.option.yup06" },
] as const
export type SoundOption = (typeof SOUND_OPTIONS)[number]
export type SoundID = SoundOption["id"]
-const soundById = Object.fromEntries(SOUND_OPTIONS.map((s) => [s.id, s.src])) as Record
+function getLoads() {
+ if (loads) return loads
+ loads = Object.fromEntries(
+ Object.entries(getFiles()).flatMap(([path, load]) => {
+ const file = path.split("/").at(-1)
+ if (!file) return []
+ return [[file.replace(/\.aac$/, ""), load] as const]
+ }),
+ ) as Record Promise>
+ return loads
+}
+
+const cache = new Map>()
export function soundSrc(id: string | undefined) {
- if (!id) return
- if (!(id in soundById)) return
- return soundById[id as SoundID]
+ const loads = getLoads()
+ if (!id || !(id in loads)) return Promise.resolve(undefined)
+ const key = id as SoundID
+ const hit = cache.get(key)
+ if (hit) return hit
+ const next = loads[key]().catch(() => undefined)
+ cache.set(key, next)
+ return next
}
export function playSound(src: string | undefined) {
@@ -108,10 +91,12 @@ export function playSound(src: string | undefined) {
if (!src) return
const audio = new Audio(src)
audio.play().catch(() => undefined)
-
- // Return a cleanup function to pause the sound.
return () => {
audio.pause()
audio.currentTime = 0
}
}
+
+export function playSoundById(id: string | undefined) {
+ return soundSrc(id).then((src) => playSound(src))
+}
diff --git a/packages/app/vite.js b/packages/app/vite.js
index 671bc53cbe..bdbf32c091 100644
--- a/packages/app/vite.js
+++ b/packages/app/vite.js
@@ -1,7 +1,10 @@
+import { readFileSync } from "node:fs"
import solidPlugin from "vite-plugin-solid"
import tailwindcss from "@tailwindcss/vite"
import { fileURLToPath } from "url"
+const theme = fileURLToPath(new URL("./public/oc-theme-preload.js", import.meta.url))
+
/**
* @type {import("vite").PluginOption}
*/
@@ -21,6 +24,15 @@ export default [
}
},
},
+ {
+ name: "opencode-desktop:theme-preload",
+ transformIndexHtml(html) {
+ return html.replace(
+ '',
+ ``,
+ )
+ },
+ },
tailwindcss(),
solidPlugin(),
]
diff --git a/packages/containers/bun-node/Dockerfile b/packages/containers/bun-node/Dockerfile
index a11df8c5a2..045ff7512c 100644
--- a/packages/containers/bun-node/Dockerfile
+++ b/packages/containers/bun-node/Dockerfile
@@ -6,7 +6,7 @@ FROM ${REGISTRY}/build/base:24.04
SHELL ["/bin/bash", "-lc"]
ARG NODE_VERSION=24.4.0
-ARG BUN_VERSION=1.3.5
+ARG BUN_VERSION=1.3.11
ENV BUN_INSTALL=/opt/bun
ENV PATH=/opt/bun/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/packages/desktop-electron/src/main/cli.ts b/packages/desktop-electron/src/main/cli.ts
index fba301f36c..f2d918bd21 100644
--- a/packages/desktop-electron/src/main/cli.ts
+++ b/packages/desktop-electron/src/main/cli.ts
@@ -35,6 +35,7 @@ export type CommandEvent =
export type SqliteMigrationProgress = { type: "InProgress"; value: number } | { type: "Done" }
export type CommandChild = {
+ pid: number | undefined
kill: () => void
}
@@ -191,7 +192,7 @@ export function spawnCommand(args: string, extraEnv: Record) {
treeKill(child.pid)
}
- return { events, child: { kill }, exit }
+ return { events, child: { pid: child.pid, kill }, exit }
}
function handleSqliteProgress(events: EventEmitter, line: string) {
diff --git a/packages/desktop-electron/src/main/index.ts b/packages/desktop-electron/src/main/index.ts
index da2b36abf3..286779cba2 100644
--- a/packages/desktop-electron/src/main/index.ts
+++ b/packages/desktop-electron/src/main/index.ts
@@ -81,6 +81,17 @@ function setupApp() {
killSidecar()
})
+ app.on("will-quit", () => {
+ killSidecar()
+ })
+
+ for (const signal of ["SIGINT", "SIGTERM"] as const) {
+ process.on(signal, () => {
+ killSidecar()
+ app.exit(0)
+ })
+ }
+
void app.whenReady().then(async () => {
// migrate()
app.setAsDefaultProtocolClient("opencode")
@@ -234,8 +245,15 @@ registerIpcHandlers({
function killSidecar() {
if (!sidecar) return
+ const pid = sidecar.pid
sidecar.kill()
sidecar = null
+ // tree-kill is async; also send process group signal as immediate fallback
+ if (pid && process.platform !== "win32") {
+ try {
+ process.kill(-pid, "SIGTERM")
+ } catch {}
+ }
}
function ensureLoopbackNoProxy() {
diff --git a/packages/desktop-electron/src/renderer/index.tsx b/packages/desktop-electron/src/renderer/index.tsx
index ec2b4d1e7a..44f2e6360c 100644
--- a/packages/desktop-electron/src/renderer/index.tsx
+++ b/packages/desktop-electron/src/renderer/index.tsx
@@ -6,6 +6,9 @@ import {
AppBaseProviders,
AppInterface,
handleNotificationClick,
+ loadLocaleDict,
+ normalizeLocale,
+ type Locale,
type Platform,
PlatformProvider,
ServerConnection,
@@ -246,6 +249,17 @@ listenForDeepLinks()
render(() => {
const platform = createPlatform()
+ const loadLocale = async () => {
+ const current = await platform.storage?.("opencode.global.dat").getItem("language")
+ const legacy = current ? undefined : await platform.storage?.().getItem("language.v1")
+ const raw = current ?? legacy
+ if (!raw) return
+ const locale = raw.match(/"locale"\s*:\s*"([^"]+)"/)?.[1]
+ if (!locale) return
+ const next = normalizeLocale(locale)
+ if (next !== "en") await loadLocaleDict(next)
+ return next satisfies Locale
+ }
const [windowCount] = createResource(() => window.api.getWindowCount())
@@ -257,6 +271,7 @@ render(() => {
if (url) return ServerConnection.key({ type: "http", http: { url } })
}),
)
+ const [locale] = createResource(loadLocale)
const servers = () => {
const data = sidecar()
@@ -309,15 +324,14 @@ render(() => {
return (
-
-
+
+
{(_) => {
return (
1}
>
diff --git a/packages/desktop/src/index.tsx b/packages/desktop/src/index.tsx
index 3f21a7186e..33af57e1d7 100644
--- a/packages/desktop/src/index.tsx
+++ b/packages/desktop/src/index.tsx
@@ -6,6 +6,9 @@ import {
AppBaseProviders,
AppInterface,
handleNotificationClick,
+ loadLocaleDict,
+ normalizeLocale,
+ type Locale,
type Platform,
PlatformProvider,
ServerConnection,
@@ -414,6 +417,17 @@ void listenForDeepLinks()
render(() => {
const platform = createPlatform()
+ const loadLocale = async () => {
+ const current = await platform.storage?.("opencode.global.dat").getItem("language")
+ const legacy = current ? undefined : await platform.storage?.().getItem("language.v1")
+ const raw = current ?? legacy
+ if (!raw) return
+ const locale = raw.match(/"locale"\s*:\s*"([^"]+)"/)?.[1]
+ if (!locale) return
+ const next = normalizeLocale(locale)
+ if (next !== "en") await loadLocaleDict(next)
+ return next satisfies Locale
+ }
// Fetch sidecar credentials from Rust (available immediately, before health check)
const [sidecar] = createResource(() => commands.awaitInitialization(new Channel() as any))
@@ -423,6 +437,7 @@ render(() => {
if (url) return ServerConnection.key({ type: "http", http: { url } })
}),
)
+ const [locale] = createResource(loadLocale)
// Build the sidecar server connection once credentials arrive
const servers = () => {
@@ -465,8 +480,8 @@ render(() => {
return (
-
-
+
+
{(_) => {
return (
>>>>>> catrielmuller/opencode-v1.3.1
import { mergeDeep, pipe, sortBy, values } from "remeda"
import { Global } from "@/global"
import path from "path"
import { Plugin } from "@/plugin"
import { Skill } from "../skill"
+import { Effect, ServiceMap, Layer } from "effect"
+import { InstanceState } from "@/effect/instance-state"
+import { makeRunPromise } from "@/effect/run-service"
import { Telemetry } from "@kilocode/kilo-telemetry" // kilocode_change
@@ -59,9 +65,21 @@ export namespace Agent {
})
export type Info = z.infer
- const state = Instance.state(async () => {
- const cfg = await Config.get()
+ export interface Interface {
+ readonly get: (agent: string) => Effect.Effect
+ readonly list: () => Effect.Effect
+ readonly defaultAgent: () => Effect.Effect
+ readonly generate: (input: {
+ description: string
+ model?: { providerID: ProviderID; modelID: ModelID }
+ }) => Effect.Effect<{
+ identifier: string
+ whenToUse: string
+ systemPrompt: string
+ }>
+ }
+<<<<<<< HEAD
const skillDirs = await Skill.dirs()
const whitelistedDirs = [Truncate.GLOB, ...skillDirs.map((dir) => path.join(dir, "*"))]
// kilocode_change start — safe bash commands that don't need user approval.
@@ -370,10 +388,32 @@ export namespace Agent {
codesearch: "allow",
codebase_search: "allow", // kilocode_change
read: "allow",
+=======
+ type State = Omit
+
+ export class Service extends ServiceMap.Service()("@opencode/Agent") {}
+
+ export const layer = Layer.effect(
+ Service,
+ Effect.gen(function* () {
+ const config = () => Effect.promise(() => Config.get())
+ const auth = yield* Auth.Service
+
+ const state = yield* InstanceState.make(
+ Effect.fn("Agent.state")(function* (ctx) {
+ const cfg = yield* config()
+ const skillDirs = yield* Effect.promise(() => Skill.dirs())
+ const whitelistedDirs = [Truncate.GLOB, ...skillDirs.map((dir) => path.join(dir, "*"))]
+
+ const defaults = Permission.fromConfig({
+ "*": "allow",
+ doom_loop: "ask",
+>>>>>>> catrielmuller/opencode-v1.3.1
external_directory: {
"*": "ask",
...Object.fromEntries(whitelistedDirs.map((dir) => [dir, "allow"])),
},
+<<<<<<< HEAD
}),
user,
),
@@ -472,27 +512,324 @@ export namespace Agent {
// kilocode_change end
item.permission = Permission.merge(item.permission, Permission.fromConfig(value.permission ?? {}))
}
+=======
+ question: "deny",
+ plan_enter: "deny",
+ plan_exit: "deny",
+ // mirrors github.com/github/gitignore Node.gitignore pattern for .env files
+ read: {
+ "*": "allow",
+ "*.env": "ask",
+ "*.env.*": "ask",
+ "*.env.example": "allow",
+ },
+ })
- // Ensure Truncate.GLOB is allowed unless explicitly configured
- for (const name in result) {
- const agent = result[name]
- const explicit = agent.permission.some((r) => {
- if (r.permission !== "external_directory") return false
- if (r.action !== "deny") return false
- return r.pattern === Truncate.GLOB
- })
- if (explicit) continue
+ const user = Permission.fromConfig(cfg.permission ?? {})
+>>>>>>> catrielmuller/opencode-v1.3.1
+ const agents: Record = {
+ build: {
+ name: "build",
+ description: "The default agent. Executes tools based on configured permissions.",
+ options: {},
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ question: "allow",
+ plan_enter: "allow",
+ }),
+ user,
+ ),
+ mode: "primary",
+ native: true,
+ },
+ plan: {
+ name: "plan",
+ description: "Plan mode. Disallows all edit tools.",
+ options: {},
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ question: "allow",
+ plan_exit: "allow",
+ external_directory: {
+ [path.join(Global.Path.data, "plans", "*")]: "allow",
+ },
+ edit: {
+ "*": "deny",
+ [path.join(".opencode", "plans", "*.md")]: "allow",
+ [path.relative(Instance.worktree, path.join(Global.Path.data, path.join("plans", "*.md")))]:
+ "allow",
+ },
+ }),
+ user,
+ ),
+ mode: "primary",
+ native: true,
+ },
+ general: {
+ name: "general",
+ description: `General-purpose agent for researching complex questions and executing multi-step tasks. Use this agent to execute multiple units of work in parallel.`,
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ todoread: "deny",
+ todowrite: "deny",
+ }),
+ user,
+ ),
+ options: {},
+ mode: "subagent",
+ native: true,
+ },
+ explore: {
+ name: "explore",
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ "*": "deny",
+ grep: "allow",
+ glob: "allow",
+ list: "allow",
+ bash: "allow",
+ webfetch: "allow",
+ websearch: "allow",
+ codesearch: "allow",
+ read: "allow",
+ external_directory: {
+ "*": "ask",
+ ...Object.fromEntries(whitelistedDirs.map((dir) => [dir, "allow"])),
+ },
+ }),
+ user,
+ ),
+ description: `Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. "src/components/**/*.tsx"), search code for keywords (eg. "API endpoints"), or answer questions about the codebase (eg. "how do API endpoints work?"). When calling this agent, specify the desired thoroughness level: "quick" for basic searches, "medium" for moderate exploration, or "very thorough" for comprehensive analysis across multiple locations and naming conventions.`,
+ prompt: PROMPT_EXPLORE,
+ options: {},
+ mode: "subagent",
+ native: true,
+ },
+ compaction: {
+ name: "compaction",
+ mode: "primary",
+ native: true,
+ hidden: true,
+ prompt: PROMPT_COMPACTION,
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ "*": "deny",
+ }),
+ user,
+ ),
+ options: {},
+ },
+ title: {
+ name: "title",
+ mode: "primary",
+ options: {},
+ native: true,
+ hidden: true,
+ temperature: 0.5,
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ "*": "deny",
+ }),
+ user,
+ ),
+ prompt: PROMPT_TITLE,
+ },
+ summary: {
+ name: "summary",
+ mode: "primary",
+ options: {},
+ native: true,
+ hidden: true,
+ permission: Permission.merge(
+ defaults,
+ Permission.fromConfig({
+ "*": "deny",
+ }),
+ user,
+ ),
+ prompt: PROMPT_SUMMARY,
+ },
+ }
+
+<<<<<<< HEAD
result[name].permission = Permission.merge(
result[name].permission,
Permission.fromConfig({ external_directory: { [Truncate.GLOB]: "allow" } }),
- )
- }
+=======
+ for (const [key, value] of Object.entries(cfg.agent ?? {})) {
+ if (value.disable) {
+ delete agents[key]
+ continue
+ }
+ let item = agents[key]
+ if (!item)
+ item = agents[key] = {
+ name: key,
+ mode: "all",
+ permission: Permission.merge(defaults, user),
+ options: {},
+ native: false,
+ }
+ if (value.model) item.model = Provider.parseModel(value.model)
+ item.variant = value.variant ?? item.variant
+ item.prompt = value.prompt ?? item.prompt
+ item.description = value.description ?? item.description
+ item.temperature = value.temperature ?? item.temperature
+ item.topP = value.top_p ?? item.topP
+ item.mode = value.mode ?? item.mode
+ item.color = value.color ?? item.color
+ item.hidden = value.hidden ?? item.hidden
+ item.name = value.name ?? item.name
+ item.steps = value.steps ?? item.steps
+ item.options = mergeDeep(item.options, value.options ?? {})
+ item.permission = Permission.merge(item.permission, Permission.fromConfig(value.permission ?? {}))
+ }
- return result
- })
+ // Ensure Truncate.GLOB is allowed unless explicitly configured
+ for (const name in agents) {
+ const agent = agents[name]
+ const explicit = agent.permission.some((r) => {
+ if (r.permission !== "external_directory") return false
+ if (r.action !== "deny") return false
+ return r.pattern === Truncate.GLOB
+ })
+ if (explicit) continue
+
+ agents[name].permission = Permission.merge(
+ agents[name].permission,
+ Permission.fromConfig({ external_directory: { [Truncate.GLOB]: "allow" } }),
+ )
+ }
+
+ const get = Effect.fnUntraced(function* (agent: string) {
+ return agents[agent]
+ })
+
+ const list = Effect.fnUntraced(function* () {
+ const cfg = yield* config()
+ return pipe(
+ agents,
+ values(),
+ sortBy(
+ [(x) => (cfg.default_agent ? x.name === cfg.default_agent : x.name === "build"), "desc"],
+ [(x) => x.name, "asc"],
+ ),
+ )
+ })
+
+ const defaultAgent = Effect.fnUntraced(function* () {
+ const c = yield* config()
+ if (c.default_agent) {
+ const agent = agents[c.default_agent]
+ if (!agent) throw new Error(`default agent "${c.default_agent}" not found`)
+ if (agent.mode === "subagent") throw new Error(`default agent "${c.default_agent}" is a subagent`)
+ if (agent.hidden === true) throw new Error(`default agent "${c.default_agent}" is hidden`)
+ return agent.name
+ }
+ const visible = Object.values(agents).find((a) => a.mode !== "subagent" && a.hidden !== true)
+ if (!visible) throw new Error("no primary visible agent found")
+ return visible.name
+ })
+
+ return {
+ get,
+ list,
+ defaultAgent,
+ } satisfies State
+ }),
+>>>>>>> catrielmuller/opencode-v1.3.1
+ )
+
+ return Service.of({
+ get: Effect.fn("Agent.get")(function* (agent: string) {
+ return yield* InstanceState.useEffect(state, (s) => s.get(agent))
+ }),
+ list: Effect.fn("Agent.list")(function* () {
+ return yield* InstanceState.useEffect(state, (s) => s.list())
+ }),
+ defaultAgent: Effect.fn("Agent.defaultAgent")(function* () {
+ return yield* InstanceState.useEffect(state, (s) => s.defaultAgent())
+ }),
+ generate: Effect.fn("Agent.generate")(function* (input: {
+ description: string
+ model?: { providerID: ProviderID; modelID: ModelID }
+ }) {
+ const cfg = yield* config()
+ const model = input.model ?? (yield* Effect.promise(() => Provider.defaultModel()))
+ const resolved = yield* Effect.promise(() => Provider.getModel(model.providerID, model.modelID))
+ const language = yield* Effect.promise(() => Provider.getLanguage(resolved))
+
+ const system = [PROMPT_GENERATE]
+ yield* Effect.promise(() =>
+ Plugin.trigger("experimental.chat.system.transform", { model: resolved }, { system }),
+ )
+ const existing = yield* InstanceState.useEffect(state, (s) => s.list())
+
+ const params = {
+ experimental_telemetry: {
+ isEnabled: cfg.experimental?.openTelemetry,
+ metadata: {
+ userId: cfg.username ?? "unknown",
+ },
+ },
+ temperature: 0.3,
+ messages: [
+ ...system.map(
+ (item): ModelMessage => ({
+ role: "system",
+ content: item,
+ }),
+ ),
+ {
+ role: "user",
+ content: `Create an agent configuration based on this request: \"${input.description}\".\n\nIMPORTANT: The following identifiers already exist and must NOT be used: ${existing.map((i) => i.name).join(", ")}\n Return ONLY the JSON object, no other text, do not wrap in backticks`,
+ },
+ ],
+ model: language,
+ schema: z.object({
+ identifier: z.string(),
+ whenToUse: z.string(),
+ systemPrompt: z.string(),
+ }),
+ } satisfies Parameters[0]
+
+ // TODO: clean this up so provider specific logic doesnt bleed over
+ const authInfo = yield* auth.get(model.providerID).pipe(Effect.orDie)
+ if (model.providerID === "openai" && authInfo?.type === "oauth") {
+ return yield* Effect.promise(async () => {
+ const result = streamObject({
+ ...params,
+ providerOptions: ProviderTransform.providerOptions(resolved, {
+ store: false,
+ }),
+ onError: () => {},
+ })
+ for await (const part of result.fullStream) {
+ if (part.type === "error") throw part.error
+ }
+ return result.object
+ })
+ }
+
+ return yield* Effect.promise(() => generateObject(params).then((r) => r.object))
+ }),
+ })
+ }),
+ )
+
+ export const defaultLayer = layer.pipe(Layer.provide(Auth.layer))
+
+ const runPromise = makeRunPromise(Service, defaultLayer)
export async function get(agent: string) {
+<<<<<<< HEAD
// kilocode_change start - Treat "build" as "code" for backward compatibility
const effectiveAgent = agent === "build" ? "code" : agent
return state().then((x) => x[effectiveAgent])
@@ -591,6 +928,21 @@ export namespace Agent {
const result = await generateObject(params)
return result.object
+=======
+ return runPromise((svc) => svc.get(agent))
+ }
+
+ export async function list() {
+ return runPromise((svc) => svc.list())
+ }
+
+ export async function defaultAgent() {
+ return runPromise((svc) => svc.defaultAgent())
+ }
+
+ export async function generate(input: { description: string; model?: { providerID: ProviderID; modelID: ModelID } }) {
+ return runPromise((svc) => svc.generate(input))
+>>>>>>> catrielmuller/opencode-v1.3.1
}
// kilocode_change start
diff --git a/packages/opencode/src/cli/cmd/account.ts b/packages/opencode/src/cli/cmd/account.ts
index fe8747bce7..c09294eddd 100644
--- a/packages/opencode/src/cli/cmd/account.ts
+++ b/packages/opencode/src/cli/cmd/account.ts
@@ -10,6 +10,26 @@ const openBrowser = (url: string) => Effect.promise(() => open(url).catch(() =>
const println = (msg: string) => Effect.sync(() => UI.println(msg))
+const dim = (value: string) => UI.Style.TEXT_DIM + value + UI.Style.TEXT_NORMAL
+
+const activeSuffix = (isActive: boolean) => (isActive ? dim(" (active)") : "")
+
+export const formatAccountLabel = (account: { email: string; url: string }, isActive: boolean) =>
+ `${account.email} ${dim(account.url)}${activeSuffix(isActive)}`
+
+const formatOrgChoiceLabel = (account: { email: string }, org: { name: string }, isActive: boolean) =>
+ `${org.name} (${account.email})${activeSuffix(isActive)}`
+
+export const formatOrgLine = (
+ account: { email: string; url: string },
+ org: { id: string; name: string },
+ isActive: boolean,
+) => {
+ const dot = isActive ? UI.Style.TEXT_SUCCESS + "●" + UI.Style.TEXT_NORMAL : " "
+ const name = isActive ? UI.Style.TEXT_HIGHLIGHT_BOLD + org.name + UI.Style.TEXT_NORMAL : org.name
+ return ` ${dot} ${name} ${dim(account.email)} ${dim(account.url)} ${dim(org.id)}`
+}
+
const isActiveOrgChoice = (
active: Option.Option<{ id: AccountID; active_org_id: OrgID | null }>,
choice: { accountID: AccountID; orgID: OrgID },
@@ -76,10 +96,9 @@ const logoutEffect = Effect.fn("logout")(function* (email?: string) {
const opts = accounts.map((a) => {
const isActive = Option.isSome(activeID) && activeID.value === a.id
- const server = UI.Style.TEXT_DIM + a.url + UI.Style.TEXT_NORMAL
return {
value: a,
- label: isActive ? `${a.email} ${server}` + UI.Style.TEXT_DIM + " (active)" : `${a.email} ${server}`,
+ label: formatAccountLabel(a, isActive),
}
})
@@ -109,9 +128,7 @@ const switchEffect = Effect.fn("switch")(function* () {
const isActive = isActiveOrgChoice(active, { accountID: group.account.id, orgID: org.id })
return {
value: { orgID: org.id, accountID: group.account.id, label: org.name },
- label: isActive
- ? `${org.name} (${group.account.email})` + UI.Style.TEXT_DIM + " (active)"
- : `${org.name} (${group.account.email})`,
+ label: formatOrgChoiceLabel(group.account, org, isActive),
}
}),
)
@@ -139,15 +156,21 @@ const orgsEffect = Effect.fn("orgs")(function* () {
for (const group of groups) {
for (const org of group.orgs) {
const isActive = isActiveOrgChoice(active, { accountID: group.account.id, orgID: org.id })
- const dot = isActive ? UI.Style.TEXT_SUCCESS + "●" + UI.Style.TEXT_NORMAL : " "
- const name = isActive ? UI.Style.TEXT_HIGHLIGHT_BOLD + org.name + UI.Style.TEXT_NORMAL : org.name
- const email = UI.Style.TEXT_DIM + group.account.email + UI.Style.TEXT_NORMAL
- const id = UI.Style.TEXT_DIM + org.id + UI.Style.TEXT_NORMAL
- yield* println(` ${dot} ${name} ${email} ${id}`)
+ yield* println(formatOrgLine(group.account, org, isActive))
}
}
})
+const openEffect = Effect.fn("open")(function* () {
+ const service = yield* Account.Service
+ const active = yield* service.active()
+ if (Option.isNone(active)) return yield* println("No active account")
+
+ const url = active.value.url
+ yield* openBrowser(url)
+ yield* Prompt.outro("Opened " + url)
+})
+
export const LoginCommand = cmd({
command: "login ",
describe: false,
@@ -195,6 +218,15 @@ export const OrgsCommand = cmd({
},
})
+export const OpenCommand = cmd({
+ command: "open",
+ describe: false,
+ async handler() {
+ UI.empty()
+ await Account.runPromise((_svc) => openEffect())
+ },
+})
+
export const ConsoleCommand = cmd({
command: "console",
describe: false,
@@ -216,6 +248,10 @@ export const ConsoleCommand = cmd({
...OrgsCommand,
describe: "list orgs",
})
+ .command({
+ ...OpenCommand,
+ describe: "open active console account",
+ })
.demandCommand(),
async handler() {},
})
diff --git a/packages/opencode/src/cli/cmd/pr.ts b/packages/opencode/src/cli/cmd/pr.ts
index 0308aafbbb..6f2f859d18 100644
--- a/packages/opencode/src/cli/cmd/pr.ts
+++ b/packages/opencode/src/cli/cmd/pr.ts
@@ -116,8 +116,9 @@ export const PrCommand = cmd({
UI.println()
const opencodeArgs = sessionId ? ["-s", sessionId] : []
+ // kilocode_change start
const opencodeProcess = Process.spawn([bin, ...opencodeArgs], {
- // kilocode_change
+ // kilocode_change end
stdin: "inherit",
stdout: "inherit",
stderr: "inherit",
diff --git a/packages/opencode/src/cli/cmd/tui/app.tsx b/packages/opencode/src/cli/cmd/tui/app.tsx
index 74547c79be..18b09ef311 100644
--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -228,7 +228,7 @@ function App() {
const command = useCommandDialog()
const sdk = useSDK()
const toast = useToast()
- const { theme, mode, setMode } = useTheme()
+ const { theme, mode, setMode, locked, lock, unlock } = useTheme()
const sync = useSync()
const exit = useExit()
const promptRef = usePromptRef()
@@ -595,7 +595,7 @@ function App() {
category: "System",
},
{
- title: "Toggle appearance",
+ title: "Toggle Theme Mode",
value: "theme.switch_mode",
onSelect: (dialog) => {
setMode(mode() === "dark" ? "light" : "dark")
@@ -603,6 +603,16 @@ function App() {
},
category: "System",
},
+ {
+ title: locked() ? "Unlock Theme Mode" : "Lock Theme Mode",
+ value: "theme.mode.lock",
+ onSelect: (dialog) => {
+ if (locked()) unlock()
+ else lock()
+ dialog.clear()
+ },
+ category: "System",
+ },
{
title: "Help",
value: "help.show",
@@ -865,7 +875,7 @@ function App() {
await DialogAlert.show(
dialog,
"Update Complete",
- `Successfully updated to Kilo v${result.data.version}. Please restart the application.`,
+ `Successfully updated to Kilo v${result.data.version}. Please restart the application.`, // kilocode_change
)
exit()
diff --git a/packages/opencode/src/cli/cmd/tui/context/exit.tsx b/packages/opencode/src/cli/cmd/tui/context/exit.tsx
index 3ed4ae3d2c..236320cf06 100644
--- a/packages/opencode/src/cli/cmd/tui/context/exit.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/exit.tsx
@@ -53,6 +53,7 @@ export const { use: useExit, provider: ExitProvider } = createSimpleContext({
message: store,
},
)
+ process.on("SIGHUP", () => exit())
return exit
},
})
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index a1f165b238..70d2c3af61 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -1,6 +1,6 @@
-import { SyntaxStyle, RGBA, type TerminalColors } from "@opentui/core"
+import { CliRenderEvents, SyntaxStyle, RGBA, type TerminalColors } from "@opentui/core"
import path from "path"
-import { createEffect, createMemo, onMount } from "solid-js"
+import { createEffect, createMemo, onCleanup, onMount } from "solid-js"
import { createSimpleContext } from "./helper"
import { Glob } from "../../../../util/glob"
import aura from "./theme/aura.json" with { type: "json" }
@@ -294,11 +294,18 @@ function ansiToRgba(code: number): RGBA {
export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
name: "Theme",
init: (props: { mode: "dark" | "light" }) => {
+ const renderer = useRenderer()
const config = useTuiConfig()
const kv = useKV()
+ const pick = (value: unknown) => {
+ if (value === "dark" || value === "light") return value
+ return
+ }
+ const lock = pick(kv.get("theme_mode_lock"))
const [store, setStore] = createStore({
themes: DEFAULT_THEMES,
- mode: kv.get("theme_mode", props.mode),
+ mode: lock ?? pick(kv.get("theme_mode", props.mode)) ?? props.mode,
+ lock,
active: (config.theme ?? kv.get("theme", "kilo")) as string, // kilocode_change
ready: false,
})
@@ -309,7 +316,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
})
function init() {
- resolveSystemTheme()
+ resolveSystemTheme(store.mode)
getCustomThemes()
.then((custom) => {
setStore(
@@ -330,14 +337,12 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
onMount(init)
- function resolveSystemTheme() {
- console.log("resolveSystemTheme")
+ function resolveSystemTheme(mode: "dark" | "light" = store.mode) {
renderer
.getPalette({
size: 16,
})
.then((colors) => {
- console.log(colors.palette)
if (!colors.palette[0]) {
if (store.active === "system") {
setStore(
@@ -351,7 +356,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
}
setStore(
produce((draft) => {
- draft.themes.system = generateSystem(colors, store.mode)
+ draft.themes.system = generateSystem(colors, mode)
if (store.active === "system") {
draft.ready = true
}
@@ -360,10 +365,34 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
})
}
- const renderer = useRenderer()
- process.on("SIGUSR2", async () => {
+ function apply(mode: "dark" | "light") {
+ kv.set("theme_mode", mode)
+ if (store.mode === mode) return
+ setStore("mode", mode)
renderer.clearPaletteCache()
- init()
+ resolveSystemTheme(mode)
+ }
+
+ function pin(mode: "dark" | "light" = store.mode) {
+ setStore("lock", mode)
+ kv.set("theme_mode_lock", mode)
+ apply(mode)
+ }
+
+ function free() {
+ setStore("lock", undefined)
+ kv.set("theme_mode_lock", undefined)
+ const mode = renderer.themeMode
+ if (mode) apply(mode)
+ }
+
+ const handle = (mode: "dark" | "light") => {
+ if (store.lock) return
+ apply(mode)
+ }
+ renderer.on(CliRenderEvents.THEME_MODE, handle)
+ onCleanup(() => {
+ renderer.off(CliRenderEvents.THEME_MODE, handle)
})
// kilocode_change start - safe fallback to kilo import if store lookup fails
@@ -377,6 +406,10 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
})
// kilocode_change end
+ createEffect(() => {
+ renderer.setBackgroundColor(values().background)
+ })
+
const syntax = createMemo(() => generateSyntax(values()))
const subtleSyntax = createMemo(() => generateSubtleSyntax(values()))
@@ -399,9 +432,17 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
mode() {
return store.mode
},
+ locked() {
+ return store.lock !== undefined
+ },
+ lock() {
+ pin(store.mode)
+ },
+ unlock() {
+ free()
+ },
setMode(mode: "dark" | "light") {
- setStore("mode", mode)
- kv.set("theme_mode", mode)
+ pin(mode)
},
set(theme: string) {
setStore("active", theme)
@@ -455,7 +496,7 @@ export function tint(base: RGBA, overlay: RGBA, alpha: number): RGBA {
function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJson {
const bg = RGBA.fromHex(colors.defaultBackground ?? colors.palette[0]!)
const fg = RGBA.fromHex(colors.defaultForeground ?? colors.palette[7]!)
- const transparent = RGBA.fromInts(0, 0, 0, 0)
+ const transparent = RGBA.fromValues(bg.r, bg.g, bg.b, 0)
const isDark = mode == "dark"
const col = (i: number) => {
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 6d21b2a2c7..737c210afa 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1545,6 +1545,8 @@ function TextPart(props: { last: boolean; part: TextPart; message: AssistantMess
streaming={true}
content={props.part.text.trim()}
conceal={ctx.conceal()}
+ fg={theme.markdownText}
+ bg={theme.background}
/>
diff --git a/packages/opencode/src/cli/cmd/upgrade.ts b/packages/opencode/src/cli/cmd/upgrade.ts
index 5f8acc0ca1..369efead62 100644
--- a/packages/opencode/src/cli/cmd/upgrade.ts
+++ b/packages/opencode/src/cli/cmd/upgrade.ts
@@ -57,7 +57,15 @@ export const UpgradeCommand = {
if (err) {
spinner.stop("Upgrade failed", 1)
if (err instanceof Installation.UpgradeFailedError) {
- prompts.log.error(err.stderr) // kilocode_change - removed choco special case
+ // kilocode_change start - removed choco special case
+ prompts.log.error(err.stderr)
+ // necessary because choco only allows install/upgrade in elevated terminals
+ // if (method === "choco" && err.stderr.includes("not running from an elevated command shell")) {
+ // prompts.log.error("Please run the terminal as Administrator and try again")
+ // } else {
+ // prompts.log.error(err.stderr)
+ // }
+ // kilocode_change end
} else if (err instanceof Error) prompts.log.error(err.message)
prompts.outro("Done")
return
diff --git a/packages/opencode/src/command/index.ts b/packages/opencode/src/command/index.ts
index 3e6673a1a4..d8f6be4130 100644
--- a/packages/opencode/src/command/index.ts
+++ b/packages/opencode/src/command/index.ts
@@ -103,6 +103,7 @@ export namespace Command {
subtask: true,
hints: hints(PROMPT_REVIEW),
}
+
// kilocode_change start
commands[Default.LOCAL_REVIEW] = localReviewCommand()
commands[Default.LOCAL_REVIEW_UNCOMMITTED] = localReviewUncommittedCommand()
diff --git a/packages/opencode/src/effect/cross-spawn-spawner.ts b/packages/opencode/src/effect/cross-spawn-spawner.ts
new file mode 100644
index 0000000000..f7b8786d08
--- /dev/null
+++ b/packages/opencode/src/effect/cross-spawn-spawner.ts
@@ -0,0 +1,476 @@
+import type * as Arr from "effect/Array"
+import { NodeSink, NodeStream } from "@effect/platform-node"
+import * as Deferred from "effect/Deferred"
+import * as Effect from "effect/Effect"
+import * as Exit from "effect/Exit"
+import * as FileSystem from "effect/FileSystem"
+import * as Layer from "effect/Layer"
+import * as Path from "effect/Path"
+import * as PlatformError from "effect/PlatformError"
+import * as Predicate from "effect/Predicate"
+import type * as Scope from "effect/Scope"
+import * as Sink from "effect/Sink"
+import * as Stream from "effect/Stream"
+import * as ChildProcess from "effect/unstable/process/ChildProcess"
+import type { ChildProcessHandle } from "effect/unstable/process/ChildProcessSpawner"
+import {
+ ChildProcessSpawner,
+ ExitCode,
+ make as makeSpawner,
+ makeHandle,
+ ProcessId,
+} from "effect/unstable/process/ChildProcessSpawner"
+import * as NodeChildProcess from "node:child_process"
+import { PassThrough } from "node:stream"
+import launch from "cross-spawn"
+
+const toError = (err: unknown): Error => (err instanceof globalThis.Error ? err : new globalThis.Error(String(err)))
+
+const toTag = (err: NodeJS.ErrnoException): PlatformError.SystemErrorTag => {
+ switch (err.code) {
+ case "ENOENT":
+ return "NotFound"
+ case "EACCES":
+ return "PermissionDenied"
+ case "EEXIST":
+ return "AlreadyExists"
+ case "EISDIR":
+ return "BadResource"
+ case "ENOTDIR":
+ return "BadResource"
+ case "EBUSY":
+ return "Busy"
+ case "ELOOP":
+ return "BadResource"
+ default:
+ return "Unknown"
+ }
+}
+
+const flatten = (command: ChildProcess.Command) => {
+ const commands: Array = []
+ const opts: Array = []
+
+ const walk = (cmd: ChildProcess.Command): void => {
+ switch (cmd._tag) {
+ case "StandardCommand":
+ commands.push(cmd)
+ return
+ case "PipedCommand":
+ walk(cmd.left)
+ opts.push(cmd.options)
+ walk(cmd.right)
+ return
+ }
+ }
+
+ walk(command)
+ if (commands.length === 0) throw new Error("flatten produced empty commands array")
+ const [head, ...tail] = commands
+ return {
+ commands: [head, ...tail] as Arr.NonEmptyReadonlyArray,
+ opts,
+ }
+}
+
+const toPlatformError = (
+ method: string,
+ err: NodeJS.ErrnoException,
+ command: ChildProcess.Command,
+): PlatformError.PlatformError => {
+ const cmd = flatten(command)
+ .commands.map((x) => `${x.command} ${x.args.join(" ")}`)
+ .join(" | ")
+ return PlatformError.systemError({
+ _tag: toTag(err),
+ module: "ChildProcess",
+ method,
+ pathOrDescriptor: cmd,
+ syscall: err.syscall,
+ cause: err,
+ })
+}
+
+type ExitSignal = Deferred.Deferred
+
+export const make = Effect.gen(function* () {
+ const fs = yield* FileSystem.FileSystem
+ const path = yield* Path.Path
+
+ const cwd = Effect.fnUntraced(function* (opts: ChildProcess.CommandOptions) {
+ if (Predicate.isUndefined(opts.cwd)) return undefined
+ yield* fs.access(opts.cwd)
+ return path.resolve(opts.cwd)
+ })
+
+ const env = (opts: ChildProcess.CommandOptions) =>
+ opts.extendEnv ? { ...globalThis.process.env, ...opts.env } : opts.env
+
+ const input = (x: ChildProcess.CommandInput | undefined): NodeChildProcess.IOType | undefined =>
+ Stream.isStream(x) ? "pipe" : x
+
+ const output = (x: ChildProcess.CommandOutput | undefined): NodeChildProcess.IOType | undefined =>
+ Sink.isSink(x) ? "pipe" : x
+
+ const stdin = (opts: ChildProcess.CommandOptions): ChildProcess.StdinConfig => {
+ const cfg: ChildProcess.StdinConfig = { stream: "pipe", encoding: "utf-8", endOnDone: true }
+ if (Predicate.isUndefined(opts.stdin)) return cfg
+ if (typeof opts.stdin === "string") return { ...cfg, stream: opts.stdin }
+ if (Stream.isStream(opts.stdin)) return { ...cfg, stream: opts.stdin }
+ return {
+ stream: opts.stdin.stream,
+ encoding: opts.stdin.encoding ?? cfg.encoding,
+ endOnDone: opts.stdin.endOnDone ?? cfg.endOnDone,
+ }
+ }
+
+ const stdio = (opts: ChildProcess.CommandOptions, key: "stdout" | "stderr"): ChildProcess.StdoutConfig => {
+ const cfg = opts[key]
+ if (Predicate.isUndefined(cfg)) return { stream: "pipe" }
+ if (typeof cfg === "string") return { stream: cfg }
+ if (Sink.isSink(cfg)) return { stream: cfg }
+ return { stream: cfg.stream }
+ }
+
+ const fds = (opts: ChildProcess.CommandOptions) => {
+ if (Predicate.isUndefined(opts.additionalFds)) return []
+ return Object.entries(opts.additionalFds)
+ .flatMap(([name, config]) => {
+ const fd = ChildProcess.parseFdName(name)
+ return Predicate.isUndefined(fd) ? [] : [{ fd, config }]
+ })
+ .toSorted((a, b) => a.fd - b.fd)
+ }
+
+ const stdios = (
+ sin: ChildProcess.StdinConfig,
+ sout: ChildProcess.StdoutConfig,
+ serr: ChildProcess.StderrConfig,
+ extra: ReadonlyArray<{ fd: number; config: ChildProcess.AdditionalFdConfig }>,
+ ): NodeChildProcess.StdioOptions => {
+ const pipe = (x: NodeChildProcess.IOType | undefined) =>
+ process.platform === "win32" && x === "pipe" ? "overlapped" : x
+ const arr: Array = [
+ pipe(input(sin.stream)),
+ pipe(output(sout.stream)),
+ pipe(output(serr.stream)),
+ ]
+ if (extra.length === 0) return arr as NodeChildProcess.StdioOptions
+ const max = extra.reduce((acc, x) => Math.max(acc, x.fd), 2)
+ for (let i = 3; i <= max; i++) arr[i] = "ignore"
+ for (const x of extra) arr[x.fd] = pipe("pipe")
+ return arr as NodeChildProcess.StdioOptions
+ }
+
+ const setupFds = Effect.fnUntraced(function* (
+ command: ChildProcess.StandardCommand,
+ proc: NodeChildProcess.ChildProcess,
+ extra: ReadonlyArray<{ fd: number; config: ChildProcess.AdditionalFdConfig }>,
+ ) {
+ if (extra.length === 0) {
+ return {
+ getInputFd: () => Sink.drain,
+ getOutputFd: () => Stream.empty,
+ }
+ }
+
+ const ins = new Map>()
+ const outs = new Map>()
+
+ for (const x of extra) {
+ const node = proc.stdio[x.fd]
+ switch (x.config.type) {
+ case "input": {
+ let sink: Sink.Sink = Sink.drain
+ if (node && "write" in node) {
+ sink = NodeSink.fromWritable({
+ evaluate: () => node,
+ onError: (err) => toPlatformError(`fromWritable(fd${x.fd})`, toError(err), command),
+ endOnDone: true,
+ })
+ }
+ if (x.config.stream) yield* Effect.forkScoped(Stream.run(x.config.stream, sink))
+ ins.set(x.fd, sink)
+ break
+ }
+ case "output": {
+ let stream: Stream.Stream = Stream.empty
+ if (node && "read" in node) {
+ const tap = new PassThrough()
+ node.on("error", (err) => tap.destroy(toError(err)))
+ node.pipe(tap)
+ stream = NodeStream.fromReadable({
+ evaluate: () => tap,
+ onError: (err) => toPlatformError(`fromReadable(fd${x.fd})`, toError(err), command),
+ })
+ }
+ if (x.config.sink) stream = Stream.transduce(stream, x.config.sink)
+ outs.set(x.fd, stream)
+ break
+ }
+ }
+ }
+
+ return {
+ getInputFd: (fd: number) => ins.get(fd) ?? Sink.drain,
+ getOutputFd: (fd: number) => outs.get(fd) ?? Stream.empty,
+ }
+ })
+
+ const setupStdin = (
+ command: ChildProcess.StandardCommand,
+ proc: NodeChildProcess.ChildProcess,
+ cfg: ChildProcess.StdinConfig,
+ ) =>
+ Effect.suspend(() => {
+ let sink: Sink.Sink = Sink.drain
+ if (Predicate.isNotNull(proc.stdin)) {
+ sink = NodeSink.fromWritable({
+ evaluate: () => proc.stdin!,
+ onError: (err) => toPlatformError("fromWritable(stdin)", toError(err), command),
+ endOnDone: cfg.endOnDone,
+ encoding: cfg.encoding,
+ })
+ }
+ if (Stream.isStream(cfg.stream)) return Effect.as(Effect.forkScoped(Stream.run(cfg.stream, sink)), sink)
+ return Effect.succeed(sink)
+ })
+
+ const setupOutput = (
+ command: ChildProcess.StandardCommand,
+ proc: NodeChildProcess.ChildProcess,
+ out: ChildProcess.StdoutConfig,
+ err: ChildProcess.StderrConfig,
+ ) => {
+ let stdout = proc.stdout
+ ? NodeStream.fromReadable({
+ evaluate: () => proc.stdout!,
+ onError: (cause) => toPlatformError("fromReadable(stdout)", toError(cause), command),
+ })
+ : Stream.empty
+ let stderr = proc.stderr
+ ? NodeStream.fromReadable({
+ evaluate: () => proc.stderr!,
+ onError: (cause) => toPlatformError("fromReadable(stderr)", toError(cause), command),
+ })
+ : Stream.empty
+
+ if (Sink.isSink(out.stream)) stdout = Stream.transduce(stdout, out.stream)
+ if (Sink.isSink(err.stream)) stderr = Stream.transduce(stderr, err.stream)
+
+ return { stdout, stderr, all: Stream.merge(stdout, stderr) }
+ }
+
+ const spawn = (command: ChildProcess.StandardCommand, opts: NodeChildProcess.SpawnOptions) =>
+ Effect.callback((resume) => {
+ const signal = Deferred.makeUnsafe()
+ const proc = launch(command.command, command.args, opts)
+ let end = false
+ let exit: readonly [code: number | null, signal: NodeJS.Signals | null] | undefined
+ proc.on("error", (err) => {
+ resume(Effect.fail(toPlatformError("spawn", err, command)))
+ })
+ proc.on("exit", (...args) => {
+ exit = args
+ })
+ proc.on("close", (...args) => {
+ if (end) return
+ end = true
+ Deferred.doneUnsafe(signal, Exit.succeed(exit ?? args))
+ })
+ proc.on("spawn", () => {
+ resume(Effect.succeed([proc, signal]))
+ })
+ return Effect.sync(() => {
+ proc.kill("SIGTERM")
+ })
+ })
+
+ const killGroup = (
+ command: ChildProcess.StandardCommand,
+ proc: NodeChildProcess.ChildProcess,
+ signal: NodeJS.Signals,
+ ) => {
+ if (globalThis.process.platform === "win32") {
+ return Effect.callback((resume) => {
+ NodeChildProcess.exec(`taskkill /pid ${proc.pid} /T /F`, { windowsHide: true }, (err) => {
+ if (err) return resume(Effect.fail(toPlatformError("kill", toError(err), command)))
+ resume(Effect.void)
+ })
+ })
+ }
+
+ return Effect.try({
+ try: () => {
+ globalThis.process.kill(-proc.pid!, signal)
+ },
+ catch: (err) => toPlatformError("kill", toError(err), command),
+ })
+ }
+
+ const killOne = (
+ command: ChildProcess.StandardCommand,
+ proc: NodeChildProcess.ChildProcess,
+ signal: NodeJS.Signals,
+ ) =>
+ Effect.suspend(() => {
+ if (proc.kill(signal)) return Effect.void
+ return Effect.fail(toPlatformError("kill", new Error("Failed to kill child process"), command))
+ })
+
+ const timeout =
+ (
+ proc: NodeChildProcess.ChildProcess,
+ command: ChildProcess.StandardCommand,
+ opts: ChildProcess.KillOptions | undefined,
+ ) =>
+ (
+ f: (
+ command: ChildProcess.StandardCommand,
+ proc: NodeChildProcess.ChildProcess,
+ signal: NodeJS.Signals,
+ ) => Effect.Effect,
+ ) => {
+ const signal = opts?.killSignal ?? "SIGTERM"
+ if (Predicate.isUndefined(opts?.forceKillAfter)) return f(command, proc, signal)
+ return Effect.timeoutOrElse(f(command, proc, signal), {
+ duration: opts.forceKillAfter,
+ onTimeout: () => f(command, proc, "SIGKILL"),
+ })
+ }
+
+ const source = (handle: ChildProcessHandle, from: ChildProcess.PipeFromOption | undefined) => {
+ const opt = from ?? "stdout"
+ switch (opt) {
+ case "stdout":
+ return handle.stdout
+ case "stderr":
+ return handle.stderr
+ case "all":
+ return handle.all
+ default: {
+ const fd = ChildProcess.parseFdName(opt)
+ return Predicate.isNotUndefined(fd) ? handle.getOutputFd(fd) : handle.stdout
+ }
+ }
+ }
+
+ const spawnCommand: (
+ command: ChildProcess.Command,
+ ) => Effect.Effect = Effect.fnUntraced(
+ function* (command) {
+ switch (command._tag) {
+ case "StandardCommand": {
+ const sin = stdin(command.options)
+ const sout = stdio(command.options, "stdout")
+ const serr = stdio(command.options, "stderr")
+ const extra = fds(command.options)
+ const dir = yield* cwd(command.options)
+
+ const [proc, signal] = yield* Effect.acquireRelease(
+ spawn(command, {
+ cwd: dir,
+ env: env(command.options),
+ stdio: stdios(sin, sout, serr, extra),
+ detached: command.options.detached ?? process.platform !== "win32",
+ shell: command.options.shell,
+ windowsHide: process.platform === "win32",
+ }),
+ Effect.fnUntraced(function* ([proc, signal]) {
+ const done = yield* Deferred.isDone(signal)
+ const kill = timeout(proc, command, command.options)
+ if (done) {
+ const [code] = yield* Deferred.await(signal)
+ if (process.platform === "win32") return yield* Effect.void
+ if (code !== 0 && Predicate.isNotNull(code)) return yield* Effect.ignore(kill(killGroup))
+ return yield* Effect.void
+ }
+ return yield* kill((command, proc, signal) =>
+ Effect.catch(killGroup(command, proc, signal), () => killOne(command, proc, signal)),
+ ).pipe(Effect.andThen(Deferred.await(signal)), Effect.ignore)
+ }),
+ )
+
+ const fd = yield* setupFds(command, proc, extra)
+ const out = setupOutput(command, proc, sout, serr)
+ return makeHandle({
+ pid: ProcessId(proc.pid!),
+ stdin: yield* setupStdin(command, proc, sin),
+ stdout: out.stdout,
+ stderr: out.stderr,
+ all: out.all,
+ getInputFd: fd.getInputFd,
+ getOutputFd: fd.getOutputFd,
+ isRunning: Effect.map(Deferred.isDone(signal), (done) => !done),
+ exitCode: Effect.flatMap(Deferred.await(signal), ([code, signal]) => {
+ if (Predicate.isNotNull(code)) return Effect.succeed(ExitCode(code))
+ return Effect.fail(
+ toPlatformError(
+ "exitCode",
+ new Error(`Process interrupted due to receipt of signal: '${signal}'`),
+ command,
+ ),
+ )
+ }),
+ kill: (opts?: ChildProcess.KillOptions) =>
+ timeout(
+ proc,
+ command,
+ opts,
+ )((command, proc, signal) =>
+ Effect.catch(killGroup(command, proc, signal), () => killOne(command, proc, signal)),
+ ).pipe(Effect.andThen(Deferred.await(signal)), Effect.asVoid),
+ })
+ }
+ case "PipedCommand": {
+ const flat = flatten(command)
+ const [head, ...tail] = flat.commands
+ let handle = spawnCommand(head)
+ for (let i = 0; i < tail.length; i++) {
+ const next = tail[i]
+ const opts = flat.opts[i] ?? {}
+ const sin = stdin(next.options)
+ const stream = Stream.unwrap(Effect.map(handle, (x) => source(x, opts.from)))
+ const to = opts.to ?? "stdin"
+ if (to === "stdin") {
+ handle = spawnCommand(
+ ChildProcess.make(next.command, next.args, {
+ ...next.options,
+ stdin: { ...sin, stream },
+ }),
+ )
+ continue
+ }
+ const fd = ChildProcess.parseFdName(to)
+ if (Predicate.isUndefined(fd)) {
+ handle = spawnCommand(
+ ChildProcess.make(next.command, next.args, {
+ ...next.options,
+ stdin: { ...sin, stream },
+ }),
+ )
+ continue
+ }
+ handle = spawnCommand(
+ ChildProcess.make(next.command, next.args, {
+ ...next.options,
+ additionalFds: {
+ ...next.options.additionalFds,
+ [ChildProcess.fdName(fd) as `fd${number}`]: { type: "input", stream },
+ },
+ }),
+ )
+ }
+ return yield* handle
+ }
+ }
+ },
+ )
+
+ return makeSpawner(spawnCommand)
+})
+
+export const layer: Layer.Layer = Layer.effect(
+ ChildProcessSpawner,
+ make,
+)
diff --git a/packages/opencode/src/effect/run-service.ts b/packages/opencode/src/effect/run-service.ts
index bac1bc7d96..226c276ead 100644
--- a/packages/opencode/src/effect/run-service.ts
+++ b/packages/opencode/src/effect/run-service.ts
@@ -3,18 +3,11 @@ import * as ServiceMap from "effect/ServiceMap"
export const memoMap = Layer.makeMemoMapUnsafe()
-// Accept layers whose RIn may not fully resolve to `never` due to
-// TypeScript inference limitations with chained Layer.provide calls
-// in Effect 4.x beta. At runtime the providers are present; the cast
-// inside ManagedRuntime.make is safe.
-export function makeRunPromise(
- service: ServiceMap.Service,
- layer: Layer.Layer,
-) {
+export function makeRunPromise(service: ServiceMap.Service, layer: Layer.Layer) {
let rt: ManagedRuntime.ManagedRuntime | undefined
return (fn: (svc: S) => Effect.Effect, options?: Effect.RunOptions) => {
- rt ??= ManagedRuntime.make(layer as Layer.Layer, { memoMap })
+ rt ??= ManagedRuntime.make(layer, { memoMap })
return rt.runPromise(service.use(fn), options)
}
}
diff --git a/packages/opencode/src/flag/flag.ts b/packages/opencode/src/flag/flag.ts
index 4c5d2cfc11..9e9da0cbfd 100644
--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -1,4 +1,3 @@
-// kilocode_change - renamed all OPENCODE_ env vars to KILO_
import { Config } from "effect"
function truthy(key: string) {
@@ -44,9 +43,9 @@ export namespace Flag {
export const KILO_EXPERIMENTAL_FILEWATCHER = Config.boolean("KILO_EXPERIMENTAL_FILEWATCHER").pipe(
Config.withDefault(false),
)
- export const KILO_EXPERIMENTAL_DISABLE_FILEWATCHER = Config.boolean(
- "KILO_EXPERIMENTAL_DISABLE_FILEWATCHER",
- ).pipe(Config.withDefault(false))
+ export const KILO_EXPERIMENTAL_DISABLE_FILEWATCHER = Config.boolean("KILO_EXPERIMENTAL_DISABLE_FILEWATCHER").pipe(
+ Config.withDefault(false),
+ )
export const KILO_EXPERIMENTAL_ICON_DISCOVERY = KILO_EXPERIMENTAL || truthy("KILO_EXPERIMENTAL_ICON_DISCOVERY")
const copy = process.env["KILO_EXPERIMENTAL_DISABLE_COPY_ON_SELECT"]
@@ -66,6 +65,7 @@ export namespace Flag {
export const KILO_EXPERIMENTAL_MARKDOWN = !falsy("KILO_EXPERIMENTAL_MARKDOWN")
export const KILO_MODELS_URL = process.env["KILO_MODELS_URL"]
export const KILO_MODELS_PATH = process.env["KILO_MODELS_PATH"]
+ export const KILO_DB = process.env["KILO_DB"]
export const KILO_DISABLE_CHANNEL_DB = truthy("KILO_DISABLE_CHANNEL_DB")
export const KILO_SKIP_MIGRATIONS = truthy("KILO_SKIP_MIGRATIONS")
export const KILO_STRICT_CONFIG_DEPS = truthy("KILO_STRICT_CONFIG_DEPS")
diff --git a/packages/opencode/src/installation/index.ts b/packages/opencode/src/installation/index.ts
index 7d24b42250..c14931a85d 100644
--- a/packages/opencode/src/installation/index.ts
+++ b/packages/opencode/src/installation/index.ts
@@ -1,6 +1,7 @@
-import { NodeChildProcessSpawner, NodeFileSystem, NodePath } from "@effect/platform-node"
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
import { Effect, Layer, Schema, ServiceMap, Stream } from "effect"
import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
import { makeRunPromise } from "@/effect/run-service"
import { withTransientReadRetry } from "@/util/effect-http-client"
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -174,7 +175,7 @@ export namespace Installation {
)
const methodImpl = Effect.fn("Installation.method")(function* () {
- if (process.execPath.includes(path.join(".kilo", "bin")) || process.execPath.includes(path.join(".opencode", "bin"))) return "curl" as Method // kilocode_change
+ if (process.execPath.includes(path.join(".kilo", "bin"))) return "curl" as Method // kilocode_change
if (process.execPath.includes(path.join(".local", "bin"))) return "curl" as Method
const exec = process.execPath.toLowerCase()
@@ -201,7 +202,7 @@ export namespace Installation {
for (const check of checks) {
const output = yield* check.command()
const installedName =
- check.name === "brew" || check.name === "choco" || check.name === "scoop" ? "kilo" : "@kilocode/cli" // kilocode_change
+ check.name === "brew" || check.name === "choco" || check.name === "scoop" ? "kilo" : "kilo" // kilocode_change
if (output.includes(installedName)) {
return check.name
}
@@ -221,7 +222,8 @@ export namespace Installation {
return info.formulae[0].versions.stable
}
const response = yield* httpOk.execute(
- HttpClientRequest.get("https://formulae.brew.sh/api/formula/kilo.json").pipe( // kilocode_change
+ HttpClientRequest.get("https://formulae.brew.sh/api/formula/kilo.json").pipe(
+ // kilocode_change
HttpClientRequest.acceptJson,
),
)
@@ -262,7 +264,8 @@ export namespace Installation {
}
const response = yield* httpOk.execute(
- HttpClientRequest.get("https://api.github.com/repos/Kilo-Org/kilocode/releases/latest").pipe( // kilocode_change
+ HttpClientRequest.get("https://api.github.com/repos/Kilo-Org/kilocode/releases/latest").pipe(
+ // kilocode_change
HttpClientRequest.acceptJson,
),
)
@@ -345,10 +348,10 @@ export namespace Installation {
export const defaultLayer = layer.pipe(
Layer.provide(FetchHttpClient.layer),
- Layer.provide(NodeChildProcessSpawner.layer),
+ Layer.provide(CrossSpawnSpawner.layer),
Layer.provide(NodeFileSystem.layer),
Layer.provide(NodePath.layer),
- ) as Layer.Layer
+ )
const runPromise = makeRunPromise(Service, defaultLayer)
diff --git a/packages/opencode/src/permission/index.ts b/packages/opencode/src/permission/index.ts
index bf404b4a81..0aed80e8c0 100644
--- a/packages/opencode/src/permission/index.ts
+++ b/packages/opencode/src/permission/index.ts
@@ -187,8 +187,9 @@ export namespace Permission {
)
const ask = Effect.fn("Permission.ask")(function* (input: z.infer) {
- const s = yield* InstanceState.get(state)
+ const { approved, pending } = yield* InstanceState.get(state)
const { ruleset, ...request } = input
+ const s = yield* InstanceState.get(state) // kilocode_change
const local = s.session[request.sessionID] ?? [] // kilocode_change
let needsAsk = false
@@ -197,7 +198,7 @@ export namespace Permission {
// kilocode_change end
for (const pattern of request.patterns) {
- const rule = evaluate(request.permission, pattern, ruleset, s.approved, local) // kilocode_change — include session rules
+ const rule = evaluate(request.permission, pattern, ruleset, approved)
log.info("evaluated", { permission: request.permission, pattern, action: rule })
if (rule.action === "deny") {
return yield* new DeniedError({
@@ -358,9 +359,7 @@ export namespace Permission {
delete s.session[input.sessionID]
return
}
- const idx = s.approved.findLastIndex(
- (r) => r.permission === "*" && r.pattern === "*" && r.action === "allow",
- )
+ const idx = s.approved.findLastIndex((r) => r.permission === "*" && r.pattern === "*" && r.action === "allow")
if (idx >= 0) s.approved.splice(idx, 1)
return
}
diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
index 83d0127aa0..63d045d558 100644
--- a/packages/opencode/src/plugin/index.ts
+++ b/packages/opencode/src/plugin/index.ts
@@ -11,11 +11,11 @@ import { Session } from "../session"
import { NamedError } from "@opencode-ai/util/error"
import { CopilotAuthPlugin } from "./copilot"
import { gitlabAuthPlugin as GitlabAuthPlugin } from "opencode-gitlab-auth"
+import { PoeAuthPlugin } from "opencode-poe-auth"
import { Effect, Layer, ServiceMap } from "effect"
import { InstanceState } from "@/effect/instance-state"
-import { makeRunPromise } from "@/effect/run-service"
-
import { KiloAuthPlugin } from "@kilocode/kilo-gateway" // kilocode_change
+import { makeRunPromise } from "@/effect/run-service"
export namespace Plugin {
const log = Log.create({ service: "plugin" })
@@ -52,6 +52,7 @@ export namespace Plugin {
CodexAuthPlugin,
CopilotAuthPlugin,
GitlabAuthPlugin as unknown as PluginInstance,
+ PoeAuthPlugin,
] // kilocode_change end
// Old npm package names for plugins that are now built-in — skip if users still have them in config
@@ -144,7 +145,11 @@ export namespace Plugin {
// Notify plugins of current config
for (const hook of hooks) {
- await (hook as any).config?.(cfg)
+ try {
+ await (hook as any).config?.(cfg)
+ } catch (err) {
+ log.error("plugin config hook failed", { error: err })
+ }
}
})
diff --git a/packages/opencode/src/project/bootstrap.ts b/packages/opencode/src/project/bootstrap.ts
index cf64048661..cfd16237fb 100644
--- a/packages/opencode/src/project/bootstrap.ts
+++ b/packages/opencode/src/project/bootstrap.ts
@@ -11,6 +11,7 @@ import { Command } from "../command"
import { Instance } from "./instance"
import { Log } from "@/util/log"
import { KiloSessions } from "@/kilo-sessions/kilo-sessions" // kilocode_change
+// import { ShareNext } from "@/share/share-next" // kilocode_change
export async function InstanceBootstrap() {
Log.Default.info("bootstrapping", { directory: Instance.directory })
diff --git a/packages/opencode/src/project/instance.ts b/packages/opencode/src/project/instance.ts
index c2292f0638..4c9b2e107b 100644
--- a/packages/opencode/src/project/instance.ts
+++ b/packages/opencode/src/project/instance.ts
@@ -132,16 +132,6 @@ export const Instance = {
cache.delete(directory)
emit(directory)
},
- /**
- * Reset a specific state entry for all instances without running dispose callbacks.
- * Used to invalidate config-derived caches (e.g. Config.state) after a no-dispose
- * config write, so the next Config.get() re-reads from disk with correct precedence.
- */
- resetStateEntry(init: (...args: any[]) => any) {
- for (const dir of cache.keys()) {
- State.resetEntry(dir, init)
- }
- },
async disposeAll() {
if (disposal.all) return disposal.all
diff --git a/packages/opencode/src/project/project.ts b/packages/opencode/src/project/project.ts
index a06407399a..4d0a72ac08 100644
--- a/packages/opencode/src/project/project.ts
+++ b/packages/opencode/src/project/project.ts
@@ -1,36 +1,23 @@
import z from "zod"
-import { Filesystem } from "../util/filesystem"
-import path from "path"
import { and, Database, eq } from "../storage/db"
import { ProjectTable } from "./project.sql"
import { SessionTable } from "../session/session.sql"
import { Log } from "../util/log"
import { Flag } from "@/flag/flag"
-import { fn } from "@opencode-ai/util/fn"
import { BusEvent } from "@/bus/bus-event"
-import { iife } from "@/util/iife"
import { GlobalBus } from "@/bus/global"
-import { existsSync } from "fs"
-import { git } from "../util/git"
-import { Glob } from "../util/glob"
import { which } from "../util/which"
import { ProjectID } from "./schema"
+import { Effect, Layer, Path, Scope, ServiceMap, Stream } from "effect"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
+import { makeRunPromise } from "@/effect/run-service"
+import { AppFileSystem } from "@/filesystem"
+import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
export namespace Project {
const log = Log.create({ service: "project" })
- function gitpath(cwd: string, name: string) {
- if (!name) return cwd
- // git output includes trailing newlines; keep path whitespace intact.
- name = name.replace(/[\r\n]+$/, "")
- if (!name) return cwd
-
- name = Filesystem.windowsPath(name)
-
- if (path.isAbsolute(name)) return path.normalize(name)
- return path.resolve(cwd, name)
- }
-
export const Info = z
.object({
id: ProjectID.zod,
@@ -73,7 +60,7 @@ export namespace Project {
? { url: row.icon_url ?? undefined, color: row.icon_color ?? undefined }
: undefined
return {
- id: ProjectID.make(row.id),
+ id: row.id,
worktree: row.worktree,
vcs: row.vcs ? Info.shape.vcs.parse(row.vcs) : undefined,
name: row.name ?? undefined,
@@ -88,245 +75,408 @@ export namespace Project {
}
}
- function readCachedId(dir: string) {
- return Filesystem.readText(path.join(dir, "kilo")) // kilocode_change
- .then((x) => x.trim())
- .then(ProjectID.make)
- .catch(() => undefined)
+ export const UpdateInput = z.object({
+ projectID: ProjectID.zod,
+ name: z.string().optional(),
+ icon: Info.shape.icon.optional(),
+ commands: Info.shape.commands.optional(),
+ })
+ export type UpdateInput = z.infer
+
+ // ---------------------------------------------------------------------------
+ // Effect service
+ // ---------------------------------------------------------------------------
+
+ export interface Interface {
+ readonly fromDirectory: (directory: string) => Effect.Effect<{ project: Info; sandbox: string }>
+ readonly discover: (input: Info) => Effect.Effect
+ readonly list: () => Effect.Effect
+ readonly get: (id: ProjectID) => Effect.Effect
+ readonly update: (input: UpdateInput) => Effect.Effect
+ readonly initGit: (input: { directory: string; project: Info }) => Effect.Effect
+ readonly setInitialized: (id: ProjectID) => Effect.Effect
+ readonly sandboxes: (id: ProjectID) => Effect.Effect
+ readonly addSandbox: (id: ProjectID, directory: string) => Effect.Effect
+ readonly removeSandbox: (id: ProjectID, directory: string) => Effect.Effect
}
- export async function fromDirectory(directory: string) {
- log.info("fromDirectory", { directory })
+ export class Service extends ServiceMap.Service()("@opencode/Project") {}
- const data = await iife(async () => {
- const matches = Filesystem.up({ targets: [".git"], start: directory })
- const dotgit = await matches.next().then((x) => x.value)
- await matches.return()
- if (dotgit) {
- let sandbox = path.dirname(dotgit)
+ type GitResult = { code: number; text: string; stderr: string }
- const gitBinary = which("git")
+ export const layer: Layer.Layer<
+ Service,
+ never,
+ AppFileSystem.Service | Path.Path | ChildProcessSpawner.ChildProcessSpawner
+ > = Layer.effect(
+ Service,
+ Effect.gen(function* () {
+ const fsys = yield* AppFileSystem.Service
+ const pathSvc = yield* Path.Path
+ const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
- // cached id calculation
- let id = await readCachedId(dotgit)
+ const git = Effect.fnUntraced(
+ function* (args: string[], opts?: { cwd?: string }) {
+ const handle = yield* spawner.spawn(
+ ChildProcess.make("git", args, { cwd: opts?.cwd, extendEnv: true, stdin: "ignore" }),
+ )
+ const [text, stderr] = yield* Effect.all(
+ [Stream.mkString(Stream.decodeText(handle.stdout)), Stream.mkString(Stream.decodeText(handle.stderr))],
+ { concurrency: 2 },
+ )
+ const code = yield* handle.exitCode
+ return { code, text, stderr } satisfies GitResult
+ },
+ Effect.scoped,
+ Effect.catch(() => Effect.succeed({ code: 1, text: "", stderr: "" } satisfies GitResult)),
+ )
- if (!gitBinary) {
- return {
- id: id ?? ProjectID.global,
- worktree: sandbox,
- sandbox: sandbox,
- vcs: Info.shape.vcs.parse(Flag.KILO_FAKE_VCS), // kilocode_change
- }
- }
+ const db = (fn: (d: Parameters[0] extends (trx: infer D) => any ? D : never) => T) =>
+ Effect.sync(() => Database.use(fn))
- const worktree = await git(["rev-parse", "--git-common-dir"], {
- cwd: sandbox,
- })
- .then(async (result) => {
- const common = gitpath(sandbox, await result.text())
- // Avoid going to parent of sandbox when git-common-dir is empty.
- return common === sandbox ? sandbox : path.dirname(common)
- })
- .catch(() => undefined)
+ const emitUpdated = (data: Info) =>
+ Effect.sync(() =>
+ GlobalBus.emit("event", {
+ payload: { type: Event.Updated.type, properties: data },
+ }),
+ )
- if (!worktree) {
- return {
- id: id ?? ProjectID.global,
- worktree: sandbox,
- sandbox,
- vcs: Info.shape.vcs.parse(Flag.KILO_FAKE_VCS), // kilocode_change
- }
- }
+ const fakeVcs = Info.shape.vcs.parse(Flag.KILO_FAKE_VCS)
- // In the case of a git worktree, it can't cache the id
- // because `.git` is not a folder, but it always needs the
- // same project id as the common dir, so we resolve it now
- if (id == null) {
- id = await readCachedId(path.join(worktree, ".git"))
- }
+ const resolveGitPath = (cwd: string, name: string) => {
+ if (!name) return cwd
+ name = name.replace(/[\r\n]+$/, "")
+ if (!name) return cwd
+ name = AppFileSystem.windowsPath(name)
+ if (pathSvc.isAbsolute(name)) return pathSvc.normalize(name)
+ return pathSvc.resolve(cwd, name)
+ }
- // generate id from root commit
- if (!id) {
- const roots = await git(["rev-list", "--max-parents=0", "HEAD"], {
- cwd: sandbox,
- })
- .then(async (result) =>
- (await result.text())
- .split("\n")
- .filter(Boolean)
- .map((x) => x.trim())
- .toSorted(),
- )
- .catch(() => undefined)
+ const scope = yield* Scope.Scope
- if (!roots) {
+ const readCachedProjectId = Effect.fnUntraced(function* (dir: string) {
+ // kilocode change start
+ return yield* fsys.readFileString(pathSvc.join(dir, "kilo")).pipe(
+ // kilocode change end
+ Effect.map((x) => x.trim()),
+ Effect.map(ProjectID.make),
+ Effect.catch(() => Effect.succeed(undefined)),
+ )
+ })
+
+ const fromDirectory = Effect.fn("Project.fromDirectory")(function* (directory: string) {
+ log.info("fromDirectory", { directory })
+
+ // Phase 1: discover git info
+ type DiscoveryResult = { id: ProjectID; worktree: string; sandbox: string; vcs: Info["vcs"] }
+
+ const data: DiscoveryResult = yield* Effect.gen(function* () {
+ const dotgitMatches = yield* fsys.up({ targets: [".git"], start: directory }).pipe(Effect.orDie)
+ const dotgit = dotgitMatches[0]
+
+ if (!dotgit) {
return {
id: ProjectID.global,
- worktree: sandbox,
- sandbox: sandbox,
- vcs: Info.shape.vcs.parse(Flag.KILO_FAKE_VCS), // kilocode_change
+ worktree: "/",
+ sandbox: "/",
+ vcs: fakeVcs,
}
}
- id = roots[0] ? ProjectID.make(roots[0]) : undefined
- if (id) {
- // Write to common dir so the cache is shared across worktrees.
- await Filesystem.write(path.join(worktree, ".git", "kilo"), id).catch(() => undefined) // kilocode_change
- }
- }
+ let sandbox = pathSvc.dirname(dotgit)
+ const gitBinary = yield* Effect.sync(() => which("git"))
+ let id = yield* readCachedProjectId(dotgit)
- if (!id) {
- return {
- id: ProjectID.global,
- worktree: sandbox,
- sandbox,
- vcs: "git",
+ if (!gitBinary) {
+ return {
+ id: id ?? ProjectID.global,
+ worktree: sandbox,
+ sandbox,
+ vcs: fakeVcs,
+ }
}
- }
- const top = await git(["rev-parse", "--show-toplevel"], {
- cwd: sandbox,
+ const commonDir = yield* git(["rev-parse", "--git-common-dir"], { cwd: sandbox })
+ if (commonDir.code !== 0) {
+ return {
+ id: id ?? ProjectID.global,
+ worktree: sandbox,
+ sandbox,
+ vcs: fakeVcs,
+ }
+ }
+ const worktree = (() => {
+ const common = resolveGitPath(sandbox, commonDir.text.trim())
+ return common === sandbox ? sandbox : pathSvc.dirname(common)
+ })()
+
+ if (id == null) {
+ id = yield* readCachedProjectId(pathSvc.join(worktree, ".git"))
+ }
+
+ if (!id) {
+ const revList = yield* git(["rev-list", "--max-parents=0", "HEAD"], { cwd: sandbox })
+ const roots = revList.text
+ .split("\n")
+ .filter(Boolean)
+ .map((x) => x.trim())
+ .toSorted()
+
+ id = roots[0] ? ProjectID.make(roots[0]) : undefined
+ if (id) {
+ // kilocode_change start
+ yield* fsys.writeFileString(pathSvc.join(worktree, ".git", "kilo"), id).pipe(Effect.ignore)
+ // kilocode_change end
+ }
+ }
+
+ if (!id) {
+ return { id: ProjectID.global, worktree: sandbox, sandbox, vcs: "git" as const }
+ }
+
+ const topLevel = yield* git(["rev-parse", "--show-toplevel"], { cwd: sandbox })
+ if (topLevel.code !== 0) {
+ return {
+ id,
+ worktree: sandbox,
+ sandbox,
+ vcs: fakeVcs,
+ }
+ }
+ sandbox = resolveGitPath(sandbox, topLevel.text.trim())
+
+ return { id, sandbox, worktree, vcs: "git" as const }
})
- .then(async (result) => gitpath(sandbox, await result.text()))
- .catch(() => undefined)
- if (!top) {
- return {
- id,
- worktree: sandbox,
- sandbox,
- vcs: Info.shape.vcs.parse(Flag.KILO_FAKE_VCS),
- }
- }
+ // Phase 2: upsert
+ const row = yield* db((d) => d.select().from(ProjectTable).where(eq(ProjectTable.id, data.id)).get())
+ const existing = row
+ ? fromRow(row)
+ : {
+ id: data.id,
+ worktree: data.worktree,
+ vcs: data.vcs,
+ sandboxes: [] as string[],
+ time: { created: Date.now(), updated: Date.now() },
+ }
- sandbox = top
+ if (Flag.KILO_EXPERIMENTAL_ICON_DISCOVERY) yield* discover(existing).pipe(Effect.ignore, Effect.forkIn(scope))
- return {
- id,
- sandbox,
- worktree,
- vcs: "git",
- }
- }
-
- return {
- id: ProjectID.global,
- worktree: "/",
- sandbox: "/",
- vcs: Info.shape.vcs.parse(Flag.KILO_FAKE_VCS),
- }
- })
-
- const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, data.id)).get())
- const existing = row
- ? fromRow(row)
- : {
- id: data.id,
+ const result: Info = {
+ ...existing,
worktree: data.worktree,
- vcs: data.vcs as Info["vcs"],
- sandboxes: [] as string[],
- time: {
- created: Date.now(),
- updated: Date.now(),
- },
+ vcs: data.vcs,
+ time: { ...existing.time, updated: Date.now() },
+ }
+ if (data.sandbox !== result.worktree && !result.sandboxes.includes(data.sandbox))
+ result.sandboxes.push(data.sandbox)
+ result.sandboxes = yield* Effect.forEach(
+ result.sandboxes,
+ (s) =>
+ fsys.exists(s).pipe(
+ Effect.orDie,
+ Effect.map((exists) => (exists ? s : undefined)),
+ ),
+ { concurrency: "unbounded" },
+ ).pipe(Effect.map((arr) => arr.filter((x): x is string => x !== undefined)))
+
+ yield* db((d) =>
+ d
+ .insert(ProjectTable)
+ .values({
+ id: result.id,
+ worktree: result.worktree,
+ vcs: result.vcs ?? null,
+ name: result.name,
+ icon_url: result.icon?.url,
+ icon_color: result.icon?.color,
+ time_created: result.time.created,
+ time_updated: result.time.updated,
+ time_initialized: result.time.initialized,
+ sandboxes: result.sandboxes,
+ commands: result.commands,
+ })
+ .onConflictDoUpdate({
+ target: ProjectTable.id,
+ set: {
+ worktree: result.worktree,
+ vcs: result.vcs ?? null,
+ name: result.name,
+ icon_url: result.icon?.url,
+ icon_color: result.icon?.color,
+ time_updated: result.time.updated,
+ time_initialized: result.time.initialized,
+ sandboxes: result.sandboxes,
+ commands: result.commands,
+ },
+ })
+ .run(),
+ )
+
+ if (data.id !== ProjectID.global) {
+ yield* db((d) =>
+ d
+ .update(SessionTable)
+ .set({ project_id: data.id })
+ .where(and(eq(SessionTable.project_id, ProjectID.global), eq(SessionTable.directory, data.worktree)))
+ .run(),
+ )
}
- if (Flag.KILO_EXPERIMENTAL_ICON_DISCOVERY) discover(existing)
+ yield* emitUpdated(result)
+ return { project: result, sandbox: data.sandbox }
+ })
- const result: Info = {
- ...existing,
- worktree: data.worktree,
- vcs: data.vcs as Info["vcs"],
- time: {
- ...existing.time,
- updated: Date.now(),
- },
- }
- if (data.sandbox !== result.worktree && !result.sandboxes.includes(data.sandbox))
- result.sandboxes.push(data.sandbox)
- result.sandboxes = result.sandboxes.filter((x) => existsSync(x))
- const insert = {
- id: result.id,
- worktree: result.worktree,
- vcs: result.vcs ?? null,
- name: result.name,
- icon_url: result.icon?.url,
- icon_color: result.icon?.color,
- time_created: result.time.created,
- time_updated: result.time.updated,
- time_initialized: result.time.initialized,
- sandboxes: result.sandboxes,
- commands: result.commands,
- }
- const updateSet = {
- worktree: result.worktree,
- vcs: result.vcs ?? null,
- name: result.name,
- icon_url: result.icon?.url,
- icon_color: result.icon?.color,
- time_updated: result.time.updated,
- time_initialized: result.time.initialized,
- sandboxes: result.sandboxes,
- commands: result.commands,
- }
- Database.use((db) =>
- db.insert(ProjectTable).values(insert).onConflictDoUpdate({ target: ProjectTable.id, set: updateSet }).run(),
- )
- // Runs after upsert so the target project row exists (FK constraint).
- // Runs on every startup because sessions created before git init
- // accumulate under "global" and need migrating whenever they appear.
- if (data.id !== ProjectID.global) {
- Database.use((db) =>
- db
- .update(SessionTable)
- .set({ project_id: data.id })
- .where(and(eq(SessionTable.project_id, ProjectID.global), eq(SessionTable.directory, data.worktree)))
- .run(),
- )
- }
- GlobalBus.emit("event", {
- payload: {
- type: Event.Updated.type,
- properties: result,
- },
- })
- return { project: result, sandbox: data.sandbox }
+ const discover = Effect.fn("Project.discover")(function* (input: Info) {
+ if (input.vcs !== "git") return
+ if (input.icon?.override) return
+ if (input.icon?.url) return
+
+ const matches = yield* fsys
+ .glob("**/favicon.{ico,png,svg,jpg,jpeg,webp}", {
+ cwd: input.worktree,
+ absolute: true,
+ include: "file",
+ })
+ .pipe(Effect.orDie)
+ const shortest = matches.sort((a, b) => a.length - b.length)[0]
+ if (!shortest) return
+
+ const buffer = yield* fsys.readFile(shortest).pipe(Effect.orDie)
+ const base64 = Buffer.from(buffer).toString("base64")
+ const mime = AppFileSystem.mimeType(shortest)
+ const url = `data:${mime};base64,${base64}`
+ yield* update({ projectID: input.id, icon: { url } })
+ })
+
+ const list = Effect.fn("Project.list")(function* () {
+ return yield* db((d) => d.select().from(ProjectTable).all().map(fromRow))
+ })
+
+ const get = Effect.fn("Project.get")(function* (id: ProjectID) {
+ const row = yield* db((d) => d.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
+ return row ? fromRow(row) : undefined
+ })
+
+ const update = Effect.fn("Project.update")(function* (input: UpdateInput) {
+ const result = yield* db((d) =>
+ d
+ .update(ProjectTable)
+ .set({
+ name: input.name,
+ icon_url: input.icon?.url,
+ icon_color: input.icon?.color,
+ commands: input.commands,
+ time_updated: Date.now(),
+ })
+ .where(eq(ProjectTable.id, input.projectID))
+ .returning()
+ .get(),
+ )
+ if (!result) throw new Error(`Project not found: ${input.projectID}`)
+ const data = fromRow(result)
+ yield* emitUpdated(data)
+ return data
+ })
+
+ const initGit = Effect.fn("Project.initGit")(function* (input: { directory: string; project: Info }) {
+ if (input.project.vcs === "git") return input.project
+ if (!(yield* Effect.sync(() => which("git")))) throw new Error("Git is not installed")
+ const result = yield* git(["init", "--quiet"], { cwd: input.directory })
+ if (result.code !== 0) {
+ throw new Error(result.stderr.trim() || result.text.trim() || "Failed to initialize git repository")
+ }
+ const { project } = yield* fromDirectory(input.directory)
+ return project
+ })
+
+ const setInitialized = Effect.fn("Project.setInitialized")(function* (id: ProjectID) {
+ yield* db((d) =>
+ d.update(ProjectTable).set({ time_initialized: Date.now() }).where(eq(ProjectTable.id, id)).run(),
+ )
+ })
+
+ const sandboxes = Effect.fn("Project.sandboxes")(function* (id: ProjectID) {
+ const row = yield* db((d) => d.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
+ if (!row) return []
+ const data = fromRow(row)
+ return yield* Effect.forEach(
+ data.sandboxes,
+ (dir) =>
+ fsys.isDir(dir).pipe(
+ Effect.orDie,
+ Effect.map((ok) => (ok ? dir : undefined)),
+ ),
+ { concurrency: "unbounded" },
+ ).pipe(Effect.map((arr) => arr.filter((x): x is string => x !== undefined)))
+ })
+
+ const addSandbox = Effect.fn("Project.addSandbox")(function* (id: ProjectID, directory: string) {
+ const row = yield* db((d) => d.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
+ if (!row) throw new Error(`Project not found: ${id}`)
+ const sboxes = [...row.sandboxes]
+ if (!sboxes.includes(directory)) sboxes.push(directory)
+ const result = yield* db((d) =>
+ d
+ .update(ProjectTable)
+ .set({ sandboxes: sboxes, time_updated: Date.now() })
+ .where(eq(ProjectTable.id, id))
+ .returning()
+ .get(),
+ )
+ if (!result) throw new Error(`Project not found: ${id}`)
+ yield* emitUpdated(fromRow(result))
+ })
+
+ const removeSandbox = Effect.fn("Project.removeSandbox")(function* (id: ProjectID, directory: string) {
+ const row = yield* db((d) => d.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
+ if (!row) throw new Error(`Project not found: ${id}`)
+ const sboxes = row.sandboxes.filter((s) => s !== directory)
+ const result = yield* db((d) =>
+ d
+ .update(ProjectTable)
+ .set({ sandboxes: sboxes, time_updated: Date.now() })
+ .where(eq(ProjectTable.id, id))
+ .returning()
+ .get(),
+ )
+ if (!result) throw new Error(`Project not found: ${id}`)
+ yield* emitUpdated(fromRow(result))
+ })
+
+ return Service.of({
+ fromDirectory,
+ discover,
+ list,
+ get,
+ update,
+ initGit,
+ setInitialized,
+ sandboxes,
+ addSandbox,
+ removeSandbox,
+ })
+ }),
+ )
+
+ export const defaultLayer = layer.pipe(
+ Layer.provide(CrossSpawnSpawner.layer),
+ Layer.provide(AppFileSystem.defaultLayer),
+ Layer.provide(NodeFileSystem.layer),
+ Layer.provide(NodePath.layer),
+ )
+ const runPromise = makeRunPromise(Service, defaultLayer)
+
+ // ---------------------------------------------------------------------------
+ // Promise-based API (delegates to Effect service via runPromise)
+ // ---------------------------------------------------------------------------
+
+ export function fromDirectory(directory: string) {
+ return runPromise((svc) => svc.fromDirectory(directory))
}
- export async function discover(input: Info) {
- if (input.vcs !== "git") return
- if (input.icon?.override) return
- if (input.icon?.url) return
- const matches = await Glob.scan("**/favicon.{ico,png,svg,jpg,jpeg,webp}", {
- cwd: input.worktree,
- absolute: true,
- include: "file",
- })
- const shortest = matches.sort((a, b) => a.length - b.length)[0]
- if (!shortest) return
- const buffer = await Filesystem.readBytes(shortest)
- const base64 = buffer.toString("base64")
- const mime = Filesystem.mimeType(shortest) || "image/png"
- const url = `data:${mime};base64,${base64}`
- await update({
- projectID: input.id,
- icon: {
- url,
- },
- })
- return
- }
-
- export function setInitialized(id: ProjectID) {
- Database.use((db) =>
- db
- .update(ProjectTable)
- .set({
- time_initialized: Date.now(),
- })
- .where(eq(ProjectTable.id, id))
- .run(),
- )
+ export function discover(input: Info) {
+ return runPromise((svc) => svc.discover(input))
}
export function list() {
@@ -345,112 +495,29 @@ export namespace Project {
return fromRow(row)
}
- export async function initGit(input: { directory: string; project: Info }) {
- if (input.project.vcs === "git") return input.project
- if (!which("git")) throw new Error("Git is not installed")
-
- const result = await git(["init", "--quiet"], {
- cwd: input.directory,
- })
- if (result.exitCode !== 0) {
- const text = result.stderr.toString().trim() || result.text().trim()
- throw new Error(text || "Failed to initialize git repository")
- }
-
- return (await fromDirectory(input.directory)).project
- }
-
- export const update = fn(
- z.object({
- projectID: ProjectID.zod,
- name: z.string().optional(),
- icon: Info.shape.icon.optional(),
- commands: Info.shape.commands.optional(),
- }),
- async (input) => {
- const id = ProjectID.make(input.projectID)
- const result = Database.use((db) =>
- db
- .update(ProjectTable)
- .set({
- name: input.name,
- icon_url: input.icon?.url,
- icon_color: input.icon?.color,
- commands: input.commands,
- time_updated: Date.now(),
- })
- .where(eq(ProjectTable.id, id))
- .returning()
- .get(),
- )
- if (!result) throw new Error(`Project not found: ${input.projectID}`)
- const data = fromRow(result)
- GlobalBus.emit("event", {
- payload: {
- type: Event.Updated.type,
- properties: data,
- },
- })
- return data
- },
- )
-
- export async function sandboxes(id: ProjectID) {
- const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
- if (!row) return []
- const data = fromRow(row)
- const valid: string[] = []
- for (const dir of data.sandboxes) {
- const s = Filesystem.stat(dir)
- if (s?.isDirectory()) valid.push(dir)
- }
- return valid
- }
-
- export async function addSandbox(id: ProjectID, directory: string) {
- const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
- if (!row) throw new Error(`Project not found: ${id}`)
- const sandboxes = [...row.sandboxes]
- if (!sandboxes.includes(directory)) sandboxes.push(directory)
- const result = Database.use((db) =>
- db
- .update(ProjectTable)
- .set({ sandboxes, time_updated: Date.now() })
- .where(eq(ProjectTable.id, id))
- .returning()
- .get(),
+ export function setInitialized(id: ProjectID) {
+ Database.use((db) =>
+ db.update(ProjectTable).set({ time_initialized: Date.now() }).where(eq(ProjectTable.id, id)).run(),
)
- if (!result) throw new Error(`Project not found: ${id}`)
- const data = fromRow(result)
- GlobalBus.emit("event", {
- payload: {
- type: Event.Updated.type,
- properties: data,
- },
- })
- return data
}
- export async function removeSandbox(id: ProjectID, directory: string) {
- const row = Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, id)).get())
- if (!row) throw new Error(`Project not found: ${id}`)
- const sandboxes = row.sandboxes.filter((s) => s !== directory)
- const result = Database.use((db) =>
- db
- .update(ProjectTable)
- .set({ sandboxes, time_updated: Date.now() })
- .where(eq(ProjectTable.id, id))
- .returning()
- .get(),
- )
- if (!result) throw new Error(`Project not found: ${id}`)
- const data = fromRow(result)
- GlobalBus.emit("event", {
- payload: {
- type: Event.Updated.type,
- properties: data,
- },
- })
- return data
+ export function initGit(input: { directory: string; project: Info }) {
+ return runPromise((svc) => svc.initGit(input))
+ }
+
+ export function update(input: UpdateInput) {
+ return runPromise((svc) => svc.update(input))
+ }
+
+ export function sandboxes(id: ProjectID) {
+ return runPromise((svc) => svc.sandboxes(id))
+ }
+
+ export function addSandbox(id: ProjectID, directory: string) {
+ return runPromise((svc) => svc.addSandbox(id, directory))
+ }
+
+ export function removeSandbox(id: ProjectID, directory: string) {
+ return runPromise((svc) => svc.removeSandbox(id, directory))
}
}
diff --git a/packages/opencode/src/provider/auth.ts b/packages/opencode/src/provider/auth.ts
index e2bce9b793..2304bed63b 100644
--- a/packages/opencode/src/provider/auth.ts
+++ b/packages/opencode/src/provider/auth.ts
@@ -260,7 +260,7 @@ export namespace ProviderAuth {
}
}
Telemetry.trackAuthSuccess(input.providerID)
+ ModelCache.clear(input.providerID)
// kilocode_change end
- ModelCache.clear(input.providerID) // kilocode_change
}
}
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index d184c39cb8..6977f6bf2a 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -197,7 +197,10 @@ export namespace ProviderTransform {
}
for (const msg of unique([...system, ...final])) {
- const useMessageLevelOptions = model.providerID === "anthropic" || model.providerID.includes("bedrock")
+ const useMessageLevelOptions =
+ model.providerID === "anthropic" ||
+ model.providerID.includes("bedrock") ||
+ model.api.npm === "@ai-sdk/amazon-bedrock"
const shouldUseContentOptions = !useMessageLevelOptions && Array.isArray(msg.content) && msg.content.length > 0
if (shouldUseContentOptions) {
diff --git a/packages/opencode/src/server/routes/global.ts b/packages/opencode/src/server/routes/global.ts
index 3a075713f0..e591efb5bb 100644
--- a/packages/opencode/src/server/routes/global.ts
+++ b/packages/opencode/src/server/routes/global.ts
@@ -201,8 +201,8 @@ export const GlobalRoutes = lazy(() =>
.post(
"/upgrade",
describeRoute({
- summary: "Upgrade kilo",
- description: "Upgrade kilo to the specified version or latest if not specified.",
+ summary: "Upgrade kilo", // kilocode_change
+ description: "Upgrade kilo to the specified version or latest if not specified.", // kilocode_change
operationId: "global.upgrade",
responses: {
200: {
diff --git a/packages/opencode/src/server/routes/permission.ts b/packages/opencode/src/server/routes/permission.ts
index fbc35eec3f..def6066f00 100644
--- a/packages/opencode/src/server/routes/permission.ts
+++ b/packages/opencode/src/server/routes/permission.ts
@@ -32,13 +32,7 @@ export const PermissionRoutes = lazy(() =>
requestID: PermissionID.zod,
}),
),
- validator(
- "json",
- z.object({
- reply: Permission.Reply,
- message: z.string().optional(),
- }),
- ),
+ validator("json", z.object({ reply: Permission.Reply, message: z.string().optional() })),
async (c) => {
const params = c.req.valid("param")
const json = c.req.valid("json")
diff --git a/packages/opencode/src/server/routes/project.ts b/packages/opencode/src/server/routes/project.ts
index 6cd51ac958..e5dd5782d6 100644
--- a/packages/opencode/src/server/routes/project.ts
+++ b/packages/opencode/src/server/routes/project.ts
@@ -107,7 +107,7 @@ export const ProjectRoutes = lazy(() =>
},
}),
validator("param", z.object({ projectID: ProjectID.zod })),
- validator("json", Project.update.schema.omit({ projectID: true })),
+ validator("json", Project.UpdateInput.omit({ projectID: true })),
async (c) => {
const projectID = c.req.valid("param").projectID
const body = c.req.valid("json")
diff --git a/packages/opencode/src/server/routes/session.ts b/packages/opencode/src/server/routes/session.ts
index 62de16f164..ada8ffdc7b 100644
--- a/packages/opencode/src/server/routes/session.ts
+++ b/packages/opencode/src/server/routes/session.ts
@@ -19,6 +19,8 @@ import { PermissionID } from "@/permission/schema"
import { ModelID, ProviderID } from "@/provider/schema"
import { errors } from "../error"
import { lazy } from "../../util/lazy"
+import { Bus } from "../../bus"
+import { NamedError } from "@opencode-ai/util/error"
const log = Log.create({ service: "server" })
@@ -846,7 +848,13 @@ export const SessionRoutes = lazy(() =>
return stream(c, async () => {
const sessionID = c.req.valid("param").sessionID
const body = c.req.valid("json")
- SessionPrompt.prompt({ ...body, sessionID })
+ SessionPrompt.prompt({ ...body, sessionID }).catch((err) => {
+ log.error("prompt_async failed", { sessionID, error: err })
+ Bus.publish(Session.Event.Error, {
+ sessionID,
+ error: new NamedError.Unknown({ message: err instanceof Error ? err.message : String(err) }).toObject(),
+ })
+ })
})
},
)
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
index ac402688bb..fc3059cb87 100644
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -32,19 +32,6 @@ import { ConfigRoutes } from "./routes/config"
import { ExperimentalRoutes } from "./routes/experimental"
import { ProviderRoutes } from "./routes/provider"
import { EventRoutes } from "./routes/event"
-import { TelemetryRoutes } from "./routes/telemetry" // kilocode_change
-import { CommitMessageRoutes } from "./routes/commit-message" // kilocode_change
-import { EnhancePromptRoutes } from "./routes/enhance-prompt" // kilocode_change
-import { KilocodeRoutes } from "./routes/kilocode" // kilocode_change
-import { PermissionKilocodeRoutes } from "../kilocode/permission/routes" // kilocode_change
-import { RemoteRoutes } from "./routes/remote" // kilocode_change
-import { NetworkRoutes } from "./routes/network" // kilocode_change
-import { createKiloRoutes } from "@kilocode/kilo-gateway" // kilocode_change
-import { Database } from "../storage/db" // kilocode_change
-import { Session } from "../session" // kilocode_change
-import { Identifier } from "../id/id" // kilocode_change
-import { SessionTable, MessageTable, PartTable } from "../session/session.sql" // kilocode_change
-import { Bus } from "@/bus" // kilocode_change
import { InstanceBootstrap } from "../project/bootstrap"
import { NotFoundError } from "../storage/db"
import type { ContentfulStatusCode } from "hono/utils/http-status"
@@ -58,6 +45,24 @@ import { GlobalRoutes } from "./routes/global"
import { MDNS } from "./mdns"
import { lazy } from "@/util/lazy"
+
+// kilocode_change start
+// KILO ROUTES
+import { TelemetryRoutes } from "./routes/telemetry"
+import { CommitMessageRoutes } from "./routes/commit-message"
+import { EnhancePromptRoutes } from "./routes/enhance-prompt"
+import { KilocodeRoutes } from "./routes/kilocode"
+import { PermissionKilocodeRoutes } from "../kilocode/permission/routes"
+import { RemoteRoutes } from "./routes/remote"
+import { NetworkRoutes } from "./routes/network"
+import { Database } from "../storage/db"
+import { Session } from "../session"
+import { Identifier } from "../id/id"
+import { SessionTable, MessageTable, PartTable } from "../session/session.sql"
+import { Bus } from "@/bus"
+import { createKiloRoutes } from "@kilocode/kilo-gateway"
+// kilocode_change end
+
// @ts-ignore This global is needed to prevent ai-sdk from logging warnings to stdout https://github.com/vercel/ai/blob/2dc67e0ef538307f21368db32d5a12345d98831b/packages/ai/src/logger/log-warnings.ts#L85
globalThis.AI_SDK_LOG_WARNINGS = false
@@ -89,14 +94,19 @@ export namespace Server {
status: 500,
})
})
- .use((c, next) => {
- // Allow CORS preflight requests to succeed without auth.
- // Browser clients sending Authorization headers will preflight with OPTIONS.
- if (c.req.method === "OPTIONS") return next()
- const password = Flag.KILO_SERVER_PASSWORD // kilocode_change
- if (!password) return next()
- const username = Flag.KILO_SERVER_USERNAME ?? "kilo" // kilocode_change
- return basicAuth({ username, password })(c, next)
+ if (err instanceof NamedError) {
+ let status: ContentfulStatusCode
+ if (err instanceof NotFoundError) status = 404
+ else if (err instanceof Provider.ModelNotFoundError) status = 400
+ else if (err.name === "ProviderAuthValidationFailed") status = 400
+ else if (err.name.startsWith("Worktree")) status = 400
+ else status = 500
+ return c.json(err.toObject(), { status })
+ }
+ if (err instanceof HTTPException) return err.getResponse()
+ const message = err instanceof Error && err.stack ? err.stack : err.toString()
+ return c.json(new NamedError.Unknown({ message }).toObject(), {
+ status: 500,
})
.use(async (c, next) => {
// kilocode_change start
@@ -112,41 +122,357 @@ export namespace Server {
method: c.req.method,
path: c.req.path,
})
- const timer = log.time("request", {
- method: c.req.method,
- path: c.req.path,
+ }
+ const timer = log.time("request", {
+ method: c.req.method,
+ path: c.req.path,
+ })
+ await next()
+ if (!skipLogging) {
+ timer.stop()
+ }
+ })
+ .use(
+ cors({
+ origin(input) {
+ if (!input) return
+
+ if (input.startsWith("http://localhost:")) return input
+ if (input.startsWith("http://127.0.0.1:")) return input
+ if (
+ input === "tauri://localhost" ||
+ input === "http://tauri.localhost" ||
+ input === "https://tauri.localhost"
+ )
+ return input
+
+ // *.opencode.ai (https only, adjust if needed)
+ if (/^https:\/\/([a-z0-9-]+\.)*opencode\.ai$/.test(input)) {
+ return input
+ }
+ if (opts?.cors?.includes(input)) {
+ return input
+ }
+
+ return
+ },
+ }),
+ )
+ .route("/global", GlobalRoutes())
+ .put(
+ "/auth/:providerID",
+ describeRoute({
+ summary: "Set auth credentials",
+ description: "Set authentication credentials",
+ operationId: "auth.set",
+ responses: {
+ 200: {
+ description: "Successfully set authentication credentials",
+ content: {
+ "application/json": {
+ schema: resolver(z.boolean()),
+ },
+ },
+ },
+ ...errors(400),
+ },
+ }),
+ validator(
+ "param",
+ z.object({
+ providerID: ProviderID.zod,
+ }),
+ ),
+ validator("json", Auth.Info.zod),
+ async (c) => {
+ const providerID = c.req.valid("param").providerID
+ const info = c.req.valid("json")
+ await Auth.set(providerID, info)
+ return c.json(true)
+ },
+ )
+ .delete(
+ "/auth/:providerID",
+ describeRoute({
+ summary: "Remove auth credentials",
+ description: "Remove authentication credentials",
+ operationId: "auth.remove",
+ responses: {
+ 200: {
+ description: "Successfully removed authentication credentials",
+ content: {
+ "application/json": {
+ schema: resolver(z.boolean()),
+ },
+ },
+ },
+ ...errors(400),
+ },
+ }),
+ validator(
+ "param",
+ z.object({
+ providerID: ProviderID.zod,
+ }),
+ ),
+ async (c) => {
+ const providerID = c.req.valid("param").providerID
+ await Auth.remove(providerID)
+ return c.json(true)
+ },
+ )
+ .use(async (c, next) => {
+ if (c.req.path === "/log") return next()
+ const rawWorkspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
+ const raw = c.req.query("directory") || c.req.header("x-opencode-directory") || process.cwd()
+ const directory = Filesystem.resolve(
+ (() => {
+ try {
+ return decodeURIComponent(raw)
+ } catch {
+ return raw
+ }
+ })(),
+ )
+
+ return WorkspaceContext.provide({
+ workspaceID: rawWorkspaceID ? WorkspaceID.make(rawWorkspaceID) : undefined,
+ async fn() {
+ return Instance.provide({
+ directory,
+ init: InstanceBootstrap,
+ async fn() {
+ return next()
+ },
+ })
+ },
+ })
+ })
+ .use(WorkspaceRouterMiddleware)
+ .get(
+ "/doc",
+ openAPIRouteHandler(app, {
+ documentation: {
+ info: {
+ title: "opencode",
+ version: "0.0.3",
+ description: "opencode api",
+ },
+ openapi: "3.1.1",
+ },
+ }),
+ )
+ .use(
+ validator(
+ "query",
+ z.object({
+ directory: z.string().optional(),
+ workspace: z.string().optional(),
+ }),
+ ),
+ )
+ .route("/project", ProjectRoutes())
+ .route("/pty", PtyRoutes())
+ .route("/config", ConfigRoutes())
+ .route("/experimental", ExperimentalRoutes())
+ .route("/session", SessionRoutes())
+ .route("/permission", PermissionRoutes())
+ .route("/question", QuestionRoutes())
+ .route("/provider", ProviderRoutes())
+ .route("/", FileRoutes())
+ .route("/", EventRoutes())
+ .route("/mcp", McpRoutes())
+ .route("/tui", TuiRoutes())
+ .post(
+ "/instance/dispose",
+ describeRoute({
+ summary: "Dispose instance",
+ description: "Clean up and dispose the current OpenCode instance, releasing all resources.",
+ operationId: "instance.dispose",
+ responses: {
+ 200: {
+ description: "Instance disposed",
+ content: {
+ "application/json": {
+ schema: resolver(z.boolean()),
+ },
+ },
+ },
+ },
+ }),
+ async (c) => {
+ await Instance.dispose()
+ return c.json(true)
+ },
+ )
+ .get(
+ "/path",
+ describeRoute({
+ summary: "Get paths",
+ description: "Retrieve the current working directory and related path information for the OpenCode instance.",
+ operationId: "path.get",
+ responses: {
+ 200: {
+ description: "Path",
+ content: {
+ "application/json": {
+ schema: resolver(
+ z
+ .object({
+ home: z.string(),
+ state: z.string(),
+ config: z.string(),
+ worktree: z.string(),
+ directory: z.string(),
+ })
+ .meta({
+ ref: "Path",
+ }),
+ ),
+ },
+ },
+ },
+ },
+ }),
+ async (c) => {
+ return c.json({
+ home: Global.Path.home,
+ state: Global.Path.state,
+ config: Global.Path.config,
+ worktree: Instance.worktree,
+ directory: Instance.directory,
})
await next()
if (!skipLogging) {
timer.stop()
}
- })
- .use(
- cors({
- origin(input) {
- if (!input) return
- if (input.startsWith("http://localhost:")) return input
- if (input.startsWith("http://127.0.0.1:")) return input
- if (
- input === "tauri://localhost" ||
- input === "http://tauri.localhost" ||
- input === "https://tauri.localhost"
- )
- return input
-
- // *.opencode.ai (https only, adjust if needed)
- if (/^https:\/\/([a-z0-9-]+\.)*opencode\.ai$/.test(input)) {
- return input
- }
- if (opts?.cors?.includes(input)) {
- return input
- }
-
- return
+ return c.json(true)
+ },
+ )
+ .get(
+ "/agent",
+ describeRoute({
+ summary: "List agents",
+ description: "Get a list of all available AI agents in the OpenCode system.",
+ operationId: "app.agents",
+ responses: {
+ 200: {
+ description: "List of agents",
+ content: {
+ "application/json": {
+ schema: resolver(Agent.Info.array()),
+ },
+ },
},
- }),
- )
+ },
+ }),
+ async (c) => {
+ const modes = await Agent.list()
+ return c.json(modes)
+ },
+ )
+ .get(
+ "/skill",
+ describeRoute({
+ summary: "List skills",
+ description: "Get a list of all available skills in the OpenCode system.",
+ operationId: "app.skills",
+ responses: {
+ 200: {
+ description: "List of skills",
+ content: {
+ "application/json": {
+ schema: resolver(Skill.Info.array()),
+ },
+ },
+ },
+ },
+ }),
+ async (c) => {
+ const skills = await Skill.all()
+ return c.json(skills)
+ },
+ )
+ .get(
+ "/lsp",
+ describeRoute({
+ summary: "Get LSP status",
+ description: "Get LSP server status",
+ operationId: "lsp.status",
+ responses: {
+ 200: {
+ description: "LSP server status",
+ content: {
+ "application/json": {
+ schema: resolver(LSP.Status.array()),
+ },
+ },
+ },
+ },
+ }),
+ async (c) => {
+ return c.json(await LSP.status())
+ },
+ )
+ .get(
+ "/formatter",
+ describeRoute({
+ summary: "Get formatter status",
+ description: "Get formatter status",
+ operationId: "formatter.status",
+ responses: {
+ 200: {
+ description: "Formatter status",
+ content: {
+ "application/json": {
+ schema: resolver(Format.Status.array()),
+ },
+ },
+ },
+ },
+ }),
+ async (c) => {
+ return c.json(await Format.status())
+ },
+ )
+ // kilocode_change start - disable proxy
+ // .all("/*", async (c) => {
+ // const path = c.req.path
+
+ // const response = await proxy(`https://app.opencode.ai${path}`, {
+ // ...c.req,
+ // headers: {
+ // ...c.req.raw.headers,
+ // host: "app.opencode.ai",
+ // },
+ // })
+ // .use(
+ // cors({
+ // origin(input) {
+ // if (!input) return
+
+ // if (input.startsWith("http://localhost:")) return input
+ // if (input.startsWith("http://127.0.0.1:")) return input
+ // if (
+ // input === "tauri://localhost" ||
+ // input === "http://tauri.localhost" ||
+ // input === "https://tauri.localhost"
+ // )
+ // return input
+
+ // // *.opencode.ai (https only, adjust if needed)
+ // if (/^https:\/\/([a-z0-9-]+\.)*opencode\.ai$/.test(input)) {
+ // return input
+ // }
+ // if (opts?.cors?.includes(input)) {
+ // return input
+ // }
+
+ // return
+ // },
+ // }),
+ // )
.route("/global", GlobalRoutes())
.put(
"/auth/:providerID",
@@ -560,8 +886,8 @@ export namespace Server {
.all("/*", async (c) => {
return c.notFound()
})
+ // kilocode_change end
)
- // kilocode_change end
}
export async function openapi() {
diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.ts
index f165201177..4d91059d6d 100644
--- a/packages/opencode/src/session/llm.ts
+++ b/packages/opencode/src/session/llm.ts
@@ -125,17 +125,20 @@ export namespace LLM {
// kilocode_change end
}
+ const isWorkflow = language instanceof GitLabWorkflowLanguageModel
const messages = isOpenaiOauth
? input.messages
- : [
- ...system.map(
- (x): ModelMessage => ({
- role: "system",
- content: x,
- }),
- ),
- ...input.messages,
- ]
+ : isWorkflow
+ ? input.messages
+ : [
+ ...system.map(
+ (x): ModelMessage => ({
+ role: "system",
+ content: x,
+ }),
+ ),
+ ...input.messages,
+ ]
const params = await Plugin.trigger(
"chat.params",
@@ -208,6 +211,7 @@ export namespace LLM {
// and results sent back over the WebSocket.
if (language instanceof GitLabWorkflowLanguageModel) {
const workflowModel = language
+ workflowModel.systemPrompt = system.join("\n")
workflowModel.toolExecutor = async (toolName, argsJson, _requestID) => {
const t = tools[toolName]
if (!t || !t.execute) {
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index a7134ed394..163d0504f8 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -48,7 +48,6 @@ import { LLM } from "./llm"
import { iife } from "@/util/iife"
import { Shell } from "@/shell/shell"
import { Truncate } from "@/tool/truncate"
-import { Identifier } from "../id/id"
import { PlanFollowup } from "@/kilocode/plan-followup" // kilocode_change
import { environmentDetails } from "@/kilocode/editor-context" // kilocode_change
import { decodeDataUrl } from "@/util/data-url"
@@ -471,6 +470,16 @@ export namespace SessionPrompt {
)
let executionError: Error | undefined
const taskAgent = await Agent.get(task.agent)
+ if (!taskAgent) {
+ const available = await Agent.list().then((agents) => agents.filter((a) => !a.hidden).map((a) => a.name))
+ const hint = available.length ? ` Available agents: ${available.join(", ")}` : ""
+ const error = new NamedError.Unknown({ message: `Agent not found: "${task.agent}".${hint}` })
+ Bus.publish(Session.Event.Error, {
+ sessionID,
+ error: error.toObject(),
+ })
+ throw error
+ }
const taskCtx: Tool.Context = {
agent: task.agent,
messageID: assistantMessage.id,
@@ -614,6 +623,16 @@ export namespace SessionPrompt {
// normal processing
const agent = await Agent.get(lastUser.agent)
+ if (!agent) {
+ const available = await Agent.list().then((agents) => agents.filter((a) => !a.hidden).map((a) => a.name))
+ const hint = available.length ? ` Available agents: ${available.join(", ")}` : ""
+ const error = new NamedError.Unknown({ message: `Agent not found: "${lastUser.agent}".${hint}` })
+ Bus.publish(Session.Event.Error, {
+ sessionID,
+ error: error.toObject(),
+ })
+ throw error
+ }
const maxSteps = agent.steps ?? Infinity
const isLastStep = step >= maxSteps
msgs = await insertReminders({
@@ -1053,7 +1072,18 @@ export namespace SessionPrompt {
}
async function createUserMessage(input: PromptInput) {
- const agent = await Agent.get(input.agent ?? (await Agent.defaultAgent()))
+ const agentName = input.agent || (await Agent.defaultAgent())
+ const agent = await Agent.get(agentName)
+ if (!agent) {
+ const available = await Agent.list().then((agents) => agents.filter((a) => !a.hidden).map((a) => a.name))
+ const hint = available.length ? ` Available agents: ${available.join(", ")}` : ""
+ const error = new NamedError.Unknown({ message: `Agent not found: "${agentName}".${hint}` })
+ Bus.publish(Session.Event.Error, {
+ sessionID: input.sessionID,
+ error: error.toObject(),
+ })
+ throw error
+ }
const model = input.model ?? agent.model ?? (await lastModel(input.sessionID))
const full =
@@ -1631,6 +1661,16 @@ NOTE: At any point in time through this workflow you should feel free to ask the
await SessionRevert.cleanup(session)
}
const agent = await Agent.get(input.agent)
+ if (!agent) {
+ const available = await Agent.list().then((agents) => agents.filter((a) => !a.hidden).map((a) => a.name))
+ const hint = available.length ? ` Available agents: ${available.join(", ")}` : ""
+ const error = new NamedError.Unknown({ message: `Agent not found: "${input.agent}".${hint}` })
+ Bus.publish(Session.Event.Error, {
+ sessionID: input.sessionID,
+ error: error.toObject(),
+ })
+ throw error
+ }
const model = input.model ?? agent.model ?? (await lastModel(input.sessionID))
const userMsg: MessageV2.User = {
id: MessageID.ascending(),
@@ -1892,7 +1932,14 @@ NOTE: At any point in time through this workflow you should feel free to ask the
log.info("command", input)
const command = await Command.get(input.command)
if (!command) {
- throw new NamedError.Unknown({ message: `Command not found: "${input.command}"` })
+ const available = await Command.list().then((cmds) => cmds.map((c) => c.name))
+ const hint = available.length ? ` Available commands: ${available.join(", ")}` : ""
+ const error = new NamedError.Unknown({ message: `Command not found: "${input.command}".${hint}` })
+ Bus.publish(Session.Event.Error, {
+ sessionID: input.sessionID,
+ error: error.toObject(),
+ })
+ throw error
}
const agentName = command.agent ?? input.agent ?? (await Agent.defaultAgent())
diff --git a/packages/opencode/src/session/system.ts b/packages/opencode/src/session/system.ts
index 7d8726b3d5..f225589978 100644
--- a/packages/opencode/src/session/system.ts
+++ b/packages/opencode/src/session/system.ts
@@ -32,30 +32,12 @@ export namespace SystemPrompt {
// kilocode_change end
export function provider(model: Provider.Model) {
- // kilocode_change start
- switch (model.prompt) {
- case "anthropic":
- return [PROMPT_ANTHROPIC]
- case "anthropic_without_todo":
- return [PROMPT_DEFAULT]
- case "beast":
- return [PROMPT_BEAST]
- case "codex":
- return [PROMPT_CODEX]
- case "gemini":
- return [PROMPT_GEMINI]
- case "trinity":
- return [PROMPT_TRINITY]
- }
- // kilocode_change end
-
if (model.api.id.includes("gpt-4") || model.api.id.includes("o1") || model.api.id.includes("o3"))
return [PROMPT_BEAST]
if (model.api.id.includes("gpt")) return [PROMPT_CODEX]
if (model.api.id.includes("gemini-")) return [PROMPT_GEMINI]
if (model.api.id.includes("claude")) return [PROMPT_ANTHROPIC]
if (model.api.id.toLowerCase().includes("trinity")) return [PROMPT_TRINITY]
-
return [PROMPT_DEFAULT]
}
diff --git a/packages/opencode/src/skill/discovery.ts b/packages/opencode/src/skill/discovery.ts
index ff0bfde495..e103975032 100644
--- a/packages/opencode/src/skill/discovery.ts
+++ b/packages/opencode/src/skill/discovery.ts
@@ -108,9 +108,9 @@ export namespace Discovery {
}),
)
- export const defaultLayer = layer.pipe(
+ export const defaultLayer: Layer.Layer = layer.pipe(
Layer.provide(FetchHttpClient.layer),
Layer.provide(AppFileSystem.defaultLayer),
Layer.provide(NodePath.layer),
- ) as Layer.Layer
+ )
}
diff --git a/packages/opencode/src/skill/index.ts b/packages/opencode/src/skill/index.ts
index 456f265ab9..15987463f2 100644
--- a/packages/opencode/src/skill/index.ts
+++ b/packages/opencode/src/skill/index.ts
@@ -1,4 +1,3 @@
-import { rm } from "fs/promises"
import os from "os"
import path from "path"
import { pathToFileURL } from "url"
@@ -18,6 +17,7 @@ import { ConfigMarkdown } from "../config/markdown"
import { Glob } from "../util/glob"
import { Log } from "../util/log"
import { Discovery } from "./discovery"
+import { rm } from "fs/promises" // kilocode_change
export namespace Skill {
const log = Log.create({ service: "skill" })
diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index ccee4c65c1..2beda72100 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -1,9 +1,9 @@
-import { $ } from "bun"
-import { NodeChildProcessSpawner, NodeFileSystem, NodePath } from "@effect/platform-node"
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
import { Cause, Duration, Effect, Layer, Schedule, ServiceMap, Stream } from "effect"
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
import path from "path"
import z from "zod"
+import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
import { InstanceState } from "@/effect/instance-state"
import { makeRunPromise } from "@/effect/run-service"
import { AppFileSystem } from "@/filesystem"
@@ -219,6 +219,18 @@ export namespace Snapshot {
const track = Effect.fnUntraced(function* () {
if (!(yield* enabled())) return
+ const existed = yield* exists(state.gitdir)
+ yield* fs.ensureDir(state.gitdir).pipe(Effect.orDie)
+ if (!existed) {
+ yield* git(["init"], {
+ env: { GIT_DIR: state.gitdir, GIT_WORK_TREE: state.worktree },
+ })
+ yield* git(["--git-dir", state.gitdir, "config", "core.autocrlf", "false"])
+ yield* git(["--git-dir", state.gitdir, "config", "core.longpaths", "true"])
+ yield* git(["--git-dir", state.gitdir, "config", "core.symlinks", "true"])
+ yield* git(["--git-dir", state.gitdir, "config", "core.fsmonitor", "false"])
+ log.info("initialized")
+ }
yield* add()
const result = yield* git(args(["write-tree"]), { cwd: state.directory })
const hash = result.text.trim()
@@ -518,7 +530,7 @@ export namespace Snapshot {
)
export const defaultLayer = layer.pipe(
- Layer.provide(NodeChildProcessSpawner.layer),
+ Layer.provide(CrossSpawnSpawner.layer),
Layer.provide(AppFileSystem.defaultLayer),
Layer.provide(NodeFileSystem.layer),
Layer.provide(NodePath.layer),
diff --git a/packages/opencode/src/storage/db.ts b/packages/opencode/src/storage/db.ts
index 2945a7b6c0..0605201b9d 100644
--- a/packages/opencode/src/storage/db.ts
+++ b/packages/opencode/src/storage/db.ts
@@ -10,7 +10,6 @@ import { NamedError } from "@opencode-ai/util/error"
import z from "zod"
import path from "path"
import { readFileSync, readdirSync, existsSync } from "fs"
-import * as schema from "./schema"
import { Installation } from "../installation"
import { Flag } from "../flag/flag"
import { iife } from "@/util/iife"
@@ -28,8 +27,17 @@ export const NotFoundError = NamedError.create(
const log = Log.create({ service: "db" })
export namespace Database {
- // kilocode_change - always use kilo.db regardless of channel
- export const Path = path.join(Global.Path.data, "kilo.db")
+ export const Path = iife(() => {
+ if (Flag.KILO_DB) {
+ if (path.isAbsolute(Flag.KILO_DB)) return Flag.KILO_DB
+ return path.join(Global.Path.data, Flag.KILO_DB)
+ }
+ const channel = Installation.CHANNEL
+ if (["latest", "beta"].includes(channel) || Flag.KILO_DISABLE_CHANNEL_DB)
+ return path.join(Global.Path.data, "kilo.db") // kilocode_change
+ const safe = channel.replace(/[^a-zA-Z0-9._-]/g, "-")
+ return path.join(Global.Path.data, `kilo-${safe}.db`) // kilocode_change
+ })
export type Transaction = SQLiteTransaction<"sync", void>
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 959cf66d9a..62b8d38456 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -113,7 +113,8 @@ export namespace ToolRegistry {
async function all(custom: Tool.Info[]): Promise {
const cfg = await Config.get()
- const question = ["app", "cli", "desktop"].includes(Flag.KILO_CLIENT) || Flag.KILO_ENABLE_QUESTION_TOOL
+ const question =
+ ["app", "cli", "desktop", "vscode"].includes(Flag.KILO_CLIENT) || Flag.KILO_ENABLE_QUESTION_TOOL
return [
InvalidTool,
@@ -223,4 +224,4 @@ export namespace ToolRegistry {
) {
return runPromise((svc) => svc.tools(model, agent))
}
-}
\ No newline at end of file
+}
diff --git a/packages/opencode/src/tool/truncate.ts b/packages/opencode/src/tool/truncate.ts
index 92ccff4831..031ca6f241 100644
--- a/packages/opencode/src/tool/truncate.ts
+++ b/packages/opencode/src/tool/truncate.ts
@@ -133,9 +133,7 @@ export namespace Truncate {
}),
)
- export const defaultLayer = layer.pipe(
- Layer.provide(AppFileSystem.defaultLayer),
- ) as Layer.Layer
+ export const defaultLayer = layer.pipe(Layer.provide(AppFileSystem.defaultLayer)) as Layer.Layer
const runPromise = makeRunPromise(Service, defaultLayer)
diff --git a/packages/opencode/test/agent/agent.test.ts b/packages/opencode/test/agent/agent.test.ts
index 53a69455fe..18ef396c7c 100644
--- a/packages/opencode/test/agent/agent.test.ts
+++ b/packages/opencode/test/agent/agent.test.ts
@@ -123,8 +123,10 @@ test("plan agent denies edits except .kilo/plans/* and .opencode/plans/*", async
expect(plan).toBeDefined()
// Wildcard is denied
expect(evalPerm(plan, "edit")).toBe("deny")
+ // kilocode_change start
// .kilo/plans/ is the primary allowed path
expect(Permission.evaluate("edit", ".kilo/plans/foo.md", plan!.permission).action).toBe("allow")
+ // kilocode_change end
// .opencode/plans/ is also allowed as backward compat fallback
expect(Permission.evaluate("edit", ".opencode/plans/foo.md", plan!.permission).action).toBe("allow")
},
diff --git a/packages/opencode/test/cli/account.test.ts b/packages/opencode/test/cli/account.test.ts
new file mode 100644
index 0000000000..d75d7bd255
--- /dev/null
+++ b/packages/opencode/test/cli/account.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, test } from "bun:test"
+import stripAnsi from "strip-ansi"
+
+import { formatAccountLabel, formatOrgLine } from "../../src/cli/cmd/account"
+
+describe("console account display", () => {
+ test("includes the account url in account labels", () => {
+ expect(stripAnsi(formatAccountLabel({ email: "one@example.com", url: "https://one.example.com" }, false))).toBe(
+ "one@example.com https://one.example.com",
+ )
+ })
+
+ test("includes the active marker in account labels", () => {
+ expect(stripAnsi(formatAccountLabel({ email: "one@example.com", url: "https://one.example.com" }, true))).toBe(
+ "one@example.com https://one.example.com (active)",
+ )
+ })
+
+ test("includes the account url in org rows", () => {
+ expect(
+ stripAnsi(
+ formatOrgLine({ email: "one@example.com", url: "https://one.example.com" }, { id: "org-1", name: "One" }, true),
+ ),
+ ).toBe(" ● One one@example.com https://one.example.com org-1")
+ })
+})
diff --git a/packages/opencode/test/effect/cross-spawn-spawner.test.ts b/packages/opencode/test/effect/cross-spawn-spawner.test.ts
new file mode 100644
index 0000000000..08cae76e2f
--- /dev/null
+++ b/packages/opencode/test/effect/cross-spawn-spawner.test.ts
@@ -0,0 +1,402 @@
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
+import { describe, expect } from "bun:test"
+import fs from "node:fs/promises"
+import path from "node:path"
+import { Effect, Exit, Layer, Stream } from "effect"
+import type * as PlatformError from "effect/PlatformError"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
+import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
+import { tmpdir } from "../fixture/fixture"
+import { testEffect } from "../lib/effect"
+
+const live = CrossSpawnSpawner.layer.pipe(Layer.provide(NodeFileSystem.layer), Layer.provide(NodePath.layer))
+const fx = testEffect(live)
+
+function js(code: string, opts?: ChildProcess.CommandOptions) {
+ return ChildProcess.make("node", ["-e", code], opts)
+}
+
+function decodeByteStream(stream: Stream.Stream) {
+ return Stream.runCollect(stream).pipe(
+ Effect.map((chunks) => {
+ const total = chunks.reduce((acc, x) => acc + x.length, 0)
+ const out = new Uint8Array(total)
+ let off = 0
+ for (const chunk of chunks) {
+ out.set(chunk, off)
+ off += chunk.length
+ }
+ return new TextDecoder("utf-8").decode(out).trim()
+ }),
+ )
+}
+
+function alive(pid: number) {
+ try {
+ process.kill(pid, 0)
+ return true
+ } catch {
+ return false
+ }
+}
+
+async function gone(pid: number, timeout = 5_000) {
+ const end = Date.now() + timeout
+ while (Date.now() < end) {
+ if (!alive(pid)) return true
+ await Bun.sleep(50)
+ }
+ return !alive(pid)
+}
+
+describe("cross-spawn spawner", () => {
+ describe("basic spawning", () => {
+ fx.effect(
+ "captures stdout",
+ Effect.gen(function* () {
+ const out = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+ svc.string(ChildProcess.make(process.execPath, ["-e", 'process.stdout.write("ok")'])),
+ )
+ expect(out).toBe("ok")
+ }),
+ )
+
+ fx.effect(
+ "captures multiple lines",
+ Effect.gen(function* () {
+ const handle = yield* js('console.log("line1"); console.log("line2"); console.log("line3")')
+ const out = yield* decodeByteStream(handle.stdout)
+ expect(out).toBe("line1\nline2\nline3")
+ }),
+ )
+
+ fx.effect(
+ "returns exit code",
+ Effect.gen(function* () {
+ const handle = yield* js("process.exit(0)")
+ const code = yield* handle.exitCode
+ expect(code).toBe(ChildProcessSpawner.ExitCode(0))
+ }),
+ )
+
+ fx.effect(
+ "returns non-zero exit code",
+ Effect.gen(function* () {
+ const handle = yield* js("process.exit(42)")
+ const code = yield* handle.exitCode
+ expect(code).toBe(ChildProcessSpawner.ExitCode(42))
+ }),
+ )
+ })
+
+ describe("cwd option", () => {
+ fx.effect(
+ "uses cwd when spawning commands",
+ Effect.gen(function* () {
+ const tmp = yield* Effect.acquireRelease(
+ Effect.promise(() => tmpdir()),
+ (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+ )
+ const out = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+ svc.string(
+ ChildProcess.make(process.execPath, ["-e", "process.stdout.write(process.cwd())"], { cwd: tmp.path }),
+ ),
+ )
+ expect(out).toBe(tmp.path)
+ }),
+ )
+
+ fx.effect(
+ "fails for invalid cwd",
+ Effect.gen(function* () {
+ const exit = yield* Effect.exit(
+ ChildProcess.make("echo", ["test"], { cwd: "/nonexistent/directory/path" }).asEffect(),
+ )
+ expect(Exit.isFailure(exit)).toBe(true)
+ }),
+ )
+ })
+
+ describe("env option", () => {
+ fx.effect(
+ "passes environment variables with extendEnv",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stdout.write(process.env.TEST_VAR ?? "")', {
+ env: { TEST_VAR: "test_value" },
+ extendEnv: true,
+ })
+ const out = yield* decodeByteStream(handle.stdout)
+ expect(out).toBe("test_value")
+ }),
+ )
+
+ fx.effect(
+ "passes multiple environment variables",
+ Effect.gen(function* () {
+ const handle = yield* js(
+ "process.stdout.write(`${process.env.VAR1}-${process.env.VAR2}-${process.env.VAR3}`)",
+ {
+ env: { VAR1: "one", VAR2: "two", VAR3: "three" },
+ extendEnv: true,
+ },
+ )
+ const out = yield* decodeByteStream(handle.stdout)
+ expect(out).toBe("one-two-three")
+ }),
+ )
+ })
+
+ describe("stderr", () => {
+ fx.effect(
+ "captures stderr output",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stderr.write("error message")')
+ const err = yield* decodeByteStream(handle.stderr)
+ expect(err).toBe("error message")
+ }),
+ )
+
+ fx.effect(
+ "captures both stdout and stderr",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stdout.write("stdout\\n"); process.stderr.write("stderr\\n")')
+ const [stdout, stderr] = yield* Effect.all([decodeByteStream(handle.stdout), decodeByteStream(handle.stderr)])
+ expect(stdout).toBe("stdout")
+ expect(stderr).toBe("stderr")
+ }),
+ )
+ })
+
+ describe("combined output (all)", () => {
+ fx.effect(
+ "captures stdout via .all when no stderr",
+ Effect.gen(function* () {
+ const handle = yield* ChildProcess.make("echo", ["hello from stdout"])
+ const all = yield* decodeByteStream(handle.all)
+ expect(all).toBe("hello from stdout")
+ }),
+ )
+
+ fx.effect(
+ "captures stderr via .all when no stdout",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stderr.write("hello from stderr")')
+ const all = yield* decodeByteStream(handle.all)
+ expect(all).toBe("hello from stderr")
+ }),
+ )
+ })
+
+ describe("stdin", () => {
+ fx.effect(
+ "allows providing standard input to a command",
+ Effect.gen(function* () {
+ const input = "a b c"
+ const stdin = Stream.make(Buffer.from(input, "utf-8"))
+ const handle = yield* js(
+ 'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out))',
+ { stdin },
+ )
+ const out = yield* decodeByteStream(handle.stdout)
+ yield* handle.exitCode
+ expect(out).toBe("a b c")
+ }),
+ )
+ })
+
+ describe("process control", () => {
+ fx.effect(
+ "kills a running process",
+ Effect.gen(function* () {
+ const exit = yield* Effect.exit(
+ Effect.gen(function* () {
+ const handle = yield* js("setTimeout(() => {}, 10_000)")
+ yield* handle.kill()
+ return yield* handle.exitCode
+ }),
+ )
+ expect(Exit.isFailure(exit) ? true : exit.value !== ChildProcessSpawner.ExitCode(0)).toBe(true)
+ }),
+ )
+
+ fx.effect(
+ "kills a child when scope exits",
+ Effect.gen(function* () {
+ const pid = yield* Effect.scoped(
+ Effect.gen(function* () {
+ const handle = yield* js("setInterval(() => {}, 10_000)")
+ return Number(handle.pid)
+ }),
+ )
+ const done = yield* Effect.promise(() => gone(pid))
+ expect(done).toBe(true)
+ }),
+ )
+
+ fx.effect(
+ "forceKillAfter escalates for stubborn processes",
+ Effect.gen(function* () {
+ if (process.platform === "win32") return
+
+ const started = Date.now()
+ const exit = yield* Effect.exit(
+ Effect.gen(function* () {
+ const handle = yield* js('process.on("SIGTERM", () => {}); setInterval(() => {}, 10_000)')
+ yield* handle.kill({ forceKillAfter: 100 })
+ return yield* handle.exitCode
+ }),
+ )
+
+ expect(Date.now() - started).toBeLessThan(1_000)
+ expect(Exit.isFailure(exit) ? true : exit.value !== ChildProcessSpawner.ExitCode(0)).toBe(true)
+ }),
+ )
+
+ fx.effect(
+ "isRunning reflects process state",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stdout.write("done")')
+ yield* handle.exitCode
+ const running = yield* handle.isRunning
+ expect(running).toBe(false)
+ }),
+ )
+ })
+
+ describe("error handling", () => {
+ fx.effect(
+ "fails for invalid command",
+ Effect.gen(function* () {
+ const exit = yield* Effect.exit(
+ Effect.gen(function* () {
+ const handle = yield* ChildProcess.make("nonexistent-command-12345")
+ return yield* handle.exitCode
+ }),
+ )
+ expect(Exit.isFailure(exit) ? true : exit.value !== ChildProcessSpawner.ExitCode(0)).toBe(true)
+ }),
+ )
+ })
+
+ describe("pipeline", () => {
+ fx.effect(
+ "pipes stdout of one command to stdin of another",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stdout.write("hello world")').pipe(
+ ChildProcess.pipeTo(
+ js(
+ 'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out.toUpperCase()))',
+ ),
+ ),
+ )
+ const out = yield* decodeByteStream(handle.stdout)
+ yield* handle.exitCode
+ expect(out).toBe("HELLO WORLD")
+ }),
+ )
+
+ fx.effect(
+ "three-stage pipeline",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stdout.write("hello world")').pipe(
+ ChildProcess.pipeTo(
+ js(
+ 'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out.toUpperCase()))',
+ ),
+ ),
+ ChildProcess.pipeTo(
+ js(
+ 'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out.replaceAll(" ", "-")))',
+ ),
+ ),
+ )
+ const out = yield* decodeByteStream(handle.stdout)
+ yield* handle.exitCode
+ expect(out).toBe("HELLO-WORLD")
+ }),
+ )
+
+ fx.effect(
+ "pipes stderr with { from: 'stderr' }",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stderr.write("error")').pipe(
+ ChildProcess.pipeTo(
+ js(
+ 'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out))',
+ ),
+ { from: "stderr" },
+ ),
+ )
+ const out = yield* decodeByteStream(handle.stdout)
+ yield* handle.exitCode
+ expect(out).toBe("error")
+ }),
+ )
+
+ fx.effect(
+ "pipes combined output with { from: 'all' }",
+ Effect.gen(function* () {
+ const handle = yield* js('process.stdout.write("stdout\\n"); process.stderr.write("stderr\\n")').pipe(
+ ChildProcess.pipeTo(
+ js(
+ 'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out))',
+ ),
+ { from: "all" },
+ ),
+ )
+ const out = yield* decodeByteStream(handle.stdout)
+ yield* handle.exitCode
+ expect(out).toContain("stdout")
+ expect(out).toContain("stderr")
+ }),
+ )
+ })
+
+ describe("Windows-specific", () => {
+ fx.effect(
+ "uses shell routing on Windows",
+ Effect.gen(function* () {
+ if (process.platform !== "win32") return
+
+ const out = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+ svc.string(
+ ChildProcess.make("set", ["OPENCODE_TEST_SHELL"], {
+ shell: true,
+ extendEnv: true,
+ env: { OPENCODE_TEST_SHELL: "ok" },
+ }),
+ ),
+ )
+ expect(out).toContain("OPENCODE_TEST_SHELL=ok")
+ }),
+ )
+
+ fx.effect(
+ "runs cmd scripts with spaces on Windows without shell",
+ Effect.gen(function* () {
+ if (process.platform !== "win32") return
+
+ const tmp = yield* Effect.acquireRelease(
+ Effect.promise(() => tmpdir()),
+ (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+ )
+ const dir = path.join(tmp.path, "with space")
+ const file = path.join(dir, "echo cmd.cmd")
+
+ yield* Effect.promise(() => fs.mkdir(dir, { recursive: true }))
+ yield* Effect.promise(() => Bun.write(file, "@echo off\r\nif %~1==--stdio exit /b 0\r\nexit /b 7\r\n"))
+
+ const code = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+ svc.exitCode(
+ ChildProcess.make(file, ["--stdio"], {
+ stdin: "pipe",
+ stdout: "pipe",
+ stderr: "pipe",
+ }),
+ ),
+ )
+ expect(code).toBe(ChildProcessSpawner.ExitCode(0))
+ }),
+ )
+ })
+})
diff --git a/packages/opencode/test/file/watcher.test.ts b/packages/opencode/test/file/watcher.test.ts
index 8cbd478cba..6658634e54 100644
--- a/packages/opencode/test/file/watcher.test.ts
+++ b/packages/opencode/test/file/watcher.test.ts
@@ -177,13 +177,17 @@ describeWatcher("FileWatcher", () => {
await withWatcher(tmp.path, Effect.void)
// Now write a file — no watcher should be listening
- await Effect.runPromise(
- noUpdate(
- tmp.path,
- (e) => e.file === file,
- Effect.promise(() => fs.writeFile(file, "gone")),
- ),
- )
+ await Instance.provide({
+ directory: tmp.path,
+ fn: () =>
+ Effect.runPromise(
+ noUpdate(
+ tmp.path,
+ (e) => e.file === file,
+ Effect.promise(() => fs.writeFile(file, "gone")),
+ ),
+ ),
+ })
})
test("ignores .git/index changes", async () => {
diff --git a/packages/opencode/test/filesystem/filesystem.test.ts b/packages/opencode/test/filesystem/filesystem.test.ts
index 970853bc73..ca73b3336b 100644
--- a/packages/opencode/test/filesystem/filesystem.test.ts
+++ b/packages/opencode/test/filesystem/filesystem.test.ts
@@ -5,9 +5,7 @@ import { AppFileSystem } from "../../src/filesystem"
import { testEffect } from "../lib/effect"
import path from "path"
-const live = AppFileSystem.layer.pipe(
- Layer.provide(NodeFileSystem.layer),
-) as Layer.Layer
+const live = AppFileSystem.layer.pipe(Layer.provide(NodeFileSystem.layer))
const { effect: it } = testEffect(live)
describe("AppFileSystem", () => {
diff --git a/packages/opencode/test/installation/installation.test.ts b/packages/opencode/test/installation/installation.test.ts
index c66c2239f2..4f8fb90905 100644
--- a/packages/opencode/test/installation/installation.test.ts
+++ b/packages/opencode/test/installation/installation.test.ts
@@ -117,8 +117,10 @@ describe("installation", () => {
() => jsonResponse({ versions: { stable: "2.0.0" } }),
(cmd, args) => {
// getBrewFormula: return core formula (no tap)
+ // kilocode_change start
if (cmd === "brew" && args.includes("--formula") && args.includes("Kilo-Org/tap/kilo")) return ""
if (cmd === "brew" && args.includes("--formula") && args.includes("kilo")) return "kilo"
+ // kilocode_change end
return ""
},
)
@@ -136,7 +138,9 @@ describe("installation", () => {
const layer = testLayer(
() => jsonResponse({}), // HTTP not used for tap formula
(cmd, args) => {
- if (cmd === "brew" && args.includes("Kilo-Org/tap/kilo") && args.includes("--formula")) return "opencode"
+ // kilocode_change start
+ if (cmd === "brew" && args.includes("Kilo-Org/tap/kilo") && args.includes("--formula")) return "kilo"
+ // kilocode_change end
if (cmd === "brew" && args.includes("--json=v2")) return brewInfoJson
return ""
},
diff --git a/packages/opencode/test/plugin/auth-override.test.ts b/packages/opencode/test/plugin/auth-override.test.ts
index b967262254..667b7ba9aa 100644
--- a/packages/opencode/test/plugin/auth-override.test.ts
+++ b/packages/opencode/test/plugin/auth-override.test.ts
@@ -54,3 +54,19 @@ describe("plugin.auth-override", () => {
expect(plainMethods[ProviderID.make("github-copilot")][0].label).not.toBe("Test Override Auth")
}, 30000) // Increased timeout for plugin installation
})
+
+const file = path.join(import.meta.dir, "../../src/plugin/index.ts")
+
+describe("plugin.config-hook-error-isolation", () => {
+ test("config hooks are individually error-isolated in the layer factory", async () => {
+ const src = await Bun.file(file).text()
+
+ // The config hook try/catch lives in the InstanceState factory (layer definition),
+ // not in init() which now just delegates to the Effect service.
+ expect(src).toContain("plugin config hook failed")
+
+ const pattern =
+ /for\s*\(const hook of hooks\)\s*\{[\s\S]*?try\s*\{[\s\S]*?\.config\?\.\([\s\S]*?\}\s*catch\s*\(err\)\s*\{[\s\S]*?plugin config hook failed[\s\S]*?\}/
+ expect(pattern.test(src)).toBe(true)
+ })
+})
diff --git a/packages/opencode/test/project/project.test.ts b/packages/opencode/test/project/project.test.ts
index a71fe0528f..b030e6cbcd 100644
--- a/packages/opencode/test/project/project.test.ts
+++ b/packages/opencode/test/project/project.test.ts
@@ -1,78 +1,69 @@
-import { describe, expect, mock, test } from "bun:test"
+import { describe, expect, test } from "bun:test"
import { Project } from "../../src/project/project"
import { Log } from "../../src/util/log"
import { $ } from "bun"
import path from "path"
import { tmpdir } from "../fixture/fixture"
-import { Filesystem } from "../../src/util/filesystem"
import { GlobalBus } from "../../src/bus/global"
import { ProjectID } from "../../src/project/schema"
+import { Effect, Layer, Stream } from "effect"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
+import { AppFileSystem } from "../../src/filesystem"
+import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
Log.init({ print: false })
-const gitModule = await import("../../src/util/git")
-const originalGit = gitModule.git
+const encoder = new TextEncoder()
-type Mode = "none" | "rev-list-fail" | "top-fail" | "common-dir-fail"
-let mode: Mode = "none"
-
-mock.module("../../src/util/git", () => ({
- git: (args: string[], opts: { cwd: string; env?: Record }) => {
- const cmd = ["git", ...args].join(" ")
- if (
- mode === "rev-list-fail" &&
- cmd.includes("git rev-list") &&
- cmd.includes("--max-parents=0") &&
- cmd.includes("HEAD")
- ) {
- return Promise.resolve({
- exitCode: 128,
- text: () => Promise.resolve(""),
- stdout: Buffer.from(""),
- stderr: Buffer.from("fatal"),
- })
- }
- if (mode === "top-fail" && cmd.includes("git rev-parse") && cmd.includes("--show-toplevel")) {
- return Promise.resolve({
- exitCode: 128,
- text: () => Promise.resolve(""),
- stdout: Buffer.from(""),
- stderr: Buffer.from("fatal"),
- })
- }
- if (mode === "common-dir-fail" && cmd.includes("git rev-parse") && cmd.includes("--git-common-dir")) {
- return Promise.resolve({
- exitCode: 128,
- text: () => Promise.resolve(""),
- stdout: Buffer.from(""),
- stderr: Buffer.from("fatal"),
- })
- }
- return originalGit(args, opts)
- },
-}))
-
-async function withMode(next: Mode, run: () => Promise) {
- const prev = mode
- mode = next
- try {
- await run()
- } finally {
- mode = prev
- }
+/**
+ * Creates a mock ChildProcessSpawner layer that intercepts git subcommands
+ * matching `failArg` and returns exit code 128, while delegating everything
+ * else to the real CrossSpawnSpawner.
+ */
+function mockGitFailure(failArg: string) {
+ return Layer.effect(
+ ChildProcessSpawner.ChildProcessSpawner,
+ Effect.gen(function* () {
+ const real = yield* ChildProcessSpawner.ChildProcessSpawner
+ return ChildProcessSpawner.make(
+ Effect.fnUntraced(function* (command) {
+ const std = ChildProcess.isStandardCommand(command) ? command : undefined
+ if (std?.command === "git" && std.args.some((a) => a === failArg)) {
+ return ChildProcessSpawner.makeHandle({
+ pid: ChildProcessSpawner.ProcessId(0),
+ exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(128)),
+ isRunning: Effect.succeed(false),
+ kill: () => Effect.void,
+ stdin: { [Symbol.for("effect/Sink/TypeId")]: Symbol.for("effect/Sink/TypeId") } as any,
+ stdout: Stream.empty,
+ stderr: Stream.make(encoder.encode("fatal: simulated failure\n")),
+ all: Stream.empty,
+ getInputFd: () => ({ [Symbol.for("effect/Sink/TypeId")]: Symbol.for("effect/Sink/TypeId") }) as any,
+ getOutputFd: () => Stream.empty,
+ })
+ }
+ return yield* real.spawn(command)
+ }),
+ )
+ }),
+ ).pipe(Layer.provide(CrossSpawnSpawner.layer), Layer.provide(NodeFileSystem.layer), Layer.provide(NodePath.layer))
}
-async function loadProject() {
- return (await import("../../src/project/project")).Project
+function projectLayerWithFailure(failArg: string) {
+ return Project.layer.pipe(
+ Layer.provide(mockGitFailure(failArg)),
+ Layer.provide(AppFileSystem.defaultLayer),
+ Layer.provide(NodePath.layer),
+ )
}
describe("Project.fromDirectory", () => {
test("should handle git repository with no commits", async () => {
- const p = await loadProject()
await using tmp = await tmpdir()
await $`git init`.cwd(tmp.path).quiet()
- const { project } = await p.fromDirectory(tmp.path)
+ const { project } = await Project.fromDirectory(tmp.path)
expect(project).toBeDefined()
expect(project.id).toBe(ProjectID.global)
@@ -80,15 +71,13 @@ describe("Project.fromDirectory", () => {
expect(project.worktree).toBe(tmp.path)
const opencodeFile = path.join(tmp.path, ".git", "opencode")
- const fileExists = await Filesystem.exists(opencodeFile)
- expect(fileExists).toBe(false)
+ expect(await Bun.file(opencodeFile).exists()).toBe(false)
})
test("should handle git repository with commits", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
- const { project } = await p.fromDirectory(tmp.path)
+ const { project } = await Project.fromDirectory(tmp.path)
expect(project).toBeDefined()
expect(project.id).not.toBe(ProjectID.global)
@@ -96,54 +85,63 @@ describe("Project.fromDirectory", () => {
expect(project.worktree).toBe(tmp.path)
const opencodeFile = path.join(tmp.path, ".git", "opencode")
- const fileExists = await Filesystem.exists(opencodeFile)
- expect(fileExists).toBe(true)
+ expect(await Bun.file(opencodeFile).exists()).toBe(true)
})
- test("keeps git vcs when rev-list exits non-zero with empty output", async () => {
- const p = await loadProject()
+ test("returns global for non-git directory", async () => {
+ await using tmp = await tmpdir()
+ const { project } = await Project.fromDirectory(tmp.path)
+ expect(project.id).toBe(ProjectID.global)
+ })
+
+ test("derives stable project ID from root commit", async () => {
+ await using tmp = await tmpdir({ git: true })
+ const { project: a } = await Project.fromDirectory(tmp.path)
+ const { project: b } = await Project.fromDirectory(tmp.path)
+ expect(b.id).toBe(a.id)
+ })
+})
+
+describe("Project.fromDirectory git failure paths", () => {
+ test("keeps vcs when rev-list exits non-zero (no commits)", async () => {
await using tmp = await tmpdir()
await $`git init`.cwd(tmp.path).quiet()
- await withMode("rev-list-fail", async () => {
- const { project } = await p.fromDirectory(tmp.path)
- expect(project.vcs).toBe("git")
- expect(project.id).toBe(ProjectID.global)
- expect(project.worktree).toBe(tmp.path)
- })
+ // rev-list fails because HEAD doesn't exist yet — this is the natural scenario
+ const { project } = await Project.fromDirectory(tmp.path)
+ expect(project.vcs).toBe("git")
+ expect(project.id).toBe(ProjectID.global)
+ expect(project.worktree).toBe(tmp.path)
})
- test("keeps git vcs when show-toplevel exits non-zero with empty output", async () => {
- const p = await loadProject()
+ test("handles show-toplevel failure gracefully", async () => {
await using tmp = await tmpdir({ git: true })
+ const layer = projectLayerWithFailure("--show-toplevel")
- await withMode("top-fail", async () => {
- const { project, sandbox } = await p.fromDirectory(tmp.path)
- expect(project.vcs).toBe("git")
- expect(project.worktree).toBe(tmp.path)
- expect(sandbox).toBe(tmp.path)
- })
+ const { project, sandbox } = await Effect.runPromise(
+ Project.Service.use((svc) => svc.fromDirectory(tmp.path)).pipe(Effect.provide(layer)),
+ )
+ expect(project.worktree).toBe(tmp.path)
+ expect(sandbox).toBe(tmp.path)
})
- test("keeps git vcs when git-common-dir exits non-zero with empty output", async () => {
- const p = await loadProject()
+ test("handles git-common-dir failure gracefully", async () => {
await using tmp = await tmpdir({ git: true })
+ const layer = projectLayerWithFailure("--git-common-dir")
- await withMode("common-dir-fail", async () => {
- const { project, sandbox } = await p.fromDirectory(tmp.path)
- expect(project.vcs).toBe("git")
- expect(project.worktree).toBe(tmp.path)
- expect(sandbox).toBe(tmp.path)
- })
+ const { project, sandbox } = await Effect.runPromise(
+ Project.Service.use((svc) => svc.fromDirectory(tmp.path)).pipe(Effect.provide(layer)),
+ )
+ expect(project.worktree).toBe(tmp.path)
+ expect(sandbox).toBe(tmp.path)
})
})
describe("Project.fromDirectory with worktrees", () => {
test("should set worktree to root when called from root", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
- const { project, sandbox } = await p.fromDirectory(tmp.path)
+ const { project, sandbox } = await Project.fromDirectory(tmp.path)
expect(project.worktree).toBe(tmp.path)
expect(sandbox).toBe(tmp.path)
@@ -151,14 +149,13 @@ describe("Project.fromDirectory with worktrees", () => {
})
test("should set worktree to root when called from a worktree", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
const worktreePath = path.join(tmp.path, "..", path.basename(tmp.path) + "-worktree")
try {
await $`git worktree add ${worktreePath} -b test-branch-${Date.now()}`.cwd(tmp.path).quiet()
- const { project, sandbox } = await p.fromDirectory(worktreePath)
+ const { project, sandbox } = await Project.fromDirectory(worktreePath)
expect(project.worktree).toBe(tmp.path)
expect(sandbox).toBe(worktreePath)
@@ -173,22 +170,21 @@ describe("Project.fromDirectory with worktrees", () => {
})
test("worktree should share project ID with main repo", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
- const { project: main } = await p.fromDirectory(tmp.path)
+ const { project: main } = await Project.fromDirectory(tmp.path)
const worktreePath = path.join(tmp.path, "..", path.basename(tmp.path) + "-wt-shared")
try {
await $`git worktree add ${worktreePath} -b shared-${Date.now()}`.cwd(tmp.path).quiet()
- const { project: wt } = await p.fromDirectory(worktreePath)
+ const { project: wt } = await Project.fromDirectory(worktreePath)
expect(wt.id).toBe(main.id)
// Cache should live in the common .git dir, not the worktree's .git file
const cache = path.join(tmp.path, ".git", "opencode")
- const exists = await Filesystem.exists(cache)
+ const exists = await Bun.file(cache).exists()
expect(exists).toBe(true)
} finally {
await $`git worktree remove ${worktreePath}`
@@ -199,7 +195,6 @@ describe("Project.fromDirectory with worktrees", () => {
})
test("separate clones of the same repo should share project ID", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
// Create a bare remote, push, then clone into a second directory
@@ -209,8 +204,8 @@ describe("Project.fromDirectory with worktrees", () => {
await $`git clone --bare ${tmp.path} ${bare}`.quiet()
await $`git clone ${bare} ${clone}`.quiet()
- const { project: a } = await p.fromDirectory(tmp.path)
- const { project: b } = await p.fromDirectory(clone)
+ const { project: a } = await Project.fromDirectory(tmp.path)
+ const { project: b } = await Project.fromDirectory(clone)
expect(b.id).toBe(a.id)
} finally {
@@ -219,7 +214,6 @@ describe("Project.fromDirectory with worktrees", () => {
})
test("should accumulate multiple worktrees in sandboxes", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
const worktree1 = path.join(tmp.path, "..", path.basename(tmp.path) + "-wt1")
@@ -228,8 +222,8 @@ describe("Project.fromDirectory with worktrees", () => {
await $`git worktree add ${worktree1} -b branch-${Date.now()}`.cwd(tmp.path).quiet()
await $`git worktree add ${worktree2} -b branch-${Date.now() + 1}`.cwd(tmp.path).quiet()
- await p.fromDirectory(worktree1)
- const { project } = await p.fromDirectory(worktree2)
+ await Project.fromDirectory(worktree1)
+ const { project } = await Project.fromDirectory(worktree2)
expect(project.worktree).toBe(tmp.path)
expect(project.sandboxes).toContain(worktree1)
@@ -250,14 +244,13 @@ describe("Project.fromDirectory with worktrees", () => {
describe("Project.discover", () => {
test("should discover favicon.png in root", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
- const { project } = await p.fromDirectory(tmp.path)
+ const { project } = await Project.fromDirectory(tmp.path)
const pngData = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])
await Bun.write(path.join(tmp.path, "favicon.png"), pngData)
- await p.discover(project)
+ await Project.discover(project)
const updated = Project.get(project.id)
expect(updated).toBeDefined()
@@ -268,13 +261,12 @@ describe("Project.discover", () => {
})
test("should not discover non-image files", async () => {
- const p = await loadProject()
await using tmp = await tmpdir({ git: true })
- const { project } = await p.fromDirectory(tmp.path)
+ const { project } = await Project.fromDirectory(tmp.path)
await Bun.write(path.join(tmp.path, "favicon.txt"), "not an image")
- await p.discover(project)
+ await Project.discover(project)
const updated = Project.get(project.id)
expect(updated).toBeDefined()
@@ -344,8 +336,6 @@ describe("Project.update", () => {
})
test("should throw error when project not found", async () => {
- await using tmp = await tmpdir({ git: true })
-
await expect(
Project.update({
projectID: ProjectID.make("nonexistent-project-id"),
@@ -358,22 +348,24 @@ describe("Project.update", () => {
await using tmp = await tmpdir({ git: true })
const { project } = await Project.fromDirectory(tmp.path)
- let eventFired = false
let eventPayload: any = null
-
- GlobalBus.on("event", (data) => {
- eventFired = true
+ const on = (data: any) => {
eventPayload = data
- })
+ }
+ GlobalBus.on("event", on)
- await Project.update({
- projectID: project.id,
- name: "Updated Name",
- })
+ try {
+ await Project.update({
+ projectID: project.id,
+ name: "Updated Name",
+ })
- expect(eventFired).toBe(true)
- expect(eventPayload.payload.type).toBe("project.updated")
- expect(eventPayload.payload.properties.name).toBe("Updated Name")
+ expect(eventPayload).not.toBeNull()
+ expect(eventPayload.payload.type).toBe("project.updated")
+ expect(eventPayload.payload.properties.name).toBe("Updated Name")
+ } finally {
+ GlobalBus.off("event", on)
+ }
})
test("should update multiple fields at once", async () => {
@@ -393,3 +385,75 @@ describe("Project.update", () => {
expect(updated.commands?.start).toBe("make start")
})
})
+
+describe("Project.list and Project.get", () => {
+ test("list returns all projects", async () => {
+ await using tmp = await tmpdir({ git: true })
+ const { project } = await Project.fromDirectory(tmp.path)
+
+ const all = Project.list()
+ expect(all.length).toBeGreaterThan(0)
+ expect(all.find((p) => p.id === project.id)).toBeDefined()
+ })
+
+ test("get returns project by id", async () => {
+ await using tmp = await tmpdir({ git: true })
+ const { project } = await Project.fromDirectory(tmp.path)
+
+ const found = Project.get(project.id)
+ expect(found).toBeDefined()
+ expect(found!.id).toBe(project.id)
+ })
+
+ test("get returns undefined for unknown id", () => {
+ const found = Project.get(ProjectID.make("nonexistent"))
+ expect(found).toBeUndefined()
+ })
+})
+
+describe("Project.setInitialized", () => {
+ test("sets time_initialized on project", async () => {
+ await using tmp = await tmpdir({ git: true })
+ const { project } = await Project.fromDirectory(tmp.path)
+
+ expect(project.time.initialized).toBeUndefined()
+
+ Project.setInitialized(project.id)
+
+ const updated = Project.get(project.id)
+ expect(updated?.time.initialized).toBeDefined()
+ })
+})
+
+describe("Project.addSandbox and Project.removeSandbox", () => {
+ test("addSandbox adds directory and removeSandbox removes it", async () => {
+ await using tmp = await tmpdir({ git: true })
+ const { project } = await Project.fromDirectory(tmp.path)
+ const sandboxDir = path.join(tmp.path, "sandbox-test")
+
+ await Project.addSandbox(project.id, sandboxDir)
+
+ let found = Project.get(project.id)
+ expect(found?.sandboxes).toContain(sandboxDir)
+
+ await Project.removeSandbox(project.id, sandboxDir)
+
+ found = Project.get(project.id)
+ expect(found?.sandboxes).not.toContain(sandboxDir)
+ })
+
+ test("addSandbox emits GlobalBus event", async () => {
+ await using tmp = await tmpdir({ git: true })
+ const { project } = await Project.fromDirectory(tmp.path)
+ const sandboxDir = path.join(tmp.path, "sandbox-event")
+
+ const events: any[] = []
+ const on = (evt: any) => events.push(evt)
+ GlobalBus.on("event", on)
+
+ await Project.addSandbox(project.id, sandboxDir)
+
+ GlobalBus.off("event", on)
+ expect(events.some((e) => e.payload.type === Project.Event.Updated.type)).toBe(true)
+ })
+})
diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts
index a667ac743a..a7a9a5d4c9 100644
--- a/packages/opencode/test/provider/transform.test.ts
+++ b/packages/opencode/test/provider/transform.test.ts
@@ -1629,6 +1629,43 @@ describe("ProviderTransform.message - claude w/bedrock custom inference profile"
})
})
+describe("ProviderTransform.message - bedrock caching with non-bedrock providerID", () => {
+ test("applies cache options at message level when npm package is amazon-bedrock", () => {
+ const model = {
+ id: "aws/us.anthropic.claude-opus-4-6-v1",
+ providerID: "aws",
+ api: {
+ id: "us.anthropic.claude-opus-4-6-v1",
+ url: "https://bedrock-runtime.us-east-1.amazonaws.com",
+ npm: "@ai-sdk/amazon-bedrock",
+ },
+ name: "Claude Opus 4.6",
+ capabilities: {},
+ options: {},
+ headers: {},
+ } as any
+
+ const msgs = [
+ {
+ role: "system",
+ content: [{ type: "text", text: "You are a helpful assistant" }],
+ },
+ {
+ role: "user",
+ content: [{ type: "text", text: "Hello" }],
+ },
+ ] as any[]
+
+ const result = ProviderTransform.message(msgs, model, {}) as any[]
+
+ // Cache should be at the message level and not the content-part level
+ expect(result[0].providerOptions?.bedrock).toEqual({
+ cachePoint: { type: "default" },
+ })
+ expect(result[0].content[0].providerOptions?.bedrock).toBeUndefined()
+ })
+})
+
describe("ProviderTransform.message - cache control on gateway", () => {
const createModel = (overrides: Partial = {}) =>
({
diff --git a/packages/opencode/test/server/session-messages.test.ts b/packages/opencode/test/server/session-messages.test.ts
index ee4c51646f..91e0fd9263 100644
--- a/packages/opencode/test/server/session-messages.test.ts
+++ b/packages/opencode/test/server/session-messages.test.ts
@@ -117,3 +117,16 @@ describe("session messages endpoint", () => {
})
})
})
+
+describe("session.prompt_async error handling", () => {
+ test("prompt_async route has error handler for detached prompt call", async () => {
+ const src = await Bun.file(path.join(import.meta.dir, "../../src/server/routes/session.ts")).text()
+ const start = src.indexOf('"/:sessionID/prompt_async"')
+ const end = src.indexOf('"/:sessionID/command"', start)
+ expect(start).toBeGreaterThan(-1)
+ expect(end).toBeGreaterThan(start)
+ const route = src.slice(start, end)
+ expect(route).toContain(".catch(")
+ expect(route).toContain("Bus.publish(Session.Event.Error")
+ })
+})
diff --git a/packages/opencode/test/session/prompt.test.ts b/packages/opencode/test/session/prompt.test.ts
index 58ac9e76f4..c98cce1696 100644
--- a/packages/opencode/test/session/prompt.test.ts
+++ b/packages/opencode/test/session/prompt.test.ts
@@ -1,6 +1,7 @@
import path from "path"
import fs from "fs/promises"
import { describe, expect, test } from "bun:test"
+import { NamedError } from "@opencode-ai/util/error"
import { fileURLToPath } from "url"
import { Instance } from "../../src/project/instance"
import { ModelID, ProviderID } from "../../src/provider/schema"
@@ -331,3 +332,78 @@ describe("session.prompt abort", () => {
}, 15000)
})
// kilocode_change end
+
+describe("session.agent-resolution", () => {
+ test("unknown agent throws typed error", async () => {
+ await using tmp = await tmpdir({ git: true })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const session = await Session.create({})
+ const err = await SessionPrompt.prompt({
+ sessionID: session.id,
+ agent: "nonexistent-agent-xyz",
+ noReply: true,
+ parts: [{ type: "text", text: "hello" }],
+ }).then(
+ () => undefined,
+ (e) => e,
+ )
+ expect(err).toBeDefined()
+ expect(err).not.toBeInstanceOf(TypeError)
+ expect(NamedError.Unknown.isInstance(err)).toBe(true)
+ if (NamedError.Unknown.isInstance(err)) {
+ expect(err.data.message).toContain('Agent not found: "nonexistent-agent-xyz"')
+ }
+ },
+ })
+ }, 30000)
+
+ test("unknown agent error includes available agent names", async () => {
+ await using tmp = await tmpdir({ git: true })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const session = await Session.create({})
+ const err = await SessionPrompt.prompt({
+ sessionID: session.id,
+ agent: "nonexistent-agent-xyz",
+ noReply: true,
+ parts: [{ type: "text", text: "hello" }],
+ }).then(
+ () => undefined,
+ (e) => e,
+ )
+ expect(NamedError.Unknown.isInstance(err)).toBe(true)
+ if (NamedError.Unknown.isInstance(err)) {
+ expect(err.data.message).toContain("build")
+ }
+ },
+ })
+ }, 30000)
+
+ test("unknown command throws typed error with available names", async () => {
+ await using tmp = await tmpdir({ git: true })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const session = await Session.create({})
+ const err = await SessionPrompt.command({
+ sessionID: session.id,
+ command: "nonexistent-command-xyz",
+ arguments: "",
+ }).then(
+ () => undefined,
+ (e) => e,
+ )
+ expect(err).toBeDefined()
+ expect(err).not.toBeInstanceOf(TypeError)
+ expect(NamedError.Unknown.isInstance(err)).toBe(true)
+ if (NamedError.Unknown.isInstance(err)) {
+ expect(err.data.message).toContain('Command not found: "nonexistent-command-xyz"')
+ expect(err.data.message).toContain("init")
+ }
+ },
+ })
+ }, 30000)
+})
diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts
index 5a2c152c8e..bf54feb472 100644
--- a/packages/opencode/test/snapshot/snapshot.test.ts
+++ b/packages/opencode/test/snapshot/snapshot.test.ts
@@ -1183,342 +1183,6 @@ test("diffFull with whitespace changes", async () => {
})
})
-// ── Tests for snapshot optimizations (upstream #17878, #20564) ────────
-
-test("batch revert with many files sharing same hash", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- // Create enough files to trigger batching (>1 per hash)
- for (let i = 0; i < 20; i++) {
- await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`)
- }
- await $`git add .`.cwd(dir).quiet()
- await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet()
- },
- })
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- // Modify all 20 files
- for (let i = 0; i < 20; i++) {
- await Filesystem.write(`${tmp.path}/file${i}.txt`, `changed-${i}`)
- }
- // Add 5 new files
- for (let i = 0; i < 5; i++) {
- await Filesystem.write(`${tmp.path}/new${i}.txt`, `new-${i}`)
- }
-
- const patch = await Snapshot.patch(before!)
- expect(patch.files.length).toBe(25)
-
- await Snapshot.revert([patch])
-
- // Modified files should be restored
- for (let i = 0; i < 20; i++) {
- const content = await Filesystem.readText(`${tmp.path}/file${i}.txt`)
- expect(content).toBe(`original-${i}`)
- }
- // New files should be deleted
- for (let i = 0; i < 5; i++) {
- expect(
- await fs
- .access(`${tmp.path}/new${i}.txt`)
- .then(() => true)
- .catch(() => false),
- ).toBe(false)
- }
- },
- })
-})
-
-test("batch revert with files in nested subdirectories", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- await fs.mkdir(`${dir}/a/b/c`, { recursive: true })
- await fs.mkdir(`${dir}/d/e`, { recursive: true })
- for (let i = 0; i < 10; i++) {
- await Filesystem.write(`${dir}/a/b/c/file${i}.txt`, `deep-${i}`)
- await Filesystem.write(`${dir}/d/e/file${i}.txt`, `other-${i}`)
- }
- await $`git add .`.cwd(dir).quiet()
- await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet()
- },
- })
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- for (let i = 0; i < 10; i++) {
- await Filesystem.write(`${tmp.path}/a/b/c/file${i}.txt`, `modified-${i}`)
- await Filesystem.write(`${tmp.path}/d/e/file${i}.txt`, `modified-${i}`)
- }
-
- await Snapshot.revert([await Snapshot.patch(before!)])
-
- for (let i = 0; i < 10; i++) {
- expect(await Filesystem.readText(`${tmp.path}/a/b/c/file${i}.txt`)).toBe(`deep-${i}`)
- expect(await Filesystem.readText(`${tmp.path}/d/e/file${i}.txt`)).toBe(`other-${i}`)
- }
- },
- })
-})
-
-test("incremental add skips new files larger than 2MB", async () => {
- await using tmp = await bootstrap()
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- // Create a file larger than 2MB
- const largeContent = "x".repeat(3 * 1024 * 1024)
- await Filesystem.write(`${tmp.path}/large.bin`, largeContent)
- // Also create a small file
- await Filesystem.write(`${tmp.path}/small.txt`, "small change")
-
- const after = await Snapshot.track()
- expect(after).toBeTruthy()
-
- const patch = await Snapshot.patch(before!)
- // Small file should be tracked, large file should be excluded
- const files = patch.files.map((f) => path.basename(f))
- expect(files).toContain("small.txt")
- expect(files).not.toContain("large.bin")
- },
- })
-})
-
-test("incremental add: tracked files that grow past 2MB are still visible in patch", async () => {
- // The 2MB size filter only prevents NEW large files from being added to the
- // snapshot index. Already-tracked files that grow past 2MB still appear in
- // patch/diff because those compare against the working tree. This matches
- // upstream OpenCode behavior.
- await using tmp = await bootstrap()
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- await Filesystem.write(`${tmp.path}/growing.txt`, "small")
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- await Filesystem.write(`${tmp.path}/growing.txt`, "x".repeat(3 * 1024 * 1024))
- await Filesystem.write(`${tmp.path}/a.txt`, "changed")
-
- const patch = await Snapshot.patch(before!)
- const files = patch.files.map((f) => path.basename(f))
- expect(files).toContain("a.txt")
- expect(files).toContain("growing.txt")
- },
- })
-})
-
-test("concurrent patch() calls return consistent results", async () => {
- await using tmp = await bootstrap()
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- await Filesystem.write(`${tmp.path}/a.txt`, "changed")
-
- const results = await Promise.all([Snapshot.patch(before!), Snapshot.patch(before!), Snapshot.patch(before!)])
-
- // All should report the same changed files
- for (const result of results) {
- expect(result.files).toContain(fwd(tmp.path, "a.txt"))
- }
- },
- })
-})
-
-test("batch revert with mix of modified, new, and deleted files", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- for (let i = 0; i < 15; i++) {
- await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`)
- }
- await $`git add .`.cwd(dir).quiet()
- await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet()
- },
- })
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- // Modify some files
- for (let i = 0; i < 5; i++) {
- await Filesystem.write(`${tmp.path}/file${i}.txt`, `modified-${i}`)
- }
- // Delete some files
- for (let i = 5; i < 10; i++) {
- await fs.unlink(`${tmp.path}/file${i}.txt`)
- }
- // Add new files
- for (let i = 0; i < 5; i++) {
- await Filesystem.write(`${tmp.path}/added${i}.txt`, `added-${i}`)
- }
-
- await Snapshot.revert([await Snapshot.patch(before!)])
-
- // Modified files restored
- for (let i = 0; i < 5; i++) {
- expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`original-${i}`)
- }
- // Deleted files restored
- for (let i = 5; i < 10; i++) {
- expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`original-${i}`)
- }
- // Untouched files unchanged
- for (let i = 10; i < 15; i++) {
- expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`original-${i}`)
- }
- // New files removed
- for (let i = 0; i < 5; i++) {
- expect(
- await fs
- .access(`${tmp.path}/added${i}.txt`)
- .then(() => true)
- .catch(() => false),
- ).toBe(false)
- }
- },
- })
-})
-
-test("batch revert with multiple patches from different snapshots", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- for (let i = 0; i < 10; i++) {
- await Filesystem.write(`${dir}/file${i}.txt`, `v0-${i}`)
- }
- await $`git add .`.cwd(dir).quiet()
- await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet()
- },
- })
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- // Snapshot A
- const snapA = await Snapshot.track()
- expect(snapA).toBeTruthy()
-
- // Modify first 5 files
- for (let i = 0; i < 5; i++) {
- await Filesystem.write(`${tmp.path}/file${i}.txt`, `v1-${i}`)
- }
-
- // Snapshot B (captures v1 state)
- const snapB = await Snapshot.track()
- expect(snapB).toBeTruthy()
-
- // Modify last 5 files
- for (let i = 5; i < 10; i++) {
- await Filesystem.write(`${tmp.path}/file${i}.txt`, `v2-${i}`)
- }
-
- // Revert with patches from two different hashes
- const patchA = await Snapshot.patch(snapA!)
- const patchB = await Snapshot.patch(snapB!)
- // patchA covers files 0-4 (changed in v1) + files 5-9 (changed in v2)
- // patchB covers files 5-9 (changed in v2)
- // Reverting [patchA, patchB]: patchA's hash wins for all files (first seen)
- await Snapshot.revert([patchA, patchB])
-
- // All files should be at v0 (snapA's state)
- for (let i = 0; i < 10; i++) {
- expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`v0-${i}`)
- }
- },
- })
-})
-
-test("track after revert produces clean snapshot", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- for (let i = 0; i < 10; i++) {
- await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`)
- }
- await $`git add .`.cwd(dir).quiet()
- await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet()
- },
- })
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- for (let i = 0; i < 10; i++) {
- await Filesystem.write(`${tmp.path}/file${i}.txt`, `changed-${i}`)
- }
-
- await Snapshot.revert([await Snapshot.patch(before!)])
-
- // After revert, a new track should match the original snapshot
- const after = await Snapshot.track()
- expect(after).toBeTruthy()
- expect(after).toBe(before)
- },
- })
-})
-
-test("incremental add tracks newly created files", async () => {
- await using tmp = await bootstrap()
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- // Create several new files in subdirectories
- await fs.mkdir(`${tmp.path}/newdir/sub`, { recursive: true })
- await Filesystem.write(`${tmp.path}/newdir/one.txt`, "one")
- await Filesystem.write(`${tmp.path}/newdir/sub/two.txt`, "two")
- await Filesystem.write(`${tmp.path}/three.txt`, "three")
-
- const patch = await Snapshot.patch(before!)
- const files = patch.files.map((f) => path.basename(f))
- expect(files).toContain("one.txt")
- expect(files).toContain("two.txt")
- expect(files).toContain("three.txt")
- },
- })
-})
-
-test("incremental add tracks modified and deleted files", async () => {
- await using tmp = await bootstrap()
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const before = await Snapshot.track()
- expect(before).toBeTruthy()
-
- // Modify one file, delete the other
- await Filesystem.write(`${tmp.path}/a.txt`, "modified-a")
- await fs.unlink(`${tmp.path}/b.txt`)
-
- const patch = await Snapshot.patch(before!)
- const files = patch.files.map((f) => path.basename(f))
- expect(files).toContain("a.txt")
- expect(files).toContain("b.txt")
- },
- })
-})
-
test("revert with overlapping files across patches uses first patch hash", async () => {
await using tmp = await bootstrap()
await Instance.provide({
diff --git a/packages/opencode/test/storage/db.test.ts b/packages/opencode/test/storage/db.test.ts
index 407b89d61e..3791d344db 100644
--- a/packages/opencode/test/storage/db.test.ts
+++ b/packages/opencode/test/storage/db.test.ts
@@ -1,11 +1,19 @@
import { describe, expect, test } from "bun:test"
import path from "path"
+import { Global } from "../../src/global"
+import { Installation } from "../../src/installation"
import { Database } from "../../src/storage/db"
describe("Database.Path", () => {
- // kilocode_change - always use kilo.db regardless of channel
- test("always uses kilo.db", () => {
- const file = path.basename(Database.Path)
- expect(file).toBe("kilo.db")
+ test("returns database path for the current channel", () => {
+ const db = process.env["KILO_DB"]
+ const expected = db
+ ? path.isAbsolute(db)
+ ? db
+ : path.join(Global.Path.data, db)
+ : ["latest", "beta"].includes(Installation.CHANNEL)
+ ? path.join(Global.Path.data, "kilo.db") // kilcode_change
+ : path.join(Global.Path.data, `kilo-${Installation.CHANNEL.replace(/[^a-zA-Z0-9._-]/g, "-")}.db`) // kilocode_change
+ expect(Database.Path).toBe(expected)
})
})
diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts
index ba3d5fb16f..69608b37d4 100644
--- a/packages/opencode/test/tool/skill.test.ts
+++ b/packages/opencode/test/tool/skill.test.ts
@@ -75,6 +75,56 @@ name: ${name}
description: ${description}
---
+# ${name}
+`,
+ )
+ }
+ },
+ })
+
+ const home = process.env.OPENCODE_TEST_HOME
+ process.env.OPENCODE_TEST_HOME = tmp.path
+
+ try {
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const first = await SkillTool.init()
+ const second = await SkillTool.init()
+
+ expect(first.description).toBe(second.description)
+
+ const alpha = first.description.indexOf("**alpha-skill**: Alpha skill.")
+ const middle = first.description.indexOf("**middle-skill**: Middle skill.")
+ const zeta = first.description.indexOf("**zeta-skill**: Zeta skill.")
+
+ expect(alpha).toBeGreaterThan(-1)
+ expect(middle).toBeGreaterThan(alpha)
+ expect(zeta).toBeGreaterThan(middle)
+ },
+ })
+ } finally {
+ process.env.OPENCODE_TEST_HOME = home
+ }
+ })
+
+ test("description sorts skills by name and is stable across calls", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ for (const [name, description] of [
+ ["zeta-skill", "Zeta skill."],
+ ["alpha-skill", "Alpha skill."],
+ ["middle-skill", "Middle skill."],
+ ]) {
+ const skillDir = path.join(dir, ".opencode", "skill", name)
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: ${name}
+description: ${description}
+---
+
# ${name}
`,
)
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 632b2c0138..0c5ea9901e 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -4366,6 +4366,38 @@ export class File extends HeyApiClient {
}
}
+export class Event extends HeyApiClient {
+ /**
+ * Subscribe to events
+ *
+ * Get events
+ */
+ public subscribe(
+ parameters?: {
+ directory?: string
+ workspace?: string
+ },
+ options?: Options,
+ ) {
+ const params = buildClientParams(
+ [parameters],
+ [
+ {
+ args: [
+ { in: "query", key: "directory" },
+ { in: "query", key: "workspace" },
+ ],
+ },
+ ],
+ )
+ return (options?.client ?? this.client).sse.get({
+ url: "/event",
+ ...options,
+ ...params,
+ })
+ }
+}
+
export class Auth2 extends HeyApiClient {
/**
* Remove MCP OAuth
@@ -5387,38 +5419,6 @@ export class Formatter extends HeyApiClient {
}
}
-export class Event extends HeyApiClient {
- /**
- * Subscribe to events
- *
- * Get events
- */
- public subscribe(
- parameters?: {
- directory?: string
- workspace?: string
- },
- options?: Options,
- ) {
- const params = buildClientParams(
- [parameters],
- [
- {
- args: [
- { in: "query", key: "directory" },
- { in: "query", key: "workspace" },
- ],
- },
- ],
- )
- return (options?.client ?? this.client).sse.get({
- url: "/event",
- ...options,
- ...params,
- })
- }
-}
-
export class KiloClient extends HeyApiClient {
public static readonly __registry = new HeyApiRegistry()
@@ -5537,6 +5537,11 @@ export class KiloClient extends HeyApiClient {
return (this._file ??= new File({ client: this.client }))
}
+ private _event?: Event
+ get event(): Event {
+ return (this._event ??= new Event({ client: this.client }))
+ }
+
private _mcp?: Mcp
get mcp(): Mcp {
return (this._mcp ??= new Mcp({ client: this.client }))
@@ -5581,9 +5586,4 @@ export class KiloClient extends HeyApiClient {
get formatter(): Formatter {
return (this._formatter ??= new Formatter({ client: this.client }))
}
-
- private _event?: Event
- get event(): Event {
- return (this._event ??= new Event({ client: this.client }))
- }
}
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index c848e83ae7..895dfebbba 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1053,6 +1053,21 @@ export type Event =
| EventLspClientDiagnostics
| EventLspUpdated
| EventFileEdited
+ | EventMessageUpdated
+ | EventMessageRemoved
+ | EventMessagePartUpdated
+ | EventMessagePartDelta
+ | EventMessagePartRemoved
+ | EventPermissionAsked
+ | EventPermissionReplied
+ | EventSessionStatus
+ | EventSessionIdle
+ | EventQuestionAsked
+ | EventQuestionReplied
+ | EventQuestionRejected
+ | EventSessionCompacted
+ | EventFileWatcherUpdated
+ | EventTodoUpdated
| EventTuiPromptAppend
| EventTuiCommandExecute
| EventTuiToastShow
@@ -5651,6 +5666,25 @@ export type FileStatusResponses = {
export type FileStatusResponse = FileStatusResponses[keyof FileStatusResponses]
+export type EventSubscribeData = {
+ body?: never
+ path?: never
+ query?: {
+ directory?: string
+ workspace?: string
+ }
+ url: "/event"
+}
+
+export type EventSubscribeResponses = {
+ /**
+ * Event stream
+ */
+ 200: Event
+}
+
+export type EventSubscribeResponse = EventSubscribeResponses[keyof EventSubscribeResponses]
+
export type McpStatusData = {
body?: never
path?: never
@@ -6401,22 +6435,3 @@ export type FormatterStatusResponses = {
}
export type FormatterStatusResponse = FormatterStatusResponses[keyof FormatterStatusResponses]
-
-export type EventSubscribeData = {
- body?: never
- path?: never
- query?: {
- directory?: string
- workspace?: string
- }
- url: "/event"
-}
-
-export type EventSubscribeResponses = {
- /**
- * Event stream
- */
- 200: Event
-}
-
-export type EventSubscribeResponse = EventSubscribeResponses[keyof EventSubscribeResponses]
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index f2240cf147..51fec1bf96 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -308,6 +308,82 @@
]
}
},
+ "/global/upgrade": {
+ "post": {
+ "operationId": "global.upgrade",
+ "summary": "Upgrade opencode",
+ "description": "Upgrade opencode to the specified version or latest if not specified.",
+ "responses": {
+ "200": {
+ "description": "Upgrade result",
+ "content": {
+ "application/json": {
+ "schema": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean",
+ "const": true
+ },
+ "version": {
+ "type": "string"
+ }
+ },
+ "required": ["success", "version"]
+ },
+ {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean",
+ "const": false
+ },
+ "error": {
+ "type": "string"
+ }
+ },
+ "required": ["success", "error"]
+ }
+ ]
+ }
+ }
+ }
+ },
+ "400": {
+ "description": "Bad request",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/BadRequestError"
+ }
+ }
+ }
+ }
+ },
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "target": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+ },
+ "x-codeSamples": [
+ {
+ "lang": "js",
+ "source": "import { createOpencodeClient } from \"@opencode-ai/sdk\n\nconst client = createOpencodeClient()\nawait client.global.upgrade({\n ...\n})"
+ }
+ ]
+ }
+ },
"/auth/{providerID}": {
"put": {
"operationId": "auth.set",
diff --git a/packages/storybook/.storybook/mocks/app/context/language.ts b/packages/storybook/.storybook/mocks/app/context/language.ts
index 8744655422..f75240b9c4 100644
--- a/packages/storybook/.storybook/mocks/app/context/language.ts
+++ b/packages/storybook/.storybook/mocks/app/context/language.ts
@@ -8,7 +8,7 @@ const dict: Record = {
"prompt.placeholder.shell": "Run a shell command...",
"prompt.placeholder.summarizeComment": "Summarize this comment",
"prompt.placeholder.summarizeComments": "Summarize these comments",
- "prompt.action.attachFile": "Attach file",
+ "prompt.action.attachFile": "Attach files",
"prompt.action.send": "Send",
"prompt.action.stop": "Stop",
"prompt.attachment.remove": "Remove attachment",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index d126a779a7..515e862697 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -12,6 +12,7 @@
"./hooks": "./src/hooks/index.ts",
"./context": "./src/context/index.ts",
"./context/*": "./src/context/*.tsx",
+ "./font-loader": "./src/font-loader.ts",
"./styles": "./src/styles/index.css",
"./styles/tailwind": "./src/styles/tailwind/index.css",
"./theme": "./src/theme/index.ts",
diff --git a/packages/ui/src/components/basic-tool.css b/packages/ui/src/components/basic-tool.css
index 9b7db1e19d..028972fec1 100644
--- a/packages/ui/src/components/basic-tool.css
+++ b/packages/ui/src/components/basic-tool.css
@@ -8,7 +8,10 @@
justify-content: flex-start;
[data-slot="basic-tool-tool-trigger-content"] {
+ flex: 0 1 auto;
width: auto;
+ max-width: calc(100% - 24px);
+ min-width: 0;
display: flex;
align-items: center;
align-self: stretch;
@@ -51,12 +54,16 @@
[data-slot="basic-tool-tool-info"] {
flex: 0 1 auto;
min-width: 0;
+ max-width: 100%;
font-size: 14px;
}
[data-slot="basic-tool-tool-info-structured"] {
+ flex: 0 1 auto;
width: auto;
- display: flex;
+ max-width: 100%;
+ min-width: 0;
+ display: inline-flex;
align-items: center;
gap: 8px;
justify-content: flex-start;
@@ -152,4 +159,10 @@
letter-spacing: var(--letter-spacing-normal);
color: var(--text-base);
}
+
+ [data-slot="basic-tool-tool-action"] {
+ display: inline-flex;
+ align-items: center;
+ flex-shrink: 0;
+ }
}
diff --git a/packages/ui/src/components/basic-tool.tsx b/packages/ui/src/components/basic-tool.tsx
index 7aa0262071..97cc02aab0 100644
--- a/packages/ui/src/components/basic-tool.tsx
+++ b/packages/ui/src/components/basic-tool.tsx
@@ -180,7 +180,9 @@ export function BasicTool(props: BasicToolProps) {
- {trigger().action}
+
+ {trigger().action}
+
)}
diff --git a/packages/ui/src/components/font.tsx b/packages/ui/src/components/font.tsx
index f735747a49..e1a508f16a 100644
--- a/packages/ui/src/components/font.tsx
+++ b/packages/ui/src/components/font.tsx
@@ -1,121 +1,9 @@
+import { Link, Style } from "@solidjs/meta"
import { Show } from "solid-js"
-import { Style, Link } from "@solidjs/meta"
import inter from "../assets/fonts/inter.woff2"
-import ibmPlexMonoRegular from "../assets/fonts/ibm-plex-mono.woff2"
-import ibmPlexMonoMedium from "../assets/fonts/ibm-plex-mono-medium.woff2"
import ibmPlexMonoBold from "../assets/fonts/ibm-plex-mono-bold.woff2"
-
-import cascadiaCode from "../assets/fonts/cascadia-code-nerd-font.woff2"
-import cascadiaCodeBold from "../assets/fonts/cascadia-code-nerd-font-bold.woff2"
-import firaCode from "../assets/fonts/fira-code-nerd-font.woff2"
-import firaCodeBold from "../assets/fonts/fira-code-nerd-font-bold.woff2"
-import hack from "../assets/fonts/hack-nerd-font.woff2"
-import hackBold from "../assets/fonts/hack-nerd-font-bold.woff2"
-import inconsolata from "../assets/fonts/inconsolata-nerd-font.woff2"
-import inconsolataBold from "../assets/fonts/inconsolata-nerd-font-bold.woff2"
-import intelOneMono from "../assets/fonts/intel-one-mono-nerd-font.woff2"
-import intelOneMonoBold from "../assets/fonts/intel-one-mono-nerd-font-bold.woff2"
-import jetbrainsMono from "../assets/fonts/jetbrains-mono-nerd-font.woff2"
-import jetbrainsMonoBold from "../assets/fonts/jetbrains-mono-nerd-font-bold.woff2"
-import mesloLgs from "../assets/fonts/meslo-lgs-nerd-font.woff2"
-import mesloLgsBold from "../assets/fonts/meslo-lgs-nerd-font-bold.woff2"
-import robotoMono from "../assets/fonts/roboto-mono-nerd-font.woff2"
-import robotoMonoBold from "../assets/fonts/roboto-mono-nerd-font-bold.woff2"
-import sourceCodePro from "../assets/fonts/source-code-pro-nerd-font.woff2"
-import sourceCodeProBold from "../assets/fonts/source-code-pro-nerd-font-bold.woff2"
-import ubuntuMono from "../assets/fonts/ubuntu-mono-nerd-font.woff2"
-import ubuntuMonoBold from "../assets/fonts/ubuntu-mono-nerd-font-bold.woff2"
-import iosevka from "../assets/fonts/iosevka-nerd-font.woff2"
-import iosevkaBold from "../assets/fonts/iosevka-nerd-font-bold.woff2"
-import geistMono from "../assets/fonts/GeistMonoNerdFontMono-Regular.woff2"
-import geistMonoBold from "../assets/fonts/GeistMonoNerdFontMono-Bold.woff2"
-
-type MonoFont = {
- family: string
- regular: string
- bold: string
-}
-
-export const MONO_NERD_FONTS = [
- {
- family: "JetBrains Mono Nerd Font",
- regular: jetbrainsMono,
- bold: jetbrainsMonoBold,
- },
- {
- family: "Fira Code Nerd Font",
- regular: firaCode,
- bold: firaCodeBold,
- },
- {
- family: "Cascadia Code Nerd Font",
- regular: cascadiaCode,
- bold: cascadiaCodeBold,
- },
- {
- family: "Hack Nerd Font",
- regular: hack,
- bold: hackBold,
- },
- {
- family: "Source Code Pro Nerd Font",
- regular: sourceCodePro,
- bold: sourceCodeProBold,
- },
- {
- family: "Inconsolata Nerd Font",
- regular: inconsolata,
- bold: inconsolataBold,
- },
- {
- family: "Roboto Mono Nerd Font",
- regular: robotoMono,
- bold: robotoMonoBold,
- },
- {
- family: "Ubuntu Mono Nerd Font",
- regular: ubuntuMono,
- bold: ubuntuMonoBold,
- },
- {
- family: "Intel One Mono Nerd Font",
- regular: intelOneMono,
- bold: intelOneMonoBold,
- },
- {
- family: "Meslo LGS Nerd Font",
- regular: mesloLgs,
- bold: mesloLgsBold,
- },
- {
- family: "Iosevka Nerd Font",
- regular: iosevka,
- bold: iosevkaBold,
- },
- {
- family: "GeistMono Nerd Font",
- regular: geistMono,
- bold: geistMonoBold,
- },
-] satisfies MonoFont[]
-
-const monoNerdCss = MONO_NERD_FONTS.map(
- (font) => `
- @font-face {
- font-family: "${font.family}";
- src: url("${font.regular}") format("woff2");
- font-display: swap;
- font-style: normal;
- font-weight: 400;
- }
- @font-face {
- font-family: "${font.family}";
- src: url("${font.bold}") format("woff2");
- font-display: swap;
- font-style: normal;
- font-weight: 700;
- }`,
-).join("")
+import ibmPlexMonoMedium from "../assets/fonts/ibm-plex-mono-medium.woff2"
+import ibmPlexMonoRegular from "../assets/fonts/ibm-plex-mono.woff2"
export const Font = () => {
return (
@@ -165,7 +53,6 @@ export const Font = () => {
descent-override: 25%;
line-gap-override: 1%;
}
-${monoNerdCss}
`}
diff --git a/packages/ui/src/components/hover-card.tsx b/packages/ui/src/components/hover-card.tsx
index 210fd54160..8330375aa3 100644
--- a/packages/ui/src/components/hover-card.tsx
+++ b/packages/ui/src/components/hover-card.tsx
@@ -13,7 +13,7 @@ export function HoverCard(props: HoverCardProps) {
return (
-
+
{local.trigger}
diff --git a/packages/ui/src/components/message-part.css b/packages/ui/src/components/message-part.css
index 9ed0dc125b..f4582e4f2a 100644
--- a/packages/ui/src/components/message-part.css
+++ b/packages/ui/src/components/message-part.css
@@ -431,7 +431,7 @@
display: flex;
align-items: center;
justify-content: space-between;
- gap: 8px;
+ gap: 12px;
width: 100%;
[data-slot="message-part-title-area"] {
@@ -443,10 +443,11 @@
}
[data-slot="message-part-title"] {
- flex-shrink: 0;
+ flex: 1 1 auto;
display: flex;
align-items: center;
gap: 8px;
+ min-width: 0;
font-family: var(--font-family-sans);
font-size: 14px;
font-style: normal;
@@ -473,12 +474,17 @@
}
[data-slot="message-part-title-text"] {
+ flex-shrink: 0;
text-transform: capitalize;
color: var(--text-strong);
}
[data-slot="message-part-title-filename"] {
/* No text-transform - preserve original filename casing */
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
font-weight: var(--font-weight-regular);
/* kilocode_change start */
@@ -544,6 +550,7 @@
gap: 16px;
align-items: center;
justify-content: flex-end;
+ flex-shrink: 0;
}
}
@@ -1234,6 +1241,7 @@
display: flex;
flex-grow: 1;
min-width: 0;
+ overflow: hidden;
}
[data-slot="apply-patch-directory"] {
@@ -1247,7 +1255,11 @@
[data-slot="apply-patch-filename"] {
color: var(--text-strong);
- flex-shrink: 0;
+ flex: 1 1 auto;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
[data-slot="apply-patch-trigger-actions"] {
diff --git a/packages/ui/src/components/provider-icons/sprite.svg b/packages/ui/src/components/provider-icons/sprite.svg
index 2e49e18607..a10b9db72b 100644
--- a/packages/ui/src/components/provider-icons/sprite.svg
+++ b/packages/ui/src/components/provider-icons/sprite.svg
@@ -181,20 +181,6 @@
fill="currentColor"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
list(data.store.message?.[props.sessionID], emptyMessages))
+ const allMessages = createMemo(() => props.messages ?? list(data.store.message?.[props.sessionID], emptyMessages))
const messageIndex = createMemo(() => {
const messages = allMessages() ?? emptyMessages
@@ -353,30 +354,28 @@ export function SessionTurn(
if (end < start) return undefined
return end - start
})
- const assistantVisible = createMemo(() =>
- assistantMessages().reduce((count, message) => {
- const parts = list(data.store.part?.[message.id], emptyParts)
- return count + parts.filter((part) => partState(part, showReasoningSummaries()) === "visible").length
- }, 0),
- )
- const assistantTailVisible = createMemo(() =>
- assistantMessages()
- .flatMap((message) => list(data.store.part?.[message.id], emptyParts))
- .flatMap((part) => {
- if (partState(part, showReasoningSummaries()) !== "visible") return []
- if (part.type === "text") return ["text" as const]
- return ["other" as const]
- })
- .at(-1),
- )
- const reasoningHeading = createMemo(() =>
- assistantMessages()
- .flatMap((message) => list(data.store.part?.[message.id], emptyParts))
- .filter((part): part is PartType & { type: "reasoning"; text: string } => part.type === "reasoning")
- .map((part) => heading(part.text))
- .filter((text): text is string => !!text)
- .at(-1),
- )
+ const assistantDerived = createMemo(() => {
+ let visible = 0
+ let tail: "text" | "other" | undefined
+ let reason: string | undefined
+ const show = showReasoningSummaries()
+ for (const message of assistantMessages()) {
+ for (const part of list(data.store.part?.[message.id], emptyParts)) {
+ if (partState(part, show) === "visible") {
+ visible++
+ tail = part.type === "text" ? "text" : "other"
+ }
+ if (part.type === "reasoning" && part.text) {
+ const h = heading(part.text)
+ if (h) reason = h
+ }
+ }
+ }
+ return { visible, tail, reason }
+ })
+ const assistantVisible = createMemo(() => assistantDerived().visible)
+ const assistantTailVisible = createMemo(() => assistantDerived().tail)
+ const reasoningHeading = createMemo(() => assistantDerived().reason)
const showThinking = createMemo(() => {
if (!working() || !!error()) return false
if (queued()) return false // kilocode_change
diff --git a/packages/ui/src/font-loader.ts b/packages/ui/src/font-loader.ts
new file mode 100644
index 0000000000..f2b1e6be13
--- /dev/null
+++ b/packages/ui/src/font-loader.ts
@@ -0,0 +1,133 @@
+type MonoFont = {
+ id: string
+ family: string
+ regular: string
+ bold: string
+}
+
+let files: Record Promise> | undefined
+
+function getFiles() {
+ if (files) return files
+ files = import.meta.glob("./assets/fonts/*.woff2", { import: "default" }) as Record Promise>
+ return files
+}
+
+export const MONO_NERD_FONTS = [
+ {
+ id: "jetbrains-mono",
+ family: "JetBrains Mono Nerd Font",
+ regular: "./assets/fonts/jetbrains-mono-nerd-font.woff2",
+ bold: "./assets/fonts/jetbrains-mono-nerd-font-bold.woff2",
+ },
+ {
+ id: "fira-code",
+ family: "Fira Code Nerd Font",
+ regular: "./assets/fonts/fira-code-nerd-font.woff2",
+ bold: "./assets/fonts/fira-code-nerd-font-bold.woff2",
+ },
+ {
+ id: "cascadia-code",
+ family: "Cascadia Code Nerd Font",
+ regular: "./assets/fonts/cascadia-code-nerd-font.woff2",
+ bold: "./assets/fonts/cascadia-code-nerd-font-bold.woff2",
+ },
+ {
+ id: "hack",
+ family: "Hack Nerd Font",
+ regular: "./assets/fonts/hack-nerd-font.woff2",
+ bold: "./assets/fonts/hack-nerd-font-bold.woff2",
+ },
+ {
+ id: "source-code-pro",
+ family: "Source Code Pro Nerd Font",
+ regular: "./assets/fonts/source-code-pro-nerd-font.woff2",
+ bold: "./assets/fonts/source-code-pro-nerd-font-bold.woff2",
+ },
+ {
+ id: "inconsolata",
+ family: "Inconsolata Nerd Font",
+ regular: "./assets/fonts/inconsolata-nerd-font.woff2",
+ bold: "./assets/fonts/inconsolata-nerd-font-bold.woff2",
+ },
+ {
+ id: "roboto-mono",
+ family: "Roboto Mono Nerd Font",
+ regular: "./assets/fonts/roboto-mono-nerd-font.woff2",
+ bold: "./assets/fonts/roboto-mono-nerd-font-bold.woff2",
+ },
+ {
+ id: "ubuntu-mono",
+ family: "Ubuntu Mono Nerd Font",
+ regular: "./assets/fonts/ubuntu-mono-nerd-font.woff2",
+ bold: "./assets/fonts/ubuntu-mono-nerd-font-bold.woff2",
+ },
+ {
+ id: "intel-one-mono",
+ family: "Intel One Mono Nerd Font",
+ regular: "./assets/fonts/intel-one-mono-nerd-font.woff2",
+ bold: "./assets/fonts/intel-one-mono-nerd-font-bold.woff2",
+ },
+ {
+ id: "meslo-lgs",
+ family: "Meslo LGS Nerd Font",
+ regular: "./assets/fonts/meslo-lgs-nerd-font.woff2",
+ bold: "./assets/fonts/meslo-lgs-nerd-font-bold.woff2",
+ },
+ {
+ id: "iosevka",
+ family: "Iosevka Nerd Font",
+ regular: "./assets/fonts/iosevka-nerd-font.woff2",
+ bold: "./assets/fonts/iosevka-nerd-font-bold.woff2",
+ },
+ {
+ id: "geist-mono",
+ family: "GeistMono Nerd Font",
+ regular: "./assets/fonts/GeistMonoNerdFontMono-Regular.woff2",
+ bold: "./assets/fonts/GeistMonoNerdFontMono-Bold.woff2",
+ },
+] satisfies MonoFont[]
+
+const mono = Object.fromEntries(MONO_NERD_FONTS.map((font) => [font.id, font])) as Record
+const loads = new Map>()
+
+function css(font: { family: string; regular: string; bold: string }) {
+ return `
+ @font-face {
+ font-family: "${font.family}";
+ src: url("${font.regular}") format("woff2");
+ font-display: swap;
+ font-style: normal;
+ font-weight: 400;
+ }
+ @font-face {
+ font-family: "${font.family}";
+ src: url("${font.bold}") format("woff2");
+ font-display: swap;
+ font-style: normal;
+ font-weight: 700;
+ }
+ `
+}
+
+export function ensureMonoFont(id: string | undefined) {
+ if (!id || id === "ibm-plex-mono") return Promise.resolve()
+ if (typeof document !== "object") return Promise.resolve()
+ const font = mono[id]
+ if (!font) return Promise.resolve()
+ const styleId = `oc-font-${font.id}`
+ if (document.getElementById(styleId)) return Promise.resolve()
+ const hit = loads.get(font.id)
+ if (hit) return hit
+ const files = getFiles()
+ const load = Promise.all([files[font.regular]?.(), files[font.bold]?.()]).then(([regular, bold]) => {
+ if (!regular || !bold) return
+ if (document.getElementById(styleId)) return
+ const style = document.createElement("style")
+ style.id = styleId
+ style.textContent = css({ family: font.family, regular, bold })
+ document.head.appendChild(style)
+ })
+ loads.set(font.id, load)
+ return load
+}
diff --git a/packages/ui/src/theme/context.tsx b/packages/ui/src/theme/context.tsx
index 9808c8e841..7d25ac3972 100644
--- a/packages/ui/src/theme/context.tsx
+++ b/packages/ui/src/theme/context.tsx
@@ -1,7 +1,7 @@
import { createEffect, onCleanup, onMount } from "solid-js"
import { createStore } from "solid-js/store"
import { createSimpleContext } from "../context/helper"
-import { DEFAULT_THEMES } from "./default-themes"
+import oc2ThemeJson from "./themes/oc-2.json"
import { resolveThemeVariant, themeToCss } from "./resolve"
import type { DesktopTheme } from "./types"
@@ -15,14 +15,101 @@ const STORAGE_KEYS = {
} as const
const THEME_STYLE_ID = "oc-theme"
+let files: Record Promise<{ default: DesktopTheme }>> | undefined
+let ids: string[] | undefined
+let known: Set | undefined
+
+function getFiles() {
+ if (files) return files
+ files = import.meta.glob<{ default: DesktopTheme }>("./themes/*.json")
+ return files
+}
+
+function themeIDs() {
+ if (ids) return ids
+ ids = Object.keys(getFiles())
+ .map((path) => path.slice("./themes/".length, -".json".length))
+ .sort()
+ return ids
+}
+
+function knownThemes() {
+ if (known) return known
+ known = new Set(themeIDs())
+ return known
+}
+
+const names: Record = {
+ "oc-2": "OC-2",
+ amoled: "AMOLED",
+ aura: "Aura",
+ ayu: "Ayu",
+ carbonfox: "Carbonfox",
+ catppuccin: "Catppuccin",
+ "catppuccin-frappe": "Catppuccin Frappe",
+ "catppuccin-macchiato": "Catppuccin Macchiato",
+ cobalt2: "Cobalt2",
+ cursor: "Cursor",
+ dracula: "Dracula",
+ everforest: "Everforest",
+ flexoki: "Flexoki",
+ github: "GitHub",
+ gruvbox: "Gruvbox",
+ kanagawa: "Kanagawa",
+ "lucent-orng": "Lucent Orng",
+ material: "Material",
+ matrix: "Matrix",
+ mercury: "Mercury",
+ monokai: "Monokai",
+ nightowl: "Night Owl",
+ nord: "Nord",
+ "one-dark": "One Dark",
+ onedarkpro: "One Dark Pro",
+ opencode: "OpenCode",
+ orng: "Orng",
+ "osaka-jade": "Osaka Jade",
+ palenight: "Palenight",
+ rosepine: "Rose Pine",
+ shadesofpurple: "Shades of Purple",
+ solarized: "Solarized",
+ synthwave84: "Synthwave '84",
+ tokyonight: "Tokyonight",
+ vercel: "Vercel",
+ vesper: "Vesper",
+ zenburn: "Zenburn",
+}
+const oc2Theme = oc2ThemeJson as DesktopTheme
function normalize(id: string | null | undefined) {
return id === "oc-1" ? "oc-2" : id
}
+function read(key: string) {
+ if (typeof localStorage !== "object") return null
+ try {
+ return localStorage.getItem(key)
+ } catch {
+ return null
+ }
+}
+
+function write(key: string, value: string) {
+ if (typeof localStorage !== "object") return
+ try {
+ localStorage.setItem(key, value)
+ } catch {}
+}
+
+function drop(key: string) {
+ if (typeof localStorage !== "object") return
+ try {
+ localStorage.removeItem(key)
+ } catch {}
+}
+
function clear() {
- localStorage.removeItem(STORAGE_KEYS.THEME_CSS_LIGHT)
- localStorage.removeItem(STORAGE_KEYS.THEME_CSS_DARK)
+ drop(STORAGE_KEYS.THEME_CSS_LIGHT)
+ drop(STORAGE_KEYS.THEME_CSS_DARK)
}
function ensureThemeStyleElement(): HTMLStyleElement {
@@ -35,6 +122,7 @@ function ensureThemeStyleElement(): HTMLStyleElement {
}
function getSystemMode(): "light" | "dark" {
+ if (typeof window !== "object") return "light"
return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"
}
@@ -45,9 +133,7 @@ function applyThemeCss(theme: DesktopTheme, themeId: string, mode: "light" | "da
const css = themeToCss(tokens)
if (themeId !== "oc-2") {
- try {
- localStorage.setItem(isDark ? STORAGE_KEYS.THEME_CSS_DARK : STORAGE_KEYS.THEME_CSS_LIGHT, css)
- } catch {}
+ write(isDark ? STORAGE_KEYS.THEME_CSS_DARK : STORAGE_KEYS.THEME_CSS_LIGHT, css)
}
const fullCss = `:root {
@@ -69,74 +155,122 @@ function cacheThemeVariants(theme: DesktopTheme, themeId: string) {
const variant = isDark ? theme.dark : theme.light
const tokens = resolveThemeVariant(variant, isDark)
const css = themeToCss(tokens)
- try {
- localStorage.setItem(isDark ? STORAGE_KEYS.THEME_CSS_DARK : STORAGE_KEYS.THEME_CSS_LIGHT, css)
- } catch {}
+ write(isDark ? STORAGE_KEYS.THEME_CSS_DARK : STORAGE_KEYS.THEME_CSS_LIGHT, css)
}
}
export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
name: "Theme",
init: (props: { defaultTheme?: string; onThemeApplied?: (theme: DesktopTheme, mode: "light" | "dark") => void }) => {
+ const themeId = normalize(read(STORAGE_KEYS.THEME_ID) ?? props.defaultTheme) ?? "oc-2"
+ const colorScheme = (read(STORAGE_KEYS.COLOR_SCHEME) as ColorScheme | null) ?? "system"
+ const mode = colorScheme === "system" ? getSystemMode() : colorScheme
const [store, setStore] = createStore({
- themes: DEFAULT_THEMES as Record,
- themeId: normalize(props.defaultTheme) ?? "oc-2",
- colorScheme: "system" as ColorScheme,
- mode: getSystemMode(),
+ themes: {
+ "oc-2": oc2Theme,
+ } as Record,
+ themeId,
+ colorScheme,
+ mode,
previewThemeId: null as string | null,
previewScheme: null as ColorScheme | null,
})
- window.addEventListener("storage", (e) => {
- if (e.key === STORAGE_KEYS.THEME_ID && e.newValue) setStore("themeId", e.newValue)
- if (e.key === STORAGE_KEYS.COLOR_SCHEME && e.newValue) {
- setStore("colorScheme", e.newValue as ColorScheme)
- setStore("mode", e.newValue === "system" ? getSystemMode() : (e.newValue as any))
- }
- })
+ const loads = new Map>()
- onMount(() => {
- const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)")
- const handler = () => {
- if (store.colorScheme === "system") {
- setStore("mode", getSystemMode())
- }
- }
- mediaQuery.addEventListener("change", handler)
- onCleanup(() => mediaQuery.removeEventListener("change", handler))
-
- const savedTheme = localStorage.getItem(STORAGE_KEYS.THEME_ID)
- const themeId = normalize(savedTheme)
- const savedScheme = localStorage.getItem(STORAGE_KEYS.COLOR_SCHEME) as ColorScheme | null
- if (themeId && store.themes[themeId]) {
- setStore("themeId", themeId)
- }
- if (savedTheme && themeId && savedTheme !== themeId) {
- localStorage.setItem(STORAGE_KEYS.THEME_ID, themeId)
- clear()
- }
- if (savedScheme) {
- setStore("colorScheme", savedScheme)
- if (savedScheme !== "system") {
- setStore("mode", savedScheme)
- }
- }
- const currentTheme = store.themes[store.themeId]
- if (currentTheme) {
- cacheThemeVariants(currentTheme, store.themeId)
- }
- })
+ const load = (id: string) => {
+ const next = normalize(id)
+ if (!next) return Promise.resolve(undefined)
+ const hit = store.themes[next]
+ if (hit) return Promise.resolve(hit)
+ const pending = loads.get(next)
+ if (pending) return pending
+ const file = getFiles()[`./themes/${next}.json`]
+ if (!file) return Promise.resolve(undefined)
+ const task = file()
+ .then((mod) => {
+ const theme = mod.default
+ setStore("themes", next, theme)
+ return theme
+ })
+ .finally(() => {
+ loads.delete(next)
+ })
+ loads.set(next, task)
+ return task
+ }
const applyTheme = (theme: DesktopTheme, themeId: string, mode: "light" | "dark") => {
applyThemeCss(theme, themeId, mode)
props.onThemeApplied?.(theme, mode)
}
+ const ids = () => {
+ const extra = Object.keys(store.themes)
+ .filter((id) => !knownThemes().has(id))
+ .sort()
+ const all = themeIDs()
+ if (extra.length === 0) return all
+ return [...all, ...extra]
+ }
+
+ const loadThemes = () => Promise.all(themeIDs().map(load)).then(() => store.themes)
+
+ const onStorage = (e: StorageEvent) => {
+ if (e.key === STORAGE_KEYS.THEME_ID && e.newValue) {
+ const next = normalize(e.newValue)
+ if (!next) return
+ if (next !== "oc-2" && !knownThemes().has(next) && !store.themes[next]) return
+ setStore("themeId", next)
+ if (next === "oc-2") {
+ clear()
+ return
+ }
+ void load(next).then((theme) => {
+ if (!theme || store.themeId !== next) return
+ cacheThemeVariants(theme, next)
+ })
+ }
+ if (e.key === STORAGE_KEYS.COLOR_SCHEME && e.newValue) {
+ setStore("colorScheme", e.newValue as ColorScheme)
+ setStore("mode", e.newValue === "system" ? getSystemMode() : (e.newValue as "light" | "dark"))
+ }
+ }
+
+ if (typeof window === "object") {
+ window.addEventListener("storage", onStorage)
+ onCleanup(() => window.removeEventListener("storage", onStorage))
+ }
+
+ onMount(() => {
+ const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)")
+ const onMedia = () => {
+ if (store.colorScheme !== "system") return
+ setStore("mode", getSystemMode())
+ }
+ mediaQuery.addEventListener("change", onMedia)
+ onCleanup(() => mediaQuery.removeEventListener("change", onMedia))
+
+ const rawTheme = read(STORAGE_KEYS.THEME_ID)
+ const savedTheme = normalize(rawTheme ?? props.defaultTheme) ?? "oc-2"
+ const savedScheme = (read(STORAGE_KEYS.COLOR_SCHEME) as ColorScheme | null) ?? "system"
+ if (rawTheme && rawTheme !== savedTheme) {
+ write(STORAGE_KEYS.THEME_ID, savedTheme)
+ clear()
+ }
+ if (savedTheme !== store.themeId) setStore("themeId", savedTheme)
+ if (savedScheme !== store.colorScheme) setStore("colorScheme", savedScheme)
+ setStore("mode", savedScheme === "system" ? getSystemMode() : savedScheme)
+ void load(savedTheme).then((theme) => {
+ if (!theme || store.themeId !== savedTheme) return
+ cacheThemeVariants(theme, savedTheme)
+ })
+ })
+
createEffect(() => {
const theme = store.themes[store.themeId]
- if (theme) {
- applyTheme(theme, store.themeId, store.mode)
- }
+ if (!theme) return
+ applyTheme(theme, store.themeId, store.mode)
})
const setTheme = (id: string) => {
@@ -145,23 +279,26 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
console.warn(`Theme "${id}" not found`)
return
}
- const theme = store.themes[next]
- if (!theme) {
+ if (next !== "oc-2" && !knownThemes().has(next) && !store.themes[next]) {
console.warn(`Theme "${id}" not found`)
return
}
setStore("themeId", next)
- localStorage.setItem(STORAGE_KEYS.THEME_ID, next)
if (next === "oc-2") {
+ write(STORAGE_KEYS.THEME_ID, next)
clear()
return
}
- cacheThemeVariants(theme, next)
+ void load(next).then((theme) => {
+ if (!theme || store.themeId !== next) return
+ cacheThemeVariants(theme, next)
+ write(STORAGE_KEYS.THEME_ID, next)
+ })
}
const setColorScheme = (scheme: ColorScheme) => {
setStore("colorScheme", scheme)
- localStorage.setItem(STORAGE_KEYS.COLOR_SCHEME, scheme)
+ write(STORAGE_KEYS.COLOR_SCHEME, scheme)
setStore("mode", scheme === "system" ? getSystemMode() : scheme)
}
@@ -169,6 +306,9 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
themeId: () => store.themeId,
colorScheme: () => store.colorScheme,
mode: () => store.mode,
+ ids,
+ name: (id: string) => store.themes[id]?.name ?? names[id] ?? id,
+ loadThemes,
themes: () => store.themes,
setTheme,
setColorScheme,
@@ -176,24 +316,28 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
previewTheme: (id: string) => {
const next = normalize(id)
if (!next) return
- const theme = store.themes[next]
- if (!theme) return
+ if (next !== "oc-2" && !knownThemes().has(next) && !store.themes[next]) return
setStore("previewThemeId", next)
- const previewMode = store.previewScheme
- ? store.previewScheme === "system"
- ? getSystemMode()
- : store.previewScheme
- : store.mode
- applyTheme(theme, next, previewMode)
+ void load(next).then((theme) => {
+ if (!theme || store.previewThemeId !== next) return
+ const mode = store.previewScheme
+ ? store.previewScheme === "system"
+ ? getSystemMode()
+ : store.previewScheme
+ : store.mode
+ applyTheme(theme, next, mode)
+ })
},
previewColorScheme: (scheme: ColorScheme) => {
setStore("previewScheme", scheme)
- const previewMode = scheme === "system" ? getSystemMode() : scheme
+ const mode = scheme === "system" ? getSystemMode() : scheme
const id = store.previewThemeId ?? store.themeId
- const theme = store.themes[id]
- if (theme) {
- applyTheme(theme, id, previewMode)
- }
+ void load(id).then((theme) => {
+ if (!theme) return
+ if ((store.previewThemeId ?? store.themeId) !== id) return
+ if (store.previewScheme !== scheme) return
+ applyTheme(theme, id, mode)
+ })
},
commitPreview: () => {
if (store.previewThemeId) {
@@ -208,10 +352,10 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
cancelPreview: () => {
setStore("previewThemeId", null)
setStore("previewScheme", null)
- const theme = store.themes[store.themeId]
- if (theme) {
+ void load(store.themeId).then((theme) => {
+ if (!theme) return
applyTheme(theme, store.themeId, store.mode)
- }
+ })
},
}
},
diff --git a/upstream-merge-report-1.3.1.md b/upstream-merge-report-1.3.1.md
new file mode 100644
index 0000000000..d4f5bad364
--- /dev/null
+++ b/upstream-merge-report-1.3.1.md
@@ -0,0 +1,973 @@
+# Upstream Merge Conflict Report
+
+Generated: 2026-04-11T14:25:12.736Z
+
+## Summary
+
+- **Upstream Version**: 1.3.1
+- **Upstream Commit**: `ec64ceab`
+- **Base Branch**: main
+- **Merge Branch**: catrielmuller/kilo-opencode-v1.3.1
+- **Total Files Changed**: 463
+
+## Files by Recommendation
+
+### Skip (Auto-Remove)
+
+- `.github/workflows/deploy.yml` (config)
+ - File should be skipped (does not exist in Kilo fork)
+- `.github/workflows/vouch-manage-by-issue.yml` (config)
+ - File should be skipped (does not exist in Kilo fork)
+- `README.zh.md` (markdown)
+ - File should be skipped (does not exist in Kilo fork)
+- `README.zht.md` (markdown)
+ - File should be skipped (does not exist in Kilo fork)
+- `packages/console/core/sst-env.d.ts` (code)
+ - File should be skipped (does not exist in Kilo fork)
+- `packages/console/function/sst-env.d.ts` (code)
+ - File should be skipped (does not exist in Kilo fork)
+- `packages/console/resource/sst-env.d.ts` (code)
+ - File should be skipped (does not exist in Kilo fork)
+- `packages/enterprise/sst-env.d.ts` (code)
+ - File should be skipped (does not exist in Kilo fork)
+- `packages/function/sst-env.d.ts` (code)
+ - File should be skipped (does not exist in Kilo fork)
+- `sst-env.d.ts` (code)
+ - File should be skipped (does not exist in Kilo fork)
+
+### i18n Transform (Auto-Apply Kilo Branding)
+
+- `packages/app/src/i18n/ar.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/br.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/bs.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/da.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/de.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/en.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/es.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/fr.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/ja.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/ko.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/no.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/pl.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/ru.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/th.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/tr.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/zh.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+- `packages/app/src/i18n/zht.ts` (i18n)
+ - i18n file: take upstream translations and apply Kilo branding
+
+### Take Upstream + Kilo Branding (Auto)
+
+- `packages/app/e2e/app/home.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/app/palette.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/prompt/prompt-history.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/prompt/prompt-multiline.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/prompt/prompt-slash-terminal.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/session/session-model-persistence.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/session/session-review.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/settings/settings-keybinds.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/sidebar/sidebar-popover-actions.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/terminal/terminal-init.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/e2e/terminal/terminal-tabs.spec.ts` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/dialog-custom-provider.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/dialog-edit-project.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/dialog-select-mcp.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/dialog-select-server.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/session/session-context-tab.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/session/session-header.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/session/session-sortable-terminal-tab.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/settings-general.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/status-popover.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/terminal.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/components/titlebar.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/command.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/global-sync.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/local.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/notification.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/platform.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/prompt.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/settings.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/sync.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/context/terminal.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/directory-layout.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/error.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/home.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/layout.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/layout/sidebar-items.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/layout/sidebar-project.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/layout/sidebar-workspace.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/session/file-tabs.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/session/message-timeline.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/session/session-side-panel.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/session/terminal-panel.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/app/src/pages/session/use-session-commands.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/ui/src/components/font.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/ui/src/components/hover-card.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/ui/src/components/line-comment.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+- `packages/ui/src/theme/context.tsx` (code)
+ - Branding-only file: take upstream and apply Kilo branding transforms
+
+### Package.json Transform (Auto)
+
+- `package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/app/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/console/app/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/console/core/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/console/function/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/console/mail/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/desktop-electron/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/desktop/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/enterprise/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/function/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/opencode/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/plugin/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/sdk/js/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/slack/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/ui/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/util/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `packages/web/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+- `sdks/vscode/package.json` (package)
+ - Package.json: take upstream, transform names, inject Kilo deps, preserve version
+
+### Script Transform (Auto)
+
+- `packages/console/core/script/lookup-user.ts` (script)
+ - Script file: take upstream and transform GitHub references
+- `packages/opencode/script/build-node.ts` (script)
+ - Script file: take upstream and transform GitHub references
+
+### Extension Transform (Auto)
+
+- `packages/extensions/zed/extension.toml` (extension)
+ - Extension file: take upstream and apply Kilo branding
+
+### Web/Docs Transform (Auto)
+
+- `packages/web/src/content/docs/agents.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ar/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ar/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ar/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/bs/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/bs/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/bs/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/config.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/da/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/da/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/da/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/de/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/de/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/de/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/es/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/es/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/es/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/fr/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/fr/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/fr/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/it/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/it/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/it/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/it/zen.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ja/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ja/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ja/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ko/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ko/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ko/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/nb/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/nb/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/nb/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/pl/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/pl/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/pl/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/pt-br/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/pt-br/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/pt-br/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ru/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ru/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/ru/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/th/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/th/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/th/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/tr/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/tr/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/tr/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zen.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zh-cn/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zh-cn/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zh-cn/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zh-tw/cli.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zh-tw/go.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+- `packages/web/src/content/docs/zh-tw/providers.mdx` (web)
+ - Web/docs file: take upstream and apply Kilo branding
+
+### Keep Kilo Version (Ours)
+
+- `.opencode/agent/translator.md` (markdown)
+ - Markdown files are typically Kilo-specific documentation
+- `.opencode/command/changelog.md` (markdown)
+ - Markdown files are typically Kilo-specific documentation
+- `packages/app/e2e/AGENTS.md` (markdown)
+ - File is Kilo-specific and should not be overwritten
+- `packages/opencode/AGENTS.md` (markdown)
+ - File is Kilo-specific and should not be overwritten
+- `packages/opencode/specs/effect-migration.md` (markdown)
+ - Markdown files are typically Kilo-specific documentation
+- `packages/sdk/openapi.json` (config)
+ - File is Kilo-specific and should not be overwritten
+
+### Manual Review Required
+
+- `.github/VOUCHED.td` (other)
+ - File needs manual review
+- `.github/actions/setup-bun/action.yml` (config)
+ - Config files may have Kilo-specific settings
+- `.github/workflows/nix-hashes.yml` (config)
+ - Config files may have Kilo-specific settings
+- `.github/workflows/test.yml` (config)
+ - Config files may have Kilo-specific settings
+- `.opencode/.gitignore` (other)
+ - File needs manual review
+- `.opencode/tool/github-pr-search.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `.opencode/tool/github-pr-search.txt` (other)
+ - File needs manual review
+- `.opencode/tool/github-triage.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `.opencode/tool/github-triage.txt` (other)
+ - File needs manual review
+- `bun.lock` (other)
+ - File needs manual review
+- `flake.lock` (other)
+ - File needs manual review
+- `infra/console.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `nix/hashes.json` (config)
+ - Config files may have Kilo-specific settings
+- `packages/app/e2e/actions.ts` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/e2e/fixtures.ts` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/e2e/projects/projects-switch.spec.ts` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/e2e/projects/workspace-new-session.spec.ts` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/e2e/projects/workspaces.spec.ts` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/src/app.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/dialog-connect-provider.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/src/components/dialog-custom-provider-form.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/dialog-custom-provider.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/prompt-input.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/src/components/prompt-input/attachments.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/prompt-input/build-request-parts.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/prompt-input/files.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/prompt-input/history.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/components/prompt-input/history.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/constants/file-picker.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/context/command-keybind.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/context/global-sync/bootstrap.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/context/global-sync/child-store.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/context/global-sync/event-reducer.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/context/language.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/src/context/terminal-title.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/entry.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/hooks/use-providers.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/pages/layout/helpers.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/pages/layout/helpers.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/pages/session.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/src/pages/session/composer/session-question-dock.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/app/src/pages/session/helpers.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/pages/session/helpers.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/pages/session/use-session-hash-scroll.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/testing/prompt.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/testing/terminal.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/utils/persist.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/utils/prompt.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/utils/server-health.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/src/utils/sound.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/app/vite.js` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/component/icon.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/component/modal.css` (other)
+ - File needs manual review
+- `packages/console/app/src/i18n/ar.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/br.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/da.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/de.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/en.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/es.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/fr.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/it.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/ja.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/ko.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/no.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/pl.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/ru.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/th.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/tr.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/zh.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/i18n/zht.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/lib/salesforce.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/api/enterprise.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/enterprise/index.css` (other)
+ - File needs manual review
+- `packages/console/app/src/routes/enterprise/index.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/feishu.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/go/index.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/stripe/webhook.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/workspace/[id]/billing/billing-section.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/workspace/[id]/billing/payment-section.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/workspace/[id]/go/lite-section.module.css` (other)
+ - File needs manual review
+- `packages/console/app/src/routes/workspace/[id]/go/lite-section.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/workspace/[id]/model-section.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/handler.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/provider/anthropic.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/provider/google.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/provider/openai-compatible.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/provider/openai.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/provider/provider.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/app/src/routes/zen/util/trialLimiter.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/core/src/billing.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/core/src/lite.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/core/src/model.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/console/core/src/schema/billing.sql.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/containers/bun-node/Dockerfile` (other)
+ - File needs manual review
+- `packages/desktop-electron/src/main/cli.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/desktop-electron/src/main/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/desktop-electron/src/main/ipc.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/desktop-electron/src/preload/types.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/desktop-electron/src/renderer/index.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/desktop-electron/src/renderer/updater.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/desktop/src/index.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/git` (other)
+ - File needs manual review
+- `packages/opencode/parsers-config.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/script/build.ts` (script)
+ - Script file has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/opencode/script/seed-e2e.ts` (script)
+ - Script file has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/opencode/src/account/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/account/repo.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/account/schema.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/account/service.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/agent/agent.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/auth/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/auth/service.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/bus/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/account.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/debug/agent.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/models.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/pr.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/providers.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/run.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/app.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/component/dialog-provider.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/component/prompt/part.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/context/exit.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/context/theme.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/routes/session/index.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/ui/dialog-confirm.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/ui/dialog.tsx` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/util/editor.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/tui/worker.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/cmd/upgrade.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/cli/upgrade.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/command/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/config/config.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/control-plane/workspace.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/effect/cross-spawn-spawner.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/effect/instance-context.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/effect/instance-registry.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/effect/instance-state.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/effect/run-service.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/effect/runtime.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/file/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/file/time.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/file/watcher.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/filesystem/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/flag/flag.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/format/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/global/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/ide/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/installation/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/lsp/client.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/lsp/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/lsp/launch.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/lsp/server.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/mcp/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/node.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/permission/evaluate.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/permission/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/permission/next.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/permission/service.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/plugin/codex.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/plugin/copilot.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/plugin/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/project/bootstrap.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/project/instance.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/project/project.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/project/vcs.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/provider/auth-service.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/provider/auth.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/provider/error.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/provider/provider.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/provider/schema.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/provider/transform.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/pty/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/question/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/question/service.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/scheduler/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/event.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/global.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/permission.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/project.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/provider.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/pty.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/routes/session.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/server/server.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/compaction.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/llm.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/message-v2.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/processor.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/prompt.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/prompt/anthropic-20250930.txt` (other)
+ - File needs manual review
+- `packages/opencode/src/session/prompt/codex.txt` (other)
+ - File needs manual review
+- `packages/opencode/src/session/prompt/default.txt` (other)
+ - File needs manual review
+- `packages/opencode/src/session/session.sql.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/status.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/summary.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/session/system.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/share/share-next.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/skill/discovery.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/skill/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/skill/skill.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/snapshot/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/storage/db.bun.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/storage/db.node.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/storage/db.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/bash.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/edit.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/read.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/registry.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/task.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/tool.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/truncate.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/truncation-dir.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/truncation.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/tool/write.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/util/effect-zod.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/util/eventloop.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/util/fn.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/util/instance-state.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/util/process.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/src/util/which.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/account/repo.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/account/service.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/agent/agent.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/cli/account.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/cli/cmd/tui/prompt-part.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/config/config.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/effect/cross-spawn-spawner.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/effect/instance-state.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/effect/run-service.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/file/index.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/file/time.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/file/watcher.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/filesystem/filesystem.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/fixture/effect.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/fixture/instance.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/format/format.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/installation/installation.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/lib/effect.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/lib/filesystem.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/lsp/launch.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/permission-task.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/permission/next.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/plugin/auth-override.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/preload.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/project/project.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/project/vcs.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/provider/amazon-bedrock.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/provider/auth.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/provider/gitlab-duo.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/provider/provider.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/provider/transform.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/pty/pty-session.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/question/question.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/scheduler.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/server/project-init-git.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/server/session-messages.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/session/llm.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/session/message-v2.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/session/prompt.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/session/system.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/share/share-next.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/skill/discovery.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/skill/skill.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/snapshot/snapshot.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/storage/db.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/bash.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/edit.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/external-directory.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/fixtures/models-api.json` (config)
+ - Config files may have Kilo-specific settings
+- `packages/opencode/test/tool/read.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/registry.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/skill.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/task.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/truncation.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/tool/write.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/util/instance-state.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/opencode/test/util/process.test.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/plugin/src/index.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/sdk/js/src/v2/gen/sdk.gen.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/sdk/js/src/v2/gen/types.gen.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/storybook/.storybook/mocks/app/context/language.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/ui/src/assets/icons/provider/alibaba-coding-plan-cn.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/alibaba-coding-plan.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/clarifai.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/dinference.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/drun.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/perplexity-agent.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/tencent-coding-plan.svg` (other)
+ - File needs manual review
+- `packages/ui/src/assets/icons/provider/zenmux.svg` (other)
+ - File needs manual review
+- `packages/ui/src/components/basic-tool.css` (other)
+ - File needs manual review
+- `packages/ui/src/components/basic-tool.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/ui/src/components/line-comment-styles.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/ui/src/components/message-part.css` (other)
+ - File needs manual review
+- `packages/ui/src/components/session-turn.tsx` (code)
+ - File has kilocode_change markers — auto-transform skipped, needs manual review
+- `packages/ui/src/font-loader.ts` (code)
+ - Code files need manual review for kilocode_change markers
+- `packages/ui/src/theme/themes/oc-2.json` (config)
+ - Config files may have Kilo-specific settings
+- `patches/@ai-sdk%2Fxai@2.0.51.patch` (other)
+ - File needs manual review
+- `patches/solid-js@1.9.10.patch` (other)
+ - File needs manual review
+
+## Recommendations
+
+- 10 files will be skipped (auto-removed)
+- 17 i18n files will be auto-transformed
+- 6 files will keep Kilo's version
+- 304 files require manual review