borgmcp 1.1.15 → 2.0.1

package/dist/stream-status.js

@@ -1,3 +1,268 @@
-import{spawnSync as b}from"node:child_process";import{statSync as $}from"node:fs";import{heartbeatPathFor as _,legacyHeartbeatPathFor as k,HEARTBEAT_STALE_MS as y}from"./inbox-monitor.js";import{shellEscape as u}from"./shell-escape.js";function x(n,t){if(!n)return null;try{const o=b("pgrep",["-f",n],{encoding:"utf-8",timeout:2e3});return o.error?null:o.status===0&&o.stdout.trim().length>0?!A(n,t):o.status===1?!1:null}catch{return null}}function A(n,t){const o=[_(n,t)];t&&o.push(k(n));let s=!1;for(const a of new Set(o))try{const c=$(a).mtimeMs;if(s=!0,Date.now()-c<=y)return!1}catch{}return s}function E(n){const{status:t,inboxMonitorHealthy:o,inboxPath:s,monitorStateRoot:a,droneLabel:c,cubeName:p,humanAgo:l}=n,m=t.reconnectAttempts===0&&t.lastWireActivityAt===null&&!t.connected,h=t.ownership?.state==="owned-by-other-process",d=t.ownership?.state==="orphaned-initialization",w=t.ownership?.state==="initializing";let r;d?r="**Stream blocked by an orphaned initialization lock.**":h?r="**Stream owned by another Borg MCP process.**":m?r="**Stream not started.**":t.connected?o===!1?r="**Stream connected (no inbox-Monitor \u2014 wake path broken).**":t.lastContentEventAt===null?r="**Stream connected, awaiting first content event.**":r=`**Stream connected, last content ${l(new Date(t.lastContentEventAt))}.**`:r=`**Stream disconnected (reconnect attempt ${t.reconnectAttempts}).**`;const e=[];if(e.push(r),e.push(""),e.push("# Log-stream status"),e.push(""),d?e.push("- **state**: _(orphaned stream-owner initialization)_"):w?e.push("- **state**: _(stream-owner initialization in progress)_"):h?e.push("- **state**: _(stream owner is another local process)_"):m?e.push("- **state**: _(stream not started)_"):e.push(`- **connected**: ${t.connected}`),e.push(`- **last content event**: ${t.lastContentEventAt?`${t.lastContentEventAt} (${l(new Date(t.lastContentEventAt))})`:"_(none yet)_"}`),e.push(`- **last heartbeat at**: ${t.lastHeartbeatAt?`${t.lastHeartbeatAt} (${l(new Date(t.lastHeartbeatAt))})`:"_(none)_"}`),e.push(`- **last wire activity**: ${t.lastWireActivityAt?`${t.lastWireActivityAt} (${l(new Date(t.lastWireActivityAt))})`:"_(none)_"}`),e.push(`- **last persisted event id**: ${t.lastPersistedEventId??"_(none)_"}`),e.push(`- **reconnect attempts**: ${t.reconnectAttempts}`),e.push(`- **run-loop restarts**: ${t.runLoopRestartCount}`),e.push(`- **stream ownership**: ${t.ownership?.state??"_(unknown)_"}`),t.ownership?.lockPath&&e.push(`- **ownership lock path**: ${t.ownership.lockPath}`),h){const i=t.ownership;e.push(`- **stream owner pid**: ${i.pid??"_(unknown)_"}`),e.push(`- **stream owner cwd**: ${i.cwd??"_(unknown)_"}`),e.push(`- **stream owner heartbeat age**: ${typeof i.ageMs=="number"&&Number.isFinite(i.ageMs)?`${Math.max(0,Math.round(i.ageMs/1e3))}s`:"_(unknown)_"}`)}return t.connected&&o===!1&&(e.push("- **inbox-monitor**: _(no watcher detected \u2014 wake path broken)_"),s&&c&&p&&(e.push(""),e.push("## Real-time wake-up (do this now)"),e.push("No process is tailing this drone's inbox file \u2014 this session won't wake on real-time cube activity, only on its fallback timer, and will miss live coordination from other drones. Arm an inbox Monitor:"),e.push(""),e.push(`> Monitor command: \`${f(s,a)}\` \u2014 persistent, 1h timeout, description "borg inbox for ${c} on cube ${p}".`))),e.join(`
-`)}function C(n,t){return n.connected&&t===!1}function H(n){const{inboxPath:t,monitorStateRoot:o,droneLabel:s,cubeName:a}=n;return!t||!s||!a?"":["## \u26A0 Wake path broken \u2014 arm Monitor NOW","","No process is tailing this drone's inbox file. SSE delivery is healthy (entries reach disk), but Claude Code has no event source to wake on. Until you arm a Monitor, this session only wakes on the /loop fallback heartbeat and will miss live coordination from other drones:","",`> Monitor command: \`${f(t,o)}\` \u2014 persistent, 1h timeout, description "borg inbox for ${s} on cube ${a}".`,"","---",""].join(`
-`)}function f(n,t){return t?`borg-inbox-monitor --state-root ${u(t)} ${u(n)}`:`borg-inbox-monitor ${u(n)}`}export{x as checkInboxMonitorHealthy,H as formatWakePathPrefix,A as isHeartbeatStale,E as renderStreamStatus,C as shouldShowWakePathWarning};
+/**
+ * Renderer + inbox-Monitor liveness probe for `borg_stream-status`.
+ *
+ * Split out from `index.ts` so the 5-state precedence logic and the
+ * `pgrep`-based liveness check can be unit-tested without spinning up
+ * the MCP server. drone-4's 18:30:51 UX contract is the spec for the
+ * rendered output shape; this module is the implementation surface.
+ *
+ * Top-line states (drone-4 contract):
+ *   1. Stream not started.
+ *   2. Stream connected, awaiting first content event.
+ *   3. Stream connected, last content <X> ago.
+ *   4. Stream disconnected (reconnect attempt N).
+ *   5. Stream connected (no inbox-Monitor — wake path broken).
+ *
+ * Precedence when both `disconnected` and `no inbox-Monitor` apply:
+ *   prefer (4) — wire-disconnect is the upstream cause and resolves
+ *   automatically when the wire comes back up; State 5 only matters
+ *   when the wire is healthy but the file-watch isn't.
+ */
+import { spawnSync } from 'node:child_process';
+import { statSync } from 'node:fs';
+import { heartbeatPathFor, legacyHeartbeatPathFor, HEARTBEAT_STALE_MS, } from './inbox-monitor.js';
+import { shellEscape } from './shell-escape.js';
+/**
+ * Best-effort check: is a process tailing this inbox file?
+ *
+ * Returns:
+ *   - true: at least one process matches `tail.*<inboxPath>` in pgrep
+ *   - false: pgrep ran cleanly and found no match
+ *   - null: cannot determine (pgrep unavailable, spawn error, no inbox path)
+ *
+ * The null case is informative — it means we don't know, so the
+ * renderer must NOT fire State 5 (which would be misleading). State 5
+ * only fires when we positively know the wake path is broken.
+ *
+ * Why `pgrep` and not a more elegant check: Claude Code Monitors are
+ * tail-based subprocesses spawned by the harness, completely opaque to
+ * the MCP server. The MCP server has no IPC channel into the harness's
+ * task table. The cheapest reliable signal we can get from inside the
+ * MCP server is "is there a tail subprocess open against this path?"
+ * — which is what `pgrep -f` answers.
+ *
+ * macOS + Linux ship `pgrep`. Windows doesn't (borgmcp targets Mac /
+ * Linux per package.json `os` field; the null branch handles other
+ * platforms gracefully).
+ */
+export function checkInboxMonitorHealthy(inboxPath, monitorStateRoot) {
+    if (!inboxPath)
+        return null;
+    try {
+        // `-f` matches against the full command line so we catch the
+        // `tail -n 0 -F <inboxPath>` form. `-l` lists matches; we only
+        // need the exit code (0 = match, 1 = no match) and a sanity check
+        // on stdout (some pgrep variants exit 0 with empty stdout under
+        // permission errors — treat empty stdout as "no match" for safety).
+        const res = spawnSync('pgrep', ['-f', inboxPath], {
+            encoding: 'utf-8',
+            timeout: 2_000,
+        });
+        if (res.error)
+            return null;
+        if (res.status === 0 && res.stdout.trim().length > 0) {
+            // gh#822: a tail PROCESS is present — but presence ≠ health (a hung tail
+            // still matches pgrep). Upgrade presence→health via the holder heartbeat
+            // sidecar: if it exists and is STALE past the conservative threshold, the
+            // holder is wedged → wake path broken (false). If it's fresh → healthy.
+            // If it's ABSENT, fall back to presence (an old pre-#822 monitor, or a
+            // #822 monitor armed <1 tick ago that hasn't written its first heartbeat)
+            // → report healthy; never false-flag a monitor that simply lacks the
+            // sidecar (conservative — err toward NOT warning).
+            return !isHeartbeatStale(inboxPath, monitorStateRoot);
+        }
+        if (res.status === 1)
+            return false;
+        // pgrep exits 2 for syntax error, 3 for fatal — treat as unknown.
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * gh#822: are all present holder heartbeat sidecars stale past the threshold?
+ * A fresh legacy sidecar wins during migration; absent sidecars (old monitor /
+ * just-armed) still fall back to process presence. Only present-and-all-stale
+ * state is a wedged-holder signal.
+ */
+export function isHeartbeatStale(inboxPath, monitorStateRoot) {
+    const paths = [heartbeatPathFor(inboxPath, monitorStateRoot)];
+    if (monitorStateRoot)
+        paths.push(legacyHeartbeatPathFor(inboxPath));
+    let sawHeartbeat = false;
+    for (const path of new Set(paths)) {
+        try {
+            const mtimeMs = statSync(path).mtimeMs;
+            sawHeartbeat = true;
+            if (Date.now() - mtimeMs <= HEARTBEAT_STALE_MS)
+                return false;
+        }
+        catch {
+            // absent / unreadable → keep evaluating the migration counterpart
+        }
+    }
+    return sawHeartbeat;
+}
+/**
+ * Render the `borg_stream-status` markdown body per drone-4's 18:30:51
+ * contract. Pure function — no I/O, no clock reads. Caller assembles
+ * the inputs.
+ */
+export function renderStreamStatus(inputs) {
+    const { status, inboxMonitorHealthy, inboxPath, monitorStateRoot, droneLabel, cubeName, humanAgo } = inputs;
+    const isNotStarted = status.reconnectAttempts === 0 &&
+        status.lastWireActivityAt === null &&
+        !status.connected;
+    const ownedByOther = status.ownership?.state === 'owned-by-other-process';
+    const orphanedInitialization = status.ownership?.state === 'orphaned-initialization';
+    const ownershipInitializing = status.ownership?.state === 'initializing';
+    // Top-line verdict — 5 states + override per drone-4 contract.
+    // Precedence: disconnected > no-inbox-Monitor (wire-down upstream
+    // cause; State 5 only applies when wire is healthy).
+    let summary;
+    if (orphanedInitialization) {
+        summary = '**Stream blocked by an orphaned initialization lock.**';
+    }
+    else if (ownedByOther) {
+        summary = '**Stream owned by another Borg MCP process.**';
+    }
+    else if (isNotStarted) {
+        summary = '**Stream not started.**';
+    }
+    else if (!status.connected) {
+        summary = `**Stream disconnected (reconnect attempt ${status.reconnectAttempts}).**`;
+    }
+    else if (inboxMonitorHealthy === false) {
+        summary = '**Stream connected (no inbox-Monitor — wake path broken).**';
+    }
+    else if (status.lastContentEventAt === null) {
+        // State 2: wire works, no content yet. Collapses two underlying
+        // conditions per drone-4 contract — fresh connect pre-first-content
+        // and quiet cube post-reconnect. The body's heartbeat field
+        // distinguishes them (populated vs `_(none)_`).
+        summary = '**Stream connected, awaiting first content event.**';
+    }
+    else {
+        summary = `**Stream connected, last content ${humanAgo(new Date(status.lastContentEventAt))}.**`;
+    }
+    const lines = [];
+    lines.push(summary);
+    lines.push('');
+    lines.push('# Log-stream status');
+    lines.push('');
+    if (orphanedInitialization) {
+        lines.push('- **state**: _(orphaned stream-owner initialization)_');
+    }
+    else if (ownershipInitializing) {
+        lines.push('- **state**: _(stream-owner initialization in progress)_');
+    }
+    else if (ownedByOther) {
+        lines.push('- **state**: _(stream owner is another local process)_');
+    }
+    else if (isNotStarted) {
+        lines.push('- **state**: _(stream not started)_');
+    }
+    else {
+        lines.push(`- **connected**: ${status.connected}`);
+    }
+    // Body shape per drone-4 contract: three timestamp lines (content,
+    // heartbeat, wire) — looks redundant in the common case where they
+    // coincide, but the asymmetric "content quiet, heartbeats alive" case
+    // is exactly the diagnostic scenario this surface exists to support.
+    lines.push(`- **last content event**: ${status.lastContentEventAt
+        ? `${status.lastContentEventAt} (${humanAgo(new Date(status.lastContentEventAt))})`
+        : '_(none yet)_'}`);
+    lines.push(`- **last heartbeat at**: ${status.lastHeartbeatAt
+        ? `${status.lastHeartbeatAt} (${humanAgo(new Date(status.lastHeartbeatAt))})`
+        : '_(none)_'}`);
+    lines.push(`- **last wire activity**: ${status.lastWireActivityAt
+        ? `${status.lastWireActivityAt} (${humanAgo(new Date(status.lastWireActivityAt))})`
+        : '_(none)_'}`);
+    lines.push(`- **last persisted event id**: ${status.lastPersistedEventId ?? '_(none)_'}`);
+    lines.push(`- **reconnect attempts**: ${status.reconnectAttempts}`);
+    lines.push(`- **run-loop restarts**: ${status.runLoopRestartCount}`);
+    lines.push(`- **stream ownership**: ${status.ownership?.state ?? '_(unknown)_'}`);
+    if (status.ownership?.lockPath) {
+        lines.push(`- **ownership lock path**: ${status.ownership.lockPath}`);
+    }
+    if (ownedByOther) {
+        const owner = status.ownership;
+        lines.push(`- **stream owner pid**: ${owner.pid ?? '_(unknown)_'}`);
+        lines.push(`- **stream owner cwd**: ${owner.cwd ?? '_(unknown)_'}`);
+        lines.push(`- **stream owner heartbeat age**: ${typeof owner.ageMs === 'number' && Number.isFinite(owner.ageMs)
+            ? `${Math.max(0, Math.round(owner.ageMs / 1000))}s`
+            : '_(unknown)_'}`);
+    }
+    // State-5 body line + self-arm instruction. Only fires when we
+    // POSITIVELY detected wake-path breakage AND the wire is up — the
+    // disconnected case takes precedence above and would never reach
+    // here. When `inboxMonitorHealthy === null` (couldn't determine) we
+    // stay silent; surfacing an uncertain failure mode is worse UX than
+    // omitting it.
+    if (status.connected && inboxMonitorHealthy === false) {
+        lines.push(`- **inbox-monitor**: _(no watcher detected — wake path broken)_`);
+        if (inboxPath && droneLabel && cubeName) {
+            lines.push('');
+            lines.push('## Real-time wake-up (do this now)');
+            lines.push('No process is tailing this drone\'s inbox file — this session won\'t wake on real-time cube activity, only on its fallback timer, and will miss live coordination from other drones. Arm an inbox Monitor:');
+            lines.push('');
+            lines.push(`> Monitor command: \`${monitorCommand(inboxPath, monitorStateRoot)}\` — persistent, 1h timeout, description "borg inbox for ${droneLabel} on cube ${cubeName}".`);
+        }
+    }
+    return lines.join('\n');
+}
+/**
+ * Gate predicate for the regen wake-path warning (gh#51 — extracted
+ * from the inline ternary in `src/index.ts` for direct unit-test
+ * coverage of the (connected × healthy) cross-product).
+ *
+ * Returns true ONLY when the wire is up AND we positively detected a
+ * dead inbox Monitor (`=== false` strict). The `null` branch
+ * (couldn't determine) stays silent — surfacing an uncertain failure
+ * mode is worse UX than omitting it (mirrors the State-5 precedence
+ * rule in `renderStreamStatus`). When disconnected, the wire-down case
+ * is the upstream cause and takes precedence; no point warning about
+ * the wake path when the wake-path's input has no events to deliver.
+ */
+export function shouldShowWakePathWarning(streamStatus, inboxMonitorHealthy) {
+    return streamStatus.connected && inboxMonitorHealthy === false;
+}
+/**
+ * Wake-path-broken prefix for `borg_regen` output (gh#43).
+ *
+ * Pure function — caller decides whether to call (gates on
+ * `shouldShowWakePathWarning`). Returns an empty string when called
+ * with insufficient context to render the Monitor command (e.g., no
+ * inbox path on a no-active-cube path), so callers can always prepend
+ * the result unconditionally.
+ *
+ * Mirrors the State-5 self-arm instruction shape in
+ * `renderStreamStatus` so a drone sees the same Monitor command via
+ * both `borg_stream-status` and `borg_regen`. The differentiator: regen
+ * runs on every /loop iteration, so the prefix gives passive
+ * self-healing (worst-case latency = the /loop fallback heartbeat),
+ * whereas stream-status only surfaces the warning when actively
+ * called.
+ */
+export function formatWakePathPrefix(inputs) {
+    const { inboxPath, monitorStateRoot, droneLabel, cubeName } = inputs;
+    if (!inboxPath || !droneLabel || !cubeName)
+        return '';
+    return [
+        `## ⚠ Wake path broken — arm Monitor NOW`,
+        ``,
+        `No process is tailing this drone's inbox file. SSE delivery is healthy (entries reach disk), but Claude Code has no event source to wake on. Until you arm a Monitor, this session only wakes on the /loop fallback heartbeat and will miss live coordination from other drones:`,
+        ``,
+        `> Monitor command: \`${monitorCommand(inboxPath, monitorStateRoot)}\` — persistent, 1h timeout, description "borg inbox for ${droneLabel} on cube ${cubeName}".`,
+        ``,
+        `---`,
+        ``,
+    ].join('\n');
+}
+function monitorCommand(inboxPath, monitorStateRoot) {
+    return monitorStateRoot
+        ? `borg-inbox-monitor --state-root ${shellEscape(monitorStateRoot)} ${shellEscape(inboxPath)}`
+        : `borg-inbox-monitor ${shellEscape(inboxPath)}`;
+}
+//# sourceMappingURL=stream-status.js.map

package/dist/stream-status.js.map

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

package/dist/sync-roles-render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-roles-render.d.ts","sourceRoot":"","sources":["../src/sync-roles-render.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,WAAW,GAAG,UAAU,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,KAAK,GAAG,UAAU,GAAG,gBAAgB,CAAC;QAC9C,SAAS,EAAE,YAAY,EAAE,CAAC;KAC3B,CAAC,CAAC;IACH,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,iBAAiB,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC1D,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAG5B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/B;AASD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,oBAAoB,EAC5B,YAAY,EAAE,MAAM,GACnB,MAAM,CA2GR"}

package/dist/sync-roles-render.js

@@ -1,3 +1,118 @@
-function p(t,r=200){if(t==null)return"(absent)";const o=t.replace(/\n/g,"\u23CE");return o.length>r?o.slice(0,r)+"\u2026":o}function y(t,r){const o=t;if(o.roles===void 0&&"updated"in o)return["## borg_sync-roles \u2014 unavailable (server out of date)","","The borg server returned the legacy sync-roles response shape \u2014 it is running a version older than #473, which the non-clobbering sync view does not support.","","**Action:** a server (worker) deploy is pending. Retry `borg_sync-roles` once it lands."].join(`
-`);const n=[`## borg_sync-roles \u2014 ${t.dryRun?"**DRY RUN** (review conflicts below; re-run with `apply: true` + a `decisions` map to commit)":"**APPLIED**"}`,`Template: ${r}`,""],d=[...t.roles.flatMap(e=>e.fragments),...t.taxonomy],c=d.filter(e=>e.kind==="conflict"),a=d.filter(e=>e.kind==="add"),i=t.roles.filter(e=>e.status==="new"),u=t.roles.filter(e=>e.status==="custom-skipped");if(c.length>0){n.push(`### \u26A0 ${c.length} CONFLICT(s) \u2014 these fragments differ between your cube and the template`),t.dryRun?n.push('These differ between your cube and the template \u2014 may be because you evolved them, or because the template changed them. Surfaced for review, never silently overwritten. Each defaults to **KEEP (reject)** \u2014 your version survives. To take the template version of a specific fragment, pass its key in `decisions` as `"<key>": "accept"`.'):n.push("Unless explicitly accepted, each conflict was KEPT (your version preserved)."),n.push("");for(const e of c){const s=t.applied.acceptedConflicts.includes(e.key),h=t.dryRun?"(would KEEP your version)":s?"\u2713 accepted \u2014 template version applied":"\u21A9 kept your version";n.push(`- **${e.label}** \`${e.key}\` ${h}`),n.push(`  - cube (current): "${p(e.cubeValue)}"`),n.push(`  - template (new): "${p(e.templateValue)}"`)}n.push("")}const l=t.unmatchedDecisions??[];if(l.length>0){n.push(`### \u26A0 ${l.length} decision key(s) matched no conflict and were ignored`),n.push("These keys in your `decisions` map did not correspond to any classified conflict this run (typo or stale key) \u2014 their intended accept had NO effect. Check the exact keys against the conflicts above:");for(const e of l)n.push(`- \`${e}\``);n.push("")}if(i.length>0||a.length>0){n.push("### Additions (safe \u2014 auto-applied, zero clobber risk)");for(const e of i){const s=t.dryRun?"(new role \u2014 would be created)":"\u2713 created";n.push(`- new role **${e.name}** ${s}`)}for(const e of a){const s=t.dryRun?"(would be added)":"\u2713 added";n.push(`- **${e.label}** \`${e.key}\` ${s}`)}n.push("")}return u.length>0&&(n.push(`### Custom roles (untouched): ${u.map(e=>e.name).join(", ")}`),n.push("")),c.length===0&&a.length===0&&i.length===0&&n.push("\u2713 Cube roles + taxonomy are **up to date** with the template (no changes)."),n.join(`
-`).trimEnd()}export{y as renderSyncRolesResult};
+/**
+ * gh#473 PR2 — non-clobbering sync output rendering.
+ *
+ * The dry-run output is UX-LOAD-BEARING: it must CLEARLY communicate each
+ * conflict (which role/section or taxonomy class, cube-current vs
+ * template-new, and how to accept) so the operator SEES what would be
+ * clobbered. Pure string logic (mirrors `roster-render.ts` /
+ * `list-roles-render.ts`) so it is unit-testable without the MCP runtime.
+ *
+ * The shape mirrors the worker's `NonClobberSyncResult`.
+ */
+/** Truncate long fragment bodies for at-a-glance diffs. */
+function trunc(s, n = 200) {
+    if (s == null)
+        return '(absent)';
+    const flat = s.replace(/\n/g, '⏎');
+    return flat.length > n ? flat.slice(0, n) + '…' : flat;
+}
+/**
+ * Render a `NonClobberSyncResult` as an operator-facing markdown report.
+ *
+ * Conflicts are the headline: each is surfaced with both sides + its
+ * stable accept key, and the report states explicitly that conflicts are
+ * KEPT (the cube's version) unless accepted. ADDs are reported as safe
+ * auto-applies. Custom roles are reported untouched.
+ */
+export function renderSyncRolesResult(result, templateName) {
+    // Defensive guard against client/worker deploy skew (gh#9 class). A
+    // pre-#473 worker returns the legacy sync-roles shape
+    // ({ updated, added, unchanged, skipped, dryRun }) with no `roles[]`, so
+    // `result.roles.flatMap(...)` below would throw `undefined.flatMap`.
+    // Detect the legacy shape and render an actionable message instead of
+    // crashing — the skew window (0.9.47+ client + pre-#473 worker) becomes a
+    // clean "redeploy the worker" prompt, not an exception.
+    const maybeLegacy = result;
+    if (maybeLegacy.roles === undefined && 'updated' in maybeLegacy) {
+        return [
+            `## borg_sync-roles — unavailable (server out of date)`,
+            ``,
+            `The borg server returned the legacy sync-roles response shape — it is running a version older than #473, which the non-clobbering sync view does not support.`,
+            ``,
+            `**Action:** a server (worker) deploy is pending. Retry \`borg_sync-roles\` once it lands.`,
+        ].join('\n');
+    }
+    const mode = result.dryRun
+        ? '**DRY RUN** (review conflicts below; re-run with `apply: true` + a `decisions` map to commit)'
+        : '**APPLIED**';
+    const lines = [`## borg_sync-roles — ${mode}`, `Template: ${templateName}`, ''];
+    // Gather all fragments across roles + taxonomy for tallying.
+    const allFragments = [
+        ...result.roles.flatMap((r) => r.fragments),
+        ...result.taxonomy,
+    ];
+    const conflicts = allFragments.filter((f) => f.kind === 'conflict');
+    const adds = allFragments.filter((f) => f.kind === 'add');
+    const newRoles = result.roles.filter((r) => r.status === 'new');
+    const customRoles = result.roles.filter((r) => r.status === 'custom-skipped');
+    // ── Conflicts (the headline — what would be clobbered) ──
+    if (conflicts.length > 0) {
+        lines.push(`### ⚠ ${conflicts.length} CONFLICT(s) — these fragments differ between your cube and the template`);
+        if (result.dryRun) {
+            lines.push('These differ between your cube and the template — may be because you evolved them, or because the template changed them. ' +
+                'Surfaced for review, never silently overwritten. Each defaults to **KEEP (reject)** — your version survives. ' +
+                'To take the template version of a specific fragment, pass its key in `decisions` as `"<key>": "accept"`.');
+        }
+        else {
+            lines.push('Unless explicitly accepted, each conflict was KEPT (your version preserved).');
+        }
+        lines.push('');
+        for (const f of conflicts) {
+            const applied = result.applied.acceptedConflicts.includes(f.key);
+            const status = result.dryRun
+                ? '(would KEEP your version)'
+                : applied
+                    ? '✓ accepted — template version applied'
+                    : '↩ kept your version';
+            lines.push(`- **${f.label}** \`${f.key}\` ${status}`);
+            lines.push(`  - cube (current): "${trunc(f.cubeValue)}"`);
+            lines.push(`  - template (new): "${trunc(f.templateValue)}"`);
+        }
+        lines.push('');
+    }
+    // ── Unmatched decision keys (typo'd / stale — intended accept dropped) ──
+    const unmatched = result.unmatchedDecisions ?? [];
+    if (unmatched.length > 0) {
+        lines.push(`### ⚠ ${unmatched.length} decision key(s) matched no conflict and were ignored`);
+        lines.push('These keys in your `decisions` map did not correspond to any classified conflict this run ' +
+            '(typo or stale key) — their intended accept had NO effect. Check the exact keys against the conflicts above:');
+        for (const k of unmatched) {
+            lines.push(`- \`${k}\``);
+        }
+        lines.push('');
+    }
+    // ── Additions (safe auto-apply, zero clobber risk) ──
+    if (newRoles.length > 0 || adds.length > 0) {
+        lines.push(`### Additions (safe — auto-applied, zero clobber risk)`);
+        for (const r of newRoles) {
+            const note = result.dryRun ? '(new role — would be created)' : '✓ created';
+            lines.push(`- new role **${r.name}** ${note}`);
+        }
+        for (const f of adds) {
+            const note = result.dryRun ? '(would be added)' : '✓ added';
+            lines.push(`- **${f.label}** \`${f.key}\` ${note}`);
+        }
+        lines.push('');
+    }
+    // ── Custom roles (never touched) ──
+    if (customRoles.length > 0) {
+        lines.push(`### Custom roles (untouched): ${customRoles.map((r) => r.name).join(', ')}`);
+        lines.push('');
+    }
+    // ── Clean no-op ──
+    if (conflicts.length === 0 && adds.length === 0 && newRoles.length === 0) {
+        lines.push('✓ Cube roles + taxonomy are **up to date** with the template (no changes).');
+    }
+    return lines.join('\n').trimEnd();
+}
+//# sourceMappingURL=sync-roles-render.js.map

package/dist/sync-roles-render.js.map

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

package/dist/sync.d.ts

@@ -12,7 +12,7 @@
  * as a checkout.
  *
  * All git mutation/decision logic is delegated to
- * `client/src/worktree-lifecycle.ts` (the seam PR-A added:
+ * `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

package/dist/sync.d.ts.map

@@ -0,0 +1 @@
+{"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"}