@openclaw/acpx 2026.9.7 → 2026.10.1-beta.1

package/dist/.setup/{service-DMae5pPH.mjs → service-BXgGdE56.mjs}

@@ -1,31 +1,28 @@
-import { t as resolveAcpxSessionResource } from "./session-resource-BaJ6bs5d.mjs";
-import { i as toAcpMcpServers, n as resolveAcpxPluginRoot, r as resolveOpenClawRoot, t as resolveAcpxPluginConfig } from "./config-CdPsIued.mjs";
-import { a as renderAgentCommand, c as CODEX_ACP_BIN, d as OPENCLAW_CODEX_CONFIG_ARG, i as normalizeAgentName, l as CODEX_ACP_PACKAGE, n as isCodexAcpCommand, o as resolveAgentCommand, r as isOpenClawBridgeCommand, s as splitCommandParts, t as isClaudeAcpCommand, u as LEGACY_CODEX_ACP_PACKAGE } from "./command-line-CPBLOiZM.mjs";
-import { a as hashAcpxProcessCommand, c as openAcpxProcessLeaseStateStore, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, h as normalizeAcpxGatewayInstanceRecord, i as createAcpxProcessLeaseStore, l as readAcpxProcessLeaseIdentity, n as OPENCLAW_ACPX_LEASE_ID_ARG, r as OPENCLAW_GATEWAY_INSTANCE_ID_ARG, t as ACPX_PROBE_LEASE_SESSION_KEY, u as withAcpxLeaseArgs } from "./process-lease-C3dNPtu8.mjs";
+import { a as isClaudeAcpCommand, c as renderAgentCommand, d as CODEX_ACP_BIN, f as CODEX_ACP_PACKAGE, i as toAcpMcpServers, l as resolveAgentCommand, m as OPENCLAW_CODEX_CONFIG_ARG, n as resolveAcpxPluginRoot, o as isCodexAcpCommand, p as LEGACY_CODEX_ACP_PACKAGE, r as resolveOpenClawRoot, s as isOpenClawBridgeCommand, t as resolveAcpxPluginConfig, u as splitCommandParts } from "./config-76krYh6C.mjs";
 import { AcpRuntimeError } from "../runtime-api.js";
+import { t as resolveAcpxSessionResource } from "./session-resource-DKJsUJPu.mjs";
+import { a as hashAcpxProcessCommand, adoptAcpxStateDirectory, c as withAcpxLeaseArgs, d as normalizeAcpxGatewayInstanceRecord, i as createAcpxProcessLeaseStore, l as ACPX_GATEWAY_INSTANCE_KEY, n as OPENCLAW_ACPX_LEASE_ID_ARG, o as openAcpxProcessLeaseStateStore, r as OPENCLAW_GATEWAY_INSTANCE_ID_ARG, s as readAcpxProcessLeaseIdentity, t as ACPX_PROBE_LEASE_SESSION_KEY, u as ACPX_GATEWAY_INSTANCE_NAMESPACE } from "./session-owner-migration-C73lfijV.mjs";
 import { createRequire } from "node:module";
 import { AcpxRuntime, createAgentRegistry, createFileSessionStore, decodeAcpxRuntimeHandleState, isRequestedModelUnsupportedError } from "acpx/runtime";
 import { finiteSecondsToTimerSafeMilliseconds, parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs";
 import path, { resolve } from "node:path";
-import { isRecord, normalizeLowercaseStringOrEmpty, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { asOptionalObjectRecord, isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import os, { availableParallelism } from "node:os";
-import fs$1 from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { escapeRegExp, sliceUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
-import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
+import fs$1 from "node:fs/promises";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
+import { tryReadJson } from "@openclaw/fs-safe/json";
 import { parse, stringify } from "smol-toml";
+import { setTimeout } from "node:timers/promises";
 import { isPidAlive, runExec } from "openclaw/plugin-sdk/process-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { isDeepStrictEqual } from "node:util";
 import { redactSensitiveText } from "openclaw/plugin-sdk/security-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 //#region extensions/acpx/src/codex-trust-config.ts
-/**
-* Builds isolated Codex config for ACPX sessions. It preserves safe inherited
-* runtime options while rendering only trusted project entries for the session.
-*/
 function stripTomlComment(line) {
 	let quote = null;
 	let escaping = false;
@@ -97,10 +94,8 @@ function parseTomlDottedKey(value) {
 	return parts.map((part) => parseTomlString(part) ?? part);
 }
 function parseProjectHeader(line) {
-	const trimmed = line.trim();
-	if (!trimmed.startsWith("[") || !trimmed.endsWith("]") || trimmed.startsWith("[[")) return;
-	const parts = parseTomlDottedKey(trimmed.slice(1, -1));
-	return parts.length === 2 && parts[0] === "projects" ? parts[1] : void 0;
+	const parts = parseTableHeader(line);
+	return parts?.length === 2 && parts[0] === "projects" ? parts[1] : void 0;
 }
 function parseTrustedInlineProjectEntries(value) {
 	const trusted = [];
@@ -113,7 +108,6 @@ function parseTrustedInlineProjectEntries(value) {
 	}
 	return trusted;
 }
-/** Extract trusted project paths from Codex TOML config. */
 function extractTrustedCodexProjectPaths(configToml) {
 	const trusted = /* @__PURE__ */ new Set();
 	let currentProjectPath;
@@ -208,10 +202,8 @@ function extractInheritedCodexRuntimeConfig(configToml) {
 		if (!INHERITED_TOP_LEVEL_CODEX_CONFIG_KEYS.has(key)) continue;
 		inheritedLines.push(rawLine.trimEnd());
 	}
-	while (inheritedLines.length > 0 && inheritedLines[inheritedLines.length - 1] === "") inheritedLines.pop();
 	return inheritedLines.join("\n");
 }
-/** Render a session-local Codex config with inherited runtime settings and trust entries. */
 function renderIsolatedCodexConfig(params) {
 	const normalized = Array.from(new Set(params.projectPaths.map((projectPath) => projectPath.trim()).filter(Boolean).map((projectPath) => path.resolve(projectPath)))).toSorted((left, right) => left.localeCompare(right));
 	return [
@@ -258,8 +250,8 @@ function resolvePackageBinPath(packageJsonPath, manifest, binName) {
 async function resolveInstalledAcpPackageBinPath(packageName, binName) {
 	try {
 		const packageJsonPath = requireFromHere$1.resolve(`${packageName}/package.json`);
-		const { value: manifest } = await readJsonFileWithFallback(packageJsonPath, {});
-		if (manifest.name !== packageName) return;
+		const manifest = await tryReadJson(packageJsonPath);
+		if (manifest?.name !== packageName) return;
 		const binPath = resolvePackageBinPath(packageJsonPath, manifest, binName);
 		if (!binPath) return;
 		await fs$1.access(binPath);
@@ -268,12 +260,6 @@ async function resolveInstalledAcpPackageBinPath(packageName, binName) {
 		return;
 	}
 }
-async function resolveInstalledCodexAcpBinPath() {
-	return await resolveInstalledAcpPackageBinPath(CODEX_ACP_PACKAGE, CODEX_ACP_BIN);
-}
-async function resolveInstalledClaudeAcpBinPath() {
-	return await resolveInstalledAcpPackageBinPath(CLAUDE_ACP_PACKAGE, CLAUDE_ACP_BIN);
-}
 const DIAGNOSTIC_REDACTION_RULES = [
 	{
 		source: String.raw`(authorization\s*[:=]\s*bearer\s+)[^\s'"<>]+`,
@@ -595,7 +581,9 @@ const npmCliPath = resolveNpmCliPath();
 const installedBinPath = ${params.installedBinPath ? JSON.stringify(params.installedBinPath) : "undefined"};
 let defaultCommand;
 let defaultArgs;
-if (installedBinPath) {
+// Plugin capture/install directories are disposable: a durable wrapper can
+// outlive the path it captured, so re-check the target before trusting it.
+if (installedBinPath && existsSync(installedBinPath)) {
   defaultCommand = process.execPath;
   defaultArgs = [installedBinPath];
 } else if (npmCliPath) {
@@ -858,13 +846,11 @@ function buildWrapperCommand(wrapperPath, args = []) {
 	];
 }
 function isAcpPackageSpec(value, packageName) {
-	const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	return new RegExp(`^${escapedPackageName}(?:@.+)?$`, "i").test(value.trim());
+	return new RegExp(`^${escapeRegExp(packageName)}(?:@.+)?$`, "i").test(value.trim());
 }
 function isAcpBinName(value, binName) {
 	const commandName = basename(value);
-	const escapedBinName = binName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	return new RegExp(`^${escapedBinName}(?:\\.exe|\\.[cm]?js)?$`, "i").test(commandName);
+	return new RegExp(`^${escapeRegExp(binName)}(?:\\.exe|\\.[cm]?js)?$`, "i").test(commandName);
 }
 function isPackageRunnerCommand(value) {
 	return /^(?:npx|npm|pnpm|bunx)(?:\.cmd|\.exe)?$/i.test(basename(value));
@@ -974,7 +960,6 @@ function buildClaudeAcpWrapperCommand(wrapperPath, configuredCommand) {
 }
 /** Prepare ACPX agent commands and isolated auth homes for Codex/Claude adapters. */
 async function prepareAcpxCodexAuthConfig(params) {
-	params.logger;
 	const codexBaseDir = path.join(params.stateDir, "acpx");
 	const configuredCodexCommand = params.pluginConfig.agents.codex;
 	const configuredClaudeCommand = params.pluginConfig.agents.claude;
@@ -986,8 +971,8 @@ async function prepareAcpxCodexAuthConfig(params) {
 		}),
 		migratedConfig: codexLaunch?.migratedConfig
 	});
-	const installedCodexBinPath = await (params.resolveInstalledCodexAcpBinPath ?? resolveInstalledCodexAcpBinPath)();
-	const installedClaudeBinPath = await (params.resolveInstalledClaudeAcpBinPath ?? resolveInstalledClaudeAcpBinPath)();
+	const installedCodexBinPath = await (params.resolveInstalledCodexAcpBinPath ? params.resolveInstalledCodexAcpBinPath() : resolveInstalledAcpPackageBinPath(CODEX_ACP_PACKAGE, CODEX_ACP_BIN));
+	const installedClaudeBinPath = await (params.resolveInstalledClaudeAcpBinPath ? params.resolveInstalledClaudeAcpBinPath() : resolveInstalledAcpPackageBinPath(CLAUDE_ACP_PACKAGE, CLAUDE_ACP_BIN));
 	const wrapperPath = await writeAdapterWrapper(codexBaseDir, "codex-acp-wrapper.mjs", buildCodexAcpWrapperScript(installedCodexBinPath));
 	const claudeWrapperPath = await writeAdapterWrapper(codexBaseDir, "claude-agent-acp-wrapper.mjs", buildClaudeAcpWrapperScript(installedClaudeBinPath));
 	return {
@@ -1114,7 +1099,6 @@ function parseProcessList(stdout) {
 	}
 	return processes;
 }
-/** List host processes in the compact shape needed by ACPX cleanup. */
 async function listPlatformProcesses() {
 	if (process.platform === "win32") return [];
 	const { stdout } = await runExec("ps", ["-axo", "pid=,ppid=,command="], {
@@ -1146,25 +1130,21 @@ function collectProcessTree(processes, rootPid) {
 function uniquePids(processes) {
 	return Array.from(new Set(processes.map((processInfo) => processInfo.pid).filter((pid) => Number.isInteger(pid) && pid > 0 && pid !== process.pid)));
 }
-async function terminatePids(pids, deps) {
-	const killProcess = deps?.killProcess ?? ((pid, signal) => process.kill(pid, signal));
-	const sleep = deps?.sleep ?? ((ms) => new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	}));
+async function terminatePids(pids, assertCurrent) {
 	const terminated = [];
 	for (const pid of pids) {
-		deps?.assertCurrent?.();
+		assertCurrent?.();
 		try {
-			killProcess(pid, "SIGTERM");
+			process.kill(pid, "SIGTERM");
 			terminated.push(pid);
 		} catch {}
 	}
 	if (terminated.length === 0) return terminated;
-	await sleep(750);
+	await setTimeout(750);
 	for (const pid of terminated) {
-		deps?.assertCurrent?.();
-		if (deps?.killProcess || isPidAlive(pid)) try {
-			killProcess(pid, "SIGKILL");
+		assertCurrent?.();
+		if (isPidAlive(pid)) try {
+			process.kill(pid, "SIGKILL");
 		} catch {}
 	}
 	return terminated;
@@ -1177,14 +1157,14 @@ async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 		terminatedPids: [],
 		skippedReason: "missing-root"
 	};
-	if ((params.deps?.platform ?? process.platform) === "win32") return {
+	if (process.platform === "win32") return {
 		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
 	};
 	let processes;
 	try {
-		processes = await (params.deps?.listProcesses ?? listPlatformProcesses)();
+		processes = await listPlatformProcesses();
 	} catch {
 		return {
 			inspectedPids: [],
@@ -1216,12 +1196,12 @@ async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 	const pids = uniquePids(listedTree.toReversed());
 	return {
 		inspectedPids: uniquePids(listedTree),
-		terminatedPids: await terminatePids(pids, params.deps)
+		terminatedPids: await terminatePids(pids, params.assertCurrent)
 	};
 }
 /** Recover a pending lease by matching its exact live wrapper identity. */
 async function cleanupOpenClawOwnedAcpxPendingLease(params) {
-	if ((params.deps?.platform ?? process.platform) === "win32") return {
+	if (process.platform === "win32") return {
 		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
@@ -1233,7 +1213,7 @@ async function cleanupOpenClawOwnedAcpxPendingLease(params) {
 	};
 	let processes;
 	try {
-		processes = await (params.deps?.listProcesses ?? listPlatformProcesses)();
+		processes = await listPlatformProcesses();
 	} catch {
 		return {
 			inspectedPids: [],
@@ -1260,19 +1240,19 @@ async function cleanupOpenClawOwnedAcpxPendingLease(params) {
 	const pids = uniquePids(listedTree.toReversed());
 	return {
 		inspectedPids: uniquePids(listedTree),
-		terminatedPids: await terminatePids(pids, params.deps)
+		terminatedPids: await terminatePids(pids, params.assertCurrent)
 	};
 }
 /** Reap orphaned OpenClaw-owned ACPX wrapper trees during runtime startup. */
 async function reapStaleOpenClawOwnedAcpxOrphans(params) {
-	if ((params.deps?.platform ?? process.platform) === "win32") return {
+	if (process.platform === "win32") return {
 		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
 	};
 	let processes;
 	try {
-		processes = await (params.deps?.listProcesses ?? listPlatformProcesses)();
+		processes = await listPlatformProcesses();
 	} catch {
 		return {
 			inspectedPids: [],
@@ -1286,7 +1266,7 @@ async function reapStaleOpenClawOwnedAcpxOrphans(params) {
 	})).map((orphan) => collectProcessTree(processes, orphan.pid));
 	return {
 		inspectedPids: uniquePids(orphanTrees.flat()),
-		terminatedPids: await terminatePids(uniquePids(orphanTrees.flatMap((tree) => tree.toReversed())), params.deps)
+		terminatedPids: await terminatePids(uniquePids(orphanTrees.flatMap((tree) => tree.toReversed())), params.assertCurrent)
 	};
 }
 //#endregion
@@ -1369,7 +1349,7 @@ var AcpxGenerationRegistry = class {
 		return generation.delegate;
 	}
 	currentGeneration(resource) {
-		if (this.stopping) throw new AcpRuntimeError("ACP_BACKEND_UNAVAILABLE", "ACP runtime is shut down.");
+		this.assertRunning();
 		let generation = this.generations.get(resource);
 		if (!generation) {
 			const fresh = this.sessionStore.isFresh(resource);
@@ -1512,40 +1492,28 @@ function captureGenerationRecord(generation, record) {
 const acpxGenerationKey = Symbol("openclaw.acpxGeneration");
 const acpxOperationScope = new AsyncLocalStorage();
 function readSessionRecordName(record) {
-	if (typeof record !== "object" || record === null) return "";
-	const { name } = record;
-	return typeof name === "string" ? name.trim() : "";
+	return normalizeOptionalString(asOptionalObjectRecord(record)?.name) ?? "";
 }
 function readRecordAgentCommand(record) {
 	return record?.agentArgv ?? record?.agentCommand;
 }
 function readRecordCwd(record) {
-	if (typeof record !== "object" || record === null) return;
-	const { cwd } = record;
-	return typeof cwd === "string" ? cwd.trim() || void 0 : void 0;
+	return normalizeOptionalString(asOptionalObjectRecord(record)?.cwd);
 }
 function readRecordResetOnNextEnsure(record) {
-	if (typeof record !== "object" || record === null) return false;
-	const { acpx } = record;
-	if (typeof acpx !== "object" || acpx === null) return false;
-	return acpx.reset_on_next_ensure === true;
+	return asOptionalObjectRecord(asOptionalObjectRecord(record)?.acpx)?.reset_on_next_ensure === true;
 }
 function readRecordAgentPid(record) {
-	if (typeof record !== "object" || record === null) return;
-	const { pid, processId } = record;
+	const { pid, processId } = asOptionalObjectRecord(record) ?? {};
 	const rawPid = pid ?? processId;
 	const numericPid = typeof rawPid === "number" ? rawPid : typeof rawPid === "string" ? parseStrictPositiveInteger(rawPid) : void 0;
 	return numericPid && Number.isInteger(numericPid) && numericPid > 0 ? numericPid : void 0;
 }
 function readOpenClawLeaseIdFromRecord(record) {
-	if (typeof record !== "object" || record === null) return;
-	const { openclawLeaseId } = record;
-	return typeof openclawLeaseId === "string" ? openclawLeaseId.trim() || void 0 : void 0;
+	return normalizeOptionalString(asOptionalObjectRecord(record)?.openclawLeaseId);
 }
 function readOpenClawGatewayInstanceIdFromRecord(record) {
-	if (typeof record !== "object" || record === null) return;
-	const { openclawGatewayInstanceId } = record;
-	return typeof openclawGatewayInstanceId === "string" ? openclawGatewayInstanceId.trim() || void 0 : void 0;
+	return normalizeOptionalString(asOptionalObjectRecord(record)?.openclawGatewayInstanceId);
 }
 function extractGeneratedWrapperPath(command) {
 	return splitCommandParts(command ?? "").find((part) => (part.split(/[\\/]/).pop() ?? "") === "codex-acp-wrapper.mjs" || (part.split(/[\\/]/).pop() ?? "") === "claude-agent-acp-wrapper.mjs") ?? "";
@@ -1569,27 +1537,24 @@ function createResetAwareSessionStore(baseStore, params) {
 			const resource = scope?.generation.resource ?? sessionId.trim();
 			const pending = pendingWrites.get(sessionId.trim());
 			if (pending && (scope?.generation.awaitPriorWrites || freshSessionKeys.has(resource))) await Promise.allSettled(pending);
-			const load = async () => {
-				if (scope?.generation.retired) return;
-				const normalized = sessionId.trim();
-				if (normalized && freshSessionKeys.has(normalized)) return;
-				const record = await baseStore.load(sessionId);
-				if (scope?.generation.retired || freshSessionKeys.has(scope?.generation.resource ?? normalized)) return;
-				if (scope && record) captureGenerationRecord(scope.generation, record);
-				if (!record || !params?.leaseStore || !params.gatewayInstanceId) return record;
-				const sessionName = readSessionRecordName(record) || normalized;
-				const lease = selectCurrentSessionLease({
-					leases: await params.leaseStore.listOpen(params.gatewayInstanceId),
-					sessionKeys: [sessionName, normalized],
-					rootPid: readRecordAgentPid(record)
-				});
-				if (!lease) return record;
-				if (scope?.generation.retired) return;
-				const leasedRecord = withOpenClawLeaseSessionMetadata(record, lease);
-				if (scope) captureGenerationRecord(scope.generation, leasedRecord);
-				return leasedRecord;
-			};
-			return await load();
+			if (scope?.generation.retired) return;
+			const normalized = sessionId.trim();
+			if (normalized && freshSessionKeys.has(normalized)) return;
+			const record = await baseStore.load(sessionId);
+			if (scope?.generation.retired || freshSessionKeys.has(scope?.generation.resource ?? normalized)) return;
+			if (scope && record) captureGenerationRecord(scope.generation, record);
+			if (!record || !params?.leaseStore || !params.gatewayInstanceId) return record;
+			const sessionName = readSessionRecordName(record) || normalized;
+			const lease = selectCurrentSessionLease({
+				leases: await params.leaseStore.listOpen(params.gatewayInstanceId),
+				sessionKeys: [sessionName, normalized],
+				rootPid: readRecordAgentPid(record)
+			});
+			if (!lease) return record;
+			if (scope?.generation.retired) return;
+			const leasedRecord = withOpenClawLeaseSessionMetadata(record, lease);
+			if (scope) captureGenerationRecord(scope.generation, leasedRecord);
+			return leasedRecord;
 		},
 		async save(record) {
 			const scope = acpxOperationScope.getStore();
@@ -1660,7 +1625,7 @@ function createResetAwareSessionStore(baseStore, params) {
 //#region extensions/acpx/src/runtime-process-cleanup.ts
 /** Capture OpenClaw wrapper cleanup ownership before a backend close can yield. */
 async function prepareAcpxProcessCleanup(params) {
-	const { leaseStore, gatewayInstanceId, wrapperRoot, deps } = params;
+	const { leaseStore, gatewayInstanceId, wrapperRoot } = params;
 	const rootPid = readRecordAgentPid(params.record);
 	const rootCommand = params.command ? renderAgentCommand(params.command) : void 0;
 	const identity = readAcpxProcessLeaseIdentity(params.command);
@@ -1684,14 +1649,12 @@ async function prepareAcpxProcessCleanup(params) {
 				rootCommand,
 				expectedLeaseId: lease.leaseId,
 				expectedGatewayInstanceId: lease.gatewayInstanceId,
-				wrapperRoot: lease.wrapperRoot,
-				deps
+				wrapperRoot: lease.wrapperRoot
 			}) : await cleanupOpenClawOwnedAcpxPendingLease({
 				leaseId: lease.leaseId,
 				gatewayInstanceId: lease.gatewayInstanceId,
 				wrapperRoot: lease.wrapperRoot,
-				wrapperPath: lease.wrapperPath,
-				deps
+				wrapperPath: lease.wrapperPath
 			});
 			await leaseStore?.markState(lease.leaseId, result.skippedReason === "process-list-unavailable" || result.skippedReason === "unsupported-platform" || lease.rootPid <= 0 && (result.skippedReason === "ambiguous-root" || result.skippedReason === "unverified-root") ? "open" : result.terminatedPids.length > 0 || result.skippedReason === "missing-root" ? "closed" : "lost");
 			return;
@@ -1702,8 +1665,7 @@ async function prepareAcpxProcessCleanup(params) {
 			rootCommand,
 			...leaseId ? { expectedLeaseId: leaseId } : {},
 			...expectedGatewayInstanceId ? { expectedGatewayInstanceId } : {},
-			wrapperRoot,
-			deps
+			wrapperRoot
 		});
 	};
 }
@@ -1791,11 +1753,11 @@ function readAgentFromSessionKey(sessionKey) {
 	const normalized = sessionKey?.trim();
 	if (!normalized) return;
 	const match = /^agent:(?<agent>[^:]+):/i.exec(normalized);
-	return normalizeAgentName(match?.groups?.agent);
+	return normalizeOptionalLowercaseString(match?.groups?.agent);
 }
 function readAgentFromHandle(handle) {
 	const decoded = decodeAcpxRuntimeHandleState(handle.runtimeSessionName);
-	return normalizeAgentName(decoded?.agent) ?? readAgentFromSessionKey(handle.sessionKey);
+	return normalizeOptionalLowercaseString(decoded?.agent) ?? readAgentFromSessionKey(handle.sessionKey);
 }
 function failUnsupportedCodexAcpModel(rawModel) {
 	throw new AcpRuntimeError("ACP_INVALID_RUNTIME_OPTION", `Codex ACP model "${rawModel}" is not supported. Use openai/<model> or <model>/<reasoning-effort>.`);
@@ -1914,8 +1876,6 @@ var AcpxRuntime$1 = class {
 		this.sessionScope = new AsyncLocalStorage();
 		this.launchLeaseScope = new AsyncLocalStorage();
 		this.legacyBareSessionKeys = new Set(options.openclawLegacyBareSessionKeys);
-		const { openclawProcessCleanup, ...delegateTestOptions } = testOptions ?? {};
-		this.processCleanupDeps = openclawProcessCleanup;
 		this.wrapperRoot = options.openclawWrapperRoot;
 		this.gatewayInstanceId = options.openclawGatewayInstanceId;
 		this.processLeaseStore = options.openclawProcessLeaseStore;
@@ -1933,7 +1893,7 @@ var AcpxRuntime$1 = class {
 		this.scopedAgentRegistry = {
 			resolve: (agentName) => {
 				const launch = this.launchCommandScope.getStore();
-				return launch && launch.agent === normalizeAgentName(agentName) && launch.command ? launch.command : this.agentRegistry.resolve(agentName);
+				return launch && launch.agent === normalizeOptionalLowercaseString(agentName) && launch.command ? launch.command : this.agentRegistry.resolve(agentName);
 			},
 			list: () => this.agentRegistry.list()
 		};
@@ -1977,11 +1937,11 @@ var AcpxRuntime$1 = class {
 				onSpawnFailed: options.processLifecycle?.onSpawnFailed,
 				onExit: options.processLifecycle?.onExit
 			}
-		}, delegateTestOptions);
+		}, testOptions);
 		this.delegate = createDelegate();
 		this.generationRegistry = new AcpxGenerationRegistry(this.sessionStore, this.delegate, createDelegate);
 		this.probe = new AcpxRuntimeProbe({
-			getAgent: () => normalizeAgentName(options.getProbeAgent?.() ?? options.probeAgent) ?? "codex",
+			getAgent: () => normalizeOptionalLowercaseString(options.getProbeAgent?.() ?? options.probeAgent) ?? "codex",
 			createRuntime: createDelegate,
 			assertRunning: () => this.generationRegistry.assertRunning(),
 			runWithLease: (agent, run) => this.runWithLaunchLease({
@@ -2076,7 +2036,7 @@ var AcpxRuntime$1 = class {
 			command: params.command,
 			wrapperRoot: this.wrapperRoot
 		})) return await this.launchCommandScope.run({
-			agent: normalizeAgentName(params.agent) ?? params.agent,
+			agent: normalizeOptionalLowercaseString(params.agent) ?? params.agent,
 			command: params.reusableCommand ?? params.command
 		}, params.run);
 		const reusableIdentity = readAcpxProcessLeaseIdentity(params.reusableCommand);
@@ -2095,15 +2055,14 @@ var AcpxRuntime$1 = class {
 			leasedCommand
 		};
 		const result = await this.launchLeaseScope.run(launch, () => this.launchCommandScope.run({
-			agent: normalizeAgentName(params.agent) ?? params.agent,
+			agent: normalizeOptionalLowercaseString(params.agent) ?? params.agent,
 			command: launch.resolvedCommand
 		}, params.run));
 		if (params.finalizeCompletedProbe) await cleanupOpenClawOwnedAcpxPendingLease({
 			leaseId,
 			gatewayInstanceId: launch.gatewayInstanceId,
 			wrapperRoot: launch.wrapperRoot,
-			wrapperPath: extractGeneratedWrapperPath(leasedCommand),
-			deps: this.processCleanupDeps
+			wrapperPath: extractGeneratedWrapperPath(leasedCommand)
 		});
 		return result;
 	}
@@ -2209,7 +2168,7 @@ var AcpxRuntime$1 = class {
 			...logicalInput,
 			sessionKey: resolveAcpxSessionResource(logicalInput)
 		};
-		const isCodexAcp = normalizeAgentName(input.agent) === CODEX_ACP_AGENT_ID && isCodexAcpCommand(command);
+		const isCodexAcp = normalizeOptionalLowercaseString(input.agent) === CODEX_ACP_AGENT_ID && isCodexAcpCommand(command);
 		const dropInheritedCodexMax = isCodexAcp && input.thinking === "max" && input.thinkingExplicit === false;
 		const effectiveInput = dropInheritedCodexMax ? { ...input } : input;
 		if (dropInheritedCodexMax) delete effectiveInput.thinking;
@@ -2452,8 +2411,7 @@ var AcpxRuntime$1 = class {
 					sessionKey: resolveAcpxSessionResource(input.handle),
 					gatewayInstanceId: this.gatewayInstanceId,
 					wrapperRoot: this.wrapperRoot,
-					leaseStore: this.processLeaseStore,
-					deps: this.processCleanupDeps
+					leaseStore: this.processLeaseStore
 				}).catch((error) => async () => {
 					throw error;
 				});
@@ -2476,10 +2434,6 @@ var AcpxRuntime$1 = class {
 };
 //#endregion
 //#region extensions/acpx/src/service.ts
-/**
-* ACPX plugin service lifecycle. It resolves config, prepares isolated adapter
-* wrappers, registers the ACP backend, and manages startup/cleanup probes.
-*/
 const ENABLE_STARTUP_PROBE_ENV = "OPENCLAW_ACPX_RUNTIME_STARTUP_PROBE";
 const SKIP_RUNTIME_PROBE_ENV = "OPENCLAW_SKIP_ACPX_RUNTIME_PROBE";
 const MAX_ACPX_TOKIO_WORKER_THREADS = 8;
@@ -2531,28 +2485,11 @@ async function measureAcpxStartup(ctx, name, run) {
 function shouldProbeRuntimeAtStartup(env = process.env) {
 	return env[ENABLE_STARTUP_PROBE_ENV] !== "0" && env[SKIP_RUNTIME_PROBE_ENV] !== "1";
 }
-async function withStartupProbeTimeout(params) {
-	let timeout;
-	const timeoutMs = resolveAcpxTimerTimeoutMs(params.timeoutSeconds) ?? 1;
-	try {
-		return await Promise.race([params.promise, new Promise((_, reject) => {
-			timeout = setTimeout(() => {
-				reject(/* @__PURE__ */ new Error(`embedded acpx runtime backend startup probe timed out after ${params.timeoutSeconds}s`));
-			}, timeoutMs);
-			timeout.unref?.();
-		})]);
-	} finally {
-		if (timeout) clearTimeout(timeout);
-	}
-}
-function openGatewayInstanceStateStore(openKeyedStore) {
-	return openKeyedStore({
+async function resolveGatewayInstanceId(openKeyedStore) {
+	const store = 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();
@@ -2563,58 +2500,41 @@ async function resolveGatewayInstanceId(openKeyedStore) {
 	return next;
 }
 async function reapOpenAcpxProcessLeases(params) {
-	const assertCurrent = () => {
-		params.assertCurrent?.();
-		params.deps?.assertCurrent?.();
-	};
-	const deps = {
-		...params.deps,
-		assertCurrent
-	};
+	const { assertCurrent } = params;
 	const leases = await params.leaseStore.listOpen(params.gatewayInstanceId);
 	const inspectedPids = [];
 	const terminatedPids = [];
 	const legacyWrapperRoots = /* @__PURE__ */ new Set();
 	for (const lease of leases) {
-		if (lease.rootPid <= 0) {
-			legacyWrapperRoots.add(lease.wrapperRoot);
-			assertCurrent();
-			await params.leaseStore.markState(lease.leaseId, "closing");
-			assertCurrent();
-			const result = await cleanupOpenClawOwnedAcpxPendingLease({
-				leaseId: lease.leaseId,
-				gatewayInstanceId: lease.gatewayInstanceId,
-				wrapperRoot: lease.wrapperRoot,
-				wrapperPath: lease.wrapperPath,
-				deps
-			});
-			inspectedPids.push(...result.inspectedPids);
-			terminatedPids.push(...result.terminatedPids);
-			const retryableEvidenceFailure = result.skippedReason === "ambiguous-root" || result.skippedReason === "process-list-unavailable" || result.skippedReason === "unsupported-platform" || result.skippedReason === "unverified-root" || lease.sessionKey === "openclaw:acpx:probe" && result.skippedReason === "missing-root";
-			assertCurrent();
-			await params.leaseStore.markState(lease.leaseId, retryableEvidenceFailure ? "open" : result.terminatedPids.length > 0 ? "closed" : "lost");
-			continue;
-		}
-		assertCurrent();
+		const pending = lease.rootPid <= 0;
+		if (pending) legacyWrapperRoots.add(lease.wrapperRoot);
+		assertCurrent?.();
 		await params.leaseStore.markState(lease.leaseId, "closing");
-		assertCurrent();
-		const result = await cleanupOpenClawOwnedAcpxProcessTree({
+		assertCurrent?.();
+		const result = pending ? await cleanupOpenClawOwnedAcpxPendingLease({
+			leaseId: lease.leaseId,
+			gatewayInstanceId: lease.gatewayInstanceId,
+			wrapperRoot: lease.wrapperRoot,
+			wrapperPath: lease.wrapperPath,
+			assertCurrent
+		}) : await cleanupOpenClawOwnedAcpxProcessTree({
 			rootPid: lease.rootPid,
 			expectedLeaseId: lease.leaseId,
 			expectedGatewayInstanceId: lease.gatewayInstanceId,
 			wrapperRoot: lease.wrapperRoot,
-			deps
+			assertCurrent
 		});
 		inspectedPids.push(...result.inspectedPids);
 		terminatedPids.push(...result.terminatedPids);
-		assertCurrent();
-		await params.leaseStore.markState(lease.leaseId, result.skippedReason === "process-list-unavailable" || result.skippedReason === "unsupported-platform" ? "open" : result.terminatedPids.length > 0 ? "closed" : "lost");
+		const retryableEvidenceFailure = result.skippedReason === "process-list-unavailable" || result.skippedReason === "unsupported-platform" || pending && (result.skippedReason === "ambiguous-root" || result.skippedReason === "unverified-root" || lease.sessionKey === "openclaw:acpx:probe" && result.skippedReason === "missing-root");
+		assertCurrent?.();
+		await params.leaseStore.markState(lease.leaseId, retryableEvidenceFailure ? "open" : result.terminatedPids.length > 0 ? "closed" : "lost");
 	}
 	for (const wrapperRoot of legacyWrapperRoots) {
-		assertCurrent();
+		assertCurrent?.();
 		const legacyResult = await reapStaleOpenClawOwnedAcpxOrphans({
 			wrapperRoot,
-			deps
+			assertCurrent
 		});
 		inspectedPids.push(...legacyResult.inspectedPids);
 		terminatedPids.push(...legacyResult.terminatedPids);
@@ -2624,7 +2544,6 @@ async function reapOpenAcpxProcessLeases(params) {
 		terminatedPids
 	};
 }
-/** Create the ACPX plugin service that owns runtime registration and cleanup. */
 function createAcpxRuntimeService(params) {
 	let runtime = null;
 	let recoverProcesses;
@@ -2659,12 +2578,22 @@ function createAcpxRuntimeService(params) {
 			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
+				workspaceDir: ctx.workspaceDir,
+				stateDir: ctx.stateDir
 			}));
+			const adoption = await measureAcpxStartup(ctx, "state.adopt", () => adoptAcpxStateDirectory({
+				rawConfig: params.pluginConfig,
+				workspaceDir: ctx.workspaceDir,
+				stateDir: basePluginConfig.stateDir,
+				openKeyedStore,
+				assertCurrent: params.assertCurrent
+			}));
+			basePluginConfig.stateDir = adoption.stateDir;
+			for (const change of adoption.changes) ctx.logger.info(change);
+			for (const warning of adoption.warnings) ctx.logger.warn(warning);
 			const pluginConfig = await measureAcpxStartup(ctx, "config.prepare-codex-auth", () => prepareAcpxCodexAuthConfig({
 				pluginConfig: basePluginConfig,
-				stateDir: ctx.stateDir,
-				logger: ctx.logger
+				stateDir: ctx.stateDir
 			}));
 			const wrapperRoot = path.join(ctx.stateDir, "acpx");
 			await measureAcpxStartup(ctx, "filesystem.prepare", async () => {
@@ -2676,7 +2605,6 @@ function createAcpxRuntimeService(params) {
 			recoverProcesses = (assertCurrent) => reapOpenAcpxProcessLeases({
 				gatewayInstanceId,
 				leaseStore: processLeaseStore,
-				deps: params.processCleanupDeps,
 				assertCurrent
 			});
 			if (params.startupPurpose !== "inspection") await promote(ctx);
@@ -2705,10 +2633,10 @@ function createAcpxRuntimeService(params) {
 			lifecycleRevision += 1;
 			const currentRevision = lifecycleRevision;
 			try {
-				const doctorReport = await measureAcpxStartup(ctx, "probe.availability", () => withStartupProbeTimeout({
-					promise: startedRuntime.doctor(),
-					timeoutSeconds: pluginConfig.timeoutSeconds ?? 120
-				}));
+				const timeoutSeconds = pluginConfig.timeoutSeconds ?? 120;
+				const doctorReport = await measureAcpxStartup(ctx, "probe.availability", () => raceWithTimeout(startedRuntime.doctor(), resolveAcpxTimerTimeoutMs(timeoutSeconds) ?? 1, () => {
+					throw new Error(`embedded acpx runtime backend startup probe timed out after ${timeoutSeconds}s`);
+				}, { ref: false }));
 				if (currentRevision !== lifecycleRevision) return;
 				if (doctorReport.ok) {
 					ctx.startupTrace?.detail?.("probe.result", [["healthyCount", 1]]);