@openclaw/acpx 2026.9.8 → 2026.10.1-beta.1

package/dist/.setup/{config-Blz15uwJ.mjs → config-76krYh6C.mjs}

@@ -1,4 +1,3 @@
-import { o as splitCommandParts } from "./command-line-B72femaL.mjs";
 import { createRequire } from "node:module";
 import { z } from "zod";
 import fs from "node:fs";
@@ -6,7 +5,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { formatPluginConfigIssue } from "openclaw/plugin-sdk/extension-shared";
 import { resolveStateDir } from "openclaw/plugin-sdk/state-paths";
-import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/acpx/src/config-schema.ts
 /**
 * ACPX plugin configuration schema and public config types. Runtime setup uses
@@ -57,6 +56,135 @@ const AcpxPluginConfigSchema = z.strictObject({
 	})).optional()
 });
 //#endregion
+//#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;
+}
+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) {
+	const [executable = "", ...args] = command ? unwrapEnvCommand(splitCommandParts(command)) : [];
+	const runtime = basename(executable) !== "openclaw" && (executable === process.execPath || /^(?:node|bun)(?:\.exe)?$/i.test(basename(executable)));
+	const scriptName = basename(runtime ? args[0] ?? "" : executable);
+	return (runtime ? /^openclaw(?:\.[cm]?js)?$/i.test(scriptName) : scriptName === "openclaw") && args[runtime ? 1 : 0] === "acp";
+}
+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 = normalizeOptionalLowercaseString(params.agentName);
+	if (!normalizedAgentName) return;
+	return splitCommandParts(params.agentRegistry.resolve(normalizedAgentName));
+}
+//#endregion
 //#region extensions/acpx/src/config.ts
 const MANAGED_MCP_BRIDGES = [[
 	"pluginToolsMcpBridge",
@@ -196,4 +324,4 @@ function resolveAcpxPluginConfig(params) {
 	};
 }
 //#endregion
-export { ACPX_NATIVE_AGENT_IDS as a, toAcpMcpServers as i, resolveAcpxPluginRoot as n, AcpxNativeAgentsSchema as o, resolveOpenClawRoot as r, resolveAcpxPluginConfig as t };
+export { isClaudeAcpCommand as a, renderAgentCommand as c, CODEX_ACP_BIN as d, CODEX_ACP_PACKAGE as f, AcpxNativeAgentsSchema as g, ACPX_NATIVE_AGENT_IDS as h, toAcpMcpServers as i, resolveAgentCommand as l, OPENCLAW_CODEX_CONFIG_ARG as m, resolveAcpxPluginRoot as n, isCodexAcpCommand as o, LEGACY_CODEX_ACP_PACKAGE as p, resolveOpenClawRoot as r, isOpenClawBridgeCommand as s, resolveAcpxPluginConfig as t, splitCommandParts as u };

package/dist/.setup/{register.runtime-DByczkH_.mjs → register.runtime-C0nVOTzT.mjs}

@@ -53,7 +53,7 @@ function createLazyAcpRuntimeProxy(resolveRuntime) {
 * immediately, then imports the heavier service only when a session needs it.
 */
 const ACPX_BACKEND_ID = "acpx";
-const loadServiceModule = createLazyRuntimeModule(() => import("./service-D5hGWl5U.mjs"));
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-BXgGdE56.mjs"));
 function unregisterOwnedRuntime(runtime) {
 	if (runtime && getAcpRuntimeBackend(ACPX_BACKEND_ID)?.runtime === runtime) unregisterAcpRuntimeBackend(ACPX_BACKEND_ID);
 }

package/dist/.setup/{process-lease-n38HFGdp.mjs → runtime-doctor-migrations-hxP-CXX7.mjs}

@@ -1,7 +1,4 @@
-import { i as renderAgentCommand, o as splitCommandParts } from "./command-line-B72femaL.mjs";
 import "node:module";
-import { asFiniteNumber, asOptionalObjectRecord, asRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createHash } from "node:crypto";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -30,12 +27,12 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 //#endregion
 //#region packages/normalization-core/src/record-coerce.ts
 /** Type guard for non-array object records at browser-safe boundaries. */
-function isRecord$1(value) {
+function isRecord(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 /** Returns a non-array record or null. */
 function asNullableRecord(value) {
-	return isRecord$1(value) ? value : null;
+	return isRecord(value) ? value : null;
 }
 //#endregion
 //#region src/config/channel-config-normalization.ts
@@ -128,6 +125,12 @@ function createLegacyWebhookListenerDoctorContract(params) {
 	};
 	const prefix = `channels.${params.channelKey}`;
 	return {
+		historicalWebhookListener: {
+			channelId: params.channelKey,
+			port: params.defaultPort,
+			preserveAuthoredActivation: params.preserveAuthoredActivation,
+			...params.defaultHost === void 0 ? {} : { host: params.defaultHost }
+		},
 		legacyConfigRules: [{
 			path: ["channels", params.channelKey],
 			message: `${prefix} webhook listeners moved to Gateway routes. Run "openclaw doctor --fix" to preserve explicitly configured listener settings as legacyWebhook.`,
@@ -185,127 +188,4 @@ var runtime_doctor_migrations_exports = /* @__PURE__ */ __exportAll({ createLega
 import * as import_openclaw_plugin_sdk_runtime_doctor_migrations from "openclaw/plugin-sdk/runtime-doctor-migrations";
 __reExport(runtime_doctor_migrations_exports, import_openclaw_plugin_sdk_runtime_doctor_migrations);
 //#endregion
-//#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) {
-	const record = asOptionalObjectRecord(value);
-	const instanceId = normalizeOptionalString(record?.instanceId);
-	if (!instanceId) return;
-	return {
-		instanceId,
-		createdAt: Math.trunc(asFiniteNumber(record?.createdAt) ?? 0)
-	};
-}
-//#endregion
-//#region extensions/acpx/src/process-lease.ts
-const OPENCLAW_ACPX_LEASE_ID_ARG = "--openclaw-acpx-lease-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";
-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) {
-	const record = asOptionalObjectRecord(value);
-	if (!record || 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 = asRecord(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"
-	});
-}
-function createAcpxProcessLeaseStore(params) {
-	let updateQueue = Promise.resolve();
-	async function update(mutator) {
-		const run = updateQueue.then(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 { __exportAll as _, hashAcpxProcessCommand as a, openAcpxProcessLeaseStateStore as c, ACPX_GATEWAY_INSTANCE_KEY as d, ACPX_GATEWAY_INSTANCE_NAMESPACE as f, runtime_doctor_migrations_exports as g, 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 };
+export { __exportAll as n, runtime_doctor_migrations_exports as t };

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

@@ -1,9 +1,7 @@
-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-n38HFGdp.mjs";
-import { i as toAcpMcpServers, n as resolveAcpxPluginRoot, r as resolveOpenClawRoot, t as resolveAcpxPluginConfig } from "./config-Blz15uwJ.mjs";
-import { a as resolveAgentCommand, c as CODEX_ACP_PACKAGE, i as renderAgentCommand, l as LEGACY_CODEX_ACP_PACKAGE, n as isCodexAcpCommand, o as splitCommandParts, r as isOpenClawBridgeCommand, s as CODEX_ACP_BIN, t as isClaudeAcpCommand, u as OPENCLAW_CODEX_CONFIG_ARG } from "./command-line-B72femaL.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-B-4yPr-j.mjs";
-import { adoptAcpxStateDirectory } from "./session-owner-migration-DsGrYq7Y.mjs";
+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";
@@ -11,13 +9,14 @@ import fs from "node:fs";
 import path, { resolve } from "node:path";
 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 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 as setTimeout$1 } from "node:timers/promises";
+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";
@@ -203,7 +202,6 @@ 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");
 }
 function renderIsolatedCodexConfig(params) {
@@ -1132,23 +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 ?? setTimeout$1;
+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;
@@ -1161,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: [],
@@ -1200,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"
@@ -1217,7 +1213,7 @@ async function cleanupOpenClawOwnedAcpxPendingLease(params) {
 	};
 	let processes;
 	try {
-		processes = await (params.deps?.listProcesses ?? listPlatformProcesses)();
+		processes = await listPlatformProcesses();
 	} catch {
 		return {
 			inspectedPids: [],
@@ -1244,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: [],
@@ -1270,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
@@ -1629,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);
@@ -1653,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;
@@ -1671,8 +1665,7 @@ async function prepareAcpxProcessCleanup(params) {
 			rootCommand,
 			...leaseId ? { expectedLeaseId: leaseId } : {},
 			...expectedGatewayInstanceId ? { expectedGatewayInstanceId } : {},
-			wrapperRoot,
-			deps
+			wrapperRoot
 		});
 	};
 }
@@ -1883,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;
@@ -1946,7 +1937,7 @@ 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({
@@ -2071,8 +2062,7 @@ var AcpxRuntime$1 = class {
 			leaseId,
 			gatewayInstanceId: launch.gatewayInstanceId,
 			wrapperRoot: launch.wrapperRoot,
-			wrapperPath: extractGeneratedWrapperPath(leasedCommand),
-			deps: this.processCleanupDeps
+			wrapperPath: extractGeneratedWrapperPath(leasedCommand)
 		});
 		return result;
 	}
@@ -2421,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;
 				});
@@ -2496,20 +2485,6 @@ 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);
-	}
-}
 async function resolveGatewayInstanceId(openKeyedStore) {
 	const store = openKeyedStore({
 		namespace: ACPX_GATEWAY_INSTANCE_NAMESPACE,
@@ -2525,14 +2500,7 @@ 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 = [];
@@ -2540,33 +2508,33 @@ async function reapOpenAcpxProcessLeases(params) {
 	for (const lease of leases) {
 		const pending = lease.rootPid <= 0;
 		if (pending) legacyWrapperRoots.add(lease.wrapperRoot);
-		assertCurrent();
+		assertCurrent?.();
 		await params.leaseStore.markState(lease.leaseId, "closing");
-		assertCurrent();
+		assertCurrent?.();
 		const result = pending ? await cleanupOpenClawOwnedAcpxPendingLease({
 			leaseId: lease.leaseId,
 			gatewayInstanceId: lease.gatewayInstanceId,
 			wrapperRoot: lease.wrapperRoot,
 			wrapperPath: lease.wrapperPath,
-			deps
+			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);
 		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();
+		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);
@@ -2637,7 +2605,6 @@ function createAcpxRuntimeService(params) {
 			recoverProcesses = (assertCurrent) => reapOpenAcpxProcessLeases({
 				gatewayInstanceId,
 				leaseStore: processLeaseStore,
-				deps: params.processCleanupDeps,
 				assertCurrent
 			});
 			if (params.startupPurpose !== "inspection") await promote(ctx);
@@ -2666,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]]);