@openclaw/acpx 2026.10.5-beta.4 → 2026.10.10-beta.1

package/dist/.setup/{service-De_oVTL3.mjs → service-5eVJSjDE.mjs}

@@ -1,18 +1,18 @@
 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-D0ATuiVJ.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-DECUY80a.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-duvwZfxk.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 path from "node:path";
 import { asOptionalObjectRecord, isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, 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";
 import { escapeRegExp, sliceUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import fs$1 from "node:fs/promises";
+import { AcpxRuntime, createAgentRegistry, createFileSessionStore, decodeAcpxRuntimeHandleState, isRequestedModelUnsupportedError } from "acpx/runtime";
 import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 import { tryReadJson } from "@openclaw/fs-safe/json";
 import { parse, stringify } from "smol-toml";
@@ -22,244 +22,8 @@ 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
-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",
-	"model_reasoning_effort",
-	"sandbox_mode"
-]);
-const INHERITED_MODEL_PROVIDER_CONFIG_KEYS = /* @__PURE__ */ new Set([
-	"name",
-	"base_url",
-	"wire_api",
-	"env_key",
-	"env_key_instructions",
-	"requires_openai_auth",
-	"request_max_retries",
-	"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));
-	return [
-		"# Generated by OpenClaw for Codex ACP sessions.",
-		params.sourceConfigToml ? extractInheritedCodexRuntimeConfig(params.sourceConfigToml) : "",
-		...normalized.flatMap((projectPath) => [
-			"",
-			`[projects.${JSON.stringify(projectPath)}]`,
-			"trust_level = \"trusted\""
-		]),
-		""
-	].filter((line, index, lines) => !(line === "" && lines[index - 1] === "")).join("\n");
-}
-//#endregion
-//#region extensions/acpx/src/codex-auth-bridge.ts
-/**
-* Prepares isolated Codex and Claude ACP wrapper commands for ACPX. The bridge
-* copies safe auth/config state into plugin-owned homes and redacts diagnostics.
-*/
-const CLAUDE_ACP_PACKAGE = "@agentclientprotocol/claude-agent-acp";
-const CLAUDE_ACP_BIN = "claude-agent-acp";
+//#region extensions/acpx/src/adapter-wrapper-script.ts
 const RUN_CONFIGURED_COMMAND_SENTINEL = "--openclaw-run-configured";
-const requireFromHere$1 = createRequire(import.meta.url);
-function readSelfManifest() {
-	const manifestPath = path.join(resolveAcpxPluginRoot(import.meta.url), "package.json");
-	return JSON.parse(fs.readFileSync(manifestPath, "utf8"));
-}
-function readManifestDependencyVersion(packageName) {
-	const version = readSelfManifest().dependencies?.[packageName];
-	if (typeof version !== "string" || version.trim() === "") throw new Error(`Missing ${packageName} dependency version in @openclaw/acpx manifest`);
-	return version;
-}
-const CODEX_ACP_PACKAGE_VERSION = readManifestDependencyVersion(CODEX_ACP_PACKAGE);
-const CLAUDE_ACP_PACKAGE_VERSION = readManifestDependencyVersion(CLAUDE_ACP_PACKAGE);
-function basename(value) {
-	return value.split(/[\\/]/).pop() ?? value;
-}
-function resolvePackageBinPath(packageJsonPath, manifest, binName) {
-	const { bin } = manifest;
-	const relativeBinPath = typeof bin === "string" ? bin : bin && typeof bin === "object" ? bin[binName] : void 0;
-	if (typeof relativeBinPath !== "string" || relativeBinPath.trim() === "") return;
-	return path.resolve(path.dirname(packageJsonPath), relativeBinPath);
-}
-async function resolveInstalledAcpPackageBinPath(packageName, binName) {
-	try {
-		const packageJsonPath = requireFromHere$1.resolve(`${packageName}/package.json`);
-		const manifest = await tryReadJson(packageJsonPath);
-		if (manifest?.name !== packageName) return;
-		const binPath = resolvePackageBinPath(packageJsonPath, manifest, binName);
-		if (!binPath) return;
-		await fs$1.access(binPath);
-		return binPath;
-	} catch {
-		return;
-	}
-}
 const DIAGNOSTIC_REDACTION_RULES = [
 	{
 		source: String.raw`(authorization\s*[:=]\s*bearer\s+)[^\s'"<>]+`,
@@ -375,6 +139,7 @@ import { spawn } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
 import { fileURLToPath } from "node:url";
 
+function main() {
 ${params.envSetup}
 const stderrLogFileNamePrefix = ${params.stderrLogFileNamePrefix ? JSON.stringify(params.stderrLogFileNamePrefix) : "undefined"};
 const stderrLogMaxChars = 256 * 1024;
@@ -602,7 +367,8 @@ const args =
 
 if (!command) {
   console.error("[openclaw] missing configured ${params.displayName} ACP command");
-  process.exit(1);
+  process.exitCode = 1;
+  return;
 }
 
 const child = spawn(command, args, {
@@ -620,6 +386,18 @@ child.stderr?.on("data", (chunk) => {
 let forceKillTimer;
 let orphanCleanupStarted = false;
 let childExitCode = 1;
+let childFailed = false;
+let childClosed = false;
+
+function finishWrapper() {
+  if (!childClosed || forceKillTimer) {
+    return;
+  }
+  for (const [signal, listener] of signalListeners) {
+    process.off(signal, listener);
+  }
+  process.exitCode = childFailed ? 1 : childExitCode;
+}
 
 function killChildTree(signal, options = {}) {
   if (!child.pid || (!options.force && child.killed)) {
@@ -638,10 +416,11 @@ function killChildTree(signal, options = {}) {
   child.kill(signal);
 }
 
+const signalListeners = new Map();
 for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
-  process.once(signal, () => {
-    killChildTree(signal);
-  });
+  const listener = () => killChildTree(signal);
+  signalListeners.set(signal, listener);
+  process.on(signal, listener);
 }
 
 const originalParentPid = process.ppid;
@@ -669,27 +448,28 @@ const parentWatcher =
         // Keep the wrapper alive long enough for stubborn adapters to receive
         // a forced fallback signal after SIGTERM.
         forceKillTimer = setTimeout(() => {
-          killChildTree("SIGKILL", { force: true });
-          childExitCode = 1;
+          try {
+            killChildTree("SIGKILL", { force: true });
+          } finally {
+            forceKillTimer = undefined;
+            childExitCode = 1;
+            finishWrapper();
+          }
         }, 1_500);
       }, 1_000);
 parentWatcher?.unref?.();
 
 child.on("error", (error) => {
   console.error(\`[openclaw] failed to launch ${params.displayName} ACP wrapper: \${error.message}\`);
-  process.exit(1);
+  childFailed = true;
 });
 
 child.on("exit", (code, signal) => {
-  if (parentWatcher) {
-    clearInterval(parentWatcher);
-  }
+  // Descendants can retain stdio after the direct child exits. Keep watching
+  // the wrapper parent until close, including after this status notification.
   if (orphanCleanupStarted) {
     return;
   }
-  if (forceKillTimer) {
-    clearTimeout(forceKillTimer);
-  }
   if (code !== null) {
     childExitCode = code;
     return;
@@ -699,10 +479,254 @@ child.on("exit", (code, signal) => {
 
 child.on("close", () => {
   finishStderrLog();
-  process.exit(childExitCode);
+  if (parentWatcher) {
+    clearInterval(parentWatcher);
+  }
+  childClosed = true;
+  finishWrapper();
 });
+}
+main();
 `;
 }
+//#endregion
+//#region 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",
+	"model_reasoning_effort",
+	"sandbox_mode"
+]);
+const INHERITED_MODEL_PROVIDER_CONFIG_KEYS = /* @__PURE__ */ new Set([
+	"name",
+	"base_url",
+	"wire_api",
+	"env_key",
+	"env_key_instructions",
+	"requires_openai_auth",
+	"request_max_retries",
+	"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));
+	return [
+		"# Generated by OpenClaw for Codex ACP sessions.",
+		params.sourceConfigToml ? extractInheritedCodexRuntimeConfig(params.sourceConfigToml) : "",
+		...normalized.flatMap((projectPath) => [
+			"",
+			`[projects.${JSON.stringify(projectPath)}]`,
+			"trust_level = \"trusted\""
+		]),
+		""
+	].filter((line, index, lines) => !(line === "" && lines[index - 1] === "")).join("\n");
+}
+//#endregion
+//#region extensions/acpx/src/codex-auth-bridge.ts
+/**
+* Prepares isolated Codex and Claude ACP wrapper commands for ACPX. The bridge
+* copies safe auth/config state into plugin-owned homes and redacts diagnostics.
+*/
+const CLAUDE_ACP_PACKAGE = "@agentclientprotocol/claude-agent-acp";
+const CLAUDE_ACP_BIN = "claude-agent-acp";
+const requireFromHere$1 = createRequire(import.meta.url);
+function readSelfManifest() {
+	const manifestPath = path.join(resolveAcpxPluginRoot(import.meta.url), "package.json");
+	return JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+}
+function readManifestDependencyVersion(packageName) {
+	const version = readSelfManifest().dependencies?.[packageName];
+	if (typeof version !== "string" || version.trim() === "") throw new Error(`Missing ${packageName} dependency version in @openclaw/acpx manifest`);
+	return version;
+}
+const CODEX_ACP_PACKAGE_VERSION = readManifestDependencyVersion(CODEX_ACP_PACKAGE);
+const CLAUDE_ACP_PACKAGE_VERSION = readManifestDependencyVersion(CLAUDE_ACP_PACKAGE);
+function basename(value) {
+	return value.split(/[\\/]/).pop() ?? value;
+}
+function resolvePackageBinPath(packageJsonPath, manifest, binName) {
+	const { bin } = manifest;
+	const relativeBinPath = typeof bin === "string" ? bin : bin && typeof bin === "object" ? bin[binName] : void 0;
+	if (typeof relativeBinPath !== "string" || relativeBinPath.trim() === "") return;
+	return path.resolve(path.dirname(packageJsonPath), relativeBinPath);
+}
+async function resolveInstalledAcpPackageBinPath(packageName, binName) {
+	try {
+		const packageJsonPath = requireFromHere$1.resolve(`${packageName}/package.json`);
+		const manifest = await tryReadJson(packageJsonPath);
+		if (manifest?.name !== packageName) return;
+		const binPath = resolvePackageBinPath(packageJsonPath, manifest, binName);
+		if (!binPath) return;
+		await fs$1.access(binPath);
+		return binPath;
+	} catch {
+		return;
+	}
+}
 function buildCodexAcpWrapperScript(installedBinPath) {
 	return buildAdapterWrapperScript({
 		displayName: "Codex",
@@ -776,7 +800,8 @@ if (openClawCodexConfigs.length > 0) {
       existingCodexConfig = parsedCodexConfig;
     } catch {
       console.error("[openclaw] CODEX_CONFIG must be a valid JSON object");
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
   }
   for (const openClawCodexConfig of openClawCodexConfigs) {
@@ -792,7 +817,8 @@ if (openClawCodexConfigs.length > 0) {
       existingCodexConfig = mergeCodexConfig(existingCodexConfig, parsedOpenClawCodexConfig);
     } catch {
       console.error("[openclaw] invalid generated Codex ACP startup config");
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
   }
   env.CODEX_CONFIG = JSON.stringify(existingCodexConfig);
@@ -979,7 +1005,7 @@ async function prepareAcpxCodexAuthConfig(params) {
 		...params.pluginConfig,
 		agents: {
 			...params.pluginConfig.agents,
-			codex: buildWrapperCommand(wrapperPath, codexLaunch?.args ?? [RUN_CONFIGURED_COMMAND_SENTINEL, ...splitCommandParts(configuredCodexCommand ?? [])]),
+			codex: buildWrapperCommand(wrapperPath, codexLaunch?.args ?? ["--openclaw-run-configured", ...splitCommandParts(configuredCodexCommand ?? [])]),
 			claude: buildClaudeAcpWrapperCommand(claudeWrapperPath, configuredClaudeCommand)
 		}
 	};
@@ -1452,7 +1478,6 @@ var AcpxRuntimeProbe = class {
 			const runtime = this.params.createRuntime(agent);
 			try {
 				const report = await this.params.runWithLease(agent, () => runtime.doctor());
-				this.params.assertRunning();
 				this.health = {
 					agent,
 					ok: report.ok
@@ -1536,7 +1561,6 @@ function createResetAwareSessionStore(baseStore, params) {
 			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;
@@ -1546,7 +1570,6 @@ function createResetAwareSessionStore(baseStore, params) {
 				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;
@@ -1575,7 +1598,6 @@ function createResetAwareSessionStore(baseStore, params) {
 					wrapperRoot: params.wrapperRoot
 				})) {
 					const existing = await params.leaseStore.load(leaseIdentity.leaseId);
-					if (scope?.generation.retired) return;
 					if (!existing || existing.gatewayInstanceId === leaseIdentity.gatewayInstanceId && existing.sessionKey === sessionName && existing.wrapperRoot === params.wrapperRoot) {
 						const adoptingLease = Boolean(launch && !isDeepStrictEqual(splitCommandParts(launch.resolvedCommand), splitCommandParts(launch.leasedCommand)));
 						const persistedCommand = launch && !adoptingLease ? launch.resolvedCommand : leasedCommand;
@@ -1952,7 +1974,7 @@ var AcpxRuntime$1 = class {
 		});
 	}
 	async runInGeneration(target, scope, run) {
-		const release = this.generationRegistry.retainGenerationOperation(scope.generation, scope.recordId ?? target.acpxRecordId ?? scope.generation.resource);
+		const release = this.generationRegistry.retainGenerationOperation(scope.generation, target.acpxRecordId ?? scope.generation.resource);
 		try {
 			return await this.sessionScope.run(resolveBridgeSession(target), () => acpxOperationScope.run(scope, run));
 		} finally {
@@ -1969,13 +1991,9 @@ var AcpxRuntime$1 = class {
 	}
 	async loadOperationSnapshotForHandle(handle, generation, allowRetired = false) {
 		const resource = generation.resource;
-		if (!allowRetired) this.generationRegistry.assertCurrentGeneration(generation);
 		const ownedRecord = generation.records.get(handle.acpxRecordId ?? resource);
-		if (ownedRecord && (handle.acpxRecordId && ownedRecord.acpxRecordId !== handle.acpxRecordId || handle.backendSessionId && ownedRecord.acpSessionId && ownedRecord.acpSessionId !== handle.backendSessionId)) throw new AcpRuntimeError("ACP_TURN_FAILED", "ACP handle no longer owns this runtime generation.");
-		let record = allowRetired ? generation.retired ? ownedRecord : await this.sessionStore.loadForClose(handle.acpxRecordId ?? resource) : await acpxOperationScope.run({ generation }, () => this.sessionStore.load(handle.acpxRecordId ?? resource));
-		if (allowRetired && generation.retired && ownedRecord) record = ownedRecord;
+		const record = allowRetired ? generation.retired ? ownedRecord : await this.sessionStore.loadForClose(handle.acpxRecordId ?? resource) : await acpxOperationScope.run({ generation }, () => this.sessionStore.load(handle.acpxRecordId ?? resource));
 		if (allowRetired && record) captureGenerationRecord(generation, record);
-		if (!allowRetired) this.generationRegistry.assertCurrentGeneration(generation);
 		if (record && (handle.acpxRecordId && handle.acpxRecordId !== record.acpxRecordId || handle.backendSessionId && record.acpSessionId && handle.backendSessionId !== record.acpSessionId)) throw new AcpRuntimeError("ACP_TURN_FAILED", "ACP handle no longer owns this runtime record.");
 		const command = readRecordAgentCommand(record) ?? resolveAgentCommand({
 			agentName: readAgentFromHandle(handle),
@@ -1987,7 +2005,6 @@ var AcpxRuntime$1 = class {
 			if (identity.gatewayInstanceId !== this.gatewayInstanceId) throw new AcpRuntimeError("ACP_TURN_FAILED", `ACPX process lease ${identity.leaseId} belongs to another gateway`);
 			if (lease && (lease.gatewayInstanceId !== identity.gatewayInstanceId || lease.sessionKey !== resolveAcpxSessionResource(handle) || lease.wrapperRoot !== this.wrapperRoot)) throw new AcpRuntimeError("ACP_TURN_FAILED", `ACPX process lease ${identity.leaseId} belongs to another session`);
 		}
-		if (!allowRetired) this.generationRegistry.assertCurrentGeneration(generation);
 		return {
 			record,
 			command,
@@ -1999,32 +2016,38 @@ var AcpxRuntime$1 = class {
 		return await this.runInGeneration(handle, { generation }, async () => {
 			const snapshot = await this.loadOperationSnapshotForHandle(handle, generation);
 			this.generationRegistry.assertCurrentGeneration(generation);
-			return await this.runInGeneration(handle, {
-				generation,
-				recordId: snapshot.record?.acpxRecordId
-			}, () => run(snapshot));
+			return await run(snapshot);
 		});
 	}
 	resolveDelegateForOperationSnapshot(handle, snapshot) {
 		return this.generationRegistry.resolveDelegate(snapshot.generation, snapshot.generation.nativeTools ?? resolveBridgeSession(handle)?.native === true);
 	}
-	async readReusablePersistentSessionCommand(params) {
-		if (params.mode !== "persistent" || !params.command) return;
-		const existing = await this.sessionStore.load(params.sessionKey);
-		if (!existing || readRecordResetOnNextEnsure(existing)) return;
-		const recordCwd = readRecordCwd(existing);
-		if (!recordCwd || resolve(recordCwd) !== resolve(params.cwd?.trim() || this.cwd)) return;
-		const recordCommand = readRecordAgentCommand(existing);
-		if (!recordCommand) return;
-		const leaseIdentity = readAcpxProcessLeaseIdentity(recordCommand);
-		if (leaseIdentity && leaseIdentity.gatewayInstanceId !== this.gatewayInstanceId) return;
-		const stableRecordCommand = leaseIdentity ? withAcpxLeaseArgs({
-			command: params.command,
-			leaseId: leaseIdentity.leaseId,
-			gatewayInstanceId: leaseIdentity.gatewayInstanceId
-		}) : params.command;
-		if (!isDeepStrictEqual(splitCommandParts(recordCommand), splitCommandParts(stableRecordCommand))) return;
-		return !params.resumeSessionId || existing.acpSessionId === params.resumeSessionId ? recordCommand : void 0;
+	async readReusableSession(input, command) {
+		const { persistedHandle, sessionKey, resumeSessionId } = input;
+		const oneShot = input.mode === "oneshot";
+		const decoded = persistedHandle && decodeAcpxRuntimeHandleState(persistedHandle.runtimeSessionName);
+		if (!command || oneShot && (resumeSessionId || persistedHandle?.backend !== "acpx" || !persistedHandle.acpxRecordId || decoded?.mode !== "oneshot" || decoded.name !== sessionKey || decoded.acpxRecordId !== persistedHandle.acpxRecordId || decoded.agent !== normalizeOptionalLowercaseString(input.agent))) return;
+		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);
+		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);
+		const ownLease = !lease || lease.gatewayInstanceId === this.gatewayInstanceId;
+		if (!oneShot && !ownLease) return;
+		const expectedCommand = lease ? withAcpxLeaseArgs({
+			command,
+			leaseId: lease.leaseId,
+			gatewayInstanceId: lease.gatewayInstanceId
+		}) : command;
+		if (!isDeepStrictEqual(splitCommandParts(recordCommand), splitCommandParts(expectedCommand))) return;
+		return {
+			reusableCommand: ownLease ? recordCommand : void 0,
+			resumeSessionId: oneShot ? record.acpSessionId : void 0
+		};
 	}
 	async runWithLaunchLease(params) {
 		if (!params.command || !this.wrapperRoot || !this.gatewayInstanceId || !this.processLeaseStore || !isOpenClawLeaseAwareAcpxProcessCommand({
@@ -2111,7 +2134,6 @@ var AcpxRuntime$1 = class {
 				sessionKey: resource,
 				agent: input.agent
 			});
-			this.generationRegistry.assertCurrentGeneration(generation);
 			generation.admitted ||= Boolean(handle);
 			return handle ? {
 				...handle,
@@ -2183,26 +2205,28 @@ var AcpxRuntime$1 = class {
 			model: claudeModelOverride
 		} : effectiveInput;
 		const stableLaunchCommand = codexModelOverride && command ? appendCodexAcpConfigOverrides(command, codexModelOverride) : command;
-		const reusableCommand = await this.readReusablePersistentSessionCommand({
-			sessionKey: input.sessionKey,
-			mode: input.mode,
-			cwd: input.cwd,
-			command: stableLaunchCommand,
-			resumeSessionId: input.resumeSessionId
-		});
+		const restoration = await this.readReusableSession(input, stableLaunchCommand);
+		this.generationRegistry.assertCurrentGeneration(generation);
+		const restoredInput = restoration?.resumeSessionId ? {
+			...ensureInput,
+			resumeSessionId: restoration.resumeSessionId
+		} : ensureInput;
 		return {
 			...await this.runWithLaunchLease({
-				agent: ensureInput.agent,
+				agent: restoredInput.agent,
 				sessionKey: ensureInput.sessionKey,
 				command: stableLaunchCommand,
-				reusableCommand,
+				reusableCommand: restoration?.reusableCommand,
 				run: () => this.withCodexWrapperDiagnostics({
 					command: stableLaunchCommand,
 					fallbackCode: "ACP_SESSION_INIT_FAILED",
-					run: () => codexModelOverride ? delegate.ensureSession(withAcpxSessionOptions(ensureInput)) : ensureSessionWithModelRef((request) => {
+					run: () => {
 						this.generationRegistry.assertCurrentGeneration(generation);
-						return delegate.ensureSession(request);
-					}, ensureInput)
+						return codexModelOverride ? delegate.ensureSession(withAcpxSessionOptions(restoredInput)) : ensureSessionWithModelRef((request) => {
+							this.generationRegistry.assertCurrentGeneration(generation);
+							return delegate.ensureSession(request);
+						}, restoredInput);
+					}
 				})
 			}),
 			...logicalTarget,
@@ -2242,7 +2266,6 @@ var AcpxRuntime$1 = class {
 		});
 		const turnPromise = this.runWithOperationSnapshot(input.handle, (snapshot) => {
 			const { command, generation } = snapshot;
-			this.generationRegistry.assertCurrentGeneration(generation);
 			const delegate = this.resolveDelegateForOperationSnapshot(input.handle, snapshot);
 			return this.sessionScope.run(resolveBridgeSession(input.handle), () => acpxOperationScope.run({ generation }, () => withTurnDiagnostics(command, async () => {
 				const release = this.generationRegistry.retainGenerationOperation(generation, snapshot.record?.acpxRecordId ?? input.handle.acpxRecordId ?? generation.resource);
@@ -2504,9 +2527,7 @@ async function reapOpenAcpxProcessLeases(params) {
 	for (const lease of leases) {
 		const pending = lease.rootPid <= 0;
 		if (pending) legacyWrapperRoots.add(lease.wrapperRoot);
-		assertCurrent?.();
 		await params.leaseStore.markState(lease.leaseId, "closing");
-		assertCurrent?.();
 		const result = pending ? await cleanupOpenClawOwnedAcpxPendingLease({
 			leaseId: lease.leaseId,
 			gatewayInstanceId: lease.gatewayInstanceId,
@@ -2523,11 +2544,9 @@ async function reapOpenAcpxProcessLeases(params) {
 		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?.();
 		await params.leaseStore.markState(lease.leaseId, retryableEvidenceFailure ? "open" : result.terminatedPids.length > 0 ? "closed" : "lost");
 	}
 	for (const wrapperRoot of legacyWrapperRoots) {
-		assertCurrent?.();
 		const legacyResult = await reapStaleOpenClawOwnedAcpxOrphans({
 			wrapperRoot,
 			assertCurrent
@@ -2556,11 +2575,9 @@ function createAcpxRuntimeService(params) {
 		assertCurrent();
 		recoveryPromise ??= measureAcpxStartup(ctx, "process-leases.reap", async () => {
 			const result = await recover(assertCurrent);
-			assertCurrent();
 			if (result.terminatedPids.length > 0) ctx.logger.info(`reaped ${result.terminatedPids.length} stale OpenClaw-owned ACPX processes`);
 		});
 		await recoveryPromise;
-		assertCurrent();
 	};
 	return {
 		id: "acpx-runtime",
@@ -2626,14 +2643,11 @@ function createAcpxRuntimeService(params) {
 				ctx.logger.info(`embedded acpx runtime backend registered (cwd: ${pluginConfig.cwd})`);
 			});
 			if (!shouldProbeRuntime) return;
-			lifecycleRevision += 1;
-			const currentRevision = lifecycleRevision;
 			try {
 				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 check timed out after ${timeoutSeconds}s`);
 				}, { ref: false }));
-				if (currentRevision !== lifecycleRevision) return;
 				if (doctorReport.ok) {
 					ctx.startupTrace?.detail?.("probe.result", [["healthyCount", 1]]);
 					ctx.logger.info("embedded acpx runtime backend ready");
@@ -2642,7 +2656,6 @@ function createAcpxRuntimeService(params) {
 				ctx.startupTrace?.detail?.("probe.result", [["healthyCount", 0]]);
 				ctx.logger.warn(`embedded acpx runtime backend check failed: ${formatDoctorFailureMessage(doctorReport)}`);
 			} catch (err) {
-				if (currentRevision !== lifecycleRevision) return;
 				ctx.startupTrace?.detail?.("probe.result", [["healthyCount", 0]]);
 				ctx.logger.warn(`embedded acpx runtime setup failed: ${formatErrorMessage(err)}`);
 			}