ryco-cli 0.1.14 → 0.1.15

package/dist/{OpenCodeDriver-B7htxutj.mjs → OpenCodeDriver-DNApoGdu.mjs}

@@ -1,17 +1,78 @@
 #!/usr/bin/env node
 
-import { Ba as ProviderDriverKind, Bo as EventId, Jo as RuntimeRequestId, Ko as ProviderItemId, Pn as TextGenerationError, Va as ProviderInstanceId, Xo as RuntimeSubagentId, ar as OpenCodeSettings, bi as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, es as TurnId, qo as RuntimeItemId } from "./collectUint8StreamText-RzKEq2NY.mjs";
+import { Ba as ProviderDriverKind, Bo as EventId, Jo as RuntimeRequestId, Ko as ProviderItemId, Pn as TextGenerationError, Va as ProviderInstanceId, Xo as RuntimeSubagentId, ar as OpenCodeSettings, bi as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, es as TurnId, qo as RuntimeItemId } from "./collectUint8StreamText-oFvWyN3_.mjs";
 import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-BP9YjxZB.mjs";
-import { Bn as createModelCapabilities, C as buildCommitMessagePrompt, D as buildThreadPriorityPrompt, Dn as enrichProviderSnapshotWithVersionAdvisory, E as buildPrContentPrompt, Fn as ServerSettingsService, Hn as getModelSelectionStringOptionValue, In as readPersistedAttachment, K as buildServerProvider, M as sanitizePrTitle, Mn as normalizeCommandPath, N as sanitizeThreadTitle, Nn as resolveProviderMaintenanceCapabilitiesEffect, O as buildThreadTitlePrompt, Pn as compareCliVersions, Q as providerModelsFromSettings, S as buildBranchNamePrompt, T as buildIssueContentTitlePrompt, X as nonEmptyTrimmed, Z as parseGenericCliVersion, _ as ProviderEventLoggers, at as createProcessDeviceToolBinding, c as OpenCodeRuntimeError, ct as ProviderAdapterSessionClosedError, d as openCodeRuntimeErrorDetail, dt as ProviderDriverError, f as parseOpenCodeModelSlug, g as toOpenCodeQuestionAnswers, h as toOpenCodePermissionReply, j as sanitizeCommitSubject, k as extractJsonObject, kn as makePackageManagedProviderMaintenanceResolver, l as buildOpenCodePermissionRules, lt as ProviderAdapterSessionNotFoundError, m as toOpenCodeFileParts, ot as ProviderAdapterProcessError, p as runOpenCodeSdk, s as OpenCodeRuntime, st as ProviderAdapterRequestError, t as makeServerQueueMetrics, tt as agentControlHostContext, u as openCodeQuestionId, ut as ProviderAdapterValidationError, v as makeEventNdjsonLogger, w as buildIssueContentPolishPrompt, x as validateRankInboxThreadsResult, z as mergeProviderInstanceEnvironment } from "./bin.mjs";
+import { $ as parseGenericCliVersion, A as buildThreadTitlePrompt, C as validateRankInboxThreadsResult, D as buildIssueContentTitlePrompt, E as buildIssueContentPolishPrompt, F as sanitizeThreadTitle, Fn as resolveProviderMaintenanceCapabilitiesEffect, Hn as createModelCapabilities, In as compareCliVersions, J as buildServerProvider, Ln as ServerSettingsService, N as sanitizeCommitSubject, O as buildPrContentPrompt, P as sanitizePrTitle, Pn as normalizeCommandPath, Q as nonEmptyTrimmed, Rn as readPersistedAttachment, T as buildCommitMessagePrompt, V as mergeProviderInstanceEnvironment, Wn as getModelSelectionStringOptionValue, _ as toOpenCodeQuestionAnswers, b as makeEventNdjsonLogger, c as OpenCodeRuntime, ct as ProviderAdapterProcessError, d as openCodeQuestionId, dt as ProviderAdapterSessionNotFoundError, et as providerModelsFromSettings, f as openCodeRuntimeErrorDetail, ft as ProviderAdapterValidationError, g as toOpenCodePermissionReply, h as toOpenCodeFileParts, j as extractJsonObject, jn as makePackageManagedProviderMaintenanceResolver, k as buildThreadPriorityPrompt, kn as enrichProviderSnapshotWithVersionAdvisory, l as OpenCodeRuntimeError, lt as ProviderAdapterRequestError, m as runOpenCodeSdk, p as parseOpenCodeModelSlug, pt as ProviderDriverError, rt as agentControlHostContext, s as MINIMUM_OPENCODE_VERSION, st as createProcessDeviceToolBinding, t as makeServerQueueMetrics, u as buildOpenCodePermissionRules, ut as ProviderAdapterSessionClosedError, v as verifyOpenCodeServerVersion, w as buildBranchNamePrompt, y as ProviderEventLoggers } from "./bin.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
-import { n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-BuG2fLP8.mjs";
+import { n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-PLtJj7EV.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
-import { Cause, Data, Effect, Exit, Fiber, Queue, Ref, Schema, Scope, Stream } from "effect";
+import { Cause, Data, Effect, Exit, Fiber, Queue, Ref, Schema, Scope, Semaphore, Stream } from "effect";
 import { HttpClient } from "effect/unstable/http";
 import "effect/unstable/process";
 import * as Semaphore$1 from "effect/Semaphore";
+//#region src/provider/OpenCodeServerOwner.ts
+const OPENCODE_MANAGED_SERVER_IDLE_TTL = "30 seconds";
+const makeOpenCodeServerOwner = Effect.fn("makeOpenCodeServerOwner")(function* (settings, environment = process.env) {
+	const runtime = yield* OpenCodeRuntime;
+	const ownerScope = yield* Effect.scope;
+	const mutex = yield* Semaphore$1.make(1);
+	let owned = null;
+	const closeOwned = (record) => Effect.gen(function* () {
+		if (owned === record) owned = null;
+		const idleFiber = record.idleCloseFiber;
+		record.idleCloseFiber = null;
+		if (idleFiber !== null) yield* Fiber.interrupt(idleFiber).pipe(Effect.ignore);
+		yield* Scope.close(record.scope, Exit.void).pipe(Effect.ignore);
+	});
+	const cancelIdleClose = (record) => Effect.gen(function* () {
+		const fiber = record.idleCloseFiber;
+		record.idleCloseFiber = null;
+		if (fiber !== null) yield* Fiber.interrupt(fiber).pipe(Effect.ignore);
+	});
+	const acquireProcess = mutex.withPermit(Effect.gen(function* () {
+		if (owned !== null) {
+			yield* cancelIdleClose(owned);
+			owned.leases += 1;
+			return owned.process;
+		}
+		return yield* Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
+			const processScope = yield* Scope.make();
+			const started = yield* Effect.exit(restore(runtime.startOpenCodeServerProcess({
+				binaryPath: settings.binaryPath,
+				...settings.serverPassword ? { serverPassword: settings.serverPassword } : {},
+				environment
+			}).pipe(Effect.provideService(Scope.Scope, processScope))));
+			if (Exit.isFailure(started)) {
+				yield* Scope.close(processScope, Exit.void).pipe(Effect.ignore);
+				return yield* Effect.failCause(started.cause);
+			}
+			owned = {
+				process: started.value,
+				scope: processScope,
+				leases: 1,
+				idleCloseFiber: null
+			};
+			return started.value;
+		}));
+	}));
+	const releaseProcess = (process) => mutex.withPermit(Effect.gen(function* () {
+		const record = owned;
+		if (record === null || record.process !== process) return;
+		record.leases = Math.max(0, record.leases - 1);
+		if (record.leases > 0 || record.idleCloseFiber !== null) return;
+		record.idleCloseFiber = yield* Effect.sleep(OPENCODE_MANAGED_SERVER_IDLE_TTL).pipe(Effect.andThen(mutex.withPermit(Effect.gen(function* () {
+			if (owned !== record || record.leases > 0) return;
+			record.idleCloseFiber = null;
+			yield* closeOwned(record);
+		}))), Effect.forkIn(ownerScope));
+	}));
+	yield* Effect.addFinalizer(() => mutex.withPermit(Effect.gen(function* () {
+		if (owned !== null) yield* closeOwned(owned);
+	})));
+	return { acquire: Effect.acquireRelease(acquireProcess, releaseProcess) };
+});
+//#endregion
 //#region src/textGeneration/OpenCodeTextGeneration.ts
-const OPENCODE_TEXT_GENERATION_IDLE_TTL = "30 seconds";
 function getOpenCodePromptErrorMessage(error) {
 	if (!error || typeof error !== "object") return null;
 	const message = "data" in error && error.data && typeof error.data === "object" && "message" in error.data && typeof error.data.message === "string" ? error.data.message.trim() : "";
@@ -30,82 +91,10 @@ function getOpenCodeTextResponse(parts) {
 		return [part.text];
 	}).join("").trim();
 }
-const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(function* (openCodeSettings, environment = process.env) {
+const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(function* (openCodeSettings, environment = process.env, options) {
 	const serverConfig = yield* ServerConfig;
 	const openCodeRuntime = yield* OpenCodeRuntime;
-	const idleFiberScope = yield* Effect.acquireRelease(Scope.make(), (scope) => Scope.close(scope, Exit.void));
-	const sharedServerMutex = yield* Semaphore$1.make(1);
-	const sharedServerState = {
-		server: null,
-		serverScope: null,
-		binaryPath: null,
-		activeRequests: 0,
-		idleCloseFiber: 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);
-	});
-	const cancelIdleCloseFiber = Effect.fn("cancelIdleCloseFiber")(function* () {
-		const idleCloseFiber = sharedServerState.idleCloseFiber;
-		sharedServerState.idleCloseFiber = null;
-		if (idleCloseFiber !== null) yield* Fiber.interrupt(idleCloseFiber).pipe(Effect.ignore);
-	});
-	const scheduleIdleClose = Effect.fn("scheduleIdleClose")(function* (server) {
-		yield* cancelIdleCloseFiber();
-		const fiber = yield* Effect.sleep(OPENCODE_TEXT_GENERATION_IDLE_TTL).pipe(Effect.andThen(sharedServerMutex.withPermit(Effect.gen(function* () {
-			if (sharedServerState.server !== server || sharedServerState.activeRequests > 0) return;
-			sharedServerState.idleCloseFiber = null;
-			yield* closeSharedServer();
-		}))), Effect.forkIn(idleFiberScope));
-		sharedServerState.idleCloseFiber = fiber;
-	});
-	const acquireSharedServer = (input) => sharedServerMutex.withPermit(Effect.gen(function* () {
-		yield* cancelIdleCloseFiber();
-		const existingServer = sharedServerState.server;
-		if (existingServer !== null) {
-			if (sharedServerState.binaryPath !== input.binaryPath && sharedServerState.activeRequests === 0) yield* closeSharedServer();
-			else {
-				if (sharedServerState.binaryPath !== input.binaryPath) yield* Effect.logWarning("OpenCode shared server binary path mismatch: requested " + input.binaryPath + " but active server uses " + sharedServerState.binaryPath + "; reusing existing server because there are active requests");
-				sharedServerState.activeRequests += 1;
-				return existingServer;
-			}
-		}
-		return yield* Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
-			const serverScope = yield* Scope.make();
-			const startedExit = yield* Effect.exit(restore(openCodeRuntime.startOpenCodeServerProcess({
-				binaryPath: input.binaryPath,
-				environment
-			}).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);
-			}
-			const server = startedExit.value;
-			sharedServerState.server = server;
-			sharedServerState.serverScope = serverScope;
-			sharedServerState.binaryPath = input.binaryPath;
-			sharedServerState.activeRequests = 1;
-			return server;
-		}));
-	}));
-	const releaseSharedServer = (server) => sharedServerMutex.withPermit(Effect.gen(function* () {
-		if (sharedServerState.server !== server) return;
-		sharedServerState.activeRequests = Math.max(0, sharedServerState.activeRequests - 1);
-		if (sharedServerState.activeRequests === 0) yield* scheduleIdleClose(server);
-	}));
-	yield* Effect.addFinalizer(() => sharedServerMutex.withPermit(Effect.gen(function* () {
-		yield* cancelIdleCloseFiber();
-		sharedServerState.activeRequests = 0;
-		yield* closeSharedServer();
-	})));
+	const serverOwner = options?.serverOwner ?? (openCodeSettings.serverUrl.trim().length === 0 ? yield* makeOpenCodeServerOwner(openCodeSettings, environment) : void 0);
 	const runOpenCodeJson = Effect.fn("runOpenCodeJson")(function* (input) {
 		const parsedModel = parseOpenCodeModelSlug(input.modelSelection.model);
 		if (!parsedModel) return yield* new TextGenerationError({
@@ -143,12 +132,17 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 			const client = yield* openCodeRuntime.createOpenCodeSdkClient({
 				baseUrl: server.url,
 				directory: input.cwd,
-				...openCodeSettings.serverUrl.length > 0 && openCodeSettings.serverPassword ? { serverPassword: openCodeSettings.serverPassword } : {}
+				...server.serverPassword ? { serverPassword: server.serverPassword } : {}
 			}).pipe(Effect.mapError((cause) => new TextGenerationError({
 				operation: input.operation,
 				detail: openCodeRuntimeErrorDetail(cause),
 				cause
 			})));
+			yield* verifyOpenCodeServerVersion(client).pipe(Effect.mapError((cause) => new TextGenerationError({
+				operation: input.operation,
+				detail: openCodeRuntimeErrorDetail(cause),
+				cause
+			})));
 			return yield* Effect.tryPromise({
 				try: async () => {
 					const session = await client.session.create({
@@ -186,10 +180,14 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 				})
 			});
 		});
-		const rawOutput = openCodeSettings.serverUrl.length > 0 ? yield* runAgainstServer({ url: openCodeSettings.serverUrl }) : yield* Effect.acquireUseRelease(acquireSharedServer({
-			binaryPath: openCodeSettings.binaryPath,
-			operation: input.operation
-		}), runAgainstServer, releaseSharedServer);
+		const rawOutput = openCodeSettings.serverUrl.length > 0 ? yield* runAgainstServer({
+			url: openCodeSettings.serverUrl,
+			...openCodeSettings.serverPassword ? { serverPassword: openCodeSettings.serverPassword } : {}
+		}) : yield* Effect.scoped(serverOwner.acquire.pipe(Effect.mapError((cause) => new TextGenerationError({
+			operation: input.operation,
+			detail: openCodeRuntimeErrorDetail(cause),
+			cause
+		})), Effect.flatMap(runAgainstServer)));
 		return yield* Schema.decodeEffect(Schema.fromJsonString(input.outputSchemaJson))(extractJsonObject(rawOutput)).pipe(Effect.catchTag("SchemaError", (cause) => Effect.fail(new TextGenerationError({
 			operation: input.operation,
 			detail: "OpenCode returned invalid structured output.",
@@ -312,6 +310,7 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 //#endregion
 //#region src/provider/Layers/OpenCodeAdapter.ts
 const PROVIDER$1 = ProviderDriverKind.make("opencode");
+const OPENCODE_RESUME_VERSION = 1;
 function nowIso() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -319,6 +318,15 @@ function nonEmptyString(value) {
 	const trimmed = value?.trim();
 	return trimmed && trimmed.length > 0 ? trimmed : void 0;
 }
+function parseOpenCodeResume(value) {
+	if (!value || typeof value !== "object") return;
+	const cursor = value;
+	return cursor.schemaVersion === OPENCODE_RESUME_VERSION && typeof cursor.sessionId === "string" && cursor.sessionId.trim().length > 0 ? { sessionId: cursor.sessionId } : void 0;
+}
+function isOpenCodeNotFound(error) {
+	const cause = error.cause;
+	return typeof cause === "object" && cause !== null && "response" in cause && cause.response?.status === 404;
+}
 function scopedOpenCodeId(sessionId, id) {
 	return `${sessionId}:${id}`;
 }
@@ -331,6 +339,9 @@ function subagentKey(subagentId) {
 function statusFromOpenCodeSubagentState(status) {
 	return status;
 }
+function isOpenCodeRequestEvent(event) {
+	return event.type === "permission.asked" || event.type === "permission.replied" || event.type === "question.asked" || event.type === "question.replied" || event.type === "question.rejected";
+}
 function subagentCompletionStatus(status) {
 	return status;
 }
@@ -340,6 +351,7 @@ function metadataWithEntries(entries) {
 }
 function makeSubtaskSubagentRef(part) {
 	const description = nonEmptyString(part.description) ?? nonEmptyString(part.prompt);
+	const model = part.model ? `${part.model.providerID}/${part.model.modelID}` : void 0;
 	const label = nonEmptyString(part.agent) ?? nonEmptyString(part.command) ?? (description ? "OpenCode subtask" : void 0);
 	return {
 		subagentId: openCodeSubagentId("subtask", part.id),
@@ -347,6 +359,7 @@ function makeSubtaskSubagentRef(part) {
 		capability: "summary",
 		...label ? { label } : {},
 		...description ? { description } : {},
+		...model ? { model } : {},
 		parentProviderItemId: ProviderItemId.make(part.id),
 		metadata: metadataWithEntries([
 			["source", "opencode.subtask"],
@@ -365,6 +378,8 @@ function mergeOpenCodeChildSessionRef(existing, session, parentSessionId) {
 		capability: "transcript",
 		label,
 		...existing?.description ? { description: existing.description } : {},
+		...existing?.model ? { model: existing.model } : {},
+		...existing?.effort ? { effort: existing.effort } : {},
 		providerSessionId: session.id,
 		providerThreadId: session.id,
 		...existing?.parentProviderItemId && { parentProviderItemId: existing.parentProviderItemId },
@@ -401,6 +416,13 @@ const toProcessError = (threadId, cause) => new ProviderAdapterProcessError({
 	detail: OpenCodeRuntimeError.is(cause) ? cause.detail : openCodeRuntimeErrorDetail(cause),
 	cause
 });
+const abortOpenCodeSession = (context, sessionID) => runOpenCodeSdk("session.abort", (signal) => context.client.session.abort({ sessionID }, { signal })).pipe(Effect.timeoutOrElse({
+	duration: "2 seconds",
+	orElse: () => Effect.fail(new OpenCodeRuntimeError({
+		operation: "session.abort",
+		detail: `Timed out aborting OpenCode session '${sessionID}'.`
+	}))
+}));
 const buildEventBase = (input) => Effect.sync(() => crypto.randomUUID()).pipe(Effect.map((uuid) => ({
 	eventId: EventId.make(uuid),
 	provider: PROVIDER$1,
@@ -560,7 +582,12 @@ function updateProviderSession(context, patch, options) {
 }
 const stopOpenCodeContext = Effect.fn("stopOpenCodeContext")(function* (context) {
 	if (yield* Ref.getAndSet(context.stopped, true)) return false;
-	yield* Effect.forEach([context.openCodeSessionId, ...context.childSessionIds], (sessionID) => runOpenCodeSdk("session.abort", () => context.client.session.abort({ sessionID })).pipe(Effect.ignore({ log: true })), { discard: true });
+	const pendingPrompt = context.pendingPrompt;
+	if (pendingPrompt) {
+		context.pendingPrompt = void 0;
+		yield* Fiber.interrupt(pendingPrompt.fiber).pipe(Effect.ignore);
+	}
+	yield* Effect.forEach([context.openCodeSessionId, ...context.childSessionIds], (sessionID) => abortOpenCodeSession(context, sessionID).pipe(Effect.ignore({ log: true })), { discard: true });
 	yield* Scope.close(context.sessionScope, Exit.void);
 	return true;
 });
@@ -675,8 +702,8 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			return context.subagentBySubtaskPartId.get(partKey);
 		};
 		const registerOpenCodeChildSession = Effect.fn("registerOpenCodeChildSession")(function* (context, session, raw) {
-			if (session.parentID !== context.openCodeSessionId) return;
-			const subagent = mergeOpenCodeChildSessionRef(context.subagentBySessionId.get(session.id) ?? takeUnboundOpenCodeSubtask(context), session, context.openCodeSessionId);
+			if (session.parentID !== context.openCodeSessionId && (session.parentID === void 0 || !context.childSessionIds.has(session.parentID))) return;
+			const subagent = mergeOpenCodeChildSessionRef(context.subagentBySessionId.get(session.id) ?? takeUnboundOpenCodeSubtask(context), session, session.parentID ?? context.openCodeSessionId);
 			const known = context.childSessionIds.has(session.id);
 			context.childSessionIds.add(session.id);
 			context.subagentBySessionId.set(session.id, subagent);
@@ -720,6 +747,89 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				child
 			});
 		});
+		const isRelatedOpenCodeSession = Effect.fn("isRelatedOpenCodeSession")(function* (context, candidateSessionId) {
+			if (candidateSessionId === context.openCodeSessionId || context.childSessionIds.has(candidateSessionId)) return true;
+			const seen = /* @__PURE__ */ new Set();
+			let sessionId = candidateSessionId;
+			for (let depth = 0; sessionId !== void 0 && depth < 32; depth += 1) {
+				if (sessionId === context.openCodeSessionId || context.childSessionIds.has(sessionId)) {
+					for (const relatedId of seen) context.childSessionIds.add(relatedId);
+					return true;
+				}
+				if (seen.has(sessionId)) return false;
+				seen.add(sessionId);
+				const currentSessionId = sessionId;
+				const response = yield* runOpenCodeSdk("session.get", () => context.client.session.get({ sessionID: currentSessionId })).pipe(Effect.catchIf(isOpenCodeNotFound, () => Effect.succeed(void 0)));
+				if (!response?.data) return false;
+				sessionId = response.data.parentID;
+			}
+			return false;
+		});
+		const recoverPendingOpenCodeRequests = Effect.fn("recoverPendingOpenCodeRequests")(function* (context) {
+			for (let attempt = 0; attempt < 5; attempt += 1) {
+				if (yield* Ref.get(context.stopped)) return;
+				const result = yield* Effect.all({
+					permissions: runOpenCodeSdk("permission.list", () => context.client.permission.list()),
+					questions: runOpenCodeSdk("question.list", () => context.client.question.list())
+				}).pipe(Effect.exit);
+				if (Exit.isFailure(result)) {
+					if (attempt === 4) {
+						yield* emitForContext(context, {
+							...yield* buildEventBase({ threadId: context.session.threadId }),
+							type: "runtime.warning",
+							payload: {
+								message: "OpenCode pending request recovery failed.",
+								detail: openCodeRuntimeErrorDetail(Cause.squash(result.cause))
+							}
+						});
+						return;
+					}
+					yield* Effect.sleep(`${250 * 2 ** attempt} millis`);
+					continue;
+				}
+				for (const request of result.value.permissions.data ?? []) {
+					if (context.resolvedRequestIds.has(request.id) || context.pendingPermissions.has(request.id) || !(yield* isRelatedOpenCodeSession(context, request.sessionID))) continue;
+					context.pendingPermissions.set(request.id, request);
+					yield* emitForContext(context, {
+						...yield* buildEventBase({
+							threadId: context.session.threadId,
+							turnId: context.activeTurnId,
+							requestId: request.id,
+							raw: {
+								type: "permission.asked",
+								properties: request,
+								recovered: true
+							}
+						}),
+						type: "request.opened",
+						payload: {
+							requestType: mapPermissionToRequestType(request.permission),
+							detail: request.patterns.length > 0 ? request.patterns.join("\n") : request.permission,
+							args: request.metadata
+						}
+					});
+				}
+				for (const request of result.value.questions.data ?? []) {
+					if (context.resolvedRequestIds.has(request.id) || context.pendingQuestions.has(request.id) || !(yield* isRelatedOpenCodeSession(context, request.sessionID))) continue;
+					context.pendingQuestions.set(request.id, request);
+					yield* emitForContext(context, {
+						...yield* buildEventBase({
+							threadId: context.session.threadId,
+							turnId: context.activeTurnId,
+							requestId: request.id,
+							raw: {
+								type: "question.asked",
+								properties: request,
+								recovered: true
+							}
+						}),
+						type: "user-input.requested",
+						payload: { questions: normalizeQuestionRequest(request) }
+					});
+				}
+				return;
+			}
+		});
 		const emitUnexpectedExit = Effect.fn("emitUnexpectedExit")(function* (context, message) {
 			if (yield* Ref.getAndSet(context.stopped, true)) return;
 			const turnId = context.activeTurnId;
@@ -822,8 +932,9 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			const eventSessionId = typeof payloadSessionId === "string" ? payloadSessionId : void 0;
 			const isRootSessionEvent = eventSessionId === context.openCodeSessionId;
 			const isKnownChildSessionEvent = eventSessionId !== void 0 && context.childSessionIds.has(eventSessionId);
-			const isChildSessionCreatedEvent = event.type === "session.created" && event.properties.info.parentID === context.openCodeSessionId;
-			if (!isRootSessionEvent && !isKnownChildSessionEvent && !isChildSessionCreatedEvent) return;
+			const isChildSessionCreatedEvent = event.type === "session.created" && (event.properties.info.parentID === context.openCodeSessionId || event.properties.info.parentID !== void 0 && context.childSessionIds.has(event.properties.info.parentID));
+			const isRelatedRequestEvent = eventSessionId !== void 0 && isOpenCodeRequestEvent(event) && (yield* isRelatedOpenCodeSession(context, eventSessionId).pipe(Effect.orElseSucceed(() => false)));
+			if (!isRootSessionEvent && !isKnownChildSessionEvent && !isChildSessionCreatedEvent && !isRelatedRequestEvent) return;
 			const turnId = context.activeTurnId;
 			yield* writeNativeEventBestEffort(context.session.threadId, {
 				observedAt: nowIso(),
@@ -946,6 +1057,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					break;
 				}
 				case "permission.asked":
+					if (context.resolvedRequestIds.has(event.properties.id) || context.pendingPermissions.has(event.properties.id)) break;
 					context.pendingPermissions.set(event.properties.id, event.properties);
 					yield* emitForContext(context, {
 						...yield* buildEventBase({
@@ -963,6 +1075,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					});
 					break;
 				case "permission.replied":
+					context.resolvedRequestIds.add(event.properties.requestID);
 					context.pendingPermissions.delete(event.properties.requestID);
 					yield* emitForContext(context, {
 						...yield* buildEventBase({
@@ -979,6 +1092,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					});
 					break;
 				case "question.asked":
+					if (context.resolvedRequestIds.has(event.properties.id) || context.pendingQuestions.has(event.properties.id)) break;
 					context.pendingQuestions.set(event.properties.id, event.properties);
 					yield* emitForContext(context, {
 						...yield* buildEventBase({
@@ -992,6 +1106,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					});
 					break;
 				case "question.replied": {
+					context.resolvedRequestIds.add(event.properties.requestID);
 					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(", ") ?? ""]));
@@ -1008,6 +1123,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					break;
 				}
 				case "question.rejected":
+					context.resolvedRequestIds.add(event.properties.requestID);
 					context.pendingQuestions.delete(event.properties.requestID);
 					yield* emitForContext(context, {
 						...yield* buildEventBase({
@@ -1059,7 +1175,13 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 						break;
 					}
 					if (event.properties.status.type === "idle" && turnId) {
+						if (context.pendingPrompt?.turnId === turnId) {
+							context.pendingPrompt.idleEvent = event;
+							break;
+						}
 						context.activeTurnId = void 0;
+						context.activeAgent = void 0;
+						context.activeVariant = void 0;
 						updateProviderSession(context, { status: "ready" }, { clearActiveTurnId: true });
 						yield* emitForContext(context, {
 							...yield* buildEventBase({
@@ -1095,7 +1217,14 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 						break;
 					}
 					const activeTurnId = context.activeTurnId;
+					const pendingPrompt = context.pendingPrompt;
+					if (pendingPrompt && pendingPrompt.turnId === activeTurnId) {
+						context.pendingPrompt = void 0;
+						yield* Fiber.interrupt(pendingPrompt.fiber).pipe(Effect.ignore);
+					}
 					context.activeTurnId = void 0;
+					context.activeAgent = void 0;
+					context.activeVariant = void 0;
 					updateProviderSession(context, {
 						status: "error",
 						lastError: message
@@ -1160,6 +1289,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			const serverUrl = openCodeSettings.serverUrl;
 			const serverPassword = openCodeSettings.serverPassword;
 			const directory = input.cwd ?? serverConfig.cwd;
+			const resumeSessionId = input.resumePolicy === "fresh" ? void 0 : parseOpenCodeResume(input.resumeCursor)?.sessionId;
 			const existing = sessions.get(input.threadId);
 			if (existing) {
 				if (existing.session.runtimeSessionId === runtimeSessionId) return existing.session;
@@ -1178,16 +1308,23 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				const sessionScope = yield* Scope.make();
 				if (deviceToolBinding) yield* Scope.addFinalizer(sessionScope, Effect.sync(() => deviceToolBinding.dispose()));
 				const startedExit = yield* Effect.exit(Effect.gen(function* () {
-					const server = yield* openCodeRuntime.connectToOpenCodeServer({
+					const server = options?.serverOwner ? yield* options.serverOwner.acquire.pipe(Effect.map((process) => ({
+						url: process.url,
+						...process.serverPassword ? { serverPassword: process.serverPassword } : {},
+						exitCode: process.exitCode,
+						external: false
+					}))) : yield* openCodeRuntime.connectToOpenCodeServer({
 						binaryPath,
 						serverUrl,
+						...serverPassword ? { serverPassword } : {},
 						...options?.environment ? { environment: options.environment } : {}
 					});
 					const client = yield* openCodeRuntime.createOpenCodeSdkClient({
 						baseUrl: server.url,
 						directory,
-						...server.external && serverPassword ? { serverPassword } : {}
+						...server.serverPassword ? { serverPassword: server.serverPassword } : {}
 					});
+					yield* verifyOpenCodeServerVersion(client);
 					if (deviceToolBinding) yield* runOpenCodeSdk("mcp.add", () => client.mcp.add({
 						directory,
 						name: `ryco_device_${runtimeSessionId}`,
@@ -1199,13 +1336,18 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 							enabled: true
 						}
 					}));
-					const openCodeSession = yield* runOpenCodeSdk("session.create", () => client.session.create({
+					const adoptedSession = resumeSessionId ? yield* runOpenCodeSdk("session.get", () => client.session.get({ sessionID: resumeSessionId })).pipe(Effect.map((response) => response.data), Effect.catchIf(isOpenCodeNotFound, () => Effect.succeed(void 0))) : void 0;
+					if (adoptedSession) yield* runOpenCodeSdk("session.update", () => client.session.update({
+						sessionID: adoptedSession.id,
+						permission: buildOpenCodePermissionRules(input.runtimeMode)
+					}));
+					const openCodeSession = adoptedSession ? { data: adoptedSession } : yield* runOpenCodeSdk("session.create", () => client.session.create({
 						title: `Ryco ${input.threadId}`,
 						permission: buildOpenCodePermissionRules(input.runtimeMode)
 					}));
 					if (!openCodeSession.data) return yield* new OpenCodeRuntimeError({
-						operation: "session.create",
-						detail: "OpenCode session.create returned no session payload."
+						operation: adoptedSession ? "session.get" : "session.create",
+						detail: adoptedSession ? "OpenCode session.get returned no session payload." : "OpenCode session.create returned no session payload."
 					});
 					return {
 						sessionScope,
@@ -1238,6 +1380,10 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				cwd: directory,
 				...input.modelSelection ? { model: input.modelSelection.model } : {},
 				threadId: input.threadId,
+				resumeCursor: {
+					schemaVersion: OPENCODE_RESUME_VERSION,
+					sessionId: started.openCodeSession.id
+				},
 				createdAt,
 				updatedAt: createdAt
 			};
@@ -1249,6 +1395,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				openCodeSessionId: started.openCodeSession.id,
 				pendingPermissions: /* @__PURE__ */ new Map(),
 				pendingQuestions: /* @__PURE__ */ new Map(),
+				resolvedRequestIds: /* @__PURE__ */ new Set(),
 				partById: /* @__PURE__ */ new Map(),
 				emittedTextByPartId: /* @__PURE__ */ new Map(),
 				messageRoleById: /* @__PURE__ */ new Map(),
@@ -1263,6 +1410,9 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				activeTurnId: void 0,
 				activeAgent: void 0,
 				activeVariant: void 0,
+				promptSemaphore: yield* Semaphore.make(1),
+				pendingPrompt: void 0,
+				promptGeneration: 0,
 				agentControlHostContextDelivered: false,
 				stopped: yield* Ref.make(false),
 				sessionScope: started.sessionScope
@@ -1280,138 +1430,193 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				payload: { providerThreadId: started.openCodeSession.id }
 			});
 			yield* startEventPump(context);
-			yield* hydrateOpenCodeChildSessions(context).pipe(Effect.forkIn(context.sessionScope));
+			yield* Effect.gen(function* () {
+				yield* hydrateOpenCodeChildSessions(context);
+				yield* recoverPendingOpenCodeRequests(context);
+			}).pipe(Effect.forkIn(context.sessionScope));
 			return session;
 		});
 		const sendTurn = Effect.fn("sendTurn")(function* (input) {
 			const context = ensureSessionContext(sessions, input.threadId);
-			const turnId = TurnId.make(`opencode-turn-${yield* Effect.sync(() => crypto.randomUUID())}`);
-			const modelSelection = input.modelSelection ?? (context.session.model ? {
-				instanceId: boundInstanceId,
-				model: context.session.model
-			} : void 0);
-			if (modelSelection !== void 0 && modelSelection.instanceId !== boundInstanceId) return yield* new ProviderAdapterValidationError({
-				provider: PROVIDER$1,
-				operation: "sendTurn",
-				issue: `OpenCode model selection is bound to instance '${modelSelection?.instanceId}', expected '${boundInstanceId}'.`
-			});
-			const parsedModel = parseOpenCodeModelSlug(modelSelection?.model);
-			if (!parsedModel) return yield* new ProviderAdapterValidationError({
-				provider: PROVIDER$1,
-				operation: "sendTurn",
-				issue: "OpenCode model selection must use the 'provider/model' format."
-			});
-			const formatted = formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
-			let text = formatted ? formatted + "\n\n" + (input.input?.trim() ?? "") : input.input?.trim();
-			const attachmentUrlById = /* @__PURE__ */ new Map();
-			const declaredAttachmentBytes = (input.attachments ?? []).reduce((total, attachment) => total + attachment.sizeBytes, 0);
-			if (declaredAttachmentBytes > 52428800) return yield* new ProviderAdapterRequestError({
-				provider: PROVIDER$1,
-				method: "session.prompt",
-				detail: `Attachments total ${declaredAttachmentBytes} bytes; limit is ${PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
-			});
-			let attachmentTotalBytes = 0;
-			for (const attachment of input.attachments ?? []) {
-				const persisted = readPersistedAttachment({
-					attachmentsDir: serverConfig.attachmentsDir,
-					attachment
+			return yield* context.promptSemaphore.withPermits(1)(Effect.gen(function* () {
+				if (sessions.get(input.threadId) !== context || (yield* Ref.get(context.stopped))) return yield* new ProviderAdapterSessionClosedError({
+					provider: PROVIDER$1,
+					threadId: input.threadId
 				});
-				if (!persisted.ok) return yield* new ProviderAdapterRequestError({
+				const turnId = TurnId.make(`opencode-turn-${yield* Effect.sync(() => crypto.randomUUID())}`);
+				const modelSelection = input.modelSelection ?? (context.session.model ? {
+					instanceId: boundInstanceId,
+					model: context.session.model
+				} : void 0);
+				if (modelSelection !== void 0 && modelSelection.instanceId !== boundInstanceId) return yield* new ProviderAdapterValidationError({
 					provider: PROVIDER$1,
-					method: "session.prompt",
-					detail: persisted.reason
+					operation: "sendTurn",
+					issue: `OpenCode model selection is bound to instance '${modelSelection?.instanceId}', expected '${boundInstanceId}'.`
 				});
-				attachmentUrlById.set(attachment.id, `data:${attachment.mimeType};base64,${persisted.bytes.toString("base64")}`);
-				attachmentTotalBytes += persisted.sizeBytes;
-				if (attachmentTotalBytes > 52428800) return yield* new ProviderAdapterRequestError({
+				const parsedModel = parseOpenCodeModelSlug(modelSelection?.model);
+				if (!parsedModel) return yield* new ProviderAdapterValidationError({
+					provider: PROVIDER$1,
+					operation: "sendTurn",
+					issue: "OpenCode model selection must use the 'provider/model' format."
+				});
+				const formatted = formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
+				let text = formatted ? formatted + "\n\n" + (input.input?.trim() ?? "") : input.input?.trim();
+				const attachmentUrlById = /* @__PURE__ */ new Map();
+				const declaredAttachmentBytes = (input.attachments ?? []).reduce((total, attachment) => total + attachment.sizeBytes, 0);
+				if (declaredAttachmentBytes > 52428800) return yield* new ProviderAdapterRequestError({
 					provider: PROVIDER$1,
 					method: "session.prompt",
-					detail: `Attachments total ${attachmentTotalBytes} bytes; limit is ${PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
+					detail: `Attachments total ${declaredAttachmentBytes} bytes; limit is ${PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
 				});
-			}
-			const fileParts = toOpenCodeFileParts({
-				attachments: input.attachments,
-				resolveAttachmentUrl: (attachment) => attachmentUrlById.get(attachment.id) ?? null
-			});
-			if ((!text || text.length === 0) && fileParts.length === 0) return yield* new ProviderAdapterValidationError({
-				provider: PROVIDER$1,
-				operation: "sendTurn",
-				issue: "OpenCode turns require text input or at least one attachment."
-			});
-			if (!context.agentControlHostContextDelivered) {
-				text = `<ryco_host_context>${agentControlHostContext(false)}</ryco_host_context>${text ? `\n\n${text}` : ""}`;
-				context.agentControlHostContextDelivered = true;
-			}
-			const agent = getModelSelectionStringOptionValue(modelSelection, "agent");
-			const variant = getModelSelectionStringOptionValue(modelSelection, "variant");
-			context.activeTurnId = turnId;
-			context.activeAgent = agent ?? (input.interactionMode === "plan" || input.interactionMode === "ask" ? "plan" : void 0);
-			context.activeVariant = variant;
-			updateProviderSession(context, {
-				status: "running",
-				activeTurnId: turnId,
-				model: modelSelection?.model ?? context.session.model
-			}, { clearLastError: true });
-			yield* emitForContext(context, {
-				...yield* buildEventBase({
-					threadId: input.threadId,
-					turnId
-				}),
-				type: "turn.started",
-				payload: {
-					model: modelSelection?.model ?? context.session.model,
-					...variant ? { effort: variant } : {}
+				let attachmentTotalBytes = 0;
+				for (const attachment of input.attachments ?? []) {
+					const persisted = readPersistedAttachment({
+						attachmentsDir: serverConfig.attachmentsDir,
+						attachment
+					});
+					if (!persisted.ok) return yield* new ProviderAdapterRequestError({
+						provider: PROVIDER$1,
+						method: "session.prompt",
+						detail: persisted.reason
+					});
+					attachmentUrlById.set(attachment.id, `data:${attachment.mimeType};base64,${persisted.bytes.toString("base64")}`);
+					attachmentTotalBytes += persisted.sizeBytes;
+					if (attachmentTotalBytes > 52428800) return yield* new ProviderAdapterRequestError({
+						provider: PROVIDER$1,
+						method: "session.prompt",
+						detail: `Attachments total ${attachmentTotalBytes} bytes; limit is ${PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
+					});
 				}
-			});
-			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",
-					text
-				}] : [], ...fileParts]
-			})).pipe(Effect.mapError(toRequestError), Effect.tapError((requestError) => Effect.gen(function* () {
-				context.activeTurnId = void 0;
-				context.activeAgent = void 0;
-				context.activeVariant = void 0;
+				const fileParts = toOpenCodeFileParts({
+					attachments: input.attachments,
+					resolveAttachmentUrl: (attachment) => attachmentUrlById.get(attachment.id) ?? null
+				});
+				if ((!text || text.length === 0) && fileParts.length === 0) return yield* new ProviderAdapterValidationError({
+					provider: PROVIDER$1,
+					operation: "sendTurn",
+					issue: "OpenCode turns require text input or at least one attachment."
+				});
+				if (!context.agentControlHostContextDelivered) {
+					text = `<ryco_host_context>${agentControlHostContext(false)}</ryco_host_context>${text ? `\n\n${text}` : ""}`;
+					context.agentControlHostContextDelivered = true;
+				}
+				const agent = getModelSelectionStringOptionValue(modelSelection, "agent");
+				const variant = getModelSelectionStringOptionValue(modelSelection, "variant");
+				context.activeTurnId = turnId;
+				context.activeAgent = agent ?? (input.interactionMode === "plan" || input.interactionMode === "ask" ? "plan" : void 0);
+				context.activeVariant = variant;
 				updateProviderSession(context, {
-					status: "ready",
-					model: modelSelection?.model ?? context.session.model,
-					lastError: requestError.detail
-				}, { clearActiveTurnId: true });
+					status: "running",
+					activeTurnId: turnId,
+					model: modelSelection?.model ?? context.session.model
+				}, { clearLastError: true });
 				yield* emitForContext(context, {
 					...yield* buildEventBase({
 						threadId: input.threadId,
 						turnId
 					}),
-					type: "turn.aborted",
-					payload: { reason: requestError.detail }
+					type: "turn.started",
+					payload: {
+						model: modelSelection?.model ?? context.session.model,
+						...variant ? { effort: variant } : {}
+					}
 				});
-			})));
-			return {
-				threadId: input.threadId,
-				turnId
-			};
+				context.promptGeneration += 1;
+				const generation = context.promptGeneration;
+				const promptFiber = yield* runOpenCodeSdk("session.promptAsync", (signal) => context.client.session.promptAsync({
+					sessionID: context.openCodeSessionId,
+					model: parsedModel,
+					...context.activeAgent ? { agent: context.activeAgent } : {},
+					...context.activeVariant ? { variant: context.activeVariant } : {},
+					parts: [...text ? [{
+						type: "text",
+						text
+					}] : [], ...fileParts]
+				}, { signal })).pipe(Effect.mapError(toRequestError), Effect.tapError((requestError) => context.activeTurnId === turnId && context.promptGeneration === generation ? Effect.gen(function* () {
+					context.activeTurnId = void 0;
+					context.activeAgent = void 0;
+					context.activeVariant = void 0;
+					updateProviderSession(context, {
+						status: "ready",
+						model: modelSelection?.model ?? context.session.model,
+						lastError: requestError.detail
+					}, { clearActiveTurnId: true });
+					yield* emitForContext(context, {
+						...yield* buildEventBase({
+							threadId: input.threadId,
+							turnId
+						}),
+						type: "turn.aborted",
+						payload: { reason: requestError.detail }
+					});
+				}) : Effect.void)).pipe(Effect.forkIn(context.sessionScope));
+				const pendingPrompt = {
+					turnId,
+					fiber: promptFiber
+				};
+				context.pendingPrompt = pendingPrompt;
+				yield* Fiber.join(promptFiber).pipe(Effect.ensuring(Effect.sync(() => {
+					if (context.pendingPrompt?.fiber === promptFiber) context.pendingPrompt = void 0;
+				})));
+				const completedDuringAdmission = pendingPrompt.idleEvent !== void 0;
+				if (completedDuringAdmission && context.activeTurnId === turnId) {
+					context.activeTurnId = void 0;
+					context.activeAgent = void 0;
+					context.activeVariant = void 0;
+					updateProviderSession(context, { status: "ready" }, { clearActiveTurnId: true });
+					yield* emitForContext(context, {
+						...yield* buildEventBase({
+							threadId: context.session.threadId,
+							turnId,
+							raw: pendingPrompt.idleEvent
+						}),
+						type: "turn.completed",
+						payload: { state: "completed" }
+					});
+				}
+				if (sessions.get(input.threadId) !== context || (yield* Ref.get(context.stopped)) || !completedDuringAdmission && context.activeTurnId !== turnId || context.promptGeneration !== generation) return yield* Effect.interrupt;
+				return {
+					threadId: input.threadId,
+					turnId,
+					resumeCursor: context.session.resumeCursor
+				};
+			}));
 		});
 		const interruptTurn = Effect.fn("interruptTurn")(function* (threadId, turnId) {
 			const context = ensureSessionContext(sessions, threadId);
-			const rootAbortExit = yield* runOpenCodeSdk("session.abort", () => context.client.session.abort({ sessionID: context.openCodeSessionId })).pipe(Effect.mapError(toRequestError), Effect.exit);
-			yield* Effect.forEach(context.childSessionIds, (sessionID) => runOpenCodeSdk("session.abort", () => context.client.session.abort({ sessionID })).pipe(Effect.ignore({ log: true })), { discard: true });
+			const interruptedTurnId = turnId ?? context.activeTurnId;
+			if (turnId !== void 0 && context.activeTurnId !== void 0 && turnId !== context.activeTurnId) return;
+			const pendingPrompt = context.pendingPrompt;
+			if (pendingPrompt && pendingPrompt.turnId === interruptedTurnId) {
+				context.pendingPrompt = void 0;
+				yield* Fiber.interrupt(pendingPrompt.fiber).pipe(Effect.ignore);
+			}
+			const rootAbortExit = yield* abortOpenCodeSession(context, context.openCodeSessionId).pipe(Effect.mapError(toRequestError), Effect.exit);
+			yield* Effect.forEach(context.childSessionIds, (sessionID) => abortOpenCodeSession(context, sessionID).pipe(Effect.ignore({ log: true })), { discard: true });
 			yield* emitStoppedOpenCodeChildren(context, {
 				method: "session.abort",
 				reason: "turn-interrupted"
 			});
 			if (Exit.isFailure(rootAbortExit)) return yield* Effect.failCause(rootAbortExit.cause);
-			if (turnId ?? context.activeTurnId) yield* emitForContext(context, {
-				...yield* buildEventBase({
-					threadId,
-					turnId: turnId ?? context.activeTurnId
-				}),
-				type: "turn.aborted",
-				payload: { reason: "Interrupted by user." }
-			});
+			if (interruptedTurnId) {
+				if (context.activeTurnId === interruptedTurnId) {
+					context.activeTurnId = void 0;
+					context.activeAgent = void 0;
+					context.activeVariant = void 0;
+					updateProviderSession(context, { status: "ready" }, {
+						clearActiveTurnId: true,
+						clearLastError: true
+					});
+				}
+				yield* emitForContext(context, {
+					...yield* buildEventBase({
+						threadId,
+						turnId: interruptedTurnId
+					}),
+					type: "turn.aborted",
+					payload: { reason: "Interrupted by user." }
+				});
+			}
 		});
 		const respondToRequest = Effect.fn("respondToRequest")(function* (threadId, requestId, decision) {
 			const context = ensureSessionContext(sessions, threadId);
@@ -1520,7 +1725,6 @@ const OPENCODE_PRESENTATION = {
 	displayName: "OpenCode",
 	showInteractionModeToggle: false
 };
-const MINIMUM_OPENCODE_VERSION = "1.14.19";
 var OpenCodeProbeError = class extends Data.TaggedError("OpenCodeProbeError") {};
 function normalizeProbeMessage(message) {
 	const trimmed = message.trim();
@@ -1736,7 +1940,7 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 		if (versionExit._tag === "Failure") return fallback(Cause.squash(versionExit.cause));
 		version = parseGenericCliVersion(versionExit.value.stdout) ?? null;
 		if (!version) return fallback(/* @__PURE__ */ new Error(`Unable to determine OpenCode version from \`opencode --version\` output. Ryco requires OpenCode v${MINIMUM_OPENCODE_VERSION} or newer.`), null);
-		if (compareCliVersions(version, MINIMUM_OPENCODE_VERSION) < 0) return buildServerProvider({
+		if (compareCliVersions(version, "1.14.19") < 0) return buildServerProvider({
 			presentation: OPENCODE_PRESENTATION,
 			enabled: openCodeSettings.enabled,
 			checkedAt,
@@ -1754,6 +1958,7 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 		const server = yield* openCodeRuntime.connectToOpenCodeServer({
 			binaryPath: openCodeSettings.binaryPath,
 			serverUrl: openCodeSettings.serverUrl,
+			...openCodeSettings.serverPassword ? { serverPassword: openCodeSettings.serverPassword } : {},
 			environment
 		}).pipe(Effect.mapError((cause) => new OpenCodeProbeError({
 			cause,
@@ -1762,19 +1967,27 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 		const client = yield* openCodeRuntime.createOpenCodeSdkClient({
 			baseUrl: server.url,
 			directory: cwd,
-			...isExternalServer && openCodeSettings.serverPassword ? { serverPassword: openCodeSettings.serverPassword } : {}
+			...server.serverPassword ? { serverPassword: server.serverPassword } : {}
 		}).pipe(Effect.mapError((cause) => new OpenCodeProbeError({
 			cause,
 			detail: openCodeRuntimeErrorDetail(cause)
 		})));
-		return yield* openCodeRuntime.loadOpenCodeInventory(client).pipe(Effect.mapError((cause) => new OpenCodeProbeError({
+		const serverVersion = yield* verifyOpenCodeServerVersion(client).pipe(Effect.mapError((cause) => new OpenCodeProbeError({
 			cause,
 			detail: openCodeRuntimeErrorDetail(cause)
 		})));
+		return {
+			inventory: yield* openCodeRuntime.loadOpenCodeInventory(client).pipe(Effect.mapError((cause) => new OpenCodeProbeError({
+				cause,
+				detail: openCodeRuntimeErrorDetail(cause)
+			}))),
+			serverVersion
+		};
 	})));
 	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 = new Set(inventoryExit.value.providerList.connected).size;
+	version = inventoryExit.value.serverVersion;
+	const models = providerModelsFromSettings(flattenOpenCodeModels(inventoryExit.value.inventory), PROVIDER, customModels, DEFAULT_OPENCODE_MODEL_CAPABILITIES);
+	const connectedCount = new Set(inventoryExit.value.inventory.providerList.connected).size;
 	return buildServerProvider({
 		presentation: OPENCODE_PRESENTATION,
 		enabled: true,
@@ -1803,8 +2016,7 @@ const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatus")(fun
 *
 * Two instances with different `serverUrl`s therefore talk to independent
 * OpenCode servers; when no `serverUrl` is set, the adapter + text-generation
-* shares spin up their own scoped child processes, and those child
-* processes are released when the registry scope closes.
+* shares reuse one scoped child process owned by the provider instance.
 *
 * @module provider/Drivers/OpenCodeDriver
 */
@@ -1865,12 +2077,14 @@ const OpenCodeDriver = {
 			binaryPath: effectiveConfig.binaryPath,
 			env: processEnv
 		});
+		const serverOwner = effectiveConfig.serverUrl.trim().length === 0 ? yield* makeOpenCodeServerOwner(effectiveConfig, processEnv) : void 0;
 		const adapter = yield* makeOpenCodeAdapter(effectiveConfig, {
 			instanceId,
 			environment: processEnv,
+			...serverOwner ? { serverOwner } : {},
 			...eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}
 		});
-		const textGeneration = yield* makeOpenCodeTextGeneration(effectiveConfig, processEnv);
+		const textGeneration = yield* makeOpenCodeTextGeneration(effectiveConfig, processEnv, serverOwner ? { serverOwner } : void 0);
 		const checkProvider = checkOpenCodeProviderStatus(effectiveConfig, serverConfig.cwd, processEnv).pipe(Effect.map(stampIdentity), Effect.provideService(OpenCodeRuntime, openCodeRuntime));
 		const snapshot = yield* makeManagedServerProvider({
 			maintenanceCapabilities,
@@ -1880,6 +2094,7 @@ const OpenCodeDriver = {
 			initialSnapshot: (settings) => stampIdentity(makePendingOpenCodeProvider(settings)),
 			checkProvider,
 			enrichSnapshot: ({ snapshot, publishSnapshot }) => enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.provideService(ServerSettingsService, serverSettings), Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
+			retainInventoryOnError: true,
 			refreshInterval: null
 		}).pipe(Effect.mapError((cause) => new ProviderDriverError({
 			driver: DRIVER_KIND,