@openclaw/acpx 2026.9.2 → 2026.9.3

package/dist/{service-COMUTA5A.js → service-BAf6nuci.js}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { n as createLazyAcpRuntimeProxy } from "./register.runtime-Ba7FPMGu.js";
+import { n as createLazyAcpRuntimeProxy } from "./register.runtime-CksaMeEx.js";
 import "./config-schema-DN_uAi4R.js";
-import { _ as quoteCommandPart, a as createAcpxProcessLeaseStore, f as ACPX_GATEWAY_INSTANCE_KEY, g as normalizeAcpxGatewayInstanceRecord, l as openAcpxProcessLeaseStateStore, n as OPENCLAW_ACPX_LEASE_ID_ARG, p as ACPX_GATEWAY_INSTANCE_NAMESPACE, r as OPENCLAW_GATEWAY_INSTANCE_ID_ARG, u as readAcpxProcessLeaseIdentity, v as splitCommandParts } from "./process-lease-Cwvj7WGe.js";
-import { n as resolveAcpxPluginRoot, r as toAcpMcpServers, t as resolveAcpxPluginConfig } from "./config-v8M2tNu6.js";
+import { _ as splitCommandParts, c as openAcpxProcessLeaseStateStore, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, h as normalizeAcpxGatewayInstanceRecord, i as createAcpxProcessLeaseStore, l as readAcpxProcessLeaseIdentity, n as OPENCLAW_ACPX_LEASE_ID_ARG, r as OPENCLAW_GATEWAY_INSTANCE_ID_ARG } from "./process-lease-B83BGiLj.js";
+import { i as toAcpMcpServers, n as resolveAcpxPluginRoot, r as resolveOpenClawRoot, t as resolveAcpxPluginConfig } from "./config-D2FTk0K7.js";
 import { createRequire } from "node:module";
 import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
@@ -12,8 +12,9 @@ import os from "node:os";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import { randomUUID } from "node:crypto";
-import { isPidAlive, runExec } from "openclaw/plugin-sdk/process-runtime";
+import { escapeRegExp } from "openclaw/plugin-sdk/text-utility-runtime";
 import { inspect } from "node:util";
+import { isPidAlive, runExec } from "openclaw/plugin-sdk/process-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
 import { parse, stringify } from "smol-toml";
@@ -68,16 +69,9 @@ function resolvePackageRoot(packageName) {
 		return;
 	}
 }
-function resolveOpenClawInstallRoot(pluginRoot) {
-	if (path.basename(pluginRoot) === "acpx" && path.basename(path.dirname(pluginRoot)) === "extensions") {
-		const parent = path.dirname(path.dirname(pluginRoot));
-		return path.basename(parent) === "dist" ? path.dirname(parent) : parent;
-	}
-	return path.resolve(pluginRoot, "..");
-}
 function resolveOwnedAcpPackageRootCandidates(packageName) {
 	const pluginRoot = resolveAcpxPluginRoot(import.meta.url);
-	const openClawRoot = resolveOpenClawInstallRoot(pluginRoot);
+	const openClawRoot = resolveOpenClawRoot(pluginRoot);
 	return [
 		resolvePackageRoot(packageName),
 		path.join(pluginRoot, "node_modules", packageName),
@@ -91,15 +85,9 @@ function commandBelongsToResolvedAcpPackage(command) {
 function commandMentionsGeneratedWrapper(command) {
 	return Array.from(GENERATED_WRAPPER_BASENAMES).some((basename) => command.includes(basename));
 }
-function commandWrapperBelongsToRoot(command, wrapperRoot) {
-	if (!wrapperRoot) return true;
-	const normalizedCommand = normalizePathLike(command);
-	const normalizedRoot = normalizePathLike(wrapperRoot).replace(/\/+$/, "");
-	return Array.from(GENERATED_WRAPPER_BASENAMES).some((basename) => normalizedCommand.includes(`${normalizedRoot}/${basename}`));
-}
 function commandContainsExactWrapperPath(command, wrapperPath) {
 	const expectedPath = normalizePathLike(wrapperPath);
-	return splitCommandParts(command).some((part) => normalizePathLike(part) === expectedPath);
+	return new RegExp(`(?:^|[\\s"'])${escapeRegExp(expectedPath)}(?=$|[\\s"'])`).test(normalizePathLike(command));
 }
 function wrapperPathBelongsToRoot(wrapperPath, wrapperRoot) {
 	const normalizedPath = normalizePathLike(wrapperPath);
@@ -108,24 +96,18 @@ function wrapperPathBelongsToRoot(wrapperPath, wrapperRoot) {
 }
 /** Check whether a command references an OpenClaw-generated ACPX wrapper path. */
 function isOpenClawLeaseAwareAcpxProcessCommand(params) {
-	const command = params.command?.trim();
-	if (!command) return false;
-	const normalized = normalizePathLike(command);
-	return commandMentionsGeneratedWrapper(normalized) && commandWrapperBelongsToRoot(normalized, params.wrapperRoot);
+	const command = normalizePathLike(Array.isArray(params.command) ? params.command.join(" ") : params.command ?? "");
+	const root = params.wrapperRoot ? `${normalizePathLike(params.wrapperRoot).replace(/\/+$/, "")}/` : "";
+	return Array.from(GENERATED_WRAPPER_BASENAMES).some((basename) => command.includes(`${root}${basename}`));
 }
 function commandsReferToSameRootCommand(liveCommand, storedCommand) {
 	if (!storedCommand?.trim()) return true;
 	return normalizePathLike(liveCommand).trim() === normalizePathLike(storedCommand).trim();
 }
-function commandOptionEquals(parts, option, expected) {
-	if (!expected) return true;
-	const index = parts.indexOf(option);
-	return index >= 0 && parts[index + 1] === expected;
-}
 function liveCommandMatchesLeaseIdentity(params) {
 	if (!params.expectedLeaseId && !params.expectedGatewayInstanceId) return true;
-	const parts = splitCommandParts(params.command ?? "");
-	return commandOptionEquals(parts, "--openclaw-acpx-lease-id", params.expectedLeaseId) && commandOptionEquals(parts, "--openclaw-gateway-instance-id", params.expectedGatewayInstanceId);
+	const identity = readAcpxProcessLeaseIdentity(params.command);
+	return (!params.expectedLeaseId || identity?.leaseId === params.expectedLeaseId) && (!params.expectedGatewayInstanceId || identity?.gatewayInstanceId === params.expectedGatewayInstanceId);
 }
 /** Check whether a command is owned by OpenClaw ACPX runtime packages or wrappers. */
 function isOpenClawOwnedAcpxProcessCommand(params) {
@@ -237,25 +219,10 @@ async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 	const rootCommand = listedTree[0]?.command ?? params.rootCommand;
 	const liveCommandWasGeneratedWrapper = commandMentionsGeneratedWrapper(normalizePathLike(rootCommand ?? ""));
 	const storedCommandWasGeneratedWrapper = commandMentionsGeneratedWrapper(normalizePathLike(params.rootCommand ?? ""));
-	if (!liveCommandWasGeneratedWrapper && storedCommandWasGeneratedWrapper) return {
-		inspectedPids: listedTree.map((processInfo) => processInfo.pid),
-		terminatedPids: [],
-		skippedReason: "not-openclaw-owned"
-	};
-	if (!liveCommandWasGeneratedWrapper && !commandsReferToSameRootCommand(rootCommand ?? "", params.rootCommand)) return {
-		inspectedPids: listedTree.map((processInfo) => processInfo.pid),
-		terminatedPids: [],
-		skippedReason: "not-openclaw-owned"
-	};
-	if (!isOpenClawOwnedAcpxProcessCommand({
+	if (!liveCommandWasGeneratedWrapper && (storedCommandWasGeneratedWrapper || !commandsReferToSameRootCommand(rootCommand ?? "", params.rootCommand)) || !isOpenClawOwnedAcpxProcessCommand({
 		command: rootCommand,
 		wrapperRoot: params.wrapperRoot
-	})) return {
-		inspectedPids: listedTree.map((processInfo) => processInfo.pid),
-		terminatedPids: [],
-		skippedReason: "not-openclaw-owned"
-	};
-	if (!liveCommandMatchesLeaseIdentity({
+	}) || !liveCommandMatchesLeaseIdentity({
 		command: rootCommand,
 		expectedLeaseId: params.expectedLeaseId,
 		expectedGatewayInstanceId: params.expectedGatewayInstanceId
@@ -701,9 +668,6 @@ const DIAGNOSTIC_REDACTION_RULES = [
 		replacement: "[REDACTED_TELEGRAM_TOKEN]"
 	}
 ];
-function renderDiagnosticRedactionRuleSpecs() {
-	return JSON.stringify(DIAGNOSTIC_REDACTION_RULES);
-}
 function buildAdapterWrapperScript(params) {
 	return `#!/usr/bin/env node
 import { appendFileSync, existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
@@ -717,9 +681,9 @@ const stderrLogFileNamePrefix = ${params.stderrLogFileNamePrefix ? JSON.stringif
 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  ")}
+  ${JSON.stringify(OPENCLAW_ACPX_LEASE_ID_ARG)},
+  ${JSON.stringify(OPENCLAW_GATEWAY_INSTANCE_ID_ARG)},
+  ${(params.openClawWrapperArgs ?? []).map((arg) => JSON.stringify(arg)).join(",\n  ")}
 ]);
 
 function readOpenClawWrapperArg(args, name) {
@@ -756,13 +720,13 @@ function resolveStderrLogPath(args) {
     return undefined;
   }
   const leaseId =
-    readOpenClawWrapperArg(args, ${quoteCommandPart(OPENCLAW_ACPX_LEASE_ID_ARG)}) ||
+    readOpenClawWrapperArg(args, ${JSON.stringify(OPENCLAW_ACPX_LEASE_ID_ARG)}) ||
     "pid-" + process.pid;
   const fileName = stderrLogFileNamePrefix + "." + safeDiagnosticFilePart(leaseId) + ".log";
   return fileURLToPath(new URL("./" + fileName, import.meta.url));
 }
 
-const diagnosticRedactionRules = ${renderDiagnosticRedactionRuleSpecs()}.map((rule) => [
+const diagnosticRedactionRules = ${JSON.stringify(DIAGNOSTIC_REDACTION_RULES)}.map((rule) => [
   new RegExp(rule.source, rule.flags),
   rule.replacement,
 ]);
@@ -915,7 +879,7 @@ function resolveNpmCliPath() {
 }
 
 const npmCliPath = resolveNpmCliPath();
-const installedBinPath = ${params.installedBinPath ? quoteCommandPart(params.installedBinPath) : "undefined"};
+const installedBinPath = ${params.installedBinPath ? JSON.stringify(params.installedBinPath) : "undefined"};
 let defaultCommand;
 let defaultArgs;
 if (installedBinPath) {
@@ -1098,7 +1062,7 @@ function mergeCodexConfig(base, override) {
 
 const openClawCodexConfigs = readOpenClawWrapperArgs(
   rawConfiguredArgs,
-  ${quoteCommandPart(OPENCLAW_CODEX_CONFIG_ARG)},
+  ${JSON.stringify(OPENCLAW_CODEX_CONFIG_ARG)},
 );
 if (openClawCodexConfigs.length > 0) {
   let existingCodexConfig = {};
@@ -1164,23 +1128,13 @@ async function prepareIsolatedCodexHome(params) {
 	}), "utf8");
 	return codexHome;
 }
-async function makeGeneratedWrapperExecutableIfPossible(wrapperPath) {
+async function writeAdapterWrapper(baseDir, fileName, script) {
+	await fs$1.mkdir(baseDir, { recursive: true });
+	const wrapperPath = path.join(baseDir, fileName);
+	await fs$1.writeFile(wrapperPath, script, { encoding: "utf8" });
 	try {
 		await fs$1.chmod(wrapperPath, 493);
 	} catch {}
-}
-async function writeCodexAcpWrapper(baseDir, installedBinPath) {
-	await fs$1.mkdir(baseDir, { recursive: true });
-	const wrapperPath = path.join(baseDir, "codex-acp-wrapper.mjs");
-	await fs$1.writeFile(wrapperPath, buildCodexAcpWrapperScript(installedBinPath), { encoding: "utf8" });
-	await makeGeneratedWrapperExecutableIfPossible(wrapperPath);
-	return wrapperPath;
-}
-async function writeClaudeAcpWrapper(baseDir, installedBinPath) {
-	await fs$1.mkdir(baseDir, { recursive: true });
-	const wrapperPath = path.join(baseDir, "claude-agent-acp-wrapper.mjs");
-	await fs$1.writeFile(wrapperPath, buildClaudeAcpWrapperScript(installedBinPath), { encoding: "utf8" });
-	await makeGeneratedWrapperExecutableIfPossible(wrapperPath);
 	return wrapperPath;
 }
 function buildWrapperCommand(wrapperPath, args = []) {
@@ -1188,7 +1142,7 @@ function buildWrapperCommand(wrapperPath, args = []) {
 		process.execPath,
 		wrapperPath,
 		...args
-	].map(quoteCommandPart).join(" ");
+	];
 }
 function isAcpPackageSpec(value, packageName) {
 	const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -1203,9 +1157,7 @@ function isPackageRunnerCommand(value) {
 	return /^(?:npx|npm|pnpm|bunx)(?:\.cmd|\.exe)?$/i.test(basename(value));
 }
 function extractConfiguredAdapterArgs(params) {
-	const trimmedConfiguredCommand = params.configuredCommand?.trim();
-	if (!trimmedConfiguredCommand) return [];
-	const parts = splitCommandParts(trimmedConfiguredCommand);
+	const parts = splitCommandParts(params.configuredCommand ?? []);
 	if (!parts.length) return [];
 	const packageIndex = parts.findIndex((part) => isAcpPackageSpec(part, params.packageName));
 	if (packageIndex >= 0) {
@@ -1291,11 +1243,6 @@ function resolveCodexAdapterLaunch(configuredCommand) {
 	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 (!isRecord(mcpServers)) return;
@@ -1310,7 +1257,7 @@ function buildClaudeAcpWrapperCommand(wrapperPath, configuredCommand) {
 		binName: CLAUDE_ACP_BIN
 	});
 	if (configuredAdapterArgs) return buildWrapperCommand(wrapperPath, configuredAdapterArgs);
-	return configuredCommand?.trim() || buildWrapperCommand(wrapperPath);
+	return configuredCommand ?? buildWrapperCommand(wrapperPath);
 }
 /** Prepare ACPX agent commands and isolated auth homes for Codex/Claude adapters. */
 async function prepareAcpxCodexAuthConfig(params) {
@@ -1328,13 +1275,13 @@ async function prepareAcpxCodexAuthConfig(params) {
 	});
 	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 wrapperPath = await writeAdapterWrapper(codexBaseDir, "codex-acp-wrapper.mjs", buildCodexAcpWrapperScript(installedCodexBinPath));
+	const claudeWrapperPath = await writeAdapterWrapper(codexBaseDir, "claude-agent-acp-wrapper.mjs", buildClaudeAcpWrapperScript(installedClaudeBinPath));
 	return {
 		...params.pluginConfig,
 		agents: {
 			...params.pluginConfig.agents,
-			codex: buildCodexAcpWrapperCommand(wrapperPath, configuredCodexCommand),
+			codex: buildWrapperCommand(wrapperPath, codexLaunch?.args ?? [RUN_CONFIGURED_COMMAND_SENTINEL, ...splitCommandParts(configuredCodexCommand ?? [])]),
 			claude: buildClaudeAcpWrapperCommand(claudeWrapperPath, configuredClaudeCommand)
 		}
 	};
@@ -1351,7 +1298,7 @@ var service_exports = /* @__PURE__ */ __exportAll({
 });
 const ENABLE_STARTUP_PROBE_ENV = "OPENCLAW_ACPX_RUNTIME_STARTUP_PROBE";
 const SKIP_RUNTIME_PROBE_ENV = "OPENCLAW_SKIP_ACPX_RUNTIME_PROBE";
-const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-memQfUBo.js"));
+const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-CSNBTQIs.js"));
 /** Convert ACPX timeout seconds into timer-safe milliseconds. */
 function resolveAcpxTimerTimeoutMs(timeoutSeconds) {
 	if (timeoutSeconds === void 0) return;
@@ -1396,9 +1343,6 @@ function createLazyDefaultRuntime(params) {
 	}
 	return {
 		...createLazyAcpRuntimeProxy(resolveRuntime),
-		async probeAvailability() {
-			await (await resolveRuntime()).probeAvailability();
-		},
 		isHealthy() {
 			return runtime?.isHealthy() ?? false;
 		}
@@ -1592,20 +1536,18 @@ function createAcpxRuntimeService(params) {
 			lifecycleRevision += 1;
 			const currentRevision = lifecycleRevision;
 			try {
-				await measureAcpxStartup(ctx, "probe.availability", () => withStartupProbeTimeout({
-					promise: startedRuntime.probeAvailability(),
+				const doctorReport = await measureAcpxStartup(ctx, "probe.availability", () => withStartupProbeTimeout({
+					promise: startedRuntime.doctor(),
 					timeoutSeconds: pluginConfig.timeoutSeconds ?? 120
 				}));
 				if (currentRevision !== lifecycleRevision) return;
-				if (startedRuntime.isHealthy()) {
+				if (doctorReport.ok) {
 					detailAcpxStartup(ctx, "probe.result", [["healthyCount", 1]]);
 					ctx.logger.info("embedded acpx runtime backend ready");
 					return;
 				}
-				const doctorReport = await measureAcpxStartup(ctx, "probe.doctor", () => startedRuntime.doctor());
-				if (currentRevision !== lifecycleRevision) return;
 				detailAcpxStartup(ctx, "probe.result", [["healthyCount", 0]]);
-				ctx.logger.warn(`embedded acpx runtime backend probe failed: ${doctorReport ? formatDoctorFailureMessage(doctorReport) : "backend remained unhealthy after probe"}`);
+				ctx.logger.warn(`embedded acpx runtime backend probe failed: ${formatDoctorFailureMessage(doctorReport)}`);
 			} catch (err) {
 				if (currentRevision !== lifecycleRevision) return;
 				detailAcpxStartup(ctx, "probe.result", [["healthyCount", 0]]);

package/dist/{session-owner-migration-CistlQKM.js → session-owner-migration-D36AH9RC.js}

@@ -1,5 +1,5 @@
-import { l as openAcpxProcessLeaseStateStore, o as hashAcpxProcessCommand, s as normalizeAcpxProcessLease, u as readAcpxProcessLeaseIdentity } from "./process-lease-Cwvj7WGe.js";
-import { t as resolveAcpxPluginConfig } from "./config-v8M2tNu6.js";
+import { a as hashAcpxProcessCommand, c as openAcpxProcessLeaseStateStore, l as readAcpxProcessLeaseIdentity, o as normalizeAcpxProcessLease } from "./process-lease-B83BGiLj.js";
+import { t as resolveAcpxPluginConfig } from "./config-D2FTk0K7.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { archiveLegacyStateSource, asObjectRecord } from "openclaw/plugin-sdk/runtime-doctor-migrations";

package/openclaw.plugin.json

@@ -14,7 +14,14 @@
   ],
   "doctorContract": {
     "configRepair": true,
-    "stateMigrations": true
+    "stateMigrations": [
+      { "id": "acpx-runtime-state-to-plugin-state" },
+      {
+        "id": "acpx-session-owner-resources",
+        "doctorOnly": true,
+        "phase": "after-session-repair"
+      }
+    ]
   },
   "activation": {
     "onStartup": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.9.2",
+  "version": "2026.9.3",
   "description": "OpenClaw ACP runtime backend with plugin-owned session and transport management.",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
   "dependencies": {
     "@agentclientprotocol/claude-agent-acp": "0.70.0",
     "@agentclientprotocol/codex-acp": "1.6.2",
-    "acpx": "0.13.1",
+    "acpx": "0.13.2",
     "smol-toml": "1.8.0",
     "zod": "4.4.3"
   },
@@ -43,10 +43,10 @@
       ]
     },
     "compat": {
-      "pluginApi": ">=2026.9.2"
+      "pluginApi": ">=2026.9.3"
     },
     "build": {
-      "openclawVersion": "2026.9.2",
+      "openclawVersion": "2026.9.3",
       "staticAssets": [
         {
           "source": "./src/runtime-internals/mcp-proxy.mjs",
@@ -74,7 +74,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.9.2"
+    "openclaw": ">=2026.9.3"
   },
   "peerDependenciesMeta": {
     "openclaw": {