@openclaw/acpx 2026.9.7 → 2026.9.9

package/dist/.setup/{session-owner-migration-CdJSYRk1.mjs → session-owner-migration-DsGrYq7Y.mjs}

@@ -1,28 +1,120 @@
-import { t as resolveAcpxPluginConfig } from "./config-CdPsIued.mjs";
-import { a as hashAcpxProcessCommand, c as openAcpxProcessLeaseStateStore, l as readAcpxProcessLeaseIdentity, o as normalizeAcpxProcessLease } from "./process-lease-C3dNPtu8.mjs";
+import { a as hashAcpxProcessCommand, c as openAcpxProcessLeaseStateStore, g as runtime_doctor_migrations_exports, l as readAcpxProcessLeaseIdentity, o as normalizeAcpxProcessLease } from "./process-lease-n38HFGdp.mjs";
+import { t as resolveAcpxPluginConfig } from "./config-Blz15uwJ.mjs";
 import path from "node:path";
 import fs from "node:fs/promises";
-import { archiveLegacyStateSource, asObjectRecord } from "openclaw/plugin-sdk/runtime-doctor-migrations";
 import { isDeepStrictEqual } from "node:util";
+import { movePathWithCopyFallback } from "openclaw/plugin-sdk/security-runtime";
 //#region extensions/acpx/src/session-owner-migration.ts
+function openStateDirectoryMarker(input) {
+	return input.openKeyedStore({
+		namespace: "state-directory-migration",
+		maxEntries: 1
+	});
+}
+async function directoryEntries(directory) {
+	return fs.readdir(directory).catch((error) => {
+		if ((0, runtime_doctor_migrations_exports.asObjectRecord)(error)?.code === "ENOENT") return [];
+		throw error;
+	});
+}
+function legacyStateDirectory(input) {
+	const explicit = (0, runtime_doctor_migrations_exports.asObjectRecord)(input.rawConfig)?.stateDir;
+	return typeof explicit === "string" && explicit.trim() ? void 0 : path.resolve(input.workspaceDir?.trim() || process.cwd(), "state");
+}
+async function hasLegacyState(input) {
+	const source = legacyStateDirectory(input);
+	return Boolean(source && source !== input.stateDir && (await directoryEntries(input.stateDir)).length === 0 && await hasSessionData(source));
+}
+async function hasSessionData(directory) {
+	return (await directoryEntries(path.join(directory, "sessions"))).some((name) => name.endsWith(".json"));
+}
+/** Startup and offline Doctor share this one-time relocation of the former default. */
+async function adoptAcpxStateDirectory(input) {
+	const result = {
+		stateDir: input.stateDir,
+		changes: [],
+		warnings: []
+	};
+	const source = legacyStateDirectory(input);
+	if (!source || source === input.stateDir) return result;
+	let published = false;
+	let legacyFallback = false;
+	try {
+		const marker = openStateDirectoryMarker(input);
+		const previous = await marker.lookup("workspace-state-v1");
+		if (previous?.destination === input.stateDir && previous.completed) return result;
+		const destinationEmpty = (await directoryEntries(input.stateDir)).length === 0;
+		if (destinationEmpty) {
+			legacyFallback = true;
+			legacyFallback = await hasSessionData(source);
+		}
+		if (previous?.destination === input.stateDir) {
+			if (await hasSessionData(input.stateDir)) {
+				published = true;
+				await marker.register("workspace-state-v1", {
+					destination: input.stateDir,
+					completed: true
+				}, { assertCurrent: input.assertCurrent });
+				result.changes.push(`Completed ACPX session state adoption at ${input.stateDir}.`);
+				if ((await directoryEntries(source)).length > 0) result.warnings.push(`ACPX uses ${input.stateDir}; a legacy copy remains at ${source}. Verify the migrated sessions before removing that copy.`);
+				return result;
+			}
+			if (!destinationEmpty) {
+				legacyFallback = true;
+				legacyFallback = await hasSessionData(source);
+				throw new Error("Destination became occupied before ACPX state adoption completed");
+			}
+		}
+		if (!destinationEmpty || !legacyFallback) return result;
+		if (!(await fs.lstat(source)).isDirectory() || input.stateDir.startsWith(`${source}${path.sep}`)) throw new Error("Legacy state must be a directory outside the new state directory");
+		input.assertCurrent?.();
+		await fs.mkdir(path.dirname(input.stateDir), { recursive: true });
+		await marker.register("workspace-state-v1", {
+			destination: input.stateDir,
+			completed: false
+		}, { assertCurrent: input.assertCurrent });
+		await movePathWithCopyFallback({
+			from: source,
+			to: input.stateDir,
+			assertBeforeMutation: input.assertCurrent,
+			onDestinationPublished() {
+				published = true;
+			}
+		});
+		result.changes.push(`Migrated ACPX session state from ${source} to ${input.stateDir}.`);
+		await marker.register("workspace-state-v1", {
+			destination: input.stateDir,
+			completed: true
+		}, { assertCurrent: input.assertCurrent });
+	} catch (error) {
+		result.stateDir = !published && legacyFallback ? source : input.stateDir;
+		result.warnings.push(published ? `ACPX state adopted at ${input.stateDir}; migration cleanup needs attention: ${String(error)}. Run openclaw doctor --fix.` : legacyFallback ? `ACPX state migration failed: ${String(error)}. Using ${source} for this process; set plugins.entries.acpx.config.stateDir to ${JSON.stringify(source)} to keep the old location.` : `ACPX state migration could not be inspected: ${String(error)}. Keeping ${input.stateDir}; run openclaw doctor --fix.`);
+	}
+	return result;
+}
+function stateDirectoryInput(input) {
+	return {
+		rawConfig: input.config.plugins?.entries?.acpx?.config,
+		workspaceDir: input.serviceWorkspaceDir,
+		stateDir: path.dirname(sessionDirectory(input)),
+		openKeyedStore: input.context.openPluginStateKeyedStore
+	};
+}
 function sessionDirectory(input) {
 	if (!input.serviceWorkspaceDir) throw new Error("ACP ownership repair requires the Gateway service workspace; upgrade OpenClaw Doctor.");
 	return path.join(resolveAcpxPluginConfig({
 		rawConfig: input.config.plugins?.entries?.acpx?.config,
-		workspaceDir: input.serviceWorkspaceDir
+		workspaceDir: input.serviceWorkspaceDir,
+		stateDir: input.stateDir
 	}).stateDir, "sessions");
 }
-async function legacyRecords(input) {
-	const directory = sessionDirectory(input);
-	const ids = (await fs.readdir(directory).catch((error) => {
-		if (asObjectRecord(error)?.code === "ENOENT") return [];
-		throw error;
-	})).filter((name) => name.endsWith(".json")).map((name) => decodeURIComponent(name.slice(0, -5))).filter((id) => !id.startsWith("agent:") && !id.startsWith(".openclaw-owner-"));
+async function legacyRecords(input, directory = sessionDirectory(input)) {
+	const ids = (await directoryEntries(directory)).filter((name) => name.endsWith(".json")).map((name) => decodeURIComponent(name.slice(0, -5))).filter((id) => !id.startsWith("agent:") && !id.startsWith(".openclaw-owner-"));
 	if (ids.length === 0) return {
 		directory,
 		ids
 	};
-	const { resolveAcpxSessionResource } = await import("./session-resource-BaJ6bs5d.mjs").then((n) => n.n);
+	const { resolveAcpxSessionResource } = await import("./session-resource-B-4yPr-j.mjs").then((n) => n.n);
 	const evidence = await input.context.inspectAcpSessionClaims?.();
 	const { decodeAcpxRuntimeHandleState } = await import("acpx/runtime");
 	return {
@@ -42,7 +134,7 @@ function requireStoppedPid(pid) {
 	try {
 		process.kill(pid, 0);
 	} catch (error) {
-		if (asObjectRecord(error)?.code === "ESRCH") return;
+		if ((0, runtime_doctor_migrations_exports.asObjectRecord)(error)?.code === "ESRCH") return;
 		throw new Error("record process liveness cannot be verified", { cause: error });
 	}
 	throw new Error("record still has a live process; stop the harness before Doctor repair");
@@ -62,10 +154,10 @@ function matchesClaimRecord(claim, raw, oldId, resource, decode) {
 async function migrateRecord(input, directory, oldId, claims, changes, warnings) {
 	const sourcePath = recordPath(directory, oldId);
 	const sourceBytes = await fs.readFile(sourcePath, "utf8");
-	const raw = asObjectRecord(JSON.parse(sourceBytes));
+	const raw = (0, runtime_doctor_migrations_exports.asObjectRecord)(JSON.parse(sourceBytes));
 	if (!raw || raw.acpx_record_id !== oldId || typeof raw.name !== "string" || !raw.name.trim() || raw.name !== oldId && !oldId.startsWith(`${raw.name}:oneshot:`)) throw new Error("record ID/name is not a recognized ACPX locator");
 	requireStoppedPid(raw.pid);
-	const { resolveAcpxSessionResource } = await import("./session-resource-BaJ6bs5d.mjs").then((n) => n.n);
+	const { resolveAcpxSessionResource } = await import("./session-resource-B-4yPr-j.mjs").then((n) => n.n);
 	const { createFileSessionStore, decodeAcpxRuntimeHandleState, encodeAcpxRuntimeHandleState } = await import("acpx/runtime");
 	const candidates = claims.filter((claim) => matchesClaimRecord(claim, raw, oldId, resolveAcpxSessionResource(claim), decodeAcpxRuntimeHandleState));
 	if (candidates.length !== 1) throw new Error("exactly one current canonical owner claim is required");
@@ -116,7 +208,7 @@ async function migrateRecord(input, directory, oldId, claims, changes, warnings)
 			name: resource
 		})) throw new Error("rekey would alter interpreted history/event references; source retained");
 		const existing = await fs.readFile(destinationPath, "utf8").catch((error) => {
-			if (asObjectRecord(error)?.code === "ENOENT") return;
+			if ((0, runtime_doctor_migrations_exports.asObjectRecord)(error)?.code === "ENOENT") return;
 			throw error;
 		});
 		const originalLocator = decodeAcpxRuntimeHandleState(claim.meta.runtimeSessionName);
@@ -151,7 +243,7 @@ async function migrateRecord(input, directory, oldId, claims, changes, warnings)
 		const verified = await input.context.inspectAcpSessionClaims();
 		if (verified.incomplete.length || !verified.claims.some((item) => item.agentId === claim.agentId && item.sessionKey === claim.sessionKey && item.meta.identity?.acpxRecordId === recordId && isDeepStrictEqual(item.binding, claim.binding))) throw new Error("canonical metadata verification failed; source retained for rerun");
 		changes.push(`Migrated ACP backend history for ${claim.agentId}/${claim.sessionKey} to its owner-qualified resource.`);
-		if (!oneshot) await archiveLegacyStateSource({
+		if (!oneshot) await (0, runtime_doctor_migrations_exports.archiveLegacyStateSource)({
 			filePath: sourcePath,
 			label: "ACP owner record",
 			changes,
@@ -169,18 +261,38 @@ const acpxSessionOwnerMigration = {
 	label: "ACP session owners",
 	doctorOnly: true,
 	phase: "after-session-repair",
+	collectBackupResources(input) {
+		const destination = sessionDirectory(input);
+		const explicit = (0, runtime_doctor_migrations_exports.asObjectRecord)(input.config.plugins?.entries?.acpx?.config)?.stateDir;
+		return [path.dirname(destination), ...!explicit && input.serviceWorkspaceDir ? [path.join(input.serviceWorkspaceDir, "state")] : []].map((directory) => ({
+			path: directory,
+			kind: "directory"
+		}));
+	},
 	async detectLegacyState(input) {
+		try {
+			const directoryInput = stateDirectoryInput(input);
+			const marker = legacyStateDirectory(directoryInput) ? await openStateDirectoryMarker(directoryInput).lookup("workspace-state-v1") : void 0;
+			const matchingMarker = marker?.destination === directoryInput.stateDir;
+			if (!(matchingMarker && marker.completed) && (matchingMarker && !marker.completed || await hasLegacyState(directoryInput))) return { preview: ["ACPX session state in <workspace>/state will be migrated automatically to the OpenClaw state directory."] };
+		} catch (error) {
+			return { preview: [`ACPX legacy state could not be inspected: ${String(error)}. Run openclaw doctor --fix.`] };
+		}
 		const { ids } = await legacyRecords(input);
 		return ids.length ? { preview: [`ACP backend has ${ids.length} unqualified record(s). Stop the Gateway and run openclaw doctor --fix; ambiguous histories remain intact.`] } : null;
 	},
 	async migrateLegacyState(input) {
-		const changes = [];
-		const warnings = [];
+		const { stateDir, changes, warnings } = await adoptAcpxStateDirectory(stateDirectoryInput(input));
+		if (warnings.length) return {
+			changes,
+			warnings,
+			warningDisposition: "recoverable"
+		};
 		if (!input.context.inspectAcpSessionClaims || !input.context.updateAcpSessionIdentity) return {
 			changes,
 			warnings: ["ACP owner repair requires current offline Doctor maintenance authority."]
 		};
-		const { directory, ids } = await legacyRecords(input);
+		const { directory, ids } = await legacyRecords(input, path.join(stateDir, "sessions"));
 		const evidence = await input.context.inspectAcpSessionClaims();
 		if (evidence.incomplete.length) return {
 			changes,
@@ -200,4 +312,4 @@ const acpxSessionOwnerMigration = {
 	}
 };
 //#endregion
-export { acpxSessionOwnerMigration };
+export { acpxSessionOwnerMigration, adoptAcpxStateDirectory };

package/dist/.setup/{session-resource-BaJ6bs5d.mjs → session-resource-B-4yPr-j.mjs}

@@ -1,19 +1,7 @@
+import { _ as __exportAll } from "./process-lease-n38HFGdp.mjs";
 import { AcpRuntimeError } from "../runtime-api.js";
-import "node:module";
 import { createHash } from "node:crypto";
 import { normalizeAgentId, parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
-//#region \0rolldown/runtime.js
-var __defProp = Object.defineProperty;
-var __exportAll = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-//#endregion
 //#region extensions/acpx/src/session-resource.ts
 var session_resource_exports = /* @__PURE__ */ __exportAll({ resolveAcpxSessionResource: () => resolveAcpxSessionResource });
 /** Logical OpenClaw keys stay intact; only bare backend resource names need a namespace. */

package/dist/doctor-contract-api.js

@@ -1,7 +1,6 @@
-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 "./.setup/process-lease-C3dNPtu8.mjs";
+import { c as openAcpxProcessLeaseStateStore, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, g as runtime_doctor_migrations_exports, h as normalizeAcpxGatewayInstanceRecord, m as ACPX_LEGACY_PROCESS_LEASE_FILE, o as normalizeAcpxProcessLease, p as ACPX_LEGACY_GATEWAY_INSTANCE_FILE, s as normalizeAcpxProcessLeaseFile } from "./.setup/process-lease-n38HFGdp.mjs";
 import path from "node:path";
 import fs from "node:fs/promises";
-import { archiveLegacyStateSource, asObjectRecord } from "openclaw/plugin-sdk/runtime-doctor-migrations";
 //#region extensions/acpx/doctor-contract-api.ts
 const ACPX_CONFIG_PATH = [
 	"plugins",
@@ -17,16 +16,16 @@ const legacyConfigRules = RETIRED_ACPX_CONFIG_KEYS.map((key) => ({
 }));
 /** Removes retired plugin-owned config without keeping runtime compatibility keys. */
 function normalizeCompatibilityConfig({ cfg }) {
-	const entry = asObjectRecord(cfg.plugins?.entries?.acpx);
-	const pluginConfig = asObjectRecord(entry?.config);
+	const entry = (0, runtime_doctor_migrations_exports.asObjectRecord)(cfg.plugins?.entries?.acpx);
+	const pluginConfig = (0, runtime_doctor_migrations_exports.asObjectRecord)(entry?.config);
 	const retiredKeys = RETIRED_ACPX_CONFIG_KEYS.filter((key) => Object.hasOwn(pluginConfig ?? {}, key));
 	if (!pluginConfig || retiredKeys.length === 0) return {
 		config: cfg,
 		changes: []
 	};
 	const nextConfig = structuredClone(cfg);
-	const nextEntry = asObjectRecord(nextConfig.plugins?.entries?.acpx);
-	const nextPluginConfig = asObjectRecord(nextEntry?.config);
+	const nextEntry = (0, runtime_doctor_migrations_exports.asObjectRecord)(nextConfig.plugins?.entries?.acpx);
+	const nextPluginConfig = (0, runtime_doctor_migrations_exports.asObjectRecord)(nextEntry?.config);
 	if (!nextPluginConfig) return {
 		config: cfg,
 		changes: []
@@ -94,20 +93,14 @@ const stateMigrations = [{
 				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) {
+		if (canonicalGatewayInstanceId && (canAdoptLegacyGateway || !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 archiveLegacyStateSource({
+		if (gatewayInstanceId) await (0, runtime_doctor_migrations_exports.archiveLegacyStateSource)({
 			filePath: gatewayInstancePath,
 			label: "ACPX gateway-instance-id",
 			changes,
@@ -119,7 +112,7 @@ const stateMigrations = [{
 			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 archiveLegacyStateSource({
+			await (0, runtime_doctor_migrations_exports.archiveLegacyStateSource)({
 				filePath: processLeasePath,
 				label: "ACPX process-leases",
 				changes,
@@ -136,11 +129,14 @@ const stateMigrations = [{
 	label: "ACP session owners",
 	doctorOnly: true,
 	phase: "after-session-repair",
+	async collectBackupResources(input) {
+		return (await import("./.setup/session-owner-migration-DsGrYq7Y.mjs")).acpxSessionOwnerMigration.collectBackupResources(input);
+	},
 	async detectLegacyState(input) {
-		return (await import("./.setup/session-owner-migration-CdJSYRk1.mjs")).acpxSessionOwnerMigration.detectLegacyState(input);
+		return (await import("./.setup/session-owner-migration-DsGrYq7Y.mjs")).acpxSessionOwnerMigration.detectLegacyState(input);
 	},
 	async migrateLegacyState(input) {
-		return (await import("./.setup/session-owner-migration-CdJSYRk1.mjs")).acpxSessionOwnerMigration.migrateLegacyState(input);
+		return (await import("./.setup/session-owner-migration-DsGrYq7Y.mjs")).acpxSessionOwnerMigration.migrateLegacyState(input);
 	}
 }];
 //#endregion

package/dist/index.js

@@ -1,5 +1,5 @@
-import { t as createAcpxRuntimeService } from "./.setup/register.runtime-Bm4HrMCp.mjs";
-import { a as ACPX_NATIVE_AGENT_IDS, o as AcpxNativeAgentsSchema, t as resolveAcpxPluginConfig } from "./.setup/config-CdPsIued.mjs";
+import { t as createAcpxRuntimeService } from "./.setup/register.runtime-DByczkH_.mjs";
+import { a as ACPX_NATIVE_AGENT_IDS, o as AcpxNativeAgentsSchema, t as resolveAcpxPluginConfig } from "./.setup/config-Blz15uwJ.mjs";
 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 "./.setup/pi-session-paths-CIvyk6KB.mjs";
 import { createAgentRegistry } from "acpx/agent-registry";
 import { tryDispatchAcpReplyHook } from "openclaw/plugin-sdk/acp-runtime-backend";
@@ -157,26 +157,47 @@ function createAcpAgentHarness(params) {
 		},
 		async loadModelCatalog(input) {
 			generation.signal.throwIfAborted();
-			if (!params.isEnabled()) return [];
+			if (!params.isEnabled()) return { entries: [] };
 			const inspection = inspectAgent();
-			if (inspection?.launch.kind !== "installed") return [];
+			if (inspection?.launch.kind !== "installed") return { entries: [] };
 			const config = resolveAcpxPluginConfig({
 				rawConfig: params.api.pluginConfig,
 				workspaceDir: input.workspaceDir
 			});
-			const models = await inspectAgentModels({
-				agentCommand: inspection.launch.argv,
-				cwd: input.workspaceDir ?? config.cwd,
-				signal: generation.signal,
-				timeoutMs: config.timeoutSeconds === void 0 ? void 0 : finiteSecondsToTimerSafeMilliseconds(config.timeoutSeconds) ?? 1
-			});
-			generation.signal.throwIfAborted();
-			return (params.isEnabled() ? models?.availableModels ?? [] : []).map((model) => ({
-				provider: id,
-				id: model.modelId,
-				name: model.name,
-				nativeRuntime: id
-			}));
+			try {
+				const models = await inspectAgentModels({
+					agentCommand: inspection.launch.argv,
+					cwd: input.workspaceDir ?? config.cwd,
+					signal: generation.signal,
+					timeoutMs: config.timeoutSeconds === void 0 ? void 0 : finiteSecondsToTimerSafeMilliseconds(config.timeoutSeconds) ?? 1
+				});
+				generation.signal.throwIfAborted();
+				if (!params.isEnabled()) return { entries: [] };
+				return {
+					entries: (models?.availableModels ?? []).map((model) => ({
+						provider: id,
+						id: model.modelId,
+						name: model.name,
+						nativeRuntime: id
+					})),
+					outcomes: [{
+						provider: id,
+						status: "ready"
+					}]
+				};
+			} catch (error) {
+				generation.signal.throwIfAborted();
+				if (!params.isEnabled()) return { entries: [] };
+				const authRequired = error instanceof Error && error.name === "RequestError" && "code" in error && error.code === -32e3 && (error.message === "Authentication required" || error.message.startsWith("Authentication required: "));
+				return {
+					entries: [],
+					outcomes: [{
+						provider: id,
+						status: authRequired ? "auth-rejected" : "unavailable",
+						rejectionScope: "catalog"
+					}]
+				};
+			}
 		},
 		async runAttempt(input) {
 			generation.signal.throwIfAborted();
@@ -226,12 +247,11 @@ function createAcpAgentHarness(params) {
 }
 //#endregion
 //#region extensions/acpx/src/pi-session-catalog-plugin.ts
-const loadPiSessionCatalogModule = createLazyRuntimeModule(() => import("./.setup/pi-session-catalog-runtime-UhiQSaDw.mjs"));
+const loadPiSessionCatalogModule = createLazyRuntimeModule(() => import("./.setup/pi-session-catalog-runtime-IKEanK3s.mjs"));
 function fullConfigCatalogEnabled(config) {
 	if (!isRecord(config) || !isRecord(config.plugins) || !isRecord(config.plugins.entries)) return true;
 	const entry = config.plugins.entries.acpx;
-	if (!isRecord(entry) || !isRecord(entry.config) || !isRecord(entry.config.piSessionCatalog)) return true;
-	return entry.config.piSessionCatalog.enabled !== false;
+	return isPiSessionCatalogEnabled(isRecord(entry) ? entry.config : void 0);
 }
 function isPiSessionCatalogEnabled(pluginConfig) {
 	return !isRecord(pluginConfig) || !isRecord(pluginConfig.piSessionCatalog) || pluginConfig.piSessionCatalog.enabled !== false;

package/dist/register.runtime.js

@@ -1,2 +1,2 @@
-import { t as createAcpxRuntimeService } from "./.setup/register.runtime-Bm4HrMCp.mjs";
+import { t as createAcpxRuntimeService } from "./.setup/register.runtime-DByczkH_.mjs";
 export { createAcpxRuntimeService };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.9.7",
+  "version": "2026.9.9",
   "description": "OpenClaw ACP runtime backend with plugin-owned session and transport management.",
   "repository": {
     "type": "git",
@@ -8,8 +8,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@agentclientprotocol/claude-agent-acp": "0.76.0",
-    "@agentclientprotocol/codex-acp": "1.11.0",
+    "@agentclientprotocol/claude-agent-acp": "0.79.0",
+    "@agentclientprotocol/codex-acp": "1.12.0",
+    "@openclaw/fs-safe": "0.21.1",
     "acpx": "0.19.1",
     "smol-toml": "1.8.0",
     "zod": "4.6.5"
@@ -44,10 +45,10 @@
       ]
     },
     "compat": {
-      "pluginApi": ">=2026.9.5"
+      "pluginApi": ">=2026.9.9"
     },
     "build": {
-      "openclawVersion": "2026.9.5",
+      "openclawVersion": "2026.9.9",
       "staticAssets": [
         {
           "source": "./src/runtime-internals/mcp-proxy.mjs",
@@ -77,7 +78,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.9.5"
+    "openclaw": ">=2026.9.9"
   },
   "peerDependenciesMeta": {
     "openclaw": {

package/skills/acp-router/SKILL.md

@@ -209,8 +209,8 @@ ${ACPX_CMD} codex sessions close oc-codex-<conversationId>
 Defaults are:
 
 - `openclaw -> openclaw acp`
-- `claude -> bundled @agentclientprotocol/claude-agent-acp@0.76.0`
-- `codex -> bundled @agentclientprotocol/codex-acp@1.11.0 through OpenClaw's isolated CODEX_HOME wrapper`
+- `claude -> bundled @agentclientprotocol/claude-agent-acp@0.79.0`
+- `codex -> bundled @agentclientprotocol/codex-acp@1.12.0 through OpenClaw's isolated CODEX_HOME wrapper`
 - `copilot -> copilot --acp --stdio`
 - `cursor -> cursor-agent acp`
 - `droid -> droid exec --output-format acp`

package/dist/.setup/process-lease-C3dNPtu8.mjs

@@ -1,138 +0,0 @@
-import { a as renderAgentCommand, s as splitCommandParts } from "./command-line-CPBLOiZM.mjs";
-import { createHash } 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.
-*/
-/** CLI argument carrying the ACPX process lease id. */
-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 = 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() : "";
-	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;
-	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,
-		overflowPolicy: "reject-new"
-	});
-}
-/** 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
-				});
-			});
-		}
-	};
-}
-/** Hash a wrapper command so process leases can detect command drift. */
-function hashAcpxProcessCommand(command) {
-	return createHash("sha256").update(renderAgentCommand(command)).digest("hex");
-}
-/** Append portable wrapper arguments without changing the executable or argument bytes. */
-function withAcpxLeaseArgs(params) {
-	return [
-		...splitCommandParts(params.command),
-		OPENCLAW_ACPX_LEASE_ID_ARG,
-		params.leaseId,
-		OPENCLAW_GATEWAY_INSTANCE_ID_ARG,
-		params.gatewayInstanceId
-	];
-}
-//#endregion
-export { hashAcpxProcessCommand as a, openAcpxProcessLeaseStateStore as c, ACPX_GATEWAY_INSTANCE_KEY as d, ACPX_GATEWAY_INSTANCE_NAMESPACE as f, 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 };