ryco-cli 0.1.24 → 0.1.26

package/dist/{CodexDriver-CR0S17Lb.cjs → CodexDriver-BK4HVNV4.cjs}

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
-const require_Metrics = require("./Metrics-Bcb9vCAe.cjs");
+const require_src = require("./src-BlzIcnVG.cjs");
+const require_Metrics = require("./Metrics-DCKbdeoH.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-VzxWN-04.cjs");
+const require_runtimeSession = require("./runtimeSession-Bj0OUcNJ.cjs");
 const require_sourceControlContextFormatter = require("./sourceControlContextFormatter-BDZqn-4T.cjs");
 const require_ProjectCustomSystemPrompt = require("./ProjectCustomSystemPrompt-B8SUlNGa.cjs");
-const require_CodexTextGeneration = require("./CodexTextGeneration-tlfe1S5W.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-DGbd8BhM.cjs");
+const require_CodexTextGeneration = require("./CodexTextGeneration-Y2GSS7f1.cjs");
 let effect = require("effect");
 let effect_unstable_http = require("effect/unstable/http");
 let effect_unstable_process = require("effect/unstable/process");
@@ -175,7 +176,7 @@ In Default mode, strongly prefer making reasonable assumptions and executing the
 </collaboration_mode>`;
 //#endregion
 //#region src/provider/Layers/CodexSessionRuntime.ts
-const PROVIDER$1 = require_collectUint8StreamText.ProviderDriverKind.make("codex");
+const PROVIDER$1 = require_src.ProviderDriverKind.make("codex");
 const ANSI_ESCAPE_REGEX = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 const CODEX_STDERR_LOG_REGEX = /^\d{4}-\d{2}-\d{2}T\S+\s+(TRACE|DEBUG|INFO|WARN|ERROR)\s+\S+:\s+(.*)$/;
 const BENIGN_ERROR_LOG_SNIPPETS = ["state db missing rollout path for thread", "state db record_discrepancy: find_thread_path_by_id_str_in_subdir, falling_back"];
@@ -428,16 +429,16 @@ function readRouteFields(notification) {
 		};
 		case "turn/started":
 		case "turn/completed": return {
-			turnId: require_collectUint8StreamText.TurnId.make(notification.params.turn.id),
+			turnId: require_src.TurnId.make(notification.params.turn.id),
 			itemId: void 0
 		};
 		case "error": return {
-			turnId: require_collectUint8StreamText.TurnId.make(notification.params.turnId),
+			turnId: require_src.TurnId.make(notification.params.turnId),
 			itemId: void 0
 		};
 		case "turn/diff/updated":
 		case "turn/plan/updated": return {
-			turnId: require_collectUint8StreamText.TurnId.make(notification.params.turnId),
+			turnId: require_src.TurnId.make(notification.params.turnId),
 			itemId: void 0
 		};
 		case "serverRequest/resolved": return {
@@ -446,8 +447,8 @@ function readRouteFields(notification) {
 		};
 		case "item/started":
 		case "item/completed": return {
-			turnId: require_collectUint8StreamText.TurnId.make(notification.params.turnId),
-			itemId: require_collectUint8StreamText.ProviderItemId.make(notification.params.item.id)
+			turnId: require_src.TurnId.make(notification.params.turnId),
+			itemId: require_src.ProviderItemId.make(notification.params.item.id)
 		};
 		case "item/agentMessage/delta":
 		case "item/plan/delta":
@@ -458,8 +459,8 @@ function readRouteFields(notification) {
 		case "item/reasoning/summaryTextDelta":
 		case "item/reasoning/summaryPartAdded":
 		case "item/reasoning/textDelta": return {
-			turnId: require_collectUint8StreamText.TurnId.make(notification.params.turnId),
-			itemId: require_collectUint8StreamText.ProviderItemId.make(notification.params.itemId)
+			turnId: require_src.TurnId.make(notification.params.turnId),
+			itemId: require_src.ProviderItemId.make(notification.params.itemId)
 		};
 		default: return {
 			turnId: void 0,
@@ -558,7 +559,7 @@ function parseThreadSnapshot(response) {
 	return {
 		threadId: response.thread.id,
 		turns: response.thread.turns.map((turn) => ({
-			id: require_collectUint8StreamText.TurnId.make(turn.id),
+			id: require_src.TurnId.make(turn.id),
 			items: turn.items,
 			status: turn.status,
 			...turn.startedAt !== void 0 ? { startedAt: turn.startedAt } : {}
@@ -601,6 +602,9 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 	const collabChildAgentsRef = yield* effect.Ref.make(/* @__PURE__ */ new Map());
 	/** Child provider-thread id → its currently running provider turn id. */
 	const collabChildLiveTurnsRef = yield* effect.Ref.make(/* @__PURE__ */ new Map());
+	const childRevisions = /* @__PURE__ */ new Map();
+	const unsettledChildren = /* @__PURE__ */ new Set();
+	const reconciledChildStatuses = /* @__PURE__ */ new Map();
 	const closedRef = yield* effect.Ref.make(false);
 	const resolvedHomePath = options.homePath ? require_bin.expandHomePath(options.homePath) : void 0;
 	const env = {
@@ -636,7 +640,7 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 	const sessionRef = yield* effect.Ref.make(initialSession);
 	const offerEvent = (event) => effect.Queue.offer(events, event).pipe(effect.Effect.asVoid);
 	const emitEvent = (event) => effect.Effect.flatMap(effect.Effect.sync(() => crypto.randomUUID()), (id) => offerEvent({
-		id: require_collectUint8StreamText.EventId.make(id),
+		id: require_src.EventId.make(id),
 		provider: PROVIDER$1,
 		...options.providerInstanceId ? { providerInstanceId: options.providerInstanceId } : {},
 		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -854,8 +858,52 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 			default: return routeCodexChildNotification(notification.method) === "drop";
 		}
 	});
+	const reconcileChild = (childThreadId, includeTurns = false) => effect.Effect.gen(function* () {
+		const revision = childRevisions.get(childThreadId);
+		const response = yield* client.request("thread/read", {
+			threadId: childThreadId,
+			includeTurns
+		});
+		if (childRevisions.get(childThreadId) !== revision) return;
+		const child = (yield* effect.Ref.get(collabChildAgentsRef)).get(childThreadId);
+		if (!child || response.thread.id !== childThreadId) return;
+		const status = response.thread.status;
+		const activeTurn = response.thread.turns.findLast((turn) => turn.status === "inProgress");
+		const live = status.type === "active";
+		yield* effect.Ref.update(collabChildLiveTurnsRef, (current) => {
+			const next = new Map(current);
+			if (live && activeTurn) next.set(childThreadId, activeTurn.id);
+			else if (!live) next.delete(childThreadId);
+			return next;
+		});
+		if (!live) unsettledChildren.delete(childThreadId);
+		const signature = JSON.stringify([revision, status]);
+		if (reconciledChildStatuses.get(childThreadId) === signature) return;
+		reconciledChildStatuses.set(childThreadId, signature);
+		yield* emitEvent({
+			kind: "notification",
+			threadId: options.threadId,
+			...child.spawnTurnId ? { turnId: child.spawnTurnId } : {},
+			method: "collabAgent/statusChanged",
+			payload: {
+				agentThreadId: childThreadId,
+				...child.nickname ? { nickname: child.nickname } : {},
+				...child.role ? { role: child.role } : {},
+				...child.agentPath ? { agentPath: child.agentPath } : {},
+				status
+			}
+		});
+	}).pipe(effect.Effect.timeout("3 seconds"));
 	const handleRawNotification = (notification) => effect.Effect.gen(function* () {
 		const payload = notification.params;
+		const rootId = currentProviderThreadId(yield* effect.Ref.get(sessionRef));
+		const activity = (notification.method === "item/started" || notification.method === "item/completed") && notification.params.item.type === "subAgentActivity" ? notification.params.item : void 0;
+		const childId = activity?.agentThreadId ?? readNotificationThreadId(notification);
+		if (childId && rootId && childId !== rootId) {
+			childRevisions.set(childId, (childRevisions.get(childId) ?? 0) + 1);
+			if (activity || notification.method === "thread/started" || notification.method === "turn/started" || notification.method === "thread/status/changed" && notification.params.status.type === "active") unsettledChildren.add(childId);
+			if (notification.method === "thread/closed" || notification.method === "turn/completed" || notification.method === "thread/status/changed" && notification.params.status.type !== "active") unsettledChildren.delete(childId);
+		}
 		const route = readRouteFields(notification);
 		const collabReceiverTurns = yield* effect.Ref.get(collabReceiverTurnsRef);
 		const childParentTurnId = (() => {
@@ -933,7 +981,7 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		deviceTurnActive = true;
 		return updateSession(sessionRef, {
 			status: "running",
-			activeTurnId: require_collectUint8StreamText.TurnId.make(payload.turn.id)
+			activeTurnId: require_src.TurnId.make(payload.turn.id)
 		});
 	})));
 	yield* client.handleServerNotification("turn/completed", (payload) => currentSessionProviderThreadId.pipe(effect.Effect.flatMap((providerThreadId) => {
@@ -957,9 +1005,9 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		});
 	})));
 	yield* client.handleServerRequest("item/commandExecution/requestApproval", (payload) => effect.Effect.gen(function* () {
-		const requestId = require_collectUint8StreamText.ApprovalRequestId.make(yield* effect.Effect.sync(() => crypto.randomUUID()));
-		const turnId = require_collectUint8StreamText.TurnId.make(payload.turnId);
-		const itemId = require_collectUint8StreamText.ProviderItemId.make(payload.itemId);
+		const requestId = require_src.ApprovalRequestId.make(yield* effect.Effect.sync(() => crypto.randomUUID()));
+		const turnId = require_src.TurnId.make(payload.turnId);
+		const itemId = require_src.ProviderItemId.make(payload.itemId);
 		const decision = yield* effect.Deferred.make();
 		yield* effect.Ref.update(pendingApprovalsRef, (current) => {
 			const next = new Map(current);
@@ -1000,9 +1048,9 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		}))) };
 	}));
 	yield* client.handleServerRequest("item/fileChange/requestApproval", (payload) => effect.Effect.gen(function* () {
-		const requestId = require_collectUint8StreamText.ApprovalRequestId.make(yield* effect.Effect.sync(() => crypto.randomUUID()));
-		const turnId = require_collectUint8StreamText.TurnId.make(payload.turnId);
-		const itemId = require_collectUint8StreamText.ProviderItemId.make(payload.itemId);
+		const requestId = require_src.ApprovalRequestId.make(yield* effect.Effect.sync(() => crypto.randomUUID()));
+		const turnId = require_src.TurnId.make(payload.turnId);
+		const itemId = require_src.ProviderItemId.make(payload.itemId);
 		const decision = yield* effect.Deferred.make();
 		yield* effect.Ref.update(pendingApprovalsRef, (current) => {
 			const next = new Map(current);
@@ -1043,9 +1091,9 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		}))) };
 	}));
 	yield* client.handleServerRequest("item/tool/requestUserInput", (payload) => effect.Effect.gen(function* () {
-		const requestId = require_collectUint8StreamText.ApprovalRequestId.make(yield* effect.Effect.sync(() => crypto.randomUUID()));
-		const turnId = require_collectUint8StreamText.TurnId.make(payload.turnId);
-		const itemId = require_collectUint8StreamText.ProviderItemId.make(payload.itemId);
+		const requestId = require_src.ApprovalRequestId.make(yield* effect.Effect.sync(() => crypto.randomUUID()));
+		const turnId = require_src.TurnId.make(payload.turnId);
+		const itemId = require_src.ProviderItemId.make(payload.itemId);
 		const answers = yield* effect.Deferred.make();
 		yield* effect.Ref.update(pendingUserInputsRef, (current) => {
 			const next = new Map(current);
@@ -1079,6 +1127,10 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		discard: true
 	});
 	yield* effect.Stream.fromQueue(serverNotifications).pipe(effect.Stream.runForEach(handleRawNotification), effect.Effect.forkIn(runtimeScope));
+	yield* effect.Effect.suspend(() => effect.Effect.forEach(Array.from(unsettledChildren), (id) => reconcileChild(id).pipe(effect.Effect.ignore), {
+		concurrency: 4,
+		discard: true
+	})).pipe(effect.Effect.repeat(effect.Schedule.spaced("5 seconds")), effect.Effect.forkIn(runtimeScope));
 	const stderrRemainderRef = yield* effect.Ref.make("");
 	yield* child.stderr.pipe(effect.Stream.decodeText(), effect.Stream.runForEach((chunk) => effect.Ref.modify(stderrRemainderRef, (current) => {
 		const lines = (current + chunk).split("\n");
@@ -1123,7 +1175,7 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		const session = {
 			...yield* effect.Ref.get(sessionRef),
 			status: activeTurn ? "running" : "ready",
-			activeTurnId: activeTurn ? require_collectUint8StreamText.TurnId.make(activeTurn.id) : void 0,
+			activeTurnId: activeTurn ? require_src.TurnId.make(activeTurn.id) : void 0,
 			cwd: opened.cwd,
 			model: opened.model,
 			resumeCursor: { threadId: providerThreadId },
@@ -1173,7 +1225,7 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 			});
 			const rawResponse = yield* client.raw.request("turn/start", params);
 			const response = yield* effect.Schema.decodeUnknownEffect(require_bin.V2TurnStartResponse)(rawResponse).pipe(effect.Effect.mapError((error) => toProtocolParseError("Invalid turn/start response payload", error)));
-			const turnId = require_collectUint8StreamText.TurnId.make(response.turn.id);
+			const turnId = require_src.TurnId.make(response.turn.id);
 			deviceTurnActive = true;
 			yield* updateSession(sessionRef, (session) => ({
 				status: "running",
@@ -1197,7 +1249,7 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 			});
 			const rawResponse = yield* client.raw.request("turn/steer", params);
 			const response = yield* effect.Schema.decodeUnknownEffect(require_bin.V2TurnSteerResponse)(rawResponse).pipe(effect.Effect.mapError((error) => toProtocolParseError("Invalid turn/steer response payload", error)));
-			const turnId = require_collectUint8StreamText.TurnId.make(response.turnId);
+			const turnId = require_src.TurnId.make(response.turnId);
 			return {
 				threadId: options.threadId,
 				turnId
@@ -1206,20 +1258,37 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 		interruptTurn: (turnId) => effect.Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
 			const session = yield* effect.Ref.get(sessionRef);
+			yield* effect.Effect.forEach(Array.from((yield* effect.Ref.get(collabChildAgentsRef)).keys()), (id) => reconcileChild(id, true).pipe(effect.Effect.ignore), {
+				concurrency: 8,
+				discard: true
+			}).pipe(effect.Effect.timeoutOption("5 seconds"));
 			const liveChildTurns = yield* effect.Ref.get(collabChildLiveTurnsRef);
+			const registeredChildren = yield* effect.Ref.get(collabChildAgentsRef);
+			let childInterruptFailed = Array.from(unsettledChildren).some((id) => registeredChildren.has(id) && !liveChildTurns.has(id));
 			yield* effect.Effect.forEach(Array.from(liveChildTurns.entries()), ([childThreadId, childTurnId]) => client.request("turn/interrupt", {
 				threadId: childThreadId,
 				turnId: childTurnId
-			}).pipe(effect.Effect.timeoutOption("3 seconds"), effect.Effect.ignore), {
+			}).pipe(effect.Effect.timeout("3 seconds"), effect.Effect.catchCause(() => effect.Effect.sync(() => {
+				childInterruptFailed = true;
+			}))), {
 				concurrency: 8,
 				discard: true
-			}).pipe(effect.Effect.timeoutOption("10 seconds"), effect.Effect.ignore);
+			}).pipe(effect.Effect.timeout("10 seconds"), effect.Effect.catchCause(() => effect.Effect.sync(() => {
+				childInterruptFailed = true;
+			})));
 			const effectiveTurnId = turnId ?? session.activeTurnId;
-			if (!effectiveTurnId) return;
-			yield* client.request("turn/interrupt", {
+			if (effectiveTurnId) yield* client.request("turn/interrupt", {
 				threadId: providerThreadId,
 				turnId: effectiveTurnId
 			});
+			if (childInterruptFailed) return yield* effect.Effect.fail(new require_bin.CodexAppServerTransportError({
+				detail: "Could not interrupt all Codex child turns",
+				cause: /* @__PURE__ */ new Error("Child interrupt failed or timed out")
+			}));
+			yield* effect.Effect.forEach(Array.from((yield* effect.Ref.get(collabChildAgentsRef)).keys()), (id) => reconcileChild(id, true).pipe(effect.Effect.ignore), {
+				concurrency: 8,
+				discard: true
+			}).pipe(effect.Effect.timeoutOption("5 seconds"));
 		}),
 		readThread: effect.Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
@@ -1323,8 +1392,8 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 *
 * @module CodexAdapterLive
 */
-const PROVIDER = require_collectUint8StreamText.ProviderDriverKind.make("codex");
-const PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES = 8 * require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_IMAGE_BYTES;
+const PROVIDER = require_src.ProviderDriverKind.make("codex");
+const PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES = 8 * require_src.PROVIDER_SEND_TURN_MAX_IMAGE_BYTES;
 /**
 * Truthful host-context note injected only when a lease was actually
 * issued. A runtime without a lease receives no mention of these tools.
@@ -1358,7 +1427,7 @@ function mapCodexRuntimeError(threadId, method, error) {
 }
 function normalizeCodexThreadGoal(goal) {
 	try {
-		return effect.Schema.decodeUnknownSync(require_collectUint8StreamText.ThreadGoal)({
+		return effect.Schema.decodeUnknownSync(require_src.ThreadGoal)({
 			objective: goal.objective,
 			status: goal.status,
 			tokenBudget: goal.tokenBudget ?? null,
@@ -1371,7 +1440,7 @@ function normalizeCodexThreadGoal(goal) {
 		return null;
 	}
 }
-const ApprovalDecisionPayload = effect.Schema.Struct({ decision: require_collectUint8StreamText.ProviderApprovalDecision });
+const ApprovalDecisionPayload = effect.Schema.Struct({ decision: require_src.ProviderApprovalDecision });
 function readPayload(schema, payload) {
 	return effect.Schema.is(schema)(payload) ? payload : void 0;
 }
@@ -1552,10 +1621,10 @@ function contentStreamKindFromMethod(method) {
 	}
 }
 function asRuntimeItemId(itemId) {
-	return require_collectUint8StreamText.RuntimeItemId.make(itemId);
+	return require_src.RuntimeItemId.make(itemId);
 }
 function asRuntimeRequestId(requestId) {
-	return require_collectUint8StreamText.RuntimeRequestId.make(requestId);
+	return require_src.RuntimeRequestId.make(requestId);
 }
 function eventRawSource(event) {
 	return event.kind === "request" ? "codex.app-server.request" : "codex.app-server.notification";
@@ -1617,7 +1686,7 @@ function mapCollabAgentEvent(event, canonicalThreadId) {
 	const agentThreadId = typeof payload?.agentThreadId === "string" ? payload.agentThreadId : "";
 	if (!payload || agentThreadId.length === 0) return [];
 	const base = runtimeEventBase(event, canonicalThreadId);
-	const taskId = require_collectUint8StreamText.RuntimeTaskId.make(agentThreadId);
+	const taskId = require_src.RuntimeTaskId.make(agentThreadId);
 	const agentPath = typeof payload.agentPath === "string" ? payload.agentPath : void 0;
 	const pathLeaf = agentPath?.split("/").findLast((segment) => segment.length > 0);
 	const nickname = typeof payload.nickname === "string" ? payload.nickname : void 0;
@@ -1724,7 +1793,7 @@ function mapCollabAgentEvent(event, canonicalThreadId) {
 					}
 				}];
 			}
-			if (statusType === "idle") return [{
+			if (statusType === "idle" || statusType === "notLoaded") return [{
 				...base,
 				type: "task.updated",
 				payload: {
@@ -1771,7 +1840,7 @@ function mapCollabAgentEvent(event, canonicalThreadId) {
 				...base,
 				type: "subagent.message.delta",
 				payload: {
-					subagentId: require_collectUint8StreamText.RuntimeSubagentId.make(agentThreadId),
+					subagentId: require_src.RuntimeSubagentId.make(agentThreadId),
 					providerThreadId: agentThreadId,
 					providerMessageId: item.id,
 					delta: item.text,
@@ -1779,12 +1848,12 @@ function mapCollabAgentEvent(event, canonicalThreadId) {
 				}
 			}];
 			const toolEvents = [];
-			if (require_collectUint8StreamText.isToolLifecycleItemType(canonical) && typeof item?.id === "string") {
+			if (require_src.isToolLifecycleItemType(canonical) && typeof item?.id === "string") {
 				const completed = payload.lifecycle === "item/completed" || item.status === "completed" || item.status === "failed";
 				toolEvents.push({
 					...base,
-					eventId: require_collectUint8StreamText.EventId.make(`${base.eventId}:tool`),
-					itemId: require_collectUint8StreamText.RuntimeItemId.make(`${agentThreadId}:${item.id}`),
+					eventId: require_src.EventId.make(`${base.eventId}:tool`),
+					itemId: require_src.RuntimeItemId.make(`${agentThreadId}:${item.id}`),
 					type: completed ? "item.completed" : "item.updated",
 					payload: {
 						itemType: canonical,
@@ -2352,7 +2421,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 * instances with different `homePath`s cannot step on each other.
 */
 const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexConfig, options) {
-	const boundInstanceId = options?.instanceId ?? require_collectUint8StreamText.ProviderInstanceId.make("codex");
+	const boundInstanceId = options?.instanceId ?? require_src.ProviderInstanceId.make("codex");
 	const adapterScope = yield* effect.Scope.Scope;
 	const fileSystem = yield* effect.FileSystem.FileSystem;
 	const childProcessSpawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
@@ -2378,7 +2447,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 			operation: "startSession",
 			issue: `Expected provider instance '${boundInstanceId}' but received '${input.providerInstanceId}'.`
 		});
-		const runtimeSessionId = yield* require_makeManagedServerProvider.requireRuntimeSessionId(PROVIDER, input);
+		const runtimeSessionId = yield* require_runtimeSession.requireRuntimeSessionId(PROVIDER, input);
 		const existing = sessions.get(input.threadId);
 		if (existing && !existing.stopped) {
 			if (existing.runtimeSessionId === runtimeSessionId) return {
@@ -2440,7 +2509,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		});
 		const eventFiber = yield* effect.Stream.runForEach(runtime.events, (event) => effect.Effect.gen(function* () {
 			yield* writeNativeEvent(event);
-			const runtimeEvents = mapToRuntimeEvents(event, event.threadId).map((runtimeEvent) => require_makeManagedServerProvider.stampRuntimeEvent(runtimeEvent, {
+			const runtimeEvents = mapToRuntimeEvents(event, event.threadId).map((runtimeEvent) => require_runtimeSession.stampRuntimeEvent(runtimeEvent, {
 				providerInstanceId: boundInstanceId,
 				runtimeSessionId
 			}));
@@ -2469,7 +2538,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 			if (agentControl) yield* agentControl.revoke("runtime-teardown");
 			yield* effect.Effect.logWarning("Codex event consumer failed; retiring its runtime", { threadId: input.threadId });
 			yield* effect.Queue.offer(runtimeEventQueue, {
-				eventId: require_collectUint8StreamText.EventId.make(crypto.randomUUID()),
+				eventId: require_src.EventId.make(crypto.randomUUID()),
 				provider: PROVIDER,
 				providerInstanceId: boundInstanceId,
 				runtimeSessionId,
@@ -2545,7 +2614,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		if (sizeBytes > 10485760) return yield* new require_bin.ProviderAdapterRequestError({
 			provider: PROVIDER,
 			method,
-			detail: `Attachment '${attachment.name}' is ${sizeBytes} bytes; limit is ${require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_IMAGE_BYTES} bytes.`
+			detail: `Attachment '${attachment.name}' is ${sizeBytes} bytes; limit is ${require_src.PROVIDER_SEND_TURN_MAX_IMAGE_BYTES} bytes.`
 		});
 		return {
 			attachment,
@@ -2593,7 +2662,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		}
 		return {
 			native: resolved,
-			pathLines: require_makeManagedServerProvider.formatAttachmentPathLines(pathLineEntries)
+			pathLines: require_runtimeSession.formatAttachmentPathLines(pathLineEntries)
 		};
 	});
 	const toCodexAttachment = effect.Effect.fn("toCodexAttachment")(function* (resolved, method) {
@@ -2615,7 +2684,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		const reasoningEffort = input.modelSelection?.instanceId === boundInstanceId ? require_bin.getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort") : void 0;
 		const fastMode = input.modelSelection?.instanceId === boundInstanceId ? require_bin.getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") : void 0;
 		const formatted = require_sourceControlContextFormatter.formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
-		const codexInput = require_makeManagedServerProvider.appendAttachmentPathLines(formatted ? formatted + "\n\n" + (input.input ?? "") : input.input, pathLines);
+		const codexInput = require_runtimeSession.appendAttachmentPathLines(formatted ? formatted + "\n\n" + (input.input ?? "") : input.input, pathLines);
 		const result = yield* session.runtime.sendTurn({
 			...codexInput !== void 0 ? { input: codexInput } : {},
 			...input.modelSelection?.instanceId === boundInstanceId ? { model: input.modelSelection.model } : {},
@@ -2636,7 +2705,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		const { native, pathLines } = yield* preflightAttachments(input, "turn/steer");
 		const codexAttachments = yield* effect.Effect.forEach(native, (attachment) => toCodexAttachment(attachment, "turn/steer"), { concurrency: 1 });
 		const session = yield* requireSession(input.threadId);
-		const steerInput = require_makeManagedServerProvider.appendAttachmentPathLines(input.input, pathLines);
+		const steerInput = require_runtimeSession.appendAttachmentPathLines(input.input, pathLines);
 		return yield* session.runtime.steerTurn({
 			expectedTurnId: input.expectedTurnId,
 			messageId: input.messageId,
@@ -2663,10 +2732,26 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		yield* effect.Effect.ignore(effect.Scope.close(session.scope, effect.Exit.void));
 		yield* effect.Fiber.interrupt(session.eventFiber).pipe(effect.Effect.ignore);
 	});
-	const interruptTurn = (threadId, turnId) => requireSession(threadId).pipe(effect.Effect.flatMap((session) => (session.agentControl ? session.agentControl.retireTurn(turnId) : effect.Effect.void).pipe(effect.Effect.andThen(session.runtime.interruptTurn(turnId)), effect.Effect.timeoutOption("15 seconds"), effect.Effect.flatMap(effect.Option.match({
+	const stopAfterFailedInterrupt = (session) => stopSessionInternal(session).pipe(effect.Effect.andThen(effect.Effect.gen(function* () {
+		yield* effect.Queue.offer(runtimeEventQueue, {
+			eventId: require_src.EventId.make(crypto.randomUUID()),
+			provider: PROVIDER,
+			providerInstanceId: boundInstanceId,
+			runtimeSessionId: session.runtimeSessionId,
+			threadId: session.threadId,
+			createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+			type: "session.exited",
+			payload: {
+				reason: "Stopped Codex after background cancellation failed.",
+				exitKind: "graceful"
+			}
+		});
+		yield* runtimeEventQueueMetrics.recordEnqueued(1);
+	})));
+	const interruptTurn = (threadId, turnId) => requireSession(threadId).pipe(effect.Effect.flatMap((session) => (session.agentControl ? session.agentControl.retireTurn(turnId) : effect.Effect.void).pipe(effect.Effect.andThen(session.runtime.interruptTurn(turnId).pipe(effect.Effect.catch(() => effect.Effect.logWarning("Codex interrupt failed; stopping the provider session and its background work.", { threadId }).pipe(effect.Effect.andThen(stopAfterFailedInterrupt(session)))))), effect.Effect.timeoutOption("15 seconds"), effect.Effect.flatMap(effect.Option.match({
 		onSome: () => effect.Effect.void,
-		onNone: () => effect.Effect.logWarning("Codex turn interrupt timed out; recycling the wedged provider session.", { threadId }).pipe(effect.Effect.andThen(stopSessionInternal(session)))
-	})))), effect.Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "turn/interrupt", cause)));
+		onNone: () => effect.Effect.logWarning("Codex turn interrupt timed out; recycling the wedged provider session.", { threadId }).pipe(effect.Effect.andThen(stopAfterFailedInterrupt(session)))
+	})))));
 	const readThread = (threadId) => requireSession(threadId).pipe(effect.Effect.flatMap((session) => session.runtime.readThread), effect.Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "thread/read", cause)), effect.Effect.map((snapshot) => ({
 		threadId,
 		turns: snapshot.turns
@@ -2697,7 +2782,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 			if (turn.status === "failed") failedTurnIds.push(turn.id);
 			const createdAt = (/* @__PURE__ */ new Date((turn.startedAt ?? 0) * 1e3)).toISOString();
 			for (const item of turn.items) if (item.type === "agentMessage" || item.type === "userMessage") messages.push({
-				id: require_collectUint8StreamText.MessageId.make(item.type === "agentMessage" ? `assistant:${item.id}` : item.clientId ?? `user:${item.id}`),
+				id: require_src.MessageId.make(item.type === "agentMessage" ? `assistant:${item.id}` : item.clientId ?? `user:${item.id}`),
 				turnId: turn.id,
 				role: item.type === "agentMessage" ? "assistant" : "user",
 				text: item.type === "agentMessage" ? item.text : item.content.flatMap((part) => part.type === "text" ? [part.text] : []).join("\n"),
@@ -2705,13 +2790,13 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 			});
 			else {
 				const event = mapItemLifecycle({
-					id: require_collectUint8StreamText.EventId.make(`history:${input.threadId}:${snapshot.threadId}:${turn.id}:${item.id}`),
+					id: require_src.EventId.make(`history:${input.threadId}:${snapshot.threadId}:${turn.id}:${item.id}`),
 					provider: PROVIDER,
 					threadId: input.threadId,
 					kind: "notification",
 					method: "item/completed",
 					turnId: turn.id,
-					itemId: require_collectUint8StreamText.ProviderItemId.make(item.id),
+					itemId: require_src.ProviderItemId.make(item.id),
 					createdAt,
 					payload: {
 						threadId: snapshot.threadId,
@@ -2839,7 +2924,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 *
 * @module provider/Drivers/CodexDriver
 */
-const DRIVER_KIND = require_collectUint8StreamText.ProviderDriverKind.make("codex");
+const DRIVER_KIND = require_src.ProviderDriverKind.make("codex");
 const UPDATE = require_bin.makePackageManagedProviderMaintenanceResolver({
 	provider: DRIVER_KIND,
 	npmPackageName: "@openai/codex",
@@ -2866,8 +2951,8 @@ const CodexDriver = {
 		displayName: "Codex",
 		supportsMultipleInstances: true
 	},
-	configSchema: require_collectUint8StreamText.CodexSettings,
-	defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CodexSettings)({}),
+	configSchema: require_src.CodexSettings,
+	defaultConfig: () => effect.Schema.decodeSync(require_src.CodexSettings)({}),
 	create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => effect.Effect.gen(function* () {
 		const spawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
 		const httpClient = yield* effect_unstable_http.HttpClient.HttpClient;