@join-pantheon/cli 0.32.1 → 0.33.0-rc.2

package/dist/ledger.js

@@ -1,7 +1,7 @@
 import { mkdirSync, existsSync, openSync, readSync, writeSync, fsyncSync, closeSync, fstatSync, copyFileSync, truncateSync, chmodSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { load } from "./config.js";
-import { fsyncDir, renameRetrying, writeFileAtomic } from "./store.js";
+import { fsyncDir, renameRetrying, syncFd, writeFileAtomic } from "./store.js";
 export class SpaceFull extends Error {
     bytes;
     cap;
@@ -107,7 +107,7 @@ export class Ledger {
         const fd = openSync(this.file, "a", 0o600);
         try {
             writeSync(fd, line);
-            fsyncSync(fd);
+            syncFd(fd);
         }
         finally {
             closeSync(fd);

package/dist/machine.js

@@ -3,7 +3,8 @@ import { closeSync, existsSync, fstatSync, mkdirSync, openSync, readFileSync, re
 import { homedir, hostname, networkInterfaces, platform } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { CONFIG_DIR } from "./config.js";
-import { borrowedHome, disableService, existingUnitPath, plistPath, serviceInstalled, serviceLogFile, unitPath, unitPaths, uninstallService } from "./service.js";
+import { borrowedHome, disableService, existingUnitPath, plistPath, serviceInstalled, serviceLogFile, stopWindowsHost, unitPath, unitPaths, uninstallService } from "./service.js";
+import { LEGACY_TASK_NAME, hostAlive, hostChildRunning, hostFiles, isHostKind, readHostState, recordedTaskName } from "./win-host.js";
 import { copilotMcpConfigFile, vsCodeUserDir, kiroMcpConfigFile, kiroDir } from "./install.js";
 const sh = (cmd) => {
     try {
@@ -100,7 +101,33 @@ function fromSystemd(kind) {
         ...(s.lastExit ? { lastExit: s.lastExit } : {}),
     };
 }
+export function elapsed(ms) {
+    const s = Math.max(0, Math.floor(ms / 1000));
+    const d = Math.floor(s / 86400), h = Math.floor((s % 86400) / 3600), m = Math.floor((s % 3600) / 60), sec = s % 60;
+    const two = (n) => String(n).padStart(2, "0");
+    return `${d ? `${d}-` : ""}${d || h ? `${two(h)}:` : ""}${two(m)}:${two(sec)}`;
+}
+export function hostProc(kind, o = {}) {
+    if ((o.platform ?? platform()) !== "win32" || !isHostKind(kind))
+        return {};
+    const home = o.home ?? CONFIG_DIR;
+    if (!existsSync(hostFiles(home).definition(kind)))
+        return {};
+    const now = o.now ?? Date.now();
+    const st = readHostState(home);
+    const up = hostAlive(st, now, o.alive);
+    const run = hostChildRunning(kind, home, now, o.alive);
+    const r = up ? st.children[kind] : undefined;
+    return {
+        managedBy: "host", label: `task ${recordedTaskName(home) ?? LEGACY_TASK_NAME}`, logPath: hostFiles(home).childLog(kind),
+        ...(run ? { running: true, pid: run.pid, ...(run.since ? { since: elapsed(now - run.since) } : {}) } : { running: false }),
+        ...(r?.lastExit && r.lastExit !== "0" ? { lastExit: r.lastExit } : {}),
+    };
+}
 const fromManager = (kind) => {
+    const h = hostProc(kind);
+    if (h.managedBy)
+        return h;
     const l = fromLaunchd(kind);
     return l.managedBy ? l : fromSystemd(kind);
 };
@@ -438,6 +465,7 @@ const defaultStopIo = (port = 8787) => ({
     borrowed: () => borrowedHome(),
     loadedFrom: (kind) => managerDefinitionPath(kind),
     kill: killPid,
+    ...(platform() === "win32" ? { stopHost: () => stopWindowsHost() } : {}),
 });
 export const borrowedHomeLine = (kind) => `${kind === "services" ? "services" : `${kind}:`} left alone — HOME (${homedir()}) is not your own home (a test, a sandbox or another account's folder), so the service manager's jobs here are the real user's, not this home's. Nothing was stopped; run this from your own login to stop your services`;
 export const isPantheonCommand = (cmd) => /pantheon/i.test(cmd) || /\bcli\.js\s+(relay|start)\b/.test(cmd);
@@ -500,7 +528,9 @@ export function stopProcResult(kind, io = defaultStopIo()) {
             else {
                 const how = platform() === "darwin"
                     ? `launchctl disable gui/${process.getuid?.() ?? 0}/dev.pantheon.${kind}`
-                    : `systemctl --user disable --now pantheon-${kind}`;
+                    : platform() === "win32"
+                        ? `pantheon service uninstall ${kind}`
+                        : `systemctl --user disable --now pantheon-${kind}`;
                 lines.push(`${kind}: could not disable the service (${e.message.split("\n")[0]}) — it may start again at login; try: ${how}`);
             }
         }
@@ -511,7 +541,7 @@ export function stopProcResult(kind, io = defaultStopIo()) {
         const stillUp = !!after.running && !k?.killed;
         if (disabled) {
             lines.unshift(`${kind}: ${stillUp ? "disabled, but a process is still running (see below)" : p.running || k?.killed ? "stopped, and will not start again at login" : "was not running; disabled, and will not start again at login"}`);
-            lines.push(`        start it again with: pantheon service install ${kind}`);
+            lines.push(`        start it again with: pantheon service ${p.managedBy === "host" ? "start" : "install"} ${kind}`);
         }
         return { lines, stopped: (p.running && disabled && !stillUp) || !!k?.killed };
     }
@@ -576,6 +606,11 @@ export function stopMachine(what, opts, io = defaultStopIo(opts.port), hosts = h
                 lines.push(`worker: ${k}`);
         }
     }
+    if (what === "all" && io.stopHost) {
+        const h = io.stopHost();
+        if (h.length)
+            lines.push(...h.map((l) => `host: ${l.trim().replace(/^the Pantheon host /, "")}`), "        it starts again at your next logon (services stay paused), or now: pantheon service start worker");
+    }
     if (!relayStopped)
         return { lines };
     const teams = opts.teams ?? (opts.teamRelay ? [{ name: "", relay: opts.teamRelay }] : []);
@@ -670,6 +705,142 @@ export function removeHomeLeftovers(home, keep, opts = {}) {
     }
     return { removed, left };
 }
+export const PANTHEON_HOME_ENTRIES = [
+    { name: "config.json", what: "your key and team tokens", identity: true },
+    { name: "config.json.bak", what: "the previous config.json", identity: true },
+    { name: "keys.json", what: "the teammates' keys this machine pinned", identity: true },
+    { name: "nonces.json", what: "the signed requests this machine has seen", identity: true },
+    { name: "continued.json", what: "what this machine already handled", identity: true },
+    { name: "cursors.json", what: "where each agent session last read", identity: true },
+    { name: "worker-cursor.json", what: "where the worker last read", identity: true },
+    { name: "profile.json", what: "your profile", identity: true },
+    { name: "worker-policy.json", what: "the worker's wake policy", identity: true },
+    { name: "spend.json", what: "the spend ledger", identity: true },
+    { name: "personas", what: "the worker's personas", dir: true, identity: true },
+    { name: "worker-state.json", what: "the worker's last state" },
+    { name: "worker-run.json", what: "the worker's record of a run in flight" },
+    { name: "run-slot.json", what: "the worker's run slot" },
+    { name: "worker.pid", what: "the worker's pid file" },
+    { name: /^notifier-state(-.+)?\.json$/, sample: "notifier-state-team%2Fone.json", what: "the alerts' state" },
+    { name: "update-check.json", what: "the update check's cache" },
+    { name: "uri-key", what: "the key pantheon:// links are signed with" },
+    { name: "board.json", what: "the board's state" },
+    { name: "hook-intent.json", what: "the hook intent" },
+    { name: "hook-guard.json", what: "the hook guard" },
+    { name: /^(worker|relay|notifier|menubar)\.log(\.1)?$/, sample: "worker.log", what: "service logs an older version wrote here" },
+    { name: /^\.write-check\..+$/, sample: ".write-check.1234.5678", what: "a leftover write probe" },
+    { name: "bin", what: "the menu bar's and alerts' files", dir: true },
+    { name: "logs", what: "the service logs", dir: true },
+    { name: "host", what: "the Windows host's queue, state and markers", dir: true },
+    { name: "mcp", what: "the agent windows' server state", dir: true },
+    { name: "run-homes", what: "the woken runs' homes", dir: true },
+    { name: "worktrees", what: "the worker's worktrees", dir: true },
+    { name: "no-hooks", what: "the empty hooks folder woken runs' git uses", dir: true },
+    { name: "lfs-hooks", what: "the LFS-only hooks folder woken runs' git uses", dir: true },
+    { name: "runtime", what: "Pantheon's own Node", dir: true, kept: "managed" },
+    { name: "data", what: "the relay's ledger", dir: true, kept: "it is your team's history and may be its only copy; delete it yourself once no relay runs from it" },
+    { name: /^(\.DS_Store|Thumbs\.db|desktop\.ini)$/i, sample: ".DS_Store", what: "the file browser's folder cache" },
+];
+const LOCK_OR_TMP = /^(.+?)(\.lock|(\.[0-9a-f]+)+\.tmp)$/i;
+export function homeEntryFor(name) {
+    const direct = (n) => PANTHEON_HOME_ENTRIES.find((e) => typeof e.name === "string" ? e.name === n : e.name.test(n)) ?? null;
+    const e = direct(name);
+    if (e)
+        return e;
+    const m = LOCK_OR_TMP.exec(name);
+    const base = m ? direct(m[1]) : null;
+    return base && !base.dir ? base : null;
+}
+const pause = (ms) => { try {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+catch { } };
+const realSweepFs = {
+    list: (d) => readdirSync(d),
+    exists: (p) => existsSync(p),
+    remove: (p) => rmSync(p, { recursive: true, force: true }),
+    removeDir: (d) => rmdirSync(d),
+};
+export function sweepPantheonHome(home, o = {}) {
+    const fs = o.fs ?? realSweepFs;
+    const tries = o.tries ?? 5, waitMs = o.waitMs ?? 200;
+    const os = o.os ?? platform();
+    const removed = [], left = [];
+    if (!fs.exists(home))
+        return { removed, left, gone: true };
+    const spare = new Set((o.spare ?? []).map((p) => resolve(p)));
+    const attempt = (p, rm) => {
+        let why = "";
+        for (let i = 0; i < tries; i++) {
+            try {
+                rm(p);
+            }
+            catch (e) {
+                why = String(e.code ?? e.message.split("\n")[0]);
+            }
+            if (!fs.exists(p))
+                return null;
+            if (i < tries - 1)
+                pause(waitMs * (i + 1));
+        }
+        return why || "still there";
+    };
+    const lockedHint = os === "win32" ? "; a Pantheon process (an agent window, the menu bar) may still have it open — close it, then delete it" : "; delete it yourself";
+    const gone = [], foreign = [], keptForIdentity = [];
+    let names = [];
+    try {
+        names = fs.list(home);
+    }
+    catch (e) {
+        return { removed, left: [`${home} — could not be read (${e.message.split("\n")[0]}), so nothing in it was removed`], gone: false };
+    }
+    for (const name of names.sort()) {
+        const p = join(home, name);
+        const e = homeEntryFor(name);
+        if (!e) {
+            foreign.push(name);
+            continue;
+        }
+        if (spare.has(resolve(p)))
+            continue;
+        if (e.kept === "managed")
+            continue;
+        if (e.kept) {
+            left.push(`${e.what}, ${p} — kept: ${e.kept}`);
+            continue;
+        }
+        if (o.keepIdentity && e.identity) {
+            keptForIdentity.push(name);
+            continue;
+        }
+        const why = attempt(p, fs.remove);
+        if (why === null)
+            gone.push(name);
+        else
+            left.push(`${e.what}, ${p} — could not remove (${why})${lockedHint}`);
+    }
+    if (gone.length)
+        removed.push(`Pantheon's own files in ${home}: ${gone.join(", ")}`);
+    if (keptForIdentity.length)
+        left.push(`what goes with your identity in ${home}: ${keptForIdentity.join(", ")} (--keep-identity)`);
+    let rest = [];
+    try {
+        rest = fs.list(home);
+    }
+    catch { }
+    if (!rest.length) {
+        const why = attempt(home, fs.removeDir);
+        if (why === null) {
+            removed.push(`${home} itself, now empty`);
+            return { removed, left, gone: true };
+        }
+        left.push(`${home} — empty, but could not remove it (${why})${lockedHint}`);
+        return { removed, left, gone: false };
+    }
+    if (foreign.length)
+        left.push(`${home}, for what is not Pantheon's: ${foreign.join(", ")} — Pantheon never writes ${foreign.length === 1 ? "it" : "these"}, so ${foreign.length === 1 ? "it was" : "they were"} not touched`);
+    return { removed, left, gone: false };
+}
 export const accountStillExists = (email) => `your account${email ? ` ${email}` : ""} still exists — this machine is signed out. Sign back in with: pantheon login${email ? ` --email ${email}` : ""}   (pantheon signup would fail: the email is taken). To delete the account itself: pantheon account delete, before leaving`;
 const LOG_KINDS = ["worker", "relay", "notifier", "menubar"];
 export function uninstallMachine(opts, io) {

package/dist/managed.js

@@ -23,6 +23,7 @@ export function managedLayout(execPath = process.execPath, os = platform()) {
             root, nodeDir, node: p, npm: win32.join(nodeDir, "npm.cmd"), npmCli: win32.join(nodeDir, "node_modules", "npm", "bin", "npm-cli.js"), binDir,
             launcher: win32.join(binDir, "pantheon.cmd"), pkgDir,
             entry: win32.join(pkgDir, "bin", "pantheon.js"), cli: win32.join(pkgDir, "dist", "cli.js"),
+            prevDir: win32.join(runtime, "cli.prev"),
         };
     }
     const p = posix.normalize(execPath);
@@ -42,8 +43,33 @@ export function managedLayout(execPath = process.execPath, os = platform()) {
         root, nodeDir, node: p, npm: posix.join(bin, "npm"), npmCli: posix.join(nodeDir, "lib", "node_modules", "npm", "bin", "npm-cli.js"), binDir,
         launcher: posix.join(binDir, "pantheon"), pkgDir,
         entry: posix.join(pkgDir, "bin", "pantheon.js"), cli: posix.join(pkgDir, "dist", "cli.js"),
+        prevDir: posix.join(runtime, "cli.prev"),
     };
 }
+const shq = (p) => `'${p.replace(/'/g, `'\\''`)}'`;
+export function launcherRepairLines(m, os = platform()) {
+    if (os === "win32") {
+        return [
+            "rem An upgrade cut off mid-swap leaves the previous version beside the runtime: put it back.",
+            'if not exist "%~dp0..\\runtime\\node\\node_modules\\@join-pantheon\\cli\\" if exist "%~dp0..\\runtime\\cli.prev\\bin\\pantheon.js" move "%~dp0..\\runtime\\cli.prev" "%~dp0..\\runtime\\node\\node_modules\\@join-pantheon\\cli" >nul 2>&1',
+        ];
+    }
+    return [
+        "# An upgrade cut off mid-swap leaves the previous version beside the runtime: put it back.",
+        `[ -e ${shq(m.pkgDir)} ] || { [ -f ${shq(posix.join(m.prevDir, "bin", "pantheon.js"))} ] && mv ${shq(m.prevDir)} ${shq(m.pkgDir)} 2>/dev/null; }`,
+    ];
+}
+export function launcherWithRepair(current, m, os = platform()) {
+    if (current.includes("cli.prev"))
+        return null;
+    const nl = os === "win32" ? "\r\n" : "\n";
+    const lines = current.split(nl);
+    const at = os === "win32" ? lines.findIndex((l) => l.startsWith('"%~dp0..\\runtime\\node\\node.exe"')) : lines.findIndex((l) => l.startsWith("exec "));
+    if (at < 0)
+        return null;
+    lines.splice(at, 0, ...launcherRepairLines(m, os));
+    return lines.join(nl);
+}
 export function childNodeFlags(execArgv = process.execArgv, layout = managedLayout()) {
     return execArgv.includes("--use-system-ca") || layout ? ["--use-system-ca"] : [];
 }
@@ -178,7 +204,7 @@ export function installerLine(relay, shell, args = []) {
     if (shell === "ps" && !args.length)
         return `irm ${base}/install.ps1 | iex`;
     const set = args.length ? `Set-Item Env:PANTHEON_ARGS '${args.join(" ")}'; ` : "";
-    return `powershell -NoProfile -ExecutionPolicy Bypass -Command "${set}irm ${base}/install.ps1 | iex"`;
+    return `powershell -NoProfile -Command "${set}irm ${base}/install.ps1 | iex"`;
 }
 export function installerLineHere(relay, os = platform()) {
     return installerLine(relay, os === "win32" ? "ps" : "sh") ?? installerLine(HOSTED_INSTALLER_BASE, os === "win32" ? "ps" : "sh");