From 9c6f1edfd7cae5c7cefa8af14e124c0547186c6b Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Thu, 26 Mar 2026 21:46:38 -0400 Subject: [PATCH 001/142] refactor(effect): yield services instead of promise facades (#19325) --- packages/opencode/specs/effect-migration.md | 31 +-- packages/opencode/src/agent/agent.ts | 19 +- packages/opencode/src/command/index.ts | 28 ++- packages/opencode/src/config/config.ts | 25 +- .../src/effect/cross-spawn-spawner.ts | 5 +- packages/opencode/src/file/watcher.ts | 8 +- packages/opencode/src/format/index.ts | 8 +- packages/opencode/src/installation/index.ts | 5 +- packages/opencode/src/lsp/index.ts | 8 +- packages/opencode/src/mcp/index.ts | 23 +- packages/opencode/src/project/project.ts | 19 +- packages/opencode/src/pty/index.ts | 2 +- packages/opencode/src/snapshot/index.ts | 97 ++++---- packages/opencode/src/worktree/index.ts | 29 +-- packages/opencode/test/config/config.test.ts | 217 ++++++++---------- .../test/effect/cross-spawn-spawner.test.ts | 2 +- packages/opencode/test/file/watcher.test.ts | 2 + packages/opencode/test/format/format.test.ts | 3 +- .../opencode/test/project/project.test.ts | 2 +- 19 files changed, 283 insertions(+), 250 deletions(-) diff --git a/packages/opencode/specs/effect-migration.md b/packages/opencode/specs/effect-migration.md index 176190437c..f4acc6e52e 100644 --- a/packages/opencode/specs/effect-migration.md +++ b/packages/opencode/specs/effect-migration.md @@ -8,8 +8,8 @@ Use `InstanceState` (from `src/effect/instance-state.ts`) for services that need Use `makeRuntime` (from `src/effect/run-service.ts`) to create a per-service `ManagedRuntime` that lazily initializes and shares layers via a global `memoMap`. Returns `{ runPromise, runFork, runCallback }`. -- Global services (no per-directory state): Account, Auth, Installation, Truncate -- Instance-scoped (per-directory state via InstanceState): File, FileTime, FileWatcher, Format, Permission, Question, Skill, Snapshot, Vcs, ProviderAuth +- Global services (no per-directory state): Account, Auth, AppFileSystem, Installation, Truncate, Worktree +- Instance-scoped (per-directory state via InstanceState): Agent, Bus, Command, Config, File, FileTime, FileWatcher, Format, LSP, MCP, Permission, Plugin, ProviderAuth, Pty, Question, SessionStatus, Skill, Snapshot, ToolRegistry, Vcs Rule of thumb: if two open directories should not share one copy of the service, it needs `InstanceState`. @@ -181,36 +181,39 @@ That is fine for leaf files like `schema.ts`. Keep the service surface in the ow Fully migrated (single namespace, InstanceState where needed, flattened facade): - [x] `Account` — `account/index.ts` +- [x] `Agent` — `agent/agent.ts` +- [x] `AppFileSystem` — `filesystem/index.ts` - [x] `Auth` — `auth/index.ts` (uses `zod()` helper for Schema→Zod interop) +- [x] `Bus` — `bus/index.ts` +- [x] `Command` — `command/index.ts` +- [x] `Config` — `config/config.ts` +- [x] `Discovery` — `skill/discovery.ts` (dependency-only layer, no standalone runtime) - [x] `File` — `file/index.ts` - [x] `FileTime` — `file/time.ts` - [x] `FileWatcher` — `file/watcher.ts` - [x] `Format` — `format/index.ts` - [x] `Installation` — `installation/index.ts` +- [x] `LSP` — `lsp/index.ts` +- [x] `MCP` — `mcp/index.ts` +- [x] `McpAuth` — `mcp/auth.ts` - [x] `Permission` — `permission/index.ts` +- [x] `Plugin` — `plugin/index.ts` +- [x] `Project` — `project/project.ts` - [x] `ProviderAuth` — `provider/auth.ts` +- [x] `Pty` — `pty/index.ts` - [x] `Question` — `question/index.ts` +- [x] `SessionStatus` — `session/status.ts` - [x] `Skill` — `skill/index.ts` - [x] `Snapshot` — `snapshot/index.ts` +- [x] `ToolRegistry` — `tool/registry.ts` - [x] `Truncate` — `tool/truncate.ts` - [x] `Vcs` — `project/vcs.ts` -- [x] `Discovery` — `skill/discovery.ts` -- [x] `SessionStatus` +- [x] `Worktree` — `worktree/index.ts` Still open and likely worth migrating: -- [x] `Plugin` -- [x] `ToolRegistry` -- [ ] `Pty` -- [x] `Worktree` -- [x] `Bus` -- [x] `Command` -- [x] `Config` - [ ] `Session` - [ ] `SessionProcessor` - [ ] `SessionPrompt` - [ ] `SessionCompaction` - [ ] `Provider` -- [x] `Project` -- [x] `LSP` -- [x] `MCP` diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.ts index 622537e3c1..53c655d1b3 100644 --- a/packages/opencode/src/agent/agent.ts +++ b/packages/opencode/src/agent/agent.ts @@ -72,13 +72,14 @@ export namespace Agent { export const layer = Layer.effect( Service, Effect.gen(function* () { - const config = () => Effect.promise(() => Config.get()) + const config = yield* Config.Service const auth = yield* Auth.Service + const skill = yield* Skill.Service const state = yield* InstanceState.make( Effect.fn("Agent.state")(function* (ctx) { - const cfg = yield* config() - const skillDirs = yield* Effect.promise(() => Skill.dirs()) + const cfg = yield* config.get() + const skillDirs = yield* skill.dirs() const whitelistedDirs = [Truncate.GLOB, ...skillDirs.map((dir) => path.join(dir, "*"))] const defaults = Permission.fromConfig({ @@ -281,7 +282,7 @@ export namespace Agent { }) const list = Effect.fnUntraced(function* () { - const cfg = yield* config() + const cfg = yield* config.get() return pipe( agents, values(), @@ -293,7 +294,7 @@ export namespace Agent { }) const defaultAgent = Effect.fnUntraced(function* () { - const c = yield* config() + const c = yield* config.get() if (c.default_agent) { const agent = agents[c.default_agent] if (!agent) throw new Error(`default agent "${c.default_agent}" not found`) @@ -328,7 +329,7 @@ export namespace Agent { description: string model?: { providerID: ProviderID; modelID: ModelID } }) { - const cfg = yield* config() + const cfg = yield* config.get() 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)) @@ -391,7 +392,11 @@ export namespace Agent { }), ) - export const defaultLayer = layer.pipe(Layer.provide(Auth.layer)) + export const defaultLayer = layer.pipe( + Layer.provide(Auth.layer), + Layer.provide(Config.defaultLayer), + Layer.provide(Skill.defaultLayer), + ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/src/command/index.ts b/packages/opencode/src/command/index.ts index a2407982a3..8cdb578419 100644 --- a/packages/opencode/src/command/index.ts +++ b/packages/opencode/src/command/index.ts @@ -75,8 +75,12 @@ export namespace Command { export const layer = Layer.effect( Service, Effect.gen(function* () { + const config = yield* Config.Service + const mcp = yield* MCP.Service + const skill = yield* Skill.Service + const init = Effect.fn("Command.state")(function* (ctx) { - const cfg = yield* Effect.promise(() => Config.get()) + const cfg = yield* config.get() const commands: Record = {} commands[Default.INIT] = { @@ -114,7 +118,7 @@ export namespace Command { } } - for (const [name, prompt] of Object.entries(yield* Effect.promise(() => MCP.prompts()))) { + for (const [name, prompt] of Object.entries(yield* mcp.prompts())) { commands[name] = { name, source: "mcp", @@ -139,14 +143,14 @@ export namespace Command { } } - for (const skill of yield* Effect.promise(() => Skill.all())) { - if (commands[skill.name]) continue - commands[skill.name] = { - name: skill.name, - description: skill.description, + for (const item of yield* skill.all()) { + if (commands[item.name]) continue + commands[item.name] = { + name: item.name, + description: item.description, source: "skill", get template() { - return skill.content + return item.content }, hints: [], } @@ -173,7 +177,13 @@ export namespace Command { }), ) - const { runPromise } = makeRuntime(Service, layer) + export const defaultLayer = layer.pipe( + Layer.provide(Config.defaultLayer), + Layer.provide(MCP.defaultLayer), + Layer.provide(Skill.defaultLayer), + ) + + const { runPromise } = makeRuntime(Service, defaultLayer) export async function get(name: string) { return runPromise((svc) => svc.get(name)) diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index 67f298b427..6a912202cd 100644 --- a/packages/opencode/src/config/config.ts +++ b/packages/opencode/src/config/config.ts @@ -40,7 +40,7 @@ import { Lock } from "@/util/lock" import { AppFileSystem } from "@/filesystem" import { InstanceState } from "@/effect/instance-state" import { makeRuntime } from "@/effect/run-service" -import { Duration, Effect, Layer, ServiceMap } from "effect" +import { Duration, Effect, Layer, Option, ServiceMap } from "effect" export namespace Config { const ModelId = z.string().meta({ $ref: "https://models.dev/model-schema.json#/$defs/Model" }) @@ -1136,10 +1136,12 @@ export namespace Config { }), ) - export const layer: Layer.Layer = Layer.effect( + export const layer: Layer.Layer = Layer.effect( Service, Effect.gen(function* () { const fs = yield* AppFileSystem.Service + const authSvc = yield* Auth.Service + const accountSvc = yield* Account.Service const readConfigFile = Effect.fnUntraced(function* (filepath: string) { return yield* fs.readFileString(filepath).pipe( @@ -1256,7 +1258,7 @@ export namespace Config { }) const loadInstanceState = Effect.fnUntraced(function* (ctx: InstanceContext) { - const auth = yield* Effect.promise(() => Auth.all()) + const auth = yield* authSvc.all().pipe(Effect.orDie) let result: Info = {} for (const [key, value] of Object.entries(auth)) { @@ -1344,17 +1346,20 @@ export namespace Config { log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT") } - const active = yield* Effect.promise(() => Account.active()) + const active = Option.getOrUndefined(yield* accountSvc.active().pipe(Effect.orDie)) if (active?.active_org_id) { yield* Effect.gen(function* () { - const [config, token] = yield* Effect.promise(() => - Promise.all([Account.config(active.id, active.active_org_id!), Account.token(active.id)]), + const [configOpt, tokenOpt] = yield* Effect.all( + [accountSvc.config(active.id, active.active_org_id!), accountSvc.token(active.id)], + { concurrency: 2 }, ) + const token = Option.getOrUndefined(tokenOpt) if (token) { process.env["OPENCODE_CONSOLE_TOKEN"] = token Env.set("OPENCODE_CONSOLE_TOKEN", token) } + const config = Option.getOrUndefined(configOpt) if (config) { result = mergeConfigConcatArrays( result, @@ -1365,7 +1370,7 @@ export namespace Config { ) } }).pipe( - Effect.catchDefect((err) => { + Effect.catch((err) => { log.debug("failed to fetch remote account config", { error: err instanceof Error ? err.message : String(err), }) @@ -1502,7 +1507,11 @@ export namespace Config { }), ) - export const defaultLayer = layer.pipe(Layer.provide(AppFileSystem.defaultLayer)) + export const defaultLayer = layer.pipe( + Layer.provide(AppFileSystem.defaultLayer), + Layer.provide(Auth.layer), + Layer.provide(Account.defaultLayer), + ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/src/effect/cross-spawn-spawner.ts b/packages/opencode/src/effect/cross-spawn-spawner.ts index f7b8786d08..eb2560ff6f 100644 --- a/packages/opencode/src/effect/cross-spawn-spawner.ts +++ b/packages/opencode/src/effect/cross-spawn-spawner.ts @@ -1,5 +1,6 @@ import type * as Arr from "effect/Array" -import { NodeSink, NodeStream } from "@effect/platform-node" +import { NodeFileSystem, NodeSink, NodeStream } from "@effect/platform-node" +import * as NodePath from "@effect/platform-node/NodePath" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -474,3 +475,5 @@ export const layer: Layer.Layer Config.get()) + const cfg = yield* config.get() const cfgIgnores = cfg.watcher?.ignore ?? [] if (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER) { @@ -159,7 +161,9 @@ export namespace FileWatcher { }), ) - const { runPromise } = makeRuntime(Service, layer) + export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer)) + + const { runPromise } = makeRuntime(Service, defaultLayer) export function init() { return runPromise((svc) => svc.init()) diff --git a/packages/opencode/src/format/index.ts b/packages/opencode/src/format/index.ts index 316ea5ba5c..314e8c6e71 100644 --- a/packages/opencode/src/format/index.ts +++ b/packages/opencode/src/format/index.ts @@ -35,12 +35,14 @@ export namespace Format { export const layer = Layer.effect( Service, Effect.gen(function* () { + const config = yield* Config.Service + const state = yield* InstanceState.make( Effect.fn("Format.state")(function* (_ctx) { const enabled: Record = {} const formatters: Record = {} - const cfg = yield* Effect.promise(() => Config.get()) + const cfg = yield* config.get() if (cfg.formatter !== false) { for (const item of Object.values(Formatter)) { @@ -167,7 +169,9 @@ export namespace Format { }), ) - const { runPromise } = makeRuntime(Service, layer) + export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer)) + + const { runPromise } = makeRuntime(Service, defaultLayer) export async function init() { return runPromise((s) => s.init()) diff --git a/packages/opencode/src/installation/index.ts b/packages/opencode/src/installation/index.ts index 76f3d0c9e1..52c149c4fd 100644 --- a/packages/opencode/src/installation/index.ts +++ b/packages/opencode/src/installation/index.ts @@ -1,4 +1,3 @@ -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" @@ -341,9 +340,7 @@ export namespace Installation { export const defaultLayer = layer.pipe( Layer.provide(FetchHttpClient.layer), - Layer.provide(CrossSpawnSpawner.layer), - Layer.provide(NodeFileSystem.layer), - Layer.provide(NodePath.layer), + Layer.provide(CrossSpawnSpawner.defaultLayer), ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/src/lsp/index.ts b/packages/opencode/src/lsp/index.ts index 81a7dfaaca..de87e568f7 100644 --- a/packages/opencode/src/lsp/index.ts +++ b/packages/opencode/src/lsp/index.ts @@ -161,9 +161,11 @@ export namespace LSP { export const layer = Layer.effect( Service, Effect.gen(function* () { + const config = yield* Config.Service + const state = yield* InstanceState.make( Effect.fn("LSP.state")(function* () { - const cfg = yield* Effect.promise(() => Config.get()) + const cfg = yield* config.get() const servers: Record = {} @@ -504,7 +506,9 @@ export namespace LSP { }), ) - const { runPromise } = makeRuntime(Service, layer) + export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer)) + + const { runPromise } = makeRuntime(Service, defaultLayer) export const init = async () => runPromise((svc) => svc.init()) diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 184e84a2a0..15ab0c9e3a 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -29,8 +29,6 @@ import { InstanceState } from "@/effect/instance-state" import { makeRuntime } from "@/effect/run-service" import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process" import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner" -import { NodeFileSystem } from "@effect/platform-node" -import * as NodePath from "@effect/platform-node/NodePath" export namespace MCP { const log = Log.create({ service: "mcp" }) @@ -437,6 +435,7 @@ export namespace MCP { log.info("create() successfully created client", { key, toolCount: listed.length }) return { mcpClient, status, defs: listed } satisfies CreateResult }) + const cfgSvc = yield* Config.Service const descendants = Effect.fnUntraced( function* (pid: number) { @@ -478,11 +477,11 @@ export namespace MCP { }) } - const getConfig = () => Effect.promise(() => Config.get()) const cache = yield* InstanceState.make( Effect.fn("MCP.state")(function* () { - const cfg = yield* getConfig() + + const cfg = yield* cfgSvc.get() const config = cfg.mcp ?? {} const s: State = { status: {}, @@ -553,7 +552,8 @@ export namespace MCP { const status = Effect.fn("MCP.status")(function* () { const s = yield* InstanceState.get(cache) - const cfg = yield* getConfig() + + const cfg = yield* cfgSvc.get() const config = cfg.mcp ?? {} const result: Record = {} @@ -613,7 +613,8 @@ export namespace MCP { const tools = Effect.fn("MCP.tools")(function* () { const result: Record = {} const s = yield* InstanceState.get(cache) - const cfg = yield* getConfig() + + const cfg = yield* cfgSvc.get() const config = cfg.mcp ?? {} const defaultTimeout = cfg.experimental?.mcp_timeout @@ -705,7 +706,8 @@ export namespace MCP { }) const getMcpConfig = Effect.fnUntraced(function* (mcpName: string) { - const cfg = yield* getConfig() + + const cfg = yield* cfgSvc.get() const mcpConfig = cfg.mcp?.[mcpName] if (!mcpConfig || !isMcpConfigured(mcpConfig)) return undefined return mcpConfig @@ -876,13 +878,12 @@ export namespace MCP { // --- Per-service runtime --- - const defaultLayer = layer.pipe( + export const defaultLayer = layer.pipe( Layer.provide(McpAuth.layer), Layer.provide(Bus.layer), - Layer.provide(CrossSpawnSpawner.layer), + Layer.provide(Config.defaultLayer), + Layer.provide(CrossSpawnSpawner.defaultLayer), Layer.provide(AppFileSystem.defaultLayer), - Layer.provide(NodeFileSystem.layer), - Layer.provide(NodePath.layer), ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/src/project/project.ts b/packages/opencode/src/project/project.ts index b8de639e76..f4b8b940d2 100644 --- a/packages/opencode/src/project/project.ts +++ b/packages/opencode/src/project/project.ts @@ -111,7 +111,7 @@ export namespace Project { > = Layer.effect( Service, Effect.gen(function* () { - const fsys = yield* AppFileSystem.Service + const fs = yield* AppFileSystem.Service const pathSvc = yield* Path.Path const spawner = yield* ChildProcessSpawner.ChildProcessSpawner @@ -155,7 +155,7 @@ export namespace Project { const scope = yield* Scope.Scope const readCachedProjectId = Effect.fnUntraced(function* (dir: string) { - return yield* fsys.readFileString(pathSvc.join(dir, "opencode")).pipe( + return yield* fs.readFileString(pathSvc.join(dir, "opencode")).pipe( Effect.map((x) => x.trim()), Effect.map(ProjectID.make), Effect.catch(() => Effect.succeed(undefined)), @@ -169,7 +169,7 @@ export namespace Project { 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 dotgitMatches = yield* fs.up({ targets: [".git"], start: directory }).pipe(Effect.orDie) const dotgit = dotgitMatches[0] if (!dotgit) { @@ -222,7 +222,7 @@ export namespace Project { id = roots[0] ? ProjectID.make(roots[0]) : undefined if (id) { - yield* fsys.writeFileString(pathSvc.join(worktree, ".git", "opencode"), id).pipe(Effect.ignore) + yield* fs.writeFileString(pathSvc.join(worktree, ".git", "opencode"), id).pipe(Effect.ignore) } } @@ -270,7 +270,7 @@ export namespace Project { result.sandboxes = yield* Effect.forEach( result.sandboxes, (s) => - fsys.exists(s).pipe( + fs.exists(s).pipe( Effect.orDie, Effect.map((exists) => (exists ? s : undefined)), ), @@ -329,7 +329,7 @@ export namespace Project { if (input.icon?.override) return if (input.icon?.url) return - const matches = yield* fsys + const matches = yield* fs .glob("**/favicon.{ico,png,svg,jpg,jpeg,webp}", { cwd: input.worktree, absolute: true, @@ -339,7 +339,7 @@ export namespace Project { const shortest = matches.sort((a, b) => a.length - b.length)[0] if (!shortest) return - const buffer = yield* fsys.readFile(shortest).pipe(Effect.orDie) + const buffer = yield* fs.readFile(shortest).pipe(Effect.orDie) const base64 = Buffer.from(buffer).toString("base64") const mime = AppFileSystem.mimeType(shortest) const url = `data:${mime};base64,${base64}` @@ -400,7 +400,7 @@ export namespace Project { return yield* Effect.forEach( data.sandboxes, (dir) => - fsys.isDir(dir).pipe( + fs.isDir(dir).pipe( Effect.orDie, Effect.map((ok) => (ok ? dir : undefined)), ), @@ -457,9 +457,8 @@ export namespace Project { ) export const defaultLayer = layer.pipe( - Layer.provide(CrossSpawnSpawner.layer), + Layer.provide(CrossSpawnSpawner.defaultLayer), Layer.provide(AppFileSystem.defaultLayer), - Layer.provide(NodeFileSystem.layer), Layer.provide(NodePath.layer), ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/src/pty/index.ts b/packages/opencode/src/pty/index.ts index 1ba87126bb..8ecd8c7a61 100644 --- a/packages/opencode/src/pty/index.ts +++ b/packages/opencode/src/pty/index.ts @@ -273,7 +273,7 @@ export namespace Pty { if (input.size) { session.process.resize(input.size.cols, input.size.rows) } - yield* Effect.promise(() => Bus.publish(Event.Updated, { info: session.info })) + void Bus.publish(Event.Updated, { info: session.info }) return session.info }) diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts index d6bdf8a3c1..4429a25696 100644 --- a/packages/opencode/src/snapshot/index.ts +++ b/packages/opencode/src/snapshot/index.ts @@ -60,24 +60,28 @@ export namespace Snapshot { export class Service extends ServiceMap.Service()("@opencode/Snapshot") {} - export const layer: Layer.Layer = - Layer.effect( - Service, - Effect.gen(function* () { - const fs = yield* AppFileSystem.Service - const spawner = yield* ChildProcessSpawner.ChildProcessSpawner - const locks = new Map() + export const layer: Layer.Layer< + Service, + never, + AppFileSystem.Service | ChildProcessSpawner.ChildProcessSpawner | Config.Service + > = Layer.effect( + Service, + Effect.gen(function* () { + const fs = yield* AppFileSystem.Service + const spawner = yield* ChildProcessSpawner.ChildProcessSpawner + const config = yield* Config.Service + const locks = new Map() - const lock = (key: string) => { - const hit = locks.get(key) - if (hit) return hit + const lock = (key: string) => { + const hit = locks.get(key) + if (hit) return hit - const next = Semaphore.makeUnsafe(1) - locks.set(key, next) - return next - } + const next = Semaphore.makeUnsafe(1) + locks.set(key, next) + return next + } - const state = yield* InstanceState.make( + const state = yield* InstanceState.make( Effect.fn("Snapshot.state")(function* (ctx) { const state = { directory: ctx.directory, @@ -123,7 +127,7 @@ export namespace Snapshot { const enabled = Effect.fnUntraced(function* () { if (state.vcs !== "git") return false - return (yield* Effect.promise(() => Config.get())).snapshot !== false + return (yield* config.get()).snapshot !== false }) const excludes = Effect.fnUntraced(function* () { @@ -423,40 +427,39 @@ export namespace Snapshot { }), ) - return Service.of({ - init: Effect.fn("Snapshot.init")(function* () { - yield* InstanceState.get(state) - }), - cleanup: Effect.fn("Snapshot.cleanup")(function* () { - return yield* InstanceState.useEffect(state, (s) => s.cleanup()) - }), - track: Effect.fn("Snapshot.track")(function* () { - return yield* InstanceState.useEffect(state, (s) => s.track()) - }), - patch: Effect.fn("Snapshot.patch")(function* (hash: string) { - return yield* InstanceState.useEffect(state, (s) => s.patch(hash)) - }), - restore: Effect.fn("Snapshot.restore")(function* (snapshot: string) { - return yield* InstanceState.useEffect(state, (s) => s.restore(snapshot)) - }), - revert: Effect.fn("Snapshot.revert")(function* (patches: Snapshot.Patch[]) { - return yield* InstanceState.useEffect(state, (s) => s.revert(patches)) - }), - diff: Effect.fn("Snapshot.diff")(function* (hash: string) { - return yield* InstanceState.useEffect(state, (s) => s.diff(hash)) - }), - diffFull: Effect.fn("Snapshot.diffFull")(function* (from: string, to: string) { - return yield* InstanceState.useEffect(state, (s) => s.diffFull(from, to)) - }), - }) - }), - ) + return Service.of({ + init: Effect.fn("Snapshot.init")(function* () { + yield* InstanceState.get(state) + }), + cleanup: Effect.fn("Snapshot.cleanup")(function* () { + return yield* InstanceState.useEffect(state, (s) => s.cleanup()) + }), + track: Effect.fn("Snapshot.track")(function* () { + return yield* InstanceState.useEffect(state, (s) => s.track()) + }), + patch: Effect.fn("Snapshot.patch")(function* (hash: string) { + return yield* InstanceState.useEffect(state, (s) => s.patch(hash)) + }), + restore: Effect.fn("Snapshot.restore")(function* (snapshot: string) { + return yield* InstanceState.useEffect(state, (s) => s.restore(snapshot)) + }), + revert: Effect.fn("Snapshot.revert")(function* (patches: Snapshot.Patch[]) { + return yield* InstanceState.useEffect(state, (s) => s.revert(patches)) + }), + diff: Effect.fn("Snapshot.diff")(function* (hash: string) { + return yield* InstanceState.useEffect(state, (s) => s.diff(hash)) + }), + diffFull: Effect.fn("Snapshot.diffFull")(function* (from: string, to: string) { + return yield* InstanceState.useEffect(state, (s) => s.diffFull(from, to)) + }), + }) + }), + ) export const defaultLayer = layer.pipe( - Layer.provide(CrossSpawnSpawner.layer), + Layer.provide(CrossSpawnSpawner.defaultLayer), Layer.provide(AppFileSystem.defaultLayer), - Layer.provide(NodeFileSystem.layer), // needed by CrossSpawnSpawner - Layer.provide(NodePath.layer), + Layer.provide(Config.defaultLayer), ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/src/worktree/index.ts b/packages/opencode/src/worktree/index.ts index 3aeee983f4..0a8ce5ea22 100644 --- a/packages/opencode/src/worktree/index.ts +++ b/packages/opencode/src/worktree/index.ts @@ -11,9 +11,10 @@ import { Log } from "../util/log" import { Slug } from "@opencode-ai/util/slug" import { BusEvent } from "@/bus/bus-event" import { GlobalBus } from "@/bus/global" -import { Effect, FileSystem, Layer, Path, Scope, ServiceMap, Stream } from "effect" +import { Effect, Layer, Path, Scope, ServiceMap, Stream } from "effect" import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process" -import { NodeFileSystem, NodePath } from "@effect/platform-node" +import { NodePath } from "@effect/platform-node" +import { AppFileSystem } from "@/filesystem" import { makeRuntime } from "@/effect/run-service" import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner" @@ -167,14 +168,15 @@ export namespace Worktree { export const layer: Layer.Layer< Service, never, - FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner + AppFileSystem.Service | Path.Path | ChildProcessSpawner.ChildProcessSpawner | Project.Service > = Layer.effect( Service, Effect.gen(function* () { const scope = yield* Scope.Scope - const fsys = yield* FileSystem.FileSystem + const fs = yield* AppFileSystem.Service const pathSvc = yield* Path.Path const spawner = yield* ChildProcessSpawner.ChildProcessSpawner + const project = yield* Project.Service const git = Effect.fnUntraced( function* (args: string[], opts?: { cwd?: string }) { @@ -201,7 +203,7 @@ export namespace Worktree { const branch = `opencode/${name}` const directory = pathSvc.join(root, name) - if (yield* fsys.exists(directory).pipe(Effect.orDie)) continue + if (yield* fs.exists(directory).pipe(Effect.orDie)) continue const ref = `refs/heads/${branch}` const branchCheck = yield* git(["show-ref", "--verify", "--quiet", ref], { cwd: Instance.worktree }) @@ -218,7 +220,7 @@ export namespace Worktree { } const root = pathSvc.join(Global.Path.data, "worktree", Instance.project.id) - yield* fsys.makeDirectory(root, { recursive: true }).pipe(Effect.orDie) + yield* fs.makeDirectory(root, { recursive: true }).pipe(Effect.orDie) const base = name ? slugify(name) : "" return yield* candidate(root, base || undefined) @@ -232,7 +234,7 @@ export namespace Worktree { throw new CreateFailedError({ message: created.stderr || created.text || "Failed to create git worktree" }) } - yield* Effect.promise(() => Project.addSandbox(Instance.project.id, info.directory).catch(() => undefined)) + yield* project.addSandbox(Instance.project.id, info.directory).pipe(Effect.catch(() => Effect.void)) }) const boot = Effect.fnUntraced(function* (info: Info, startCommand?: string) { @@ -297,7 +299,7 @@ export namespace Worktree { const canonical = Effect.fnUntraced(function* (input: string) { const abs = pathSvc.resolve(input) - const real = yield* fsys.realPath(abs).pipe(Effect.catch(() => Effect.succeed(abs))) + const real = yield* fs.realPath(abs).pipe(Effect.catch(() => Effect.succeed(abs))) const normalized = pathSvc.normalize(real) return process.platform === "win32" ? normalized.toLowerCase() : normalized }) @@ -334,7 +336,7 @@ export namespace Worktree { }) function stopFsmonitor(target: string) { - return fsys.exists(target).pipe( + return fs.exists(target).pipe( Effect.orDie, Effect.flatMap((exists) => (exists ? git(["fsmonitor--daemon", "stop"], { cwd: target }) : Effect.void)), ) @@ -364,7 +366,7 @@ export namespace Worktree { const entry = yield* locateWorktree(entries, directory) if (!entry?.path) { - const directoryExists = yield* fsys.exists(directory).pipe(Effect.orDie) + const directoryExists = yield* fs.exists(directory).pipe(Effect.orDie) if (directoryExists) { yield* stopFsmonitor(directory) yield* cleanDirectory(directory) @@ -464,7 +466,7 @@ export namespace Worktree { const target = yield* canonical(pathSvc.resolve(root, entry)) if (target === base) return if (!target.startsWith(`${base}${pathSvc.sep}`)) return - yield* fsys.remove(target, { recursive: true }).pipe(Effect.ignore) + yield* fs.remove(target, { recursive: true }).pipe(Effect.ignore) }), { concurrency: "unbounded" }, ) @@ -603,8 +605,9 @@ export namespace Worktree { ) const defaultLayer = layer.pipe( - Layer.provide(CrossSpawnSpawner.layer), - Layer.provide(NodeFileSystem.layer), + Layer.provide(CrossSpawnSpawner.defaultLayer), + Layer.provide(Project.defaultLayer), + Layer.provide(AppFileSystem.defaultLayer), Layer.provide(NodePath.layer), ) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts index dc2397b38b..33f700ebf2 100644 --- a/packages/opencode/test/config/config.test.ts +++ b/packages/opencode/test/config/config.test.ts @@ -1,9 +1,19 @@ import { test, expect, describe, mock, afterEach, spyOn } from "bun:test" +import { Effect, Layer, Option } from "effect" +import { NodeFileSystem, NodePath } from "@effect/platform-node" import { Config } from "../../src/config/config" import { Instance } from "../../src/project/instance" import { Auth } from "../../src/auth" import { AccessToken, Account, AccountID, OrgID } from "../../src/account" +import { AppFileSystem } from "../../src/filesystem" +import { provideTmpdirInstance } from "../fixture/fixture" import { tmpdir } from "../fixture/fixture" +import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner" + +/** Infra layer that provides FileSystem, Path, ChildProcessSpawner for test fixtures */ +const infra = CrossSpawnSpawner.defaultLayer.pipe( + Layer.provideMerge(Layer.mergeAll(NodeFileSystem.layer, NodePath.layer)), +) import path from "path" import fs from "fs/promises" import { pathToFileURL } from "url" @@ -12,6 +22,14 @@ import { ProjectID } from "../../src/project/schema" import { Filesystem } from "../../src/util/filesystem" import { BunProc } from "../../src/bun" +const emptyAccount = Layer.mock(Account.Service)({ + active: () => Effect.succeed(Option.none()), +}) + +const emptyAuth = Layer.mock(Auth.Service)({ + all: () => Effect.succeed({}), +}) + // Get managed config directory from environment (set in preload.ts) const managedConfigDir = process.env.OPENCODE_TEST_MANAGED_CONFIG_DIR! @@ -246,43 +264,44 @@ test("preserves env variables when adding $schema to config", async () => { }) test("resolves env templates in account config with account token", async () => { - const originalActive = Account.active - const originalConfig = Account.config - const originalToken = Account.token const originalControlToken = process.env["OPENCODE_CONSOLE_TOKEN"] - Account.active = mock(async () => ({ - id: AccountID.make("account-1"), - email: "user@example.com", - url: "https://control.example.com", - active_org_id: OrgID.make("org-1"), - })) + const fakeAccount = Layer.mock(Account.Service)({ + active: () => + Effect.succeed( + Option.some({ + id: AccountID.make("account-1"), + email: "user@example.com", + url: "https://control.example.com", + active_org_id: OrgID.make("org-1"), + }), + ), + config: () => + Effect.succeed( + Option.some({ + provider: { opencode: { options: { apiKey: "{env:OPENCODE_CONSOLE_TOKEN}" } } }, + }), + ), + token: () => Effect.succeed(Option.some(AccessToken.make("st_test_token"))), + }) - Account.config = mock(async () => ({ - provider: { - opencode: { - options: { - apiKey: "{env:OPENCODE_CONSOLE_TOKEN}", - }, - }, - }, - })) - - Account.token = mock(async () => AccessToken.make("st_test_token")) + const layer = Config.layer.pipe( + Layer.provide(AppFileSystem.defaultLayer), + Layer.provide(emptyAuth), + Layer.provide(fakeAccount), + Layer.provideMerge(infra), + ) try { - await using tmp = await tmpdir() - await Instance.provide({ - directory: tmp.path, - fn: async () => { - const config = await Config.get() - expect(config.provider?.["opencode"]?.options?.apiKey).toBe("st_test_token") - }, - }) + await provideTmpdirInstance(() => + Config.Service.use((svc) => + Effect.gen(function* () { + const config = yield* svc.get() + expect(config.provider?.["opencode"]?.options?.apiKey).toBe("st_test_token") + }), + ), + ).pipe(Effect.scoped, Effect.provide(layer), Effect.runPromise) } finally { - Account.active = originalActive - Account.config = originalConfig - Account.token = originalToken if (originalControlToken !== undefined) { process.env["OPENCODE_CONSOLE_TOKEN"] = originalControlToken } else { @@ -1588,7 +1607,7 @@ test("local .opencode config can override MCP from project config", async () => test("project config overrides remote well-known config", async () => { const originalFetch = globalThis.fetch let fetchedUrl: string | undefined - const mockFetch = mock((url: string | URL | Request) => { + globalThis.fetch = mock((url: string | URL | Request) => { const urlStr = url.toString() if (urlStr.includes(".well-known/opencode")) { fetchedUrl = urlStr @@ -1596,13 +1615,7 @@ test("project config overrides remote well-known config", async () => { new Response( JSON.stringify({ config: { - mcp: { - jira: { - type: "remote", - url: "https://jira.example.com/mcp", - enabled: false, - }, - }, + mcp: { jira: { type: "remote", url: "https://jira.example.com/mcp", enabled: false } }, }, }), { status: 200 }, @@ -1610,60 +1623,46 @@ test("project config overrides remote well-known config", async () => { ) } return originalFetch(url) - }) - globalThis.fetch = mockFetch as unknown as typeof fetch + }) as unknown as typeof fetch - const originalAuthAll = Auth.all - Auth.all = mock(() => - Promise.resolve({ - "https://example.com": { - type: "wellknown" as const, - key: "TEST_TOKEN", - token: "test-token", - }, - }), + const fakeAuth = Layer.mock(Auth.Service)({ + all: () => + Effect.succeed({ + "https://example.com": new Auth.WellKnown({ type: "wellknown", key: "TEST_TOKEN", token: "test-token" }), + }), + }) + + const layer = Config.layer.pipe( + Layer.provide(AppFileSystem.defaultLayer), + Layer.provide(fakeAuth), + Layer.provide(emptyAccount), + Layer.provideMerge(infra), ) try { - await using tmp = await tmpdir({ - git: true, - init: async (dir) => { - // Project config enables jira (overriding remote default) - await Filesystem.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - mcp: { - jira: { - type: "remote", - url: "https://jira.example.com/mcp", - enabled: true, - }, - }, + await provideTmpdirInstance( + () => + Config.Service.use((svc) => + Effect.gen(function* () { + const config = yield* svc.get() + expect(fetchedUrl).toBe("https://example.com/.well-known/opencode") + expect(config.mcp?.jira?.enabled).toBe(true) }), - ) + ), + { + git: true, + config: { mcp: { jira: { type: "remote", url: "https://jira.example.com/mcp", enabled: true } } }, }, - }) - await Instance.provide({ - directory: tmp.path, - fn: async () => { - const config = await Config.get() - // Verify fetch was called for wellknown config - expect(fetchedUrl).toBe("https://example.com/.well-known/opencode") - // Project config (enabled: true) should override remote (enabled: false) - expect(config.mcp?.jira?.enabled).toBe(true) - }, - }) + ).pipe(Effect.scoped, Effect.provide(layer), Effect.runPromise) } finally { globalThis.fetch = originalFetch - Auth.all = originalAuthAll } }) test("wellknown URL with trailing slash is normalized", async () => { const originalFetch = globalThis.fetch let fetchedUrl: string | undefined - const mockFetch = mock((url: string | URL | Request) => { + globalThis.fetch = mock((url: string | URL | Request) => { const urlStr = url.toString() if (urlStr.includes(".well-known/opencode")) { fetchedUrl = urlStr @@ -1671,13 +1670,7 @@ test("wellknown URL with trailing slash is normalized", async () => { new Response( JSON.stringify({ config: { - mcp: { - slack: { - type: "remote", - url: "https://slack.example.com/mcp", - enabled: true, - }, - }, + mcp: { slack: { type: "remote", url: "https://slack.example.com/mcp", enabled: true } }, }, }), { status: 200 }, @@ -1685,43 +1678,35 @@ test("wellknown URL with trailing slash is normalized", async () => { ) } return originalFetch(url) - }) - globalThis.fetch = mockFetch as unknown as typeof fetch + }) as unknown as typeof fetch - const originalAuthAll = Auth.all - Auth.all = mock(() => - Promise.resolve({ - "https://example.com/": { - type: "wellknown" as const, - key: "TEST_TOKEN", - token: "test-token", - }, - }), + const fakeAuth = Layer.mock(Auth.Service)({ + all: () => + Effect.succeed({ + "https://example.com/": new Auth.WellKnown({ type: "wellknown", key: "TEST_TOKEN", token: "test-token" }), + }), + }) + + const layer = Config.layer.pipe( + Layer.provide(AppFileSystem.defaultLayer), + Layer.provide(fakeAuth), + Layer.provide(emptyAccount), + Layer.provideMerge(infra), ) try { - await using tmp = await tmpdir({ - git: true, - init: async (dir) => { - await Filesystem.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", + await provideTmpdirInstance( + () => + Config.Service.use((svc) => + Effect.gen(function* () { + yield* svc.get() + expect(fetchedUrl).toBe("https://example.com/.well-known/opencode") }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - fn: async () => { - await Config.get() - // Trailing slash should be stripped — no double slash in the fetch URL - expect(fetchedUrl).toBe("https://example.com/.well-known/opencode") - }, - }) + ), + { git: true }, + ).pipe(Effect.scoped, Effect.provide(layer), Effect.runPromise) } finally { globalThis.fetch = originalFetch - Auth.all = originalAuthAll } }) diff --git a/packages/opencode/test/effect/cross-spawn-spawner.test.ts b/packages/opencode/test/effect/cross-spawn-spawner.test.ts index 08cae76e2f..287d04ed31 100644 --- a/packages/opencode/test/effect/cross-spawn-spawner.test.ts +++ b/packages/opencode/test/effect/cross-spawn-spawner.test.ts @@ -9,7 +9,7 @@ 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 live = CrossSpawnSpawner.defaultLayer const fx = testEffect(live) function js(code: string, opts?: ChildProcess.CommandOptions) { diff --git a/packages/opencode/test/file/watcher.test.ts b/packages/opencode/test/file/watcher.test.ts index f98a580f62..2224a80e68 100644 --- a/packages/opencode/test/file/watcher.test.ts +++ b/packages/opencode/test/file/watcher.test.ts @@ -5,6 +5,7 @@ import path from "path" import { ConfigProvider, Deferred, Effect, Layer, ManagedRuntime, Option } from "effect" import { tmpdir } from "../fixture/fixture" import { Bus } from "../../src/bus" +import { Config } from "../../src/config/config" import { FileWatcher } from "../../src/file/watcher" import { Instance } from "../../src/project/instance" @@ -30,6 +31,7 @@ function withWatcher(directory: string, body: Effect.Effect) { directory, fn: async () => { const layer: Layer.Layer = FileWatcher.layer.pipe( + Layer.provide(Config.defaultLayer), Layer.provide(watcherConfigLayer), ) const rt = ManagedRuntime.make(layer) diff --git a/packages/opencode/test/format/format.test.ts b/packages/opencode/test/format/format.test.ts index c718c13e8b..6a9b4f5eda 100644 --- a/packages/opencode/test/format/format.test.ts +++ b/packages/opencode/test/format/format.test.ts @@ -4,13 +4,14 @@ import { Effect, Layer } from "effect" import { provideTmpdirInstance } from "../fixture/fixture" import { testEffect } from "../lib/effect" import { Format } from "../../src/format" +import { Config } from "../../src/config/config" import * as Formatter from "../../src/format/formatter" const node = NodeChildProcessSpawner.layer.pipe( Layer.provideMerge(Layer.mergeAll(NodeFileSystem.layer, NodePath.layer)), ) -const it = testEffect(Layer.mergeAll(Format.layer, node)) +const it = testEffect(Layer.mergeAll(Format.layer, node).pipe(Layer.provide(Config.defaultLayer))) describe("Format", () => { it.effect("status() returns built-in formatters when no config overrides", () => diff --git a/packages/opencode/test/project/project.test.ts b/packages/opencode/test/project/project.test.ts index b030e6cbcd..988ae27426 100644 --- a/packages/opencode/test/project/project.test.ts +++ b/packages/opencode/test/project/project.test.ts @@ -47,7 +47,7 @@ function mockGitFailure(failArg: string) { }), ) }), - ).pipe(Layer.provide(CrossSpawnSpawner.layer), Layer.provide(NodeFileSystem.layer), Layer.provide(NodePath.layer)) + ).pipe(Layer.provide(CrossSpawnSpawner.defaultLayer)) } function projectLayerWithFailure(failArg: string) { From b242a8d8e42839496c7213d020e8cba19a76e111 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 01:47:36 +0000 Subject: [PATCH 002/142] chore: generate --- packages/opencode/src/config/config.ts | 656 ++++++++++++------------ packages/opencode/src/mcp/index.ts | 3 - packages/opencode/src/snapshot/index.ts | 629 +++++++++++------------ 3 files changed, 640 insertions(+), 648 deletions(-) diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index 6a912202cd..41fa4a1ca6 100644 --- a/packages/opencode/src/config/config.ts +++ b/packages/opencode/src/config/config.ts @@ -1136,376 +1136,380 @@ export namespace Config { }), ) - export const layer: Layer.Layer = Layer.effect( - Service, - Effect.gen(function* () { - const fs = yield* AppFileSystem.Service - const authSvc = yield* Auth.Service - const accountSvc = yield* Account.Service + export const layer: Layer.Layer = + Layer.effect( + Service, + Effect.gen(function* () { + const fs = yield* AppFileSystem.Service + const authSvc = yield* Auth.Service + const accountSvc = yield* Account.Service - const readConfigFile = Effect.fnUntraced(function* (filepath: string) { - return yield* fs.readFileString(filepath).pipe( - Effect.catchIf( - (e) => e.reason._tag === "NotFound", - () => Effect.succeed(undefined), - ), - Effect.orDie, - ) - }) + const readConfigFile = Effect.fnUntraced(function* (filepath: string) { + return yield* fs.readFileString(filepath).pipe( + Effect.catchIf( + (e) => e.reason._tag === "NotFound", + () => Effect.succeed(undefined), + ), + Effect.orDie, + ) + }) - const loadConfig = Effect.fnUntraced(function* ( - text: string, - options: { path: string } | { dir: string; source: string }, - ) { - const original = text - const source = "path" in options ? options.path : options.source - const isFile = "path" in options - const data = yield* Effect.promise(() => - ConfigPaths.parseText(text, "path" in options ? options.path : { source: options.source, dir: options.dir }), - ) + const loadConfig = Effect.fnUntraced(function* ( + text: string, + options: { path: string } | { dir: string; source: string }, + ) { + const original = text + const source = "path" in options ? options.path : options.source + const isFile = "path" in options + const data = yield* Effect.promise(() => + ConfigPaths.parseText( + text, + "path" in options ? options.path : { source: options.source, dir: options.dir }, + ), + ) - const normalized = (() => { - if (!data || typeof data !== "object" || Array.isArray(data)) return data - const copy = { ...(data as Record) } - const hadLegacy = "theme" in copy || "keybinds" in copy || "tui" in copy - if (!hadLegacy) return copy - delete copy.theme - delete copy.keybinds - delete copy.tui - log.warn("tui keys in opencode config are deprecated; move them to tui.json", { path: source }) - return copy - })() + const normalized = (() => { + if (!data || typeof data !== "object" || Array.isArray(data)) return data + const copy = { ...(data as Record) } + const hadLegacy = "theme" in copy || "keybinds" in copy || "tui" in copy + if (!hadLegacy) return copy + delete copy.theme + delete copy.keybinds + delete copy.tui + log.warn("tui keys in opencode config are deprecated; move them to tui.json", { path: source }) + return copy + })() - const parsed = Info.safeParse(normalized) - if (parsed.success) { - if (!parsed.data.$schema && isFile) { - parsed.data.$schema = "https://opencode.ai/config.json" - const updated = original.replace(/^\s*\{/, '{\n "$schema": "https://opencode.ai/config.json",') - yield* fs.writeFileString(options.path, updated).pipe(Effect.catch(() => Effect.void)) - } - const data = parsed.data - if (data.plugin && isFile) { - for (let i = 0; i < data.plugin.length; i++) { - const plugin = data.plugin[i] - try { - data.plugin[i] = import.meta.resolve!(plugin, options.path) - } catch (e) { + const parsed = Info.safeParse(normalized) + if (parsed.success) { + if (!parsed.data.$schema && isFile) { + parsed.data.$schema = "https://opencode.ai/config.json" + const updated = original.replace(/^\s*\{/, '{\n "$schema": "https://opencode.ai/config.json",') + yield* fs.writeFileString(options.path, updated).pipe(Effect.catch(() => Effect.void)) + } + const data = parsed.data + if (data.plugin && isFile) { + for (let i = 0; i < data.plugin.length; i++) { + const plugin = data.plugin[i] try { - const require = createRequire(options.path) - const resolvedPath = require.resolve(plugin) - data.plugin[i] = pathToFileURL(resolvedPath).href - } catch { - // Ignore, plugin might be a generic string identifier like "mcp-server" + data.plugin[i] = import.meta.resolve!(plugin, options.path) + } catch (e) { + try { + const require = createRequire(options.path) + const resolvedPath = require.resolve(plugin) + data.plugin[i] = pathToFileURL(resolvedPath).href + } catch { + // Ignore, plugin might be a generic string identifier like "mcp-server" + } } } } + return data } - return data - } - throw new InvalidError({ - path: source, - issues: parsed.error.issues, + throw new InvalidError({ + path: source, + issues: parsed.error.issues, + }) }) - }) - const loadFile = Effect.fnUntraced(function* (filepath: string) { - log.info("loading", { path: filepath }) - const text = yield* readConfigFile(filepath) - if (!text) return {} as Info - return yield* loadConfig(text, { path: filepath }) - }) + const loadFile = Effect.fnUntraced(function* (filepath: string) { + log.info("loading", { path: filepath }) + const text = yield* readConfigFile(filepath) + if (!text) return {} as Info + return yield* loadConfig(text, { path: filepath }) + }) - const loadGlobal = Effect.fnUntraced(function* () { - let result: Info = pipe( - {}, - mergeDeep(yield* loadFile(path.join(Global.Path.config, "config.json"))), - mergeDeep(yield* loadFile(path.join(Global.Path.config, "opencode.json"))), - mergeDeep(yield* loadFile(path.join(Global.Path.config, "opencode.jsonc"))), + const loadGlobal = Effect.fnUntraced(function* () { + let result: Info = pipe( + {}, + mergeDeep(yield* loadFile(path.join(Global.Path.config, "config.json"))), + mergeDeep(yield* loadFile(path.join(Global.Path.config, "opencode.json"))), + mergeDeep(yield* loadFile(path.join(Global.Path.config, "opencode.jsonc"))), + ) + + const legacy = path.join(Global.Path.config, "config") + if (existsSync(legacy)) { + yield* Effect.promise(() => + import(pathToFileURL(legacy).href, { with: { type: "toml" } }) + .then(async (mod) => { + const { provider, model, ...rest } = mod.default + if (provider && model) result.model = `${provider}/${model}` + result["$schema"] = "https://opencode.ai/config.json" + result = mergeDeep(result, rest) + await fsNode.writeFile(path.join(Global.Path.config, "config.json"), JSON.stringify(result, null, 2)) + await fsNode.unlink(legacy) + }) + .catch(() => {}), + ) + } + + return result + }) + + const [cachedGlobal, invalidateGlobal] = yield* Effect.cachedInvalidateWithTTL( + loadGlobal().pipe( + Effect.tapError((error) => + Effect.sync(() => log.error("failed to load global config, using defaults", { error: String(error) })), + ), + Effect.orElseSucceed((): Info => ({})), + ), + Duration.infinity, ) - const legacy = path.join(Global.Path.config, "config") - if (existsSync(legacy)) { - yield* Effect.promise(() => - import(pathToFileURL(legacy).href, { with: { type: "toml" } }) - .then(async (mod) => { - const { provider, model, ...rest } = mod.default - if (provider && model) result.model = `${provider}/${model}` - result["$schema"] = "https://opencode.ai/config.json" - result = mergeDeep(result, rest) - await fsNode.writeFile(path.join(Global.Path.config, "config.json"), JSON.stringify(result, null, 2)) - await fsNode.unlink(legacy) - }) - .catch(() => {}), - ) - } + const getGlobal = Effect.fn("Config.getGlobal")(function* () { + return yield* cachedGlobal + }) - return result - }) + const loadInstanceState = Effect.fnUntraced(function* (ctx: InstanceContext) { + const auth = yield* authSvc.all().pipe(Effect.orDie) - const [cachedGlobal, invalidateGlobal] = yield* Effect.cachedInvalidateWithTTL( - loadGlobal().pipe( - Effect.tapError((error) => - Effect.sync(() => log.error("failed to load global config, using defaults", { error: String(error) })), - ), - Effect.orElseSucceed((): Info => ({})), - ), - Duration.infinity, - ) - - const getGlobal = Effect.fn("Config.getGlobal")(function* () { - return yield* cachedGlobal - }) - - const loadInstanceState = Effect.fnUntraced(function* (ctx: InstanceContext) { - const auth = yield* authSvc.all().pipe(Effect.orDie) - - let result: Info = {} - for (const [key, value] of Object.entries(auth)) { - if (value.type === "wellknown") { - const url = key.replace(/\/+$/, "") - process.env[value.key] = value.token - log.debug("fetching remote config", { url: `${url}/.well-known/opencode` }) - const response = yield* Effect.promise(() => fetch(`${url}/.well-known/opencode`)) - if (!response.ok) { - throw new Error(`failed to fetch remote config from ${url}: ${response.status}`) - } - const wellknown = (yield* Effect.promise(() => response.json())) as any - const remoteConfig = wellknown.config ?? {} - if (!remoteConfig.$schema) remoteConfig.$schema = "https://opencode.ai/config.json" - result = mergeConfigConcatArrays( - result, - yield* loadConfig(JSON.stringify(remoteConfig), { - dir: path.dirname(`${url}/.well-known/opencode`), - source: `${url}/.well-known/opencode`, - }), - ) - log.debug("loaded remote config from well-known", { url }) - } - } - - result = mergeConfigConcatArrays(result, yield* getGlobal()) - - if (Flag.OPENCODE_CONFIG) { - result = mergeConfigConcatArrays(result, yield* loadFile(Flag.OPENCODE_CONFIG)) - log.debug("loaded custom config", { path: Flag.OPENCODE_CONFIG }) - } - - if (!Flag.OPENCODE_DISABLE_PROJECT_CONFIG) { - for (const file of yield* Effect.promise(() => - ConfigPaths.projectFiles("opencode", ctx.directory, ctx.worktree), - )) { - result = mergeConfigConcatArrays(result, yield* loadFile(file)) - } - } - - result.agent = result.agent || {} - result.mode = result.mode || {} - result.plugin = result.plugin || [] - - const directories = yield* Effect.promise(() => ConfigPaths.directories(ctx.directory, ctx.worktree)) - - if (Flag.OPENCODE_CONFIG_DIR) { - log.debug("loading config from OPENCODE_CONFIG_DIR", { path: Flag.OPENCODE_CONFIG_DIR }) - } - - const deps: Promise[] = [] - - for (const dir of unique(directories)) { - if (dir.endsWith(".opencode") || dir === Flag.OPENCODE_CONFIG_DIR) { - for (const file of ["opencode.jsonc", "opencode.json"]) { - log.debug(`loading config from ${path.join(dir, file)}`) - result = mergeConfigConcatArrays(result, yield* loadFile(path.join(dir, file))) - result.agent ??= {} - result.mode ??= {} - result.plugin ??= [] - } - } - - deps.push( - iife(async () => { - const shouldInstall = await needsInstall(dir) - if (shouldInstall) await installDependencies(dir) - }), - ) - - result.command = mergeDeep(result.command ?? {}, yield* Effect.promise(() => loadCommand(dir))) - result.agent = mergeDeep(result.agent, yield* Effect.promise(() => loadAgent(dir))) - result.agent = mergeDeep(result.agent, yield* Effect.promise(() => loadMode(dir))) - result.plugin.push(...(yield* Effect.promise(() => loadPlugin(dir)))) - } - - if (process.env.OPENCODE_CONFIG_CONTENT) { - result = mergeConfigConcatArrays( - result, - yield* loadConfig(process.env.OPENCODE_CONFIG_CONTENT, { - dir: ctx.directory, - source: "OPENCODE_CONFIG_CONTENT", - }), - ) - log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT") - } - - const active = Option.getOrUndefined(yield* accountSvc.active().pipe(Effect.orDie)) - if (active?.active_org_id) { - yield* Effect.gen(function* () { - const [configOpt, tokenOpt] = yield* Effect.all( - [accountSvc.config(active.id, active.active_org_id!), accountSvc.token(active.id)], - { concurrency: 2 }, - ) - const token = Option.getOrUndefined(tokenOpt) - if (token) { - process.env["OPENCODE_CONSOLE_TOKEN"] = token - Env.set("OPENCODE_CONSOLE_TOKEN", token) - } - - const config = Option.getOrUndefined(configOpt) - if (config) { + let result: Info = {} + for (const [key, value] of Object.entries(auth)) { + if (value.type === "wellknown") { + const url = key.replace(/\/+$/, "") + process.env[value.key] = value.token + log.debug("fetching remote config", { url: `${url}/.well-known/opencode` }) + const response = yield* Effect.promise(() => fetch(`${url}/.well-known/opencode`)) + if (!response.ok) { + throw new Error(`failed to fetch remote config from ${url}: ${response.status}`) + } + const wellknown = (yield* Effect.promise(() => response.json())) as any + const remoteConfig = wellknown.config ?? {} + if (!remoteConfig.$schema) remoteConfig.$schema = "https://opencode.ai/config.json" result = mergeConfigConcatArrays( result, - yield* loadConfig(JSON.stringify(config), { - dir: path.dirname(`${active.url}/api/config`), - source: `${active.url}/api/config`, + yield* loadConfig(JSON.stringify(remoteConfig), { + dir: path.dirname(`${url}/.well-known/opencode`), + source: `${url}/.well-known/opencode`, }), ) + log.debug("loaded remote config from well-known", { url }) } - }).pipe( - Effect.catch((err) => { - log.debug("failed to fetch remote account config", { - error: err instanceof Error ? err.message : String(err), - }) - return Effect.void - }), - ) - } - - if (existsSync(managedDir)) { - for (const file of ["opencode.jsonc", "opencode.json"]) { - result = mergeConfigConcatArrays(result, yield* loadFile(path.join(managedDir, file))) } - } - for (const [name, mode] of Object.entries(result.mode ?? {})) { - result.agent = mergeDeep(result.agent ?? {}, { - [name]: { - ...mode, - mode: "primary" as const, - }, - }) - } + result = mergeConfigConcatArrays(result, yield* getGlobal()) - if (Flag.OPENCODE_PERMISSION) { - result.permission = mergeDeep(result.permission ?? {}, JSON.parse(Flag.OPENCODE_PERMISSION)) - } + if (Flag.OPENCODE_CONFIG) { + result = mergeConfigConcatArrays(result, yield* loadFile(Flag.OPENCODE_CONFIG)) + log.debug("loaded custom config", { path: Flag.OPENCODE_CONFIG }) + } - if (result.tools) { - const perms: Record = {} - for (const [tool, enabled] of Object.entries(result.tools)) { - const action: Config.PermissionAction = enabled ? "allow" : "deny" - if (tool === "write" || tool === "edit" || tool === "patch" || tool === "multiedit") { - perms.edit = action - continue + if (!Flag.OPENCODE_DISABLE_PROJECT_CONFIG) { + for (const file of yield* Effect.promise(() => + ConfigPaths.projectFiles("opencode", ctx.directory, ctx.worktree), + )) { + result = mergeConfigConcatArrays(result, yield* loadFile(file)) } - perms[tool] = action } - result.permission = mergeDeep(perms, result.permission ?? {}) - } - if (!result.username) result.username = os.userInfo().username + result.agent = result.agent || {} + result.mode = result.mode || {} + result.plugin = result.plugin || [] - if (result.autoshare === true && !result.share) { - result.share = "auto" - } + const directories = yield* Effect.promise(() => ConfigPaths.directories(ctx.directory, ctx.worktree)) - if (Flag.OPENCODE_DISABLE_AUTOCOMPACT) { - result.compaction = { ...result.compaction, auto: false } - } - if (Flag.OPENCODE_DISABLE_PRUNE) { - result.compaction = { ...result.compaction, prune: false } - } + if (Flag.OPENCODE_CONFIG_DIR) { + log.debug("loading config from OPENCODE_CONFIG_DIR", { path: Flag.OPENCODE_CONFIG_DIR }) + } - result.plugin = deduplicatePlugins(result.plugin ?? []) + const deps: Promise[] = [] - return { - config: result, - directories, - deps, - } - }) + for (const dir of unique(directories)) { + if (dir.endsWith(".opencode") || dir === Flag.OPENCODE_CONFIG_DIR) { + for (const file of ["opencode.jsonc", "opencode.json"]) { + log.debug(`loading config from ${path.join(dir, file)}`) + result = mergeConfigConcatArrays(result, yield* loadFile(path.join(dir, file))) + result.agent ??= {} + result.mode ??= {} + result.plugin ??= [] + } + } - const state = yield* InstanceState.make( - Effect.fn("Config.state")(function* (ctx) { - return yield* loadInstanceState(ctx) - }), - ) + deps.push( + iife(async () => { + const shouldInstall = await needsInstall(dir) + if (shouldInstall) await installDependencies(dir) + }), + ) - const get = Effect.fn("Config.get")(function* () { - return yield* InstanceState.use(state, (s) => s.config) - }) + result.command = mergeDeep(result.command ?? {}, yield* Effect.promise(() => loadCommand(dir))) + result.agent = mergeDeep(result.agent, yield* Effect.promise(() => loadAgent(dir))) + result.agent = mergeDeep(result.agent, yield* Effect.promise(() => loadMode(dir))) + result.plugin.push(...(yield* Effect.promise(() => loadPlugin(dir)))) + } - const directories = Effect.fn("Config.directories")(function* () { - return yield* InstanceState.use(state, (s) => s.directories) - }) + if (process.env.OPENCODE_CONFIG_CONTENT) { + result = mergeConfigConcatArrays( + result, + yield* loadConfig(process.env.OPENCODE_CONFIG_CONTENT, { + dir: ctx.directory, + source: "OPENCODE_CONFIG_CONTENT", + }), + ) + log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT") + } - const waitForDependencies = Effect.fn("Config.waitForDependencies")(function* () { - yield* InstanceState.useEffect(state, (s) => Effect.promise(() => Promise.all(s.deps).then(() => undefined))) - }) + const active = Option.getOrUndefined(yield* accountSvc.active().pipe(Effect.orDie)) + if (active?.active_org_id) { + yield* Effect.gen(function* () { + const [configOpt, tokenOpt] = yield* Effect.all( + [accountSvc.config(active.id, active.active_org_id!), accountSvc.token(active.id)], + { concurrency: 2 }, + ) + const token = Option.getOrUndefined(tokenOpt) + if (token) { + process.env["OPENCODE_CONSOLE_TOKEN"] = token + Env.set("OPENCODE_CONSOLE_TOKEN", token) + } - const update = Effect.fn("Config.update")(function* (config: Info) { - const file = path.join(Instance.directory, "config.json") - const existing = yield* loadFile(file) - yield* fs.writeFileString(file, JSON.stringify(mergeDeep(existing, config), null, 2)).pipe(Effect.orDie) - yield* Effect.promise(() => Instance.dispose()) - }) + const config = Option.getOrUndefined(configOpt) + if (config) { + result = mergeConfigConcatArrays( + result, + yield* loadConfig(JSON.stringify(config), { + dir: path.dirname(`${active.url}/api/config`), + source: `${active.url}/api/config`, + }), + ) + } + }).pipe( + Effect.catch((err) => { + log.debug("failed to fetch remote account config", { + error: err instanceof Error ? err.message : String(err), + }) + return Effect.void + }), + ) + } - const invalidate = Effect.fn("Config.invalidate")(function* (wait?: boolean) { - yield* invalidateGlobal - const task = Instance.disposeAll() - .catch(() => undefined) - .finally(() => - GlobalBus.emit("event", { - directory: "global", - payload: { - type: Event.Disposed.type, - properties: {}, + if (existsSync(managedDir)) { + for (const file of ["opencode.jsonc", "opencode.json"]) { + result = mergeConfigConcatArrays(result, yield* loadFile(path.join(managedDir, file))) + } + } + + for (const [name, mode] of Object.entries(result.mode ?? {})) { + result.agent = mergeDeep(result.agent ?? {}, { + [name]: { + ...mode, + mode: "primary" as const, }, - }), - ) - if (wait) yield* Effect.promise(() => task) - else void task - }) + }) + } - const updateGlobal = Effect.fn("Config.updateGlobal")(function* (config: Info) { - const file = globalConfigFile() - const before = (yield* readConfigFile(file)) ?? "{}" + if (Flag.OPENCODE_PERMISSION) { + result.permission = mergeDeep(result.permission ?? {}, JSON.parse(Flag.OPENCODE_PERMISSION)) + } - let next: Info - if (!file.endsWith(".jsonc")) { - const existing = parseConfig(before, file) - const merged = mergeDeep(existing, config) - yield* fs.writeFileString(file, JSON.stringify(merged, null, 2)).pipe(Effect.orDie) - next = merged - } else { - const updated = patchJsonc(before, config) - next = parseConfig(updated, file) - yield* fs.writeFileString(file, updated).pipe(Effect.orDie) - } + if (result.tools) { + const perms: Record = {} + for (const [tool, enabled] of Object.entries(result.tools)) { + const action: Config.PermissionAction = enabled ? "allow" : "deny" + if (tool === "write" || tool === "edit" || tool === "patch" || tool === "multiedit") { + perms.edit = action + continue + } + perms[tool] = action + } + result.permission = mergeDeep(perms, result.permission ?? {}) + } - yield* invalidate() - return next - }) + if (!result.username) result.username = os.userInfo().username - return Service.of({ - get, - getGlobal, - update, - updateGlobal, - invalidate, - directories, - waitForDependencies, - }) - }), - ) + if (result.autoshare === true && !result.share) { + result.share = "auto" + } + + if (Flag.OPENCODE_DISABLE_AUTOCOMPACT) { + result.compaction = { ...result.compaction, auto: false } + } + if (Flag.OPENCODE_DISABLE_PRUNE) { + result.compaction = { ...result.compaction, prune: false } + } + + result.plugin = deduplicatePlugins(result.plugin ?? []) + + return { + config: result, + directories, + deps, + } + }) + + const state = yield* InstanceState.make( + Effect.fn("Config.state")(function* (ctx) { + return yield* loadInstanceState(ctx) + }), + ) + + const get = Effect.fn("Config.get")(function* () { + return yield* InstanceState.use(state, (s) => s.config) + }) + + const directories = Effect.fn("Config.directories")(function* () { + return yield* InstanceState.use(state, (s) => s.directories) + }) + + const waitForDependencies = Effect.fn("Config.waitForDependencies")(function* () { + yield* InstanceState.useEffect(state, (s) => Effect.promise(() => Promise.all(s.deps).then(() => undefined))) + }) + + const update = Effect.fn("Config.update")(function* (config: Info) { + const file = path.join(Instance.directory, "config.json") + const existing = yield* loadFile(file) + yield* fs.writeFileString(file, JSON.stringify(mergeDeep(existing, config), null, 2)).pipe(Effect.orDie) + yield* Effect.promise(() => Instance.dispose()) + }) + + const invalidate = Effect.fn("Config.invalidate")(function* (wait?: boolean) { + yield* invalidateGlobal + const task = Instance.disposeAll() + .catch(() => undefined) + .finally(() => + GlobalBus.emit("event", { + directory: "global", + payload: { + type: Event.Disposed.type, + properties: {}, + }, + }), + ) + if (wait) yield* Effect.promise(() => task) + else void task + }) + + const updateGlobal = Effect.fn("Config.updateGlobal")(function* (config: Info) { + const file = globalConfigFile() + const before = (yield* readConfigFile(file)) ?? "{}" + + let next: Info + if (!file.endsWith(".jsonc")) { + const existing = parseConfig(before, file) + const merged = mergeDeep(existing, config) + yield* fs.writeFileString(file, JSON.stringify(merged, null, 2)).pipe(Effect.orDie) + next = merged + } else { + const updated = patchJsonc(before, config) + next = parseConfig(updated, file) + yield* fs.writeFileString(file, updated).pipe(Effect.orDie) + } + + yield* invalidate() + return next + }) + + return Service.of({ + get, + getGlobal, + update, + updateGlobal, + invalidate, + directories, + waitForDependencies, + }) + }), + ) export const defaultLayer = layer.pipe( Layer.provide(AppFileSystem.defaultLayer), diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 15ab0c9e3a..e3bf4cac06 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -477,10 +477,8 @@ export namespace MCP { }) } - const cache = yield* InstanceState.make( Effect.fn("MCP.state")(function* () { - const cfg = yield* cfgSvc.get() const config = cfg.mcp ?? {} const s: State = { @@ -706,7 +704,6 @@ export namespace MCP { }) const getMcpConfig = Effect.fnUntraced(function* (mcpName: string) { - const cfg = yield* cfgSvc.get() const mcpConfig = cfg.mcp?.[mcpName] if (!mcpConfig || !isMcpConfigured(mcpConfig)) return undefined diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts index 4429a25696..a0ab62f75c 100644 --- a/packages/opencode/src/snapshot/index.ts +++ b/packages/opencode/src/snapshot/index.ts @@ -82,350 +82,341 @@ export namespace Snapshot { } const state = yield* InstanceState.make( - Effect.fn("Snapshot.state")(function* (ctx) { - const state = { - directory: ctx.directory, - worktree: ctx.worktree, - gitdir: path.join(Global.Path.data, "snapshot", ctx.project.id, Hash.fast(ctx.worktree)), - vcs: ctx.project.vcs, - } + Effect.fn("Snapshot.state")(function* (ctx) { + const state = { + directory: ctx.directory, + worktree: ctx.worktree, + gitdir: path.join(Global.Path.data, "snapshot", ctx.project.id, Hash.fast(ctx.worktree)), + vcs: ctx.project.vcs, + } - const args = (cmd: string[]) => ["--git-dir", state.gitdir, "--work-tree", state.worktree, ...cmd] + const args = (cmd: string[]) => ["--git-dir", state.gitdir, "--work-tree", state.worktree, ...cmd] - const git = Effect.fnUntraced( - function* (cmd: string[], opts?: { cwd?: string; env?: Record }) { - const proc = ChildProcess.make("git", cmd, { - cwd: opts?.cwd, - env: opts?.env, - extendEnv: true, - }) - const handle = yield* spawner.spawn(proc) - 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((err) => - Effect.succeed({ - code: ChildProcessSpawner.ExitCode(1), - text: "", - stderr: String(err), - }), - ), - ) - - const exists = (file: string) => fs.exists(file).pipe(Effect.orDie) - const read = (file: string) => fs.readFileString(file).pipe(Effect.catch(() => Effect.succeed(""))) - const remove = (file: string) => fs.remove(file).pipe(Effect.catch(() => Effect.void)) - const locked = (fx: Effect.Effect) => lock(state.gitdir).withPermits(1)(fx) - - const enabled = Effect.fnUntraced(function* () { - if (state.vcs !== "git") return false - return (yield* config.get()).snapshot !== false - }) - - const excludes = Effect.fnUntraced(function* () { - const result = yield* git(["rev-parse", "--path-format=absolute", "--git-path", "info/exclude"], { - cwd: state.worktree, + const git = Effect.fnUntraced( + function* (cmd: string[], opts?: { cwd?: string; env?: Record }) { + const proc = ChildProcess.make("git", cmd, { + cwd: opts?.cwd, + env: opts?.env, + extendEnv: true, }) - const file = result.text.trim() - if (!file) return - if (!(yield* exists(file))) return - return file - }) - - const sync = Effect.fnUntraced(function* (list: string[] = []) { - const file = yield* excludes() - const target = path.join(state.gitdir, "info", "exclude") - const text = [ - file ? (yield* read(file)).trimEnd() : "", - ...list.map((item) => `/${item.replaceAll("\\", "/")}`), - ] - .filter(Boolean) - .join("\n") - yield* fs.ensureDir(path.join(state.gitdir, "info")).pipe(Effect.orDie) - yield* fs.writeFileString(target, text ? `${text}\n` : "").pipe(Effect.orDie) - }) - - const add = Effect.fnUntraced(function* () { - yield* sync() - const [diff, other] = yield* Effect.all( - [ - git([...quote, ...args(["diff-files", "--name-only", "-z", "--", "."])], { - cwd: state.directory, - }), - git([...quote, ...args(["ls-files", "--others", "--exclude-standard", "-z", "--", "."])], { - cwd: state.directory, - }), - ], + const handle = yield* spawner.spawn(proc) + const [text, stderr] = yield* Effect.all( + [Stream.mkString(Stream.decodeText(handle.stdout)), Stream.mkString(Stream.decodeText(handle.stderr))], { concurrency: 2 }, ) - if (diff.code !== 0 || other.code !== 0) { - log.warn("failed to list snapshot files", { - diffCode: diff.code, - diffStderr: diff.stderr, - otherCode: other.code, - otherStderr: other.stderr, - }) - return - } + const code = yield* handle.exitCode + return { code, text, stderr } satisfies GitResult + }, + Effect.scoped, + Effect.catch((err) => + Effect.succeed({ + code: ChildProcessSpawner.ExitCode(1), + text: "", + stderr: String(err), + }), + ), + ) - const tracked = diff.text.split("\0").filter(Boolean) - const all = Array.from(new Set([...tracked, ...other.text.split("\0").filter(Boolean)])) - if (!all.length) return + const exists = (file: string) => fs.exists(file).pipe(Effect.orDie) + const read = (file: string) => fs.readFileString(file).pipe(Effect.catch(() => Effect.succeed(""))) + const remove = (file: string) => fs.remove(file).pipe(Effect.catch(() => Effect.void)) + const locked = (fx: Effect.Effect) => lock(state.gitdir).withPermits(1)(fx) - const large = (yield* Effect.all( - all.map((item) => - fs - .stat(path.join(state.directory, item)) - .pipe(Effect.catch(() => Effect.void)) - .pipe( - Effect.map((stat) => { - if (!stat || stat.type !== "File") return - const size = typeof stat.size === "bigint" ? Number(stat.size) : stat.size - return size > limit ? item : undefined - }), - ), - ), - { concurrency: 8 }, - )).filter((item): item is string => Boolean(item)) - yield* sync(large) - const result = yield* git([...cfg, ...args(["add", "--sparse", "."])], { cwd: state.directory }) - if (result.code !== 0) { - log.warn("failed to add snapshot files", { - exitCode: result.code, - stderr: result.stderr, - }) - } + const enabled = Effect.fnUntraced(function* () { + if (state.vcs !== "git") return false + return (yield* config.get()).snapshot !== false + }) + + const excludes = Effect.fnUntraced(function* () { + const result = yield* git(["rev-parse", "--path-format=absolute", "--git-path", "info/exclude"], { + cwd: state.worktree, }) + const file = result.text.trim() + if (!file) return + if (!(yield* exists(file))) return + return file + }) - const cleanup = Effect.fnUntraced(function* () { - return yield* locked( - Effect.gen(function* () { - if (!(yield* enabled())) return - if (!(yield* exists(state.gitdir))) return - const result = yield* git(args(["gc", `--prune=${prune}`]), { cwd: state.directory }) - if (result.code !== 0) { - log.warn("cleanup failed", { - exitCode: result.code, - stderr: result.stderr, - }) - return - } - log.info("cleanup", { prune }) + const sync = Effect.fnUntraced(function* (list: string[] = []) { + const file = yield* excludes() + const target = path.join(state.gitdir, "info", "exclude") + const text = [ + file ? (yield* read(file)).trimEnd() : "", + ...list.map((item) => `/${item.replaceAll("\\", "/")}`), + ] + .filter(Boolean) + .join("\n") + yield* fs.ensureDir(path.join(state.gitdir, "info")).pipe(Effect.orDie) + yield* fs.writeFileString(target, text ? `${text}\n` : "").pipe(Effect.orDie) + }) + + const add = Effect.fnUntraced(function* () { + yield* sync() + const [diff, other] = yield* Effect.all( + [ + git([...quote, ...args(["diff-files", "--name-only", "-z", "--", "."])], { + cwd: state.directory, }), - ) - }) - - const track = Effect.fnUntraced(function* () { - return yield* locked( - Effect.gen(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() - log.info("tracking", { hash, cwd: state.directory, git: state.gitdir }) - return hash + git([...quote, ...args(["ls-files", "--others", "--exclude-standard", "-z", "--", "."])], { + cwd: state.directory, }), - ) - }) + ], + { concurrency: 2 }, + ) + if (diff.code !== 0 || other.code !== 0) { + log.warn("failed to list snapshot files", { + diffCode: diff.code, + diffStderr: diff.stderr, + otherCode: other.code, + otherStderr: other.stderr, + }) + return + } - const patch = Effect.fnUntraced(function* (hash: string) { - return yield* locked( - Effect.gen(function* () { - yield* add() - const result = yield* git( - [...quote, ...args(["diff", "--cached", "--no-ext-diff", "--name-only", hash, "--", "."])], - { - cwd: state.directory, - }, - ) - if (result.code !== 0) { - log.warn("failed to get diff", { hash, exitCode: result.code }) - return { hash, files: [] } - } - return { - hash, - files: result.text - .trim() - .split("\n") - .map((x) => x.trim()) - .filter(Boolean) - .map((x) => path.join(state.worktree, x).replaceAll("\\", "/")), - } - }), - ) - }) + const tracked = diff.text.split("\0").filter(Boolean) + const all = Array.from(new Set([...tracked, ...other.text.split("\0").filter(Boolean)])) + if (!all.length) return - const restore = Effect.fnUntraced(function* (snapshot: string) { - return yield* locked( - Effect.gen(function* () { - log.info("restore", { commit: snapshot }) - const result = yield* git([...core, ...args(["read-tree", snapshot])], { cwd: state.worktree }) - if (result.code === 0) { - const checkout = yield* git([...core, ...args(["checkout-index", "-a", "-f"])], { - cwd: state.worktree, - }) - if (checkout.code === 0) return - log.error("failed to restore snapshot", { - snapshot, - exitCode: checkout.code, - stderr: checkout.stderr, - }) - return - } - log.error("failed to restore snapshot", { - snapshot, + const large = (yield* Effect.all( + all.map((item) => + fs + .stat(path.join(state.directory, item)) + .pipe(Effect.catch(() => Effect.void)) + .pipe( + Effect.map((stat) => { + if (!stat || stat.type !== "File") return + const size = typeof stat.size === "bigint" ? Number(stat.size) : stat.size + return size > limit ? item : undefined + }), + ), + ), + { concurrency: 8 }, + )).filter((item): item is string => Boolean(item)) + yield* sync(large) + const result = yield* git([...cfg, ...args(["add", "--sparse", "."])], { cwd: state.directory }) + if (result.code !== 0) { + log.warn("failed to add snapshot files", { + exitCode: result.code, + stderr: result.stderr, + }) + } + }) + + const cleanup = Effect.fnUntraced(function* () { + return yield* locked( + Effect.gen(function* () { + if (!(yield* enabled())) return + if (!(yield* exists(state.gitdir))) return + const result = yield* git(args(["gc", `--prune=${prune}`]), { cwd: state.directory }) + if (result.code !== 0) { + log.warn("cleanup failed", { exitCode: result.code, stderr: result.stderr, }) - }), - ) - }) + return + } + log.info("cleanup", { prune }) + }), + ) + }) - const revert = Effect.fnUntraced(function* (patches: Snapshot.Patch[]) { - return yield* locked( - Effect.gen(function* () { - const seen = new Set() - for (const item of patches) { - for (const file of item.files) { - if (seen.has(file)) continue - seen.add(file) - log.info("reverting", { file, hash: item.hash }) - const result = yield* git([...core, ...args(["checkout", item.hash, "--", file])], { + const track = Effect.fnUntraced(function* () { + return yield* locked( + Effect.gen(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() + log.info("tracking", { hash, cwd: state.directory, git: state.gitdir }) + return hash + }), + ) + }) + + const patch = Effect.fnUntraced(function* (hash: string) { + return yield* locked( + Effect.gen(function* () { + yield* add() + const result = yield* git( + [...quote, ...args(["diff", "--cached", "--no-ext-diff", "--name-only", hash, "--", "."])], + { + cwd: state.directory, + }, + ) + if (result.code !== 0) { + log.warn("failed to get diff", { hash, exitCode: result.code }) + return { hash, files: [] } + } + return { + hash, + files: result.text + .trim() + .split("\n") + .map((x) => x.trim()) + .filter(Boolean) + .map((x) => path.join(state.worktree, x).replaceAll("\\", "/")), + } + }), + ) + }) + + const restore = Effect.fnUntraced(function* (snapshot: string) { + return yield* locked( + Effect.gen(function* () { + log.info("restore", { commit: snapshot }) + const result = yield* git([...core, ...args(["read-tree", snapshot])], { cwd: state.worktree }) + if (result.code === 0) { + const checkout = yield* git([...core, ...args(["checkout-index", "-a", "-f"])], { + cwd: state.worktree, + }) + if (checkout.code === 0) return + log.error("failed to restore snapshot", { + snapshot, + exitCode: checkout.code, + stderr: checkout.stderr, + }) + return + } + log.error("failed to restore snapshot", { + snapshot, + exitCode: result.code, + stderr: result.stderr, + }) + }), + ) + }) + + const revert = Effect.fnUntraced(function* (patches: Snapshot.Patch[]) { + return yield* locked( + Effect.gen(function* () { + const seen = new Set() + for (const item of patches) { + for (const file of item.files) { + if (seen.has(file)) continue + seen.add(file) + log.info("reverting", { file, hash: item.hash }) + const result = yield* git([...core, ...args(["checkout", item.hash, "--", file])], { + cwd: state.worktree, + }) + if (result.code !== 0) { + const rel = path.relative(state.worktree, file) + const tree = yield* git([...core, ...args(["ls-tree", item.hash, "--", rel])], { cwd: state.worktree, }) - if (result.code !== 0) { - const rel = path.relative(state.worktree, file) - const tree = yield* git([...core, ...args(["ls-tree", item.hash, "--", rel])], { - cwd: state.worktree, - }) - if (tree.code === 0 && tree.text.trim()) { - log.info("file existed in snapshot but checkout failed, keeping", { file }) - } else { - log.info("file did not exist in snapshot, deleting", { file }) - yield* remove(file) - } + if (tree.code === 0 && tree.text.trim()) { + log.info("file existed in snapshot but checkout failed, keeping", { file }) + } else { + log.info("file did not exist in snapshot, deleting", { file }) + yield* remove(file) } } } - }), - ) - }) - - const diff = Effect.fnUntraced(function* (hash: string) { - return yield* locked( - Effect.gen(function* () { - yield* add() - const result = yield* git( - [...quote, ...args(["diff", "--cached", "--no-ext-diff", hash, "--", "."])], - { - cwd: state.worktree, - }, - ) - if (result.code !== 0) { - log.warn("failed to get diff", { - hash, - exitCode: result.code, - stderr: result.stderr, - }) - return "" - } - return result.text.trim() - }), - ) - }) - - const diffFull = Effect.fnUntraced(function* (from: string, to: string) { - return yield* locked( - Effect.gen(function* () { - const result: Snapshot.FileDiff[] = [] - const status = new Map() - - const statuses = yield* git( - [ - ...quote, - ...args(["diff", "--no-ext-diff", "--name-status", "--no-renames", from, to, "--", "."]), - ], - { cwd: state.directory }, - ) - - for (const line of statuses.text.trim().split("\n")) { - if (!line) continue - const [code, file] = line.split("\t") - if (!code || !file) continue - status.set(file, code.startsWith("A") ? "added" : code.startsWith("D") ? "deleted" : "modified") - } - - const numstat = yield* git( - [...quote, ...args(["diff", "--no-ext-diff", "--no-renames", "--numstat", from, to, "--", "."])], - { - cwd: state.directory, - }, - ) - - for (const line of numstat.text.trim().split("\n")) { - if (!line) continue - const [adds, dels, file] = line.split("\t") - if (!file) continue - const binary = adds === "-" && dels === "-" - const [before, after] = binary - ? ["", ""] - : yield* Effect.all( - [ - git([...cfg, ...args(["show", `${from}:${file}`])]).pipe(Effect.map((item) => item.text)), - git([...cfg, ...args(["show", `${to}:${file}`])]).pipe(Effect.map((item) => item.text)), - ], - { concurrency: 2 }, - ) - const additions = binary ? 0 : parseInt(adds) - const deletions = binary ? 0 : parseInt(dels) - result.push({ - file, - before, - after, - additions: Number.isFinite(additions) ? additions : 0, - deletions: Number.isFinite(deletions) ? deletions : 0, - status: status.get(file) ?? "modified", - }) - } - - return result - }), - ) - }) - - yield* cleanup().pipe( - Effect.catchCause((cause) => { - log.error("cleanup loop failed", { cause: Cause.pretty(cause) }) - return Effect.void + } }), - Effect.repeat(Schedule.spaced(Duration.hours(1))), - Effect.delay(Duration.minutes(1)), - Effect.forkScoped, ) + }) - return { cleanup, track, patch, restore, revert, diff, diffFull } - }), - ) + const diff = Effect.fnUntraced(function* (hash: string) { + return yield* locked( + Effect.gen(function* () { + yield* add() + const result = yield* git([...quote, ...args(["diff", "--cached", "--no-ext-diff", hash, "--", "."])], { + cwd: state.worktree, + }) + if (result.code !== 0) { + log.warn("failed to get diff", { + hash, + exitCode: result.code, + stderr: result.stderr, + }) + return "" + } + return result.text.trim() + }), + ) + }) + + const diffFull = Effect.fnUntraced(function* (from: string, to: string) { + return yield* locked( + Effect.gen(function* () { + const result: Snapshot.FileDiff[] = [] + const status = new Map() + + const statuses = yield* git( + [...quote, ...args(["diff", "--no-ext-diff", "--name-status", "--no-renames", from, to, "--", "."])], + { cwd: state.directory }, + ) + + for (const line of statuses.text.trim().split("\n")) { + if (!line) continue + const [code, file] = line.split("\t") + if (!code || !file) continue + status.set(file, code.startsWith("A") ? "added" : code.startsWith("D") ? "deleted" : "modified") + } + + const numstat = yield* git( + [...quote, ...args(["diff", "--no-ext-diff", "--no-renames", "--numstat", from, to, "--", "."])], + { + cwd: state.directory, + }, + ) + + for (const line of numstat.text.trim().split("\n")) { + if (!line) continue + const [adds, dels, file] = line.split("\t") + if (!file) continue + const binary = adds === "-" && dels === "-" + const [before, after] = binary + ? ["", ""] + : yield* Effect.all( + [ + git([...cfg, ...args(["show", `${from}:${file}`])]).pipe(Effect.map((item) => item.text)), + git([...cfg, ...args(["show", `${to}:${file}`])]).pipe(Effect.map((item) => item.text)), + ], + { concurrency: 2 }, + ) + const additions = binary ? 0 : parseInt(adds) + const deletions = binary ? 0 : parseInt(dels) + result.push({ + file, + before, + after, + additions: Number.isFinite(additions) ? additions : 0, + deletions: Number.isFinite(deletions) ? deletions : 0, + status: status.get(file) ?? "modified", + }) + } + + return result + }), + ) + }) + + yield* cleanup().pipe( + Effect.catchCause((cause) => { + log.error("cleanup loop failed", { cause: Cause.pretty(cause) }) + return Effect.void + }), + Effect.repeat(Schedule.spaced(Duration.hours(1))), + Effect.delay(Duration.minutes(1)), + Effect.forkScoped, + ) + + return { cleanup, track, patch, restore, revert, diff, diffFull } + }), + ) return Service.of({ init: Effect.fn("Snapshot.init")(function* () { From e96eead32eb28c8b78be9def46cb1688d49468ae Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Thu, 26 Mar 2026 22:14:46 -0400 Subject: [PATCH 003/142] refactor(vcs): replace async git() with ChildProcessSpawner (#19361) --- packages/opencode/src/project/vcs.ts | 39 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/packages/opencode/src/project/vcs.ts b/packages/opencode/src/project/vcs.ts index 1c595f7f14..25f172b8a8 100644 --- a/packages/opencode/src/project/vcs.ts +++ b/packages/opencode/src/project/vcs.ts @@ -1,12 +1,12 @@ import { Effect, Layer, ServiceMap, Stream } from "effect" +import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process" import { Bus } from "@/bus" import { BusEvent } from "@/bus/bus-event" +import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner" import { InstanceState } from "@/effect/instance-state" import { makeRuntime } from "@/effect/run-service" import { FileWatcher } from "@/file/watcher" import { Log } from "@/util/log" -import { git } from "@/util/git" -import { Instance } from "./instance" import z from "zod" export namespace Vcs { @@ -41,10 +41,25 @@ export namespace Vcs { export class Service extends ServiceMap.Service()("@opencode/Vcs") {} - export const layer: Layer.Layer = Layer.effect( + export const layer: Layer.Layer = Layer.effect( Service, Effect.gen(function* () { const bus = yield* Bus.Service + const spawner = yield* ChildProcessSpawner.ChildProcessSpawner + + 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 = yield* Stream.mkString(Stream.decodeText(handle.stdout)) + const code = yield* handle.exitCode + return { code, text } + }, + Effect.scoped, + Effect.catch(() => Effect.succeed({ code: ChildProcessSpawner.ExitCode(1), text: "" })), + ) + const state = yield* InstanceState.make( Effect.fn("Vcs.state")((ctx) => Effect.gen(function* () { @@ -52,17 +67,15 @@ export namespace Vcs { return { current: undefined } } - const get = async () => { - const result = await git(["rev-parse", "--abbrev-ref", "HEAD"], { - cwd: ctx.worktree, - }) - if (result.exitCode !== 0) return undefined - const text = result.text().trim() + const getBranch = Effect.fnUntraced(function* () { + const result = yield* git(["rev-parse", "--abbrev-ref", "HEAD"], { cwd: ctx.worktree }) + if (result.code !== 0) return undefined + const text = result.text.trim() return text || undefined - } + }) const value = { - current: yield* Effect.promise(() => get()), + current: yield* getBranch(), } log.info("initialized", { branch: value.current }) @@ -70,7 +83,7 @@ export namespace Vcs { Stream.filter((evt) => evt.properties.file.endsWith("HEAD")), Stream.runForEach(() => Effect.gen(function* () { - const next = yield* Effect.promise(() => get()) + const next = yield* getBranch() if (next !== value.current) { log.info("branch changed", { from: value.current, to: next }) value.current = next @@ -97,7 +110,7 @@ export namespace Vcs { }), ) - export const defaultLayer = layer.pipe(Layer.provide(Bus.layer)) + export const defaultLayer = layer.pipe(Layer.provide(Bus.layer), Layer.provide(CrossSpawnSpawner.defaultLayer)) const { runPromise } = makeRuntime(Service, defaultLayer) From 771525270a0c4d1394b3117e5842847a51caf72d Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Thu, 26 Mar 2026 22:21:17 -0400 Subject: [PATCH 004/142] fix(opencode): ignore generated models snapshot files (#19362) --- packages/opencode/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/opencode/.gitignore b/packages/opencode/.gitignore index 69643b7af7..348f05113e 100644 --- a/packages/opencode/.gitignore +++ b/packages/opencode/.gitignore @@ -2,4 +2,5 @@ research dist gen app.log -src/provider/models-snapshot.ts +src/provider/models-snapshot.js +src/provider/models-snapshot.d.ts From d3414996845bb05e27059902c2bcca21e8ef6c36 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Fri, 27 Mar 2026 13:16:47 +0530 Subject: [PATCH 005/142] fix(ui): keep partial markdown readable while responses stream (#19403) --- bun.lock | 4 ++ package.json | 1 + packages/ui/package.json | 1 + .../ui/src/components/markdown-stream.test.ts | 32 ++++++++++++ packages/ui/src/components/markdown-stream.ts | 49 +++++++++++++++++++ packages/ui/src/components/markdown.tsx | 49 ++----------------- 6 files changed, 90 insertions(+), 46 deletions(-) create mode 100644 packages/ui/src/components/markdown-stream.test.ts create mode 100644 packages/ui/src/components/markdown-stream.ts diff --git a/bun.lock b/bun.lock index 6052633505..54e1c768d0 100644 --- a/bun.lock +++ b/bun.lock @@ -516,6 +516,7 @@ "motion-dom": "12.34.3", "motion-utils": "12.29.2", "remeda": "catalog:", + "remend": "catalog:", "shiki": "catalog:", "solid-js": "catalog:", "solid-list": "catalog:", @@ -631,6 +632,7 @@ "marked": "17.0.1", "marked-shiki": "1.2.1", "remeda": "2.26.0", + "remend": "1.3.0", "shiki": "3.20.0", "solid-js": "1.9.10", "solid-list": "0.3.0", @@ -4107,6 +4109,8 @@ "remeda": ["remeda@2.26.0", "", { "dependencies": { "type-fest": "^4.41.0" } }, "sha512-lmNNwtaC6Co4m0WTTNoZ/JlpjEqAjPZO0+czC9YVRQUpkbS4x8Hmh+Mn9HPfJfiXqUQ5IXXgSXSOB2pBKAytdA=="], + "remend": ["remend@1.3.0", "", {}, "sha512-iIhggPkhW3hFImKtB10w0dz4EZbs28mV/dmbcYVonWEJ6UGHHpP+bFZnTh6GNWJONg5m+U56JrL+8IxZRdgWjw=="], + "request-light": ["request-light@0.7.0", "", {}, "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="], "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="], diff --git a/package.json b/package.json index dfc9840c2a..40ab8ceaf6 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "luxon": "3.6.1", "marked": "17.0.1", "marked-shiki": "1.2.1", + "remend": "1.3.0", "@playwright/test": "1.51.0", "typescript": "5.8.2", "@typescript/native-preview": "7.0.0-dev.20251207.1", diff --git a/packages/ui/package.json b/packages/ui/package.json index d4e7505bf5..8214a7a1d3 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -64,6 +64,7 @@ "motion-dom": "12.34.3", "motion-utils": "12.29.2", "remeda": "catalog:", + "remend": "catalog:", "shiki": "catalog:", "solid-js": "catalog:", "solid-list": "catalog:", diff --git a/packages/ui/src/components/markdown-stream.test.ts b/packages/ui/src/components/markdown-stream.test.ts new file mode 100644 index 0000000000..1ee63fc62e --- /dev/null +++ b/packages/ui/src/components/markdown-stream.test.ts @@ -0,0 +1,32 @@ +import { describe, expect, test } from "bun:test" +import { stream } from "./markdown-stream" + +describe("markdown stream", () => { + test("heals incomplete emphasis while streaming", () => { + expect(stream("hello **world", true)).toEqual([{ raw: "hello **world", src: "hello **world**", mode: "live" }]) + expect(stream("say `code", true)).toEqual([{ raw: "say `code", src: "say `code`", mode: "live" }]) + }) + + test("keeps incomplete links non-clickable until they finish", () => { + expect(stream("see [docs](https://example.com/gu", true)).toEqual([ + { raw: "see [docs](https://example.com/gu", src: "see docs", mode: "live" }, + ]) + }) + + test("splits an unfinished trailing code fence from stable content", () => { + expect(stream("before\n\n```ts\nconst x = 1", true)).toEqual([ + { raw: "before\n\n", src: "before\n\n", mode: "live" }, + { raw: "```ts\nconst x = 1", src: "```ts\nconst x = 1", mode: "live" }, + ]) + }) + + test("keeps reference-style markdown as one block", () => { + expect(stream("[docs][1]\n\n[1]: https://example.com", true)).toEqual([ + { + raw: "[docs][1]\n\n[1]: https://example.com", + src: "[docs][1]\n\n[1]: https://example.com", + mode: "live", + }, + ]) + }) +}) diff --git a/packages/ui/src/components/markdown-stream.ts b/packages/ui/src/components/markdown-stream.ts new file mode 100644 index 0000000000..ea35b0c140 --- /dev/null +++ b/packages/ui/src/components/markdown-stream.ts @@ -0,0 +1,49 @@ +import { marked, type Tokens } from "marked" +import remend from "remend" + +export type Block = { + raw: string + src: string + mode: "full" | "live" +} + +function refs(text: string) { + return /^\[[^\]]+\]:\s+\S+/m.test(text) || /^\[\^[^\]]+\]:\s+/m.test(text) +} + +function open(raw: string) { + const match = raw.match(/^[ \t]{0,3}(`{3,}|~{3,})/) + if (!match) return false + const mark = match[1] + if (!mark) return false + const char = mark[0] + const size = mark.length + const last = raw.trimEnd().split("\n").at(-1)?.trim() ?? "" + return !new RegExp(`^[\\t ]{0,3}${char}{${size},}[\\t ]*$`).test(last) +} + +function heal(text: string) { + return remend(text, { linkMode: "text-only" }) +} + +export function stream(text: string, live: boolean) { + if (!live) return [{ raw: text, src: text, mode: "full" }] satisfies Block[] + const src = heal(text) + if (refs(text)) return [{ raw: text, src, mode: "live" }] satisfies Block[] + const tokens = marked.lexer(text) + const tail = tokens.findLastIndex((token) => token.type !== "space") + if (tail < 0) return [{ raw: text, src, mode: "live" }] satisfies Block[] + const last = tokens[tail] + if (!last || last.type !== "code") return [{ raw: text, src, mode: "live" }] satisfies Block[] + const code = last as Tokens.Code + if (!open(code.raw)) return [{ raw: text, src, mode: "live" }] satisfies Block[] + const head = tokens + .slice(0, tail) + .map((token) => token.raw) + .join("") + if (!head) return [{ raw: code.raw, src: code.raw, mode: "live" }] satisfies Block[] + return [ + { raw: head, src: heal(head), mode: "live" }, + { raw: code.raw, src: code.raw, mode: "live" }, + ] satisfies Block[] +} diff --git a/packages/ui/src/components/markdown.tsx b/packages/ui/src/components/markdown.tsx index ce6bdb7e0d..ceab10df98 100644 --- a/packages/ui/src/components/markdown.tsx +++ b/packages/ui/src/components/markdown.tsx @@ -2,10 +2,10 @@ import { useMarked } from "../context/marked" import { useI18n } from "../context/i18n" import DOMPurify from "dompurify" import morphdom from "morphdom" -import { marked, type Tokens } from "marked" import { checksum } from "@opencode-ai/util/encode" import { ComponentProps, createEffect, createResource, createSignal, onCleanup, splitProps } from "solid-js" import { isServer } from "solid-js/web" +import { stream } from "./markdown-stream" type Entry = { hash: string @@ -58,47 +58,6 @@ function fallback(markdown: string) { return escape(markdown).replace(/\r\n?/g, "\n").replace(/\n/g, "
") } -type Block = { - raw: string - mode: "full" | "live" -} - -function references(markdown: string) { - return /^\[[^\]]+\]:\s+\S+/m.test(markdown) || /^\[\^[^\]]+\]:\s+/m.test(markdown) -} - -function incomplete(raw: string) { - const open = raw.match(/^[ \t]{0,3}(`{3,}|~{3,})/) - if (!open) return false - const mark = open[1] - if (!mark) return false - const char = mark[0] - const size = mark.length - const last = raw.trimEnd().split("\n").at(-1)?.trim() ?? "" - return !new RegExp(`^[\\t ]{0,3}${char}{${size},}[\\t ]*$`).test(last) -} - -function blocks(markdown: string, streaming: boolean) { - if (!streaming || references(markdown)) return [{ raw: markdown, mode: "full" }] satisfies Block[] - const tokens = marked.lexer(markdown) - const last = tokens.findLast((token) => token.type !== "space") - if (!last || last.type !== "code") return [{ raw: markdown, mode: "full" }] satisfies Block[] - const code = last as Tokens.Code - if (!incomplete(code.raw)) return [{ raw: markdown, mode: "full" }] satisfies Block[] - const head = tokens - .slice( - 0, - tokens.findLastIndex((token) => token.type !== "space"), - ) - .map((token) => token.raw) - .join("") - if (!head) return [{ raw: code.raw, mode: "live" }] satisfies Block[] - return [ - { raw: head, mode: "full" }, - { raw: code.raw, mode: "live" }, - ] satisfies Block[] -} - type CopyLabels = { copy: string copied: string @@ -251,8 +210,6 @@ function setupCodeCopy(root: HTMLDivElement, getLabels: () => CopyLabels) { timeouts.set(button, timeout) } - decorate(root, getLabels()) - const buttons = Array.from(root.querySelectorAll('[data-slot="markdown-copy-button"]')) for (const button of buttons) { if (button instanceof HTMLButtonElement) updateLabel(button) @@ -304,7 +261,7 @@ export function Markdown( const base = src.key ?? checksum(src.text) return Promise.all( - blocks(src.text, src.streaming).map(async (block, index) => { + stream(src.text, src.streaming).map(async (block, index) => { const hash = checksum(block.raw) const key = base ? `${base}:${index}:${block.mode}` : hash @@ -316,7 +273,7 @@ export function Markdown( } } - const next = await Promise.resolve(marked.parse(block.raw)) + const next = await Promise.resolve(marked.parse(block.src)) const safe = sanitize(next) if (key && hash) touch(key, { hash, html: safe }) return safe From 3fb60d05e555dad020d3354602affe166ef0cc22 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 08:25:19 +0000 Subject: [PATCH 006/142] chore: update nix node_modules hashes --- nix/hashes.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/hashes.json b/nix/hashes.json index aff5f38a86..5eaac2de42 100644 --- a/nix/hashes.json +++ b/nix/hashes.json @@ -1,8 +1,8 @@ { "nodeModules": { - "x86_64-linux": "sha256-YI/VXZYi/5BEKRGWCHVqEBmMgBP5VMVJyL06OJlfQxY=", - "aarch64-linux": "sha256-HvGPC4TuLnCNAty8nr+JwnPkV+MtrPnso3VPmgCe06Y=", - "aarch64-darwin": "sha256-DKzYPvFsKy8utQZbiWWPWukPEle/SuFQz1FakWzObA8=", - "x86_64-darwin": "sha256-311yDcV1P3gaFh75j3uoe3eTuZJn48E7OVgNjLxSpIo=" + "x86_64-linux": "sha256-a2eTu0ISjqPuojkNPnPXzVb/PLlDvw/DXDvmxi9RD5k=", + "aarch64-linux": "sha256-yLaTXRzZ7M/6j2WDP+IL1YCY3+rYY4Qmq3xTDatNzD0=", + "aarch64-darwin": "sha256-uGSVe8S/QvnW+RCI/CxzrlfAAJ1YA+NrhzRE0GTcnvE=", + "x86_64-darwin": "sha256-tplWx2tLg6jWvOBmM41lODJV8pHpkAm4HKWRG7lpkcU=" } } From d2bfa92e7438eb7ac7c4e2d72fca708f27c52ba3 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Fri, 27 Mar 2026 17:32:09 +0530 Subject: [PATCH 007/142] fix(app): persist queued followups across project switches (#19421) --- packages/app/src/pages/session.tsx | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx index c41133ded7..752b549b86 100644 --- a/packages/app/src/pages/session.tsx +++ b/packages/app/src/pages/session.tsx @@ -57,12 +57,15 @@ import { TerminalPanel } from "@/pages/session/terminal-panel" import { useSessionCommands } from "@/pages/session/use-session-commands" import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll" import { Identifier } from "@/utils/id" +import { Persist, persisted } from "@/utils/persist" import { extractPromptFromParts } from "@/utils/prompt" import { same } from "@/utils/same" import { formatServerError } from "@/utils/server-errors" const emptyUserMessages: UserMessage[] = [] -const emptyFollowups: (FollowupDraft & { id: string })[] = [] +type FollowupItem = FollowupDraft & { id: string } +type FollowupEdit = Pick +const emptyFollowups: FollowupItem[] = [] type SessionHistoryWindowInput = { sessionID: () => string | undefined @@ -512,15 +515,20 @@ export default function Page() { deferRender: false, }) - const [followup, setFollowup] = createStore({ - items: {} as Record, - failed: {} as Record, - paused: {} as Record, - edit: {} as Record< - string, - { id: string; prompt: FollowupDraft["prompt"]; context: FollowupDraft["context"] } | undefined - >, - }) + const [followup, setFollowup] = persisted( + Persist.workspace(sdk.directory, "followup", ["followup.v1"]), + createStore<{ + items: Record + failed: Record + paused: Record + edit: Record + }>({ + items: {}, + failed: {}, + paused: {}, + edit: {}, + }), + ) createComputed((prev) => { const key = sessionKey() From 7b449181498252f64eff7410c39aeebe7d2f1a88 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 09:53:00 -0400 Subject: [PATCH 008/142] refactor(tool-registry): yield Config/Plugin services, use Effect.forEach (#19363) --- packages/opencode/src/plugin/index.ts | 2 +- packages/opencode/src/tool/registry.ts | 115 +++++++++++++------------ 2 files changed, 60 insertions(+), 57 deletions(-) diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts index 9804169a46..df644c42a9 100644 --- a/packages/opencode/src/plugin/index.ts +++ b/packages/opencode/src/plugin/index.ts @@ -194,7 +194,7 @@ export namespace Plugin { }), ) - const defaultLayer = layer.pipe(Layer.provide(Bus.layer)) + export const defaultLayer = layer.pipe(Layer.provide(Bus.layer)) const { runPromise } = makeRuntime(Service, defaultLayer) export async function trigger< diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts index ada761fd50..1e2b72ee28 100644 --- a/packages/opencode/src/tool/registry.ts +++ b/packages/opencode/src/tool/registry.ts @@ -54,6 +54,9 @@ export namespace ToolRegistry { export const layer = Layer.effect( Service, Effect.gen(function* () { + const config = yield* Config.Service + const plugin = yield* Plugin.Service + const cache = yield* InstanceState.make( Effect.fn("ToolRegistry.state")(function* (ctx) { const custom: Tool.Info[] = [] @@ -82,35 +85,34 @@ export namespace ToolRegistry { } } - yield* Effect.promise(async () => { - const matches = await Config.directories().then((dirs) => - dirs.flatMap((dir) => - Glob.scanSync("{tool,tools}/*.{js,ts}", { cwd: dir, absolute: true, dot: true, symlink: true }), - ), + const dirs = yield* config.directories() + const matches = dirs.flatMap((dir) => + Glob.scanSync("{tool,tools}/*.{js,ts}", { cwd: dir, absolute: true, dot: true, symlink: true }), + ) + if (matches.length) yield* config.waitForDependencies() + for (const match of matches) { + const namespace = path.basename(match, path.extname(match)) + const mod = yield* Effect.promise(() => + import(process.platform === "win32" ? match : pathToFileURL(match).href), ) - if (matches.length) await Config.waitForDependencies() - for (const match of matches) { - const namespace = path.basename(match, path.extname(match)) - const mod = await import(process.platform === "win32" ? match : pathToFileURL(match).href) - for (const [id, def] of Object.entries(mod)) { - custom.push(fromPlugin(id === "default" ? namespace : `${namespace}_${id}`, def)) - } + for (const [id, def] of Object.entries(mod)) { + custom.push(fromPlugin(id === "default" ? namespace : `${namespace}_${id}`, def)) } + } - const plugins = await Plugin.list() - for (const plugin of plugins) { - for (const [id, def] of Object.entries(plugin.tool ?? {})) { - custom.push(fromPlugin(id, def)) - } + const plugins = yield* plugin.list() + for (const p of plugins) { + for (const [id, def] of Object.entries(p.tool ?? {})) { + custom.push(fromPlugin(id, def)) } - }) + } return { custom } }), ) - async function all(custom: Tool.Info[]): Promise { - const cfg = await Config.get() + const all = Effect.fn("ToolRegistry.all")(function* (custom: Tool.Info[]) { + const cfg = yield* config.get() const question = ["app", "cli", "desktop"].includes(Flag.OPENCODE_CLIENT) || Flag.OPENCODE_ENABLE_QUESTION_TOOL return [ @@ -134,7 +136,7 @@ export namespace ToolRegistry { ...(Flag.OPENCODE_EXPERIMENTAL_PLAN_MODE && Flag.OPENCODE_CLIENT === "cli" ? [PlanExitTool] : []), ...custom, ] - } + }) const register = Effect.fn("ToolRegistry.register")(function* (tool: Tool.Info) { const state = yield* InstanceState.get(cache) @@ -148,7 +150,7 @@ export namespace ToolRegistry { const ids = Effect.fn("ToolRegistry.ids")(function* () { const state = yield* InstanceState.get(cache) - const tools = yield* Effect.promise(() => all(state.custom)) + const tools = yield* all(state.custom) return tools.map((t) => t.id) }) @@ -157,40 +159,37 @@ export namespace ToolRegistry { agent?: Agent.Info, ) { const state = yield* InstanceState.get(cache) - const allTools = yield* Effect.promise(() => all(state.custom)) - return yield* Effect.promise(() => - Promise.all( - allTools - .filter((tool) => { - // Enable websearch/codesearch for zen users OR via enable flag - if (tool.id === "codesearch" || tool.id === "websearch") { - return model.providerID === ProviderID.opencode || Flag.OPENCODE_ENABLE_EXA - } + const allTools = yield* all(state.custom) + const filtered = allTools.filter((tool) => { + if (tool.id === "codesearch" || tool.id === "websearch") { + return model.providerID === ProviderID.opencode || Flag.OPENCODE_ENABLE_EXA + } - // use apply tool in same format as codex - const usePatch = - model.modelID.includes("gpt-") && !model.modelID.includes("oss") && !model.modelID.includes("gpt-4") - if (tool.id === "apply_patch") return usePatch - if (tool.id === "edit" || tool.id === "write") return !usePatch + const usePatch = + model.modelID.includes("gpt-") && !model.modelID.includes("oss") && !model.modelID.includes("gpt-4") + if (tool.id === "apply_patch") return usePatch + if (tool.id === "edit" || tool.id === "write") return !usePatch - return true - }) - .map(async (tool) => { - using _ = log.time(tool.id) - const next = await tool.init({ agent }) - const output = { - description: next.description, - parameters: next.parameters, - } - await Plugin.trigger("tool.definition", { toolID: tool.id }, output) - return { - id: tool.id, - ...next, - description: output.description, - parameters: output.parameters, - } - }), - ), + return true + }) + return yield* Effect.forEach( + filtered, + Effect.fnUntraced(function* (tool) { + using _ = log.time(tool.id) + const next = yield* Effect.promise(() => tool.init({ agent })) + const output = { + description: next.description, + parameters: next.parameters, + } + yield* plugin.trigger("tool.definition", { toolID: tool.id }, output) + return { + id: tool.id, + ...next, + description: output.description, + parameters: output.parameters, + } as Awaited> & { id: string } + }), + { concurrency: "unbounded" }, ) }) @@ -198,7 +197,11 @@ export namespace ToolRegistry { }), ) - const { runPromise } = makeRuntime(Service, layer) + export const defaultLayer = Layer.unwrap( + Effect.sync(() => layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(Plugin.defaultLayer))), + ) + + const { runPromise } = makeRuntime(Service, defaultLayer) export async function register(tool: Tool.Info) { return runPromise((svc) => svc.register(tool)) @@ -214,7 +217,7 @@ export namespace ToolRegistry { modelID: ModelID }, agent?: Agent.Info, - ) { + ): Promise<(Awaited> & { id: string })[]> { return runPromise((svc) => svc.tools(model, agent)) } } From d8ad8338f5311ac6692ebc362d28389e028f6aad Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 13:53:59 +0000 Subject: [PATCH 009/142] chore: generate --- packages/opencode/src/tool/registry.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts index 1e2b72ee28..eeb7334806 100644 --- a/packages/opencode/src/tool/registry.ts +++ b/packages/opencode/src/tool/registry.ts @@ -92,8 +92,8 @@ export namespace ToolRegistry { if (matches.length) yield* config.waitForDependencies() for (const match of matches) { const namespace = path.basename(match, path.extname(match)) - const mod = yield* Effect.promise(() => - import(process.platform === "win32" ? match : pathToFileURL(match).href), + const mod = yield* Effect.promise( + () => import(process.platform === "win32" ? match : pathToFileURL(match).href), ) for (const [id, def] of Object.entries(mod)) { custom.push(fromPlugin(id === "default" ? namespace : `${namespace}_${id}`, def)) From 6274b0677c1c65815c525b9b199f1ce5c6fb97fc Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 27 Mar 2026 15:00:26 +0100 Subject: [PATCH 010/142] tui plugins (#19347) --- .opencode/plugins/smoke-theme.json | 223 ++++ .opencode/plugins/tui-smoke.tsx | 852 +++++++++++++++ .opencode/themes/.gitignore | 1 + .opencode/tui.json | 19 + bun.lock | 16 +- .../src/components/status-popover-body.tsx | 4 +- packages/opencode/bunfig.toml | 2 +- packages/opencode/script/build.ts | 5 +- packages/opencode/specs/tui-plugins.md | 377 +++++++ packages/opencode/src/bun/index.ts | 11 +- packages/opencode/src/bun/registry.ts | 6 + packages/opencode/src/cli/cmd/db.ts | 5 +- packages/opencode/src/cli/cmd/plug.ts | 231 +++++ packages/opencode/src/cli/cmd/tui/app.tsx | 365 +++---- .../cli/cmd/tui/component/dialog-command.tsx | 36 +- .../cli/cmd/tui/component/dialog-status.tsx | 3 +- .../tui/component/dialog-workspace-list.tsx | 33 +- .../cli/cmd/tui/component/error-component.tsx | 91 ++ .../tui/component/plugin-route-missing.tsx | 14 + .../cli/cmd/tui/component/startup-loading.tsx | 63 ++ .../opencode/src/cli/cmd/tui/context/exit.tsx | 3 +- .../src/cli/cmd/tui/context/keybind.tsx | 21 +- .../cli/cmd/tui/context/plugin-keybinds.ts | 41 + .../src/cli/cmd/tui/context/route.tsx | 9 +- .../opencode/src/cli/cmd/tui/context/sdk.tsx | 3 + .../src/cli/cmd/tui/context/theme.tsx | 242 +++-- .../home/tips-view.tsx} | 2 +- .../cli/cmd/tui/feature-plugins/home/tips.tsx | 48 + .../tui/feature-plugins/sidebar/context.tsx | 61 ++ .../cmd/tui/feature-plugins/sidebar/files.tsx | 60 ++ .../tui/feature-plugins/sidebar/footer.tsx | 91 ++ .../cmd/tui/feature-plugins/sidebar/lsp.tsx | 64 ++ .../cmd/tui/feature-plugins/sidebar/mcp.tsx | 94 ++ .../cmd/tui/feature-plugins/sidebar/todo.tsx | 46 + .../tui/feature-plugins/system/plugins.tsx | 262 +++++ .../opencode/src/cli/cmd/tui/plugin/api.tsx | 406 ++++++++ .../opencode/src/cli/cmd/tui/plugin/index.ts | 3 + .../src/cli/cmd/tui/plugin/internal.ts | 25 + .../src/cli/cmd/tui/plugin/runtime.ts | 972 ++++++++++++++++++ .../opencode/src/cli/cmd/tui/plugin/slots.tsx | 61 ++ .../opencode/src/cli/cmd/tui/routes/home.tsx | 48 +- .../src/cli/cmd/tui/routes/session/index.tsx | 1 - .../cli/cmd/tui/routes/session/sidebar.tsx | 303 +----- packages/opencode/src/cli/cmd/tui/thread.ts | 5 +- .../opencode/src/cli/cmd/tui/ui/dialog.tsx | 18 +- packages/opencode/src/cli/error.ts | 15 +- packages/opencode/src/config/config.ts | 173 ++-- packages/opencode/src/config/tui-schema.ts | 2 + packages/opencode/src/config/tui.ts | 148 ++- packages/opencode/src/flag/flag.ts | 25 + packages/opencode/src/index.ts | 17 +- packages/opencode/src/plugin/index.ts | 189 +++- packages/opencode/src/plugin/install.ts | 351 +++++++ packages/opencode/src/plugin/meta.ts | 165 +++ packages/opencode/src/plugin/shared.ts | 149 +++ packages/opencode/src/provider/auth.ts | 6 +- packages/opencode/src/session/message-v2.ts | 3 +- packages/opencode/src/tool/batch.ts | 3 +- packages/opencode/src/util/error.ts | 77 ++ packages/opencode/src/util/flock.ts | 333 ++++++ .../src/util/{proxied.ts => network.ts} | 6 + packages/opencode/src/util/process.ts | 3 +- packages/opencode/src/util/record.ts | 3 + packages/opencode/src/worktree/index.ts | 12 +- .../test/cli/tui/keybind-plugin.test.ts | 90 ++ .../opencode/test/cli/tui/plugin-add.test.ts | 61 ++ .../test/cli/tui/plugin-install.test.ts | 95 ++ .../test/cli/tui/plugin-lifecycle.test.ts | 225 ++++ .../cli/tui/plugin-loader-entrypoint.test.ts | 132 +++ .../test/cli/tui/plugin-loader-pure.test.ts | 71 ++ .../test/cli/tui/plugin-loader.test.ts | 563 ++++++++++ .../test/cli/tui/plugin-toggle.test.ts | 157 +++ .../opencode/test/cli/tui/theme-store.test.ts | 50 + packages/opencode/test/config/config.test.ts | 213 +++- packages/opencode/test/config/tui.test.ts | 161 ++- .../opencode/test/fixture/flock-worker.ts | 72 ++ packages/opencode/test/fixture/plug-worker.ts | 93 ++ .../test/fixture/plugin-meta-worker.ts | 26 + packages/opencode/test/fixture/tui-plugin.ts | 334 ++++++ packages/opencode/test/fixture/tui-runtime.ts | 34 + .../test/plugin/auth-override.test.ts | 21 +- .../test/plugin/install-concurrency.test.ts | 134 +++ packages/opencode/test/plugin/install.test.ts | 410 ++++++++ .../test/plugin/loader-shared.test.ts | 548 ++++++++++ packages/opencode/test/plugin/meta.test.ts | 137 +++ packages/opencode/test/util/error.test.ts | 38 + packages/opencode/test/util/flock.test.ts | 383 +++++++ packages/plugin/package.json | 17 +- packages/plugin/src/index.ts | 22 +- packages/plugin/src/tui.ts | 419 ++++++++ packages/sdk/js/src/v2/gen/types.gen.ts | 10 +- 91 files changed, 10544 insertions(+), 898 deletions(-) create mode 100644 .opencode/plugins/smoke-theme.json create mode 100644 .opencode/plugins/tui-smoke.tsx create mode 100644 .opencode/themes/.gitignore create mode 100644 .opencode/tui.json create mode 100644 packages/opencode/specs/tui-plugins.md create mode 100644 packages/opencode/src/cli/cmd/plug.ts create mode 100644 packages/opencode/src/cli/cmd/tui/component/error-component.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/component/plugin-route-missing.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/component/startup-loading.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/context/plugin-keybinds.ts rename packages/opencode/src/cli/cmd/tui/{component/tips.tsx => feature-plugins/home/tips-view.tsx} (99%) create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/plugin/api.tsx create mode 100644 packages/opencode/src/cli/cmd/tui/plugin/index.ts create mode 100644 packages/opencode/src/cli/cmd/tui/plugin/internal.ts create mode 100644 packages/opencode/src/cli/cmd/tui/plugin/runtime.ts create mode 100644 packages/opencode/src/cli/cmd/tui/plugin/slots.tsx create mode 100644 packages/opencode/src/plugin/install.ts create mode 100644 packages/opencode/src/plugin/meta.ts create mode 100644 packages/opencode/src/plugin/shared.ts create mode 100644 packages/opencode/src/util/error.ts create mode 100644 packages/opencode/src/util/flock.ts rename packages/opencode/src/util/{proxied.ts => network.ts} (50%) create mode 100644 packages/opencode/src/util/record.ts create mode 100644 packages/opencode/test/cli/tui/keybind-plugin.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-add.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-install.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-lifecycle.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-loader-entrypoint.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-loader-pure.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-loader.test.ts create mode 100644 packages/opencode/test/cli/tui/plugin-toggle.test.ts create mode 100644 packages/opencode/test/cli/tui/theme-store.test.ts create mode 100644 packages/opencode/test/fixture/flock-worker.ts create mode 100644 packages/opencode/test/fixture/plug-worker.ts create mode 100644 packages/opencode/test/fixture/plugin-meta-worker.ts create mode 100644 packages/opencode/test/fixture/tui-plugin.ts create mode 100644 packages/opencode/test/fixture/tui-runtime.ts create mode 100644 packages/opencode/test/plugin/install-concurrency.test.ts create mode 100644 packages/opencode/test/plugin/install.test.ts create mode 100644 packages/opencode/test/plugin/loader-shared.test.ts create mode 100644 packages/opencode/test/plugin/meta.test.ts create mode 100644 packages/opencode/test/util/error.test.ts create mode 100644 packages/opencode/test/util/flock.test.ts create mode 100644 packages/plugin/src/tui.ts diff --git a/.opencode/plugins/smoke-theme.json b/.opencode/plugins/smoke-theme.json new file mode 100644 index 0000000000..6e4595d446 --- /dev/null +++ b/.opencode/plugins/smoke-theme.json @@ -0,0 +1,223 @@ +{ + "$schema": "https://opencode.ai/theme.json", + "defs": { + "nord0": "#2E3440", + "nord1": "#3B4252", + "nord2": "#434C5E", + "nord3": "#4C566A", + "nord4": "#D8DEE9", + "nord5": "#E5E9F0", + "nord6": "#ECEFF4", + "nord7": "#8FBCBB", + "nord8": "#88C0D0", + "nord9": "#81A1C1", + "nord10": "#5E81AC", + "nord11": "#BF616A", + "nord12": "#D08770", + "nord13": "#EBCB8B", + "nord14": "#A3BE8C", + "nord15": "#B48EAD" + }, + "theme": { + "primary": { + "dark": "nord10", + "light": "nord9" + }, + "secondary": { + "dark": "nord9", + "light": "nord9" + }, + "accent": { + "dark": "nord7", + "light": "nord7" + }, + "error": { + "dark": "nord11", + "light": "nord11" + }, + "warning": { + "dark": "nord12", + "light": "nord12" + }, + "success": { + "dark": "nord14", + "light": "nord14" + }, + "info": { + "dark": "nord8", + "light": "nord10" + }, + "text": { + "dark": "nord6", + "light": "nord0" + }, + "textMuted": { + "dark": "#8B95A7", + "light": "nord1" + }, + "background": { + "dark": "nord0", + "light": "nord6" + }, + "backgroundPanel": { + "dark": "nord1", + "light": "nord5" + }, + "backgroundElement": { + "dark": "nord2", + "light": "nord4" + }, + "border": { + "dark": "nord2", + "light": "nord3" + }, + "borderActive": { + "dark": "nord3", + "light": "nord2" + }, + "borderSubtle": { + "dark": "nord2", + "light": "nord3" + }, + "diffAdded": { + "dark": "nord14", + "light": "nord14" + }, + "diffRemoved": { + "dark": "nord11", + "light": "nord11" + }, + "diffContext": { + "dark": "#8B95A7", + "light": "nord3" + }, + "diffHunkHeader": { + "dark": "#8B95A7", + "light": "nord3" + }, + "diffHighlightAdded": { + "dark": "nord14", + "light": "nord14" + }, + "diffHighlightRemoved": { + "dark": "nord11", + "light": "nord11" + }, + "diffAddedBg": { + "dark": "#36413C", + "light": "#E6EBE7" + }, + "diffRemovedBg": { + "dark": "#43393D", + "light": "#ECE6E8" + }, + "diffContextBg": { + "dark": "nord1", + "light": "nord5" + }, + "diffLineNumber": { + "dark": "nord2", + "light": "nord4" + }, + "diffAddedLineNumberBg": { + "dark": "#303A35", + "light": "#DDE4DF" + }, + "diffRemovedLineNumberBg": { + "dark": "#3C3336", + "light": "#E4DDE0" + }, + "markdownText": { + "dark": "nord4", + "light": "nord0" + }, + "markdownHeading": { + "dark": "nord8", + "light": "nord10" + }, + "markdownLink": { + "dark": "nord9", + "light": "nord9" + }, + "markdownLinkText": { + "dark": "nord7", + "light": "nord7" + }, + "markdownCode": { + "dark": "nord14", + "light": "nord14" + }, + "markdownBlockQuote": { + "dark": "#8B95A7", + "light": "nord3" + }, + "markdownEmph": { + "dark": "nord12", + "light": "nord12" + }, + "markdownStrong": { + "dark": "nord13", + "light": "nord13" + }, + "markdownHorizontalRule": { + "dark": "#8B95A7", + "light": "nord3" + }, + "markdownListItem": { + "dark": "nord8", + "light": "nord10" + }, + "markdownListEnumeration": { + "dark": "nord7", + "light": "nord7" + }, + "markdownImage": { + "dark": "nord9", + "light": "nord9" + }, + "markdownImageText": { + "dark": "nord7", + "light": "nord7" + }, + "markdownCodeBlock": { + "dark": "nord4", + "light": "nord0" + }, + "syntaxComment": { + "dark": "#8B95A7", + "light": "nord3" + }, + "syntaxKeyword": { + "dark": "nord9", + "light": "nord9" + }, + "syntaxFunction": { + "dark": "nord8", + "light": "nord8" + }, + "syntaxVariable": { + "dark": "nord7", + "light": "nord7" + }, + "syntaxString": { + "dark": "nord14", + "light": "nord14" + }, + "syntaxNumber": { + "dark": "nord15", + "light": "nord15" + }, + "syntaxType": { + "dark": "nord7", + "light": "nord7" + }, + "syntaxOperator": { + "dark": "nord9", + "light": "nord9" + }, + "syntaxPunctuation": { + "dark": "nord4", + "light": "nord0" + } + } +} diff --git a/.opencode/plugins/tui-smoke.tsx b/.opencode/plugins/tui-smoke.tsx new file mode 100644 index 0000000000..3e90bafb65 --- /dev/null +++ b/.opencode/plugins/tui-smoke.tsx @@ -0,0 +1,852 @@ +/** @jsxImportSource @opentui/solid */ +import { useKeyboard, useTerminalDimensions } from "@opentui/solid" +import { RGBA, VignetteEffect } from "@opentui/core" +import type { TuiKeybindSet, TuiPluginApi, TuiPluginMeta, TuiSlotPlugin } from "@opencode-ai/plugin/tui" + +const tabs = ["overview", "counter", "help"] +const bind = { + modal: "ctrl+shift+m", + screen: "ctrl+shift+o", + home: "escape,ctrl+h", + left: "left,h", + right: "right,l", + up: "up,k", + down: "down,j", + alert: "a", + confirm: "c", + prompt: "p", + select: "s", + modal_accept: "enter,return", + modal_close: "escape", + dialog_close: "escape", + local: "x", + local_push: "enter,return", + local_close: "q,backspace", + host: "z", +} + +const pick = (value: unknown, fallback: string) => { + if (typeof value !== "string") return fallback + if (!value.trim()) return fallback + return value +} + +const num = (value: unknown, fallback: number) => { + if (typeof value !== "number") return fallback + return value +} + +const rec = (value: unknown) => { + if (!value || typeof value !== "object" || Array.isArray(value)) return + return Object.fromEntries(Object.entries(value)) +} + +type Cfg = { + label: string + route: string + vignette: number + keybinds: Record | undefined +} + +type Route = { + modal: string + screen: string +} + +type State = { + tab: number + count: number + source: string + note: string + selected: string + local: number +} + +const cfg = (options: Record | undefined) => { + return { + label: pick(options?.label, "smoke"), + route: pick(options?.route, "workspace-smoke"), + vignette: Math.max(0, num(options?.vignette, 0.35)), + keybinds: rec(options?.keybinds), + } +} + +const names = (input: Cfg) => { + return { + modal: `${input.route}.modal`, + screen: `${input.route}.screen`, + } +} + +type Keys = TuiKeybindSet +const ui = { + panel: "#1d1d1d", + border: "#4a4a4a", + text: "#f0f0f0", + muted: "#a5a5a5", + accent: "#5f87ff", +} + +type Color = RGBA | string + +const ink = (map: Record, name: string, fallback: string): Color => { + const value = map[name] + if (typeof value === "string") return value + if (value instanceof RGBA) return value + return fallback +} + +const look = (map: Record) => { + return { + panel: ink(map, "backgroundPanel", ui.panel), + border: ink(map, "border", ui.border), + text: ink(map, "text", ui.text), + muted: ink(map, "textMuted", ui.muted), + accent: ink(map, "primary", ui.accent), + selected: ink(map, "selectedListItemText", ui.text), + } +} + +const tone = (api: TuiPluginApi) => { + return look(api.theme.current) +} + +type Skin = { + panel: Color + border: Color + text: Color + muted: Color + accent: Color + selected: Color +} + +const Btn = (props: { txt: string; run: () => void; skin: Skin; on?: boolean }) => { + return ( + { + props.run() + }} + backgroundColor={props.on ? props.skin.accent : props.skin.border} + paddingLeft={1} + paddingRight={1} + > + {props.txt} + + ) +} + +const parse = (params: Record | undefined) => { + const tab = typeof params?.tab === "number" ? params.tab : 0 + const count = typeof params?.count === "number" ? params.count : 0 + const source = typeof params?.source === "string" ? params.source : "unknown" + const note = typeof params?.note === "string" ? params.note : "" + const selected = typeof params?.selected === "string" ? params.selected : "" + const local = typeof params?.local === "number" ? params.local : 0 + return { + tab: Math.max(0, Math.min(tab, tabs.length - 1)), + count, + source, + note, + selected, + local: Math.max(0, local), + } +} + +const current = (api: TuiPluginApi, route: Route) => { + const value = api.route.current + const ok = Object.values(route).includes(value.name) + if (!ok) return parse(undefined) + if (!("params" in value)) return parse(undefined) + return parse(value.params) +} + +const opts = [ + { + title: "Overview", + value: 0, + description: "Switch to overview tab", + }, + { + title: "Counter", + value: 1, + description: "Switch to counter tab", + }, + { + title: "Help", + value: 2, + description: "Switch to help tab", + }, +] + +const host = (api: TuiPluginApi, input: Cfg, skin: Skin) => { + api.ui.dialog.setSize("medium") + api.ui.dialog.replace(() => ( + + + {input.label} host overlay + + Using api.ui.dialog stack with built-in backdrop + esc closes · depth {api.ui.dialog.depth} + + api.ui.dialog.clear()} skin={skin} on /> + + + )) +} + +const warn = (api: TuiPluginApi, route: Route, value: State) => { + const DialogAlert = api.ui.DialogAlert + api.ui.dialog.setSize("medium") + api.ui.dialog.replace(() => ( + api.route.navigate(route.screen, { ...value, source: "alert" })} + /> + )) +} + +const check = (api: TuiPluginApi, route: Route, value: State) => { + const DialogConfirm = api.ui.DialogConfirm + api.ui.dialog.setSize("medium") + api.ui.dialog.replace(() => ( + api.route.navigate(route.screen, { ...value, count: value.count + 1, source: "confirm" })} + onCancel={() => api.route.navigate(route.screen, { ...value, source: "confirm-cancel" })} + /> + )) +} + +const entry = (api: TuiPluginApi, route: Route, value: State) => { + const DialogPrompt = api.ui.DialogPrompt + api.ui.dialog.setSize("medium") + api.ui.dialog.replace(() => ( + { + api.ui.dialog.clear() + api.route.navigate(route.screen, { ...value, note, source: "prompt" }) + }} + onCancel={() => { + api.ui.dialog.clear() + api.route.navigate(route.screen, value) + }} + /> + )) +} + +const picker = (api: TuiPluginApi, route: Route, value: State) => { + const DialogSelect = api.ui.DialogSelect + api.ui.dialog.setSize("medium") + api.ui.dialog.replace(() => ( + { + api.ui.dialog.clear() + api.route.navigate(route.screen, { + ...value, + tab: typeof item.value === "number" ? item.value : value.tab, + selected: item.title, + source: "select", + }) + }} + /> + )) +} + +const Screen = (props: { + api: TuiPluginApi + input: Cfg + route: Route + keys: Keys + meta: TuiPluginMeta + params?: Record +}) => { + const dim = useTerminalDimensions() + const value = parse(props.params) + const skin = tone(props.api) + const set = (local: number, base?: State) => { + const next = base ?? current(props.api, props.route) + props.api.route.navigate(props.route.screen, { ...next, local: Math.max(0, local), source: "local" }) + } + const push = (base?: State) => { + const next = base ?? current(props.api, props.route) + set(next.local + 1, next) + } + const open = () => { + const next = current(props.api, props.route) + if (next.local > 0) return + set(1, next) + } + const pop = (base?: State) => { + const next = base ?? current(props.api, props.route) + const local = Math.max(0, next.local - 1) + set(local, next) + } + const show = () => { + setTimeout(() => { + open() + }, 0) + } + useKeyboard((evt) => { + if (props.api.route.current.name !== props.route.screen) return + const next = current(props.api, props.route) + if (props.api.ui.dialog.open) { + if (props.keys.match("dialog_close", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.ui.dialog.clear() + return + } + return + } + + if (next.local > 0) { + if (evt.name === "escape" || props.keys.match("local_close", evt)) { + evt.preventDefault() + evt.stopPropagation() + pop(next) + return + } + + if (props.keys.match("local_push", evt)) { + evt.preventDefault() + evt.stopPropagation() + push(next) + return + } + return + } + + if (props.keys.match("home", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate("home") + return + } + + if (props.keys.match("left", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate(props.route.screen, { ...next, tab: (next.tab - 1 + tabs.length) % tabs.length }) + return + } + + if (props.keys.match("right", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate(props.route.screen, { ...next, tab: (next.tab + 1) % tabs.length }) + return + } + + if (props.keys.match("up", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate(props.route.screen, { ...next, count: next.count + 1 }) + return + } + + if (props.keys.match("down", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate(props.route.screen, { ...next, count: next.count - 1 }) + return + } + + if (props.keys.match("modal", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate(props.route.modal, next) + return + } + + if (props.keys.match("local", evt)) { + evt.preventDefault() + evt.stopPropagation() + open() + return + } + + if (props.keys.match("host", evt)) { + evt.preventDefault() + evt.stopPropagation() + host(props.api, props.input, skin) + return + } + + if (props.keys.match("alert", evt)) { + evt.preventDefault() + evt.stopPropagation() + warn(props.api, props.route, next) + return + } + + if (props.keys.match("confirm", evt)) { + evt.preventDefault() + evt.stopPropagation() + check(props.api, props.route, next) + return + } + + if (props.keys.match("prompt", evt)) { + evt.preventDefault() + evt.stopPropagation() + entry(props.api, props.route, next) + return + } + + if (props.keys.match("select", evt)) { + evt.preventDefault() + evt.stopPropagation() + picker(props.api, props.route, next) + } + }) + + return ( + + + + + {props.input.label} screen + plugin route + + {props.keys.print("home")} home + + + + {tabs.map((item, i) => { + const on = value.tab === i + return ( + props.api.route.navigate(props.route.screen, { ...value, tab: i })} + skin={skin} + on={on} + /> + ) + })} + + + + {value.tab === 0 ? ( + + Route: {props.route.screen} + plugin state: {props.meta.state} + + first: {props.meta.state === "first" ? "yes" : "no"} · updated:{" "} + {props.meta.state === "updated" ? "yes" : "no"} · loads: {props.meta.load_count} + + plugin source: {props.meta.source} + source: {value.source} + note: {value.note || "(none)"} + selected: {value.selected || "(none)"} + local stack depth: {value.local} + host stack open: {props.api.ui.dialog.open ? "yes" : "no"} + + ) : null} + + {value.tab === 1 ? ( + + Counter: {value.count} + + {props.keys.print("up")} / {props.keys.print("down")} change value + + + ) : null} + + {value.tab === 2 ? ( + + + {props.keys.print("modal")} modal | {props.keys.print("alert")} alert | {props.keys.print("confirm")}{" "} + confirm | {props.keys.print("prompt")} prompt | {props.keys.print("select")} select + + + {props.keys.print("local")} local stack | {props.keys.print("host")} host stack + + + local open: {props.keys.print("local_push")} push nested · esc or {props.keys.print("local_close")}{" "} + close + + {props.keys.print("home")} returns home + + ) : null} + + + + props.api.route.navigate("home")} skin={skin} /> + props.api.route.navigate(props.route.modal, value)} skin={skin} on /> + + host(props.api, props.input, skin)} skin={skin} /> + warn(props.api, props.route, value)} skin={skin} /> + check(props.api, props.route, value)} skin={skin} /> + entry(props.api, props.route, value)} skin={skin} /> + picker(props.api, props.route, value)} skin={skin} /> + + + + 0} + width={dim().width} + height={dim().height} + alignItems="center" + position="absolute" + zIndex={3000} + paddingTop={dim().height / 4} + left={0} + top={0} + backgroundColor={RGBA.fromInts(0, 0, 0, 160)} + onMouseUp={() => { + pop() + }} + > + { + evt.stopPropagation() + }} + width={60} + maxWidth={dim().width - 2} + backgroundColor={skin.panel} + border + borderColor={skin.border} + paddingTop={1} + paddingBottom={1} + paddingLeft={2} + paddingRight={2} + gap={1} + flexDirection="column" + > + + {props.input.label} local overlay + + Plugin-owned stack depth: {value.local} + + {props.keys.print("local_push")} push nested · {props.keys.print("local_close")} pop/close + + + + + + + + + ) +} + +const Modal = (props: { + api: TuiPluginApi + input: Cfg + route: Route + keys: Keys + params?: Record +}) => { + const Dialog = props.api.ui.Dialog + const value = parse(props.params) + const skin = tone(props.api) + + useKeyboard((evt) => { + if (props.api.route.current.name !== props.route.modal) return + + if (props.keys.match("modal_accept", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate(props.route.screen, { ...value, source: "modal" }) + return + } + + if (props.keys.match("modal_close", evt)) { + evt.preventDefault() + evt.stopPropagation() + props.api.route.navigate("home") + } + }) + + return ( + + props.api.route.navigate("home")}> + + + {props.input.label} modal + + {props.keys.print("modal")} modal command + {props.keys.print("screen")} screen command + + {props.keys.print("modal_accept")} opens screen · {props.keys.print("modal_close")} closes + + + props.api.route.navigate(props.route.screen, { ...value, source: "modal" })} + skin={skin} + on + /> + props.api.route.navigate("home")} skin={skin} /> + + + + + ) +} + +const home = (input: Cfg): TuiSlotPlugin => ({ + slots: { + home_logo(ctx) { + const map = ctx.theme.current + const skin = look(map) + const art = [ + " $$\\", + " $$ |", + " $$$$$$$\\ $$$$$$\\$$$$\\ $$$$$$\\ $$ | $$\\ $$$$$$\\", + "$$ _____|$$ _$$ _$$\\ $$ __$$\\ $$ | $$ |$$ __$$\\", + "\\$$$$$$\\ $$ / $$ / $$ |$$ / $$ |$$$$$$ / $$$$$$$$ |", + " \\____$$\\ $$ | $$ | $$ |$$ | $$ |$$ _$$< $$ ____|", + "$$$$$$$ |$$ | $$ | $$ |\\$$$$$$ |$$ | \\$$\\ \\$$$$$$$\\", + "\\_______/ \\__| \\__| \\__| \\______/ \\__| \\__| \\_______|", + ] + const fill = [ + skin.accent, + skin.muted, + ink(map, "info", ui.accent), + skin.text, + ink(map, "success", ui.accent), + ink(map, "warning", ui.accent), + ink(map, "secondary", ui.accent), + ink(map, "error", ui.accent), + ] + + return ( + + {art.map((line, i) => ( + {line} + ))} + + ) + }, + home_bottom(ctx) { + const skin = look(ctx.theme.current) + const text = "extra content in the unified home bottom slot" + + return ( + + + + {input.label} {text} + + + + ) + }, + }, +}) + +const block = (input: Cfg, order: number, title: string, text: string): TuiSlotPlugin => ({ + order, + slots: { + sidebar_content(ctx, value) { + const skin = look(ctx.theme.current) + + return ( + + + {title} + + {text} + + {input.label} order {order} · session {value.session_id.slice(0, 8)} + + + ) + }, + }, +}) + +const slot = (input: Cfg): TuiSlotPlugin[] => [ + home(input), + block(input, 50, "Smoke above", "renders above internal sidebar blocks"), + block(input, 250, "Smoke between", "renders between internal sidebar blocks"), + block(input, 650, "Smoke below", "renders below internal sidebar blocks"), +] + +const reg = (api: TuiPluginApi, input: Cfg, keys: Keys) => { + const route = names(input) + api.command.register(() => [ + { + title: `${input.label} modal`, + value: "plugin.smoke.modal", + keybind: keys.get("modal"), + category: "Plugin", + slash: { + name: "smoke", + }, + onSelect: () => { + api.route.navigate(route.modal, { source: "command" }) + }, + }, + { + title: `${input.label} screen`, + value: "plugin.smoke.screen", + keybind: keys.get("screen"), + category: "Plugin", + slash: { + name: "smoke-screen", + }, + onSelect: () => { + api.route.navigate(route.screen, { source: "command", tab: 0, count: 0 }) + }, + }, + { + title: `${input.label} alert dialog`, + value: "plugin.smoke.alert", + category: "Plugin", + slash: { + name: "smoke-alert", + }, + onSelect: () => { + warn(api, route, current(api, route)) + }, + }, + { + title: `${input.label} confirm dialog`, + value: "plugin.smoke.confirm", + category: "Plugin", + slash: { + name: "smoke-confirm", + }, + onSelect: () => { + check(api, route, current(api, route)) + }, + }, + { + title: `${input.label} prompt dialog`, + value: "plugin.smoke.prompt", + category: "Plugin", + slash: { + name: "smoke-prompt", + }, + onSelect: () => { + entry(api, route, current(api, route)) + }, + }, + { + title: `${input.label} select dialog`, + value: "plugin.smoke.select", + category: "Plugin", + slash: { + name: "smoke-select", + }, + onSelect: () => { + picker(api, route, current(api, route)) + }, + }, + { + title: `${input.label} host overlay`, + value: "plugin.smoke.host", + category: "Plugin", + slash: { + name: "smoke-host", + }, + onSelect: () => { + host(api, input, tone(api)) + }, + }, + { + title: `${input.label} go home`, + value: "plugin.smoke.home", + category: "Plugin", + enabled: api.route.current.name !== "home", + onSelect: () => { + api.route.navigate("home") + }, + }, + { + title: `${input.label} toast`, + value: "plugin.smoke.toast", + category: "Plugin", + onSelect: () => { + api.ui.toast({ + variant: "info", + title: "Smoke", + message: "Plugin toast works", + duration: 2000, + }) + }, + }, + ]) +} + +const tui = async (api: TuiPluginApi, options: Record | null, meta: TuiPluginMeta) => { + if (options?.enabled === false) return + + await api.theme.install("./smoke-theme.json") + api.theme.set("smoke-theme") + + const value = cfg(options ?? undefined) + const route = names(value) + const keys = api.keybind.create(bind, value.keybinds) + const fx = new VignetteEffect(value.vignette) + const post = fx.apply.bind(fx) + api.renderer.addPostProcessFn(post) + api.lifecycle.onDispose(() => { + api.renderer.removePostProcessFn(post) + }) + + api.route.register([ + { + name: route.screen, + render: ({ params }) => , + }, + { + name: route.modal, + render: ({ params }) => , + }, + ]) + + reg(api, value, keys) + for (const item of slot(value)) { + api.slots.register(item) + } +} + +export default { + id: "tui-smoke", + tui, +} diff --git a/.opencode/themes/.gitignore b/.opencode/themes/.gitignore new file mode 100644 index 0000000000..5b41319c6a --- /dev/null +++ b/.opencode/themes/.gitignore @@ -0,0 +1 @@ +smoke-theme.json diff --git a/.opencode/tui.json b/.opencode/tui.json new file mode 100644 index 0000000000..f228c20886 --- /dev/null +++ b/.opencode/tui.json @@ -0,0 +1,19 @@ +{ + "$schema": "https://opencode.ai/tui.json", + "theme": "smoke-theme", + "plugin": [ + [ + "./plugins/tui-smoke.tsx", + { + "enabled": false, + "label": "workspace", + "keybinds": { + "modal": "ctrl+alt+m", + "screen": "ctrl+alt+o", + "home": "escape,ctrl+shift+h", + "dialog_close": "escape,q" + } + } + ] + ] +} diff --git a/bun.lock b/bun.lock index 54e1c768d0..1ff4b4f728 100644 --- a/bun.lock +++ b/bun.lock @@ -428,11 +428,21 @@ "zod": "catalog:", }, "devDependencies": { + "@opentui/core": "0.1.90", + "@opentui/solid": "0.1.90", "@tsconfig/node22": "catalog:", "@types/node": "catalog:", "@typescript/native-preview": "catalog:", "typescript": "catalog:", }, + "peerDependencies": { + "@opentui/core": ">=0.1.90", + "@opentui/solid": ">=0.1.90", + }, + "optionalPeers": [ + "@opentui/core", + "@opentui/solid", + ], }, "packages/script": { "name": "@opencode-ai/script", @@ -3837,7 +3847,7 @@ "pagefind": ["pagefind@1.4.0", "", { "optionalDependencies": { "@pagefind/darwin-arm64": "1.4.0", "@pagefind/darwin-x64": "1.4.0", "@pagefind/freebsd-x64": "1.4.0", "@pagefind/linux-arm64": "1.4.0", "@pagefind/linux-x64": "1.4.0", "@pagefind/windows-x64": "1.4.0" }, "bin": { "pagefind": "lib/runner/bin.cjs" } }, "sha512-z2kY1mQlL4J8q5EIsQkLzQjilovKzfNVhX8De6oyE6uHpfFtyBaqUpcl/XzJC/4fjD8vBDyh1zolimIcVrCn9g=="], - "pako": ["pako@0.2.9", "", {}, "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="], + "pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="], "param-case": ["param-case@3.0.4", "", { "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" } }, "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="], @@ -5677,12 +5687,12 @@ "type-is/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], + "unicode-trie/pako": ["pako@0.2.9", "", {}, "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="], + "unifont/ofetch": ["ofetch@1.5.1", "", { "dependencies": { "destr": "^2.0.5", "node-fetch-native": "^1.6.7", "ufo": "^1.6.1" } }, "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA=="], "uri-js/punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="], - "utif2/pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="], - "vite-plugin-icons-spritesheet/glob": ["glob@11.1.0", "", { "dependencies": { "foreground-child": "^3.3.1", "jackspeak": "^4.1.1", "minimatch": "^10.1.1", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw=="], "vitest/@vitest/expect": ["@vitest/expect@4.0.18", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.0.18", "@vitest/utils": "4.0.18", "chai": "^6.2.1", "tinyrainbow": "^3.0.3" } }, "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ=="], diff --git a/packages/app/src/components/status-popover-body.tsx b/packages/app/src/components/status-popover-body.tsx index aaf9f58d6a..0f6a1c1355 100644 --- a/packages/app/src/components/status-popover-body.tsx +++ b/packages/app/src/components/status-popover-body.tsx @@ -239,7 +239,9 @@ export function StatusPopoverBody(props: { shown: Accessor }) { const mcpConnected = createMemo(() => mcpNames().filter((name) => mcpStatus(name) === "connected").length) const lspItems = createMemo(() => sync.data.lsp ?? []) const lspCount = createMemo(() => lspItems().length) - const plugins = createMemo(() => sync.data.config.plugin ?? []) + const plugins = createMemo(() => + (sync.data.config.plugin ?? []).map((item) => (typeof item === "string" ? item : item[0])), + ) const pluginCount = createMemo(() => plugins().length) const pluginEmpty = createMemo(() => pluginEmptyMessage(language.t("dialog.plugins.empty"), "opencode.json")) diff --git a/packages/opencode/bunfig.toml b/packages/opencode/bunfig.toml index c3b7270764..33b39f719f 100644 --- a/packages/opencode/bunfig.toml +++ b/packages/opencode/bunfig.toml @@ -1,7 +1,7 @@ preload = ["@opentui/solid/preload"] [test] -preload = ["./test/preload.ts"] +preload = ["@opentui/solid/preload", "./test/preload.ts"] # timeout is not actually parsed from bunfig.toml (see src/bunfig.zig in oven-sh/bun) # using --timeout in package.json scripts instead # https://github.com/oven-sh/bun/issues/7789 diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts index 7341810768..b104dd2677 100755 --- a/packages/opencode/script/build.ts +++ b/packages/opencode/script/build.ts @@ -4,7 +4,7 @@ import { $ } from "bun" import fs from "fs" import path from "path" import { fileURLToPath } from "url" -import solidPlugin from "@opentui/solid/bun-plugin" +import { createSolidTransformPlugin } from "@opentui/solid/bun-plugin" const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) @@ -63,6 +63,7 @@ console.log(`Loaded ${migrations.length} migrations`) const singleFlag = process.argv.includes("--single") const baselineFlag = process.argv.includes("--baseline") const skipInstall = process.argv.includes("--skip-install") +const plugin = createSolidTransformPlugin() const skipEmbedWebUi = process.argv.includes("--skip-embed-web-ui") const createEmbeddedWebUIBundle = async () => { @@ -207,7 +208,7 @@ for (const item of targets) { await Bun.build({ conditions: ["browser"], tsconfig: "./tsconfig.json", - plugins: [solidPlugin], + plugins: [plugin], compile: { autoloadBunfig: false, autoloadDotenv: false, diff --git a/packages/opencode/specs/tui-plugins.md b/packages/opencode/specs/tui-plugins.md new file mode 100644 index 0000000000..1a7ba55a02 --- /dev/null +++ b/packages/opencode/specs/tui-plugins.md @@ -0,0 +1,377 @@ +# TUI plugins + +Technical reference for the current TUI plugin system. + +## Overview + +- TUI plugin config lives in `tui.json`. +- Author package entrypoint is `@opencode-ai/plugin/tui`. +- Internal plugins load inside the CLI app the same way external TUI plugins do. +- Package plugins can be installed from CLI or TUI. + +## TUI config + +Example: + +```json +{ + "$schema": "https://opencode.ai/tui.json", + "theme": "smoke-theme", + "plugin": ["@acme/opencode-plugin@1.2.3", ["./plugins/demo.tsx", { "label": "demo" }]], + "plugin_enabled": { + "acme.demo": false + } +} +``` + +- `plugin` entries can be either a string spec or `[spec, options]`. +- Plugin specs can be npm specs, `file://` URLs, relative paths, or absolute paths. +- Relative path specs are resolved relative to the config file that declared them. +- Duplicate npm plugins are deduped by package name; higher-precedence config wins. +- Duplicate file plugins are deduped by exact resolved file spec. This happens while merging config, before plugin modules are loaded. +- `plugin_enabled` is keyed by plugin id, not by plugin spec. +- For file plugins, that id must come from the plugin module's exported `id`. For npm plugins, it is the exported `id` or the package name if `id` is omitted. +- Plugins are enabled by default. `plugin_enabled` is only for explicit overrides, usually to disable a plugin with `false`. +- `plugin_enabled` is merged across config layers. +- Runtime enable/disable state is also stored in KV under `plugin_enabled`; that KV state overrides config on startup. + +## Author package shape + +Package entrypoint: + +- Import types from `@opencode-ai/plugin/tui`. +- `@opencode-ai/plugin` exports `./tui` and declares optional peer deps on `@opentui/core` and `@opentui/solid`. + +Minimal module shape: + +```tsx +/** @jsxImportSource @opentui/solid */ +import type { TuiPlugin } from "@opencode-ai/plugin/tui" + +const tui: TuiPlugin = async (api, options, meta) => { + api.command.register(() => [ + { + title: "Demo", + value: "demo.open", + onSelect: () => api.route.navigate("demo"), + }, + ]) + + api.route.register([ + { + name: "demo", + render: () => ( + + demo + + ), + }, + ]) +} + +export default { + id: "acme.demo", + tui, +} +``` + +- Loader only reads the module default export object. Named exports are ignored. +- TUI shape is `default export { id?, tui }`. +- `tui` signature is `(api, options, meta) => Promise`. +- If package `exports` contains `./tui`, the loader resolves that entrypoint. Otherwise it uses the resolved package target. +- File/path plugins must export a non-empty `id`. +- npm plugins may omit `id`; package `name` is used. +- Runtime identity is the resolved plugin id. Later plugins with the same id are rejected, including collisions with internal plugin ids. +- If a path spec points at a directory, that directory must have `package.json` with `main`. +- There is no directory auto-discovery for TUI plugins; they must be listed in `tui.json`. + +## Package manifest and install + +Package manifest is read from `package.json` field `oc-plugin`. + +Example: + +```json +{ + "name": "@acme/opencode-plugin", + "type": "module", + "main": "./dist/index.js", + "engines": { + "opencode": "^1.0.0" + }, + "oc-plugin": [ + ["server", { "custom": true }], + ["tui", { "compact": true }] + ] +} +``` + +### Version compatibility + +npm plugins can declare a version compatibility range in `package.json` using the standard `engines` field: + +```json +{ + "engines": { + "opencode": "^1.0.0" + } +} +``` + +- The value is a semver range checked against the running OpenCode version. +- If the range is not satisfied, the plugin is skipped with a warning and a session error. +- If `engines.opencode` is absent, no check is performed (backward compatible). +- File plugins are never checked; only npm package plugins are validated. + +- Install flow is shared by CLI and TUI in `src/plugin/install.ts`. +- Shared helpers are `installPlugin`, `readPluginManifest`, and `patchPluginConfig`. +- `opencode plugin ` and TUI install both run install → manifest read → config patch. +- Alias: `opencode plug `. +- `-g` / `--global` writes into the global config dir. +- Local installs resolve target dir inside `patchPluginConfig`. +- For local scope, path is `/.opencode` only when VCS is git and `worktree !== "/"`; otherwise `/.opencode`. +- Root-worktree fallback (`worktree === "/"` uses `/.opencode`) is covered by regression tests. +- `patchPluginConfig` applies all declared manifest targets (`server` and/or `tui`) in one call. +- `patchPluginConfig` returns structured result unions (`ok`, `code`, fields by error kind) instead of custom thrown errors. +- Without `--force`, an already-configured npm package name is a no-op. +- With `--force`, replacement matches by package name. If the existing row is `[spec, options]`, those tuple options are kept. +- Tuple targets in `oc-plugin` provide default options written into config. +- A package can target `server`, `tui`, or both. +- There is no uninstall, list, or update CLI command for external plugins. +- Local file plugins are configured directly in `tui.json`. + +When `plugin` entries exist in a writable `.opencode` dir or `OPENCODE_CONFIG_DIR`, OpenCode installs `@opencode-ai/plugin` into that dir and writes: + +- `package.json` +- `bun.lock` +- `node_modules/` +- `.gitignore` + +That is what makes local config-scoped plugins able to import `@opencode-ai/plugin/tui`. + +## TUI plugin API + +Top-level API groups exposed to `tui(api, options, meta)`: + +- `api.app.version` +- `api.command.register(cb)` / `api.command.trigger(value)` +- `api.route.register(routes)` / `api.route.navigate(name, params?)` / `api.route.current` +- `api.ui.Dialog`, `DialogAlert`, `DialogConfirm`, `DialogPrompt`, `DialogSelect`, `ui.toast`, `ui.dialog` +- `api.keybind.match`, `print`, `create` +- `api.tuiConfig` +- `api.kv.get`, `set`, `ready` +- `api.state` +- `api.theme.current`, `selected`, `has`, `set`, `install`, `mode`, `ready` +- `api.client`, `api.scopedClient(workspaceID?)`, `api.workspace.current()`, `api.workspace.set(workspaceID?)` +- `api.event.on(type, handler)` +- `api.renderer` +- `api.slots.register(plugin)` +- `api.plugins.list()`, `activate(id)`, `deactivate(id)`, `add(spec)`, `install(spec, options?)` +- `api.lifecycle.signal`, `api.lifecycle.onDispose(fn)` + +### Commands + +`api.command.register` returns an unregister function. Command rows support: + +- `title`, `value` +- `description`, `category` +- `keybind` +- `suggested`, `hidden`, `enabled` +- `slash: { name, aliases? }` +- `onSelect` + +Command behavior: + +- Registrations are reactive. +- Later registrations win for duplicate `value` and for keybind handling. +- Hidden commands are removed from the command dialog and slash list, but still respond to keybinds and `command.trigger(value)` if `enabled !== false`. + +### Routes + +- Reserved route names: `home` and `session`. +- Any other name is treated as a plugin route. +- `api.route.current` returns one of: + - `{ name: "home" }` + - `{ name: "session", params: { sessionID, initialPrompt? } }` + - `{ name: string, params?: Record }` +- `api.route.navigate("session", params)` only uses `params.sessionID`. It cannot set `initialPrompt`. +- If multiple plugins register the same route name, the last registered route wins. +- Unknown plugin routes render a fallback screen with a `go home` action. + +### Dialogs and toast + +- `ui.Dialog` is the base dialog wrapper. +- `ui.DialogAlert`, `ui.DialogConfirm`, `ui.DialogPrompt`, `ui.DialogSelect` are built-in dialog components. +- `ui.toast(...)` shows a toast. +- `ui.dialog` exposes the host dialog stack: + - `replace(render, onClose?)` + - `clear()` + - `setSize("medium" | "large" | "xlarge")` + - readonly `size`, `depth`, `open` + +### Keybinds + +- `api.keybind.match(key, evt)` and `print(key)` use the host keybind parser/printer. +- `api.keybind.create(defaults, overrides?)` builds a plugin-local keybind set. +- Only missing, blank, or non-string overrides are ignored. Key syntax is not validated. +- Returned keybind set exposes `all`, `get(name)`, `match(name, evt)`, `print(name)`. + +### KV, state, client, events + +- `api.kv` is the shared app KV store backed by `state/kv.json`. It is not plugin-namespaced. +- `api.kv` exposes `ready`. +- `api.tuiConfig` and `api.state` are live host objects/getters, not frozen snapshots. +- `api.state` exposes synced TUI state: + - `ready` + - `config` + - `provider` + - `path.{state,config,worktree,directory}` + - `vcs?.branch` + - `workspace.list()` / `workspace.get(workspaceID)` + - `session.count()` + - `session.diff(sessionID)` + - `session.todo(sessionID)` + - `session.messages(sessionID)` + - `session.status(sessionID)` + - `session.permission(sessionID)` + - `session.question(sessionID)` + - `part(messageID)` + - `lsp()` + - `mcp()` +- `api.client` always reflects the current runtime client. +- `api.scopedClient(workspaceID?)` creates or reuses a client bound to a workspace. +- `api.workspace.set(...)` rebinds the active workspace; `api.client` follows that rebind. +- `api.event.on(type, handler)` subscribes to the TUI event stream and returns an unsubscribe function. +- `api.renderer` exposes the raw `CliRenderer`. + +### Theme + +- `api.theme.current` exposes the resolved current theme tokens. +- `api.theme.selected` is the selected theme name. +- `api.theme.has(name)` checks for an installed theme. +- `api.theme.set(name)` switches theme and returns `boolean`. +- `api.theme.mode()` returns `"dark" | "light"`. +- `api.theme.install(jsonPath)` installs a theme JSON file. +- `api.theme.ready` reports theme readiness. + +Theme install behavior: + +- Relative theme paths are resolved from the plugin root. +- Theme name is the JSON basename. +- Install is skipped if that theme name already exists. +- Local plugins persist installed themes under the local `.opencode/themes` area near the plugin config source. +- Global plugins persist installed themes under the global `themes` dir. +- Invalid or unreadable theme files are ignored. + +### Slots + +Current host slot names: + +- `app` +- `home_logo` +- `home_bottom` +- `sidebar_title` with props `{ session_id, title, share_url? }` +- `sidebar_content` with props `{ session_id }` +- `sidebar_footer` with props `{ session_id }` + +Slot notes: + +- Slot context currently exposes only `theme`. +- `api.slots.register(plugin)` returns the host-assigned slot plugin id. +- `api.slots.register(plugin)` does not return an unregister function. +- Returned ids are `pluginId`, `pluginId:1`, `pluginId:2`, and so on. +- Plugin-provided `id` is not allowed. +- The current host renders `home_logo` with `replace`, `sidebar_title` and `sidebar_footer` with `single_winner`, and `app`, `home_bottom`, and `sidebar_content` with the slot library default mode. +- Plugins cannot define new slot names in this branch. + +### Plugin control and lifecycle + +- `api.plugins.list()` returns `{ id, source, spec, target, enabled, active }[]`. +- `enabled` is the persisted desired state. `active` means the plugin is currently initialized. +- `api.plugins.activate(id)` sets `enabled=true`, persists it into KV, and initializes the plugin. +- `api.plugins.deactivate(id)` sets `enabled=false`, persists it into KV, and disposes the plugin scope. +- `api.plugins.add(spec)` trims the input and returns `false` for an empty string. +- `api.plugins.add(spec)` treats the input as the runtime plugin spec and loads it without re-reading `tui.json`. +- `api.plugins.add(spec)` no-ops when that resolved spec (or resolved plugin id) is already loaded. +- `api.plugins.add(spec)` assumes enabled and always attempts initialization (it does not consult config/KV enable state). +- `api.plugins.install(spec, { global? })` runs install -> manifest read -> config patch using the same helper flow as CLI install. +- `api.plugins.install(...)` returns either `{ ok: false, message, missing? }` or `{ ok: true, dir, tui }`. +- `api.plugins.install(...)` does not load plugins into the current session. Call `api.plugins.add(spec)` to load after install. +- For packages that declare a tuple `tui` target in `oc-plugin`, `api.plugins.install(...)` stages those tuple options so a following `api.plugins.add(spec)` uses them. +- If activation fails, the plugin can remain `enabled=true` and `active=false`. +- `api.lifecycle.signal` is aborted before cleanup runs. +- `api.lifecycle.onDispose(fn)` registers cleanup and returns an unregister function. + +## Plugin metadata + +`meta` passed to `tui(api, options, meta)` contains: + +- `state`: `first | updated | same` +- `id`, `source`, `spec`, `target` +- npm-only fields when available: `requested`, `version` +- file-only field when available: `modified` +- `first_time`, `last_time`, `time_changed`, `load_count`, `fingerprint` + +Metadata is persisted by plugin id. + +- File plugin fingerprint is `target|modified`. +- npm plugin fingerprint is `target|requested|version`. +- Internal plugins get synthetic metadata with `state: "same"`. + +## Runtime behavior + +- Internal TUI plugins load first. +- External TUI plugins load from `tuiConfig.plugin`. +- `--pure` / `OPENCODE_PURE` skips external TUI plugins only. +- External plugin resolution and import are parallel. +- External plugin activation is sequential to keep command, route, and side-effect order deterministic. +- File plugins that fail initially are retried once after waiting for config dependency installation. +- Runtime add uses the same external loader path, including the file-plugin retry after dependency wait. +- Runtime add skips duplicates by resolved spec and returns `true` when the spec is already loaded. +- Runtime install and runtime add are separate operations. +- Plugin init failure rolls back that plugin's tracked registrations and loading continues. +- TUI runtime tracks and disposes: + - command registrations + - route registrations + - event subscriptions + - slot registrations + - explicit `lifecycle.onDispose(...)` handlers +- Cleanup runs in reverse order. +- Cleanup is awaited. +- Total cleanup budget per plugin is 5 seconds; timeout/error is logged and shutdown continues. + +## Built-in plugins + +- `internal:home-tips` +- `internal:sidebar-context` +- `internal:sidebar-mcp` +- `internal:sidebar-lsp` +- `internal:sidebar-todo` +- `internal:sidebar-files` +- `internal:sidebar-footer` +- `internal:plugin-manager` + +Sidebar content order is currently: context `100`, mcp `200`, lsp `300`, todo `400`, files `500`. + +The plugin manager is exposed as a command with title `Plugins` and value `plugins.list`. + +- Keybind name is `plugin_manager`. +- Default keybind is `none`. +- It lists both internal and external plugins. +- It toggles based on `active`. +- Its own row is disabled only inside the manager dialog. +- It also exposes command `plugins.install` with title `Install plugin`. +- Inside the Plugins dialog, key `shift+i` opens the install prompt. +- Install prompt asks for npm package name. +- Scope defaults to local, and `tab` toggles local/global. +- Install is blocked until `api.state.path.directory` is available; current guard message is `Paths are still syncing. Try again in a moment.`. +- Manager install uses `api.plugins.install(spec, { global })`. +- If the installed package has no `tui` target (`tui=false`), manager reports that and does not expect a runtime load. +- If install reports `tui=true`, manager then calls `api.plugins.add(spec)`. +- If runtime add fails, TUI shows a warning and restart remains the fallback. + +## Current in-repo examples + +- Local smoke plugin: `.opencode/plugins/tui-smoke.tsx` +- Local smoke config: `.opencode/tui.json` +- Local smoke theme: `.opencode/plugins/smoke-theme.json` diff --git a/packages/opencode/src/bun/index.ts b/packages/opencode/src/bun/index.ts index d6c4538259..dbdf5a2bc4 100644 --- a/packages/opencode/src/bun/index.ts +++ b/packages/opencode/src/bun/index.ts @@ -6,7 +6,7 @@ import { Filesystem } from "../util/filesystem" import { NamedError } from "@opencode-ai/util/error" import { Lock } from "../util/lock" import { PackageRegistry } from "./registry" -import { proxied } from "@/util/proxied" +import { online, proxied } from "@/util/network" import { Process } from "../util/process" export namespace BunProc { @@ -68,12 +68,13 @@ export namespace BunProc { if (!modExists || !cachedVersion) { // continue to install - } else if (version !== "latest" && cachedVersion === version) { - return mod } else if (version === "latest") { - const isOutdated = await PackageRegistry.isOutdated(pkg, cachedVersion, Global.Path.cache) - if (!isOutdated) return mod + if (!online()) return mod + const stale = await PackageRegistry.isOutdated(pkg, cachedVersion, Global.Path.cache) + if (!stale) return mod log.info("Cached version is outdated, proceeding with install", { pkg, cachedVersion }) + } else if (cachedVersion === version) { + return mod } // Build command arguments diff --git a/packages/opencode/src/bun/registry.ts b/packages/opencode/src/bun/registry.ts index e43e20e6c5..dead5e74d7 100644 --- a/packages/opencode/src/bun/registry.ts +++ b/packages/opencode/src/bun/registry.ts @@ -1,6 +1,7 @@ import semver from "semver" import { Log } from "../util/log" import { Process } from "../util/process" +import { online } from "@/util/network" export namespace PackageRegistry { const log = Log.create({ service: "bun" }) @@ -10,6 +11,11 @@ export namespace PackageRegistry { } export async function info(pkg: string, field: string, cwd?: string): Promise { + if (!online()) { + log.debug("offline, skipping bun info", { pkg, field }) + return null + } + const { code, stdout, stderr } = await Process.run([which(), "info", pkg, field], { cwd, env: { diff --git a/packages/opencode/src/cli/cmd/db.ts b/packages/opencode/src/cli/cmd/db.ts index 8ca4b9a42e..03e765dabc 100644 --- a/packages/opencode/src/cli/cmd/db.ts +++ b/packages/opencode/src/cli/cmd/db.ts @@ -6,6 +6,7 @@ import { UI } from "../ui" import { cmd } from "./cmd" import { JsonMigration } from "../../storage/json-migration" import { EOL } from "os" +import { errorMessage } from "../../util/error" const QueryCommand = cmd({ command: "$0 [query]", @@ -39,7 +40,7 @@ const QueryCommand = cmd({ } } } catch (err) { - UI.error(err instanceof Error ? err.message : String(err)) + UI.error(errorMessage(err)) process.exit(1) } db.close() @@ -100,7 +101,7 @@ const MigrateCommand = cmd({ } } catch (err) { if (tty) process.stderr.write("\x1b[?25h") - UI.error(`Migration failed: ${err instanceof Error ? err.message : String(err)}`) + UI.error(`Migration failed: ${errorMessage(err)}`) process.exit(1) } finally { sqlite.close() diff --git a/packages/opencode/src/cli/cmd/plug.ts b/packages/opencode/src/cli/cmd/plug.ts new file mode 100644 index 0000000000..ae2ea4ffde --- /dev/null +++ b/packages/opencode/src/cli/cmd/plug.ts @@ -0,0 +1,231 @@ +import { intro, log, outro, spinner } from "@clack/prompts" +import type { Argv } from "yargs" + +import { ConfigPaths } from "../../config/paths" +import { Global } from "../../global" +import { installPlugin, patchPluginConfig, readPluginManifest } from "../../plugin/install" +import { resolvePluginTarget } from "../../plugin/shared" +import { Instance } from "../../project/instance" +import { errorMessage } from "../../util/error" +import { Filesystem } from "../../util/filesystem" +import { Process } from "../../util/process" +import { UI } from "../ui" +import { cmd } from "./cmd" + +type Spin = { + start: (msg: string) => void + stop: (msg: string, code?: number) => void +} + +export type PlugDeps = { + spinner: () => Spin + log: { + error: (msg: string) => void + info: (msg: string) => void + success: (msg: string) => void + } + resolve: (spec: string) => Promise + readText: (file: string) => Promise + write: (file: string, text: string) => Promise + exists: (file: string) => Promise + files: (dir: string, name: "opencode" | "tui") => string[] + global: string +} + +export type PlugInput = { + mod: string + global?: boolean + force?: boolean +} + +export type PlugCtx = { + vcs?: string + worktree: string + directory: string +} + +const defaultPlugDeps: PlugDeps = { + spinner: () => spinner(), + log: { + error: (msg) => log.error(msg), + info: (msg) => log.info(msg), + success: (msg) => log.success(msg), + }, + resolve: (spec) => resolvePluginTarget(spec), + readText: (file) => Filesystem.readText(file), + write: async (file, text) => { + await Filesystem.write(file, text) + }, + exists: (file) => Filesystem.exists(file), + files: (dir, name) => ConfigPaths.fileInDirectory(dir, name), + global: Global.Path.config, +} + +function cause(err: unknown) { + if (!err || typeof err !== "object") return + if (!("cause" in err)) return + return (err as { cause?: unknown }).cause +} + +export function createPlugTask(input: PlugInput, dep: PlugDeps = defaultPlugDeps) { + const mod = input.mod + const force = Boolean(input.force) + const global = Boolean(input.global) + + return async (ctx: PlugCtx) => { + const install = dep.spinner() + install.start("Installing plugin package...") + const target = await installPlugin(mod, dep) + if (!target.ok) { + install.stop("Install failed", 1) + dep.log.error(`Could not install "${mod}"`) + const hit = cause(target.error) ?? target.error + if (hit instanceof Process.RunFailedError) { + const lines = hit.stderr + .toString() + .split(/\r?\n/) + .map((line) => line.trim()) + .filter(Boolean) + const errs = lines.filter((line) => line.startsWith("error:")).map((line) => line.replace(/^error:\s*/, "")) + const detail = errs[0] ?? lines.at(-1) + if (detail) dep.log.error(detail) + if (lines.some((line) => line.includes("No version matching"))) { + dep.log.info("This package depends on a version that is not available in your npm registry.") + dep.log.info("Check npm registry/auth settings and try again.") + } + } + if (!(hit instanceof Process.RunFailedError)) { + dep.log.error(errorMessage(hit)) + } + return false + } + install.stop("Plugin package ready") + + const inspect = dep.spinner() + inspect.start("Reading plugin manifest...") + const manifest = await readPluginManifest(target.target) + if (!manifest.ok) { + if (manifest.code === "manifest_read_failed") { + inspect.stop("Manifest read failed", 1) + dep.log.error(`Installed "${mod}" but failed to read ${manifest.file}`) + dep.log.error(errorMessage(cause(manifest.error) ?? manifest.error)) + return false + } + + if (manifest.code === "manifest_no_targets") { + inspect.stop("No plugin targets found", 1) + dep.log.error(`"${mod}" does not declare supported targets in package.json`) + dep.log.info('Expected: "oc-plugin": ["server", "tui"] or tuples like [["tui", { ... }]].') + return false + } + + inspect.stop("Manifest read failed", 1) + return false + } + + inspect.stop( + `Detected ${manifest.targets.map((item) => item.kind).join(" + ")} target${manifest.targets.length === 1 ? "" : "s"}`, + ) + + const patch = dep.spinner() + patch.start("Updating plugin config...") + const out = await patchPluginConfig( + { + spec: mod, + targets: manifest.targets, + force, + global, + vcs: ctx.vcs, + worktree: ctx.worktree, + directory: ctx.directory, + config: dep.global, + }, + dep, + ) + if (!out.ok) { + if (out.code === "invalid_json") { + patch.stop(`Failed updating ${out.kind} config`, 1) + dep.log.error(`Invalid JSON in ${out.file} (${out.parse} at line ${out.line}, column ${out.col})`) + dep.log.info("Fix the config file and run the command again.") + return false + } + + patch.stop("Failed updating plugin config", 1) + dep.log.error(errorMessage(out.error)) + return false + } + patch.stop("Plugin config updated") + for (const item of out.items) { + if (item.mode === "noop") { + dep.log.info(`Already configured in ${item.file}`) + continue + } + if (item.mode === "replace") { + dep.log.info(`Replaced in ${item.file}`) + continue + } + dep.log.info(`Added to ${item.file}`) + } + + dep.log.success(`Installed ${mod}`) + dep.log.info(global ? `Scope: global (${out.dir})` : `Scope: local (${out.dir})`) + return true + } +} + +export const PluginCommand = cmd({ + command: "plugin ", + aliases: ["plug"], + describe: "install plugin and update config", + builder: (yargs: Argv) => { + return yargs + .positional("module", { + type: "string", + describe: "npm module name", + }) + .option("global", { + alias: ["g"], + type: "boolean", + default: false, + describe: "install in global config", + }) + .option("force", { + alias: ["f"], + type: "boolean", + default: false, + describe: "replace existing plugin version", + }) + }, + handler: async (args) => { + const mod = String(args.module ?? "").trim() + if (!mod) { + UI.error("module is required") + process.exitCode = 1 + return + } + + UI.empty() + intro(`Install plugin ${mod}`) + + const run = createPlugTask({ + mod, + global: Boolean(args.global), + force: Boolean(args.force), + }) + let ok = true + + await Instance.provide({ + directory: process.cwd(), + fn: async () => { + ok = await run({ + vcs: Instance.project.vcs, + worktree: Instance.worktree, + directory: Instance.directory, + }) + }, + }) + + outro("Done") + if (!ok) process.exitCode = 1 + }, +}) diff --git a/packages/opencode/src/cli/cmd/tui/app.tsx b/packages/opencode/src/cli/cmd/tui/app.tsx index 4897cb7e82..2557d965ad 100644 --- a/packages/opencode/src/cli/cmd/tui/app.tsx +++ b/packages/opencode/src/cli/cmd/tui/app.tsx @@ -1,15 +1,30 @@ -import { render, useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/solid" +import { render, TimeToFirstDraw, useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/solid" import { Clipboard } from "@tui/util/clipboard" import { Selection } from "@tui/util/selection" -import { MouseButton, TextAttributes } from "@opentui/core" +import { createCliRenderer, MouseButton, type CliRendererConfig } from "@opentui/core" import { RouteProvider, useRoute } from "@tui/context/route" -import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, batch, Show, on } from "solid-js" -import { win32DisableProcessedInput, win32FlushInputBuffer, win32InstallCtrlCGuard } from "./win32" +import { + Switch, + Match, + createEffect, + createMemo, + ErrorBoundary, + createSignal, + onMount, + batch, + Show, + on, + onCleanup, +} from "solid-js" +import { win32DisableProcessedInput, win32InstallCtrlCGuard } from "./win32" import { Flag } from "@/flag/flag" import semver from "semver" import { DialogProvider, useDialog } from "@tui/ui/dialog" import { DialogProvider as DialogProviderList } from "@tui/component/dialog-provider" +import { ErrorComponent } from "@tui/component/error-component" +import { PluginRouteMissing } from "@tui/component/plugin-route-missing" import { SDKProvider, useSDK } from "@tui/context/sdk" +import { StartupLoading } from "@tui/component/startup-loading" import { SyncProvider, useSync } from "@tui/context/sync" import { LocalProvider, useLocal } from "@tui/context/local" import { DialogModel, useConnected } from "@tui/component/dialog-model" @@ -21,7 +36,7 @@ import { CommandProvider, useCommandDialog } from "@tui/component/dialog-command import { DialogAgent } from "@tui/component/dialog-agent" import { DialogSessionList } from "@tui/component/dialog-session-list" import { DialogWorkspaceList } from "@tui/component/dialog-workspace-list" -import { KeybindProvider } from "@tui/context/keybind" +import { KeybindProvider, useKeybind } from "@tui/context/keybind" import { ThemeProvider, useTheme } from "@tui/context/theme" import { Home } from "@tui/routes/home" import { Session } from "@tui/routes/session" @@ -40,8 +55,10 @@ import { ArgsProvider, useArgs, type Args } from "./context/args" import open from "open" import { writeHeapSnapshot } from "v8" import { PromptRefProvider, usePromptRef } from "./context/prompt" -import { TuiConfigProvider } from "./context/tui-config" +import { TuiConfigProvider, useTuiConfig } from "./context/tui-config" import { TuiConfig } from "@/config/tui" +import { createTuiApi, TuiPluginRuntime, type RouteMap } from "./plugin" +import { FormatError, FormatUnknownError } from "@/cli/error" async function getTerminalBackgroundColor(): Promise<"dark" | "light"> { // can't set raw mode if not a TTY @@ -104,7 +121,42 @@ async function getTerminalBackgroundColor(): Promise<"dark" | "light"> { } import type { EventSource } from "./context/sdk" -import { Installation } from "@/installation" + +function rendererConfig(_config: TuiConfig.Info): CliRendererConfig { + return { + targetFps: 60, + gatherStats: false, + exitOnCtrlC: false, + useKittyKeyboard: { events: process.platform === "win32" }, + autoFocus: false, + openConsoleOnError: false, + consoleOptions: { + keyBindings: [{ name: "y", ctrl: true, action: "copy-selection" }], + onCopySelection: (text) => { + Clipboard.copy(text).catch((error) => { + console.error(`Failed to copy console selection to clipboard: ${error}`) + }) + }, + }, + } +} + +function errorMessage(error: unknown) { + const formatted = FormatError(error) + if (formatted !== undefined) return formatted + if ( + typeof error === "object" && + error !== null && + "data" in error && + typeof error.data === "object" && + error.data !== null && + "message" in error.data && + typeof error.data.message === "string" + ) { + return error.data.message + } + return FormatUnknownError(error) +} export function tui(input: { url: string @@ -132,77 +184,68 @@ export function tui(input: { resolve() } - render( - () => { - return ( - } - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ) - }, - { - targetFps: 60, - gatherStats: false, - exitOnCtrlC: false, - useKittyKeyboard: { events: process.platform === "win32" }, - autoFocus: false, - openConsoleOnError: false, - consoleOptions: { - keyBindings: [{ name: "y", ctrl: true, action: "copy-selection" }], - onCopySelection: (text) => { - Clipboard.copy(text).catch((error) => { - console.error(`Failed to copy console selection to clipboard: ${error}`) - }) - }, - }, - }, - ) + const onBeforeExit = async () => { + await TuiPluginRuntime.dispose() + } + + const renderer = await createCliRenderer(rendererConfig(input.config)) + + await render(() => { + return ( + ( + + )} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) + }, renderer) }) } function App(props: { onSnapshot?: () => Promise }) { + const tuiConfig = useTuiConfig() const route = useRoute() const dimensions = useTerminalDimensions() const renderer = useRenderer() @@ -211,12 +254,47 @@ function App(props: { onSnapshot?: () => Promise }) { const local = useLocal() const kv = useKV() const command = useCommandDialog() + const keybind = useKeybind() const sdk = useSDK() const toast = useToast() - const { theme, mode, setMode, locked, lock, unlock } = useTheme() + const themeState = useTheme() + const { theme, mode, setMode, locked, lock, unlock } = themeState const sync = useSync() const exit = useExit() const promptRef = usePromptRef() + const routes: RouteMap = new Map() + const [routeRev, setRouteRev] = createSignal(0) + const routeView = (name: string) => { + routeRev() + return routes.get(name)?.at(-1)?.render + } + + const api = createTuiApi({ + command, + tuiConfig, + dialog, + keybind, + kv, + route, + routes, + bump: () => setRouteRev((x) => x + 1), + sdk, + sync, + theme: themeState, + toast, + renderer, + }) + onCleanup(() => { + api.dispose() + }) + const [ready, setReady] = createSignal(false) + TuiPluginRuntime.init(api) + .catch((error) => { + console.error("Failed to load TUI plugins", error) + }) + .finally(() => { + setReady(true) + }) useKeyboard((evt) => { if (!Flag.OPENCODE_EXPERIMENTAL_DISABLE_COPY_ON_SELECT) return @@ -259,10 +337,6 @@ function App(props: { onSnapshot?: () => Promise }) { } const [terminalTitleEnabled, setTerminalTitleEnabled] = createSignal(kv.get("terminal_title_enabled", true)) - createEffect(() => { - console.log(JSON.stringify(route.data)) - }) - // Update terminal window title based on current route and session createEffect(() => { if (!terminalTitleEnabled() || Flag.OPENCODE_DISABLE_TERMINAL_TITLE) return @@ -279,9 +353,13 @@ function App(props: { onSnapshot?: () => Promise }) { return } - // Truncate title to 40 chars max const title = session.title.length > 40 ? session.title.slice(0, 37) + "..." : session.title renderer.setTerminalTitle(`OC | ${title}`) + return + } + + if (route.data.type === "plugin") { + renderer.setTerminalTitle(`OC | ${route.data.id}`) } }) @@ -723,17 +801,7 @@ function App(props: { onSnapshot?: () => Promise }) { sdk.event.on("session.error", (evt) => { const error = evt.properties.error if (error && typeof error === "object" && error.name === "MessageAbortedError") return - const message = (() => { - if (!error) return "An error occurred" - - if (typeof error === "object") { - const data = error.data - if ("message" in data && typeof data.message === "string") { - return data.message - } - } - return String(error) - })() + const message = errorMessage(error) toast.show({ variant: "error", @@ -789,6 +857,14 @@ function App(props: { onSnapshot?: () => Promise }) { exit() }) + const plugin = createMemo(() => { + if (!ready()) return + if (route.data.type !== "plugin") return + const render = routeView(route.data.id) + if (!render) return route.navigate({ type: "home" })} /> + return render({ params: route.data.data }) + }) + return ( Promise }) { }} onMouseUp={Flag.OPENCODE_EXPERIMENTAL_DISABLE_COPY_ON_SELECT ? undefined : () => Selection.copy(renderer, toast)} > - - - - - - - - - - ) -} - -function ErrorComponent(props: { - error: Error - reset: () => void - onExit: () => Promise - mode?: "dark" | "light" -}) { - const term = useTerminalDimensions() - const renderer = useRenderer() - - const handleExit = async () => { - renderer.setTerminalTitle("") - renderer.destroy() - win32FlushInputBuffer() - await props.onExit() - } - - useKeyboard((evt) => { - if (evt.ctrl && evt.name === "c") { - handleExit() - } - }) - const [copied, setCopied] = createSignal(false) - - const issueURL = new URL("https://github.com/anomalyco/opencode/issues/new?template=bug-report.yml") - - // Choose safe fallback colors per mode since theme context may not be available - const isLight = props.mode === "light" - const colors = { - bg: isLight ? "#ffffff" : "#0a0a0a", - text: isLight ? "#1a1a1a" : "#eeeeee", - muted: isLight ? "#8a8a8a" : "#808080", - primary: isLight ? "#3b7dd8" : "#fab283", - } - - if (props.error.message) { - issueURL.searchParams.set("title", `opentui: fatal: ${props.error.message}`) - } - - if (props.error.stack) { - issueURL.searchParams.set( - "description", - "```\n" + props.error.stack.substring(0, 6000 - issueURL.toString().length) + "...\n```", - ) - } - - issueURL.searchParams.set("opencode-version", Installation.VERSION) - - const copyIssueURL = () => { - Clipboard.copy(issueURL.toString()).then(() => { - setCopied(true) - }) - } - - return ( - - - - Please report an issue. - - - - Copy issue URL (exception info pre-filled) - - - {copied() && Successfully copied} - - - A fatal error occurred! - - Reset TUI - - - Exit - - - - {props.error.stack} - - {props.error.message} + + + + + + + + + + + + + + {plugin()} + + ) } diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-command.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-command.tsx index be031296e9..f42ba15ec0 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-command.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-command.tsx @@ -4,13 +4,15 @@ import { createContext, createMemo, createSignal, + getOwner, onCleanup, + runWithOwner, useContext, type Accessor, type ParentProps, } from "solid-js" import { useKeyboard } from "@opentui/solid" -import { type KeybindKey, useKeybind } from "@tui/context/keybind" +import { useKeybind } from "@tui/context/keybind" type Context = ReturnType const ctx = createContext() @@ -21,7 +23,7 @@ export type Slash = { } export type CommandOption = DialogSelectOption & { - keybind?: KeybindKey + keybind?: string suggested?: boolean slash?: Slash hidden?: boolean @@ -29,6 +31,7 @@ export type CommandOption = DialogSelectOption & { } function init() { + const root = getOwner() const [registrations, setRegistrations] = createSignal[]>([]) const [suspendCount, setSuspendCount] = createSignal(0) const dialog = useDialog() @@ -100,11 +103,32 @@ function init() { dialog.replace(() => ) }, register(cb: () => CommandOption[]) { - const results = createMemo(cb) - setRegistrations((arr) => [results, ...arr]) - onCleanup(() => { - setRegistrations((arr) => arr.filter((x) => x !== results)) + const owner = getOwner() ?? root + if (!owner) return () => {} + + let list: Accessor | undefined + + // TUI plugins now register commands via an async store that runs outside an active reactive scope. + // runWithOwner attaches createMemo/onCleanup to this owner so plugin registrations stay reactive and dispose correctly. + runWithOwner(owner, () => { + list = createMemo(cb) + const ref = list + if (!ref) return + setRegistrations((arr) => [ref, ...arr]) + onCleanup(() => { + setRegistrations((arr) => arr.filter((x) => x !== ref)) + }) }) + + if (!list) return () => {} + let done = false + return () => { + if (done) return + done = true + const ref = list + if (!ref) return + setRegistrations((arr) => arr.filter((x) => x !== ref)) + } }, } return result diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx index 3b6b5ef218..ebc65a45b7 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx @@ -16,7 +16,8 @@ export function DialogStatus() { const plugins = createMemo(() => { const list = sync.data.config.plugin ?? [] - const result = list.map((value) => { + const result = list.map((item) => { + const value = typeof item === "string" ? item : item[0] if (value.startsWith("file://")) { const path = fileURLToPath(value) const parts = path.split("/") diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx index 09bb492f63..84127b5763 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx @@ -3,14 +3,22 @@ import { DialogSelect } from "@tui/ui/dialog-select" import { useRoute } from "@tui/context/route" import { useSync } from "@tui/context/sync" import { createEffect, createMemo, createSignal, onMount } from "solid-js" -import type { Session } from "@opencode-ai/sdk/v2" +import { createOpencodeClient, type Session } from "@opencode-ai/sdk/v2" import { useSDK } from "../context/sdk" import { useToast } from "../ui/toast" import { useKeybind } from "../context/keybind" import { DialogSessionList } from "./workspace/dialog-session-list" -import { createOpencodeClient } from "@opencode-ai/sdk/v2" import { setTimeout as sleep } from "node:timers/promises" +function scoped(sdk: ReturnType, sync: ReturnType, workspaceID?: string) { + return createOpencodeClient({ + baseUrl: sdk.url, + fetch: sdk.fetch, + directory: sync.data.path.directory || sdk.directory, + experimental_workspaceID: workspaceID, + }) +} + async function openWorkspace(input: { dialog: ReturnType route: ReturnType @@ -29,12 +37,7 @@ async function openWorkspace(input: { ) } - const client = createOpencodeClient({ - baseUrl: input.sdk.url, - fetch: input.sdk.fetch, - directory: input.sync.data.path.directory || input.sdk.directory, - experimental_workspaceID: input.workspaceID, - }) + const client = scoped(input.sdk, input.sync, input.workspaceID) const listed = input.forceCreate ? undefined : await client.session.list({ roots: true, limit: 1 }) const session = listed?.data?.[0] if (session?.id) { @@ -187,12 +190,7 @@ export function DialogWorkspaceList() { await open(workspaceID) return } - const client = createOpencodeClient({ - baseUrl: sdk.url, - fetch: sdk.fetch, - directory: sync.data.path.directory || sdk.directory, - experimental_workspaceID: workspaceID, - }) + const client = scoped(sdk, sync, workspaceID) const listed = await client.session.list({ roots: true, limit: 1 }).catch(() => undefined) if (listed?.data?.length) { dialog.replace(() => ) @@ -223,12 +221,7 @@ export function DialogWorkspaceList() { setCounts(Object.fromEntries(workspaces.map((workspace) => [workspace.id, undefined]))) void Promise.all( workspaces.map(async (workspace) => { - const client = createOpencodeClient({ - baseUrl: sdk.url, - fetch: sdk.fetch, - directory: sync.data.path.directory || sdk.directory, - experimental_workspaceID: workspace.id, - }) + const client = scoped(sdk, sync, workspace.id) const result = await client.session.list({ roots: true }).catch(() => undefined) return [workspace.id, result ? (result.data?.length ?? 0) : null] as const }), diff --git a/packages/opencode/src/cli/cmd/tui/component/error-component.tsx b/packages/opencode/src/cli/cmd/tui/component/error-component.tsx new file mode 100644 index 0000000000..c568e54e42 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/component/error-component.tsx @@ -0,0 +1,91 @@ +import { TextAttributes } from "@opentui/core" +import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/solid" +import { Clipboard } from "@tui/util/clipboard" +import { createSignal } from "solid-js" +import { Installation } from "@/installation" +import { win32FlushInputBuffer } from "../win32" + +export function ErrorComponent(props: { + error: Error + reset: () => void + onBeforeExit?: () => Promise + onExit: () => Promise + mode?: "dark" | "light" +}) { + const term = useTerminalDimensions() + const renderer = useRenderer() + + const handleExit = async () => { + await props.onBeforeExit?.() + renderer.setTerminalTitle("") + renderer.destroy() + win32FlushInputBuffer() + await props.onExit() + } + + useKeyboard((evt) => { + if (evt.ctrl && evt.name === "c") { + handleExit() + } + }) + const [copied, setCopied] = createSignal(false) + + const issueURL = new URL("https://github.com/anomalyco/opencode/issues/new?template=bug-report.yml") + + // Choose safe fallback colors per mode since theme context may not be available + const isLight = props.mode === "light" + const colors = { + bg: isLight ? "#ffffff" : "#0a0a0a", + text: isLight ? "#1a1a1a" : "#eeeeee", + muted: isLight ? "#8a8a8a" : "#808080", + primary: isLight ? "#3b7dd8" : "#fab283", + } + + if (props.error.message) { + issueURL.searchParams.set("title", `opentui: fatal: ${props.error.message}`) + } + + if (props.error.stack) { + issueURL.searchParams.set( + "description", + "```\n" + props.error.stack.substring(0, 6000 - issueURL.toString().length) + "...\n```", + ) + } + + issueURL.searchParams.set("opencode-version", Installation.VERSION) + + const copyIssueURL = () => { + Clipboard.copy(issueURL.toString()).then(() => { + setCopied(true) + }) + } + + return ( + + + + Please report an issue. + + + + Copy issue URL (exception info pre-filled) + + + {copied() && Successfully copied} + + + A fatal error occurred! + + Reset TUI + + + Exit + + + + {props.error.stack} + + {props.error.message} + + ) +} diff --git a/packages/opencode/src/cli/cmd/tui/component/plugin-route-missing.tsx b/packages/opencode/src/cli/cmd/tui/component/plugin-route-missing.tsx new file mode 100644 index 0000000000..77e2ea8dd3 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/component/plugin-route-missing.tsx @@ -0,0 +1,14 @@ +import { useTheme } from "../context/theme" + +export function PluginRouteMissing(props: { id: string; onHome: () => void }) { + const { theme } = useTheme() + + return ( + + Unknown plugin route: {props.id} + + go home + + + ) +} diff --git a/packages/opencode/src/cli/cmd/tui/component/startup-loading.tsx b/packages/opencode/src/cli/cmd/tui/component/startup-loading.tsx new file mode 100644 index 0000000000..6665c0c2e8 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/component/startup-loading.tsx @@ -0,0 +1,63 @@ +import { createEffect, createMemo, createSignal, onCleanup, Show } from "solid-js" +import { useTheme } from "../context/theme" +import { Spinner } from "./spinner" + +export function StartupLoading(props: { ready: () => boolean }) { + const theme = useTheme().theme + const [show, setShow] = createSignal(false) + const text = createMemo(() => (props.ready() ? "Finishing startup..." : "Loading plugins...")) + let wait: NodeJS.Timeout | undefined + let hold: NodeJS.Timeout | undefined + let stamp = 0 + + createEffect(() => { + if (props.ready()) { + if (wait) { + clearTimeout(wait) + wait = undefined + } + if (!show()) return + if (hold) return + + const left = 3000 - (Date.now() - stamp) + if (left <= 0) { + setShow(false) + return + } + + hold = setTimeout(() => { + hold = undefined + setShow(false) + }, left).unref() + return + } + + if (hold) { + clearTimeout(hold) + hold = undefined + } + if (show()) return + if (wait) return + + wait = setTimeout(() => { + wait = undefined + stamp = Date.now() + setShow(true) + }, 500).unref() + }) + + onCleanup(() => { + if (wait) clearTimeout(wait) + if (hold) clearTimeout(hold) + }) + + return ( + + + + {text()} + + + + ) +} diff --git a/packages/opencode/src/cli/cmd/tui/context/exit.tsx b/packages/opencode/src/cli/cmd/tui/context/exit.tsx index 236320cf06..205025f867 100644 --- a/packages/opencode/src/cli/cmd/tui/context/exit.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/exit.tsx @@ -12,7 +12,7 @@ type Exit = ((reason?: unknown) => Promise) & { export const { use: useExit, provider: ExitProvider } = createSimpleContext({ name: "Exit", - init: (input: { onExit?: () => Promise }) => { + init: (input: { onBeforeExit?: () => Promise; onExit?: () => Promise }) => { const renderer = useRenderer() let message: string | undefined let task: Promise | undefined @@ -33,6 +33,7 @@ export const { use: useExit, provider: ExitProvider } = createSimpleContext({ (reason?: unknown) => { if (task) return task task = (async () => { + await input.onBeforeExit?.() // Reset window title before destroying renderer renderer.setTerminalTitle("") renderer.destroy() diff --git a/packages/opencode/src/cli/cmd/tui/context/keybind.tsx b/packages/opencode/src/cli/cmd/tui/context/keybind.tsx index 566d66ade5..8d3fe487d1 100644 --- a/packages/opencode/src/cli/cmd/tui/context/keybind.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/keybind.tsx @@ -80,21 +80,24 @@ export const { use: useKeybind, provider: KeybindProvider } = createSimpleContex } return Keybind.fromParsedKey(evt, store.leader) }, - match(key: KeybindKey, evt: ParsedKey) { - const keybind = keybinds()[key] - if (!keybind) return false + match(key: string, evt: ParsedKey) { + const list = keybinds()[key] ?? Keybind.parse(key) + if (!list.length) return false const parsed: Keybind.Info = result.parse(evt) - for (const key of keybind) { - if (Keybind.match(key, parsed)) { + for (const item of list) { + if (Keybind.match(item, parsed)) { return true } } + return false }, - print(key: KeybindKey) { - const first = keybinds()[key]?.at(0) + print(key: string) { + const first = keybinds()[key]?.at(0) ?? Keybind.parse(key).at(0) if (!first) return "" - const result = Keybind.toString(first) - return result.replace("", Keybind.toString(keybinds().leader![0]!)) + const text = Keybind.toString(first) + const lead = keybinds().leader?.[0] + if (!lead) return text + return text.replace("", Keybind.toString(lead)) }, } return result diff --git a/packages/opencode/src/cli/cmd/tui/context/plugin-keybinds.ts b/packages/opencode/src/cli/cmd/tui/context/plugin-keybinds.ts new file mode 100644 index 0000000000..a84e10128c --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/context/plugin-keybinds.ts @@ -0,0 +1,41 @@ +import type { ParsedKey } from "@opentui/core" + +export type PluginKeybindMap = Record + +type Base = { + match: (key: string, evt: ParsedKey) => boolean + print: (key: string) => string +} + +export type PluginKeybind = { + readonly all: PluginKeybindMap + get: (name: string) => string + match: (name: string, evt: ParsedKey) => boolean + print: (name: string) => string +} + +const txt = (value: unknown) => { + if (typeof value !== "string") return + if (!value.trim()) return + return value +} + +export function createPluginKeybind( + base: Base, + defaults: PluginKeybindMap, + overrides?: Record, +): PluginKeybind { + const all = Object.freeze( + Object.fromEntries(Object.entries(defaults).map(([name, value]) => [name, txt(overrides?.[name]) ?? value])), + ) + const get = (name: string) => all[name] ?? name + + return { + get all() { + return all + }, + get, + match: (name, evt) => base.match(get(name), evt), + print: (name) => base.print(get(name)), + } +} diff --git a/packages/opencode/src/cli/cmd/tui/context/route.tsx b/packages/opencode/src/cli/cmd/tui/context/route.tsx index e96cd2c3a4..939c2d5dc8 100644 --- a/packages/opencode/src/cli/cmd/tui/context/route.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/route.tsx @@ -14,7 +14,13 @@ export type SessionRoute = { initialPrompt?: PromptInfo } -export type Route = HomeRoute | SessionRoute +export type PluginRoute = { + type: "plugin" + id: string + data?: Record +} + +export type Route = HomeRoute | SessionRoute | PluginRoute export const { use: useRoute, provider: RouteProvider } = createSimpleContext({ name: "Route", @@ -32,7 +38,6 @@ export const { use: useRoute, provider: RouteProvider } = createSimpleContext({ return store }, navigate(route: Route) { - console.log("navigate", route) setStore(route) }, } diff --git a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx index 2403a4e938..a0f1b32249 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx @@ -109,6 +109,9 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({ get client() { return sdk }, + get workspaceID() { + return workspaceID + }, directory: props.directory, event: emitter, fetch: props.fetch ?? fetch, diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx index a3d268afd3..008f1bf806 100644 --- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx @@ -42,66 +42,13 @@ import { createStore, produce } from "solid-js/store" import { Global } from "@/global" import { Filesystem } from "@/util/filesystem" import { useTuiConfig } from "./tui-config" +import { isRecord } from "@/util/record" +import type { TuiThemeCurrent } from "@opencode-ai/plugin/tui" -type ThemeColors = { - primary: RGBA - secondary: RGBA - accent: RGBA - error: RGBA - warning: RGBA - success: RGBA - info: RGBA - text: RGBA - textMuted: RGBA - selectedListItemText: RGBA - background: RGBA - backgroundPanel: RGBA - backgroundElement: RGBA - backgroundMenu: RGBA - border: RGBA - borderActive: RGBA - borderSubtle: RGBA - diffAdded: RGBA - diffRemoved: RGBA - diffContext: RGBA - diffHunkHeader: RGBA - diffHighlightAdded: RGBA - diffHighlightRemoved: RGBA - diffAddedBg: RGBA - diffRemovedBg: RGBA - diffContextBg: RGBA - diffLineNumber: RGBA - diffAddedLineNumberBg: RGBA - diffRemovedLineNumberBg: RGBA - markdownText: RGBA - markdownHeading: RGBA - markdownLink: RGBA - markdownLinkText: RGBA - markdownCode: RGBA - markdownBlockQuote: RGBA - markdownEmph: RGBA - markdownStrong: RGBA - markdownHorizontalRule: RGBA - markdownListItem: RGBA - markdownListEnumeration: RGBA - markdownImage: RGBA - markdownImageText: RGBA - markdownCodeBlock: RGBA - syntaxComment: RGBA - syntaxKeyword: RGBA - syntaxFunction: RGBA - syntaxVariable: RGBA - syntaxString: RGBA - syntaxNumber: RGBA - syntaxType: RGBA - syntaxOperator: RGBA - syntaxPunctuation: RGBA -} - -type Theme = ThemeColors & { +type Theme = TuiThemeCurrent & { _hasSelectedListItemText: boolean - thinkingOpacity: number } +type ThemeColor = Exclude export function selectedForeground(theme: Theme, bg?: RGBA): RGBA { // If theme explicitly defines selectedListItemText, use it @@ -128,10 +75,10 @@ type Variant = { light: HexColor | RefName } type ColorValue = HexColor | RefName | Variant | RGBA -type ThemeJson = { +export type ThemeJson = { $schema?: string defs?: Record - theme: Omit, "selectedListItemText" | "backgroundMenu"> & { + theme: Omit, "selectedListItemText" | "backgroundMenu"> & { selectedListItemText?: ColorValue backgroundMenu?: ColorValue thinkingOpacity?: number @@ -174,27 +121,91 @@ export const DEFAULT_THEMES: Record = { carbonfox, } -function resolveTheme(theme: ThemeJson, mode: "dark" | "light") { +type State = { + themes: Record + mode: "dark" | "light" + lock: "dark" | "light" | undefined + active: string + ready: boolean +} + +const pluginThemes: Record = {} +let customThemes: Record = {} +let systemTheme: ThemeJson | undefined + +function listThemes() { + // Priority: defaults < plugin installs < custom files < generated system. + const themes = { + ...DEFAULT_THEMES, + ...pluginThemes, + ...customThemes, + } + if (!systemTheme) return themes + return { + ...themes, + system: systemTheme, + } +} + +function syncThemes() { + setStore("themes", listThemes()) +} + +const [store, setStore] = createStore({ + themes: listThemes(), + mode: "dark", + lock: undefined, + active: "opencode", + ready: false, +}) + +export function allThemes() { + return store.themes +} + +function isTheme(theme: unknown): theme is ThemeJson { + if (!isRecord(theme)) return false + if (!isRecord(theme.theme)) return false + return true +} + +export function hasTheme(name: string) { + if (!name) return false + return allThemes()[name] !== undefined +} + +export function addTheme(name: string, theme: unknown) { + if (!name) return false + if (!isTheme(theme)) return false + if (hasTheme(name)) return false + pluginThemes[name] = theme + syncThemes() + return true +} + +export function resolveTheme(theme: ThemeJson, mode: "dark" | "light") { const defs = theme.defs ?? {} - function resolveColor(c: ColorValue): RGBA { + function resolveColor(c: ColorValue, chain: string[] = []): RGBA { if (c instanceof RGBA) return c if (typeof c === "string") { if (c === "transparent" || c === "none") return RGBA.fromInts(0, 0, 0, 0) if (c.startsWith("#")) return RGBA.fromHex(c) - if (defs[c] != null) { - return resolveColor(defs[c]) - } else if (theme.theme[c as keyof ThemeColors] !== undefined) { - return resolveColor(theme.theme[c as keyof ThemeColors]!) - } else { + if (chain.includes(c)) { + throw new Error(`Circular color reference: ${[...chain, c].join(" -> ")}`) + } + + const next = defs[c] ?? theme.theme[c as ThemeColor] + if (next === undefined) { throw new Error(`Color reference "${c}" not found in defs or theme`) } + return resolveColor(next, [...chain, c]) } if (typeof c === "number") { return ansiToRgba(c) } - return resolveColor(c[mode]) + return resolveColor(c[mode], chain) } const resolved = Object.fromEntries( @@ -203,7 +214,7 @@ function resolveTheme(theme: ThemeJson, mode: "dark" | "light") { .map(([key, value]) => { return [key, resolveColor(value as ColorValue)] }), - ) as Partial + ) as Partial> // Handle selectedListItemText separately since it's optional const hasSelectedListItemText = theme.theme.selectedListItemText !== undefined @@ -287,14 +298,18 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({ if (value === "dark" || value === "light") return value return } - const lock = pick(kv.get("theme_mode_lock")) - const [store, setStore] = createStore({ - themes: DEFAULT_THEMES, - mode: lock ?? pick(kv.get("theme_mode", props.mode)) ?? props.mode, - lock, - active: (config.theme ?? kv.get("theme", "opencode")) as string, - ready: false, - }) + + setStore( + produce((draft) => { + const lock = pick(kv.get("theme_mode_lock")) + const mode = pick(kv.get("theme_mode", props.mode)) + draft.mode = lock ?? mode ?? props.mode + draft.lock = lock + const active = config.theme ?? kv.get("theme", "opencode") + draft.active = typeof active === "string" ? active : "opencode" + draft.ready = false + }), + ) createEffect(() => { const theme = config.theme @@ -302,52 +317,46 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({ }) function init() { - resolveSystemTheme(store.mode) - getCustomThemes() - .then((custom) => { - setStore( - produce((draft) => { - Object.assign(draft.themes, custom) - }), - ) - }) - .catch(() => { - setStore("active", "opencode") - }) - .finally(() => { - if (store.active !== "system") { - setStore("ready", true) - } - }) + Promise.allSettled([ + resolveSystemTheme(store.mode), + getCustomThemes() + .then((custom) => { + customThemes = custom + syncThemes() + }) + .catch(() => { + setStore("active", "opencode") + }), + ]).finally(() => { + setStore("ready", true) + }) } onMount(init) function resolveSystemTheme(mode: "dark" | "light" = store.mode) { - renderer + return renderer .getPalette({ size: 16, }) - .then((colors) => { + .then((colors: TerminalColors) => { if (!colors.palette[0]) { + systemTheme = undefined + syncThemes() if (store.active === "system") { - setStore( - produce((draft) => { - draft.active = "opencode" - draft.ready = true - }), - ) + setStore("active", "opencode") } return } - setStore( - produce((draft) => { - draft.themes.system = generateSystem(colors, mode) - if (store.active === "system") { - draft.ready = true - } - }), - ) + systemTheme = generateSystem(colors, mode) + syncThemes() + }) + .catch(() => { + systemTheme = undefined + syncThemes() + if (store.active === "system") { + setStore("active", "opencode") + } }) } @@ -377,8 +386,16 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({ apply(mode) } renderer.on(CliRenderEvents.THEME_MODE, handle) + + const refresh = () => { + renderer.clearPaletteCache() + init() + } + process.on("SIGUSR2", refresh) + onCleanup(() => { renderer.off(CliRenderEvents.THEME_MODE, handle) + process.off("SIGUSR2", refresh) }) const values = createMemo(() => { @@ -403,7 +420,10 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({ return store.active }, all() { - return store.themes + return allThemes() + }, + has(name: string) { + return hasTheme(name) }, syntax, subtleSyntax, @@ -423,8 +443,10 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({ pin(mode) }, set(theme: string) { + if (!hasTheme(theme)) return false setStore("active", theme) kv.set("theme", theme) + return true }, get ready() { return store.ready diff --git a/packages/opencode/src/cli/cmd/tui/component/tips.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips-view.tsx similarity index 99% rename from packages/opencode/src/cli/cmd/tui/component/tips.tsx rename to packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips-view.tsx index 73d82248ad..08e429617f 100644 --- a/packages/opencode/src/cli/cmd/tui/component/tips.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips-view.tsx @@ -1,4 +1,4 @@ -import { createMemo, createSignal, For } from "solid-js" +import { For } from "solid-js" import { DEFAULT_THEMES, useTheme } from "@tui/context/theme" const themeCount = Object.keys(DEFAULT_THEMES).length diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx new file mode 100644 index 0000000000..1a1d3c174c --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx @@ -0,0 +1,48 @@ +import type { TuiPlugin } from "@opencode-ai/plugin/tui" +import { createMemo, Show } from "solid-js" +import { Tips } from "./tips-view" + +const id = "internal:home-tips" + +function View(props: { show: boolean }) { + return ( + + + + + + ) +} + +const tui: TuiPlugin = async (api) => { + api.command.register(() => [ + { + title: api.kv.get("tips_hidden", false) ? "Show tips" : "Hide tips", + value: "tips.toggle", + keybind: "tips_toggle", + category: "System", + hidden: api.route.current.name !== "home", + onSelect() { + api.kv.set("tips_hidden", !api.kv.get("tips_hidden", false)) + api.ui.dialog.clear() + }, + }, + ]) + + api.slots.register({ + order: 100, + slots: { + home_bottom() { + const hidden = createMemo(() => api.kv.get("tips_hidden", false)) + const first = createMemo(() => api.state.session.count() === 0) + const show = createMemo(() => !first() && !hidden()) + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx new file mode 100644 index 0000000000..c8538ae2a7 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx @@ -0,0 +1,61 @@ +import type { AssistantMessage } from "@opencode-ai/sdk/v2" +import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import { createMemo } from "solid-js" + +const id = "internal:sidebar-context" + +const money = new Intl.NumberFormat("en-US", { + style: "currency", + currency: "USD", +}) + +function View(props: { api: TuiPluginApi; session_id: string }) { + const theme = () => props.api.theme.current + const msg = createMemo(() => props.api.state.session.messages(props.session_id)) + const cost = createMemo(() => msg().reduce((sum, item) => sum + (item.role === "assistant" ? item.cost : 0), 0)) + + const state = createMemo(() => { + const last = msg().findLast((item): item is AssistantMessage => item.role === "assistant" && item.tokens.output > 0) + if (!last) { + return { + tokens: 0, + percent: null, + } + } + + const tokens = + last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write + const model = props.api.state.provider.find((item) => item.id === last.providerID)?.models[last.modelID] + return { + tokens, + percent: model?.limit.context ? Math.round((tokens / model.limit.context) * 100) : null, + } + }) + + return ( + + + Context + + {state().tokens.toLocaleString()} tokens + {state().percent ?? 0}% used + {money.format(cost())} spent + + ) +} + +const tui: TuiPlugin = async (api) => { + api.slots.register({ + order: 100, + slots: { + sidebar_content(_ctx, props) { + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx new file mode 100644 index 0000000000..16bed72878 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx @@ -0,0 +1,60 @@ +import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import { createMemo, For, Show, createSignal } from "solid-js" + +const id = "internal:sidebar-files" + +function View(props: { api: TuiPluginApi; session_id: string }) { + const [open, setOpen] = createSignal(true) + const theme = () => props.api.theme.current + const list = createMemo(() => props.api.state.session.diff(props.session_id)) + + return ( + 0}> + + list().length > 2 && setOpen((x) => !x)}> + 2}> + {open() ? "▼" : "▶"} + + + Modified Files + + + + + {(item) => ( + + + {item.file} + + + + +{item.additions} + + + -{item.deletions} + + + + )} + + + + + ) +} + +const tui: TuiPlugin = async (api) => { + api.slots.register({ + order: 500, + slots: { + sidebar_content(_ctx, props) { + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx new file mode 100644 index 0000000000..a6bff01a57 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx @@ -0,0 +1,91 @@ +import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import { createMemo, Show } from "solid-js" +import { Global } from "@/global" + +const id = "internal:sidebar-footer" + +function View(props: { api: TuiPluginApi }) { + const theme = () => props.api.theme.current + const has = createMemo(() => + props.api.state.provider.some( + (item) => item.id !== "opencode" || Object.values(item.models).some((model) => model.cost?.input !== 0), + ), + ) + const done = createMemo(() => props.api.kv.get("dismissed_getting_started", false)) + const show = createMemo(() => !has() && !done()) + const path = createMemo(() => { + const dir = props.api.state.path.directory || process.cwd() + const out = dir.replace(Global.Path.home, "~") + const text = props.api.state.vcs?.branch ? out + ":" + props.api.state.vcs.branch : out + const list = text.split("/") + return { + parent: list.slice(0, -1).join("/"), + name: list.at(-1) ?? "", + } + }) + + return ( + + + + + ⬖ + + + + + Getting started + + props.api.kv.set("dismissed_getting_started", true)}> + ✕ + + + OpenCode includes free models so you can start immediately. + + Connect from 75+ providers to use other models, including Claude, GPT, Gemini etc + + + Connect provider + /connect + + + + + + {path().parent}/ + {path().name} + + + • Open + + Code + {" "} + {props.api.app.version} + + + ) +} + +const tui: TuiPlugin = async (api) => { + api.slots.register({ + order: 100, + slots: { + sidebar_footer() { + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx new file mode 100644 index 0000000000..db9b3a7e56 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx @@ -0,0 +1,64 @@ +import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import { createMemo, For, Show, createSignal } from "solid-js" + +const id = "internal:sidebar-lsp" + +function View(props: { api: TuiPluginApi }) { + const [open, setOpen] = createSignal(true) + const theme = () => props.api.theme.current + const list = createMemo(() => props.api.state.lsp()) + const off = createMemo(() => props.api.state.config.lsp === false) + + return ( + + list().length > 2 && setOpen((x) => !x)}> + 2}> + {open() ? "▼" : "▶"} + + + LSP + + + + + + {off() ? "LSPs have been disabled in settings" : "LSPs will activate as files are read"} + + + + {(item) => ( + + + • + + + {item.id} {item.root} + + + )} + + + + ) +} + +const tui: TuiPlugin = async (api) => { + api.slots.register({ + order: 300, + slots: { + sidebar_content() { + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx new file mode 100644 index 0000000000..178050abd5 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx @@ -0,0 +1,94 @@ +import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import { createMemo, For, Match, Show, Switch, createSignal } from "solid-js" + +const id = "internal:sidebar-mcp" + +function View(props: { api: TuiPluginApi }) { + const [open, setOpen] = createSignal(true) + const theme = () => props.api.theme.current + const list = createMemo(() => props.api.state.mcp()) + const on = createMemo(() => list().filter((item) => item.status === "connected").length) + const bad = createMemo( + () => + list().filter( + (item) => + item.status === "failed" || item.status === "needs_auth" || item.status === "needs_client_registration", + ).length, + ) + + const dot = (status: string) => { + if (status === "connected") return theme().success + if (status === "failed") return theme().error + if (status === "disabled") return theme().textMuted + if (status === "needs_auth") return theme().warning + if (status === "needs_client_registration") return theme().error + return theme().textMuted + } + + return ( + 0}> + + list().length > 2 && setOpen((x) => !x)}> + 2}> + {open() ? "▼" : "▶"} + + + MCP + + + {" "} + ({on()} active{bad() > 0 ? `, ${bad()} error${bad() > 1 ? "s" : ""}` : ""}) + + + + + + + {(item) => ( + + + • + + + {item.name}{" "} + + + Connected + + {item.error} + + Disabled + Needs auth + Needs client ID + + + + + )} + + + + + ) +} + +const tui: TuiPlugin = async (api) => { + api.slots.register({ + order: 200, + slots: { + sidebar_content() { + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx new file mode 100644 index 0000000000..c9e904debd --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx @@ -0,0 +1,46 @@ +import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import { createMemo, For, Show, createSignal } from "solid-js" +import { TodoItem } from "../../component/todo-item" + +const id = "internal:sidebar-todo" + +function View(props: { api: TuiPluginApi; session_id: string }) { + const [open, setOpen] = createSignal(true) + const theme = () => props.api.theme.current + const list = createMemo(() => props.api.state.session.todo(props.session_id)) + const show = createMemo(() => list().length > 0 && list().some((item) => item.status !== "completed")) + + return ( + + + list().length > 2 && setOpen((x) => !x)}> + 2}> + {open() ? "▼" : "▶"} + + + Todo + + + + {(item) => } + + + + ) +} + +const tui: TuiPlugin = async (api) => { + api.slots.register({ + order: 400, + slots: { + sidebar_content(_ctx, props) { + return + }, + }, + }) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx new file mode 100644 index 0000000000..8293be5068 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx @@ -0,0 +1,262 @@ +import { Keybind } from "@/util/keybind" +import type { TuiPlugin, TuiPluginApi, TuiPluginStatus } from "@opencode-ai/plugin/tui" +import { useKeyboard, useTerminalDimensions } from "@opentui/solid" +import { fileURLToPath } from "url" +import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select" +import { createEffect, createMemo, createSignal } from "solid-js" + +const id = "internal:plugin-manager" +const key = Keybind.parse("space").at(0) +const add = Keybind.parse("shift+i").at(0) +const tab = Keybind.parse("tab").at(0) + +function state(api: TuiPluginApi, item: TuiPluginStatus) { + if (!item.enabled) { + return disabled + } + + return ( + + {item.active ? "active" : "inactive"} + + ) +} + +function source(spec: string) { + if (!spec.startsWith("file://")) return + return fileURLToPath(spec) +} + +function meta(item: TuiPluginStatus, width: number) { + if (item.source === "internal") { + if (width >= 120) return "Built-in plugin" + return "Built-in" + } + const next = source(item.spec) + if (next) return next + return item.spec +} + +function Install(props: { api: TuiPluginApi }) { + const [global, setGlobal] = createSignal(false) + const [busy, setBusy] = createSignal(false) + + useKeyboard((evt) => { + if (evt.name !== "tab") return + evt.preventDefault() + evt.stopPropagation() + if (busy()) return + setGlobal((x) => !x) + }) + + return ( + ( + + scope: + {global() ? "global" : "local"} + ({Keybind.toString(tab)} toggle) + + )} + onConfirm={(raw) => { + if (busy()) return + const mod = raw.trim() + if (!mod) { + props.api.ui.toast({ + variant: "error", + message: "Plugin package name is required", + }) + return + } + + setBusy(true) + props.api.plugins + .install(mod, { global: global() }) + .then((out) => { + if (!out.ok) { + props.api.ui.toast({ + variant: "error", + message: out.message, + }) + if (out.missing) { + props.api.ui.toast({ + variant: "info", + message: "Check npm registry/auth settings and try again.", + }) + } + show(props.api) + return + } + + props.api.ui.toast({ + variant: "success", + message: `Installed ${mod} (${global() ? "global" : "local"}: ${out.dir})`, + }) + if (!out.tui) { + props.api.ui.toast({ + variant: "info", + message: "Package has no TUI target to load in this app.", + }) + show(props.api) + return + } + + return props.api.plugins.add(mod).then((ok) => { + if (!ok) { + props.api.ui.toast({ + variant: "warning", + message: "Installed plugin, but runtime load failed. See console/logs; restart TUI to retry.", + }) + show(props.api) + return + } + + props.api.ui.toast({ + variant: "success", + message: `Loaded ${mod} in current session.`, + }) + show(props.api) + }) + }) + .finally(() => { + setBusy(false) + }) + }} + onCancel={() => { + show(props.api) + }} + /> + ) +} + +function row(api: TuiPluginApi, item: TuiPluginStatus, width: number): DialogSelectOption { + return { + title: item.id, + value: item.id, + category: item.source === "internal" ? "Internal" : "External", + description: meta(item, width), + footer: state(api, item), + disabled: item.id === id, + } +} + +function showInstall(api: TuiPluginApi) { + api.ui.dialog.replace(() => ) +} + +function View(props: { api: TuiPluginApi }) { + const size = useTerminalDimensions() + const [list, setList] = createSignal(props.api.plugins.list()) + const [cur, setCur] = createSignal() + const [lock, setLock] = createSignal(false) + + createEffect(() => { + const width = size().width + if (width >= 128) { + props.api.ui.dialog.setSize("xlarge") + return + } + if (width >= 96) { + props.api.ui.dialog.setSize("large") + return + } + props.api.ui.dialog.setSize("medium") + }) + + const rows = createMemo(() => + [...list()] + .sort((a, b) => { + const x = a.source === "internal" ? 1 : 0 + const y = b.source === "internal" ? 1 : 0 + if (x !== y) return x - y + return a.id.localeCompare(b.id) + }) + .map((item) => row(props.api, item, size().width)), + ) + + const flip = (x: string) => { + if (lock()) return + const item = list().find((entry) => entry.id === x) + if (!item) return + setLock(true) + const task = item.active ? props.api.plugins.deactivate(x) : props.api.plugins.activate(x) + task + .then((ok) => { + if (!ok) { + props.api.ui.toast({ + variant: "error", + message: `Failed to update plugin ${item.id}`, + }) + } + setList(props.api.plugins.list()) + }) + .finally(() => { + setLock(false) + }) + } + + return ( + setCur(item.value)} + keybind={[ + { + title: "toggle", + keybind: key, + disabled: lock(), + onTrigger: (item) => { + setCur(item.value) + flip(item.value) + }, + }, + { + title: "install", + keybind: add, + disabled: lock(), + onTrigger: () => { + showInstall(props.api) + }, + }, + ]} + onSelect={(item) => { + setCur(item.value) + flip(item.value) + }} + /> + ) +} + +function show(api: TuiPluginApi) { + api.ui.dialog.replace(() => ) +} + +const tui: TuiPlugin = async (api) => { + api.command.register(() => [ + { + title: "Plugins", + value: "plugins.list", + keybind: "plugin_manager", + category: "System", + onSelect() { + show(api) + }, + }, + { + title: "Install plugin", + value: "plugins.install", + category: "System", + onSelect() { + showInstall(api) + }, + }, + ]) +} + +export default { + id, + tui, +} diff --git a/packages/opencode/src/cli/cmd/tui/plugin/api.tsx b/packages/opencode/src/cli/cmd/tui/plugin/api.tsx new file mode 100644 index 0000000000..2bfd96ac3a --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/plugin/api.tsx @@ -0,0 +1,406 @@ +import type { ParsedKey } from "@opentui/core" +import type { TuiDialogSelectOption, TuiPluginApi, TuiRouteDefinition } from "@opencode-ai/plugin/tui" +import type { useCommandDialog } from "@tui/component/dialog-command" +import type { useKeybind } from "@tui/context/keybind" +import type { useRoute } from "@tui/context/route" +import type { useSDK } from "@tui/context/sdk" +import type { useSync } from "@tui/context/sync" +import type { useTheme } from "@tui/context/theme" +import { Dialog as DialogUI, type useDialog } from "@tui/ui/dialog" +import type { TuiConfig } from "@/config/tui" +import { createPluginKeybind } from "../context/plugin-keybinds" +import type { useKV } from "../context/kv" +import { DialogAlert } from "../ui/dialog-alert" +import { DialogConfirm } from "../ui/dialog-confirm" +import { DialogPrompt } from "../ui/dialog-prompt" +import { DialogSelect, type DialogSelectOption as SelectOption } from "../ui/dialog-select" +import type { useToast } from "../ui/toast" +import { Installation } from "@/installation" +import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/v2" + +type RouteEntry = { + key: symbol + render: TuiRouteDefinition["render"] +} + +export type RouteMap = Map + +type Input = { + command: ReturnType + tuiConfig: TuiConfig.Info + dialog: ReturnType + keybind: ReturnType + kv: ReturnType + route: ReturnType + routes: RouteMap + bump: () => void + sdk: ReturnType + sync: ReturnType + theme: ReturnType + toast: ReturnType + renderer: TuiPluginApi["renderer"] +} + +type TuiHostPluginApi = TuiPluginApi & { + map: Map + dispose: () => void +} + +function routeRegister(routes: RouteMap, list: TuiRouteDefinition[], bump: () => void) { + const key = Symbol() + for (const item of list) { + const prev = routes.get(item.name) ?? [] + prev.push({ key, render: item.render }) + routes.set(item.name, prev) + } + bump() + + return () => { + for (const item of list) { + const prev = routes.get(item.name) + if (!prev) continue + const next = prev.filter((x) => x.key !== key) + if (!next.length) { + routes.delete(item.name) + continue + } + routes.set(item.name, next) + } + bump() + } +} + +function routeNavigate(route: ReturnType, name: string, params?: Record) { + if (name === "home") { + route.navigate({ type: "home" }) + return + } + + if (name === "session") { + const sessionID = params?.sessionID + if (typeof sessionID !== "string") return + route.navigate({ type: "session", sessionID }) + return + } + + route.navigate({ type: "plugin", id: name, data: params }) +} + +function routeCurrent(route: ReturnType): TuiPluginApi["route"]["current"] { + if (route.data.type === "home") return { name: "home" } + if (route.data.type === "session") { + return { + name: "session", + params: { + sessionID: route.data.sessionID, + initialPrompt: route.data.initialPrompt, + }, + } + } + + return { + name: route.data.id, + params: route.data.data, + } +} + +function mapOption(item: TuiDialogSelectOption): SelectOption { + return { + ...item, + onSelect: () => item.onSelect?.(), + } +} + +function pickOption(item: SelectOption): TuiDialogSelectOption { + return { + title: item.title, + value: item.value, + description: item.description, + footer: item.footer, + category: item.category, + disabled: item.disabled, + } +} + +function mapOptionCb(cb?: (item: TuiDialogSelectOption) => void) { + if (!cb) return + return (item: SelectOption) => cb(pickOption(item)) +} + +function stateApi(sync: ReturnType): TuiPluginApi["state"] { + return { + get ready() { + return sync.ready + }, + get config() { + return sync.data.config + }, + get provider() { + return sync.data.provider + }, + get path() { + return sync.data.path + }, + get vcs() { + if (!sync.data.vcs) return + return { + branch: sync.data.vcs.branch, + } + }, + workspace: { + list() { + return sync.data.workspaceList + }, + get(workspaceID) { + return sync.workspace.get(workspaceID) + }, + }, + session: { + count() { + return sync.data.session.length + }, + diff(sessionID) { + return sync.data.session_diff[sessionID] ?? [] + }, + todo(sessionID) { + return sync.data.todo[sessionID] ?? [] + }, + messages(sessionID) { + return sync.data.message[sessionID] ?? [] + }, + status(sessionID) { + return sync.data.session_status[sessionID] + }, + permission(sessionID) { + return sync.data.permission[sessionID] ?? [] + }, + question(sessionID) { + return sync.data.question[sessionID] ?? [] + }, + }, + part(messageID) { + return sync.data.part[messageID] ?? [] + }, + lsp() { + return sync.data.lsp.map((item) => ({ id: item.id, root: item.root, status: item.status })) + }, + mcp() { + return Object.entries(sync.data.mcp) + .sort(([a], [b]) => a.localeCompare(b)) + .map(([name, item]) => ({ + name, + status: item.status, + error: item.status === "failed" ? item.error : undefined, + })) + }, + } +} + +function appApi(): TuiPluginApi["app"] { + return { + get version() { + return Installation.VERSION + }, + } +} + +export function createTuiApi(input: Input): TuiHostPluginApi { + const map = new Map() + const scoped: TuiPluginApi["scopedClient"] = (workspaceID) => { + const hit = map.get(workspaceID) + if (hit) return hit + + const next = createOpencodeClient({ + baseUrl: input.sdk.url, + fetch: input.sdk.fetch, + directory: input.sync.data.path.directory || input.sdk.directory, + experimental_workspaceID: workspaceID, + }) + map.set(workspaceID, next) + return next + } + const workspace: TuiPluginApi["workspace"] = { + current() { + return input.sdk.workspaceID + }, + set(workspaceID) { + input.sdk.setWorkspace(workspaceID) + }, + } + const lifecycle: TuiPluginApi["lifecycle"] = { + signal: new AbortController().signal, + onDispose() { + return () => {} + }, + } + + return { + app: appApi(), + command: { + register(cb) { + return input.command.register(() => cb()) + }, + trigger(value) { + input.command.trigger(value) + }, + }, + route: { + register(list) { + return routeRegister(input.routes, list, input.bump) + }, + navigate(name, params) { + routeNavigate(input.route, name, params) + }, + get current() { + return routeCurrent(input.route) + }, + }, + ui: { + Dialog(props) { + return ( + + {props.children} + + ) + }, + DialogAlert(props) { + return + }, + DialogConfirm(props) { + return + }, + DialogPrompt(props) { + return + }, + DialogSelect(props) { + return ( + + ) + }, + toast(inputToast) { + input.toast.show({ + title: inputToast.title, + message: inputToast.message, + variant: inputToast.variant ?? "info", + duration: inputToast.duration, + }) + }, + dialog: { + replace(render, onClose) { + input.dialog.replace(render, onClose) + }, + clear() { + input.dialog.clear() + }, + setSize(size) { + input.dialog.setSize(size) + }, + get size() { + return input.dialog.size + }, + get depth() { + return input.dialog.stack.length + }, + get open() { + return input.dialog.stack.length > 0 + }, + }, + }, + keybind: { + match(key, evt: ParsedKey) { + return input.keybind.match(key, evt) + }, + print(key) { + return input.keybind.print(key) + }, + create(defaults, overrides) { + return createPluginKeybind(input.keybind, defaults, overrides) + }, + }, + get tuiConfig() { + return input.tuiConfig + }, + kv: { + get(key, fallback) { + return input.kv.get(key, fallback) + }, + set(key, value) { + input.kv.set(key, value) + }, + get ready() { + return input.kv.ready + }, + }, + state: stateApi(input.sync), + get client() { + return input.sdk.client + }, + scopedClient: scoped, + workspace, + event: input.sdk.event, + renderer: input.renderer, + slots: { + register() { + throw new Error("slots.register is only available in plugin context") + }, + }, + plugins: { + list() { + return [] + }, + async activate() { + return false + }, + async deactivate() { + return false + }, + async add() { + return false + }, + async install() { + return { + ok: false, + message: "plugins.install is only available in plugin context", + } + }, + }, + lifecycle, + theme: { + get current() { + return input.theme.theme + }, + get selected() { + return input.theme.selected + }, + has(name) { + return input.theme.has(name) + }, + set(name) { + return input.theme.set(name) + }, + async install(_jsonPath) { + throw new Error("theme.install is only available in plugin context") + }, + mode() { + return input.theme.mode() + }, + get ready() { + return input.theme.ready + }, + }, + map, + dispose() { + map.clear() + }, + } +} diff --git a/packages/opencode/src/cli/cmd/tui/plugin/index.ts b/packages/opencode/src/cli/cmd/tui/plugin/index.ts new file mode 100644 index 0000000000..c970a318f2 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/plugin/index.ts @@ -0,0 +1,3 @@ +export { TuiPluginRuntime } from "./runtime" +export { createTuiApi } from "./api" +export type { RouteMap } from "./api" diff --git a/packages/opencode/src/cli/cmd/tui/plugin/internal.ts b/packages/opencode/src/cli/cmd/tui/plugin/internal.ts new file mode 100644 index 0000000000..9e28bbd2e3 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/plugin/internal.ts @@ -0,0 +1,25 @@ +import HomeTips from "../feature-plugins/home/tips" +import SidebarContext from "../feature-plugins/sidebar/context" +import SidebarMcp from "../feature-plugins/sidebar/mcp" +import SidebarLsp from "../feature-plugins/sidebar/lsp" +import SidebarTodo from "../feature-plugins/sidebar/todo" +import SidebarFiles from "../feature-plugins/sidebar/files" +import SidebarFooter from "../feature-plugins/sidebar/footer" +import PluginManager from "../feature-plugins/system/plugins" +import type { TuiPlugin, TuiPluginModule } from "@opencode-ai/plugin/tui" + +export type InternalTuiPlugin = TuiPluginModule & { + id: string + tui: TuiPlugin +} + +export const INTERNAL_TUI_PLUGINS: InternalTuiPlugin[] = [ + HomeTips, + SidebarContext, + SidebarMcp, + SidebarLsp, + SidebarTodo, + SidebarFiles, + SidebarFooter, + PluginManager, +] diff --git a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts new file mode 100644 index 0000000000..9cc5194df0 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts @@ -0,0 +1,972 @@ +import "@opentui/solid/runtime-plugin-support" +import { + type TuiDispose, + type TuiPlugin, + type TuiPluginApi, + type TuiPluginInstallResult, + type TuiPluginModule, + type TuiPluginMeta, + type TuiPluginStatus, + type TuiTheme, +} from "@opencode-ai/plugin/tui" +import path from "path" +import { fileURLToPath } from "url" + +import { Config } from "@/config/config" +import { TuiConfig } from "@/config/tui" +import { Log } from "@/util/log" +import { errorData, errorMessage } from "@/util/error" +import { isRecord } from "@/util/record" +import { Instance } from "@/project/instance" +import { + checkPluginCompatibility, + getDefaultPlugin, + isDeprecatedPlugin, + pluginSource, + readPluginId, + resolvePluginEntrypoint, + resolvePluginId, + resolvePluginTarget, + type PluginSource, +} from "@/plugin/shared" +import { PluginMeta } from "@/plugin/meta" +import { installPlugin as installModulePlugin, patchPluginConfig, readPluginManifest } from "@/plugin/install" +import { addTheme, hasTheme } from "../context/theme" +import { Global } from "@/global" +import { Filesystem } from "@/util/filesystem" +import { Process } from "@/util/process" +import { Flag } from "@/flag/flag" +import { Installation } from "@/installation" +import { INTERNAL_TUI_PLUGINS, type InternalTuiPlugin } from "./internal" +import { setupSlots, Slot as View } from "./slots" +import type { HostPluginApi, HostSlots } from "./slots" + +type PluginLoad = { + item?: Config.PluginSpec + spec: string + target: string + retry: boolean + source: PluginSource | "internal" + id: string + module: TuiPluginModule + install_theme: TuiTheme["install"] +} + +type Api = HostPluginApi + +type PluginScope = { + lifecycle: TuiPluginApi["lifecycle"] + track: (fn: (() => void) | undefined) => () => void + dispose: () => Promise +} + +type PluginEntry = { + id: string + load: PluginLoad + meta: TuiPluginMeta + plugin: TuiPlugin + options: Config.PluginOptions | undefined + enabled: boolean + scope?: PluginScope +} + +type RuntimeState = { + directory: string + api: Api + slots: HostSlots + plugins: PluginEntry[] + plugins_by_id: Map + pending: Map< + string, + { + item: Config.PluginSpec + meta: TuiConfig.PluginMeta + } + > +} + +const log = Log.create({ service: "tui.plugin" }) +const DISPOSE_TIMEOUT_MS = 5000 +const KV_KEY = "plugin_enabled" + +function fail(message: string, data: Record) { + if (!("error" in data)) { + log.error(message, data) + console.error(`[tui.plugin] ${message}`, data) + return + } + + const text = `${message}: ${errorMessage(data.error)}` + const next = { ...data, error: errorData(data.error) } + log.error(text, next) + console.error(`[tui.plugin] ${text}`, next) +} + +type CleanupResult = { type: "ok" } | { type: "error"; error: unknown } | { type: "timeout" } + +function runCleanup(fn: () => unknown, ms: number): Promise { + return new Promise((resolve) => { + const timer = setTimeout(() => { + resolve({ type: "timeout" }) + }, ms) + + Promise.resolve() + .then(fn) + .then( + () => { + resolve({ type: "ok" }) + }, + (error) => { + resolve({ type: "error", error }) + }, + ) + .finally(() => { + clearTimeout(timer) + }) + }) +} + +function isTheme(value: unknown) { + if (!isRecord(value)) return false + if (!("theme" in value)) return false + if (!isRecord(value.theme)) return false + return true +} + +function resolveRoot(root: string) { + if (root.startsWith("file://")) { + const file = fileURLToPath(root) + if (root.endsWith("/")) return file + return path.dirname(file) + } + if (path.isAbsolute(root)) return root + return path.resolve(process.cwd(), root) +} + +function createThemeInstaller(meta: TuiConfig.PluginMeta, root: string, spec: string): TuiTheme["install"] { + return async (file) => { + const raw = file.startsWith("file://") ? fileURLToPath(file) : file + const src = path.isAbsolute(raw) ? raw : path.resolve(root, raw) + const theme = path.basename(src, path.extname(src)) + if (hasTheme(theme)) return + + const text = await Filesystem.readText(src).catch((error) => { + log.warn("failed to read tui plugin theme", { path: spec, theme: src, error }) + return + }) + if (text === undefined) return + + const fail = Symbol() + const data = await Promise.resolve(text) + .then((x) => JSON.parse(x)) + .catch((error) => { + log.warn("failed to parse tui plugin theme", { path: spec, theme: src, error }) + return fail + }) + if (data === fail) return + + if (!isTheme(data)) { + log.warn("invalid tui plugin theme", { path: spec, theme: src }) + return + } + + const source_dir = path.dirname(meta.source) + const local_dir = + path.basename(source_dir) === ".opencode" + ? path.join(source_dir, "themes") + : path.join(source_dir, ".opencode", "themes") + const dest_dir = meta.scope === "local" ? local_dir : path.join(Global.Path.config, "themes") + const dest = path.join(dest_dir, `${theme}.json`) + if (!(await Filesystem.exists(dest))) { + await Filesystem.write(dest, text).catch((error) => { + log.warn("failed to persist tui plugin theme", { path: spec, theme: src, dest, error }) + }) + } + + addTheme(theme, data) + } +} + +async function loadExternalPlugin( + item: Config.PluginSpec, + meta: TuiConfig.PluginMeta | undefined, + retry = false, +): Promise { + const spec = Config.pluginSpecifier(item) + if (isDeprecatedPlugin(spec)) return + log.info("loading tui plugin", { path: spec, retry }) + const resolved = await resolvePluginTarget(spec).catch((error) => { + fail("failed to resolve tui plugin", { path: spec, retry, error }) + return + }) + if (!resolved) return + + const source = pluginSource(spec) + if (source === "npm") { + const ok = await checkPluginCompatibility(resolved, Installation.VERSION) + .then(() => true) + .catch((error) => { + fail("tui plugin incompatible", { path: spec, retry, error }) + return false + }) + if (!ok) return + } + + const target = resolved + if (!meta) { + fail("missing tui plugin metadata", { + path: spec, + retry, + }) + return + } + + const root = resolveRoot(source === "file" ? spec : target) + const install_theme = createThemeInstaller(meta, root, spec) + const entry = await resolvePluginEntrypoint(spec, target, "tui").catch((error) => { + fail("failed to resolve tui plugin entry", { path: spec, target, retry, error }) + return + }) + if (!entry) return + + const mod = await import(entry) + .then((raw) => { + const mod = getDefaultPlugin(raw) as TuiPluginModule | undefined + if (!mod?.tui) throw new TypeError(`Plugin ${spec} must default export an object with tui()`) + return mod + }) + .catch((error) => { + fail("failed to load tui plugin", { path: spec, target: entry, retry, error }) + return + }) + if (!mod) return + + const id = await resolvePluginId(source, spec, target, readPluginId(mod.id, spec)).catch((error) => { + fail("failed to load tui plugin", { path: spec, target, retry, error }) + return + }) + if (!id) return + + return { + item, + spec, + target, + retry, + source, + id, + module: mod, + install_theme, + } +} + +function createMeta( + source: PluginLoad["source"], + spec: string, + target: string, + meta: { state: PluginMeta.State; entry: PluginMeta.Entry } | undefined, + id?: string, +): TuiPluginMeta { + if (meta) { + return { + state: meta.state, + ...meta.entry, + } + } + + const now = Date.now() + return { + state: source === "internal" ? "same" : "first", + id: id ?? spec, + source, + spec, + target, + first_time: now, + last_time: now, + time_changed: now, + load_count: 1, + fingerprint: target, + } +} + +function loadInternalPlugin(item: InternalTuiPlugin): PluginLoad { + const spec = item.id + const target = spec + + return { + spec, + target, + retry: false, + source: "internal", + id: item.id, + module: item, + install_theme: createThemeInstaller( + { + scope: "global", + source: target, + }, + process.cwd(), + spec, + ), + } +} + +function createPluginScope(load: PluginLoad, id: string) { + const ctrl = new AbortController() + let list: { key: symbol; fn: TuiDispose }[] = [] + let done = false + + const onDispose = (fn: TuiDispose) => { + if (done) return () => {} + const key = Symbol() + list.push({ key, fn }) + let drop = false + return () => { + if (drop) return + drop = true + list = list.filter((x) => x.key !== key) + } + } + + const track = (fn: (() => void) | undefined) => { + if (!fn) return () => {} + const off = onDispose(fn) + let drop = false + return () => { + if (drop) return + drop = true + off() + fn() + } + } + + const lifecycle: TuiPluginApi["lifecycle"] = { + signal: ctrl.signal, + onDispose, + } + + const dispose = async () => { + if (done) return + done = true + ctrl.abort() + const queue = [...list].reverse() + list = [] + const until = Date.now() + DISPOSE_TIMEOUT_MS + for (const item of queue) { + const left = until - Date.now() + if (left <= 0) { + fail("timed out cleaning up tui plugin", { + path: load.spec, + id, + timeout: DISPOSE_TIMEOUT_MS, + }) + break + } + + const out = await runCleanup(item.fn, left) + if (out.type === "ok") continue + if (out.type === "timeout") { + fail("timed out cleaning up tui plugin", { + path: load.spec, + id, + timeout: DISPOSE_TIMEOUT_MS, + }) + break + } + + if (out.type === "error") { + fail("failed to clean up tui plugin", { + path: load.spec, + id, + error: out.error, + }) + } + } + } + + return { + lifecycle, + track, + dispose, + } +} + +function readPluginEnabledMap(value: unknown) { + if (!isRecord(value)) return {} + return Object.fromEntries( + Object.entries(value).filter((item): item is [string, boolean] => typeof item[1] === "boolean"), + ) +} + +function pluginEnabledState(state: RuntimeState, config: TuiConfig.Info) { + return { + ...readPluginEnabledMap(config.plugin_enabled), + ...readPluginEnabledMap(state.api.kv.get(KV_KEY, {})), + } +} + +function writePluginEnabledState(api: Api, id: string, enabled: boolean) { + api.kv.set(KV_KEY, { + ...readPluginEnabledMap(api.kv.get(KV_KEY, {})), + [id]: enabled, + }) +} + +function listPluginStatus(state: RuntimeState): TuiPluginStatus[] { + return state.plugins.map((plugin) => ({ + id: plugin.id, + source: plugin.meta.source, + spec: plugin.meta.spec, + target: plugin.meta.target, + enabled: plugin.enabled, + active: plugin.scope !== undefined, + })) +} + +async function deactivatePluginEntry(state: RuntimeState, plugin: PluginEntry, persist: boolean) { + plugin.enabled = false + if (persist) writePluginEnabledState(state.api, plugin.id, false) + if (!plugin.scope) return true + const scope = plugin.scope + plugin.scope = undefined + await scope.dispose() + return true +} + +async function activatePluginEntry(state: RuntimeState, plugin: PluginEntry, persist: boolean) { + plugin.enabled = true + if (persist) writePluginEnabledState(state.api, plugin.id, true) + if (plugin.scope) return true + + const scope = createPluginScope(plugin.load, plugin.id) + const api = pluginApi(state, plugin.load, scope, plugin.id) + const ok = await Promise.resolve() + .then(async () => { + await plugin.plugin(api, plugin.options, plugin.meta) + return true + }) + .catch((error) => { + fail("failed to initialize tui plugin", { + path: plugin.load.spec, + id: plugin.id, + error, + }) + return false + }) + + if (!ok) { + await scope.dispose() + return false + } + + if (!plugin.enabled) { + await scope.dispose() + return true + } + + plugin.scope = scope + return true +} + +async function activatePluginById(state: RuntimeState | undefined, id: string, persist: boolean) { + if (!state) return false + const plugin = state.plugins_by_id.get(id) + if (!plugin) return false + return activatePluginEntry(state, plugin, persist) +} + +async function deactivatePluginById(state: RuntimeState | undefined, id: string, persist: boolean) { + if (!state) return false + const plugin = state.plugins_by_id.get(id) + if (!plugin) return false + return deactivatePluginEntry(state, plugin, persist) +} + +function pluginApi(runtime: RuntimeState, load: PluginLoad, scope: PluginScope, base: string): TuiPluginApi { + const api = runtime.api + const host = runtime.slots + const command: TuiPluginApi["command"] = { + register(cb) { + return scope.track(api.command.register(cb)) + }, + trigger(value) { + api.command.trigger(value) + }, + } + + const route: TuiPluginApi["route"] = { + register(list) { + return scope.track(api.route.register(list)) + }, + navigate(name, params) { + api.route.navigate(name, params) + }, + get current() { + return api.route.current + }, + } + + const theme: TuiPluginApi["theme"] = Object.assign(Object.create(api.theme), { + install: load.install_theme, + }) + + const event: TuiPluginApi["event"] = { + on(type, handler) { + return scope.track(api.event.on(type, handler)) + }, + } + + let count = 0 + + const slots: TuiPluginApi["slots"] = { + register(plugin) { + const id = count ? `${base}:${count}` : base + count += 1 + scope.track(host.register({ ...plugin, id })) + return id + }, + } + + return { + app: api.app, + command, + route, + ui: api.ui, + keybind: api.keybind, + tuiConfig: api.tuiConfig, + kv: api.kv, + state: api.state, + theme, + get client() { + return api.client + }, + scopedClient: api.scopedClient, + workspace: api.workspace, + event, + renderer: api.renderer, + slots, + plugins: { + list() { + return listPluginStatus(runtime) + }, + activate(id) { + return activatePluginById(runtime, id, true) + }, + deactivate(id) { + return deactivatePluginById(runtime, id, true) + }, + add(spec) { + return addPluginBySpec(runtime, spec) + }, + install(spec, options) { + return installPluginBySpec(runtime, spec, options?.global) + }, + }, + lifecycle: scope.lifecycle, + } +} + +function collectPluginEntries(load: PluginLoad, meta: TuiPluginMeta) { + // TUI stays default-only so plugin ids, lifecycle, and errors remain stable. + const plugin = load.module.tui + if (!plugin) return [] + const options = load.item ? Config.pluginOptions(load.item) : undefined + return [ + { + id: load.id, + load, + meta, + plugin, + options, + enabled: true, + }, + ] +} + +function addPluginEntry(state: RuntimeState, plugin: PluginEntry) { + if (state.plugins_by_id.has(plugin.id)) { + fail("duplicate tui plugin id", { + id: plugin.id, + path: plugin.load.spec, + }) + return false + } + + state.plugins_by_id.set(plugin.id, plugin) + state.plugins.push(plugin) + return true +} + +function applyInitialPluginEnabledState(state: RuntimeState, config: TuiConfig.Info) { + const map = pluginEnabledState(state, config) + for (const plugin of state.plugins) { + const enabled = map[plugin.id] + if (enabled === undefined) continue + plugin.enabled = enabled + } +} + +async function resolveExternalPlugins( + list: Config.PluginSpec[], + wait: () => Promise, + meta: (item: Config.PluginSpec) => TuiConfig.PluginMeta | undefined, +) { + const loaded = await Promise.all(list.map((item) => loadExternalPlugin(item, meta(item)))) + const ready: PluginLoad[] = [] + let deps: Promise | undefined + + for (let i = 0; i < list.length; i++) { + let entry = loaded[i] + if (!entry) { + const item = list[i] + if (!item) continue + const spec = Config.pluginSpecifier(item) + if (pluginSource(spec) !== "file") continue + deps ??= wait().catch((error) => { + log.warn("failed waiting for tui plugin dependencies", { error }) + }) + await deps + entry = await loadExternalPlugin(item, meta(item), true) + } + if (!entry) continue + ready.push(entry) + } + + return ready +} + +async function addExternalPluginEntries(state: RuntimeState, ready: PluginLoad[]) { + if (!ready.length) return { plugins: [] as PluginEntry[], ok: true } + + const meta = await PluginMeta.touchMany( + ready.map((item) => ({ + spec: item.spec, + target: item.target, + id: item.id, + })), + ).catch((error) => { + log.warn("failed to track tui plugins", { error }) + return undefined + }) + + const plugins: PluginEntry[] = [] + let ok = true + for (let i = 0; i < ready.length; i++) { + const entry = ready[i] + if (!entry) continue + const hit = meta?.[i] + if (hit && hit.state !== "same") { + log.info("tui plugin metadata updated", { + path: entry.spec, + retry: entry.retry, + state: hit.state, + source: hit.entry.source, + version: hit.entry.version, + modified: hit.entry.modified, + }) + } + + const row = createMeta(entry.source, entry.spec, entry.target, hit, entry.id) + for (const plugin of collectPluginEntries(entry, row)) { + if (!addPluginEntry(state, plugin)) { + ok = false + continue + } + plugins.push(plugin) + } + } + + return { plugins, ok } +} + +function defaultPluginMeta(state: RuntimeState): TuiConfig.PluginMeta { + return { + scope: "local", + source: state.api.state.path.config || path.join(state.directory, ".opencode", "tui.json"), + } +} + +function installCause(err: unknown) { + if (!err || typeof err !== "object") return + if (!("cause" in err)) return + return (err as { cause?: unknown }).cause +} + +function installDetail(err: unknown) { + const hit = installCause(err) ?? err + if (!(hit instanceof Process.RunFailedError)) { + return { + message: errorMessage(hit), + missing: false, + } + } + + const lines = hit.stderr + .toString() + .split(/\r?\n/) + .map((line) => line.trim()) + .filter(Boolean) + const errs = lines.filter((line) => line.startsWith("error:")).map((line) => line.replace(/^error:\s*/, "")) + return { + message: errs[0] ?? lines.at(-1) ?? errorMessage(hit), + missing: lines.some((line) => line.includes("No version matching")), + } +} + +async function addPluginBySpec(state: RuntimeState | undefined, raw: string) { + if (!state) return false + const spec = raw.trim() + if (!spec) return false + + const pending = state.pending.get(spec) + const item = pending?.item ?? spec + const nextSpec = Config.pluginSpecifier(item) + if (state.plugins.some((plugin) => plugin.load.spec === nextSpec)) { + state.pending.delete(spec) + return true + } + + const meta = pending?.meta ?? defaultPluginMeta(state) + + const ready = await Instance.provide({ + directory: state.directory, + fn: () => + resolveExternalPlugins( + [item], + () => TuiConfig.waitForDependencies(), + () => meta, + ), + }).catch((error) => { + fail("failed to add tui plugin", { path: nextSpec, error }) + return [] as PluginLoad[] + }) + if (!ready.length) { + fail("failed to add tui plugin", { path: nextSpec }) + return false + } + + const first = ready[0] + if (!first) { + fail("failed to add tui plugin", { path: nextSpec }) + return false + } + if (state.plugins_by_id.has(first.id)) { + state.pending.delete(spec) + return true + } + + const out = await addExternalPluginEntries(state, [first]) + let ok = out.ok && out.plugins.length > 0 + for (const plugin of out.plugins) { + const active = await activatePluginEntry(state, plugin, false) + if (!active) ok = false + } + + if (ok) state.pending.delete(spec) + if (!ok) { + fail("failed to add tui plugin", { path: nextSpec }) + } + return ok +} + +async function installPluginBySpec( + state: RuntimeState | undefined, + raw: string, + global = false, +): Promise { + if (!state) { + return { + ok: false, + message: "Plugin runtime is not ready.", + } + } + + const spec = raw.trim() + if (!spec) { + return { + ok: false, + message: "Plugin package name is required", + } + } + + const dir = state.api.state.path + if (!dir.directory) { + return { + ok: false, + message: "Paths are still syncing. Try again in a moment.", + } + } + + const install = await installModulePlugin(spec) + if (!install.ok) { + const out = installDetail(install.error) + return { + ok: false, + message: out.message, + missing: out.missing, + } + } + + const manifest = await readPluginManifest(install.target) + if (!manifest.ok) { + if (manifest.code === "manifest_no_targets") { + return { + ok: false, + message: `"${spec}" does not declare supported targets in package.json`, + } + } + + return { + ok: false, + message: `Installed "${spec}" but failed to read ${manifest.file}`, + } + } + + const patch = await patchPluginConfig({ + spec, + targets: manifest.targets, + global, + vcs: dir.worktree && dir.worktree !== "/" ? "git" : undefined, + worktree: dir.worktree, + directory: dir.directory, + }) + if (!patch.ok) { + if (patch.code === "invalid_json") { + return { + ok: false, + message: `Invalid JSON in ${patch.file} (${patch.parse} at line ${patch.line}, column ${patch.col})`, + } + } + + return { + ok: false, + message: errorMessage(patch.error), + } + } + + const tui = manifest.targets.find((item) => item.kind === "tui") + if (tui) { + const file = patch.items.find((item) => item.kind === "tui")?.file + state.pending.set(spec, { + item: tui.opts ? [spec, tui.opts] : spec, + meta: { + scope: global ? "global" : "local", + source: (file ?? dir.config) || path.join(patch.dir, "tui.json"), + }, + }) + } + + return { + ok: true, + dir: patch.dir, + tui: Boolean(tui), + } +} + +export namespace TuiPluginRuntime { + let dir = "" + let loaded: Promise | undefined + let runtime: RuntimeState | undefined + export const Slot = View + + export async function init(api: HostPluginApi) { + const cwd = process.cwd() + if (loaded) { + if (dir !== cwd) { + throw new Error(`TuiPluginRuntime.init() called with a different working directory. expected=${dir} got=${cwd}`) + } + return loaded + } + + dir = cwd + loaded = load(api) + return loaded + } + + export function list() { + if (!runtime) return [] + return listPluginStatus(runtime) + } + + export async function activatePlugin(id: string) { + return activatePluginById(runtime, id, true) + } + + export async function deactivatePlugin(id: string) { + return deactivatePluginById(runtime, id, true) + } + + export async function addPlugin(spec: string) { + return addPluginBySpec(runtime, spec) + } + + export async function installPlugin(spec: string, options?: { global?: boolean }) { + return installPluginBySpec(runtime, spec, options?.global) + } + + export async function dispose() { + const task = loaded + loaded = undefined + dir = "" + if (task) await task + const state = runtime + runtime = undefined + if (!state) return + const queue = [...state.plugins].reverse() + for (const plugin of queue) { + await deactivatePluginEntry(state, plugin, false) + } + } + + async function load(api: Api) { + const cwd = process.cwd() + const slots = setupSlots(api) + const next: RuntimeState = { + directory: cwd, + api, + slots, + plugins: [], + plugins_by_id: new Map(), + pending: new Map(), + } + runtime = next + + await Instance.provide({ + directory: cwd, + fn: async () => { + const config = await TuiConfig.get() + const plugins = Flag.OPENCODE_PURE ? [] : (config.plugin ?? []) + if (Flag.OPENCODE_PURE && config.plugin?.length) { + log.info("skipping external tui plugins in pure mode", { count: config.plugin.length }) + } + + for (const item of INTERNAL_TUI_PLUGINS) { + log.info("loading internal tui plugin", { id: item.id }) + const entry = loadInternalPlugin(item) + const meta = createMeta(entry.source, entry.spec, entry.target, undefined, entry.id) + for (const plugin of collectPluginEntries(entry, meta)) { + addPluginEntry(next, plugin) + } + } + + const ready = await resolveExternalPlugins( + plugins, + () => TuiConfig.waitForDependencies(), + (item) => config.plugin_meta?.[Config.pluginSpecifier(item)], + ) + await addExternalPluginEntries(next, ready) + + applyInitialPluginEnabledState(next, config) + for (const plugin of next.plugins) { + if (!plugin.enabled) continue + // Keep plugin execution sequential for deterministic side effects: + // command registration order affects keybind/command precedence, + // route registration is last-wins when ids collide, + // and hook chains rely on stable plugin ordering. + await activatePluginEntry(next, plugin, false) + } + }, + }).catch((error) => { + fail("failed to load tui plugins", { directory: cwd, error }) + }) + } +} diff --git a/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx b/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx new file mode 100644 index 0000000000..3fd77875ed --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx @@ -0,0 +1,61 @@ +import { type SlotMode, type TuiPluginApi, type TuiSlotContext, type TuiSlotMap } from "@opencode-ai/plugin/tui" +import { createSlot, createSolidSlotRegistry, type JSX, type SolidPlugin } from "@opentui/solid" +import { isRecord } from "@/util/record" + +type SlotProps = { + name: K + mode?: SlotMode + children?: JSX.Element +} & TuiSlotMap[K] + +type Slot = (props: SlotProps) => JSX.Element | null +export type HostSlotPlugin = SolidPlugin + +export type HostPluginApi = TuiPluginApi +export type HostSlots = { + register: (plugin: HostSlotPlugin) => () => void +} + +function empty(_props: SlotProps) { + return null +} + +let view: Slot = empty + +export const Slot: Slot = (props) => view(props) + +function isHostSlotPlugin(value: unknown): value is HostSlotPlugin { + if (!isRecord(value)) return false + if (typeof value.id !== "string") return false + if (!isRecord(value.slots)) return false + return true +} + +export function setupSlots(api: HostPluginApi): HostSlots { + const reg = createSolidSlotRegistry( + api.renderer, + { + theme: api.theme, + }, + { + onPluginError(event) { + console.error("[tui.slot] plugin error", { + plugin: event.pluginId, + slot: event.slot, + phase: event.phase, + source: event.source, + message: event.error.message, + }) + }, + }, + ) + + const slot = createSlot(reg) + view = (props) => slot(props) + return { + register(plugin) { + if (!isHostSlotPlugin(plugin)) return () => {} + return reg.register(plugin) + }, + } +} diff --git a/packages/opencode/src/cli/cmd/tui/routes/home.tsx b/packages/opencode/src/cli/cmd/tui/routes/home.tsx index e76e165b26..07549c6c29 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/home.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/home.tsx @@ -1,9 +1,7 @@ import { Prompt, type PromptRef } from "@tui/component/prompt" import { createEffect, createMemo, Match, on, onMount, Show, Switch } from "solid-js" import { useTheme } from "@tui/context/theme" -import { useKeybind } from "@tui/context/keybind" import { Logo } from "../component/logo" -import { Tips } from "../component/tips" import { Locale } from "@/util/locale" import { useSync } from "../context/sync" import { Toast } from "../ui/toast" @@ -12,20 +10,17 @@ import { useDirectory } from "../context/directory" import { useRouteData } from "@tui/context/route" import { usePromptRef } from "../context/prompt" import { Installation } from "@/installation" -import { useKV } from "../context/kv" -import { useCommandDialog } from "../component/dialog-command" import { useLocal } from "../context/local" +import { TuiPluginRuntime } from "../plugin" // TODO: what is the best way to do this? let once = false export function Home() { const sync = useSync() - const kv = useKV() const { theme } = useTheme() const route = useRouteData("home") const promptRef = usePromptRef() - const command = useCommandDialog() const mcp = createMemo(() => Object.keys(sync.data.mcp).length > 0) const mcpError = createMemo(() => { return Object.values(sync.data.mcp).some((x) => x.status === "failed") @@ -35,30 +30,9 @@ export function Home() { return Object.values(sync.data.mcp).filter((x) => x.status === "connected").length }) - const isFirstTimeUser = createMemo(() => sync.data.session.length === 0) - const tipsHidden = createMemo(() => kv.get("tips_hidden", false)) - const showTips = createMemo(() => { - // Don't show tips for first-time users - if (isFirstTimeUser()) return false - return !tipsHidden() - }) - - command.register(() => [ - { - title: tipsHidden() ? "Show tips" : "Hide tips", - value: "tips.toggle", - keybind: "tips_toggle", - category: "System", - onSelect: (dialog) => { - kv.set("tips_hidden", !tipsHidden()) - dialog.clear() - }, - }, - ]) - const Hint = ( - 0}> - + + 0}> @@ -71,8 +45,8 @@ export function Home() { - - + + ) let prompt: PromptRef @@ -103,15 +77,15 @@ export function Home() { ) const directory = useDirectory() - const keybind = useKeybind() - return ( <> - + + + @@ -124,11 +98,7 @@ export function Home() { workspaceID={route.workspaceID} /> - - - - - + 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 0d9ddc746c..080065fd78 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx @@ -70,7 +70,6 @@ import { Toast, useToast } from "../../ui/toast" import { useKV } from "../../context/kv.tsx" import { Editor } from "../../util/editor" import stripAnsi from "strip-ansi" -import { Footer } from "./footer.tsx" import { usePromptRef } from "../../context/prompt" import { useExit } from "../../context/exit" import { Filesystem } from "@/util/filesystem" diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx index 42ac5fbe08..66bf82dba3 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx @@ -1,72 +1,13 @@ import { useSync } from "@tui/context/sync" -import { createMemo, For, Show, Switch, Match } from "solid-js" -import { createStore } from "solid-js/store" +import { createMemo, Show } from "solid-js" import { useTheme } from "../../context/theme" -import { Locale } from "@/util/locale" -import path from "path" -import type { AssistantMessage } from "@opencode-ai/sdk/v2" -import { Global } from "@/global" import { Installation } from "@/installation" -import { useKeybind } from "../../context/keybind" -import { useDirectory } from "../../context/directory" -import { useKV } from "../../context/kv" -import { TodoItem } from "../../component/todo-item" +import { TuiPluginRuntime } from "../../plugin" export function Sidebar(props: { sessionID: string; overlay?: boolean }) { const sync = useSync() const { theme } = useTheme() - const session = createMemo(() => sync.session.get(props.sessionID)!) - const diff = createMemo(() => sync.data.session_diff[props.sessionID] ?? []) - const todo = createMemo(() => sync.data.todo[props.sessionID] ?? []) - const messages = createMemo(() => sync.data.message[props.sessionID] ?? []) - - const [expanded, setExpanded] = createStore({ - mcp: true, - diff: true, - todo: true, - lsp: true, - }) - - // Sort MCP servers alphabetically for consistent display order - const mcpEntries = createMemo(() => Object.entries(sync.data.mcp).sort(([a], [b]) => a.localeCompare(b))) - - // Count connected and error MCP servers for collapsed header display - const connectedMcpCount = createMemo(() => mcpEntries().filter(([_, item]) => item.status === "connected").length) - const errorMcpCount = createMemo( - () => - mcpEntries().filter( - ([_, item]) => - item.status === "failed" || item.status === "needs_auth" || item.status === "needs_client_registration", - ).length, - ) - - const cost = createMemo(() => { - const total = messages().reduce((sum, x) => sum + (x.role === "assistant" ? x.cost : 0), 0) - return new Intl.NumberFormat("en-US", { - style: "currency", - currency: "USD", - }).format(total) - }) - - const context = createMemo(() => { - const last = messages().findLast((x) => x.role === "assistant" && x.tokens.output > 0) as AssistantMessage - if (!last) return - const total = - last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write - const model = sync.data.provider.find((x) => x.id === last.providerID)?.models[last.modelID] - return { - tokens: total.toLocaleString(), - percentage: model?.limit.context ? Math.round((total / model.limit.context) * 100) : null, - } - }) - - const directory = useDirectory() - const kv = useKV() - - const hasProviders = createMemo(() => - sync.data.provider.some((x) => x.id !== "opencode" || Object.values(x.models).some((y) => y.cost?.input !== 0)), - ) - const gettingStartedDismissed = createMemo(() => kv.get("dismissed_getting_started", false)) + const session = createMemo(() => sync.session.get(props.sessionID)) return ( @@ -90,230 +31,36 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) { }} > - - - {session().title} - - - {session().share!.url} - - - - - Context - - {context()?.tokens ?? 0} tokens - {context()?.percentage ?? 0}% used - {cost()} spent - - 0}> - - mcpEntries().length > 2 && setExpanded("mcp", !expanded.mcp)} - > - 2}> - {expanded.mcp ? "▼" : "▶"} - - - MCP - - - {" "} - ({connectedMcpCount()} active - {errorMcpCount() > 0 ? `, ${errorMcpCount()} error${errorMcpCount() > 1 ? "s" : ""}` : ""}) - - - - - - - {([key, item]) => ( - - - )[item.status], - }} - > - • - - - {key}{" "} - - - Connected - {(val) => {val().error}} - Disabled - Needs auth - - Needs client ID - - - - - - )} - - - - - - sync.data.lsp.length > 2 && setExpanded("lsp", !expanded.lsp)} - > - 2}> - {expanded.lsp ? "▼" : "▶"} - + + - LSP + {session()!.title} - - - - - {sync.data.config.lsp === false - ? "LSPs have been disabled in settings" - : "LSPs will activate as files are read"} - - - - {(item) => ( - - - • - - - {item.id} {item.root} - - - )} - - - - 0 && todo().some((t) => t.status !== "completed")}> - - todo().length > 2 && setExpanded("todo", !expanded.todo)} - > - 2}> - {expanded.todo ? "▼" : "▶"} - - - Todo - - - - {(todo) => } + + {session()!.share!.url} - - 0}> - - diff().length > 2 && setExpanded("diff", !expanded.diff)} - > - 2}> - {expanded.diff ? "▼" : "▶"} - - - Modified Files - - - - - {(item) => { - return ( - - - {item.file} - - - - +{item.additions} - - - -{item.deletions} - - - - ) - }} - - - - + + - - - - ⬖ - - - - - Getting started - - kv.set("dismissed_getting_started", true)}> - ✕ - - - OpenCode includes free models so you can start immediately. - - Connect from 75+ providers to use other models, including Claude, GPT, Gemini etc - - - Connect provider - /connect - - - - - - {directory().split("/").slice(0, -1).join("/")}/ - {directory().split("/").at(-1)} - - - • Open - - Code - {" "} - {Installation.VERSION} - + + + • Open + + Code + {" "} + {Installation.VERSION} + + diff --git a/packages/opencode/src/cli/cmd/tui/thread.ts b/packages/opencode/src/cli/cmd/tui/thread.ts index d984dc6f3f..3bb56937a6 100644 --- a/packages/opencode/src/cli/cmd/tui/thread.ts +++ b/packages/opencode/src/cli/cmd/tui/thread.ts @@ -6,6 +6,7 @@ import path from "path" import { fileURLToPath } from "url" import { UI } from "@/cli/ui" import { Log } from "@/util/log" +import { errorMessage } from "@/util/error" import { withTimeout } from "@/util/timeout" import { withNetworkOptions, resolveNetworkOptions } from "@/cli/network" import { Filesystem } from "@/util/filesystem" @@ -145,7 +146,7 @@ export const TuiThreadCommand = cmd({ const reload = () => { client.call("reload", undefined).catch((err) => { Log.Default.warn("worker reload failed", { - error: err instanceof Error ? err.message : String(err), + error: errorMessage(err), }) }) } @@ -162,7 +163,7 @@ export const TuiThreadCommand = cmd({ process.off("SIGUSR2", reload) await withTimeout(client.call("shutdown", undefined), 5000).catch((error) => { Log.Default.warn("worker shutdown failed", { - error: error instanceof Error ? error.message : String(error), + error: errorMessage(error), }) }) worker.terminate() diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx index 43f1a1ff58..11c43fe24c 100644 --- a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx +++ b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx @@ -9,7 +9,7 @@ import { Selection } from "@tui/util/selection" export function Dialog( props: ParentProps<{ - size?: "medium" | "large" + size?: "medium" | "large" | "xlarge" onClose: () => void }>, ) { @@ -18,6 +18,11 @@ export function Dialog( const renderer = useRenderer() let dismiss = false + const width = () => { + if (props.size === "xlarge") return 116 + if (props.size === "large") return 88 + return 60 + } return ( void }[], - size: "medium" as "medium" | "large", + size: "medium" as "medium" | "large" | "xlarge", }) const renderer = useRenderer() @@ -72,6 +78,9 @@ function init() { if (evt.defaultPrevented) return if ((evt.name === "escape" || (evt.ctrl && evt.name === "c")) && renderer.getSelection()?.getSelectedText()) return if (evt.name === "escape" || (evt.ctrl && evt.name === "c")) { + if (renderer.getSelection()) { + renderer.clearSelection() + } const current = store.stack.at(-1)! current.onClose?.() setStore("stack", store.stack.slice(0, -1)) @@ -132,7 +141,7 @@ function init() { get size() { return store.size }, - setSize(size: "medium" | "large") { + setSize(size: "medium" | "large" | "xlarge") { setStore("size", size) }, } @@ -151,6 +160,7 @@ export function DialogProvider(props: ParentProps) { {props.children} { if (!Flag.OPENCODE_EXPERIMENTAL_DISABLE_COPY_ON_SELECT) return if (evt.button !== MouseButton.RIGHT) return diff --git a/packages/opencode/src/cli/error.ts b/packages/opencode/src/cli/error.ts index d7120aa5e9..52bad892eb 100644 --- a/packages/opencode/src/cli/error.ts +++ b/packages/opencode/src/cli/error.ts @@ -1,4 +1,5 @@ import { ConfigMarkdown } from "@/config/markdown" +import { errorFormat } from "@/util/error" import { Config } from "../config/config" import { MCP } from "../mcp" import { Provider } from "../provider/provider" @@ -41,17 +42,5 @@ export function FormatError(input: unknown) { } export function FormatUnknownError(input: unknown): string { - if (input instanceof Error) { - return input.stack ?? `${input.name}: ${input.message}` - } - - if (typeof input === "object" && input !== null) { - try { - return JSON.stringify(input, null, 2) - } catch { - return "Unexpected error (unserializable)" - } - } - - return String(input) + return errorFormat(input) } diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index 41fa4a1ca6..3cbb341623 100644 --- a/packages/opencode/src/config/config.ts +++ b/packages/opencode/src/config/config.ts @@ -30,20 +30,27 @@ import { GlobalBus } from "@/bus/global" import { Event } from "../server/event" import { Glob } from "../util/glob" import { PackageRegistry } from "@/bun/registry" -import { proxied } from "@/util/proxied" +import { online, proxied } from "@/util/network" import { iife } from "@/util/iife" import { Account } from "@/account" +import { isRecord } from "@/util/record" import { ConfigPaths } from "./paths" import { Filesystem } from "@/util/filesystem" import { Process } from "@/util/process" -import { Lock } from "@/util/lock" import { AppFileSystem } from "@/filesystem" import { InstanceState } from "@/effect/instance-state" import { makeRuntime } from "@/effect/run-service" import { Duration, Effect, Layer, Option, ServiceMap } from "effect" +import { Flock } from "@/util/flock" +import { isPathPluginSpec, parsePluginSpecifier, resolvePathPluginTarget } from "@/plugin/shared" export namespace Config { const ModelId = z.string().meta({ $ref: "https://models.dev/model-schema.json#/$defs/Model" }) + const PluginOptions = z.record(z.string(), z.unknown()) + export const PluginSpec = z.union([z.string(), z.tuple([z.string(), PluginOptions])]) + + export type PluginOptions = z.infer + export type PluginSpec = z.infer const log = Log.create({ service: "config" }) @@ -78,34 +85,65 @@ export namespace Config { return merged } - export async function installDependencies(dir: string) { + export type InstallInput = { + signal?: AbortSignal + waitTick?: (input: { dir: string; attempt: number; delay: number; waited: number }) => void | Promise + } + + export async function installDependencies(dir: string, input?: InstallInput) { + if (!(await needsInstall(dir))) return + + await using _ = await Flock.acquire(`config-install:${Filesystem.resolve(dir)}`, { + signal: input?.signal, + onWait: (tick) => + input?.waitTick?.({ + dir, + attempt: tick.attempt, + delay: tick.delay, + waited: tick.waited, + }), + }) + + input?.signal?.throwIfAborted() + if (!(await needsInstall(dir))) return + const pkg = path.join(dir, "package.json") - const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION + const target = Installation.isLocal() ? "*" : Installation.VERSION const json = await Filesystem.readJson<{ dependencies?: Record }>(pkg).catch(() => ({ dependencies: {}, })) json.dependencies = { ...json.dependencies, - "@opencode-ai/plugin": targetVersion, + "@opencode-ai/plugin": target, } await Filesystem.writeJson(pkg, json) const gitignore = path.join(dir, ".gitignore") - const hasGitIgnore = await Filesystem.exists(gitignore) - if (!hasGitIgnore) + const ignore = await Filesystem.exists(gitignore) + if (!ignore) { await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n")) + } + + // Bun can race cache writes on Windows when installs run in parallel across dirs. + // Serialize installs globally on win32, but keep parallel installs on other platforms. + await using __ = + process.platform === "win32" + ? await Flock.acquire("config-install:bun", { + signal: input?.signal, + }) + : undefined - // Install any additional dependencies defined in the package.json - // This allows local plugins and custom tools to use external packages - using _ = await Lock.write("bun-install") await BunProc.run( [ "install", // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936) ...(proxied() || process.env.CI ? ["--no-cache"] : []), ], - { cwd: dir }, + { + cwd: dir, + abort: input?.signal, + }, ).catch((err) => { if (err instanceof Process.RunFailedError) { const detail = { @@ -149,8 +187,8 @@ export namespace Config { return false } - const nodeModules = path.join(dir, "node_modules") - if (!existsSync(nodeModules)) return true + const mod = path.join(dir, "node_modules", "@opencode-ai", "plugin") + if (!existsSync(mod)) return true const pkg = path.join(dir, "package.json") const pkgExists = await Filesystem.exists(pkg) @@ -163,8 +201,9 @@ export namespace Config { const targetVersion = Installation.isLocal() ? "latest" : Installation.VERSION if (targetVersion === "latest") { - const isOutdated = await PackageRegistry.isOutdated("@opencode-ai/plugin", depVersion, dir) - if (!isOutdated) return false + if (!online()) return false + const stale = await PackageRegistry.isOutdated("@opencode-ai/plugin", depVersion, dir) + if (!stale) return false log.info("Cached version is outdated, proceeding with install", { pkg: "@opencode-ai/plugin", cachedVersion: depVersion, @@ -303,7 +342,7 @@ export namespace Config { } async function loadPlugin(dir: string) { - const plugins: string[] = [] + const plugins: PluginSpec[] = [] for (const item of await Glob.scan("{plugin,plugins}/*.{ts,js}", { cwd: dir, @@ -316,25 +355,44 @@ export namespace Config { return plugins } - /** - * Extracts a canonical plugin name from a plugin specifier. - * - For file:// URLs: extracts filename without extension - * - For npm packages: extracts package name without version - * - * @example - * getPluginName("file:///path/to/plugin/foo.js") // "foo" - * getPluginName("oh-my-opencode@2.4.3") // "oh-my-opencode" - * getPluginName("@scope/pkg@1.0.0") // "@scope/pkg" - */ - export function getPluginName(plugin: string): string { - if (plugin.startsWith("file://")) { - return path.parse(new URL(plugin).pathname).name + export function pluginSpecifier(plugin: PluginSpec): string { + return Array.isArray(plugin) ? plugin[0] : plugin + } + + export function pluginOptions(plugin: PluginSpec): PluginOptions | undefined { + return Array.isArray(plugin) ? plugin[1] : undefined + } + + export async function resolvePluginSpec(plugin: PluginSpec, configFilepath: string): Promise { + const spec = pluginSpecifier(plugin) + if (!isPathPluginSpec(spec)) return plugin + if (spec.startsWith("file://")) { + const resolved = await resolvePathPluginTarget(spec).catch(() => spec) + if (Array.isArray(plugin)) return [resolved, plugin[1]] + return resolved } - const lastAt = plugin.lastIndexOf("@") - if (lastAt > 0) { - return plugin.substring(0, lastAt) + if (path.isAbsolute(spec) || /^[A-Za-z]:[\\/]/.test(spec)) { + const base = pathToFileURL(spec).href + const resolved = await resolvePathPluginTarget(base).catch(() => base) + if (Array.isArray(plugin)) return [resolved, plugin[1]] + return resolved + } + try { + const base = import.meta.resolve!(spec, configFilepath) + const resolved = await resolvePathPluginTarget(base).catch(() => base) + if (Array.isArray(plugin)) return [resolved, plugin[1]] + return resolved + } catch { + try { + const require = createRequire(configFilepath) + const base = pathToFileURL(require.resolve(spec)).href + const resolved = await resolvePathPluginTarget(base).catch(() => base) + if (Array.isArray(plugin)) return [resolved, plugin[1]] + return resolved + } catch { + return plugin + } } - return plugin } /** @@ -348,17 +406,13 @@ export namespace Config { * Since plugins are added in low-to-high priority order, * we reverse, deduplicate (keeping first occurrence), then restore order. */ - export function deduplicatePlugins(plugins: string[]): string[] { - // seenNames: canonical plugin names for duplicate detection - // e.g., "oh-my-opencode", "@scope/pkg" + export function deduplicatePlugins(plugins: PluginSpec[]): PluginSpec[] { const seenNames = new Set() - - // uniqueSpecifiers: full plugin specifiers to return - // e.g., "oh-my-opencode@2.4.3", "file:///path/to/plugin.js" - const uniqueSpecifiers: string[] = [] + const uniqueSpecifiers: PluginSpec[] = [] for (const specifier of plugins.toReversed()) { - const name = getPluginName(specifier) + const spec = pluginSpecifier(specifier) + const name = spec.startsWith("file://") ? spec : parsePluginSpecifier(spec).pkg if (!seenNames.has(name)) { seenNames.add(name) uniqueSpecifiers.push(specifier) @@ -757,6 +811,7 @@ export namespace Config { terminal_suspend: z.string().optional().default("ctrl+z").describe("Suspend terminal"), terminal_title_toggle: z.string().optional().default("none").describe("Toggle terminal title"), tips_toggle: z.string().optional().default("h").describe("Toggle tips on home screen"), + plugin_manager: z.string().optional().default("none").describe("Open plugin manager dialog"), display_thinking: z.string().optional().default("none").describe("Toggle thinking blocks visibility"), }) .strict() @@ -858,13 +913,13 @@ export namespace Config { ignore: z.array(z.string()).optional(), }) .optional(), - plugin: z.string().array().optional(), snapshot: z .boolean() .optional() .describe( "Enable or disable snapshot tracking. When false, filesystem snapshots are not recorded and undoing or reverting will not undo/redo file changes. Defaults to true.", ), + plugin: PluginSpec.array().optional(), share: z .enum(["manual", "auto", "disabled"]) .optional() @@ -1070,10 +1125,6 @@ export namespace Config { return candidates[0] } - function isRecord(value: unknown): value is Record { - return !!value && typeof value === "object" && !Array.isArray(value) - } - function patchJsonc(input: string, patch: unknown, path: string[] = []): string { if (!isRecord(patch)) { const edits = modify(input, path, patch, { @@ -1189,19 +1240,9 @@ export namespace Config { } const data = parsed.data if (data.plugin && isFile) { - for (let i = 0; i < data.plugin.length; i++) { - const plugin = data.plugin[i] - try { - data.plugin[i] = import.meta.resolve!(plugin, options.path) - } catch (e) { - try { - const require = createRequire(options.path) - const resolvedPath = require.resolve(plugin) - data.plugin[i] = pathToFileURL(resolvedPath).href - } catch { - // Ignore, plugin might be a generic string identifier like "mcp-server" - } - } + const list = data.plugin + for (let i = 0; i < list.length; i++) { + list[i] = yield* Effect.promise(() => resolvePluginSpec(list[i], options.path)) } } return data @@ -1326,12 +1367,14 @@ export namespace Config { } } - deps.push( - iife(async () => { - const shouldInstall = await needsInstall(dir) - if (shouldInstall) await installDependencies(dir) - }), - ) + const dep = iife(async () => { + const stale = await needsInstall(dir) + if (stale) await installDependencies(dir) + }) + void dep.catch((err) => { + log.warn("background dependency install failed", { dir, error: err }) + }) + deps.push(dep) result.command = mergeDeep(result.command ?? {}, yield* Effect.promise(() => loadCommand(dir))) result.agent = mergeDeep(result.agent, yield* Effect.promise(() => loadAgent(dir))) diff --git a/packages/opencode/src/config/tui-schema.ts b/packages/opencode/src/config/tui-schema.ts index f9068e3f01..b126d3c96a 100644 --- a/packages/opencode/src/config/tui-schema.ts +++ b/packages/opencode/src/config/tui-schema.ts @@ -29,6 +29,8 @@ export const TuiInfo = z $schema: z.string().optional(), theme: z.string().optional(), keybinds: KeybindOverride.optional(), + plugin: Config.PluginSpec.array().optional(), + plugin_enabled: z.record(z.string(), z.boolean()).optional(), }) .extend(TuiOptions.shape) .strict() diff --git a/packages/opencode/src/config/tui.ts b/packages/opencode/src/config/tui.ts index f0964f63b3..857b673960 100644 --- a/packages/opencode/src/config/tui.ts +++ b/packages/opencode/src/config/tui.ts @@ -8,23 +8,101 @@ import { TuiInfo } from "./tui-schema" import { Instance } from "@/project/instance" import { Flag } from "@/flag/flag" import { Log } from "@/util/log" +import { isRecord } from "@/util/record" import { Global } from "@/global" +import { parsePluginSpecifier } from "@/plugin/shared" export namespace TuiConfig { const log = Log.create({ service: "tui.config" }) export const Info = TuiInfo - export type Info = z.output + export type PluginMeta = { + scope: "global" | "local" + source: string + } + + type PluginEntry = { + item: Config.PluginSpec + meta: PluginMeta + } + + type Acc = { + result: Info + entries: PluginEntry[] + } + + export type Info = z.output & { + plugin_meta?: Record + } + + function pluginScope(file: string): PluginMeta["scope"] { + if (Instance.containsPath(file)) return "local" + return "global" + } + + function dedupePlugins(list: PluginEntry[]) { + const seen = new Set() + const result: PluginEntry[] = [] + for (const item of list.toReversed()) { + const spec = Config.pluginSpecifier(item.item) + const name = spec.startsWith("file://") ? spec : parsePluginSpecifier(spec).pkg + if (seen.has(name)) continue + seen.add(name) + result.push(item) + } + return result.toReversed() + } function mergeInfo(target: Info, source: Info): Info { - return mergeDeep(target, source) + const merged = mergeDeep(target, source) + if (target.plugin && source.plugin) { + merged.plugin = [...target.plugin, ...source.plugin] + } + return merged } function customPath() { return Flag.OPENCODE_TUI_CONFIG } + function normalize(raw: Record) { + const data = { ...raw } + if (!("tui" in data)) return data + if (!isRecord(data.tui)) { + delete data.tui + return data + } + + const tui = data.tui + delete data.tui + return { + ...tui, + ...data, + } + } + + function installDeps(dir: string): Promise { + return Config.installDependencies(dir) + } + + async function mergeFile(acc: Acc, file: string) { + const data = await loadFile(file) + acc.result = mergeInfo(acc.result, data) + if (!data.plugin?.length) return + + const scope = pluginScope(file) + for (const item of data.plugin) { + acc.entries.push({ + item, + meta: { + scope, + source: file, + }, + }) + } + } + const state = Instance.state(async () => { let projectFiles = Flag.OPENCODE_DISABLE_PROJECT_CONFIG ? [] @@ -38,38 +116,55 @@ export namespace TuiConfig { ? [] : await ConfigPaths.projectFiles("tui", Instance.directory, Instance.worktree) - let result: Info = {} + const acc: Acc = { + result: {}, + entries: [], + } for (const file of ConfigPaths.fileInDirectory(Global.Path.config, "tui")) { - result = mergeInfo(result, await loadFile(file)) + await mergeFile(acc, file) } if (custom) { - result = mergeInfo(result, await loadFile(custom)) + await mergeFile(acc, custom) log.debug("loaded custom tui config", { path: custom }) } for (const file of projectFiles) { - result = mergeInfo(result, await loadFile(file)) + await mergeFile(acc, file) } for (const dir of unique(directories)) { if (!dir.endsWith(".opencode") && dir !== Flag.OPENCODE_CONFIG_DIR) continue for (const file of ConfigPaths.fileInDirectory(dir, "tui")) { - result = mergeInfo(result, await loadFile(file)) + await mergeFile(acc, file) } } if (existsSync(managed)) { for (const file of ConfigPaths.fileInDirectory(managed, "tui")) { - result = mergeInfo(result, await loadFile(file)) + await mergeFile(acc, file) } } - result.keybinds = Config.Keybinds.parse(result.keybinds ?? {}) + const merged = dedupePlugins(acc.entries) + acc.result.keybinds = Config.Keybinds.parse(acc.result.keybinds ?? {}) + acc.result.plugin = merged.map((item) => item.item) + acc.result.plugin_meta = merged.length + ? Object.fromEntries(merged.map((item) => [Config.pluginSpecifier(item.item), item.meta])) + : undefined + + const deps: Promise[] = [] + if (acc.result.plugin?.length) { + for (const dir of unique(directories)) { + if (!dir.endsWith(".opencode") && dir !== Flag.OPENCODE_CONFIG_DIR) continue + deps.push(installDeps(dir)) + } + } return { - config: result, + config: acc.result, + deps, } }) @@ -77,6 +172,11 @@ export namespace TuiConfig { return state().then((x) => x.config) } + export async function waitForDependencies() { + const deps = await state().then((x) => x.deps) + await Promise.all(deps) + } + async function loadFile(filepath: string): Promise { const text = await ConfigPaths.readFile(filepath) if (!text) return {} @@ -87,25 +187,12 @@ export namespace TuiConfig { } async function load(text: string, configFilepath: string): Promise { - const data = await ConfigPaths.parseText(text, configFilepath, "empty") - if (!data || typeof data !== "object" || Array.isArray(data)) return {} + const raw = await ConfigPaths.parseText(text, configFilepath, "empty") + if (!isRecord(raw)) return {} // Flatten a nested "tui" key so users who wrote `{ "tui": { ... } }` inside tui.json // (mirroring the old opencode.json shape) still get their settings applied. - const normalized = (() => { - const copy = { ...(data as Record) } - if (!("tui" in copy)) return copy - if (!copy.tui || typeof copy.tui !== "object" || Array.isArray(copy.tui)) { - delete copy.tui - return copy - } - const tui = copy.tui as Record - delete copy.tui - return { - ...tui, - ...copy, - } - })() + const normalized = normalize(raw) const parsed = Info.safeParse(normalized) if (!parsed.success) { @@ -113,6 +200,13 @@ export namespace TuiConfig { return {} } - return parsed.data + const data = parsed.data + if (data.plugin) { + for (let i = 0; i < data.plugin.length; i++) { + data.plugin[i] = await Config.resolvePluginSpec(data.plugin[i], configFilepath) + } + } + + return data } } diff --git a/packages/opencode/src/flag/flag.ts b/packages/opencode/src/flag/flag.ts index b35f84c8e2..27190f2eb2 100644 --- a/packages/opencode/src/flag/flag.ts +++ b/packages/opencode/src/flag/flag.ts @@ -14,13 +14,16 @@ export namespace Flag { export const OPENCODE_AUTO_SHARE = truthy("OPENCODE_AUTO_SHARE") export const OPENCODE_GIT_BASH_PATH = process.env["OPENCODE_GIT_BASH_PATH"] export const OPENCODE_CONFIG = process.env["OPENCODE_CONFIG"] + export declare const OPENCODE_PURE: boolean export declare const OPENCODE_TUI_CONFIG: string | undefined export declare const OPENCODE_CONFIG_DIR: string | undefined + export declare const OPENCODE_PLUGIN_META_FILE: string | undefined export const OPENCODE_CONFIG_CONTENT = process.env["OPENCODE_CONFIG_CONTENT"] export const OPENCODE_DISABLE_AUTOUPDATE = truthy("OPENCODE_DISABLE_AUTOUPDATE") export const OPENCODE_ALWAYS_NOTIFY_UPDATE = truthy("OPENCODE_ALWAYS_NOTIFY_UPDATE") export const OPENCODE_DISABLE_PRUNE = truthy("OPENCODE_DISABLE_PRUNE") export const OPENCODE_DISABLE_TERMINAL_TITLE = truthy("OPENCODE_DISABLE_TERMINAL_TITLE") + export const OPENCODE_SHOW_TTFD = truthy("OPENCODE_SHOW_TTFD") export const OPENCODE_PERMISSION = process.env["OPENCODE_PERMISSION"] export const OPENCODE_DISABLE_DEFAULT_PLUGINS = truthy("OPENCODE_DISABLE_DEFAULT_PLUGINS") export const OPENCODE_DISABLE_LSP_DOWNLOAD = truthy("OPENCODE_DISABLE_LSP_DOWNLOAD") @@ -117,6 +120,28 @@ Object.defineProperty(Flag, "OPENCODE_CONFIG_DIR", { configurable: false, }) +// Dynamic getter for OPENCODE_PURE +// This must be evaluated at access time, not module load time, +// because the CLI can set this flag at runtime +Object.defineProperty(Flag, "OPENCODE_PURE", { + get() { + return truthy("OPENCODE_PURE") + }, + enumerable: true, + configurable: false, +}) + +// Dynamic getter for OPENCODE_PLUGIN_META_FILE +// This must be evaluated at access time, not module load time, +// because tests and external tooling may set this env var at runtime +Object.defineProperty(Flag, "OPENCODE_PLUGIN_META_FILE", { + get() { + return process.env["OPENCODE_PLUGIN_META_FILE"] + }, + enumerable: true, + configurable: false, +}) + // Dynamic getter for OPENCODE_CLIENT // This must be evaluated at access time, not module load time, // because some commands override the client at runtime diff --git a/packages/opencode/src/index.ts b/packages/opencode/src/index.ts index e27471068f..2da35ace1d 100644 --- a/packages/opencode/src/index.ts +++ b/packages/opencode/src/index.ts @@ -33,16 +33,18 @@ import path from "path" import { Global } from "./global" import { JsonMigration } from "./storage/json-migration" import { Database } from "./storage/db" +import { errorMessage } from "./util/error" +import { PluginCommand } from "./cli/cmd/plug" process.on("unhandledRejection", (e) => { Log.Default.error("rejection", { - e: e instanceof Error ? e.message : e, + e: errorMessage(e), }) }) process.on("uncaughtException", (e) => { Log.Default.error("exception", { - e: e instanceof Error ? e.message : e, + e: errorMessage(e), }) }) @@ -63,7 +65,15 @@ const cli = yargs(hideBin(process.argv)) type: "string", choices: ["DEBUG", "INFO", "WARN", "ERROR"], }) + .option("pure", { + describe: "run without external plugins", + type: "boolean", + }) .middleware(async (opts) => { + if (opts.pure) { + process.env.OPENCODE_PURE = "1" + } + await Log.init({ print: process.argv.includes("--print-logs"), dev: Installation.isLocal(), @@ -143,6 +153,7 @@ const cli = yargs(hideBin(process.argv)) .command(GithubCommand) .command(PrCommand) .command(SessionCommand) + .command(PluginCommand) .command(DbCommand) .fail((msg, err) => { if ( @@ -194,7 +205,7 @@ try { if (formatted) UI.error(formatted) if (formatted === undefined) { UI.error("Unexpected error, check log file at " + Log.file() + " for more details" + EOL) - process.stderr.write((e instanceof Error ? e.message : String(e)) + EOL) + process.stderr.write(errorMessage(e) + EOL) } process.exitCode = 1 } finally { diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts index df644c42a9..e7bb2a91d0 100644 --- a/packages/opencode/src/plugin/index.ts +++ b/packages/opencode/src/plugin/index.ts @@ -1,9 +1,8 @@ -import type { Hooks, PluginInput, Plugin as PluginInstance } from "@opencode-ai/plugin" +import type { Hooks, PluginInput, Plugin as PluginInstance, PluginModule } from "@opencode-ai/plugin" import { Config } from "../config/config" import { Bus } from "../bus" import { Log } from "../util/log" import { createOpencodeClient } from "@opencode-ai/sdk" -import { BunProc } from "../bun" import { Flag } from "../flag/flag" import { CodexAuthPlugin } from "./codex" import { Session } from "../session" @@ -14,6 +13,17 @@ import { PoeAuthPlugin } from "opencode-poe-auth" import { Effect, Layer, ServiceMap, Stream } from "effect" import { InstanceState } from "@/effect/instance-state" import { makeRuntime } from "@/effect/run-service" +import { errorMessage } from "@/util/error" +import { Installation } from "@/installation" +import { + checkPluginCompatibility, + getDefaultPlugin, + isDeprecatedPlugin, + parsePluginSpecifier, + pluginSource, + resolvePluginEntrypoint, + resolvePluginTarget, +} from "./shared" export namespace Plugin { const log = Log.create({ service: "plugin" }) @@ -22,6 +32,12 @@ export namespace Plugin { hooks: Hooks[] } + type Loaded = { + item: Config.PluginSpec + spec: string + mod: Record + } + // Hook names that follow the (input, output) => Promise trigger pattern type TriggerName = { [K in keyof Hooks]-?: NonNullable extends (input: any, output: any) => Promise ? K : never @@ -46,8 +62,115 @@ export namespace Plugin { // Built-in plugins that are directly imported (not installed from npm) const INTERNAL_PLUGINS: PluginInstance[] = [CodexAuthPlugin, CopilotAuthPlugin, GitlabAuthPlugin, PoeAuthPlugin] - // Old npm package names for plugins that are now built-in — skip if users still have them in config - const DEPRECATED_PLUGIN_PACKAGES = ["opencode-openai-codex-auth", "opencode-copilot-auth"] + function isServerPlugin(value: unknown): value is PluginInstance { + return typeof value === "function" + } + + function getServerPlugin(value: unknown) { + if (isServerPlugin(value)) return value + if (!value || typeof value !== "object" || !("server" in value)) return + if (!isServerPlugin(value.server)) return + return value.server + } + + function getLegacyPlugins(mod: Record) { + const seen = new Set() + const result: PluginInstance[] = [] + + for (const entry of Object.values(mod)) { + if (seen.has(entry)) continue + seen.add(entry) + const plugin = getServerPlugin(entry) + if (!plugin) throw new TypeError("Plugin export is not a function") + result.push(plugin) + } + + return result + } + + async function resolvePlugin(spec: string) { + const parsed = parsePluginSpecifier(spec) + const target = await resolvePluginTarget(spec, parsed).catch((err) => { + const cause = err instanceof Error ? err.cause : err + const detail = errorMessage(cause ?? err) + log.error("failed to install plugin", { pkg: parsed.pkg, version: parsed.version, error: detail }) + Bus.publish(Session.Event.Error, { + error: new NamedError.Unknown({ + message: `Failed to install plugin ${parsed.pkg}@${parsed.version}: ${detail}`, + }).toObject(), + }) + return "" + }) + if (!target) return + return target + } + + async function prepPlugin(item: Config.PluginSpec): Promise { + const spec = Config.pluginSpecifier(item) + if (isDeprecatedPlugin(spec)) return + log.info("loading plugin", { path: spec }) + const resolved = await resolvePlugin(spec) + if (!resolved) return + + if (pluginSource(spec) === "npm") { + const incompatible = await checkPluginCompatibility(resolved, Installation.VERSION) + .then(() => false) + .catch((err) => { + const message = errorMessage(err) + log.warn("plugin incompatible", { path: spec, error: message }) + Bus.publish(Session.Event.Error, { + error: new NamedError.Unknown({ + message: `Plugin ${spec} skipped: ${message}`, + }).toObject(), + }) + return true + }) + if (incompatible) return + } + + const target = resolved + const entry = await resolvePluginEntrypoint(spec, target, "server").catch((err) => { + const message = errorMessage(err) + log.error("failed to resolve plugin server entry", { path: spec, target, error: message }) + Bus.publish(Session.Event.Error, { + error: new NamedError.Unknown({ + message: `Failed to load plugin ${spec}: ${message}`, + }).toObject(), + }) + return + }) + if (!entry) return + + const mod = await import(entry).catch((err) => { + const message = errorMessage(err) + log.error("failed to load plugin", { path: spec, target: entry, error: message }) + Bus.publish(Session.Event.Error, { + error: new NamedError.Unknown({ + message: `Failed to load plugin ${spec}: ${message}`, + }).toObject(), + }) + return + }) + if (!mod) return + + return { + item, + spec, + mod, + } + } + + async function applyPlugin(load: Loaded, input: PluginInput, hooks: Hooks[]) { + const plugin = getDefaultPlugin(load.mod) as PluginModule | undefined + if (plugin?.server) { + hooks.push(await plugin.server(input, Config.pluginOptions(load.item))) + return + } + + for (const server of getLegacyPlugins(load.mod)) { + hooks.push(await server(input, Config.pluginOptions(load.item))) + } + } export const layer = Layer.effect( Service, @@ -91,51 +214,27 @@ export namespace Plugin { if (init) hooks.push(init) } - let plugins = cfg.plugin ?? [] + const plugins = Flag.OPENCODE_PURE ? [] : (cfg.plugin ?? []) + if (Flag.OPENCODE_PURE && cfg.plugin?.length) { + log.info("skipping external plugins in pure mode", { count: cfg.plugin.length }) + } if (plugins.length) await Config.waitForDependencies() - for (let plugin of plugins) { - if (DEPRECATED_PLUGIN_PACKAGES.some((pkg) => plugin.includes(pkg))) continue - log.info("loading plugin", { path: plugin }) - if (!plugin.startsWith("file://")) { - const idx = plugin.lastIndexOf("@") - const pkg = idx > 0 ? plugin.substring(0, idx) : plugin - const version = idx > 0 ? plugin.substring(idx + 1) : "latest" - plugin = await BunProc.install(pkg, version).catch((err) => { - const cause = err instanceof Error ? err.cause : err - const detail = cause instanceof Error ? cause.message : String(cause ?? err) - log.error("failed to install plugin", { pkg, version, error: detail }) - Bus.publish(Session.Event.Error, { - error: new NamedError.Unknown({ - message: `Failed to install plugin ${pkg}@${version}: ${detail}`, - }).toObject(), - }) - return "" - }) - if (!plugin) continue - } + const loaded = await Promise.all(plugins.map((item) => prepPlugin(item))) + for (const load of loaded) { + if (!load) continue - // Prevent duplicate initialization when plugins export the same function - // as both a named export and default export (e.g., `export const X` and `export default X`). - // Object.entries(mod) would return both entries pointing to the same function reference. - await import(plugin) - .then(async (mod) => { - const seen = new Set() - for (const [_name, fn] of Object.entries(mod)) { - if (seen.has(fn)) continue - seen.add(fn) - hooks.push(await fn(input)) - } - }) - .catch((err) => { - const message = err instanceof Error ? err.message : String(err) - log.error("failed to load plugin", { path: plugin, error: message }) - Bus.publish(Session.Event.Error, { - error: new NamedError.Unknown({ - message: `Failed to load plugin ${plugin}: ${message}`, - }).toObject(), - }) + // Keep plugin execution sequential so hook registration and execution + // order remains deterministic across plugin runs. + await applyPlugin(load, input, hooks).catch((err) => { + const message = errorMessage(err) + log.error("failed to load plugin", { path: load.spec, error: message }) + Bus.publish(Session.Event.Error, { + error: new NamedError.Unknown({ + message: `Failed to load plugin ${load.spec}: ${message}`, + }).toObject(), }) + }) } // Notify plugins of current config diff --git a/packages/opencode/src/plugin/install.ts b/packages/opencode/src/plugin/install.ts new file mode 100644 index 0000000000..9640a662bd --- /dev/null +++ b/packages/opencode/src/plugin/install.ts @@ -0,0 +1,351 @@ +import path from "path" +import { + type ParseError as JsoncParseError, + applyEdits, + modify, + parse as parseJsonc, + printParseErrorCode, +} from "jsonc-parser" + +import { ConfigPaths } from "@/config/paths" +import { Global } from "@/global" +import { Filesystem } from "@/util/filesystem" +import { Flock } from "@/util/flock" + +import { parsePluginSpecifier, readPluginPackage, resolvePluginTarget } from "./shared" + +type Mode = "noop" | "add" | "replace" +type Kind = "server" | "tui" + +export type Target = { + kind: Kind + opts?: Record +} + +export type InstallDeps = { + resolve: (spec: string) => Promise +} + +export type PatchDeps = { + readText: (file: string) => Promise + write: (file: string, text: string) => Promise + exists: (file: string) => Promise + files: (dir: string, name: "opencode" | "tui") => string[] +} + +export type PatchInput = { + spec: string + targets: Target[] + force?: boolean + global?: boolean + vcs?: string + worktree: string + directory: string + config?: string +} + +type Ok = { + ok: true +} & T + +type Err = { + ok: false + code: C +} & T + +export type InstallResult = Ok<{ target: string }> | Err<"install_failed", { error: unknown }> + +export type ManifestResult = + | Ok<{ targets: Target[] }> + | Err<"manifest_read_failed", { file: string; error: unknown }> + | Err<"manifest_no_targets", { file: string }> + +export type PatchItem = { + kind: Kind + mode: Mode + file: string +} + +type PatchErr = + | Err<"invalid_json", { kind: Kind; file: string; line: number; col: number; parse: string }> + | Err<"patch_failed", { kind: Kind; error: unknown }> + +type PatchOne = Ok<{ item: PatchItem }> | PatchErr + +export type PatchResult = Ok<{ dir: string; items: PatchItem[] }> | (PatchErr & { dir: string }) + +const defaultInstallDeps: InstallDeps = { + resolve: (spec) => resolvePluginTarget(spec), +} + +const defaultPatchDeps: PatchDeps = { + readText: (file) => Filesystem.readText(file), + write: async (file, text) => { + await Filesystem.write(file, text) + }, + exists: (file) => Filesystem.exists(file), + files: (dir, name) => ConfigPaths.fileInDirectory(dir, name), +} + +function pluginSpec(item: unknown) { + if (typeof item === "string") return item + if (!Array.isArray(item)) return + if (typeof item[0] !== "string") return + return item[0] +} + +function parseTarget(item: unknown): Target | undefined { + if (item === "server" || item === "tui") return { kind: item } + if (!Array.isArray(item)) return + if (item[0] !== "server" && item[0] !== "tui") return + if (item.length < 2) return { kind: item[0] } + const opt = item[1] + if (!opt || typeof opt !== "object" || Array.isArray(opt)) return { kind: item[0] } + return { + kind: item[0], + opts: opt, + } +} + +function parseTargets(raw: unknown) { + if (!Array.isArray(raw)) return [] + const map = new Map() + for (const item of raw) { + const hit = parseTarget(item) + if (!hit) continue + map.set(hit.kind, hit) + } + return [...map.values()] +} + +function patchPluginList(list: unknown[], spec: string, next: unknown, force = false): { mode: Mode; list: unknown[] } { + const pkg = parsePluginSpecifier(spec).pkg + const rows = list.map((item, i) => ({ + item, + i, + spec: pluginSpec(item), + })) + const dup = rows.filter((item) => { + if (!item.spec) return false + if (item.spec === spec) return true + if (item.spec.startsWith("file://")) return false + return parsePluginSpecifier(item.spec).pkg === pkg + }) + + if (!dup.length) { + return { + mode: "add", + list: [...list, next], + } + } + + if (!force) { + return { + mode: "noop", + list, + } + } + + const keep = dup[0] + if (!keep) { + return { + mode: "noop", + list, + } + } + + if (dup.length === 1 && keep.spec === spec) { + return { + mode: "noop", + list, + } + } + + const idx = new Set(dup.map((item) => item.i)) + return { + mode: "replace", + list: rows.flatMap((row) => { + if (!idx.has(row.i)) return [row.item] + if (row.i !== keep.i) return [] + if (typeof row.item === "string") return [next] + if (Array.isArray(row.item) && typeof row.item[0] === "string") { + return [[spec, ...row.item.slice(1)]] + } + return [row.item] + }), + } +} + +export async function installPlugin(spec: string, dep: InstallDeps = defaultInstallDeps): Promise { + const target = await dep.resolve(spec).then( + (item) => ({ + ok: true as const, + item, + }), + (error: unknown) => ({ + ok: false as const, + error, + }), + ) + if (!target.ok) { + return { + ok: false, + code: "install_failed", + error: target.error, + } + } + return { + ok: true, + target: target.item, + } +} + +export async function readPluginManifest(target: string): Promise { + const pkg = await readPluginPackage(target).then( + (item) => ({ + ok: true as const, + item, + }), + (error: unknown) => ({ + ok: false as const, + error, + }), + ) + if (!pkg.ok) { + return { + ok: false, + code: "manifest_read_failed", + file: target, + error: pkg.error, + } + } + + const targets = parseTargets(pkg.item.json["oc-plugin"]) + if (!targets.length) { + return { + ok: false, + code: "manifest_no_targets", + file: pkg.item.pkg, + } + } + + return { + ok: true, + targets, + } +} + +function patchDir(input: PatchInput) { + if (input.global) return input.config ?? Global.Path.config + const git = input.vcs === "git" && input.worktree !== "/" + const root = git ? input.worktree : input.directory + return path.join(root, ".opencode") +} + +function patchName(kind: Kind): "opencode" | "tui" { + if (kind === "server") return "opencode" + return "tui" +} + +async function patchOne(dir: string, target: Target, spec: string, force: boolean, dep: PatchDeps): Promise { + const name = patchName(target.kind) + await using _ = await Flock.acquire(`plug-config:${Filesystem.resolve(path.join(dir, name))}`) + + const files = dep.files(dir, name) + let cfg = files[0] + for (const file of files) { + if (!(await dep.exists(file))) continue + cfg = file + break + } + + const src = await dep.readText(cfg).catch((err: NodeJS.ErrnoException) => { + if (err.code === "ENOENT") return "{}" + return err + }) + if (src instanceof Error) { + return { + ok: false, + code: "patch_failed", + kind: target.kind, + error: src, + } + } + const text = src.trim() ? src : "{}" + + const errs: JsoncParseError[] = [] + const data = parseJsonc(text, errs, { allowTrailingComma: true }) + if (errs.length) { + const err = errs[0] + const lines = text.substring(0, err.offset).split("\n") + return { + ok: false, + code: "invalid_json", + kind: target.kind, + file: cfg, + line: lines.length, + col: lines[lines.length - 1].length + 1, + parse: printParseErrorCode(err.error), + } + } + + const list: unknown[] = + data && typeof data === "object" && !Array.isArray(data) && Array.isArray(data.plugin) ? data.plugin : [] + const item = target.opts ? [spec, target.opts] : spec + const out = patchPluginList(list, spec, item, force) + if (out.mode === "noop") { + return { + ok: true, + item: { + kind: target.kind, + mode: out.mode, + file: cfg, + }, + } + } + + const edits = modify(text, ["plugin"], out.list, { + formattingOptions: { + tabSize: 2, + insertSpaces: true, + }, + }) + const write = await dep.write(cfg, applyEdits(text, edits)).catch((error: unknown) => error) + if (write instanceof Error) { + return { + ok: false, + code: "patch_failed", + kind: target.kind, + error: write, + } + } + + return { + ok: true, + item: { + kind: target.kind, + mode: out.mode, + file: cfg, + }, + } +} + +export async function patchPluginConfig(input: PatchInput, dep: PatchDeps = defaultPatchDeps): Promise { + const dir = patchDir(input) + const items: PatchItem[] = [] + for (const target of input.targets) { + const hit = await patchOne(dir, target, input.spec, Boolean(input.force), dep) + if (!hit.ok) { + return { + ...hit, + dir, + } + } + items.push(hit.item) + } + return { + ok: true, + dir, + items, + } +} diff --git a/packages/opencode/src/plugin/meta.ts b/packages/opencode/src/plugin/meta.ts new file mode 100644 index 0000000000..bf93870cb0 --- /dev/null +++ b/packages/opencode/src/plugin/meta.ts @@ -0,0 +1,165 @@ +import path from "path" +import { fileURLToPath } from "url" + +import { Flag } from "@/flag/flag" +import { Global } from "@/global" +import { Filesystem } from "@/util/filesystem" +import { Flock } from "@/util/flock" + +import { parsePluginSpecifier, pluginSource } from "./shared" + +export namespace PluginMeta { + type Source = "file" | "npm" + + export type Entry = { + id: string + source: Source + spec: string + target: string + requested?: string + version?: string + modified?: number + first_time: number + last_time: number + time_changed: number + load_count: number + fingerprint: string + } + + export type State = "first" | "updated" | "same" + + export type Touch = { + spec: string + target: string + id: string + } + + type Store = Record + type Core = Omit + type Row = Touch & { core: Core } + + function storePath() { + return Flag.OPENCODE_PLUGIN_META_FILE ?? path.join(Global.Path.state, "plugin-meta.json") + } + + function lock(file: string) { + return `plugin-meta:${file}` + } + + function fileTarget(spec: string, target: string) { + if (spec.startsWith("file://")) return fileURLToPath(spec) + if (target.startsWith("file://")) return fileURLToPath(target) + return + } + + function modifiedAt(file: string) { + const stat = Filesystem.stat(file) + if (!stat) return + const value = stat.mtimeMs + return Math.floor(typeof value === "bigint" ? Number(value) : value) + } + + function resolvedTarget(target: string) { + if (target.startsWith("file://")) return fileURLToPath(target) + return target + } + + async function npmVersion(target: string) { + const resolved = resolvedTarget(target) + const stat = Filesystem.stat(resolved) + const dir = stat?.isDirectory() ? resolved : path.dirname(resolved) + return Filesystem.readJson<{ version?: string }>(path.join(dir, "package.json")) + .then((item) => item.version) + .catch(() => undefined) + } + + async function entryCore(item: Touch): Promise { + const spec = item.spec + const target = item.target + const source = pluginSource(spec) + if (source === "file") { + const file = fileTarget(spec, target) + return { + id: item.id, + source, + spec, + target, + modified: file ? modifiedAt(file) : undefined, + } + } + + return { + id: item.id, + source, + spec, + target, + requested: parsePluginSpecifier(spec).version, + version: await npmVersion(target), + } + } + + function fingerprint(value: Core) { + if (value.source === "file") return [value.target, value.modified ?? ""].join("|") + return [value.target, value.requested ?? "", value.version ?? ""].join("|") + } + + async function read(file: string): Promise { + return Filesystem.readJson(file).catch(() => ({}) as Store) + } + + async function row(item: Touch): Promise { + return { + ...item, + core: await entryCore(item), + } + } + + function next(prev: Entry | undefined, core: Core, now: number): { state: State; entry: Entry } { + const entry: Entry = { + ...core, + first_time: prev?.first_time ?? now, + last_time: now, + time_changed: prev?.time_changed ?? now, + load_count: (prev?.load_count ?? 0) + 1, + fingerprint: fingerprint(core), + } + const state: State = !prev ? "first" : prev.fingerprint === entry.fingerprint ? "same" : "updated" + if (state === "updated") entry.time_changed = now + return { + state, + entry, + } + } + + export async function touchMany(items: Touch[]): Promise> { + if (!items.length) return [] + const file = storePath() + const rows = await Promise.all(items.map((item) => row(item))) + + return Flock.withLock(lock(file), async () => { + const store = await read(file) + const now = Date.now() + const out: Array<{ state: State; entry: Entry }> = [] + for (const item of rows) { + const hit = next(store[item.id], item.core, now) + store[item.id] = hit.entry + out.push(hit) + } + await Filesystem.writeJson(file, store) + return out + }) + } + + export async function touch(spec: string, target: string, id: string): Promise<{ state: State; entry: Entry }> { + return touchMany([{ spec, target, id }]).then((item) => { + const hit = item[0] + if (hit) return hit + throw new Error("Failed to touch plugin metadata.") + }) + } + + export async function list(): Promise { + const file = storePath() + return Flock.withLock(lock(file), async () => read(file)) + } +} diff --git a/packages/opencode/src/plugin/shared.ts b/packages/opencode/src/plugin/shared.ts new file mode 100644 index 0000000000..ee2ee6dd71 --- /dev/null +++ b/packages/opencode/src/plugin/shared.ts @@ -0,0 +1,149 @@ +import path from "path" +import { fileURLToPath, pathToFileURL } from "url" +import semver from "semver" +import { BunProc } from "@/bun" +import { Filesystem } from "@/util/filesystem" +import { isRecord } from "@/util/record" + +// Old npm package names for plugins that are now built-in +export const DEPRECATED_PLUGIN_PACKAGES = ["opencode-openai-codex-auth", "opencode-copilot-auth"] + +export function isDeprecatedPlugin(spec: string) { + return DEPRECATED_PLUGIN_PACKAGES.some((pkg) => spec.includes(pkg)) +} + +export function parsePluginSpecifier(spec: string) { + const lastAt = spec.lastIndexOf("@") + const pkg = lastAt > 0 ? spec.substring(0, lastAt) : spec + const version = lastAt > 0 ? spec.substring(lastAt + 1) : "latest" + return { pkg, version } +} + +export type PluginSource = "file" | "npm" +export type PluginKind = "server" | "tui" + +export function pluginSource(spec: string): PluginSource { + return spec.startsWith("file://") ? "file" : "npm" +} + +function hasEntrypoint(json: Record, kind: PluginKind) { + if (!isRecord(json.exports)) return false + return `./${kind}` in json.exports +} + +function resolveExportPath(raw: string, dir: string) { + if (raw.startsWith("./") || raw.startsWith("../")) return path.resolve(dir, raw) + if (raw.startsWith("file://")) return fileURLToPath(raw) + return raw +} + +function extractExportValue(value: unknown): string | undefined { + if (typeof value === "string") return value + if (!isRecord(value)) return undefined + for (const key of ["import", "default"]) { + const nested = value[key] + if (typeof nested === "string") return nested + } + return undefined +} + +export async function resolvePluginEntrypoint(spec: string, target: string, kind: PluginKind) { + const pkg = await readPluginPackage(target).catch(() => undefined) + if (!pkg) return target + if (!hasEntrypoint(pkg.json, kind)) return target + + const exports = pkg.json.exports + if (!isRecord(exports)) return target + const raw = extractExportValue(exports[`./${kind}`]) + if (!raw) return target + + const resolved = resolveExportPath(raw, pkg.dir) + const root = Filesystem.resolve(pkg.dir) + const next = Filesystem.resolve(resolved) + if (!Filesystem.contains(root, next)) { + throw new Error(`Plugin ${spec} resolved ${kind} entry outside plugin directory`) + } + + return pathToFileURL(next).href +} + +export function isPathPluginSpec(spec: string) { + return spec.startsWith("file://") || spec.startsWith(".") || path.isAbsolute(spec) || /^[A-Za-z]:[\\/]/.test(spec) +} + +export async function resolvePathPluginTarget(spec: string) { + const raw = spec.startsWith("file://") ? fileURLToPath(spec) : spec + const file = path.isAbsolute(raw) || /^[A-Za-z]:[\\/]/.test(raw) ? raw : path.resolve(raw) + const stat = await Filesystem.stat(file) + if (!stat?.isDirectory()) { + if (spec.startsWith("file://")) return spec + return pathToFileURL(file).href + } + + const pkg = await Filesystem.readJson>(path.join(file, "package.json")).catch(() => undefined) + if (!pkg) throw new Error(`Plugin directory ${file} is missing package.json`) + if (typeof pkg.main !== "string" || !pkg.main.trim()) { + throw new Error(`Plugin directory ${file} must define package.json main`) + } + return pathToFileURL(path.resolve(file, pkg.main)).href +} + +export async function checkPluginCompatibility(target: string, opencodeVersion: string) { + if (!semver.valid(opencodeVersion) || semver.major(opencodeVersion) === 0) return + const pkg = await readPluginPackage(target).catch(() => undefined) + if (!pkg) return + const engines = pkg.json.engines + if (!isRecord(engines)) return + const range = engines.opencode + if (typeof range !== "string") return + if (!semver.satisfies(opencodeVersion, range)) { + throw new Error(`Plugin requires opencode ${range} but running ${opencodeVersion}`) + } +} + +export async function resolvePluginTarget(spec: string, parsed = parsePluginSpecifier(spec)) { + if (isPathPluginSpec(spec)) return resolvePathPluginTarget(spec) + return BunProc.install(parsed.pkg, parsed.version) +} + +export async function readPluginPackage(target: string) { + const file = target.startsWith("file://") ? fileURLToPath(target) : target + const stat = await Filesystem.stat(file) + const dir = stat?.isDirectory() ? file : path.dirname(file) + const pkg = path.join(dir, "package.json") + const json = await Filesystem.readJson>(pkg) + return { dir, pkg, json } +} + +export function readPluginId(id: unknown, spec: string) { + if (id === undefined) return + if (typeof id !== "string") throw new TypeError(`Plugin ${spec} has invalid id type ${typeof id}`) + const value = id.trim() + if (!value) throw new TypeError(`Plugin ${spec} has an empty id`) + return value +} + +export async function resolvePluginId(source: PluginSource, spec: string, target: string, id: string | undefined) { + if (source === "file") { + if (id) return id + throw new TypeError(`Path plugin ${spec} must export id`) + } + if (id) return id + const pkg = await readPluginPackage(target) + if (typeof pkg.json.name !== "string" || !pkg.json.name.trim()) { + throw new TypeError(`Plugin package ${pkg.pkg} is missing name`) + } + return pkg.json.name.trim() +} + +export function getDefaultPlugin(mod: Record) { + // A single default object keeps v1 detection explicit and avoids scanning exports. + const value = mod.default + if (!isRecord(value)) return + const server = "server" in value ? value.server : undefined + const tui = "tui" in value ? value.tui : undefined + if (server !== undefined && typeof server !== "function") return + if (tui !== undefined && typeof tui !== "function") return + if (server === undefined && tui === undefined) return + return value +} diff --git a/packages/opencode/src/provider/auth.ts b/packages/opencode/src/provider/auth.ts index fc4cc5e6b9..0b39a06a63 100644 --- a/packages/opencode/src/provider/auth.ts +++ b/packages/opencode/src/provider/auth.ts @@ -1,4 +1,4 @@ -import type { AuthOuathResult, Hooks } from "@opencode-ai/plugin" +import type { AuthOAuthResult, Hooks } from "@opencode-ai/plugin" import { NamedError } from "@opencode-ai/util/error" import { Auth } from "@/auth" import { InstanceState } from "@/effect/instance-state" @@ -106,7 +106,7 @@ export namespace ProviderAuth { interface State { hooks: Record - pending: Map + pending: Map } export class Service extends ServiceMap.Service()("@opencode/ProviderAuth") {} @@ -127,7 +127,7 @@ export namespace ProviderAuth { : Result.failVoid, ), ), - pending: new Map(), + pending: new Map(), } }), ), diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts index 86e4315652..37cbebc9ce 100644 --- a/packages/opencode/src/session/message-v2.ts +++ b/packages/opencode/src/session/message-v2.ts @@ -11,6 +11,7 @@ import { Database, NotFoundError, and, desc, eq, inArray, lt, or } from "@/stora import { MessageTable, PartTable, SessionTable } from "./session.sql" import { ProviderError } from "@/provider/error" import { iife } from "@/util/iife" +import { errorMessage } from "@/util/error" import type { SystemError } from "bun" import type { Provider } from "@/provider/provider" import { ModelID, ProviderID } from "@/provider/schema" @@ -990,7 +991,7 @@ export namespace MessageV2 { { cause: e }, ).toObject() case e instanceof Error: - return new NamedError.Unknown({ message: e instanceof Error ? e.message : String(e) }, { cause: e }).toObject() + return new NamedError.Unknown({ message: errorMessage(e) }, { cause: e }).toObject() default: try { const parsed = ProviderError.parseStreamError(e) diff --git a/packages/opencode/src/tool/batch.ts b/packages/opencode/src/tool/batch.ts index 00c22bfe6b..c79a530f71 100644 --- a/packages/opencode/src/tool/batch.ts +++ b/packages/opencode/src/tool/batch.ts @@ -1,6 +1,7 @@ import z from "zod" import { Tool } from "./tool" import { ProviderID, ModelID } from "../provider/schema" +import { errorMessage } from "../util/error" import DESCRIPTION from "./batch.txt" const DISALLOWED = new Set(["batch"]) @@ -118,7 +119,7 @@ export const BatchTool = Tool.define("batch", async () => { state: { status: "error", input: call.parameters, - error: error instanceof Error ? error.message : String(error), + error: errorMessage(error), time: { start: callStartTime, end: Date.now(), diff --git a/packages/opencode/src/util/error.ts b/packages/opencode/src/util/error.ts new file mode 100644 index 0000000000..ea1c79178c --- /dev/null +++ b/packages/opencode/src/util/error.ts @@ -0,0 +1,77 @@ +import { isRecord } from "./record" + +export function errorFormat(error: unknown): string { + if (error instanceof Error) { + return error.stack ?? `${error.name}: ${error.message}` + } + + if (typeof error === "object" && error !== null) { + try { + return JSON.stringify(error, null, 2) + } catch { + return "Unexpected error (unserializable)" + } + } + + return String(error) +} + +export function errorMessage(error: unknown): string { + if (error instanceof Error) { + if (error.message) return error.message + if (error.name) return error.name + } + + if (isRecord(error) && typeof error.message === "string" && error.message) { + return error.message + } + + const text = String(error) + if (text && text !== "[object Object]") return text + + const formatted = errorFormat(error) + if (formatted && formatted !== "{}") return formatted + return "unknown error" +} + +export function errorData(error: unknown) { + if (error instanceof Error) { + return { + type: error.name, + message: errorMessage(error), + stack: error.stack, + cause: error.cause === undefined ? undefined : errorFormat(error.cause), + formatted: errorFormatted(error), + } + } + + if (!isRecord(error)) { + return { + type: typeof error, + message: errorMessage(error), + formatted: errorFormatted(error), + } + } + + const data = Object.getOwnPropertyNames(error).reduce>((acc, key) => { + const value = error[key] + if (value === undefined) return acc + if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") { + acc[key] = value + return acc + } + acc[key] = value instanceof Error ? value.message : String(value) + return acc + }, {}) + + if (typeof data.message !== "string") data.message = errorMessage(error) + if (typeof data.type !== "string") data.type = error.constructor?.name + data.formatted = errorFormatted(error) + return data +} + +function errorFormatted(error: unknown) { + const formatted = errorFormat(error) + if (formatted !== "{}") return formatted + return String(error) +} diff --git a/packages/opencode/src/util/flock.ts b/packages/opencode/src/util/flock.ts new file mode 100644 index 0000000000..74c7905ebb --- /dev/null +++ b/packages/opencode/src/util/flock.ts @@ -0,0 +1,333 @@ +import path from "path" +import os from "os" +import { randomBytes, randomUUID } from "crypto" +import { mkdir, readFile, rm, stat, utimes, writeFile } from "fs/promises" +import { Global } from "@/global" +import { Hash } from "@/util/hash" + +export namespace Flock { + const root = path.join(Global.Path.state, "locks") + // Defaults for callers that do not provide timing options. + const defaultOpts = { + staleMs: 60_000, + timeoutMs: 5 * 60_000, + baseDelayMs: 100, + maxDelayMs: 2_000, + } + + export interface WaitEvent { + key: string + attempt: number + delay: number + waited: number + } + + export type Wait = (input: WaitEvent) => void | Promise + + export interface Options { + dir?: string + signal?: AbortSignal + staleMs?: number + timeoutMs?: number + baseDelayMs?: number + maxDelayMs?: number + onWait?: Wait + } + + type Opts = { + staleMs: number + timeoutMs: number + baseDelayMs: number + maxDelayMs: number + } + + type Owned = { + acquired: true + startHeartbeat: (intervalMs?: number) => void + release: () => Promise + } + + export interface Lease { + release: () => Promise + [Symbol.asyncDispose]: () => Promise + } + + function code(err: unknown) { + if (typeof err !== "object" || err === null || !("code" in err)) return + const value = err.code + if (typeof value !== "string") return + return value + } + + function sleep(ms: number, signal?: AbortSignal) { + return new Promise((resolve, reject) => { + if (signal?.aborted) { + reject(signal.reason ?? new Error("Aborted")) + return + } + + let timer: NodeJS.Timeout | undefined + + const done = () => { + signal?.removeEventListener("abort", abort) + resolve() + } + + const abort = () => { + if (timer) { + clearTimeout(timer) + } + signal?.removeEventListener("abort", abort) + reject(signal?.reason ?? new Error("Aborted")) + } + + signal?.addEventListener("abort", abort, { once: true }) + timer = setTimeout(done, ms) + }) + } + + function jitter(ms: number) { + const j = Math.floor(ms * 0.3) + const d = Math.floor(Math.random() * (2 * j + 1)) - j + return Math.max(0, ms + d) + } + + function mono() { + return performance.now() + } + + function wall() { + return performance.timeOrigin + mono() + } + + async function stats(file: string) { + try { + return await stat(file) + } catch (err) { + const errCode = code(err) + if (errCode === "ENOENT" || errCode === "ENOTDIR") return + throw err + } + } + + async function stale(lockDir: string, heartbeatPath: string, metaPath: string, staleMs: number) { + // Stale detection allows automatic recovery after crashed owners. + const now = wall() + const heartbeat = await stats(heartbeatPath) + if (heartbeat) { + return now - heartbeat.mtimeMs > staleMs + } + + const meta = await stats(metaPath) + if (meta) { + return now - meta.mtimeMs > staleMs + } + + const dir = await stats(lockDir) + if (!dir) { + return false + } + + return now - dir.mtimeMs > staleMs + } + + async function tryAcquireLockDir(lockDir: string, opts: Opts): Promise { + const token = randomUUID?.() ?? randomBytes(16).toString("hex") + const metaPath = path.join(lockDir, "meta.json") + const heartbeatPath = path.join(lockDir, "heartbeat") + + try { + await mkdir(lockDir, { mode: 0o700 }) + } catch (err) { + if (code(err) !== "EEXIST") { + throw err + } + + if (!(await stale(lockDir, heartbeatPath, metaPath, opts.staleMs))) { + return { acquired: false } + } + + const breakerPath = lockDir + ".breaker" + try { + await mkdir(breakerPath, { mode: 0o700 }) + } catch (claimErr) { + const errCode = code(claimErr) + if (errCode === "EEXIST") { + const breaker = await stats(breakerPath) + if (breaker && wall() - breaker.mtimeMs > opts.staleMs) { + await rm(breakerPath, { recursive: true, force: true }).catch(() => undefined) + } + return { acquired: false } + } + + if (errCode === "ENOENT" || errCode === "ENOTDIR") { + return { acquired: false } + } + + throw claimErr + } + + try { + // Breaker ownership ensures only one contender performs stale cleanup. + if (!(await stale(lockDir, heartbeatPath, metaPath, opts.staleMs))) { + return { acquired: false } + } + + await rm(lockDir, { recursive: true, force: true }) + + try { + await mkdir(lockDir, { mode: 0o700 }) + } catch (retryErr) { + const errCode = code(retryErr) + if (errCode === "EEXIST" || errCode === "ENOTEMPTY") { + return { acquired: false } + } + throw retryErr + } + } finally { + await rm(breakerPath, { recursive: true, force: true }).catch(() => undefined) + } + } + + const meta = { + token, + pid: process.pid, + hostname: os.hostname(), + createdAt: new Date().toISOString(), + } + + await writeFile(heartbeatPath, "", { flag: "wx" }).catch(async () => { + await rm(lockDir, { recursive: true, force: true }) + throw new Error("Lock acquired but heartbeat already existed (possible compromise).") + }) + + await writeFile(metaPath, JSON.stringify(meta, null, 2), { flag: "wx" }).catch(async () => { + await rm(lockDir, { recursive: true, force: true }) + throw new Error("Lock acquired but meta.json already existed (possible compromise).") + }) + + let timer: NodeJS.Timeout | undefined + + const startHeartbeat = (intervalMs = Math.max(100, Math.floor(opts.staleMs / 3))) => { + if (timer) return + // Heartbeat prevents long critical sections from being evicted as stale. + timer = setInterval(() => { + const t = new Date() + void utimes(heartbeatPath, t, t).catch(() => undefined) + }, intervalMs) + timer.unref?.() + } + + const release = async () => { + if (timer) { + clearInterval(timer) + timer = undefined + } + + const current = await readFile(metaPath, "utf8") + .then((raw) => { + const parsed = JSON.parse(raw) + if (!parsed || typeof parsed !== "object") return {} + return { + token: "token" in parsed && typeof parsed.token === "string" ? parsed.token : undefined, + } + }) + .catch((err) => { + const errCode = code(err) + if (errCode === "ENOENT" || errCode === "ENOTDIR") { + throw new Error("Refusing to release: lock is compromised (metadata missing).") + } + if (err instanceof SyntaxError) { + throw new Error("Refusing to release: lock is compromised (metadata invalid).") + } + throw err + }) + // Token check prevents deleting a lock that was re-acquired by another process. + if (current.token !== token) { + throw new Error("Refusing to release: lock token mismatch (not the owner).") + } + + await rm(lockDir, { recursive: true, force: true }) + } + + return { + acquired: true, + startHeartbeat, + release, + } + } + + async function acquireLockDir( + lockDir: string, + input: { key: string; onWait?: Wait; signal?: AbortSignal }, + opts: Opts, + ) { + const stop = mono() + opts.timeoutMs + let attempt = 0 + let waited = 0 + let delay = opts.baseDelayMs + + while (true) { + input.signal?.throwIfAborted() + + const res = await tryAcquireLockDir(lockDir, opts) + if (res.acquired) { + return res + } + + if (mono() > stop) { + throw new Error(`Timed out waiting for lock: ${input.key}`) + } + + attempt += 1 + const ms = jitter(delay) + await input.onWait?.({ + key: input.key, + attempt, + delay: ms, + waited, + }) + await sleep(ms, input.signal) + waited += ms + delay = Math.min(opts.maxDelayMs, Math.floor(delay * 1.7)) + } + } + + export async function acquire(key: string, input: Options = {}): Promise { + input.signal?.throwIfAborted() + const cfg: Opts = { + staleMs: input.staleMs ?? defaultOpts.staleMs, + timeoutMs: input.timeoutMs ?? defaultOpts.timeoutMs, + baseDelayMs: input.baseDelayMs ?? defaultOpts.baseDelayMs, + maxDelayMs: input.maxDelayMs ?? defaultOpts.maxDelayMs, + } + const dir = input.dir ?? root + + await mkdir(dir, { recursive: true }) + const lockfile = path.join(dir, Hash.fast(key) + ".lock") + const lock = await acquireLockDir( + lockfile, + { + key, + onWait: input.onWait, + signal: input.signal, + }, + cfg, + ) + lock.startHeartbeat() + + const release = () => lock.release() + return { + release, + [Symbol.asyncDispose]() { + return release() + }, + } + } + + export async function withLock(key: string, fn: () => Promise, input: Options = {}) { + await using _ = await acquire(key, input) + input.signal?.throwIfAborted() + return await fn() + } +} diff --git a/packages/opencode/src/util/proxied.ts b/packages/opencode/src/util/network.ts similarity index 50% rename from packages/opencode/src/util/proxied.ts rename to packages/opencode/src/util/network.ts index 440a9ccced..69e5d17588 100644 --- a/packages/opencode/src/util/proxied.ts +++ b/packages/opencode/src/util/network.ts @@ -1,3 +1,9 @@ +export function online() { + const nav = globalThis.navigator + if (!nav || typeof nav.onLine !== "boolean") return true + return nav.onLine +} + export function proxied() { return !!(process.env.HTTP_PROXY || process.env.HTTPS_PROXY || process.env.http_proxy || process.env.https_proxy) } diff --git a/packages/opencode/src/util/process.ts b/packages/opencode/src/util/process.ts index 22dce37cb0..1230ed3236 100644 --- a/packages/opencode/src/util/process.ts +++ b/packages/opencode/src/util/process.ts @@ -1,6 +1,7 @@ import { type ChildProcess } from "child_process" import launch from "cross-spawn" import { buffer } from "node:stream/consumers" +import { errorMessage } from "./error" export namespace Process { export type Stdio = "inherit" | "pipe" | "ignore" @@ -136,7 +137,7 @@ export namespace Process { return { code: 1, stdout: Buffer.alloc(0), - stderr: Buffer.from(err instanceof Error ? err.message : String(err)), + stderr: Buffer.from(errorMessage(err)), } }) if (out.code === 0 || opts.nothrow) return out diff --git a/packages/opencode/src/util/record.ts b/packages/opencode/src/util/record.ts new file mode 100644 index 0000000000..495927463b --- /dev/null +++ b/packages/opencode/src/util/record.ts @@ -0,0 +1,3 @@ +export function isRecord(value: unknown): value is Record { + return !!value && typeof value === "object" && !Array.isArray(value) +} diff --git a/packages/opencode/src/worktree/index.ts b/packages/opencode/src/worktree/index.ts index 0a8ce5ea22..7087ac2627 100644 --- a/packages/opencode/src/worktree/index.ts +++ b/packages/opencode/src/worktree/index.ts @@ -9,6 +9,7 @@ import { ProjectTable } from "../project/project.sql" import type { ProjectID } from "../project/schema" import { Log } from "../util/log" import { Slug } from "@opencode-ai/util/slug" +import { errorMessage } from "../util/error" import { BusEvent } from "@/bus/bus-event" import { GlobalBus } from "@/bus/global" import { Effect, Layer, Path, Scope, ServiceMap, Stream } from "effect" @@ -260,7 +261,7 @@ export namespace Worktree { }) .then(() => true) .catch((error) => { - const message = error instanceof Error ? error.message : String(error) + const message = errorMessage(error) log.error("worktree bootstrap failed", { directory: info.directory, message }) GlobalBus.emit("event", { directory: info.directory, @@ -344,9 +345,12 @@ export namespace Worktree { function cleanDirectory(target: string) { return Effect.promise(() => - import("fs/promises").then((fsp) => - fsp.rm(target, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 }), - ), + import("fs/promises") + .then((fsp) => fsp.rm(target, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 })) + .catch((error) => { + const message = errorMessage(error) + throw new RemoveFailedError({ message: message || "Failed to remove git worktree directory" }) + }), ) } diff --git a/packages/opencode/test/cli/tui/keybind-plugin.test.ts b/packages/opencode/test/cli/tui/keybind-plugin.test.ts new file mode 100644 index 0000000000..7cd4c87a73 --- /dev/null +++ b/packages/opencode/test/cli/tui/keybind-plugin.test.ts @@ -0,0 +1,90 @@ +import { describe, expect, test } from "bun:test" +import type { ParsedKey } from "@opentui/core" +import { createPluginKeybind } from "../../../src/cli/cmd/tui/context/plugin-keybinds" + +describe("createPluginKeybind", () => { + const defaults = { + open: "ctrl+o", + close: "escape", + } + + test("uses defaults when overrides are missing", () => { + const api = { + match: () => false, + print: (key: string) => key, + } + const bind = createPluginKeybind(api, defaults) + + expect(bind.all).toEqual(defaults) + expect(bind.get("open")).toBe("ctrl+o") + expect(bind.get("close")).toBe("escape") + }) + + test("applies valid overrides", () => { + const api = { + match: () => false, + print: (key: string) => key, + } + const bind = createPluginKeybind(api, defaults, { + open: "ctrl+alt+o", + close: "q", + }) + + expect(bind.all).toEqual({ + open: "ctrl+alt+o", + close: "q", + }) + }) + + test("ignores invalid overrides", () => { + const api = { + match: () => false, + print: (key: string) => key, + } + const bind = createPluginKeybind(api, defaults, { + open: " ", + close: 1, + extra: "ctrl+x", + }) + + expect(bind.all).toEqual(defaults) + expect(bind.get("extra")).toBe("extra") + }) + + test("resolves names for match", () => { + const list: string[] = [] + const api = { + match: (key: string) => { + list.push(key) + return true + }, + print: (key: string) => key, + } + const bind = createPluginKeybind(api, defaults, { + open: "ctrl+shift+o", + }) + + bind.match("open", { name: "x" } as ParsedKey) + bind.match("ctrl+k", { name: "x" } as ParsedKey) + + expect(list).toEqual(["ctrl+shift+o", "ctrl+k"]) + }) + + test("resolves names for print", () => { + const list: string[] = [] + const api = { + match: () => false, + print: (key: string) => { + list.push(key) + return `print:${key}` + }, + } + const bind = createPluginKeybind(api, defaults, { + close: "q", + }) + + expect(bind.print("close")).toBe("print:q") + expect(bind.print("ctrl+p")).toBe("print:ctrl+p") + expect(list).toEqual(["q", "ctrl+p"]) + }) +}) diff --git a/packages/opencode/test/cli/tui/plugin-add.test.ts b/packages/opencode/test/cli/tui/plugin-add.test.ts new file mode 100644 index 0000000000..d6ff4fc6cb --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-add.test.ts @@ -0,0 +1,61 @@ +import { expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { TuiConfig } from "../../../src/config/tui" + +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +test("adds tui plugin at runtime from spec", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "add-plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "add.txt") + + await Bun.write( + file, + `export default { + id: "demo.add", + tui: async () => { + await Bun.write(${JSON.stringify(marker)}, "called") + }, +} +`, + ) + + return { spec, marker } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [], + plugin_meta: undefined, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + + await expect(TuiPluginRuntime.addPlugin(tmp.extra.spec)).resolves.toBe(true) + await expect(fs.readFile(tmp.extra.marker, "utf8")).resolves.toBe("called") + expect(TuiPluginRuntime.list().find((item) => item.id === "demo.add")).toEqual({ + id: "demo.add", + source: "file", + spec: tmp.extra.spec, + target: tmp.extra.spec, + enabled: true, + active: true, + }) + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) diff --git a/packages/opencode/test/cli/tui/plugin-install.test.ts b/packages/opencode/test/cli/tui/plugin-install.test.ts new file mode 100644 index 0000000000..a2477cc79e --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-install.test.ts @@ -0,0 +1,95 @@ +import { expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { TuiConfig } from "../../../src/config/tui" + +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +test("installs plugin without loading it", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "install-plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "install.txt") + + await Bun.write( + path.join(dir, "package.json"), + JSON.stringify( + { + name: "demo-install-plugin", + type: "module", + main: "./install-plugin.ts", + "oc-plugin": [["tui", { marker }]], + }, + null, + 2, + ), + ) + + await Bun.write( + file, + `export default { + id: "demo.install", + tui: async (_api, options) => { + if (!options?.marker) return + await Bun.write(options.marker, "loaded") + }, +} +`, + ) + + return { spec, marker } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + let cfg: Awaited> = { + plugin: [], + plugin_meta: undefined, + } + const get = spyOn(TuiConfig, "get").mockImplementation(async () => cfg) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + const api = createTuiPluginApi({ + state: { + path: { + state: path.join(tmp.path, "state.json"), + config: path.join(tmp.path, "tui.json"), + worktree: tmp.path, + directory: tmp.path, + }, + }, + }) + + try { + await TuiPluginRuntime.init(api) + cfg = { + plugin: [[tmp.extra.spec, { marker: tmp.extra.marker }]], + plugin_meta: { + [tmp.extra.spec]: { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }, + } + + const out = await TuiPluginRuntime.installPlugin(tmp.extra.spec) + expect(out).toMatchObject({ + ok: true, + tui: true, + }) + + await expect(fs.readFile(tmp.extra.marker, "utf8")).rejects.toThrow() + await expect(TuiPluginRuntime.addPlugin(tmp.extra.spec)).resolves.toBe(true) + await expect(fs.readFile(tmp.extra.marker, "utf8")).resolves.toBe("loaded") + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) diff --git a/packages/opencode/test/cli/tui/plugin-lifecycle.test.ts b/packages/opencode/test/cli/tui/plugin-lifecycle.test.ts new file mode 100644 index 0000000000..9c868a4c99 --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-lifecycle.test.ts @@ -0,0 +1,225 @@ +import { expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { mockTuiRuntime } from "../../fixture/tui-runtime" +import { TuiConfig } from "../../../src/config/tui" + +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +test("runs onDispose callbacks with aborted signal and is idempotent", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "marker.txt") + + await Bun.write( + file, + `export default { + id: "demo.lifecycle", + tui: async (api, options) => { + api.event.on("event.test", () => {}) + api.route.register([{ name: "lifecycle.route", render: () => null }]) + api.lifecycle.onDispose(async () => { + const prev = await Bun.file(options.marker).text().catch(() => "") + await Bun.write(options.marker, prev + "custom\\n") + }) + api.lifecycle.onDispose(async () => { + const prev = await Bun.file(options.marker).text().catch(() => "") + await Bun.write(options.marker, prev + "aborted:" + String(api.lifecycle.signal.aborted) + "\\n") + }) + }, +} +`, + ) + + return { spec, marker } + }, + }) + + const restore = mockTuiRuntime(tmp.path, [[tmp.extra.spec, { marker: tmp.extra.marker }]]) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + await TuiPluginRuntime.dispose() + + const marker = await fs.readFile(tmp.extra.marker, "utf8") + expect(marker).toContain("custom") + expect(marker).toContain("aborted:true") + + // second dispose is a no-op + await TuiPluginRuntime.dispose() + const after = await fs.readFile(tmp.extra.marker, "utf8") + expect(after).toBe(marker) + } finally { + await TuiPluginRuntime.dispose() + restore() + } +}) + +test("rolls back failed plugin and continues loading next", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const bad = path.join(dir, "bad-plugin.ts") + const good = path.join(dir, "good-plugin.ts") + const badSpec = pathToFileURL(bad).href + const goodSpec = pathToFileURL(good).href + const badMarker = path.join(dir, "bad-cleanup.txt") + const goodMarker = path.join(dir, "good-called.txt") + + await Bun.write( + bad, + `export default { + id: "demo.bad", + tui: async (api, options) => { + api.route.register([{ name: "bad.route", render: () => null }]) + api.lifecycle.onDispose(async () => { + await Bun.write(options.bad_marker, "cleaned") + }) + throw new Error("bad plugin") + }, +} +`, + ) + + await Bun.write( + good, + `export default { + id: "demo.good", + tui: async (_api, options) => { + await Bun.write(options.good_marker, "called") + }, +} +`, + ) + + return { badSpec, goodSpec, badMarker, goodMarker } + }, + }) + + const restore = mockTuiRuntime(tmp.path, [ + [tmp.extra.badSpec, { bad_marker: tmp.extra.badMarker }], + [tmp.extra.goodSpec, { good_marker: tmp.extra.goodMarker }], + ]) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + // bad plugin's onDispose ran during rollback + await expect(fs.readFile(tmp.extra.badMarker, "utf8")).resolves.toBe("cleaned") + // good plugin still loaded + await expect(fs.readFile(tmp.extra.goodMarker, "utf8")).resolves.toBe("called") + } finally { + await TuiPluginRuntime.dispose() + restore() + } +}) + +test("assigns sequential slot ids scoped to plugin", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "slot-plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "slot-setup.txt") + + await Bun.write( + file, + `import fs from "fs" + +const mark = (label) => { + fs.appendFileSync(${JSON.stringify(marker)}, label + "\\n") +} + +export default { + id: "demo.slot", + tui: async (api) => { + const one = api.slots.register({ + id: 1, + setup: () => { mark("one") }, + slots: { home_logo() { return null } }, + }) + const two = api.slots.register({ + id: 2, + setup: () => { mark("two") }, + slots: { home_bottom() { return null } }, + }) + mark("id:" + one) + mark("id:" + two) + }, +} +`, + ) + + return { spec, marker } + }, + }) + + const restore = mockTuiRuntime(tmp.path, [tmp.extra.spec]) + const err = spyOn(console, "error").mockImplementation(() => {}) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + + const marker = await fs.readFile(tmp.extra.marker, "utf8") + expect(marker).toContain("one") + expect(marker).toContain("two") + expect(marker).toContain("id:demo.slot") + expect(marker).toContain("id:demo.slot:1") + + // no initialization failures + const hit = err.mock.calls.find( + (item) => typeof item[0] === "string" && item[0].includes("failed to initialize tui plugin"), + ) + expect(hit).toBeUndefined() + } finally { + await TuiPluginRuntime.dispose() + err.mockRestore() + restore() + } +}) + +test( + "times out hanging plugin cleanup on dispose", + async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "timeout-plugin.ts") + const spec = pathToFileURL(file).href + + await Bun.write( + file, + `export default { + id: "demo.timeout", + tui: async (api) => { + api.lifecycle.onDispose(() => new Promise(() => {})) + }, +} +`, + ) + + return { spec } + }, + }) + + const restore = mockTuiRuntime(tmp.path, [tmp.extra.spec]) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + + const done = await new Promise((resolve) => { + const timer = setTimeout(() => resolve("timeout"), 7000) + TuiPluginRuntime.dispose().then(() => { + clearTimeout(timer) + resolve("done") + }) + }) + expect(done).toBe("done") + } finally { + await TuiPluginRuntime.dispose() + restore() + } + }, + { timeout: 15000 }, +) diff --git a/packages/opencode/test/cli/tui/plugin-loader-entrypoint.test.ts b/packages/opencode/test/cli/tui/plugin-loader-entrypoint.test.ts new file mode 100644 index 0000000000..e9b1135f06 --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-loader-entrypoint.test.ts @@ -0,0 +1,132 @@ +import { expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { TuiConfig } from "../../../src/config/tui" +import { BunProc } from "../../../src/bun" + +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +test("loads npm tui plugin from package ./tui export", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const mod = path.join(dir, "mods", "acme-plugin") + const marker = path.join(dir, "tui-called.txt") + await fs.mkdir(mod, { recursive: true }) + + await Bun.write( + path.join(mod, "package.json"), + JSON.stringify({ + name: "acme-plugin", + type: "module", + exports: { ".": "./index.js", "./server": "./server.js", "./tui": "./tui.js" }, + }), + ) + await Bun.write(path.join(mod, "index.js"), 'import "./main-throws.js"\nexport default {}\n') + await Bun.write(path.join(mod, "main-throws.js"), 'throw new Error("main loaded")\n') + await Bun.write(path.join(mod, "server.js"), "export default {}\n") + await Bun.write( + path.join(mod, "tui.js"), + `export default { + id: "demo.tui.export", + tui: async (_api, options) => { + if (!options?.marker) return + await Bun.write(${JSON.stringify(marker)}, "called") + }, +} +`, + ) + + return { mod, marker, spec: "acme-plugin@1.0.0" } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [[tmp.extra.spec, { marker: tmp.extra.marker }]], + plugin_meta: { + [tmp.extra.spec]: { scope: "local", source: path.join(tmp.path, "tui.json") }, + }, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + const install = spyOn(BunProc, "install").mockResolvedValue(tmp.extra.mod) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + await expect(fs.readFile(tmp.extra.marker, "utf8")).resolves.toBe("called") + const hit = TuiPluginRuntime.list().find((item) => item.id === "demo.tui.export") + expect(hit?.enabled).toBe(true) + expect(hit?.active).toBe(true) + expect(hit?.source).toBe("npm") + } finally { + await TuiPluginRuntime.dispose() + install.mockRestore() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) + +test("rejects npm tui export that resolves outside plugin directory", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const mod = path.join(dir, "mods", "acme-plugin") + const outside = path.join(dir, "outside") + const marker = path.join(dir, "outside-called.txt") + await fs.mkdir(mod, { recursive: true }) + await fs.mkdir(outside, { recursive: true }) + + await Bun.write( + path.join(mod, "package.json"), + JSON.stringify({ + name: "acme-plugin", + type: "module", + exports: { ".": "./index.js", "./tui": "./escape/tui.js" }, + }), + ) + await Bun.write(path.join(mod, "index.js"), "export default {}\n") + await Bun.write( + path.join(outside, "tui.js"), + `export default { + id: "demo.outside", + tui: async () => { + await Bun.write(${JSON.stringify(marker)}, "outside") + }, +} +`, + ) + await fs.symlink(outside, path.join(mod, "escape"), process.platform === "win32" ? "junction" : "dir") + + return { mod, marker, spec: "acme-plugin@1.0.0" } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [tmp.extra.spec], + plugin_meta: { + [tmp.extra.spec]: { scope: "local", source: path.join(tmp.path, "tui.json") }, + }, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + const install = spyOn(BunProc, "install").mockResolvedValue(tmp.extra.mod) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + // plugin code never ran + await expect(fs.readFile(tmp.extra.marker, "utf8")).rejects.toThrow() + // plugin not listed + expect(TuiPluginRuntime.list().some((item) => item.spec === tmp.extra.spec)).toBe(false) + } finally { + await TuiPluginRuntime.dispose() + install.mockRestore() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) diff --git a/packages/opencode/test/cli/tui/plugin-loader-pure.test.ts b/packages/opencode/test/cli/tui/plugin-loader-pure.test.ts new file mode 100644 index 0000000000..ef8f05c087 --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-loader-pure.test.ts @@ -0,0 +1,71 @@ +import { expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { TuiConfig } from "../../../src/config/tui" + +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +test("skips external tui plugins in pure mode", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "called.txt") + const meta = path.join(dir, "plugin-meta.json") + + await Bun.write( + file, + `export default { + id: "demo.pure", + tui: async (_api, options) => { + if (!options?.marker) return + await Bun.write(options.marker, "called") + }, +} +`, + ) + + return { spec, marker, meta } + }, + }) + + const pure = process.env.OPENCODE_PURE + const meta = process.env.OPENCODE_PLUGIN_META_FILE + process.env.OPENCODE_PURE = "1" + process.env.OPENCODE_PLUGIN_META_FILE = tmp.extra.meta + + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [[tmp.extra.spec, { marker: tmp.extra.marker }]], + plugin_meta: { + [tmp.extra.spec]: { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + await expect(fs.readFile(tmp.extra.marker, "utf8")).rejects.toThrow() + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + if (pure === undefined) { + delete process.env.OPENCODE_PURE + } else { + process.env.OPENCODE_PURE = pure + } + if (meta === undefined) { + delete process.env.OPENCODE_PLUGIN_META_FILE + } else { + process.env.OPENCODE_PLUGIN_META_FILE = meta + } + } +}) diff --git a/packages/opencode/test/cli/tui/plugin-loader.test.ts b/packages/opencode/test/cli/tui/plugin-loader.test.ts new file mode 100644 index 0000000000..9e72754975 --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-loader.test.ts @@ -0,0 +1,563 @@ +import { beforeAll, describe, expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { Global } from "../../../src/global" +import { TuiConfig } from "../../../src/config/tui" +import { Config } from "../../../src/config/config" +import { Filesystem } from "../../../src/util/filesystem" + +const { allThemes, addTheme } = await import("../../../src/cli/cmd/tui/context/theme") +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +type Row = Record + +type Data = { + local: Row + global: Row + invalid: Row + preloaded: Row + fn_called: boolean + local_installed: string + global_installed: string + preloaded_installed: string + leaked_local_to_global: boolean + leaked_global_to_local: boolean + local_theme: string + global_theme: string +} + +async function row(file: string): Promise { + return Filesystem.readJson(file) +} + +async function load(): Promise { + const stamp = Date.now() + const globalConfigPath = path.join(Global.Path.config, "tui.json") + const backup = await Bun.file(globalConfigPath) + .text() + .catch(() => undefined) + + await using tmp = await tmpdir({ + init: async (dir) => { + const localPluginPath = path.join(dir, "local-plugin.ts") + const invalidPluginPath = path.join(dir, "invalid-plugin.ts") + const preloadedPluginPath = path.join(dir, "preloaded-plugin.ts") + const globalPluginPath = path.join(dir, "global-plugin.ts") + const localSpec = pathToFileURL(localPluginPath).href + const invalidSpec = pathToFileURL(invalidPluginPath).href + const preloadedSpec = pathToFileURL(preloadedPluginPath).href + const globalSpec = pathToFileURL(globalPluginPath).href + const localThemeFile = `local-theme-${stamp}.json` + const invalidThemeFile = `invalid-theme-${stamp}.json` + const globalThemeFile = `global-theme-${stamp}.json` + const preloadedThemeFile = `preloaded-theme-${stamp}.json` + const localThemeName = localThemeFile.replace(/\.json$/, "") + const invalidThemeName = invalidThemeFile.replace(/\.json$/, "") + const globalThemeName = globalThemeFile.replace(/\.json$/, "") + const preloadedThemeName = preloadedThemeFile.replace(/\.json$/, "") + const localThemePath = path.join(dir, localThemeFile) + const invalidThemePath = path.join(dir, invalidThemeFile) + const globalThemePath = path.join(dir, globalThemeFile) + const preloadedThemePath = path.join(dir, preloadedThemeFile) + const localDest = path.join(dir, ".opencode", "themes", localThemeFile) + const globalDest = path.join(Global.Path.config, "themes", globalThemeFile) + const preloadedDest = path.join(dir, ".opencode", "themes", preloadedThemeFile) + const fnMarker = path.join(dir, "function-called.txt") + const localMarker = path.join(dir, "local-called.json") + const invalidMarker = path.join(dir, "invalid-called.json") + const globalMarker = path.join(dir, "global-called.json") + const preloadedMarker = path.join(dir, "preloaded-called.json") + const localConfigPath = path.join(dir, "tui.json") + + await Bun.write(localThemePath, JSON.stringify({ theme: { primary: "#101010" } }, null, 2)) + await Bun.write(invalidThemePath, "{ invalid json }") + await Bun.write(globalThemePath, JSON.stringify({ theme: { primary: "#202020" } }, null, 2)) + await Bun.write(preloadedThemePath, JSON.stringify({ theme: { primary: "#f0f0f0" } }, null, 2)) + await Bun.write(preloadedDest, JSON.stringify({ theme: { primary: "#303030" } }, null, 2)) + + await Bun.write( + localPluginPath, + `export const ignored = async (_input, options) => { + if (!options?.fn_marker) return + await Bun.write(options.fn_marker, "called") +} + +export default { + id: "demo.local", + tui: async (api, options) => { + if (!options?.marker) return + const cfg_theme = api.tuiConfig.theme + const cfg_diff = api.tuiConfig.diff_style + const cfg_speed = api.tuiConfig.scroll_speed + const cfg_accel = api.tuiConfig.scroll_acceleration?.enabled + const cfg_submit = api.tuiConfig.keybinds?.input_submit + const key = api.keybind.create( + { modal: "ctrl+shift+m", screen: "ctrl+shift+o", close: "escape" }, + options.keybinds, + ) + const kv_before = api.kv.get(options.kv_key, "missing") + api.kv.set(options.kv_key, "stored") + const kv_after = api.kv.get(options.kv_key, "missing") + const diff = api.state.session.diff(options.session_id) + const todo = api.state.session.todo(options.session_id) + const lsp = api.state.lsp() + const mcp = api.state.mcp() + const depth_before = api.ui.dialog.depth + const open_before = api.ui.dialog.open + const size_before = api.ui.dialog.size + api.ui.dialog.setSize("large") + const size_after = api.ui.dialog.size + api.ui.dialog.replace(() => null) + const depth_after = api.ui.dialog.depth + const open_after = api.ui.dialog.open + api.ui.dialog.clear() + const open_clear = api.ui.dialog.open + const before = api.theme.has(options.theme_name) + const set_missing = api.theme.set(options.theme_name) + await api.theme.install(options.theme_path) + const after = api.theme.has(options.theme_name) + const set_installed = api.theme.set(options.theme_name) + const first = await Bun.file(options.dest).text() + await Bun.write(options.source, JSON.stringify({ theme: { primary: "#fefefe" } }, null, 2)) + await api.theme.install(options.theme_path) + const second = await Bun.file(options.dest).text() + await Bun.write( + options.marker, + JSON.stringify({ + before, + set_missing, + after, + set_installed, + selected: api.theme.selected, + same: first === second, + key_modal: key.get("modal"), + key_close: key.get("close"), + key_unknown: key.get("ctrl+k"), + key_print: key.print("modal"), + kv_before, + kv_after, + kv_ready: api.kv.ready, + diff_count: diff.length, + diff_file: diff[0]?.file, + todo_count: todo.length, + todo_first: todo[0]?.content, + lsp_count: lsp.length, + mcp_count: mcp.length, + mcp_first: mcp[0]?.name, + depth_before, + open_before, + size_before, + size_after, + depth_after, + open_after, + open_clear, + cfg_theme, + cfg_diff, + cfg_speed, + cfg_accel, + cfg_submit, + }), + ) + }, +} +`, + ) + + await Bun.write( + invalidPluginPath, + `export default { + id: "demo.invalid", + tui: async (api, options) => { + if (!options?.marker) return + const before = api.theme.has(options.theme_name) + const set_missing = api.theme.set(options.theme_name) + await api.theme.install(options.theme_path) + const after = api.theme.has(options.theme_name) + const set_installed = api.theme.set(options.theme_name) + await Bun.write( + options.marker, + JSON.stringify({ + before, + set_missing, + after, + set_installed, + }), + ) + }, +} +`, + ) + + await Bun.write( + preloadedPluginPath, + `export default { + id: "demo.preloaded", + tui: async (api, options) => { + if (!options?.marker) return + const before = api.theme.has(options.theme_name) + await api.theme.install(options.theme_path) + const after = api.theme.has(options.theme_name) + const text = await Bun.file(options.dest).text() + await Bun.write( + options.marker, + JSON.stringify({ + before, + after, + text, + }), + ) + }, +} +`, + ) + + await Bun.write( + globalPluginPath, + `export default { + id: "demo.global", + tui: async (api, options) => { + if (!options?.marker) return + await api.theme.install(options.theme_path) + const has = api.theme.has(options.theme_name) + const set_installed = api.theme.set(options.theme_name) + await Bun.write( + options.marker, + JSON.stringify({ + has, + set_installed, + selected: api.theme.selected, + }), + ) + }, +} +`, + ) + + await Bun.write( + globalConfigPath, + JSON.stringify( + { + plugin: [ + [globalSpec, { marker: globalMarker, theme_path: `./${globalThemeFile}`, theme_name: globalThemeName }], + ], + }, + null, + 2, + ), + ) + + await Bun.write( + localConfigPath, + JSON.stringify( + { + plugin: [ + [ + localSpec, + { + fn_marker: fnMarker, + marker: localMarker, + source: localThemePath, + dest: localDest, + theme_path: `./${localThemeFile}`, + theme_name: localThemeName, + kv_key: "plugin_state_key", + session_id: "ses_test", + keybinds: { + modal: "ctrl+alt+m", + close: "q", + }, + }, + ], + [ + invalidSpec, + { + marker: invalidMarker, + theme_path: `./${invalidThemeFile}`, + theme_name: invalidThemeName, + }, + ], + [ + preloadedSpec, + { + marker: preloadedMarker, + dest: preloadedDest, + theme_path: `./${preloadedThemeFile}`, + theme_name: preloadedThemeName, + }, + ], + ], + }, + null, + 2, + ), + ) + + return { + localThemeFile, + invalidThemeFile, + globalThemeFile, + preloadedThemeFile, + localThemeName, + invalidThemeName, + globalThemeName, + preloadedThemeName, + localDest, + globalDest, + preloadedDest, + localPluginPath, + invalidPluginPath, + globalPluginPath, + preloadedPluginPath, + localSpec, + invalidSpec, + globalSpec, + preloadedSpec, + fnMarker, + localMarker, + invalidMarker, + globalMarker, + preloadedMarker, + } + }, + }) + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const install = spyOn(Config, "installDependencies").mockResolvedValue() + + try { + expect(addTheme(tmp.extra.preloadedThemeName, { theme: { primary: "#303030" } })).toBe(true) + + await TuiPluginRuntime.init( + createTuiPluginApi({ + tuiConfig: { + theme: "smoke", + diff_style: "stacked", + scroll_speed: 1.5, + scroll_acceleration: { enabled: true }, + keybinds: { + input_submit: "ctrl+enter", + }, + }, + keybind: { + print: (key) => `print:${key}`, + }, + state: { + session: { + diff(sessionID) { + if (sessionID !== "ses_test") return [] + return [{ file: "src/app.ts", additions: 3, deletions: 1 }] + }, + todo(sessionID) { + if (sessionID !== "ses_test") return [] + return [{ content: "ship it", status: "pending" }] + }, + }, + lsp() { + return [{ id: "ts", root: "/tmp/project", status: "connected" }] + }, + mcp() { + return [{ name: "github", status: "connected" }] + }, + }, + theme: { + has(name) { + return allThemes()[name] !== undefined + }, + }, + }), + ) + const local = await row(tmp.extra.localMarker) + const global = await row(tmp.extra.globalMarker) + const invalid = await row(tmp.extra.invalidMarker) + const preloaded = await row(tmp.extra.preloadedMarker) + const fn_called = await fs + .readFile(tmp.extra.fnMarker, "utf8") + .then(() => true) + .catch(() => false) + const local_installed = await fs.readFile(tmp.extra.localDest, "utf8") + const global_installed = await fs.readFile(tmp.extra.globalDest, "utf8") + const preloaded_installed = await fs.readFile(tmp.extra.preloadedDest, "utf8") + const leaked_local_to_global = await fs + .stat(path.join(Global.Path.config, "themes", tmp.extra.localThemeFile)) + .then(() => true) + .catch(() => false) + const leaked_global_to_local = await fs + .stat(path.join(tmp.path, ".opencode", "themes", tmp.extra.globalThemeFile)) + .then(() => true) + .catch(() => false) + + return { + local, + global, + invalid, + preloaded, + fn_called, + local_installed, + global_installed, + preloaded_installed, + leaked_local_to_global, + leaked_global_to_local, + local_theme: tmp.extra.localThemeName, + global_theme: tmp.extra.globalThemeName, + } + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + wait.mockRestore() + install.mockRestore() + if (backup === undefined) { + await fs.rm(globalConfigPath, { force: true }) + } else { + await Bun.write(globalConfigPath, backup) + } + await fs.rm(tmp.extra.globalDest, { force: true }).catch(() => {}) + } +} + +test("continues loading when a plugin is missing config metadata", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const bad = path.join(dir, "missing-meta-plugin.ts") + const good = path.join(dir, "next-plugin.ts") + const bare = path.join(dir, "plain-plugin.ts") + const badSpec = pathToFileURL(bad).href + const goodSpec = pathToFileURL(good).href + const bareSpec = pathToFileURL(bare).href + const goodMarker = path.join(dir, "next-called.txt") + const bareMarker = path.join(dir, "plain-called.txt") + + for (const [file, id] of [ + [bad, "demo.missing-meta"], + [good, "demo.next"], + ] as const) { + await Bun.write( + file, + `export default { + id: "${id}", + tui: async (_api, options) => { + if (!options?.marker) return + await Bun.write(options.marker, "called") + }, +} +`, + ) + } + + await Bun.write( + bare, + `export default { + id: "demo.plain", + tui: async (_api, options) => { + await Bun.write(${JSON.stringify(bareMarker)}, options === undefined ? "undefined" : "value") + }, +} +`, + ) + + return { badSpec, goodSpec, bareSpec, goodMarker, bareMarker } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [ + [tmp.extra.badSpec, { marker: path.join(tmp.path, "bad.txt") }], + [tmp.extra.goodSpec, { marker: tmp.extra.goodMarker }], + tmp.extra.bareSpec, + ], + plugin_meta: { + [tmp.extra.goodSpec]: { scope: "local", source: path.join(tmp.path, "tui.json") }, + [tmp.extra.bareSpec]: { scope: "local", source: path.join(tmp.path, "tui.json") }, + }, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + + try { + await TuiPluginRuntime.init(createTuiPluginApi()) + // bad plugin was skipped (no metadata entry) + await expect(fs.readFile(path.join(tmp.path, "bad.txt"), "utf8")).rejects.toThrow() + // good plugin loaded fine + await expect(fs.readFile(tmp.extra.goodMarker, "utf8")).resolves.toBe("called") + // bare string spec gets undefined options + await expect(fs.readFile(tmp.extra.bareMarker, "utf8")).resolves.toBe("undefined") + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) + +describe("tui.plugin.loader", () => { + let data: Data + + beforeAll(async () => { + data = await load() + }) + + test("passes keybind, kv, state, and dialog APIs to v1 plugins", () => { + expect(data.local.key_modal).toBe("ctrl+alt+m") + expect(data.local.key_close).toBe("q") + expect(data.local.key_unknown).toBe("ctrl+k") + expect(data.local.key_print).toBe("print:ctrl+alt+m") + expect(data.local.kv_before).toBe("missing") + expect(data.local.kv_after).toBe("stored") + expect(data.local.kv_ready).toBe(true) + expect(data.local.diff_count).toBe(1) + expect(data.local.diff_file).toBe("src/app.ts") + expect(data.local.todo_count).toBe(1) + expect(data.local.todo_first).toBe("ship it") + expect(data.local.lsp_count).toBe(1) + expect(data.local.mcp_count).toBe(1) + expect(data.local.mcp_first).toBe("github") + expect(data.local.depth_before).toBe(0) + expect(data.local.open_before).toBe(false) + expect(data.local.size_before).toBe("medium") + expect(data.local.size_after).toBe("large") + expect(data.local.depth_after).toBe(1) + expect(data.local.open_after).toBe(true) + expect(data.local.open_clear).toBe(false) + expect(data.local.cfg_theme).toBe("smoke") + expect(data.local.cfg_diff).toBe("stacked") + expect(data.local.cfg_speed).toBe(1.5) + expect(data.local.cfg_accel).toBe(true) + expect(data.local.cfg_submit).toBe("ctrl+enter") + }) + + test("installs themes in the correct scope and remains resilient", () => { + expect(data.local.before).toBe(false) + expect(data.local.set_missing).toBe(false) + expect(data.local.after).toBe(true) + expect(data.local.set_installed).toBe(true) + expect(data.local.selected).toBe(data.local_theme) + expect(data.local.same).toBe(true) + + expect(data.global.has).toBe(true) + expect(data.global.set_installed).toBe(true) + expect(data.global.selected).toBe(data.global_theme) + + expect(data.invalid.before).toBe(false) + expect(data.invalid.set_missing).toBe(false) + expect(data.invalid.after).toBe(false) + expect(data.invalid.set_installed).toBe(false) + + expect(data.preloaded.before).toBe(true) + expect(data.preloaded.after).toBe(true) + expect(data.preloaded.text).toContain("#303030") + expect(data.preloaded.text).not.toContain("#f0f0f0") + + expect(data.fn_called).toBe(false) + expect(data.local_installed).toContain("#101010") + expect(data.local_installed).not.toContain("#fefefe") + expect(data.global_installed).toContain("#202020") + expect(data.preloaded_installed).toContain("#303030") + expect(data.preloaded_installed).not.toContain("#f0f0f0") + expect(data.leaked_local_to_global).toBe(false) + expect(data.leaked_global_to_local).toBe(false) + }) +}) diff --git a/packages/opencode/test/cli/tui/plugin-toggle.test.ts b/packages/opencode/test/cli/tui/plugin-toggle.test.ts new file mode 100644 index 0000000000..c407d11171 --- /dev/null +++ b/packages/opencode/test/cli/tui/plugin-toggle.test.ts @@ -0,0 +1,157 @@ +import { expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../../fixture/fixture" +import { createTuiPluginApi } from "../../fixture/tui-plugin" +import { TuiConfig } from "../../../src/config/tui" + +const { TuiPluginRuntime } = await import("../../../src/cli/cmd/tui/plugin/runtime") + +test("toggles plugin runtime state by exported id", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "toggle-plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "toggle.txt") + + await Bun.write( + file, + `export default { + id: "demo.toggle", + tui: async (api, options) => { + const text = await Bun.file(options.marker).text().catch(() => "") + await Bun.write(options.marker, text + "start\\n") + api.lifecycle.onDispose(async () => { + const next = await Bun.file(options.marker).text().catch(() => "") + await Bun.write(options.marker, next + "stop\\n") + }) + }, +} +`, + ) + + return { + spec, + marker, + } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [[tmp.extra.spec, { marker: tmp.extra.marker }]], + plugin_enabled: { + "demo.toggle": false, + }, + plugin_meta: { + [tmp.extra.spec]: { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + const api = createTuiPluginApi() + + try { + await TuiPluginRuntime.init(api) + + await expect(fs.readFile(tmp.extra.marker, "utf8")).rejects.toThrow() + expect(TuiPluginRuntime.list().find((item) => item.id === "demo.toggle")).toEqual({ + id: "demo.toggle", + source: "file", + spec: tmp.extra.spec, + target: tmp.extra.spec, + enabled: false, + active: false, + }) + + await expect(TuiPluginRuntime.activatePlugin("demo.toggle")).resolves.toBe(true) + await expect(fs.readFile(tmp.extra.marker, "utf8")).resolves.toBe("start\n") + expect(api.kv.get("plugin_enabled", {})).toEqual({ + "demo.toggle": true, + }) + + await expect(TuiPluginRuntime.deactivatePlugin("demo.toggle")).resolves.toBe(true) + await expect(fs.readFile(tmp.extra.marker, "utf8")).resolves.toBe("start\nstop\n") + expect(api.kv.get("plugin_enabled", {})).toEqual({ + "demo.toggle": false, + }) + + await expect(TuiPluginRuntime.activatePlugin("missing.id")).resolves.toBe(false) + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) + +test("kv plugin_enabled overrides tui config on startup", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "startup-plugin.ts") + const spec = pathToFileURL(file).href + const marker = path.join(dir, "startup.txt") + + await Bun.write( + file, + `export default { + id: "demo.startup", + tui: async (_api, options) => { + await Bun.write(options.marker, "on") + }, +} +`, + ) + + return { + spec, + marker, + } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json") + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin: [[tmp.extra.spec, { marker: tmp.extra.marker }]], + plugin_enabled: { + "demo.startup": false, + }, + plugin_meta: { + [tmp.extra.spec]: { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path) + const api = createTuiPluginApi() + api.kv.set("plugin_enabled", { + "demo.startup": true, + }) + + try { + await TuiPluginRuntime.init(api) + + await expect(fs.readFile(tmp.extra.marker, "utf8")).resolves.toBe("on") + expect(TuiPluginRuntime.list().find((item) => item.id === "demo.startup")).toEqual({ + id: "demo.startup", + source: "file", + spec: tmp.extra.spec, + target: tmp.extra.spec, + enabled: true, + active: true, + }) + } finally { + await TuiPluginRuntime.dispose() + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +}) diff --git a/packages/opencode/test/cli/tui/theme-store.test.ts b/packages/opencode/test/cli/tui/theme-store.test.ts new file mode 100644 index 0000000000..23dcfb71cf --- /dev/null +++ b/packages/opencode/test/cli/tui/theme-store.test.ts @@ -0,0 +1,50 @@ +import { expect, test } from "bun:test" + +const { DEFAULT_THEMES, allThemes, addTheme, hasTheme, resolveTheme } = + await import("../../../src/cli/cmd/tui/context/theme") + +test("addTheme writes into module theme store", () => { + const name = `plugin-theme-${Date.now()}` + expect(addTheme(name, DEFAULT_THEMES.opencode)).toBe(true) + + expect(allThemes()[name]).toBeDefined() +}) + +test("addTheme keeps first theme for duplicate names", () => { + const name = `plugin-theme-keep-${Date.now()}` + const one = structuredClone(DEFAULT_THEMES.opencode) + const two = structuredClone(DEFAULT_THEMES.opencode) + one.theme.primary = "#101010" + two.theme.primary = "#fefefe" + + expect(addTheme(name, one)).toBe(true) + expect(addTheme(name, two)).toBe(false) + + expect(allThemes()[name]).toBeDefined() + expect(allThemes()[name]!.theme.primary).toBe("#101010") +}) + +test("addTheme ignores entries without a theme object", () => { + const name = `plugin-theme-invalid-${Date.now()}` + expect(addTheme(name, { defs: { a: "#ffffff" } })).toBe(false) + expect(allThemes()[name]).toBeUndefined() +}) + +test("hasTheme checks theme presence", () => { + const name = `plugin-theme-has-${Date.now()}` + expect(hasTheme(name)).toBe(false) + expect(addTheme(name, DEFAULT_THEMES.opencode)).toBe(true) + expect(hasTheme(name)).toBe(true) +}) + +test("resolveTheme rejects circular color refs", () => { + const item = structuredClone(DEFAULT_THEMES.opencode) + item.defs = { + ...(item.defs ?? {}), + one: "two", + two: "one", + } + item.theme.primary = "one" + + expect(() => resolveTheme(item, "dark")).toThrow("Circular color reference") +}) diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts index 33f700ebf2..aa49aa4bd5 100644 --- a/packages/opencode/test/config/config.test.ts +++ b/packages/opencode/test/config/config.test.ts @@ -20,6 +20,7 @@ import { pathToFileURL } from "url" import { Global } from "../../src/global" import { ProjectID } from "../../src/project/schema" import { Filesystem } from "../../src/util/filesystem" +import * as Network from "../../src/util/network" import { BunProc } from "../../src/bun" const emptyAccount = Layer.mock(Account.Service)({ @@ -765,6 +766,20 @@ test("installs dependencies in writable OPENCODE_CONFIG_DIR", async () => { const prev = process.env.OPENCODE_CONFIG_DIR process.env.OPENCODE_CONFIG_DIR = tmp.extra + const online = spyOn(Network, "online").mockReturnValue(false) + const run = spyOn(BunProc, "run").mockImplementation(async (_cmd, opts) => { + const mod = path.join(opts?.cwd ?? "", "node_modules", "@opencode-ai", "plugin") + await fs.mkdir(mod, { recursive: true }) + await Filesystem.write( + path.join(mod, "package.json"), + JSON.stringify({ name: "@opencode-ai/plugin", version: "1.0.0" }), + ) + return { + code: 0, + stdout: Buffer.alloc(0), + stderr: Buffer.alloc(0), + } + }) try { await Instance.provide({ @@ -778,25 +793,43 @@ test("installs dependencies in writable OPENCODE_CONFIG_DIR", async () => { expect(await Filesystem.exists(path.join(tmp.extra, "package.json"))).toBe(true) expect(await Filesystem.exists(path.join(tmp.extra, ".gitignore"))).toBe(true) } finally { + online.mockRestore() + run.mockRestore() if (prev === undefined) delete process.env.OPENCODE_CONFIG_DIR else process.env.OPENCODE_CONFIG_DIR = prev } }) -test("serializes concurrent config dependency installs", async () => { +test("dedupes concurrent config dependency installs for the same dir", async () => { await using tmp = await tmpdir() - const dirs = [path.join(tmp.path, "a"), path.join(tmp.path, "b")] - await Promise.all(dirs.map((dir) => fs.mkdir(dir, { recursive: true }))) + const dir = path.join(tmp.path, "a") + await fs.mkdir(dir, { recursive: true }) - const seen: string[] = [] - let active = 0 - let max = 0 + const ticks: number[] = [] + let calls = 0 + let start = () => {} + let done = () => {} + let blocked = () => {} + const ready = new Promise((resolve) => { + start = resolve + }) + const gate = new Promise((resolve) => { + done = resolve + }) + const waiting = new Promise((resolve) => { + blocked = resolve + }) + const online = spyOn(Network, "online").mockReturnValue(false) const run = spyOn(BunProc, "run").mockImplementation(async (_cmd, opts) => { - active++ - max = Math.max(max, active) - seen.push(opts?.cwd ?? "") - await new Promise((resolve) => setTimeout(resolve, 25)) - active-- + calls += 1 + start() + await gate + const mod = path.join(opts?.cwd ?? "", "node_modules", "@opencode-ai", "plugin") + await fs.mkdir(mod, { recursive: true }) + await Filesystem.write( + path.join(mod, "package.json"), + JSON.stringify({ name: "@opencode-ai/plugin", version: "1.0.0" }), + ) return { code: 0, stdout: Buffer.alloc(0), @@ -805,15 +838,85 @@ test("serializes concurrent config dependency installs", async () => { }) try { - await Promise.all(dirs.map((dir) => Config.installDependencies(dir))) + const first = Config.installDependencies(dir) + await ready + const second = Config.installDependencies(dir, { + waitTick: (tick) => { + ticks.push(tick.attempt) + blocked() + blocked = () => {} + }, + }) + await waiting + done() + await Promise.all([first, second]) } finally { + online.mockRestore() run.mockRestore() } - expect(max).toBe(1) - expect(seen.toSorted()).toEqual(dirs.toSorted()) - expect(await Filesystem.exists(path.join(dirs[0], "package.json"))).toBe(true) - expect(await Filesystem.exists(path.join(dirs[1], "package.json"))).toBe(true) + expect(calls).toBe(1) + expect(ticks.length).toBeGreaterThan(0) + expect(await Filesystem.exists(path.join(dir, "package.json"))).toBe(true) +}) + +test("serializes config dependency installs across dirs", async () => { + if (process.platform !== "win32") return + + await using tmp = await tmpdir() + const a = path.join(tmp.path, "a") + const b = path.join(tmp.path, "b") + await fs.mkdir(a, { recursive: true }) + await fs.mkdir(b, { recursive: true }) + + let calls = 0 + let open = 0 + let peak = 0 + let start = () => {} + let done = () => {} + const ready = new Promise((resolve) => { + start = resolve + }) + const gate = new Promise((resolve) => { + done = resolve + }) + + const online = spyOn(Network, "online").mockReturnValue(false) + const run = spyOn(BunProc, "run").mockImplementation(async (_cmd, opts) => { + calls += 1 + open += 1 + peak = Math.max(peak, open) + if (calls === 1) { + start() + await gate + } + const mod = path.join(opts?.cwd ?? "", "node_modules", "@opencode-ai", "plugin") + await fs.mkdir(mod, { recursive: true }) + await Filesystem.write( + path.join(mod, "package.json"), + JSON.stringify({ name: "@opencode-ai/plugin", version: "1.0.0" }), + ) + open -= 1 + return { + code: 0, + stdout: Buffer.alloc(0), + stderr: Buffer.alloc(0), + } + }) + + try { + const first = Config.installDependencies(a) + await ready + const second = Config.installDependencies(b) + done() + await Promise.all([first, second]) + } finally { + online.mockRestore() + run.mockRestore() + } + + expect(calls).toBe(2) + expect(peak).toBe(1) }) test("resolves scoped npm plugins in config", async () => { @@ -855,15 +958,7 @@ test("resolves scoped npm plugins in config", async () => { fn: async () => { const config = await Config.get() const pluginEntries = config.plugin ?? [] - - const baseUrl = pathToFileURL(path.join(tmp.path, "opencode.json")).href - const expected = pathToFileURL(path.join(tmp.path, "node_modules", "@scope", "plugin", "index.js")).href - - expect(pluginEntries.includes(expected)).toBe(true) - - const scopedEntry = pluginEntries.find((entry) => entry === expected) - expect(scopedEntry).toBeDefined() - expect(scopedEntry?.includes("/node_modules/@scope/plugin/")).toBe(true) + expect(pluginEntries).toContain("@scope/plugin") }, }) }) @@ -1710,27 +1805,43 @@ test("wellknown URL with trailing slash is normalized", async () => { } }) -describe("getPluginName", () => { - test("extracts name from file:// URL", () => { - expect(Config.getPluginName("file:///path/to/plugin/foo.js")).toBe("foo") - expect(Config.getPluginName("file:///path/to/plugin/bar.ts")).toBe("bar") - expect(Config.getPluginName("file:///some/path/my-plugin.js")).toBe("my-plugin") +describe("resolvePluginSpec", () => { + test("keeps package specs unchanged", async () => { + await using tmp = await tmpdir() + const file = path.join(tmp.path, "opencode.json") + expect(await Config.resolvePluginSpec("oh-my-opencode@2.4.3", file)).toBe("oh-my-opencode@2.4.3") + expect(await Config.resolvePluginSpec("@scope/pkg", file)).toBe("@scope/pkg") }) - test("extracts name from npm package with version", () => { - expect(Config.getPluginName("oh-my-opencode@2.4.3")).toBe("oh-my-opencode") - expect(Config.getPluginName("some-plugin@1.0.0")).toBe("some-plugin") - expect(Config.getPluginName("plugin@latest")).toBe("plugin") + test("resolves relative file plugin paths to file urls", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write(path.join(dir, "plugin.ts"), "export default {}") + }, + }) + + const file = path.join(tmp.path, "opencode.json") + const hit = await Config.resolvePluginSpec("./plugin.ts", file) + expect(Config.pluginSpecifier(hit)).toBe(pathToFileURL(path.join(tmp.path, "plugin.ts")).href) }) - test("extracts name from scoped npm package", () => { - expect(Config.getPluginName("@scope/pkg@1.0.0")).toBe("@scope/pkg") - expect(Config.getPluginName("@opencode/plugin@2.0.0")).toBe("@opencode/plugin") - }) + test("resolves plugin directory paths to package main files", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const plugin = path.join(dir, "plugin") + await fs.mkdir(plugin, { recursive: true }) + await Filesystem.writeJson(path.join(plugin, "package.json"), { + name: "demo-plugin", + type: "module", + main: "./index.ts", + }) + await Filesystem.write(path.join(plugin, "index.ts"), "export default {}") + }, + }) - test("returns full string for package without version", () => { - expect(Config.getPluginName("some-plugin")).toBe("some-plugin") - expect(Config.getPluginName("@scope/pkg")).toBe("@scope/pkg") + const file = path.join(tmp.path, "opencode.json") + const hit = await Config.resolvePluginSpec("./plugin", file) + expect(Config.pluginSpecifier(hit)).toBe(pathToFileURL(path.join(tmp.path, "plugin", "index.ts")).href) }) }) @@ -1747,13 +1858,20 @@ describe("deduplicatePlugins", () => { expect(result.length).toBe(3) }) - test("prefers local file over npm package with same name", () => { + test("keeps path plugins separate from package plugins", () => { const plugins = ["oh-my-opencode@2.4.3", "file:///project/.opencode/plugin/oh-my-opencode.js"] const result = Config.deduplicatePlugins(plugins) - expect(result.length).toBe(1) - expect(result[0]).toBe("file:///project/.opencode/plugin/oh-my-opencode.js") + expect(result).toEqual(plugins) + }) + + test("deduplicates direct path plugins by exact spec", () => { + const plugins = ["file:///project/.opencode/plugin/demo.ts", "file:///project/.opencode/plugin/demo.ts"] + + const result = Config.deduplicatePlugins(plugins) + + expect(result).toEqual(["file:///project/.opencode/plugin/demo.ts"]) }) test("preserves order of remaining plugins", () => { @@ -1764,7 +1882,7 @@ describe("deduplicatePlugins", () => { expect(result).toEqual(["a-plugin@1.0.0", "b-plugin@1.0.0", "c-plugin@1.0.0"]) }) - test("local plugin directory overrides global opencode.json plugin", async () => { + test("loads auto-discovered local plugins as file urls", async () => { await using tmp = await tmpdir({ init: async (dir) => { const projectDir = path.join(dir, "project") @@ -1790,9 +1908,8 @@ describe("deduplicatePlugins", () => { const config = await Config.get() const plugins = config.plugin ?? [] - const myPlugins = plugins.filter((p) => Config.getPluginName(p) === "my-plugin") - expect(myPlugins.length).toBe(1) - expect(myPlugins[0].startsWith("file://")).toBe(true) + expect(plugins.some((p) => Config.pluginSpecifier(p) === "my-plugin@1.0.0")).toBe(true) + expect(plugins.some((p) => Config.pluginSpecifier(p).startsWith("file://"))).toBe(true) }, }) }) diff --git a/packages/opencode/test/config/tui.test.ts b/packages/opencode/test/config/tui.test.ts index f9de5b041b..14f02fe30e 100644 --- a/packages/opencode/test/config/tui.test.ts +++ b/packages/opencode/test/config/tui.test.ts @@ -458,9 +458,15 @@ test("applies file substitutions when first identical token is in a commented li test("loads managed tui config and gives it highest precedence", async () => { await using tmp = await tmpdir({ init: async (dir) => { - await Bun.write(path.join(dir, "tui.json"), JSON.stringify({ theme: "project-theme" }, null, 2)) + await Bun.write( + path.join(dir, "tui.json"), + JSON.stringify({ theme: "project-theme", plugin: ["shared-plugin@1.0.0"] }, null, 2), + ) await fs.mkdir(managedConfigDir, { recursive: true }) - await Bun.write(path.join(managedConfigDir, "tui.json"), JSON.stringify({ theme: "managed-theme" }, null, 2)) + await Bun.write( + path.join(managedConfigDir, "tui.json"), + JSON.stringify({ theme: "managed-theme", plugin: ["shared-plugin@2.0.0"] }, null, 2), + ) }, }) @@ -469,6 +475,13 @@ test("loads managed tui config and gives it highest precedence", async () => { fn: async () => { const config = await TuiConfig.get() expect(config.theme).toBe("managed-theme") + expect(config.plugin).toEqual(["shared-plugin@2.0.0"]) + expect(config.plugin_meta).toEqual({ + "shared-plugin@2.0.0": { + scope: "global", + source: path.join(managedConfigDir, "tui.json"), + }, + }) }, }) }) @@ -508,3 +521,147 @@ test("gracefully falls back when tui.json has invalid JSON", async () => { }, }) }) + +test("supports tuple plugin specs with options in tui.json", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write( + path.join(dir, "tui.json"), + JSON.stringify({ + plugin: [["acme-plugin@1.2.3", { enabled: true, label: "demo" }]], + }), + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const config = await TuiConfig.get() + expect(config.plugin).toEqual([["acme-plugin@1.2.3", { enabled: true, label: "demo" }]]) + expect(config.plugin_meta).toEqual({ + "acme-plugin@1.2.3": { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }) + }, + }) +}) + +test("deduplicates tuple plugin specs by name with higher precedence winning", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write( + path.join(Global.Path.config, "tui.json"), + JSON.stringify({ + plugin: [["acme-plugin@1.0.0", { source: "global" }]], + }), + ) + await Bun.write( + path.join(dir, "tui.json"), + JSON.stringify({ + plugin: [ + ["acme-plugin@2.0.0", { source: "project" }], + ["second-plugin@3.0.0", { source: "project" }], + ], + }), + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const config = await TuiConfig.get() + expect(config.plugin).toEqual([ + ["acme-plugin@2.0.0", { source: "project" }], + ["second-plugin@3.0.0", { source: "project" }], + ]) + expect(config.plugin_meta).toEqual({ + "acme-plugin@2.0.0": { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + "second-plugin@3.0.0": { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }) + }, + }) +}) + +test("tracks global and local plugin metadata in merged tui config", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write( + path.join(Global.Path.config, "tui.json"), + JSON.stringify({ + plugin: ["global-plugin@1.0.0"], + }), + ) + await Bun.write( + path.join(dir, "tui.json"), + JSON.stringify({ + plugin: ["local-plugin@2.0.0"], + }), + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const config = await TuiConfig.get() + expect(config.plugin).toEqual(["global-plugin@1.0.0", "local-plugin@2.0.0"]) + expect(config.plugin_meta).toEqual({ + "global-plugin@1.0.0": { + scope: "global", + source: path.join(Global.Path.config, "tui.json"), + }, + "local-plugin@2.0.0": { + scope: "local", + source: path.join(tmp.path, "tui.json"), + }, + }) + }, + }) +}) + +test("merges plugin_enabled flags across config layers", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write( + path.join(Global.Path.config, "tui.json"), + JSON.stringify({ + plugin_enabled: { + "internal:sidebar-context": false, + "demo.plugin": true, + }, + }), + ) + await Bun.write( + path.join(dir, "tui.json"), + JSON.stringify({ + plugin_enabled: { + "demo.plugin": false, + "local.plugin": true, + }, + }), + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const config = await TuiConfig.get() + expect(config.plugin_enabled).toEqual({ + "internal:sidebar-context": false, + "demo.plugin": false, + "local.plugin": true, + }) + }, + }) +}) diff --git a/packages/opencode/test/fixture/flock-worker.ts b/packages/opencode/test/fixture/flock-worker.ts new file mode 100644 index 0000000000..ac05fe810c --- /dev/null +++ b/packages/opencode/test/fixture/flock-worker.ts @@ -0,0 +1,72 @@ +import fs from "fs/promises" +import { Flock } from "../../src/util/flock" + +type Msg = { + key: string + dir: string + staleMs?: number + timeoutMs?: number + baseDelayMs?: number + maxDelayMs?: number + holdMs?: number + ready?: string + active?: string + done?: string +} + +function sleep(ms: number) { + return new Promise((resolve) => { + setTimeout(resolve, ms) + }) +} + +function input() { + const raw = process.argv[2] + if (!raw) { + throw new Error("Missing flock worker input") + } + + return JSON.parse(raw) as Msg +} + +async function job(input: Msg) { + if (input.ready) { + await fs.writeFile(input.ready, String(process.pid)) + } + + if (input.active) { + await fs.writeFile(input.active, String(process.pid), { flag: "wx" }) + } + + try { + if (input.holdMs && input.holdMs > 0) { + await sleep(input.holdMs) + } + + if (input.done) { + await fs.appendFile(input.done, "1\n") + } + } finally { + if (input.active) { + await fs.rm(input.active, { force: true }) + } + } +} + +async function main() { + const msg = input() + + await Flock.withLock(msg.key, () => job(msg), { + dir: msg.dir, + staleMs: msg.staleMs, + timeoutMs: msg.timeoutMs, + baseDelayMs: msg.baseDelayMs, + maxDelayMs: msg.maxDelayMs, + }) +} + +await main().catch((err) => { + const text = err instanceof Error ? (err.stack ?? err.message) : String(err) + process.stderr.write(text) + process.exit(1) +}) diff --git a/packages/opencode/test/fixture/plug-worker.ts b/packages/opencode/test/fixture/plug-worker.ts new file mode 100644 index 0000000000..e4b80c5dc5 --- /dev/null +++ b/packages/opencode/test/fixture/plug-worker.ts @@ -0,0 +1,93 @@ +import path from "path" + +import { createPlugTask, type PlugCtx, type PlugDeps } from "../../src/cli/cmd/plug" +import { Filesystem } from "../../src/util/filesystem" + +type Msg = { + dir: string + target: string + mod: string + global?: boolean + force?: boolean + globalDir?: string + vcs?: string + worktree?: string + directory?: string + holdMs?: number +} + +function sleep(ms: number) { + return new Promise((resolve) => { + setTimeout(resolve, ms) + }) +} + +function input() { + const raw = process.argv[2] + if (!raw) { + throw new Error("Missing plug worker input") + } + + const msg = JSON.parse(raw) as Partial + if (!msg.dir || !msg.target || !msg.mod) { + throw new Error("Invalid plug worker input") + } + + return msg as Msg +} + +function deps(msg: Msg): PlugDeps { + return { + spinner: () => ({ + start() {}, + stop() {}, + }), + log: { + error() {}, + info() {}, + success() {}, + }, + resolve: async () => msg.target, + readText: (file) => Filesystem.readText(file), + write: async (file, text) => { + if (msg.holdMs && msg.holdMs > 0) { + await sleep(msg.holdMs) + } + await Filesystem.write(file, text) + }, + exists: (file) => Filesystem.exists(file), + files: (dir, name) => [path.join(dir, `${name}.jsonc`), path.join(dir, `${name}.json`)], + global: msg.globalDir ?? path.join(msg.dir, ".global"), + } +} + +function ctx(msg: Msg): PlugCtx { + return { + vcs: msg.vcs ?? "git", + worktree: msg.worktree ?? msg.dir, + directory: msg.directory ?? msg.dir, + } +} + +async function main() { + const msg = input() + const run = createPlugTask( + { + mod: msg.mod, + global: msg.global, + force: msg.force, + }, + deps(msg), + ) + + const ok = await run(ctx(msg)) + if (!ok) { + throw new Error("Plug task failed") + } +} + +await main().catch((err) => { + const text = err instanceof Error ? (err.stack ?? err.message) : String(err) + process.stderr.write(text) + process.exit(1) +}) diff --git a/packages/opencode/test/fixture/plugin-meta-worker.ts b/packages/opencode/test/fixture/plugin-meta-worker.ts new file mode 100644 index 0000000000..86284b4c73 --- /dev/null +++ b/packages/opencode/test/fixture/plugin-meta-worker.ts @@ -0,0 +1,26 @@ +type Msg = { + file: string + spec: string + target: string + id: string +} + +const raw = process.argv[2] +if (!raw) throw new Error("Missing worker payload") + +const value = JSON.parse(raw) +if (!value || typeof value !== "object") { + throw new Error("Invalid worker payload") +} + +const msg = Object.fromEntries(Object.entries(value)) +if (typeof msg.file !== "string" || typeof msg.spec !== "string" || typeof msg.target !== "string") { + throw new Error("Invalid worker payload") +} +if (typeof msg.id !== "string") throw new Error("Invalid worker payload") + +process.env.OPENCODE_PLUGIN_META_FILE = msg.file + +const { PluginMeta } = await import("../../src/plugin/meta") + +await PluginMeta.touch(msg.spec, msg.target, msg.id) diff --git a/packages/opencode/test/fixture/tui-plugin.ts b/packages/opencode/test/fixture/tui-plugin.ts new file mode 100644 index 0000000000..c982d129f3 --- /dev/null +++ b/packages/opencode/test/fixture/tui-plugin.ts @@ -0,0 +1,334 @@ +import { createOpencodeClient } from "@opencode-ai/sdk/v2" +import { RGBA, type CliRenderer } from "@opentui/core" +import { createPluginKeybind } from "../../src/cli/cmd/tui/context/plugin-keybinds" +import type { HostPluginApi } from "../../src/cli/cmd/tui/plugin/slots" + +type Count = { + event_add: number + event_drop: number + route_add: number + route_drop: number + command_add: number + command_drop: number +} + +function themeCurrent(): HostPluginApi["theme"]["current"] { + const a = RGBA.fromInts(0, 120, 240) + const b = RGBA.fromInts(120, 120, 120) + const c = RGBA.fromInts(230, 230, 230) + const d = RGBA.fromInts(120, 30, 30) + const e = RGBA.fromInts(140, 100, 40) + const f = RGBA.fromInts(20, 140, 80) + const g = RGBA.fromInts(20, 80, 160) + const h = RGBA.fromInts(40, 40, 40) + const i = RGBA.fromInts(60, 60, 60) + const j = RGBA.fromInts(80, 80, 80) + return { + primary: a, + secondary: b, + accent: a, + error: d, + warning: e, + success: f, + info: g, + text: c, + textMuted: b, + selectedListItemText: h, + background: h, + backgroundPanel: h, + backgroundElement: i, + backgroundMenu: i, + border: j, + borderActive: c, + borderSubtle: i, + diffAdded: f, + diffRemoved: d, + diffContext: b, + diffHunkHeader: b, + diffHighlightAdded: f, + diffHighlightRemoved: d, + diffAddedBg: h, + diffRemovedBg: h, + diffContextBg: h, + diffLineNumber: b, + diffAddedLineNumberBg: h, + diffRemovedLineNumberBg: h, + markdownText: c, + markdownHeading: c, + markdownLink: a, + markdownLinkText: g, + markdownCode: f, + markdownBlockQuote: e, + markdownEmph: e, + markdownStrong: c, + markdownHorizontalRule: b, + markdownListItem: a, + markdownListEnumeration: g, + markdownImage: a, + markdownImageText: g, + markdownCodeBlock: c, + syntaxComment: b, + syntaxKeyword: a, + syntaxFunction: g, + syntaxVariable: c, + syntaxString: f, + syntaxNumber: e, + syntaxType: a, + syntaxOperator: a, + syntaxPunctuation: c, + thinkingOpacity: 0.6, + } +} + +type Opts = { + client?: HostPluginApi["client"] | (() => HostPluginApi["client"]) + scopedClient?: HostPluginApi["scopedClient"] + workspace?: Partial + renderer?: HostPluginApi["renderer"] + count?: Count + keybind?: Partial + tuiConfig?: HostPluginApi["tuiConfig"] + app?: Partial + state?: { + ready?: HostPluginApi["state"]["ready"] + config?: HostPluginApi["state"]["config"] + provider?: HostPluginApi["state"]["provider"] + path?: HostPluginApi["state"]["path"] + vcs?: HostPluginApi["state"]["vcs"] + workspace?: Partial + session?: Partial + part?: HostPluginApi["state"]["part"] + lsp?: HostPluginApi["state"]["lsp"] + mcp?: HostPluginApi["state"]["mcp"] + } + theme?: { + selected?: string + has?: HostPluginApi["theme"]["has"] + set?: HostPluginApi["theme"]["set"] + install?: HostPluginApi["theme"]["install"] + mode?: HostPluginApi["theme"]["mode"] + ready?: boolean + current?: HostPluginApi["theme"]["current"] + } +} + +export function createTuiPluginApi(opts: Opts = {}): HostPluginApi { + const kv: Record = {} + const count = opts.count + const ctrl = new AbortController() + const own = createOpencodeClient({ + baseUrl: "http://localhost:4096", + }) + const fallback = () => own + const read = + typeof opts.client === "function" + ? opts.client + : opts.client + ? () => opts.client as HostPluginApi["client"] + : fallback + const client = () => read() + const scopedClient = opts.scopedClient ?? ((_workspaceID?: string) => client()) + const workspace: HostPluginApi["workspace"] = { + current: opts.workspace?.current ?? (() => undefined), + set: opts.workspace?.set ?? (() => {}), + } + let depth = 0 + let size: "medium" | "large" | "xlarge" = "medium" + const has = opts.theme?.has ?? (() => false) + let selected = opts.theme?.selected ?? "opencode" + const key = { + match: opts.keybind?.match ?? (() => false), + print: opts.keybind?.print ?? ((name: string) => name), + } + const set = + opts.theme?.set ?? + ((name: string) => { + if (!has(name)) return false + selected = name + return true + }) + const renderer: CliRenderer = opts.renderer ?? { + ...Object.create(null), + once(this: CliRenderer) { + return this + }, + } + + function kvGet(name: string): unknown + function kvGet(name: string, fallback: Value): Value + function kvGet(name: string, fallback?: unknown) { + const value = kv[name] + if (value === undefined) return fallback + return value + } + + return { + app: { + get version() { + return opts.app?.version ?? "0.0.0-test" + }, + }, + get client() { + return client() + }, + scopedClient, + workspace, + event: { + on: () => { + if (count) count.event_add += 1 + return () => { + if (!count) return + count.event_drop += 1 + } + }, + }, + renderer, + slots: { + register: () => "fixture-slot", + }, + plugins: { + list: () => [], + activate: async () => false, + deactivate: async () => false, + add: async () => false, + install: async () => ({ + ok: false, + message: "not implemented in fixture", + }), + }, + lifecycle: { + signal: ctrl.signal, + onDispose() { + return () => {} + }, + }, + command: { + register: () => { + if (count) count.command_add += 1 + return () => { + if (!count) return + count.command_drop += 1 + } + }, + trigger: () => {}, + }, + route: { + register: () => { + if (count) count.route_add += 1 + return () => { + if (!count) return + count.route_drop += 1 + } + }, + navigate: () => {}, + get current() { + return { name: "home" } + }, + }, + ui: { + Dialog: () => null, + DialogAlert: () => null, + DialogConfirm: () => null, + DialogPrompt: () => null, + DialogSelect: () => null, + toast: () => {}, + dialog: { + replace: () => { + depth = 1 + }, + clear: () => { + depth = 0 + size = "medium" + }, + setSize: (next) => { + size = next + }, + get size() { + return size + }, + get depth() { + return depth + }, + get open() { + return depth > 0 + }, + }, + }, + keybind: { + ...key, + create: + opts.keybind?.create ?? + ((defaults, over) => { + return createPluginKeybind(key, defaults, over) + }), + }, + tuiConfig: opts.tuiConfig ?? {}, + kv: { + get: kvGet, + set(name, value) { + kv[name] = value + }, + get ready() { + return true + }, + }, + state: { + get ready() { + return opts.state?.ready ?? true + }, + get config() { + return opts.state?.config ?? {} + }, + get provider() { + return opts.state?.provider ?? [] + }, + get path() { + return opts.state?.path ?? { state: "", config: "", worktree: "", directory: "" } + }, + get vcs() { + return opts.state?.vcs + }, + workspace: { + list: opts.state?.workspace?.list ?? (() => []), + get: opts.state?.workspace?.get ?? (() => undefined), + }, + session: { + count: opts.state?.session?.count ?? (() => 0), + diff: opts.state?.session?.diff ?? (() => []), + todo: opts.state?.session?.todo ?? (() => []), + messages: opts.state?.session?.messages ?? (() => []), + status: opts.state?.session?.status ?? (() => undefined), + permission: opts.state?.session?.permission ?? (() => []), + question: opts.state?.session?.question ?? (() => []), + }, + part: opts.state?.part ?? (() => []), + lsp: opts.state?.lsp ?? (() => []), + mcp: opts.state?.mcp ?? (() => []), + }, + theme: { + get current() { + return opts.theme?.current ?? themeCurrent() + }, + get selected() { + return selected + }, + has(name) { + return has(name) + }, + set(name) { + return set(name) + }, + async install(file) { + if (opts.theme?.install) return opts.theme.install(file) + throw new Error("base theme.install should not run") + }, + mode() { + if (opts.theme?.mode) return opts.theme.mode() + return "dark" + }, + get ready() { + return opts.theme?.ready ?? true + }, + }, + } +} diff --git a/packages/opencode/test/fixture/tui-runtime.ts b/packages/opencode/test/fixture/tui-runtime.ts new file mode 100644 index 0000000000..67ea4b9a4c --- /dev/null +++ b/packages/opencode/test/fixture/tui-runtime.ts @@ -0,0 +1,34 @@ +import { spyOn } from "bun:test" +import path from "path" +import { TuiConfig } from "../../src/config/tui" + +type PluginSpec = string | [string, Record] + +export function mockTuiRuntime(dir: string, plugin: PluginSpec[]) { + process.env.OPENCODE_PLUGIN_META_FILE = path.join(dir, "plugin-meta.json") + const meta = Object.fromEntries( + plugin.map((item) => { + const spec = Array.isArray(item) ? item[0] : item + return [ + spec, + { + scope: "local" as const, + source: path.join(dir, "tui.json"), + }, + ] + }), + ) + const get = spyOn(TuiConfig, "get").mockResolvedValue({ + plugin, + plugin_meta: meta, + }) + const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue() + const cwd = spyOn(process, "cwd").mockImplementation(() => dir) + + return () => { + cwd.mockRestore() + get.mockRestore() + wait.mockRestore() + delete process.env.OPENCODE_PLUGIN_META_FILE + } +} diff --git a/packages/opencode/test/plugin/auth-override.test.ts b/packages/opencode/test/plugin/auth-override.test.ts index 667b7ba9aa..c25984be6f 100644 --- a/packages/opencode/test/plugin/auth-override.test.ts +++ b/packages/opencode/test/plugin/auth-override.test.ts @@ -16,15 +16,18 @@ describe("plugin.auth-override", () => { await Bun.write( path.join(pluginDir, "custom-copilot-auth.ts"), [ - "export default async () => ({", - " auth: {", - ' provider: "github-copilot",', - " methods: [", - ' { type: "api", label: "Test Override Auth" },', - " ],", - " loader: async () => ({ access: 'test-token' }),", - " },", - "})", + "export default {", + ' id: "demo.custom-copilot-auth",', + " server: async () => ({", + " auth: {", + ' provider: "github-copilot",', + " methods: [", + ' { type: "api", label: "Test Override Auth" },', + " ],", + " loader: async () => ({ access: 'test-token' }),", + " },", + " }),", + "}", "", ].join("\n"), ) diff --git a/packages/opencode/test/plugin/install-concurrency.test.ts b/packages/opencode/test/plugin/install-concurrency.test.ts new file mode 100644 index 0000000000..d21d7ca35b --- /dev/null +++ b/packages/opencode/test/plugin/install-concurrency.test.ts @@ -0,0 +1,134 @@ +import { describe, expect, test } from "bun:test" +import fs from "fs/promises" +import path from "path" + +import { Process } from "../../src/util/process" +import { Filesystem } from "../../src/util/filesystem" +import { tmpdir } from "../fixture/fixture" + +const root = path.join(import.meta.dir, "../..") +const worker = path.join(import.meta.dir, "../fixture/plug-worker.ts") + +type Msg = { + dir: string + target: string + mod: string + holdMs?: number +} + +function run(msg: Msg) { + return Process.run([process.execPath, worker, JSON.stringify(msg)], { + cwd: root, + nothrow: true, + }) +} + +async function plugin(dir: string, kinds: Array<"server" | "tui">) { + const p = path.join(dir, "plugin") + await fs.mkdir(p, { recursive: true }) + await Bun.write( + path.join(p, "package.json"), + JSON.stringify( + { + name: "acme", + version: "1.0.0", + "oc-plugin": kinds, + }, + null, + 2, + ), + ) + return p +} + +async function read(file: string) { + return Filesystem.readJson<{ plugin?: unknown[] }>(file) +} + +function mods(prefix: string, n: number) { + return Array.from({ length: n }, (_, i) => `${prefix}-${i}@1.0.0`) +} + +function expectPlugins(list: unknown[] | undefined, expectMods: string[]) { + expect(Array.isArray(list)).toBe(true) + const hit = (list ?? []).filter((item): item is string => typeof item === "string") + expect(hit.length).toBe(expectMods.length) + expect(new Set(hit)).toEqual(new Set(expectMods)) +} + +describe("plugin.install.concurrent", () => { + test("serializes concurrent server config updates across processes", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const all = mods("mod-server", 12) + + const out = await Promise.all( + all.map((mod) => + run({ + dir: tmp.path, + target, + mod, + holdMs: 30, + }), + ), + ) + + expect(out.map((x) => x.code)).toEqual(Array.from({ length: all.length }, () => 0)) + expect(out.map((x) => x.stderr.toString()).filter(Boolean)).toEqual([]) + + const cfg = await read(path.join(tmp.path, ".opencode", "opencode.jsonc")) + expectPlugins(cfg.plugin, all) + }, 25_000) + + test("serializes concurrent server+tui config updates across processes", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server", "tui"]) + const all = mods("mod-both", 10) + + const out = await Promise.all( + all.map((mod) => + run({ + dir: tmp.path, + target, + mod, + holdMs: 30, + }), + ), + ) + + expect(out.map((x) => x.code)).toEqual(Array.from({ length: all.length }, () => 0)) + expect(out.map((x) => x.stderr.toString()).filter(Boolean)).toEqual([]) + + const server = await read(path.join(tmp.path, ".opencode", "opencode.jsonc")) + const tui = await read(path.join(tmp.path, ".opencode", "tui.jsonc")) + expectPlugins(server.plugin, all) + expectPlugins(tui.plugin, all) + }, 25_000) + + test("preserves updates when existing config uses .json", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const cfg = path.join(tmp.path, ".opencode", "opencode.json") + await fs.mkdir(path.dirname(cfg), { recursive: true }) + await Bun.write(cfg, JSON.stringify({ plugin: ["seed@1.0.0"] }, null, 2)) + + const next = mods("mod-json", 8) + const out = await Promise.all( + next.map((mod) => + run({ + dir: tmp.path, + target, + mod, + holdMs: 30, + }), + ), + ) + + expect(out.map((x) => x.code)).toEqual(Array.from({ length: next.length }, () => 0)) + expect(out.map((x) => x.stderr.toString()).filter(Boolean)).toEqual([]) + + const json = await read(cfg) + expectPlugins(json.plugin, ["seed@1.0.0", ...next]) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "opencode.jsonc"))).toBe(false) + }, 25_000) +}) diff --git a/packages/opencode/test/plugin/install.test.ts b/packages/opencode/test/plugin/install.test.ts new file mode 100644 index 0000000000..e7d39bf87d --- /dev/null +++ b/packages/opencode/test/plugin/install.test.ts @@ -0,0 +1,410 @@ +import { describe, expect, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { Filesystem } from "../../src/util/filesystem" +import { createPlugTask, type PlugCtx, type PlugDeps } from "../../src/cli/cmd/plug" +import { tmpdir } from "../fixture/fixture" + +function deps(global: string, target: string | Error): PlugDeps { + return { + spinner: () => ({ + start() {}, + stop() {}, + }), + log: { + error() {}, + info() {}, + success() {}, + }, + resolve: async () => { + if (target instanceof Error) throw target + return target + }, + readText: (file) => Filesystem.readText(file), + write: async (file, text) => { + await Filesystem.write(file, text) + }, + exists: (file) => Filesystem.exists(file), + files: (dir, name) => [path.join(dir, `${name}.jsonc`), path.join(dir, `${name}.json`)], + global, + } +} + +function ctx(dir: string): PlugCtx { + return { + vcs: "git", + worktree: dir, + directory: dir, + } +} + +function ctxDir(dir: string, worktree: string): PlugCtx { + return { + vcs: "none", + worktree, + directory: dir, + } +} + +function ctxRoot(dir: string): PlugCtx { + return { + vcs: "git", + worktree: "/", + directory: dir, + } +} + +async function plugin(dir: string, kinds?: unknown) { + const p = path.join(dir, "plugin") + await fs.mkdir(p, { recursive: true }) + await Bun.write( + path.join(p, "package.json"), + JSON.stringify( + { + name: "acme", + version: "1.0.0", + ...(kinds === undefined ? {} : { "oc-plugin": kinds }), + }, + null, + 2, + ), + ) + return p +} + +async function read(file: string) { + return Filesystem.readJson<{ + plugin?: unknown[] + }>(file) +} + +describe("plugin.install.task", () => { + test("writes both server and tui config entries", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server", "tui"]) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + + const server = await read(path.join(tmp.path, ".opencode", "opencode.jsonc")) + const tui = await read(path.join(tmp.path, ".opencode", "tui.jsonc")) + expect(server.plugin).toEqual(["acme@1.2.3"]) + expect(tui.plugin).toEqual(["acme@1.2.3"]) + }) + + test("writes default options from tuple manifest targets", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, [ + ["server", { custom: true, other: false }], + ["tui", { compact: true }], + ]) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + + const server = await read(path.join(tmp.path, ".opencode", "opencode.jsonc")) + const tui = await read(path.join(tmp.path, ".opencode", "tui.jsonc")) + expect(server.plugin).toEqual([["acme@1.2.3", { custom: true, other: false }]]) + expect(tui.plugin).toEqual([["acme@1.2.3", { compact: true }]]) + }) + + test("supports resolver target pointing to a file", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const file = path.join(target, "index.js") + await Bun.write(file, "export {}") + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), file), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + const server = await read(path.join(tmp.path, ".opencode", "opencode.jsonc")) + expect(server.plugin).toEqual(["acme@1.2.3"]) + }) + + test("does not change configured package version without force", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const cfg = path.join(tmp.path, ".opencode", "opencode.json") + await fs.mkdir(path.dirname(cfg), { recursive: true }) + await Bun.write(cfg, JSON.stringify({ plugin: ["acme@1.0.0"] }, null, 2)) + + const run = createPlugTask( + { + mod: "acme@2.0.0", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + const json = await read(cfg) + expect(json.plugin).toEqual(["acme@1.0.0"]) + }) + + test("does not change scoped package version without force", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const cfg = path.join(tmp.path, ".opencode", "opencode.json") + await fs.mkdir(path.dirname(cfg), { recursive: true }) + await Bun.write(cfg, JSON.stringify({ plugin: ["@scope/acme@1.0.0"] }, null, 2)) + + const run = createPlugTask( + { + mod: "@scope/acme@2.0.0", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + const json = await read(cfg) + expect(json.plugin).toEqual(["@scope/acme@1.0.0"]) + }) + + test("keeps file plugin entries and still adds npm plugin", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const cfg = path.join(tmp.path, ".opencode", "opencode.json") + await fs.mkdir(path.dirname(cfg), { recursive: true }) + await Bun.write(cfg, JSON.stringify({ plugin: ["file:///tmp/acme.ts"] }, null, 2)) + + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + const json = await read(cfg) + expect(json.plugin).toEqual(["file:///tmp/acme.ts", "acme@1.2.3"]) + }) + + test("force replaces configured package version and keeps tuple options", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const cfg = path.join(tmp.path, ".opencode", "opencode.json") + await fs.mkdir(path.dirname(cfg), { recursive: true }) + await Bun.write( + cfg, + JSON.stringify( + { + plugin: [["acme@1.0.0", { mode: "safe" }], "acme@1.1.0", "other@1.0.0"], + }, + null, + 2, + ), + ) + + const run = createPlugTask( + { + mod: "acme@2.0.0", + force: true, + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + const json = await read(cfg) + expect(json.plugin).toEqual([["acme@2.0.0", { mode: "safe" }], "other@1.0.0"]) + }) + + test("writes to global scope when global flag is set", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const global = path.join(tmp.path, "global") + const run = createPlugTask( + { + mod: "acme@1.2.3", + global: true, + }, + deps(global, target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + + expect(await Filesystem.exists(path.join(global, "opencode.jsonc"))).toBe(true) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "opencode.jsonc"))).toBe(false) + }) + + test("writes local scope under directory when vcs is not git", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const directory = path.join(tmp.path, "dir") + const worktree = path.join(tmp.path, "worktree") + await fs.mkdir(directory, { recursive: true }) + await fs.mkdir(worktree, { recursive: true }) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctxDir(directory, worktree)) + expect(ok).toBe(true) + expect(await Filesystem.exists(path.join(directory, ".opencode", "opencode.jsonc"))).toBe(true) + expect(await Filesystem.exists(path.join(worktree, ".opencode", "opencode.jsonc"))).toBe(false) + }) + + test("writes local scope under directory when worktree is root slash", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const directory = path.join(tmp.path, "dir") + await fs.mkdir(directory, { recursive: true }) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctxRoot(directory)) + expect(ok).toBe(true) + expect(await Filesystem.exists(path.join(directory, ".opencode", "opencode.jsonc"))).toBe(true) + }) + + test("writes tui local scope under directory when worktree is root slash", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["tui"]) + const directory = path.join(tmp.path, "dir") + await fs.mkdir(directory, { recursive: true }) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctxRoot(directory)) + expect(ok).toBe(true) + expect(await Filesystem.exists(path.join(directory, ".opencode", "tui.jsonc"))).toBe(true) + }) + + test("writes only tui config for tui-only plugins", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["tui"]) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "tui.jsonc"))).toBe(true) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "opencode.jsonc"))).toBe(false) + }) + + test("force replaces version in both server and tui configs", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server", "tui"]) + const server = path.join(tmp.path, ".opencode", "opencode.json") + const tui = path.join(tmp.path, ".opencode", "tui.json") + await fs.mkdir(path.dirname(server), { recursive: true }) + await Bun.write(server, JSON.stringify({ plugin: ["acme@1.0.0", "other@1.0.0"] }, null, 2)) + await Bun.write(tui, JSON.stringify({ plugin: [["acme@1.0.0", { mode: "safe" }], "other@1.0.0"] }, null, 2)) + + const run = createPlugTask( + { + mod: "acme@2.0.0", + force: true, + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(true) + const serverJson = await read(server) + const tuiJson = await read(tui) + expect(serverJson.plugin).toEqual(["acme@2.0.0", "other@1.0.0"]) + expect(tuiJson.plugin).toEqual([["acme@2.0.0", { mode: "safe" }], "other@1.0.0"]) + }) + + test("returns false and keeps config unchanged for invalid JSONC", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path, ["server"]) + const cfg = path.join(tmp.path, ".opencode", "opencode.jsonc") + await fs.mkdir(path.dirname(cfg), { recursive: true }) + const bad = '{"plugin": ["acme@1.0.0",}' + await Bun.write(cfg, bad) + + const run = createPlugTask( + { + mod: "acme@2.0.0", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(false) + expect(await fs.readFile(cfg, "utf8")).toBe(bad) + }) + + test("returns false when manifest declares no supported targets", async () => { + await using tmp = await tmpdir() + const target = await plugin(tmp.path) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(false) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "opencode.jsonc"))).toBe(false) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "tui.jsonc"))).toBe(false) + }) + + test("returns false when manifest cannot be read", async () => { + await using tmp = await tmpdir() + const target = path.join(tmp.path, "plugin") + await fs.mkdir(target, { recursive: true }) + const run = createPlugTask( + { + mod: "acme@1.2.3", + }, + deps(path.join(tmp.path, "global"), target), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(false) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "opencode.jsonc"))).toBe(false) + }) + + test("returns false when install fails", async () => { + await using tmp = await tmpdir() + const run = createPlugTask( + { + mod: "acme@9.9.9", + }, + deps(path.join(tmp.path, "global"), new Error("boom")), + ) + + const ok = await run(ctx(tmp.path)) + expect(ok).toBe(false) + expect(await Filesystem.exists(path.join(tmp.path, ".opencode", "opencode.jsonc"))).toBe(false) + }) +}) diff --git a/packages/opencode/test/plugin/loader-shared.test.ts b/packages/opencode/test/plugin/loader-shared.test.ts new file mode 100644 index 0000000000..572f790faf --- /dev/null +++ b/packages/opencode/test/plugin/loader-shared.test.ts @@ -0,0 +1,548 @@ +import { afterAll, afterEach, describe, expect, spyOn, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" +import { tmpdir } from "../fixture/fixture" +import { Filesystem } from "../../src/util/filesystem" + +const disableDefault = process.env.OPENCODE_DISABLE_DEFAULT_PLUGINS +process.env.OPENCODE_DISABLE_DEFAULT_PLUGINS = "1" + +const { Plugin } = await import("../../src/plugin/index") +const { Instance } = await import("../../src/project/instance") +const { BunProc } = await import("../../src/bun") +const { Bus } = await import("../../src/bus") +const { Session } = await import("../../src/session") + +afterAll(() => { + if (disableDefault === undefined) { + delete process.env.OPENCODE_DISABLE_DEFAULT_PLUGINS + return + } + process.env.OPENCODE_DISABLE_DEFAULT_PLUGINS = disableDefault +}) + +afterEach(async () => { + await Instance.disposeAll() +}) + +async function load(dir: string) { + return Instance.provide({ + directory: dir, + fn: async () => { + await Plugin.list() + }, + }) +} + +async function errs(dir: string) { + return Instance.provide({ + directory: dir, + fn: async () => { + const errors: string[] = [] + const off = Bus.subscribe(Session.Event.Error, (evt) => { + const error = evt.properties.error + if (!error || typeof error !== "object") return + if (!("data" in error)) return + if (!error.data || typeof error.data !== "object") return + if (!("message" in error.data)) return + if (typeof error.data.message !== "string") return + errors.push(error.data.message) + }) + await Plugin.list() + off() + return errors + }, + }) +} + +describe("plugin.loader.shared", () => { + test("loads a file:// plugin function export", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + const mark = path.join(dir, "called.txt") + await Bun.write( + file, + [ + "export default async () => {", + ` await Bun.write(${JSON.stringify(mark)}, \"called\")`, + " return {}", + "}", + "", + ].join("\n"), + ) + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: [pathToFileURL(file).href] }, null, 2), + ) + + return { mark } + }, + }) + + await load(tmp.path) + expect(await fs.readFile(tmp.extra.mark, "utf8")).toBe("called") + }) + + test("deduplicates same function exported as default and named", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + const mark = path.join(dir, "count.txt") + await Bun.write(mark, "") + await Bun.write( + file, + [ + "const run = async () => {", + ` const text = await Bun.file(${JSON.stringify(mark)}).text().catch(() => \"\")`, + ` await Bun.write(${JSON.stringify(mark)}, text + \"1\")`, + " return {}", + "}", + "export default run", + "export const named = run", + "", + ].join("\n"), + ) + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: [pathToFileURL(file).href] }, null, 2), + ) + + return { mark } + }, + }) + + await load(tmp.path) + expect(await fs.readFile(tmp.extra.mark, "utf8")).toBe("1") + }) + + test("uses only default v1 server plugin when present", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + const mark = path.join(dir, "count.txt") + await Bun.write( + file, + [ + "export default {", + " server: async () => {", + ` await Bun.write(${JSON.stringify(mark)}, "default")`, + " return {}", + " },", + "}", + "export const named = async () => {", + ` await Bun.write(${JSON.stringify(mark)}, "named")`, + " return {}", + "}", + "", + ].join("\n"), + ) + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: [pathToFileURL(file).href] }, null, 2), + ) + + return { mark } + }, + }) + + await load(tmp.path) + expect(await Bun.file(tmp.extra.mark).text()).toBe("default") + }) + + test("resolves npm plugin specs with explicit and default versions", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const acme = path.join(dir, "node_modules", "acme-plugin") + const scope = path.join(dir, "node_modules", "scope-plugin") + await fs.mkdir(acme, { recursive: true }) + await fs.mkdir(scope, { recursive: true }) + await Bun.write( + path.join(acme, "package.json"), + JSON.stringify({ name: "acme-plugin", type: "module", main: "./index.js" }, null, 2), + ) + await Bun.write(path.join(acme, "index.js"), "export default { server: async () => ({}) }\n") + await Bun.write( + path.join(scope, "package.json"), + JSON.stringify({ name: "scope-plugin", type: "module", main: "./index.js" }, null, 2), + ) + await Bun.write(path.join(scope, "index.js"), "export default { server: async () => ({}) }\n") + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: ["acme-plugin", "scope-plugin@2.3.4"] }, null, 2), + ) + + return { acme, scope } + }, + }) + + const install = spyOn(BunProc, "install").mockImplementation(async (pkg) => { + if (pkg === "acme-plugin") return tmp.extra.acme + return tmp.extra.scope + }) + + try { + await load(tmp.path) + + expect(install.mock.calls).toContainEqual(["acme-plugin", "latest"]) + expect(install.mock.calls).toContainEqual(["scope-plugin", "2.3.4"]) + } finally { + install.mockRestore() + } + }) + + test("loads npm server plugin from package ./server export", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const mod = path.join(dir, "mods", "acme-plugin") + const mark = path.join(dir, "server-called.txt") + await fs.mkdir(mod, { recursive: true }) + + await Bun.write( + path.join(mod, "package.json"), + JSON.stringify( + { + name: "acme-plugin", + type: "module", + exports: { + ".": "./index.js", + "./server": "./server.js", + "./tui": "./tui.js", + }, + }, + null, + 2, + ), + ) + await Bun.write(path.join(mod, "index.js"), 'import "./main-throws.js"\nexport default {}\n') + await Bun.write(path.join(mod, "main-throws.js"), 'throw new Error("main loaded")\n') + await Bun.write( + path.join(mod, "server.js"), + [ + "export default {", + " server: async () => {", + ` await Bun.write(${JSON.stringify(mark)}, "called")`, + " return {}", + " },", + "}", + "", + ].join("\n"), + ) + await Bun.write(path.join(mod, "tui.js"), "export default {}\n") + + await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ plugin: ["acme-plugin@1.0.0"] }, null, 2)) + + return { + mod, + mark, + } + }, + }) + + const install = spyOn(BunProc, "install").mockResolvedValue(tmp.extra.mod) + + try { + await load(tmp.path) + expect(await Bun.file(tmp.extra.mark).text()).toBe("called") + } finally { + install.mockRestore() + } + }) + + test("rejects npm server export that resolves outside plugin directory", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const mod = path.join(dir, "mods", "acme-plugin") + const outside = path.join(dir, "outside") + const mark = path.join(dir, "outside-server.txt") + await fs.mkdir(mod, { recursive: true }) + await fs.mkdir(outside, { recursive: true }) + + await Bun.write( + path.join(mod, "package.json"), + JSON.stringify( + { + name: "acme-plugin", + type: "module", + exports: { + ".": "./index.js", + "./server": "./escape/server.js", + }, + }, + null, + 2, + ), + ) + await Bun.write(path.join(mod, "index.js"), "export default {}\n") + await Bun.write( + path.join(outside, "server.js"), + [ + "export default {", + " server: async () => {", + ` await Bun.write(${JSON.stringify(mark)}, "outside")`, + " return {}", + " },", + "}", + "", + ].join("\n"), + ) + await fs.symlink(outside, path.join(mod, "escape"), process.platform === "win32" ? "junction" : "dir") + + await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ plugin: ["acme-plugin"] }, null, 2)) + + return { + mod, + mark, + } + }, + }) + + const install = spyOn(BunProc, "install").mockResolvedValue(tmp.extra.mod) + + try { + const errors = await errs(tmp.path) + const called = await Bun.file(tmp.extra.mark) + .text() + .then(() => true) + .catch(() => false) + expect(called).toBe(false) + expect(errors.some((x) => x.includes("outside plugin directory"))).toBe(true) + } finally { + install.mockRestore() + } + }) + + test("skips legacy codex and copilot auth plugin specs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify( + { + plugin: ["opencode-openai-codex-auth@1.0.0", "opencode-copilot-auth@1.0.0", "regular-plugin@1.0.0"], + }, + null, + 2, + ), + ) + }, + }) + + const install = spyOn(BunProc, "install").mockResolvedValue("") + + try { + await load(tmp.path) + + const pkgs = install.mock.calls.map((call) => call[0]) + expect(pkgs).toContain("regular-plugin") + expect(pkgs).not.toContain("opencode-openai-codex-auth") + expect(pkgs).not.toContain("opencode-copilot-auth") + } finally { + install.mockRestore() + } + }) + + test("publishes session.error when install fails", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ plugin: ["broken-plugin@9.9.9"] }, null, 2)) + }, + }) + + const install = spyOn(BunProc, "install").mockRejectedValue(new Error("boom")) + + try { + const errors = await errs(tmp.path) + + expect(errors.some((x) => x.includes("Failed to install plugin broken-plugin@9.9.9") && x.includes("boom"))).toBe( + true, + ) + } finally { + install.mockRestore() + } + }) + + test("publishes session.error when plugin init throws", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = pathToFileURL(path.join(dir, "throws.ts")).href + await Bun.write( + path.join(dir, "throws.ts"), + [ + "export default {", + ' id: "demo.throws",', + " server: async () => {", + ' throw new Error("explode")', + " },", + "}", + "", + ].join("\n"), + ) + + await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ plugin: [file] }, null, 2)) + + return { file } + }, + }) + + const errors = await errs(tmp.path) + + expect(errors.some((x) => x.includes(`Failed to load plugin ${tmp.extra.file}: explode`))).toBe(true) + }) + + test("publishes session.error when plugin module has invalid export", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = pathToFileURL(path.join(dir, "invalid.ts")).href + await Bun.write( + path.join(dir, "invalid.ts"), + ["export default {", ' id: "demo.invalid",', " nope: true,", "}", ""].join("\n"), + ) + + await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ plugin: [file] }, null, 2)) + + return { file } + }, + }) + + const errors = await errs(tmp.path) + + expect(errors.some((x) => x.includes(`Failed to load plugin ${tmp.extra.file}`))).toBe(true) + }) + + test("publishes session.error when plugin import fails", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const missing = pathToFileURL(path.join(dir, "missing-plugin.ts")).href + await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ plugin: [missing] }, null, 2)) + + return { missing } + }, + }) + + const errors = await errs(tmp.path) + + expect(errors.some((x) => x.includes(`Failed to load plugin ${tmp.extra.missing}`))).toBe(true) + }) + + test("loads object plugin via plugin.server", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "object-plugin.ts") + const mark = path.join(dir, "object-called.txt") + await Bun.write( + file, + [ + "const plugin = {", + ' id: "demo.object",', + " server: async () => {", + ` await Bun.write(${JSON.stringify(mark)}, \"called\")`, + " return {}", + " },", + "}", + "export default plugin", + "", + ].join("\n"), + ) + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: [pathToFileURL(file).href] }, null, 2), + ) + + return { mark } + }, + }) + + await load(tmp.path) + expect(await fs.readFile(tmp.extra.mark, "utf8")).toBe("called") + }) + + test("passes tuple plugin options into server plugin", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "options-plugin.ts") + const mark = path.join(dir, "options.json") + await Bun.write( + file, + [ + "const plugin = {", + ' id: "demo.options",', + " server: async (_input, options) => {", + ` await Bun.write(${JSON.stringify(mark)}, JSON.stringify(options ?? null))`, + " return {}", + " },", + "}", + "export default plugin", + "", + ].join("\n"), + ) + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: [[pathToFileURL(file).href, { source: "tuple", enabled: true }]] }, null, 2), + ) + + return { mark } + }, + }) + + await load(tmp.path) + expect(await Filesystem.readJson<{ source: string; enabled: boolean }>(tmp.extra.mark)).toEqual({ + source: "tuple", + enabled: true, + }) + }) + + test("skips external plugins in pure mode", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + const mark = path.join(dir, "called.txt") + await Bun.write( + file, + [ + "export default {", + ' id: "demo.pure",', + " server: async () => {", + ` await Bun.write(${JSON.stringify(mark)}, \"called\")`, + " return {}", + " },", + "}", + "", + ].join("\n"), + ) + + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ plugin: [pathToFileURL(file).href] }, null, 2), + ) + + return { mark } + }, + }) + + const pure = process.env.OPENCODE_PURE + process.env.OPENCODE_PURE = "1" + + try { + await load(tmp.path) + const called = await fs + .readFile(tmp.extra.mark, "utf8") + .then(() => true) + .catch(() => false) + expect(called).toBe(false) + } finally { + if (pure === undefined) { + delete process.env.OPENCODE_PURE + } else { + process.env.OPENCODE_PURE = pure + } + } + }) +}) diff --git a/packages/opencode/test/plugin/meta.test.ts b/packages/opencode/test/plugin/meta.test.ts new file mode 100644 index 0000000000..0571740667 --- /dev/null +++ b/packages/opencode/test/plugin/meta.test.ts @@ -0,0 +1,137 @@ +import { afterEach, describe, expect, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { pathToFileURL } from "url" + +import { tmpdir } from "../fixture/fixture" +import { Process } from "../../src/util/process" +import { Filesystem } from "../../src/util/filesystem" + +const { PluginMeta } = await import("../../src/plugin/meta") +const root = path.join(import.meta.dir, "../..") +const worker = path.join(import.meta.dir, "../fixture/plugin-meta-worker.ts") + +function run(input: { file: string; spec: string; target: string; id: string }) { + return Process.run([process.execPath, worker, JSON.stringify(input)], { + cwd: root, + nothrow: true, + }) +} + +async function map(file: string): Promise> { + return Filesystem.readJson>(file) +} + +afterEach(() => { + delete process.env.OPENCODE_PLUGIN_META_FILE +}) + +describe("plugin.meta", () => { + test("tracks file plugin loads and changes", async () => { + await using tmp = await tmpdir<{ file: string }>({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + await Bun.write(file, "export default async () => ({})\n") + return { file } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "state", "plugin-meta.json") + const file = process.env.OPENCODE_PLUGIN_META_FILE! + const spec = pathToFileURL(tmp.extra.file).href + + const one = await PluginMeta.touch(spec, spec, "demo.file") + expect(one.state).toBe("first") + expect(one.entry.source).toBe("file") + expect(one.entry.id).toBe("demo.file") + expect(one.entry.modified).toBeDefined() + + const two = await PluginMeta.touch(spec, spec, "demo.file") + expect(two.state).toBe("same") + expect(two.entry.load_count).toBe(2) + + await Bun.write(tmp.extra.file, "export default async () => ({ ok: true })\n") + const stamp = new Date(Date.now() + 10_000) + await fs.utimes(tmp.extra.file, stamp, stamp) + + const three = await PluginMeta.touch(spec, spec, "demo.file") + expect(three.state).toBe("updated") + expect(three.entry.load_count).toBe(3) + expect((three.entry.modified ?? 0) > (one.entry.modified ?? 0)).toBe(true) + + const all = await PluginMeta.list() + expect(Object.values(all).some((item) => item.spec === spec && item.source === "file")).toBe(true) + const saved = await map<{ spec: string; load_count: number }>(file) + expect(saved["demo.file"]?.spec).toBe(spec) + expect(saved["demo.file"]?.load_count).toBe(3) + }) + + test("tracks npm plugin versions", async () => { + await using tmp = await tmpdir<{ mod: string; pkg: string }>({ + init: async (dir) => { + const mod = path.join(dir, "node_modules", "acme-plugin") + const pkg = path.join(mod, "package.json") + await fs.mkdir(mod, { recursive: true }) + await Bun.write(pkg, JSON.stringify({ name: "acme-plugin", version: "1.0.0" }, null, 2)) + return { mod, pkg } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "state", "plugin-meta.json") + const file = process.env.OPENCODE_PLUGIN_META_FILE! + + const one = await PluginMeta.touch("acme-plugin@latest", tmp.extra.mod, "acme-plugin") + expect(one.state).toBe("first") + expect(one.entry.source).toBe("npm") + expect(one.entry.requested).toBe("latest") + expect(one.entry.version).toBe("1.0.0") + + await Bun.write(tmp.extra.pkg, JSON.stringify({ name: "acme-plugin", version: "1.1.0" }, null, 2)) + + const two = await PluginMeta.touch("acme-plugin@latest", tmp.extra.mod, "acme-plugin") + expect(two.state).toBe("updated") + expect(two.entry.version).toBe("1.1.0") + expect(two.entry.load_count).toBe(2) + + const all = await PluginMeta.list() + expect(Object.values(all).some((item) => item.id === "acme-plugin" && item.version === "1.1.0")).toBe(true) + const saved = await map<{ id: string; version?: string }>(file) + expect(Object.values(saved).some((item) => item.id === "acme-plugin" && item.version === "1.1.0")).toBe(true) + }) + + test("serializes concurrent metadata updates across processes", async () => { + await using tmp = await tmpdir<{ file: string }>({ + init: async (dir) => { + const file = path.join(dir, "plugin.ts") + await Bun.write(file, "export default async () => ({})\n") + return { file } + }, + }) + + process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "state", "plugin-meta.json") + const file = process.env.OPENCODE_PLUGIN_META_FILE! + const spec = pathToFileURL(tmp.extra.file).href + const n = 12 + + const out = await Promise.all( + Array.from({ length: n }, () => + run({ + file, + spec, + target: spec, + id: "demo.file", + }), + ), + ) + + expect(out.map((item) => item.code)).toEqual(Array.from({ length: n }, () => 0)) + expect(out.map((item) => item.stderr.toString()).filter(Boolean)).toEqual([]) + + const all = await PluginMeta.list() + const hit = Object.values(all).find((item) => item.spec === spec) + expect(hit?.load_count).toBe(n) + + const saved = await map<{ spec: string; load_count: number }>(file) + expect(Object.values(saved).find((item) => item.spec === spec)?.load_count).toBe(n) + }, 20_000) +}) diff --git a/packages/opencode/test/util/error.test.ts b/packages/opencode/test/util/error.test.ts new file mode 100644 index 0000000000..e536f3c4ea --- /dev/null +++ b/packages/opencode/test/util/error.test.ts @@ -0,0 +1,38 @@ +import { describe, expect, test } from "bun:test" +import { errorData, errorFormat, errorMessage } from "../../src/util/error" + +describe("util.error", () => { + test("formats native Error instances", () => { + const err = new Error("boom") + expect(errorMessage(err)).toBe("boom") + expect(errorFormat(err)).toContain("boom") + + const data = errorData(err) + expect(data.type).toBe("Error") + expect(data.message).toBe("boom") + expect(String(data.formatted)).toContain("boom") + }) + + test("extracts message from record-like values", () => { + const err = { message: "bad input", code: "E_BAD" } + expect(errorMessage(err)).toBe("bad input") + + const data = errorData(err) + expect(data.message).toBe("bad input") + expect(data.code).toBe("E_BAD") + }) + + test("handles opaque throwables with custom toString", () => { + const err = { + toString() { + return "ResolveMessage: Cannot resolve module" + }, + } + + expect(errorMessage(err)).toBe("ResolveMessage: Cannot resolve module") + + const data = errorData(err) + expect(data.message).toBe("ResolveMessage: Cannot resolve module") + expect(String(data.formatted)).toContain("ResolveMessage") + }) +}) diff --git a/packages/opencode/test/util/flock.test.ts b/packages/opencode/test/util/flock.test.ts new file mode 100644 index 0000000000..fedbfb0697 --- /dev/null +++ b/packages/opencode/test/util/flock.test.ts @@ -0,0 +1,383 @@ +import { describe, expect, test } from "bun:test" +import fs from "fs/promises" +import path from "path" +import { Flock } from "../../src/util/flock" +import { Hash } from "../../src/util/hash" +import { Process } from "../../src/util/process" +import { Filesystem } from "../../src/util/filesystem" +import { tmpdir } from "../fixture/fixture" + +const root = path.join(import.meta.dir, "../..") +const worker = path.join(import.meta.dir, "../fixture/flock-worker.ts") + +type Msg = { + key: string + dir: string + staleMs?: number + timeoutMs?: number + baseDelayMs?: number + maxDelayMs?: number + holdMs?: number + ready?: string + active?: string + done?: string +} + +function lock(dir: string, key: string) { + return path.join(dir, Hash.fast(key) + ".lock") +} + +function sleep(ms: number) { + return new Promise((resolve) => { + setTimeout(resolve, ms) + }) +} + +async function exists(file: string) { + return fs + .stat(file) + .then(() => true) + .catch(() => false) +} + +async function wait(file: string, timeout = 3_000) { + const stop = Date.now() + timeout + while (Date.now() < stop) { + if (await exists(file)) return + await sleep(20) + } + + throw new Error(`Timed out waiting for file: ${file}`) +} + +function run(msg: Msg) { + return Process.run([process.execPath, worker, JSON.stringify(msg)], { + cwd: root, + nothrow: true, + }) +} + +function spawn(msg: Msg) { + return Process.spawn([process.execPath, worker, JSON.stringify(msg)], { + cwd: root, + stdin: "ignore", + stdout: "pipe", + stderr: "pipe", + }) +} + +describe("util.flock", () => { + test("enforces mutual exclusion under process contention", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const done = path.join(tmp.path, "done.log") + const active = path.join(tmp.path, "active") + const key = "flock:stress" + const n = 16 + + const out = await Promise.all( + Array.from({ length: n }, () => + run({ + key, + dir, + done, + active, + holdMs: 30, + staleMs: 1_000, + timeoutMs: 15_000, + }), + ), + ) + + expect(out.map((x) => x.code)).toEqual(Array.from({ length: n }, () => 0)) + expect(out.map((x) => x.stderr.toString()).filter(Boolean)).toEqual([]) + + const lines = (await fs.readFile(done, "utf8")) + .split("\n") + .map((x) => x.trim()) + .filter(Boolean) + expect(lines.length).toBe(n) + }, 20_000) + + test("times out while waiting when lock is still healthy", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:timeout" + const ready = path.join(tmp.path, "ready") + const proc = spawn({ + key, + dir, + ready, + holdMs: 20_000, + staleMs: 10_000, + timeoutMs: 30_000, + }) + + try { + await wait(ready, 5_000) + const seen: string[] = [] + const err = await Flock.withLock(key, async () => {}, { + dir, + staleMs: 10_000, + timeoutMs: 1_000, + onWait: (tick) => { + seen.push(tick.key) + }, + }).catch((err) => err) + + expect(err).toBeInstanceOf(Error) + if (!(err instanceof Error)) throw err + expect(err.message).toContain("Timed out waiting for lock") + expect(seen.length).toBeGreaterThan(0) + expect(seen.every((x) => x === key)).toBe(true) + } finally { + await Process.stop(proc).catch(() => undefined) + await proc.exited.catch(() => undefined) + } + }, 15_000) + + test("recovers after a crashed lock owner", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:crash" + const ready = path.join(tmp.path, "ready") + const proc = spawn({ + key, + dir, + ready, + holdMs: 20_000, + staleMs: 500, + timeoutMs: 30_000, + }) + + await wait(ready, 5_000) + await Process.stop(proc) + await proc.exited.catch(() => undefined) + + let hit = false + await Flock.withLock( + key, + async () => { + hit = true + }, + { + dir, + staleMs: 500, + timeoutMs: 8_000, + }, + ) + + expect(hit).toBe(true) + }, 20_000) + + test("breaks stale lock dirs when heartbeat is missing", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:missing-heartbeat" + const lockDir = lock(dir, key) + + await fs.mkdir(lockDir, { recursive: true }) + const old = new Date(Date.now() - 2_000) + await fs.utimes(lockDir, old, old) + + let hit = false + await Flock.withLock( + key, + async () => { + hit = true + }, + { + dir, + staleMs: 200, + timeoutMs: 3_000, + }, + ) + + expect(hit).toBe(true) + }) + + test("recovers when a stale breaker claim was left behind", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:stale-breaker" + const lockDir = lock(dir, key) + const breaker = lockDir + ".breaker" + + await fs.mkdir(lockDir, { recursive: true }) + await fs.mkdir(breaker) + + const old = new Date(Date.now() - 2_000) + await fs.utimes(lockDir, old, old) + await fs.utimes(breaker, old, old) + + let hit = false + await Flock.withLock( + key, + async () => { + hit = true + }, + { + dir, + staleMs: 200, + timeoutMs: 3_000, + }, + ) + + expect(hit).toBe(true) + expect(await exists(breaker)).toBe(false) + }) + + test("fails clearly if lock dir is removed while held", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:compromised" + const lockDir = lock(dir, key) + + const err = await Flock.withLock( + key, + async () => { + await fs.rm(lockDir, { + recursive: true, + force: true, + }) + }, + { + dir, + staleMs: 1_000, + timeoutMs: 3_000, + }, + ).catch((err) => err) + + expect(err).toBeInstanceOf(Error) + if (!(err instanceof Error)) throw err + expect(err.message).toContain("compromised") + + let hit = false + await Flock.withLock( + key, + async () => { + hit = true + }, + { + dir, + staleMs: 200, + timeoutMs: 3_000, + }, + ) + expect(hit).toBe(true) + }) + + test("writes owner metadata while lock is held", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:meta" + const file = path.join(lock(dir, key), "meta.json") + + await Flock.withLock( + key, + async () => { + const json = await Filesystem.readJson<{ + token?: unknown + pid?: unknown + hostname?: unknown + createdAt?: unknown + }>(file) + + expect(typeof json.token).toBe("string") + expect(typeof json.pid).toBe("number") + expect(typeof json.hostname).toBe("string") + expect(typeof json.createdAt).toBe("string") + }, + { + dir, + staleMs: 1_000, + timeoutMs: 3_000, + }, + ) + }) + + test("supports acquire with await using", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:acquire" + const lockDir = lock(dir, key) + + { + await using _ = await Flock.acquire(key, { + dir, + staleMs: 1_000, + timeoutMs: 3_000, + }) + expect(await exists(lockDir)).toBe(true) + } + + expect(await exists(lockDir)).toBe(false) + }) + + test("refuses token mismatch release and recovers from stale", async () => { + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:token" + const lockDir = lock(dir, key) + const meta = path.join(lockDir, "meta.json") + + const err = await Flock.withLock( + key, + async () => { + const json = await Filesystem.readJson<{ token?: string }>(meta) + json.token = "tampered" + await fs.writeFile(meta, JSON.stringify(json, null, 2)) + }, + { + dir, + staleMs: 500, + timeoutMs: 3_000, + }, + ).catch((err) => err) + + expect(err).toBeInstanceOf(Error) + if (!(err instanceof Error)) throw err + expect(err.message).toContain("token mismatch") + expect(await exists(lockDir)).toBe(true) + + let hit = false + await Flock.withLock( + key, + async () => { + hit = true + }, + { + dir, + staleMs: 500, + timeoutMs: 6_000, + }, + ) + expect(hit).toBe(true) + }) + + test("fails clearly on unwritable lock roots", async () => { + if (process.platform === "win32") return + + await using tmp = await tmpdir() + const dir = path.join(tmp.path, "locks") + const key = "flock:perm" + + await fs.mkdir(dir, { recursive: true }) + await fs.chmod(dir, 0o500) + + try { + const err = await Flock.withLock(key, async () => {}, { + dir, + staleMs: 100, + timeoutMs: 500, + }).catch((err) => err) + + expect(err).toBeInstanceOf(Error) + if (!(err instanceof Error)) throw err + const text = err.message + expect(text.includes("EACCES") || text.includes("EPERM")).toBe(true) + } finally { + await fs.chmod(dir, 0o700) + } + }) +}) diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 5004a3ee27..c0565a7a2c 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -10,7 +10,8 @@ }, "exports": { ".": "./src/index.ts", - "./tool": "./src/tool.ts" + "./tool": "./src/tool.ts", + "./tui": "./src/tui.ts" }, "files": [ "dist" @@ -19,7 +20,21 @@ "@opencode-ai/sdk": "workspace:*", "zod": "catalog:" }, + "peerDependencies": { + "@opentui/core": ">=0.1.90", + "@opentui/solid": ">=0.1.90" + }, + "peerDependenciesMeta": { + "@opentui/core": { + "optional": true + }, + "@opentui/solid": { + "optional": true + } + }, "devDependencies": { + "@opentui/core": "0.1.90", + "@opentui/solid": "0.1.90", "@tsconfig/node22": "catalog:", "@types/node": "catalog:", "typescript": "catalog:", diff --git a/packages/plugin/src/index.ts b/packages/plugin/src/index.ts index 8bdb51a2ae..d289689b93 100644 --- a/packages/plugin/src/index.ts +++ b/packages/plugin/src/index.ts @@ -9,7 +9,7 @@ import type { Message, Part, Auth, - Config, + Config as SDKConfig, } from "@opencode-ai/sdk" import type { BunShell } from "./shell.js" @@ -32,7 +32,18 @@ export type PluginInput = { $: BunShell } -export type Plugin = (input: PluginInput) => Promise +export type PluginOptions = Record + +export type Config = Omit & { + plugin?: Array +} + +export type Plugin = (input: PluginInput, options?: PluginOptions) => Promise + +export type PluginModule = { + id?: string + server?: Plugin +} type Rule = { key: string @@ -72,7 +83,7 @@ export type AuthHook = { when?: Rule } > - authorize(inputs?: Record): Promise + authorize(inputs?: Record): Promise } | { type: "api" @@ -116,7 +127,7 @@ export type AuthHook = { )[] } -export type AuthOuathResult = { url: string; instructions: string } & ( +export type AuthOAuthResult = { url: string; instructions: string } & ( | { method: "auto" callback(): Promise< @@ -161,6 +172,9 @@ export type AuthOuathResult = { url: string; instructions: string } & ( } ) +/** @deprecated Use AuthOAuthResult instead. */ +export type AuthOuathResult = AuthOAuthResult + export interface Hooks { event?: (input: { event: Event }) => Promise config?: (input: Config) => Promise diff --git a/packages/plugin/src/tui.ts b/packages/plugin/src/tui.ts new file mode 100644 index 0000000000..62747884fb --- /dev/null +++ b/packages/plugin/src/tui.ts @@ -0,0 +1,419 @@ +import type { + OpencodeClient, + Event, + LspStatus, + McpStatus, + Todo, + Message, + Part, + Provider, + PermissionRequest, + QuestionRequest, + SessionStatus, + Workspace, + Config as SdkConfig, +} from "@opencode-ai/sdk/v2" +import type { CliRenderer, ParsedKey, RGBA } from "@opentui/core" +import type { JSX, SolidPlugin } from "@opentui/solid" +import type { Config as PluginConfig, Plugin, PluginModule, PluginOptions } from "./index.js" + +export type { CliRenderer, SlotMode } from "@opentui/core" + +export type TuiRouteCurrent = + | { + name: "home" + } + | { + name: "session" + params: { + sessionID: string + initialPrompt?: unknown + } + } + | { + name: string + params?: Record + } + +export type TuiRouteDefinition = { + name: string + render: (input: { params?: Record }) => JSX.Element +} + +export type TuiCommand = { + title: string + value: string + description?: string + category?: string + keybind?: string + suggested?: boolean + hidden?: boolean + enabled?: boolean + slash?: { + name: string + aliases?: string[] + } + onSelect?: () => void +} + +export type TuiKeybind = { + name: string + ctrl: boolean + meta: boolean + shift: boolean + super?: boolean + leader: boolean +} + +export type TuiKeybindMap = Record + +export type TuiKeybindSet = { + readonly all: TuiKeybindMap + get: (name: string) => string + match: (name: string, evt: ParsedKey) => boolean + print: (name: string) => string +} + +export type TuiDialogProps = { + size?: "medium" | "large" | "xlarge" + onClose: () => void + children?: JSX.Element +} + +export type TuiDialogStack = { + replace: (render: () => JSX.Element, onClose?: () => void) => void + clear: () => void + setSize: (size: "medium" | "large" | "xlarge") => void + readonly size: "medium" | "large" | "xlarge" + readonly depth: number + readonly open: boolean +} + +export type TuiDialogAlertProps = { + title: string + message: string + onConfirm?: () => void +} + +export type TuiDialogConfirmProps = { + title: string + message: string + onConfirm?: () => void + onCancel?: () => void +} + +export type TuiDialogPromptProps = { + title: string + description?: () => JSX.Element + placeholder?: string + value?: string + onConfirm?: (value: string) => void + onCancel?: () => void +} + +export type TuiDialogSelectOption = { + title: string + value: Value + description?: string + footer?: JSX.Element | string + category?: string + disabled?: boolean + onSelect?: () => void +} + +export type TuiDialogSelectProps = { + title: string + placeholder?: string + options: TuiDialogSelectOption[] + flat?: boolean + onMove?: (option: TuiDialogSelectOption) => void + onFilter?: (query: string) => void + onSelect?: (option: TuiDialogSelectOption) => void + skipFilter?: boolean + current?: Value +} + +export type TuiToast = { + variant?: "info" | "success" | "warning" | "error" + title?: string + message: string + duration?: number +} + +export type TuiThemeCurrent = { + readonly primary: RGBA + readonly secondary: RGBA + readonly accent: RGBA + readonly error: RGBA + readonly warning: RGBA + readonly success: RGBA + readonly info: RGBA + readonly text: RGBA + readonly textMuted: RGBA + readonly selectedListItemText: RGBA + readonly background: RGBA + readonly backgroundPanel: RGBA + readonly backgroundElement: RGBA + readonly backgroundMenu: RGBA + readonly border: RGBA + readonly borderActive: RGBA + readonly borderSubtle: RGBA + readonly diffAdded: RGBA + readonly diffRemoved: RGBA + readonly diffContext: RGBA + readonly diffHunkHeader: RGBA + readonly diffHighlightAdded: RGBA + readonly diffHighlightRemoved: RGBA + readonly diffAddedBg: RGBA + readonly diffRemovedBg: RGBA + readonly diffContextBg: RGBA + readonly diffLineNumber: RGBA + readonly diffAddedLineNumberBg: RGBA + readonly diffRemovedLineNumberBg: RGBA + readonly markdownText: RGBA + readonly markdownHeading: RGBA + readonly markdownLink: RGBA + readonly markdownLinkText: RGBA + readonly markdownCode: RGBA + readonly markdownBlockQuote: RGBA + readonly markdownEmph: RGBA + readonly markdownStrong: RGBA + readonly markdownHorizontalRule: RGBA + readonly markdownListItem: RGBA + readonly markdownListEnumeration: RGBA + readonly markdownImage: RGBA + readonly markdownImageText: RGBA + readonly markdownCodeBlock: RGBA + readonly syntaxComment: RGBA + readonly syntaxKeyword: RGBA + readonly syntaxFunction: RGBA + readonly syntaxVariable: RGBA + readonly syntaxString: RGBA + readonly syntaxNumber: RGBA + readonly syntaxType: RGBA + readonly syntaxOperator: RGBA + readonly syntaxPunctuation: RGBA + readonly thinkingOpacity: number +} + +export type TuiTheme = { + readonly current: TuiThemeCurrent + readonly selected: string + has: (name: string) => boolean + set: (name: string) => boolean + install: (jsonPath: string) => Promise + mode: () => "dark" | "light" + readonly ready: boolean +} + +export type TuiKV = { + get: (key: string, fallback?: Value) => Value + set: (key: string, value: unknown) => void + readonly ready: boolean +} + +export type TuiState = { + readonly ready: boolean + readonly config: SdkConfig + readonly provider: ReadonlyArray + readonly path: { + state: string + config: string + worktree: string + directory: string + } + readonly vcs: { branch?: string } | undefined + readonly workspace: { + list: () => ReadonlyArray + get: (workspaceID: string) => Workspace | undefined + } + session: { + count: () => number + diff: (sessionID: string) => ReadonlyArray + todo: (sessionID: string) => ReadonlyArray + messages: (sessionID: string) => ReadonlyArray + status: (sessionID: string) => SessionStatus | undefined + permission: (sessionID: string) => ReadonlyArray + question: (sessionID: string) => ReadonlyArray + } + part: (messageID: string) => ReadonlyArray + lsp: () => ReadonlyArray + mcp: () => ReadonlyArray +} + +type TuiConfigView = Pick & + NonNullable & { + plugin_enabled?: Record + } + +export type TuiApp = { + readonly version: string +} + +type Frozen = Value extends (...args: never[]) => unknown + ? Value + : Value extends ReadonlyArray + ? ReadonlyArray> + : Value extends object + ? { readonly [Key in keyof Value]: Frozen } + : Value + +export type TuiSidebarMcpItem = { + name: string + status: McpStatus["status"] + error?: string +} + +export type TuiSidebarLspItem = Pick + +export type TuiSidebarTodoItem = Pick + +export type TuiSidebarFileItem = { + file: string + additions: number + deletions: number +} + +export type TuiSlotMap = { + app: {} + home_logo: {} + home_bottom: {} + sidebar_title: { + session_id: string + title: string + share_url?: string + } + sidebar_content: { + session_id: string + } + sidebar_footer: { + session_id: string + } +} + +export type TuiSlotContext = { + theme: TuiTheme +} + +type SlotCore = SolidPlugin + +export type TuiSlotPlugin = Omit & { + id?: never +} + +export type TuiSlots = { + register: (plugin: TuiSlotPlugin) => string +} + +export type TuiEventBus = { + on: (type: Type, handler: (event: Extract) => void) => () => void +} + +export type TuiDispose = () => void | Promise + +export type TuiLifecycle = { + readonly signal: AbortSignal + onDispose: (fn: TuiDispose) => () => void +} + +export type TuiPluginState = "first" | "updated" | "same" + +export type TuiPluginEntry = { + id: string + source: "file" | "npm" | "internal" + spec: string + target: string + requested?: string + version?: string + modified?: number + first_time: number + last_time: number + time_changed: number + load_count: number + fingerprint: string +} + +export type TuiPluginMeta = TuiPluginEntry & { + state: TuiPluginState +} + +export type TuiPluginStatus = { + id: string + source: TuiPluginEntry["source"] + spec: string + target: string + enabled: boolean + active: boolean +} + +export type TuiPluginInstallOptions = { + global?: boolean +} + +export type TuiPluginInstallResult = + | { + ok: true + dir: string + tui: boolean + } + | { + ok: false + message: string + missing?: boolean + } + +export type TuiWorkspace = { + current: () => string | undefined + set: (workspaceID?: string) => void +} + +export type TuiPluginApi = { + app: TuiApp + command: { + register: (cb: () => TuiCommand[]) => () => void + trigger: (value: string) => void + } + route: { + register: (routes: TuiRouteDefinition[]) => () => void + navigate: (name: string, params?: Record) => void + readonly current: TuiRouteCurrent + } + ui: { + Dialog: (props: TuiDialogProps) => JSX.Element + DialogAlert: (props: TuiDialogAlertProps) => JSX.Element + DialogConfirm: (props: TuiDialogConfirmProps) => JSX.Element + DialogPrompt: (props: TuiDialogPromptProps) => JSX.Element + DialogSelect: (props: TuiDialogSelectProps) => JSX.Element + toast: (input: TuiToast) => void + dialog: TuiDialogStack + } + keybind: { + match: (key: string, evt: ParsedKey) => boolean + print: (key: string) => string + create: (defaults: TuiKeybindMap, overrides?: Record) => TuiKeybindSet + } + readonly tuiConfig: Frozen + kv: TuiKV + state: TuiState + theme: TuiTheme + client: OpencodeClient + scopedClient: (workspaceID?: string) => OpencodeClient + workspace: TuiWorkspace + event: TuiEventBus + renderer: CliRenderer + slots: TuiSlots + plugins: { + list: () => ReadonlyArray + activate: (id: string) => Promise + deactivate: (id: string) => Promise + add: (spec: string) => Promise + install: (spec: string, options?: TuiPluginInstallOptions) => Promise + } + lifecycle: TuiLifecycle +} + +export type TuiPlugin = (api: TuiPluginApi, options: PluginOptions | undefined, meta: TuiPluginMeta) => Promise + +export type TuiPluginModule = PluginModule & { + tui?: TuiPlugin +} diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 4a2ae95918..ce5a47f84b 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -1447,7 +1447,15 @@ export type Config = { watcher?: { ignore?: Array } - plugin?: Array + plugin?: Array< + | string + | [ + string, + { + [key: string]: unknown + }, + ] + > /** * Enable or disable snapshot tracking. When false, filesystem snapshots are not recorded and undoing or reverting will not undo/redo file changes. Defaults to true. */ From 21023337fa8011568b2570a3bd49fffed842ce86 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 14:01:28 +0000 Subject: [PATCH 011/142] chore: generate --- .../opencode/test/cli/tui/theme-store.test.ts | 5 +-- packages/sdk/js/src/v2/gen/types.gen.ts | 8 ++--- packages/sdk/openapi.json | 31 +++++++++++++++---- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/packages/opencode/test/cli/tui/theme-store.test.ts b/packages/opencode/test/cli/tui/theme-store.test.ts index 23dcfb71cf..936e3e6f7c 100644 --- a/packages/opencode/test/cli/tui/theme-store.test.ts +++ b/packages/opencode/test/cli/tui/theme-store.test.ts @@ -1,7 +1,8 @@ import { expect, test } from "bun:test" -const { DEFAULT_THEMES, allThemes, addTheme, hasTheme, resolveTheme } = - await import("../../../src/cli/cmd/tui/context/theme") +const { DEFAULT_THEMES, allThemes, addTheme, hasTheme, resolveTheme } = await import( + "../../../src/cli/cmd/tui/context/theme" +) test("addTheme writes into module theme store", () => { const name = `plugin-theme-${Date.now()}` diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index ce5a47f84b..4d0b13539f 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -1447,6 +1447,10 @@ export type Config = { watcher?: { ignore?: Array } + /** + * Enable or disable snapshot tracking. When false, filesystem snapshots are not recorded and undoing or reverting will not undo/redo file changes. Defaults to true. + */ + snapshot?: boolean plugin?: Array< | string | [ @@ -1456,10 +1460,6 @@ export type Config = { }, ] > - /** - * Enable or disable snapshot tracking. When false, filesystem snapshots are not recorded and undoing or reverting will not undo/redo file changes. Defaults to true. - */ - snapshot?: boolean /** * Control sharing behavior:'manual' allows manual sharing via commands, 'auto' enables automatic sharing, 'disabled' disables all sharing */ diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index 245df2ce19..007391177b 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -10961,16 +10961,35 @@ } } }, - "plugin": { - "type": "array", - "items": { - "type": "string" - } - }, "snapshot": { "description": "Enable or disable snapshot tracking. When false, filesystem snapshots are not recorded and undoing or reverting will not undo/redo file changes. Defaults to true.", "type": "boolean" }, + "plugin": { + "type": "array", + "items": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "array", + "prefixItems": [ + { + "type": "string" + }, + { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": {} + } + ] + } + ] + } + }, "share": { "description": "Control sharing behavior:'manual' allows manual sharing via commands, 'auto' enables automatic sharing, 'disabled' disables all sharing", "type": "string", From decb5e68eea8ac3090e870deaba243cf30d203fc Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 10:15:51 -0400 Subject: [PATCH 012/142] effectify Skill service internals (#19364) --- packages/opencode/src/skill/index.ts | 146 ++++++++++++++++++--------- 1 file changed, 96 insertions(+), 50 deletions(-) diff --git a/packages/opencode/src/skill/index.ts b/packages/opencode/src/skill/index.ts index aa3829683a..e92e45b1ce 100644 --- a/packages/opencode/src/skill/index.ts +++ b/packages/opencode/src/skill/index.ts @@ -63,16 +63,23 @@ export namespace Skill { readonly available: (agent?: Agent.Info) => Effect.Effect } - const add = async (state: State, match: string) => { - const md = await ConfigMarkdown.parse(match).catch(async (err) => { - const message = ConfigMarkdown.FrontmatterError.isInstance(err) - ? err.data.message - : `Failed to parse skill ${match}` - const { Session } = await import("@/session") - Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) - log.error("failed to load skill", { skill: match, err }) - return undefined - }) + const add = Effect.fnUntraced(function* (state: State, match: string, bus: Bus.Interface) { + const md = yield* Effect.tryPromise({ + try: () => ConfigMarkdown.parse(match), + catch: (err) => err, + }).pipe( + Effect.catch( + Effect.fnUntraced(function* (err) { + const message = ConfigMarkdown.FrontmatterError.isInstance(err) + ? err.data.message + : `Failed to parse skill ${match}` + const { Session } = yield* Effect.promise(() => import("@/session")) + yield* bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + log.error("failed to load skill", { skill: match, err }) + return undefined + }), + ), + ) if (!md) return @@ -94,80 +101,115 @@ export namespace Skill { location: match, content: md.content, } - } + }) - const scan = async (state: State, root: string, pattern: string, opts?: { dot?: boolean; scope?: string }) => { - return Glob.scan(pattern, { - cwd: root, - absolute: true, - include: "file", - symlink: true, - dot: opts?.dot, - }) - .then((matches) => Promise.all(matches.map((match) => add(state, match)))) - .catch((error) => { - if (!opts?.scope) throw error + const scan = Effect.fnUntraced(function* ( + state: State, + bus: Bus.Interface, + root: string, + pattern: string, + opts?: { dot?: boolean; scope?: string }, + ) { + const matches = yield* Effect.tryPromise({ + try: () => + Glob.scan(pattern, { + cwd: root, + absolute: true, + include: "file", + symlink: true, + dot: opts?.dot, + }), + catch: (error) => error, + }).pipe( + Effect.catch((error) => { + if (!opts?.scope) return Effect.die(error) log.error(`failed to scan ${opts.scope} skills`, { dir: root, error }) - }) - } + return Effect.succeed([] as string[]) + }), + ) - async function loadSkills(state: State, discovery: Discovery.Interface, directory: string, worktree: string) { + yield* Effect.forEach(matches, (match) => add(state, match, bus), { + concurrency: "unbounded", + discard: true, + }) + }) + + const loadSkills = Effect.fnUntraced(function* ( + state: State, + config: Config.Interface, + discovery: Discovery.Interface, + bus: Bus.Interface, + directory: string, + worktree: string, + ) { if (!Flag.OPENCODE_DISABLE_EXTERNAL_SKILLS) { for (const dir of EXTERNAL_DIRS) { const root = path.join(Global.Path.home, dir) - if (!(await Filesystem.isDir(root))) continue - await scan(state, root, EXTERNAL_SKILL_PATTERN, { dot: true, scope: "global" }) + const isDir = yield* Effect.promise(() => Filesystem.isDir(root)) + if (!isDir) continue + yield* scan(state, bus, root, EXTERNAL_SKILL_PATTERN, { dot: true, scope: "global" }) } - for await (const root of Filesystem.up({ - targets: EXTERNAL_DIRS, - start: directory, - stop: worktree, - })) { - await scan(state, root, EXTERNAL_SKILL_PATTERN, { dot: true, scope: "project" }) + const upDirs = yield* Effect.promise(async () => { + const dirs: string[] = [] + for await (const root of Filesystem.up({ + targets: EXTERNAL_DIRS, + start: directory, + stop: worktree, + })) { + dirs.push(root) + } + return dirs + }) + + for (const root of upDirs) { + yield* scan(state, bus, root, EXTERNAL_SKILL_PATTERN, { dot: true, scope: "project" }) } } - for (const dir of await Config.directories()) { - await scan(state, dir, OPENCODE_SKILL_PATTERN) + const configDirs = yield* config.directories() + for (const dir of configDirs) { + yield* scan(state, bus, dir, OPENCODE_SKILL_PATTERN) } - const cfg = await Config.get() + const cfg = yield* config.get() for (const item of cfg.skills?.paths ?? []) { const expanded = item.startsWith("~/") ? path.join(os.homedir(), item.slice(2)) : item const dir = path.isAbsolute(expanded) ? expanded : path.join(directory, expanded) - if (!(await Filesystem.isDir(dir))) { + const isDir = yield* Effect.promise(() => Filesystem.isDir(dir)) + if (!isDir) { log.warn("skill path not found", { path: dir }) continue } - await scan(state, dir, SKILL_PATTERN) + yield* scan(state, bus, dir, SKILL_PATTERN) } for (const url of cfg.skills?.urls ?? []) { - for (const dir of await Effect.runPromise(discovery.pull(url))) { + const pulledDirs = yield* discovery.pull(url) + for (const dir of pulledDirs) { state.dirs.add(dir) - await scan(state, dir, SKILL_PATTERN) + yield* scan(state, bus, dir, SKILL_PATTERN) } } log.info("init", { count: Object.keys(state.skills).length }) - } + }) export class Service extends ServiceMap.Service()("@opencode/Skill") {} - export const layer: Layer.Layer = Layer.effect( + export const layer: Layer.Layer = Layer.effect( Service, Effect.gen(function* () { const discovery = yield* Discovery.Service + const config = yield* Config.Service + const bus = yield* Bus.Service const state = yield* InstanceState.make( - Effect.fn("Skill.state")((ctx) => - Effect.gen(function* () { - const s: State = { skills: {}, dirs: new Set() } - yield* Effect.promise(() => loadSkills(s, discovery, ctx.directory, ctx.worktree)) - return s - }), - ), + Effect.fn("Skill.state")(function* (ctx) { + const s: State = { skills: {}, dirs: new Set() } + yield* loadSkills(s, config, discovery, bus, ctx.directory, ctx.worktree) + return s + }), ) const get = Effect.fn("Skill.get")(function* (name: string) { @@ -196,7 +238,11 @@ export namespace Skill { }), ) - export const defaultLayer: Layer.Layer = layer.pipe(Layer.provide(Discovery.defaultLayer)) + export const defaultLayer: Layer.Layer = layer.pipe( + Layer.provide(Discovery.defaultLayer), + Layer.provide(Config.defaultLayer), + Layer.provide(Bus.layer), + ) export function fmt(list: Info[], opts: { verbose: boolean }) { if (list.length === 0) return "No skills are currently available." From bb8d2cdd108618c1057a8890ac1e655198db866e Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 14:45:53 +0000 Subject: [PATCH 013/142] chore: update nix node_modules hashes --- nix/hashes.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/hashes.json b/nix/hashes.json index 5eaac2de42..4971aa4eb9 100644 --- a/nix/hashes.json +++ b/nix/hashes.json @@ -1,8 +1,8 @@ { "nodeModules": { - "x86_64-linux": "sha256-a2eTu0ISjqPuojkNPnPXzVb/PLlDvw/DXDvmxi9RD5k=", - "aarch64-linux": "sha256-yLaTXRzZ7M/6j2WDP+IL1YCY3+rYY4Qmq3xTDatNzD0=", - "aarch64-darwin": "sha256-uGSVe8S/QvnW+RCI/CxzrlfAAJ1YA+NrhzRE0GTcnvE=", - "x86_64-darwin": "sha256-tplWx2tLg6jWvOBmM41lODJV8pHpkAm4HKWRG7lpkcU=" + "x86_64-linux": "sha256-4XhUHjgqinKxOeT8K5hGAjpFA2vzOp8QpEg0uYCZwvg=", + "aarch64-linux": "sha256-X2YTNOpJocIkWkkfS8RnuDW+tvj4riHs7CXM+cS9iv0=", + "aarch64-darwin": "sha256-pN0rY+cpdW+6gNWeegVprdmhc2H72OZ9WxKDIs1fvJM=", + "x86_64-darwin": "sha256-l8+Yz/6UfSPJrdgfcqy/L2SvxN2i9Apv2R0B61rpEmw=" } } From e528ed5d86dc386044552c9306af0e35baea1b95 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 11:20:11 -0400 Subject: [PATCH 014/142] effectify Plugin service internals (#19365) --- packages/opencode/src/plugin/index.ts | 128 ++++++++++-------- .../test/plugin/auth-override.test.ts | 5 +- 2 files changed, 70 insertions(+), 63 deletions(-) diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts index e7bb2a91d0..fe4be0372c 100644 --- a/packages/opencode/src/plugin/index.ts +++ b/packages/opencode/src/plugin/index.ts @@ -176,76 +176,86 @@ export namespace Plugin { Service, Effect.gen(function* () { const bus = yield* Bus.Service + const config = yield* Config.Service const cache = yield* InstanceState.make( Effect.fn("Plugin.state")(function* (ctx) { const hooks: Hooks[] = [] - yield* Effect.promise(async () => { - const { Server } = await import("../server/server") + const { Server } = yield* Effect.promise(() => import("../server/server")) - const client = createOpencodeClient({ - baseUrl: "http://localhost:4096", - directory: ctx.directory, - headers: Flag.OPENCODE_SERVER_PASSWORD - ? { - Authorization: `Basic ${Buffer.from(`${Flag.OPENCODE_SERVER_USERNAME ?? "opencode"}:${Flag.OPENCODE_SERVER_PASSWORD}`).toString("base64")}`, - } - : undefined, - fetch: async (...args) => Server.Default().fetch(...args), - }) - const cfg = await Config.get() - const input: PluginInput = { - client, - project: ctx.project, - worktree: ctx.worktree, - directory: ctx.directory, - get serverUrl(): URL { - return Server.url ?? new URL("http://localhost:4096") - }, - $: Bun.$, - } + const client = createOpencodeClient({ + baseUrl: "http://localhost:4096", + directory: ctx.directory, + headers: Flag.OPENCODE_SERVER_PASSWORD + ? { + Authorization: `Basic ${Buffer.from(`${Flag.OPENCODE_SERVER_USERNAME ?? "opencode"}:${Flag.OPENCODE_SERVER_PASSWORD}`).toString("base64")}`, + } + : undefined, + fetch: async (...args) => Server.Default().fetch(...args), + }) + const cfg = yield* config.get() + const input: PluginInput = { + client, + project: ctx.project, + worktree: ctx.worktree, + directory: ctx.directory, + get serverUrl(): URL { + return Server.url ?? new URL("http://localhost:4096") + }, + $: Bun.$, + } - for (const plugin of INTERNAL_PLUGINS) { - log.info("loading internal plugin", { name: plugin.name }) - const init = await plugin(input).catch((err) => { + for (const plugin of INTERNAL_PLUGINS) { + log.info("loading internal plugin", { name: plugin.name }) + const init = yield* Effect.tryPromise({ + try: () => plugin(input), + catch: (err) => { log.error("failed to load internal plugin", { name: plugin.name, error: err }) - }) - if (init) hooks.push(init) - } + }, + }).pipe(Effect.option) + if (init._tag === "Some") hooks.push(init.value) + } - const plugins = Flag.OPENCODE_PURE ? [] : (cfg.plugin ?? []) - if (Flag.OPENCODE_PURE && cfg.plugin?.length) { - log.info("skipping external plugins in pure mode", { count: cfg.plugin.length }) - } - if (plugins.length) await Config.waitForDependencies() + const plugins = Flag.OPENCODE_PURE ? [] : (cfg.plugin ?? []) + if (Flag.OPENCODE_PURE && cfg.plugin?.length) { + log.info("skipping external plugins in pure mode", { count: cfg.plugin.length }) + } + if (plugins.length) yield* config.waitForDependencies() - const loaded = await Promise.all(plugins.map((item) => prepPlugin(item))) - for (const load of loaded) { - if (!load) continue + const loaded = yield* Effect.promise(() => Promise.all(plugins.map((item) => prepPlugin(item)))) + for (const load of loaded) { + if (!load) continue - // Keep plugin execution sequential so hook registration and execution - // order remains deterministic across plugin runs. - await applyPlugin(load, input, hooks).catch((err) => { + // Keep plugin execution sequential so hook registration and execution + // order remains deterministic across plugin runs. + yield* Effect.tryPromise({ + try: () => applyPlugin(load, input, hooks), + catch: (err) => { const message = errorMessage(err) log.error("failed to load plugin", { path: load.spec, error: message }) - Bus.publish(Session.Event.Error, { + return message + }, + }).pipe( + Effect.catch((message) => + bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message: `Failed to load plugin ${load.spec}: ${message}`, }).toObject(), - }) - }) - } + }), + ), + ) + } - // Notify plugins of current config - for (const hook of hooks) { - try { - await (hook as any).config?.(cfg) - } catch (err) { + // Notify plugins of current config + for (const hook of hooks) { + yield* Effect.tryPromise({ + try: () => Promise.resolve((hook as any).config?.(cfg)), + catch: (err) => { log.error("plugin config hook failed", { error: err }) - } - } - }) + }, + }).pipe(Effect.ignore) + } // Subscribe to bus events, fiber interrupted when scope closes yield* bus.subscribeAll().pipe( @@ -270,13 +280,11 @@ export namespace Plugin { >(name: Name, input: Input, output: Output) { if (!name) return output const state = yield* InstanceState.get(cache) - yield* Effect.promise(async () => { - for (const hook of state.hooks) { - const fn = hook[name] as any - if (!fn) continue - await fn(input, output) - } - }) + for (const hook of state.hooks) { + const fn = hook[name] as any + if (!fn) continue + yield* Effect.promise(() => fn(input, output)) + } return output }) @@ -293,7 +301,7 @@ export namespace Plugin { }), ) - export const defaultLayer = layer.pipe(Layer.provide(Bus.layer)) + export const defaultLayer = layer.pipe(Layer.provide(Bus.layer), Layer.provide(Config.defaultLayer)) const { runPromise } = makeRuntime(Service, defaultLayer) export async function trigger< diff --git a/packages/opencode/test/plugin/auth-override.test.ts b/packages/opencode/test/plugin/auth-override.test.ts index c25984be6f..6b77083828 100644 --- a/packages/opencode/test/plugin/auth-override.test.ts +++ b/packages/opencode/test/plugin/auth-override.test.ts @@ -64,12 +64,11 @@ 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. + // Each hook's config call is wrapped in Effect.tryPromise with error logging + Effect.ignore 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]*?\}/ + /for\s*\(const hook of hooks\)\s*\{[\s\S]*?Effect\.tryPromise[\s\S]*?\.config\?\.\([\s\S]*?plugin config hook failed[\s\S]*?Effect\.ignore/ expect(pattern.test(src)).toBe(true) }) }) From a76be695c7d2e60683fe79c8a6dc2c402ab13349 Mon Sep 17 00:00:00 2001 From: James Long Date: Fri, 27 Mar 2026 11:51:21 -0400 Subject: [PATCH 015/142] refactor(core): split out instance and route through workspaces (#19335) --- .../workspace-router-middleware.ts | 45 ++- packages/opencode/src/server/instance.ts | 307 ++++++++++++++++ packages/opencode/src/server/middleware.ts | 29 ++ packages/opencode/src/server/routes/event.ts | 6 +- packages/opencode/src/server/server.ts | 347 +----------------- packages/sdk/js/src/v2/gen/sdk.gen.ts | 224 +++++------ packages/sdk/js/src/v2/gen/types.gen.ts | 94 ++--- packages/sdk/openapi.json | 168 ++++----- 8 files changed, 622 insertions(+), 598 deletions(-) create mode 100644 packages/opencode/src/server/instance.ts create mode 100644 packages/opencode/src/server/middleware.ts diff --git a/packages/opencode/src/control-plane/workspace-router-middleware.ts b/packages/opencode/src/control-plane/workspace-router-middleware.ts index 283350532b..1fc19a22b1 100644 --- a/packages/opencode/src/control-plane/workspace-router-middleware.ts +++ b/packages/opencode/src/control-plane/workspace-router-middleware.ts @@ -3,6 +3,8 @@ import { Flag } from "../flag/flag" import { getAdaptor } from "./adaptors" import { WorkspaceID } from "./schema" import { Workspace } from "./workspace" +import { InstanceRoutes } from "../server/instance" +import { lazy } from "../util/lazy" type Rule = { method?: string; path: string; exact?: boolean; action: "local" | "forward" } @@ -20,16 +22,25 @@ function local(method: string, path: string) { return false } -async function routeRequest(req: Request) { - const url = new URL(req.url) - const raw = url.searchParams.get("workspace") || req.headers.get("x-opencode-workspace") +const routes = lazy(() => InstanceRoutes()) - if (!raw) return +export const WorkspaceRouterMiddleware: MiddlewareHandler = async (c) => { + if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) { + return routes().fetch(c.req.raw, c.env) + } - if (local(req.method, url.pathname)) return + const url = new URL(c.req.url) + const raw = url.searchParams.get("workspace") + + if (!raw) { + return routes().fetch(c.req.raw, c.env) + } + + if (local(c.req.method, url.pathname)) { + return routes().fetch(c.req.raw, c.env) + } const workspaceID = WorkspaceID.make(raw) - const workspace = await Workspace.get(workspaceID) if (!workspace) { return new Response(`Workspace not found: ${workspaceID}`, { @@ -41,27 +52,13 @@ async function routeRequest(req: Request) { } const adaptor = await getAdaptor(workspace.type) - - const headers = new Headers(req.headers) + const headers = new Headers(c.req.raw.headers) headers.delete("x-opencode-workspace") return adaptor.fetch(workspace, `${url.pathname}${url.search}`, { - method: req.method, - body: req.method === "GET" || req.method === "HEAD" ? undefined : await req.arrayBuffer(), - signal: req.signal, + method: c.req.method, + body: c.req.method === "GET" || c.req.method === "HEAD" ? undefined : await c.req.raw.arrayBuffer(), + signal: c.req.raw.signal, headers, }) } - -export const WorkspaceRouterMiddleware: MiddlewareHandler = async (c, next) => { - // Only available in development for now - if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) { - return next() - } - - const response = await routeRequest(c.req.raw) - if (response) { - return response - } - return next() -} diff --git a/packages/opencode/src/server/instance.ts b/packages/opencode/src/server/instance.ts new file mode 100644 index 0000000000..b99cf3d99f --- /dev/null +++ b/packages/opencode/src/server/instance.ts @@ -0,0 +1,307 @@ +import { describeRoute, resolver } from "hono-openapi" +import { Hono } from "hono" +import { proxy } from "hono/proxy" +import z from "zod" +import { createHash } from "node:crypto" +import { Log } from "../util/log" +import { Format } from "../format" +import { TuiRoutes } from "./routes/tui" +import { Instance } from "../project/instance" +import { Vcs } from "../project/vcs" +import { Agent } from "../agent/agent" +import { Skill } from "../skill" +import { Global } from "../global" +import { LSP } from "../lsp" +import { Command } from "../command" +import { Flag } from "../flag/flag" +import { Filesystem } from "@/util/filesystem" +import { QuestionRoutes } from "./routes/question" +import { PermissionRoutes } from "./routes/permission" +import { ProjectRoutes } from "./routes/project" +import { SessionRoutes } from "./routes/session" +import { PtyRoutes } from "./routes/pty" +import { McpRoutes } from "./routes/mcp" +import { FileRoutes } from "./routes/file" +import { ConfigRoutes } from "./routes/config" +import { ExperimentalRoutes } from "./routes/experimental" +import { ProviderRoutes } from "./routes/provider" +import { EventRoutes } from "./routes/event" +import { InstanceBootstrap } from "../project/bootstrap" +import { errorHandler } from "./middleware" + +const log = Log.create({ service: "server" }) + +const embeddedUIPromise = Flag.OPENCODE_DISABLE_EMBEDDED_WEB_UI + ? Promise.resolve(null) + : // @ts-expect-error - generated file at build time + import("opencode-web-ui.gen.ts").then((module) => module.default as Record).catch(() => null) + +const DEFAULT_CSP = + "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:" + +const csp = (hash = "") => + `default-src 'self'; script-src 'self' 'wasm-unsafe-eval'${hash ? ` 'sha256-${hash}'` : ""}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:` + +export const InstanceRoutes = (app?: Hono) => + (app ?? new Hono()) + .onError(errorHandler(log)) + .use(async (c, next) => { + 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 Instance.provide({ + directory, + init: InstanceBootstrap, + async fn() { + return next() + }, + }) + }) + .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, + }) + }, + ) + .get( + "/vcs", + describeRoute({ + summary: "Get VCS info", + description: "Retrieve version control system (VCS) information for the current project, such as git branch.", + operationId: "vcs.get", + responses: { + 200: { + description: "VCS info", + content: { + "application/json": { + schema: resolver(Vcs.Info), + }, + }, + }, + }, + }), + async (c) => { + const branch = await Vcs.branch() + return c.json({ + branch, + }) + }, + ) + .get( + "/command", + describeRoute({ + summary: "List commands", + description: "Get a list of all available commands in the OpenCode system.", + operationId: "command.list", + responses: { + 200: { + description: "List of commands", + content: { + "application/json": { + schema: resolver(Command.Info.array()), + }, + }, + }, + }, + }), + async (c) => { + const commands = await Command.list() + return c.json(commands) + }, + ) + .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()) + }, + ) + .all("/*", async (c) => { + const embeddedWebUI = await embeddedUIPromise + const path = c.req.path + + if (embeddedWebUI) { + const match = embeddedWebUI[path.replace(/^\//, "")] ?? embeddedWebUI["index.html"] ?? null + if (!match) return c.json({ error: "Not Found" }, 404) + const file = Bun.file(match) + if (await file.exists()) { + c.header("Content-Type", file.type) + if (file.type.startsWith("text/html")) { + c.header("Content-Security-Policy", DEFAULT_CSP) + } + return c.body(await file.arrayBuffer()) + } else { + return c.json({ error: "Not Found" }, 404) + } + } else { + const response = await proxy(`https://app.opencode.ai${path}`, { + ...c.req, + headers: { + ...c.req.raw.headers, + host: "app.opencode.ai", + }, + }) + const match = response.headers.get("content-type")?.includes("text/html") + ? (await response.clone().text()).match( + /]*\bsrc\s*=)[^>]*\bid=(['"])oc-theme-preload-script\1[^>]*>([\s\S]*?)<\/script>/i, + ) + : undefined + const hash = match ? createHash("sha256").update(match[2]).digest("base64") : "" + response.headers.set("Content-Security-Policy", csp(hash)) + return response + } + }) diff --git a/packages/opencode/src/server/middleware.ts b/packages/opencode/src/server/middleware.ts new file mode 100644 index 0000000000..ebf0163cd6 --- /dev/null +++ b/packages/opencode/src/server/middleware.ts @@ -0,0 +1,29 @@ +import { Provider } from "../provider/provider" +import { NamedError } from "@opencode-ai/util/error" +import { NotFoundError } from "../storage/db" +import type { ContentfulStatusCode } from "hono/utils/http-status" +import type { ErrorHandler } from "hono" +import { HTTPException } from "hono/http-exception" +import type { Log } from "../util/log" + +export function errorHandler(log: Log.Logger): ErrorHandler { + return (err, c) => { + log.error("failed", { + error: err, + }) + 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, + }) + } +} diff --git a/packages/opencode/src/server/routes/event.ts b/packages/opencode/src/server/routes/event.ts index 96284242f9..989b857710 100644 --- a/packages/opencode/src/server/routes/event.ts +++ b/packages/opencode/src/server/routes/event.ts @@ -4,12 +4,11 @@ import { streamSSE } from "hono/streaming" import { Log } from "@/util/log" import { BusEvent } from "@/bus/bus-event" import { Bus } from "@/bus" -import { lazy } from "../../util/lazy" import { AsyncQueue } from "../../util/queue" const log = Log.create({ service: "server" }) -export const EventRoutes = lazy(() => +export const EventRoutes = () => new Hono().get( "/event", describeRoute({ @@ -81,5 +80,4 @@ export const EventRoutes = lazy(() => } }) }, - ), -) + ) diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index 7dc6ec1bdc..cfb22929bc 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -1,67 +1,30 @@ -import { createHash } from "node:crypto" import { Log } from "../util/log" import { describeRoute, generateSpecs, validator, resolver, openAPIRouteHandler } from "hono-openapi" import { Hono } from "hono" import { compress } from "hono/compress" import { cors } from "hono/cors" -import { proxy } from "hono/proxy" import { basicAuth } from "hono/basic-auth" import z from "zod" -import { Provider } from "../provider/provider" -import { NamedError } from "@opencode-ai/util/error" -import { LSP } from "../lsp" -import { Format } from "../format" -import { TuiRoutes } from "./routes/tui" -import { Instance } from "../project/instance" -import { Vcs } from "../project/vcs" -import { Agent } from "../agent/agent" -import { Skill } from "../skill" import { Auth } from "../auth" import { Flag } from "../flag/flag" -import { Command } from "../command" -import { Global } from "../global" -import { WorkspaceID } from "../control-plane/schema" import { ProviderID } from "../provider/schema" import { WorkspaceRouterMiddleware } from "../control-plane/workspace-router-middleware" -import { ProjectRoutes } from "./routes/project" -import { SessionRoutes } from "./routes/session" -import { PtyRoutes } from "./routes/pty" -import { McpRoutes } from "./routes/mcp" -import { FileRoutes } from "./routes/file" -import { ConfigRoutes } from "./routes/config" -import { ExperimentalRoutes } from "./routes/experimental" -import { ProviderRoutes } from "./routes/provider" -import { EventRoutes } from "./routes/event" -import { InstanceBootstrap } from "../project/bootstrap" -import { NotFoundError } from "../storage/db" -import type { ContentfulStatusCode } from "hono/utils/http-status" import { websocket } from "hono/bun" -import { HTTPException } from "hono/http-exception" import { errors } from "./error" -import { Filesystem } from "@/util/filesystem" -import { QuestionRoutes } from "./routes/question" -import { PermissionRoutes } from "./routes/permission" import { GlobalRoutes } from "./routes/global" import { MDNS } from "./mdns" import { lazy } from "@/util/lazy" +import { errorHandler } from "./middleware" +import { InstanceRoutes } from "./instance" import { initProjectors } from "./projectors" // @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 -const csp = (hash = "") => - `default-src 'self'; script-src 'self' 'wasm-unsafe-eval'${hash ? ` 'sha256-${hash}'` : ""}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:` - initProjectors() export namespace Server { const log = Log.create({ service: "server" }) - const DEFAULT_CSP = - "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:" - const embeddedUIPromise = Flag.OPENCODE_DISABLE_EMBEDDED_WEB_UI - ? Promise.resolve(null) - : // @ts-expect-error - generated file at build time - import("opencode-web-ui.gen.ts").then((module) => module.default as Record).catch(() => null) const zipped = compress() @@ -71,30 +34,12 @@ export namespace Server { return false } - export const Default = lazy(() => createApp({})) + export const Default = lazy(() => ControlPlaneRoutes()) - export const createApp = (opts: { cors?: string[] }): Hono => { + export const ControlPlaneRoutes = (opts?: { cors?: string[] }): Hono => { const app = new Hono() return app - .onError((err, c) => { - log.error("failed", { - error: err, - }) - 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, - }) - }) + .onError(errorHandler(log)) .use((c, next) => { // Allow CORS preflight requests to succeed without auth. // Browser clients sending Authorization headers will preflight with OPTIONS. @@ -105,8 +50,8 @@ export namespace Server { return basicAuth({ username, password })(c, next) }) .use(async (c, next) => { - const skipLogging = c.req.path === "/log" - if (!skipLogging) { + const skip = c.req.path === "/log" + if (!skip) { log.info("request", { method: c.req.method, path: c.req.path, @@ -117,7 +62,7 @@ export namespace Server { path: c.req.path, }) await next() - if (!skipLogging) { + if (!skip) { timer.stop() } }) @@ -215,27 +160,6 @@ export namespace Server { return c.json(true) }, ) - .use(async (c, next) => { - if (c.req.path === "/log") return next() - 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 Instance.provide({ - directory, - init: InstanceBootstrap, - async fn() { - return next() - }, - }) - }) .get( "/doc", openAPIRouteHandler(app, { @@ -258,126 +182,6 @@ export namespace Server { }), ), ) - .use(WorkspaceRouterMiddleware) - .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, - }) - }, - ) - .get( - "/vcs", - describeRoute({ - summary: "Get VCS info", - description: "Retrieve version control system (VCS) information for the current project, such as git branch.", - operationId: "vcs.get", - responses: { - 200: { - description: "VCS info", - content: { - "application/json": { - schema: resolver(Vcs.Info), - }, - }, - }, - }, - }), - async (c) => { - const branch = await Vcs.branch() - return c.json({ - branch, - }) - }, - ) - .get( - "/command", - describeRoute({ - summary: "List commands", - description: "Get a list of all available commands in the OpenCode system.", - operationId: "command.list", - responses: { - 200: { - description: "List of commands", - content: { - "application/json": { - schema: resolver(Command.Info.array()), - }, - }, - }, - }, - }), - async (c) => { - const commands = await Command.list() - return c.json(commands) - }, - ) .post( "/log", describeRoute({ @@ -430,132 +234,21 @@ export namespace Server { 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()) - }, - ) - .all("/*", async (c) => { - const embeddedWebUI = await embeddedUIPromise - const path = c.req.path + .use(WorkspaceRouterMiddleware) + } - if (embeddedWebUI) { - const match = embeddedWebUI[path.replace(/^\//, "")] ?? embeddedWebUI["index.html"] ?? null - if (!match) return c.json({ error: "Not Found" }, 404) - const file = Bun.file(match) - if (await file.exists()) { - c.header("Content-Type", file.type) - if (file.type.startsWith("text/html")) { - c.header("Content-Security-Policy", DEFAULT_CSP) - } - return c.body(await file.arrayBuffer()) - } else { - return c.json({ error: "Not Found" }, 404) - } - } else { - const response = await proxy(`https://app.opencode.ai${path}`, { - ...c.req, - headers: { - ...c.req.raw.headers, - host: "app.opencode.ai", - }, - }) - const match = response.headers.get("content-type")?.includes("text/html") - ? (await response.clone().text()).match( - /]*\bsrc\s*=)[^>]*\bid=(['"])oc-theme-preload-script\1[^>]*>([\s\S]*?)<\/script>/i, - ) - : undefined - const hash = match ? createHash("sha256").update(match[2]).digest("base64") : "" - response.headers.set("Content-Security-Policy", csp(hash)) - return response - } - }) as unknown as Hono + export function createApp(opts: { cors?: string[] }) { + return ControlPlaneRoutes(opts) } export async function openapi() { - // Cast to break excessive type recursion from long route chains - const result = await generateSpecs(Default(), { + // Build a fresh app with all routes registered directly so + // hono-openapi can see describeRoute metadata (`.route()` wraps + // handlers when the sub-app has a custom errorHandler, which + // strips the metadata symbol). + const app = ControlPlaneRoutes() + InstanceRoutes(app) + const result = await generateSpecs(app, { documentation: { info: { title: "opencode", @@ -579,7 +272,7 @@ export namespace Server { cors?: string[] }) { url = new URL(`http://${opts.hostname}:${opts.port}`) - const app = createApp(opts) + const app = ControlPlaneRoutes({ cors: opts.cors }) const args = { hostname: opts.hostname, idleTimeout: 0, diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts index 4109068443..527584e7e2 100644 --- a/packages/sdk/js/src/v2/gen/sdk.gen.ts +++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts @@ -411,6 +411,113 @@ export class Auth extends HeyApiClient { } } +export class App extends HeyApiClient { + /** + * Write log + * + * Write a log entry to the server logs with specified level and metadata. + */ + public log( + parameters?: { + directory?: string + workspace?: string + service?: string + level?: "debug" | "info" | "error" | "warn" + message?: string + extra?: { + [key: string]: unknown + } + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + { in: "body", key: "service" }, + { in: "body", key: "level" }, + { in: "body", key: "message" }, + { in: "body", key: "extra" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/log", + ...options, + ...params, + headers: { + "Content-Type": "application/json", + ...options?.headers, + ...params.headers, + }, + }) + } + + /** + * List agents + * + * Get a list of all available AI agents in the OpenCode system. + */ + public agents( + 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).get({ + url: "/agent", + ...options, + ...params, + }) + } + + /** + * List skills + * + * Get a list of all available skills in the OpenCode system. + */ + public skills( + 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).get({ + url: "/skill", + ...options, + ...params, + }) + } +} + export class Project extends HeyApiClient { /** * List all projects @@ -3773,113 +3880,6 @@ export class Command extends HeyApiClient { } } -export class App extends HeyApiClient { - /** - * Write log - * - * Write a log entry to the server logs with specified level and metadata. - */ - public log( - parameters?: { - directory?: string - workspace?: string - service?: string - level?: "debug" | "info" | "error" | "warn" - message?: string - extra?: { - [key: string]: unknown - } - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - { in: "body", key: "service" }, - { in: "body", key: "level" }, - { in: "body", key: "message" }, - { in: "body", key: "extra" }, - ], - }, - ], - ) - return (options?.client ?? this.client).post({ - url: "/log", - ...options, - ...params, - headers: { - "Content-Type": "application/json", - ...options?.headers, - ...params.headers, - }, - }) - } - - /** - * List agents - * - * Get a list of all available AI agents in the OpenCode system. - */ - public agents( - 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).get({ - url: "/agent", - ...options, - ...params, - }) - } - - /** - * List skills - * - * Get a list of all available skills in the OpenCode system. - */ - public skills( - 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).get({ - url: "/skill", - ...options, - ...params, - }) - } -} - export class Lsp extends HeyApiClient { /** * Get LSP status @@ -3962,6 +3962,11 @@ export class OpencodeClient extends HeyApiClient { return (this._auth ??= new Auth({ client: this.client })) } + private _app?: App + get app(): App { + return (this._app ??= new App({ client: this.client })) + } + private _project?: Project get project(): Project { return (this._project ??= new Project({ client: this.client })) @@ -4062,11 +4067,6 @@ export class OpencodeClient extends HeyApiClient { return (this._command ??= new Command({ client: this.client })) } - private _app?: App - get app(): App { - return (this._app ??= new App({ client: this.client })) - } - private _lsp?: Lsp get lsp(): Lsp { return (this._lsp ??= new Lsp({ 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 4d0b13539f..318b8907a9 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -2249,6 +2249,53 @@ export type AuthSetResponses = { export type AuthSetResponse = AuthSetResponses[keyof AuthSetResponses] +export type AppLogData = { + body?: { + /** + * Service name for the log entry + */ + service: string + /** + * Log level + */ + level: "debug" | "info" | "error" | "warn" + /** + * Log message + */ + message: string + /** + * Additional metadata for the log entry + */ + extra?: { + [key: string]: unknown + } + } + path?: never + query?: { + directory?: string + workspace?: string + } + url: "/log" +} + +export type AppLogErrors = { + /** + * Bad request + */ + 400: BadRequestError +} + +export type AppLogError = AppLogErrors[keyof AppLogErrors] + +export type AppLogResponses = { + /** + * Log entry written successfully + */ + 200: boolean +} + +export type AppLogResponse = AppLogResponses[keyof AppLogResponses] + export type ProjectListData = { body?: never path?: never @@ -5036,53 +5083,6 @@ export type CommandListResponses = { export type CommandListResponse = CommandListResponses[keyof CommandListResponses] -export type AppLogData = { - body?: { - /** - * Service name for the log entry - */ - service: string - /** - * Log level - */ - level: "debug" | "info" | "error" | "warn" - /** - * Log message - */ - message: string - /** - * Additional metadata for the log entry - */ - extra?: { - [key: string]: unknown - } - } - path?: never - query?: { - directory?: string - workspace?: string - } - url: "/log" -} - -export type AppLogErrors = { - /** - * Bad request - */ - 400: BadRequestError -} - -export type AppLogError = AppLogErrors[keyof AppLogErrors] - -export type AppLogResponses = { - /** - * Log entry written successfully - */ - 200: boolean -} - -export type AppLogResponse = AppLogResponses[keyof AppLogResponses] - export type AppAgentsData = { body?: never path?: never diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index 007391177b..5362e1daac 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -356,6 +356,90 @@ ] } }, + "/log": { + "post": { + "operationId": "app.log", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + } + ], + "summary": "Write log", + "description": "Write a log entry to the server logs with specified level and metadata.", + "responses": { + "200": { + "description": "Log entry written successfully", + "content": { + "application/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "400": { + "description": "Bad request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BadRequestError" + } + } + } + } + }, + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "service": { + "description": "Service name for the log entry", + "type": "string" + }, + "level": { + "description": "Log level", + "type": "string", + "enum": ["debug", "info", "error", "warn"] + }, + "message": { + "description": "Log message", + "type": "string" + }, + "extra": { + "description": "Additional metadata for the log entry", + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": {} + } + }, + "required": ["service", "level", "message"] + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createOpencodeClient } from \"@opencode-ai/sdk\n\nconst client = createOpencodeClient()\nawait client.app.log({\n ...\n})" + } + ] + } + }, "/project": { "get": { "operationId": "project.list", @@ -6762,90 +6846,6 @@ ] } }, - "/log": { - "post": { - "operationId": "app.log", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - } - ], - "summary": "Write log", - "description": "Write a log entry to the server logs with specified level and metadata.", - "responses": { - "200": { - "description": "Log entry written successfully", - "content": { - "application/json": { - "schema": { - "type": "boolean" - } - } - } - }, - "400": { - "description": "Bad request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/BadRequestError" - } - } - } - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "service": { - "description": "Service name for the log entry", - "type": "string" - }, - "level": { - "description": "Log level", - "type": "string", - "enum": ["debug", "info", "error", "warn"] - }, - "message": { - "description": "Log message", - "type": "string" - }, - "extra": { - "description": "Additional metadata for the log entry", - "type": "object", - "propertyNames": { - "type": "string" - }, - "additionalProperties": {} - } - }, - "required": ["service", "level", "message"] - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createOpencodeClient } from \"@opencode-ai/sdk\n\nconst client = createOpencodeClient()\nawait client.app.log({\n ...\n})" - } - ] - } - }, "/agent": { "get": { "operationId": "app.agents", From af2ccc94ebc632d0014f54ea5c5e6c2e26b5dda5 Mon Sep 17 00:00:00 2001 From: Adam <2363879+adamdotdevin@users.noreply.github.com> Date: Fri, 27 Mar 2026 11:22:16 -0500 Subject: [PATCH 016/142] chore(app): more spacing controls --- packages/ui/src/components/collapsible.css | 3 +- packages/ui/src/components/message-part.css | 13 +++-- packages/ui/src/components/message-part.tsx | 2 +- .../timeline-playground.stories.tsx | 48 ++++++++++++++++++- 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/packages/ui/src/components/collapsible.css b/packages/ui/src/components/collapsible.css index bab2c4f926..a999f62986 100644 --- a/packages/ui/src/components/collapsible.css +++ b/packages/ui/src/components/collapsible.css @@ -9,7 +9,8 @@ overflow: visible; &.tool-collapsible { - gap: 8px; + --tool-content-gap: 8px; + gap: var(--tool-content-gap); } [data-slot="collapsible-trigger"] { diff --git a/packages/ui/src/components/message-part.css b/packages/ui/src/components/message-part.css index bb16581d66..d9893503fb 100644 --- a/packages/ui/src/components/message-part.css +++ b/packages/ui/src/components/message-part.css @@ -636,14 +636,17 @@ } [data-component="context-tool-group-list"] { - padding: 6px 0 4px 0; + padding-top: 6px; + padding-right: 0; + padding-bottom: 4px; + padding-left: 13px; display: flex; flex-direction: column; - gap: 2px; + gap: 8px; [data-slot="context-tool-group-item"] { min-width: 0; - padding: 6px 0; + padding: 0; } } @@ -1154,8 +1157,8 @@ position: sticky; top: var(--sticky-accordion-top, 0px); z-index: 20; - height: 40px; - padding-bottom: 8px; + height: calc(32px + var(--tool-content-gap)); + padding-bottom: var(--tool-content-gap); background-color: var(--background-stronger); } } diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx index 8b572aff81..0e5c98d8ff 100644 --- a/packages/ui/src/components/message-part.tsx +++ b/packages/ui/src/components/message-part.tsx @@ -790,7 +790,7 @@ function ContextToolGroup(props: { parts: ToolPart[]; busy?: boolean }) { const summary = createMemo(() => contextToolSummary(props.parts)) return ( - +
Date: Fri, 27 Mar 2026 22:06:47 +0530 Subject: [PATCH 017/142] fix(ui): make streamed markdown feel more continuous (#19404) --- packages/ui/src/components/message-part.tsx | 88 +++++++++++++++------ 1 file changed, 63 insertions(+), 25 deletions(-) diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx index 0e5c98d8ff..1555a09a07 100644 --- a/packages/ui/src/components/message-part.tsx +++ b/packages/ui/src/components/message-part.tsx @@ -156,37 +156,75 @@ export type PartComponent = Component export const PART_MAPPING: Record = {} -const TEXT_RENDER_THROTTLE_MS = 100 +const TEXT_RENDER_PACE_MS = 24 +const TEXT_RENDER_SNAP = /[\s.,!?;:)\]]/ -function createThrottledValue(getValue: () => string) { +function step(size: number) { + if (size <= 12) return 2 + if (size <= 48) return 4 + if (size <= 96) return 8 + return Math.min(24, Math.ceil(size / 8)) +} + +function next(text: string, start: number) { + const end = Math.min(text.length, start + step(text.length - start)) + const max = Math.min(text.length, end + 8) + for (let i = end; i < max; i++) { + if (TEXT_RENDER_SNAP.test(text[i] ?? "")) return i + 1 + } + return end +} + +function createPacedValue(getValue: () => string, live?: () => boolean) { const [value, setValue] = createSignal(getValue()) + let shown = getValue() let timeout: ReturnType | undefined - let last = 0 - createEffect(() => { - const next = getValue() - const now = Date.now() + const clear = () => { + if (!timeout) return + clearTimeout(timeout) + timeout = undefined + } - const remaining = TEXT_RENDER_THROTTLE_MS - (now - last) - if (remaining <= 0) { - if (timeout) { - clearTimeout(timeout) - timeout = undefined - } - last = now - setValue(next) + const sync = (text: string) => { + shown = text + setValue(text) + } + + const run = () => { + timeout = undefined + const text = getValue() + if (!live?.()) { + sync(text) return } - if (timeout) clearTimeout(timeout) - timeout = setTimeout(() => { - last = Date.now() - setValue(next) - timeout = undefined - }, remaining) + if (!text.startsWith(shown) || text.length <= shown.length) { + sync(text) + return + } + const end = next(text, shown.length) + sync(text.slice(0, end)) + if (end < text.length) timeout = setTimeout(run, TEXT_RENDER_PACE_MS) + } + + createEffect(() => { + const text = getValue() + if (!live?.()) { + clear() + sync(text) + return + } + if (!text.startsWith(shown) || text.length < shown.length) { + clear() + sync(text) + return + } + if (text.length === shown.length || timeout) return + timeout = setTimeout(run, TEXT_RENDER_PACE_MS) }) onCleanup(() => { - if (timeout) clearTimeout(timeout) + clear() }) return value @@ -1332,11 +1370,11 @@ PART_MAPPING["text"] = function TextPartDisplay(props) { return items.filter((x) => !!x).join(" \u00B7 ") }) - const displayText = () => (part().text ?? "").trim() - const throttledText = createThrottledValue(displayText) const streaming = createMemo( () => props.message.role === "assistant" && typeof (props.message as AssistantMessage).time.completed !== "number", ) + const displayText = () => (part().text ?? "").trim() + const throttledText = createPacedValue(displayText, streaming) const isLastTextPart = createMemo(() => { const last = (data.store.part?.[props.message.id] ?? []) .filter((item): item is TextPart => item?.type === "text" && !!item.text?.trim()) @@ -1395,11 +1433,11 @@ PART_MAPPING["text"] = function TextPartDisplay(props) { PART_MAPPING["reasoning"] = function ReasoningPartDisplay(props) { const part = () => props.part as ReasoningPart - const text = () => part().text.trim() - const throttledText = createThrottledValue(text) const streaming = createMemo( () => props.message.role === "assistant" && typeof (props.message as AssistantMessage).time.completed !== "number", ) + const text = () => part().text.trim() + const throttledText = createPacedValue(text, streaming) return ( From bdd7829c689830668ae9a6026f3187196774797c Mon Sep 17 00:00:00 2001 From: Burak Yigit Kaya Date: Fri, 27 Mar 2026 16:39:13 +0000 Subject: [PATCH 018/142] fix(app): resize layout viewport when mobile keyboard appears (#15841) --- packages/app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/index.html b/packages/app/index.html index 6fa3455351..8fad7efb3a 100644 --- a/packages/app/index.html +++ b/packages/app/index.html @@ -2,7 +2,7 @@ - + OpenCode From d36b38e4a6f5b778644669ba281fb5a35cf2f028 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 13:32:05 -0400 Subject: [PATCH 019/142] fix(desktop-electron): match dev dock icon inset on macOS (#19429) --- packages/desktop-electron/icons/README.md | 3 +++ packages/desktop-electron/icons/beta/dock.png | Bin 0 -> 33332 bytes packages/desktop-electron/icons/dev/dock.png | Bin 0 -> 50483 bytes packages/desktop-electron/icons/prod/dock.png | Bin 0 -> 38916 bytes packages/desktop-electron/src/main/windows.ts | 3 ++- 5 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 packages/desktop-electron/icons/beta/dock.png create mode 100644 packages/desktop-electron/icons/dev/dock.png create mode 100644 packages/desktop-electron/icons/prod/dock.png diff --git a/packages/desktop-electron/icons/README.md b/packages/desktop-electron/icons/README.md index fa219a77ef..cf2f8e24c5 100644 --- a/packages/desktop-electron/icons/README.md +++ b/packages/desktop-electron/icons/README.md @@ -9,3 +9,6 @@ Here's the process I've been using to create icons: The Image2Icon step is necessary as the `icon.icns` generated by `app-icon.png` does not apply the shadow/padding expected by macOS, so app icons appear larger than expected. + +For unpackaged Electron on macOS, `app.dock.setIcon()` should use a PNG. Keep `dock.png` in each channel folder synced with the +extracted `icon_128x128@2x.png` from that channel's `icon.icns` so the dev Dock icon matches the packaged app inset. diff --git a/packages/desktop-electron/icons/beta/dock.png b/packages/desktop-electron/icons/beta/dock.png new file mode 100644 index 0000000000000000000000000000000000000000..f274ef64598bb3553bcc9ebda724cd6969fbd48e GIT binary patch literal 33332 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 literal 0 HcmV?d00001 diff --git a/packages/desktop-electron/icons/dev/dock.png b/packages/desktop-electron/icons/dev/dock.png new file mode 100644 index 0000000000000000000000000000000000000000..4953d5531e751bac6b2ec3985a0f2a4b20e0cc86 GIT binary patch literal 50483 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 z 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

#0oVu`Pdp8_ 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 P1|aZs^>bP0l+XkKisKE- literal 0 HcmV?d00001 diff --git a/packages/desktop-electron/icons/prod/dock.png b/packages/desktop-electron/icons/prod/dock.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ab694e97d9556e306bec4c76f54e8cdb83a938 GIT binary patch literal 38916 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 TpPc;$`gQiyxs#Q@U%mH#q;zt8 literal 0 HcmV?d00001 diff --git a/packages/desktop-electron/src/main/windows.ts b/packages/desktop-electron/src/main/windows.ts index 0b7783f289..170cd877cd 100644 --- a/packages/desktop-electron/src/main/windows.ts +++ b/packages/desktop-electron/src/main/windows.ts @@ -50,7 +50,8 @@ export function setTitlebar(win: BrowserWindow, theme: Partial = export function setDockIcon() { if (process.platform !== "darwin") return - app.dock?.setIcon(nativeImage.createFromPath(join(iconsDir(), "128x128@2x.png"))) + const icon = nativeImage.createFromPath(join(iconsDir(), "dock.png")) + if (!icon.isEmpty()) app.dock?.setIcon(icon) } export function createMainWindow(globals: Globals) { From e973bbf54a519566bfdccce3474178b26b163a6d Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 14:11:50 -0400 Subject: [PATCH 020/142] fix(app): default file tree to closed with minimum width (#19426) --- packages/app/src/context/layout.tsx | 23 ++++++++++++----------- packages/app/src/pages/session.tsx | 9 +++++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/packages/app/src/context/layout.tsx b/packages/app/src/context/layout.tsx index 78928118d7..640d5e02eb 100644 --- a/packages/app/src/context/layout.tsx +++ b/packages/app/src/context/layout.tsx @@ -13,7 +13,8 @@ import { createScrollPersistence, type SessionScroll } from "./layout-scroll" import { createPathHelpers } from "./file/path" const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const -const DEFAULT_PANEL_WIDTH = 344 +const DEFAULT_SIDEBAR_WIDTH = 344 +const DEFAULT_FILE_TREE_WIDTH = 200 const DEFAULT_SESSION_WIDTH = 600 const DEFAULT_TERMINAL_HEIGHT = 280 export type AvatarColorKey = (typeof AVATAR_COLOR_KEYS)[number] @@ -161,11 +162,11 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( if (!isRecord(fileTree)) return fileTree if (fileTree.tab === "changes" || fileTree.tab === "all") return fileTree - const width = typeof fileTree.width === "number" ? fileTree.width : DEFAULT_PANEL_WIDTH + const width = typeof fileTree.width === "number" ? fileTree.width : DEFAULT_FILE_TREE_WIDTH return { ...fileTree, opened: true, - width: width === 260 ? DEFAULT_PANEL_WIDTH : width, + width: width === 260 ? DEFAULT_FILE_TREE_WIDTH : width, tab: "changes", } })() @@ -230,7 +231,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( createStore({ sidebar: { opened: false, - width: DEFAULT_PANEL_WIDTH, + width: DEFAULT_SIDEBAR_WIDTH, workspaces: {} as Record, workspacesDefault: false, }, @@ -243,8 +244,8 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( panelOpened: true, }, fileTree: { - opened: true, - width: DEFAULT_PANEL_WIDTH, + opened: false, + width: DEFAULT_FILE_TREE_WIDTH, tab: "changes" as "changes" | "all", }, session: { @@ -628,32 +629,32 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( }, fileTree: { opened: createMemo(() => store.fileTree?.opened ?? true), - width: createMemo(() => store.fileTree?.width ?? DEFAULT_PANEL_WIDTH), + width: createMemo(() => store.fileTree?.width ?? DEFAULT_FILE_TREE_WIDTH), tab: createMemo(() => store.fileTree?.tab ?? "changes"), setTab(tab: "changes" | "all") { if (!store.fileTree) { - setStore("fileTree", { opened: true, width: DEFAULT_PANEL_WIDTH, tab }) + setStore("fileTree", { opened: true, width: DEFAULT_FILE_TREE_WIDTH, tab }) return } setStore("fileTree", "tab", tab) }, open() { if (!store.fileTree) { - setStore("fileTree", { opened: true, width: DEFAULT_PANEL_WIDTH, tab: "changes" }) + setStore("fileTree", { opened: true, width: DEFAULT_FILE_TREE_WIDTH, tab: "changes" }) return } setStore("fileTree", "opened", true) }, close() { if (!store.fileTree) { - setStore("fileTree", { opened: false, width: DEFAULT_PANEL_WIDTH, tab: "changes" }) + setStore("fileTree", { opened: false, width: DEFAULT_FILE_TREE_WIDTH, tab: "changes" }) return } setStore("fileTree", "opened", false) }, toggle() { if (!store.fileTree) { - setStore("fileTree", { opened: true, width: DEFAULT_PANEL_WIDTH, tab: "changes" }) + setStore("fileTree", { opened: true, width: DEFAULT_FILE_TREE_WIDTH, tab: "changes" }) return } setStore("fileTree", "opened", (x) => !x) diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx index 752b549b86..11e6375b3b 100644 --- a/packages/app/src/pages/session.tsx +++ b/packages/app/src/pages/session.tsx @@ -1640,6 +1640,15 @@ export default function Page() { consumePendingMessage: layout.pendingMessage.consume, }) + createEffect( + on( + () => params.id, + (id) => { + if (!id) requestAnimationFrame(() => inputRef?.focus()) + }, + ), + ) + onMount(() => { document.addEventListener("keydown", handleKeyDown) }) From ff13524a531ebd196224551199c3cb0833c44c3c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 27 Mar 2026 20:55:03 +0100 Subject: [PATCH 021/142] fix flaky plugin tests (no mock.module for bun) (#19445) --- packages/opencode/test/cli/tui/thread.test.ts | 111 +++++++----------- packages/opencode/test/config/config.test.ts | 29 +++-- 2 files changed, 60 insertions(+), 80 deletions(-) diff --git a/packages/opencode/test/cli/tui/thread.test.ts b/packages/opencode/test/cli/tui/thread.test.ts index d3de7c3183..176c2575a3 100644 --- a/packages/opencode/test/cli/tui/thread.test.ts +++ b/packages/opencode/test/cli/tui/thread.test.ts @@ -1,7 +1,15 @@ -import { describe, expect, mock, test } from "bun:test" +import { afterEach, describe, expect, mock, spyOn, test } from "bun:test" import fs from "fs/promises" import path from "path" import { tmpdir } from "../../fixture/fixture" +import * as App from "../../../src/cli/cmd/tui/app" +import { Rpc } from "../../../src/util/rpc" +import { UI } from "../../../src/cli/ui" +import * as Timeout from "../../../src/util/timeout" +import * as Network from "../../../src/cli/network" +import * as Win32 from "../../../src/cli/cmd/tui/win32" +import { TuiConfig } from "../../../src/config/tui" +import { Instance } from "../../../src/project/instance" const stop = new Error("stop") const seen = { @@ -9,81 +17,43 @@ const seen = { inst: [] as string[], } -mock.module("../../../src/cli/cmd/tui/app", () => ({ - tui: async (input: { directory: string }) => { - seen.tui.push(input.directory) +function setup() { + // Intentionally avoid mock.module() here: Bun keeps module overrides in cache + // and mock.restore() does not reset mock.module values. If this switches back + // to module mocks, later suites can see mocked @/config/tui and fail (e.g. + // plugin-loader tests expecting real TuiConfig.waitForDependencies). See: + // https://github.com/oven-sh/bun/issues/7823 and #12823. + spyOn(App, "tui").mockImplementation(async (input) => { + if (input.directory) seen.tui.push(input.directory) throw stop - }, -})) - -mock.module("@/util/rpc", () => ({ - Rpc: { - client: () => ({ - call: async () => ({ url: "http://127.0.0.1" }), - on: () => {}, - }), - }, -})) - -mock.module("@/cli/ui", () => ({ - UI: { - error: () => {}, - }, -})) - -mock.module("@/util/log", () => ({ - Log: { - init: async () => {}, - create: () => ({ - error: () => {}, - info: () => {}, - warn: () => {}, - debug: () => {}, - time: () => ({ stop: () => {} }), - }), - Default: { - error: () => {}, - info: () => {}, - warn: () => {}, - debug: () => {}, - }, - }, -})) - -mock.module("@/util/timeout", () => ({ - withTimeout: (input: Promise) => input, -})) - -mock.module("@/cli/network", () => ({ - withNetworkOptions: (input: T) => input, - resolveNetworkOptions: async () => ({ + }) + spyOn(Rpc, "client").mockImplementation(() => ({ + call: async () => ({ url: "http://127.0.0.1" }) as never, + on: () => () => {}, + })) + spyOn(UI, "error").mockImplementation(() => {}) + spyOn(Timeout, "withTimeout").mockImplementation((input) => input) + spyOn(Network, "resolveNetworkOptions").mockResolvedValue({ mdns: false, port: 0, hostname: "127.0.0.1", - }), -})) - -mock.module("../../../src/cli/cmd/tui/win32", () => ({ - win32DisableProcessedInput: () => {}, - win32InstallCtrlCGuard: () => undefined, -})) - -mock.module("@/config/tui", () => ({ - TuiConfig: { - get: () => ({}), - }, -})) - -mock.module("@/project/instance", () => ({ - Instance: { - provide: async (input: { directory: string; fn: () => Promise | unknown }) => { - seen.inst.push(input.directory) - return input.fn() - }, - }, -})) + mdnsDomain: "opencode.local", + cors: [], + }) + spyOn(Win32, "win32DisableProcessedInput").mockImplementation(() => {}) + spyOn(Win32, "win32InstallCtrlCGuard").mockReturnValue(undefined) + spyOn(TuiConfig, "get").mockResolvedValue({}) + spyOn(Instance, "provide").mockImplementation(async (input) => { + seen.inst.push(input.directory) + return input.fn() + }) +} describe("tui thread", () => { + afterEach(() => { + mock.restore() + }) + async function call(project?: string) { const { TuiThreadCommand } = await import("../../../src/cli/cmd/tui/thread") const args: Parameters>[0] = { @@ -107,6 +77,7 @@ describe("tui thread", () => { } async function check(project?: string) { + setup() await using tmp = await tmpdir({ git: true }) const cwd = process.cwd() const pwd = process.env.PWD diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts index aa49aa4bd5..ea0a545200 100644 --- a/packages/opencode/test/config/config.test.ts +++ b/packages/opencode/test/config/config.test.ts @@ -821,9 +821,12 @@ test("dedupes concurrent config dependency installs for the same dir", async () }) const online = spyOn(Network, "online").mockReturnValue(false) const run = spyOn(BunProc, "run").mockImplementation(async (_cmd, opts) => { - calls += 1 - start() - await gate + const hit = path.normalize(opts?.cwd ?? "") === path.normalize(dir) + if (hit) { + calls += 1 + start() + await gate + } const mod = path.join(opts?.cwd ?? "", "node_modules", "@opencode-ai", "plugin") await fs.mkdir(mod, { recursive: true }) await Filesystem.write( @@ -883,12 +886,16 @@ test("serializes config dependency installs across dirs", async () => { const online = spyOn(Network, "online").mockReturnValue(false) const run = spyOn(BunProc, "run").mockImplementation(async (_cmd, opts) => { - calls += 1 - open += 1 - peak = Math.max(peak, open) - if (calls === 1) { - start() - await gate + const cwd = path.normalize(opts?.cwd ?? "") + const hit = cwd === path.normalize(a) || cwd === path.normalize(b) + if (hit) { + calls += 1 + open += 1 + peak = Math.max(peak, open) + if (calls === 1) { + start() + await gate + } } const mod = path.join(opts?.cwd ?? "", "node_modules", "@opencode-ai", "plugin") await fs.mkdir(mod, { recursive: true }) @@ -896,7 +903,9 @@ test("serializes config dependency installs across dirs", async () => { path.join(mod, "package.json"), JSON.stringify({ name: "@opencode-ai/plugin", version: "1.0.0" }), ) - open -= 1 + if (hit) { + open -= 1 + } return { code: 0, stdout: Buffer.alloc(0), From 6f5b70e681b3a257c01fae1df4dbfe555cd216ef Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Fri, 27 Mar 2026 15:19:51 -0500 Subject: [PATCH 022/142] tweak: add additional overflow error patterns (#19446) --- packages/opencode/src/provider/error.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/opencode/src/provider/error.ts b/packages/opencode/src/provider/error.ts index 7a171f4dbb..52e525177a 100644 --- a/packages/opencode/src/provider/error.ts +++ b/packages/opencode/src/provider/error.ts @@ -23,6 +23,9 @@ export namespace ProviderError { /request entity too large/i, // HTTP 413 /context length is only \d+ tokens/i, // vLLM /input length.*exceeds.*context length/i, // vLLM + /prompt too long; exceeded (?:max )?context length/i, // Ollama explicit overflow error + /too large for model with \d+ maximum context length/i, // Mistral + /model_context_window_exceeded/i, // z.ai non-standard finish_reason surfaced as error text ] function isOpenAiErrorRetryable(e: APICallError) { From 7a7643c86a69edbd79f99b0c4f613463627f2428 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 27 Mar 2026 21:21:15 +0100 Subject: [PATCH 023/142] no theme override in dev (#19456) --- .opencode/tui.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.opencode/tui.json b/.opencode/tui.json index f228c20886..1eee01b302 100644 --- a/.opencode/tui.json +++ b/.opencode/tui.json @@ -1,6 +1,5 @@ { "$schema": "https://opencode.ai/tui.json", - "theme": "smoke-theme", "plugin": [ [ "./plugins/tui-smoke.tsx", From c33d9996f0e630d15b6e40b9a1feb578e991561a Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Fri, 27 Mar 2026 15:24:30 -0500 Subject: [PATCH 024/142] feat: AI SDK v6 support (#18433) --- bun.lock | 246 ++---- package.json | 8 +- packages/console/function/package.json | 6 +- packages/opencode/package.json | 44 +- packages/opencode/src/provider/provider.ts | 73 +- ...vert-to-openai-compatible-chat-messages.ts | 14 +- .../map-openai-compatible-finish-reason.ts | 8 +- .../openai-compatible-chat-language-model.ts | 113 ++- .../openai-compatible-metadata-extractor.ts | 6 +- .../chat/openai-compatible-prepare-tools.ts | 18 +- .../provider/sdk/copilot/copilot-provider.ts | 10 +- .../convert-to-openai-responses-input.ts | 46 +- .../map-openai-responses-finish-reason.ts | 6 +- .../responses/openai-responses-api-types.ts | 7 + .../openai-responses-language-model.ts | 187 +++-- .../openai-responses-prepare-tools.ts | 18 +- .../responses/tool/code-interpreter.ts | 5 +- .../sdk/copilot/responses/tool/file-search.ts | 5 +- .../responses/tool/image-generation.ts | 5 +- .../sdk/copilot/responses/tool/local-shell.ts | 5 +- .../responses/tool/web-search-preview.ts | 5 +- .../sdk/copilot/responses/tool/web-search.ts | 5 +- packages/opencode/src/provider/transform.ts | 78 +- packages/opencode/src/session/compaction.ts | 2 +- packages/opencode/src/session/llm.ts | 17 +- packages/opencode/src/session/message-v2.ts | 17 +- packages/opencode/src/session/prompt.ts | 67 +- .../copilot/copilot-chat-model.test.ts | 28 +- .../opencode/test/provider/gitlab-duo.test.ts | 784 +++++++++--------- packages/opencode/test/session/llm.test.ts | 127 ++- .../opencode/test/session/message-v2.test.ts | 52 +- .../test/session/structured-output.test.ts | 17 +- patches/@ai-sdk%2Fanthropic@3.0.64.patch | 119 +++ patches/@ai-sdk%2Fprovider-utils@4.0.21.patch | 61 ++ patches/@ai-sdk%2Fxai@2.0.51.patch | 108 --- .../@openrouter%2Fai-sdk-provider@1.5.4.patch | 128 --- 36 files changed, 1290 insertions(+), 1155 deletions(-) create mode 100644 patches/@ai-sdk%2Fanthropic@3.0.64.patch create mode 100644 patches/@ai-sdk%2Fprovider-utils@4.0.21.patch delete mode 100644 patches/@ai-sdk%2Fxai@2.0.51.patch delete mode 100644 patches/@openrouter%2Fai-sdk-provider@1.5.4.patch diff --git a/bun.lock b/bun.lock index 1ff4b4f728..783abe2893 100644 --- a/bun.lock +++ b/bun.lock @@ -142,9 +142,9 @@ "name": "@opencode-ai/console-function", "version": "1.3.3", "dependencies": { - "@ai-sdk/anthropic": "2.0.0", - "@ai-sdk/openai": "2.0.2", - "@ai-sdk/openai-compatible": "1.0.1", + "@ai-sdk/anthropic": "3.0.64", + "@ai-sdk/openai": "3.0.48", + "@ai-sdk/openai-compatible": "2.0.37", "@hono/zod-validator": "catalog:", "@openauthjs/openauth": "0.0.0-20250322224806", "@opencode-ai/console-core": "workspace:*", @@ -305,25 +305,25 @@ "@actions/core": "1.11.1", "@actions/github": "6.0.1", "@agentclientprotocol/sdk": "0.14.1", - "@ai-sdk/amazon-bedrock": "3.0.82", - "@ai-sdk/anthropic": "2.0.65", - "@ai-sdk/azure": "2.0.91", - "@ai-sdk/cerebras": "1.0.36", - "@ai-sdk/cohere": "2.0.22", - "@ai-sdk/deepinfra": "1.0.36", - "@ai-sdk/gateway": "2.0.30", - "@ai-sdk/google": "2.0.54", - "@ai-sdk/google-vertex": "3.0.106", - "@ai-sdk/groq": "2.0.34", - "@ai-sdk/mistral": "2.0.27", - "@ai-sdk/openai": "2.0.89", - "@ai-sdk/openai-compatible": "1.0.32", - "@ai-sdk/perplexity": "2.0.23", - "@ai-sdk/provider": "2.0.1", - "@ai-sdk/provider-utils": "3.0.21", - "@ai-sdk/togetherai": "1.0.34", - "@ai-sdk/vercel": "1.0.33", - "@ai-sdk/xai": "2.0.51", + "@ai-sdk/amazon-bedrock": "4.0.83", + "@ai-sdk/anthropic": "3.0.64", + "@ai-sdk/azure": "3.0.49", + "@ai-sdk/cerebras": "2.0.41", + "@ai-sdk/cohere": "3.0.27", + "@ai-sdk/deepinfra": "2.0.41", + "@ai-sdk/gateway": "3.0.80", + "@ai-sdk/google": "3.0.53", + "@ai-sdk/google-vertex": "4.0.95", + "@ai-sdk/groq": "3.0.31", + "@ai-sdk/mistral": "3.0.27", + "@ai-sdk/openai": "3.0.48", + "@ai-sdk/openai-compatible": "2.0.37", + "@ai-sdk/perplexity": "3.0.26", + "@ai-sdk/provider": "3.0.8", + "@ai-sdk/provider-utils": "4.0.21", + "@ai-sdk/togetherai": "2.0.41", + "@ai-sdk/vercel": "2.0.39", + "@ai-sdk/xai": "3.0.74", "@aws-sdk/credential-providers": "3.993.0", "@clack/prompts": "1.0.0-alpha.1", "@effect/platform-node": "catalog:", @@ -337,7 +337,7 @@ "@opencode-ai/script": "workspace:*", "@opencode-ai/sdk": "workspace:*", "@opencode-ai/util": "workspace:*", - "@openrouter/ai-sdk-provider": "1.5.4", + "@openrouter/ai-sdk-provider": "2.3.3", "@opentui/core": "0.1.90", "@opentui/solid": "0.1.90", "@parcel/watcher": "2.5.1", @@ -347,7 +347,7 @@ "@standard-schema/spec": "1.0.0", "@zip.js/zip.js": "2.7.62", "ai": "catalog:", - "ai-gateway-provider": "2.3.1", + "ai-gateway-provider": "3.1.2", "bonjour-service": "1.3.0", "bun-pty": "0.4.8", "chokidar": "4.0.3", @@ -358,7 +358,7 @@ "drizzle-orm": "catalog:", "effect": "catalog:", "fuzzysort": "3.1.0", - "gitlab-ai-provider": "5.3.3", + "gitlab-ai-provider": "6.0.0", "glob": "13.0.5", "google-auth-library": "10.5.0", "gray-matter": "4.0.3", @@ -599,10 +599,10 @@ "tree-sitter-bash", ], "patchedDependencies": { - "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch", "solid-js@1.9.10": "patches/solid-js@1.9.10.patch", - "@ai-sdk/xai@2.0.51": "patches/@ai-sdk%2Fxai@2.0.51.patch", "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch", + "@ai-sdk/anthropic@3.0.64": "patches/@ai-sdk%2Fanthropic@3.0.64.patch", + "@ai-sdk/provider-utils@4.0.21": "patches/@ai-sdk%2Fprovider-utils@4.0.21.patch", }, "overrides": { "@types/bun": "catalog:", @@ -629,7 +629,7 @@ "@types/node": "22.13.9", "@types/semver": "7.7.1", "@typescript/native-preview": "7.0.0-dev.20251207.1", - "ai": "5.0.124", + "ai": "6.0.138", "diff": "8.0.2", "dompurify": "3.3.1", "drizzle-kit": "1.0.0-beta.19-d95b7a4", @@ -673,51 +673,51 @@ "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@0.14.1", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-b6r3PS3Nly+Wyw9U+0nOr47bV8tfS476EgyEMhoKvJCZLbgqoDFN7DJwkxL88RR0aiOqOYV1ZnESHqb+RmdH8w=="], - "@ai-sdk/amazon-bedrock": ["@ai-sdk/amazon-bedrock@3.0.82", "", { "dependencies": { "@ai-sdk/anthropic": "2.0.65", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21", "@smithy/eventstream-codec": "^4.0.1", "@smithy/util-utf8": "^4.0.0", "aws4fetch": "^1.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-yb1EkRCMWex0tnpHPLGQxoJEiJvMGOizuxzlXFOpuGFiYgE679NsWE/F8pHwtoAWsqLlylgGAJvJDIJ8us8LEw=="], + "@ai-sdk/amazon-bedrock": ["@ai-sdk/amazon-bedrock@4.0.83", "", { "dependencies": { "@ai-sdk/anthropic": "3.0.64", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21", "@smithy/eventstream-codec": "^4.0.1", "@smithy/util-utf8": "^4.0.0", "aws4fetch": "^1.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-DoRpvIWGU/r83UeJAM9L93Lca8Kf/yP5fIhfEOltMPGP/PXrGe0BZaz0maLSRn8djJ6+HzWIsgu5ZI6bZqXEXg=="], - "@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.0", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4" } }, "sha512-uyyaO4KhxoIKZztREqLPh+6/K3ZJx/rp72JKoUEL9/kC+vfQTThUfPnY/bUryUpcnawx8IY/tSoYNOi/8PCv7w=="], + "@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.64", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-rwLi/Rsuj2pYniQXIrvClHvXDzgM4UQHHnvHTWEF14efnlKclG/1ghpNC+adsRujAbCTr6gRsSbDE2vEqriV7g=="], - "@ai-sdk/azure": ["@ai-sdk/azure@2.0.91", "", { "dependencies": { "@ai-sdk/openai": "2.0.89", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-9tznVSs6LGQNKKxb8pKd7CkBV9yk+a/ENpFicHCj2CmBUKefxzwJ9JbUqrlK3VF6dGZw3LXq0dWxt7/Yekaj1w=="], + "@ai-sdk/azure": ["@ai-sdk/azure@3.0.49", "", { "dependencies": { "@ai-sdk/openai": "3.0.48", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wskgAL+OmrHG7by/iWIxEBQCEdc1mDudha/UZav46i0auzdFfsDB/k2rXZaC4/3nWSgMZkxr0W3ncyouEGX/eg=="], - "@ai-sdk/cerebras": ["@ai-sdk/cerebras@1.0.36", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.32", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-zoJYL33+ieyd86FSP0Whm86D79d1lKPR7wUzh1SZ1oTxwYmsGyvIrmMf2Ll0JA9Ds2Es6qik4VaFCrjwGYRTIQ=="], + "@ai-sdk/cerebras": ["@ai-sdk/cerebras@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kDMEpjaRdRXIUi1EH8WHwLRahyDTYv9SAJnP6VCCeq8X+tVqZbMLCqqxSG5dRknrI65ucjvzQt+FiDKTAa7AHg=="], - "@ai-sdk/cohere": ["@ai-sdk/cohere@2.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-yJ9kP5cEDJwo8qpITq5TQFD8YNfNtW+HbyvWwrKMbFzmiMvIZuk95HIaFXE7PCTuZsqMA05yYu+qX/vQ3rNKjA=="], + "@ai-sdk/cohere": ["@ai-sdk/cohere@3.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OqcCq2PiFY1dbK/0Ck45KuvE8jfdxRuuAE9Y5w46dAk6U+9vPOeg1CDcmR+ncqmrYrhRl3nmyDttyDahyjCzAw=="], - "@ai-sdk/deepgram": ["@ai-sdk/deepgram@1.0.24", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.22" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-E+wzGPSa/XHmajO3WtX8mtq0ewy04tsHSpU6/SGwqbiykwWba/emi7ayZ4ir89s5OzbAen2g7T9zZiEchMfkHQ=="], + "@ai-sdk/deepgram": ["@ai-sdk/deepgram@2.0.24", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-htT1Y7vBN0cRu/1pGnhx6DNH3xaNr0o0MjDkmii48X2+6S/WkOzVNtMjn7V3vLWEQIWNio5vw1hG/F43K8WLHA=="], - "@ai-sdk/deepinfra": ["@ai-sdk/deepinfra@1.0.36", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.33", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-LndvRktEgY2IFu4peDJMEXcjhHEEFtM0upLx/J64kCpFHCifalXpK4PPSX3PVndnn0bJzvamO5+fc0z2ooqBZw=="], + "@ai-sdk/deepinfra": ["@ai-sdk/deepinfra@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-y6RoOP7DGWmDSiSxrUSt5p18sbz+Ixe5lMVPmdE7x+Tr5rlrzvftyHhjWHfqlAtoYERZTGFbP6tPW1OfQcrb4A=="], - "@ai-sdk/deepseek": ["@ai-sdk/deepseek@1.0.35", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.22" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Qvh2yxL5zJS9RO/Bf12pyYBIDmn+9GR1hT6e28IYWQWnt2Xq0h9XGps6XagLAv3VYYFg8c/ozkWVd4kXLZ25HA=="], + "@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.24", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-4vOEekW4TAYVHN0qgiwoUOQZhguGwZBiEw8LDeUmpWBm07QkLRAtxYCaSoMiA4hZZojao5mj6NRGEBW1CnDPtg=="], - "@ai-sdk/elevenlabs": ["@ai-sdk/elevenlabs@1.0.24", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.22" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ee2At5jgV+SqC6nrtPq20iH7N/aN+O36LrA4gkzVM4cmhM7bvQKVkOXhC1XxG+wsYG6UZi3Nekoi8MEjNWuRrw=="], + "@ai-sdk/elevenlabs": ["@ai-sdk/elevenlabs@2.0.24", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-K+1YprVMO8R6vTcNhqTqUWhOzX5V/hEY0pFx9KQL0/+MJjOgRi6DcOLoNBd7ONcjxYTyiFLRfk/0a/pHTtSgFA=="], - "@ai-sdk/fireworks": ["@ai-sdk/fireworks@1.0.35", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.34", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.22" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-inUq29XvSVDer6JIeOkwAmCFxOtHPU0OZEhwaWoe3PI59naHIW4RIFA9wppLLV5fJI9WQcAfDKy0ZHW9nV3UJw=="], + "@ai-sdk/fireworks": ["@ai-sdk/fireworks@2.0.40", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.35", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ARjygiBQtVSgNBp3Sag+Bkwn68ub+cZPC05UpRGG+VY8/Q896K2yU1j4I0+S1eU0BQW/9DKbRG04d9Ayi2DUmA=="], - "@ai-sdk/gateway": ["@ai-sdk/gateway@2.0.30", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20", "@vercel/oidc": "3.1.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-5Nrkj8B4MzkkOfjjA+Cs5pamkbkK4lI11bx80QV7TFcen/hWA8wEC+UVzwuM5H2zpekoNMjvl6GonHnR62XIZw=="], + "@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.80", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21", "@vercel/oidc": "3.1.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-uM7kpZB5l977lW7+2X1+klBUxIZQ78+1a9jHlaHFEzcOcmmslTl3sdP0QqfuuBcO0YBM2gwOiqVdp8i4TRQYcw=="], - "@ai-sdk/google": ["@ai-sdk/google@2.0.54", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-VKguP0x/PUYpdQyuA/uy5pDGJy6reL0X/yDKxHfL207aCUXpFIBmyMhVs4US39dkEVhtmIFSwXauY0Pt170JRw=="], + "@ai-sdk/google": ["@ai-sdk/google@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-uz8tIlkDgQJG9Js2Wh9JHzd4kI9+hYJqf9XXJLx60vyN5mRIqhr49iwR5zGP5Gl8odp2PeR3Gh2k+5bh3Z1HHw=="], - "@ai-sdk/google-vertex": ["@ai-sdk/google-vertex@3.0.106", "", { "dependencies": { "@ai-sdk/anthropic": "2.0.65", "@ai-sdk/google": "2.0.54", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21", "google-auth-library": "^10.5.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-f9sA66bmhgJoTwa+pHWFSdYxPa0lgdQ/MgYNxZptzVyGptoziTf1a9EIXEL3jiCD0qIBAg+IhDAaYalbvZaDqQ=="], + "@ai-sdk/google-vertex": ["@ai-sdk/google-vertex@4.0.95", "", { "dependencies": { "@ai-sdk/anthropic": "3.0.64", "@ai-sdk/google": "3.0.53", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21", "google-auth-library": "^10.5.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-xL44fHlTtDM7RLkMTgyqMfkfthA38JS91bbMaHItObIhte1PAIY936ZV1PLl/Z9A/oBAXjHWbXo5xDoHzB7LEg=="], - "@ai-sdk/groq": ["@ai-sdk/groq@2.0.34", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wfCYkVgmVjxNA32T57KbLabVnv9aFUflJ4urJ7eWgTwbnmGQHElCTu+rJ3ydxkXSqxOkXPwMOttDm7XNrvPjmg=="], + "@ai-sdk/groq": ["@ai-sdk/groq@3.0.31", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-XbbugpnFmXGu2TlXiq8KUJskP6/VVbuFcnFIGDzDIB/Chg6XHsNnqrTF80Zxkh0Pd3+NvbM+2Uqrtsndk6bDAg=="], - "@ai-sdk/mistral": ["@ai-sdk/mistral@2.0.27", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-gaptHgaXjMw3+eA0Q4FABcsj5nQNP6EpFaGUR+Pj5WJy7Kn6mApl975/x57224MfeJIShNpt8wFKK3tvh5ewKg=="], + "@ai-sdk/mistral": ["@ai-sdk/mistral@3.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZXe7nZQgliDdjz5ufH5RKpHWxbN72AzmzzKGbF/z+0K9GN5tUCnftrQRvTRFHA5jAzTapcm2BEevmGLVbMkW+A=="], - "@ai-sdk/openai": ["@ai-sdk/openai@2.0.2", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4" } }, "sha512-D4zYz2uR90aooKQvX1XnS00Z7PkbrcY+snUvPfm5bCabTG7bzLrVtD56nJ5bSaZG8lmuOMfXpyiEEArYLyWPpw=="], + "@ai-sdk/openai": ["@ai-sdk/openai@3.0.48", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ALmj/53EXpcRqMbGpPJPP4UOSWw0q4VGpnDo7YctvsynjkrKDmoneDG/1a7VQnSPYHnJp6tTRMf5ZdxZ5whulg=="], - "@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.1", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4" } }, "sha512-luHVcU+yKzwv3ekKgbP3v+elUVxb2Rt+8c6w9qi7g2NYG2/pEL21oIrnaEnc6UtTZLLZX9EFBcpq2N1FQKDIMw=="], + "@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.37", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-+POSFVcgiu47BK64dhsI6OpcDC0/VAE2ZSaXdXGNNhpC/ava++uSRJYks0k2bpfY0wwCTgpAWZsXn/dG2Yppiw=="], - "@ai-sdk/perplexity": ["@ai-sdk/perplexity@2.0.23", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-aiaRvnc6mhQZKhTTSXPCjPH8Iqr5D/PfCN1hgVP/3RGTBbJtsd9HemIBSABeSdAKbsMH/PwJxgnqH75HEamcBA=="], + "@ai-sdk/perplexity": ["@ai-sdk/perplexity@3.0.26", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-dXzrVsLR5f6tr+U04jq4AXoRroGFBTvODnLgss0SWbzNjGGQg3XqtQ9j7rCLo6o8qbYGuAHvqUrIpUCuiscuFg=="], - "@ai-sdk/provider": ["@ai-sdk/provider@2.0.1", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-KCUwswvsC5VsW2PWFqF8eJgSCu5Ysj7m1TxiHTVA6g7k360bk0RNQENT8KTMAYEs+8fWPD3Uu4dEmzGHc+jGng=="], + "@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="], - "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.21", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-veuMwTLxsgh31Jjn0SnBABnM1f7ebHhRWcV2ZuY3hP3iJDCZ8VXBaYqcHXoOQDqUXTCas08sKQcHyWK+zl882Q=="], + "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="], - "@ai-sdk/togetherai": ["@ai-sdk/togetherai@1.0.34", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.32", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-jjJmJms6kdEc4nC3MDGFJfhV8F1ifY4nolV2dbnT7BM4ab+Wkskc0GwCsJ7G7WdRMk7xDbFh4he3DPL8KJ/cyA=="], + "@ai-sdk/togetherai": ["@ai-sdk/togetherai@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-k3p9e3k0/gpDDyTtvafsK4HYR4D/aUQW/kzCwWo1+CzdBU84i4L14gWISC/mv6tgSicMXHcEUd521fPufQwNlg=="], - "@ai-sdk/vercel": ["@ai-sdk/vercel@1.0.33", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.32", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Qwjm+HdwKasu7L9bDUryBMGKDMscIEzMUkjw/33uGdJpktzyNW13YaNIObOZ2HkskqDMIQJSd4Ao2BBT8fEYLw=="], + "@ai-sdk/vercel": ["@ai-sdk/vercel@2.0.39", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8eu3ljJpkCTP4ppcyYB+NcBrkcBoSOFthCSgk5VnjaxnDaOJFaxnPwfddM7wx3RwMk2CiK1O61Px/LlqNc7QkQ=="], - "@ai-sdk/xai": ["@ai-sdk/xai@2.0.51", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.30", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-AI3le03qiegkZvn9hpnpDwez49lOvQLj4QUBT8H41SMbrdTYOxn3ktTwrsSu90cNDdzKGMvoH0u2GHju1EdnCg=="], + "@ai-sdk/xai": ["@ai-sdk/xai@3.0.74", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-HDDLsT+QrzE3c2QZLRV/HKAwMtXDb0PMDdk1PYUXLJ3r9Qv76zGKGyvJLX7Pu6c8TOHD1mwLrOVYrsTpC/eTMw=="], "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="], @@ -1455,9 +1455,7 @@ "@opencode-ai/web": ["@opencode-ai/web@workspace:packages/web"], - "@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@1.5.4", "", { "dependencies": { "@openrouter/sdk": "^0.1.27" }, "peerDependencies": { "ai": "^5.0.0", "zod": "^3.24.1 || ^v4" } }, "sha512-xrSQPUIH8n9zuyYZR0XK7Ba0h2KsjJcMkxnwaYfmv13pKs3sDkjPzVPPhlhzqBGddHb5cFEwJ9VFuFeDcxCDSw=="], - - "@openrouter/sdk": ["@openrouter/sdk@0.1.27", "", { "dependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-RH//L10bSmc81q25zAZudiI4kNkLgxF2E+WU42vghp3N6TEvZ6F0jK7uT3tOxkEn91gzmMw9YVmDENy7SJsajQ=="], + "@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.3.3", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-4fVteGkVedc7fGoA9+qJs4tpYwALezMq14m2Sjub3KmyRlksCbK+WJf67NPdGem8+NZrV2tAN42A1NU3+SiV3w=="], "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="], @@ -2271,9 +2269,9 @@ "agentkeepalive": ["agentkeepalive@4.6.0", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="], - "ai": ["ai@5.0.124", "", { "dependencies": { "@ai-sdk/gateway": "2.0.30", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Li6Jw9F9qsvFJXZPBfxj38ddP2iURCnMs96f9Q3OeQzrDVcl1hvtwSEAuxA/qmfh6SDV2ERqFUOFzigvr0697g=="], + "ai": ["ai@6.0.138", "", { "dependencies": { "@ai-sdk/gateway": "3.0.80", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-49OfPe0f5uxJ6jUdA5BBXjIinP6+ZdYfAtpF2aEH64GA5wPcxH2rf/TBUQQ0bbamBz/D+TLMV18xilZqOC+zaA=="], - "ai-gateway-provider": ["ai-gateway-provider@2.3.1", "", { "dependencies": { "@ai-sdk/provider": "^2.0.0", "@ai-sdk/provider-utils": "^3.0.19", "ai": "^5.0.116" }, "optionalDependencies": { "@ai-sdk/amazon-bedrock": "^3.0.71", "@ai-sdk/anthropic": "^2.0.56", "@ai-sdk/azure": "^2.0.90", "@ai-sdk/cerebras": "^1.0.33", "@ai-sdk/cohere": "^2.0.21", "@ai-sdk/deepgram": "^1.0.21", "@ai-sdk/deepseek": "^1.0.32", "@ai-sdk/elevenlabs": "^1.0.21", "@ai-sdk/fireworks": "^1.0.30", "@ai-sdk/google": "^2.0.51", "@ai-sdk/google-vertex": "3.0.90", "@ai-sdk/groq": "^2.0.33", "@ai-sdk/mistral": "^2.0.26", "@ai-sdk/openai": "^2.0.88", "@ai-sdk/perplexity": "^2.0.22", "@ai-sdk/xai": "^2.0.42", "@openrouter/ai-sdk-provider": "^1.5.3" }, "peerDependencies": { "@ai-sdk/openai-compatible": "^1.0.29" } }, "sha512-PqI6TVNEDNwr7kOhy7XUGnA8XJB1SpeA9aLqGjr0CyWkKgH+y+ofPm8MZGZ74DOwVejDF+POZq0Qs9jKEKUeYg=="], + "ai-gateway-provider": ["ai-gateway-provider@3.1.2", "", { "optionalDependencies": { "@ai-sdk/amazon-bedrock": "^4.0.62", "@ai-sdk/anthropic": "^3.0.46", "@ai-sdk/azure": "^3.0.31", "@ai-sdk/cerebras": "^2.0.34", "@ai-sdk/cohere": "^3.0.21", "@ai-sdk/deepgram": "^2.0.20", "@ai-sdk/deepseek": "^2.0.20", "@ai-sdk/elevenlabs": "^2.0.20", "@ai-sdk/fireworks": "^2.0.34", "@ai-sdk/google": "^3.0.30", "@ai-sdk/google-vertex": "^4.0.61", "@ai-sdk/groq": "^3.0.24", "@ai-sdk/mistral": "^3.0.20", "@ai-sdk/openai": "^3.0.30", "@ai-sdk/perplexity": "^3.0.19", "@ai-sdk/xai": "^3.0.57", "@openrouter/ai-sdk-provider": "^2.2.3" }, "peerDependencies": { "@ai-sdk/openai-compatible": "^2.0.0", "@ai-sdk/provider": "^3.0.0", "@ai-sdk/provider-utils": "^4.0.0", "ai": "^6.0.0" } }, "sha512-krGNnJSoO/gJ7Hbe5nQDlsBpDUGIBGtMQTRUaW7s1MylsfvLduba0TLWzQaGtOmNRkP0pGhtGlwsnS6FNQMlyw=="], "ajv": ["ajv@8.18.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A=="], @@ -3049,7 +3047,7 @@ "github-slugger": ["github-slugger@2.0.0", "", {}, "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="], - "gitlab-ai-provider": ["gitlab-ai-provider@5.3.3", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=2.0.0", "@ai-sdk/provider-utils": ">=3.0.0" } }, "sha512-k0kRUoAhDvoRC28hQW4sPp+A3cfpT5c/oL9Ng10S0oBiF2Tci1AtsX1iclJM5Os8C1nIIAXBW8LMr0GY7rwcGA=="], + "gitlab-ai-provider": ["gitlab-ai-provider@6.0.0", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=3.0.0", "@ai-sdk/provider-utils": ">=4.0.0" } }, "sha512-683GcJdrer/GhnljkbVcGsndCEhvGB8f9fUdCxQBlkuyt8rzf0G9DpSh+iMBYp9HpcSvYmYG0Qv5ks9dLrNxwQ=="], "glob": ["glob@13.0.5", "", { "dependencies": { "minimatch": "^10.2.1", "minipass": "^7.1.2", "path-scurry": "^2.0.0" } }, "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw=="], @@ -4799,63 +4797,21 @@ "@actions/http-client/undici": ["undici@6.23.0", "", {}, "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g=="], - "@ai-sdk/amazon-bedrock/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.65", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-HqTPP59mLQ9U6jXQcx6EORkdc5FyZu34Sitkg6jNpyMYcRjStvfx4+NWq/qaR+OTwBFcccv8hvVii0CYkH2Lag=="], + "@ai-sdk/amazon-bedrock/@smithy/eventstream-codec": ["@smithy/eventstream-codec@4.2.11", "", { "dependencies": { "@aws-crypto/crc32": "5.2.0", "@smithy/types": "^4.13.0", "@smithy/util-hex-encoding": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-Sf39Ml0iVX+ba/bgMPxaXWAAFmHqYLTmbjAPfLPLY8CrYkRDEqZdUsKC1OwVMCdJXfAt0v4j49GIJ8DoSYAe6w=="], - "@ai-sdk/anthropic/@ai-sdk/provider": ["@ai-sdk/provider@2.0.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA=="], + "@ai-sdk/amazon-bedrock/@smithy/util-utf8": ["@smithy/util-utf8@4.2.2", "", { "dependencies": { "@smithy/util-buffer-from": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw=="], - "@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.0", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.3", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.25.76 || ^4" } }, "sha512-BoQZtGcBxkeSH1zK+SRYNDtJPIPpacTeiMZqnG4Rv6xXjEwM0FH4MGs9c+PlhyEWmQCzjRM2HAotEydFhD4dYw=="], + "@ai-sdk/deepgram/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.19", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-3eG55CrSWCu2SXlqq2QCsFjo3+E7+Gmg7i/oRVoSZzIodTuDSfLb3MRje67xE9RFea73Zao7Lm4mADIfUETKGg=="], - "@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@2.0.89", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-4+qWkBCbL9HPKbgrUO/F2uXZ8GqrYxHa8SWEYIzxEJ9zvWw3ISr3t1/27O1i8MGSym+PzEyHBT48EV4LAwWaEw=="], + "@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.19", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-3eG55CrSWCu2SXlqq2QCsFjo3+E7+Gmg7i/oRVoSZzIodTuDSfLb3MRje67xE9RFea73Zao7Lm4mADIfUETKGg=="], - "@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], + "@ai-sdk/elevenlabs/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.19", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-3eG55CrSWCu2SXlqq2QCsFjo3+E7+Gmg7i/oRVoSZzIodTuDSfLb3MRje67xE9RFea73Zao7Lm4mADIfUETKGg=="], - "@ai-sdk/cerebras/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="], + "@ai-sdk/fireworks/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.35", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-g3wA57IAQFb+3j4YuFndgkUdXyRETZVvbfAWM+UX7bZSxA3xjes0v3XKgIdKdekPtDGsh4ZX2byHD0gJIMPfiA=="], - "@ai-sdk/cerebras/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], + "@ai-sdk/fireworks/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.19", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-3eG55CrSWCu2SXlqq2QCsFjo3+E7+Gmg7i/oRVoSZzIodTuDSfLb3MRje67xE9RFea73Zao7Lm4mADIfUETKGg=="], - "@ai-sdk/cohere/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/deepgram/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-fFT1KfUUKktfAFm5mClJhS1oux9tP2qgzmEZVl5UdwltQ1LO/s8hd7znVrgKzivwv1s1FIPza0s9OpJaNB/vHw=="], - - "@ai-sdk/deepinfra/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.33", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-2KMcR2xAul3u5dGZD7gONgbIki3Hg7Ey+sFu7gsiJ4U2iRU0GDV3ccNq79dTuAEXPDFcOWCUpW8A8jXc0kxJxQ=="], - - "@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-fFT1KfUUKktfAFm5mClJhS1oux9tP2qgzmEZVl5UdwltQ1LO/s8hd7znVrgKzivwv1s1FIPza0s9OpJaNB/vHw=="], - - "@ai-sdk/elevenlabs/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-fFT1KfUUKktfAFm5mClJhS1oux9tP2qgzmEZVl5UdwltQ1LO/s8hd7znVrgKzivwv1s1FIPza0s9OpJaNB/vHw=="], - - "@ai-sdk/fireworks/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.34", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.22" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-AnGoxVNZ/E3EU4lW12rrufI6riqL2cEv4jk3OrjJ/i54XwR0CJU1V26jXAwxb+Pc+uZmYG++HM+gzXxPQZkMNQ=="], - - "@ai-sdk/fireworks/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-fFT1KfUUKktfAFm5mClJhS1oux9tP2qgzmEZVl5UdwltQ1LO/s8hd7znVrgKzivwv1s1FIPza0s9OpJaNB/vHw=="], - - "@ai-sdk/gateway/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/google-vertex/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.65", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-HqTPP59mLQ9U6jXQcx6EORkdc5FyZu34Sitkg6jNpyMYcRjStvfx4+NWq/qaR+OTwBFcccv8hvVii0CYkH2Lag=="], - - "@ai-sdk/groq/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/mistral/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@2.0.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA=="], - - "@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.0", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.3", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.25.76 || ^4" } }, "sha512-BoQZtGcBxkeSH1zK+SRYNDtJPIPpacTeiMZqnG4Rv6xXjEwM0FH4MGs9c+PlhyEWmQCzjRM2HAotEydFhD4dYw=="], - - "@ai-sdk/openai-compatible/@ai-sdk/provider": ["@ai-sdk/provider@2.0.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA=="], - - "@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.0", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.3", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.25.76 || ^4" } }, "sha512-BoQZtGcBxkeSH1zK+SRYNDtJPIPpacTeiMZqnG4Rv6xXjEwM0FH4MGs9c+PlhyEWmQCzjRM2HAotEydFhD4dYw=="], - - "@ai-sdk/perplexity/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/togetherai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="], - - "@ai-sdk/togetherai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/vercel/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="], - - "@ai-sdk/vercel/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.30", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-thubwhRtv9uicAxSWwNpinM7hiL/0CkhL/ymPaHuKvI494J7HIzn8KQZQ2ymRz284WTIZnI7VMyyejxW4RMM6w=="], - - "@ai-sdk/xai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], + "@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], "@astrojs/check/yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="], @@ -5329,16 +5285,6 @@ "accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - "ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "ai-gateway-provider/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.65", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-HqTPP59mLQ9U6jXQcx6EORkdc5FyZu34Sitkg6jNpyMYcRjStvfx4+NWq/qaR+OTwBFcccv8hvVii0CYkH2Lag=="], - - "ai-gateway-provider/@ai-sdk/google-vertex": ["@ai-sdk/google-vertex@3.0.90", "", { "dependencies": { "@ai-sdk/anthropic": "2.0.56", "@ai-sdk/google": "2.0.46", "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.19", "google-auth-library": "^10.5.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-C9MLe1KZGg1ZbupV2osygHtL5qngyCDA6ATatunyfTbIe8TXKG8HGni/3O6ifbnI5qxTidIn150Ox7eIFZVMYg=="], - - "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@2.0.89", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-4+qWkBCbL9HPKbgrUO/F2uXZ8GqrYxHa8SWEYIzxEJ9zvWw3ISr3t1/27O1i8MGSym+PzEyHBT48EV4LAwWaEw=="], - - "ai-gateway-provider/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.34", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.22" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-AnGoxVNZ/E3EU4lW12rrufI6riqL2cEv4jk3OrjJ/i54XwR0CJU1V26jXAwxb+Pc+uZmYG++HM+gzXxPQZkMNQ=="], - "ajv-keywords/ajv": ["ajv@6.14.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw=="], "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], @@ -5557,12 +5503,6 @@ "nypm/tinyexec": ["tinyexec@1.0.2", "", {}, "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg=="], - "opencode/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.65", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-HqTPP59mLQ9U6jXQcx6EORkdc5FyZu34Sitkg6jNpyMYcRjStvfx4+NWq/qaR+OTwBFcccv8hvVii0CYkH2Lag=="], - - "opencode/@ai-sdk/openai": ["@ai-sdk/openai@2.0.89", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-4+qWkBCbL9HPKbgrUO/F2uXZ8GqrYxHa8SWEYIzxEJ9zvWw3ISr3t1/27O1i8MGSym+PzEyHBT48EV4LAwWaEw=="], - - "opencode/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="], - "opencode-gitlab-auth/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="], "opencode-poe-auth/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="], @@ -5739,16 +5679,6 @@ "@actions/github/@octokit/plugin-rest-endpoint-methods/@octokit/types": ["@octokit/types@12.6.0", "", { "dependencies": { "@octokit/openapi-types": "^20.0.0" } }, "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw=="], - "@ai-sdk/anthropic/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/anthropic/@ai-sdk/provider-utils/zod-to-json-schema": ["zod-to-json-schema@3.25.1", "", { "peerDependencies": { "zod": "^3.25 || ^4" } }, "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA=="], - - "@ai-sdk/azure/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/cerebras/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/cohere/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@ai-sdk/deepgram/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], "@ai-sdk/deepseek/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], @@ -5757,28 +5687,6 @@ "@ai-sdk/fireworks/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@ai-sdk/gateway/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/groq/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/mistral/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/openai-compatible/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/openai-compatible/@ai-sdk/provider-utils/zod-to-json-schema": ["zod-to-json-schema@3.25.1", "", { "peerDependencies": { "zod": "^3.25 || ^4" } }, "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA=="], - - "@ai-sdk/openai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/openai/@ai-sdk/provider-utils/zod-to-json-schema": ["zod-to-json-schema@3.25.1", "", { "peerDependencies": { "zod": "^3.25 || ^4" } }, "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA=="], - - "@ai-sdk/perplexity/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/togetherai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/vercel/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@ai-sdk/xai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@astrojs/check/yargs/cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="], "@astrojs/check/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], @@ -6211,20 +6119,6 @@ "accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.56", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-XHJKu0Yvfu9SPzRfsAFESa+9T7f2YJY6TxykKMfRsAwpeWAiX/Gbx5J5uM15AzYC3Rw8tVP3oH+j7jEivENirQ=="], - - "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/google": ["@ai-sdk/google@2.0.46", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8PK6u4sGE/kXebd7ZkTp+0aya4kNqzoqpS5m7cHY2NfTK6fhPc6GNvE+MZIZIoHQTp5ed86wGBdeBPpFaaUtyg=="], - - "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider": ["@ai-sdk/provider@2.0.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA=="], - - "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.19", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-W41Wc9/jbUVXVwCN/7bWa4IKe8MtxO3EyA0Hfhx6grnmiYlCvpI8neSYWFE0zScXJkgA/YK3BRybzgyiXuu6JA=="], - - "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "ai-gateway-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-fFT1KfUUKktfAFm5mClJhS1oux9tP2qgzmEZVl5UdwltQ1LO/s8hd7znVrgKzivwv1s1FIPza0s9OpJaNB/vHw=="], - - "ai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "ajv-keywords/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="], "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], @@ -6321,10 +6215,6 @@ "opencode-poe-auth/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="], - "opencode/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - - "opencode/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="], - "opencontrol/@modelcontextprotocol/sdk/express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="], "opencontrol/@modelcontextprotocol/sdk/express-rate-limit": ["express-rate-limit@7.5.1", "", { "peerDependencies": { "express": ">= 4.11" } }, "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw=="], @@ -6581,12 +6471,6 @@ "@solidjs/start/shiki/@shikijs/engine-javascript/oniguruma-to-es": ["oniguruma-to-es@2.3.0", "", { "dependencies": { "emoji-regex-xs": "^1.0.0", "regex": "^5.1.1", "regex-recursion": "^5.1.1" } }, "sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g=="], - "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "ai-gateway-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "ansi-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], "app-builder-lib/@electron/get/fs-extra/universalify": ["universalify@0.1.2", "", {}, "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="], @@ -6639,10 +6523,6 @@ "js-beautify/glob/path-scurry/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="], - "opencode/@ai-sdk/openai-compatible/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "opencode/@ai-sdk/openai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "opencontrol/@modelcontextprotocol/sdk/express/accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="], "opencontrol/@modelcontextprotocol/sdk/express/body-parser": ["body-parser@2.2.2", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA=="], diff --git a/package.json b/package.json index 40ab8ceaf6..2b1c15fb69 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "drizzle-kit": "1.0.0-beta.19-d95b7a4", "drizzle-orm": "1.0.0-beta.19-d95b7a4", "effect": "4.0.0-beta.37", - "ai": "5.0.124", + "ai": "6.0.138", "hono": "4.10.7", "hono-openapi": "1.1.2", "fuzzysort": "3.1.0", @@ -113,8 +113,8 @@ }, "patchedDependencies": { "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch", - "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch", - "@ai-sdk/xai@2.0.51": "patches/@ai-sdk%2Fxai@2.0.51.patch", - "solid-js@1.9.10": "patches/solid-js@1.9.10.patch" + "solid-js@1.9.10": "patches/solid-js@1.9.10.patch", + "@ai-sdk/provider-utils@4.0.21": "patches/@ai-sdk%2Fprovider-utils@4.0.21.patch", + "@ai-sdk/anthropic@3.0.64": "patches/@ai-sdk%2Fanthropic@3.0.64.patch" } } diff --git a/packages/console/function/package.json b/packages/console/function/package.json index 4fa2d2a2d2..389583edba 100644 --- a/packages/console/function/package.json +++ b/packages/console/function/package.json @@ -17,9 +17,9 @@ "@typescript/native-preview": "catalog:" }, "dependencies": { - "@ai-sdk/anthropic": "2.0.0", - "@ai-sdk/openai": "2.0.2", - "@ai-sdk/openai-compatible": "1.0.1", + "@ai-sdk/anthropic": "3.0.64", + "@ai-sdk/openai": "3.0.48", + "@ai-sdk/openai-compatible": "2.0.37", "@hono/zod-validator": "catalog:", "@opencode-ai/console-core": "workspace:*", "@opencode-ai/console-resource": "workspace:*", diff --git a/packages/opencode/package.json b/packages/opencode/package.json index 0f3d7d4deb..b6226bac51 100644 --- a/packages/opencode/package.json +++ b/packages/opencode/package.json @@ -68,25 +68,25 @@ "@actions/core": "1.11.1", "@actions/github": "6.0.1", "@agentclientprotocol/sdk": "0.14.1", - "@ai-sdk/amazon-bedrock": "3.0.82", - "@ai-sdk/anthropic": "2.0.65", - "@ai-sdk/azure": "2.0.91", - "@ai-sdk/cerebras": "1.0.36", - "@ai-sdk/cohere": "2.0.22", - "@ai-sdk/deepinfra": "1.0.36", - "@ai-sdk/gateway": "2.0.30", - "@ai-sdk/google": "2.0.54", - "@ai-sdk/google-vertex": "3.0.106", - "@ai-sdk/groq": "2.0.34", - "@ai-sdk/mistral": "2.0.27", - "@ai-sdk/openai": "2.0.89", - "@ai-sdk/openai-compatible": "1.0.32", - "@ai-sdk/perplexity": "2.0.23", - "@ai-sdk/provider": "2.0.1", - "@ai-sdk/provider-utils": "3.0.21", - "@ai-sdk/togetherai": "1.0.34", - "@ai-sdk/vercel": "1.0.33", - "@ai-sdk/xai": "2.0.51", + "@ai-sdk/amazon-bedrock": "4.0.83", + "@ai-sdk/anthropic": "3.0.64", + "@ai-sdk/azure": "3.0.49", + "@ai-sdk/cerebras": "2.0.41", + "@ai-sdk/cohere": "3.0.27", + "@ai-sdk/deepinfra": "2.0.41", + "@ai-sdk/gateway": "3.0.80", + "@ai-sdk/google": "3.0.53", + "@ai-sdk/google-vertex": "4.0.95", + "@ai-sdk/groq": "3.0.31", + "@ai-sdk/mistral": "3.0.27", + "@ai-sdk/openai": "3.0.48", + "@ai-sdk/openai-compatible": "2.0.37", + "@ai-sdk/perplexity": "3.0.26", + "@ai-sdk/provider": "3.0.8", + "@ai-sdk/provider-utils": "4.0.21", + "@ai-sdk/togetherai": "2.0.41", + "@ai-sdk/vercel": "2.0.39", + "@ai-sdk/xai": "3.0.74", "@aws-sdk/credential-providers": "3.993.0", "@clack/prompts": "1.0.0-alpha.1", "@effect/platform-node": "catalog:", @@ -100,7 +100,7 @@ "@opencode-ai/script": "workspace:*", "@opencode-ai/sdk": "workspace:*", "@opencode-ai/util": "workspace:*", - "@openrouter/ai-sdk-provider": "1.5.4", + "@openrouter/ai-sdk-provider": "2.3.3", "@opentui/core": "0.1.90", "@opentui/solid": "0.1.90", "@parcel/watcher": "2.5.1", @@ -110,7 +110,7 @@ "@standard-schema/spec": "1.0.0", "@zip.js/zip.js": "2.7.62", "ai": "catalog:", - "ai-gateway-provider": "2.3.1", + "ai-gateway-provider": "3.1.2", "bonjour-service": "1.3.0", "bun-pty": "0.4.8", "chokidar": "4.0.3", @@ -121,7 +121,7 @@ "drizzle-orm": "catalog:", "effect": "catalog:", "fuzzysort": "3.1.0", - "gitlab-ai-provider": "5.3.3", + "gitlab-ai-provider": "6.0.0", "glob": "13.0.5", "google-auth-library": "10.5.0", "gray-matter": "4.0.3", diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts index 6ab45d028b..7fb3166284 100644 --- a/packages/opencode/src/provider/provider.ts +++ b/packages/opencode/src/provider/provider.ts @@ -9,6 +9,7 @@ import { BunProc } from "../bun" import { Hash } from "../util/hash" import { Plugin } from "../plugin" import { NamedError } from "@opencode-ai/util/error" +import { type LanguageModelV3 } from "@ai-sdk/provider" import { ModelsDev } from "./models" import { Auth } from "../auth" import { Env } from "../env" @@ -28,7 +29,7 @@ import { createVertex } from "@ai-sdk/google-vertex" import { createVertexAnthropic } from "@ai-sdk/google-vertex/anthropic" import { createOpenAI } from "@ai-sdk/openai" import { createOpenAICompatible } from "@ai-sdk/openai-compatible" -import { createOpenRouter, type LanguageModelV2 } from "@openrouter/ai-sdk-provider" +import { createOpenRouter } from "@openrouter/ai-sdk-provider" import { createOpenaiCompatible as createGitHubCopilotOpenAICompatible } from "./sdk/copilot" import { createXai } from "@ai-sdk/xai" import { createMistral } from "@ai-sdk/mistral" @@ -109,7 +110,11 @@ export namespace Provider { }) } - const BUNDLED_PROVIDERS: Record SDK> = { + type BundledSDK = { + languageModel(modelId: string): LanguageModelV3 + } + + const BUNDLED_PROVIDERS: Record BundledSDK> = { "@ai-sdk/amazon-bedrock": createAmazonBedrock, "@ai-sdk/anthropic": createAnthropic, "@ai-sdk/azure": createAzure, @@ -130,7 +135,6 @@ export namespace Provider { "@ai-sdk/perplexity": createPerplexity, "@ai-sdk/vercel": createVercel, "gitlab-ai-provider": createGitLab, - // @ts-ignore (TODO: kill this code so we dont have to maintain it) "@ai-sdk/github-copilot": createGitHubCopilotOpenAICompatible, } @@ -591,7 +595,12 @@ export namespace Provider { if (!result.models.length) { log.info("gitlab model discovery skipped: no models found", { - project: result.project ? { id: result.project.id, path: result.project.pathWithNamespace } : null, + project: result.project + ? { + id: result.project.id, + path: result.project.pathWithNamespace, + } + : null, }) return {} } @@ -619,8 +628,20 @@ export namespace Provider { reasoning: true, attachment: true, toolcall: true, - input: { text: true, audio: false, image: true, video: false, pdf: true }, - output: { text: true, audio: false, image: false, video: false, pdf: false }, + input: { + text: true, + audio: false, + image: true, + video: false, + pdf: true, + }, + output: { + text: true, + audio: false, + image: false, + video: false, + pdf: false, + }, interleaved: false, }, release_date: "", @@ -930,17 +951,17 @@ export namespace Provider { } const providers: Record = {} as Record - const languages = new Map() + const languages = new Map() const modelLoaders: { [providerID: string]: CustomModelLoader } = {} const varsLoaders: { [providerID: string]: CustomVarsLoader } = {} + const sdk = new Map() const discoveryLoaders: { [providerID: string]: CustomDiscoverModels } = {} - const sdk = new Map() log.info("init") @@ -1232,7 +1253,13 @@ export namespace Provider { ...model.headers, } - const key = Hash.fast(JSON.stringify({ providerID: model.providerID, npm: model.api.npm, options })) + const key = Hash.fast( + JSON.stringify({ + providerID: model.providerID, + npm: model.api.npm, + options, + }), + ) const existing = s.sdk.get(key) if (existing) return existing @@ -1285,7 +1312,10 @@ export namespace Provider { const bundledFn = BUNDLED_PROVIDERS[model.api.npm] if (bundledFn) { - log.info("using bundled provider", { providerID: model.providerID, pkg: model.api.npm }) + log.info("using bundled provider", { + providerID: model.providerID, + pkg: model.api.npm, + }) const loaded = bundledFn({ name: model.providerID, ...options, @@ -1325,7 +1355,10 @@ export namespace Provider { const provider = s.providers[providerID] if (!provider) { const availableProviders = Object.keys(s.providers) - const matches = fuzzysort.go(providerID, availableProviders, { limit: 3, threshold: -10000 }) + const matches = fuzzysort.go(providerID, availableProviders, { + limit: 3, + threshold: -10000, + }) const suggestions = matches.map((m) => m.target) throw new ModelNotFoundError({ providerID, modelID, suggestions }) } @@ -1333,14 +1366,17 @@ export namespace Provider { const info = provider.models[modelID] if (!info) { const availableModels = Object.keys(provider.models) - const matches = fuzzysort.go(modelID, availableModels, { limit: 3, threshold: -10000 }) + const matches = fuzzysort.go(modelID, availableModels, { + limit: 3, + threshold: -10000, + }) const suggestions = matches.map((m) => m.target) throw new ModelNotFoundError({ providerID, modelID, suggestions }) } return info } - export async function getLanguage(model: Model): Promise { + export async function getLanguage(model: Model): Promise { const s = await state() const key = `${model.providerID}/${model.id}` if (s.models.has(key)) return s.models.get(key)! @@ -1350,7 +1386,10 @@ export namespace Provider { try { const language = s.modelLoaders[model.providerID] - ? await s.modelLoaders[model.providerID](sdk, model.api.id, { ...provider.options, ...model.options }) + ? await s.modelLoaders[model.providerID](sdk, model.api.id, { + ...provider.options, + ...model.options, + }) : sdk.languageModel(model.api.id) s.models.set(key, language) return language @@ -1457,9 +1496,9 @@ export namespace Provider { if (cfg.model) return parseModel(cfg.model) const providers = await list() - const recent = (await Filesystem.readJson<{ recent?: { providerID: ProviderID; modelID: ModelID }[] }>( - path.join(Global.Path.state, "model.json"), - ) + const recent = (await Filesystem.readJson<{ + recent?: { providerID: ProviderID; modelID: ModelID }[] + }>(path.join(Global.Path.state, "model.json")) .then((x) => (Array.isArray(x.recent) ? x.recent : [])) .catch(() => [])) as { providerID: ProviderID; modelID: ModelID }[] for (const entry of recent) { diff --git a/packages/opencode/src/provider/sdk/copilot/chat/convert-to-openai-compatible-chat-messages.ts b/packages/opencode/src/provider/sdk/copilot/chat/convert-to-openai-compatible-chat-messages.ts index e1e3ed4c20..c4e15e0b4f 100644 --- a/packages/opencode/src/provider/sdk/copilot/chat/convert-to-openai-compatible-chat-messages.ts +++ b/packages/opencode/src/provider/sdk/copilot/chat/convert-to-openai-compatible-chat-messages.ts @@ -1,16 +1,16 @@ import { - type LanguageModelV2Prompt, - type SharedV2ProviderMetadata, + type LanguageModelV3Prompt, + type SharedV3ProviderOptions, UnsupportedFunctionalityError, } from "@ai-sdk/provider" import type { OpenAICompatibleChatPrompt } from "./openai-compatible-api-types" import { convertToBase64 } from "@ai-sdk/provider-utils" -function getOpenAIMetadata(message: { providerOptions?: SharedV2ProviderMetadata }) { +function getOpenAIMetadata(message: { providerOptions?: SharedV3ProviderOptions }) { return message?.providerOptions?.copilot ?? {} } -export function convertToOpenAICompatibleChatMessages(prompt: LanguageModelV2Prompt): OpenAICompatibleChatPrompt { +export function convertToOpenAICompatibleChatMessages(prompt: LanguageModelV3Prompt): OpenAICompatibleChatPrompt { const messages: OpenAICompatibleChatPrompt = [] for (const { role, content, ...message } of prompt) { const metadata = getOpenAIMetadata({ ...message }) @@ -127,6 +127,9 @@ export function convertToOpenAICompatibleChatMessages(prompt: LanguageModelV2Pro case "tool": { for (const toolResponse of content) { + if (toolResponse.type === "tool-approval-response") { + continue + } const output = toolResponse.output let contentValue: string @@ -135,6 +138,9 @@ export function convertToOpenAICompatibleChatMessages(prompt: LanguageModelV2Pro case "error-text": contentValue = output.value break + case "execution-denied": + contentValue = output.reason ?? "Tool execution denied." + break case "content": case "json": case "error-json": diff --git a/packages/opencode/src/provider/sdk/copilot/chat/map-openai-compatible-finish-reason.ts b/packages/opencode/src/provider/sdk/copilot/chat/map-openai-compatible-finish-reason.ts index 82e2ca02e9..7186b62af9 100644 --- a/packages/opencode/src/provider/sdk/copilot/chat/map-openai-compatible-finish-reason.ts +++ b/packages/opencode/src/provider/sdk/copilot/chat/map-openai-compatible-finish-reason.ts @@ -1,6 +1,8 @@ -import type { LanguageModelV2FinishReason } from "@ai-sdk/provider" +import type { LanguageModelV3FinishReason } from "@ai-sdk/provider" -export function mapOpenAICompatibleFinishReason(finishReason: string | null | undefined): LanguageModelV2FinishReason { +export function mapOpenAICompatibleFinishReason( + finishReason: string | null | undefined, +): LanguageModelV3FinishReason["unified"] { switch (finishReason) { case "stop": return "stop" @@ -12,6 +14,6 @@ export function mapOpenAICompatibleFinishReason(finishReason: string | null | un case "tool_calls": return "tool-calls" default: - return "unknown" + return "other" } } diff --git a/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-chat-language-model.ts b/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-chat-language-model.ts index c85d3f3d17..280970c41b 100644 --- a/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-chat-language-model.ts +++ b/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-chat-language-model.ts @@ -1,12 +1,12 @@ import { APICallError, InvalidResponseDataError, - type LanguageModelV2, - type LanguageModelV2CallWarning, - type LanguageModelV2Content, - type LanguageModelV2FinishReason, - type LanguageModelV2StreamPart, - type SharedV2ProviderMetadata, + type LanguageModelV3, + type LanguageModelV3CallOptions, + type LanguageModelV3Content, + type LanguageModelV3StreamPart, + type SharedV3ProviderMetadata, + type SharedV3Warning, } from "@ai-sdk/provider" import { combineHeaders, @@ -47,11 +47,11 @@ export type OpenAICompatibleChatConfig = { /** * The supported URLs for the model. */ - supportedUrls?: () => LanguageModelV2["supportedUrls"] + supportedUrls?: () => LanguageModelV3["supportedUrls"] } -export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { - readonly specificationVersion = "v2" +export class OpenAICompatibleChatLanguageModel implements LanguageModelV3 { + readonly specificationVersion = "v3" readonly supportsStructuredOutputs: boolean @@ -98,8 +98,8 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { seed, toolChoice, tools, - }: Parameters[0]) { - const warnings: LanguageModelV2CallWarning[] = [] + }: LanguageModelV3CallOptions) { + const warnings: SharedV3Warning[] = [] // Parse provider options const compatibleOptions = Object.assign( @@ -116,13 +116,13 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { ) if (topK != null) { - warnings.push({ type: "unsupported-setting", setting: "topK" }) + warnings.push({ type: "unsupported", feature: "topK" }) } if (responseFormat?.type === "json" && responseFormat.schema != null && !this.supportsStructuredOutputs) { warnings.push({ - type: "unsupported-setting", - setting: "responseFormat", + type: "unsupported", + feature: "responseFormat", details: "JSON response format schema is only supported with structuredOutputs", }) } @@ -189,9 +189,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { } } - async doGenerate( - options: Parameters[0], - ): Promise>> { + async doGenerate(options: LanguageModelV3CallOptions) { const { args, warnings } = await this.getArgs({ ...options }) const body = JSON.stringify(args) @@ -214,7 +212,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { }) const choice = responseBody.choices[0] - const content: Array = [] + const content: Array = [] // text content: const text = choice.message.content @@ -257,7 +255,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { } // provider metadata: - const providerMetadata: SharedV2ProviderMetadata = { + const providerMetadata: SharedV3ProviderMetadata = { [this.providerOptionsName]: {}, ...(await this.config.metadataExtractor?.extractMetadata?.({ parsedBody: rawResponse, @@ -275,13 +273,23 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { return { content, - finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason), + finishReason: { + unified: mapOpenAICompatibleFinishReason(choice.finish_reason), + raw: choice.finish_reason ?? undefined, + }, usage: { - inputTokens: responseBody.usage?.prompt_tokens ?? undefined, - outputTokens: responseBody.usage?.completion_tokens ?? undefined, - totalTokens: responseBody.usage?.total_tokens ?? undefined, - reasoningTokens: responseBody.usage?.completion_tokens_details?.reasoning_tokens ?? undefined, - cachedInputTokens: responseBody.usage?.prompt_tokens_details?.cached_tokens ?? undefined, + inputTokens: { + total: responseBody.usage?.prompt_tokens ?? undefined, + noCache: undefined, + cacheRead: responseBody.usage?.prompt_tokens_details?.cached_tokens ?? undefined, + cacheWrite: undefined, + }, + outputTokens: { + total: responseBody.usage?.completion_tokens ?? undefined, + text: undefined, + reasoning: responseBody.usage?.completion_tokens_details?.reasoning_tokens ?? undefined, + }, + raw: responseBody.usage ?? undefined, }, providerMetadata, request: { body }, @@ -294,9 +302,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { } } - async doStream( - options: Parameters[0], - ): Promise>> { + async doStream(options: LanguageModelV3CallOptions) { const { args, warnings } = await this.getArgs({ ...options }) const body = { @@ -332,7 +338,13 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { hasFinished: boolean }> = [] - let finishReason: LanguageModelV2FinishReason = "unknown" + let finishReason: { + unified: ReturnType + raw: string | undefined + } = { + unified: "other", + raw: undefined, + } const usage: { completionTokens: number | undefined completionTokensDetails: { @@ -366,7 +378,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { return { stream: response.pipeThrough( - new TransformStream>, LanguageModelV2StreamPart>({ + new TransformStream>, LanguageModelV3StreamPart>({ start(controller) { controller.enqueue({ type: "stream-start", warnings }) }, @@ -380,7 +392,10 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { // handle failed chunk parsing / validation: if (!chunk.success) { - finishReason = "error" + finishReason = { + unified: "error", + raw: undefined, + } controller.enqueue({ type: "error", error: chunk.error }) return } @@ -390,7 +405,10 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { // handle error chunks: if ("error" in value) { - finishReason = "error" + finishReason = { + unified: "error", + raw: undefined, + } controller.enqueue({ type: "error", error: value.error.message }) return } @@ -435,7 +453,10 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { const choice = value.choices[0] if (choice?.finish_reason != null) { - finishReason = mapOpenAICompatibleFinishReason(choice.finish_reason) + finishReason = { + unified: mapOpenAICompatibleFinishReason(choice.finish_reason), + raw: choice.finish_reason ?? undefined, + } } if (choice?.delta == null) { @@ -652,7 +673,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { }) } - const providerMetadata: SharedV2ProviderMetadata = { + const providerMetadata: SharedV3ProviderMetadata = { [providerOptionsName]: {}, // Include reasoning_opaque for Copilot multi-turn reasoning ...(reasoningOpaque ? { copilot: { reasoningOpaque } } : {}), @@ -671,11 +692,25 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV2 { type: "finish", finishReason, usage: { - inputTokens: usage.promptTokens ?? undefined, - outputTokens: usage.completionTokens ?? undefined, - totalTokens: usage.totalTokens ?? undefined, - reasoningTokens: usage.completionTokensDetails.reasoningTokens ?? undefined, - cachedInputTokens: usage.promptTokensDetails.cachedTokens ?? undefined, + inputTokens: { + total: usage.promptTokens, + noCache: + usage.promptTokens != undefined && usage.promptTokensDetails.cachedTokens != undefined + ? usage.promptTokens - usage.promptTokensDetails.cachedTokens + : undefined, + cacheRead: usage.promptTokensDetails.cachedTokens, + cacheWrite: undefined, + }, + outputTokens: { + total: usage.completionTokens, + text: undefined, + reasoning: usage.completionTokensDetails.reasoningTokens, + }, + raw: { + prompt_tokens: usage.promptTokens ?? null, + completion_tokens: usage.completionTokens ?? null, + total_tokens: usage.totalTokens ?? null, + }, }, providerMetadata, }) diff --git a/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-metadata-extractor.ts b/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-metadata-extractor.ts index ba233fbc1b..40335f87f6 100644 --- a/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-metadata-extractor.ts +++ b/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-metadata-extractor.ts @@ -1,4 +1,4 @@ -import type { SharedV2ProviderMetadata } from "@ai-sdk/provider" +import type { SharedV3ProviderMetadata } from "@ai-sdk/provider" /** Extracts provider-specific metadata from API responses. @@ -14,7 +14,7 @@ export type MetadataExtractor = { * @returns Provider-specific metadata or undefined if no metadata is available. * The metadata should be under a key indicating the provider id. */ - extractMetadata: ({ parsedBody }: { parsedBody: unknown }) => Promise + extractMetadata: ({ parsedBody }: { parsedBody: unknown }) => Promise /** * Creates an extractor for handling streaming responses. The returned object provides @@ -39,6 +39,6 @@ export type MetadataExtractor = { * @returns Provider-specific metadata or undefined if no metadata is available. * The metadata should be under a key indicating the provider id. */ - buildMetadata(): SharedV2ProviderMetadata | undefined + buildMetadata(): SharedV3ProviderMetadata | undefined } } diff --git a/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-prepare-tools.ts b/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-prepare-tools.ts index 8879d6481b..ac907f5254 100644 --- a/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-prepare-tools.ts +++ b/packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-prepare-tools.ts @@ -1,15 +1,11 @@ -import { - type LanguageModelV2CallOptions, - type LanguageModelV2CallWarning, - UnsupportedFunctionalityError, -} from "@ai-sdk/provider" +import { type LanguageModelV3CallOptions, type SharedV3Warning, UnsupportedFunctionalityError } from "@ai-sdk/provider" export function prepareTools({ tools, toolChoice, }: { - tools: LanguageModelV2CallOptions["tools"] - toolChoice?: LanguageModelV2CallOptions["toolChoice"] + tools: LanguageModelV3CallOptions["tools"] + toolChoice?: LanguageModelV3CallOptions["toolChoice"] }): { tools: | undefined @@ -22,12 +18,12 @@ export function prepareTools({ } }> toolChoice: { type: "function"; function: { name: string } } | "auto" | "none" | "required" | undefined - toolWarnings: LanguageModelV2CallWarning[] + toolWarnings: SharedV3Warning[] } { // when the tools array is empty, change it to undefined to prevent errors: tools = tools?.length ? tools : undefined - const toolWarnings: LanguageModelV2CallWarning[] = [] + const toolWarnings: SharedV3Warning[] = [] if (tools == null) { return { tools: undefined, toolChoice: undefined, toolWarnings } @@ -43,8 +39,8 @@ export function prepareTools({ }> = [] for (const tool of tools) { - if (tool.type === "provider-defined") { - toolWarnings.push({ type: "unsupported-tool", tool }) + if (tool.type === "provider") { + toolWarnings.push({ type: "unsupported", feature: `tool type: ${tool.type}` }) } else { openaiCompatTools.push({ type: "function", diff --git a/packages/opencode/src/provider/sdk/copilot/copilot-provider.ts b/packages/opencode/src/provider/sdk/copilot/copilot-provider.ts index 1dc373ff3c..b9cbb6c7cc 100644 --- a/packages/opencode/src/provider/sdk/copilot/copilot-provider.ts +++ b/packages/opencode/src/provider/sdk/copilot/copilot-provider.ts @@ -1,4 +1,4 @@ -import type { LanguageModelV2 } from "@ai-sdk/provider" +import type { LanguageModelV3 } from "@ai-sdk/provider" import { type FetchFunction, withoutTrailingSlash, withUserAgentSuffix } from "@ai-sdk/provider-utils" import { OpenAICompatibleChatLanguageModel } from "./chat/openai-compatible-chat-language-model" import { OpenAIResponsesLanguageModel } from "./responses/openai-responses-language-model" @@ -36,10 +36,10 @@ export interface OpenaiCompatibleProviderSettings { } export interface OpenaiCompatibleProvider { - (modelId: OpenaiCompatibleModelId): LanguageModelV2 - chat(modelId: OpenaiCompatibleModelId): LanguageModelV2 - responses(modelId: OpenaiCompatibleModelId): LanguageModelV2 - languageModel(modelId: OpenaiCompatibleModelId): LanguageModelV2 + (modelId: OpenaiCompatibleModelId): LanguageModelV3 + chat(modelId: OpenaiCompatibleModelId): LanguageModelV3 + responses(modelId: OpenaiCompatibleModelId): LanguageModelV3 + languageModel(modelId: OpenaiCompatibleModelId): LanguageModelV3 // embeddingModel(modelId: any): EmbeddingModelV2 diff --git a/packages/opencode/src/provider/sdk/copilot/responses/convert-to-openai-responses-input.ts b/packages/opencode/src/provider/sdk/copilot/responses/convert-to-openai-responses-input.ts index 807f6ea57c..83e46015dd 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/convert-to-openai-responses-input.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/convert-to-openai-responses-input.ts @@ -1,7 +1,7 @@ import { - type LanguageModelV2CallWarning, - type LanguageModelV2Prompt, - type LanguageModelV2ToolCallPart, + type LanguageModelV3Prompt, + type LanguageModelV3ToolCallPart, + type SharedV3Warning, UnsupportedFunctionalityError, } from "@ai-sdk/provider" import { convertToBase64, parseProviderOptions } from "@ai-sdk/provider-utils" @@ -25,17 +25,18 @@ export async function convertToOpenAIResponsesInput({ store, hasLocalShellTool = false, }: { - prompt: LanguageModelV2Prompt + prompt: LanguageModelV3Prompt systemMessageMode: "system" | "developer" | "remove" fileIdPrefixes?: readonly string[] store: boolean hasLocalShellTool?: boolean }): Promise<{ input: OpenAIResponsesInput - warnings: Array + warnings: Array }> { const input: OpenAIResponsesInput = [] - const warnings: Array = [] + const warnings: Array = [] + const processedApprovalIds = new Set() for (const { role, content } of prompt) { switch (role) { @@ -118,7 +119,7 @@ export async function convertToOpenAIResponsesInput({ case "assistant": { const reasoningMessages: Record = {} - const toolCallParts: Record = {} + const toolCallParts: Record = {} for (const part of content) { switch (part.type) { @@ -251,8 +252,36 @@ export async function convertToOpenAIResponsesInput({ case "tool": { for (const part of content) { + if (part.type === "tool-approval-response") { + if (processedApprovalIds.has(part.approvalId)) { + continue + } + processedApprovalIds.add(part.approvalId) + + if (store) { + input.push({ + type: "item_reference", + id: part.approvalId, + }) + } + + input.push({ + type: "mcp_approval_response", + approval_request_id: part.approvalId, + approve: part.approved, + }) + continue + } const output = part.output + if (output.type === "execution-denied") { + const approvalId = (output.providerOptions?.openai as { approvalId?: string } | undefined)?.approvalId + + if (approvalId) { + continue + } + } + if (hasLocalShellTool && part.toolName === "local_shell" && output.type === "json") { input.push({ type: "local_shell_call_output", @@ -268,6 +297,9 @@ export async function convertToOpenAIResponsesInput({ case "error-text": contentValue = output.value break + case "execution-denied": + contentValue = output.reason ?? "Tool execution denied." + break case "content": case "json": case "error-json": diff --git a/packages/opencode/src/provider/sdk/copilot/responses/map-openai-responses-finish-reason.ts b/packages/opencode/src/provider/sdk/copilot/responses/map-openai-responses-finish-reason.ts index 54bb9056d7..4f443b511b 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/map-openai-responses-finish-reason.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/map-openai-responses-finish-reason.ts @@ -1,4 +1,4 @@ -import type { LanguageModelV2FinishReason } from "@ai-sdk/provider" +import type { LanguageModelV3FinishReason } from "@ai-sdk/provider" export function mapOpenAIResponseFinishReason({ finishReason, @@ -7,7 +7,7 @@ export function mapOpenAIResponseFinishReason({ finishReason: string | null | undefined // flag that checks if there have been client-side tool calls (not executed by openai) hasFunctionCall: boolean -}): LanguageModelV2FinishReason { +}): LanguageModelV3FinishReason["unified"] { switch (finishReason) { case undefined: case null: @@ -17,6 +17,6 @@ export function mapOpenAIResponseFinishReason({ case "content_filter": return "content-filter" default: - return hasFunctionCall ? "tool-calls" : "unknown" + return hasFunctionCall ? "tool-calls" : "other" } } diff --git a/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-api-types.ts b/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-api-types.ts index cf1a3ba2fb..dfdd066750 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-api-types.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-api-types.ts @@ -13,6 +13,7 @@ export type OpenAIResponsesInputItem = | OpenAIResponsesLocalShellCallOutput | OpenAIResponsesReasoning | OpenAIResponsesItemReference + | OpenAIResponsesMcpApprovalResponse export type OpenAIResponsesIncludeValue = | "web_search_call.action.sources" @@ -93,6 +94,12 @@ export type OpenAIResponsesItemReference = { id: string } +export type OpenAIResponsesMcpApprovalResponse = { + type: "mcp_approval_response" + approval_request_id: string + approve: boolean +} + /** * A filter used to compare a specified attribute key to a given value using a defined comparison operation. */ diff --git a/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-language-model.ts b/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-language-model.ts index 0a575bc02b..4606af7a15 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-language-model.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-language-model.ts @@ -1,13 +1,13 @@ import { APICallError, - type LanguageModelV2, - type LanguageModelV2CallWarning, - type LanguageModelV2Content, - type LanguageModelV2FinishReason, - type LanguageModelV2ProviderDefinedTool, - type LanguageModelV2StreamPart, - type LanguageModelV2Usage, - type SharedV2ProviderMetadata, + type JSONValue, + type LanguageModelV3, + type LanguageModelV3CallOptions, + type LanguageModelV3Content, + type LanguageModelV3ProviderTool, + type LanguageModelV3StreamPart, + type SharedV3ProviderMetadata, + type SharedV3Warning, } from "@ai-sdk/provider" import { combineHeaders, @@ -128,8 +128,8 @@ const LOGPROBS_SCHEMA = z.array( }), ) -export class OpenAIResponsesLanguageModel implements LanguageModelV2 { - readonly specificationVersion = "v2" +export class OpenAIResponsesLanguageModel implements LanguageModelV3 { + readonly specificationVersion = "v3" readonly modelId: OpenAIResponsesModelId @@ -163,34 +163,34 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { tools, toolChoice, responseFormat, - }: Parameters[0]) { - const warnings: LanguageModelV2CallWarning[] = [] + }: LanguageModelV3CallOptions) { + const warnings: SharedV3Warning[] = [] const modelConfig = getResponsesModelConfig(this.modelId) if (topK != null) { - warnings.push({ type: "unsupported-setting", setting: "topK" }) + warnings.push({ type: "unsupported", feature: "topK" }) } if (seed != null) { - warnings.push({ type: "unsupported-setting", setting: "seed" }) + warnings.push({ type: "unsupported", feature: "seed" }) } if (presencePenalty != null) { warnings.push({ - type: "unsupported-setting", - setting: "presencePenalty", + type: "unsupported", + feature: "presencePenalty", }) } if (frequencyPenalty != null) { warnings.push({ - type: "unsupported-setting", - setting: "frequencyPenalty", + type: "unsupported", + feature: "frequencyPenalty", }) } if (stopSequences != null) { - warnings.push({ type: "unsupported-setting", setting: "stopSequences" }) + warnings.push({ type: "unsupported", feature: "stopSequences" }) } const openaiOptions = await parseProviderOptions({ @@ -218,7 +218,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { } function hasOpenAITool(id: string) { - return tools?.find((tool) => tool.type === "provider-defined" && tool.id === id) != null + return tools?.find((tool) => tool.type === "provider" && tool.id === id) != null } // when logprobs are requested, automatically include them: @@ -237,9 +237,8 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { const webSearchToolName = ( tools?.find( (tool) => - tool.type === "provider-defined" && - (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview"), - ) as LanguageModelV2ProviderDefinedTool | undefined + tool.type === "provider" && (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview"), + ) as LanguageModelV3ProviderTool | undefined )?.name if (webSearchToolName) { @@ -315,8 +314,8 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { if (baseArgs.temperature != null) { baseArgs.temperature = undefined warnings.push({ - type: "unsupported-setting", - setting: "temperature", + type: "unsupported", + feature: "temperature", details: "temperature is not supported for reasoning models", }) } @@ -324,24 +323,24 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { if (baseArgs.top_p != null) { baseArgs.top_p = undefined warnings.push({ - type: "unsupported-setting", - setting: "topP", + type: "unsupported", + feature: "topP", details: "topP is not supported for reasoning models", }) } } else { if (openaiOptions?.reasoningEffort != null) { warnings.push({ - type: "unsupported-setting", - setting: "reasoningEffort", + type: "unsupported", + feature: "reasoningEffort", details: "reasoningEffort is not supported for non-reasoning models", }) } if (openaiOptions?.reasoningSummary != null) { warnings.push({ - type: "unsupported-setting", - setting: "reasoningSummary", + type: "unsupported", + feature: "reasoningSummary", details: "reasoningSummary is not supported for non-reasoning models", }) } @@ -350,8 +349,8 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { // Validate flex processing support if (openaiOptions?.serviceTier === "flex" && !modelConfig.supportsFlexProcessing) { warnings.push({ - type: "unsupported-setting", - setting: "serviceTier", + type: "unsupported", + feature: "serviceTier", details: "flex processing is only available for o3, o4-mini, and gpt-5 models", }) // Remove from args if not supported @@ -361,8 +360,8 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { // Validate priority processing support if (openaiOptions?.serviceTier === "priority" && !modelConfig.supportsPriorityProcessing) { warnings.push({ - type: "unsupported-setting", - setting: "serviceTier", + type: "unsupported", + feature: "serviceTier", details: "priority processing is only available for supported models (gpt-4, gpt-5, gpt-5-mini, o3, o4-mini) and requires Enterprise access. gpt-5-nano is not supported", }) @@ -391,9 +390,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { } } - async doGenerate( - options: Parameters[0], - ): Promise>> { + async doGenerate(options: LanguageModelV3CallOptions) { const { args: body, warnings, webSearchToolName } = await this.getArgs(options) const url = this.config.url({ path: "/responses", @@ -508,7 +505,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { }) } - const content: Array = [] + const content: Array = [] const logprobs: Array> = [] // flag that checks if there have been client-side tool calls (not executed by openai) @@ -554,7 +551,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { result: { result: part.result, } satisfies z.infer, - providerExecuted: true, }) break @@ -648,7 +644,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { toolCallId: part.id, toolName: webSearchToolName ?? "web_search", result: { status: part.status }, - providerExecuted: true, }) break @@ -671,7 +666,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { type: "computer_use_tool_result", status: part.status || "completed", }, - providerExecuted: true, }) break } @@ -693,14 +687,13 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { queries: part.queries, results: part.results?.map((result) => ({ - attributes: result.attributes, + attributes: result.attributes as Record, fileId: result.file_id, filename: result.filename, score: result.score, text: result.text, })) ?? null, } satisfies z.infer, - providerExecuted: true, }) break } @@ -724,14 +717,13 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { result: { outputs: part.outputs, } satisfies z.infer, - providerExecuted: true, }) break } } } - const providerMetadata: SharedV2ProviderMetadata = { + const providerMetadata: SharedV3ProviderMetadata = { openai: { responseId: response.id }, } @@ -745,16 +737,29 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { return { content, - finishReason: mapOpenAIResponseFinishReason({ - finishReason: response.incomplete_details?.reason, - hasFunctionCall, - }), + finishReason: { + unified: mapOpenAIResponseFinishReason({ + finishReason: response.incomplete_details?.reason, + hasFunctionCall, + }), + raw: response.incomplete_details?.reason, + }, usage: { - inputTokens: response.usage.input_tokens, - outputTokens: response.usage.output_tokens, - totalTokens: response.usage.input_tokens + response.usage.output_tokens, - reasoningTokens: response.usage.output_tokens_details?.reasoning_tokens ?? undefined, - cachedInputTokens: response.usage.input_tokens_details?.cached_tokens ?? undefined, + inputTokens: { + total: response.usage.input_tokens, + noCache: + response.usage.input_tokens_details?.cached_tokens != null + ? response.usage.input_tokens - response.usage.input_tokens_details.cached_tokens + : undefined, + cacheRead: response.usage.input_tokens_details?.cached_tokens ?? undefined, + cacheWrite: undefined, + }, + outputTokens: { + total: response.usage.output_tokens, + text: undefined, + reasoning: response.usage.output_tokens_details?.reasoning_tokens ?? undefined, + }, + raw: response.usage, }, request: { body }, response: { @@ -769,9 +774,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { } } - async doStream( - options: Parameters[0], - ): Promise>> { + async doStream(options: LanguageModelV3CallOptions) { const { args: body, warnings, webSearchToolName } = await this.getArgs(options) const { responseHeaders, value: response } = await postJsonToApi({ @@ -792,11 +795,25 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { const self = this - let finishReason: LanguageModelV2FinishReason = "unknown" - const usage: LanguageModelV2Usage = { + let finishReason: { + unified: ReturnType + raw: string | undefined + } = { + unified: "other", + raw: undefined, + } + const usage: { + inputTokens: number | undefined + outputTokens: number | undefined + totalTokens: number | undefined + reasoningTokens: number | undefined + cachedInputTokens: number | undefined + } = { inputTokens: undefined, outputTokens: undefined, totalTokens: undefined, + reasoningTokens: undefined, + cachedInputTokens: undefined, } const logprobs: Array> = [] let responseId: string | null = null @@ -837,7 +854,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { return { stream: response.pipeThrough( - new TransformStream>, LanguageModelV2StreamPart>({ + new TransformStream>, LanguageModelV3StreamPart>({ start(controller) { controller.enqueue({ type: "stream-start", warnings }) }, @@ -849,7 +866,10 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { // handle failed chunk parsing / validation: if (!chunk.success) { - finishReason = "error" + finishReason = { + unified: "error", + raw: undefined, + } controller.enqueue({ type: "error", error: chunk.error }) return } @@ -999,7 +1019,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { toolCallId: value.item.id, toolName: "web_search", result: { status: value.item.status }, - providerExecuted: true, }) } else if (value.item.type === "computer_call") { ongoingToolCalls[value.output_index] = undefined @@ -1025,7 +1044,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { type: "computer_use_tool_result", status: value.item.status || "completed", }, - providerExecuted: true, }) } else if (value.item.type === "file_search_call") { ongoingToolCalls[value.output_index] = undefined @@ -1038,14 +1056,13 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { queries: value.item.queries, results: value.item.results?.map((result) => ({ - attributes: result.attributes, + attributes: result.attributes as Record, fileId: result.file_id, filename: result.filename, score: result.score, text: result.text, })) ?? null, } satisfies z.infer, - providerExecuted: true, }) } else if (value.item.type === "code_interpreter_call") { ongoingToolCalls[value.output_index] = undefined @@ -1057,7 +1074,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { result: { outputs: value.item.outputs, } satisfies z.infer, - providerExecuted: true, }) } else if (value.item.type === "image_generation_call") { controller.enqueue({ @@ -1067,7 +1083,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { result: { result: value.item.result, } satisfies z.infer, - providerExecuted: true, }) } else if (value.item.type === "local_shell_call") { ongoingToolCalls[value.output_index] = undefined @@ -1137,7 +1152,6 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { result: { result: value.partial_image_b64, } satisfies z.infer, - providerExecuted: true, }) } else if (isResponseCodeInterpreterCallCodeDeltaChunk(value)) { const toolCall = ongoingToolCalls[value.output_index] @@ -1244,10 +1258,13 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { }) } } else if (isResponseFinishedChunk(value)) { - finishReason = mapOpenAIResponseFinishReason({ - finishReason: value.response.incomplete_details?.reason, - hasFunctionCall, - }) + finishReason = { + unified: mapOpenAIResponseFinishReason({ + finishReason: value.response.incomplete_details?.reason, + hasFunctionCall, + }), + raw: value.response.incomplete_details?.reason ?? undefined, + } usage.inputTokens = value.response.usage.input_tokens usage.outputTokens = value.response.usage.output_tokens usage.totalTokens = value.response.usage.input_tokens + value.response.usage.output_tokens @@ -1287,7 +1304,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { currentTextId = null } - const providerMetadata: SharedV2ProviderMetadata = { + const providerMetadata: SharedV3ProviderMetadata = { openai: { responseId, }, @@ -1304,7 +1321,27 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV2 { controller.enqueue({ type: "finish", finishReason, - usage, + usage: { + inputTokens: { + total: usage.inputTokens, + noCache: + usage.inputTokens != null && usage.cachedInputTokens != null + ? usage.inputTokens - usage.cachedInputTokens + : undefined, + cacheRead: usage.cachedInputTokens, + cacheWrite: undefined, + }, + outputTokens: { + total: usage.outputTokens, + text: undefined, + reasoning: usage.reasoningTokens, + }, + raw: { + input_tokens: usage.inputTokens, + output_tokens: usage.outputTokens, + total_tokens: usage.totalTokens, + }, + }, providerMetadata, }) }, diff --git a/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-prepare-tools.ts b/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-prepare-tools.ts index 791de3e7cf..8b2eb01673 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-prepare-tools.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/openai-responses-prepare-tools.ts @@ -1,8 +1,4 @@ -import { - type LanguageModelV2CallOptions, - type LanguageModelV2CallWarning, - UnsupportedFunctionalityError, -} from "@ai-sdk/provider" +import { type LanguageModelV3CallOptions, type SharedV3Warning, UnsupportedFunctionalityError } from "@ai-sdk/provider" import { codeInterpreterArgsSchema } from "./tool/code-interpreter" import { fileSearchArgsSchema } from "./tool/file-search" import { webSearchArgsSchema } from "./tool/web-search" @@ -15,8 +11,8 @@ export function prepareResponsesTools({ toolChoice, strictJsonSchema, }: { - tools: LanguageModelV2CallOptions["tools"] - toolChoice?: LanguageModelV2CallOptions["toolChoice"] + tools: LanguageModelV3CallOptions["tools"] + toolChoice?: LanguageModelV3CallOptions["toolChoice"] strictJsonSchema: boolean }): { tools?: Array @@ -30,12 +26,12 @@ export function prepareResponsesTools({ | { type: "function"; name: string } | { type: "code_interpreter" } | { type: "image_generation" } - toolWarnings: LanguageModelV2CallWarning[] + toolWarnings: SharedV3Warning[] } { // when the tools array is empty, change it to undefined to prevent errors: tools = tools?.length ? tools : undefined - const toolWarnings: LanguageModelV2CallWarning[] = [] + const toolWarnings: SharedV3Warning[] = [] if (tools == null) { return { tools: undefined, toolChoice: undefined, toolWarnings } @@ -54,7 +50,7 @@ export function prepareResponsesTools({ strict: strictJsonSchema, }) break - case "provider-defined": { + case "provider": { switch (tool.id) { case "openai.file_search": { const args = fileSearchArgsSchema.parse(tool.args) @@ -138,7 +134,7 @@ export function prepareResponsesTools({ break } default: - toolWarnings.push({ type: "unsupported-tool", tool }) + toolWarnings.push({ type: "unsupported", feature: "tool type" }) break } } diff --git a/packages/opencode/src/provider/sdk/copilot/responses/tool/code-interpreter.ts b/packages/opencode/src/provider/sdk/copilot/responses/tool/code-interpreter.ts index 2bb4bce778..909694ec7d 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/tool/code-interpreter.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/tool/code-interpreter.ts @@ -1,4 +1,4 @@ -import { createProviderDefinedToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" +import { createProviderToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" import { z } from "zod/v4" export const codeInterpreterInputSchema = z.object({ @@ -37,7 +37,7 @@ type CodeInterpreterArgs = { container?: string | { fileIds?: string[] } } -export const codeInterpreterToolFactory = createProviderDefinedToolFactoryWithOutputSchema< +export const codeInterpreterToolFactory = createProviderToolFactoryWithOutputSchema< { /** * The code to run, or null if not available. @@ -76,7 +76,6 @@ export const codeInterpreterToolFactory = createProviderDefinedToolFactoryWithOu CodeInterpreterArgs >({ id: "openai.code_interpreter", - name: "code_interpreter", inputSchema: codeInterpreterInputSchema, outputSchema: codeInterpreterOutputSchema, }) diff --git a/packages/opencode/src/provider/sdk/copilot/responses/tool/file-search.ts b/packages/opencode/src/provider/sdk/copilot/responses/tool/file-search.ts index 1fccddaf63..12a490e19d 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/tool/file-search.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/tool/file-search.ts @@ -1,4 +1,4 @@ -import { createProviderDefinedToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" +import { createProviderToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" import type { OpenAIResponsesFileSearchToolComparisonFilter, OpenAIResponsesFileSearchToolCompoundFilter, @@ -43,7 +43,7 @@ export const fileSearchOutputSchema = z.object({ .nullable(), }) -export const fileSearch = createProviderDefinedToolFactoryWithOutputSchema< +export const fileSearch = createProviderToolFactoryWithOutputSchema< {}, { /** @@ -122,7 +122,6 @@ export const fileSearch = createProviderDefinedToolFactoryWithOutputSchema< } >({ id: "openai.file_search", - name: "file_search", inputSchema: z.object({}), outputSchema: fileSearchOutputSchema, }) diff --git a/packages/opencode/src/provider/sdk/copilot/responses/tool/image-generation.ts b/packages/opencode/src/provider/sdk/copilot/responses/tool/image-generation.ts index 7367a4802b..b67bb76f9c 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/tool/image-generation.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/tool/image-generation.ts @@ -1,4 +1,4 @@ -import { createProviderDefinedToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" +import { createProviderToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" import { z } from "zod/v4" export const imageGenerationArgsSchema = z @@ -92,7 +92,7 @@ type ImageGenerationArgs = { size?: "auto" | "1024x1024" | "1024x1536" | "1536x1024" } -const imageGenerationToolFactory = createProviderDefinedToolFactoryWithOutputSchema< +const imageGenerationToolFactory = createProviderToolFactoryWithOutputSchema< {}, { /** @@ -103,7 +103,6 @@ const imageGenerationToolFactory = createProviderDefinedToolFactoryWithOutputSch ImageGenerationArgs >({ id: "openai.image_generation", - name: "image_generation", inputSchema: z.object({}), outputSchema: imageGenerationOutputSchema, }) diff --git a/packages/opencode/src/provider/sdk/copilot/responses/tool/local-shell.ts b/packages/opencode/src/provider/sdk/copilot/responses/tool/local-shell.ts index 4ceca0d6cd..45230d5ce5 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/tool/local-shell.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/tool/local-shell.ts @@ -1,4 +1,4 @@ -import { createProviderDefinedToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" +import { createProviderToolFactoryWithOutputSchema } from "@ai-sdk/provider-utils" import { z } from "zod/v4" export const localShellInputSchema = z.object({ @@ -16,7 +16,7 @@ export const localShellOutputSchema = z.object({ output: z.string(), }) -export const localShell = createProviderDefinedToolFactoryWithOutputSchema< +export const localShell = createProviderToolFactoryWithOutputSchema< { /** * Execute a shell command on the server. @@ -59,7 +59,6 @@ export const localShell = createProviderDefinedToolFactoryWithOutputSchema< {} >({ id: "openai.local_shell", - name: "local_shell", inputSchema: localShellInputSchema, outputSchema: localShellOutputSchema, }) diff --git a/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search-preview.ts b/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search-preview.ts index 69ea65ef0e..3d9a308d8a 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search-preview.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search-preview.ts @@ -1,4 +1,4 @@ -import { createProviderDefinedToolFactory } from "@ai-sdk/provider-utils" +import { createProviderToolFactory } from "@ai-sdk/provider-utils" import { z } from "zod/v4" // Args validation schema @@ -40,7 +40,7 @@ export const webSearchPreviewArgsSchema = z.object({ .optional(), }) -export const webSearchPreview = createProviderDefinedToolFactory< +export const webSearchPreview = createProviderToolFactory< { // Web search doesn't take input parameters - it's controlled by the prompt }, @@ -81,7 +81,6 @@ export const webSearchPreview = createProviderDefinedToolFactory< } >({ id: "openai.web_search_preview", - name: "web_search_preview", inputSchema: z.object({ action: z .discriminatedUnion("type", [ diff --git a/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search.ts b/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search.ts index 89622ad3ce..e380bb13b6 100644 --- a/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search.ts +++ b/packages/opencode/src/provider/sdk/copilot/responses/tool/web-search.ts @@ -1,4 +1,4 @@ -import { createProviderDefinedToolFactory } from "@ai-sdk/provider-utils" +import { createProviderToolFactory } from "@ai-sdk/provider-utils" import { z } from "zod/v4" export const webSearchArgsSchema = z.object({ @@ -21,7 +21,7 @@ export const webSearchArgsSchema = z.object({ .optional(), }) -export const webSearchToolFactory = createProviderDefinedToolFactory< +export const webSearchToolFactory = createProviderToolFactory< { // Web search doesn't take input parameters - it's controlled by the prompt }, @@ -74,7 +74,6 @@ export const webSearchToolFactory = createProviderDefinedToolFactory< } >({ id: "openai.web_search", - name: "web_search", inputSchema: z.object({ action: z .discriminatedUnion("type", [ diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts index 418ccc5b2e..f651a5b91a 100644 --- a/packages/opencode/src/provider/transform.ts +++ b/packages/opencode/src/provider/transform.ts @@ -25,8 +25,9 @@ export namespace ProviderTransform { switch (npm) { case "@ai-sdk/github-copilot": return "copilot" - case "@ai-sdk/openai": case "@ai-sdk/azure": + return "azure" + case "@ai-sdk/openai": return "openai" case "@ai-sdk/amazon-bedrock": return "bedrock" @@ -34,6 +35,7 @@ export namespace ProviderTransform { case "@ai-sdk/google-vertex/anthropic": return "anthropic" case "@ai-sdk/google-vertex": + return "vertex" case "@ai-sdk/google": return "google" case "@ai-sdk/gateway": @@ -72,17 +74,29 @@ export namespace ProviderTransform { } if (model.api.id.includes("claude")) { + const scrub = (id: string) => id.replace(/[^a-zA-Z0-9_-]/g, "_") return msgs.map((msg) => { - if ((msg.role === "assistant" || msg.role === "tool") && Array.isArray(msg.content)) { - msg.content = msg.content.map((part) => { - if ((part.type === "tool-call" || part.type === "tool-result") && "toolCallId" in part) { - return { - ...part, - toolCallId: part.toolCallId.replace(/[^a-zA-Z0-9_-]/g, "_"), + if (msg.role === "assistant" && Array.isArray(msg.content)) { + return { + ...msg, + content: msg.content.map((part) => { + if (part.type === "tool-call" || part.type === "tool-result") { + return { ...part, toolCallId: scrub(part.toolCallId) } } - } - return part - }) + return part + }), + } + } + if (msg.role === "tool" && Array.isArray(msg.content)) { + return { + ...msg, + content: msg.content.map((part) => { + if (part.type === "tool-result") { + return { ...part, toolCallId: scrub(part.toolCallId) } + } + return part + }), + } } return msg }) @@ -92,29 +106,33 @@ export namespace ProviderTransform { model.api.id.toLowerCase().includes("mistral") || model.api.id.toLocaleLowerCase().includes("devstral") ) { + const scrub = (id: string) => { + return id + .replace(/[^a-zA-Z0-9]/g, "") // Remove non-alphanumeric characters + .substring(0, 9) // Take first 9 characters + .padEnd(9, "0") // Pad with zeros if less than 9 characters + } const result: ModelMessage[] = [] for (let i = 0; i < msgs.length; i++) { const msg = msgs[i] const nextMsg = msgs[i + 1] - if ((msg.role === "assistant" || msg.role === "tool") && Array.isArray(msg.content)) { + if (msg.role === "assistant" && Array.isArray(msg.content)) { msg.content = msg.content.map((part) => { - if ((part.type === "tool-call" || part.type === "tool-result") && "toolCallId" in part) { - // Mistral requires alphanumeric tool call IDs with exactly 9 characters - const normalizedId = part.toolCallId - .replace(/[^a-zA-Z0-9]/g, "") // Remove non-alphanumeric characters - .substring(0, 9) // Take first 9 characters - .padEnd(9, "0") // Pad with zeros if less than 9 characters - - return { - ...part, - toolCallId: normalizedId, - } + if (part.type === "tool-call" || part.type === "tool-result") { + return { ...part, toolCallId: scrub(part.toolCallId) } + } + return part + }) + } + if (msg.role === "tool" && Array.isArray(msg.content)) { + msg.content = msg.content.map((part) => { + if (part.type === "tool-result") { + return { ...part, toolCallId: scrub(part.toolCallId) } } return part }) } - result.push(msg) // Fix message sequence: tool messages cannot be followed by user messages @@ -202,7 +220,12 @@ export namespace ProviderTransform { if (shouldUseContentOptions) { const lastContent = msg.content[msg.content.length - 1] - if (lastContent && typeof lastContent === "object") { + if ( + lastContent && + typeof lastContent === "object" && + lastContent.type !== "tool-approval-request" && + lastContent.type !== "tool-approval-response" + ) { lastContent.providerOptions = mergeDeep(lastContent.providerOptions ?? {}, providerOptions) continue } @@ -284,7 +307,12 @@ export namespace ProviderTransform { return { ...msg, providerOptions: remap(msg.providerOptions), - content: msg.content.map((part) => ({ ...part, providerOptions: remap(part.providerOptions) })), + content: msg.content.map((part) => { + if (part.type === "tool-approval-request" || part.type === "tool-approval-response") { + return { ...part } + } + return { ...part, providerOptions: remap(part.providerOptions) } + }), } as typeof msg }) } diff --git a/packages/opencode/src/session/compaction.ts b/packages/opencode/src/session/compaction.ts index f6145b7a47..d352d4f079 100644 --- a/packages/opencode/src/session/compaction.ts +++ b/packages/opencode/src/session/compaction.ts @@ -215,7 +215,7 @@ When constructing the summary, try to stick to this template: tools: {}, system: [], messages: [ - ...MessageV2.toModelMessages(msgs, model, { stripMedia: true }), + ...(await MessageV2.toModelMessages(msgs, model, { stripMedia: true })), { role: "user", content: [ diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.ts index 075f070e42..ed82ebc592 100644 --- a/packages/opencode/src/session/llm.ts +++ b/packages/opencode/src/session/llm.ts @@ -1,16 +1,6 @@ -import { Installation } from "@/installation" import { Provider } from "@/provider/provider" import { Log } from "@/util/log" -import { - streamText, - wrapLanguageModel, - type ModelMessage, - type StreamTextResult, - type Tool, - type ToolSet, - tool, - jsonSchema, -} from "ai" +import { streamText, wrapLanguageModel, type ModelMessage, type Tool, tool, jsonSchema } from "ai" import { mergeDeep, pipe } from "remeda" import { GitLabWorkflowLanguageModel } from "gitlab-ai-provider" import { ProviderTransform } from "@/provider/transform" @@ -23,6 +13,7 @@ import { SystemPrompt } from "./system" import { Flag } from "@/flag/flag" import { Permission } from "@/permission" import { Auth } from "@/auth" +import { Installation } from "@/installation" export namespace LLM { const log = Log.create({ service: "llm" }) @@ -43,8 +34,6 @@ export namespace LLM { toolChoice?: "auto" | "required" | "none" } - export type StreamOutput = StreamTextResult - export async function stream(input: StreamInput) { const l = log .clone() @@ -273,8 +262,10 @@ export namespace LLM { model: language, middleware: [ { + specificationVersion: "v3" as const, async transformParams(args) { if (args.type === "stream") { + // TODO: verify that LanguageModelV3Prompt is still compat here!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // @ts-expect-error args.params.prompt = ProviderTransform.message(args.params.prompt, input.model, options) } diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts index 37cbebc9ce..7260a8af2e 100644 --- a/packages/opencode/src/session/message-v2.ts +++ b/packages/opencode/src/session/message-v2.ts @@ -573,11 +573,11 @@ export namespace MessageV2 { })) } - export function toModelMessages( + export async function toModelMessages( input: WithParts[], model: Provider.Model, options?: { stripMedia?: boolean }, - ): ModelMessage[] { + ): Promise { const result: UIMessage[] = [] const toolNames = new Set() // Track media from tool results that need to be injected as user messages @@ -601,7 +601,8 @@ export namespace MessageV2 { return false })() - const toModelOutput = (output: unknown) => { + const toModelOutput = (options: { toolCallId: string; input: unknown; output: unknown }) => { + const output = options.output if (typeof output === "string") { return { type: "text", value: output } } @@ -799,7 +800,7 @@ export namespace MessageV2 { const tools = Object.fromEntries(Array.from(toolNames).map((toolName) => [toolName, { toModelOutput }])) - return convertToModelMessages( + return await convertToModelMessages( result.filter((msg) => msg.parts.some((part) => part.type !== "step-start")), { //@ts-expect-error (convertToModelMessages expects a ToolSet but only actually needs tools[name]?.toModelOutput) @@ -871,7 +872,13 @@ export namespace MessageV2 { db.select().from(PartTable).where(eq(PartTable.message_id, message_id)).orderBy(PartTable.id).all(), ) return rows.map( - (row) => ({ ...row.data, id: row.id, sessionID: row.session_id, messageID: row.message_id }) as MessageV2.Part, + (row) => + ({ + ...row.data, + id: row.id, + sessionID: row.session_id, + messageID: row.message_id, + }) as MessageV2.Part, ) }) diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts index b3c34539e7..dd74b83f50 100644 --- a/packages/opencode/src/session/prompt.ts +++ b/packages/opencode/src/session/prompt.ts @@ -11,7 +11,7 @@ import { Session } from "." import { Agent } from "../agent/agent" import { Provider } from "../provider/provider" import { ModelID, ProviderID } from "../provider/schema" -import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions, asSchema } from "ai" +import { type Tool as AITool, tool, jsonSchema, type ToolExecutionOptions, asSchema } from "ai" import { SessionCompaction } from "./compaction" import { Instance } from "../project/instance" import { Bus } from "../bus" @@ -321,7 +321,13 @@ export namespace SessionPrompt { if (!lastUser) throw new Error("No user message found in stream. This should never happen.") if ( lastAssistant?.finish && - !["tool-calls", "unknown"].includes(lastAssistant.finish) && + ![ + "tool-calls", + // in v6 unknown became other but other existed in v5 too and was distinctly different + // I think there are certain providers that used to have bad stop reasons, not rlly sure which + // ones if any still have this? + // "unknown", + ].includes(lastAssistant.finish) && lastUser.id < lastAssistant.id ) { log.info("exiting loop", { sessionID }) @@ -692,7 +698,7 @@ export namespace SessionPrompt { sessionID, system, messages: [ - ...MessageV2.toModelMessages(msgs, model), + ...(await MessageV2.toModelMessages(msgs, model)), ...(isLastStep ? [ { @@ -775,7 +781,7 @@ export namespace SessionPrompt { using _ = log.time("resolveTools") const tools: Record = {} - const context = (args: any, options: ToolCallOptions): Tool.Context => ({ + const context = (args: any, options: ToolExecutionOptions): Tool.Context => ({ sessionID: input.session.id, abort: options.abortSignal!, messageID: input.processor.message.id, @@ -861,7 +867,8 @@ export namespace SessionPrompt { const execute = item.execute if (!execute) continue - const transformed = ProviderTransform.schema(input.model, asSchema(item.inputSchema).jsonSchema) + const schema = await asSchema(item.inputSchema).jsonSchema + const transformed = ProviderTransform.schema(input.model, schema) item.inputSchema = jsonSchema(transformed) // Wrap execute to add plugin hooks and format output item.execute = async (args, opts) => { @@ -974,10 +981,10 @@ export namespace SessionPrompt { metadata: { valid: true }, } }, - toModelOutput(result) { + toModelOutput({ output }) { return { type: "text", - value: result.output, + value: output.output, } }, }) @@ -2010,28 +2017,28 @@ NOTE: At any point in time through this workflow you should feel free to ask the (await Provider.getSmallModel(input.providerID)) ?? (await Provider.getModel(input.providerID, input.modelID)) ) }) - const result = await LLM.stream({ - agent, - user: firstRealUser.info as MessageV2.User, - system: [], - small: true, - tools: {}, - model, - abort: new AbortController().signal, - sessionID: input.session.id, - retries: 2, - messages: [ - { - role: "user", - content: "Generate a title for this conversation:\n", - }, - ...(hasOnlySubtaskParts - ? [{ role: "user" as const, content: subtaskParts.map((p) => p.prompt).join("\n") }] - : MessageV2.toModelMessages(contextMessages, model)), - ], - }) - const text = await result.text.catch((err) => log.error("failed to generate title", { error: err })) - if (text) { + try { + const result = await LLM.stream({ + agent, + user: firstRealUser.info as MessageV2.User, + system: [], + small: true, + tools: {}, + model, + abort: new AbortController().signal, + sessionID: input.session.id, + retries: 2, + messages: [ + { + role: "user", + content: "Generate a title for this conversation:\n", + }, + ...(hasOnlySubtaskParts + ? [{ role: "user" as const, content: subtaskParts.map((p) => p.prompt).join("\n") }] + : await MessageV2.toModelMessages(contextMessages, model)), + ], + }) + const text = await result.text const cleaned = text .replace(/[\s\S]*?<\/think>\s*/g, "") .split("\n") @@ -2044,6 +2051,8 @@ NOTE: At any point in time through this workflow you should feel free to ask the if (NotFoundError.isInstance(err)) return throw err }) + } catch (error) { + log.error("failed to generate title", { error }) } } } diff --git a/packages/opencode/test/provider/copilot/copilot-chat-model.test.ts b/packages/opencode/test/provider/copilot/copilot-chat-model.test.ts index 562da4507d..389a72bb37 100644 --- a/packages/opencode/test/provider/copilot/copilot-chat-model.test.ts +++ b/packages/opencode/test/provider/copilot/copilot-chat-model.test.ts @@ -1,6 +1,6 @@ import { OpenAICompatibleChatLanguageModel } from "@/provider/sdk/copilot/chat/openai-compatible-chat-language-model" import { describe, test, expect, mock } from "bun:test" -import type { LanguageModelV2Prompt } from "@ai-sdk/provider" +import type { LanguageModelV3Prompt } from "@ai-sdk/provider" async function convertReadableStreamToArray(stream: ReadableStream): Promise { const reader = stream.getReader() @@ -13,7 +13,7 @@ async function convertReadableStreamToArray(stream: ReadableStream): Promi return result } -const TEST_PROMPT: LanguageModelV2Prompt = [{ role: "user", content: [{ type: "text", text: "Hello" }] }] +const TEST_PROMPT: LanguageModelV3Prompt = [{ role: "user", content: [{ type: "text", text: "Hello" }] }] // Fixtures from copilot_test.exs const FIXTURES = { @@ -123,7 +123,7 @@ describe("doStream", () => { { type: "text-delta", id: "txt-0", delta: " world" }, { type: "text-delta", id: "txt-0", delta: "!" }, { type: "text-end", id: "txt-0" }, - { type: "finish", finishReason: "stop" }, + { type: "finish", finishReason: { unified: "stop" } }, ]) }) @@ -201,10 +201,10 @@ describe("doStream", () => { const finish = parts.find((p) => p.type === "finish") expect(finish).toMatchObject({ type: "finish", - finishReason: "tool-calls", + finishReason: { unified: "tool-calls" }, usage: { - inputTokens: 19581, - outputTokens: 53, + inputTokens: { total: 19581 }, + outputTokens: { total: 53 }, }, }) }) @@ -256,10 +256,10 @@ describe("doStream", () => { const finish = parts.find((p) => p.type === "finish") expect(finish).toMatchObject({ type: "finish", - finishReason: "stop", + finishReason: { unified: "stop" }, usage: { - inputTokens: 5778, - outputTokens: 59, + inputTokens: { total: 5778 }, + outputTokens: { total: 59 }, }, providerMetadata: { copilot: { @@ -315,7 +315,7 @@ describe("doStream", () => { const finish = parts.find((p) => p.type === "finish") expect(finish).toMatchObject({ type: "finish", - finishReason: "stop", + finishReason: { unified: "stop" }, }) }) @@ -388,10 +388,10 @@ describe("doStream", () => { const finish = parts.find((p) => p.type === "finish") expect(finish).toMatchObject({ type: "finish", - finishReason: "tool-calls", + finishReason: { unified: "tool-calls" }, usage: { - inputTokens: 3767, - outputTokens: 19, + inputTokens: { total: 3767 }, + outputTokens: { total: 19 }, }, }) }) @@ -449,7 +449,7 @@ describe("doStream", () => { const finish = parts.find((p) => p.type === "finish") expect(finish).toMatchObject({ type: "finish", - finishReason: "tool-calls", + finishReason: { unified: "tool-calls" }, }) }) diff --git a/packages/opencode/test/provider/gitlab-duo.test.ts b/packages/opencode/test/provider/gitlab-duo.test.ts index 15c797022d..b669a1e21a 100644 --- a/packages/opencode/test/provider/gitlab-duo.test.ts +++ b/packages/opencode/test/provider/gitlab-duo.test.ts @@ -1,408 +1,412 @@ -import { test, expect, describe } from "bun:test" -import path from "path" +// TODO: UNCOMMENT WHEN GITLAB SUPPORT IS COMPLETED +// +// +// +// import { test, expect, describe } from "bun:test" +// import path from "path" -import { ProviderID, ModelID } from "../../src/provider/schema" -import { tmpdir } from "../fixture/fixture" -import { Instance } from "../../src/project/instance" -import { Provider } from "../../src/provider/provider" -import { Env } from "../../src/env" -import { Global } from "../../src/global" -import { GitLabWorkflowLanguageModel } from "gitlab-ai-provider" +// import { ProviderID, ModelID } from "../../src/provider/schema" +// import { tmpdir } from "../fixture/fixture" +// import { Instance } from "../../src/project/instance" +// import { Provider } from "../../src/provider/provider" +// import { Env } from "../../src/env" +// import { Global } from "../../src/global" +// import { GitLabWorkflowLanguageModel } from "gitlab-ai-provider" -test("GitLab Duo: loads provider with API key from environment", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-gitlab-token") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - expect(providers[ProviderID.gitlab].key).toBe("test-gitlab-token") - }, - }) -}) +// test("GitLab Duo: loads provider with API key from environment", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-gitlab-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// expect(providers[ProviderID.gitlab].key).toBe("test-gitlab-token") +// }, +// }) +// }) -test("GitLab Duo: config instanceUrl option sets baseURL", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - provider: { - gitlab: { - options: { - instanceUrl: "https://gitlab.example.com", - }, - }, - }, - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - Env.set("GITLAB_INSTANCE_URL", "https://gitlab.example.com") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - expect(providers[ProviderID.gitlab].options?.instanceUrl).toBe("https://gitlab.example.com") - }, - }) -}) +// test("GitLab Duo: config instanceUrl option sets baseURL", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// provider: { +// gitlab: { +// options: { +// instanceUrl: "https://gitlab.example.com", +// }, +// }, +// }, +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// Env.set("GITLAB_INSTANCE_URL", "https://gitlab.example.com") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// expect(providers[ProviderID.gitlab].options?.instanceUrl).toBe("https://gitlab.example.com") +// }, +// }) +// }) -test("GitLab Duo: loads with OAuth token from auth.json", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - }), - ) - }, - }) +// test("GitLab Duo: loads with OAuth token from auth.json", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// }), +// ) +// }, +// }) - const authPath = path.join(Global.Path.data, "auth.json") - await Bun.write( - authPath, - JSON.stringify({ - gitlab: { - type: "oauth", - access: "test-access-token", - refresh: "test-refresh-token", - expires: Date.now() + 3600000, - }, - }), - ) +// const authPath = path.join(Global.Path.data, "auth.json") +// await Bun.write( +// authPath, +// JSON.stringify({ +// gitlab: { +// type: "oauth", +// access: "test-access-token", +// refresh: "test-refresh-token", +// expires: Date.now() + 3600000, +// }, +// }), +// ) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - }, - }) -}) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// }, +// }) +// }) -test("GitLab Duo: loads with Personal Access Token from auth.json", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - }), - ) - }, - }) +// test("GitLab Duo: loads with Personal Access Token from auth.json", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// }), +// ) +// }, +// }) - const authPath2 = path.join(Global.Path.data, "auth.json") - await Bun.write( - authPath2, - JSON.stringify({ - gitlab: { - type: "api", - key: "glpat-test-pat-token", - }, - }), - ) +// const authPath2 = path.join(Global.Path.data, "auth.json") +// await Bun.write( +// authPath2, +// JSON.stringify({ +// gitlab: { +// type: "api", +// key: "glpat-test-pat-token", +// }, +// }), +// ) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - expect(providers[ProviderID.gitlab].key).toBe("glpat-test-pat-token") - }, - }) -}) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// expect(providers[ProviderID.gitlab].key).toBe("glpat-test-pat-token") +// }, +// }) +// }) -test("GitLab Duo: supports self-hosted instance configuration", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - provider: { - gitlab: { - options: { - instanceUrl: "https://gitlab.company.internal", - apiKey: "glpat-internal-token", - }, - }, - }, - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_INSTANCE_URL", "https://gitlab.company.internal") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - expect(providers[ProviderID.gitlab].options?.instanceUrl).toBe("https://gitlab.company.internal") - }, - }) -}) +// test("GitLab Duo: supports self-hosted instance configuration", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// provider: { +// gitlab: { +// options: { +// instanceUrl: "https://gitlab.company.internal", +// apiKey: "glpat-internal-token", +// }, +// }, +// }, +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_INSTANCE_URL", "https://gitlab.company.internal") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// expect(providers[ProviderID.gitlab].options?.instanceUrl).toBe("https://gitlab.company.internal") +// }, +// }) +// }) -test("GitLab Duo: config apiKey takes precedence over environment variable", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - provider: { - gitlab: { - options: { - apiKey: "config-token", - }, - }, - }, - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "env-token") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - }, - }) -}) +// test("GitLab Duo: config apiKey takes precedence over environment variable", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// provider: { +// gitlab: { +// options: { +// apiKey: "config-token", +// }, +// }, +// }, +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "env-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// }, +// }) +// }) -test("GitLab Duo: includes context-1m beta header in aiGatewayHeaders", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - expect(providers[ProviderID.gitlab].options?.aiGatewayHeaders?.["anthropic-beta"]).toContain( - "context-1m-2025-08-07", - ) - }, - }) -}) +// test("GitLab Duo: includes context-1m beta header in aiGatewayHeaders", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// expect(providers[ProviderID.gitlab].options?.aiGatewayHeaders?.["anthropic-beta"]).toContain( +// "context-1m-2025-08-07", +// ) +// }, +// }) +// }) -test("GitLab Duo: supports feature flags configuration", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - provider: { - gitlab: { - options: { - featureFlags: { - duo_agent_platform_agentic_chat: true, - duo_agent_platform: true, - }, - }, - }, - }, - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - expect(providers[ProviderID.gitlab].options?.featureFlags).toBeDefined() - expect(providers[ProviderID.gitlab].options?.featureFlags?.duo_agent_platform_agentic_chat).toBe(true) - }, - }) -}) +// test("GitLab Duo: supports feature flags configuration", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// provider: { +// gitlab: { +// options: { +// featureFlags: { +// duo_agent_platform_agentic_chat: true, +// duo_agent_platform: true, +// }, +// }, +// }, +// }, +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// expect(providers[ProviderID.gitlab].options?.featureFlags).toBeDefined() +// expect(providers[ProviderID.gitlab].options?.featureFlags?.duo_agent_platform_agentic_chat).toBe(true) +// }, +// }) +// }) -test("GitLab Duo: has multiple agentic chat models available", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write( - path.join(dir, "opencode.json"), - JSON.stringify({ - $schema: "https://opencode.ai/config.json", - }), - ) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - const models = Object.keys(providers[ProviderID.gitlab].models) - expect(models.length).toBeGreaterThan(0) - expect(models).toContain("duo-chat-haiku-4-5") - expect(models).toContain("duo-chat-sonnet-4-5") - expect(models).toContain("duo-chat-opus-4-5") - }, - }) -}) +// test("GitLab Duo: has multiple agentic chat models available", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write( +// path.join(dir, "opencode.json"), +// JSON.stringify({ +// $schema: "https://opencode.ai/config.json", +// }), +// ) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// const models = Object.keys(providers[ProviderID.gitlab].models) +// expect(models.length).toBeGreaterThan(0) +// expect(models).toContain("duo-chat-haiku-4-5") +// expect(models).toContain("duo-chat-sonnet-4-5") +// expect(models).toContain("duo-chat-opus-4-5") +// }, +// }) +// }) -describe("GitLab Duo: workflow model routing", () => { - test("duo-workflow-* model routes through workflowChat", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - const gitlab = providers[ProviderID.gitlab] - expect(gitlab).toBeDefined() - gitlab.models["duo-workflow-sonnet-4-6"] = { - id: ModelID.make("duo-workflow-sonnet-4-6"), - providerID: ProviderID.make("gitlab"), - name: "Agent Platform (Claude Sonnet 4.6)", - family: "", - api: { id: "duo-workflow-sonnet-4-6", url: "https://gitlab.com", npm: "gitlab-ai-provider" }, - status: "active", - headers: {}, - options: { workflowRef: "claude_sonnet_4_6" }, - cost: { input: 0, output: 0, cache: { read: 0, write: 0 } }, - limit: { context: 200000, output: 64000 }, - capabilities: { - temperature: false, - reasoning: true, - attachment: true, - toolcall: true, - input: { text: true, audio: false, image: true, video: false, pdf: true }, - output: { text: true, audio: false, image: false, video: false, pdf: false }, - interleaved: false, - }, - release_date: "", - variants: {}, - } - const model = await Provider.getModel(ProviderID.gitlab, ModelID.make("duo-workflow-sonnet-4-6")) - expect(model).toBeDefined() - expect(model.options?.workflowRef).toBe("claude_sonnet_4_6") - const language = await Provider.getLanguage(model) - expect(language).toBeDefined() - expect(language).toBeInstanceOf(GitLabWorkflowLanguageModel) - }, - }) - }) +// describe("GitLab Duo: workflow model routing", () => { +// test("duo-workflow-* model routes through workflowChat", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// const gitlab = providers[ProviderID.gitlab] +// expect(gitlab).toBeDefined() +// gitlab.models["duo-workflow-sonnet-4-6"] = { +// id: ModelID.make("duo-workflow-sonnet-4-6"), +// providerID: ProviderID.make("gitlab"), +// name: "Agent Platform (Claude Sonnet 4.6)", +// family: "", +// api: { id: "duo-workflow-sonnet-4-6", url: "https://gitlab.com", npm: "gitlab-ai-provider" }, +// status: "active", +// headers: {}, +// options: { workflowRef: "claude_sonnet_4_6" }, +// cost: { input: 0, output: 0, cache: { read: 0, write: 0 } }, +// limit: { context: 200000, output: 64000 }, +// capabilities: { +// temperature: false, +// reasoning: true, +// attachment: true, +// toolcall: true, +// input: { text: true, audio: false, image: true, video: false, pdf: true }, +// output: { text: true, audio: false, image: false, video: false, pdf: false }, +// interleaved: false, +// }, +// release_date: "", +// variants: {}, +// } +// const model = await Provider.getModel(ProviderID.gitlab, ModelID.make("duo-workflow-sonnet-4-6")) +// expect(model).toBeDefined() +// expect(model.options?.workflowRef).toBe("claude_sonnet_4_6") +// const language = await Provider.getLanguage(model) +// expect(language).toBeDefined() +// expect(language).toBeInstanceOf(GitLabWorkflowLanguageModel) +// }, +// }) +// }) - test("duo-chat-* model routes through agenticChat (not workflow)", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - expect(providers[ProviderID.gitlab]).toBeDefined() - const model = await Provider.getModel(ProviderID.gitlab, ModelID.make("duo-chat-sonnet-4-5")) - expect(model).toBeDefined() - const language = await Provider.getLanguage(model) - expect(language).toBeDefined() - expect(language).not.toBeInstanceOf(GitLabWorkflowLanguageModel) - }, - }) - }) +// test("duo-chat-* model routes through agenticChat (not workflow)", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// expect(providers[ProviderID.gitlab]).toBeDefined() +// const model = await Provider.getModel(ProviderID.gitlab, ModelID.make("duo-chat-sonnet-4-5")) +// expect(model).toBeDefined() +// const language = await Provider.getLanguage(model) +// expect(language).toBeDefined() +// expect(language).not.toBeInstanceOf(GitLabWorkflowLanguageModel) +// }, +// }) +// }) - test("model.options merged with provider.options in getLanguage", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - const gitlab = providers[ProviderID.gitlab] - expect(gitlab.options?.featureFlags).toBeDefined() - const model = await Provider.getModel(ProviderID.gitlab, ModelID.make("duo-chat-sonnet-4-5")) - expect(model).toBeDefined() - expect(model.options).toBeDefined() - }, - }) - }) -}) +// test("model.options merged with provider.options in getLanguage", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// const gitlab = providers[ProviderID.gitlab] +// expect(gitlab.options?.featureFlags).toBeDefined() +// const model = await Provider.getModel(ProviderID.gitlab, ModelID.make("duo-chat-sonnet-4-5")) +// expect(model).toBeDefined() +// expect(model.options).toBeDefined() +// }, +// }) +// }) +// }) -describe("GitLab Duo: static models", () => { - test("static duo-chat models always present regardless of discovery", async () => { - await using tmp = await tmpdir({ - init: async (dir) => { - await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) - }, - }) - await Instance.provide({ - directory: tmp.path, - init: async () => { - Env.set("GITLAB_TOKEN", "test-token") - }, - fn: async () => { - const providers = await Provider.list() - const models = Object.keys(providers[ProviderID.gitlab].models) - expect(models).toContain("duo-chat-haiku-4-5") - expect(models).toContain("duo-chat-sonnet-4-5") - expect(models).toContain("duo-chat-opus-4-5") - }, - }) - }) -}) +// describe("GitLab Duo: static models", () => { +// test("static duo-chat models always present regardless of discovery", async () => { +// await using tmp = await tmpdir({ +// init: async (dir) => { +// await Bun.write(path.join(dir, "opencode.json"), JSON.stringify({ $schema: "https://opencode.ai/config.json" })) +// }, +// }) +// await Instance.provide({ +// directory: tmp.path, +// init: async () => { +// Env.set("GITLAB_TOKEN", "test-token") +// }, +// fn: async () => { +// const providers = await Provider.list() +// const models = Object.keys(providers[ProviderID.gitlab].models) +// expect(models).toContain("duo-chat-haiku-4-5") +// expect(models).toContain("duo-chat-sonnet-4-5") +// expect(models).toContain("duo-chat-opus-4-5") +// }, +// }) +// }) +// }) diff --git a/packages/opencode/test/session/llm.test.ts b/packages/opencode/test/session/llm.test.ts index 5202c06dd9..8de7d2723a 100644 --- a/packages/opencode/test/session/llm.test.ts +++ b/packages/opencode/test/session/llm.test.ts @@ -3,7 +3,6 @@ import path from "path" import { tool, type ModelMessage } from "ai" import z from "zod" import { LLM } from "../../src/session/llm" -import { Global } from "../../src/global" import { Instance } from "../../src/project/instance" import { Provider } from "../../src/provider/provider" import { ProviderTransform } from "../../src/provider/transform" @@ -535,6 +534,130 @@ describe("session.llm.stream", () => { }) }) + test("accepts user image attachments as data URLs for OpenAI models", async () => { + const server = state.server + if (!server) { + throw new Error("Server not initialized") + } + + const source = await loadFixture("openai", "gpt-5.2") + const model = source.model + const chunks = [ + { + type: "response.created", + response: { + id: "resp-data-url", + created_at: Math.floor(Date.now() / 1000), + model: model.id, + service_tier: null, + }, + }, + { + type: "response.output_text.delta", + item_id: "item-data-url", + delta: "Looks good", + logprobs: null, + }, + { + type: "response.completed", + response: { + incomplete_details: null, + usage: { + input_tokens: 1, + input_tokens_details: null, + output_tokens: 1, + output_tokens_details: null, + }, + service_tier: null, + }, + }, + ] + const request = waitRequest("/responses", createEventResponse(chunks, true)) + const image = `data:image/png;base64,${Buffer.from( + await Bun.file(path.join(import.meta.dir, "../tool/fixtures/large-image.png")).arrayBuffer(), + ).toString("base64")}` + + await using tmp = await tmpdir({ + init: async (dir) => { + await Bun.write( + path.join(dir, "opencode.json"), + JSON.stringify({ + $schema: "https://opencode.ai/config.json", + enabled_providers: ["openai"], + provider: { + openai: { + name: "OpenAI", + env: ["OPENAI_API_KEY"], + npm: "@ai-sdk/openai", + api: "https://api.openai.com/v1", + models: { + [model.id]: model, + }, + options: { + apiKey: "test-openai-key", + baseURL: `${server.url.origin}/v1`, + }, + }, + }, + }), + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const resolved = await Provider.getModel(ProviderID.openai, ModelID.make(model.id)) + const sessionID = SessionID.make("session-test-data-url") + const agent = { + name: "test", + mode: "primary", + options: {}, + permission: [{ permission: "*", pattern: "*", action: "allow" }], + } satisfies Agent.Info + + const user = { + id: MessageID.make("user-data-url"), + sessionID, + role: "user", + time: { created: Date.now() }, + agent: agent.name, + model: { providerID: ProviderID.make("openai"), modelID: resolved.id }, + } satisfies MessageV2.User + + const stream = await LLM.stream({ + user, + sessionID, + model: resolved, + agent, + system: ["You are a helpful assistant."], + abort: new AbortController().signal, + messages: [ + { + role: "user", + content: [ + { type: "text", text: "Describe this image" }, + { + type: "file", + mediaType: "image/png", + filename: "large-image.png", + data: image, + }, + ], + }, + ] as ModelMessage[], + tools: {}, + }) + + for await (const _ of stream.fullStream) { + } + + const capture = await request + expect(capture.url.pathname.endsWith("/responses")).toBe(true) + }, + }) + }) + test("sends messages API payload for Anthropic models", async () => { const server = state.server if (!server) { @@ -625,7 +748,7 @@ describe("session.llm.stream", () => { role: "user", time: { created: Date.now() }, agent: agent.name, - model: { providerID: ProviderID.make(providerID), modelID: resolved.id }, + model: { providerID: ProviderID.make("minimax"), modelID: ModelID.make("MiniMax-M2.7") }, } satisfies MessageV2.User const stream = await LLM.stream({ diff --git a/packages/opencode/test/session/message-v2.test.ts b/packages/opencode/test/session/message-v2.test.ts index 7d416597a8..3634d6fb7e 100644 --- a/packages/opencode/test/session/message-v2.test.ts +++ b/packages/opencode/test/session/message-v2.test.ts @@ -108,7 +108,7 @@ function basePart(messageID: string, id: string) { } describe("session.message-v2.toModelMessage", () => { - test("filters out messages with no parts", () => { + test("filters out messages with no parts", async () => { const input: MessageV2.WithParts[] = [ { info: userInfo("m-empty"), @@ -126,7 +126,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [{ type: "text", text: "hello" }], @@ -134,7 +134,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("filters out messages with only ignored parts", () => { + test("filters out messages with only ignored parts", async () => { const messageID = "m-user" const input: MessageV2.WithParts[] = [ @@ -151,10 +151,10 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([]) + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([]) }) - test("includes synthetic text parts", () => { + test("includes synthetic text parts", async () => { const messageID = "m-user" const input: MessageV2.WithParts[] = [ @@ -182,7 +182,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [{ type: "text", text: "hello" }], @@ -194,7 +194,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("converts user text/file parts and injects compaction/subtask prompts", () => { + test("converts user text/file parts and injects compaction/subtask prompts", async () => { const messageID = "m-user" const input: MessageV2.WithParts[] = [ @@ -249,7 +249,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [ @@ -267,7 +267,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("converts assistant tool completion into tool-call + tool-result messages with attachments", () => { + test("converts assistant tool completion into tool-call + tool-result messages with attachments", async () => { const userID = "m-user" const assistantID = "m-assistant" @@ -319,7 +319,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [{ type: "text", text: "run tool" }], @@ -359,7 +359,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("omits provider metadata when assistant model differs", () => { + test("omits provider metadata when assistant model differs", async () => { const userID = "m-user" const assistantID = "m-assistant" @@ -402,7 +402,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [{ type: "text", text: "run tool" }], @@ -434,7 +434,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("replaces compacted tool output with placeholder", () => { + test("replaces compacted tool output with placeholder", async () => { const userID = "m-user" const assistantID = "m-assistant" @@ -470,7 +470,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [{ type: "text", text: "run tool" }], @@ -501,7 +501,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("converts assistant tool error into error-text tool result", () => { + test("converts assistant tool error into error-text tool result", async () => { const userID = "m-user" const assistantID = "m-assistant" @@ -537,7 +537,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "user", content: [{ type: "text", text: "run tool" }], @@ -570,7 +570,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("filters assistant messages with non-abort errors", () => { + test("filters assistant messages with non-abort errors", async () => { const assistantID = "m-assistant" const input: MessageV2.WithParts[] = [ @@ -590,10 +590,10 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([]) + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([]) }) - test("includes aborted assistant messages only when they have non-step-start/reasoning content", () => { + test("includes aborted assistant messages only when they have non-step-start/reasoning content", async () => { const assistantID1 = "m-assistant-1" const assistantID2 = "m-assistant-2" @@ -633,7 +633,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "assistant", content: [ @@ -644,7 +644,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("splits assistant messages on step-start boundaries", () => { + test("splits assistant messages on step-start boundaries", async () => { const assistantID = "m-assistant" const input: MessageV2.WithParts[] = [ @@ -669,7 +669,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([ + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([ { role: "assistant", content: [{ type: "text", text: "first" }], @@ -681,7 +681,7 @@ describe("session.message-v2.toModelMessage", () => { ]) }) - test("drops messages that only contain step-start parts", () => { + test("drops messages that only contain step-start parts", async () => { const assistantID = "m-assistant" const input: MessageV2.WithParts[] = [ @@ -696,10 +696,10 @@ describe("session.message-v2.toModelMessage", () => { }, ] - expect(MessageV2.toModelMessages(input, model)).toStrictEqual([]) + expect(await MessageV2.toModelMessages(input, model)).toStrictEqual([]) }) - test("converts pending/running tool calls to error results to prevent dangling tool_use", () => { + test("converts pending/running tool calls to error results to prevent dangling tool_use", async () => { const userID = "m-user" const assistantID = "m-assistant" @@ -743,7 +743,7 @@ describe("session.message-v2.toModelMessage", () => { }, ] - const result = MessageV2.toModelMessages(input, model) + const result = await MessageV2.toModelMessages(input, model) expect(result).toStrictEqual([ { diff --git a/packages/opencode/test/session/structured-output.test.ts b/packages/opencode/test/session/structured-output.test.ts index f6131b149b..db3f8cfded 100644 --- a/packages/opencode/test/session/structured-output.test.ts +++ b/packages/opencode/test/session/structured-output.test.ts @@ -363,20 +363,25 @@ describe("structured-output.createStructuredOutputTool", () => { expect(inputSchema.jsonSchema?.properties?.tags?.items?.type).toBe("string") }) - test("toModelOutput returns text value", () => { + test("toModelOutput returns text value", async () => { const tool = SessionPrompt.createStructuredOutputTool({ schema: { type: "object" }, onSuccess: () => {}, }) expect(tool.toModelOutput).toBeDefined() - const modelOutput = tool.toModelOutput!({ - output: "Test output", - title: "Test", - metadata: { valid: true }, - }) + const modelOutput = await Promise.resolve( + tool.toModelOutput!({ + toolCallId: "test-call-id", + input: {}, + output: { + output: "Test output", + }, + }), + ) expect(modelOutput.type).toBe("text") + if (modelOutput.type !== "text") throw new Error("expected text model output") expect(modelOutput.value).toBe("Test output") }) diff --git a/patches/@ai-sdk%2Fanthropic@3.0.64.patch b/patches/@ai-sdk%2Fanthropic@3.0.64.patch new file mode 100644 index 0000000000..b8c2f387d7 --- /dev/null +++ b/patches/@ai-sdk%2Fanthropic@3.0.64.patch @@ -0,0 +1,119 @@ +--- a/dist/index.js ++++ b/dist/index.js +@@ -3155,15 +3155,6 @@ + }); + } + baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0); +- } else { +- if (topP != null && temperature != null) { +- warnings.push({ +- type: "unsupported", +- feature: "topP", +- details: `topP is not supported when temperature is set. topP is ignored.` +- }); +- baseArgs.top_p = void 0; +- } + } + if (isKnownModel && baseArgs.max_tokens > maxOutputTokensForModel) { + if (maxOutputTokens != null) { +@@ -5180,4 +5171,4 @@ + createAnthropic, + forwardAnthropicContainerIdFromLastStep + }); +-//# sourceMappingURL=index.js.map +\ No newline at end of file ++//# sourceMappingURL=index.js.map +--- a/dist/index.mjs ++++ b/dist/index.mjs +@@ -3192,15 +3192,6 @@ + }); + } + baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0); +- } else { +- if (topP != null && temperature != null) { +- warnings.push({ +- type: "unsupported", +- feature: "topP", +- details: `topP is not supported when temperature is set. topP is ignored.` +- }); +- baseArgs.top_p = void 0; +- } + } + if (isKnownModel && baseArgs.max_tokens > maxOutputTokensForModel) { + if (maxOutputTokens != null) { +@@ -5256,4 +5247,4 @@ + createAnthropic, + forwardAnthropicContainerIdFromLastStep + }; +-//# sourceMappingURL=index.mjs.map +\ No newline at end of file ++//# sourceMappingURL=index.mjs.map +--- a/dist/internal/index.js ++++ b/dist/internal/index.js +@@ -3147,15 +3147,6 @@ + }); + } + baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0); +- } else { +- if (topP != null && temperature != null) { +- warnings.push({ +- type: "unsupported", +- feature: "topP", +- details: `topP is not supported when temperature is set. topP is ignored.` +- }); +- baseArgs.top_p = void 0; +- } + } + if (isKnownModel && baseArgs.max_tokens > maxOutputTokensForModel) { + if (maxOutputTokens != null) { +@@ -5080,4 +5071,4 @@ + anthropicTools, + prepareTools + }); +-//# sourceMappingURL=index.js.map +\ No newline at end of file ++//# sourceMappingURL=index.js.map +--- a/dist/internal/index.mjs ++++ b/dist/internal/index.mjs +@@ -3176,15 +3176,6 @@ + }); + } + baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0); +- } else { +- if (topP != null && temperature != null) { +- warnings.push({ +- type: "unsupported", +- feature: "topP", +- details: `topP is not supported when temperature is set. topP is ignored.` +- }); +- baseArgs.top_p = void 0; +- } + } + if (isKnownModel && baseArgs.max_tokens > maxOutputTokensForModel) { + if (maxOutputTokens != null) { +@@ -5148,4 +5139,4 @@ + anthropicTools, + prepareTools + }; +-//# sourceMappingURL=index.mjs.map +\ No newline at end of file ++//# sourceMappingURL=index.mjs.map +--- a/src/anthropic-messages-language-model.ts ++++ b/src/anthropic-messages-language-model.ts +@@ -534,16 +534,6 @@ + + // adjust max tokens to account for thinking: + baseArgs.max_tokens = maxTokens + (thinkingBudget ?? 0); +- } else { +- // Only check temperature/topP mutual exclusivity when thinking is not enabled +- if (topP != null && temperature != null) { +- warnings.push({ +- type: 'unsupported', +- feature: 'topP', +- details: `topP is not supported when temperature is set. topP is ignored.`, +- }); +- baseArgs.top_p = undefined; +- } + } + + // limit to max output tokens for known models to enable model switching without breaking it: diff --git a/patches/@ai-sdk%2Fprovider-utils@4.0.21.patch b/patches/@ai-sdk%2Fprovider-utils@4.0.21.patch new file mode 100644 index 0000000000..b93092c466 --- /dev/null +++ b/patches/@ai-sdk%2Fprovider-utils@4.0.21.patch @@ -0,0 +1,61 @@ +diff --git a/dist/index.js b/dist/index.js +index 9aa8e83684777e860d905ff7a6895995a7347a4f..820797581ac2a33e731e139da3ebc98b4d93fdcf 100644 +--- a/dist/index.js ++++ b/dist/index.js +@@ -395,10 +395,13 @@ function validateDownloadUrl(url) { + message: `Invalid URL: ${url}` + }); + } ++ if (parsed.protocol === "data:") { ++ return; ++ } + if (parsed.protocol !== "http:" && parsed.protocol !== "https:") { + throw new DownloadError({ + url, +- message: `URL scheme must be http or https, got ${parsed.protocol}` ++ message: `URL scheme must be http, https, or data, got ${parsed.protocol}` + }); + } + const hostname = parsed.hostname; +diff --git a/dist/index.mjs b/dist/index.mjs +index 095fdc188b1d7f227b42591c78ecb71fe2e2cf8b..ca5227d3b6e358aea8ecd85782a0a2b48130a2c9 100644 +--- a/dist/index.mjs ++++ b/dist/index.mjs +@@ -299,10 +299,13 @@ function validateDownloadUrl(url) { + message: `Invalid URL: ${url}` + }); + } ++ if (parsed.protocol === "data:") { ++ return; ++ } + if (parsed.protocol !== "http:" && parsed.protocol !== "https:") { + throw new DownloadError({ + url, +- message: `URL scheme must be http or https, got ${parsed.protocol}` ++ message: `URL scheme must be http, https, or data, got ${parsed.protocol}` + }); + } + const hostname = parsed.hostname; +diff --git a/src/validate-download-url.ts b/src/validate-download-url.ts +index 7c026ad6b400aef551ce3a424c343e1cedc60997..6a2f11398e58f80a8e11995ac1ce5f4d7c110561 100644 +--- a/src/validate-download-url.ts ++++ b/src/validate-download-url.ts +@@ -18,11 +18,16 @@ export function validateDownloadUrl(url: string): void { + }); + } + +- // Only allow http and https protocols ++ // data: URLs are inline content and do not make network requests. ++ if (parsed.protocol === 'data:') { ++ return; ++ } ++ ++ // Only allow http and https network protocols + if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') { + throw new DownloadError({ + url, +- message: `URL scheme must be http or https, got ${parsed.protocol}`, ++ message: `URL scheme must be http, https, or data, got ${parsed.protocol}`, + }); + } + diff --git a/patches/@ai-sdk%2Fxai@2.0.51.patch b/patches/@ai-sdk%2Fxai@2.0.51.patch deleted file mode 100644 index 8776cab483..0000000000 --- a/patches/@ai-sdk%2Fxai@2.0.51.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/dist/index.mjs b/dist/index.mjs ---- a/dist/index.mjs -+++ b/dist/index.mjs -@@ -959,7 +959,7 @@ - model: z4.string().nullish(), - object: z4.literal("response"), - output: z4.array(outputItemSchema), -- usage: xaiResponsesUsageSchema, -+ usage: xaiResponsesUsageSchema.nullish(), - status: z4.string() - }); - var xaiResponsesChunkSchema = z4.union([ -\ No newline at end of file -@@ -1143,6 +1143,18 @@ - z4.object({ - type: z4.literal("response.completed"), - response: xaiResponsesResponseSchema -+ }), -+ z4.object({ -+ type: z4.literal("response.function_call_arguments.delta"), -+ item_id: z4.string(), -+ output_index: z4.number(), -+ delta: z4.string() -+ }), -+ z4.object({ -+ type: z4.literal("response.function_call_arguments.done"), -+ item_id: z4.string(), -+ output_index: z4.number(), -+ arguments: z4.string() - }) - ]); - -\ No newline at end of file -@@ -1940,6 +1952,9 @@ - if (response2.status) { - finishReason = mapXaiResponsesFinishReason(response2.status); - } -+ if (seenToolCalls.size > 0 && finishReason !== "tool-calls") { -+ finishReason = "tool-calls"; -+ } - return; - } - if (event.type === "response.output_item.added" || event.type === "response.output_item.done") { -\ No newline at end of file -@@ -2024,7 +2039,7 @@ - } - } - } else if (part.type === "function_call") { -- if (!seenToolCalls.has(part.call_id)) { -+ if (event.type === "response.output_item.done" && !seenToolCalls.has(part.call_id)) { - seenToolCalls.add(part.call_id); - controller.enqueue({ - type: "tool-input-start", -\ No newline at end of file -diff --git a/dist/index.js b/dist/index.js ---- a/dist/index.js -+++ b/dist/index.js -@@ -964,7 +964,7 @@ - model: import_v44.z.string().nullish(), - object: import_v44.z.literal("response"), - output: import_v44.z.array(outputItemSchema), -- usage: xaiResponsesUsageSchema, -+ usage: xaiResponsesUsageSchema.nullish(), - status: import_v44.z.string() - }); - var xaiResponsesChunkSchema = import_v44.z.union([ -\ No newline at end of file -@@ -1148,6 +1148,18 @@ - import_v44.z.object({ - type: import_v44.z.literal("response.completed"), - response: xaiResponsesResponseSchema -+ }), -+ import_v44.z.object({ -+ type: import_v44.z.literal("response.function_call_arguments.delta"), -+ item_id: import_v44.z.string(), -+ output_index: import_v44.z.number(), -+ delta: import_v44.z.string() -+ }), -+ import_v44.z.object({ -+ type: import_v44.z.literal("response.function_call_arguments.done"), -+ item_id: import_v44.z.string(), -+ output_index: import_v44.z.number(), -+ arguments: import_v44.z.string() - }) - ]); - -\ No newline at end of file -@@ -1935,6 +1947,9 @@ - if (response2.status) { - finishReason = mapXaiResponsesFinishReason(response2.status); - } -+ if (seenToolCalls.size > 0 && finishReason !== "tool-calls") { -+ finishReason = "tool-calls"; -+ } - return; - } - if (event.type === "response.output_item.added" || event.type === "response.output_item.done") { -\ No newline at end of file -@@ -2019,7 +2034,7 @@ - } - } - } else if (part.type === "function_call") { -- if (!seenToolCalls.has(part.call_id)) { -+ if (event.type === "response.output_item.done" && !seenToolCalls.has(part.call_id)) { - seenToolCalls.add(part.call_id); - controller.enqueue({ - type: "tool-input-start", -\ No newline at end of file diff --git a/patches/@openrouter%2Fai-sdk-provider@1.5.4.patch b/patches/@openrouter%2Fai-sdk-provider@1.5.4.patch deleted file mode 100644 index 6226bf790c..0000000000 --- a/patches/@openrouter%2Fai-sdk-provider@1.5.4.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index f33510a50d11a2cb92a90ea70cc0ac84c89f29b9..e887a60352c0c08ab794b1e6821854dfeefd20cc 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -2110,7 +2110,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted && !textStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - reasoningStarted = false; - } -@@ -2307,7 +2312,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - } - if (textStarted) { -diff --git a/dist/index.mjs b/dist/index.mjs -index 8a688331b88b4af738ee4ca8062b5f24124d3d81..6310cb8b7c8d0a728d86e1eed09906c6b4c91ae2 100644 ---- a/dist/index.mjs -+++ b/dist/index.mjs -@@ -2075,7 +2075,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted && !textStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - reasoningStarted = false; - } -@@ -2272,7 +2277,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - } - if (textStarted) { -diff --git a/dist/internal/index.js b/dist/internal/index.js -index d40fa66125941155ac13a4619503caba24d89f8a..8dd86d1b473f2fa31c1acd9881d72945b294a197 100644 ---- a/dist/internal/index.js -+++ b/dist/internal/index.js -@@ -2064,7 +2064,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted && !textStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - reasoningStarted = false; - } -@@ -2261,7 +2266,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - } - if (textStarted) { -diff --git a/dist/internal/index.mjs b/dist/internal/index.mjs -index b0ed9d113549c5c55ea3b1e08abb3db6f92ae5a7..5695930a8e038facc071d58a4179a369a29be9c7 100644 ---- a/dist/internal/index.mjs -+++ b/dist/internal/index.mjs -@@ -2030,7 +2030,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted && !textStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - reasoningStarted = false; - } -@@ -2227,7 +2232,12 @@ var OpenRouterChatLanguageModel = class { - if (reasoningStarted) { - controller.enqueue({ - type: "reasoning-end", -- id: reasoningId || generateId() -+ id: reasoningId || generateId(), -+ providerMetadata: accumulatedReasoningDetails.length > 0 ? { -+ openrouter: { -+ reasoning_details: accumulatedReasoningDetails -+ } -+ } : undefined - }); - } - if (textStarted) { From e5f0e813b6e2f9305fc27d432689f95a56beea51 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 16:25:47 -0400 Subject: [PATCH 025/142] refactor(session): effectify Session service (#19449) --- packages/opencode/src/session/index.ts | 897 ++++++++++++++----------- 1 file changed, 502 insertions(+), 395 deletions(-) diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts index 6102b7b413..eb01739c15 100644 --- a/packages/opencode/src/session/index.ts +++ b/packages/opencode/src/session/index.ts @@ -33,6 +33,8 @@ import { Permission } from "@/permission" import { Global } from "@/global" import type { LanguageModelV2Usage } from "@ai-sdk/provider" import { iife } from "@/util/iife" +import { Effect, Layer, Scope, ServiceMap } from "effect" +import { makeRuntime } from "@/effect/run-service" export namespace Session { const log = Log.create({ service: "session" }) @@ -233,6 +235,473 @@ export namespace Session { ), } + export function plan(input: { slug: string; time: { created: number } }) { + const base = Instance.project.vcs + ? path.join(Instance.worktree, ".opencode", "plans") + : path.join(Global.Path.data, "plans") + return path.join(base, [input.time.created, input.slug].join("-") + ".md") + } + + export const getUsage = (input: { + model: Provider.Model + usage: LanguageModelV2Usage + metadata?: ProviderMetadata + }) => { + const safe = (value: number) => { + if (!Number.isFinite(value)) return 0 + return value + } + const inputTokens = safe(input.usage.inputTokens ?? 0) + const outputTokens = safe(input.usage.outputTokens ?? 0) + const reasoningTokens = safe(input.usage.reasoningTokens ?? 0) + + const cacheReadInputTokens = safe(input.usage.cachedInputTokens ?? 0) + const cacheWriteInputTokens = safe( + (input.metadata?.["anthropic"]?.["cacheCreationInputTokens"] ?? + // @ts-expect-error + input.metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ?? + // @ts-expect-error + input.metadata?.["venice"]?.["usage"]?.["cacheCreationInputTokens"] ?? + 0) as number, + ) + + // OpenRouter provides inputTokens as the total count of input tokens (including cached). + // AFAIK other providers (OpenRouter/OpenAI/Gemini etc.) do it the same way e.g. vercel/ai#8794 (comment) + // Anthropic does it differently though - inputTokens doesn't include cached tokens. + // It looks like OpenCode's cost calculation assumes all providers return inputTokens the same way Anthropic does (I'm guessing getUsage logic was originally implemented with anthropic), so it's causing incorrect cost calculation for OpenRouter and others. + const excludesCachedTokens = !!(input.metadata?.["anthropic"] || input.metadata?.["bedrock"]) + const adjustedInputTokens = safe( + excludesCachedTokens ? inputTokens : inputTokens - cacheReadInputTokens - cacheWriteInputTokens, + ) + + const total = iife(() => { + // Anthropic doesn't provide total_tokens, also ai sdk will vastly undercount if we + // don't compute from components + if ( + input.model.api.npm === "@ai-sdk/anthropic" || + input.model.api.npm === "@ai-sdk/amazon-bedrock" || + input.model.api.npm === "@ai-sdk/google-vertex/anthropic" + ) { + return adjustedInputTokens + outputTokens + cacheReadInputTokens + cacheWriteInputTokens + } + return input.usage.totalTokens + }) + + const tokens = { + total, + input: adjustedInputTokens, + output: outputTokens, + reasoning: reasoningTokens, + cache: { + write: cacheWriteInputTokens, + read: cacheReadInputTokens, + }, + } + + const costInfo = + input.model.cost?.experimentalOver200K && tokens.input + tokens.cache.read > 200_000 + ? input.model.cost.experimentalOver200K + : input.model.cost + return { + cost: safe( + new Decimal(0) + .add(new Decimal(tokens.input).mul(costInfo?.input ?? 0).div(1_000_000)) + .add(new Decimal(tokens.output).mul(costInfo?.output ?? 0).div(1_000_000)) + .add(new Decimal(tokens.cache.read).mul(costInfo?.cache?.read ?? 0).div(1_000_000)) + .add(new Decimal(tokens.cache.write).mul(costInfo?.cache?.write ?? 0).div(1_000_000)) + // TODO: update models.dev to have better pricing model, for now: + // charge reasoning tokens at the same rate as output tokens + .add(new Decimal(tokens.reasoning).mul(costInfo?.output ?? 0).div(1_000_000)) + .toNumber(), + ), + tokens, + } + } + + export class BusyError extends Error { + constructor(public readonly sessionID: string) { + super(`Session ${sessionID} is busy`) + } + } + + export interface Interface { + readonly create: (input?: { + parentID?: SessionID + title?: string + permission?: Permission.Ruleset + workspaceID?: WorkspaceID + }) => Effect.Effect + readonly fork: (input: { sessionID: SessionID; messageID?: MessageID }) => Effect.Effect + readonly touch: (sessionID: SessionID) => Effect.Effect + readonly get: (id: SessionID) => Effect.Effect + readonly share: (id: SessionID) => Effect.Effect<{ url: string }> + readonly unshare: (id: SessionID) => Effect.Effect + readonly setTitle: (input: { sessionID: SessionID; title: string }) => Effect.Effect + readonly setArchived: (input: { sessionID: SessionID; time?: number }) => Effect.Effect + readonly setPermission: (input: { sessionID: SessionID; permission: Permission.Ruleset }) => Effect.Effect + readonly setRevert: (input: { + sessionID: SessionID + revert: Info["revert"] + summary: Info["summary"] + }) => Effect.Effect + readonly clearRevert: (sessionID: SessionID) => Effect.Effect + readonly setSummary: (input: { sessionID: SessionID; summary: Info["summary"] }) => Effect.Effect + readonly diff: (sessionID: SessionID) => Effect.Effect + readonly messages: (input: { sessionID: SessionID; limit?: number }) => Effect.Effect + readonly children: (parentID: SessionID) => Effect.Effect + readonly remove: (sessionID: SessionID) => Effect.Effect + readonly updateMessage: (msg: MessageV2.Info) => Effect.Effect + readonly removeMessage: (input: { sessionID: SessionID; messageID: MessageID }) => Effect.Effect + readonly removePart: (input: { + sessionID: SessionID + messageID: MessageID + partID: PartID + }) => Effect.Effect + readonly updatePart: (part: MessageV2.Part) => Effect.Effect + readonly updatePartDelta: (input: { + sessionID: SessionID + messageID: MessageID + partID: PartID + field: string + delta: string + }) => Effect.Effect + readonly initialize: (input: { + sessionID: SessionID + modelID: ModelID + providerID: ProviderID + messageID: MessageID + }) => Effect.Effect + } + + export class Service extends ServiceMap.Service()("@opencode/Session") {} + + type Patch = z.infer["info"] + + const db = (fn: (d: Parameters[0] extends (trx: infer D) => any ? D : never) => T) => + Effect.sync(() => Database.use(fn)) + + export const layer: Layer.Layer = Layer.effect( + Service, + Effect.gen(function* () { + const bus = yield* Bus.Service + const config = yield* Config.Service + const scope = yield* Scope.Scope + + const createNext = Effect.fn("Session.createNext")(function* (input: { + id?: SessionID + title?: string + parentID?: SessionID + workspaceID?: WorkspaceID + directory: string + permission?: Permission.Ruleset + }) { + const result: Info = { + id: SessionID.descending(input.id), + slug: Slug.create(), + version: Installation.VERSION, + projectID: Instance.project.id, + directory: input.directory, + workspaceID: input.workspaceID, + parentID: input.parentID, + title: input.title ?? createDefaultTitle(!!input.parentID), + permission: input.permission, + time: { + created: Date.now(), + updated: Date.now(), + }, + } + log.info("created", result) + + yield* Effect.sync(() => SyncEvent.run(Event.Created, { sessionID: result.id, info: result })) + + const cfg = yield* config.get() + if (!result.parentID && (Flag.OPENCODE_AUTO_SHARE || cfg.share === "auto")) { + yield* share(result.id).pipe(Effect.ignore, Effect.forkIn(scope)) + } + + if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) { + // This only exist for backwards compatibility. We should not be + // manually publishing this event; it is a sync event now + yield* bus.publish(Event.Updated, { + sessionID: result.id, + info: result, + }) + } + + return result + }) + + const get = Effect.fn("Session.get")(function* (id: SessionID) { + const row = yield* db((d) => d.select().from(SessionTable).where(eq(SessionTable.id, id)).get()) + if (!row) throw new NotFoundError({ message: `Session not found: ${id}` }) + return fromRow(row) + }) + + const share = Effect.fn("Session.share")(function* (id: SessionID) { + const cfg = yield* config.get() + if (cfg.share === "disabled") throw new Error("Sharing is disabled in configuration") + const result = yield* Effect.promise(async () => { + const { ShareNext } = await import("@/share/share-next") + return ShareNext.create(id) + }) + yield* Effect.sync(() => SyncEvent.run(Event.Updated, { sessionID: id, info: { share: { url: result.url } } })) + return result + }) + + const unshare = Effect.fn("Session.unshare")(function* (id: SessionID) { + yield* Effect.promise(async () => { + const { ShareNext } = await import("@/share/share-next") + await ShareNext.remove(id) + }) + yield* Effect.sync(() => SyncEvent.run(Event.Updated, { sessionID: id, info: { share: { url: null } } })) + }) + + const children = Effect.fn("Session.children")(function* (parentID: SessionID) { + const project = Instance.project + const rows = yield* db((d) => + d + .select() + .from(SessionTable) + .where(and(eq(SessionTable.project_id, project.id), eq(SessionTable.parent_id, parentID))) + .all(), + ) + return rows.map(fromRow) + }) + + const remove: (sessionID: SessionID) => Effect.Effect = Effect.fnUntraced(function* (sessionID: SessionID) { + try { + const session = yield* get(sessionID) + const kids = yield* children(sessionID) + for (const child of kids) { + yield* remove(child.id) + } + yield* unshare(sessionID).pipe(Effect.ignore) + yield* Effect.sync(() => { + SyncEvent.run(Event.Deleted, { sessionID, info: session }) + SyncEvent.remove(sessionID) + }) + } catch (e) { + log.error(e) + } + }) + + const updateMessage = Effect.fn("Session.updateMessage")(function* (msg: MessageV2.Info) { + yield* Effect.sync(() => + SyncEvent.run(MessageV2.Event.Updated, { + sessionID: msg.sessionID, + info: msg, + }), + ) + return msg + }) + + const updatePart = Effect.fn("Session.updatePart")(function* (part: MessageV2.Part) { + yield* Effect.sync(() => + SyncEvent.run(MessageV2.Event.PartUpdated, { + sessionID: part.sessionID, + part: structuredClone(part), + time: Date.now(), + }), + ) + return part + }) + + const create = Effect.fn("Session.create")(function* (input?: { + parentID?: SessionID + title?: string + permission?: Permission.Ruleset + workspaceID?: WorkspaceID + }) { + return yield* createNext({ + parentID: input?.parentID, + directory: Instance.directory, + title: input?.title, + permission: input?.permission, + workspaceID: input?.workspaceID, + }) + }) + + const fork = Effect.fn("Session.fork")(function* (input: { sessionID: SessionID; messageID?: MessageID }) { + const original = yield* get(input.sessionID) + const title = getForkedTitle(original.title) + const session = yield* createNext({ + directory: Instance.directory, + workspaceID: original.workspaceID, + title, + }) + const msgs = yield* messages({ sessionID: input.sessionID }) + const idMap = new Map() + + for (const msg of msgs) { + if (input.messageID && msg.info.id >= input.messageID) break + const newID = MessageID.ascending() + idMap.set(msg.info.id, newID) + + const parentID = msg.info.role === "assistant" && msg.info.parentID ? idMap.get(msg.info.parentID) : undefined + const cloned = yield* updateMessage({ + ...msg.info, + sessionID: session.id, + id: newID, + ...(parentID && { parentID }), + }) + + for (const part of msg.parts) { + yield* updatePart({ + ...part, + id: PartID.ascending(), + messageID: cloned.id, + sessionID: session.id, + }) + } + } + return session + }) + + const patch = (sessionID: SessionID, info: Patch) => + Effect.sync(() => SyncEvent.run(Event.Updated, { sessionID, info })) + + const touch = Effect.fn("Session.touch")(function* (sessionID: SessionID) { + yield* patch(sessionID, { time: { updated: Date.now() } }) + }) + + const setTitle = Effect.fn("Session.setTitle")(function* (input: { sessionID: SessionID; title: string }) { + yield* patch(input.sessionID, { title: input.title }) + }) + + const setArchived = Effect.fn("Session.setArchived")(function* (input: { sessionID: SessionID; time?: number }) { + yield* patch(input.sessionID, { time: { archived: input.time } }) + }) + + const setPermission = Effect.fn("Session.setPermission")(function* (input: { + sessionID: SessionID + permission: Permission.Ruleset + }) { + yield* patch(input.sessionID, { permission: input.permission, time: { updated: Date.now() } }) + }) + + const setRevert = Effect.fn("Session.setRevert")(function* (input: { + sessionID: SessionID + revert: Info["revert"] + summary: Info["summary"] + }) { + yield* patch(input.sessionID, { summary: input.summary, time: { updated: Date.now() }, revert: input.revert }) + }) + + const clearRevert = Effect.fn("Session.clearRevert")(function* (sessionID: SessionID) { + yield* patch(sessionID, { time: { updated: Date.now() }, revert: null }) + }) + + const setSummary = Effect.fn("Session.setSummary")(function* (input: { + sessionID: SessionID + summary: Info["summary"] + }) { + yield* patch(input.sessionID, { time: { updated: Date.now() }, summary: input.summary }) + }) + + const diff = Effect.fn("Session.diff")(function* (sessionID: SessionID) { + return yield* Effect.tryPromise(() => Storage.read(["session_diff", sessionID])).pipe( + Effect.orElseSucceed(() => [] as Snapshot.FileDiff[]), + ) + }) + + const messages = Effect.fn("Session.messages")(function* (input: { sessionID: SessionID; limit?: number }) { + return yield* Effect.promise(async () => { + const result = [] as MessageV2.WithParts[] + for await (const msg of MessageV2.stream(input.sessionID)) { + if (input.limit && result.length >= input.limit) break + result.push(msg) + } + result.reverse() + return result + }) + }) + + const removeMessage = Effect.fn("Session.removeMessage")(function* (input: { + sessionID: SessionID + messageID: MessageID + }) { + yield* Effect.sync(() => + SyncEvent.run(MessageV2.Event.Removed, { + sessionID: input.sessionID, + messageID: input.messageID, + }), + ) + return input.messageID + }) + + const removePart = Effect.fn("Session.removePart")(function* (input: { + sessionID: SessionID + messageID: MessageID + partID: PartID + }) { + yield* Effect.sync(() => + SyncEvent.run(MessageV2.Event.PartRemoved, { + sessionID: input.sessionID, + messageID: input.messageID, + partID: input.partID, + }), + ) + return input.partID + }) + + const updatePartDelta = Effect.fn("Session.updatePartDelta")(function* (input: { + sessionID: SessionID + messageID: MessageID + partID: PartID + field: string + delta: string + }) { + yield* bus.publish(MessageV2.Event.PartDelta, input) + }) + + const initialize = Effect.fn("Session.initialize")(function* (input: { + sessionID: SessionID + modelID: ModelID + providerID: ProviderID + messageID: MessageID + }) { + yield* Effect.promise(() => + SessionPrompt.command({ + sessionID: input.sessionID, + messageID: input.messageID, + model: input.providerID + "/" + input.modelID, + command: Command.Default.INIT, + arguments: "", + }), + ) + }) + + return Service.of({ + create, + fork, + touch, + get, + share, + unshare, + setTitle, + setArchived, + setPermission, + setRevert, + clearRevert, + setSummary, + diff, + messages, + children, + remove, + updateMessage, + removeMessage, + removePart, + updatePart, + updatePartDelta, + initialize, + }) + }), + ) + + export const defaultLayer = layer.pipe(Layer.provide(Bus.layer), Layer.provide(Config.defaultLayer)) + + const { runPromise } = makeRuntime(Service, defaultLayer) + export const create = fn( z .object({ @@ -242,244 +711,46 @@ export namespace Session { workspaceID: WorkspaceID.zod.optional(), }) .optional(), - async (input) => { - return createNext({ - parentID: input?.parentID, - directory: Instance.directory, - title: input?.title, - permission: input?.permission, - workspaceID: input?.workspaceID, - }) - }, + (input) => runPromise((svc) => svc.create(input)), ) - export const fork = fn( - z.object({ - sessionID: SessionID.zod, - messageID: MessageID.zod.optional(), - }), - async (input) => { - const original = await get(input.sessionID) - if (!original) throw new Error("session not found") - const title = getForkedTitle(original.title) - const session = await createNext({ - directory: Instance.directory, - workspaceID: original.workspaceID, - title, - }) - const msgs = await messages({ sessionID: input.sessionID }) - const idMap = new Map() - - for (const msg of msgs) { - if (input.messageID && msg.info.id >= input.messageID) break - const newID = MessageID.ascending() - idMap.set(msg.info.id, newID) - - const parentID = msg.info.role === "assistant" && msg.info.parentID ? idMap.get(msg.info.parentID) : undefined - const cloned = await updateMessage({ - ...msg.info, - sessionID: session.id, - id: newID, - ...(parentID && { parentID }), - }) - - for (const part of msg.parts) { - await updatePart({ - ...part, - id: PartID.ascending(), - messageID: cloned.id, - sessionID: session.id, - }) - } - } - return session - }, + export const fork = fn(z.object({ sessionID: SessionID.zod, messageID: MessageID.zod.optional() }), (input) => + runPromise((svc) => svc.fork(input)), ) - export const touch = fn(SessionID.zod, async (sessionID) => { - const time = Date.now() - SyncEvent.run(Event.Updated, { sessionID, info: { time: { updated: time } } }) - }) + export const touch = fn(SessionID.zod, (id) => runPromise((svc) => svc.touch(id))) + export const get = fn(SessionID.zod, (id) => runPromise((svc) => svc.get(id))) + export const share = fn(SessionID.zod, (id) => runPromise((svc) => svc.share(id))) + export const unshare = fn(SessionID.zod, (id) => runPromise((svc) => svc.unshare(id))) - export async function createNext(input: { - id?: SessionID - title?: string - parentID?: SessionID - workspaceID?: WorkspaceID - directory: string - permission?: Permission.Ruleset - }) { - const result: Info = { - id: SessionID.descending(input.id), - slug: Slug.create(), - version: Installation.VERSION, - projectID: Instance.project.id, - directory: input.directory, - workspaceID: input.workspaceID, - parentID: input.parentID, - title: input.title ?? createDefaultTitle(!!input.parentID), - permission: input.permission, - time: { - created: Date.now(), - updated: Date.now(), - }, - } - log.info("created", result) - - SyncEvent.run(Event.Created, { sessionID: result.id, info: result }) - - const cfg = await Config.get() - if (!result.parentID && (Flag.OPENCODE_AUTO_SHARE || cfg.share === "auto")) { - share(result.id).catch(() => { - // Silently ignore sharing errors during session creation - }) - } - - if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) { - // This only exist for backwards compatibility. We should not be - // manually publishing this event; it is a sync event now - Bus.publish(Event.Updated, { - sessionID: result.id, - info: result, - }) - } - - return result - } - - export function plan(input: { slug: string; time: { created: number } }) { - const base = Instance.project.vcs - ? path.join(Instance.worktree, ".opencode", "plans") - : path.join(Global.Path.data, "plans") - return path.join(base, [input.time.created, input.slug].join("-") + ".md") - } - - export const get = fn(SessionID.zod, async (id) => { - const row = Database.use((db) => db.select().from(SessionTable).where(eq(SessionTable.id, id)).get()) - if (!row) throw new NotFoundError({ message: `Session not found: ${id}` }) - return fromRow(row) - }) - - export const share = fn(SessionID.zod, async (id) => { - const cfg = await Config.get() - if (cfg.share === "disabled") { - throw new Error("Sharing is disabled in configuration") - } - const { ShareNext } = await import("@/share/share-next") - const share = await ShareNext.create(id) - - SyncEvent.run(Event.Updated, { sessionID: id, info: { share: { url: share.url } } }) - - return share - }) - - export const unshare = fn(SessionID.zod, async (id) => { - // Use ShareNext to remove the share (same as share function uses ShareNext to create) - const { ShareNext } = await import("@/share/share-next") - await ShareNext.remove(id) - - SyncEvent.run(Event.Updated, { sessionID: id, info: { share: { url: null } } }) - }) - - export const setTitle = fn( - z.object({ - sessionID: SessionID.zod, - title: z.string(), - }), - async (input) => { - SyncEvent.run(Event.Updated, { sessionID: input.sessionID, info: { title: input.title } }) - }, + export const setTitle = fn(z.object({ sessionID: SessionID.zod, title: z.string() }), (input) => + runPromise((svc) => svc.setTitle(input)), ) - export const setArchived = fn( - z.object({ - sessionID: SessionID.zod, - time: z.number().optional(), - }), - async (input) => { - SyncEvent.run(Event.Updated, { sessionID: input.sessionID, info: { time: { archived: input.time } } }) - }, + export const setArchived = fn(z.object({ sessionID: SessionID.zod, time: z.number().optional() }), (input) => + runPromise((svc) => svc.setArchived(input)), ) - export const setPermission = fn( - z.object({ - sessionID: SessionID.zod, - permission: Permission.Ruleset, - }), - async (input) => { - SyncEvent.run(Event.Updated, { - sessionID: input.sessionID, - info: { permission: input.permission, time: { updated: Date.now() } }, - }) - }, + export const setPermission = fn(z.object({ sessionID: SessionID.zod, permission: Permission.Ruleset }), (input) => + runPromise((svc) => svc.setPermission(input)), ) export const setRevert = fn( - z.object({ - sessionID: SessionID.zod, - revert: Info.shape.revert, - summary: Info.shape.summary, - }), - async (input) => { - SyncEvent.run(Event.Updated, { - sessionID: input.sessionID, - info: { - summary: input.summary, - time: { updated: Date.now() }, - revert: input.revert, - }, - }) - }, + z.object({ sessionID: SessionID.zod, revert: Info.shape.revert, summary: Info.shape.summary }), + (input) => + runPromise((svc) => svc.setRevert({ sessionID: input.sessionID, revert: input.revert, summary: input.summary })), ) - export const clearRevert = fn(SessionID.zod, async (sessionID) => { - SyncEvent.run(Event.Updated, { - sessionID, - info: { - time: { updated: Date.now() }, - revert: null, - }, - }) - }) + export const clearRevert = fn(SessionID.zod, (id) => runPromise((svc) => svc.clearRevert(id))) - export const setSummary = fn( - z.object({ - sessionID: SessionID.zod, - summary: Info.shape.summary, - }), - async (input) => { - SyncEvent.run(Event.Updated, { - sessionID: input.sessionID, - info: { - time: { updated: Date.now() }, - summary: input.summary, - }, - }) - }, + export const setSummary = fn(z.object({ sessionID: SessionID.zod, summary: Info.shape.summary }), (input) => + runPromise((svc) => svc.setSummary({ sessionID: input.sessionID, summary: input.summary })), ) - export const diff = fn(SessionID.zod, async (sessionID) => { - try { - return await Storage.read(["session_diff", sessionID]) - } catch { - return [] - } - }) + export const diff = fn(SessionID.zod, (id) => runPromise((svc) => svc.diff(id))) - export const messages = fn( - z.object({ - sessionID: SessionID.zod, - limit: z.number().optional(), - }), - async (input) => { - const result = [] as MessageV2.WithParts[] - for await (const msg of MessageV2.stream(input.sessionID)) { - if (input.limit && result.length >= input.limit) break - result.push(msg) - } - result.reverse() - return result - }, + export const messages = fn(z.object({ sessionID: SessionID.zod, limit: z.number().optional() }), (input) => + runPromise((svc) => svc.messages(input)), ) export function* list(input?: { @@ -594,84 +865,20 @@ export namespace Session { } } - export const children = fn(SessionID.zod, async (parentID) => { - const project = Instance.project - const rows = Database.use((db) => - db - .select() - .from(SessionTable) - .where(and(eq(SessionTable.project_id, project.id), eq(SessionTable.parent_id, parentID))) - .all(), - ) - return rows.map(fromRow) - }) + export const children = fn(SessionID.zod, (id) => runPromise((svc) => svc.children(id))) + export const remove = fn(SessionID.zod, (id) => runPromise((svc) => svc.remove(id))) + export const updateMessage = fn(MessageV2.Info, (msg) => runPromise((svc) => svc.updateMessage(msg))) - export const remove = fn(SessionID.zod, async (sessionID) => { - try { - const session = await get(sessionID) - for (const child of await children(sessionID)) { - await remove(child.id) - } - await unshare(sessionID).catch(() => {}) - - SyncEvent.run(Event.Deleted, { sessionID, info: session }) - - // Eagerly remove event sourcing data to free up space - SyncEvent.remove(sessionID) - } catch (e) { - log.error(e) - } - }) - - export const updateMessage = fn(MessageV2.Info, async (msg) => { - SyncEvent.run(MessageV2.Event.Updated, { - sessionID: msg.sessionID, - info: msg, - }) - - return msg - }) - - export const removeMessage = fn( - z.object({ - sessionID: SessionID.zod, - messageID: MessageID.zod, - }), - async (input) => { - SyncEvent.run(MessageV2.Event.Removed, { - sessionID: input.sessionID, - messageID: input.messageID, - }) - return input.messageID - }, + export const removeMessage = fn(z.object({ sessionID: SessionID.zod, messageID: MessageID.zod }), (input) => + runPromise((svc) => svc.removeMessage(input)), ) export const removePart = fn( - z.object({ - sessionID: SessionID.zod, - messageID: MessageID.zod, - partID: PartID.zod, - }), - async (input) => { - SyncEvent.run(MessageV2.Event.PartRemoved, { - sessionID: input.sessionID, - messageID: input.messageID, - partID: input.partID, - }) - return input.partID - }, + z.object({ sessionID: SessionID.zod, messageID: MessageID.zod, partID: PartID.zod }), + (input) => runPromise((svc) => svc.removePart(input)), ) - const UpdatePartInput = MessageV2.Part - - export const updatePart = fn(UpdatePartInput, async (part) => { - SyncEvent.run(MessageV2.Event.PartUpdated, { - sessionID: part.sessionID, - part: structuredClone(part), - time: Date.now(), - }) - return part - }) + export const updatePart = fn(MessageV2.Part, (part) => runPromise((svc) => svc.updatePart(part))) export const updatePartDelta = fn( z.object({ @@ -681,111 +888,11 @@ export namespace Session { field: z.string(), delta: z.string(), }), - async (input) => { - Bus.publish(MessageV2.Event.PartDelta, input) - }, + (input) => runPromise((svc) => svc.updatePartDelta(input)), ) - export const getUsage = fn( - z.object({ - model: z.custom(), - usage: z.custom(), - metadata: z.custom().optional(), - }), - (input) => { - const safe = (value: number) => { - if (!Number.isFinite(value)) return 0 - return value - } - const inputTokens = safe(input.usage.inputTokens ?? 0) - const outputTokens = safe(input.usage.outputTokens ?? 0) - const reasoningTokens = safe(input.usage.reasoningTokens ?? 0) - - const cacheReadInputTokens = safe(input.usage.cachedInputTokens ?? 0) - const cacheWriteInputTokens = safe( - (input.metadata?.["anthropic"]?.["cacheCreationInputTokens"] ?? - // @ts-expect-error - input.metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ?? - // @ts-expect-error - input.metadata?.["venice"]?.["usage"]?.["cacheCreationInputTokens"] ?? - 0) as number, - ) - - // OpenRouter provides inputTokens as the total count of input tokens (including cached). - // AFAIK other providers (OpenRouter/OpenAI/Gemini etc.) do it the same way e.g. vercel/ai#8794 (comment) - // Anthropic does it differently though - inputTokens doesn't include cached tokens. - // It looks like OpenCode's cost calculation assumes all providers return inputTokens the same way Anthropic does (I'm guessing getUsage logic was originally implemented with anthropic), so it's causing incorrect cost calculation for OpenRouter and others. - const excludesCachedTokens = !!(input.metadata?.["anthropic"] || input.metadata?.["bedrock"]) - const adjustedInputTokens = safe( - excludesCachedTokens ? inputTokens : inputTokens - cacheReadInputTokens - cacheWriteInputTokens, - ) - - const total = iife(() => { - // Anthropic doesn't provide total_tokens, also ai sdk will vastly undercount if we - // don't compute from components - if ( - input.model.api.npm === "@ai-sdk/anthropic" || - input.model.api.npm === "@ai-sdk/amazon-bedrock" || - input.model.api.npm === "@ai-sdk/google-vertex/anthropic" - ) { - return adjustedInputTokens + outputTokens + cacheReadInputTokens + cacheWriteInputTokens - } - return input.usage.totalTokens - }) - - const tokens = { - total, - input: adjustedInputTokens, - output: outputTokens, - reasoning: reasoningTokens, - cache: { - write: cacheWriteInputTokens, - read: cacheReadInputTokens, - }, - } - - const costInfo = - input.model.cost?.experimentalOver200K && tokens.input + tokens.cache.read > 200_000 - ? input.model.cost.experimentalOver200K - : input.model.cost - return { - cost: safe( - new Decimal(0) - .add(new Decimal(tokens.input).mul(costInfo?.input ?? 0).div(1_000_000)) - .add(new Decimal(tokens.output).mul(costInfo?.output ?? 0).div(1_000_000)) - .add(new Decimal(tokens.cache.read).mul(costInfo?.cache?.read ?? 0).div(1_000_000)) - .add(new Decimal(tokens.cache.write).mul(costInfo?.cache?.write ?? 0).div(1_000_000)) - // TODO: update models.dev to have better pricing model, for now: - // charge reasoning tokens at the same rate as output tokens - .add(new Decimal(tokens.reasoning).mul(costInfo?.output ?? 0).div(1_000_000)) - .toNumber(), - ), - tokens, - } - }, - ) - - export class BusyError extends Error { - constructor(public readonly sessionID: string) { - super(`Session ${sessionID} is busy`) - } - } - export const initialize = fn( - z.object({ - sessionID: SessionID.zod, - modelID: ModelID.zod, - providerID: ProviderID.zod, - messageID: MessageID.zod, - }), - async (input) => { - await SessionPrompt.command({ - sessionID: input.sessionID, - messageID: input.messageID, - model: input.providerID + "/" + input.modelID, - command: Command.Default.INIT, - arguments: "", - }) - }, + z.object({ sessionID: SessionID.zod, modelID: ModelID.zod, providerID: ProviderID.zod, messageID: MessageID.zod }), + (input) => runPromise((svc) => svc.initialize(input)), ) } From 4b9660b211aa57477b6baa1848e582d3279f4db7 Mon Sep 17 00:00:00 2001 From: James Long Date: Fri, 27 Mar 2026 16:33:56 -0400 Subject: [PATCH 026/142] refactor(core): move more responsibility to workspace routing (#19455) --- .../src/control-plane/adaptors/worktree.ts | 12 +-- .../workspace-router-middleware.ts | 64 ------------ packages/opencode/src/server/instance.ts | 22 ----- packages/opencode/src/server/router.ts | 99 +++++++++++++++++++ packages/opencode/src/server/server.ts | 2 +- 5 files changed, 102 insertions(+), 97 deletions(-) delete mode 100644 packages/opencode/src/control-plane/workspace-router-middleware.ts create mode 100644 packages/opencode/src/server/router.ts diff --git a/packages/opencode/src/control-plane/adaptors/worktree.ts b/packages/opencode/src/control-plane/adaptors/worktree.ts index 2a96034d78..719748e3a1 100644 --- a/packages/opencode/src/control-plane/adaptors/worktree.ts +++ b/packages/opencode/src/control-plane/adaptors/worktree.ts @@ -32,15 +32,7 @@ export const WorktreeAdaptor: Adaptor = { const config = Config.parse(info) await Worktree.remove({ directory: config.directory }) }, - async fetch(info, input: RequestInfo | URL, init?: RequestInit) { - const { Server } = await import("../../server/server") - - const config = Config.parse(info) - const url = input instanceof Request || input instanceof URL ? input : new URL(input, "http://opencode.internal") - const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined)) - headers.set("x-opencode-directory", config.directory) - - const request = new Request(url, { ...init, headers }) - return Server.Default().fetch(request) + async fetch(_info, _input: RequestInfo | URL, _init?: RequestInit) { + throw new Error("fetch not implemented") }, } diff --git a/packages/opencode/src/control-plane/workspace-router-middleware.ts b/packages/opencode/src/control-plane/workspace-router-middleware.ts deleted file mode 100644 index 1fc19a22b1..0000000000 --- a/packages/opencode/src/control-plane/workspace-router-middleware.ts +++ /dev/null @@ -1,64 +0,0 @@ -import type { MiddlewareHandler } from "hono" -import { Flag } from "../flag/flag" -import { getAdaptor } from "./adaptors" -import { WorkspaceID } from "./schema" -import { Workspace } from "./workspace" -import { InstanceRoutes } from "../server/instance" -import { lazy } from "../util/lazy" - -type Rule = { method?: string; path: string; exact?: boolean; action: "local" | "forward" } - -const RULES: Array = [ - { path: "/session/status", action: "forward" }, - { method: "GET", path: "/session", action: "local" }, -] - -function local(method: string, path: string) { - for (const rule of RULES) { - if (rule.method && rule.method !== method) continue - const match = rule.exact ? path === rule.path : path === rule.path || path.startsWith(rule.path + "/") - if (match) return rule.action === "local" - } - return false -} - -const routes = lazy(() => InstanceRoutes()) - -export const WorkspaceRouterMiddleware: MiddlewareHandler = async (c) => { - if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) { - return routes().fetch(c.req.raw, c.env) - } - - const url = new URL(c.req.url) - const raw = url.searchParams.get("workspace") - - if (!raw) { - return routes().fetch(c.req.raw, c.env) - } - - if (local(c.req.method, url.pathname)) { - return routes().fetch(c.req.raw, c.env) - } - - const workspaceID = WorkspaceID.make(raw) - const workspace = await Workspace.get(workspaceID) - if (!workspace) { - return new Response(`Workspace not found: ${workspaceID}`, { - status: 500, - headers: { - "content-type": "text/plain; charset=utf-8", - }, - }) - } - - const adaptor = await getAdaptor(workspace.type) - const headers = new Headers(c.req.raw.headers) - headers.delete("x-opencode-workspace") - - return adaptor.fetch(workspace, `${url.pathname}${url.search}`, { - method: c.req.method, - body: c.req.method === "GET" || c.req.method === "HEAD" ? undefined : await c.req.raw.arrayBuffer(), - signal: c.req.raw.signal, - headers, - }) -} diff --git a/packages/opencode/src/server/instance.ts b/packages/opencode/src/server/instance.ts index b99cf3d99f..4bb6efaf9b 100644 --- a/packages/opencode/src/server/instance.ts +++ b/packages/opencode/src/server/instance.ts @@ -14,7 +14,6 @@ import { Global } from "../global" import { LSP } from "../lsp" import { Command } from "../command" import { Flag } from "../flag/flag" -import { Filesystem } from "@/util/filesystem" import { QuestionRoutes } from "./routes/question" import { PermissionRoutes } from "./routes/permission" import { ProjectRoutes } from "./routes/project" @@ -26,7 +25,6 @@ import { ConfigRoutes } from "./routes/config" import { ExperimentalRoutes } from "./routes/experimental" import { ProviderRoutes } from "./routes/provider" import { EventRoutes } from "./routes/event" -import { InstanceBootstrap } from "../project/bootstrap" import { errorHandler } from "./middleware" const log = Log.create({ service: "server" }) @@ -45,26 +43,6 @@ const csp = (hash = "") => export const InstanceRoutes = (app?: Hono) => (app ?? new Hono()) .onError(errorHandler(log)) - .use(async (c, next) => { - 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 Instance.provide({ - directory, - init: InstanceBootstrap, - async fn() { - return next() - }, - }) - }) .route("/project", ProjectRoutes()) .route("/pty", PtyRoutes()) .route("/config", ConfigRoutes()) diff --git a/packages/opencode/src/server/router.ts b/packages/opencode/src/server/router.ts new file mode 100644 index 0000000000..f64180892e --- /dev/null +++ b/packages/opencode/src/server/router.ts @@ -0,0 +1,99 @@ +import type { MiddlewareHandler } from "hono" +import { getAdaptor } from "@/control-plane/adaptors" +import { WorkspaceID } from "@/control-plane/schema" +import { Workspace } from "@/control-plane/workspace" +import { lazy } from "@/util/lazy" +import { Filesystem } from "@/util/filesystem" +import { Instance } from "@/project/instance" +import { InstanceBootstrap } from "@/project/bootstrap" +import { InstanceRoutes } from "./instance" + +type Rule = { method?: string; path: string; exact?: boolean; action: "local" | "forward" } + +const RULES: Array = [ + { path: "/session/status", action: "forward" }, + { method: "GET", path: "/session", action: "local" }, +] + +function local(method: string, path: string) { + for (const rule of RULES) { + if (rule.method && rule.method !== method) continue + const match = rule.exact ? path === rule.path : path === rule.path || path.startsWith(rule.path + "/") + if (match) return rule.action === "local" + } + return false +} + +const routes = lazy(() => InstanceRoutes()) + +export const WorkspaceRouterMiddleware: MiddlewareHandler = async (c) => { + 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 + } + })(), + ) + + const url = new URL(c.req.url) + const workspaceParam = url.searchParams.get("workspace") + + // TODO: If session is being routed, force it to lookup the + // project/workspace + + // If no workspace is provided we use the "project" workspace + if (!workspaceParam) { + return Instance.provide({ + directory, + init: InstanceBootstrap, + async fn() { + return routes().fetch(c.req.raw, c.env) + }, + }) + } + + const workspaceID = WorkspaceID.make(workspaceParam) + const workspace = await Workspace.get(workspaceID) + if (!workspace) { + return new Response(`Workspace not found: ${workspaceID}`, { + status: 500, + headers: { + "content-type": "text/plain; charset=utf-8", + }, + }) + } + + // Handle local workspaces directly so we can pass env to `fetch`, + // necessary for websocket upgrades + if (workspace.type === "worktree") { + return Instance.provide({ + directory: workspace.directory!, + init: InstanceBootstrap, + async fn() { + return routes().fetch(c.req.raw, c.env) + }, + }) + } + + // Remote workspaces + + if (local(c.req.method, url.pathname)) { + // No instance provided because we are serving cached data; there + // is no instance to work with + return routes().fetch(c.req.raw, c.env) + } + + const adaptor = await getAdaptor(workspace.type) + const headers = new Headers(c.req.raw.headers) + headers.delete("x-opencode-workspace") + + return adaptor.fetch(workspace, `${url.pathname}${url.search}`, { + method: c.req.method, + body: c.req.method === "GET" || c.req.method === "HEAD" ? undefined : await c.req.raw.arrayBuffer(), + signal: c.req.raw.signal, + headers, + }) +} diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index cfb22929bc..ec245ed59f 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -8,7 +8,7 @@ import z from "zod" import { Auth } from "../auth" import { Flag } from "../flag/flag" import { ProviderID } from "../provider/schema" -import { WorkspaceRouterMiddleware } from "../control-plane/workspace-router-middleware" +import { WorkspaceRouterMiddleware } from "./router" import { websocket } from "hono/bun" import { errors } from "./error" import { GlobalRoutes } from "./routes/global" From c8909908f50afc3622d354cd8fd7a83dc3445706 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 21:11:06 +0000 Subject: [PATCH 027/142] chore: update nix node_modules hashes --- nix/hashes.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/hashes.json b/nix/hashes.json index 4971aa4eb9..8b5f69d0d7 100644 --- a/nix/hashes.json +++ b/nix/hashes.json @@ -1,8 +1,8 @@ { "nodeModules": { - "x86_64-linux": "sha256-4XhUHjgqinKxOeT8K5hGAjpFA2vzOp8QpEg0uYCZwvg=", - "aarch64-linux": "sha256-X2YTNOpJocIkWkkfS8RnuDW+tvj4riHs7CXM+cS9iv0=", - "aarch64-darwin": "sha256-pN0rY+cpdW+6gNWeegVprdmhc2H72OZ9WxKDIs1fvJM=", - "x86_64-darwin": "sha256-l8+Yz/6UfSPJrdgfcqy/L2SvxN2i9Apv2R0B61rpEmw=" + "x86_64-linux": "sha256-aqmdiQeFREbUfRi3YX+ot4+CjykDuJpxYQH54W3hxME=", + "aarch64-linux": "sha256-ykJp6rFFwXkfJpMRJheTw+r495Wpmx5nj2LKxgSSVDw=", + "aarch64-darwin": "sha256-xHGM1rLld8sqkY+lhvec7fWkPPajIE403viIcpsFnk4=", + "x86_64-darwin": "sha256-QkGtT76P9Kf2+Ny0rI4CwMrIFzRIXiZwi8KS2o+jECU=" } } From 5cd54ec345f3dd501131f0c255d86ddfc8a90e07 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Fri, 27 Mar 2026 17:37:07 -0400 Subject: [PATCH 028/142] refactor(format): use ChildProcessSpawner instead of Process.spawn (#19457) --- packages/opencode/specs/effect-migration.md | 83 ++++++++++++++++++-- packages/opencode/src/format/index.ts | 65 ++++++++------- packages/opencode/test/format/format.test.ts | 10 +-- 3 files changed, 118 insertions(+), 40 deletions(-) diff --git a/packages/opencode/specs/effect-migration.md b/packages/opencode/specs/effect-migration.md index f4acc6e52e..93b9cf8fb9 100644 --- a/packages/opencode/specs/effect-migration.md +++ b/packages/opencode/specs/effect-migration.md @@ -212,8 +212,81 @@ Fully migrated (single namespace, InstanceState where needed, flattened facade): Still open and likely worth migrating: -- [ ] `Session` -- [ ] `SessionProcessor` -- [ ] `SessionPrompt` -- [ ] `SessionCompaction` -- [ ] `Provider` +- [x] `Session` — `session/index.ts` +- [ ] `SessionProcessor` — blocked by AI SDK v6 PR (#18433) +- [ ] `SessionPrompt` — blocked by AI SDK v6 PR (#18433) +- [ ] `SessionCompaction` — blocked by AI SDK v6 PR (#18433) +- [ ] `Provider` — blocked by AI SDK v6 PR (#18433) + +Other services not yet migrated: + +- [ ] `SessionSummary` — `session/summary.ts` +- [ ] `SessionTodo` — `session/todo.ts` +- [ ] `SessionRevert` — `session/revert.ts` +- [ ] `Instruction` — `session/instruction.ts` +- [ ] `ShareNext` — `share/share-next.ts` +- [ ] `SyncEvent` — `sync/index.ts` +- [ ] `Storage` — `storage/storage.ts` +- [ ] `Workspace` — `control-plane/workspace.ts` + +## Tool interface → Effect + +Once individual tools are effectified, change `Tool.Info` (`tool/tool.ts`) so `init` and `execute` return `Effect` instead of `Promise`. This lets tool implementations compose natively with the Effect pipeline rather than being wrapped in `Effect.promise()` at the call site. Requires: + +1. Migrate each tool to return Effects +2. Update `Tool.define()` factory to work with Effects +3. Update `SessionPrompt` to `yield*` tool results instead of `await`ing — blocked by AI SDK v6 PR (#18433) + +Individual tools, ordered by value: + +- [ ] `apply_patch.ts` — HIGH: multi-step orchestration, error accumulation, Bus events +- [ ] `read.ts` — HIGH: streaming I/O, readline, binary detection → FileSystem + Stream +- [ ] `edit.ts` — HIGH: multi-step diff/format/publish pipeline, FileWatcher lock +- [ ] `grep.ts` — MEDIUM: spawns ripgrep → ChildProcessSpawner, timeout handling +- [ ] `write.ts` — MEDIUM: permission checks, diagnostics polling, Bus events +- [ ] `codesearch.ts` — MEDIUM: HTTP + SSE + manual timeout → HttpClient + Effect.timeout +- [ ] `webfetch.ts` — MEDIUM: fetch with UA retry, size limits → HttpClient +- [ ] `websearch.ts` — MEDIUM: MCP over HTTP → HttpClient +- [ ] `batch.ts` — MEDIUM: parallel execution, per-call error recovery → Effect.all +- [ ] `task.ts` — MEDIUM: task state management +- [ ] `glob.ts` — LOW: simple async generator +- [ ] `lsp.ts` — LOW: dispatch switch over LSP operations +- [ ] `skill.ts` — LOW: skill tool adapter +- [ ] `plan.ts` — LOW: plan file operations + +## Effect service adoption in already-migrated code + +Some services are effectified but still use raw `Filesystem.*` or `Process.spawn` instead of the Effect equivalents. These are low-hanging fruit — the layers already exist, they just need the dependency swap. + +### `Filesystem.*` → `AppFileSystem.Service` (yield in layer) + +- [ ] `file/index.ts` — 11 calls (the File service itself) +- [ ] `config/config.ts` — 7 calls +- [ ] `auth/index.ts` — 3 calls +- [ ] `skill/index.ts` — 3 calls +- [ ] `file/time.ts` — 1 call + +### `Process.spawn` → `ChildProcessSpawner` (yield in layer) + +- [ ] `format/index.ts` — 1 call + +## Filesystem consolidation + +`util/filesystem.ts` (raw fs wrapper) is used by **64 files**. The effectified `AppFileSystem` service (`filesystem/index.ts`) exists but only has **8 consumers**. As services and tools are effectified, they should switch from `Filesystem.*` to yielding `AppFileSystem.Service` — this happens naturally during each migration, not as a separate effort. + +Similarly, **28 files** still import raw `fs` or `fs/promises` directly. These should migrate to `AppFileSystem` or `Filesystem.*` as they're touched. + +Current raw fs users that will convert during tool migration: +- `tool/read.ts` — fs.createReadStream, readline +- `tool/apply_patch.ts` — fs/promises +- `tool/bash.ts` — fs/promises +- `file/ripgrep.ts` — fs/promises +- `storage/storage.ts` — fs/promises +- `patch/index.ts` — fs, fs/promises + +## Primitives & utilities + +- [ ] `util/lock.ts` — reader-writer lock → Effect Semaphore/Permit +- [ ] `util/flock.ts` — file-based distributed lock with heartbeat → Effect.repeat + addFinalizer +- [ ] `util/process.ts` — child process spawn wrapper → return Effect instead of Promise +- [ ] `util/lazy.ts` — replace uses in Effect code with Effect.cached; keep for sync-only code diff --git a/packages/opencode/src/format/index.ts b/packages/opencode/src/format/index.ts index 314e8c6e71..47b7d76b77 100644 --- a/packages/opencode/src/format/index.ts +++ b/packages/opencode/src/format/index.ts @@ -1,4 +1,6 @@ import { Effect, Layer, ServiceMap } from "effect" +import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process" +import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner" import { InstanceState } from "@/effect/instance-state" import { makeRuntime } from "@/effect/run-service" import path from "path" @@ -6,7 +8,6 @@ import { mergeDeep } from "remeda" import z from "zod" import { Config } from "../config/config" import { Instance } from "../project/instance" -import { Process } from "../util/process" import { Log } from "../util/log" import * as Formatter from "./formatter" @@ -36,6 +37,7 @@ export namespace Format { Service, Effect.gen(function* () { const config = yield* Config.Service + const spawner = yield* ChildProcessSpawner.ChildProcessSpawner const state = yield* InstanceState.make( Effect.fn("Format.state")(function* (_ctx) { @@ -98,38 +100,45 @@ export namespace Format { return checks.filter((x) => x.enabled).map((x) => x.item) } - async function formatFile(filepath: string) { - log.info("formatting", { file: filepath }) - const ext = path.extname(filepath) + function formatFile(filepath: string) { + return Effect.gen(function* () { + log.info("formatting", { file: filepath }) + const ext = path.extname(filepath) - for (const item of await getFormatter(ext)) { - log.info("running", { command: item.command }) - try { - const proc = Process.spawn( - item.command.map((x) => x.replace("$FILE", filepath)), - { - cwd: Instance.directory, - env: { ...process.env, ...item.environment }, - stdout: "ignore", - stderr: "ignore", - }, - ) - const exit = await proc.exited - if (exit !== 0) { + for (const item of yield* Effect.promise(() => getFormatter(ext))) { + log.info("running", { command: item.command }) + const cmd = item.command.map((x) => x.replace("$FILE", filepath)) + const code = yield* spawner + .spawn( + ChildProcess.make(cmd[0]!, cmd.slice(1), { + cwd: Instance.directory, + env: item.environment, + extendEnv: true, + }), + ) + .pipe( + Effect.flatMap((handle) => handle.exitCode), + Effect.scoped, + Effect.catch(() => + Effect.sync(() => { + log.error("failed to format file", { + error: "spawn failed", + command: item.command, + ...item.environment, + file: filepath, + }) + return ChildProcessSpawner.ExitCode(1) + }), + ), + ) + if (code !== 0) { log.error("failed", { command: item.command, ...item.environment, }) } - } catch (error) { - log.error("failed to format file", { - error, - command: item.command, - ...item.environment, - file: filepath, - }) } - } + }) } log.info("init") @@ -162,14 +171,14 @@ export namespace Format { const file = Effect.fn("Format.file")(function* (filepath: string) { const { formatFile } = yield* InstanceState.get(state) - yield* Effect.promise(() => formatFile(filepath)) + yield* formatFile(filepath) }) return Service.of({ init, status, file }) }), ) - export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer)) + export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(CrossSpawnSpawner.defaultLayer)) const { runPromise } = makeRuntime(Service, defaultLayer) diff --git a/packages/opencode/test/format/format.test.ts b/packages/opencode/test/format/format.test.ts index 6a9b4f5eda..74336e02a3 100644 --- a/packages/opencode/test/format/format.test.ts +++ b/packages/opencode/test/format/format.test.ts @@ -1,17 +1,13 @@ -import { NodeChildProcessSpawner, NodeFileSystem, NodePath } from "@effect/platform-node" +import { NodeFileSystem } from "@effect/platform-node" import { describe, expect } from "bun:test" import { Effect, Layer } from "effect" import { provideTmpdirInstance } from "../fixture/fixture" import { testEffect } from "../lib/effect" +import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner" import { Format } from "../../src/format" -import { Config } from "../../src/config/config" import * as Formatter from "../../src/format/formatter" -const node = NodeChildProcessSpawner.layer.pipe( - Layer.provideMerge(Layer.mergeAll(NodeFileSystem.layer, NodePath.layer)), -) - -const it = testEffect(Layer.mergeAll(Format.layer, node).pipe(Layer.provide(Config.defaultLayer))) +const it = testEffect(Layer.mergeAll(Format.defaultLayer, CrossSpawnSpawner.defaultLayer, NodeFileSystem.layer)) describe("Format", () => { it.effect("status() returns built-in formatters when no config overrides", () => From 02b19bc3d733ee2e4220971fa421d4a6f05a9468 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" Date: Fri, 27 Mar 2026 21:38:08 +0000 Subject: [PATCH 029/142] chore: generate --- packages/opencode/specs/effect-migration.md | 1 + packages/opencode/src/format/index.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/opencode/specs/effect-migration.md b/packages/opencode/specs/effect-migration.md index 93b9cf8fb9..38871356fd 100644 --- a/packages/opencode/specs/effect-migration.md +++ b/packages/opencode/specs/effect-migration.md @@ -277,6 +277,7 @@ Some services are effectified but still use raw `Filesystem.*` or `Process.spawn Similarly, **28 files** still import raw `fs` or `fs/promises` directly. These should migrate to `AppFileSystem` or `Filesystem.*` as they're touched. Current raw fs users that will convert during tool migration: + - `tool/read.ts` — fs.createReadStream, readline - `tool/apply_patch.ts` — fs/promises - `tool/bash.ts` — fs/promises diff --git a/packages/opencode/src/format/index.ts b/packages/opencode/src/format/index.ts index 47b7d76b77..8def248757 100644 --- a/packages/opencode/src/format/index.ts +++ b/packages/opencode/src/format/index.ts @@ -178,7 +178,10 @@ export namespace Format { }), ) - export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(CrossSpawnSpawner.defaultLayer)) + export const defaultLayer = layer.pipe( + Layer.provide(Config.defaultLayer), + Layer.provide(CrossSpawnSpawner.defaultLayer), + ) const { runPromise } = makeRuntime(Service, defaultLayer) From f3997d8082413c8b3a506d24fbfb3c58a0c3dedb Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 28 Mar 2026 00:44:46 +0100 Subject: [PATCH 030/142] Single target plugin entrypoints (#19467) --- .opencode/plugins/tui-smoke.tsx | 15 +++- packages/opencode/specs/tui-plugins.md | 14 +++- .../cli/cmd/tui/feature-plugins/home/tips.tsx | 6 +- .../tui/feature-plugins/sidebar/context.tsx | 6 +- .../cmd/tui/feature-plugins/sidebar/files.tsx | 6 +- .../tui/feature-plugins/sidebar/footer.tsx | 6 +- .../cmd/tui/feature-plugins/sidebar/lsp.tsx | 6 +- .../cmd/tui/feature-plugins/sidebar/mcp.tsx | 6 +- .../cmd/tui/feature-plugins/sidebar/todo.tsx | 6 +- .../tui/feature-plugins/system/plugins.tsx | 18 +++-- .../src/cli/cmd/tui/plugin/runtime.ts | 11 +-- .../src/cli/cmd/tui/ui/dialog-prompt.tsx | 41 ++++++++-- packages/opencode/src/plugin/index.ts | 19 +++-- packages/opencode/src/plugin/shared.ts | 47 ++++++++--- .../cli/tui/plugin-loader-entrypoint.test.ts | 57 ++++++++++++++ .../test/plugin/loader-shared.test.ts | 77 +++++++++++++++++++ packages/plugin/src/index.ts | 3 +- packages/plugin/src/tui.ts | 10 ++- 18 files changed, 292 insertions(+), 62 deletions(-) diff --git a/.opencode/plugins/tui-smoke.tsx b/.opencode/plugins/tui-smoke.tsx index 3e90bafb65..deb3c3e3e4 100644 --- a/.opencode/plugins/tui-smoke.tsx +++ b/.opencode/plugins/tui-smoke.tsx @@ -1,7 +1,14 @@ /** @jsxImportSource @opentui/solid */ import { useKeyboard, useTerminalDimensions } from "@opentui/solid" import { RGBA, VignetteEffect } from "@opentui/core" -import type { TuiKeybindSet, TuiPluginApi, TuiPluginMeta, TuiSlotPlugin } from "@opencode-ai/plugin/tui" +import type { + TuiKeybindSet, + TuiPlugin, + TuiPluginApi, + TuiPluginMeta, + TuiPluginModule, + TuiSlotPlugin, +} from "@opencode-ai/plugin/tui" const tabs = ["overview", "counter", "help"] const bind = { @@ -813,7 +820,7 @@ const reg = (api: TuiPluginApi, input: Cfg, keys: Keys) => { ]) } -const tui = async (api: TuiPluginApi, options: Record | null, meta: TuiPluginMeta) => { +const tui: TuiPlugin = async (api, options, meta) => { if (options?.enabled === false) return await api.theme.install("./smoke-theme.json") @@ -846,7 +853,9 @@ const tui = async (api: TuiPluginApi, options: Record | null, m } } -export default { +const plugin: TuiPluginModule & { id: string } = { id: "tui-smoke", tui, } + +export default plugin diff --git a/packages/opencode/specs/tui-plugins.md b/packages/opencode/specs/tui-plugins.md index 1a7ba55a02..02b2a9741d 100644 --- a/packages/opencode/specs/tui-plugins.md +++ b/packages/opencode/specs/tui-plugins.md @@ -8,6 +8,8 @@ Technical reference for the current TUI plugin system. - Author package entrypoint is `@opencode-ai/plugin/tui`. - Internal plugins load inside the CLI app the same way external TUI plugins do. - Package plugins can be installed from CLI or TUI. +- v1 plugin modules are target-exclusive: a module can export `server` or `tui`, never both. +- Server runtime keeps v0 legacy fallback (function exports / enumerated exports) after v1 parsing. ## TUI config @@ -27,6 +29,7 @@ Example: - `plugin` entries can be either a string spec or `[spec, options]`. - Plugin specs can be npm specs, `file://` URLs, relative paths, or absolute paths. - Relative path specs are resolved relative to the config file that declared them. +- A file module listed in `tui.json` must be a TUI module (`default export { id?, tui }`) and must not export `server`. - Duplicate npm plugins are deduped by package name; higher-precedence config wins. - Duplicate file plugins are deduped by exact resolved file spec. This happens while merging config, before plugin modules are loaded. - `plugin_enabled` is keyed by plugin id, not by plugin spec. @@ -46,7 +49,7 @@ Minimal module shape: ```tsx /** @jsxImportSource @opentui/solid */ -import type { TuiPlugin } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginModule } from "@opencode-ai/plugin/tui" const tui: TuiPlugin = async (api, options, meta) => { api.command.register(() => [ @@ -69,16 +72,20 @@ const tui: TuiPlugin = async (api, options, meta) => { ]) } -export default { +const plugin: TuiPluginModule & { id: string } = { id: "acme.demo", tui, } + +export default plugin ``` - Loader only reads the module default export object. Named exports are ignored. -- TUI shape is `default export { id?, tui }`. +- TUI shape is `default export { id?, tui }`; including `server` is rejected. +- A single module cannot export both `server` and `tui`. - `tui` signature is `(api, options, meta) => Promise`. - If package `exports` contains `./tui`, the loader resolves that entrypoint. Otherwise it uses the resolved package target. +- If a package supports both server and TUI, use separate files and package `exports` (`./server` and `./tui`) so each target resolves to a target-only module. - File/path plugins must export a non-empty `id`. - npm plugins may omit `id`; package `name` is used. - Runtime identity is the resolved plugin id. Later plugins with the same id are rejected, including collisions with internal plugin ids. @@ -137,6 +144,7 @@ npm plugins can declare a version compatibility range in `package.json` using th - With `--force`, replacement matches by package name. If the existing row is `[spec, options]`, those tuple options are kept. - Tuple targets in `oc-plugin` provide default options written into config. - A package can target `server`, `tui`, or both. +- If a package targets both, each target must still resolve to a separate target-only module. Do not export `{ server, tui }` from one module. - There is no uninstall, list, or update CLI command for external plugins. - Local file plugins are configured directly in `tui.json`. diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx index 1a1d3c174c..c0e02f74af 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/home/tips.tsx @@ -1,4 +1,4 @@ -import type { TuiPlugin } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo, Show } from "solid-js" import { Tips } from "./tips-view" @@ -42,7 +42,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx index c8538ae2a7..9ffe779791 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/context.tsx @@ -1,5 +1,5 @@ import type { AssistantMessage } from "@opencode-ai/sdk/v2" -import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo } from "solid-js" const id = "internal:sidebar-context" @@ -55,7 +55,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx index 16bed72878..c865c5eb49 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/files.tsx @@ -1,4 +1,4 @@ -import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo, For, Show, createSignal } from "solid-js" const id = "internal:sidebar-files" @@ -54,7 +54,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx index a6bff01a57..b468d851b0 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/footer.tsx @@ -1,4 +1,4 @@ -import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo, Show } from "solid-js" import { Global } from "@/global" @@ -85,7 +85,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx index db9b3a7e56..cb4050fdb8 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/lsp.tsx @@ -1,4 +1,4 @@ -import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo, For, Show, createSignal } from "solid-js" const id = "internal:sidebar-lsp" @@ -58,7 +58,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx index 178050abd5..391bf27b90 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/mcp.tsx @@ -1,4 +1,4 @@ -import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo, For, Match, Show, Switch, createSignal } from "solid-js" const id = "internal:sidebar-mcp" @@ -88,7 +88,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx index c9e904debd..eed0cb703d 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/sidebar/todo.tsx @@ -1,4 +1,4 @@ -import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui" import { createMemo, For, Show, createSignal } from "solid-js" import { TodoItem } from "../../component/todo-item" @@ -40,7 +40,9 @@ const tui: TuiPlugin = async (api) => { }) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx index 8293be5068..f2fd25ffb6 100644 --- a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx +++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/plugins.tsx @@ -1,9 +1,9 @@ import { Keybind } from "@/util/keybind" -import type { TuiPlugin, TuiPluginApi, TuiPluginStatus } from "@opencode-ai/plugin/tui" +import type { TuiPlugin, TuiPluginApi, TuiPluginModule, TuiPluginStatus } from "@opencode-ai/plugin/tui" import { useKeyboard, useTerminalDimensions } from "@opentui/solid" import { fileURLToPath } from "url" import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select" -import { createEffect, createMemo, createSignal } from "solid-js" +import { Show, createEffect, createMemo, createSignal } from "solid-js" const id = "internal:plugin-manager" const key = Keybind.parse("space").at(0) @@ -53,11 +53,17 @@ function Install(props: { api: TuiPluginApi }) { ( scope: - {global() ? "global" : "local"} - ({Keybind.toString(tab)} toggle) + + {global() ? "global" : "local"} + + + ({Keybind.toString(tab)} toggle) + )} onConfirm={(raw) => { @@ -256,7 +262,9 @@ const tui: TuiPlugin = async (api) => { ]) } -export default { +const plugin: TuiPluginModule & { id: string } = { id, tui, } + +export default plugin diff --git a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts index 9cc5194df0..0e1674bdac 100644 --- a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts +++ b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts @@ -20,10 +20,10 @@ import { isRecord } from "@/util/record" import { Instance } from "@/project/instance" import { checkPluginCompatibility, - getDefaultPlugin, isDeprecatedPlugin, pluginSource, readPluginId, + readV1Plugin, resolvePluginEntrypoint, resolvePluginId, resolvePluginTarget, @@ -231,9 +231,7 @@ async function loadExternalPlugin( const mod = await import(entry) .then((raw) => { - const mod = getDefaultPlugin(raw) as TuiPluginModule | undefined - if (!mod?.tui) throw new TypeError(`Plugin ${spec} must default export an object with tui()`) - return mod + return readV1Plugin(raw as Record, spec, "tui") as TuiPluginModule }) .catch((error) => { fail("failed to load tui plugin", { path: spec, target: entry, retry, error }) @@ -566,16 +564,13 @@ function pluginApi(runtime: RuntimeState, load: PluginLoad, scope: PluginScope, } function collectPluginEntries(load: PluginLoad, meta: TuiPluginMeta) { - // TUI stays default-only so plugin ids, lifecycle, and errors remain stable. - const plugin = load.module.tui - if (!plugin) return [] const options = load.item ? Config.pluginOptions(load.item) : undefined return [ { id: load.id, load, meta, - plugin, + plugin: load.module.tui, options, enabled: true, }, diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx index b1b05a0f1a..cb1b8257ab 100644 --- a/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx +++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx @@ -1,14 +1,17 @@ import { TextareaRenderable, TextAttributes } from "@opentui/core" import { useTheme } from "../context/theme" import { useDialog, type DialogContext } from "./dialog" -import { onMount, type JSX } from "solid-js" +import { Show, createEffect, onMount, type JSX } from "solid-js" import { useKeyboard } from "@opentui/solid" +import { Spinner } from "../component/spinner" export type DialogPromptProps = { title: string description?: () => JSX.Element placeholder?: string value?: string + busy?: boolean + busyText?: string onConfirm?: (value: string) => void onCancel?: () => void } @@ -19,6 +22,12 @@ export function DialogPrompt(props: DialogPromptProps) { let textarea: TextareaRenderable useKeyboard((evt) => { + if (props.busy) { + if (evt.name === "escape") return + evt.preventDefault() + evt.stopPropagation() + return + } if (evt.name === "return") { props.onConfirm?.(textarea.plainText) } @@ -28,11 +37,21 @@ export function DialogPrompt(props: DialogPromptProps) { dialog.setSize("medium") setTimeout(() => { if (!textarea || textarea.isDestroyed) return + if (props.busy) return textarea.focus() }, 1) textarea.gotoLineEnd() }) + createEffect(() => { + if (!textarea || textarea.isDestroyed) return + if (props.busy) { + textarea.blur() + return + } + textarea.focus() + }) + return ( @@ -47,22 +66,28 @@ export function DialogPrompt(props: DialogPromptProps) { {props.description}