borgmcp 0.7.7 → 0.8.0

package/dist/claude.d.ts

@@ -12,6 +12,8 @@
  *   borg setup          → Re-route to the setup wizard
  *   borg spawn <name>   → Create a sibling git worktree + launch a
  *                         fresh drone inside it (see spawn.ts)
+ *   borg sync           → Advance the current worktree across the 5
+ *                         lifecycle states (see sync.ts, gh#33)
  */
 export {};
 //# sourceMappingURL=claude.d.ts.map

package/dist/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;GAaG"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;GAeG"}

package/dist/claude.js

@@ -12,6 +12,8 @@
  *   borg setup          → Re-route to the setup wizard
  *   borg spawn <name>   → Create a sibling git worktree + launch a
  *                         fresh drone inside it (see spawn.ts)
+ *   borg sync           → Advance the current worktree across the 5
+ *                         lifecycle states (see sync.ts, gh#33)
  */
 import { spawn } from 'child_process';
 import { basename } from 'node:path';
@@ -19,6 +21,7 @@ import chalk from 'chalk';
 import { getActiveCube, inboxPathForDrone } from './cubes.js';
 import { handleVersionFlag } from './version.js';
 import { parseSpawnArgs, runSpawn } from './spawn.js';
+import { parseSyncArgs, runSync } from './sync.js';
 import { setTerminalTitle } from './terminal-title.js';
 async function main() {
     // Honor `--version` / `-v` before any other work.
@@ -37,6 +40,15 @@ async function main() {
         const code = await runSpawn(parsed.args);
         process.exit(code);
     }
+    if (process.argv[2] === 'sync') {
+        const parsed = parseSyncArgs(process.argv.slice(3));
+        if (!parsed.ok) {
+            process.stderr.write(chalk.red(`◼ borg sync: ${parsed.error}\n`));
+            process.exit(1);
+        }
+        const code = await runSync();
+        process.exit(code);
+    }
     // Forward any user-supplied flags (e.g. --resume <id>, --cwd, etc.) to
     // claude unchanged.
     //

package/dist/claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.js","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,KAAK,UAAU,IAAI;IACjB,kDAAkD;IAClD,iBAAiB,EAAE,CAAC;IAEpB,wBAAwB;IACxB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QAChC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YACnE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,uEAAuE;IACvE,oBAAoB;IACpB,EAAE;IACF,oEAAoE;IACpE,mEAAmE;IACnE,uEAAuE;IACvE,EAAE;IACF,mEAAmE;IACnE,sEAAsE;IACtE,mEAAmE;IACnE,oEAAoE;IACpE,qEAAqE;IACrE,4CAA4C;IAC5C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE9C,kEAAkE;IAClE,qEAAqE;IACrE,qEAAqE;IACrE,sEAAsE;IACtE,uDAAuD;IACvD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;IAErC,uDAAuD;IACvD,iEAAiE;IACjE,mEAAmE;IACnE,2DAA2D;IAC3D,gBAAgB,CACd,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EACnE,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CACxB,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM;QAC1B,CAAC,CAAC,sEAAsE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG;YACzH,4EAA4E;QAC9E,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,OAAO,GACX,iEAAiE;QACjE,qEAAqE;QACrE,sEAAsE;QACtE,qEAAqE;QACrE,gEAAgE;QAChE,kCAAkC;QAClC,aAAa;QACb,gEAAgE,CAAC;IAEnE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAEtD,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,eAAe,EAAE,OAAO,CAAC,EAAE;QACnE,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;QACvD,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC,CAAC;YACjE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,qCAAqC,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"claude.js","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"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"}

package/dist/remote-client.d.ts.map

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

package/dist/sync.d.ts

@@ -1,57 +1,99 @@
 /**
- * File sync logic with conflict detection
+ * `borg sync` — worktree lifecycle management subcommand (gh#33).
  *
- * Addresses consensus finding: Last-write-wins causes silent data loss
- * Solution: Track both local and remote timestamps, detect conflicts explicitly
- */
-import type { FileMetadata, ConflictInfo } from './types.js';
-/**
- * Calculate SHA-256 hash of file content
- */
-export declare function hashContent(content: string): string;
-/**
- * Load sync metadata from disk
- */
-export declare function loadMetadata(): Promise<FileMetadata | null>;
-/**
- * Save sync metadata to disk
- */
-export declare function saveMetadata(metadata: FileMetadata): Promise<void>;
-/**
- * Read local CLAUDE.md file
- */
-export declare function readLocalFile(): Promise<string | null>;
-/**
- * Write content to local CLAUDE.md file
- */
-export declare function writeLocalFile(content: string): Promise<void>;
-/**
- * Get local file modification time
- */
-export declare function getLocalMtime(): Promise<number | null>;
-/**
- * Detect if there's a sync conflict
+ * 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).
+ *
+ * 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.
  *
- * Conflict occurs when:
- * 1. Both local and remote have changed since last sync
- * 2. Changes are different (different content hashes)
+ * The subcommand mirrors `borg spawn`'s dependency-injection shape so
+ * tests can stub every external interaction (git, filesystem, output).
+ *
+ * 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).
  */
-export declare function detectConflict(localContent: string, remoteContent: string, metadata: FileMetadata | null): Promise<ConflictInfo | null>;
+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;
+};
+export interface SyncDeps {
+    /** Synchronous spawn — used for `git ...` invocations. */
+    runSync?: (cmd: string, args: string[], cwd?: string) => SpawnSyncResult;
+    /** Inject for tests; defaults to `process.cwd()`. */
+    cwd?: () => string;
+    /** stderr sink — overridable for tests. */
+    stderr?: (line: string) => void;
+    /** stdout sink — overridable for tests. */
+    stdout?: (line: string) => void;
+}
+export interface SpawnSyncResult {
+    status: number | null;
+    stdout: string;
+    stderr: string;
+}
 /**
- * Handle sync conflict by creating a conflict file
+ * Detect the worktree's current lifecycle state. Read-only — performs
+ * a `git fetch origin` before measuring so origin/main reflects the
+ * latest remote tip.
  *
- * Strategy: Create CLAUDE.md.conflict with remote content
- * Keep local file unchanged, let user resolve manually
+ * Returns an error variant if the worktree is not a git repository
+ * OR if the remote fetch fails.
  */
-export declare function handleConflict(conflict: ConflictInfo): Promise<void>;
+export declare function detectState(deps: Required<SyncDeps>): SyncState | {
+    kind: 'error';
+    reason: string;
+};
 /**
- * Determine sync action based on file states
- *
- * Returns: 'push' | 'pull' | 'conflict' | 'skip'
+ * Run the `borg sync` flow. Returns the desired process exit code.
  */
-export declare function determineSyncAction(localContent: string | null, remoteContent: string | null, metadata: FileMetadata | null): Promise<'push' | 'pull' | 'conflict' | 'skip'>;
+export declare function runSync(deps?: SyncDeps): Promise<number>;
+export type ParseResult = {
+    ok: true;
+} | {
+    ok: false;
+    error: string;
+};
 /**
- * Update metadata after successful sync
+ * 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).
  */
-export declare function updateMetadataAfterSync(content: string): Promise<void>;
+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;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK7D;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAUD;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAUjE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAGxE;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS5D;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAInE;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAU5D;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,YAAY,GAAG,IAAI,GAC5B,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgC9B;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAc1E;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,EAC5B,QAAQ,EAAE,YAAY,GAAG,IAAI,GAC5B,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC,CAkDhD;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS5E"}
+{"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"}

package/dist/sync.js

@@ -1,196 +1,240 @@
 /**
- * File sync logic with conflict detection
+ * `borg sync` — worktree lifecycle management subcommand (gh#33).
  *
- * Addresses consensus finding: Last-write-wins causes silent data loss
- * Solution: Track both local and remote timestamps, detect conflicts explicitly
- */
-import * as crypto from 'crypto';
-import * as fs from 'fs/promises';
-import * as path from 'path';
-import { homedir } from 'os';
-const METADATA_FILE = path.join(homedir(), '.borg-mcp', 'sync-metadata.json');
-const CLAUDE_MD_PATH = path.join(homedir(), '.claude', 'CLAUDE.md');
-/**
- * Calculate SHA-256 hash of file content
- */
-export function hashContent(content) {
-    return crypto.createHash('sha256').update(content, 'utf8').digest('hex');
-}
-/**
- * Ensure metadata directory exists
+ * 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).
+ *
+ * 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.
+ *
+ * The subcommand mirrors `borg spawn`'s dependency-injection shape so
+ * tests can stub every external interaction (git, filesystem, output).
+ *
+ * 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).
  */
-async function ensureMetadataDir() {
-    const dir = path.dirname(METADATA_FILE);
-    await fs.mkdir(dir, { recursive: true });
-}
+import { spawnSync } from 'node:child_process';
+import chalk from 'chalk';
+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),
+};
+// ------------------------------------------------------------------
+// State detection (pure of side effects beyond git reads)
+// ------------------------------------------------------------------
 /**
- * Load sync metadata from disk
+ * Detect the worktree's current lifecycle state. Read-only — performs
+ * a `git fetch origin` before measuring so origin/main reflects the
+ * latest remote tip.
+ *
+ * Returns an error variant if the worktree is not a git repository
+ * OR if the remote fetch fails.
  */
-export async function loadMetadata() {
-    try {
-        const data = await fs.readFile(METADATA_FILE, 'utf8');
-        return JSON.parse(data);
-    }
-    catch (error) {
-        if (error.code === 'ENOENT') {
-            return null; // File doesn't exist yet
-        }
-        throw error;
+export function detectState(deps) {
+    const { runSync, cwd } = deps;
+    const cwdValue = cwd();
+    // (1) Confirm we're in a git repo.
+    const topLevel = runSync('git', ['rev-parse', '--show-toplevel'], cwdValue);
+    if (topLevel.status !== 0) {
+        return {
+            kind: 'error',
+            reason: `not in a git repository (cwd: ${cwdValue})`,
+        };
     }
-}
-/**
- * Save sync metadata to disk
- */
-export async function saveMetadata(metadata) {
-    await ensureMetadataDir();
-    await fs.writeFile(METADATA_FILE, JSON.stringify(metadata, null, 2), 'utf8');
-}
-/**
- * Read local CLAUDE.md file
- */
-export async function readLocalFile() {
-    try {
-        return await fs.readFile(CLAUDE_MD_PATH, 'utf8');
+    // (2) Dirty-tree check FIRST so we never act on a worktree with
+    // uncommitted changes. `git status --porcelain` returns empty
+    // string when the worktree is clean; any line is a dirty file.
+    const status = runSync('git', ['status', '--porcelain'], cwdValue);
+    if (status.status !== 0) {
+        return {
+            kind: 'error',
+            reason: `git status failed: ${status.stderr.trim()}`,
+        };
     }
-    catch (error) {
-        if (error.code === 'ENOENT') {
-            return null; // File doesn't exist
-        }
-        throw error;
+    const dirtyLines = status.stdout
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((l) => l.length > 0);
+    if (dirtyLines.length > 0) {
+        return { kind: 'dirty', files: dirtyLines };
     }
-}
-/**
- * Write content to local CLAUDE.md file
- */
-export async function writeLocalFile(content) {
-    const dir = path.dirname(CLAUDE_MD_PATH);
-    await fs.mkdir(dir, { recursive: true });
-    await fs.writeFile(CLAUDE_MD_PATH, content, 'utf8');
-}
-/**
- * Get local file modification time
- */
-export async function getLocalMtime() {
-    try {
-        const stats = await fs.stat(CLAUDE_MD_PATH);
-        return stats.mtimeMs;
-    }
-    catch (error) {
-        if (error.code === 'ENOENT') {
-            return null;
-        }
-        throw error;
+    // (3) Current branch.
+    const branch = runSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], cwdValue);
+    if (branch.status !== 0) {
+        return {
+            kind: 'error',
+            reason: `cannot resolve current branch: ${branch.stderr.trim()}`,
+        };
     }
-}
-/**
- * Detect if there's a sync conflict
- *
- * Conflict occurs when:
- * 1. Both local and remote have changed since last sync
- * 2. Changes are different (different content hashes)
- */
-export async function detectConflict(localContent, remoteContent, metadata) {
-    // No conflict if no metadata (first sync)
-    if (!metadata) {
-        return null;
-    }
-    const localHash = hashContent(localContent);
-    const remoteHash = hashContent(remoteContent);
-    // No conflict if content is identical
-    if (localHash === remoteHash) {
-        return null;
-    }
-    // Check if both have changed since last sync
-    const localChanged = localHash !== metadata.lastSyncHash;
-    const remoteChanged = remoteHash !== metadata.lastSyncHash;
-    if (localChanged && remoteChanged) {
-        // CONFLICT: Both local and remote changed since last sync
-        const localMtime = await getLocalMtime();
+    const branchName = branch.stdout.trim();
+    if (branchName === 'HEAD') {
         return {
-            localContent,
-            remoteContent,
-            localMtime: localMtime || Date.now(),
-            remoteMtime: Date.now(), // Remote doesn't track mtime, use current time
+            kind: 'error',
+            reason: 'detached HEAD; cannot sync (checkout a branch first)',
         };
     }
-    // No conflict - only one side changed
-    return null;
-}
-/**
- * Handle sync conflict by creating a conflict file
- *
- * Strategy: Create CLAUDE.md.conflict with remote content
- * Keep local file unchanged, let user resolve manually
- */
-export async function handleConflict(conflict) {
-    const conflictPath = `${CLAUDE_MD_PATH}.conflict`;
-    // Write remote content to conflict file
-    await fs.writeFile(conflictPath, conflict.remoteContent, 'utf8');
-    // Log conflict to stderr for user visibility
-    console.error('\n◼ SYNC CONFLICT DETECTED');
-    console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n');
-    console.error('Both local and remote CLAUDE.md have been modified.');
-    console.error(`Local file:    ${CLAUDE_MD_PATH}`);
-    console.error(`Remote backup: ${conflictPath}\n`);
-    console.error('Please resolve manually by choosing one version or merging them.');
-    console.error('Delete the .conflict file once resolved.\n');
+    // (4) Fetch from origin so remote state is current. Failure here is
+    // fatal — we can't reason about lifecycle without a fresh remote
+    // view. --prune so the local view of remote-tracking branches
+    // reflects deletions on origin (load-bearing for post-merge state).
+    const fetch = runSync('git', ['fetch', 'origin', '--prune'], cwdValue);
+    if (fetch.status !== 0) {
+        return {
+            kind: 'error',
+            reason: `git fetch origin failed: ${fetch.stderr.trim()}`,
+        };
+    }
+    // (5) Current HEAD short sha.
+    const head = runSync('git', ['rev-parse', '--short', 'HEAD'], cwdValue);
+    const headSha = head.stdout.trim();
+    // (6) Branch-class detection.
+    if (branchName === 'main') {
+        return { kind: 'idle', branch: 'main', head: headSha };
+    }
+    // (7) Feature-branch sub-states. Check whether origin/<branch>
+    // still exists; if not, we're in post-merge state.
+    const remoteBranchProbe = runSync('git', ['rev-parse', '--verify', '--quiet', `refs/remotes/origin/${branchName}`], cwdValue);
+    if (remoteBranchProbe.status !== 0) {
+        return { kind: 'post-merge', branch: branchName, mergedSha: headSha };
+    }
+    // (8) Remote branch exists — check whether origin/main advanced past
+    // the merge-base with our feature branch.
+    const mergeBase = runSync('git', ['merge-base', 'HEAD', 'origin/main'], cwdValue);
+    if (mergeBase.status !== 0) {
+        return {
+            kind: 'error',
+            reason: `cannot compute merge-base with origin/main: ${mergeBase.stderr.trim()}`,
+        };
+    }
+    const mergeBaseSha = mergeBase.stdout.trim();
+    const originMainTip = runSync('git', ['rev-parse', 'origin/main'], cwdValue);
+    if (mergeBaseSha === originMainTip.stdout.trim()) {
+        return { kind: 'mid-sprint-noop', branch: branchName, head: headSha };
+    }
+    const commitCount = runSync('git', ['rev-list', '--count', `${mergeBaseSha}..origin/main`], cwdValue);
+    const n = parseInt(commitCount.stdout.trim(), 10) || 0;
+    return { kind: 'mid-sprint-merge', branch: branchName, commits: n };
 }
+// ------------------------------------------------------------------
+// State-action dispatcher (side-effecting)
+// ------------------------------------------------------------------
 /**
- * Determine sync action based on file states
- *
- * Returns: 'push' | 'pull' | 'conflict' | 'skip'
+ * Run the `borg sync` flow. Returns the desired process exit code.
  */
-export async function determineSyncAction(localContent, remoteContent, metadata) {
-    // Case 1: Neither exists - skip
-    if (!localContent && !remoteContent) {
-        return 'skip';
-    }
-    // Case 2: Only remote exists - pull
-    if (!localContent && remoteContent) {
-        return 'pull';
-    }
-    // Case 3: Only local exists - push
-    if (localContent && !remoteContent) {
-        return 'push';
-    }
-    // Case 4: Both exist - check for conflicts
-    if (localContent && remoteContent) {
-        const conflict = await detectConflict(localContent, remoteContent, metadata);
-        if (conflict) {
-            return 'conflict';
+export async function runSync(deps = {}) {
+    const merged = { ...defaultDeps, ...deps };
+    const { runSync: runSyncCmd, 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`));
+        const preview = state.files.slice(0, 5);
+        for (const line of preview) {
+            stderr(chalk.gray(`  ${line}\n`));
+        }
+        if (state.files.length > 5) {
+            stderr(chalk.gray(`  ... and ${state.files.length - 5} more\n`));
         }
-        // No conflict - determine direction based on content hash
-        const localHash = hashContent(localContent);
-        const remoteHash = hashContent(remoteContent);
-        if (localHash === remoteHash) {
-            return 'skip'; // Identical content
+        stderr(chalk.yellow(`◼ Commit, stash, or restore before running \`borg sync\`.\n`));
+        return 1;
+    }
+    if (state.kind === 'idle') {
+        const ahead = runSyncCmd('git', ['rev-list', '--count', 'HEAD..origin/main'], cwd());
+        const n = parseInt(ahead.stdout.trim(), 10) || 0;
+        if (n === 0) {
+            stdout(chalk.blue(`◼ On main; up to date with origin (@${state.head}).\n`));
+            return 0;
+        }
+        const pull = runSyncCmd('git', ['pull', '--ff-only', 'origin', 'main'], cwd());
+        if (pull.status !== 0) {
+            stderr(chalk.red(`◼ borg sync: git pull --ff-only failed:\n${pull.stderr.trim()}\n`));
+            return 1;
+        }
+        const newHead = runSyncCmd('git', ['rev-parse', '--short', 'HEAD'], cwd());
+        stdout(chalk.blue(`◼ On main; fast-forwarded ${n} commit${n === 1 ? '' : 's'} → @${newHead.stdout.trim()}.\n`));
+        return 0;
+    }
+    if (state.kind === 'mid-sprint-noop') {
+        stdout(chalk.blue(`◼ On \`${state.branch}\` @${state.head}; up to date with origin (no upstream changes).\n`));
+        stdout(chalk.gray(`◼ Continue your sprint, or post REVIEW-READY when complete.\n`));
+        return 0;
+    }
+    if (state.kind === 'mid-sprint-merge') {
+        // Merge origin/main into feature branch. No rebase (cube rule a).
+        const merge = runSyncCmd('git', ['merge', '--no-edit', 'origin/main'], cwd());
+        if (merge.status !== 0) {
+            stderr(chalk.red(`◼ borg sync: git merge origin/main failed (likely conflict). Resolve manually:\n${merge.stderr.trim()}\n`));
+            return 1;
+        }
+        const newHead = runSyncCmd('git', ['rev-parse', '--short', 'HEAD'], cwd());
+        stdout(chalk.blue(`◼ On \`${state.branch}\`; merged ${state.commits} commit${state.commits === 1 ? '' : 's'} from origin/main → @${newHead.stdout.trim()}.\n`));
+        stdout(chalk.gray(`◼ Re-run tests; continue your sprint.\n`));
+        return 0;
+    }
+    if (state.kind === 'post-merge') {
+        const checkout = runSyncCmd('git', ['checkout', 'main'], cwd());
+        if (checkout.status !== 0) {
+            stderr(chalk.red(`◼ borg sync: git checkout main failed:\n${checkout.stderr.trim()}\n`));
+            return 1;
         }
-        // One side changed - sync in that direction
-        if (metadata) {
-            const localChanged = localHash !== metadata.lastSyncHash;
-            const remoteChanged = remoteHash !== metadata.lastSyncHash;
-            if (localChanged) {
-                return 'push';
-            }
-            if (remoteChanged) {
-                return 'pull';
-            }
+        const pull = runSyncCmd('git', ['pull', '--ff-only', 'origin', 'main'], cwd());
+        if (pull.status !== 0) {
+            stderr(chalk.red(`◼ borg sync: git pull --ff-only failed:\n${pull.stderr.trim()}\n`));
+            return 1;
         }
-        // No metadata - default to push (local is source of truth for first sync)
-        return 'push';
+        const newHead = runSyncCmd('git', ['rev-parse', '--short', 'HEAD'], cwd());
+        stdout(chalk.blue(`◼ Branch \`${state.branch}\` was merged on origin; switched to main @${newHead.stdout.trim()}.\n`));
+        stdout(chalk.gray(`◼ Local branch \`${state.branch}\` retained; delete with \`git branch -d ${state.branch}\` when ready.\n`));
+        return 0;
     }
-    return 'skip';
+    // Exhaustiveness — unreachable.
+    const _exhaustive = state;
+    stderr(chalk.red(`◼ borg sync: unhandled state\n`));
+    return 1;
 }
 /**
- * Update metadata after successful sync
+ * 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).
  */
-export async function updateMetadataAfterSync(content) {
-    const metadata = {
-        localMtime: await getLocalMtime() || Date.now(),
-        remoteMtime: Date.now(),
-        lastSyncHash: hashContent(content),
-        lastSyncTime: Date.now(),
+export function parseSyncArgs(rawArgs) {
+    if (rawArgs.length === 0)
+        return { ok: true };
+    return {
+        ok: false,
+        error: `unexpected argument: ${rawArgs[0]}. Usage: borg sync (no arguments)`,
     };
-    await saveMetadata(metadata);
 }
 //# sourceMappingURL=sync.js.map

package/dist/sync.js.map

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

package/dist/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CAMzB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAoMD,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAE9C,CAAC;AAEF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAEzD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,EAAE,CAE5C"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CAMzB;AA6DD,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAoMD,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAE9C,CAAC;AAEF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAEzD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,EAAE,CAE5C"}

package/dist/templates.js

@@ -25,6 +25,62 @@
  * schema-allowed; in practice, software-dev cubes ship exactly one
  * (Coordinator).
  */
+// ====================================================================
+// Shared workflow-discipline content (gh#31 + gh#32, productized in
+// 0.8.0 per Sprint A of 2026-05-13). The cube directive + role
+// descriptions weave these constants in so new cubes inherit the
+// session-codified discipline automatically. Source-of-truth is the
+// cube log entries enumerated in drone-1's 17:06:58 reconstruction
+// note; these strings are faithful paraphrases trimmed to template
+// scale. Update both the cube-log canonical post AND these constants
+// together — keep them in sync.
+// ====================================================================
+/**
+ * gh#32 — escalation hierarchy. Universal clause for every non-
+ * Coordinator role. Source: cube-log entries 2026-05-13T10:11:47Z
+ * (PROCESS REMINDER) + 2026-05-13T10:13:22Z (AskUserQuestion
+ * addendum).
+ */
+const ESCALATION_DISCIPLINE = `
+
+**Escalation discipline (gh#32):**
+- The cube hierarchy is Drones ↔ Coordinator ↔ Queen. Address Coordinator (typically \`drone-1:\`) when blocked; **never** address Queen directly via cube messages.
+- When blocked — missing context, ambiguous scope, harness rejection, environment issue, anything — post to cube log with structured frame: "drone-1: blocker X, options A/B/C, my pick is B." Coordinator either resolves in-lane OR escalates to Queen if the decision is genuinely Queen-class.
+- **Do NOT use the \`AskUserQuestion\` tool for in-cube decisions.** That tool surfaces the question directly to the human at their terminal (Queen) and bypasses the Coordinator-routing the cube relies on. \`AskUserQuestion\` is reserved for genuinely user-only-knowable info in solo work (preferences, config values, etc.) — never for "should I deploy?" / "should I skip E2E?" / "which option?" — those are Coordinator decisions posted to cube log.
+- User-facing text output: same rule. Framing should be "drone-1: blocker X, options A/B/C, my pick is B" — never "Queen: which of A/B/C?" The cube log is the channel; how the harness displays your output is incidental.
+- If Coordinator is silent >10 min on a blocker, PING via \`borg:roster since=<dispatch-entry-id>\` or post a follow-up — don't bypass to Queen.
+- Autonomous-mode default: if you can resolve a question by reading the cube log + your role playbook + the codebase, do so without escalating. Escalate only when you genuinely need a decision Coordinator (or higher) holds.`;
+/**
+ * gh#31 + Queen rule (d) — git workflow rules + full release cycle.
+ * Coordinator-only clause; only the Coordinator role enacts merges,
+ * deploys, and release-housekeeping. Source: cube-log entries
+ * 2026-05-13T08:45:40Z (rules codified) + 2026-05-13T14:05Z
+ * (full-release-cycle discipline correction).
+ */
+const COORDINATOR_WORKFLOW_RULES = `
+
+**Codified git workflow rules (gh#31):**
+- **(a) No rebases, ever, on any branch.** Includes \`--interactive\` and \`gh pr merge --rebase\`. Upstream pull-in into a feature branch is \`git fetch origin && git merge origin/main\`. Feature-branch-into-main uses \`gh pr merge --merge\` (explicit merge commit).
+- **(b) No force-pushes, ever.** Includes \`--force-with-lease\`. The audit-trail commit-hash stability property is load-bearing — every SECURITY-* / REVIEW-* entry anchors on hashes; rewriting them dangles the references. Recovery for a half-rebased feature branch is \`git reset --hard origin/<branch>\` (resets local to remote without destructive remote push) then \`git merge origin/main\`.
+- **(c) Coordinator owns ALL merges into main AND all deploys for code-bearing PRs.** Other roles never run \`gh pr merge\` or \`git push origin main\`. Coordinator verifies all required gates pass before merging. **No fallback when Coordinator unavailable — cube halts on merge actions until Coordinator returns.** Per gh#31: Coordinator also runs all test-env and prod deploys for QA-gated PRs and code-bearing PRs touching workers/ or landing-page/ — drones lack user-level shared-infra auth.
+- **(d) Merge commit body encodes gate entry IDs:**
+\`\`\`
+Reviewed-by: drone-2 (entry <uuid>)
+Security-Approved-by: drone-8 (entry <uuid>)
+QA-Passed-by: drone-3 (entry <uuid>)
+UX-Approved-by: drone-4 (entry <uuid>)
+\`\`\`
+Format makes the multi-lens approval chain durable in git log independent of cube-log retention.
+- **(e) Fetch-before-push discipline.** Always \`git fetch origin && git log HEAD..origin/main --oneline\` before \`git push origin main\` to detect any commits that landed during local work.
+
+**Full release cycle (5 steps for code-bearing PRs):**
+1. Merge PR → main (Coordinator runs \`gh pr merge --merge\` with the gate-ID trailer above)
+2. npm publish (Queen — Coordinator stages the commit, hands off the \`cd client && npm publish\` command)
+3. Tag + push (Coordinator runs \`git tag -a vX.Y.Z -m "..."\` + \`git push origin vX.Y.Z\` **immediately** after Queen confirms publish; don't let the cleanup step slip)
+4. Prod deploy worker + frontend (Coordinator-class, Queen-authorized) — code-bearing PRs touching \`workers/\` or \`landing-page/\` need this step. Library-only PRs (changes ONLY in \`client/\`) skip this step.
+5. PM ALIGNMENT verifies deployed surface (not just npm/tag claim) — catches the claimed-vs-shipped gap class
+
+**In-lane decision discipline:** when a drone escalates, make the call IN YOUR LANE: deploy from your session if the drone can't, pick A/B/C on tactical splits, authorize anti-scope clarifications, resolve cross-drone NIT disagreements. Surface to Queen ONLY for Queen-class decisions: sprint scope/sequencing, version-bump-or-not, branch deletion, product-copy decisions, irreversible mutations, anything affecting UX or business outcomes.`;
 const SOFTWARE_DEV = {
     name: 'software-dev',
     description: 'Multi-agent software development. Coordinator (held by the human Queen) directs Builders, a Code Reviewer, a QA Tester, a UX Expert, a Visionary, a Product Manager, and a Security Auditor. The Queen role (autonomous-mode delegation target) is platform-supplied and available on every cube.',
@@ -63,7 +119,7 @@ Log conventions you use:
 
 Read the log first on every regen. Act only on actionable signals.
 
-**Elevation to the Queen role (autonomous variant):** When the human Queen authorizes autonomous operation (a few hours, overnight, etc.), your role is reassigned to Queen via \`borg:reassign-drone\`. Same base responsibilities documented here; the Queen role adds autonomous-mode behaviors (ship-on-consensus, ~2h STATE-SUMMARY cadence, sustained-idle stop, operator-credentialed deferral) documented in its own \`detailed_description\`. On the human Queen's return, you're reassigned back to this role. Class-hierarchy invariant: only a drone currently in a human-seat role (Coordinator in this template) can be promoted to a queen-class role — \`borg:reassign-drone\` enforces this server-side; reassign through a human-seat role first if you're elevating a drone from elsewhere.`,
+**Elevation to the Queen role (autonomous variant):** When the human Queen authorizes autonomous operation (a few hours, overnight, etc.), your role is reassigned to Queen via \`borg:reassign-drone\`. Same base responsibilities documented here; the Queen role adds autonomous-mode behaviors (ship-on-consensus, ~2h STATE-SUMMARY cadence, sustained-idle stop, operator-credentialed deferral) documented in its own \`detailed_description\`. On the human Queen's return, you're reassigned back to this role. Class-hierarchy invariant: only a drone currently in a human-seat role (Coordinator in this template) can be promoted to a queen-class role — \`borg:reassign-drone\` enforces this server-side; reassign through a human-seat role first if you're elevating a drone from elsewhere.${COORDINATOR_WORKFLOW_RULES}`,
         },
         {
             name: 'Builder',
@@ -80,7 +136,7 @@ Workflow:
 Project conventions:
 - TDD where it applies (DB methods, business logic). Skip TDD for migrations and UI.
 - Always commit specific file paths (\`git add path/to/file\`), never \`-A\`.
-- Tests must pass and any build-verification or deploy-dry-run gate the cube specifies must succeed before claiming DONE.`,
+- Tests must pass and any build-verification or deploy-dry-run gate the cube specifies must succeed before claiming DONE.${ESCALATION_DISCIPLINE}`,
         },
         {
             name: 'Code Reviewer',
@@ -96,7 +152,7 @@ Workflow:
 - For each finding worth flagging, post \`REVIEW-FEEDBACK: <branch> <observation>\` — high-confidence issues only. Sort blockers from nits explicitly.
 - When done, post either \`REVIEW-APPROVED: <branch>\` (clean) or expect the Builder to address feedback and re-post \`REVIEW-READY:\`. Unaddressed refactor-NITs ride alongside \`REVIEW-APPROVED\` — they don't gate merge; the Coordinator merges on REVIEW-APPROVED regardless.
 
-Don't merge yourself — \`REVIEW-APPROVED\` is the signal; the Coordinator does the actual merge to main.`,
+Don't merge yourself — \`REVIEW-APPROVED\` is the signal; the Coordinator does the actual merge to main.${ESCALATION_DISCIPLINE}`,
         },
         {
             name: 'QA Tester',
@@ -111,7 +167,7 @@ Workflow:
 - For each defect, post \`QA-FAIL: <branch> <one-line symptom> — repro: <steps>\`. Be specific enough that the Builder can reproduce without asking. Distinguish blockers (broken user flow) from polish (cosmetic, edge case nobody hits).
 - When the change passes, post \`QA-PASS: <branch> <what you exercised>\`. List the scenarios you actually ran so reviewers can see coverage.
 
-You don't gate merges directly and you don't perform them — \`QA-PASS\` is the green-light signal, the Coordinator does the actual merge. Your job is to make sure no one ships something they only think works.`,
+You don't gate merges directly and you don't perform them — \`QA-PASS\` is the green-light signal, the Coordinator does the actual merge. Your job is to make sure no one ships something they only think works.${ESCALATION_DISCIPLINE}`,
         },
         {
             name: 'UX Expert',
@@ -124,7 +180,7 @@ Workflow:
 - Use the Playwright MCP if available to actually exercise the flows in a browser, not just read the diff.
 - Post findings as \`UX-FEEDBACK: <branch> <observation>\` and approvals as \`UX-APPROVED: <branch>\`.
 
-You don't gate merges and you don't perform them — \`UX-APPROVED\` is informational signal, the Coordinator does the actual merge. Your job is to make the signal visible.`,
+You don't gate merges and you don't perform them — \`UX-APPROVED\` is informational signal, the Coordinator does the actual merge. Your job is to make the signal visible.${ESCALATION_DISCIPLINE}`,
         },
         {
             name: 'Product Manager',
@@ -154,7 +210,7 @@ Operating principles:
 - Respect the strategic-horizon stated by the Queen + Visionary. Coherence findings are present-tense; if you spot something that should be on the roadmap but isn't, flag it as a VISION-CHECK and let the Visionary + Queen weigh whether to extend the horizon.
 - The PM seat is distinct from the Visionary seat: Visionary is generative future-facing ("what should EXIST that doesn't?"), Product Manager is integrative present-facing ("does the thing-that-exists hang together?"). The same drone can hold both at different times, but they're different lenses on different time horizons.
 
-Read the log first on every regen — including older entries that may have surfaced drift you can confirm or close.`,
+Read the log first on every regen — including older entries that may have surfaced drift you can confirm or close.${ESCALATION_DISCIPLINE}`,
         },
         {
             name: 'Visionary',
@@ -184,7 +240,7 @@ Operating principles:
 - Don't bypass dispatch. You propose; the Queen and Coordinator triage. Don't directly tell Builders to do things.
 - Respect the cube's current focus. Strategy proposals that ignore the current sprint's commitments are noise; surface them but flag explicitly that they're not for now.
 
-Read the log first on every regen — including older entries that may have surfaced retrospectives you can build on.`,
+Read the log first on every regen — including older entries that may have surfaced retrospectives you can build on.${ESCALATION_DISCIPLINE}`,
         },
         {
             name: 'Security Auditor',
@@ -212,7 +268,7 @@ When done, post \`SECURITY-APPROVED: <branch>\` (clean), or \`SECURITY-DEFER: <b
 
 Don't merge yourself — \`SECURITY-APPROVED\` is the signal; the Coordinator does the actual merge. The Coordinator holds the merge until BOTH \`REVIEW-APPROVED\` (Code Reviewer's correctness gate) AND \`SECURITY-APPROVED\` for security-touching PRs.
 
-You DON'T do: correctness review (Code Reviewer's lane), QA testing (QA Tester's lane), UX evaluation (UX Expert's lane), merging, or releasing. Your output is \`SECURITY-FINDING:\` / \`SECURITY-APPROVED:\` / \`SECURITY-DEFER:\` / \`SECURITY-SWEEP:\` signals on the log.`,
+You DON'T do: correctness review (Code Reviewer's lane), QA testing (QA Tester's lane), UX evaluation (UX Expert's lane), merging, or releasing. Your output is \`SECURITY-FINDING:\` / \`SECURITY-APPROVED:\` / \`SECURITY-DEFER:\` / \`SECURITY-SWEEP:\` signals on the log.${ESCALATION_DISCIPLINE}`,
         },
     ],
 };

package/dist/templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAqBH,MAAM,YAAY,GAAa;IAC7B,IAAI,EAAE,cAAc;IACpB,WAAW,EACT,mSAAmS;IACrS,KAAK,EAAE;QACL;YACE,IAAI,EAAE,aAAa;YACnB,aAAa,EAAE,IAAI;YACnB,iBAAiB,EACf,oNAAoN;YACtN,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+wBA8BmvB;SAC1wB;QACD;YACE,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,IAAI;YAChB,iBAAiB,EAAE,2FAA2F;YAC9G,oBAAoB,EAAE;;;;;;;;;;;0HAW8F;SACrH;QACD;YACE,IAAI,EAAE,eAAe;YACrB,iBAAiB,EAAE,iJAAiJ;YACpK,oBAAoB,EAAE;;;;;;;;;;;yGAW6E;SACpG;QACD;YACE,IAAI,EAAE,WAAW;YACjB,iBAAiB,EAAE,6FAA6F;YAChH,oBAAoB,EAAE;;;;;;;;;;iNAUqL;SAC5M;QACD;YACE,IAAI,EAAE,WAAW;YACjB,iBAAiB,EAAE,+EAA+E;YAClG,oBAAoB,EAAE;;;;;;;;2KAQ+I;SACtK;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,iBAAiB,EAAE,kMAAkM;YACrN,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;mHAyBuF;SAC9G;QACD;YACE,IAAI,EAAE,WAAW;YACjB,iBAAiB,EAAE,qIAAqI;YACxJ,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;oHAyBwF;SAC/G;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,iBAAiB,EAAE,8KAA8K;YACjM,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;+QAuBmP;SAC1Q;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAA6B;IACjD,cAAc,EAAE,YAAY;CAC7B,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAeH,uEAAuE;AACvE,oEAAoE;AACpE,+DAA+D;AAC/D,iEAAiE;AACjE,oEAAoE;AACpE,mEAAmE;AACnE,mEAAmE;AACnE,qEAAqE;AACrE,gCAAgC;AAChC,uEAAuE;AAEvE;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG;;;;;;;;gOAQkM,CAAC;AAEjO;;;;;;GAMG;AACH,MAAM,0BAA0B,GAAG;;;;;;;;;;;;;;;;;;;;;;;ybAuBsZ,CAAC;AAQ1b,MAAM,YAAY,GAAa;IAC7B,IAAI,EAAE,cAAc;IACpB,WAAW,EACT,mSAAmS;IACrS,KAAK,EAAE;QACL;YACE,IAAI,EAAE,aAAa;YACnB,aAAa,EAAE,IAAI;YACnB,iBAAiB,EACf,oNAAoN;YACtN,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gxBA8BovB,0BAA0B,EAAE;SACvyB;QACD;YACE,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,IAAI;YAChB,iBAAiB,EAAE,2FAA2F;YAC9G,oBAAoB,EAAE;;;;;;;;;;;2HAW+F,qBAAqB,EAAE;SAC7I;QACD;YACE,IAAI,EAAE,eAAe;YACrB,iBAAiB,EAAE,iJAAiJ;YACpK,oBAAoB,EAAE;;;;;;;;;;;0GAW8E,qBAAqB,EAAE;SAC5H;QACD;YACE,IAAI,EAAE,WAAW;YACjB,iBAAiB,EAAE,6FAA6F;YAChH,oBAAoB,EAAE;;;;;;;;;;kNAUsL,qBAAqB,EAAE;SACpO;QACD;YACE,IAAI,EAAE,WAAW;YACjB,iBAAiB,EAAE,+EAA+E;YAClG,oBAAoB,EAAE;;;;;;;;4KAQgJ,qBAAqB,EAAE;SAC9L;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,iBAAiB,EAAE,kMAAkM;YACrN,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;oHAyBwF,qBAAqB,EAAE;SACtI;QACD;YACE,IAAI,EAAE,WAAW;YACjB,iBAAiB,EAAE,qIAAqI;YACxJ,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;qHAyByF,qBAAqB,EAAE;SACvI;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,iBAAiB,EAAE,8KAA8K;YACjM,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;;;gRAuBoP,qBAAqB,EAAE;SAClS;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAA6B;IACjD,cAAc,EAAE,YAAY;CAC7B,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChC,CAAC"}

package/dist/types.d.ts

@@ -1,23 +1,6 @@
 /**
  * Type definitions for Borg MCP Client
  */
-export interface FileMetadata {
-    localMtime: number;
-    remoteMtime: number;
-    lastSyncHash: string;
-    lastSyncTime: number;
-}
-export interface SyncState {
-    inProgress: boolean;
-    lastSync: number;
-    pendingChanges: PendingChange[];
-}
-export interface PendingChange {
-    operation: 'set' | 'delete';
-    content?: string;
-    timestamp: number;
-    retryCount: number;
-}
 export interface GoogleOAuthTokens {
     id_token: string;
     refresh_token?: string;
@@ -28,10 +11,4 @@ export interface RemoteResponse {
     data?: any;
     error?: string;
 }
-export interface ConflictInfo {
-    localContent: string;
-    remoteContent: string;
-    localMtime: number;
-    remoteMtime: number;
-}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "0.7.7",
+  "version": "0.8.0",
   "description": "Multi-agent coordination for Claude Code — cubes, drones, and a shared activity log.",
   "type": "module",
   "main": "dist/index.js",