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

package/dist/{session-binding-CMTXuyoz.js → session-binding-DbdVqMzW.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { a as normalizeCodexServiceTier } from "./config-0rd3LnKg.js";
+import { o as normalizeCodexServiceTier } from "./config-3ATInASk.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import fs from "node:fs/promises";
 import { ensureAuthProfileStore, resolveDefaultAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
@@ -103,7 +103,19 @@ function readContextEngineBinding(value) {
 	return {
 		schemaVersion: 1,
 		engineId: record.engineId,
-		policyFingerprint: record.policyFingerprint
+		policyFingerprint: record.policyFingerprint,
+		projection: readContextEngineProjectionBinding(record.projection)
+	};
+}
+function readContextEngineProjectionBinding(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const record = value;
+	if (record.schemaVersion !== 1 || record.mode !== "thread_bootstrap" || typeof record.epoch !== "string" || !record.epoch.trim()) return;
+	return {
+		schemaVersion: 1,
+		mode: "thread_bootstrap",
+		epoch: record.epoch,
+		fingerprint: typeof record.fingerprint === "string" ? record.fingerprint : void 0
 	};
 }
 function readPluginAppPolicyContext(value) {

package/dist/{shared-client-BwUqd3lh.js → shared-client-CnbrvEfV.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { n as codexAppServerStartOptionsKey, s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
-import { a as MANAGED_CODEX_APP_SERVER_PACKAGE, o as resolveCodexAppServerSpawnEnv, t as CodexAppServerClient } from "./client-CoctX13d.js";
+import { c as resolveCodexAppServerRuntimeOptions, n as codexAppServerStartOptionsKey } from "./config-3ATInASk.js";
+import { a as MANAGED_CODEX_APP_SERVER_PACKAGE, o as resolveCodexAppServerSpawnEnv, t as CodexAppServerClient } from "./client-CA7amCZ8.js";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import { constants, readFileSync } from "node:fs";

package/dist/{side-question-CVWPOkY-.js → side-question-CFcVH8fj.js}

@@ -1,12 +1,12 @@
-import { o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
+import { c as resolveCodexAppServerRuntimeOptions, s as readCodexPluginConfig } from "./config-3ATInASk.js";
 import { a as readCodexDynamicToolCallParams, i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, t as assertCodexThreadForkResponse } from "./protocol-validators-CSY0BFBo.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { r as isCodexAppServerApprovalRequest } from "./client-CoctX13d.js";
-import { u as formatCodexUsageLimitErrorMessage } from "./command-formatters-DRJaVHhN.js";
-import { i as getSharedCodexAppServerClient, s as refreshCodexAppServerAuthTokens } from "./shared-client-BwUqd3lh.js";
-import { i as readCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { c as resolveCodexAppServerModelProvider, l as resolveReasoningEffort, n as buildCodexRuntimeThreadConfig, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-DrbViNpf.js";
-import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-CzTdigBu.js";
+import { r as isCodexAppServerApprovalRequest } from "./client-CA7amCZ8.js";
+import { u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BRW7_Nu7.js";
+import { i as getSharedCodexAppServerClient, s as refreshCodexAppServerAuthTokens } from "./shared-client-CnbrvEfV.js";
+import { i as readCodexAppServerBinding } from "./session-binding-DbdVqMzW.js";
+import { b as createCodexDynamicToolBridge, d as resolveReasoningEffort, n as buildCodexRuntimeThreadConfig, u as resolveCodexAppServerModelProvider, x as filterCodexDynamicTools } from "./thread-lifecycle-BMK4m_PL.js";
+import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-Cm_YicZb.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import { embeddedAgentLog, formatErrorMessage, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/side-question.ts

package/dist/test-api.js

@@ -1,5 +1,5 @@
-import { s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
-import { a as buildThreadStartParams, i as buildThreadResumeParams, o as buildTurnStartParams, r as buildDeveloperInstructions, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-DrbViNpf.js";
+import { c as resolveCodexAppServerRuntimeOptions } from "./config-3ATInASk.js";
+import { a as buildThreadResumeParams, b as createCodexDynamicToolBridge, i as buildDeveloperInstructions, o as buildThreadStartParams, s as buildTurnStartParams, x as filterCodexDynamicTools } from "./thread-lifecycle-BMK4m_PL.js";
 //#region extensions/codex/test-api.ts
 function resolveCodexPromptSnapshotAppServerOptions(pluginConfig) {
 	return resolveCodexAppServerRuntimeOptions({

package/dist/{thread-lifecycle-DrbViNpf.js → thread-lifecycle-BMK4m_PL.js}

@@ -1,14 +1,15 @@
-import { l as resolveCodexPluginsPolicy, r as codexSandboxPolicyForTurn } from "./config-0rd3LnKg.js";
+import { r as codexSandboxPolicyForTurn, u as resolveCodexPluginsPolicy } from "./config-3ATInASk.js";
 import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-CSY0BFBo.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY, renderCodexPromptOverlay } from "./prompt-overlay.js";
 import { isModernCodexModel } from "./provider.js";
-import { i as isCodexAppServerConnectionClosedError } from "./client-CoctX13d.js";
-import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { a as defaultCodexAppInventoryCache, r as readCodexPluginInventory, t as ensureCodexPluginActivation } from "./plugin-activation-aQOmRQwA.js";
+import { i as isCodexAppServerConnectionClosedError } from "./client-CA7amCZ8.js";
+import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DbdVqMzW.js";
+import { a as defaultCodexAppInventoryCache, r as readCodexPluginInventory, t as ensureCodexPluginActivation } from "./plugin-activation-BDU4e-NA.js";
 import crypto from "node:crypto";
 import { HEARTBEAT_RESPONSE_TOOL_NAME, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractToolResultMediaArtifact, filterToolResultMediaUrls, isActiveHarnessContextEngine, isMessagingTool, isMessagingToolSendAction, isToolWrappedWithBeforeToolCallHook, normalizeHeartbeatToolResponse, runAgentHarnessAfterToolCallHook, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { buildCodexUserMcpServersThreadConfigPatch } from "openclaw/plugin-sdk/codex-mcp-projection";
+import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/codex/src/app-server/dynamic-tool-profile.ts
 const CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES = [
 	"read",
@@ -17,7 +18,11 @@ const CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES = [
 	"apply_patch",
 	"exec",
 	"process",
-	"update_plan"
+	"update_plan",
+	"tool_search_code",
+	"tool_search",
+	"tool_describe",
+	"tool_call"
 ];
 const DYNAMIC_TOOL_NAME_ALIASES = {
 	bash: "exec",
@@ -365,7 +370,10 @@ function projectContextEngineAssemblyForCodex(params) {
 	const prompt = params.prompt.trim();
 	const contextMessages = dropDuplicateTrailingPrompt(params.assembledMessages, prompt);
 	const maxRenderedContextChars = normalizeRenderedContextMaxChars(params.maxRenderedContextChars);
-	const renderedContext = renderMessagesForCodexContext(contextMessages, { maxTextPartChars: resolveTextPartMaxChars(maxRenderedContextChars) });
+	const renderedContext = renderMessagesForCodexContext(contextMessages, {
+		maxTextPartChars: resolveTextPartMaxChars(maxRenderedContextChars),
+		toolPayloadMode: params.toolPayloadMode ?? "elide"
+	});
 	const promptText = renderedContext ? [
 		CONTEXT_HEADER,
 		CONTEXT_SAFETY_NOTE,
@@ -436,10 +444,88 @@ function renderMessagePart(part, options) {
 	const type = typeof record.type === "string" ? record.type : void 0;
 	if (type === "text") return typeof record.text === "string" ? truncateText(record.text.trim(), options.maxTextPartChars) : "";
 	if (type === "image") return "[image omitted]";
-	if (type === "toolCall" || type === "tool_use") return `tool call${typeof record.name === "string" ? `: ${record.name}` : ""} [input omitted]`;
-	if (type === "toolResult" || type === "tool_result") return `${typeof record.toolUseId === "string" ? `tool result: ${record.toolUseId}` : "tool result"} [content omitted]`;
+	if (type === "toolCall" || type === "tool_use") {
+		const label = `tool call${typeof record.name === "string" ? `: ${record.name}` : ""}`;
+		if (options.toolPayloadMode === "preserve") return truncateText(`${label}\n${stableJson(renderToolCallPayload(record))}`, options.maxTextPartChars);
+		return `${label} [input omitted]`;
+	}
+	if (type === "toolResult" || type === "tool_result") {
+		const label = typeof record.toolUseId === "string" ? `tool result: ${record.toolUseId}` : "tool result";
+		if (options.toolPayloadMode === "preserve") return truncateText(`${label}\n${stableJson(renderToolResultPayload(record))}`, options.maxTextPartChars);
+		return `${label} [content omitted]`;
+	}
 	return `[${type ?? "non-text"} content omitted]`;
 }
+function renderToolCallPayload(record) {
+	const payload = pickToolPayloadMetadata(record);
+	const input = record.input ?? record.arguments;
+	if (input !== void 0) payload.inputShape = summarizeToolInputShape(input);
+	return payload;
+}
+function renderToolResultPayload(record) {
+	const payload = pickToolPayloadMetadata(record);
+	for (const [key, value] of Object.entries(record)) {
+		if (TOOL_PAYLOAD_METADATA_KEYS.has(key)) continue;
+		payload[key] = redactPreservedToolValue(key, value);
+	}
+	return payload;
+}
+const TOOL_PAYLOAD_METADATA_KEYS = new Set([
+	"type",
+	"name",
+	"id",
+	"callId",
+	"toolCallId",
+	"toolUseId"
+]);
+function pickToolPayloadMetadata(record) {
+	const payload = {};
+	for (const key of TOOL_PAYLOAD_METADATA_KEYS) {
+		const value = record[key];
+		if (typeof value === "string" && value.trim()) payload[key] = redactSensitiveFieldValue(key, value);
+	}
+	return payload;
+}
+function summarizeToolInputShape(value, seen = /* @__PURE__ */ new WeakSet()) {
+	if (value === null) return null;
+	if (Array.isArray(value)) {
+		if (seen.has(value)) return "[Circular]";
+		seen.add(value);
+		return value.map((entry) => summarizeToolInputShape(entry, seen));
+	}
+	if (value && typeof value === "object") {
+		if (seen.has(value)) return "[Circular]";
+		seen.add(value);
+		const out = {};
+		for (const [key, child] of Object.entries(value)) out[key] = summarizeToolInputShape(child, seen);
+		return out;
+	}
+	return `[${typeof value}]`;
+}
+function redactPreservedToolValue(key, value, seen = /* @__PURE__ */ new WeakSet()) {
+	if (typeof value === "string") return redactSensitiveFieldValue(key, redactToolPayloadText(value));
+	if (value === null || value === void 0 || typeof value === "number" || typeof value === "boolean") return value;
+	if (Array.isArray(value)) {
+		if (seen.has(value)) return "[Circular]";
+		seen.add(value);
+		return value.map((entry) => redactPreservedToolValue(key, entry, seen));
+	}
+	if (value && typeof value === "object") {
+		if (seen.has(value)) return "[Circular]";
+		seen.add(value);
+		const out = {};
+		for (const [childKey, child] of Object.entries(value)) out[childKey] = redactPreservedToolValue(childKey, child, seen);
+		return out;
+	}
+	return `[${typeof value}]`;
+}
+function stableJson(value) {
+	try {
+		return JSON.stringify(value, null, 2) ?? "";
+	} catch {
+		return "[unserializable payload omitted]";
+	}
+}
 function extractMessageText(message) {
 	if (!hasMessageContent(message)) return "";
 	if (typeof message.content === "string") return message.content;
@@ -704,8 +790,8 @@ const CODEX_CODE_MODE_THREAD_CONFIG = {
 const CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG = { project_doc_max_bytes: 0 };
 async function startOrResumeThread(params) {
 	const dynamicToolsFingerprint = fingerprintDynamicTools(params.dynamicTools);
-	const contextEngineBinding = buildContextEngineBinding(params.params);
-	const userMcpServersConfigPatch = buildCodexUserMcpServersThreadConfigPatch(params.params.config);
+	const contextEngineBinding = buildContextEngineBinding(params.params, params.contextEngineProjection);
+	const userMcpServersConfigPatch = buildCodexUserMcpServersThreadConfigPatch(params.params.config, { agentId: params.agentId ?? params.params.agentId });
 	const userMcpServersFingerprint = fingerprintUserMcpServersConfigPatch(userMcpServersConfigPatch);
 	let binding = await readCodexAppServerBinding(params.params.sessionFile, {
 		authProfileStore: params.params.authProfileStore,
@@ -720,7 +806,13 @@ async function startOrResumeThread(params) {
 			embeddedAgentLog.debug("codex app-server context-engine binding changed; starting a new thread", {
 				threadId: binding.threadId,
 				engineId: contextEngineBinding?.engineId,
-				previousEngineId: binding.contextEngine?.engineId
+				previousEngineId: binding.contextEngine?.engineId,
+				epoch: contextEngineBinding?.projection?.epoch,
+				previousEpoch: binding.contextEngine?.projection?.epoch,
+				fingerprint: contextEngineBinding?.projection?.fingerprint,
+				previousFingerprint: binding.contextEngine?.projection?.fingerprint,
+				policyFingerprint: contextEngineBinding?.policyFingerprint,
+				previousPolicyFingerprint: binding.contextEngine?.policyFingerprint
 			});
 			await clearCodexAppServerBinding(params.params.sessionFile);
 			binding = void 0;
@@ -816,6 +908,15 @@ async function startOrResumeThread(params) {
 			agentDir: params.params.agentDir,
 			config: params.params.config
 		});
+		if (contextEngineBinding) embeddedAgentLog.info("codex app-server wrote context-engine thread binding", {
+			sessionId: params.params.sessionId,
+			sessionKey: params.params.sessionKey,
+			threadId: response.thread.id,
+			engineId: contextEngineBinding.engineId,
+			epoch: contextEngineBinding.projection?.epoch,
+			fingerprint: contextEngineBinding.projection?.fingerprint,
+			action: "resumed"
+		});
 		return {
 			...binding,
 			threadId: response.thread.id,
@@ -855,25 +956,36 @@ async function startOrResumeThread(params) {
 	});
 	const createdAt = (/* @__PURE__ */ new Date()).toISOString();
 	const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : void 0;
-	if (!preserveExistingBinding) await writeCodexAppServerBinding(params.params.sessionFile, {
-		threadId: response.thread.id,
-		cwd: params.cwd,
-		authProfileId: params.params.authProfileId,
-		model: response.model ?? params.params.modelId,
-		modelProvider: response.modelProvider ?? modelProvider,
-		dynamicToolsFingerprint,
-		userMcpServersFingerprint,
-		mcpServersFingerprint: nextMcpServersFingerprint,
-		pluginAppsFingerprint: pluginThreadConfig?.fingerprint,
-		pluginAppsInputFingerprint: pluginThreadConfig?.inputFingerprint,
-		pluginAppPolicyContext: pluginThreadConfig?.policyContext,
-		contextEngine: contextEngineBinding,
-		createdAt
-	}, {
-		authProfileStore: params.params.authProfileStore,
-		agentDir: params.params.agentDir,
-		config: params.params.config
-	});
+	if (!preserveExistingBinding) {
+		await writeCodexAppServerBinding(params.params.sessionFile, {
+			threadId: response.thread.id,
+			cwd: params.cwd,
+			authProfileId: params.params.authProfileId,
+			model: response.model ?? params.params.modelId,
+			modelProvider: response.modelProvider ?? modelProvider,
+			dynamicToolsFingerprint,
+			userMcpServersFingerprint,
+			mcpServersFingerprint: nextMcpServersFingerprint,
+			pluginAppsFingerprint: pluginThreadConfig?.fingerprint,
+			pluginAppsInputFingerprint: pluginThreadConfig?.inputFingerprint,
+			pluginAppPolicyContext: pluginThreadConfig?.policyContext,
+			contextEngine: contextEngineBinding,
+			createdAt
+		}, {
+			authProfileStore: params.params.authProfileStore,
+			agentDir: params.params.agentDir,
+			config: params.params.config
+		});
+		if (contextEngineBinding) embeddedAgentLog.info("codex app-server wrote context-engine thread binding", {
+			sessionId: params.params.sessionId,
+			sessionKey: params.params.sessionKey,
+			threadId: response.thread.id,
+			engineId: contextEngineBinding.engineId,
+			epoch: contextEngineBinding.projection?.epoch,
+			fingerprint: contextEngineBinding.projection?.fingerprint,
+			action: rotatedContextEngineBinding ? "rotated" : "started"
+		});
+	}
 	return {
 		schemaVersion: 1,
 		threadId: response.thread.id,
@@ -897,7 +1009,7 @@ async function startOrResumeThread(params) {
 		}
 	};
 }
-function buildContextEngineBinding(params) {
+function buildContextEngineBinding(params, projection) {
 	const contextEngine = isActiveHarnessContextEngine(params.contextEngine) ? params.contextEngine : void 0;
 	const engineId = contextEngine?.info?.id?.trim();
 	if (!contextEngine || !engineId) return;
@@ -916,11 +1028,24 @@ function buildContextEngineBinding(params) {
 				contextTokenBudget: params.contextTokenBudget,
 				reserveTokens: resolveCodexContextEngineProjectionReserveTokens({ config: params.config })
 			})
-		})
+		}),
+		projection: projection ? buildContextEngineProjectionBinding(projection) : void 0
+	};
+}
+function buildContextEngineProjectionBinding(projection) {
+	return {
+		schemaVersion: 1,
+		mode: "thread_bootstrap",
+		epoch: projection.epoch,
+		fingerprint: projection.fingerprint
 	};
 }
 function isContextEngineBindingCompatible(previous, next) {
-	return previous?.schemaVersion === next.schemaVersion && previous.engineId === next.engineId && previous.policyFingerprint === next.policyFingerprint;
+	return previous?.schemaVersion === next.schemaVersion && previous.engineId === next.engineId && previous.policyFingerprint === next.policyFingerprint && areContextEngineProjectionBindingsCompatible(previous.projection, next.projection);
+}
+function areContextEngineProjectionBindingsCompatible(previous, next) {
+	if (!next) return previous === void 0;
+	return previous?.schemaVersion === next.schemaVersion && previous.mode === next.mode && previous.epoch === next.epoch && previous.fingerprint === next.fingerprint;
 }
 function resolveContextEngineCitationsMode(config) {
 	const rootConfig = isUnknownRecord(config) ? config : void 0;
@@ -1135,4 +1260,4 @@ function resolveReasoningEffort(thinkLevel, modelId) {
 	return null;
 }
 //#endregion
-export { resolveCodexContextEngineProjectionReserveTokens as _, buildThreadStartParams as a, normalizeCodexDynamicToolName as b, resolveCodexAppServerModelProvider as c, buildCodexPluginThreadConfig as d, buildCodexPluginThreadConfigInputFingerprint as f, resolveCodexContextEngineProjectionMaxChars as g, projectContextEngineAssemblyForCodex as h, buildThreadResumeParams as i, resolveReasoningEffort as l, shouldBuildCodexPluginThreadConfig as m, buildCodexRuntimeThreadConfig as n, buildTurnStartParams as o, mergeCodexThreadConfigs as p, buildDeveloperInstructions as r, codexDynamicToolsFingerprint as s, areCodexDynamicToolFingerprintsCompatible as t, startOrResumeThread as u, createCodexDynamicToolBridge as v, filterCodexDynamicTools as y };
+export { normalizeCodexDynamicToolName as S, projectContextEngineAssemblyForCodex as _, buildThreadResumeParams as a, createCodexDynamicToolBridge as b, codexDynamicToolsFingerprint as c, resolveReasoningEffort as d, startOrResumeThread as f, shouldBuildCodexPluginThreadConfig as g, mergeCodexThreadConfigs as h, buildDeveloperInstructions as i, isContextEngineBindingCompatible as l, buildCodexPluginThreadConfigInputFingerprint as m, buildCodexRuntimeThreadConfig as n, buildThreadStartParams as o, buildCodexPluginThreadConfig as p, buildContextEngineBinding as r, buildTurnStartParams as s, areCodexDynamicToolFingerprintsCompatible as t, resolveCodexAppServerModelProvider as u, resolveCodexContextEngineProjectionMaxChars as v, filterCodexDynamicTools as x, resolveCodexContextEngineProjectionReserveTokens as y };

package/dist/{vision-tools-CzTdigBu.js → vision-tools-Cm_YicZb.js}

@@ -1,6 +1,6 @@
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { r as formatCodexDisplayText } from "./command-formatters-DRJaVHhN.js";
-import { callGatewayTool, embeddedAgentLog, formatApprovalDisplayPath } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { r as formatCodexDisplayText } from "./command-formatters-BRW7_Nu7.js";
+import { callGatewayTool, embeddedAgentLog, formatApprovalDisplayPath, runBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
 const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;
 const MAX_PLUGIN_APPROVAL_TITLE_LENGTH = 80;
@@ -84,6 +84,25 @@ async function handleCodexAppServerApprovalRequest(params) {
 		paramsForRun: params.paramsForRun
 	});
 	try {
+		const policyOutcome = await runOpenClawToolPolicyForApprovalRequest({
+			method: params.method,
+			requestParams,
+			paramsForRun: params.paramsForRun,
+			context,
+			signal: params.signal
+		});
+		if (policyOutcome?.blocked) {
+			emitApprovalEvent(params.paramsForRun, {
+				phase: "resolved",
+				kind: context.kind,
+				status: "denied",
+				title: context.title,
+				...context.eventDetails,
+				...approvalEventScope(params.method, "denied"),
+				message: policyOutcome.reason
+			});
+			return buildApprovalResponse(params.method, context.requestParams, "denied");
+		}
 		const requestResult = await requestPluginApproval({
 			paramsForRun: params.paramsForRun,
 			title: context.title,
@@ -198,6 +217,79 @@ function buildApprovalContext(params) {
 		}
 	};
 }
+async function runOpenClawToolPolicyForApprovalRequest(params) {
+	const policyRequest = buildOpenClawToolPolicyRequest(params.method, params.requestParams);
+	if (!policyRequest) return;
+	const cwd = readString$1(params.requestParams, "cwd") ?? params.paramsForRun.workspaceDir;
+	const outcome = await runBeforeToolCallHook({
+		toolName: policyRequest.toolName,
+		params: policyRequest.params,
+		...params.context.itemId ? { toolCallId: params.context.itemId } : {},
+		approvalMode: "report",
+		signal: params.signal,
+		ctx: {
+			...params.paramsForRun.agentId ? { agentId: params.paramsForRun.agentId } : {},
+			...params.paramsForRun.config ? { config: params.paramsForRun.config } : {},
+			...cwd ? { cwd } : {},
+			...params.paramsForRun.sessionKey ? { sessionKey: params.paramsForRun.sessionKey } : {},
+			...params.paramsForRun.sessionId ? { sessionId: params.paramsForRun.sessionId } : {},
+			...params.paramsForRun.runId ? { runId: params.paramsForRun.runId } : {},
+			...params.paramsForRun.messageChannel || params.paramsForRun.messageProvider ? { channelId: params.paramsForRun.messageChannel ?? params.paramsForRun.messageProvider } : {}
+		}
+	});
+	if (outcome.blocked) return {
+		blocked: true,
+		reason: outcome.reason
+	};
+	if ("params" in outcome && toolPolicyParamsWereRewritten(policyRequest.params, outcome.params)) return {
+		blocked: true,
+		reason: "OpenClaw tool policy rewrote Codex app-server approval params; refusing original request."
+	};
+}
+function buildOpenClawToolPolicyRequest(method, requestParams) {
+	if (method === "item/commandExecution/requestApproval") {
+		const command = readPolicyCommand(requestParams);
+		return {
+			toolName: "bash",
+			params: {
+				...command ? { command } : {},
+				...readString$1(requestParams, "cwd") ? { cwd: readString$1(requestParams, "cwd") } : {},
+				approval: requestParams ?? {}
+			}
+		};
+	}
+	if (method === "item/fileChange/requestApproval") return {
+		toolName: "apply_patch",
+		params: requestParams ?? {}
+	};
+	if (method === "item/permissions/requestApproval") return {
+		toolName: "codex_permission_approval",
+		params: requestParams ?? {}
+	};
+}
+function toolPolicyParamsWereRewritten(original, candidate) {
+	if (candidate === original) return false;
+	const originalText = stableJsonText(original);
+	const candidateText = stableJsonText(candidate);
+	return !candidateText || candidateText !== originalText;
+}
+function stableJsonText(value) {
+	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return JSON.stringify(value);
+	if (Array.isArray(value)) {
+		const items = value.map((item) => stableJsonText(item));
+		return items.every((item) => item !== void 0) ? `[${items.join(",")}]` : void 0;
+	}
+	if (isPlainRecord(value)) {
+		const entries = Object.entries(value).toSorted(([left], [right]) => left.localeCompare(right)).map(([key, item]) => {
+			const text = stableJsonText(item);
+			return text === void 0 ? void 0 : `${JSON.stringify(key)}:${text}`;
+		});
+		return entries.every((entry) => entry !== void 0) ? `{${entries.join(",")}}` : void 0;
+	}
+}
+function isPlainRecord(value) {
+	return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
 function commandApprovalDecision(requestParams, outcome) {
 	if (outcome === "cancelled") return commandRejectionDecision(requestParams, "cancel");
 	if (outcome === "denied" || outcome === "unavailable") return commandRejectionDecision(requestParams, "decline");
@@ -452,13 +544,21 @@ function readDisplayCommandPreview(record) {
 	if (actionCommand) return actionCommand;
 	return readCommandPreview(record);
 }
-function readCommandActionsPreview(record) {
+function readPolicyCommand(record) {
+	const command = record?.command;
+	if (typeof command === "string") return command;
+	if (Array.isArray(command) && command.every((part) => typeof part === "string")) return command.join(" ");
+	const actionCommands = readCommandActions(record);
+	if (actionCommands.length > 0) return actionCommands.join(" && ");
+}
+function readCommandActions(record) {
 	const actions = record?.commandActions;
-	if (!Array.isArray(actions)) return;
+	if (!Array.isArray(actions)) return [];
+	return actions.map((action) => isJsonObject(action) ? readString$1(action, "command") : void 0).filter((command) => Boolean(command));
+}
+function readCommandActionsPreview(record) {
 	let source;
-	for (const action of actions) {
-		const command = isJsonObject(action) ? readString$1(action, "command") : void 0;
-		if (!command) continue;
+	for (const command of readCommandActions(record)) {
 		source = appendPreviewPart(source, command, " && ");
 		if (source.clipped) break;
 	}

package/openclaw.plugin.json

@@ -333,7 +333,7 @@
     },
     "appServer.turnCompletionIdleTimeoutMs": {
       "label": "Turn Completion Idle Timeout",
-      "help": "Maximum quiet time after a turn-scoped Codex app-server request before OpenClaw interrupts the turn while waiting for turn/completed.",
+      "help": "Maximum quiet time after Codex accepts a turn or after a turn-scoped app-server request before OpenClaw interrupts the turn while waiting for turn/completed.",
       "advanced": true
     },
     "appServer.approvalPolicy": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.14-beta.2",
+  "version": "2026.5.16-beta.2",
   "description": "OpenClaw Codex harness and model provider plugin",
   "repository": {
     "type": "git",
@@ -27,10 +27,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.14-beta.2"
+      "pluginApi": ">=2026.5.16-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.5.14-beta.2"
+      "openclawVersion": "2026.5.16-beta.2"
     },
     "release": {
       "publishToClawHub": true,
@@ -45,7 +45,7 @@
     "openclaw.plugin.json"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.14-beta.2"
+    "openclaw": ">=2026.5.16-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {