@join-pantheon/cli 0.19.1 → 0.20.0

package/dist/roster-file.js

@@ -1,4 +1,5 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync, renameSync } from "node:fs";
+import { randomBytes } from "node:crypto";
 import { createHash, timingSafeEqual } from "node:crypto";
 import { dirname, join } from "node:path";
 import { fingerprint } from "./identity.js";
@@ -9,6 +10,8 @@ export class Allowlist {
     entries = new Map();
     invites = new Map();
     tokenHash = null;
+    id = null;
+    repos = new Map();
     file;
     constructor(dir, space) {
         this.file = join(dir, `${space}.members.json`);
@@ -20,18 +23,41 @@ export class Allowlist {
             for (const i of doc.invites ?? [])
                 this.invites.set(i.token, i);
             this.tokenHash = doc.tokenHash ?? null;
+            this.id = doc.id ?? null;
+            for (const r of doc.repos ?? [])
+                this.repos.set(r.fingerprint, r);
         }
     }
     flush() {
         mkdirSync(dirname(this.file), { recursive: true });
         const tmp = `${this.file}.tmp`;
         writeFileSync(tmp, JSON.stringify({
+            ...(this.id ? { id: this.id } : {}),
             members: [...this.entries.values()],
             invites: [...this.invites.values()],
             ...(this.tokenHash ? { tokenHash: this.tokenHash } : {}),
+            ...(this.repos.size ? { repos: [...this.repos.values()] } : {}),
         }, null, 2) + "\n", { mode: 0o600 });
         renameSync(tmp, this.file);
     }
+    peekId() { return this.id; }
+    spaceId() {
+        if (!this.id) {
+            this.id = `sp_${randomBytes(9).toString("base64url")}`;
+            this.flush();
+        }
+        return this.id;
+    }
+    repoList() { return [...this.repos.values()]; }
+    repoCount() { return this.repos.size; }
+    hasRepo(fingerprint) { return this.repos.has(fingerprint); }
+    addRepo(fingerprint, origin, by) {
+        if (this.repos.has(fingerprint))
+            return false;
+        this.repos.set(fingerprint, { fingerprint, origin, added_by: by, at: Date.now() });
+        this.flush();
+        return true;
+    }
     tokenMatches(token) {
         if (!this.tokenHash)
             return null;

package/dist/store.js

@@ -1,9 +1,11 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync, renameSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { emptyRefusals } from "./admin-stats.js";
 export class StateStore {
     file;
     timer = null;
     dirty = false;
+    refusals = emptyRefusals();
     constructor(dir, space) {
         this.file = join(dir, `${space}.state.json`);
     }
@@ -23,6 +25,8 @@ export class StateStore {
             }
             for (const p of snap.profiles ?? [])
                 profiles.set(p.member, p);
+            if (snap.refusals)
+                this.refusals = { total: snap.refusals.total ?? 0, by_code: snap.refusals.by_code ?? {}, recent: snap.refusals.recent ?? [], stamps: snap.refusals.stamps ?? [] };
         }
         catch {
         }
@@ -46,6 +50,7 @@ export class StateStore {
             goals: [...goals.values()],
             obligations: [...obligations.values()],
             profiles: [...profiles.values()],
+            ...(this.refusals.total ? { refusals: this.refusals } : {}),
             saved_at: Date.now(),
         };
         mkdirSync(dirname(this.file), { recursive: true });

package/dist/tray.js

@@ -3,7 +3,7 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "n
 import { platform } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { CONFIG_DIR, load } from "./config.js";
+import { CONFIG_DIR, load, loadAll, configFor } from "./config.js";
 import { workerProc, notifierProc } from "./machine.js";
 import { agentHookStates } from "./notify.js";
 import { requireDeveloperTools } from "./notifier.js";
@@ -72,6 +72,27 @@ async function getJson(url) {
     }
 }
 export async function trayStatus(cfg = load()) {
+    const f = loadAll();
+    const ms = Object.values(f?.spaces ?? {});
+    if (f && ms.length > 1) {
+        const parts = await Promise.all(ms.map((m) => trayStatusOne(configFor(f, m, null))));
+        const ok = parts.filter((p) => p.configured);
+        if (!ok.length)
+            return parts[0];
+        const [first] = ok;
+        return {
+            ...first,
+            space: ok.map((p) => p.space).join(" · "),
+            relay_ok: ok.every((p) => p.relay_ok),
+            online: ok.reduce((n, p) => n + (p.online ?? 0), 0),
+            members: ok.reduce((n, p) => n + (p.members ?? 0), 0),
+            decisions: ok.flatMap((p) => (p.decisions ?? []).map((d) => ({ ...d, body: `[${p.space}] ${d.body}` }))),
+            decisions_prompt: allDecisionsPrompt(ok.reduce((n, p) => n + (p.decisions?.length ?? 0), 0)),
+        };
+    }
+    return trayStatusOne(cfg);
+}
+async function trayStatusOne(cfg) {
     if (!cfg)
         return { configured: false, version: VERSION };
     const base = cfg.relay.replace(/^ws/, "http").replace(/\/+$/, "");

package/dist/worker-fleet.js

@@ -0,0 +1,84 @@
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { CONFIG_DIR, configFor, loadAll, repoInfo } from "./config.js";
+import { Worker } from "./worker.js";
+export class WorkerFleet {
+    opts;
+    slots = new Map();
+    stopped = false;
+    constructor(opts) {
+        this.opts = opts;
+    }
+    get running() {
+        return [...this.slots.values()].map((s) => ({ space: s.space, path: s.path }));
+    }
+    reconcile() {
+        const f = (this.opts.readConfig ?? loadAll)();
+        const started = [], stopped = [];
+        const wanted = new Map();
+        if (f) {
+            const several = Object.keys(f.spaces ?? {}).length > 1;
+            for (const b of Object.values(f.bindings ?? {})) {
+                const m = f.spaces?.[b.space];
+                if (!m || !existsSync(join(b.path, ".git")))
+                    continue;
+                if (wanted.has(m.id))
+                    continue;
+                const repo = repoInfo(b.path);
+                wanted.set(m.id, { path: b.path, cfg: configFor(f, m, repo) });
+                void several;
+            }
+            for (const [id, w] of wanted) {
+                if (this.slots.has(id))
+                    continue;
+                const home = this.opts.home ?? CONFIG_DIR;
+                const { pollMs: _p, readConfig: _r, makeWorker: _m, home: _h, ...rest } = this.opts;
+                const wopts = {
+                    ...rest,
+                    project: w.path,
+                    scratch: join(home, "worktrees", encodeURIComponent(id)),
+                    home,
+                    requirePersonaSpaces: several,
+                    log: (l) => this.opts.log(`[${w.cfg.space}] ${l}`),
+                };
+                const worker = (this.opts.makeWorker ?? ((c, o) => new Worker(c, o)))(w.cfg, wopts);
+                const done = worker.run().catch((e) => this.opts.log(`[${w.cfg.space}] ! worker stopped: ${e.message}`)).finally(() => { if (this.slots.get(id)?.worker === worker)
+                    this.slots.delete(id); });
+                this.slots.set(id, { worker, done, path: w.path, space: w.cfg.space });
+                started.push(w.cfg.space);
+            }
+        }
+        for (const [id, s] of this.slots) {
+            if (wanted.has(id))
+                continue;
+            s.worker.stop();
+            this.slots.delete(id);
+            stopped.push(s.space);
+        }
+        return { started, stopped };
+    }
+    async run() {
+        const poll = this.opts.pollMs ?? 5000;
+        while (!this.stopped) {
+            const { started, stopped } = this.reconcile();
+            for (const s of started)
+                this.opts.log(`fleet: worker for "${s}" started`);
+            for (const s of stopped)
+                this.opts.log(`fleet: worker for "${s}" stopped — binding gone`);
+            if (!this.slots.size && !started.length)
+                this.opts.log(`fleet: no bound repos on this machine — bind one with \`pantheon use <team> --here\` from its checkout`);
+            await new Promise((r) => setTimeout(r, poll));
+            if (this.opts.once && this.slots.size === 0)
+                break;
+        }
+        for (const s of this.slots.values())
+            s.worker.stop();
+        await Promise.allSettled([...this.slots.values()].map((s) => s.done));
+    }
+    stop() {
+        this.stopped = true;
+        for (const s of this.slots.values())
+            s.worker.stop();
+    }
+}
+//# sourceMappingURL=worker-fleet.js.map

package/dist/worker.js

@@ -23,8 +23,7 @@ const isRepo = (cwd) => {
         return false;
     }
 };
-export function prepareWorktree(project, scratch, goal, log) {
-    const branch = `pantheon/${goal}`;
+export function prepareWorktree(project, scratch, goal, log, branch = `pantheon/${goal}`) {
     const worktree = join(scratch, goal);
     if (existsSync(join(worktree, ".git")))
         return { branch, worktree };
@@ -136,12 +135,35 @@ DO THIS
 There is no human in this session. Do not ask for approval; you will not get an answer.
 Act, reply if a reply is owed, then finish.`;
 }
+let fleetLock = null;
 export class Worker {
     cfg;
     opts;
     running = false;
     done = [];
     stopped = false;
+    personasOnDisk = 0;
+    personas() {
+        const all = loadPersonas(this.opts.project, this.opts.home);
+        this.personasOnDisk = all.length;
+        const mine = all.filter((p) => {
+            if (p.spaces && p.spaces.length)
+                return p.spaces.includes(this.cfg.space) || (!!this.cfg.spaceId && p.spaces.includes(this.cfg.spaceId));
+            if (p.scope === "user" && this.opts.requirePersonaSpaces)
+                return false;
+            return true;
+        });
+        for (const p of all) {
+            if (mine.includes(p) || this.warnedPersona.has(p.file))
+                continue;
+            this.warnedPersona.add(p.file);
+            this.opts.log(p.spaces?.length
+                ? `  persona ${p.name} skipped — its spaces: line does not name "${this.cfg.space}"`
+                : `  persona ${p.name} skipped — a user-scope persona on a machine in several teams needs a spaces: line`);
+        }
+        return mine;
+    }
+    warnedPersona = new Set();
     skipLogged = new Set();
     contQueue = [];
     contDone = new Set();
@@ -160,16 +182,19 @@ export class Worker {
         if (this.runHomeDir)
             return this.runHomeDir;
         const base = this.opts.home ?? process.env.PANTHEON_HOME ?? join(homedir(), ".pantheon");
-        const dir = join(base, "run-homes", encodeURIComponent(this.cfg.space));
+        const dir = join(base, "run-homes", encodeURIComponent(this.cfg.spaceId ?? this.cfg.space));
         mkdirSync(dir, { recursive: true, mode: 0o700 });
         writeFileSync(join(dir, "config.json"), JSON.stringify(this.cfg, null, 2) + "\n", { mode: 0o600 });
         this.runHomeDir = dir;
         return dir;
     }
     selectPersona(client, o) {
-        const personas = loadPersonas(this.opts.project, this.opts.home);
-        if (!personas.length && !this.opts.persona)
-            return {};
+        const personas = this.personas();
+        if (!personas.length && !this.opts.persona) {
+            return this.personasOnDisk
+                ? { skip: `personas exist on this machine but none covers "${this.cfg.space}" — add \`spaces: ${this.cfg.space}\` to one, or pantheon persona init default in this repo` }
+                : {};
+        }
         const ctx = {
             ...(client.recentFrom(o.ref) ? { from: client.recentFrom(o.ref) } : {}),
             kind: o.kind,
@@ -207,7 +232,7 @@ export class Worker {
         this.opts.log(`  scratch ${resolve(this.opts.scratch)}`);
         this.opts.log(`  agent   ${agentLabel}`);
         this.opts.log(`  policy  ${this.opts.maxRunsPerHour} runs/hour, one at a time, ${this.opts.allowBash ? "bash allowed" : "edits only (bash gated)"}`);
-        const personas = loadPersonas(this.opts.project, this.opts.home);
+        const personas = this.personas();
         if (this.opts.persona && !personaByName(personas, this.opts.persona)) {
             client.close();
             throw new Error(`persona "${this.opts.persona}" not found — create it with: pantheon persona init ${this.opts.persona}`);
@@ -236,6 +261,10 @@ export class Worker {
             await this.maintain(client, arrived);
             if (this.running)
                 continue;
+            if (fleetLock && fleetLock !== this) {
+                this.writeState("watching", `waiting: a run for "${fleetLock.cfg.space}" is in progress`);
+                continue;
+            }
             const me = client.roster.find((m) => m.id === this.cfg.member);
             const liveInteractive = me?.sessions.some((s) => s.role === "interactive") ?? false;
             const grace = liveInteractive ? this.opts.graceMs : Math.min(this.opts.graceMs, 2_000);
@@ -349,6 +378,7 @@ export class Worker {
                 }
             }
             this.running = true;
+            fleetLock = this;
             this.writeState("running", candidate ? `${candidate.kind} ${candidate.id}` : `CONTINUE ${continuation.id}`);
             const job = candidate
                 ? await this.handle(client, candidate, persona, policy)
@@ -361,6 +391,8 @@ export class Worker {
                 }
             }
             this.running = false;
+            if (fleetLock === this)
+                fleetLock = null;
             this.writeState("watching", "waiting for work");
             if (this.opts.once)
                 break;
@@ -399,10 +431,10 @@ export class Worker {
         if (this.opts.allowBash && !policy.allowBash && persona) {
             this.opts.log(`  bash    off for this run — persona "${persona.name}" says allow_bash: false`);
         }
-        let branch = `pantheon/${goal}`;
+        let branch = `pantheon/${this.cfg.space}/${goal}`;
         let worktree = join(this.opts.scratch, goal);
         try {
-            ({ branch, worktree } = prepareWorktree(this.opts.project, this.opts.scratch, goal, this.opts.log));
+            ({ branch, worktree } = prepareWorktree(this.opts.project, this.opts.scratch, goal, this.opts.log, branch));
         }
         catch (e) {
             const detail = `could not prepare a worktree: ${e.message}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@join-pantheon/cli",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "description": "Let your coding agent collaborate directly with your teammates' agents — ask, agree an interface, and deliver, without a human relaying messages.",
   "type": "module",
   "bin": {