@openclaw/codex 2026.7.1 → 2026.7.2-beta.2

package/dist/{config-CYEDnLJ2.js → session-binding-h1mmCGnl.js}

@@ -1,15 +1,28 @@
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
+import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
 import path from "node:path";
 import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
-import { createHash, createHmac, randomBytes } from "node:crypto";
+import { createHash, createHmac, randomBytes, randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
-import { resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
+import { ensureAuthProfileStore, resolveDefaultAgentDir, resolveProviderIdForAuth, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
 import { resolveExecApprovalsFromFile } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { buildSecretInputSchema, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { detectWindowsSpawnCommandInlineArgs } from "openclaw/plugin-sdk/windows-spawn";
+import { parse } from "smol-toml";
 import { z } from "zod";
+import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+//#region extensions/codex/src/app-server/session-discovery-config.ts
+const codexSessionCatalogConfigSchema = z.object({ enabled: z.boolean().optional() }).strict();
+const codexDiscoveryConfigSchema = z.object({
+	enabled: z.boolean().optional(),
+	timeoutMs: z.number().positive().optional()
+}).strict();
+//#endregion
 //#region extensions/codex/src/app-server/config.ts
 const START_OPTIONS_KEY_SECRET_SYMBOL = Symbol.for("openclaw.codexAppServerStartOptionsKeySecret");
 const START_OPTIONS_KEY_SECRET = getStartOptionsKeySecret();
@@ -19,14 +32,22 @@ const CODEX_APP_SERVER_HOME_DIRNAME = "codex-home";
 const CODEX_CONFIG_TOML_FILENAME = "config.toml";
 const PLAIN_DECIMAL_NUMBER_RE = /^[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))$/;
 const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
+const CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME = "workspace-directory";
 function shouldAutoApproveCodexAppServerApprovals(appServer) {
 	return appServer.networkProxy === void 0 && appServer.approvalPolicy === "never" && appServer.sandbox === "danger-full-access";
 }
 const DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME = "computer-use";
 const DEFAULT_CODEX_COMPUTER_USE_MCP_SERVER_NAME = "computer-use";
 const DEFAULT_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS = 6e4;
+const DEFAULT_CODEX_COMPUTER_USE_LIVE_TEST_TIMEOUT_MS = 6e4;
+const DEFAULT_CODEX_COMPUTER_USE_TOOL_CALL_TIMEOUT_MS = 6e4;
+const DEFAULT_CODEX_COMPUTER_USE_HEALTH_CHECK_INTERVAL_MINUTES = 60;
 const DEFAULT_CODEX_APP_SERVER_NETWORK_PROXY_PROFILE_PREFIX = "openclaw-network";
-const codexAppServerTransportSchema = z.enum(["stdio", "websocket"]);
+const codexAppServerTransportSchema = z.enum([
+	"stdio",
+	"websocket",
+	"unix"
+]);
 const codexAppServerHomeScopeSchema = z.enum(["agent", "user"]);
 const SecretInputSchema = buildSecretInputSchema();
 const codexAppServerPolicyModeSchema = z.enum(["yolo", "guardian"]);
@@ -46,6 +67,13 @@ const codexAppServerApprovalsReviewerSchema = z.enum([
 	"guardian_subagent"
 ]);
 const codexDynamicToolsLoadingSchema = z.enum(["searchable", "direct"]);
+const codexComputerUseHealthIntervalSchema = z.union([
+	z.literal(30),
+	z.literal(60),
+	z.literal(120),
+	z.literal(240)
+]);
+const codexComputerUsePluginCacheModeSchema = z.enum(["shared", "independent"]);
 const codexPluginDestructivePolicySchema = z.union([
 	z.boolean(),
 	z.literal("auto"),
@@ -74,7 +102,7 @@ const codexAppServerNetworkProxySchema = z.object({
 }).strict();
 const codexPluginEntryConfigSchema = z.object({
 	enabled: z.boolean().optional(),
-	marketplaceName: z.literal(CODEX_PLUGINS_MARKETPLACE_NAME).optional(),
+	marketplaceName: z.enum([CODEX_PLUGINS_MARKETPLACE_NAME, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME]).optional(),
 	pluginName: z.string().trim().min(1).optional(),
 	allow_destructive_actions: codexPluginDestructivePolicySchema.optional()
 }).strict();
@@ -84,17 +112,42 @@ const codexPluginsConfigSchema = z.object({
 	allow_destructive_actions: codexPluginDestructivePolicySchema.optional(),
 	plugins: z.record(z.string(), codexPluginEntryConfigSchema).optional()
 }).strict();
+const codexSupervisionEndpointSchema = z.union([z.object({
+	id: z.string().optional(),
+	label: z.string().optional(),
+	transport: z.literal("stdio-proxy").optional(),
+	command: z.string().optional(),
+	args: z.array(z.string()).optional(),
+	cwd: z.string().optional()
+}).strict(), z.object({
+	id: z.string().optional(),
+	label: z.string().optional(),
+	transport: z.literal("websocket"),
+	url: z.string(),
+	authTokenEnv: z.string().optional()
+}).strict()]);
+const codexSupervisionConfigSchema = z.object({
+	enabled: z.boolean().optional(),
+	endpoints: z.array(codexSupervisionEndpointSchema).optional(),
+	allowRawTranscripts: z.boolean().optional(),
+	allowWriteControls: z.boolean().optional()
+}).strict();
 const codexPluginConfigSchema = z.object({
 	codexDynamicToolsLoading: codexDynamicToolsLoadingSchema.optional(),
 	codexDynamicToolsExclude: z.array(z.string()).optional(),
-	discovery: z.object({
-		enabled: z.boolean().optional(),
-		timeoutMs: z.number().positive().optional()
-	}).strict().optional(),
+	sessionCatalog: codexSessionCatalogConfigSchema.optional(),
+	discovery: codexDiscoveryConfigSchema.optional(),
 	computerUse: z.object({
 		enabled: z.boolean().optional(),
 		autoInstall: z.boolean().optional(),
 		marketplaceDiscoveryTimeoutMs: z.number().positive().optional(),
+		liveTestTimeoutMs: z.number().positive().optional(),
+		toolCallTimeoutMs: z.number().positive().optional(),
+		healthCheckEnabled: z.boolean().optional(),
+		healthCheckIntervalMinutes: codexComputerUseHealthIntervalSchema.optional(),
+		pluginCacheMode: codexComputerUsePluginCacheModeSchema.optional(),
+		strictReadiness: z.boolean().optional(),
+		autoRepair: z.boolean().optional(),
 		marketplaceSource: z.string().optional(),
 		marketplacePath: z.string().optional(),
 		marketplaceName: z.string().optional(),
@@ -102,6 +155,7 @@ const codexPluginConfigSchema = z.object({
 		mcpServerName: z.string().optional()
 	}).strict().optional(),
 	codexPlugins: z.unknown().optional(),
+	supervision: codexSupervisionConfigSchema.optional(),
 	appServer: z.object({
 		mode: codexAppServerPolicyModeSchema.optional(),
 		transport: codexAppServerTransportSchema.optional(),
@@ -114,6 +168,7 @@ const codexPluginConfigSchema = z.object({
 		clearEnv: z.array(z.string()).optional(),
 		remoteWorkspaceRoot: codexAppServerRemoteWorkspaceRootSchema.optional(),
 		codeModeOnly: z.boolean().optional(),
+		loopDetectionPreToolUseRelay: z.boolean().optional(),
 		requestTimeoutMs: z.number().positive().optional(),
 		turnCompletionIdleTimeoutMs: z.number().positive().optional(),
 		postToolRawAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
@@ -153,11 +208,11 @@ function resolveCodexPluginsPolicy(pluginConfig) {
 	const enabled = config?.enabled === true;
 	const destructivePolicy = resolveCodexPluginDestructivePolicy(config?.allow_destructive_actions ?? true);
 	const pluginPolicies = Object.entries(config?.plugins ?? {}).flatMap(([configKey, entry]) => {
-		if (entry.marketplaceName !== "openai-curated" || !entry.pluginName) return [];
+		if (!isCodexPluginMarketplaceName(entry.marketplaceName) || !entry.pluginName) return [];
 		const entryDestructivePolicy = resolveCodexPluginDestructivePolicy(entry.allow_destructive_actions ?? config?.allow_destructive_actions ?? true);
 		return [{
 			configKey,
-			marketplaceName: CODEX_PLUGINS_MARKETPLACE_NAME,
+			marketplaceName: entry.marketplaceName,
 			pluginName: entry.pluginName,
 			enabled: enabled && entry.enabled !== false,
 			allowDestructiveActions: entryDestructivePolicy.allowDestructiveActions,
@@ -173,6 +228,9 @@ function resolveCodexPluginsPolicy(pluginConfig) {
 		pluginPolicies
 	};
 }
+function isCodexPluginMarketplaceName(value) {
+	return value === "openai-curated" || value === "workspace-directory";
+}
 function resolveCodexPluginDestructivePolicy(policy) {
 	if (policy === "auto" || policy === "ask") return {
 		allowDestructiveActions: true,
@@ -187,7 +245,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 	const env = params.env ?? process.env;
 	const config = readCodexPluginConfig(params.pluginConfig).appServer ?? {};
 	const transport = resolveTransport(config.transport);
-	const homeScope = config.homeScope === "user" ? "user" : "agent";
+	const homeScope = config.homeScope ?? "agent";
 	const configCommand = readNonEmptyString(config.command);
 	const envCommand = readNonEmptyString(env.OPENCLAW_CODEX_APP_SERVER_BIN);
 	const command = configCommand ?? envCommand ?? "codex";
@@ -203,7 +261,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		value: config.authToken,
 		path: "plugins.entries.codex.config.appServer.authToken"
 	});
-	const url = readNonEmptyString(config.url);
+	const url = readNonEmptyString(config.url) ?? (transport === "unix" ? "unix://" : void 0);
 	const connectionClass = inferCodexAppServerConnectionClass({
 		transport,
 		url
@@ -264,9 +322,12 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 	const serviceTier = normalizeCodexServiceTier(config.serviceTier);
 	const resolvedSandbox = forcedPolicy?.sandbox ?? configuredSandbox ?? defaultPolicy?.sandbox ?? (policyMode === "guardian" ? "workspace-write" : "danger-full-access");
 	if (transport === "websocket" && !url) throw new Error("plugins.entries.codex.config.appServer.url is required when appServer.transport is websocket");
-	if (transport === "websocket" && homeScope === "user") throw new Error("plugins.entries.codex.config.appServer.homeScope=user requires appServer.transport=stdio");
-	assertCodexAppServerConnectionClassConfig({
-		connectionClass,
+	if (transport === "websocket" && homeScope === "user") throw new Error("plugins.entries.codex.config.appServer.homeScope=user requires appServer.transport=stdio or unix");
+	if (transport === "unix" && homeScope !== "user") throw new Error("plugins.entries.codex.config.appServer.transport=unix requires appServer.homeScope=user");
+	if (transport === "unix" && !url?.startsWith("unix://")) throw new Error("plugins.entries.codex.config.appServer.url must use unix:// when appServer.transport is unix");
+	assertCodexAppServerConnectionSecurity({
+		transport,
+		url,
 		authToken,
 		headers
 	});
@@ -274,12 +335,21 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 	const envApprovalPolicy = resolveApprovalPolicy(env.OPENCLAW_CODEX_APP_SERVER_APPROVAL_POLICY);
 	const approvalPolicy = configApprovalPolicy ?? envApprovalPolicy ?? defaultPolicy?.approvalPolicy ?? (policyMode === "guardian" ? "on-request" : "never");
 	const approvalPolicySource = configApprovalPolicy ? "config" : envApprovalPolicy ? "env" : defaultPolicy?.approvalPolicy ? "requirements" : "implicit";
+	const computerUseConfig = resolveCodexComputerUseConfig({
+		pluginConfig: params.pluginConfig,
+		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 managedComputerUsePluginNames = [.../* @__PURE__ */ new Set([DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME, computerUseConfig.pluginName])];
 	return {
 		start: {
 			transport,
 			homeScope,
 			command,
 			commandSource,
+			...includeManagedCommandOrder ? { managedCommandOrder } : {},
+			...commandSource === "managed" ? { managedComputerUsePluginNames } : {},
 			args: args.length > 0 ? args : [
 				"app-server",
 				"--listen",
@@ -294,6 +364,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		remoteAppsSubstrate,
 		...remoteWorkspaceRoot ? { remoteWorkspaceRoot } : {},
 		codeModeOnly: config.codeModeOnly === true,
+		loopDetectionPreToolUseRelay: config.loopDetectionPreToolUseRelay !== false,
 		requestTimeoutMs: normalizePositiveNumber(config.requestTimeoutMs, 6e4),
 		turnCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnCompletionIdleTimeoutMs, 6e4),
 		...config.postToolRawAssistantCompletionIdleTimeoutMs !== void 0 ? { postToolRawAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.postToolRawAssistantCompletionIdleTimeoutMs, 6e4) } : {},
@@ -305,6 +376,28 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		...resolveCodexAppServerNetworkProxy(config.networkProxy, resolvedSandbox)
 	};
 }
+/**
+* Rechecks Codex-owned plugin state at the final spawn boundary, where the
+* effective agent home is known, so Computer Use keeps the desktop app's TCC ownership.
+*/
+function resolveCodexAppServerStartOptionsForAgent(params) {
+	const startOptions = params.startOptions;
+	if (startOptions.transport !== "stdio" || startOptions.commandSource !== "managed" || startOptions.managedCommandOrder !== void 0) return startOptions;
+	if (startOptions.homeScope === "user") return {
+		...startOptions,
+		managedCommandOrder: "desktop-first"
+	};
+	return codexConfigEnablesNativeComputerUse({
+		agentDir: params.agentDir,
+		codexConfigToml: params.codexConfigToml,
+		env: params.env,
+		homeScope: "agent",
+		pluginNames: startOptions.managedComputerUsePluginNames ?? [DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME]
+	}) ? {
+		...startOptions,
+		managedCommandOrder: "desktop-first"
+	} : startOptions;
+}
 function isCodexAppServerApprovalPolicyAllowedByRequirements(policy, params = {}) {
 	const content = readCodexRequirementsToml(params);
 	if (content === void 0) return true;
@@ -359,32 +452,58 @@ function resolveCodexComputerUseConfig(params = {}) {
 	const marketplaceSource = readNonEmptyString(params.overrides?.marketplaceSource) ?? readNonEmptyString(config.marketplaceSource) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_MARKETPLACE_SOURCE);
 	const marketplacePath = readNonEmptyString(params.overrides?.marketplacePath) ?? readNonEmptyString(config.marketplacePath) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_MARKETPLACE_PATH);
 	const marketplaceName = readNonEmptyString(params.overrides?.marketplaceName) ?? readNonEmptyString(config.marketplaceName) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_MARKETPLACE_NAME);
+	const configuredPluginName = readNonEmptyString(params.overrides?.pluginName) ?? readNonEmptyString(config.pluginName) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_PLUGIN_NAME);
+	const configuredMcpServerName = readNonEmptyString(params.overrides?.mcpServerName) ?? readNonEmptyString(config.mcpServerName) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_MCP_SERVER_NAME);
 	const autoInstall = params.overrides?.autoInstall ?? config.autoInstall ?? readBooleanEnv(env.OPENCLAW_CODEX_COMPUTER_USE_AUTO_INSTALL) ?? false;
 	const marketplaceDiscoveryTimeoutMs = normalizePositiveNumber(params.overrides?.marketplaceDiscoveryTimeoutMs ?? config.marketplaceDiscoveryTimeoutMs ?? readNumberEnv(env.OPENCLAW_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS), DEFAULT_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS);
+	const liveTestTimeoutMs = normalizePositiveNumber(params.overrides?.liveTestTimeoutMs ?? config.liveTestTimeoutMs ?? readNumberEnv(env.OPENCLAW_CODEX_COMPUTER_USE_LIVE_TEST_TIMEOUT_MS), DEFAULT_CODEX_COMPUTER_USE_LIVE_TEST_TIMEOUT_MS);
+	const toolCallTimeoutMs = normalizePositiveNumber(params.overrides?.toolCallTimeoutMs ?? config.toolCallTimeoutMs ?? readNumberEnv(env.OPENCLAW_CODEX_COMPUTER_USE_TOOL_CALL_TIMEOUT_MS), DEFAULT_CODEX_COMPUTER_USE_TOOL_CALL_TIMEOUT_MS);
+	const healthCheckIntervalMinutes = normalizeComputerUseHealthCheckIntervalMinutes(params.overrides?.healthCheckIntervalMinutes ?? config.healthCheckIntervalMinutes ?? readNumberEnv(env.OPENCLAW_CODEX_COMPUTER_USE_HEALTH_CHECK_INTERVAL_MINUTES));
+	const healthCheckEnabled = params.overrides?.healthCheckEnabled ?? config.healthCheckEnabled ?? readBooleanEnv(env.OPENCLAW_CODEX_COMPUTER_USE_HEALTH_CHECK_ENABLED) ?? false;
+	const pluginCacheMode = normalizeComputerUsePluginCacheMode(params.overrides?.pluginCacheMode) ?? normalizeComputerUsePluginCacheMode(config.pluginCacheMode) ?? normalizeComputerUsePluginCacheMode(env.OPENCLAW_CODEX_COMPUTER_USE_PLUGIN_CACHE_MODE) ?? "independent";
+	const strictReadiness = params.overrides?.strictReadiness ?? config.strictReadiness ?? readBooleanEnv(env.OPENCLAW_CODEX_COMPUTER_USE_STRICT_READINESS) ?? false;
+	const autoRepair = params.overrides?.autoRepair ?? config.autoRepair ?? readBooleanEnv(env.OPENCLAW_CODEX_COMPUTER_USE_AUTO_REPAIR) ?? false;
 	return {
-		enabled: params.overrides?.enabled ?? config.enabled ?? readBooleanEnv(env.OPENCLAW_CODEX_COMPUTER_USE) ?? Boolean(autoInstall || marketplaceSource || marketplacePath || marketplaceName),
+		enabled: params.overrides?.enabled ?? config.enabled ?? readBooleanEnv(env.OPENCLAW_CODEX_COMPUTER_USE) ?? Boolean(autoInstall || marketplaceSource || marketplacePath || marketplaceName || configuredPluginName || configuredMcpServerName),
 		autoInstall,
 		marketplaceDiscoveryTimeoutMs,
-		pluginName: readNonEmptyString(params.overrides?.pluginName) ?? readNonEmptyString(config.pluginName) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_PLUGIN_NAME) ?? DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME,
-		mcpServerName: readNonEmptyString(params.overrides?.mcpServerName) ?? readNonEmptyString(config.mcpServerName) ?? readNonEmptyString(env.OPENCLAW_CODEX_COMPUTER_USE_MCP_SERVER_NAME) ?? DEFAULT_CODEX_COMPUTER_USE_MCP_SERVER_NAME,
+		liveTestTimeoutMs,
+		toolCallTimeoutMs,
+		healthCheckEnabled,
+		healthCheckIntervalMinutes,
+		pluginCacheMode,
+		strictReadiness,
+		autoRepair,
+		pluginName: configuredPluginName ?? DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME,
+		mcpServerName: configuredMcpServerName ?? DEFAULT_CODEX_COMPUTER_USE_MCP_SERVER_NAME,
 		...marketplaceSource ? { marketplaceSource } : {},
 		...marketplacePath ? { marketplacePath } : {},
 		...marketplaceName ? { marketplaceName } : {}
 	};
 }
+function normalizeComputerUseHealthCheckIntervalMinutes(value) {
+	return value === 30 || value === 60 || value === 120 || value === 240 ? value : DEFAULT_CODEX_COMPUTER_USE_HEALTH_CHECK_INTERVAL_MINUTES;
+}
+function normalizeComputerUsePluginCacheMode(value) {
+	return value === "shared" || value === "independent" ? value : null;
+}
 function codexAppServerStartOptionsKey(options, params = {}) {
 	return JSON.stringify({
 		transport: options.transport,
 		command: options.command,
 		commandSource: options.commandSource ?? null,
+		managedCommandOrder: options.managedCommandOrder ?? "package-first",
+		managedComputerUsePluginNames: [...options.managedComputerUsePluginNames ?? []].toSorted(),
 		managedFallbackCommandPaths: [...options.managedFallbackCommandPaths ?? []],
 		args: options.args,
+		cwd: options.cwd ?? null,
 		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}`)]),
 		clearEnv: [...options.clearEnv ?? []].toSorted(),
 		authProfileId: params.authProfileId ?? null,
+		authBindingFingerprint: params.authBindingFingerprint ?? null,
 		agentDir: params.agentDir ?? null,
 		fallbackApiKeyCacheKey: params.fallbackApiKeyCacheKey ?? null
 	});
@@ -403,6 +522,23 @@ function codexSandboxPolicyForTurn(mode, cwd) {
 		excludeSlashTmp: false
 	};
 }
+/** Resolves the passive supervision control connection without changing harness defaults. */
+function resolveCodexSupervisionAppServerRuntimeOptions(params = {}) {
+	const pluginConfig = readCodexPluginConfig(params.pluginConfig);
+	const appServer = pluginConfig.appServer ?? {};
+	const transport = resolveTransport(appServer.transport);
+	const homeScope = appServer.homeScope ?? (transport === "websocket" ? "agent" : "user");
+	return resolveCodexAppServerRuntimeOptions({
+		...params,
+		pluginConfig: {
+			...pluginConfig,
+			appServer: {
+				...appServer,
+				homeScope
+			}
+		}
+	});
+}
 function resolveCodexAppServerNetworkProxy(config, sandbox) {
 	if (config?.enabled !== true) return {};
 	const fileSystemMode = config.baseProfile === "read-only" || !config.baseProfile && sandbox === "read-only" ? "read" : "write";
@@ -484,7 +620,7 @@ function withMcpElicitationsApprovalPolicy(policy) {
 	} };
 }
 function resolveTransport(value) {
-	return value === "websocket" ? "websocket" : "stdio";
+	return value === "websocket" || value === "unix" ? value : "stdio";
 }
 function normalizeRemoteWorkspaceRoot(value) {
 	return readNonEmptyString(value);
@@ -499,6 +635,14 @@ function assertCodexAppServerConnectionClassConfig(params) {
 		headers: params.headers
 	})) throw new Error("remote Codex app-server WebSocket URLs require appServer.authToken or an Authorization header");
 }
+/** Applies the canonical remote-auth boundary to any Codex AppServer transport. */
+function assertCodexAppServerConnectionSecurity(params) {
+	assertCodexAppServerConnectionClassConfig({
+		connectionClass: inferCodexAppServerConnectionClass(params),
+		authToken: params.authToken,
+		headers: params.headers
+	});
+}
 function isLoopbackWebSocketUrl(value) {
 	let parsed;
 	try {
@@ -603,12 +747,18 @@ function parseTopLevelRequirementsStringArray(content, key) {
 	return parseRequirementsStringArray(stripTomlLineComments(content).slice(0, firstTomlTableOffset(content)), key);
 }
 function parseTomlStringValue(content, key) {
-	const match = parseTomlStringAssignment(content, tomlDottedKeyPattern(key));
-	return match ? match[1] ?? match[2] ?? "" : void 0;
+	return parseTomlStringAssignmentValue(content, tomlDottedKeyPattern(key));
 }
 function parseInlineOpenAIModelProviderBaseUrl(content) {
-	const match = parseTomlStringAssignment(content, `${tomlKeyPattern("model_providers")}\\s*=\\s*\\{[\\s\\S]*?${tomlKeyPattern("openai")}\\s*=\\s*\\{[\\s\\S]*?${tomlKeyPattern("base_url")}`);
-	return match ? match[1] ?? match[2] ?? "" : void 0;
+	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*(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|'([^']*)')`));
@@ -759,14 +909,19 @@ function readCodexBaseUrlOverridesForModelBackedReview(params) {
 	};
 	const topLevelContent = stripTomlLineComments(configToml).slice(0, firstTomlTableOffset(configToml));
 	const modelProviderOpenAISection = parseTomlTableSection(configToml, "model_providers.openai");
+	const openAIBaseUrl = parseTomlStringValue(topLevelContent, "openai_base_url");
+	const chatGPTBaseUrl = parseTomlStringValue(topLevelContent, "chatgpt_base_url");
+	const openAI = [
+		openAIBaseUrl,
+		parseTomlStringValue(topLevelContent, "model_providers.openai.base_url"),
+		parseInlineOpenAIModelProviderBaseUrl(topLevelContent),
+		modelProviderOpenAISection ? parseTomlStringValue(modelProviderOpenAISection, "base_url") : void 0
+	];
+	const chatGPT = [chatGPTBaseUrl];
+	if ([...openAI, ...chatGPT].includes(false)) return false;
 	return {
-		openAI: [
-			parseTomlStringValue(topLevelContent, "openai_base_url"),
-			parseTomlStringValue(topLevelContent, "model_providers.openai.base_url"),
-			parseInlineOpenAIModelProviderBaseUrl(topLevelContent),
-			modelProviderOpenAISection ? parseTomlStringValue(modelProviderOpenAISection, "base_url") : void 0
-		].filter((entry) => entry !== void 0),
-		chatGPT: [parseTomlStringValue(topLevelContent, "chatgpt_base_url")].filter((entry) => entry !== void 0)
+		openAI: openAI.filter((entry) => typeof entry === "string"),
+		chatGPT: chatGPT.filter((entry) => typeof entry === "string")
 	};
 }
 function readCodexAppServerConfigToml(params) {
@@ -779,6 +934,29 @@ function readCodexAppServerConfigToml(params) {
 		return readErrorCode(error) === "ENOENT" ? void 0 : false;
 	}
 }
+function codexConfigEnablesNativeComputerUse(params) {
+	const configToml = readCodexAppServerConfigToml(params);
+	if (configToml === false) return true;
+	if (configToml === void 0) return false;
+	let parsedConfig;
+	try {
+		parsedConfig = parse(configToml, { integersAsBigInt: true });
+	} catch {
+		return true;
+	}
+	const rawPlugins = parsedConfig.plugins;
+	if (rawPlugins === void 0) return false;
+	const plugins = readRecord(rawPlugins);
+	if (!plugins) return true;
+	for (const [pluginId, rawPluginConfig] of Object.entries(plugins)) {
+		if (!params.pluginNames.some((pluginName) => pluginId === pluginName || pluginId.startsWith(`${pluginName}@`))) continue;
+		const pluginConfig = readRecord(rawPluginConfig);
+		if (!pluginConfig) return true;
+		if (pluginConfig.enabled === false) continue;
+		return true;
+	}
+	return false;
+}
 function resolveCodexAppServerConfigPath(params) {
 	if (params.homeScope === "user") return path.join(resolveCodexAppServerUserHomeDir(params.env), CODEX_CONFIG_TOML_FILENAME);
 	const agentDir = readNonEmptyString(params.agentDir);
@@ -1135,4 +1313,780 @@ function splitShellWords(value) {
 	return words;
 }
 //#endregion
-export { shouldAutoApproveCodexAppServerApprovals as _, isCodexAppServerApprovalPolicyAllowedByRequirements as a, isTrustedCodexModelBackedOpenAIProvider as c, resolveCodexAppServerRuntimeOptions as d, resolveCodexAppServerUserHomeDir as f, resolveOpenClawExecPolicyForCodexAppServer as g, resolveCodexPluginsPolicy as h, codexSandboxPolicyForTurn as i, normalizeCodexServiceTier as l, resolveCodexModelBackedReviewerPolicyContext as m, canUseCodexModelBackedApprovalsReviewerForModel as n, isCodexFastServiceTier as o, resolveCodexComputerUseConfig as p, codexAppServerStartOptionsKey as r, isCodexSandboxExecServerEnabled as s, CODEX_PLUGINS_MARKETPLACE_NAME as t, readCodexPluginConfig as u, withMcpElicitationsApprovalPolicy as v };
+//#region extensions/codex/src/app-server/session-binding.ts
+/** SQLite-backed Codex app-server thread bindings. */
+var session_binding_exports = /* @__PURE__ */ __exportAll({
+	CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS: () => CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS,
+	CODEX_APP_SERVER_BINDING_MAX_ENTRIES: () => CODEX_APP_SERVER_BINDING_MAX_ENTRIES,
+	CODEX_APP_SERVER_BINDING_NAMESPACE: () => CODEX_APP_SERVER_BINDING_NAMESPACE,
+	CodexSupervisionBindingReplacementError: () => CodexSupervisionBindingReplacementError,
+	assertCodexBindingMayBeReplaced: () => assertCodexBindingMayBeReplaced,
+	bindingStoreKey: () => bindingStoreKey,
+	createCodexAppServerBindingStore: () => createCodexAppServerBindingStore,
+	createStoredCodexAppServerBinding: () => createStoredCodexAppServerBinding,
+	hashCodexAppServerBindingFingerprint: () => hashCodexAppServerBindingFingerprint,
+	isCodexAppServerNativeAuthProfile: () => isCodexAppServerNativeAuthProfile,
+	normalizeCodexAppServerBindingModelProvider: () => normalizeCodexAppServerBindingModelProvider,
+	normalizeStoredCodexAppServerBindingFingerprints: () => normalizeStoredCodexAppServerBindingFingerprints,
+	readCodexAppServerThreadBinding: () => readCodexAppServerThreadBinding,
+	readStoredCodexAppServerBinding: () => readStoredCodexAppServerBinding,
+	reclaimCurrentCodexSessionGeneration: () => reclaimCurrentCodexSessionGeneration,
+	resolveCodexAppServerBindingModelProvider: () => resolveCodexAppServerBindingModelProvider,
+	sessionBindingIdentity: () => sessionBindingIdentity
+});
+const CODEX_APP_SERVER_NATIVE_AUTH_PROVIDER = "openai";
+const PUBLIC_OPENAI_MODEL_PROVIDER = "openai";
+const BINDING_LEASE_RETRY_INTERVAL_MS = 1e3;
+const BOUNDED_BINDING_FINGERPRINT_PATTERN = /^sha256:[a-f0-9]{64}$/i;
+const CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS = 6e4;
+const BINDING_LEASE_STALE_MS = 65e3;
+const BINDING_LEASE_WAIT_MS = 7e4;
+const BINDING_LEASE_RENEW_INTERVAL_MS = Math.floor(BINDING_LEASE_STALE_MS / 3);
+const PHYSICAL_SESSION_RETIRE_TTL_MS = BINDING_LEASE_WAIT_MS;
+/** Resolves the same agent scope OpenClaw uses for transcript/session ownership. */
+function sessionBindingIdentity(params) {
+	const { sessionAgentId } = resolveSessionAgentIds(params);
+	const sessionKey = params.sessionKey?.trim();
+	return {
+		kind: "session",
+		agentId: sessionAgentId,
+		sessionId: params.sessionId,
+		...sessionKey ? { sessionKey } : {}
+	};
+}
+const optionalStringSchema = z.string().optional().catch(void 0);
+const optionalBooleanSchema = z.boolean().optional().catch(void 0);
+const optionalNonBlankStringSchema = z.string().refine((value) => Boolean(value.trim())).optional().catch(void 0);
+const optionalTimestampSchema = z.string().refine((value) => Number.isFinite(Date.parse(value))).optional().catch(void 0);
+const pendingSupervisionBranchSchema = z.object({
+	sourceThreadId: z.string().trim().min(1),
+	connectionFingerprint: z.string().trim().min(1).optional(),
+	lastTurnId: z.string().trim().min(1).optional(),
+	cleanupThreadIds: z.array(z.string().trim().min(1)).max(2).optional()
+}).strict().superRefine((pending, context) => {
+	const cleanupThreadIds = pending.cleanupThreadIds ?? [];
+	if (new Set(cleanupThreadIds).size !== cleanupThreadIds.length) context.addIssue({
+		code: "custom",
+		message: "pending supervision cleanup thread ids must be unique"
+	});
+	if (cleanupThreadIds.includes(pending.sourceThreadId)) context.addIssue({
+		code: "custom",
+		message: "pending supervision cleanup cannot target its source"
+	});
+});
+const contextEngineProjectionSchema = z.object({
+	schemaVersion: z.literal(1),
+	mode: z.literal("thread_bootstrap"),
+	epoch: z.string().refine((value) => Boolean(value.trim())),
+	fingerprint: optionalStringSchema
+}).strict();
+const contextEngineSchema = z.object({
+	schemaVersion: z.literal(1),
+	engineId: z.string(),
+	policyFingerprint: z.string(),
+	projection: contextEngineProjectionSchema.optional().catch(void 0)
+}).strict();
+const destructiveApprovalModeSchema = z.enum([
+	"allow",
+	"deny",
+	"auto",
+	"ask"
+]).optional().catch(void 0);
+const accountAppPolicyEntrySchema = z.object({
+	source: z.literal("account"),
+	appName: z.string(),
+	allowDestructiveActions: z.boolean(),
+	destructiveApprovalMode: destructiveApprovalModeSchema,
+	mcpServerNames: z.array(z.string())
+}).strict();
+const pluginAppPolicyEntrySchema = z.object({
+	source: z.literal("plugin").optional(),
+	configKey: z.string(),
+	marketplaceName: z.enum([CODEX_PLUGINS_MARKETPLACE_NAME, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME]),
+	pluginName: z.string(),
+	allowDestructiveActions: z.boolean(),
+	destructiveApprovalMode: destructiveApprovalModeSchema,
+	mcpServerNames: z.array(z.string())
+}).strict();
+const pluginAppPolicyContextSchema = z.object({
+	fingerprint: z.string(),
+	apps: z.record(z.string(), z.union([accountAppPolicyEntrySchema, pluginAppPolicyEntrySchema])),
+	pluginAppIds: z.record(z.string(), z.array(z.string())).default({})
+}).strict();
+const threadBindingSchema = z.object({
+	threadId: z.string().refine((value) => Boolean(value.trim())),
+	clientId: optionalStringSchema,
+	cwd: z.string(),
+	connectionScope: z.literal("supervision").optional(),
+	supervisionSourceThreadId: z.string().trim().min(1).optional(),
+	authProfileId: optionalStringSchema,
+	model: optionalStringSchema,
+	preserveNativeModel: z.literal(true).optional().catch(void 0),
+	pendingSupervisionBranch: pendingSupervisionBranchSchema.optional(),
+	modelProvider: z.string().transform((value) => value.trim()).pipe(z.string().min(1)).optional().catch(void 0),
+	approvalPolicy: z.preprocess((value) => value === "on-failure" ? "on-request" : value, z.enum([
+		"never",
+		"on-request",
+		"untrusted"
+	]).optional()).catch(void 0),
+	sandbox: z.enum([
+		"read-only",
+		"workspace-write",
+		"danger-full-access"
+	]).optional().catch(void 0),
+	serviceTier: z.preprocess(normalizeCodexServiceTier, z.custom((value) => typeof value === "string").optional()).optional().catch(void 0),
+	networkProxyProfileName: optionalStringSchema,
+	networkProxyConfigFingerprint: optionalStringSchema,
+	dynamicToolsFingerprint: optionalStringSchema,
+	dynamicToolsContainDeferred: optionalBooleanSchema,
+	webSearchThreadConfigFingerprint: optionalStringSchema,
+	userMcpServersFingerprint: optionalStringSchema,
+	mcpServersFingerprint: optionalStringSchema,
+	ringZeroConfigFingerprint: optionalStringSchema,
+	ringZeroClientInstanceId: optionalStringSchema,
+	nativeHookRelayGeneration: optionalNonBlankStringSchema,
+	appServerRuntimeFingerprint: optionalStringSchema,
+	pluginAppsFingerprint: optionalStringSchema,
+	pluginAppsInputFingerprint: optionalStringSchema,
+	pluginAppPolicyContext: pluginAppPolicyContextSchema.optional().catch(void 0),
+	contextEngine: contextEngineSchema.optional().catch(void 0),
+	environmentSelectionFingerprint: optionalStringSchema,
+	conversationStartId: optionalStringSchema,
+	conversationSourceTransferComplete: z.literal(true).optional().catch(void 0),
+	historyCoveredThrough: optionalTimestampSchema
+}).superRefine((binding, context) => {
+	if (binding.connectionScope === "supervision") {
+		if (!binding.supervisionSourceThreadId) context.addIssue({
+			code: "custom",
+			message: "supervision connection ownership requires its native source thread id"
+		});
+		if (binding.preserveNativeModel !== true) context.addIssue({
+			code: "custom",
+			message: "supervision connection ownership requires native model ownership"
+		});
+		if (binding.conversationSourceTransferComplete !== true) context.addIssue({
+			code: "custom",
+			message: "supervision connection ownership requires a completed source transfer"
+		});
+		if (!binding.pendingSupervisionBranch && (!binding.model?.trim() || !binding.modelProvider)) context.addIssue({
+			code: "custom",
+			message: "materialized supervision bindings require a native model and provider"
+		});
+	}
+	if (binding.supervisionSourceThreadId && binding.connectionScope !== "supervision") context.addIssue({
+		code: "custom",
+		message: "a supervision source thread id requires supervision connection ownership"
+	});
+	if (!binding.pendingSupervisionBranch) return;
+	if (binding.threadId !== binding.pendingSupervisionBranch.sourceThreadId) context.addIssue({
+		code: "custom",
+		message: "pending supervision source must match the provisional thread binding"
+	});
+	if (binding.supervisionSourceThreadId !== binding.pendingSupervisionBranch.sourceThreadId) context.addIssue({
+		code: "custom",
+		message: "pending supervision source must match its durable source identity"
+	});
+	if (binding.preserveNativeModel !== true) context.addIssue({
+		code: "custom",
+		message: "pending supervision bindings must defer model selection to Codex App Server"
+	});
+	if (binding.connectionScope !== "supervision") context.addIssue({
+		code: "custom",
+		message: "pending supervision bindings require supervision connection ownership"
+	});
+});
+var CodexSupervisionBindingReplacementError = class extends Error {
+	constructor(threadId, operation) {
+		super(`Refusing to replace supervised Codex thread ${threadId} while ${operation}; its native user-home connection and model ownership must be preserved`);
+		this.name = "CodexSupervisionBindingReplacementError";
+	}
+};
+function assertCodexBindingMayBeReplaced(binding, operation) {
+	if (binding?.connectionScope === "supervision") throw new CodexSupervisionBindingReplacementError(binding.threadId, operation);
+}
+const bindingLeaseSchema = z.object({
+	token: z.string().refine((value) => Boolean(value.trim())),
+	expiresAt: z.number().finite()
+});
+const storedSessionIdSchema = z.string().transform((value) => value.trim()).pipe(z.string().min(1)).optional().catch(void 0);
+const storedBindingSchema = z.discriminatedUnion("state", [z.object({
+	version: z.literal(1),
+	state: z.literal("active"),
+	binding: threadBindingSchema,
+	sessionId: storedSessionIdSchema,
+	lease: bindingLeaseSchema.optional().catch(void 0)
+}), z.object({
+	version: z.literal(1),
+	state: z.literal("cleared"),
+	sessionId: storedSessionIdSchema,
+	lease: bindingLeaseSchema.optional().catch(void 0),
+	retired: z.literal(true).optional().catch(void 0)
+})]);
+function hashCodexAppServerBindingFingerprint(canonical) {
+	return `sha256:${createHash("sha256").update(canonical).digest("hex")}`;
+}
+function normalizeLegacyBindingFingerprint(value) {
+	if (typeof value !== "string" || value === "" || value === "[]" || BOUNDED_BINDING_FINGERPRINT_PATTERN.test(value)) return value;
+	return hashCodexAppServerBindingFingerprint(value);
+}
+function normalizeLegacyBindingFingerprints(record) {
+	let normalized = record;
+	for (const key of ["dynamicToolsFingerprint", "userMcpServersFingerprint"]) {
+		const value = record[key];
+		const next = normalizeLegacyBindingFingerprint(value);
+		if (next === value) continue;
+		if (normalized === record) normalized = { ...record };
+		normalized[key] = next;
+	}
+	return normalized;
+}
+function normalizeStoredCodexAppServerBindingFingerprints(value) {
+	const stored = readStoredCodexAppServerBinding(value);
+	if (!stored || stored.state !== "active") return stored;
+	const binding = normalizeLegacyBindingFingerprints(stored.binding);
+	return binding === stored.binding ? stored : readStoredCodexAppServerBinding({
+		...stored,
+		binding
+	});
+}
+/** Encodes a migrated sidecar binding as one canonical plugin-state row. */
+function createStoredCodexAppServerBinding(value, options = {}) {
+	const rawRecord = asRecord(value);
+	if (!rawRecord) return;
+	const record = normalizeLegacyBindingFingerprints(rawRecord);
+	if (record.schemaVersion !== 1 && record.schemaVersion !== 2) return;
+	const pluginAppPolicyContext = readPluginAppPolicyContext(record.pluginAppPolicyContext, record.schemaVersion);
+	const historyCoveredThrough = readTimestamp(record.historyCoveredThrough) ?? readTimestamp(record.updatedAt) ?? readTimestamp(record.createdAt) ?? readTimestamp(options.now) ?? (/* @__PURE__ */ new Date()).toISOString();
+	const authProfileId = typeof record.authProfileId === "string" ? record.authProfileId : void 0;
+	const binding = readCodexAppServerThreadBinding({
+		...record,
+		modelProvider: normalizeCodexAppServerBindingModelProvider({
+			...options.lookup,
+			authProfileId,
+			modelProvider: typeof record.modelProvider === "string" ? record.modelProvider : void 0
+		}),
+		cwd: typeof record.cwd === "string" ? record.cwd : "",
+		pluginAppPolicyContext,
+		historyCoveredThrough
+	});
+	return binding ? {
+		version: 1,
+		state: "active",
+		binding: stripUndefinedBinding(binding)
+	} : void 0;
+}
+function bindingLeaseLostError(key, cause) {
+	return new Error(`Lost Codex binding lease: ${key}`, cause === void 0 ? void 0 : { cause });
+}
+/** Lets the authoritative OpenClaw session generation claim a stale stable binding row. */
+async function reclaimCurrentCodexSessionGeneration(params) {
+	const sessionKey = params.identity.sessionKey?.trim();
+	if (!sessionKey) return true;
+	const plan = await params.bindingStore.prepareSessionGenerationReclaim(params.identity);
+	if (plan.kind === "resolved") return plan.result;
+	try {
+		const storePath = resolveStorePath(params.config?.session?.store, { agentId: params.identity.agentId });
+		if (getSessionEntry({
+			agentId: params.identity.agentId,
+			hydrateSkillPromptRefs: false,
+			readConsistency: "latest",
+			sessionKey,
+			storePath
+		})?.sessionId !== params.identity.sessionId) return false;
+	} catch {
+		return false;
+	}
+	return await params.bindingStore.mutate(params.identity, {
+		kind: "reclaim-generation",
+		expectedPreviousSessionId: plan.expectedPreviousSessionId
+	});
+}
+/** Creates the single binding facade owned by the Codex plugin runtime. */
+function createCodexAppServerBindingStore(state) {
+	const update = state.update?.bind(state);
+	if (!update) throw new Error("Codex app-server bindings require atomic plugin-state updates");
+	const leaseContext = new AsyncLocalStorage();
+	const archiveContext = new AsyncLocalStorage();
+	let activeBindingMutations = 0;
+	let pendingArchives = 0;
+	let archiveTail = Promise.resolve();
+	let bindingMutationsDrained = [];
+	const waitForBindingMutations = async () => {
+		if (activeBindingMutations === 0) return;
+		await new Promise((resolve) => {
+			bindingMutationsDrained.push(resolve);
+		});
+	};
+	const runBindingMutation = async (run) => {
+		if (archiveContext.getStore() === true) return await run();
+		if (pendingArchives > 0) throw new Error("Codex binding mutation blocked while a native archive is in progress; retry");
+		activeBindingMutations += 1;
+		try {
+			return await run();
+		} finally {
+			activeBindingMutations -= 1;
+			if (activeBindingMutations === 0) {
+				const drained = bindingMutationsDrained;
+				bindingMutationsDrained = [];
+				for (const resolve of drained) resolve();
+			}
+		}
+	};
+	const renewLease = (key, owner) => {
+		if (owner.failure) return;
+		try {
+			let renewed = false;
+			const stored = update(key, (raw) => {
+				const current = readStoredCodexAppServerBinding(raw);
+				if (raw !== void 0 && !current) throw new Error(`Invalid Codex app-server binding row: ${key}`);
+				const lease = current?.lease;
+				const now = Date.now();
+				if (!lease || lease.token !== owner.token || lease.expiresAt <= now) return;
+				renewed = true;
+				return {
+					...current,
+					lease: {
+						token: owner.token,
+						expiresAt: now + BINDING_LEASE_STALE_MS
+					}
+				};
+			});
+			if (!renewed || !stored) owner.failure = bindingLeaseLostError(key);
+		} catch (error) {
+			owner.failure = bindingLeaseLostError(key, error);
+		}
+	};
+	const transactKey = async (key, apply, ttlMs) => {
+		const deadline = Date.now() + BINDING_LEASE_WAIT_MS;
+		while (true) {
+			let busy = false;
+			let leaseLost = false;
+			let result;
+			const ownedLease = leaseContext.getStore()?.get(key);
+			if (ownedLease?.failure) throw ownedLease.failure;
+			const ownedToken = ownedLease?.token;
+			update(key, (raw) => {
+				const current = readStoredCodexAppServerBinding(raw);
+				if (raw !== void 0 && !current) throw new Error(`Invalid Codex app-server binding row: ${key}`);
+				const activeLease = current?.lease;
+				const now = Date.now();
+				if (ownedToken && (!activeLease || activeLease.token !== ownedToken || activeLease.expiresAt <= now)) {
+					leaseLost = true;
+					return;
+				}
+				if (activeLease && activeLease.token !== ownedToken && activeLease.expiresAt > now) {
+					busy = true;
+					return;
+				}
+				const applied = apply(current, ownedToken);
+				result = applied.result;
+				return applied.next;
+			}, ttlMs == null ? void 0 : { ttlMs });
+			if (leaseLost) {
+				const failure = bindingLeaseLostError(key);
+				if (ownedLease) ownedLease.failure = failure;
+				throw failure;
+			}
+			if (!busy) return result;
+			if (Date.now() >= deadline) throw new Error(`Timed out waiting for Codex binding lease: ${key}`);
+			await sleep(BINDING_LEASE_RETRY_INTERVAL_MS);
+		}
+	};
+	return {
+		async read(identity) {
+			const key = bindingStoreKey(identity);
+			const raw = state.lookup(key);
+			const stored = readStoredCodexAppServerBinding(raw);
+			if (raw !== void 0 && !stored) throw new Error(`Invalid Codex app-server binding row: ${key}`);
+			return stored?.state === "active" && ownsStoredSessionGeneration(identity, stored) ? stored.binding : void 0;
+		},
+		async hasOtherThreadOwner(threadId, currentIdentity) {
+			const currentKey = currentIdentity ? bindingStoreKey(currentIdentity) : void 0;
+			return state.entries().some(({ key, value }) => {
+				const stored = readStoredCodexAppServerBinding(value);
+				if (!stored) throw new Error(`Invalid Codex app-server binding row: ${key}`);
+				const isCurrentOwner = currentIdentity !== void 0 && key === currentKey && (currentIdentity.kind === "conversation" || stored.sessionId === currentIdentity.sessionId.trim());
+				if (stored.state !== "active" || stored.binding.threadId !== threadId || isCurrentOwner) return false;
+				return true;
+			});
+		},
+		async prepareSessionGenerationReclaim(identity) {
+			const key = bindingStoreKey(identity);
+			const raw = state.lookup(key);
+			const current = readStoredCodexAppServerBinding(raw);
+			if (raw !== void 0 && !current) throw new Error(`Invalid Codex app-server binding row: ${key}`);
+			if (!current) return {
+				kind: "resolved",
+				result: true
+			};
+			const currentSessionId = current.sessionId;
+			if (!currentSessionId || currentSessionId === identity.sessionId) return {
+				kind: "resolved",
+				result: current.state !== "cleared" || current.retired !== true
+			};
+			return {
+				kind: "verify",
+				expectedPreviousSessionId: currentSessionId
+			};
+		},
+		async mutate(identity, mutation) {
+			return await runBindingMutation(async () => {
+				const key = bindingStoreKey(identity);
+				const retainLegacyClear = mutation.kind === "clear" && key.startsWith("conversation:legacy-");
+				return await transactKey(key, (current, leaseToken) => {
+					const ownsGeneration = ownsStoredSessionGeneration(identity, current);
+					const ownedLease = current?.lease && current.lease.token === leaseToken ? { lease: current.lease } : {};
+					if (mutation.kind === "reclaim-generation") {
+						if (identity.kind !== "session" || !identity.sessionKey?.trim()) return { result: false };
+						if (!current) return { result: true };
+						if (ownsGeneration) return { result: current.state !== "cleared" || current.retired !== true };
+						if (current.sessionId !== mutation.expectedPreviousSessionId) return { result: false };
+						if (current.state === "active" && current.binding.connectionScope === "supervision") return { result: false };
+						return {
+							result: true,
+							next: {
+								version: 1,
+								state: "cleared",
+								sessionId: identity.sessionId,
+								...ownedLease
+							}
+						};
+					}
+					const storedActive = current?.state === "active" ? current : void 0;
+					const active = ownsGeneration ? storedActive : void 0;
+					const retiredGeneration = current?.state === "cleared" && current.retired === true && ownsGeneration;
+					const preservesSupervisionOwner = mutation.kind === "set" && active?.binding.connectionScope === "supervision" && isSameSupervisionOwner(active.binding, mutation.binding);
+					const clearsPendingSupervisionOwner = mutation.kind === "clear" && active?.binding.connectionScope === "supervision" && matchesPendingSupervisionClear(active.binding, mutation.threadId, mutation.expectedPendingSupervisionBranch);
+					if (mutation.kind === "set" && (mutation.if?.kind === "absent" && storedActive || current !== void 0 && !ownsGeneration || retiredGeneration || active?.binding.connectionScope === "supervision" && !preservesSupervisionOwner) || mutation.kind === "patch" && active?.binding.threadId !== mutation.threadId || (mutation.kind === "patch-pending-supervision-branch" || mutation.kind === "commit-pending-supervision-branch") && !matchesPendingSupervisionBranch(active?.binding, mutation.expected) || mutation.kind === "clear" && (mutation.threadId !== void 0 && active?.binding.threadId !== mutation.threadId || !ownsGeneration || active?.binding.connectionScope === "supervision" && !clearsPendingSupervisionOwner)) return { result: false };
+					if (mutation.kind === "clear" && retiredGeneration) return { result: true };
+					if (mutation.kind === "clear") return {
+						result: true,
+						next: {
+							version: 1,
+							state: "cleared",
+							...storedSessionGeneration(identity, current),
+							...ownedLease
+						}
+					};
+					let binding;
+					if (mutation.kind === "set") binding = validateBindingForWrite(mutation.binding);
+					else if (mutation.kind === "patch-pending-supervision-branch") binding = validateBindingForWrite({
+						...active.binding,
+						pendingSupervisionBranch: mutation.pending
+					});
+					else if (mutation.kind === "commit-pending-supervision-branch") binding = validateBindingForWrite({
+						...active.binding,
+						...mutation.patch,
+						threadId: mutation.threadId,
+						pendingSupervisionBranch: void 0
+					});
+					else binding = validateBindingForWrite({
+						...active.binding,
+						...mutation.patch,
+						threadId: mutation.threadId
+					});
+					return {
+						result: true,
+						next: {
+							version: 1,
+							state: "active",
+							binding,
+							...storedSessionGeneration(identity, current),
+							...ownedLease
+						}
+					};
+				}, mutation.kind === "clear" && !retainLegacyClear && !leaseContext.getStore()?.has(key) ? 1 : void 0);
+			});
+		},
+		async adoptSessionGeneration(identity, expectedPreviousSessionId) {
+			return await runBindingMutation(async () => {
+				const key = bindingStoreKey(identity);
+				const expectedSessionId = expectedPreviousSessionId.trim();
+				const targetSessionId = identity.sessionId.trim();
+				if (!expectedSessionId) throw new Error("Codex session generation adoption requires the previous session id");
+				return await transactKey(key, (current) => {
+					if (current?.state !== "active") return { result: "absent" };
+					if (current.sessionId === targetSessionId) return { result: "current" };
+					if (current.sessionId !== expectedSessionId) return { result: "conflict" };
+					return {
+						result: "adopted",
+						next: {
+							...current,
+							sessionId: targetSessionId
+						}
+					};
+				});
+			});
+		},
+		async retireSessionGeneration(identity) {
+			return await runBindingMutation(async () => {
+				const key = bindingStoreKey(identity);
+				return await transactKey(key, (current, leaseToken) => {
+					if (!current) return { result: "absent" };
+					if (!ownsStoredSessionGeneration(identity, current)) return { result: "conflict" };
+					if (current.state === "cleared" && current.retired === true) return { result: "applied" };
+					return {
+						result: "applied",
+						next: {
+							version: 1,
+							state: "cleared",
+							retired: true,
+							...storedSessionGeneration(identity, current),
+							...current.lease && current.lease.token === leaseToken ? { lease: current.lease } : {}
+						}
+					};
+				}, identity.sessionKey?.trim() ? void 0 : PHYSICAL_SESSION_RETIRE_TTL_MS);
+			});
+		},
+		async withThreadArchiveFence(run) {
+			pendingArchives += 1;
+			const operation = archiveTail.then(async () => {
+				await waitForBindingMutations();
+				return await archiveContext.run(true, run);
+			});
+			archiveTail = operation.then(() => void 0, () => void 0);
+			try {
+				return await operation;
+			} finally {
+				pendingArchives -= 1;
+			}
+		},
+		async withLease(identity, run) {
+			const key = bindingStoreKey(identity);
+			const owned = leaseContext.getStore();
+			const existingOwner = owned?.get(key);
+			if (existingOwner) {
+				const failureBeforeRun = existingOwner.failure;
+				if (failureBeforeRun) throw failureBeforeRun;
+				const result = await run();
+				const failureAfterRun = existingOwner.failure;
+				if (failureAfterRun) throw failureAfterRun;
+				return result;
+			}
+			const token = randomUUID();
+			if (!await transactKey(key, (current) => {
+				if (current?.state === "cleared" && current.retired === true && ownsStoredSessionGeneration(identity, current)) return { result: false };
+				const lease = {
+					token,
+					expiresAt: Date.now() + BINDING_LEASE_STALE_MS
+				};
+				if (current?.state === "active") return {
+					result: true,
+					next: {
+						...current,
+						...preservedSessionGeneration(identity, current),
+						lease
+					}
+				};
+				if (current?.state === "cleared" && current.retired === true) return {
+					result: true,
+					next: {
+						...current,
+						lease
+					}
+				};
+				return {
+					result: true,
+					next: {
+						version: 1,
+						state: "cleared",
+						...preservedSessionGeneration(identity, current),
+						lease
+					}
+				};
+			})) throw new Error(`Codex binding generation was retired: ${key}`);
+			const owner = { token };
+			const nested = new Map(owned);
+			nested.set(key, owner);
+			const heartbeat = setInterval(() => renewLease(key, owner), BINDING_LEASE_RENEW_INTERVAL_MS);
+			heartbeat.unref();
+			try {
+				const result = await leaseContext.run(nested, run);
+				if (owner.failure) throw owner.failure;
+				return result;
+			} finally {
+				clearInterval(heartbeat);
+				try {
+					const removeOwnedLease = (raw, matches) => {
+						const current = readStoredCodexAppServerBinding(raw);
+						if (!current || !matches(current) || current.lease?.token !== token) return;
+						const { lease: _lease, ...released } = current;
+						return released;
+					};
+					if (!update(key, (raw) => removeOwnedLease(raw, (current) => current.state === "active"))) {
+						if (!update(key, (raw) => removeOwnedLease(raw, (current) => current.state === "cleared" && current.retired === true), key.startsWith("session:") ? { ttlMs: PHYSICAL_SESSION_RETIRE_TTL_MS } : void 0)) update(key, (raw) => removeOwnedLease(raw, (current) => current.state === "cleared"), { ttlMs: 1 });
+					}
+				} catch (error) {
+					embeddedAgentLog.warn("failed to release codex app-server binding lease", {
+						key,
+						error
+					});
+				}
+			}
+		}
+	};
+}
+function matchesPendingSupervisionBranch(binding, expected) {
+	const pending = binding?.pendingSupervisionBranch;
+	if (!pending || binding?.threadId !== expected.sourceThreadId) return false;
+	if (pending.sourceThreadId !== expected.sourceThreadId || pending.connectionFingerprint !== expected.connectionFingerprint || pending.lastTurnId !== expected.lastTurnId) return false;
+	const currentCleanup = pending.cleanupThreadIds ?? [];
+	const expectedCleanup = expected.cleanupThreadIds ?? [];
+	return currentCleanup.length === expectedCleanup.length && currentCleanup.every((threadId, index) => threadId === expectedCleanup[index]);
+}
+function isSameSupervisionOwner(current, replacement) {
+	return replacement.connectionScope === "supervision" && replacement.threadId === current.threadId && replacement.supervisionSourceThreadId === current.supervisionSourceThreadId;
+}
+function matchesPendingSupervisionClear(binding, threadId, expected) {
+	if (!expected) return false;
+	const sourceThreadId = expected.sourceThreadId;
+	return threadId === sourceThreadId && binding.supervisionSourceThreadId === sourceThreadId && matchesPendingSupervisionBranch(binding, expected);
+}
+/** Stable plugin-state key for one current binding owner. */
+function bindingStoreKey(identity) {
+	if (identity.kind === "session") {
+		const rawAgentId = identity.agentId.trim();
+		const sessionId = identity.sessionId.trim();
+		if (!rawAgentId) throw new Error("Codex app-server binding requires an agent id");
+		if (!sessionId) throw new Error("Codex app-server binding requires a session id");
+		const agentId = resolveSessionAgentIds({ agentId: rawAgentId }).sessionAgentId;
+		const sessionKey = identity.sessionKey?.trim();
+		if (sessionKey) return `session-key:${agentId}:${createHash("sha256").update(sessionKey).digest("base64url")}`;
+		return `session:${agentId}:${sessionId}`;
+	}
+	const bindingId = identity.bindingId.trim();
+	if (!bindingId) throw new Error("Codex app-server conversation binding requires a binding id");
+	return `conversation:${bindingId}`;
+}
+function readStoredCodexAppServerBinding(value) {
+	const result = storedBindingSchema.safeParse(value);
+	return result.success ? stripUndefinedValue(result.data) : void 0;
+}
+function storedSessionGeneration(identity, current) {
+	if (identity.kind === "session") return { sessionId: identity.sessionId };
+	return current?.sessionId ? { sessionId: current.sessionId } : {};
+}
+function preservedSessionGeneration(identity, current) {
+	if (current?.sessionId) return { sessionId: current.sessionId };
+	return storedSessionGeneration(identity, current);
+}
+function ownsStoredSessionGeneration(identity, current) {
+	return identity.kind !== "session" || !current?.sessionId || current.sessionId === identity.sessionId;
+}
+function validateBindingForWrite(binding) {
+	const validated = readCodexAppServerThreadBinding(binding);
+	if (!validated) throw new Error("Invalid Codex app-server thread binding");
+	return stripUndefinedBinding(validated);
+}
+/** Parses stored or shipped sidecar data into the current domain value. */
+function readCodexAppServerThreadBinding(value) {
+	const result = threadBindingSchema.safeParse(value);
+	if (!result.success) return;
+	return result.data;
+}
+function stripUndefinedBinding(binding) {
+	return stripUndefinedValue(binding);
+}
+function stripUndefinedValue(value) {
+	if (Array.isArray(value)) return value.map(stripUndefinedValue);
+	if (!value || typeof value !== "object") return value;
+	return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0).map(([key, entry]) => [key, stripUndefinedValue(entry)]));
+}
+function asRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function readTimestamp(value) {
+	return optionalTimestampSchema.parse(value);
+}
+function readPluginAppPolicyContext(value, bindingSchemaVersion) {
+	const record = asRecord(value);
+	if (!record || typeof record.fingerprint !== "string") return;
+	const apps = asRecord(record.apps);
+	if (!apps) return;
+	const parsedApps = {};
+	for (const [appId, rawEntry] of Object.entries(apps)) {
+		const entry = asRecord(rawEntry);
+		if (!entry) return;
+		const destructiveApprovalMode = readDestructiveApprovalMode(entry.destructiveApprovalMode, bindingSchemaVersion);
+		const mcpServerNamesValid = Array.isArray(entry.mcpServerNames) && entry.mcpServerNames.every((serverName) => typeof serverName === "string");
+		if (entry.source === "account") {
+			if ("appId" in entry || typeof entry.appName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || destructiveApprovalMode === "invalid" || !mcpServerNamesValid) return;
+			parsedApps[appId] = {
+				source: "account",
+				appName: entry.appName,
+				allowDestructiveActions: entry.allowDestructiveActions,
+				...destructiveApprovalMode ? { destructiveApprovalMode } : {},
+				mcpServerNames: entry.mcpServerNames
+			};
+			continue;
+		}
+		if ("appId" in entry || entry.source !== void 0 && entry.source !== "plugin" || typeof entry.configKey !== "string" || entry.marketplaceName !== "openai-curated" && entry.marketplaceName !== "workspace-directory" || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || destructiveApprovalMode === "invalid" || !mcpServerNamesValid) return;
+		parsedApps[appId] = {
+			configKey: entry.configKey,
+			marketplaceName: entry.marketplaceName,
+			pluginName: entry.pluginName,
+			allowDestructiveActions: entry.allowDestructiveActions,
+			...destructiveApprovalMode ? { destructiveApprovalMode } : {},
+			mcpServerNames: entry.mcpServerNames
+		};
+	}
+	const parsedPluginAppIds = {};
+	if (record.pluginAppIds !== void 0 && (!record.pluginAppIds || typeof record.pluginAppIds !== "object" || Array.isArray(record.pluginAppIds))) return;
+	if (record.pluginAppIds && typeof record.pluginAppIds === "object") for (const [configKey, appIds] of Object.entries(record.pluginAppIds)) {
+		if (!Array.isArray(appIds) || appIds.some((appId) => typeof appId !== "string")) return;
+		parsedPluginAppIds[configKey] = appIds;
+	}
+	return {
+		fingerprint: record.fingerprint,
+		apps: parsedApps,
+		pluginAppIds: parsedPluginAppIds
+	};
+}
+function readDestructiveApprovalMode(value, bindingSchemaVersion) {
+	if (value === void 0) return;
+	if (value === "allow" || value === "deny") return value;
+	if (value === "auto") return bindingSchemaVersion === 1 ? "allow" : "auto";
+	if (value === "ask" && bindingSchemaVersion === 2) return "ask";
+	if (value === "on-request" && bindingSchemaVersion === 1) return "auto";
+	return "invalid";
+}
+function sleep(ms) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
+}
+/** Returns true when an auth profile uses native Codex/OpenAI app-server auth. */
+function isCodexAppServerNativeAuthProfile(lookup) {
+	const authProfileId = lookup.authProfileId?.trim();
+	if (!authProfileId) return false;
+	try {
+		const credential = (lookup.authProfileStore ?? ensureAuthProfileStore(lookup.agentDir?.trim() || resolveDefaultAgentDir(lookup.config ?? {}), {
+			allowKeychainPrompt: false,
+			config: lookup.config,
+			externalCliProviderIds: [CODEX_APP_SERVER_NATIVE_AUTH_PROVIDER],
+			externalCliProfileIds: [authProfileId]
+		})).profiles[authProfileId];
+		if (!credential || credential.type === "api_key") return false;
+		const provider = credential.provider?.trim();
+		return Boolean(provider && resolveProviderIdForAuth(provider, { config: lookup.config }) === CODEX_APP_SERVER_NATIVE_AUTH_PROVIDER);
+	} catch (error) {
+		embeddedAgentLog.debug("failed to resolve codex app-server auth profile provider", {
+			authProfileId,
+			error
+		});
+		return false;
+	}
+}
+/** Hides redundant OpenAI provider attribution for native Codex auth bindings. */
+function normalizeCodexAppServerBindingModelProvider(params) {
+	const modelProvider = params.modelProvider?.trim();
+	if (!modelProvider) return;
+	if (isCodexAppServerNativeAuthProfile(params) && modelProvider.toLowerCase() === PUBLIC_OPENAI_MODEL_PROVIDER) return;
+	return modelProvider;
+}
+/** Restores the sole provider intentionally omitted from canonical binding rows. */
+function resolveCodexAppServerBindingModelProvider(params) {
+	return params.modelProvider?.trim() || (isCodexAppServerNativeAuthProfile(params) ? PUBLIC_OPENAI_MODEL_PROVIDER : void 0);
+}
+//#endregion
+export { resolveCodexComputerUseConfig as C, resolveOpenClawExecPolicyForCodexAppServer as D, resolveCodexSupervisionAppServerRuntimeOptions as E, shouldAutoApproveCodexAppServerApprovals as O, resolveCodexAppServerUserHomeDir as S, resolveCodexPluginsPolicy as T, isCodexFastServiceTier as _, isCodexAppServerNativeAuthProfile as a, resolveCodexAppServerRuntimeOptions as b, sessionBindingIdentity as c, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as d, assertCodexAppServerConnectionSecurity as f, isCodexAppServerApprovalPolicyAllowedByRequirements as g, codexSandboxPolicyForTurn as h, hashCodexAppServerBindingFingerprint as i, withMcpElicitationsApprovalPolicy as k, session_binding_exports as l, codexAppServerStartOptionsKey as m, assertCodexBindingMayBeReplaced as n, normalizeCodexAppServerBindingModelProvider as o, canUseCodexModelBackedApprovalsReviewerForModel as p, bindingStoreKey as r, reclaimCurrentCodexSessionGeneration as s, CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS as t, CODEX_PLUGINS_MARKETPLACE_NAME as u, isCodexSandboxExecServerEnabled as v, resolveCodexModelBackedReviewerPolicyContext as w, resolveCodexAppServerStartOptionsForAgent as x, readCodexPluginConfig as y };