@openclaw/codex 2026.5.10-beta.2 → 2026.5.10-beta.3

package/dist/{run-attempt-CefRS5_d.js → run-attempt-COMElKgN.js}

@@ -1,14 +1,14 @@
-import { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, u as withMcpElicitationsApprovalPolicy } from "./config-CT01BBDc.js";
+import { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, u as withMcpElicitationsApprovalPolicy } from "./config-C7xdbzrp.js";
 import { i as readCodexDynamicToolCallParams, r as assertCodexTurnStartResponse, s as readCodexTurn } from "./protocol-validators-CeCyJaWj.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CTzy3Y6M.js";
-import { d as formatCodexUsageLimitErrorMessage, i as formatCodexDisplayText } from "./request-DC1Dz3iZ.js";
-import { a as refreshCodexAppServerAuthTokens, c as resolveCodexAppServerAuthProfileIdForAgent, l as resolveCodexAppServerEnvApiKeyCacheKey, o as resolveCodexAppServerAuthAccountCacheKey, s as resolveCodexAppServerAuthProfileId, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerHomeDir } from "./shared-client-p-TvEiNL.js";
-import { i as readCodexAppServerBinding } from "./session-binding-B44KIZM2.js";
-import { i as defaultCodexAppInventoryCache, r as buildCodexAppInventoryCacheKey } from "./plugin-activation-CweAZa7r.js";
-import { a as buildTurnStartParams, c as buildCodexPluginThreadConfig, d as createCodexDynamicToolBridge, f as filterCodexDynamicTools, l as buildCodexPluginThreadConfigInputFingerprint, n as buildDeveloperInstructions, o as codexDynamicToolsFingerprint, p as normalizeCodexDynamicToolName, s as startOrResumeThread, t as areCodexDynamicToolFingerprintsCompatible, u as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-CGc-O_5d.js";
-import { n as defaultCodexAppServerClientFactory } from "./client-factory-BJL_efz4.js";
-import { n as rememberCodexRateLimits, r as ensureCodexComputerUse, t as readRecentCodexRateLimits } from "./rate-limit-cache-DbZvmrAD.js";
+import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CpksBQ9l.js";
+import { d as formatCodexUsageLimitErrorMessage, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as formatCodexDisplayText, p as CODEX_CONTROL_METHODS } from "./request-Bj4IRDU9.js";
+import { a as refreshCodexAppServerAuthTokens, c as resolveCodexAppServerAuthProfileIdForAgent, l as resolveCodexAppServerEnvApiKeyCacheKey, o as resolveCodexAppServerAuthAccountCacheKey, s as resolveCodexAppServerAuthProfileId, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerHomeDir } from "./shared-client-BRX9tReb.js";
+import { i as readCodexAppServerBinding } from "./session-binding-BAaJ-7s-.js";
+import { i as defaultCodexAppInventoryCache, r as buildCodexAppInventoryCacheKey } from "./plugin-activation-Dn14PX1W.js";
+import { a as buildTurnStartParams, c as buildCodexPluginThreadConfig, d as createCodexDynamicToolBridge, f as filterCodexDynamicTools, l as buildCodexPluginThreadConfigInputFingerprint, n as buildDeveloperInstructions, o as codexDynamicToolsFingerprint, p as normalizeCodexDynamicToolName, s as startOrResumeThread, t as areCodexDynamicToolFingerprintsCompatible, u as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-DRyCVHhL.js";
+import { n as defaultCodexAppServerClientFactory } from "./client-factory-BHbKz0nI.js";
+import { n as rememberCodexRateLimits, r as ensureCodexComputerUse, t as readRecentCodexRateLimits } from "./rate-limit-cache-BFTJlMhx.js";
 import { createHash } from "node:crypto";
 import nodeFs from "node:fs";
 import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, callGatewayTool, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatApprovalDisplayPath, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockAcquireTimeoutMs, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -19,7 +19,7 @@ import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runt
 import { AsyncLocalStorage } from "node:async_hooks";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@mariozechner/pi-coding-agent";
-import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/text-runtime";
+import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
 const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;
 const MAX_PLUGIN_APPROVAL_TITLE_LENGTH = 80;
@@ -1301,6 +1301,8 @@ var CodexAppServerEventProjector = class {
 		this.toolTranscriptMessages = [];
 		this.toolTranscriptCallIds = /* @__PURE__ */ new Set();
 		this.toolTranscriptResultIds = /* @__PURE__ */ new Set();
+		this.nativeGeneratedMediaUrls = /* @__PURE__ */ new Set();
+		this.diagnosticToolStartedAtByItem = /* @__PURE__ */ new Map();
 		this.assistantStarted = false;
 		this.reasoningStarted = false;
 		this.reasoningEnded = false;
@@ -1418,7 +1420,7 @@ var CodexAppServerEventProjector = class {
 			messagingToolSentMediaUrls: toolTelemetry.messagingToolSentMediaUrls,
 			messagingToolSentTargets: toolTelemetry.messagingToolSentTargets,
 			heartbeatToolResponse: toolTelemetry.heartbeatToolResponse,
-			toolMediaUrls: toolTelemetry.toolMediaUrls,
+			toolMediaUrls: this.buildToolMediaUrls(toolTelemetry),
 			toolAudioAsVoice: toolTelemetry.toolAudioAsVoice,
 			successfulCronAdds: toolTelemetry.successfulCronAdds,
 			cloudCodeAssistFormatError: false,
@@ -1565,6 +1567,7 @@ var CodexAppServerEventProjector = class {
 			this.rememberAssistantItem(item.id);
 			this.assistantTextByItem.set(item.id, item.text);
 		}
+		this.recordNativeGeneratedMedia(item);
 		if (item?.type === "plan" && typeof item.text === "string" && item.text) {
 			this.planTextByItem.set(item.id, item.text);
 			this.emitPlanUpdate({
@@ -1694,6 +1697,7 @@ var CodexAppServerEventProjector = class {
 				this.rememberAssistantItem(item.id);
 				this.assistantTextByItem.set(item.id, item.text);
 			}
+			this.recordNativeGeneratedMedia(item);
 			if (item.type === "plan" && typeof item.text === "string" && item.text) {
 				this.planTextByItem.set(item.id, item.text);
 				this.emitPlanUpdate({
@@ -1752,6 +1756,16 @@ var CodexAppServerEventProjector = class {
 		this.rememberAssistantItem(itemId);
 		this.assistantTextByItem.set(itemId, text);
 	}
+	recordNativeGeneratedMedia(item) {
+		if (item?.type !== "imageGeneration") return;
+		const savedPath = readItemString(item, "savedPath")?.trim();
+		if (savedPath) this.nativeGeneratedMediaUrls.add(savedPath);
+	}
+	buildToolMediaUrls(toolTelemetry) {
+		const mediaUrls = new Set(toolTelemetry.toolMediaUrls?.map((url) => url.trim()).filter(Boolean) ?? []);
+		if ((toolTelemetry.messagingToolSentMediaUrls?.length ?? 0) === 0) for (const mediaUrl of this.nativeGeneratedMediaUrls) mediaUrls.add(mediaUrl);
+		return mediaUrls.size > 0 ? [...mediaUrls] : toolTelemetry.toolMediaUrls;
+	}
 	async maybeEndReasoning() {
 		if (!this.reasoningStarted || this.reasoningEnded) return;
 		this.reasoningEnded = true;
@@ -1799,6 +1813,12 @@ 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.emitDiagnosticToolExecutionEvent({
+			phase: params.phase,
+			item,
+			name,
+			status
+		});
 		this.emitAgentEvent({
 			stream: "tool",
 			data: {
@@ -1816,6 +1836,42 @@ var CodexAppServerEventProjector = class {
 			}
 		});
 	}
+	emitDiagnosticToolExecutionEvent(params) {
+		const base = {
+			runId: this.params.runId,
+			sessionId: this.params.sessionId,
+			sessionKey: this.params.sessionKey,
+			toolName: params.name,
+			toolCallId: params.item.id
+		};
+		if (params.phase === "start") {
+			this.diagnosticToolStartedAtByItem.set(params.item.id, Date.now());
+			emitTrustedDiagnosticEvent({
+				type: "tool.execution.started",
+				...base
+			});
+			return;
+		}
+		const startedAt = this.diagnosticToolStartedAtByItem.get(params.item.id);
+		this.diagnosticToolStartedAtByItem.delete(params.item.id);
+		const durationMs = (typeof params.item.durationMs === "number" ? params.item.durationMs : void 0) ?? (startedAt === void 0 ? 0 : Math.max(0, Date.now() - startedAt));
+		const terminalEvent = params.status === "blocked" ? {
+			type: "tool.execution.blocked",
+			reason: "codex_native_tool_blocked",
+			deniedReason: "codex_native_tool_blocked"
+		} : params.status === "failed" ? {
+			type: "tool.execution.error",
+			durationMs,
+			errorCategory: "codex_native_tool_error"
+		} : {
+			type: "tool.execution.completed",
+			durationMs
+		};
+		emitTrustedDiagnosticEvent({
+			...base,
+			...terminalEvent
+		});
+	}
 	emitToolResultSummary(item) {
 		if (!item || !this.params.onToolResult || !this.shouldEmitToolResult()) return;
 		const itemId = item.id;
@@ -1986,13 +2042,15 @@ var CodexAppServerEventProjector = class {
 		};
 	}
 	createToolCallMessage(params) {
+		const args = normalizeToolTranscriptArguments(params.arguments);
 		return {
 			role: "assistant",
 			content: [{
 				type: "toolCall",
 				id: params.id,
 				name: params.name,
-				arguments: normalizeToolTranscriptArguments(params.arguments)
+				arguments: args,
+				input: args
 			}],
 			api: this.params.model.api ?? "openai-codex-responses",
 			provider: this.params.provider,
@@ -2011,6 +2069,9 @@ var CodexAppServerEventProjector = class {
 			isError: params.isError,
 			content: [{
 				type: "toolResult",
+				id: params.id,
+				name: params.name,
+				toolName: params.name,
 				toolCallId: params.id,
 				toolUseId: params.id,
 				tool_use_id: params.id,
@@ -2745,6 +2806,7 @@ const CODEX_DYNAMIC_TOOL_MAX_TIMEOUT_MS = 6e5;
 const CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 6e4;
 const CODEX_APP_SERVER_STARTUP_CONNECTION_CLOSE_MAX_ATTEMPTS = 3;
 const CODEX_APP_SERVER_STARTUP_TIMEOUT_FLOOR_MS = 100;
+const CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS = 5e3;
 const CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS = 6e4;
 const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
@@ -3047,13 +3109,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? historyMessages;
 	}
 	const baseDeveloperInstructions = buildDeveloperInstructions(params);
-	const workspaceBootstrapInstructions = await buildCodexWorkspaceBootstrapInstructions({
+	const workspaceBootstrapContext = await buildCodexWorkspaceBootstrapContext({
 		params,
 		resolvedWorkspace,
 		effectiveWorkspace,
 		sessionKey: sandboxSessionKey,
 		sessionAgentId
 	});
+	const workspaceBootstrapInstructions = workspaceBootstrapContext.instructions;
 	let promptText = params.prompt;
 	let developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
 	let prePromptMessageCount = historyMessages.length;
@@ -3095,12 +3158,21 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		promptText = projection.promptText;
 		prePromptMessageCount = projection.prePromptMessageCount;
 	}
+	promptText = prependCurrentTurnContext(promptText, params.currentTurnContext);
 	const promptBuild = await resolveAgentHarnessBeforePromptBuildResult({
 		prompt: promptText,
 		developerInstructions,
 		messages: historyMessages,
 		ctx: hookContext
 	});
+	const systemPromptReport = buildCodexSystemPromptReport({
+		attempt: params,
+		sessionKey: sandboxSessionKey,
+		workspaceDir: effectiveWorkspace,
+		developerInstructions: promptBuild.developerInstructions,
+		workspaceBootstrapContext,
+		tools: toolBridge.specs
+	});
 	const trajectoryRecorder = createCodexTrajectoryRecorder({
 		attempt: params,
 		cwd: effectiveWorkspace,
@@ -3614,7 +3686,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			signal: runAbortController.signal
 		}));
 	} catch (error) {
-		const usageLimitError = formatCodexTurnStartUsageLimitError(error, pendingNotifications);
+		const usageLimitError = await formatCodexTurnStartUsageLimitError({
+			client,
+			error,
+			pendingNotifications,
+			timeoutMs: appServer.requestTimeoutMs,
+			signal: runAbortController.signal
+		});
 		const turnStartErrorMessage = usageLimitError ?? formatErrorMessage(error);
 		emitCodexAppServerEvent(params, {
 			stream: "codex_app_server.lifecycle",
@@ -3731,7 +3809,18 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		await completion;
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
 		const finalAborted = result.aborted || runAbortController.signal.aborted;
-		const finalPromptError = turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError;
+		let finalPromptError = turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError;
+		const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
+		if (shouldRefreshCodexRateLimitsForUsageLimitMessage(finalPromptErrorMessage)) finalPromptError = await refreshCodexUsageLimitErrorMessage({
+			client,
+			source: {
+				message: finalPromptErrorMessage,
+				codexErrorInfo: "usageLimitExceeded",
+				rateLimits: readRecentCodexRateLimits()
+			},
+			timeoutMs: appServer.requestTimeoutMs,
+			signal: runAbortController.signal
+		});
 		const finalPromptErrorSource = timedOut ? "prompt" : result.promptErrorSource;
 		recordCodexTrajectoryCompletion(trajectoryRecorder, {
 			attempt: params,
@@ -3825,7 +3914,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			timedOut,
 			aborted: finalAborted,
 			promptError: finalPromptError,
-			promptErrorSource: finalPromptErrorSource
+			promptErrorSource: finalPromptErrorSource,
+			systemPromptReport
 		};
 	} finally {
 		emitLifecycleTerminal({
@@ -4142,14 +4232,55 @@ function resolveCodexTurnTerminalIdleTimeoutMs(value) {
 function readDynamicToolCallParams(value) {
 	return readCodexDynamicToolCallParams(value);
 }
-function formatCodexTurnStartUsageLimitError(error, pendingNotifications) {
+async function formatCodexTurnStartUsageLimitError(params) {
+	return refreshCodexUsageLimitErrorMessage({
+		client: params.client,
+		source: readCodexTurnStartUsageLimitErrorSource(params.error, params.pendingNotifications),
+		timeoutMs: params.timeoutMs,
+		signal: params.signal
+	});
+}
+async function refreshCodexUsageLimitErrorMessage(params) {
+	const initialMessage = formatCodexUsageLimitErrorMessage(params.source);
+	if (!shouldRefreshCodexRateLimitsForUsageLimitMessage(initialMessage)) return initialMessage ?? void 0;
+	const rateLimits = await readCodexRateLimitsFromAppServerForUsageLimitError({
+		client: params.client,
+		timeoutMs: params.timeoutMs,
+		signal: params.signal
+	});
+	if (!rateLimits) return initialMessage;
+	return formatCodexUsageLimitErrorMessage({
+		message: params.source.message,
+		codexErrorInfo: params.source.codexErrorInfo,
+		rateLimits
+	}) ?? initialMessage;
+}
+async function readCodexRateLimitsFromAppServerForUsageLimitError(params) {
+	if (params.signal?.aborted) return;
+	try {
+		const rateLimits = await params.client.request(CODEX_CONTROL_METHODS.rateLimits, void 0, {
+			timeoutMs: resolveCodexUsageLimitRateLimitRefreshTimeoutMs(params.timeoutMs),
+			signal: params.signal
+		});
+		rememberCodexRateLimits(rateLimits);
+		return rateLimits;
+	} catch (error) {
+		embeddedAgentLog.debug("codex app-server rate-limit refresh failed after usage-limit error", { error: formatErrorMessage(error) });
+		return;
+	}
+}
+function resolveCodexUsageLimitRateLimitRefreshTimeoutMs(timeoutMs) {
+	if (timeoutMs === void 0 || !Number.isFinite(timeoutMs) || timeoutMs <= 0) return CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS;
+	return Math.max(100, Math.min(timeoutMs, CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS));
+}
+function readCodexTurnStartUsageLimitErrorSource(error, pendingNotifications) {
 	const notificationError = readLatestCodexErrorNotification(pendingNotifications);
 	const errorPayload = readCodexErrorPayload(error);
-	return formatCodexUsageLimitErrorMessage({
+	return {
 		message: notificationError?.message ?? errorPayload.message ?? formatErrorMessage(error),
 		codexErrorInfo: notificationError?.codexErrorInfo ?? errorPayload.codexErrorInfo,
 		rateLimits: readLatestRateLimitNotificationPayload(pendingNotifications) ?? errorPayload.rateLimits ?? readRecentCodexRateLimits()
-	});
+	};
 }
 function readLatestRateLimitNotificationPayload(notifications) {
 	for (let index = notifications.length - 1; index >= 0; index -= 1) {
@@ -4238,9 +4369,9 @@ async function readMirroredSessionHistoryMessages(sessionFile) {
 	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile });
 	return messages;
 }
-async function buildCodexWorkspaceBootstrapInstructions(params) {
+async function buildCodexWorkspaceBootstrapContext(params) {
 	try {
-		const { contextFiles } = await resolveBootstrapContextForRun({
+		const bootstrapContext = await resolveBootstrapContextForRun({
 			workspaceDir: params.resolvedWorkspace,
 			config: params.params.config,
 			sessionKey: params.sessionKey,
@@ -4250,15 +4381,117 @@ async function buildCodexWorkspaceBootstrapInstructions(params) {
 			contextMode: params.params.bootstrapContextMode,
 			runKind: params.params.bootstrapContextRunKind
 		});
-		return renderCodexWorkspaceBootstrapInstructions(contextFiles.map((file) => remapCodexContextFilePath({
+		const contextFiles = bootstrapContext.contextFiles.map((file) => remapCodexContextFilePath({
 			file,
 			sourceWorkspaceDir: params.resolvedWorkspace,
 			targetWorkspaceDir: params.effectiveWorkspace
-		})));
+		}));
+		return {
+			...bootstrapContext,
+			contextFiles,
+			instructions: renderCodexWorkspaceBootstrapInstructions(contextFiles)
+		};
 	} catch (error) {
 		embeddedAgentLog.warn("failed to load codex workspace bootstrap instructions", { error });
-		return;
+		return {
+			bootstrapFiles: [],
+			contextFiles: []
+		};
+	}
+}
+function buildCodexSystemPromptReport(params) {
+	const toolEntries = params.tools.map(buildCodexToolReportEntry);
+	const schemaChars = toolEntries.reduce((sum, tool) => sum + tool.schemaChars, 0);
+	const projectContextChars = params.workspaceBootstrapContext.instructions?.length ?? 0;
+	const bootstrapMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapMaxChars);
+	const bootstrapTotalMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapTotalMaxChars);
+	return {
+		source: "run",
+		generatedAt: Date.now(),
+		sessionId: params.attempt.sessionId,
+		sessionKey: params.sessionKey,
+		provider: params.attempt.provider,
+		model: params.attempt.modelId,
+		workspaceDir: params.workspaceDir,
+		...bootstrapMaxChars ? { bootstrapMaxChars } : {},
+		...bootstrapTotalMaxChars ? { bootstrapTotalMaxChars } : {},
+		systemPrompt: {
+			chars: params.developerInstructions.length,
+			projectContextChars,
+			nonProjectContextChars: Math.max(0, params.developerInstructions.length - projectContextChars)
+		},
+		injectedWorkspaceFiles: buildCodexBootstrapInjectionStats({
+			bootstrapFiles: params.workspaceBootstrapContext.bootstrapFiles,
+			injectedFiles: params.workspaceBootstrapContext.contextFiles
+		}),
+		skills: {
+			promptChars: 0,
+			entries: []
+		},
+		tools: {
+			listChars: 0,
+			schemaChars,
+			entries: toolEntries
+		}
+	};
+}
+function buildCodexToolReportEntry(tool) {
+	const summary = tool.description.trim();
+	if (tool.deferLoading === true) return {
+		name: tool.name,
+		summaryChars: summary.length,
+		schemaChars: 0,
+		propertiesCount: null
+	};
+	return {
+		name: tool.name,
+		summaryChars: summary.length,
+		...buildCodexToolSchemaStats(tool.inputSchema)
+	};
+}
+function buildCodexToolSchemaStats(schema) {
+	const schemaChars = (() => {
+		try {
+			return JSON.stringify(schema).length;
+		} catch {
+			return 0;
+		}
+	})();
+	const properties = isJsonObject(schema) && isJsonObject(schema.properties) ? schema.properties : null;
+	return {
+		schemaChars,
+		propertiesCount: properties ? Object.keys(properties).length : null
+	};
+}
+function buildCodexBootstrapInjectionStats(params) {
+	const injectedByPath = /* @__PURE__ */ new Map();
+	const injectedByBaseName = /* @__PURE__ */ new Map();
+	for (const file of params.injectedFiles) {
+		const pathValue = readNonEmptyString(file.path);
+		if (!pathValue) continue;
+		if (!injectedByPath.has(pathValue)) injectedByPath.set(pathValue, file.content);
+		const baseName = path.posix.basename(pathValue.replaceAll("\\", "/"));
+		if (!injectedByBaseName.has(baseName)) injectedByBaseName.set(baseName, file.content);
 	}
+	return params.bootstrapFiles.map((file) => {
+		const pathValue = readNonEmptyString(file.path) ?? file.name;
+		const rawChars = file.missing ? 0 : (file.content ?? "").trimEnd().length;
+		const injectedChars = (injectedByPath.get(pathValue) ?? injectedByPath.get(file.name) ?? injectedByBaseName.get(file.name))?.length ?? 0;
+		return {
+			name: file.name,
+			path: pathValue,
+			missing: file.missing,
+			rawChars,
+			injectedChars,
+			truncated: !file.missing && injectedChars < rawChars
+		};
+	});
+}
+function readPositiveNumber(value) {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : void 0;
+}
+function readNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
 function renderCodexWorkspaceBootstrapInstructions(contextFiles) {
 	const files = contextFiles.filter((file) => {
@@ -4274,7 +4507,7 @@ function renderCodexWorkspaceBootstrapInstructions(contextFiles) {
 		"",
 		"The following project context files have been loaded:"
 	];
-	if (hasSoulFile) lines.push("If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance unless higher-priority instructions override it.");
+	if (hasSoulFile) lines.push("SOUL.md: persona/tone. Follow it unless higher-priority instructions override.");
 	lines.push("");
 	for (const file of files) lines.push(`## ${file.path}`, "", file.content, "");
 	return lines.join("\n").trim();
@@ -4324,6 +4557,10 @@ function isNonEmptyString(value) {
 function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
+function prependCurrentTurnContext(prompt, context) {
+	const text = context?.text.trim();
+	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
+}
 function handleApprovalRequest(params) {
 	return handleCodexAppServerApprovalRequest({
 		method: params.method,

package/dist/{session-binding-B44KIZM2.js → session-binding-BAaJ-7s-.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { a as normalizeCodexServiceTier } from "./config-CT01BBDc.js";
+import { a as normalizeCodexServiceTier } from "./config-C7xdbzrp.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";

package/dist/{shared-client-p-TvEiNL.js → shared-client-BRX9tReb.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { n as codexAppServerStartOptionsKey, s as resolveCodexAppServerRuntimeOptions } from "./config-CT01BBDc.js";
-import { a as MANAGED_CODEX_APP_SERVER_PACKAGE, o as resolveCodexAppServerSpawnEnv, t as CodexAppServerClient } from "./client-CTzy3Y6M.js";
+import { n as codexAppServerStartOptionsKey, s as resolveCodexAppServerRuntimeOptions } from "./config-C7xdbzrp.js";
+import { a as MANAGED_CODEX_APP_SERVER_PACKAGE, o as resolveCodexAppServerSpawnEnv, t as CodexAppServerClient } from "./client-CpksBQ9l.js";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import { constants, readFileSync } from "node:fs";

package/dist/test-api.js

@@ -1,5 +1,5 @@
-import { s as resolveCodexAppServerRuntimeOptions } from "./config-CT01BBDc.js";
-import { a as buildTurnStartParams, d as createCodexDynamicToolBridge, f as filterCodexDynamicTools, i as buildThreadStartParams, n as buildDeveloperInstructions, r as buildThreadResumeParams } from "./thread-lifecycle-CGc-O_5d.js";
+import { s as resolveCodexAppServerRuntimeOptions } from "./config-C7xdbzrp.js";
+import { a as buildTurnStartParams, d as createCodexDynamicToolBridge, f as filterCodexDynamicTools, i as buildThreadStartParams, n as buildDeveloperInstructions, r as buildThreadResumeParams } from "./thread-lifecycle-DRyCVHhL.js";
 //#region extensions/codex/test-api.ts
 function resolveCodexPromptSnapshotAppServerOptions(pluginConfig) {
 	return resolveCodexAppServerRuntimeOptions({

package/dist/{thread-lifecycle-CGc-O_5d.js → thread-lifecycle-DRyCVHhL.js}

@@ -1,11 +1,11 @@
-import { l as resolveCodexPluginsPolicy, r as codexSandboxPolicyForTurn } from "./config-CT01BBDc.js";
+import { l as resolveCodexPluginsPolicy, r as codexSandboxPolicyForTurn } from "./config-C7xdbzrp.js";
 import { n as assertCodexThreadStartResponse, t as assertCodexThreadResumeResponse } from "./protocol-validators-CeCyJaWj.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-CTzy3Y6M.js";
-import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-B44KIZM2.js";
-import { i as defaultCodexAppInventoryCache, n as readCodexPluginInventory, t as ensureCodexPluginActivation } from "./plugin-activation-CweAZa7r.js";
+import { i as isCodexAppServerConnectionClosedError } from "./client-CpksBQ9l.js";
+import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BAaJ-7s-.js";
+import { i as defaultCodexAppInventoryCache, n as readCodexPluginInventory, t as ensureCodexPluginActivation } from "./plugin-activation-Dn14PX1W.js";
 import crypto from "node:crypto";
 import { HEARTBEAT_RESPONSE_TOOL_NAME, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractToolResultMediaArtifact, filterToolResultMediaUrls, isMessagingTool, isMessagingToolSendAction, isToolWrappedWithBeforeToolCallHook, normalizeHeartbeatToolResponse, runAgentHarnessAfterToolCallHook, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/dynamic-tool-profile.ts
@@ -530,6 +530,10 @@ function stableStringify(value) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/thread-lifecycle.ts
+const CODEX_CODE_MODE_THREAD_CONFIG = {
+	"features.code_mode": true,
+	"features.code_mode_only": true
+};
 async function startOrResumeThread(params) {
 	const dynamicToolsFingerprint = fingerprintDynamicTools(params.dynamicTools);
 	let binding = await readCodexAppServerBinding(params.params.sessionFile, {
@@ -699,7 +703,7 @@ function buildThreadStartParams(params, options) {
 		sandbox: options.appServer.sandbox,
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
 		serviceName: "OpenClaw",
-		...options.config ? { config: options.config } : {},
+		config: buildCodexRuntimeThreadConfig(options.config),
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params),
 		dynamicTools: options.dynamicTools,
 		experimentalRawEvents: true,
@@ -722,11 +726,14 @@ function buildThreadResumeParams(params, options) {
 		approvalsReviewer: options.appServer.approvalsReviewer,
 		sandbox: options.appServer.sandbox,
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
-		...options.config ? { config: options.config } : {},
+		config: buildCodexRuntimeThreadConfig(options.config),
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params),
 		persistExtendedHistory: true
 	};
 }
+function buildCodexRuntimeThreadConfig(config) {
+	return mergeCodexThreadConfigs(config, CODEX_CODE_MODE_THREAD_CONFIG) ?? { ...CODEX_CODE_MODE_THREAD_CONFIG };
+}
 function buildTurnStartParams(params, options) {
 	return {
 		threadId: options.threadId,
@@ -795,8 +802,8 @@ function compareJsonFingerprint(left, right) {
 }
 function buildDeveloperInstructions(params) {
 	return [
-		"You are running inside OpenClaw. Use OpenClaw dynamic tools for OpenClaw-specific integrations such as messaging, cron, sessions, media, gateway, and nodes when available.",
-		"Preserve the user's existing channel/session context. If sending a channel reply, use the OpenClaw messaging tool instead of describing that you would reply.",
+		"Running inside OpenClaw. Use dynamic tools for messaging, cron, sessions, media, gateway, and nodes when available.",
+		"Preserve channel/session context. Visible channel replies: use `message`, do not describe would-reply.",
 		renderCodexRuntimePromptOverlay(params),
 		params.extraSystemPrompt,
 		params.skillsSnapshot?.prompt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.10-beta.2",
+  "version": "2026.5.10-beta.3",
   "description": "OpenClaw Codex harness and model provider plugin",
   "repository": {
     "type": "git",
@@ -11,7 +11,8 @@
     "@mariozechner/pi-coding-agent": "0.73.1",
     "@openai/codex": "0.130.0",
     "ajv": "^8.20.0",
-    "ws": "^8.20.0"
+    "ws": "^8.20.0",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
     "@openclaw/plugin-sdk": "workspace:*"
@@ -26,10 +27,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.10-beta.2"
+      "pluginApi": ">=2026.5.10-beta.3"
     },
     "build": {
-      "openclawVersion": "2026.5.10-beta.2"
+      "openclawVersion": "2026.5.10-beta.3"
     },
     "release": {
       "publishToClawHub": true,
@@ -44,7 +45,7 @@
     "openclaw.plugin.json"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.10-beta.2"
+    "openclaw": ">=2026.5.10-beta.3"
   },
   "peerDependenciesMeta": {
     "openclaw": {