ryco-cli 0.1.21 → 0.1.23

package/dist/{CodexDriver-CccSWoP3.mjs → CodexDriver-DnnqkGoY.mjs}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
-import { $o as RuntimeItemId, Ha as ProviderInstanceId, Ko as EventId, Mi as ProviderApprovalDecision, Qo as ProviderItemId, Ro as ApprovalRequestId, Si as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, Va as ProviderDriverKind, _a as ThreadGoal, er as CodexSettings, es as RuntimeRequestId, os as TurnId, rs as RuntimeTaskId } from "./collectUint8StreamText-D8TBiBWk.mjs";
-import { st as ServerConfig } from "./Metrics-BP9YjxZB.mjs";
-import { $t as V2ReasoningSummaryTextDeltaNotification, At as SERVER_NOTIFICATION_METHODS, Bn as resolveProviderMaintenanceCapabilitiesEffect, Bt as V2AccountUpdatedNotification, Ct as CodexAppServerClient, D as checkRtkAvailability, Dt as CodexAppServerRequestError, E as buildTokenReductionInstructions, Et as CodexAppServerProtocolParseError, Ft as ServerRequest__FileChangeRequestApprovalParams, Gt as V2ErrorNotification, Hn as ServerSettingsService, Ht as V2CommandExecutionOutputDeltaNotification, In as makePackageManagedProviderMaintenanceResolver, It as ServerRequest__ToolRequestUserInputParams, J as checkCodexProviderStatus, Jn as getModelSelectionBooleanOptionValue, Jt as V2ItemStartedNotification, K as mergeProviderInstanceEnvironment, Kt as V2FileChangeOutputDeltaNotification, Lt as ToolRequestUserInputParams, Mt as ServerRequest__CommandExecutionRequestApprovalParams, Nt as ServerRequest__DynamicToolCallParams, Ot as CodexAppServerSpawnError, Pn as enrichProviderSnapshotWithVersionAdvisory, Pt as ServerRequest__ExecCommandApprovalParams, Qt as V2PlanDeltaNotification, Rt as ToolRequestUserInputResponse, Sn as V2WindowsWorldWritableWarningNotification, St as expandHomePath, T as makeEventNdjsonLogger, Tt as CodexAppServerProcessExitedError, Ut as V2ConfigWarningNotification, Vt as V2AgentMessageDeltaNotification, Wn as resolveAttachmentPath, Wt as V2DeprecationNoticeNotification, Xt as V2McpToolCallProgressNotification, Y as makePendingCodexProvider, Yn as getModelSelectionStringOptionValue, Yt as V2McpServerOauthLoginCompletedNotification, Zt as V2ModelReroutedNotification, _n as V2TurnStartParams__CollaborationMode, _t as ProviderAdapterValidationError, an as V2ThreadRealtimeClosedNotification, bn as V2TurnSteerResponse, bt as materializeCodexShadowHome, cn as V2ThreadRealtimeOutputAudioDeltaNotification, dn as V2ThreadStatusChangedNotification, en as V2ReasoningTextDeltaNotification, er as normalizeModelSlug, fn as V2ThreadTokenUsageUpdatedNotification, ft as createProcessDeviceToolBinding, gn as V2TurnStartParams, gt as ProviderAdapterSessionNotFoundError, hn as V2TurnPlanUpdatedNotification, ht as ProviderAdapterSessionClosedError, in as V2ThreadNameUpdatedNotification, jt as ServerRequest__ApplyPatchApprovalParams, kt as CodexAppServerTransportError, ln as V2ThreadRealtimeStartedNotification, mn as V2TurnDiffUpdatedNotification, mt as ProviderAdapterRequestError, n as AgentControlSessionRegistry, nn as V2ThreadGoalClearedNotification, on as V2ThreadRealtimeErrorNotification, pn as V2TurnCompletedNotification, pt as ProviderAdapterProcessError, q as buildCodexInitializeParams, qt as V2ItemCompletedNotification, rn as V2ThreadGoalUpdatedNotification, sn as V2ThreadRealtimeItemAddedNotification, t as makeServerQueueMetrics, tn as V2ServerRequestResolvedNotification, un as V2ThreadStartedNotification, ut as installAgentControlNativeHttp, vn as V2TurnStartResponse, vt as ProviderDriverError, w as ProviderEventLoggers, wt as layerChildProcess, xn as V2WindowsSandboxSetupCompletedNotification, xt as resolveCodexHomeLayout, yn as V2TurnSteerParams, yt as codexContinuationIdentity, zt as V2AccountRateLimitsUpdatedNotification } from "./bin.mjs";
+import { $a as ProviderInstanceId, Oa as ThreadGoal, Qa as ProviderDriverKind, Vi as ProviderApprovalDecision, Yo as ApprovalRequestId, _s as TurnId, as as MessageId, br as isToolLifecycleItemType, ds as RuntimeRequestId, ji as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, ls as ProviderItemId, ms as RuntimeTaskId, ps as RuntimeSubagentId, rr as CodexSettings, rs as EventId, us as RuntimeItemId } from "./collectUint8StreamText-C_VNyArd.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-GZcpSLrW.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
 import { t as appendProjectCustomSystemPrompt } from "./ProjectCustomSystemPrompt-CS1nulhL.mjs";
-import { n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-DRlNwlhe.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BfGt7ZUe.mjs";
-import { Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Queue, Redacted, Ref, Schema, Scope, Stream } from "effect";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-Cw-FZbSS.mjs";
+import { Cause, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Queue, Redacted, Ref, 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";
@@ -177,13 +177,6 @@ const PROVIDER$1 = 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"];
-const RECOVERABLE_THREAD_RESUME_ERROR_SNIPPETS = [
-	"not found",
-	"missing thread",
-	"no such thread",
-	"unknown thread",
-	"does not exist"
-];
 const CodexResumeCursorSchema = Schema.Struct({ threadId: Schema.String });
 const CodexUserInputAnswerObject = Schema.Struct({ answers: Schema.Array(Schema.String) });
 const CodexTurnStartParamsWithCollaborationMode = V2TurnStartParams.pipe(Schema.fieldsAssign({ collaborationMode: Schema.optionalKey(V2TurnStartParams__CollaborationMode) }));
@@ -276,7 +269,10 @@ function buildThreadStartParams(input) {
 		approvalPolicy: config.approvalPolicy,
 		sandbox: config.sandbox,
 		approvalsReviewer: config.approvalsReviewer,
-		...Object.keys(mcpServers).length > 0 ? { config: { mcp_servers: mcpServers } } : {},
+		config: {
+			"features.goals": true,
+			...Object.keys(mcpServers).length > 0 ? { mcp_servers: mcpServers } : {}
+		},
 		...input.model ? { model: input.model } : {},
 		...input.serviceTier ? { serviceTier: input.serviceTier } : {}
 	};
@@ -357,11 +353,6 @@ function classifyCodexStderrLine(rawLine) {
 	}
 	return { message: line };
 }
-function isRecoverableThreadResumeError(error) {
-	const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
-	if (!message.includes("thread")) return false;
-	return RECOVERABLE_THREAD_RESUME_ERROR_SNIPPETS.some((snippet) => message.includes(snippet));
-}
 const openCodexThread = (input) => {
 	const resumeThreadId = input.resumeThreadId;
 	const startParams = buildThreadStartParams({
@@ -376,13 +367,10 @@ const openCodexThread = (input) => {
 	return input.client.request("thread/resume", {
 		threadId: resumeThreadId,
 		...startParams
-	}).pipe(Effect.catchIf(isRecoverableThreadResumeError, (error) => Effect.logWarning("codex app-server thread resume fell back to fresh start", {
-		threadId: input.threadId,
-		requestedRuntimeMode: input.runtimeMode,
-		resumeThreadId,
-		recoverable: true,
-		cause: error.message
-	}).pipe(Effect.andThen(input.client.request("thread/start", startParams)))));
+	}).pipe(Effect.mapError((error) => error.message.includes("already has an active writer") ? new CodexAppServerRequestError({
+		code: -32600,
+		errorMessage: "This Codex thread already has an active writer in another process. Its history can still be recovered. Release the thread in that process before continuing it here."
+	}) : error));
 };
 function readNotificationThreadId(notification) {
 	switch (notification.method) {
@@ -569,10 +557,31 @@ function parseThreadSnapshot(response) {
 		threadId: response.thread.id,
 		turns: response.thread.turns.map((turn) => ({
 			id: TurnId.make(turn.id),
-			items: turn.items
+			items: turn.items,
+			status: turn.status,
+			...turn.startedAt !== void 0 ? { startedAt: turn.startedAt } : {}
 		}))
 	};
 }
+const readStoredCodexThread = (input) => Effect.scoped(Effect.gen(function* () {
+	const context = yield* Layer.build(layerCommand({
+		command: input.binaryPath,
+		args: ["app-server"],
+		cwd: input.cwd,
+		env: {
+			...input.environment ?? process.env,
+			...input.homePath ? { CODEX_HOME: expandHomePath(input.homePath) } : {}
+		},
+		requestTimeoutMs: 2e4
+	}));
+	const client = yield* Effect.service(CodexAppServerClient).pipe(Effect.provide(context));
+	yield* client.request("initialize", buildCodexInitializeParams());
+	yield* client.notify("initialized", void 0);
+	return parseThreadSnapshot(yield* client.request("thread/read", {
+		threadId: input.providerThreadId,
+		includeTurns: true
+	}));
+}));
 const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const runtimeScope = yield* Scope.Scope;
@@ -604,7 +613,8 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 		command: `${options.binaryPath} app-server`,
 		cause
 	})));
-	const clientContext = yield* layerChildProcess(child).pipe(Layer.build, Effect.provideService(Scope.Scope, runtimeScope));
+	const transportFailure = yield* Deferred.make();
+	const clientContext = yield* layerChildProcess(child, { onTermination: (error) => Deferred.succeed(transportFailure, error).pipe(Effect.asVoid) }).pipe(Layer.build, Effect.provideService(Scope.Scope, runtimeScope));
 	const client = yield* Effect.service(CodexAppServerClient).pipe(Effect.provide(clientContext));
 	const serverNotifications = yield* Queue.bounded(512);
 	const initialSession = {
@@ -636,6 +646,16 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 		method,
 		message
 	});
+	yield* Deferred.await(transportFailure).pipe(Effect.flatMap((error) => Ref.get(closedRef).pipe(Effect.flatMap((closed) => closed ? Effect.void : Effect.gen(function* () {
+		deviceTurnActive = false;
+		yield* updateSession(sessionRef, {
+			status: "error",
+			activeTurnId: void 0,
+			lastError: "Codex connection was lost. Reopen the chat to recover its history."
+		});
+		yield* emitSessionEvent("session/exited", `Codex connection lost (${error._tag}).`);
+		yield* child.kill().pipe(Effect.ignore);
+	})))), Effect.forkIn(runtimeScope));
 	const settlePendingApprovals = (decision) => Ref.get(pendingApprovalsRef).pipe(Effect.flatMap((pendingApprovals) => Effect.forEach(Array.from(pendingApprovals.values()), (pendingApproval) => Deferred.succeed(pendingApproval.decision, decision).pipe(Effect.ignore), { discard: true })));
 	const settlePendingUserInputs = (answers) => Ref.get(pendingUserInputsRef).pipe(Effect.flatMap((pendingUserInputs) => Effect.forEach(Array.from(pendingUserInputs.values()), (pendingUserInput) => Deferred.succeed(pendingUserInput.answers, answers).pipe(Effect.ignore), { discard: true })));
 	/**
@@ -792,7 +812,8 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 					method: "collabAgent/item",
 					payload: {
 						...childIdentity,
-						item: notification.params.item
+						item: notification.params.item,
+						lifecycle: notification.method
 					}
 				});
 				return true;
@@ -1095,9 +1116,12 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 			...options.agentControl ? { agentControl: options.agentControl } : {}
 		});
 		const providerThreadId = opened.thread.id;
+		const activeTurn = opened.thread.turns.findLast((turn) => turn.status === "inProgress");
+		deviceTurnActive = activeTurn !== void 0;
 		const session = {
 			...yield* Ref.get(sessionRef),
-			status: "ready",
+			status: activeTurn ? "running" : "ready",
+			activeTurnId: activeTurn ? TurnId.make(activeTurn.id) : void 0,
 			cwd: opened.cwd,
 			model: opened.model,
 			resumeCursor: { threadId: providerThreadId },
@@ -1197,10 +1221,19 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 		}),
 		readThread: Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
-			return parseThreadSnapshot(yield* client.request("thread/read", {
+			const response = yield* client.request("thread/read", {
 				threadId: providerThreadId,
 				includeTurns: true
-			}));
+			});
+			const session = yield* Ref.get(sessionRef);
+			if (session.activeTurnId && response.thread.turns.some((turn) => turn.id === session.activeTurnId && turn.status !== "inProgress")) {
+				deviceTurnActive = false;
+				yield* updateSession(sessionRef, {
+					status: "ready",
+					activeTurnId: void 0
+				});
+			}
+			return parseThreadSnapshot(response);
 		}),
 		rollbackThread: (numTurns) => Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
@@ -1362,7 +1395,7 @@ function readTokenReductionInstructions(tokenMode) {
 function normalizeCodexTokenUsage(usage) {
 	const totalProcessedTokens = usage.total.totalTokens;
 	const usedTokens = usage.last.totalTokens;
-	if (usedTokens === void 0 || usedTokens <= 0) return;
+	if (usedTokens === void 0 || usedTokens < 0) return;
 	const maxTokens = usage.modelContextWindow ?? void 0;
 	const inputTokens = usage.last.inputTokens;
 	const cachedInputTokens = usage.last.cachedInputTokens;
@@ -1732,7 +1765,35 @@ function mapCollabAgentEvent(event, canonicalThreadId) {
 			const looseSummary = (typeof item?.command === "string" ? item.command : void 0) ?? (typeof item?.title === "string" ? item.title : void 0) ?? (typeof item?.query === "string" ? item.query : void 0);
 			const canonical = toCanonicalItemType(itemTypeRaw);
 			const summary = looseSummary ?? canonical.replaceAll("_", " ");
-			return [{
+			if (canonical === "assistant_message" && payload.lifecycle === "item/completed" && typeof item?.text === "string" && typeof item.id === "string") return [{
+				...base,
+				type: "subagent.message.delta",
+				payload: {
+					subagentId: RuntimeSubagentId.make(agentThreadId),
+					providerThreadId: agentThreadId,
+					providerMessageId: item.id,
+					delta: item.text,
+					role: "assistant"
+				}
+			}];
+			const toolEvents = [];
+			if (isToolLifecycleItemType(canonical) && typeof item?.id === "string") {
+				const completed = payload.lifecycle === "item/completed" || item.status === "completed" || item.status === "failed";
+				toolEvents.push({
+					...base,
+					eventId: EventId.make(`${base.eventId}:tool`),
+					itemId: RuntimeItemId.make(`${agentThreadId}:${item.id}`),
+					type: completed ? "item.completed" : "item.updated",
+					payload: {
+						itemType: canonical,
+						status: item.status === "failed" ? "failed" : completed ? "completed" : "inProgress",
+						title: summary,
+						agentId: agentThreadId,
+						data: { item }
+					}
+				});
+			}
+			return [...toolEvents, {
 				...base,
 				type: "task.progress",
 				payload: {
@@ -2290,6 +2351,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 */
 const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, options) {
 	const boundInstanceId = options?.instanceId ?? ProviderInstanceId.make("codex");
+	const adapterScope = yield* Scope.Scope;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const serverConfig = yield* Effect.service(ServerConfig);
@@ -2369,6 +2431,11 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			detail: formatCodexRuntimeErrorDetail(cause),
 			cause
 		})));
+		let runtimeExited = false;
+		const retireRuntime = Effect.gen(function* () {
+			const current = sessions.get(input.threadId);
+			if (current?.runtime === runtime) yield* stopSessionInternal(current);
+		});
 		const eventFiber = yield* Stream.runForEach(runtime.events, (event) => Effect.gen(function* () {
 			yield* writeNativeEvent(event);
 			const runtimeEvents = mapToRuntimeEvents(event, event.threadId).map((runtimeEvent) => stampRuntimeEvent(runtimeEvent, {
@@ -2391,19 +2458,43 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			}
 			yield* Queue.offerAll(runtimeEventQueue, runtimeEvents);
 			yield* runtimeEventQueueMetrics.recordEnqueued(runtimeEvents.length);
-		})).pipe(Effect.forkIn(sessionScope));
+			if (runtimeEvents.some((runtimeEvent) => runtimeEvent.type === "session.exited")) {
+				runtimeExited = true;
+				yield* retireRuntime.pipe(Effect.forkIn(adapterScope));
+			}
+		})).pipe(Effect.catchCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.interrupt : Effect.gen(function* () {
+			runtimeExited = true;
+			if (agentControl) yield* agentControl.revoke("runtime-teardown");
+			yield* Effect.logWarning("Codex event consumer failed; retiring its runtime", { threadId: input.threadId });
+			yield* Queue.offer(runtimeEventQueue, {
+				eventId: EventId.make(crypto.randomUUID()),
+				provider: PROVIDER,
+				providerInstanceId: boundInstanceId,
+				runtimeSessionId,
+				threadId: input.threadId,
+				createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+				type: "session.exited",
+				payload: {
+					reason: "Codex event stream failed. Reopen the chat to recover.",
+					recoverable: true,
+					exitKind: "error"
+				}
+			});
+			yield* runtimeEventQueueMetrics.recordEnqueued(1);
+			yield* retireRuntime.pipe(Effect.forkIn(adapterScope));
+		})), Effect.forkIn(sessionScope));
 		const started = yield* runtime.start().pipe(Effect.mapError((cause) => new ProviderAdapterProcessError({
 			provider: PROVIDER,
 			threadId: input.threadId,
 			detail: formatCodexRuntimeErrorDetail(cause),
 			cause
 		})), Effect.onError(() => runtime.close.pipe(Effect.andThen(Effect.ignore(Scope.close(sessionScope, Exit.void))), Effect.andThen(Fiber.interrupt(eventFiber)), Effect.ignore)));
-		if (started.runtimeSessionId !== void 0 && started.runtimeSessionId !== runtimeSessionId) {
+		if (runtimeExited || started.runtimeSessionId !== void 0 && started.runtimeSessionId !== runtimeSessionId) {
 			yield* runtime.close.pipe(Effect.andThen(Fiber.interrupt(eventFiber)), Effect.andThen(Scope.close(sessionScope, Exit.void)), Effect.ignore);
 			return yield* new ProviderAdapterValidationError({
 				provider: PROVIDER,
 				operation: "startSession",
-				issue: `Codex runtime returned epoch '${started.runtimeSessionId}' for requested epoch '${runtimeSessionId}'.`
+				issue: runtimeExited ? "Codex runtime exited while the session was starting." : `Codex runtime returned epoch '${started.runtimeSessionId}' for requested epoch '${runtimeSessionId}'.`
 			});
 		}
 		sessions.set(input.threadId, {
@@ -2467,13 +2558,21 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			method,
 			detail: `Turn has ${attachments.length} attachments; limit is 8.`
 		});
-		const resolved = yield* Effect.forEach(attachments, (attachment) => resolveAttachmentForPreflight(attachment, method), { concurrency: 1 });
+		const native = attachments.filter((attachment) => attachment.type === "image");
+		const resolved = yield* Effect.forEach(native, (attachment) => resolveAttachmentForPreflight(attachment, method), { concurrency: 1 });
 		const totalBytes = resolved.reduce((total, entry) => total + entry.sizeBytes, 0);
 		if (totalBytes > PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES) return yield* new ProviderAdapterRequestError({
 			provider: PROVIDER,
 			method,
 			detail: `Turn attachments total ${totalBytes} bytes; limit is ${PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
 		});
+		const pathLineEntries = attachments.filter((attachment) => attachment.type !== "image").map((attachment) => ({
+			attachment,
+			...attachment.id === void 0 ? {} : { resolvedPath: resolveAttachmentPath({
+				attachmentsDir: serverConfig.attachmentsDir,
+				attachment
+			}) ?? void 0 }
+		}));
 		if (resolved.length > 0) {
 			yield* Effect.annotateCurrentSpan({
 				"provider.attachment_count": resolved.length,
@@ -2490,7 +2589,10 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 				}))
 			});
 		}
-		return resolved;
+		return {
+			native: resolved,
+			pathLines: formatAttachmentPathLines(pathLineEntries)
+		};
 	});
 	const toCodexAttachment = Effect.fn("toCodexAttachment")(function* (resolved, method) {
 		const bytes = yield* fileSystem.readFile(resolved.path).pipe(Effect.mapError((cause) => new ProviderAdapterRequestError({
@@ -2505,13 +2607,13 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		};
 	});
 	const sendTurn = Effect.fn("sendTurn")(function* (input) {
-		const resolvedAttachments = yield* preflightAttachments(input, "turn/start");
-		const codexAttachments = yield* Effect.forEach(resolvedAttachments, (attachment) => toCodexAttachment(attachment, "turn/start"), { concurrency: 1 });
+		const { native, pathLines } = yield* preflightAttachments(input, "turn/start");
+		const codexAttachments = yield* Effect.forEach(native, (attachment) => toCodexAttachment(attachment, "turn/start"), { concurrency: 1 });
 		const session = yield* requireSession(input.threadId);
 		const reasoningEffort = input.modelSelection?.instanceId === boundInstanceId ? getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort") : void 0;
 		const fastMode = input.modelSelection?.instanceId === boundInstanceId ? getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") : void 0;
 		const formatted = formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
-		const codexInput = formatted ? formatted + "\n\n" + (input.input ?? "") : input.input;
+		const codexInput = 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 } : {},
@@ -2529,12 +2631,14 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		return result;
 	});
 	const steerTurn = Effect.fn("steerTurn")(function* (input) {
-		const resolvedAttachments = yield* preflightAttachments(input, "turn/steer");
-		const codexAttachments = yield* Effect.forEach(resolvedAttachments, (attachment) => toCodexAttachment(attachment, "turn/steer"), { concurrency: 1 });
-		return yield* (yield* requireSession(input.threadId)).runtime.steerTurn({
+		const { native, pathLines } = yield* preflightAttachments(input, "turn/steer");
+		const codexAttachments = yield* Effect.forEach(native, (attachment) => toCodexAttachment(attachment, "turn/steer"), { concurrency: 1 });
+		const session = yield* requireSession(input.threadId);
+		const steerInput = appendAttachmentPathLines(input.input, pathLines);
+		return yield* session.runtime.steerTurn({
 			expectedTurnId: input.expectedTurnId,
 			messageId: input.messageId,
-			...input.input !== void 0 ? { input: input.input } : {},
+			...steerInput !== void 0 ? { input: steerInput } : {},
 			...codexAttachments.length > 0 ? { attachments: codexAttachments } : {}
 		}).pipe(Effect.mapError((cause) => mapCodexRuntimeError(input.threadId, "turn/steer", cause)));
 	});
@@ -2565,6 +2669,64 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		threadId,
 		turns: snapshot.turns
 	})));
+	const readThreadHistory = (input) => Effect.gen(function* () {
+		if (!Schema.is(CodexResumeCursorSchema)(input.resumeCursor)) return yield* new ProviderAdapterValidationError({
+			provider: PROVIDER,
+			operation: "readThreadHistory",
+			issue: "Missing Codex thread identity."
+		});
+		const existing = sessions.get(input.threadId);
+		const liveSession = existing && !existing.stopped ? yield* existing.runtime.getSession : void 0;
+		const liveSnapshot = existing && liveSession && (liveSession.status === "ready" || liveSession.status === "running") && Schema.is(CodexResumeCursorSchema)(liveSession.resumeCursor) && liveSession.resumeCursor.threadId === input.resumeCursor.threadId ? yield* existing.runtime.readThread.pipe(Effect.timeoutOption("2 seconds"), Effect.orElseSucceed(() => Option.none())) : Option.none();
+		const snapshot = Option.isSome(liveSnapshot) ? liveSnapshot.value : yield* readStoredCodexThread({
+			binaryPath: codexConfig.binaryPath,
+			cwd: input.cwd ?? process.cwd(),
+			providerThreadId: input.resumeCursor.threadId,
+			...codexConfig.homePath ? { homePath: codexConfig.homePath } : {},
+			...options?.environment ? { environment: options.environment } : {}
+		}).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner), Effect.mapError((cause) => mapCodexRuntimeError(input.threadId, "thread/read", cause)));
+		const messages = [];
+		const items = [];
+		const completedTurnIds = [];
+		const failedTurnIds = [];
+		for (const turn of snapshot.turns) {
+			if (!turn.status || turn.status === "inProgress") continue;
+			completedTurnIds.push(turn.id);
+			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: 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"),
+				createdAt
+			});
+			else {
+				const event = mapItemLifecycle({
+					id: 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: ProviderItemId.make(item.id),
+					createdAt,
+					payload: {
+						threadId: snapshot.threadId,
+						turnId: turn.id,
+						item
+					}
+				}, input.threadId, "item.completed");
+				if (event) items.push(event);
+			}
+		}
+		return {
+			messages,
+			items,
+			completedTurnIds,
+			failedTurnIds
+		};
+	});
 	const rollbackThread = (threadId, numTurns) => {
 		if (!Number.isInteger(numTurns) || numTurns < 1) return Effect.fail(new ProviderAdapterValidationError({
 			provider: PROVIDER,
@@ -2576,11 +2738,34 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			turns: snapshot.turns
 		})));
 	};
-	const setThreadGoal = (threadId, goal) => requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.setGoal({
-		objective: goal.objective,
-		status: goal.status,
-		tokenBudget: goal.tokenBudget
-	})), Effect.asVoid, Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "thread/goal/set", cause)));
+	const setThreadGoal = (threadId, goal) => requireSession(threadId).pipe(Effect.flatMap((session) => {
+		const fields = goal.synchronization?.fields ?? [
+			"objective",
+			"status",
+			"tokenBudget"
+		];
+		return session.runtime.setGoal({
+			...fields.includes("objective") ? { objective: goal.objective } : {},
+			...fields.includes("status") ? { status: goal.status } : {},
+			...fields.includes("tokenBudget") ? { tokenBudget: goal.tokenBudget } : {}
+		});
+	}), Effect.flatMap((response) => {
+		const goal = normalizeCodexThreadGoal(response.goal);
+		return goal ? Effect.succeed(goal) : Effect.fail(new ProviderAdapterRequestError({
+			provider: "codex",
+			method: "thread/goal/set",
+			detail: "Codex returned an invalid goal."
+		}));
+	}), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" || cause._tag === "ProviderAdapterRequestError" ? cause : mapCodexRuntimeError(threadId, "thread/goal/set", cause)));
+	const getThreadGoal = (threadId) => requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.getGoal), Effect.flatMap((response) => {
+		if (!response.goal) return Effect.succeed(null);
+		const goal = normalizeCodexThreadGoal(response.goal);
+		return goal ? Effect.succeed(goal) : Effect.fail(new ProviderAdapterRequestError({
+			provider: "codex",
+			method: "thread/goal/get",
+			detail: "Codex returned an invalid goal."
+		}));
+	}), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" || cause._tag === "ProviderAdapterRequestError" ? cause : mapCodexRuntimeError(threadId, "thread/goal/get", cause)));
 	const clearThreadGoal = (threadId) => requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.clearGoal), Effect.asVoid, Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "thread/goal/clear", cause)));
 	const respondToRequest = (threadId, requestId, decision) => requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.respondToRequest(requestId, decision)), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "item/requestApproval/decision", cause)));
 	const respondToUserInput = (threadId, requestId, answers) => requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.respondToUserInput(requestId, answers)), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "item/tool/requestUserInput", cause)));
@@ -2611,8 +2796,10 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		steerTurn,
 		interruptTurn,
 		readThread,
+		readThreadHistory,
 		rollbackThread,
 		setThreadGoal,
+		getThreadGoal,
 		clearThreadGoal,
 		respondToRequest,
 		respondToUserInput,

package/dist/{CodexTextGeneration-BfGt7ZUe.mjs → CodexTextGeneration-Cw-FZbSS.mjs}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { Pn as TextGenerationError } from "./collectUint8StreamText-D8TBiBWk.mjs";
-import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-BP9YjxZB.mjs";
-import { A as buildCommitMessagePrompt, B as sanitizeThreadTitle, F as buildThreadTitlePrompt, Jn as getModelSelectionBooleanOptionValue, L as normalizeCliError, M as buildIssueContentTitlePrompt, N as buildPrContentPrompt, O as validateRankInboxThreadsResult, P as buildThreadPriorityPrompt, R as sanitizeCommitSubject, St as expandHomePath, V as toJsonSchemaObject, Wn as resolveAttachmentPath, Yn as getModelSelectionStringOptionValue, j as buildIssueContentPolishPrompt, k as buildBranchNamePrompt, z as sanitizePrTitle } from "./bin.mjs";
+import { Ln as TextGenerationError } from "./collectUint8StreamText-C_VNyArd.mjs";
+import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-a1h4iBQi.mjs";
+import { $n as resolveAttachmentPath, B as buildPrContentPrompt, F as validateRankInboxThreadsResult, G as sanitizeCommitSubject, H as buildThreadTitlePrompt, I as buildBranchNamePrompt, J as toJsonSchemaObject, K as sanitizePrTitle, L as buildCommitMessagePrompt, R as buildIssueContentPolishPrompt, V as buildThreadPriorityPrompt, W as normalizeCliError, ir as getModelSelectionStringOptionValue, kt as expandHomePath, q as sanitizeThreadTitle, rr as getModelSelectionBooleanOptionValue, z as buildIssueContentTitlePrompt } from "./bin.mjs";
 import { Effect, FileSystem, Option, Path, Schema, Stream } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 //#region src/textGeneration/CodexTextGeneration.ts

package/dist/{CodexTextGeneration-CBJHkgOz.cjs → CodexTextGeneration-tlfe1S5W.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-C5fop6Zf.cjs");
-const require_Metrics = require("./Metrics-DIjMQ5pa.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
+const require_Metrics = require("./Metrics-Bcb9vCAe.cjs");
 const require_bin = require("./bin.cjs");
 let effect = require("effect");
 let effect_unstable_process = require("effect/unstable/process");