@openclaw/codex 2026.9.5 → 2026.9.6

package/dist/.setup/{command-rpc-DHFpn4le.mjs → command-rpc-DixIj3HW.mjs}

@@ -1,16 +1,18 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-_vXcZGSx.mjs";
-import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient } from "./request-BioXJLYa.mjs";
-import "./config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { o as CodexAppServerRpcError } from "./timeout-C910MdAB.mjs";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-CDXOOFdZ.mjs";
+import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient } from "./request-D2L0zMrq.mjs";
+import "./config-BoTP_mrL.mjs";
+import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-C8Rw1m1m.mjs";
 import { a as resolveCodexAppServerAuthProfileStore, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-WqZtZfXN.mjs";
+import { Z as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-DA4VR4Eb.mjs";
+import { c as isCodexAppServerIndeterminateTransportError, l as isCodexAppServerOverloadError, s as isCodexAppServerIndeterminateRequestCancellationError } from "./client-Cs08OXVQ.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-CEv1cKwF.mjs";
 import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-DhLWa_7K.mjs";
-import { Z as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-BpTtuLQ5.mjs";
-import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-BpYKdTA0.mjs";
-import { n as listCodexAppServerModels } from "./models-BDFgm_G-.mjs";
-import { n as createCodexSessionGenerationSupersededError } from "./session-binding-_0W_fHRr.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BkNpj9Pz.mjs";
+import { n as listCodexAppServerModels } from "./models-KnqBv0hE.mjs";
+import { n as createCodexSessionGenerationSupersededError } from "./session-binding-Cm0apEbd.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-DIBXwOpE.mjs";
 import { resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { prepareAgentRuntimeAuth } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -129,13 +131,15 @@ function requestOptions(pluginConfig, limit, config, agentDir) {
 		agentDir
 	};
 }
-async function codexControlRequest(pluginConfig, method, requestParams, options = {}) {
+async function codexControlRequest(pluginConfig, method, requestParams, inputOptions = {}) {
+	const options = { ...inputOptions };
 	try {
 		options.controlObservation?.phase("prepare");
 	} catch {}
 	const runtime = options.startOptions ? resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig }) : resolveCodexAppServerRuntimeOptions({ pluginConfig });
 	const startOptions = options.startOptions ?? runtime.start;
-	const auth = options.onResponse ? await prepareCodexControlSessionAuth(options, startOptions) : {
+	const nativeAuthFork = method === "thread/fork" && options.startOptions !== void 0 && options.authProfileId === null;
+	const auth = options.onResponse && !nativeAuthFork ? await prepareCodexControlSessionAuth(options, startOptions) : {
 		authProfileId: options.authProfileId ?? void 0,
 		clientOptions: { authProfileId: options.authProfileId }
 	};
@@ -148,7 +152,7 @@ async function codexControlRequest(pluginConfig, method, requestParams, options
 		sessionId: options.sessionId,
 		agentDir: options.agentDir,
 		isolated: options.isolated,
-		...options.catalogPreview && method === "thread/list" ? {
+		...options.catalogPreview ? {
 			catalogPreview: true,
 			catalogPreviewCache: options.catalogPreviewCache,
 			catalogRows: options.catalogRows
@@ -170,25 +174,36 @@ async function codexControlRequest(pluginConfig, method, requestParams, options
 				},
 				requestResume: () => request({
 					method,
-					requestParams
+					requestParams,
+					assertCurrent: options.assertOwnerCurrent
 				}),
 				abandonClient: () => closeCodexStartupClientBestEffort(client)
 			});
-		} else response = await request({
-			method,
-			requestParams
-		});
-		await options.onResponse?.(response, client, {
+		} else try {
+			response = await request({
+				method,
+				requestParams,
+				assertCurrent: options.assertOwnerCurrent
+			});
+		} catch (error) {
+			if (nativeAuthFork && (isCodexAppServerIndeterminateRequestCancellationError(error) || isCodexAppServerIndeterminateTransportError(error) || error instanceof CodexAppServerRpcError && !isCodexAppServerOverloadError(error))) await closeCodexStartupClientBestEffort(client);
+			throw error;
+		}
+		if (options.onResponse) await options.onResponse(response, client, {
 			authProfileId: auth.authProfileId,
 			assertCurrent: scope.assertCurrent
 		});
-		scope.assertCurrent();
+		else scope.assertCurrent();
 		return response;
 	});
 	return await requestCodexAppServerJson({
 		method,
 		requestParams,
-		...controlRequestOptions
+		...controlRequestOptions,
+		...options.assertOwnerCurrent ? { assertCurrent: () => {
+			options.assertOwnerCurrent?.();
+			options.assertCurrent?.();
+		} } : {}
 	});
 }
 async function safeCodexControlRequest(pluginConfig, method, requestParams, options = {}) {

package/dist/.setup/{compact-C3i3qlzj.mjs → compact-Du5UvtxA.mjs}

@@ -1,18 +1,18 @@
-import { p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { u as isCodexAppServerPrewriteRequestCancellationError } from "./client-vXs2929Q.mjs";
+import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
 import { n as withCodexAppServerThreadMutation, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.mjs";
-import { i as CodexAppServerRpcError } from "./timeout-DZF05XrR.mjs";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-Bm38niE8.mjs";
-import { N as consumeCodexAppServerLiveThread, W as retainCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-BpTtuLQ5.mjs";
-import { a as closeCodexStartupClientBestEffort, b as readCodexNotificationTurnId, c as isCodexNoActiveTurnInterruptError, f as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError, y as readCodexNotificationThreadId } from "./attempt-client-cleanup-BpYKdTA0.mjs";
-import { c as readCodexNotificationItem, n as readCodexThreadContextSnapshot } from "./event-projector-usage-C7Ntzs-f.mjs";
-import { o as resolveCodexSessionBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-_0W_fHRr.mjs";
-import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-Cjs4B8xf.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BkNpj9Pz.mjs";
-import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-skomxnIt.mjs";
+import { o as CodexAppServerRpcError } from "./timeout-C910MdAB.mjs";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-ThoatDcb.mjs";
+import { N as consumeCodexAppServerLiveThread, W as retainCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-DA4VR4Eb.mjs";
+import { u as isCodexAppServerPrewriteRequestCancellationError } from "./client-Cs08OXVQ.mjs";
+import { b as readCodexNotificationTurnId, l as isCodexNoActiveTurnInterruptError, o as closeCodexStartupClientBestEffort, p as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError, y as readCodexNotificationThreadId } from "./attempt-client-cleanup-CEv1cKwF.mjs";
+import { c as readCodexNotificationItem, n as readCodexThreadContextSnapshot } from "./event-projector-usage-CnBS8Wa3.mjs";
+import { o as resolveCodexSessionBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-Cm0apEbd.mjs";
+import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-DGuQsuFC.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-DIBXwOpE.mjs";
+import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DcTtAcXj.mjs";
 import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.mjs";
-import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-BBP-RbTf.mjs";
+import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C2sRMOEY.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -81,14 +81,7 @@ function watchCodexNativeCompactionCompletion(params) {
 			threadId: params.threadId,
 			turnId: compactionTurnId
 		}, { timeoutMs: Math.max(1, params.interruptGraceMs) }).catch((error) => {
-			if (isCodexNoActiveTurnInterruptError(error)) {
-				if (compactionItemCompleted) {
-					complete();
-					return;
-				}
-				fail("codex app-server compaction reached terminal state without a completed compaction item");
-				return;
-			}
+			if (isCodexNoActiveTurnInterruptError(error)) return;
 			embeddedAgentLog.warn("codex app-server compaction interrupt request failed", {
 				threadId: params.threadId,
 				turnId: compactionTurnId,

package/dist/.setup/{config-CedDWjM-.mjs → config-BoTP_mrL.mjs}

@@ -1,8 +1,8 @@
 import { c as readExecAsk, f as readRecord, l as readExecSecurity } from "./config-utils-DujwEnhg.mjs";
-import "./config-security-BRQ2mgW9.mjs";
+import "./config-security-BEReZ6go.mjs";
 import "./config-parsing-CcB9iPoq.mjs";
-import { c as canUseCodexModelBackedApprovalsReviewerForModel$1 } from "./config-options-BsanJ8QG.mjs";
-import "./config-runtime-CeAhl_h4.mjs";
+import { c as canUseCodexModelBackedApprovalsReviewerForModel$1 } from "./config-options-BvaRs51b.mjs";
+import "./config-runtime-C8Rw1m1m.mjs";
 import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { execPolicy } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { resolveExecApprovalsFromFile } from "openclaw/plugin-sdk/exec-approvals-runtime";

package/dist/.setup/{config-options-BsanJ8QG.mjs → config-options-BvaRs51b.mjs}

@@ -1,7 +1,8 @@
 import { a as normalizeHeaders, d as readNumberEnv, f as readRecord, i as normalizeCodexServiceTier, o as normalizePositiveNumber, p as resolveArgs, r as normalizeCodexAppServerSecretInput, s as readBooleanEnv, t as hashSecretForKey, u as readNonEmptyString } from "./config-utils-DujwEnhg.mjs";
-import { A as stripTomlLineComments, C as parseInlineOpenAIModelProviderBaseUrl, E as readCodexRequirementsToml, F as resolveEffectiveOpenClawExecModeForCodexAppServer, I as resolveSandbox, L as selectForcedDangerFullAccessSandbox, M as resolveApprovalPolicy, N as resolveApprovalsReviewer, P as resolveCodexPolicyModeForOpenClawExecMode, R as selectForcedPromptingSandbox, T as parseTomlTableSection, _ as resolveCodexAppServerUserHomeDir, a as resolveCodexAppServerNetworkProxy, b as parseAllowedApprovalPoliciesFromCodexRequirements, c as resolveTransport, h as resolveCodexAppServerHomeDir, i as normalizeRemoteWorkspaceRoot, j as assertCodexAppServerAllowedForOpenClawExecMode, m as isJsonObject, o as resolveDefaultCodexAppServerPolicy, r as inferCodexAppServerConnectionClass, s as resolvePolicyMode, t as assertCodexAppServerConnectionSecurity, w as parseTomlStringValue, y as firstTomlTableOffset } from "./config-security-BRQ2mgW9.mjs";
+import { A as selectForcedPromptingSandbox, C as assertCodexAppServerAllowedForOpenClawExecMode, D as resolveEffectiveOpenClawExecModeForCodexAppServer, E as resolveCodexPolicyModeForOpenClawExecMode, O as resolveSandbox, T as resolveApprovalsReviewer, a as resolveCodexAppServerNetworkProxy, c as resolveTransport, d as resolveCodexAppServerHomeDir, g as parseAllowedApprovalPoliciesFromCodexRequirements, i as normalizeRemoteWorkspaceRoot, k as selectForcedDangerFullAccessSandbox, o as resolveDefaultCodexAppServerPolicy, p as resolveCodexAppServerUserHomeDir, r as inferCodexAppServerConnectionClass, s as resolvePolicyMode, t as assertCodexAppServerConnectionSecurity, w as resolveApprovalPolicy, y as readCodexRequirementsToml } from "./config-security-BEReZ6go.mjs";
 import { a as DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME, d as readCodexPluginConfig, n as DEFAULT_CODEX_COMPUTER_USE_LIVE_TEST_TIMEOUT_MS, o as DEFAULT_CODEX_COMPUTER_USE_TOOL_CALL_TIMEOUT_MS, r as DEFAULT_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS, s as assertCodexAppServerCommandHasNoInlineArgs } from "./config-parsing-CcB9iPoq.mjs";
-import { i as readCodexAppServerConfigOptions } from "./launch-args-DnMak49W.mjs";
+import { i as readCodexAppServerConfigOptions } from "./launch-args-DbFCehO7.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
 import { normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { parse } from "smol-toml";
 import { readFileSync } from "node:fs";
@@ -28,18 +29,21 @@ async function readCodexEffectiveConfig(client, cwd, options) {
 //#endregion
 //#region extensions/codex/src/app-server/config-reviewer-policy.ts
 const CODEX_CONFIG_TOML_FILENAME = "config.toml";
+const CODEX_CLI_WHITESPACE = /^\p{White_Space}+|\p{White_Space}+$/gu;
 /** 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 readCodexEffectiveConfig(params.client, params.cwd, { signal: params.signal });
-	const effectiveConfig = response.config;
-	const modelProvider = effectiveConfig.model_provider;
-	const providers = effectiveConfig.model_providers;
+	if (!isTrustedCodexReviewerConfig(response.config)) throw new Error("Codex model-backed approval reviewer requires the running server to use a trusted OpenAI endpoint");
+	return response;
+}
+function isTrustedCodexReviewerConfig(config) {
+	const modelProvider = config.model_provider;
+	const providers = config.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;
+	return (modelProvider == null || modelProvider === "openai") && (providers == null || providerRecords !== void 0) && (provider == null || openAIProvider !== void 0) && isTrustedOptionalReviewerEndpoint(config.openai_base_url, isNativeOpenAIBaseUrl) && isTrustedOptionalReviewerEndpoint(config.chatgpt_base_url, isNativeChatGPTBaseUrl) && isTrustedOptionalReviewerEndpoint(openAIProvider?.base_url, isNativeOpenAIBaseUrl);
 }
 function isTrustedOptionalReviewerEndpoint(value, isTrusted) {
 	return value == null || typeof value === "string" && isTrusted(value);
@@ -52,8 +56,7 @@ function canUseCodexModelBackedApprovalsReviewerForModel(params, resolveAuthProv
 }
 function isTrustedCodexModelBackedOpenAIProvider(params, resolveAuthProviderId) {
 	if (!openAIBaseUrlEnvOverridesAreTrustedForModelBackedReview(params.env)) return false;
-	const codexBaseUrlOverrides = readCodexBaseUrlOverridesForModelBackedReview(params);
-	if (codexBaseUrlOverrides === false || !codexBaseUrlOverrides.openAI.every(isNativeOpenAIBaseUrl) || !codexBaseUrlOverrides.chatGPT.every(isNativeChatGPTBaseUrl)) return false;
+	if (!nativeCodexConfigIsTrustedForModelBackedReview(params)) return false;
 	const openAIProviders = readConfiguredOpenAIProvidersForModelBackedReview(params.config, resolveAuthProviderId);
 	if (openAIProviders.length === 0) return true;
 	return openAIProviders.every((openAIProvider) => configuredOpenAIProviderIsTrustedForModelBackedReview(openAIProvider, params.model));
@@ -85,28 +88,17 @@ function resolveCodexModelBackedReviewerPolicyContext(params) {
 		model: params.model ?? params.bindingModel
 	};
 }
-function readCodexBaseUrlOverridesForModelBackedReview(params) {
+function nativeCodexConfigIsTrustedForModelBackedReview(params) {
 	const configToml = readCodexAppServerConfigToml(params);
 	if (configToml === false) return false;
-	const configTomls = configToml === void 0 ? [] : [configToml];
 	const nativeOverrides = readNativeCodexReviewerConfigOverrides(params);
 	if (nativeOverrides === false) return false;
-	configTomls.push(...nativeOverrides);
-	const openAI = [];
-	const chatGPT = [];
-	for (const content of configTomls) {
-		const topLevelContent = stripTomlLineComments(content).slice(0, firstTomlTableOffset(content));
-		const modelProviderOpenAISection = parseTomlTableSection(content, "model_providers.openai");
-		const modelProvider = parseTomlStringValue(topLevelContent, "model_provider");
-		if (modelProvider === false || modelProvider && modelProvider !== "openai") return false;
-		openAI.push(parseTomlStringValue(topLevelContent, "openai_base_url"), parseTomlStringValue(topLevelContent, "model_providers.openai.base_url"), parseInlineOpenAIModelProviderBaseUrl(topLevelContent), modelProviderOpenAISection ? parseTomlStringValue(modelProviderOpenAISection, "base_url") : void 0);
-		chatGPT.push(parseTomlStringValue(topLevelContent, "chatgpt_base_url"));
+	if (configToml !== void 0) try {
+		nativeOverrides.unshift(parse(configToml, { integersAsBigInt: true }));
+	} catch {
+		return false;
 	}
-	if ([...openAI, ...chatGPT].includes(false)) return false;
-	return {
-		openAI: openAI.filter((entry) => typeof entry === "string"),
-		chatGPT: chatGPT.filter((entry) => typeof entry === "string")
-	};
+	return nativeOverrides.every(isTrustedCodexReviewerConfig);
 }
 function readNativeCodexReviewerConfigOverrides(params) {
 	if (params.codexArgs?.some((arg) => !arg)) return false;
@@ -115,20 +107,39 @@ function readNativeCodexReviewerConfigOverrides(params) {
 	for (const { name, value } of readCodexAppServerConfigOptions(params.codexArgs ?? [])) {
 		if (!value) return false;
 		if (name === "--profile" || name === "-p") profile = value;
-		else overrides.push(`${value}\n`);
+		else {
+			const override = parseNativeCodexReviewerConfigOverride(value);
+			if (override === false) return false;
+			overrides.push(override);
+		}
 	}
 	if (profile) {
 		if (path.basename(profile) !== profile || profile === "." || profile === "..") return false;
 		const configPath = resolveCodexAppServerConfigPath(params);
 		if (!configPath) return false;
 		try {
-			overrides.unshift(readFileSync(path.join(path.dirname(configPath), `${profile}.config.toml`), "utf8"));
+			overrides.unshift(parse(readFileSync(path.join(path.dirname(configPath), `${profile}.config.toml`), "utf8"), { integersAsBigInt: true }));
 		} catch (error) {
 			if (readErrorCode(error) !== "ENOENT") return false;
 		}
 	}
 	return overrides;
 }
+function parseNativeCodexReviewerConfigOverride(override) {
+	const separator = override.indexOf("=");
+	if (separator < 0) return false;
+	const key = override.slice(0, separator).replace(CODEX_CLI_WHITESPACE, "");
+	if (!key) return false;
+	const raw = override.slice(separator + 1).replace(CODEX_CLI_WHITESPACE, "");
+	let value;
+	try {
+		value = parse(`_x_ = ${raw}`, { integersAsBigInt: true })["_x_"];
+	} catch {
+		value = raw.replace(/^["']+|["']+$/g, "");
+	}
+	for (const segment of key.split(".").toReversed()) value = { [segment]: value };
+	return readRecord(value) ?? false;
+}
 function readCodexAppServerConfigToml(params) {
 	if (params.codexConfigToml !== void 0) return params.codexConfigToml ?? void 0;
 	const configPath = resolveCodexAppServerConfigPath(params);
@@ -163,6 +174,7 @@ function codexConfigEnablesNativeComputerUse(params) {
 	return false;
 }
 function resolveCodexAppServerConfigPath(params) {
+	if (params.codexHome) return path.join(params.codexHome, CODEX_CONFIG_TOML_FILENAME);
 	if (params.homeScope === "user") return path.join(resolveCodexAppServerUserHomeDir(params.env), CODEX_CONFIG_TOML_FILENAME);
 	const agentDir = readNonEmptyString(params.agentDir);
 	return agentDir ? path.join(resolveCodexAppServerHomeDir(agentDir), CODEX_CONFIG_TOML_FILENAME) : void 0;
@@ -363,7 +375,7 @@ function createCodexAppServerConfig({ resolveProviderIdForAuth }) {
 			env
 		});
 		const managedCommandOrder = params.managedCommandOrder ?? (homeScope === "user" || computerUseConfig.enabled ? "desktop-first" : "package-first");
-		const includeManagedCommandOrder = commandSource === "managed" && (managedCommandOrder === "desktop-first" || params.managedCommandOrder === "package-first");
+		const includeManagedCommandOrder = commandSource === "managed" && (managedCommandOrder === "desktop-first" || params.managedCommandOrder !== void 0);
 		const managedComputerUsePluginNames = [.../* @__PURE__ */ new Set([DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME, computerUseConfig.pluginName])];
 		return {
 			start: {
@@ -435,6 +447,7 @@ function resolveCodexAppServerStartOptionsForAgent(params) {
 	if (!params.agentDir) throw new Error("Agent-scoped Codex requires an OpenClaw agent directory");
 	return codexConfigEnablesNativeComputerUse({
 		agentDir: params.agentDir,
+		codexHome: startOptions.codexHome,
 		codexConfigToml: params.codexConfigToml,
 		env: params.env,
 		homeScope: "agent",
@@ -498,7 +511,10 @@ function codexAppServerStartOptionsKey(options, params = {}) {
 		url: options.url ?? null,
 		authToken: hashSecretForKey(options.authToken, "authToken"),
 		headers: Object.entries(options.headers).toSorted(([left], [right]) => left.localeCompare(right)).map(([key, value]) => [key, hashSecretForKey(value, `header:${key}`)]),
-		env: Object.entries(options.env ?? {}).toSorted(([left], [right]) => left.localeCompare(right)).map(([key, value]) => [key, hashSecretForKey(value, `env:${key}`)]),
+		env: Object.entries({
+			...options.env,
+			...options.codexHome ? { CODEX_HOME: options.codexHome } : {}
+		}).toSorted(([left], [right]) => left.localeCompare(right)).map(([key, value]) => [key, hashSecretForKey(value, `env:${key}`)]),
 		clearEnv: [...options.clearEnv ?? []].toSorted(),
 		authProfileId: params.authProfileId ?? null,
 		authBindingFingerprint: params.authBindingFingerprint ?? null,

package/dist/.setup/{config-runtime-CeAhl_h4.mjs → config-runtime-C8Rw1m1m.mjs}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
-import { r as createCodexAppServerConfig } from "./config-options-BsanJ8QG.mjs";
+import { r as createCodexAppServerConfig } from "./config-options-BvaRs51b.mjs";
 import { resolveProviderIdForAuth } from "openclaw/plugin-sdk/provider-auth-aliases";
 //#region extensions/codex/src/app-server/config-runtime.ts
 var config_runtime_exports = /* @__PURE__ */ __exportAll({

package/dist/.setup/{config-security-BRQ2mgW9.mjs → config-security-BEReZ6go.mjs}

@@ -1,9 +1,10 @@
-import { u as readNonEmptyString } from "./config-utils-DujwEnhg.mjs";
+import { f as readRecord, u as readNonEmptyString } from "./config-utils-DujwEnhg.mjs";
 import { t as DEFAULT_CODEX_APP_SERVER_NETWORK_PROXY_PROFILE_PREFIX } from "./config-parsing-CcB9iPoq.mjs";
-import { r as normalizeCodexAppServerArgs } from "./launch-args-DnMak49W.mjs";
-import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { r as normalizeCodexAppServerArgs } from "./launch-args-DbFCehO7.mjs";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { AgentHarnessPreflightError } from "openclaw/plugin-sdk/agent-harness-registration";
+import { parse } from "smol-toml";
 import { readFileSync } from "node:fs";
 import path from "node:path";
 import { homedir, hostname } from "node:os";
@@ -68,29 +69,32 @@ function resolveCodexRequirementsPath(env, platform) {
 	return UNIX_CODEX_REQUIREMENTS_PATH;
 }
 function parseAllowedSandboxModesFromCodexRequirements(content, hostName) {
-	const remoteSandboxModes = parseMatchingRemoteSandboxModesFromCodexRequirements(content, hostName);
+	const requirements = parseCodexRequirements(content);
+	const remoteSandboxModes = parseMatchingRemoteSandboxModesFromCodexRequirements(requirements, hostName);
 	if (remoteSandboxModes !== void 0) return remoteSandboxModes;
-	return parseRequirementsSandboxModes(parseTopLevelRequirementsStringArray(content, "allowed_sandbox_modes"));
+	return parseRequirementsSandboxModes(readRequirementsStringArray(requirements?.allowed_sandbox_modes));
 }
 function parseAllowedApprovalPoliciesFromCodexRequirements(content) {
-	const values = parseTopLevelRequirementsStringArray(content, "allowed_approval_policies");
+	const values = readRequirementsStringArray(parseCodexRequirements(content)?.allowed_approval_policies);
 	if (values === void 0) return;
 	const normalizedPolicies = values.map((entry) => normalizeRequirementsApprovalPolicy(entry)).filter((entry) => entry !== void 0);
 	return normalizedPolicies.length > 0 ? new Set(normalizedPolicies) : void 0;
 }
 function parseAllowedApprovalsReviewersFromCodexRequirements(content) {
-	const values = parseTopLevelRequirementsStringArray(content, "allowed_approvals_reviewers");
+	const values = readRequirementsStringArray(parseCodexRequirements(content)?.allowed_approvals_reviewers);
 	if (values === void 0) return;
 	const normalizedReviewers = values.map((entry) => normalizeRequirementsApprovalsReviewer(entry)).filter((entry) => entry !== void 0);
 	return normalizedReviewers.length > 0 ? new Set(normalizedReviewers) : void 0;
 }
-function parseMatchingRemoteSandboxModesFromCodexRequirements(content, hostName) {
+function parseMatchingRemoteSandboxModesFromCodexRequirements(requirements, hostName) {
 	const normalizedHostName = normalizeRequirementsHostName(hostName);
-	if (normalizedHostName === void 0) return;
-	for (const section of parseTomlArrayTableSections(content, "remote_sandbox_config")) {
-		const patterns = parseRequirementsStringArray(section, "hostname_patterns");
+	const remoteConfigs = requirements?.remote_sandbox_config;
+	if (normalizedHostName === void 0 || !Array.isArray(remoteConfigs)) return;
+	for (const section of remoteConfigs) {
+		const config = readRecord(section);
+		const patterns = readRequirementsStringArray(config?.hostname_patterns);
 		if (!patterns || !requirementsHostNameMatchesAnyPattern(normalizedHostName, patterns)) continue;
-		return parseRequirementsSandboxModes(parseRequirementsStringArray(section, "allowed_sandbox_modes"));
+		return parseRequirementsSandboxModes(readRequirementsStringArray(config?.allowed_sandbox_modes));
 	}
 }
 function parseRequirementsSandboxModes(values) {
@@ -98,99 +102,15 @@ function parseRequirementsSandboxModes(values) {
 	const normalizedModes = values.map((entry) => normalizeRequirementsSandboxMode(entry)).filter((entry) => entry !== void 0);
 	return normalizedModes.length > 0 ? new Set(normalizedModes) : void 0;
 }
-function parseTopLevelRequirementsStringArray(content, key) {
-	return parseRequirementsStringArray(stripTomlLineComments(content).slice(0, firstTomlTableOffset(content)), key);
-}
-function parseTomlStringValue(content, key) {
-	return parseTomlStringAssignmentValue(content, tomlDottedKeyPattern(key));
-}
-function parseInlineOpenAIModelProviderBaseUrl(content) {
-	return parseTomlStringAssignmentValue(content, `${tomlKeyPattern("model_providers")}\\s*=\\s*\\{[\\s\\S]*?${tomlKeyPattern("openai")}\\s*=\\s*\\{[\\s\\S]*?${tomlKeyPattern("base_url")}`);
-}
-function parseTomlStringAssignmentValue(content, keyPattern) {
-	const assignment = content.match(new RegExp(`(?:^|\\n)\\s*${keyPattern}\\s*=\\s*([^\\r\\n]*)`));
-	if (!assignment) return;
-	const rawValue = assignment[1]?.trimStart() ?? "";
-	if (rawValue.startsWith("\"\"\"") || rawValue.startsWith("'''")) return false;
-	const match = parseTomlStringAssignment(content, keyPattern);
-	return match ? match[1] ?? match[2] ?? "" : false;
-}
-function parseTomlStringAssignment(content, keyPattern) {
-	return content.match(new RegExp(`(?:^|\\n)\\s*${keyPattern}\\s*=\\s*(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|'([^']*)')`));
-}
-function tomlDottedKeyPattern(key) {
-	return key.split(".").map(tomlKeyPattern).join("\\s*\\.\\s*");
-}
-function tomlKeyPattern(key) {
-	const escaped = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	return `(?:"${escaped}"|'${escaped}'|${escaped})`;
-}
-function parseRequirementsStringArray(content, key) {
-	const match = content.match(new RegExp(`(?:^|\\n)\\s*${key}\\s*=\\s*\\[([\\s\\S]*?)\\]`));
-	if (!match) return;
-	const arrayBody = match[1] ?? "";
-	const stringMatches = [...arrayBody.matchAll(/"([^"\\]*(?:\\.[^"\\]*)*)"|'([^']*)'/g)];
-	if (stringMatches.length === 0 && arrayBody.trim().length > 0) return;
-	return stringMatches.map((entry) => entry[1] ?? entry[2] ?? "");
-}
-function parseTomlTableSection(content, table) {
-	const strippedContent = stripTomlLineComments(content);
-	const tablePattern = tomlDottedKeyPattern(table);
-	const match = new RegExp(`^\\s*\\[\\s*${tablePattern}\\s*\\]\\s*$`, "m").exec(strippedContent);
-	if (!match) return;
-	const sectionStart = match.index + match[0].length;
-	const rest = strippedContent.slice(sectionStart);
-	const nextTableOffset = rest.search(/^\s*\[/m);
-	return nextTableOffset === -1 ? rest : rest.slice(0, nextTableOffset);
-}
-function parseTomlArrayTableSections(content, table) {
-	const strippedContent = stripTomlLineComments(content);
-	const escapedTable = table.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	const headerPattern = new RegExp(`^\\s*\\[\\[\\s*${escapedTable}\\s*\\]\\]\\s*$`, "gm");
-	const sections = [];
-	for (let match = headerPattern.exec(strippedContent); match; match = headerPattern.exec(strippedContent)) {
-		const sectionStart = headerPattern.lastIndex;
-		const rest = strippedContent.slice(sectionStart);
-		const nextTableOffset = rest.search(/^\s*\[/m);
-		sections.push(nextTableOffset === -1 ? rest : rest.slice(0, nextTableOffset));
-	}
-	return sections;
-}
-function firstTomlTableOffset(content) {
-	return content.match(/^\s*\[[^\]\n]/m)?.index ?? content.length;
-}
-function stripTomlLineComments(value) {
-	let output = "";
-	let quote;
-	let escaped = false;
-	for (let index = 0; index < value.length; index += 1) {
-		const char = value[index] ?? "";
-		if (quote) {
-			output += char;
-			if (quote === "\"" && escaped) {
-				escaped = false;
-				continue;
-			}
-			if (quote === "\"" && char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === quote) quote = void 0;
-			continue;
-		}
-		if (char === "\"" || char === "'") {
-			quote = char;
-			output += char;
-			continue;
-		}
-		if (char === "#") {
-			while (index < value.length && value[index] !== "\n") index += 1;
-			if (value[index] === "\n") output += "\n";
-			continue;
-		}
-		output += char;
+function parseCodexRequirements(content) {
+	try {
+		return parse(content, { integersAsBigInt: true });
+	} catch {
+		return;
 	}
-	return output;
+}
+function readRequirementsStringArray(value) {
+	return Array.isArray(value) && value.every((entry) => typeof entry === "string") ? value : void 0;
 }
 function normalizeRequirementsSandboxMode(value) {
 	const compact = value.replace(/[\s_-]/g, "").toLowerCase();
@@ -258,6 +178,7 @@ function resolveCodexAppServerUserHomeDir(env = process.env, homedir$1 = homedir
 }
 /** Resolves the local CODEX_HOME used when starting one app-server connection. */
 function resolveCodexAppServerLocalHomeDir(startOptions, agentDir, env = process.env) {
+	if (startOptions.codexHome) return startOptions.codexHome;
 	const configured = startOptions.env?.CODEX_HOME;
 	if (configured?.trim()) return configured;
 	return startOptions.homeScope === "user" ? resolveCodexAppServerUserHomeDir(env) : resolveCodexAppServerHomeDir(agentDir);
@@ -272,20 +193,14 @@ function withEphemeralCodexAuthStore(params) {
 		args
 	};
 }
-//#endregion
-//#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]);
-}
-/** Asserts the experimental beforeTurnId request field before it crosses the app-server boundary. */
-function assertCodexThreadForkParams(value) {
-	if (!isRecord(value) || typeof value.threadId !== "string" || !value.threadId.trim() || value.beforeTurnId !== void 0 && value.beforeTurnId !== null && typeof value.beforeTurnId !== "string") throw new Error("Invalid Codex app-server thread/fork params");
-	return value;
-}
-function isJsonObject(value) {
-	return isRecord(value);
+function withClearedEnvironmentVariables(startOptions, envVars) {
+	const clearEnv = startOptions.clearEnv ?? [];
+	const missingEnvVars = envVars.filter((envVar) => !clearEnv.includes(envVar));
+	if (missingEnvVars.length === 0) return startOptions;
+	return {
+		...startOptions,
+		clearEnv: [...clearEnv, ...missingEnvVars]
+	};
 }
 //#endregion
 //#region extensions/codex/src/app-server/config-security.ts
@@ -341,7 +256,7 @@ function fingerprintCodexAppServerNetworkProxyConfigPatch(configPatch) {
 	return createHash("sha256").update(stableStringifyJson(configPatch)).digest("hex");
 }
 function normalizeNetworkProxyPermissionMap(value) {
-	const entries = Object.entries(value ?? {}).map(([key, permission]) => [key.trim(), permission]).filter(([key]) => key.length > 0);
+	const entries = Object.entries(value ?? {}).map(([key, permission]) => [key.trim(), permission === "none" ? "deny" : permission]).filter(([key]) => key.length > 0);
 	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
 }
 function removeUndefinedJsonFields(value) {
@@ -462,4 +377,4 @@ function resolveDefaultCodexAppServerPolicy(params) {
 	};
 }
 //#endregion
-export { stripTomlLineComments as A, parseInlineOpenAIModelProviderBaseUrl as C, selectGuardianApprovalPolicy as D, readCodexRequirementsToml as E, resolveEffectiveOpenClawExecModeForCodexAppServer as F, resolveSandbox as I, selectForcedDangerFullAccessSandbox as L, resolveApprovalPolicy as M, resolveApprovalsReviewer as N, selectGuardianApprovalsReviewer as O, resolveCodexPolicyModeForOpenClawExecMode as P, selectForcedPromptingSandbox as R, parseAllowedSandboxModesFromCodexRequirements as S, parseTomlTableSection as T, resolveCodexAppServerUserHomeDir as _, resolveCodexAppServerNetworkProxy as a, parseAllowedApprovalPoliciesFromCodexRequirements as b, resolveTransport as c, CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE as d, assertCodexThreadForkParams as f, resolveCodexAppServerLocalHomeDir as g, resolveCodexAppServerHomeDir as h, normalizeRemoteWorkspaceRoot as i, assertCodexAppServerAllowedForOpenClawExecMode as j, selectUserApprovalsReviewer as k, shouldAutoApproveCodexAppServerApprovals as l, isJsonObject as m, hasCodexMcpToolApprovalOverrides as n, resolveDefaultCodexAppServerPolicy as o, flattenCodexDynamicToolFunctions as p, inferCodexAppServerConnectionClass as r, resolvePolicyMode as s, assertCodexAppServerConnectionSecurity as t, withMcpElicitationsApprovalPolicy as u, withEphemeralCodexAuthStore as v, parseTomlStringValue as w, parseAllowedApprovalsReviewersFromCodexRequirements as x, firstTomlTableOffset as y, selectGuardianSandbox as z };
+export { selectForcedPromptingSandbox as A, assertCodexAppServerAllowedForOpenClawExecMode as C, resolveEffectiveOpenClawExecModeForCodexAppServer as D, resolveCodexPolicyModeForOpenClawExecMode as E, resolveSandbox as O, selectUserApprovalsReviewer as S, resolveApprovalsReviewer as T, parseAllowedApprovalsReviewersFromCodexRequirements as _, resolveCodexAppServerNetworkProxy as a, selectGuardianApprovalPolicy as b, resolveTransport as c, resolveCodexAppServerHomeDir as d, resolveCodexAppServerLocalHomeDir as f, parseAllowedApprovalPoliciesFromCodexRequirements as g, withEphemeralCodexAuthStore as h, normalizeRemoteWorkspaceRoot as i, selectGuardianSandbox as j, selectForcedDangerFullAccessSandbox as k, shouldAutoApproveCodexAppServerApprovals as l, withClearedEnvironmentVariables as m, hasCodexMcpToolApprovalOverrides as n, resolveDefaultCodexAppServerPolicy as o, resolveCodexAppServerUserHomeDir as p, inferCodexAppServerConnectionClass as r, resolvePolicyMode as s, assertCodexAppServerConnectionSecurity as t, withMcpElicitationsApprovalPolicy as u, parseAllowedSandboxModesFromCodexRequirements as v, resolveApprovalPolicy as w, selectGuardianApprovalsReviewer as x, readCodexRequirementsToml as y };