@openclaw/codex 2026.5.16-beta.3 → 2026.5.16-beta.5

package/dist/{run-attempt-B3nk5oT1.js → run-attempt-Bssnu2uw.js}

@@ -1,20 +1,20 @@
-import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-3ATInASk.js";
+import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-B5pq6hEz.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-CA7amCZ8.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-Czoa60Nt.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, 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-D2sxRPdz.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 { 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-BbriKhTq.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 { 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, 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 { 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 fs from "node:fs/promises";
 import path from "node:path";
 import { markAuthProfileBlockedUntil, resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
@@ -324,7 +324,7 @@ async function readCodexMirroredSessionHistoryMessages(sessionFile) {
 		const firstEntry = entries[0];
 		if (firstEntry?.type !== "session" || typeof firstEntry.id !== "string") return;
 		migrateSessionEntries(entries);
-		return buildSessionContext(entries.filter((entry) => entry.type !== "session")).messages;
+		return sanitizeCodexHistoryImagePayloads(buildSessionContext(entries.filter((entry) => entry.type !== "session")).messages, "codex mirrored history");
 	} catch (error) {
 		if (isMissingFileError(error)) return [];
 		return;
@@ -446,7 +446,7 @@ async function mirrorCodexAppServerTranscript(params) {
 	if (messages.length === 0) return;
 	const lock = await acquireSessionWriteLock({
 		sessionFile: params.sessionFile,
-		timeoutMs: resolveSessionWriteLockAcquireTimeoutMs(params.config)
+		...resolveSessionWriteLockOptions(params.config)
 	});
 	try {
 		const existingIdempotencyKeys = await readTranscriptIdempotencyKeys(params.sessionFile);
@@ -990,6 +990,7 @@ var CodexAppServerEventProjector = class {
 				});
 			}
 			this.recordToolMeta(item);
+			this.emitSnapshotOnlyNativeToolProgress(item);
 			this.recordNativeToolTranscriptCall(item);
 			this.recordNativeToolTranscriptResult(item);
 			this.emitAfterToolCallObservation(item);
@@ -999,6 +1000,33 @@ var CodexAppServerEventProjector = class {
 		this.activeCompactionItemIds.clear();
 		await this.maybeEndReasoning();
 	}
+	emitSnapshotOnlyNativeToolProgress(item) {
+		if (!shouldSynthesizeToolProgressForItem(item) || !this.isCurrentTurnSnapshotItem(item) || this.completedItemIds.has(item.id) || itemStatus(item) === "running") return;
+		if (!this.activeItemIds.has(item.id)) {
+			this.emitStandardItemEvent({
+				phase: "start",
+				item
+			});
+			this.emitNormalizedToolItemEvent({
+				phase: "start",
+				item
+			});
+		}
+		this.activeItemIds.delete(item.id);
+		this.emitStandardItemEvent({
+			phase: "end",
+			item
+		});
+		this.emitNormalizedToolItemEvent({
+			phase: "result",
+			item
+		});
+		this.completedItemIds.add(item.id);
+	}
+	isCurrentTurnSnapshotItem(item) {
+		const itemTurnId = readItemString(item, "turnId") ?? readItemString(item, "turn_id");
+		return itemTurnId === void 0 || itemTurnId === this.turnId;
+	}
 	handleOutputDelta(params, toolName) {
 		const itemId = readString$2(params, "itemId");
 		const delta = readString$2(params, "delta");
@@ -1128,6 +1156,13 @@ var CodexAppServerEventProjector = class {
 		const meta = itemMeta(item, this.toolProgressDetailMode());
 		const args = params.phase === "start" ? itemToolArgs(item) : void 0;
 		const status = params.phase === "result" ? itemStatus(item) : "running";
+		this.recordToolTrajectoryEvent({
+			phase: params.phase,
+			item,
+			name,
+			args,
+			status
+		});
 		this.emitDiagnosticToolExecutionEvent({
 			phase: params.phase,
 			item,
@@ -1152,6 +1187,32 @@ var CodexAppServerEventProjector = class {
 		});
 		if (params.phase === "result") this.emitAfterToolCallObservation(item);
 	}
+	recordToolTrajectoryEvent(params) {
+		if (params.phase === "start") {
+			this.options.trajectoryRecorder?.recordEvent("tool.call", {
+				threadId: this.threadId,
+				turnId: this.turnId,
+				itemId: params.item.id,
+				toolCallId: params.item.id,
+				name: params.name,
+				arguments: params.args
+			});
+			return;
+		}
+		const toolResult = itemToolResult(params.item).result;
+		const output = itemOutputText(params.item);
+		this.options.trajectoryRecorder?.recordEvent("tool.result", {
+			threadId: this.threadId,
+			turnId: this.turnId,
+			itemId: params.item.id,
+			toolCallId: params.item.id,
+			name: params.name,
+			status: params.status,
+			isError: isNonSuccessItemStatus(params.status),
+			...toolResult ? { result: toolResult } : {},
+			...output ? { output } : {}
+		});
+	}
 	emitDiagnosticToolExecutionEvent(params) {
 		const base = {
 			runId: this.params.runId,
@@ -1749,88 +1810,6 @@ function readTurn(value) {
 	return readCodexTurn(value);
 }
 //#endregion
-//#region extensions/codex/src/app-server/native-hook-relay.ts
-const CODEX_NATIVE_HOOK_RELAY_EVENTS = [
-	"pre_tool_use",
-	"post_tool_use",
-	"permission_request",
-	"before_agent_finalize"
-];
-const CODEX_HOOK_EVENT_BY_NATIVE_EVENT = {
-	pre_tool_use: "PreToolUse",
-	post_tool_use: "PostToolUse",
-	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.hooks": true };
-	const hookState = {};
-	for (const event of events) {
-		const codexEvent = CODEX_HOOK_EVENT_BY_NATIVE_EVENT[event];
-		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.hooks": false,
-		"hooks.PreToolUse": [],
-		"hooks.PostToolUse": [],
-		"hooks.PermissionRequest": [],
-		"hooks.Stop": []
-	};
-}
-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;
 const PRIVATE_PAYLOAD_FIELD_RE = /(?:image|screenshot|attachment|fileData|dataUri)/iu;
@@ -2401,6 +2380,169 @@ function isCodexAppServerPolicyMode(value) {
 function isCodexAppServerApprovalPolicy(value) {
 	return value === "never" || value === "on-request" || value === "on-failure" || value === "untrusted";
 }
+const CODEX_APP_SERVER_NATIVE_THREAD_MAX_TOKENS = 7e4;
+const CODEX_APP_SERVER_BYTE_UNITS = {
+	b: 1,
+	k: 1024,
+	kb: 1024,
+	kib: 1024,
+	m: 1024 * 1024,
+	mb: 1024 * 1024,
+	mib: 1024 * 1024,
+	g: 1024 * 1024 * 1024,
+	gb: 1024 * 1024 * 1024,
+	gib: 1024 * 1024 * 1024,
+	t: 1024 * 1024 * 1024 * 1024,
+	tb: 1024 * 1024 * 1024 * 1024,
+	tib: 1024 * 1024 * 1024 * 1024
+};
+function parseCodexAppServerByteLimit(value) {
+	if (typeof value === "number" && Number.isFinite(value) && value > 0) return Math.floor(value);
+	if (typeof value !== "string") return;
+	const match = value.trim().match(/^(\d+(?:\.\d+)?)\s*([a-z]+)?$/i);
+	if (!match) return;
+	const amount = Number(match[1]);
+	if (!Number.isFinite(amount) || amount <= 0) return;
+	const multiplier = CODEX_APP_SERVER_BYTE_UNITS[(match[2] ?? "b").toLowerCase()];
+	if (multiplier === void 0) return;
+	return Math.max(1, Math.round(amount * multiplier));
+}
+async function listCodexAppServerRolloutFilesForThread(agentDir, threadId, codexHome) {
+	const resolvedAgentDir = path.resolve(agentDir);
+	const resolvedCodexHome = codexHome?.trim() ? path.resolve(codexHome) : resolveCodexAppServerHomeDir(resolvedAgentDir);
+	const roots = [
+		path.join(resolvedCodexHome, "sessions"),
+		path.join(resolveCodexAppServerHomeDir(resolvedAgentDir), "sessions"),
+		path.join(resolvedAgentDir, "agent", "codex-home", "sessions"),
+		path.join(path.dirname(resolvedAgentDir), "codex-home", "sessions")
+	];
+	const files = [];
+	const visited = /* @__PURE__ */ new Set();
+	for (const root of roots) {
+		if (visited.has(root)) continue;
+		visited.add(root);
+		const stack = [root];
+		while (stack.length > 0) {
+			const dir = stack.pop();
+			if (!dir) continue;
+			let entries;
+			try {
+				entries = await fs.readdir(dir, { withFileTypes: true });
+			} catch {
+				continue;
+			}
+			for (const entry of entries) {
+				const file = path.join(dir, entry.name);
+				if (entry.isDirectory()) {
+					stack.push(file);
+					continue;
+				}
+				if (!entry.isFile() || !entry.name.endsWith(".jsonl") || !entry.name.includes(threadId)) continue;
+				try {
+					files.push({
+						path: file,
+						bytes: (await fs.stat(file)).size
+					});
+				} catch {}
+			}
+		}
+	}
+	return files;
+}
+async function readCodexSessionRecordForSessionFile(sessionFile) {
+	const sessionsFile = path.join(path.dirname(sessionFile), "sessions.json");
+	let store;
+	try {
+		store = JSON.parse(await fs.readFile(sessionsFile, "utf8"));
+	} catch {
+		return;
+	}
+	if (!isJsonObject(store)) return;
+	const resolvedSessionFile = path.resolve(sessionFile);
+	for (const [sessionKey, record] of Object.entries(store)) {
+		if (!isJsonObject(record) || typeof record.sessionFile !== "string") continue;
+		if (path.resolve(record.sessionFile) !== resolvedSessionFile) continue;
+		return {
+			sessionKey,
+			...record
+		};
+	}
+}
+async function readCodexAppServerRolloutTokenUsage(file) {
+	let handle;
+	try {
+		handle = await fs.open(file, "r");
+	} catch {
+		return;
+	}
+	let totalTokens;
+	try {
+		for await (const line of handle.readLines()) {
+			const lineTokens = readCodexAppServerRolloutTokenUsageLine(line);
+			if (lineTokens !== void 0) totalTokens = lineTokens;
+		}
+	} finally {
+		await handle.close();
+	}
+	return totalTokens;
+}
+function readCodexAppServerRolloutTokenUsageLine(line) {
+	if (!line.trim()) return;
+	try {
+		const parsed = JSON.parse(line);
+		const payload = isJsonObject(parsed) ? parsed.payload : void 0;
+		const info = isJsonObject(payload) && payload.type === "token_count" && isJsonObject(payload.info) ? payload.info : void 0;
+		if (!info) return;
+		const usage = isJsonObject(info.last_token_usage) ? info.last_token_usage : isJsonObject(info.total_token_usage) ? info.total_token_usage : void 0;
+		const value = usage?.total_tokens ?? usage?.totalTokens;
+		return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+	} catch {
+		return;
+	}
+}
+function maxFiniteNumber(values) {
+	const nums = values.filter((value) => typeof value === "number" && Number.isFinite(value));
+	if (nums.length === 0) return;
+	return Math.max(...nums);
+}
+async function rotateOversizedCodexAppServerStartupBinding(params) {
+	const binding = params.binding;
+	if (!binding?.threadId) return binding;
+	if (params.config?.agents?.defaults?.compaction?.truncateAfterCompaction !== true) return binding;
+	const sessionRecord = await readCodexSessionRecordForSessionFile(params.sessionFile);
+	const maxBytes = parseCodexAppServerByteLimit(params.config?.agents?.defaults?.compaction?.maxActiveTranscriptBytes);
+	const rolloutFiles = await listCodexAppServerRolloutFilesForThread(params.agentDir, binding.threadId, params.codexHome);
+	if (maxBytes !== void 0) {
+		const oversizedFiles = rolloutFiles.filter((file) => file.bytes >= maxBytes);
+		if (oversizedFiles.length > 0) {
+			embeddedAgentLog.warn("codex app-server native transcript exceeded active byte limit; starting a fresh thread", {
+				threadId: binding.threadId,
+				maxBytes,
+				files: oversizedFiles.map((file) => ({
+					path: file.path,
+					bytes: file.bytes
+				}))
+			});
+			await clearCodexAppServerBinding(params.sessionFile);
+			return;
+		}
+	}
+	const nativeTokens = maxFiniteNumber(await Promise.all(rolloutFiles.map(async (file) => readCodexAppServerRolloutTokenUsage(file.path))));
+	const sessionTokens = sessionRecord?.totalTokensFresh !== false && typeof sessionRecord?.totalTokens === "number" && Number.isFinite(sessionRecord.totalTokens) ? sessionRecord.totalTokens : void 0;
+	const tokenCount = maxFiniteNumber([sessionTokens, nativeTokens]);
+	if (tokenCount !== void 0 && tokenCount >= CODEX_APP_SERVER_NATIVE_THREAD_MAX_TOKENS) {
+		embeddedAgentLog.warn("codex app-server native transcript exceeded active token limit; starting a fresh thread", {
+			threadId: binding.threadId,
+			maxTokens: CODEX_APP_SERVER_NATIVE_THREAD_MAX_TOKENS,
+			sessionKey: sessionRecord?.sessionKey,
+			sessionTokens,
+			nativeTokens
+		});
+		await clearCodexAppServerBinding(params.sessionFile);
+		return;
+	}
+	return binding;
+}
 async function runCodexAppServerAttempt(params, options = {}) {
 	const attemptStartedAt = Date.now();
 	const attemptClientFactory = options.clientFactory ?? defaultCodexAppServerClientFactory;
@@ -2440,8 +2582,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		agentId: params.agentId
 	});
 	const agentDir = params.agentDir ?? resolveAgentDir$1(params.config ?? {}, sessionAgentId);
-	const startupBinding = await readCodexAppServerBinding(params.sessionFile);
-	const startupAuthProfileCandidate = params.runtimePlan?.auth.forwardedAuthProfileId ?? params.authProfileId ?? startupBinding?.authProfileId;
+	let startupBinding = await readCodexAppServerBinding(params.sessionFile);
+	const startupBindingAuthProfileId = startupBinding?.authProfileId;
+	startupBinding = await rotateOversizedCodexAppServerStartupBinding({
+		binding: startupBinding,
+		sessionFile: params.sessionFile,
+		agentDir,
+		codexHome: appServer.start.env?.CODEX_HOME,
+		config: params.config
+	});
+	const startupAuthProfileCandidate = params.runtimePlan?.auth.forwardedAuthProfileId ?? params.authProfileId ?? startupBinding?.authProfileId ?? startupBindingAuthProfileId;
 	const startupAuthProfileId = params.authProfileStore ? resolveCodexAppServerAuthProfileId({
 		authProfileId: startupAuthProfileCandidate,
 		store: params.authProfileStore,
@@ -2483,6 +2633,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	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);
 	let yieldDetected = false;
 	const toolBridge = createCodexDynamicToolBridge({
 		tools: await buildDynamicTools({
@@ -2499,14 +2650,15 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 		}),
 		signal: runAbortController.signal,
-		loading: pluginConfig.codexDynamicToolsLoading ?? "searchable",
+		loading: resolveCodexDynamicToolsLoading(pluginConfig),
 		directToolNames: shouldForceMessageTool(params) ? ["message"] : [],
 		hookContext: {
 			agentId: sessionAgentId,
 			config: params.config,
 			sessionId: params.sessionId,
 			sessionKey: sandboxSessionKey,
-			runId: params.runId
+			runId: params.runId,
+			channelId: hookChannelId
 		}
 	});
 	const hadSessionFile = await pathExists(activeSessionFile);
@@ -2524,7 +2676,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		workspaceDir: params.workspaceDir,
 		messageProvider: params.messageProvider ?? void 0,
 		trigger: params.trigger,
-		channelId: params.messageChannel ?? params.messageProvider ?? void 0,
+		channelId: hookChannelId,
 		...hookContextWindowFields
 	};
 	const activeContextEnginePluginId = activeContextEngine ? resolveContextEngineOwnerPluginId(activeContextEngine) : void 0;
@@ -2644,7 +2796,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prePromptMessageCount = projection.prePromptMessageCount;
 	}
 	const buildPromptFromCurrentInputs = () => resolveAgentHarnessBeforePromptBuildResult({
-		prompt: prependCurrentTurnContext(promptText, params.currentTurnContext),
+		prompt: prependCurrentInboundContext(promptText, params.currentInboundContext),
 		developerInstructions,
 		messages: historyMessages,
 		ctx: hookContext
@@ -2688,16 +2840,18 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			sessionKey: sandboxSessionKey,
 			config: params.config,
 			runId: params.runId,
+			channelId: hookChannelId,
 			attemptTimeoutMs: params.timeoutMs,
 			startupTimeoutMs,
 			turnStartTimeoutMs: params.timeoutMs,
 			signal: runAbortController.signal
 		});
-		const threadConfig = mergeCodexThreadConfigs(nativeHookRelay ? buildCodexNativeHookRelayConfig({
+		const nativeHookRelayConfig = nativeHookRelay ? buildCodexNativeHookRelayConfig({
 			relay: nativeHookRelay,
 			events: nativeHookRelayEvents,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
-		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0, bundleMcpThreadConfig?.configPatch);
+		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
+		const threadConfig = mergeCodexThreadConfigs(bundleMcpThreadConfig?.configPatch);
 		const pluginThreadConfigEnabled = shouldBuildCodexPluginThreadConfig(pluginConfig);
 		const pluginAppCacheKey = buildCodexPluginAppCacheKey({
 			appServer,
@@ -2740,6 +2894,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						appServer: pluginAppServer,
 						developerInstructions: promptBuild.developerInstructions,
 						config: threadConfig,
+						finalConfigPatch: nativeHookRelayConfig,
 						mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
 						mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
 						contextEngineProjection,
@@ -2826,9 +2981,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let userInputBridge;
 	let steeringQueue;
 	let completed = false;
+	let terminalTurnNotificationQueued = false;
 	let timedOut = false;
 	let turnCompletionIdleTimedOut = false;
 	let turnCompletionIdleTimeoutMessage;
+	let clientClosedPromptError;
+	let clientClosedAbort = false;
 	let lifecycleStarted = false;
 	let lifecycleTerminalEmitted = false;
 	let resolveCompletion;
@@ -2842,6 +3000,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let turnCompletionIdleTimer;
 	let turnCompletionIdleWatchArmed = false;
 	let turnCompletionIdleWatchPinnedByTerminalError = false;
+	let turnCompletionIdleTimeoutOverrideMs;
 	let turnAssistantCompletionIdleTimer;
 	let turnAssistantCompletionIdleWatchArmed = false;
 	let turnAssistantCompletionLastActivityAt = Date.now();
@@ -2953,8 +3112,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	};
 	const fireTurnCompletionIdleTimeout = () => {
 		if (completed || runAbortController.signal.aborted || !turnCompletionIdleWatchArmed || activeAppServerTurnRequests > 0) return;
+		const timeoutMs = turnCompletionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		const idleMs = Math.max(0, Date.now() - turnCompletionLastActivityAt);
-		if (idleMs < turnCompletionIdleTimeoutMs) {
+		if (idleMs < timeoutMs) {
 			scheduleTurnCompletionIdleWatch();
 			return;
 		}
@@ -2966,7 +3126,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			turnId,
 			idleMs,
-			timeoutMs: turnCompletionIdleTimeoutMs,
+			timeoutMs,
 			lastActivityReason: turnCompletionLastActivityReason,
 			...turnCompletionLastActivityDetails
 		});
@@ -2974,7 +3134,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			turnId,
 			idleMs,
-			timeoutMs: turnCompletionIdleTimeoutMs,
+			timeoutMs,
 			lastActivityReason: turnCompletionLastActivityReason,
 			...turnCompletionLastActivityDetails
 		});
@@ -3013,7 +3173,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		clearTurnCompletionIdleTimer();
 		if (completed || runAbortController.signal.aborted || !turnCompletionIdleWatchArmed || activeAppServerTurnRequests > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - turnCompletionLastActivityAt);
-		const delayMs = Math.max(1, turnCompletionIdleTimeoutMs - elapsedMs);
+		const delayMs = Math.max(1, (turnCompletionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs) - elapsedMs);
 		turnCompletionIdleTimer = setTimeout(fireTurnCompletionIdleTimeout, delayMs);
 		turnCompletionIdleTimer.unref?.();
 	}
@@ -3064,6 +3224,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		turnCompletionLastActivityAt = Date.now();
 		turnCompletionLastActivityReason = reason;
 		turnCompletionLastActivityDetails = options?.details;
+		turnCompletionIdleTimeoutOverrideMs = void 0;
 		if (options?.attemptProgress) {
 			turnAttemptLastProgressAt = turnCompletionLastActivityAt;
 			turnAttemptLastProgressReason = reason;
@@ -3092,6 +3253,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const disarmTurnCompletionIdleWatch = () => {
 		turnCompletionIdleWatchArmed = false;
 		turnCompletionIdleWatchPinnedByTerminalError = false;
+		turnCompletionIdleTimeoutOverrideMs = void 0;
 		clearTurnCompletionIdleTimer();
 	};
 	const disarmTurnAssistantCompletionIdleWatch = () => {
@@ -3108,6 +3270,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const armTurnCompletionIdleWatch = (options) => {
 		turnCompletionIdleWatchArmed = true;
 		turnCompletionIdleWatchPinnedByTerminalError = options?.pinnedByTerminalError === true;
+		turnCompletionIdleTimeoutOverrideMs = options?.timeoutMs !== void 0 ? Math.max(1, Math.floor(options.timeoutMs)) : void 0;
 		scheduleTurnCompletionIdleWatch();
 	};
 	const emitLifecycleStart = () => {
@@ -3162,6 +3325,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			itemId: item.id
 		});
 	};
+	const isTerminalTurnNotificationForTurn = (notification, notificationTurnId) => {
+		if (!isTurnNotification(notification.params, thread.threadId, notificationTurnId)) return false;
+		return notification.method === "turn/completed" || isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
+	};
 	const handleNotification = async (notification) => {
 		userInputBridge?.handleNotification(notification);
 		if (!projector || !turnId) {
@@ -3183,6 +3350,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		const rawToolOutputCompletion = isRawToolOutputCompletionNotification(notification);
 		if (isCurrentTurnNotification && (rawToolOutputCompletion || isNativeToolProgressNotification(notification))) turnCrossedToolHandoff = true;
 		const assistantCompletionCanRelease = isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff);
+		const postToolRawAssistantCompletionNeedsTerminalGuard = isCurrentTurnNotification && turnCrossedToolHandoff && isRawAssistantCompletionNotification(notification) && activeTurnItemIds.size === 0;
 		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !assistantCompletionCanRelease;
 		if (isCurrentTurnNotification && notification.method === "error") {
 			if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
@@ -3190,13 +3358,15 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			disarmTurnAssistantCompletionIdleWatch();
 		} else if (isTurnCompletion) disarmTurnAssistantCompletionIdleWatch();
 		else if (isCurrentTurnNotification && assistantCompletionCanRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+		else if (postToolRawAssistantCompletionNeedsTerminalGuard) armTurnCompletionIdleWatch({ timeoutMs: turnAssistantCompletionIdleTimeoutMs });
 		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 && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
+		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !postToolRawAssistantCompletionNeedsTerminalGuard && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
 		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
-		const isTurnTerminal = isTurnCompletion || isTurnAbortMarker;
+		const isTurnTerminal = isTerminalTurnNotificationForTurn(notification, turnId);
+		if (isTurnTerminal) terminalTurnNotificationQueued = true;
 		try {
 			await waitForCodexNotificationDispatchTurn();
 			await projector.handleNotification(notification);
@@ -3223,6 +3393,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			pendingNotifications.push(notification);
 			return Promise.resolve();
 		}
+		if (isTerminalTurnNotificationForTurn(notification, turnId)) terminalTurnNotificationQueued = true;
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
@@ -3280,6 +3451,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						paramsForRun: params,
 						threadId: thread.threadId,
 						turnId,
+						nativeHookRelay,
 						signal: runAbortController.signal
 					});
 				}
@@ -3375,6 +3547,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			} else scheduleTurnProgressWatches();
 		}
 	});
+	let closeCleanup;
 	const forceContextEngineCompactionForCodexOverflow = async (error) => {
 		if (!activeContextEngine?.info.ownsCompaction) return false;
 		embeddedAgentLog.warn("codex app-server context-engine turn overflowed; forcing context-engine compaction", {
@@ -3520,6 +3693,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				signal: runAbortController.signal
 			});
 			const turnStartErrorMessage = usageLimitError?.message ?? formatErrorMessage(turnStartError);
+			if (isInvalidCodexImagePayloadError(turnStartErrorMessage)) await clearCodexBindingAfterInvalidImagePayload(activeSessionFile, {
+				phase: "turn_start",
+				threadId: thread.threadId,
+				error: turnStartErrorMessage
+			});
 			emitCodexAppServerEvent(params, {
 				stream: "codex_app_server.lifecycle",
 				data: {
@@ -3602,7 +3780,31 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: promptBuild.prompt,
 		imagesCount: params.images?.length ?? 0
 	});
-	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, { nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true });
+	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, {
+		nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true && nativeHookRelay.shouldRelayEvent("post_tool_use"),
+		trajectoryRecorder
+	});
+	if (isTerminalTurnStatus(turn.turn.status) || pendingNotifications.some((notification) => isTerminalTurnNotificationForTurn(notification, activeTurnId))) terminalTurnNotificationQueued = true;
+	closeCleanup = client.addCloseHandler?.(() => {
+		if (completed || terminalTurnNotificationQueued || runAbortController.signal.aborted) return;
+		clientClosedPromptError = "codex app-server client closed before turn completed";
+		trajectoryRecorder?.recordEvent("turn.client_closed", {
+			threadId: thread.threadId,
+			turnId: activeTurnId
+		});
+		embeddedAgentLog.warn("codex app-server client closed before turn completed", {
+			threadId: thread.threadId,
+			turnId: activeTurnId
+		});
+		clientClosedAbort = true;
+		runAbortController.abort("client_closed");
+		completed = true;
+		clearTurnAttemptIdleTimer();
+		clearTurnCompletionIdleTimer();
+		clearTurnAssistantCompletionIdleTimer();
+		clearTurnTerminalIdleTimer();
+		resolveCompletion?.();
+	});
 	emitLifecycleStart();
 	const activeProjector = projector;
 	turnTerminalIdleWatchArmed = true;
@@ -3655,9 +3857,15 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	try {
 		await completion;
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
-		const finalAborted = result.aborted || runAbortController.signal.aborted;
-		let finalPromptError = turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError;
+		const finalAborted = result.aborted || runAbortController.signal.aborted && !clientClosedAbort;
+		let finalPromptError = clientClosedPromptError ?? (turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError);
 		const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
+		if (isInvalidCodexImagePayloadError(finalPromptErrorMessage)) await clearCodexBindingAfterInvalidImagePayload(activeSessionFile, {
+			phase: "turn_completed",
+			threadId: thread.threadId,
+			turnId: activeTurnId,
+			error: finalPromptErrorMessage
+		});
 		if (shouldRefreshCodexRateLimitsForUsageLimitMessage(finalPromptErrorMessage)) finalPromptError = await refreshCodexUsageLimitErrorMessage({
 			client,
 			source: {
@@ -3668,7 +3876,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			timeoutMs: appServer.requestTimeoutMs,
 			signal: runAbortController.signal
 		});
-		const finalPromptErrorSource = timedOut ? "prompt" : result.promptErrorSource;
+		const finalPromptErrorSource = timedOut || clientClosedPromptError ? "prompt" : result.promptErrorSource;
 		recordCodexTrajectoryCompletion(trajectoryRecorder, {
 			attempt: params,
 			result,
@@ -3774,11 +3982,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			error: "codex app-server run completed without lifecycle terminal event"
 		});
 		if (trajectoryRecorder && !trajectoryEndRecorded) trajectoryRecorder.recordEvent("session.ended", {
-			status: timedOut || runAbortController.signal.aborted ? "interrupted" : "cleanup",
+			status: timedOut || runAbortController.signal.aborted && !clientClosedAbort ? "interrupted" : "cleanup",
 			threadId: thread.threadId,
 			turnId: activeTurnId,
 			timedOut,
-			aborted: runAbortController.signal.aborted
+			aborted: runAbortController.signal.aborted && !clientClosedAbort
 		});
 		await runAgentCleanupStep({
 			runId: params.runId,
@@ -3797,6 +4005,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		clearTurnTerminalIdleTimer();
 		notificationCleanup();
 		requestCleanup();
+		closeCleanup?.();
 		nativeHookRelay?.unregister();
 		runAbortController.signal.removeEventListener("abort", abortListener);
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
@@ -3956,6 +4165,7 @@ function createCodexNativeHookRelay(params) {
 		...params.sessionKey ? { sessionKey: params.sessionKey } : {},
 		...params.config ? { config: params.config } : {},
 		runId: params.runId,
+		...params.channelId ? { channelId: params.channelId } : {},
 		allowedEvents: params.events,
 		ttlMs: resolveCodexNativeHookRelayTtlMs({
 			explicitTtlMs: params.options?.ttlMs,
@@ -4019,6 +4229,15 @@ function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
 		runSessionKey: params.sessionKey && params.sessionKey !== sandboxSessionKey ? params.sessionKey : void 0
 	};
 }
+function resolveCodexAppServerHookChannelId(params, sandboxSessionKey) {
+	return buildAgentHookContextChannelFields({
+		sessionKey: sandboxSessionKey,
+		messageChannel: params.messageChannel,
+		messageProvider: params.messageProvider,
+		currentChannelId: params.currentChannelId,
+		messageTo: params.messageTo
+	}).channelId;
+}
 function buildOpenClawCodingToolsOptions(input) {
 	const { params } = input;
 	const modelHasVision = params.model.input?.includes("image") ?? false;
@@ -4045,7 +4264,7 @@ function buildOpenClawCodingToolsOptions(input) {
 		senderUsername: params.senderUsername,
 		senderE164: params.senderE164,
 		senderIsOwner: params.senderIsOwner,
-		allowGatewaySubagentBinding: params.allowGatewaySubagentBinding,
+		allowGatewaySubagentBinding: params.allowGatewaySubagentBinding || isForcedPrivateQaCodexRuntime(),
 		...sessionKeys,
 		sessionId: params.sessionId,
 		runId: params.runId,
@@ -4066,6 +4285,7 @@ function buildOpenClawCodingToolsOptions(input) {
 		modelAuthMode: resolveModelAuthMode(params.model.provider, params.config, void 0, { workspaceDir: input.effectiveWorkspace }),
 		suppressManagedWebSearch: false,
 		currentChannelId: params.currentChannelId,
+		hookChannelId: resolveCodexAppServerHookChannelId(params, input.sandboxSessionKey),
 		currentThreadTs: params.currentThreadTs,
 		currentMessageId: params.currentMessageId,
 		replyToMode: params.replyToMode,
@@ -4324,6 +4544,23 @@ function readCodexErrorPayload(error) {
 		rateLimits
 	};
 }
+function isInvalidCodexImagePayloadError(message) {
+	if (typeof message !== "string" || !message.trim()) return false;
+	const normalizedMessage = message.replace(/[_-]+/gu, " ");
+	return /\b(?:invalid|malformed)\b[\s\S]{0,120}\b(?:image|image url|base64)\b/iu.test(normalizedMessage) || /\b(?:image|image url|base64)\b[\s\S]{0,120}\b(?:invalid|malformed)\b/iu.test(normalizedMessage);
+}
+async function clearCodexBindingAfterInvalidImagePayload(sessionFile, fields) {
+	const currentBinding = await readCodexAppServerBinding(sessionFile);
+	if (fields.threadId && currentBinding && currentBinding.threadId !== fields.threadId) {
+		embeddedAgentLog.warn("codex app-server image payload error detected for unbound thread; preserving thread binding", {
+			...fields,
+			boundThreadId: currentBinding.threadId
+		});
+		return;
+	}
+	embeddedAgentLog.warn("codex app-server image payload error detected; clearing thread binding", fields);
+	await clearCodexAppServerBinding(sessionFile);
+}
 function describeNotificationActivity(notification) {
 	if (!isJsonObject(notification.params)) return { lastNotificationMethod: notification.method };
 	if (notification.method !== "rawResponseItem/completed") return { lastNotificationMethod: notification.method };
@@ -4692,7 +4929,7 @@ function codexExecutionToolName(item) {
 function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
-function prependCurrentTurnContext(prompt, context) {
+function prependCurrentInboundContext(prompt, context) {
 	const text = context?.text.trim();
 	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
 }
@@ -4708,6 +4945,7 @@ function handleApprovalRequest(params) {
 		paramsForRun: params.paramsForRun,
 		threadId: params.threadId,
 		turnId: params.turnId,
+		nativeHookRelay: params.nativeHookRelay,
 		signal: params.signal
 	});
 }