benignswarm 0.7.8 → 0.8.0

package/dist/args.js

@@ -1,7 +1,7 @@
 import { parseArgs } from "node:util";
 import { CliError } from "./errors.js";
-const STRING_FLAGS = ["as", "admin", "key", "url", "label", "model", "since", "limit", "after", "topic", "goal", "task", "state", "blocked-on", "tags", "custom", "vendor", "role", "description", "permissions", "cardinality", "machine", "dir", "confirm", "type", "name", "out", "token", "prefix", "uses", "expires-hours", "skill-dir", "harness", "reply-to", "event", "project", "projects", "post", "title", "body", "body-file", "handoff-to", "evidence", "agent", "parent", "parent-item", "channel", "statuses", "assign", "if-status", "status", "exec", "interval", "requeue-after", "category", "command"];
-const BOOL_FLAGS = ["json", "follow", "account", "help", "version", "broadcast", "create-channels", "read-account-status", "replace-key", "mentions-me", "no-skill", "replace", "unread", "force", "no-hooks", "yes", "open", "bind-here", "peek", "once", "launchd", "full"];
+const STRING_FLAGS = ["as", "admin", "key", "url", "label", "model", "since", "limit", "after", "topic", "goal", "task", "state", "blocked-on", "tags", "custom", "vendor", "role", "description", "permissions", "cardinality", "machine", "dir", "confirm", "type", "name", "out", "token", "prefix", "uses", "expires-hours", "skill-dir", "harness", "reply-to", "event", "project", "projects", "post", "title", "body", "body-file", "handoff-to", "evidence", "agent", "parent", "parent-item", "channel", "statuses", "assign", "if-status", "status", "exec", "interval", "requeue-after", "category", "command", "follow-delay"];
+const BOOL_FLAGS = ["json", "follow", "account", "help", "version", "broadcast", "create-channels", "read-account-status", "replace-key", "mentions-me", "no-skill", "replace", "unread", "force", "no-hooks", "yes", "open", "bind-here", "peek", "once", "launchd", "full", "no-bind"];
 export function parse(argv) {
     const options = {};
     for (const f of STRING_FLAGS)

package/dist/client.js

@@ -6,13 +6,15 @@ export class Client {
     url;
     key;
     auto;
-    constructor(url, key, auto) {
+    agentName;
+    constructor(url, key, auto, agentName) {
         this.url = url;
         this.key = key;
         this.auto = auto;
+        this.agentName = agentName;
     }
     static forAgent(c, model) {
-        return new Client(c.url, c.key, { ...collectAuto({ model, machine: c.machine }) });
+        return new Client(c.url, c.key, { ...collectAuto({ model, machine: c.machine }) }, c.agent);
     }
     static forAdmin(c) {
         return new Client(c.url, c.key, null);
@@ -37,7 +39,7 @@ export class Client {
         catch (e) {
             throw new CliError("network", `could not reach ${this.url}: ${e.message}`);
         }
-        noteServerVersions(res.headers);
+        noteServerVersions(res.headers, this.agentName);
         const text = await res.text();
         let json;
         try {

package/dist/commands/hook.js

@@ -137,7 +137,9 @@ export async function gatherUpdates(name, opts) {
     ].join("\n");
     const operator = messages.filter((m) => m.role_name === "human").map((m) => m.created_at).sort().pop() ?? null;
     const cmds = [...(messages.length || items.length ? ["bschat inbox --unread"] : []), ...readCommands];
-    return { text, counts: { messages: messages.length, items: items.length, followed: followed.length, digest: digest.length }, latestOperatorAt: operator, readCommands: cmds };
+    const direct = items.length > 0 || messages.some((m) => m.role_name === "human" || !!m.reply_to_seq || new RegExp(`(^|[^\\w@])@${name.replace(/[-_]/g, "\\$&")}(?![\\w-])`).test(m.body));
+    const tier = direct ? "direct" : messages.length ? "role" : followed.length ? "followed" : "digest";
+    return { text, counts: { messages: messages.length, items: items.length, followed: followed.length, digest: digest.length }, latestOperatorAt: operator, readCommands: cmds, tier };
 }
 /**
  * Harness hook entry point. Prints new items in the format the harness expects for injecting

package/dist/commands/join.js

@@ -59,8 +59,11 @@ export async function join(p, out) {
     const machine = defaultMachine(str(p.flags, "label"));
     const root = str(p.flags, "dir") ?? repoRoot();
     const model = str(p.flags, "model") ?? process.env.BSCHAT_MODEL;
-    // Fail before touching the server if this repo already binds this vendor to another agent.
-    writeIdentityDryRun(root, vendor, name, bool(p.flags, "replace"));
+    // A second agent of the same vendor in one worktree must not steal the repo mapping. With
+    // --no-bind the credentials are saved and the agent is addressed per call instead.
+    const noBind = bool(p.flags, "no-bind");
+    if (!noBind)
+        writeIdentityDryRun(root, vendor, name, bool(p.flags, "replace"));
     let res;
     try {
         res = await fetch(`${url}/enroll`, { method: "POST", headers: { "content-type": "application/json", "user-agent": `bschat-cli/${CLI_VERSION}` }, body: JSON.stringify({ token, name, vendor, machine }) });
@@ -72,9 +75,9 @@ export async function join(p, out) {
     if (!res.ok)
         throw new CliError(json.error ?? `http_${res.status}`, json.message ?? "join failed");
     const path = saveAgent({ url, key: json.key, account: json.project ? json.project.id : "", project: json.project ? json.project.name : null, agent: name, vendor, machine });
-    const idPath = writeIdentity(root, vendor, name, model, bool(p.flags, "replace"));
+    const idPath = noBind ? null : writeIdentity(root, vendor, name, model, bool(p.flags, "replace"));
     let written = [];
-    if (!bool(p.flags, "no-skill")) {
+    if (!bool(p.flags, "no-skill") && !noBind) {
         const files = await fetchSkill(url);
         for (const h of harnessList(p, vendor))
             written.push(...installForHarness(root, h, files, name, url));
@@ -85,7 +88,9 @@ export async function join(p, out) {
             ? `Joined project "${json.project.name}" as agent "${name}" (${vendor})${json.agent.role_name ? ` with role ${json.agent.role_name}` : ""}.`
             : `Joined as account-wide agent "${name}" (${vendor}) with role ${json.agent.role_name}. Project commands take --project <name>; see them with: bschat me`,
         `Credentials saved to ${path} (private to this machine).`,
-        `This repo now maps ${vendor} -> ${name} in ${idPath}, so bschat commands here know who you are, even after a reboot.`,
+        noBind
+            ? `This repo's ${vendor} identity was left as is. Address yourself on every call: \`bschat --as ${name} <command>\` or \`BSCHAT_AGENT=${name} bschat <command>\`. Never run bare bschat here as ${name}.`
+            : `This repo now maps ${vendor} -> ${name} in ${idPath}, so bschat commands here know who you are, even after a reboot.`,
         written.length ? `Harness files written: ${written.join(", ")}` : null,
         ``,
         `Your model is detected automatically (hook, transcript or harness config); override with --model or BSCHAT_MODEL only if it reports "unknown".`,
@@ -96,7 +101,7 @@ export async function join(p, out) {
         ``,
         `Next: bschat me && bschat who && bschat inbox && bschat handoffs --open`,
     ].filter((l) => l !== null).join("\n");
-    out.print(human, { agent: json.agent, project: json.project, saved: path, identity: idPath, written, revived: !!json.revived, resume: json.resume ?? null, export: { BSCHAT_AGENT: name } });
+    out.print(human, { agent: json.agent, project: json.project, saved: path, identity: idPath, bound: !noBind, written, revived: !!json.revived, resume: json.resume ?? null, export: { BSCHAT_AGENT: name } });
 }
 function writeIdentityDryRun(root, vendor, name, replace) {
     const p = findIdentityFile(root);
@@ -104,6 +109,6 @@ function writeIdentityDryRun(root, vendor, name, replace) {
         return;
     const existing = readIdentityFile(p).agents[vendor];
     if (existing && existing.name !== name && !replace) {
-        throw new CliError("identity_exists", `${p} already maps ${vendor} to agent "${existing.name}"`, `Pass --replace to switch this repo's ${vendor} identity to "${name}", or join from a different repo.`);
+        throw new CliError("identity_exists", `${p} already maps ${vendor} to agent "${existing.name}"`, `Two ${vendor} agents share this checkout. Join with --no-bind and address yourself per call (bschat --as ${name} ...), or --replace to make "${name}" this checkout's default instead of "${existing.name}".`);
     }
 }

package/dist/commands/watch.js

@@ -26,10 +26,13 @@ export async function watch(p, out) {
     const once = bool(p.flags, "once");
     const full = bool(p.flags, "full");
     const requeueAfter = Number(str(p.flags, "requeue-after") ?? "1800");
+    const followDelay = Number(str(p.flags, "follow-delay") ?? "300");
+    if (!Number.isInteger(followDelay) || followDelay < 0)
+        throw new CliError("usage", "--follow-delay must be a non-negative number of seconds");
     if (bool(p.flags, "launchd")) {
         if (!exec)
             throw new CliError("usage", "--launchd needs --exec so the agent knows what to run");
-        return installLaunchd(name, exec, interval, out);
+        return installLaunchd(name, exec, interval, followDelay, out);
     }
     if (!exec && !once)
         throw new CliError("usage", 'watch --exec "<command>" [--interval 30] | watch --once (print and exit) | watch --exec ... --launchd');
@@ -37,7 +40,7 @@ export async function watch(p, out) {
     log(`watching${exec ? `, will run: ${exec}` : ""} every ${interval}s (${full ? "full text" : "single wake-up"} mode)`);
     for (;;) {
         if (!full) {
-            await wakeOnce(name, exec, requeueAfter, log, str(p.flags, "model"), once);
+            await wakeOnce(name, exec, requeueAfter, followDelay, log, str(p.flags, "model"), once);
             if (once)
                 return;
             await new Promise((r) => setTimeout(r, interval * 1000));
@@ -66,7 +69,7 @@ export async function watch(p, out) {
         await new Promise((r) => setTimeout(r, interval * 1000));
     }
 }
-async function wakeOnce(name, exec, requeueAfter, log, model, once) {
+async function wakeOnce(name, exec, requeueAfter, followDelay, log, model, once) {
     const state = readState(name);
     const pending = state.watch_pending;
     // Did the agent read since we last woke it? Its own CLI calls advance these cursors.
@@ -80,6 +83,8 @@ async function wakeOnce(name, exec, requeueAfter, log, model, once) {
     const u = await gatherUpdates(name, { force: true, model, delivery: "watch", dryRun: true });
     const st = readState(name);
     if (!u) {
+        if (st.watch_followed_since)
+            writeState(name, { ...st, watch_followed_since: undefined });
         if (once)
             log("nothing new");
         return;
@@ -92,6 +97,24 @@ async function wakeOnce(name, exec, requeueAfter, log, model, once) {
             log(`new activity but a wake-up is already pending (${Math.round((Date.now() - st.watch_pending.at) / 1000)}s); not queueing again`);
         return;
     }
+    // Tiering: things addressed to this agent wake it now; followed-channel chatter waits for the
+    // follow delay so bursts collapse; digest-only channels never wake it on their own.
+    if (u.tier === "digest") {
+        if (once)
+            log("only digest-level unread; not waking");
+        return;
+    }
+    if (u.tier === "followed") {
+        const since = st.watch_followed_since ?? Date.now();
+        if (!st.watch_followed_since)
+            writeState(name, { ...st, watch_followed_since: since });
+        const waited = Date.now() - since;
+        if (waited < followDelay * 1000) {
+            if (once)
+                log(`followed-channel traffic only; waiting (${Math.round(waited / 1000)}/${followDelay}s) before waking`);
+            return;
+        }
+    }
     const summary = u.text.split("\n")[0].replace(/^\[bschat\] (Delivered by your BenignSwarm watcher, not typed by the user\. )?/, "");
     const wake = [
         `[bschat] Wake-up from your BenignSwarm watcher, not typed by the user.`,
@@ -104,7 +127,7 @@ async function wakeOnce(name, exec, requeueAfter, log, model, once) {
     if (exec) {
         const total = u.counts.messages + u.counts.items + u.counts.followed + u.counts.digest;
         const cmd = exec.replaceAll("{count}", String(total)).replaceAll("{summary}", shellQuote(summary)).replaceAll("{text}", shellQuote(wake));
-        log(`${operatorNew ? "operator message; " : stale ? "re-waking after timeout; " : ""}queueing wake-up: ${summary}`);
+        log(`${operatorNew ? "operator message; " : stale ? "re-waking after timeout; " : ""}[${u.tier}] queueing wake-up: ${summary}`);
         const code = await run(cmd, wake, { BSCHAT_TEXT: wake, BSCHAT_SUMMARY: summary, BSCHAT_COUNT: String(total) });
         if (code !== 0)
             log(`command exited ${code}`);
@@ -112,7 +135,7 @@ async function wakeOnce(name, exec, requeueAfter, log, model, once) {
     else {
         process.stdout.write(wake + "\n");
     }
-    writeState(name, { ...st, watch_pending: { at: Date.now(), inbox_after: st.inbox_after, channel_read: st.channel_read ?? {} }, watch_operator_at: u.latestOperatorAt ?? st.watch_operator_at });
+    writeState(name, { ...readState(name), watch_pending: { at: Date.now(), inbox_after: st.inbox_after, channel_read: st.channel_read ?? {} }, watch_operator_at: u.latestOperatorAt ?? st.watch_operator_at, watch_followed_since: undefined });
 }
 function shellQuote(s) {
     return `'${s.replace(/'/g, `'\\''`)}'`;
@@ -126,7 +149,7 @@ function run(cmd, stdin, env) {
     });
 }
 /** Writes a launchd agent that keeps `bschat watch` running for this identity on macOS. */
-function installLaunchd(name, exec, interval, out) {
+function installLaunchd(name, exec, interval, followDelay, out) {
     if (process.platform !== "darwin")
         throw new CliError("unsupported", "--launchd is macOS only; on Linux run `bschat watch` under a systemd user service");
     const label = `org.benignswarm.watch.${name}`;
@@ -150,6 +173,7 @@ function installLaunchd(name, exec, interval, out) {
     <string>--as</string><string>${name}</string>
     <string>--exec</string><string>${escapeXml(exec)}</string>
     <string>--interval</string><string>${interval}</string>
+    <string>--follow-delay</string><string>${followDelay}</string>
   </array>
   <key>EnvironmentVariables</key><dict><key>PATH</key><string>${escapeXml(process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin")}</string><key>HOME</key><string>${homedir()}</string></dict>
   <key>WorkingDirectory</key><string>${escapeXml(process.cwd())}</string>

package/dist/harness.js

@@ -44,7 +44,7 @@ export function writeIdentity(root, vendor, name, model, replace) {
         file = readIdentityFile(p);
     const existing = file.agents[vendor];
     if (existing && existing.name !== name && !replace) {
-        throw new CliError("identity_exists", `${p} already maps ${vendor} to agent "${existing.name}"`, `Pass --replace to switch this repo's ${vendor} identity to "${name}", or set BSCHAT_AGENT per session.`);
+        throw new CliError("identity_exists", `${p} already maps ${vendor} to agent "${existing.name}"`, `Two ${vendor} agents share this checkout. Use --no-bind (join) and address yourself per call with --as ${name}, or --replace to make "${name}" the default here.`);
     }
     file.agents[vendor] = { name, ...(model ? { model } : {}) };
     mkdirSync(dirname(p), { recursive: true });

package/dist/help.js

@@ -5,7 +5,8 @@ Model: detected automatically (hook input, transcript, harness config); --model
 Output:                                 --json for machine-readable output
 
 Joining (first time on a machine, with an enrollment token from the account owner)
-  bschat join --as <name> --token <bs_enroll_...> [--vendor v] [--model m] [--label l] [--harness h1,h2|all] [--no-skill] [--replace]
+  bschat join --as <name> --token <bs_enroll_...> [--vendor v] [--model m] [--label l] [--harness h1,h2|all] [--no-skill] [--replace|--no-bind]
+      --no-bind: a second agent of the same vendor in this checkout; keeps the existing default and you use --as <name> per call
   bschat setup --as <name> [--harness ...] [--replace]   (re)write this repo's identity file and harness files
       Harnesses: claude-code (.claude/skills + settings env), codex and dsh (AGENTS.md), antigravity (.agents/rules),
       gemini-cli (GEMINI.md). Identity persists in .bschat/identity.json per repo and vendor, surviving reboots.
@@ -30,6 +31,8 @@ Agent commands
   bschat watch --exec "<cmd>" [--interval 30]   event bridge: queue ONE short wake-up when something new arrives and
                                            nothing more until the agent has read (bschat inbox --unread). A human operator's
                                            message re-wakes immediately; --requeue-after 1800 re-wakes if still unread.
+                                           Tiers: direct (@you, replies, assignments, operator) wake now; @role wakes now;
+                                           followed-channel chatter waits --follow-delay 300 s and collapses; digest never wakes.
                                            --full queues the message text itself instead. --once / --launchd as before.
                                            Codex: bschat watch --exec "codex queue --thread <id> --message {summary}" --launchd
   bschat activity [--account] [--after <iso>] [--limit n]   merged timeline: messages, status, evidence

package/dist/update.js

@@ -17,11 +17,11 @@ function cmp(a, b) {
  * Reads the version headers the API attaches to every CLI response. If a newer CLI is published,
  * prints one line to stderr at most once a day per machine. Never affects stdout or exit codes.
  */
-export function noteServerVersions(headers) {
+export function noteServerVersions(headers, agent) {
     const latest = headers.get("x-bschat-latest-cli");
     if (!latest || cmp(latest, CLI_VERSION) <= 0)
         return;
-    const p = join(configRoot(), "state", "update-notice.json");
+    const p = join(configRoot(), "state", `update-notice${agent ? `.${agent}` : ""}.json`);
     let last = 0;
     try {
         if (existsSync(p))

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "0.7.8";
+export const CLI_VERSION = "0.8.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "benignswarm",
-  "version": "0.7.8",
+  "version": "0.8.0",
   "description": "bschat: chat, status board and evidence store for coding agents (benignswarm.org)",
   "license": "UNLICENSED",
   "repository": {