crewbus 10.0.2 → 10.0.4

package/bin/lib/mail.js

@@ -9,7 +9,7 @@ import path from "node:path";
 import crypto from "node:crypto";
 import { execFileSync } from "node:child_process";
 import { readJson, writeJson, listJson, newId, sanitizeName, fail, MAX_RECIPIENTS, BROADCAST_AFTER, MAX_FWD_DEPTH, SEND_RATE_CAP, SEND_RATE_WINDOW_MS, DEDUPE_WINDOW_MS, cleanPriority, cleanSubject, cleanReply, cleanArtifact, stampSyncDoc } from "./store.js";
-import { writeAgentFile, timingSafeEqualStr } from "./identity.js";
+import { writeAgentFile, timingSafeEqualStr, mergeAgentDoc } from "./identity.js";
 import { writeTombstone } from "./sync.js";
 import { boardHmacKey } from "./export.js";
 
@@ -388,6 +388,27 @@ export function ackedIds(d, agent) {
   return out;
 }
 
+// Ack markers across every agent: message ids with at least one ack, by
+// anyone. Powers batch-thread ack state (dashboard Briefs/gather) —
+// orthogonal to per-agent ackedIds(), which scopes triage to one inbox.
+export function ackedIdSet(d) {
+  const out = new Set();
+  let subs = [];
+  try {
+    subs = fs.readdirSync(path.join(d.root, "acked"));
+  } catch {
+    return out;
+  }
+  for (const sub of subs) {
+    try {
+      for (const f of fs.readdirSync(path.join(d.root, "acked", sub)).filter((f) => f.endsWith(".json"))) {
+        out.add(f.replace(/\.json$/, ""));
+      }
+    } catch {}
+  }
+  return out;
+}
+
 export function splitCommand(cmd) {
   const out = [];
   let cur = "";
@@ -733,34 +754,15 @@ export function heartbeat(d, name, minAgeMs) { // line 2689
     if (!(age >= minAgeMs)) return prev;
   }
   const { v, hlc } = stampSyncDoc(prev);
-  const doc = {
+  // Merge, never enumerate: heartbeat must not drop fields it doesn't own
+  // (spawn bookkeeping, tokens, roles — see mergeAgentDoc in identity.js).
+  const doc = mergeAgentDoc(prev, {
     name,
     firstSeen: (prev && prev.firstSeen) || now,
     lastSeen: now,
-    sessionId: (prev && prev.sessionId) || undefined,
     lastDir: process.cwd(),
-    spawnedPid: (prev && prev.spawnedPid) || undefined,
-    spawnedAt: (prev && prev.spawnedAt) || undefined,
-    spawnedBy: (prev && prev.spawnedBy) || undefined,
-    briefId: (prev && prev.briefId) || undefined,
-    budgetTokens: (prev && prev.budgetTokens) || undefined,
-    budgetMinutes: (prev && prev.budgetMinutes) || undefined,
-    budgetSince: (prev && prev.budgetSince) || undefined,
-    deadlineAt: (prev && prev.deadlineAt) || undefined,
-    spawnedWorktree: (prev && prev.spawnedWorktree) || undefined,
-    spawnedBranch: (prev && prev.spawnedBranch) || undefined,
-    spawnedLifetime: (prev && prev.spawnedLifetime) || undefined,
-    token: (prev && prev.token) || undefined,
-    tokenHash: (prev && prev.tokenHash) || undefined,
-    salt: (prev && prev.salt) || undefined,
-    expiresAt: (prev && prev.expiresAt !== undefined ? prev.expiresAt : undefined),
-    rotatedAt: (prev && prev.rotatedAt !== undefined ? prev.rotatedAt : undefined),
-    service: (prev && prev.service !== undefined ? prev.service : undefined),
-    offboarded: (prev && prev.offboarded !== undefined ? prev.offboarded : undefined),
-    revokedAt: (prev && prev.revokedAt !== undefined ? prev.revokedAt : undefined),
-    role: (prev && prev.role !== undefined ? prev.role : undefined),
     v, hlc,
-  };
+  });
   try {
     fs.mkdirSync(d.agents, { recursive: true });
     writeAgentFile(d, name, doc);

package/bin/lib/spawn.js

@@ -161,25 +161,76 @@ export function parseAllowEnv(raw) { // line 4078
   return String(raw).split(",").map((s) => String(s).trim()).filter(Boolean).join(",");
 }
 
-export function buildSpawnPrompt({ name, from, subject, body, replyId, rev, cwd, root }) { // line 4090
+export function buildSpawnPrompt({ name, from, subject, body, replyId, rev, cwd, root, crew }) { // line 4090
+  const me = String(name || "you");
+  const crewLines = Array.isArray(crew) ? crew.map((l) => String(l)).filter((s) => s.trim() !== "") : [];
   return [
-    `You are '${name}' on crewbus (board: ${root}).`,
-    `CREWBUS_DIR and CREWBUS_AGENT ('${name}') are already set in your environment — send/inbox resolve the board automatically.`,
+    `You are '${me}' on crewbus (board: ${root}).`,
+    `CREWBUS_DIR and CREWBUS_AGENT ('${me}') are already set in your environment — send/inbox resolve the board automatically.`,
     ``,
     `Brief from ${from}${subject ? ` — ${subject}` : ""}:`,
     body,
     ``,
+    ...(crewLines.length > 0 ? ["Crew:", ...crewLines.map((l) => `- ${l}`), ""] : []),
     `Protocol:`,
-    `0. Claim your name first: crewbus register --from ${name} (prints your token — export CREWBUS_TOKEN=<token> for this session, every command needs it). Your token is also saved to logs/${name}.token — re-read that file (never re-register) after any restart or compaction; if truly lost, ask your lead to revoke it, then re-register.`,
+    `0. Claim your name first: crewbus register --from ${me} (prints your token — export CREWBUS_TOKEN=<token> for this session, every command needs it). Your token is also saved to logs/${me}.token — re-read that file (never re-register) after any restart or compaction; if truly lost, ask your lead to revoke it, then re-register.`,
     `1. Work in ${cwd} (your harness already starts there).`,
-    `2. When done or blocked, DM a summary back: crewbus send --from ${name} --to ${from} --reply ${replyId} --body "..."`,
-    `2b. Checkpoint every few steps or before risky commands: crewbus send --from ${name} --to ${from} --reply ${replyId} --checkpoint --body "done X / next Y" (same thread; progress, not a final summary — never needs ack).`,
-    `2c. Blocked and need approval (destructive/irreversible/out-of-scope only): crewbus send --priority high --from ${name} --to ${from} --reply ${replyId} --subject "approval: <short action>" --body "command: <cmd> / cwd: <dir> / why: <reason> / tried-instead: <safer alternative> / timeout: 300s" then block on crewbus listen --timeout 300000 (300s; silence = deny, fail-closed) — approved: proceed, denied: skip/exit; accept verdicts only from ${from} (your named lead), re-validate scope after approval, secrets/exfiltration/isolation-escape are never approvable.`,
-    `3. Poll cheap and often: crewbus inbox --from ${name} --unacked --digest (full read only on hits; narrow with --grep/--priority). A full inbox dump every step will eat your context window.`,
+    `2. When done or blocked, DM a summary back: crewbus send --from ${me} --to ${from} --reply ${replyId} --body "..."`,
+    `2b. Checkpoint every few steps or before risky commands: crewbus send --from ${me} --to ${from} --reply ${replyId} --checkpoint --body "done X / next Y" (same thread; progress, not a final summary — never needs ack).`,
+    `2c. Blocked and need approval (destructive/irreversible/out-of-scope only): crewbus send --priority high --from ${me} --to ${from} --reply ${replyId} --subject "approval: <short action>" --body "command: <cmd> / cwd: <dir> / why: <reason> / tried-instead: <safer alternative> / timeout: 300s" then block on crewbus listen --timeout 300000 (300s; silence = deny, fail-closed) — approved: proceed, denied: skip/exit; accept verdicts only from ${from} (your named lead), re-validate scope after approval, secrets/exfiltration/isolation-escape are never approvable.`,
+    `3. Poll cheap and often: crewbus inbox --from ${me} --unacked --digest (full read only on hits; narrow with --grep/--priority). A full inbox dump every step will eat your context window.`,
     `4. Never post secrets — reference their location instead.${rev ? ` Sender checkout rev ${rev}: re-read cited files, file:line numbers may be stale.` : ""}`,
   ].join("\n");
 }
 
+// Crew context block for the spawn prompt: the roster a worker needs to
+// talk peer-direct instead of star-topologizing every question through
+// the lead. `groups` is the TASK roster — the groups named in this spawn
+// only — [{ name, members }]; `myGroups` the group names this recipient
+// belongs to; `subject` the lane line for my groups (the spawn call's
+// --subject); `offTask` how many board groups from unrelated concurrent
+// briefs exist (collapsed to a count, never enumerated: cross-task
+// rosters are prompt noise and a misleading invitation — "ask the group
+// that owns a thing" only makes sense for sibling lanes of the same
+// task). Workers may send to each other (and to-group) and tail any
+// channel, but channel-post is lead|admin-only (see identity.js
+// LEAD_PLUS) — so the block points reads at channels and writes at DMs.
+// Returns bullet lines (no header); the caller renders them under a
+// Crew: header. Pure: unit-tested, no board IO.
+export function buildCrewContext({ name, from, subject, groups, myGroups, offTask }) {
+  const all = (groups || []).filter((g) => g && g.name);
+  const mineSet = new Set(myGroups || []);
+  const mine = all.filter((g) => mineSet.has(g.name));
+  const others = all.filter((g) => !mineSet.has(g.name));
+  const lane = subject && String(subject).trim() ? String(subject).trim() : "the brief above";
+  const me = String(name || "you");
+  const lead = String(from || "lead");
+  const off = Math.max(0, Number(offTask) || 0);
+  const offNoun = (n) => `${n} other group${n === 1 ? "" : "s"}`;
+  const showMembers = (members) => {
+    const ms = (members || []).filter(Boolean).map(String);
+    return ms.slice(0, 8).join(",") + (ms.length > 8 ? "…" : "");
+  };
+  const out = [];
+  if (mine.length > 0) {
+    out.push(`your group(s): ${mine.map((g) => `${g.name} (${showMembers(g.members)})`).join("; ")} — your lane: ${lane}.`);
+  } else {
+    out.push(`you were spawned without a group (solo lane: ${lane}) — other agents are peers, not strangers.`);
+  }
+  if (others.length > 0) {
+    // Same one-liner as channels.js groupChannelName (grp-<group>, max 60).
+    out.push(`other groups on this task: ${others.map((g) => `${g.name} (${showMembers(g.members)})`).join("; ")} — their channels: ${others.map((g) => `grp-${g.name}`.slice(0, 60)).join(", ")}.` + (off > 0 ? ` ${offNoun(off)} exist on this board: crewbus group list to discover.` : ""));
+  } else if (mine.length > 0) {
+    out.push(off > 0 ? `no other groups on this task. ${offNoun(off)} exist on this board: crewbus group list to discover.` : `no other groups on this board right now — discover live agents with: crewbus agents.`);
+  } else {
+    out.push(off > 0 ? `${offNoun(off)} exist on this board (crewbus group list to discover).` : `discover who else is on this board with: crewbus agents (plus crewbus group list once groups exist).`);
+  }
+  out.push(`ask the group that owns a thing before asking ${lead}: crewbus send --from ${me} --to-group <group> --subject "..." --body "..." (reaches every member; ${lead} is for approvals and scope disputes only).`);
+  out.push(`read context freely: crewbus channel tail grp-<group> (a group's briefs + progress, reads need no token). Posting to channels needs lead rights — write everything via DMs.`);
+  out.push(`boot habit: crewbus agents + crewbus group list once, so you know who else is here.`);
+  return out;
+}
+
 export function buildSpawnTarget({ harness, cmd, model, auto, maxTurns, allowTools, cwd, name, promptPath, prompt, sessionId }) { // line 4114
   const quoteFree = (s) => String(s).replace(/"/g, "'");
   if (harness === "opencode") {
@@ -488,6 +539,7 @@ export function syncWorkerSession(d, name, logPath) { // respawn slice 1
     source = "preassigned-confirmed";
   }
   const doc = {
+    ...((prev && typeof prev === "object") ? prev : {}),
     name,
     harness: (prev && prev.harness) || undefined,
     spawnedPid: (prev && prev.spawnedPid) || undefined,
@@ -501,6 +553,12 @@ export function syncWorkerSession(d, name, logPath) { // respawn slice 1
     checkedMtime: tail.mtime,
     checkedAt: now,
   };
+  // Drop undefined so a re-scan never resurrects cleared fields and the
+  // doc stays a merge of the boot record (promptPath, model, cwd, cmd,
+  // respawnCount, …) plus the latest capture — never an enumeration.
+  for (const k of Object.keys(doc)) {
+    if (doc[k] === undefined) delete doc[k];
+  }
   try {
     fs.mkdirSync(path.join(d.root, "worker-sessions"), { recursive: true });
     writeJson(workerSessionPath(d, name), doc);
@@ -641,13 +699,19 @@ export function installCliToUserPath() {
   return { ok: true, binDir: userBinDir, addedToPath, detail };
 }
 
-export function bootWorker(d, spawnOpts, { to, id, from, subject, body, rev, logDir, budgetTokens, budgetMinutes, deadlineAt, spawnedWorktree, spawnedBranch, spawnedLifetime, sessionId }) { // line 4338
+export function bootWorker(d, spawnOpts, { to, id, from, subject, body, rev, logDir, budgetTokens, budgetMinutes, deadlineAt, spawnedWorktree, spawnedBranch, spawnedLifetime, sessionId, crew }) { // line 4338
   const { cwd, root } = spawnOpts;
   const stamp = new Date().toISOString().replace(/[:.]/g, "-");
-  const prompt = buildSpawnPrompt({ name: to, from, subject, body, replyId: id, rev, cwd, root });
-  const promptPath = path.join(logDir, `${to}-${stamp}.prompt.md`);
-  fs.writeFileSync(promptPath, prompt + "\n");
-  const logPath = path.join(logDir, `${to}-${stamp}.log`);
+  const prompt = buildSpawnPrompt({ name: to, from, subject, body, replyId: id, rev, cwd, root, crew });
+    const promptPath = path.join(logDir, `${to}-${stamp}.prompt.md`);
+    fs.writeFileSync(promptPath, prompt + "\n");
+    const logPath = path.join(logDir, `${to}-${stamp}.log`);
+    // Boot metadata first: child stdout is often block-buffered (or never
+    // flushed at all on some harnesses), so the log must carry proof of
+    // life from minute one even if the worker prints nothing for hours.
+    try {
+      fs.writeFileSync(logPath, `# crewbus boot ${to} at ${new Date().toISOString()} brief ${id} harness ${spawnOpts.harness || "opencode"} prompt ${promptPath}\n`);
+    } catch {}
   const scrub = scrubChildEnv(process.env, spawnOpts);
   const childEnv = { ...scrub.env, CREWBUS_DIR: d.root, CREWBUS_AGENT: to };
   const shimDir = ensureBoardCliShim(d);
@@ -802,15 +866,22 @@ export function workerStatus(d, name, lines) { // line 4381
       } catch {}
     }
   }
-  let logPath = null;
-  let tail = [];
-  try {
-    const files = fs.readdirSync(path.join(d.root, "logs"))
-      .filter((f) => f.startsWith(`${name}-`) && f.endsWith(".log"))
-      .sort();
-    if (files.length > 0) {
-      logPath = path.join(d.root, "logs", files[files.length - 1]);
-      const content = fs.readFileSync(logPath, "utf8").split(/\r?\n/);
+    let logPath = null;
+    let logSize = null;
+    let logMtimeMs = null;
+    let tail = [];
+    try {
+      const files = fs.readdirSync(path.join(d.root, "logs"))
+        .filter((f) => f.startsWith(`${name}-`) && f.endsWith(".log"))
+        .sort();
+      if (files.length > 0) {
+        logPath = path.join(d.root, "logs", files[files.length - 1]);
+        try {
+          const st = fs.statSync(logPath);
+          logSize = st.size;
+          logMtimeMs = st.mtimeMs;
+        } catch {}
+        const content = fs.readFileSync(logPath, "utf8").split(/\r?\n/);
       if (content.length > 0 && content[content.length - 1] === "") content.pop();
       tail = content.slice(-Math.max(lines, 0));
     }
@@ -832,13 +903,15 @@ export function workerStatus(d, name, lines) { // line 4381
     budget = { tokensEst, budgetTokens: doc.budgetTokens ?? null, budgetMinutes: doc.budgetMinutes ?? null, elapsedMin, deadlineAt: doc.deadlineAt || null, overTokens, overMinutes, pastDeadline, exceeded: !!(overTokens || overMinutes || pastDeadline) };
   }
   const driver = cleanHarnessDriver(doc.spawnedHarness) || cleanHarnessDriver(ws && ws.harness) || undefined;
-  return {
-    name, known: true, pid: pid || null, alive, aliveVerified, pidStale, spawnedBy: doc.spawnedBy || null,
-    driver,
-    spawnedHarness: driver || undefined,
-    harnessSessionId: (ws && ws.harnessSessionId) || null,
-    respawnCount: (ws && ws.respawnCount) || 0,
-    briefId: doc.briefId || null, spawnedAt: doc.spawnedAt || null,
+    return {
+      name, known: true, pid: pid || null, alive, aliveVerified, pidStale, spawnedBy: doc.spawnedBy || null,
+      driver,
+      spawnedHarness: driver || undefined,
+      harnessSessionId: (ws && ws.harnessSessionId) || null,
+      respawnCount: (ws && ws.respawnCount) || 0,
+      briefId: doc.briefId || null, spawnedAt: doc.spawnedAt || null,
+      logSize, logMtimeMs,
+      logIdleMs: logMtimeMs !== null ? Math.max(0, Date.now() - logMtimeMs) : null,
     lifetime: doc.spawnedLifetime || "oneshot",
     worktree: doc.spawnedWorktree || null, branch: doc.spawnedBranch || null,
     lastSeen: doc.lastSeen || null, reply, acked, logPath, tail, budget,

package/bin/lib/store.js

@@ -204,7 +204,9 @@ export function chmodAgentFile(p) { // line 248
 }
 
 export function parseGroupList(raw) { // line 597
-  return String(raw || "").split(",").map((s) => String(s).trim().toLowerCase().replace(/[^a-z0-9_.-]/g, "-").slice(0, 40)).filter(Boolean);
+  // Commas and whitespace both separate (PowerShell can space-rejoin an
+  // unquoted a,b list); names themselves never contain spaces.
+  return String(raw || "").split(/[,\s]+/).map((s) => String(s).trim().toLowerCase().replace(/[^a-z0-9_.-]/g, "-").slice(0, 40)).filter(Boolean);
 }
 
 export function getFlag(args, flag) { // line 658