@openclaw/acpx 2026.9.7 → 2026.10.1-beta.1

package/dist/index.js

@@ -1,10 +1,11 @@
-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-C0nVOTzT.mjs";
+import { g as AcpxNativeAgentsSchema, h as ACPX_NATIVE_AGENT_IDS, t as resolveAcpxPluginConfig } from "./.setup/config-76krYh6C.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";
 import { createLazyRuntimeModule, createLazyRuntimeSurface } from "openclaw/plugin-sdk/lazy-runtime";
 import { inspectAgentModels } from "acpx/runtime";
+import { createNativeSessionCommitFinalizer } from "openclaw/plugin-sdk/agent-harness-session-runtime";
 import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveNodeHostExecutable } from "openclaw/plugin-sdk/node-host";
@@ -157,26 +158,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();
@@ -206,14 +228,14 @@ function createAcpAgentHarness(params) {
 		async withSessionDeletion(input, run) {
 			let committed = false;
 			try {
-				return await run({
+				return await run(createNativeSessionCommitFinalizer({
 					commit: () => {
 						committed = true;
 					},
 					rollback: () => {
 						committed = false;
 					}
-				});
+				}));
 			} finally {
 				if (committed) await retire(input, input.assertCurrent);
 			}
@@ -226,12 +248,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-7jc50ZJ4.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-C0nVOTzT.mjs";
 export { createAcpxRuntimeService };

package/openclaw.plugin.json

@@ -16,7 +16,6 @@
   "doctorContract": {
     "configRepair": true,
     "stateMigrations": [
-      { "id": "acpx-runtime-state-to-plugin-state" },
       {
         "id": "acpx-session-owner-resources",
         "doctorOnly": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.9.7",
+  "version": "2026.10.1-beta.1",
   "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.23.0",
     "acpx": "0.19.1",
     "smol-toml": "1.8.0",
     "zod": "4.6.5"
@@ -44,20 +45,10 @@
       ]
     },
     "compat": {
-      "pluginApi": ">=2026.9.5"
+      "pluginApi": ">=2026.10.1-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.9.5",
-      "staticAssets": [
-        {
-          "source": "./src/runtime-internals/mcp-proxy.mjs",
-          "output": "mcp-proxy.mjs"
-        },
-        {
-          "source": "./src/runtime-internals/mcp-command-line.mjs",
-          "output": "mcp-command-line.mjs"
-        }
-      ]
+      "openclawVersion": "2026.10.1-beta.1"
     },
     "release": {
       "publishToClawHub": true,
@@ -77,7 +68,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.9.5"
+    "openclaw": ">=2026.10.1-beta.1"
   },
   "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/command-line-CPBLOiZM.mjs

@@ -1,138 +0,0 @@
-//#region extensions/acpx/src/codex-adapter.ts
-const CODEX_ACP_PACKAGE = "@agentclientprotocol/codex-acp";
-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
-/** Match ACPX's persisted argv identity; scalar records keep their original bytes. */
-function renderAgentCommand(command) {
-	return typeof command === "string" ? command : command.map((part) => /^[A-Za-z0-9_@%+=:,./^~-]+$/.test(part) ? part : JSON.stringify(part)).join(" ");
-}
-/** Split a command string into argv-like parts using simple quote/backslash rules. */
-function splitCommandParts(value) {
-	if (Array.isArray(value)) return value;
-	const windows = process.platform === "win32";
-	const parts = [];
-	let current = "";
-	let quote = null;
-	let escaping = false;
-	let hasPart = false;
-	for (const ch of value) {
-		if (escaping) {
-			current += ch;
-			escaping = false;
-			hasPart = true;
-			continue;
-		}
-		if (ch === "\\" && quote !== "'" && !windows) {
-			escaping = true;
-			hasPart = true;
-			continue;
-		}
-		if (windows && ch === "\"" && quote !== "'") {
-			const backslashes = current.match(/\\+$/)?.[0].length ?? 0;
-			current = current.slice(0, current.length - backslashes) + "\\".repeat(Math.floor(backslashes / 2));
-			if (backslashes % 2 === 1) {
-				current += "\"";
-				continue;
-			}
-		}
-		if (quote) {
-			if (ch === quote) quote = null;
-			else current += ch;
-			continue;
-		}
-		if (ch === "'" || ch === "\"") {
-			quote = ch;
-			hasPart = true;
-			continue;
-		}
-		if (/\s/.test(ch)) {
-			if (hasPart) {
-				parts.push(current);
-				current = "";
-				hasPart = false;
-			}
-			continue;
-		}
-		current += ch;
-		hasPart = true;
-	}
-	if (escaping) current += "\\";
-	if (quote) throw new Error("Invalid agent command: unterminated quote");
-	if (hasPart) parts.push(current);
-	return parts;
-}
-const OPENCLAW_BRIDGE_EXECUTABLE = "openclaw";
-const OPENCLAW_BRIDGE_SUBCOMMAND = "acp";
-function normalizeAgentName(value) {
-	const normalized = value?.trim().toLowerCase();
-	return normalized ? normalized : void 0;
-}
-function basename(value) {
-	return value.split(/[\\/]/).pop() ?? value;
-}
-function isEnvAssignment(value) {
-	return /^[A-Za-z_][A-Za-z0-9_]*=/.test(value);
-}
-function unwrapEnvCommand(parts) {
-	const command = parts.at(0);
-	if (!command || basename(command) !== "env") return parts;
-	let index = 1;
-	while (true) {
-		const part = parts.at(index);
-		if (!part || !isEnvAssignment(part)) break;
-		index += 1;
-	}
-	return parts.slice(index);
-}
-function matchesExecutableName(value, executableName) {
-	const normalized = basename(value).toLowerCase();
-	return normalized === executableName || normalized === `${executableName}.exe`;
-}
-function matchesPackageSpec(value, packageName) {
-	const normalized = value.trim().toLowerCase();
-	return normalized === packageName || normalized.startsWith(`${packageName}@`);
-}
-function stripModuleExtension(value) {
-	return value.replace(/\.[cm]?js$/i, "").toLowerCase();
-}
-function isAcpCommand(command, params) {
-	if (!command) return false;
-	const parts = unwrapEnvCommand(splitCommandParts(command));
-	if (!parts.length) return false;
-	if (parts.some((part) => matchesPackageSpec(part, params.packageName))) return true;
-	const commandName = basename(parts[0] ?? "");
-	if (matchesExecutableName(commandName, params.executableName)) return true;
-	if (!matchesExecutableName(commandName, "node")) return false;
-	const scriptName = stripModuleExtension(basename(parts[1] ?? ""));
-	return scriptName === params.executableName || scriptName === `${params.executableName}-wrapper`;
-}
-function isOpenClawBridgeCommand(command) {
-	if (!command) return false;
-	const parts = unwrapEnvCommand(splitCommandParts(command));
-	if (basename(parts[0] ?? "") === OPENCLAW_BRIDGE_EXECUTABLE) return parts[1] === OPENCLAW_BRIDGE_SUBCOMMAND;
-	if (basename(parts[0] ?? "") !== "node") return false;
-	const scriptName = basename(parts[1] ?? "");
-	return /^openclaw(?:\.[cm]?js)?$/i.test(scriptName) && parts[2] === OPENCLAW_BRIDGE_SUBCOMMAND;
-}
-function isCodexAcpCommand(command) {
-	return isAcpCommand(command, {
-		packageName: CODEX_ACP_PACKAGE,
-		executableName: "codex-acp"
-	});
-}
-function isClaudeAcpCommand(command) {
-	return isAcpCommand(command, {
-		packageName: "@agentclientprotocol/claude-agent-acp",
-		executableName: "claude-agent-acp"
-	});
-}
-function resolveAgentCommand(params) {
-	const normalizedAgentName = normalizeAgentName(params.agentName);
-	if (!normalizedAgentName) return;
-	return splitCommandParts(params.agentRegistry.resolve(normalizedAgentName));
-}
-//#endregion
-export { renderAgentCommand as a, CODEX_ACP_BIN as c, OPENCLAW_CODEX_CONFIG_ARG as d, normalizeAgentName as i, CODEX_ACP_PACKAGE as l, isCodexAcpCommand as n, resolveAgentCommand as o, isOpenClawBridgeCommand as r, splitCommandParts as s, isClaudeAcpCommand as t, LEGACY_CODEX_ACP_PACKAGE as u };

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 };

package/dist/.setup/session-owner-migration-CdJSYRk1.mjs

@@ -1,203 +0,0 @@
-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 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";
-//#region extensions/acpx/src/session-owner-migration.ts
-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
-	}).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-"));
-	if (ids.length === 0) return {
-		directory,
-		ids
-	};
-	const { resolveAcpxSessionResource } = await import("./session-resource-BaJ6bs5d.mjs").then((n) => n.n);
-	const evidence = await input.context.inspectAcpSessionClaims?.();
-	const { decodeAcpxRuntimeHandleState } = await import("acpx/runtime");
-	return {
-		directory,
-		ids: ids.filter((id) => !evidence?.claims.some((claim) => {
-			const locator = decodeAcpxRuntimeHandleState(claim.meta.runtimeSessionName);
-			return evidence.incomplete.length === 0 && claim.meta.identity?.state === "resolved" && claim.meta.identity.acpxRecordId === id && locator?.acpxRecordId === id && locator.name === resolveAcpxSessionResource(claim);
-		})).filter((id) => !id.includes(":oneshot:") || evidence?.claims.some((claim) => {
-			const locator = decodeAcpxRuntimeHandleState(claim.meta.runtimeSessionName);
-			return claim.meta.identity?.acpxRecordId === id && locator?.name !== resolveAcpxSessionResource(claim);
-		})).toSorted()
-	};
-}
-function requireStoppedPid(pid) {
-	if (pid === void 0 || pid === null) return;
-	if (typeof pid !== "number" || !Number.isSafeInteger(pid) || pid <= 0) throw new Error("record process identity is uncertain");
-	try {
-		process.kill(pid, 0);
-	} catch (error) {
-		if (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");
-}
-function recordPath(directory, recordId) {
-	return path.join(directory, `${encodeURIComponent(recordId)}.json`);
-}
-function matchesClaimRecord(claim, raw, oldId, resource, decode) {
-	const state = decode(claim.meta.runtimeSessionName);
-	const identity = claim.meta.identity;
-	if (!state || !identity || identity.state !== "resolved" || !identity.acpxSessionId && !identity.agentSessionId || state.mode !== claim.meta.mode) return false;
-	const recordId = claim.meta.mode === "oneshot" ? oldId : resource;
-	const oldLocator = state.name === raw.name && identity.acpxRecordId === oldId && state.acpxRecordId === oldId;
-	const newLocator = state.name === resource && identity.acpxRecordId === recordId && state.acpxRecordId === recordId;
-	return (oldLocator || newLocator) && state.agent === claim.meta.agent && (!identity.acpxSessionId || identity.acpxSessionId === raw.acp_session_id) && (!identity.agentSessionId || identity.agentSessionId === raw.agent_session_id) && (!state.backendSessionId || state.backendSessionId === raw.acp_session_id) && (!state.agentSessionId || state.agentSessionId === raw.agent_session_id);
-}
-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));
-	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 { 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");
-	const claim = candidates[0];
-	const resource = resolveAcpxSessionResource(claim);
-	const oneshot = claim.meta.mode === "oneshot";
-	if (oneshot !== (raw.name !== oldId)) throw new Error("canonical claim and backend record mode disagree");
-	if (!oneshot && oldId === resource) return;
-	const recordId = oneshot ? oldId : resource;
-	const leaseStore = openAcpxProcessLeaseStateStore(input.context.openPluginStateKeyedStore);
-	const leases = (await leaseStore.entries()).map((row) => ({
-		row,
-		lease: normalizeAcpxProcessLease(row.value)
-	}));
-	if (leases.some(({ lease }) => !lease)) throw new Error("process lease evidence is incomplete");
-	const commandIdentity = typeof raw.agent_command === "string" ? readAcpxProcessLeaseIdentity(raw.agent_command) : void 0;
-	const matchingLeases = leases.filter(({ lease }) => lease.sessionKey === raw.name || lease.sessionKey === resource);
-	for (const { lease } of matchingLeases) {
-		if (lease.state === "open" || lease.state === "closing") throw new Error("record has a live or uncertain process lease");
-		requireStoppedPid(lease.rootPid || void 0);
-		if (!commandIdentity || lease.leaseId !== commandIdentity.leaseId || lease.gatewayInstanceId !== commandIdentity.gatewayInstanceId || lease.commandHash !== hashAcpxProcessCommand(String(raw.agent_command))) throw new Error("record lease association does not match its persisted command");
-	}
-	const destinationPath = recordPath(directory, recordId);
-	const candidate = oneshot ? raw : {
-		...raw,
-		acpx_record_id: resource,
-		name: resource
-	};
-	const candidateBytes = `${JSON.stringify(candidate, null, 2)}\n`;
-	const source = await createFileSessionStore({ stateDir: path.dirname(directory) }).load(oldId);
-	if (!source) throw new Error("pinned ACPX reader rejected the source record");
-	const temporaryDirectory = await fs.mkdtemp(path.join(directory, ".openclaw-owner-"));
-	const temporarySessions = path.join(temporaryDirectory, "sessions");
-	const temporaryPath = recordPath(temporarySessions, recordId);
-	try {
-		await fs.mkdir(temporarySessions, { mode: 448 });
-		const file = await fs.open(temporaryPath, "wx", 384);
-		try {
-			await file.writeFile(candidateBytes);
-			await file.sync();
-		} finally {
-			await file.close();
-		}
-		const interpreted = await createFileSessionStore({ stateDir: temporaryDirectory }).load(recordId);
-		if (!interpreted || !isDeepStrictEqual(interpreted, oneshot ? source : {
-			...source,
-			acpxRecordId: resource,
-			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;
-			throw error;
-		});
-		const originalLocator = decodeAcpxRuntimeHandleState(claim.meta.runtimeSessionName);
-		if (!oneshot && originalLocator.name === resource && existing === void 0) throw new Error("migrated metadata has no published destination; source retained");
-		if (existing !== void 0 && !isDeepStrictEqual(JSON.parse(existing), candidate)) throw new Error("destination conflicts; no files were overwritten");
-		if (existing === void 0) await fs.link(temporaryPath, destinationPath);
-		const publicationDirectory = await fs.open(directory, "r");
-		try {
-			await publicationDirectory.sync();
-		} finally {
-			await publicationDirectory.close();
-		}
-		if (await fs.readFile(sourcePath, "utf8") !== sourceBytes) throw new Error("source changed during repair");
-		if (!isDeepStrictEqual(JSON.parse(await fs.readFile(destinationPath, "utf8")), candidate)) throw new Error("destination changed during repair");
-		for (const { row } of matchingLeases) {
-			if (!isDeepStrictEqual(await leaseStore.lookup(row.key), row.value)) throw new Error("lease changed during repair");
-			await leaseStore.register(row.key, {
-				...row.value,
-				sessionKey: resource
-			});
-		}
-		const state = decodeAcpxRuntimeHandleState(claim.meta.runtimeSessionName);
-		input.context.updateAcpSessionIdentity({
-			claim,
-			runtimeSessionName: encodeAcpxRuntimeHandleState({
-				...state,
-				name: resource,
-				acpxRecordId: recordId
-			}),
-			acpxRecordId: recordId
-		});
-		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({
-			filePath: sourcePath,
-			label: "ACP owner record",
-			changes,
-			warnings
-		});
-	} finally {
-		await fs.rm(temporaryDirectory, {
-			recursive: true,
-			force: true
-		});
-	}
-}
-const acpxSessionOwnerMigration = {
-	id: "acpx-session-owner-resources",
-	label: "ACP session owners",
-	doctorOnly: true,
-	phase: "after-session-repair",
-	async detectLegacyState(input) {
-		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 = [];
-		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 evidence = await input.context.inspectAcpSessionClaims();
-		if (evidence.incomplete.length) return {
-			changes,
-			warnings: [`ACP owner evidence is incomplete; all records retained: ${evidence.incomplete.join("; ")}`]
-		};
-		for (const oldId of ids) try {
-			const current = await input.context.inspectAcpSessionClaims();
-			if (current.incomplete.length) throw new Error("canonical ownership evidence became incomplete");
-			await migrateRecord(input, directory, oldId, current.claims, changes, warnings);
-		} catch (error) {
-			warnings.push(`ACP record ${oldId} retained: ${String(error)}`);
-		}
-		return {
-			changes,
-			warnings
-		};
-	}
-};
-//#endregion
-export { acpxSessionOwnerMigration };