@openclaw/acpx 2026.9.1 → 2026.9.3

package/dist/{config-v8M2tNu6.js → config-D2FTk0K7.js}

@@ -1,4 +1,5 @@
 import { t as AcpxPluginConfigSchema } from "./config-schema-DN_uAi4R.js";
+import { _ as splitCommandParts } from "./process-lease-B83BGiLj.js";
 import { createRequire } from "node:module";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs";
@@ -57,21 +58,6 @@ function resolveAcpxPluginRoot(moduleUrl = import.meta.url) {
 }
 const DEFAULT_PERMISSION_MODE = "approve-reads";
 const DEFAULT_NON_INTERACTIVE_POLICY = "fail";
-function parseAcpxPluginConfig(value) {
-	if (value === void 0) return {
-		ok: true,
-		value: void 0
-	};
-	const parsed = AcpxPluginConfigSchema.safeParse(value);
-	if (!parsed.success) return {
-		ok: false,
-		message: formatPluginConfigIssue(parsed.error.issues[0])
-	};
-	return {
-		ok: true,
-		value: parsed.data
-	};
-}
 function resolveOpenClawRoot(currentRoot) {
 	if (path.basename(currentRoot) === "acpx" && path.basename(path.dirname(currentRoot)) === "extensions") {
 		const parent = path.dirname(path.dirname(currentRoot));
@@ -87,35 +73,14 @@ function resolveTsxImportSpecifier() {
 		return "tsx";
 	}
 }
-function shellQuoteCommandArg(arg) {
-	if (!/[\s'"\\$|&;<>{}()*?[\]~`]/.test(arg)) return arg;
-	return `'${arg.replace(/'/g, "'\"'\"'")}'`;
-}
-function resolvePluginToolsMcpServerConfig(moduleUrl = import.meta.url) {
-	const openClawRoot = resolveOpenClawRoot(resolveAcpxPluginRoot(moduleUrl));
-	const distEntry = path.join(openClawRoot, "dist", "mcp", "plugin-tools-serve.js");
-	if (fs.existsSync(distEntry)) return {
-		command: process.execPath,
-		args: [distEntry]
-	};
-	const sourceEntry = path.join(openClawRoot, "src", "mcp", "plugin-tools-serve.ts");
-	return {
-		command: process.execPath,
-		args: [
-			"--import",
-			resolveTsxImportSpecifier(),
-			sourceEntry
-		]
-	};
-}
-function resolveOpenClawToolsMcpServerConfig(moduleUrl = import.meta.url) {
+function resolveManagedToolsMcpServerConfig(entryPoint, moduleUrl = import.meta.url) {
 	const openClawRoot = resolveOpenClawRoot(resolveAcpxPluginRoot(moduleUrl));
-	const distEntry = path.join(openClawRoot, "dist", "mcp", "openclaw-tools-serve.js");
+	const distEntry = path.join(openClawRoot, "dist", "mcp", `${entryPoint}.js`);
 	if (fs.existsSync(distEntry)) return {
 		command: process.execPath,
 		args: [distEntry]
 	};
-	const sourceEntry = path.join(openClawRoot, "src", "mcp", "openclaw-tools-serve.ts");
+	const sourceEntry = path.join(openClawRoot, "src", "mcp", `${entryPoint}.ts`);
 	return {
 		command: process.execPath,
 		args: [
@@ -129,8 +94,8 @@ function resolveConfiguredMcpServers(params) {
 	const resolved = { ...params.mcpServers };
 	if (params.pluginToolsMcpBridge && resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME]) throw new Error(`mcpServers.${ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME} is reserved when pluginToolsMcpBridge=true`);
 	if (params.openClawToolsMcpBridge && resolved[ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME]) throw new Error(`mcpServers.${ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME} is reserved when openClawToolsMcpBridge=true`);
-	if (params.pluginToolsMcpBridge) resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME] = resolvePluginToolsMcpServerConfig(params.moduleUrl);
-	if (params.openClawToolsMcpBridge) resolved[ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME] = resolveOpenClawToolsMcpServerConfig(params.moduleUrl);
+	if (params.pluginToolsMcpBridge) resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME] = resolveManagedToolsMcpServerConfig("plugin-tools-serve", params.moduleUrl);
+	if (params.openClawToolsMcpBridge) resolved[ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME] = resolveManagedToolsMcpServerConfig("openclaw-tools-serve", params.moduleUrl);
 	return resolved;
 }
 /** Convert OpenClaw MCP server config into ACPX runtime MCP server entries. */
@@ -147,12 +112,12 @@ function toAcpMcpServers(mcpServers) {
 }
 /** Validate and normalize raw ACPX plugin config for runtime startup. */
 function resolveAcpxPluginConfig(params) {
-	const parsed = parseAcpxPluginConfig(params.rawConfig);
-	if (!parsed.ok) throw new Error(parsed.message);
-	const normalized = parsed.value ?? {};
+	const { rawConfig } = params;
+	const parsed = AcpxPluginConfigSchema.safeParse(rawConfig === void 0 ? {} : rawConfig);
+	if (!parsed.success) throw new Error(formatPluginConfigIssue(parsed.error.issues[0]));
+	const normalized = parsed.data;
 	const workspaceDir = params.workspaceDir?.trim() || process.cwd();
-	const fallbackCwd = workspaceDir;
-	const cwd = path.resolve(normalized.cwd?.trim() || fallbackCwd);
+	const cwd = path.resolve(normalized.cwd?.trim() || workspaceDir);
 	const stateDir = path.resolve(normalized.stateDir?.trim() || path.join(workspaceDir, "state"));
 	const pluginToolsMcpBridge = normalized.pluginToolsMcpBridge === true;
 	const openClawToolsMcpBridge = normalized.openClawToolsMcpBridge === true;
@@ -164,9 +129,8 @@ function resolveAcpxPluginConfig(params) {
 	});
 	const agents = Object.fromEntries(Object.entries(normalized.agents ?? {}).map(([name, entry]) => {
 		const cmd = entry.command.trim();
-		const cmdArgs = entry.args ?? [];
-		const fullCommand = cmdArgs.length > 0 ? `${cmd} ${cmdArgs.map(shellQuoteCommandArg).join(" ")}` : cmd;
-		return [normalizeLowercaseStringOrEmpty(name), fullCommand];
+		const command = path.isAbsolute(cmd) && fs.existsSync(cmd) ? [cmd] : splitCommandParts(cmd);
+		return [normalizeLowercaseStringOrEmpty(name), [...command, ...entry.args ?? []]];
 	}));
 	return {
 		cwd,
@@ -176,10 +140,10 @@ function resolveAcpxPluginConfig(params) {
 		nonInteractivePermissions: normalized.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE_POLICY,
 		pluginToolsMcpBridge,
 		openClawToolsMcpBridge,
-		timeoutSeconds: normalized.timeoutSeconds ?? 120,
+		timeoutSeconds: normalized.timeoutSeconds,
 		mcpServers,
 		agents
 	};
 }
 //#endregion
-export { resolveAcpxPluginRoot as n, toAcpMcpServers as r, resolveAcpxPluginConfig as t };
+export { toAcpMcpServers as i, resolveAcpxPluginRoot as n, resolveOpenClawRoot as r, resolveAcpxPluginConfig as t };

package/dist/doctor-contract-api.js

@@ -1,4 +1,4 @@
-import { c as normalizeAcpxProcessLeaseFile, f as ACPX_GATEWAY_INSTANCE_KEY, g as normalizeAcpxGatewayInstanceRecord, h as ACPX_LEGACY_PROCESS_LEASE_FILE, l as openAcpxProcessLeaseStateStore, m as ACPX_LEGACY_GATEWAY_INSTANCE_FILE, p as ACPX_GATEWAY_INSTANCE_NAMESPACE, s as normalizeAcpxProcessLease } from "./process-lease-Cwvj7WGe.js";
+import { c as openAcpxProcessLeaseStateStore, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, h as normalizeAcpxGatewayInstanceRecord, m as ACPX_LEGACY_PROCESS_LEASE_FILE, o as normalizeAcpxProcessLease, p as ACPX_LEGACY_GATEWAY_INSTANCE_FILE, s as normalizeAcpxProcessLeaseFile } from "./process-lease-B83BGiLj.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { archiveLegacyStateSource, asObjectRecord } from "openclaw/plugin-sdk/runtime-doctor-migrations";
@@ -137,10 +137,10 @@ const stateMigrations = [{
 	doctorOnly: true,
 	phase: "after-session-repair",
 	async detectLegacyState(input) {
-		return (await import("./session-owner-migration-CistlQKM.js")).acpxSessionOwnerMigration.detectLegacyState(input);
+		return (await import("./session-owner-migration-D36AH9RC.js")).acpxSessionOwnerMigration.detectLegacyState(input);
 	},
 	async migrateLegacyState(input) {
-		return (await import("./session-owner-migration-CistlQKM.js")).acpxSessionOwnerMigration.migrateLegacyState(input);
+		return (await import("./session-owner-migration-D36AH9RC.js")).acpxSessionOwnerMigration.migrateLegacyState(input);
 	}
 }];
 //#endregion

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as createAcpxRuntimeService } from "./register.runtime-Ba7FPMGu.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-CksaMeEx.js";
 import "./config-schema-DN_uAi4R.js";
 import { a as PI_SESSIONS_CAPABILITY, c as PI_SESSION_READ_COMMAND, l as PI_TERMINAL_RESUME_COMMAND, o as PI_SESSIONS_LIST_COMMAND, r as piSessionStoreAvailable, s as PI_SESSION_ID_PATTERN } from "./pi-session-paths-EMbd4Hkz.js";
 import { tryDispatchAcpReplyHook } from "openclaw/plugin-sdk/acp-runtime-backend";
@@ -8,7 +8,7 @@ import { resolveNodeHostExecutable } from "openclaw/plugin-sdk/node-host";
 import { createSessionCatalogNodeHostBindings } from "openclaw/plugin-sdk/session-catalog";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/acpx/src/pi-session-catalog-plugin.ts
-const loadPiSessionCatalogModule = createLazyRuntimeModule(() => import("./pi-session-catalog-runtime-C0HodUWT.js"));
+const loadPiSessionCatalogModule = createLazyRuntimeModule(() => import("./pi-session-catalog-runtime-BIieInfo.js"));
 function fullConfigCatalogEnabled(config) {
 	if (!isRecord(config) || !isRecord(config.plugins) || !isRecord(config.plugins.entries)) return true;
 	const entry = config.plugins.entries.acpx;

package/dist/{pi-session-catalog-runtime-C0HodUWT.js → pi-session-catalog-runtime-BIieInfo.js}

@@ -1,7 +1,7 @@
 import { c as PI_SESSION_READ_COMMAND, i as PI_LOCAL_SESSION_HOST_ID, l as PI_TERMINAL_RESUME_COMMAND, n as piSessionStore, o as PI_SESSIONS_LIST_COMMAND, r as piSessionStoreAvailable, s as PI_SESSION_ID_PATTERN, t as piAcpSessionStoreRoot } from "./pi-session-paths-EMbd4Hkz.js";
 import { parseDateFirstTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { resolveNodeHostExecutable } from "openclaw/plugin-sdk/node-host";
-import { createSessionCatalogFamily, importSessionCatalogHistory, isExternalUserText, listAdoptedSessionCatalogSessions, sessionCatalogAdoptedSessionKey, sessionCatalogPaging } from "openclaw/plugin-sdk/session-catalog";
+import { createSessionCatalogFamily, importSessionCatalogHistory, isExternalUserText, listAdoptedSessionCatalogSessions, sessionCatalogAdoptedSessionKey } from "openclaw/plugin-sdk/session-catalog";
 import { isRecord, normalizeBoundedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createReadStream } from "node:fs";
 import path from "node:path";
@@ -9,6 +9,7 @@ import fs$1 from "node:fs/promises";
 import process from "node:process";
 import { resolveAcpSessionAvailability } from "openclaw/plugin-sdk/acp-runtime";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { sessionCatalogPaging } from "openclaw/plugin-sdk/session-catalog-paging";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { runTasksWithConcurrency } from "openclaw/plugin-sdk/concurrency-runtime";
 import { isPathStrictlyInside } from "openclaw/plugin-sdk/file-access-runtime";

package/dist/{process-lease-Cwvj7WGe.js → process-lease-B83BGiLj.js}

@@ -1,29 +1,38 @@
-import { createHash, randomUUID } from "node:crypto";
+import { createHash } from "node:crypto";
 //#region extensions/acpx/src/command-line.ts
-/**
-* Small shell-command helpers for ACPX-launched processes. Splitting supports
-* simple quoted command strings from config without invoking a shell parser.
-*/
-/** Quote one command argument for display or config serialization. */
-function quoteCommandPart(value) {
-	return JSON.stringify(value);
+/** Match ACPX's persisted argv identity; scalar records keep their original bytes. */
+function renderAgentCommand(command) {
+	return typeof command === "string" ? command : command.map((part) => /^[A-Za-z0-9_@%+=:,./^~-]+$/.test(part) ? part : JSON.stringify(part)).join(" ");
 }
 /** Split a command string into argv-like parts using simple quote/backslash rules. */
 function splitCommandParts(value) {
+	if (Array.isArray(value)) return value;
+	const windows = process.platform === "win32";
 	const parts = [];
 	let current = "";
 	let quote = null;
 	let escaping = false;
+	let hasPart = false;
 	for (const ch of value) {
 		if (escaping) {
 			current += ch;
 			escaping = false;
+			hasPart = true;
 			continue;
 		}
-		if (ch === "\\" && quote !== "'") {
+		if (ch === "\\" && quote !== "'" && !windows) {
 			escaping = true;
+			hasPart = true;
 			continue;
 		}
+		if (windows && ch === "\"" && quote !== "'") {
+			const backslashes = current.match(/\\+$/)?.[0].length ?? 0;
+			current = current.slice(0, current.length - backslashes) + "\\".repeat(Math.floor(backslashes / 2));
+			if (backslashes % 2 === 1) {
+				current += "\"";
+				continue;
+			}
+		}
 		if (quote) {
 			if (ch === quote) quote = null;
 			else current += ch;
@@ -31,19 +40,23 @@ function splitCommandParts(value) {
 		}
 		if (ch === "'" || ch === "\"") {
 			quote = ch;
+			hasPart = true;
 			continue;
 		}
 		if (/\s/.test(ch)) {
-			if (current) {
+			if (hasPart) {
 				parts.push(current);
 				current = "";
+				hasPart = false;
 			}
 			continue;
 		}
 		current += ch;
+		hasPart = true;
 	}
 	if (escaping) current += "\\";
-	if (current) parts.push(current);
+	if (quote) throw new Error("Invalid agent command: unterminated quote");
+	if (hasPart) parts.push(current);
 	return parts;
 }
 //#endregion
@@ -78,7 +91,7 @@ const OPENCLAW_GATEWAY_INSTANCE_ID_ARG = "--openclaw-gateway-instance-id";
 const ACPX_PROBE_LEASE_SESSION_KEY = "openclaw:acpx:probe";
 /** Read OpenClaw lease identity from a generated wrapper command. */
 function readAcpxProcessLeaseIdentity(command) {
-	const parts = splitCommandParts(command?.trim() ?? "");
+	const parts = typeof command === "string" ? Array.from(command.matchAll(/(?:^|\s)(--openclaw-(?:acpx-lease-id|gateway-instance-id))\s+(?:"([^"]*)"|'([^']*)'|(\S+))(?=\s|$)/g)).flatMap((match) => [match[1], match[2] ?? match[3] ?? match[4]]) : command ?? [];
 	const leaseIndex = parts.lastIndexOf(OPENCLAW_ACPX_LEASE_ID_ARG);
 	const gatewayIndex = parts.lastIndexOf(OPENCLAW_GATEWAY_INSTANCE_ID_ARG);
 	const leaseId = leaseIndex >= 0 ? parts[leaseIndex + 1]?.trim() : "";
@@ -167,29 +180,19 @@ function createAcpxProcessLeaseStore(params) {
 		}
 	};
 }
-/** Create a unique lease id for one ACPX wrapper process. */
-function createAcpxProcessLeaseId() {
-	return randomUUID();
-}
 /** Hash a wrapper command so process leases can detect command drift. */
 function hashAcpxProcessCommand(command) {
-	return createHash("sha256").update(command).digest("hex");
-}
-function quoteEnvValue(value) {
-	return /^[A-Za-z0-9_./:=@+-]+$/.test(value) ? value : `'${value.replace(/'/g, "'\\''")}'`;
+	return createHash("sha256").update(renderAgentCommand(command)).digest("hex");
 }
-function appendAcpxLeaseArgs(params) {
+/** Append portable wrapper arguments without changing the executable or argument bytes. */
+function withAcpxLeaseArgs(params) {
 	return [
-		params.command,
+		...splitCommandParts(params.command),
 		OPENCLAW_ACPX_LEASE_ID_ARG,
-		quoteEnvValue(params.leaseId),
+		params.leaseId,
 		OPENCLAW_GATEWAY_INSTANCE_ID_ARG,
-		quoteEnvValue(params.gatewayInstanceId)
-	].join(" ");
-}
-/** Add ACPX lease identity to a command through portable wrapper arguments. */
-function withAcpxLeaseEnvironment(params) {
-	return appendAcpxLeaseArgs(params);
+		params.gatewayInstanceId
+	];
 }
 //#endregion
-export { quoteCommandPart as _, createAcpxProcessLeaseStore as a, normalizeAcpxProcessLeaseFile as c, withAcpxLeaseEnvironment as d, ACPX_GATEWAY_INSTANCE_KEY as f, normalizeAcpxGatewayInstanceRecord as g, ACPX_LEGACY_PROCESS_LEASE_FILE as h, createAcpxProcessLeaseId as i, openAcpxProcessLeaseStateStore as l, ACPX_LEGACY_GATEWAY_INSTANCE_FILE as m, OPENCLAW_ACPX_LEASE_ID_ARG as n, hashAcpxProcessCommand as o, ACPX_GATEWAY_INSTANCE_NAMESPACE as p, OPENCLAW_GATEWAY_INSTANCE_ID_ARG as r, normalizeAcpxProcessLease as s, ACPX_PROBE_LEASE_SESSION_KEY as t, readAcpxProcessLeaseIdentity as u, splitCommandParts as v };
+export { splitCommandParts as _, hashAcpxProcessCommand as a, openAcpxProcessLeaseStateStore as c, ACPX_GATEWAY_INSTANCE_KEY as d, ACPX_GATEWAY_INSTANCE_NAMESPACE as f, renderAgentCommand as g, normalizeAcpxGatewayInstanceRecord as h, createAcpxProcessLeaseStore as i, readAcpxProcessLeaseIdentity as l, ACPX_LEGACY_PROCESS_LEASE_FILE as m, OPENCLAW_ACPX_LEASE_ID_ARG as n, normalizeAcpxProcessLease as o, ACPX_LEGACY_GATEWAY_INSTANCE_FILE as p, OPENCLAW_GATEWAY_INSTANCE_ID_ARG as r, normalizeAcpxProcessLeaseFile as s, ACPX_PROBE_LEASE_SESSION_KEY as t, withAcpxLeaseArgs as u };

package/dist/{register.runtime-Ba7FPMGu.js → register.runtime-CksaMeEx.js}

@@ -67,7 +67,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-COMUTA5A.js").then((n) => n.t));
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-BAf6nuci.js").then((n) => n.t));
 function unregisterOwnedRuntime(runtime) {
 	if (runtime && getAcpRuntimeBackend(ACPX_BACKEND_ID)?.runtime === runtime) unregisterAcpRuntimeBackend(ACPX_BACKEND_ID);
 }

package/dist/register.runtime.js

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