ryco-cli 0.1.5 → 0.1.7

package/dist/{OpenCodeDriver-fwqXoVyH.mjs → OpenCodeDriver-BhvLOmvn.mjs}

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 
-import { In as ProviderDriverKind, Ln as ProviderInstanceId, R as OpenCodeSettings, mr as RuntimeRequestId, or as EventId, pr as RuntimeItemId, v as TextGenerationError, vr as TurnId } from "./collectUint8StreamText-DuFJyaQh.mjs";
-import { L as sanitizeBranchFragment, R as sanitizeFeatureBranchName, U as ServerConfig } from "./Metrics-BCOc3Ml2.mjs";
-import { $ as ProviderAdapterSessionClosedError, E as enrichProviderSnapshotWithVersionAdvisory, I as mergeProviderInstanceEnvironment, J as parseGenericCliVersion, M as resolveProviderMaintenanceCapabilitiesEffect, N as compareCliVersions, O as makePackageManagedProviderMaintenanceResolver, Q as ProviderAdapterRequestError, U as buildServerProvider, Y as providerModelsFromSettings, Z as ProviderAdapterProcessError, a as OpenCodeRuntimeError, c as openCodeRuntimeErrorDetail, cn as getModelSelectionStringOptionValue, d as toOpenCodeFileParts, et as ProviderAdapterSessionNotFoundError, f as toOpenCodePermissionReply, h as makeEventNdjsonLogger, i as OpenCodeRuntime, j as normalizeCommandPath, l as parseOpenCodeModelSlug, m as ProviderEventLoggers, nt as ProviderDriverError, o as buildOpenCodePermissionRules, on as createModelCapabilities, p as toOpenCodeQuestionAnswers, q as nonEmptyTrimmed, rn as resolveAttachmentPath, s as openCodeQuestionId, tt as ProviderAdapterValidationError, u as runOpenCodeSdk } from "./bin.mjs";
-import { a as buildIssueContentTitlePrompt, c as extractJsonObject, d as sanitizePrTitle, f as sanitizeThreadTitle, i as buildIssueContentPolishPrompt, n as buildBranchNamePrompt, o as buildPrContentPrompt, r as buildCommitMessagePrompt, s as buildThreadTitlePrompt, t as makeManagedServerProvider, u as sanitizeCommitSubject } from "./makeManagedServerProvider-wFGZ2-vd.mjs";
+import { Bn as ProviderInstanceId, Sr as TurnId, V as OpenCodeSettings, _r as RuntimeRequestId, gr as RuntimeItemId, hr as ProviderItemId, lr as EventId, vr as RuntimeSubagentId, x as TextGenerationError, zn as ProviderDriverKind } from "./collectUint8StreamText-Lv4GGI79.mjs";
+import { U as sanitizeBranchFragment, W as sanitizeFeatureBranchName, Y as ServerConfig } from "./Metrics-6Xj17Se3.mjs";
+import { A as nonEmptyTrimmed, E as buildServerProvider, F as ProviderAdapterRequestError, I as ProviderAdapterSessionClosedError, L as ProviderAdapterSessionNotFoundError, M as providerModelsFromSettings, P as ProviderAdapterProcessError, Qt as makePackageManagedProviderMaintenanceResolver, R as ProviderAdapterValidationError, Xt as enrichProviderSnapshotWithVersionAdvisory, a as OpenCodeRuntime, an as resolveAttachmentPath, c as openCodeQuestionId, cn as createModelCapabilities, d as runOpenCodeSdk, f as toOpenCodeFileParts, g as makeEventNdjsonLogger, h as ProviderEventLoggers, in as ServerSettingsService, j as parseGenericCliVersion, l as openCodeRuntimeErrorDetail, m as toOpenCodeQuestionAnswers, nn as resolveProviderMaintenanceCapabilitiesEffect, o as OpenCodeRuntimeError, p as toOpenCodePermissionReply, rn as compareCliVersions, s as buildOpenCodePermissionRules, t as makeServerQueueMetrics, tn as normalizeCommandPath, u as parseOpenCodeModelSlug, un as getModelSelectionStringOptionValue, y as mergeProviderInstanceEnvironment, z as ProviderDriverError } from "./bin.mjs";
+import { a as buildIssueContentTitlePrompt, c as extractJsonObject, d as sanitizePrTitle, f as sanitizeThreadTitle, i as buildIssueContentPolishPrompt, n as buildBranchNamePrompt, o as buildPrContentPrompt, r as buildCommitMessagePrompt, s as buildThreadTitlePrompt, t as makeManagedServerProvider, u as sanitizeCommitSubject } from "./makeManagedServerProvider-CkPEptun.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
 import { Cause, Data, Effect, Exit, Fiber, Queue, Random, Ref, Schema, Scope, Stream } from "effect";
 import { HttpClient } from "effect/unstable/http";
-import * as Semaphore$1 from "effect/Semaphore";
 import "effect/unstable/process";
+import * as Semaphore$1 from "effect/Semaphore";
 //#region src/textGeneration/OpenCodeTextGeneration.ts
 const OPENCODE_TEXT_GENERATION_IDLE_TTL = "30 seconds";
 function getOpenCodePromptErrorMessage(error) {
@@ -279,6 +279,68 @@ const PROVIDER$1 = ProviderDriverKind.make("opencode");
 function nowIso() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
+function nonEmptyString(value) {
+	const trimmed = value?.trim();
+	return trimmed && trimmed.length > 0 ? trimmed : void 0;
+}
+function scopedOpenCodeId(sessionId, id) {
+	return `${sessionId}:${id}`;
+}
+function openCodeSubagentId(kind, id) {
+	return RuntimeSubagentId.make(`opencode:${kind}:${id}`);
+}
+function subagentKey(subagentId) {
+	return String(subagentId);
+}
+function statusFromOpenCodeSubagentState(status) {
+	return status;
+}
+function subagentCompletionStatus(status) {
+	return status;
+}
+function metadataWithEntries(entries) {
+	const metadata = Object.fromEntries(entries.filter(([, value]) => value !== void 0 && value !== null && value !== ""));
+	return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+function makeSubtaskSubagentRef(part) {
+	const description = nonEmptyString(part.description) ?? nonEmptyString(part.prompt);
+	const label = nonEmptyString(part.agent) ?? nonEmptyString(part.command) ?? (description ? "OpenCode subtask" : void 0);
+	return {
+		subagentId: openCodeSubagentId("subtask", part.id),
+		origin: "native",
+		capability: "summary",
+		...label ? { label } : {},
+		...description ? { description } : {},
+		parentProviderItemId: ProviderItemId.make(part.id),
+		metadata: metadataWithEntries([
+			["source", "opencode.subtask"],
+			["prompt", nonEmptyString(part.prompt)],
+			["agent", nonEmptyString(part.agent)],
+			["command", nonEmptyString(part.command)],
+			["model", part.model]
+		])
+	};
+}
+function mergeOpenCodeChildSessionRef(existing, session, parentSessionId) {
+	const label = nonEmptyString(session.title) ?? existing?.label ?? "OpenCode subagent";
+	return {
+		subagentId: existing?.subagentId ?? openCodeSubagentId("session", session.id),
+		origin: "native",
+		capability: "transcript",
+		label,
+		...existing?.description ? { description: existing.description } : {},
+		providerSessionId: session.id,
+		providerThreadId: session.id,
+		...existing?.parentProviderItemId && { parentProviderItemId: existing.parentProviderItemId },
+		metadata: {
+			...existing?.metadata,
+			source: "opencode.session",
+			parentSessionId,
+			slug: session.slug,
+			directory: session.directory
+		}
+	};
+}
 /**
 * Map a tagged OpenCodeRuntimeError produced by {@link runOpenCodeSdk} into
 * the adapter-boundary `ProviderAdapterRequestError`. SDK-method-level call
@@ -422,7 +484,7 @@ function isoFromEpochMs(value) {
 	return new Date(value).toISOString();
 }
 function messageRoleForPart(context, part) {
-	const known = context.messageRoleById.get(part.messageID);
+	const known = context.messageRoleById.get(scopedOpenCodeId(part.sessionID, part.messageID));
 	if (known) return known;
 	return part.type === "tool" ? "assistant" : void 0;
 }
@@ -474,6 +536,12 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 		const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 		const managedNativeEventLogger = options?.nativeEventLogger === void 0 ? nativeEventLogger : void 0;
 		const runtimeEvents = yield* Queue.unbounded();
+		const runtimeEventQueueMetrics = yield* makeServerQueueMetrics({
+			queue: "provider.adapter.runtimeEvents",
+			component: "OpenCodeAdapter",
+			provider: PROVIDER$1,
+			providerInstanceId: boundInstanceId
+		});
 		const sessions = /* @__PURE__ */ new Map();
 		yield* Effect.addFinalizer(() => Effect.gen(function* () {
 			const contexts = [...sessions.values()];
@@ -483,10 +551,126 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				discard: true
 			});
 			if (managedNativeEventLogger !== void 0) yield* managedNativeEventLogger.close();
-		}).pipe(Effect.ensuring(Queue.shutdown(runtimeEvents))));
-		const emit = (event) => Queue.offer(runtimeEvents, event).pipe(Effect.asVoid);
+		}).pipe(Effect.ensuring(runtimeEventQueueMetrics.reset), Effect.ensuring(Queue.shutdown(runtimeEvents))));
+		const emit = (event) => Queue.offer(runtimeEvents, event).pipe(Effect.andThen(runtimeEventQueueMetrics.recordEnqueued()), Effect.asVoid);
 		const writeNativeEvent = (threadId, event) => nativeEventLogger ? nativeEventLogger.write(event, threadId) : Effect.void;
 		const writeNativeEventBestEffort = (threadId, event) => writeNativeEvent(threadId, event).pipe(Effect.catchCause(() => Effect.void));
+		const emitOpenCodeSubagentStarted = Effect.fn("emitOpenCodeSubagentStarted")(function* (context, subagent, raw) {
+			const key = subagentKey(subagent.subagentId);
+			if (context.startedSubagentIds.has(key)) return;
+			context.startedSubagentIds.add(key);
+			yield* emit({
+				...yield* buildEventBase({
+					threadId: context.session.threadId,
+					turnId: context.activeTurnId,
+					raw
+				}),
+				type: "subagent.started",
+				payload: { subagent }
+			});
+		});
+		const emitOpenCodeSubagentUpdated = Effect.fn("emitOpenCodeSubagentUpdated")(function* (context, input) {
+			yield* emitOpenCodeSubagentStarted(context, input.subagent, input.raw);
+			yield* emit({
+				...yield* buildEventBase({
+					threadId: context.session.threadId,
+					turnId: context.activeTurnId,
+					raw: input.raw
+				}),
+				type: "subagent.updated",
+				payload: {
+					subagent: input.subagent,
+					...input.status ? { status: input.status } : {},
+					...input.summary ? { summary: input.summary } : {},
+					...input.detail ? { detail: input.detail } : {}
+				}
+			});
+		});
+		const emitOpenCodeSubagentCompleted = Effect.fn("emitOpenCodeSubagentCompleted")(function* (context, input) {
+			const key = subagentKey(input.subagent.subagentId);
+			if (context.completedSubagentIds.has(key)) return;
+			yield* emitOpenCodeSubagentStarted(context, input.subagent, input.raw);
+			context.completedSubagentIds.add(key);
+			yield* emit({
+				...yield* buildEventBase({
+					threadId: context.session.threadId,
+					turnId: context.activeTurnId,
+					raw: input.raw
+				}),
+				type: "subagent.completed",
+				payload: {
+					subagent: input.subagent,
+					status: input.status,
+					...input.summary ? { summary: input.summary } : {}
+				}
+			});
+		});
+		const bindOpenCodeSubtaskPart = Effect.fn("bindOpenCodeSubtaskPart")(function* (context, part, raw) {
+			const partKey = scopedOpenCodeId(part.sessionID, part.id);
+			const existing = context.subagentBySubtaskPartId.get(partKey);
+			const subagent = existing ?? makeSubtaskSubagentRef(part);
+			context.subagentBySubtaskPartId.set(partKey, subagent);
+			if (!existing && !context.unboundSubtaskPartIds.includes(partKey)) context.unboundSubtaskPartIds.push(partKey);
+			yield* emitOpenCodeSubagentUpdated(context, {
+				subagent,
+				status: statusFromOpenCodeSubagentState("starting"),
+				summary: nonEmptyString(part.description) ?? nonEmptyString(part.prompt),
+				detail: nonEmptyString(part.prompt),
+				raw
+			});
+			return subagent;
+		});
+		const takeUnboundOpenCodeSubtask = (context) => {
+			const partKey = context.unboundSubtaskPartIds.shift();
+			if (!partKey) return;
+			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);
+			const known = context.childSessionIds.has(session.id);
+			context.childSessionIds.add(session.id);
+			context.subagentBySessionId.set(session.id, subagent);
+			if (known) {
+				yield* emitOpenCodeSubagentUpdated(context, {
+					subagent,
+					status: statusFromOpenCodeSubagentState("running"),
+					raw
+				});
+				return subagent;
+			}
+			const wasStartedFromSubtask = context.startedSubagentIds.has(subagentKey(subagent.subagentId));
+			yield* emitOpenCodeSubagentStarted(context, subagent, raw);
+			if (wasStartedFromSubtask) yield* emitOpenCodeSubagentUpdated(context, {
+				subagent,
+				status: statusFromOpenCodeSubagentState("running"),
+				raw
+			});
+			return subagent;
+		});
+		const hydrateOpenCodeChildSessions = Effect.fn("hydrateOpenCodeChildSessions")(function* (context) {
+			const children = yield* runOpenCodeSdk("session.children", () => context.client.session.children({ sessionID: context.openCodeSessionId })).pipe(Effect.map((response) => {
+				const value = response;
+				if (Array.isArray(value)) return value;
+				const data = value.data;
+				return Array.isArray(data) ? data : [];
+			}), Effect.catchCause((cause) => Effect.gen(function* () {
+				const error = Cause.squash(cause);
+				yield* emit({
+					...yield* buildEventBase({ threadId: context.session.threadId }),
+					type: "runtime.warning",
+					payload: {
+						message: "OpenCode child session hydration failed.",
+						detail: OpenCodeRuntimeError.is(error) ? error.detail : openCodeRuntimeErrorDetail(error)
+					}
+				});
+				return [];
+			})));
+			for (const child of children) yield* registerOpenCodeChildSession(context, child, {
+				method: "session.children",
+				child
+			});
+		});
 		const emitUnexpectedExit = Effect.fn("emitUnexpectedExit")(function* (context, message) {
 			if (yield* Ref.getAndSet(context.stopped, true)) return;
 			const turnId = context.activeTurnId;
@@ -521,29 +705,52 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 		const emitAssistantTextDelta = Effect.fn("emitAssistantTextDelta")(function* (context, part, turnId, raw) {
 			const text = textFromPart(part);
 			if (text === void 0) return;
-			const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(context.emittedTextByPartId.get(part.id), text);
-			context.emittedTextByPartId.set(part.id, latestText);
-			if (latestText !== text) context.partById.set(part.id, part.type === "text" || part.type === "reasoning" ? {
+			const partKey = scopedOpenCodeId(part.sessionID, part.id);
+			const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(context.emittedTextByPartId.get(partKey), text);
+			context.emittedTextByPartId.set(partKey, latestText);
+			if (latestText !== text) context.partById.set(partKey, part.type === "text" || part.type === "reasoning" ? {
 				...part,
 				text: latestText
 			} : part);
-			if (deltaToEmit.length > 0) yield* emit({
-				...yield* buildEventBase({
-					threadId: context.session.threadId,
-					turnId,
-					itemId: part.id,
-					createdAt: part.type === "text" || part.type === "reasoning" ? isoFromEpochMs(part.time?.start) : void 0,
-					raw
-				}),
-				type: "content.delta",
-				payload: {
-					streamKind: resolveTextStreamKind(part),
-					delta: deltaToEmit
-				}
-			});
-			if (part.type === "text" && part.time?.end !== void 0 && !context.completedAssistantPartIds.has(part.id)) {
-				context.completedAssistantPartIds.add(part.id);
-				yield* emit({
+			if (deltaToEmit.length > 0) {
+				const subagent = context.subagentBySessionId.get(part.sessionID);
+				if (subagent) yield* emit({
+					...yield* buildEventBase({
+						threadId: context.session.threadId,
+						turnId,
+						itemId: part.id,
+						createdAt: part.type === "text" || part.type === "reasoning" ? isoFromEpochMs(part.time?.start) : void 0,
+						raw
+					}),
+					type: "subagent.message.delta",
+					payload: {
+						subagentId: subagent.subagentId,
+						delta: deltaToEmit,
+						streamKind: resolveTextStreamKind(part),
+						role: "assistant",
+						providerSessionId: part.sessionID,
+						providerThreadId: part.sessionID,
+						providerMessageId: part.messageID
+					}
+				});
+				else yield* emit({
+					...yield* buildEventBase({
+						threadId: context.session.threadId,
+						turnId,
+						itemId: part.id,
+						createdAt: part.type === "text" || part.type === "reasoning" ? isoFromEpochMs(part.time?.start) : void 0,
+						raw
+					}),
+					type: "content.delta",
+					payload: {
+						streamKind: resolveTextStreamKind(part),
+						delta: deltaToEmit
+					}
+				});
+			}
+			if (part.type === "text" && part.time?.end !== void 0 && !context.completedAssistantPartIds.has(partKey)) {
+				context.completedAssistantPartIds.add(partKey);
+				if (!context.subagentBySessionId.get(part.sessionID)) yield* emit({
 					...yield* buildEventBase({
 						threadId: context.session.threadId,
 						turnId,
@@ -562,45 +769,73 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			}
 		});
 		const handleSubscribedEvent = Effect.fn("handleSubscribedEvent")(function* (context, event) {
-			if (("properties" in event ? event.properties.sessionID : void 0) !== context.openCodeSessionId) return;
+			const payloadSessionId = "properties" in event ? event.properties.sessionID : void 0;
+			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 turnId = context.activeTurnId;
 			yield* writeNativeEventBestEffort(context.session.threadId, {
 				observedAt: nowIso(),
 				event: {
 					provider: PROVIDER$1,
 					threadId: context.session.threadId,
-					providerThreadId: context.openCodeSessionId,
+					providerThreadId: eventSessionId ?? context.openCodeSessionId,
 					type: event.type,
 					...turnId ? { turnId } : {},
 					payload: event
 				}
 			});
 			switch (event.type) {
+				case "session.created":
+					yield* registerOpenCodeChildSession(context, event.properties.info, event);
+					break;
 				case "message.updated":
-					context.messageRoleById.set(event.properties.info.id, event.properties.info.role);
+					context.messageRoleById.set(scopedOpenCodeId(event.properties.sessionID, 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;
+						if (part.sessionID !== event.properties.sessionID || part.messageID !== event.properties.info.id) continue;
 						yield* emitAssistantTextDelta(context, part, turnId, event);
 					}
 					break;
 				case "message.removed":
-					context.messageRoleById.delete(event.properties.messageID);
+					context.messageRoleById.delete(scopedOpenCodeId(event.properties.sessionID, event.properties.messageID));
 					break;
 				case "message.part.delta": {
-					const existingPart = context.partById.get(event.properties.partID);
+					const partKey = scopedOpenCodeId(event.properties.sessionID, event.properties.partID);
+					const existingPart = context.partById.get(partKey);
 					if (!existingPart) break;
 					if (messageRoleForPart(context, existingPart) !== "assistant") break;
 					const streamKind = resolveTextStreamKind(existingPart);
 					const delta = event.properties.delta;
 					if (delta.length === 0) break;
-					const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(context.emittedTextByPartId.get(event.properties.partID) ?? textFromPart(existingPart) ?? "", delta);
+					const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(context.emittedTextByPartId.get(partKey) ?? textFromPart(existingPart) ?? "", 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, {
+					context.emittedTextByPartId.set(partKey, nextText);
+					if (existingPart.type === "text" || existingPart.type === "reasoning") context.partById.set(partKey, {
 						...existingPart,
 						text: nextText
 					});
-					yield* emit({
+					const subagent = context.subagentBySessionId.get(event.properties.sessionID);
+					if (subagent) yield* emit({
+						...yield* buildEventBase({
+							threadId: context.session.threadId,
+							turnId,
+							itemId: event.properties.partID,
+							raw: event
+						}),
+						type: "subagent.message.delta",
+						payload: {
+							subagentId: subagent.subagentId,
+							delta: deltaToEmit,
+							streamKind,
+							role: "assistant",
+							providerSessionId: event.properties.sessionID,
+							providerThreadId: event.properties.sessionID,
+							providerMessageId: event.properties.messageID
+						}
+					});
+					else yield* emit({
 						...yield* buildEventBase({
 							threadId: context.session.threadId,
 							turnId,
@@ -617,12 +852,24 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				}
 				case "message.part.updated": {
 					const part = event.properties.part;
-					context.partById.set(part.id, part);
+					context.partById.set(scopedOpenCodeId(part.sessionID, part.id), part);
 					if (messageRoleForPart(context, part) === "assistant") yield* emitAssistantTextDelta(context, part, turnId, event);
+					if (part.type === "subtask" && part.sessionID === context.openCodeSessionId) yield* bindOpenCodeSubtaskPart(context, part, 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 childSubagent = context.subagentBySessionId.get(part.sessionID);
+						if (childSubagent) {
+							yield* emitOpenCodeSubagentUpdated(context, {
+								subagent: childSubagent,
+								status: statusFromOpenCodeSubagentState("running"),
+								summary: title,
+								detail,
+								raw: event
+							});
+							break;
+						}
 						const payload = {
 							itemType,
 							...part.state.status === "error" ? { status: "failed" } : part.state.status === "completed" ? { status: "completed" } : { status: "inProgress" },
@@ -724,7 +971,25 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 						payload: { answers: {} }
 					});
 					break;
-				case "session.status":
+				case "session.status": {
+					const childSubagent = context.subagentBySessionId.get(event.properties.sessionID);
+					if (childSubagent) {
+						if (event.properties.status.type === "idle") {
+							yield* emitOpenCodeSubagentCompleted(context, {
+								subagent: childSubagent,
+								status: subagentCompletionStatus("completed"),
+								raw: event
+							});
+							break;
+						}
+						yield* emitOpenCodeSubagentUpdated(context, {
+							subagent: childSubagent,
+							status: statusFromOpenCodeSubagentState("running"),
+							...event.properties.status.type === "retry" ? { detail: event.properties.status.message } : {},
+							raw: event
+						});
+						break;
+					}
 					if (event.properties.status.type === "busy") updateProviderSession(context, {
 						status: "running",
 						activeTurnId: turnId
@@ -758,8 +1023,28 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 						});
 					}
 					break;
+				}
+				case "session.idle": {
+					const childSubagent = context.subagentBySessionId.get(event.properties.sessionID);
+					if (childSubagent) yield* emitOpenCodeSubagentCompleted(context, {
+						subagent: childSubagent,
+						status: subagentCompletionStatus("completed"),
+						raw: event
+					});
+					break;
+				}
 				case "session.error": {
 					const message = sessionErrorMessage(event.properties.error);
+					const childSubagent = event.properties.sessionID !== void 0 ? context.subagentBySessionId.get(event.properties.sessionID) : void 0;
+					if (childSubagent) {
+						yield* emitOpenCodeSubagentCompleted(context, {
+							subagent: childSubagent,
+							status: subagentCompletionStatus("failed"),
+							summary: message,
+							raw: event
+						});
+						break;
+					}
 					const activeTurnId = context.activeTurnId;
 					context.activeTurnId = void 0;
 					updateProviderSession(context, {
@@ -887,6 +1172,12 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				emittedTextByPartId: /* @__PURE__ */ new Map(),
 				messageRoleById: /* @__PURE__ */ new Map(),
 				completedAssistantPartIds: /* @__PURE__ */ new Set(),
+				childSessionIds: /* @__PURE__ */ new Set(),
+				subagentBySessionId: /* @__PURE__ */ new Map(),
+				subagentBySubtaskPartId: /* @__PURE__ */ new Map(),
+				unboundSubtaskPartIds: [],
+				startedSubagentIds: /* @__PURE__ */ new Set(),
+				completedSubagentIds: /* @__PURE__ */ new Set(),
 				turns: [],
 				activeTurnId: void 0,
 				activeAgent: void 0,
@@ -895,7 +1186,6 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				sessionScope: started.sessionScope
 			};
 			sessions.set(input.threadId, context);
-			yield* startEventPump(context);
 			yield* emit({
 				...yield* buildEventBase({ threadId: input.threadId }),
 				type: "session.started",
@@ -906,6 +1196,8 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				type: "thread.started",
 				payload: { providerThreadId: started.openCodeSession.id }
 			});
+			yield* startEventPump(context);
+			yield* hydrateOpenCodeChildSessions(context).pipe(Effect.forkIn(context.sessionScope));
 			return session;
 		});
 		const sendTurn = Effect.fn("sendTurn")(function* (input) {
@@ -1095,7 +1387,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			rollbackThread,
 			stopAll,
 			get streamEvents() {
-				return Stream.fromQueue(runtimeEvents);
+				return Stream.fromQueue(runtimeEvents).pipe(Stream.tap(() => runtimeEventQueueMetrics.recordDequeued()));
 			}
 		};
 	});
@@ -1428,6 +1720,7 @@ const OpenCodeDriver = {
 		const openCodeRuntime = yield* OpenCodeRuntime;
 		const serverConfig = yield* ServerConfig;
 		const httpClient = yield* HttpClient.HttpClient;
+		const serverSettings = yield* ServerSettingsService;
 		const eventLoggers = yield* ProviderEventLoggers;
 		const processEnv = mergeProviderInstanceEnvironment(environment);
 		const continuationIdentity = defaultProviderContinuationIdentity({
@@ -1469,7 +1762,7 @@ const OpenCodeDriver = {
 				haveSettingsChanged: () => false,
 				initialSnapshot: (settings) => stampIdentity(makePendingOpenCodeProvider(settings)),
 				checkProvider,
-				enrichSnapshot: ({ snapshot, publishSnapshot }) => enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
+				enrichSnapshot: ({ snapshot, publishSnapshot }) => enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.provideService(ServerSettingsService, serverSettings), Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
 				refreshInterval: null
 			}).pipe(Effect.mapError((cause) => new ProviderDriverError({
 				driver: DRIVER_KIND,