@openclaw/codex 2026.5.31-beta.4 → 2026.6.1-beta.2

package/dist/{client-factory-DBgo1xC5.js → client-factory-3ykiiX2z.js}

@@ -1,7 +1,7 @@
 //#region extensions/codex/src/app-server/client-factory.ts
 let sharedClientModulePromise = null;
 const loadSharedClientModule = async () => {
-	sharedClientModulePromise ??= import("./shared-client-ByKKWtYX.js").then((n) => n.s);
+	sharedClientModulePromise ??= import("./shared-client-DUWLidr5.js").then((n) => n.s);
 	return await sharedClientModulePromise;
 };
 const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => loadSharedClientModule().then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({

package/dist/{command-handlers-82GqsKYq.js → command-handlers-VhJdcXcI.js}

@@ -1,12 +1,12 @@
 import { d as resolveCodexAppServerRuntimeOptions, o as isCodexFastServiceTier } from "./config-AlzuNKCY.js";
-import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-DEgJXKQy.js";
+import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-DAJvlyJu.js";
 import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { a as readCodexAppServerBinding, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
-import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-DYdA1i4c.js";
+import { a as readCodexAppServerBinding, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
+import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-CPtFWp-f.js";
 import { a as buildHelp, c as formatCodexStatus, d as formatModels, f as formatSkills, l as formatComputerUseStatus, m as readString$1, o as formatAccount, p as formatThreads, s as formatCodexDisplayText, u as formatList, v as summarizeCodexAccountUsage } from "./notification-correlation-BykOI_jh.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-DMCJlzmz.js";
-import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-ffCScZef.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-BbqwzKz3.js";
+import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-CqVPKJPp.js";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-DYLSxIfq.js";
 import { n as rememberCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";

package/dist/{compact-Dgz_jIBU.js → compact-D1dSrNrT.js}

@@ -1,7 +1,7 @@
 import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
-import { a as readCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
+import { a as readCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DMCJlzmz.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-DBgo1xC5.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-3ykiiX2z.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const warnedIgnoredCompactionOverrides = /* @__PURE__ */ new Set();

package/dist/{computer-use-BbqwzKz3.js → computer-use-DYLSxIfq.js}

@@ -1,5 +1,5 @@
 import { d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig } from "./config-AlzuNKCY.js";
-import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-DYdA1i4c.js";
+import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-CPtFWp-f.js";
 import { existsSync } from "node:fs";
 //#region extensions/codex/src/app-server/computer-use.ts
 var CodexComputerUseSetupError = class extends Error {

package/dist/{conversation-binding-ffCScZef.js → conversation-binding-CqVPKJPp.js}

@@ -1,10 +1,10 @@
 import { d as resolveCodexAppServerRuntimeOptions, i as codexSandboxPolicyForTurn, m as resolveOpenClawExecPolicyForCodexAppServer, o as isCodexFastServiceTier } from "./config-AlzuNKCY.js";
 import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-Bnlv_Q8u.js";
-import { a as readCodexAppServerBinding, i as normalizeCodexAppServerBindingModelProvider, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
-import { r as CODEX_CONTROL_METHODS } from "./request-DYdA1i4c.js";
+import { t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-6nrEQZMV.js";
+import { a as readCodexAppServerBinding, i as normalizeCodexAppServerBindingModelProvider, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
+import { r as CODEX_CONTROL_METHODS } from "./request-CPtFWp-f.js";
 import { i as readCodexNotificationTurnId, r as readCodexNotificationThreadId, s as formatCodexDisplayText } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, f as resolveCodexAppServerAuthProfileIdForAgent, i as getLeasedSharedCodexAppServerClient } from "./shared-client-ByKKWtYX.js";
+import { a as releaseLeasedSharedCodexAppServerClient, f as resolveCodexAppServerAuthProfileIdForAgent, i as getLeasedSharedCodexAppServerClient } from "./shared-client-DUWLidr5.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-DMCJlzmz.js";
 import { resolveTimerTimeoutMs, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import os from "node:os";

package/dist/harness.js

@@ -28,31 +28,31 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-BHkuGybn.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-DM53zFlW.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-6HqYQ06R.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-dIZf9RBV.js");
 			return runCodexAppServerSideQuestion(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-Dgz_jIBU.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-D1dSrNrT.js");
 			return maybeCompactCodexAppServerSession(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
 		reset: async (params) => {
 			if (params.sessionFile) {
-				const { clearCodexAppServerBinding } = await import("./session-binding-BXJAV_xy.js").then((n) => n.o);
+				const { clearCodexAppServerBinding } = await import("./session-binding-DWiEGATW.js").then((n) => n.o);
 				await clearCodexAppServerBinding(params.sessionFile);
 			}
 		},
 		dispose: async () => {
-			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-ByKKWtYX.js").then((n) => n.s);
+			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-DUWLidr5.js").then((n) => n.s);
 			await clearSharedCodexAppServerClientAndWait();
 		}
 	};

package/dist/index.js

@@ -1,12 +1,12 @@
 import { createCodexAppServerAgentHarness } from "./harness.js";
 import { d as resolveCodexAppServerRuntimeOptions, s as isCodexPluginsMarketplaceName, t as CODEX_PLUGINS_MARKETPLACE_NAME, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
 import { buildCodexProvider } from "./provider.js";
-import { v as ensureCodexPluginActivation, x as defaultCodexAppInventoryCache, y as pluginReadParams } from "./thread-lifecycle-Bnlv_Q8u.js";
+import { v as ensureCodexPluginActivation, x as defaultCodexAppInventoryCache, y as pluginReadParams } from "./thread-lifecycle-6nrEQZMV.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
-import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-DYdA1i4c.js";
+import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-CPtFWp-f.js";
 import { s as formatCodexDisplayText } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, f as resolveCodexAppServerAuthProfileIdForAgent, i as getLeasedSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndWait, p as resolveCodexAppServerFallbackApiKeyCacheKey, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-ByKKWtYX.js";
-import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, n as handleCodexConversationInboundClaim, s as listCodexCliSessionsOnNode, t as handleCodexConversationBindingResolved } from "./conversation-binding-ffCScZef.js";
+import { a as releaseLeasedSharedCodexAppServerClient, f as resolveCodexAppServerAuthProfileIdForAgent, i as getLeasedSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndWait, p as resolveCodexAppServerFallbackApiKeyCacheKey, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-DUWLidr5.js";
+import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, n as handleCodexConversationInboundClaim, s as listCodexCliSessionsOnNode, t as handleCodexConversationBindingResolved } from "./conversation-binding-CqVPKJPp.js";
 import { mutateConfigFile } from "openclaw/plugin-sdk/config-mutation";
 import { resolveLivePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
@@ -48,7 +48,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-82GqsKYq.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-VhJdcXcI.js");
 	return handleCodexSubcommand;
 }
 //#endregion

package/dist/media-understanding-provider.js

@@ -1,9 +1,9 @@
 import { CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS } from "./provider-catalog.js";
 import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
 import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-DIt7cXIp.js";
-import { i as readModelListResult } from "./models-DEgJXKQy.js";
+import { i as readModelListResult } from "./models-DAJvlyJu.js";
 import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-Bnlv_Q8u.js";
+import { r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-6nrEQZMV.js";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/codex/media-understanding-provider.ts
@@ -64,7 +64,7 @@ async function runBoundedCodexVisionTurn(params) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.options.pluginConfig });
 	const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, 100, 100);
 	const ownsClient = !params.options.clientFactory;
-	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-ByKKWtYX.js").then((n) => n.s).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-DUWLidr5.js").then((n) => n.s).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions: appServer.start,
 		timeoutMs,
 		authProfileId: params.profile

package/dist/{models-DEgJXKQy.js → models-DAJvlyJu.js}

@@ -40,7 +40,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-ByKKWtYX.js").then((n) => n.s);
+	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-DUWLidr5.js").then((n) => n.s);
 	const client = useSharedClient ? await getLeasedSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,

package/dist/{native-hook-relay-D_LPgQFs.js → native-hook-relay-CIJt8cLN.js}

@@ -1,5 +1,5 @@
 import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { S as invalidInlineImageText, w as sanitizeInlineImageDataUrl } from "./thread-lifecycle-Bnlv_Q8u.js";
+import { S as invalidInlineImageText, w as sanitizeInlineImageDataUrl } from "./thread-lifecycle-6nrEQZMV.js";
 import { s as formatCodexDisplayText } from "./notification-correlation-BykOI_jh.js";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash } from "node:crypto";
@@ -880,44 +880,6 @@ function formatErrorMessage$1(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
-//#region extensions/codex/src/app-server/dynamic-tool-profile.ts
-const CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES = [
-	"read",
-	"write",
-	"edit",
-	"apply_patch",
-	"exec",
-	"process",
-	"update_plan",
-	"tool_call",
-	"tool_describe",
-	"tool_search",
-	"tool_search_code"
-];
-const DYNAMIC_TOOL_NAME_ALIASES = {
-	bash: "exec",
-	"apply-patch": "apply_patch"
-};
-function normalizeCodexDynamicToolName(name) {
-	const normalized = name.trim().toLowerCase();
-	return DYNAMIC_TOOL_NAME_ALIASES[normalized] ?? normalized;
-}
-function isForcedPrivateQaCodexRuntime(env = process.env) {
-	return env.OPENCLAW_BUILD_PRIVATE_QA === "1" && env.OPENCLAW_QA_FORCE_RUNTIME?.trim().toLowerCase() === "codex";
-}
-function resolveCodexDynamicToolsLoading(config, env = process.env) {
-	return isForcedPrivateQaCodexRuntime(env) ? "direct" : config.codexDynamicToolsLoading ?? "searchable";
-}
-function filterCodexDynamicTools(tools, config, env = process.env) {
-	const excludes = /* @__PURE__ */ new Set();
-	if (!isForcedPrivateQaCodexRuntime(env)) for (const name of CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES) excludes.add(name);
-	for (const name of config.codexDynamicToolsExclude ?? []) {
-		const trimmed = normalizeCodexDynamicToolName(name);
-		if (trimmed) excludes.add(trimmed);
-	}
-	return excludes.size === 0 ? tools : tools.filter((tool) => !excludes.has(normalizeCodexDynamicToolName(tool.name)));
-}
-//#endregion
 //#region extensions/codex/src/app-server/vision-tools.ts
 function filterToolsForVisionInputs(tools, params) {
 	if (!params.modelHasVision || !params.hasInboundImages) return tools;
@@ -2167,4 +2129,4 @@ function sortJsonValue(value) {
 	return sorted;
 }
 //#endregion
-export { resolveCodexTurnAssistantCompletionIdleTimeoutMs as C, withCodexStartupTimeout as E, resolveCodexStartupTimeoutMs as S, resolveCodexTurnTerminalIdleTimeoutMs as T, normalizeCodexDynamicToolName as _, createCodexNativeHookRelay as a, CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS as b, scheduleCodexNativeHookRelayUnregister as c, emitDynamicToolErrorDiagnostic as d, emitDynamicToolStartedDiagnostic as f, isForcedPrivateQaCodexRuntime as g, filterCodexDynamicTools as h, buildCodexNativeHookRelayDisabledConfig as i, handleCodexAppServerElicitationRequest as l, filterToolsForVisionInputs as m, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as n, resolveCodexNativeHookRelayEvents as o, emitDynamicToolTerminalDiagnostic as p, buildCodexNativeHookRelayConfig as r, resolveCodexNativeHookRelayTtlMs as s, CODEX_NATIVE_HOOK_RELAY_EVENTS as t, createCodexDynamicToolBridge as u, resolveCodexDynamicToolsLoading as v, resolveCodexTurnCompletionIdleTimeoutMs as w, resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs as x, handleCodexAppServerApprovalRequest as y };
+export { withCodexStartupTimeout as S, resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs as _, createCodexNativeHookRelay as a, resolveCodexTurnCompletionIdleTimeoutMs as b, scheduleCodexNativeHookRelayUnregister as c, emitDynamicToolErrorDiagnostic as d, emitDynamicToolStartedDiagnostic as f, CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS as g, handleCodexAppServerApprovalRequest as h, buildCodexNativeHookRelayDisabledConfig as i, handleCodexAppServerElicitationRequest as l, filterToolsForVisionInputs as m, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as n, resolveCodexNativeHookRelayEvents as o, emitDynamicToolTerminalDiagnostic as p, buildCodexNativeHookRelayConfig as r, resolveCodexNativeHookRelayTtlMs as s, CODEX_NATIVE_HOOK_RELAY_EVENTS as t, createCodexDynamicToolBridge as u, resolveCodexStartupTimeoutMs as v, resolveCodexTurnTerminalIdleTimeoutMs as x, resolveCodexTurnAssistantCompletionIdleTimeoutMs as y };

package/dist/provider.js

@@ -123,7 +123,7 @@ async function listModelsBestEffort(params) {
 	}
 }
 async function listCodexAppServerModelsLazy(options) {
-	const { listCodexAppServerModels } = await import("./models-DEgJXKQy.js").then((n) => n.r);
+	const { listCodexAppServerModels } = await import("./models-DAJvlyJu.js").then((n) => n.r);
 	return listCodexAppServerModels(options);
 }
 function normalizeTimeoutMs(value) {

package/dist/{request-DYdA1i4c.js → request-CPtFWp-f.js}

@@ -1,6 +1,6 @@
 import { n as CodexAppServerRpcError } from "./client-BnOmn0y-.js";
-import { b as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-Bnlv_Q8u.js";
-import { a as releaseLeasedSharedCodexAppServerClient, c as withTimeout, i as getLeasedSharedCodexAppServerClient, m as resolveCodexAppServerHomeDir, r as createIsolatedCodexAppServerClient } from "./shared-client-ByKKWtYX.js";
+import { b as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-6nrEQZMV.js";
+import { a as releaseLeasedSharedCodexAppServerClient, c as withTimeout, i as getLeasedSharedCodexAppServerClient, m as resolveCodexAppServerHomeDir, r as createIsolatedCodexAppServerClient } from "./shared-client-DUWLidr5.js";
 import { t as resolveCodexAppServerDirectSandboxBypassBlock } from "./sandbox-guard-DMCJlzmz.js";
 import { createHash } from "node:crypto";
 //#region extensions/codex/src/app-server/capabilities.ts

package/dist/{run-attempt-BHkuGybn.js → run-attempt-DM53zFlW.js}

@@ -1,15 +1,15 @@
 import { a as isCodexAppServerApprovalPolicyAllowedByRequirements, c as isCodexSandboxExecServerEnabled, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as withMcpElicitationsApprovalPolicy, h as shouldAutoApproveCodexAppServerApprovals, m as resolveOpenClawExecPolicyForCodexAppServer, p as resolveCodexPluginsPolicy, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-DIt7cXIp.js";
 import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, l as isJsonObject, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-BnOmn0y-.js";
-import { C as sanitizeCodexHistoryImagePayloads, D as resolveCodexContextEngineProjectionReserveTokens, E as resolveCodexContextEngineProjectionMaxChars, T as projectContextEngineAssemblyForCodex, _ as shouldBuildCodexPluginThreadConfig, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildContextEngineBinding, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfig, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, p as isCodexAppServerProfilerEnabled, s as buildTurnStartParams, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-Bnlv_Q8u.js";
-import { a as readCodexAppServerBinding, n as clearCodexAppServerBindingForThread, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-DYdA1i4c.js";
+import { A as projectContextEngineAssemblyForCodex, C as sanitizeCodexHistoryImagePayloads, D as normalizeCodexDynamicToolName$1, E as isForcedPrivateQaCodexRuntime, M as resolveCodexContextEngineProjectionReserveTokens, T as filterCodexDynamicTools, _ as shouldBuildCodexPluginThreadConfig, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildContextEngineBinding, j as resolveCodexContextEngineProjectionMaxChars, k as resolveCodexDynamicToolsLoadingForModel, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfig, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, p as isCodexAppServerProfilerEnabled, s as buildTurnStartParams, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-6nrEQZMV.js";
+import { a as readCodexAppServerBinding, n as clearCodexAppServerBindingForThread, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-CPtFWp-f.js";
 import { _ as shouldRefreshCodexRateLimitsForUsageLimitMessage, g as resolveCodexUsageLimitResetAtMs, h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthProfileId, f as resolveCodexAppServerAuthProfileIdForAgent, l as refreshCodexAppServerAuthTokens, m as resolveCodexAppServerHomeDir, o as retireSharedCodexAppServerClientIfCurrent, p as resolveCodexAppServerFallbackApiKeyCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-ByKKWtYX.js";
+import { a as releaseLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthProfileId, f as resolveCodexAppServerAuthProfileIdForAgent, l as refreshCodexAppServerAuthTokens, m as resolveCodexAppServerHomeDir, o as retireSharedCodexAppServerClientIfCurrent, p as resolveCodexAppServerFallbackApiKeyCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-DUWLidr5.js";
 import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-DMCJlzmz.js";
-import { n as defaultLeasedCodexAppServerClientFactory } from "./client-factory-DBgo1xC5.js";
-import { C as resolveCodexTurnAssistantCompletionIdleTimeoutMs, E as withCodexStartupTimeout, S as resolveCodexStartupTimeoutMs, T as resolveCodexTurnTerminalIdleTimeoutMs, _ as normalizeCodexDynamicToolName$1, a as createCodexNativeHookRelay, b as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as isForcedPrivateQaCodexRuntime, h as filterCodexDynamicTools, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexDynamicToolsLoading, w as resolveCodexTurnCompletionIdleTimeoutMs, x as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, y as handleCodexAppServerApprovalRequest } from "./native-hook-relay-D_LPgQFs.js";
-import { t as ensureCodexComputerUse } from "./computer-use-BbqwzKz3.js";
+import { n as defaultLeasedCodexAppServerClientFactory } from "./client-factory-3ykiiX2z.js";
+import { S as withCodexStartupTimeout, _ as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, a as createCodexNativeHookRelay, b as resolveCodexTurnCompletionIdleTimeoutMs, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexStartupTimeoutMs, x as resolveCodexTurnTerminalIdleTimeoutMs, y as resolveCodexTurnAssistantCompletionIdleTimeoutMs } from "./native-hook-relay-CIJt8cLN.js";
+import { t as ensureCodexComputerUse } from "./computer-use-DYLSxIfq.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { asDateTimestampMs, parseStrictNonNegativeInteger, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash, randomUUID } from "node:crypto";
@@ -1535,7 +1535,7 @@ function sendResult(socket, id, result) {
 	socket.send(JSON.stringify({
 		jsonrpc: "2.0",
 		id,
-		result: result ?? {}
+		result: result === void 0 ? {} : result
 	}));
 }
 function sendError(socket, id, code, message) {
@@ -2782,6 +2782,7 @@ async function startCodexAttemptThread(params) {
 							mcpServersFingerprintEvaluated: params.bundleMcpThreadConfig.evaluated,
 							environmentSelection: startupEnvironmentSelection,
 							contextEngineProjection: params.contextEngineProjection,
+							signal: params.signal,
 							pluginThreadConfig: pluginThreadConfigRequired ? {
 								enabled: true,
 								inputFingerprint: pluginThreadConfigInputFingerprint,
@@ -2929,6 +2930,10 @@ function createCodexSteeringQueue(params) {
 				});
 				clearBatchTimer();
 				const debounceMs = normalizeCodexSteerDebounceMs(options?.debounceMs);
+				if (debounceMs === 0) {
+					flushBatch().catch(() => void 0);
+					return;
+				}
 				batchTimer = setTimeout(() => {
 					batchTimer = void 0;
 					flushBatch().catch(() => void 0);
@@ -3051,6 +3056,12 @@ function createCodexAttemptTurnWatchController(params) {
 		scheduleCompletionIdleWatch();
 		scheduleTerminalIdleWatch();
 	}
+	function isCompletionIdleTimeoutDueBeforeAttempt(timeoutMs) {
+		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return false;
+		const completionTimeoutMs = completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
+		if (completionTimeoutMs > timeoutMs) return false;
+		return Math.max(0, Date.now() - completionLastActivityAt) >= completionTimeoutMs;
+	}
 	function recordAttemptProgress(reason, options) {
 		attemptIdleTimeoutOverrideMs = options?.attemptTimeoutMs !== void 0 ? resolveWatchTimeoutMs(options.attemptTimeoutMs) : void 0;
 		attemptLastProgressAt = completionLastActivityAt;
@@ -3104,6 +3115,10 @@ function createCodexAttemptTurnWatchController(params) {
 			scheduleAttemptIdleWatch();
 			return;
 		}
+		if (isCompletionIdleTimeoutDueBeforeAttempt(timeoutMs)) {
+			fireCompletionIdleTimeout();
+			return;
+		}
 		const timeout = {
 			kind: "progress",
 			idleMs,
@@ -3806,6 +3821,7 @@ const CODEX_PROMPT_TOTAL_INPUT_KEYS = [
 ];
 const MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM = 20;
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 12e3;
+const MISSING_TOOL_RESULT_ERROR = "OpenClaw recorded a native Codex tool.call without a matching tool.result before the turn completed.";
 const GENERATED_IMAGE_MEDIA_SUBDIR = "tool-image-generation";
 const BYTES_PER_MB = 1024 * 1024;
 const DEFAULT_GENERATED_IMAGE_MAX_BYTES = 6 * BYTES_PER_MB;
@@ -3852,6 +3868,10 @@ var CodexAppServerEventProjector = class {
 		this.toolTranscriptMessages = [];
 		this.toolTranscriptCallIds = /* @__PURE__ */ new Set();
 		this.toolTranscriptResultIds = /* @__PURE__ */ new Set();
+		this.toolTranscriptNamesById = /* @__PURE__ */ new Map();
+		this.toolTrajectoryCallIds = /* @__PURE__ */ new Set();
+		this.toolTrajectoryResultIds = /* @__PURE__ */ new Set();
+		this.toolTrajectoryNamesById = /* @__PURE__ */ new Map();
 		this.transcriptToolProgressCallIds = /* @__PURE__ */ new Set();
 		this.nativeGeneratedMediaUrls = /* @__PURE__ */ new Set();
 		this.nativeGeneratedMediaItemIds = /* @__PURE__ */ new Set();
@@ -3862,6 +3882,7 @@ var CodexAppServerEventProjector = class {
 		this.reasoningStarted = false;
 		this.reasoningEnded = false;
 		this.promptErrorSource = null;
+		this.synthesizedMissingToolResultError = null;
 		this.aborted = false;
 		this.guardianReviewCount = 0;
 		this.completedCompactionCount = 0;
@@ -3935,6 +3956,7 @@ var CodexAppServerEventProjector = class {
 		const assistantTexts = this.collectAssistantTexts();
 		const reasoningText = collectReasoningTextValues(this.reasoningTextByGroup, this.reasoningItemOrder).join("\n\n");
 		const planText = collectTextValues(this.planTextByItem).join("\n\n");
+		this.synthesizeMissingToolResults({ failClosed: !this.completedTurn || this.completedTurn.status !== "completed" || assistantTexts.length > 0 });
 		const lastAssistant = assistantTexts.length > 0 ? this.createAssistantMessage(assistantTexts.join("\n\n")) : void 0;
 		const turnId = this.turnId;
 		const messagesSnapshot = this.params.suppressNextUserMessagePersistence ? [] : [attachCodexMirrorIdentity(buildCodexUserPromptMessage(this.params), `${turnId}:prompt`)];
@@ -3943,7 +3965,7 @@ var CodexAppServerEventProjector = class {
 		messagesSnapshot.push(...this.toolTranscriptMessages);
 		if (lastAssistant) messagesSnapshot.push(attachCodexMirrorIdentity(lastAssistant, `${turnId}:assistant`));
 		const turnFailed = this.completedTurn?.status === "failed";
-		const promptError = this.promptError ?? (turnFailed ? this.completedTurn?.error?.message ?? "codex app-server turn failed" : null);
+		const promptError = this.promptError ?? this.synthesizedMissingToolResultError ?? (turnFailed ? this.completedTurn?.error?.message ?? "codex app-server turn failed" : null);
 		const agentHarnessResultClassification = classifyAgentHarnessTerminalOutcome({
 			assistantTexts,
 			reasoningText,
@@ -4594,6 +4616,8 @@ var CodexAppServerEventProjector = class {
 	}
 	recordToolTrajectoryEvent(params) {
 		if (params.phase === "start") {
+			this.toolTrajectoryCallIds.add(params.item.id);
+			this.toolTrajectoryNamesById.set(params.item.id, params.name);
 			this.options.trajectoryRecorder?.recordEvent("tool.call", {
 				threadId: this.threadId,
 				turnId: this.turnId,
@@ -4604,6 +4628,7 @@ var CodexAppServerEventProjector = class {
 			});
 			return;
 		}
+		this.toolTrajectoryResultIds.add(params.item.id);
 		const toolResult = itemToolResult(params.item).result;
 		const output = itemOutputText(params.item, this.toolResultOutputTextByItem);
 		this.options.trajectoryRecorder?.recordEvent("tool.result", {
@@ -4774,6 +4799,7 @@ var CodexAppServerEventProjector = class {
 	recordToolTranscriptCall(params) {
 		if (!params.id || !params.name || this.toolTranscriptCallIds.has(params.id)) return;
 		this.toolTranscriptCallIds.add(params.id);
+		this.toolTranscriptNamesById.set(params.id, params.name);
 		this.toolTranscriptArgumentsById.set(params.id, params.arguments);
 		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) this.transcriptToolProgressSuppressedIds.add(params.id);
 		else this.transcriptToolProgressSuppressedIds.delete(params.id);
@@ -4786,6 +4812,51 @@ var CodexAppServerEventProjector = class {
 		this.emitTranscriptToolResultProgress(params);
 		this.toolTranscriptMessages.push(attachCodexMirrorIdentity(this.createToolResultMessage(params), `${this.turnId}:tool:${params.id}:result`));
 	}
+	synthesizeMissingToolResults(params) {
+		if (!params.failClosed) return;
+		const missingTranscriptIds = [...this.toolTranscriptCallIds].filter((id) => !this.toolTranscriptResultIds.has(id));
+		const missingTrajectoryIds = [...this.toolTrajectoryCallIds].filter((id) => !this.toolTrajectoryResultIds.has(id));
+		if (missingTranscriptIds.length === 0 && missingTrajectoryIds.length === 0) return;
+		for (const id of missingTranscriptIds) {
+			const name = this.toolTranscriptNamesById.get(id) ?? this.toolTrajectoryNamesById.get(id);
+			if (!name) continue;
+			this.recordToolTranscriptResult({
+				id,
+				name,
+				text: formatMissingToolResultError({
+					id,
+					name
+				}),
+				isError: true
+			});
+		}
+		for (const id of missingTrajectoryIds) {
+			const name = this.toolTrajectoryNamesById.get(id) ?? this.toolTranscriptNamesById.get(id);
+			if (!name) continue;
+			this.toolTrajectoryResultIds.add(id);
+			const text = formatMissingToolResultError({
+				id,
+				name
+			});
+			this.options.trajectoryRecorder?.recordEvent("tool.result", {
+				threadId: this.threadId,
+				turnId: this.turnId,
+				itemId: id,
+				toolCallId: id,
+				name,
+				status: "failed",
+				isError: true,
+				result: {
+					status: "failed",
+					reason: "missing_tool_result"
+				},
+				output: text
+			});
+		}
+		const missingCount = new Set([...missingTranscriptIds, ...missingTrajectoryIds]).size;
+		this.synthesizedMissingToolResultError = missingCount === 1 ? MISSING_TOOL_RESULT_ERROR : `${MISSING_TOOL_RESULT_ERROR} missingToolResultCount=${missingCount}`;
+		this.promptErrorSource = this.promptErrorSource ?? "prompt";
+	}
 	emitTranscriptToolCallProgress(params) {
 		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) return;
 		this.transcriptToolProgressCallIds.add(params.id);
@@ -5152,6 +5223,9 @@ function itemStatus(item) {
 	if (status === "inProgress" || status === "running") return "running";
 	return "completed";
 }
+function formatMissingToolResultError(params) {
+	return `${MISSING_TOOL_RESULT_ERROR} toolCallId=${params.id}; toolName=${params.name}`;
+}
 function isNonSuccessItemStatus(status) {
 	return status === "failed" || status === "blocked";
 }
@@ -7457,7 +7531,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			onCodexAppServerEvent: (event) => emitCodexAppServerEvent(params, event)
 		}),
 		signal: runAbortController.signal,
-		loading: resolveCodexDynamicToolsLoading(pluginConfig),
+		loading: resolveCodexDynamicToolsLoadingForModel(pluginConfig, params.modelId),
 		directToolNames: shouldForceMessageTool(params) ? ["message"] : [],
 		hookContext: {
 			agentId: sessionAgentId,
@@ -8414,6 +8488,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 	});
 	let turn;
+	const throwIfTurnStartAcceptedAfterAbort = () => {
+		if (!runAbortController.signal.aborted) return;
+		const reason = runAbortController.signal.reason;
+		if (reason instanceof Error) throw reason;
+		const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "codex app-server turn start aborted before acceptance");
+		error.name = "AbortError";
+		throw error;
+	};
 	const startCodexTurn = async () => {
 		const turnStartParams = buildTurnStartParams(params, {
 			threadId: thread.threadId,
@@ -8428,10 +8510,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			heartbeatCollaborationInstructions: workspaceBootstrapContext.heartbeatCollaborationInstructions
 		});
 		codexModelCallDiagnostics.setRequestPayloadBytes(utf8JsonByteLength(turnStartParams));
-		return assertCodexTurnStartResponse(await client.request("turn/start", turnStartParams, {
+		const startedTurn = assertCodexTurnStartResponse(await client.request("turn/start", turnStartParams, {
 			timeoutMs: params.timeoutMs,
 			signal: runAbortController.signal
 		}));
+		throwIfTurnStartAcceptedAfterAbort();
+		return startedTurn;
 	};
 	try {
 		codexModelCallDiagnostics.emitStarted();
@@ -8469,6 +8553,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				});
 				else {
 					thread = await restartContextEngineCodexThread();
+					{
+						const retryBinding = await readCodexAppServerBinding(activeSessionFile);
+						if (retryBinding && retryBinding.threadId === thread.threadId && retryBinding.contextEngine?.projection) {
+							const { schemaVersion: _schemaVersion, sessionFile: _boundSessionFile, updatedAt: _updatedAt, ...bindingForWrite } = retryBinding;
+							await writeCodexAppServerBinding(activeSessionFile, {
+								...bindingForWrite,
+								contextEngine: bindingForWrite.contextEngine ? {
+									...bindingForWrite.contextEngine,
+									projection: void 0
+								} : void 0
+							});
+							embeddedAgentLog.info("codex app-server cleared stale context-engine projection after overflow retry", {
+								threadId: thread.threadId,
+								previousEpoch: retryBinding.contextEngine.projection.epoch
+							});
+						}
+					}
 					emitCodexAppServerEvent(params, {
 						stream: "codex_app_server.lifecycle",
 						data: {
@@ -8656,7 +8757,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const handle = {
 		kind: "embedded",
 		queueMessage: async (text, optionsLocal) => activeSteeringQueue.queue(text, optionsLocal),
-		isStreaming: () => !completed,
+		isStreaming: () => !completed && !runAbortController.signal.aborted,
 		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
 		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
 		cancel: () => runAbortController.abort("cancelled"),

package/dist/{session-binding-BXJAV_xy.js → session-binding-DWiEGATW.js}

@@ -51,6 +51,7 @@ async function readCodexAppServerBinding(sessionFile, lookup = {}) {
 			sandbox: readSandboxMode(parsed.sandbox),
 			serviceTier: readServiceTier(parsed.serviceTier),
 			dynamicToolsFingerprint: typeof parsed.dynamicToolsFingerprint === "string" ? parsed.dynamicToolsFingerprint : void 0,
+			dynamicToolsContainDeferred: typeof parsed.dynamicToolsContainDeferred === "boolean" ? parsed.dynamicToolsContainDeferred : void 0,
 			userMcpServersFingerprint: typeof parsed.userMcpServersFingerprint === "string" ? parsed.userMcpServersFingerprint : void 0,
 			mcpServersFingerprint: typeof parsed.mcpServersFingerprint === "string" ? parsed.mcpServersFingerprint : void 0,
 			nativeHookRelayGeneration: typeof parsed.nativeHookRelayGeneration === "string" && parsed.nativeHookRelayGeneration.trim() ? parsed.nativeHookRelayGeneration : void 0,
@@ -88,6 +89,7 @@ async function writeCodexAppServerBinding(sessionFile, binding, lookup = {}) {
 		sandbox: binding.sandbox,
 		serviceTier: binding.serviceTier,
 		dynamicToolsFingerprint: binding.dynamicToolsFingerprint,
+		dynamicToolsContainDeferred: binding.dynamicToolsContainDeferred,
 		userMcpServersFingerprint: binding.userMcpServersFingerprint,
 		mcpServersFingerprint: binding.mcpServersFingerprint,
 		nativeHookRelayGeneration: binding.nativeHookRelayGeneration,

package/dist/{shared-client-ByKKWtYX.js → shared-client-DUWLidr5.js}

@@ -713,7 +713,11 @@ async function createIsolatedCodexAppServerClient(options) {
 	}
 }
 function resetSharedCodexAppServerClientForTests() {
-	getSharedCodexAppServerClientState().clients.clear();
+	const state = getSharedCodexAppServerClientState();
+	const clients = collectSharedClients(state);
+	state.clients.clear();
+	state.leasedReleases = /* @__PURE__ */ new WeakMap();
+	for (const client of clients) client.close();
 }
 function clearSharedCodexAppServerClient() {
 	const state = getSharedCodexAppServerClientState();

package/dist/{side-question-6HqYQ06R.js → side-question-dIZf9RBV.js}

@@ -1,12 +1,12 @@
 import { d as resolveCodexAppServerRuntimeOptions, h as shouldAutoApproveCodexAppServerApprovals, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-DIt7cXIp.js";
 import { i as isCodexAppServerApprovalRequest, l as isJsonObject } from "./client-BnOmn0y-.js";
-import { d as resolveReasoningEffort, g as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-Bnlv_Q8u.js";
-import { a as readCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
+import { O as resolveCodexDynamicToolsLoading, T as filterCodexDynamicTools, d as resolveReasoningEffort, g as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-6nrEQZMV.js";
+import { a as readCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
 import { h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, r as readCodexNotificationThreadId } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, i as getLeasedSharedCodexAppServerClient, l as refreshCodexAppServerAuthTokens } from "./shared-client-ByKKWtYX.js";
+import { a as releaseLeasedSharedCodexAppServerClient, i as getLeasedSharedCodexAppServerClient, l as refreshCodexAppServerAuthTokens } from "./shared-client-DUWLidr5.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DMCJlzmz.js";
-import { d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, h as filterCodexDynamicTools, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, t as CODEX_NATIVE_HOOK_RELAY_EVENTS, u as createCodexDynamicToolBridge, v as resolveCodexDynamicToolsLoading, y as handleCodexAppServerApprovalRequest } from "./native-hook-relay-D_LPgQFs.js";
+import { d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, t as CODEX_NATIVE_HOOK_RELAY_EVENTS, u as createCodexDynamicToolBridge } from "./native-hook-relay-CIJt8cLN.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/side-question.ts

package/dist/{thread-lifecycle-Bnlv_Q8u.js → thread-lifecycle-6nrEQZMV.js}

@@ -3,7 +3,7 @@ import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartRespon
 import { a as isCodexAppServerConnectionClosedError, l as isJsonObject, n as CodexAppServerRpcError } from "./client-BnOmn0y-.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY } from "./prompt-overlay.js";
 import { isModernCodexModel } from "./provider.js";
-import { a as readCodexAppServerBinding, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
+import { a as readCodexAppServerBinding, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
 import { isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -227,6 +227,59 @@ function truncateOlderContext(text, maxChars) {
 	return `${marker}${text.slice(text.length - tailChars).trimStart()}`;
 }
 //#endregion
+//#region extensions/codex/src/app-server/dynamic-tool-profile.ts
+const CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES = [
+	"read",
+	"write",
+	"edit",
+	"apply_patch",
+	"exec",
+	"process",
+	"update_plan",
+	"tool_call",
+	"tool_describe",
+	"tool_search",
+	"tool_search_code"
+];
+const DYNAMIC_TOOL_NAME_ALIASES = {
+	bash: "exec",
+	"apply-patch": "apply_patch"
+};
+function normalizeCodexDynamicToolName(name) {
+	const normalized = name.trim().toLowerCase();
+	return DYNAMIC_TOOL_NAME_ALIASES[normalized] ?? normalized;
+}
+function isForcedPrivateQaCodexRuntime(env = process.env) {
+	return env.OPENCLAW_BUILD_PRIVATE_QA === "1" && env.OPENCLAW_QA_FORCE_RUNTIME?.trim().toLowerCase() === "codex";
+}
+function resolveCodexDynamicToolsLoading(config, env = process.env) {
+	return isForcedPrivateQaCodexRuntime(env) ? "direct" : config.codexDynamicToolsLoading ?? "searchable";
+}
+function normalizeCodexModelId(modelId) {
+	const normalized = modelId?.trim().toLowerCase();
+	if (!normalized) return "";
+	return normalized.includes("/") ? normalized.split("/").at(-1) : normalized;
+}
+function shouldUseDirectCodexDynamicToolsForModel(modelId) {
+	return shouldDisableCodexToolSearchForModel(modelId);
+}
+function shouldDisableCodexToolSearchForModel(modelId) {
+	return normalizeCodexModelId(modelId) === "gpt-5.4-nano";
+}
+function resolveCodexDynamicToolsLoadingForModel(config, modelId, env = process.env) {
+	const loading = resolveCodexDynamicToolsLoading(config, env);
+	return loading === "searchable" && shouldUseDirectCodexDynamicToolsForModel(modelId) ? "direct" : loading;
+}
+function filterCodexDynamicTools(tools, config, env = process.env) {
+	const excludes = /* @__PURE__ */ new Set();
+	if (!isForcedPrivateQaCodexRuntime(env)) for (const name of CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES) excludes.add(name);
+	for (const name of config.codexDynamicToolsExclude ?? []) {
+		const trimmed = normalizeCodexDynamicToolName(name);
+		if (trimmed) excludes.add(trimmed);
+	}
+	return excludes.size === 0 ? tools : tools.filter((tool) => !excludes.has(normalizeCodexDynamicToolName(tool.name)));
+}
+//#endregion
 //#region extensions/codex/src/app-server/image-payload-sanitizer.ts
 const IMAGE_OMITTED_TEXT = "omitted image payload: invalid inline image data";
 function sanitizeInlineImageDataUrl$1(imageUrl) {
@@ -1037,38 +1090,50 @@ const CODEX_CODE_MODE_DISABLED_THREAD_CONFIG = {
 	"features.code_mode_only": false
 };
 const CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG = { project_doc_max_bytes: 0 };
+const CODEX_TOOL_SEARCH_UNSUPPORTED_THREAD_CONFIG = { "features.multi_agent": false };
 const CODEX_THREAD_LIFECYCLE_TIMING_WARN_TOTAL_MS = 1e3;
 const CODEX_THREAD_LIFECYCLE_TIMING_WARN_STAGE_MS = 500;
+function shouldWarnCodexThreadLifecycleTimingSummary(summary, options = {}) {
+	const totalThresholdMs = options.totalThresholdMs ?? CODEX_THREAD_LIFECYCLE_TIMING_WARN_TOTAL_MS;
+	const stageThresholdMs = options.stageThresholdMs ?? CODEX_THREAD_LIFECYCLE_TIMING_WARN_STAGE_MS;
+	return summary.totalMs >= totalThresholdMs || summary.spans.some((span) => span.durationMs >= stageThresholdMs);
+}
+function formatCodexThreadLifecycleTimingSummary(params) {
+	const spans = params.summary.spans.length > 0 ? params.summary.spans.map((span) => `${span.name}:${span.durationMs}ms@${span.elapsedMs}ms`).join(",") : "none";
+	return `[trace:codex-app-server] thread lifecycle: runId=${params.runId} sessionId=${params.sessionId} sessionKey=${params.sessionKey ?? "unknown"} action=${params.action} totalMs=${params.summary.totalMs} stages=${spans}`;
+}
 function createCodexThreadLifecycleTimingTracker(options = {}) {
-	if (!options.enabled) return {
+	const log = options.log ?? embeddedAgentLog;
+	if (!options.enabled && log.isEnabled?.("trace") !== true) return {
 		async measure(_name, run) {
 			return await run();
 		},
 		measureSync(_name, run) {
 			return run();
 		},
-		logIfSlow() {}
+		mark() {},
+		logSummary() {}
 	};
-	const startedAt = Date.now();
+	const now = options.now ?? Date.now;
+	const startedAt = now();
 	let didLog = false;
 	const spans = [];
 	const toMs = (value) => Math.max(0, Math.round(value));
 	const record = (name, spanStartedAt) => {
+		const currentAt = now();
 		spans.push({
 			name,
-			durationMs: toMs(Date.now() - spanStartedAt),
-			elapsedMs: toMs(Date.now() - startedAt)
+			durationMs: toMs(currentAt - spanStartedAt),
+			elapsedMs: toMs(currentAt - startedAt)
 		});
 	};
 	const snapshot = () => ({
-		totalMs: toMs(Date.now() - startedAt),
+		totalMs: toMs(now() - startedAt),
 		spans: spans.slice()
 	});
-	const shouldLog = (summary) => summary.totalMs >= CODEX_THREAD_LIFECYCLE_TIMING_WARN_TOTAL_MS || summary.spans.some((span) => span.durationMs >= CODEX_THREAD_LIFECYCLE_TIMING_WARN_STAGE_MS);
-	const formatSpans = (summary) => summary.spans.length > 0 ? summary.spans.map((span) => `${span.name}:${span.durationMs}ms@${span.elapsedMs}ms`).join(",") : "none";
 	return {
 		async measure(name, run) {
-			const spanStartedAt = Date.now();
+			const spanStartedAt = now();
 			try {
 				return await run();
 			} finally {
@@ -1076,19 +1141,30 @@ function createCodexThreadLifecycleTimingTracker(options = {}) {
 			}
 		},
 		measureSync(name, run) {
-			const spanStartedAt = Date.now();
+			const spanStartedAt = now();
 			try {
 				return run();
 			} finally {
 				record(name, spanStartedAt);
 			}
 		},
-		logIfSlow(params) {
+		mark(name) {
+			record(name, now());
+		},
+		logSummary(params) {
 			if (didLog) return;
 			const summary = snapshot();
-			if (!shouldLog(summary)) return;
+			const shouldWarn = shouldWarnCodexThreadLifecycleTimingSummary(summary, options);
+			if (!shouldWarn && !log.isEnabled?.("trace")) return;
 			didLog = true;
-			embeddedAgentLog.warn(`codex app-server thread lifecycle timings runId=${params.runId} sessionId=${params.sessionId} sessionKey=${params.sessionKey ?? "unknown"} action=${params.action} totalMs=${summary.totalMs} stages=${formatSpans(summary)}`, {
+			const message = formatCodexThreadLifecycleTimingSummary({
+				runId: params.runId,
+				sessionId: params.sessionId,
+				sessionKey: params.sessionKey,
+				action: params.action,
+				summary
+			});
+			const meta = {
 				runId: params.runId,
 				sessionId: params.sessionId,
 				sessionKey: params.sessionKey,
@@ -1096,18 +1172,24 @@ function createCodexThreadLifecycleTimingTracker(options = {}) {
 				threadId: params.threadId,
 				totalMs: summary.totalMs,
 				spans: summary.spans
-			});
+			};
+			if (shouldWarn) log.warn(message, meta);
+			else log.trace(message, meta);
 		}
 	};
 }
 async function startOrResumeThread(params) {
-	const lifecycleTiming = createCodexThreadLifecycleTimingTracker({ enabled: isCodexAppServerProfilerEnabled(params.params.config) });
-	const dynamicToolsFingerprint = lifecycleTiming.measureSync("fingerprint_dynamic_tools", () => fingerprintDynamicTools(params.dynamicTools));
-	const contextEngineBinding = lifecycleTiming.measureSync("context_engine_binding", () => buildContextEngineBinding(params.params, params.contextEngineProjection));
+	const lifecycleTiming = createCodexThreadLifecycleTimingTracker({
+		...params.timing,
+		enabled: params.timing?.enabled ?? isCodexAppServerProfilerEnabled(params.params.config)
+	});
+	const dynamicToolsFingerprint = lifecycleTiming.measureSync("dynamic-tools-fingerprint", () => fingerprintDynamicTools(params.dynamicTools));
+	const dynamicToolsContainDeferred = params.dynamicTools.some((tool) => tool.deferLoading === true);
+	const contextEngineBinding = lifecycleTiming.measureSync("context-engine-binding", () => buildContextEngineBinding(params.params, params.contextEngineProjection));
 	const userMcpServersConfigPatch = params.userMcpServersEnabled === false ? void 0 : buildCodexUserMcpServersThreadConfigPatch(params.params.config, { agentId: params.agentId ?? params.params.agentId });
 	const userMcpServersFingerprint = fingerprintUserMcpServersConfigPatch(userMcpServersConfigPatch);
 	const environmentSelectionFingerprint = fingerprintEnvironmentSelection(params.environmentSelection);
-	let binding = await lifecycleTiming.measure("read_binding", () => readCodexAppServerBinding(params.params.sessionFile, {
+	let binding = await lifecycleTiming.measure("read-binding", () => readCodexAppServerBinding(params.params.sessionFile, {
 		authProfileStore: params.params.authProfileStore,
 		agentDir: params.params.agentDir,
 		config: params.params.config
@@ -1115,6 +1197,14 @@ async function startOrResumeThread(params) {
 	let preserveExistingBinding = false;
 	let rotatedContextEngineBinding = false;
 	let prebuiltPluginThreadConfig;
+	const throwIfAborted = () => {
+		if (!params.signal?.aborted) return;
+		const reason = params.signal.reason;
+		if (reason instanceof Error) throw reason;
+		const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "codex app-server thread lifecycle aborted");
+		error.name = "AbortError";
+		throw error;
+	};
 	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;
@@ -1165,7 +1255,7 @@ async function startOrResumeThread(params) {
 			binding,
 			pluginThreadConfig: params.pluginThreadConfig
 		})) try {
-			prebuiltPluginThreadConfig = await lifecycleTiming.measure("plugin_config_recovery", () => params.pluginThreadConfig?.build());
+			prebuiltPluginThreadConfig = await lifecycleTiming.measure("plugin-config-recovery", () => params.pluginThreadConfig?.build());
 			pluginBindingStale = prebuiltPluginThreadConfig?.fingerprint !== binding.pluginAppsFingerprint;
 		} catch (error) {
 			embeddedAgentLog.warn("codex app-server plugin app config recovery check failed", {
@@ -1184,6 +1274,13 @@ async function startOrResumeThread(params) {
 		await clearCodexAppServerBinding(params.params.sessionFile);
 		binding = void 0;
 	}
+	if (binding?.threadId) {
+		if (binding.dynamicToolsFingerprint && params.dynamicTools.length > 0 && binding.dynamicToolsContainDeferred !== dynamicToolsContainDeferred && (binding.dynamicToolsContainDeferred !== void 0 || !dynamicToolsContainDeferred)) {
+			embeddedAgentLog.debug("codex app-server dynamic tool loading changed; starting a new thread", { threadId: binding.threadId });
+			await clearCodexAppServerBinding(params.params.sessionFile);
+			binding = void 0;
+		}
+	}
 	if (binding?.threadId) if (binding.dynamicToolsFingerprint && !areDynamicToolFingerprintsCompatible(binding.dynamicToolsFingerprint, dynamicToolsFingerprint)) {
 		preserveExistingBinding = shouldStartTransientNoToolThread({
 			previous: binding.dynamicToolsFingerprint,
@@ -1204,7 +1301,7 @@ async function startOrResumeThread(params) {
 			nativeHookRelayGeneration: params.nativeHookRelayGeneration
 		};
 		const resumeConfig = mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, finalConfigPatch.configPatch);
-		const resumeParams = lifecycleTiming.measureSync("thread_resume_params", () => buildThreadResumeParams(params.params, {
+		const resumeParams = lifecycleTiming.measureSync("thread-resume-params", () => buildThreadResumeParams(params.params, {
 			threadId: binding.threadId,
 			authProfileId,
 			appServer: params.appServer,
@@ -1214,7 +1311,8 @@ async function startOrResumeThread(params) {
 			nativeCodeModeEnabled: params.nativeCodeModeEnabled,
 			nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled
 		}));
-		const response = assertCodexThreadResumeResponse(await lifecycleTiming.measure("thread_resume_request", () => params.client.request("thread/resume", resumeParams)));
+		const response = assertCodexThreadResumeResponse(await lifecycleTiming.measure("thread-resume-request", () => params.client.request("thread/resume", resumeParams, { signal: params.signal })));
+		throwIfAborted();
 		const boundAuthProfileId = authProfileId;
 		const fallbackModelProvider = resolveCodexAppServerModelProvider({
 			provider: params.params.provider,
@@ -1224,13 +1322,14 @@ async function startOrResumeThread(params) {
 			config: params.params.config
 		});
 		const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : binding.mcpServersFingerprint;
-		await lifecycleTiming.measure("thread_resume_write_binding", () => writeCodexAppServerBinding(params.params.sessionFile, {
+		await lifecycleTiming.measure("thread-resume-write-binding", () => writeCodexAppServerBinding(params.params.sessionFile, {
 			threadId: response.thread.id,
 			cwd: params.cwd,
 			authProfileId: boundAuthProfileId,
 			model: params.params.modelId,
 			modelProvider: response.modelProvider ?? fallbackModelProvider,
 			dynamicToolsFingerprint,
+			dynamicToolsContainDeferred,
 			userMcpServersFingerprint,
 			mcpServersFingerprint: nextMcpServersFingerprint,
 			nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration ?? binding.nativeHookRelayGeneration,
@@ -1254,7 +1353,8 @@ async function startOrResumeThread(params) {
 			fingerprint: contextEngineBinding.projection?.fingerprint,
 			action: "resumed"
 		});
-		lifecycleTiming.logIfSlow({
+		lifecycleTiming.mark("thread-ready");
+		lifecycleTiming.logSummary({
 			runId: params.params.runId,
 			sessionId: params.params.sessionId,
 			sessionKey: params.params.sessionKey,
@@ -1269,6 +1369,7 @@ async function startOrResumeThread(params) {
 			model: params.params.modelId,
 			modelProvider: response.modelProvider ?? fallbackModelProvider,
 			dynamicToolsFingerprint,
+			dynamicToolsContainDeferred,
 			userMcpServersFingerprint,
 			mcpServersFingerprint: nextMcpServersFingerprint,
 			nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration ?? binding.nativeHookRelayGeneration,
@@ -1284,13 +1385,13 @@ async function startOrResumeThread(params) {
 		embeddedAgentLog.warn("codex app-server thread resume failed; starting a new thread", { error });
 		await clearCodexAppServerBinding(params.params.sessionFile);
 	}
-	const pluginThreadConfig = params.pluginThreadConfig?.enabled ? prebuiltPluginThreadConfig ?? await lifecycleTiming.measure("plugin_config_build", () => params.pluginThreadConfig?.build()) : void 0;
+	const pluginThreadConfig = params.pluginThreadConfig?.enabled ? prebuiltPluginThreadConfig ?? await lifecycleTiming.measure("plugin-config-build", () => params.pluginThreadConfig?.build()) : void 0;
 	const finalConfigPatch = params.buildFinalConfigPatch?.({ action: "start" }) ?? {
 		configPatch: params.finalConfigPatch,
 		nativeHookRelayGeneration: params.nativeHookRelayGeneration
 	};
-	const config = lifecycleTiming.measureSync("merge_thread_config", () => mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginThreadConfig?.configPatch, finalConfigPatch.configPatch));
-	const startParams = lifecycleTiming.measureSync("thread_start_params", () => buildThreadStartParams(params.params, {
+	const config = lifecycleTiming.measureSync("merge-thread-config", () => mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginThreadConfig?.configPatch, finalConfigPatch.configPatch));
+	const startParams = lifecycleTiming.measureSync("thread-start-params", () => buildThreadStartParams(params.params, {
 		cwd: params.cwd,
 		dynamicTools: params.dynamicTools,
 		appServer: params.appServer,
@@ -1300,14 +1401,15 @@ async function startOrResumeThread(params) {
 		nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
 		environmentSelection: params.environmentSelection
 	}));
-	const response = assertCodexThreadStartResponse(await lifecycleTiming.measure("thread_start_request", async () => {
+	const response = assertCodexThreadStartResponse(await lifecycleTiming.measure("thread-start-request", async () => {
 		try {
-			return await params.client.request("thread/start", startParams);
+			return await params.client.request("thread/start", startParams, { signal: params.signal });
 		} catch (error) {
 			if (error instanceof CodexAppServerRpcError) throw new CodexThreadStartRequestError(error);
 			throw error;
 		}
 	}));
+	throwIfAborted();
 	const modelProvider = resolveCodexAppServerModelProvider({
 		provider: params.params.provider,
 		authProfileId: params.params.authProfileId,
@@ -1318,13 +1420,14 @@ async function startOrResumeThread(params) {
 	const createdAt = (/* @__PURE__ */ new Date()).toISOString();
 	const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : void 0;
 	if (!preserveExistingBinding) {
-		await lifecycleTiming.measure("thread_start_write_binding", () => writeCodexAppServerBinding(params.params.sessionFile, {
+		await lifecycleTiming.measure("thread-start-write-binding", () => 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,
+			dynamicToolsContainDeferred,
 			userMcpServersFingerprint,
 			mcpServersFingerprint: nextMcpServersFingerprint,
 			nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration,
@@ -1349,7 +1452,8 @@ async function startOrResumeThread(params) {
 			action: rotatedContextEngineBinding ? "rotated" : "started"
 		});
 	}
-	lifecycleTiming.logIfSlow({
+	lifecycleTiming.mark("thread-ready");
+	lifecycleTiming.logSummary({
 		runId: params.params.runId,
 		sessionId: params.params.sessionId,
 		sessionKey: params.params.sessionKey,
@@ -1365,6 +1469,7 @@ async function startOrResumeThread(params) {
 		model: response.model ?? params.params.modelId,
 		modelProvider: response.modelProvider ?? modelProvider,
 		dynamicToolsFingerprint,
+		dynamicToolsContainDeferred,
 		userMcpServersFingerprint,
 		mcpServersFingerprint: nextMcpServersFingerprint,
 		nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration,
@@ -1512,7 +1617,8 @@ function buildCodexRuntimeThreadConfig(config, options = {}) {
 	return mergeCodexThreadConfigs(codeModeConfig, config) ?? { ...codeModeConfig };
 }
 function buildCodexRuntimeThreadConfigForRun(params, config, options = {}) {
-	const runtimeConfig = buildCodexRuntimeThreadConfig(config, options);
+	const baseConfig = buildCodexRuntimeThreadConfig(config, options);
+	const runtimeConfig = mergeCodexThreadConfigs(baseConfig, shouldDisableCodexToolSearchForModel(params.modelId) ? CODEX_TOOL_SEARCH_UNSUPPORTED_THREAD_CONFIG : void 0) ?? baseConfig;
 	if (params.bootstrapContextMode !== "lightweight") return runtimeConfig;
 	return mergeCodexThreadConfigs(runtimeConfig, CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG) ?? {
 		...runtimeConfig,
@@ -1614,7 +1720,7 @@ function fingerprintDynamicToolSpec(tool) {
 	if (!isJsonObject(tool)) return stabilizeJsonValue(tool);
 	const stable = {};
 	for (const [key, child] of Object.entries(tool).toSorted(([left], [right]) => left.localeCompare(right))) {
-		if (key === "description" || key === "deferLoading" || key === "namespace") continue;
+		if (key === "description") continue;
 		stable[key] = stabilizeJsonValue(child);
 	}
 	return stable;
@@ -1697,4 +1803,4 @@ function resolveReasoningEffort(thinkLevel, modelId) {
 	return null;
 }
 //#endregion
-export { sanitizeCodexHistoryImagePayloads as C, resolveCodexContextEngineProjectionReserveTokens as D, resolveCodexContextEngineProjectionMaxChars as E, invalidInlineImageText as S, projectContextEngineAssemblyForCodex as T, shouldBuildCodexPluginThreadConfig as _, buildDeveloperInstructions as a, buildCodexAppInventoryCacheKey as b, codexDynamicToolsFingerprint as c, resolveReasoningEffort as d, startOrResumeThread as f, mergeCodexThreadConfigs as g, buildCodexPluginThreadConfigInputFingerprint as h, buildContextEngineBinding as i, isContextEngineBindingCompatible as l, buildCodexPluginThreadConfig as m, areCodexDynamicToolFingerprintsCompatible as n, buildTurnCollaborationMode as o, isCodexAppServerProfilerEnabled as p, buildCodexRuntimeThreadConfig as r, buildTurnStartParams as s, CODEX_NATIVE_PERSONALITY_NONE as t, resolveCodexAppServerModelProvider as u, ensureCodexPluginActivation as v, sanitizeInlineImageDataUrl$1 as w, defaultCodexAppInventoryCache as x, pluginReadParams as y };
+export { projectContextEngineAssemblyForCodex as A, sanitizeCodexHistoryImagePayloads as C, normalizeCodexDynamicToolName as D, isForcedPrivateQaCodexRuntime as E, resolveCodexContextEngineProjectionReserveTokens as M, resolveCodexDynamicToolsLoading as O, invalidInlineImageText as S, filterCodexDynamicTools as T, shouldBuildCodexPluginThreadConfig as _, buildDeveloperInstructions as a, buildCodexAppInventoryCacheKey as b, codexDynamicToolsFingerprint as c, resolveReasoningEffort as d, startOrResumeThread as f, mergeCodexThreadConfigs as g, buildCodexPluginThreadConfigInputFingerprint as h, buildContextEngineBinding as i, resolveCodexContextEngineProjectionMaxChars as j, resolveCodexDynamicToolsLoadingForModel as k, isContextEngineBindingCompatible as l, buildCodexPluginThreadConfig as m, areCodexDynamicToolFingerprintsCompatible as n, buildTurnCollaborationMode as o, isCodexAppServerProfilerEnabled as p, buildCodexRuntimeThreadConfig as r, buildTurnStartParams as s, CODEX_NATIVE_PERSONALITY_NONE as t, resolveCodexAppServerModelProvider as u, ensureCodexPluginActivation as v, sanitizeInlineImageDataUrl$1 as w, defaultCodexAppInventoryCache as x, pluginReadParams as y };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.31-beta.4",
+  "version": "2026.6.1-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/codex",
-      "version": "2026.5.31-beta.4",
+      "version": "2026.6.1-beta.2",
       "dependencies": {
         "@openai/codex": "0.135.0",
         "typebox": "1.1.39",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.31-beta.4",
+  "version": "2026.6.1-beta.2",
   "description": "OpenClaw Codex app-server harness and model provider plugin with a Codex-managed GPT catalog.",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.31-beta.4"
+      "pluginApi": ">=2026.6.1-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.5.31-beta.4"
+      "openclawVersion": "2026.6.1-beta.2"
     },
     "release": {
       "publishToClawHub": true,
@@ -47,7 +47,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.31-beta.4"
+    "openclaw": ">=2026.6.1-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {