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

package/dist/index.js

@@ -1,9 +1,9 @@
-import { t as createAcpxRuntimeService } from "./register.runtime-DBqbPx5P.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-CysfMsSr.js";
 import "./config-schema-lrk5nlcV.js";
 import { tryDispatchAcpReplyHook } from "openclaw/plugin-sdk/acp-runtime-backend";
 import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import process$1 from "node:process";
-import { decodeNodePtyResumeParams, resolveExecutableFromPathEnv, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
+import { decodeNodePtyResumeParams, resolveNodeHostExecutable, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createReadStream, readFileSync, statSync } from "node:fs";
 import fs$1 from "node:fs/promises";
@@ -389,7 +389,7 @@ async function readPiSessionById(threadId, env) {
 const LOCAL_HOST_ID$1 = "gateway";
 const DEFAULT_PAGE_LIMIT = 20;
 const MAX_PAGE_LIMIT$1 = 100;
-const MAX_SEARCH_LENGTH$1 = 500;
+const MAX_SEARCH_LENGTH = 500;
 const MAX_CURSOR_LENGTH$1 = 128;
 const MAX_TRANSCRIPT_ITEM_BYTES = 512 * 1024;
 const MAX_TRANSCRIPT_PAGE_BYTES = 20 * 1024 * 1024;
@@ -483,7 +483,7 @@ function parseListParams(value) {
 		"cursor"
 	].includes(key));
 	if (unknown) throw new Error(`unknown Pi session list parameter: ${unknown}`);
-	const searchTerm = optionalPiString(value.searchTerm, MAX_SEARCH_LENGTH$1);
+	const searchTerm = optionalPiString(value.searchTerm, MAX_SEARCH_LENGTH);
 	if (value.searchTerm !== void 0 && !searchTerm) throw new Error("searchTerm is invalid");
 	const cursor = optionalPiString(value.cursor, MAX_CURSOR_LENGTH$1);
 	if (value.cursor !== void 0 && !cursor) throw new Error("cursor is invalid");
@@ -693,7 +693,6 @@ const LOCAL_HOST_ID = "gateway";
 const MAX_PAGE_LIMIT = 100;
 const MAX_HOSTS = 100;
 const MAX_CURSOR_LENGTH = 128;
-const MAX_SEARCH_LENGTH = 500;
 const NODE_TIMEOUT_MS = 2e4;
 const SESSION_ID_PATTERN = /^(?!-)[A-Za-z0-9._:-]{1,256}$/u;
 const TRANSCRIPT_ITEM_TYPES = /* @__PURE__ */ new Set([
@@ -762,15 +761,23 @@ function createPiSessionNodeHostCommands() {
 			isAvailable: ({ config, env }) => storeAvailable({
 				config,
 				env
-			}) && Boolean(resolveExecutableFromPathEnv("pi", env.PATH ?? "")),
+			}) && Boolean(resolveNodeHostExecutable("pi", {
+				env,
+				pathEnv: env.PATH ?? env.Path ?? "",
+				strategy: "direct"
+			})),
 			handle: async (paramsJSON, io) => {
 				if (!io) throw new Error("Pi terminal command requires duplex transport");
 				const params = decodeNodePtyResumeParams(paramsJSON, validatePiThreadId);
 				const record = await requireLocalPiSession(params.threadId);
-				const file = resolveExecutableFromPathEnv("pi", process$1.env.PATH ?? "");
-				if (!file) throw new Error("Pi CLI is unavailable");
+				const resolution = resolveNodeHostExecutable("pi", {
+					env: process$1.env,
+					pathEnv: process$1.env.PATH ?? process$1.env.Path ?? "",
+					strategy: "direct"
+				});
+				if (!resolution) throw new Error("Pi CLI is unavailable");
 				return JSON.stringify(await runNodePtyCommand({
-					file,
+					file: resolution.executable,
 					args: ["--session", params.threadId],
 					cwd: record.cwd,
 					cols: params.cols,
@@ -828,7 +835,7 @@ async function listPiNodeHost(runtime, query, node) {
 			command: PI_SESSIONS_LIST_COMMAND,
 			params: {
 				...query.limitPerHost ? { limit: query.limitPerHost } : {},
-				...query.search?.trim() ? { searchTerm: query.search.trim().slice(0, MAX_SEARCH_LENGTH) } : {},
+				...query.search ? { searchTerm: query.search } : {},
 				...query.cursors?.[hostId] ? { cursor: query.cursors[hostId] } : {}
 			},
 			timeoutMs: NODE_TIMEOUT_MS,
@@ -874,7 +881,6 @@ function parseNodeTranscriptPage(value, threadId) {
 }
 async function listPiHosts(runtime, query) {
 	const requested = query.hostIds ? new Set(query.hostIds) : void 0;
-	const searchTerm = query.search?.trim().slice(0, MAX_SEARCH_LENGTH) || void 0;
 	const hosts = [];
 	if ((!requested || requested.has(LOCAL_HOST_ID)) && piSessionStoreAvailable(process$1.env)) try {
 		hosts.push({
@@ -884,9 +890,13 @@ async function listPiHosts(runtime, query) {
 			connected: true,
 			...await listLocalPiSessionPage({
 				limit: query.limitPerHost,
-				...searchTerm ? { searchTerm } : {},
+				...query.search ? { searchTerm: query.search } : {},
 				cursor: query.cursors?.[LOCAL_HOST_ID]
-			}).then((page) => setTerminalCapability(page, resolveExecutableFromPathEnv("pi", process$1.env.PATH ?? "") !== void 0))
+			}).then((page) => setTerminalCapability(page, resolveNodeHostExecutable("pi", {
+				env: process$1.env,
+				pathEnv: process$1.env.PATH ?? "",
+				strategy: "fallback"
+			}) !== void 0))
 		});
 	} catch {
 		hosts.push({
@@ -937,16 +947,21 @@ async function openPiTerminal(params) {
 	const title = `pi --session ${params.threadId.slice(0, 12)}…`;
 	if (params.hostId === LOCAL_HOST_ID) {
 		const record = await requireLocalPiSession(params.threadId);
-		const executable = resolveExecutableFromPathEnv("pi", process$1.env.PATH ?? "");
-		if (!executable) throw new Error("Pi CLI is unavailable");
+		const resolution = resolveNodeHostExecutable("pi", {
+			env: process$1.env,
+			pathEnv: process$1.env.PATH ?? "",
+			strategy: "fallback"
+		});
+		if (!resolution) throw new Error("Pi CLI is unavailable");
 		return {
 			kind: "local",
 			argv: [
-				executable,
+				resolution.executable,
 				"--session",
 				params.threadId
 			],
 			...record.cwd ? { cwd: record.cwd } : {},
+			...resolution.pathEnv ? { pathEnv: resolution.pathEnv } : {},
 			title
 		};
 	}

package/dist/{process-reaper-B29BzBk4.js → process-reaper-CoGRyMJ_.js}

@@ -7,6 +7,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { runExec } from "openclaw/plugin-sdk/process-runtime";
 import { fileURLToPath } from "node:url";
+//#region extensions/acpx/src/codex-adapter.ts
+const CODEX_ACP_PACKAGE = "@agentclientprotocol/codex-acp";
+const CODEX_ACP_BIN = "codex-acp";
+const LEGACY_CODEX_ACP_PACKAGE = "@zed-industries/codex-acp";
+const OPENCLAW_CODEX_CONFIG_ARG = "--openclaw-codex-config";
+//#endregion
 //#region extensions/acpx/src/command-line.ts
 /**
 * Small shell-command helpers for ACPX-launched processes. Splitting supports
@@ -248,8 +254,10 @@ function resolveAcpxPluginConfig(params) {
 const requireFromHere = createRequire(import.meta.url);
 const GENERATED_WRAPPER_BASENAMES = /* @__PURE__ */ new Set(["codex-acp-wrapper.mjs", "claude-agent-acp-wrapper.mjs"]);
 const OPENCLAW_PLUGIN_DEPS_MARKER = "/plugin-runtime-deps/";
+const ACPX_PROCESS_LIST_TIMEOUT_MS = 2e3;
 const OWNED_ACP_PACKAGE_NAMES = [
-	"@zed-industries/codex-acp",
+	CODEX_ACP_PACKAGE,
+	LEGACY_CODEX_ACP_PACKAGE,
 	"@zed-industries/codex-acp-darwin-arm64",
 	"@zed-industries/codex-acp-darwin-x64",
 	"@zed-industries/codex-acp-linux-arm64",
@@ -259,7 +267,20 @@ const OWNED_ACP_PACKAGE_NAMES = [
 	"@agentclientprotocol/claude-agent-acp",
 	"acpx"
 ];
-const ACP_PACKAGE_MARKERS = [...OWNED_ACP_PACKAGE_NAMES.map((packageName) => `/node_modules/${packageName}/`), "/acpx/dist/"];
+const PLUGIN_DEPS_CODEX_PACKAGE_NAMES = [
+	"@openai/codex",
+	"@openai/codex-darwin-arm64",
+	"@openai/codex-darwin-x64",
+	"@openai/codex-linux-arm64",
+	"@openai/codex-linux-x64",
+	"@openai/codex-win32-arm64",
+	"@openai/codex-win32-x64"
+];
+const ACP_PACKAGE_MARKERS = [
+	...OWNED_ACP_PACKAGE_NAMES.map((packageName) => `/node_modules/${packageName}/`),
+	...PLUGIN_DEPS_CODEX_PACKAGE_NAMES.map((packageName) => `/node_modules/${packageName}/`),
+	"/acpx/dist/"
+];
 function normalizePathLike(value) {
 	return value.replaceAll("\\", "/");
 }
@@ -354,7 +375,8 @@ async function listPlatformProcesses() {
 	if (process.platform === "win32") return [];
 	const { stdout } = await runExec("ps", ["-axo", "pid=,ppid=,command="], {
 		logOutput: false,
-		maxBuffer: 8 * 1024 * 1024
+		maxBuffer: 8 * 1024 * 1024,
+		timeoutMs: ACPX_PROCESS_LIST_TIMEOUT_MS
 	});
 	return parseProcessList(stdout);
 }
@@ -488,4 +510,4 @@ async function reapStaleOpenClawOwnedAcpxOrphans(params) {
 	};
 }
 //#endregion
-export { resolveAcpxPluginRoot as a, splitCommandParts as c, resolveAcpxPluginConfig as i, isOpenClawLeaseAwareAcpxProcessCommand as n, toAcpMcpServers as o, reapStaleOpenClawOwnedAcpxOrphans as r, quoteCommandPart as s, cleanupOpenClawOwnedAcpxProcessTree as t };
+export { resolveAcpxPluginRoot as a, splitCommandParts as c, LEGACY_CODEX_ACP_PACKAGE as d, OPENCLAW_CODEX_CONFIG_ARG as f, resolveAcpxPluginConfig as i, CODEX_ACP_BIN as l, isOpenClawLeaseAwareAcpxProcessCommand as n, toAcpMcpServers as o, reapStaleOpenClawOwnedAcpxOrphans as r, quoteCommandPart as s, cleanupOpenClawOwnedAcpxProcessTree as t, CODEX_ACP_PACKAGE as u };

package/dist/{register.runtime-DBqbPx5P.js → register.runtime-CysfMsSr.js}

@@ -200,7 +200,7 @@ function createLazyAcpRuntimeProxy(resolveRuntime) {
 * immediately, then imports the heavier service only when a session needs it.
 */
 const ACPX_BACKEND_ID = "acpx";
-const loadServiceModule = createLazyRuntimeModule(() => import("./service-Dm8hpy-C.js"));
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-DJchyiuU.js"));
 async function startRealService(state) {
 	if (state.realRuntime) return state.realRuntime;
 	if (!state.ctx) throw new Error("ACPX runtime service is not started");

package/dist/register.runtime.js

@@ -1,2 +1,2 @@
-import { t as createAcpxRuntimeService } from "./register.runtime-DBqbPx5P.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-CysfMsSr.js";
 export { createAcpxRuntimeService };

package/dist/{runtime-D_fW1HnP.js → runtime-BEOGc4Ik.js}

@@ -1,6 +1,6 @@
 import { i as createAcpxProcessLeaseId, o as hashAcpxProcessCommand, u as withAcpxLeaseEnvironment } from "./process-lease-DiKkFj6F.js";
 import { AcpRuntimeError } from "./runtime-api.js";
-import { c as splitCommandParts, n as isOpenClawLeaseAwareAcpxProcessCommand, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-B29BzBk4.js";
+import { c as splitCommandParts, f as OPENCLAW_CODEX_CONFIG_ARG, n as isOpenClawLeaseAwareAcpxProcessCommand, t as cleanupOpenClawOwnedAcpxProcessTree, u as CODEX_ACP_PACKAGE } from "./process-reaper-CoGRyMJ_.js";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
@@ -14,6 +14,7 @@ import { sliceUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 * OpenClaw ACPX runtime adapter. It wraps the upstream acpx runtime with
 * OpenClaw session metadata, lease tracking, model scoping, and cleanup policy.
 */
+const ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME = "openclaw-plugin-tools";
 const ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME = "openclaw-tools";
 const OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV = "OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY";
 function withOpenClawManagedTurnTimeout(input) {
@@ -256,7 +257,7 @@ function isOpenClawBridgeCommand(command) {
 }
 function isCodexAcpCommand(command) {
 	return isAcpCommand(command, {
-		packageName: "@zed-industries/codex-acp",
+		packageName: CODEX_ACP_PACKAGE,
 		executableName: "codex-acp"
 	});
 }
@@ -303,10 +304,6 @@ function normalizeCodexAcpModelOverride(rawModel, rawThinking) {
 		...reasoningEffort ? { reasoningEffort } : {}
 	};
 }
-function codexAcpSessionModelId(override) {
-	if (!override.model) return "";
-	return override.reasoningEffort ? `${override.model}/${override.reasoningEffort}` : override.model;
-}
 function normalizeClaudeAcpModelOverride(rawModel) {
 	const raw = rawModel?.trim();
 	if (!raw) return;
@@ -344,10 +341,12 @@ function quoteShellArg(value) {
 	return `'${value.replace(/'/g, "'\\''")}'`;
 }
 function appendCodexAcpConfigOverrides(command, override) {
-	const configArgs = override.model ? [`model=${override.model}`] : [];
-	if (override.reasoningEffort) configArgs.push(`model_reasoning_effort=${override.reasoningEffort}`);
-	if (configArgs.length === 0) return command;
-	return `${command} ${configArgs.map((arg) => `-c ${quoteShellArg(arg)}`).join(" ")}`;
+	const config = {
+		...override.model ? { model: override.model } : {},
+		...override.reasoningEffort ? { model_reasoning_effort: override.reasoningEffort } : {}
+	};
+	if (Object.keys(config).length === 0) return command;
+	return `${command} ${OPENCLAW_CODEX_CONFIG_ARG} ${quoteShellArg(JSON.stringify(config))}`;
 }
 function createModelScopedAgentRegistry(params) {
 	return {
@@ -375,12 +374,14 @@ function shouldUseDistinctBridgeDelegate(options) {
 	const { mcpServers } = options;
 	return Array.isArray(mcpServers) && mcpServers.length > 0;
 }
-function withOpenClawToolsMcpSessionEnv(params) {
+function withManagedToolsMcpSessionEnv(params) {
 	const sessionKey = params.sessionKey.trim();
-	if (!params.enabled || !sessionKey || !params.mcpServers?.length) return params.mcpServers;
+	if (!params.pluginToolsEnabled && !params.openclawToolsEnabled || !sessionKey || !params.mcpServers?.length) return params.mcpServers;
 	let changed = false;
 	const nextServers = params.mcpServers.map((server) => {
-		if (server.name !== ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME || !("command" in server)) return server;
+		const isManagedPluginTools = params.pluginToolsEnabled && server.name === ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME;
+		const isManagedOpenClawTools = params.openclawToolsEnabled && server.name === ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME;
+		if (!isManagedPluginTools && !isManagedOpenClawTools || !("command" in server)) return server;
 		changed = true;
 		const env = [...server.env.filter((entry) => entry.name !== OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV), {
 			name: OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV,
@@ -397,14 +398,16 @@ function withOpenClawToolsMcpSessionEnv(params) {
 var AcpxRuntime = class {
 	constructor(options, testOptions) {
 		this.codexAcpModelOverrideScope = new AsyncLocalStorage();
-		this.openclawToolsSessionDelegates = /* @__PURE__ */ new Map();
+		this.managedToolsSessionDelegates = /* @__PURE__ */ new Map();
 		this.launchLeaseScope = new AsyncLocalStorage();
 		const { openclawProcessCleanup, ...delegateTestOptions } = testOptions ?? {};
 		this.processCleanupDeps = openclawProcessCleanup;
 		this.wrapperRoot = options.openclawWrapperRoot;
 		this.gatewayInstanceId = options.openclawGatewayInstanceId;
 		this.processLeaseStore = options.openclawProcessLeaseStore;
+		this.pluginToolsMcpBridgeEnabled = options.pluginToolsMcpBridgeEnabled === true;
 		this.openclawToolsMcpBridgeEnabled = options.openclawToolsMcpBridgeEnabled === true;
+		this.managedToolsMcpBridgeEnabled = this.pluginToolsMcpBridgeEnabled || this.openclawToolsMcpBridgeEnabled;
 		this.cwd = options.cwd;
 		this.sessionStore = createResetAwareSessionStore(options.sessionStore, {
 			gatewayInstanceId: this.gatewayInstanceId,
@@ -433,35 +436,36 @@ var AcpxRuntime = class {
 			agentName: normalizeAgentName(options.probeAgent) ?? "codex",
 			agentRegistry: this.agentRegistry
 		});
-		const useBridgeSafeProbe = this.openclawToolsMcpBridgeEnabled || shouldUseBridgeSafeDelegateForCommand(probeCommand);
+		const useBridgeSafeProbe = this.managedToolsMcpBridgeEnabled || shouldUseBridgeSafeDelegateForCommand(probeCommand);
 		this.probeDelegate = useBridgeSafeProbe ? this.bridgeSafeDelegate : this.delegate;
 	}
 	resolveDelegateForSession(params) {
 		if (shouldUseBridgeSafeDelegateForCommand(params.command)) return this.bridgeSafeDelegate;
-		return this.resolveOpenClawToolsDelegateForSession(params.sessionKey);
+		return this.resolveManagedToolsDelegateForSession(params.sessionKey);
 	}
-	resolveOpenClawToolsDelegateForSession(sessionKey) {
-		if (!this.openclawToolsMcpBridgeEnabled) return this.delegate;
+	resolveManagedToolsDelegateForSession(sessionKey) {
+		if (!this.managedToolsMcpBridgeEnabled) return this.delegate;
 		const normalizedSessionKey = sessionKey.trim();
 		if (!normalizedSessionKey) return this.delegate;
-		const cached = this.openclawToolsSessionDelegates.get(normalizedSessionKey);
+		const cached = this.managedToolsSessionDelegates.get(normalizedSessionKey);
 		if (cached) return cached;
 		const delegate = new AcpxRuntime$1({
 			...this.delegateOptions,
-			mcpServers: withOpenClawToolsMcpSessionEnv({
-				enabled: this.openclawToolsMcpBridgeEnabled,
+			mcpServers: withManagedToolsMcpSessionEnv({
+				pluginToolsEnabled: this.pluginToolsMcpBridgeEnabled,
+				openclawToolsEnabled: this.openclawToolsMcpBridgeEnabled,
 				mcpServers: this.delegateOptions.mcpServers,
 				sessionKey: normalizedSessionKey
 			})
 		}, this.delegateTestOptions);
-		this.openclawToolsSessionDelegates.set(normalizedSessionKey, delegate);
+		this.managedToolsSessionDelegates.set(normalizedSessionKey, delegate);
 		return delegate;
 	}
-	releaseOpenClawToolsDelegateForSession(sessionKey) {
-		if (!this.openclawToolsMcpBridgeEnabled) return;
+	releaseManagedToolsDelegateForSession(sessionKey) {
+		if (!this.managedToolsMcpBridgeEnabled) return;
 		const normalizedSessionKey = sessionKey.trim();
 		if (!normalizedSessionKey) return;
-		this.openclawToolsSessionDelegates.delete(normalizedSessionKey);
+		this.managedToolsSessionDelegates.delete(normalizedSessionKey);
 	}
 	async resolveDelegateForHandle(handle) {
 		const record = await this.sessionStore.load(handle.acpxRecordId ?? handle.sessionKey);
@@ -639,7 +643,7 @@ var AcpxRuntime = class {
 		});
 		const normalizedInput = {
 			...ensureInput,
-			...codexAcpSessionModelId(codexModelOverride) ? { model: codexAcpSessionModelId(codexModelOverride) } : {}
+			...codexModelOverride.model ? { model: codexModelOverride.model } : {}
 		};
 		return await this.runWithLaunchLease({
 			sessionKey: input.sessionKey,
@@ -751,8 +755,8 @@ var AcpxRuntime = class {
 			}
 		};
 	}
-	getCapabilities() {
-		return this.delegate.getCapabilities();
+	getCapabilities(input) {
+		return this.delegate.getCapabilities(input);
 	}
 	async getStatus(input) {
 		return (await this.resolveDelegateForHandle(input.handle)).getStatus(input);
@@ -815,7 +819,7 @@ var AcpxRuntime = class {
 		} finally {
 			await this.cleanupProcessTreeForRecord(input.handle, record);
 		}
-		if (closeSucceeded) this.releaseOpenClawToolsDelegateForSession(input.handle.sessionKey);
+		if (closeSucceeded) this.releaseManagedToolsDelegateForSession(input.handle.sessionKey);
 		if (closeSucceeded && input.discardPersistentState) this.sessionStore.markFresh(input.handle.sessionKey);
 	}
 };
@@ -823,7 +827,6 @@ var AcpxRuntime = class {
 const testing = {
 	appendCodexAcpConfigOverrides,
 	assertSupportedRuntimeSessionMode,
-	codexAcpSessionModelId,
 	isClaudeAcpCommand,
 	isCodexAcpCommand,
 	normalizeClaudeAcpModelOverride,

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

@@ -1,8 +1,8 @@
-import { n as createLazyAcpRuntimeProxy } from "./register.runtime-DBqbPx5P.js";
+import { n as createLazyAcpRuntimeProxy } from "./register.runtime-CysfMsSr.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-BEOGc4Ik.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,

package/npm-shrinkwrap.json

@@ -1,16 +1,17 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/acpx",
-      "version": "2026.7.2-beta.1",
+      "version": "2026.7.2-beta.2",
       "dependencies": {
         "@agentclientprotocol/claude-agent-acp": "0.55.0",
-        "@zed-industries/codex-acp": "0.16.0",
+        "@agentclientprotocol/codex-acp": "1.1.2",
         "acpx": "0.11.2",
+        "smol-toml": "1.7.0",
         "zod": "4.4.3"
       }
     },
@@ -31,6 +32,32 @@
         "node": ">=22"
       }
     },
+    "node_modules/@agentclientprotocol/codex-acp": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@agentclientprotocol/codex-acp/-/codex-acp-1.1.2.tgz",
+      "integrity": "sha512-qE/R1WdqJJ9OFHsHGvbmVmS2j9iCMZzpWT3g2XIViXrGHu1fLOALLINBIlW+WzKDllCh131aB6cqcIWSt0otbw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@agentclientprotocol/sdk": "^1.2.1",
+        "@openai/codex": "^0.144.0",
+        "diff": "^9.0.0",
+        "open": "^11.0.0",
+        "vscode-jsonrpc": "^9.0.1",
+        "zod": "^4.0.0"
+      },
+      "bin": {
+        "codex-acp": "dist/index.js"
+      }
+    },
+    "node_modules/@agentclientprotocol/codex-acp/node_modules/@agentclientprotocol/sdk": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.2.1.tgz",
+      "integrity": "sha512-jwYUdOQR7tc+Zfch53VL4JJyUNK/46q03uUTYb+PjECsmnNl94XFXOfYLJ8RBpMNidXd1rpOAVgb0vqD98xImA==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "zod": "^3.25.0 || ^4.0.0"
+      }
+    },
     "node_modules/@agentclientprotocol/sdk": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.1.0.tgz",
@@ -694,33 +721,31 @@
         }
       }
     },
-    "node_modules/@stablelib/base64": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
-      "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==",
-      "license": "MIT"
-    },
-    "node_modules/@zed-industries/codex-acp": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp/-/codex-acp-0.16.0.tgz",
-      "integrity": "sha512-XKzqztT5R8Wg1BVFnk6/U4JVx5GNUaZgxpf9gP2Cw6BsknvJWh3aefcAGZQljgdMivRqczjNKYL4F6H65dc5vA==",
+    "node_modules/@openai/codex": {
+      "version": "0.144.4",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4.tgz",
+      "integrity": "sha512-DTHzYatlKq9dw55E0/HsbK4tRCEKabuJ10ybbqpsG8gVv/kvwEdg3Z4OI3cvLXKa21xkIa4lkGlZoO/HmqmFFw==",
       "license": "Apache-2.0",
       "bin": {
-        "codex-acp": "bin/codex-acp.js"
+        "codex": "bin/codex.js"
+      },
+      "engines": {
+        "node": ">=16"
       },
       "optionalDependencies": {
-        "@zed-industries/codex-acp-darwin-arm64": "0.16.0",
-        "@zed-industries/codex-acp-darwin-x64": "0.16.0",
-        "@zed-industries/codex-acp-linux-arm64": "0.16.0",
-        "@zed-industries/codex-acp-linux-x64": "0.16.0",
-        "@zed-industries/codex-acp-win32-arm64": "0.16.0",
-        "@zed-industries/codex-acp-win32-x64": "0.16.0"
-      }
-    },
-    "node_modules/@zed-industries/codex-acp-darwin-arm64": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp-darwin-arm64/-/codex-acp-darwin-arm64-0.16.0.tgz",
-      "integrity": "sha512-2AmbWsc/+Mpn6U8UOIlPLvgwGsGOr/LFpgcvrnjcCT9V1yY92MLrqzjMX82+VjTrRLRuXvc25SB5Z1++4Pw29g==",
+        "@openai/codex-darwin-arm64": "npm:@openai/codex@0.144.4-darwin-arm64",
+        "@openai/codex-darwin-x64": "npm:@openai/codex@0.144.4-darwin-x64",
+        "@openai/codex-linux-arm64": "npm:@openai/codex@0.144.4-linux-arm64",
+        "@openai/codex-linux-x64": "npm:@openai/codex@0.144.4-linux-x64",
+        "@openai/codex-win32-arm64": "npm:@openai/codex@0.144.4-win32-arm64",
+        "@openai/codex-win32-x64": "npm:@openai/codex@0.144.4-win32-x64"
+      }
+    },
+    "node_modules/@openai/codex-darwin-arm64": {
+      "name": "@openai/codex",
+      "version": "0.144.4-darwin-arm64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4-darwin-arm64.tgz",
+      "integrity": "sha512-6J3g498cM2oA7vYIJhpuGJlnIi/M5JdYmjB5BZ1Of5HQ0ziIlplFSvH801oVy9J5TQFp642ODzOu/ZEokDUXsg==",
       "cpu": [
         "arm64"
       ],
@@ -729,14 +754,15 @@
       "os": [
         "darwin"
       ],
-      "bin": {
-        "codex-acp-darwin-arm64": "bin/codex-acp"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/@zed-industries/codex-acp-darwin-x64": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp-darwin-x64/-/codex-acp-darwin-x64-0.16.0.tgz",
-      "integrity": "sha512-QCWggk0s4GTPLCR7eznyx29Dls4gzUKvp4MjZ4nzPX5gDL/02PGY+oCV1WsQOsnzWRK0RxM+GlK19rG1qzqplw==",
+    "node_modules/@openai/codex-darwin-x64": {
+      "name": "@openai/codex",
+      "version": "0.144.4-darwin-x64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4-darwin-x64.tgz",
+      "integrity": "sha512-k1HC8gdbAy+VmMbekYkhM+r+QE2Xfgd67n1VSp94tjz7aXVKoalHcDkdKNM/uUQ8o2tvbiwhHSUftJF8Sm9/Lw==",
       "cpu": [
         "x64"
       ],
@@ -745,14 +771,15 @@
       "os": [
         "darwin"
       ],
-      "bin": {
-        "codex-acp-darwin-x64": "bin/codex-acp"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/@zed-industries/codex-acp-linux-arm64": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp-linux-arm64/-/codex-acp-linux-arm64-0.16.0.tgz",
-      "integrity": "sha512-8HaZGWVPVs1N6yqImLCKlnlcYTYc9BMCEhaVJk0ON9lyofhK9mOBBAHQndKC4Scqq5JLUHQIOyb8+jwHUe3hSQ==",
+    "node_modules/@openai/codex-linux-arm64": {
+      "name": "@openai/codex",
+      "version": "0.144.4-linux-arm64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4-linux-arm64.tgz",
+      "integrity": "sha512-OlKx65579OwIzech9Tt3OUH9+hFZfFrCBP1hL2MudnMIoNr1+cFZjB5YIj5MWMRoBD+K5W3wdBIpQSH855b5Sg==",
       "cpu": [
         "arm64"
       ],
@@ -761,14 +788,15 @@
       "os": [
         "linux"
       ],
-      "bin": {
-        "codex-acp-linux-arm64": "bin/codex-acp"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/@zed-industries/codex-acp-linux-x64": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp-linux-x64/-/codex-acp-linux-x64-0.16.0.tgz",
-      "integrity": "sha512-xs5zZBLpJuciEbZNx6ZSNL0qCa9h3i/zWpj40sp6QtF+L4Ow/7qzHdBzboGhHdcz1jrLedfZeRFDA2Elj8TLMA==",
+    "node_modules/@openai/codex-linux-x64": {
+      "name": "@openai/codex",
+      "version": "0.144.4-linux-x64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4-linux-x64.tgz",
+      "integrity": "sha512-2jxrmV6+/7eBNdg5uhhmOEPFu2o28eYY/ClLzWhSBHH8uo3f2KA1z9JQcVtwlbToW03nEPlEzYNYfCF1UBqsVQ==",
       "cpu": [
         "x64"
       ],
@@ -777,14 +805,15 @@
       "os": [
         "linux"
       ],
-      "bin": {
-        "codex-acp-linux-x64": "bin/codex-acp"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/@zed-industries/codex-acp-win32-arm64": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp-win32-arm64/-/codex-acp-win32-arm64-0.16.0.tgz",
-      "integrity": "sha512-4V3pDJvEyNkgVqWqlm0bLYEZ8liGXXp8InuHzCy5cgr+SFur6BuasA29tisN8NUrLus/ZvMhXCrOsNKurYAWQw==",
+    "node_modules/@openai/codex-win32-arm64": {
+      "name": "@openai/codex",
+      "version": "0.144.4-win32-arm64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4-win32-arm64.tgz",
+      "integrity": "sha512-CCgfI1smFhHZTIpTuBwDJwBr/AR40RTqaFxbBWVabu0RMeYDteRuPiDfdTlktf3C43Y1q10VZXhVGYtCokDg2w==",
       "cpu": [
         "arm64"
       ],
@@ -793,14 +822,15 @@
       "os": [
         "win32"
       ],
-      "bin": {
-        "codex-acp-win32-arm64": "bin/codex-acp.exe"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/@zed-industries/codex-acp-win32-x64": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@zed-industries/codex-acp-win32-x64/-/codex-acp-win32-x64-0.16.0.tgz",
-      "integrity": "sha512-ZriI/ay5E3DCg8s22LZykIRI2XzQL6sZg/t81K+6qc86ldscaSWQSOT6KSnRcv31QJCMfBlFxMj22pZiGSVjQA==",
+    "node_modules/@openai/codex-win32-x64": {
+      "name": "@openai/codex",
+      "version": "0.144.4-win32-x64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.144.4-win32-x64.tgz",
+      "integrity": "sha512-iL1ky0ERgdQJOKzom/Ms1fhpwkSmpsA9eVrzAqURFlYGS8z7JqwEgm33+nLGCsY7y25d8Xs/LJ91Oiqz3yXcUg==",
       "cpu": [
         "x64"
       ],
@@ -809,10 +839,16 @@
       "os": [
         "win32"
       ],
-      "bin": {
-        "codex-acp-win32-x64": "bin/codex-acp.exe"
+      "engines": {
+        "node": ">=16"
       }
     },
+    "node_modules/@stablelib/base64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
+      "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==",
+      "license": "MIT"
+    },
     "node_modules/accepts": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
@@ -1030,6 +1066,21 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+      "license": "MIT",
+      "dependencies": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -1165,6 +1216,46 @@
         }
       }
     },
+    "node_modules/default-browser": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz",
+      "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==",
+      "license": "MIT",
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.1.tgz",
+      "integrity": "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -1174,6 +1265,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/diff": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-9.0.0.tgz",
+      "integrity": "sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -1642,12 +1742,72 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-in-ssh": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-in-ssh/-/is-in-ssh-1.0.0.tgz",
+      "integrity": "sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-promise": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "license": "MIT"
     },
+    "node_modules/is-wsl": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz",
+      "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-inside-container": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -1800,6 +1960,26 @@
         "wrappy": "1"
       }
     },
+    "node_modules/open": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-11.0.0.tgz",
+      "integrity": "sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==",
+      "license": "MIT",
+      "dependencies": {
+        "default-browser": "^5.4.0",
+        "define-lazy-prop": "^3.0.0",
+        "is-in-ssh": "^1.0.0",
+        "is-inside-container": "^1.0.0",
+        "powershell-utils": "^0.1.0",
+        "wsl-utils": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -1837,6 +2017,18 @@
         "node": ">=16.20.0"
       }
     },
+    "node_modules/powershell-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.1.0.tgz",
+      "integrity": "sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -1918,6 +2110,18 @@
         "node": ">= 18"
       }
     },
+    "node_modules/run-applescript": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz",
+      "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -2091,6 +2295,18 @@
         "node": ">=18"
       }
     },
+    "node_modules/smol-toml": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.0.tgz",
+      "integrity": "sha512-aqVvWoyO21L23mb+drl4RmMXbf6N7FdHjAhTRA9ZBL7apWBgfWC16KjrASI+1p9GAroljyMHj6fK67i0UiTNvQ==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/cyyynthia"
+      }
+    },
     "node_modules/standardwebhooks": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/standardwebhooks/-/standardwebhooks-1.0.0.tgz",
@@ -2233,6 +2449,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.1.tgz",
+      "integrity": "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2254,6 +2479,22 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "license": "ISC"
     },
+    "node_modules/wsl-utils": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.3.1.tgz",
+      "integrity": "sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0",
+        "powershell-utils": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/zod": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.2",
   "description": "OpenClaw ACP runtime backend with plugin-owned session and transport management.",
   "repository": {
     "type": "git",
@@ -9,8 +9,9 @@
   "type": "module",
   "dependencies": {
     "@agentclientprotocol/claude-agent-acp": "0.55.0",
-    "@zed-industries/codex-acp": "0.16.0",
+    "@agentclientprotocol/codex-acp": "1.1.2",
     "acpx": "0.11.2",
+    "smol-toml": "1.7.0",
     "zod": "4.4.3"
   },
   "devDependencies": {
@@ -26,10 +27,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.1"
+      "pluginApi": ">=2026.7.2-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.1",
+      "openclawVersion": "2026.7.2-beta.2",
       "staticAssets": [
         {
           "source": "./src/runtime-internals/mcp-proxy.mjs",
@@ -58,7 +59,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.1"
+    "openclaw": ">=2026.7.2-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {

package/skills/acp-router/SKILL.md

@@ -210,7 +210,7 @@ Defaults are:
 
 - `openclaw -> openclaw acp`
 - `claude -> bundled @agentclientprotocol/claude-agent-acp@0.55.0`
-- `codex -> bundled @zed-industries/codex-acp@0.16.0 through OpenClaw's isolated CODEX_HOME wrapper`
+- `codex -> bundled @agentclientprotocol/codex-acp@1.1.2 through OpenClaw's isolated CODEX_HOME wrapper`
 - `copilot -> copilot --acp --stdio`
 - `cursor -> cursor-agent acp`
 - `droid -> droid exec --output-format acp`