benignswarm 0.4.1 → 0.5.0

package/dist/args.js

@@ -1,6 +1,6 @@
 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"];
+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"];
 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"];
 export function parse(argv) {
     const options = {};

package/dist/commands/admin.js

@@ -84,6 +84,8 @@ async function project(action, rest, p, out) {
 }
 async function agent(action, rest, p, out) {
     const c = adminClient(p);
+    if (bool(p.flags, "account"))
+        return accountAgent(action, rest, p, out, c);
     const [proj, name, extra] = rest;
     if (action === "list" && proj) {
         const r = await c.call("GET", `/projects/${proj}/agents`);
@@ -108,35 +110,95 @@ async function agent(action, rest, p, out) {
     else
         throw new CliError("usage", "admin agent create|list|role|rotate-key|delete ...", "Run: bschat --help");
 }
+async function accountAgent(action, rest, p, out, c) {
+    const [name, extra] = rest;
+    if (action === "list") {
+        const r = await c.call("GET", "/agents");
+        out.print(table(r.agents, ["name", "vendor", "role_name", "active_keys", "created_at"]), r);
+    }
+    else if (action === "create" && name) {
+        const r = await c.call("POST", "/agents", { name, vendor: need(p.flags, "vendor"), role: need(p.flags, "role"), machine: str(p.flags, "machine") ?? null });
+        out.print(`created account-wide agent ${name} with role ${r.agent.role_name}. Key shown once.\nPaste this into the agent's instructions:\n\n${r.instructions}`, r);
+    }
+    else if (action === "role" && name && extra) {
+        const r = await c.call("PATCH", `/agents/${name}`, { role: extra });
+        out.print(`agent ${name} role is now ${r.role_name}`, r);
+    }
+    else if (action === "rotate-key" && name) {
+        const r = await c.call("POST", `/agents/${name}/keys`, { machine: str(p.flags, "machine") ?? null });
+        out.print(`previous keys revoked. New key shown once.\nPaste this into the agent's instructions:\n\n${r.instructions}`, r);
+    }
+    else if (action === "delete" && name) {
+        const r = await c.call("DELETE", `/agents/${name}`);
+        out.print(`deleted account agent ${name}`, r);
+    }
+    else
+        throw new CliError("usage", "admin agent --account create <name> --vendor v --role r | list | role <name> <role> | rotate-key <name> | delete <name>");
+}
+function permsFromFlags(p, projectScoped) {
+    const raw = str(p.flags, "permissions");
+    if (raw) {
+        try {
+            return JSON.parse(raw);
+        }
+        catch {
+            throw new CliError("usage", "--permissions must be valid JSON");
+        }
+    }
+    const touched = ["post", "projects", "broadcast", "create-channels", "read-account-status"].some((k) => p.flags[k] !== undefined);
+    if (!touched)
+        return null;
+    const post = str(p.flags, "post");
+    const perms = {
+        post_channels: post ? post.split(",").map((s) => s.trim()) : ["*"],
+        broadcast: bool(p.flags, "broadcast"),
+        create_channels: bool(p.flags, "create-channels"),
+        read_account_status: bool(p.flags, "read-account-status"),
+    };
+    const projects = str(p.flags, "projects");
+    if (projects !== undefined) {
+        if (projectScoped)
+            throw new CliError("usage", "--projects only applies to account-scope roles");
+        perms.projects = projects === "" ? [] : projects.split(",").map((s) => s.trim());
+    }
+    return perms;
+}
 async function role(action, rest, p, out) {
     const c = adminClient(p);
     const proj = str(p.flags, "project");
     const base = proj ? `/projects/${proj}/roles` : "/roles";
     if (action === "list") {
         const r = await c.call("GET", base);
-        const rows = r.roles.map((x) => ({ name: x.name, scope: x.project_id ? "project" : "account", cardinality: x.cardinality, post: x.permissions.post_channels.join(","), broadcast: x.permissions.broadcast, create_channels: x.permissions.create_channels, read_account_status: x.permissions.read_account_status }));
-        out.print(table(rows, ["name", "scope", "cardinality", "post", "broadcast", "create_channels", "read_account_status"]), r);
+        const rows = r.roles.map((x) => ({ name: x.name, scope: x.project_id ? "project" : "account", cardinality: x.cardinality, projects: x.project_id ? "(own)" : (x.permissions.projects ?? []).join(",") || "(none)", post: x.permissions.post_channels.join(","), broadcast: x.permissions.broadcast, create_channels: x.permissions.create_channels, read_account_status: x.permissions.read_account_status }));
+        out.print(table(rows, ["name", "scope", "cardinality", "projects", "post", "broadcast", "create_channels", "read_account_status"]), r);
     }
     else if (action === "create" && rest[0]) {
-        let permissions = { post_channels: ["*"], broadcast: bool(p.flags, "broadcast"), create_channels: bool(p.flags, "create-channels"), read_account_status: bool(p.flags, "read-account-status") };
-        const raw = str(p.flags, "permissions");
-        if (raw) {
-            try {
-                permissions = JSON.parse(raw);
-            }
-            catch {
-                throw new CliError("usage", "--permissions must be valid JSON");
-            }
-        }
+        const permissions = permsFromFlags(p, !!proj) ?? { post_channels: ["*"], broadcast: false, create_channels: false, read_account_status: false, ...(proj ? {} : { projects: [] }) };
         const r = await c.call("POST", base, { name: rest[0], description: str(p.flags, "description") ?? "", permissions, cardinality: str(p.flags, "cardinality") ?? "many" });
-        out.print(`created ${proj ? "project" : "account"} role ${r.role.name}`, r);
+        out.print(`created ${proj ? "project" : "account"} role ${r.role.name}${!proj ? ` (projects: ${r.role.permissions.projects.join(",") || "none; set with: bschat admin role edit ${r.role.name} --projects a,b or '*'"})` : ""}`, r);
+    }
+    else if (action === "edit" && rest[0]) {
+        const body = {};
+        const d = str(p.flags, "description");
+        if (d !== undefined)
+            body.description = d;
+        const card = str(p.flags, "cardinality");
+        if (card !== undefined)
+            body.cardinality = card;
+        const permissions = permsFromFlags(p, !!proj);
+        if (permissions)
+            body.permissions = permissions;
+        if (!Object.keys(body).length)
+            throw new CliError("usage", "role edit needs --description, --cardinality, --projects, --post, --broadcast, --create-channels, --read-account-status or --permissions");
+        const r = await c.call("PATCH", `${base}/${rest[0]}`, body);
+        out.print(`updated role ${r.role.name}: projects=${r.role.permissions.projects.join(",") || "(none)"} post=${r.role.permissions.post_channels.join(",")} broadcast=${r.role.permissions.broadcast}`, r);
     }
     else if (action === "delete" && rest[0]) {
         const r = await c.call("DELETE", `${base}/${rest[0]}`);
         out.print(`deleted role ${rest[0]}`, r);
     }
     else
-        throw new CliError("usage", "admin role create|list|delete <name> [--project p]");
+        throw new CliError("usage", "admin role create|edit|list|delete <name> [--project p] [--projects a,b|*] [--post ch1,ch2] [--broadcast] [--create-channels] [--read-account-status] [--description d] [--cardinality one|many]");
 }
 async function channel(action, rest, p, out) {
     const c = adminClient(p);
@@ -154,8 +216,10 @@ async function channel(action, rest, p, out) {
 }
 async function enroll(action, rest, p, out) {
     const c = adminClient(p);
-    const [proj, id] = rest;
-    if (action === "create" && proj) {
+    const account = bool(p.flags, "account");
+    const [proj, id] = account ? [null, rest[0]] : rest;
+    const base = account ? "/account/enroll" : `/projects/${proj}/enroll`;
+    if (action === "create" && (proj || account)) {
         const body = {};
         const name = str(p.flags, "name");
         const prefix = str(p.flags, "prefix");
@@ -172,17 +236,17 @@ async function enroll(action, rest, p, out) {
         const hours = str(p.flags, "expires-hours");
         if (hours)
             body.expires_hours = Number(hours);
-        const r = await c.call("POST", `/projects/${proj}/enroll`, body);
+        const r = await c.call("POST", base, body);
         out.print(`Enrollment token created (expires ${r.enroll.expires_at}, ${r.enroll.max_uses} use${r.enroll.max_uses === 1 ? "" : "s"}).\nPaste this into the agent's instructions:\n\n${r.invite}`, r);
     }
-    else if (action === "list" && proj) {
-        const r = await c.call("GET", `/projects/${proj}/enroll`);
+    else if (action === "list" && (proj || account)) {
+        const r = await c.call("GET", base);
         out.print(table(r.enroll.map((t) => ({ ...t, joined: t.joined.join(",") })), ["id", "prefix", "status", "fixed_name", "name_prefix", "role_name", "uses", "max_uses", "expires_at", "joined"]), r);
     }
-    else if (action === "revoke" && proj && id) {
-        const r = await c.call("DELETE", `/projects/${proj}/enroll/${id}`);
+    else if (action === "revoke" && (proj || account) && id) {
+        const r = await c.call("DELETE", `${base}/${id}`);
         out.print(`revoked token ${id}`, r);
     }
     else
-        throw new CliError("usage", "admin enroll create <project> [--name n | --prefix p] [--role r] | list <project> | revoke <project> <id>");
+        throw new CliError("usage", "admin enroll create <project> [--name n | --prefix p] [--role r] | list <project> | revoke <project> <id>   (use --account instead of <project> for account-wide agents)");
 }

package/dist/commands/agent.js

@@ -13,6 +13,18 @@ function agentClient(p) {
     const model = resolveModel(str(p.flags, "model"));
     return { client: Client.forAgent(creds, model), creds };
 }
+/**
+ * The project a command acts in. Project agents: their own. Account agents: --project or
+ * BSCHAT_PROJECT, and an error naming the options otherwise.
+ */
+export function projectOf(p, creds) {
+    if (creds.project)
+        return creds.project;
+    const v = str(p.flags, "project") ?? process.env.BSCHAT_PROJECT;
+    if (!v)
+        throw new CliError("no_project", `${creds.agent} is an account-scoped agent; this command needs --project <name> (or BSCHAT_PROJECT)`, "See your accessible projects with: bschat me");
+    return v;
+}
 export async function login(p, out) {
     const name = str(p.flags, "as") ?? process.env.BSCHAT_AGENT;
     if (!name)
@@ -27,8 +39,9 @@ export async function login(p, out) {
     if (me.agent.name !== name) {
         throw new CliError("identity_mismatch", `this key belongs to agent "${me.agent.name}", not "${name}"`, `Run: bschat login --as ${me.agent.name} --key ...`);
     }
-    const path = saveAgent({ url, key, account: me.project.id, project: me.project.name, agent: name, vendor: me.agent.vendor, machine: defaultMachine(str(p.flags, "label")) });
-    out.print(`Saved identity ${name} (project ${me.project.name}) to ${path}\nNext: export BSCHAT_AGENT=${name}`, { saved: path, agent: name, project: me.project.name });
+    const project = me.project ? me.project.name : null;
+    const path = saveAgent({ url, key, account: me.project ? me.project.id : "", project, agent: name, vendor: me.agent.vendor, machine: defaultMachine(str(p.flags, "label")) });
+    out.print(`Saved identity ${name} (${project ? `project ${project}` : "account-scoped"}) to ${path}\nNext: export BSCHAT_AGENT=${name}`, { saved: path, agent: name, project });
 }
 export async function logout(p, out) {
     const name = str(p.flags, "as") ?? process.env.BSCHAT_AGENT;
@@ -41,7 +54,7 @@ export async function identities(_p, out) {
     const names = listSaved("agents");
     const rows = names.map((n) => {
         const c = loadAgent(n);
-        return { agent: n, project: c.project, url: c.url, machine: c.machine };
+        return { agent: n, project: c.project ?? "(account)", url: c.url, machine: c.machine };
     });
     const current = process.env.BSCHAT_AGENT ?? "(BSCHAT_AGENT not set)";
     out.print(`${table(rows, ["agent", "project", "url", "machine"])}\n\ncurrent: ${current}`, { identities: rows, current: process.env.BSCHAT_AGENT ?? null });
@@ -51,23 +64,24 @@ export async function me(p, out) {
     const r = await client.call("GET", "/me");
     const lines = [
         `agent:    ${r.agent.name} (${r.agent.vendor})`,
-        `project:  ${r.project.name}`,
+        r.scope === "account" ? `scope:    account-wide; projects: ${r.projects.length ? r.projects.map((x) => x.name).join(", ") : "(none allowed by your role)"}` : `project:  ${r.project.name}`,
         `role:     ${r.role ? `${r.role.name} [${r.role.scope} scope, cardinality ${r.role.cardinality}]` : "(none)"}${r.role_name_unresolved ? ` (assigned role ${r.role_name_unresolved} no longer exists)` : ""}`,
         r.role?.description ? `\n${r.role.description}\n` : "",
         `permissions: post=${r.permissions.post_channels.join(",")} broadcast=${r.permissions.broadcast} create_channels=${r.permissions.create_channels} read_account_status=${r.permissions.read_account_status}`,
-        `channels: ${r.channels.map((c) => `#${c.name}`).join(" ")}`,
+        r.scope === "account" ? `tip:      project commands take --project <name> (or BSCHAT_PROJECT)` : `channels: ${r.channels.map((c) => `#${c.name}`).join(" ")}`,
     ];
     out.print(lines.join("\n"), r);
 }
 export async function who(p, out) {
     const { client, creds } = agentClient(p);
-    if (bool(p.flags, "account")) {
+    if (bool(p.flags, "account") || (!creds.project && !str(p.flags, "project") && !process.env.BSCHAT_PROJECT)) {
         const r = await client.call("GET", "/account/agents/status");
-        const text = r.projects.map((pr) => `## ${pr.project}\n${pr.statuses.length ? pr.statuses.map(fmtStatus).join("\n") : "(no agents have reported)"}`).join("\n\n");
+        const acct = r.account.statuses.length ? `## account-wide agents\n${r.account.statuses.map(fmtStatus).join("\n")}\n\n` : "";
+        const text = acct + r.projects.map((pr) => `## ${pr.project}\n${pr.statuses.length ? pr.statuses.map(fmtStatus).join("\n") : "(no agents have reported)"}`).join("\n\n");
         out.print(text, r);
         return;
     }
-    const r = await client.call("GET", `/projects/${creds.project}/agents/status`);
+    const r = await client.call("GET", `/projects/${projectOf(p, creds)}/agents/status`);
     out.print(r.statuses.length ? r.statuses.map(fmtStatus).join("\n") : "(no agents have reported status yet)", r);
 }
 export async function status(p, out) {
@@ -94,7 +108,7 @@ export async function status(p, out) {
         }
         if (!Object.keys(body).length)
             throw new CliError("usage", "status set needs at least one of --state --goal --task --blocked-on --tags --custom");
-        const r = await client.call("PUT", `/projects/${creds.project}/agents/me/status`, body);
+        const r = await client.call("PUT", creds.project ? `/projects/${creds.project}/agents/me/status` : "/agents/me/status", body);
         out.print(fmtStatus(r.status), r);
         return;
     }
@@ -102,7 +116,7 @@ export async function status(p, out) {
         const agent = p.positionals[2];
         if (!agent)
             throw new CliError("usage", "status history <agent>");
-        const r = await client.call("GET", `/projects/${creds.project}/agents/${agent}/status/history?limit=${str(p.flags, "limit") ?? "50"}`);
+        const r = await client.call("GET", `/projects/${projectOf(p, creds)}/agents/${agent}/status/history?limit=${str(p.flags, "limit") ?? "50"}`);
         out.print(r.history.map((h) => `${h.at}  ${fmtStatus(h.status)}`).join("\n") || "(no history)", r);
         return;
     }
@@ -117,7 +131,7 @@ export async function send(p, out) {
     const replyTo = str(p.flags, "reply-to");
     if (replyTo !== undefined && !/^\d+$/.test(replyTo))
         throw new CliError("usage", "--reply-to takes the seq number of the message you are answering");
-    const r = await client.call("POST", `/projects/${creds.project}/channels/${channel}/messages`, { body, reply_to: replyTo === undefined ? null : Number(replyTo) });
+    const r = await client.call("POST", `/projects/${projectOf(p, creds)}/channels/${channel}/messages`, { body, reply_to: replyTo === undefined ? null : Number(replyTo) });
     out.print(`sent #${channel} seq ${r.message.seq}${r.message.reply_to_seq ? ` (reply to #${r.message.reply_to_seq})` : ""}${r.message.mentions.length ? ` (mentions ${r.message.mentions.length})` : ""}`, r);
 }
 export async function read(p, out) {
@@ -125,16 +139,17 @@ export async function read(p, out) {
     if (!channel)
         throw new CliError("usage", "read <channel> [--since seq] [--limit n] [--follow]");
     const { client, creds } = agentClient(p);
+    const project = projectOf(p, creds);
     const since = str(p.flags, "since");
     if (bool(p.flags, "follow")) {
-        await follow(client, `/ws/projects/${creds.project}/channels/${channel}${since !== undefined ? `?since=${since}` : ""}`, out);
+        await follow(client, `/ws/projects/${project}/channels/${channel}${since !== undefined ? `?since=${since}` : ""}`, out);
         return;
     }
     const qs = new URLSearchParams();
     if (since !== undefined)
         qs.set("since", since);
     qs.set("limit", str(p.flags, "limit") ?? "100");
-    const r = await client.call("GET", `/projects/${creds.project}/channels/${channel}/messages?${qs}`);
+    const r = await client.call("GET", `/projects/${project}/channels/${channel}/messages?${qs}`);
     const text = r.messages.length ? r.messages.map(fmtMessage).join("\n") : "(no messages)";
     out.print(`${text}\ncursor: ${r.cursor}`, r);
 }
@@ -174,32 +189,32 @@ export async function inbox(p, out) {
     if (after)
         qs.set("after", after);
     qs.set("limit", str(p.flags, "limit") ?? "50");
-    const r = await client.call("GET", `/projects/${creds.project}/inbox?${qs}`);
+    const r = await client.call("GET", `/inbox?${qs}`);
     if (unread && r.messages.length)
         writeState(creds.agent, { ...state, inbox_after: r.messages[r.messages.length - 1].created_at, last_check: Date.now() });
-    const fmt = (m) => `${fmtMessage(m)}${m.reply_to_seq ? `  (reply to #${m.reply_to_seq})` : ""}`;
+    const fmt = (m) => `${creds.project ? "" : `[${m.project}] `}${fmtMessage(m)}${m.reply_to_seq ? `  (reply to #${m.reply_to_seq})` : ""}`;
     out.print(r.messages.length ? r.messages.map(fmt).join("\n") : unread ? "(nothing new for you)" : "(nothing mentions you)", r);
 }
 export async function channels(p, out) {
     const { client, creds } = agentClient(p);
-    const r = await client.call("GET", `/projects/${creds.project}/channels`);
+    const r = await client.call("GET", `/projects/${projectOf(p, creds)}/channels`);
     out.print(table(r.channels, ["name", "topic", "created_at"]), r);
 }
 export async function channel(p, out) {
     if (p.positionals[1] !== "create" || !p.positionals[2])
         throw new CliError("usage", "channel create <name> [--topic t]");
     const { client, creds } = agentClient(p);
-    const r = await client.call("POST", `/projects/${creds.project}/channels`, { name: p.positionals[2], topic: str(p.flags, "topic") ?? "" });
+    const r = await client.call("POST", `/projects/${projectOf(p, creds)}/channels`, { name: p.positionals[2], topic: str(p.flags, "topic") ?? "" });
     out.print(`created #${r.channel.name}`, r);
 }
 export async function agents(p, out) {
     const { client, creds } = agentClient(p);
-    const r = await client.call("GET", `/projects/${creds.project}/agents`);
+    const r = await client.call("GET", `/projects/${projectOf(p, creds)}/agents`);
     out.print(table(r.agents, ["name", "vendor", "role_name", "active_keys"]), r);
 }
 export async function roles(p, out) {
     const { client, creds } = agentClient(p);
-    const r = await client.call("GET", `/projects/${creds.project}/roles`);
+    const r = await client.call("GET", creds.project ? `/projects/${creds.project}/roles` : "/roles");
     const rows = r.roles.map((x) => ({ name: x.name, scope: x.project_id ? "project" : "account", cardinality: x.cardinality, broadcast: x.permissions.broadcast, description: x.description.split("\n")[0].slice(0, 60) }));
     out.print(table(rows, ["name", "scope", "cardinality", "broadcast", "description"]), r);
 }
@@ -228,3 +243,28 @@ export async function skill(p, out) {
     }
     throw new CliError("usage", "skill <install|print>");
 }
+/** Merged timeline. Project agents: their project. Account agents and --account: every accessible project. */
+export async function activity(p, out) {
+    const { client, creds } = agentClient(p);
+    const qs = new URLSearchParams({ limit: str(p.flags, "limit") ?? "100" });
+    const after = str(p.flags, "after");
+    if (after)
+        qs.set("after", after);
+    const accountWide = bool(p.flags, "account") || (!creds.project && !str(p.flags, "project") && !process.env.BSCHAT_PROJECT);
+    const r = await client.call("GET", accountWide ? `/account/activity?${qs}` : `/projects/${projectOf(p, creds)}/activity?${qs}`);
+    const lines = r.events.map((e) => {
+        const pfx = `${e.at.slice(11, 19)} ${e.project ? `[${e.project}] ` : accountWide ? "[account] " : ""}`;
+        if (e.kind === "message")
+            return `${pfx}#${e.message.channel} ${e.message.agent_name}: ${e.message.body}${e.message.reply_to_seq ? ` (reply to #${e.message.reply_to_seq})` : ""}`;
+        if (e.kind === "status")
+            return `${pfx}${e.status.agent_name} status: ${e.status.state ?? "-"}${e.status.goal ? ` goal="${e.status.goal}"` : ""}${e.status.branch ? ` ${e.status.branch}@${e.status.head ?? "?"}` : ""}`;
+        return `${pfx}${e.evidence.agent_name} posted evidence ${e.evidence.filename} (evidence:${e.evidence.id})`;
+    });
+    out.print(lines.length ? `${lines.join("\n")}\ncursor: ${r.cursor}` : "(no activity)", r);
+}
+export async function projects(p, out) {
+    const { client } = agentClient(p);
+    const r = await client.call("GET", "/me");
+    const list = r.scope === "account" ? r.projects : [r.project];
+    out.print(list.map((x) => x.name).join("\n") || "(none)", { projects: list });
+}

package/dist/commands/evidence.js

@@ -4,6 +4,7 @@ import { basename, extname } from "node:path";
 import { str } from "../args.js";
 import { Client } from "../client.js";
 import { loadAgent, resolveAgentName, resolveModel } from "../config.js";
+import { projectOf } from "./agent.js";
 import { CliError } from "../errors.js";
 import { table } from "../output.js";
 const TYPES = {
@@ -21,6 +22,7 @@ export async function evidence(p, out) {
     const name = resolveAgentName(str(p.flags, "as"));
     const creds = loadAgent(name);
     const client = Client.forAgent(creds, resolveModel(str(p.flags, "model")));
+    const project = projectOf(p, creds);
     if (sub === "post") {
         const file = p.positionals[2];
         if (!file)
@@ -41,7 +43,7 @@ export async function evidence(p, out) {
         const label = str(p.flags, "label");
         if (label)
             headers["x-bschat-label"] = label;
-        const res = await fetch(`${creds.url}/projects/${creds.project}/evidence`, { method: "POST", headers, body: new Uint8Array(bytes) });
+        const res = await fetch(`${creds.url}/projects/${project}/evidence`, { method: "POST", headers, body: new Uint8Array(bytes) });
         const json = await res.json();
         if (!res.ok)
             throw new CliError(json.error, json.message);
@@ -49,7 +51,7 @@ export async function evidence(p, out) {
         return;
     }
     if (sub === "list") {
-        const r = await client.call("GET", `/projects/${creds.project}/evidence?limit=${str(p.flags, "limit") ?? "50"}`);
+        const r = await client.call("GET", `/projects/${project}/evidence?limit=${str(p.flags, "limit") ?? "50"}`);
         const rows = r.evidence.map((e) => ({ id: e.id, filename: e.filename, size: e.size, by: e.agent_name, label: e.label, sha256: e.sha256.slice(0, 12), created_at: e.created_at }));
         out.print(table(rows, ["id", "filename", "size", "by", "label", "sha256", "created_at"]), r);
         return;
@@ -58,7 +60,7 @@ export async function evidence(p, out) {
         const id = p.positionals[2];
         if (!id)
             throw new CliError("usage", "evidence info <id|sha256>");
-        const r = await client.call("GET", `/projects/${creds.project}/evidence/${id}`);
+        const r = await client.call("GET", `/projects/${project}/evidence/${id}`);
         out.print(Object.entries(r.evidence).map(([k, v]) => `${k.padEnd(13)} ${v}`).join("\n"), r);
         return;
     }
@@ -66,7 +68,7 @@ export async function evidence(p, out) {
         const id = p.positionals[2];
         if (!id)
             throw new CliError("usage", "evidence get <id|sha256> [--out path]");
-        const res = await fetch(`${creds.url}/projects/${creds.project}/evidence/${id}/content`, { headers: client.headers() });
+        const res = await fetch(`${creds.url}/projects/${project}/evidence/${id}/content`, { headers: client.headers() });
         if (!res.ok) {
             const json = await res.json();
             throw new CliError(json.error, json.message);

package/dist/commands/hook.js

@@ -34,7 +34,7 @@ export async function hook(p) {
         const qs = new URLSearchParams({ limit: "20" });
         if (state.inbox_after)
             qs.set("after", state.inbox_after);
-        const r = await client.call("GET", `/projects/${creds.project}/inbox?${qs}`);
+        const r = await client.call("GET", `/inbox?${qs}`);
         messages = r.messages;
     }
     catch (e) {
@@ -47,11 +47,11 @@ export async function hook(p) {
     writeState(name, next);
     if (!messages.length)
         return;
-    const lines = messages.map((m) => `${fmtMessage(m)}${m.reply_to_seq ? `  (reply to #${m.reply_to_seq})` : ""}`);
+    const lines = messages.map((m) => `${creds.project ? "" : `[${m.project}] `}${fmtMessage(m)}${m.reply_to_seq ? `  (reply to #${m.reply_to_seq})` : ""}`);
     const text = [
         `[bschat] ${messages.length} new message${messages.length === 1 ? "" : "s"} for you (${name}) on BenignSwarm:`,
         ...lines,
-        `Reply with: bschat send <channel> --reply-to <seq> "..."   (or just continue if no answer is needed)`,
+        `Reply with: bschat send ${creds.project ? "" : "--project <project> "}<channel> --reply-to <seq> "..."   (or just continue if no answer is needed)`,
     ].join("\n");
     if (harness === "claude-code") {
         process.stdout.write(JSON.stringify({ hookSpecificOutput: { hookEventName: event, additionalContext: text } }) + "\n");

package/dist/commands/join.js

@@ -71,7 +71,7 @@ export async function join(p, out) {
     const json = await res.json();
     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.id, project: json.project.name, agent: name, vendor, machine });
+    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"));
     let written = [];
     if (!bool(p.flags, "no-skill")) {
@@ -81,7 +81,9 @@ export async function join(p, out) {
         written = [...new Set(written)];
     }
     const human = [
-        `Joined project "${json.project.name}" as agent "${name}" (${vendor})${json.agent.role_name ? ` with role ${json.agent.role_name}` : ""}.`,
+        json.project
+            ? `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.`,
         written.length ? `Harness files written: ${written.join(", ")}` : null,

package/dist/help.js

@@ -10,6 +10,8 @@ Joining (first time on a machine, with an enrollment token from the account owne
       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.
 
+Account-wide agents: project commands take --project <name> (or BSCHAT_PROJECT); see projects with: bschat me
+
 Agent commands
   bschat login --as <name> --key <bs_agent_...> [--url <api>] [--label <machine-label>]
   bschat logout --as <name>
@@ -22,6 +24,8 @@ Agent commands
   bschat read <channel> [--since <seq>] [--limit n] [--follow]
   bschat inbox [--unread] [--after <iso-time>] [--limit n]   mentions of you and replies to your messages
   bschat hook claude-code [--event E]       harness hook: prints new inbox items as hook JSON (installed by join)
+  bschat activity [--account] [--after <iso>] [--limit n]   merged timeline: messages, status, evidence
+  bschat projects                          projects you can access
   bschat channels
   bschat channel create <name> [--topic t]  needs create_channels permission
   bschat agents
@@ -38,14 +42,18 @@ Admin commands (BSCHAT_ADMIN=<nickname> or --admin <nickname>)
   bschat admin signup --url <api> --key <signup-code> <account-name> <email>
   bschat admin project create|list|delete <name>
   bschat admin agent create <project> <name> --vendor <v> [--role r] [--machine m]
+  bschat admin agent --account create <name> --vendor <v> --role <r>   account-wide agent (role's --projects decides access)
+  bschat admin agent --account list|role|rotate-key|delete ...
   bschat admin agent list <project>
   bschat admin enroll create <project> [--name n | --prefix p] [--role r] [--uses n] [--expires-hours h]   prints the invite text
+  bschat admin enroll create --account --name n --role r      invite an account-wide agent
   bschat admin enroll list <project>
   bschat admin enroll revoke <project> <token-id>
   bschat admin agent role <project> <name> <role|none>
   bschat admin agent rotate-key <project> <name> [--machine m]
   bschat admin agent delete <project> <name>
   bschat admin role create <name> [--project p] [--description d] [--broadcast] [--create-channels] [--read-account-status] [--permissions '{json}'] [--cardinality one|many]
+  bschat admin role edit <name> [--project p] [--projects a,b|*] [--post c1,c2] [--broadcast] [--create-channels] [--read-account-status] [--description d] [--cardinality one|many]
   bschat admin role list [--project p]
   bschat admin role delete <name> [--project p]
   bschat admin channel create|delete <project> <name>

package/dist/index.js

@@ -25,6 +25,8 @@ const COMMANDS = {
     channel: a.channel,
     agents: a.agents,
     roles: a.roles,
+    activity: a.activity,
+    projects: a.projects,
     skill: a.skill,
     evidence,
     hook: async (p) => hook(p),

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "0.4.1";
+export const CLI_VERSION = "0.5.0";

package/package.json

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