@openclaw/codex 2026.5.7 → 2026.5.10-beta.1

package/dist/{run-attempt-BaT_FcTv.js → run-attempt-DsO-3wqp.js}

@@ -1,22 +1,25 @@
-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 { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, u as withMcpElicitationsApprovalPolicy } from "./config-CT01BBDc.js";
+import { i as readCodexDynamicToolCallParams, r as assertCodexTurnStartResponse, s as readCodexTurn } from "./protocol-validators-CbqWfY5M.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.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 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 { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CTzy3Y6M.js";
+import { d as formatCodexUsageLimitErrorMessage, i as formatCodexDisplayText } from "./request-DC1Dz3iZ.js";
+import { a as refreshCodexAppServerAuthTokens, c as resolveCodexAppServerAuthProfileIdForAgent, l as resolveCodexAppServerEnvApiKeyCacheKey, o as resolveCodexAppServerAuthAccountCacheKey, s as resolveCodexAppServerAuthProfileId, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerHomeDir } from "./shared-client-p-TvEiNL.js";
+import { i as readCodexAppServerBinding } from "./session-binding-B44KIZM2.js";
+import { i as defaultCodexAppInventoryCache, r as buildCodexAppInventoryCacheKey } from "./plugin-activation-CweAZa7r.js";
+import { a as buildTurnStartParams, c as buildCodexPluginThreadConfig, d as createCodexDynamicToolBridge, f as filterCodexDynamicTools, l as buildCodexPluginThreadConfigInputFingerprint, n as buildDeveloperInstructions, o as codexDynamicToolsFingerprint, p as normalizeCodexDynamicToolName, s as startOrResumeThread, t as areCodexDynamicToolFingerprintsCompatible, u as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-DtD_qoMW.js";
+import { n as defaultCodexAppServerClientFactory } from "./client-factory-BJL_efz4.js";
+import { n as rememberCodexRateLimits, r as ensureCodexComputerUse, t as readRecentCodexRateLimits } from "./rate-limit-cache-DbZvmrAD.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 nodeFs from "node:fs";
+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, 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";
 import path from "node:path";
-import nodeFs from "node:fs";
+import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
+import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runtime";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@mariozechner/pi-coding-agent";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/text-runtime";
-import { resolveUserPath as resolveUserPath$1 } from "openclaw/plugin-sdk/agent-harness";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
 const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;
 const MAX_PLUGIN_APPROVAL_TITLE_LENGTH = 80;
@@ -92,7 +95,7 @@ const INVISIBLE_FORMATTING_CONTROL_RE$1 = new RegExp(String.raw`[\u00ad\u034f\u0
 const DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE$1 = new RegExp(String.raw`(?:\u001b\][^\u001b\u009c\u0007]*|\u009d[^\u001b\u009c\u0007]*|\u001b\[[0-?]*[ -/]*|\u009b[0-?]*[ -/]*|\u001b)$`);
 async function handleCodexAppServerApprovalRequest(params) {
 	const requestParams = isJsonObject(params.requestParams) ? params.requestParams : void 0;
-	if (!matchesCurrentTurn$1(requestParams, params.threadId, params.turnId)) return;
+	if (!matchesCurrentTurn(requestParams, params.threadId, params.turnId)) return;
 	if (!isSupportedAppServerApprovalMethod(params.method)) return unsupportedApprovalResponse();
 	const context = buildApprovalContext({
 		method: params.method,
@@ -176,7 +179,7 @@ function buildApprovalResponse(method, requestParams, outcome) {
 	}
 	return unsupportedApprovalResponse();
 }
-function matchesCurrentTurn$1(requestParams, threadId, turnId) {
+function matchesCurrentTurn(requestParams, threadId, turnId) {
 	if (!requestParams) return false;
 	const requestThreadId = readString$4(requestParams, "threadId") ?? readString$4(requestParams, "conversationId");
 	const requestTurnId = readString$4(requestParams, "turnId");
@@ -636,6 +639,29 @@ const MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY = "connector_name";
 const MCP_TOOL_APPROVAL_TOOL_TITLE_KEY = "tool_title";
 const MCP_TOOL_APPROVAL_TOOL_DESCRIPTION_KEY = "tool_description";
 const MCP_TOOL_APPROVAL_TOOL_PARAMS_DISPLAY_KEY = "tool_params_display";
+const PLUGIN_APP_ID_META_KEYS = [
+	"app_id",
+	"appId",
+	"codex_app_id",
+	"codexAppId"
+];
+const PLUGIN_NAME_META_KEYS = [
+	"plugin_name",
+	"pluginName",
+	"codex_plugin_name",
+	"codexPluginName"
+];
+const PLUGIN_CONFIG_KEY_META_KEYS = [
+	"config_key",
+	"configKey",
+	"codex_config_key"
+];
+const PLUGIN_MARKETPLACE_NAME_META_KEYS = [
+	"marketplace_name",
+	"marketplaceName",
+	"codex_marketplace_name",
+	"codexMarketplaceName"
+];
 const MAX_DISPLAY_PARAM_ENTRIES = 8;
 const MAX_DISPLAY_PARAM_VALUE_LENGTH = 120;
 const MAX_DISPLAY_VALUE_ARRAY_ITEMS = 8;
@@ -649,7 +675,24 @@ const INVISIBLE_FORMATTING_CONTROL_RE = new RegExp(String.raw`[\u00ad\u034f\u061
 const DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE = new RegExp(String.raw`(?:\u001b\][^\u001b\u009c\u0007]*|\u009d[^\u001b\u009c\u0007]*|\u001b\[[0-?]*[ -/]*|\u009b[0-?]*[ -/]*|\u001b)$`);
 async function handleCodexAppServerElicitationRequest(params) {
 	const requestParams = isJsonObject(params.requestParams) ? params.requestParams : void 0;
-	if (!matchesCurrentTurn(requestParams, params.threadId, params.turnId)) return;
+	if (!requestParams) return;
+	if (!matchesCurrentThread(requestParams, params.threadId)) return;
+	if (turnIdMismatches(requestParams, params.turnId)) return;
+	const pluginResolution = resolvePluginElicitation({
+		requestParams,
+		pluginAppPolicyContext: params.pluginAppPolicyContext
+	});
+	if (pluginResolution.kind !== "not_plugin") {
+		if (pluginResolution.kind === "decline") {
+			logPluginElicitationDecline(pluginResolution.reason, requestParams);
+			return declineElicitationResponse();
+		}
+		if (!hasExactTurnId(requestParams, params.turnId)) {
+			logPluginElicitationDecline("missing_active_turn", requestParams);
+			return declineElicitationResponse();
+		}
+		return buildPluginPolicyElicitationResponse(pluginResolution.entry, requestParams);
+	}
 	const approvalPrompt = readBridgeableApprovalElicitation(requestParams);
 	if (!approvalPrompt) return;
 	const outcome = await requestPluginApprovalOutcome({
@@ -660,12 +703,113 @@ async function handleCodexAppServerElicitationRequest(params) {
 	});
 	return buildElicitationResponse(approvalPrompt.requestedSchema, approvalPrompt.meta, outcome);
 }
-function matchesCurrentTurn(requestParams, threadId, turnId) {
+function matchesCurrentThread(requestParams, threadId) {
 	if (!requestParams) return false;
-	if (readString$3(requestParams, "threadId") !== threadId) return false;
-	const rawTurnId = requestParams.turnId;
-	if (rawTurnId !== null && rawTurnId !== void 0 && rawTurnId !== turnId) return false;
-	return true;
+	return readString$3(requestParams, "threadId") === threadId;
+}
+function turnIdMismatches(requestParams, turnId) {
+	const rawTurnId = requestParams?.turnId;
+	return rawTurnId !== null && rawTurnId !== void 0 && rawTurnId !== turnId;
+}
+function hasExactTurnId(requestParams, turnId) {
+	return requestParams?.turnId === turnId;
+}
+function resolvePluginElicitation(params) {
+	const requestParams = params.requestParams;
+	if (!requestParams) return { kind: "not_plugin" };
+	const meta = isJsonObject(requestParams._meta) ? requestParams._meta : {};
+	const context = params.pluginAppPolicyContext;
+	const entries = context ? Object.values(context.apps) : [];
+	const appId = readFirstString(meta, PLUGIN_APP_ID_META_KEYS) ?? readFirstString(requestParams, PLUGIN_APP_ID_META_KEYS);
+	if (appId) {
+		if (!context) return {
+			kind: "decline",
+			reason: "missing_policy_context"
+		};
+		const entry = context.apps[appId];
+		return uniquePluginMatch(entry ? [entry] : [], "app_id");
+	}
+	const serverName = readString$3(requestParams, "serverName");
+	if (serverName && context) {
+		const matches = entries.filter((entry) => entry.mcpServerNames.includes(serverName));
+		if (matches.length > 0) return uniquePluginMatch(matches, "server_name");
+	}
+	const metadataResolution = resolvePluginStableMetadataMatch({
+		meta,
+		requestParams,
+		entries,
+		context
+	});
+	if (metadataResolution.kind !== "not_plugin") return metadataResolution;
+	if (context && hasDisplayNameOnlyPluginMatch(meta, entries)) return {
+		kind: "decline",
+		reason: "display_name_only"
+	};
+	return { kind: "not_plugin" };
+}
+function resolvePluginStableMetadataMatch(params) {
+	const pluginName = readFirstString(params.meta, PLUGIN_NAME_META_KEYS) ?? readFirstString(params.requestParams, PLUGIN_NAME_META_KEYS);
+	const configKey = readFirstString(params.meta, PLUGIN_CONFIG_KEY_META_KEYS) ?? readFirstString(params.requestParams, PLUGIN_CONFIG_KEY_META_KEYS);
+	const marketplaceName = readFirstString(params.meta, PLUGIN_MARKETPLACE_NAME_META_KEYS) ?? readFirstString(params.requestParams, PLUGIN_MARKETPLACE_NAME_META_KEYS);
+	if (!pluginName && !configKey) return { kind: "not_plugin" };
+	if (!params.context) return {
+		kind: "decline",
+		reason: "missing_policy_context"
+	};
+	return uniquePluginMatch(params.entries.filter((entry) => {
+		if (marketplaceName && entry.marketplaceName !== marketplaceName) return false;
+		if (pluginName && entry.pluginName !== pluginName) return false;
+		if (configKey && entry.configKey !== configKey) return false;
+		return true;
+	}), "metadata");
+}
+function uniquePluginMatch(matches, source) {
+	if (matches.length === 1 && matches[0]) return {
+		kind: "matched",
+		entry: matches[0]
+	};
+	return {
+		kind: "decline",
+		reason: matches.length === 0 ? `${source}_not_enabled` : `${source}_ambiguous`
+	};
+}
+function hasDisplayNameOnlyPluginMatch(meta, entries) {
+	const connectorName = readString$3(meta, MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY);
+	if (!connectorName) return false;
+	const normalized = normalizePluginIdentityText(connectorName);
+	return entries.some((entry) => normalizePluginIdentityText(entry.pluginName) === normalized || normalizePluginIdentityText(entry.configKey) === normalized);
+}
+function normalizePluginIdentityText(value) {
+	return value.toLowerCase().replace(/[^a-z0-9]+/g, "");
+}
+function buildPluginPolicyElicitationResponse(entry, requestParams) {
+	if (!entry.allowDestructiveActions) {
+		logPluginElicitationDecline("destructive_actions_disabled", requestParams);
+		return declineElicitationResponse();
+	}
+	if (readString$3(requestParams, "mode") !== "form" || !isJsonObject(requestParams.requestedSchema)) {
+		logPluginElicitationDecline("unsupported_schema", requestParams);
+		return declineElicitationResponse();
+	}
+	const meta = isJsonObject(requestParams._meta) ? requestParams._meta : {};
+	const response = buildElicitationResponse(requestParams.requestedSchema, meta, "approved-once");
+	if (isJsonObject(response) && response.action === "accept") return response;
+	logPluginElicitationDecline("unmappable_schema", requestParams);
+	return declineElicitationResponse();
+}
+function declineElicitationResponse() {
+	return {
+		action: "decline",
+		content: null,
+		_meta: null
+	};
+}
+function logPluginElicitationDecline(reason, requestParams) {
+	embeddedAgentLog.debug("codex plugin elicitation declined", {
+		reason,
+		serverName: readString$3(requestParams, "serverName"),
+		mode: readString$3(requestParams, "mode")
+	});
 }
 function readBridgeableApprovalElicitation(requestParams) {
 	if (!requestParams || readString$3(requestParams, "mode") !== "form" || !isJsonObject(requestParams._meta) || requestParams._meta[MCP_TOOL_APPROVAL_KIND_KEY] !== MCP_TOOL_APPROVAL_KIND || !isJsonObject(requestParams.requestedSchema)) return;
@@ -944,6 +1088,12 @@ function readString$3(record, key) {
 	const value = record?.[key];
 	return typeof value === "string" && value.trim() ? value : void 0;
 }
+function readFirstString(record, keys) {
+	for (const key of keys) {
+		const value = readString$3(record, key);
+		if (value) return value;
+	}
+}
 //#endregion
 //#region extensions/codex/src/app-server/session-history.ts
 function isMissingFileError(error) {
@@ -1038,7 +1188,7 @@ function buildMirrorDedupeIdentity(message) {
 	return `${message.role}:${fingerprintMirrorMessageContent(message)}`;
 }
 async function mirrorCodexAppServerTranscript(params) {
-	const messages = params.messages.filter((message) => message.role === "user" || message.role === "assistant");
+	const messages = params.messages.filter((message) => message.role === "user" || message.role === "assistant" || message.role === "toolResult");
 	if (messages.length === 0) return;
 	const lock = await acquireSessionWriteLock({
 		sessionFile: params.sessionFile,
@@ -1130,6 +1280,7 @@ const CODEX_PROMPT_TOTAL_INPUT_KEYS = [
 	"prompt_tokens"
 ];
 const MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM = 20;
+const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 12e3;
 var CodexAppServerEventProjector = class {
 	constructor(params, threadId, turnId) {
 		this.params = params;
@@ -1147,6 +1298,9 @@ var CodexAppServerEventProjector = class {
 		this.toolResultOutputStreamedItemIds = /* @__PURE__ */ new Set();
 		this.toolResultOutputDeltaState = /* @__PURE__ */ new Map();
 		this.toolMetas = /* @__PURE__ */ new Map();
+		this.toolTranscriptMessages = [];
+		this.toolTranscriptCallIds = /* @__PURE__ */ new Set();
+		this.toolTranscriptResultIds = /* @__PURE__ */ new Set();
 		this.assistantStarted = false;
 		this.reasoningStarted = false;
 		this.reasoningEnded = false;
@@ -1230,6 +1384,7 @@ var CodexAppServerEventProjector = class {
 		}, `${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`));
+		messagesSnapshot.push(...this.toolTranscriptMessages);
 		if (lastAssistant) messagesSnapshot.push(attachCodexMirrorIdentity(lastAssistant, `${turnId}:assistant`));
 		const turnFailed = this.completedTurn?.status === "failed";
 		const turnInterrupted = this.completedTurn?.status === "interrupted";
@@ -1282,6 +1437,21 @@ var CodexAppServerEventProjector = class {
 			didSendDeterministicApprovalPrompt: this.guardianReviewCount > 0 ? false : void 0
 		};
 	}
+	recordDynamicToolCall(params) {
+		this.recordToolTranscriptCall({
+			id: params.callId,
+			name: params.tool,
+			arguments: sanitizeCodexToolArguments(params.arguments)
+		});
+	}
+	recordDynamicToolResult(params) {
+		this.recordToolTranscriptResult({
+			id: params.callId,
+			name: params.tool,
+			text: collectDynamicToolContentText(params.contentItems),
+			isError: !params.success
+		});
+	}
 	markTimedOut() {
 		this.aborted = true;
 		this.promptError = "codex app-server attempt timed out";
@@ -1373,6 +1543,7 @@ var CodexAppServerEventProjector = class {
 			phase: "start",
 			item
 		});
+		this.recordNativeToolTranscriptCall(item);
 		this.emitToolResultSummary(item);
 		this.emitAgentEvent({
 			stream: "codex_app_server.item",
@@ -1439,6 +1610,8 @@ var CodexAppServerEventProjector = class {
 			phase: "result",
 			item
 		});
+		this.recordNativeToolTranscriptCall(item);
+		this.recordNativeToolTranscriptResult(item);
 		this.emitToolResultSummary(item);
 		this.emitToolResultOutput(item);
 		this.emitAgentEvent({
@@ -1529,6 +1702,8 @@ var CodexAppServerEventProjector = class {
 				});
 			}
 			this.recordToolMeta(item);
+			this.recordNativeToolTranscriptCall(item);
+			this.recordNativeToolTranscriptResult(item);
 			this.emitToolResultSummary(item);
 			this.emitToolResultOutput(item);
 		}
@@ -1693,6 +1868,37 @@ var CodexAppServerEventProjector = class {
 			...meta ? { meta } : {}
 		});
 	}
+	recordNativeToolTranscriptCall(item) {
+		if (!item || !shouldSynthesizeToolProgressForItem(item)) return;
+		const name = itemName(item);
+		if (!name) return;
+		this.recordToolTranscriptCall({
+			id: item.id,
+			name,
+			arguments: itemToolArgs(item)
+		});
+	}
+	recordNativeToolTranscriptResult(item) {
+		if (!item || !shouldSynthesizeToolProgressForItem(item)) return;
+		const name = itemName(item);
+		if (!name) return;
+		this.recordToolTranscriptResult({
+			id: item.id,
+			name,
+			text: itemTranscriptResultText(item),
+			isError: isNonSuccessItemStatus(itemStatus(item))
+		});
+	}
+	recordToolTranscriptCall(params) {
+		if (!params.id || !params.name || this.toolTranscriptCallIds.has(params.id)) return;
+		this.toolTranscriptCallIds.add(params.id);
+		this.toolTranscriptMessages.push(attachCodexMirrorIdentity(this.createToolCallMessage(params), `${this.turnId}:tool:${params.id}:call`));
+	}
+	recordToolTranscriptResult(params) {
+		if (!params.id || !params.name || this.toolTranscriptResultIds.has(params.id)) return;
+		this.toolTranscriptResultIds.add(params.id);
+		this.toolTranscriptMessages.push(attachCodexMirrorIdentity(this.createToolResultMessage(params), `${this.turnId}:tool:${params.id}:result`));
+	}
 	formatCodexErrorMessage(params) {
 		const error = isJsonObject(params.error) ? params.error : void 0;
 		return formatCodexUsageLimitErrorMessage({
@@ -1779,6 +1985,41 @@ var CodexAppServerEventProjector = class {
 			timestamp: Date.now()
 		};
 	}
+	createToolCallMessage(params) {
+		return {
+			role: "assistant",
+			content: [{
+				type: "toolCall",
+				id: params.id,
+				name: params.name,
+				arguments: normalizeToolTranscriptArguments(params.arguments)
+			}],
+			api: this.params.model.api ?? "openai-codex-responses",
+			provider: this.params.provider,
+			model: this.params.modelId,
+			usage: ZERO_USAGE,
+			stopReason: "toolUse",
+			timestamp: Date.now()
+		};
+	}
+	createToolResultMessage(params) {
+		const text = truncateToolTranscriptText(params.text?.trim() || toolResultStatusText(params));
+		return {
+			role: "toolResult",
+			toolCallId: params.id,
+			toolName: params.name,
+			isError: params.isError,
+			content: [{
+				type: "toolResult",
+				toolCallId: params.id,
+				toolUseId: params.id,
+				tool_use_id: params.id,
+				content: text,
+				text
+			}],
+			timestamp: Date.now()
+		};
+	}
 	isNotificationForTurn(params) {
 		const threadId = readString$2(params, "threadId");
 		const turnId = readNotificationTurnId$1(params);
@@ -1813,13 +2054,13 @@ function readNumber(record, key) {
 	const value = record[key];
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
-function readBoolean(record, key) {
+function readBoolean$1(record, key) {
 	const value = record[key];
 	return typeof value === "boolean" ? value : void 0;
 }
 function readBooleanAlias(record, keys) {
 	for (const key of keys) {
-		const value = readBoolean(record, key);
+		const value = readBoolean$1(record, key);
 		if (value !== void 0) return value;
 	}
 }
@@ -2003,6 +2244,16 @@ function itemOutputText(item) {
 		return item.result ? stringifyJsonValue(item.result) : void 0;
 	}
 }
+function itemTranscriptResultText(item) {
+	const output = itemOutputText(item);
+	if (output) return output;
+	const result = itemToolResult(item).result;
+	return result ? stringifyJsonValue(result) : itemStatus(item);
+}
+function normalizeToolTranscriptArguments(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+	return value;
+}
 function collectDynamicToolContentText(contentItems) {
 	if (!Array.isArray(contentItems)) return "";
 	return contentItems.flatMap((entry) => {
@@ -2011,6 +2262,13 @@ function collectDynamicToolContentText(contentItems) {
 		return text ? [text] : [];
 	}).join("\n");
 }
+function truncateToolTranscriptText(text) {
+	if (text.length <= TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS) return text;
+	return `${text.slice(0, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS)}\n...(truncated)...`;
+}
+function toolResultStatusText(params) {
+	return params.isError ? `${params.name} failed` : `${params.name} completed`;
+}
 function stringifyJsonValue(value) {
 	try {
 		return JSON.stringify(value, null, 2);
@@ -2111,62 +2369,17 @@ const JWT_VALUE_RE = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]
 const COOKIE_PAIR_RE = /\b([A-Za-z][A-Za-z0-9_.-]{1,64})=([A-Za-z0-9+/._~%=-]{16,})(?=;|\s|$)/gu;
 const TRAJECTORY_RUNTIME_FILE_MAX_BYTES = 50 * 1024 * 1024;
 const TRAJECTORY_RUNTIME_EVENT_MAX_BYTES = 256 * 1024;
-function resolveCodexTrajectoryAppendFlags(constants = nodeFs.constants) {
-	const noFollow = constants.O_NOFOLLOW;
-	return constants.O_CREAT | constants.O_APPEND | constants.O_WRONLY | (typeof noFollow === "number" ? noFollow : 0);
-}
 function resolveCodexTrajectoryPointerFlags(constants = nodeFs.constants) {
 	const noFollow = constants.O_NOFOLLOW;
 	return constants.O_CREAT | constants.O_TRUNC | constants.O_WRONLY | (typeof noFollow === "number" ? noFollow : 0);
 }
-async function assertNoSymlinkParents(filePath) {
-	const resolvedDir = path.resolve(path.dirname(filePath));
-	const parsed = path.parse(resolvedDir);
-	const relativeParts = path.relative(parsed.root, resolvedDir).split(path.sep).filter(Boolean);
-	let current = parsed.root;
-	for (const part of relativeParts) {
-		current = path.join(current, part);
-		const stat = await fs.lstat(current);
-		if (stat.isSymbolicLink()) {
-			if (path.dirname(current) === parsed.root) continue;
-			throw new Error(`Refusing to write trajectory under symlinked directory: ${current}`);
-		}
-		if (!stat.isDirectory()) throw new Error(`Refusing to write trajectory under non-directory: ${current}`);
-	}
-}
-function verifyStableOpenedTrajectoryFile(params) {
-	if (!params.postOpenStat.isFile()) throw new Error(`Refusing to write trajectory to non-file: ${params.filePath}`);
-	if (params.postOpenStat.nlink > 1) throw new Error(`Refusing to write trajectory to hardlinked file: ${params.filePath}`);
-	const pre = params.preOpenStat;
-	if (pre && (pre.dev !== params.postOpenStat.dev || pre.ino !== params.postOpenStat.ino)) throw new Error(`Refusing to write trajectory after file changed: ${params.filePath}`);
-}
 async function safeAppendTrajectoryFile(filePath, line) {
-	await assertNoSymlinkParents(filePath);
-	let preOpenStat;
-	try {
-		const stat = await fs.lstat(filePath);
-		if (stat.isSymbolicLink()) throw new Error(`Refusing to write trajectory through symlink: ${filePath}`);
-		if (!stat.isFile()) throw new Error(`Refusing to write trajectory to non-file: ${filePath}`);
-		preOpenStat = stat;
-	} catch (err) {
-		if (err.code !== "ENOENT") throw err;
-	}
-	const lineBytes = Buffer.byteLength(line, "utf8");
-	if ((preOpenStat?.size ?? 0) + lineBytes > TRAJECTORY_RUNTIME_FILE_MAX_BYTES) return;
-	const handle = await fs.open(filePath, resolveCodexTrajectoryAppendFlags(), 384);
-	try {
-		const stat = await handle.stat();
-		verifyStableOpenedTrajectoryFile({
-			preOpenStat,
-			postOpenStat: stat,
-			filePath
-		});
-		if (stat.size + lineBytes > TRAJECTORY_RUNTIME_FILE_MAX_BYTES) return;
-		await handle.chmod(384);
-		await handle.appendFile(line, "utf8");
-	} finally {
-		await handle.close();
-	}
+	await appendRegularFile({
+		filePath,
+		content: line,
+		maxFileBytes: TRAJECTORY_RUNTIME_FILE_MAX_BYTES,
+		rejectSymlinkParents: true
+	});
 }
 function boundedTrajectoryLine(event) {
 	const line = JSON.stringify(event);
@@ -2289,7 +2502,7 @@ function parseTrajectoryEnabled(env) {
 }
 function resolveTrajectoryFilePath(params) {
 	const dirOverride = params.env.OPENCLAW_TRAJECTORY_DIR?.trim();
-	if (dirOverride) return resolveContainedPath(resolveUserPath$1(dirOverride), `${safeTrajectorySessionFileName(params.sessionId)}.jsonl`);
+	if (dirOverride) return resolveContainedPath(resolveUserPath(dirOverride), `${safeTrajectorySessionFileName(params.sessionId)}.jsonl`);
 	return params.sessionFile.endsWith(".jsonl") ? `${params.sessionFile.slice(0, -6)}.trajectory.jsonl` : `${params.sessionFile}.trajectory.jsonl`;
 }
 function safeTrajectorySessionFileName(sessionId) {
@@ -2528,9 +2741,14 @@ function filterToolsForVisionInputs(tools, params) {
 //#endregion
 //#region extensions/codex/src/app-server/run-attempt.ts
 const CODEX_DYNAMIC_TOOL_TIMEOUT_MS = 3e4;
+const CODEX_DYNAMIC_TOOL_MAX_TIMEOUT_MS = 6e5;
+const CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 6e4;
 const CODEX_APP_SERVER_STARTUP_CONNECTION_CLOSE_MAX_ATTEMPTS = 3;
+const CODEX_APP_SERVER_STARTUP_TIMEOUT_FLOOR_MS = 100;
 const CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS = 6e4;
 const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 6e4;
+const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
+const CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 6e4;
 const CODEX_STEER_ALL_DEBOUNCE_MS = 500;
 const LOG_FIELD_MAX_LENGTH = 160;
 const CODEX_NATIVE_PROJECT_DOC_BASENAMES = new Set(["agents.md"]);
@@ -2544,7 +2762,12 @@ const CODEX_BOOTSTRAP_CONTEXT_ORDER = new Map([
 	["memory.md", 60],
 	["heartbeat.md", 70]
 ]);
-let clientFactory = defaultCodexAppServerClientFactory;
+const testClientFactoryStorage = new AsyncLocalStorage();
+const clientFactory = defaultCodexAppServerClientFactory;
+let openClawCodingToolsFactoryForTests;
+function resolveCodexAppServerClientFactory() {
+	return testClientFactoryStorage.getStore() ?? clientFactory;
+}
 function emitCodexAppServerEvent(params, event) {
 	try {
 		emitAgentEvent({
@@ -2680,11 +2903,42 @@ function toCodexTextInput(text) {
 		text_elements: []
 	};
 }
+function resolveCodexPluginAppCacheEndpoint(appServer) {
+	return JSON.stringify({
+		transport: appServer.start.transport,
+		command: appServer.start.command,
+		args: appServer.start.args,
+		url: appServer.start.url ?? null,
+		credentialFingerprint: fingerprintCodexPluginAppCacheCredentials(appServer.start)
+	});
+}
+function fingerprintCodexPluginAppCacheCredentials(startOptions) {
+	const authToken = startOptions.authToken ?? "";
+	const headers = Object.entries(startOptions.headers).map(([key, value]) => [key.toLowerCase(), value]).toSorted(([left], [right]) => left.localeCompare(right));
+	if (!authToken && headers.length === 0) return null;
+	const hash = createHash("sha256");
+	hash.update("openclaw:codex:plugin-app-cache-credentials:v1");
+	hash.update("\0");
+	hash.update(authToken);
+	for (const [key, value] of headers) {
+		hash.update("\0");
+		hash.update(key);
+		hash.update("\0");
+		hash.update(value);
+	}
+	return `sha256:${hash.digest("hex")}`;
+}
+function resolveCodexPluginAppCacheCodexHome(appServer, agentDir) {
+	const configuredCodexHome = appServer.start.env?.CODEX_HOME?.trim();
+	if (configuredCodexHome) return configuredCodexHome;
+	return appServer.start.transport === "stdio" ? resolveCodexAppServerHomeDir(agentDir) : void 0;
+}
 async function runCodexAppServerAttempt(params, options = {}) {
 	const attemptStartedAt = Date.now();
-	const attemptClientFactory = clientFactory;
+	const attemptClientFactory = resolveCodexAppServerClientFactory();
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig });
+	let pluginAppServer = appServer;
 	const nativeHookRelayEvents = resolveCodexNativeHookRelayEvents({
 		configuredEvents: options.nativeHookRelay?.events,
 		appServer
@@ -2710,7 +2964,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		config: params.config,
 		agentId: params.agentId
 	});
-	const agentDir = params.agentDir ?? resolveOpenClawAgentDir();
+	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, sessionAgentId);
 	const startupBinding = await readCodexAppServerBinding(params.sessionFile);
 	const startupAuthProfileCandidate = params.runtimePlan?.auth.forwardedAuthProfileId ?? params.authProfileId ?? startupBinding?.authProfileId;
 	const startupAuthProfileId = params.authProfileStore ? resolveCodexAppServerAuthProfileId({
@@ -2727,6 +2981,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		sessionKey: sandboxSessionKey,
 		...startupAuthProfileId ? { authProfileId: startupAuthProfileId } : {}
 	};
+	const startupAuthAccountCacheKey = await resolveCodexAppServerAuthAccountCacheKey({
+		authProfileId: startupAuthProfileId,
+		authProfileStore: params.authProfileStore,
+		agentDir,
+		config: params.config
+	});
+	const startupEnvApiKeyCacheKey = startupAuthProfileId ? void 0 : resolveCodexAppServerEnvApiKeyCacheKey({ startOptions: appServer.start });
 	const activeContextEngine = isActiveHarnessContextEngine(params.contextEngine) ? params.contextEngine : void 0;
 	let yieldDetected = false;
 	const toolBridge = createCodexDynamicToolBridge({
@@ -2744,6 +3005,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 		}),
 		signal: runAbortController.signal,
+		loading: pluginConfig.codexDynamicToolsLoading ?? "searchable",
+		directToolNames: shouldForceMessageTool(params) ? ["message"] : [],
 		hookContext: {
 			agentId: sessionAgentId,
 			config: params.config,
@@ -2752,7 +3015,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			runId: params.runId
 		}
 	});
-	const hadSessionFile = await fileExists(params.sessionFile);
+	const hadSessionFile = await pathExists(params.sessionFile);
 	let historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? [];
 	const hookContext = {
 		runId: params.runId,
@@ -2784,8 +3047,15 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? historyMessages;
 	}
 	const baseDeveloperInstructions = buildDeveloperInstructions(params);
+	const workspaceBootstrapInstructions = await buildCodexWorkspaceBootstrapInstructions({
+		params,
+		resolvedWorkspace,
+		effectiveWorkspace,
+		sessionKey: sandboxSessionKey,
+		sessionAgentId
+	});
 	let promptText = params.prompt;
-	let developerInstructions = baseDeveloperInstructions;
+	let developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
 	let prePromptMessageCount = historyMessages.length;
 	if (activeContextEngine) try {
 		const assembled = await assembleHarnessContextEngine({
@@ -2807,7 +3077,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			systemPromptAddition: assembled.systemPromptAddition
 		});
 		promptText = projection.promptText;
-		developerInstructions = joinPresentSections(baseDeveloperInstructions, projection.developerInstructionAddition);
+		developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions, projection.developerInstructionAddition);
 		prePromptMessageCount = projection.prePromptMessageCount;
 	} catch (assembleErr) {
 		embeddedAgentLog.warn("context engine assemble failed; using Codex baseline prompt", { error: formatErrorMessage(assembleErr) });
@@ -2831,13 +3101,6 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		messages: historyMessages,
 		ctx: hookContext
 	});
-	const workspaceBootstrapInstructions = await buildCodexWorkspaceBootstrapInstructions({
-		params,
-		resolvedWorkspace,
-		effectiveWorkspace,
-		sessionKey: sandboxSessionKey,
-		sessionAgentId
-	});
 	const trajectoryRecorder = createCodexTrajectoryRecorder({
 		attempt: params,
 		cwd: effectiveWorkspace,
@@ -2850,6 +3113,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let trajectoryEndRecorded = false;
 	let nativeHookRelay;
 	let startupClientForCleanup;
+	const startupTimeoutMs = resolveCodexStartupTimeoutMs({
+		timeoutMs: params.timeoutMs,
+		timeoutFloorMs: options.startupTimeoutFloorMs
+	});
 	try {
 		emitCodexAppServerEvent(params, {
 			stream: "codex_app_server.lifecycle",
@@ -2863,16 +3130,36 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			sessionKey: sandboxSessionKey,
 			config: params.config,
 			runId: params.runId,
+			attemptTimeoutMs: params.timeoutMs,
+			startupTimeoutMs,
+			turnStartTimeoutMs: params.timeoutMs,
 			signal: runAbortController.signal
 		});
-		const threadConfig = mergeCodexConfigInstructions(nativeHookRelay ? buildCodexNativeHookRelayConfig({
+		const threadConfig = nativeHookRelay ? buildCodexNativeHookRelayConfig({
 			relay: nativeHookRelay,
 			events: nativeHookRelayEvents,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
-		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0, workspaceBootstrapInstructions);
+		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
+		const pluginThreadConfigEnabled = shouldBuildCodexPluginThreadConfig(pluginConfig);
+		const pluginAppCacheKey = buildCodexAppInventoryCacheKey({
+			codexHome: resolveCodexPluginAppCacheCodexHome(appServer, agentDir),
+			endpoint: resolveCodexPluginAppCacheEndpoint(appServer),
+			authProfileId: startupAuthProfileId,
+			accountId: startupAuthAccountCacheKey,
+			envApiKeyFingerprint: startupEnvApiKeyCacheKey
+		});
+		const pluginThreadConfigInputFingerprint = pluginThreadConfigEnabled ? buildCodexPluginThreadConfigInputFingerprint({
+			pluginConfig,
+			appCacheKey: pluginAppCacheKey
+		}) : void 0;
+		const resolvedPluginPolicy = pluginThreadConfigEnabled ? resolveCodexPluginsPolicy(pluginConfig) : void 0;
+		const enabledPluginConfigKeys = resolvedPluginPolicy ? resolvedPluginPolicy.pluginPolicies.filter((plugin) => plugin.enabled).map((plugin) => plugin.configKey).toSorted() : void 0;
+		pluginAppServer = resolvedPluginPolicy?.enabled === true ? {
+			...appServer,
+			approvalPolicy: withMcpElicitationsApprovalPolicy(appServer.approvalPolicy)
+		} : appServer;
 		({client, thread} = await withCodexStartupTimeout({
-			timeoutMs: params.timeoutMs,
-			timeoutFloorMs: options.startupTimeoutFloorMs,
+			timeoutMs: startupTimeoutMs,
 			signal: runAbortController.signal,
 			operation: async () => {
 				let attemptedClient;
@@ -2893,9 +3180,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 							params: runtimeParams,
 							cwd: effectiveWorkspace,
 							dynamicTools: toolBridge.specs,
-							appServer,
+							appServer: pluginAppServer,
 							developerInstructions: promptBuild.developerInstructions,
-							config: threadConfig
+							config: threadConfig,
+							pluginThreadConfig: pluginThreadConfigEnabled ? {
+								enabled: true,
+								inputFingerprint: pluginThreadConfigInputFingerprint,
+								enabledPluginConfigKeys,
+								build: () => buildCodexPluginThreadConfig({
+									pluginConfig,
+									request: (method, requestParams) => startupClient.request(method, requestParams, {
+										timeoutMs: appServer.requestTimeoutMs,
+										signal: runAbortController.signal
+									}),
+									appCache: defaultCodexAppInventoryCache,
+									appCacheKey: pluginAppCacheKey
+								})
+							} : void 0
 						})
 					};
 				};
@@ -2971,14 +3272,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		resolveCompletion = resolve;
 	});
 	let notificationQueue = Promise.resolve();
-	const turnCompletionIdleTimeoutMs = resolveCodexTurnCompletionIdleTimeoutMs(options.turnCompletionIdleTimeoutMs);
+	const turnCompletionIdleTimeoutMs = resolveCodexTurnCompletionIdleTimeoutMs(options.turnCompletionIdleTimeoutMs ?? appServer.turnCompletionIdleTimeoutMs);
 	const turnTerminalIdleTimeoutMs = resolveCodexTurnTerminalIdleTimeoutMs(options.turnTerminalIdleTimeoutMs);
 	let turnCompletionIdleTimer;
 	let turnCompletionIdleWatchArmed = false;
+	let turnCompletionIdleWatchPinnedByTerminalError = false;
 	let turnTerminalIdleTimer;
 	let turnTerminalIdleWatchArmed = false;
 	let turnCompletionLastActivityAt = Date.now();
 	let turnCompletionLastActivityReason = "startup";
+	let turnCompletionLastActivityDetails;
 	let activeAppServerTurnRequests = 0;
 	const clearTurnCompletionIdleTimer = () => {
 		if (turnCompletionIdleTimer) {
@@ -3008,14 +3311,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnId,
 			idleMs,
 			timeoutMs: turnCompletionIdleTimeoutMs,
-			lastActivityReason: turnCompletionLastActivityReason
+			lastActivityReason: turnCompletionLastActivityReason,
+			...turnCompletionLastActivityDetails
 		});
 		embeddedAgentLog.warn("codex app-server turn idle timed out waiting for completion", {
 			threadId: thread.threadId,
 			turnId,
 			idleMs,
 			timeoutMs: turnCompletionIdleTimeoutMs,
-			lastActivityReason: turnCompletionLastActivityReason
+			lastActivityReason: turnCompletionLastActivityReason,
+			...turnCompletionLastActivityDetails
 		});
 		runAbortController.abort("turn_completion_idle_timeout");
 	};
@@ -3035,14 +3340,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnId,
 			idleMs,
 			timeoutMs: turnTerminalIdleTimeoutMs,
-			lastActivityReason: turnCompletionLastActivityReason
+			lastActivityReason: turnCompletionLastActivityReason,
+			...turnCompletionLastActivityDetails
 		});
 		embeddedAgentLog.warn("codex app-server turn idle timed out waiting for terminal event", {
 			threadId: thread.threadId,
 			turnId,
 			idleMs,
 			timeoutMs: turnTerminalIdleTimeoutMs,
-			lastActivityReason: turnCompletionLastActivityReason
+			lastActivityReason: turnCompletionLastActivityReason,
+			...turnCompletionLastActivityDetails
 		});
 		runAbortController.abort("turn_terminal_idle_timeout");
 	};
@@ -3065,6 +3372,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const touchTurnCompletionActivity = (reason, options) => {
 		turnCompletionLastActivityAt = Date.now();
 		turnCompletionLastActivityReason = reason;
+		turnCompletionLastActivityDetails = options?.details;
 		emitTrustedDiagnosticEvent({
 			type: "run.progress",
 			runId: params.runId,
@@ -3072,10 +3380,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			sessionKey: params.sessionKey,
 			reason: `codex_app_server:${reason}`
 		});
-		if (options?.arm) turnCompletionIdleWatchArmed = true;
+		if (options?.arm) {
+			turnCompletionIdleWatchArmed = true;
+			turnCompletionIdleWatchPinnedByTerminalError = false;
+		}
 		scheduleTurnCompletionIdleWatch();
 		scheduleTurnTerminalIdleWatch();
 	};
+	const disarmTurnCompletionIdleWatch = () => {
+		turnCompletionIdleWatchArmed = false;
+		turnCompletionIdleWatchPinnedByTerminalError = false;
+		clearTurnCompletionIdleTimer();
+	};
+	const armTurnCompletionIdleWatch = (options) => {
+		turnCompletionIdleWatchArmed = true;
+		turnCompletionIdleWatchPinnedByTerminalError = options?.pinnedByTerminalError === true;
+		scheduleTurnCompletionIdleWatch();
+	};
 	const emitLifecycleStart = () => {
 		emitCodexAppServerEvent(params, {
 			stream: "lifecycle",
@@ -3099,13 +3420,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		lifecycleTerminalEmitted = true;
 	};
 	const handleNotification = async (notification) => {
-		touchTurnCompletionActivity(`notification:${notification.method}`);
 		userInputBridge?.handleNotification(notification);
 		if (!projector || !turnId) {
 			pendingNotifications.push(notification);
 			return;
 		}
-		const isTurnCompletion = notification.method === "turn/completed" && isTurnNotification(notification.params, thread.threadId, turnId);
+		const isCurrentTurnNotification = isTurnNotification(notification.params, thread.threadId, turnId);
+		if (isCurrentTurnNotification) touchTurnCompletionActivity(`notification:${notification.method}`, { details: describeNotificationActivity(notification) });
+		if (isCurrentTurnNotification && notification.method === "error") if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
+		else armTurnCompletionIdleWatch({ pinnedByTerminalError: true });
+		else if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification) disarmTurnCompletionIdleWatch();
+		const isTurnCompletion = notification.method === "turn/completed" && isCurrentTurnNotification;
 		try {
 			await projector.handleNotification(notification);
 		} catch (error) {
@@ -3136,7 +3461,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		try {
 			if (request.method === "account/chatgptAuthTokens/refresh") return refreshCodexAppServerAuthTokens({
 				agentDir,
-				authProfileId: startupAuthProfileId
+				authProfileId: startupAuthProfileId,
+				config: params.config
 			});
 			if (!turnId) return;
 			if (request.method === "mcpServer/elicitation/request") {
@@ -3146,6 +3472,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					paramsForRun: params,
 					threadId: thread.threadId,
 					turnId,
+					pluginAppPolicyContext: thread.pluginAppPolicyContext,
 					signal: runAbortController.signal
 				});
 			}
@@ -3180,6 +3507,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				name: call.tool,
 				arguments: call.arguments
 			});
+			projector?.recordDynamicToolCall({
+				callId: call.callId,
+				tool: call.tool,
+				arguments: call.arguments
+			});
 			const toolMeta = inferCodexDynamicToolMeta(call, resolveCodexToolProgressDetailMode(params.toolProgressDetail));
 			const toolArgs = sanitizeCodexToolArguments(call.arguments);
 			emitCodexAppServerEvent(params, {
@@ -3192,18 +3524,22 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					...toolArgs ? { args: toolArgs } : {}
 				}
 			});
+			const dynamicToolTimeoutMs = resolveDynamicToolCallTimeoutMs({
+				call,
+				config: params.config
+			});
 			const response = await handleDynamicToolCallWithTimeout({
 				call,
 				toolBridge,
 				signal: runAbortController.signal,
-				timeoutMs: CODEX_DYNAMIC_TOOL_TIMEOUT_MS,
+				timeoutMs: dynamicToolTimeoutMs,
 				onTimeout: () => {
 					trajectoryRecorder?.recordEvent("tool.timeout", {
 						threadId: call.threadId,
 						turnId: call.turnId,
 						toolCallId: call.callId,
 						name: call.tool,
-						timeoutMs: CODEX_DYNAMIC_TOOL_TIMEOUT_MS
+						timeoutMs: dynamicToolTimeoutMs
 					});
 				}
 			});
@@ -3215,6 +3551,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				success: response.success,
 				contentItems: response.contentItems
 			});
+			projector?.recordDynamicToolResult({
+				callId: call.callId,
+				tool: call.tool,
+				success: response.success,
+				contentItems: response.contentItems
+			});
 			emitCodexAppServerEvent(params, {
 				stream: "tool",
 				data: {
@@ -3265,7 +3607,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		turn = assertCodexTurnStartResponse(await client.request("turn/start", buildTurnStartParams(params, {
 			threadId: thread.threadId,
 			cwd: effectiveWorkspace,
-			appServer,
+			appServer: pluginAppServer,
 			promptText: promptBuild.prompt
 		}), {
 			timeoutMs: params.timeoutMs,
@@ -3535,7 +3877,7 @@ async function handleDynamicToolCallWithTimeout(params) {
 		resolveAbort = resolve;
 	});
 	const timeoutPromise = new Promise((resolve) => {
-		const timeoutMs = Math.max(1, Math.min(CODEX_DYNAMIC_TOOL_TIMEOUT_MS, params.timeoutMs));
+		const timeoutMs = clampDynamicToolTimeoutMs(params.timeoutMs);
 		timeout = setTimeout(() => {
 			timedOut = true;
 			const timeoutDetails = formatDynamicToolTimeoutDetails({
@@ -3578,6 +3920,31 @@ function failedDynamicToolResponse(message) {
 		}]
 	};
 }
+function resolveDynamicToolCallTimeoutMs(params) {
+	return clampDynamicToolTimeoutMs(readDynamicToolCallTimeoutMs(params.call.arguments) ?? readConfiguredDynamicToolTimeoutMs(params.call.tool, params.config) ?? CODEX_DYNAMIC_TOOL_TIMEOUT_MS);
+}
+function readDynamicToolCallTimeoutMs(value) {
+	if (!isJsonObject(value)) return;
+	return readPositiveFiniteTimeoutMs(value.timeoutMs);
+}
+function readConfiguredDynamicToolTimeoutMs(toolName, config) {
+	if (toolName === "image_generate") {
+		const imageGenerationModel = config?.agents?.defaults?.imageGenerationModel;
+		if (!imageGenerationModel || typeof imageGenerationModel !== "object") return;
+		return readPositiveFiniteTimeoutMs(imageGenerationModel.timeoutMs);
+	}
+	if (toolName === "image") return readTimeoutSecondsAsMs(config?.tools?.media?.image?.timeoutSeconds) ?? CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS;
+}
+function readTimeoutSecondsAsMs(value) {
+	const seconds = readPositiveFiniteTimeoutMs(value);
+	return seconds === void 0 ? void 0 : seconds * 1e3;
+}
+function readPositiveFiniteTimeoutMs(value) {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : void 0;
+}
+function clampDynamicToolTimeoutMs(timeoutMs) {
+	return Math.max(1, Math.min(CODEX_DYNAMIC_TOOL_MAX_TIMEOUT_MS, Math.floor(timeoutMs)));
+}
 function createCodexNativeHookRelay(params) {
 	if (params.options?.enabled === false) return;
 	return registerNativeHookRelay({
@@ -3593,7 +3960,12 @@ function createCodexNativeHookRelay(params) {
 		...params.config ? { config: params.config } : {},
 		runId: params.runId,
 		allowedEvents: params.events,
-		ttlMs: params.options?.ttlMs,
+		ttlMs: resolveCodexNativeHookRelayTtlMs({
+			explicitTtlMs: params.options?.ttlMs,
+			attemptTimeoutMs: params.attemptTimeoutMs,
+			startupTimeoutMs: params.startupTimeoutMs,
+			turnStartTimeoutMs: params.turnStartTimeoutMs
+		}),
 		signal: params.signal,
 		command: { timeoutMs: params.options?.gatewayTimeoutMs }
 	});
@@ -3602,6 +3974,11 @@ function resolveCodexNativeHookRelayEvents(params) {
 	if (params.configuredEvents?.length) return params.configuredEvents;
 	return params.appServer.approvalPolicy === "never" ? CODEX_NATIVE_HOOK_RELAY_EVENTS : CODEX_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS;
 }
+function resolveCodexNativeHookRelayTtlMs(params) {
+	if (params.explicitTtlMs !== void 0) return params.explicitTtlMs;
+	const relayBudgetMs = params.attemptTimeoutMs + params.startupTimeoutMs + params.turnStartTimeoutMs + CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS;
+	return Math.max(CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS, Math.floor(relayBudgetMs));
+}
 function buildCodexNativeHookRelayId(params) {
 	const hash = createHash("sha256");
 	hash.update("openclaw:codex:native-hook-relay:v1");
@@ -3616,13 +3993,20 @@ function interruptCodexTurnBestEffort(client, params) {
 		embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
 	});
 }
+function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
+	return {
+		sessionKey: sandboxSessionKey,
+		runSessionKey: params.sessionKey && params.sessionKey !== sandboxSessionKey ? params.sessionKey : void 0
+	};
+}
 async function buildDynamicTools(input) {
 	const { params } = input;
 	if (params.disableTools || !supportsModelTools(params.model)) return [];
 	const modelHasVision = params.model.input?.includes("image") ?? false;
-	const agentDir = params.agentDir ?? resolveOpenClawAgentDir();
-	const { createOpenClawCodingTools } = await import("openclaw/plugin-sdk/agent-harness");
-	const visionFilteredTools = filterToolsForVisionInputs(applyCodexDynamicToolProfile(createOpenClawCodingTools({
+	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, input.sessionAgentId);
+	const createOpenClawCodingTools = openClawCodingToolsFactoryForTests ?? (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
+	const sessionKeys = resolveOpenClawCodingToolsSessionKeys(params, input.sandboxSessionKey);
+	const filteredTools = filterCodexDynamicToolsForAllowlist(filterToolsForVisionInputs(filterCodexDynamicTools(createOpenClawCodingTools({
 		agentId: input.sessionAgentId,
 		...buildEmbeddedAttemptToolRunContext(params),
 		exec: {
@@ -3644,8 +4028,7 @@ async function buildDynamicTools(input) {
 		senderE164: params.senderE164,
 		senderIsOwner: params.senderIsOwner,
 		allowGatewaySubagentBinding: params.allowGatewaySubagentBinding,
-		sessionKey: input.sandboxSessionKey,
-		runSessionKey: params.sessionKey && params.sessionKey !== input.sandboxSessionKey ? params.sessionKey : void 0,
+		...sessionKeys,
 		sessionId: params.sessionId,
 		runId: params.runId,
 		agentDir,
@@ -3670,8 +4053,9 @@ async function buildDynamicTools(input) {
 		hasRepliedRef: params.hasRepliedRef,
 		modelHasVision,
 		requireExplicitMessageTarget: params.requireExplicitMessageTarget ?? isSubagentSessionKey(params.sessionKey),
+		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
 		disableMessageTool: params.disableMessageTool,
-		forceMessageTool: params.sourceReplyDeliveryMode === "message_tool_only",
+		forceMessageTool: shouldForceMessageTool(params),
 		enableHeartbeatTool: params.trigger === "heartbeat",
 		forceHeartbeatTool: params.trigger === "heartbeat",
 		onYield: (message) => {
@@ -3688,8 +4072,7 @@ async function buildDynamicTools(input) {
 	}), input.pluginConfig), {
 		modelHasVision,
 		hasInboundImages: (params.images?.length ?? 0) > 0
-	});
-	const filteredTools = params.toolsAllow && params.toolsAllow.length > 0 ? visionFilteredTools.filter((tool) => params.toolsAllow?.includes(tool.name)) : visionFilteredTools;
+	}), params.toolsAllow);
 	return normalizeAgentRuntimeTools({
 		runtimePlan: params.runtimePlan,
 		tools: filteredTools,
@@ -3702,6 +4085,14 @@ async function buildDynamicTools(input) {
 		model: params.model
 	});
 }
+function filterCodexDynamicToolsForAllowlist(tools, toolsAllow) {
+	if (!toolsAllow || toolsAllow.length === 0) return tools;
+	const allowSet = new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name)).filter(Boolean));
+	return tools.filter((tool) => allowSet.has(normalizeCodexDynamicToolName(tool.name)));
+}
+function shouldForceMessageTool(params) {
+	return params.sourceReplyDeliveryMode === "message_tool_only";
+}
 function shouldProjectMirroredHistoryForCodexStart(params) {
 	if (!params.historyMessages.some((message) => message.role === "user")) return false;
 	if (!params.startupBinding?.threadId) return true;
@@ -3723,10 +4114,9 @@ async function withCodexStartupTimeout(params) {
 				}
 				reject(error);
 			};
-			const timeoutMs = Math.max(params.timeoutFloorMs ?? 100, params.timeoutMs);
 			timeout = setTimeout(() => {
 				rejectOnce(/* @__PURE__ */ new Error("codex app-server startup timed out"));
-			}, timeoutMs);
+			}, params.timeoutMs);
 			const abortListener = () => rejectOnce(/* @__PURE__ */ new Error("codex app-server startup aborted"));
 			params.signal.addEventListener("abort", abortListener, { once: true });
 			abortCleanup = () => params.signal.removeEventListener("abort", abortListener);
@@ -3736,6 +4126,9 @@ async function withCodexStartupTimeout(params) {
 		abortCleanup?.();
 	}
 }
+function resolveCodexStartupTimeoutMs(params) {
+	return Math.max(params.timeoutFloorMs ?? CODEX_APP_SERVER_STARTUP_TIMEOUT_FLOOR_MS, params.timeoutMs);
+}
 function resolveCodexTurnCompletionIdleTimeoutMs(value) {
 	if (value === void 0) return CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS;
 	if (!Number.isFinite(value)) return CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS;
@@ -3791,10 +4184,37 @@ function readCodexErrorPayload(error) {
 		rateLimits: nestedError.rateLimits ?? data.rateLimits
 	};
 }
+function describeNotificationActivity(notification) {
+	if (!isJsonObject(notification.params)) return { lastNotificationMethod: notification.method };
+	if (notification.method !== "rawResponseItem/completed") return { lastNotificationMethod: notification.method };
+	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
+	if (!item) return { lastNotificationMethod: notification.method };
+	return {
+		lastNotificationMethod: notification.method,
+		lastNotificationItemId: readString(item, "id"),
+		lastNotificationItemType: readString(item, "type"),
+		lastNotificationItemRole: readString(item, "role"),
+		lastAssistantTextPreview: readRawAssistantTextPreview(item)
+	};
+}
+function readRawAssistantTextPreview(item) {
+	if (readString(item, "role") !== "assistant" || !Array.isArray(item.content)) return;
+	const text = item.content.flatMap((content) => {
+		if (!isJsonObject(content)) return [];
+		const contentText = readString(content, "text");
+		return contentText ? [contentText] : [];
+	}).join("\n").trim();
+	if (!text) return;
+	return text.length > 240 ? `${text.slice(0, 237)}...` : text;
+}
 function isTurnNotification(value, threadId, turnId) {
 	if (!isJsonObject(value)) return false;
 	return readString(value, "threadId") === threadId && readNotificationTurnId(value) === turnId;
 }
+function isRetryableErrorNotification(value) {
+	if (!isJsonObject(value)) return false;
+	return readBoolean(value, "willRetry") === true || readBoolean(value, "will_retry") === true;
+}
 function isTerminalTurnStatus(status) {
 	return status === "completed" || status === "interrupted" || status === "failed";
 }
@@ -3809,6 +4229,10 @@ function readString(record, key) {
 	const value = record[key];
 	return typeof value === "string" ? value : void 0;
 }
+function readBoolean(record, key) {
+	const value = record[key];
+	return typeof value === "boolean" ? value : void 0;
+}
 async function readMirroredSessionHistoryMessages(sessionFile) {
 	const messages = await readCodexMirroredSessionHistoryMessages(sessionFile);
 	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile });
@@ -3855,12 +4279,6 @@ function renderCodexWorkspaceBootstrapInstructions(contextFiles) {
 	for (const file of files) lines.push(`## ${file.path}`, "", file.content, "");
 	return lines.join("\n").trim();
 }
-function mergeCodexConfigInstructions(config, instructions) {
-	if (!instructions?.trim()) return config;
-	const merged = { ...config };
-	merged.instructions = joinPresentSections(typeof merged.instructions === "string" ? merged.instructions.trim() : void 0, instructions);
-	return merged;
-}
 function remapCodexContextFilePath(params) {
 	const relativePath = path.relative(params.sourceWorkspaceDir, params.file.path);
 	if (!relativePath || relativePath.startsWith("..") || path.isAbsolute(relativePath) || params.sourceWorkspaceDir === params.targetWorkspaceDir) return params.file;
@@ -3900,15 +4318,6 @@ async function mirrorTranscriptBestEffort(params) {
 		embeddedAgentLog.warn("failed to mirror codex app-server transcript", { error });
 	}
 }
-async function fileExists(filePath) {
-	try {
-		await fs.stat(filePath);
-		return true;
-	} catch (error) {
-		if (error.code === "ENOENT") return false;
-		throw error;
-	}
-}
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
@@ -3925,8 +4334,5 @@ function handleApprovalRequest(params) {
 		signal: params.signal
 	});
 }
-({ ...createCodexAppServerClientFactoryTestHooks((factory) => {
-	clientFactory = factory;
-}) });
 //#endregion
 export { runCodexAppServerAttempt };