borgmcp 1.1.15 → 2.0.1

package/dist/sync.js

@@ -1,22 +1,286 @@
-import{spawnSync as y}from"node:child_process";import{basename as p}from"node:path";import o from"chalk";import{adoptWorktree as b,syncWorktree as k,cleanupMerged as v,isMerged as A,perWorktreeBranchName as D}from"./worktree-lifecycle.js";const W={runSync:(i,e,u)=>{const r=y(i,e,{cwd:u,encoding:"utf-8"});return{status:r.status,stdout:r.stdout??"",stderr:r.stderr??""}},cwd:()=>process.cwd(),stderr:i=>process.stderr.write(i),stdout:i=>process.stdout.write(i)},c="origin/main";function x(i,e,u){if(u.startsWith("wt-"))return u;const r=i("git",["rev-parse","--show-toplevel"],e),d=r.status===0?r.stdout.trim():e,s=i("git",["worktree","list","--porcelain"],e);let n=d;if(s.status===0){const t=s.stdout.split(`
-`).find(f=>f.startsWith("worktree "));t&&(n=t.slice(9).trim())}return D(p(d),p(n))}function E(i){const{runSync:e,cwd:u}=i,r=u();if(e("git",["rev-parse","--show-toplevel"],r).status!==0)return{kind:"error",reason:`not in a git repository (cwd: ${r})`};const d=e("git",["status","--porcelain"],r);if(d.status!==0)return{kind:"error",reason:`git status failed: ${d.stderr.trim()}`};const s=d.stdout.split(`
-`).map(g=>g.trim()).filter(g=>g.length>0);if(s.length>0)return{kind:"dirty",files:s};const n=e("git",["rev-parse","--abbrev-ref","HEAD"],r);if(n.status!==0)return{kind:"error",reason:`cannot resolve current branch: ${n.stderr.trim()}`};const t=n.stdout.trim();if(t==="HEAD")return{kind:"error",reason:"detached HEAD; run `borg assimilate` to adopt a wt- branch first"};const f=e("git",["fetch","origin","--prune"],r);if(f.status!==0)return{kind:"error",reason:`git fetch origin failed: ${f.stderr.trim()}`};const a=x(e,r,t);if(t.startsWith("wt-"))return{kind:"on-wt",branch:t,wtBranch:t};if(t==="main"||t==="master")return{kind:"on-main",branch:t,wtBranch:a};if(A(e,r,"HEAD",c))return{kind:"feature-merged",branch:t,wtBranch:a};const l=e("git",["merge-base","HEAD",c],r),m=l.status===0?l.stdout.trim():"",w=e("git",["rev-list","--count",`${m}..${c}`],r),$=parseInt(w.stdout.trim(),10)||0;return{kind:"feature-mid-sprint",branch:t,wtBranch:a,commits:$}}async function O(i={},e={prune:!1}){const u={...W,...i},{runSync:r,cwd:d,stderr:s,stdout:n}=u,t=E(u);if(t.kind==="error")return s(o.red(`\u25FC borg sync: ${t.reason}
-`)),1;if(t.kind==="dirty"){s(o.yellow(`\u25FC Working tree has uncommitted changes.
-`));for(const a of t.files.slice(0,5))s(o.gray(`  ${a}
-`));return t.files.length>5&&s(o.gray(`  ... and ${t.files.length-5} more
-`)),s(o.yellow("\u25FC Commit, stash, or restore before running `borg sync`. Nothing was changed.\n")),1}if(t.kind==="on-wt"){const a=k(r,d(),t.wtBranch,c);return a.action==="fast-forwarded"?(n(o.blue(`\u25FC On \`${t.wtBranch}\`; fast-forwarded to ${c}.
-`)),0):a.action==="already-current"?(n(o.blue(`\u25FC On \`${t.wtBranch}\`; up to date with ${c}.
-`)),0):(s(o.yellow(`\u25FC ${a.message??"sync skipped"}.
-`)),1)}if(t.kind==="on-main")return h(t.wtBranch,r,d,n,s);if(t.kind==="feature-mid-sprint"){if(t.commits===0)return n(o.blue(`\u25FC On \`${t.branch}\` (feature branch); up to date with ${c}.
-`)),n(o.gray(`\u25FC Continue your sprint, or post REVIEW-READY when complete.
-`)),0;const a=r("git",["merge","--no-edit",c],d());return a.status!==0?(s(o.red(`\u25FC borg sync: git merge ${c} failed (likely conflict). Resolve manually:
-${a.stderr.trim()}
-`)),1):(n(o.blue(`\u25FC On \`${t.branch}\`; merged ${t.commits} commit${t.commits===1?"":"s"} from ${c} (no rebase).
-`)),n(o.gray(`\u25FC Re-run tests; continue your sprint.
-`)),0)}if(t.kind==="feature-merged"){const a=t.branch,l=h(t.wtBranch,r,d,n,s,{adoptedPrefix:`\u25FC \`${a}\` is merged into ${c};`});if(l!==0)return l;const m=v(r,d(),a,c,{prune:e.prune});return m.action==="pruned"?n(o.blue(`\u25FC Pruned merged branch \`${a}\`.
-`)):m.action==="announced"&&n(o.gray(`\u25FC ${m.message}
-`)),0}const f=t;return s(o.red(`\u25FC borg sync: unhandled state
-`)),1}function h(i,e,u,r,d,s={}){const n=b(e,u(),i,c);return n.action==="adopted"?(s.adoptedPrefix?r(o.blue(`${s.adoptedPrefix} switched to \`${i}\` at ${c}.
-`)):r(o.blue(`\u25FC On \`${i}\` at ${c}.
-`)),0):(d(o.yellow(`\u25FC borg sync: ${n.message??"not adopted"}. Nothing was changed.
-`)),1)}function P(i){let e=!1;for(const u of i)if(u==="--prune")e=!0;else return{ok:!1,error:`unexpected argument: ${u}. Usage: borg sync [--prune]`};return{ok:!0,options:{prune:e}}}export{E as detectState,P as parseSyncArgs,x as resolveWtBranch,O as runSync};
+/**
+ * `borg sync` — worktree lifecycle management subcommand (gh#33).
+ *
+ * Reconciled to the per-worktree `wt-<suffix>` branch model (PR-B,
+ * ruling ea643b33). Replaces the previous main-centric semantics
+ * ("idle = on main"; "post-merge = checkout main") — under the approved
+ * gh#33 model `main` is NEVER a working branch in any worktree; it is
+ * purely the integration target. Every worktree works on a named
+ * `wt-<suffix>` branch and `borg sync` keeps it current with
+ * origin/main, returns to it after a feature branch merges, and absorbs
+ * upstream into an in-progress feature branch — never touching `main`
+ * as a checkout.
+ *
+ * All git mutation/decision logic is delegated to
+ * `src/worktree-lifecycle.ts` (the seam PR-A added:
+ * `adoptWorktree`, `syncWorktree`, `cleanupMerged`, `isMerged`,
+ * `localBranchExists`) so the never-discard guards (dirty / unmerged
+ * HEAD / unmerged target wt- branch) and the args-array subprocess
+ * shape are shared, not duplicated.
+ *
+ * Lifecycle states:
+ *   1. dirty             — uncommitted changes; refuse (never discard).
+ *   2. on-wt             — on the per-worktree `wt-<suffix>` branch;
+ *                          fast-forward it to origin/main (ff-only).
+ *   3. on-main           — on `main`/`master` (or detached at a merged
+ *                          point); adopt the `wt-<suffix>` branch
+ *                          (Q4: main is never a working branch).
+ *   4. feature-mid-sprint — on a feature branch not yet merged; absorb
+ *                          origin/main into it via `git merge --no-edit`
+ *                          (no rebase — cube workflow rule (a)) when
+ *                          origin/main advanced; else no-op.
+ *   5. feature-merged    — on a feature branch fully merged into
+ *                          origin/main; return to `wt-<suffix>` and
+ *                          ANNOUNCE the prunable feature branch (prune
+ *                          only with `--prune`, Q3).
+ *
+ * Anti-features (intentional, unchanged):
+ *   - No auto-stash / auto-commit / auto-discard on dirty tree.
+ *   - No force-push, no rebase, no --force-with-lease.
+ *   - No remote-branch deletion (Coordinator owns merge actions).
+ *   - Local feature-branch deletion only on explicit `--prune` (Q3).
+ */
+import { spawnSync } from 'node:child_process';
+import { basename } from 'node:path';
+import chalk from 'chalk';
+import { adoptWorktree, syncWorktree, cleanupMerged, isMerged, perWorktreeBranchName, } from './worktree-lifecycle.js';
+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 ?? '',
+        };
+    },
+    cwd: () => process.cwd(),
+    stderr: (line) => process.stderr.write(line),
+    stdout: (line) => process.stdout.write(line),
+};
+const DEFAULT_BRANCH = 'origin/main';
+// ------------------------------------------------------------------
+// wt- branch resolution
+// ------------------------------------------------------------------
+/**
+ * Resolve the per-worktree `wt-` branch for the current checkout,
+ * DETERMINISTICALLY per worktree.
+ *
+ *   - current branch is already `wt-*` → that is the branch.
+ *   - otherwise → derive `wt-<suffix>` from THIS worktree's directory
+ *     basename minus the main worktree's (repo) basename prefix — the
+ *     same `perWorktreeBranchName` derivation the spawn path uses, so
+ *     the name matches what `borg assimilate --worktree` created.
+ *
+ * This must NOT list `git branch --list wt-*`: in linked worktrees the
+ * local branch namespace is SHARED across all siblings (gh#33 CR-v2
+ * blocker 32bc45da), so every drone's `wt-` branch is visible and a
+ * "single match" heuristic is never satisfied in a real multi-drone
+ * cube. The directory-derivation is unique per worktree and never
+ * ambiguous. The first `worktree <path>` line of
+ * `git worktree list --porcelain` is the main worktree (the repo dir);
+ * its basename is the prefix to strip. For an independent clone the
+ * main worktree IS this worktree, so the prefix == basename and the
+ * result is `wt-<basename>` (no strip) — consistent with PR-A's
+ * in-place adoption.
+ */
+export function resolveWtBranch(runSync, cwd, currentBranch) {
+    if (currentBranch.startsWith('wt-'))
+        return currentBranch;
+    const top = runSync('git', ['rev-parse', '--show-toplevel'], cwd);
+    const thisDir = top.status === 0 ? top.stdout.trim() : cwd;
+    const wtList = runSync('git', ['worktree', 'list', '--porcelain'], cwd);
+    let mainDir = thisDir;
+    if (wtList.status === 0) {
+        const firstWorktreeLine = wtList.stdout
+            .split('\n')
+            .find((l) => l.startsWith('worktree '));
+        if (firstWorktreeLine)
+            mainDir = firstWorktreeLine.slice('worktree '.length).trim();
+    }
+    return perWorktreeBranchName(basename(thisDir), basename(mainDir));
+}
+/**
+ * Detect the worktree's lifecycle state. Read-only except for the
+ * `git fetch origin --prune` needed to measure against the latest tip.
+ */
+export function detectState(deps) {
+    const { runSync, cwd } = deps;
+    const cwdValue = cwd();
+    // (1) git repo?
+    if (runSync('git', ['rev-parse', '--show-toplevel'], cwdValue).status !== 0) {
+        return { kind: 'error', reason: `not in a git repository (cwd: ${cwdValue})` };
+    }
+    // (2) dirty FIRST — never act on uncommitted changes.
+    const status = runSync('git', ['status', '--porcelain'], cwdValue);
+    if (status.status !== 0) {
+        return { kind: 'error', reason: `git status failed: ${status.stderr.trim()}` };
+    }
+    const dirty = status.stdout.split('\n').map((l) => l.trim()).filter((l) => l.length > 0);
+    if (dirty.length > 0)
+        return { kind: 'dirty', files: dirty };
+    // (3) current branch.
+    const branchProbe = runSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], cwdValue);
+    if (branchProbe.status !== 0) {
+        return { kind: 'error', reason: `cannot resolve current branch: ${branchProbe.stderr.trim()}` };
+    }
+    const branch = branchProbe.stdout.trim();
+    if (branch === 'HEAD') {
+        return { kind: 'error', reason: 'detached HEAD; run `borg assimilate` to adopt a wt- branch first' };
+    }
+    // (4) fetch — fatal on failure (can't reason about lifecycle offline).
+    const fetch = runSync('git', ['fetch', 'origin', '--prune'], cwdValue);
+    if (fetch.status !== 0) {
+        return { kind: 'error', reason: `git fetch origin failed: ${fetch.stderr.trim()}` };
+    }
+    const wtBranch = resolveWtBranch(runSync, cwdValue, branch);
+    // (5) on the per-worktree wt- branch.
+    if (branch.startsWith('wt-')) {
+        return { kind: 'on-wt', branch, wtBranch: branch };
+    }
+    // (6) on main/master — Q4: never a working branch; adopt wt-.
+    if (branch === 'main' || branch === 'master') {
+        return { kind: 'on-main', branch, wtBranch };
+    }
+    // (7) feature branch — merged vs mid-sprint.
+    // ASSUMPTION (gh#33 CR NIT 0e19637a): merged-detection keys off commit
+    // ancestry (`isMerged` = HEAD is an ancestor of origin/main), which
+    // holds for merge-commit / fast-forward integration. A squash- or
+    // rebase-merged PR leaves the feature tip a NON-ancestor → it would
+    // classify here as mid-sprint, not merged. That degrades safely
+    // (merge-back of origin/main, no discard), and this cube integrates
+    // via merge commits, so it is not triggered. If squash-merge is ever
+    // adopted, switch this to PR-merged-state detection.
+    if (isMerged(runSync, cwdValue, 'HEAD', DEFAULT_BRANCH)) {
+        return { kind: 'feature-merged', branch, wtBranch };
+    }
+    // not merged → mid-sprint. Count how far origin/main advanced past the
+    // merge-base so the message can report it (0 → no-op).
+    const mergeBase = runSync('git', ['merge-base', 'HEAD', DEFAULT_BRANCH], cwdValue);
+    const base = mergeBase.status === 0 ? mergeBase.stdout.trim() : '';
+    const count = runSync('git', ['rev-list', '--count', `${base}..${DEFAULT_BRANCH}`], cwdValue);
+    const commits = parseInt(count.stdout.trim(), 10) || 0;
+    return { kind: 'feature-mid-sprint', branch, wtBranch, commits };
+}
+// ------------------------------------------------------------------
+// Orchestrator
+// ------------------------------------------------------------------
+export async function runSync(deps = {}, opts = { prune: false }) {
+    const merged = { ...defaultDeps, ...deps };
+    const { runSync: run, cwd, stderr, stdout } = merged;
+    const state = detectState(merged);
+    if (state.kind === 'error') {
+        stderr(chalk.red(`◼ borg sync: ${state.reason}\n`));
+        return 1;
+    }
+    if (state.kind === 'dirty') {
+        stderr(chalk.yellow(`◼ Working tree has uncommitted changes.\n`));
+        for (const line of state.files.slice(0, 5))
+            stderr(chalk.gray(`  ${line}\n`));
+        if (state.files.length > 5)
+            stderr(chalk.gray(`  ... and ${state.files.length - 5} more\n`));
+        stderr(chalk.yellow(`◼ Commit, stash, or restore before running \`borg sync\`. Nothing was changed.\n`));
+        return 1;
+    }
+    // on-wt: fast-forward the per-worktree branch to origin/main (ff-only,
+    // clean-gated, never merge/rebase). Delegates to syncWorktree.
+    if (state.kind === 'on-wt') {
+        const res = syncWorktree(run, cwd(), state.wtBranch, DEFAULT_BRANCH);
+        if (res.action === 'fast-forwarded') {
+            stdout(chalk.blue(`◼ On \`${state.wtBranch}\`; fast-forwarded to ${DEFAULT_BRANCH}.\n`));
+            return 0;
+        }
+        if (res.action === 'already-current') {
+            stdout(chalk.blue(`◼ On \`${state.wtBranch}\`; up to date with ${DEFAULT_BRANCH}.\n`));
+            return 0;
+        }
+        // skipped-diverged: the wt- branch has local commits not on origin/main.
+        stderr(chalk.yellow(`◼ ${res.message ?? 'sync skipped'}.\n`));
+        return 1;
+    }
+    // on-main: adopt the wt- branch (Q4 — move off main). adoptWorktree
+    // applies the dirty / unmerged-HEAD / unmerged-target guards.
+    if (state.kind === 'on-main') {
+        return adoptAndReport(state.wtBranch, run, cwd, stdout, stderr);
+    }
+    // feature-mid-sprint: absorb origin/main into the feature branch (no
+    // rebase). Leaves the drone on the feature branch to keep working.
+    if (state.kind === 'feature-mid-sprint') {
+        if (state.commits === 0) {
+            stdout(chalk.blue(`◼ On \`${state.branch}\` (feature branch); up to date with ${DEFAULT_BRANCH}.\n`));
+            stdout(chalk.gray(`◼ Continue your sprint, or post REVIEW-READY when complete.\n`));
+            return 0;
+        }
+        const merge = run('git', ['merge', '--no-edit', DEFAULT_BRANCH], cwd());
+        if (merge.status !== 0) {
+            stderr(chalk.red(`◼ borg sync: git merge ${DEFAULT_BRANCH} failed (likely conflict). Resolve manually:\n${merge.stderr.trim()}\n`));
+            return 1;
+        }
+        stdout(chalk.blue(`◼ On \`${state.branch}\`; merged ${state.commits} commit${state.commits === 1 ? '' : 's'} from ${DEFAULT_BRANCH} (no rebase).\n`));
+        stdout(chalk.gray(`◼ Re-run tests; continue your sprint.\n`));
+        return 0;
+    }
+    // feature-merged: the PR merged. Return to the wt- branch (adopt) and
+    // announce the prunable feature branch (prune only with --prune, Q3).
+    if (state.kind === 'feature-merged') {
+        const feature = state.branch;
+        const code = adoptAndReport(state.wtBranch, run, cwd, stdout, stderr, {
+            adoptedPrefix: `◼ \`${feature}\` is merged into ${DEFAULT_BRANCH};`,
+        });
+        if (code !== 0)
+            return code; // adoption blocked (dirty/unmerged target) — don't prune
+        // Now on the wt- branch — safe to prune/announce the merged feature.
+        const cleanup = cleanupMerged(run, cwd(), feature, DEFAULT_BRANCH, { prune: opts.prune });
+        if (cleanup.action === 'pruned') {
+            stdout(chalk.blue(`◼ Pruned merged branch \`${feature}\`.\n`));
+        }
+        else if (cleanup.action === 'announced') {
+            stdout(chalk.gray(`◼ ${cleanup.message}\n`));
+        }
+        return 0;
+    }
+    // Exhaustiveness.
+    const _exhaustive = state;
+    stderr(chalk.red(`◼ borg sync: unhandled state\n`));
+    return 1;
+}
+/**
+ * Shared adopt-the-wt-branch path for the on-main + feature-merged
+ * states. Surfaces the never-discard outcomes; returns the process exit
+ * code (0 adopted, 1 blocked/ambiguous).
+ */
+function adoptAndReport(wtBranch, run, cwd, stdout, stderr, opts = {}) {
+    const res = adoptWorktree(run, cwd(), wtBranch, DEFAULT_BRANCH);
+    if (res.action === 'adopted') {
+        if (opts.adoptedPrefix) {
+            stdout(chalk.blue(`${opts.adoptedPrefix} switched to \`${wtBranch}\` at ${DEFAULT_BRANCH}.\n`));
+        }
+        else {
+            stdout(chalk.blue(`◼ On \`${wtBranch}\` at ${DEFAULT_BRANCH}.\n`));
+        }
+        return 0;
+    }
+    // skipped-dirty handled upstream (dirty state), but defensively surface.
+    stderr(chalk.yellow(`◼ borg sync: ${res.message ?? 'not adopted'}. Nothing was changed.\n`));
+    return 1;
+}
+/**
+ * Parse args after `borg sync`. Supports `--prune` (Q3: delete a merged
+ * feature branch after returning to the wt- branch). Rejects anything
+ * else to keep room for future flags.
+ */
+export function parseSyncArgs(rawArgs) {
+    let prune = false;
+    for (const arg of rawArgs) {
+        if (arg === '--prune') {
+            prune = true;
+        }
+        else {
+            return {
+                ok: false,
+                error: `unexpected argument: ${arg}. Usage: borg sync [--prune]`,
+            };
+        }
+    }
+    return { ok: true, options: { prune } };
+}
+//# sourceMappingURL=sync.js.map

package/dist/sync.js.map

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

package/dist/terminal-title.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-title.d.ts","sourceRoot":"","sources":["../src/terminal-title.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EACvD,YAAY,EAAE,MAAM,GACnB,MAAM,CAKR;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EACvD,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,MAAM,CAAC,WAA4B,GAC1C,MAAM,CASR"}

package/dist/terminal-title.js

@@ -1 +1,68 @@
-function n(e,r){return e?`borg \xB7 ${e.label} \xB7 ${e.cubeName}`:`borg \xB7 ${r}`}function o(e,r,t=process.stdout){const i=n(e,r);return t.isTTY&&t.write(`\x1B]0;${i}\x07`),i}export{n as composeTerminalTitle,o as setTerminalTitle};
+/**
+ * Terminal-title setter for borg drone sessions.
+ *
+ * Multiple Claude Code sessions across sibling worktrees are visually
+ * indistinguishable in Cmd-Tab / tab bars / Mission Control on macOS,
+ * and likewise on most Linux terminal emulators. Setting the terminal
+ * title via the OSC 0 / OSC 2 escape gives each window a free per-
+ * session identity.
+ *
+ * Format (Queen-specified):
+ *   - Assimilated drone session: `borg · <label> · <cubeName>`
+ *   - Unassimilated session:     `borg · <repo-basename>`
+ *
+ * Why OSC 0 (`\x1b]0;…\x07`): sets both window title AND icon name on
+ * most terminals. OSC 2 sets only window title; OSC 1 sets only icon
+ * name. OSC 0 is the maximally-portable choice — works in iTerm2,
+ * macOS Terminal, kitty, alacritty, ghostty, GNOME Terminal, xterm.
+ *
+ * Lifetime: the escape is emitted once, before spawning Claude Code.
+ * Claude Code itself does not set its own window title (verified
+ * 2026-05-11), so the borg-set title persists for the whole session.
+ *
+ * Limitations (acceptable for v1; flagged for future):
+ *   - Title doesn't update mid-session on `borg_assimilate`. The
+ *     borgmcp client process can't write the escape post-spawn
+ *     because stdio is owned by Claude Code at that point (and stdio
+ *     to Claude is JSON-RPC — terminal escapes would be parsed as
+ *     invalid messages).
+ *   - Falls back to repo-basename for the unassimilated case; loses
+ *     drone identity until the cube is joined. Typical pattern is
+ *     "drone has been around long enough that cubes.json is already
+ *     populated," so the assimilated path is the common case.
+ */
+/**
+ * Pure: compose the title string for a session. Exported so tests can
+ * exercise every branch without TTY / process / fs dependencies.
+ *
+ * @param activeDrone — `{label, cubeName}` if this project is
+ *   assimilated to a cube, null otherwise.
+ * @param repoBasename — fallback identity for the unassimilated case
+ *   (typically `basename(process.cwd())`).
+ */
+export function composeTerminalTitle(activeDrone, repoBasename) {
+    if (activeDrone) {
+        return `borg · ${activeDrone.label} · ${activeDrone.cubeName}`;
+    }
+    return `borg · ${repoBasename}`;
+}
+/**
+ * Side-effecting: emit the OSC 0 escape to stdout, but only if stdout
+ * is a TTY. When stdout is piped (CI, redirection, scripted
+ * invocation), emitting the raw escape would pollute the captured
+ * output without doing anything useful — so we no-op.
+ *
+ * Returns the title string that WOULD have been emitted, regardless of
+ * TTY state, so callers can log it independently for diagnostics.
+ */
+export function setTerminalTitle(activeDrone, repoBasename, stdout = process.stdout) {
+    const title = composeTerminalTitle(activeDrone, repoBasename);
+    if (stdout.isTTY) {
+        // OSC 0: ESC ] 0 ; <title> BEL
+        // (BEL terminator is honored by all OSC-supporting terminals;
+        // ST = `ESC \` is an alternative but BEL has wider compat.)
+        stdout.write(`\x1b]0;${title}\x07`);
+    }
+    return title;
+}
+//# sourceMappingURL=terminal-title.js.map

package/dist/terminal-title.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-title.js","sourceRoot":"","sources":["../src/terminal-title.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,WAAuD,EACvD,YAAoB;IAEpB,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,UAAU,WAAW,CAAC,KAAK,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,UAAU,YAAY,EAAE,CAAC;AAClC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAC9B,WAAuD,EACvD,YAAoB,EACpB,SAA6B,OAAO,CAAC,MAAM;IAE3C,MAAM,KAAK,GAAG,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,+BAA+B;QAC/B,8DAA8D;QAC9D,4DAA4D;QAC5D,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/token-store.d.ts

@@ -1,27 +1,14 @@
 /**
- * gh#557 — token storage backends + selection.
+ * Local-server credential backend.
  *
- * config.ts exposes the public token API (storeIdToken/getIdToken/...). This
- * module supplies the interchangeable storage engines it sits on top of:
- *
- *   - KeychainBackend      — OS keychain via @napi-rs/keyring (the default;
- *                            real platform at-rest encryption).
- *   - EncryptedFileBackend — ~/.borg/credentials, all accounts in one
- *                            AES-256-GCM blob, file 0600 / dir 0700. Engages
- *                            only when no keychain is available. Obfuscation-
- *                            grade (see token-crypto.ts).
- *   - caller-managed       — BORG_TOKEN / BORG_TOKEN_FILE: an externally
- *                            supplied id_token, used read-only with no store
- *                            (the caller owns its lifecycle/freshness).
- *
- * Every engine takes its side-effecting dependencies (keyring entry factory,
- * fs, machine key) by injection so the logic is unit-tested without a real
- * keychain or disk.
+ * config.ts's local-server credential group sits on top of this. Storage is the
+ * 0600 file store (Queen rescope) — the OS keychain (@napi-rs/keyring) is GONE.
+ * The raw secret rests only in the 0600 file, parity with the server's own TLS
+ * private keys; there is no keychain and no obfuscation-grade fallback.
  */
-export type TokenBackendName = 'keychain' | 'encrypted-file';
+export type TokenBackendName = 'file';
 /**
- * Account-agnostic key/value store over a backing engine. `account` is one
- * of config.ts's three slots (id-token, refresh-token, expiry).
+ * Account-agnostic key/value store over the 0600 credential file.
  */
 export interface TokenBackend {
     readonly name: TokenBackendName;
@@ -30,97 +17,16 @@ export interface TokenBackend {
     delete(account: string): Promise<void>;
 }
 /**
- * The slice of @napi-rs/keyring's AsyncEntry this backend depends on. The
- * return types mirror AsyncEntry exactly (deletePassword resolves to an
- * implementation-defined value we ignore) so the real class is assignable.
- */
-export interface KeyringEntry {
-    setPassword(value: string): Promise<void>;
-    getPassword(): Promise<string | null | undefined>;
-    deletePassword(): Promise<unknown>;
-}
-export type KeyringEntryFactory = (account: string) => KeyringEntry;
-/**
- * Build the OS-keychain backend. Preserves config.ts's prior semantics:
- * a missing entry reads as null, and delete is silent on a NoEntry error
- * (idempotent clear) while other errors propagate (fail-loud).
- */
-export declare function makeKeychainBackend(entryFactory?: KeyringEntryFactory): TokenBackend;
-/** The minimal fs surface the file backend needs (injected for tests). */
-export interface FileStoreFs {
-    readFile(filePath: string): Promise<string>;
-    writeFile(filePath: string, data: string, mode: number): Promise<void>;
-    mkdir(dir: string, mode: number): Promise<void>;
-    /** Atomically move `from`→`to` (overwrites). Used for crash-safe writes. */
-    rename(from: string, to: string): Promise<void>;
-    /**
-     * Atomically create `lockPath` ONLY if it does not exist (O_EXCL). Resolves
-     * `true` if it was created (lock acquired) or `false` if it already existed
-     * (lock held by another process). This is the inter-process serialization
-     * primitive — no native dependency.
-     */
-    createExclusive(lockPath: string, content: string): Promise<boolean>;
-    /** Remove a file; silent if already gone (lock release + stale-lock steal). */
-    removeFile(filePath: string): Promise<void>;
-    /** Age in ms (now − mtime) of a file, or null if it does not exist. */
-    fileAgeMs(filePath: string): Promise<number | null>;
-}
-export interface EncryptedFileBackendDeps {
-    filePath: string;
-    key: Buffer;
-    fs: FileStoreFs;
-    /** Backoff between lock-acquire retries; defaults to a real setTimeout sleep. */
-    sleep?: (ms: number) => Promise<void>;
-    /** Monotonic clock for the acquire deadline; defaults to Date.now. */
-    now?: () => number;
-    /** Unique suffix for the write temp file; defaults to a random hex token. */
-    uniqueSuffix?: () => string;
-}
-/**
- * Build the encrypted-file backend. All accounts live in one JSON object
- * encrypted as a single AES-256-GCM envelope at `filePath`.
- *
- * A missing file reads as an empty map. A file that won't decrypt (wrong
- * machine key after a hostname change, truncation, tampering) is ALSO
- * treated as empty: the only consequence is the user re-runs `borg setup`,
- * which is the right fail-safe for credential material — a hard crash on a
- * corrupt dotfile would be worse UX than transparent re-auth.
+ * Build a TokenBackend over a single 0600 store file, all accounts held in one
+ * `{version, accounts}` map. get/set/delete read-modify-write the file via the
+ * seat-store's atomic 0600 writer — the RAW secret rests only in the 0600 file
+ * (parity with the server's TLS keys), never a keychain.
  *
- * gh#570 — concurrency + atomicity. Multiple `borg` processes (e.g. sibling
- * drone sessions on one host) can share `~/.borg/credentials`. Two fixes:
- *  - Anti-lost-update (load-bearing): `set`/`delete` serialize their whole
- *    read-modify-write cycle behind an O_EXCL lock file, so concurrent
- *    writers no longer each read a stale map and clobber each other.
- *  - Anti-corruption: every write goes to a unique temp file then `rename`s
- *    into place, so a reader (which is intentionally lock-FREE) always sees a
- *    complete old-or-new file, never a torn one.
- */
-export declare function makeEncryptedFileBackend(deps: EncryptedFileBackendDeps): TokenBackend;
-/** User-facing BORG_TOKEN_STORE values (friendlier than the backend names). */
-export type ForcedStore = 'keychain' | 'file';
-export interface SelectTokenBackendDeps {
-    keyringAvailable: () => Promise<boolean>;
-    makeKeychain: () => TokenBackend;
-    makeFile: () => TokenBackend;
-    /** BORG_TOKEN_STORE override: skip probing and force a backend. */
-    forced?: ForcedStore;
-}
-/**
- * Select the persistent backend: a forced choice (BORG_TOKEN_STORE=keychain|file)
- * wins and skips the probe; otherwise probe the keychain and fall back to the
- * encrypted file when it's unavailable.
- */
-export declare function selectTokenBackend(deps: SelectTokenBackendDeps): Promise<TokenBackend>;
-export interface CallerManagedDeps {
-    env: NodeJS.ProcessEnv;
-    readFile: (filePath: string) => Promise<string>;
-}
-/**
- * Resolve an externally-supplied id_token (no storage). BORG_TOKEN takes
- * precedence; otherwise BORG_TOKEN_FILE is read from disk. Returns null when
- * neither is configured. The value is trimmed (env vars and files commonly
- * carry trailing newlines). The caller owns this token's freshness, so it
- * bypasses the keychain AND the expiry check in config.ts.
+ * These ops are NON-flocking by design: the config layer holds the single store
+ * lock (withStoreLock over CREDENTIALS_LOCK) continuously across each
+ * read-compare-write, so nesting a second lock here would deadlock the O_EXCL
+ * lockfile. Pure reads (get) are safe lock-free because atomicWrite0600's rename
+ * guarantees a reader only ever sees a complete file.
  */
-export declare function readCallerManagedIdToken(deps: CallerManagedDeps): Promise<string | null>;
+export declare function makeFileBackend(filePath: string): TokenBackend;
 //# sourceMappingURL=token-store.d.ts.map

package/dist/token-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-store.d.ts","sourceRoot":"","sources":["../src/token-store.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEtC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC;AAID;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CA8D9D"}