@openclaw/codex 2026.5.4-beta.1 → 2026.5.4-beta.2

package/dist/{run-attempt-DdEBxgoj.js → run-attempt-CFL1BFBl.js}

@@ -1,12 +1,13 @@
-import { i as resolveCodexAppServerRuntimeOptions, r as readCodexPluginConfig } from "./config-CkkoMeqF.js";
-import { i as readCodexDynamicToolCallParams, r as assertCodexTurnStartResponse, s as readCodexTurn } from "./protocol-validators-Cpopom3_.js";
+import { i as resolveCodexAppServerRuntimeOptions, r as readCodexPluginConfig } from "./config-ByrA30No.js";
+import { i as readCodexDynamicToolCallParams, r as assertCodexTurnStartResponse, s as readCodexTurn } from "./protocol-validators-Dky2yV4W.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-chGfNrq5.js";
-import { a as refreshCodexAppServerAuthTokens, o as resolveCodexAppServerAuthProfileId, s as resolveCodexAppServerAuthProfileIdForAgent, t as clearSharedCodexAppServerClientIfCurrent } from "./shared-client-B7LbV3PF.js";
+import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-BGbqC7jk.js";
+import { r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-PiJcdUbu.js";
+import { a as refreshCodexAppServerAuthTokens, o as resolveCodexAppServerAuthProfileId, s as resolveCodexAppServerAuthProfileIdForAgent, t as clearSharedCodexAppServerClientIfCurrent } from "./shared-client-Dfk3Enm-.js";
 import { i as readCodexAppServerBinding } from "./session-binding-DuJYTJQy.js";
-import { a as startOrResumeThread, i as buildTurnStartParams, o as createCodexDynamicToolBridge, s as applyCodexDynamicToolProfile, t as buildDeveloperInstructions } from "./thread-lifecycle-C2MSeIjn.js";
-import { n as defaultCodexAppServerClientFactory, t as createCodexAppServerClientFactoryTestHooks } from "./client-factory-ClSvDfKC.js";
-import { t as ensureCodexComputerUse } from "./computer-use-DtCrnbLb.js";
+import { a as buildTurnStartParams, c as createCodexDynamicToolBridge, l as applyCodexDynamicToolProfile, n as buildDeveloperInstructions, o as codexDynamicToolsFingerprint, s as startOrResumeThread, t as areCodexDynamicToolFingerprintsCompatible } from "./thread-lifecycle-CzllX4PU.js";
+import { n as defaultCodexAppServerClientFactory, t as createCodexAppServerClientFactoryTestHooks } from "./client-factory--cll1Fba.js";
+import { n as rememberCodexRateLimits, r as ensureCodexComputerUse, t as readRecentCodexRateLimits } from "./rate-limit-cache-t6ebYmfS.js";
 import { createHash } from "node:crypto";
 import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, callGatewayTool, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatApprovalDisplayPath, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveModelAuthMode, resolveOpenClawAgentDir, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockAcquireTimeoutMs, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import fs from "node:fs/promises";
@@ -80,6 +81,7 @@ function truncateForGateway(value, maxLength) {
 const PERMISSION_DESCRIPTION_MAX_LENGTH = 700;
 const PERMISSION_SAMPLE_LIMIT = 2;
 const PERMISSION_VALUE_MAX_LENGTH = 48;
+const COMMAND_PREVIEW_WITH_DETAILS_MAX_LENGTH = 80;
 const APPROVAL_PREVIEW_SCAN_MAX_LENGTH = 4096;
 const APPROVAL_PREVIEW_OMITTED = "[preview truncated or unsafe content omitted]";
 const ANSI_OSC_SEQUENCE_RE$1 = new RegExp(String.raw`(?:\u001b]|\u009d)[^\u001b\u009c\u0007]*(?:\u0007|\u001b\\|\u009c)`, "g");
@@ -153,7 +155,7 @@ async function handleCodexAppServerApprovalRequest(params) {
 			title: context.title,
 			...context.eventDetails,
 			...approvalEventScope(params.method, cancelled ? "cancelled" : "denied"),
-			message: cancelled ? "Codex app-server approval cancelled because the run stopped." : `Codex app-server approval route failed: ${formatErrorMessage$1(error)}`
+			message: cancelled ? "Codex app-server approval cancelled because the run stopped." : `Codex app-server approval route failed: ${formatCodexDisplayText(formatErrorMessage$1(error))}`
 		});
 		return buildApprovalResponse(params.method, context.requestParams, cancelled ? "cancelled" : "denied");
 	}
@@ -181,7 +183,8 @@ function matchesCurrentTurn$1(requestParams, threadId, turnId) {
 }
 function buildApprovalContext(params) {
 	const itemId = readString$4(params.requestParams, "itemId") ?? readString$4(params.requestParams, "callId") ?? readString$4(params.requestParams, "approvalId");
-	const commandPreview = sanitizeApprovalPreview(readDisplayCommandPreview(params.requestParams), 180);
+	const commandDetailLines = params.method === "item/commandExecution/requestApproval" ? describeCommandApprovalDetails(params.requestParams) : [];
+	const commandPreview = sanitizeApprovalPreview(readDisplayCommandPreview(params.requestParams), commandDetailLines.length > 0 ? COMMAND_PREVIEW_WITH_DETAILS_MAX_LENGTH : 180);
 	const reasonPreview = sanitizeApprovalPreview(readStringPreview(params.requestParams, "reason"), 180);
 	const command = commandPreview.text;
 	const reason = reasonPreview.text;
@@ -192,7 +195,11 @@ function buildApprovalContext(params) {
 	return {
 		kind,
 		title,
-		description: permissionLines.length > 0 ? joinDescriptionLinesWithinLimit(permissionLines, PERMISSION_DESCRIPTION_MAX_LENGTH) : [subject, params.paramsForRun.sessionKey && `Session: ${params.paramsForRun.sessionKey}`].filter(Boolean).join("\n"),
+		description: permissionLines.length > 0 ? joinDescriptionLinesWithinLimit(permissionLines, PERMISSION_DESCRIPTION_MAX_LENGTH) : [
+			subject,
+			...commandDetailLines,
+			params.paramsForRun.sessionKey && `Session: ${params.paramsForRun.sessionKey}`
+		].filter(Boolean).join("\n"),
 		severity: kind === "exec" ? "warning" : "info",
 		toolName: kind === "exec" ? "codex_command_approval" : params.method === "item/permissions/requestApproval" ? "codex_permission_approval" : "codex_file_approval",
 		itemId,
@@ -235,46 +242,101 @@ function unsupportedApprovalResponse() {
 	};
 }
 function describeRequestedPermissions(requestParams) {
-	const permissions = requestedPermissions(requestParams);
+	return describePermissionProfile(requestedPermissions(requestParams), "Permissions");
+}
+function describeCommandApprovalDetails(requestParams) {
+	const lines = [];
+	const additionalPermissions = isJsonObject(requestParams?.additionalPermissions) ? requestParams.additionalPermissions : void 0;
+	if (additionalPermissions) lines.push(...describePermissionProfile(additionalPermissions, "Additional permissions"));
+	const execpolicySummary = summarizeStringArray(requestParams?.proposedExecpolicyAmendment, "Proposed exec policy", sanitizePermissionScalar);
+	if (execpolicySummary) lines.push(execpolicySummary);
+	const networkAmendmentSummary = summarizeNetworkPolicyAmendments(requestParams?.proposedNetworkPolicyAmendments);
+	if (networkAmendmentSummary) lines.push(networkAmendmentSummary);
+	return lines;
+}
+function describePermissionProfile(permissions, label) {
 	const lines = [];
 	const kinds = [];
 	const risks = /* @__PURE__ */ new Set();
 	if (isJsonObject(permissions.network)) kinds.push("network");
 	if (isJsonObject(permissions.fileSystem)) kinds.push("fileSystem");
-	if (kinds.length > 0) lines.push(`Permissions: ${kinds.join(", ")}`);
+	if (kinds.length > 0) lines.push(`${label}: ${kinds.join(", ")}`);
 	let networkSummary;
-	if (isJsonObject(permissions.network)) networkSummary = summarizePermissionRecord(permissions.network, risks, [{
-		key: "allowHosts",
-		label: "allowHosts",
-		sanitize: sanitizePermissionHostValue,
-		risksFor: permissionHostRisks
-	}]);
+	if (isJsonObject(permissions.network)) {
+		const summaries = [summarizeNetworkEnabledPermission(permissions.network, risks), summarizePermissionRecord(permissions.network, risks, [{
+			key: "allowHosts",
+			label: "allowHosts",
+			sanitize: sanitizePermissionHostValue,
+			risksFor: permissionHostRisks
+		}])].filter((summary) => Boolean(summary));
+		networkSummary = summaries.length > 0 ? summaries.join("; ") : void 0;
+	}
 	let fileSystemSummary;
-	if (isJsonObject(permissions.fileSystem)) fileSystemSummary = summarizePermissionRecord(permissions.fileSystem, risks, [
-		{
-			key: "roots",
-			label: "roots",
-			sanitize: sanitizePermissionPathValue,
-			risksFor: permissionPathRisks
-		},
-		{
-			key: "readPaths",
-			label: "readPaths",
-			sanitize: sanitizePermissionPathValue,
-			risksFor: permissionPathRisks
-		},
-		{
-			key: "writePaths",
-			label: "writePaths",
-			sanitize: sanitizePermissionPathValue,
-			risksFor: permissionPathRisks
-		}
-	]);
+	if (isJsonObject(permissions.fileSystem)) {
+		const summaries = [summarizePermissionRecord(permissions.fileSystem, risks, [
+			{
+				key: "read",
+				label: "read",
+				sanitize: sanitizePermissionPathValue,
+				risksFor: permissionPathRisks
+			},
+			{
+				key: "write",
+				label: "write",
+				sanitize: sanitizePermissionPathValue,
+				risksFor: permissionPathRisks
+			},
+			{
+				key: "roots",
+				label: "roots",
+				sanitize: sanitizePermissionPathValue,
+				risksFor: permissionPathRisks
+			},
+			{
+				key: "readPaths",
+				label: "readPaths",
+				sanitize: sanitizePermissionPathValue,
+				risksFor: permissionPathRisks
+			},
+			{
+				key: "writePaths",
+				label: "writePaths",
+				sanitize: sanitizePermissionPathValue,
+				risksFor: permissionPathRisks
+			}
+		]), summarizeFileSystemEntries(permissions.fileSystem, risks)].filter((summary) => Boolean(summary));
+		fileSystemSummary = summaries.length > 0 ? summaries.join("; ") : void 0;
+	}
 	if (risks.size > 0) lines.push(`High-risk targets: ${[...risks].join(", ")}`);
 	if (networkSummary) lines.push(`Network ${networkSummary}`);
 	if (fileSystemSummary) lines.push(`File system ${fileSystemSummary}`);
 	return lines;
 }
+function summarizeNetworkEnabledPermission(permission, risks) {
+	const enabled = permission.enabled;
+	if (typeof enabled !== "boolean") return;
+	if (enabled) risks.add("network access");
+	return `enabled: ${enabled}`;
+}
+function summarizeFileSystemEntries(permission, risks) {
+	const entries = permission.entries;
+	if (!Array.isArray(entries)) return;
+	const samples = [];
+	let count = 0;
+	for (const entry of entries) {
+		const item = isJsonObject(entry) ? entry : void 0;
+		const path = typeof item?.path === "string" ? item.path.trim() : "";
+		const access = typeof item?.access === "string" ? item.access.trim() : "";
+		if (!path || !access) continue;
+		count += 1;
+		if (access !== "none") for (const risk of permissionPathRisks(path)) risks.add(risk);
+		if (samples.length < PERMISSION_SAMPLE_LIMIT) samples.push(`${sanitizePermissionScalar(access)} ${sanitizePermissionPathValue(path)}`);
+	}
+	if (count === 0) return;
+	const remaining = count - samples.length;
+	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
+	return `entries: ${samples.join(", ")}${remainderSuffix}`;
+}
 function summarizePermissionRecord(permission, risks, descriptors) {
 	const details = [];
 	for (const descriptor of descriptors) {
@@ -293,6 +355,32 @@ function summarizePermissionArray(record, descriptor, risks) {
 	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
 	return `${descriptor.label}: ${sampleValues.join(", ")}${remainderSuffix}`;
 }
+function summarizeStringArray(value, label, sanitize) {
+	if (!Array.isArray(value)) return;
+	const values = value.filter((entry) => typeof entry === "string").map((entry) => sanitize(entry)).filter(Boolean);
+	if (values.length === 0) return;
+	const samples = values.slice(0, PERMISSION_SAMPLE_LIMIT);
+	const remaining = values.length - samples.length;
+	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
+	return `${label}: ${samples.join(", ")}${remainderSuffix}`;
+}
+function summarizeNetworkPolicyAmendments(value) {
+	if (!Array.isArray(value)) return;
+	const samples = [];
+	let count = 0;
+	for (const entry of value) {
+		const amendment = isJsonObject(entry) ? entry : void 0;
+		const host = typeof amendment?.host === "string" ? amendment.host : "";
+		const action = typeof amendment?.action === "string" ? amendment.action : "";
+		if (!host || !action) continue;
+		count += 1;
+		if (samples.length < PERMISSION_SAMPLE_LIMIT) samples.push(`${sanitizePermissionScalar(action)} ${sanitizePermissionHostValue(host)}`);
+	}
+	if (count === 0) return;
+	const remaining = count - samples.length;
+	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
+	return `Proposed network policy: ${samples.join(", ")}${remainderSuffix}`;
+}
 function readStringArray(record, key) {
 	const value = record[key];
 	return Array.isArray(value) ? value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean) : [];
@@ -433,7 +521,7 @@ function sanitizeApprovalPreview(source, maxLength) {
 	const sanitized = sanitizeVisibleScalar(source.value.replace(DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE$1, ""));
 	if (!sanitized) return { omitted: true };
 	return {
-		text: truncate(sanitized, maxLength),
+		text: formatCodexDisplayText(truncate(sanitized, maxLength)),
 		omitted: source.clipped
 	};
 }
@@ -679,7 +767,8 @@ function sanitizeDisplayText(value) {
 	const scanned = value.slice(0, DISPLAY_TEXT_SCAN_MAX_LENGTH);
 	const clipped = value.length > DISPLAY_TEXT_SCAN_MAX_LENGTH;
 	const sanitized = scanned.replace(ANSI_OSC_SEQUENCE_RE, "").replace(ANSI_CONTROL_SEQUENCE_RE, "").replace(DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE, "").replace(INVISIBLE_FORMATTING_CONTROL_RE, " ").replace(CONTROL_CHARACTER_RE, " ").replace(/\s+/g, " ").trim();
-	return clipped ? `${sanitized}...` : sanitized;
+	const escaped = sanitized ? formatCodexDisplayText(sanitized) : "";
+	return clipped && escaped ? `${escaped}...` : escaped;
 }
 function truncateDisplayText(value, maxLength) {
 	return value.length <= maxLength ? value : `${value.slice(0, Math.max(0, maxLength - 3))}...`;
@@ -872,6 +961,110 @@ async function readCodexMirroredSessionHistoryMessages(sessionFile) {
 	}
 }
 //#endregion
+//#region extensions/codex/src/app-server/transcript-mirror.ts
+const MIRROR_IDENTITY_META_KEY = "mirrorIdentity";
+/**
+* Tag a message with a stable logical identity for mirror dedupe. Callers
+* should use a value that is invariant for the same logical message across
+* re-emits (e.g. `${turnId}:prompt`, `${turnId}:assistant`) but distinct
+* for genuinely-distinct messages (different turns, different kinds). When
+* present this identity replaces the role/content fingerprint in the
+* idempotency key, so the dedupe survives caller-scope rotation without
+* collapsing distinct same-content turns.
+*/
+function attachCodexMirrorIdentity(message, identity) {
+	const record = message;
+	const existing = record.__openclaw;
+	const baseMeta = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
+	return {
+		...record,
+		__openclaw: {
+			...baseMeta,
+			[MIRROR_IDENTITY_META_KEY]: identity
+		}
+	};
+}
+function readMirrorIdentity(message) {
+	const meta = message.__openclaw;
+	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return;
+	const id = meta[MIRROR_IDENTITY_META_KEY];
+	return typeof id === "string" && id.length > 0 ? id : void 0;
+}
+function fingerprintMirrorMessageContent(message) {
+	const payload = JSON.stringify({
+		role: message.role,
+		content: message.content
+	});
+	return createHash("sha256").update(payload).digest("hex").slice(0, 16);
+}
+function buildMirrorDedupeIdentity(message) {
+	const explicit = readMirrorIdentity(message);
+	if (explicit) return explicit;
+	return `${message.role}:${fingerprintMirrorMessageContent(message)}`;
+}
+async function mirrorCodexAppServerTranscript(params) {
+	const messages = params.messages.filter((message) => message.role === "user" || message.role === "assistant");
+	if (messages.length === 0) return;
+	const lock = await acquireSessionWriteLock({
+		sessionFile: params.sessionFile,
+		timeoutMs: resolveSessionWriteLockAcquireTimeoutMs(params.config)
+	});
+	try {
+		const existingIdempotencyKeys = await readTranscriptIdempotencyKeys(params.sessionFile);
+		for (const message of messages) {
+			const dedupeIdentity = buildMirrorDedupeIdentity(message);
+			const idempotencyKey = params.idempotencyScope ? `${params.idempotencyScope}:${dedupeIdentity}` : void 0;
+			if (idempotencyKey && existingIdempotencyKeys.has(idempotencyKey)) continue;
+			const nextMessage = runAgentHarnessBeforeMessageWriteHook({
+				message: {
+					...message,
+					...idempotencyKey ? { idempotencyKey } : {}
+				},
+				agentId: params.agentId,
+				sessionKey: params.sessionKey
+			});
+			if (!nextMessage) continue;
+			const messageToAppend = idempotencyKey ? {
+				...nextMessage,
+				idempotencyKey
+			} : nextMessage;
+			await appendSessionTranscriptMessage({
+				transcriptPath: params.sessionFile,
+				message: messageToAppend,
+				config: params.config
+			});
+			if (idempotencyKey) existingIdempotencyKeys.add(idempotencyKey);
+		}
+	} finally {
+		await lock.release();
+	}
+	if (params.sessionKey) emitSessionTranscriptUpdate({
+		sessionFile: params.sessionFile,
+		sessionKey: params.sessionKey
+	});
+	else emitSessionTranscriptUpdate(params.sessionFile);
+}
+async function readTranscriptIdempotencyKeys(sessionFile) {
+	const keys = /* @__PURE__ */ new Set();
+	let raw;
+	try {
+		raw = await fs.readFile(sessionFile, "utf8");
+	} catch (error) {
+		if (error.code !== "ENOENT") throw error;
+		return keys;
+	}
+	for (const line of raw.split(/\r?\n/)) {
+		if (!line.trim()) continue;
+		try {
+			const parsed = JSON.parse(line);
+			if (typeof parsed.message?.idempotencyKey === "string") keys.add(parsed.message.idempotencyKey);
+		} catch {
+			continue;
+		}
+	}
+	return keys;
+}
+//#endregion
 //#region extensions/codex/src/app-server/event-projector.ts
 const ZERO_USAGE = {
 	input: 0,
@@ -930,6 +1123,11 @@ var CodexAppServerEventProjector = class {
 	async handleNotification(notification) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
+		if (notification.method === "account/rateLimits/updated") {
+			this.latestRateLimits = params;
+			rememberCodexRateLimits(params);
+			return;
+		}
 		if (isHookNotificationMethod(notification.method)) {
 			if (!this.isHookNotificationForCurrentThread(params)) return;
 		} else if (!this.isNotificationForTurn(params)) return;
@@ -978,7 +1176,7 @@ var CodexAppServerEventProjector = class {
 				break;
 			case "error":
 				if (readBooleanAlias(params, ["willRetry", "will_retry"]) === true) break;
-				this.promptError = readCodexErrorNotificationMessage(params) ?? "codex app-server error";
+				this.promptError = this.formatCodexErrorMessage(params) ?? "codex app-server error";
 				this.promptErrorSource = "prompt";
 				break;
 			default: break;
@@ -989,14 +1187,15 @@ var CodexAppServerEventProjector = class {
 		const reasoningText = collectTextValues(this.reasoningTextByItem).join("\n\n");
 		const planText = collectTextValues(this.planTextByItem).join("\n\n");
 		const lastAssistant = assistantTexts.length > 0 ? this.createAssistantMessage(assistantTexts.join("\n\n")) : void 0;
-		const messagesSnapshot = [{
+		const turnId = this.turnId;
+		const messagesSnapshot = [attachCodexMirrorIdentity({
 			role: "user",
 			content: this.params.prompt,
 			timestamp: Date.now()
-		}];
-		if (reasoningText) messagesSnapshot.push(this.createAssistantMirrorMessage("Codex reasoning", reasoningText));
-		if (planText) messagesSnapshot.push(this.createAssistantMirrorMessage("Codex plan", planText));
-		if (lastAssistant) messagesSnapshot.push(lastAssistant);
+		}, `${turnId}:prompt`)];
+		if (reasoningText) messagesSnapshot.push(attachCodexMirrorIdentity(this.createAssistantMirrorMessage("Codex reasoning", reasoningText), `${turnId}:reasoning`));
+		if (planText) messagesSnapshot.push(attachCodexMirrorIdentity(this.createAssistantMirrorMessage("Codex plan", planText), `${turnId}:plan`));
+		if (lastAssistant) messagesSnapshot.push(attachCodexMirrorIdentity(lastAssistant, `${turnId}:assistant`));
 		const turnFailed = this.completedTurn?.status === "failed";
 		const turnInterrupted = this.completedTurn?.status === "interrupted";
 		const promptError = this.promptError ?? (turnFailed ? this.completedTurn?.error?.message ?? "codex app-server turn failed" : null);
@@ -1267,7 +1466,11 @@ var CodexAppServerEventProjector = class {
 		this.completedTurn = turn;
 		if (turn.status === "interrupted") this.aborted = true;
 		if (turn.status === "failed") {
-			this.promptError = turn.error?.message ?? "codex app-server turn failed";
+			this.promptError = formatCodexUsageLimitErrorMessage({
+				message: turn.error?.message,
+				codexErrorInfo: turn.error?.codexErrorInfo,
+				rateLimits: this.latestRateLimits ?? readRecentCodexRateLimits()
+			}) ?? turn.error?.message ?? "codex app-server turn failed";
 			this.promptErrorSource = "prompt";
 		}
 		for (const item of turn.items ?? []) {
@@ -1420,6 +1623,14 @@ var CodexAppServerEventProjector = class {
 			...meta ? { meta } : {}
 		});
 	}
+	formatCodexErrorMessage(params) {
+		const error = isJsonObject(params.error) ? params.error : void 0;
+		return formatCodexUsageLimitErrorMessage({
+			message: error ? readString$2(error, "message") : void 0,
+			codexErrorInfo: error?.codexErrorInfo,
+			rateLimits: this.latestRateLimits ?? readRecentCodexRateLimits()
+		}) ?? readCodexErrorNotificationMessage(params);
+	}
 	emitAgentEvent(event) {
 		try {
 			emitAgentEvent({
@@ -2019,69 +2230,6 @@ function normalizeCodexTrajectoryError(value) {
 	}
 }
 //#endregion
-//#region extensions/codex/src/app-server/transcript-mirror.ts
-async function mirrorCodexAppServerTranscript(params) {
-	const messages = params.messages.filter((message) => message.role === "user" || message.role === "assistant");
-	if (messages.length === 0) return;
-	const lock = await acquireSessionWriteLock({
-		sessionFile: params.sessionFile,
-		timeoutMs: resolveSessionWriteLockAcquireTimeoutMs(params.config)
-	});
-	try {
-		const existingIdempotencyKeys = await readTranscriptIdempotencyKeys(params.sessionFile);
-		for (const [index, message] of messages.entries()) {
-			const idempotencyKey = params.idempotencyScope ? `${params.idempotencyScope}:${message.role}:${index}` : void 0;
-			if (idempotencyKey && existingIdempotencyKeys.has(idempotencyKey)) continue;
-			const nextMessage = runAgentHarnessBeforeMessageWriteHook({
-				message: {
-					...message,
-					...idempotencyKey ? { idempotencyKey } : {}
-				},
-				agentId: params.agentId,
-				sessionKey: params.sessionKey
-			});
-			if (!nextMessage) continue;
-			const messageToAppend = idempotencyKey ? {
-				...nextMessage,
-				idempotencyKey
-			} : nextMessage;
-			await appendSessionTranscriptMessage({
-				transcriptPath: params.sessionFile,
-				message: messageToAppend,
-				config: params.config
-			});
-			if (idempotencyKey) existingIdempotencyKeys.add(idempotencyKey);
-		}
-	} finally {
-		await lock.release();
-	}
-	if (params.sessionKey) emitSessionTranscriptUpdate({
-		sessionFile: params.sessionFile,
-		sessionKey: params.sessionKey
-	});
-	else emitSessionTranscriptUpdate(params.sessionFile);
-}
-async function readTranscriptIdempotencyKeys(sessionFile) {
-	const keys = /* @__PURE__ */ new Set();
-	let raw;
-	try {
-		raw = await fs.readFile(sessionFile, "utf8");
-	} catch (error) {
-		if (error.code !== "ENOENT") throw error;
-		return keys;
-	}
-	for (const line of raw.split(/\r?\n/)) {
-		if (!line.trim()) continue;
-		try {
-			const parsed = JSON.parse(line);
-			if (typeof parsed.message?.idempotencyKey === "string") keys.add(parsed.message.idempotencyKey);
-		} catch {
-			continue;
-		}
-	}
-	return keys;
-}
-//#endregion
 //#region extensions/codex/src/app-server/user-input-bridge.ts
 function createCodexUserInputBridge(params) {
 	let pending;
@@ -2097,6 +2245,7 @@ function createCodexUserInputBridge(params) {
 			const requestParams = readUserInputParams(request.params);
 			if (!requestParams) return;
 			if (requestParams.threadId !== params.threadId || requestParams.turnId !== params.turnId) return;
+			if (requestParams.questions.length === 0) return emptyUserInputResponse();
 			resolvePending(emptyUserInputResponse());
 			return new Promise((resolve) => {
 				const abortListener = () => resolvePending(emptyUserInputResponse());
@@ -2191,11 +2340,11 @@ async function deliverUserInputPrompt(params, questions) {
 function formatUserInputPrompt(questions) {
 	const lines = ["Codex needs input:"];
 	questions.forEach((question, index) => {
-		if (questions.length > 1) lines.push("", `${index + 1}. ${question.header}`, question.question);
-		else lines.push("", question.header, question.question);
+		if (questions.length > 1) lines.push("", `${index + 1}. ${formatCodexDisplayText(question.header)}`, formatCodexDisplayText(question.question));
+		else lines.push("", formatCodexDisplayText(question.header), formatCodexDisplayText(question.question));
 		if (question.isSecret) lines.push("This channel may show your reply to other participants.");
 		question.options?.forEach((option, optionIndex) => {
-			lines.push(`${optionIndex + 1}. ${option.label}${option.description ? ` - ${option.description}` : ""}`);
+			lines.push(`${optionIndex + 1}. ${formatCodexDisplayText(option.label)}${option.description ? ` - ${formatCodexDisplayText(option.description)}` : ""}`);
 		});
 		if (question.isOther) lines.push("Other: reply with your own answer.");
 	});
@@ -2205,14 +2354,18 @@ function buildUserInputResponse(questions, inputText) {
 	const answers = {};
 	if (questions.length === 1) {
 		const question = questions[0];
-		if (question) answers[question.id] = { answers: [normalizeAnswer(inputText, question)] };
+		if (question) {
+			const answer = normalizeAnswer(inputText, question);
+			answers[question.id] = { answers: answer ? [answer] : [] };
+		}
 		return { answers };
 	}
 	const keyed = parseKeyedAnswers(inputText);
 	const fallbackLines = inputText.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
 	questions.forEach((question, index) => {
 		const answer = keyed.get(question.id.toLowerCase()) ?? keyed.get(question.header.toLowerCase()) ?? keyed.get(question.question.toLowerCase()) ?? keyed.get(String(index + 1)) ?? fallbackLines[index] ?? "";
-		answers[question.id] = { answers: answer ? [normalizeAnswer(answer, question)] : [] };
+		const normalized = answer ? normalizeAnswer(answer, question) : void 0;
+		answers[question.id] = { answers: normalized ? [normalized] : [] };
 	});
 	return { answers };
 }
@@ -2222,7 +2375,10 @@ function normalizeAnswer(answer, question) {
 	const optionIndex = /^\d+$/.test(trimmed) ? Number(trimmed) - 1 : -1;
 	const indexed = optionIndex >= 0 ? options[optionIndex] : void 0;
 	if (indexed) return indexed.label;
-	return options.find((option) => option.label.toLowerCase() === trimmed.toLowerCase())?.label ?? trimmed;
+	const exact = options.find((option) => option.label.toLowerCase() === trimmed.toLowerCase());
+	if (exact) return exact.label;
+	if (options.length > 0 && !question.isOther) return;
+	return trimmed || void 0;
 }
 function parseKeyedAnswers(inputText) {
 	const answers = /* @__PURE__ */ new Map();
@@ -2468,6 +2624,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		signal: runAbortController.signal,
 		hookContext: {
 			agentId: sessionAgentId,
+			config: params.config,
 			sessionId: params.sessionId,
 			sessionKey: sandboxSessionKey,
 			runId: params.runId
@@ -2533,6 +2690,19 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	} catch (assembleErr) {
 		embeddedAgentLog.warn("context engine assemble failed; using Codex baseline prompt", { error: formatErrorMessage(assembleErr) });
 	}
+	else if (shouldProjectMirroredHistoryForCodexStart({
+		startupBinding,
+		dynamicToolsFingerprint: codexDynamicToolsFingerprint(toolBridge.specs),
+		historyMessages
+	})) {
+		const projection = projectContextEngineAssemblyForCodex({
+			assembledMessages: historyMessages,
+			originalHistoryMessages: historyMessages,
+			prompt: params.prompt
+		});
+		promptText = projection.promptText;
+		prePromptMessageCount = projection.prePromptMessageCount;
+	}
 	const promptBuild = await resolveAgentHarnessBeforePromptBuildResult({
 		prompt: promptText,
 		developerInstructions,
@@ -2568,6 +2738,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			agentId: sessionAgentId,
 			sessionId: params.sessionId,
 			sessionKey: sandboxSessionKey,
+			config: params.config,
 			runId: params.runId,
 			signal: runAbortController.signal
 		});
@@ -2955,11 +3126,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			signal: runAbortController.signal
 		}));
 	} catch (error) {
+		const usageLimitError = formatCodexTurnStartUsageLimitError(error, pendingNotifications);
+		const turnStartErrorMessage = usageLimitError ?? formatErrorMessage(error);
 		emitCodexAppServerEvent(params, {
 			stream: "codex_app_server.lifecycle",
 			data: {
 				phase: "turn_start_failed",
-				error: formatErrorMessage(error)
+				error: turnStartErrorMessage
 			}
 		});
 		trajectoryRecorder?.recordEvent("session.ended", {
@@ -2967,7 +3140,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			timedOut,
 			aborted: runAbortController.signal.aborted,
-			promptError: normalizeCodexTrajectoryError(error)
+			promptError: turnStartErrorMessage
 		});
 		trajectoryEndRecorded = true;
 		runAgentHarnessLlmOutputHook({
@@ -2986,7 +3159,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			event: {
 				messages: turnStartFailureMessages,
 				success: false,
-				error: formatErrorMessage(error),
+				error: turnStartErrorMessage,
 				durationMs: Date.now() - attemptStartedAt
 			},
 			ctx: hookContext
@@ -3004,6 +3177,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 		});
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
+		if (usageLimitError) throw new Error(usageLimitError, { cause: error });
 		throw error;
 	}
 	turnId = turn.turn.id;
@@ -3270,6 +3444,7 @@ function createCodexNativeHookRelay(params) {
 		...params.agentId ? { agentId: params.agentId } : {},
 		sessionId: params.sessionId,
 		...params.sessionKey ? { sessionKey: params.sessionKey } : {},
+		...params.config ? { config: params.config } : {},
 		runId: params.runId,
 		allowedEvents: params.options?.events ?? CODEX_NATIVE_HOOK_RELAY_EVENTS,
 		ttlMs: params.options?.ttlMs,
@@ -3377,6 +3552,14 @@ async function buildDynamicTools(input) {
 		model: params.model
 	});
 }
+function shouldProjectMirroredHistoryForCodexStart(params) {
+	if (!params.historyMessages.some((message) => message.role === "user")) return false;
+	if (!params.startupBinding?.threadId) return true;
+	return !areCodexDynamicToolFingerprintsCompatible({
+		previous: params.startupBinding.dynamicToolsFingerprint,
+		next: params.dynamicToolsFingerprint
+	});
+}
 async function withCodexStartupTimeout(params) {
 	if (params.signal.aborted) throw new Error("codex app-server startup aborted");
 	let timeout;
@@ -3416,6 +3599,48 @@ function resolveCodexTurnTerminalIdleTimeoutMs(value) {
 function readDynamicToolCallParams(value) {
 	return readCodexDynamicToolCallParams(value);
 }
+function formatCodexTurnStartUsageLimitError(error, pendingNotifications) {
+	const notificationError = readLatestCodexErrorNotification(pendingNotifications);
+	const errorPayload = readCodexErrorPayload(error);
+	return formatCodexUsageLimitErrorMessage({
+		message: notificationError?.message ?? errorPayload.message ?? formatErrorMessage(error),
+		codexErrorInfo: notificationError?.codexErrorInfo ?? errorPayload.codexErrorInfo,
+		rateLimits: readLatestRateLimitNotificationPayload(pendingNotifications) ?? errorPayload.rateLimits ?? readRecentCodexRateLimits()
+	});
+}
+function readLatestRateLimitNotificationPayload(notifications) {
+	for (let index = notifications.length - 1; index >= 0; index -= 1) {
+		const notification = notifications[index];
+		if (notification?.method === "account/rateLimits/updated") {
+			rememberCodexRateLimits(notification.params);
+			return notification.params;
+		}
+	}
+}
+function readLatestCodexErrorNotification(notifications) {
+	for (let index = notifications.length - 1; index >= 0; index -= 1) {
+		const notification = notifications[index];
+		if (notification?.method !== "error" || !isJsonObject(notification.params)) continue;
+		const error = notification.params.error;
+		if (!isJsonObject(error)) continue;
+		return {
+			message: readString(error, "message"),
+			codexErrorInfo: error.codexErrorInfo
+		};
+	}
+}
+function readCodexErrorPayload(error) {
+	const message = error instanceof Error ? error.message : void 0;
+	if (!error || typeof error !== "object" || !("data" in error)) return { message };
+	const data = error.data;
+	if (!isJsonObject(data)) return { message };
+	const nestedError = isJsonObject(data.error) ? data.error : data;
+	return {
+		message: readString(nestedError, "message") ?? message,
+		codexErrorInfo: nestedError.codexErrorInfo,
+		rateLimits: nestedError.rateLimits ?? data.rateLimits
+	};
+}
 function isTurnNotification(value, threadId, turnId) {
 	if (!isJsonObject(value)) return false;
 	return readString(value, "threadId") === threadId && readNotificationTurnId(value) === turnId;
@@ -3518,7 +3743,7 @@ async function mirrorTranscriptBestEffort(params) {
 			agentId: params.agentId,
 			sessionKey: params.sessionKey,
 			messages: params.result.messagesSnapshot,
-			idempotencyScope: `codex-app-server:${params.threadId}:${params.turnId}`,
+			idempotencyScope: `codex-app-server:${params.threadId}`,
 			config: params.params.config
 		});
 	} catch (error) {