Skip to content

Claude Code. Any Model. The most powerful AI coding agent now speaks every language.

fix(mcp): drop dead members from a pane's group snapshot on refresh

Jack Rudenko47d5780cb309
diff --git a/packages/cli/src/pane/pane-registry.ts b/packages/cli/src/pane/pane-registry.ts
index 644e1b21..0e61fed0 100644
--- a/packages/cli/src/pane/pane-registry.ts
+++ b/packages/cli/src/pane/pane-registry.ts
@@ -46,6 +46,7 @@ import {
readProcessTable,
readProcessTableAsync,
recordPathOf,
+ sameSnapshot,
verifiedGroupSnapshot,
} from "./process-identity.js";
@@ -257,10 +258,7 @@ export function refreshGroupOf(p: RegisteredPane, table: PsRow[]): void {
if (!pid) return;
const fresh = verifiedGroupSnapshot(table, pid, p.identity);
const merged = mergeSnapshots(p.group, fresh);
- if (!merged) return;
- const changed =
- !p.group || merged.pgid !== p.group.pgid || merged.members.length !== p.group.members.length;
- if (!changed) return;
+ if (!merged || sameSnapshot(merged, p.group)) return;
p.group = merged;
writeGroupFile(p.identity.ctlDir, merged);
}
diff --git a/packages/cli/src/pane/process-identity.test.ts b/packages/cli/src/pane/process-identity.test.ts
index bc1e784f..a040fc9b 100644
--- a/packages/cli/src/pane/process-identity.test.ts
+++ b/packages/cli/src/pane/process-identity.test.ts
@@ -16,6 +16,7 @@ import {
paneIdentityMatches,
parseGroupFile,
parsePsTable,
+ sameSnapshot,
verifiedGroupSnapshot,
} from "./process-identity.js";
import { FIXTURES } from "./test-helpers/fixtures.js";
@@ -119,9 +120,22 @@ describe("TS predicates", () => {
test("group file round trip and snapshot merge", () => {
const snap = verifiedGroupSnapshot(table, fx.panePid, pane);
expect(parseGroupFile(formatGroupFile(snap!))).toEqual(snap);
- const merged = mergeSnapshots(snap, { pgid: fx.panePid, members: [{ pid: 5, lstart: "x" }] });
- expect(merged?.members).toHaveLength(2);
expect(mergeSnapshots(snap, { pgid: 7, members: [] })).toBe(snap);
+ expect(mergeSnapshots(snap, null)).toBe(snap);
+ });
+
+ test("merge prunes members that died: a long session's group record stays bounded", () => {
+ let rec = verifiedGroupSnapshot(table, fx.panePid, pane);
+ // 500 ticks, each sampling a different short-lived process in the pane group
+ for (let i = 0; i < 500; i++) {
+ const brief: PsRow = { ...leader, pid: 90_000 + i, ppid: leader.pid, command: "ls -la" };
+ rec = mergeSnapshots(rec, verifiedGroupSnapshot([...table, brief], fx.panePid, pane));
+ }
+ const live = verifiedGroupSnapshot(table, fx.panePid, pane);
+ rec = mergeSnapshots(rec, live);
+ expect(rec?.members.length).toBe(live?.members.length);
+ expect(sameSnapshot(rec, live)).toBe(true);
+ expect(groupCheck(table, rec)).toBe(true);
});
});
diff --git a/packages/cli/src/pane/process-identity.ts b/packages/cli/src/pane/process-identity.ts
index 8a487032..cc671b01 100644
--- a/packages/cli/src/pane/process-identity.ts
+++ b/packages/cli/src/pane/process-identity.ts
@@ -170,17 +170,29 @@ export function verifiedGroupSnapshot(
return { pgid, members: members.map((r) => ({ pid: r.pid, lstart: r.lstart })) };
}
-/** Merge a fresh snapshot into a recorded one (members only accumulate). */
+/**
+ * Merge a fresh VERIFIED snapshot into a recorded one. The fresh snapshot lists every
+ * live member of the group, so a recorded member missing from it is dead (its (pid,
+ * start) pair can never match again) or has left the group (`groupCheck` only looks at
+ * the recorded pgid): the fresh one replaces the record, which therefore stays bounded
+ * over a session of days. With no fresh snapshot (no member carries the identity any
+ * more) the record is kept as it is: it is what still recognises an orphaned grandchild.
+ */
export function mergeSnapshots(
a: GroupSnapshot | null,
b: GroupSnapshot | null
): GroupSnapshot | null {
if (!a) return b;
- if (!b || b.pgid !== a.pgid) return a;
- const seen = new Set(a.members.map((m) => `${m.pid} ${m.lstart}`));
- const members = [...a.members];
- for (const m of b.members) if (!seen.has(`${m.pid} ${m.lstart}`)) members.push(m);
- return { pgid: a.pgid, members };
+ if (!b || b.pgid !== a.pgid || b.members.length === 0) return a;
+ return { pgid: a.pgid, members: [...b.members] };
+}
+
+/** Same pgid and the same (pid, start) members, in any order. */
+export function sameSnapshot(a: GroupSnapshot | null, b: GroupSnapshot | null): boolean {
+ if (!a || !b) return a === b;
+ if (a.pgid !== b.pgid || a.members.length !== b.members.length) return false;
+ const keys = new Set(a.members.map((m) => `${m.pid} ${collapse(m.lstart)}`));
+ return b.members.every((m) => keys.has(`${m.pid} ${collapse(m.lstart)}`));
}
/**