@openclaw/codex 2026.5.16-beta.4 → 2026.5.16-beta.6

package/dist/{run-attempt-DMKAwtUV.js → run-attempt-D6sdcUE0.js}

@@ -4,17 +4,17 @@ 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, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-DlvmoLBJ.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 { 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-wcyYqwrl.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-Cc_ljZLZ.js";
 import { t as defaultCodexAppServerClientFactory } from "./client-factory-9L6Ie1dC.js";
-import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-Cm_YicZb.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);
@@ -535,6 +535,19 @@ const CODEX_PROMPT_TOTAL_INPUT_KEYS = [
 ];
 const MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM = 20;
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 12e3;
+const TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES = new Set([
+	"message",
+	"messages",
+	"reply",
+	"send",
+	"reaction",
+	"react",
+	"typing"
+]);
+function shouldEmitTranscriptToolProgress(toolName, args) {
+	const normalized = typeof toolName === "string" ? toolName.trim().toLowerCase() : "";
+	return Boolean(normalized && !TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES.has(normalized) && !isActivityLogCommandProgress(normalized, args));
+}
 var CodexAppServerEventProjector = class {
 	constructor(params, threadId, turnId, options = {}) {
 		this.params = params;
@@ -554,11 +567,15 @@ var CodexAppServerEventProjector = class {
 		this.toolResultSummaryItemIds = /* @__PURE__ */ new Set();
 		this.toolResultOutputItemIds = /* @__PURE__ */ new Set();
 		this.toolResultOutputStreamedItemIds = /* @__PURE__ */ new Set();
+		this.transcriptToolProgressSuppressedIds = /* @__PURE__ */ new Set();
+		this.toolTranscriptArgumentsById = /* @__PURE__ */ new Map();
 		this.toolResultOutputDeltaState = /* @__PURE__ */ new Map();
+		this.toolResultOutputTextByItem = /* @__PURE__ */ new Map();
 		this.toolMetas = /* @__PURE__ */ new Map();
 		this.toolTranscriptMessages = [];
 		this.toolTranscriptCallIds = /* @__PURE__ */ new Set();
 		this.toolTranscriptResultIds = /* @__PURE__ */ new Set();
+		this.transcriptToolProgressCallIds = /* @__PURE__ */ new Set();
 		this.nativeGeneratedMediaUrls = /* @__PURE__ */ new Set();
 		this.diagnosticToolStartedAtByItem = /* @__PURE__ */ new Map();
 		this.afterToolCallObservedItemIds = /* @__PURE__ */ new Set();
@@ -990,6 +1007,7 @@ var CodexAppServerEventProjector = class {
 				});
 			}
 			this.recordToolMeta(item);
+			this.emitSnapshotOnlyNativeToolProgress(item);
 			this.recordNativeToolTranscriptCall(item);
 			this.recordNativeToolTranscriptResult(item);
 			this.emitAfterToolCallObservation(item);
@@ -999,10 +1017,40 @@ 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");
-		if (!itemId || !delta || !this.shouldEmitToolOutput()) return;
+		if (!itemId || !delta) return;
+		appendToolOutputDeltaText(this.toolResultOutputTextByItem, itemId, delta);
+		if (!this.shouldEmitToolOutput()) return;
+		if (this.transcriptToolProgressSuppressedIds.has(itemId) || !shouldEmitTranscriptToolProgress(toolName, this.toolTranscriptArgumentsById.get(itemId))) return;
 		const state = this.toolResultOutputDeltaState.get(itemId) ?? {
 			chars: 0,
 			messages: 0,
@@ -1125,15 +1173,26 @@ var CodexAppServerEventProjector = class {
 		if (!item || !shouldSynthesizeToolProgressForItem(item)) return;
 		const name = itemName(item);
 		if (!name) return;
-		const meta = itemMeta(item, this.toolProgressDetailMode());
-		const args = params.phase === "start" ? itemToolArgs(item) : void 0;
 		const status = params.phase === "result" ? itemStatus(item) : "running";
+		const args = itemToolArgs(item);
+		this.recordToolTrajectoryEvent({
+			phase: params.phase,
+			item,
+			name,
+			args,
+			status
+		});
 		this.emitDiagnosticToolExecutionEvent({
 			phase: params.phase,
 			item,
 			name,
 			status
 		});
+		if (!shouldEmitTranscriptToolProgress(name, args)) {
+			if (params.phase === "result") this.emitAfterToolCallObservation(item);
+			return;
+		}
+		const meta = itemMeta(item, this.toolProgressDetailMode());
 		this.emitAgentEvent({
 			stream: "tool",
 			data: {
@@ -1142,7 +1201,7 @@ var CodexAppServerEventProjector = class {
 				itemId: item.id,
 				toolCallId: item.id,
 				...meta ? { meta } : {},
-				...args ? { args } : {},
+				...params.phase === "start" && args ? { args } : {},
 				...params.phase === "result" ? {
 					status,
 					isError: isNonSuccessItemStatus(status),
@@ -1152,6 +1211,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.toolResultOutputTextByItem);
+		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,
@@ -1196,7 +1281,7 @@ var CodexAppServerEventProjector = class {
 		if (status === "running") return;
 		this.afterToolCallObservedItemIds.add(item.id);
 		const result = itemToolResult(item).result;
-		const error = itemToolError(item, status);
+		const error = itemToolError(item, status, this.toolResultOutputTextByItem);
 		const startedAt = typeof item.durationMs === "number" ? Date.now() - Math.max(0, item.durationMs) : void 0;
 		const hookParams = {
 			toolName: name,
@@ -1225,6 +1310,7 @@ var CodexAppServerEventProjector = class {
 		if (this.toolResultSummaryItemIds.has(itemId)) return;
 		const toolName = itemName(item);
 		if (!toolName) return;
+		if (!shouldEmitTranscriptToolProgress(toolName, itemToolArgs(item))) return;
 		this.toolResultSummaryItemIds.add(itemId);
 		const meta = itemMeta(item, this.toolProgressDetailMode());
 		this.emitToolResultMessage({
@@ -1238,8 +1324,9 @@ var CodexAppServerEventProjector = class {
 		if (this.toolResultOutputItemIds.has(itemId)) return;
 		if (this.toolResultOutputStreamedItemIds.has(itemId)) return;
 		const toolName = itemName(item);
-		const output = itemOutputText(item);
+		const output = itemOutputText(item, this.toolResultOutputTextByItem);
 		if (!toolName || !output) return;
+		if (!shouldEmitTranscriptToolProgress(toolName, itemToolArgs(item))) return;
 		this.emitToolResultMessage({
 			itemId,
 			text: formatToolOutput(toolName, itemMeta(item, this.toolProgressDetailMode()), output),
@@ -1291,20 +1378,53 @@ var CodexAppServerEventProjector = class {
 		this.recordToolTranscriptResult({
 			id: item.id,
 			name,
-			text: itemTranscriptResultText(item),
+			text: itemTranscriptResultText(item, this.toolResultOutputTextByItem),
 			isError: isNonSuccessItemStatus(itemStatus(item))
 		});
 	}
 	recordToolTranscriptCall(params) {
 		if (!params.id || !params.name || this.toolTranscriptCallIds.has(params.id)) return;
 		this.toolTranscriptCallIds.add(params.id);
+		this.toolTranscriptArgumentsById.set(params.id, params.arguments);
+		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) this.transcriptToolProgressSuppressedIds.add(params.id);
+		else this.transcriptToolProgressSuppressedIds.delete(params.id);
+		this.emitTranscriptToolCallProgress(params);
 		this.toolTranscriptMessages.push(attachCodexMirrorIdentity(this.createToolCallMessage(params), `${this.turnId}:tool:${params.id}:call`));
 	}
 	recordToolTranscriptResult(params) {
 		if (!params.id || !params.name || this.toolTranscriptResultIds.has(params.id)) return;
 		this.toolTranscriptResultIds.add(params.id);
+		this.emitTranscriptToolResultProgress(params);
 		this.toolTranscriptMessages.push(attachCodexMirrorIdentity(this.createToolResultMessage(params), `${this.turnId}:tool:${params.id}:result`));
 	}
+	emitTranscriptToolCallProgress(params) {
+		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) return;
+		this.transcriptToolProgressCallIds.add(params.id);
+		const args = normalizeToolTranscriptArguments(params.arguments);
+		const meta = inferToolMetaFromArgs(params.name, args, { detailMode: this.toolProgressDetailMode() });
+		if (!this.params.onToolResult || !this.shouldEmitToolResult() || this.toolResultSummaryItemIds.has(params.id) || this.toolResultOutputStreamedItemIds.has(params.id)) return;
+		this.toolResultSummaryItemIds.add(params.id);
+		this.emitToolResultMessage({
+			itemId: params.id,
+			text: formatToolSummary(params.name, meta)
+		});
+	}
+	emitTranscriptToolResultProgress(params) {
+		if (this.transcriptToolProgressSuppressedIds.has(params.id) || !shouldEmitTranscriptToolProgress(params.name, this.toolTranscriptArgumentsById.get(params.id))) return;
+		if (!this.transcriptToolProgressCallIds.has(params.id)) this.emitTranscriptToolCallProgress({
+			id: params.id,
+			name: params.name,
+			arguments: {}
+		});
+		if (!this.params.onToolResult || !this.shouldEmitToolOutput() || this.toolResultOutputItemIds.has(params.id) || this.toolResultOutputStreamedItemIds.has(params.id)) return;
+		const text = params.text?.trim();
+		if (!text) return;
+		this.emitToolResultMessage({
+			itemId: params.id,
+			text: formatToolOutput(params.name, void 0, text),
+			finalOutput: true
+		});
+	}
 	formatCodexErrorMessage(params) {
 		const error = isJsonObject(params.error) ? params.error : void 0;
 		return formatCodexUsageLimitErrorMessage({
@@ -1654,10 +1774,10 @@ function itemFileChanges(item) {
 		kind: change.kind
 	})) : [];
 }
-function itemToolError(item, status) {
+function itemToolError(item, status, outputTextByItem) {
 	if (status === "blocked") return "codex native tool blocked";
 	if (status !== "failed") return;
-	return itemOutputText(item) ?? "codex native tool failed";
+	return itemOutputText(item, outputTextByItem) ?? "codex native tool failed";
 }
 function itemMeta(item, detailMode = "explain") {
 	if (item.type === "commandExecution" && typeof item.command === "string") return inferToolMetaFromArgs("exec", {
@@ -1668,24 +1788,50 @@ function itemMeta(item, detailMode = "explain") {
 	const toolName = itemName(item);
 	if ((item.type === "dynamicToolCall" || item.type === "mcpToolCall") && toolName) return inferToolMetaFromArgs(toolName, item.arguments, { detailMode });
 }
-function itemOutputText(item) {
-	if (item.type === "commandExecution") return item.aggregatedOutput?.trim() || void 0;
+function itemOutputText(item, outputTextByItem) {
+	if (item.type === "commandExecution") return item.aggregatedOutput?.trim() || outputTextByItem?.get(item.id)?.trim() || void 0;
 	if (item.type === "dynamicToolCall") return collectDynamicToolContentText(item.contentItems).trim() || void 0;
 	if (item.type === "mcpToolCall") {
 		if (item.error) return stringifyJsonValue(item.error);
 		return item.result ? stringifyJsonValue(item.result) : void 0;
 	}
 }
-function itemTranscriptResultText(item) {
-	const output = itemOutputText(item);
+function itemTranscriptResultText(item, outputTextByItem) {
+	const output = itemOutputText(item, outputTextByItem);
 	if (output) return output;
 	const result = itemToolResult(item).result;
 	return result ? stringifyJsonValue(result) : itemStatus(item);
 }
+function appendToolOutputDeltaText(outputTextByItem, itemId, delta) {
+	const current = outputTextByItem.get(itemId) ?? "";
+	if (current.length >= TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS) return;
+	const remaining = TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS - current.length;
+	const next = current + (delta.length > remaining ? delta.slice(0, remaining) : delta);
+	outputTextByItem.set(itemId, next);
+}
 function normalizeToolTranscriptArguments(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
 	return value;
 }
+function isActivityLogCommandProgress(toolName, args) {
+	if (toolName !== "bash" && toolName !== "exec" && toolName !== "shell") return false;
+	const command = readToolCommandText(args);
+	return Boolean(command && command.includes("log_activity.sh"));
+}
+function readToolCommandText(value) {
+	if (typeof value === "string") return value;
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const record = value;
+	for (const key of [
+		"command",
+		"cmd",
+		"shellCommand",
+		"script"
+	]) {
+		const text = record[key];
+		if (typeof text === "string" && text) return text;
+	}
+}
 function collectDynamicToolContentText(contentItems) {
 	if (!Array.isArray(contentItems)) return "";
 	return contentItems.flatMap((entry) => {
@@ -1749,88 +1895,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 +2465,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 +2667,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,
@@ -2481,8 +2716,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		disableTools: params.disableTools,
 		toolsAllow: params.toolsAllow
 	});
+	const nativeToolSurfaceEnabled = shouldEnableCodexAppServerNativeToolSurface(params);
 	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 +2736,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 +2762,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;
@@ -2688,6 +2926,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			sessionKey: sandboxSessionKey,
 			config: params.config,
 			runId: params.runId,
+			channelId: hookChannelId,
 			attemptTimeoutMs: params.timeoutMs,
 			startupTimeoutMs,
 			turnStartTimeoutMs: params.timeoutMs,
@@ -2699,7 +2938,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
 		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
 		const threadConfig = mergeCodexThreadConfigs(bundleMcpThreadConfig?.configPatch);
-		const pluginThreadConfigEnabled = shouldBuildCodexPluginThreadConfig(pluginConfig);
+		const pluginThreadConfigRequired = !nativeToolSurfaceEnabled || shouldBuildCodexPluginThreadConfig(pluginConfig);
+		const pluginThreadConfigPluginConfig = nativeToolSurfaceEnabled ? pluginConfig : disableCodexPluginThreadConfig(pluginConfig);
 		const pluginAppCacheKey = buildCodexPluginAppCacheKey({
 			appServer,
 			agentDir,
@@ -2707,11 +2947,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			accountId: startupAuthAccountCacheKey,
 			envApiKeyFingerprint: startupEnvApiKeyCacheKey
 		});
-		const pluginThreadConfigInputFingerprint = pluginThreadConfigEnabled ? buildCodexPluginThreadConfigInputFingerprint({
-			pluginConfig,
+		const pluginThreadConfigInputFingerprint = pluginThreadConfigRequired ? buildCodexPluginThreadConfigInputFingerprint({
+			pluginConfig: pluginThreadConfigPluginConfig,
 			appCacheKey: pluginAppCacheKey
 		}) : void 0;
-		const resolvedPluginPolicy = pluginThreadConfigEnabled ? resolveCodexPluginsPolicy(pluginConfig) : 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;
 		pluginAppServer = resolvedPluginPolicy?.enabled === true ? {
 			...appServer,
@@ -2742,15 +2982,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						developerInstructions: promptBuild.developerInstructions,
 						config: threadConfig,
 						finalConfigPatch: nativeHookRelayConfig,
+						nativeCodeModeEnabled: nativeToolSurfaceEnabled,
+						userMcpServersEnabled: nativeToolSurfaceEnabled,
 						mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
 						mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
 						contextEngineProjection,
-						pluginThreadConfig: pluginThreadConfigEnabled ? {
+						pluginThreadConfig: pluginThreadConfigRequired ? {
 							enabled: true,
 							inputFingerprint: pluginThreadConfigInputFingerprint,
 							enabledPluginConfigKeys,
 							build: () => buildCodexPluginThreadConfig({
-								pluginConfig,
+								pluginConfig: pluginThreadConfigPluginConfig,
 								request: (method, requestParams) => startupClient.request(method, requestParams, {
 									timeoutMs: appServer.requestTimeoutMs,
 									signal: runAbortController.signal
@@ -3298,6 +3540,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						paramsForRun: params,
 						threadId: thread.threadId,
 						turnId,
+						nativeHookRelay,
 						signal: runAbortController.signal
 					});
 				}
@@ -3328,7 +3571,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			});
 			const toolMeta = inferCodexDynamicToolMeta(call, resolveCodexToolProgressDetailMode(params.toolProgressDetail));
 			const toolArgs = sanitizeCodexToolArguments(call.arguments);
-			emitCodexAppServerEvent(params, {
+			const shouldEmitDynamicToolProgress = shouldEmitTranscriptToolProgress(call.tool, toolArgs);
+			if (shouldEmitDynamicToolProgress) emitCodexAppServerEvent(params, {
 				stream: "tool",
 				data: {
 					phase: "start",
@@ -3371,7 +3615,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				success: response.success,
 				contentItems: response.contentItems
 			});
-			emitCodexAppServerEvent(params, {
+			if (shouldEmitDynamicToolProgress) emitCodexAppServerEvent(params, {
 				stream: "tool",
 				data: {
 					phase: "result",
@@ -3539,6 +3783,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: {
@@ -3621,7 +3870,10 @@ 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;
@@ -3698,6 +3950,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		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: {
@@ -3997,6 +4255,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,
@@ -4060,6 +4319,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;
@@ -4086,7 +4354,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,
@@ -4107,6 +4375,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,
@@ -4153,16 +4422,35 @@ async function buildDynamicTools(input) {
 	});
 }
 function includeForcedMessageToolAllow(toolsAllow, params) {
-	if (!shouldForceMessageTool(params)) return toolsAllow;
-	if (toolsAllow === void 0) return toolsAllow;
+	if (!shouldForceMessageTool(params) || toolsAllow === void 0 || hasWildcardCodexToolsAllow(toolsAllow)) return toolsAllow;
 	if (toolsAllow.length === 0) return ["message"];
 	return new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name))).has("message") ? toolsAllow : [...toolsAllow, "message"];
 }
+function shouldEnableCodexAppServerNativeToolSurface(params) {
+	const toolsAllow = includeForcedMessageToolAllow(params.toolsAllow, params);
+	if (toolsAllow === void 0) return true;
+	return hasWildcardCodexToolsAllow(toolsAllow);
+}
+function disableCodexPluginThreadConfig(pluginConfig) {
+	const config = readCodexPluginConfig(pluginConfig);
+	return {
+		...config,
+		codexPlugins: {
+			...config.codexPlugins,
+			enabled: false
+		}
+	};
+}
 function filterCodexDynamicToolsForAllowlist(tools, toolsAllow) {
-	if (!toolsAllow || toolsAllow.length === 0) return tools;
+	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)));
 }
+function hasWildcardCodexToolsAllow(toolsAllow) {
+	return toolsAllow.some((name) => normalizeCodexDynamicToolName(name) === "*");
+}
 function shouldForceMessageTool(params) {
 	return params.sourceReplyDeliveryMode === "message_tool_only";
 }
@@ -4365,6 +4653,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 };
@@ -4749,6 +5054,7 @@ function handleApprovalRequest(params) {
 		paramsForRun: params.paramsForRun,
 		threadId: params.threadId,
 		turnId: params.turnId,
+		nativeHookRelay: params.nativeHookRelay,
 		signal: params.signal
 	});
 }