@whittlelabs/trivet 0.1.9 → 0.2.0

package/bin.js

@@ -3023,15 +3023,55 @@ var require_commander = __commonJS({
 var require_apply = __commonJS({
   "../../packages/shuttle/dist/branding/apply.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i2 = 0; i2 < k.length; i2++) if (k[i2] !== "default") __createBinding(result, mod, k[i2]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.PROFILE_NAME = exports2.DEFAULT_PROFILE = void 0;
     exports2.expandHome = expandHome;
+    exports2.windowsLocalAppData = windowsLocalAppData;
+    exports2.brandConfigDir = brandConfigDir;
+    exports2.resolveBrandPath = resolveBrandPath;
     exports2.resolveProfile = resolveProfile;
     exports2.resolvePaths = resolvePaths;
     exports2.runConfigSearchPaths = runConfigSearchPaths;
     exports2.renderTemplate = renderTemplate;
     var os_1 = require("os");
-    var path_1 = require("path");
+    var path_1 = __importStar(require("path"));
     function expandHome(p) {
       if (p === "~")
         return (0, os_1.homedir)();
@@ -3039,6 +3079,26 @@ var require_apply = __commonJS({
         return (0, path_1.join)((0, os_1.homedir)(), p.slice(2));
       return p;
     }
+    function windowsLocalAppData(env = process.env) {
+      return env.LOCALAPPDATA ?? path_1.default.win32.join((0, os_1.homedir)(), "AppData", "Local");
+    }
+    function brandConfigDir(brand, platform = process.platform, env = process.env) {
+      const declared = brand.paths.configDir;
+      if (platform === "win32" && (declared === "~" || declared.startsWith("~/"))) {
+        return path_1.default.win32.join(windowsLocalAppData(env), brand.product.cliBinary);
+      }
+      return expandHome(declared);
+    }
+    function resolveBrandPath(brand, declaredPath, platform = process.platform, env = process.env) {
+      const declaredDir = brand.paths.configDir;
+      if (declaredPath === declaredDir)
+        return brandConfigDir(brand, platform, env);
+      if (declaredPath.startsWith(`${declaredDir}/`)) {
+        const p = platform === "win32" ? path_1.default.win32 : path_1.default;
+        return p.join(brandConfigDir(brand, platform, env), ...declaredPath.slice(declaredDir.length + 1).split("/"));
+      }
+      return expandHome(declaredPath);
+    }
     exports2.DEFAULT_PROFILE = "default";
     exports2.PROFILE_NAME = /^[a-z0-9][a-z0-9-]*$/;
     function resolveProfile(brand, explicit) {
@@ -3050,9 +3110,9 @@ var require_apply = __commonJS({
       return candidate;
     }
     function resolvePaths(brand, profile = exports2.DEFAULT_PROFILE) {
-      const base = expandHome(brand.paths.configDir);
+      const base = brandConfigDir(brand);
       const configDir = profile === exports2.DEFAULT_PROFILE ? base : (0, path_1.join)(base, profile);
-      const auditFile = brand.audit?.path ? expandHome(brand.audit.path) : (0, path_1.join)(configDir, "audit.jsonl");
+      const auditFile = brand.audit?.path ? resolveBrandPath(brand, brand.audit.path) : (0, path_1.join)(configDir, "audit.jsonl");
       return {
         profile,
         configDir,
@@ -3063,7 +3123,7 @@ var require_apply = __commonJS({
     }
     function runConfigSearchPaths(brand, profile) {
       if (profile === exports2.DEFAULT_PROFILE) {
-        return brand.paths.configSearchPaths ? [...brand.paths.configSearchPaths] : [];
+        return brand.paths.configSearchPaths ? brand.paths.configSearchPaths.map((p) => resolveBrandPath(brand, p)) : [];
       }
       return [(0, path_1.join)(resolvePaths(brand, profile).configDir, `${brand.product.id}.yaml`)];
     }
@@ -10375,6 +10435,148 @@ var require_progress = __commonJS({
   }
 });
 
+// ../../packages/shuttle/dist/platform/launch.js
+var require_launch = __commonJS({
+  "../../packages/shuttle/dist/platform/launch.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.UnlaunchableError = void 0;
+    exports2.findOnPath = findOnPath;
+    exports2.pathExtensions = pathExtensions;
+    exports2.resolveLaunch = resolveLaunch;
+    exports2.npmShimTarget = npmShimTarget;
+    var fs_1 = require("fs");
+    var path_1 = __importDefault(require("path"));
+    var UnlaunchableError = class extends Error {
+      code = "EUNLAUNCHABLE";
+      constructor(message) {
+        super(message);
+        this.name = "UnlaunchableError";
+      }
+    };
+    exports2.UnlaunchableError = UnlaunchableError;
+    var DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD";
+    function findOnPath(bin, host = {}) {
+      const platform = host.platform ?? process.platform;
+      const env = host.env ?? process.env;
+      const delimiter = platform === "win32" ? ";" : ":";
+      const dirs = (env.PATH ?? env.Path ?? "").split(delimiter).filter(Boolean);
+      const names = platform === "win32" ? [...path_1.default.extname(bin) ? [bin] : [], ...pathExtensions(env).map((ext) => `${bin}${ext}`)] : [bin];
+      if (path_1.default.isAbsolute(bin))
+        return names.find((name2) => isLaunchableFile(name2, platform)) ?? null;
+      for (const dir of dirs) {
+        for (const name2 of names) {
+          const candidate = path_1.default.join(dir, name2);
+          if (isLaunchableFile(candidate, platform))
+            return candidate;
+        }
+      }
+      return null;
+    }
+    function pathExtensions(env = process.env) {
+      return (env.PATHEXT ?? DEFAULT_PATHEXT).split(";").map((ext) => ext.trim().toLowerCase()).filter((ext) => ext.startsWith("."));
+    }
+    function isLaunchableFile(candidate, platform) {
+      try {
+        if (!(0, fs_1.statSync)(candidate).isFile())
+          return false;
+        if (platform !== "win32")
+          (0, fs_1.accessSync)(candidate, fs_1.constants.X_OK);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    function resolveLaunch(bin, args2, host = {}) {
+      const platform = host.platform ?? process.platform;
+      if (platform !== "win32")
+        return { command: bin, args: args2 };
+      const found = findOnPath(bin, host);
+      if (found === null)
+        return { command: bin, args: args2 };
+      const ext = path_1.default.extname(found).toLowerCase();
+      if (ext === ".exe" || ext === ".com")
+        return { command: found, args: args2 };
+      if (ext === ".cmd" || ext === ".bat") {
+        const unwrapped = unwrapNpmShim(found, host);
+        if (unwrapped !== null)
+          return { command: unwrapped.command, args: [...unwrapped.args, ...args2] };
+        throw new UnlaunchableError(`${found} is a batch file that is not an npm shim; it would have to run through cmd.exe, which a review's arguments must never reach. Install ${bin} as an .exe or with npm`);
+      }
+      throw new UnlaunchableError(`${found} is not a program Windows starts directly (${ext || "no extension"})`);
+    }
+    function unwrapNpmShim(shim, host) {
+      let text;
+      try {
+        text = (0, fs_1.readFileSync)(shim, "utf8");
+      } catch {
+        return null;
+      }
+      const dir = path_1.default.dirname(shim);
+      const target = npmShimTarget(text);
+      let resolved = null;
+      if (target !== null) {
+        resolved = path_1.default.join(dir, ...target.split(/[\\/]/));
+      } else if (/NPM_CLI_JS/.test(text)) {
+        resolved = path_1.default.join(dir, "node_modules", "npm", "bin", "npm-cli.js");
+      }
+      if (resolved === null || !(0, fs_1.existsSync)(resolved))
+        return null;
+      const ext = path_1.default.extname(resolved).toLowerCase();
+      if (ext === ".exe" || ext === ".com")
+        return { command: resolved, args: [] };
+      if (ext !== ".js" && ext !== ".cjs" && ext !== ".mjs" && ext !== "")
+        return null;
+      const besideShim = path_1.default.join(dir, "node.exe");
+      const node = (0, fs_1.existsSync)(besideShim) ? besideShim : host.nodePath ?? process.execPath;
+      return { command: node, args: [resolved] };
+    }
+    function npmShimTarget(cmdText) {
+      const match = /"%~?dp0%?\\([^"]+)"\s+%\*/.exec(cmdText);
+      if (!match)
+        return null;
+      const target = match[1];
+      if (/[%!^&|<>]/.test(target))
+        return null;
+      return target;
+    }
+  }
+});
+
+// ../../packages/shuttle/dist/platform/terminate.js
+var require_terminate = __commonJS({
+  "../../packages/shuttle/dist/platform/terminate.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.terminate = terminate;
+    exports2.taskkillPath = taskkillPath;
+    var child_process_1 = require("child_process");
+    var path_1 = __importDefault(require("path"));
+    function terminate(child, signal = "SIGTERM", platform = process.platform) {
+      if (platform !== "win32") {
+        child.kill(signal);
+        return;
+      }
+      if (child.pid === void 0 || child.exitCode !== null)
+        return;
+      const killer = (0, child_process_1.spawn)(taskkillPath(), ["/pid", String(child.pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true
+      });
+      killer.on("error", () => child.kill());
+    }
+    function taskkillPath(env = process.env) {
+      return path_1.default.win32.join(env.SystemRoot ?? env.SYSTEMROOT ?? "C:\\Windows", "System32", "taskkill.exe");
+    }
+  }
+});
+
 // ../../packages/shuttle/dist/executors/agent-process.js
 var require_agent_process = __commonJS({
   "../../packages/shuttle/dist/executors/agent-process.js"(exports2) {
@@ -10395,12 +10597,15 @@ var require_agent_process = __commonJS({
     var fs_1 = require("fs");
     var path_1 = __importDefault(require("path"));
     var string_decoder_1 = require("string_decoder");
+    var launch_1 = require_launch();
+    var terminate_1 = require_terminate();
     exports2.STDERR_LIMIT = 4e3;
     function runAgentProcess(opts) {
       return new Promise((resolve, reject) => {
         let child;
         try {
-          child = (0, child_process_1.spawn)(opts.bin, opts.args, {
+          const launch = (0, launch_1.resolveLaunch)(opts.bin, opts.args, opts.env ? { env: opts.env } : {});
+          child = (0, child_process_1.spawn)(launch.command, launch.args, {
             cwd: opts.cwd,
             stdio: ["pipe", "pipe", "pipe"],
             ...opts.env ? { env: opts.env } : {}
@@ -10425,11 +10630,11 @@ var require_agent_process = __commonJS({
           fn();
         };
         function onAbort() {
-          child.kill("SIGTERM");
+          (0, terminate_1.terminate)(child);
           finish(() => reject(new Error("Dispatch aborted")));
         }
         if (opts.signal.aborted) {
-          child.kill("SIGTERM");
+          (0, terminate_1.terminate)(child);
           finish(() => reject(new Error("Dispatch aborted")));
           return;
         }
@@ -10440,7 +10645,7 @@ var require_agent_process = __commonJS({
           if (timer)
             clearTimeout(timer);
           timer = setTimeout(() => {
-            child.kill("SIGTERM");
+            (0, terminate_1.terminate)(child);
             finish(() => reject(new Error(`${opts.toolName} produced no output for ${opts.idleTimeoutMs}ms; killed as hung`)));
           }, opts.idleTimeoutMs);
         };
@@ -10494,7 +10699,7 @@ var require_agent_process = __commonJS({
       }
     }
     function classifyAgentFault(failure, vocab) {
-      if (failure.spawnErrorCode === "ENOENT")
+      if (failure.spawnErrorCode === "ENOENT" || failure.spawnErrorCode === "EUNLAUNCHABLE")
         return vocab.installRemedy;
       const text = failure.text ?? "";
       if (failure.apiErrorStatus === 401 || vocab.signedOut.test(text))
@@ -10695,6 +10900,18 @@ var require_workspace_telemetry = __commonJS({
       }
       return roots;
     }
+    function insideRoot(resolved, root) {
+      const fold = (s) => process.platform === "win32" ? s.toLowerCase() : s;
+      if (!fold(resolved).startsWith(fold(root + path_1.default.sep)))
+        return null;
+      return resolved.slice(root.length + 1).split(path_1.default.sep).join("/");
+    }
+    function stripRoots(input, roots) {
+      if (process.platform !== "win32")
+        return roots.reduce((s, r) => s.split(`${r}/`).join(""), input);
+      const slashed = input.replaceAll("\\\\", "/");
+      return roots.reduce((s, r) => s.replace(new RegExp(`${escapeRegExp(r.split(path_1.default.sep).join("/"))}/`, "gi"), ""), slashed);
+    }
     function relativeWorkspaceReads(readPaths, cwd) {
       const roots = workspaceRoots(cwd);
       const root = roots[0];
@@ -10702,11 +10919,10 @@ var require_workspace_telemetry = __commonJS({
       for (const p of readPaths) {
         const resolved = path_1.default.resolve(root, p);
         for (const r of roots) {
-          if (resolved === r)
-            break;
-          if (!resolved.startsWith(r + path_1.default.sep))
+          const rel = insideRoot(resolved, r);
+          if (rel === null)
             continue;
-          out2.add(resolved.slice(r.length + 1));
+          out2.add(rel);
           break;
         }
         if (out2.size >= MAX_REPORTED_READS)
@@ -10770,10 +10986,10 @@ var require_workspace_telemetry = __commonJS({
       const dirAlt = [...dirs].map(escapeRegExp).join("|");
       const wordRe = dirs.size > 0 ? new RegExp(`(?:${dirAlt})[^\\s"'\`;|&<>()\\\\]*`, "g") : null;
       const findRe = dirs.size > 0 ? new RegExp(`\\bfind\\s+(?:\\./)?(${[...dirs].map((d) => escapeRegExp(d.slice(0, -1))).join("|")})/?(?=\\s|$)`, "g") : null;
-      const readerRe = new RegExp(`(?:^|[\\s"])(?:-exec|-execdir|xargs)\\b[^;|&]*\\b${READERS}\\b`);
+      const readerRe = new RegExp(`(?:^|[\\s"])(?:-exec|-execdir|xargs)\\b[^;|&]*\\b${READERS}\\b`, READER_FLAGS);
       const credited = /* @__PURE__ */ new Set();
       for (const raw of toolInputs) {
-        const input = roots.reduce((s, r) => s.split(`${r}/`).join(""), raw);
+        const input = stripRoots(raw, roots);
         for (const rel of writtenPaths) {
           if (input.includes(rel))
             credited.add(rel);
@@ -10816,8 +11032,9 @@ var require_workspace_telemetry = __commonJS({
       }
       return [...credited].sort();
     }
-    var READERS = "(?:cat|head|tail|sed|awk|less|more|bat)";
-    var PLAIN_READER_RE = new RegExp(`(?:^|[\\s"'\`;|&(])${READERS}\\b`);
+    var READERS = process.platform === "win32" ? "(?:cat|head|tail|sed|awk|less|more|bat|Get-Content|gc|type)" : "(?:cat|head|tail|sed|awk|less|more|bat)";
+    var READER_FLAGS = process.platform === "win32" ? "i" : "";
+    var PLAIN_READER_RE = new RegExp(`(?:^|[\\s"'\`;|&(])${READERS}\\b`, READER_FLAGS);
     var CD_RE = /(?:^|[\s"'`;|&(])cd\s+(?:--\s+)?["']?([^\s"'`;|&<>()\\]+)/g;
     function namesBareWord(input, word) {
       const edge = String.raw`[\s"'\`;|&<>(),\\]`;
@@ -10833,8 +11050,8 @@ var require_workspace_telemetry = __commonJS({
           const word = raw.replace(/^\.\//, "");
           if (word.length === 0 || word.startsWith("-") || GLOB_CHARS.test(word))
             continue;
-          const abs = path_1.default.resolve(roots[0], roots.reduce((w, r) => w.startsWith(`${r}/`) ? w.slice(r.length + 1) : w, word));
-          if (!roots.some((r) => abs.startsWith(r + path_1.default.sep)))
+          const abs = path_1.default.resolve(roots[0], roots.reduce((w, r) => w.startsWith(`${r}/`) || w.startsWith(`${r}${path_1.default.sep}`) ? w.slice(r.length + 1) : w, word));
+          if (!roots.some((r) => insideRoot(abs, r) !== null))
             continue;
           try {
             if ((0, fs_1.statSync)(abs).isFile())
@@ -10877,11 +11094,13 @@ var require_cli_version = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.cliVersion = cliVersion;
     var child_process_1 = require("child_process");
+    var launch_1 = require_launch();
     var VERSION_TIMEOUT_MS = 5e3;
     function cliVersion(bin, env) {
       return new Promise((resolve) => {
         try {
-          (0, child_process_1.execFile)(bin, ["--version"], { timeout: VERSION_TIMEOUT_MS, ...env ? { env } : {} }, (err2, stdout) => {
+          const launch = (0, launch_1.resolveLaunch)(bin, ["--version"], env ? { env } : {});
+          (0, child_process_1.execFile)(launch.command, launch.args, { timeout: VERSION_TIMEOUT_MS, ...env ? { env } : {} }, (err2, stdout) => {
             resolve(err2 ? null : String(stdout).match(/\d+\.\d+\.\d+/)?.[0] ?? null);
           });
         } catch {
@@ -56610,6 +56829,78 @@ data:
   }
 });
 
+// ../../packages/shuttle/dist/platform/private-file.js
+var require_private_file = __commonJS({
+  "../../packages/shuttle/dist/platform/private-file.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.restrictToOwner = restrictToOwner;
+    exports2.othersWithAccess = othersWithAccess;
+    var child_process_1 = require("child_process");
+    var fs_1 = require("fs");
+    var path_1 = __importDefault(require("path"));
+    var SYSTEM_SID = "S-1-5-18";
+    var ADMINISTRATORS_SID = "S-1-5-32-544";
+    async function restrictToOwner(target, platform = process.platform) {
+      const isDirectory = (await fs_1.promises.stat(target)).isDirectory();
+      if (platform !== "win32") {
+        await fs_1.promises.chmod(target, isDirectory ? 448 : 384);
+        return;
+      }
+      const user = await currentUserSid();
+      const inherit = isDirectory ? "(OI)(CI)" : "";
+      await run2(system32("icacls.exe"), [
+        target,
+        "/inheritance:r",
+        "/grant:r",
+        `*${user}:${inherit}F`,
+        `*${SYSTEM_SID}:${inherit}F`
+      ]);
+    }
+    async function othersWithAccess(file) {
+      try {
+        const user = await currentUserSid();
+        const env = Object.fromEntries(Object.entries(process.env).filter(([key]) => key.toUpperCase() !== "PSMODULEPATH"));
+        const stdout = await run2(system32("WindowsPowerShell", "v1.0", "powershell.exe"), [
+          "-NoProfile",
+          "-NonInteractive",
+          "-Command",
+          "(Get-Acl -LiteralPath $env:SHUTTLE_ACL_TARGET).Access | ForEach-Object { $_.IdentityReference.Translate([Security.Principal.SecurityIdentifier]).Value }"
+        ], { ...env, SHUTTLE_ACL_TARGET: file });
+        const allowed = /* @__PURE__ */ new Set([user, SYSTEM_SID, ADMINISTRATORS_SID]);
+        return {
+          others: [...new Set(stdout.split(/\r?\n/).map((l) => l.trim()).filter((sid) => sid.length > 0 && !allowed.has(sid)))]
+        };
+      } catch (err2) {
+        return { unreadable: err2 instanceof Error ? err2.message : String(err2) };
+      }
+    }
+    async function currentUserSid() {
+      const stdout = await run2(system32("whoami.exe"), ["/user", "/fo", "csv", "/nh"]);
+      const sid = /"(S-1-[0-9-]+)"/.exec(stdout)?.[1];
+      if (!sid)
+        throw new Error(`whoami did not report this user's SID: ${stdout.trim().slice(0, 200)}`);
+      return sid;
+    }
+    function system32(...parts2) {
+      return path_1.default.win32.join(process.env.SystemRoot ?? process.env.SYSTEMROOT ?? "C:\\Windows", "System32", ...parts2);
+    }
+    function run2(file, args2, env) {
+      return new Promise((resolve, reject) => {
+        (0, child_process_1.execFile)(file, args2, { windowsHide: true, timeout: 15e3, ...env ? { env } : {} }, (err2, stdout, stderr) => {
+          if (err2)
+            reject(new Error(`${path_1.default.win32.basename(file)} failed: ${String(stderr).trim() || err2.message}`));
+          else
+            resolve(String(stdout));
+        });
+      });
+    }
+  }
+});
+
 // ../../packages/shuttle/dist/toolsets/server.js
 var require_server = __commonJS({
   "../../packages/shuttle/dist/toolsets/server.js"(exports2) {
@@ -56628,6 +56919,7 @@ var require_server = __commonJS({
     var node_path_1 = __importDefault(require("node:path"));
     var node_stream_1 = require("node:stream");
     var server_1 = require_dist3();
+    var private_file_1 = require_private_file();
     async function serveToolSet(name2, toolNames, build) {
       const handler = (0, server_1.createMcpHandler)(build, { legacy: "stateless" });
       const token = node_crypto_1.default.randomBytes(32).toString("base64url");
@@ -56667,6 +56959,7 @@ var require_server = __commonJS({
       let configDir = null;
       try {
         configDir = await node_fs_1.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), "shuttle-mcp-"));
+        await (0, private_file_1.restrictToOwner)(configDir);
         const mcpConfigPath = node_path_1.default.join(configDir, "mcp.json");
         const mcpServers = Object.fromEntries(sets.map((s) => [s.name, { type: "http", url: s.url, headers: { Authorization: `Bearer ${s.token}` } }]));
         await node_fs_1.promises.writeFile(mcpConfigPath, JSON.stringify({ mcpServers }), { mode: 384, flag: "wx" });
@@ -56805,6 +57098,27 @@ ${items.map(render).join("\n")}`;
   }
 });
 
+// ../../packages/shuttle/dist/platform/no-follow.js
+var require_no_follow = __commonJS({
+  "../../packages/shuttle/dist/platform/no-follow.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.writeFileNoFollow = writeFileNoFollow;
+    var fs_1 = require("fs");
+    async function writeFileNoFollow(file, content) {
+      if (fs_1.constants.O_NOFOLLOW === void 0 && (await fs_1.promises.lstat(file).catch(() => null))?.isSymbolicLink()) {
+        throw new Error(`${file} is a symlink; refusing to write through it`);
+      }
+      const handle2 = await fs_1.promises.open(file, fs_1.constants.O_WRONLY | fs_1.constants.O_CREAT | fs_1.constants.O_TRUNC | (fs_1.constants.O_NOFOLLOW ?? 0), 420);
+      try {
+        await handle2.writeFile(content);
+      } finally {
+        await handle2.close();
+      }
+    }
+  }
+});
+
 // ../../packages/shuttle/dist/workspace/overlay.js
 var require_overlay = __commonJS({
   "../../packages/shuttle/dist/workspace/overlay.js"(exports2) {
@@ -56819,6 +57133,7 @@ var require_overlay = __commonJS({
     exports2.fetchCapped = fetchCapped;
     var fs_1 = require("fs");
     var path_1 = __importDefault(require("path"));
+    var no_follow_1 = require_no_follow();
     var DEFAULT_TIMEOUT_MS = 3e4;
     var DEFAULT_MAX_BYTES = 5 * 1024 * 1024;
     exports2.overlayModifier = {
@@ -56868,12 +57183,7 @@ var require_overlay = __commonJS({
             skip("destination parent escapes the workspace root");
             continue;
           }
-          const handle2 = await fs_1.promises.open(dest, fs_1.constants.O_WRONLY | fs_1.constants.O_CREAT | fs_1.constants.O_TRUNC | fs_1.constants.O_NOFOLLOW, 420);
-          try {
-            await handle2.writeFile(content);
-          } finally {
-            await handle2.close();
-          }
+          await (0, no_follow_1.writeFileNoFollow)(dest, content);
           result.written += 1;
           result.writtenPaths.push(file.path);
         } catch (err2) {
@@ -57967,6 +58277,7 @@ var require_codex = __commonJS({
     var strict_schema_1 = require_strict_schema();
     var workspace_telemetry_1 = require_workspace_telemetry();
     var apply_1 = require_apply();
+    var launch_1 = require_launch();
     var CODEX_PROFILE = "sift-review";
     function reviewProfile(installDir, platform = process.platform, outputDir) {
       const rules = ['":root"="deny"', '":minimal"="read"', '":workspace_roots"="read"', `${JSON.stringify(installDir)}="read"`];
@@ -57982,7 +58293,9 @@ var require_codex = __commonJS({
     function codexHome() {
       return process.env.CODEX_HOME ?? path_1.default.join(os_1.default.homedir(), ".codex");
     }
-    function resolveCodex(pathEnv = process.env.PATH ?? "") {
+    function resolveCodex(pathEnv = process.env.PATH ?? "", platform = process.platform) {
+      if (platform === "win32")
+        return resolveCodexOnWindows(pathEnv);
       for (const dir of pathEnv.split(path_1.default.delimiter)) {
         if (!dir)
           continue;
@@ -58000,6 +58313,20 @@ var require_codex = __commonJS({
       }
       return null;
     }
+    function resolveCodexOnWindows(pathEnv) {
+      let launch;
+      try {
+        launch = (0, launch_1.resolveLaunch)("codex", [], { platform: "win32", env: { ...process.env, PATH: pathEnv } });
+      } catch {
+        return null;
+      }
+      const script = launch.args[0];
+      if (script !== void 0)
+        return { bin: "codex", installDir: path_1.default.dirname(path_1.default.dirname(script)) };
+      if (!path_1.default.isAbsolute(launch.command))
+        return null;
+      return { bin: launch.command, installDir: path_1.default.dirname(launch.command) };
+    }
     var DISABLED_FEATURES = [
       "hooks",
       "apps",
@@ -58032,6 +58359,7 @@ var require_codex = __commonJS({
         reviewProfile(installDir, platform, outputDir),
         "-c",
         `default_permissions="${CODEX_PROFILE}"`,
+        ...platform === "win32" ? ["-c", 'windows.sandbox="unelevated"'] : [],
         "-c",
         'approval_policy="never"',
         "-c",
@@ -58437,6 +58765,7 @@ var require_copilot = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.copilotReviewArgs = copilotReviewArgs;
     exports2.withSchema = withSchema;
+    exports2.withoutRealGh = withoutRealGh;
     exports2.usageOf = usageOf;
     exports2.parseCopilotEvents = parseCopilotEvents;
     exports2.parseCopilotModels = parseCopilotModels;
@@ -58457,6 +58786,7 @@ var require_copilot = __commonJS({
     var cli_version_1 = require_cli_version();
     var version_check_1 = require_version_check();
     var apply_1 = require_apply();
+    var private_file_1 = require_private_file();
     var REVIEW_TOOLS = ["view", "grep", "glob"];
     var DENIED_TOOLS = ["shell", "write"];
     function copilotReviewArgs(version, outputDir) {
@@ -58765,13 +59095,17 @@ ${JSON.stringify(spec.outputSchema)}
     async function makeRunHome(scratch) {
       const home = path_1.default.join(scratch, "copilot-home");
       await fs_1.promises.mkdir(home, { mode: 448 });
+      if (process.platform === "win32")
+        await (0, private_file_1.restrictToOwner)(home);
       await fs_1.promises.writeFile(path_1.default.join(home, "settings.json"), JSON.stringify(RUN_SETTINGS));
       const bin = path_1.default.join(scratch, "bin");
       await fs_1.promises.mkdir(bin, { recursive: true });
       await fs_1.promises.writeFile(path_1.default.join(bin, "gh"), REFUSING_GH, { mode: 493 });
+      await fs_1.promises.writeFile(path_1.default.join(bin, "gh.cmd"), REFUSING_GH_CMD);
       return home;
     }
     var REFUSING_GH = '#!/bin/sh\necho "gh is not available to a Sifter review" >&2\nexit 1\n';
+    var REFUSING_GH_CMD = "@echo gh is not available to a Sifter review 1>&2\r\n@exit /b 1\r\n";
     var LOGIN_POINTER_KEYS = ["lastLoggedInUser", "loggedInUsers"];
     var LOGIN_TOKEN_KEYS = ["authTokens"];
     async function withOperatorLogin(home, fn) {
@@ -58819,12 +59153,20 @@ ${JSON.stringify(spec.outputSchema)}
     }
     function runEnv(home) {
       const bin = path_1.default.join(path_1.default.dirname(home), "bin");
-      return {
+      const ambient = process.env.PATH ?? process.env.Path ?? "";
+      const searched = process.platform === "win32" ? withoutRealGh(ambient) : ambient;
+      const env = {
         ...process.env,
-        PATH: `${bin}${path_1.default.delimiter}${process.env.PATH ?? ""}`,
+        PATH: `${bin}${path_1.default.delimiter}${searched}`,
         COPILOT_HOME: home,
         COPILOT_AUTO_UPDATE: "false"
       };
+      if (process.platform === "win32" && "Path" in env)
+        delete env.Path;
+      return env;
+    }
+    function withoutRealGh(pathValue) {
+      return pathValue.split(path_1.default.win32.delimiter).filter((dir) => dir.length > 0 && !["gh.exe", "gh.com"].some((name2) => (0, fs_1.existsSync)(path_1.default.join(dir, name2)))).join(path_1.default.win32.delimiter);
     }
     async function readUsage(file) {
       try {
@@ -60282,6 +60624,7 @@ var require_custom_script = __commonJS({
     var child_process_1 = require("child_process");
     var loom_1 = require_dist();
     var validate_output_1 = require_validate_output();
+    var terminate_1 = require_terminate();
     var DEFAULT_TIMEOUT = 3e4;
     var CustomScriptExecutor = class {
       capability;
@@ -60331,16 +60674,16 @@ var require_custom_script = __commonJS({
           child.stdin.write(JSON.stringify(request));
           child.stdin.end();
           const timer = setTimeout(() => {
-            child.kill("SIGTERM");
+            (0, terminate_1.terminate)(child);
             settle(() => reject(new Error(`Custom script timed out after ${this.config.timeout}ms`)));
           }, this.config.timeout);
           function onAbort() {
-            child.kill("SIGTERM");
+            (0, terminate_1.terminate)(child);
             settle(() => reject(new Error("Dispatch aborted")));
           }
           if (signal.aborted) {
             clearTimeout(timer);
-            child.kill("SIGTERM");
+            (0, terminate_1.terminate)(child);
             settle(() => reject(new Error("Dispatch aborted")));
             return;
           }
@@ -67909,6 +68252,7 @@ var require_store = __commonJS({
     var fs2 = __importStar(require("fs"));
     var fsp = __importStar(require("fs/promises"));
     var path_1 = require("path");
+    var private_file_1 = require_private_file();
     var PairingConfigStore = class {
       path;
       constructor(path) {
@@ -67933,13 +68277,18 @@ var require_store = __commonJS({
         const tmp = `${this.path}.tmp`;
         const fd = await fsp.open(tmp, "w", 384);
         try {
+          await (0, private_file_1.restrictToOwner)(tmp);
           await fd.write(JSON.stringify(config, null, 2));
           await fd.sync();
         } finally {
           await fd.close();
         }
         await fsp.rename(tmp, this.path);
-        await fsp.chmod(this.path, 384);
+        await (0, private_file_1.restrictToOwner)(this.path);
+      }
+      /** Forget the pairing: `revoke` of this machine, whose credential is dead. */
+      async remove() {
+        await fsp.rm(this.path, { force: true });
       }
     };
     exports2.PairingConfigStore = PairingConfigStore;
@@ -68039,7 +68388,7 @@ var require_checks3 = __commonJS({
     var apply_1 = require_apply();
     var environment_1 = require_environment();
     var scaffold_1 = require_scaffold();
-    var NODE_FLOOR = "20.0.0";
+    var NODE_FLOOR = "22.0.0";
     var DISK_FLOOR_BYTES = 1024 * 1024 * 1024;
     var AGENTS = [
       { executor: "claude-code", bin: "claude", install: "install Claude Code (npm install -g @anthropic-ai/claude-code)" },
@@ -68159,16 +68508,12 @@ var require_checks3 = __commonJS({
     var platformSupported = {
       name: "platform-supported",
       phases: ["init", "run", "doctor"],
-      prerequisite: true,
-      async run(probes, subject) {
+      async run(probes) {
         const platform = probes.platform();
-        if (platform === "win32") {
-          return fail("platform-supported", "native Windows is not supported", `install WSL (https://learn.microsoft.com/windows/wsl/install), then install and run ${subject.brand.product.cliBinary} inside it`);
-        }
         return pass("platform-supported", PLATFORM_NAMES[platform] ?? platform);
       }
     };
-    var PLATFORM_NAMES = { darwin: "macOS", linux: "Linux" };
+    var PLATFORM_NAMES = { darwin: "macOS", linux: "Linux", win32: "Windows" };
     var nodeVersion = {
       name: "node-version",
       phases: ["init", "run", "doctor"],
@@ -68191,6 +68536,16 @@ var require_checks3 = __commonJS({
         if (result.value === null) {
           return fail("pairing-present", `no pairing at ${subject.paths.configFile}`, pairElsewhereRemedy(probes, subject) ?? `run \`${subject.brand.product.cliBinary} init\` to pair`);
         }
+        if (probes.platform() === "win32") {
+          const acl = await probes.othersWithAccess(subject.paths.configFile);
+          if ("unreadable" in acl) {
+            return warn("pairing-present", `paired, but who else can read ${subject.paths.configFile} could not be determined (${acl.unreadable}), and it holds a bearer secret`, `in PowerShell: icacls "${subject.paths.configFile}" /inheritance:r /grant:r "$env:USERNAME:F"`);
+          }
+          if (acl.others.length > 0) {
+            return warn("pairing-present", `paired, but ${subject.paths.configFile} holds a bearer secret and its ACL also grants ${acl.others.join(", ")}`, `in PowerShell: icacls "${subject.paths.configFile}" /inheritance:r /grant:r "$env:USERNAME:F"`);
+          }
+          return pass("pairing-present", `paired as ${result.value.serviceIdentity.displayName}`);
+        }
         const mode = await probes.stat(subject.paths.configFile);
         if (mode !== null && (mode.mode & 63) !== 0) {
           return warn("pairing-present", `paired, but ${subject.paths.configFile} is mode ${mode.mode.toString(8).padStart(4, "0")} and holds a bearer secret`, `chmod 600 ${subject.paths.configFile}`);
@@ -70124,12 +70479,8 @@ var require_loader = __commonJS({
       }
     }
     function defaultSearchPaths(productId) {
-      return [
-        (0, path_1.resolve)("shuttle.yaml"),
-        (0, path_1.resolve)(`${productId}.yaml`),
-        (0, path_1.join)((0, os_1.homedir)(), ".config", "whittle-labs", `${productId}.yaml`),
-        (0, path_1.join)((0, os_1.homedir)(), ".config", "whittle-labs", "shuttle.yaml")
-      ];
+      const shared = process.platform === "win32" ? (0, path_1.join)((0, apply_1.windowsLocalAppData)(), "whittle-labs") : (0, path_1.join)((0, os_1.homedir)(), ".config", "whittle-labs");
+      return [(0, path_1.resolve)("shuttle.yaml"), (0, path_1.resolve)(`${productId}.yaml`), (0, path_1.join)(shared, `${productId}.yaml`), (0, path_1.join)(shared, "shuttle.yaml")];
     }
     function resolveConfigPath(opts) {
       if (opts.explicitPath) {
@@ -70229,6 +70580,9 @@ var require_probes = __commonJS({
     var codex_1 = require_codex();
     var copilot_1 = require_copilot();
     var store_1 = require_store();
+    var launch_1 = require_launch();
+    var private_file_1 = require_private_file();
+    var terminate_1 = require_terminate();
     var version_check_1 = require_version_check();
     var PROBE_TIMEOUT_MS = 1e4;
     var VERSION_TIMEOUT_MS = 1e4;
@@ -70274,16 +70628,7 @@ var require_probes = __commonJS({
         platform: () => process.platform,
         osTmpDir: () => os_1.default.tmpdir(),
         async which(bin) {
-          const dirs = (process.env.PATH ?? "").split(path_1.default.delimiter).filter(Boolean);
-          for (const dir of dirs) {
-            const candidate = path_1.default.join(dir, bin);
-            try {
-              await fs_1.promises.access(candidate, fs_1.constants.X_OK);
-              return candidate;
-            } catch {
-            }
-          }
-          return null;
+          return (0, launch_1.findOnPath)(bin);
         },
         async versionOf(bin) {
           const known = versions.get(bin);
@@ -70325,6 +70670,7 @@ var require_probes = __commonJS({
             return null;
           }
         },
+        othersWithAccess: (target) => (0, private_file_1.othersWithAccess)(target),
         async mkdtemp(dir) {
           let created;
           try {
@@ -70519,7 +70865,8 @@ ${outcome.stderr}`.split("\n").map((l) => l.trim()).find((l) => l.length > 0);
       return new Promise((resolve) => {
         let child;
         try {
-          child = (0, child_process_1.spawn)(bin, args2, { stdio: ["ignore", "pipe", "pipe"] });
+          const launch = (0, launch_1.resolveLaunch)(bin, args2);
+          child = (0, child_process_1.spawn)(launch.command, launch.args, { stdio: ["ignore", "pipe", "pipe"] });
         } catch (err2) {
           resolve({ ok: false, reason: describe(err2), exited: false });
           return;
@@ -70534,7 +70881,7 @@ ${outcome.stderr}`.split("\n").map((l) => l.trim()).find((l) => l.length > 0);
           resolve(value);
         };
         const timer = setTimeout(() => {
-          child.kill("SIGKILL");
+          (0, terminate_1.terminate)(child, "SIGKILL");
           settle({ ok: false, reason: `did not finish within ${Math.round(timeoutMs / 1e3)}s`, exited: false });
         }, timeoutMs);
         child.stdout?.on("data", (chunk) => {
@@ -70653,19 +71000,11 @@ var require_preflight = __commonJS({
     var typed_exit_1 = require_typed_exit();
     async function runPreflight(probes, subject) {
       const verdicts = [];
-      let blockedBy;
       for (const check of checks_1.CHECKS) {
         if (!check.phases.includes(subject.phase))
           continue;
-        if (blockedBy !== void 0) {
-          verdicts.push({ name: check.name, status: "SKIP", detail: `not checked; see ${blockedBy}` });
-          continue;
-        }
         try {
-          const verdict = await check.run(probes, subject);
-          verdicts.push(verdict);
-          if (check.prerequisite === true && verdict.status === "FAIL")
-            blockedBy = check.name;
+          verdicts.push(await check.run(probes, subject));
         } catch (err2) {
           if ((0, typed_exit_1.isTypedExit)(err2))
             throw err2;
@@ -72639,7 +72978,7 @@ var require_device_code = __commonJS({
       return [
         reason,
         "",
-        restored ? "Nothing was saved on this machine, so it is as it was before init." : `Some of what init wrote could not be put back; check ${brand.paths.configDir} before pairing again.`,
+        restored ? "Nothing was saved on this machine, so it is as it was before init." : `Some of what init wrote could not be put back; check ${(0, apply_1.brandConfigDir)(brand)} before pairing again.`,
         `Keep has already issued "${identity}", which this machine will not use: open`,
         `${webPairingPlace(brand)}, remove "${identity}", then pair again from there.`
       ].join("\n");
@@ -73152,6 +73491,7 @@ var require_self_update = __commonJS({
     exports2.updateForFloor = updateForFloor;
     var child_process_1 = require("child_process");
     var version_check_1 = require_version_check();
+    var launch_1 = require_launch();
     function readUpgradeDirective(directives, currentVersion, attemptedVersions) {
       const raw = directives.upgrade;
       if (!raw || typeof raw !== "object")
@@ -73219,7 +73559,8 @@ var require_self_update = __commonJS({
     }
     function defaultInstall(packageSpec) {
       return new Promise((resolve, reject) => {
-        const child = (0, child_process_1.spawn)("npm", ["install", "-g", packageSpec], {
+        const launch = (0, launch_1.resolveLaunch)("npm", ["install", "-g", packageSpec]);
+        const child = (0, child_process_1.spawn)(launch.command, launch.args, {
           stdio: ["ignore", "pipe", "pipe"]
         });
         let output = "";
@@ -73236,7 +73577,7 @@ var require_self_update = __commonJS({
     }
     function defaultRespawn() {
       const child = (0, child_process_1.spawn)(process.execPath, process.argv.slice(1), {
-        detached: true,
+        detached: process.platform !== "win32",
         stdio: "inherit"
       });
       child.unref();
@@ -73512,6 +73853,8 @@ var require_git = __commonJS({
     var child_process_1 = require("child_process");
     var fs_1 = require("fs");
     var path_1 = __importDefault(require("path"));
+    var launch_1 = require_launch();
+    var terminate_1 = require_terminate();
     var DEFAULT_GIT_TIMEOUT_MS = 12e4;
     exports2.DEFAULT_GIT_PROTOCOLS = "https:ssh:git";
     var DEFAULT_MAX_CONTEXT_REPOS = 5;
@@ -73775,9 +74118,11 @@ var require_git = __commonJS({
       used.add(name2);
       return name2;
     }
+    var CHECKOUT_CONFIG = ["-c", "core.autocrlf=false", "-c", "core.longpaths=true"];
     function runGit(args2, cwd, opts) {
       return new Promise((resolve) => {
-        const child = (0, child_process_1.spawn)("git", args2, {
+        const launch = (0, launch_1.resolveLaunch)("git", [...CHECKOUT_CONFIG, ...args2]);
+        const child = (0, child_process_1.spawn)(launch.command, launch.args, {
           cwd,
           stdio: [opts.stdin !== void 0 ? "pipe" : "ignore", "pipe", "pipe"],
           env: {
@@ -73801,7 +74146,9 @@ var require_git = __commonJS({
           resolve(result);
         };
         const killChild = () => {
-          child.kill("SIGTERM");
+          (0, terminate_1.terminate)(child);
+          if (process.platform === "win32")
+            return;
           const escalate = setTimeout(() => child.kill("SIGKILL"), 5e3);
           escalate.unref();
           child.once("close", () => clearTimeout(escalate));
@@ -75497,6 +75844,8 @@ var require_shutdown = __commonJS({
       process.on("SIGINT", () => handler("SIGINT"));
       process.on("SIGTERM", () => handler("SIGTERM"));
       process.on("SIGHUP", () => handler("SIGHUP"));
+      if (process.platform === "win32")
+        process.on("SIGBREAK", () => handler("SIGBREAK"));
     }
     function createShutdownHandler(onShutdown, options = {}) {
       const deadlineMs = options.deadlineMs ?? exports2.SHUTDOWN_DEADLINE_MS;
@@ -75761,38 +76110,55 @@ var require_pairings = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.listPairings = listPairings;
     exports2.revokePairing = revokePairing;
+    var keep_1 = require_keep();
+    var keep_2 = require_dist4();
+    var version_check_1 = require_version_check();
+    var PAGE_LIMIT = 100;
     async function listPairings(opts) {
-      const fetcher = opts.fetcher ?? globalThis.fetch;
-      const url = `${opts.brand.keepRegistration.keepApiUrl.replace(/\/$/, "")}/api/me/service-identities?client_id=${encodeURIComponent(opts.brand.keepRegistration.oauthClientId)}`;
-      const response = await fetcher(url, {
-        method: "GET",
-        headers: { Authorization: `Bearer ${opts.accessToken}` }
-      });
-      return parseJson(response);
+      const machines = [];
+      for (let offset = 0; ; offset += PAGE_LIMIT) {
+        const { pairings, total } = await ask(opts, (keep) => keep.get("/api/pairings", {
+          query: { limit: PAGE_LIMIT, offset },
+          headers: { Authorization: `Bearer ${opts.accessToken}` }
+        }));
+        machines.push(...pairings);
+        if (pairings.length < PAGE_LIMIT || offset + pairings.length >= total)
+          return machines;
+      }
     }
     async function revokePairing(opts) {
-      const fetcher = opts.fetcher ?? globalThis.fetch;
-      const url = `${opts.brand.keepRegistration.keepApiUrl.replace(/\/$/, "")}/api/service-identities/${encodeURIComponent(opts.identityId)}`;
-      const response = await fetcher(url, {
-        method: "DELETE",
+      await ask(opts, (keep) => keep.delete("/api/pairings/{pairingId}", {
+        path: { pairingId: opts.pairingId },
         headers: { Authorization: `Bearer ${opts.accessToken}` }
-      });
-      if (!response.ok) {
-        throw new Error(`Revoke failed with status ${response.status}`);
-      }
+      }));
     }
-    async function parseJson(response) {
-      let body2;
-      try {
-        body2 = await response.json();
-      } catch {
-        throw new Error(`Keep returned non-JSON (status ${response.status}).`);
-      }
-      if (!response.ok) {
-        const err2 = body2;
-        throw new Error(err2.error?.message ?? `Keep returned status ${response.status}.`);
+    async function ask(opts, send) {
+      const fetcher = opts.fetcher ?? globalThis.fetch;
+      let belowFloor;
+      const transport = async (url, init2) => {
+        const response = await fetcher(url, init2);
+        try {
+          (0, version_check_1.checkResponseMinVersion)({
+            response,
+            productId: opts.brand.product.id,
+            currentVersion: opts.brand.product.version,
+            packageName: opts.brand.product.packageName
+          });
+        } catch (err2) {
+          belowFloor = err2;
+          throw err2;
+        }
+        return response;
+      };
+      const result = await send((0, keep_1.createClient)({ baseUrl: opts.keepApiUrl.replace(/\/$/, ""), transport }));
+      if (belowFloor !== void 0)
+        throw belowFloor;
+      if (result.success)
+        return result.data;
+      if (result.error.status === 401) {
+        throw new keep_2.AgentCredentialRevokedError(`Keep refused this machine's token (401): ${result.error.message}`);
       }
-      return body2.data;
+      throw new Error(result.error.message || `Keep answered ${result.error.status ?? "nothing"}.`);
     }
   }
 });
@@ -75803,42 +76169,75 @@ var require_list = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildListCommand = buildListCommand;
+    exports2.mintAgentToken = mintAgentToken;
+    exports2.renderPairings = renderPairings;
     var commander_1 = require_commander();
     var keep_1 = require_dist4();
     var apply_1 = require_apply();
     var store_1 = require_store();
     var pairings_1 = require_pairings();
+    var version_check_1 = require_version_check();
+    var typed_exit_1 = require_typed_exit();
     function buildListCommand(brand) {
-      return new commander_1.Command("list").description(`List paired ${brand.product.title} machines`).option("-p, --profile <name>", 'Config profile whose pairing credentials to use (default "default")').action(async (options) => {
+      return new commander_1.Command("list").description(`List the machines paired to your account as a ${brand.product.title}`).option("-p, --profile <name>", 'Config profile whose pairing credentials to use (default "default")').option("--json", "Print the pairings as JSON and nothing else").action(async (options) => {
         try {
           const paths = (0, apply_1.resolvePaths)(brand, (0, apply_1.resolveProfile)(brand, options.profile));
-          const store = new store_1.PairingConfigStore(paths.configFile);
-          const pairing = store.read();
-          const tokens = new keep_1.ServiceTokenManager({
+          const pairing = new store_1.PairingConfigStore(paths.configFile).read();
+          const machines = await (0, pairings_1.listPairings)({
+            brand,
             keepApiUrl: pairing.keepApiUrl,
-            clientId: pairing.credentials.clientId,
-            clientSecret: pairing.credentials.clientSecret
+            accessToken: await mintAgentToken(pairing, brand)
           });
-          const accessToken = await tokens.getToken();
-          if (!accessToken) {
-            throw new Error("Failed to mint service token from stored credentials.");
-          }
-          const machines = await (0, pairings_1.listPairings)({ brand, accessToken });
-          if (machines.length === 0) {
-            console.log("No paired machines.");
+          if (options.json) {
+            console.log(JSON.stringify(machines, null, 2));
             return;
           }
-          console.log(["id", "name", "hostname", "pairedAt", "lastSeenAt", "active"].join("	"));
-          for (const m of machines) {
-            console.log([m.id, m.name, m.hostname ?? "-", m.pairedAt ?? "-", m.lastSeenAt ?? "-", m.active].join("	"));
-          }
+          for (const line of renderPairings(machines, pairing.serviceIdentity.id))
+            console.log(line);
         } catch (err2) {
+          if ((0, typed_exit_1.isTypedExit)(err2))
+            throw err2;
           const message = err2 instanceof Error ? err2.message : String(err2);
           console.error(`list failed: ${message}`);
           process.exit(1);
         }
       });
     }
+    async function mintAgentToken(pairing, brand) {
+      const token = await new keep_1.AgentTokenManager({
+        keepApiUrl: pairing.keepApiUrl,
+        clientId: pairing.credentials.clientId,
+        clientSecret: pairing.credentials.clientSecret,
+        onResponse: (response) => (0, version_check_1.checkResponseMinVersion)({
+          response,
+          productId: brand.product.id,
+          currentVersion: brand.product.version,
+          packageName: brand.product.packageName
+        })
+      }).getToken();
+      if (!token)
+        throw new Error("This pairing holds no credentials to mint a token with. Run `init` again.");
+      return token;
+    }
+    function renderPairings(machines, self2) {
+      if (machines.length === 0)
+        return ["No paired machines."];
+      const header = ["", "ID", "NAME", "HOST", "PAIRED", "LAST USED"];
+      const rows = machines.map((m) => [
+        m.id === self2 ? "*" : "",
+        m.id,
+        m.displayName,
+        m.hostname ?? "-",
+        m.pairedAt.slice(0, 10),
+        m.lastUsedAt ? m.lastUsedAt.slice(0, 16).replace("T", " ") : "never"
+      ]);
+      const widths = header.map((h, i2) => Math.max(h.length, ...rows.map((r) => r[i2].length)));
+      const line = (cells) => cells.map((cell, i2) => cell.padEnd(widths[i2])).join("  ").trimEnd();
+      const lines = [line(header), ...rows.map(line)];
+      if (machines.some((m) => m.id === self2))
+        lines.push("", "* this machine");
+      return lines;
+    }
   }
 });
 
@@ -75848,43 +76247,51 @@ var require_revoke = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildRevokeCommand = buildRevokeCommand;
+    exports2.pickMachine = pickMachine;
     var commander_1 = require_commander();
-    var keep_1 = require_dist4();
     var apply_1 = require_apply();
     var store_1 = require_store();
     var pairings_1 = require_pairings();
+    var list_1 = require_list();
+    var typed_exit_1 = require_typed_exit();
     function buildRevokeCommand(brand) {
-      return new commander_1.Command("revoke").description(`Revoke a paired ${brand.product.title}`).argument("<nameOrId>", "Machine name or service-identity id to revoke").option("-p, --profile <name>", 'Config profile whose pairing credentials to use (default "default")').action(async (nameOrId, options) => {
+      return new commander_1.Command("revoke").description(`Revoke a machine paired to your account as a ${brand.product.title} (this one included)`).argument("<machine>", "The machine to revoke: its id, the start of its id, its name, or its host, as `list` shows them").option("-p, --profile <name>", 'Config profile whose pairing credentials to use (default "default")').action(async (machine, options) => {
         try {
           const paths = (0, apply_1.resolvePaths)(brand, (0, apply_1.resolveProfile)(brand, options.profile));
           const store = new store_1.PairingConfigStore(paths.configFile);
           const pairing = store.read();
-          const tokens = new keep_1.ServiceTokenManager({
-            keepApiUrl: pairing.keepApiUrl,
-            clientId: pairing.credentials.clientId,
-            clientSecret: pairing.credentials.clientSecret
-          });
-          const accessToken = await tokens.getToken();
-          if (!accessToken) {
-            throw new Error("Failed to mint service token from stored credentials.");
-          }
-          const machines = await (0, pairings_1.listPairings)({ brand, accessToken });
-          const target = machines.find((m) => m.id === nameOrId || m.name === nameOrId || m.displayName === nameOrId);
-          if (!target) {
-            throw new Error(`No paired machine matches "${nameOrId}".`);
-          }
+          const api = { brand, keepApiUrl: pairing.keepApiUrl, accessToken: await (0, list_1.mintAgentToken)(pairing, brand) };
+          const target = pickMachine(await (0, pairings_1.listPairings)(api), machine);
+          await (0, pairings_1.revokePairing)({ ...api, pairingId: target.id });
           if (target.id === pairing.serviceIdentity.id) {
-            throw new Error("Refusing to revoke the currently-paired identity. Run `init` on a different machine and revoke from there.");
+            await store.remove();
+            console.log(`Revoked this machine, "${target.displayName}" (${target.id}).`);
+            console.log(`Its pairing is removed from ${paths.configFile}; run \`${brand.product.cliBinary} init\` to pair it again.`);
+            return;
           }
-          await (0, pairings_1.revokePairing)({ brand, accessToken, identityId: target.id });
-          console.log(`Revoked ${target.name} (${target.id}).`);
+          console.log(`Revoked "${target.displayName}" (${target.id}). It can take no more work.`);
         } catch (err2) {
+          if ((0, typed_exit_1.isTypedExit)(err2))
+            throw err2;
           const message = err2 instanceof Error ? err2.message : String(err2);
           console.error(`revoke failed: ${message}`);
           process.exit(1);
         }
       });
     }
+    function pickMachine(machines, query) {
+      const exact = machines.find((m) => m.id === query);
+      if (exact)
+        return exact;
+      const candidates = machines.filter((m) => m.id.startsWith(query) || m.name === query || m.displayName === query || m.hostname === query);
+      if (candidates.length === 1)
+        return candidates[0];
+      if (candidates.length === 0) {
+        throw new Error(`No paired machine matches "${query}". Run \`list\` to see them.`);
+      }
+      const named = candidates.map((m) => `  ${m.id}  ${m.displayName}${m.hostname ? ` (${m.hostname})` : ""}`);
+      throw new Error([`"${query}" matches ${candidates.length} machines; name one by its id:`, ...named].join("\n"));
+    }
   }
 });
 
@@ -76390,7 +76797,7 @@ var import_shuttle2 = __toESM(require_dist8());
 
 // src/brand.ts
 var import_shuttle = __toESM(require_dist8());
-var buildVersion = true ? "0.1.9" : pkg.version;
+var buildVersion = true ? "0.2.0" : pkg.version;
 var EXECUTORS = ["claude-code"];
 var trivetBrand = {
   product: {