@geohar/pi-mcp-combiner 0.24.2 → 0.24.5

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.
Files changed (41) hide show
  1. package/CHANGELOG.md +101 -0
  2. package/dist/client/footer.d.ts +10 -2
  3. package/dist/client/footer.d.ts.map +1 -1
  4. package/dist/client/footer.js +15 -6
  5. package/dist/client/footer.js.map +1 -1
  6. package/dist/combiner-process.d.ts +160 -0
  7. package/dist/combiner-process.d.ts.map +1 -0
  8. package/dist/combiner-process.js +721 -0
  9. package/dist/combiner-process.js.map +1 -0
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/index.js +140 -306
  12. package/dist/index.js.map +1 -1
  13. package/dist/native/combiner-connection.d.ts +84 -0
  14. package/dist/native/combiner-connection.d.ts.map +1 -1
  15. package/dist/native/combiner-connection.js +194 -5
  16. package/dist/native/combiner-connection.js.map +1 -1
  17. package/dist/native/index.d.ts +32 -4
  18. package/dist/native/index.d.ts.map +1 -1
  19. package/dist/native/index.js +94 -6
  20. package/dist/native/index.js.map +1 -1
  21. package/dist/native/resources.d.ts +3 -0
  22. package/dist/native/resources.d.ts.map +1 -1
  23. package/dist/native/resources.js +6 -1
  24. package/dist/native/resources.js.map +1 -1
  25. package/dist/native/tool-surface.d.ts +31 -2
  26. package/dist/native/tool-surface.d.ts.map +1 -1
  27. package/dist/native/tool-surface.js +62 -18
  28. package/dist/native/tool-surface.js.map +1 -1
  29. package/dist/pi.d.ts +9 -1
  30. package/dist/pi.d.ts.map +1 -1
  31. package/package.json +5 -5
  32. package/src/client/footer.ts +16 -4
  33. package/src/client/panel.ts +1 -1
  34. package/src/client/renderers.ts +2 -2
  35. package/src/combiner-process.ts +813 -0
  36. package/src/index.ts +142 -355
  37. package/src/native/combiner-connection.ts +220 -10
  38. package/src/native/index.ts +119 -18
  39. package/src/native/resources.ts +8 -1
  40. package/src/native/tool-surface.ts +80 -18
  41. package/src/pi.ts +6 -1
@@ -22,16 +22,44 @@ export type NativeActivationOptions = {
22
22
  /** Cap on guarded tool-result text before spill-to-file (maxResultChars setting);
23
23
  * forwarded to the tool surface and the interactive read_* tools. */
24
24
  maxResultChars?: number;
25
+ /** Tool-registration progress for the current pass (registered, total); see
26
+ * NativeToolSurfaceOptions.onProgress. index.ts drives the footer from it. */
27
+ onToolProgress?: (done: number, total: number) => void;
25
28
  log: (level: "info" | "warn" | "error", message: string) => void;
26
29
  };
30
+ /** The native surface's lifecycle, as returned by activateNativeMode. */
31
+ export type NativeSurface = {
32
+ /** Start a registration pass against the current catalog (supersedes one in flight). */
33
+ run(): void;
34
+ /** True while a tool registration pass is running (connecting, listing, or
35
+ * registering). */
36
+ busy(): boolean;
37
+ /** Resolves when no tool pass is running: the newest pass has ended, however it
38
+ * ended (finished, failed, stopped). Never rejects. */
39
+ settled(): Promise<void>;
40
+ /** Stop: in-flight passes end at their next check; run() becomes a no-op. */
41
+ dispose(): void;
42
+ };
43
+ /** How long a turn waits for tool registration before starting with what it has.
44
+ * Covers the worst cold start: the connect retry (15 s budget) plus a full
45
+ * registration pass (~10 s for ~1,000 tools). */
46
+ export declare const TURN_WAIT_MS = 30000;
47
+ /** Wait until `surface` has no registration pass running, at most `timeoutMs`, or
48
+ * until `signal` aborts or `onInterrupt` fires (it receives a callback that ends
49
+ * the wait and returns an unsubscribe; index.ts wires it to Esc / Ctrl+C / Ctrl+D,
50
+ * since pi has no abort signal at before_agent_start). Never rejects; the timer is
51
+ * cleared (and unref'd) and the listeners removed, so a wait that ends early never
52
+ * holds pi open. */
53
+ export declare function waitForRegistration(surface: Pick<NativeSurface, "busy" | "settled">, opts?: {
54
+ timeoutMs?: number;
55
+ signal?: AbortSignal;
56
+ onInterrupt?: (interrupt: () => void) => () => void;
57
+ }): Promise<"idle" | "settled" | "timeout" | "aborted">;
27
58
  /** Register the declared tool surface + interactive-resource read_* tools + the
28
59
  * list_changed re-registration handler. Called once at session_start; the
29
60
  * list_changed hook re-syncs both surfaces on the same names. One shared
30
61
  * NativeToolSurfaceState diff across all passes — unchanged declarations are
31
62
  * skipped, removed ones re-registered hidden (see activateNativeTools). */
32
- export declare function activateNativeMode(pi: ExtensionAPI, opts: NativeActivationOptions): {
33
- run(): void;
34
- dispose(): void;
35
- };
63
+ export declare function activateNativeMode(pi: ExtensionAPI, opts: NativeActivationOptions): NativeSurface;
36
64
  export type { ExtensionContext };
37
65
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AAInE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,KAAK,wBAAwB,EAAE,KAAK,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AACnH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAEhH,MAAM,MAAM,uBAAuB,GAAG;IAClC,UAAU,EAAE,wBAAwB,CAAA;IACpC,kFAAkF;IAClF,UAAU,CAAC,EAAE,MAAM,MAAM,EAAE,GAAG,QAAQ,GAAG,SAAS,CAAA;IAClD,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,YAAY,GAAG,SAAS,CAAA;IAC7C;kCAC8B;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;yEACqE;IACrE,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC;0EACsE;IACtE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AAED;;;;4EAI4E;AAC5E,wBAAgB,kBAAkB,CAC9B,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,uBAAuB,GAC9B;IAAE,GAAG,IAAI,IAAI,CAAC;IAAC,OAAO,IAAI,IAAI,CAAA;CAAE,CAgDlC;AAaD,YAAY,EAAE,gBAAgB,EAAE,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AAInE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,KAAK,wBAAwB,EAAE,KAAK,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AACnH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAEhH,MAAM,MAAM,uBAAuB,GAAG;IAClC,UAAU,EAAE,wBAAwB,CAAA;IACpC,kFAAkF;IAClF,UAAU,CAAC,EAAE,MAAM,MAAM,EAAE,GAAG,QAAQ,GAAG,SAAS,CAAA;IAClD,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,YAAY,GAAG,SAAS,CAAA;IAC7C;kCAC8B;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;yEACqE;IACrE,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC;0EACsE;IACtE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;mFAC+E;IAC/E,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACtD,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AAED,yEAAyE;AACzE,MAAM,MAAM,aAAa,GAAG;IACxB,wFAAwF;IACxF,GAAG,IAAI,IAAI,CAAA;IACX;wBACoB;IACpB,IAAI,IAAI,OAAO,CAAA;IACf;4DACwD;IACxD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,6EAA6E;IAC7E,OAAO,IAAI,IAAI,CAAA;CAClB,CAAA;AAED;;kDAEkD;AAClD,eAAO,MAAM,YAAY,QAAS,CAAA;AAElC;;;;;qBAKqB;AACrB,wBAAsB,mBAAmB,CACrC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC,EAChD,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;CAAO,GAC7G,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC,CA4BrD;AAED;;;;4EAI4E;AAC5E,wBAAgB,kBAAkB,CAC9B,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,uBAAuB,GAC9B,aAAa,CAwFf;AAaD,YAAY,EAAE,gBAAgB,EAAE,CAAA"}
@@ -17,6 +17,51 @@ export { NativeCombinerConnection } from "./combiner-connection.js";
17
17
  export { activateNativeTools } from "./tool-surface.js";
18
18
  export { tokenedUrl } from "./combiner-connection.js";
19
19
  export { activateNativeResources, filterInteractiveResources } from "./resources.js";
20
+ /** How long a turn waits for tool registration before starting with what it has.
21
+ * Covers the worst cold start: the connect retry (15 s budget) plus a full
22
+ * registration pass (~10 s for ~1,000 tools). */
23
+ export const TURN_WAIT_MS = 30_000;
24
+ /** Wait until `surface` has no registration pass running, at most `timeoutMs`, or
25
+ * until `signal` aborts or `onInterrupt` fires (it receives a callback that ends
26
+ * the wait and returns an unsubscribe; index.ts wires it to Esc / Ctrl+C / Ctrl+D,
27
+ * since pi has no abort signal at before_agent_start). Never rejects; the timer is
28
+ * cleared (and unref'd) and the listeners removed, so a wait that ends early never
29
+ * holds pi open. */
30
+ export async function waitForRegistration(surface, opts = {}) {
31
+ if (!surface.busy())
32
+ return "idle";
33
+ if (opts.signal?.aborted)
34
+ return "aborted";
35
+ let timer;
36
+ let onAbort;
37
+ let unsubscribe;
38
+ try {
39
+ return await Promise.race([
40
+ surface.settled().then(() => "settled"),
41
+ new Promise((resolve) => {
42
+ timer = setTimeout(() => resolve("timeout"), opts.timeoutMs ?? TURN_WAIT_MS);
43
+ timer.unref?.();
44
+ }),
45
+ new Promise((resolve) => {
46
+ onAbort = () => resolve("aborted");
47
+ opts.signal?.addEventListener("abort", onAbort, { once: true });
48
+ try {
49
+ unsubscribe = opts.onInterrupt?.(onAbort);
50
+ }
51
+ catch {
52
+ // an interrupt source that fails just isn't one
53
+ }
54
+ }),
55
+ ]);
56
+ }
57
+ finally {
58
+ if (timer)
59
+ clearTimeout(timer);
60
+ if (onAbort)
61
+ opts.signal?.removeEventListener("abort", onAbort);
62
+ unsubscribe?.();
63
+ }
64
+ }
20
65
  /** Register the declared tool surface + interactive-resource read_* tools + the
21
66
  * list_changed re-registration handler. Called once at session_start; the
22
67
  * list_changed hook re-syncs both surfaces on the same names. One shared
@@ -28,28 +73,64 @@ export function activateNativeMode(pi, opts) {
28
73
  // Cross-pass memory for the read_* tools (skip re-registration of unchanged
29
74
  // names — pi.registerTool replaces-by-name with a warning).
30
75
  const resourceRegistered = new Set();
76
+ // Only the NEWEST tool pass may change toolState. activateNativeTools yields
77
+ // between registration slices, so passes can overlap in time; each run() bumps
78
+ // `generation`, and a pass whose generation is stale stops at its next check.
79
+ // That is enough on its own: a pass checks shouldContinue() after every await
80
+ // (listTools and each slice yield), and every state change happens synchronously
81
+ // between those checks, so a superseded pass never touches state again.
82
+ // index.ts calls dispose() at session_shutdown and on reload teardown, which
83
+ // stops a pass the same way before pi retires the session's extension API.
84
+ let generation = 0;
85
+ // The newest tool pass, until it ends; undefined when no pass is running. A
86
+ // superseded pass doesn't count: settled() follows whichever pass is newest.
87
+ let latest;
31
88
  const run = () => {
32
89
  if (!active)
33
90
  return;
34
- void activateNativeTools(pi, {
91
+ const mine = ++generation;
92
+ const current = () => active && generation === mine;
93
+ // A pass that fails after this surface was disposed or superseded (pi's
94
+ // registerTool throws once the session's extension API is retired) is not
95
+ // news: only the newest live pass reports failures.
96
+ const failed = (what) => (e) => {
97
+ if (current())
98
+ opts.log("warn", `${what} failed: ${e instanceof Error ? e.message : String(e)}`);
99
+ };
100
+ const tools = activateNativeTools(pi, {
35
101
  connection: opts.connection,
36
102
  serverFilter: opts.serverFilter,
37
103
  directSpec: opts.directSpec,
38
104
  state: toolState,
39
105
  warnLargeDirectExposure: opts.warnLargeDirectExposure,
40
106
  maxResultChars: opts.maxResultChars,
107
+ shouldContinue: current,
108
+ onProgress: opts.onToolProgress,
41
109
  log: opts.log,
42
- }).catch((e) => opts.log("warn", `native tool surface failed: ${e instanceof Error ? e.message : String(e)}`));
43
- if (opts.exposeResources !== false) {
44
- void activateNativeResources(pi, {
110
+ }).then(() => undefined, failed("native tool surface"));
111
+ const resources = opts.exposeResources !== false
112
+ ? activateNativeResources(pi, {
45
113
  connection: opts.connection,
46
114
  serverFilter: opts.serverFilter,
47
115
  directSpec: opts.directSpec,
48
116
  uiAutoOpen: opts.uiAutoOpen,
49
117
  maxResultChars: opts.maxResultChars,
118
+ shouldContinue: current,
50
119
  log: opts.log,
51
- }, resourceRegistered).catch((e) => opts.log("warn", `native resource surface failed: ${e instanceof Error ? e.message : String(e)}`));
52
- }
120
+ }, resourceRegistered).then(() => undefined, failed("native resource surface"))
121
+ : Promise.resolve();
122
+ // The pass is both surfaces: a turn that waits on settled() gets the read_*
123
+ // tools too. The newest pass always ends with a "done" report, even when it
124
+ // had nothing to register or failed, so a "registering" left by a superseded
125
+ // pass never sticks in the footer.
126
+ const pass = Promise.all([tools, resources]).then(() => {
127
+ // Clear first: a throwing progress hook must not leave busy() true.
128
+ if (latest === pass)
129
+ latest = undefined;
130
+ if (current())
131
+ opts.onToolProgress?.(0, 0);
132
+ });
133
+ latest = pass;
53
134
  };
54
135
  // The FIRST run is the caller's to schedule: the grouping token only exists
55
136
  // after session_start (the connection refuses to connect without it), so a
@@ -61,6 +142,13 @@ export function activateNativeMode(pi, opts) {
61
142
  // ONE hook set, index.ts's.
62
143
  return {
63
144
  run,
145
+ busy: () => latest !== undefined,
146
+ async settled() {
147
+ // A pass that ends because a newer one superseded it hands over: keep
148
+ // waiting until no pass is running.
149
+ while (latest)
150
+ await latest;
151
+ },
64
152
  dispose() {
65
153
  active = false;
66
154
  },
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,kFAAkF;AAClF,6CAA6C;AAC7C,EAAE;AACF,+FAA+F;AAC/F,0EAA0E;AAC1E,+EAA+E;AAC/E,EAAE;AACF,mFAAmF;AACnF,mFAAmF;AACnF,kFAAkF;AAClF,iFAAiF;AACjF,wEAAwE;AAKxE,OAAO,EAAE,mBAAmB,EAA+B,MAAM,mBAAmB,CAAA;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAA8D,MAAM,mBAAmB,CAAA;AACnH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAA8B,MAAM,gBAAgB,CAAA;AAsBhH;;;;4EAI4E;AAC5E,MAAM,UAAU,kBAAkB,CAC9B,EAAgB,EAChB,IAA6B;IAE7B,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,MAAM,SAAS,GAA2B,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,CAAA;IACrF,4EAA4E;IAC5E,4DAA4D;IAC5D,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAA;IAC5C,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,KAAK,mBAAmB,CAAC,EAAE,EAAE;YACzB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK,EAAE,SAAS;YAChB,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;YACrD,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,GAAG,EAAE,IAAI,CAAC,GAAG;SAChB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACX,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAChG,CAAA;QACD,IAAI,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,uBAAuB,CACxB,EAAE,EACF;gBACI,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,GAAG,EAAE,IAAI,CAAC,GAAG;aAChB,EACD,kBAAkB,CACrB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACrH,CAAC;IACL,CAAC,CAAA;IACD,4EAA4E;IAC5E,2EAA2E;IAC3E,2EAA2E;IAC3E,gEAAgE;IAChE,yEAAyE;IACzE,sEAAsE;IACtE,2EAA2E;IAC3E,4BAA4B;IAC5B,OAAO;QACH,GAAG;QACH,OAAO;YACH,MAAM,GAAG,KAAK,CAAA;QAClB,CAAC;KACJ,CAAA;AACL,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,9 @@ import type { NativeCombinerConnection, ResourceSummary } from "./combiner-conne
3
3
  import type { ServerFilter } from "../client/config-ladder.js";
4
4
  export type NativeResourceOptions = {
5
5
  connection: NativeCombinerConnection;
6
+ /** Checked after listing: false means this pass should stop (see
7
+ * NativeToolSurfaceOptions.shouldContinue). */
8
+ shouldContinue?: () => boolean;
6
9
  /** Per-project server filter, same semantics as legacy filterResources; a getter
7
10
  * resolves per call (worktrees/project switches re-resolve session config). */
8
11
  serverFilter?: ServerFilter | (() => ServerFilter | undefined);
@@ -1 +1 @@
1
- {"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/native/resources.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,UAAU,CAAA;AAC5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAIzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,MAAM,qBAAqB,GAAG;IAChC,UAAU,EAAE,wBAAwB,CAAA;IACpC;oFACgF;IAChF,YAAY,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,CAAA;IAC9D;;2EAEuE;IACvE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,QAAQ,GAAG,CAAC,MAAM,MAAM,EAAE,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAA;IAC1E,wEAAwE;IACxE,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,gFAAgF;IAChF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AASD;gFACgF;AAChF,wBAAgB,0BAA0B,CACtC,SAAS,EAAE,eAAe,EAAE,EAC5B,MAAM,EAAE,YAAY,GAAG,SAAS,GACjC,eAAe,EAAE,CAUnB;AA6DD;mDACmD;AACnD,wBAAsB,uBAAuB,CACzC,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAkBnB"}
1
+ {"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/native/resources.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,UAAU,CAAA;AAC5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAIzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,MAAM,qBAAqB,GAAG;IAChC,UAAU,EAAE,wBAAwB,CAAA;IACpC;oDACgD;IAChD,cAAc,CAAC,EAAE,MAAM,OAAO,CAAA;IAC9B;oFACgF;IAChF,YAAY,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,CAAA;IAC9D;;2EAEuE;IACvE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,QAAQ,GAAG,CAAC,MAAM,MAAM,EAAE,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAA;IAC1E,wEAAwE;IACxE,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,gFAAgF;IAChF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AASD;gFACgF;AAChF,wBAAgB,0BAA0B,CACtC,SAAS,EAAE,eAAe,EAAE,EAC5B,MAAM,EAAE,YAAY,GAAG,SAAS,GACjC,eAAe,EAAE,CAUnB;AA6DD;mDACmD;AACnD,wBAAsB,uBAAuB,CACzC,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAsBnB"}
@@ -105,9 +105,14 @@ export async function activateNativeResources(pi, opts, registered) {
105
105
  resources = filterInteractiveResources(await opts.connection.listResources(true), resolveFilter(opts.serverFilter));
106
106
  }
107
107
  catch (e) {
108
- opts.log("warn", `interactive resource discovery failed (${e instanceof Error ? e.message : String(e)})`);
108
+ // A pass stopped by dispose() or a newer pass fails here harmlessly
109
+ // (e.g. "connect superseded"): not news.
110
+ if (!opts.shouldContinue || opts.shouldContinue())
111
+ opts.log("warn", `interactive resource discovery failed (${e instanceof Error ? e.message : String(e)})`);
109
112
  return [];
110
113
  }
114
+ if (opts.shouldContinue && !opts.shouldContinue())
115
+ return [];
111
116
  const added = [];
112
117
  for (const resource of resources) {
113
118
  const toolName = `read_${resourceNameToToolName(resource.name ?? resource.uri)}`;
@@ -1 +1 @@
1
- {"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/native/resources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/native/resources.ts"],"names":[],"mappings":"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"}
@@ -24,8 +24,29 @@ export type NativeToolSurfaceOptions = {
24
24
  /** Warn when the direct-exposure set grows large (every declared schema rides in
25
25
  * every request). Settings kill-switch: warnLargeDirectExposure (default true). */
26
26
  warnLargeDirectExposure?: boolean;
27
+ /** Checked after every yield between registration slices: false means this
28
+ * pass should stop (the session ended, or a newer pass superseded it). pi's
29
+ * registerTool throws once the extension API is invalidated (/new, /resume,
30
+ * /reload), and a superseded pass would only redo work the next one does. */
31
+ shouldContinue?: () => boolean;
32
+ /** Registration progress for this pass: (changes applied so far, total changes;
33
+ * a change is a registration or a removal).
34
+ * Called after each slice; not called when the pass has nothing to register.
35
+ * done >= total means finished (activateNativeMode also reports (0, 0) when its
36
+ * newest pass ends, however it ends). */
37
+ onProgress?: (done: number, total: number) => void;
27
38
  log: (level: "info" | "warn" | "error", message: string) => void;
28
39
  };
40
+ /** Main-thread time a registration slice may use before yielding to the event
41
+ * loop. Every pi.registerTool rebuilds pi's whole tool registry, and with codemode
42
+ * active that re-renders a declaration for every codemode tool registered so far.
43
+ * So a pass is O(n²) and the per-call cost grows as the pass goes (from ~2 ms to
44
+ * ~12–18 ms at ~1,000 tools). A fixed tool COUNT per slice made the last slices
45
+ * about six times longer than the first; a time budget keeps every slice about
46
+ * the same length. Registering a 1,000-tool catalog in one go froze typing for
47
+ * ~10 s. A slice always registers at least one tool, so a call slower than the
48
+ * budget still makes progress. */
49
+ export declare const REGISTER_SLICE_MS = 50;
29
50
  /** Registration memory across passes: currently-declared names + each tool's schema
30
51
  * signature, so a changed schema re-registers and an unchanged one doesn't (pi's
31
52
  * re-register = replace-with-warning; skipping unchanged declarations avoids the
@@ -37,7 +58,15 @@ export type NativeToolSurfaceState = {
37
58
  /** Register the combiner's tools natively, DIFFING against `state` (which the caller
38
59
  * reuses across passes): unchanged declarations are skipped (pi.registerTool
39
60
  * replaces-by-name with a warning — churn on every list_changed would spam), changed
40
- * schemas re-register, and removed tools are re-registered hidden. Returns the names
41
- * currently active (for status/panel surfaces). */
61
+ * schemas re-register, and removed tools are re-registered hidden.
62
+ *
63
+ * Registration runs in time-boxed slices (REGISTER_SLICE_MS) with an event-loop
64
+ * yield between them, so a large catalog never holds pi's main thread for long. `state` is updated per registerTool, never ahead of it, so a
65
+ * pass that stops early (shouldContinue() false) leaves state matching exactly what
66
+ * pi holds and the next pass's diff resumes from there. Two passes over the same
67
+ * state may overlap in time only if the older one's shouldContinue() turns false
68
+ * once the newer starts (native/index.ts's generation check); every state change
69
+ * happens between those checks. Returns the names currently active (for
70
+ * status/panel surfaces). */
42
71
  export declare function activateNativeTools(pi: ExtensionAPI, opts: NativeToolSurfaceOptions): Promise<string[]>;
43
72
  //# 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":"AA8BA,OAAO,KAAK,EAAE,YAAY,EAA8C,MAAM,UAAU,CAAA;AACxF,OAAO,KAAK,EAAE,wBAAwB,EAAe,MAAM,0BAA0B,CAAA;AAMrF,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;;qFAEiF;IACjF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;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;AAgHD;;;;oDAIoD;AACpD,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwD7G"}
1
+ {"version":3,"file":"tool-surface.d.ts","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,YAAY,EAA8C,MAAM,UAAU,CAAA;AACxF,OAAO,KAAK,EAAE,wBAAwB,EAAe,MAAM,0BAA0B,CAAA;AAMrF,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;;qFAEiF;IACjF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;wFACoF;IACpF,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC;;;kFAG8E;IAC9E,cAAc,CAAC,EAAE,MAAM,OAAO,CAAA;IAC9B;;;;8CAI0C;IAC1C,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAClD,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AAED;;;;;;;;mCAQmC;AACnC,eAAO,MAAM,iBAAiB,KAAK,CAAA;AAMnC;;;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;AAgHD;;;;;;;;;;;;8BAY8B;AAC9B,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAoF7G"}
@@ -32,6 +32,19 @@ import { renderSchemaSignature } from "../client/schema-signature.js";
32
32
  import { toLlmContent } from "@earendil-works/pi-mcp";
33
33
  import { renderToolResultBlocks } from "../client/render.js";
34
34
  import { isRunnerStaleError, runnerStaleHint, safeModel } from "../client/runner-stale.js";
35
+ /** Main-thread time a registration slice may use before yielding to the event
36
+ * loop. Every pi.registerTool rebuilds pi's whole tool registry, and with codemode
37
+ * active that re-renders a declaration for every codemode tool registered so far.
38
+ * So a pass is O(n²) and the per-call cost grows as the pass goes (from ~2 ms to
39
+ * ~12–18 ms at ~1,000 tools). A fixed tool COUNT per slice made the last slices
40
+ * about six times longer than the first; a time budget keeps every slice about
41
+ * the same length. Registering a 1,000-tool catalog in one go froze typing for
42
+ * ~10 s. A slice always registers at least one tool, so a call slower than the
43
+ * budget still makes progress. */
44
+ export const REGISTER_SLICE_MS = 50;
45
+ /** Yield to the event loop with a MACROTASK. A microtask (await Promise.resolve())
46
+ * runs before pi reads stdin, so typing would stay frozen across the whole pass. */
47
+ const yieldToEventLoop = () => new Promise((resolve) => setImmediate(resolve));
35
48
  const COMBINER_NAMESPACE = { name: "mcp_combiner", description: "mcp-combiner aggregated tools" };
36
49
  function resolveFilter(f) {
37
50
  return typeof f === "function" ? f() : f;
@@ -127,16 +140,28 @@ function removedToolDefinition(name) {
127
140
  /** Register the combiner's tools natively, DIFFING against `state` (which the caller
128
141
  * reuses across passes): unchanged declarations are skipped (pi.registerTool
129
142
  * replaces-by-name with a warning — churn on every list_changed would spam), changed
130
- * schemas re-register, and removed tools are re-registered hidden. Returns the names
131
- * currently active (for status/panel surfaces). */
143
+ * schemas re-register, and removed tools are re-registered hidden.
144
+ *
145
+ * Registration runs in time-boxed slices (REGISTER_SLICE_MS) with an event-loop
146
+ * yield between them, so a large catalog never holds pi's main thread for long. `state` is updated per registerTool, never ahead of it, so a
147
+ * pass that stops early (shouldContinue() false) leaves state matching exactly what
148
+ * pi holds and the next pass's diff resumes from there. Two passes over the same
149
+ * state may overlap in time only if the older one's shouldContinue() turns false
150
+ * once the newer starts (native/index.ts's generation check); every state change
151
+ * happens between those checks. Returns the names currently active (for
152
+ * status/panel surfaces). */
132
153
  export async function activateNativeTools(pi, opts) {
133
154
  const state = opts.state ?? { names: new Set(), signatures: new Map() };
155
+ const keepGoing = opts.shouldContinue ?? (() => true);
134
156
  const tools = applyServerFilter(await opts.connection.listTools(true), resolveFilter(opts.serverFilter));
157
+ if (!keepGoing())
158
+ return [...state.names];
135
159
  const allowlist = Array.isArray(resolveDirectSpec(opts.directSpec)) ? resolveDirectSpec(opts.directSpec) : [];
136
160
  const reserved = new Set(RESERVED_TOOL_NAMES);
161
+ // Diff first, register second: the slices then hold only real changes.
137
162
  const currentNames = new Set(tools.map((t) => t.name));
138
163
  const directNames = [];
139
- let fresh = 0;
164
+ const toRegister = [];
140
165
  for (const sum of tools) {
141
166
  if (reserved.has(sum.name)) {
142
167
  opts.log("warn", `skipping combiner tool "${sum.name}" — collides with a reserved name`);
@@ -150,26 +175,45 @@ export async function activateNativeTools(pi, opts) {
150
175
  // Diff: skip the re-register when the schema signature is unchanged (pi keeps
151
176
  // the existing declaration; re-registering would log its warning for nothing).
152
177
  const sig = renderSchemaSignature(sum.inputSchema);
153
- if (state.names.has(sum.name) && state.signatures.get(sum.name) === sig) {
178
+ if (state.names.has(sum.name) && state.signatures.get(sum.name) === sig)
154
179
  continue;
155
- }
156
- pi.registerTool(toNativeTool(sum, opts.connection, exposure, opts.maxResultChars));
157
- state.signatures.set(sum.name, sig);
158
- state.names.add(sum.name);
159
- fresh++;
160
180
  if (exposure === "direct")
161
181
  directNames.push(sum.name);
182
+ toRegister.push({ def: toNativeTool(sum, opts.connection, exposure, opts.maxResultChars), sig });
162
183
  }
163
- // Removals: hide them (never unregister silently — pi has no unregister; a hidden
164
- // re-register at the same name retires the declaration).
184
+ const ops = [
185
+ ...[...state.names].filter((n) => !currentNames.has(n)).map((name) => ({ kind: "remove", name })),
186
+ ...toRegister.map(({ def, sig }) => ({ kind: "register", def, sig })),
187
+ ];
188
+ let done = 0;
189
+ let fresh = 0;
165
190
  let removed = 0;
166
- for (const goneName of [...state.names]) {
167
- if (currentNames.has(goneName))
168
- continue;
169
- pi.registerTool(removedToolDefinition(goneName));
170
- state.names.delete(goneName);
171
- state.signatures.delete(goneName);
172
- removed++;
191
+ while (done < ops.length) {
192
+ if (done > 0) {
193
+ await yieldToEventLoop();
194
+ if (!keepGoing()) {
195
+ opts.log("info", `native tool surface: pass stopped after ${done}/${ops.length} (superseded or session ended)`);
196
+ return [...state.names];
197
+ }
198
+ }
199
+ const sliceStart = performance.now();
200
+ do {
201
+ const op = ops[done];
202
+ if (op.kind === "remove") {
203
+ pi.registerTool(removedToolDefinition(op.name));
204
+ state.names.delete(op.name);
205
+ state.signatures.delete(op.name);
206
+ removed++;
207
+ }
208
+ else {
209
+ pi.registerTool(op.def);
210
+ state.signatures.set(op.def.name, op.sig);
211
+ state.names.add(op.def.name);
212
+ fresh++;
213
+ }
214
+ done++;
215
+ } while (done < ops.length && performance.now() - sliceStart < REGISTER_SLICE_MS);
216
+ opts.onProgress?.(done, ops.length);
173
217
  }
174
218
  if (directNames.length > DIRECT_EXPOSURE_WARN_THRESHOLD &&
175
219
  opts.warnLargeDirectExposure !== false) {
@@ -1 +1 @@
1
- {"version":3,"file":"tool-surface.js","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"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"}
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
@@ -34,6 +34,14 @@ export type ExtensionUIContext = {
34
34
  input?: (title: string, placeholder?: string, opts?: unknown) => Promise<string | undefined>;
35
35
  /** Set footer/status-bar text; undefined clears the slot. */
36
36
  setStatus?: (key: string, text: string | undefined) => void;
37
+ /** Raw terminal input (interactive mode only; a no-op elsewhere). Return
38
+ * undefined to leave the key to pi. Returns an unsubscribe function. */
39
+ onTerminalInput?: (handler: (data: string) => {
40
+ consume?: boolean;
41
+ data?: string;
42
+ } | undefined) => () => void;
43
+ /** The editor's current text (pi ≥ 1.0). */
44
+ getEditorText?: () => string;
37
45
  };
38
46
  /** Context handed to a command handler. Superset of ExtensionContext in practice; we
39
47
  * only read `signal`, `ui`, and `hasUI`. */
@@ -97,7 +105,7 @@ export type ImageBlock = {
97
105
  * time the transcript invalidates (session restore, theme change, resize).
98
106
  * Renderers must at minimum no-op it / drop any width cache. */
99
107
  export type TuiComponent = {
100
- render(width: number): string[];
108
+ render(width: number): readonly string[];
101
109
  invalidate(): void;
102
110
  };
103
111
  /** The theme slice renderers receive (pi passes its live theme). */
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.24.2",
3
+ "version": "0.24.5",
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",
@@ -26,7 +26,7 @@
26
26
  "build": "tsc",
27
27
  "clean": "rm -rf dist",
28
28
  "typecheck": "tsc --noEmit",
29
- "smoke": "node scripts/smoke.mjs",
29
+ "smoke": "tsc && node scripts/smoke.mjs",
30
30
  "prepack": "node -e \"require('fs').copyFileSync('../../CLAUDE.md.example', './instructions.txt')\"",
31
31
  "prepublishOnly": "npm run clean && npm run build",
32
32
  "test": "vitest run"
@@ -56,7 +56,7 @@
56
56
  "access": "public"
57
57
  },
58
58
  "devDependencies": {
59
- "@earendil-works/pi-tui": "^0.85.1",
59
+ "@earendil-works/pi-tui": "^1.6.0",
60
60
  "@types/node": "^22.0.0",
61
61
  "typescript": "^5.6.0",
62
62
  "vitest": "^4.1.11"
@@ -66,7 +66,7 @@
66
66
  },
67
67
  "peerDependencies": {
68
68
  "@earendil-works/pi-mcp": "^1.2.0",
69
- "@earendil-works/pi-tui": "^0.85.1"
69
+ "@earendil-works/pi-tui": "^0.85.1 || ^1.0.0"
70
70
  },
71
71
  "peerDependenciesMeta": {
72
72
  "@earendil-works/pi-mcp": {
@@ -74,6 +74,6 @@
74
74
  }
75
75
  },
76
76
  "dependencies": {
77
- "@earendil-works/pi-mcp": "^1.2.0"
77
+ "@earendil-works/pi-mcp": "^1.6.0"
78
78
  }
79
79
  }