@alfe.ai/openclaw-mcp-bundler 0.0.5 → 0.0.7

package/dist/index.d.cts

@@ -3,43 +3,41 @@ import { t as plugin } from "./plugin.cjs";
 //#region src/cli-backend-detect.d.ts
 
 /**
- * Determine whether the active agent's CLI backend already has native bundle-MCP
- * support. If so, our plugin should no-op so we don't double-register tools.
+ * Decide whether to defer to OpenClaw's native `bundleMcp:true` path for
+ * this run. Pre-May-2026 this gated on backend type (claude-cli /
+ * codex-cli), but the actual hazard was double-registration: when
+ * `openclaw.json#mcp.servers` had entries AND the plugin registered the
+ * same tools via `api.registerTool`, claude-cli's bundleMcp would spawn
+ * its own copy and OpenClaw would suffix-disambiguate the duplicates.
  *
- * As of OpenClaw 2026.4 only `claude-cli` and `codex-cli` ship with
- * `bundleMcp: true`. We hardcode that allowlist for now; future backends
- * shipping with bundleMcp:true will need to be added here (or, ideally,
- * OpenClaw exposes a public API to query the resolved backend's bundleMcp
- * flag and we call that instead — see project_openclaw_mcp_bundler.md TODO).
+ * The single-source-of-truth refactor stops mirror-writing the alfe
+ * store into openclaw.json, so `mcp.servers` is empty in practice. The
+ * native path on claude-cli has nothing to spawn, our plugin's IPC path
+ * is the only one in play, and we register on every backend.
  *
- * This detection is best-effort: if we can't determine the backend (no
- * runtime config available), we default to "no native MCP" (return false)
- * so our plugin DOES register. Worst case is benign duplicate tool names
- * with `-2` suffix on claude-cli, which is recoverable; missing tools on
- * MiniMax is the bug we exist to fix.
+ * The escape hatch survives: a user who hand-edits `mcp.servers` in
+ * openclaw.json (private dev MCP, etc.) gets the native path back —
+ * this function returns true, the plugin no-ops, and claude-cli/codex-cli
+ * spawn that entry themselves.
  */
 interface ConfigLike {
-  agents?: {
-    defaults?: {
-      model?: string;
-      cliBackends?: Record<string, unknown>;
-    };
+  mcp?: {
+    servers?: Record<string, unknown>;
   };
 }
 /**
- * Read the active agent's primary model and infer its CLI backend.
- * Returns true if that backend has native bundleMcp support.
+ * Returns true when openclaw.json#mcp.servers has at least one entry —
+ * signalling that the native bundleMcp path is in play for THIS run
+ * (regardless of backend) and the plugin should defer to it.
  *
- * Heuristic mapping (matches what OpenClaw's plugin-setup-cli-backend
- * registry resolves to today):
- *   - model id containing "claude" or "anthropic" → claude-cli
- *   - model id containing "codex" or "gpt-5-codex" or "openai/codex" → codex-cli
- *   - everything else → no native bundle-mcp
- *
- * If `agents.defaults.cliBackends` explicitly configures one of the native
- * backends, we trust that override.
+ * Empty object / missing key → false → plugin registers IPC-proxied tools.
+ */
+declare function hasNativeOpenclawMcpServers(cfg: ConfigLike | undefined): boolean;
+/**
+ * Back-compat alias for callers still on the old name. Internal — drop
+ * once we cut the next major.
  */
-declare function detectNativeBundleMcp(cfg: ConfigLike | undefined): boolean;
+declare const detectNativeBundleMcp: typeof hasNativeOpenclawMcpServers;
 //#endregion
 export { plugin as default, detectNativeBundleMcp };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../src/cli-backend-detect.ts"],"mappings":";;;;;;;;AAyCA;;;;;;;;;;;;UAtBU,UAAA;;;;oBAIU;;;;;;;;;;;;;;;;;iBAkBJ,qBAAA,MAA2B"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/cli-backend-detect.ts"],"mappings":";;;;;;;;AAgCA;AAWA;;;;;;;;;;;;;UAxBU,UAAA;;cAEI;;;;;;;;;;iBAWE,2BAAA,MAAiC;;;;;cAWpC,8BAAqB"}

package/dist/index.d.ts

@@ -3,43 +3,41 @@ import { t as plugin } from "./plugin.js";
 //#region src/cli-backend-detect.d.ts
 
 /**
- * Determine whether the active agent's CLI backend already has native bundle-MCP
- * support. If so, our plugin should no-op so we don't double-register tools.
+ * Decide whether to defer to OpenClaw's native `bundleMcp:true` path for
+ * this run. Pre-May-2026 this gated on backend type (claude-cli /
+ * codex-cli), but the actual hazard was double-registration: when
+ * `openclaw.json#mcp.servers` had entries AND the plugin registered the
+ * same tools via `api.registerTool`, claude-cli's bundleMcp would spawn
+ * its own copy and OpenClaw would suffix-disambiguate the duplicates.
  *
- * As of OpenClaw 2026.4 only `claude-cli` and `codex-cli` ship with
- * `bundleMcp: true`. We hardcode that allowlist for now; future backends
- * shipping with bundleMcp:true will need to be added here (or, ideally,
- * OpenClaw exposes a public API to query the resolved backend's bundleMcp
- * flag and we call that instead — see project_openclaw_mcp_bundler.md TODO).
+ * The single-source-of-truth refactor stops mirror-writing the alfe
+ * store into openclaw.json, so `mcp.servers` is empty in practice. The
+ * native path on claude-cli has nothing to spawn, our plugin's IPC path
+ * is the only one in play, and we register on every backend.
  *
- * This detection is best-effort: if we can't determine the backend (no
- * runtime config available), we default to "no native MCP" (return false)
- * so our plugin DOES register. Worst case is benign duplicate tool names
- * with `-2` suffix on claude-cli, which is recoverable; missing tools on
- * MiniMax is the bug we exist to fix.
+ * The escape hatch survives: a user who hand-edits `mcp.servers` in
+ * openclaw.json (private dev MCP, etc.) gets the native path back —
+ * this function returns true, the plugin no-ops, and claude-cli/codex-cli
+ * spawn that entry themselves.
  */
 interface ConfigLike {
-  agents?: {
-    defaults?: {
-      model?: string;
-      cliBackends?: Record<string, unknown>;
-    };
+  mcp?: {
+    servers?: Record<string, unknown>;
   };
 }
 /**
- * Read the active agent's primary model and infer its CLI backend.
- * Returns true if that backend has native bundleMcp support.
+ * Returns true when openclaw.json#mcp.servers has at least one entry —
+ * signalling that the native bundleMcp path is in play for THIS run
+ * (regardless of backend) and the plugin should defer to it.
  *
- * Heuristic mapping (matches what OpenClaw's plugin-setup-cli-backend
- * registry resolves to today):
- *   - model id containing "claude" or "anthropic" → claude-cli
- *   - model id containing "codex" or "gpt-5-codex" or "openai/codex" → codex-cli
- *   - everything else → no native bundle-mcp
- *
- * If `agents.defaults.cliBackends` explicitly configures one of the native
- * backends, we trust that override.
+ * Empty object / missing key → false → plugin registers IPC-proxied tools.
+ */
+declare function hasNativeOpenclawMcpServers(cfg: ConfigLike | undefined): boolean;
+/**
+ * Back-compat alias for callers still on the old name. Internal — drop
+ * once we cut the next major.
  */
-declare function detectNativeBundleMcp(cfg: ConfigLike | undefined): boolean;
+declare const detectNativeBundleMcp: typeof hasNativeOpenclawMcpServers;
 //#endregion
 export { plugin as default, detectNativeBundleMcp };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/cli-backend-detect.ts"],"mappings":";;;;;;;;AAyCA;;;;;;;;;;;;UAtBU,UAAA;;;;oBAIU;;;;;;;;;;;;;;;;;iBAkBJ,qBAAA,MAA2B"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/cli-backend-detect.ts"],"mappings":";;;;;;;;AAgCA;AAWA;;;;;;;;;;;;;UAxBU,UAAA;;cAEI;;;;;;;;;;iBAWE,2BAAA,MAAiC;;;;;cAWpC,8BAAqB"}

package/dist/plugin.d.cts

@@ -1,21 +1,12 @@
-//#region ../mcp-bundler/dist/index.d.ts
-//#region src/types.d.ts
-/**
- * Shape of a single MCP server entry — matches OpenClaw `mcp.servers.{name}`.
- * Either a stdio child process spec or a remote URL spec.
- */
-type McpServerConfig = StdioServerConfig | RemoteServerConfig;
-interface StdioServerConfig {
-  command: string;
-  args?: string[];
-  env?: Record<string, string>;
-  cwd?: string;
-}
-interface RemoteServerConfig {
-  url: string;
-  transport?: 'sse' | 'streamable-http';
-  headers?: Record<string, string>;
-  connectionTimeoutMs?: number;
+//#region src/ipc-client.d.ts
+interface IpcResponse<T = unknown> {
+  id: string;
+  ok: boolean;
+  payload?: T;
+  error?: {
+    code: string;
+    message: string;
+  };
 }
 //#endregion
 //#region src/plugin.d.ts
@@ -34,8 +25,7 @@ interface ConfigSnapshot {
     };
   };
   mcp?: {
-    servers?: Record<string, McpServerConfig>;
-    sessionIdleTtlMs?: number;
+    servers?: Record<string, unknown>;
   };
 }
 interface AgentToolResult {
@@ -90,5 +80,5 @@ declare const plugin: {
   deactivate(api: OpenClawPluginApi): void;
 };
 //#endregion
-export { plugin as t };
+export { IpcResponse as n, plugin as t };
 //# sourceMappingURL=plugin.d.cts.map

package/dist/plugin.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.cts","names":["McpServerConfig","StdioServerConfig","RemoteServerConfig","Record","McpTransportKind","McpToolDescriptor","ReconcileDiff","Logger","McpToolCallResult","BundlerOptions","STDIO_ENV_DENYLIST","Set","sanitizeStdioEnv","ConnectionDeps","McpClientHandle","Promise","AbortSignal","Connection","defaultConnect","McpBundler","sanitizeNameSegment","buildNamespacedToolName","disambiguateAgainst","ReadonlySet"],"sources":["../../mcp-bundler/dist/index.d.ts","../src/plugin.ts"],"sourcesContent":["//#region src/types.d.ts\n/**\n * Shape of a single MCP server entry — matches OpenClaw `mcp.servers.{name}`.\n * Either a stdio child process spec or a remote URL spec.\n */\ntype McpServerConfig = StdioServerConfig | RemoteServerConfig;\ninterface StdioServerConfig {\n  command: string;\n  args?: string[];\n  env?: Record<string, string>;\n  cwd?: string;\n}\ninterface RemoteServerConfig {\n  url: string;\n  transport?: 'sse' | 'streamable-http';\n  headers?: Record<string, string>;\n  connectionTimeoutMs?: number;\n}\ntype McpTransportKind = 'stdio' | 'sse' | 'streamable-http';\n/**\n * One tool surfaced from one MCP server, after namespacing.\n */\ninterface McpToolDescriptor {\n  /** Namespaced name as the LLM sees it: `{serverName}__{originalName}`, sanitized + max 64 chars. */\n  prefixed: string;\n  /** Server name (key in `mcp.servers.*`). */\n  server: string;\n  /** Original tool name as advertised by the MCP server. */\n  original: string;\n  /** Human label for the tool (truncated description, suitable for UI). */\n  label: string;\n  /** Full description from the MCP server. */\n  description: string;\n  /** JSON Schema (object) for tool parameters. */\n  parameters: Record<string, unknown>;\n}\ninterface ReconcileDiff {\n  added: string[];\n  removed: string[];\n  changed: string[];\n  unchanged: string[];\n}\ninterface Logger {\n  debug: (msg: string, meta?: Record<string, unknown>) => void;\n  info: (msg: string, meta?: Record<string, unknown>) => void;\n  warn: (msg: string, meta?: Record<string, unknown>) => void;\n  error: (msg: string, meta?: Record<string, unknown>) => void;\n}\ninterface McpToolCallResult {\n  content: Record<string, unknown>[];\n  isError?: boolean;\n}\ninterface BundlerOptions {\n  logger?: Logger;\n  /** Idle TTL for spawned children (ms). 0 disables. Default: 600_000 (10 min). */\n  idleTtlMs?: number;\n  /** Sweep interval for idle reaping (ms). Default: 60_000 (1 min). */\n  idleSweepIntervalMs?: number;\n}\n//# sourceMappingURL=types.d.ts.map\n//#endregion\n//#region src/connection.d.ts\n/** Env keys OpenClaw rejects from stdio MCP env blocks. Filter them out before spawning. */\ndeclare const STDIO_ENV_DENYLIST: Set<string>;\ndeclare function sanitizeStdioEnv(env: Record<string, string> | undefined): Record<string, string>;\ninterface ConnectionDeps {\n  /**\n   * Factory for an MCP Client connected to the given config. Injected so tests\n   * can mock without spawning real processes. In production this wraps\n   * `@modelcontextprotocol/sdk/client`.\n   */\n  connect: (server: McpServerConfig) => Promise<McpClientHandle>;\n}\n/**\n * Minimal interface our connection layer needs from an MCP client. Mirrors\n * the @modelcontextprotocol/sdk Client surface but kept narrow so we can\n * mock cleanly in tests.\n */\ninterface McpClientHandle {\n  listTools(): Promise<{\n    name: string;\n    description?: string;\n    inputSchema: Record<string, unknown>;\n  }[]>;\n  callTool(name: string, args: unknown, opts?: {\n    signal?: AbortSignal;\n  }): Promise<McpToolCallResult>;\n  close(): Promise<void>;\n}\n/**\n * One Connection per MCP server. Owns lifecycle (lazy-spawn, close, refresh-lock).\n * Refresh-lock pattern adapted from AIWerk `index.ts:219-250` — prevents\n * reconnect + `notifications/tools/list_changed` race.\n */\ndeclare class Connection {\n  readonly name: string;\n  readonly config: McpServerConfig;\n  private readonly deps;\n  private readonly logger;\n  private client;\n  private tools;\n  private connectInFlight;\n  private refreshInFlight;\n  private refreshQueued;\n  private lastUsedAt;\n  constructor(params: {\n    name: string;\n    config: McpServerConfig;\n    deps: ConnectionDeps;\n    logger?: Logger;\n  });\n  /** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */\n  snapshotTools(): McpToolDescriptor[];\n  /** Whether an MCP child process / remote connection has been established. */\n  isConnected(): boolean;\n  /** Idle timestamp for reaping. */\n  idleSinceMs(): number;\n  /**\n   * Lazy connect + tool discovery. Safe to call concurrently; in-flight\n   * connects coalesce.\n   */\n  ensureConnected(): Promise<void>;\n  private connectAndDiscover;\n  /**\n   * Re-discover tools. Used on reconnect or `tools/list_changed` notification.\n   * Refresh-lock collapses concurrent refreshes; if one is in flight, the next\n   * is queued (max 1 queued, since N>1 queued provides no extra freshness).\n   */\n  refresh(): Promise<void>;\n  callTool(originalName: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult>;\n  /**\n   * Close the underlying transport. Idempotent. If a connect is in flight\n   * (warmup racing with reconcile-removal), wait for it to settle and then\n   * close the client it produced — otherwise the child process is orphaned.\n   */\n  close(): Promise<void>;\n  /**\n   * Stable hash of the config for diff detection in `reconcile`.\n   * Two configs with the same hash are equivalent (no restart needed).\n   */\n  configFingerprint(): string;\n}\n/**\n * Build the production `connect` factory using the official MCP SDK.\n * Kept in a separate function so tests can substitute a mock without\n * pulling the SDK into the test bundle.\n */\ndeclare function defaultConnect(server: McpServerConfig): Promise<McpClientHandle>;\n//# sourceMappingURL=connection.d.ts.map\n//#endregion\n//#region src/bundler.d.ts\n/**\n * Provider-agnostic MCP server bundler. Holds N MCP server connections,\n * exposes a unified namespaced tool catalog, and routes calls to the right\n * server.\n *\n * Designed to be embedded in any host (OpenClaw plugin, AI proxy, Lambda).\n * Public surface is intentionally synchronous where the host needs sync\n * (snapshot, listTools), async only where I/O is unavoidable.\n */\ndeclare class McpBundler {\n  private readonly logger;\n  private readonly connections;\n  private readonly idleTtlMs;\n  private readonly idleSweepIntervalMs;\n  private idleSweepTimer;\n  private readonly deps;\n  private disposed;\n  private reconcileLatch;\n  constructor(opts?: BundlerOptions, deps?: ConnectionDeps);\n  /**\n   * Diff `desired` against current connections, spawn newcomers, dispose\n   * removals, hot-restart on config change. Pull-based — call whenever the\n   * host's config snapshot may have changed. Cheap if no diff.\n   *\n   * Lazy: newly-added servers are NOT eagerly connected; they connect on the\n   * first `callTool()` (or first `listTools()` after `forceDiscover()`).\n   * This avoids paying spawn cost for servers the agent never uses.\n   */\n  reconcile(desired: Record<string, McpServerConfig>): Promise<ReconcileDiff>;\n  private doReconcile;\n  /**\n   * Synchronous snapshot of all currently-known tools across connected servers.\n   * Servers that have not connected yet contribute nothing. Intended for use\n   * inside OpenClaw's plugin tool factory which must be sync.\n   *\n   * Tool names are namespaced and disambiguated (suffix `-2`, `-3` on collision)\n   * so cross-server name clashes never produce duplicate registrations.\n   */\n  listTools(): McpToolDescriptor[];\n  /**\n   * Eagerly connect to every configured server and discover tools. Used by\n   * hosts that want a hot list rather than the lazy default. Errors are\n   * swallowed per-server (logged), so one bad server doesn't fail the batch.\n   */\n  warmup(): Promise<void>;\n  /**\n   * Invoke a tool by its namespaced name. Routes to the originating server.\n   * Errors are returned as `{ isError: true, content: [...] }` so a failing\n   * tool doesn't crash the host.\n   */\n  callTool(prefixed: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult>;\n  /**\n   * Resolve a namespaced tool name back to its server connection and original\n   * tool name. Returns undefined if the tool is not currently advertised.\n   */\n  private routeToolName;\n  /**\n   * Tear down all connections and stop background tasks. Idempotent.\n   * Call from `registerRuntimeLifecycle({ cleanup })` in the host plugin.\n   */\n  dispose(): Promise<void>;\n  private startIdleSweep;\n  private sweepIdle;\n}\n//# sourceMappingURL=bundler.d.ts.map\n//#endregion\n//#region src/tool-naming.d.ts\n/**\n * Tool name sanitization and collision handling.\n *\n * OpenClaw constraint: tool names must match `[A-Za-z0-9_-]` and be ≤64 chars.\n * Pattern mirrored from `openclaw/src/agents/pi-bundle-mcp-names.ts`.\n *\n * Strategy: prefix every tool with its server name (`{server}__{tool}`),\n * sanitize disallowed chars to `_`, truncate, then suffix-disambiguate\n * (`-2`, `-3`, ...) on collision.\n */\ndeclare function sanitizeNameSegment(value: string): string;\ndeclare function buildNamespacedToolName(server: string, tool: string): string;\n/**\n * Disambiguate a candidate name against an existing set by appending `-2`, `-3`, etc.\n * Mutates nothing; returns the chosen name. Caller is responsible for inserting it\n * into the set.\n */\ndeclare function disambiguateAgainst(candidate: string, taken: ReadonlySet<string>): string;\n//# sourceMappingURL=tool-naming.d.ts.map\n\n//#endregion\nexport { type BundlerOptions, Connection, type ConnectionDeps, type Logger, McpBundler, type McpClientHandle, type McpServerConfig, type McpToolCallResult, type McpToolDescriptor, type McpTransportKind, type ReconcileDiff, type RemoteServerConfig, STDIO_ENV_DENYLIST, type StdioServerConfig, buildNamespacedToolName, defaultConnect, disambiguateAgainst, sanitizeNameSegment, sanitizeStdioEnv };\n//# sourceMappingURL=index.d.ts.map"],"mappings":";;;;;;KAKKA,eAAAA,GAAkBC,iBAAsC,GAAlBC,kBAAkB;AAAA,UACnDD,iBAAAA,CAAiB;EAGb,OAGJC,EAAAA,MAAAA;;QAHFC;;ACGwF;AAUhF,UDVND,kBAAAA,CCiBc;EAAA,GAAA,EAAA,MAAA;WACgC,CAAA,EAAA,KAAA,GAAA,iBAAA;SACrB,CAAA,EDhBvBC,MCgBuB,CAAA,MAAA,EAAA,MAAA,CAAA;qBAAf,CAAA,EAAA,MAAA;;;;;AATJ,UAAN,MAAA,CAOA;EAAc,KAAA,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;MACgC,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;MACrB,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;OAAf,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;;AAAM,UAFhB,cAAA,CAKe;EAAA,MAAA,CAAA,EAAA;IACd,QAAA,CAAA,EAAA;MACC,KAAA,CAAA,EAAA,MAAA;MAAM,WAAA,CAAA,EANsC,MAMtC,CAAA,MAAA,EAAA,OAAA,CAAA;IAGR,CAAA;EAAS,CAAA;KAIL,CAAA,EAAA;IAID,OAAA,CAAA,EAhBO,MAgBP,CAAA,MAAA,EAhBsB,eAgBtB,CAAA;IAEE,gBAAA,CAAA,EAAA,MAAA;;;AAAD,UAfJ,eAAA,CAkBkB;EAAA,OAAA,EAjBjB,MAiBiB,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA;SACjB,CAAA,EAjBC,MAiBD,CAAA,MAAA,EAAA,OAAA,CAAA;;UAdD,SAAA,CAgBiB;EAAc,IAAA,EAAA,MAAA;EAG/B,KAAA,CAAA,EAAA,MAAA;EAAqB,WAAA,EAAA,MAAA;YAEI,EAjBrB,MAiBqB,CAAA,MAAA,EAAA,OAAA,CAAA;SACA,EAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,OAAA,EAAA,MAAA,CAAA,EAdtB,WAcsB,EAAA,QAAA,CAAA,EAAA,CAAA,MAAA,EAAA,OAAA,EAAA,GAAA,IAAA,EAAA,GAZ5B,OAY4B,CAZpB,eAYoB,CAAA;;AAAO,UAThC,kBAAA,CAYiB;EAAA,MAAA,CAAA,EAXhB,cAWgB;eACjB,CAAA,EAXQ,cAWR;kBACC,CAAA,EAAA,GAAA,GAXgB,cAWhB,GAAA,SAAA;;UARD,qBAAA,CAaA;MAAmB,MAAA;OAAuB,EAAA,CAAA,GAAA,CAAA,EAAA,OAAA,EAAA,GAAA,IAAA,GAXjB,OAWiB,CAAA,IAAA,CAAA;MAAY,CAAA,EAAA,CAAA,GAAA,CAAA,EAAA,OAAA,EAAA,GAAA,IAAA,GAV7B,OAU6B,CAAA,IAAA,CAAA;;UAPtD,iBAAA,CAUyC;EAqD7C,MAAA,EA9DI,MAiKT;EAAA,MAAA,CAAA,EAhKU,cAgKV;cAnFe,CAAA,EAAA;IA+EE,QAAA,CAAA,EAAA,OAAA;EAAiB,CAAA;;;;sBAzJM;;;uBAE/B,mBAAmB,uBAAuB,YAAY;;;;;8BAGlC;;cAqDxB;;;;;;;;gBAgBU;kBA+EE"}
+{"version":3,"file":"plugin.d.cts","names":[],"sources":["../src/ipc-client.ts","../src/plugin.ts"],"mappings":";UA0BiB;EAAA,EAAA,EAAA,MAAA;;YAGL;;ICIF,IAAA,EAAM,MAAA;IAON,OAAA,EAAA,MAAc;EAAA,CAAA;;;;;UAPd,MAAA,CA2BI;EAGJ,KAAA,CAAA,GAAA,EAAA,MAAA,EAAA,GAAkB,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;EAAA,IAAA,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;MACjB,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;OACO,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;;UAzBR,cAAA,CA0B+B;EAG/B,MAAA,CAAA,EAAA;IAAqB,QAAA,CAAA,EAAA;MAEI,KAAA,CAAA,EAAA,MAAA;MACA,WAAA,CAAA,EA/BqB,MA+BrB,CAAA,MAAA,EAAA,OAAA,CAAA;IAAO,CAAA;EAGhC,CAAA;EAAiB,GAAA,CAAA,EAAA;IACjB,OAAA,CAAA,EAlCU,MAkCV,CAAA,MAAA,EAAA,OAAA,CAAA;;;UA/BA,eAAA,CAqCA;SAAmB,EApClB,MAoCkB,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA;SAAuB,CAAA,EAnCxC,MAmCwC,CAAA,MAAA,EAAA,OAAA,CAAA;;UAhC1C,SAAA,CAmCoB;EAAqB,IAAA,EAAA,MAAA;EAuN7C,KAAA,CAAA,EAAA,MAkGL;EAAA,WAAA,EAAA,MAAA;YAtFe,EAlQF,MAkQE,CAAA,MAAA,EAAA,OAAA,CAAA;SAkFE,EAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,OAAA,EAAA,MAAA,CAAA,EAhVL,WAgVK,EAAA,QAAA,CAAA,EAAA,CAAA,MAAA,EAAA,OAAA,EAAA,GAAA,IAAA,EAAA,GA9UX,OA8UW,CA9UH,eA8UG,CAAA;;UA3UR,kBAAA;WACC;kBACO;2BACS;;UAGjB,qBAAA;;mCAEyB;mCACA;;UAGzB,iBAAA;UACA;WACC;;;;;;;sBAG8B;;;uBAE/B,mBAAmB,uBAAuB,YAAY;;;;;8BAGlC;;cAuNxB;;;;;;;;gBAYU;kBAkFE"}

package/dist/plugin.d.ts

@@ -1,21 +1,12 @@
-//#region ../mcp-bundler/dist/index.d.ts
-//#region src/types.d.ts
-/**
- * Shape of a single MCP server entry — matches OpenClaw `mcp.servers.{name}`.
- * Either a stdio child process spec or a remote URL spec.
- */
-type McpServerConfig = StdioServerConfig | RemoteServerConfig;
-interface StdioServerConfig {
-  command: string;
-  args?: string[];
-  env?: Record<string, string>;
-  cwd?: string;
-}
-interface RemoteServerConfig {
-  url: string;
-  transport?: 'sse' | 'streamable-http';
-  headers?: Record<string, string>;
-  connectionTimeoutMs?: number;
+//#region src/ipc-client.d.ts
+interface IpcResponse<T = unknown> {
+  id: string;
+  ok: boolean;
+  payload?: T;
+  error?: {
+    code: string;
+    message: string;
+  };
 }
 //#endregion
 //#region src/plugin.d.ts
@@ -34,8 +25,7 @@ interface ConfigSnapshot {
     };
   };
   mcp?: {
-    servers?: Record<string, McpServerConfig>;
-    sessionIdleTtlMs?: number;
+    servers?: Record<string, unknown>;
   };
 }
 interface AgentToolResult {
@@ -90,5 +80,5 @@ declare const plugin: {
   deactivate(api: OpenClawPluginApi): void;
 };
 //#endregion
-export { plugin as t };
+export { IpcResponse as n, plugin as t };
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","names":["McpServerConfig","StdioServerConfig","RemoteServerConfig","Record","McpTransportKind","McpToolDescriptor","ReconcileDiff","Logger","McpToolCallResult","BundlerOptions","STDIO_ENV_DENYLIST","Set","sanitizeStdioEnv","ConnectionDeps","McpClientHandle","Promise","AbortSignal","Connection","defaultConnect","McpBundler","sanitizeNameSegment","buildNamespacedToolName","disambiguateAgainst","ReadonlySet"],"sources":["../../mcp-bundler/dist/index.d.ts","../src/plugin.ts"],"sourcesContent":["//#region src/types.d.ts\n/**\n * Shape of a single MCP server entry — matches OpenClaw `mcp.servers.{name}`.\n * Either a stdio child process spec or a remote URL spec.\n */\ntype McpServerConfig = StdioServerConfig | RemoteServerConfig;\ninterface StdioServerConfig {\n  command: string;\n  args?: string[];\n  env?: Record<string, string>;\n  cwd?: string;\n}\ninterface RemoteServerConfig {\n  url: string;\n  transport?: 'sse' | 'streamable-http';\n  headers?: Record<string, string>;\n  connectionTimeoutMs?: number;\n}\ntype McpTransportKind = 'stdio' | 'sse' | 'streamable-http';\n/**\n * One tool surfaced from one MCP server, after namespacing.\n */\ninterface McpToolDescriptor {\n  /** Namespaced name as the LLM sees it: `{serverName}__{originalName}`, sanitized + max 64 chars. */\n  prefixed: string;\n  /** Server name (key in `mcp.servers.*`). */\n  server: string;\n  /** Original tool name as advertised by the MCP server. */\n  original: string;\n  /** Human label for the tool (truncated description, suitable for UI). */\n  label: string;\n  /** Full description from the MCP server. */\n  description: string;\n  /** JSON Schema (object) for tool parameters. */\n  parameters: Record<string, unknown>;\n}\ninterface ReconcileDiff {\n  added: string[];\n  removed: string[];\n  changed: string[];\n  unchanged: string[];\n}\ninterface Logger {\n  debug: (msg: string, meta?: Record<string, unknown>) => void;\n  info: (msg: string, meta?: Record<string, unknown>) => void;\n  warn: (msg: string, meta?: Record<string, unknown>) => void;\n  error: (msg: string, meta?: Record<string, unknown>) => void;\n}\ninterface McpToolCallResult {\n  content: Record<string, unknown>[];\n  isError?: boolean;\n}\ninterface BundlerOptions {\n  logger?: Logger;\n  /** Idle TTL for spawned children (ms). 0 disables. Default: 600_000 (10 min). */\n  idleTtlMs?: number;\n  /** Sweep interval for idle reaping (ms). Default: 60_000 (1 min). */\n  idleSweepIntervalMs?: number;\n}\n//# sourceMappingURL=types.d.ts.map\n//#endregion\n//#region src/connection.d.ts\n/** Env keys OpenClaw rejects from stdio MCP env blocks. Filter them out before spawning. */\ndeclare const STDIO_ENV_DENYLIST: Set<string>;\ndeclare function sanitizeStdioEnv(env: Record<string, string> | undefined): Record<string, string>;\ninterface ConnectionDeps {\n  /**\n   * Factory for an MCP Client connected to the given config. Injected so tests\n   * can mock without spawning real processes. In production this wraps\n   * `@modelcontextprotocol/sdk/client`.\n   */\n  connect: (server: McpServerConfig) => Promise<McpClientHandle>;\n}\n/**\n * Minimal interface our connection layer needs from an MCP client. Mirrors\n * the @modelcontextprotocol/sdk Client surface but kept narrow so we can\n * mock cleanly in tests.\n */\ninterface McpClientHandle {\n  listTools(): Promise<{\n    name: string;\n    description?: string;\n    inputSchema: Record<string, unknown>;\n  }[]>;\n  callTool(name: string, args: unknown, opts?: {\n    signal?: AbortSignal;\n  }): Promise<McpToolCallResult>;\n  close(): Promise<void>;\n}\n/**\n * One Connection per MCP server. Owns lifecycle (lazy-spawn, close, refresh-lock).\n * Refresh-lock pattern adapted from AIWerk `index.ts:219-250` — prevents\n * reconnect + `notifications/tools/list_changed` race.\n */\ndeclare class Connection {\n  readonly name: string;\n  readonly config: McpServerConfig;\n  private readonly deps;\n  private readonly logger;\n  private client;\n  private tools;\n  private connectInFlight;\n  private refreshInFlight;\n  private refreshQueued;\n  private lastUsedAt;\n  constructor(params: {\n    name: string;\n    config: McpServerConfig;\n    deps: ConnectionDeps;\n    logger?: Logger;\n  });\n  /** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */\n  snapshotTools(): McpToolDescriptor[];\n  /** Whether an MCP child process / remote connection has been established. */\n  isConnected(): boolean;\n  /** Idle timestamp for reaping. */\n  idleSinceMs(): number;\n  /**\n   * Lazy connect + tool discovery. Safe to call concurrently; in-flight\n   * connects coalesce.\n   */\n  ensureConnected(): Promise<void>;\n  private connectAndDiscover;\n  /**\n   * Re-discover tools. Used on reconnect or `tools/list_changed` notification.\n   * Refresh-lock collapses concurrent refreshes; if one is in flight, the next\n   * is queued (max 1 queued, since N>1 queued provides no extra freshness).\n   */\n  refresh(): Promise<void>;\n  callTool(originalName: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult>;\n  /**\n   * Close the underlying transport. Idempotent. If a connect is in flight\n   * (warmup racing with reconcile-removal), wait for it to settle and then\n   * close the client it produced — otherwise the child process is orphaned.\n   */\n  close(): Promise<void>;\n  /**\n   * Stable hash of the config for diff detection in `reconcile`.\n   * Two configs with the same hash are equivalent (no restart needed).\n   */\n  configFingerprint(): string;\n}\n/**\n * Build the production `connect` factory using the official MCP SDK.\n * Kept in a separate function so tests can substitute a mock without\n * pulling the SDK into the test bundle.\n */\ndeclare function defaultConnect(server: McpServerConfig): Promise<McpClientHandle>;\n//# sourceMappingURL=connection.d.ts.map\n//#endregion\n//#region src/bundler.d.ts\n/**\n * Provider-agnostic MCP server bundler. Holds N MCP server connections,\n * exposes a unified namespaced tool catalog, and routes calls to the right\n * server.\n *\n * Designed to be embedded in any host (OpenClaw plugin, AI proxy, Lambda).\n * Public surface is intentionally synchronous where the host needs sync\n * (snapshot, listTools), async only where I/O is unavoidable.\n */\ndeclare class McpBundler {\n  private readonly logger;\n  private readonly connections;\n  private readonly idleTtlMs;\n  private readonly idleSweepIntervalMs;\n  private idleSweepTimer;\n  private readonly deps;\n  private disposed;\n  private reconcileLatch;\n  constructor(opts?: BundlerOptions, deps?: ConnectionDeps);\n  /**\n   * Diff `desired` against current connections, spawn newcomers, dispose\n   * removals, hot-restart on config change. Pull-based — call whenever the\n   * host's config snapshot may have changed. Cheap if no diff.\n   *\n   * Lazy: newly-added servers are NOT eagerly connected; they connect on the\n   * first `callTool()` (or first `listTools()` after `forceDiscover()`).\n   * This avoids paying spawn cost for servers the agent never uses.\n   */\n  reconcile(desired: Record<string, McpServerConfig>): Promise<ReconcileDiff>;\n  private doReconcile;\n  /**\n   * Synchronous snapshot of all currently-known tools across connected servers.\n   * Servers that have not connected yet contribute nothing. Intended for use\n   * inside OpenClaw's plugin tool factory which must be sync.\n   *\n   * Tool names are namespaced and disambiguated (suffix `-2`, `-3` on collision)\n   * so cross-server name clashes never produce duplicate registrations.\n   */\n  listTools(): McpToolDescriptor[];\n  /**\n   * Eagerly connect to every configured server and discover tools. Used by\n   * hosts that want a hot list rather than the lazy default. Errors are\n   * swallowed per-server (logged), so one bad server doesn't fail the batch.\n   */\n  warmup(): Promise<void>;\n  /**\n   * Invoke a tool by its namespaced name. Routes to the originating server.\n   * Errors are returned as `{ isError: true, content: [...] }` so a failing\n   * tool doesn't crash the host.\n   */\n  callTool(prefixed: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult>;\n  /**\n   * Resolve a namespaced tool name back to its server connection and original\n   * tool name. Returns undefined if the tool is not currently advertised.\n   */\n  private routeToolName;\n  /**\n   * Tear down all connections and stop background tasks. Idempotent.\n   * Call from `registerRuntimeLifecycle({ cleanup })` in the host plugin.\n   */\n  dispose(): Promise<void>;\n  private startIdleSweep;\n  private sweepIdle;\n}\n//# sourceMappingURL=bundler.d.ts.map\n//#endregion\n//#region src/tool-naming.d.ts\n/**\n * Tool name sanitization and collision handling.\n *\n * OpenClaw constraint: tool names must match `[A-Za-z0-9_-]` and be ≤64 chars.\n * Pattern mirrored from `openclaw/src/agents/pi-bundle-mcp-names.ts`.\n *\n * Strategy: prefix every tool with its server name (`{server}__{tool}`),\n * sanitize disallowed chars to `_`, truncate, then suffix-disambiguate\n * (`-2`, `-3`, ...) on collision.\n */\ndeclare function sanitizeNameSegment(value: string): string;\ndeclare function buildNamespacedToolName(server: string, tool: string): string;\n/**\n * Disambiguate a candidate name against an existing set by appending `-2`, `-3`, etc.\n * Mutates nothing; returns the chosen name. Caller is responsible for inserting it\n * into the set.\n */\ndeclare function disambiguateAgainst(candidate: string, taken: ReadonlySet<string>): string;\n//# sourceMappingURL=tool-naming.d.ts.map\n\n//#endregion\nexport { type BundlerOptions, Connection, type ConnectionDeps, type Logger, McpBundler, type McpClientHandle, type McpServerConfig, type McpToolCallResult, type McpToolDescriptor, type McpTransportKind, type ReconcileDiff, type RemoteServerConfig, STDIO_ENV_DENYLIST, type StdioServerConfig, buildNamespacedToolName, defaultConnect, disambiguateAgainst, sanitizeNameSegment, sanitizeStdioEnv };\n//# sourceMappingURL=index.d.ts.map"],"mappings":";;;;;;KAKKA,eAAAA,GAAkBC,iBAAsC,GAAlBC,kBAAkB;AAAA,UACnDD,iBAAAA,CAAiB;EAGb,OAGJC,EAAAA,MAAAA;;QAHFC;;ACGwF;AAUhF,UDVND,kBAAAA,CCiBc;EAAA,GAAA,EAAA,MAAA;WACgC,CAAA,EAAA,KAAA,GAAA,iBAAA;SACrB,CAAA,EDhBvBC,MCgBuB,CAAA,MAAA,EAAA,MAAA,CAAA;qBAAf,CAAA,EAAA,MAAA;;;;;AATJ,UAAN,MAAA,CAOA;EAAc,KAAA,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;MACgC,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;MACrB,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;OAAf,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;;AAAM,UAFhB,cAAA,CAKe;EAAA,MAAA,CAAA,EAAA;IACd,QAAA,CAAA,EAAA;MACC,KAAA,CAAA,EAAA,MAAA;MAAM,WAAA,CAAA,EANsC,MAMtC,CAAA,MAAA,EAAA,OAAA,CAAA;IAGR,CAAA;EAAS,CAAA;KAIL,CAAA,EAAA;IAID,OAAA,CAAA,EAhBO,MAgBP,CAAA,MAAA,EAhBsB,eAgBtB,CAAA;IAEE,gBAAA,CAAA,EAAA,MAAA;;;AAAD,UAfJ,eAAA,CAkBkB;EAAA,OAAA,EAjBjB,MAiBiB,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA;SACjB,CAAA,EAjBC,MAiBD,CAAA,MAAA,EAAA,OAAA,CAAA;;UAdD,SAAA,CAgBiB;EAAc,IAAA,EAAA,MAAA;EAG/B,KAAA,CAAA,EAAA,MAAA;EAAqB,WAAA,EAAA,MAAA;YAEI,EAjBrB,MAiBqB,CAAA,MAAA,EAAA,OAAA,CAAA;SACA,EAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,OAAA,EAAA,MAAA,CAAA,EAdtB,WAcsB,EAAA,QAAA,CAAA,EAAA,CAAA,MAAA,EAAA,OAAA,EAAA,GAAA,IAAA,EAAA,GAZ5B,OAY4B,CAZpB,eAYoB,CAAA;;AAAO,UAThC,kBAAA,CAYiB;EAAA,MAAA,CAAA,EAXhB,cAWgB;eACjB,CAAA,EAXQ,cAWR;kBACC,CAAA,EAAA,GAAA,GAXgB,cAWhB,GAAA,SAAA;;UARD,qBAAA,CAaA;MAAmB,MAAA;OAAuB,EAAA,CAAA,GAAA,CAAA,EAAA,OAAA,EAAA,GAAA,IAAA,GAXjB,OAWiB,CAAA,IAAA,CAAA;MAAY,CAAA,EAAA,CAAA,GAAA,CAAA,EAAA,OAAA,EAAA,GAAA,IAAA,GAV7B,OAU6B,CAAA,IAAA,CAAA;;UAPtD,iBAAA,CAUyC;EAqD7C,MAAA,EA9DI,MAiKT;EAAA,MAAA,CAAA,EAhKU,cAgKV;cAnFe,CAAA,EAAA;IA+EE,QAAA,CAAA,EAAA,OAAA;EAAiB,CAAA;;;;sBAzJM;;;uBAE/B,mBAAmB,uBAAuB,YAAY;;;;;8BAGlC;;cAqDxB;;;;;;;;gBAgBU;kBA+EE"}
+{"version":3,"file":"plugin.d.ts","names":[],"sources":["../src/ipc-client.ts","../src/plugin.ts"],"mappings":";UA0BiB;EAAA,EAAA,EAAA,MAAA;;YAGL;;ICIF,IAAA,EAAM,MAAA;IAON,OAAA,EAAA,MAAc;EAAA,CAAA;;;;;UAPd,MAAA,CA2BI;EAGJ,KAAA,CAAA,GAAA,EAAA,MAAA,EAAA,GAAkB,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;EAAA,IAAA,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;MACjB,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;OACO,CAAA,GAAA,EAAA,MAAA,EAAA,GAAA,IAAA,EAAA,OAAA,EAAA,CAAA,EAAA,IAAA;;UAzBR,cAAA,CA0B+B;EAG/B,MAAA,CAAA,EAAA;IAAqB,QAAA,CAAA,EAAA;MAEI,KAAA,CAAA,EAAA,MAAA;MACA,WAAA,CAAA,EA/BqB,MA+BrB,CAAA,MAAA,EAAA,OAAA,CAAA;IAAO,CAAA;EAGhC,CAAA;EAAiB,GAAA,CAAA,EAAA;IACjB,OAAA,CAAA,EAlCU,MAkCV,CAAA,MAAA,EAAA,OAAA,CAAA;;;UA/BA,eAAA,CAqCA;SAAmB,EApClB,MAoCkB,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA;SAAuB,CAAA,EAnCxC,MAmCwC,CAAA,MAAA,EAAA,OAAA,CAAA;;UAhC1C,SAAA,CAmCoB;EAAqB,IAAA,EAAA,MAAA;EAuN7C,KAAA,CAAA,EAAA,MAkGL;EAAA,WAAA,EAAA,MAAA;YAtFe,EAlQF,MAkQE,CAAA,MAAA,EAAA,OAAA,CAAA;SAkFE,EAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,OAAA,EAAA,MAAA,CAAA,EAhVL,WAgVK,EAAA,QAAA,CAAA,EAAA,CAAA,MAAA,EAAA,OAAA,EAAA,GAAA,IAAA,EAAA,GA9UX,OA8UW,CA9UH,eA8UG,CAAA;;UA3UR,kBAAA;WACC;kBACO;2BACS;;UAGjB,qBAAA;;mCAEyB;mCACA;;UAGzB,iBAAA;UACA;WACC;;;;;;;sBAG8B;;;uBAE/B,mBAAmB,uBAAuB,YAAY;;;;;8BAGlC;;cAuNxB;;;;;;;;gBAYU;kBAkFE"}