ryco-cli 0.1.25 → 0.1.26

package/dist/{OpenCodeDriver-Bz_uJdMA.mjs → OpenCodeDriver-CnWJHyDJ.mjs}

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
 
-import { as as EventId, ds as ProviderItemId, eo as ProviderDriverKind, fs as RuntimeItemId, hs as RuntimeSubagentId, ji as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, ps as RuntimeRequestId, to as ProviderInstanceId, ur as OpenCodeSettings, ys as TurnId, zn as TextGenerationError } from "./collectUint8StreamText-CE1Re5Ij.mjs";
-import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-a1h4iBQi.mjs";
-import { $ as mergeProviderInstanceEnvironment, $n as resolveAttachmentPath, B as buildPrContentPrompt, C as openCodeRuntimeErrorDetail, Ct as ProviderAdapterSessionNotFoundError, D as toOpenCodePermissionReply, E as toOpenCodeFileParts, F as validateRankInboxThreadsResult, G as sanitizeCommitSubject, H as buildThreadTitlePrompt, Hn as enrichProviderSnapshotWithVersionAdvisory, I as buildBranchNamePrompt, Jn as resolveProviderMaintenanceCapabilitiesEffect, K as sanitizePrTitle, L as buildCommitMessagePrompt, M as makeEventNdjsonLogger, O as toOpenCodeQuestionAnswers, Qn as readPersistedAttachment, R as buildIssueContentPolishPrompt, S as openCodeQuestionId, St as ProviderAdapterSessionClosedError, T as runOpenCodeSdk, Tt as ProviderDriverError, U as extractJsonObject, V as buildThreadPriorityPrompt, Wn as makePackageManagedProviderMaintenanceResolver, Xn as ServerSettingsService, Yn as compareCliVersions, _ as MINIMUM_OPENCODE_VERSION, b as buildOpenCodePermissionRules, bt as ProviderAdapterProcessError, dt as parseGenericCliVersion, ft as providerModelsFromSettings, ht as agentControlHostContext, ir as getModelSelectionStringOptionValue, j as ProviderEventLoggers, k as verifyOpenCodeServerVersion, nr as createModelCapabilities, ot as buildServerProvider, q as sanitizeThreadTitle, qn as normalizeCommandPath, t as makeServerQueueMetrics, ut as nonEmptyTrimmed, v as OpenCodeRuntime, w as parseOpenCodeModelSlug, wt as ProviderAdapterValidationError, x as isOpenCodeNativeAttachment, xt as ProviderAdapterRequestError, y as OpenCodeRuntimeError, yt as createProcessDeviceToolBinding, z as buildIssueContentTitlePrompt } from "./bin.mjs";
-import { a as formatAttachmentPathLines, i as appendAttachmentPathLines, n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-CwYhl_P-.mjs";
-import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
+import { As as EventId, Bs as RuntimeSubagentId, Eo as ProviderInstanceId, Is as ProviderItemId, Ls as RuntimeItemId, Pr as OpenCodeSettings, Rs as RuntimeRequestId, To as ProviderDriverKind, Ws as TurnId, cr as TextGenerationError, na as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES } from "./src-DtEOcXdl.mjs";
+import { Z as ServerConfig } from "./Metrics-C-3MahDy.mjs";
+import { m as sanitizeFeatureBranchName, p as sanitizeBranchFragment } from "./git-C4iJMbBu.mjs";
+import { $ as buildCommitMessagePrompt, A as makeEventNdjsonLogger, At as providerModelsFromSettings, Bt as ProviderAdapterSessionClosedError, C as runOpenCodeSdk, D as verifyOpenCodeServerVersion, E as toOpenCodeQuestionAnswers, Ht as ProviderAdapterValidationError, Lt as createProcessDeviceToolBinding, Nt as agentControlHostContext, Ot as nonEmptyTrimmed, Q as buildBranchNamePrompt, Rt as ProviderAdapterProcessError, S as parseOpenCodeModelSlug, Sr as getModelSelectionStringOptionValue, T as toOpenCodePermissionReply, Ut as ProviderDriverError, Vt as ProviderAdapterSessionNotFoundError, Z as validateRankInboxThreadsResult, _ as OpenCodeRuntimeError, _r as resolveAttachmentPath, at as buildThreadTitlePrompt, b as openCodeQuestionId, br as createModelCapabilities, cr as makePackageManagedProviderMaintenanceResolver, ct as sanitizeCommitSubject, dr as normalizeCommandPath, et as buildIssueContentPolishPrompt, fr as resolveProviderMaintenanceCapabilitiesEffect, g as OpenCodeRuntime, gr as readPersistedAttachment, gt as mergeProviderInstanceEnvironment, h as MINIMUM_OPENCODE_VERSION, it as buildThreadPriorityPrompt, k as ProviderEventLoggers, kt as parseGenericCliVersion, lt as sanitizePrTitle, mr as ServerSettingsService, nt as buildPrContentPrompt, or as enrichProviderSnapshotWithVersionAdvisory, ot as extractJsonObject, pr as compareCliVersions, t as makeServerQueueMetrics, tt as buildIssueContentTitlePrompt, ut as sanitizeThreadTitle, v as buildOpenCodePermissionRules, w as toOpenCodeFileParts, wt as buildServerProvider, x as openCodeRuntimeErrorDetail, y as isOpenCodeNativeAttachment, zt as ProviderAdapterRequestError } from "./bin.mjs";
+import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-CA6cLWg0.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
+import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-BINne1KE.mjs";
 import { Cause, Data, Effect, Exit, Fiber, Queue, Ref, Schema, Scope, Semaphore, Stream } from "effect";
 import { HttpClient } from "effect/unstable/http";
 import * as NodePath from "node:path";
+import { createHash } from "node:crypto";
 import * as NodeOS from "node:os";
 import * as NodeFS from "node:fs/promises";
 import "effect/unstable/process";
@@ -210,106 +213,115 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 			cause
 		}))));
 	});
-	return {
-		generateCommitMessage: Effect.fn("OpenCodeTextGeneration.generateCommitMessage")(function* (input) {
-			const { prompt, outputSchema } = buildCommitMessagePrompt({
-				branch: input.branch,
-				stagedSummary: input.stagedSummary,
-				stagedPatch: input.stagedPatch,
-				includeBranch: input.includeBranch === true
+	const generateCommitMessage = Effect.fn("OpenCodeTextGeneration.generateCommitMessage")(function* (input) {
+		const { prompt, outputSchema } = buildCommitMessagePrompt({
+			branch: input.branch,
+			stagedSummary: input.stagedSummary,
+			stagedPatch: input.stagedPatch,
+			includeBranch: input.includeBranch === true
+		});
+		const generated = yield* runOpenCodeJson({
+			operation: "generateCommitMessage",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection
+		});
+		return {
+			subject: sanitizeCommitSubject(generated.subject),
+			body: generated.body.trim(),
+			..."branch" in generated && typeof generated.branch === "string" ? { branch: sanitizeFeatureBranchName(generated.branch) } : {}
+		};
+	});
+	const generatePrContent = Effect.fn("OpenCodeTextGeneration.generatePrContent")(function* (input) {
+		const { prompt, outputSchema } = buildPrContentPrompt({
+			baseBranch: input.baseBranch,
+			headBranch: input.headBranch,
+			commitSummary: input.commitSummary,
+			diffSummary: input.diffSummary,
+			diffPatch: input.diffPatch
+		});
+		const generated = yield* runOpenCodeJson({
+			operation: "generatePrContent",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection
+		});
+		return {
+			title: sanitizePrTitle(generated.title),
+			body: generated.body.trim()
+		};
+	});
+	const generateBranchName = Effect.fn("OpenCodeTextGeneration.generateBranchName")(function* (input) {
+		const { prompt, outputSchema } = buildBranchNamePrompt({
+			message: input.message,
+			attachments: input.attachments
+		});
+		const generated = yield* runOpenCodeJson({
+			operation: "generateBranchName",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection,
+			attachments: input.attachments
+		});
+		return { branch: sanitizeBranchFragment(generated.branch) };
+	});
+	const generateThreadTitle = Effect.fn("OpenCodeTextGeneration.generateThreadTitle")(function* (input) {
+		const { prompt, outputSchema } = buildThreadTitlePrompt({
+			message: input.message,
+			attachments: input.attachments
+		});
+		const generated = yield* runOpenCodeJson({
+			operation: "generateThreadTitle",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection,
+			attachments: input.attachments
+		});
+		return { title: sanitizeThreadTitle(generated.title) };
+	});
+	const generateIssueContent = Effect.fn("OpenCodeTextGeneration.generateIssueContent")(function* (input) {
+		if (input.mode === "polish") {
+			const { prompt, outputSchema } = buildIssueContentPolishPrompt({
+				rough: input.rough ?? "",
+				...input.currentTitle ? { currentTitle: input.currentTitle } : {},
+				...input.customInstructions ? { customInstructions: input.customInstructions } : {}
 			});
-			const generated = yield* runOpenCodeJson({
-				operation: "generateCommitMessage",
+			const decoded = yield* runOpenCodeJson({
+				operation: "generateIssueContent",
 				cwd: input.cwd,
 				prompt,
 				outputSchemaJson: outputSchema,
 				modelSelection: input.modelSelection
 			});
 			return {
-				subject: sanitizeCommitSubject(generated.subject),
-				body: generated.body.trim(),
-				..."branch" in generated && typeof generated.branch === "string" ? { branch: sanitizeFeatureBranchName(generated.branch) } : {}
+				title: decoded.title.trim(),
+				body: decoded.body.trim()
 			};
-		}),
-		generatePrContent: Effect.fn("OpenCodeTextGeneration.generatePrContent")(function* (input) {
-			const { prompt, outputSchema } = buildPrContentPrompt({
-				baseBranch: input.baseBranch,
-				headBranch: input.headBranch,
-				commitSummary: input.commitSummary,
-				diffSummary: input.diffSummary,
-				diffPatch: input.diffPatch
-			});
-			const generated = yield* runOpenCodeJson({
-				operation: "generatePrContent",
+		} else {
+			const { prompt, outputSchema } = buildIssueContentTitlePrompt({ body: input.body ?? "" });
+			return { title: (yield* runOpenCodeJson({
+				operation: "generateIssueContent",
 				cwd: input.cwd,
 				prompt,
 				outputSchemaJson: outputSchema,
 				modelSelection: input.modelSelection
-			});
-			return {
-				title: sanitizePrTitle(generated.title),
-				body: generated.body.trim()
-			};
-		}),
-		generateBranchName: Effect.fn("OpenCodeTextGeneration.generateBranchName")(function* (input) {
-			const { prompt, outputSchema } = buildBranchNamePrompt({
-				message: input.message,
-				attachments: input.attachments
-			});
-			const generated = yield* runOpenCodeJson({
-				operation: "generateBranchName",
-				cwd: input.cwd,
-				prompt,
-				outputSchemaJson: outputSchema,
-				modelSelection: input.modelSelection,
-				attachments: input.attachments
-			});
-			return { branch: sanitizeBranchFragment(generated.branch) };
-		}),
-		generateThreadTitle: Effect.fn("OpenCodeTextGeneration.generateThreadTitle")(function* (input) {
-			const { prompt, outputSchema } = buildThreadTitlePrompt({
-				message: input.message,
-				attachments: input.attachments
-			});
-			const generated = yield* runOpenCodeJson({
-				operation: "generateThreadTitle",
-				cwd: input.cwd,
-				prompt,
-				outputSchemaJson: outputSchema,
-				modelSelection: input.modelSelection,
-				attachments: input.attachments
-			});
-			return { title: sanitizeThreadTitle(generated.title) };
-		}),
-		generateIssueContent: Effect.fn("OpenCodeTextGeneration.generateIssueContent")(function* (input) {
-			if (input.mode === "polish") {
-				const { prompt, outputSchema } = buildIssueContentPolishPrompt({
-					rough: input.rough ?? "",
-					...input.currentTitle ? { currentTitle: input.currentTitle } : {},
-					...input.customInstructions ? { customInstructions: input.customInstructions } : {}
-				});
-				const decoded = yield* runOpenCodeJson({
-					operation: "generateIssueContent",
-					cwd: input.cwd,
-					prompt,
-					outputSchemaJson: outputSchema,
-					modelSelection: input.modelSelection
-				});
-				return {
-					title: decoded.title.trim(),
-					body: decoded.body.trim()
-				};
-			} else {
-				const { prompt, outputSchema } = buildIssueContentTitlePrompt({ body: input.body ?? "" });
-				return { title: (yield* runOpenCodeJson({
-					operation: "generateIssueContent",
-					cwd: input.cwd,
-					prompt,
-					outputSchemaJson: outputSchema,
-					modelSelection: input.modelSelection
-				})).title.trim() };
-			}
-		}),
+			})).title.trim() };
+		}
+	});
+	const answerSideQuestion = () => Effect.fail(new TextGenerationError({
+		operation: "answerSideQuestion",
+		detail: "OpenCode cannot isolate configured server plugins for a tool-free side question. Select Codex, Claude, or GitHub Copilot for side chat."
+	}));
+	return {
+		generateCommitMessage,
+		generatePrContent,
+		generateBranchName,
+		generateThreadTitle,
+		generateIssueContent,
 		rankInboxThreads: Effect.fn("OpenCodeTextGeneration.rankInboxThreads")(function* (input) {
 			const { prompt, outputSchema } = buildThreadPriorityPrompt({ serializedCandidates: input.chunk.serializedCandidates });
 			const generated = yield* runOpenCodeJson({
@@ -320,10 +332,177 @@ const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration")(funct
 				modelSelection: input.modelSelection
 			});
 			return yield* validateRankInboxThreadsResult(input, generated.rankings);
-		})
+		}),
+		answerSideQuestion
 	};
 });
 //#endregion
+//#region src/provider/openCodeTaskLifecycle.ts
+const text = (value) => typeof value === "string" && value.trim() ? value.trim() : void 0;
+const record = (value) => value !== null && typeof value === "object" ? value : {};
+const terminal = (status) => status === "completed" || status === "failed" || status === "stopped";
+function resultText(output) {
+	const result = output.match(/<task_result>\s*([\s\S]*?)\s*<\/task_result>/)?.[1];
+	return text(result ?? output.split("\n").filter((line) => !line.trimStart().startsWith("task_id:")).join("\n"));
+}
+/** Native Task lifecycle state stays here; clients consume the shared subagent events. */
+var OpenCodeTaskLifecycle = class {
+	tasks = /* @__PURE__ */ new Map();
+	calls = /* @__PURE__ */ new Map();
+	sessions = /* @__PURE__ */ new Map();
+	emitted = /* @__PURE__ */ new Set();
+	notifications = /* @__PURE__ */ new Set();
+	values() {
+		return Array.from(this.tasks.values(), (task) => task.ref);
+	}
+	hasSession(id) {
+		return this.sessions.has(id);
+	}
+	refForSession(id) {
+		return this.sessions.get(id)?.ref;
+	}
+	transition(task, type, source) {
+		const eventKey = JSON.stringify([
+			task.ref.subagentId,
+			task.callId ?? source,
+			type,
+			task.status,
+			task.summary,
+			task.ref
+		]);
+		if (this.emitted.has(eventKey)) return [];
+		this.emitted.add(eventKey);
+		return [{
+			type,
+			subagent: task.ref,
+			status: task.status,
+			...task.summary ? { summary: task.summary } : {},
+			eventKey
+		}];
+	}
+	stop() {
+		return Array.from(this.tasks.values()).flatMap((task) => {
+			if (terminal(task.status)) return [];
+			task.status = "stopped";
+			return this.transition(task, "completed", "stop");
+		});
+	}
+	project(part, existingRef) {
+		if (part.type === "text") {
+			if (part.synthetic !== true) return [];
+			const envelope = part.text.match(/<task id="([^"]+)" state="(completed|error|interrupted|cancelled)">/);
+			const sessionId = text(envelope?.[1]);
+			if (!sessionId) return [];
+			const notificationKey = JSON.stringify([
+				part.sessionID,
+				part.id,
+				part.text
+			]);
+			if (this.notifications.has(notificationKey)) return [];
+			this.notifications.add(notificationKey);
+			let task = this.sessions.get(sessionId);
+			if (task && terminal(task.status)) return [];
+			const events = [];
+			if (!task) {
+				task = {
+					ref: existingRef ?? this.makeRef(sessionId, part.sessionID),
+					callId: void 0,
+					status: "running",
+					summary: void 0,
+					seenCalls: /* @__PURE__ */ new Set()
+				};
+				this.tasks.set(String(task.ref.subagentId), task);
+				this.sessions.set(sessionId, task);
+				events.push(...this.transition(task, "started", part.id));
+			}
+			task.status = envelope?.[2] === "error" ? "failed" : envelope?.[2] === "completed" ? "completed" : "stopped";
+			task.summary = task.status === "failed" ? text(part.text.match(/<task_error>\s*([\s\S]*?)\s*<\/task_error>/)?.[1]) : resultText(part.text);
+			return [...events, ...this.transition(task, "completed", part.id)];
+		}
+		if (part.type !== "tool" || part.tool.toLowerCase() !== "task") return [];
+		const callKey = JSON.stringify([part.sessionID, part.callID]);
+		const previousCall = this.calls.get(callKey);
+		const metadata = "metadata" in part.state ? record(part.state.metadata) : {};
+		const input = record(part.state.input);
+		const output = part.state.status === "completed" ? part.state.output : "";
+		const sessionId = text(metadata.sessionId) ?? text(metadata.sessionID) ?? text(input.task_id) ?? text(metadata.jobId) ?? text(output.match(/<task id="([^"]+)"/)?.[1]) ?? text(output.match(/(?:^|\n)\s*task_id:\s*(\S+)/)?.[1]);
+		if (part.state.status === "pending" && !sessionId && !previousCall) return [];
+		let task = previousCall ?? (sessionId ? this.sessions.get(sessionId) : void 0);
+		if (!task && !sessionId && part.state.status !== "error") return [];
+		if (task && task.callId !== void 0 && task.callId !== callKey && task.seenCalls.has(callKey)) return [];
+		if (task && task.callId === callKey && task.status !== "starting" && part.state.status === "pending") return [];
+		const newTask = !task;
+		if (!task) {
+			task = {
+				ref: existingRef ?? this.makeRef(sessionId, part.sessionID, part.callID),
+				callId: callKey,
+				status: "starting",
+				summary: void 0,
+				seenCalls: /* @__PURE__ */ new Set()
+			};
+			this.tasks.set(String(task.ref.subagentId), task);
+		}
+		const reopen = task.callId !== void 0 && task.callId !== callKey;
+		const terminalBeforeTool = task.callId === void 0 && terminal(task.status);
+		const priorRef = task.ref;
+		const priorStatus = task.status;
+		if (reopen) {
+			task.status = "starting";
+			task.summary = void 0;
+		}
+		task.callId = callKey;
+		task.seenCalls.add(callKey);
+		this.calls.set(callKey, task);
+		const modelRecord = record(metadata.model);
+		const provider = text(modelRecord.providerID);
+		const model = text(modelRecord.modelID);
+		task.ref = {
+			...task.ref,
+			...sessionId ? {
+				providerSessionId: sessionId,
+				providerThreadId: sessionId
+			} : {},
+			...text(input.description) ? { description: text(input.description) } : {},
+			...text(input.subagent_type) ? { label: text(input.subagent_type) } : {},
+			...provider && model ? { model: `${provider}/${model}` } : {},
+			parentProviderItemId: ProviderItemId.make(part.callID),
+			metadata: {
+				...task.ref.metadata,
+				...metadata,
+				source: "opencode.task",
+				parentSessionId: part.sessionID
+			}
+		};
+		if (sessionId) this.sessions.set(sessionId, task);
+		const outputState = output.match(/<task id="[^"]+" state="([^"]+)">/)?.[1];
+		const interrupted = outputState === "interrupted" || outputState === "cancelled";
+		const background = metadata.background === true || outputState === "running";
+		const events = [];
+		if (newTask) events.push(...this.transition(task, "started", part.id));
+		if (!terminalBeforeTool && (!terminal(task.status) || reopen)) {
+			task.status = interrupted ? "stopped" : part.state.status === "error" ? "failed" : part.state.status === "completed" && !background ? "completed" : part.state.status === "pending" ? "starting" : "running";
+			task.summary = part.state.status === "error" ? text(part.state.error) : task.status === "completed" ? resultText(output) : void 0;
+			events.push(...this.transition(task, terminal(task.status) ? "completed" : "updated", part.id));
+		} else if (JSON.stringify(priorRef) !== JSON.stringify(task.ref) || priorStatus !== task.status) events.push(...this.transition(task, "updated", part.id));
+		return events;
+	}
+	makeRef(sessionId, parentSessionId, callId) {
+		return {
+			subagentId: RuntimeSubagentId.make(sessionId ? `opencode:session:${sessionId}` : `opencode:task:${parentSessionId}:${callId}`),
+			origin: "native",
+			capability: "summary",
+			...sessionId ? {
+				providerSessionId: sessionId,
+				providerThreadId: sessionId
+			} : {},
+			metadata: {
+				source: "opencode.task",
+				parentSessionId
+			}
+		};
+	}
+};
+//#endregion
 //#region src/provider/Layers/OpenCodeAdapter.ts
 const PROVIDER$1 = ProviderDriverKind.make("opencode");
 const OPENCODE_RESUME_VERSION = 1;
@@ -693,6 +872,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			});
 		});
 		const emitOpenCodeSubagentUpdated = Effect.fn("emitOpenCodeSubagentUpdated")(function* (context, input) {
+			if (context.completedSubagentIds.has(subagentKey(input.subagent.subagentId))) return;
 			yield* emitOpenCodeSubagentStarted(context, input.subagent, input.raw);
 			yield* emitForContext(context, {
 				...yield* buildEventBase({
@@ -728,7 +908,98 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				}
 			});
 		});
+		const emitOpenCodeTaskTransition = Effect.fn("emitOpenCodeTaskTransition")(function* (context, transition, raw) {
+			const nativeRef = transition.subagent;
+			const existing = nativeRef.providerSessionId ? context.subagentBySessionId.get(nativeRef.providerSessionId) : void 0;
+			const subagent = {
+				...existing,
+				...nativeRef,
+				subagentId: existing?.subagentId ?? nativeRef.subagentId,
+				capability: existing?.capability === "transcript" ? "transcript" : nativeRef.capability,
+				metadata: {
+					...existing?.metadata,
+					...nativeRef.metadata,
+					providerInstanceId: boundInstanceId
+				}
+			};
+			if (subagent.providerSessionId) {
+				context.childSessionIds.add(subagent.providerSessionId);
+				context.subagentBySessionId.set(subagent.providerSessionId, subagent);
+			}
+			const key = subagentKey(subagent.subagentId);
+			const base = {
+				...yield* buildEventBase({
+					threadId: context.session.threadId,
+					turnId: context.activeTurnId,
+					raw
+				}),
+				eventId: EventId.make(createHash("sha256").update(JSON.stringify([
+					context.session.threadId,
+					context.openCodeSessionId,
+					transition.eventKey
+				])).digest("hex"))
+			};
+			if (transition.type === "started") {
+				if (context.startedSubagentIds.has(key)) yield* emitForContext(context, {
+					...base,
+					type: "subagent.updated",
+					payload: {
+						subagent,
+						status: transition.status
+					}
+				});
+				else {
+					context.startedSubagentIds.add(key);
+					yield* emitForContext(context, {
+						...base,
+						type: "subagent.started",
+						payload: { subagent }
+					});
+				}
+				context.completedSubagentIds.delete(key);
+			} else if (transition.type === "completed") {
+				context.startedSubagentIds.add(key);
+				context.completedSubagentIds.add(key);
+				yield* emitForContext(context, {
+					...base,
+					type: "subagent.completed",
+					payload: {
+						subagent,
+						status: transition.status,
+						...transition.summary ? { summary: transition.summary } : {}
+					}
+				});
+			} else {
+				if (transition.status === "running" || transition.status === "starting") context.completedSubagentIds.delete(key);
+				yield* emitForContext(context, {
+					...base,
+					type: "subagent.updated",
+					payload: {
+						subagent,
+						status: transition.status,
+						...transition.summary ? { summary: transition.summary } : {}
+					}
+				});
+			}
+		});
+		const projectOpenCodeTask = Effect.fn("projectOpenCodeTask")(function* (context, part) {
+			for (const transition of context.tasks.project(part)) yield* emitOpenCodeTaskTransition(context, transition, part);
+		});
+		const loadOpenCodeTasks = Effect.fn("loadOpenCodeTasks")(function* (context) {
+			const messages = yield* runOpenCodeSdk("session.messages", () => context.client.session.messages({ sessionID: context.openCodeSessionId }));
+			const latest = /* @__PURE__ */ new Map();
+			for (const entry of messages.data ?? []) for (const part of entry.parts) {
+				if (part.sessionID !== context.openCodeSessionId) continue;
+				if (entry.info.role !== "assistant" && !(part.type === "text" && part.synthetic)) continue;
+				for (const transition of context.tasks.project(part)) latest.set(String(transition.subagent.subagentId), {
+					transition,
+					part
+				});
+			}
+			return [...latest.values()];
+		});
 		const emitStoppedOpenCodeChildren = Effect.fn("emitStoppedOpenCodeChildren")(function* (context, raw) {
+			for (const transition of context.tasks.stop()) yield* emitOpenCodeTaskTransition(context, transition, raw);
 			for (const subagent of context.subagentBySessionId.values()) yield* emitOpenCodeSubagentCompleted(context, {
 				subagent,
 				status: subagentCompletionStatus("stopped"),
@@ -757,10 +1028,12 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 		};
 		const registerOpenCodeChildSession = Effect.fn("registerOpenCodeChildSession")(function* (context, session, raw) {
 			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 taskRef = context.tasks.refForSession(session.id);
+			const subagent = mergeOpenCodeChildSessionRef(context.subagentBySessionId.get(session.id) ?? taskRef ?? 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);
+			if (taskRef) return subagent;
 			if (known) {
 				yield* emitOpenCodeSubagentUpdated(context, {
 					subagent,
@@ -886,6 +1159,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 		});
 		const emitUnexpectedExit = Effect.fn("emitUnexpectedExit")(function* (context, message) {
 			if (yield* Ref.getAndSet(context.stopped, true)) return;
+			yield* emitStoppedOpenCodeChildren(context, { reason: "transport-exit" });
 			const turnId = context.activeTurnId;
 			yield* emitForContext(context, {
 				...yield* buildEventBase({
@@ -982,6 +1256,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			}
 		});
 		const handleSubscribedEvent = Effect.fn("handleSubscribedEvent")(function* (context, event) {
+			if (yield* Ref.get(context.stopped)) return;
 			const payloadSessionId = "properties" in event ? event.properties.sessionID : void 0;
 			const eventSessionId = typeof payloadSessionId === "string" ? payloadSessionId : void 0;
 			const isRootSessionEvent = eventSessionId === context.openCodeSessionId;
@@ -1099,14 +1374,17 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				case "message.part.updated": {
 					const part = event.properties.part;
 					context.partById.set(scopedOpenCodeId(part.sessionID, part.id), part);
-					if (messageRoleForPart(context, part) === "assistant") yield* emitAssistantTextDelta(context, part, turnId, event);
+					const messageRole = messageRoleForPart(context, part);
+					if (part.sessionID === context.openCodeSessionId && messageRole !== "user") yield* projectOpenCodeTask(context, part);
+					else if (part.sessionID === context.openCodeSessionId && part.type === "text" && part.synthetic) yield* projectOpenCodeTask(context, part);
+					if (messageRole === "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, {
+						if (childSubagent && !context.tasks.hasSession(part.sessionID)) yield* emitOpenCodeSubagentUpdated(context, {
 							subagent: childSubagent,
 							status: statusFromOpenCodeSubagentState("running"),
 							summary: title,
@@ -1223,6 +1501,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					});
 					break;
 				case "session.status": {
+					if (context.tasks.hasSession(event.properties.sessionID)) break;
 					const childSubagent = context.subagentBySessionId.get(event.properties.sessionID);
 					if (childSubagent) {
 						if (event.properties.status.type === "idle") {
@@ -1290,6 +1569,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					break;
 				}
 				case "session.idle": {
+					if (context.tasks.hasSession(event.properties.sessionID)) break;
 					const childSubagent = context.subagentBySessionId.get(event.properties.sessionID);
 					if (childSubagent) yield* emitOpenCodeSubagentCompleted(context, {
 						subagent: childSubagent,
@@ -1299,6 +1579,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 					break;
 				}
 				case "session.error": {
+					if (event.properties.sessionID && context.tasks.hasSession(event.properties.sessionID)) break;
 					const message = sessionErrorMessage(event.properties.error);
 					const childSubagent = event.properties.sessionID !== void 0 ? context.subagentBySessionId.get(event.properties.sessionID) : void 0;
 					if (childSubagent) {
@@ -1351,14 +1632,41 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				}
 			}
 		});
-		const startEventPump = Effect.fn("startEventPump")(function* (context) {
+		const prepareEventSubscription = Effect.fn("prepareEventSubscription")(function* (context) {
 			const eventsAbortController = new AbortController();
 			yield* Scope.addFinalizer(context.sessionScope, Effect.sync(() => eventsAbortController.abort()));
-			yield* Effect.flatMap(runOpenCodeSdk("event.subscribe", () => context.client.event.subscribe(void 0, { signal: eventsAbortController.signal })), (subscription) => Stream.fromAsyncIterable(subscription.stream, (cause) => new OpenCodeRuntimeError({
+			const iterator = (yield* runOpenCodeSdk("event.subscribe", () => context.client.event.subscribe(void 0, { signal: eventsAbortController.signal }))).stream[Symbol.asyncIterator]();
+			const first = yield* runOpenCodeSdk("event.subscribe", () => iterator.next()).pipe(Effect.timeoutOrElse({
+				duration: "10 seconds",
+				orElse: () => Effect.fail(new OpenCodeRuntimeError({
+					operation: "event.subscribe",
+					detail: "Timed out opening OpenCode event stream."
+				}))
+			}));
+			return {
+				subscription: { stream: (async function* () {
+					try {
+						if (!first.done) yield first.value;
+						if (first.done) return;
+						while (true) {
+							const next = await iterator.next();
+							if (next.done) return;
+							yield next.value;
+						}
+					} finally {
+						await iterator.return?.();
+					}
+				})() },
+				eventsAbortController
+			};
+		});
+		const startEventPump = Effect.fn("startEventPump")(function* (context, prepared) {
+			const { subscription, eventsAbortController } = prepared;
+			yield* 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* () {
+			})).pipe(Stream.runForEach((event) => handleSubscribedEvent(context, event))).pipe(Effect.exit, Effect.flatMap((exit) => Effect.gen(function* () {
 				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));
@@ -1447,7 +1755,8 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 						sessionScope,
 						server,
 						client,
-						openCodeSession: openCodeSession.data
+						openCodeSession: openCodeSession.data,
+						adopted: adoptedSession !== void 0
 					};
 				}).pipe(Effect.provideService(Scope.Scope, sessionScope)));
 				if (Exit.isFailure(startedExit)) {
@@ -1456,12 +1765,6 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				}
 				return startedExit.value;
 			});
-			const raceWinner = sessions.get(input.threadId);
-			if (raceWinner) {
-				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;
-			}
 			const createdAt = nowIso();
 			const tokenMode = input.tokenMode ?? "balanced";
 			const session = {
@@ -1500,6 +1803,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				unboundSubtaskPartIds: [],
 				startedSubagentIds: /* @__PURE__ */ new Set(),
 				completedSubagentIds: /* @__PURE__ */ new Set(),
+				tasks: new OpenCodeTaskLifecycle(),
 				turns: [],
 				activeTurnId: void 0,
 				activeAgent: void 0,
@@ -1513,6 +1817,19 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				stopped: yield* Ref.make(false),
 				sessionScope: started.sessionScope
 			};
+			const prepared = yield* Effect.exit(prepareEventSubscription(context));
+			if (Exit.isFailure(prepared)) {
+				if (!started.adopted) 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 yield* toProcessError(input.threadId, Cause.squash(prepared.cause));
+			}
+			const storedTasks = started.adopted ? yield* loadOpenCodeTasks(context).pipe(Effect.catch((error) => Effect.logWarning("OpenCode Task history reconstruction failed", error).pipe(Effect.as([])))) : [];
+			const raceWinner = sessions.get(input.threadId);
+			if (raceWinner) {
+				if (!started.adopted) 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;
+			}
 			deviceToolContext = context;
 			sessions.set(input.threadId, context);
 			yield* emitForContext(context, {
@@ -1525,7 +1842,8 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				type: "thread.started",
 				payload: { providerThreadId: started.openCodeSession.id }
 			});
-			yield* startEventPump(context);
+			for (const { transition, part } of storedTasks) yield* emitOpenCodeTaskTransition(context, transition, part);
+			yield* startEventPump(context, prepared.value);
 			yield* Effect.gen(function* () {
 				yield* hydrateOpenCodeChildSessions(context);
 				yield* recoverPendingOpenCodeRequests(context);
@@ -1694,6 +2012,10 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			const context = ensureSessionContext(sessions, threadId);
 			const interruptedTurnId = turnId ?? context.activeTurnId;
 			if (turnId !== void 0 && context.activeTurnId !== void 0 && turnId !== context.activeTurnId) return;
+			yield* emitStoppedOpenCodeChildren(context, {
+				method: "session.abort",
+				reason: "turn-interrupted"
+			});
 			const pendingPrompt = context.pendingPrompt;
 			if (pendingPrompt && pendingPrompt.turnId === interruptedTurnId) {
 				context.pendingPrompt = void 0;
@@ -1701,10 +2023,6 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			}
 			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 (interruptedTurnId) {
 				if (context.activeTurnId === interruptedTurnId) {