vrr/opencode
2
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-08-04 19:49:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

chore: merge dev

Browse source
This commit is contained in:
Dax Raad 2026-06-04 10:17:17 -04:00
commit d525663171
28 changed files with 3763 additions and 3070 deletions
Download patch file Download diff file Expand all files Collapse all files

28
packages/cli/bin/lildax.cjs
View file

@ -88,8 +88,17 @@ const names = (() => {
return false
}
})()
if (musl) return arch === "x64" ? (baseline ? [`${base}-baseline-musl`, `${base}-musl`, `${base}-baseline`, base] : [`${base}-musl`, `${base}-baseline-musl`, base, `${base}-baseline`]) : [`${base}-musl`, base]
return arch === "x64" ? (baseline ? [`${base}-baseline`, base, `${base}-baseline-musl`, `${base}-musl`] : [base, `${base}-baseline`, `${base}-musl`, `${base}-baseline-musl`]) : [base, `${base}-musl`]
if (musl)
return arch === "x64"
? baseline
? [`${base}-baseline-musl`, `${base}-musl`, `${base}-baseline`, base]
: [`${base}-musl`, `${base}-baseline-musl`, base, `${base}-baseline`]
: [`${base}-musl`, base]
return arch === "x64"
? baseline
? [`${base}-baseline`, base, `${base}-baseline-musl`, `${base}-musl`]
: [base, `${base}-baseline`, `${base}-musl`, `${base}-baseline-musl`]
: [base, `${base}-musl`]
}
return arch === "x64" ? (baseline ? [`${base}-baseline`, base] : [base, `${base}-baseline`]) : [base]
})()
@ -98,10 +107,11 @@ function findBinary(startDir) {
let current = startDir
for (;;) {
const modules = path.join(current, "node_modules")
if (fs.existsSync(modules)) for (const name of names) {
const candidate = path.join(modules, name, "bin", binary)
if (fs.existsSync(candidate)) return candidate
}
if (fs.existsSync(modules))
for (const name of names) {
const candidate = path.join(modules, name, "bin", binary)
if (fs.existsSync(candidate)) return candidate
}
const parent = path.dirname(current)
if (parent === current) return
current = parent
@ -110,7 +120,11 @@ function findBinary(startDir) {
const resolved = envPath || (fs.existsSync(cached) ? cached : findBinary(scriptDir))
if (!resolved) {
console.error("It seems that your package manager failed to install the right lildax CLI package. Try manually installing " + names.map((name) => `"${name}"`).join(" or ") + " package")
console.error(
"It seems that your package manager failed to install the right lildax CLI package. Try manually installing " +
names.map((name) => `"${name}"`).join(" or ") +
" package",
)
process.exit(1)
}
run(resolved)

6
packages/cli/script/publish.ts
View file

@ -44,5 +44,9 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
),
)
await Promise.all(Object.entries(binaries).map(([name, version]) => publish(`./dist/${name.replace("@opencode-ai/", "")}`, name, version)))
await Promise.all(
Object.entries(binaries).map(([name, version]) =>
publish(`./dist/${name.replace("@opencode-ai/", "")}`, name, version),
),
)
await publish(`./dist/${pkg.name}`, pkg.name, version)

4
packages/cli/src/framework/runtime.ts
View file

@ -11,7 +11,9 @@ export type Input<Value> =
: never
type RuntimeHandler = (input: unknown) => Effect.Effect<void, unknown, Daemon.Service>
type Loader<Node extends Spec.Any> = () => Promise<{ default: (input: Input<Node>) => Effect.Effect<void, any, Daemon.Service> }>
type Loader<Node extends Spec.Any> = () => Promise<{
default: (input: Input<Node>) => Effect.Effect<void, any, Daemon.Service>
}>
type ProvidedCommand = Command.Command<string, unknown, unknown, unknown, Daemon.Service>
export type Handlers<Node extends Spec.Any> = keyof Node["commands"] extends never

8
packages/cli/src/services/daemon.ts
View file

@ -125,11 +125,9 @@ export const layer = Layer.effect(
const register = Effect.fn("cli.daemon.register")(function* (address: HttpServer.Address) {
const temp = file + ".tmp"
yield* fs.makeDirectory(directory, { recursive: true })
yield* fs.writeFileString(
temp,
JSON.stringify({ url: HttpServer.formatAddress(address), pid: process.pid }),
{ mode: 0o600 },
)
yield* fs.writeFileString(temp, JSON.stringify({ url: HttpServer.formatAddress(address), pid: process.pid }), {
mode: 0o600,
})
yield* fs.rename(temp, file)
// The metadata file represents this live listener, not persistent config.
// Scope shutdown removes it when the server exits normally.

1
packages/core/migration/20260603040000_session_message_projection_order/migration.sql
View file

@ -1,3 +1,4 @@
DELETE FROM `session_message`;--> statement-breakpoint
ALTER TABLE `session_message` ADD `seq` integer NOT NULL;--> statement-breakpoint
DROP INDEX IF EXISTS `session_message_session_time_created_id_idx`;--> statement-breakpoint
DROP INDEX IF EXISTS `session_message_session_type_time_created_id_idx`;--> statement-breakpoint

14
packages/core/src/config/plugin/command.ts
View file

@ -19,12 +19,14 @@ export const Plugin = PluginV2.define({
const config = yield* Config.Service
const fs = yield* FSUtil.Service
const transform = yield* command.transform()
const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
if (entry.type === "document") return Effect.succeed([{ commands: entry.info.commands }])
return loadDirectory(fs, entry.path).pipe(
Effect.map((commands) => [{ commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) }]),
)
}).pipe(Effect.map((documents) => documents.flat()))
const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
if (entry.type === "document") return Effect.succeed([{ commands: entry.info.commands }])
return loadDirectory(fs, entry.path).pipe(
Effect.map((commands) => [
{ commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) },
]),
)
}).pipe(Effect.map((documents) => documents.flat()))
yield* transform((editor) => {
for (const document of documents) {

8
packages/core/src/config/plugin/skill.ts
View file

@ -23,8 +23,12 @@ export const Plugin = PluginV2.define({
yield* transform((editor) => {
for (const directory of directories) {
editor.source(new SkillV2.DirectorySource({ type: "directory", path: AbsolutePath.make(path.join(directory, "skill")) }))
editor.source(new SkillV2.DirectorySource({ type: "directory", path: AbsolutePath.make(path.join(directory, "skills")) }))
editor.source(
new SkillV2.DirectorySource({ type: "directory", path: AbsolutePath.make(path.join(directory, "skill")) }),
)
editor.source(
new SkillV2.DirectorySource({ type: "directory", path: AbsolutePath.make(path.join(directory, "skills")) }),
)
}
for (const item of items) {
if (URL.canParse(item) && /^(https?:)$/.test(new URL(item).protocol)) {

14
packages/core/src/database/migration/20260603040000_session_message_projection_order.ts
View file

@ -5,16 +5,10 @@ export default {
id: "20260603040000_session_message_projection_order",
up(tx) {
return Effect.gen(function* () {
yield* tx.run(`ALTER TABLE \`session_message\` ADD COLUMN \`seq\` integer NOT NULL DEFAULT 0;`)
yield* tx.run(
`UPDATE \`session_message\` SET \`seq\` = COALESCE((SELECT \`seq\` + 1 FROM \`event\` WHERE \`event\`.\`id\` = \`session_message\`.\`id\`), 0);`,
)
const unmatched = yield* tx.get<{ count: number }>(
`SELECT COUNT(*) AS \`count\` FROM \`session_message\` WHERE \`seq\` = 0;`,
)
if ((unmatched?.count ?? 0) > 0)
return yield* Effect.die("Cannot migrate session_message projections without matching durable events")
yield* tx.run(`UPDATE \`session_message\` SET \`seq\` = \`seq\` - 1;`)
// Pre-launch Session projections were written before durable event persistence
// became unconditional, so they cannot be assigned truthful aggregate order.
yield* tx.run(`DELETE FROM \`session_message\`;`)
yield* tx.run(`ALTER TABLE \`session_message\` ADD COLUMN \`seq\` integer NOT NULL;`)
yield* tx.run(`DROP INDEX IF EXISTS \`session_message_session_type_time_created_id_idx\`;`)
yield* tx.run(`CREATE INDEX \`session_message_session_seq_idx\` ON \`session_message\` (\`session_id\`,\`seq\`);`)
yield* tx.run(

4
packages/core/src/plugin/skill.ts
View file

@ -10,7 +10,9 @@ export const Plugin = PluginV2.define({
effect: Effect.gen(function* () {
const skill = yield* SkillV2.Service
const transform = yield* skill.transform()
const content = yield* Effect.promise(() => Bun.file(new URL("./skill/customize-opencode.md", import.meta.url)).text())
const content = yield* Effect.promise(() =>
Bun.file(new URL("./skill/customize-opencode.md", import.meta.url)).text(),
)
yield* transform((editor) => {
editor.source(

6
packages/core/src/skill.ts
View file

@ -37,7 +37,11 @@ export const Source = Schema.Union([DirectorySource, UrlSource, EmbeddedSource])
return false
},
key: (source: DirectorySource | UrlSource | EmbeddedSource) =>
source.type === "directory" ? `directory:${source.path}` : source.type === "url" ? `url:${source.url}` : `embedded:${source.skill.name}`,
source.type === "directory"
? `directory:${source.path}`
: source.type === "url"
? `url:${source.url}`
: `embedded:${source.skill.name}`,
})),
)
export type Source = typeof Source.Type

59
packages/core/test/database-migration.test.ts
View file

@ -79,13 +79,20 @@ describe("DatabaseMigration", () => {
)
})
test("backfills projected Session message order from durable event sequence", async () => {
test("resets incompatible projected Session messages before adding sequence order", async () => {
await run(
Effect.gen(function* () {
const db = yield* makeDb
yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY)`)
yield* db.run(
sql`CREATE TABLE message (id text PRIMARY KEY, session_id text NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
)
yield* db.run(
sql`CREATE TABLE part (id text PRIMARY KEY, message_id text NOT NULL, session_id text NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
)
yield* db.run(sql`CREATE TABLE event (id text PRIMARY KEY, seq integer NOT NULL)`)
yield* db.run(
sql`CREATE TABLE session_message (id text PRIMARY KEY, session_id text NOT NULL, type text NOT NULL, time_created integer NOT NULL, data text NOT NULL)`,
sql`CREATE TABLE session_message (id text PRIMARY KEY, session_id text NOT NULL, type text NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
)
yield* db.run(
sql`CREATE INDEX session_message_session_time_created_id_idx ON session_message (session_id, time_created, id)`,
@ -93,40 +100,40 @@ describe("DatabaseMigration", () => {
yield* db.run(
sql`CREATE INDEX session_message_session_type_time_created_id_idx ON session_message (session_id, type, time_created, id)`,
)
yield* db.run(sql`INSERT INTO event (id, seq) VALUES ('evt_z', 0), ('evt_a', 1)`)
yield* db.run(sql`INSERT INTO session (id) VALUES ('session')`)
yield* db.run(
sql`INSERT INTO session_message (id, session_id, type, time_created, data) VALUES ('evt_z', 'session', 'user', 0, '{}'), ('evt_a', 'session', 'user', 0, '{}')`,
sql`INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES ('legacy_message', 'session', 1, 1, '{"role":"user"}')`,
)
yield* db.run(
sql`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES ('legacy_part', 'legacy_message', 'session', 1, 1, '{"type":"text","text":"hello"}')`,
)
yield* db.run(
sql`INSERT INTO session_message (id, session_id, type, time_created, time_updated, data) VALUES ('stale_projection', 'session', 'user', 1, 1, '{}')`,
)
yield* DatabaseMigration.applyOnly(db, [sessionMessageProjectionOrderMigration])
expect(yield* db.all(sql`SELECT id, seq FROM session_message ORDER BY seq`)).toEqual([
{ id: "evt_z", seq: 0 },
{ id: "evt_a", seq: 1 },
expect(yield* db.all(sql`SELECT id, session_id, data FROM message`)).toEqual([
{ id: "legacy_message", session_id: "session", data: '{"role":"user"}' },
])
expect(yield* db.all(sql`SELECT id, message_id, session_id, data FROM part`)).toEqual([
{
id: "legacy_part",
message_id: "legacy_message",
session_id: "session",
data: '{"type":"text","text":"hello"}',
},
])
expect(yield* db.all(sql`SELECT id FROM session_message`)).toEqual([])
yield* db.run(
sql`INSERT INTO session_message (id, session_id, type, seq, time_created, time_updated, data) VALUES ('fresh_projection', 'session', 'user', 7, 2, 2, '{}')`,
)
expect(yield* db.get(sql`SELECT id, seq FROM session_message`)).toEqual({ id: "fresh_projection", seq: 7 })
}),
)
})
test("fails projected Session message order backfill without a durable event", async () => {
await expect(
run(
Effect.gen(function* () {
const db = yield* makeDb
yield* db.run(sql`CREATE TABLE event (id text PRIMARY KEY, seq integer NOT NULL)`)
yield* db.run(
sql`CREATE TABLE session_message (id text PRIMARY KEY, session_id text NOT NULL, type text NOT NULL, time_created integer NOT NULL, data text NOT NULL)`,
)
yield* db.run(
sql`INSERT INTO session_message (id, session_id, type, time_created, data) VALUES ('evt_missing', 'session', 'user', 0, '{}')`,
)
yield* DatabaseMigration.applyOnly(db, [sessionMessageProjectionOrderMigration])
}),
),
).rejects.toThrow("Cannot migrate session_message projections without matching durable events")
})
test("runs session usage backfill in order with schema changes", async () => {
await run(
Effect.gen(function* () {

10
packages/core/test/plugin/command.test.ts
View file

@ -12,10 +12,7 @@ const project = AbsolutePath.make("/repo")
const it = testEffect(
CommandV2.locationLayer.pipe(
Layer.provide(
Layer.succeed(
Location.Service,
Location.Service.of(location({ directory }, { projectDirectory: project })),
),
Layer.succeed(Location.Service, Location.Service.of(location({ directory }, { projectDirectory: project }))),
),
),
)
@ -26,7 +23,10 @@ describe("CommandPlugin.Plugin", () => {
const command = yield* CommandV2.Service
yield* CommandPlugin.Plugin.effect.pipe(
Effect.provideService(CommandV2.Service, command),
Effect.provideService(Location.Service, Location.Service.of(location({ directory }, { projectDirectory: project }))),
Effect.provideService(
Location.Service,
Location.Service.of(location({ directory }, { projectDirectory: project })),
),
)
expect(yield* command.get("init")).toMatchObject({

25
packages/opencode/src/acp/event.ts
View file

@ -12,6 +12,7 @@ import type {
import { Effect } from "effect"
import { ACPSession } from "./session"
import { ACPPermission } from "./permission"
import { partsToContentChunks, type ReplayPart } from "./content"
import {
duplicateRunningToolUpdate,
errorToolUpdate,
@ -87,7 +88,31 @@ export class Subscription {
await this.recordFetchedPart(message.info.sessionID, message, part)
if (part.type === "tool") {
await this.handleToolPart(message.info.sessionID, part)
continue
}
await this.replayContentPart(message, part)
}
}
private async replayContentPart(message: SessionMessageResponse, part: Part) {
if (part.type !== "text" && part.type !== "file" && part.type !== "reasoning") return
const sessionUpdate =
part.type === "reasoning"
? "agent_thought_chunk"
: message.info.role === "user"
? "user_message_chunk"
: "agent_message_chunk"
for (const chunk of partsToContentChunks([part as ReplayPart])) {
await this.input.connection.sessionUpdate({
sessionId: message.info.sessionID,
update: {
sessionUpdate,
messageId: message.info.id,
...chunk,
},
})
}
}

59
packages/opencode/src/cli/cmd/tui/feature-plugins/session/dialog.tsx
View file

@ -8,7 +8,8 @@ import { useSDK } from "@tui/context/sdk"
import { useLocal } from "@tui/context/local"
import { useToast } from "@tui/ui/toast"
import { useCommandShortcut } from "@tui/keymap"
import { createEffect, createMemo, createResource, createSignal, on, onMount, untrack } from "solid-js"
import { createEffect, createMemo, createResource, createSignal, on, Show, untrack } from "solid-js"
import { useTerminalDimensions } from "@opentui/solid"
import { Spinner } from "@tui/component/spinner"
import { DialogSessionRename } from "@tui/component/dialog-session-rename"
import { DialogSessionDeleteFailed } from "@tui/component/dialog-session-delete-failed"
@ -31,6 +32,7 @@ export function SessionSwitcherDialog() {
const sdk = useSDK()
const local = useLocal()
const toast = useToast()
const dimensions = useTerminalDimensions()
const [toDelete, setToDelete] = createSignal<string>()
const [search, setSearch] = createDebouncedSignal("", 150)
const deleteHint = useCommandShortcut("session.delete")
@ -151,11 +153,6 @@ export function SessionSwitcherDialog() {
if (!first || !last) return undefined
return quickSwitchRange(first, last)
})
const quickSwitchFooterHints = createMemo(() => {
const hint = quickSwitchHint()
return hint && local.session.slots().length > 0 ? [{ title: "switch", label: hint }] : []
})
const options = createMemo<DialogSelectOption<string>[]>(() => {
const today = new Date().toDateString()
const sessionMap = new Map(
@ -183,10 +180,18 @@ export function SessionSwitcherDialog() {
const status = sync.data.session_status?.[x.id]
const isWorking = status?.type === "busy" || status?.type === "retry"
const slot = slotByID.get(x.id)
const gutter = isWorking
? () => <Spinner />
: slot !== undefined
? () => <text fg={theme.accent}>{slot}</text>
const gutter =
slot !== undefined || isWorking
? () => (
<box flexDirection="row" gap={1}>
<Show when={slot !== undefined}>
<text fg={theme.accent}>{slot}</text>
</Show>
<Show when={isWorking}>
<Spinner />
</Show>
</box>
)
: undefined
const titleText = isDeleting ? `Press ${deleteHint()} again to confirm` : isWorktree ? `⎇ ${x.title}` : x.title
return {
@ -194,6 +199,17 @@ export function SessionSwitcherDialog() {
bg: isDeleting ? theme.error : undefined,
value: x.id,
category,
categoryView:
category === "Pinned" ? (
<text>
<span style={{ fg: theme.accent }}>
<b>Pinned</b>
</span>
<Show when={quickSwitchHint()}>
{(hint) => <span style={{ fg: theme.textMuted }}> · switch {hint()}</span>}
</Show>
</text>
) : undefined,
footer,
gutter,
}
@ -224,8 +240,11 @@ export function SessionSwitcherDialog() {
}),
)
onMount(() => {
dialog.setSize("xlarge")
const showPreview = createMemo(() => dimensions().width >= 100)
const height = createMemo(() => Math.max(8, Math.floor(dimensions().height / 2) - 4))
createEffect(() => {
dialog.setSize(showPreview() ? "xlarge" : "large")
})
const list = (
@ -253,6 +272,7 @@ export function SessionSwitcherDialog() {
title: "pin/unpin",
onTrigger: (option: { value: string }) => {
local.session.togglePin(option.value)
queueMicrotask(() => select?.moveTo(option.value))
},
},
{
@ -311,19 +331,20 @@ export function SessionSwitcherDialog() {
},
},
]}
footerHints={quickSwitchFooterHints()}
/>
)
return (
<box flexDirection="row" width="100%">
<box flexBasis={68} flexShrink={0}>
<box flexDirection="row" width="100%" height={height()}>
<box flexBasis={showPreview() ? 68 : undefined} flexGrow={showPreview() ? 0 : 1} flexShrink={0}>
{list}
</box>
<box width={1} flexShrink={0} border={["left"]} borderColor={theme.borderSubtle} />
<box flexGrow={1} flexShrink={1} flexDirection="column">
<SessionPreviewPane sessionID={focusedSession} session={focusedSessionInfo} />
</box>
<Show when={showPreview()}>
<box width={1} height={height() - 1} flexShrink={0} border={["left"]} borderColor={theme.borderSubtle} />
<box flexGrow={1} flexShrink={1} flexDirection="column">
<SessionPreviewPane sessionID={focusedSession} session={focusedSessionInfo} />
</box>
</Show>
</box>
)
}

126
packages/opencode/src/cli/cmd/tui/feature-plugins/session/preview-pane.tsx
View file

@ -1,14 +1,14 @@
import { createResource, Show, createMemo, createSignal, onMount, type Accessor, type JSX } from "solid-js"
import { TextAttributes, type RGBA } from "@opentui/core"
import { TextAttributes } from "@opentui/core"
import { useTerminalDimensions } from "@opentui/solid"
import { debounce, leadingAndTrailing } from "@solid-primitives/scheduled"
import type { Message, Part, Session as SdkSession, SnapshotFileDiff } from "@opencode-ai/sdk/v2"
import type { Message, Part, Session as SdkSession } from "@opencode-ai/sdk/v2"
import { useTheme } from "@tui/context/theme"
import { useSDK } from "@tui/context/sdk"
import { useSync } from "@tui/context/sync"
import { Locale } from "@/util/locale"
import { Spinner } from "@tui/component/spinner"
import { extractMessageMarkdown, extractMessageText, formatDiffSummary, relativeTime, shortModelLabel } from "./util"
import { extractMessageMarkdown, extractMessageText, relativeTime } from "./util"
type WithParts = { info: Message; parts: Part[] }
@ -16,7 +16,6 @@ type Sdk = ReturnType<typeof useSDK>
type Sync = ReturnType<typeof useSync>
const messageCache = new Map<string, Promise<WithParts[]>>()
const diffCache = new Map<string, Promise<SnapshotFileDiff[]>>()
function cacheKey(sessionID: string, version: number) {
return `${sessionID}:${version}`
@ -36,41 +35,21 @@ function loadMessages(sdk: Sdk, sessionID: string, version: number): Promise<Wit
const promise = sdk.client.session
.messages({ sessionID, limit: 50 })
.then((res) => {
if (res.error) messageCache.delete(key)
if (res.error) throw res.error
return (res.data as WithParts[] | undefined) ?? []
})
.catch(() => {
.catch((error) => {
messageCache.delete(key)
return [] as WithParts[]
throw error
})
messageCache.set(key, promise)
return promise
}
function loadDiff(sdk: Sdk, sessionID: string, version: number): Promise<SnapshotFileDiff[]> {
const key = cacheKey(sessionID, version)
const cached = diffCache.get(key)
if (cached) return cached
const promise = sdk.client.session
.diff({ sessionID })
.then((res) => {
if (res.error) diffCache.delete(key)
return (res.data as SnapshotFileDiff[] | undefined) ?? []
})
.catch(() => {
diffCache.delete(key)
return [] as SnapshotFileDiff[]
})
diffCache.set(key, promise)
return promise
}
export function prefetchPreviews(sdk: Sdk, sync: Sync, sessionIDs: readonly string[]) {
for (const id of sessionIDs) {
const version = sync.data.session.find((session) => session.id === id)?.time.updated ?? 0
if (!hydrateFromSync(sync, id)) loadMessages(sdk, id, version).catch(() => {})
if (!sync.data.session_diff[id]?.length) loadDiff(sdk, id, version).catch(() => {})
}
}
@ -121,13 +100,6 @@ export function SessionPreviewPane(props: {
return hydrateFromSync(sync, id)
})
const syncedDiff = createMemo(() => {
const id = props.sessionID()
if (!id) return undefined
const diff = sync.data.session_diff[id]
return diff && diff.length > 0 ? (diff as SnapshotFileDiff[]) : undefined
})
const [fetchedMessages] = createResource(
() => {
const id = props.sessionID()
@ -137,31 +109,7 @@ export function SessionPreviewPane(props: {
async (input) => loadMessages(sdk, input.sessionID, input.version),
)
const [fetchedDiff] = createResource(
() => {
const id = props.sessionID()
if (!id || syncedDiff()) return undefined
return { sessionID: id, version: session()?.time.updated ?? 0 }
},
async (input) => loadDiff(sdk, input.sessionID, input.version),
)
const messages = createMemo(() => syncedMessages() ?? fetchedMessages() ?? [])
const diff = createMemo(() => syncedDiff() ?? fetchedDiff() ?? [])
const diffSummary = createMemo(() => {
const live = diff()
if (live && live.length > 0) {
let additions = 0
let deletions = 0
for (const file of live) {
additions += file.additions ?? 0
deletions += file.deletions ?? 0
}
return formatDiffSummary({ additions, deletions, files: live.length })
}
return formatDiffSummary(session()?.summary)
})
const exchange = createMemo(() => {
const items = messages()
@ -174,13 +122,13 @@ export function SessionPreviewPane(props: {
return { user, assistant }
})
const loading = createMemo(() => (fetchedMessages.loading || fetchedDiff.loading) && !exchange())
const loading = createMemo(() => fetchedMessages.loading && !exchange())
const statusLabel = createMemo(() => {
const s = status()
if (s === "busy") return { text: "working", color: theme.warning }
if (s === "retry") return { text: "retrying", color: theme.warning }
return { text: "idle", color: theme.textMuted }
if (s === "busy") return "working"
if (s === "retry") return "retrying"
return "idle"
})
return (
@ -191,7 +139,7 @@ export function SessionPreviewPane(props: {
paddingTop={1}
paddingBottom={1}
gap={1}
maxHeight={maxHeight()}
height={maxHeight()}
overflow="hidden"
>
<Show
@ -204,7 +152,7 @@ export function SessionPreviewPane(props: {
>
{(s) => (
<>
<Header session={s()} statusLabel={statusLabel()} diff={diffSummary()} />
<Header session={s()} statusLabel={statusLabel()} />
<Show when={loading()}>
<Spinner>loading preview...</Spinner>
</Show>
@ -213,7 +161,7 @@ export function SessionPreviewPane(props: {
fallback={
<Show when={!loading()}>
<text fg={theme.textMuted} wrapMode="word">
No messages yet
{fetchedMessages.error ? "Preview unavailable" : "No messages yet"}
</text>
</Show>
}
@ -241,24 +189,12 @@ function messageParentID(item: WithParts) {
const ROW_WIDTH = 40
function Header(props: {
session: SdkSession
statusLabel: { text: string; color: RGBA }
diff: { additions: number; deletions: number; files: number } | undefined
}) {
function Header(props: { session: SdkSession; statusLabel: string }) {
const { theme } = useTheme()
const title = createMemo(() => Locale.truncate(props.session.title, ROW_WIDTH))
const modelAgent = createMemo(() => {
const m = shortModelLabel(props.session.model)
const a = props.session.agent ?? ""
if (m && a) return Locale.truncate(`${m} · ${a}`, ROW_WIDTH)
if (m) return Locale.truncate(m, ROW_WIDTH)
if (a) return Locale.truncate(a, ROW_WIDTH)
return ""
})
const statusRest = createMemo(() => {
const joined = ` · ${relativeTime(props.session.time.updated)}`
return Locale.truncate(joined, Math.max(0, ROW_WIDTH - props.statusLabel.text.length))
return Locale.truncate(joined, Math.max(0, ROW_WIDTH - props.statusLabel.length))
})
return (
@ -268,20 +204,12 @@ function Header(props: {
{title()}
</text>
</Row>
<Show when={modelAgent()}>
<Row height={1}>
<text fg={theme.text} wrapMode="none" overflow="hidden">
{modelAgent()}
</text>
</Row>
</Show>
<Row height={1}>
<text fg={theme.textMuted} wrapMode="none" overflow="hidden">
<span style={{ fg: props.statusLabel.color }}>{props.statusLabel.text}</span>
<span>{props.statusLabel}</span>
<span>{statusRest()}</span>
</text>
</Row>
<Show when={props.diff}>{(d) => <DiffRow diff={d()} />}</Show>
</box>
)
}
@ -294,28 +222,6 @@ function Row(props: { height: number; children: JSX.Element }) {
)
}
function DiffRow(props: { diff: { additions: number; deletions: number; files: number } }) {
const { theme } = useTheme()
const showAdds = () => props.diff.additions > 0
const showDels = () => props.diff.deletions > 0
if (!showAdds() && !showDels()) return null
return (
<Row height={1}>
<text wrapMode="none" overflow="hidden">
<Show when={showAdds()}>
<span style={{ fg: theme.diffAdded }}>+{props.diff.additions}</span>
</Show>
<Show when={showAdds() && showDels()}>
<span> </span>
</Show>
<Show when={showDels()}>
<span style={{ fg: theme.diffRemoved }}>−{props.diff.deletions}</span>
</Show>
</text>
</Row>
)
}
const PROMPT_MAX_CHARS = 240
const REPLY_MAX_LINES = 12
const REPLY_MAX_CHARS = 800

16
packages/opencode/src/cli/cmd/tui/feature-plugins/session/util.tsx
View file

@ -52,19 +52,3 @@ function collectTextParts(parts: readonly Part[]): string[] {
}
return chunks
}
export function formatDiffSummary(
summary: { additions: number; deletions: number; files: number } | undefined,
): { additions: number; deletions: number; files: number } | undefined {
if (!summary) return undefined
if (!summary.additions && !summary.deletions && !summary.files) return undefined
return summary
}
export function shortModelLabel(model: { id: string; providerID?: string; variant?: string } | undefined): string {
if (!model) return ""
const id = model.id ?? ""
const stripped =
model.providerID && id.startsWith(`${model.providerID}/`) ? id.slice(model.providerID.length + 1) : id
return model.variant ? `${stripped} (${model.variant})` : stripped
}

7
packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
View file

@ -66,6 +66,7 @@ export type DialogSelectRef<T> = {
filter: string
filtered: DialogSelectOption<T>[]
selected: DialogSelectOption<T> | undefined
moveTo(value: T): void
}
export function DialogSelect<T>(props: DialogSelectProps<T>) {
@ -341,6 +342,10 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
get selected() {
return selected()
},
moveTo(value) {
const index = flat().findIndex((option) => isDeepEqual(option.value, value))
if (index >= 0) moveTo(index, true)
},
}
props.ref?.(ref)
@ -551,7 +556,7 @@ function Option(props: {
●
</text>
</Show>
<Show when={!props.current && props.gutter}>
<Show when={props.gutter}>
<box flexShrink={0} marginRight={0}>
{props.gutter?.()}
</box>

10
packages/opencode/src/provider/provider.ts
View file

@ -1017,20 +1017,14 @@ export type Error = ModelNotFoundError | InitError | NoProvidersError | NoModels
export interface Interface {
readonly list: () => Effect.Effect<Record<ProviderV2.ID, Info>>
readonly getProvider: (providerID: ProviderV2.ID) => Effect.Effect<Info>
readonly getModel: (
providerID: ProviderV2.ID,
modelID: ModelV2.ID,
) => Effect.Effect<Model, ModelNotFoundError>
readonly getModel: (providerID: ProviderV2.ID, modelID: ModelV2.ID) => Effect.Effect<Model, ModelNotFoundError>
readonly getLanguage: (model: Model) => Effect.Effect<LanguageModelV3, ModelNotFoundError>
readonly closest: (
providerID: ProviderV2.ID,
query: string[],
) => Effect.Effect<{ providerID: ProviderV2.ID; modelID: string } | undefined>
readonly getSmallModel: (providerID: ProviderV2.ID) => Effect.Effect<Model | undefined>
readonly defaultModel: () => Effect.Effect<
{ providerID: ProviderV2.ID; modelID: ModelV2.ID },
DefaultModelError
>
readonly defaultModel: () => Effect.Effect<{ providerID: ProviderV2.ID; modelID: ModelV2.ID }, DefaultModelError>
}
interface State {

10
packages/opencode/src/server/routes/instance/httpapi/server.ts
View file

@ -192,7 +192,15 @@ type RouteRequirements =
export function createRoutes(
corsOptions?: CorsOptions,
): Layer.Layer<never, EffectConfig.ConfigError, RouteRequirements> {
return Layer.mergeAll(rootApiRoutes, eventApiRoutes, ptyConnectApiRoutes, instanceRoutes, v2Routes, docRoute, uiRoute).pipe(
return Layer.mergeAll(
rootApiRoutes,
eventApiRoutes,
ptyConnectApiRoutes,
instanceRoutes,
v2Routes,
docRoute,
uiRoute,
).pipe(
Layer.provide([
errorLayer,
compressionLayer,

47
packages/opencode/src/session/session.ts
View file

@ -574,10 +574,7 @@ export const layer: Layer.Layer<
}
log.info("created", result)
yield* events.publish(
SessionV1.Event.Created,
{ sessionID: result.id, info: result },
)
yield* events.publish(SessionV1.Event.Created, { sessionID: result.id, info: result })
return result
})
@ -664,10 +661,7 @@ export const layer: Layer.Layer<
yield* remove(child.id)
}
yield* events.publish(
SessionV1.Event.Deleted,
{ sessionID, info: session },
)
yield* events.publish(SessionV1.Event.Deleted, { sessionID, info: session })
yield* events.remove(sessionID)
} catch (e) {
log.error(e)
@ -682,14 +676,11 @@ export const layer: Layer.Layer<
const updatePart = <T extends SessionV1.Part>(part: T): Effect.Effect<T> =>
Effect.gen(function* () {
yield* events.publish(
SessionV1.Event.PartUpdated,
{
sessionID: part.sessionID,
part: structuredClone(part),
time: Date.now(),
},
)
yield* events.publish(SessionV1.Event.PartUpdated, {
sessionID: part.sessionID,
part: structuredClone(part),
time: Date.now(),
})
return part
}).pipe(Effect.withSpan("Session.updatePart"))
@ -892,13 +883,10 @@ export const layer: Layer.Layer<
sessionID: SessionID
messageID: MessageID
}) {
yield* events.publish(
SessionV1.Event.MessageRemoved,
{
sessionID: input.sessionID,
messageID: input.messageID,
},
)
yield* events.publish(SessionV1.Event.MessageRemoved, {
sessionID: input.sessionID,
messageID: input.messageID,
})
return input.messageID
})
@ -907,14 +895,11 @@ export const layer: Layer.Layer<
messageID: MessageID
partID: PartID
}) {
yield* events.publish(
SessionV1.Event.PartRemoved,
{
sessionID: input.sessionID,
messageID: input.messageID,
partID: input.partID,
},
)
yield* events.publish(SessionV1.Event.PartRemoved, {
sessionID: input.sessionID,
messageID: input.messageID,
partID: input.partID,
})
return input.partID
})

40
packages/opencode/test/acp/service-session.test.ts
View file

@ -316,6 +316,46 @@ describe("ACP service sessions", () => {
expect(result.configOptions?.find((option) => option.id === "mode")?.currentValue).toBe("plan")
})
it("replays loaded session transcript chunks", async () => {
const { service, updates } = makeService([
{
info: { id: "msg_user", sessionID: "ses_loaded", role: "user" },
parts: [{ id: "part_user", sessionID: "ses_loaded", messageID: "msg_user", type: "text", text: "hello" }],
},
{
info: { id: "msg_assistant", sessionID: "ses_loaded", role: "assistant" },
parts: [
{
id: "part_assistant",
sessionID: "ses_loaded",
messageID: "msg_assistant",
type: "text",
text: "hi there",
},
],
},
])
await Effect.runPromise(service.loadSession({ cwd: "/workspace", sessionId: "ses_loaded", mcpServers: [] }))
expect(
updates
.map((item) => item.update)
.filter((item) => item.sessionUpdate === "user_message_chunk" || item.sessionUpdate === "agent_message_chunk"),
).toEqual([
{
sessionUpdate: "user_message_chunk",
messageId: "msg_user",
content: { type: "text", text: "hello" },
},
{
sessionUpdate: "agent_message_chunk",
messageId: "msg_assistant",
content: { type: "text", text: "hi there" },
},
])
})
it("lists sessions sorted by updated time with cursor support", async () => {
const { service } = makeService()
const first = await Effect.runPromise(service.listSessions({ cwd: "/workspace" }))

10
packages/opencode/test/provider/provider.test.ts
View file

@ -980,14 +980,8 @@ it.instance(
it.instance("getModel returns consistent results", () =>
Effect.gen(function* () {
yield* set("ANTHROPIC_API_KEY", "test-api-key")
const model1 = yield* Provider.use.getModel(
ProviderV2.ID.anthropic,
ModelV2.ID.make("claude-sonnet-4-20250514"),
)
const model2 = yield* Provider.use.getModel(
ProviderV2.ID.anthropic,
ModelV2.ID.make("claude-sonnet-4-20250514"),
)
const model1 = yield* Provider.use.getModel(ProviderV2.ID.anthropic, ModelV2.ID.make("claude-sonnet-4-20250514"))
const model2 = yield* Provider.use.getModel(ProviderV2.ID.anthropic, ModelV2.ID.make("claude-sonnet-4-20250514"))
expect(model1.providerID).toEqual(model2.providerID)
expect(model1.id).toEqual(model2.id)
expect(model1).toEqual(model2)

5
packages/opencode/test/server/httpapi-v2-location.test.ts
View file

@ -57,7 +57,10 @@ describe("v2 location HttpApi", () => {
for (const route of ["/api/command", "/api/skill"]) {
const response = await request(route, tmp.path)
expect(response.status).toBe(200)
const body = (await response.json()) as { location: { directory: string; project: { id: string } }; data: unknown }
const body = (await response.json()) as {
location: { directory: string; project: { id: string } }
data: unknown
}
expect(body.data).toBeArray()
expect(body.location.directory).toBe(tmp.path)
expect(body.location.project.id).toBeTruthy()

5
packages/opencode/test/session/llm.test.ts
View file

@ -1671,10 +1671,7 @@ describe("session.llm.stream", () => {
]
const request = waitRequest("/messages", createEventResponse(chunks))
const resolved = yield* Provider.use.getModel(
ProviderV2.ID.make("anthropic"),
ModelV2.ID.make(model.id),
)
const resolved = yield* Provider.use.getModel(ProviderV2.ID.make("anthropic"), ModelV2.ID.make(model.id))
const sessionID = SessionID.make("session-test-anthropic-tools")
const agent = {
name: "test",

6261
packages/sdk/openapi.json
View file

File diff suppressed because it is too large Load diff

14
packages/server/src/handlers/v2/event.ts
View file

@ -34,13 +34,15 @@ export const eventHandlers = HttpApiBuilder.group(V2Api, "v2.event", (handlers)
return HttpServerResponse.stream(
Stream.make(connected).pipe(
Stream.concat(
events.all().pipe(
Stream.filter(
(event) =>
event.location?.directory === location.directory &&
event.location.workspaceID === location.workspaceID,
events
.all()
.pipe(
Stream.filter(
(event) =>
event.location?.directory === location.directory &&
event.location.workspaceID === location.workspaceID,
),
),
),
),
Stream.map(eventData),
Stream.pipeThroughChannel(Sse.encode()),

31
packages/server/src/routes.ts
View file

@ -14,23 +14,24 @@ import { schemaErrorLayer } from "./middleware/schema-error"
export function createRoutes(password?: string) {
return HttpApiBuilder.layer(V2Api).pipe(
Layer.provide(v2Handlers),
Layer.provide(v2AuthorizationLayer),
Layer.provide(schemaErrorLayer),
Layer.provide(
password
? ServerAuth.Config.layer({ username: "opencode", password: Option.some(password) })
: ServerAuth.Config.defaultLayer,
),
Layer.provide(LocationServiceMap.layer),
Layer.provide(PermissionSaved.layer),
Layer.provide(SessionV2.defaultLayer),
Layer.provide(Database.defaultLayer),
Layer.provide(EventV2.defaultLayer),
Layer.provide(FetchHttpClient.layer),
Layer.provide(v2Handlers),
Layer.provide(v2AuthorizationLayer),
Layer.provide(schemaErrorLayer),
Layer.provide(
password
? ServerAuth.Config.layer({ username: "opencode", password: Option.some(password) })
: ServerAuth.Config.defaultLayer,
),
Layer.provide(LocationServiceMap.layer),
Layer.provide(PermissionSaved.layer),
Layer.provide(SessionV2.defaultLayer),
Layer.provide(Database.defaultLayer),
Layer.provide(EventV2.defaultLayer),
Layer.provide(FetchHttpClient.layer),
)
}
export const routes = createRoutes()
export const webHandler = () => HttpRouter.toWebHandler(routes.pipe(Layer.provide(HttpServer.layerServices)), { disableLogger: true })
export const webHandler = () =>
HttpRouter.toWebHandler(routes.pipe(Layer.provide(HttpServer.layerServices)), { disableLogger: true })

5
specs/v2/schema-changelog.md
View file

@ -103,7 +103,7 @@ Affected schema:
Change:
- Add and backfill `session_message.seq` from matching synchronized events.
- Reset pre-launch Session-message projections and add `session_message.seq` for newly projected synchronized events.
- Add event aggregate-sequence and aggregate-type-sequence indexes.
- Add Session-message sequence, type-sequence, and compatibility timestamp indexes.
@ -114,7 +114,8 @@ Reason:
Compatibility:
- Migration fails rather than inventing chronology if an existing projected Session message has no matching durable event.
- Pre-launch Session-message projections are disposable because historical versions could write them without durable creator events.
- The migration resets those projections rather than inventing chronology or blocking startup.
- The timestamp compatibility index remains for legacy or transitional query shapes.
### Structured Tool Registry And Canonical Output