Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Refactor OpenCode lifecycle and structured output handling (#2218)
Julius Marminge306ec4bb842f
diff --git a/apps/server/src/git/Layers/OpenCodeTextGeneration.test.ts b/apps/server/src/git/Layers/OpenCodeTextGeneration.test.tsindex ab9802456..28ee0a3e6 100644--- a/apps/server/src/git/Layers/OpenCodeTextGeneration.test.ts+++ b/apps/server/src/git/Layers/OpenCodeTextGeneration.test.ts@@ -1,18 +1,22 @@-import type { ChildProcess } from "node:child_process";-import * as NodeServices from "@effect/platform-node/NodeServices";import { it } from "@effect/vitest";import { Duration, Effect, Layer } from "effect";import { TestClock } from "effect/testing";-import { beforeEach, expect, vi } from "vitest";+import { NetService } from "@t3tools/shared/Net";+import { beforeEach, expect } from "vitest";import { ServerConfig } from "../../config.ts";import { ServerSettingsService } from "../../serverSettings.ts";+import {+ OpenCodeRuntime,+ OpenCodeRuntimeError,+ type OpenCodeRuntimeShape,+} from "../../provider/opencodeRuntime.ts";import { TextGeneration } from "../Services/TextGeneration.ts";import { OpenCodeTextGenerationLive } from "./OpenCodeTextGeneration.ts";-const runtimeMock = vi.hoisted(() => {- const state = {+const runtimeMock = {+ state: {startCalls: [] as string[],promptUrls: [] as string[],authHeaders: [] as Array<string | null>,@@ -20,69 +24,77 @@ const runtimeMock = vi.hoisted(() => {promptResult: undefined as| { data?: { info?: { error?: unknown }; parts?: Array<{ type: string; text?: string }> } }| undefined,- };-- return {- state,- reset() {- state.startCalls.length = 0;- state.promptUrls.length = 0;- state.authHeaders.length = 0;- state.closeCalls.length = 0;- state.promptResult = undefined;- },- };-});--vi.mock("../../provider/opencodeRuntime.ts", async () => {- const actual = await vi.importActual<typeof import("../../provider/opencodeRuntime.ts")>(- "../../provider/opencodeRuntime.ts",- );+ },+ reset() {+ this.state.startCalls.length = 0;+ this.state.promptUrls.length = 0;+ this.state.authHeaders.length = 0;+ this.state.closeCalls.length = 0;+ this.state.promptResult = undefined;+ },+};- return {- ...actual,- startOpenCodeServerProcess: vi.fn(async ({ binaryPath }: { binaryPath: string }) => {+const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {+ startOpenCodeServerProcess: ({ binaryPath }) =>+ Effect.gen(function* () {const index = runtimeMock.state.startCalls.length + 1;const url = `http://127.0.0.1:${4_300 + index}`;runtimeMock.state.startCalls.push(binaryPath);+ // The production runtime binds server lifetime to the caller's scope.+ // Mirror that here so the closeCalls probe observes scope close.+ yield* Effect.addFinalizer(() =>+ Effect.sync(() => {+ runtimeMock.state.closeCalls.push(url);+ }),+ );return {url,- process: {} as ChildProcess,- close: () => {- runtimeMock.state.closeCalls.push(url);- },+ exitCode: Effect.never,};}),- createOpenCodeSdkClient: vi.fn(- ({ baseUrl, serverPassword }: { baseUrl: string; serverPassword?: string }) => ({- session: {- create: vi.fn(async () => ({ data: { id: `${baseUrl}/session` } })),- prompt: vi.fn(async () => {- runtimeMock.state.promptUrls.push(baseUrl);- runtimeMock.state.authHeaders.push(- serverPassword ? `Basic ${btoa(`opencode:${serverPassword}`)}` : null,- );- return (- runtimeMock.state.promptResult ?? {- data: {- parts: [- {- type: "text",- text: JSON.stringify({- subject: "Improve OpenCode reuse",- body: "Reuse one server for the full action.",- }),- },- ],- },- }- );- }),+ connectToOpenCodeServer: ({ serverUrl }) =>+ Effect.succeed({+ url: serverUrl ?? "http://127.0.0.1:4301",+ exitCode: null,+ external: Boolean(serverUrl),+ }),+ runOpenCodeCommand: () => Effect.succeed({ stdout: "", stderr: "", code: 0 }),+ createOpenCodeSdkClient: ({ baseUrl, serverPassword }) =>+ ({+ session: {+ create: async () => ({ data: { id: `${baseUrl}/session` } }),+ prompt: async () => {+ runtimeMock.state.promptUrls.push(baseUrl);+ runtimeMock.state.authHeaders.push(+ serverPassword ? `Basic ${btoa(`opencode:${serverPassword}`)}` : null,+ );+ return (+ runtimeMock.state.promptResult ?? {+ data: {+ parts: [+ {+ type: "text",+ text: JSON.stringify({+ subject: "Improve OpenCode reuse",+ body: "Reuse one server for the full action.",+ }),+ },+ ],+ },+ }+ );},+ },+ }) as unknown as ReturnType<OpenCodeRuntimeShape["createOpenCodeSdkClient"]>,+ loadOpenCodeInventory: () =>+ Effect.fail(+ new OpenCodeRuntimeError({+ operation: "loadOpenCodeInventory",+ detail: "OpenCodeRuntimeTestDouble.loadOpenCodeInventory not used in this test",+ cause: null,}),),- };-});+};const DEFAULT_TEST_MODEL_SELECTION = {provider: "opencode" as const,@@ -92,6 +104,7 @@ const DEFAULT_TEST_MODEL_SELECTION = {const OPENCODE_TEXT_GENERATION_IDLE_TTL_MS = 30_000;const OpenCodeTextGenerationTestLayer = OpenCodeTextGenerationLive.pipe(+ Layer.provideMerge(Layer.succeed(OpenCodeRuntime, OpenCodeRuntimeTestDouble)),Layer.provideMerge(ServerSettingsService.layerTest({providers: {@@ -106,10 +119,12 @@ const OpenCodeTextGenerationTestLayer = OpenCodeTextGenerationLive.pipe(prefix: "t3code-opencode-text-generation-test-",}),),+ Layer.provideMerge(NetService.layer),Layer.provideMerge(NodeServices.layer),);const OpenCodeTextGenerationExistingServerTestLayer = OpenCodeTextGenerationLive.pipe(+ Layer.provideMerge(Layer.succeed(OpenCodeRuntime, OpenCodeRuntimeTestDouble)),Layer.provideMerge(ServerSettingsService.layerTest({providers: {@@ -126,6 +141,7 @@ const OpenCodeTextGenerationExistingServerTestLayer = OpenCodeTextGenerationLiveprefix: "t3code-opencode-text-generation-existing-server-test-",}),),+ Layer.provideMerge(NetService.layer),Layer.provideMerge(NodeServices.layer),);diff --git a/apps/server/src/git/Layers/OpenCodeTextGeneration.ts b/apps/server/src/git/Layers/OpenCodeTextGeneration.tsindex d206e59e8..fd28188d6 100644--- a/apps/server/src/git/Layers/OpenCodeTextGeneration.ts+++ b/apps/server/src/git/Layers/OpenCodeTextGeneration.ts@@ -1,4 +1,4 @@-import { Duration, Effect, Exit, Fiber, Layer, Schema, Scope } from "effect";+import { Effect, Exit, Fiber, Layer, Schema, Scope } from "effect";import * as Semaphore from "effect/Semaphore";import {@@ -25,15 +25,15 @@ import {sanitizeThreadTitle,} from "../Utils.ts";import {- createOpenCodeSdkClient,+ OpenCodeRuntime,type OpenCodeServerConnection,type OpenCodeServerProcess,+ openCodeRuntimeErrorDetail,parseOpenCodeModelSlug,- startOpenCodeServerProcess,toOpenCodeFileParts,} from "../../provider/opencodeRuntime.ts";-const OPENCODE_TEXT_GENERATION_IDLE_TTL_MS = 30_000;+const OPENCODE_TEXT_GENERATION_IDLE_TTL = "30 seconds";function getOpenCodePromptErrorMessage(error: unknown): string | null {if (!error || typeof error !== "object") {@@ -80,6 +80,13 @@ function getOpenCodeTextResponse(parts: ReadonlyArray<unknown> | undefined): strinterface SharedOpenCodeTextGenerationServerState {server: OpenCodeServerProcess | null;+ /**+ * The scope that owns the shared server's lifetime. Closing this scope+ * terminates the OpenCode child process and interrupts any fibers the+ * runtime forked during startup. We don't hold a `close()` function on+ * the server handle anymore — the scope is the only lifecycle handle.+ */+ serverScope: Scope.Closeable | null;binaryPath: string | null;activeRequests: number;idleCloseFiber: Fiber.Fiber<void, never> | null;@@ -88,24 +95,28 @@ interface SharedOpenCodeTextGenerationServerState {const makeOpenCodeTextGeneration = Effect.gen(function* () {const serverConfig = yield* ServerConfig;const serverSettingsService = yield* ServerSettingsService;+ const openCodeRuntime = yield* OpenCodeRuntime;const idleFiberScope = yield* Effect.acquireRelease(Scope.make(), (scope) =>Scope.close(scope, Exit.void),);const sharedServerMutex = yield* Semaphore.make(1);const sharedServerState: SharedOpenCodeTextGenerationServerState = {server: null,+ serverScope: null,binaryPath: null,activeRequests: 0,idleCloseFiber: null,};- const closeSharedServer = (server: OpenCodeServerProcess) => {- if (sharedServerState.server === server) {- sharedServerState.server = null;- sharedServerState.binaryPath = null;+ const closeSharedServer = Effect.fn("closeSharedServer")(function* () {+ const scope = sharedServerState.serverScope;+ sharedServerState.server = null;+ sharedServerState.serverScope = null;+ sharedServerState.binaryPath = null;+ if (scope !== null) {+ yield* Scope.close(scope, Exit.void).pipe(Effect.ignore);}- server.close();- };+ });const cancelIdleCloseFiber = Effect.fn("cancelIdleCloseFiber")(function* () {const idleCloseFiber = sharedServerState.idleCloseFiber;@@ -119,15 +130,15 @@ const makeOpenCodeTextGeneration = Effect.gen(function* () {server: OpenCodeServerProcess,) {yield* cancelIdleCloseFiber();- const fiber = yield* Effect.sleep(Duration.millis(OPENCODE_TEXT_GENERATION_IDLE_TTL_MS)).pipe(+ const fiber = yield* Effect.sleep(OPENCODE_TEXT_GENERATION_IDLE_TTL).pipe(Effect.andThen(sharedServerMutex.withPermit(- Effect.sync(() => {+ Effect.gen(function* () {if (sharedServerState.server !== server || sharedServerState.activeRequests > 0) {return;}sharedServerState.idleCloseFiber = null;- closeSharedServer(server);+ yield* closeSharedServer();}),),),@@ -154,7 +165,7 @@ const makeOpenCodeTextGeneration = Effect.gen(function* () {sharedServerState.binaryPath !== input.binaryPath &&sharedServerState.activeRequests === 0) {- closeSharedServer(existingServer);+ yield* closeSharedServer();} else {if (sharedServerState.binaryPath !== input.binaryPath) {yield* Effect.logWarning(@@ -170,20 +181,53 @@ const makeOpenCodeTextGeneration = Effect.gen(function* () {}}- const server = yield* Effect.tryPromise({- try: () => startOpenCodeServerProcess({ binaryPath: input.binaryPath }),- catch: (cause) =>- new TextGenerationError({- operation: input.operation,- detail: cause instanceof Error ? cause.message : "Failed to start OpenCode server.",- cause,- }),- });+ // Create a fresh scope that owns this shared server. The runtime+ // will attach its child-process and fiber finalizers to this scope;+ // closing it kills the server and interrupts those fibers.+ //+ // The `Scope.make` / spawn / record-or-close transitions run inside+ // `uninterruptibleMask` so an interrupt arriving between any two+ // steps can't orphan the scope (and the child process attached to+ // it) before we either close it on failure or hand ownership to+ // `sharedServerState`. `restore` keeps the actual spawn+ // interruptible; an interrupt during the spawn is captured by+ // `Effect.exit` and drives us through the failure branch that+ // closes the fresh scope.+ return yield* Effect.uninterruptibleMask((restore) =>+ Effect.gen(function* () {+ const serverScope = yield* Scope.make();+ const startedExit = yield* Effect.exit(+ restore(+ openCodeRuntime+ .startOpenCodeServerProcess({+ binaryPath: input.binaryPath,+ })+ .pipe(+ Effect.provideService(Scope.Scope, serverScope),+ Effect.mapError(+ (cause) =>+ new TextGenerationError({+ operation: input.operation,+ detail: openCodeRuntimeErrorDetail(cause),+ cause,+ }),+ ),+ ),+ ),+ );+ if (startedExit._tag === "Failure") {+ yield* Scope.close(serverScope, Exit.void).pipe(Effect.ignore);+ return yield* Effect.failCause(startedExit.cause);+ }- sharedServerState.server = server;- sharedServerState.binaryPath = input.binaryPath;- sharedServerState.activeRequests = 1;- return server;+ const server = startedExit.value;+ sharedServerState.server = server;+ sharedServerState.serverScope = serverScope;+ sharedServerState.binaryPath = input.binaryPath;+ sharedServerState.activeRequests = 1;+ return server;+ }),+ );}),);@@ -200,17 +244,15 @@ const makeOpenCodeTextGeneration = Effect.gen(function* () {}),);+ // Module-level finalizer: on layer shutdown, cancel the idle close fiber+ // and close the shared server scope. Consumers therefore cannot leak+ // the shared OpenCode server by forgetting to call anything.yield* Effect.addFinalizer(() =>sharedServerMutex.withPermit(Effect.gen(function* () {yield* cancelIdleCloseFiber();- const server = sharedServerState.server;- sharedServerState.server = null;- sharedServerState.binaryPath = null;sharedServerState.activeRequests = 0;- if (server !== null) {- server.close();- }+ yield* closeSharedServer();}),),);@@ -264,7 +306,7 @@ const makeOpenCodeTextGeneration = Effect.gen(function* () {const runAgainstServer = (server: Pick<OpenCodeServerConnection, "url">) =>Effect.tryPromise({try: async () => {- const client = createOpenCodeSdkClient({+ const client = openCodeRuntime.createOpenCodeSdkClient({baseUrl: server.url,directory: input.cwd,...(settings.serverUrl.length > 0 && settings.serverPassword@@ -304,8 +346,7 @@ const makeOpenCodeTextGeneration = Effect.gen(function* () {catch: (cause) =>new TextGenerationError({operation: input.operation,- detail:- cause instanceof Error ? cause.message : "OpenCode text generation request failed.",+ detail: openCodeRuntimeErrorDetail(cause),cause,}),});diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.test.tsindex 98691082c..9a391b553 100644--- a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts@@ -3,13 +3,18 @@ import assert from "node:assert/strict";import * as NodeServices from "@effect/platform-node/NodeServices";import { it } from "@effect/vitest";import { Effect, Layer, Option } from "effect";-import { beforeEach, vi } from "vitest";+import { beforeEach } from "vitest";import { ThreadId } from "@t3tools/contracts";import { ServerConfig } from "../../config.ts";import { ServerSettingsService } from "../../serverSettings.ts";import { ProviderSessionDirectory } from "../Services/ProviderSessionDirectory.ts";import { OpenCodeAdapter } from "../Services/OpenCodeAdapter.ts";+import {+ OpenCodeRuntime,+ OpenCodeRuntimeError,+ type OpenCodeRuntimeShape,+} from "../opencodeRuntime.ts";import {appendOpenCodeAssistantTextDelta,makeOpenCodeAdapterLive,@@ -18,16 +23,16 @@ import {const asThreadId = (value: string): ThreadId => ThreadId.make(value);-const runtimeMock = vi.hoisted(() => {- type MessageEntry = {- info: {- id: string;- role: "user" | "assistant";- };- parts: Array<unknown>;+type MessageEntry = {+ info: {+ id: string;+ role: "user" | "assistant";};+ parts: Array<unknown>;+};- const state = {+const runtimeMock = {+ state: {startCalls: [] as string[],sessionCreateUrls: [] as string[],authHeaders: [] as Array<string | null>,@@ -38,105 +43,118 @@ const runtimeMock = vi.hoisted(() => {closeError: null as Error | null,messages: [] as MessageEntry[],subscribedEvents: [] as unknown[],- };-- return {- state,- reset() {- state.startCalls.length = 0;- state.sessionCreateUrls.length = 0;- state.authHeaders.length = 0;- state.abortCalls.length = 0;- state.closeCalls.length = 0;- state.revertCalls.length = 0;- state.promptAsyncError = null;- state.closeError = null;- state.messages = [];- state.subscribedEvents = [];- },- };-});--vi.mock("../opencodeRuntime.ts", async () => {- const actual =- await vi.importActual<typeof import("../opencodeRuntime.ts")>("../opencodeRuntime.ts");-- return {- ...actual,- startOpenCodeServerProcess: vi.fn(async ({ binaryPath }: { binaryPath: string }) => {+ },+ reset() {+ this.state.startCalls.length = 0;+ this.state.sessionCreateUrls.length = 0;+ this.state.authHeaders.length = 0;+ this.state.abortCalls.length = 0;+ this.state.closeCalls.length = 0;+ this.state.revertCalls.length = 0;+ this.state.promptAsyncError = null;+ this.state.closeError = null;+ this.state.messages = [];+ this.state.subscribedEvents = [];+ },+};++const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {+ startOpenCodeServerProcess: ({ binaryPath }) =>+ Effect.gen(function* () {runtimeMock.state.startCalls.push(binaryPath);+ const url = "http://127.0.0.1:4301";+ yield* Effect.addFinalizer(() =>+ Effect.sync(() => {+ runtimeMock.state.closeCalls.push(url);+ if (runtimeMock.state.closeError) {+ throw runtimeMock.state.closeError;+ }+ }),+ );return {- url: "http://127.0.0.1:4301",- process: {- once() {},- },- close() {},+ url,+ exitCode: Effect.never,};}),- connectToOpenCodeServer: vi.fn(async ({ serverUrl }: { serverUrl?: string }) => ({- url: serverUrl ?? "http://127.0.0.1:4301",- process: null,- external: Boolean(serverUrl),- close() {- runtimeMock.state.closeCalls.push(serverUrl ?? "http://127.0.0.1:4301");- if (runtimeMock.state.closeError) {- throw runtimeMock.state.closeError;- }- },- })),- createOpenCodeSdkClient: vi.fn(- ({ baseUrl, serverPassword }: { baseUrl: string; serverPassword?: string }) => ({- session: {- create: vi.fn(async () => {- runtimeMock.state.sessionCreateUrls.push(baseUrl);- runtimeMock.state.authHeaders.push(- serverPassword ? `Basic ${btoa(`opencode:${serverPassword}`)}` : null,- );- return { data: { id: `${baseUrl}/session` } };- }),- abort: vi.fn(async ({ sessionID }: { sessionID: string }) => {- runtimeMock.state.abortCalls.push(sessionID);- }),- promptAsync: vi.fn(async () => {- if (runtimeMock.state.promptAsyncError) {- throw runtimeMock.state.promptAsyncError;- }- }),- messages: vi.fn(async () => ({ data: runtimeMock.state.messages })),- revert: vi.fn(- async ({ sessionID, messageID }: { sessionID: string; messageID?: string }) => {- runtimeMock.state.revertCalls.push({- sessionID,- ...(messageID ? { messageID } : {}),- });- if (!messageID) {- runtimeMock.state.messages = [];- return;- }-- const targetIndex = runtimeMock.state.messages.findIndex(- (entry) => entry.info.id === messageID,- );- runtimeMock.state.messages =- targetIndex >= 0- ? runtimeMock.state.messages.slice(0, targetIndex + 1)- : runtimeMock.state.messages;- },- ),+ connectToOpenCodeServer: ({ serverUrl }) =>+ Effect.gen(function* () {+ const url = serverUrl ?? "http://127.0.0.1:4301";+ // Unconditionally register a scope finalizer for test observability —+ // preserves the `closeCalls` / `closeError` probes that the existing+ // suites rely on. Production code never attaches a finalizer to an+ // external server (it simply returns `Effect.succeed(...)`).+ yield* Effect.addFinalizer(() =>+ Effect.sync(() => {+ runtimeMock.state.closeCalls.push(url);+ if (runtimeMock.state.closeError) {+ throw runtimeMock.state.closeError;+ }+ }),+ );+ return {+ url,+ exitCode: null,+ external: Boolean(serverUrl),+ };+ }),+ runOpenCodeCommand: () => Effect.succeed({ stdout: "", stderr: "", code: 0 }),+ createOpenCodeSdkClient: ({ baseUrl, serverPassword }) =>+ ({+ session: {+ create: async () => {+ runtimeMock.state.sessionCreateUrls.push(baseUrl);+ runtimeMock.state.authHeaders.push(+ serverPassword ? `Basic ${btoa(`opencode:${serverPassword}`)}` : null,+ );+ return { data: { id: `${baseUrl}/session` } };+ },+ abort: async ({ sessionID }: { sessionID: string }) => {+ runtimeMock.state.abortCalls.push(sessionID);},- event: {- subscribe: vi.fn(async () => ({- stream: (async function* () {- for (const event of runtimeMock.state.subscribedEvents) {- yield event;- }- })(),- })),+ promptAsync: async () => {+ if (runtimeMock.state.promptAsyncError) {+ throw runtimeMock.state.promptAsyncError;+ }},+ messages: async () => ({ data: runtimeMock.state.messages }),+ revert: async ({ sessionID, messageID }: { sessionID: string; messageID?: string }) => {+ runtimeMock.state.revertCalls.push({+ sessionID,+ ...(messageID ? { messageID } : {}),+ });+ if (!messageID) {+ runtimeMock.state.messages = [];+ return;+ }++ const targetIndex = runtimeMock.state.messages.findIndex(+ (entry) => entry.info.id === messageID,+ );+ runtimeMock.state.messages =+ targetIndex >= 0+ ? runtimeMock.state.messages.slice(0, targetIndex + 1)+ : runtimeMock.state.messages;+ },+ },+ event: {+ subscribe: async () => ({+ stream: (async function* () {+ for (const event of runtimeMock.state.subscribedEvents) {+ yield event;+ }+ })(),+ }),+ },+ }) as unknown as ReturnType<OpenCodeRuntimeShape["createOpenCodeSdkClient"]>,+ loadOpenCodeInventory: () =>+ Effect.fail(+ new OpenCodeRuntimeError({+ operation: "loadOpenCodeInventory",+ detail: "OpenCodeRuntimeTestDouble.loadOpenCodeInventory not used in this test",+ cause: null,}),),- };-});+};const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory, {upsert: () => Effect.void,@@ -148,6 +166,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory});const OpenCodeAdapterTestLayer = makeOpenCodeAdapterLive().pipe(+ Layer.provideMerge(Layer.succeed(OpenCodeRuntime, OpenCodeRuntimeTestDouble)),Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),Layer.provideMerge(ServerSettingsService.layerTest({@@ -211,7 +230,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {}),);- it.effect("clears session state when stopAll cleanup fails", () =>+ it.effect("clears session state even when cleanup finalizers throw", () =>Effect.gen(function* () {const adapter = yield* OpenCodeAdapter;yield* adapter.startSession({@@ -226,11 +245,14 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {});runtimeMock.state.closeError = new Error("close failed");- const error = yield* adapter.stopAll().pipe(Effect.flip);+ // `stopAll` relies on `stopOpenCodeContext`, which is typed as+ // never-failing. A throwing finalizer surfaces as a defect — `Effect.exit`+ // captures it so the assertions can still run. The key invariant we're+ // validating is "the sessions map and close-call probes reflect cleanup+ // attempts regardless of finalizer outcome".+ yield* Effect.exit(adapter.stopAll());const sessions = yield* adapter.listSessions();- assert.equal(error._tag, "ProviderAdapterProcessError");- assert.equal(error.detail, "Failed to stop 2 OpenCode sessions.");assert.deepEqual(runtimeMock.state.closeCalls, ["http://127.0.0.1:9999","http://127.0.0.1:9999",@@ -374,7 +396,10 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {close: () => Effect.void,};- const adapterLayer = makeOpenCodeAdapterLive({ nativeEventLogger }).pipe(+ const adapterLayer = makeOpenCodeAdapterLive({+ nativeEventLogger,+ }).pipe(+ Layer.provideMerge(Layer.succeed(OpenCodeRuntime, OpenCodeRuntimeTestDouble)),Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),Layer.provideMerge(ServerSettingsService.layerTest({@@ -450,7 +475,10 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {close: () => Effect.void,};- const adapterLayer = makeOpenCodeAdapterLive({ nativeEventLogger }).pipe(+ const adapterLayer = makeOpenCodeAdapterLive({+ nativeEventLogger,+ }).pipe(+ Layer.provideMerge(Layer.succeed(OpenCodeRuntime, OpenCodeRuntimeTestDouble)),Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),Layer.provideMerge(ServerSettingsService.layerTest({@@ -467,7 +495,13 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {Layer.provideMerge(NodeServices.layer),);- const sessions = yield* Effect.gen(function* () {+ // Capture closeCalls *inside* the provided layer scope: the adapter's+ // layer finalizer now tears down any live sessions when the layer+ // closes (which is exactly what we want for leak prevention), so+ // inspecting closeCalls after `Effect.provide` completes would observe+ // the teardown — not the behavior under test. We care that the event+ // pump kept the session alive while logging was failing.+ const { sessions, closeCallsDuringRun } = yield* Effect.gen(function* () {const adapter = yield* OpenCodeAdapter;yield* adapter.startSession({provider: "opencode",@@ -475,12 +509,15 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {runtimeMode: "full-access",});yield* sleep(10);- return yield* adapter.listSessions();+ return {+ sessions: yield* adapter.listSessions(),+ closeCallsDuringRun: [...runtimeMock.state.closeCalls],+ };}).pipe(Effect.provide(adapterLayer));assert.equal(sessions.length, 1);assert.equal(sessions[0]?.threadId, "thread-native-log-failure");- assert.deepEqual(runtimeMock.state.closeCalls, []);+ assert.deepEqual(closeCallsDuringRun, []);}),);});diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.tsindex 4e3c12ef5..5081495dc 100644--- a/apps/server/src/provider/Layers/OpenCodeAdapter.ts+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.ts@@ -11,7 +11,7 @@ import {TurnId,type UserInputQuestion,} from "@t3tools/contracts";-import { Cause, Effect, Layer, Queue, Stream } from "effect";+import { Cause, Effect, Exit, Layer, Queue, Ref, Scope, Stream } from "effect";import type { OpencodeClient, Part, PermissionRequest, QuestionRequest } from "@opencode-ai/sdk/v2";import { resolveAttachmentPath } from "../../attachmentStore.ts";@@ -28,10 +28,12 @@ import {import { OpenCodeAdapter, type OpenCodeAdapterShape } from "../Services/OpenCodeAdapter.ts";import {buildOpenCodePermissionRules,- connectToOpenCodeServer,- createOpenCodeSdkClient,+ OpenCodeRuntime,+ OpenCodeRuntimeError,openCodeQuestionId,+ openCodeRuntimeErrorDetail,parseOpenCodeModelSlug,+ runOpenCodeSdk,toOpenCodeFileParts,toOpenCodePermissionReply,toOpenCodeQuestionAnswers,@@ -45,6 +47,13 @@ interface OpenCodeTurnSnapshot {readonly items: Array<unknown>;}+type OpenCodeSubscribedEvent =+ Awaited<ReturnType<OpencodeClient["event"]["subscribe"]>> extends {+ readonly stream: AsyncIterable<infer TEvent>;+ }+ ? TEvent+ : never;+interface OpenCodeSessionContext {session: ProviderSession;readonly client: OpencodeClient;@@ -61,8 +70,21 @@ interface OpenCodeSessionContext {activeTurnId: TurnId | undefined;activeAgent: string | undefined;activeVariant: string | undefined;- stopped: boolean;- readonly eventsAbortController: AbortController;+ /**+ * One-shot guard flipped by `stopOpenCodeContext` / `emitUnexpectedExit`.+ * The session lifecycle is owned by `sessionScope`; this Ref exists only+ * so concurrent callers can race the transition safely via `getAndSet`.+ */+ readonly stopped: Ref.Ref<boolean>;+ /**+ * Sole lifecycle handle for the session. Closing this scope:+ * - aborts the `AbortController` registered as a finalizer+ * (cancels the in-flight `event.subscribe` fetch),+ * - interrupts the event-pump and server-exit fibers forked+ * via `Effect.forkIn(sessionScope)`,+ * - tears down the OpenCode server process for scope-owned servers.+ */+ readonly sessionScope: Scope.Closeable;}export interface OpenCodeAdapterLiveOptions {@@ -74,14 +96,33 @@ function nowIso(): string {return new Date().toISOString();}-function isProviderAdapterRequestError(cause: unknown): cause is ProviderAdapterRequestError {- return (- typeof cause === "object" &&- cause !== null &&- "_tag" in cause &&- cause._tag === "ProviderAdapterRequestError"- );-}+/**+ * Map a tagged OpenCodeRuntimeError produced by {@link runOpenCodeSdk} into+ * the adapter-boundary `ProviderAdapterRequestError`. SDK-method-level call+ * sites pipe through this in `Effect.mapError` so they never build the error+ * shape by hand.+ */+const toRequestError = (cause: OpenCodeRuntimeError): ProviderAdapterRequestError =>+ new ProviderAdapterRequestError({+ provider: PROVIDER,+ method: cause.operation,+ detail: cause.detail,+ cause: cause.cause,+ });++/**+ * Map a `Cause.squash`-ed failure into a `ProviderAdapterProcessError`. The+ * typed cause is usually an `OpenCodeRuntimeError` (from {@link runOpenCodeSdk}),+ * in which case we preserve its `detail`; otherwise we fall back to+ * {@link openCodeRuntimeErrorDetail} for unknown causes (defects, etc.).+ */+const toProcessError = (threadId: ThreadId, cause: unknown): ProviderAdapterProcessError =>+ new ProviderAdapterProcessError({+ provider: PROVIDER,+ threadId,+ detail: OpenCodeRuntimeError.is(cause) ? cause.detail : openCodeRuntimeErrorDetail(cause),+ cause,+ });function buildEventBase(input: {readonly threadId: ThreadId;@@ -205,7 +246,10 @@ function ensureSessionContext(if (!session) {throw new ProviderAdapterSessionNotFoundError({ provider: PROVIDER, threadId });}- if (session.stopped) {+ // `ensureSessionContext` is a sync gate used from both sync helpers and+ // Effect bodies. `Ref.getUnsafe` is an atomic read of the backing cell —+ // no fiber suspension required, which keeps this callable everywhere.+ if (Ref.getUnsafe(session.stopped)) {throw new ProviderAdapterSessionClosedError({ provider: PROVIDER, threadId });}return session;@@ -369,73 +413,119 @@ function updateProviderSession(return nextSession;}-async function stopOpenCodeContext(context: OpenCodeSessionContext): Promise<void> {- context.stopped = true;- context.eventsAbortController.abort();- try {- await context.client.session- .abort({ sessionID: context.openCodeSessionId })- .catch(() => undefined);- } catch {}- context.server.close();-}+const stopOpenCodeContext = Effect.fn("stopOpenCodeContext")(function* (+ context: OpenCodeSessionContext,+) {+ // Race-safe one-shot: first caller flips the flag, everyone else no-ops.+ if (yield* Ref.getAndSet(context.stopped, true)) {+ return;+ }++ // Best-effort remote abort. The scope close below tears down the local+ // handles (event-pump fiber, server-exit fiber, event-subscribe fetch),+ // but we still want to tell OpenCode that this session is done.+ yield* runOpenCodeSdk("session.abort", () =>+ context.client.session.abort({ sessionID: context.openCodeSessionId }),+ ).pipe(Effect.ignore({ log: true }));-export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {+ // Closing the session scope interrupts every fiber forked into it and+ // runs each finalizer we registered — the `AbortController.abort()` call,+ // the child-process termination, etc.+ yield* Scope.close(context.sessionScope, Exit.void);+});++export function makeOpenCodeAdapterLive(options?: OpenCodeAdapterLiveOptions) {return Layer.effect(OpenCodeAdapter,Effect.gen(function* () {const serverConfig = yield* ServerConfig;const serverSettings = yield* ServerSettingsService;- const services = yield* Effect.context<never>();+ const openCodeRuntime = yield* OpenCodeRuntime;const nativeEventLogger =- _options?.nativeEventLogger ??- (_options?.nativeEventLogPath !== undefined- ? yield* makeEventNdjsonLogger(_options.nativeEventLogPath, {+ options?.nativeEventLogger ??+ (options?.nativeEventLogPath !== undefined+ ? yield* makeEventNdjsonLogger(options.nativeEventLogPath, {stream: "native",}): undefined);+ // Only close loggers we created. If the caller passed one in via+ // `options.nativeEventLogger`, they own its lifecycle.+ const managedNativeEventLogger =+ options?.nativeEventLogger === undefined ? nativeEventLogger : undefined;const runtimeEvents = yield* Queue.unbounded<ProviderRuntimeEvent>();const sessions = new Map<ThreadId, OpenCodeSessionContext>();+ // Layer-level finalizer: when the adapter layer shuts down, stop every+ // session. Each session's `Scope.close` tears down its spawned OpenCode+ // server (via the `ChildProcessSpawner` finalizer installed in+ // `startOpenCodeServerProcess`) and interrupts the forked event/exit+ // fibers. Consumers that can't reason about Effect scopes therefore+ // cannot leak OpenCode child processes by forgetting to call `stopAll`.+ yield* Effect.addFinalizer(() =>+ Effect.gen(function* () {+ const contexts = [...sessions.values()];+ sessions.clear();+ // `ignoreCause` swallows both typed failures (none here) and defects+ // from throwing scope finalizers so a sibling's death can't interrupt+ // the remaining cleanups.+ yield* Effect.forEach(+ contexts,+ (context) => Effect.ignoreCause(stopOpenCodeContext(context)),+ { concurrency: "unbounded", discard: true },+ );+ // Close the logger AFTER session teardown so any final lifecycle+ // events emitted during shutdown still get written. `close` flushes+ // the `Logger.batched` window and closes each per-thread+ // `RotatingFileSink` handle owned by the logger's internal scope.+ if (managedNativeEventLogger !== undefined) {+ yield* managedNativeEventLogger.close();+ }+ }),+ );+const emit = (event: ProviderRuntimeEvent) =>Queue.offer(runtimeEvents, event).pipe(Effect.asVoid);- const emitPromise = (event: ProviderRuntimeEvent) =>- emit(event).pipe(Effect.runPromiseWith(services));- const writeNativeEventPromise = (+ const writeNativeEvent = (threadId: ThreadId,event: {readonly observedAt: string;readonly event: Record<string, unknown>;},- ) =>- (nativeEventLogger ? nativeEventLogger.write(event, threadId) : Effect.void).pipe(- Effect.runPromiseWith(services),- );+ ) => (nativeEventLogger ? nativeEventLogger.write(event, threadId) : Effect.void);const writeNativeEventBestEffort = (threadId: ThreadId,event: {readonly observedAt: string;readonly event: Record<string, unknown>;},- ) => writeNativeEventPromise(threadId, event).catch(() => undefined);+ ) => writeNativeEvent(threadId, event).pipe(Effect.catchCause(() => Effect.void));- const emitUnexpectedExit = (context: OpenCodeSessionContext, message: string) => {- if (context.stopped) {+ const emitUnexpectedExit = Effect.fn("emitUnexpectedExit")(function* (+ context: OpenCodeSessionContext,+ message: string,+ ) {+ // Atomic one-shot: two fibers can race here (the event-pump on stream+ // failure and the server-exit watcher). `getAndSet` flips the flag in+ // a single step so the loser observes `true` and returns; a plain+ // `Ref.get` would let both racers slip past and emit duplicates.+ if (yield* Ref.getAndSet(context.stopped, true)) {return;}- context.stopped = true;- sessions.delete(context.session.threadId);- context.server.close();const turnId = context.activeTurnId;- void emitPromise({+ sessions.delete(context.session.threadId);+ // Emit lifecycle events BEFORE tearing down the scope. Both call sites+ // run this inside a fiber forked via `Effect.forkIn(context.sessionScope)`;+ // closing that scope triggers the fiber-interrupt finalizer, so any+ // subsequent yield point would unwind and silently drop these emits.+ yield* emit({...buildEventBase({ threadId: context.session.threadId, turnId }),type: "runtime.error",payload: {message,class: "transport_error",},- }).catch(() => undefined);- void emitPromise({+ }).pipe(Effect.ignore);+ yield* emit({...buildEventBase({ threadId: context.session.threadId, turnId }),type: "session.exited",payload: {@@ -443,16 +533,23 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {recoverable: false,exitKind: "error",},- }).catch(() => undefined);- };+ }).pipe(Effect.ignore);+ // Inline the teardown that `stopOpenCodeContext` would do; we can't+ // delegate to it because our `getAndSet` above already flipped the+ // one-shot guard, so the call would no-op.+ yield* runOpenCodeSdk("session.abort", () =>+ context.client.session.abort({ sessionID: context.openCodeSessionId }),+ ).pipe(Effect.ignore({ log: true }));+ yield* Scope.close(context.sessionScope, Exit.void);+ });/** Emit content.delta and item.completed events for an assistant text part. */- const emitAssistantTextDelta = async (+ const emitAssistantTextDelta = Effect.fn("emitAssistantTextDelta")(function* (context: OpenCodeSessionContext,part: Part,turnId: TurnId | undefined,raw: unknown,- ): Promise<void> => {+ ) {const text = textFromPart(part);if (text === undefined) {return;@@ -469,7 +566,7 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {);}if (deltaToEmit.length > 0) {- await emitPromise({+ yield* emit({...buildEventBase({threadId: context.session.threadId,turnId,@@ -494,7 +591,7 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {!context.completedAssistantPartIds.has(part.id)) {context.completedAssistantPartIds.add(part.id);- await emitPromise({+ yield* emit({...buildEventBase({threadId: context.session.threadId,turnId,@@ -511,346 +608,383 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {},});}- };-- const startEventPump = (context: OpenCodeSessionContext) => {- void (async () => {- try {- const subscription = await context.client.event.subscribe(undefined, {- signal: context.eventsAbortController.signal,- });+ });- for await (const event of subscription.stream) {- const payloadSessionId =- "properties" in event- ? (event.properties as { sessionID?: unknown }).sessionID- : undefined;- if (payloadSessionId !== context.openCodeSessionId) {- continue;- }+ const handleSubscribedEvent = Effect.fn("handleSubscribedEvent")(function* (+ context: OpenCodeSessionContext,+ event: OpenCodeSubscribedEvent,+ ) {+ const payloadSessionId =+ "properties" in event+ ? (event.properties as { sessionID?: unknown }).sessionID+ : undefined;+ if (payloadSessionId !== context.openCodeSessionId) {+ return;+ }- const turnId = context.activeTurnId;- await writeNativeEventBestEffort(context.session.threadId, {- observedAt: nowIso(),- event: {- provider: PROVIDER,- threadId: context.session.threadId,- providerThreadId: context.openCodeSessionId,- type: event.type,- ...(turnId ? { turnId } : {}),- payload: event,- },- });+ const turnId = context.activeTurnId;+ yield* writeNativeEventBestEffort(context.session.threadId, {+ observedAt: nowIso(),+ event: {+ provider: PROVIDER,+ threadId: context.session.threadId,+ providerThreadId: context.openCodeSessionId,+ type: event.type,+ ...(turnId ? { turnId } : {}),+ payload: event,+ },+ });- switch (event.type) {- case "message.updated": {- context.messageRoleById.set(event.properties.info.id, event.properties.info.role);- if (event.properties.info.role === "assistant") {- for (const part of context.partById.values()) {- if (part.messageID !== event.properties.info.id) {- continue;- }- await emitAssistantTextDelta(context, part, turnId, event);- }- }- break;+ switch (event.type) {+ case "message.updated": {+ context.messageRoleById.set(event.properties.info.id, event.properties.info.role);+ if (event.properties.info.role === "assistant") {+ for (const part of context.partById.values()) {+ if (part.messageID !== event.properties.info.id) {+ continue;}+ yield* emitAssistantTextDelta(context, part, turnId, event);+ }+ }+ break;+ }- case "message.removed": {- context.messageRoleById.delete(event.properties.messageID);- break;- }+ case "message.removed": {+ context.messageRoleById.delete(event.properties.messageID);+ break;+ }- case "message.part.delta": {- const existingPart = context.partById.get(event.properties.partID);- if (!existingPart) {- break;- }- const role = messageRoleForPart(context, existingPart);- if (role !== "assistant") {- break;- }- const streamKind = resolveTextStreamKind(existingPart);- const delta = event.properties.delta;- if (delta.length === 0) {- break;- }- const previousText =- context.emittedTextByPartId.get(event.properties.partID) ??- textFromPart(existingPart) ??- "";- const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(- previousText,- delta,- );- if (deltaToEmit.length === 0) {- break;- }- context.emittedTextByPartId.set(event.properties.partID, nextText);- if (existingPart.type === "text" || existingPart.type === "reasoning") {- context.partById.set(event.properties.partID, {- ...existingPart,- text: nextText,- });- }- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId,- itemId: event.properties.partID,- raw: event,- }),- type: "content.delta",- payload: {- streamKind,- delta: deltaToEmit,- },- });- break;- }+ case "message.part.delta": {+ const existingPart = context.partById.get(event.properties.partID);+ if (!existingPart) {+ break;+ }+ const role = messageRoleForPart(context, existingPart);+ if (role !== "assistant") {+ break;+ }+ const streamKind = resolveTextStreamKind(existingPart);+ const delta = event.properties.delta;+ if (delta.length === 0) {+ break;+ }+ const previousText =+ context.emittedTextByPartId.get(event.properties.partID) ??+ textFromPart(existingPart) ??+ "";+ const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(previousText, delta);+ if (deltaToEmit.length === 0) {+ break;+ }+ context.emittedTextByPartId.set(event.properties.partID, nextText);+ if (existingPart.type === "text" || existingPart.type === "reasoning") {+ context.partById.set(event.properties.partID, {+ ...existingPart,+ text: nextText,+ });+ }+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ itemId: event.properties.partID,+ raw: event,+ }),+ type: "content.delta",+ payload: {+ streamKind,+ delta: deltaToEmit,+ },+ });+ break;+ }- case "message.part.updated": {- const part = event.properties.part;- context.partById.set(part.id, part);- const messageRole = messageRoleForPart(context, part);-- if (messageRole === "assistant") {- await emitAssistantTextDelta(context, part, turnId, event);- }-- if (part.type === "tool") {- const itemType = toToolLifecycleItemType(part.tool);- const title =- part.state.status === "running" ? (part.state.title ?? part.tool) : part.tool;- const detail = detailFromToolPart(part);- const payload = {- itemType,- ...(part.state.status === "error"- ? { status: "failed" as const }- : part.state.status === "completed"- ? { status: "completed" as const }- : { status: "inProgress" as const }),- ...(title ? { title } : {}),- ...(detail ? { detail } : {}),- data: {- tool: part.tool,- state: part.state,- },- };- const runtimeEvent: ProviderRuntimeEvent = {- ...buildEventBase({- threadId: context.session.threadId,- turnId,- itemId: part.callID,- createdAt: toolStateCreatedAt(part),- raw: event,- }),- type:- part.state.status === "pending"- ? "item.started"- : part.state.status === "completed" || part.state.status === "error"- ? "item.completed"- : "item.updated",- payload,- };- appendTurnItem(context, turnId, part);- await emitPromise(runtimeEvent);- }- break;- }+ case "message.part.updated": {+ const part = event.properties.part;+ context.partById.set(part.id, part);+ const messageRole = messageRoleForPart(context, part);- case "permission.asked": {- context.pendingPermissions.set(event.properties.id, event.properties);- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId,- requestId: event.properties.id,- raw: event,- }),- type: "request.opened",- payload: {- requestType: mapPermissionToRequestType(event.properties.permission),- detail:- event.properties.patterns.length > 0- ? event.properties.patterns.join("\n")- : event.properties.permission,- args: event.properties.metadata,- },- });- break;- }+ if (messageRole === "assistant") {+ yield* emitAssistantTextDelta(context, part, turnId, event);+ }- case "permission.replied": {- context.pendingPermissions.delete(event.properties.requestID);- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId,- requestId: event.properties.requestID,- raw: event,- }),- type: "request.resolved",- payload: {- requestType: "unknown",- decision: mapPermissionDecision(event.properties.reply),- },- });- break;- }+ if (part.type === "tool") {+ const itemType = toToolLifecycleItemType(part.tool);+ const title =+ part.state.status === "running" ? (part.state.title ?? part.tool) : part.tool;+ const detail = detailFromToolPart(part);+ const payload = {+ itemType,+ ...(part.state.status === "error"+ ? { status: "failed" as const }+ : part.state.status === "completed"+ ? { status: "completed" as const }+ : { status: "inProgress" as const }),+ ...(title ? { title } : {}),+ ...(detail ? { detail } : {}),+ data: {+ tool: part.tool,+ state: part.state,+ },+ };+ const runtimeEvent: ProviderRuntimeEvent = {+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ itemId: part.callID,+ createdAt: toolStateCreatedAt(part),+ raw: event,+ }),+ type:+ part.state.status === "pending"+ ? "item.started"+ : part.state.status === "completed" || part.state.status === "error"+ ? "item.completed"+ : "item.updated",+ payload,+ };+ appendTurnItem(context, turnId, part);+ yield* emit(runtimeEvent);+ }+ break;+ }- case "question.asked": {- context.pendingQuestions.set(event.properties.id, event.properties);- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId,- requestId: event.properties.id,- raw: event,- }),- type: "user-input.requested",- payload: {- questions: normalizeQuestionRequest(event.properties),- },- });- break;- }+ case "permission.asked": {+ context.pendingPermissions.set(event.properties.id, event.properties);+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ requestId: event.properties.id,+ raw: event,+ }),+ type: "request.opened",+ payload: {+ requestType: mapPermissionToRequestType(event.properties.permission),+ detail:+ event.properties.patterns.length > 0+ ? event.properties.patterns.join("\n")+ : event.properties.permission,+ args: event.properties.metadata,+ },+ });+ break;+ }- case "question.replied": {- const request = context.pendingQuestions.get(event.properties.requestID);- context.pendingQuestions.delete(event.properties.requestID);- const answers = Object.fromEntries(- (request?.questions ?? []).map((question, index) => [- openCodeQuestionId(index, question),- event.properties.answers[index]?.join(", ") ?? "",- ]),- );- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId,- requestId: event.properties.requestID,- raw: event,- }),- type: "user-input.resolved",- payload: { answers },- });- break;- }+ case "permission.replied": {+ context.pendingPermissions.delete(event.properties.requestID);+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ requestId: event.properties.requestID,+ raw: event,+ }),+ type: "request.resolved",+ payload: {+ requestType: "unknown",+ decision: mapPermissionDecision(event.properties.reply),+ },+ });+ break;+ }- case "question.rejected": {- context.pendingQuestions.delete(event.properties.requestID);- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId,- requestId: event.properties.requestID,- raw: event,- }),- type: "user-input.resolved",- payload: { answers: {} },- });- break;- }+ case "question.asked": {+ context.pendingQuestions.set(event.properties.id, event.properties);+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ requestId: event.properties.id,+ raw: event,+ }),+ type: "user-input.requested",+ payload: {+ questions: normalizeQuestionRequest(event.properties),+ },+ });+ break;+ }- case "session.status": {- if (event.properties.status.type === "busy") {- updateProviderSession(context, { status: "running", activeTurnId: turnId });- }-- if (event.properties.status.type === "retry") {- await emitPromise({- ...buildEventBase({ threadId: context.session.threadId, turnId, raw: event }),- type: "runtime.warning",- payload: {- message: event.properties.status.message,- detail: event.properties.status,- },- });- break;- }-- if (event.properties.status.type === "idle" && turnId) {- context.activeTurnId = undefined;- updateProviderSession(- context,- { status: "ready" },- { clearActiveTurnId: true },- );- await emitPromise({- ...buildEventBase({ threadId: context.session.threadId, turnId, raw: event }),- type: "turn.completed",- payload: {- state: "completed",- },- });- }- break;- }+ case "question.replied": {+ const request = context.pendingQuestions.get(event.properties.requestID);+ context.pendingQuestions.delete(event.properties.requestID);+ const answers = Object.fromEntries(+ (request?.questions ?? []).map((question, index) => [+ openCodeQuestionId(index, question),+ event.properties.answers[index]?.join(", ") ?? "",+ ]),+ );+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ requestId: event.properties.requestID,+ raw: event,+ }),+ type: "user-input.resolved",+ payload: { answers },+ });+ break;+ }- case "session.error": {- const message = sessionErrorMessage(event.properties.error);- const activeTurnId = context.activeTurnId;- context.activeTurnId = undefined;- updateProviderSession(- context,- {- status: "error",- lastError: message,- },- { clearActiveTurnId: true },- );- if (activeTurnId) {- await emitPromise({- ...buildEventBase({- threadId: context.session.threadId,- turnId: activeTurnId,- raw: event,- }),- type: "turn.completed",- payload: {- state: "failed",- errorMessage: message,- },- });- }- await emitPromise({- ...buildEventBase({ threadId: context.session.threadId, raw: event }),- type: "runtime.error",- payload: {- message,- class: "provider_error",- detail: event.properties.error,- },- });- break;- }+ case "question.rejected": {+ context.pendingQuestions.delete(event.properties.requestID);+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId,+ requestId: event.properties.requestID,+ raw: event,+ }),+ type: "user-input.resolved",+ payload: { answers: {} },+ });+ break;+ }- default:- break;- }+ case "session.status": {+ if (event.properties.status.type === "busy") {+ updateProviderSession(context, { status: "running", activeTurnId: turnId });+ }++ if (event.properties.status.type === "retry") {+ yield* emit({+ ...buildEventBase({ threadId: context.session.threadId, turnId, raw: event }),+ type: "runtime.warning",+ payload: {+ message: event.properties.status.message,+ detail: event.properties.status,+ },+ });+ break;}- } catch (error) {- if (context.eventsAbortController.signal.aborted || context.stopped) {- return;++ if (event.properties.status.type === "idle" && turnId) {+ context.activeTurnId = undefined;+ updateProviderSession(context, { status: "ready" }, { clearActiveTurnId: true });+ yield* emit({+ ...buildEventBase({ threadId: context.session.threadId, turnId, raw: event }),+ type: "turn.completed",+ payload: {+ state: "completed",+ },+ });}- emitUnexpectedExit(+ break;+ }++ case "session.error": {+ const message = sessionErrorMessage(event.properties.error);+ const activeTurnId = context.activeTurnId;+ context.activeTurnId = undefined;+ updateProviderSession(context,- error instanceof Error ? error.message : "OpenCode event stream failed.",+ {+ status: "error",+ lastError: message,+ },+ { clearActiveTurnId: true },);+ if (activeTurnId) {+ yield* emit({+ ...buildEventBase({+ threadId: context.session.threadId,+ turnId: activeTurnId,+ raw: event,+ }),+ type: "turn.completed",+ payload: {+ state: "failed",+ errorMessage: message,+ },+ });+ }+ yield* emit({+ ...buildEventBase({ threadId: context.session.threadId, raw: event }),+ type: "runtime.error",+ payload: {+ message,+ class: "provider_error",+ detail: event.properties.error,+ },+ });+ break;}- })();- context.server.process?.once("exit", (code, signal) => {- if (context.stopped) {- return;- }- emitUnexpectedExit(- context,- `OpenCode server exited unexpectedly (${signal ?? code ?? "unknown"}).`,+ default:+ break;+ }+ });++ const startEventPump = Effect.fn("startEventPump")(function* (+ context: OpenCodeSessionContext,+ ) {+ // One AbortController per session scope. The finalizer fires when+ // the scope closes (explicit stop, unexpected exit, or layer+ // shutdown) and cancels the in-flight `event.subscribe` fetch so+ // the async iterable unwinds cleanly.+ const eventsAbortController = new AbortController();+ yield* Scope.addFinalizer(+ context.sessionScope,+ Effect.sync(() => eventsAbortController.abort()),+ );++ // Fibers forked into `context.sessionScope` are interrupted+ // automatically when the scope closes — no bookkeeping required.+ yield* Effect.flatMap(+ runOpenCodeSdk("event.subscribe", () =>+ context.client.event.subscribe(undefined, {+ signal: eventsAbortController.signal,+ }),+ ),+ (subscription) =>+ Stream.fromAsyncIterable(+ subscription.stream,+ (cause) =>+ new OpenCodeRuntimeError({+ operation: "event.subscribe",+ detail: openCodeRuntimeErrorDetail(cause),+ cause,+ }),+ ).pipe(Stream.runForEach((event) => handleSubscribedEvent(context, event))),+ ).pipe(+ Effect.exit,+ Effect.flatMap((exit) =>+ Effect.gen(function* () {+ // Expected paths: caller aborted the fetch or the session+ // has already been marked stopped. Treat as a clean exit.+ if (eventsAbortController.signal.aborted || (yield* Ref.get(context.stopped))) {+ return;+ }+ if (Exit.isFailure(exit)) {+ yield* emitUnexpectedExit(+ context,+ openCodeRuntimeErrorDetail(Cause.squash(exit.cause)),+ );+ }+ }),+ ),+ Effect.forkIn(context.sessionScope),+ );++ if (!context.server.external && context.server.exitCode !== null) {+ yield* context.server.exitCode.pipe(+ Effect.flatMap((code) =>+ Effect.gen(function* () {+ if (yield* Ref.get(context.stopped)) {+ return;+ }+ yield* emitUnexpectedExit(+ context,+ `OpenCode server exited unexpectedly (${code}).`,+ );+ }),+ ),+ Effect.forkIn(context.sessionScope),);- });- };+ }+ });const startSession: OpenCodeAdapterShape["startSession"] = Effect.fn("startSession")(function* (input) {@@ -871,44 +1005,46 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {const directory = input.cwd ?? serverConfig.cwd;const existing = sessions.get(input.threadId);if (existing) {- yield* Effect.tryPromise({- try: () => stopOpenCodeContext(existing),- catch: (cause) =>- new ProviderAdapterProcessError({- provider: PROVIDER,- threadId: input.threadId,- detail: "Failed to stop existing OpenCode session.",- cause,- }),- });+ yield* stopOpenCodeContext(existing);sessions.delete(input.threadId);}- const started = yield* Effect.tryPromise({- try: async () => {- const server = await connectToOpenCodeServer({ binaryPath, serverUrl });- const client = createOpenCodeSdkClient({- baseUrl: server.url,- directory,- ...(server.external && serverPassword ? { serverPassword } : {}),- });- const openCodeSession = await client.session.create({- title: `T3 Code ${input.threadId}`,- permission: buildOpenCodePermissionRules(input.runtimeMode),- });- if (!openCodeSession.data) {- throw new Error("OpenCode session.create returned no session payload.");- }- return { server, client, openCodeSession: openCodeSession.data };- },- catch: (cause) =>- new ProviderAdapterProcessError({- provider: PROVIDER,- threadId: input.threadId,- detail:- cause instanceof Error ? cause.message : "Failed to start OpenCode session.",- cause,- }),+ const started = yield* Effect.gen(function* () {+ const sessionScope = yield* Scope.make();+ const startedExit = yield* Effect.exit(+ Effect.gen(function* () {+ // The runtime binds the server's lifetime to the Scope.Scope+ // we provide below — closing `sessionScope` kills the child+ // process automatically. No manual `server.close()` needed.+ const server = yield* openCodeRuntime.connectToOpenCodeServer({+ binaryPath,+ serverUrl,+ });+ const client = openCodeRuntime.createOpenCodeSdkClient({+ baseUrl: server.url,+ directory,+ ...(server.external && serverPassword ? { serverPassword } : {}),+ });+ const openCodeSession = yield* runOpenCodeSdk("session.create", () =>+ client.session.create({+ title: `T3 Code ${input.threadId}`,+ permission: buildOpenCodePermissionRules(input.runtimeMode),+ }),+ );+ if (!openCodeSession.data) {+ return yield* new OpenCodeRuntimeError({+ operation: "session.create",+ detail: "OpenCode session.create returned no session payload.",+ });+ }+ return { sessionScope, server, client, openCodeSession: openCodeSession.data };+ }).pipe(Effect.provideService(Scope.Scope, sessionScope)),+ );+ if (Exit.isFailure(startedExit)) {+ yield* Scope.close(sessionScope, Exit.void).pipe(Effect.ignore);+ return yield* toProcessError(input.threadId, Cause.squash(startedExit.cause));+ }+ return startedExit.value;});// Guard against a concurrent startSession call that may have raced@@ -917,14 +1053,10 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {if (raceWinner) {// Another call won the race – clean up the session we just created// (including the remote SDK session) and return the existing one.- yield* Effect.tryPromise({- try: () =>- started.client.session- .abort({ sessionID: started.openCodeSession.id })- .catch(() => undefined),- catch: () => undefined,- }).pipe(Effect.ignore);- started.server.close();+ yield* runOpenCodeSdk("session.abort", () =>+ started.client.session.abort({ sessionID: started.openCodeSession.id }),+ ).pipe(Effect.ignore);+ yield* Scope.close(started.sessionScope, Exit.void).pipe(Effect.ignore);return raceWinner.session;}@@ -956,11 +1088,11 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {activeTurnId: undefined,activeAgent: undefined,activeVariant: undefined,- stopped: false,- eventsAbortController: new AbortController(),+ stopped: yield* Ref.make(false),+ sessionScope: started.sessionScope,};sessions.set(input.threadId, context);- startEventPump(context);+ yield* startEventPump(context);yield* emit({...buildEventBase({ threadId: input.threadId }),@@ -1043,59 +1175,44 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {},});- const promptExit = yield* Effect.exit(- Effect.tryPromise({- try: async () => {- await context.client.session.promptAsync({- sessionID: context.openCodeSessionId,- model: parsedModel,- ...(context.activeAgent ? { agent: context.activeAgent } : {}),- ...(context.activeVariant ? { variant: context.activeVariant } : {}),- parts: [...(text ? [{ type: "text" as const, text }] : []), ...fileParts],- });- },- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "session.promptAsync",- detail: cause instanceof Error ? cause.message : "Failed to send OpenCode turn.",- cause,- }),+ yield* runOpenCodeSdk("session.promptAsync", () =>+ context.client.session.promptAsync({+ sessionID: context.openCodeSessionId,+ model: parsedModel,+ ...(context.activeAgent ? { agent: context.activeAgent } : {}),+ ...(context.activeVariant ? { variant: context.activeVariant } : {}),+ parts: [...(text ? [{ type: "text" as const, text }] : []), ...fileParts],}),- );- if (promptExit._tag === "Failure") {- const failure = Cause.squash(promptExit.cause);- const requestError = isProviderAdapterRequestError(failure)- ? failure- : new ProviderAdapterRequestError({- provider: PROVIDER,- method: "session.promptAsync",- detail:- failure instanceof Error ? failure.message : "Failed to send OpenCode turn.",- cause: failure,+ ).pipe(+ Effect.mapError(toRequestError),+ // On failure: clear active-turn state, flip the session back to ready+ // with lastError set, emit turn.aborted, then let the typed error+ // propagate. We don't need to rebuild the error here — `toRequestError`+ // already produced the right shape.+ Effect.tapError((requestError) =>+ Effect.gen(function* () {+ context.activeTurnId = undefined;+ context.activeAgent = undefined;+ context.activeVariant = undefined;+ updateProviderSession(+ context,+ {+ status: "ready",+ model: modelSelection?.model ?? context.session.model,+ lastError: requestError.detail,+ },+ { clearActiveTurnId: true },+ );+ yield* emit({+ ...buildEventBase({ threadId: input.threadId, turnId }),+ type: "turn.aborted",+ payload: {+ reason: requestError.detail,+ },});- const failureMessage = requestError.detail;- context.activeTurnId = undefined;- context.activeAgent = undefined;- context.activeVariant = undefined;- updateProviderSession(- context,- {- status: "ready",- model: modelSelection?.model ?? context.session.model,- lastError: failureMessage,- },- { clearActiveTurnId: true },- );- yield* emit({- ...buildEventBase({ threadId: input.threadId, turnId }),- type: "turn.aborted",- payload: {- reason: failureMessage,- },- });- return yield* requestError;- }+ }),+ ),+ );return {threadId: input.threadId,@@ -1106,16 +1223,9 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {const interruptTurn: OpenCodeAdapterShape["interruptTurn"] = Effect.fn("interruptTurn")(function* (threadId, turnId) {const context = ensureSessionContext(sessions, threadId);- yield* Effect.tryPromise({- try: () => context.client.session.abort({ sessionID: context.openCodeSessionId }),- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "session.abort",- detail: cause instanceof Error ? cause.message : "Failed to abort OpenCode turn.",- cause,- }),- });+ yield* runOpenCodeSdk("session.abort", () =>+ context.client.session.abort({ sessionID: context.openCodeSessionId }),+ ).pipe(Effect.mapError(toRequestError));if (turnId ?? context.activeTurnId) {yield* emit({...buildEventBase({ threadId, turnId: turnId ?? context.activeTurnId }),@@ -1140,23 +1250,12 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {});}- yield* Effect.tryPromise({- try: () =>- context.client.permission.reply({- requestID: requestId,- reply: toOpenCodePermissionReply(decision),- }),- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "permission.reply",- detail:- cause instanceof Error- ? cause.message- : "Failed to submit OpenCode permission reply.",- cause,- }),- });+ yield* runOpenCodeSdk("permission.reply", () =>+ context.client.permission.reply({+ requestID: requestId,+ reply: toOpenCodePermissionReply(decision),+ }),+ ).pipe(Effect.mapError(toRequestError));});const respondToUserInput: OpenCodeAdapterShape["respondToUserInput"] = Effect.fn(@@ -1172,35 +1271,18 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {});}- yield* Effect.tryPromise({- try: () =>- context.client.question.reply({- requestID: requestId,- answers: toOpenCodeQuestionAnswers(request, answers),- }),- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "question.reply",- detail: cause instanceof Error ? cause.message : "Failed to submit OpenCode answers.",- cause,- }),- });+ yield* runOpenCodeSdk("question.reply", () =>+ context.client.question.reply({+ requestID: requestId,+ answers: toOpenCodeQuestionAnswers(request, answers),+ }),+ ).pipe(Effect.mapError(toRequestError));});const stopSession: OpenCodeAdapterShape["stopSession"] = Effect.fn("stopSession")(function* (threadId) {const context = ensureSessionContext(sessions, threadId);- yield* Effect.tryPromise({- try: () => stopOpenCodeContext(context),- catch: (cause) =>- new ProviderAdapterProcessError({- provider: PROVIDER,- threadId,- detail: cause instanceof Error ? cause.message : "Failed to stop OpenCode session.",- cause,- }),- });+ yield* stopOpenCodeContext(context);sessions.delete(threadId);yield* emit({...buildEventBase({ threadId }),@@ -1223,16 +1305,9 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {const readThread: OpenCodeAdapterShape["readThread"] = Effect.fn("readThread")(function* (threadId) {const context = ensureSessionContext(sessions, threadId);- const messages = yield* Effect.tryPromise({- try: () => context.client.session.messages({ sessionID: context.openCodeSessionId }),- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "session.messages",- detail: cause instanceof Error ? cause.message : "Failed to read OpenCode thread.",- cause,- }),- });+ const messages = yield* runOpenCodeSdk("session.messages", () =>+ context.client.session.messages({ sessionID: context.openCodeSessionId }),+ ).pipe(Effect.mapError(toRequestError));const turns = (messages.data ?? []).filter((entry) => entry.info.role === "assistant")@@ -1251,70 +1326,39 @@ export function makeOpenCodeAdapterLive(_options?: OpenCodeAdapterLiveOptions) {const rollbackThread: OpenCodeAdapterShape["rollbackThread"] = Effect.fn("rollbackThread")(function* (threadId, numTurns) {const context = ensureSessionContext(sessions, threadId);- const messages = yield* Effect.tryPromise({- try: () => context.client.session.messages({ sessionID: context.openCodeSessionId }),- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "session.messages",- detail:- cause instanceof Error ? cause.message : "Failed to inspect OpenCode thread.",- cause,- }),- });+ const messages = yield* runOpenCodeSdk("session.messages", () =>+ context.client.session.messages({ sessionID: context.openCodeSessionId }),+ ).pipe(Effect.mapError(toRequestError));const assistantMessages = (messages.data ?? []).filter((entry) => entry.info.role === "assistant",);const targetIndex = assistantMessages.length - numTurns - 1;const target = targetIndex >= 0 ? assistantMessages[targetIndex] : null;- yield* Effect.tryPromise({- try: () =>- context.client.session.revert({- sessionID: context.openCodeSessionId,- ...(target ? { messageID: target.info.id } : {}),- }),- catch: (cause) =>- new ProviderAdapterRequestError({- provider: PROVIDER,- method: "session.revert",- detail: cause instanceof Error ? cause.message : "Failed to revert OpenCode turn.",- cause,- }),- });+ yield* runOpenCodeSdk("session.revert", () =>+ context.client.session.revert({+ sessionID: context.openCodeSessionId,+ ...(target ? { messageID: target.info.id } : {}),+ }),+ ).pipe(Effect.mapError(toRequestError));return yield* readThread(threadId);},);const stopAll: OpenCodeAdapterShape["stopAll"] = () =>- Effect.tryPromise({- try: async () => {- const contexts = [...sessions.values()];- sessions.clear();- const results = await Promise.allSettled(- contexts.map((context) => stopOpenCodeContext(context)),- );- const errors = results- .filter((result): result is PromiseRejectedResult => result.status === "rejected")- .map((result) => result.reason);- if (errors.length === 1) {- throw errors[0];- }- if (errors.length > 1) {- throw new AggregateError(- errors,- `Failed to stop ${errors.length} OpenCode sessions.`,- );- }- },- catch: (cause) =>- new ProviderAdapterProcessError({- provider: PROVIDER,- threadId: "*",- detail: cause instanceof Error ? cause.message : "Failed to stop OpenCode sessions.",- cause,- }),+ Effect.gen(function* () {+ const contexts = [...sessions.values()];+ sessions.clear();+ // `stopOpenCodeContext` is typed as never-failing — SDK aborts are+ // already `Effect.ignore`'d inside it. `ignoreCause` here also+ // swallows defects from throwing finalizers so one bad close can't+ // interrupt the sibling fibers. Same pattern as the layer finalizer.+ yield* Effect.forEach(+ contexts,+ (context) => Effect.ignoreCause(stopOpenCodeContext(context)),+ { concurrency: "unbounded", discard: true },+ );});return {diff --git a/apps/server/src/provider/Layers/OpenCodeProvider.test.ts b/apps/server/src/provider/Layers/OpenCodeProvider.test.tsindex cf3d588d9..ffce70843 100644--- a/apps/server/src/provider/Layers/OpenCodeProvider.test.ts+++ b/apps/server/src/provider/Layers/OpenCodeProvider.test.ts@@ -3,66 +3,81 @@ import assert from "node:assert/strict";import * as NodeServices from "@effect/platform-node/NodeServices";import { it } from "@effect/vitest";import { Effect, Layer } from "effect";-import { beforeEach, vi } from "vitest";+import { beforeEach } from "vitest";import { ServerConfig } from "../../config.ts";import { ServerSettingsService } from "../../serverSettings.ts";import { OpenCodeProvider } from "../Services/OpenCodeProvider.ts";-import { makeOpenCodeProviderLive } from "./OpenCodeProvider.ts";--const runtimeMock = vi.hoisted(() => {- const state = {+import {+ OpenCodeRuntime,+ OpenCodeRuntimeError,+ type OpenCodeRuntimeShape,+} from "../opencodeRuntime.ts";+import { OpenCodeProviderLive } from "./OpenCodeProvider.ts";+import type { OpenCodeInventory } from "../opencodeRuntime.ts";++const runtimeMock = {+ state: {runVersionError: null as Error | null,inventoryError: null as Error | null,- };-- return {- state,- reset() {- state.runVersionError = null;- state.inventoryError = null;- },- };-});--vi.mock("../opencodeRuntime.ts", async () => {- const actual =- await vi.importActual<typeof import("../opencodeRuntime.ts")>("../opencodeRuntime.ts");-- return {- ...actual,- runOpenCodeCommand: vi.fn(async () => {- if (runtimeMock.state.runVersionError) {- throw runtimeMock.state.runVersionError;- }- return { stdout: "opencode 1.0.0\n", stderr: "", code: 0 };+ inventory: {+ providerList: { connected: [] as string[], all: [] as unknown[], default: {} },+ agents: [] as unknown[],+ } as unknown,+ },+ reset() {+ this.state.runVersionError = null;+ this.state.inventoryError = null;+ this.state.inventory = {+ providerList: { connected: [], all: [] as unknown[], default: {} },+ agents: [] as unknown[],+ };+ },+};++const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {+ startOpenCodeServerProcess: () =>+ Effect.succeed({+ url: "http://127.0.0.1:4301",+ exitCode: Effect.never,}),- connectToOpenCodeServer: vi.fn(async ({ serverUrl }: { serverUrl?: string }) => ({+ connectToOpenCodeServer: ({ serverUrl }) =>+ Effect.succeed({url: serverUrl ?? "http://127.0.0.1:4301",- process: null,+ exitCode: null,external: Boolean(serverUrl),- close() {},- })),- createOpenCodeSdkClient: vi.fn(() => ({})),- loadOpenCodeInventory: vi.fn(async () => {- if (runtimeMock.state.inventoryError) {- throw runtimeMock.state.inventoryError;- }- return {- providerList: { connected: [], all: [] },- agents: [],- };}),- flattenOpenCodeModels: vi.fn(() => []),- };-});+ runOpenCodeCommand: () =>+ runtimeMock.state.runVersionError+ ? Effect.fail(+ new OpenCodeRuntimeError({+ operation: "runOpenCodeCommand",+ detail: runtimeMock.state.runVersionError.message,+ cause: runtimeMock.state.runVersionError,+ }),+ )+ : Effect.succeed({ stdout: "opencode 1.0.0\n", stderr: "", code: 0 }),+ createOpenCodeSdkClient: () =>+ ({}) as unknown as ReturnType<OpenCodeRuntimeShape["createOpenCodeSdkClient"]>,+ loadOpenCodeInventory: () =>+ runtimeMock.state.inventoryError+ ? Effect.fail(+ new OpenCodeRuntimeError({+ operation: "loadOpenCodeInventory",+ detail: runtimeMock.state.inventoryError.message,+ cause: runtimeMock.state.inventoryError,+ }),+ )+ : Effect.succeed(runtimeMock.state.inventory as OpenCodeInventory),+};beforeEach(() => {runtimeMock.reset();});const makeTestLayer = (settingsOverrides?: Parameters<typeof ServerSettingsService.layerTest>[0]) =>- makeOpenCodeProviderLive().pipe(+ OpenCodeProviderLive.pipe(+ Layer.provideMerge(Layer.succeed(OpenCodeRuntime, OpenCodeRuntimeTestDouble)),Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),Layer.provideMerge(ServerSettingsService.layerTest(settingsOverrides)),Layer.provideMerge(NodeServices.layer),@@ -92,6 +107,54 @@ it.layer(makeTestLayer())("OpenCodeProviderLive", (it) => {assert.equal(snapshot.message, "Failed to execute OpenCode CLI health check.");}),);++ it.effect("emits OpenCode variant defaults so trait picker can resolve a visible selection", () =>+ Effect.gen(function* () {+ runtimeMock.state.inventory = {+ providerList: {+ connected: ["openai"],+ all: [+ {+ id: "openai",+ name: "OpenAI",+ models: {+ "gpt-5.4": {+ id: "gpt-5.4",+ name: "GPT-5.4",+ variants: {+ none: {},+ low: {},+ medium: {},+ high: {},+ xhigh: {},+ },+ },+ },+ },+ ],+ default: {},+ },+ agents: [+ { name: "build", hidden: false, mode: "primary" },+ { name: "plan", hidden: false, mode: "primary" },+ ],+ };++ const provider = yield* OpenCodeProvider;+ const snapshot = yield* provider.refresh;+ const model = snapshot.models.find((entry) => entry.slug === "openai/gpt-5.4");++ assert.ok(model);+ assert.equal(+ model.capabilities?.variantOptions?.find((option) => option.isDefault)?.value,+ "medium",+ );+ assert.equal(+ model.capabilities?.agentOptions?.find((option) => option.isDefault)?.value,+ "build",+ );+ }),+ );});it.layer(diff --git a/apps/server/src/provider/Layers/OpenCodeProvider.ts b/apps/server/src/provider/Layers/OpenCodeProvider.tsindex f19694125..5e51eae02 100644--- a/apps/server/src/provider/Layers/OpenCodeProvider.ts+++ b/apps/server/src/provider/Layers/OpenCodeProvider.ts@@ -1,57 +1,58 @@-import type { OpenCodeSettings, ServerProvider } from "@t3tools/contracts";-import { Cause, Effect, Equal, Layer, Stream } from "effect";+import type {+ ModelCapabilities,+ OpenCodeSettings,+ ServerProvider,+ ServerProviderModel,+} from "@t3tools/contracts";+import { Cause, Data, Effect, Equal, Layer, Stream } from "effect";import { ServerConfig } from "../../config.ts";import { ServerSettingsService } from "../../serverSettings.ts";import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";import {buildServerProvider,- isCommandMissingCause,parseGenericCliVersion,providerModelsFromSettings,} from "../providerSnapshot.ts";import { OpenCodeProvider } from "../Services/OpenCodeProvider.ts";import {- connectToOpenCodeServer,- DEFAULT_OPENCODE_MODEL_CAPABILITIES,- createOpenCodeSdkClient,- flattenOpenCodeModels,- loadOpenCodeInventory,- runOpenCodeCommand,+ OpenCodeRuntime,+ openCodeRuntimeErrorDetail,+ type OpenCodeInventory,} from "../opencodeRuntime.ts";+import type { Agent, ProviderListResponse } from "@opencode-ai/sdk/v2";const PROVIDER = "opencode" as const;-class OpenCodeProbePromiseError extends Error {- override readonly cause: unknown;+class OpenCodeProbeError extends Data.TaggedError("OpenCodeProbeError")<{+ readonly cause: unknown;+ readonly detail: string;+}> {}- constructor(cause: unknown) {- super(cause instanceof Error ? cause.message : String(cause));- this.cause = cause;- this.name = "OpenCodeProbePromiseError";+function normalizeProbeMessage(message: string): string | undefined {+ const trimmed = message.trim();+ if (trimmed.length === 0) {+ return undefined;}-}--function toOpenCodeProbeError(cause: unknown): OpenCodeProbePromiseError {- return new OpenCodeProbePromiseError(cause);+ if (+ trimmed === "An error occurred in Effect.tryPromise" ||+ trimmed === "An error occurred in Effect.try"+ ) {+ return undefined;+ }+ return trimmed;}function normalizedErrorMessage(cause: unknown): string | undefined {- if (!(cause instanceof Error)) {- return undefined;+ if (cause instanceof OpenCodeProbeError) {+ return normalizeProbeMessage(cause.detail);}- const message = cause.message.trim();- if (message.length === 0) {- return undefined;- }- if (- message === "An error occurred in Effect.tryPromise" ||- message === "An error occurred in Effect.try"- ) {+ if (!(cause instanceof Error)) {return undefined;}- return message;++ return normalizeProbeMessage(cause.message);}function formatOpenCodeProbeError(input: {@@ -59,8 +60,8 @@ function formatOpenCodeProbeError(input: {readonly isExternalServer: boolean;readonly serverUrl: string;}): { readonly installed: boolean; readonly message: string } {- const lower = input.cause instanceof Error ? input.cause.message.toLowerCase() : "";const detail = normalizedErrorMessage(input.cause);+ const lower = detail?.toLowerCase() ?? "";if (input.isExternalServer) {if (@@ -96,7 +97,7 @@ function formatOpenCodeProbeError(input: {};}- if (input.cause instanceof Error && isCommandMissingCause(input.cause)) {+ if (lower.includes("enoent") || lower.includes("notfound")) {return {installed: false,message: "OpenCode CLI (`opencode`) is not installed or not on PATH.",@@ -127,6 +128,99 @@ function formatOpenCodeProbeError(input: {};}+function titleCaseSlug(value: string): string {+ return value+ .split(/[-_/]+/)+ .filter((segment) => segment.length > 0)+ .map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1))+ .join(" ");+}++function inferDefaultVariant(+ providerID: string,+ variants: ReadonlyArray<string>,+): string | undefined {+ if (variants.length === 1) {+ return variants[0];+ }+ if (providerID === "anthropic" || providerID.startsWith("google")) {+ return variants.includes("high") ? "high" : undefined;+ }+ if (providerID === "openai" || providerID === "opencode") {+ return variants.includes("medium") ? "medium" : variants.includes("high") ? "high" : undefined;+ }+ return undefined;+}++function inferDefaultAgent(agents: ReadonlyArray<Agent>): string | undefined {+ return agents.find((agent) => agent.name === "build")?.name ?? agents[0]?.name ?? undefined;+}++const DEFAULT_OPENCODE_MODEL_CAPABILITIES: ModelCapabilities = {+ reasoningEffortLevels: [],+ supportsFastMode: false,+ supportsThinkingToggle: false,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+};++function openCodeCapabilitiesForModel(input: {+ readonly providerID: string;+ readonly model: ProviderListResponse["all"][number]["models"][string];+ readonly agents: ReadonlyArray<Agent>;+}): ModelCapabilities {+ const variantValues = Object.keys(input.model.variants ?? {});+ const defaultVariant = inferDefaultVariant(input.providerID, variantValues);+ const variantOptions: ModelCapabilities["variantOptions"] = variantValues.map((value) =>+ Object.assign(+ { value, label: titleCaseSlug(value) },+ defaultVariant === value ? { isDefault: true } : {},+ ),+ );+ const primaryAgents = input.agents.filter(+ (agent) => !agent.hidden && (agent.mode === "primary" || agent.mode === "all"),+ );+ const defaultAgent = inferDefaultAgent(primaryAgents);+ const agentOptions: ModelCapabilities["agentOptions"] = primaryAgents.map((agent) =>+ Object.assign(+ { value: agent.name, label: titleCaseSlug(agent.name) },+ defaultAgent === agent.name ? { isDefault: true } : {},+ ),+ );+ return {+ ...DEFAULT_OPENCODE_MODEL_CAPABILITIES,+ ...(variantOptions.length > 0 ? { variantOptions } : {}),+ ...(agentOptions.length > 0 ? { agentOptions } : {}),+ };+}++function flattenOpenCodeModels(input: OpenCodeInventory): ReadonlyArray<ServerProviderModel> {+ const connected = new Set(input.providerList.connected);+ const models: Array<ServerProviderModel> = [];++ for (const provider of input.providerList.all) {+ if (!connected.has(provider.id)) {+ continue;+ }++ for (const model of Object.values(provider.models)) {+ models.push({+ slug: `${provider.id}/${model.id}`,+ name: model.name,+ subProvider: provider.name,+ isCustom: false,+ capabilities: openCodeCapabilitiesForModel({+ providerID: provider.id,+ model,+ agents: input.agents,+ }),+ });+ }+ }++ return models.toSorted((left, right) => left.name.localeCompare(right.name));+}+const makePendingOpenCodeProvider = (openCodeSettings: OpenCodeSettings): ServerProvider => {const checkedAt = new Date().toISOString();const models = providerModelsFromSettings(@@ -170,173 +264,177 @@ const makePendingOpenCodeProvider = (openCodeSettings: OpenCodeSettings): Server});};-export function checkOpenCodeProviderStatus(input: {- readonly settings: OpenCodeSettings;- readonly cwd: string;-}): Effect.Effect<ServerProvider> {- const checkedAt = new Date().toISOString();- const customModels = input.settings.customModels;- const isExternalServer = input.settings.serverUrl.trim().length > 0;-- const fallback = (cause: unknown, version: string | null = null) => {- const failure = formatOpenCodeProbeError({- cause,- isExternalServer,- serverUrl: input.settings.serverUrl,- });- return buildServerProvider({- provider: PROVIDER,- enabled: input.settings.enabled,- checkedAt,- models: providerModelsFromSettings(- [],+export const OpenCodeProviderLive = Layer.effect(+ OpenCodeProvider,+ Effect.gen(function* () {+ const serverSettings = yield* ServerSettingsService;+ const serverConfig = yield* ServerConfig;+ const openCodeRuntime = yield* OpenCodeRuntime;++ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(function* (input: {+ readonly settings: OpenCodeSettings;+ readonly cwd: string;+ }): Effect.fn.Return<ServerProvider, never> {+ const checkedAt = new Date().toISOString();+ const customModels = input.settings.customModels;+ const isExternalServer = input.settings.serverUrl.trim().length > 0;++ const fallback = (cause: unknown, version: string | null = null) => {+ const failure = formatOpenCodeProbeError({+ cause,+ isExternalServer,+ serverUrl: input.settings.serverUrl,+ });+ return buildServerProvider({+ provider: PROVIDER,+ enabled: input.settings.enabled,+ checkedAt,+ models: providerModelsFromSettings(+ [],+ PROVIDER,+ customModels,+ DEFAULT_OPENCODE_MODEL_CAPABILITIES,+ ),+ probe: {+ installed: failure.installed,+ version,+ status: "error",+ auth: { status: "unknown" },+ message: failure.message,+ },+ });+ };++ if (!input.settings.enabled) {+ return buildServerProvider({+ provider: PROVIDER,+ enabled: false,+ checkedAt,+ models: providerModelsFromSettings(+ [],+ PROVIDER,+ customModels,+ DEFAULT_OPENCODE_MODEL_CAPABILITIES,+ ),+ probe: {+ installed: false,+ version: null,+ status: "warning",+ auth: { status: "unknown" },+ message: isExternalServer+ ? "OpenCode is disabled in T3 Code settings. A server URL is configured."+ : "OpenCode is disabled in T3 Code settings.",+ },+ });+ }++ let version: string | null = null;+ if (!isExternalServer) {+ const versionExit = yield* Effect.exit(+ openCodeRuntime+ .runOpenCodeCommand({+ binaryPath: input.settings.binaryPath,+ args: ["--version"],+ })+ .pipe(+ Effect.mapError(+ (cause) =>+ new OpenCodeProbeError({ cause, detail: openCodeRuntimeErrorDetail(cause) }),+ ),+ ),+ );+ if (versionExit._tag === "Failure") {+ return fallback(Cause.squash(versionExit.cause));+ }+ version = parseGenericCliVersion(versionExit.value.stdout) ?? null;+ }++ const inventoryExit = yield* Effect.exit(+ Effect.scoped(+ Effect.gen(function* () {+ const server = yield* openCodeRuntime+ .connectToOpenCodeServer({+ binaryPath: input.settings.binaryPath,+ serverUrl: input.settings.serverUrl,+ })+ .pipe(+ Effect.mapError(+ (cause) =>+ new OpenCodeProbeError({ cause, detail: openCodeRuntimeErrorDetail(cause) }),+ ),+ );+ return yield* openCodeRuntime+ .loadOpenCodeInventory(+ openCodeRuntime.createOpenCodeSdkClient({+ baseUrl: server.url,+ directory: input.cwd,+ ...(isExternalServer && input.settings.serverPassword+ ? { serverPassword: input.settings.serverPassword }+ : {}),+ }),+ )+ .pipe(+ Effect.mapError(+ (cause) =>+ new OpenCodeProbeError({ cause, detail: openCodeRuntimeErrorDetail(cause) }),+ ),+ );+ }),+ ),+ );+ if (inventoryExit._tag === "Failure") {+ return fallback(Cause.squash(inventoryExit.cause), version);+ }++ const models = providerModelsFromSettings(+ flattenOpenCodeModels(inventoryExit.value),PROVIDER,customModels,DEFAULT_OPENCODE_MODEL_CAPABILITIES,- ),- probe: {- installed: failure.installed,- version,- status: "error",- auth: { status: "unknown" },- message: failure.message,- },- });- };-- return Effect.gen(function* () {- if (!input.settings.enabled) {+ );+ const connectedCount = inventoryExit.value.providerList.connected.length;return buildServerProvider({provider: PROVIDER,- enabled: false,+ enabled: true,checkedAt,- models: providerModelsFromSettings(- [],- PROVIDER,- customModels,- DEFAULT_OPENCODE_MODEL_CAPABILITIES,- ),+ models,probe: {- installed: false,- version: null,- status: "warning",- auth: { status: "unknown" },- message: isExternalServer- ? "OpenCode is disabled in T3 Code settings. A server URL is configured."- : "OpenCode is disabled in T3 Code settings.",+ installed: true,+ version,+ status: connectedCount > 0 ? "ready" : "warning",+ auth: {+ status: connectedCount > 0 ? "authenticated" : "unknown",+ type: "opencode",+ },+ message:+ connectedCount > 0+ ? `${connectedCount} upstream provider${connectedCount === 1 ? "" : "s"} connected through ${isExternalServer ? "the configured OpenCode server" : "OpenCode"}.`+ : isExternalServer+ ? "Connected to the configured OpenCode server, but it did not report any connected upstream providers."+ : "OpenCode is available, but it did not report any connected upstream providers.",},});- }+ });- let version: string | null = null;- if (!isExternalServer) {- const versionExit = yield* Effect.exit(- Effect.tryPromise({- try: () =>- runOpenCodeCommand({- binaryPath: input.settings.binaryPath,- args: ["--version"],- }),- catch: toOpenCodeProbeError,- }),- );- if (versionExit._tag === "Failure") {- return fallback(Cause.squash(versionExit.cause));- }- version = parseGenericCliVersion(versionExit.value.stdout) ?? null;- }+ const getProviderSettings = serverSettings.getSettings.pipe(+ Effect.map((settings) => settings.providers.opencode),+ );- const inventoryExit = yield* Effect.exit(- Effect.acquireUseRelease(- Effect.tryPromise({- try: () =>- connectToOpenCodeServer({- binaryPath: input.settings.binaryPath,- serverUrl: input.settings.serverUrl,- }),- catch: toOpenCodeProbeError,- }),- (server) =>- Effect.tryPromise({- try: async () => {- const client = createOpenCodeSdkClient({- baseUrl: server.url,- directory: input.cwd,- ...(isExternalServer && input.settings.serverPassword- ? { serverPassword: input.settings.serverPassword }- : {}),- });- return await loadOpenCodeInventory(client);- },- catch: toOpenCodeProbeError,+ return yield* makeManagedServerProvider<OpenCodeSettings>({+ getSettings: getProviderSettings.pipe(Effect.orDie),+ streamSettings: serverSettings.streamChanges.pipe(+ Stream.map((settings) => settings.providers.opencode),+ ),+ haveSettingsChanged: (previous, next) => !Equal.equals(previous, next),+ initialSnapshot: makePendingOpenCodeProvider,+ checkProvider: getProviderSettings.pipe(+ Effect.flatMap((settings) =>+ checkOpenCodeProviderStatus({+ settings,+ cwd: serverConfig.cwd,}),- (server) => Effect.sync(() => server.close()),+ ),),- );- if (inventoryExit._tag === "Failure") {- return fallback(Cause.squash(inventoryExit.cause), version);- }-- const models = providerModelsFromSettings(- flattenOpenCodeModels(inventoryExit.value),- PROVIDER,- customModels,- DEFAULT_OPENCODE_MODEL_CAPABILITIES,- );- const connectedCount = inventoryExit.value.providerList.connected.length;- return buildServerProvider({- provider: PROVIDER,- enabled: true,- checkedAt,- models,- probe: {- installed: true,- version,- status: connectedCount > 0 ? "ready" : "warning",- auth: {- status: connectedCount > 0 ? "authenticated" : "unknown",- type: "opencode",- },- message:- connectedCount > 0- ? `${connectedCount} upstream provider${connectedCount === 1 ? "" : "s"} connected through ${isExternalServer ? "the configured OpenCode server" : "OpenCode"}.`- : isExternalServer- ? "Connected to the configured OpenCode server, but it did not report any connected upstream providers."- : "OpenCode is available, but it did not report any connected upstream providers.",- },});- });-}--export function makeOpenCodeProviderLive() {- return Layer.effect(- OpenCodeProvider,- Effect.gen(function* () {- const serverSettings = yield* ServerSettingsService;- const serverConfig = yield* ServerConfig;-- const getProviderSettings = serverSettings.getSettings.pipe(- Effect.map((settings) => settings.providers.opencode),- );-- return yield* makeManagedServerProvider<OpenCodeSettings>({- getSettings: getProviderSettings.pipe(Effect.orDie),- streamSettings: serverSettings.streamChanges.pipe(- Stream.map((settings) => settings.providers.opencode),- ),- haveSettingsChanged: (previous, next) => !Equal.equals(previous, next),- initialSnapshot: makePendingOpenCodeProvider,- checkProvider: getProviderSettings.pipe(- Effect.flatMap((settings) =>- checkOpenCodeProviderStatus({- settings,- cwd: serverConfig.cwd,- }),- ),- ),- });- }),- );-}--export const OpenCodeProviderLive = makeOpenCodeProviderLive();+ }),+);diff --git a/apps/server/src/provider/Layers/ProviderRegistry.ts b/apps/server/src/provider/Layers/ProviderRegistry.tsindex d06833531..3f83419a3 100644--- a/apps/server/src/provider/Layers/ProviderRegistry.ts+++ b/apps/server/src/provider/Layers/ProviderRegistry.ts@@ -16,6 +16,7 @@ import { CodexProvider } from "../Services/CodexProvider.ts";import { CursorProvider } from "../Services/CursorProvider.ts";import { OpenCodeProvider } from "../Services/OpenCodeProvider.ts";import { ProviderRegistry, type ProviderRegistryShape } from "../Services/ProviderRegistry.ts";+import { OpenCodeRuntimeLive } from "../opencodeRuntime.ts";import {hydrateCachedProvider,PROVIDER_CACHE_IDS,@@ -287,6 +288,7 @@ export const ProviderRegistryLive = Layer.unwrap(Layer.provideMerge(CodexProviderLive),Layer.provideMerge(ClaudeProviderLive),Layer.provideMerge(OpenCodeProviderLive),+ Layer.provideMerge(OpenCodeRuntimeLive),),),);diff --git a/apps/server/src/provider/opencodeRuntime.test.ts b/apps/server/src/provider/opencodeRuntime.test.tsdeleted file mode 100644index 0e7024efc..000000000--- a/apps/server/src/provider/opencodeRuntime.test.ts+++ /dev/null@@ -1,37 +0,0 @@-import { describe, expect, it } from "vitest";--import { DEFAULT_OPENCODE_MODEL_CAPABILITIES, flattenOpenCodeModels } from "./opencodeRuntime.ts";--describe("flattenOpenCodeModels", () => {- it("keeps the canonical model name separate from the subprovider label", () => {- const models = flattenOpenCodeModels({- providerList: {- connected: ["github-copilot"],- all: [- {- id: "github-copilot",- name: "GitHub Copilot",- models: {- "claude-opus-4.5": {- id: "claude-opus-4.5",- name: "Claude Opus 4.5",- variants: {},- },- },- },- ],- },- agents: [],- } as unknown as Parameters<typeof flattenOpenCodeModels>[0]);-- expect(models).toEqual([- {- slug: "github-copilot/claude-opus-4.5",- name: "Claude Opus 4.5",- subProvider: "GitHub Copilot",- isCustom: false,- capabilities: DEFAULT_OPENCODE_MODEL_CAPABILITIES,- },- ]);- });-});diff --git a/apps/server/src/provider/opencodeRuntime.ts b/apps/server/src/provider/opencodeRuntime.tsindex 91a855bce..9f10738db 100644--- a/apps/server/src/provider/opencodeRuntime.ts+++ b/apps/server/src/provider/opencodeRuntime.ts@@ -1,17 +1,6 @@-import { execFileSync, spawn, type ChildProcess } from "node:child_process";-import * as FS from "node:fs";-import { createServer, type AddressInfo } from "node:net";-import * as OS from "node:os";-import * as Path from "node:path";import { pathToFileURL } from "node:url";-import type {- ChatAttachment,- ModelCapabilities,- ProviderApprovalDecision,- RuntimeMode,- ServerProviderModel,-} from "@t3tools/contracts";+import type { ChatAttachment, ProviderApprovalDecision, RuntimeMode } from "@t3tools/contracts";import {createOpencodeClient,type Agent,@@ -22,40 +11,80 @@ import {type QuestionAnswer,type QuestionRequest,} from "@opencode-ai/sdk/v2";+import {+ Cause,+ Context,+ Data,+ Deferred,+ Effect,+ Exit,+ Fiber,+ Layer,+ Option,+ Predicate as P,+ Ref,+ Result,+ Scope,+ Stream,+} from "effect";+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";++import { isWindowsCommandNotFound } from "../processRunner.ts";+import { collectStreamAsString } from "./providerSnapshot.ts";+import { NetService } from "@t3tools/shared/Net";const OPENCODE_SERVER_READY_PREFIX = "opencode server listening";const DEFAULT_OPENCODE_SERVER_TIMEOUT_MS = 5_000;const DEFAULT_HOSTNAME = "127.0.0.1";-const OPENAI_VARIANTS = ["none", "minimal", "low", "medium", "high", "xhigh"];-const ANTHROPIC_VARIANTS = ["high", "max"];-const GOOGLE_VARIANTS = ["low", "high"];--export const DEFAULT_OPENCODE_MODEL_CAPABILITIES: ModelCapabilities = {- reasoningEffortLevels: [],- supportsFastMode: false,- supportsThinkingToggle: false,- contextWindowOptions: [],- promptInjectedEffortLevels: [],-};-export interface OpenCodeServerProcess {readonly url: string;- readonly process: ChildProcess;- close(): void;+ readonly exitCode: Effect.Effect<number, never>;}export interface OpenCodeServerConnection {readonly url: string;- readonly process: ChildProcess | null;+ readonly exitCode: Effect.Effect<number, never> | null;readonly external: boolean;- close(): void;}-function buildOpenCodeBasicAuthorizationHeader(password: string): string {- return `Basic ${Buffer.from(`opencode:${password}`, "utf8").toString("base64")}`;+const OPENCODE_RUNTIME_ERROR_TAG = "OpenCodeRuntimeError";+export class OpenCodeRuntimeError extends Data.TaggedError(OPENCODE_RUNTIME_ERROR_TAG)<{+ readonly operation: string;+ readonly cause?: unknown;+ readonly detail: string;+}> {+ static readonly is = (u: unknown): u is OpenCodeRuntimeError =>+ P.isTagged(u, OPENCODE_RUNTIME_ERROR_TAG);+}++export function openCodeRuntimeErrorDetail(cause: unknown): string {+ if (OpenCodeRuntimeError.is(cause)) return cause.detail;+ if (cause instanceof Error && cause.message.trim().length > 0) return cause.message.trim();+ if (cause && typeof cause === "object") {+ // SDK v2 throws { response, request, error? } shapes — extract what's useful+ const anyCause = cause as Record<string, unknown>;+ const status = (anyCause.response as { status?: number } | undefined)?.status;+ const body = anyCause.error ?? anyCause.data ?? anyCause.body;+ try {+ return `status=${status ?? "?"} body=${JSON.stringify(body ?? cause)}`;+ } catch {+ /* fall through */+ }+ }+ return String(cause);}+export const runOpenCodeSdk = <A>(+ operation: string,+ fn: () => Promise<A>,+): Effect.Effect<A, OpenCodeRuntimeError> =>+ Effect.tryPromise({+ try: fn,+ catch: (cause) =>+ new OpenCodeRuntimeError({ operation, detail: openCodeRuntimeErrorDetail(cause), cause }),+ }).pipe(Effect.withSpan(`opencode.${operation}`));+export interface OpenCodeCommandResult {readonly stdout: string;readonly stderr: string;@@ -72,12 +101,43 @@ export interface ParsedOpenCodeModelSlug {readonly modelID: string;}-function titleCaseSlug(value: string): string {- return value- .split(/[-_/]+/)- .filter((segment) => segment.length > 0)- .map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1))- .join(" ");+export interface OpenCodeRuntimeShape {+ /**+ * Spawns a local OpenCode server process. Its lifetime is bound to the caller's+ * `Scope.Scope` — the child is killed automatically when that scope closes.+ * Consumers that want a long-lived server must create and hold a scope explicitly+ * (see {@link Scope.make}) and close it when done.+ */+ readonly startOpenCodeServerProcess: (input: {+ readonly binaryPath: string;+ readonly port?: number;+ readonly hostname?: string;+ readonly timeoutMs?: number;+ }) => Effect.Effect<OpenCodeServerProcess, OpenCodeRuntimeError, Scope.Scope>;+ /**+ * Returns a handle to either an externally-managed OpenCode server (when+ * `serverUrl` is provided — no lifetime is attached to the caller's scope) or a+ * freshly spawned local server whose lifetime is bound to the caller's scope.+ */+ readonly connectToOpenCodeServer: (input: {+ readonly binaryPath: string;+ readonly serverUrl?: string | null;+ readonly port?: number;+ readonly hostname?: string;+ readonly timeoutMs?: number;+ }) => Effect.Effect<OpenCodeServerConnection, OpenCodeRuntimeError, Scope.Scope>;+ readonly runOpenCodeCommand: (input: {+ readonly binaryPath: string;+ readonly args: ReadonlyArray<string>;+ }) => Effect.Effect<OpenCodeCommandResult, OpenCodeRuntimeError>;+ readonly createOpenCodeSdkClient: (input: {+ readonly baseUrl: string;+ readonly directory: string;+ readonly serverPassword?: string;+ }) => OpencodeClient;+ readonly loadOpenCodeInventory: (+ client: OpencodeClient,+ ) => Effect.Effect<OpenCodeInventory, OpenCodeRuntimeError>;}function parseServerUrlFromOutput(output: string): string | null {@@ -91,92 +151,6 @@ function parseServerUrlFromOutput(output: string): string | null {return null;}-function isPrimaryAgent(agent: Agent): boolean {- return !agent.hidden && (agent.mode === "primary" || agent.mode === "all");-}--function inferVariantValues(providerID: string): ReadonlyArray<string> {- if (providerID === "anthropic") {- return ANTHROPIC_VARIANTS;- }- if (providerID === "openai" || providerID === "opencode") {- return OPENAI_VARIANTS;- }- if (providerID.startsWith("google")) {- return GOOGLE_VARIANTS;- }- return [];-}--function inferDefaultVariant(- providerID: string,- variants: ReadonlyArray<string>,-): string | undefined {- if (variants.length === 1) {- return variants[0];- }- if (providerID === "anthropic" || providerID.startsWith("google")) {- return variants.includes("high") ? "high" : undefined;- }- if (providerID === "openai" || providerID === "opencode") {- return variants.includes("medium") ? "medium" : variants.includes("high") ? "high" : undefined;- }- return undefined;-}--function buildVariantOptions(- providerID: string,- model: ProviderListResponse["all"][number]["models"][string],-) {- const variantValues = Object.keys(model.variants ?? {});- const resolvedValues =- variantValues.length > 0 ? variantValues : [...inferVariantValues(providerID)];- const defaultVariant = inferDefaultVariant(providerID, resolvedValues);-- return resolvedValues.map((value) => {- const option: { value: string; label: string; isDefault?: boolean } = {- value,- label: titleCaseSlug(value),- };- if (defaultVariant === value) {- option.isDefault = true;- }- return option;- });-}--function buildAgentOptions(agents: ReadonlyArray<Agent>) {- const primaryAgents = agents.filter(isPrimaryAgent);- const defaultAgent =- primaryAgents.find((agent) => agent.name === "build")?.name ??- primaryAgents[0]?.name ??- undefined;- return primaryAgents.map((agent) => {- const option: { value: string; label: string; isDefault?: boolean } = {- value: agent.name,- label: titleCaseSlug(agent.name),- };- if (defaultAgent === agent.name) {- option.isDefault = true;- }- return option;- });-}--function openCodeCapabilitiesForModel(input: {- readonly providerID: string;- readonly model: ProviderListResponse["all"][number]["models"][string];- readonly agents: ReadonlyArray<Agent>;-}): ModelCapabilities {- const variantOptions = buildVariantOptions(input.providerID, input.model);- const agentOptions = buildAgentOptions(input.agents);- return {- ...DEFAULT_OPENCODE_MODEL_CAPABILITIES,- ...(variantOptions.length > 0 ? { variantOptions } : {}),- ...(agentOptions.length > 0 ? { agentOptions } : {}),- };-}-export function parseOpenCodeModelSlug(slug: string | null | undefined,): ParsedOpenCodeModelSlug | null {@@ -196,10 +170,6 @@ export function parseOpenCodeModelSlug(};}-export function toOpenCodeModelSlug(providerID: string, modelID: string): string {- return `${providerID}/${modelID}`;-}-export function openCodeQuestionId(index: number,question: QuestionRequest["questions"][number],@@ -286,289 +256,268 @@ export function toOpenCodeQuestionAnswers(});}-export async function findAvailablePort(): Promise<number> {- const server = createServer();- await new Promise<void>((resolve, reject) => {- server.once("error", reject);- server.listen(0, DEFAULT_HOSTNAME, () => resolve());- });- const address = server.address() as AddressInfo;- const port = address.port;- await new Promise<void>((resolve, reject) => {- server.close((error) => (error ? reject(error) : resolve()));- });- return port;+function ensureRuntimeError(+ operation: OpenCodeRuntimeError["operation"],+ detail: string,+ cause: unknown,+): OpenCodeRuntimeError {+ return OpenCodeRuntimeError.is(cause)+ ? cause+ : new OpenCodeRuntimeError({ operation, detail, cause });}-export function resolveOpenCodeBinaryPath(binaryPath: string): string {- if (Path.isAbsolute(binaryPath)) {- return binaryPath;- }- return execFileSync("which", [binaryPath], {- encoding: "utf8",- timeout: 3_000,- }).trim();-}+const makeOpenCodeRuntime = Effect.gen(function* () {+ const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;+ const netService = yield* NetService;-export function detectMacosSigkillHint(binaryPath: string): string | null {- try {- // Check for quarantine xattr first.- const resolvedPath = resolveOpenCodeBinaryPath(binaryPath);- const xattr = execFileSync("xattr", ["-l", resolvedPath], {- encoding: "utf8",- timeout: 3_000,- });- if (xattr.includes("com.apple.quarantine")) {- return (- `macOS quarantine is blocking the OpenCode binary. ` +- `Run: xattr -d com.apple.quarantine ${resolvedPath}`+ const runOpenCodeCommand: OpenCodeRuntimeShape["runOpenCodeCommand"] = (input) =>+ Effect.gen(function* () {+ const child = yield* spawner.spawn(+ ChildProcess.make(input.binaryPath, [...input.args], {+ shell: process.platform === "win32",+ env: process.env,+ }),);- }-- // Look for a recent crash report with the termination reason.- const crashDir = Path.join(OS.homedir(), "Library/Logs/DiagnosticReports");- const binaryName = Path.basename(resolvedPath);- const recentReports = FS.readdirSync(crashDir)- .filter((f) => f.startsWith(binaryName) && f.endsWith(".ips"))- .toSorted()- .toReversed()- .slice(0, 1);-- for (const report of recentReports) {- const content = FS.readFileSync(Path.join(crashDir, report), "utf8");- if (content.includes('"namespace":"CODESIGNING"')) {- return (- "macOS killed the process due to an invalid code signature. " +- "The binary may be corrupted — try reinstalling OpenCode."- );+ const [stdout, stderr, code] = yield* Effect.all(+ [collectStreamAsString(child.stdout), collectStreamAsString(child.stderr), child.exitCode],+ { concurrency: "unbounded" },+ );+ const exitCode = Number(code);+ if (isWindowsCommandNotFound(exitCode, stderr)) {+ return yield* new OpenCodeRuntimeError({+ operation: "runOpenCodeCommand",+ detail: `spawn ${input.binaryPath} ENOENT`,+ });}- }- } catch {- // Best-effort detection — don't fail the original error path.- }- return null;-}--export async function startOpenCodeServerProcess(input: {- readonly binaryPath: string;- readonly port?: number;- readonly hostname?: string;- readonly timeoutMs?: number;-}): Promise<OpenCodeServerProcess> {- const hostname = input.hostname ?? DEFAULT_HOSTNAME;- const port = input.port ?? (await findAvailablePort());- const timeoutMs = input.timeoutMs ?? DEFAULT_OPENCODE_SERVER_TIMEOUT_MS;- const args = ["serve", `--hostname=${hostname}`, `--port=${port}`];- const child = spawn(input.binaryPath, args, {- stdio: ["ignore", "pipe", "pipe"],- env: {- ...process.env,- OPENCODE_CONFIG_CONTENT: JSON.stringify({}),- },- });+ return {+ stdout,+ stderr,+ code: exitCode,+ } satisfies OpenCodeCommandResult;+ }).pipe(+ Effect.scoped,+ Effect.mapError((cause) =>+ ensureRuntimeError(+ "runOpenCodeCommand",+ `Failed to execute '${input.binaryPath} ${input.args.join(" ")}': ${openCodeRuntimeErrorDetail(cause)}`,+ cause,+ ),+ ),+ );++ const startOpenCodeServerProcess: OpenCodeRuntimeShape["startOpenCodeServerProcess"] = (input) =>+ Effect.gen(function* () {+ // Bind this server's lifetime to the caller's scope. When the caller's+ // scope closes, the spawned child is killed and all associated fibers+ // are interrupted automatically — no `close()` method needed.+ const runtimeScope = yield* Scope.Scope;++ const hostname = input.hostname ?? DEFAULT_HOSTNAME;+ const port =+ input.port ??+ (yield* netService.findAvailablePort(0).pipe(+ Effect.mapError(+ (cause) =>+ new OpenCodeRuntimeError({+ operation: "startOpenCodeServerProcess",+ detail: `Failed to find available port: ${openCodeRuntimeErrorDetail(cause)}`,+ cause,+ }),+ ),+ ));+ const timeoutMs = input.timeoutMs ?? DEFAULT_OPENCODE_SERVER_TIMEOUT_MS;+ const args = ["serve", `--hostname=${hostname}`, `--port=${port}`];++ const child = yield* spawner+ .spawn(+ ChildProcess.make(input.binaryPath, args, {+ env: {+ ...process.env,+ OPENCODE_CONFIG_CONTENT: JSON.stringify({}),+ },+ }),+ )+ .pipe(+ Effect.provideService(Scope.Scope, runtimeScope),+ Effect.mapError(+ (cause) =>+ new OpenCodeRuntimeError({+ operation: "startOpenCodeServerProcess",+ detail: `Failed to spawn OpenCode server process: ${openCodeRuntimeErrorDetail(cause)}`,+ cause,+ }),+ ),+ );- child.stdout.setEncoding("utf8");- child.stderr.setEncoding("utf8");+ const stdoutRef = yield* Ref.make("");+ const stderrRef = yield* Ref.make("");+ const readyDeferred = yield* Deferred.make<string, OpenCodeRuntimeError>();++ const setReadyFromStdoutChunk = (chunk: string) =>+ Ref.updateAndGet(stdoutRef, (stdout) => `${stdout}${chunk}`).pipe(+ Effect.flatMap((nextStdout) => {+ const parsed = parseServerUrlFromOutput(nextStdout);+ return parsed+ ? Deferred.succeed(readyDeferred, parsed).pipe(Effect.ignore)+ : Effect.void;+ }),+ );- let stdout = "";- let stderr = "";- let closed = false;- const close = () => {- if (closed) {- return;- }- closed = true;- child.kill();- };+ const stdoutFiber = yield* child.stdout.pipe(+ Stream.decodeText(),+ Stream.runForEach(setReadyFromStdoutChunk),+ Effect.ignore,+ Effect.forkIn(runtimeScope),+ );+ const stderrFiber = yield* child.stderr.pipe(+ Stream.decodeText(),+ Stream.runForEach((chunk) => Ref.update(stderrRef, (stderr) => `${stderr}${chunk}`)),+ Effect.ignore,+ Effect.forkIn(runtimeScope),+ );- const url = await new Promise<string>((resolve, reject) => {- const timeout = setTimeout(() => {- close();- reject(new Error(`Timed out waiting for OpenCode server start after ${timeoutMs}ms.`));- }, timeoutMs);-- const cleanup = () => {- clearTimeout(timeout);- child.stdout.off("data", onStdout);- child.stderr.off("data", onStderr);- child.off("error", onError);- child.off("close", onClose);- };-- const onStdout = (chunk: string) => {- stdout += chunk;- const parsed = parseServerUrlFromOutput(stdout);- if (!parsed) {- return;- }- cleanup();- resolve(parsed);- };-- const onStderr = (chunk: string) => {- stderr += chunk;- };-- const onError = (error: Error) => {- cleanup();- reject(error);- };-- const onClose = (code: number | null, signal: NodeJS.Signals | null) => {- cleanup();- const exitReason = signal ? `signal: ${signal}` : `code: ${code ?? "unknown"}`;- const hint =- signal === "SIGKILL" && process.platform === "darwin"- ? detectMacosSigkillHint(input.binaryPath)- : null;- reject(- new Error(- [- `OpenCode server exited before startup completed (${exitReason}).`,- hint,- stdout.trim() ? `stdout:\n${stdout.trim()}` : null,- stderr.trim() ? `stderr:\n${stderr.trim()}` : null,- ]- .filter(Boolean)- .join("\n\n"),+ const exitFiber = yield* child.exitCode.pipe(+ Effect.flatMap((code) =>+ Effect.gen(function* () {+ const stdout = yield* Ref.get(stdoutRef);+ const stderr = yield* Ref.get(stderrRef);+ const exitCode = Number(code);+ yield* Deferred.fail(+ readyDeferred,+ new OpenCodeRuntimeError({+ operation: "startOpenCodeServerProcess",+ detail: [+ `OpenCode server exited before startup completed (code: ${String(exitCode)}).`,+ stdout.trim() ? `stdout:\n${stdout.trim()}` : null,+ stderr.trim() ? `stderr:\n${stderr.trim()}` : null,+ ]+ .filter(Boolean)+ .join("\n\n"),+ cause: { exitCode, stdout, stderr },+ }),+ ).pipe(Effect.ignore);+ }),),+ Effect.ignore,+ Effect.forkIn(runtimeScope),);- };-- child.stdout.on("data", onStdout);- child.stderr.on("data", onStderr);- child.once("error", onError);- child.once("close", onClose);- });-- return {- url,- process: child,- close,- };-}--export async function connectToOpenCodeServer(input: {- readonly binaryPath: string;- readonly serverUrl?: string | null;- readonly port?: number;- readonly hostname?: string;- readonly timeoutMs?: number;-}): Promise<OpenCodeServerConnection> {- const serverUrl = input.serverUrl?.trim();- if (serverUrl) {- return {- url: serverUrl,- process: null,- external: true,- close() {},- };- }- const server = await startOpenCodeServerProcess({- binaryPath: input.binaryPath,- ...(input.port !== undefined ? { port: input.port } : {}),- ...(input.hostname !== undefined ? { hostname: input.hostname } : {}),- ...(input.timeoutMs !== undefined ? { timeoutMs: input.timeoutMs } : {}),- });-- return {- url: server.url,- process: server.process,- external: false,- close: () => server.close(),- };-}--export async function runOpenCodeCommand(input: {- readonly binaryPath: string;- readonly args: ReadonlyArray<string>;-}): Promise<OpenCodeCommandResult> {- const child = spawn(input.binaryPath, [...input.args], {- stdio: ["ignore", "pipe", "pipe"],- shell: process.platform === "win32",- env: process.env,- });-- child.stdout?.setEncoding("utf8");- child.stderr?.setEncoding("utf8");-- const stdoutChunks: Array<string> = [];- const stderrChunks: Array<string> = [];+ const readyExit = yield* Effect.exit(+ Deferred.await(readyDeferred).pipe(Effect.timeoutOption(timeoutMs)),+ );- child.stdout?.on("data", (chunk: string) => stdoutChunks.push(chunk));- child.stderr?.on("data", (chunk: string) => stderrChunks.push(chunk));+ // Startup-time fibers are no longer needed once ready has resolved (either+ // way). The exit fiber is only interrupted on failure; on success it keeps+ // the caller's `exitCode` effect observable until the scope closes.+ yield* Fiber.interrupt(stdoutFiber).pipe(Effect.ignore);+ yield* Fiber.interrupt(stderrFiber).pipe(Effect.ignore);++ if (Exit.isFailure(readyExit)) {+ yield* Fiber.interrupt(exitFiber).pipe(Effect.ignore);+ const squashed = Cause.squash(readyExit.cause);+ return yield* ensureRuntimeError(+ "startOpenCodeServerProcess",+ `Failed while waiting for OpenCode server startup: ${openCodeRuntimeErrorDetail(squashed)}`,+ squashed,+ );+ }- const code = await new Promise<number>((resolve, reject) => {- child.once("error", reject);- child.once("exit", (exitCode) => resolve(exitCode ?? 0));- });+ const readyOption = readyExit.value;+ if (Option.isNone(readyOption)) {+ yield* Fiber.interrupt(exitFiber).pipe(Effect.ignore);+ return yield* new OpenCodeRuntimeError({+ operation: "startOpenCodeServerProcess",+ detail: `Timed out waiting for OpenCode server start after ${timeoutMs}ms.`,+ });+ }- return {- stdout: stdoutChunks.join(""),- stderr: stderrChunks.join(""),- code,- };-}+ return {+ url: readyOption.value,+ exitCode: child.exitCode.pipe(+ Effect.map(Number),+ Effect.orElseSucceed(() => 0),+ ),+ } satisfies OpenCodeServerProcess;+ });-export function createOpenCodeSdkClient(input: {- readonly baseUrl: string;- readonly directory: string;- readonly serverPassword?: string;-}): OpencodeClient {- return createOpencodeClient({- baseUrl: input.baseUrl,- directory: input.directory,- ...(input.serverPassword- ? {- headers: {- Authorization: buildOpenCodeBasicAuthorizationHeader(input.serverPassword),- },- }- : {}),- throwOnError: true,- });-}+ const connectToOpenCodeServer: OpenCodeRuntimeShape["connectToOpenCodeServer"] = (input) => {+ const serverUrl = input.serverUrl?.trim();+ if (serverUrl) {+ // We don't own externally-configured servers — no scope interaction.+ return Effect.succeed({+ url: serverUrl,+ exitCode: null,+ external: true,+ });+ }-export async function loadOpenCodeInventory(client: OpencodeClient): Promise<OpenCodeInventory> {- const [providerListResult, agentsResult] = await Promise.all([- client.provider.list(),- client.app.agents(),- ]);- if (!providerListResult.data) {- throw new Error("OpenCode provider inventory was empty.");- }- return {- providerList: providerListResult.data,- agents: agentsResult.data ?? [],+ return startOpenCodeServerProcess({+ binaryPath: input.binaryPath,+ ...(input.port !== undefined ? { port: input.port } : {}),+ ...(input.hostname !== undefined ? { hostname: input.hostname } : {}),+ ...(input.timeoutMs !== undefined ? { timeoutMs: input.timeoutMs } : {}),+ }).pipe(+ Effect.map((server) => ({+ url: server.url,+ exitCode: server.exitCode,+ external: false,+ })),+ );};-}-export function flattenOpenCodeModels(- input: OpenCodeInventory,-): ReadonlyArray<ServerProviderModel> {- const connected = new Set(input.providerList.connected);- const models: Array<ServerProviderModel> = [];+ const createOpenCodeSdkClient: OpenCodeRuntimeShape["createOpenCodeSdkClient"] = (input) =>+ createOpencodeClient({+ baseUrl: input.baseUrl,+ directory: input.directory,+ ...(input.serverPassword+ ? {+ headers: {+ Authorization: `Basic ${Buffer.from(`opencode:${input.serverPassword}`, "utf8").toString("base64")}`,+ },+ }+ : {}),+ throwOnError: true,+ });- for (const provider of input.providerList.all) {- if (!connected.has(provider.id)) {- continue;- }+ const loadProviders = (client: OpencodeClient) =>+ runOpenCodeSdk("provider.list", () => client.provider.list()).pipe(+ Effect.filterMapOrFail(+ (list) =>+ list.data+ ? Result.succeed(list.data)+ : Result.fail(+ new OpenCodeRuntimeError({+ operation: "provider.list",+ detail: "OpenCode provider list was empty.",+ }),+ ),+ (result) => result,+ ),+ );++ const loadAgents = (client: OpencodeClient) =>+ runOpenCodeSdk("app.agents", () => client.app.agents()).pipe(+ Effect.map((result) => result.data ?? []),+ );++ const loadOpenCodeInventory: OpenCodeRuntimeShape["loadOpenCodeInventory"] = (client) =>+ Effect.all([loadProviders(client), loadAgents(client)], { concurrency: "unbounded" }).pipe(+ Effect.map(([providerList, agents]) => ({ providerList, agents })),+ );- for (const model of Object.values(provider.models)) {- models.push({- slug: toOpenCodeModelSlug(provider.id, model.id),- name: model.name,- subProvider: provider.name,- isCustom: false,- capabilities: openCodeCapabilitiesForModel({- providerID: provider.id,- model,- agents: input.agents,- }),- });- }- }-- return models.toSorted((left, right) => left.name.localeCompare(right.name));-}+ return {+ startOpenCodeServerProcess,+ connectToOpenCodeServer,+ runOpenCodeCommand,+ createOpenCodeSdkClient,+ loadOpenCodeInventory,+ } satisfies OpenCodeRuntimeShape;+});++export class OpenCodeRuntime extends Context.Service<OpenCodeRuntime, OpenCodeRuntimeShape>()(+ "t3/provider/OpenCodeRuntime",+) {}++export const OpenCodeRuntimeLive = Layer.effect(OpenCodeRuntime, makeOpenCodeRuntime).pipe(+ Layer.provide(NetService.layer),+);diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.tsindex 66d776152..47e159d30 100644--- a/apps/server/src/server.test.ts+++ b/apps/server/src/server.test.ts@@ -1830,7 +1830,14 @@ it.layer(NodeServices.layer)("server router seam", (it) => {);assertTrue(result._tag === "Failure");- assertInclude(String(result.failure), "SocketOpenError");+ const failureMessage = String(result.failure);+ assertTrue(+ failureMessage.includes("SocketOpenError") || failureMessage.includes("SocketCloseError"),+ );+ assertTrue(+ failureMessage.includes("Unauthorized") ||+ failureMessage.includes("An error occurred during Open"),+ );}).pipe(Effect.provide(NodeHttpServer.layerTest)),);diff --git a/apps/server/src/server.ts b/apps/server/src/server.tsindex 9aee0b987..f94bbb34b 100644--- a/apps/server/src/server.ts+++ b/apps/server/src/server.ts@@ -76,6 +76,7 @@ import {orchestrationDispatchRouteLayer,orchestrationSnapshotRouteLayer,} from "./orchestration/http.ts";+import { NetService } from "@t3tools/shared/Net";const PtyAdapterLive = Layer.unwrap(Effect.gen(function* () {@@ -243,6 +244,7 @@ const RuntimeDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(AnalyticsServiceLayerLive),Layer.provideMerge(OpenLive),Layer.provideMerge(ServerLifecycleEventsLive),+ Layer.provide(NetService.layer),);const RuntimeServicesLive = ServerRuntimeStartupLive.pipe(diff --git a/apps/web/src/components/chat/TraitsPicker.browser.tsx b/apps/web/src/components/chat/TraitsPicker.browser.tsxindex f39d0defc..dbfbf0928 100644--- a/apps/web/src/components/chat/TraitsPicker.browser.tsx+++ b/apps/web/src/components/chat/TraitsPicker.browser.tsx@@ -630,7 +630,11 @@ describe("TraitsPicker (Codex)", () => {// ── OpenCode TraitsPicker tests ───────────────────────────────────────-async function mountOpenCodePicker(props: { model?: string; options?: OpenCodeModelOptions }) {+async function mountOpenCodePicker(props: {+ model?: string;+ options?: OpenCodeModelOptions;+ models?: ServerProvider["models"];+}) {const threadId = ThreadId.make("thread-opencode-traits");const threadRef = scopeThreadRef(LOCAL_ENVIRONMENT_ID, threadId);const threadKey = scopedThreadKey(threadRef);@@ -665,7 +669,7 @@ async function mountOpenCodePicker(props: { model?: string; options?: OpenCodeMoconst screen = await render(<TraitsPickerprovider="opencode"- models={findTestProvider("opencode").models}+ models={props.models ?? findTestProvider("opencode").models}threadRef={threadRef}model={model}prompt=""@@ -712,6 +716,41 @@ describe("TraitsPicker (OpenCode)", () => {expect(text).not.toContain("Medium · plan");});});++ it("does not show a leading separator when only agent options are available", async () => {+ await using _ = await mountOpenCodePicker({+ model: "openai/gpt-5.4",+ models: [+ {+ slug: "openai/gpt-5.4",+ name: "OpenAI · GPT-5.4",+ isCustom: false,+ capabilities: {+ reasoningEffortLevels: [],+ supportsFastMode: false,+ supportsThinkingToggle: false,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+ variantOptions: [],+ agentOptions: [+ { value: "build", label: "Build", isDefault: true },+ { value: "plan", label: "Plan" },+ ],+ },+ },+ ],+ });++ await page.getByRole("button").click();++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).toContain("Agent");+ expect(text).toContain("Build (default)");+ expect(text).toContain("Plan");+ expect(document.querySelectorAll('[data-slot="menu-separator"]')).toHaveLength(0);+ });+ });});describe("TraitsPicker (Cursor)", () => {diff --git a/apps/web/src/components/chat/TraitsPicker.tsx b/apps/web/src/components/chat/TraitsPicker.tsxindex 77cb1b9a2..d30fba832 100644--- a/apps/web/src/components/chat/TraitsPicker.tsx+++ b/apps/web/src/components/chat/TraitsPicker.tsx@@ -91,7 +91,7 @@ function resolveNamedOption(return matchingOption;}}- return options.find((option) => option.isDefault) ?? null;+ return options.find((option) => option.isDefault) ?? options[0] ?? null;}function getRawContextWindow(@@ -301,6 +301,12 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({allowPromptInjectedEffort,});const defaultEffort = getDefaultEffort(caps);+ const showsEffortSection = showEffort;+ const showsThinkingSection = !showEffort && showThinking;+ const showsFastModeSection = showFastMode;+ const showsContextWindowSection = showContextWindow;+ const hasSectionsBeforeAgent =+ showsEffortSection || showsThinkingSection || showsFastModeSection || showsContextWindowSection;const handleEffortChange = useCallback((value: string) => {@@ -348,7 +354,7 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({return (<>- {showEffort ? (+ {showsEffortSection ? (<><MenuGroup><div className="px-2 pt-1.5 pb-1 font-medium text-muted-foreground text-xs">@@ -378,7 +384,7 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({</MenuRadioGroup></MenuGroup></>- ) : showThinking ? (+ ) : showsThinkingSection ? (<MenuGroup><div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Thinking</div><MenuRadioGroup@@ -394,9 +400,9 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({</MenuRadioGroup></MenuGroup>) : null}- {showFastMode ? (+ {showsFastModeSection ? (<>- {showEffort || showThinking ? <MenuDivider /> : null}+ {showsEffortSection || showsThinkingSection ? <MenuDivider /> : null}<MenuGroup><div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Fast Mode</div><MenuRadioGroup@@ -413,9 +419,11 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({</MenuGroup></>) : null}- {showContextWindow ? (+ {showsContextWindowSection ? (<>- {showEffort || showThinking || showFastMode ? <MenuDivider /> : null}+ {showsEffortSection || showsThinkingSection || showsFastModeSection ? (+ <MenuDivider />+ ) : null}<MenuGroup><div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Context Window@@ -442,7 +450,7 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({) : null}{agentOptions.length > 0 ? (<>- <MenuDivider />+ {hasSectionsBeforeAgent ? <MenuDivider /> : null}<MenuGroup><div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Agent</div><MenuRadioGroupdiff --git a/packages/shared/src/model.ts b/packages/shared/src/model.tsindex d15a3a6c3..ad62debf6 100644--- a/packages/shared/src/model.ts+++ b/packages/shared/src/model.ts@@ -134,7 +134,7 @@ function resolveLabeledOption(if (raw && options.some((option) => option.value === raw)) {return raw;}- return options.find((option) => option.isDefault)?.value;+ return options.find((option) => option.isDefault)?.value ?? options[0]?.value;}export function normalizeOpenCodeModelOptionsWithCapabilities(