@openclaw/acpx 2026.10.10 → 2026.11.5-beta.1

package/dist/.setup/{service-Dr8U5n0S.mjs → service-DmgP1gPb.mjs}

@@ -1,12 +1,13 @@
-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-CE-ej7LM.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-Cplh34lQ.mjs";
 import { AcpRuntimeError } from "../runtime-api.js";
-import { t as resolveAcpxSessionResource } from "./session-resource-Cv-RAA6y.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-WmiXoSmh.mjs";
+import { t as resolveAcpxSessionResource } from "./session-resource-D_tXKvcv.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-CQA7L68K.mjs";
 import { createRequire } from "node:module";
-import { finiteSecondsToTimerSafeMilliseconds, parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
+import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs";
 import path from "node:path";
-import { asOptionalObjectRecord, isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { isPidAlive, runExec } from "openclaw/plugin-sdk/process-runtime";
+import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import os, { availableParallelism } from "node:os";
 import { randomUUID } from "node:crypto";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -17,7 +18,6 @@ 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";
@@ -441,9 +441,7 @@ const parentWatcher =
           return;
         }
         orphanCleanupStarted = true;
-        if (parentWatcher) {
-          clearInterval(parentWatcher);
-        }
+        clearInterval(parentWatcher);
         killChildTree("SIGTERM");
         // Keep the wrapper alive long enough for stubborn adapters to receive
         // a forced fallback signal after SIGTERM.
@@ -479,9 +477,7 @@ child.on("exit", (code, signal) => {
 
 child.on("close", () => {
   finishStderrLog();
-  if (parentWatcher) {
-    clearInterval(parentWatcher);
-  }
+  clearInterval(parentWatcher);
   childClosed = true;
   finishWrapper();
 });
@@ -490,121 +486,6 @@ main();
 `;
 }
 // extensions/acpx/src/codex-trust-config.ts
-function stripTomlComment(line) {
-	let quote = null;
-	let escaping = false;
-	for (let index = 0; index < line.length; index += 1) {
-		const ch = line[index];
-		if (escaping) {
-			escaping = false;
-			continue;
-		}
-		if (quote === "\"" && ch === "\\") {
-			escaping = true;
-			continue;
-		}
-		if (quote) {
-			if (ch === quote) quote = null;
-			continue;
-		}
-		if (ch === "'" || ch === "\"") {
-			quote = ch;
-			continue;
-		}
-		if (ch === "#") return line.slice(0, index);
-	}
-	return line;
-}
-function parseTomlString(value) {
-	const trimmed = value.trim();
-	if (trimmed.startsWith("\"") && trimmed.endsWith("\"")) try {
-		return JSON.parse(trimmed);
-	} catch {
-		return;
-	}
-	if (trimmed.startsWith("'") && trimmed.endsWith("'")) return trimmed.slice(1, -1);
-}
-function parseTomlDottedKey(value) {
-	const parts = [];
-	let current = "";
-	let quote = null;
-	let escaping = false;
-	for (const ch of value.trim()) {
-		if (escaping) {
-			current += ch;
-			escaping = false;
-			continue;
-		}
-		if (quote === "\"" && ch === "\\") {
-			current += ch;
-			escaping = true;
-			continue;
-		}
-		if (quote) {
-			current += ch;
-			if (ch === quote) quote = null;
-			continue;
-		}
-		if (ch === "'" || ch === "\"") {
-			quote = ch;
-			current += ch;
-			continue;
-		}
-		if (ch === ".") {
-			parts.push(current.trim());
-			current = "";
-			continue;
-		}
-		current += ch;
-	}
-	if (current.trim()) parts.push(current.trim());
-	return parts.map((part) => parseTomlString(part) ?? part);
-}
-function parseProjectHeader(line) {
-	const parts = parseTableHeader(line);
-	return parts?.length === 2 && parts[0] === "projects" ? parts[1] : void 0;
-}
-function parseTrustedInlineProjectEntries(value) {
-	const trusted = [];
-	for (const match of value.matchAll(/(?<key>"(?:\\.|[^"\\])*"|'[^']*'|[A-Za-z0-9_\-/.~:]+)\s*=\s*\{(?<body>[^{}]*(?:\{[^{}]*\}[^{}]*)*)\}/g)) {
-		const key = match.groups?.key;
-		const body = match.groups?.body;
-		if (!key || !body || !/\btrust_level\s*=\s*["']trusted["']/.test(body)) continue;
-		const projectPath = parseTomlString(key) ?? key.trim();
-		if (projectPath) trusted.push(projectPath);
-	}
-	return trusted;
-}
-function extractTrustedCodexProjectPaths(configToml) {
-	const trusted = /* @__PURE__ */ new Set();
-	let currentProjectPath;
-	let inProjectsTable = false;
-	for (const rawLine of configToml.split(/\r?\n/)) {
-		const line = stripTomlComment(rawLine).trim();
-		if (!line) continue;
-		if (line.startsWith("[")) {
-			currentProjectPath = parseProjectHeader(line);
-			inProjectsTable = line === "[projects]";
-			continue;
-		}
-		if (currentProjectPath && /^trust_level\s*=\s*["']trusted["']\s*$/.test(line)) {
-			trusted.add(currentProjectPath);
-			continue;
-		}
-		const assignment = /^(?<key>"(?:\\.|[^"\\])*"|'[^']*'|[A-Za-z0-9_\-/.~:]+)\s*=\s*(?<value>.+)$/.exec(line);
-		const rawKey = assignment?.groups?.key;
-		const rawValue = assignment?.groups?.value;
-		if (!rawKey || rawValue === void 0) continue;
-		const key = parseTomlString(rawKey) ?? rawKey;
-		const value = rawValue.trim();
-		if (inProjectsTable && /^\{.*\}$/.test(value)) {
-			if (/\btrust_level\s*=\s*["']trusted["']/.test(value) && key) trusted.add(key);
-			continue;
-		}
-		if (key === "projects" || inProjectsTable) for (const projectPath of parseTrustedInlineProjectEntries(value)) trusted.add(projectPath);
-	}
-	return Array.from(trusted);
-}
 const INHERITED_TOP_LEVEL_CODEX_CONFIG_KEYS = /* @__PURE__ */ new Set([
 	"model",
 	"model_provider",
@@ -622,61 +503,30 @@ const INHERITED_MODEL_PROVIDER_CONFIG_KEYS = /* @__PURE__ */ new Set([
 	"stream_max_retries",
 	"stream_idle_timeout_ms"
 ]);
-function parseTableHeader(line) {
-	const trimmed = line.trim();
-	if (!trimmed.startsWith("[") || !trimmed.endsWith("]") || trimmed.startsWith("[[")) return;
-	return parseTomlDottedKey(trimmed.slice(1, -1));
-}
-function isInheritedModelProviderTable(parts) {
-	return parts?.[0] === "model_providers" && parts.length === 2;
-}
-function parseTopLevelAssignmentKey(line) {
-	return /^(?<key>[A-Za-z0-9_-]+)\s*=\s*(?<value>.+)$/.exec(line)?.groups?.key;
-}
-function extractInheritedCodexRuntimeConfig(configToml) {
-	const inheritedLines = [];
-	let inAnyTable = false;
-	let inInheritedTable = false;
-	let pendingInheritedTableHeader = "";
-	function flushInheritedTableHeader() {
-		if (!pendingInheritedTableHeader) return;
-		if (inheritedLines.length > 0 && inheritedLines[inheritedLines.length - 1] !== "") inheritedLines.push("");
-		inheritedLines.push(pendingInheritedTableHeader);
-		pendingInheritedTableHeader = "";
-	}
-	for (const rawLine of configToml.split(/\r?\n/)) {
-		const trimmedLine = rawLine.trim();
-		const semanticLine = stripTomlComment(rawLine).trim();
-		if (trimmedLine.startsWith("[")) {
-			const tableParts = parseTableHeader(trimmedLine);
-			inAnyTable = true;
-			inInheritedTable = isInheritedModelProviderTable(tableParts);
-			if (inInheritedTable) pendingInheritedTableHeader = rawLine.trimEnd();
-			else pendingInheritedTableHeader = "";
-			continue;
-		}
-		if (inInheritedTable) {
-			if (!semanticLine) continue;
-			const key = parseTopLevelAssignmentKey(semanticLine);
-			if (!key || !INHERITED_MODEL_PROVIDER_CONFIG_KEYS.has(key)) continue;
-			flushInheritedTableHeader();
-			inheritedLines.push(rawLine.trimEnd());
-			continue;
-		}
-		if (inAnyTable) continue;
-		const key = parseTopLevelAssignmentKey(semanticLine);
-		if (!key) continue;
-		if (!INHERITED_TOP_LEVEL_CODEX_CONFIG_KEYS.has(key)) continue;
-		inheritedLines.push(rawLine.trimEnd());
-	}
-	return inheritedLines.join("\n");
-}
 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));
+	let source = {};
+	if (params.sourceConfigToml) try {
+		source = parse(params.sourceConfigToml, { integersAsBigInt: true });
+	} catch {
+		throw new Error("Codex config.toml must be valid TOML before starting an ACP session.");
+	}
+	const providers = /* @__PURE__ */ new Map();
+	if (isRecord(source.model_providers)) for (const [name, provider] of Object.entries(source.model_providers)) {
+		if (!isRecord(provider)) continue;
+		const config = Object.fromEntries(Object.entries(provider).filter(([key]) => INHERITED_MODEL_PROVIDER_CONFIG_KEYS.has(key)));
+		if (Object.keys(config).length) providers.set(name, config);
+	}
+	const inherited = {
+		...Object.fromEntries(Object.entries(source).filter(([key]) => INHERITED_TOP_LEVEL_CODEX_CONFIG_KEYS.has(key))),
+		...providers.size ? { model_providers: Object.fromEntries(providers) } : {},
+		...params.mcpServers ? { mcp_servers: params.mcpServers } : {}
+	};
+	const trustedProjects = isRecord(source.projects) ? Object.entries(source.projects).filter(([, project]) => isRecord(project) && project.trust_level === "trusted").map(([projectPath]) => projectPath) : [];
+	const projectPaths = Array.from(new Set([...params.projectPaths, ...trustedProjects].map((projectPath) => projectPath.trim()).filter(Boolean).map((projectPath) => path.resolve(projectPath)))).toSorted((left, right) => left.localeCompare(right));
 	return [
 		"# Generated by OpenClaw for Codex ACP sessions.",
-		params.sourceConfigToml ? extractInheritedCodexRuntimeConfig(params.sourceConfigToml) : "",
-		...normalized.flatMap((projectPath) => [
+		stringify(inherited, { numbersAsFloat: true }).trimEnd(),
+		...projectPaths.flatMap((projectPath) => [
 			"",
 			`[projects.${JSON.stringify(projectPath)}]`,
 			"trust_level = \"trusted\""
@@ -844,17 +694,15 @@ async function readSourceCodexConfig(codexHome) {
 }
 async function prepareIsolatedCodexHome(params) {
 	const sourceConfig = await readSourceCodexConfig(process.env.CODEX_HOME || path.join(os.homedir(), ".codex"));
-	const trustedProjectPaths = [...sourceConfig ? extractTrustedCodexProjectPaths(sourceConfig) : [], params.workspaceDir];
 	const codexHome = path.join(params.baseDir, "codex-home");
 	await fs$1.mkdir(codexHome, { recursive: true });
 	await fs$1.writeFile(path.join(codexHome, "config.toml"), renderIsolatedCodexConfig({
 		sourceConfigToml: sourceConfig,
-		projectPaths: trustedProjectPaths
+		projectPaths: [params.workspaceDir],
+		mcpServers: isRecord(params.migratedConfig?.mcp_servers) ? params.migratedConfig.mcp_servers : void 0
 	}), "utf8");
-	return codexHome;
 }
 async function writeAdapterWrapper(baseDir, fileName, script) {
-	await fs$1.mkdir(baseDir, { recursive: true });
 	const wrapperPath = path.join(baseDir, fileName);
 	await fs$1.writeFile(wrapperPath, script, { encoding: "utf8" });
 	try {
@@ -966,13 +814,6 @@ function resolveCodexAdapterLaunch(configuredCommand) {
 	if (!maintainedAdapterArgs) return;
 	return { args: maintainedAdapterArgs };
 }
-async function persistMigratedCodexMcpConfig(params) {
-	const mcpServers = params.migratedConfig?.mcp_servers;
-	if (!isRecord(mcpServers)) return;
-	const configPath = path.join(params.codexHome, "config.toml");
-	const merged = mergeConfigRecords(parse(await fs$1.readFile(configPath, "utf8")), { mcp_servers: mcpServers });
-	await fs$1.writeFile(configPath, stringify(merged), "utf8");
-}
 function buildClaudeAcpWrapperCommand(wrapperPath, configuredCommand) {
 	const configuredAdapterArgs = extractConfiguredAdapterArgs({
 		configuredCommand,
@@ -988,17 +829,15 @@ async function prepareAcpxCodexAuthConfig(params) {
 	const configuredCodexCommand = params.pluginConfig.agents.codex;
 	const configuredClaudeCommand = params.pluginConfig.agents.claude;
 	const codexLaunch = resolveCodexAdapterLaunch(configuredCodexCommand);
-	await persistMigratedCodexMcpConfig({
-		codexHome: await prepareIsolatedCodexHome({
-			baseDir: codexBaseDir,
-			workspaceDir: params.pluginConfig.cwd
-		}),
+	await prepareIsolatedCodexHome({
+		baseDir: codexBaseDir,
+		workspaceDir: params.pluginConfig.cwd,
 		migratedConfig: codexLaunch?.migratedConfig
 	});
-	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));
+	const codexBinPath = await resolveInstalledAcpPackageBinPath(CODEX_ACP_PACKAGE, CODEX_ACP_BIN);
+	const claudeBinPath = await resolveInstalledAcpPackageBinPath(CLAUDE_ACP_PACKAGE, CLAUDE_ACP_BIN);
+	const wrapperPath = await writeAdapterWrapper(codexBaseDir, "codex-acp-wrapper.mjs", buildCodexAcpWrapperScript(codexBinPath));
+	const claudeWrapperPath = await writeAdapterWrapper(codexBaseDir, "claude-agent-acp-wrapper.mjs", buildClaudeAcpWrapperScript(claudeBinPath));
 	return {
 		...params.pluginConfig,
 		agents: {
@@ -1124,12 +963,16 @@ function parseProcessList(stdout) {
 }
 async function listPlatformProcesses() {
 	if (process.platform === "win32") return [];
-	const { stdout } = await runExec("ps", ["-axo", "pid=,ppid=,command="], {
-		logOutput: false,
-		maxBuffer: 8388608,
-		timeoutMs: ACPX_PROCESS_LIST_TIMEOUT_MS
-	});
-	return parseProcessList(stdout);
+	try {
+		const { stdout } = await runExec("ps", ["-axo", "pid=,ppid=,command="], {
+			logOutput: false,
+			maxBuffer: 8388608,
+			timeoutMs: ACPX_PROCESS_LIST_TIMEOUT_MS
+		});
+		return parseProcessList(stdout);
+	} catch {
+		return;
+	}
 }
 function collectProcessTree(processes, rootPid) {
 	const childrenByParent = /* @__PURE__ */ new Map();
@@ -1138,7 +981,7 @@ function collectProcessTree(processes, rootPid) {
 		children.push(processInfo);
 		childrenByParent.set(processInfo.ppid, children);
 	}
-	const root = new Map(processes.map((processInfo) => [processInfo.pid, processInfo])).get(rootPid);
+	const root = processes.find((processInfo) => processInfo.pid === rootPid);
 	const collected = [];
 	if (root) collected.push(root);
 	const queue = [...childrenByParent.get(rootPid) ?? []];
@@ -1176,28 +1019,20 @@ async function terminatePids(pids, assertCurrent) {
 async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 	const rootPid = params.rootPid;
 	if (!rootPid || rootPid <= 0 || rootPid === process.pid) return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "missing-root"
 	};
 	if (process.platform === "win32") return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
 	};
-	let processes;
-	try {
-		processes = await listPlatformProcesses();
-	} catch {
-		return {
-			inspectedPids: [],
-			terminatedPids: [],
-			skippedReason: "process-list-unavailable"
-		};
-	}
+	const processes = await listPlatformProcesses();
+	if (!processes) return {
+		terminatedPids: [],
+		skippedReason: "process-list-unavailable"
+	};
 	const listedTree = collectProcessTree(processes, rootPid);
 	if (listedTree.length === 0) return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unverified-root"
 	};
@@ -1212,85 +1047,56 @@ async function cleanupOpenClawOwnedAcpxProcessTree(params) {
 		expectedLeaseId: params.expectedLeaseId,
 		expectedGatewayInstanceId: params.expectedGatewayInstanceId
 	})) return {
-		inspectedPids: listedTree.map((processInfo) => processInfo.pid),
 		terminatedPids: [],
 		skippedReason: "not-openclaw-owned"
 	};
-	const pids = uniquePids(listedTree.toReversed());
-	return {
-		inspectedPids: uniquePids(listedTree),
-		terminatedPids: await terminatePids(pids, params.assertCurrent)
-	};
+	return { terminatedPids: await terminatePids(uniquePids(listedTree.toReversed()), params.assertCurrent) };
 }
 /** Recover a pending lease by matching its exact live wrapper identity. */
 async function cleanupOpenClawOwnedAcpxPendingLease(params) {
 	if (process.platform === "win32") return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
 	};
 	if (!params.wrapperPath || !wrapperPathBelongsToRoot(params.wrapperPath, params.wrapperRoot)) return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unverified-root"
 	};
-	let processes;
-	try {
-		processes = await listPlatformProcesses();
-	} catch {
-		return {
-			inspectedPids: [],
-			terminatedPids: [],
-			skippedReason: "process-list-unavailable"
-		};
-	}
+	const processes = await listPlatformProcesses();
+	if (!processes) return {
+		terminatedPids: [],
+		skippedReason: "process-list-unavailable"
+	};
 	const matchingRoots = processes.filter((processInfo) => commandContainsExactWrapperPath(processInfo.command, params.wrapperPath) && liveCommandMatchesLeaseIdentity({
 		command: processInfo.command,
 		expectedLeaseId: params.leaseId,
 		expectedGatewayInstanceId: params.gatewayInstanceId
 	}));
 	if (matchingRoots.length === 0) return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "missing-root"
 	};
 	if (matchingRoots.length > 1) return {
-		inspectedPids: uniquePids(matchingRoots),
 		terminatedPids: [],
 		skippedReason: "ambiguous-root"
 	};
-	const listedTree = collectProcessTree(processes, matchingRoots[0].pid);
-	const pids = uniquePids(listedTree.toReversed());
-	return {
-		inspectedPids: uniquePids(listedTree),
-		terminatedPids: await terminatePids(pids, params.assertCurrent)
-	};
+	return { terminatedPids: await terminatePids(uniquePids(collectProcessTree(processes, matchingRoots[0].pid).toReversed()), params.assertCurrent) };
 }
 /** Reap orphaned OpenClaw-owned ACPX wrapper trees during runtime startup. */
 async function reapStaleOpenClawOwnedAcpxOrphans(params) {
 	if (process.platform === "win32") return {
-		inspectedPids: [],
 		terminatedPids: [],
 		skippedReason: "unsupported-platform"
 	};
-	let processes;
-	try {
-		processes = await listPlatformProcesses();
-	} catch {
-		return {
-			inspectedPids: [],
-			terminatedPids: [],
-			skippedReason: "process-list-unavailable"
-		};
-	}
-	const orphanTrees = processes.filter((processInfo) => processInfo.ppid === 1 && !readAcpxProcessLeaseIdentity(processInfo.command) && isOpenClawOwnedAcpxProcessCommand({
+	const processes = await listPlatformProcesses();
+	if (!processes) return {
+		terminatedPids: [],
+		skippedReason: "process-list-unavailable"
+	};
+	return { terminatedPids: await terminatePids(uniquePids(processes.filter((processInfo) => processInfo.ppid === 1 && !readAcpxProcessLeaseIdentity(processInfo.command) && isOpenClawOwnedAcpxProcessCommand({
 		command: processInfo.command,
 		wrapperRoot: params.wrapperRoot
-	})).map((orphan) => collectProcessTree(processes, orphan.pid));
-	return {
-		inspectedPids: uniquePids(orphanTrees.flat()),
-		terminatedPids: await terminatePids(uniquePids(orphanTrees.flatMap((tree) => tree.toReversed())), params.assertCurrent)
-	};
+	})).map((orphan) => collectProcessTree(processes, orphan.pid)).flatMap((tree) => tree.toReversed())), params.assertCurrent) };
 }
 // extensions/acpx/src/model-ref.ts
 function withAcpxSessionOptions(input) {
@@ -1504,30 +1310,9 @@ function captureGenerationRecord(generation, record) {
 }
 const acpxGenerationKey = Symbol("openclaw.acpxGeneration");
 const acpxOperationScope = new AsyncLocalStorage();
-function readSessionRecordName(record) {
-	return normalizeOptionalString(asOptionalObjectRecord(record)?.name) ?? "";
-}
 function readRecordAgentCommand(record) {
 	return record?.agentArgv ?? record?.agentCommand;
 }
-function readRecordCwd(record) {
-	return normalizeOptionalString(asOptionalObjectRecord(record)?.cwd);
-}
-function readRecordResetOnNextEnsure(record) {
-	return asOptionalObjectRecord(asOptionalObjectRecord(record)?.acpx)?.reset_on_next_ensure === true;
-}
-function readRecordAgentPid(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) {
-	return normalizeOptionalString(asOptionalObjectRecord(record)?.openclawLeaseId);
-}
-function readOpenClawGatewayInstanceIdFromRecord(record) {
-	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") ?? "";
 }
@@ -1556,11 +1341,11 @@ function createResetAwareSessionStore(baseStore, params) {
 			const record = await baseStore.load(sessionId);
 			if (scope && record) captureGenerationRecord(scope.generation, record);
 			if (!record || !params?.leaseStore || !params.gatewayInstanceId) return record;
-			const sessionName = readSessionRecordName(record) || normalized;
+			const sessionName = record.name || normalized;
 			const lease = selectCurrentSessionLease({
 				leases: await params.leaseStore.listOpen(params.gatewayInstanceId),
 				sessionKeys: [sessionName, normalized],
-				rootPid: readRecordAgentPid(record)
+				rootPid: record.pid
 			});
 			if (!lease) return record;
 			const leasedRecord = withOpenClawLeaseSessionMetadata(record, lease);
@@ -1582,7 +1367,7 @@ function createResetAwareSessionStore(baseStore, params) {
 				}
 				let recordToSave = record;
 				const launch = params?.launchScope?.getStore();
-				const sessionName = readSessionRecordName(record);
+				const sessionName = record.name;
 				const agentCommand = readRecordAgentCommand(record);
 				const leasedCommand = launch?.leasedCommand ?? agentCommand;
 				const leaseIdentity = launch ?? readAcpxProcessLeaseIdentity(leasedCommand);
@@ -1635,12 +1420,12 @@ function createResetAwareSessionStore(baseStore, params) {
 /** Capture OpenClaw wrapper cleanup ownership before a backend close can yield. */
 async function prepareAcpxProcessCleanup(params) {
 	const { leaseStore, gatewayInstanceId, wrapperRoot } = params;
-	const rootPid = readRecordAgentPid(params.record);
+	const rootPid = params.record?.pid;
 	const rootCommand = params.command ? renderAgentCommand(params.command) : void 0;
 	const identity = readAcpxProcessLeaseIdentity(params.command);
-	const leaseId = readOpenClawLeaseIdFromRecord(params.record) ?? identity?.leaseId;
-	const expectedGatewayInstanceId = readOpenClawGatewayInstanceIdFromRecord(params.record) ?? identity?.gatewayInstanceId;
-	const sessionKeys = [params.sessionKey, readSessionRecordName(params.record)];
+	const leaseId = params.record?.openclawLeaseId ?? identity?.leaseId;
+	const expectedGatewayInstanceId = params.record?.openclawGatewayInstanceId ?? identity?.gatewayInstanceId;
+	const sessionKeys = [params.sessionKey, params.record?.name ?? ""];
 	const openLeases = rootPid && gatewayInstanceId && leaseStore ? await leaseStore.listOpen(gatewayInstanceId) : [];
 	const selectedLease = rootPid ? selectCurrentSessionLease({
 		leases: openLeases,
@@ -1648,8 +1433,7 @@ async function prepareAcpxProcessCleanup(params) {
 		rootPid
 	}) : void 0;
 	const loadedLease = leaseId ? await leaseStore?.load(leaseId) : void 0;
-	const ownedLease = selectedLease ?? (loadedLease && loadedLease.gatewayInstanceId === gatewayInstanceId && (!rootPid || loadedLease.rootPid === rootPid) && sessionKeys.includes(loadedLease.sessionKey) ? loadedLease : void 0);
-	const lease = ownedLease ? { ...ownedLease } : void 0;
+	const lease = selectedLease ?? (loadedLease && loadedLease.gatewayInstanceId === gatewayInstanceId && (!rootPid || loadedLease.rootPid === rootPid) && sessionKeys.includes(loadedLease.sessionKey) ? loadedLease : void 0);
 	return async () => {
 		if (lease && lease.gatewayInstanceId === gatewayInstanceId) {
 			await leaseStore?.markState(lease.leaseId, "closing");
@@ -1847,35 +1631,9 @@ function appendCodexAcpConfigOverrides(command, override) {
 		JSON.stringify(config)
 	];
 }
-function withManagedToolsMcpSessionEnv(params) {
-	const sessionKey = params.sessionKey.trim();
-	if (!params.pluginToolsEnabled && !params.openclawToolsEnabled || !sessionKey || !params.mcpServers?.length) return params.mcpServers;
-	let changed = false;
-	const nextServers = params.mcpServers.map((server) => {
-		const isManagedPluginTools = params.pluginToolsEnabled && server.name === ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME;
-		const isManagedOpenClawTools = params.openclawToolsEnabled && server.name === ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME;
-		if (!isManagedPluginTools && !isManagedOpenClawTools || !("command" in server)) return server;
-		changed = true;
-		const env = [...server.env.filter((entry) => entry.name !== OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV), {
-			name: OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV,
-			value: sessionKey
-		}];
-		return {
-			...server,
-			env,
-			args: params.agentId ? [
-				...server.args,
-				"--openclaw-agent-id",
-				params.agentId
-			] : server.args
-		};
-	});
-	return changed ? nextServers : params.mcpServers;
-}
 function resolveBridgeSession(handle) {
 	return handle.bridgeSession === void 0 ? handle : handle.bridgeSession;
 }
-/** OpenClaw-managed ACP runtime implementation backed by the upstream acpx runtime. */
 var AcpxRuntime$1 = class {
 	constructor(options, testOptions) {
 		this.ownerAwareSessions = 1;
@@ -1925,12 +1683,29 @@ var AcpxRuntime$1 = class {
 				if (target === null) return [];
 				if (!this.managedToolsMcpBridgeEnabled) return servers;
 				if (!target) throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP tool bridge has no session owner");
-				return withManagedToolsMcpSessionEnv({
-					pluginToolsEnabled: this.pluginToolsMcpBridgeEnabled,
-					openclawToolsEnabled: this.openclawToolsMcpBridgeEnabled,
-					mcpServers: servers,
-					...target
+				const sessionKey = target.sessionKey.trim();
+				if (!this.pluginToolsMcpBridgeEnabled && !this.openclawToolsMcpBridgeEnabled || !sessionKey || !servers?.length) return servers;
+				let changed = false;
+				const nextServers = servers.map((server) => {
+					const isManagedPluginTools = this.pluginToolsMcpBridgeEnabled && server.name === ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME;
+					const isManagedOpenClawTools = this.openclawToolsMcpBridgeEnabled && server.name === ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME;
+					if (!isManagedPluginTools && !isManagedOpenClawTools || !("command" in server)) return server;
+					changed = true;
+					const env = [...server.env.filter((entry) => entry.name !== OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV), {
+						name: OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV,
+						value: sessionKey
+					}];
+					return {
+						...server,
+						env,
+						args: target.agentId ? [
+							...server.args,
+							"--openclaw-agent-id",
+							target.agentId
+						] : server.args
+					};
 				});
+				return changed ? nextServers : servers;
 			},
 			processLifecycle: {
 				onBeforeSpawn: async (launch) => {
@@ -2023,9 +1798,9 @@ var AcpxRuntime$1 = class {
 		const recordId = oneShot ? persistedHandle?.acpxRecordId : sessionKey;
 		if (!recordId) return;
 		const record = await this.sessionStore.load(recordId);
-		if (!record || readRecordResetOnNextEnsure(record)) return;
-		if (oneShot && (record.acpxRecordId !== recordId || readSessionRecordName(record) !== sessionKey || record.acpSessionId !== (persistedHandle?.backendSessionId ?? decoded?.backendSessionId) || !record.agentCapabilities?.loadSession && !record.agentCapabilities?.sessionCapabilities?.resume || record.lastPromptAt !== void 0 || record.messages.some((message) => typeof message !== "string" && "User" in message))) return;
-		const recordCwd = readRecordCwd(record);
+		if (!record || record.acpx?.reset_on_next_ensure === true) return;
+		if (oneShot && (record.acpxRecordId !== recordId || record.name !== sessionKey || record.acpSessionId !== (persistedHandle?.backendSessionId ?? decoded?.backendSessionId) || !record.agentCapabilities?.loadSession && !record.agentCapabilities?.sessionCapabilities?.resume || record.lastPromptAt !== void 0 || record.messages.some((message) => typeof message !== "string" && "User" in message))) return;
+		const recordCwd = record.cwd?.trim();
 		const recordCommand = readRecordAgentCommand(record);
 		if (!recordCwd || !recordCommand || path.resolve(recordCwd) !== path.resolve(input.cwd?.trim() || this.cwd) || !oneShot && resumeSessionId && record.acpSessionId !== resumeSessionId) return;
 		const lease = readAcpxProcessLeaseIdentity(recordCommand);
@@ -2116,7 +1891,7 @@ var AcpxRuntime$1 = class {
 		const record = await this.sessionStore.load(params.handle.acpxRecordId ?? resolveAcpxSessionResource(params.handle));
 		return readCodexWrapperStderrTail({
 			wrapperRoot: this.wrapperRoot,
-			leaseId: readOpenClawLeaseIdFromRecord(record)
+			leaseId: record?.openclawLeaseId
 		});
 	}
 	async findSession(input) {
@@ -2456,36 +2231,6 @@ function resolveAgentProcessEnv() {
 	if (process.env.TOKIO_WORKER_THREADS?.trim()) return;
 	return { TOKIO_WORKER_THREADS: String(Math.min(availableParallelism(), MAX_ACPX_TOKIO_WORKER_THREADS)) };
 }
-async function createDefaultRuntime(params) {
-	const names = await fs$1.readdir(path.join(params.pluginConfig.stateDir, "sessions")).catch((error) => {
-		if (error instanceof Error && "code" in error && error.code === "ENOENT") return [];
-		throw error;
-	});
-	const legacyBareSessionKeys = /* @__PURE__ */ new Set();
-	for (const name of names) {
-		if (!name.endsWith(".json")) continue;
-		const recordId = decodeURIComponent(name.slice(0, -5));
-		if (!recordId.startsWith("agent:") && !recordId.startsWith(".openclaw-owner-") && !recordId.includes(":oneshot:")) legacyBareSessionKeys.add(recordId.toLowerCase());
-	}
-	return new AcpxRuntime$1({
-		cwd: params.pluginConfig.cwd,
-		agentProcessEnv: resolveAgentProcessEnv(),
-		openclawLegacyBareSessionKeys: legacyBareSessionKeys,
-		openclawGatewayInstanceId: params.gatewayInstanceId,
-		openclawProcessLeaseStore: params.processLeaseStore,
-		openclawWrapperRoot: params.wrapperRoot,
-		sessionStore: createFileSessionStore({ stateDir: params.pluginConfig.stateDir }),
-		agentRegistry: createAgentRegistry({ overrides: params.pluginConfig.agents }),
-		getProbeAgent: params.getProbeAgent,
-		mcpServers: toAcpMcpServers(params.pluginConfig.mcpServers),
-		pluginToolsMcpBridgeEnabled: params.pluginConfig.pluginToolsMcpBridge,
-		openclawToolsMcpBridgeEnabled: params.pluginConfig.openClawToolsMcpBridge,
-		permissionMode: params.pluginConfig.permissionMode,
-		nonInteractivePermissions: params.pluginConfig.nonInteractivePermissions,
-		elicitationModes: ["form", "url"],
-		timeoutMs: resolveAcpxTimerTimeoutMs(params.pluginConfig.timeoutSeconds)
-	});
-}
 function formatDoctorFailureMessage(report) {
 	const detailText = report.details?.map((detail) => detail.trim()).filter(Boolean).join("; ");
 	return detailText ? `${report.message} (${detailText})` : report.message;
@@ -2513,7 +2258,6 @@ async function resolveGatewayInstanceId(openKeyedStore) {
 async function reapOpenAcpxProcessLeases(params) {
 	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) {
@@ -2533,7 +2277,6 @@ async function reapOpenAcpxProcessLeases(params) {
 			wrapperRoot: lease.wrapperRoot,
 			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");
 		await params.leaseStore.markState(lease.leaseId, retryableEvidenceFailure ? "open" : result.terminatedPids.length > 0 ? "closed" : "lost");
@@ -2543,13 +2286,9 @@ async function reapOpenAcpxProcessLeases(params) {
 			wrapperRoot,
 			assertCurrent
 		});
-		inspectedPids.push(...legacyResult.inspectedPids);
 		terminatedPids.push(...legacyResult.terminatedPids);
 	}
-	return {
-		inspectedPids,
-		terminatedPids
-	};
+	return { terminatedPids };
 }
 function createAcpxRuntimeService(params) {
 	let runtime = null;
@@ -2580,7 +2319,6 @@ function createAcpxRuntimeService(params) {
 				return;
 			}
 			const openKeyedStore = params.openKeyedStore;
-			if (!openKeyedStore) throw new Error("ACPX runtime service requires plugin keyed state");
 			const basePluginConfig = await measureAcpxStartup(ctx, "config.resolve", () => resolveAcpxPluginConfig({
 				rawConfig: params.pluginConfig,
 				workspaceDir: ctx.workspaceDir,
@@ -2615,14 +2353,38 @@ function createAcpxRuntimeService(params) {
 			if (params.startupPurpose !== "inspection") await promote(ctx);
 			const getAllowedAgents = params.getAllowedAgents ?? (() => ctx.config.acp?.allowedAgents);
 			const getProbeAgent = () => pluginConfig.probeAgent ?? getAllowedAgents()?.map(normalizeLowercaseStringOrEmpty).find(Boolean);
-			const startedRuntime = await measureAcpxStartup(ctx, "runtime.create", () => (params.runtimeFactory ?? createDefaultRuntime)({
-				pluginConfig,
-				getProbeAgent,
-				gatewayInstanceId,
-				processLeaseStore,
-				wrapperRoot,
-				logger: ctx.logger
-			}));
+			const startedRuntime = await measureAcpxStartup(ctx, "runtime.create", async () => {
+				const names = await fs$1.readdir(path.join(pluginConfig.stateDir, "sessions")).catch((error) => {
+					if (error instanceof Error && "code" in error && error.code === "ENOENT") return [];
+					throw error;
+				});
+				const legacyBareSessionKeys = /* @__PURE__ */ new Set();
+				for (const name of names) {
+					if (!name.endsWith(".json")) continue;
+					const recordId = decodeURIComponent(name.slice(0, -5));
+					if (!recordId.startsWith("agent:") && !recordId.startsWith(".openclaw-owner-") && !recordId.includes(":oneshot:")) legacyBareSessionKeys.add(recordId.toLowerCase());
+				}
+				return new AcpxRuntime$1({
+					cwd: pluginConfig.cwd,
+					agentProcessEnv: resolveAgentProcessEnv(),
+					agentProcessEnvAllow: pluginConfig.agentProcessEnvAllow,
+					agentProcessEnvBlock: pluginConfig.agentProcessEnvBlock,
+					openclawLegacyBareSessionKeys: legacyBareSessionKeys,
+					openclawGatewayInstanceId: gatewayInstanceId,
+					openclawProcessLeaseStore: processLeaseStore,
+					openclawWrapperRoot: wrapperRoot,
+					sessionStore: createFileSessionStore({ stateDir: pluginConfig.stateDir }),
+					agentRegistry: createAgentRegistry({ overrides: pluginConfig.agents }),
+					getProbeAgent,
+					mcpServers: toAcpMcpServers(pluginConfig.mcpServers),
+					pluginToolsMcpBridgeEnabled: pluginConfig.pluginToolsMcpBridge,
+					openclawToolsMcpBridgeEnabled: pluginConfig.openClawToolsMcpBridge,
+					permissionMode: pluginConfig.permissionMode,
+					nonInteractivePermissions: pluginConfig.nonInteractivePermissions,
+					elicitationModes: ["form", "url"],
+					timeoutMs: resolveAcpxTimerTimeoutMs(pluginConfig.timeoutSeconds)
+				});
+			});
 			runtime = startedRuntime;
 			const shouldProbeRuntime = params.probeAtStartup !== false && shouldProbeRuntimeAtStartup();
 			ctx.startupTrace?.detail?.("probe-policy", [["startupProbeEnabledCount", shouldProbeRuntime ? 1 : 0], ["probeAgent", getProbeAgent() ?? "default"]]);