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

package/dist/harness.js

@@ -18,14 +18,14 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-Bssnu2uw.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-Mn4zlbBO.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-DgVgwmjR.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-D8VnF9iq.js");
 			return runCodexAppServerSideQuestion(params, {
 				pluginConfig: options?.pluginConfig,
 				nativeHookRelay: { enabled: true }

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

@@ -7,7 +7,7 @@ import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimits
 import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, f as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-DlvmoLBJ.js";
 import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DqApZIgD.js";
 import { a as defaultCodexAppInventoryCache } from "./plugin-activation-B49xb7pI.js";
-import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, _ as projectContextEngineAssemblyForCodex, b as createCodexDynamicToolBridge, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as shouldBuildCodexPluginThreadConfig, h as mergeCodexThreadConfigs, i as buildDeveloperInstructions, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfigInputFingerprint, p as buildCodexPluginThreadConfig, r as buildContextEngineBinding, s as buildTurnStartParams, t as areCodexDynamicToolFingerprintsCompatible, v as resolveCodexContextEngineProjectionMaxChars, w as normalizeCodexDynamicToolName, x as sanitizeCodexHistoryImagePayloads, y as resolveCodexContextEngineProjectionReserveTokens } from "./thread-lifecycle-BbriKhTq.js";
+import { 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-Czx7CGwZ.js";
 import { t as defaultCodexAppServerClientFactory } from "./client-factory-9L6Ie1dC.js";
 import { a as handleCodexAppServerElicitationRequest, i as buildCodexNativeHookRelayDisabledConfig, n as CODEX_NATIVE_HOOK_RELAY_EVENTS, o as handleCodexAppServerApprovalRequest, r as buildCodexNativeHookRelayConfig, t as filterToolsForVisionInputs } from "./vision-tools-BX9YuTEK.js";
 import { t as ensureCodexComputerUse } from "./computer-use-UJ3dxrXF.js";
@@ -21,7 +21,7 @@ import { markAuthProfileBlockedUntil, resolveAgentDir as resolveAgentDir$1 } fro
 import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
-import { createRunningTaskRun, finalizeTaskRunByRunId, recordTaskRunProgressByRunId } from "openclaw/plugin-sdk/codex-native-task-runtime";
+import { CODEX_NATIVE_SUBAGENT_RUNTIME, CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX, CODEX_NATIVE_SUBAGENT_TASK_KIND, createRunningTaskRun, finalizeTaskRunByRunId, recordTaskRunProgressByRunId } from "openclaw/plugin-sdk/codex-native-task-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@earendil-works/pi-coding-agent";
 //#region extensions/codex/src/app-server/local-runtime-attribution.ts
 const OPENAI_PROVIDER_ID = "openai";
@@ -44,8 +44,6 @@ function resolveCodexLocalRuntimeAttribution(params) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/native-subagent-task-mirror.ts
-const CODEX_NATIVE_SUBAGENT_RUNTIME = "subagent";
-const CODEX_NATIVE_SUBAGENT_TASK_KIND = "codex-native";
 const defaultRuntime = {
 	createRunningTaskRun,
 	recordTaskRunProgressByRunId,
@@ -239,7 +237,7 @@ var CodexNativeSubagentTaskMirror = class {
 	}
 };
 function codexNativeSubagentRunId(threadId) {
-	return `codex-thread:${threadId.trim()}`;
+	return `${CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX}${threadId.trim()}`;
 }
 function readSubagentThreadSpawnSource(source, parentThreadId) {
 	if (!source || typeof source !== "object" || !("subAgent" in source)) return;
@@ -535,6 +533,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 +565,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();
@@ -683,6 +698,7 @@ var CodexAppServerEventProjector = class {
 			assistantTexts,
 			toolMetas: [...this.toolMetas.values()],
 			lastAssistant,
+			...this.lastNativeToolError ? { lastToolError: this.lastNativeToolError } : {},
 			didSendViaMessagingTool: toolTelemetry.didSendViaMessagingTool,
 			messagingToolSentTexts: toolTelemetry.messagingToolSentTexts,
 			messagingToolSentMediaUrls: toolTelemetry.messagingToolSentMediaUrls,
@@ -1030,7 +1046,10 @@ var CodexAppServerEventProjector = class {
 	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,
@@ -1153,9 +1172,9 @@ 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);
+		const meta = itemMeta(item, this.toolProgressDetailMode());
 		this.recordToolTrajectoryEvent({
 			phase: params.phase,
 			item,
@@ -1169,6 +1188,16 @@ var CodexAppServerEventProjector = class {
 			name,
 			status
 		});
+		if (params.phase === "result") this.recordNativeToolError({
+			item,
+			name,
+			meta,
+			status
+		});
+		if (!shouldEmitTranscriptToolProgress(name, args)) {
+			if (params.phase === "result") this.emitAfterToolCallObservation(item);
+			return;
+		}
 		this.emitAgentEvent({
 			stream: "tool",
 			data: {
@@ -1177,7 +1206,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),
@@ -1187,6 +1216,27 @@ var CodexAppServerEventProjector = class {
 		});
 		if (params.phase === "result") this.emitAfterToolCallObservation(item);
 	}
+	recordNativeToolError(params) {
+		if (!isNonSuccessItemStatus(params.status)) {
+			if (!this.lastNativeToolError) return;
+			if (!this.lastNativeToolError.mutatingAction) {
+				this.lastNativeToolError = void 0;
+				return;
+			}
+			const actionFingerprint = nativeToolActionFingerprint(params.item);
+			if (this.lastNativeToolError.actionFingerprint && actionFingerprint && this.lastNativeToolError.actionFingerprint === actionFingerprint) this.lastNativeToolError = void 0;
+			return;
+		}
+		const error = itemToolError(params.item, params.status, this.toolResultOutputTextByItem);
+		const actionFingerprint = nativeToolActionFingerprint(params.item);
+		this.lastNativeToolError = {
+			toolName: params.name,
+			...params.meta ? { meta: params.meta } : {},
+			...error ? { error } : {},
+			...isMutatingNativeToolItem(params.item) ? { mutatingAction: true } : {},
+			...actionFingerprint ? { actionFingerprint } : {}
+		};
+	}
 	recordToolTrajectoryEvent(params) {
 		if (params.phase === "start") {
 			this.options.trajectoryRecorder?.recordEvent("tool.call", {
@@ -1200,7 +1250,7 @@ var CodexAppServerEventProjector = class {
 			return;
 		}
 		const toolResult = itemToolResult(params.item).result;
-		const output = itemOutputText(params.item);
+		const output = itemOutputText(params.item, this.toolResultOutputTextByItem);
 		this.options.trajectoryRecorder?.recordEvent("tool.result", {
 			threadId: this.threadId,
 			turnId: this.turnId,
@@ -1257,7 +1307,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,
@@ -1286,6 +1336,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({
@@ -1299,8 +1350,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),
@@ -1352,20 +1404,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({
@@ -1669,6 +1754,20 @@ function shouldSynthesizeToolProgressForItem(item) {
 		default: return false;
 	}
 }
+function isMutatingNativeToolItem(item) {
+	return item.type === "commandExecution" || item.type === "fileChange";
+}
+function nativeToolActionFingerprint(item) {
+	if (item.type === "commandExecution" && typeof item.command === "string") return JSON.stringify({
+		type: item.type,
+		command: item.command,
+		cwd: typeof item.cwd === "string" ? item.cwd : ""
+	});
+	if (item.type === "fileChange") return JSON.stringify({
+		type: item.type,
+		changes: itemFileChanges(item)
+	});
+}
 function isNativePostToolUseRelayItem(item) {
 	switch (item.type) {
 		case "commandExecution":
@@ -1715,10 +1814,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", {
@@ -1729,24 +1828,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) => {
@@ -2631,6 +2756,7 @@ 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);
@@ -2852,7 +2978,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,
@@ -2860,11 +2987,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,
@@ -2895,15 +3022,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
@@ -3482,7 +3611,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",
@@ -3525,7 +3655,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				success: response.success,
 				contentItems: response.contentItems
 			});
-			emitCodexAppServerEvent(params, {
+			if (shouldEmitDynamicToolProgress) emitCodexAppServerEvent(params, {
 				stream: "tool",
 				data: {
 					phase: "result",
@@ -4332,16 +4462,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";
 }

package/dist/{side-question-DgVgwmjR.js → side-question-D8VnF9iq.js}

@@ -5,7 +5,7 @@ import { r as isCodexAppServerApprovalRequest } from "./client-6FkrXfaz.js";
 import { u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BRW7_Nu7.js";
 import { i as getSharedCodexAppServerClient, s as refreshCodexAppServerAuthTokens } from "./shared-client-DlvmoLBJ.js";
 import { i as readCodexAppServerBinding } from "./session-binding-DqApZIgD.js";
-import { S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, b as createCodexDynamicToolBridge, d as resolveReasoningEffort, h as mergeCodexThreadConfigs, n as buildCodexRuntimeThreadConfig, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-BbriKhTq.js";
+import { S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, b as createCodexDynamicToolBridge, d as resolveReasoningEffort, h as mergeCodexThreadConfigs, n as buildCodexRuntimeThreadConfig, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-Czx7CGwZ.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 { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";

package/dist/test-api.js

@@ -1,5 +1,5 @@
 import { c as resolveCodexAppServerRuntimeOptions } from "./config-B5pq6hEz.js";
-import { S as filterCodexDynamicTools, a as buildThreadResumeParams, b as createCodexDynamicToolBridge, i as buildDeveloperInstructions, o as buildThreadStartParams, s as buildTurnStartParams } from "./thread-lifecycle-BbriKhTq.js";
+import { S as filterCodexDynamicTools, a as buildThreadResumeParams, b as createCodexDynamicToolBridge, i as buildDeveloperInstructions, o as buildThreadStartParams, s as buildTurnStartParams } from "./thread-lifecycle-Czx7CGwZ.js";
 //#region extensions/codex/test-api.ts
 function resolveCodexPromptSnapshotAppServerOptions(pluginConfig) {
 	return resolveCodexAppServerRuntimeOptions({

package/dist/{thread-lifecycle-BbriKhTq.js → thread-lifecycle-Czx7CGwZ.js}

@@ -569,7 +569,7 @@ function projectContextEngineAssemblyForCodex(params) {
 		CONTEXT_SAFETY_NOTE,
 		"",
 		CONTEXT_OPEN,
-		truncateText(renderedContext, maxRenderedContextChars),
+		truncateOlderContext(renderedContext, maxRenderedContextChars),
 		CONTEXT_CLOSE,
 		"",
 		REQUEST_HEADER,
@@ -739,6 +739,17 @@ function resolveTextPartMaxChars(maxRenderedContextChars) {
 function truncateText(text, maxChars) {
 	return text.length > maxChars ? `${text.slice(0, maxChars)}\n[truncated ${text.length - maxChars} chars]` : text;
 }
+function truncateOlderContext(text, maxChars) {
+	if (text.length <= maxChars) return text;
+	if (maxChars <= 0) return "";
+	const buildMarker = (omittedChars) => `[truncated ${omittedChars} chars from older context]\n`;
+	let marker = buildMarker(text.length - maxChars);
+	let tailChars = Math.max(0, maxChars - marker.length);
+	marker = buildMarker(text.length - tailChars);
+	if (marker.length >= maxChars) return marker.slice(0, maxChars);
+	tailChars = maxChars - marker.length;
+	return `${marker}${text.slice(text.length - tailChars).trimStart()}`;
+}
 //#endregion
 //#region extensions/codex/src/app-server/plugin-thread-config.ts
 const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 1;
@@ -977,11 +988,15 @@ const CODEX_CODE_MODE_THREAD_CONFIG = {
 	"features.code_mode": true,
 	"features.code_mode_only": true
 };
+const CODEX_CODE_MODE_DISABLED_THREAD_CONFIG = {
+	"features.code_mode": false,
+	"features.code_mode_only": false
+};
 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, params.contextEngineProjection);
-	const userMcpServersConfigPatch = buildCodexUserMcpServersThreadConfigPatch(params.params.config, { agentId: params.agentId ?? params.params.agentId });
+	const userMcpServersConfigPatch = params.userMcpServersEnabled === false ? void 0 : 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,
@@ -991,6 +1006,11 @@ async function startOrResumeThread(params) {
 	let preserveExistingBinding = false;
 	let rotatedContextEngineBinding = false;
 	let prebuiltPluginThreadConfig;
+	if (binding?.threadId && params.nativeCodeModeEnabled === false) {
+		embeddedAgentLog.debug("codex app-server native tool surface disabled for turn; starting transient thread", { threadId: binding.threadId });
+		preserveExistingBinding = true;
+		binding = void 0;
+	}
 	if (binding?.threadId && (binding.contextEngine || contextEngineBinding)) {
 		if (!contextEngineBinding || !isContextEngineBindingCompatible(binding.contextEngine, contextEngineBinding)) {
 			embeddedAgentLog.debug("codex app-server context-engine binding changed; starting a new thread", {
@@ -1068,7 +1088,8 @@ async function startOrResumeThread(params) {
 			authProfileId,
 			appServer: params.appServer,
 			developerInstructions: params.developerInstructions,
-			config: resumeConfig
+			config: resumeConfig,
+			nativeCodeModeEnabled: params.nativeCodeModeEnabled
 		})));
 		const boundAuthProfileId = authProfileId;
 		const fallbackModelProvider = resolveCodexAppServerModelProvider({
@@ -1135,7 +1156,8 @@ async function startOrResumeThread(params) {
 		dynamicTools: params.dynamicTools,
 		appServer: params.appServer,
 		developerInstructions: params.developerInstructions,
-		config
+		config,
+		nativeCodeModeEnabled: params.nativeCodeModeEnabled
 	})));
 	const modelProvider = resolveCodexAppServerModelProvider({
 		provider: params.params.provider,
@@ -1276,7 +1298,8 @@ function buildThreadStartParams(params, options) {
 		sandbox: options.appServer.sandbox,
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
 		serviceName: "OpenClaw",
-		config: buildCodexRuntimeThreadConfigForRun(params, options.config),
+		config: buildCodexRuntimeThreadConfigForRun(params, options.config, { nativeCodeModeEnabled: options.nativeCodeModeEnabled }),
+		...options.nativeCodeModeEnabled === false ? { environments: [] } : {},
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params),
 		dynamicTools: options.dynamicTools,
 		experimentalRawEvents: true,
@@ -1299,16 +1322,17 @@ function buildThreadResumeParams(params, options) {
 		approvalsReviewer: options.appServer.approvalsReviewer,
 		sandbox: options.appServer.sandbox,
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
-		config: buildCodexRuntimeThreadConfigForRun(params, options.config),
+		config: buildCodexRuntimeThreadConfigForRun(params, options.config, { nativeCodeModeEnabled: options.nativeCodeModeEnabled }),
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params),
 		persistExtendedHistory: true
 	};
 }
-function buildCodexRuntimeThreadConfig(config) {
-	return mergeCodexThreadConfigs(config, CODEX_CODE_MODE_THREAD_CONFIG) ?? { ...CODEX_CODE_MODE_THREAD_CONFIG };
+function buildCodexRuntimeThreadConfig(config, options = {}) {
+	const codeModeConfig = options.nativeCodeModeEnabled === false ? CODEX_CODE_MODE_DISABLED_THREAD_CONFIG : CODEX_CODE_MODE_THREAD_CONFIG;
+	return mergeCodexThreadConfigs(config, codeModeConfig) ?? { ...codeModeConfig };
 }
-function buildCodexRuntimeThreadConfigForRun(params, config) {
-	const runtimeConfig = buildCodexRuntimeThreadConfig(config);
+function buildCodexRuntimeThreadConfigForRun(params, config, options = {}) {
+	const runtimeConfig = buildCodexRuntimeThreadConfig(config, options);
 	if (params.bootstrapContextMode !== "lightweight") return runtimeConfig;
 	return mergeCodexThreadConfigs(runtimeConfig, CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG) ?? {
 		...runtimeConfig,
@@ -1400,6 +1424,7 @@ function compareJsonFingerprint(left, right) {
 function buildDeveloperInstructions(params) {
 	return [
 		"Running inside OpenClaw. Use dynamic tools for messaging, cron, sessions, media, gateway, and nodes when available.",
+		"Use Codex native `spawn_agent` for Codex subagents. Use OpenClaw `sessions_spawn` only for OpenClaw or ACP delegation; if it is not already loaded, search for `sessions_spawn` in the `openclaw` dynamic tool namespace before calling it.",
 		"Preserve channel/session context. Visible channel replies: use `message`, do not describe would-reply.",
 		renderCodexRuntimePromptOverlay(params),
 		params.extraSystemPrompt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.16-beta.5",
+  "version": "2026.5.16-beta.7",
   "description": "OpenClaw Codex harness and model provider plugin",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.74.1",
+    "@earendil-works/pi-coding-agent": "0.75.1",
     "@openai/codex": "0.130.0",
     "ajv": "8.20.0",
     "ws": "8.20.1",
@@ -27,10 +27,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.16-beta.5"
+      "pluginApi": ">=2026.5.16-beta.7"
     },
     "build": {
-      "openclawVersion": "2026.5.16-beta.5"
+      "openclawVersion": "2026.5.16-beta.7"
     },
     "release": {
       "publishToClawHub": true,
@@ -45,7 +45,7 @@
     "openclaw.plugin.json"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.16-beta.5"
+    "openclaw": ">=2026.5.16-beta.7"
   },
   "peerDependenciesMeta": {
     "openclaw": {