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

package/dist/{run-attempt-CFBsGx1T.js → run-attempt-D8Vxo-Jm.js}

@@ -1,16 +1,16 @@
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-CaOpX89B.js";
+import { n as defaultLeasedCodexAppServerClientFactory } from "./client-factory-fW4Hh9q_.js";
 import { c as readCodexPluginConfig, d as resolveCodexPluginsPolicy, f as shouldAutoApproveCodexAppServerApprovals, i as isCodexAppServerApprovalPolicyAllowedByRequirements, l as resolveCodexAppServerRuntimeOptions, o as isCodexSandboxExecServerEnabled, p as withMcpElicitationsApprovalPolicy, u as resolveCodexComputerUseConfig } from "./config-0-UN67Qg.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CSuFMLvY.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-DtjYmUw_.js";
 import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, l as isJsonObject, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-BVK_jmHW.js";
-import { C as defaultCodexAppInventoryCache, D as projectContextEngineAssemblyForCodex, O as resolveCodexContextEngineProjectionMaxChars, T as sanitizeCodexHistoryImagePayloads, _ as buildCodexPluginThreadConfigInputFingerprint, a as buildDeveloperInstructions, c as buildTurnCollaborationMode, d as isContextEngineBindingCompatible, g as buildCodexPluginThreadConfig, h as isCodexAppServerProfilerEnabled, i as buildContextEngineBinding, k as resolveCodexContextEngineProjectionReserveTokens, l as buildTurnStartParams, m as startOrResumeThread, n as areCodexDynamicToolFingerprintsCompatible, u as codexDynamicToolsFingerprint, v as mergeCodexThreadConfigs, y as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-BapIT9Qs.js";
+import { C as defaultCodexAppInventoryCache, D as projectContextEngineAssemblyForCodex, O as resolveCodexContextEngineProjectionMaxChars, T as sanitizeCodexHistoryImagePayloads, _ as buildCodexPluginThreadConfigInputFingerprint, a as buildDeveloperInstructions, c as buildTurnCollaborationMode, d as isContextEngineBindingCompatible, g as buildCodexPluginThreadConfig, h as isCodexAppServerProfilerEnabled, i as buildContextEngineBinding, k as resolveCodexContextEngineProjectionReserveTokens, l as buildTurnStartParams, m as startOrResumeThread, n as areCodexDynamicToolFingerprintsCompatible, u as codexDynamicToolsFingerprint, v as mergeCodexThreadConfigs, y as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-CUXQezJL.js";
 import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-UFjjws4k.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-DmBkYLPy.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-OaxhR46w.js";
 import { g as shouldRefreshCodexRateLimitsForUsageLimitMessage, h as resolveCodexUsageLimitResetAtMs, i as readCodexNotificationTurnId, m as formatCodexUsageLimitErrorMessage, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-YINts3PA.js";
-import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerFallbackApiKeyCacheKey, f as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-Fou5nAyt.js";
+import { a as releaseLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthProfileId, f as resolveCodexAppServerAuthProfileIdForAgent, l as refreshCodexAppServerAuthTokens, m as resolveCodexAppServerHomeDir, o as retireSharedCodexAppServerClientIfCurrent, p as resolveCodexAppServerFallbackApiKeyCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-8kIrP817.js";
 import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-CTnEWuor.js";
-import { a as resolveCodexDynamicToolsLoading, i as normalizeCodexDynamicToolName, n as filterCodexDynamicTools, r as isForcedPrivateQaCodexRuntime, t as createCodexDynamicToolBridge } from "./dynamic-tools-BG9ICyU4.js";
-import { a as handleCodexAppServerElicitationRequest, c as emitDynamicToolTerminalDiagnostic, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerApprovalRequest, n as CODEX_NATIVE_HOOK_RELAY_EVENTS, o as emitDynamicToolErrorDiagnostic, r as buildCodexNativeHookRelayConfig, s as emitDynamicToolStartedDiagnostic, t as filterToolsForVisionInputs } from "./vision-tools-B30YCKRK.js";
-import { t as ensureCodexComputerUse } from "./computer-use-CDDlIBhY.js";
+import { a as resolveCodexDynamicToolsLoading, i as normalizeCodexDynamicToolName, n as filterCodexDynamicTools, r as isForcedPrivateQaCodexRuntime, t as createCodexDynamicToolBridge } from "./dynamic-tools-DlEefKNQ.js";
+import { a as handleCodexAppServerElicitationRequest, c as emitDynamicToolTerminalDiagnostic, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerApprovalRequest, n as CODEX_NATIVE_HOOK_RELAY_EVENTS, o as emitDynamicToolErrorDiagnostic, r as buildCodexNativeHookRelayConfig, s as emitDynamicToolStartedDiagnostic, t as filterToolsForVisionInputs } from "./vision-tools-DqpLmF5H.js";
+import { t as ensureCodexComputerUse } from "./computer-use-DSdj1hJY.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { createHash, randomUUID } from "node:crypto";
 import fsSync from "node:fs";
@@ -108,7 +108,7 @@ function buildSenderLabel(params) {
 	if (!params.senderId || label.includes(params.senderId)) return label;
 	return `${label} (${params.senderId})`;
 }
-function buildCodexUserPromptMessage(params) {
+function buildCodexUserPromptMessageFromPrepared(params, preparedUserMessage) {
 	const senderId = normalizeOptionalString(params.senderId);
 	const senderName = normalizeOptionalString(params.senderName);
 	const senderUsername = normalizeOptionalString(params.senderUsername);
@@ -120,6 +120,18 @@ function buildCodexUserPromptMessage(params) {
 		senderE164
 	});
 	const sourceChannel = normalizeOptionalString(params.inputProvenance?.sourceChannel ?? params.messageChannel ?? params.messageProvider);
+	if (preparedUserMessage) return {
+		role: "user",
+		timestamp: Date.now(),
+		...params.inputProvenance ? { provenance: params.inputProvenance } : {},
+		...sourceChannel ? { sourceChannel } : {},
+		...senderId ? { senderId } : {},
+		...senderName ? { senderName } : {},
+		...senderUsername ? { senderUsername } : {},
+		...senderE164 ? { senderE164 } : {},
+		...senderLabel ? { senderLabel } : {},
+		...preparedUserMessage
+	};
 	return {
 		role: "user",
 		content: params.prompt,
@@ -133,6 +145,12 @@ function buildCodexUserPromptMessage(params) {
 		...senderLabel ? { senderLabel } : {}
 	};
 }
+function buildCodexUserPromptMessage(params) {
+	return buildCodexUserPromptMessageFromPrepared(params, params.userTurnTranscriptRecorder?.message);
+}
+async function buildResolvedCodexUserPromptMessage(params) {
+	return buildCodexUserPromptMessageFromPrepared(params, await params.userTurnTranscriptRecorder?.resolveMessage() ?? params.userTurnTranscriptRecorder?.message);
+}
 /**
 * 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
@@ -174,24 +192,30 @@ function buildMirrorDedupeIdentity(message) {
 }
 async function mirrorCodexAppServerTranscript(params) {
 	const messages = params.messages.filter((message) => message.role === "user" || message.role === "assistant" || message.role === "toolResult");
-	if (messages.length === 0) return;
+	if (messages.length === 0) return { userMessagesPresent: [] };
 	const lock = await acquireSessionWriteLock({
 		sessionFile: params.sessionFile,
 		...resolveSessionWriteLockOptions(params.config)
 	});
 	const appendedUpdates = [];
+	const userMessagesPresent = [];
 	try {
 		const mirrorState = await readTranscriptMirrorState(params.sessionFile);
 		let nextMessageSeq = mirrorState.messageCount;
 		for (const message of messages) {
 			const dedupeIdentity = buildMirrorDedupeIdentity(message);
 			const idempotencyKey = params.idempotencyScope ? `${params.idempotencyScope}:${dedupeIdentity}` : void 0;
-			if (idempotencyKey && mirrorState.idempotencyKeys.has(idempotencyKey)) continue;
+			const transcriptMessage = {
+				...message,
+				...idempotencyKey ? { idempotencyKey } : {}
+			};
+			if (idempotencyKey && mirrorState.idempotencyKeys.has(idempotencyKey)) {
+				const persistedUserMessage = mirrorState.userMessagesByIdempotencyKey.get(idempotencyKey);
+				if (persistedUserMessage) userMessagesPresent.push(persistedUserMessage);
+				continue;
+			}
 			const nextMessage = runAgentHarnessBeforeMessageWriteHook({
-				message: {
-					...message,
-					...idempotencyKey ? { idempotencyKey } : {}
-				},
+				message: transcriptMessage,
 				agentId: params.agentId,
 				sessionKey: params.sessionKey
 			});
@@ -203,8 +227,13 @@ async function mirrorCodexAppServerTranscript(params) {
 			const { messageId, message: appendedMessage } = await appendSessionTranscriptMessage({
 				transcriptPath: params.sessionFile,
 				message: messageToAppend,
+				idempotencyLookup: idempotencyKey ? "caller-checked" : "scan",
 				config: params.config
 			});
+			if (appendedMessage.role === "user") {
+				userMessagesPresent.push(appendedMessage);
+				if (idempotencyKey) mirrorState.userMessagesByIdempotencyKey.set(idempotencyKey, appendedMessage);
+			}
 			nextMessageSeq += 1;
 			appendedUpdates.push({
 				messageId,
@@ -223,9 +252,11 @@ async function mirrorCodexAppServerTranscript(params) {
 		messageId: update.messageId,
 		messageSeq: update.messageSeq
 	});
+	return { userMessagesPresent };
 }
 async function readTranscriptMirrorState(sessionFile) {
 	const idempotencyKeys = /* @__PURE__ */ new Set();
+	const userMessagesByIdempotencyKey = /* @__PURE__ */ new Map();
 	let messageCount = 0;
 	let raw;
 	try {
@@ -234,7 +265,8 @@ async function readTranscriptMirrorState(sessionFile) {
 		if (error.code !== "ENOENT") throw error;
 		return {
 			idempotencyKeys,
-			messageCount
+			messageCount,
+			userMessagesByIdempotencyKey
 		};
 	}
 	for (const line of raw.split(/\r?\n/)) {
@@ -242,14 +274,18 @@ async function readTranscriptMirrorState(sessionFile) {
 		try {
 			const parsed = JSON.parse(line);
 			if (parsed.type === "message") messageCount += 1;
-			if (typeof parsed.message?.idempotencyKey === "string") idempotencyKeys.add(parsed.message.idempotencyKey);
+			if (typeof parsed.message?.idempotencyKey === "string") {
+				idempotencyKeys.add(parsed.message.idempotencyKey);
+				if (parsed.message.role === "user") userMessagesByIdempotencyKey.set(parsed.message.idempotencyKey, parsed.message);
+			}
 		} catch {
 			continue;
 		}
 	}
 	return {
 		idempotencyKeys,
-		messageCount
+		messageCount,
+		userMessagesByIdempotencyKey
 	};
 }
 //#endregion
@@ -4312,7 +4348,7 @@ function readRequestId(record) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/run-attempt.ts
-const CODEX_DYNAMIC_TOOL_TIMEOUT_MS = 3e4;
+const CODEX_DYNAMIC_TOOL_TIMEOUT_MS = 9e4;
 const CODEX_DYNAMIC_TOOL_MAX_TIMEOUT_MS = 6e5;
 const CODEX_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS = 12e4;
 const CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 6e4;
@@ -4799,7 +4835,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let codexModelCallTerminalEmitted = false;
 	let codexModelCallRequestPayloadBytes;
 	const preDynamicStartupStages = createCodexDynamicToolBuildStageTracker({ enabled: profilerEnabled });
-	const attemptClientFactory = options.clientFactory ?? defaultCodexAppServerClientFactory;
+	const attemptClientFactory = options.clientFactory ?? defaultLeasedCodexAppServerClientFactory;
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const computerUseConfig = resolveCodexComputerUseConfig({ pluginConfig });
 	const configuredAppServer = resolveCodexAppServerRuntimeOptions({ pluginConfig });
@@ -5150,6 +5186,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let thread;
 	let trajectoryEndRecorded = false;
 	let nativeHookRelay;
+	let releaseSharedClientLease;
 	let startupClientForCleanup;
 	let sandboxExecEnvironmentAcquired = false;
 	const releaseSandboxExecEnvironment = async () => {
@@ -5233,106 +5270,120 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			operation: async () => {
 				let attemptedClient;
 				const startupAttempt = async () => {
-					const startupClient = await attemptClientFactory(appServer.start, startupAuthProfileId, agentDir, params.config);
-					attemptedClient = startupClient;
-					startupClientForCleanup = startupClient;
-					await ensureCodexComputerUse({
-						client: startupClient,
-						pluginConfig,
-						timeoutMs: appServer.requestTimeoutMs,
-						signal: runAbortController.signal
-					});
-					let startupSandboxEnvironment;
-					let startupSandboxEnvironmentAcquired = false;
-					const releaseStartupSandboxEnvironment = async () => {
-						if (startupSandboxEnvironmentAcquired) {
-							startupSandboxEnvironmentAcquired = false;
-							await releaseCodexSandboxExecServerEnvironment(sandbox);
-						}
-					};
-					releaseStartupResourcesOnTimeout = releaseStartupSandboxEnvironment;
+					let startupClientLease;
+					let startupAttemptSucceeded = false;
 					try {
-						startupSandboxEnvironment = shouldRequireCodexSandboxExecServerEnvironment({
-							sandbox,
-							nativeToolSurfaceEnabled,
-							sandboxExecServerEnabled
-						}) ? await ensureCodexSandboxExecServerEnvironment({
+						const startupClient = await attemptClientFactory(appServer.start, startupAuthProfileId, agentDir, params.config);
+						startupClientLease = () => {
+							releaseLeasedSharedCodexAppServerClient(startupClient);
+						};
+						releaseSharedClientLease = startupClientLease;
+						attemptedClient = startupClient;
+						startupClientForCleanup = startupClient;
+						await ensureCodexComputerUse({
 							client: startupClient,
-							sandbox: sandbox ?? null,
-							appServerStartOptions: appServer.start,
+							pluginConfig,
 							timeoutMs: appServer.requestTimeoutMs,
 							signal: runAbortController.signal
-						}) : void 0;
-						startupSandboxEnvironmentAcquired = Boolean(startupSandboxEnvironment);
-						if (runAbortController.signal.aborted) {
-							await releaseStartupSandboxEnvironment();
-							throw new Error("codex app-server startup aborted");
-						}
-						if (sandbox?.enabled && nativeToolSurfaceEnabled && sandboxExecServerEnabled && !startupSandboxEnvironment) throw new Error("Codex app-server did not register an OpenClaw sandbox exec-server environment.");
-					} catch (error) {
-						await releaseStartupSandboxEnvironment();
-						throw error;
-					}
-					const startupEnvironmentSelection = resolveCodexSandboxEnvironmentSelection(startupSandboxEnvironment, nativeToolSurfaceEnabled);
-					const startupExecutionCwd = resolveCodexAppServerExecutionCwd({
-						effectiveWorkspace,
-						environment: startupSandboxEnvironment,
-						nativeToolSurfaceEnabled
-					});
-					const startupSandboxPolicy = startupSandboxEnvironment ? resolveCodexExternalSandboxPolicyForOpenClawSandbox(sandbox) : void 0;
-					const buildThreadLifecycleParams = () => ({
-						client: startupClient,
-						params: buildActiveRunAttemptParams(),
-						agentId: sessionAgentId,
-						cwd: startupExecutionCwd,
-						dynamicTools: toolBridge.specs,
-						appServer: pluginAppServer,
-						developerInstructions: promptBuild.developerInstructions,
-						config: threadConfig,
-						finalConfigPatch: nativeHookRelayConfig,
-						nativeCodeModeEnabled: nativeToolSurfaceEnabled,
-						nativeCodeModeOnlyEnabled: appServer.codeModeOnly,
-						userMcpServersEnabled: nativeToolSurfaceEnabled,
-						mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
-						mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
-						environmentSelection: startupEnvironmentSelection,
-						contextEngineProjection,
-						pluginThreadConfig: pluginThreadConfigRequired ? {
-							enabled: true,
-							inputFingerprint: pluginThreadConfigInputFingerprint,
-							enabledPluginConfigKeys,
-							build: () => buildCodexPluginThreadConfig({
-								pluginConfig: pluginThreadConfigPluginConfig,
-								request: (method, requestParams) => startupClient.request(method, requestParams, {
-									timeoutMs: appServer.requestTimeoutMs,
-									signal: runAbortController.signal
-								}),
-								appCache: defaultCodexAppInventoryCache,
-								appCacheKey: pluginAppCacheKey
-							})
-						} : void 0
-					});
-					try {
-						restartContextEngineCodexThread = () => startOrResumeThread(buildThreadLifecycleParams());
-						const startupThread = await startOrResumeThread(buildThreadLifecycleParams());
-						if (runAbortController.signal.aborted) {
+						});
+						let startupSandboxEnvironment;
+						let startupSandboxEnvironmentAcquired = false;
+						const releaseStartupSandboxEnvironment = async () => {
+							if (startupSandboxEnvironmentAcquired) {
+								startupSandboxEnvironmentAcquired = false;
+								await releaseCodexSandboxExecServerEnvironment(sandbox);
+							}
+						};
+						releaseStartupResourcesOnTimeout = releaseStartupSandboxEnvironment;
+						try {
+							startupSandboxEnvironment = shouldRequireCodexSandboxExecServerEnvironment({
+								sandbox,
+								nativeToolSurfaceEnabled,
+								sandboxExecServerEnabled
+							}) ? await ensureCodexSandboxExecServerEnvironment({
+								client: startupClient,
+								sandbox: sandbox ?? null,
+								appServerStartOptions: appServer.start,
+								timeoutMs: appServer.requestTimeoutMs,
+								signal: runAbortController.signal
+							}) : void 0;
+							startupSandboxEnvironmentAcquired = Boolean(startupSandboxEnvironment);
+							if (runAbortController.signal.aborted) {
+								await releaseStartupSandboxEnvironment();
+								throw new Error("codex app-server startup aborted");
+							}
+							if (sandbox?.enabled && nativeToolSurfaceEnabled && sandboxExecServerEnabled && !startupSandboxEnvironment) throw new Error("Codex app-server did not register an OpenClaw sandbox exec-server environment.");
+						} catch (error) {
 							await releaseStartupSandboxEnvironment();
-							throw new Error("codex app-server startup aborted");
+							throw error;
 						}
-						startupSandboxEnvironmentAcquired = false;
-						return {
+						const startupEnvironmentSelection = resolveCodexSandboxEnvironmentSelection(startupSandboxEnvironment, nativeToolSurfaceEnabled);
+						const startupExecutionCwd = resolveCodexAppServerExecutionCwd({
+							effectiveWorkspace,
+							environment: startupSandboxEnvironment,
+							nativeToolSurfaceEnabled
+						});
+						const startupSandboxPolicy = startupSandboxEnvironment ? resolveCodexExternalSandboxPolicyForOpenClawSandbox(sandbox) : void 0;
+						const buildThreadLifecycleParams = () => ({
 							client: startupClient,
-							thread: startupThread,
-							sandboxEnvironment: startupSandboxEnvironment,
+							params: buildActiveRunAttemptParams(),
+							agentId: sessionAgentId,
+							cwd: startupExecutionCwd,
+							dynamicTools: toolBridge.specs,
+							appServer: pluginAppServer,
+							developerInstructions: promptBuild.developerInstructions,
+							config: threadConfig,
+							finalConfigPatch: nativeHookRelayConfig,
+							nativeCodeModeEnabled: nativeToolSurfaceEnabled,
+							nativeCodeModeOnlyEnabled: appServer.codeModeOnly,
+							userMcpServersEnabled: nativeToolSurfaceEnabled,
+							mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
+							mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
 							environmentSelection: startupEnvironmentSelection,
-							executionCwd: startupExecutionCwd,
-							sandboxPolicy: startupSandboxPolicy
-						};
-					} catch (error) {
-						await releaseStartupSandboxEnvironment();
-						throw error;
+							contextEngineProjection,
+							pluginThreadConfig: pluginThreadConfigRequired ? {
+								enabled: true,
+								inputFingerprint: pluginThreadConfigInputFingerprint,
+								enabledPluginConfigKeys,
+								build: () => buildCodexPluginThreadConfig({
+									pluginConfig: pluginThreadConfigPluginConfig,
+									request: (method, requestParams) => startupClient.request(method, requestParams, {
+										timeoutMs: appServer.requestTimeoutMs,
+										signal: runAbortController.signal
+									}),
+									appCache: defaultCodexAppInventoryCache,
+									appCacheKey: pluginAppCacheKey
+								})
+							} : void 0
+						});
+						try {
+							restartContextEngineCodexThread = () => startOrResumeThread(buildThreadLifecycleParams());
+							const startupThread = await startOrResumeThread(buildThreadLifecycleParams());
+							if (runAbortController.signal.aborted) {
+								await releaseStartupSandboxEnvironment();
+								throw new Error("codex app-server startup aborted");
+							}
+							startupSandboxEnvironmentAcquired = false;
+							startupAttemptSucceeded = true;
+							return {
+								client: startupClient,
+								thread: startupThread,
+								sandboxEnvironment: startupSandboxEnvironment,
+								environmentSelection: startupEnvironmentSelection,
+								executionCwd: startupExecutionCwd,
+								sandboxPolicy: startupSandboxPolicy
+							};
+						} catch (error) {
+							await releaseStartupSandboxEnvironment();
+							throw error;
+						} finally {
+							if (releaseStartupResourcesOnTimeout === releaseStartupSandboxEnvironment) releaseStartupResourcesOnTimeout = void 0;
+						}
 					} finally {
-						if (releaseStartupResourcesOnTimeout === releaseStartupSandboxEnvironment) releaseStartupResourcesOnTimeout = void 0;
+						if (!startupAttemptSucceeded) {
+							if (releaseSharedClientLease === startupClientLease) releaseSharedClientLease = void 0;
+							startupClientLease?.();
+						}
 					}
 				};
 				for (let attempt = 1; attempt <= CODEX_APP_SERVER_STARTUP_CONNECTION_CLOSE_MAX_ATTEMPTS; attempt += 1) try {
@@ -5539,7 +5590,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		runAbortController.abort("turn_progress_idle_timeout");
 	};
 	const fireTurnCompletionIdleTimeout = () => {
-		if (completed || runAbortController.signal.aborted || !turnCompletionIdleWatchArmed || activeAppServerTurnRequests > 0) return;
+		if (completed || terminalTurnNotificationQueued || runAbortController.signal.aborted || !turnCompletionIdleWatchArmed || activeAppServerTurnRequests > 0) return;
 		const timeoutMs = turnCompletionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		const idleMs = Math.max(0, Date.now() - turnCompletionLastActivityAt);
 		if (idleMs < timeoutMs) {
@@ -5569,7 +5620,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		runAbortController.abort("turn_completion_idle_timeout");
 	};
 	const fireTurnTerminalIdleTimeout = () => {
-		if (completed || runAbortController.signal.aborted || !turnTerminalIdleWatchArmed || activeAppServerTurnRequests > 0) return;
+		if (completed || terminalTurnNotificationQueued || runAbortController.signal.aborted || !turnTerminalIdleWatchArmed || activeAppServerTurnRequests > 0) return;
 		const idleMs = Math.max(0, Date.now() - turnCompletionLastActivityAt);
 		if (idleMs < turnTerminalIdleTimeoutMs) {
 			scheduleTurnTerminalIdleWatch();
@@ -5891,7 +5942,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			...turnId ? { turnId } : {}
 		});
-		embeddedAgentLog.debug("codex app-server raw notification received", correlation);
+		embeddedAgentLog.trace("codex app-server raw notification received", correlation);
 		if (notification.method === "turn/completed" && correlation.matchesActiveTurn === false) if (correlation.matchesActiveThread) embeddedAgentLog.warn("codex app-server turn/completed did not match active turn", correlation);
 		else embeddedAgentLog.debug("codex app-server turn/completed ignored for other subscribed thread", correlation);
 		if (isCodexNotificationOutsideActiveRun(correlation)) return Promise.resolve();
@@ -5901,6 +5952,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			return Promise.resolve();
 		}
 		if (isTerminalTurnNotificationForTurn(notification, turnId)) terminalTurnNotificationQueued = true;
+		if (correlation.matchesActiveTurn !== false) {
+			const now = Date.now();
+			turnCompletionLastActivityAt = now;
+			turnCompletionLastActivityReason = `notification:${notification.method}`;
+			turnAttemptLastProgressAt = now;
+			turnAttemptLastProgressReason = `notification:${notification.method}`;
+		}
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
@@ -6352,6 +6410,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				}
 			});
 			params.abortSignal?.removeEventListener("abort", abortFromUpstream);
+			releaseSharedClientLease?.();
+			releaseSharedClientLease = void 0;
 			if (usageLimitError) {
 				await markCodexAuthProfileBlockedFromRateLimits({
 					params,
@@ -6368,7 +6428,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			throw turnStartError;
 		}
 	}
-	if (!turn) throw new Error("codex app-server turn/start failed without an error");
+	if (!turn) {
+		releaseSharedClientLease?.();
+		releaseSharedClientLease = void 0;
+		throw new Error("codex app-server turn/start failed without an error");
+	}
 	turnId = turn.turn.id;
 	const activeTurnId = turn.turn.id;
 	emitExecutionPhaseOnce("turn_accepted", { phase: "turn_accepted" });
@@ -6440,9 +6504,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		abort: () => runAbortController.abort("aborted")
 	};
 	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
+	const notifyUserMessagePersisted = createCodexAppServerUserMessagePersistenceNotifier(params);
 	mirrorPromptAtTurnStartBestEffort({
 		params,
 		agentId: sessionAgentId,
+		notifyUserMessagePersisted,
 		sessionKey: sandboxSessionKey,
 		threadId: thread.threadId,
 		turnId: activeTurnId
@@ -6451,10 +6517,19 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	turnTerminalIdleWatchArmed = true;
 	touchTurnCompletionActivity("turn:start", { attemptProgress: true });
 	const abortListener = () => {
+		if (timedOut) {
+			retireCodexAppServerClientAfterTimedOutTurn(client, {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				reason: String(runAbortController.signal.reason ?? "timeout")
+			}).finally(() => {
+				resolveCompletion?.();
+			});
+			return;
+		}
 		interruptCodexTurnBestEffort(client, {
 			threadId: thread.threadId,
-			turnId: activeTurnId,
-			timeoutMs: timedOut ? CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS : void 0
+			turnId: activeTurnId
 		});
 		resolveCompletion?.();
 	};
@@ -6513,6 +6588,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		await mirrorTranscriptBestEffort({
 			params,
 			agentId: sessionAgentId,
+			notifyUserMessagePersisted,
 			result,
 			sessionKey: contextSessionKey,
 			threadId: thread.threadId,
@@ -6637,6 +6713,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		notificationCleanup();
 		requestCleanup();
 		closeCleanup?.();
+		releaseSharedClientLease?.();
 		if (nativeHookRelay) if (shouldDelayNativeHookRelayUnregister) scheduleCodexNativeHookRelayUnregister({
 			relay: nativeHookRelay,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
@@ -6940,6 +7017,41 @@ async function unsubscribeCodexThreadBestEffort(client, params) {
 		});
 	}
 }
+async function retireCodexAppServerClientAfterTimedOutTurn(client, params) {
+	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
+	const detachedSharedClient = Boolean(retiredSharedClient);
+	interruptCodexTurnBestEffort(client, {
+		threadId: params.threadId,
+		turnId: params.turnId,
+		timeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS
+	});
+	await unsubscribeCodexThreadBestEffort(client, {
+		threadId: params.threadId,
+		timeoutMs: CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS
+	});
+	let closedClient = retiredSharedClient?.closed ?? false;
+	if (!detachedSharedClient) {
+		const close = client.close;
+		if (typeof close === "function") try {
+			close.call(client);
+			closedClient = true;
+		} catch (error) {
+			embeddedAgentLog.debug("codex app-server client close failed during timeout cleanup", {
+				threadId: params.threadId,
+				turnId: params.turnId,
+				error
+			});
+		}
+	}
+	embeddedAgentLog.warn("codex app-server client retired after timed-out turn", {
+		threadId: params.threadId,
+		turnId: params.turnId,
+		reason: params.reason,
+		detachedSharedClient,
+		closedClient,
+		activeSharedClientLeases: retiredSharedClient?.activeLeases ?? 0
+	});
+}
 function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
 	return {
 		sessionKey: sandboxSessionKey,
@@ -7043,7 +7155,7 @@ async function buildDynamicTools(input) {
 		modelCompat: params.model.compat && typeof params.model.compat === "object" ? params.model.compat : void 0,
 		modelApi: params.model.api,
 		modelContextWindowTokens: params.model.contextWindow,
-		modelAuthMode: resolveModelAuthMode(params.model.provider, params.config, void 0, { workspaceDir: input.effectiveWorkspace }),
+		modelAuthMode: resolveModelAuthMode(params.model.provider, params.config, params.toolAuthProfileStore ?? params.authProfileStore, { workspaceDir: input.effectiveWorkspace }),
 		suppressManagedWebSearch: false,
 		currentChannelId: params.currentChannelId,
 		hookChannelId: resolveCodexAppServerHookChannelId(params, input.sandboxSessionKey),
@@ -7901,6 +8013,16 @@ function readPositiveNumber(value) {
 function readNonEmptyString(value) {
 	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
+const CODEX_DELIVERY_HINT_LINES = ["Delivery: to send a message, use the `message` tool.", "Delivery: Final assistant text is not automatically delivered in this run. Use the `message` tool to send user-visible output."];
+function splitLeadingCodexDeliveryHint(prompt) {
+	const trimmedStart = prompt.trimStart();
+	const matchedHint = CODEX_DELIVERY_HINT_LINES.find((hint) => trimmedStart.startsWith(hint));
+	if (!matchedHint) return { prompt };
+	return {
+		deliveryHint: matchedHint,
+		prompt: trimmedStart.slice(matchedHint.length).replace(/^\s*\n/, "").trimStart()
+	};
+}
 function buildCodexOpenClawPromptContext(params) {
 	if (!shouldInjectCodexOpenClawPromptContext(params.params)) return;
 	const sections = [params.skillsPrompt?.trim() ? [
@@ -7925,12 +8047,18 @@ function shouldInjectCodexOpenClawPromptContext(params) {
 }
 function prependCodexOpenClawPromptContext(prompt, context) {
 	if (!context?.trim()) return prompt;
-	const promptSection = prompt.startsWith("OpenClaw assembled context for this turn:") ? prompt : ["Current user request:", prompt].join("\n");
+	const { deliveryHint, prompt: promptWithoutDeliveryHint } = splitLeadingCodexDeliveryHint(prompt);
+	const promptSection = promptWithoutDeliveryHint.startsWith("OpenClaw assembled context for this turn:") ? promptWithoutDeliveryHint : ["Current user request:", promptWithoutDeliveryHint].join("\n");
+	const deliverySection = deliveryHint ? [
+		"OpenClaw delivery metadata:",
+		"This delivery metadata is runtime routing guidance, not the user's request.",
+		deliveryHint
+	].join("\n") : void 0;
 	return [
 		context.trim(),
-		"",
+		deliverySection,
 		promptSection
-	].join("\n");
+	].filter(Boolean).join("\n\n");
 }
 function renderCodexWorkspaceBootstrapPromptContext(contextFiles) {
 	const files = selectCodexWorkspacePromptContextFiles(contextFiles);
@@ -8041,29 +8169,63 @@ function getCodexContextFileBasename(filePath) {
 }
 async function mirrorTranscriptBestEffort(params) {
 	try {
-		await mirrorCodexAppServerTranscript({
+		const messages = await resolveFinalCodexMirrorMessages({
+			params: params.params,
+			messagesSnapshot: params.result.messagesSnapshot,
+			turnId: params.turnId
+		});
+		const mirrorResult = await mirrorCodexAppServerTranscript({
 			sessionFile: params.params.sessionFile,
 			agentId: params.agentId,
 			sessionKey: params.sessionKey,
-			messages: params.result.messagesSnapshot,
+			messages,
 			idempotencyScope: `codex-app-server:${params.threadId}`,
 			config: params.params.config
 		});
+		for (const message of mirrorResult.userMessagesPresent) params.notifyUserMessagePersisted(message);
 	} catch (error) {
 		embeddedAgentLog.warn("failed to mirror codex app-server transcript", { error });
 	}
 }
+async function resolveFinalCodexMirrorMessages(params) {
+	if (params.params.suppressNextUserMessagePersistence || !params.params.userTurnTranscriptRecorder) return params.messagesSnapshot;
+	const resolvedPrompt = attachCodexMirrorIdentity(await buildResolvedCodexUserPromptMessage(params.params), `${params.turnId}:prompt`);
+	const firstUserIndex = params.messagesSnapshot.findIndex((message) => message.role === "user");
+	if (firstUserIndex === -1) return [resolvedPrompt, ...params.messagesSnapshot];
+	const messages = params.messagesSnapshot.slice();
+	messages[firstUserIndex] = resolvedPrompt;
+	return messages;
+}
+function createCodexAppServerUserMessagePersistenceNotifier(runParams) {
+	let notified = false;
+	return (message) => {
+		if (notified) return;
+		notified = true;
+		runParams.userTurnTranscriptRecorder?.markRuntimePersisted(message);
+		try {
+			runParams.onUserMessagePersisted?.(message);
+		} catch (error) {
+			embeddedAgentLog.warn("codex app-server user persistence notification failed", { error: formatErrorMessage(error) });
+		}
+	};
+}
 async function mirrorPromptAtTurnStartBestEffort(params) {
 	if (params.params.suppressNextUserMessagePersistence) return;
 	try {
-		await mirrorCodexAppServerTranscript({
-			sessionFile: params.params.sessionFile,
-			agentId: params.agentId,
-			sessionKey: params.sessionKey,
-			messages: [attachCodexMirrorIdentity(buildCodexUserPromptMessage(params.params), `${params.turnId}:prompt`)],
-			idempotencyScope: `codex-app-server:${params.threadId}`,
-			config: params.params.config
-		});
+		const mirrorPromise = (async () => {
+			const userPromptMessage = attachCodexMirrorIdentity(await buildResolvedCodexUserPromptMessage(params.params), `${params.turnId}:prompt`);
+			const mirrorResult = await mirrorCodexAppServerTranscript({
+				sessionFile: params.params.sessionFile,
+				agentId: params.agentId,
+				sessionKey: params.sessionKey,
+				messages: [userPromptMessage],
+				idempotencyScope: `codex-app-server:${params.threadId}`,
+				config: params.params.config
+			});
+			for (const message of mirrorResult.userMessagesPresent) params.notifyUserMessagePersisted(message);
+		})();
+		params.params.userTurnTranscriptRecorder?.markRuntimePersistencePending(mirrorPromise);
+		await mirrorPromise;
 	} catch (error) {
 		embeddedAgentLog.warn("failed to mirror codex app-server prompt at turn start", { error });
 	}