borgmcp 1.1.7 → 1.1.9

package/dist/regen.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import{regen as i,listCubes as a}from"./remote-client.js";import{getActiveCube as c,inboxPathForDrone as u}from"./cubes.js";import{parseHookSource as h,formatLeanOrientation as l,resolveLeanIdentity as p}from"./regen-format.js";import{resolveSessionAgentKind as b}from"./codex-app-wake.js";import{handleVersionFlag as g}from"./version.js";import{gateAllowsActivation as m}from"./launch-gate.js";async function d(){if(process.stdin.isTTY)return"";try{const e=[];for await(const t of process.stdin)e.push(t);return Buffer.concat(e).toString("utf-8")}catch{return""}}async function f(){if(g(),!m("borg-regen SessionStart hook"))return;const e=h(await d()),t=await c();if(!t){await w();return}const o=u(t.cubeId,t.droneId),n=b();let s=null;try{s=await i(t.sessionToken,t.apiUrl)}catch{s=null}const r=p(t,s);process.stdout.write(l({...r,inboxPath:o,agentKind:n,source:e})+`
-`)}async function w(){const e=[];e.push("# Borg MCP \u2014 not connected to a cube"),e.push(""),e.push("The borg MCP server is installed in this project but no cube has been joined here yet."),e.push(""),e.push("**Drone instructions:**"),e.push("1. **Tell the user** which cubes exist on their account (see the list below) and ask them which one to join, or whether to create a new cube. This is the first thing you should surface in this session."),e.push("2. **Do not** call `borg_assimilate`, `borg_create-cube`, or any other state-changing borg tool until the user has chosen."),e.push("3. The user may also decline to use borg in this project at all \u2014 that's a valid choice; just stop suggesting it."),e.push("");try{const{cubes:t}=await a();if(t.length>0){e.push("## Cubes on your account");for(const o of t)e.push(`- **${o.name}** (id: ${o.id})`)}else e.push("## Cubes on your account"),e.push("_(none yet \u2014 offer to create one via `borg_create-cube` once the user confirms)_")}catch(t){e.push("## Cubes on your account"),e.push("_(could not list \u2014 "+(t?.message??String(t))+")_")}e.push(""),e.push("## Tools you can call once the user has chosen"),e.push('- Join an existing cube: `borg_assimilate cube_name="<their choice>"`'),e.push('- Create a new cube: `borg_create-cube name="<name>" cube_directive="<markdown>"` (optionally `template="software-dev"`)'),e.push("- See available templates: `borg_list-templates`"),process.stdout.write(e.join(`
+import{regen as a,listCubes as c}from"./remote-client.js";import{findProjectRoot as u,getActiveCube as h,inboxPathForDrone as l}from"./cubes.js";import{monitorStateRootForWorktree as p}from"./inbox-monitor.js";import{parseHookSource as b,formatLeanOrientation as m,resolveLeanIdentity as g}from"./regen-format.js";import{resolveSessionAgentKind as d}from"./codex-app-wake.js";import{handleVersionFlag as f}from"./version.js";import{gateAllowsActivation as w}from"./launch-gate.js";async function y(){if(process.stdin.isTTY)return"";try{const e=[];for await(const t of process.stdin)e.push(t);return Buffer.concat(e).toString("utf-8")}catch{return""}}async function v(){if(f(),!w("borg-regen SessionStart hook"))return;const e=b(await y()),t=await h();if(!t){await _();return}const o=l(t.cubeId,t.droneId),n=p(u()),r=d();let s=null;try{s=await a(t.sessionToken,t.apiUrl)}catch{s=null}const i=g(t,s);process.stdout.write(m({...i,inboxPath:o,monitorStateRoot:n,agentKind:r,source:e})+`
+`)}async function _(){const e=[];e.push("# Borg MCP \u2014 not connected to a cube"),e.push(""),e.push("The borg MCP server is installed in this project but no cube has been joined here yet."),e.push(""),e.push("**Drone instructions:**"),e.push("1. **Tell the user** which cubes exist on their account (see the list below) and ask them which one to join, or whether to create a new cube. This is the first thing you should surface in this session."),e.push("2. **Do not** call `borg_assimilate`, `borg_create-cube`, or any other state-changing borg tool until the user has chosen."),e.push("3. The user may also decline to use borg in this project at all \u2014 that's a valid choice; just stop suggesting it."),e.push("");try{const{cubes:t}=await c();if(t.length>0){e.push("## Cubes on your account");for(const o of t)e.push(`- **${o.name}** (id: ${o.id})`)}else e.push("## Cubes on your account"),e.push("_(none yet \u2014 offer to create one via `borg_create-cube` once the user confirms)_")}catch(t){e.push("## Cubes on your account"),e.push("_(could not list \u2014 "+(t?.message??String(t))+")_")}e.push(""),e.push("## Tools you can call once the user has chosen"),e.push('- Join an existing cube: `borg_assimilate cube_name="<their choice>"`'),e.push('- Create a new cube: `borg_create-cube name="<name>" cube_directive="<markdown>"` (optionally `template="software-dev"`)'),e.push("- See available templates: `borg_list-templates`"),process.stdout.write(e.join(`
 `)+`
-`)}f().catch(e=>{const t=e?.message??String(e);process.stderr.write(`borg-regen: ${t}
+`)}v().catch(e=>{const t=e?.message??String(e);process.stderr.write(`borg-regen: ${t}
 `),process.exit(1)});

package/dist/roster-render.d.ts

@@ -24,7 +24,7 @@ export interface RosterDrone {
     /**
      * gh#370 — which AI agent is running this drone. Null for drones that
      * joined before the column existed or via a launcher path that didn't
-     * forward the kind. Rendered as `(Role, kind)` when present.
+     * forward the kind. This is the agent CLI, not a model descriptor.
      */
     agent_kind?: 'claude' | 'codex' | 'opencode' | null;
     regen_count?: number | null;
@@ -32,7 +32,10 @@ export interface RosterDrone {
     wake_path_alert_class?: 'dead' | 'post-blocked' | 'presumed-dead' | 'systemic-post-block' | 'wake-path-deaf' | 'independent' | null;
     /**
      * Model descriptor (e.g., "claude:claude-opus-4-8" or "ollama:qwen3-coder-next:q4_K_M").
-     * Null for drones with no explicit model (use cube/role default).
+     * This is the configured launch setting captured at assimilation, not a live
+     * runtime model observation. It may remain after a later CLI relaunch.
+     * Null is not enough information to distinguish an inherited default from
+     * a legacy/missing report, so renderers must not infer an agent CLI from it.
      */
     model?: string | null;
 }

package/dist/roster-render.js

@@ -1,3 +1,3 @@
-import{formatDroneAddressToken as f}from"./drone-address.js";const m={degraded:"unverified",deaf:"unresponsive"};function g(t,o){return o?`${t}, ${o}`:t}function M(t){const{cubeName:o,drones:a,roles:k,resolvedSince:s,humanAgo:r}=t,l=new Map;for(const e of k)l.set(e.id,e);const n=[];if(n.push(`# Drones in cube: ${o}`),n.push(""),s&&(n.push(`_Liveness probe since ${s} (${r(s)}). \`awake\` = drone posted to the cube log after that point._`),n.push("")),!a.length)return n.push("_(no drones connected)_"),n.join(`
-`);for(const e of a){const h=l.get(e.role_id)?.name??"unknown",c=g(h,e.agent_kind),d=e.id?` ${f(e.id)}`:"",$=r(e.last_seen),i=e.model?` \xB7 \`${e.model}\``:"",p=e.wake_path&&e.wake_path!=="live"?` \xB7 \`wake-path:${m[e.wake_path]??e.wake_path}\``:"",u=e.wake_path_alert_class&&e.wake_path_alert_class!=="independent"?` \xB7 \`wake-path-class:${e.wake_path_alert_class}\``:"",_=typeof e.regen_count=="number"?` \xB7 \`regen-count:${e.regen_count}\``:"";if(s){const w=e.seen_since===!0?"`awake`":"`stale`";n.push(`- **${e.label}**${d} (${c}) \u2014 last seen ${$} \xB7 ${w}${_}${p}${u}${i}`)}else n.push(`- **${e.label}**${d} (${c}) \u2014 last seen ${$}${_}${p}${u}${i}`)}return n.join(`
-`)}export{g as formatRoleAgentLabel,M as renderRoster};
+import{formatDroneAddressToken as w}from"./drone-address.js";const m={degraded:"unverified",deaf:"unresponsive"};function g(a,o){return`Role: ${a} \xB7 Agent CLI: ${o==="claude"?"Claude Code":o==="codex"?"Codex":o==="opencode"?"OpenCode":"unknown"}`}function v(a){const{cubeName:o,drones:s,roles:k,resolvedSince:t,humanAgo:r}=a,l=new Map;for(const e of k)l.set(e.id,e);const n=[];if(n.push(`# Drones in cube: ${o}`),n.push(""),t&&(n.push(`_Liveness probe since ${t} (${r(t)}). \`awake\` = drone posted to the cube log after that point._`),n.push("")),!s.length)return n.push("_(no drones connected)_"),n.join(`
+`);for(const e of s){const h=l.get(e.role_id)?.name??"unknown",c=g(h,e.agent_kind),d=e.id?` ${w(e.id)}`:"",u=r(e.last_seen),i=e.model?` \xB7 \`Configured model: ${e.model}\``:" \xB7 `Configured model: not reported`",p=e.wake_path&&e.wake_path!=="live"?` \xB7 \`wake-path:${m[e.wake_path]??e.wake_path}\``:"",$=e.wake_path_alert_class&&e.wake_path_alert_class!=="independent"?` \xB7 \`wake-path-class:${e.wake_path_alert_class}\``:"",_=typeof e.regen_count=="number"?` \xB7 \`regen-count:${e.regen_count}\``:"";if(t){const f=e.seen_since===!0?"`awake`":"`stale`";n.push(`- **${e.label}**${d} (${c}) \u2014 last seen ${u} \xB7 ${f}${_}${p}${$}${i}`)}else n.push(`- **${e.label}**${d} (${c}) \u2014 last seen ${u}${_}${p}${$}${i}`)}return n.join(`
+`)}export{g as formatRoleAgentLabel,v as renderRoster};

package/dist/stream-status.d.ts

@@ -42,13 +42,14 @@ import type { StreamStatus } from './log-stream.js';
  * Linux per package.json `os` field; the null branch handles other
  * platforms gracefully).
  */
-export declare function checkInboxMonitorHealthy(inboxPath: string | null): boolean | null;
+export declare function checkInboxMonitorHealthy(inboxPath: string | null, monitorStateRoot?: string | null): boolean | null;
 /**
- * gh#822: is the holder heartbeat sidecar present AND stale past the threshold?
- * Absent (old monitor / just-armed) or fresh → NOT stale (false). Only a
- * present-but-stale sidecar → true (the wedged-holder signal).
+ * 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 declare function isHeartbeatStale(inboxPath: string): boolean;
+export declare function isHeartbeatStale(inboxPath: string, monitorStateRoot?: string | null): boolean;
 export interface RenderInputs {
     status: StreamStatus;
     /**
@@ -62,6 +63,8 @@ export interface RenderInputs {
      * mode but omit the exact command.
      */
     inboxPath: string | null;
+    /** Explicit worktree-local root for the Monitor command, when known. */
+    monitorStateRoot?: string | null;
     /** Drone label for the Monitor description copy. */
     droneLabel: string | null;
     /** Cube name for the Monitor description copy. */
@@ -108,6 +111,7 @@ export declare function shouldShowWakePathWarning(streamStatus: StreamStatus, in
  */
 export declare function formatWakePathPrefix(inputs: {
     inboxPath: string | null;
+    monitorStateRoot?: string | null;
     droneLabel: string | null;
     cubeName: string | null;
 }): string;

package/dist/stream-status.js

@@ -1,3 +1,3 @@
-import{spawnSync as d}from"node:child_process";import{statSync as f}from"node:fs";import{heartbeatPathFor as w,HEARTBEAT_STALE_MS as b}from"./inbox-monitor.js";function A(n){if(!n)return null;try{const t=d("pgrep",["-f",n],{encoding:"utf-8",timeout:2e3});return t.error?null:t.status===0&&t.stdout.trim().length>0?!_(n):t.status===1?!1:null}catch{return null}}function _(n){try{const t=f(w(n)).mtimeMs;return Date.now()-t>b}catch{return!1}}function g(n){const{status:t,inboxMonitorHealthy:s,inboxPath:i,droneLabel:c,cubeName:h,humanAgo:a}=n,u=t.reconnectAttempts===0&&t.lastWireActivityAt===null&&!t.connected,l=t.ownership?.state==="owned-by-other-process",p=t.ownership?.state==="orphaned-initialization",m=t.ownership?.state==="initializing";let o;p?o="**Stream blocked by an orphaned initialization lock.**":l?o="**Stream owned by another Borg MCP process.**":u?o="**Stream not started.**":t.connected?s===!1?o="**Stream connected (no inbox-Monitor \u2014 wake path broken).**":t.lastContentEventAt===null?o="**Stream connected, awaiting first content event.**":o=`**Stream connected, last content ${a(new Date(t.lastContentEventAt))}.**`:o=`**Stream disconnected (reconnect attempt ${t.reconnectAttempts}).**`;const e=[];if(e.push(o),e.push(""),e.push("# Log-stream status"),e.push(""),p?e.push("- **state**: _(orphaned stream-owner initialization)_"):m?e.push("- **state**: _(stream-owner initialization in progress)_"):l?e.push("- **state**: _(stream owner is another local process)_"):u?e.push("- **state**: _(stream not started)_"):e.push(`- **connected**: ${t.connected}`),e.push(`- **last content event**: ${t.lastContentEventAt?`${t.lastContentEventAt} (${a(new Date(t.lastContentEventAt))})`:"_(none yet)_"}`),e.push(`- **last heartbeat at**: ${t.lastHeartbeatAt?`${t.lastHeartbeatAt} (${a(new Date(t.lastHeartbeatAt))})`:"_(none)_"}`),e.push(`- **last wire activity**: ${t.lastWireActivityAt?`${t.lastWireActivityAt} (${a(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}`),l){const r=t.ownership;e.push(`- **stream owner pid**: ${r.pid??"_(unknown)_"}`),e.push(`- **stream owner cwd**: ${r.cwd??"_(unknown)_"}`),e.push(`- **stream owner heartbeat age**: ${typeof r.ageMs=="number"&&Number.isFinite(r.ageMs)?`${Math.max(0,Math.round(r.ageMs/1e3))}s`:"_(unknown)_"}`)}return t.connected&&s===!1&&(e.push("- **inbox-monitor**: _(no watcher detected \u2014 wake path broken)_"),i&&c&&h&&(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: \`tail -n 0 -F ${i}\` \u2014 persistent, 1h timeout, description "borg inbox for ${c} on cube ${h}".`))),e.join(`
-`)}function v(n,t){return n.connected&&t===!1}function S(n){const{inboxPath:t,droneLabel:s,cubeName:i}=n;return!t||!s||!i?"":["## \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: \`tail -n 0 -F ${t}\` \u2014 persistent, 1h timeout, description "borg inbox for ${s} on cube ${i}".`,"","---",""].join(`
-`)}export{A as checkInboxMonitorHealthy,S as formatWakePathPrefix,_ as isHeartbeatStale,g as renderStreamStatus,v as shouldShowWakePathWarning};
+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};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "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",