@join-pantheon/cli 0.33.5 → 0.33.6-rc.1

package/dist/tray.js

@@ -11,6 +11,8 @@ import { plistPath, serviceInstalled, whichPantheon } from "./service.js";
 import { VERSION } from "./version.js";
 import { LIMITS } from "./protocol.js";
 import { signedRead } from "./reads.js";
+import { clearRemoval, recordRemoval, removalFor, removalHolds, removalRefusal } from "./removed.js";
+import { pickupEstimate } from "./pickup.js";
 import { allDecisionsPrompt, decisionPrompt, decisionTitle, owedPrompt, stripCeremony, tidyIds, tidyLead, waitingPrompt, workerSummary } from "./decision-ui.js";
 import { loadProfile, SURFACE_BUNDLE_IDS } from "./profile.js";
 const HERE = dirname(fileURLToPath(import.meta.url));
@@ -116,7 +118,8 @@ function workerState(home = CONFIG_DIR) {
         const raw = JSON.parse(readFileSync(join(home, "worker-state.json"), "utf8"));
         if (!raw.at || Date.now() - raw.at > 10 * 60_000)
             return undefined;
-        return raw.detail ? `${raw.state} — ${raw.detail}` : raw.state;
+        const line = (x) => String(x ?? "").replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, " ").replace(/\s+/g, " ").trim().slice(0, 160);
+        return raw.detail ? `${line(raw.state)} — ${line(raw.detail)}` : line(raw.state);
     }
     catch {
         return undefined;
@@ -136,13 +139,29 @@ async function getJson(url) {
         clearTimeout(t);
     }
 }
-async function signedObligations(cfg) {
+async function signedObligations(cfg, removed = null) {
     try {
         const res = await signedRead(cfg, "/obligations", {}, { timeoutMs: LIMITS.pendingTimeoutMs });
-        return res.ok ? await res.json() : null;
+        let refusedAsRemoved = false;
+        if (removed) {
+            const team = { space: cfg.space, spaceId: cfg.spaceId ?? null, relay: cfg.relay, member: cfg.member };
+            try {
+                if (res.status === 403) {
+                    const why = await res.clone().json().catch(() => null);
+                    if (why?.code === "REVOKED") {
+                        refusedAsRemoved = true;
+                        recordRemoval(team, removalRefusal(`REVOKED: ${why.error ?? ""} Only a member`)?.by ?? removed.by);
+                    }
+                }
+                else if (res.ok)
+                    clearRemoval(team);
+            }
+            catch { }
+        }
+        return { body: res.ok ? await res.json() : null, refusedAsRemoved };
     }
     catch {
-        return null;
+        return { body: null, refusedAsRemoved: false };
     }
 }
 export async function trayStatus(cfg = load(), f = loadAll()) {
@@ -160,6 +179,7 @@ export async function trayStatus(cfg = load(), f = loadAll()) {
             relay_ok: ok.every((p) => p.relay_ok),
             decisions_ok: ok.every((p) => p.decisions_ok),
             unavailable_spaces: ok.flatMap((p) => p.unavailable_spaces ?? []),
+            removed_spaces: ok.flatMap((p) => p.removed_spaces ?? []),
             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}` }))),
@@ -175,10 +195,24 @@ async function trayStatusOne(cfg) {
     if (!cfg)
         return { configured: false, version: VERSION };
     const base = cfg.relay.replace(/^ws/, "http").replace(/\/+$/, "");
-    const [health, obligations] = await Promise.all([
+    const record = (() => { try {
+        return removalFor({ space: cfg.space, spaceId: cfg.spaceId ?? null, relay: cfg.relay, member: cfg.member });
+    }
+    catch {
+        return null;
+    } })();
+    const removed = removalHolds(record);
+    const [health, probe] = await Promise.all([
         getJson(`${base}/health?space=${encodeURIComponent(cfg.space)}`),
-        signedObligations(cfg),
+        removed ? Promise.resolve({ body: null, refusedAsRemoved: false }) : signedObligations(cfg, record),
     ]);
+    const obligations = probe.body;
+    const rosterRaw = obligations?.roster;
+    const roster = Array.isArray(rosterRaw) ? rosterRaw : null;
+    const membersRaw = obligations?.members;
+    const myMayWake = Array.isArray(membersRaw) ? membersRaw.find((m) => m.member === cfg.member)?.may_wake : undefined;
+    const relayAt = obligations?.now;
+    const relayNow = typeof relayAt === "number" && Number.isFinite(relayAt) ? relayAt : Date.now();
     const space = health
         ?.spaces?.find((s) => s.name === cfg.space);
     const pending = obligations?.obligations;
@@ -213,7 +247,10 @@ async function trayStatusOne(cfg) {
         ...owed.map((o) => row(o, "owed", "you", owedPrompt(decisionTitle(o.body), o.goal))),
         ...waiting.map((o) => {
             const who = o.owner.replace(/^human:/, "");
-            const r = row(o, "waiting", who, waitingPrompt(who, decisionTitle(o.body), o.goal));
+            const r0 = row(o, "waiting", who, waitingPrompt(who, decisionTitle(o.body), o.goal));
+            const r = roster && !o.owner.startsWith("human:") && o.kind !== "DELIVER"
+                ? { ...r0, pickup: pickupEstimate(roster.find((m) => m.id === who) ?? { id: who, sessions: [] }, { now: relayNow, about: { ref: o.ref ?? null, goal: o.goal ?? null }, ...(myMayWake !== undefined ? { mayWake: myMayWake } : {}) }).says }
+                : r0;
             return o.owner.startsWith("human:")
                 ? { ...r, title: `${who} decides: ${r.title}`, headline: `${who} decides: ${r.headline}`, decider: who }
                 : r;
@@ -235,6 +272,7 @@ async function trayStatusOne(cfg) {
         relay_ok: !!space,
         decisions_ok: decisionsOk,
         unavailable_spaces: !space || !decisionsOk ? [cfg.space] : [],
+        ...(removed || probe.refusedAsRemoved ? { removed_spaces: [cfg.space] } : {}),
         online: space?.online ?? 0,
         members: space?.members ?? 0,
         worker_running: workerRunning,

package/dist/usage.js

@@ -0,0 +1,97 @@
+export const USAGE_KEEP_DAYS = 400;
+export const USAGE_SHOW_DAYS = 30;
+const DAY_MS = 24 * 60 * 60 * 1_000;
+export const emptyUsage = (space) => ({ v: 1, ...(space ? { space } : {}), days: {} });
+const emptyDay = () => ({ acts: {}, by_worker: 0, by_person: 0, goals_opened: 0, goals_closed: 0 });
+export const dayKey = (ts) => new Date(ts).toISOString().slice(0, 10);
+const count = (n) => (typeof n === "number" && Number.isFinite(n) && n >= 0 ? Math.floor(n) : 0);
+const ACT_NAME = /^[A-Z_]{1,32}$/;
+const DAY_NAME = /^\d{4}-\d{2}-\d{2}$/;
+export function parseUsage(raw) {
+    const book = emptyUsage();
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return book;
+    const r = raw;
+    if (typeof r.space === "string" && r.space)
+        book.space = r.space;
+    if (!r.days || typeof r.days !== "object" || Array.isArray(r.days))
+        return book;
+    for (const [day, v] of Object.entries(r.days)) {
+        if (!DAY_NAME.test(day) || !v || typeof v !== "object")
+            continue;
+        const d = v;
+        const acts = {};
+        if (d.acts && typeof d.acts === "object" && !Array.isArray(d.acts)) {
+            for (const [a, n] of Object.entries(d.acts))
+                if (ACT_NAME.test(a) && count(n))
+                    acts[a] = count(n);
+        }
+        book.days[day] = { acts, by_worker: count(d.by_worker), by_person: count(d.by_person), goals_opened: count(d.goals_opened), goals_closed: count(d.goals_closed) };
+    }
+    return book;
+}
+export function pruneUsage(book, now = Date.now()) {
+    const oldest = dayKey(now - (USAGE_KEEP_DAYS - 1) * DAY_MS);
+    for (const day of Object.keys(book.days))
+        if (day < oldest)
+            delete book.days[day];
+}
+function today(book, now) {
+    const k = dayKey(now);
+    let d = book.days[k];
+    if (!d) {
+        d = book.days[k] = emptyDay();
+        pruneUsage(book, now);
+    }
+    return d;
+}
+export function countMessage(book, act, role, now = Date.now()) {
+    const d = today(book, now);
+    d.acts[act] = (d.acts[act] ?? 0) + 1;
+    if (role === "worker")
+        d.by_worker++;
+    else
+        d.by_person++;
+}
+export function countGoal(book, what, now = Date.now()) {
+    const d = today(book, now);
+    if (what === "opened")
+        d.goals_opened++;
+    else
+        d.goals_closed++;
+}
+export function usageRows(book, days = USAGE_SHOW_DAYS, now = Date.now()) {
+    const n = Math.max(1, Math.min(USAGE_KEEP_DAYS, Math.floor(days) || USAGE_SHOW_DAYS));
+    const oldest = dayKey(now - (n - 1) * DAY_MS);
+    return Object.entries(book.days)
+        .filter(([day]) => day >= oldest && day <= dayKey(now))
+        .sort(([a], [b]) => (a < b ? 1 : a > b ? -1 : 0))
+        .map(([day, d]) => ({ day, ...d, acts: { ...d.acts }, messages: Object.values(d.acts).reduce((s, x) => s + x, 0) }));
+}
+export function usageAnswer(space, book, days = USAGE_SHOW_DAYS, now = Date.now()) {
+    return { space, days: usageRows(book, days, now), kept_days: USAGE_KEEP_DAYS };
+}
+export function usageTable(space, rows, shownDays = USAGE_SHOW_DAYS) {
+    const out = [];
+    out.push(`Usage of "${space}" — the last ${shownDays} days (UTC), counted by the relay. Counts only: no message content, nothing per person.`);
+    if (!rows.length) {
+        out.push("", "Nothing counted in that time. (Counting started when the relay was upgraded to 0.33.6.)");
+        return out.join("\n");
+    }
+    const head = ["day", "messages", "by runs", "by people", "goals opened", "goals closed"];
+    const lines = rows.map((r) => [r.day, String(r.messages), String(r.by_worker), String(r.by_person), String(r.goals_opened), String(r.goals_closed)]);
+    const sum = (k) => rows.reduce((s, r) => s + r[k], 0);
+    const total = ["total", String(sum("messages")), String(sum("by_worker")), String(sum("by_person")), String(sum("goals_opened")), String(sum("goals_closed"))];
+    const width = head.map((h, i) => Math.max(h.length, ...lines.map((l) => l[i].length), total[i].length));
+    const fmt = (cells) => cells.map((c, i) => (i === 0 ? c.padEnd(width[i]) : c.padStart(width[i]))).join("  ");
+    out.push("", fmt(head), ...lines.map(fmt), fmt(width.map((w) => "-".repeat(w))), fmt(total));
+    const byAct = {};
+    for (const r of rows)
+        for (const [a, n] of Object.entries(r.acts))
+            byAct[a] = (byAct[a] ?? 0) + n;
+    const kinds = Object.entries(byAct).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+    if (kinds.length)
+        out.push("", `messages by type: ${kinds.map(([a, n]) => `${a} ${n}`).join(", ")}`);
+    return out.join("\n");
+}
+//# sourceMappingURL=usage.js.map

package/dist/which.js

@@ -83,6 +83,7 @@ function posixOnPath(name, env, ok = runnable) {
     }
     return null;
 }
+export const loginShellRunner = (timeoutMs) => (script, args) => runLoginShell(script, args, timeoutMs);
 export function loginShellLookup(name, run = runLoginShell) {
     if (!name)
         return null;
@@ -108,9 +109,9 @@ export function parseLoginAnswer(out, mark) {
     const found = said.length === 1 && said[0].startsWith("/") ? said[0] : null;
     return { found, path };
 }
-function runLoginShell(script, args) {
+function runLoginShell(script, args, timeoutMs = 15_000) {
     try {
-        return execFileSync("sh", ["-lc", script, "sh", ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 15_000 });
+        return execFileSync("sh", ["-lc", script, "sh", ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: timeoutMs, killSignal: "SIGKILL" });
     }
     catch (e) {
         const out = e.stdout;

package/dist/worker-fleet.js

@@ -4,6 +4,7 @@ import { holdsRepo, repoInside } from "./repo-find.js";
 import { CONFIG_DIR, configFor, loadAll, repoInfo } from "./config.js";
 import { Worker, workspaceOf } from "./worker.js";
 import { folderReaderLine } from "./agents.js";
+import { removalFor, removalHolds, removalWords, removedLine, removedNotice, takeTold } from "./removed.js";
 export class WorkerFleet {
     opts;
     dupSaid = new Set();
@@ -57,10 +58,12 @@ export class WorkerFleet {
                 this.stopKeeper();
             else
                 this.startKeeper(f);
-            this.alertChecks(f, Object.values(f.spaces ?? {}).filter((m) => (idCount.get(m.id) ?? 0) === 1 && !wanted.has(m.id) && this.keeper?.id !== m.id));
+            this.alertChecks(f, Object.values(f.spaces ?? {}).filter((m) => (idCount.get(m.id) ?? 0) === 1 && !wanted.has(m.id) && this.keeper?.id !== m.id && !this.removedFrom(configFor(f, m, null))));
             for (const [id, w] of wanted) {
                 if (this.slots.has(id))
                     continue;
+                if (this.removedFrom(w.cfg))
+                    continue;
                 const home = this.opts.home ?? CONFIG_DIR;
                 const { pollMs: _p, readConfig: _r, makeWorker: _m, home: _h, alertsEveryMs: _a, ...rest } = this.opts;
                 const wopts = {
@@ -90,9 +93,36 @@ export class WorkerFleet {
         }
         return { started, stopped };
     }
+    removedFrom(cfg) {
+        let r = null;
+        const team = { space: cfg.space, spaceId: cfg.spaceId ?? null, relay: cfg.relay, member: cfg.member };
+        try {
+            r = removalFor(team);
+        }
+        catch {
+            return false;
+        }
+        if (!removalHolds(r)) {
+            if (r)
+                this.removedSaid.delete(r.team);
+            return false;
+        }
+        if (!this.removedSaid.has(r.team)) {
+            this.removedSaid.add(r.team);
+            const words = removalWords(team, r.by);
+            this.opts.log(`fleet: [${cfg.space}] ${removedLine(words)}`);
+            try {
+                if (this.opts.notify && takeTold(team))
+                    this.opts.notify(removedNotice(words));
+            }
+            catch { }
+        }
+        return true;
+    }
+    removedSaid = new Set();
     startKeeper(f) {
-        const teams = Object.values(f.spaces ?? {});
-        const m = (f.default_space ? f.spaces?.[f.default_space] : undefined) ?? teams[0];
+        const teams = Object.values(f.spaces ?? {}).filter((t) => !this.removedFrom(configFor(f, t, null)));
+        const m = (f.default_space ? teams.find((t) => t.id === f.default_space) : undefined) ?? teams[0];
         if (!m) {
             this.stopKeeper();
             return;

package/dist/worker-policy.js

@@ -4,6 +4,53 @@ import { CONFIG_PATH } from "./config.js";
 import { trustWrite } from "./home-guard.js";
 import { parseJsonText } from "./text-file.js";
 import { compareVersions, isVersion } from "./installer.js";
+export const IDLE_SECONDS = { default: 120, min: 0, max: 900 };
+export function parseIdleSeconds(raw) {
+    if (raw === undefined || raw === null)
+        return null;
+    const s = String(raw).trim();
+    if (!/^\d+$/.test(s))
+        return null;
+    const n = Number(s);
+    return n >= IDLE_SECONDS.min && n <= IDLE_SECONDS.max ? n : null;
+}
+export function idleSecondsProblem(raw) {
+    return `"${raw ?? ""}" is not an idle wait — give a whole number of seconds from ${IDLE_SECONDS.min} to ${IDLE_SECONDS.max} (the default is ${IDLE_SECONDS.default}; back to it: pantheon policy set idle-seconds default)`;
+}
+export function effectiveIdleSeconds(o) {
+    if (o.flag !== undefined)
+        return { seconds: o.flag, from: "flag" };
+    if (o.policy?.idleSeconds !== undefined)
+        return { seconds: o.policy.idleSeconds, from: "policy" };
+    return { seconds: IDLE_SECONDS.default, from: "default" };
+}
+export function describeIdleSeconds(s) {
+    return s === 0 ? "at once" : s % 60 === 0 ? `${s / 60} minute${s === 60 ? "" : "s"}` : `${s} seconds`;
+}
+export const RUN_MINUTES = { default: 60, min: 5, max: 180 };
+export function parseRunMinutes(raw) {
+    if (raw === undefined || raw === null)
+        return null;
+    const s = String(raw).trim();
+    if (!/^\d+$/.test(s))
+        return null;
+    const n = Number(s);
+    return n >= RUN_MINUTES.min && n <= RUN_MINUTES.max ? n : null;
+}
+export function runMinutesProblem(raw) {
+    return `"${raw ?? ""}" is not a run limit — give a whole number of minutes from ${RUN_MINUTES.min} to ${RUN_MINUTES.max} (the default is ${RUN_MINUTES.default}; back to it: pantheon policy set run-minutes default)`;
+}
+export function effectiveRunMinutes(o) {
+    const machine = o.flag !== undefined ? { minutes: o.flag, from: "flag" }
+        : o.policy?.runMinutes !== undefined ? { minutes: o.policy.runMinutes, from: "policy" }
+            : { minutes: RUN_MINUTES.default, from: "default" };
+    return o.persona !== undefined && o.persona < machine.minutes ? { minutes: o.persona, from: "persona" } : machine;
+}
+export function describeRunMinutes(r, persona) {
+    const why = r.from === "default" ? "the default" : r.from === "policy" ? "set on this machine"
+        : r.from === "flag" ? "this worker's --run-minutes" : `lowered by persona ${persona ?? ""}`.trim();
+    return `${r.minutes} minutes per run (${why})`;
+}
 export const WAKE_NO_MS = 30 * 24 * 60 * 60 * 1_000;
 export const wakeKey = (team, member) => `${team}|${member}`;
 export function mayAskWake(p, teams, member, now = Date.now()) {
@@ -41,6 +88,15 @@ export function policyHome(home) {
 export function policyPath(home) {
     return join(policyHome(home), "worker-policy.json");
 }
+export function readinessRecheckPath(home) {
+    return join(policyHome(home), "readiness-recheck.stamp");
+}
+export function requestReadinessRecheck(home) {
+    try {
+        writeFileSync(readinessRecheckPath(home), `${Date.now()}\n`, { mode: 0o600 });
+    }
+    catch { }
+}
 const isRecord = (x) => !!x && typeof x === "object" && !Array.isArray(x);
 function readWakers(x) {
     if (!isRecord(x))
@@ -71,6 +127,8 @@ export function loadPolicy(home) {
             ...(isRecord(raw.wakeTeamFlag) ? { wakeTeamFlag: Object.fromEntries(Object.entries(raw.wakeTeamFlag).filter(([, v]) => typeof v === "number")) } : {}),
             ...(isRecord(raw.upgradeHeld) && typeof raw.upgradeHeld.version === "string" && typeof raw.upgradeHeld.node === "string"
                 ? { upgradeHeld: { version: raw.upgradeHeld.version, node: raw.upgradeHeld.node, at: Number(raw.upgradeHeld.at) || 0, why: String(raw.upgradeHeld.why ?? "") } } : {}),
+            ...(typeof raw.runMinutes === "number" && parseRunMinutes(raw.runMinutes) !== null ? { runMinutes: raw.runMinutes } : {}),
+            ...(typeof raw.idleSeconds === "number" && parseIdleSeconds(raw.idleSeconds) !== null ? { idleSeconds: raw.idleSeconds } : {}),
         };
     }
     catch {