@openclaw/codex 2026.9.6 → 2026.9.8

package/dist/.setup/{thread-requests-BLvGkP2R.mjs → thread-requests-OWGOiDaV.mjs}

@@ -1,28 +1,31 @@
-import { a as readCodexPluginInventory, o as resolveOwnedAppApprovalOverrideKeys } from "./plugin-inventory-BoRei8Z4.mjs";
-import { f as resolveCodexAppServerLocalHomeDir } from "./config-security-BEReZ6go.mjs";
-import { f as resolveCodexPluginsPolicy } from "./config-parsing-CcB9iPoq.mjs";
+import { l as toCodexPluginOwnedAccountApp, s as readCodexPluginInventory } from "./plugin-inventory-Cky2XJUw.mjs";
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { d as readCodexEffectiveConfig, u as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES } from "./config-options-BvaRs51b.mjs";
-import { t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.mjs";
-import { a as defaultCodexAppInventoryCache, i as CodexAppInventoryCache, o as serializeCodexAppInventoryError, s as codexAppIdentityKey, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-B2CsSdnV.mjs";
-import "./config-BoTP_mrL.mjs";
-import { t as isCodexAppServerNativeAuthProfile } from "./auth-profile-WqZtZfXN.mjs";
-import { E as nativeHookRelayUnregisterQueue, H as readCodexClientSessionMeta } from "./shared-client-DA4VR4Eb.mjs";
-import { L as resolveCodexToolAbortTerminalReason } from "./client-Cs08OXVQ.mjs";
-import { n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, p as unsubscribeCodexThreadBestEffort } from "./attempt-client-cleanup-CEv1cKwF.mjs";
-import { t as ensureCodexPluginActivation } from "./plugin-activation-DT3MNtqj.mjs";
-import { r as hashCodexAppServerBindingFingerprint } from "./session-binding-Cm0apEbd.mjs";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { u as stringifyCodexPolicy } from "./config-security-CE-FcGw9.mjs";
+import { f as resolveCodexPluginsPolicy } from "./config-parsing-b088LyhT.mjs";
+import { n as resolveCodexAppServerLocalHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
+import { d as readCodexEffectiveConfig, u as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES } from "./config-options-CzyWLTJt.mjs";
+import { t as isIncognitoSessionKey } from "./incognito-session-DWYapfwf.mjs";
+import { a as defaultCodexAppInventoryCache, i as CodexAppInventoryCache, o as serializeCodexAppInventoryError, s as codexAppIdentityKey, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-BL9B5H0L.mjs";
+import "./config-DKhXquav.mjs";
+import { t as isCodexAppServerNativeAuthProfile } from "./auth-profile-B0okYl2D.mjs";
+import { D as nativeHookRelayUnregisterQueue, W as readCodexClientSessionMeta } from "./shared-client-CJCTeFpQ.mjs";
+import { a as isCodexResponsesOAuthRun, i as isCodexResponsesOAuthCredential, t as CODEX_RESPONSES_OAUTH_PROVIDER } from "./responses-oauth-twnuTaAa.mjs";
+import { B as resolveCodexToolAbortTerminalReason } from "./client-qyUBJlGZ.mjs";
+import { n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, p as unsubscribeCodexThreadBestEffort } from "./attempt-client-cleanup-B-S7ngS_.mjs";
+import { t as ensureCodexPluginActivation } from "./plugin-activation-cNHRfaxU.mjs";
+import { r as hashCodexAppServerBindingFingerprint } from "./session-binding-DGCYAfvD.mjs";
+import { t as codexNativeSubagentMonitorRuntime } from "./native-subagent-monitor-BwkQXf9e.mjs";
+import { normalizeOptionalString, normalizeUniqueStringEntries, normalizeUniqueTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import * as crypto$1 from "node:crypto";
 import crypto, { createHash } from "node:crypto";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs/promises";
+import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { resolveRequiredHomeDir, resolveStateDir } from "openclaw/plugin-sdk/state-paths";
-import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { SKILL_WORKSHOP_TOOL_NAME, buildCredentialSafetyPrompt, buildDelegationGuidanceSection, buildSkillWorkshopPromptSection, buildUiPresentationPrompt, embeddedAgentLog, isHostScopedAgentToolActive, resolveMainSessionDelegationMode } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -58,7 +61,7 @@ function resolveCodexPluginThreadAppCacheKey(params) {
 	return params.threadId ? `${params.appCacheKey}:thread:${encodeURIComponent(params.threadId)}` : params.appCacheKey;
 }
 function createCodexPluginThreadAppInventoryRequest(params) {
-	return async (method, requestParams) => await params.request(method, (method === "app/installed" || method === "app/read") && params.threadId ? {
+	return async (method, requestParams) => await params.request(method, params.threadId ? {
 		...requestParams,
 		threadId: params.threadId
 	} : requestParams);
@@ -131,19 +134,6 @@ async function readCodexThreadAdmissibleAccountApps(params, appCache) {
 		installedApps: snapshot.installedApps
 	};
 }
-function toCodexPluginOwnedAccountApp(app, installedApp) {
-	return {
-		id: app.id,
-		name: app.name,
-		accessible: true,
-		enabled: installedApp?.enabled ?? false,
-		needsAuth: false,
-		...resolveOwnedAppApprovalOverrideKeys(app)
-	};
-}
-function resolveCodexThreadConfigAppsForRecord(params) {
-	return params.inventory.appInventory?.state === "missing" ? [] : params.record.apps;
-}
 function resolveCodexPluginAppThreadAdmission(app, inventory) {
 	const snapshot = inventory.appInventory?.snapshot;
 	if (!snapshot) return "blocked";
@@ -194,13 +184,8 @@ function shouldForceRefreshCodexNotReadyPluginApps(params, policy, inventory) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/plugin-thread-config.ts
-/**
-* Builds Codex thread config patches that expose only policy-approved apps
-* for native Codex turns.
-*/
-const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 13;
+const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 15;
 const CODEX_PLUGIN_THREAD_CONFIG_FINGERPRINT_VERSION = 2;
-/** Returns true when plugin config exists and thread config may need app patches. */
 function shouldBuildCodexPluginThreadConfig(pluginConfig) {
 	return resolveCodexPluginsPolicy(pluginConfig).configured;
 }
@@ -227,7 +212,6 @@ function buildCodexPluginThreadConfigTimeoutFallback(params) {
 		}]
 	};
 }
-/** Builds the Codex apps config patch and policy context for a native thread. */
 async function buildCodexPluginThreadConfig(params) {
 	const appCache = params.appCache ?? defaultCodexAppInventoryCache;
 	const threadAppCacheKey = resolveCodexPluginThreadAppCacheKey(params);
@@ -245,7 +229,7 @@ async function buildCodexPluginThreadConfig(params) {
 		inputFingerprint,
 		configPatch: buildDisabledAppsConfigPatch()
 	});
-	let inventory = policy.pluginPolicies.length > 0 ? await readCodexPluginInventory({
+	const readInventory = (suppressAppInventoryRefresh) => readCodexPluginInventory({
 		pluginConfig: params.pluginConfig,
 		policy,
 		request: threadRequest,
@@ -255,31 +239,31 @@ async function buildCodexPluginThreadConfig(params) {
 		configCwd: params.configCwd,
 		metadataCache: params.metadataCache,
 		nowMs: params.nowMs,
-		suppressAppInventoryRefresh: true
-	}) : emptyCodexPluginInventory(policy);
-	const appInventoryRefreshDeferredForActivation = inventory.records.some((record) => record.activationRequired) && shouldRefreshMissingAppInventory(params, policy, inventory);
-	if (shouldWaitForInitialAppInventory(params, policy, inventory)) {
+		suppressAppInventoryRefresh
+	});
+	let inventory = policy.pluginPolicies.length > 0 ? await readInventory(true) : {
+		policy,
+		records: [],
+		diagnostics: []
+	};
+	const refreshInventory = async (options) => {
 		await refreshCodexPluginAppInventory(params, appCache, {
-			forceRefetch: false,
-			reason: "initial_missing",
+			...options,
 			targetAppIds: collectCodexPluginOwnedAppIds(inventory)
 		});
-		inventory = await readCodexPluginInventory({
-			pluginConfig: params.pluginConfig,
-			policy,
-			request: threadRequest,
-			appCache,
-			appCacheKey: params.appCacheKey,
-			appInventoryCacheKey: threadAppCacheKey,
-			configCwd: params.configCwd,
-			metadataCache: params.metadataCache,
-			nowMs: params.nowMs
-		});
+		inventory = await readInventory();
 		inputFingerprint = buildCodexPluginThreadConfigInputFingerprint({
 			pluginConfig: params.pluginConfig,
 			appCacheKey: params.appCacheKey
 		});
-	}
+	};
+	const activationRequired = inventory.records.some((record) => record.activationRequired);
+	const appInventoryMissing = shouldRefreshMissingAppInventory(params, policy, inventory);
+	const appInventoryRefreshDeferredForActivation = activationRequired && appInventoryMissing;
+	if (!activationRequired && appInventoryMissing) await refreshInventory({
+		forceRefetch: false,
+		reason: "initial_missing"
+	});
 	const activationDiagnostics = [];
 	const activationResults = [];
 	for (const record of inventory.records) {
@@ -304,50 +288,14 @@ async function buildCodexPluginThreadConfig(params) {
 	}
 	const postInstallRefreshRequired = activationResults.some((activation) => activation.ok && activation.installAttempted);
 	const deferredMissingRefreshRequired = appInventoryRefreshDeferredForActivation && !postInstallRefreshRequired && shouldRefreshMissingAppInventory(params, policy, inventory);
-	if (postInstallRefreshRequired || deferredMissingRefreshRequired) {
-		await refreshCodexPluginAppInventory(params, appCache, {
-			forceRefetch: true,
-			reason: postInstallRefreshRequired ? "post_install" : "deferred_missing",
-			targetAppIds: collectCodexPluginOwnedAppIds(inventory)
-		});
-		inventory = await readCodexPluginInventory({
-			pluginConfig: params.pluginConfig,
-			policy,
-			request: threadRequest,
-			appCache,
-			appCacheKey: params.appCacheKey,
-			appInventoryCacheKey: threadAppCacheKey,
-			configCwd: params.configCwd,
-			metadataCache: params.metadataCache,
-			nowMs: params.nowMs
-		});
-		inputFingerprint = buildCodexPluginThreadConfigInputFingerprint({
-			pluginConfig: params.pluginConfig,
-			appCacheKey: params.appCacheKey
-		});
-	}
-	if (shouldForceRefreshCodexNotReadyPluginApps(params, policy, inventory)) {
-		await refreshCodexPluginAppInventory(params, appCache, {
-			forceRefetch: true,
-			reason: "not_ready_plugin_apps",
-			targetAppIds: collectCodexPluginOwnedAppIds(inventory)
-		});
-		inventory = await readCodexPluginInventory({
-			pluginConfig: params.pluginConfig,
-			policy,
-			request: threadRequest,
-			appCache,
-			appCacheKey: params.appCacheKey,
-			appInventoryCacheKey: threadAppCacheKey,
-			configCwd: params.configCwd,
-			metadataCache: params.metadataCache,
-			nowMs: params.nowMs
-		});
-		inputFingerprint = buildCodexPluginThreadConfigInputFingerprint({
-			pluginConfig: params.pluginConfig,
-			appCacheKey: params.appCacheKey
-		});
-	}
+	if (postInstallRefreshRequired || deferredMissingRefreshRequired) await refreshInventory({
+		forceRefetch: true,
+		reason: postInstallRefreshRequired ? "post_install" : "deferred_missing"
+	});
+	if (shouldForceRefreshCodexNotReadyPluginApps(params, policy, inventory)) await refreshInventory({
+		forceRefetch: true,
+		reason: "not_ready_plugin_apps"
+	});
 	const accountAppsResult = policy.allowAllPlugins ? await readCodexThreadAdmissibleAccountApps(params, appCache) : {
 		apps: [],
 		installedApps: []
@@ -385,10 +333,7 @@ async function buildCodexPluginThreadConfig(params) {
 		if (activation?.ok === false || record.activationRequired && !activation?.ok) continue;
 		if (record.appOwnership !== "proven") continue;
 		pluginAppIds[record.policy.configKey] = [...record.ownedAppIds].toSorted();
-		for (const app of resolveCodexThreadConfigAppsForRecord({
-			record,
-			inventory
-		})) {
+		for (const app of inventory.appInventory?.state === "missing" ? [] : record.apps) {
 			const admissionConfig = resolveCodexPluginAppThreadAdmission(app, inventory) === "blocked" ? void 0 : await getAdmissionConfig();
 			if (!admissionConfig || resolveCodexExplicitAppEnablement(admissionConfig.layers, app.id) === false) {
 				diagnostics.push({
@@ -450,11 +395,10 @@ function mergeCodexThreadConfigs(...configs) {
 	let merged;
 	for (const config of configs) {
 		if (!config) continue;
-		merged = mergeJsonObjects(merged ?? {}, config);
+		merged = mergeJsonObjects(merged ?? {}, normalizeShellEnvironmentOverrides(config));
 	}
 	return merged && Object.keys(merged).length > 0 ? merged : void 0;
 }
-/** Detects when a stored thread binding no longer matches current plugin policy inputs. */
 function isCodexPluginThreadBindingStale(params) {
 	if (!params.codexPluginsEnabled) return Boolean(params.bindingFingerprint || params.bindingInputFingerprint || params.hasBindingPolicyContext);
 	if (!params.bindingFingerprint || !params.bindingInputFingerprint || !params.hasBindingPolicyContext) return true;
@@ -500,8 +444,10 @@ function buildEnabledAppConfig(policy, approvalOverrides = {}) {
 		enabled: true,
 		destructive_enabled: policy.allowDestructiveActions,
 		open_world_enabled: policy.allowOpenWorld !== false,
-		default_tools_approval_mode: "auto",
-		...policy.destructiveApprovalMode === "ask" ? { approvals_reviewer: "user" } : {}
+		...policy.destructiveApprovalMode === "ask" ? {
+			default_tools_approval_mode: "auto",
+			approvals_reviewer: "user"
+		} : {}
 	};
 }
 /** Rebuilds the safe per-thread apps patch persisted with a Codex thread binding. */
@@ -559,20 +505,9 @@ function buildPluginAppPolicyContext(apps, pluginAppIds) {
 		pluginAppIds
 	};
 }
-function shouldWaitForInitialAppInventory(params, policy, inventory) {
-	if (inventory.records.some((record) => record.activationRequired)) return false;
-	return shouldRefreshMissingAppInventory(params, policy, inventory);
-}
 function shouldRefreshMissingAppInventory(params, policy, inventory) {
 	return Boolean(params.appCacheKey && policy.pluginPolicies.some((plugin) => plugin.enabled) && inventory.appInventory?.state === "missing");
 }
-function emptyCodexPluginInventory(policy) {
-	return {
-		policy,
-		records: [],
-		diagnostics: []
-	};
-}
 function policyFingerprint(policy) {
 	return {
 		enabled: policy.enabled,
@@ -589,6 +524,17 @@ function policyFingerprint(policy) {
 		}))
 	};
 }
+function normalizeShellEnvironmentOverrides(config) {
+	let normalized = { ...config };
+	for (const [key, value] of Object.entries(config)) {
+		if (!key.startsWith("shell_environment_policy.")) continue;
+		delete normalized[key];
+		let patch = value;
+		for (const segment of key.split(".").toReversed()) patch = { [segment]: patch };
+		normalized = mergeJsonObjects(normalized, patch);
+	}
+	return normalized;
+}
 function mergeJsonObjects(left, right) {
 	const merged = {
 		...left,
@@ -601,12 +547,7 @@ function mergeJsonObjects(left, right) {
 	return merged;
 }
 function fingerprintJson(value) {
-	return crypto.createHash("sha256").update(stringifyCodexPluginPolicy(value)).digest("hex");
-}
-function stringifyCodexPluginPolicy(value) {
-	if (Array.isArray(value)) return `[${value.map((item) => stringifyCodexPluginPolicy(item)).join(",")}]`;
-	if (value && typeof value === "object") return `{${Object.entries(value).toSorted(([left], [right]) => left.localeCompare(right)).map(([key, item]) => `${JSON.stringify(key)}:${stringifyCodexPluginPolicy(item)}`).join(",")}}`;
-	return JSON.stringify(value);
+	return crypto.createHash("sha256").update(stringifyCodexPolicy(value)).digest("hex");
 }
 //#endregion
 //#region extensions/codex/src/app-server/dynamic-tool-profile.ts
@@ -621,8 +562,7 @@ const CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES = [
 	"update_plan",
 	"tool_call",
 	"tool_describe",
-	"tool_search",
-	"tool_search_code"
+	"tool_search"
 ];
 const CODEX_NATIVE_GOAL_TOOL_EXCLUDES = [
 	"get_goal",
@@ -641,7 +581,6 @@ const DYNAMIC_TOOL_NAME_ALIASES = {
 	bash: "exec",
 	"apply-patch": "apply_patch"
 };
-/** Normalizes OpenClaw/Codex tool names before filtering and allowlist checks. */
 function normalizeCodexDynamicToolName(name) {
 	const normalized = name.trim().toLowerCase();
 	return DYNAMIC_TOOL_NAME_ALIASES[normalized] ?? normalized;
@@ -654,36 +593,20 @@ function isSystemAgentOnlyCodexDynamicToolAllowlist(toolsAllow) {
 function isMessageOnlyCodexSourceReply(params) {
 	return params.sourceReplyDeliveryMode === "message_tool_only" && params.toolsAllow?.length === 1 && normalizeCodexDynamicToolName(params.toolsAllow[0] ?? "") === "message";
 }
-/** Returns true for private QA runs that force the Codex runtime profile. */
 function isForcedPrivateQaCodexRuntime(env = process.env) {
 	return env.OPENCLAW_BUILD_PRIVATE_QA === "1" && env.OPENCLAW_QA_FORCE_RUNTIME?.trim().toLowerCase() === "codex";
 }
-/** Resolves whether dynamic tools load directly or through Codex tool search. */
 function resolveCodexDynamicToolsLoading(config, env = process.env) {
 	return isForcedPrivateQaCodexRuntime(env) ? "direct" : config.codexDynamicToolsLoading ?? "searchable";
 }
-function normalizeCodexModelId(modelId) {
-	const normalized = modelId?.trim().toLowerCase();
-	if (!normalized) return "";
-	return normalized.includes("/") ? normalized.split("/").at(-1) : normalized;
-}
-/** Returns true when model behavior requires direct dynamic-tool registration. */
-function shouldUseDirectCodexDynamicToolsForModel(modelId) {
-	return shouldDisableCodexToolSearchForModel(modelId);
-}
 /** Returns true for models whose tool-search path is unsupported or inefficient. */
 function shouldDisableCodexToolSearchForModel(modelId) {
-	return normalizeCodexModelId(modelId) === "gpt-5.4-nano";
-}
-/** Resolves dynamic-tool loading after applying model-specific restrictions. */
-function resolveCodexDynamicToolsLoadingForModel(config, modelId, env = process.env) {
-	const loading = resolveCodexDynamicToolsLoading(config, env);
-	return loading === "searchable" && shouldUseDirectCodexDynamicToolsForModel(modelId) ? "direct" : loading;
+	return modelId?.trim().toLowerCase().split("/").at(-1) === "gpt-5.4-nano";
 }
 /** Resolves dynamic-tool loading for the app-server connection that will execute the turn. */
 function resolveCodexDynamicToolsLoadingForRuntime(config, modelId, options = {}, env = process.env) {
-	const loading = resolveCodexDynamicToolsLoadingForModel(config, modelId, env);
-	return loading === "searchable" && options.connectionClass === "remote" ? "direct" : loading;
+	const loading = resolveCodexDynamicToolsLoading(config, env);
+	return loading === "searchable" && (shouldDisableCodexToolSearchForModel(modelId) || options.connectionClass === "remote") ? "direct" : loading;
 }
 /** Filters OpenClaw tools that Codex owns natively or config explicitly excludes. */
 function filterCodexDynamicTools(tools, config, env = process.env) {
@@ -767,15 +690,12 @@ function shouldRecheckRecoverablePluginBinding(params) {
 //#endregion
 //#region extensions/codex/src/app-server/thread-fingerprints.ts
 function codexDynamicToolsFingerprint(dynamicTools) {
-	return hashCodexAppServerBindingFingerprint(legacyFingerprintDynamicTools(dynamicTools));
-}
-function codexLegacyDynamicToolsFingerprint(dynamicTools) {
-	return legacyFingerprintDynamicTools(dynamicTools);
+	return hashCodexAppServerBindingFingerprint(codexLegacyDynamicToolsFingerprint(dynamicTools));
 }
 function areCodexDynamicToolFingerprintsCompatible(params) {
-	return areDynamicToolFingerprintsCompatible(params.previous, params.next, params.nextLegacy);
+	return !params.previous || params.previous === params.next || params.previous === params.nextLegacy;
 }
-function legacyFingerprintDynamicTools(dynamicTools) {
+function codexLegacyDynamicToolsFingerprint(dynamicTools) {
 	return JSON.stringify(dynamicTools.map(stabilizeJsonValue).toSorted(compareJsonFingerprint));
 }
 function legacyFingerprintUserMcpServersConfigPatch(configPatch) {
@@ -827,11 +747,8 @@ function readActiveCodexTurnIdsFromResume(response) {
 	const pagedTurns = response.initialTurnsPage?.data;
 	return readActiveCodexTurnIds(Array.isArray(pagedTurns) ? { turns: pagedTurns } : response.thread);
 }
-const LEGACY_EMPTY_DYNAMIC_TOOLS_FINGERPRINT = legacyFingerprintDynamicTools([]);
+const LEGACY_EMPTY_DYNAMIC_TOOLS_FINGERPRINT = codexLegacyDynamicToolsFingerprint([]);
 const EMPTY_DYNAMIC_TOOLS_FINGERPRINT = hashCodexAppServerBindingFingerprint(LEGACY_EMPTY_DYNAMIC_TOOLS_FINGERPRINT);
-function areDynamicToolFingerprintsCompatible(previous, next, nextLegacy) {
-	return !previous || previous === next || previous === nextLegacy;
-}
 function areUserMcpServersFingerprintsCompatible(params) {
 	return params.previous === params.next || params.previous === params.nextLegacy || params.nextLegacy !== void 0 && params.previous === hashCodexAppServerBindingFingerprint(params.nextLegacy);
 }
@@ -939,38 +856,27 @@ async function collectPersonalSkillRealPaths(homes, codexHome) {
 				}
 				if (entry.name.startsWith(".")) continue;
 				const entryPath = path.join(current.dir, entry.name);
-				if (entry.name === "SKILL.md" && entry.isFile()) {
-					await recordSkillFile(entryPath, current.onlyEscapedStateTargets);
+				let isFile = entry.isFile();
+				let isDirectory = entry.isDirectory();
+				if (entry.isSymbolicLink()) try {
+					const stat = await fs.stat(entryPath);
+					isFile = stat.isFile();
+					isDirectory = stat.isDirectory();
+				} catch (error) {
+					if (!isMissingPathError(error)) complete = false;
 					continue;
 				}
-				if (entry.isSymbolicLink()) {
-					try {
-						const stat = await fs.stat(entryPath);
-						if (entry.name === "SKILL.md" && stat.isFile()) await recordSkillFile(entryPath, current.onlyEscapedStateTargets);
-						else if (stat.isDirectory()) {
-							if (current.depth < MAX_PERSONAL_SKILL_DEPTH) queue.push({
-								dir: entryPath,
-								depth: current.depth + 1,
-								onlyEscapedStateTargets: current.onlyEscapedStateTargets
-							});
-							else complete = false;
-						}
-					} catch (error) {
-						if (!isMissingPathError(error)) complete = false;
-					}
-					continue;
-				}
-				if (current.depth >= MAX_PERSONAL_SKILL_DEPTH) {
-					if (entry.isDirectory()) complete = false;
+				if (entry.name === "SKILL.md" && isFile) {
+					await recordSkillFile(entryPath, current.onlyEscapedStateTargets);
 					continue;
 				}
-				if (entry.isDirectory()) {
-					queue.push({
+				if (isDirectory) {
+					if (current.depth >= MAX_PERSONAL_SKILL_DEPTH) complete = false;
+					else queue.push({
 						dir: entryPath,
 						depth: current.depth + 1,
 						onlyEscapedStateTargets: current.onlyEscapedStateTargets
 					});
-					continue;
 				}
 			}
 		} catch (error) {
@@ -1225,11 +1131,6 @@ async function discardUnattestedCodexPluginThread(params) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/native-hook-relay.ts
-/**
-* Bridges Codex native hook callbacks into OpenClaw's native hook relay so
-* app-server tool events can still run OpenClaw policy and diagnostics.
-*/
-/** Codex hook events that can be registered through OpenClaw's native relay. */
 const CODEX_NATIVE_HOOK_RELAY_EVENTS = [
 	"pre_tool_use",
 	"post_tool_use",
@@ -1298,7 +1199,6 @@ function scheduleCodexNativeHookRelayUnregister(params) {
 	nativeHookRelayUnregisterQueue.add(pending);
 	timeout.unref();
 }
-/** Computes the delayed unregister window from Codex's hook timeout. */
 function resolveCodexNativeHookRelayUnregisterGraceMs(hookTimeoutSec) {
 	const hookTimeoutMs = finiteSecondsToTimerSafeMilliseconds(normalizeHookTimeoutSec(hookTimeoutSec)) ?? 0;
 	return Math.max(CODEX_NATIVE_HOOK_RELAY_UNREGISTER_GRACE_MS, addTimerTimeoutGraceMs(hookTimeoutMs, CODEX_NATIVE_HOOK_RELAY_UNREGISTER_EXTRA_GRACE_MS) ?? 0);
@@ -1319,9 +1219,9 @@ function emitCodexNativePreToolUseFailureDiagnostic(params) {
 		...params.sourceTimestampMs !== void 0 ? { sourceTimestampMs: params.sourceTimestampMs } : {}
 	});
 }
-/** Registers an OpenClaw native hook relay for a Codex app-server turn. */
 function createCodexNativeHookRelay(params) {
 	if (params.options?.enabled === false) return;
+	const modelInputTools = params.nativeModelAdmission?.tools ?? ["multi_agent_v1send_input"];
 	const directChildClaims = /* @__PURE__ */ new Map();
 	const pendingDirectChildAdmissions = /* @__PURE__ */ new Map();
 	let foregroundClosed = false;
@@ -1362,10 +1262,33 @@ function createCodexNativeHookRelay(params) {
 		}),
 		signal: params.signal,
 		runBeforeToolCall: params.hostCapabilities.runBeforeToolCall,
-		executionAdmission: params.nativeProcessAuthority ? {
-			toolNames: ["exec"],
-			admit: (invocation, assertAdmissionCurrent) => {
+		executionAdmission: params.nativeProcessAuthority || params.nativeModelAdmission ? {
+			toolNames: [...params.nativeProcessAuthority ? ["exec"] : [], ...params.nativeModelAdmission ? modelInputTools : []],
+			admit: async (invocation, assertAdmissionCurrent, preparation) => {
 				const payload = invocation.rawPayload;
+				if (params.nativeModelAdmission && invocation.toolName && modelInputTools.includes(invocation.toolName)) {
+					const admission = params.nativeModelAdmission;
+					const input = isJsonObject(payload) ? payload.tool_input : void 0;
+					const targetThreadId = isJsonObject(input) && typeof input.target === "string" ? input.target.trim() : void 0;
+					const threadId = readCodexNativeChildThreadId(payload) ?? admission.threadId();
+					if (!threadId || !targetThreadId || !invocation.turnId || !invocation.toolUseId) throw new Error("Codex native input requires exact sender, receiver, turn, and tool identities");
+					assertAdmissionCurrent();
+					const request = {
+						client: admission.client(),
+						threadId,
+						turnId: invocation.turnId,
+						itemId: invocation.toolUseId
+					};
+					await codexNativeSubagentMonitorRuntime.prepareModelInput({
+						...request,
+						target: targetThreadId,
+						readQualification: admission.readQualification,
+						signal: preparation.signal,
+						assertCurrent: preparation.assertCurrent
+					});
+					assertAdmissionCurrent();
+					return;
+				}
 				const rootThreadId = isJsonObject(payload) && typeof payload.session_id === "string" ? payload.session_id.trim() : void 0;
 				const childThreadId = readCodexNativeChildThreadId(payload);
 				const threadId = childThreadId ?? rootThreadId;
@@ -1478,18 +1401,15 @@ function readCodexNativeChildThreadId(rawPayload) {
 	if (!isJsonObject(rawPayload) || typeof rawPayload.agent_id !== "string") return;
 	return rawPayload.agent_id.trim() || void 0;
 }
-/** Selects the native hook events Codex should install for the current approval mode. */
 function resolveCodexNativeHookRelayEvents(params) {
 	if (params.configuredEvents?.length) return params.configuredEvents;
 	return params.appServer.approvalPolicy === "never" ? CODEX_NATIVE_HOOK_RELAY_EVENTS : CODEX_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS;
 }
-/** Derives the native hook relay TTL from the turn budget unless explicitly configured. */
 function resolveCodexNativeHookRelayTtlMs(params) {
 	if (params.explicitTtlMs !== void 0) return params.explicitTtlMs;
 	const relayBudgetMs = params.attemptTimeoutMs + params.startupTimeoutMs + params.turnStartTimeoutMs + CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS;
 	return Math.max(CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS, Math.floor(relayBudgetMs));
 }
-/** Builds a stable relay id scoped to the agent and session identity. */
 function buildCodexNativeHookRelayId(params) {
 	const hash = createHash("sha256");
 	hash.update("openclaw:codex:native-hook-relay:v1");
@@ -1512,7 +1432,6 @@ const CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT = {
 	before_agent_finalize: "stop"
 };
 const CODEX_SESSION_FLAGS_HOOK_SOURCE_PATHS = ["/<session-flags>/config.toml", "<session-flags>/config.toml"];
-/** Builds the Codex config overlay that installs trusted command hooks for relay events. */
 function buildCodexNativeHookRelayConfig(params) {
 	const events = params.events?.length ? params.events : CODEX_NATIVE_HOOK_RELAY_EVENTS;
 	const selectedEvents = new Set(events);
@@ -1530,7 +1449,7 @@ function buildCodexNativeHookRelayConfig(params) {
 		const timeout = normalizeHookTimeoutSec(params.hookTimeoutSec);
 		const command = params.relay.commandForEvent(event, { timeoutMs: resolveCodexNativeHookRelayCommandTimeoutMs(timeout) });
 		const matcher = buildCodexNativeToolMatcher(params.relay.toolMatcherForEvent(event));
-		config[`hooks.${codexEvent}`] = [{
+		const group = {
 			...matcher ? { matcher } : {},
 			hooks: [{
 				type: "command",
@@ -1539,23 +1458,20 @@ function buildCodexNativeHookRelayConfig(params) {
 				async: false,
 				statusMessage: "OpenClaw native hook relay"
 			}]
-		}];
+		};
+		config[`hooks.${codexEvent}`] = [group];
 		const state = {
 			enabled: true,
-			trusted_hash: codexCommandHookTrustedHash({
-				event,
-				command,
-				matcher,
-				timeout,
-				statusMessage: "OpenClaw native hook relay"
-			})
+			trusted_hash: `sha256:${createHash("sha256").update(stringifyCodexPolicy({
+				event_name: CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT[event],
+				...group
+			})).digest("hex")}`
 		};
 		for (const sourcePath of CODEX_SESSION_FLAGS_HOOK_SOURCE_PATHS) hookState[`${sourcePath}:${CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT[event]}:0:0`] = state;
 	}
 	config["hooks.state"] = hookState;
 	return config;
 }
-/** Builds a Codex config overlay that disables native hooks and clears hook arrays. */
 function buildCodexNativeHookRelayDisabledConfig() {
 	return {
 		"features.hooks": false,
@@ -1589,27 +1505,6 @@ function buildCodexNativeToolMatcher(toolNames) {
 	if (!hasCustomToolName && sortedNames.every((toolName) => /^[A-Za-z0-9_]+$/.test(toolName))) return sortedNames.join("|");
 	return `(?i)^(?:${sortedNames.map((toolName) => toolName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|")})$`;
 }
-function codexCommandHookTrustedHash(params) {
-	const identity = {
-		event_name: CODEX_HOOK_KEY_LABEL_BY_NATIVE_EVENT[params.event],
-		...params.matcher ? { matcher: params.matcher } : {},
-		hooks: [{
-			async: false,
-			command: params.command,
-			statusMessage: params.statusMessage,
-			timeout: params.timeout,
-			type: "command"
-		}]
-	};
-	return `sha256:${createHash("sha256").update(JSON.stringify(sortJsonValue(identity))).digest("hex")}`;
-}
-function sortJsonValue(value) {
-	if (!value || typeof value !== "object") return value;
-	if (Array.isArray(value)) return value.map(sortJsonValue);
-	const sorted = {};
-	for (const [key, entry] of Object.entries(value).toSorted(([left], [right]) => left.localeCompare(right))) sorted[key] = sortJsonValue(entry);
-	return sorted;
-}
 //#endregion
 //#region extensions/codex/src/app-server/project-doc-thread-config.ts
 const CODEX_NATIVE_PROJECT_DOC_MAX_BYTES = 131072;
@@ -1628,6 +1523,11 @@ function mergeCodexNativeProjectDocThreadConfig(config, effectiveNativeConfig) {
 	return authoredMaxBytes === void 0 ? config : mergeCodexThreadConfigs({ project_doc_max_bytes: authoredMaxBytes }, config);
 }
 //#endregion
+//#region extensions/codex/src/app-server/developer-instruction-sections.ts
+function joinPresentSections(...sections) {
+	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
+}
+//#endregion
 //#region extensions/codex/src/app-server/thread-model-selection.ts
 const CODEX_NATIVE_PERSONALITY_NONE = "none";
 function resolveCodexBindingModelProviderFallback(params) {
@@ -1639,13 +1539,10 @@ function resolveCodexBindingModelProviderFallback(params) {
 	return hasProviderQualifiedModelRef(currentModel) ? void 0 : params.bindingModelProvider;
 }
 function resolveCodexAppServerThreadModelSelection(params) {
-	const authProfileId = params.authProfileId ?? params.binding?.authProfileId;
+	const authProfileId = params.inheritBindingAuthProfile === false ? params.authProfileId : params.authProfileId ?? params.binding?.authProfileId;
 	const explicitModelProvider = resolveCodexAppServerModelProvider({
-		provider: params.provider,
-		authProfileId,
-		authProfileStore: params.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.config
+		...params,
+		authProfileId
 	});
 	const bindingModelProvider = params.binding?.threadId ? resolveCodexBindingModelProviderFallback({
 		provider: params.provider,
@@ -1654,12 +1551,10 @@ function resolveCodexAppServerThreadModelSelection(params) {
 		bindingModelProvider: params.binding.modelProvider
 	}) : void 0;
 	return resolveCodexAppServerRequestModelSelection({
-		model: params.model,
+		...params,
+		model: params.requestModel ?? params.model,
 		modelProvider: explicitModelProvider ?? bindingModelProvider,
-		authProfileId,
-		authProfileStore: params.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.config
+		authProfileId
 	});
 }
 function resolveCodexAppServerRequestModelSelection(params) {
@@ -1671,12 +1566,10 @@ function resolveCodexAppServerRequestModelSelection(params) {
 	};
 	const slashIndex = model.indexOf("/");
 	if (slashIndex <= 0 || slashIndex >= model.length - 1) return { model };
+	const inferredProvider = model.slice(0, slashIndex);
 	const inferredModelProvider = resolveCodexAppServerModelProvider({
-		provider: model.slice(0, slashIndex),
-		authProfileId: params.authProfileId,
-		authProfileStore: params.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.config
+		...params,
+		provider: inferredProvider
 	});
 	return {
 		model: model.slice(slashIndex + 1).trim(),
@@ -1691,8 +1584,9 @@ function hasProviderQualifiedModelRef(model) {
 function resolveCodexAppServerModelProvider(params) {
 	const normalized = params.provider.trim();
 	const normalizedLower = normalized.toLowerCase();
+	if (normalizedLower === "openai" && params.authProfileId && isCodexResponsesOAuthCredential(params.authProfileStore?.profiles[params.authProfileId])) return CODEX_RESPONSES_OAUTH_PROVIDER;
 	if (!normalized || normalizedLower === "codex") return;
-	if (isCodexAppServerNativeAuthProfile(params) && normalizedLower === "openai") return;
+	if (normalizedLower === "openai" && (params.homeScope === "user" || isCodexAppServerNativeAuthProfile(params))) return;
 	return normalizedLower === "openai" ? "openai" : normalized;
 }
 //#endregion
@@ -1738,8 +1632,8 @@ function buildDeveloperInstructions(params, options = {}) {
 		surface: "codex_app_server",
 		includeLegacyGlobalGuidance: false
 	}).join("\n");
-	const delegationGuidanceAvailable = params.disableTools !== true && params.delegationCapability !== "report_only" && !isMessageOnlyCodexSourceReply(params);
-	const nativeDelegationAvailable = delegationGuidanceAvailable && !isSystemAgentOnlyCodexDynamicToolAllowlist(params.toolsAllow) && !shouldDisableCodexToolSearchForModel(params.modelId);
+	const delegationGuidanceAvailable = params.disableTools !== true && params.toolsAllow?.length !== 0 && params.delegationCapability !== "report_only" && !isMessageOnlyCodexSourceReply(params);
+	const nativeDelegationAvailable = delegationGuidanceAvailable && !isCodexResponsesOAuthRun(params) && !isSystemAgentOnlyCodexDynamicToolAllowlist(params.toolsAllow) && !shouldDisableCodexToolSearchForModel(params.modelId);
 	const deferredToolDiscoveryGuidance = deferredToolNames.size > 0 || nativeDelegationAvailable ? "Deferred tools may be absent from the direct tool list. Use `tool_search` when directly callable. On code-mode-only models, use `exec` instead: filter `ALL_TOOLS` by name and description, then call the matching entry through `tools`." : void 0;
 	return [
 		"You are a personal agent running inside OpenClaw. OpenClaw has dynamic tools for OpenClaw-owned messaging, cron, sessions, media, gateway, and nodes.",
@@ -1776,18 +1670,33 @@ function buildDeveloperInstructions(params, options = {}) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/thread-shell-environment.ts
+/** Retain native policy beneath request overrides before applying host-owned values. */
+function mergeCodexNativeShellEnvironment(config, nativePolicy) {
+	return isJsonObject(nativePolicy) ? mergeCodexThreadConfigs({ shell_environment_policy: Object.fromEntries(Object.entries(nativePolicy).filter(([, value]) => value !== null)) }, config) : config;
+}
 /** Applies host-selected values and any required login-shell restriction last. */
-function applyCodexManagedShellEnvironment(config, environment, disableLoginShell = false) {
+function applyCodexManagedShellEnvironment(config, environment, disableLoginShell = false, pathPrepend) {
 	if (!environment || Object.keys(environment).length === 0) return disableLoginShell ? {
 		...config,
 		allow_login_shell: false
 	} : config;
 	const current = isJsonObject(config.shell_environment_policy) ? config.shell_environment_policy : {};
 	const currentSet = isJsonObject(current.set) ? current.set : {};
-	const names = Object.keys(environment).toSorted();
+	const managedEnvironment = { ...environment };
+	if (pathPrepend?.length) for (const key of Object.keys(environment)) {
+		if (key.toUpperCase() !== "PATH") continue;
+		const aliases = Object.keys(currentSet).filter((name) => name === key || process.platform === "win32" && name.toUpperCase() === "PATH");
+		const authoredKey = aliases.includes(key) ? key : aliases[0];
+		if (authoredKey !== void 0 && typeof currentSet[authoredKey] === "string") {
+			const merged = normalizeUniqueStringEntries([...pathPrepend, ...currentSet[authoredKey].split(path.delimiter)]).join(path.delimiter);
+			for (const name of [key, ...aliases]) managedEnvironment[name] = merged;
+		}
+	}
+	const names = Object.keys(managedEnvironment).toSorted();
 	const includeOnly = Array.isArray(current.include_only) ? current.include_only.filter((entry) => typeof entry === "string") : [];
 	const filters = isJsonObject(current.filters) ? current.filters : void 0;
 	const hasIncludeFilter = filters && Object.values(filters).includes("include");
+	const managedFilterNames = new Set(names.map((name) => name.toLowerCase()));
 	const managedConfig = {
 		...config,
 		shell_environment_policy: {
@@ -1795,11 +1704,11 @@ function applyCodexManagedShellEnvironment(config, environment, disableLoginShel
 			experimental_use_profile: false,
 			set: {
 				...currentSet,
-				...environment
+				...managedEnvironment
 			},
 			...filters ? hasIncludeFilter ? { filters: {
-				...filters,
-				...Object.fromEntries(names.map((name) => [name, "include"]))
+				...Object.fromEntries(Object.entries(filters).filter(([name]) => !managedFilterNames.has(name.toLowerCase()))),
+				...Object.fromEntries([...managedFilterNames].map((name) => [name, "include"]))
 			} } : {} : includeOnly.length > 0 ? { include_only: [.../* @__PURE__ */ new Set([...includeOnly, ...names])] } : {}
 		}
 	};
@@ -1814,16 +1723,11 @@ const CODEX_NATIVE_WEB_SEARCH_DISABLED_CONFIG = {
 	"features.standalone_web_search": false,
 	web_search: "disabled"
 };
-function normalizeUniqueStrings(value) {
-	if (!Array.isArray(value)) return;
-	const normalized = [...new Set(value.map(normalizeOptionalString).filter((entry) => Boolean(entry)))];
-	return normalized.length > 0 ? normalized : void 0;
-}
 function hasManagedSearchProvider(config) {
 	return normalizeOptionalString(config?.tools?.web?.search?.provider) !== void 0;
 }
 function hasNativeDomainRestrictions(config) {
-	return normalizeUniqueStrings(config?.tools?.web?.search?.openaiCodex?.allowedDomains) !== void 0;
+	return normalizeUniqueTrimmedStringList(config?.tools?.web?.search?.openaiCodex?.allowedDomains).length > 0;
 }
 function buildCodexNativeWebSearchThreadConfig(config) {
 	const nativeConfig = config?.tools?.web?.search?.openaiCodex;
@@ -1831,18 +1735,18 @@ function buildCodexNativeWebSearchThreadConfig(config) {
 		"features.standalone_web_search": false,
 		web_search: nativeConfig?.mode === "live" ? "live" : "cached"
 	};
-	const allowedDomains = normalizeUniqueStrings(nativeConfig?.allowedDomains);
-	if (allowedDomains) threadConfig["tools.web_search.allowed_domains"] = allowedDomains;
+	const allowedDomains = normalizeUniqueTrimmedStringList(nativeConfig?.allowedDomains);
+	if (allowedDomains.length > 0) threadConfig["tools.web_search.allowed_domains"] = allowedDomains;
 	if (nativeConfig?.contextSize) threadConfig["tools.web_search.context_size"] = nativeConfig.contextSize;
-	const location = nativeConfig?.userLocation;
-	const country = normalizeOptionalString(location?.country);
-	const region = normalizeOptionalString(location?.region);
-	const city = normalizeOptionalString(location?.city);
-	const timezone = normalizeOptionalString(location?.timezone);
-	if (country) threadConfig["tools.web_search.location.country"] = country;
-	if (region) threadConfig["tools.web_search.location.region"] = region;
-	if (city) threadConfig["tools.web_search.location.city"] = city;
-	if (timezone) threadConfig["tools.web_search.location.timezone"] = timezone;
+	for (const key of [
+		"country",
+		"region",
+		"city",
+		"timezone"
+	]) {
+		const value = normalizeOptionalString(nativeConfig?.userLocation?.[key]);
+		if (value) threadConfig[`tools.web_search.location.${key}`] = value;
+	}
 	return threadConfig;
 }
 function resolveCodexWebSearchPlan(params) {
@@ -1966,35 +1870,22 @@ function buildCodexThreadConfiguration(params, options) {
 		...codexThreadSandboxOrPermissions(options.appServer),
 		...options.appServer.serviceTier !== void 0 ? { serviceTier: options.appServer.serviceTier } : {},
 		config: buildCodexRuntimeThreadConfigForRun(params, options.config, {
-			nativeCodeModeEnabled: options.nativeCodeModeEnabled,
-			nativeProviderWebSearchSupport: options.nativeProviderWebSearchSupport,
-			nativeCodeModeOnlyEnabled: options.nativeCodeModeOnlyEnabled,
-			directOnlyToolNamespaces: resolveDirectOnlyToolNamespaces(options.dynamicTools),
-			webSearchAllowed: options.webSearchAllowed,
-			appServer: options.appServer,
-			hostSystemAgentActive: options.hostSystemAgentActive,
-			restrictedToolSurfaceInheritedMcpServerNames: options.restrictedToolSurfaceInheritedMcpServerNames,
-			shellEnvironment: options.shellEnvironment,
-			disableLoginShell: options.disableLoginShell
+			...options,
+			directOnlyToolNamespaces: resolveDirectOnlyToolNamespaces(options.dynamicTools)
 		}),
-		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params, { dynamicTools: options.dynamicTools })
+		developerInstructions: joinPresentSections(options.developerInstructions ?? buildDeveloperInstructions(params, { dynamicTools: options.dynamicTools }), options.skillsInstructions)
 	};
 }
 function buildThreadStartParams(params, options) {
 	const resolvedModelProvider = resolveCodexAppServerModelProvider({
-		provider: params.provider,
-		authProfileId: params.authProfileId,
-		authProfileStore: params.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.config
+		...params,
+		homeScope: options.appServer.start.homeScope
 	});
 	const modelSelection = resolveCodexAppServerRequestModelSelection({
+		...params,
+		homeScope: options.appServer.start.homeScope,
 		model: options.model ?? params.modelId,
-		modelProvider: options.modelProvider ?? resolvedModelProvider,
-		authProfileId: params.authProfileId,
-		authProfileStore: params.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.config
+		modelProvider: options.modelProvider ?? resolvedModelProvider
 	});
 	return {
 		model: modelSelection.model,
@@ -2012,18 +1903,15 @@ function buildThreadStartParams(params, options) {
 }
 function buildThreadResumeParams(params, options) {
 	const modelSelection = options.preserveNativeModel ? void 0 : resolveCodexAppServerRequestModelSelection({
+		...params,
+		homeScope: options.appServer.start.homeScope,
 		model: options.model ?? params.modelId,
 		modelProvider: options.modelProvider ?? resolveCodexAppServerModelProvider({
-			provider: params.provider,
-			authProfileId: options.authProfileId ?? params.authProfileId,
-			authProfileStore: params.authProfileStore,
-			agentDir: params.agentDir,
-			config: params.config
+			...params,
+			homeScope: options.appServer.start.homeScope,
+			authProfileId: options.authProfileId ?? params.authProfileId
 		}),
-		authProfileId: options.authProfileId ?? params.authProfileId,
-		authProfileStore: params.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.config
+		authProfileId: options.authProfileId ?? params.authProfileId
 	});
 	return {
 		threadId: options.threadId,
@@ -2052,8 +1940,7 @@ function buildCodexRuntimeThreadConfig(config, options = {}) {
 		delete disabledConfig["features.apply_patch_streaming_events"];
 		return disabledConfig;
 	}
-	if (options.nativeCodeModeOnlyEnabled === true) return ensureDirectOnlyToolNamespaces(expectDefined(mergeCodexThreadConfigs(codeModeConfig, configured, CODEX_GOAL_CONTINUATION_DISABLED_THREAD_CONFIG, CODEX_NATIVE_UPDATE_PLAN_DISABLED_THREAD_CONFIG, { "features.code_mode_only": true }), "Codex code mode only config"), options.directOnlyToolNamespaces);
-	return ensureDirectOnlyToolNamespaces(expectDefined(mergeCodexThreadConfigs(codeModeConfig, configured, CODEX_GOAL_CONTINUATION_DISABLED_THREAD_CONFIG, CODEX_NATIVE_UPDATE_PLAN_DISABLED_THREAD_CONFIG), "Codex code mode config"), options.directOnlyToolNamespaces);
+	return ensureDirectOnlyToolNamespaces(expectDefined(mergeCodexThreadConfigs(codeModeConfig, configured, CODEX_GOAL_CONTINUATION_DISABLED_THREAD_CONFIG, CODEX_NATIVE_UPDATE_PLAN_DISABLED_THREAD_CONFIG, options.nativeCodeModeOnlyEnabled === true ? { "features.code_mode_only": true } : void 0), options.nativeCodeModeOnlyEnabled === true ? "Codex code mode only config" : "Codex code mode config"), options.directOnlyToolNamespaces);
 }
 function ensureDirectOnlyToolNamespaces(config, requiredNamespaces) {
 	if (!requiredNamespaces?.length) return config;
@@ -2082,15 +1969,25 @@ function buildCodexRuntimeThreadConfigForRun(params, config, options = {}) {
 	const webSearchConfig = resolveCodexWebSearchPlan({
 		config: params.config,
 		disableTools: params.disableTools,
-		nativeToolSurfaceEnabled: options.nativeCodeModeEnabled,
+		nativeToolSurfaceEnabled: isCodexResponsesOAuthRun(params) || options.nativeCodeModeEnabled,
 		nativeProviderWebSearchSupport: options.nativeProviderWebSearchSupport,
 		webSearchAllowed: options.webSearchAllowed
 	}).threadConfig;
 	const baseConfig = buildCodexRuntimeThreadConfig(mergeCodexThreadConfigs(config, webSearchConfig), options);
 	return applyCodexManagedShellEnvironment({
-		...mergeCodexThreadConfigs(baseConfig, options.appServer?.networkProxy?.configPatch, params.pluginHarnessToolPolicySafeDeniedTools?.includes("image_generate") ? { "features.image_generation": false } : void 0, shouldDisableCodexToolSearchForModel(params.modelId) ? CODEX_TOOL_SEARCH_UNSUPPORTED_THREAD_CONFIG : void 0, params.delegationCapability === "report_only" ? CODEX_DELEGATION_DISABLED_THREAD_CONFIG : void 0, messageOnlySourceReply || params.pluginHarnessToolPolicyRestricted === true ? buildRestrictedToolConfigPatch(restrictedToolSurfaceMcpServerNames, Boolean(params.scheduledRuntimeAuthority)) : buildCodexRingZeroThreadConfigPatch(params, options.hostSystemAgentActive, restrictedToolSurfaceMcpServerNames), restrictedTurnDisablesProjectDocs ? CODEX_NO_PROJECT_DOCS_CONFIG : void 0, params.authoredContextTokenCap === void 0 ? void 0 : { model_context_window: params.authoredContextTokenCap }) ?? baseConfig,
+		...mergeCodexThreadConfigs(baseConfig, options.appServer?.networkProxy?.configPatch, isCodexResponsesOAuthRun(params) ? {
+			...CODEX_DELEGATION_DISABLED_THREAD_CONFIG,
+			"features.apps": false,
+			"features.plugins": false,
+			"features.image_generation": false,
+			"features.memories": false,
+			"features.skill_search": false,
+			"orchestrator.skills.enabled": false,
+			"orchestrator.mcp.enabled": false,
+			"skills.bundled.enabled": false
+		} : void 0, params.pluginHarnessToolPolicySafeDeniedTools?.includes("image_generate") ? { "features.image_generation": false } : void 0, shouldDisableCodexToolSearchForModel(params.modelId) ? CODEX_TOOL_SEARCH_UNSUPPORTED_THREAD_CONFIG : void 0, params.delegationCapability === "report_only" ? CODEX_DELEGATION_DISABLED_THREAD_CONFIG : void 0, messageOnlySourceReply || params.pluginHarnessToolPolicyRestricted === true ? buildRestrictedToolConfigPatch(restrictedToolSurfaceMcpServerNames, Boolean(params.scheduledRuntimeAuthority) && !isCodexResponsesOAuthRun(params)) : buildCodexRingZeroThreadConfigPatch(params, options.hostSystemAgentActive, restrictedToolSurfaceMcpServerNames), restrictedTurnDisablesProjectDocs ? CODEX_NO_PROJECT_DOCS_CONFIG : void 0, params.authoredContextTokenCap === void 0 ? void 0 : { model_context_window: params.authoredContextTokenCap }) ?? baseConfig,
 		...params.bootstrapContextMode === "lightweight" ? CODEX_NO_PROJECT_DOCS_CONFIG : {}
-	}, options.shellEnvironment, options.disableLoginShell);
+	}, options.shellEnvironment, options.disableLoginShell, options.shellPathPrepend);
 }
 function buildCodexRingZeroThreadConfigPatch(params, hostSystemAgentActive = isHostScopedAgentToolActive("openclaw"), inheritedMcpServerNames = []) {
 	if (!hostSystemAgentActive || !isSystemAgentOnlyCodexDynamicToolAllowlist(params.toolsAllow)) return;
@@ -2202,4 +2099,4 @@ function resolveCodexThreadEnvironmentSelection(options) {
 	return {};
 }
 //#endregion
-export { readActiveCodexTurnIdsFromResume as $, emitCodexNativePreToolUseFailureDiagnostic as A, parseCodexNativeToolCatalog as B, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as C, shouldBuildCodexPluginThreadConfig as Ct, buildCodexNativeHookRelayDisabledConfig as D, buildCodexNativeHookRelayConfig as E, checkCodexThreadAppAvailability as F, areUserMcpServersFingerprintsCompatible as G, resolveCodexNativeSkillIsolation as H, discardUnattestedCodexPluginThread as I, fingerprintCodexThreadConfig as J, codexDynamicToolsFingerprint as K, attestCodexRestrictedToolSurfaceMcpServersDisabled as L, resolveCodexNativeHookRelayTtlMs as M, scheduleCodexNativeHookRelayUnregister as N, buildCodexNativeHookRelayId as O, attestCodexThreadToolSurface as P, legacyFingerprintUserMcpServersConfigPatch as Q, hasCodexNativeToolCatalog as R, CODEX_NATIVE_HOOK_RELAY_EVENTS as S, refreshCodexPluginAppApprovalPolicy as St, assertCodexNativeHookRelayAllowed as T, buildCodexAppApprovalOverrides as Tt, areCodexDynamicToolFingerprintsCompatible as U, applyCodexNativeSkillIsolation as V, areDynamicToolFingerprintsCompatible as W, fingerprintJsonObject as X, fingerprintEnvironmentSelection as Y, fingerprintUserMcpServersConfigPatch as Z, resolveCodexAppServerRequestModelSelection as _, buildDisabledAppsConfigPatch as _t, buildCodexThreadConfiguration as a, filterCodexDynamicTools as at, buildCodexProjectDocThreadConfig as b, isCodexPluginThreadBindingStale as bt, codexThreadSandboxOrPermissions as c, isMessageOnlyCodexSourceReply as ct, resolveCodexThreadApprovalsReviewer as d, resolveCodexDynamicToolsLoading as dt, shouldStartTransientNoToolThread as et, buildCodexNativeWebSearchThreadConfig as f, resolveCodexDynamicToolsLoadingForRuntime as ft, resolveCodexAppServerModelProvider as g, buildCodexPluginThreadConfigTimeoutFallback as gt, CODEX_NATIVE_PERSONALITY_NONE as h, buildCodexPluginThreadConfigInputFingerprint as ht, buildCodexRuntimeThreadConfigForRun as i, shouldRotateCodexGpt56MultiAgentBinding as it, resolveCodexNativeHookRelayEvents as j, createCodexNativeHookRelay as k, readCodexInheritedMcpServerNames as l, isSystemAgentOnlyCodexDynamicToolAllowlist as lt, buildDeveloperInstructions as m, buildCodexPluginThreadConfig as mt, buildCodexRingZeroThreadConfigPatch as n, shouldRecheckRecoverablePluginBinding as nt, buildThreadResumeParams as o, filterCodexDynamicToolsForDisabledNativeSurface as ot, resolveCodexWebSearchPlan as p, buildCodexPluginAppsConfigPatchFromPolicyContext as pt, codexLegacyDynamicToolsFingerprint as q, buildCodexRuntimeThreadConfig as r, shouldRotateCodexAppServerBindingForRuntime as rt, buildThreadStartParams as s, isForcedPrivateQaCodexRuntime as st, assertCodexManagedRequirementsDoNotOverrideToolPolicy as t, isTransientWebSearchRestriction as tt, readCodexManagedRequirementsFingerprint as u, normalizeCodexDynamicToolName as ut, resolveCodexAppServerThreadModelSelection as v, buildPluginAppPolicyContext as vt, CodexManagedHooksOnlyError as w, stringifyCodexPluginPolicy as wt, mergeCodexNativeProjectDocThreadConfig as x, mergeCodexThreadConfigs as xt, resolveCodexBindingModelProviderFallback as y, disableUnlistedCodexApps as yt, loadCodexNativeToolCatalog as z };
+export { readActiveCodexTurnIdsFromResume as $, createCodexNativeHookRelay as A, loadCodexNativeToolCatalog as B, mergeCodexNativeProjectDocThreadConfig as C, refreshCodexPluginAppApprovalPolicy as Ct, buildCodexNativeHookRelayConfig as D, assertCodexNativeHookRelayAllowed as E, attestCodexThreadToolSurface as F, areUserMcpServersFingerprintsCompatible as G, applyCodexNativeSkillIsolation as H, checkCodexThreadAppAvailability as I, fingerprintCodexThreadConfig as J, codexDynamicToolsFingerprint as K, discardUnattestedCodexPluginThread as L, resolveCodexNativeHookRelayEvents as M, resolveCodexNativeHookRelayTtlMs as N, buildCodexNativeHookRelayDisabledConfig as O, scheduleCodexNativeHookRelayUnregister as P, legacyFingerprintUserMcpServersConfigPatch as Q, attestCodexRestrictedToolSurfaceMcpServersDisabled as R, buildCodexProjectDocThreadConfig as S, mergeCodexThreadConfigs as St, CodexManagedHooksOnlyError as T, buildCodexAppApprovalOverrides as Tt, resolveCodexNativeSkillIsolation as U, parseCodexNativeToolCatalog as V, areCodexDynamicToolFingerprintsCompatible as W, fingerprintJsonObject as X, fingerprintEnvironmentSelection as Y, fingerprintUserMcpServersConfigPatch as Z, resolveCodexAppServerModelProvider as _, buildCodexPluginThreadConfigTimeoutFallback as _t, buildCodexThreadConfiguration as a, shouldRotateCodexGpt56MultiAgentBinding as at, resolveCodexBindingModelProviderFallback as b, disableUnlistedCodexApps as bt, codexThreadSandboxOrPermissions as c, isForcedPrivateQaCodexRuntime as ct, resolveCodexThreadApprovalsReviewer as d, normalizeCodexDynamicToolName as dt, shouldStartTransientNoToolThread as et, buildCodexNativeWebSearchThreadConfig as f, resolveCodexDynamicToolsLoading as ft, CODEX_NATIVE_PERSONALITY_NONE as g, buildCodexPluginThreadConfigInputFingerprint as gt, buildDeveloperInstructions as h, buildCodexPluginThreadConfig as ht, buildCodexRuntimeThreadConfigForRun as i, shouldRotateCodexAppServerBindingForRuntime as it, emitCodexNativePreToolUseFailureDiagnostic as j, buildCodexNativeHookRelayId as k, readCodexInheritedMcpServerNames as l, isMessageOnlyCodexSourceReply as lt, mergeCodexNativeShellEnvironment as m, buildCodexPluginAppsConfigPatchFromPolicyContext as mt, buildCodexRingZeroThreadConfigPatch as n, isTransientWebSearchRestriction as nt, buildThreadResumeParams as o, filterCodexDynamicTools as ot, resolveCodexWebSearchPlan as p, resolveCodexDynamicToolsLoadingForRuntime as pt, codexLegacyDynamicToolsFingerprint as q, buildCodexRuntimeThreadConfig as r, shouldRecheckRecoverablePluginBinding as rt, buildThreadStartParams as s, filterCodexDynamicToolsForDisabledNativeSurface as st, assertCodexManagedRequirementsDoNotOverrideToolPolicy as t, stabilizeJsonValue as tt, readCodexManagedRequirementsFingerprint as u, isSystemAgentOnlyCodexDynamicToolAllowlist as ut, resolveCodexAppServerRequestModelSelection as v, buildDisabledAppsConfigPatch as vt, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as w, shouldBuildCodexPluginThreadConfig as wt, joinPresentSections as x, isCodexPluginThreadBindingStale as xt, resolveCodexAppServerThreadModelSelection as y, buildPluginAppPolicyContext as yt, hasCodexNativeToolCatalog as z };