@openclaw/codex 2026.6.11-beta.2 → 2026.7.1-1

package/dist/{config-CszD0vP3.js → config-CYEDnLJ2.js}

@@ -1,13 +1,13 @@
 import path from "node:path";
 import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
-import { normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, createHmac, randomBytes } from "node:crypto";
 import { readFileSync } from "node:fs";
-import { hostname } from "node:os";
+import { homedir, hostname } from "node:os";
 import { resolveProviderIdForAuth } 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 { z } from "zod";
 //#region extensions/codex/src/app-server/config.ts
@@ -27,14 +27,14 @@ const DEFAULT_CODEX_COMPUTER_USE_MCP_SERVER_NAME = "computer-use";
 const DEFAULT_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS = 6e4;
 const DEFAULT_CODEX_APP_SERVER_NETWORK_PROXY_PROFILE_PREFIX = "openclaw-network";
 const codexAppServerTransportSchema = z.enum(["stdio", "websocket"]);
+const codexAppServerHomeScopeSchema = z.enum(["agent", "user"]);
 const SecretInputSchema = buildSecretInputSchema();
 const codexAppServerPolicyModeSchema = z.enum(["yolo", "guardian"]);
-const codexAppServerApprovalPolicySchema = z.enum([
+const codexAppServerApprovalPolicySchema = z.preprocess((value) => value === "on-failure" ? "on-request" : value, z.enum([
 	"never",
 	"on-request",
-	"on-failure",
 	"untrusted"
-]);
+]));
 const codexAppServerSandboxSchema = z.enum([
 	"read-only",
 	"workspace-write",
@@ -46,7 +46,11 @@ const codexAppServerApprovalsReviewerSchema = z.enum([
 	"guardian_subagent"
 ]);
 const codexDynamicToolsLoadingSchema = z.enum(["searchable", "direct"]);
-const codexPluginDestructivePolicySchema = z.union([z.boolean(), z.literal("auto")]);
+const codexPluginDestructivePolicySchema = z.union([
+	z.boolean(),
+	z.literal("auto"),
+	z.literal("ask")
+]);
 const codexAppServerServiceTierSchema = z.preprocess((value) => value === null ? null : normalizeCodexServiceTier(value), z.string().trim().min(1).nullable().optional()).optional();
 const codexAppServerExperimentalSchema = z.object({ sandboxExecServer: z.boolean().optional() }).strict();
 const codexAppServerRemoteWorkspaceRootSchema = z.string().trim().min(1);
@@ -76,6 +80,7 @@ const codexPluginEntryConfigSchema = z.object({
 }).strict();
 const codexPluginsConfigSchema = z.object({
 	enabled: z.boolean().optional(),
+	allow_all_plugins: z.boolean().optional(),
 	allow_destructive_actions: codexPluginDestructivePolicySchema.optional(),
 	plugins: z.record(z.string(), codexPluginEntryConfigSchema).optional()
 }).strict();
@@ -100,6 +105,7 @@ const codexPluginConfigSchema = z.object({
 	appServer: z.object({
 		mode: codexAppServerPolicyModeSchema.optional(),
 		transport: codexAppServerTransportSchema.optional(),
+		homeScope: codexAppServerHomeScopeSchema.optional(),
 		command: z.string().optional(),
 		args: z.union([z.array(z.string()), z.string()]).optional(),
 		url: z.string().optional(),
@@ -161,15 +167,16 @@ function resolveCodexPluginsPolicy(pluginConfig) {
 	return {
 		configured,
 		enabled,
+		allowAllPlugins: enabled && config?.allow_all_plugins === true,
 		allowDestructiveActions: destructivePolicy.allowDestructiveActions,
 		destructiveApprovalMode: destructivePolicy.destructiveApprovalMode,
 		pluginPolicies
 	};
 }
 function resolveCodexPluginDestructivePolicy(policy) {
-	if (policy === "auto") return {
+	if (policy === "auto" || policy === "ask") return {
 		allowDestructiveActions: true,
-		destructiveApprovalMode: "auto"
+		destructiveApprovalMode: policy
 	};
 	return {
 		allowDestructiveActions: policy,
@@ -180,6 +187,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 configCommand = readNonEmptyString(config.command);
 	const envCommand = readNonEmptyString(env.OPENCLAW_CODEX_APP_SERVER_BIN);
 	const command = configCommand ?? envCommand ?? "codex";
@@ -218,7 +226,8 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		config: params.config,
 		env,
 		agentDir: params.agentDir,
-		codexConfigToml: params.codexConfigToml
+		codexConfigToml: params.codexConfigToml,
+		homeScope
 	});
 	const forceUserReviewer = !canUseModelBackedReviewer && (explicitApprovalsReviewer === "auto_review" || explicitApprovalsReviewer === "guardian_subagent" || explicitPolicyMode === "guardian" && explicitApprovalsReviewer !== "user") || execMode !== void 0 && execMode !== "full" && (execMode !== "auto" || !canUseModelBackedReviewer);
 	const forceGuardianReviewer = execMode === "auto" && canUseModelBackedReviewer;
@@ -255,6 +264,7 @@ 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,
 		authToken,
@@ -267,6 +277,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 	return {
 		start: {
 			transport,
+			homeScope,
 			command,
 			commandSource,
 			args: args.length > 0 ? args : [
@@ -366,6 +377,7 @@ function codexAppServerStartOptionsKey(options, params = {}) {
 		transport: options.transport,
 		command: options.command,
 		commandSource: options.commandSource ?? null,
+		managedFallbackCommandPaths: [...options.managedFallbackCommandPaths ?? []],
 		args: options.args,
 		url: options.url ?? null,
 		authToken: hashSecretForKey(options.authToken, "authToken"),
@@ -430,10 +442,11 @@ function resolveCodexAppServerNetworkProxy(config, sandbox) {
 function resolveNetworkProxyPermissionProfileName(config, profile) {
 	const explicitProfileName = readNonEmptyString(config.profileName);
 	if (explicitProfileName) return explicitProfileName;
-	return `${DEFAULT_CODEX_APP_SERVER_NETWORK_PROXY_PROFILE_PREFIX}-${createHash("sha256").update(stableStringifyJson({
+	const suffix = createHash("sha256").update(stableStringifyJson({
 		version: 1,
 		profile
-	})).digest("hex").slice(0, 16)}`;
+	})).digest("hex").slice(0, 16);
+	return `${DEFAULT_CODEX_APP_SERVER_NETWORK_PROXY_PROFILE_PREFIX}-${suffix}`;
 }
 function fingerprintCodexAppServerNetworkProxyConfigPatch(configPatch) {
 	return createHash("sha256").update(stableStringifyJson(configPatch)).digest("hex");
@@ -458,12 +471,16 @@ function withMcpElicitationsApprovalPolicy(policy) {
 	if (policy === "never") return { granular: {
 		mcp_elicitations: true,
 		rules: false,
-		sandbox_approval: false
+		sandbox_approval: false,
+		request_permissions: false,
+		skill_approval: false
 	} };
 	return { granular: {
 		mcp_elicitations: true,
 		rules: true,
-		sandbox_approval: true
+		sandbox_approval: true,
+		request_permissions: true,
+		skill_approval: true
 	} };
 }
 function resolveTransport(value) {
@@ -695,7 +712,9 @@ function globPatternMatches(value, pattern) {
 	return new RegExp(regex).test(value);
 }
 function normalizeRequirementsApprovalPolicy(value) {
-	return resolveApprovalPolicy(value.trim().toLowerCase());
+	const normalized = value.trim().toLowerCase();
+	if (normalized === "on-failure") return "on-request";
+	return resolveApprovalPolicy(normalized);
 }
 function normalizeRequirementsApprovalsReviewer(value) {
 	return resolveApprovalsReviewer(value.trim().toLowerCase());
@@ -703,7 +722,6 @@ function normalizeRequirementsApprovalsReviewer(value) {
 function selectGuardianApprovalPolicy(allowedApprovalPolicies, execModeRequiringPromptingApprovals) {
 	if (allowedApprovalPolicies === void 0 || allowedApprovalPolicies.has("on-request")) return "on-request";
 	if (execModeRequiringPromptingApprovals) throw new Error(`tools.exec.mode=${execModeRequiringPromptingApprovals} requires Codex app-server prompting approvals`);
-	if (allowedApprovalPolicies.has("on-failure")) return "on-failure";
 	if (allowedApprovalPolicies.has("untrusted")) return "untrusted";
 	if (allowedApprovalPolicies.has("never")) return "never";
 	return "on-request";
@@ -728,7 +746,8 @@ function isTrustedCodexModelBackedApprovalsReviewerProvider(provider, params) {
 		env: params.env,
 		model: params.model,
 		agentDir: params.agentDir,
-		codexConfigToml: params.codexConfigToml
+		codexConfigToml: params.codexConfigToml,
+		homeScope: params.homeScope
 	});
 }
 function readCodexBaseUrlOverridesForModelBackedReview(params) {
@@ -761,10 +780,16 @@ function readCodexAppServerConfigToml(params) {
 	}
 }
 function resolveCodexAppServerConfigPath(params) {
+	if (params.homeScope === "user") return path.join(resolveCodexAppServerUserHomeDir(params.env), CODEX_CONFIG_TOML_FILENAME);
 	const agentDir = readNonEmptyString(params.agentDir);
 	const codexHome = agentDir ? path.join(path.resolve(agentDir), CODEX_APP_SERVER_HOME_DIRNAME) : void 0;
 	return codexHome ? path.join(codexHome, CODEX_CONFIG_TOML_FILENAME) : void 0;
 }
+/** Resolves the native user Codex home used by Desktop and the CLI. */
+function resolveCodexAppServerUserHomeDir(env = process.env, homedir$1 = homedir) {
+	const configured = readNonEmptyString(env.CODEX_HOME);
+	return path.resolve(configured ?? path.join(homedir$1(), ".codex"));
+}
 function readErrorCode(error) {
 	return error && typeof error === "object" && "code" in error ? String(error.code) : void 0;
 }
@@ -855,7 +880,8 @@ function selectGuardianSandbox(allowedSandboxModes) {
 	return "workspace-write";
 }
 function resolveApprovalPolicy(value) {
-	return value === "on-request" || value === "on-failure" || value === "untrusted" || value === "never" ? value : void 0;
+	if (value === "on-failure") return "on-request";
+	return value === "on-request" || value === "untrusted" || value === "never" ? value : void 0;
 }
 function resolveSandbox(value) {
 	return value === "read-only" || value === "workspace-write" || value === "danger-full-access" ? value : void 0;
@@ -1109,4 +1135,4 @@ function splitShellWords(value) {
 	return words;
 }
 //#endregion
-export { withMcpElicitationsApprovalPolicy as _, isCodexAppServerApprovalPolicyAllowedByRequirements as a, isTrustedCodexModelBackedOpenAIProvider as c, resolveCodexAppServerRuntimeOptions as d, resolveCodexComputerUseConfig as f, shouldAutoApproveCodexAppServerApprovals as g, resolveOpenClawExecPolicyForCodexAppServer as h, codexSandboxPolicyForTurn as i, normalizeCodexServiceTier as l, resolveCodexPluginsPolicy as m, canUseCodexModelBackedApprovalsReviewerForModel as n, isCodexFastServiceTier as o, resolveCodexModelBackedReviewerPolicyContext as p, codexAppServerStartOptionsKey as r, isCodexSandboxExecServerEnabled as s, CODEX_PLUGINS_MARKETPLACE_NAME as t, readCodexPluginConfig as u };
+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 };

package/dist/conversation-binding-data-BHRpYbX3.js

@@ -0,0 +1,121 @@
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
+import { createHash, randomUUID } from "node:crypto";
+import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import process from "node:process";
+//#region extensions/codex/src/conversation-binding-data.ts
+var conversation_binding_data_exports = /* @__PURE__ */ __exportAll({
+	createCodexCliNodeConversationBindingData: () => createCodexCliNodeConversationBindingData,
+	createCodexConversationBindingData: () => createCodexConversationBindingData,
+	legacyCodexConversationBindingId: () => legacyCodexConversationBindingId,
+	readCodexConversationBindingData: () => readCodexConversationBindingData,
+	readCodexConversationBindingDataRecord: () => readCodexConversationBindingDataRecord,
+	resolveCodexDefaultWorkspaceDir: () => resolveCodexDefaultWorkspaceDir
+});
+const APP_SERVER_BINDING_DATA_VERSION = 2;
+const CLI_BINDING_DATA_VERSION = 1;
+function createCodexConversationBindingData(params) {
+	const agentId = params.agentId?.trim();
+	const agentDir = params.agentDir?.trim();
+	const source = readConversationSource(params.source);
+	const start = readConversationStart(params.start);
+	return {
+		kind: "codex-app-server-session",
+		version: APP_SERVER_BINDING_DATA_VERSION,
+		bindingId: params.bindingId?.trim() || randomUUID(),
+		workspaceDir: params.workspaceDir,
+		...agentId ? { agentId } : {},
+		...agentDir ? { agentDir } : {},
+		...source ? { source } : {},
+		...start ? { start } : {}
+	};
+}
+function createCodexCliNodeConversationBindingData(params) {
+	const agentId = params.agentId?.trim();
+	const cwd = params.cwd?.trim();
+	return {
+		kind: "codex-cli-node-session",
+		version: CLI_BINDING_DATA_VERSION,
+		nodeId: params.nodeId,
+		sessionId: params.sessionId,
+		...agentId ? { agentId } : {},
+		...cwd ? { cwd } : {}
+	};
+}
+function readCodexConversationBindingData(binding) {
+	const data = binding?.data;
+	if (!data || typeof data !== "object" || Array.isArray(data)) return;
+	return readCodexConversationBindingDataRecord(data);
+}
+function readCodexConversationBindingDataRecord(data) {
+	if (data.kind === "codex-cli-node-session") {
+		if (data.version !== CLI_BINDING_DATA_VERSION || typeof data.nodeId !== "string" || !data.nodeId.trim() || typeof data.sessionId !== "string" || !data.sessionId.trim()) return;
+		return {
+			kind: "codex-cli-node-session",
+			version: CLI_BINDING_DATA_VERSION,
+			nodeId: data.nodeId.trim(),
+			sessionId: data.sessionId.trim(),
+			agentId: typeof data.agentId === "string" && data.agentId.trim() ? data.agentId.trim() : void 0,
+			cwd: typeof data.cwd === "string" && data.cwd.trim() ? data.cwd.trim() : void 0
+		};
+	}
+	if (data.kind !== "codex-app-server-session") return;
+	const bindingId = data.version === APP_SERVER_BINDING_DATA_VERSION && typeof data.bindingId === "string" && data.bindingId.trim() ? data.bindingId.trim() : data.version === 1 && typeof data.sessionFile === "string" && data.sessionFile.trim() ? legacyCodexConversationBindingId(data.sessionFile) : void 0;
+	if (!bindingId) return;
+	const start = readConversationStart(asOptionalRecord(data.start));
+	const source = readConversationSource(asOptionalRecord(data.source));
+	const legacyBinding = data.version === 1;
+	return {
+		kind: "codex-app-server-session",
+		version: APP_SERVER_BINDING_DATA_VERSION,
+		bindingId,
+		workspaceDir: typeof data.workspaceDir === "string" && data.workspaceDir.trim() ? data.workspaceDir : process.cwd(),
+		agentId: typeof data.agentId === "string" && data.agentId.trim() ? data.agentId.trim() : void 0,
+		agentDir: typeof data.agentDir === "string" && data.agentDir.trim() ? data.agentDir.trim() : void 0,
+		...source ? { source } : {},
+		...start ? { start } : {},
+		...legacyBinding ? { legacyBinding: true } : {}
+	};
+}
+function readConversationSource(value) {
+	const agentId = readString(value, "agentId");
+	const sessionId = readString(value, "sessionId");
+	const threadId = readString(value, "threadId");
+	const sessionKey = readString(value, "sessionKey");
+	if (!agentId || !sessionId || !threadId) return;
+	return {
+		agentId,
+		sessionId,
+		threadId,
+		...sessionKey ? { sessionKey } : {}
+	};
+}
+/** Doctor/runtime v1 decoder key for shipped conversation bindings that stored a file locator. */
+function legacyCodexConversationBindingId(sessionFile) {
+	return `legacy-${createHash("sha256").update(sessionFile).digest("base64url")}`;
+}
+function resolveCodexDefaultWorkspaceDir(pluginConfig) {
+	return readString(asOptionalRecord(asOptionalRecord(pluginConfig)?.appServer), "defaultWorkspaceDir") ?? process.cwd();
+}
+function readString(record, key) {
+	const value = record?.[key];
+	return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function readConversationStart(value) {
+	const read = (key) => {
+		const candidate = value?.[key];
+		return typeof candidate === "string" && candidate.trim() ? candidate.trim() : void 0;
+	};
+	const start = {
+		id: read("id"),
+		threadId: read("threadId"),
+		model: read("model"),
+		modelProvider: read("modelProvider"),
+		authProfileId: read("authProfileId")
+	};
+	return start.id ? {
+		...start,
+		id: start.id
+	} : void 0;
+}
+//#endregion
+export { readCodexConversationBindingDataRecord as a, readCodexConversationBindingData as i, createCodexCliNodeConversationBindingData as n, resolveCodexDefaultWorkspaceDir as o, createCodexConversationBindingData as r, conversation_binding_data_exports as t };