@openclaw/acpx 2026.7.2-beta.1 → 2026.7.2-beta.3

package/dist/{service-Dm8hpy-C.js → service-D6LQXIcJ.js}

@@ -1,8 +1,8 @@
-import { n as createLazyAcpRuntimeProxy } from "./register.runtime-DBqbPx5P.js";
+import { n as createLazyAcpRuntimeProxy } from "./register.runtime-BrVpU-xc.js";
 import "./config-schema-lrk5nlcV.js";
 import { a as createAcpxProcessLeaseStore, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, h as normalizeAcpxGatewayInstanceRecord, l as openAcpxProcessLeaseStateStore, n as OPENCLAW_ACPX_LEASE_ID_ENV, r as OPENCLAW_GATEWAY_INSTANCE_ID_ARG, t as OPENCLAW_ACPX_LEASE_ID_ARG } from "./process-lease-DiKkFj6F.js";
 import { registerAcpRuntimeBackend, unregisterAcpRuntimeBackend } from "./runtime-api.js";
-import { a as resolveAcpxPluginRoot, c as splitCommandParts, i as resolveAcpxPluginConfig, o as toAcpMcpServers, r as reapStaleOpenClawOwnedAcpxOrphans, s as quoteCommandPart, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-B29BzBk4.js";
+import { a as resolveAcpxPluginRoot, c as splitCommandParts, d as LEGACY_CODEX_ACP_PACKAGE, f as OPENCLAW_CODEX_CONFIG_ARG, i as resolveAcpxPluginConfig, l as CODEX_ACP_BIN, o as toAcpMcpServers, r as reapStaleOpenClawOwnedAcpxOrphans, s as quoteCommandPart, t as cleanupOpenClawOwnedAcpxProcessTree, u as CODEX_ACP_PACKAGE } from "./process-reaper-CoGRyMJ_.js";
 import { createRequire } from "node:module";
 import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
@@ -15,6 +15,7 @@ import { randomUUID } from "node:crypto";
 import { inspect } from "node:util";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
+import { parse, stringify } from "smol-toml";
 //#region extensions/acpx/src/codex-trust-config.ts
 /**
 * Builds isolated Codex config for ACPX sessions. It preserves safe inherited
@@ -225,8 +226,6 @@ function renderIsolatedCodexConfig(params) {
 * Prepares isolated Codex and Claude ACP wrapper commands for ACPX. The bridge
 * copies safe auth/config state into plugin-owned homes and redacts diagnostics.
 */
-const CODEX_ACP_PACKAGE = "@zed-industries/codex-acp";
-const CODEX_ACP_BIN = "codex-acp";
 const CLAUDE_ACP_PACKAGE = "@agentclientprotocol/claude-agent-acp";
 const CLAUDE_ACP_BIN = "claude-agent-acp";
 const RUN_CONFIGURED_COMMAND_SENTINEL = "--openclaw-run-configured";
@@ -382,7 +381,7 @@ function renderDiagnosticRedactionRuleSpecs() {
 }
 function buildAdapterWrapperScript(params) {
 	return `#!/usr/bin/env node
-import { appendFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { appendFileSync, existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { spawn } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
@@ -395,6 +394,7 @@ const stderrLogMaxChars = 256 * 1024;
 const openClawWrapperArgs = new Set([
   ${quoteCommandPart(OPENCLAW_ACPX_LEASE_ID_ARG)},
   ${quoteCommandPart(OPENCLAW_GATEWAY_INSTANCE_ID_ARG)},
+  ${(params.openClawWrapperArgs ?? []).map(quoteCommandPart).join(",\n  ")}
 ]);
 
 function readOpenClawWrapperArg(args, name) {
@@ -406,6 +406,21 @@ function readOpenClawWrapperArg(args, name) {
   return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
 
+function readOpenClawWrapperArgs(args, name) {
+  const values = [];
+  for (let index = 0; index < args.length; index += 1) {
+    if (args[index] !== name) {
+      continue;
+    }
+    const value = args[index + 1];
+    if (typeof value === "string" && value.trim()) {
+      values.push(value.trim());
+    }
+    index += 1;
+  }
+  return values;
+}
+
 function safeDiagnosticFilePart(value) {
   const sanitized = String(value || "").replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 120);
   return sanitized || "pid-" + process.pid;
@@ -550,14 +565,14 @@ function stripOpenClawWrapperArgs(args) {
 }
 
 const rawConfiguredArgs = process.argv.slice(2);
+${params.envConfigSetup ?? ""}
 const stderrLogPath = resolveStderrLogPath(rawConfiguredArgs);
-
-try {
-  if (stderrLogPath) {
-    writeFileSync(stderrLogPath, "", "utf8");
+if (stderrLogPath) {
+  try {
+    rmSync(stderrLogPath, { force: true });
+  } catch {
+    // Diagnostic cleanup must never prevent the adapter from starting.
   }
-} catch {
-  // Stderr capture is diagnostic-only; never break the ACP adapter.
 }
 
 const configuredArgs = stripOpenClawWrapperArgs(rawConfiguredArgs);
@@ -706,6 +721,7 @@ function buildCodexAcpWrapperScript(installedBinPath) {
 		binName: CODEX_ACP_BIN,
 		installedBinPath,
 		stderrLogFileNamePrefix: "codex-acp-wrapper.stderr",
+		openClawWrapperArgs: [OPENCLAW_CODEX_CONFIG_ARG],
 		envSetup: `const codexHome = fileURLToPath(new URL("./codex-home/", import.meta.url));
 const codexAuthPath = fileURLToPath(new URL("./codex-home/auth.json", import.meta.url));
 const codexApiKey = (process.env.CODEX_API_KEY || process.env.OPENAI_API_KEY || "").trim();
@@ -739,7 +755,59 @@ if (shouldWriteCodexApiKeyAuth) {
 const env = {
   ...process.env,
   CODEX_HOME: codexHome,
-};`
+};`,
+		envConfigSetup: `function isCodexConfigObject(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function mergeCodexConfig(base, override) {
+  const merged = Object.assign(Object.create(null), base);
+  for (const [key, value] of Object.entries(override)) {
+    const existing = merged[key];
+    merged[key] =
+      isCodexConfigObject(existing) && isCodexConfigObject(value)
+        ? mergeCodexConfig(existing, value)
+        : value;
+  }
+  return merged;
+}
+
+const openClawCodexConfigs = readOpenClawWrapperArgs(
+  rawConfiguredArgs,
+  ${quoteCommandPart(OPENCLAW_CODEX_CONFIG_ARG)},
+);
+if (openClawCodexConfigs.length > 0) {
+  let existingCodexConfig = {};
+  if (typeof env.CODEX_CONFIG === "string" && env.CODEX_CONFIG.trim()) {
+    try {
+      const parsedCodexConfig = JSON.parse(env.CODEX_CONFIG);
+      if (!parsedCodexConfig || typeof parsedCodexConfig !== "object" || Array.isArray(parsedCodexConfig)) {
+        throw new Error("CODEX_CONFIG must be a JSON object");
+      }
+      existingCodexConfig = parsedCodexConfig;
+    } catch {
+      console.error("[openclaw] CODEX_CONFIG must be a valid JSON object");
+      process.exit(1);
+    }
+  }
+  for (const openClawCodexConfig of openClawCodexConfigs) {
+    try {
+      const parsedOpenClawCodexConfig = JSON.parse(openClawCodexConfig);
+      if (
+        !parsedOpenClawCodexConfig ||
+        typeof parsedOpenClawCodexConfig !== "object" ||
+        Array.isArray(parsedOpenClawCodexConfig)
+      ) {
+        throw new Error("invalid OpenClaw Codex config");
+      }
+      existingCodexConfig = mergeCodexConfig(existingCodexConfig, parsedOpenClawCodexConfig);
+    } catch {
+      console.error("[openclaw] invalid generated Codex ACP startup config");
+      process.exit(1);
+    }
+  }
+  env.CODEX_CONFIG = JSON.stringify(existingCodexConfig);
+}`
 	});
 }
 function buildClaudeAcpWrapperScript(installedBinPath) {
@@ -826,15 +894,94 @@ function extractConfiguredAdapterArgs(params) {
 	if (isAcpBinName(parts[0] ?? "", params.binName)) return parts.slice(1);
 	if (basename(parts[0] ?? "") === "node" && isAcpBinName(parts[1] ?? "", params.binName)) return parts.slice(2);
 }
-function buildCodexAcpWrapperCommand(wrapperPath, configuredCommand) {
-	const configuredAdapterArgs = extractConfiguredAdapterArgs({
+function isConfigRecord(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function mergeConfigRecords(base, override) {
+	const merged = { ...base };
+	for (const [key, value] of Object.entries(override)) {
+		const existing = merged[key];
+		const nextValue = isConfigRecord(existing) && isConfigRecord(value) ? mergeConfigRecords(existing, value) : value;
+		Object.defineProperty(merged, key, {
+			value: nextValue,
+			configurable: true,
+			enumerable: true,
+			writable: true
+		});
+	}
+	return merged;
+}
+function parseLegacyCodexConfigAssignment(assignment) {
+	const separator = assignment.indexOf("=");
+	if (separator <= 0) throw new Error(`Invalid legacy Codex ACP config override: ${assignment}`);
+	const rawKey = assignment.slice(0, separator).trim();
+	const key = rawKey === "use_legacy_landlock" ? "features.use_legacy_landlock" : rawKey;
+	const rawValue = assignment.slice(separator + 1).trim();
+	try {
+		return parse(`${key} = ${rawValue}`);
+	} catch {
+		const literal = rawValue.replace(/^["']+|["']+$/g, "");
+		return parse(`${key} = ${JSON.stringify(literal)}`);
+	}
+}
+function migrateLegacyCodexArgs(args) {
+	let config = {};
+	const forwardedArgs = [];
+	let hadOverrides = false;
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index] ?? "";
+		let assignment;
+		if (arg === "-c" || arg === "--config") assignment = args[index += 1];
+		else if (arg.startsWith("--config=")) assignment = arg.slice(9);
+		else if (arg.startsWith("-c=")) assignment = arg.slice(3);
+		else if (arg.startsWith("-c") && arg.length > 2) assignment = arg.slice(2);
+		else {
+			forwardedArgs.push(arg);
+			continue;
+		}
+		if (!assignment) throw new Error(`Missing value for legacy Codex ACP option ${arg}`);
+		hadOverrides = true;
+		config = mergeConfigRecords(config, parseLegacyCodexConfigAssignment(assignment));
+	}
+	return {
+		config,
+		forwardedArgs,
+		hadOverrides
+	};
+}
+function resolveCodexAdapterLaunch(configuredCommand) {
+	const legacyAdapterArgs = extractConfiguredAdapterArgs({
+		configuredCommand,
+		packageName: LEGACY_CODEX_ACP_PACKAGE,
+		binName: CODEX_ACP_BIN
+	});
+	if (legacyAdapterArgs) {
+		const migration = migrateLegacyCodexArgs(legacyAdapterArgs);
+		return {
+			args: [...migration.hadOverrides ? [OPENCLAW_CODEX_CONFIG_ARG, JSON.stringify(migration.config)] : [], ...migration.forwardedArgs],
+			...migration.hadOverrides ? { migratedConfig: migration.config } : {}
+		};
+	}
+	const maintainedAdapterArgs = extractConfiguredAdapterArgs({
 		configuredCommand,
 		packageName: CODEX_ACP_PACKAGE,
 		binName: CODEX_ACP_BIN
 	});
-	if (configuredAdapterArgs) return buildWrapperCommand(wrapperPath, configuredAdapterArgs);
+	if (!maintainedAdapterArgs) return;
+	return { args: maintainedAdapterArgs };
+}
+function buildCodexAcpWrapperCommand(wrapperPath, configuredCommand) {
+	const launch = resolveCodexAdapterLaunch(configuredCommand);
+	if (launch) return buildWrapperCommand(wrapperPath, launch.args);
 	return buildWrapperCommand(wrapperPath, [RUN_CONFIGURED_COMMAND_SENTINEL, ...splitCommandParts(configuredCommand?.trim() ?? "")]);
 }
+async function persistMigratedCodexMcpConfig(params) {
+	const mcpServers = params.migratedConfig?.mcp_servers;
+	if (!isConfigRecord(mcpServers)) return;
+	const configPath = path.join(params.codexHome, "config.toml");
+	const merged = mergeConfigRecords(parse(await fs$1.readFile(configPath, "utf8")), { mcp_servers: mcpServers });
+	await fs$1.writeFile(configPath, stringify(merged), "utf8");
+}
 function buildClaudeAcpWrapperCommand(wrapperPath, configuredCommand) {
 	const configuredAdapterArgs = extractConfiguredAdapterArgs({
 		configuredCommand,
@@ -848,16 +995,20 @@ function buildClaudeAcpWrapperCommand(wrapperPath, configuredCommand) {
 async function prepareAcpxCodexAuthConfig(params) {
 	params.logger;
 	const codexBaseDir = path.join(params.stateDir, "acpx");
-	await prepareIsolatedCodexHome({
-		baseDir: codexBaseDir,
-		workspaceDir: params.pluginConfig.cwd
+	const configuredCodexCommand = params.pluginConfig.agents.codex;
+	const configuredClaudeCommand = params.pluginConfig.agents.claude;
+	const codexLaunch = resolveCodexAdapterLaunch(configuredCodexCommand);
+	await persistMigratedCodexMcpConfig({
+		codexHome: await prepareIsolatedCodexHome({
+			baseDir: codexBaseDir,
+			workspaceDir: params.pluginConfig.cwd
+		}),
+		migratedConfig: codexLaunch?.migratedConfig
 	});
 	const installedCodexBinPath = await (params.resolveInstalledCodexAcpBinPath ?? resolveInstalledCodexAcpBinPath)();
 	const installedClaudeBinPath = await (params.resolveInstalledClaudeAcpBinPath ?? resolveInstalledClaudeAcpBinPath)();
 	const wrapperPath = await writeCodexAcpWrapper(codexBaseDir, installedCodexBinPath);
 	const claudeWrapperPath = await writeClaudeAcpWrapper(codexBaseDir, installedClaudeBinPath);
-	const configuredCodexCommand = params.pluginConfig.agents.codex;
-	const configuredClaudeCommand = params.pluginConfig.agents.claude;
 	return {
 		...params.pluginConfig,
 		agents: {
@@ -876,7 +1027,7 @@ async function prepareAcpxCodexAuthConfig(params) {
 const ENABLE_STARTUP_PROBE_ENV = "OPENCLAW_ACPX_RUNTIME_STARTUP_PROBE";
 const SKIP_RUNTIME_PROBE_ENV = "OPENCLAW_SKIP_ACPX_RUNTIME_PROBE";
 const ACPX_BACKEND_ID = "acpx";
-const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-D_fW1HnP.js"));
+const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-CMARmJuS.js"));
 /** Convert ACPX timeout seconds into timer-safe milliseconds. */
 function resolveAcpxTimerTimeoutMs(timeoutSeconds) {
 	if (timeoutSeconds === void 0) return;
@@ -897,6 +1048,7 @@ function createLazyDefaultRuntime(params) {
 				agentRegistry: module.createAgentRegistry({ overrides: params.pluginConfig.agents }),
 				probeAgent: params.pluginConfig.probeAgent,
 				mcpServers: toAcpMcpServers(params.pluginConfig.mcpServers),
+				pluginToolsMcpBridgeEnabled: params.pluginConfig.pluginToolsMcpBridge,
 				openclawToolsMcpBridgeEnabled: params.pluginConfig.openClawToolsMcpBridge,
 				permissionMode: params.pluginConfig.permissionMode,
 				nonInteractivePermissions: params.pluginConfig.nonInteractivePermissions,