@join-pantheon/cli 0.33.3 → 0.33.4-rc.1

package/dist/accounts.js

@@ -2,9 +2,31 @@ import { DEFAULT_PLANS, parsePlans, parseLimits, planLimits } from "./plans.js";
 import { createRequire } from "node:module";
 import { createHash, randomBytes, randomInt, timingSafeEqual } from "node:crypto";
 import { chmodSync, closeSync, mkdirSync, openSync, readdirSync, rmSync } from "node:fs";
+import { Worker } from "node:worker_threads";
 import { dirname, join } from "node:path";
 import { fingerprint } from "./identity.js";
 const nodeRequire = createRequire(import.meta.url);
+const BACKUP_WORKER = `
+const { workerData, parentPort } = require("node:worker_threads");
+const fs = require("node:fs"), path = require("node:path");
+const warn = process.emitWarning.bind(process);
+process.emitWarning = (w, ...r) => { if (String((w && w.message) || w).includes("SQLite")) return; return warn(w, ...r); };
+try {
+  const { DatabaseSync } = require("node:sqlite");
+  const { db, dir, file, keep } = workerData;
+  const conn = new DatabaseSync(db);
+  try {
+    conn.exec("PRAGMA busy_timeout = 10000");
+    conn.exec("VACUUM INTO '" + file.replace(/'/g, "''") + "'");
+  } finally { conn.close(); }
+  try { fs.chmodSync(file, 0o600); } catch {}
+  const snaps = fs.readdirSync(dir).filter((f) => f.startsWith("accounts-") && f.endsWith(".db")).sort();
+  for (const old of snaps.slice(0, Math.max(0, snaps.length - keep))) { try { fs.rmSync(path.join(dir, old)); } catch {} }
+  parentPort.postMessage({ ok: true });
+} catch (e) {
+  parentPort.postMessage({ ok: false, error: (e && e.message) || String(e) });
+}
+`;
 const CODE_TTL_MS = 10 * 60 * 1_000;
 const CODE_RESEND_COOLDOWN_MS = 60 * 1_000;
 const MAX_ATTEMPTS = 5;
@@ -28,8 +50,10 @@ export function validEmail(email) {
     return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
 }
 export class Accounts {
+    dbPath;
     db;
     constructor(dbPath) {
+        this.dbPath = dbPath;
         if (dbPath !== ":memory:") {
             mkdirSync(dirname(dbPath), { recursive: true, mode: 0o700 });
             try {
@@ -660,6 +684,35 @@ export class Accounts {
         }
         return file;
     }
+    backupAsync(dir, keep = 14) {
+        if (this.dbPath === ":memory:") {
+            try {
+                return Promise.resolve(this.backup(dir, keep));
+            }
+            catch (e) {
+                return Promise.reject(e);
+            }
+        }
+        mkdirSync(dir, { recursive: true });
+        const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+        const file = join(dir, `accounts-${stamp}.db`);
+        return new Promise((resolve, reject) => {
+            const w = new Worker(BACKUP_WORKER, { eval: true, workerData: { db: this.dbPath, dir, file, keep } });
+            let settled = false;
+            w.once("message", (m) => { settled = true; if (m.ok)
+                resolve(file);
+            else
+                reject(new Error(m.error ?? "backup failed")); });
+            w.once("error", (e) => { if (!settled) {
+                settled = true;
+                reject(e);
+            } });
+            w.once("exit", (code) => { if (!settled) {
+                settled = true;
+                reject(new Error(`backup worker exited ${code}`));
+            } });
+        });
+    }
     auditLog(opts = {}) {
         const where = [];
         const args = [];

package/dist/board.js

@@ -527,8 +527,7 @@ export async function startBoardServer(o = {}) {
                 sendJson(res, 400, { ok: false, error: "bad request" });
                 return;
             }
-            const teams = lastStatus?.status.spaces ?? [];
-            const r = await deps.cli(["history", "--goal", goal, "--json", "--last", "40", ...(teams.length > 1 ? ["--space", space] : [])], 20_000);
+            const r = await deps.cli(["history", "--goal", goal, "--json", "--last", "40", "--space", space], 20_000);
             try {
                 const acts = JSON.parse(r.out);
                 sendJson(res, 200, { ok: true, acts: acts.map((a) => ({ id: String(a.id ?? ""), act: String(a.act ?? ""), from: String(a.from ?? ""), ts: Number(a.ts) || 0, body: String(a.body ?? "").slice(0, 6000), ...(a.summary ? { summary: String(a.summary) } : {}) })) });

package/dist/cli.js

@@ -38,7 +38,9 @@ import { homedir } from "node:os";
 import { removeHook, decideStop, writeIntent, clearIntent, readIntent, repairNote, installHooks, agentHookStates } from "./notify.js";
 import { pending, render as renderPending } from "./pending.js";
 import { signedRead } from "./reads.js";
-import { start as qsStart, join as qsJoin, wireUp, teamNameFor, deviceLabel, bindableFolder } from "./quickstart.js";
+import { start as qsStart, join as qsJoin, wireUp, teamNameFor, deviceLabel, bindableFolder, startReconnects } from "./quickstart.js";
+import { alreadyMemberLine, askedLine, configureLines, fetchSeats, inUseLine, offerSeats, seatsForTeam, seatsToMove, startGate, RECOVER_WAITING_EXIT } from "./recover-offer.js";
+import { shellArg, teamNameProblem } from "./team-name.js";
 import { folderRefusalHere, isTemporaryRefusal, projectFolderAnswer } from "./folder-guard.js";
 import { installService, serviceInstalled, serviceLogFile, uninstallService } from "./service.js";
 import { LEGACY_TASK_NAME, hostAlive, hostFiles, readHostState, recordedTaskName } from "./win-host.js";
@@ -114,6 +116,39 @@ async function requireSignInOnAccountsRelay(relayFlag) {
     if (hasAccounts)
         die(`sign in first — ${relayFlag} verifies email.${signInHint("NOT_SIGNED_IN", relayFlag)}\n  Then run this same pantheon start again.`);
 }
+async function accountSeats(relay) {
+    const id = identity();
+    if (!id?.account)
+        return null;
+    if (relay && !sameHost(relay.replace(/^ws/i, "http"), id.relay.replace(/^ws/i, "http")))
+        return null;
+    const base = id.relay.replace(/^ws/, "http").replace(/\/+$/, "");
+    return Promise.race([
+        fetchSeats(() => signedFetch(id, "GET", "/account/recover").then(async (x) => ({ status: x.status, j: await relayJson(x, `${base}/account/recover`) }))),
+        new Promise((res) => setTimeout(() => res(null), 8_000).unref()),
+    ]);
+}
+async function askOnce(q) {
+    const rl = createInterface({ input: process.stdin, output: process.stderr });
+    try {
+        return await questionOrNull(rl, q);
+    }
+    finally {
+        rl.close();
+    }
+}
+async function runRecover(team) {
+    const { spawnSync } = await import("node:child_process");
+    const keep = argv.filter((a) => /^--(no-worker|no-hook|no-notifications|no-menubar|no-guide|yes)$/.test(a));
+    return spawnSync(process.execPath, [process.argv[1], "recover", team, ...keep], { stdio: "inherit" }).status ?? 1;
+}
+async function offerSeatsHere(seats, o = {}) {
+    const list = seats === undefined ? await accountSeats() : seats;
+    if (!list)
+        return null;
+    configureLines({ launcher: managedLayout()?.launcher ?? null });
+    return offerSeats(list, { tty: o.tty ?? !!process.stdin.isTTY, ask: askOnce, recover: runRecover, log: (l) => console.error(l) });
+}
 async function interactiveOnboard(relayArg, opts = {}) {
     const prior = identity();
     const relay = relayArg ?? prior?.relay ?? process.env.PANTHEON_RELAY ?? DEFAULT_RELAY;
@@ -257,6 +292,10 @@ async function interactiveOnboard(relayArg, opts = {}) {
                 console.error(`\n  ${C("You're in")} — signed in as ${B(acct.username)} <${acct.email}> on this machine.\n`);
                 if (opts.joining || opts.starting)
                     return true;
+                rl.close();
+                const res = await offerSeatsHere();
+                if (res?.offered.length)
+                    console.error("");
                 if (opts.signin) {
                     console.error(`  ${B("Signed in — tell your agent to continue;")} it will run the join or start again.`);
                     console.error(D(`  (On your own? ${C("pantheon start")} creates a team; ${C("pantheon join <invite-link>")} joins one.)`));
@@ -626,11 +665,23 @@ async function teamLimitAdvice(warning) {
 const repoLabel = (r) => r.origin ?? basename(r.root);
 const repoShare = (r) => (r.origin ? r.origin.replace(/^.*[:/]([^:/]+)$/, "$1") : basename(r.root));
 const teamFlag = (cfg) => (flag("space") ? ` --space ${cfg.space}` : "");
+function sayDefaultAfter(before, gone) {
+    if (before.default_space !== gone.id)
+        return;
+    const now = loadAll();
+    const left = Object.values(now?.spaces ?? {});
+    if (left.length === 1)
+        console.error(D(`  "${left[0].name}" is your default team now.`));
+    else if (left.length > 1)
+        console.error(D(`  It was your default team; none is picked now. A command run from a folder bound to no team asks which (pantheon use <team> picks a default). The menu bar, alerts and worker cover all ${left.length} teams either way.`));
+}
 function need() {
     const r = resolveFor(process.cwd());
     if (flag("space") && !["start", "profile"].includes(cmd)) {
         const f = loadAll();
         const m = f && findMembership(f, flag("space"));
+        if ((!f || !m) && r.cfg && r.cfg.space === flag("space") && r.reason === "env")
+            return r.cfg;
         if (!f || !m)
             die(`you are not in a team called "${flag("space")}". Yours: ${Object.values(f?.spaces ?? {}).map((x) => x.name).join(", ") || "none"}`);
         return r.cfg && (r.cfg.spaceId === m.id || r.cfg.space === m.name) && r.reason !== "default" ? r.cfg : configFor(f, m, null);
@@ -1191,13 +1242,13 @@ function usageFor(command, help) {
     return out.length ? out.join("\n") : null;
 }
 const COMMAND_FLAGS = {
-    start: "--space <name>  --relay <url>  --me <name>  --port <n>  --ttl <minutes>  --no-worker  --no-hook  --no-notifications  --no-menubar  --reset  --yes\n  and every setup answer as a flag (--name, --title, --wake, --commands, --alerts, --decides …): pantheon setup --questions",
+    start: "--space <name>  --relay <url>  --me <name>  --port <n>  --ttl <minutes>  --no-worker  --no-hook  --no-notifications  --no-menubar  --reset  --yes  --new-team (a team even though you have a seat to bring here)\n  and every setup answer as a flag (--name, --title, --wake, --commands, --alerts, --decides …): pantheon setup --questions",
     join: "<invite link | line | code>  --relay <url>  --me <name>  --no-worker  --no-hook  --no-notifications  --no-menubar  --reset  --yes\n  and every setup answer as a flag: pantheon setup --questions",
     invite: "--list  --revoke <token|all>  --may-wake | --no-wake  --ttl <minutes>",
     admit: "<member>  --may-wake | --no-wake  --revoke  --forget  --yes",
     wake: "allow <member> | deny <member> | list   --space <team>",
     trust: "[<member>]  --yes  --space <team>",
-    recover: "[<team>] | withdraw <team> | confirm <member> | cancel <member> [--yes]   --space <team>  --no-worker  --no-hook  --no-notifications  --no-menubar",
+    recover: "[<team>] | withdraw <team> | confirm <member> | cancel <member> [--yes]   --space <team>  --no-worker  --no-hook  --no-notifications  --no-menubar\n  exits 3 when the move was asked for and waits for a teammate (or a day); 0 when it moved",
     say: "<ACT> <text>  --to <member>[,<member>]  --goal <id>  --ref <id | seq | last>  --summary '<one line>'  --domains <a,b>  --branch --commit --remote (DELIVERED)  --space <team>",
     goal: "list | open \"<title>\" --with <member>[,…] [--acceptance \"…\"] [--deadline <ISO time>] [--list] | close <id> \"<summary>\"",
     history: "--goal <id>  --from <member>  --last <n>  --since <seq>  --short  --presence  --json",
@@ -1371,8 +1422,48 @@ async function main() {
             if (setupFlags.errors.length)
                 die(setupFlags.errors.join("\n") + "\n  pantheon setup --questions  lists every answer");
             const wp = unattendedProject();
+            const named = flag("space") ?? null;
+            const startFile = loadAll();
+            const localTeam = named && startFile ? findMembership(startFile, named) : undefined;
             await requireSignInOnHostedRelay(flag("relay"));
             await requireSignInOnAccountsRelay(flag("relay"));
+            const reconnect = startReconnects({ ...(named ? { space: named } : {}), reset: argv.includes("--reset") });
+            const newTeam = argv.includes("--new-team") || argv.includes("--yes");
+            let seatsKnown = false;
+            if (!reconnect && !localTeam && identity()?.account) {
+                const seats = await accountSeats(flag("relay"));
+                seatsKnown = !!seats;
+                if (seats) {
+                    const tty = !!process.stdin.isTTY;
+                    const mine = named ? seats.find((x) => x.space.toLowerCase() === named.toLowerCase()) : undefined;
+                    if (mine) {
+                        console.error(`\n\x1b[33m  ${alreadyMemberLine(mine.space)}\x1b[0m`);
+                        if (mine.in_use === true)
+                            console.error(`  ${inUseLine(mine)}`);
+                        if (!tty || mine.in_use === true)
+                            process.exit(1);
+                        const a = ((await askOnce(`  Move your seat in ${mine.space} to this machine now? [Y/n] `)) ?? "n").trim().toLowerCase();
+                        process.exit(a === "" || a === "y" || a === "yes" ? await runRecover(mine.space) : 1);
+                    }
+                    const res = named || tty || newTeam || !seatsToMove(seats).length
+                        ? await offerSeatsHere(seats, { tty: tty && !named }) : null;
+                    const gate = await startGate({ named, seats, moved: res?.moved ?? [], asked: res?.asked ?? [], tty, newTeam, ask: askOnce });
+                    if (!gate.go) {
+                        console.error("");
+                        for (const l of gate.lines)
+                            console.error(gate.code === 1 ? `\x1b[33m  ${l}\x1b[0m` : `  ${l}`);
+                        process.exit(gate.code);
+                    }
+                    if (!named && !argv.includes("--new-team") && argv.includes("--yes") && seatsToMove(seats).some((x) => !res?.moved.includes(x.space) && !res?.asked.includes(x.space))) {
+                        console.error(D(`  (--yes for a new team beside a seat you have is going away: use --new-team)`));
+                    }
+                }
+            }
+            if (named && !localTeam && seatsKnown) {
+                const bad = teamNameProblem(named);
+                if (bad)
+                    die(bad);
+            }
             console.error(`${B("pantheon start")}\n`);
             if (!flag("space") && !repoInfo(process.cwd()))
                 console.error(D(`  No git repo here, so the team will be named after this folder: "${teamNameFor(process.cwd())}". Pass --space <name> to choose.\n`));
@@ -1544,6 +1635,14 @@ async function main() {
         }
         case "init": {
             const had = argv.includes("--reset") ? null : identity();
+            if (flag("space") && !flag("token")) {
+                const f0 = loadAll();
+                if (!(f0 && findMembership(f0, flag("space")))) {
+                    const bad = teamNameProblem(flag("space"));
+                    if (bad)
+                        die(bad);
+                }
+            }
             const kp = had?.publicKey && had.privateKey ? { publicKey: had.publicKey, privateKey: had.privateKey } : newKeypair();
             const cfg = {
                 relay: flag("relay", "ws://localhost:8787"),
@@ -1614,6 +1713,17 @@ async function main() {
                 const ok = await interactiveOnboard(parsed.relay, { joining: parsed.space });
                 if (!ok || !identity()?.account)
                     die(`not signed in yet — the invite is still good.\n  When the code arrives:  pantheon verify <code>   (check spam if it is not in your inbox)\n  Then run this same \`pantheon join\` command again.`);
+                const mineAll = await accountSeats(parsed.relay);
+                const own = mineAll ? seatsForTeam(mineAll, parsed.space) : null;
+                const offer = own ? await offerSeatsHere(own) : null;
+                if (offer?.moved.length) {
+                    console.error(`\n  ${C("done")} — your seat in ${offer.moved[0]} is on this machine; the invite was not needed.`);
+                    return;
+                }
+                if (offer?.asked.length) {
+                    console.error(`\n  The invite is not needed for a team you are already in. ${askedLine(offer.asked[0])}`);
+                    process.exit(RECOVER_WAITING_EXIT);
+                }
                 console.error("");
             }
             if (!identity()?.account && sameHost(parsed.relay, DEFAULT_RELAY)) {
@@ -2698,6 +2808,7 @@ async function main() {
             const bound = Object.values(all.bindings ?? {}).filter((b) => b.space === m.id).length;
             removeMembership(m.id);
             console.error(`${B("deleted")} "${m.name}" — everyone in it was disconnected; its token${bound ? ` and ${bound} folder binding${bound === 1 ? "" : "s"}` : ""} left this machine`);
+            sayDefaultAfter(all, m);
             return;
         }
         case "uninstall":
@@ -2721,6 +2832,7 @@ async function main() {
                 }
                 removeMembership(m.id);
                 console.error(`${B("left")} "${m.name}" — its token is gone from this machine${bound.length ? `, and ${bound.length} binding${bound.length === 1 ? "" : "s"} with it (${bound.join(", ")})` : ""}.`);
+                sayDefaultAfter(all, m);
                 if (others === null)
                     console.error(D(`The relay could not be reached to check who else is in "${m.name}". If there are teammates, they still list you; one of them removes you with: pantheon admit ${all.member} --revoke`));
                 else if (others.length)
@@ -3204,6 +3316,13 @@ async function main() {
             delete nextCfg.pendingAuth;
             save(nextCfg);
             console.error(`${C("verified")} — you are ${B(acct.username)} <${acct.email}> on this device.`);
+            const offer = await offerSeatsHere();
+            if (offer?.moved.length)
+                return;
+            if (offer?.offered.length) {
+                console.error(D(`\nOr, for a team you are not in yet: pantheon join <invite>`));
+                return;
+            }
             console.error(pending.purpose === "signup"
                 ? D(`\nNext: pantheon start  (create a team)  ·  or  pantheon join <invite>  (join one)`)
                 : D(`\nThis device is now signed in. pantheon start / pantheon join work as your account.`));
@@ -3648,6 +3767,7 @@ async function main() {
                 console.log(`${C("withdrawn")} — your seat in ${team} stays where it was.`);
                 return;
             }
+            let picked = null;
             if (!sub) {
                 const r = await call("GET", "/account/recover");
                 if (r.status === 404)
@@ -3658,18 +3778,28 @@ async function main() {
                 console.log(`${B(`Your seats as ${acct.username}`)} ${D(`(this device: ${fingerprint(id.publicKey)})`)}\n`);
                 if (!seats.length)
                     console.log(D("  none — you are in no team on this relay yet"));
+                const pickable = seats.filter((s) => s.state === "ready" || s.state === "movable");
                 for (const s of seats) {
-                    const name = s.space.padEnd(18);
+                    const n = pickable.indexOf(s);
+                    const name = `${n >= 0 ? `${n + 1}. ` : "   "}${s.space}`.padEnd(21);
                     const line = s.state === "here" ? D("on this machine") :
-                        s.state === "ready" ? `moved here — save it on this machine:  ${C(`pantheon recover ${s.space}`)}` :
+                        s.state === "ready" ? `moved here — save it on this machine:  ${C(`pantheon recover ${shellArg(s.space)}`)}` :
                             s.state === "waiting" ? `waiting — moves ${new Date(s.due_at).toLocaleString()} unless someone cancels; a teammate can confirm it sooner` :
-                                s.state === "movable" ? `on another of your devices (${s.fp}) — move it here:  ${C(`pantheon recover ${s.space}`)}${D(s.alone ? "  (you are alone in it: at once)" : "  (a teammate confirms, or it waits a day)")}` :
+                                s.state === "movable" ? `on another of your devices (${s.fp}) — move it here:  ${C(`pantheon recover ${shellArg(s.space)}`)}${D(s.alone ? "  (you are alone in it: at once)" : "  (a teammate confirms, or it waits a day)")}` :
                                     D(`its key ${s.fp} was never signed in to your account here, so it cannot be moved by email — a teammate who has checked it is you: pantheon admit ${acct.username} --forget, then a new invite`);
                     console.log(`  ${name}${line}${s.founder ? D("  (founder)") : ""}`);
                 }
-                return;
+                if (!pickable.length || !process.stdin.isTTY)
+                    return;
+                const a = ((await askOnce(`\n  Move which seat to this machine? Its number (Enter for none): `)) ?? "").trim();
+                const i = Number(a);
+                if (!a)
+                    return;
+                if (!Number.isInteger(i) || i < 1 || i > pickable.length)
+                    die(`no seat numbered ${a} — run  pantheon recover  again`);
+                picked = pickable[i - 1].space;
             }
-            const team = sub;
+            const team = sub ?? picked;
             let r = await call("POST", "/account/recover", { space: team });
             if (r.status === 403 && r.j.reason === "sign_in_again" && process.stdin.isTTY) {
                 console.error(`${B("First, prove it is you")} — a code goes to ${C(acct.email)} (look in spam too if it is not there in a minute).`);
@@ -3694,7 +3824,7 @@ async function main() {
                 }
                 rl.close();
                 if (!ok)
-                    die(`not verified — run  pantheon recover ${team}  again for a new code`);
+                    die(`not verified — run  pantheon recover ${shellArg(team)}  again for a new code`);
                 r = await call("POST", "/account/recover", { space: team });
             }
             if (r.status === 404 && !r.j.reason)
@@ -3705,9 +3835,9 @@ async function main() {
                 const others = (r.j.others ?? []);
                 console.log(`${B(`Asked: your seat in ${team} moves to this machine`)} ${D(`(new key ${String(r.j.fp)})`)}`);
                 console.log(`  It moves when a teammate confirms it — ${others.join(", ") || "your teammates"} ${others.length === 1 ? "was" : "were"} told — or on its own ${new Date(Number(r.j.due_at)).toLocaleString()} if nobody cancels.`);
-                console.log(`  Speed it up: ask one of them to check your key with you (read them "this device" from  pantheon whoami ) and run  ${C(`pantheon recover confirm ${acct.username} --space ${team}`)}`);
-                console.log(D(`  Once it has moved, run  pantheon recover ${team}  again here to save the team on this machine.`));
-                return;
+                console.log(`  Speed it up: ask one of them to check your key with you (read them "this device" from  pantheon whoami ) and run  ${C(`pantheon recover confirm ${acct.username} --space ${shellArg(team)}`)}`);
+                console.log(D(`  Once it has moved, run  pantheon recover ${shellArg(team)}  again here to save the team on this machine.`));
+                process.exit(RECOVER_WAITING_EXIT);
             }
             const token = String(r.j.invite ?? "");
             if (r.j.state !== "moved" || !token)
@@ -3717,7 +3847,7 @@ async function main() {
             console.error(D(`  If the old machine is lost or not yours any more, sign it out of your account too:  pantheon sessions  (then  pantheon sessions revoke <device-id> --device)\n`));
             const { spawnSync: run } = await import("node:child_process");
             const invite = toInvite({ ...id, space: String(r.j.space ?? team), token });
-            const keep = argv.slice(2).filter((a) => /^--(no-worker|no-hook|no-notifications|no-menubar|yes)$/.test(a));
+            const keep = argv.slice(1).filter((a) => /^--(no-worker|no-hook|no-notifications|no-menubar|no-guide|yes)$/.test(a));
             const res = run(process.execPath, [process.argv[1], "join", invite, ...keep], { stdio: "inherit" });
             process.exit(res.status ?? 1);
         }
@@ -4087,9 +4217,21 @@ async function main() {
                 if (argv.includes("--only-action") && !hud)
                     refuse("that action was already taken or is no longer there — click it again");
             }
-            const cfg = (() => {
-                if (!hud?.space)
+            let cfg = (() => {
+                if (!hud?.space) {
+                    const r = resolveFor(process.cwd());
+                    if (r.cfg?.space)
+                        return need();
+                    const f = loadAll();
+                    const first = Object.values(f?.spaces ?? {})[0];
+                    if (f && first && (!hud || ["details", "open", "fix", "done", "wake"].includes(hud.action)))
+                        return configFor(f, first, null);
+                    if (hud && (hud.action === "reply" || hud.action === "retract")) {
+                        console.log(`not sent: which team it belongs to was not recorded — answer it from the board`);
+                        process.exit(1);
+                    }
                     return need();
+                }
                 const f = loadAll();
                 const m = f ? findMembership(f, hud.space) : undefined;
                 if (f && m)
@@ -4222,6 +4364,13 @@ async function main() {
                 const wa = ref ? loadPolicy().wakeAsks?.[ref] : undefined;
                 if (!wa || !hud.member || wa.member !== hud.member)
                     notSent("that question is no longer open on this machine — pantheon wake list shows who may wake it");
+                if (!hud.space) {
+                    const f = loadAll();
+                    const m = f ? findMembership(f, wa.team) : undefined;
+                    if (!f || !m)
+                        notSent(`that question is about the team "${wa.team}", which this machine is no longer in`);
+                    cfg = configFor(f, m, null);
+                }
                 if (![cfg.spaceId, cfg.space].includes(wa.team))
                     notSent(`that question is about the team "${wa.team}", not "${hud.space ?? cfg.space}" — answer it from that team's board`);
                 const allow = hud.allow === true;
@@ -4252,11 +4401,22 @@ async function main() {
                 return;
             }
             if (hud?.action === "done") {
-                const c2 = new PantheonClient(cfg, undefined, { role: "cli" });
-                await c2.connect().catch((e) => die(connectFailure(e, cfg.relay)));
-                const o = hud.decision ? c2.obligations.find((x) => x.id === hud.decision) : undefined;
-                if (!o) {
-                    c2.close();
+                const tries = hud.space ? [cfg] : (() => { const f = loadAll(); const all = f ? Object.values(f.spaces ?? {}).map((m) => configFor(f, m, null)) : []; return all.length ? all : [cfg]; })();
+                let c2 = null;
+                let o;
+                for (const tc of tries) {
+                    const c = new PantheonClient(tc, undefined, { role: "cli" });
+                    const ok = await c.connect().then(() => true, (e) => { if (tries.length === 1)
+                        die(connectFailure(e, tc.relay)); return false; });
+                    const hit = ok && hud.decision ? c.obligations.find((x) => x.id === hud.decision) : undefined;
+                    if (hit) {
+                        c2 = c;
+                        o = hit;
+                        break;
+                    }
+                    c.close();
+                }
+                if (!c2 || !o) {
                     console.error(D("that decision is no longer waiting on you"));
                     return;
                 }
@@ -4810,8 +4970,9 @@ async function main() {
             return;
         }
         case "menubar": {
-            need();
-            const { ensureTrayBinary, writeTrayCommands } = await import("./tray.js");
+            const { ensureTrayBinary, writeTrayCommands, menubarRefusal } = await import("./tray.js");
+            if (menubarRefusal(loadAll(), load()))
+                need();
             const { spawn } = await import("node:child_process");
             let binary;
             try {

package/dist/config.js

@@ -6,6 +6,7 @@ import { join, resolve, sep } from "node:path";
 import { VERSION } from "./version.js";
 import { repoName } from "./repo-route.js";
 import { markPantheonHome } from "./home-safety.js";
+import { TEAM_NAME } from "./team-name.js";
 export const CONFIG_DIR = process.env.PANTHEON_HOME ?? join(homedir(), ".pantheon");
 export const CONFIG_PATH = join(CONFIG_DIR, "config.json");
 export const DEFAULT_RELAY = process.env.PANTHEON_DEFAULT_RELAY
@@ -596,7 +597,7 @@ export function toInvite(cfg) {
 }
 export const JOIN_LINK_BASE = "https://www.joinpantheon.network/join";
 const HOSTED_RELAY = "wss://relay.joinpantheon.network";
-const JOIN_SLUG = /^[a-z0-9][a-z0-9_-]{0,63}$/i;
+const JOIN_SLUG = TEAM_NAME;
 export function toJoinLink(cfg) {
     if (cfg.relay.replace(/\/+$/, "") !== HOSTED_RELAY || !JOIN_SLUG.test(cfg.space))
         return null;