ryco-cli 0.1.25 → 0.1.26

package/dist/{CodexDriver-V4CL9APE.mjs → CodexDriver-fwcV84hX.mjs}

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
-import { Aa as ThreadGoal, Ni as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, Sr as isToolLifecycleItemType, Ui as ProviderApprovalDecision, Zo as ApprovalRequestId, ar as CodexSettings, as as EventId, ds as ProviderItemId, eo as ProviderDriverKind, fs as RuntimeItemId, gs as RuntimeTaskId, hs as RuntimeSubagentId, ps as RuntimeRequestId, ss as MessageId, to as ProviderInstanceId, ys as TurnId } from "./collectUint8StreamText-CE1Re5Ij.mjs";
-import { st as ServerConfig } from "./Metrics-a1h4iBQi.mjs";
-import { $ as mergeProviderInstanceEnvironment, $n as resolveAttachmentPath, $t as V2ErrorNotification, An as V2WindowsWorldWritableWarningNotification, At as CodexAppServerClient, Bt as ServerRequest__CommandExecutionRequestApprovalParams, Cn as V2TurnPlanUpdatedNotification, Ct as ProviderAdapterSessionNotFoundError, Dn as V2TurnSteerParams, Dt as materializeCodexShadowHome, En as V2TurnStartResponse, Et as codexContinuationIdentity, Ft as CodexAppServerRequestError, Gt as ToolRequestUserInputParams, Hn as enrichProviderSnapshotWithVersionAdvisory, Ht as ServerRequest__ExecCommandApprovalParams, It as CodexAppServerSpawnError, Jn as resolveProviderMaintenanceCapabilitiesEffect, Jt as V2AccountUpdatedNotification, Kt as ToolRequestUserInputResponse, Lt as CodexAppServerTransportError, M as makeEventNdjsonLogger, Mt as layerCommand, N as buildTokenReductionInstructions, Nt as CodexAppServerProcessExitedError, On as V2TurnSteerResponse, Ot as resolveCodexHomeLayout, P as checkRtkAvailability, Pt as CodexAppServerProtocolParseError, Qt as V2DeprecationNoticeNotification, Rt as SERVER_NOTIFICATION_METHODS, Sn as V2TurnDiffUpdatedNotification, St as ProviderAdapterSessionClosedError, Tn as V2TurnStartParams__CollaborationMode, Tt as ProviderDriverError, Ut as ServerRequest__FileChangeRequestApprovalParams, Vt as ServerRequest__DynamicToolCallParams, Wn as makePackageManagedProviderMaintenanceResolver, Wt as ServerRequest__ToolRequestUserInputParams, Xn as ServerSettingsService, Xt as V2CommandExecutionOutputDeltaNotification, Yt as V2AgentMessageDeltaNotification, Zt as V2ConfigWarningNotification, _n as V2ThreadRealtimeStartedNotification, _t as installAgentControlNativeHttp, an as V2ModelReroutedNotification, bn as V2ThreadTokenUsageUpdatedNotification, bt as ProviderAdapterProcessError, cn as V2ReasoningTextDeltaNotification, dn as V2ThreadGoalUpdatedNotification, en as V2FileChangeOutputDeltaNotification, et as buildCodexInitializeParams, fn as V2ThreadNameUpdatedNotification, gn as V2ThreadRealtimeOutputAudioDeltaNotification, hn as V2ThreadRealtimeItemAddedNotification, in as V2McpToolCallProgressNotification, ir as getModelSelectionStringOptionValue, j as ProviderEventLoggers, jt as layerChildProcess, kn as V2WindowsSandboxSetupCompletedNotification, kt as expandHomePath, ln as V2ServerRequestResolvedNotification, lr as normalizeModelSlug, mn as V2ThreadRealtimeErrorNotification, n as AgentControlSessionRegistry, nn as V2ItemStartedNotification, nt as makePendingCodexProvider, on as V2PlanDeltaNotification, pn as V2ThreadRealtimeClosedNotification, qt as V2AccountRateLimitsUpdatedNotification, rn as V2McpServerOauthLoginCompletedNotification, rr as getModelSelectionBooleanOptionValue, sn as V2ReasoningSummaryTextDeltaNotification, t as makeServerQueueMetrics, tn as V2ItemCompletedNotification, tt as checkCodexProviderStatus, un as V2ThreadGoalClearedNotification, vn as V2ThreadStartedNotification, wn as V2TurnStartParams, wt as ProviderAdapterValidationError, xn as V2TurnCompletedNotification, xt as ProviderAdapterRequestError, yn as V2ThreadStatusChangedNotification, yt as createProcessDeviceToolBinding, zt as ServerRequest__ApplyPatchApprovalParams } 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 { As as EventId, Bs as RuntimeSubagentId, Eo as ProviderInstanceId, Is as ProviderItemId, Kr as isToolLifecycleItemType, Ls as RuntimeItemId, Ms as MessageId, Or as CodexSettings, Rs as RuntimeRequestId, Ss as ApprovalRequestId, To as ProviderDriverKind, Vs as RuntimeTaskId, Ws as TurnId, ia as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, ma as ProviderApprovalDecision, to as ThreadGoal } from "./src-DtEOcXdl.mjs";
+import { Z as ServerConfig } from "./Metrics-C-3MahDy.mjs";
+import { $t as CodexAppServerRequestError, A as makeEventNdjsonLogger, An as V2ThreadNameUpdatedNotification, B as buildTokenReductionInstructions, Bn as V2TurnDiffUpdatedNotification, Bt as ProviderAdapterSessionClosedError, Cn as V2ModelReroutedNotification, Dn as V2ServerRequestResolvedNotification, Dr as normalizeModelSlug, En as V2ReasoningTextDeltaNotification, Fn as V2ThreadRealtimeStartedNotification, Ft as installAgentControlNativeHttp, Gn as V2TurnSteerParams, Gt as materializeCodexShadowHome, Hn as V2TurnStartParams, Ht as ProviderAdapterValidationError, In as V2ThreadStartedNotification, Jn as V2WindowsWorldWritableWarningNotification, Jt as CodexAppServerClient, Kn as V2TurnSteerResponse, Kt as resolveCodexHomeLayout, Ln as V2ThreadStatusChangedNotification, Lt as createProcessDeviceToolBinding, Mn as V2ThreadRealtimeErrorNotification, Nn as V2ThreadRealtimeItemAddedNotification, On as V2ThreadGoalClearedNotification, Pn as V2ThreadRealtimeOutputAudioDeltaNotification, Qt as CodexAppServerProtocolParseError, Rn as V2ThreadTokenUsageUpdatedNotification, Rt as ProviderAdapterProcessError, Sn as V2McpToolCallProgressNotification, Sr as getModelSelectionStringOptionValue, Tn as V2ReasoningSummaryTextDeltaNotification, Un as V2TurnStartParams__CollaborationMode, Ut as ProviderDriverError, V as checkRtkAvailability, Vn as V2TurnPlanUpdatedNotification, Vt as ProviderAdapterSessionNotFoundError, Wn as V2TurnStartResponse, Wt as codexContinuationIdentity, Xt as layerCommand, Yt as layerChildProcess, Zt as CodexAppServerProcessExitedError, _n as V2ErrorNotification, _r as resolveAttachmentPath, _t as buildCodexInitializeParams, an as ServerRequest__DynamicToolCallParams, bn as V2ItemStartedNotification, cn as ServerRequest__ToolRequestUserInputParams, cr as makePackageManagedProviderMaintenanceResolver, dn as V2AccountRateLimitsUpdatedNotification, en as CodexAppServerSpawnError, fn as V2AccountUpdatedNotification, fr as resolveProviderMaintenanceCapabilitiesEffect, gn as V2DeprecationNoticeNotification, gt as mergeProviderInstanceEnvironment, hn as V2ConfigWarningNotification, in as ServerRequest__CommandExecutionRequestApprovalParams, jn as V2ThreadRealtimeClosedNotification, k as ProviderEventLoggers, kn as V2ThreadGoalUpdatedNotification, ln as ToolRequestUserInputParams, mn as V2CommandExecutionOutputDeltaNotification, mr as ServerSettingsService, n as AgentControlSessionRegistry, nn as SERVER_NOTIFICATION_METHODS, on as ServerRequest__ExecCommandApprovalParams, or as enrichProviderSnapshotWithVersionAdvisory, pn as V2AgentMessageDeltaNotification, qn as V2WindowsSandboxSetupCompletedNotification, qt as expandHomePath, rn as ServerRequest__ApplyPatchApprovalParams, sn as ServerRequest__FileChangeRequestApprovalParams, t as makeServerQueueMetrics, tn as CodexAppServerTransportError, un as ToolRequestUserInputResponse, vn as V2FileChangeOutputDeltaNotification, vt as checkCodexProviderStatus, wn as V2PlanDeltaNotification, xn as V2McpServerOauthLoginCompletedNotification, xr as getModelSelectionBooleanOptionValue, yn as V2ItemCompletedNotification, yt as makePendingCodexProvider, zn as V2TurnCompletedNotification, 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 formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
 import { t as appendProjectCustomSystemPrompt } from "./ProjectCustomSystemPrompt-CS1nulhL.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-DoCidwvI.mjs";
-import { Cause, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Queue, Redacted, Ref, Schema, Scope, Stream } from "effect";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-BINne1KE.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-_4aT5BHa.mjs";
+import { Cause, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Queue, Redacted, Ref, Schedule, Schema, Scope, Stream } from "effect";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as SchemaIssue$1 from "effect/SchemaIssue";
@@ -599,6 +600,9 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 	const collabChildAgentsRef = yield* Ref.make(/* @__PURE__ */ new Map());
 	/** Child provider-thread id → its currently running provider turn id. */
 	const collabChildLiveTurnsRef = yield* Ref.make(/* @__PURE__ */ new Map());
+	const childRevisions = /* @__PURE__ */ new Map();
+	const unsettledChildren = /* @__PURE__ */ new Set();
+	const reconciledChildStatuses = /* @__PURE__ */ new Map();
 	const closedRef = yield* Ref.make(false);
 	const resolvedHomePath = options.homePath ? expandHomePath(options.homePath) : void 0;
 	const env = {
@@ -852,8 +856,52 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 			default: return routeCodexChildNotification(notification.method) === "drop";
 		}
 	});
+	const reconcileChild = (childThreadId, includeTurns = false) => 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* 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* 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.timeout("3 seconds"));
 	const handleRawNotification = (notification) => Effect.gen(function* () {
 		const payload = notification.params;
+		const rootId = currentProviderThreadId(yield* 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* Ref.get(collabReceiverTurnsRef);
 		const childParentTurnId = (() => {
@@ -1077,6 +1125,10 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 		discard: true
 	});
 	yield* Stream.fromQueue(serverNotifications).pipe(Stream.runForEach(handleRawNotification), Effect.forkIn(runtimeScope));
+	yield* Effect.suspend(() => Effect.forEach(Array.from(unsettledChildren), (id) => reconcileChild(id).pipe(Effect.ignore), {
+		concurrency: 4,
+		discard: true
+	})).pipe(Effect.repeat(Schedule.spaced("5 seconds")), Effect.forkIn(runtimeScope));
 	const stderrRemainderRef = yield* Ref.make("");
 	yield* child.stderr.pipe(Stream.decodeText(), Stream.runForEach((chunk) => Ref.modify(stderrRemainderRef, (current) => {
 		const lines = (current + chunk).split("\n");
@@ -1204,20 +1256,37 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 		interruptTurn: (turnId) => Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
 			const session = yield* Ref.get(sessionRef);
+			yield* Effect.forEach(Array.from((yield* Ref.get(collabChildAgentsRef)).keys()), (id) => reconcileChild(id, true).pipe(Effect.ignore), {
+				concurrency: 8,
+				discard: true
+			}).pipe(Effect.timeoutOption("5 seconds"));
 			const liveChildTurns = yield* Ref.get(collabChildLiveTurnsRef);
+			const registeredChildren = yield* Ref.get(collabChildAgentsRef);
+			let childInterruptFailed = Array.from(unsettledChildren).some((id) => registeredChildren.has(id) && !liveChildTurns.has(id));
 			yield* Effect.forEach(Array.from(liveChildTurns.entries()), ([childThreadId, childTurnId]) => client.request("turn/interrupt", {
 				threadId: childThreadId,
 				turnId: childTurnId
-			}).pipe(Effect.timeoutOption("3 seconds"), Effect.ignore), {
+			}).pipe(Effect.timeout("3 seconds"), Effect.catchCause(() => Effect.sync(() => {
+				childInterruptFailed = true;
+			}))), {
 				concurrency: 8,
 				discard: true
-			}).pipe(Effect.timeoutOption("10 seconds"), Effect.ignore);
+			}).pipe(Effect.timeout("10 seconds"), Effect.catchCause(() => 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.fail(new CodexAppServerTransportError({
+				detail: "Could not interrupt all Codex child turns",
+				cause: /* @__PURE__ */ new Error("Child interrupt failed or timed out")
+			}));
+			yield* Effect.forEach(Array.from((yield* Ref.get(collabChildAgentsRef)).keys()), (id) => reconcileChild(id, true).pipe(Effect.ignore), {
+				concurrency: 8,
+				discard: true
+			}).pipe(Effect.timeoutOption("5 seconds"));
 		}),
 		readThread: Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
@@ -1722,7 +1791,7 @@ function mapCollabAgentEvent(event, canonicalThreadId) {
 					}
 				}];
 			}
-			if (statusType === "idle") return [{
+			if (statusType === "idle" || statusType === "notLoaded") return [{
 				...base,
 				type: "task.updated",
 				payload: {
@@ -2661,10 +2730,26 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		yield* Effect.ignore(Scope.close(session.scope, Exit.void));
 		yield* Fiber.interrupt(session.eventFiber).pipe(Effect.ignore);
 	});
-	const interruptTurn = (threadId, turnId) => requireSession(threadId).pipe(Effect.flatMap((session) => (session.agentControl ? session.agentControl.retireTurn(turnId) : Effect.void).pipe(Effect.andThen(session.runtime.interruptTurn(turnId)), Effect.timeoutOption("15 seconds"), Effect.flatMap(Option.match({
+	const stopAfterFailedInterrupt = (session) => stopSessionInternal(session).pipe(Effect.andThen(Effect.gen(function* () {
+		yield* Queue.offer(runtimeEventQueue, {
+			eventId: 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.flatMap((session) => (session.agentControl ? session.agentControl.retireTurn(turnId) : Effect.void).pipe(Effect.andThen(session.runtime.interruptTurn(turnId).pipe(Effect.catch(() => Effect.logWarning("Codex interrupt failed; stopping the provider session and its background work.", { threadId }).pipe(Effect.andThen(stopAfterFailedInterrupt(session)))))), Effect.timeoutOption("15 seconds"), Effect.flatMap(Option.match({
 		onSome: () => Effect.void,
-		onNone: () => Effect.logWarning("Codex turn interrupt timed out; recycling the wedged provider session.", { threadId }).pipe(Effect.andThen(stopSessionInternal(session)))
-	})))), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "turn/interrupt", cause)));
+		onNone: () => Effect.logWarning("Codex turn interrupt timed out; recycling the wedged provider session.", { threadId }).pipe(Effect.andThen(stopAfterFailedInterrupt(session)))
+	})))));
 	const readThread = (threadId) => requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.readThread), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "thread/read", cause)), Effect.map((snapshot) => ({
 		threadId,
 		turns: snapshot.turns

package/dist/{CodexTextGeneration-DTrSzY-I.cjs → CodexTextGeneration-Y2GSS7f1.cjs}

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-whblCEfg.cjs");
-const require_Metrics = require("./Metrics-Bcb9vCAe.cjs");
+const require_src = require("./src-BlzIcnVG.cjs");
+const require_Metrics = require("./Metrics-DCKbdeoH.cjs");
+const require_git = require("./git-irmB8_k7.cjs");
 const require_bin = require("./bin.cjs");
+const require_SideQuestionIsolation = require("./SideQuestionIsolation-DvVKZWxi.cjs");
 let effect = require("effect");
 let effect_unstable_process = require("effect/unstable/process");
 //#region src/textGeneration/CodexTextGeneration.ts
@@ -22,7 +24,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 		return effect.Effect.gen(function* () {
 			const tempFileId = yield* effect.Effect.sync(() => crypto.randomUUID());
 			return yield* fileSystem.makeTempFileScoped({ prefix: `ryco-${prefix}-${process.pid}-${tempFileId}.tmp` }).pipe(effect.Effect.tap((filePath) => fileSystem.writeFileString(filePath, content)));
-		}).pipe(effect.Effect.mapError((cause) => new require_collectUint8StreamText.TextGenerationError({
+		}).pipe(effect.Effect.mapError((cause) => new require_src.TextGenerationError({
 			operation,
 			detail: `Failed to write temp file`,
 			cause
@@ -53,6 +55,33 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 			const command = effect_unstable_process.ChildProcess.make(codexConfig.binaryPath || "codex", [
 				"exec",
 				"--ephemeral",
+				...operation === "answerSideQuestion" ? [
+					"--ignore-user-config",
+					"--ignore-rules",
+					...[
+						"approval_policy=\"never\"",
+						"web_search=\"disabled\"",
+						"project_doc_max_bytes=0",
+						"mcp_servers={}",
+						"features.shell_tool=false",
+						"features.view_image=false",
+						"features.search_tool=false",
+						"features.tool_search=false",
+						"features.tool_suggest=false",
+						"features.external_agent_memory_import=false",
+						"features.unified_exec=false",
+						"features.apply_patch_freeform=false",
+						"features.apps=false",
+						"features.plugins=false",
+						"features.hooks=false",
+						"features.codex_hooks=false",
+						"features.plugin_hooks=false",
+						"features.memories=false",
+						"features.memory_tool=false",
+						"features.js_repl=false",
+						"features.multi_agent=false"
+					].flatMap((config) => ["--config", config])
+				] : [],
 				"--skip-git-repo-check",
 				"-s",
 				"read-only",
@@ -69,7 +98,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 				"-"
 			], {
 				env: {
-					...environment,
+					...operation === "answerSideQuestion" ? require_SideQuestionIsolation.sideQuestionEnvironment(environment) : environment,
 					...codexConfig.homePath ? { CODEX_HOME: require_bin.expandHomePath(codexConfig.homePath) } : {}
 				},
 				cwd,
@@ -86,7 +115,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 				const stderrDetail = stderr.trim();
 				const stdoutDetail = stdout.trim();
 				const detail = stderrDetail.length > 0 ? stderrDetail : stdoutDetail;
-				return yield* new require_collectUint8StreamText.TextGenerationError({
+				return yield* new require_src.TextGenerationError({
 					operation,
 					detail: detail.length > 0 ? `Codex CLI command failed: ${detail}` : `Codex CLI command failed with code ${exitCode}.`
 				});
@@ -99,125 +128,141 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 		].map((filePath) => safeUnlink(filePath)), { concurrency: "unbounded" }).pipe(effect.Effect.asVoid);
 		return yield* effect.Effect.gen(function* () {
 			yield* runCodexCommand().pipe(effect.Effect.scoped, effect.Effect.timeoutOption(CODEX_TIMEOUT_MS), effect.Effect.flatMap(effect.Option.match({
-				onNone: () => effect.Effect.fail(new require_collectUint8StreamText.TextGenerationError({
+				onNone: () => effect.Effect.fail(new require_src.TextGenerationError({
 					operation,
 					detail: "Codex CLI request timed out."
 				})),
 				onSome: () => effect.Effect.void
 			})));
-			return yield* fileSystem.readFileString(outputPath).pipe(effect.Effect.mapError((cause) => new require_collectUint8StreamText.TextGenerationError({
+			return yield* fileSystem.readFileString(outputPath).pipe(effect.Effect.mapError((cause) => new require_src.TextGenerationError({
 				operation,
 				detail: "Failed to read Codex output file.",
 				cause
-			})), effect.Effect.flatMap(effect.Schema.decodeEffect(effect.Schema.fromJsonString(outputSchemaJson))), effect.Effect.catchTag("SchemaError", (cause) => effect.Effect.fail(new require_collectUint8StreamText.TextGenerationError({
+			})), effect.Effect.flatMap(effect.Schema.decodeEffect(effect.Schema.fromJsonString(outputSchemaJson))), effect.Effect.catchTag("SchemaError", (cause) => effect.Effect.fail(new require_src.TextGenerationError({
 				operation,
 				detail: "Codex returned invalid structured output.",
 				cause
 			}))));
 		}).pipe(effect.Effect.ensuring(cleanup));
 	});
-	return {
-		generateCommitMessage: effect.Effect.fn("CodexTextGeneration.generateCommitMessage")(function* (input) {
-			const { prompt, outputSchema } = require_bin.buildCommitMessagePrompt({
-				branch: input.branch,
-				stagedSummary: input.stagedSummary,
-				stagedPatch: input.stagedPatch,
-				includeBranch: input.includeBranch === true
-			});
-			const generated = yield* runCodexJson({
-				operation: "generateCommitMessage",
-				cwd: input.cwd,
-				prompt,
-				outputSchemaJson: outputSchema,
-				modelSelection: input.modelSelection
-			});
-			return {
-				subject: require_bin.sanitizeCommitSubject(generated.subject),
-				body: generated.body.trim(),
-				..."branch" in generated && typeof generated.branch === "string" ? { branch: require_Metrics.sanitizeFeatureBranchName(generated.branch) } : {}
-			};
-		}),
-		generatePrContent: effect.Effect.fn("CodexTextGeneration.generatePrContent")(function* (input) {
-			const { prompt, outputSchema } = require_bin.buildPrContentPrompt({
-				baseBranch: input.baseBranch,
-				headBranch: input.headBranch,
-				commitSummary: input.commitSummary,
-				diffSummary: input.diffSummary,
-				diffPatch: input.diffPatch
+	const generateCommitMessage = effect.Effect.fn("CodexTextGeneration.generateCommitMessage")(function* (input) {
+		const { prompt, outputSchema } = require_bin.buildCommitMessagePrompt({
+			branch: input.branch,
+			stagedSummary: input.stagedSummary,
+			stagedPatch: input.stagedPatch,
+			includeBranch: input.includeBranch === true
+		});
+		const generated = yield* runCodexJson({
+			operation: "generateCommitMessage",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection
+		});
+		return {
+			subject: require_bin.sanitizeCommitSubject(generated.subject),
+			body: generated.body.trim(),
+			..."branch" in generated && typeof generated.branch === "string" ? { branch: require_git.sanitizeFeatureBranchName(generated.branch) } : {}
+		};
+	});
+	const generatePrContent = effect.Effect.fn("CodexTextGeneration.generatePrContent")(function* (input) {
+		const { prompt, outputSchema } = require_bin.buildPrContentPrompt({
+			baseBranch: input.baseBranch,
+			headBranch: input.headBranch,
+			commitSummary: input.commitSummary,
+			diffSummary: input.diffSummary,
+			diffPatch: input.diffPatch
+		});
+		const generated = yield* runCodexJson({
+			operation: "generatePrContent",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection
+		});
+		return {
+			title: require_bin.sanitizePrTitle(generated.title),
+			body: generated.body.trim()
+		};
+	});
+	const generateBranchName = effect.Effect.fn("CodexTextGeneration.generateBranchName")(function* (input) {
+		const { imagePaths } = yield* materializeImageAttachments("generateBranchName", input.attachments);
+		const { prompt, outputSchema } = require_bin.buildBranchNamePrompt({
+			message: input.message,
+			attachments: input.attachments
+		});
+		const generated = yield* runCodexJson({
+			operation: "generateBranchName",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			imagePaths,
+			modelSelection: input.modelSelection
+		});
+		return { branch: require_git.sanitizeBranchFragment(generated.branch) };
+	});
+	const generateThreadTitle = effect.Effect.fn("CodexTextGeneration.generateThreadTitle")(function* (input) {
+		const { imagePaths } = yield* materializeImageAttachments("generateThreadTitle", input.attachments);
+		const { prompt, outputSchema } = require_bin.buildThreadTitlePrompt({
+			message: input.message,
+			attachments: input.attachments
+		});
+		const generated = yield* runCodexJson({
+			operation: "generateThreadTitle",
+			cwd: input.cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			imagePaths,
+			modelSelection: input.modelSelection
+		});
+		return { title: require_bin.sanitizeThreadTitle(generated.title) };
+	});
+	const generateIssueContent = effect.Effect.fn("CodexTextGeneration.generateIssueContent")(function* (input) {
+		if (input.mode === "polish") {
+			const { prompt, outputSchema } = require_bin.buildIssueContentPolishPrompt({
+				rough: input.rough ?? "",
+				...input.currentTitle ? { currentTitle: input.currentTitle } : {},
+				...input.customInstructions ? { customInstructions: input.customInstructions } : {}
 			});
-			const generated = yield* runCodexJson({
-				operation: "generatePrContent",
+			const decoded = yield* runCodexJson({
+				operation: "generateIssueContent",
 				cwd: input.cwd,
 				prompt,
 				outputSchemaJson: outputSchema,
 				modelSelection: input.modelSelection
 			});
 			return {
-				title: require_bin.sanitizePrTitle(generated.title),
-				body: generated.body.trim()
+				title: decoded.title.trim(),
+				body: decoded.body.trim()
 			};
-		}),
-		generateBranchName: effect.Effect.fn("CodexTextGeneration.generateBranchName")(function* (input) {
-			const { imagePaths } = yield* materializeImageAttachments("generateBranchName", input.attachments);
-			const { prompt, outputSchema } = require_bin.buildBranchNamePrompt({
-				message: input.message,
-				attachments: input.attachments
-			});
-			const generated = yield* runCodexJson({
-				operation: "generateBranchName",
-				cwd: input.cwd,
-				prompt,
-				outputSchemaJson: outputSchema,
-				imagePaths,
-				modelSelection: input.modelSelection
-			});
-			return { branch: require_Metrics.sanitizeBranchFragment(generated.branch) };
-		}),
-		generateThreadTitle: effect.Effect.fn("CodexTextGeneration.generateThreadTitle")(function* (input) {
-			const { imagePaths } = yield* materializeImageAttachments("generateThreadTitle", input.attachments);
-			const { prompt, outputSchema } = require_bin.buildThreadTitlePrompt({
-				message: input.message,
-				attachments: input.attachments
-			});
-			const generated = yield* runCodexJson({
-				operation: "generateThreadTitle",
+		} else {
+			const { prompt, outputSchema } = require_bin.buildIssueContentTitlePrompt({ body: input.body ?? "" });
+			return { title: (yield* runCodexJson({
+				operation: "generateIssueContent",
 				cwd: input.cwd,
 				prompt,
 				outputSchemaJson: outputSchema,
-				imagePaths,
 				modelSelection: input.modelSelection
-			});
-			return { title: require_bin.sanitizeThreadTitle(generated.title) };
-		}),
-		generateIssueContent: effect.Effect.fn("CodexTextGeneration.generateIssueContent")(function* (input) {
-			if (input.mode === "polish") {
-				const { prompt, outputSchema } = require_bin.buildIssueContentPolishPrompt({
-					rough: input.rough ?? "",
-					...input.currentTitle ? { currentTitle: input.currentTitle } : {},
-					...input.customInstructions ? { customInstructions: input.customInstructions } : {}
-				});
-				const decoded = yield* runCodexJson({
-					operation: "generateIssueContent",
-					cwd: input.cwd,
-					prompt,
-					outputSchemaJson: outputSchema,
-					modelSelection: input.modelSelection
-				});
-				return {
-					title: decoded.title.trim(),
-					body: decoded.body.trim()
-				};
-			} else {
-				const { prompt, outputSchema } = require_bin.buildIssueContentTitlePrompt({ body: input.body ?? "" });
-				return { title: (yield* runCodexJson({
-					operation: "generateIssueContent",
-					cwd: input.cwd,
-					prompt,
-					outputSchemaJson: outputSchema,
-					modelSelection: input.modelSelection
-				})).title.trim() };
-			}
-		}),
+			})).title.trim() };
+		}
+	});
+	const answerSideQuestion = (input) => effect.Effect.scoped(effect.Effect.gen(function* () {
+		const cwd = yield* require_SideQuestionIsolation.sideQuestionDirectory;
+		const { prompt, outputSchema } = require_bin.buildSideQuestionPrompt(input);
+		return yield* runCodexJson({
+			operation: "answerSideQuestion",
+			cwd,
+			prompt,
+			outputSchemaJson: outputSchema,
+			modelSelection: input.modelSelection
+		});
+	}));
+	return {
+		generateCommitMessage,
+		generatePrContent,
+		generateBranchName,
+		generateThreadTitle,
+		generateIssueContent,
 		rankInboxThreads: effect.Effect.fn("CodexTextGeneration.rankInboxThreads")(function* (input) {
 			const { prompt, outputSchema } = require_bin.buildThreadPriorityPrompt({ serializedCandidates: input.chunk.serializedCandidates });
 			const generated = yield* runCodexJson({
@@ -228,7 +273,8 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 				modelSelection: input.modelSelection
 			});
 			return yield* require_bin.validateRankInboxThreadsResult(input, generated.rankings);
-		})
+		}),
+		answerSideQuestion
 	};
 });
 //#endregion