@openclaw/codex 2026.5.22 → 2026.5.24-beta.2

package/dist/{client-D3SUwPFl.js → client-1sSy4p3z.js}

@@ -340,7 +340,7 @@ var CodexAppServerClient = class CodexAppServerClient {
 				return;
 			}
 			try {
-				this.writeMessage(message);
+				this.writeMessage(message, (error) => rejectPending(error));
 			} catch (error) {
 				rejectPending(error instanceof Error ? error : new Error(String(error)));
 			}
@@ -372,16 +372,19 @@ var CodexAppServerClient = class CodexAppServerClient {
 		this.markClosed(/* @__PURE__ */ new Error("codex app-server client is closed"));
 		await closeCodexAppServerTransportAndWait(this.child, options);
 	}
-	writeMessage(message) {
+	writeMessage(message, onError) {
 		if (this.closed) return;
 		const id = "id" in message ? message.id : void 0;
 		const method = "method" in message ? message.method : void 0;
 		this.child.stdin.write(`${stringifyCodexAppServerMessage(message)}\n`, (error) => {
-			if (error) embeddedAgentLog.warn("codex app-server write failed", {
-				error,
-				id,
-				method
-			});
+			if (error) {
+				embeddedAgentLog.warn("codex app-server write failed", {
+					error,
+					id,
+					method
+				});
+				onError?.(error);
+			}
 		});
 	}
 	handleLine(line) {
@@ -418,7 +421,7 @@ var CodexAppServerClient = class CodexAppServerClient {
 			parsed = JSON.parse(candidate);
 		} catch (error) {
 			const lineCount = pending.lineCount + 1;
-			if (candidate.length <= CODEX_APP_SERVER_PARSE_BUFFER_MAX && lineCount <= CODEX_APP_SERVER_PARSE_BUFFER_MAX_LINES) {
+			if (shouldBufferCodexAppServerParseFailure(candidate.trim(), error) && candidate.length <= CODEX_APP_SERVER_PARSE_BUFFER_MAX && lineCount <= CODEX_APP_SERVER_PARSE_BUFFER_MAX_LINES) {
 				this.pendingParse = {
 					text: candidate,
 					lineCount,

package/dist/{client-factory-DdrIY1lw.js → client-factory-Bk6i4FnW.js}

@@ -1,5 +1,5 @@
 //#region extensions/codex/src/app-server/client-factory.ts
-const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => import("./shared-client-C_RbGxW8.js").then((n) => n.a).then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({
+const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => import("./shared-client-CFCUGEVs.js").then((n) => n.a).then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({
 	startOptions,
 	authProfileId,
 	agentDir,

package/dist/{command-handlers-DsB0GYd2.js → command-handlers-CcTABuem.js}

@@ -1,12 +1,12 @@
 import { a as isCodexFastServiceTier, l as resolveCodexAppServerRuntimeOptions } from "./config-DDMrwfJl.js";
-import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-B_uo1pf5.js";
+import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-DtGLkqMP.js";
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
 import { i as readCodexAppServerBinding, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
-import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-NklFaHM4.js";
+import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-D93E78SA.js";
 import { _ as summarizeCodexAccountUsage, a as buildHelp, c as formatCodexStatus, d as formatModels, f as formatThreads, l as formatComputerUseStatus, o as formatAccount, p as readString$1, s as formatCodexDisplayText, u as formatList } from "./notification-correlation-qKY_sgga.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-CTnEWuor.js";
-import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, l as startCodexConversationThread, m as setCodexConversationFastMode, p as readCodexConversationActiveTurn, r as formatCodexCliSessions, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./node-cli-sessions-yVCifOyG.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-BMMwWwno.js";
+import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, l as startCodexConversationThread, m as setCodexConversationFastMode, p as readCodexConversationActiveTurn, r as formatCodexCliSessions, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./node-cli-sessions-9CAqnIaA.js";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-Hdq1WgTA.js";
 import { n as rememberCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import crypto from "node:crypto";
 import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveDefaultAgentDir, resolveProfileUnusableUntilForDisplay, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";

package/dist/{compact-BwQn7jKq.js → compact-DnTgL6UT.js}

@@ -2,7 +2,7 @@ import { l as resolveCodexAppServerRuntimeOptions } from "./config-DDMrwfJl.js";
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
 import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-CTnEWuor.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-DdrIY1lw.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-Bk6i4FnW.js";
 import { compactContextEngineWithSafetyTimeout, embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, resolveCompactionTimeoutMs, resolveContextEngineOwnerPluginId, runHarnessContextEngineMaintenance } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const DEFAULT_CODEX_COMPACTION_WAIT_TIMEOUT_MS = 300 * 1e3;

package/dist/{computer-use-BMMwWwno.js → computer-use-Hdq1WgTA.js}

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

package/dist/{dynamic-tools-DA42no4X.js → dynamic-tools-Bq717oJR.js}

@@ -1,4 +1,4 @@
-import { C as sanitizeInlineImageDataUrl, x as invalidInlineImageText } from "./thread-lifecycle-4Ul7RoW4.js";
+import { S as invalidInlineImageText, w as sanitizeInlineImageDataUrl } from "./thread-lifecycle-DGoaguJh.js";
 import { HEARTBEAT_RESPONSE_TOOL_NAME, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, extractToolResultMediaArtifact, filterToolResultMediaUrls, isMessagingTool, isMessagingToolSendAction, isToolWrappedWithBeforeToolCallHook, normalizeHeartbeatToolResponse, runAgentHarnessAfterToolCallHook, setBeforeToolCallDiagnosticsEnabled, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 //#region extensions/codex/src/app-server/dynamic-tool-profile.ts

package/dist/harness.js

@@ -28,21 +28,21 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-DzlLXP5Y.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-CT1N__qp.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-DzP1wClA.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-CYFMTA1O.js");
 			return runCodexAppServerSideQuestion(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-BwQn7jKq.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-DnTgL6UT.js");
 			return maybeCompactCodexAppServerSession(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
 		reset: async (params) => {
@@ -52,7 +52,7 @@ function createCodexAppServerAgentHarness(options) {
 			}
 		},
 		dispose: async () => {
-			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-C_RbGxW8.js").then((n) => n.a);
+			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-CFCUGEVs.js").then((n) => n.a);
 			await clearSharedCodexAppServerClientAndWait();
 		}
 	};

package/dist/index.js

@@ -1,12 +1,12 @@
 import { createCodexAppServerAgentHarness } from "./harness.js";
 import { c as readCodexPluginConfig, l as resolveCodexAppServerRuntimeOptions, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-DDMrwfJl.js";
 import { buildCodexProvider } from "./provider.js";
-import { _ as ensureCodexPluginActivation, b as defaultCodexAppInventoryCache, v as pluginReadParams } from "./thread-lifecycle-4Ul7RoW4.js";
+import { v as ensureCodexPluginActivation, x as defaultCodexAppInventoryCache, y as pluginReadParams } from "./thread-lifecycle-DGoaguJh.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
-import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-NklFaHM4.js";
+import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-D93E78SA.js";
 import { s as formatCodexDisplayText } from "./notification-correlation-qKY_sgga.js";
-import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, i as getSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndWait, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-C_RbGxW8.js";
-import { a as resolveCodexCliSessionForBindingOnNode, c as handleCodexConversationInboundClaim, i as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeInvokePolicies, o as resumeCodexCliSessionOnNode, s as handleCodexConversationBindingResolved, t as createCodexCliSessionNodeHostCommands } from "./node-cli-sessions-yVCifOyG.js";
+import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, i as getSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndWait, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CFCUGEVs.js";
+import { a as resolveCodexCliSessionForBindingOnNode, c as handleCodexConversationInboundClaim, i as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeInvokePolicies, o as resumeCodexCliSessionOnNode, s as handleCodexConversationBindingResolved, t as createCodexCliSessionNodeHostCommands } from "./node-cli-sessions-9CAqnIaA.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";
@@ -45,7 +45,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-DsB0GYd2.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-CcTABuem.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 { l as resolveCodexAppServerRuntimeOptions } from "./config-DDMrwfJl.js";
 import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-_gKDcd0x.js";
-import { i as readModelListResult } from "./models-B_uo1pf5.js";
+import { i as readModelListResult } from "./models-DtGLkqMP.js";
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
-import { n as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-4Ul7RoW4.js";
+import { n as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DGoaguJh.js";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 //#region extensions/codex/media-understanding-provider.ts
 const DEFAULT_CODEX_IMAGE_MODEL = FALLBACK_CODEX_MODELS.find((model) => model.inputModalities.includes("image"))?.id ?? FALLBACK_CODEX_MODELS[0]?.id;
@@ -63,7 +63,7 @@ async function runBoundedCodexVisionTurn(params) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.options.pluginConfig });
 	const timeoutMs = Math.max(100, params.timeoutMs);
 	const ownsClient = !params.options.clientFactory;
-	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-C_RbGxW8.js").then((n) => n.a).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-CFCUGEVs.js").then((n) => n.a).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions: appServer.start,
 		timeoutMs,
 		authProfileId: params.profile

package/dist/{models-B_uo1pf5.js → models-DtGLkqMP.js}

@@ -39,7 +39,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getSharedCodexAppServerClient } = await import("./shared-client-C_RbGxW8.js").then((n) => n.a);
+	const { createIsolatedCodexAppServerClient, getSharedCodexAppServerClient } = await import("./shared-client-CFCUGEVs.js").then((n) => n.a);
 	const client = useSharedClient ? await getSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,

package/dist/{node-cli-sessions-yVCifOyG.js → node-cli-sessions-9CAqnIaA.js}

@@ -1,9 +1,9 @@
 import { a as isCodexFastServiceTier, l as resolveCodexAppServerRuntimeOptions, r as codexSandboxPolicyForTurn } from "./config-DDMrwfJl.js";
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
 import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, r as normalizeCodexAppServerBindingModelProvider, t as clearCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
-import { r as CODEX_CONTROL_METHODS } from "./request-NklFaHM4.js";
+import { r as CODEX_CONTROL_METHODS } from "./request-D93E78SA.js";
 import { i as readCodexNotificationTurnId, r as readCodexNotificationThreadId, s as formatCodexDisplayText } from "./notification-correlation-qKY_sgga.js";
-import { i as getSharedCodexAppServerClient, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-C_RbGxW8.js";
+import { i as getSharedCodexAppServerClient, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CFCUGEVs.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-CTnEWuor.js";
 import os from "node:os";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";

package/dist/provider-catalog.js

@@ -4,47 +4,32 @@ const CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 const CODEX_APP_SERVER_AUTH_MARKER = "codex-app-server";
 const DEFAULT_CONTEXT_WINDOW = 272e3;
 const DEFAULT_MAX_TOKENS = 128e3;
-const FALLBACK_CODEX_MODELS = [
-	{
-		id: "gpt-5.5",
-		model: "gpt-5.5",
-		displayName: "gpt-5.5",
-		description: "Latest frontier agentic coding model.",
-		isDefault: true,
-		inputModalities: ["text", "image"],
-		supportedReasoningEfforts: [
-			"low",
-			"medium",
-			"high",
-			"xhigh"
-		]
-	},
-	{
-		id: "gpt-5.4-mini",
-		model: "gpt-5.4-mini",
-		displayName: "GPT-5.4-Mini",
-		description: "Smaller frontier agentic coding model.",
-		inputModalities: ["text", "image"],
-		supportedReasoningEfforts: [
-			"low",
-			"medium",
-			"high",
-			"xhigh"
-		]
-	},
-	{
-		id: "gpt-5.2",
-		model: "gpt-5.2",
-		displayName: "gpt-5.2",
-		inputModalities: ["text", "image"],
-		supportedReasoningEfforts: [
-			"low",
-			"medium",
-			"high",
-			"xhigh"
-		]
-	}
-];
+const FALLBACK_CODEX_MODELS = [{
+	id: "gpt-5.5",
+	model: "gpt-5.5",
+	displayName: "gpt-5.5",
+	description: "Latest frontier agentic coding model.",
+	isDefault: true,
+	inputModalities: ["text", "image"],
+	supportedReasoningEfforts: [
+		"low",
+		"medium",
+		"high",
+		"xhigh"
+	]
+}, {
+	id: "gpt-5.4-mini",
+	model: "gpt-5.4-mini",
+	displayName: "GPT-5.4-Mini",
+	description: "Smaller frontier agentic coding model.",
+	inputModalities: ["text", "image"],
+	supportedReasoningEfforts: [
+		"low",
+		"medium",
+		"high",
+		"xhigh"
+	]
+}];
 function buildCodexModelDefinition(model) {
 	const id = model.id.trim() || model.model.trim();
 	return {

package/dist/provider.js

@@ -123,7 +123,7 @@ async function listModelsBestEffort(params) {
 	}
 }
 async function listCodexAppServerModelsLazy(options) {
-	const { listCodexAppServerModels } = await import("./models-B_uo1pf5.js").then((n) => n.r);
+	const { listCodexAppServerModels } = await import("./models-DtGLkqMP.js").then((n) => n.r);
 	return listCodexAppServerModels(options);
 }
 function normalizeTimeoutMs(value) {
@@ -144,7 +144,7 @@ function isKnownXHighCodexModel(modelId) {
 }
 function isModernCodexModel(modelId) {
 	const lower = modelId.trim().toLowerCase();
-	return lower === "gpt-5.5" || lower === "gpt-5.4" || lower === "gpt-5.4-mini" || lower === "gpt-5.2";
+	return lower === "gpt-5.5" || lower === "gpt-5.4" || lower === "gpt-5.4-mini";
 }
 //#endregion
 export { buildCodexProvider, buildCodexProviderCatalog, isModernCodexModel };

package/dist/{request-NklFaHM4.js → request-D93E78SA.js}

@@ -1,6 +1,6 @@
-import { n as CodexAppServerRpcError } from "./client-D3SUwPFl.js";
-import { y as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-4Ul7RoW4.js";
-import { f as resolveCodexAppServerHomeDir, i as getSharedCodexAppServerClient, o as withTimeout, r as createIsolatedCodexAppServerClient } from "./shared-client-C_RbGxW8.js";
+import { n as CodexAppServerRpcError } from "./client-1sSy4p3z.js";
+import { b as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-DGoaguJh.js";
+import { f as resolveCodexAppServerHomeDir, i as getSharedCodexAppServerClient, o as withTimeout, r as createIsolatedCodexAppServerClient } from "./shared-client-CFCUGEVs.js";
 import { t as resolveCodexAppServerDirectSandboxBypassBlock } from "./sandbox-guard-CTnEWuor.js";
 import { createHash } from "node:crypto";
 //#region extensions/codex/src/app-server/capabilities.ts

package/dist/{run-attempt-DzlLXP5Y.js → run-attempt-CT1N__qp.js}

@@ -1,17 +1,17 @@
 import { c as readCodexPluginConfig, d as resolveCodexPluginsPolicy, f as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, l as resolveCodexAppServerRuntimeOptions, o as isCodexSandboxExecServerEnabled, u as resolveCodexComputerUseConfig } from "./config-DDMrwfJl.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-_gKDcd0x.js";
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
-import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-D3SUwPFl.js";
-import { D as resolveCodexContextEngineProjectionReserveTokens, E as resolveCodexContextEngineProjectionMaxChars, S as sanitizeCodexHistoryImagePayloads, T as projectContextEngineAssemblyForCodex, b as defaultCodexAppInventoryCache, 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 } from "./thread-lifecycle-4Ul7RoW4.js";
+import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-1sSy4p3z.js";
+import { C as sanitizeCodexHistoryImagePayloads, D as resolveCodexContextEngineProjectionMaxChars, E as projectContextEngineAssemblyForCodex, O as resolveCodexContextEngineProjectionReserveTokens, _ as shouldBuildCodexPluginThreadConfig, c as buildTurnStartParams, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildDeveloperInstructions, l as codexDynamicToolsFingerprint, m as buildCodexPluginThreadConfig, p as startOrResumeThread, r as buildContextEngineBinding, s as buildTurnCollaborationMode, t as areCodexDynamicToolFingerprintsCompatible, u as isContextEngineBindingCompatible, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-DGoaguJh.js";
 import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-NklFaHM4.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-D93E78SA.js";
 import { g as shouldRefreshCodexRateLimitsForUsageLimitMessage, h as resolveCodexUsageLimitResetAtMs, i as readCodexNotificationTurnId, m as formatCodexUsageLimitErrorMessage, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-qKY_sgga.js";
-import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, f as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-C_RbGxW8.js";
+import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, f as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CFCUGEVs.js";
 import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-CTnEWuor.js";
-import { a as resolveCodexDynamicToolsLoading, i as normalizeCodexDynamicToolName, n as filterCodexDynamicTools, r as isForcedPrivateQaCodexRuntime, t as createCodexDynamicToolBridge } from "./dynamic-tools-DA42no4X.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-DdrIY1lw.js";
+import { a as resolveCodexDynamicToolsLoading, i as normalizeCodexDynamicToolName, n as filterCodexDynamicTools, r as isForcedPrivateQaCodexRuntime, t as createCodexDynamicToolBridge } from "./dynamic-tools-Bq717oJR.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-Bk6i4FnW.js";
 import { a as handleCodexAppServerElicitationRequest, c as emitDynamicToolTerminalDiagnostic, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerApprovalRequest, n as CODEX_NATIVE_HOOK_RELAY_EVENTS, o as emitDynamicToolErrorDiagnostic, r as buildCodexNativeHookRelayConfig, s as emitDynamicToolStartedDiagnostic, t as filterToolsForVisionInputs } from "./vision-tools-DOnxzH2y.js";
-import { t as ensureCodexComputerUse } from "./computer-use-BMMwWwno.js";
+import { t as ensureCodexComputerUse } from "./computer-use-Hdq1WgTA.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { createHash, randomUUID } from "node:crypto";
 import nodeFs from "node:fs";
@@ -324,6 +324,9 @@ var CodexAppServerEventProjector = class {
 		this.guardianReviewCount = 0;
 		this.completedCompactionCount = 0;
 	}
+	getCompletedTurnStatus() {
+		return this.completedTurn?.status;
+	}
 	async handleNotification(notification) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
@@ -1338,6 +1341,23 @@ function readString$5(record, key) {
 	const value = record[key];
 	return typeof value === "string" ? value : void 0;
 }
+function normalizeNonEmptyString(value) {
+	if (typeof value !== "string") return;
+	return value.trim() || void 0;
+}
+function readNonEmptyString$1(record, key) {
+	return normalizeNonEmptyString(record[key]);
+}
+function readNonEmptyStringArray(record, key) {
+	const value = record[key];
+	if (!Array.isArray(value)) return [];
+	const entries = [];
+	for (const entry of value) {
+		const normalized = normalizeNonEmptyString(entry);
+		if (normalized) entries.push(normalized);
+	}
+	return entries;
+}
 function readNullableString$1(record, key) {
 	const value = record[key];
 	if (value === null) return null;
@@ -1524,9 +1544,25 @@ function itemToolArgs(item) {
 		...typeof item.cwd === "string" ? { cwd: item.cwd } : {}
 	});
 	if (item.type === "fileChange") return sanitizeCodexAgentEventRecord({ changes: itemFileChanges(item) });
-	if (item.type === "webSearch" && typeof item.query === "string") return sanitizeCodexAgentEventRecord({ query: item.query });
+	if (item.type === "webSearch") return webSearchToolArgs(item);
 	if (item.type === "dynamicToolCall" || item.type === "mcpToolCall") return sanitizeCodexToolArguments(item.arguments);
 }
+function webSearchToolArgs(item) {
+	const action = isJsonObject(item.action) ? item.action : void 0;
+	const actionType = action ? readNonEmptyString$1(action, "type") : void 0;
+	const queries = action && actionType === "search" ? readNonEmptyStringArray(action, "queries") : [];
+	const query = normalizeNonEmptyString(item.query) ?? (action && actionType === "search" ? readNonEmptyString$1(action, "query") : void 0) ?? queries[0];
+	const url = action ? readNonEmptyString$1(action, "url") : void 0;
+	const pattern = action ? readNonEmptyString$1(action, "pattern") : void 0;
+	const args = {};
+	if (query) args.query = query;
+	if (queries.length > 0) args.queries = queries;
+	if (actionType && actionType !== "search") args.action = actionType;
+	if (url) args.url = url;
+	if (pattern) args.pattern = pattern;
+	if (!query && !url && !pattern) args.queryUnavailable = true;
+	return sanitizeCodexAgentEventRecord(args);
+}
 function itemToolResult(item) {
 	if (item.type === "commandExecution") return { result: sanitizeCodexAgentEventRecord({
 		status: item.status,
@@ -1543,9 +1579,16 @@ function itemToolResult(item) {
 		...item.error ? { error: item.error } : {},
 		...item.result ? { result: item.result } : {}
 	}) };
-	if (item.type === "webSearch") return { result: sanitizeCodexAgentEventRecord({ status: "completed" }) };
+	if (item.type === "webSearch") return { result: webSearchToolResult(item) };
 	return {};
 }
+function webSearchToolResult(item) {
+	return sanitizeCodexAgentEventRecord({
+		status: itemStatus(item),
+		...typeof item.durationMs === "number" ? { durationMs: item.durationMs } : {},
+		...webSearchToolArgs(item)
+	});
+}
 function itemFileChanges(item) {
 	return Array.isArray(item.changes) ? item.changes.map((change) => ({
 		path: change.path,
@@ -1562,7 +1605,7 @@ function itemMeta(item, detailMode = "explain") {
 		command: item.command,
 		cwd: typeof item.cwd === "string" ? item.cwd : void 0
 	}, { detailMode });
-	if (item.type === "webSearch" && typeof item.query === "string") return item.query;
+	if (item.type === "webSearch") return inferToolMetaFromArgs("web_search", webSearchToolArgs(item), { detailMode });
 	const toolName = itemName(item);
 	if ((item.type === "dynamicToolCall" || item.type === "mcpToolCall") && toolName) return inferToolMetaFromArgs(toolName, item.arguments, { detailMode });
 }
@@ -3217,6 +3260,10 @@ async function runStreamingSandboxHttpRequest(execServer, socket, requestId, par
 	child.once("close", () => {
 		socket.off("close", abortOnSocketClose);
 	});
+	child.stdin.on("error", (error) => {
+		if (error.code === "EPIPE" || error.code === "ERR_STREAM_DESTROYED") return;
+		embeddedAgentLog.warn("codex sandbox http/request stdin write failed", { error });
+	});
 	child.stdin.end(JSON.stringify(params));
 	return await readStreamingSandboxHttpResponse({
 		child,
@@ -3689,7 +3736,6 @@ function readStringList(value) {
 //#endregion
 //#region extensions/codex/src/app-server/sandbox-exec-server.ts
 const SANDBOX_EXEC_SERVERS = /* @__PURE__ */ new Map();
-const EXEC_SERVER_CLOSE_GRACE_MS = 1e3;
 async function ensureCodexSandboxExecServerEnvironment(params) {
 	if (!params.sandbox?.enabled || !params.sandbox.backend) return;
 	if (!canExposeLocalExecServerToAppServer(params.appServerStartOptions)) throw new Error("OpenClaw Codex exec-server uses a local loopback URL and cannot be registered with a remote Codex app-server.");
@@ -3808,18 +3854,7 @@ async function closeOpenClawExecServer(execServer) {
 	execServer.closed = true;
 	for (const client of execServer.server.clients) client.close(1001, "shutdown");
 	await new Promise((resolve) => {
-		let fallbackTimer;
-		const forceCloseTimer = setTimeout(() => {
-			for (const client of execServer.server.clients) client.terminate();
-			fallbackTimer = setTimeout(resolve, EXEC_SERVER_CLOSE_GRACE_MS);
-			fallbackTimer.unref?.();
-		}, EXEC_SERVER_CLOSE_GRACE_MS);
-		forceCloseTimer.unref?.();
-		execServer.server.close(() => {
-			clearTimeout(forceCloseTimer);
-			if (fallbackTimer) clearTimeout(fallbackTimer);
-			resolve();
-		});
+		execServer.server.close(() => resolve());
 	});
 }
 function buildEnvironmentId(sandbox) {
@@ -4273,10 +4308,13 @@ const CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS = 5e3;
 const CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS = 5e3;
 const CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS = 6e4;
 const CODEX_TURN_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS = 1e4;
+const CODEX_POST_REASONING_SOURCE_REPLY_IDLE_TIMEOUT_MS = 5 * 6e4;
 const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS = 6e4;
+const CODEX_NATIVE_HOOK_RELAY_UNREGISTER_GRACE_MS = 1e4;
+const CODEX_NATIVE_HOOK_RELAY_UNREGISTER_EXTRA_GRACE_MS = 5e3;
 const CODEX_STEER_ALL_DEBOUNCE_MS = 500;
 const LOG_FIELD_MAX_LENGTH = 160;
 const CODEX_NATIVE_SANDBOX_TOOL_REQUIREMENTS = [
@@ -4289,12 +4327,13 @@ const CODEX_NATIVE_SANDBOX_TOOL_REQUIREMENTS = [
 ];
 const CODEX_MEMORY_FLUSH_DYNAMIC_TOOL_ALLOW = new Set(["read", "write"]);
 const CODEX_NATIVE_PROJECT_DOC_BASENAMES = new Set(["agents.md"]);
-const CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = new Set([
+const CODEX_INHERITED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = new Set(["tools.md"]);
+const CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = new Set([
 	"identity.md",
 	"soul.md",
-	"tools.md",
 	"user.md"
 ]);
+const CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = new Set([...CODEX_INHERITED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES, ...CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES]);
 const CODEX_HEARTBEAT_CONTEXT_BASENAME = "heartbeat.md";
 const CODEX_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS = CODEX_NATIVE_HOOK_RELAY_EVENTS.filter((event) => event !== "permission_request");
 const CODEX_BOOTSTRAP_CONTEXT_ORDER = new Map([
@@ -4306,6 +4345,28 @@ const CODEX_BOOTSTRAP_CONTEXT_ORDER = new Map([
 	["memory.md", 60],
 	["heartbeat.md", 70]
 ]);
+const pendingCodexNativeHookRelayUnregisters = /* @__PURE__ */ new Set();
+function scheduleCodexNativeHookRelayUnregister(params) {
+	let pending;
+	const unregister = () => {
+		if (!pending) return;
+		const current = pending;
+		pending = void 0;
+		if (!pendingCodexNativeHookRelayUnregisters.delete(current)) return;
+		params.relay.unregister();
+	};
+	const timeout = setTimeout(unregister, resolveCodexNativeHookRelayUnregisterGraceMs(params.hookTimeoutSec));
+	pending = {
+		timeout,
+		unregister
+	};
+	pendingCodexNativeHookRelayUnregisters.add(pending);
+	timeout.unref();
+}
+function resolveCodexNativeHookRelayUnregisterGraceMs(hookTimeoutSec) {
+	const hookTimeoutMs = typeof hookTimeoutSec === "number" && Number.isFinite(hookTimeoutSec) && hookTimeoutSec > 0 ? Math.ceil(hookTimeoutSec) * 1e3 : 0;
+	return Math.max(CODEX_NATIVE_HOOK_RELAY_UNREGISTER_GRACE_MS, hookTimeoutMs + CODEX_NATIVE_HOOK_RELAY_UNREGISTER_EXTRA_GRACE_MS);
+}
 function emitCodexAppServerEvent(params, event) {
 	try {
 		emitAgentEvent({
@@ -5024,6 +5085,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const refreshCodexTurnPromptText = () => {
 		codexTurnPromptText = decorateCodexTurnPromptText(promptBuild.prompt);
 	};
+	const buildCodexTurnCollaborationDeveloperInstructions = () => buildTurnCollaborationMode(params, {
+		turnScopedDeveloperInstructions: workspaceBootstrapContext.turnScopedDeveloperInstructions,
+		heartbeatCollaborationInstructions: workspaceBootstrapContext.heartbeatCollaborationInstructions
+	}).settings.developer_instructions ?? void 0;
+	const buildRenderedCodexDeveloperInstructions = () => joinPresentSections(promptBuild.developerInstructions, buildCodexTurnCollaborationDeveloperInstructions());
 	const rebuildPromptAfterContextEngineCompaction = async () => {
 		historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages;
 		resetCodexPromptInputs();
@@ -5039,16 +5105,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		const contextTokenBudget = typeof params.contextTokenBudget === "number" && Number.isFinite(params.contextTokenBudget) ? Math.floor(params.contextTokenBudget) : typeof params.contextWindowInfo?.tokens === "number" && Number.isFinite(params.contextWindowInfo.tokens) ? Math.floor(params.contextWindowInfo.tokens) : void 0;
 		if (!contextTokenBudget || contextTokenBudget <= 0) return;
 		const reserveTokens = resolveCodexContextEngineProjectionReserveTokens({ config: params.config }) ?? 2e4;
-		const renderedChars = codexTurnPromptText.length + (promptBuild.developerInstructions?.length ?? 0);
+		const renderedDeveloperInstructions = buildRenderedCodexDeveloperInstructions();
+		const renderedChars = codexTurnPromptText.length + renderedDeveloperInstructions.length;
 		return shouldPreemptivelyCompactBeforePrompt({
 			messages: historyMessages,
-			systemPrompt: promptBuild.developerInstructions,
+			systemPrompt: renderedDeveloperInstructions,
 			prompt: codexTurnPromptText,
 			contextTokenBudget,
 			reserveTokens,
 			llmBoundaryTokenPressure: {
 				estimatedPromptTokens: estimateRenderedLlmBoundaryTokenPressure({
-					systemPrompt: promptBuild.developerInstructions,
+					systemPrompt: renderedDeveloperInstructions,
 					prompt: codexTurnPromptText
 				}),
 				source: "codex_app_server_rendered_prompt",
@@ -5091,7 +5158,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		attempt: params,
 		sessionKey: contextSessionKey,
 		workspaceDir: effectiveWorkspace,
-		developerInstructions: promptBuild.developerInstructions,
+		developerInstructions: buildRenderedCodexDeveloperInstructions(),
 		workspaceBootstrapContext,
 		skillsPrompt: openClawPromptContext ? params.skillsSnapshot?.prompt ?? "" : "",
 		tools: toolBridge.availableSpecs
@@ -5099,7 +5166,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const trajectoryRecorder = createCodexTrajectoryRecorder({
 		attempt: params,
 		cwd: effectiveWorkspace,
-		developerInstructions: promptBuild.developerInstructions,
+		developerInstructions: buildRenderedCodexDeveloperInstructions(),
 		prompt: codexTurnPromptText,
 		tools: toolBridge.availableSpecs
 	});
@@ -5367,6 +5434,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let turnCompletionIdleTimeoutMessage;
 	let clientClosedPromptError;
 	let clientClosedAbort = false;
+	let shouldDelayNativeHookRelayUnregister = false;
 	let lifecycleStarted = false;
 	let lifecycleTerminalEmitted = false;
 	let resolveCompletion;
@@ -5797,7 +5865,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		if (isCurrentTurnNotification && (rawToolOutputCompletion || isNativeToolProgressNotification(notification))) turnCrossedToolHandoff = true;
 		const assistantCompletionCanRelease = isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff);
 		const postToolRawAssistantCompletionNeedsTerminalGuard = isCurrentTurnNotification && turnCrossedToolHandoff && isRawAssistantCompletionNotification(notification) && activeTurnItemIds.size === 0;
-		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !assistantCompletionCanRelease;
+		const shouldArmPostReasoningSourceReplyWatch = isCurrentTurnNotification && isReasoningItemCompletionNotification(notification) && activeTurnItemIds.size === 0 && params.sourceReplyDeliveryMode === "message_tool_only";
+		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !assistantCompletionCanRelease && !shouldArmPostReasoningSourceReplyWatch;
 		if (isCurrentTurnNotification && notification.method === "error") {
 			if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
 			else armTurnCompletionIdleWatch({ pinnedByTerminalError: true });
@@ -5805,11 +5874,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		} else if (isTurnCompletion) disarmTurnAssistantCompletionIdleWatch();
 		else if (isCurrentTurnNotification && assistantCompletionCanRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
 		else if (postToolRawAssistantCompletionNeedsTerminalGuard) armTurnCompletionIdleWatch({ timeoutMs: postToolRawAssistantCompletionIdleTimeoutMs });
+		else if (shouldArmPostReasoningSourceReplyWatch) armTurnCompletionIdleWatch({ timeoutMs: CODEX_POST_REASONING_SOURCE_REPLY_IDLE_TIMEOUT_MS });
 		else if (unblockedAssistantCompletionRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
 		else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && rawToolOutputCompletion) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && shouldDisarmAssistantCompletionIdleWatch(notification)) disarmTurnAssistantCompletionIdleWatch();
-		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !postToolRawAssistantCompletionNeedsTerminalGuard && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
+		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !postToolRawAssistantCompletionNeedsTerminalGuard && !shouldArmPostReasoningSourceReplyWatch && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
 		if (trackedDynamicToolCompletion) {
 			const itemId = readNotificationItemId(notification);
 			if (itemId) {
@@ -6088,7 +6158,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		sessionId: params.sessionId,
 		provider: params.provider,
 		model: params.modelId,
-		systemPrompt: promptBuild.developerInstructions,
+		systemPrompt: buildRenderedCodexDeveloperInstructions(),
 		prompt: codexTurnPromptText,
 		historyMessages,
 		imagesCount: params.images?.length ?? 0
@@ -6105,6 +6175,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		promptText: codexTurnPromptText,
 		sandboxPolicy: codexSandboxPolicy,
 		environmentSelection: codexEnvironmentSelection,
+		turnScopedDeveloperInstructions: workspaceBootstrapContext.turnScopedDeveloperInstructions,
 		heartbeatCollaborationInstructions: workspaceBootstrapContext.heartbeatCollaborationInstructions
 	}), {
 		timeoutMs: params.timeoutMs,
@@ -6452,6 +6523,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			},
 			ctx: hookContext
 		});
+		shouldDelayNativeHookRelayUnregister = activeProjector.getCompletedTurnStatus() === "completed" && !timedOut && !runAbortController.signal.aborted && !finalAborted && !finalPromptError;
 		return {
 			...result,
 			timedOut,
@@ -6503,7 +6575,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		notificationCleanup();
 		requestCleanup();
 		closeCleanup?.();
-		nativeHookRelay?.unregister();
+		if (nativeHookRelay) if (shouldDelayNativeHookRelayUnregister) scheduleCodexNativeHookRelayUnregister({
+			relay: nativeHookRelay,
+			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
+		});
+		else nativeHookRelay.unregister();
 		await releaseSandboxExecEnvironment();
 		runAbortController.signal.removeEventListener("abort", abortListener);
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
@@ -6887,15 +6963,6 @@ async function buildDynamicTools(input) {
 					message
 				}
 			});
-		},
-		onAsyncTaskStarted: (message) => {
-			emitCodexAppServerEvent(params, {
-				stream: "codex_app_server.tool",
-				data: {
-					name: "media_async_task_started",
-					message
-				}
-			});
 		}
 	});
 	const filteredTools = filterCodexDynamicToolsForAllowlist(filterToolsForVisionInputs(addNodeShellDynamicToolsIfNeeded(addSandboxShellDynamicToolsIfAvailable(isCodexMemoryFlushRun(params) ? filterCodexMemoryFlushDynamicTools(allTools) : filterCodexDynamicTools(allTools, input.pluginConfig), allTools, input), allTools, input), {
@@ -7341,6 +7408,11 @@ function isCompletedAssistantNotification(notification) {
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	return Boolean(item && readString(item, "type") === "agentMessage" && readString(item, "phase") !== "commentary");
 }
+function isReasoningItemCompletionNotification(notification) {
+	if (!isJsonObject(notification.params) || notification.method !== "item/completed") return false;
+	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
+	return item ? readString(item, "type") === "reasoning" : false;
+}
 function isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff) {
 	if (isCompletedAssistantNotification(notification)) return true;
 	return !turnCrossedToolHandoff && isRawAssistantCompletionNotification(notification);
@@ -7482,16 +7554,19 @@ async function buildCodexWorkspaceBootstrapContext(params) {
 			targetWorkspaceDir: params.effectiveWorkspace
 		}));
 		const promptContextFiles = selectCodexWorkspacePromptContextFiles(contextFiles);
-		const developerInstructionFiles = shouldInjectCodexOpenClawPromptContext(params.params) ? selectCodexWorkspaceDeveloperInstructionFiles(contextFiles) : [];
+		const developerInstructionFiles = shouldInjectCodexOpenClawPromptContext(params.params) ? selectCodexWorkspaceInheritedDeveloperInstructionFiles(contextFiles) : [];
+		const turnScopedDeveloperInstructionFiles = shouldInjectCodexOpenClawPromptContext(params.params) ? selectCodexWorkspaceTurnScopedDeveloperInstructionFiles(contextFiles) : [];
 		const heartbeatReferenceFiles = selectCodexWorkspaceHeartbeatReferenceFiles(contextFiles);
 		return {
 			...bootstrapContext,
 			contextFiles,
 			promptContextFiles,
 			developerInstructionFiles,
+			turnScopedDeveloperInstructionFiles,
 			heartbeatReferenceFiles,
 			promptContext: renderCodexWorkspaceBootstrapPromptContext(promptContextFiles),
-			developerInstructions: renderCodexWorkspaceDeveloperInstructions(developerInstructionFiles),
+			developerInstructions: renderCodexWorkspaceThreadDeveloperInstructions(developerInstructionFiles),
+			turnScopedDeveloperInstructions: renderCodexWorkspaceCollaborationDeveloperInstructions(turnScopedDeveloperInstructionFiles),
 			heartbeatCollaborationInstructions: renderCodexWorkspaceHeartbeatReference(heartbeatReferenceFiles)
 		};
 	} catch (error) {
@@ -7526,7 +7601,7 @@ function buildCodexSystemPromptReport(params) {
 		injectedWorkspaceFiles: buildCodexBootstrapInjectionStats({
 			bootstrapFiles: params.workspaceBootstrapContext.bootstrapFiles,
 			injectedFiles: params.workspaceBootstrapContext.promptContextFiles ?? [],
-			developerInstructionFiles: params.workspaceBootstrapContext.developerInstructionFiles ?? []
+			developerInstructionFiles: [...params.workspaceBootstrapContext.developerInstructionFiles ?? [], ...params.workspaceBootstrapContext.turnScopedDeveloperInstructionFiles ?? []]
 		}),
 		skills: {
 			promptChars: skillsPrompt.length,
@@ -7671,7 +7746,7 @@ function renderCodexWorkspaceBootstrapPromptContext(contextFiles) {
 	const files = selectCodexWorkspacePromptContextFiles(contextFiles);
 	if (files.length === 0) return;
 	const lines = [
-		"OpenClaw loaded these user-editable workspace files for the current turn. Codex loads AGENTS.md natively. SOUL.md, IDENTITY.md, TOOLS.md, and USER.md are provided separately as Codex developer instructions. HEARTBEAT.md is handled by heartbeat collaboration-mode guidance. Those files are not repeated here.",
+		"OpenClaw loaded these user-editable workspace files for the current turn. Codex loads AGENTS.md natively. TOOLS.md is provided as inherited Codex developer instructions. SOUL.md, IDENTITY.md, and USER.md are provided as turn-scoped collaboration instructions so native Codex subagents do not inherit them. HEARTBEAT.md is handled by heartbeat collaboration-mode guidance. Those files are not repeated here.",
 		"",
 		"# Project Context",
 		"",
@@ -7687,18 +7762,39 @@ function selectCodexWorkspacePromptContextFiles(contextFiles) {
 		return baseName && !CODEX_NATIVE_PROJECT_DOC_BASENAMES.has(baseName) && !CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES.has(baseName) && baseName !== CODEX_HEARTBEAT_CONTEXT_BASENAME && !isMissingCodexBootstrapContextFile(file);
 	}).toSorted(compareCodexContextFiles);
 }
-function selectCodexWorkspaceDeveloperInstructionFiles(contextFiles) {
+function selectCodexWorkspaceInheritedDeveloperInstructionFiles(contextFiles) {
+	return selectCodexWorkspaceDeveloperInstructionFiles(contextFiles, CODEX_INHERITED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES);
+}
+function selectCodexWorkspaceTurnScopedDeveloperInstructionFiles(contextFiles) {
+	return selectCodexWorkspaceDeveloperInstructionFiles(contextFiles, CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES);
+}
+function selectCodexWorkspaceDeveloperInstructionFiles(contextFiles, basenames) {
 	return contextFiles.filter((file) => {
 		const baseName = getCodexContextFileBasename(file.path);
-		return baseName && CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES.has(baseName) && !isMissingCodexBootstrapContextFile(file) && file.content.trim().length > 0;
+		return baseName && basenames.has(baseName) && !isMissingCodexBootstrapContextFile(file) && file.content.trim().length > 0;
 	}).toSorted(compareCodexContextFiles);
 }
-function renderCodexWorkspaceDeveloperInstructions(files) {
+function renderCodexWorkspaceThreadDeveloperInstructions(files) {
+	return renderCodexWorkspaceDeveloperInstructions({
+		files,
+		header: "## OpenClaw Workspace Instructions",
+		preamble: "OpenClaw loaded these workspace instruction files from the active agent workspace. Internalize and follow them accordingly."
+	});
+}
+function renderCodexWorkspaceCollaborationDeveloperInstructions(files) {
+	return renderCodexWorkspaceDeveloperInstructions({
+		files,
+		header: "## OpenClaw Agent Soul",
+		preamble: "OpenClaw loaded these workspace instruction files from the active agent workspace. They are the canonical definitions of who you are, how you think and work, and the human you work alongside. Internalize and follow them accordingly."
+	});
+}
+function renderCodexWorkspaceDeveloperInstructions(params) {
+	const { files, header, preamble } = params;
 	if (files.length === 0) return;
 	const lines = [
-		"## OpenClaw Agent Soul",
+		header,
 		"",
-		"OpenClaw loaded these workspace instruction files from the active agent workspace. They define who you are, how you work, what tools are available, and the human you work alongside. Internalize and follow them accordingly.",
+		preamble,
 		""
 	];
 	for (const file of files) lines.push(`### ${file.path}`, "", file.content, "");

package/dist/{shared-client-C_RbGxW8.js → shared-client-CFCUGEVs.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { l as resolveCodexAppServerRuntimeOptions, n as codexAppServerStartOptionsKey } from "./config-DDMrwfJl.js";
-import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-D3SUwPFl.js";
+import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-1sSy4p3z.js";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import { constants, readFileSync } from "node:fs";

package/dist/{side-question-DzP1wClA.js → side-question-CYFMTA1O.js}

@@ -1,13 +1,13 @@
 import { c as readCodexPluginConfig, l as resolveCodexAppServerRuntimeOptions } from "./config-DDMrwfJl.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-_gKDcd0x.js";
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
-import { i as isCodexAppServerApprovalRequest } from "./client-D3SUwPFl.js";
-import { d as resolveReasoningEffort, h as mergeCodexThreadConfigs, n as buildCodexRuntimeThreadConfig, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-4Ul7RoW4.js";
+import { i as isCodexAppServerApprovalRequest } from "./client-1sSy4p3z.js";
+import { d as resolveCodexAppServerModelProvider, f as resolveReasoningEffort, g as mergeCodexThreadConfigs, n as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DGoaguJh.js";
 import { i as readCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
 import { i as readCodexNotificationTurnId, m as formatCodexUsageLimitErrorMessage, r as readCodexNotificationThreadId } from "./notification-correlation-qKY_sgga.js";
-import { i as getSharedCodexAppServerClient, s as refreshCodexAppServerAuthTokens } from "./shared-client-C_RbGxW8.js";
+import { i as getSharedCodexAppServerClient, s as refreshCodexAppServerAuthTokens } from "./shared-client-CFCUGEVs.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-CTnEWuor.js";
-import { a as resolveCodexDynamicToolsLoading, n as filterCodexDynamicTools, t as createCodexDynamicToolBridge } from "./dynamic-tools-DA42no4X.js";
+import { a as resolveCodexDynamicToolsLoading, n as filterCodexDynamicTools, t as createCodexDynamicToolBridge } from "./dynamic-tools-Bq717oJR.js";
 import { a as handleCodexAppServerElicitationRequest, c as emitDynamicToolTerminalDiagnostic, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerApprovalRequest, n as CODEX_NATIVE_HOOK_RELAY_EVENTS, o as emitDynamicToolErrorDiagnostic, r as buildCodexNativeHookRelayConfig, s as emitDynamicToolStartedDiagnostic, t as filterToolsForVisionInputs } from "./vision-tools-DOnxzH2y.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";

package/dist/test-api.js

@@ -1,6 +1,6 @@
 import { l as resolveCodexAppServerRuntimeOptions } from "./config-DDMrwfJl.js";
-import { a as buildThreadResumeParams, i as buildDeveloperInstructions, o as buildThreadStartParams, s as buildTurnStartParams } from "./thread-lifecycle-4Ul7RoW4.js";
-import { n as filterCodexDynamicTools, t as createCodexDynamicToolBridge } from "./dynamic-tools-DA42no4X.js";
+import { a as buildThreadResumeParams, c as buildTurnStartParams, i as buildDeveloperInstructions, o as buildThreadStartParams } from "./thread-lifecycle-DGoaguJh.js";
+import { n as filterCodexDynamicTools, t as createCodexDynamicToolBridge } from "./dynamic-tools-Bq717oJR.js";
 //#region extensions/codex/test-api.ts
 function resolveCodexPromptSnapshotAppServerOptions(pluginConfig) {
 	return resolveCodexAppServerRuntimeOptions({
@@ -31,6 +31,7 @@ function buildCodexHarnessPromptSnapshot(params) {
 			cwd: params.cwd,
 			appServer: params.appServer,
 			promptText: params.promptText,
+			turnScopedDeveloperInstructions: params.turnScopedDeveloperInstructions,
 			heartbeatCollaborationInstructions: params.heartbeatCollaborationInstructions
 		})
 	};

package/dist/{thread-lifecycle-4Ul7RoW4.js → thread-lifecycle-DGoaguJh.js}

@@ -3,7 +3,7 @@ import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartRespon
 import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY } from "./prompt-overlay.js";
 import { isModernCodexModel } from "./provider.js";
-import { a as isCodexAppServerConnectionClosedError } from "./client-D3SUwPFl.js";
+import { a as isCodexAppServerConnectionClosedError } from "./client-1sSy4p3z.js";
 import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-Bw_mfIW2.js";
 import crypto from "node:crypto";
 import { embeddedAgentLog, isActiveHarnessContextEngine } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -1469,7 +1469,10 @@ function buildTurnStartParams(params, options) {
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
 		effort: resolveReasoningEffort(params.thinkLevel, params.modelId),
 		...options.environmentSelection ? { environments: options.environmentSelection } : {},
-		collaborationMode: buildTurnCollaborationMode(params, { heartbeatCollaborationInstructions: options.heartbeatCollaborationInstructions })
+		collaborationMode: buildTurnCollaborationMode(params, {
+			turnScopedDeveloperInstructions: options.turnScopedDeveloperInstructions,
+			heartbeatCollaborationInstructions: options.heartbeatCollaborationInstructions
+		})
 	};
 }
 function resolveCodexThreadEnvironmentSelection(options) {
@@ -1488,10 +1491,26 @@ function buildTurnCollaborationMode(params, options = {}) {
 	};
 }
 function buildTurnScopedCollaborationInstructions(params, options = {}) {
-	if (params.trigger === "cron") return buildCronCollaborationInstructions();
-	if (params.trigger === "heartbeat") return joinPresentSections(buildHeartbeatCollaborationInstructions(), options.heartbeatCollaborationInstructions);
+	if (params.trigger === "cron") return joinPresentSections(buildCronCollaborationInstructions(), options.turnScopedDeveloperInstructions);
+	if (params.trigger === "heartbeat") return joinPresentSections(buildHeartbeatCollaborationInstructions(), options.turnScopedDeveloperInstructions, options.heartbeatCollaborationInstructions);
+	if (options.turnScopedDeveloperInstructions?.trim()) return joinPresentSections(buildDefaultCollaborationInstructions(), options.turnScopedDeveloperInstructions);
 	return null;
 }
+function buildDefaultCollaborationInstructions() {
+	return [
+		"# Collaboration Mode: Default",
+		"",
+		"You are now in Default mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.",
+		"",
+		"Your active mode changes only when new developer instructions with a different `<collaboration_mode>...</collaboration_mode>` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default and Plan.",
+		"",
+		"## request_user_input availability",
+		"",
+		"Use the `request_user_input` tool only when it is listed in the available tools for this turn.",
+		"",
+		"In Default mode, strongly prefer making reasonable assumptions and executing the user's request rather than stopping to ask questions. If you absolutely must ask a question because the answer cannot be discovered from local context and a reasonable assumption would be risky, ask the user directly with a concise plain-text question. Never write a multiple choice question as a textual assistant message."
+	].join("\n");
+}
 function buildCronCollaborationInstructions() {
 	return [
 		"This is an OpenClaw cron automation turn. Apply these instructions only to this scheduled job; ordinary chat turns should stay in Codex Default mode.",
@@ -1606,4 +1625,4 @@ function resolveReasoningEffort(thinkLevel, modelId) {
 	return null;
 }
 //#endregion
-export { sanitizeInlineImageDataUrl as C, resolveCodexContextEngineProjectionReserveTokens as D, resolveCodexContextEngineProjectionMaxChars as E, sanitizeCodexHistoryImagePayloads as S, projectContextEngineAssemblyForCodex as T, ensureCodexPluginActivation as _, buildThreadResumeParams as a, defaultCodexAppInventoryCache as b, codexDynamicToolsFingerprint as c, resolveReasoningEffort as d, startOrResumeThread as f, shouldBuildCodexPluginThreadConfig as g, mergeCodexThreadConfigs as h, buildDeveloperInstructions as i, isContextEngineBindingCompatible as l, buildCodexPluginThreadConfigInputFingerprint as m, buildCodexRuntimeThreadConfig as n, buildThreadStartParams as o, buildCodexPluginThreadConfig as p, buildContextEngineBinding as r, buildTurnStartParams as s, areCodexDynamicToolFingerprintsCompatible as t, resolveCodexAppServerModelProvider as u, pluginReadParams as v, DEFAULT_CODEX_PROJECTION_RESERVE_TOKENS as w, invalidInlineImageText as x, buildCodexAppInventoryCacheKey as y };
+export { sanitizeCodexHistoryImagePayloads as C, resolveCodexContextEngineProjectionMaxChars as D, projectContextEngineAssemblyForCodex as E, resolveCodexContextEngineProjectionReserveTokens as O, invalidInlineImageText as S, DEFAULT_CODEX_PROJECTION_RESERVE_TOKENS as T, shouldBuildCodexPluginThreadConfig as _, buildThreadResumeParams as a, buildCodexAppInventoryCacheKey as b, buildTurnStartParams as c, resolveCodexAppServerModelProvider as d, resolveReasoningEffort as f, mergeCodexThreadConfigs as g, buildCodexPluginThreadConfigInputFingerprint as h, buildDeveloperInstructions as i, codexDynamicToolsFingerprint as l, buildCodexPluginThreadConfig as m, buildCodexRuntimeThreadConfig as n, buildThreadStartParams as o, startOrResumeThread as p, buildContextEngineBinding as r, buildTurnCollaborationMode as s, areCodexDynamicToolFingerprintsCompatible as t, isContextEngineBindingCompatible as u, ensureCodexPluginActivation as v, sanitizeInlineImageDataUrl as w, defaultCodexAppInventoryCache as x, pluginReadParams as y };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.22",
+  "version": "2026.5.24-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/codex",
-      "version": "2026.5.22",
+      "version": "2026.5.24-beta.2",
       "dependencies": {
         "@earendil-works/pi-coding-agent": "0.75.4",
         "@openai/codex": "0.132.0",

package/package.json

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