@geohar/pi-mcp-combiner 0.16.0-dev.3 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,22 +5,35 @@ export type NativeToolSurfaceOptions = {
5
5
  /** The resolved combiner connection (owns elicitation, filters, caches). */
6
6
  connection: NativeCombinerConnection;
7
7
  /** The per-project server filter (same object index.ts passes to applyFilter);
8
- * applied defensively here too so a filter race never widens surface exposure. */
9
- serverFilter?: ServerFilter;
8
+ * applied defensively here too so a filter race never widens surface exposure.
9
+ * A GETTER resolves per call — worktrees/project switches re-resolve session
10
+ * config, and a load-time snapshot would apply the wrong allow/deny set. */
11
+ serverFilter?: ServerFilter | (() => ServerFilter | undefined);
10
12
  /** The combiner block's directTools spec, as resolved from the ladder: a glob
11
- * allowlist → "direct" exposure for matches; "search" → everything codemode. */
12
- directSpec?: string[] | "search";
13
+ * allowlist → "direct" exposure for matches; "search" → everything codemode.
14
+ * A getter resolves per call (same reason as serverFilter). */
15
+ directSpec?: string[] | "search" | (() => string[] | "search" | undefined);
16
+ /** Cross-pass registration state (see activateNativeTools). A fresh object on
17
+ * first call; the SAME object on every pass so the diffing + hidden-removal
18
+ * work. native/index.ts owns one per activation. */
19
+ state?: NativeToolSurfaceState;
13
20
  /** Warn when the direct-exposure set grows large (every declared schema rides in
14
21
  * every request). Settings kill-switch: warnLargeDirectExposure (default true). */
15
22
  warnLargeDirectExposure?: boolean;
16
- /** Namespace shown in codemode's grouped listing (pi normalizes -/­_ alike). */
17
- namespaceName?: string;
18
- /** Names that must never be shadowed by a combiner tool (pi builtins + ours). */
19
- reserved?: readonly string[];
20
23
  log: (level: "info" | "warn" | "error", message: string) => void;
21
24
  };
22
- /** Register the combiner's tools natively. Returns the names it registered (for
23
- * status/panel surfaces). Idempotent by name — pi.registerTool replaces by name with
24
- * a warning, so re-registration on list_changed must pass the same names. */
25
+ /** Registration memory across passes: currently-declared names + each tool's schema
26
+ * signature, so a changed schema re-registers and an unchanged one doesn't (pi's
27
+ * re-register = replace-with-warning; skipping unchanged declarations avoids the
28
+ * warning churn and keeps pi's tool identity stable). */
29
+ export type NativeToolSurfaceState = {
30
+ names: Set<string>;
31
+ signatures: Map<string, string | null>;
32
+ };
33
+ /** Register the combiner's tools natively, DIFFING against `state` (which the caller
34
+ * reuses across passes): unchanged declarations are skipped (pi.registerTool
35
+ * replaces-by-name with a warning — churn on every list_changed would spam), changed
36
+ * schemas re-register, and removed tools are re-registered hidden. Returns the names
37
+ * currently active (for status/panel surfaces). */
25
38
  export declare function activateNativeTools(pi: ExtensionAPI, opts: NativeToolSurfaceOptions): Promise<string[]>;
26
39
  //# sourceMappingURL=tool-surface.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tool-surface.d.ts","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,UAAU,CAAA;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAe,MAAM,0BAA0B,CAAA;AAErF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAM9D,MAAM,MAAM,wBAAwB,GAAG;IACnC,4EAA4E;IAC5E,UAAU,EAAE,wBAAwB,CAAA;IACpC;uFACmF;IACnF,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B;qFACiF;IACjF,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAChC;wFACoF;IACpF,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iFAAiF;IACjF,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AAwDD;;8EAE8E;AAC9E,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAmC7G"}
1
+ {"version":3,"file":"tool-surface.d.ts","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,UAAU,CAAA;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAe,MAAM,0BAA0B,CAAA;AAIrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,MAAM,wBAAwB,GAAG;IACnC,4EAA4E;IAC5E,UAAU,EAAE,wBAAwB,CAAA;IACpC;;;iFAG6E;IAC7E,YAAY,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,CAAA;IAC9D;;oEAEgE;IAChE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,QAAQ,GAAG,CAAC,MAAM,MAAM,EAAE,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAA;IAC1E;;yDAEqD;IACrD,KAAK,CAAC,EAAE,sBAAsB,CAAA;IAC9B;wFACoF;IACpF,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AAED;;;0DAG0D;AAC1D,MAAM,MAAM,sBAAsB,GAAG;IACjC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAClB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAA;CACzC,CAAA;AA4ED;;;;oDAIoD;AACpD,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwD7G"}
@@ -21,28 +21,25 @@
21
21
  // replaces it). Per-project allow/deny keeps flowing combiner-side via applyFilter.
22
22
  //
23
23
  // Wire shape: register once at session_start (tools list is stable modulo
24
- // list_changed, which re-registers on the same names). Tools the combiner offers
25
- // during a session surface via the connection's onToolsChanged hook → activate again.
24
+ // list_changed, which re-registers through this module again). Each pass diffs
25
+ // against the previous registration (schema signatures) so only CHANGED tools hit
26
+ // pi.registerTool (pi's replace-by-name path logs a warning per re-registration —
27
+ // a full re-register on every list_changed would churn hundreds of warnings);
28
+ // tools the server REMOVED are re-registered `hidden` so they stop being
29
+ // callable/declared rather than lingering as broken names.
26
30
  import { applyServerFilter, matchesGlob, RESERVED_TOOL_NAMES } from "../client/tool-matching.js";
27
- function isRecord(v) {
28
- return typeof v === "object" && v !== null && !Array.isArray(v);
31
+ import { renderSchemaSignature } from "../client/schema-signature.js";
32
+ import { toLlmContent } from "@earendil-works/pi-mcp";
33
+ const COMBINER_NAMESPACE = { name: "mcp_combiner", description: "mcp-combiner aggregated tools" };
34
+ function resolveFilter(f) {
35
+ return typeof f === "function" ? f() : f;
29
36
  }
30
- /** Map a CallToolResult content block to pi's text-block contract. pi tool results
31
- * are arrays of text blocks today; image/other blocks are summarized to text and the
32
- * full result rides `details` for renderers (same shape the SDK client half uses). */
33
- function textBlockOf(b) {
34
- const block = isRecord(b) ? b : undefined;
35
- if (block && block.type === "text") {
36
- return { type: "text", text: String(block.text) };
37
- }
38
- const kind = block?.type ?? (block ? "content" : b);
39
- return { type: "text", text: `[${String(kind)} block]` };
37
+ function resolveDirectSpec(d) {
38
+ return typeof d === "function" ? d() : d;
40
39
  }
41
40
  function toToolResult(call) {
42
- const blocks = Array.isArray(call.content) ? call.content : [];
43
- return { content: blocks.map((b) => textBlockOf(b)) };
41
+ return { content: toLlmContent(call) };
44
42
  }
45
- /** Register the combiner's tools natively. */
46
43
  const DIRECT_EXPOSURE_WARN_THRESHOLD = 50;
47
44
  /** Turn one combiner ToolSummary into pi's ToolDefinition, plus the native-only fields
48
45
  * pi 1.0 accepts on registerTool (exposure/namespace/annotations). */
@@ -58,14 +55,14 @@ function toNativeTool(sum, conn, exposure) {
58
55
  // pi-permission-system's classification. Kept optional on ToolDefinition so the
59
56
  // extension stays load-compatible with pi 0.99.x where these fields are ignored.
60
57
  exposure,
61
- namespace: { name: "mcp_combiner", description: "mcp-combiner aggregated tools" },
58
+ namespace: COMBINER_NAMESPACE,
62
59
  annotations: sum.annotations,
63
60
  execute: async (_toolCallId, params, signal) => {
64
- // The abort signal rides into the transport; the combiner can cancel
65
- // upstream work, and widget holds respect it (notifications/cancelled).
66
- void signal;
61
+ // The abort signal rides into the transport (callTool's options.signal):
62
+ // cancellation cancels upstream work, and widget holds respect it
63
+ // (notifications/cancelled).
67
64
  try {
68
- const result = await conn.callTool(name, params);
65
+ const result = await conn.callTool(name, params, { signal });
69
66
  return { ...toToolResult(result), details: result };
70
67
  }
71
68
  catch (e) {
@@ -76,16 +73,35 @@ function toNativeTool(sum, conn, exposure) {
76
73
  },
77
74
  };
78
75
  }
79
- /** Register the combiner's tools natively. Returns the names it registered (for
80
- * status/panel surfaces). Idempotent by name — pi.registerTool replaces by name with
81
- * a warning, so re-registration on list_changed must pass the same names. */
76
+ /** Registration for a tool the combiner no longer offers: same name (replaces the old
77
+ * declaration), exposure `hidden` (not declared to the model/codemode; calling it
78
+ * surfaces a clear error instead of a stale upstream call). */
79
+ function removedToolDefinition(name) {
80
+ return {
81
+ name,
82
+ label: name,
83
+ description: "(unavailable: the combiner no longer offers this tool)",
84
+ parameters: { type: "object", properties: {} },
85
+ exposure: "hidden",
86
+ namespace: COMBINER_NAMESPACE,
87
+ execute: async () => {
88
+ throw new Error(`"${name}" is no longer offered by the combiner; use tool_search or the mcp discovery tool to find its replacement`);
89
+ },
90
+ };
91
+ }
92
+ /** Register the combiner's tools natively, DIFFING against `state` (which the caller
93
+ * reuses across passes): unchanged declarations are skipped (pi.registerTool
94
+ * replaces-by-name with a warning — churn on every list_changed would spam), changed
95
+ * schemas re-register, and removed tools are re-registered hidden. Returns the names
96
+ * currently active (for status/panel surfaces). */
82
97
  export async function activateNativeTools(pi, opts) {
83
- const registered = [];
84
- const cachedNames = registered;
85
- const tools = applyServerFilter(await opts.connection.listTools(true), opts.serverFilter);
86
- const allowlist = Array.isArray(opts.directSpec) ? opts.directSpec : [];
87
- const reserved = new Set([...(opts.reserved ?? []), ...RESERVED_TOOL_NAMES]);
98
+ const state = opts.state ?? { names: new Set(), signatures: new Map() };
99
+ const tools = applyServerFilter(await opts.connection.listTools(true), resolveFilter(opts.serverFilter));
100
+ const allowlist = Array.isArray(resolveDirectSpec(opts.directSpec)) ? resolveDirectSpec(opts.directSpec) : [];
101
+ const reserved = new Set(RESERVED_TOOL_NAMES);
102
+ const currentNames = new Set(tools.map((t) => t.name));
88
103
  const directNames = [];
104
+ let fresh = 0;
89
105
  for (const sum of tools) {
90
106
  if (reserved.has(sum.name)) {
91
107
  opts.log("warn", `skipping combiner tool "${sum.name}" — collides with a reserved name`);
@@ -96,10 +112,29 @@ export async function activateNativeTools(pi, opts) {
96
112
  // near-zero declaration cost. "search" degrades to the same codemode mapping
97
113
  // (pi's tool_search replaces the adapter's search-promote semantics).
98
114
  const exposure = allowlist.some((p) => matchesGlob(sum.name, p)) ? "direct" : "codemode";
115
+ // Diff: skip the re-register when the schema signature is unchanged (pi keeps
116
+ // the existing declaration; re-registering would log its warning for nothing).
117
+ const sig = renderSchemaSignature(sum.inputSchema);
118
+ if (state.names.has(sum.name) && state.signatures.get(sum.name) === sig) {
119
+ continue;
120
+ }
121
+ pi.registerTool(toNativeTool(sum, opts.connection, exposure));
122
+ state.signatures.set(sum.name, sig);
123
+ state.names.add(sum.name);
124
+ fresh++;
99
125
  if (exposure === "direct")
100
126
  directNames.push(sum.name);
101
- pi.registerTool(toNativeTool(sum, opts.connection, exposure));
102
- cachedNames.push(sum.name);
127
+ }
128
+ // Removals: hide them (never unregister silently — pi has no unregister; a hidden
129
+ // re-register at the same name retires the declaration).
130
+ let removed = 0;
131
+ for (const goneName of [...state.names]) {
132
+ if (currentNames.has(goneName))
133
+ continue;
134
+ pi.registerTool(removedToolDefinition(goneName));
135
+ state.names.delete(goneName);
136
+ state.signatures.delete(goneName);
137
+ removed++;
103
138
  }
104
139
  if (directNames.length > DIRECT_EXPOSURE_WARN_THRESHOLD &&
105
140
  opts.warnLargeDirectExposure !== false) {
@@ -107,7 +142,9 @@ export async function activateNativeTools(pi, opts) {
107
142
  `request. Consider trimming the allowlist (directTools) or disabling this warning ` +
108
143
  `with "warnLargeDirectExposure": false in extensions/mcp-combiner.json.`);
109
144
  }
110
- opts.log("info", `native tool surface: ${cachedNames.length} tools registered`);
111
- return cachedNames;
145
+ if (fresh || removed) {
146
+ opts.log("info", `native tool surface: ${fresh} registered, ${removed} hidden (removed), ${state.names.size} active`);
147
+ }
148
+ return [...state.names];
112
149
  }
113
150
  //# sourceMappingURL=tool-surface.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tool-surface.js","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,mFAAmF;AACnF,uFAAuF;AACvF,EAAE;AACF,uDAAuD;AACvD,EAAE;AACF,iFAAiF;AACjF,wCAAwC;AACxC,qFAAqF;AACrF,oFAAoF;AACpF,kFAAkF;AAClF,8DAA8D;AAC9D,mFAAmF;AACnF,iFAAiF;AACjF,mFAAmF;AACnF,6DAA6D;AAC7D,EAAE;AACF,qFAAqF;AACrF,qFAAqF;AACrF,sFAAsF;AACtF,oFAAoF;AACpF,EAAE;AACF,0EAA0E;AAC1E,iFAAiF;AACjF,sFAAsF;AAItF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAGhG,SAAS,QAAQ,CAAC,CAAU;IACxB,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AACnE,CAAC;AAqBD;;uFAEuF;AACvF,SAAS,WAAW,CAAC,CAAU;IAC3B,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACzC,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACjC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAA;IACrD,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAA;AAC5D,CAAC;AAED,SAAS,YAAY,CAAC,IAAwD;IAG1E,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACzD,CAAC;AAED,8CAA8C;AAC9C,MAAM,8BAA8B,GAAG,EAAE,CAAA;AAEzC;uEACuE;AACvE,SAAS,YAAY,CAAC,GAAgB,EAAE,IAA8B,EAAE,QAAoC;IACxG,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACrB,OAAO;QACH,IAAI;QACJ,KAAK,EAAE,IAAI;QACX,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,IAAI;QACpC,UAAU,EAAG,GAAG,CAAC,WAA8B,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;QACrF,gFAAgF;QAChF,wEAAwE;QACxE,gFAAgF;QAChF,iFAAiF;QACjF,QAAQ;QACR,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,+BAA+B,EAAE;QACjF,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC3C,qEAAqE;YACrE,wEAAwE;YACxE,KAAK,MAAM,CAAA;YACX,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAChD,OAAO,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAA;YACvD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,sEAAsE;gBACtE,mCAAmC;gBACnC,MAAM,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACvD,CAAC;QACL,CAAC;KACJ,CAAA;AACL,CAAC;AAED;;8EAE8E;AAC9E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAgB,EAAE,IAA8B;IACtF,MAAM,UAAU,GAAG,EAAc,CAAA;IACjC,MAAM,WAAW,GAAa,UAAU,CAAA;IACxC,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IACzF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;IACvE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAA;IAEpF,MAAM,WAAW,GAAa,EAAE,CAAA;IAChC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,GAAG,CAAC,IAAI,mCAAmC,CAAC,CAAA;YACxF,SAAQ;QACZ,CAAC;QACD,6EAA6E;QAC7E,+EAA+E;QAC/E,6EAA6E;QAC7E,sEAAsE;QACtE,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAA;QACxF,IAAI,QAAQ,KAAK,QAAQ;YAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrD,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC7D,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IACD,IACI,WAAW,CAAC,MAAM,GAAG,8BAA8B;QACnD,IAAI,CAAC,uBAAuB,KAAK,KAAK,EACxC,CAAC;QACC,IAAI,CAAC,GAAG,CACJ,MAAM,EACN,gBAAgB,WAAW,CAAC,MAAM,yDAAyD;YACvF,mFAAmF;YACnF,wEAAwE,CAC/E,CAAA;IACL,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,WAAW,CAAC,MAAM,mBAAmB,CAAC,CAAA;IAC/E,OAAO,WAAW,CAAA;AACtB,CAAC"}
1
+ {"version":3,"file":"tool-surface.js","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"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"}
package/dist/pi.d.ts CHANGED
@@ -79,6 +79,12 @@ export type TextBlock = {
79
79
  type: "text";
80
80
  text: string;
81
81
  };
82
+ /** Image block as pi-ai accepts it (tool results may carry images — see toLlmContent). */
83
+ export type ImageBlock = {
84
+ type: "image";
85
+ data: string;
86
+ mimeType: string;
87
+ };
82
88
  /** pi's TUI Component contract (pi-tui's Component). invalidate() is REQUIRED,
83
89
  * not optional: MouseRegion.invalidate calls it unconditionally, and a component
84
90
  * missing it crashes pi with "this.child.invalidate is not a function" the first
@@ -101,7 +107,9 @@ export type ToolRenderResultOptions = {
101
107
  /** pi's real tool-result contract: content is an ARRAY of blocks; the error flag is
102
108
  * set by THROWING from execute, never by returning a property. */
103
109
  export type ToolResult = {
104
- content: TextBlock[];
110
+ /** SAFETY: content blocks follow pi-ai's block union — text or base64 image. The
111
+ * wider-than-TextBlock shape keeps MCP image results lossless (toLlmContent). */
112
+ content: (TextBlock | ImageBlock)[];
105
113
  details?: unknown;
106
114
  terminate?: boolean;
107
115
  };
package/dist/pi.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../src/pi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../src/pi.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geohar/pi-mcp-combiner",
3
- "version": "0.16.0-dev.3",
3
+ "version": "0.16.0",
4
4
  "description": "Pi extension: run the mcp-combiner MCP aggregator via sharedserver and inject its tool-discovery directive. Pairs with pi-mcp-adapter, which makes the combiner's tools reachable from Pi.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -54,7 +54,6 @@
54
54
  "access": "public"
55
55
  },
56
56
  "devDependencies": {
57
- "@earendil-works/pi-mcp": "^1.0.0",
58
57
  "@earendil-works/pi-tui": "^0.85.1",
59
58
  "@types/node": "^22.0.0",
60
59
  "typescript": "^5.6.0",
@@ -67,6 +66,11 @@
67
66
  "@earendil-works/pi-mcp": "^1.0.2",
68
67
  "@earendil-works/pi-tui": "^0.85.1"
69
68
  },
69
+ "peerDependenciesMeta": {
70
+ "@earendil-works/pi-mcp": {
71
+ "optional": true
72
+ }
73
+ },
70
74
  "dependencies": {
71
75
  "@earendil-works/pi-mcp": "^1.0.2"
72
76
  }
@@ -59,7 +59,10 @@ export interface CombinerConnection {
59
59
  getPrompt(name: string, args: Record<string, string>): Promise<unknown>
60
60
  listResources(force?: boolean): Promise<ResourceSummary[]>
61
61
  readResource(uri: string): Promise<unknown>
62
- callTool(name: string, args: Record<string, unknown> | undefined): Promise<unknown>
62
+ /** Call a combiner tool. `options.signal` rides into the transport — pi's cancel
63
+ * aborts upstream work and widget holds. Throws on transport failure (with a
64
+ * recovery hint) and on server-marked tool errors (result.isError). */
65
+ callTool(name: string, args: Record<string, unknown> | undefined, options?: { signal?: AbortSignal }): Promise<unknown>
63
66
  controlOrigin(): string
64
67
  uiUrlFor(resourceUri: string): string
65
68
  applyFilter(filter: ServerFilter): Promise<void>
package/src/index.ts CHANGED
@@ -409,20 +409,16 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
409
409
  // without a grouping token); list_changed re-syncs ride resyncAll below.
410
410
  nativeSurface = activateNativeMode(pi, {
411
411
  connection,
412
- directSpec: sessionCfg?.directSpec ?? [],
413
- serverFilter: sessionCfg?.serverFilter,
412
+ // Getters, not snapshots: worktrees / project switches re-resolve
413
+ // sessionCfg per session_start, and a load-time value would apply the
414
+ // wrong allow/deny set and directTools spec to later sessions.
415
+ directSpec: () => sessionCfg?.directSpec,
416
+ serverFilter: () => sessionCfg?.serverFilter,
414
417
  exposeResources: settings.exposeResources !== false,
415
418
  uiAutoOpen: settings.uiAutoOpen !== false,
416
419
  warnLargeDirectExposure: settings.warnLargeDirectExposure,
417
420
  log: clientLog,
418
421
  })
419
- if (sessionCfg.otherServers.length && !adapterPackageInstalled()) {
420
- clientLog(
421
- "info",
422
- `note: ${sessionCfg.otherServers.length} non-combiner server(s) in the mcp.json ladder are not ` +
423
- `connected by this extension (${sessionCfg.otherServers.join(", ")})`,
424
- )
425
- }
426
422
  }
427
423
 
428
424
  if (!adapterEnabled && notify) {
@@ -491,10 +487,12 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
491
487
 
492
488
  pi.on("session_start", (event, ctx) => {
493
489
  try {
494
- uiNotify = notify && ctx.hasUI && ctx.ui?.notify ? (m, l) => ctxUi?.notify?.(m, l) : undefined
495
- uiCtx = ctx.ui
496
- const ctxUi = ctx.ui // SAFETY: the object, once — never re-enter the getter async
497
- conn.bindUi({ hasUI: ctx.hasUI && Boolean(ctx.ui?.select && ctx.ui?.input), ui: ctx.ui })
490
+ // SAFETY: capture ctx.ui ONCE, first — the getter asserts staleness,
491
+ // the object does not; every async closure below uses the object only.
492
+ const ctxUi = ctx.ui
493
+ uiNotify = notify && ctx.hasUI && ctxUi?.notify ? (m, l) => ctxUi?.notify?.(m, l) : undefined
494
+ uiCtx = ctxUi
495
+ conn.bindUi({ hasUI: ctx.hasUI && Boolean(ctxUi?.select && ctxUi?.input), ui: ctxUi })
498
496
  // Per-session config re-resolution: worktrees and project switches read
499
497
  // THEIR project layers (.mcp.json / .pi/mcp.json); a changed URL rebinds.
500
498
  sessionCfg = resolveSessionConfig({
@@ -594,6 +592,16 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
594
592
  // not — capture once, use the object in async paths (stale after a
595
593
  // reload is a no-op render, not a crash).
596
594
  const ctxUi = ctx.ui
595
+ // SAFETY: the shared async-notify shape (notify via the captured object,
596
+ // degrade to stderr) — a catch must never re-enter the same stale ctx it
597
+ // is handling, so every async .then/.catch funnels through here.
598
+ const uiNotifySafe = (msg: string, level: "info" | "warn" | "error"): void => {
599
+ try {
600
+ ctxUi?.notify?.(msg, level)
601
+ } catch {
602
+ process.stderr.write(`mcp-combiner: ${msg}\n`)
603
+ }
604
+ }
597
605
  if (v === "panel") {
598
606
  if (!connection) {
599
607
  ctx.ui?.notify?.(
@@ -602,7 +610,9 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
602
610
  )
603
611
  return
604
612
  }
605
- openCombinerPanel(
613
+ // Async (it opens a held tool session); its rejection must be handled
614
+ // via STDERR — not via the stale getter this handler was entered for.
615
+ void openCombinerPanel(
606
616
  {
607
617
  connection,
608
618
  toolName,
@@ -611,7 +621,7 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
611
621
  notify: (m, l) => ctxUi?.notify?.(m, l),
612
622
  },
613
623
  ctxUi,
614
- )
624
+ ).catch((e) => process.stderr.write(`mcp-combiner: panel failed (${e instanceof Error ? e.message : String(e)})\n`))
615
625
  return
616
626
  }
617
627
  if (v === "" || v === "status") {
@@ -622,27 +632,11 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
622
632
  )
623
633
  return
624
634
  }
625
- // SAFETY: capture ctx.ui ONCE synchronously (the getter asserts
626
- // staleness; the OBJECT it returns does not) — an async callback
627
- // must never re-enter the getter, and a catch must never touch
628
- // the same stale ctx it's handling.
629
- const ctxUi = ctx.ui
630
635
  void controlStatusText(connection, ctx.cwd)
631
- .then((t) => {
632
- try {
633
- ctxUi?.notify?.(t, "info")
634
- } catch {
635
- process.stderr.write(`${t}\n`)
636
- }
637
- })
638
- .catch((e) => {
639
- const msg = `mcp-combiner: status failed (${e instanceof Error ? e.message : String(e)})`
640
- try {
641
- ctxUi?.notify?.(msg, "error")
642
- } catch {
643
- process.stderr.write(`${msg}\n`)
644
- }
645
- })
636
+ .then((t) => uiNotifySafe(t, "info"))
637
+ .catch((e) =>
638
+ uiNotifySafe(`status failed (${e instanceof Error ? e.message : String(e)})`, "error"),
639
+ )
646
640
  return
647
641
  }
648
642
  if (v === "enable" || v === "disable" || v === "restart-server") {
@@ -655,23 +649,9 @@ export default function mcpCombiner(pi: ExtensionAPI): void {
655
649
  ctx.ui?.notify?.(`mcp-combiner: ${v} needs a server name`, "warn")
656
650
  return
657
651
  }
658
- const ctxUi = ctx.ui
659
652
  void metaToolCall(connection, v, server)
660
- .then((t) => {
661
- try {
662
- ctxUi?.notify?.(t, "info")
663
- } catch {
664
- process.stderr.write(`${t}\n`)
665
- }
666
- })
667
- .catch((e) => {
668
- const msg = `mcp-combiner: ${v} failed (${e instanceof Error ? e.message : String(e)})`
669
- try {
670
- ctxUi?.notify?.(msg, "error")
671
- } catch {
672
- process.stderr.write(`${msg}\n`)
673
- }
674
- })
653
+ .then((t) => uiNotifySafe(t, "info"))
654
+ .catch((e) => uiNotifySafe(`${v} failed (${e instanceof Error ? e.message : String(e)})`, "error"))
675
655
  return
676
656
  }
677
657
  if (v === "system-prompt") {