borgmcp 1.1.15 → 2.0.2

package/dist/cleanup-cmd.js

@@ -1,14 +1,453 @@
-import{spawnSync as I}from"node:child_process";import{realpathSync as W}from"node:fs";import{sep as R,basename as v,dirname as A}from"node:path";import{homedir as D}from"node:os";import c from"chalk";import{classifyDirty as L,isMerged as B,localBranchExists as x,perWorktreeBranchName as _,worktreesHome as C}from"./worktree-lifecycle.js";import{readAllProjectIdentities as F}from"./cubes.js";import{defaultProbeSeat as O}from"./seat-probe.js";const S="origin/main",j=new Set(["node_modules","dist","build",".next","coverage",".wrangler",".playwright-mcp",".claude"]),G=new Set([".DS_Store","worker-configuration.d.ts"]),H=[".log",".tsbuildinfo",".tmp"];function M(r){const n=r.replace(/\/+$/,""),e=n.split("/").filter(s=>s.length>0);if(e.some(s=>j.has(s)))return!0;const t=e[e.length-1]??n;return!!(G.has(t)||H.some(s=>t.endsWith(s)))}function T(r,n){const e=r("git",["status","--porcelain","--ignored"],n);if(e.status!==0)return["<git status --ignored failed \u2014 cannot verify clean>"];const t=[];for(const s of e.stdout.split(`
-`)){if(!s.startsWith("!!"))continue;const a=s.slice(3).trim();a.length!==0&&(M(a)||t.push(a))}return t}const z={runSync:(r,n,e)=>{const t=I(r,n,{cwd:e,encoding:"utf-8"});return{status:t.status,stdout:t.stdout??"",stderr:t.stderr??""}},homeDir:()=>D(),cwd:()=>process.cwd(),listSeats:()=>F(),probeSeat:O,realpath:r=>W(r),stdout:r=>process.stdout.write(r),stderr:r=>process.stderr.write(r)};function K(r,n,e){let t,s;try{t=r(n),s=r(e)}catch{return!1}if(s===t)return!1;const a=t.endsWith(R)?t:t+R;return s.startsWith(a)}function oe(r){return N(r).map(n=>n.path)}function N(r){const n=[];let e=null;for(const t of r.split(`
-`))t.startsWith("worktree ")?(e&&n.push(e),e={path:t.slice(9).trim(),branch:null}):t.startsWith("branch ")&&e&&(e.branch=t.slice(7).trim().replace(/^refs\/heads\//,""));return e&&n.push(e),n}async function X(r,n,e,t){const{runSync:s}=r,a=L(s,n),u=a.staged.length+a.unstaged.length+a.untracked.length;if(u>0)return{reason:"SURVIVES-dirty",detail:`${u} uncommitted file(s)`};const d=T(s,n);if(d.length>0)return{reason:"SURVIVES-clobber",detail:`gitignored local state: ${d.slice(0,3).join(", ")}${d.length>3?` (+${d.length-3})`:""}`};if(e===null)return{reason:"SURVIVES-detached",detail:"detached HEAD \u2014 cannot verify merged"};if(!B(s,n,e,S))return{reason:"SURVIVES-unmerged",detail:`${e} not merged into ${S}`};switch(await r.probeSeat(t.sessionToken,t.apiUrl)){case"evicted":return{reason:"PRUNABLE",detail:"410 DRONE_EVICTED (clean + merged)"};case"frozen":return{reason:"SURVIVES-frozen",detail:"423 DRONE_FROZEN (reversible)"};case"live":return{reason:"SURVIVES-live",detail:"seat resolves (drone alive)"};default:return{reason:"UNKNOWN-indeterminate",detail:"probe returned 401/network/transient (or gh#877 not yet deployed) \u2014 not deleting"}}}async function Y(r){const{runSync:n,realpath:e}=r,t=r.cwd();if(n("git",["rev-parse","--show-toplevel"],t).status!==0)return{rows:[],error:`not in a git repository (cwd: ${t})`};const s=n("git",["fetch","origin","--prune"],t);if(s.status!==0)return{rows:[],error:`git fetch origin failed: ${s.stderr.trim()}`};const a=n("git",["worktree","list","--porcelain"],t);if(a.status!==0)return{rows:[],error:`git worktree list failed: ${a.stderr.trim()}`};const u=N(a.stdout),d=new Map(u.map(i=>[i.path,i.branch])),h=u.map(i=>i.path),E=h[0],b=r.homeDir(),g=C(b),o=k(e,t),p=E?k(e,E):null,y=await r.listSeats(),f=new Map;for(const{projectPath:i,cube:w}of y){const m=k(e,i);m&&f.set(m,w)}const l=[];for(const i of h){const w=k(e,i);if(!w||p&&w===p)continue;const m=f.get(w),U=K(e,g,i);if(w===o){l.push({worktreePath:i,wtBranch:null,reason:"SURVIVES-self",detail:"current worktree"});continue}if(!U){m&&l.push({worktreePath:i,wtBranch:null,reason:"LEGACY-manual-review",detail:"borg seat outside worktreesHome (pre-gh#556 sibling)"});continue}if(!m){l.push({worktreePath:i,wtBranch:null,reason:"UNKNOWN-no-seat",detail:"no cubes.json seat \u2014 manual review"});continue}const $=d.get(i)??null,{reason:P,detail:V}=await X(r,i,$,m);l.push({worktreePath:i,wtBranch:$,reason:P,detail:V})}return{rows:l}}function k(r,n){try{return r(n)}catch{return null}}async function se(r={},n={prune:!1}){const e={...z,...r},{stdout:t,stderr:s,runSync:a}=e,{rows:u,error:d}=await Y(e);if(d)return s(c.red(`\u25FC borg cleanup: ${d}
-`)),1;const h=u.filter(o=>o.reason==="PRUNABLE"),E=u.filter(o=>o.reason!=="PRUNABLE");if(u.length===0)return t(c.blue(`\u25FC borg cleanup: no borg-managed worktrees found.
-`)),0;t(c.bold(`\u25FC borg cleanup report:
-`));for(const o of u){const p=o.reason==="PRUNABLE"?c.yellow(o.reason):c.gray(o.reason);t(`  ${p}  ${o.worktreePath}${o.detail?c.gray(`  \u2014 ${o.detail}`):""}
-`)}if(t(c.gray(`\u25FC ${h.length} prunable, ${E.length} kept.
-`)),!n.prune)return h.length>0&&t(c.gray("\u25FC Dry-run \u2014 nothing deleted. Re-run with `--prune` to remove the PRUNABLE worktree(s).\n")),0;if(h.length===0)return t(c.blue(`\u25FC Nothing to prune.
-`)),0;let b=0,g=0;for(const o of h){const p=a("git",["worktree","remove",o.worktreePath],e.cwd());if(p.status!==0){o.prune="remove-failed",g++,s(c.red(`  \u2717 worktree remove ${o.worktreePath}: ${p.stderr.trim()}
-`));continue}if(o.wtBranch){const l=a("git",["branch","-d",o.wtBranch],e.cwd());if(l.status!==0){o.prune="branch-delete-failed",s(c.yellow(`  \u26A0 removed worktree but \`git branch -d ${o.wtBranch}\` refused: ${l.stderr.trim()}
-`)),b++;continue}}let y="";const f=_(v(o.worktreePath),v(A(o.worktreePath)));if(f!==o.wtBranch&&x(a,e.cwd(),f)&&B(a,e.cwd(),f,S)){const l=a("git",["branch","-d",f],e.cwd());l.status===0?y=` + base ${f}`:s(c.yellow(`  \u26A0 left dangling base branch ${f}: \`git branch -d\` refused: ${l.stderr.trim()}
-`))}o.prune="removed",b++,t(c.blue(`  \u2713 pruned ${o.worktreePath}${o.wtBranch?` + branch ${o.wtBranch}`:""}${y}
-`))}return t(c.gray(`\u25FC Pruned ${b} worktree(s)${g>0?`, ${g} failed`:""}.
-`)),g>0?1:0}function ae(r){let n=!1;for(const e of r)if(e==="--prune")n=!0;else return{ok:!1,error:`unexpected argument: ${e}. Usage: borg cleanup [--prune]`};return{ok:!0,options:{prune:n}}}export{Y as buildCleanupReport,T as clobberClassIgnored,M as isRegenerableIgnored,K as isStrictlyUnder,ae as parseCleanupArgs,N as parseWorktreeEntries,oe as parseWorktreeList,se as runCleanup};
+/**
+ * `borg cleanup` — reap orphaned worktrees for evicted drones (gh#882).
+ *
+ * An evicted drone (manual `borg_evict-drone`, watchdog
+ * `autoEvictPresumedDead`, or gh#877 graceful self-shutdown) leaves its
+ * worktree dir (`~/.borg/worktrees/<repo>/<name>`) + its `wt-<suffix>`
+ * branch on disk. Nothing reclaims them. This command finds and SAFELY
+ * removes worktrees orphaned by eviction — never destroying live,
+ * dirty, unmerged, or precious-local-state work.
+ *
+ * Pure composition over `worktree-lifecycle.ts` + the gh#877 per-seat
+ * `410 DRONE_EVICTED` discrimination (via the seat-probe seam). All git +
+ * network + filesystem effects are behind injected deps so every branch is
+ * unit-testable without a live repo, network, or $HOME.
+ *
+ * SEC gate (gh#882, S1–S5 — design entries 98e45fbf / acd76794):
+ *   S1  Destructive prune authority = server 410 DRONE_EVICTED on the
+ *       worktree's OWN saved-seat token, ONLY.
+ *   S2  KEEP classes (any one → never prune, surface): dirty; unmerged;
+ *       non-regenerable gitignored-local.
+ *   S3  Report-only until gh#877 is DEPLOYED. The destructive path keys on
+ *       the 410 CODE — pre-deploy the server returns 401 → probe resolves
+ *       'indeterminate' → report-only → safe. No flag / deploy coupling;
+ *       --prune auto-unlocks the day 410 ships.
+ *   S4  (a) gitignored-aware clean-gate, DEFAULT-DENY: block on ANY
+ *       gitignored-local present UNLESS it matches a curated REGENERABLE
+ *       allowlist (NOT a secret denylist — that fails open). Layered here,
+ *       NOT in the shared isCleanTree/classifyDirty (those feed
+ *       assimilate/sync — widening them perturbs that path).
+ *       (b) fetch origin/main BEFORE the isMerged gate.
+ *   S5  Auto-prune strictly under canonicalized (realpath) worktreesHome —
+ *       reject symlink-escape / `..`. Report MAY widen to legacy siblings
+ *       outside worktreesHome (label "legacy — manual review"); report ≠ delete.
+ */
+import { spawnSync } from 'node:child_process';
+import { realpathSync } from 'node:fs';
+import { sep, basename, dirname } from 'node:path';
+import { homedir } from 'node:os';
+import chalk from 'chalk';
+import { classifyDirty, isMerged, localBranchExists, perWorktreeBranchName, worktreesHome, } from './worktree-lifecycle.js';
+import { readAllProjectIdentities, } from './cubes.js';
+import { defaultProbeSeat } from './seat-probe.js';
+const DEFAULT_REF = 'origin/main';
+// ------------------------------------------------------------------
+// S4a — gitignored-aware clean gate (DEFAULT-DENY via regenerable allowlist)
+// ------------------------------------------------------------------
+/**
+ * Regenerable build/scratch artifacts that are SAFE to delete with the
+ * worktree (present in nearly every worktree; never precious). DEFAULT-DENY:
+ * an ignored path is "regenerable" ONLY if it matches this allowlist;
+ * EVERYTHING else (unknown ignored path) is assumed PRECIOUS and blocks the
+ * prune. A secret-denylist would fail OPEN on an unanticipated precious file
+ * (`data/`, `.dev.vars`, `credentials.json`, a private key) — so we allowlist
+ * the bounded disposable set instead (SEC S4a / B24 9e79b0b1).
+ */
+const REGENERABLE_DIRS = new Set([
+    'node_modules',
+    'dist',
+    'build',
+    '.next',
+    'coverage',
+    '.wrangler',
+    '.playwright-mcp',
+    // gh#882 follow-up: `.claude/` is Claude Code's PER-WORKTREE scaffolding
+    // (session state, scheduled-task locks, and a `settings.local.json` of
+    // worktree-local permission grants). It is present in EVERY borg worktree, so
+    // without this entry the S4a default-deny gate flagged it precious and `borg
+    // cleanup` could NEVER prune ANY worktree (0 prunable, N kept). It is a
+    // DELIBERATE, narrow carve-out: the gate only ever runs on an already-EVICTED,
+    // clean, merged worktree (410 DRONE_EVICTED stays the SOLE delete authority —
+    // S1), and `.claude/` is recreated on the next assimilate; its only
+    // arguably-precious fragment (`settings.local.json`) is worktree-local, never
+    // carries to the parent, and dies with the dead seat. git collapses an ignored
+    // dir to a single `!! .claude/` porcelain line, so segment-matching `.claude`
+    // here covers root + nested `<sub>/.claude/` and is the only expressible
+    // granularity. A truly-precious sibling (`data/`, `credentials.json`,
+    // `.env.test`, `.dev.vars`) emits its OWN `!!` line, still fails this
+    // allowlist, and still → SURVIVES-clobber (T-GITIGNORED-DEFAULTDENY intact).
+    // RESIDUAL RISK (accepted): any file hand-placed DIRECTLY under `.claude/` in an
+    // evicted worktree is sacrificial and silently removed — `git worktree remove`
+    // without `--force` does NOT refuse on ignored content, and a gitignore negation
+    // (`!.claude/keep`) is inert once the parent is excluded, so the allowlist
+    // decision here is the SOLE guard. Today `.claude/` is exclusively Claude Code
+    // scaffolding; this comment makes the assumption auditable.
+    '.claude',
+]);
+const REGENERABLE_FILES = new Set(['.DS_Store', 'worker-configuration.d.ts']);
+const REGENERABLE_SUFFIXES = ['.log', '.tsbuildinfo', '.tmp'];
+/** True iff a single gitignored path is a known-regenerable artifact. */
+export function isRegenerableIgnored(ignoredPath) {
+    const clean = ignoredPath.replace(/\/+$/, ''); // strip trailing slash
+    const segments = clean.split('/').filter((s) => s.length > 0);
+    if (segments.some((s) => REGENERABLE_DIRS.has(s)))
+        return true;
+    const base = segments[segments.length - 1] ?? clean;
+    if (REGENERABLE_FILES.has(base))
+        return true;
+    if (REGENERABLE_SUFFIXES.some((suf) => base.endsWith(suf)))
+        return true;
+    return false;
+}
+/**
+ * Return the gitignored-local paths in `cwd` that are NOT regenerable — i.e.
+ * the precious-local-state files (`.env`, `.env.test`, `.dev.vars`, secrets,
+ * `data/`, …) that a prune would destroy forever. Non-empty → BLOCK (S4a).
+ *
+ * `git status --porcelain --ignored` emits ignored entries with a `!!` status
+ * prefix; git collapses an ignored directory to a single `!! dir/` entry, so
+ * segment-matching the reported path against the allowlist is sufficient.
+ */
+export function clobberClassIgnored(runSync, cwd) {
+    const r = runSync('git', ['status', '--porcelain', '--ignored'], cwd);
+    if (r.status !== 0) {
+        // Cannot determine ignored state → fail SAFE: treat as "has precious"
+        // so the worktree survives rather than risking a clobber.
+        return ['<git status --ignored failed — cannot verify clean>'];
+    }
+    const precious = [];
+    for (const line of r.stdout.split('\n')) {
+        if (!line.startsWith('!!'))
+            continue;
+        const path = line.slice(3).trim();
+        if (path.length === 0)
+            continue;
+        if (!isRegenerableIgnored(path))
+            precious.push(path);
+    }
+    return precious;
+}
+// ------------------------------------------------------------------
+// Defaults
+// ------------------------------------------------------------------
+const defaultDeps = {
+    runSync: (cmd, args, cwd) => {
+        const r = spawnSync(cmd, args, { cwd, encoding: 'utf-8' });
+        return { status: r.status, stdout: r.stdout ?? '', stderr: r.stderr ?? '' };
+    },
+    homeDir: () => homedir(),
+    cwd: () => process.cwd(),
+    listSeats: () => readAllProjectIdentities(),
+    probeSeat: defaultProbeSeat,
+    realpath: (p) => realpathSync(p),
+    stdout: (line) => process.stdout.write(line),
+    stderr: (line) => process.stderr.write(line),
+};
+// (defaultProbeSeat now lives in seat-probe.ts — imported above.)
+// ------------------------------------------------------------------
+// Path anchoring (S5)
+// ------------------------------------------------------------------
+/**
+ * True iff `child`'s canonicalized real path is STRICTLY under `parent`'s
+ * canonicalized real path — rejecting `..` traversal AND symlink escape (a
+ * symlinked worktree whose realpath is outside worktreesHome is NOT a prune
+ * candidate). Returns false (never under) if either path can't be resolved.
+ */
+export function isStrictlyUnder(realpath, parent, child) {
+    let rp;
+    let rc;
+    try {
+        rp = realpath(parent);
+        rc = realpath(child);
+    }
+    catch {
+        return false;
+    }
+    if (rc === rp)
+        return false; // the home dir itself is not "under" itself
+    const prefix = rp.endsWith(sep) ? rp : rp + sep;
+    return rc.startsWith(prefix);
+}
+// ------------------------------------------------------------------
+// Enumeration
+// ------------------------------------------------------------------
+/** Parse `git worktree list --porcelain` → absolute worktree paths (in order). */
+export function parseWorktreeList(porcelain) {
+    return parseWorktreeEntries(porcelain).map((e) => e.path);
+}
+/**
+ * Parse `git worktree list --porcelain` into `{path, branch}` entries (in
+ * order; primary first). `branch` is the ACTUAL checked-out branch name (from
+ * the `branch refs/heads/<name>` line) or null for a detached HEAD (no branch
+ * line). This is load-bearing (gh#882 CR blocker dcdd7fca): a drone cuts
+ * `fix/…`/`feat/…` off `wt-<suffix>` INSIDE the worktree, so the checked-out
+ * HEAD is commonly a feature branch with unpushed commits while `wt-<suffix>`
+ * stays at the merged base. The merged-gate + `git branch -d` MUST key on the
+ * actual HEAD branch, not the derived `wt-<suffix>`, or unmerged feature work
+ * is misclassified PRUNABLE.
+ */
+export function parseWorktreeEntries(porcelain) {
+    const entries = [];
+    let cur = null;
+    for (const line of porcelain.split('\n')) {
+        if (line.startsWith('worktree ')) {
+            if (cur)
+                entries.push(cur);
+            cur = { path: line.slice('worktree '.length).trim(), branch: null };
+        }
+        else if (line.startsWith('branch ') && cur) {
+            // `branch refs/heads/<name>` → <name>. A detached worktree emits
+            // `detached` (or no branch line) → branch stays null.
+            cur.branch = line.slice('branch '.length).trim().replace(/^refs\/heads\//, '');
+        }
+    }
+    if (cur)
+        entries.push(cur);
+    return entries;
+}
+// ------------------------------------------------------------------
+// Classification (per worktree)
+// ------------------------------------------------------------------
+/**
+ * Classify ONE borg-managed worktree (cheap-first gate order; the FIRST
+ * KEEP-class short-circuits — a transient probe failure on a dirty/unmerged
+ * tree never even reaches the network). Only `PRUNABLE` authorizes a delete.
+ */
+async function classifyWorktree(deps, worktreePath, actualBranch, seat) {
+    const { runSync } = deps;
+    // (1) dirty — tracked staged/unstaged/untracked. KEEP.
+    const dirty = classifyDirty(runSync, worktreePath);
+    const dirtyCount = dirty.staged.length + dirty.unstaged.length + dirty.untracked.length;
+    if (dirtyCount > 0) {
+        return { reason: 'SURVIVES-dirty', detail: `${dirtyCount} uncommitted file(s)` };
+    }
+    // (2) S4a — gitignored precious-local present (the clobber class). KEEP.
+    const precious = clobberClassIgnored(runSync, worktreePath);
+    if (precious.length > 0) {
+        return {
+            reason: 'SURVIVES-clobber',
+            detail: `gitignored local state: ${precious.slice(0, 3).join(', ')}${precious.length > 3 ? ` (+${precious.length - 3})` : ''}`,
+        };
+    }
+    // (3) detached HEAD — no branch to verify merged-state against. Cannot
+    // prove the work is safely on origin/main → KEEP (gh#882 CR blocker).
+    if (actualBranch === null) {
+        return { reason: 'SURVIVES-detached', detail: 'detached HEAD — cannot verify merged' };
+    }
+    // (4) unmerged — the worktree's ACTUAL checked-out branch has commits not on
+    // origin/main (fetch already ran ONCE globally — S4b). This MUST key on the
+    // real HEAD branch, not the derived `wt-<suffix>`: a drone cuts feature
+    // branches off wt-<suffix> inside the worktree, so checking wt-<suffix>
+    // (which stays at the merged base) would miss unpushed feature work and
+    // misclassify it PRUNABLE (gh#882 CR blocker dcdd7fca). KEEP.
+    if (!isMerged(runSync, worktreePath, actualBranch, DEFAULT_REF)) {
+        return { reason: 'SURVIVES-unmerged', detail: `${actualBranch} not merged into ${DEFAULT_REF}` };
+    }
+    // (5) ONLY now probe eviction with the worktree's OWN seat token (S1).
+    const status = await deps.probeSeat(seat.sessionToken, seat.apiUrl, seat.serverTrustIdentity);
+    switch (status) {
+        case 'evicted':
+            return { reason: 'PRUNABLE', detail: '410 DRONE_EVICTED (clean + merged)' };
+        case 'rejected':
+            return { reason: 'SURVIVES-rejected', detail: 'pin-matched 401 (revoked/taken over) — recoverable via re-enroll, never delete' };
+        case 'live':
+            return { reason: 'SURVIVES-live', detail: 'seat resolves (drone alive)' };
+        case 'indeterminate':
+        default:
+            return {
+                reason: 'UNKNOWN-indeterminate',
+                detail: 'probe returned network/transient/404/trust-mismatch (or gh#877 not yet deployed) — not deleting',
+            };
+    }
+}
+// ------------------------------------------------------------------
+// Orchestrator
+// ------------------------------------------------------------------
+/**
+ * Build the cleanup report (read-only except the single up-front
+ * `git fetch origin`). Exported separately from the prune action so tests +
+ * the dry-run path share it.
+ */
+export async function buildCleanupReport(deps) {
+    const { runSync, realpath } = deps;
+    const cwd = deps.cwd();
+    if (runSync('git', ['rev-parse', '--show-toplevel'], cwd).status !== 0) {
+        return { rows: [], error: `not in a git repository (cwd: ${cwd})` };
+    }
+    // S4b — fetch origin ONCE up front so every per-worktree isMerged gate runs
+    // against a fresh origin/main (the ref is shared across linked worktrees).
+    // Fatal: a stale origin/main makes an unpushed wt-branch look merged.
+    const fetch = runSync('git', ['fetch', 'origin', '--prune'], cwd);
+    if (fetch.status !== 0) {
+        return { rows: [], error: `git fetch origin failed: ${fetch.stderr.trim()}` };
+    }
+    const wtList = runSync('git', ['worktree', 'list', '--porcelain'], cwd);
+    if (wtList.status !== 0) {
+        return { rows: [], error: `git worktree list failed: ${wtList.stderr.trim()}` };
+    }
+    const wtEntries = parseWorktreeEntries(wtList.stdout);
+    const branchByPath = new Map(wtEntries.map((e) => [e.path, e.branch]));
+    const allWorktrees = wtEntries.map((e) => e.path);
+    const mainDir = allWorktrees[0]; // porcelain lists the primary worktree first
+    const home = deps.homeDir();
+    const wtHome = worktreesHome(home);
+    // Self + primary are never orphan candidates.
+    const selfReal = safeRealpath(realpath, cwd);
+    const mainReal = mainDir ? safeRealpath(realpath, mainDir) : null;
+    // Seat lookup keyed by realpath(projectPath) so symlinked/relative entries
+    // still match the enumerated worktree path.
+    const seats = await deps.listSeats();
+    const seatByReal = new Map();
+    for (const { projectPath, cube } of seats) {
+        const real = safeRealpath(realpath, projectPath);
+        if (real)
+            seatByReal.set(real, cube);
+    }
+    const rows = [];
+    for (const wt of allWorktrees) {
+        const real = safeRealpath(realpath, wt);
+        if (!real)
+            continue; // gone from disk — git will report it as prunable itself
+        if (mainReal && real === mainReal)
+            continue; // primary worktree — never a candidate
+        const seat = seatByReal.get(real);
+        const under = isStrictlyUnder(realpath, wtHome, wt);
+        // Self (the running worktree): surface but never prune (can't remove the
+        // current worktree; the seat probe would also report it live).
+        if (real === selfReal) {
+            rows.push({ worktreePath: wt, wtBranch: null, reason: 'SURVIVES-self', detail: 'current worktree' });
+            continue;
+        }
+        if (!under) {
+            // Outside worktreesHome. A seat'd worktree here is a legacy pre-gh#556
+            // sibling → REPORT for manual review, never auto-prune (S5). No seat →
+            // an arbitrary user worktree we never touch or list.
+            if (seat) {
+                rows.push({ worktreePath: wt, wtBranch: null, reason: 'LEGACY-manual-review', detail: 'borg seat outside worktreesHome (pre-gh#556 sibling)' });
+            }
+            continue;
+        }
+        // Under worktreesHome but no saved seat → not eviction-orphaned
+        // (pre-assimilate or hand-made). Report, never auto-prune.
+        if (!seat) {
+            rows.push({ worktreePath: wt, wtBranch: null, reason: 'UNKNOWN-no-seat', detail: 'no saved seat — manual review' });
+            continue;
+        }
+        // Use the worktree's ACTUAL checked-out HEAD branch (from porcelain) for
+        // BOTH the merged-gate and the eventual `git branch -d` — NOT the derived
+        // `wt-<suffix>` (gh#882 CR blocker dcdd7fca). null = detached HEAD → KEEP.
+        const actualBranch = branchByPath.get(wt) ?? null;
+        const { reason, detail } = await classifyWorktree(deps, wt, actualBranch, seat);
+        rows.push({ worktreePath: wt, wtBranch: actualBranch, reason, detail });
+    }
+    return { rows };
+}
+function safeRealpath(realpath, p) {
+    try {
+        return realpath(p);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * `borg cleanup [--prune]` entry point. Returns the process exit code.
+ * Dry-run (default): print the report, delete nothing. `--prune`: additionally
+ * remove PRUNABLE worktrees via `git worktree remove` (NO --force) +
+ * `git branch -d` (NO -D) — git's own refusals are the final backstop.
+ */
+export async function runCleanup(deps = {}, opts = { prune: false }) {
+    const merged = { ...defaultDeps, ...deps };
+    const { stdout, stderr, runSync } = merged;
+    const { rows, error } = await buildCleanupReport(merged);
+    if (error) {
+        stderr(chalk.red(`◼ borg cleanup: ${error}\n`));
+        return 1;
+    }
+    const prunable = rows.filter((r) => r.reason === 'PRUNABLE');
+    const survivors = rows.filter((r) => r.reason !== 'PRUNABLE');
+    // --- Report (always) ---
+    if (rows.length === 0) {
+        stdout(chalk.blue('◼ borg cleanup: no borg-managed worktrees found.\n'));
+        return 0;
+    }
+    stdout(chalk.bold('◼ borg cleanup report:\n'));
+    for (const r of rows) {
+        const tag = r.reason === 'PRUNABLE' ? chalk.yellow(r.reason) : chalk.gray(r.reason);
+        stdout(`  ${tag}  ${r.worktreePath}${r.detail ? chalk.gray(`  — ${r.detail}`) : ''}\n`);
+    }
+    stdout(chalk.gray(`◼ ${prunable.length} prunable, ${survivors.length} kept.\n`));
+    if (!opts.prune) {
+        if (prunable.length > 0) {
+            stdout(chalk.gray('◼ Dry-run — nothing deleted. Re-run with `--prune` to remove the PRUNABLE worktree(s).\n'));
+        }
+        return 0;
+    }
+    // --- Prune (PRUNABLE only) ---
+    if (prunable.length === 0) {
+        stdout(chalk.blue('◼ Nothing to prune.\n'));
+        return 0;
+    }
+    let removed = 0;
+    let failed = 0;
+    for (const r of prunable) {
+        // git worktree remove WITHOUT --force (refuses a dirty/locked worktree —
+        // backstop even past our gates).
+        const rm = runSync('git', ['worktree', 'remove', r.worktreePath], merged.cwd());
+        if (rm.status !== 0) {
+            r.prune = 'remove-failed';
+            failed++;
+            stderr(chalk.red(`  ✗ worktree remove ${r.worktreePath}: ${rm.stderr.trim()}\n`));
+            continue;
+        }
+        // git branch -d (NOT -D) — refuses an unmerged branch (backstop).
+        if (r.wtBranch) {
+            const bd = runSync('git', ['branch', '-d', r.wtBranch], merged.cwd());
+            if (bd.status !== 0) {
+                r.prune = 'branch-delete-failed';
+                stderr(chalk.yellow(`  ⚠ removed worktree but \`git branch -d ${r.wtBranch}\` refused: ${bd.stderr.trim()}\n`));
+                removed++;
+                continue;
+            }
+        }
+        // gh#884: r.wtBranch is the worktree's ACTUAL checked-out HEAD (often a
+        // feature branch the drone cut). The DERIVED per-worktree base branch
+        // `wt-<suffix>` — created by `borg assimilate`, the base feature branches
+        // were cut from — is a SEPARATE ref left dangling once the worktree is
+        // gone. Prune it too when it still exists and is merged into origin/main
+        // (skip when it IS r.wtBranch, already deleted above). `git branch -d`
+        // (NOT -D) backstops the merged + not-checked-out guards.
+        let baseNote = '';
+        const derivedWtBranch = perWorktreeBranchName(basename(r.worktreePath), basename(dirname(r.worktreePath)));
+        if (derivedWtBranch !== r.wtBranch &&
+            localBranchExists(runSync, merged.cwd(), derivedWtBranch) &&
+            isMerged(runSync, merged.cwd(), derivedWtBranch, DEFAULT_REF)) {
+            const bdBase = runSync('git', ['branch', '-d', derivedWtBranch], merged.cwd());
+            if (bdBase.status === 0) {
+                baseNote = ` + base ${derivedWtBranch}`;
+            }
+            else {
+                stderr(chalk.yellow(`  ⚠ left dangling base branch ${derivedWtBranch}: \`git branch -d\` refused: ${bdBase.stderr.trim()}\n`));
+            }
+        }
+        r.prune = 'removed';
+        removed++;
+        stdout(chalk.blue(`  ✓ pruned ${r.worktreePath}${r.wtBranch ? ` + branch ${r.wtBranch}` : ''}${baseNote}\n`));
+    }
+    stdout(chalk.gray(`◼ Pruned ${removed} worktree(s)${failed > 0 ? `, ${failed} failed` : ''}.\n`));
+    return failed > 0 ? 1 : 0;
+}
+/** Parse args after `borg cleanup`. Supports `--prune`; rejects anything else. */
+export function parseCleanupArgs(rawArgs) {
+    let prune = false;
+    for (const arg of rawArgs) {
+        if (arg === '--prune') {
+            prune = true;
+        }
+        else {
+            return { ok: false, error: `unexpected argument: ${arg}. Usage: borg cleanup [--prune]` };
+        }
+    }
+    return { ok: true, options: { prune } };
+}
+//# sourceMappingURL=cleanup-cmd.js.map

package/dist/cleanup-cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanup-cmd.js","sourceRoot":"","sources":["../src/cleanup-cmd.ts"],"names":[],"mappings":"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"}

package/dist/clear-rewake-core.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clear-rewake-core.d.ts","sourceRoot":"","sources":["../src/clear-rewake-core.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,6IAC0G,CAAC;AAE7I,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,iBAAiB,CAenB"}

package/dist/clear-rewake-core.js

@@ -1,2 +1,23 @@
-import{isBorgSession as o}from"./launch-gate.js";const n="Post-/clear recovery: full regen, drain the unread log; handle actionable cube entries, otherwise resume the work from before this wake.";function i(r,t=process.env){if(!o(t))return{exitCode:0,stderr:""};let e;try{e=r.trim()?JSON.parse(r):null}catch{return{exitCode:0,stderr:""}}return e?.hook_event_name!=="SessionStart"||e?.source!=="clear"?{exitCode:0,stderr:""}:{exitCode:2,stderr:`${n}
-`}}export{n as CLEAR_REWAKE_REMINDER,i as evaluateClearRewake};
+import { isBorgSession } from './launch-gate.js';
+export const CLEAR_REWAKE_REMINDER = 'Post-/clear recovery: full regen, drain the unread log; handle actionable cube entries, otherwise resume the work from before this wake.';
+/**
+ * Resolve the Claude `/clear` async-rewake response without consulting cube
+ * state. The reminder is deliberately static: hook input can contain local
+ * paths and session metadata, none of which may cross into stderr.
+ */
+export function evaluateClearRewake(raw, env = process.env) {
+    if (!isBorgSession(env))
+        return { exitCode: 0, stderr: '' };
+    let input;
+    try {
+        input = raw.trim() ? JSON.parse(raw) : null;
+    }
+    catch {
+        return { exitCode: 0, stderr: '' };
+    }
+    if (input?.hook_event_name !== 'SessionStart' || input?.source !== 'clear') {
+        return { exitCode: 0, stderr: '' };
+    }
+    return { exitCode: 2, stderr: `${CLEAR_REWAKE_REMINDER}\n` };
+}
+//# sourceMappingURL=clear-rewake-core.js.map

package/dist/clear-rewake-core.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clear-rewake-core.js","sourceRoot":"","sources":["../src/clear-rewake-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,qBAAqB,GAChC,0IAA0I,CAAC;AAO7I;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,GAAW,EACX,MAAyB,OAAO,CAAC,GAAG;IAEpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAE5D,IAAI,KAAU,CAAC;IACf,IAAI,CAAC;QACH,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACrC,CAAC;IAED,IAAI,KAAK,EAAE,eAAe,KAAK,cAAc,IAAI,KAAK,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;QAC3E,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACrC,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,qBAAqB,IAAI,EAAE,CAAC;AAC/D,CAAC"}

package/dist/clear-rewake.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clear-rewake.d.ts","sourceRoot":"","sources":["../src/clear-rewake.ts"],"names":[],"mappings":""}

package/dist/clear-rewake.js

@@ -1,2 +1,20 @@
 #!/usr/bin/env node
-import{evaluateClearRewake as s}from"./clear-rewake-core.js";async function n(){if(process.stdin.isTTY)return"";try{const t=[];for await(const e of process.stdin)t.push(e);return Buffer.concat(t).toString("utf-8")}catch{return""}}const r=s(await n());r.stderr&&process.stderr.write(r.stderr),process.exitCode=r.exitCode;
+import { evaluateClearRewake } from './clear-rewake-core.js';
+async function readStdin() {
+    if (process.stdin.isTTY)
+        return '';
+    try {
+        const chunks = [];
+        for await (const chunk of process.stdin)
+            chunks.push(chunk);
+        return Buffer.concat(chunks).toString('utf-8');
+    }
+    catch {
+        return '';
+    }
+}
+const result = evaluateClearRewake(await readStdin());
+if (result.stderr)
+    process.stderr.write(result.stderr);
+process.exitCode = result.exitCode;
+//# sourceMappingURL=clear-rewake.js.map

package/dist/clear-rewake.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clear-rewake.js","sourceRoot":"","sources":["../src/clear-rewake.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,KAAK,UAAU,SAAS;IACtB,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,KAAe,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC;AACtD,IAAI,MAAM,CAAC,MAAM;IAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACvD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC"}

package/dist/cli-help.d.ts

@@ -19,6 +19,11 @@ export declare function topLevelHelpText(version: string): string;
  * set. Model/provider configuration belongs to the selected agent CLI.
  */
 export declare function assimilateHelpText(version: string): string;
+/**
+ * Help text for `borg reset-local-seat --help`. The offline, network-free seat
+ * reset recommended by the pin-matched SESSION_REJECTED diagnostic (#1082).
+ */
+export declare function resetLocalSeatHelpText(version: string): string;
 /**
  * Help text for `borg setup --help` (gh#520 — previously this ran the setup
  * wizard instead of showing help). Mirrors the `borg setup` description in the

package/dist/cli-help.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-help.d.ts","sourceRoot":"","sources":["../src/cli-help.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAuBxD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA4B1D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAkB9D;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD"}