@openclaw/codex 2026.5.18 → 2026.5.19-beta.2

package/dist/{run-attempt-DyLQRA61.js → run-attempt-BqRPAaHk.js}

@@ -1,26 +1,26 @@
-import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-B5pq6hEz.js";
+import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-B5rU0vP3.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-BGBspNmF.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-6FkrXfaz.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-XPjLayGw.js";
-import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BRW7_Nu7.js";
-import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, f as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-DlvmoLBJ.js";
-import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DqApZIgD.js";
-import { a as defaultCodexAppInventoryCache } from "./plugin-activation-B49xb7pI.js";
-import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, _ as projectContextEngineAssemblyForCodex, b as createCodexDynamicToolBridge, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as shouldBuildCodexPluginThreadConfig, h as mergeCodexThreadConfigs, i as buildDeveloperInstructions, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfigInputFingerprint, p as buildCodexPluginThreadConfig, r as buildContextEngineBinding, s as buildTurnStartParams, t as areCodexDynamicToolFingerprintsCompatible, v as resolveCodexContextEngineProjectionMaxChars, w as normalizeCodexDynamicToolName, x as sanitizeCodexHistoryImagePayloads, y as resolveCodexContextEngineProjectionReserveTokens } from "./thread-lifecycle-5SBrtWFl.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-9L6Ie1dC.js";
-import { a as handleCodexAppServerElicitationRequest, i as buildCodexNativeHookRelayDisabledConfig, n as CODEX_NATIVE_HOOK_RELAY_EVENTS, o as handleCodexAppServerApprovalRequest, r as buildCodexNativeHookRelayConfig, t as filterToolsForVisionInputs } from "./vision-tools-BX9YuTEK.js";
-import { t as ensureCodexComputerUse } from "./computer-use-UJ3dxrXF.js";
+import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-BCJaLwdZ.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-BLCZjckr.js";
+import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BpPOTePl.js";
+import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, f as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-DWgKldR5.js";
+import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-D9ejASYj.js";
+import { a as defaultCodexAppInventoryCache } from "./plugin-activation-Dtcfb3sk.js";
+import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, _ as projectContextEngineAssemblyForCodex, b as createCodexDynamicToolBridge, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as shouldBuildCodexPluginThreadConfig, h as mergeCodexThreadConfigs, i as buildDeveloperInstructions, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfigInputFingerprint, p as buildCodexPluginThreadConfig, r as buildContextEngineBinding, s as buildTurnStartParams, t as areCodexDynamicToolFingerprintsCompatible, v as resolveCodexContextEngineProjectionMaxChars, w as normalizeCodexDynamicToolName, x as sanitizeCodexHistoryImagePayloads, y as resolveCodexContextEngineProjectionReserveTokens } from "./thread-lifecycle-C07GnPSH.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-By1f68U_.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-CDoJ4rDN.js";
+import { t as ensureCodexComputerUse } from "./computer-use-BD8UmXB-.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import { createHash } from "node:crypto";
 import nodeFs from "node:fs";
-import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildAgentHookContextChannelFields, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, hasBeforeToolCallPolicy, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, loadCodexBundleMcpThreadConfig, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveContextEngineOwnerPluginId, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockOptions, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildAgentHookContextChannelFields, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, compactContextEngineWithSafetyTimeout, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, hasBeforeToolCallPolicy, hasSandboxBindContainerPathAliases, hasSandboxBindReadonlyHostShadows, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, loadCodexBundleMcpThreadConfig, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveCompactionTimeoutMs, resolveContextEngineOwnerPluginId, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockOptions, resolveUserPath, resolveWritableSandboxBindHostRoots, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, 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 { markAuthProfileBlockedUntil, resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
 import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
-import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
+import { emitTrustedDiagnosticEvent, hasPendingInternalDiagnosticEvent, onInternalDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { CODEX_NATIVE_SUBAGENT_RUNTIME, CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX, CODEX_NATIVE_SUBAGENT_TASK_KIND, createRunningTaskRun, finalizeTaskRunByRunId, recordTaskRunProgressByRunId } from "openclaw/plugin-sdk/codex-native-task-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@earendil-works/pi-coding-agent";
 //#region extensions/codex/src/app-server/local-runtime-attribution.ts
@@ -164,9 +164,27 @@ var CodexNativeSubagentTaskMirror = class {
 		if (!item || readString$3(item, "type") !== "collabAgentToolCall") return;
 		if (readString$3(item, "senderThreadId") !== this.params.parentThreadId) return;
 		const receiverThreadIds = readStringArray(item.receiverThreadIds);
-		if (normalizeToolName(readString$3(item, "tool")) === "spawnagent") for (const receiverThreadId of receiverThreadIds) this.createTaskFromCollabSpawnItem(receiverThreadId, item);
+		const isSpawnAgentTool = normalizeToolName(readString$3(item, "tool")) === "spawnagent";
+		if (isSpawnAgentTool) for (const receiverThreadId of receiverThreadIds) this.createTaskFromCollabSpawnItem(receiverThreadId, item);
 		const agentsStates = readAgentsStates(item.agentsStates);
-		for (const [threadId, state] of agentsStates) this.applyCollabAgentStatus(threadId, state.status, state.message);
+		const toolCallStatus = normalizeCollabToolCallStatus(readString$3(item, "status"));
+		const terminalToolCallThreadIds = /* @__PURE__ */ new Set();
+		if (isSpawnAgentTool && isBlockedOrFailedCollabToolCallStatus(toolCallStatus)) {
+			for (const threadId of receiverThreadIds) terminalToolCallThreadIds.add(threadId);
+			for (const threadId of agentsStates.keys()) terminalToolCallThreadIds.add(threadId);
+		}
+		const terminalAgentStateThreadIds = /* @__PURE__ */ new Set();
+		for (const [threadId, state] of agentsStates) {
+			const normalizedStatus = normalizeAgentStateStatus(state.status);
+			if (terminalToolCallThreadIds.has(threadId) && isNonTerminalAgentStateStatus(normalizedStatus)) continue;
+			this.applyCollabAgentStatus(threadId, normalizedStatus, state.message);
+			if (isTerminalAgentStateStatus(normalizedStatus)) terminalAgentStateThreadIds.add(threadId);
+		}
+		if (isBlockedOrFailedCollabToolCallStatus(toolCallStatus)) for (const threadId of terminalToolCallThreadIds) {
+			if (terminalAgentStateThreadIds.has(threadId)) continue;
+			const state = agentsStates.get(threadId);
+			this.applyCollabAgentStatus(threadId, toolCallStatus, state?.message);
+		}
 	}
 	createTaskFromCollabSpawnItem(threadId, item) {
 		const normalizedThreadId = threadId.trim();
@@ -200,6 +218,7 @@ var CodexNativeSubagentTaskMirror = class {
 		const normalizedStatus = normalizeAgentStateStatus(status);
 		if (!normalizedStatus) return;
 		const runId = codexNativeSubagentRunId(threadId);
+		if (this.terminalRunIds.has(runId) && isNonTerminalAgentStateStatus(normalizedStatus)) return;
 		const eventAt = this.now();
 		if (normalizedStatus === "pendingInit" || normalizedStatus === "running") {
 			this.runtime.recordTaskRunProgressByRunId({
@@ -223,6 +242,20 @@ var CodexNativeSubagentTaskMirror = class {
 			});
 			return;
 		}
+		if (normalizedStatus === "blocked") {
+			this.terminalRunIds.add(runId);
+			this.runtime.finalizeTaskRunByRunId({
+				runId,
+				runtime: CODEX_NATIVE_SUBAGENT_RUNTIME,
+				status: "succeeded",
+				endedAt: eventAt,
+				lastEventAt: eventAt,
+				progressSummary: trimOptional(message) ?? "Codex native subagent blocked.",
+				terminalSummary: trimOptional(message) ?? "Codex native subagent blocked.",
+				terminalOutcome: "blocked"
+			});
+			return;
+		}
 		this.terminalRunIds.add(runId);
 		this.runtime.finalizeTaskRunByRunId({
 			runId,
@@ -293,6 +326,23 @@ function readNullableString$1(value, key) {
 function normalizeToolName(value) {
 	return value?.replace(/[^a-z0-9]/giu, "").toLowerCase();
 }
+function normalizeCollabToolCallStatus(value) {
+	const key = value?.replace(/[^a-z0-9]/giu, "").toLowerCase();
+	if (key === "completed" || key === "succeeded" || key === "success") return "completed";
+	if (key === "failed" || key === "error" || key === "errored") return "failed";
+	if (key === "blocked" || key === "declined") return "blocked";
+	if (key === "inprogress" || key === "running") return "running";
+	return value?.trim();
+}
+function isBlockedOrFailedCollabToolCallStatus(value) {
+	return value === "failed" || value === "blocked";
+}
+function isNonTerminalAgentStateStatus(value) {
+	return value === "pendingInit" || value === "running";
+}
+function isTerminalAgentStateStatus(value) {
+	return value !== void 0 && !isNonTerminalAgentStateStatus(value);
+}
 function normalizeAgentStateStatus(value) {
 	const key = value?.replace(/[^a-z0-9]/giu, "").toLowerCase();
 	if (!key) return;
@@ -301,6 +351,7 @@ function normalizeAgentStateStatus(value) {
 	if (key === "completed" || key === "succeeded" || key === "success") return "completed";
 	if (key === "interrupted" || key === "cancelled" || key === "canceled" || key === "shutdown") return key === "shutdown" ? "shutdown" : "interrupted";
 	if (key === "failed" || key === "error" || key === "systemerror") return "failed";
+	if (key === "blocked" || key === "declined") return "blocked";
 	return value?.trim();
 }
 function secondsToMillis(value) {
@@ -411,7 +462,7 @@ function buildCodexUserPromptMessage(params) {
 */
 function attachCodexMirrorIdentity(message, identity) {
 	const record = message;
-	const existing = record.__openclaw;
+	const existing = record["__openclaw"];
 	const baseMeta = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
 	return {
 		...record,
@@ -422,7 +473,7 @@ function attachCodexMirrorIdentity(message, identity) {
 	};
 }
 function readMirrorIdentity(message) {
-	const meta = message.__openclaw;
+	const meta = message["__openclaw"];
 	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return;
 	const id = meta[MIRROR_IDENTITY_META_KEY];
 	return typeof id === "string" && id.length > 0 ? id : void 0;
@@ -2311,6 +2362,7 @@ function readRequestId(record) {
 //#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_GENERATION_TOOL_TIMEOUT_MS = 12e4;
 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;
@@ -2325,6 +2377,13 @@ const CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS = 6e4;
 const CODEX_STEER_ALL_DEBOUNCE_MS = 500;
 const LOG_FIELD_MAX_LENGTH = 160;
 const CODEX_NATIVE_PROJECT_DOC_BASENAMES = new Set(["agents.md"]);
+const CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = new Set([
+	"identity.md",
+	"soul.md",
+	"tools.md",
+	"user.md"
+]);
+const CODEX_HEARTBEAT_CONTEXT_BASENAME = "heartbeat.md";
 const CODEX_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS = CODEX_NATIVE_HOOK_RELAY_EVENTS.filter((event) => event !== "permission_request");
 const CODEX_BOOTSTRAP_CONTEXT_ORDER = new Map([
 	["soul.md", 10],
@@ -2485,9 +2544,11 @@ function toCodexTextInput(text) {
 function resolveCodexAppServerSandboxPolicyForOpenClawSandbox(appServer, sandbox, cwd) {
 	if (!sandbox?.enabled || appServer.sandbox === "read-only") return;
 	const networkAccess = codexNetworkAccessForOpenClawSandbox(sandbox);
+	const writableRoots = new Set([cwd]);
+	if (sandbox.backendId === "docker") for (const root of resolveWritableSandboxBindHostRoots(sandbox.docker.binds)) writableRoots.add(root);
 	return {
 		type: "workspaceWrite",
-		writableRoots: [cwd],
+		writableRoots: [...writableRoots],
 		networkAccess,
 		excludeTmpdirEnvVar: false,
 		excludeSlashTmp: false
@@ -2765,7 +2826,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		disableTools: params.disableTools,
 		toolsAllow: params.toolsAllow
 	});
-	const nativeToolSurfaceEnabled = shouldEnableCodexAppServerNativeToolSurface(params);
+	const nativeToolSurfaceEnabled = shouldEnableCodexAppServerNativeToolSurface(params, sandbox);
 	for (const diagnostic of bundleMcpThreadConfig.diagnostics) embeddedAgentLog.warn(`bundle-mcp: ${diagnostic.pluginId}: ${diagnostic.message}`);
 	const activeContextEngine = isActiveHarnessContextEngine(params.contextEngine) ? params.contextEngine : void 0;
 	const hookChannelId = resolveCodexAppServerHookChannelId(params, sandboxSessionKey);
@@ -2777,6 +2838,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			effectiveWorkspace,
 			sandboxSessionKey,
 			sandbox,
+			nativeToolSurfaceEnabled,
 			runAbortController,
 			sessionAgentId,
 			pluginConfig,
@@ -2837,7 +2899,6 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		});
 		historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages;
 	}
-	const baseDeveloperInstructions = buildDeveloperInstructions(params);
 	const workspaceBootstrapContext = await buildCodexWorkspaceBootstrapContext({
 		params,
 		resolvedWorkspace,
@@ -2845,14 +2906,19 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		sessionKey: sandboxSessionKey,
 		sessionAgentId
 	});
-	const workspaceBootstrapInstructions = workspaceBootstrapContext.instructions;
+	const baseDeveloperInstructions = joinPresentSections(buildDeveloperInstructions(params, { dynamicTools: toolBridge.specs }), workspaceBootstrapContext.developerInstructions);
+	const openClawPromptContext = buildCodexOpenClawPromptContext({
+		params,
+		skillsPrompt: params.skillsSnapshot?.prompt,
+		workspacePromptContext: workspaceBootstrapContext.promptContext
+	});
 	let promptText = params.prompt;
-	let developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
+	let developerInstructions = baseDeveloperInstructions;
 	let prePromptMessageCount = historyMessages.length;
 	let contextEngineProjection;
 	const resetCodexPromptInputs = () => {
 		promptText = params.prompt;
-		developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
+		developerInstructions = baseDeveloperInstructions;
 		prePromptMessageCount = historyMessages.length;
 		contextEngineProjection = void 0;
 	};
@@ -2909,7 +2975,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			developerInstructionAdditionChars: projection.developerInstructionAddition?.length ?? 0
 		});
 		promptText = projectionDecision.project ? projection.promptText : params.prompt;
-		developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions, projection.developerInstructionAddition);
+		developerInstructions = joinPresentSections(baseDeveloperInstructions, projection.developerInstructionAddition);
 		prePromptMessageCount = projection.prePromptMessageCount;
 	};
 	if (activeContextEngine) try {
@@ -2937,19 +3003,25 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		ctx: hookContext
 	});
 	let promptBuild = await buildPromptFromCurrentInputs();
+	const decorateCodexTurnPromptText = (prompt) => prependCodexOpenClawPromptContext(prompt, openClawPromptContext);
+	let codexTurnPromptText = decorateCodexTurnPromptText(promptBuild.prompt);
+	const refreshCodexTurnPromptText = () => {
+		codexTurnPromptText = decorateCodexTurnPromptText(promptBuild.prompt);
+	};
 	const systemPromptReport = buildCodexSystemPromptReport({
 		attempt: params,
 		sessionKey: sandboxSessionKey,
 		workspaceDir: effectiveWorkspace,
 		developerInstructions: promptBuild.developerInstructions,
 		workspaceBootstrapContext,
+		skillsPrompt: openClawPromptContext ? params.skillsSnapshot?.prompt ?? "" : "",
 		tools: toolBridge.specs
 	});
 	const trajectoryRecorder = createCodexTrajectoryRecorder({
 		attempt: params,
 		cwd: effectiveWorkspace,
 		developerInstructions: promptBuild.developerInstructions,
-		prompt: promptBuild.prompt,
+		prompt: codexTurnPromptText,
 		tools: toolBridge.specs
 	});
 	let client;
@@ -3002,6 +3074,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}) : void 0;
 		const resolvedPluginPolicy = pluginThreadConfigRequired ? resolveCodexPluginsPolicy(pluginThreadConfigPluginConfig) : void 0;
 		const enabledPluginConfigKeys = resolvedPluginPolicy ? resolvedPluginPolicy.pluginPolicies.filter((plugin) => plugin.enabled).map((plugin) => plugin.configKey).toSorted() : void 0;
+		embeddedAgentLog.info("codex plugin thread config eligibility", buildCodexPluginThreadConfigEligibilityLogData({
+			sessionId: params.sessionId,
+			sessionKey: sandboxSessionKey,
+			pluginThreadConfigRequired,
+			resolvedPluginPolicy,
+			enabledPluginConfigKeys,
+			pluginAppCacheKey,
+			startupAuthProfileId,
+			appServer
+		}));
 		pluginAppServer = resolvedPluginPolicy?.enabled === true ? {
 			...appServer,
 			approvalPolicy: withMcpElicitationsApprovalPolicy(appServer.approvalPolicy)
@@ -3032,6 +3114,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						config: threadConfig,
 						finalConfigPatch: nativeHookRelayConfig,
 						nativeCodeModeEnabled: nativeToolSurfaceEnabled,
+						nativeCodeModeOnlyEnabled: appServer.codeModeOnly,
 						userMcpServersEnabled: nativeToolSurfaceEnabled,
 						mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
 						mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
@@ -3110,7 +3193,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		attempt: params,
 		cwd: effectiveWorkspace,
 		developerInstructions: promptBuild.developerInstructions,
-		prompt: promptBuild.prompt,
+		prompt: codexTurnPromptText,
 		tools: toolBridge.specs
 	});
 	let projector;
@@ -3156,7 +3239,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let turnAttemptLastProgressDetails;
 	let nativeHookRelayLastRenewedAt = 0;
 	let activeAppServerTurnRequests = 0;
-	const activeOpenClawDynamicToolCallIds = /* @__PURE__ */ new Set();
+	const pendingOpenClawDynamicToolCompletionIds = /* @__PURE__ */ new Set();
 	const activeTurnItemIds = /* @__PURE__ */ new Set();
 	let turnCrossedToolHandoff = false;
 	const clearTurnCompletionIdleTimer = () => {
@@ -3465,7 +3548,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	};
 	const isTerminalTurnNotificationForTurn = (notification, notificationTurnId) => {
 		if (!isTurnNotification(notification.params, thread.threadId, notificationTurnId)) return false;
-		return notification.method === "turn/completed" || isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
+		return notification.method === "turn/completed" || isCodexTurnAbortMarkerNotification(notification, { currentPromptTexts: [codexTurnPromptText] });
 	};
 	const handleNotification = async (notification) => {
 		userInputBridge?.handleNotification(notification);
@@ -3484,7 +3567,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 		if (isCurrentTurnNotification) updateActiveTurnItemIds(notification, activeTurnItemIds);
 		const unblockedAssistantCompletionRelease = isCurrentTurnNotification && turnAssistantCompletionIdleWatchArmed && notification.method === "item/completed" && activeTurnItemIds.size === 0;
-		const trackedDynamicToolCompletion = isTrackedOpenClawDynamicToolCompletionNotification(notification, activeOpenClawDynamicToolCallIds);
+		const trackedDynamicToolCompletion = isPendingOpenClawDynamicToolCompletionNotification(notification, pendingOpenClawDynamicToolCompletionIds);
 		const rawToolOutputCompletion = isRawToolOutputCompletionNotification(notification);
 		if (isCurrentTurnNotification && (rawToolOutputCompletion || isNativeToolProgressNotification(notification))) turnCrossedToolHandoff = true;
 		const assistantCompletionCanRelease = isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff);
@@ -3502,7 +3585,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		else if (isCurrentTurnNotification && rawToolOutputCompletion) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && shouldDisarmAssistantCompletionIdleWatch(notification)) disarmTurnAssistantCompletionIdleWatch();
 		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !postToolRawAssistantCompletionNeedsTerminalGuard && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
-		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
+		if (trackedDynamicToolCompletion) {
+			const itemId = readNotificationItemId(notification);
+			if (itemId) pendingOpenClawDynamicToolCompletionIds.delete(itemId);
+		}
+		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptTexts: [codexTurnPromptText] });
 		const isTurnTerminal = isTerminalTurnNotificationForTurn(notification, turnId);
 		if (isTurnTerminal) terminalTurnNotificationQueued = true;
 		try {
@@ -3600,7 +3687,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			armCompletionWatchOnResponse = true;
 			markCurrentTurnRequestProgress();
 			turnCrossedToolHandoff = true;
-			activeOpenClawDynamicToolCallIds.add(call.callId);
+			pendingOpenClawDynamicToolCompletionIds.add(call.callId);
 			trajectoryRecorder?.recordEvent("tool.call", {
 				threadId: call.threadId,
 				turnId: call.turnId,
@@ -3618,6 +3705,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				tool: call.tool,
 				toolCallId: call.callId
 			});
+			emitDynamicToolStartedDiagnostic({
+				call,
+				runId: params.runId,
+				sessionId: params.sessionId,
+				sessionKey: params.sessionKey
+			});
 			const toolMeta = inferCodexDynamicToolMeta(call, resolveCodexToolProgressDetailMode(params.toolProgressDetail));
 			const toolArgs = sanitizeCodexToolArguments(call.arguments);
 			const shouldEmitDynamicToolProgress = shouldEmitTranscriptToolProgress(call.tool, toolArgs);
@@ -3635,47 +3728,92 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				call,
 				config: params.config
 			});
-			const response = await handleDynamicToolCallWithTimeout({
-				call,
-				toolBridge,
-				signal: runAbortController.signal,
-				timeoutMs: dynamicToolTimeoutMs,
-				onTimeout: () => {
-					trajectoryRecorder?.recordEvent("tool.timeout", {
-						threadId: call.threadId,
-						turnId: call.turnId,
-						toolCallId: call.callId,
-						name: call.tool,
-						timeoutMs: dynamicToolTimeoutMs
-					});
+			const toolStartedAt = Date.now();
+			let terminalDiagnosticObserved = false;
+			const unsubscribeToolDiagnosticObserver = onInternalDiagnosticEvent((event) => {
+				if (isDynamicToolTerminalDiagnosticEvent(event)) {
+					if (isMatchingDynamicToolTerminalDiagnostic({
+						event,
+						call,
+						runId: params.runId,
+						sessionId: params.sessionId,
+						sessionKey: params.sessionKey
+					})) terminalDiagnosticObserved = true;
 				}
 			});
-			trajectoryRecorder?.recordEvent("tool.result", {
-				threadId: call.threadId,
-				turnId: call.turnId,
-				toolCallId: call.callId,
-				name: call.tool,
-				success: response.success,
-				contentItems: response.contentItems
-			});
-			projector?.recordDynamicToolResult({
-				callId: call.callId,
-				tool: call.tool,
-				success: response.success,
-				contentItems: response.contentItems
-			});
-			if (shouldEmitDynamicToolProgress) emitCodexAppServerEvent(params, {
-				stream: "tool",
-				data: {
-					phase: "result",
-					name: call.tool,
+			try {
+				const response = await handleDynamicToolCallWithTimeout({
+					call,
+					toolBridge,
+					signal: runAbortController.signal,
+					timeoutMs: dynamicToolTimeoutMs,
+					onTimeout: () => {
+						trajectoryRecorder?.recordEvent("tool.timeout", {
+							threadId: call.threadId,
+							turnId: call.turnId,
+							toolCallId: call.callId,
+							name: call.tool,
+							timeoutMs: dynamicToolTimeoutMs
+						});
+					}
+				});
+				const protocolResponse = toCodexDynamicToolProtocolResponse(response);
+				trajectoryRecorder?.recordEvent("tool.result", {
+					threadId: call.threadId,
+					turnId: call.turnId,
 					toolCallId: call.callId,
-					...toolMeta ? { meta: toolMeta } : {},
-					isError: !response.success,
-					result: sanitizeCodexToolResponse(response)
-				}
-			});
-			return response;
+					name: call.tool,
+					success: protocolResponse.success,
+					contentItems: protocolResponse.contentItems
+				});
+				projector?.recordDynamicToolResult({
+					callId: call.callId,
+					tool: call.tool,
+					success: protocolResponse.success,
+					contentItems: protocolResponse.contentItems
+				});
+				if (shouldEmitDynamicToolProgress) emitCodexAppServerEvent(params, {
+					stream: "tool",
+					data: {
+						phase: "result",
+						name: call.tool,
+						toolCallId: call.callId,
+						...toolMeta ? { meta: toolMeta } : {},
+						isError: !protocolResponse.success,
+						result: sanitizeCodexToolResponse(protocolResponse)
+					}
+				});
+				if (!terminalDiagnosticObserved && !hasPendingDynamicToolTerminalDiagnostic({
+					call,
+					runId: params.runId,
+					sessionId: params.sessionId,
+					sessionKey: params.sessionKey
+				})) emitDynamicToolTerminalDiagnostic({
+					response,
+					call,
+					runId: params.runId,
+					sessionId: params.sessionId,
+					sessionKey: params.sessionKey,
+					durationMs: Math.max(0, Date.now() - toolStartedAt)
+				});
+				return protocolResponse;
+			} catch (error) {
+				if (!terminalDiagnosticObserved && !hasPendingDynamicToolTerminalDiagnostic({
+					call,
+					runId: params.runId,
+					sessionId: params.sessionId,
+					sessionKey: params.sessionKey
+				})) emitDynamicToolErrorDiagnostic({
+					call,
+					runId: params.runId,
+					sessionId: params.sessionId,
+					sessionKey: params.sessionKey,
+					durationMs: Math.max(0, Date.now() - toolStartedAt)
+				});
+				throw error;
+			} finally {
+				unsubscribeToolDiagnosticObserver();
+			}
 		} finally {
 			if (requestCountsAsTurnActivity) {
 				activeAppServerTurnRequests = Math.max(0, activeAppServerTurnRequests - 1);
@@ -3700,7 +3838,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		try {
 			const runtimeContext = buildActiveContextEngineRuntimeContext();
 			const overflowTokenCount = params.contextTokenBudget ?? params.contextWindowInfo?.tokens;
-			const compactResult = await activeContextEngine.compact({
+			const compactResult = await compactContextEngineWithSafetyTimeout(activeContextEngine, {
 				sessionId: activeSessionId,
 				sessionKey: sandboxSessionKey,
 				sessionFile: activeSessionFile,
@@ -3712,7 +3850,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					...runtimeContext,
 					currentTokenCount: overflowTokenCount
 				} : runtimeContext
-			});
+			}, resolveCompactionTimeoutMs(params.config), runAbortController.signal);
 			embeddedAgentLog.info("codex app-server context-engine forced compaction result", {
 				sessionId: activeSessionId,
 				sessionKey: sandboxSessionKey,
@@ -3755,6 +3893,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			embeddedAgentLog.warn("context engine assemble failed after forced compaction; using Codex baseline prompt", { error: formatErrorMessage(assembleErr) });
 		}
 		promptBuild = await buildPromptFromCurrentInputs();
+		refreshCodexTurnPromptText();
 	};
 	const buildLlmInputEvent = () => ({
 		runId: params.runId,
@@ -3762,21 +3901,22 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		provider: params.provider,
 		model: params.modelId,
 		systemPrompt: promptBuild.developerInstructions,
-		prompt: promptBuild.prompt,
+		prompt: codexTurnPromptText,
 		historyMessages,
 		imagesCount: params.images?.length ?? 0
 	});
 	const buildTurnStartFailureMessages = () => [...historyMessages, buildCodexUserPromptMessage({
 		...params,
-		prompt: promptBuild.prompt
+		prompt: codexTurnPromptText
 	})];
 	let turn;
 	const startCodexTurn = async () => assertCodexTurnStartResponse(await client.request("turn/start", buildTurnStartParams(params, {
 		threadId: thread.threadId,
 		cwd: effectiveWorkspace,
 		appServer: pluginAppServer,
-		promptText: promptBuild.prompt,
-		sandboxPolicy: codexSandboxPolicy
+		promptText: codexTurnPromptText,
+		sandboxPolicy: codexSandboxPolicy,
+		heartbeatCollaborationInstructions: workspaceBootstrapContext.heartbeatCollaborationInstructions
 	}), {
 		timeoutMs: params.timeoutMs,
 		signal: runAbortController.signal
@@ -3917,7 +4057,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	trajectoryRecorder?.recordEvent("prompt.submitted", {
 		threadId: thread.threadId,
 		turnId: activeTurnId,
-		prompt: promptBuild.prompt,
+		prompt: codexTurnPromptText,
 		imagesCount: params.images?.length ?? 0
 	});
 	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, {
@@ -4258,14 +4398,48 @@ async function handleDynamicToolCallWithTimeout(params) {
 	}
 }
 function failedDynamicToolResponse(message) {
-	return {
-		success: false,
+	const response = {
 		contentItems: [{
 			type: "inputText",
 			text: message
-		}]
+		}],
+		success: false
+	};
+	Object.defineProperty(response, "diagnosticTerminalType", {
+		configurable: true,
+		enumerable: false,
+		value: "error"
+	});
+	return response;
+}
+function toCodexDynamicToolProtocolResponse(response) {
+	return {
+		contentItems: response.contentItems,
+		success: response.success
 	};
 }
+function isDynamicToolTerminalDiagnosticEvent(event) {
+	return event.type === "tool.execution.completed" || event.type === "tool.execution.error" || event.type === "tool.execution.blocked";
+}
+function isMatchingDynamicToolTerminalDiagnostic(params) {
+	if (params.event.toolCallId !== params.call.callId || params.event.toolName !== params.call.tool) return false;
+	if (params.runId !== void 0) return params.event.runId === params.runId;
+	if (params.sessionId !== void 0) return params.event.sessionId === params.sessionId;
+	if (params.sessionKey !== void 0) return params.event.sessionKey === params.sessionKey;
+	return params.event.runId === void 0 && params.event.sessionId === void 0 && params.event.sessionKey === void 0;
+}
+function hasPendingDynamicToolTerminalDiagnostic(params) {
+	return hasPendingInternalDiagnosticEvent((event) => {
+		if (!isDynamicToolTerminalDiagnosticEvent(event)) return false;
+		return isMatchingDynamicToolTerminalDiagnostic({
+			event,
+			call: params.call,
+			runId: params.runId,
+			sessionId: params.sessionId,
+			sessionKey: params.sessionKey
+		});
+	});
+}
 function resolveDynamicToolCallTimeoutMs(params) {
 	return clampDynamicToolTimeoutMs(readDynamicToolCallTimeoutMs(params.call.arguments) ?? readConfiguredDynamicToolTimeoutMs(params.call.tool, params.config) ?? CODEX_DYNAMIC_TOOL_TIMEOUT_MS);
 }
@@ -4276,8 +4450,8 @@ function readDynamicToolCallTimeoutMs(value) {
 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 (!imageGenerationModel || typeof imageGenerationModel !== "object") return CODEX_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS;
+		return readPositiveFiniteTimeoutMs(imageGenerationModel.timeoutMs) ?? CODEX_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS;
 	}
 	if (toolName === "image") return readTimeoutSecondsAsMs(config?.tools?.media?.image?.timeoutSeconds) ?? CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS;
 }
@@ -4335,6 +4509,28 @@ function buildCodexNativeHookRelayId(params) {
 	hash.update(params.sessionKey?.trim() || params.sessionId);
 	return `codex-${hash.digest("hex").slice(0, 40)}`;
 }
+function fingerprintCodexLogValue(namespace, value) {
+	const hash = createHash("sha256");
+	hash.update(namespace);
+	hash.update("\0");
+	hash.update(value);
+	return `sha256:${hash.digest("hex").slice(0, 16)}`;
+}
+function buildCodexPluginThreadConfigEligibilityLogData(params) {
+	return {
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey,
+		enabled: params.pluginThreadConfigRequired,
+		policyConfigured: params.resolvedPluginPolicy?.configured === true,
+		policyEnabled: params.resolvedPluginPolicy?.enabled === true,
+		pluginConfigKeys: params.resolvedPluginPolicy?.pluginPolicies.map((plugin) => plugin.configKey).toSorted(),
+		enabledPluginConfigKeys: params.enabledPluginConfigKeys,
+		appCacheKeyFingerprint: fingerprintCodexLogValue("openclaw:codex:plugin-app-cache-key:v1", params.pluginAppCacheKey),
+		authProfileId: params.startupAuthProfileId,
+		appServerTransport: params.appServer.start.transport,
+		appServerCommandSource: params.appServer.start.commandSource
+	};
+}
 function interruptCodexTurnBestEffort(client, params) {
 	const requestOptions = params.timeoutMs && Number.isFinite(params.timeoutMs) && params.timeoutMs > 0 ? { timeoutMs: params.timeoutMs } : void 0;
 	const requestParams = {
@@ -4385,7 +4581,7 @@ async function buildDynamicTools(input) {
 	const agentDir = params.agentDir ?? resolveAgentDir$1(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({
+	const allTools = createOpenClawCodingTools({
 		agentId: input.sessionAgentId,
 		...buildEmbeddedAttemptToolRunContext(params),
 		exec: {
@@ -4417,8 +4613,9 @@ async function buildDynamicTools(input) {
 			resolvedWorkspace: input.resolvedWorkspace
 		}),
 		config: params.config,
-		authProfileStore: params.authProfileStore,
+		authProfileStore: params.toolAuthProfileStore ?? params.authProfileStore,
 		abortSignal: input.runAbortController.signal,
+		emitBeforeToolCallDiagnostics: false,
 		modelProvider: params.model.provider,
 		modelId: params.modelId,
 		modelCompat: params.model.compat && typeof params.model.compat === "object" ? params.model.compat : void 0,
@@ -4450,7 +4647,8 @@ async function buildDynamicTools(input) {
 			});
 			input.runAbortController.abort("sessions_yield");
 		}
-	}), input.pluginConfig), {
+	});
+	const filteredTools = filterCodexDynamicToolsForAllowlist(filterToolsForVisionInputs(addSandboxShellDynamicToolsIfAvailable(filterCodexDynamicTools(allTools, input.pluginConfig), allTools, input), {
 		modelHasVision,
 		hasInboundImages: (params.images?.length ?? 0) > 0
 	}), includeForcedMessageToolAllow(params.toolsAllow, params));
@@ -4471,10 +4669,14 @@ function includeForcedMessageToolAllow(toolsAllow, params) {
 	if (toolsAllow.length === 0) return ["message"];
 	return new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name))).has("message") ? toolsAllow : [...toolsAllow, "message"];
 }
-function shouldEnableCodexAppServerNativeToolSurface(params) {
+function shouldEnableCodexAppServerNativeToolSurface(params, sandbox) {
 	const toolsAllow = includeForcedMessageToolAllow(params.toolsAllow, params);
-	if (toolsAllow === void 0) return true;
-	return hasWildcardCodexToolsAllow(toolsAllow);
+	if (toolsAllow === void 0) return canCodexAppServerNativeToolSurfaceHonorSandbox(sandbox);
+	return hasWildcardCodexToolsAllow(toolsAllow) && canCodexAppServerNativeToolSurfaceHonorSandbox(sandbox);
+}
+function canCodexAppServerNativeToolSurfaceHonorSandbox(sandbox) {
+	if (!sandbox?.enabled || sandbox.backendId !== "docker") return true;
+	return !hasSandboxBindContainerPathAliases(sandbox.docker.binds) && !hasSandboxBindReadonlyHostShadows(sandbox.docker.binds);
 }
 function disableCodexPluginThreadConfig(pluginConfig) {
 	const config = readCodexPluginConfig(pluginConfig);
@@ -4486,18 +4688,59 @@ function disableCodexPluginThreadConfig(pluginConfig) {
 		}
 	};
 }
+function addSandboxShellDynamicToolsIfAvailable(filteredTools, allTools, input) {
+	if (!shouldExposeSandboxExecDynamicTool(input) || isSandboxShellDynamicToolExcluded(input.pluginConfig)) return filteredTools;
+	const execTool = allTools.find((tool) => normalizeCodexDynamicToolName(tool.name) === "exec");
+	const processTool = allTools.find((tool) => normalizeCodexDynamicToolName(tool.name) === "process");
+	if (!execTool || !processTool) return filteredTools;
+	const sandboxExecTool = {
+		...execTool,
+		name: "sandbox_exec",
+		description: "Run a shell command through OpenClaw's configured sandbox backend for this session. Use only when the command must execute in the OpenClaw sandbox backend, such as an SSH-backed sandbox or Docker container-path bind layout that Codex's native shell cannot represent. Use Codex's native shell for normal local workspace commands.",
+		execute: async (toolCallId, args, signal, onUpdate) => {
+			const result = await execTool.execute(toolCallId, args, signal, onUpdate);
+			return {
+				...result,
+				content: result.content.map((item) => item.type === "text" ? Object.assign({}, item, { text: item.text.replace("Use process (list/poll/log/write/send-keys/submit/paste/kill/clear/remove) for follow-up.", "Use sandbox_process (list/poll/log/write/send-keys/submit/paste/kill/clear/remove) for follow-up.") }) : item)
+			};
+		}
+	};
+	const sandboxProcessTool = {
+		...processTool,
+		name: "sandbox_process",
+		description: "Manage sandbox_exec sessions that were started through OpenClaw's configured sandbox backend for this session: list, poll, log, write, send-keys, submit, paste, kill, clear, or remove. Use only for sandbox_exec follow-up; use Codex's native shell session handling for normal native shell commands."
+	};
+	return [
+		...filteredTools,
+		sandboxExecTool,
+		sandboxProcessTool
+	];
+}
+function shouldExposeSandboxExecDynamicTool(input) {
+	const backendId = input.sandbox?.enabled ? input.sandbox.backendId.trim().toLowerCase() : "";
+	return Boolean(backendId && (backendId !== "docker" || input.nativeToolSurfaceEnabled === false));
+}
+function isSandboxShellDynamicToolExcluded(config) {
+	return (config.codexDynamicToolsExclude ?? []).some((name) => {
+		const normalized = normalizeCodexDynamicToolName(name);
+		return normalized === "exec" || normalized === "sandbox_exec" || normalized === "process" || normalized === "sandbox_process";
+	});
+}
 function filterCodexDynamicToolsForAllowlist(tools, toolsAllow) {
 	if (!toolsAllow) return tools;
 	if (toolsAllow.length === 0) return [];
 	if (hasWildcardCodexToolsAllow(toolsAllow)) return tools;
 	const allowSet = new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name)).filter(Boolean));
-	return tools.filter((tool) => allowSet.has(normalizeCodexDynamicToolName(tool.name)));
+	return tools.filter((tool) => {
+		const normalized = normalizeCodexDynamicToolName(tool.name);
+		return allowSet.has(normalized) || normalized === "sandbox_exec" && allowSet.has("exec") || normalized === "sandbox_process" && (allowSet.has("exec") || allowSet.has("process"));
+	});
 }
 function hasWildcardCodexToolsAllow(toolsAllow) {
 	return toolsAllow.some((name) => normalizeCodexDynamicToolName(name) === "*");
 }
 function shouldForceMessageTool(params) {
-	return params.sourceReplyDeliveryMode === "message_tool_only";
+	return params.disableMessageTool !== true && params.sourceReplyDeliveryMode === "message_tool_only";
 }
 function shouldProjectMirroredHistoryForCodexStart(params) {
 	if (!params.historyMessages.some((message) => message.role === "user")) return false;
@@ -4759,10 +5002,10 @@ function readNotificationItemId(notification) {
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	return (item ? readString(item, "id") : void 0) ?? readString(notification.params, "itemId") ?? readString(notification.params, "id");
 }
-function isTrackedOpenClawDynamicToolCompletionNotification(notification, activeOpenClawDynamicToolCallIds) {
+function isPendingOpenClawDynamicToolCompletionNotification(notification, pendingOpenClawDynamicToolCompletionIds) {
 	if (notification.method !== "item/completed" || !isJsonObject(notification.params)) return false;
 	const itemId = readNotificationItemId(notification);
-	if (!itemId || !activeOpenClawDynamicToolCallIds.has(itemId)) return false;
+	if (!itemId || !pendingOpenClawDynamicToolCompletionIds.has(itemId)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	const itemType = item ? readString(item, "type") : void 0;
 	return itemType === void 0 || itemType === "dynamicToolCall";
@@ -4840,7 +5083,8 @@ function isCodexTurnAbortMarkerNotification(notification, options = {}) {
 	const role = isJsonObject(item) ? readString(item, "role") : void 0;
 	if (!isJsonObject(item) || role !== "user" && role !== "developer") return false;
 	const text = extractRawResponseItemText(item).trim();
-	if (role === "user" && text === options.currentPromptText?.trim()) return false;
+	const currentPromptTexts = [options.currentPromptText, ...options.currentPromptTexts ?? []].filter(isNonEmptyString).map((prompt) => prompt.trim());
+	if (role === "user" && currentPromptTexts.includes(text)) return false;
 	const markerBody = readCodexTurnAbortMarkerBody(text);
 	return markerBody === CODEX_INTERRUPTED_USER_GUIDANCE || markerBody === CODEX_INTERRUPTED_DEVELOPER_GUIDANCE;
 }
@@ -4889,10 +5133,18 @@ async function buildCodexWorkspaceBootstrapContext(params) {
 			sourceWorkspaceDir: params.resolvedWorkspace,
 			targetWorkspaceDir: params.effectiveWorkspace
 		}));
+		const promptContextFiles = selectCodexWorkspacePromptContextFiles(contextFiles);
+		const developerInstructionFiles = shouldInjectCodexOpenClawPromptContext(params.params) ? selectCodexWorkspaceDeveloperInstructionFiles(contextFiles) : [];
+		const heartbeatReferenceFiles = selectCodexWorkspaceHeartbeatReferenceFiles(contextFiles);
 		return {
 			...bootstrapContext,
 			contextFiles,
-			instructions: renderCodexWorkspaceBootstrapInstructions(contextFiles)
+			promptContextFiles,
+			developerInstructionFiles,
+			heartbeatReferenceFiles,
+			promptContext: renderCodexWorkspaceBootstrapPromptContext(promptContextFiles),
+			developerInstructions: renderCodexWorkspaceDeveloperInstructions(developerInstructionFiles),
+			heartbeatCollaborationInstructions: renderCodexWorkspaceHeartbeatReference(heartbeatReferenceFiles)
 		};
 	} catch (error) {
 		embeddedAgentLog.warn("failed to load codex workspace bootstrap instructions", { error });
@@ -4905,7 +5157,7 @@ async function buildCodexWorkspaceBootstrapContext(params) {
 function buildCodexSystemPromptReport(params) {
 	const toolEntries = params.tools.map(buildCodexToolReportEntry);
 	const schemaChars = toolEntries.reduce((sum, tool) => sum + tool.schemaChars, 0);
-	const projectContextChars = params.workspaceBootstrapContext.instructions?.length ?? 0;
+	const skillsPrompt = params.skillsPrompt.trim();
 	const bootstrapMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapMaxChars);
 	const bootstrapTotalMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapTotalMaxChars);
 	return {
@@ -4920,16 +5172,17 @@ function buildCodexSystemPromptReport(params) {
 		...bootstrapTotalMaxChars ? { bootstrapTotalMaxChars } : {},
 		systemPrompt: {
 			chars: params.developerInstructions.length,
-			projectContextChars,
-			nonProjectContextChars: Math.max(0, params.developerInstructions.length - projectContextChars)
+			projectContextChars: 0,
+			nonProjectContextChars: params.developerInstructions.length
 		},
 		injectedWorkspaceFiles: buildCodexBootstrapInjectionStats({
 			bootstrapFiles: params.workspaceBootstrapContext.bootstrapFiles,
-			injectedFiles: params.workspaceBootstrapContext.contextFiles
+			injectedFiles: params.workspaceBootstrapContext.promptContextFiles ?? [],
+			developerInstructionFiles: params.workspaceBootstrapContext.developerInstructionFiles ?? []
 		}),
 		skills: {
-			promptChars: 0,
-			entries: []
+			promptChars: skillsPrompt.length,
+			entries: buildCodexSkillReportEntries(skillsPrompt)
 		},
 		tools: {
 			listChars: 0,
@@ -4938,6 +5191,13 @@ function buildCodexSystemPromptReport(params) {
 		}
 	};
 }
+function buildCodexSkillReportEntries(skillsPrompt) {
+	if (!skillsPrompt) return [];
+	return Array.from(skillsPrompt.matchAll(/<skill>[\s\S]*?<\/skill>/gi)).map((match) => match[0] ?? "").map((block) => ({
+		name: block.match(/<name>\s*([^<]+?)\s*<\/name>/i)?.[1]?.trim() || "(unknown)",
+		blockChars: block.length
+	})).filter((entry) => entry.blockChars > 0);
+}
 function buildCodexToolReportEntry(tool) {
 	const summary = tool.description.trim();
 	if (tool.deferLoading === true) return {
@@ -4967,54 +5227,145 @@ function buildCodexToolSchemaStats(schema) {
 	};
 }
 function buildCodexBootstrapInjectionStats(params) {
-	const injectedByPath = /* @__PURE__ */ new Map();
-	const injectedByBaseName = /* @__PURE__ */ new Map();
-	for (const file of params.injectedFiles) {
-		const pathValue = readNonEmptyString(file.path);
-		if (!pathValue) continue;
-		if (!injectedByPath.has(pathValue)) injectedByPath.set(pathValue, file.content);
-		const baseName = path.posix.basename(pathValue.replaceAll("\\", "/"));
-		if (!injectedByBaseName.has(baseName)) injectedByBaseName.set(baseName, file.content);
-	}
+	const injectedIndex = indexCodexContextFileContent(params.injectedFiles);
+	const developerInstructionIndex = indexCodexContextFileContent(params.developerInstructionFiles ?? []);
 	return params.bootstrapFiles.map((file) => {
 		const pathValue = readNonEmptyString(file.path) ?? file.name;
+		const baseName = getCodexContextFileBasename(pathValue || file.name);
 		const rawChars = file.missing ? 0 : (file.content ?? "").trimEnd().length;
-		const injectedChars = (injectedByPath.get(pathValue) ?? injectedByPath.get(file.name) ?? injectedByBaseName.get(file.name))?.length ?? 0;
+		const injected = readCodexIndexedContextFileContent(injectedIndex, pathValue, file.name) ?? readCodexIndexedContextFileContent(developerInstructionIndex, pathValue, file.name);
+		let injectedChars = injected?.length ?? 0;
+		let truncated = !file.missing && injectedChars < rawChars;
+		if (injected === void 0) {
+			if (CODEX_NATIVE_PROJECT_DOC_BASENAMES.has(baseName)) {
+				injectedChars = rawChars;
+				truncated = false;
+			} else if (baseName === CODEX_HEARTBEAT_CONTEXT_BASENAME) {
+				injectedChars = 0;
+				truncated = false;
+			}
+		}
 		return {
 			name: file.name,
 			path: pathValue,
 			missing: file.missing,
 			rawChars,
 			injectedChars,
-			truncated: !file.missing && injectedChars < rawChars
+			truncated
 		};
 	});
 }
+function indexCodexContextFileContent(files) {
+	const byPath = /* @__PURE__ */ new Map();
+	const byBaseName = /* @__PURE__ */ new Map();
+	for (const file of files) {
+		const pathValue = readNonEmptyString(file.path);
+		if (!pathValue) continue;
+		if (!byPath.has(pathValue)) byPath.set(pathValue, file.content);
+		const baseName = getCodexContextFileBasename(pathValue);
+		if (baseName && !byBaseName.has(baseName)) byBaseName.set(baseName, file.content);
+	}
+	return {
+		byPath,
+		byBaseName
+	};
+}
+function readCodexIndexedContextFileContent(index, pathValue, fileName) {
+	return index.byPath.get(pathValue) ?? index.byPath.get(fileName) ?? index.byBaseName.get(getCodexContextFileBasename(fileName));
+}
 function readPositiveNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : void 0;
 }
 function readNonEmptyString(value) {
 	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
-function renderCodexWorkspaceBootstrapInstructions(contextFiles) {
-	const files = contextFiles.filter((file) => {
-		const baseName = getCodexContextFileBasename(file.path);
-		return baseName && !CODEX_NATIVE_PROJECT_DOC_BASENAMES.has(baseName);
-	}).toSorted(compareCodexContextFiles);
+function buildCodexOpenClawPromptContext(params) {
+	if (!shouldInjectCodexOpenClawPromptContext(params.params)) return;
+	const sections = [params.skillsPrompt?.trim() ? [
+		"## OpenClaw Skills",
+		"",
+		params.skillsPrompt.trim()
+	].join("\n") : void 0, params.workspacePromptContext?.trim() ? [
+		"## OpenClaw Workspace Context",
+		"",
+		params.workspacePromptContext.trim()
+	].join("\n") : void 0].filter(isNonEmptyString);
+	if (sections.length === 0) return;
+	return [
+		"OpenClaw runtime context for this turn:",
+		"Treat this OpenClaw-provided context as supporting project/user reference for the current request.",
+		"",
+		...sections
+	].join("\n");
+}
+function shouldInjectCodexOpenClawPromptContext(params) {
+	return !(params.bootstrapContextMode === "lightweight" && params.bootstrapContextRunKind === "cron");
+}
+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");
+	return [
+		context.trim(),
+		"",
+		promptSection
+	].join("\n");
+}
+function renderCodexWorkspaceBootstrapPromptContext(contextFiles) {
+	const files = selectCodexWorkspacePromptContextFiles(contextFiles);
 	if (files.length === 0) return;
-	const hasSoulFile = files.some((file) => getCodexContextFileBasename(file.path) === "soul.md");
 	const lines = [
-		"OpenClaw loaded these user-editable workspace files. Treat them as project/user context. Codex loads AGENTS.md natively, so AGENTS.md is not repeated here.",
+		"OpenClaw loaded these user-editable workspace files for the current turn. Codex loads AGENTS.md natively. SOUL.md, IDENTITY.md, TOOLS.md, and USER.md are provided separately as Codex developer instructions. HEARTBEAT.md is handled by heartbeat collaboration-mode guidance. Those files are not repeated here.",
 		"",
 		"# Project Context",
 		"",
 		"The following project context files have been loaded:"
 	];
-	if (hasSoulFile) lines.push("SOUL.md: persona/tone. Follow it unless higher-priority instructions override.");
 	lines.push("");
 	for (const file of files) lines.push(`## ${file.path}`, "", file.content, "");
 	return lines.join("\n").trim();
 }
+function selectCodexWorkspacePromptContextFiles(contextFiles) {
+	return contextFiles.filter((file) => {
+		const baseName = getCodexContextFileBasename(file.path);
+		return baseName && !CODEX_NATIVE_PROJECT_DOC_BASENAMES.has(baseName) && !CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES.has(baseName) && baseName !== CODEX_HEARTBEAT_CONTEXT_BASENAME && !isMissingCodexBootstrapContextFile(file);
+	}).toSorted(compareCodexContextFiles);
+}
+function selectCodexWorkspaceDeveloperInstructionFiles(contextFiles) {
+	return contextFiles.filter((file) => {
+		const baseName = getCodexContextFileBasename(file.path);
+		return baseName && CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES.has(baseName) && !isMissingCodexBootstrapContextFile(file) && file.content.trim().length > 0;
+	}).toSorted(compareCodexContextFiles);
+}
+function renderCodexWorkspaceDeveloperInstructions(files) {
+	if (files.length === 0) return;
+	const lines = [
+		"## OpenClaw Agent Soul",
+		"",
+		"OpenClaw loaded these workspace instruction files from the active agent workspace. They define who you are, how you work, what tools are available, and the human you work alongside. Internalize and follow them accordingly.",
+		""
+	];
+	for (const file of files) lines.push(`### ${file.path}`, "", file.content, "");
+	return lines.join("\n").trim();
+}
+function selectCodexWorkspaceHeartbeatReferenceFiles(contextFiles) {
+	return contextFiles.filter((file) => {
+		return getCodexContextFileBasename(file.path) === CODEX_HEARTBEAT_CONTEXT_BASENAME && !isMissingCodexBootstrapContextFile(file) && file.content.trim().length > 0;
+	}).toSorted(compareCodexContextFiles);
+}
+function renderCodexWorkspaceHeartbeatReference(files) {
+	if (files.length === 0) return;
+	const lines = [
+		"## OpenClaw Heartbeat Workspace",
+		"",
+		"HEARTBEAT.md exists in the active agent workspace. Read it before proceeding with this heartbeat, then decide what action is appropriate.",
+		""
+	];
+	for (const file of files) lines.push(`- ${file.path}`);
+	return lines.join("\n").trim();
+}
+function isMissingCodexBootstrapContextFile(file) {
+	return file.content.trimStart().startsWith("[MISSING] Expected at:");
+}
 function remapCodexContextFilePath(params) {
 	const relativePath = path.relative(params.sourceWorkspaceDir, params.file.path);
 	if (!relativePath || relativePath === ".." || relativePath.startsWith(`..${path.sep}`) || path.isAbsolute(relativePath) || params.sourceWorkspaceDir === params.targetWorkspaceDir) return params.file;