borgmcp 0.9.36 → 0.9.38

package/dist/worktree-lifecycle.js

@@ -0,0 +1,173 @@
+/**
+ * gh#33 — worktree lifecycle as product behavior.
+ *
+ * Pure git-decision helpers behind an injected `runSync` seam (matching
+ * the `AssimilateDeps.runSync` shape), so every branch is unit-testable
+ * without a live repo. This module DECIDES + emits git command sequences;
+ * it never launches agents and never touches the cube API.
+ *
+ * Design spec: docs/superpowers/specs/2026-05-29-worktree-lifecycle-design.md
+ * Q-resolutions baked in (SPEC-APPROVED 3a80412d):
+ *   Q1 branch naming  — `wt-<suffix>` prefix-stripped, full-basename fallback.
+ *   Q2 idle-sync      — ff-only, clean-gated; never merge/rebase; never over dirty.
+ *   Q3 post-merge     — auto-return to wt-<basename>; ANNOUNCE the prunable
+ *                       merged branch, prune only when explicitly requested.
+ *   Q4 uniform        — no primary-worktree carve-out; main is never a working branch.
+ */
+/**
+ * Per-worktree branch name (Q1). Strips the repo basename prefix from the
+ * worktree dir basename for readability (`borg-mcp-codex-builder` ->
+ * `wt-codex-builder`); falls back to the full dir basename when there is
+ * no shared prefix (`myrepo-feature` under repo `otherrepo` ->
+ * `wt-myrepo-feature`).
+ */
+export function perWorktreeBranchName(worktreeBasename, repoBasename) {
+    const prefix = `${repoBasename}-`;
+    const suffix = worktreeBasename.startsWith(prefix)
+        ? worktreeBasename.slice(prefix.length)
+        : worktreeBasename;
+    return `wt-${suffix}`;
+}
+/** True iff the working tree is clean (`git status --porcelain` empty). */
+export function isCleanTree(runSync, cwd) {
+    const r = runSync('git', ['status', '--porcelain'], cwd);
+    return r.status === 0 && r.stdout.trim() === '';
+}
+const LOCAL_CONFIG_RE = /^\.claude\//;
+/**
+ * Classify a dirty tree into staged / unstaged / untracked buckets, and
+ * flag local-config files separately. The STAGED bucket is load-bearing:
+ * the live UNBLOCK case (b15894be) had a *staged* leftover diff that
+ * blocked `pull --ff-only`, which an unstaged-only check would miss.
+ */
+export function classifyDirty(runSync, cwd) {
+    const r = runSync('git', ['status', '--porcelain'], cwd);
+    const out = { staged: [], unstaged: [], untracked: [], localConfig: [] };
+    if (r.status !== 0)
+        return out;
+    for (const line of r.stdout.split('\n')) {
+        if (!line.trim())
+            continue;
+        const path = line.slice(3);
+        if (line.startsWith('??')) {
+            out.untracked.push(path);
+        }
+        else {
+            const x = line[0]; // staged (index) column
+            const y = line[1]; // unstaged (work-tree) column
+            if (x !== ' ' && x !== '?')
+                out.staged.push(path);
+            if (y !== ' ' && y !== '?')
+                out.unstaged.push(path);
+        }
+        if (LOCAL_CONFIG_RE.test(path))
+            out.localConfig.push(path);
+    }
+    return out;
+}
+/** True iff `branch` is an ancestor of `ref` — i.e. a clean fast-forward target. */
+export function isFastForward(runSync, cwd, branch, ref) {
+    return runSync('git', ['merge-base', '--is-ancestor', branch, ref], cwd).status === 0;
+}
+/** True iff `branch`'s tip is an ancestor of `ref` — i.e. fully merged into it. */
+export function isMerged(runSync, cwd, branch, ref) {
+    return runSync('git', ['merge-base', '--is-ancestor', branch, ref], cwd).status === 0;
+}
+/**
+ * Idle-sync the current per-worktree branch to `ref` (Q2). NEVER discards
+ * work: dirty -> skipped-dirty (no mutation). Only fast-forwards (no
+ * merge/rebase): diverged -> skipped-diverged. The caller fetches first.
+ *
+ * `already-current` when the branch tip already equals `ref` (the common
+ * no-op case on every launch).
+ */
+export function syncWorktree(runSync, cwd, branch, ref) {
+    if (!isCleanTree(runSync, cwd)) {
+        return {
+            action: 'skipped-dirty',
+            message: 'uncommitted changes present; sync skipped (nothing discarded)',
+        };
+    }
+    if (!isFastForward(runSync, cwd, branch, ref)) {
+        return {
+            action: 'skipped-diverged',
+            message: `${branch} has diverged from ${ref}; resolve manually (no auto-merge/rebase)`,
+        };
+    }
+    // Already at ref? merge --ff-only is a no-op but we report it distinctly
+    // so callers can stay quiet on the common case.
+    const ahead = runSync('git', ['rev-list', '--count', `${branch}..${ref}`], cwd);
+    if (ahead.status === 0 && ahead.stdout.trim() === '0') {
+        return { action: 'already-current' };
+    }
+    const ff = runSync('git', ['merge', '--ff-only', ref], cwd);
+    if (ff.status !== 0) {
+        return { action: 'skipped-diverged', message: 'ff-only merge unexpectedly failed' };
+    }
+    return { action: 'fast-forwarded' };
+}
+/** True iff a local branch named `branch` already exists. */
+export function localBranchExists(runSync, cwd, branch) {
+    return runSync('git', ['rev-parse', '--verify', '--quiet', `refs/heads/${branch}`], cwd).status === 0;
+}
+/**
+ * Migration (Q4/Q5/§4.5): bring a detached/stale worktree onto
+ * `wt-<basename>` at `ref`. Idempotent: re-running on an already-adopted
+ * clean worktree is a lossless reset to `ref`. Never discards:
+ *   - dirty work tree            -> skipped-dirty (surface)
+ *   - current HEAD unmerged      -> blocked-unmerged (surface)
+ *   - TARGET `branch` exists with commits not on `ref` -> blocked-target-
+ *     unmerged (surface). This is load-bearing: the switch uses `-C`
+ *     (force-create/reset), which would ORPHAN commits on a pre-existing
+ *     `wt-` branch. The HEAD-merged check alone misses this when the
+ *     target branch != HEAD (e.g. on `main` while a prior `wt-x` holds
+ *     committed-but-unmerged work). gh#33 CR-v2 blocker 078d1630.
+ */
+export function adoptWorktree(runSync, cwd, branch, ref) {
+    if (!isCleanTree(runSync, cwd)) {
+        return {
+            action: 'skipped-dirty',
+            message: 'uncommitted changes present; not switching (nothing discarded)',
+        };
+    }
+    if (!isMerged(runSync, cwd, 'HEAD', ref)) {
+        return {
+            action: 'blocked-unmerged',
+            message: `current HEAD has commits not on ${ref}; commit/push or set aside before adopting`,
+        };
+    }
+    // Guard the TARGET branch ref before the `switch -C` force-reset. If
+    // `branch` already exists and is NOT an ancestor of `ref`, it carries
+    // committed-unmerged work that `-C` would discard — block instead.
+    // (Absent, or an ancestor of `ref` = a clean reset target → proceed.)
+    if (localBranchExists(runSync, cwd, branch) && !isMerged(runSync, cwd, branch, ref)) {
+        return {
+            action: 'blocked-target-unmerged',
+            message: `branch ${branch} exists with commits not on ${ref}; resolve before adopting (a force-switch would discard them)`,
+        };
+    }
+    runSync('git', ['switch', '-C', branch, ref], cwd);
+    return { action: 'adopted' };
+}
+/**
+ * Post-merge cleanup (Q3): when `feature` is fully merged into `ref`,
+ * either ANNOUNCE it as prunable (default) or actually prune it with the
+ * safe `git branch -d` (which itself refuses to delete an unmerged
+ * branch — defense in depth against a stale local ref). Unmerged ->
+ * not-merged (never touched).
+ */
+export function cleanupMerged(runSync, cwd, feature, ref, opts = { prune: false }) {
+    if (!isMerged(runSync, cwd, feature, ref)) {
+        return { action: 'not-merged', branch: feature };
+    }
+    if (!opts.prune) {
+        return {
+            action: 'announced',
+            branch: feature,
+            message: `${feature} is merged into ${ref} and can be pruned: \`git branch -d ${feature}\` (or re-run with --prune)`,
+        };
+    }
+    runSync('git', ['branch', '-d', feature], cwd);
+    return { action: 'pruned', branch: feature };
+}
+//# sourceMappingURL=worktree-lifecycle.js.map

package/dist/worktree-lifecycle.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "0.9.36",
+  "version": "0.9.38",
   "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code and Codex. Create projects, assign roles, and share a live activity log.",
   "type": "module",
   "main": "dist/index.js",