@openclaw/acpx 2026.6.11 → 2026.7.1-beta.2

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as createAcpxRuntimeService } from "./register.runtime-CmYbf9SF.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-Bcp4wC4g.js";
 import { tryDispatchAcpReplyHook } from "openclaw/plugin-sdk/acp-runtime-backend";
 //#region extensions/acpx/index.ts
 /**

package/dist/{register.runtime-CmYbf9SF.js → register.runtime-Bcp4wC4g.js}

@@ -1,17 +1,11 @@
 import { getAcpRuntimeBackend, registerAcpRuntimeBackend, unregisterAcpRuntimeBackend } from "openclaw/plugin-sdk/acp-runtime-backend";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 //#region extensions/acpx/src/runtime-turn.ts
-function createDeferredResult() {
-	let resolve;
-	let reject;
-	return {
-		promise: new Promise((resolvePromise, rejectPromise) => {
-			resolve = resolvePromise;
-			reject = rejectPromise;
-		}),
-		resolve,
-		reject
-	};
-}
+/**
+* ACPX turn adapters. Modern runtimes can expose startTurn directly; legacy
+* runtimes that only stream runTurn events are adapted to the newer contract.
+*/
 var LegacyRunTurnEventQueue = class {
 	constructor() {
 		this.items = [];
@@ -62,7 +56,7 @@ var LegacyRunTurnEventQueue = class {
 	}
 };
 function legacyRunTurnAsStartTurn(runtime, input) {
-	const result = createDeferredResult();
+	const result = createDeferred();
 	result.promise.catch(() => {});
 	const queue = new LegacyRunTurnEventQueue();
 	let resultSettled = false;
@@ -203,11 +197,7 @@ function createLazyAcpRuntimeProxy(resolveRuntime) {
 * immediately, then imports the heavier service only when a session needs it.
 */
 const ACPX_BACKEND_ID = "acpx";
-let serviceModulePromise = null;
-function loadServiceModule() {
-	serviceModulePromise ??= import("./service-BqMIPoSJ.js");
-	return serviceModulePromise;
-}
+const loadServiceModule = createLazyRuntimeModule(() => import("./service-DrBh86Oc.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-CmYbf9SF.js";
+import { t as createAcpxRuntimeService } from "./register.runtime-Bcp4wC4g.js";
 export { createAcpxRuntimeService };

package/dist/{runtime-B1cHS4Li.js → runtime-7Xuu2bcn.js}

@@ -1,6 +1,6 @@
 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-Dv_iMcOo.js";
+import { c as splitCommandParts, n as isOpenClawLeaseAwareAcpxProcessCommand, t as cleanupOpenClawOwnedAcpxProcessTree } from "./process-reaper-_ttV4L1d.js";
 import fs from "node:fs/promises";
 import path, { resolve } from "node:path";
 import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -13,6 +13,8 @@ import { redactSensitiveText } from "openclaw/plugin-sdk/security-runtime";
 * OpenClaw ACPX runtime adapter. It wraps the upstream acpx runtime with
 * OpenClaw session metadata, lease tracking, model scoping, and cleanup policy.
 */
+const ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME = "openclaw-tools";
+const OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY_ENV = "OPENCLAW_TOOLS_MCP_AGENT_SESSION_KEY";
 function withOpenClawManagedTurnTimeout(input) {
 	return {
 		...input,
@@ -374,16 +376,36 @@ function shouldUseDistinctBridgeDelegate(options) {
 	const { mcpServers } = options;
 	return Array.isArray(mcpServers) && mcpServers.length > 0;
 }
+function withOpenClawToolsMcpSessionEnv(params) {
+	const sessionKey = params.sessionKey.trim();
+	if (!params.enabled || !sessionKey || !params.mcpServers?.length) return params.mcpServers;
+	let changed = false;
+	const nextServers = params.mcpServers.map((server) => {
+		if (server.name !== ACPX_OPENCLAW_TOOLS_MCP_SERVER_NAME || !("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
+		};
+	});
+	return changed ? nextServers : params.mcpServers;
+}
 /** OpenClaw-managed ACP runtime implementation backed by the upstream acpx runtime. */
 var AcpxRuntime = class {
 	constructor(options, testOptions) {
 		this.codexAcpModelOverrideScope = new AsyncLocalStorage();
+		this.openclawToolsSessionDelegates = /* @__PURE__ */ new Map();
 		this.launchLeaseScope = new AsyncLocalStorage();
 		const { openclawProcessCleanup, ...delegateTestOptions } = testOptions ?? {};
 		this.processCleanupDeps = openclawProcessCleanup;
 		this.wrapperRoot = options.openclawWrapperRoot;
 		this.gatewayInstanceId = options.openclawGatewayInstanceId;
 		this.processLeaseStore = options.openclawProcessLeaseStore;
+		this.openclawToolsMcpBridgeEnabled = options.openclawToolsMcpBridgeEnabled === true;
 		this.cwd = options.cwd;
 		this.sessionStore = createResetAwareSessionStore(options.sessionStore, {
 			gatewayInstanceId: this.gatewayInstanceId,
@@ -401,12 +423,14 @@ var AcpxRuntime = class {
 			sessionStore: this.sessionStore,
 			agentRegistry: this.scopedAgentRegistry
 		};
-		this.delegate = new AcpxRuntime$1(sharedOptions, delegateTestOptions);
+		this.delegateOptions = sharedOptions;
+		this.delegateTestOptions = delegateTestOptions;
+		this.delegate = new AcpxRuntime$1(sharedOptions, this.delegateTestOptions);
 		this.bridgeSafeDelegate = shouldUseDistinctBridgeDelegate(options) ? new AcpxRuntime$1({
 			...sharedOptions,
 			mcpServers: []
-		}, delegateTestOptions) : this.delegate;
-		this.probeDelegate = this.resolveDelegateForAgent(resolveProbeAgentName(options));
+		}, this.delegateTestOptions) : this.delegate;
+		this.probeDelegate = this.openclawToolsMcpBridgeEnabled ? this.bridgeSafeDelegate : this.resolveDelegateForAgent(resolveProbeAgentName(options));
 	}
 	resolveDelegateForAgent(agentName) {
 		const command = resolveAgentCommandForName({
@@ -418,14 +442,51 @@ var AcpxRuntime = class {
 	resolveDelegateForCommand(command) {
 		return shouldUseBridgeSafeDelegateForCommand(command) ? this.bridgeSafeDelegate : this.delegate;
 	}
+	resolveDelegateForSession(params) {
+		if (shouldUseBridgeSafeDelegateForCommand(params.command)) return this.bridgeSafeDelegate;
+		return this.resolveOpenClawToolsDelegateForSession(params.sessionKey);
+	}
+	resolveOpenClawToolsDelegateForSession(sessionKey) {
+		if (!this.openclawToolsMcpBridgeEnabled) return this.delegate;
+		const normalizedSessionKey = sessionKey.trim();
+		if (!normalizedSessionKey) return this.delegate;
+		const cached = this.openclawToolsSessionDelegates.get(normalizedSessionKey);
+		if (cached) return cached;
+		const delegate = new AcpxRuntime$1({
+			...this.delegateOptions,
+			mcpServers: withOpenClawToolsMcpSessionEnv({
+				enabled: this.openclawToolsMcpBridgeEnabled,
+				mcpServers: this.delegateOptions.mcpServers,
+				sessionKey: normalizedSessionKey
+			})
+		}, this.delegateTestOptions);
+		this.openclawToolsSessionDelegates.set(normalizedSessionKey, delegate);
+		return delegate;
+	}
+	releaseOpenClawToolsDelegateForSession(sessionKey) {
+		if (!this.openclawToolsMcpBridgeEnabled) return;
+		const normalizedSessionKey = sessionKey.trim();
+		if (!normalizedSessionKey) return;
+		this.openclawToolsSessionDelegates.delete(normalizedSessionKey);
+	}
 	async resolveDelegateForHandle(handle) {
 		const record = await this.sessionStore.load(handle.acpxRecordId ?? handle.sessionKey);
 		return this.resolveDelegateForLoadedRecord(handle, record);
 	}
 	resolveDelegateForLoadedRecord(handle, record) {
 		const recordCommand = readAgentCommandFromRecord(record);
-		if (recordCommand) return this.resolveDelegateForCommand(recordCommand);
-		return this.resolveDelegateForAgent(readAgentFromHandle(handle));
+		if (recordCommand) return this.resolveDelegateForSession({
+			command: recordCommand,
+			sessionKey: handle.sessionKey
+		});
+		const command = resolveAgentCommandForName({
+			agentName: readAgentFromHandle(handle),
+			agentRegistry: this.agentRegistry
+		});
+		return this.resolveDelegateForSession({
+			command,
+			sessionKey: handle.sessionKey
+		});
 	}
 	async resolveCommandForHandle(handle) {
 		const recordCommand = readAgentCommandFromRecord(await this.sessionStore.load(handle.acpxRecordId ?? handle.sessionKey));
@@ -554,7 +615,10 @@ var AcpxRuntime = class {
 			agentName: input.agent,
 			agentRegistry: this.agentRegistry
 		});
-		const delegate = this.resolveDelegateForCommand(command);
+		const delegate = this.resolveDelegateForSession({
+			command,
+			sessionKey: input.sessionKey
+		});
 		const claudeModelOverride = isClaudeAcpCommand(command) ? normalizeClaudeAcpModelOverride(input.model) : void 0;
 		const codexModelOverride = normalizeAgentName(input.agent) === CODEX_ACP_AGENT_ID && isCodexAcpCommand(command) ? normalizeCodexAcpModelOverride(input.model, input.thinking) : void 0;
 		const ensureInput = claudeModelOverride ? {
@@ -746,8 +810,9 @@ var AcpxRuntime = class {
 	async close(input) {
 		const record = await this.sessionStore.load(input.handle.acpxRecordId ?? input.handle.sessionKey);
 		let closeSucceeded;
+		const delegate = this.resolveDelegateForLoadedRecord(input.handle, record);
 		try {
-			await this.resolveDelegateForLoadedRecord(input.handle, record).close({
+			await delegate.close({
 				handle: input.handle,
 				reason: input.reason,
 				discardPersistentState: input.discardPersistentState
@@ -756,6 +821,7 @@ var AcpxRuntime = class {
 		} finally {
 			await this.cleanupProcessTreeForRecord(input.handle, record);
 		}
+		if (closeSucceeded) this.releaseOpenClawToolsDelegateForSession(input.handle.sessionKey);
 		if (closeSucceeded && input.discardPersistentState) this.sessionStore.markFresh(input.handle.sessionKey);
 	}
 };

package/dist/{service-BqMIPoSJ.js → service-DrBh86Oc.js}

@@ -1,8 +1,9 @@
-import { n as createLazyAcpRuntimeProxy } from "./register.runtime-CmYbf9SF.js";
+import { n as createLazyAcpRuntimeProxy } from "./register.runtime-Bcp4wC4g.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-Dv_iMcOo.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-_ttV4L1d.js";
 import { createRequire } from "node:module";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
@@ -851,11 +852,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";
-let runtimeModulePromise = null;
-function loadRuntimeModule() {
-	runtimeModulePromise ??= import("./runtime-B1cHS4Li.js");
-	return runtimeModulePromise;
-}
+const loadRuntimeModule = createLazyRuntimeModule(() => import("./runtime-7Xuu2bcn.js"));
 /** Convert ACPX timeout seconds into timer-safe milliseconds. */
 function resolveAcpxTimerTimeoutMs(timeoutSeconds) {
 	if (timeoutSeconds === void 0) return;
@@ -876,6 +873,7 @@ function createLazyDefaultRuntime(params) {
 				agentRegistry: module.createAgentRegistry({ overrides: params.pluginConfig.agents }),
 				probeAgent: params.pluginConfig.probeAgent,
 				mcpServers: toAcpMcpServers(params.pluginConfig.mcpServers),
+				openclawToolsMcpBridgeEnabled: params.pluginConfig.openClawToolsMcpBridge,
 				permissionMode: params.pluginConfig.permissionMode,
 				nonInteractivePermissions: params.pluginConfig.nonInteractivePermissions,
 				timeoutMs: resolveAcpxTimerTimeoutMs(params.pluginConfig.timeoutSeconds)

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.6.11",
+  "version": "2026.7.1-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/acpx",
-      "version": "2026.6.11",
+      "version": "2026.7.1-beta.2",
       "dependencies": {
         "@agentclientprotocol/claude-agent-acp": "0.39.0",
         "@zed-industries/codex-acp": "0.15.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/acpx",
-  "version": "2026.6.11",
+  "version": "2026.7.1-beta.2",
   "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.6.11"
+      "pluginApi": ">=2026.7.1-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.6.11",
+      "openclawVersion": "2026.7.1-beta.2",
       "staticAssets": [
         {
           "source": "./src/runtime-internals/mcp-proxy.mjs",
@@ -58,7 +58,7 @@
     "skills/**"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.6.11"
+    "openclaw": ">=2026.7.1-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {

package/dist/{process-reaper-Dv_iMcOo.js → process-reaper-_ttV4L1d.js}

@@ -1,12 +1,12 @@
 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 fsSync from "node:fs";
 import { fileURLToPath } from "node:url";
-import { formatPluginConfigIssue } from "openclaw/plugin-sdk/extension-shared";
 import { z } from "zod";
 //#region extensions/acpx/src/command-line.ts
 /**