@openclaw/acpx 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/pi-session-paths-DgYt8LUg.js

@@ -0,0 +1,81 @@
+import { isRecord, normalizeBoundedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { readFileSync, statSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+//#region extensions/acpx/src/pi-session-catalog-shared.ts
+const PI_SESSIONS_LIST_COMMAND = "acpx.pi.sessions.list.v1";
+const PI_SESSION_READ_COMMAND = "acpx.pi.sessions.read.v1";
+const PI_TERMINAL_RESUME_COMMAND = "acpx.pi.terminal.resume.v1";
+//#endregion
+//#region extensions/acpx/src/pi-session-paths.ts
+function piHome(env) {
+	return (process.platform === "win32" ? env.USERPROFILE?.trim() : env.HOME?.trim()) || os.homedir();
+}
+function isPiSessionCatalogPathAbsolute(value, platform = process.platform) {
+	if (platform !== "win32") return path.posix.isAbsolute(value);
+	const root = path.win32.parse(value).root;
+	return path.win32.isAbsolute(value) && root !== "\\" && root !== "/";
+}
+function resolveConfiguredPath(value, env, relativeBase) {
+	const home = piHome(env);
+	let resolved = value;
+	if (value === "~") resolved = home;
+	if (value.startsWith("~/") || value.startsWith("~\\")) resolved = path.join(home, value.slice(2));
+	if (!isPiSessionCatalogPathAbsolute(resolved)) {
+		if (relativeBase) return path.resolve(relativeBase, resolved);
+		throw new Error("Pi session catalog requires absolute or home-relative storage paths");
+	}
+	return path.resolve(resolved);
+}
+function settingsSessionDir(file) {
+	try {
+		const value = JSON.parse(readFileSync(file, "utf8"));
+		return isRecord(value) ? normalizeBoundedOptionalString(value.sessionDir, 4096) : void 0;
+	} catch {
+		return;
+	}
+}
+function piSessionStore(env, cwd = process.cwd()) {
+	const customSessionDir = env.PI_CODING_AGENT_SESSION_DIR?.trim();
+	if (customSessionDir) return {
+		root: resolveConfiguredPath(customSessionDir, env),
+		flat: true,
+		usesProcessHomeFallback: false
+	};
+	const home = piHome(env);
+	const customAgentDir = env.PI_CODING_AGENT_DIR?.trim();
+	const agentDir = customAgentDir ? resolveConfiguredPath(customAgentDir, env) : path.join(home, ".pi", "agent");
+	const projectSessionDir = settingsSessionDir(path.join(cwd, ".pi", "settings.json"));
+	if (projectSessionDir) return {
+		root: resolveConfiguredPath(projectSessionDir, env, path.join(cwd, ".pi")),
+		flat: true,
+		usesProcessHomeFallback: false
+	};
+	const globalSessionDir = settingsSessionDir(path.join(agentDir, "settings.json"));
+	if (globalSessionDir) return {
+		root: resolveConfiguredPath(globalSessionDir, env, agentDir),
+		flat: true,
+		usesProcessHomeFallback: false
+	};
+	return {
+		root: path.join(agentDir, "sessions"),
+		flat: false,
+		usesProcessHomeFallback: !customAgentDir
+	};
+}
+/** Store root scanned by pi-acp@0.0.26 when resolving a native session id. */
+function piAcpSessionStoreRoot(env) {
+	const configuredAgentDir = env.PI_CODING_AGENT_DIR?.trim();
+	if (configuredAgentDir && !isPiSessionCatalogPathAbsolute(configuredAgentDir)) return;
+	const agentDir = configuredAgentDir ? path.resolve(configuredAgentDir) : path.join(piHome(env), ".pi", "agent");
+	return path.join(agentDir, "sessions");
+}
+function piSessionStoreAvailable(env, store) {
+	try {
+		return statSync((store ?? piSessionStore(env)).root).isDirectory();
+	} catch {
+		return false;
+	}
+}
+//#endregion
+export { PI_SESSION_READ_COMMAND as a, PI_SESSIONS_LIST_COMMAND as i, piSessionStore as n, PI_TERMINAL_RESUME_COMMAND as o, piSessionStoreAvailable as r, piAcpSessionStoreRoot as t };

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

@@ -1,4 +1,52 @@
 import { createHash, randomUUID } 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);
+}
+/** Split a command string into argv-like parts using simple quote/backslash rules. */
+function splitCommandParts(value) {
+	const parts = [];
+	let current = "";
+	let quote = null;
+	let escaping = false;
+	for (const ch of value) {
+		if (escaping) {
+			current += ch;
+			escaping = false;
+			continue;
+		}
+		if (ch === "\\" && quote !== "'") {
+			escaping = true;
+			continue;
+		}
+		if (quote) {
+			if (ch === quote) quote = null;
+			else current += ch;
+			continue;
+		}
+		if (ch === "'" || ch === "\"") {
+			quote = ch;
+			continue;
+		}
+		if (/\s/.test(ch)) {
+			if (current) {
+				parts.push(current);
+				current = "";
+			}
+			continue;
+		}
+		current += ch;
+	}
+	if (escaping) current += "\\";
+	if (current) parts.push(current);
+	return parts;
+}
+//#endregion
 //#region extensions/acpx/src/state.ts
 const ACPX_PROCESS_LEASE_NAMESPACE = "process-leases";
 const ACPX_PROCESS_LEASE_MAX_ENTRIES = 4096;
@@ -26,6 +74,21 @@ function normalizeAcpxGatewayInstanceRecord(value) {
 const OPENCLAW_ACPX_LEASE_ID_ARG = "--openclaw-acpx-lease-id";
 /** CLI argument carrying the owning gateway instance id. */
 const OPENCLAW_GATEWAY_INSTANCE_ID_ARG = "--openclaw-gateway-instance-id";
+/** Synthetic session identity for generated-wrapper health probes. */
+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 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() : "";
+	const gatewayInstanceId = gatewayIndex >= 0 ? parts[gatewayIndex + 1]?.trim() : "";
+	if (!leaseId || !gatewayInstanceId) return;
+	return {
+		leaseId,
+		gatewayInstanceId
+	};
+}
 function normalizeAcpxProcessLease(value) {
 	if (typeof value !== "object" || value === null) return;
 	const record = value;
@@ -58,7 +121,8 @@ function normalizeAcpxProcessLeaseFile(value) {
 function openAcpxProcessLeaseStateStore(openKeyedStore) {
 	return openKeyedStore({
 		namespace: ACPX_PROCESS_LEASE_NAMESPACE,
-		maxEntries: ACPX_PROCESS_LEASE_MAX_ENTRIES
+		maxEntries: ACPX_PROCESS_LEASE_MAX_ENTRIES,
+		overflowPolicy: "reject-new"
 	});
 }
 /** Create a serialized SQLite-backed ACPX process lease store. */
@@ -128,4 +192,4 @@ function withAcpxLeaseEnvironment(params) {
 	return appendAcpxLeaseArgs(params);
 }
 //#endregion
-export { hashAcpxProcessCommand as a, openAcpxProcessLeaseStateStore as c, ACPX_GATEWAY_INSTANCE_NAMESPACE as d, ACPX_LEGACY_GATEWAY_INSTANCE_FILE as f, createAcpxProcessLeaseStore as i, withAcpxLeaseEnvironment as l, normalizeAcpxGatewayInstanceRecord as m, OPENCLAW_GATEWAY_INSTANCE_ID_ARG as n, normalizeAcpxProcessLease as o, ACPX_LEGACY_PROCESS_LEASE_FILE as p, createAcpxProcessLeaseId as r, normalizeAcpxProcessLeaseFile as s, OPENCLAW_ACPX_LEASE_ID_ARG as t, ACPX_GATEWAY_INSTANCE_KEY as u };
+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 };

package/dist/{process-reaper-BIOtp_Ek.js → process-reaper-DzVuCxl3.js}

@@ -1,5 +1,5 @@
-import { t as AcpxPluginConfigSchema } from "./config-schema-lrk5nlcV.js";
-import "./process-lease-CU1cFI4I.js";
+import { t as AcpxPluginConfigSchema } from "./config-schema-DN_uAi4R.js";
+import { u as readAcpxProcessLeaseIdentity, v as splitCommandParts } from "./process-lease-Cwvj7WGe.js";
 import { createRequire } from "node:module";
 import { formatPluginConfigIssue } from "openclaw/plugin-sdk/extension-shared";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -13,54 +13,6 @@ 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
-* 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);
-}
-/** Split a command string into argv-like parts using simple quote/backslash rules. */
-function splitCommandParts(value) {
-	const parts = [];
-	let current = "";
-	let quote = null;
-	let escaping = false;
-	for (const ch of value) {
-		if (escaping) {
-			current += ch;
-			escaping = false;
-			continue;
-		}
-		if (ch === "\\" && quote !== "'") {
-			escaping = true;
-			continue;
-		}
-		if (quote) {
-			if (ch === quote) quote = null;
-			else current += ch;
-			continue;
-		}
-		if (ch === "'" || ch === "\"") {
-			quote = ch;
-			continue;
-		}
-		if (/\s/.test(ch)) {
-			if (current) {
-				parts.push(current);
-				current = "";
-			}
-			continue;
-		}
-		current += ch;
-	}
-	if (escaping) current += "\\";
-	if (current) parts.push(current);
-	return parts;
-}
-//#endregion
 //#region extensions/acpx/src/config.ts
 /**
 * Resolves ACPX plugin config from raw user configuration. It locates the
@@ -113,8 +65,6 @@ function resolveAcpxPluginRoot(moduleUrl = import.meta.url) {
 }
 const DEFAULT_PERMISSION_MODE = "approve-reads";
 const DEFAULT_NON_INTERACTIVE_POLICY = "fail";
-const DEFAULT_QUEUE_OWNER_TTL_SECONDS = .1;
-const DEFAULT_STRICT_WINDOWS_CMD_WRAPPER = true;
 function parseAcpxPluginConfig(value) {
 	if (value === void 0) return {
 		ok: true,
@@ -234,13 +184,7 @@ function resolveAcpxPluginConfig(params) {
 		nonInteractivePermissions: normalized.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE_POLICY,
 		pluginToolsMcpBridge,
 		openClawToolsMcpBridge,
-		strictWindowsCmdWrapper: normalized.strictWindowsCmdWrapper ?? DEFAULT_STRICT_WINDOWS_CMD_WRAPPER,
 		timeoutSeconds: normalized.timeoutSeconds ?? 120,
-		queueOwnerTtlSeconds: normalized.queueOwnerTtlSeconds ?? DEFAULT_QUEUE_OWNER_TTL_SECONDS,
-		legacyCompatibilityConfig: {
-			strictWindowsCmdWrapper: normalized.strictWindowsCmdWrapper,
-			queueOwnerTtlSeconds: normalized.queueOwnerTtlSeconds
-		},
 		mcpServers,
 		agents
 	};
@@ -320,6 +264,15 @@ function commandWrapperBelongsToRoot(command, wrapperRoot) {
 	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);
+}
+function wrapperPathBelongsToRoot(wrapperPath, wrapperRoot) {
+	const normalizedPath = normalizePathLike(wrapperPath);
+	const normalizedRoot = normalizePathLike(wrapperRoot).replace(/\/+$/, "");
+	return GENERATED_WRAPPER_BASENAMES.has(path.posix.basename(normalizedPath)) && normalizedPath.startsWith(`${normalizedRoot}/`);
+}
 /** Check whether a command references an OpenClaw-generated ACPX wrapper path. */
 function isOpenClawLeaseAwareAcpxProcessCommand(params) {
 	const command = params.command?.trim();
@@ -435,11 +388,20 @@ async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 		terminatedPids: [],
 		skippedReason: "missing-root"
 	};
+	if ((params.deps?.platform ?? process.platform) === "win32") return {
+		inspectedPids: [],
+		terminatedPids: [],
+		skippedReason: "unsupported-platform"
+	};
 	let processes;
 	try {
 		processes = await (params.deps?.listProcesses ?? listPlatformProcesses)();
 	} catch {
-		processes = [];
+		return {
+			inspectedPids: [],
+			terminatedPids: [],
+			skippedReason: "process-list-unavailable"
+		};
 	}
 	const listedTree = collectProcessTree(processes, rootPid);
 	if (listedTree.length === 0) return {
@@ -483,9 +445,53 @@ async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 		terminatedPids: await terminatePids(pids, params.deps)
 	};
 }
+/** Recover a pending lease by matching its exact live wrapper identity. */
+async function cleanupOpenClawOwnedAcpxPendingLease(params) {
+	if ((params.deps?.platform ?? process.platform) === "win32") return {
+		inspectedPids: [],
+		terminatedPids: [],
+		skippedReason: "unsupported-platform"
+	};
+	if (!params.wrapperPath || !wrapperPathBelongsToRoot(params.wrapperPath, params.wrapperRoot)) return {
+		inspectedPids: [],
+		terminatedPids: [],
+		skippedReason: "unverified-root"
+	};
+	let processes;
+	try {
+		processes = await (params.deps?.listProcesses ?? listPlatformProcesses)();
+	} catch {
+		return {
+			inspectedPids: [],
+			terminatedPids: [],
+			skippedReason: "process-list-unavailable"
+		};
+	}
+	const matchingRoots = processes.filter((processInfo) => commandContainsExactWrapperPath(processInfo.command, params.wrapperPath) && liveCommandMatchesLeaseIdentity({
+		command: processInfo.command,
+		expectedLeaseId: params.leaseId,
+		expectedGatewayInstanceId: params.gatewayInstanceId
+	}));
+	if (matchingRoots.length === 0) return {
+		inspectedPids: [],
+		terminatedPids: [],
+		skippedReason: "missing-root"
+	};
+	if (matchingRoots.length > 1) return {
+		inspectedPids: uniquePids(matchingRoots),
+		terminatedPids: [],
+		skippedReason: "ambiguous-root"
+	};
+	const listedTree = collectProcessTree(processes, matchingRoots[0].pid);
+	const pids = uniquePids(listedTree.toReversed());
+	return {
+		inspectedPids: uniquePids(listedTree),
+		terminatedPids: await terminatePids(pids, params.deps)
+	};
+}
 /** Reap orphaned OpenClaw-owned ACPX wrapper trees during runtime startup. */
 async function reapStaleOpenClawOwnedAcpxOrphans(params) {
-	if (process.platform === "win32") return {
+	if ((params.deps?.platform ?? process.platform) === "win32") return {
 		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
@@ -500,7 +506,7 @@ async function reapStaleOpenClawOwnedAcpxOrphans(params) {
 			skippedReason: "process-list-unavailable"
 		};
 	}
-	const orphanTrees = processes.filter((processInfo) => processInfo.ppid === 1 && isOpenClawOwnedAcpxProcessCommand({
+	const orphanTrees = processes.filter((processInfo) => processInfo.ppid === 1 && !readAcpxProcessLeaseIdentity(processInfo.command) && isOpenClawOwnedAcpxProcessCommand({
 		command: processInfo.command,
 		wrapperRoot: params.wrapperRoot
 	})).map((orphan) => collectProcessTree(processes, orphan.pid));
@@ -510,4 +516,4 @@ async function reapStaleOpenClawOwnedAcpxOrphans(params) {
 	};
 }
 //#endregion
-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 };
+export { resolveAcpxPluginConfig as a, CODEX_ACP_BIN as c, OPENCLAW_CODEX_CONFIG_ARG as d, reapStaleOpenClawOwnedAcpxOrphans as i, CODEX_ACP_PACKAGE as l, cleanupOpenClawOwnedAcpxProcessTree as n, resolveAcpxPluginRoot as o, isOpenClawLeaseAwareAcpxProcessCommand as r, toAcpMcpServers as s, cleanupOpenClawOwnedAcpxPendingLease as t, LEGACY_CODEX_ACP_PACKAGE as u };

package/dist/{register.runtime-Dajn8myc.js → register.runtime-C29AY8LI.js}

@@ -1,5 +1,6 @@
 import { getAcpRuntimeBackend, registerAcpRuntimeBackend, unregisterAcpRuntimeBackend } from "openclaw/plugin-sdk/acp-runtime-backend";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 //#region extensions/acpx/src/runtime-turn.ts
 /**
@@ -41,7 +42,7 @@ var LegacyRunTurnEventQueue = class {
 	async next() {
 		const item = this.items.shift();
 		if (item) return item;
-		if (this.error) throw toLintErrorObject(this.error, "Non-Error thrown");
+		if (this.error) throw toErrorObject(this.error, "Non-Error thrown");
 		if (this.closed) return null;
 		return await new Promise((resolve, reject) => {
 			this.waits.push({
@@ -143,13 +144,6 @@ function lazyStartRuntimeTurn(resolveRuntime, input) {
 		}
 	};
 }
-function toLintErrorObject(value, fallbackMessage) {
-	if (value instanceof Error) return value;
-	if (typeof value === "string") return new Error(value);
-	const error = new Error(fallbackMessage, { cause: value });
-	if (typeof value === "object" && value !== null || typeof value === "function") Object.assign(error, value);
-	return error;
-}
 //#endregion
 //#region extensions/acpx/src/runtime-proxy.ts
 /** Create an ACP runtime facade backed by an async runtime resolver. */
@@ -200,40 +194,69 @@ 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-DOsKw_R1.js"));
-async function startRealService(state) {
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-LTeZyc7q.js"));
+function unregisterOwnedRuntime(runtime) {
+	if (runtime && getAcpRuntimeBackend(ACPX_BACKEND_ID)?.runtime === runtime) unregisterAcpRuntimeBackend(ACPX_BACKEND_ID);
+}
+async function startRealService(state, lifecycleRevision, deferredRuntime) {
+	if (state.lifecycleRevision !== lifecycleRevision || !state.ctx) throw new Error("ACPX runtime service is not started");
 	if (state.realRuntime) return state.realRuntime;
-	if (!state.ctx) throw new Error("ACPX runtime service is not started");
-	state.startPromise ??= (async () => {
+	if (state.startPromise) return await state.startPromise;
+	const ctx = state.ctx;
+	state.startPromise = (async () => {
+		let publishedRuntime = null;
 		const { createAcpxRuntimeService: createAcpxRuntimeServiceLocal } = await loadServiceModule();
-		const service = createAcpxRuntimeServiceLocal(state.params);
+		const service = createAcpxRuntimeServiceLocal({
+			...state.params,
+			backendLifecycle: {
+				publish(backend) {
+					if (state.lifecycleRevision !== lifecycleRevision || state.ctx !== ctx) throw new Error("ACPX runtime service stopped during activation");
+					if (getAcpRuntimeBackend(ACPX_BACKEND_ID)?.runtime !== deferredRuntime) throw new Error("ACPX runtime service lost registry ownership during activation");
+					registerAcpRuntimeBackend({
+						id: ACPX_BACKEND_ID,
+						...backend
+					});
+					publishedRuntime = backend.runtime;
+					state.ownedRuntime = backend.runtime;
+				},
+				retract(runtime) {
+					unregisterOwnedRuntime(runtime);
+				}
+			}
+		});
 		state.realService = service;
-		await service.start(state.ctx);
-		const backend = getAcpRuntimeBackend(ACPX_BACKEND_ID);
-		if (!backend?.runtime) throw new Error("ACPX runtime service did not register an ACP backend");
-		state.realRuntime = backend.runtime;
-		return state.realRuntime;
+		await service.start(ctx);
+		if (state.lifecycleRevision !== lifecycleRevision || state.ctx !== ctx) throw new Error("ACPX runtime service stopped during activation");
+		if (!publishedRuntime) throw new Error("ACPX runtime service did not register an ACP backend");
+		if (getAcpRuntimeBackend(ACPX_BACKEND_ID)?.runtime !== publishedRuntime) throw new Error("ACPX runtime service lost registry ownership during activation");
+		state.realRuntime = publishedRuntime;
+		return publishedRuntime;
 	})();
 	try {
 		return await state.startPromise;
 	} catch (error) {
-		state.startPromise = null;
-		state.realService = null;
+		if (state.lifecycleRevision === lifecycleRevision) {
+			state.startPromise = null;
+			state.realService = null;
+		}
 		throw error;
 	}
 }
-function createDeferredRuntime(state) {
-	const resolveRuntime = () => startRealService(state);
-	return createLazyAcpRuntimeProxy(resolveRuntime);
+function createDeferredRuntime(state, lifecycleRevision) {
+	const deferredRuntime = createLazyAcpRuntimeProxy(() => startRealService(state, lifecycleRevision, deferredRuntime));
+	return deferredRuntime;
 }
 /** Creates the plugin service that registers ACPX as an ACP runtime backend. */
 function createAcpxRuntimeService(params = {}) {
 	const state = {
 		ctx: null,
+		lifecycleRevision: 0,
+		ownedRuntime: null,
 		params,
 		realRuntime: null,
 		realService: null,
-		startPromise: null
+		startPromise: null,
+		stopPromise: null
 	};
 	return {
 		id: "acpx-runtime",
@@ -242,20 +265,42 @@ function createAcpxRuntimeService(params = {}) {
 				ctx.logger.info("skipping embedded acpx runtime backend (OPENCLAW_SKIP_ACPX_RUNTIME=1)");
 				return;
 			}
+			if (state.stopPromise) await state.stopPromise;
+			state.lifecycleRevision += 1;
+			const lifecycleRevision = state.lifecycleRevision;
 			state.ctx = ctx;
+			const deferredRuntime = createDeferredRuntime(state, lifecycleRevision);
+			state.ownedRuntime = deferredRuntime;
 			registerAcpRuntimeBackend({
 				id: ACPX_BACKEND_ID,
-				runtime: createDeferredRuntime(state)
+				runtime: deferredRuntime
 			});
 			ctx.logger.info("embedded acpx runtime backend registered lazily");
 		},
 		async stop(ctx) {
-			if (state.realService) await state.realService.stop?.(ctx);
-			else unregisterAcpRuntimeBackend(ACPX_BACKEND_ID);
+			if (state.stopPromise) return await state.stopPromise;
+			state.lifecycleRevision += 1;
 			state.ctx = null;
-			state.realRuntime = null;
-			state.realService = null;
-			state.startPromise = null;
+			const ownedRuntime = state.ownedRuntime;
+			unregisterOwnedRuntime(ownedRuntime);
+			const startPromise = state.startPromise;
+			state.stopPromise = (async () => {
+				await startPromise?.catch(() => void 0);
+				try {
+					await state.realService?.stop?.(ctx);
+				} finally {
+					unregisterOwnedRuntime(ownedRuntime);
+					state.ownedRuntime = null;
+					state.realRuntime = null;
+					state.realService = null;
+					state.startPromise = null;
+				}
+			})();
+			try {
+				await state.stopPromise;
+			} finally {
+				state.stopPromise = null;
+			}
 		}
 	};
 }

package/dist/register.runtime.js

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