@openclaw/codex 2026.9.1 → 2026.9.2

package/dist/{compact-_t0HQrUS.js → compact-Y_xBqrHN.js}

@@ -1,18 +1,19 @@
-import { $t as isJsonObject, At as retainCodexAppServerLiveThread, St as consumeCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, q as CodexAppServerRpcError } from "./shared-client-DxcfF9KX.js";
-import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-BHuTCRZQ.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-DYHcRQAa.js";
-import { f as readCodexNotificationItem, i as readCodexThreadContextSnapshot } from "./event-projector-usage-C5mcrGjp.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-C7pyVKeW.js";
-import { l as isIncognitoSessionKey, o as withCodexAppServerThreadMutation, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-zGokd8i1.js";
-import { s as resolveCodexNativeExecutionBlock } from "./request-DYAI5FQE.js";
-import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-g4KbJPzp.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-E6uDsPlx.js";
+import { l as sessionBindingIdentity } from "./session-binding-record-CyaXZvTe.js";
+import { B as isJsonObject } from "./config-CyapYSji.js";
+import { Mt as retainCodexAppServerLiveThread, U as isCodexAppServerPrewriteRequestCancellationError, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, q as CodexAppServerRpcError, wt as consumeCodexAppServerLiveThread } from "./shared-client-CKhX2kFt.js";
+import { l as resolveCodexSessionBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-4Ki04sW-.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, c as isCodexNoActiveTurnInterruptError, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-Bp1ZOnk2.js";
+import { n as readCodexThreadContextSnapshot, u as readCodexNotificationItem } from "./event-projector-usage-ZqEVbAEY.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BLgqkUc1.js";
+import { l as isIncognitoSessionKey, o as withCodexAppServerThreadMutation, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-CbucAmmp.js";
+import { r as assertCodexSupervisionThreadLineage, s as resolveCodexBindingAppServerConnection } from "./thread-policy-CTalhWFy.js";
+import { s as resolveCodexNativeExecutionBlock } from "./request-C8H22rPi.js";
 import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.js";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { embeddedAgentLog, resolveCompactionTimeoutMs } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
-import { resolveDefaultAgentId as resolveDefaultAgentId$1 } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { resolveAgentDir as resolveAgentDir$2 } from "openclaw/plugin-sdk/agent-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
@@ -77,7 +78,7 @@ function watchCodexNativeCompactionCompletion(params) {
 			threadId: params.threadId,
 			turnId: compactionTurnId
 		}, { timeoutMs: Math.max(1, params.interruptGraceMs) }).catch((error) => {
-			if (isCodexAlreadyTerminalInterruptError(error)) {
+			if (isCodexNoActiveTurnInterruptError(error)) {
 				if (compactionItemCompleted) {
 					complete();
 					return;
@@ -292,7 +293,33 @@ async function compactCodexNativeThread(params, options) {
 		agentId: params.agentId,
 		config: params.config
 	});
-	const initialBinding = await options.bindingStore.read(bindingIdentity);
+	const abortedResult = (expectedThreadId, currentThreadId = expectedThreadId) => options.allowNonManualNativeRequest ? skippedCodexNativeCompactionResult(params, {
+		reason: "codex app-server compaction aborted before native compaction",
+		code: "aborted_before_native_compaction",
+		request: options.nativeCompactionRequest ?? "after_context_engine",
+		...expectedThreadId ? {
+			expectedThreadId,
+			currentThreadId
+		} : {}
+	}) : {
+		ok: false,
+		compacted: false,
+		reason: "codex app-server compaction aborted while waiting to start"
+	};
+	let resolvedBinding;
+	try {
+		resolvedBinding = await resolveCodexSessionBinding({
+			bindingStore: options.bindingStore,
+			identity: bindingIdentity,
+			config: params.config,
+			storePath: params.sessionTarget?.storePath,
+			signal: params.abortSignal
+		});
+	} catch (error) {
+		if (!params.abortSignal?.aborted) throw error;
+		return abortedResult(options.bindingStore.read(bindingIdentity)?.threadId);
+	}
+	const { binding: initialBinding, assertCurrent } = resolvedBinding;
 	if (!initialBinding?.threadId) return failedCodexThreadBindingCompactionResult(params, {
 		reason: "no codex app-server thread binding",
 		recovery: "missing_thread_binding"
@@ -312,13 +339,13 @@ async function compactCodexNativeThread(params, options) {
 	let connection;
 	try {
 		const config = params.config ?? {};
-		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId$1(config);
+		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId(config);
 		connection = resolveCodexBindingAppServerConnection({
 			binding,
 			authProfileId: requestedAuthProfileId ?? binding.authProfileId,
 			pluginConfig: options.pluginConfig,
 			config,
-			agentDir: resolveAgentDir$1(config, agentId)
+			agentDir: resolveAgentDir$2(config, agentId)
 		});
 	} catch (error) {
 		return {
@@ -345,6 +372,7 @@ async function compactCodexNativeThread(params, options) {
 	};
 	try {
 		return await runExclusiveCodexNativeCompaction(binding.threadId, params.abortSignal, async () => {
+			assertCurrent();
 			const client = await clientFactory({
 				startOptions: appServer.start,
 				...preparedApiKey ? { preparedAuth: {
@@ -352,7 +380,8 @@ async function compactCodexNativeThread(params, options) {
 					apiKey: preparedApiKey
 				} } : { authProfileId: connection.clientAuthProfileId },
 				agentDir: params.agentDir,
-				config: params.config
+				config: params.config,
+				assertCurrent
 			});
 			let releaseThreadSubscription;
 			let retainedThreadOwnership;
@@ -387,8 +416,8 @@ async function compactCodexNativeThread(params, options) {
 					if (await options.bindingStore.mutate(bindingIdentity, {
 						kind: "clear",
 						threadId: binding.threadId
-					})) return;
-					if ((await options.bindingStore.read(bindingIdentity))?.threadId !== binding.threadId) return;
+					}, assertCurrent)) return;
+					if (options.bindingStore.read(bindingIdentity)?.threadId !== binding.threadId) return;
 					throw new Error("failed to detach unconfirmed codex app-server thread binding");
 				}
 			});
@@ -404,6 +433,7 @@ async function compactCodexNativeThread(params, options) {
 								excludeTurns: true
 							},
 							timeoutMs: timeoutMs ?? appServer.requestTimeoutMs,
+							assertCurrent,
 							...params.abortSignal ? { signal: params.abortSignal } : {}
 						});
 						releaseThreadSubscription = async () => releaseCompactionThread(binding.threadId);
@@ -413,7 +443,8 @@ async function compactCodexNativeThread(params, options) {
 						const { thread } = await client.request("thread/read", {
 							threadId: binding.threadId,
 							includeTurns: false
-						});
+						}, { assertCurrent });
+						assertCurrent();
 						retainedThreadOwnership.assertCurrent();
 						assertCodexSupervisionThreadLineage(binding, thread);
 					}
@@ -422,7 +453,7 @@ async function compactCodexNativeThread(params, options) {
 			};
 			try {
 				const guardedResult = await options.bindingStore.withLease(bindingIdentity, async () => {
-					const currentBinding = await options.bindingStore.read(bindingIdentity);
+					const currentBinding = options.bindingStore.read(bindingIdentity);
 					if (params.abortSignal?.aborted) {
 						if (!options.allowNonManualNativeRequest) params.abortSignal.throwIfAborted();
 						return {
@@ -436,6 +467,7 @@ async function compactCodexNativeThread(params, options) {
 							})
 						};
 					}
+					assertCurrent();
 					if (!currentBinding || !isSameNativeCompactionBinding(currentBinding, binding)) {
 						embeddedAgentLog.warn("codex app-server compaction could not use the thread binding because it changed", {
 							sessionId: params.sessionId,
@@ -466,23 +498,38 @@ async function compactCodexNativeThread(params, options) {
 						sessionId: params.sessionId,
 						bindingStore: options.bindingStore,
 						identity: bindingIdentity,
-						binding
+						binding,
+						assertCurrent
 					});
+					assertCurrent();
 					try {
 						completionWatch.beginRequest();
-						if (guardedRequestTimeoutMs === void 0) await client.request("thread/compact/start", { threadId: binding.threadId });
-						else await client.request("thread/compact/start", { threadId: binding.threadId }, { timeoutMs: guardedRequestTimeoutMs });
+						await client.request("thread/compact/start", { threadId: binding.threadId }, {
+							...guardedRequestTimeoutMs === void 0 ? {} : { timeoutMs: guardedRequestTimeoutMs },
+							assertCurrent: () => {
+								try {
+									assertCurrent();
+								} catch (error) {
+									compactionRequestDefinitelyRejected = true;
+									throw error;
+								}
+							}
+						});
 						return {
 							started: true,
 							accepted: true
 						};
 					} catch (error) {
-						if (error instanceof CodexAppServerRpcError) {
-							await options.bindingStore.mutate(bindingIdentity, {
-								kind: "set",
-								binding
-							});
-							compactionRequestDefinitelyRejected = !isCodexThreadNotFoundError(error);
+						compactionRequestDefinitelyRejected ||= isCodexAppServerPrewriteRequestCancellationError(error);
+						if (compactionRequestDefinitelyRejected || error instanceof CodexAppServerRpcError) {
+							completionWatch.confirmRequestRejected();
+							if (!compactionRequestDefinitelyRejected) {
+								await options.bindingStore.mutate(bindingIdentity, {
+									kind: "set",
+									binding
+								}, assertCurrent);
+								compactionRequestDefinitelyRejected = !isCodexThreadNotFoundError(error);
+							}
 						}
 						return {
 							started: true,
@@ -493,8 +540,7 @@ async function compactCodexNativeThread(params, options) {
 				});
 				if (!guardedResult.started) return guardedResult.result;
 				if (!guardedResult.accepted) {
-					if (guardedResult.error instanceof CodexAppServerRpcError) completionWatch.confirmRequestRejected();
-					else await completionWatch.retireUnconfirmedRequest(`codex app-server compaction start was unconfirmed: ${coerceErrorMessage(guardedResult.error)}`);
+					if (!compactionRequestDefinitelyRejected && !(guardedResult.error instanceof CodexAppServerRpcError)) await completionWatch.retireUnconfirmedRequest(`codex app-server compaction start was unconfirmed: ${coerceErrorMessage(guardedResult.error)}`);
 					throw guardedResult.error;
 				}
 				embeddedAgentLog.info("started codex app-server compaction", {
@@ -502,6 +548,7 @@ async function compactCodexNativeThread(params, options) {
 					threadId: binding.threadId
 				});
 				const completion = await completionWatch.completion;
+				assertCurrent();
 				if (!completion.completed) throw new Error(completion.reason);
 				tokensAfter = completion.tokensAfter;
 				if (completion.turnId && completion.itemId) await persistCodexContextCompactionActivity({
@@ -514,6 +561,7 @@ async function compactCodexNativeThread(params, options) {
 					itemId: completion.itemId,
 					timestamp: Date.now()
 				});
+				assertCurrent();
 				embeddedAgentLog.info("completed codex app-server compaction", {
 					sessionId: params.sessionId,
 					threadId: binding.threadId
@@ -541,9 +589,9 @@ async function compactCodexNativeThread(params, options) {
 				try {
 					if ((compactionSucceeded || compactionRequestDefinitelyRejected) && retainedThreadOwnership) {
 						const ownership = retainedThreadOwnership;
-						const currentBinding = await options.bindingStore.read(bindingIdentity);
+						const currentBinding = options.bindingStore.read(bindingIdentity);
 						if (!(isSameCodexAppServerThreadOwner(currentBinding, binding) && await options.bindingStore.withLease(bindingIdentity, async () => {
-							const leasedBinding = await options.bindingStore.read(bindingIdentity);
+							const leasedBinding = options.bindingStore.read(bindingIdentity);
 							if (!isSameCodexAppServerThreadOwner(leasedBinding, binding)) return false;
 							return await retainCodexAppServerLiveThread(client, binding.threadId, ownership.release, ownership.configFingerprint, ownership.serviceTier);
 						}))) await releaseThreadSubscription?.();
@@ -570,20 +618,7 @@ async function compactCodexNativeThread(params, options) {
 			});
 		});
 	} catch (error) {
-		if (params.abortSignal?.aborted) {
-			if (options.allowNonManualNativeRequest) return skippedCodexNativeCompactionResult(params, {
-				reason: "codex app-server compaction aborted before native compaction",
-				code: "aborted_before_native_compaction",
-				request: options.nativeCompactionRequest ?? "after_context_engine",
-				expectedThreadId: initialBinding.threadId,
-				currentThreadId: binding.threadId
-			});
-			return {
-				ok: false,
-				compacted: false,
-				reason: "codex app-server compaction aborted while waiting to start"
-			};
-		}
+		if (params.abortSignal?.aborted) return abortedResult(initialBinding.threadId, binding.threadId);
 		throw error;
 	}
 }
@@ -644,7 +679,7 @@ async function clearContextEngineProjectionBeforeNativeCompaction(params) {
 			...contextEngineBinding,
 			projection: void 0
 		} }
-	});
+	}, params.assertCurrent);
 	embeddedAgentLog.info("cleared codex context-engine projection before native compaction", {
 		sessionId: params.sessionId,
 		threadId: params.binding.threadId,

package/dist/{config-BhmfC1s6.js → config-CyapYSji.js}

@@ -1,19 +1,34 @@
-import { n as normalizeCodexAppServerArgs, r as readCodexAppServerConfigOptions } from "./launch-args-RXQwn8zV.js";
-import { asNullableRecord, asOptionalRecord as readRecord, normalizeOptionalString, normalizeOptionalString as readNonEmptyString, normalizeTrimmedStringList, parseBooleanValue } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { a as normalizeHeaders, c as readExecAsk, d as readNumberEnv, f as readRecord, g as CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN, i as normalizeCodexServiceTier, l as readExecSecurity, o as normalizePositiveNumber, p as resolveArgs, r as normalizeCodexAppServerSecretInput, s as readBooleanEnv, t as hashSecretForKey, u as readNonEmptyString } from "./config-utils-C57JiJrU.js";
+import { m as readCodexAppServerConfigOptions, p as normalizeCodexAppServerArgs } from "./managed-binary-DcpnJF9x.js";
+import { asNullableRecord, isRecord, normalizeOptionalString, normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { createHash } from "node:crypto";
+import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { z } from "zod";
+import { buildSecretInputSchema } from "openclaw/plugin-sdk/secret-input";
 import path from "node:path";
-import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { AgentHarnessPreflightError } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { createHash, createHmac, randomBytes } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
 import { resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
-import { resolveAgentConfig as resolveAgentConfig$1 } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { resolveExecApprovalsFromFile } from "openclaw/plugin-sdk/exec-approvals-runtime";
-import { buildSecretInputSchema, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { detectWindowsSpawnCommandInlineArgs } from "openclaw/plugin-sdk/windows-spawn";
-import { z } from "zod";
 import { parse } from "smol-toml";
 import { isLoopbackHost } from "openclaw/plugin-sdk/ssrf-runtime";
+//#region extensions/codex/src/app-server/protocol.ts
+/** Namespace Codex keeps directly model-visible without exposing it to Code Mode guests. */
+const CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE = "openclaw_direct";
+function flattenCodexDynamicToolFunctions(tools) {
+	return (tools ?? []).flatMap((tool) => tool.type === "namespace" ? tool.tools : [tool]);
+}
+const CODEX_INTERACTIVE_THREAD_SOURCE_KINDS = ["cli", "vscode"];
+const CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES = ["atlas", "chatgpt"];
+function isJsonObject(value) {
+	return isRecord(value);
+}
+function isRpcResponse(message) {
+	return "id" in message && !("method" in message);
+}
+//#endregion
 //#region extensions/codex/src/app-server/auth-start-options.ts
 const CODEX_APP_SERVER_HOME_DIRNAME = "codex-home";
 const CODEX_EPHEMERAL_AUTH_STORE_OVERRIDE = "cli_auth_credentials_store=\"ephemeral\"";
@@ -42,96 +57,6 @@ function withEphemeralCodexAuthStore(params) {
 	};
 }
 //#endregion
-//#region extensions/codex/src/app-server/config-contracts.ts
-const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
-const CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME = "workspace-directory";
-const CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN = /^[A-Za-z0-9_-]+$/;
-//#endregion
-//#region extensions/codex/src/app-server/config-utils.ts
-const START_OPTIONS_KEY_SECRET_SYMBOL = Symbol.for("openclaw.codexAppServerStartOptionsKeySecret");
-const START_OPTIONS_KEY_SECRET = getStartOptionsKeySecret();
-const PLAIN_DECIMAL_NUMBER_RE = /^[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))$/;
-function normalizeCodexServiceTier(value) {
-	if (typeof value !== "string") return;
-	const trimmed = value.trim();
-	if (!trimmed) return;
-	const normalized = trimmed.toLowerCase();
-	if (normalized === "fast" || normalized === "priority") return "priority";
-	if (normalized === "flex") return "flex";
-	return trimmed;
-}
-function isCodexFastServiceTier(value) {
-	return normalizeCodexServiceTier(value) === "priority";
-}
-function normalizePositiveNumber(value, fallback) {
-	return resolvePositiveTimerTimeoutMs(value, fallback);
-}
-function normalizeHeaders(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-	return Object.fromEntries(Object.entries(value).map(([key, child]) => [key.trim(), normalizeCodexAppServerSecretInput({
-		value: child,
-		path: `plugins.entries.codex.config.appServer.headers.${key}`
-	})]).filter((entry) => Boolean(entry[0] && entry[1])));
-}
-function normalizeCodexAppServerSecretInput(params) {
-	return normalizeResolvedSecretInputString(params);
-}
-function readBooleanEnv(value) {
-	return parseBooleanValue(value);
-}
-function readExecSecurity(value) {
-	return value === "deny" || value === "allowlist" || value === "full" ? value : void 0;
-}
-function readExecAsk(value) {
-	return value === "off" || value === "on-miss" || value === "always" ? value : void 0;
-}
-function readNumberEnv(value) {
-	const trimmed = value?.trim();
-	if (!trimmed || !PLAIN_DECIMAL_NUMBER_RE.test(trimmed)) return;
-	const parsed = Number(trimmed);
-	return Number.isFinite(parsed) ? parsed : void 0;
-}
-function resolveArgs(configArgs, envArgs) {
-	if (Array.isArray(configArgs)) return configArgs.map((entry) => readNonEmptyString(entry)).filter((entry) => entry !== void 0);
-	if (typeof configArgs === "string") return splitShellWords(configArgs);
-	return splitShellWords(envArgs ?? "");
-}
-function hashSecretForKey(value, label) {
-	if (!value) return null;
-	return createHmac("sha256", START_OPTIONS_KEY_SECRET).update(label).update("\0").update(value).digest("hex");
-}
-function getStartOptionsKeySecret() {
-	const globalState = globalThis;
-	globalState[START_OPTIONS_KEY_SECRET_SYMBOL] ??= randomBytes(32);
-	return globalState[START_OPTIONS_KEY_SECRET_SYMBOL];
-}
-function splitShellWords(value) {
-	const words = [];
-	let current = "";
-	let quote = null;
-	for (const char of value) {
-		if (quote) {
-			if (char === quote) quote = null;
-			else current += char;
-			continue;
-		}
-		if (char === "\"" || char === "'") {
-			quote = char;
-			continue;
-		}
-		if (/\s/.test(char)) {
-			if (current) {
-				words.push(current);
-				current = "";
-			}
-			continue;
-		}
-		current += char;
-	}
-	if (current) words.push(current);
-	return words;
-}
-//#endregion
 //#region extensions/codex/src/app-server/config-exec-policy.ts
 function selectForcedPromptingSandbox(params) {
 	if (params.configuredSandbox === "read-only" || params.defaultSandbox === "read-only") return "read-only";
@@ -166,7 +91,7 @@ function resolveOpenClawExecPolicyFromConfig(params) {
 	const globalExec = readRecord(params.config?.tools?.exec);
 	const globalPolicy = applyOpenClawExecPolicyLayer(createDefaultOpenClawExecPolicy(), globalExec);
 	const agentId = params.agentId?.trim();
-	return applyOpenClawExecPolicyLayer(globalPolicy, agentId ? readRecord(resolveAgentConfig$1(params.config ?? {}, agentId)?.tools?.exec) : void 0);
+	return applyOpenClawExecPolicyLayer(globalPolicy, agentId ? readRecord(resolveAgentConfig(params.config ?? {}, agentId)?.tools?.exec) : void 0);
 }
 function resolveOpenClawExecPolicyForCodexAppServer(params) {
 	if (params.permissionMode === "full") return {
@@ -520,6 +445,26 @@ function resolveCodexPluginDestructivePolicy(policy) {
 	};
 }
 //#endregion
+//#region extensions/codex/src/app-server/config-layer-policy.ts
+const CODEX_SESSION_OVERRIDABLE_LAYER_TYPES = /* @__PURE__ */ new Set([
+	"packagedDefaults",
+	"mdm",
+	"system",
+	"enterpriseManaged",
+	"user",
+	"project",
+	"sessionFlags"
+]);
+/** Read one effective snapshot for the current boundary's reviewer and tool-policy checks. */
+async function readCodexEffectiveConfig(client, cwd, signal) {
+	const response = await client.request("config/read", {
+		cwd: path.resolve(cwd),
+		includeLayers: true
+	}, { signal });
+	if (!isJsonObject(response) || !isJsonObject(response.config)) throw new Error("Codex config/read returned an invalid effective config");
+	return response;
+}
+//#endregion
 //#region extensions/codex/src/app-server/config-requirements.ts
 const UNIX_CODEX_REQUIREMENTS_PATH = "/etc/codex/requirements.toml";
 const WINDOWS_CODEX_REQUIREMENTS_SUFFIX = "\\OpenAI\\Codex\\requirements.toml";
@@ -719,18 +664,15 @@ const CODEX_CONFIG_TOML_FILENAME = "config.toml";
 /** Cloud/system config can redirect reviews after local home/profile checks have passed. */
 async function assertCodexModelBackedReviewerEffectiveConfig(params) {
 	if (params.approvalsReviewer !== "auto_review" && params.approvalsReviewer !== "guardian_subagent") return;
-	const response = await params.client.request("config/read", {
-		cwd: path.resolve(params.cwd),
-		includeLayers: false
-	}, { signal: params.signal });
-	const effectiveConfig = readRecord(readRecord(response)?.config);
-	if (!effectiveConfig) throw new Error("Codex config/read returned an invalid model-backed reviewer config");
+	const response = await readCodexEffectiveConfig(params.client, params.cwd, params.signal);
+	const effectiveConfig = response.config;
 	const modelProvider = effectiveConfig.model_provider;
 	const providers = effectiveConfig.model_providers;
 	const providerRecords = providers == null ? void 0 : readRecord(providers);
 	const provider = providerRecords?.openai;
 	const openAIProvider = provider == null ? void 0 : readRecord(provider);
 	if (modelProvider != null && modelProvider !== "openai" || providers != null && !providerRecords || provider != null && !openAIProvider || !isTrustedOptionalReviewerEndpoint(effectiveConfig.openai_base_url, isNativeOpenAIBaseUrl) || !isTrustedOptionalReviewerEndpoint(effectiveConfig.chatgpt_base_url, isNativeChatGPTBaseUrl) || !isTrustedOptionalReviewerEndpoint(openAIProvider?.base_url, isNativeOpenAIBaseUrl)) throw new Error("Codex model-backed approval reviewer requires the running server to use a trusted OpenAI endpoint");
+	return response;
 }
 function isTrustedOptionalReviewerEndpoint(value, isTrusted) {
 	return value == null || typeof value === "string" && isTrusted(value);
@@ -1398,4 +1340,4 @@ function resolveCodexSupervisionAppServerRuntimeOptions(params = {}) {
 	});
 }
 //#endregion
-export { isCodexFastServiceTier as A, isCodexPairedNodeRemoteExecPlacementSandbox as C, resolveCodexPluginsPolicy as D, readCodexPluginConfig as E, resolveCodexAppServerHomeDir as F, resolveCodexAppServerLocalHomeDir as I, resolveCodexAppServerUserHomeDir as L, CODEX_PLUGINS_MARKETPLACE_NAME as M, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as N, resolveOpenClawExecPolicyForCodexAppServer as O, CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN as P, withEphemeralCodexAuthStore as R, selectUserApprovalsReviewer as S, isCodexSandboxExecServerEnabled as T, parseAllowedApprovalsReviewersFromCodexRequirements as _, resolveCodexAppServerStartOptionsForAgent as a, selectGuardianApprovalPolicy as b, assertCodexAppServerConnectionSecurity as c, shouldAutoApproveCodexAppServerApprovals as d, withMcpElicitationsApprovalPolicy as f, parseAllowedApprovalPoliciesFromCodexRequirements as g, resolveCodexModelBackedReviewerPolicyContext as h, resolveCodexAppServerRuntimeOptions as i, normalizeCodexServiceTier as j, selectGuardianSandbox as k, hasCodexMcpToolApprovalOverrides as l, canUseCodexModelBackedApprovalsReviewerForModel as m, codexSandboxPolicyForTurn as n, resolveCodexComputerUseConfig as o, assertCodexModelBackedReviewerEffectiveConfig as p, resolveCodexAppServerHomeScope as r, resolveCodexSupervisionAppServerRuntimeOptions as s, codexAppServerStartOptionsKey as t, resolveCodexAppServerNetworkProxy as u, parseAllowedSandboxModesFromCodexRequirements as v, isCodexRemoteExecPlacementSandbox as w, selectGuardianApprovalsReviewer as x, readCodexRequirementsToml as y };
+export { resolveOpenClawExecPolicyForCodexAppServer as A, isJsonObject as B, CODEX_SESSION_OVERRIDABLE_LAYER_TYPES as C, isCodexSandboxExecServerEnabled as D, isCodexRemoteExecPlacementSandbox as E, withEphemeralCodexAuthStore as F, CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES as I, CODEX_INTERACTIVE_THREAD_SOURCE_KINDS as L, resolveCodexAppServerHomeDir as M, resolveCodexAppServerLocalHomeDir as N, readCodexPluginConfig as O, resolveCodexAppServerUserHomeDir as P, CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE as R, selectUserApprovalsReviewer as S, isCodexPairedNodeRemoteExecPlacementSandbox as T, isRpcResponse as V, parseAllowedApprovalsReviewersFromCodexRequirements as _, resolveCodexAppServerStartOptionsForAgent as a, selectGuardianApprovalPolicy as b, assertCodexAppServerConnectionSecurity as c, shouldAutoApproveCodexAppServerApprovals as d, withMcpElicitationsApprovalPolicy as f, parseAllowedApprovalPoliciesFromCodexRequirements as g, resolveCodexModelBackedReviewerPolicyContext as h, resolveCodexAppServerRuntimeOptions as i, selectGuardianSandbox as j, resolveCodexPluginsPolicy as k, hasCodexMcpToolApprovalOverrides as l, canUseCodexModelBackedApprovalsReviewerForModel as m, codexSandboxPolicyForTurn as n, resolveCodexComputerUseConfig as o, assertCodexModelBackedReviewerEffectiveConfig as p, resolveCodexAppServerHomeScope as r, resolveCodexSupervisionAppServerRuntimeOptions as s, codexAppServerStartOptionsKey as t, resolveCodexAppServerNetworkProxy as u, parseAllowedSandboxModesFromCodexRequirements as v, readCodexEffectiveConfig as w, selectGuardianApprovalsReviewer as x, readCodexRequirementsToml as y, flattenCodexDynamicToolFunctions as z };

package/dist/config-utils-C57JiJrU.js

@@ -0,0 +1,69 @@
+import { asOptionalRecord as readRecord, normalizeOptionalString as readNonEmptyString, parseBooleanValue } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { createHmac, randomBytes } from "node:crypto";
+import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { splitCommandArgs } from "openclaw/plugin-sdk/process-runtime";
+import { normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input";
+//#region extensions/codex/src/app-server/config-contracts.ts
+const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
+const CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME = "workspace-directory";
+const CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN = /^[A-Za-z0-9_-]+$/;
+//#endregion
+//#region extensions/codex/src/app-server/config-utils.ts
+const START_OPTIONS_KEY_SECRET_SYMBOL = Symbol.for("openclaw.codexAppServerStartOptionsKeySecret");
+const START_OPTIONS_KEY_SECRET = getStartOptionsKeySecret();
+const PLAIN_DECIMAL_NUMBER_RE = /^[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))$/;
+function normalizeCodexServiceTier(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	if (!trimmed) return;
+	const normalized = trimmed.toLowerCase();
+	if (normalized === "fast" || normalized === "priority") return "priority";
+	if (normalized === "flex") return "flex";
+	return trimmed;
+}
+function isCodexFastServiceTier(value) {
+	return normalizeCodexServiceTier(value) === "priority";
+}
+function normalizePositiveNumber(value, fallback) {
+	return resolvePositiveTimerTimeoutMs(value, fallback);
+}
+function normalizeHeaders(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+	return Object.fromEntries(Object.entries(value).map(([key, child]) => [key.trim(), normalizeCodexAppServerSecretInput({
+		value: child,
+		path: `plugins.entries.codex.config.appServer.headers.${key}`
+	})]).filter((entry) => Boolean(entry[0] && entry[1])));
+}
+function normalizeCodexAppServerSecretInput(params) {
+	return normalizeResolvedSecretInputString(params);
+}
+function readBooleanEnv(value) {
+	return parseBooleanValue(value);
+}
+function readExecSecurity(value) {
+	return value === "deny" || value === "allowlist" || value === "full" ? value : void 0;
+}
+function readExecAsk(value) {
+	return value === "off" || value === "on-miss" || value === "always" ? value : void 0;
+}
+function readNumberEnv(value) {
+	const trimmed = value?.trim();
+	if (!trimmed || !PLAIN_DECIMAL_NUMBER_RE.test(trimmed)) return;
+	const parsed = Number(trimmed);
+	return Number.isFinite(parsed) ? parsed : void 0;
+}
+function resolveArgs(configArgs, envArgs) {
+	if (Array.isArray(configArgs)) return configArgs.map((entry) => readNonEmptyString(entry)).filter((entry) => entry !== void 0);
+	return splitCommandArgs(typeof configArgs === "string" ? configArgs : envArgs ?? "", { allowUnclosedQuotes: true });
+}
+function hashSecretForKey(value, label) {
+	if (!value) return null;
+	return createHmac("sha256", START_OPTIONS_KEY_SECRET).update(label).update("\0").update(value).digest("hex");
+}
+function getStartOptionsKeySecret() {
+	const globalState = globalThis;
+	globalState[START_OPTIONS_KEY_SECRET_SYMBOL] ??= randomBytes(32);
+	return globalState[START_OPTIONS_KEY_SECRET_SYMBOL];
+}
+//#endregion
+export { normalizeHeaders as a, readExecAsk as c, readNumberEnv as d, readRecord as f, CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN as g, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as h, normalizeCodexServiceTier as i, readExecSecurity as l, CODEX_PLUGINS_MARKETPLACE_NAME as m, isCodexFastServiceTier as n, normalizePositiveNumber as o, resolveArgs as p, normalizeCodexAppServerSecretInput as r, readBooleanEnv as s, hashSecretForKey as t, readNonEmptyString as u };

package/dist/doctor-contract-api.js

@@ -1,16 +1,17 @@
 import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
 import { asNullableRecord, asOptionalRecord, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { createHash } from "node:crypto";
+import { listAgentIds, resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
-import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { pathExists } from "openclaw/plugin-sdk/security-runtime";
-import { listAgentIds, resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { setImmediate } from "node:timers/promises";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
 import { archiveLegacyStateSource, legacyStateFileExists } from "openclaw/plugin-sdk/runtime-doctor-migrations";
+import { resolveStorePath } from "openclaw/plugin-sdk/session-store-paths";
 //#region extensions/codex/src/migration/session-binding-orphans.ts
 const PAGE_SIZE = 512;
 const KEY_PREFIXES = ["session-key:", "session:"];
@@ -122,7 +123,6 @@ const LEGACY_BINDING_LOCK_OPTIONS = {
 	stale: 12e4
 };
 async function collectSessionSurfaces(params) {
-	const { resolveStorePath } = await import("openclaw/plugin-sdk/session-store-runtime");
 	const surfaces = /* @__PURE__ */ new Map();
 	const stateRoot = await canonicalPathFromExistingAncestor(params.stateDir);
 	const add = async (root, storePath, agentId, scan) => {
@@ -268,7 +268,6 @@ async function* walkSidecars(root) {
 	}
 }
 async function collectBindingOwners(sources, surfaces, params) {
-	const { resolveStorePath } = await import("openclaw/plugin-sdk/session-store-runtime");
 	const sourcePaths = new Set(await Promise.all(sources.map((source) => canonicalPathFromExistingAncestor(source.transcriptPath))));
 	const owners = /* @__PURE__ */ new Map();
 	const storePaths = new Set(surfaces.flatMap((surface) => [...surface.storePaths]));
@@ -392,7 +391,7 @@ async function migrateSource(source, candidates, params, store) {
 		return await withFileLock(source.sidecarPath, LEGACY_BINDING_LOCK_OPTIONS, async () => {
 			const [contents, stat] = await Promise.all([fs.readFile(source.sidecarPath, "utf8"), fs.stat(source.sidecarPath)]);
 			const raw = JSON.parse(contents);
-			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-BHuTCRZQ.js").then((n) => n.f), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-4Ki04sW-.js").then((n) => n.d), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
 			const agentId = owner?.agentId ?? (source.agentIds.size === 1 ? [...source.agentIds][0] : void 0);
 			const baseStored = createStoredCodexAppServerBinding(raw, {
 				now: stat.mtime.toISOString(),