@openclaw/codex 2026.5.14-beta.2 → 2026.5.16-beta.2

package/dist/{run-attempt-DG9NQab2.js → run-attempt-B6gN6CrO.js}

@@ -1,28 +1,28 @@
-import { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, u as withMcpElicitationsApprovalPolicy } from "./config-0rd3LnKg.js";
+import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-3ATInASk.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CSY0BFBo.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CoctX13d.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-CKYiRqsN.js";
-import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-DRJaVHhN.js";
-import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, l as resolveCodexAppServerAuthProfileId, n as clearSharedCodexAppServerClientIfCurrent, s as refreshCodexAppServerAuthTokens, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-BwUqd3lh.js";
-import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { a as defaultCodexAppInventoryCache } from "./plugin-activation-aQOmRQwA.js";
-import { _ as resolveCodexContextEngineProjectionReserveTokens, b as normalizeCodexDynamicToolName, d as buildCodexPluginThreadConfig, f as buildCodexPluginThreadConfigInputFingerprint, g as resolveCodexContextEngineProjectionMaxChars, h as projectContextEngineAssemblyForCodex, m as shouldBuildCodexPluginThreadConfig, o as buildTurnStartParams, p as mergeCodexThreadConfigs, r as buildDeveloperInstructions, s as codexDynamicToolsFingerprint, t as areCodexDynamicToolFingerprintsCompatible, u as startOrResumeThread, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-DrbViNpf.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-Be6RD28K.js";
-import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-CzTdigBu.js";
-import { t as ensureCodexComputerUse } from "./computer-use-DsJxRRtm.js";
+import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CA7amCZ8.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-Czoa60Nt.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, l as resolveCodexAppServerAuthProfileId, n as clearSharedCodexAppServerClientIfCurrent, s as refreshCodexAppServerAuthTokens, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CnbrvEfV.js";
+import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DbdVqMzW.js";
+import { a as defaultCodexAppInventoryCache } from "./plugin-activation-BDU4e-NA.js";
+import { S as normalizeCodexDynamicToolName, _ 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, x as filterCodexDynamicTools, y as resolveCodexContextEngineProjectionReserveTokens } from "./thread-lifecycle-BMK4m_PL.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-DwzPofwS.js";
+import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-Cm_YicZb.js";
+import { t as ensureCodexComputerUse } from "./computer-use-BX02ojP4.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, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, loadCodexBundleMcpThreadConfig, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockAcquireTimeoutMs, 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, 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, resolveSessionWriteLockAcquireTimeoutMs, resolveUserPath, 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 { createRunningTaskRun, finalizeTaskRunByRunId, recordTaskRunProgressByRunId } from "openclaw/plugin-sdk/codex-native-task-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@earendil-works/pi-coding-agent";
-import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/codex/src/app-server/native-subagent-task-mirror.ts
 const CODEX_NATIVE_SUBAGENT_RUNTIME = "subagent";
 const CODEX_NATIVE_SUBAGENT_TASK_KIND = "codex-native";
@@ -347,6 +347,41 @@ function inferCodexDynamicToolMeta(call, detailMode) {
 //#endregion
 //#region extensions/codex/src/app-server/transcript-mirror.ts
 const MIRROR_IDENTITY_META_KEY = "mirrorIdentity";
+function normalizeOptionalString(value) {
+	const normalized = value?.trim();
+	return normalized ? normalized : void 0;
+}
+function buildSenderLabel(params) {
+	const label = params.senderName ?? params.senderUsername ?? params.senderE164 ?? params.senderId;
+	if (!label) return;
+	if (!params.senderId || label.includes(params.senderId)) return label;
+	return `${label} (${params.senderId})`;
+}
+function buildCodexUserPromptMessage(params) {
+	const senderId = normalizeOptionalString(params.senderId);
+	const senderName = normalizeOptionalString(params.senderName);
+	const senderUsername = normalizeOptionalString(params.senderUsername);
+	const senderE164 = normalizeOptionalString(params.senderE164);
+	const senderLabel = buildSenderLabel({
+		senderId,
+		senderName,
+		senderUsername,
+		senderE164
+	});
+	const sourceChannel = normalizeOptionalString(params.inputProvenance?.sourceChannel ?? params.messageChannel ?? params.messageProvider);
+	return {
+		role: "user",
+		content: params.prompt,
+		timestamp: Date.now(),
+		...params.inputProvenance ? { provenance: params.inputProvenance } : {},
+		...sourceChannel ? { sourceChannel } : {},
+		...senderId ? { senderId } : {},
+		...senderName ? { senderName } : {},
+		...senderUsername ? { senderUsername } : {},
+		...senderE164 ? { senderE164 } : {},
+		...senderLabel ? { senderLabel } : {}
+	};
+}
 /**
 * Tag a message with a stable logical identity for mirror dedupe. Callers
 * should use a value that is invariant for the same logical message across
@@ -596,11 +631,7 @@ var CodexAppServerEventProjector = class {
 		const planText = collectTextValues(this.planTextByItem).join("\n\n");
 		const lastAssistant = assistantTexts.length > 0 ? this.createAssistantMessage(assistantTexts.join("\n\n")) : void 0;
 		const turnId = this.turnId;
-		const messagesSnapshot = [attachCodexMirrorIdentity({
-			role: "user",
-			content: this.params.prompt,
-			timestamp: Date.now()
-		}, `${turnId}:prompt`)];
+		const messagesSnapshot = [attachCodexMirrorIdentity(buildCodexUserPromptMessage(this.params), `${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);
@@ -1701,27 +1732,45 @@ const CODEX_HOOK_EVENT_BY_NATIVE_EVENT = {
 	permission_request: "PermissionRequest",
 	before_agent_finalize: "Stop"
 };
+const CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT = {
+	pre_tool_use: "pre_tool_use",
+	post_tool_use: "post_tool_use",
+	permission_request: "permission_request",
+	before_agent_finalize: "stop"
+};
+const CODEX_SESSION_FLAGS_HOOK_SOURCE_PATHS = ["/<session-flags>/config.toml", "<session-flags>/config.toml"];
 function buildCodexNativeHookRelayConfig(params) {
 	const events = params.events?.length ? params.events : CODEX_NATIVE_HOOK_RELAY_EVENTS;
-	const config = { "features.codex_hooks": true };
+	const config = { "features.hooks": true };
+	const hookState = {};
 	for (const event of events) {
 		const codexEvent = CODEX_HOOK_EVENT_BY_NATIVE_EVENT[event];
-		config[`hooks.${codexEvent}`] = [{
-			matcher: null,
-			hooks: [{
-				type: "command",
-				command: params.relay.commandForEvent(event),
-				timeout: normalizeHookTimeoutSec(params.hookTimeoutSec),
-				async: false,
+		const command = params.relay.commandForEvent(event);
+		const timeout = normalizeHookTimeoutSec(params.hookTimeoutSec);
+		config[`hooks.${codexEvent}`] = [{ hooks: [{
+			type: "command",
+			command,
+			timeout,
+			async: false,
+			statusMessage: "OpenClaw native hook relay"
+		}] }];
+		const state = {
+			enabled: true,
+			trusted_hash: codexCommandHookTrustedHash({
+				event,
+				command,
+				timeout,
 				statusMessage: "OpenClaw native hook relay"
-			}]
-		}];
+			})
+		};
+		for (const sourcePath of CODEX_SESSION_FLAGS_HOOK_SOURCE_PATHS) hookState[`${sourcePath}:${CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT[event]}:0:0`] = state;
 	}
+	config["hooks.state"] = hookState;
 	return config;
 }
 function buildCodexNativeHookRelayDisabledConfig() {
 	return {
-		"features.codex_hooks": false,
+		"features.hooks": false,
 		"hooks.PreToolUse": [],
 		"hooks.PostToolUse": [],
 		"hooks.PermissionRequest": [],
@@ -1731,6 +1780,26 @@ function buildCodexNativeHookRelayDisabledConfig() {
 function normalizeHookTimeoutSec(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.ceil(value) : 5;
 }
+function codexCommandHookTrustedHash(params) {
+	const identity = {
+		event_name: CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT[params.event],
+		hooks: [{
+			async: false,
+			command: params.command,
+			statusMessage: params.statusMessage,
+			timeout: params.timeout,
+			type: "command"
+		}]
+	};
+	return `sha256:${createHash("sha256").update(JSON.stringify(sortJsonValue(identity))).digest("hex")}`;
+}
+function sortJsonValue(value) {
+	if (!value || typeof value !== "object") return value;
+	if (Array.isArray(value)) return value.map(sortJsonValue);
+	const sorted = {};
+	for (const key of Object.keys(value).toSorted()) sorted[key] = sortJsonValue(value[key]);
+	return sorted;
+}
 //#endregion
 //#region extensions/codex/src/app-server/trajectory.ts
 const SENSITIVE_FIELD_RE = /(?:authorization|cookie|credential|key|password|passwd|secret|token)/iu;
@@ -2284,6 +2353,22 @@ function restrictCodexAppServerSandboxForOpenClawSandbox(appServer, sandbox) {
 		sandbox: "workspace-write"
 	};
 }
+function resolveCodexAppServerForOpenClawToolPolicy(params) {
+	if (!params.shouldPromote || !params.canUseUntrustedApprovalPolicy || params.appServer.approvalPolicy !== "never") return params.appServer;
+	const explicitMode = params.pluginConfig.appServer?.mode !== void 0 || isCodexAppServerPolicyMode(params.env.OPENCLAW_CODEX_APP_SERVER_MODE);
+	const explicitApprovalPolicy = params.pluginConfig.appServer?.approvalPolicy !== void 0 || isCodexAppServerApprovalPolicy(params.env.OPENCLAW_CODEX_APP_SERVER_APPROVAL_POLICY);
+	if (explicitMode || explicitApprovalPolicy) return params.appServer;
+	return {
+		...params.appServer,
+		approvalPolicy: "untrusted"
+	};
+}
+function isCodexAppServerPolicyMode(value) {
+	return value === "guardian" || value === "yolo";
+}
+function isCodexAppServerApprovalPolicy(value) {
+	return value === "never" || value === "on-request" || value === "on-failure" || value === "untrusted";
+}
 async function runCodexAppServerAttempt(params, options = {}) {
 	const attemptStartedAt = Date.now();
 	const attemptClientFactory = options.clientFactory ?? defaultCodexAppServerClientFactory;
@@ -2299,7 +2384,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	const effectiveWorkspace = sandbox?.enabled ? sandbox.workspaceAccess === "rw" ? resolvedWorkspace : sandbox.workspaceDir : resolvedWorkspace;
 	await fs.mkdir(effectiveWorkspace, { recursive: true });
-	const appServer = restrictCodexAppServerSandboxForOpenClawSandbox(configuredAppServer, sandbox);
+	const appServer = resolveCodexAppServerForOpenClawToolPolicy({
+		appServer: restrictCodexAppServerSandboxForOpenClawSandbox(configuredAppServer, sandbox),
+		pluginConfig,
+		env: process.env,
+		shouldPromote: hasBeforeToolCallPolicy(),
+		canUseUntrustedApprovalPolicy: configuredAppServer.start.transport !== "stdio" || isCodexAppServerApprovalPolicyAllowedByRequirements("untrusted")
+	});
 	let pluginAppServer = appServer;
 	const nativeHookRelayEvents = resolveCodexNativeHookRelayEvents({
 		configuredEvents: options.nativeHookRelay?.events,
@@ -2333,6 +2424,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		sessionKey: sandboxSessionKey,
 		...startupAuthProfileId ? { authProfileId: startupAuthProfileId } : {}
 	};
+	let activeSessionId = params.sessionId;
+	let activeSessionFile = params.sessionFile;
+	const buildActiveRunAttemptParams = () => ({
+		...runtimeParams,
+		sessionId: activeSessionId,
+		sessionFile: activeSessionFile
+	});
+	const adoptContextEngineCompactionTranscript = (compactResult) => {
+		if (compactResult.result?.sessionId) activeSessionId = compactResult.result.sessionId;
+		if (compactResult.result?.sessionFile) activeSessionFile = compactResult.result.sessionFile;
+	};
 	const startupAuthAccountCacheKey = await resolveCodexAppServerAuthAccountCacheKey({
 		authProfileId: startupAuthProfileId,
 		authProfileStore: params.authProfileStore,
@@ -2375,8 +2477,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			runId: params.runId
 		}
 	});
-	const hadSessionFile = await pathExists(params.sessionFile);
-	let historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? [];
+	const hadSessionFile = await pathExists(activeSessionFile);
+	let historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? [];
 	const hookContextWindowFields = {
 		...params.contextWindowInfo?.tokens ? { contextTokenBudget: params.contextWindowInfo.tokens } : params.contextTokenBudget ? { contextTokenBudget: params.contextTokenBudget } : {},
 		...params.contextWindowInfo?.source ? { contextWindowSource: params.contextWindowInfo.source } : {},
@@ -2393,24 +2495,28 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		channelId: params.messageChannel ?? params.messageProvider ?? void 0,
 		...hookContextWindowFields
 	};
+	const activeContextEnginePluginId = activeContextEngine ? resolveContextEngineOwnerPluginId(activeContextEngine) : void 0;
+	const buildActiveContextEngineRuntimeContext = () => buildHarnessContextEngineRuntimeContext({
+		attempt: buildActiveRunAttemptParams(),
+		workspaceDir: effectiveWorkspace,
+		agentDir,
+		activeAgentId: sessionAgentId,
+		contextEnginePluginId: activeContextEnginePluginId,
+		tokenBudget: params.contextTokenBudget
+	});
 	if (activeContextEngine) {
 		await bootstrapHarnessContextEngine({
 			hadSessionFile,
 			contextEngine: activeContextEngine,
-			sessionId: params.sessionId,
+			sessionId: activeSessionId,
 			sessionKey: sandboxSessionKey,
-			sessionFile: params.sessionFile,
-			runtimeContext: buildHarnessContextEngineRuntimeContext({
-				attempt: runtimeParams,
-				workspaceDir: effectiveWorkspace,
-				agentDir,
-				tokenBudget: params.contextTokenBudget
-			}),
+			sessionFile: activeSessionFile,
+			runtimeContext: buildActiveContextEngineRuntimeContext(),
 			runMaintenance: runHarnessContextEngineMaintenance,
 			config: params.config,
 			warn: (message) => embeddedAgentLog.warn(message)
 		});
-		historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? historyMessages;
+		historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages;
 	}
 	const baseDeveloperInstructions = buildDeveloperInstructions(params);
 	const workspaceBootstrapContext = await buildCodexWorkspaceBootstrapContext({
@@ -2424,10 +2530,18 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let promptText = params.prompt;
 	let developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
 	let prePromptMessageCount = historyMessages.length;
-	if (activeContextEngine) try {
+	let contextEngineProjection;
+	const resetCodexPromptInputs = () => {
+		promptText = params.prompt;
+		developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
+		prePromptMessageCount = historyMessages.length;
+		contextEngineProjection = void 0;
+	};
+	const applyActiveContextEngineProjection = async (decisionStartupBinding) => {
+		if (!activeContextEngine) return;
 		const assembled = await assembleHarnessContextEngine({
 			contextEngine: activeContextEngine,
-			sessionId: params.sessionId,
+			sessionId: activeSessionId,
 			sessionKey: sandboxSessionKey,
 			messages: historyMessages,
 			tokenBudget: params.contextTokenBudget,
@@ -2437,6 +2551,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			prompt: params.prompt
 		});
 		if (!assembled) throw new Error("context engine assemble returned no result");
+		contextEngineProjection = readContextEngineThreadBootstrapProjection(assembled.contextProjection);
 		const projection = projectContextEngineAssemblyForCodex({
 			assembledMessages: assembled.messages,
 			originalHistoryMessages: historyMessages,
@@ -2445,11 +2560,41 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			maxRenderedContextChars: resolveCodexContextEngineProjectionMaxChars({
 				contextTokenBudget: params.contextTokenBudget,
 				reserveTokens: resolveCodexContextEngineProjectionReserveTokens({ config: params.config })
-			})
+			}),
+			toolPayloadMode: contextEngineProjection ? "preserve" : "elide"
 		});
-		promptText = projection.promptText;
+		const projectionDecision = contextEngineProjection ? resolveContextEngineBootstrapProjectionDecision({
+			startupBinding: decisionStartupBinding,
+			expectedBinding: buildContextEngineBinding(buildActiveRunAttemptParams(), contextEngineProjection),
+			projection: contextEngineProjection,
+			dynamicToolsFingerprint: codexDynamicToolsFingerprint(toolBridge.specs)
+		}) : {
+			project: true,
+			reason: "per-turn-projection"
+		};
+		embeddedAgentLog.info("codex app-server context-engine projection decision", {
+			sessionId: params.sessionId,
+			sessionKey: sandboxSessionKey,
+			engineId: activeContextEngine.info.id,
+			mode: contextEngineProjection?.mode ?? assembled.contextProjection?.mode ?? "per_turn",
+			epoch: contextEngineProjection?.epoch,
+			fingerprint: contextEngineProjection?.fingerprint,
+			previousThreadId: decisionStartupBinding?.threadId,
+			previousEpoch: decisionStartupBinding?.contextEngine?.projection?.epoch,
+			previousFingerprint: decisionStartupBinding?.contextEngine?.projection?.fingerprint,
+			projected: projectionDecision.project,
+			reason: projectionDecision.reason,
+			assembledMessages: assembled.messages.length,
+			originalHistoryMessages: historyMessages.length,
+			projectedPromptChars: projection.promptText.length,
+			developerInstructionAdditionChars: projection.developerInstructionAddition?.length ?? 0
+		});
+		promptText = projectionDecision.project ? projection.promptText : params.prompt;
 		developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions, projection.developerInstructionAddition);
 		prePromptMessageCount = projection.prePromptMessageCount;
+	};
+	if (activeContextEngine) try {
+		await applyActiveContextEngineProjection(startupBinding);
 	} catch (assembleErr) {
 		embeddedAgentLog.warn("context engine assemble failed; using Codex baseline prompt", { error: formatErrorMessage(assembleErr) });
 	}
@@ -2466,13 +2611,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		promptText = projection.promptText;
 		prePromptMessageCount = projection.prePromptMessageCount;
 	}
-	promptText = prependCurrentTurnContext(promptText, params.currentTurnContext);
-	const promptBuild = await resolveAgentHarnessBeforePromptBuildResult({
-		prompt: promptText,
+	const buildPromptFromCurrentInputs = () => resolveAgentHarnessBeforePromptBuildResult({
+		prompt: prependCurrentTurnContext(promptText, params.currentTurnContext),
 		developerInstructions,
 		messages: historyMessages,
 		ctx: hookContext
 	});
+	let promptBuild = await buildPromptFromCurrentInputs();
 	const systemPromptReport = buildCodexSystemPromptReport({
 		attempt: params,
 		sessionKey: sandboxSessionKey,
@@ -2554,9 +2699,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						timeoutMs: appServer.requestTimeoutMs,
 						signal: runAbortController.signal
 					});
-					const threadLifecycleParams = {
+					const buildThreadLifecycleParams = () => ({
 						client: startupClient,
-						params: runtimeParams,
+						params: buildActiveRunAttemptParams(),
+						agentId: sessionAgentId,
 						cwd: effectiveWorkspace,
 						dynamicTools: toolBridge.specs,
 						appServer: pluginAppServer,
@@ -2564,6 +2710,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						config: threadConfig,
 						mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
 						mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
+						contextEngineProjection,
 						pluginThreadConfig: pluginThreadConfigEnabled ? {
 							enabled: true,
 							inputFingerprint: pluginThreadConfigInputFingerprint,
@@ -2578,11 +2725,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 								appCacheKey: pluginAppCacheKey
 							})
 						} : void 0
-					};
-					restartContextEngineCodexThread = () => startOrResumeThread(threadLifecycleParams);
+					});
+					restartContextEngineCodexThread = () => startOrResumeThread(buildThreadLifecycleParams());
 					return {
 						client: startupClient,
-						thread: await startOrResumeThread(threadLifecycleParams)
+						thread: await startOrResumeThread(buildThreadLifecycleParams())
 					};
 				};
 				for (let attempt = 1; attempt <= CODEX_APP_SERVER_STARTUP_CONNECTION_CLOSE_MAX_ATTEMPTS; attempt += 1) try {
@@ -2916,6 +3063,9 @@ 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 rawToolOutputCompletion = isRawToolOutputCompletionNotification(notification);
+		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !isCompletedAssistantNotification(notification);
 		if (isCurrentTurnNotification && notification.method === "error") {
 			if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
 			else armTurnCompletionIdleWatch({ pinnedByTerminalError: true });
@@ -2923,11 +3073,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		} else if (isTurnCompletion) disarmTurnAssistantCompletionIdleWatch();
 		else if (isCurrentTurnNotification && isCompletedAssistantNotification(notification)) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
 		else if (unblockedAssistantCompletionRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+		else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) armTurnCompletionIdleWatch();
+		else if (isCurrentTurnNotification && rawToolOutputCompletion) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && shouldDisarmAssistantCompletionIdleWatch(notification)) disarmTurnAssistantCompletionIdleWatch();
-		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !isTrackedOpenClawDynamicToolCompletionNotification(notification, activeOpenClawDynamicToolCallIds)) disarmTurnCompletionIdleWatch();
+		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
 		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
 		const isTurnTerminal = isTurnCompletion || isTurnAbortMarker;
 		try {
+			await waitForCodexNotificationDispatchTurn();
 			await projector.handleNotification(notification);
 		} catch (error) {
 			embeddedAgentLog.debug("codex app-server projector notification threw", {
@@ -2947,6 +3100,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 	};
 	const enqueueNotification = (notification) => {
+		if (!projector || !turnId) {
+			userInputBridge?.handleNotification(notification);
+			pendingNotifications.push(notification);
+			return Promise.resolve();
+		}
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
@@ -3079,7 +3237,76 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			touchTurnCompletionActivity(`request:${request.method}:response`, { arm: armCompletionWatchOnResponse });
 		}
 	});
-	const llmInputEvent = {
+	const forceContextEngineCompactionForCodexOverflow = async (error) => {
+		if (!activeContextEngine?.info.ownsCompaction) return false;
+		embeddedAgentLog.warn("codex app-server context-engine turn overflowed; forcing context-engine compaction", {
+			sessionId: activeSessionId,
+			sessionKey: sandboxSessionKey,
+			threadId: thread.threadId,
+			engineId: activeContextEngine.info.id,
+			tokenBudget: params.contextTokenBudget,
+			error: formatErrorMessage(error)
+		});
+		try {
+			const runtimeContext = buildActiveContextEngineRuntimeContext();
+			const overflowTokenCount = params.contextTokenBudget ?? params.contextWindowInfo?.tokens;
+			const compactResult = await activeContextEngine.compact({
+				sessionId: activeSessionId,
+				sessionKey: sandboxSessionKey,
+				sessionFile: activeSessionFile,
+				tokenBudget: params.contextTokenBudget,
+				force: true,
+				...overflowTokenCount ? { currentTokenCount: overflowTokenCount } : {},
+				compactionTarget: "threshold",
+				runtimeContext: overflowTokenCount ? {
+					...runtimeContext,
+					currentTokenCount: overflowTokenCount
+				} : runtimeContext
+			});
+			embeddedAgentLog.info("codex app-server context-engine forced compaction result", {
+				sessionId: activeSessionId,
+				sessionKey: sandboxSessionKey,
+				engineId: activeContextEngine.info.id,
+				ok: compactResult.ok,
+				compacted: compactResult.compacted,
+				reason: compactResult.reason,
+				tokensBefore: compactResult.result?.tokensBefore,
+				tokensAfter: compactResult.result?.tokensAfter
+			});
+			if (!compactResult.ok || !compactResult.compacted) return false;
+			adoptContextEngineCompactionTranscript(compactResult);
+			const maintenanceRuntimeContext = buildActiveContextEngineRuntimeContext();
+			await runHarnessContextEngineMaintenance({
+				contextEngine: activeContextEngine,
+				sessionId: activeSessionId,
+				sessionKey: sandboxSessionKey,
+				sessionFile: activeSessionFile,
+				reason: "compaction",
+				runtimeContext: maintenanceRuntimeContext,
+				config: params.config
+			});
+			return true;
+		} catch (compactErr) {
+			embeddedAgentLog.warn("codex app-server context-engine forced compaction failed", {
+				sessionId: params.sessionId,
+				sessionKey: sandboxSessionKey,
+				engineId: activeContextEngine.info.id,
+				error: formatErrorMessage(compactErr)
+			});
+			return false;
+		}
+	};
+	const rebuildPromptAfterContextEngineCompaction = async () => {
+		historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages;
+		resetCodexPromptInputs();
+		try {
+			await applyActiveContextEngineProjection(void 0);
+		} catch (assembleErr) {
+			embeddedAgentLog.warn("context engine assemble failed after forced compaction; using Codex baseline prompt", { error: formatErrorMessage(assembleErr) });
+		}
+		promptBuild = await buildPromptFromCurrentInputs();
+	};
+	const buildLlmInputEvent = () => ({
 		runId: params.runId,
 		sessionId: params.sessionId,
 		provider: params.provider,
@@ -3088,12 +3315,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: promptBuild.prompt,
 		historyMessages,
 		imagesCount: params.images?.length ?? 0
-	};
-	const turnStartFailureMessages = [...historyMessages, {
-		role: "user",
-		content: promptBuild.prompt,
-		timestamp: Date.now()
-	}];
+	});
+	const buildTurnStartFailureMessages = () => [...historyMessages, buildCodexUserPromptMessage({
+		...params,
+		prompt: promptBuild.prompt
+	})];
 	let turn;
 	const startCodexTurn = async () => assertCodexTurnStartResponse(await client.request("turn/start", buildTurnStartParams(params, {
 		threadId: thread.threadId,
@@ -3106,7 +3332,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	}));
 	try {
 		runAgentHarnessLlmInputHook({
-			event: llmInputEvent,
+			event: buildLlmInputEvent(),
 			ctx: hookContext
 		});
 		emitCodexAppServerEvent(params, {
@@ -3128,7 +3354,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				threadId: thread.threadId,
 				error: formatErrorMessage(turnStartError)
 			});
-			await clearCodexAppServerBinding(params.sessionFile);
+			const preRetrySessionFile = activeSessionFile;
+			const compactedForRetry = await forceContextEngineCompactionForCodexOverflow(turnStartError);
+			await clearCodexAppServerBinding(preRetrySessionFile);
+			if (activeSessionFile !== preRetrySessionFile) await clearCodexAppServerBinding(activeSessionFile);
+			if (compactedForRetry) await rebuildPromptAfterContextEngineCompaction();
 			thread = await restartContextEngineCodexThread();
 			emitCodexAppServerEvent(params, {
 				stream: "codex_app_server.lifecycle",
@@ -3182,7 +3412,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			});
 			runAgentHarnessAgentEndHook({
 				event: {
-					messages: turnStartFailureMessages,
+					messages: buildTurnStartFailureMessages(),
 					success: false,
 					error: turnStartErrorMessage,
 					durationMs: Date.now() - attemptStartedAt
@@ -3211,7 +3441,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				return buildCodexTurnStartFailureResult({
 					params,
 					message: usageLimitError.message,
-					messagesSnapshot: turnStartFailureMessages,
+					messagesSnapshot: buildTurnStartFailureMessages(),
 					systemPromptReport
 				});
 			}
@@ -3237,6 +3467,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, { nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true });
 	emitLifecycleStart();
 	const activeProjector = projector;
+	turnTerminalIdleWatchArmed = true;
+	touchTurnCompletionActivity("turn:start", { arm: true });
 	for (const notification of pendingNotifications.splice(0)) await enqueueNotification(notification);
 	if (!completed && isTerminalTurnStatus(turn.turn.status)) await enqueueNotification({
 		method: "turn/completed",
@@ -3263,8 +3495,6 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		abort: () => runAbortController.abort("aborted")
 	};
 	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
-	turnTerminalIdleWatchArmed = true;
-	touchTurnCompletionActivity("turn:start");
 	const timeout = setTimeout(() => {
 		timedOut = true;
 		projector?.markTimedOut();
@@ -3342,22 +3572,25 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			...finalAborted ? { aborted: true } : {}
 		});
 		if (activeContextEngine) {
-			const finalMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? historyMessages.concat(result.messagesSnapshot);
+			const activeContextEnginePluginId = resolveContextEngineOwnerPluginId(activeContextEngine);
+			const finalMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages.concat(result.messagesSnapshot);
 			await finalizeHarnessContextEngineTurn({
 				contextEngine: activeContextEngine,
 				promptError: Boolean(finalPromptError),
 				aborted: finalAborted,
 				yieldAborted: Boolean(result.yieldDetected),
-				sessionIdUsed: params.sessionId,
+				sessionIdUsed: activeSessionId,
 				sessionKey: sandboxSessionKey,
-				sessionFile: params.sessionFile,
+				sessionFile: activeSessionFile,
 				messagesSnapshot: finalMessages,
 				prePromptMessageCount,
 				tokenBudget: params.contextTokenBudget,
 				runtimeContext: buildHarnessContextEngineRuntimeContextFromUsage({
-					attempt: runtimeParams,
+					attempt: buildActiveRunAttemptParams(),
 					workspaceDir: effectiveWorkspace,
 					agentDir,
+					activeAgentId: sessionAgentId,
+					contextEnginePluginId: activeContextEnginePluginId,
 					tokenBudget: params.contextTokenBudget,
 					lastCallUsage: result.attemptUsage,
 					promptCache: result.promptCache
@@ -3650,14 +3883,12 @@ function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
 		runSessionKey: params.sessionKey && params.sessionKey !== sandboxSessionKey ? params.sessionKey : void 0
 	};
 }
-async function buildDynamicTools(input) {
+function buildOpenClawCodingToolsOptions(input) {
 	const { params } = input;
-	if (params.disableTools || !supportsModelTools(params.model)) return [];
 	const modelHasVision = params.model.input?.includes("image") ?? false;
 	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({
+	return {
 		agentId: input.sessionAgentId,
 		...buildEmbeddedAttemptToolRunContext(params),
 		exec: {
@@ -3721,8 +3952,15 @@ async function buildDynamicTools(input) {
 			});
 			input.runAbortController.abort("sessions_yield");
 		}
-	}), input.pluginConfig), {
-		modelHasVision,
+	};
+}
+async function buildDynamicTools(input) {
+	const { params } = input;
+	if (params.disableTools || !supportsModelTools(params.model)) return [];
+	const createOpenClawCodingTools = openClawCodingToolsFactoryForTests ?? (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
+	const toolOptions = buildOpenClawCodingToolsOptions(input);
+	const filteredTools = filterCodexDynamicToolsForAllowlist(filterToolsForVisionInputs(filterCodexDynamicTools(createOpenClawCodingTools(toolOptions), input.pluginConfig), {
+		modelHasVision: toolOptions.modelHasVision ?? false,
 		hasInboundImages: (params.images?.length ?? 0) > 0
 	}), includeForcedMessageToolAllow(params.toolsAllow, params));
 	return normalizeAgentRuntimeTools({
@@ -3759,6 +3997,45 @@ function shouldProjectMirroredHistoryForCodexStart(params) {
 		next: params.dynamicToolsFingerprint
 	});
 }
+function readContextEngineThreadBootstrapProjection(projection) {
+	if (projection?.mode !== "thread_bootstrap") return;
+	const epoch = projection.epoch?.trim();
+	if (!epoch) {
+		embeddedAgentLog.warn("context engine requested Codex thread-bootstrap projection without an epoch; using per-turn projection");
+		return;
+	}
+	const fingerprint = projection.fingerprint?.trim();
+	return {
+		mode: "thread_bootstrap",
+		epoch,
+		...fingerprint ? { fingerprint } : {}
+	};
+}
+function resolveContextEngineBootstrapProjectionDecision(params) {
+	const bindingProjection = params.startupBinding?.contextEngine?.projection;
+	if (!params.startupBinding?.threadId || !bindingProjection) return {
+		project: true,
+		reason: !params.startupBinding?.threadId ? "missing-thread-binding" : "missing-projection-binding"
+	};
+	if (!params.expectedBinding || !isContextEngineBindingCompatible(params.startupBinding.contextEngine, params.expectedBinding)) return {
+		project: true,
+		reason: "context-engine-binding-mismatch"
+	};
+	if (!areCodexDynamicToolFingerprintsCompatible({
+		previous: params.startupBinding.dynamicToolsFingerprint,
+		next: params.dynamicToolsFingerprint
+	})) return {
+		project: true,
+		reason: "dynamic-tools-mismatch"
+	};
+	return bindingProjection.mode !== "thread_bootstrap" || bindingProjection.epoch !== params.projection.epoch || bindingProjection.fingerprint !== params.projection.fingerprint ? {
+		project: true,
+		reason: "projection-mismatch"
+	} : {
+		project: false,
+		reason: "matching-thread-bootstrap-binding"
+	};
+}
 async function withCodexStartupTimeout(params) {
 	if (params.signal.aborted) throw new Error("codex app-server startup aborted");
 	let timeout;
@@ -3959,6 +4236,11 @@ function isTrackedOpenClawDynamicToolCompletionNotification(notification, active
 	const itemType = item ? readString(item, "type") : void 0;
 	return itemType === void 0 || itemType === "dynamicToolCall";
 }
+function isRawToolOutputCompletionNotification(notification) {
+	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
+	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
+	return item ? readString(item, "type") === "custom_tool_call_output" : false;
+}
 function readRawAssistantTextPreview(item) {
 	if (readString(item, "role") !== "assistant" || !Array.isArray(item.content)) return;
 	const text = item.content.flatMap((content) => {
@@ -4244,6 +4526,11 @@ function prependCurrentTurnContext(prompt, context) {
 	const text = context?.text.trim();
 	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
 }
+function waitForCodexNotificationDispatchTurn() {
+	return new Promise((resolve) => {
+		setImmediate(resolve);
+	});
+}
 function handleApprovalRequest(params) {
 	return handleCodexAppServerApprovalRequest({
 		method: params.method,