@blackbelt-technology/pi-agent-dashboard 0.5.1 → 0.5.2

package/packages/server/src/headless-pid-registry.ts

@@ -11,6 +11,18 @@ import path from "node:path";
 import os from "node:os";
 import { isUnsafeTestHomeScan } from "./test-env-guard.js";
 
+/**
+ * Minimal interface the registry depends on for keeper-mediated writes
+ * and orphan reconciliation. Implemented by `KeeperManager` in
+ * `rpc-keeper/keeper-manager.ts`. Injected via
+ * `HeadlessPidRegistryOptions.keeperManager` to avoid a circular dep at
+ * module load. See change: add-rpc-stdin-dispatch-with-keeper-sidecar (Phase 6).
+ */
+export interface KeeperWriter {
+  writeRpcToSockPath(sockPath: string, line: string): Promise<boolean>;
+  discoverExistingKeepers(): Promise<Array<{ sessionId: string; keeperPid: number; sockPath: string }>>;
+}
+
 /** Default PID file path */
 const DEFAULT_PID_FILE = path.join(os.homedir(), ".pi", "dashboard", "headless-pids.json");
 
@@ -30,31 +42,99 @@ export interface HeadlessEntry {
    * See change: spawn-correlation-token.
    */
   spawnToken?: string;
+  /**
+   * Pi process PID, distinct from the spawn-time PID when an RPC keeper
+   * sidecar owns pi's stdin (see `rpc-keeper-sidecar`). Set by
+   * `linkByToken` from `session_register.pid` once the bridge connects.
+   * In non-keeper mode it remains undefined; consumers fall back to
+   * `entry.pid`. See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+   */
+  piPid?: number;
+  /**
+   * RPC keeper sidecar PID. Set at register-time when the entry was
+   * spawned through `spawnHeadlessViaKeeper`. In keeper mode this equals
+   * `entry.pid` (the keeper IS the spawned child); the explicit field
+   * makes the keeper-vs-non-keeper branch unambiguous in `killBySessionId`
+   * and `writeRpc`. See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+   */
+  keeperPid?: number;
+  /**
+   * Absolute UDS / named-pipe path the keeper listens on. Set at
+   * register-time alongside `keeperPid`. Used by `writeRpc` to forward
+   * `dispatch_extension_command` lines without re-deriving the path.
+   */
+  keeperSockPath?: string;
 }
 
-/** Serialized format for disk persistence */
+/**
+ * Serialized format for disk persistence. ALL identity-bearing fields
+ * must round-trip across server restart so `linkByToken` / `linkByPid`
+ * keep their precise matching after `cleanupOrphans` reclaims entries.
+ *
+ * Without this, after a dashboard restart the rebuilt entry only has
+ * (pid, cwd, spawnedAt). The bridge then re-registers with
+ * `{pid: piPid, spawnToken: <omitted-on-reattach>}` and the registry
+ * falls all the way through to the cwd-FIFO tier, which mis-maps
+ * sessionIds to keeper entries when two sessions share a cwd. Symptom:
+ * `/ctx-stats` in session A dispatches to pi-B's keeper; killing A
+ * SIGTERMs B's pi. See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+ */
 interface PersistedEntry {
   pid: number;
   cwd: string;
   spawnedAt: string;
+  spawnToken?: string;
+  piPid?: number;
+  keeperPid?: number;
+  keeperSockPath?: string;
 }
 
 interface PidFileData {
   entries: PersistedEntry[];
 }
 
+export interface KeeperRegisterOptions {
+  keeperPid: number;
+  keeperSockPath: string;
+}
+
+/**
+ * Pure helper: derive the optional `KeeperRegisterOptions` from a
+ * SpawnResult-shaped object. Returns `undefined` when the spawn was not
+ * keeper-mediated (no `keeperSockPath`). Lets registration call sites
+ * stay one-liners across all spawn paths.
+ * See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+ */
+export function keeperOptsFromSpawnResult(
+  result: { pid?: number; keeperSockPath?: string },
+): KeeperRegisterOptions | undefined {
+  if (typeof result.pid !== "number" || !result.keeperSockPath) return undefined;
+  return { keeperPid: result.pid, keeperSockPath: result.keeperSockPath };
+}
+
 export interface HeadlessPidRegistry {
   /**
    * Register a newly spawned headless process. The optional `spawnToken`
    * is the server-minted UUID injected into the spawned process's env;
    * storing it lets `linkByToken` resolve identity precisely later.
-   * See change: spawn-correlation-token.
+   * The optional `keeperOpts` marks this entry as keeper-mediated and
+   * stores the keeper PID + socket path for `writeRpc` / `killBySessionId`.
+   * See change: spawn-correlation-token, add-rpc-stdin-dispatch-with-keeper-sidecar.
    */
-  register(pid: number, cwd: string, proc: ChildProcess, spawnToken?: string): void;
+  register(
+    pid: number,
+    cwd: string,
+    proc: ChildProcess,
+    spawnToken?: string,
+    keeperOpts?: KeeperRegisterOptions,
+  ): void;
   /**
    * Tier 1 link: find entry by `spawnToken`, set its `sessionId`. Returns
    * `true` on match. The strongest identity — used when the bridge sent
-   * `session_register.spawnToken`. See change: spawn-correlation-token.
+   * `session_register.spawnToken`. When `pid` is provided AND the entry
+   * is keeper-mediated, `entry.piPid` is set so `killBySessionId` can
+   * SIGTERM pi directly (the keeper auto-exits on pi exit). See change:
+   * spawn-correlation-token, add-rpc-stdin-dispatch-with-keeper-sidecar.
    */
   linkByToken(spawnToken: string, sessionId: string, pid?: number): boolean;
   /**
@@ -70,9 +150,19 @@ export interface HeadlessPidRegistry {
    * concurrent same-cwd spawns; tiers 1–2 should pre-empt this.
    */
   linkSession(sessionId: string, cwd: string): boolean;
-  /** Get the PID linked to a session ID. */
+  /**
+   * Get the PID linked to a session ID. In keeper mode returns the pi
+   * PID once linked (`entry.piPid`), falling back to `entry.pid` (= keeper
+   * PID at spawn) if the bridge hasn't connected yet. In non-keeper mode
+   * returns `entry.pid` unchanged.
+   */
   getPid(sessionId: string): number | undefined;
-  /** Send SIGTERM to the process linked to a session ID. Returns true if killed. */
+  /**
+   * Send SIGTERM to the process linked to a session ID. Returns true if
+   * killed. In keeper mode kills pi first (so the keeper's auto-exit-on-
+   * pi-exit fires) and falls back to killing the keeper after a brief
+   * delay if it survives. See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+   */
   killBySessionId(sessionId: string): boolean;
   /** Remove a tracked process by PID. */
   remove(pid: number): void;
@@ -82,23 +172,69 @@ export interface HeadlessPidRegistry {
   size(): number;
   /** Clean up orphan processes from a previous server instance. */
   cleanupOrphans(): void;
+  /**
+   * Connect to the keeper UDS for `sessionId` and write `line + \n`.
+   * Returns false if no entry, no keeper for this session, or if the
+   * 3-attempt write to the socket fails. Never throws. Used by the
+   * server's dispatch handler to forward extension slash commands to pi.
+   * See change: add-rpc-stdin-dispatch-with-keeper-sidecar (Phase 6/8).
+   */
+  writeRpc(sessionId: string, line: string): Promise<boolean>;
+  /**
+   * Async startup pass: scan the sessions dir for live keeper sidecars
+   * (via the injected `KeeperManager.discoverExistingKeepers`) and
+   * reconcile them with the in-memory registry. Live keepers whose
+   * registry entry doesn't yet exist are skipped (the bridge will
+   * register them on connect). No-op when no `keeperManager` was injected.
+   * See change: add-rpc-stdin-dispatch-with-keeper-sidecar (Phase 6).
+   */
+  cleanupKeeperOrphans(): Promise<void>;
+  /**
+   * Inject the keeper writer / discoverer after construction. Necessary
+   * because `browser-gateway.ts` constructs the registry before the
+   * server creates the `KeeperManager`. Pass `null` to clear (used by tests).
+   */
+  setKeeperWriter(writer: KeeperWriter | null): void;
 }
 
 export interface HeadlessPidRegistryOptions {
   pidFilePath?: string;
+  /**
+   * Optional `KeeperWriter` (typically a `KeeperManager`) wired so the
+   * registry can delegate UDS writes and orphan reconciliation. May be
+   * supplied after construction via `setKeeperWriter` instead.
+   * See change: add-rpc-stdin-dispatch-with-keeper-sidecar (Phase 6).
+   */
+  keeperManager?: KeeperWriter;
 }
 
 export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions): HeadlessPidRegistry {
   const entries = new Map<number, HeadlessEntry>();
   const pidFilePath = options?.pidFilePath ?? DEFAULT_PID_FILE;
+  let keeperWriter: KeeperWriter | null = options?.keeperManager ?? null;
+
+  /** Internal: locate entry by sessionId. */
+  function findBySessionId(sessionId: string): HeadlessEntry | undefined {
+    for (const entry of entries.values()) {
+      if (entry.sessionId === sessionId) return entry;
+    }
+    return undefined;
+  }
 
   function persist() {
     const data: PidFileData = {
-      entries: [...entries.values()].map((e) => ({
-        pid: e.pid,
-        cwd: e.cwd,
-        spawnedAt: new Date(e.spawnedAt).toISOString(),
-      })),
+      entries: [...entries.values()].map((e) => {
+        const out: PersistedEntry = {
+          pid: e.pid,
+          cwd: e.cwd,
+          spawnedAt: new Date(e.spawnedAt).toISOString(),
+        };
+        if (e.spawnToken) out.spawnToken = e.spawnToken;
+        if (e.piPid !== undefined) out.piPid = e.piPid;
+        if (e.keeperPid !== undefined) out.keeperPid = e.keeperPid;
+        if (e.keeperSockPath) out.keeperSockPath = e.keeperSockPath;
+        return out;
+      }),
     };
     try {
       writeJsonFile(pidFilePath, data);
@@ -113,8 +249,25 @@ export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions):
   }
 
   return {
-    register(pid: number, cwd: string, proc: ChildProcess, spawnToken?: string) {
-      entries.set(pid, { pid, cwd, process: proc, spawnedAt: Date.now(), spawnToken });
+    register(
+      pid: number,
+      cwd: string,
+      proc: ChildProcess,
+      spawnToken?: string,
+      keeperOpts?: KeeperRegisterOptions,
+    ) {
+      const entry: HeadlessEntry = {
+        pid,
+        cwd,
+        process: proc,
+        spawnedAt: Date.now(),
+        spawnToken,
+      };
+      if (keeperOpts) {
+        entry.keeperPid = keeperOpts.keeperPid;
+        entry.keeperSockPath = keeperOpts.keeperSockPath;
+      }
+      entries.set(pid, entry);
       proc.on("exit", () => {
         entries.delete(pid);
         persist();
@@ -122,11 +275,22 @@ export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions):
       persist();
     },
 
-    linkByToken(spawnToken: string, sessionId: string, _pid?: number): boolean {
+    linkByToken(spawnToken: string, sessionId: string, pid?: number): boolean {
       if (!spawnToken) return false;
       for (const entry of entries.values()) {
         if (entry.spawnToken === spawnToken && !entry.sessionId) {
           entry.sessionId = sessionId;
+          // Keeper-mode: store pi's PID separately so killBySessionId can
+          // SIGTERM pi directly (the keeper auto-exits on pi exit).
+          // Non-keeper mode leaves piPid undefined; getPid falls back to
+          // entry.pid. See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+          if (entry.keeperPid !== undefined && pid !== undefined && pid !== entry.pid) {
+            entry.piPid = pid;
+            // Persist immediately so a future cleanupOrphans reclaim has
+            // piPid available for linkByPid to match against (the token
+            // is omitted by the bridge on reattach).
+            persist();
+          }
           return true;
         }
       }
@@ -134,11 +298,27 @@ export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions):
     },
 
     linkByPid(sessionId: string, pid: number): boolean {
-      const entry = entries.get(pid);
-      if (entry && !entry.sessionId) {
-        entry.sessionId = sessionId;
+      // Tier 2a: match by Map key (= spawn-time pid). Always tried first
+      // because it's O(1) and exact for non-keeper mode.
+      const direct = entries.get(pid);
+      if (direct && !direct.sessionId) {
+        direct.sessionId = sessionId;
         return true;
       }
+      // Tier 2b: keeper-mode reattach. After server restart, the Map is
+      // keyed by `keeperPid` (the spawn-time pid in keeper mode); pi's
+      // actual PID lives in `entry.piPid`. The bridge's session_register
+      // sends pi's PID, so direct Map lookup misses. Iterate to find a
+      // matching piPid — critical for correct sessionId↔pi mapping when
+      // multiple sessions share a cwd (otherwise the cwd-FIFO fallback
+      // mis-maps and `/ctx-stats` dispatches to the wrong keeper).
+      // See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+      for (const entry of entries.values()) {
+        if (entry.piPid === pid && !entry.sessionId) {
+          entry.sessionId = sessionId;
+          return true;
+        }
+      }
       return false;
     },
 
@@ -153,32 +333,62 @@ export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions):
     },
 
     getPid(sessionId: string): number | undefined {
-      for (const entry of entries.values()) {
-        if (entry.sessionId === sessionId) {
-          return entry.pid;
-        }
-      }
-      return undefined;
+      const entry = findBySessionId(sessionId);
+      if (!entry) return undefined;
+      // Keeper mode: prefer the linked pi PID; fall back to entry.pid (=
+      // keeper PID) when the bridge hasn't connected yet. Non-keeper mode
+      // returns entry.pid unchanged.
+      // See change: add-rpc-stdin-dispatch-with-keeper-sidecar.
+      return entry.piPid ?? entry.pid;
     },
 
     killBySessionId(sessionId: string): boolean {
-      for (const entry of entries.values()) {
-        if (entry.sessionId === sessionId) {
+      const entry = findBySessionId(sessionId);
+      if (!entry) return false;
+
+      // Keeper-mediated entry: kill pi first so the keeper's
+      // auto-exit-on-pi-exit handler fires; schedule a fallback SIGTERM
+      // to the keeper if it survives the brief grace window.
+      // See change: add-rpc-stdin-dispatch-with-keeper-sidecar (task 6.4).
+      if (entry.keeperPid !== undefined) {
+        const piPid = entry.piPid;
+        const keeperPid = entry.keeperPid;
+        let killedSomething = false;
+        if (piPid !== undefined) {
           try {
-            // Delegate platform-specific pid-vs-group-pid handling to the
-            // shared primitive. See change: consolidate-platform-handlers.
-            killPidWithGroup(entry.pid, "SIGTERM");
-            entries.delete(entry.pid);
-            persist();
-            return true;
-          } catch {
-            entries.delete(entry.pid);
-            persist();
-            return false;
+            killPidWithGroup(piPid, "SIGTERM");
+            killedSomething = true;
+          } catch { /* pi may already be dead */ }
+        }
+        // Fallback: 200 ms grace for the keeper's auto-exit; SIGTERM if it
+        // survives. Fire-and-forget to keep killBySessionId synchronous.
+        setTimeout(() => {
+          if (isProcessAlive(keeperPid)) {
+            try { killPidWithGroup(keeperPid, "SIGTERM"); } catch { /* ignore */ }
           }
+        }, 200).unref?.();
+        // If pi was unknown (bridge never connected), fall through to
+        // killing the keeper directly so the spawn cleanup completes.
+        if (!killedSomething) {
+          try { killPidWithGroup(keeperPid, "SIGTERM"); killedSomething = true; }
+          catch { /* ignore */ }
         }
+        entries.delete(entry.pid);
+        persist();
+        return killedSomething;
+      }
+
+      // Non-keeper path (legacy): kill the spawn-time PID directly.
+      try {
+        killPidWithGroup(entry.pid, "SIGTERM");
+        entries.delete(entry.pid);
+        persist();
+        return true;
+      } catch {
+        entries.delete(entry.pid);
+        persist();
+        return false;
       }
-      return false;
     },
 
     remove(pid: number) {
@@ -207,6 +417,46 @@ export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions):
       return entries.size;
     },
 
+    setKeeperWriter(writer: KeeperWriter | null) {
+      keeperWriter = writer;
+    },
+
+    async writeRpc(sessionId: string, line: string): Promise<boolean> {
+      const entry = findBySessionId(sessionId);
+      if (!entry || !entry.keeperSockPath || !keeperWriter) return false;
+      return keeperWriter.writeRpcToSockPath(entry.keeperSockPath, line);
+    },
+
+    async cleanupKeeperOrphans(): Promise<void> {
+      if (isUnsafeTestHomeScan()) {
+        console.warn("[headless-pid-registry] cleanupKeeperOrphans() blocked: running under vitest with real HOME");
+        return;
+      }
+      if (!keeperWriter) return;
+      // KeeperManager.discoverExistingKeepers does the heavy lifting:
+      // unlinks stale sockets, SIGTERMs orphans whose pi child is dead.
+      // The registry only needs to know about live pairs so it can
+      // attach keeper info to existing entries (matched by spawn-time
+      // pid via the persisted sidecar PID).
+      try {
+        const live = await keeperWriter.discoverExistingKeepers();
+        for (const k of live) {
+          // Reattach to any existing entry whose spawn-time PID matches
+          // the keeper PID (set when the previous server instance ran
+          // spawnHeadlessViaKeeper). Defensive: do not blow away entries
+          // that already have keeperPid set.
+          const existing = entries.get(k.keeperPid);
+          if (existing && existing.keeperPid === undefined) {
+            existing.keeperPid = k.keeperPid;
+            existing.keeperSockPath = k.sockPath;
+            persist();
+          }
+        }
+      } catch (err) {
+        console.warn("[headless-pid-registry] cleanupKeeperOrphans failed", err);
+      }
+    },
+
     cleanupOrphans() {
       if (isUnsafeTestHomeScan()) {
         console.warn("[headless-pid-registry] cleanupOrphans() blocked: running under vitest with real HOME");
@@ -234,16 +484,24 @@ export function createHeadlessPidRegistry(options?: HeadlessPidRegistryOptions):
           continue;
         }
 
-        // Alive and not too old — reclaim into registry
-        // Create a dummy ChildProcess-like emitter for the entry
-        // EventEmitter imported at top level
+        // Alive and not too old — reclaim into registry.
+        // ALL identity fields are restored so the post-restart three-tier
+        // link (token → pid → cwd-FIFO) keeps its precision; without piPid
+        // / spawnToken, keeper-mode sessions mis-map under cwd-FIFO when
+        // two sessions share a cwd. See change:
+        // add-rpc-stdin-dispatch-with-keeper-sidecar.
         const dummyProc = new EventEmitter() as ChildProcess;
-        entries.set(entry.pid, {
+        const reclaimed: HeadlessEntry = {
           pid: entry.pid,
           cwd: entry.cwd,
           process: dummyProc,
           spawnedAt,
-        });
+        };
+        if (entry.spawnToken) reclaimed.spawnToken = entry.spawnToken;
+        if (entry.piPid !== undefined) reclaimed.piPid = entry.piPid;
+        if (entry.keeperPid !== undefined) reclaimed.keeperPid = entry.keeperPid;
+        if (entry.keeperSockPath) reclaimed.keeperSockPath = entry.keeperSockPath;
+        entries.set(entry.pid, reclaimed);
       }
 
       persist();

package/packages/server/src/legacy-pi-cleanup.ts

@@ -0,0 +1,151 @@
+/**
+ * Detects and removes legacy `@mariozechner/pi-coding-agent` installs.
+ *
+ * Pi was renamed to `@earendil-works/pi-coding-agent` at v0.74. The legacy
+ * scope is published only up to v0.73.x and conflicts with the new scope's
+ * `bin/pi` symlink in npm-global (EEXIST). This module surfaces legacy
+ * installs so the UI can offer a one-click cleanup.
+ *
+ * Detection is read-only and cheap (3 fs.stat calls + optional `npm root
+ * -g`). Cleanup is gated behind a POST endpoint — never silent.
+ *
+ * Scopes scanned:
+ *   - npm-global:  `$(npm root -g)/@mariozechner/pi-coding-agent`
+ *   - npx-cache:   `~/.npm/_npx/<hash>/node_modules/@mariozechner/pi-coding-agent`
+ *   - managed:     `~/.pi-dashboard/node_modules/@mariozechner/pi-coding-agent`
+ */
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+import { execSync } from "@blackbelt-technology/pi-dashboard-shared/platform/exec.js";
+
+export const LEGACY_PI_PACKAGE = "@mariozechner/pi-coding-agent";
+
+export type LegacyPiScope = "npm-global" | "npx-cache" | "managed";
+
+export interface LegacyPiInstall {
+  scope: LegacyPiScope;
+  path: string;
+  version: string | null;
+}
+
+export interface LegacyPiCleanupResult {
+  scope: LegacyPiScope;
+  path: string;
+  removed: boolean;
+  error?: string;
+}
+
+// ── Pure helpers (no I/O) ──────────────────────────────────────────
+
+/** Build the legacy package path under a given node_modules root. */
+export function legacyPathUnder(nodeModulesDir: string): string {
+  return path.join(nodeModulesDir, ...LEGACY_PI_PACKAGE.split("/"));
+}
+
+/** Read `version` from a package.json blob; returns null on any parse failure. */
+export function parseVersion(packageJsonRaw: string): string | null {
+  try {
+    const parsed = JSON.parse(packageJsonRaw);
+    return typeof parsed.version === "string" ? parsed.version : null;
+  } catch {
+    return null;
+  }
+}
+
+// ── Detection ──────────────────────────────────────────────────────
+
+function safeStatDir(p: string): boolean {
+  try { return fs.statSync(p).isDirectory(); } catch { return false; }
+}
+
+function readVersionOf(packageDir: string): string | null {
+  try {
+    const raw = fs.readFileSync(path.join(packageDir, "package.json"), "utf-8");
+    return parseVersion(raw);
+  } catch {
+    return null;
+  }
+}
+
+function detectNpmGlobal(): LegacyPiInstall | null {
+  let globalRoot: string;
+  try {
+    globalRoot = execSync("npm root -g", { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+  } catch {
+    return null; // npm not available, or call failed — treat as no install
+  }
+  if (!globalRoot) return null;
+  const pkgDir = legacyPathUnder(globalRoot);
+  if (!safeStatDir(pkgDir)) return null;
+  return { scope: "npm-global", path: pkgDir, version: readVersionOf(pkgDir) };
+}
+
+function detectNpxCache(): LegacyPiInstall[] {
+  const root = path.join(os.homedir(), ".npm", "_npx");
+  let entries: string[];
+  try { entries = fs.readdirSync(root); } catch { return []; }
+  const found: LegacyPiInstall[] = [];
+  for (const hash of entries) {
+    const pkgDir = legacyPathUnder(path.join(root, hash, "node_modules"));
+    if (safeStatDir(pkgDir)) {
+      found.push({ scope: "npx-cache", path: pkgDir, version: readVersionOf(pkgDir) });
+    }
+  }
+  return found;
+}
+
+function detectManaged(): LegacyPiInstall | null {
+  const pkgDir = legacyPathUnder(path.join(os.homedir(), ".pi-dashboard", "node_modules"));
+  if (!safeStatDir(pkgDir)) return null;
+  return { scope: "managed", path: pkgDir, version: readVersionOf(pkgDir) };
+}
+
+/**
+ * Scan all three locations for legacy pi installs. Synchronous because
+ * the cost is dominated by one `npm root -g` invocation (~50ms once);
+ * everything else is fs.statSync. Called at startup and on POST refresh.
+ */
+export function detectLegacyPiInstalls(): LegacyPiInstall[] {
+  const found: LegacyPiInstall[] = [];
+  const g = detectNpmGlobal();
+  if (g) found.push(g);
+  found.push(...detectNpxCache());
+  const m = detectManaged();
+  if (m) found.push(m);
+  return found;
+}
+
+// ── Cleanup ────────────────────────────────────────────────────────
+
+function rmrf(target: string): void {
+  fs.rmSync(target, { recursive: true, force: true });
+}
+
+function removeOne(install: LegacyPiInstall): LegacyPiCleanupResult {
+  const base: Pick<LegacyPiCleanupResult, "scope" | "path"> = { scope: install.scope, path: install.path };
+  try {
+    if (install.scope === "npm-global") {
+      // npm-global needs the package-manager call so any bin symlinks are
+      // cleaned up too. Using `--no-fund --no-audit` to keep output quiet.
+      execSync(`npm uninstall -g --no-fund --no-audit ${LEGACY_PI_PACKAGE}`, {
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf-8",
+      });
+    } else {
+      // npx-cache and managed are plain node_modules subtrees we can rm.
+      rmrf(install.path);
+    }
+    return { ...base, removed: true };
+  } catch (err: any) {
+    return { ...base, removed: false, error: err?.message ?? String(err) };
+  }
+}
+
+/**
+ * Remove all detected legacy installs. Each scope is attempted
+ * independently; one failure does not abort the others.
+ */
+export function uninstallLegacyPi(installs: readonly LegacyPiInstall[]): LegacyPiCleanupResult[] {
+  return installs.map(removeOne);
+}