borgmcp 0.9.35 → 0.9.37

package/dist/roster-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"roster-render.js","sourceRoot":"","sources":["../src/roster-render.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AA8BH,MAAM,UAAU,YAAY,CAAC,MAA0B;IACrD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC/C,KAAK,MAAM,CAAC,IAAI,KAAK;QAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;IAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,IAAI,aAAa,EAAE,CAAC;QAClB,kEAAkE;QAClE,sDAAsD;QACtD,KAAK,CAAC,IAAI,CACR,yBAAyB,aAAa,KAAK,QAAQ,CACjD,aAAa,CACd,gEAAgE,CAClE,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,SAAS,CAAC;QACzC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,aAAa,EAAE,CAAC;YAClB,kEAAkE;YAClE,8DAA8D;YAC9D,6DAA6D;YAC7D,4DAA4D;YAC5D,yDAAyD;YACzD,8CAA8C;YAC9C,EAAE;YACF,iEAAiE;YACjE,6DAA6D;YAC7D,gEAAgE;YAChE,6DAA6D;YAC7D,8DAA8D;YAC9D,6DAA6D;YAC7D,qBAAqB;YACrB,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;YACtC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/C,KAAK,CAAC,IAAI,CACR,OAAO,CAAC,CAAC,KAAK,OAAO,QAAQ,iBAAiB,QAAQ,MAAM,MAAM,EAAE,CACrE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CACR,OAAO,CAAC,CAAC,KAAK,OAAO,QAAQ,iBAAiB,QAAQ,EAAE,CACzD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"roster-render.js","sourceRoot":"","sources":["../src/roster-render.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAoCH,MAAM,UAAU,YAAY,CAAC,MAA0B;IACrD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC/C,KAAK,MAAM,CAAC,IAAI,KAAK;QAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;IAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,IAAI,aAAa,EAAE,CAAC;QAClB,kEAAkE;QAClE,sDAAsD;QACtD,KAAK,CAAC,IAAI,CACR,yBAAyB,aAAa,KAAK,QAAQ,CACjD,aAAa,CACd,gEAAgE,CAClE,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,SAAS,CAAC;QACzC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3E,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,aAAa,EAAE,CAAC;YAClB,kEAAkE;YAClE,8DAA8D;YAC9D,6DAA6D;YAC7D,4DAA4D;YAC5D,yDAAyD;YACzD,8CAA8C;YAC9C,EAAE;YACF,iEAAiE;YACjE,6DAA6D;YAC7D,gEAAgE;YAChE,6DAA6D;YAC7D,8DAA8D;YAC9D,6DAA6D;YAC7D,qBAAqB;YACrB,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;YACtC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/C,KAAK,CAAC,IAAI,CACR,OAAO,CAAC,CAAC,KAAK,OAAO,SAAS,iBAAiB,QAAQ,MAAM,MAAM,EAAE,CACtE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CACR,OAAO,CAAC,CAAC,KAAK,OAAO,SAAS,iBAAiB,QAAQ,EAAE,CAC1D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}

package/dist/sync.d.ts

@@ -1,61 +1,54 @@
 /**
  * `borg sync` — worktree lifecycle management subcommand (gh#33).
  *
- * Detects the current state of the operator's git worktree and either
- * advances it (fast-forward main, merge origin/main into a feature
- * branch, switch to main after a feature branch was merged + deleted
- * on origin) or refuses cleanly (dirty tree, network failure).
+ * 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.
  *
- * Five lifecycle states:
- *   1. dirty            — uncommitted changes present; refuse + tell
- *                         operator to commit/stash/restore first.
- *   2. idle             — on main, clean, up-to-date with origin/main
- *                         (or fast-forwarded). Nothing to sync.
- *   3. mid-sprint-noop  — on a feature branch; origin/main has not
- *                         advanced since the branch's merge base.
- *                         Nothing to do.
- *   4. mid-sprint-merge — on a feature branch; origin/main advanced.
- *                         Merge origin/main into the feature branch
- *                         (no rebase, per cube workflow rule (a)).
- *   5. post-merge       — on a local branch whose remote was deleted
- *                         (typical post-PR-merge state); switch to
- *                         main and pull. Local merged branch is left
- *                         intact for the operator to delete manually.
+ * All git mutation/decision logic is delegated to
+ * `client/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.
  *
- * The subcommand mirrors `borg spawn`'s dependency-injection shape so
- * tests can stub every external interaction (git, filesystem, output).
+ * 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):
- *   - No auto-stash, no auto-commit, no auto-discard on dirty tree.
- *     Fail-loud per cube discipline.
- *   - No force-push, no rebase, no --force-with-lease (cube rules a, b).
- *   - No local-branch deletion (operator decides; sync just announces).
- *   - No remote-branch deletion (Coordinator owns merge actions, not
- *     this subcommand).
+ * 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).
  */
-export type SyncState = {
-    kind: 'dirty';
-    files: string[];
-} | {
-    kind: 'idle';
-    branch: string;
-    head: string;
-} | {
-    kind: 'mid-sprint-noop';
-    branch: string;
-    head: string;
-} | {
-    kind: 'mid-sprint-merge';
-    branch: string;
-    commits: number;
-} | {
-    kind: 'post-merge';
-    branch: string;
-    mergedSha: string;
-};
+import { type RunSync } from './worktree-lifecycle.js';
+export interface SpawnSyncResult {
+    status: number | null;
+    stdout: string;
+    stderr: string;
+}
 export interface SyncDeps {
     /** Synchronous spawn — used for `git ...` invocations. */
-    runSync?: (cmd: string, args: string[], cwd?: string) => SpawnSyncResult;
+    runSync?: RunSync;
     /** Inject for tests; defaults to `process.cwd()`. */
     cwd?: () => string;
     /** stderr sink — overridable for tests. */
@@ -63,37 +56,74 @@ export interface SyncDeps {
     /** stdout sink — overridable for tests. */
     stdout?: (line: string) => void;
 }
-export interface SpawnSyncResult {
-    status: number | null;
-    stdout: string;
-    stderr: string;
+export interface SyncOptions {
+    /** Q3: prune a merged feature branch instead of only announcing it. */
+    prune: boolean;
 }
 /**
- * Detect the worktree's current lifecycle state. Read-only — performs
- * a `git fetch origin` before measuring so origin/main reflects the
- * latest remote tip.
+ * 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.
  *
- * Returns an error variant if the worktree is not a git repository
- * OR if the remote fetch fails.
+ * 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 declare function detectState(deps: Required<SyncDeps>): SyncState | {
+export declare function resolveWtBranch(runSync: RunSync, cwd: string, currentBranch: string): string;
+export type SyncState = {
+    kind: 'dirty';
+    files: string[];
+} | {
+    kind: 'on-wt';
+    branch: string;
+    wtBranch: string;
+} | {
+    kind: 'on-main';
+    branch: string;
+    wtBranch: string;
+} | {
+    kind: 'feature-mid-sprint';
+    branch: string;
+    wtBranch: string;
+    commits: number;
+} | {
+    kind: 'feature-merged';
+    branch: string;
+    wtBranch: string;
+} | {
     kind: 'error';
     reason: string;
 };
 /**
- * Run the `borg sync` flow. Returns the desired process exit code.
+ * Detect the worktree's lifecycle state. Read-only except for the
+ * `git fetch origin --prune` needed to measure against the latest tip.
  */
-export declare function runSync(deps?: SyncDeps): Promise<number>;
+export declare function detectState(deps: Required<SyncDeps>): SyncState;
+export declare function runSync(deps?: SyncDeps, opts?: SyncOptions): Promise<number>;
 export type ParseResult = {
     ok: true;
+    options: SyncOptions;
 } | {
     ok: false;
     error: string;
 };
 /**
- * Parse args passed after `borg sync`. No positional args, no flags
- * today; reject anything that looks like one to keep room for future
- * extensions (e.g., --dry-run).
+ * 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 declare function parseSyncArgs(rawArgs: string[]): ParseResult;
 //# sourceMappingURL=sync.d.ts.map

package/dist/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AASH,MAAM,MAAM,SAAS,GACjB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,WAAW,QAAQ;IACvB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,eAAe,CAAC;IACzE,qDAAqD;IACrD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,2CAA2C;IAC3C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAoBD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,GACvB,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAyG/C;AAMD;;GAEG;AACH,wBAAsB,OAAO,CAAC,IAAI,GAAE,QAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CA6HlE;AAMD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,CAM5D"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AAKH,OAAO,EAML,KAAK,OAAO,EACb,MAAM,yBAAyB,CAAC;AAMjC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,QAAQ;IACvB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qDAAqD;IACrD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,2CAA2C;IAC3C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,WAAW;IAC1B,uEAAuE;IACvE,KAAK,EAAE,OAAO,CAAC;CAChB;AAsBD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,GACpB,MAAM,CAaR;AAMD,MAAM,MAAM,SAAS,GACjB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACjF;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC5D;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS,CAgE/D;AAMD,wBAAsB,OAAO,CAAC,IAAI,GAAE,QAAa,EAAE,IAAI,GAAE,WAA8B,GAAG,OAAO,CAAC,MAAM,CAAC,CAiFxG;AAiCD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5F;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,CAa5D"}