@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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"combiner-process.js","sourceRoot":"","sources":["../src/combiner-process.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAER,YAAY,EAMf,MAAM,SAAS,CAAA;AAyPhB,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAuf1D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAER,YAAY,EAMf,MAAM,SAAS,CAAA;AAgDhB,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAkhB1D"}
package/dist/index.js CHANGED
@@ -25,13 +25,12 @@
25
25
  // faithfully from plugins/opencode/src/index.ts — same floor, same warnings, same
26
26
  // degrade-rather-than-die behaviour, so a user running several clients gets one answer
27
27
  // to "which combiner / which sharedserver am I on, and why".
28
- import { spawnSync } from "node:child_process";
29
28
  import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
30
29
  import { homedir } from "node:os";
31
30
  import { basename, dirname, join } from "node:path";
32
31
  import { fileURLToPath } from "node:url";
33
- import { resolveSharedserver } from "./sharedserver-resolve.js";
34
- import { NativeCombinerConnection, activateNativeMode } from "./native/index.js";
32
+ import { CombinerProcess, DEFAULT_PORT, env } from "./combiner-process.js";
33
+ import { NativeCombinerConnection, activateNativeMode, waitForRegistration } from "./native/index.js";
35
34
  // ── TOOL SURFACE ───────────────────────────────────────────────────────────────
36
35
  // The mcp router (search/describe/call on the owned connection) + the native
37
36
  // per-tool registration (pi-1.0 exposure/namespace/annotations) + interactive
@@ -45,18 +44,7 @@ import { metaToolCall, statusText as controlStatusText } from "./client/control.
45
44
  import { openCombinerPanel } from "./client/panel.js";
46
45
  import { syncPromptCommands } from "./client/prompts.js";
47
46
  import { updateFooter } from "./client/footer.js";
48
- const DEFAULT_PORT = 9741;
49
- const DEFAULT_NAME = "mcp-combiner";
50
- const DEFAULT_GRACE = "30m";
51
- // The `--mcp` serve flag arrived in combiner 0.8.0; older versions serve with a bare
52
- // `--config`. That boundary is also the floor for trusting a PATH install — below it we
53
- // fetch a known-good release via uvx rather than limp along. NOT the lockstep release
54
- // version; it moves only when this extension depends on newer combiner behaviour.
55
- const MIN_COMBINER_VERSION = [0, 8, 0];
56
- // Floor-only against sharedserver's latest release: this repo consumes sharedserver
57
- // rather than shipping it. Kept equal to the OpenCode plugin's value (they resolve the
58
- // same binary the same way).
59
- const SHAREDSERVER_MIN_VERSION = "0.6.7";
47
+ import { matchesKey } from "@earendil-works/pi-tui";
60
48
  // ── the tool-discovery directive ───────────────────────────────────
61
49
  // Appended to the system prompt so the agent knows combined tools arrive under a
62
50
  // `<server>_` prefix (and, through pi-mcp-adapter, are reached via its `mcp()` proxy or
@@ -82,164 +70,8 @@ const DIRECTIVE_MARKER = COMBINER_DIRECTIVE.split("\n", 1)[0] ?? "";
82
70
  // The PI_MCP_COMBINER_* namespace mirrors the Claude plugin's CLAUDE_MCP_COMBINER_* and
83
71
  // the OpenCode plugin's OPENCODE_MCP_COMBINER_*, so a user running several clients keeps
84
72
  // one namespace per client rather than options in one place and env vars in another.
85
- function env(name) {
86
- const v = process.env[name];
87
- return v !== undefined && v !== "" ? v : undefined;
88
- }
89
- function splitArgs(value) {
90
- if (!value)
91
- return [];
92
- return value.split(/\s+/).filter((s) => s.length > 0);
93
- }
94
- function parseVersion(text) {
95
- const m = text.match(/(\d+)\.(\d+)\.(\d+)/);
96
- if (!m)
97
- return undefined;
98
- return [Number(m[1]), Number(m[2]), Number(m[3])];
99
- }
100
- function gte(a, b) {
101
- for (let i = 0; i < 3; i++) {
102
- if (a[i] !== b[i])
103
- return a[i] > b[i];
104
- }
105
- return true;
106
- }
107
- /** Probe a command once for BOTH facts: is it runnable, and which version. Presence is
108
- * "spawn did not fail", NOT "exited 0" — a pre-0.8.0 combiner exits non-zero on
109
- * `--version` (the flag did not exist), which is exactly the stale install the floor
110
- * exists to catch. Probes with ONLY the structural args; the user's extras are never
111
- * folded in, so one arg the CLI rejects cannot make a healthy install look absent. */
112
- function probe(cmd) {
113
- const r = spawnSync(cmd.cmd, [...cmd.args, "--version"], { env: process.env });
114
- if (r.error)
115
- return { present: false };
116
- if (r.status !== 0)
117
- return { present: true };
118
- return { present: true, version: parseVersion(`${r.stdout?.toString() ?? ""}${r.stderr?.toString() ?? ""}`) };
119
- }
120
- function probeUsable(cmd) {
121
- const { version } = probe(cmd);
122
- if (!version || !gte(version, MIN_COMBINER_VERSION))
123
- return undefined;
124
- return { ...cmd, version };
125
- }
126
- /** This extension's own version, kept equal to the published PyPI mcp-combiner by
127
- * lockstep releases (scripts/bump-version.sh). Used as the uvx pin — read from the
128
- * manifest, never duplicated as a constant. */
129
- const PLUGIN_VERSION = (() => {
130
- try {
131
- const here = dirname(fileURLToPath(import.meta.url));
132
- const pkg = JSON.parse(readFileSync(join(here, "..", "package.json"), "utf8"));
133
- return pkg.version;
134
- }
135
- catch {
136
- return undefined;
137
- }
138
- })();
139
- /** Resolve how to invoke the combiner, mirroring the sibling plugins' priority:
140
- * explicit env command → `mcp-combiner` on PATH (only when new enough) →
141
- * `uv run --project <checkout> python -m mcp_combiner` → a pinned release via uvx. The
142
- * uvx tail is what makes a bare install work with nothing installed by hand. */
143
- function resolveCombiner(log) {
144
- const extra = splitArgs(env("PI_MCP_COMBINER_ARGS"));
145
- const command = env("PI_MCP_COMBINER_COMMAND");
146
- if (command) {
147
- return { cmd: command, args: [], extra };
148
- }
149
- const onPath = { cmd: "mcp-combiner", args: [] };
150
- const pathProbe = probe(onPath);
151
- if (pathProbe.present) {
152
- if (pathProbe.version && gte(pathProbe.version, MIN_COMBINER_VERSION)) {
153
- return { ...onPath, extra, version: pathProbe.version };
154
- }
155
- log("warn", `mcp-combiner on PATH reports ${pathProbe.version?.join(".") ?? "a pre-0.8.0 version"}, older than ` +
156
- `${MIN_COMBINER_VERSION.join(".")} — ignoring it and fetching a pinned release instead. ` +
157
- "Upgrade with: uv tool install --upgrade mcp-combiner");
158
- }
159
- const checkout = env("PI_MCP_COMBINER_CHECKOUT");
160
- if (checkout && existsSync(checkout) && probe({ cmd: "uv", args: [] }).present) {
161
- return { cmd: "uv", args: ["run", "--project", checkout, "python", "-m", "mcp_combiner"], extra };
162
- }
163
- // Out-of-the-box path: no install required, fetch from PyPI. Pinned to this
164
- // extension's version so the pair moves in lockstep; if that exact release is
165
- // missing, fall back to latest rather than failing. The probe both validates the pin
166
- // and warms uv's cache, so the real spawn is a cache hit.
167
- if (probe({ cmd: "uvx", args: [] }).present) {
168
- if (PLUGIN_VERSION) {
169
- const pinned = probeUsable({ cmd: "uvx", args: [`mcp-combiner@${PLUGIN_VERSION}`] });
170
- if (pinned)
171
- return { ...pinned, extra };
172
- log("warn", `pinned mcp-combiner@${PLUGIN_VERSION} unavailable or too old; trying latest from PyPI`);
173
- }
174
- const latest = probeUsable({ cmd: "uvx", args: ["mcp-combiner"] });
175
- if (latest)
176
- return { ...latest, extra };
177
- }
178
- return undefined;
179
- }
180
- /** True if the resolved combiner supports (needs) the `--mcp` serve flag. Unknown
181
- * version → assume NO: a version we cannot read is a pre-0.8.0 build serving on a bare
182
- * `--config`, and a bare `--config` still serves on newer releases (with a deprecation
183
- * warning), so guessing low degrades gracefully whereas guessing high does not. */
184
- function combinerNeedsMcpFlag(cmd) {
185
- const ver = cmd.version ?? probe({ cmd: cmd.cmd, args: cmd.args }).version;
186
- return ver ? gte(ver, MIN_COMBINER_VERSION) : false;
187
- }
188
- // ── servers.json resolution (mirrors the sibling plugins) ──
189
- function resolveConfig(log) {
190
- const explicit = env("PI_MCP_COMBINER_CONFIG");
191
- if (explicit)
192
- return explicit;
193
- const user = process.env.USER ?? process.env.LOGNAME ?? "";
194
- const candidates = [
195
- join(homedir(), ".cache", "secrets", `${user}.mcpservers.json`),
196
- join(homedir(), ".config", "mcp-combiner", "servers.json"),
197
- join(homedir(), ".config", "mcp", "servers.json"),
198
- ];
199
- const found = candidates.find(existsSync);
200
- if (!found) {
201
- log("error", "no combiner servers.json found; set $PI_MCP_COMBINER_CONFIG (probed " +
202
- "~/.cache/secrets/<user>.mcpservers.json, ~/.config/mcp-combiner/servers.json, " +
203
- "~/.config/mcp/servers.json)");
204
- }
205
- return found;
206
- }
207
- let attachment = null;
208
- /** Process-global guard — jiti loads extensions with moduleCache:false, so every
209
- * session bind (parent + each subagent child) re-instantiates this module with
210
- * fresh module state. Symbol.for survives that isolation (same trick
211
- * pi-permission-system's service.ts uses), so the signal handlers are installed
212
- * exactly once per process no matter how many sessions bind. */
213
- const CLEANUP_GUARD = Symbol.for("mcp-companion:cleanup-installed");
214
- function installProcessCleanup() {
215
- const g = globalThis;
216
- if (g[CLEANUP_GUARD])
217
- return;
218
- g[CLEANUP_GUARD] = true;
219
- // Belt to the session_shutdown("quit") braces: if Pi is killed hard enough that
220
- // session_shutdown never fires, still release the refcount. Idempotent via `detach`.
221
- process.on("exit", () => detach());
222
- for (const sig of ["SIGINT", "SIGTERM", "SIGHUP"]) {
223
- const handler = () => {
224
- detach();
225
- // Remove our listener before re-raising: re-killing with the handler
226
- // still installed re-delivers the signal to it forever (loop verified —
227
- // ctrl+c wedged pi instead of exiting). Gone, the re-raise falls through
228
- // to the default disposition and terminates; the idempotent "exit"
229
- // belt stays for any path that gets there.
230
- process.removeListener(sig, handler);
231
- process.kill(process.pid, sig);
232
- };
233
- process.on(sig, handler);
234
- }
235
- }
236
- function detach() {
237
- if (!attachment)
238
- return;
239
- const { binary, name } = attachment;
240
- attachment = null;
241
- spawnSync(binary, ["unuse", name, "--pid", String(process.pid)], { stdio: "ignore", env: process.env });
242
- }
73
+ // env(), the combiner command/config/port resolution and the whole sharedserver
74
+ // lifecycle live in combiner-process.ts.
243
75
  // ── the extension ──────────────────────────────────────────────────
244
76
  export default function mcpCombiner(pi) {
245
77
  const notify = env("PI_MCP_COMBINER_NOTIFY") !== "false";
@@ -309,7 +141,16 @@ export default function mcpCombiner(pi) {
309
141
  }
310
142
  };
311
143
  let connection;
144
+ // The combiner process, when we manage it (combiner-process.ts): connects wait
145
+ // for its first attach (`ready`), and ask it between refused retries. Host-owned
146
+ // or unmanaged combiners are someone else's: connect only.
147
+ const combinerProcess = manage && !hostOwned ? new CombinerProcess(clientLog) : undefined;
148
+ // Stops CombinerProcess.watch at session_shutdown / reload teardown.
149
+ let stopCombinerWatch;
312
150
  let nativeSurface;
151
+ // Set once the footer exists (the `if (connection)` block below); the native
152
+ // surface, created first, reports registration progress through it.
153
+ let onToolProgress;
313
154
  // Session-config HOLDER: everything the ladder shapes, resolved against a SESSION
314
155
  // cwd (worktree subagents / project switches get their own project layers).
315
156
  // Factory-time resolution with process.cwd() is the pre-session default; every
@@ -348,6 +189,12 @@ export default function mcpCombiner(pi) {
348
189
  }
349
190
  g.__piMcpCombinerDispose = [];
350
191
  connection = new NativeCombinerConnection(connInputsFor(sessionCfg), clientLog);
192
+ if (combinerProcess) {
193
+ const proc = combinerProcess;
194
+ const conn = connection;
195
+ conn.setStartGate(proc.ready);
196
+ conn.setLivenessCheck(() => proc.onRefused());
197
+ }
351
198
  // The mcp router registers alongside the per-tool native surface (the same
352
199
  // owned connection — not a second proxy): tool_call gates such as
353
200
  // pi-permission-system and pi-subagents recognize MCP calls by the tool
@@ -362,6 +209,7 @@ export default function mcpCombiner(pi) {
362
209
  // session_start (post-setToken — the connection refuses to connect
363
210
  // without a grouping token); list_changed re-syncs ride resyncAll below.
364
211
  nativeSurface = activateNativeMode(pi, {
212
+ onToolProgress: (done, total) => onToolProgress?.(done, total),
365
213
  connection,
366
214
  // Getters, not snapshots: worktrees / project switches re-resolve
367
215
  // sessionCfg per session_start, and a load-time value would apply the
@@ -384,6 +232,17 @@ export default function mcpCombiner(pi) {
384
232
  }
385
233
  if (connection) {
386
234
  const conn = connection; // captured non-optional for the handlers below
235
+ // The connection keeps itself up (reconnect after a drop, background retry after
236
+ // a failed connect; combiner-connection.ts). The combiner process, when we
237
+ // manage it, reports process events: its going away triggers a reconnect, and
238
+ // the reconnect asks it (respawn within the cap, or attach to a new process).
239
+ const arm = () => {
240
+ conn.reopen();
241
+ conn.setAutoReconnect(true);
242
+ if (combinerProcess && !stopCombinerWatch)
243
+ stopCombinerWatch = combinerProcess.watch(() => conn.reconnect("the combiner process exited"));
244
+ };
245
+ arm();
387
246
  const registeredPrompts = new Set();
388
247
  let footerTimer;
389
248
  let uiCtx;
@@ -399,11 +258,33 @@ export default function mcpCombiner(pi) {
399
258
  footerTimer = undefined;
400
259
  uiCtx = undefined;
401
260
  uiNotify = undefined;
402
- void conn.reset("superseded by a newer extension instance (reload)");
261
+ stopCombinerWatch?.();
262
+ stopCombinerWatch = undefined;
263
+ nativeSurface?.dispose();
264
+ void conn.close("superseded by a newer extension instance (reload)");
403
265
  });
266
+ // Native registration progress (undefined when no pass is registering).
267
+ let registering;
268
+ let lastProgressPaint = 0;
404
269
  const refreshFooter = () => {
405
270
  if (uiCtx)
406
- void updateFooter(conn, uiCtx, settings.mcpFooterKey, settings.mcpFooterStatus).catch(() => undefined);
271
+ void updateFooter(conn, uiCtx, settings.mcpFooterKey, settings.mcpFooterStatus, () => registering).catch(() => undefined);
272
+ };
273
+ // Called after every registration slice. Repaint at most every 500 ms (each
274
+ // repaint fetches /health) and always on the final slice.
275
+ onToolProgress = (done, total) => {
276
+ const finished = done >= total;
277
+ // A pass's last slice reports (total, total) and its end reports (0, 0):
278
+ // repaint for the first "finished" only.
279
+ const wasRegistering = registering !== undefined;
280
+ registering = finished ? undefined : { done, total };
281
+ if (finished && !wasRegistering)
282
+ return;
283
+ const now = Date.now();
284
+ if (finished || now - lastProgressPaint >= 500) {
285
+ lastProgressPaint = now;
286
+ refreshFooter();
287
+ }
407
288
  };
408
289
  const syncPrompts = () => {
409
290
  if (!settings.prompts)
@@ -422,15 +303,10 @@ export default function mcpCombiner(pi) {
422
303
  conn.setHooks({
423
304
  onToolsChanged: resyncAll,
424
305
  onStateChange: (state) => {
425
- // Re-attach on (re)connect: a combiner bounce kills the instance our
426
- // sharedserver reference was attached to, and nothing else re-takes
427
- // ownership until the next session_start — an orphaned combiner then
428
- // grace-stops 30m later (sharedserver `use` is idempotent per pid, so
429
- // re-attaching on every connect is safe and cheap). Host-owned / unmanaged
430
- // combiners have nothing to attach to, and the factory returns before
431
- // `attachCombiner` is declared — calling it there is a TDZ ReferenceError.
432
- if (state === "connected" && !hostOwned && manage)
433
- attachCombiner(clientLog);
306
+ // A different combiner process now (someone restarted it)? Attach to
307
+ // it: same function, same ref (CombinerProcess.onReconnected).
308
+ if (state === "connected")
309
+ void combinerProcess?.onReconnected().catch(() => undefined);
434
310
  refreshFooter();
435
311
  },
436
312
  // Stage 2: the widget hold announces its UI URL mid-call — open it.
@@ -441,6 +317,9 @@ export default function mcpCombiner(pi) {
441
317
  });
442
318
  pi.on("session_start", (event, ctx) => {
443
319
  try {
320
+ // Re-arm auto-reconnect and the process watch if a host reused this
321
+ // instance after a session_shutdown (idempotent; pi 1.6 doesn't reuse).
322
+ arm();
444
323
  // SAFETY: capture ctx.ui ONCE, first — the getter asserts staleness,
445
324
  // the object does not; every async closure below uses the object only.
446
325
  const ctxUi = ctx.ui;
@@ -505,12 +384,78 @@ export default function mcpCombiner(pi) {
505
384
  clientLog("error", `session setup failed: ${e instanceof Error ? e.message : String(e)}`);
506
385
  }
507
386
  });
387
+ // A turn that starts while tools are still registering (or the first connect
388
+ // is still retrying) would see only part of the catalog. pi awaits
389
+ // before_agent_start handlers and reads the live tool set afterwards, so
390
+ // waiting here puts every tool in the turn. The registration keeps yielding
391
+ // while we wait, so the UI stays live. pi has no abort for this hook today
392
+ // (Esc during the wait takes effect when it ends); ctx.signal is honoured if
393
+ // a future pi provides one.
394
+ pi.on("before_agent_start", async (_event, ctx) => {
395
+ const surface = nativeSurface;
396
+ if (!surface?.busy())
397
+ return;
398
+ // Still connecting: wait only for a combiner we just attached (it is
399
+ // starting up). A host-owned/unmanaged combiner that's down, or one whose
400
+ // attach failed, would only stall the turn for the whole retry budget.
401
+ const connecting = conn.state !== "connected";
402
+ if (connecting && !combinerProcess?.attached)
403
+ return;
404
+ const ui = ctx.ui;
405
+ const notice = setTimeout(() => {
406
+ if (notify)
407
+ ui?.notify?.(connecting
408
+ ? "mcp-combiner: waiting for the combiner to come up…"
409
+ : "mcp-combiner: waiting for MCP tools to finish registering…", "info");
410
+ }, 250); // brief waits (a list_changed resync) stay silent
411
+ notice.unref();
412
+ const started = Date.now();
413
+ const outcome = await waitForRegistration(surface, {
414
+ signal: ctx.signal,
415
+ // pi has no abort for this hook: end the wait on Esc / Ctrl+C / Ctrl+D
416
+ // ourselves (pi still sees the key and cancels or quits as usual).
417
+ // A single Ctrl+C only clears the editor in pi; its second press within
418
+ // 500 ms quits, so that is what ends the wait.
419
+ onInterrupt: (interrupt) => {
420
+ let lastCtrlC = 0;
421
+ return (ui?.onTerminalInput?.((data) => {
422
+ if (matchesKey(data, "ctrl+c")) {
423
+ const now = Date.now();
424
+ if (now - lastCtrlC < 500)
425
+ interrupt();
426
+ lastCtrlC = now;
427
+ }
428
+ else if (matchesKey(data, "escape"))
429
+ interrupt();
430
+ // Ctrl+D quits only on an empty editor; with text it deletes forward.
431
+ else if (matchesKey(data, "ctrl+d") && !(ui?.getEditorText?.() ?? ""))
432
+ interrupt();
433
+ return undefined;
434
+ }) ?? (() => undefined));
435
+ },
436
+ });
437
+ clearTimeout(notice);
438
+ const waitedMs = Date.now() - started;
439
+ const waited = `${(waitedMs / 1000).toFixed(1)} s`;
440
+ if (outcome === "timeout") {
441
+ clientLog("warn", `tool registration still running after ${waited}; the rest join from the turn's next model request`);
442
+ }
443
+ else if (waitedMs >= 250) {
444
+ // Brief waits (a list_changed resync) stay silent, like the notice.
445
+ clientLog("info", `turn waited ${waited} for tool registration (${outcome})`);
446
+ }
447
+ });
508
448
  pi.on("session_shutdown", () => {
509
449
  if (footerTimer) {
510
450
  clearInterval(footerTimer);
511
451
  footerTimer = undefined;
512
452
  }
513
- void conn.reset("session shutdown");
453
+ // Stop a registration pass in flight before pi retires this session's
454
+ // extension API (pi 1.6 creates a fresh instance for the next session).
455
+ stopCombinerWatch?.();
456
+ stopCombinerWatch = undefined;
457
+ nativeSurface?.dispose();
458
+ void conn.close("session shutdown");
514
459
  });
515
460
  }
516
461
  // ── instructions: appended every turn (analogue of the sibling plugins) ──
@@ -614,98 +559,22 @@ export default function mcpCombiner(pi) {
614
559
  return;
615
560
  }
616
561
  // ── process: launch on session_start, release on session_shutdown("quit") ──
617
- // Pi forbids starting background resources from the factory, so all of this is
618
- // deferred to session_start. session_start fires again on reload/new/resume/fork
619
- // within the same process; the `attachment` guard makes re-entry a no-op attach.
620
- const attachCombiner = (log) => {
621
- const binary = resolveSharedserver({
622
- label: "mcp-combiner",
623
- minVersion: SHAREDSERVER_MIN_VERSION,
624
- installerUrl: "https://github.com/georgeharker/sharedserver/releases/latest/download/sharedserver-installer.sh",
625
- }, env("SHAREDSERVER_BIN"), process.env, log);
626
- if (!binary) {
627
- log("error", "sharedserver binary not found; set $SHAREDSERVER_BIN, or PI_MCP_COMBINER_MANAGE=false");
628
- return;
629
- }
630
- const combiner = resolveCombiner(log);
631
- if (!combiner) {
632
- log("error", "mcp-combiner could not be found or fetched; install uv and it is fetched from PyPI on demand, " +
633
- "or install mcp-combiner, or set $PI_MCP_COMBINER_COMMAND / $PI_MCP_COMBINER_CHECKOUT");
634
- return;
635
- }
636
- const cfgPath = resolveConfig(log);
637
- if (!cfgPath)
638
- return; // resolveConfig already logged the specifics
639
- const name = env("PI_MCP_COMBINER_NAME") ?? DEFAULT_NAME;
640
- const port = resolvePort(log);
641
- const grace = env("PI_MCP_COMBINER_GRACE") ?? DEFAULT_GRACE;
642
- // Assemble: <combiner> [--mcp] --config <cfg> --port <port> [--host <host>]
643
- const serve = [];
644
- const modern = combinerNeedsMcpFlag(combiner);
645
- if (modern)
646
- serve.push("--mcp");
647
- serve.push("--config", cfgPath, "--port", String(port));
648
- const host = env("PI_MCP_COMBINER_HOST");
649
- if (host)
650
- serve.push("--host", host);
651
- // Logging parity with the sibling plugins' two-file scheme: sharedserver captures
652
- // raw stdout/stderr (--log-file on `use`), and the combiner writes its own
653
- // --log-file. Both default under $XDG_STATE_HOME/mcp-combiner; "none" disables.
654
- // Combiner-side flags ride the same version gate as --mcp.
655
- const logDir = join(process.env.XDG_STATE_HOME || join(homedir(), ".local", "state"), "mcp-combiner");
656
- const pyLogFile = env("PI_MCP_COMBINER_PYLOG") ?? join(logDir, "mcp-combiner-py.log");
657
- if (modern) {
658
- if (pyLogFile !== "none")
659
- serve.push("--log-file", pyLogFile);
660
- serve.push("--log-level", env("PI_MCP_COMBINER_LOG_LEVEL") ?? "info");
661
- }
662
- const wrappedArgs = [...combiner.args, ...(combiner.extra ?? []), ...serve];
663
- const useArgs = [
664
- "use",
665
- name,
666
- "--pid",
667
- String(process.pid),
668
- "--grace-period",
669
- grace,
670
- "--metadata",
671
- `pi-${process.pid}`,
672
- ];
673
- const logFile = env("PI_MCP_COMBINER_LOG") ?? join(logDir, "mcp-combiner.log");
674
- if (logFile !== "none") {
675
- try {
676
- mkdirSync(dirname(logFile), { recursive: true });
677
- }
678
- catch {
679
- // best-effort — a failed mkdir just means sharedserver may drop the capture
680
- }
681
- useArgs.push("--log-file", logFile);
682
- }
683
- useArgs.push("--", combiner.cmd, ...wrappedArgs);
684
- installProcessCleanup();
685
- const result = spawnSync(binary, useArgs, { stdio: "pipe", env: process.env });
686
- if (result.error) {
687
- log("error", `${name}: failed to spawn sharedserver (${result.error.message})`);
688
- return;
689
- }
690
- if (result.status !== 0) {
691
- const stderr = result.stderr?.toString().trim();
692
- log("error", `${name}: sharedserver use exited ${result.status}${stderr ? ` (${stderr})` : ""}`);
693
- return;
694
- }
695
- attachment = { binary, name };
696
- log("info", `combiner "${name}" attached on port ${port} (${combiner.cmd} ${wrappedArgs.join(" ")})`);
697
- };
698
- pi.on("session_start", (_event, ctx) => {
699
- if (attachment)
700
- return; // already attached in this process
701
- attachCombiner(makeLog(ctx, notify));
562
+ // Pi forbids starting background resources from the factory, so the attach is
563
+ // deferred to session_start. It fires again on reload/new/resume/fork within the
564
+ // same process; CombinerProcess keeps one ref per pi process, so re-entry is a
565
+ // no-op. Everything else about the process lives in combiner-process.ts.
566
+ const proc = combinerProcess;
567
+ if (!proc)
568
+ return; // unreachable: combinerProcess exists exactly when manage && !hostOwned
569
+ pi.on("session_start", async (_event, ctx) => {
570
+ await proc.start(makeLog(ctx, notify));
702
571
  });
703
572
  pi.on("session_shutdown", (event) => {
704
573
  // Only "quit" means the Pi process is actually leaving. reload/new/resume/fork
705
574
  // keep the process alive and a fresh session_start re-attaches — releasing the
706
575
  // refcount on those would needlessly drop (and re-take) the shared combiner.
707
576
  if (event.reason === "quit")
708
- detach();
577
+ proc.quit();
709
578
  });
710
579
  }
711
580
  // ── helpers ────────────────────────────────────────────────────
@@ -877,39 +746,4 @@ function makeLog(ctx, notify) {
877
746
  }
878
747
  };
879
748
  }
880
- /** The port to serve on, reconciling PI_MCP_COMBINER_PORT with any explicit
881
- * $MCP_COMPANION_COMBINER_URL (which is what pi-mcp-adapter registers, so serving
882
- * anywhere else would be unreachable — the URL wins, same rule as the sibling plugins). */
883
- function resolvePort(log) {
884
- const raw = env("PI_MCP_COMBINER_PORT");
885
- let port = DEFAULT_PORT;
886
- if (raw !== undefined) {
887
- const n = Number(raw);
888
- if (Number.isInteger(n) && n > 0)
889
- port = n;
890
- else
891
- log("warn", `PI_MCP_COMBINER_PORT=${raw} is not a positive integer; using ${DEFAULT_PORT}`);
892
- }
893
- const url = env("MCP_COMPANION_COMBINER_URL");
894
- if (url && raw !== undefined) {
895
- let urlPort = Number.NaN;
896
- try {
897
- urlPort = Number(new URL(url).port);
898
- }
899
- catch {
900
- // malformed URL — fall through to the no-usable-port warning below
901
- }
902
- if (!Number.isInteger(urlPort) || urlPort <= 0) {
903
- log("warn", `MCP_COMPANION_COMBINER_URL=${url} has no explicit port; serving on ${port}. ` +
904
- `Use an explicit port in the URL (e.g. http://127.0.0.1:${port}/mcp).`);
905
- }
906
- else if (urlPort !== port) {
907
- log("warn", `PI_MCP_COMBINER_PORT=${port} disagrees with MCP_COMPANION_COMBINER_URL=${url}; the URL is what ` +
908
- `pi-mcp-adapter registers, so serving on ${port} would be unreachable — using ${urlPort}. ` +
909
- "Set them to the same port.");
910
- port = urlPort;
911
- }
912
- }
913
- return port;
914
- }
915
749
  //# sourceMappingURL=index.js.map