@openclaw/acpx 2026.9.7 → 2026.10.1-beta.1

package/README.md

@@ -12,6 +12,12 @@ openclaw plugins install @openclaw/acpx
 
 Restart the Gateway after installing or updating the plugin.
 
+The generated Codex and Claude ACP wrappers prefer the installed adapter while its
+entry file exists. If plugin capture cleanup removes that file, the next launch
+uses the existing pinned `npm exec` / `npx` fallback. This may require registry
+access when the pinned package is not cached. Restart the Gateway after updating
+to regenerate wrappers written by an older plugin version.
+
 ## What it provides
 
 - ACP-backed agent runtime sessions.

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

@@ -1,11 +1,11 @@
-import { s as splitCommandParts } from "./command-line-CPBLOiZM.mjs";
 import { createRequire } from "node:module";
 import { z } from "zod";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { formatPluginConfigIssue } from "openclaw/plugin-sdk/extension-shared";
-import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { resolveStateDir } from "openclaw/plugin-sdk/state-paths";
+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
@@ -56,13 +56,145 @@ 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
-/**
-* Resolves ACPX plugin config from raw user configuration. It locates the
-* plugin root, injects optional MCP bridge servers, and applies runtime defaults.
-*/
-const ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME = "openclaw-plugin-tools";
-const ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME = "openclaw-tools";
+const MANAGED_MCP_BRIDGES = [[
+	"pluginToolsMcpBridge",
+	"openclaw-plugin-tools",
+	"plugin-tools-serve"
+], [
+	"openClawToolsMcpBridge",
+	"openclaw-tools",
+	"openclaw-tools-serve"
+]];
 const requireFromHere = createRequire(import.meta.url);
 function isAcpxPluginRoot(dir) {
 	return fs.existsSync(path.join(dir, "openclaw.plugin.json")) && fs.existsSync(path.join(dir, "package.json"));
@@ -142,13 +274,10 @@ function resolveManagedToolsMcpServerConfig(entryPoint, moduleUrl = import.meta.
 }
 function resolveConfiguredMcpServers(params) {
 	const resolved = { ...params.mcpServers };
-	if (params.pluginToolsMcpBridge && resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME]) throw new Error(`mcpServers.${ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME} is reserved when pluginToolsMcpBridge=true`);
-	if (params.openClawToolsMcpBridge && resolved[ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME]) throw new Error(`mcpServers.${ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME} is reserved when openClawToolsMcpBridge=true`);
-	if (params.pluginToolsMcpBridge) resolved[ACPX_PLUGIN_TOOLS_MCP_SERVER_NAME] = resolveManagedToolsMcpServerConfig("plugin-tools-serve", params.moduleUrl);
-	if (params.openClawToolsMcpBridge) resolved[ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME] = resolveManagedToolsMcpServerConfig("openclaw-tools-serve", params.moduleUrl);
+	for (const [flag, name] of MANAGED_MCP_BRIDGES) if (params[flag] && resolved[name]) throw new Error(`mcpServers.${name} is reserved when ${flag}=true`);
+	for (const [flag, name, entryPoint] of MANAGED_MCP_BRIDGES) if (params[flag]) resolved[name] = resolveManagedToolsMcpServerConfig(entryPoint, params.moduleUrl);
 	return resolved;
 }
-/** Convert OpenClaw MCP server config into ACPX runtime MCP server entries. */
 function toAcpMcpServers(mcpServers) {
 	return Object.entries(mcpServers).map(([name, server]) => ({
 		name,
@@ -160,15 +289,14 @@ function toAcpMcpServers(mcpServers) {
 		}))
 	}));
 }
-/** Validate and normalize raw ACPX plugin config for runtime startup. */
 function resolveAcpxPluginConfig(params) {
 	const { rawConfig } = params;
 	const parsed = AcpxPluginConfigSchema.safeParse(rawConfig === void 0 ? {} : rawConfig);
 	if (!parsed.success) throw new Error(formatPluginConfigIssue(parsed.error.issues[0]));
 	const normalized = parsed.data;
 	const workspaceDir = params.workspaceDir?.trim() || process.cwd();
-	const cwd = path.resolve(normalized.cwd?.trim() || workspaceDir);
-	const stateDir = path.resolve(normalized.stateDir?.trim() || path.join(workspaceDir, "state"));
+	const cwd = path.resolve(normalized.cwd ?? workspaceDir);
+	const stateDir = path.resolve(normalized.stateDir ?? path.join(params.stateDir ?? resolveStateDir(), "acpx"));
 	const pluginToolsMcpBridge = normalized.pluginToolsMcpBridge === true;
 	const openClawToolsMcpBridge = normalized.openClawToolsMcpBridge === true;
 	const mcpServers = resolveConfiguredMcpServers({
@@ -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/{pi-session-catalog-runtime-UhiQSaDw.mjs → pi-session-catalog-runtime-7jc50ZJ4.mjs}

@@ -1,24 +1,18 @@
 import { c as PI_SESSION_READ_COMMAND, i as PI_LOCAL_SESSION_HOST_ID, l as PI_TERMINAL_RESUME_COMMAND, n as piSessionStore, o as PI_SESSIONS_LIST_COMMAND, r as piSessionStoreAvailable, s as PI_SESSION_ID_PATTERN, t as piAcpSessionStoreRoot } from "./pi-session-paths-CIvyk6KB.mjs";
-import { parseDateFirstTimestampMs } from "openclaw/plugin-sdk/number-runtime";
+import { parseDateFirstTimestampMs, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { createReadStream } from "node:fs";
 import path from "node:path";
 import { isRecord, normalizeBoundedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveNodeHostExecutable } from "openclaw/plugin-sdk/node-host";
 import { createSessionCatalogFamily, importSessionCatalogHistory, isExternalUserText, listAdoptedSessionCatalogSessions, sessionCatalogAdoptedSessionKey } from "openclaw/plugin-sdk/session-catalog";
-import fs$1 from "node:fs/promises";
 import { resolveAcpSessionAvailability } from "openclaw/plugin-sdk/acp-runtime";
 import process from "node:process";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { sessionCatalogPaging } from "openclaw/plugin-sdk/session-catalog-paging";
-import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { safeParseJson, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import fs$1 from "node:fs/promises";
 import { runTasksWithConcurrency } from "openclaw/plugin-sdk/concurrency-runtime";
 import { isPathStrictlyInside, readFileRangeAsync } from "openclaw/plugin-sdk/file-access-runtime";
-//#region extensions/acpx/src/pi-session-timestamp.ts
-/** Preserve Pi JSONL's date-first string contract while accepting numeric millisecond values. */
-function parsePiSessionTimestampMs(value) {
-	return parseDateFirstTimestampMs(value);
-}
-//#endregion
 //#region extensions/acpx/src/pi-session-store.ts
 const MAX_DISCOVERY_FILES = 1e4;
 const SUMMARY_SCAN_BATCH_SIZE = 100;
@@ -29,7 +23,6 @@ const APPEND_PROOF_EDGE_BYTES = 65536;
 const IO_CONCURRENCY = 8;
 const PI_FILE_CANDIDATE_CACHE_TTL_MS = 32e3;
 const PI_FILE_CANDIDATE_CACHE_MAX_ENTRIES = 8;
-const SESSION_ID_PATTERN = /^(?!-)[A-Za-z0-9._:-]{1,256}$/u;
 const summaryCache = /* @__PURE__ */ new Map();
 const threadFileCache = /* @__PURE__ */ new Map();
 const piFileCandidateCache = /* @__PURE__ */ new Map();
@@ -153,15 +146,11 @@ async function piFileCandidates(env) {
 function parsePiJsonLines(content) {
 	return content.split(/\r?\n/u).flatMap((line) => {
 		if (!line.trim()) return [];
-		try {
-			const value = JSON.parse(line);
-			return isRecord(value) ? [value] : [];
-		} catch {
-			return [];
-		}
+		const value = safeParseJson(line);
+		return isRecord(value) ? [value] : [];
 	});
 }
-function textFromContent$2(content) {
+function piMessageText(content) {
 	if (typeof content === "string") return content;
 	if (!Array.isArray(content)) return "";
 	return content.flatMap((part) => isRecord(part) && part.type === "text" && typeof part.text === "string" ? [part.text] : []).join("\n");
@@ -178,7 +167,7 @@ function processSummaryLine(state, line) {
 		return;
 	}
 	if (entry.type === "session_info") state.name = normalizeBoundedOptionalString(entry.name, 1e3);
-	else if (!state.firstMessage && entry.type === "message" && isRecord(entry.message) && entry.message.role === "user") state.firstMessage = normalizeBoundedOptionalString(textFromContent$2(entry.message.content), 1e3);
+	else if (!state.firstMessage && entry.type === "message" && isRecord(entry.message) && entry.message.role === "user") state.firstMessage = normalizeBoundedOptionalString(piMessageText(entry.message.content), 1e3);
 }
 function appendSummaryBytes(state, bytes) {
 	if (state.discarding || bytes.length === 0) return;
@@ -268,9 +257,9 @@ async function readPiSessionSummary(candidate) {
 		const { header, name, firstMessage } = projectedState;
 		const version = header?.type === "session" && typeof header.version === "number" ? header.version : 1;
 		const threadId = header?.type === "session" ? normalizeBoundedOptionalString(header.id, 256) : void 0;
-		if (header && threadId && SESSION_ID_PATTERN.test(threadId)) {
+		if (header && threadId && PI_SESSION_ID_PATTERN.test(threadId)) {
 			const cwd = normalizeBoundedOptionalString(header.cwd, 4096);
-			const createdAt = parsePiSessionTimestampMs(header.timestamp);
+			const createdAt = parseDateFirstTimestampMs(header.timestamp);
 			summary = {
 				file: candidate.file,
 				version,
@@ -383,7 +372,7 @@ async function readPiSessionById(threadId, env) {
 //#region extensions/acpx/src/pi-session-catalog.ts
 const MAX_SEARCH_LENGTH = 500;
 const isExactPiSessionCursor = sessionCatalogPaging.isExactCursor;
-function textFromContent$1(content) {
+function textFromContent(content) {
 	if (typeof content === "string") return content;
 	if (!Array.isArray(content)) return "";
 	return content.flatMap((part) => {
@@ -421,12 +410,6 @@ async function listLocalPiSessionPage(value) {
 		...hasMore ? { nextCursor: sessionCatalogPaging.encodeCursor(offset + page.length) } : {}
 	};
 }
-function isoTimestamp(message, entry) {
-	const value = parsePiSessionTimestampMs(message.timestamp) ?? parsePiSessionTimestampMs(entry.timestamp);
-	if (value === void 0) return;
-	const date = new Date(value);
-	return Number.isNaN(date.getTime()) ? void 0 : date.toISOString();
-}
 function jsonText(value, maxLength = 2e4) {
 	try {
 		const text = JSON.stringify(value);
@@ -458,7 +441,7 @@ function piMessageItems(entry) {
 	const message = entry.message;
 	const role = message.role;
 	const id = normalizeBoundedOptionalString(entry.id, 256);
-	const timestamp = isoTimestamp(message, entry);
+	const timestamp = timestampMsToIsoString(parseDateFirstTimestampMs(message.timestamp) ?? parseDateFirstTimestampMs(entry.timestamp));
 	const model = normalizeBoundedOptionalString(message.model, 256);
 	const provider = normalizeBoundedOptionalString(message.provider, 256);
 	const modelRef = provider && model ? `${provider}/${model}` : model;
@@ -468,7 +451,7 @@ function piMessageItems(entry) {
 		...modelRef ? { model: modelRef } : {}
 	};
 	if (role === "user") {
-		const text = textFromContent$1(message.content);
+		const text = textFromContent(message.content);
 		return text ? [{
 			...common,
 			type: "userMessage",
@@ -477,7 +460,7 @@ function piMessageItems(entry) {
 	}
 	if (role === "toolResult") {
 		const toolName = normalizeBoundedOptionalString(message.toolName, 256);
-		const text = textFromContent$1(message.content);
+		const text = textFromContent(message.content);
 		return [{
 			...common,
 			type: "toolResult",
@@ -502,7 +485,7 @@ function piMessageItems(entry) {
 	if (role === "custom" || role === "hookMessage") {
 		if (message.display !== true) return [];
 		const customType = normalizeBoundedOptionalString(message.customType, 256);
-		const text = textFromContent$1(message.content);
+		const text = textFromContent(message.content);
 		return text ? [{
 			...common,
 			type: "other",
@@ -547,18 +530,13 @@ function piTranscriptItems(entries) {
 			...id ? { id } : {},
 			...timestamp ? { timestamp } : {}
 		};
-		if (entry.type === "compaction" && typeof entry.summary === "string") return [{
-			...common,
-			type: "other",
-			text: entry.summary
-		}];
-		if (entry.type === "branch_summary" && typeof entry.summary === "string") return [{
+		if ((entry.type === "compaction" || entry.type === "branch_summary") && typeof entry.summary === "string") return [{
 			...common,
 			type: "other",
 			text: entry.summary
 		}];
 		if (entry.type === "custom_message" && entry.display === true) {
-			const text = textFromContent$1(entry.content);
+			const text = textFromContent(entry.content);
 			return text ? [{
 				...common,
 				type: "other",
@@ -594,12 +572,10 @@ function parseCompletePiRows(tail) {
 	for (let index = 0; index < tail.length; index += 1) {
 		if (tail[index] !== 10) continue;
 		const line = tail.subarray(lineStart, index).toString("utf8").trim();
-		if (line) try {
-			const value = JSON.parse(line);
+		if (line) {
+			const value = safeParseJson(line);
 			if (!isRecord(value)) break;
 			entries.push(value);
-		} catch {
-			break;
 		}
 		classifiedBytes = index + 1;
 		lineStart = index + 1;
@@ -609,11 +585,6 @@ function parseCompletePiRows(tail) {
 		classifiedBytes
 	};
 }
-function textFromContent(content) {
-	if (typeof content === "string") return content;
-	if (!Array.isArray(content)) return;
-	return content.flatMap((part) => isRecord(part) && part.type === "text" && typeof part.text === "string" ? [part.text] : []).join("\n") || void 0;
-}
 function readFilePath(probe) {
 	return isRecord(probe.upstreamRef) && typeof probe.upstreamRef.filePath === "string" ? probe.upstreamRef.filePath : void 0;
 }
@@ -663,10 +634,10 @@ async function checkPiSessionUpstreamActivity(probe) {
 		let occurredAt;
 		for (const entry of entries) {
 			if (entry.type !== "message" || !isRecord(entry.message) || entry.message.role !== "user") continue;
-			const text = textFromContent(entry.message.content);
+			const text = piMessageText(entry.message.content);
 			if (!isExternalUserText(probe, text)) continue;
 			humanTurns += 1;
-			occurredAt = Math.max(occurredAt ?? 0, parsePiSessionTimestampMs(entry.message.timestamp) ?? parsePiSessionTimestampMs(entry.timestamp) ?? stat.mtimeMs);
+			occurredAt = Math.max(occurredAt ?? 0, parseDateFirstTimestampMs(entry.message.timestamp) ?? parseDateFirstTimestampMs(entry.timestamp) ?? stat.mtimeMs);
 		}
 		const nextOffset = markerOffset + classifiedBytes;
 		return {
@@ -781,12 +752,6 @@ async function createAdoptedPiSession(params) {
 function assertPiLocalAccess(hostId, allowProcessHomeFallback) {
 	if (hostId === "gateway" && allowProcessHomeFallback === false && piSessionStore(process.env).usesProcessHomeFallback) throw new Error("local Pi sessions are unavailable in isolated state");
 }
-async function listPiSessions(params) {
-	return await listLocalPiSessionPage(params);
-}
-async function readPiSession(params) {
-	return await readLocalPiTranscriptPage(params);
-}
 function createPiSessionCatalogRuntime(api) {
 	return createSessionCatalogFamily({
 		runtime: api.runtime,
@@ -880,4 +845,4 @@ function createPiSessionCatalogRuntime(api) {
 	}, isExactPiSessionCursor);
 }
 //#endregion
-export { createPiSessionCatalogRuntime, listPiSessions, readPiSession, requireLocalPiSession };
+export { createPiSessionCatalogRuntime, listLocalPiSessionPage as listPiSessions, readLocalPiTranscriptPage as readPiSession, requireLocalPiSession };

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

@@ -1,5 +1,5 @@
 import { getAcpRuntimeBackend, registerAcpRuntimeBackend, unregisterAcpRuntimeBackend } from "openclaw/plugin-sdk/acp-runtime-backend";
-import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { createLazyRuntimeMethodBinder, createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/acpx/src/runtime-proxy.ts
 /** Start an ACP turn through a lazy runtime resolver without awaiting resolution up front. */
 function lazyStartRuntimeTurn(resolveRuntime, input) {
@@ -23,50 +23,27 @@ function lazyStartRuntimeTurn(resolveRuntime, input) {
 }
 /** Create an ACP runtime facade backed by an async runtime resolver. */
 function createLazyAcpRuntimeProxy(resolveRuntime) {
+	const bind = createLazyRuntimeMethodBinder(resolveRuntime);
 	return {
 		ownerAwareSessions: 1,
-		async findSession(input) {
-			return await (await resolveRuntime()).findSession(input);
-		},
-		async shutdown() {
-			await (await resolveRuntime()).shutdown();
-		},
-		async ensureSession(input) {
-			return await (await resolveRuntime()).ensureSession(input);
-		},
+		findSession: bind((runtime) => runtime.findSession.bind(runtime)),
+		shutdown: bind((runtime) => runtime.shutdown.bind(runtime)),
+		ensureSession: bind((runtime) => runtime.ensureSession.bind(runtime)),
 		startTurn(input) {
 			return lazyStartRuntimeTurn(resolveRuntime, input);
 		},
 		async *runTurn(input) {
 			yield* (await resolveRuntime()).runTurn(input);
 		},
-		async getCapabilities(input) {
-			return await (await resolveRuntime()).getCapabilities(input);
-		},
-		async getStatus(input) {
-			return await (await resolveRuntime()).getStatus(input);
-		},
-		async setMode(input) {
-			await (await resolveRuntime()).setMode(input);
-		},
-		async setModel(input) {
-			await (await resolveRuntime()).setModel(input);
-		},
-		async setConfigOption(input) {
-			return await (await resolveRuntime()).setConfigOption(input);
-		},
-		async doctor() {
-			return await (await resolveRuntime()).doctor();
-		},
-		async prepareFreshSession(input) {
-			await (await resolveRuntime()).prepareFreshSession(input);
-		},
-		async cancel(input) {
-			await (await resolveRuntime()).cancel(input);
-		},
-		async close(input) {
-			await (await resolveRuntime()).close(input);
-		}
+		getCapabilities: bind((runtime) => runtime.getCapabilities.bind(runtime)),
+		getStatus: bind((runtime) => runtime.getStatus.bind(runtime)),
+		setMode: bind((runtime) => runtime.setMode.bind(runtime)),
+		setModel: bind((runtime) => runtime.setModel.bind(runtime)),
+		setConfigOption: bind((runtime) => runtime.setConfigOption.bind(runtime)),
+		doctor: bind((runtime) => runtime.doctor.bind(runtime)),
+		prepareFreshSession: bind((runtime) => runtime.prepareFreshSession.bind(runtime)),
+		cancel: bind((runtime) => runtime.cancel.bind(runtime)),
+		close: bind((runtime) => runtime.close.bind(runtime))
 	};
 }
 //#endregion
@@ -76,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-DMae5pPH.mjs"));
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-BXgGdE56.mjs"));
 function unregisterOwnedRuntime(runtime) {
 	if (runtime && getAcpRuntimeBackend(ACPX_BACKEND_ID)?.runtime === runtime) unregisterAcpRuntimeBackend(ACPX_BACKEND_ID);
 }