@openclaw/acpx 2026.7.1-beta.6 → 2026.7.2-beta.1

package/dist/{process-reaper-cncoDfwV.js → process-reaper-B29BzBk4.js}

@@ -1,13 +1,12 @@
+import { t as AcpxPluginConfigSchema } from "./config-schema-lrk5nlcV.js";
 import "./process-lease-DiKkFj6F.js";
 import { createRequire } from "node:module";
 import { formatPluginConfigIssue } from "openclaw/plugin-sdk/extension-shared";
-import path from "node:path";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import fs from "node:fs";
+import path from "node:path";
+import { runExec } from "openclaw/plugin-sdk/process-runtime";
 import { fileURLToPath } from "node:url";
-import { z } from "zod";
 //#region extensions/acpx/src/command-line.ts
 /**
 * Small shell-command helpers for ACPX-launched processes. Splitting supports
@@ -56,42 +55,6 @@ function splitCommandParts(value) {
 	return parts;
 }
 //#endregion
-//#region extensions/acpx/src/config-schema.ts
-/**
-* ACPX plugin configuration schema and public config types. Runtime setup uses
-* this file as the single source of truth for validation and defaulting.
-*/
-const ACPX_PERMISSION_MODES = [
-	"approve-all",
-	"approve-reads",
-	"deny-all"
-];
-const ACPX_NON_INTERACTIVE_POLICIES = ["deny", "fail"];
-const nonEmptyTrimmedString = (message) => z.string({ error: message }).trim().min(1, { error: message });
-const McpServerConfigSchema = z.object({
-	command: nonEmptyTrimmedString("command must be a non-empty string").describe("Command to run the MCP server"),
-	args: z.array(z.string({ error: "args must be an array of strings" }), { error: "args must be an array of strings" }).optional().describe("Arguments to pass to the command"),
-	env: z.record(z.string(), z.string({ error: "env values must be strings" }), { error: "env must be an object of strings" }).optional().describe("Environment variables for the MCP server")
-});
-/** Zod schema for validating raw ACPX plugin config from OpenClaw config. */
-const AcpxPluginConfigSchema = z.strictObject({
-	cwd: nonEmptyTrimmedString("cwd must be a non-empty string").optional(),
-	stateDir: nonEmptyTrimmedString("stateDir must be a non-empty string").optional(),
-	probeAgent: nonEmptyTrimmedString("probeAgent must be a non-empty string").optional(),
-	permissionMode: z.enum(ACPX_PERMISSION_MODES, { error: `permissionMode must be one of: ${ACPX_PERMISSION_MODES.join(", ")}` }).optional(),
-	nonInteractivePermissions: z.enum(ACPX_NON_INTERACTIVE_POLICIES, { error: `nonInteractivePermissions must be one of: ${ACPX_NON_INTERACTIVE_POLICIES.join(", ")}` }).optional(),
-	pluginToolsMcpBridge: z.boolean({ error: "pluginToolsMcpBridge must be a boolean" }).optional(),
-	openClawToolsMcpBridge: z.boolean({ error: "openClawToolsMcpBridge must be a boolean" }).optional(),
-	strictWindowsCmdWrapper: z.boolean({ error: "strictWindowsCmdWrapper must be a boolean" }).optional(),
-	timeoutSeconds: z.number({ error: "timeoutSeconds must be a number >= 0.001" }).min(.001, { error: "timeoutSeconds must be a number >= 0.001" }).default(120),
-	queueOwnerTtlSeconds: z.number({ error: "queueOwnerTtlSeconds must be a number >= 0" }).min(0, { error: "queueOwnerTtlSeconds must be a number >= 0" }).optional(),
-	mcpServers: z.record(z.string(), McpServerConfigSchema).optional(),
-	agents: z.record(z.string(), z.strictObject({
-		command: nonEmptyTrimmedString("agents.<id>.command must be a non-empty string"),
-		args: z.array(z.string({ error: "args must be an array of strings" })).optional()
-	})).optional()
-});
-//#endregion
 //#region extensions/acpx/src/config.ts
 /**
 * Resolves ACPX plugin config from raw user configuration. It locates the
@@ -260,7 +223,7 @@ function resolveAcpxPluginConfig(params) {
 	return {
 		cwd,
 		stateDir,
-		probeAgent: normalizeLowercaseStringOrEmpty(normalized.probeAgent) || void 0,
+		probeAgent: normalized.probeAgent,
 		permissionMode: normalized.permissionMode ?? DEFAULT_PERMISSION_MODE,
 		nonInteractivePermissions: normalized.nonInteractivePermissions ?? DEFAULT_NON_INTERACTIVE_POLICY,
 		pluginToolsMcpBridge,
@@ -282,7 +245,6 @@ function resolveAcpxPluginConfig(params) {
 * ACPX process ownership checks and cleanup. The reaper only terminates
 * OpenClaw-owned wrapper trees after validating paths, packages, and lease ids.
 */
-const execFileAsync = promisify(execFile);
 const requireFromHere = createRequire(import.meta.url);
 const GENERATED_WRAPPER_BASENAMES = /* @__PURE__ */ new Set(["codex-acp-wrapper.mjs", "claude-agent-acp-wrapper.mjs"]);
 const OPENCLAW_PLUGIN_DEPS_MARKER = "/plugin-runtime-deps/";
@@ -375,11 +337,14 @@ function parseProcessList(stdout) {
 	const processes = [];
 	for (const line of stdout.split(/\r?\n/)) {
 		const match = /^\s*(?<pid>\d+)\s+(?<ppid>\d+)\s+(?<command>.+?)\s*$/.exec(line);
-		if (!match?.groups) continue;
+		const pid = match?.groups?.pid;
+		const ppid = match?.groups?.ppid;
+		const command = match?.groups?.command;
+		if (!pid || !ppid || !command) continue;
 		processes.push({
-			pid: Number.parseInt(match.groups.pid, 10),
-			ppid: Number.parseInt(match.groups.ppid, 10),
-			command: match.groups.command
+			pid: Number.parseInt(pid, 10),
+			ppid: Number.parseInt(ppid, 10),
+			command
 		});
 	}
 	return processes;
@@ -387,7 +352,10 @@ function parseProcessList(stdout) {
 /** List host processes in the compact shape needed by ACPX cleanup. */
 async function listPlatformProcesses() {
 	if (process.platform === "win32") return [];
-	const { stdout } = await execFileAsync("ps", ["-axo", "pid=,ppid=,command="], { maxBuffer: 8 * 1024 * 1024 });
+	const { stdout } = await runExec("ps", ["-axo", "pid=,ppid=,command="], {
+		logOutput: false,
+		maxBuffer: 8 * 1024 * 1024
+	});
 	return parseProcessList(stdout);
 }
 function collectProcessTree(processes, rootPid) {

package/dist/{register.runtime-Yz704dK5.js → register.runtime-DBqbPx5P.js}

@@ -200,7 +200,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-CzJr7Koj.js"));
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-Dm8hpy-C.js"));
 async function startRealService(state) {
 	if (state.realRuntime) return state.realRuntime;
 	if (!state.ctx) throw new Error("ACPX runtime service is not started");

package/dist/register.runtime.js

@@ -1,2 +1,2 @@
-import { t as createAcpxRuntimeService } from "./register.runtime-Yz704dK5.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-DBqbPx5P.js";
 export { createAcpxRuntimeService };

package/dist/{runtime-WjNm2DKO.js → runtime-D_fW1HnP.js}

@@ -1,13 +1,14 @@
 import { i as createAcpxProcessLeaseId, o as hashAcpxProcessCommand, u as withAcpxLeaseEnvironment } from "./process-lease-DiKkFj6F.js";
 import { AcpRuntimeError } from "./runtime-api.js";
-import { c as splitCommandParts, n as isOpenClawLeaseAwareAcpxProcessCommand, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-cncoDfwV.js";
+import { c as splitCommandParts, n as isOpenClawLeaseAwareAcpxProcessCommand, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-B29BzBk4.js";
+import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
+import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path, { resolve } from "node:path";
-import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { ACPX_BACKEND_ID, AcpxRuntime as AcpxRuntime$1, createAcpRuntime, createAgentRegistry, createFileSessionStore, decodeAcpxRuntimeHandleState, encodeAcpxRuntimeHandleState, isRequestedModelUnsupportedError } from "acpx/runtime";
-import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import { redactSensitiveText } from "openclaw/plugin-sdk/security-runtime";
+import { sliceUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/acpx/src/runtime.ts
 /**
 * OpenClaw ACPX runtime adapter. It wraps the upstream acpx runtime with
@@ -48,7 +49,7 @@ function isGenericInternalAcpError(error) {
 async function readCodexWrapperStderrTail(params) {
 	if (!params.wrapperRoot || !params.leaseId) return "";
 	try {
-		return compactDiagnosticText(redactSensitiveText((await fs.readFile(path.join(params.wrapperRoot, codexWrapperStderrLogFileName(params.leaseId)), "utf8")).slice(-6e3)));
+		return compactDiagnosticText(redactSensitiveText(sliceUtf16Safe(await fs.readFile(path.join(params.wrapperRoot, codexWrapperStderrLogFileName(params.leaseId)), "utf8"), -6e3)));
 	} catch {
 		return "";
 	}
@@ -213,9 +214,14 @@ function isEnvAssignment(value) {
 	return /^[A-Za-z_][A-Za-z0-9_]*=/.test(value);
 }
 function unwrapEnvCommand(parts) {
-	if (!parts.length || basename(parts[0]) !== "env") return parts;
+	const command = parts.at(0);
+	if (!command || basename(command) !== "env") return parts;
 	let index = 1;
-	while (index < parts.length && isEnvAssignment(parts[index])) index += 1;
+	while (true) {
+		const part = parts.at(index);
+		if (!part || !isEnvAssignment(part)) break;
+		index += 1;
+	}
 	return parts.slice(index);
 }
 function matchesExecutableName(value, executableName) {
@@ -362,13 +368,6 @@ function resolveAgentCommand(params) {
 	const resolvedCommand = params.agentRegistry.resolve(normalizedAgentName);
 	return typeof resolvedCommand === "string" ? resolvedCommand.trim() || void 0 : void 0;
 }
-function resolveProbeAgentName(options) {
-	const { probeAgent } = options;
-	return normalizeAgentName(typeof probeAgent === "string" ? probeAgent : void 0) ?? "codex";
-}
-function resolveAgentCommandForName(params) {
-	return resolveAgentCommand(params);
-}
 function shouldUseBridgeSafeDelegateForCommand(command) {
 	return isOpenClawBridgeCommand(command);
 }
@@ -430,17 +429,12 @@ var AcpxRuntime = class {
 			...sharedOptions,
 			mcpServers: []
 		}, this.delegateTestOptions) : this.delegate;
-		this.probeDelegate = this.openclawToolsMcpBridgeEnabled ? this.bridgeSafeDelegate : this.resolveDelegateForAgent(resolveProbeAgentName(options));
-	}
-	resolveDelegateForAgent(agentName) {
-		const command = resolveAgentCommandForName({
-			agentName,
+		const probeCommand = resolveAgentCommand({
+			agentName: normalizeAgentName(options.probeAgent) ?? "codex",
 			agentRegistry: this.agentRegistry
 		});
-		return this.resolveDelegateForCommand(command);
-	}
-	resolveDelegateForCommand(command) {
-		return shouldUseBridgeSafeDelegateForCommand(command) ? this.bridgeSafeDelegate : this.delegate;
+		const useBridgeSafeProbe = this.openclawToolsMcpBridgeEnabled || shouldUseBridgeSafeDelegateForCommand(probeCommand);
+		this.probeDelegate = useBridgeSafeProbe ? this.bridgeSafeDelegate : this.delegate;
 	}
 	resolveDelegateForSession(params) {
 		if (shouldUseBridgeSafeDelegateForCommand(params.command)) return this.bridgeSafeDelegate;
@@ -479,7 +473,7 @@ var AcpxRuntime = class {
 			command: recordCommand,
 			sessionKey: handle.sessionKey
 		});
-		const command = resolveAgentCommandForName({
+		const command = resolveAgentCommand({
 			agentName: readAgentFromHandle(handle),
 			agentRegistry: this.agentRegistry
 		});
@@ -491,7 +485,7 @@ var AcpxRuntime = class {
 	async resolveCommandForHandle(handle) {
 		const recordCommand = readAgentCommandFromRecord(await this.sessionStore.load(handle.acpxRecordId ?? handle.sessionKey));
 		if (recordCommand) return recordCommand;
-		return resolveAgentCommandForName({
+		return resolveAgentCommand({
 			agentName: readAgentFromHandle(handle),
 			agentRegistry: this.agentRegistry
 		});
@@ -585,7 +579,7 @@ var AcpxRuntime = class {
 			await this.processLeaseStore?.markState(lease.leaseId, result.terminatedPids.length > 0 || result.skippedReason === "missing-root" ? "closed" : "lost");
 			return;
 		}
-		const rootCommand = readAgentCommandFromRecord(record) ?? resolveAgentCommandForName({
+		const rootCommand = readAgentCommandFromRecord(record) ?? resolveAgentCommand({
 			agentName: readAgentFromHandle(handle),
 			agentRegistry: this.agentRegistry
 		});
@@ -611,7 +605,7 @@ var AcpxRuntime = class {
 	}
 	async ensureSession(input) {
 		assertSupportedRuntimeSessionMode(input.mode);
-		const command = resolveAgentCommandForName({
+		const command = resolveAgentCommand({
 			agentName: input.agent,
 			agentRegistry: this.agentRegistry
 		});

package/dist/{service-CzJr7Koj.js → service-Dm8hpy-C.js}

@@ -1,17 +1,19 @@
-import { n as createLazyAcpRuntimeProxy } from "./register.runtime-Yz704dK5.js";
+import { n as createLazyAcpRuntimeProxy } from "./register.runtime-DBqbPx5P.js";
+import "./config-schema-lrk5nlcV.js";
 import { a as createAcpxProcessLeaseStore, d as ACPX_GATEWAY_INSTANCE_KEY, f as ACPX_GATEWAY_INSTANCE_NAMESPACE, h as normalizeAcpxGatewayInstanceRecord, l as openAcpxProcessLeaseStateStore, n as OPENCLAW_ACPX_LEASE_ID_ENV, r as OPENCLAW_GATEWAY_INSTANCE_ID_ARG, t as OPENCLAW_ACPX_LEASE_ID_ARG } from "./process-lease-DiKkFj6F.js";
 import { registerAcpRuntimeBackend, unregisterAcpRuntimeBackend } from "./runtime-api.js";
-import { a as resolveAcpxPluginRoot, c as splitCommandParts, i as resolveAcpxPluginConfig, o as toAcpMcpServers, r as reapStaleOpenClawOwnedAcpxOrphans, s as quoteCommandPart, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-cncoDfwV.js";
+import { a as resolveAcpxPluginRoot, c as splitCommandParts, i as resolveAcpxPluginConfig, o as toAcpMcpServers, r as reapStaleOpenClawOwnedAcpxOrphans, s as quoteCommandPart, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-B29BzBk4.js";
 import { createRequire } from "node:module";
+import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import fs from "node:fs/promises";
+import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import fs from "node:fs";
+import fs$1 from "node:fs/promises";
 import path from "node:path";
+import os from "node:os";
 import { randomUUID } from "node:crypto";
-import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { inspect } from "node:util";
-import fs$1 from "node:fs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import os from "node:os";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
 //#region extensions/acpx/src/codex-trust-config.ts
 /**
@@ -123,9 +125,11 @@ function extractTrustedCodexProjectPaths(configToml) {
 			continue;
 		}
 		const assignment = /^(?<key>"(?:\\.|[^"\\])*"|'[^']*'|[A-Za-z0-9_\-/.~:]+)\s*=\s*(?<value>.+)$/.exec(line);
-		if (!assignment?.groups) continue;
-		const key = parseTomlString(assignment.groups.key) ?? assignment.groups.key;
-		const value = assignment.groups.value.trim();
+		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;
@@ -229,7 +233,7 @@ const RUN_CONFIGURED_COMMAND_SENTINEL = "--openclaw-run-configured";
 const requireFromHere = createRequire(import.meta.url);
 function readSelfManifest() {
 	const manifestPath = path.join(resolveAcpxPluginRoot(import.meta.url), "package.json");
-	return JSON.parse(fs$1.readFileSync(manifestPath, "utf8"));
+	return JSON.parse(fs.readFileSync(manifestPath, "utf8"));
 }
 function readManifestDependencyVersion(packageName) {
 	const version = readSelfManifest().dependencies?.[packageName];
@@ -254,7 +258,7 @@ async function resolveInstalledAcpPackageBinPath(packageName, binName) {
 		if (manifest.name !== packageName) return;
 		const binPath = resolvePackageBinPath(packageJsonPath, manifest, binName);
 		if (!binPath) return;
-		await fs.access(binPath);
+		await fs$1.access(binPath);
 		return binPath;
 	} catch {
 		return;
@@ -381,6 +385,7 @@ function buildAdapterWrapperScript(params) {
 import { appendFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { spawn } from "node:child_process";
+import { StringDecoder } from "node:string_decoder";
 import { fileURLToPath } from "node:url";
 
 ${params.envSetup}
@@ -431,7 +436,25 @@ function redactDiagnosticText(text) {
   return redacted;
 }
 
+function tailUtf16Safe(text, maxChars) {
+  let start = Math.max(0, text.length - maxChars);
+  const startsInsideSurrogatePair =
+    start > 0 &&
+    start < text.length &&
+    text.charCodeAt(start) >= 0xdc00 &&
+    text.charCodeAt(start) <= 0xdfff &&
+    text.charCodeAt(start - 1) >= 0xd800 &&
+    text.charCodeAt(start - 1) <= 0xdbff;
+  if (startsInsideSurrogatePair) {
+    start += 1;
+  }
+  return text.slice(start);
+}
+
 let pendingStderrLogText = "";
+// Pipe chunks can split a UTF-8 sequence. Preserve decoder state so diagnostic
+// capture does not manufacture replacement characters between chunks.
+const stderrDecoder = new StringDecoder("utf8");
 const stderrPrivateKeyEndPattern = /-----END [A-Z ]*PRIVATE KEY-----/;
 
 function hasUnclosedPrivateKeyBlock(text) {
@@ -456,7 +479,7 @@ function writeRedactedStderrLog(text) {
     appendFileSync(stderrLogPath, redactDiagnosticText(text), "utf8");
     const current = readFileSync(stderrLogPath, "utf8");
     if (current.length > stderrLogMaxChars) {
-      writeFileSync(stderrLogPath, current.slice(-stderrLogMaxChars), "utf8");
+      writeFileSync(stderrLogPath, tailUtf16Safe(current, stderrLogMaxChars), "utf8");
     }
   } catch {
     // Stderr capture is diagnostic-only; never break the ACP adapter.
@@ -475,7 +498,7 @@ function flushFinalizedStderrLogText() {
   const lastLineBreak = pendingStderrLogText.lastIndexOf("\\n");
   if (lastLineBreak === -1) {
     if (pendingStderrLogText.length > stderrLogMaxChars) {
-      pendingStderrLogText = pendingStderrLogText.slice(-stderrLogMaxChars);
+      pendingStderrLogText = tailUtf16Safe(pendingStderrLogText, stderrLogMaxChars);
     }
     return;
   }
@@ -488,7 +511,7 @@ function flushFinalizedStderrLogText() {
   }
   if (flushEnd <= 0) {
     if (pendingStderrLogText.length > stderrLogMaxChars) {
-      pendingStderrLogText = pendingStderrLogText.slice(-stderrLogMaxChars);
+      pendingStderrLogText = tailUtf16Safe(pendingStderrLogText, stderrLogMaxChars);
     }
     return;
   }
@@ -498,7 +521,7 @@ function flushFinalizedStderrLogText() {
 }
 
 function appendStderrLog(chunk) {
-  const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+  const text = stderrDecoder.write(chunk);
   if (!text) {
     return;
   }
@@ -507,6 +530,7 @@ function appendStderrLog(chunk) {
 }
 
 function finishStderrLog() {
+  pendingStderrLogText += stderrDecoder.end();
   const text = redactIncompletePrivateKeyTail(pendingStderrLogText);
   pendingStderrLogText = "";
   writeRedactedStderrLog(text);
@@ -731,7 +755,7 @@ function buildClaudeAcpWrapperScript(installedBinPath) {
 }
 async function readSourceCodexConfig(codexHome) {
 	try {
-		return await fs.readFile(path.join(codexHome, "config.toml"), "utf8");
+		return await fs$1.readFile(path.join(codexHome, "config.toml"), "utf8");
 	} catch (error) {
 		if (error.code === "ENOENT") return;
 		throw error;
@@ -741,8 +765,8 @@ 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.mkdir(codexHome, { recursive: true });
-	await fs.writeFile(path.join(codexHome, "config.toml"), renderIsolatedCodexConfig({
+	await fs$1.mkdir(codexHome, { recursive: true });
+	await fs$1.writeFile(path.join(codexHome, "config.toml"), renderIsolatedCodexConfig({
 		sourceConfigToml: sourceConfig,
 		projectPaths: trustedProjectPaths
 	}), "utf8");
@@ -750,20 +774,20 @@ async function prepareIsolatedCodexHome(params) {
 }
 async function makeGeneratedWrapperExecutableIfPossible(wrapperPath) {
 	try {
-		await fs.chmod(wrapperPath, 493);
+		await fs$1.chmod(wrapperPath, 493);
 	} catch {}
 }
 async function writeCodexAcpWrapper(baseDir, installedBinPath) {
-	await fs.mkdir(baseDir, { recursive: true });
+	await fs$1.mkdir(baseDir, { recursive: true });
 	const wrapperPath = path.join(baseDir, "codex-acp-wrapper.mjs");
-	await fs.writeFile(wrapperPath, buildCodexAcpWrapperScript(installedBinPath), { encoding: "utf8" });
+	await fs$1.writeFile(wrapperPath, buildCodexAcpWrapperScript(installedBinPath), { encoding: "utf8" });
 	await makeGeneratedWrapperExecutableIfPossible(wrapperPath);
 	return wrapperPath;
 }
 async function writeClaudeAcpWrapper(baseDir, installedBinPath) {
-	await fs.mkdir(baseDir, { recursive: true });
+	await fs$1.mkdir(baseDir, { recursive: true });
 	const wrapperPath = path.join(baseDir, "claude-agent-acp-wrapper.mjs");
-	await fs.writeFile(wrapperPath, buildClaudeAcpWrapperScript(installedBinPath), { encoding: "utf8" });
+	await fs$1.writeFile(wrapperPath, buildClaudeAcpWrapperScript(installedBinPath), { encoding: "utf8" });
 	await makeGeneratedWrapperExecutableIfPossible(wrapperPath);
 	return wrapperPath;
 }
@@ -852,7 +876,7 @@ async function prepareAcpxCodexAuthConfig(params) {
 const ENABLE_STARTUP_PROBE_ENV = "OPENCLAW_ACPX_RUNTIME_STARTUP_PROBE";
 const SKIP_RUNTIME_PROBE_ENV = "OPENCLAW_SKIP_ACPX_RUNTIME_PROBE";
 const ACPX_BACKEND_ID = "acpx";
-const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-WjNm2DKO.js"));
+const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-D_fW1HnP.js"));
 /** Convert ACPX timeout seconds into timer-safe milliseconds. */
 function resolveAcpxTimerTimeoutMs(timeoutSeconds) {
 	if (timeoutSeconds === void 0) return;
@@ -924,13 +948,9 @@ function formatDoctorFailureMessage(report) {
 	const detailText = report.details?.map(formatDoctorDetail).filter(Boolean).join("; ").trim();
 	return detailText ? `${report.message} (${detailText})` : report.message;
 }
-function normalizeProbeAgent(value) {
-	const normalized = value?.trim().toLowerCase();
-	return normalized ? normalized : void 0;
-}
 function resolveAllowedAgentsProbeAgent(ctx) {
 	for (const agent of ctx.config.acp?.allowedAgents ?? []) {
-		const normalized = normalizeProbeAgent(agent);
+		const normalized = normalizeLowercaseStringOrEmpty(agent);
 		if (normalized) return normalized;
 	}
 }
@@ -1043,8 +1063,8 @@ function createAcpxRuntimeService(params = {}) {
 			}));
 			const wrapperRoot = path.join(ctx.stateDir, "acpx");
 			await measureAcpxStartup(ctx, "filesystem.prepare", async () => {
-				await fs.mkdir(pluginConfig.stateDir, { recursive: true });
-				await fs.mkdir(wrapperRoot, { recursive: true });
+				await fs$1.mkdir(pluginConfig.stateDir, { recursive: true });
+				await fs$1.mkdir(wrapperRoot, { recursive: true });
 			});
 			const gatewayInstanceId = await measureAcpxStartup(ctx, "gateway-instance-id", () => resolveGatewayInstanceId(openKeyedStore));
 			const processLeaseStore = createAcpxProcessLeaseStore({ store: openAcpxProcessLeaseStateStore(openKeyedStore) });

package/dist/setup-api.js

@@ -1,5 +1,5 @@
-import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/acpx/setup-api.ts
 /**
 * ACPX setup plugin entry. It auto-enables setup when ACP config already points

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.7.1-beta.6",
+  "version": "2026.7.2-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/acpx",
-      "version": "2026.7.1-beta.6",
+      "version": "2026.7.2-beta.1",
       "dependencies": {
         "@agentclientprotocol/claude-agent-acp": "0.55.0",
         "@zed-industries/codex-acp": "0.16.0",

package/openclaw.plugin.json

@@ -49,9 +49,15 @@
         "type": "number",
         "minimum": 0
       },
-      "probeAgent": {
-        "type": "string",
-        "minLength": 1
+      "piSessionCatalog": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "default": true
+          }
+        }
       },
       "mcpServers": {
         "type": "object",
@@ -138,6 +144,10 @@
       "help": "Reserved compatibility field for the older embedded ACPX queue-owner path. Accepted for compatibility and logged as ignored.",
       "advanced": true
     },
+    "piSessionCatalog.enabled": {
+      "label": "Pi Session Catalog",
+      "help": "Auto-detect Pi sessions on the Gateway and paired nodes, then show them in the sessions sidebar."
+    },
     "probeAgent": {
       "label": "Health Probe Agent",
       "help": "Agent id used for the embedded ACP runtime health probe. Defaults to the first `acp.allowedAgents` entry when that allowlist is set, otherwise to the runtime built-in probe agent (codex). Set this explicitly (for example `opencode` or `claude`) when the default probe agent is not installed or not authenticated, so the whole embedded ACP backend does not get marked unavailable.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.7.1-beta.6",
+  "version": "2026.7.2-beta.1",
   "description": "OpenClaw ACP runtime backend with plugin-owned session and transport management.",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.7.1-beta.6"
+      "pluginApi": ">=2026.7.2-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.7.1-beta.6",
+      "openclawVersion": "2026.7.2-beta.1",
       "staticAssets": [
         {
           "source": "./src/runtime-internals/mcp-proxy.mjs",
@@ -58,7 +58,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.7.1-beta.6"
+    "openclaw": ">=2026.7.2-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {