@openclaw/acpx 2026.6.5-beta.2 → 2026.6.5-beta.5

package/dist/doctor-contract-api.js

@@ -0,0 +1,121 @@
+import { c as normalizeAcpxProcessLeaseFile, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, h as normalizeAcpxGatewayInstanceRecord, l as openAcpxProcessLeaseStateStore, m as ACPX_LEGACY_PROCESS_LEASE_FILE, p as ACPX_LEGACY_GATEWAY_INSTANCE_FILE, s as normalizeAcpxProcessLease } from "./process-lease-DiKkFj6F.js";
+import fs from "node:fs/promises";
+import path from "node:path";
+//#region extensions/acpx/doctor-contract-api.ts
+function resolveLegacyGatewayInstancePath(stateDir) {
+	return path.join(stateDir, ACPX_LEGACY_GATEWAY_INSTANCE_FILE);
+}
+function resolveLegacyProcessLeasePath(stateDir) {
+	return path.join(stateDir, "acpx", ACPX_LEGACY_PROCESS_LEASE_FILE);
+}
+async function fileExists(filePath) {
+	try {
+		return (await fs.stat(filePath)).isFile();
+	} catch {
+		return false;
+	}
+}
+async function readLegacyGatewayInstanceId(filePath) {
+	try {
+		return (await fs.readFile(filePath, "utf8")).trim() || null;
+	} catch {
+		return null;
+	}
+}
+async function readLegacyOpenProcessLeases(filePath) {
+	try {
+		return normalizeAcpxProcessLeaseFile(JSON.parse(await fs.readFile(filePath, "utf8"))).leases.filter((lease) => lease.state === "open" || lease.state === "closing");
+	} catch {
+		return [];
+	}
+}
+async function archiveLegacySource(params) {
+	const archivedPath = `${params.filePath}.migrated`;
+	if (await fileExists(archivedPath)) {
+		params.warnings.push(`Left migrated ACPX ${params.label} source in place because ${archivedPath} already exists`);
+		return;
+	}
+	try {
+		await fs.rename(params.filePath, archivedPath);
+		params.changes.push(`Archived ACPX ${params.label} legacy source -> ${archivedPath}`);
+	} catch (err) {
+		params.warnings.push(`Failed archiving ACPX ${params.label} legacy source: ${String(err)}`);
+	}
+}
+const stateMigrations = [{
+	id: "acpx-runtime-state-to-plugin-state",
+	label: "ACPX runtime state",
+	async detectLegacyState(params) {
+		const gatewayInstanceId = await readLegacyGatewayInstanceId(resolveLegacyGatewayInstancePath(params.stateDir));
+		const openLeases = await readLegacyOpenProcessLeases(resolveLegacyProcessLeasePath(params.stateDir));
+		if (!gatewayInstanceId && openLeases.length === 0) return null;
+		const preview = [];
+		if (gatewayInstanceId) preview.push(`- ACPX gateway instance id: ${resolveLegacyGatewayInstancePath(params.stateDir)} -> plugin state (${ACPX_GATEWAY_INSTANCE_NAMESPACE})`);
+		if (openLeases.length > 0) preview.push(`- ACPX process leases: ${resolveLegacyProcessLeasePath(params.stateDir)} -> plugin state (${openLeases.length} open lease(s))`);
+		return { preview };
+	},
+	async migrateLegacyState(params) {
+		const changes = [];
+		const warnings = [];
+		const gatewayInstancePath = resolveLegacyGatewayInstancePath(params.stateDir);
+		const gatewayInstanceId = await readLegacyGatewayInstanceId(gatewayInstancePath);
+		const processLeasePath = resolveLegacyProcessLeasePath(params.stateDir);
+		const openLeases = await readLegacyOpenProcessLeases(processLeasePath);
+		const processLeaseStore = openAcpxProcessLeaseStateStore(params.context.openPluginStateKeyedStore);
+		const gatewayStore = params.context.openPluginStateKeyedStore({
+			namespace: ACPX_GATEWAY_INSTANCE_NAMESPACE,
+			maxEntries: 1
+		});
+		const existingGateway = normalizeAcpxGatewayInstanceRecord(await gatewayStore.lookup(ACPX_GATEWAY_INSTANCE_KEY));
+		const existingLiveLeases = (await processLeaseStore.entries()).map((entry) => normalizeAcpxProcessLease(entry.value)).filter((lease) => lease != null && (lease.state === "open" || lease.state === "closing"));
+		const leaseGatewayIds = new Set(openLeases.map((lease) => lease.gatewayInstanceId));
+		const onlyLeaseGatewayId = leaseGatewayIds.size === 1 ? [...leaseGatewayIds][0] : null;
+		const canAdoptLegacyGateway = existingGateway && gatewayInstanceId && existingGateway.instanceId !== gatewayInstanceId && onlyLeaseGatewayId === gatewayInstanceId && existingLiveLeases.length === 0;
+		const canonicalGatewayInstanceId = canAdoptLegacyGateway || !existingGateway ? gatewayInstanceId ?? onlyLeaseGatewayId : existingGateway.instanceId;
+		if (openLeases.length > 0 && (!canonicalGatewayInstanceId || [...leaseGatewayIds].some((leaseGatewayId) => leaseGatewayId !== canonicalGatewayInstanceId))) {
+			warnings.push("Skipped ACPX process lease migration because legacy leases do not match the canonical gateway instance id; left legacy sources in place for manual cleanup");
+			return {
+				changes,
+				warnings
+			};
+		}
+		if (canAdoptLegacyGateway && canonicalGatewayInstanceId) {
+			await gatewayStore.register(ACPX_GATEWAY_INSTANCE_KEY, {
+				instanceId: canonicalGatewayInstanceId,
+				createdAt: Date.now()
+			});
+			changes.push("Migrated ACPX gateway instance id -> plugin state");
+		} else if (canonicalGatewayInstanceId && !existingGateway) {
+			await gatewayStore.register(ACPX_GATEWAY_INSTANCE_KEY, {
+				instanceId: canonicalGatewayInstanceId,
+				createdAt: Date.now()
+			});
+			changes.push("Migrated ACPX gateway instance id -> plugin state");
+		} else if (gatewayInstanceId && existingGateway?.instanceId !== gatewayInstanceId) warnings.push("Skipped ACPX gateway instance id import because plugin state already differs");
+		if (gatewayInstanceId) await archiveLegacySource({
+			filePath: gatewayInstancePath,
+			label: "gateway-instance-id",
+			changes,
+			warnings
+		});
+		if (openLeases.length > 0) {
+			let imported = 0;
+			let alreadyPresent = 0;
+			for (const lease of openLeases) if (await processLeaseStore.registerIfAbsent(lease.leaseId, lease)) imported++;
+			else alreadyPresent++;
+			changes.push(`Migrated ACPX process leases -> plugin state (${imported} imported, ${alreadyPresent} already present)`);
+			await archiveLegacySource({
+				filePath: processLeasePath,
+				label: "process-leases",
+				changes,
+				warnings
+			});
+		}
+		return {
+			changes,
+			warnings
+		};
+	}
+}];
+//#endregion
+export { stateMigrations };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as createAcpxRuntimeService } from "./register.runtime-DVYJo9yv.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-FxCa4GGt.js";
 import { tryDispatchAcpReplyHook } from "openclaw/plugin-sdk/acp-runtime-backend";
 //#region extensions/acpx/index.ts
 /**
@@ -10,7 +10,10 @@ const plugin = {
 	name: "ACPX Runtime",
 	description: "Embedded ACP runtime backend with plugin-owned session and transport management.",
 	register(api) {
-		api.registerService(createAcpxRuntimeService({ pluginConfig: api.pluginConfig }));
+		api.registerService(createAcpxRuntimeService({
+			pluginConfig: api.pluginConfig,
+			openKeyedStore: (options) => api.runtime.state.openKeyedStore(options)
+		}));
 		api.on("reply_dispatch", tryDispatchAcpReplyHook);
 	}
 };

package/dist/process-lease-DiKkFj6F.js

@@ -0,0 +1,141 @@
+import { createHash, randomUUID } from "node:crypto";
+//#region extensions/acpx/src/state.ts
+const ACPX_PROCESS_LEASE_NAMESPACE = "process-leases";
+const ACPX_PROCESS_LEASE_MAX_ENTRIES = 4096;
+const ACPX_LEGACY_PROCESS_LEASE_FILE = "process-leases.json";
+const ACPX_GATEWAY_INSTANCE_NAMESPACE = "gateway-instance";
+const ACPX_GATEWAY_INSTANCE_KEY = "current";
+const ACPX_LEGACY_GATEWAY_INSTANCE_FILE = "gateway-instance-id";
+function normalizeAcpxGatewayInstanceRecord(value) {
+	if (typeof value !== "object" || value === null) return;
+	const record = value;
+	if (typeof record.instanceId !== "string" || !record.instanceId.trim()) return;
+	const createdAt = typeof record.createdAt === "number" && Number.isFinite(record.createdAt) ? Math.trunc(record.createdAt) : 0;
+	return {
+		instanceId: record.instanceId.trim(),
+		createdAt
+	};
+}
+//#endregion
+//#region extensions/acpx/src/process-lease.ts
+/**
+* Persistent lease store for ACPX wrapper processes. Leases let OpenClaw attach
+* gateway/session identity to spawned ACP processes and clean them up later.
+*/
+/** Environment variable carrying the ACPX process lease id. */
+const OPENCLAW_ACPX_LEASE_ID_ENV = "OPENCLAW_ACPX_LEASE_ID";
+/** Environment variable carrying the owning gateway instance id. */
+const OPENCLAW_GATEWAY_INSTANCE_ID_ENV = "OPENCLAW_GATEWAY_INSTANCE_ID";
+/** CLI argument carrying the ACPX process lease id for platforms without env wrapping. */
+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";
+function normalizeAcpxProcessLease(value) {
+	if (typeof value !== "object" || value === null) return;
+	const record = value;
+	if (typeof record.leaseId !== "string" || typeof record.gatewayInstanceId !== "string" || typeof record.sessionKey !== "string" || typeof record.wrapperRoot !== "string" || typeof record.wrapperPath !== "string" || typeof record.rootPid !== "number" || typeof record.commandHash !== "string" || typeof record.startedAt !== "number" || ![
+		"open",
+		"closing",
+		"closed",
+		"lost"
+	].includes(String(record.state))) return;
+	return {
+		leaseId: record.leaseId,
+		gatewayInstanceId: record.gatewayInstanceId,
+		sessionKey: record.sessionKey,
+		wrapperRoot: record.wrapperRoot,
+		wrapperPath: record.wrapperPath,
+		rootPid: record.rootPid,
+		...typeof record.processGroupId === "number" ? { processGroupId: record.processGroupId } : {},
+		commandHash: record.commandHash,
+		startedAt: record.startedAt,
+		state: record.state
+	};
+}
+function normalizeAcpxProcessLeaseFile(value) {
+	const root = typeof value === "object" && value !== null ? value : {};
+	return {
+		version: 1,
+		leases: Array.isArray(root.leases) ? root.leases.map(normalizeAcpxProcessLease).filter((lease) => Boolean(lease)) : []
+	};
+}
+function openAcpxProcessLeaseStateStore(openKeyedStore) {
+	return openKeyedStore({
+		namespace: ACPX_PROCESS_LEASE_NAMESPACE,
+		maxEntries: ACPX_PROCESS_LEASE_MAX_ENTRIES
+	});
+}
+/** Create a serialized SQLite-backed ACPX process lease store. */
+function createAcpxProcessLeaseStore(params) {
+	let updateQueue = Promise.resolve();
+	async function update(mutator) {
+		const run = updateQueue.then(async () => {
+			await mutator();
+		});
+		updateQueue = run.catch(() => {});
+		await run;
+	}
+	async function readCurrent() {
+		await updateQueue;
+		return (await params.store.entries()).map((entry) => normalizeAcpxProcessLease(entry.value)).filter((lease) => Boolean(lease));
+	}
+	return {
+		async load(leaseId) {
+			await updateQueue;
+			return normalizeAcpxProcessLease(await params.store.lookup(leaseId));
+		},
+		async listOpen(gatewayInstanceId) {
+			return (await readCurrent()).filter((lease) => (lease.state === "open" || lease.state === "closing") && (!gatewayInstanceId || lease.gatewayInstanceId === gatewayInstanceId));
+		},
+		async save(lease) {
+			await update(async () => {
+				await params.store.register(lease.leaseId, lease);
+			});
+		},
+		async markState(leaseId, state) {
+			await update(async () => {
+				if (state === "closed" || state === "lost") {
+					await params.store.delete(leaseId);
+					return;
+				}
+				const lease = normalizeAcpxProcessLease(await params.store.lookup(leaseId));
+				if (lease) await params.store.register(leaseId, {
+					...lease,
+					state
+				});
+			});
+		}
+	};
+}
+/** 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, "'\\''")}'`;
+}
+function appendAcpxLeaseArgs(params) {
+	return [
+		params.command,
+		OPENCLAW_ACPX_LEASE_ID_ARG,
+		quoteEnvValue(params.leaseId),
+		OPENCLAW_GATEWAY_INSTANCE_ID_ARG,
+		quoteEnvValue(params.gatewayInstanceId)
+	].join(" ");
+}
+/** Add ACPX lease identity to a command through env vars and portable args. */
+function withAcpxLeaseEnvironment(params) {
+	if ((params.platform ?? process.platform) === "win32") return appendAcpxLeaseArgs(params);
+	return [
+		"env",
+		`${OPENCLAW_ACPX_LEASE_ID_ENV}=${quoteEnvValue(params.leaseId)}`,
+		`${OPENCLAW_GATEWAY_INSTANCE_ID_ENV}=${quoteEnvValue(params.gatewayInstanceId)}`,
+		appendAcpxLeaseArgs(params)
+	].join(" ");
+}
+//#endregion
+export { createAcpxProcessLeaseStore as a, normalizeAcpxProcessLeaseFile as c, ACPX_GATEWAY_INSTANCE_KEY as d, ACPX_GATEWAY_INSTANCE_NAMESPACE as f, normalizeAcpxGatewayInstanceRecord as h, createAcpxProcessLeaseId as i, openAcpxProcessLeaseStateStore as l, ACPX_LEGACY_PROCESS_LEASE_FILE as m, OPENCLAW_ACPX_LEASE_ID_ENV as n, hashAcpxProcessCommand as o, ACPX_LEGACY_GATEWAY_INSTANCE_FILE as p, OPENCLAW_GATEWAY_INSTANCE_ID_ARG as r, normalizeAcpxProcessLease as s, OPENCLAW_ACPX_LEASE_ID_ARG as t, withAcpxLeaseEnvironment as u };

package/dist/{process-reaper-CEUqe0IY.js → process-reaper-Dv_iMcOo.js}

@@ -1,9 +1,7 @@
+import "./process-lease-DiKkFj6F.js";
 import { createRequire } from "node:module";
-import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
-import fs from "node:fs/promises";
 import path from "node:path";
-import { createHash, randomUUID } from "node:crypto";
-import { readJsonFileWithFallback, writeJsonFileAtomically } from "openclaw/plugin-sdk/json-store";
+import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import fsSync from "node:fs";
@@ -58,123 +56,6 @@ function splitCommandParts(value) {
 	return parts;
 }
 //#endregion
-//#region extensions/acpx/src/process-lease.ts
-/**
-* Persistent lease store for ACPX wrapper processes. Leases let OpenClaw attach
-* gateway/session identity to spawned ACP processes and clean them up later.
-*/
-/** Environment variable carrying the ACPX process lease id. */
-const OPENCLAW_ACPX_LEASE_ID_ENV = "OPENCLAW_ACPX_LEASE_ID";
-/** Environment variable carrying the owning gateway instance id. */
-const OPENCLAW_GATEWAY_INSTANCE_ID_ENV = "OPENCLAW_GATEWAY_INSTANCE_ID";
-/** CLI argument carrying the ACPX process lease id for platforms without env wrapping. */
-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";
-const LEASE_FILE = "process-leases.json";
-function normalizeLease(value) {
-	if (typeof value !== "object" || value === null) return;
-	const record = value;
-	if (typeof record.leaseId !== "string" || typeof record.gatewayInstanceId !== "string" || typeof record.sessionKey !== "string" || typeof record.wrapperRoot !== "string" || typeof record.wrapperPath !== "string" || typeof record.rootPid !== "number" || typeof record.commandHash !== "string" || typeof record.startedAt !== "number" || ![
-		"open",
-		"closing",
-		"closed",
-		"lost"
-	].includes(String(record.state))) return;
-	return {
-		leaseId: record.leaseId,
-		gatewayInstanceId: record.gatewayInstanceId,
-		sessionKey: record.sessionKey,
-		wrapperRoot: record.wrapperRoot,
-		wrapperPath: record.wrapperPath,
-		rootPid: record.rootPid,
-		...typeof record.processGroupId === "number" ? { processGroupId: record.processGroupId } : {},
-		commandHash: record.commandHash,
-		startedAt: record.startedAt,
-		state: record.state
-	};
-}
-async function readLeaseFile(filePath) {
-	const { value } = await readJsonFileWithFallback(filePath, {
-		version: 1,
-		leases: []
-	});
-	return {
-		version: 1,
-		leases: Array.isArray(value.leases) ? value.leases.map(normalizeLease).filter((lease) => Boolean(lease)) : []
-	};
-}
-function writeLeaseFile(filePath, value) {
-	return writeJsonFileAtomically(filePath, value);
-}
-/** Create a serialized JSON-backed ACPX process lease store. */
-function createAcpxProcessLeaseStore(params) {
-	const filePath = path.join(params.stateDir, LEASE_FILE);
-	let updateQueue = Promise.resolve();
-	async function update(mutator) {
-		const run = updateQueue.then(async () => {
-			await fs.mkdir(params.stateDir, { recursive: true });
-			await writeLeaseFile(filePath, {
-				version: 1,
-				leases: mutator((await readLeaseFile(filePath)).leases)
-			});
-		});
-		updateQueue = run.catch(() => {});
-		await run;
-	}
-	async function readCurrent() {
-		await updateQueue;
-		return await readLeaseFile(filePath);
-	}
-	return {
-		async load(leaseId) {
-			return (await readCurrent()).leases.find((lease) => lease.leaseId === leaseId);
-		},
-		async listOpen(gatewayInstanceId) {
-			return (await readCurrent()).leases.filter((lease) => (lease.state === "open" || lease.state === "closing") && (!gatewayInstanceId || lease.gatewayInstanceId === gatewayInstanceId));
-		},
-		async save(lease) {
-			await update((leases) => [...leases.filter((entry) => entry.leaseId !== lease.leaseId), lease]);
-		},
-		async markState(leaseId, state) {
-			await update((leases) => leases.map((lease) => lease.leaseId === leaseId ? {
-				...lease,
-				state
-			} : lease));
-		}
-	};
-}
-/** 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, "'\\''")}'`;
-}
-function appendAcpxLeaseArgs(params) {
-	return [
-		params.command,
-		OPENCLAW_ACPX_LEASE_ID_ARG,
-		quoteEnvValue(params.leaseId),
-		OPENCLAW_GATEWAY_INSTANCE_ID_ARG,
-		quoteEnvValue(params.gatewayInstanceId)
-	].join(" ");
-}
-/** Add ACPX lease identity to a command through env vars and portable args. */
-function withAcpxLeaseEnvironment(params) {
-	if ((params.platform ?? process.platform) === "win32") return appendAcpxLeaseArgs(params);
-	return [
-		"env",
-		`${OPENCLAW_ACPX_LEASE_ID_ENV}=${quoteEnvValue(params.leaseId)}`,
-		`${OPENCLAW_GATEWAY_INSTANCE_ID_ENV}=${quoteEnvValue(params.gatewayInstanceId)}`,
-		appendAcpxLeaseArgs(params)
-	].join(" ");
-}
-//#endregion
 //#region extensions/acpx/src/config-schema.ts
 /**
 * ACPX plugin configuration schema and public config types. Runtime setup uses
@@ -639,4 +520,4 @@ async function reapStaleOpenClawOwnedAcpxOrphans(params) {
 	};
 }
 //#endregion
-export { resolveAcpxPluginRoot as a, OPENCLAW_ACPX_LEASE_ID_ENV as c, createAcpxProcessLeaseStore as d, hashAcpxProcessCommand as f, splitCommandParts as h, resolveAcpxPluginConfig as i, OPENCLAW_GATEWAY_INSTANCE_ID_ARG as l, quoteCommandPart as m, isOpenClawLeaseAwareAcpxProcessCommand as n, toAcpMcpServers as o, withAcpxLeaseEnvironment as p, reapStaleOpenClawOwnedAcpxOrphans as r, OPENCLAW_ACPX_LEASE_ID_ARG as s, cleanupOpenClawOwnedAcpxProcessTree as t, createAcpxProcessLeaseId as u };
+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 };

package/dist/{register.runtime-DVYJo9yv.js → register.runtime-FxCa4GGt.js}

@@ -205,7 +205,7 @@ function createLazyAcpRuntimeProxy(resolveRuntime) {
 const ACPX_BACKEND_ID = "acpx";
 let serviceModulePromise = null;
 function loadServiceModule() {
-	serviceModulePromise ??= import("./service-8gUnMlij.js");
+	serviceModulePromise ??= import("./service-DepTzi7g.js");
 	return serviceModulePromise;
 }
 async function startRealService(state) {

package/dist/register.runtime.js

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

package/dist/{runtime-COFrLvHN.js → runtime-C3wjx6fQ.js}

@@ -1,9 +1,10 @@
+import { i as createAcpxProcessLeaseId, o as hashAcpxProcessCommand, u as withAcpxLeaseEnvironment } from "./process-lease-DiKkFj6F.js";
 import { AcpRuntimeError } from "./runtime-api.js";
-import { f as hashAcpxProcessCommand, h as splitCommandParts, n as isOpenClawLeaseAwareAcpxProcessCommand, p as withAcpxLeaseEnvironment, t as cleanupOpenClawOwnedAcpxProcessTree, u as createAcpxProcessLeaseId } from "./process-reaper-CEUqe0IY.js";
-import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { AsyncLocalStorage } from "node:async_hooks";
+import { c as splitCommandParts, n as isOpenClawLeaseAwareAcpxProcessCommand, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-Dv_iMcOo.js";
 import fs from "node:fs/promises";
 import path, { resolve } from "node:path";
+import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { ACPX_BACKEND_ID, AcpxRuntime as AcpxRuntime$1, createAcpRuntime, createAgentRegistry, createFileSessionStore, decodeAcpxRuntimeHandleState, encodeAcpxRuntimeHandleState } from "acpx/runtime";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import { redactSensitiveText } from "openclaw/plugin-sdk/security-runtime";
@@ -83,6 +84,11 @@ function readOpenClawLeaseIdFromRecord(record) {
 	const { openclawLeaseId } = record;
 	return typeof openclawLeaseId === "string" ? openclawLeaseId.trim() || void 0 : void 0;
 }
+function readOpenClawGatewayInstanceIdFromRecord(record) {
+	if (typeof record !== "object" || record === null) return;
+	const { openclawGatewayInstanceId } = record;
+	return typeof openclawGatewayInstanceId === "string" ? openclawGatewayInstanceId.trim() || void 0 : void 0;
+}
 function extractGeneratedWrapperPath(command) {
 	return splitCommandParts(command ?? "").find((part) => basename(part) === "codex-acp-wrapper.mjs" || basename(part) === "claude-agent-acp-wrapper.mjs") ?? "";
 }
@@ -502,9 +508,12 @@ var AcpxRuntime = class {
 			agentRegistry: this.agentRegistry
 		});
 		if (!rootPid || !rootCommand) return;
+		const expectedGatewayInstanceId = readOpenClawGatewayInstanceIdFromRecord(record);
 		await cleanupOpenClawOwnedAcpxProcessTree({
 			rootPid,
 			rootCommand,
+			...leaseId ? { expectedLeaseId: leaseId } : {},
+			...expectedGatewayInstanceId ? { expectedGatewayInstanceId } : {},
 			wrapperRoot: this.wrapperRoot,
 			deps: this.processCleanupDeps
 		});

package/dist/{service-8gUnMlij.js → service-DepTzi7g.js}

@@ -1,16 +1,17 @@
-import { n as createLazyAcpRuntimeProxy } from "./register.runtime-DVYJo9yv.js";
+import { n as createLazyAcpRuntimeProxy } from "./register.runtime-FxCa4GGt.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 OPENCLAW_ACPX_LEASE_ID_ENV, d as createAcpxProcessLeaseStore, h as splitCommandParts, i as resolveAcpxPluginConfig, l as OPENCLAW_GATEWAY_INSTANCE_ID_ARG, m as quoteCommandPart, o as toAcpMcpServers, r as reapStaleOpenClawOwnedAcpxOrphans, s as OPENCLAW_ACPX_LEASE_ID_ARG, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-CEUqe0IY.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-Dv_iMcOo.js";
 import { createRequire } from "node:module";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { randomUUID } from "node:crypto";
-import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
+import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { inspect } from "node:util";
 import fsSync from "node:fs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import os from "node:os";
+import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
 //#region extensions/acpx/src/codex-trust-config.ts
 /**
 * Builds isolated Codex config for ACPX sessions. It preserves safe inherited
@@ -846,7 +847,7 @@ const SKIP_RUNTIME_PROBE_ENV = "OPENCLAW_SKIP_ACPX_RUNTIME_PROBE";
 const ACPX_BACKEND_ID = "acpx";
 let runtimeModulePromise = null;
 function loadRuntimeModule() {
-	runtimeModulePromise ??= import("./runtime-COFrLvHN.js");
+	runtimeModulePromise ??= import("./runtime-C3wjx6fQ.js");
 	return runtimeModulePromise;
 }
 /** Convert ACPX timeout seconds into timer-safe milliseconds. */
@@ -955,17 +956,21 @@ async function withStartupProbeTimeout(params) {
 		if (timeout) clearTimeout(timeout);
 	}
 }
-async function resolveGatewayInstanceId(stateDir) {
-	const filePath = path.join(stateDir, "gateway-instance-id");
-	try {
-		const existing = (await fs.readFile(filePath, "utf8")).trim();
-		if (existing) return existing;
-	} catch (error) {
-		if (error.code !== "ENOENT") throw error;
-	}
+function openGatewayInstanceStateStore(openKeyedStore) {
+	return openKeyedStore({
+		namespace: ACPX_GATEWAY_INSTANCE_NAMESPACE,
+		maxEntries: 1
+	});
+}
+async function resolveGatewayInstanceId(openKeyedStore) {
+	const store = openGatewayInstanceStateStore(openKeyedStore);
+	const existing = normalizeAcpxGatewayInstanceRecord(await store.lookup(ACPX_GATEWAY_INSTANCE_KEY));
+	if (existing) return existing.instanceId;
 	const next = randomUUID();
-	await fs.mkdir(stateDir, { recursive: true });
-	await fs.writeFile(filePath, `${next}\n`, { mode: 384 });
+	await store.register(ACPX_GATEWAY_INSTANCE_KEY, {
+		instanceId: next,
+		createdAt: Date.now()
+	});
 	return next;
 }
 async function reapOpenAcpxProcessLeases(params) {
@@ -1017,6 +1022,8 @@ function createAcpxRuntimeService(params = {}) {
 				ctx.logger.info("skipping embedded acpx runtime backend (OPENCLAW_SKIP_ACPX_RUNTIME=1)");
 				return;
 			}
+			const openKeyedStore = params.openKeyedStore;
+			if (!openKeyedStore) throw new Error("ACPX runtime service requires plugin keyed state");
 			const basePluginConfig = await measureAcpxStartup(ctx, "config.resolve", () => resolveAcpxPluginConfig({
 				rawConfig: params.pluginConfig,
 				workspaceDir: ctx.workspaceDir
@@ -1035,8 +1042,8 @@ function createAcpxRuntimeService(params = {}) {
 				await fs.mkdir(pluginConfig.stateDir, { recursive: true });
 				await fs.mkdir(wrapperRoot, { recursive: true });
 			});
-			const gatewayInstanceId = await measureAcpxStartup(ctx, "gateway-instance-id", () => resolveGatewayInstanceId(ctx.stateDir));
-			const processLeaseStore = createAcpxProcessLeaseStore({ stateDir: wrapperRoot });
+			const gatewayInstanceId = await measureAcpxStartup(ctx, "gateway-instance-id", () => resolveGatewayInstanceId(openKeyedStore));
+			const processLeaseStore = createAcpxProcessLeaseStore({ store: openAcpxProcessLeaseStateStore(openKeyedStore) });
 			const startupReap = await measureAcpxStartup(ctx, "process-leases.reap", () => reapOpenAcpxProcessLeases({
 				gatewayInstanceId,
 				leaseStore: processLeaseStore,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.6.5-beta.2",
+  "version": "2026.6.5-beta.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/acpx",
-      "version": "2026.6.5-beta.2",
+      "version": "2026.6.5-beta.5",
       "dependencies": {
         "@agentclientprotocol/claude-agent-acp": "0.39.0",
         "@zed-industries/codex-acp": "0.15.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.6.5-beta.2",
+  "version": "2026.6.5-beta.5",
   "description": "OpenClaw ACP runtime backend with plugin-owned session and transport management.",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.6.5-beta.2"
+      "pluginApi": ">=2026.6.5-beta.5"
     },
     "build": {
-      "openclawVersion": "2026.6.5-beta.2",
+      "openclawVersion": "2026.6.5-beta.5",
       "staticAssets": [
         {
           "source": "./src/runtime-internals/mcp-proxy.mjs",
@@ -58,7 +58,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.6.5-beta.2"
+    "openclaw": ">=2026.6.5-beta.5"
   },
   "peerDependenciesMeta": {
     "openclaw": {