@logic-joe/fleek 0.2.15 → 0.2.16

package/dist/fleek.mjs

@@ -2395,6 +2395,7 @@ var require_tools = __commonJS({
       fleek_get_whiteboard: "whiteboards.get",
       whiteboard_scene: "whiteboards.get",
       fleek_list_attachments: "attachments.list",
+      fleek_get_attachment: "attachments.get",
       // DOCFMT stage 1 (DOC-P2) reads, registered in INTEG-4 (coordinator 12.10.2026, IP10 option a)
       fleek_read_document_fmd: "documents.readFmd",
       fleek_list_space_documents: "documents.listInSpace",
@@ -4652,7 +4653,7 @@ var require_setup_session = __commonJS({
     exports.SETUP_SESSION_TTL_MINUTES = 30;
     exports.SETUP_SESSION_OPEN_MAX = 10;
     exports.SETUP_SESSION_CLAIM_LIMIT = 10;
-    exports.FLEEK_CLI_SETUP_VERSION_DEFAULT = "0.2.15";
+    exports.FLEEK_CLI_SETUP_VERSION_DEFAULT = "0.2.16";
     exports.FLEEK_CLI_PACKAGE = "@logic-joe/fleek";
     exports.FLEEK_CANONICAL_SERVER = "https://api.onfleek.app";
     exports.SETUP_CLIENT_APPS = ["claude-code", "codex", "orca", "cursor", "other"];
@@ -5594,7 +5595,7 @@ var require_util = __commonJS({
       else
         target[key] = value;
     }
-    function mirrorShape(target, source, keys, wrap) {
+    function mirrorShape(target, source, keys, wrap2) {
       const raw = sourceShape(source);
       for (const key of keys) {
         const desc = Object.getOwnPropertyDescriptor(raw, key);
@@ -5603,10 +5604,10 @@ var require_util = __commonJS({
         if (desc.get) {
           deferProp(target, key, () => {
             const value = source._zod.def.shape[key];
-            return wrap ? wrap(value, key) : value;
+            return wrap2 ? wrap2(value, key) : value;
           });
         } else
-          putProp(target, key, wrap ? wrap(desc.value, key) : desc.value);
+          putProp(target, key, wrap2 ? wrap2(desc.value, key) : desc.value);
       }
     }
     function mirrorProps(target, source) {
@@ -36471,7 +36472,7 @@ var require_dist2 = __commonJS({
 var import_types11 = __toESM(require_dist(), 1);
 import { spawn as spawn9 } from "node:child_process";
 import { createHash as createHash9, randomBytes as randomBytes12 } from "node:crypto";
-import { rm as rm13 } from "node:fs/promises";
+import { rm as rm13, stat as stat16 } from "node:fs/promises";
 import { hostname as osHostname2 } from "node:os";
 import { join as join33 } from "node:path";
 import { parseArgs } from "node:util";
@@ -36944,6 +36945,11 @@ var Output = class {
     if (this.activities.size) this.progress(null);
     this.stderr.write(`${this.render(text6, "err")}
 `);
+  }
+  /** The keyboard list (tui.ts): CLI-owned cursor control plus rendered lines in one write, so a redraw never flickers. */
+  screen(control, lines) {
+    this.stdout.write(control + lines.map((line) => `${this.render(line, "out")}
+`).join(""));
   }
   /** CLI-owned OSC-8 link. The label/URI are neutralized; JSON, pipes and dumb terminals get a plain URL. */
   link(label, uri, stream = "out") {
@@ -37270,20 +37276,32 @@ var EN = {
   "menu.setupServer": "Server: {server}",
   "menu.resume": "Continue {key}",
   "menu.ticketDefault": "Ticket key (Enter = {key}):",
-  "menu.fix": "Setup needs attention: {command} (option 3).",
-  "menu.recommend": "Recommended: {action}",
+  "menu.fix": "Setup needs attention: {command}. Open status and repair.",
+  "menu.recommended": "Recommended",
+  "menu.quit": "Quit",
+  "menu.loading": "Loading …",
+  "menu.yes": "Yes",
+  "menu.no": "No",
+  "menu.yesNo": "(y/N)",
+  "menu.setupComputer": "Set up this computer",
+  "menu.switchCheckout": "Switch checkout",
+  "menu.checkoutTitle": "Which checkout do you want to work in?",
+  "menu.key.move": "↑↓ move",
+  "menu.key.open": "Enter open",
+  "menu.key.confirm": "Enter confirm",
+  "menu.key.back": "Esc back",
+  "menu.key.cancel": "Esc cancel",
+  "menu.key.quit": "q quit",
   "menu.connect": "Connect this computer",
-  "menu.bind": "Choose a checkout or set up this computer",
   "menu.pick": "My next ticket",
   "menu.continue": "Continue a ticket",
   "menu.doctor": "Status and repair",
   "menu.connections": "Connect ChatGPT / Claude · Settings › Connections",
   "menu.help": "All commands",
-  "menu.choose": "Number (Enter cancels):",
-  "menu.checkout": "Checkout number (0 = setup, Enter cancels):",
+  "menu.choose": "Number (Enter quits):",
   "menu.code": "Paste fleek setup <code> from Settings › Connections (Enter cancels):",
   "menu.ticket": "Ticket key (Enter cancels):",
-  "menu.repair": "Run {command} to review repair offers? (y/N)",
+  "menu.repair": "Run {command} to review repair offers?",
   "read.more": "More details: add --json.",
   "read.empty": "No entries.",
   "read.items": "Entries",
@@ -37660,6 +37678,7 @@ var EN = {
   "orca.rateWait": "Rate limit: waiting {seconds} s, then continuing at the same page.",
   "orca.partial": "Partial list after {pages} pages. Narrow it with --project or --mine.",
   "orca.listCount": "{count} open tickets · mine first, priority, recently updated",
+  "orca.pickTitle": "{count} tickets · mine first, priority, recently updated",
   "orca.pickPage": "Tickets {first}–{last} of {count} · mine first, priority, recently updated",
   "orca.pickPages": "n: next page · p: previous page · enter any ticket number",
   "errors.proxyProfileAmbiguous": "Several sign-ins are bound to this checkout. Pin one with --profile <key> or FLEEK_PROFILE.",
@@ -38045,20 +38064,32 @@ var DE = {
   "menu.setupServer": "Server: {server}",
   "menu.resume": "{key} weiterarbeiten",
   "menu.ticketDefault": "Ticket-Schlüssel (Enter = {key}):",
-  "menu.fix": "Einrichtung prüfen: {command} (Option 3).",
-  "menu.recommend": "Empfohlen: {action}",
+  "menu.fix": "Einrichtung prüfen: {command}. Öffne Status und Reparatur.",
+  "menu.recommended": "Empfohlen",
+  "menu.quit": "Beenden",
+  "menu.loading": "Lädt …",
+  "menu.yes": "Ja",
+  "menu.no": "Nein",
+  "menu.yesNo": "(j/N)",
+  "menu.setupComputer": "Rechner einrichten",
+  "menu.switchCheckout": "Checkout wechseln",
+  "menu.checkoutTitle": "In welchem Checkout möchtest du arbeiten?",
+  "menu.key.move": "↑↓ wählen",
+  "menu.key.open": "Enter öffnen",
+  "menu.key.confirm": "Enter bestätigen",
+  "menu.key.back": "Esc zurück",
+  "menu.key.cancel": "Esc abbrechen",
+  "menu.key.quit": "q beenden",
   "menu.connect": "Rechner verbinden",
-  "menu.bind": "Checkout wählen oder Rechner einrichten",
   "menu.pick": "Mein nächstes Ticket",
   "menu.continue": "Ticket fortsetzen",
   "menu.doctor": "Status und Reparatur",
   "menu.connections": "ChatGPT / Claude verbinden · Einstellungen › Verbindungen",
   "menu.help": "Alle Befehle",
-  "menu.choose": "Nummer (Enter bricht ab):",
-  "menu.checkout": "Checkout-Nummer (0 = Einrichtung, Enter bricht ab):",
+  "menu.choose": "Nummer (Enter beendet):",
   "menu.code": "fleek setup <code> aus Einstellungen › Verbindungen einfügen (Enter bricht ab):",
   "menu.ticket": "Ticket-Schlüssel (Enter bricht ab):",
-  "menu.repair": "Mit {command} Reparaturangebote prüfen? (j/N)",
+  "menu.repair": "Mit {command} Reparaturangebote prüfen?",
   "read.more": "Weitere Details: --json ergänzen.",
   "read.empty": "Keine Einträge.",
   "read.items": "Einträge",
@@ -38435,6 +38466,7 @@ var DE = {
   "orca.rateWait": "Anfragelimit: {seconds} s warten, dann auf derselben Seite fortsetzen.",
   "orca.partial": "Teilliste nach {pages} Seiten. Mit --project oder --mine eingrenzen.",
   "orca.listCount": "{count} offene Tickets · eigene zuerst, Priorität, zuletzt aktualisiert",
+  "orca.pickTitle": "{count} Tickets · eigene zuerst, Priorität, zuletzt aktualisiert",
   "orca.pickPage": "Tickets {first}–{last} von {count} · eigene zuerst, Priorität, zuletzt aktualisiert",
   "orca.pickPages": "n: nächste Seite · p: vorherige Seite · beliebige Ticket-Nummer eingeben",
   "errors.proxyProfileAmbiguous": "Mehrere Anmeldungen sind an dieses Repo gebunden. Leg eine fest mit --profile <schlüssel> oder FLEEK_PROFILE.",
@@ -38807,8 +38839,8 @@ async function processStart(pid) {
   if (process.platform === "win32") return null;
   if (process.platform === "linux") {
     try {
-      const stat16 = await readFile2(`/proc/${pid}/stat`, "utf8");
-      const fields = stat16.slice(stat16.lastIndexOf(")") + 2).split(" ");
+      const stat17 = await readFile2(`/proc/${pid}/stat`, "utf8");
+      const fields = stat17.slice(stat17.lastIndexOf(")") + 2).split(" ");
       const ticks = Number(fields[19]);
       return Number.isSafeInteger(ticks) ? ticks : null;
     } catch {
@@ -49716,7 +49748,7 @@ async function reloadProxyProfile(store, started) {
 // src/orca.ts
 import { execFile as nodeExecFile } from "node:child_process";
 import { realpath as realpath4 } from "node:fs/promises";
-import { posix, win32 } from "node:path";
+import { posix as posix2, win32 as win322 } from "node:path";
 import { setTimeout as sleep4 } from "node:timers/promises";
 
 // src/tools.ts
@@ -49773,12 +49805,277 @@ var WIRE = {
   reportServiceHost: "fleek_report_service_host"
 };
 
+// src/header.ts
+import { win32, posix } from "node:path";
+
+// src/uuid.ts
+var UUID2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isUuid(value) {
+  return UUID2.test(value);
+}
+function canonicalId(value) {
+  if (!UUID2.test(value)) throw new Error("INVALID_UUID");
+  return value.toLowerCase();
+}
+
+// src/header.ts
+var LOGO2 = ["  ▄██████▀", " ▄█████▀  ", " ██▀      "];
+var ASCII_LOGO = ["  ######/", " #####/  ", " ##/     "];
+var BRAND = "\x1B[38;2;69;94;255m";
+function shouldShowHeader(positionals, options, terminal) {
+  if (options.json || options.version || terminal.stream.isTTY !== true) return false;
+  const active = (value) => value !== void 0 && value !== "" && value !== "0" && value !== "false";
+  if (["CI", "CONTINUOUS_INTEGRATION", "GITHUB_ACTIONS", "BUILD_NUMBER", "TF_BUILD"].some((key) => active(terminal.env[key]))) return false;
+  const [command, sub] = positionals;
+  return !command || command === "help" || !!options.help || command === "setup" || command === "doctor" || command === "init" || command === "kit" && ["setup", "doctor", "pull"].includes(sub ?? "") || command === "service" && sub === "setup";
+}
+function cells(value) {
+  let width = 0;
+  for (const char of value) {
+    const code = char.codePointAt(0);
+    if (new RegExp("\\p{Mark}", "u").test(char)) continue;
+    width += code >= 4352 && (code <= 4447 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744) ? 2 : 1;
+  }
+  return width;
+}
+function fit(value, width, ascii) {
+  if (cells(value) <= width) return value;
+  const suffix = ascii ? "..." : "…";
+  if (width <= suffix.length) return suffix.slice(0, Math.max(0, width));
+  let out = "";
+  for (const char of value) {
+    if (cells(out + char) > width - suffix.length) break;
+    out += char;
+  }
+  return out + suffix;
+}
+var safe = (value) => neutralizeLine(redact(value));
+function directory(context, windows, env) {
+  const path = windows ? win32 : posix;
+  const home = context.home ?? userHome(env, windows ? "win32" : process.platform);
+  const relative3 = path.relative(home, context.cwd);
+  const inside = relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path.sep}`) && !path.isAbsolute(relative3);
+  return safe(inside ? relative3 ? `~${path.sep}${relative3}` : "~" : context.cwd);
+}
+function displayPath(cwd, home, env) {
+  return directory({ version: "", cwd, home }, process.platform === "win32", env);
+}
+function headerServer(value) {
+  if (!value) return void 0;
+  try {
+    const url = new URL(value);
+    return ["http:", "https:"].includes(url.protocol) ? url.host : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function renderHeader(context, terminal, t) {
+  const windows = (terminal.platform ?? process.platform) === "win32";
+  const ascii = windows || terminal.env.TERM === "dumb";
+  const separator = ascii ? " - " : " · ";
+  const requested = terminal.stream.columns ?? Number(terminal.env.COLUMNS);
+  const columns = Number.isFinite(requested) && requested > 0 ? Math.floor(requested) : 80;
+  const title = t("header.title", { version: safe(context.version) });
+  const cwd = directory(context, windows, terminal.env);
+  const parts = [context.workspace, context.project && !isUuid(context.project) ? context.project : void 0, headerServer(context.server), context.displayName].filter((value) => !!value);
+  const details = parts.length ? parts.map(safe).join(separator) : t("header.noContext");
+  if (columns < 60) return ["", fit([title, cwd].join(separator), columns, ascii)];
+  const logo = ascii ? ASCII_LOGO : LOGO2;
+  const width = Math.max(...logo.map(cells));
+  const color = colorEnabled(terminal.env, terminal.stream);
+  const available2 = columns - width - 6;
+  const tagline = separator + t("header.tagline");
+  const attribution = separator + t("header.attribution");
+  const secondary = cells(title + tagline) <= available2 ? tagline + (cells(title + tagline + attribution) <= available2 ? attribution : "") : "";
+  const text6 = [title, details, cwd];
+  const rows = logo.map((row, index) => {
+    const mark = row.padEnd(width);
+    const label = fit(text6[index], available2, ascii);
+    if (index === 0) {
+      const heading = color ? `\x1B[1m${label}\x1B[22m` : label;
+      const branding = color && secondary ? `\x1B[2m${secondary}\x1B[22m` : secondary;
+      return `${color ? `${BRAND}${mark}\x1B[39m` : mark}  ${heading}${branding}`;
+    }
+    const styled = color ? `\x1B[2m${label}\x1B[22m` : label;
+    return `${color ? `${BRAND}${mark}\x1B[39m` : mark}  ${styled}`;
+  });
+  const inner = Math.max(...rows.map((row) => cells(stripAnsi(row))));
+  const edge = (value) => color ? `${BRAND}${value}\x1B[39m` : value;
+  const vertical = ascii ? "|" : "│";
+  return [
+    "",
+    edge(`${ascii ? "+" : "╭"}${(ascii ? "-" : "─").repeat(inner + 2)}${ascii ? "+" : "╮"}`),
+    ...rows.map((row) => `${edge(vertical)} ${row}${" ".repeat(inner - cells(stripAnsi(row)))} ${edge(vertical)}`),
+    edge(`${ascii ? "+" : "╰"}${(ascii ? "-" : "─").repeat(inner + 2)}${ascii ? "+" : "╯"}`)
+  ];
+}
+function printHeader(out, context, terminal, t) {
+  for (const line of renderHeader(context, terminal, t)) out.line(line);
+  out.line();
+  out.indentHumanOutput();
+}
+
+// src/tui.ts
+var yesNoList = (question, t) => ({
+  title: [question],
+  items: [{ id: "no", label: t("menu.no") }, { id: "yes", label: t("menu.yes") }],
+  initial: "no",
+  back: true,
+  confirm: true,
+  echo: (item2) => `${question} ${item2.label}`
+});
+var isYes = (result) => result.kind === "select" && result.id === "yes";
+function isKeyInput(stream) {
+  const input = stream;
+  return !!input && input.isTTY === true && typeof input.setRawMode === "function";
+}
+var SEQUENCE = /\u001b\[[0-9;]*[A-Za-z~]|\u001bO[A-Za-z]|[\s\S]/g;
+var NAMED = {
+  "\x1B[A": "up",
+  "\x1BOA": "up",
+  k: "up",
+  "\x1B[B": "down",
+  "\x1BOB": "down",
+  j: "down",
+  "\x1B[H": "home",
+  "\x1BOH": "home",
+  "\x1B[1~": "home",
+  "\x1B[F": "end",
+  "\x1BOF": "end",
+  "\x1B[4~": "end",
+  "\x1B[5~": "pageUp",
+  "\x1B[6~": "pageDown",
+  "\r": "enter",
+  "\n": "enter",
+  "\x1B[C": "enter",
+  "\x1BOC": "enter",
+  "\x1B": "back",
+  "\x1B[D": "back",
+  "\x1BOD": "back",
+  q: "quit",
+  "": "abort",
+  "": "abort"
+};
+function parseKeys(chunk) {
+  return (chunk.match(SEQUENCE) ?? []).flatMap((part) => {
+    const named = NAMED[part];
+    if (named) return [named];
+    return /^[1-9]$/.test(part) ? [`digit${Number(part)}`] : [];
+  });
+}
+function wrap(text6, width) {
+  const lines = [];
+  let line = "";
+  for (const word of text6.split(" ")) {
+    if (line && cells(`${line} ${word}`) > width) {
+      lines.push(line);
+      line = "";
+    }
+    line = line ? `${line} ${word}` : word;
+  }
+  return [...lines, line].map((entry) => fit(entry, width, false));
+}
+function selectList(terminal, options) {
+  const { stdin, stdout, out, t } = terminal;
+  const s = out.style, items = options.items;
+  const pointer = s.unicode ? "›" : ">";
+  let cursor = Math.max(0, items.findIndex((item2) => item2.id === options.initial));
+  let top = 0, drawn = 0;
+  const footer = () => [
+    t("menu.key.move"),
+    t(options.confirm ? "menu.key.confirm" : "menu.key.open"),
+    ...options.back ? [t(options.confirm ? "menu.key.cancel" : "menu.key.back")] : [],
+    ...options.quit ? [t("menu.key.quit")] : []
+  ].join(` ${s.glyph.bullet} `);
+  const view = () => {
+    const width = Math.max(20, (stdout.columns ?? 80) - 3);
+    const title = [
+      ...options.context ? [s.dim(fit(neutralizeLine(options.context), width, !s.unicode))] : [],
+      ...(options.title ?? []).flatMap((line) => wrap(neutralizeLine(line), width)).map((line) => s.bold(line))
+    ];
+    const room = Math.max(3, (stdout.rows ?? 24) - title.length - 5);
+    const size = Math.min(items.length, room);
+    if (cursor < top) top = cursor;
+    if (cursor >= top + size) top = cursor - size + 1;
+    top = Math.min(top, items.length - size);
+    const shown3 = items.slice(top, top + size).map((item2) => ({ item: item2, label: neutralizeLine(item2.label), hint: item2.hint ? neutralizeLine(item2.hint) : "" }));
+    const column = Math.max(...shown3.map(({ label, hint }) => hint ? cells(label) : 0));
+    const rows = shown3.map(({ item: item2, label, hint }) => {
+      const room2 = hint ? width - 2 - cells(hint) - 2 : width - 2;
+      const text6 = fit(label, room2, !s.unicode);
+      const pad = hint ? " ".repeat(Math.max(2, column - cells(text6) + 2)) : "";
+      const chosen = items[cursor] === item2;
+      return `${chosen ? s.cmd(`${pointer} `) : "  "}${chosen ? s.bold(s.cmd(text6)) : text6}${pad}${hint ? s.dim(hint) : ""}`;
+    });
+    const position = items.length > size ? `${cursor + 1}/${items.length} ${s.glyph.bullet} ` : "";
+    return [...title, ...title.length ? [""] : [], ...rows, "", s.dim(`${position}${footer()}`)];
+  };
+  const draw = () => {
+    const lines = view();
+    out.screen(`${drawn ? `\x1B[${drawn}A` : ""}\r\x1B[J`, lines);
+    drawn = lines.length;
+  };
+  return new Promise((resolve9) => {
+    const showCursor = () => out.screen("\x1B[?25h", []);
+    const finish2 = (result) => {
+      stdin.off("data", onData);
+      stdin.off("end", onEnd);
+      stdout.off?.("resize", draw);
+      process.off("exit", showCursor);
+      stdin.setRawMode(false);
+      stdin.pause();
+      out.screen(`\x1B[${drawn}A\r\x1B[J\x1B[?25h`, []);
+      if (result.kind === "select") {
+        const item2 = items[cursor];
+        out.line(s.dim(`${pointer} ${neutralizeLine(options.echo ? options.echo(item2) : item2.label)}`));
+      }
+      resolve9(result);
+    };
+    const onEnd = () => finish2({ kind: "abort" });
+    const onData = (chunk) => {
+      for (const key of parseKeys(String(chunk))) {
+        if (key === "abort") return finish2({ kind: "abort" });
+        if (key === "quit" && options.quit) return finish2({ kind: "quit" });
+        if (key === "quit" && options.back) return finish2({ kind: "back" });
+        if (key === "back" && options.back) return finish2({ kind: "back" });
+        if (key === "enter") return finish2({ kind: "select", id: items[cursor].id });
+        if (key === "up") cursor = (cursor - 1 + items.length) % items.length;
+        else if (key === "down") cursor = (cursor + 1) % items.length;
+        else if (key === "home") cursor = 0;
+        else if (key === "end") cursor = items.length - 1;
+        else if (key === "pageUp") cursor = Math.max(0, cursor - 10);
+        else if (key === "pageDown") cursor = Math.min(items.length - 1, cursor + 10);
+        else if (key.startsWith("digit") && !options.confirm) {
+          const index = Number(key.slice(5)) - 1;
+          if (items[index]) {
+            cursor = index;
+            return finish2({ kind: "select", id: items[index].id });
+          }
+        }
+      }
+      draw();
+    };
+    process.once("exit", showCursor);
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.on("data", onData);
+    stdin.once("end", onEnd);
+    stdout.on?.("resize", draw);
+    out.screen("\x1B[?25l", []);
+    draw();
+  });
+}
+
 // src/orca.ts
 var ORCA_LIMITS = { items: 200, projects: 200, title: 1e3, status: 120, id: 200 };
 var KEY = /^[A-Z0-9]{2,10}-[1-9][0-9]*$/;
-var UUID2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var UUID3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 var CLOSED = /* @__PURE__ */ new Set(["completed", "cancelled", "canceled"]);
-var terminalConfirm = (deps) => async (question) => deps.isTTY && deps.ask ? /^(y|yes|j|ja)$/i.test((await deps.ask(`${question} (y/N)`)).trim()) : null;
+var terminalConfirm = (deps) => async (question) => {
+  if (!deps.isTTY || !deps.ask) return null;
+  if (deps.select) return isYes(await deps.select(yesNoList(question, deps.t)));
+  return /^(y|yes|j|ja)$/i.test((await deps.ask(`${question} (y/N)`)).trim());
+};
 var notBound = () => new CliError("errors.orcaNotBound", EXIT.failed, {}, "NOT_BOUND");
 var usage = () => new CliError("errors.usage", EXIT.usage, {}, "USAGE");
 var bounded = (value, max) => String(value ?? "").slice(0, max);
@@ -49845,7 +50142,7 @@ async function readTool(client, tool, args, read2) {
 }
 async function claimableIds(client, teamId, read2) {
   const candidates = await pages(client, WIRE.findWork, { ...teamId ? { teamId } : {} }, void 0, read2);
-  return new Set(candidates.filter((row) => Array.isArray(row.claims) && !row.claims.some((claim) => object3(claim) && claim.purpose === "work") && (!object3(row.eligibility) || row.eligibility.allowAgents === true && !row.eligibility.blockedBy) && (!object3(row.request) || row.request.canTake !== false)).map((row) => String(row.issueId ?? "").toLowerCase()).filter((id) => UUID2.test(id)));
+  return new Set(candidates.filter((row) => Array.isArray(row.claims) && !row.claims.some((claim) => object3(claim) && claim.purpose === "work") && (!object3(row.eligibility) || row.eligibility.allowAgents === true && !row.eligibility.blockedBy) && (!object3(row.request) || row.request.canTake !== false)).map((row) => String(row.issueId ?? "").toLowerCase()).filter((id) => UUID3.test(id)));
 }
 async function pages(client, tool, args, max = Number.POSITIVE_INFINITY, read2) {
   await available(client, tool);
@@ -49886,7 +50183,7 @@ function sortIssues(issues, mine) {
   return [...issues].sort((a, b) => Number(mine.has(b.id)) - Number(mine.has(a.id)) || priority(a) - priority(b) || updated(b) - updated(a) || String(a.identifier ?? "").localeCompare(String(b.identifier ?? ""), "en", { numeric: true }));
 }
 async function teams(client, read2) {
-  return (await pages(client, "fleek_list_teams", {}, ORCA_LIMITS.projects, read2)).filter((team) => typeof team.id === "string" && UUID2.test(team.id)).map((team) => ({ id: team.id.toLowerCase(), key: bounded(team.key, 32), name: bounded(team.name, 512) }));
+  return (await pages(client, "fleek_list_teams", {}, ORCA_LIMITS.projects, read2)).filter((team) => typeof team.id === "string" && UUID3.test(team.id)).map((team) => ({ id: team.id.toLowerCase(), key: bounded(team.key, 32), name: bounded(team.name, 512) }));
 }
 async function statesOf(client, teamIds, read2) {
   const states = /* @__PURE__ */ new Map();
@@ -49898,9 +50195,9 @@ async function statesOf(client, teamIds, read2) {
   return states;
 }
 function item(profile, issue, teamsById, states) {
-  const id = typeof issue.id === "string" && UUID2.test(issue.id) ? issue.id.toLowerCase() : null;
+  const id = typeof issue.id === "string" && UUID3.test(issue.id) ? issue.id.toLowerCase() : null;
   const key = typeof issue.identifier === "string" && KEY.test(issue.identifier) ? issue.identifier : null;
-  const teamId = typeof issue.teamId === "string" && UUID2.test(issue.teamId) ? issue.teamId.toLowerCase() : null;
+  const teamId = typeof issue.teamId === "string" && UUID3.test(issue.teamId) ? issue.teamId.toLowerCase() : null;
   if (!id || !key || !teamId) return null;
   const status = typeof issue.stateId === "string" ? states.get(issue.stateId.toLowerCase())?.name ?? "" : "";
   return { id, key, title: bounded(issue.title, ORCA_LIMITS.title), status, url: ticketUrl(profile, teamsById.get(teamId)?.key ?? null, key), projectId: teamId };
@@ -49908,14 +50205,14 @@ function item(profile, issue, teamsById, states) {
 function projectOf(values, found, list2) {
   if (values.project === void 0) return found.projectId;
   const value = values.project.trim();
-  const match = UUID2.test(value) ? list2.find((team) => team.id === value.toLowerCase()) : list2.find((team) => team.key.toUpperCase() === value.toUpperCase());
+  const match = UUID3.test(value) ? list2.find((team) => team.id === value.toLowerCase()) : list2.find((team) => team.key.toUpperCase() === value.toUpperCase());
   if (!match) throw new CliError("errors.orcaProjectUnknown", EXIT.usage, {}, "NOT_FOUND");
   return match.id;
 }
 async function myUserId(client, read2) {
   const who = (await readTool(client, WIRE.whoami, {}, read2)).structured;
   const id = who.principal?.userId;
-  if (typeof id !== "string" || !UUID2.test(id)) throw new CliError("errors.metadata", EXIT.failed, { reason: "context" }, "METADATA_INVALID");
+  if (typeof id !== "string" || !UUID3.test(id)) throw new CliError("errors.metadata", EXIT.failed, { reason: "context" }, "METADATA_INVALID");
   return id.toLowerCase();
 }
 async function orcaContext(deps, values = {}) {
@@ -50013,7 +50310,7 @@ var defaultExec = (program, args, options) => new Promise((resolve9) => nodeExec
   (error, stdout, stderr) => resolve9({ code: error ? typeof error.code === "number" ? error.code : 1 : 0, stdout: String(stdout), stderr: String(stderr) })
 ));
 async function orcaProgram(deps, runtime = { platform: process.platform }) {
-  const paths = runtime.platform === "win32" ? win32 : posix;
+  const paths = runtime.platform === "win32" ? win322 : posix2;
   const custom = deps.env.ORCA_CLI_COMMAND || void 0;
   const found = custom ?? (runtime.platform === "linux" ? await deps.which("orca-ide") : null) ?? await deps.which("orca");
   if (!found || !paths.isAbsolute(found) || paths.resolve(found) === "/usr/bin/orca" || await (runtime.realpath ?? realpath4)(found).catch(() => found) === "/usr/bin/orca") {
@@ -50053,6 +50350,11 @@ async function orcaPick(deps, values, start2) {
     deps.out.line(deps.out.style.note(deps.t("orca.none")));
     return EXIT.ok;
   }
+  if (deps.select) {
+    const rows = deps.out.style.columns(items.map((entry) => [entry.key, mineIds.has(entry.id) ? deps.t("orca.mine") : "", neutralizeLine(entry.status), neutralizeLine(entry.title).slice(0, 100)]), "");
+    const choice = await deps.select({ title: [deps.t("orca.pickTitle", { count: items.length })], items: items.map((entry, index) => ({ id: entry.key, label: rows[index] })), back: true });
+    return choice.kind === "select" ? start2(choice.id) : EXIT.ok;
+  }
   let offset = 0;
   while (true) {
     const end = Math.min(offset + 50, items.length);
@@ -50158,7 +50460,7 @@ async function liveFacts(client, task) {
   const claims = (Array.isArray(work2.claims) ? work2.claims : []).filter(object3).map((claim) => ({
     purpose: string3(claim.purpose),
     isMine: claim.isMine === true,
-    claimId: typeof claim.claimId === "string" && UUID2.test(claim.claimId) ? claim.claimId.toLowerCase() : null,
+    claimId: typeof claim.claimId === "string" && UUID3.test(claim.claimId) ? claim.claimId.toLowerCase() : null,
     holder: object3(claim.holder) ? string3(claim.holder.text) : "",
     expiresAt: string3(claim.expiresAt)
   }));
@@ -50264,7 +50566,7 @@ var foreignClaim = (key, holder, expiresAt) => new CliError(
 async function takeClaim(deps, client, task, purpose, runLabel) {
   try {
     const claim = (await mutate(client, WIRE.claim, { issueId: task.id, purpose, runLabel: runLabel.slice(0, 120) }, { backoffMs: deps.backoffMs })).result;
-    return typeof claim.claimId === "string" && UUID2.test(claim.claimId) ? claim.claimId.toLowerCase() : null;
+    return typeof claim.claimId === "string" && UUID3.test(claim.claimId) ? claim.claimId.toLowerCase() : null;
   } catch (error) {
     if (error instanceof ToolError && error.code === "ALREADY_CLAIMED") {
       const details = object3(error.details) ? error.details : {};
@@ -51751,7 +52053,7 @@ var USER_SKILL_MARKER = "<!-- Generated by scripts/agent-guidance/generate.mjs f
 var USER_SKILLS = [
   {
     "name": "fleek-orca-coordinator",
-    "content": "---\nname: fleek-orca-coordinator\ndescription: \"Coordinate Fleek tickets in Orca: find claimable work, claim it for this machine, start a builder in its own worktree with the project kit, review with the other model, leave gates to people and deliver to review. Use when you coordinate Orca agents for a Fleek project.\"\nmetadata:\n  protocol: fleek-work-protocol/1.13\n---\n\n<!-- Generated by scripts/agent-guidance/generate.mjs from scripts/agent-guidance/protocol.json - do not edit by hand. -->\n\n# Fleek in Orca: coordinator recipe\n\nFleek holds the tickets and every human decision; Orca runs worktrees and agents. Follow the fleek-work skill for every Fleek call. Never change Orca's code or settings.\n\n## 1. Ready check\n- `fleek doctor` in the repo: Fleek MCP current for Claude Code, Codex and every Orca account, repo bound to its Fleek project. Otherwise ask the person to run the setup command from Fleek once per machine (Settings › Connections › Set up this computer: `fleek setup <code>`). Never sign in for them.\n\n## 2. Find work\n- fleek_find_work and fleek_my_work_inbox (claimable: agent-ready or assigned to your person; addressed work first); `fleek orca tasks` lists the project's open tickets. Take only status roles where agents work: intake_review, ready, analysis, design, implementation, review. Skip tickets another holder claims.\n- Read stage in fleek_get_work_context before starting a worker, then use this role table. Do not infer a role from the displayed status name or from the ticket title.\n\n| Status role | Work and delivery |\n| --- | --- |\n| intake_review | One triage agent: duplicates, criteria and readiness; no product code or PR. |\n| ready | Claim, then re-read the live stage and use its row. A claim is not permission to skip analysis or design. |\n| analysis / design | One agent: concept or design proposal with evidence; no product code or PR. |\n| implementation | Builder, other-model review, then deliver the work claim (sections 3-5). |\n| review | One reviewer with a review claim (`fleek orca start KEY --yes --agent OTHER-MODEL` takes it on the delivered branch in its own worktree): checklist, acceptance and evidence; record the verdict, then release that review claim. No builder, implementation, PR or complete_work outcome done loop. Findings go back to the existing implementation work or to the person. |\n| collecting / clarification / acceptance / customer gate | Start no builder; prepare a draft only if requested and wait for the responsible person or customer. Never decide their gate. |\n| done / cancelled | Start nothing. |\n\n- Only implementation uses sections 3-5. `fleek orca tasks` is an overview; `fleek orca pick` works only in a person's terminal and offers only server candidates without an existing work claim. Re-read the live context after claiming: availability is not a status-role decision.\n\n## 3. Claim, worktree, builder\n- `fleek orca start KEY --yes` (the core of `fleek start` for coordinators: Orca required; a new or restarted agent stays in the background, one already running comes to the front) takes or reuses the claim for this machine, creates the Orca worktree named after the key from the project's base branch with the Fleek ticket as reference and starts the agent with a first prompt naming key and claim. You run without a terminal: only `--yes` replaces the person's confirmation, without it the command refuses with CONFIRMATION_REQUIRED. Use it only for tickets your person lets you start; the web link and a person's own terminal keep asking. With the Fleek start command as Orca's agent command (`fleek setup` names it), the agent loads the project's kit. Your own claim is reused, no error. Another holder's claim or NOT_READY: pick another ticket.\n- By hand: fleek_claim_issue (purpose work, runLabel \"orca\" plus the worktree name), then `orca worktree create --name eng-123-slug --reference TICKET-URL --agent claude` from the base branch of fleek_get_project_brief.\n- The builder's task is a pointer: key, claimId, worktree, branch, role builder. Never paste ticket text, criteria or sign-in data; the agent reads them live from Fleek.\n- Models only from providers conventions.aiProviders allows (fleek_get_work_context); a customer's code never goes to another provider.\n- Card: `orca worktree set --worktree id:WORKTREE-ID --workspace-status in-progress`.\n\n## 4. Review by the other model\n- After the builder's worker_done verify its report in two reads before starting a reviewer: the fetched feature branch head equals the reported SHA and the worktree has no uncommitted changes; the test note is on the ticket when the project kit asks for one. A mismatch goes back to the builder, not to the reviewer.\n- Then start a reviewer with the other model (Claude and Codex swap; only one provider allowed: a fresh session of it) in the same worktree, role reviewer. It claims purpose review, checks criteria and checklist and records its verdict at the ticket.\n- Check the review's shape (fleek-work, In Orca, reviewer): verdict on the first line, blockers each with a reproduction, anchors only inside the reviewed range, each finding read or measured, questions for a person at the ticket. A review that misses it goes back to the reviewer once with the exact points.\n- Verdict not ready or a criterion not_met: builder round 2 in the same worktree, then review again. After two rounds ask the person.\n\n## 5. Deliver\n- Clean review: load the guidance (fleek_get_work_context), then fleek_complete_work on the work claim, outcome done, with SHA, branch, PR, checks and result, acceptance per criterion and nextStep. The ticket moves to the project's review state, never Done; check moved and toStateId.\n- A coordination or review claim that only records a status writes fleek_post_progress, not a result. One completion = one fleek_complete_work; no extra summary or analysis comment. Put the recommendation in nextStep; do not add a note about your own draft or publication request.\n- Parts open: outcome partial. Blocked: fleek_release_issue outcome not_doable. Interrupted: outcome paused. A failed dispatch is never done.\n- Card in-review with the existing result; no extra ticket comment.\n\n## 6. People decide\n- Questions only a person can answer go to the ticket (fleek_ask_question); the worker waits, the card gets `--unread`. Gates, acceptance, customer text and Done are decided by a person in Fleek, by an agent only where the project rule allows it and the person approved or gave a standing mandate. Never orca gate-resolve or a terminal yes on their behalf.\n- Answer an orca ask only when a rule or a decision recorded at the ticket settles it, and cite it. Anything else a person decides goes back as \"ask at the ticket\": the asking agent calls fleek_ask_question with the deciding person as addressee and waits. Your own person's answer in chat or terminal is recorded verbatim as an internal ticket comment (\"Answer NAME in chat, DATE: ...\"); pass it on only together with that comment, never a chat answer alone. The comment only records the factual answer of your own person; it decides no gate, customer acceptance or publication and grants or widens no mandate or agent_git_* right - those stay decisions in Fleek.\n\n## 7. Keep claims alive\n- Renew by expiresAt (about every 20 minutes) while a worker runs or waits; an Orca heartbeat is no renewal. The claim belongs to the machine, so a switched account or a usage-limit pause keeps it: renew and resume. Nobody can continue before expiry: release paused.\n- After a crash read your live claims (fleek_my_work_inbox) and `orca worktree list`, then continue on the same claim (`fleek orca start KEY --yes` restarts an ended agent) or release it. Never claim or complete twice.\n\n## 8. Limits\n- One builder per ticket, one ticket per worktree. Parallel tickets: as many as the person allows, default 2, each with its reviewer; queue the rest. QUOTA_EXCEEDED: the machine's claims are used up - finish or release one first.\n- No Orca code changes, forks or pull requests on Orca. Git effects only as far as the project brief allows.\n"
+    "content": "---\nname: fleek-orca-coordinator\ndescription: \"Coordinate Fleek tickets in Orca: find claimable work, claim it for this machine, start a builder in its own worktree with the project kit, review with the other model, leave gates to people and deliver to review. Use when you coordinate Orca agents for a Fleek project.\"\nmetadata:\n  protocol: fleek-work-protocol/1.13\n---\n\n<!-- Generated by scripts/agent-guidance/generate.mjs from scripts/agent-guidance/protocol.json - do not edit by hand. -->\n\n# Fleek in Orca: coordinator recipe\n\nFleek holds the tickets and every human decision; Orca runs worktrees and agents. Follow the fleek-work skill for every Fleek call. Never change Orca's code or settings.\n\n## 1. Ready check\n- `fleek doctor` in the repo: Fleek MCP current for Claude Code, Codex and every Orca account, repo bound to its Fleek project. Otherwise ask the person to run the setup command from Fleek once per machine (Settings › Connections › Set up this computer: `fleek setup <code>`). Never sign in for them.\n\n## 2. Find work\n- fleek_find_work and fleek_my_work_inbox (claimable: agent-ready or assigned to your person; addressed work first); `fleek orca tasks` lists the project's open tickets. Take only status roles where agents work: intake_review, ready, analysis, design, implementation, review. Skip tickets another holder claims.\n- Read stage in fleek_get_work_context before starting a worker, then use this role table. Do not infer a role from the displayed status name or from the ticket title.\n\n| Status role | Work and delivery |\n| --- | --- |\n| intake_review | One triage agent: duplicates, criteria and readiness; no product code or PR. |\n| ready | Claim, then re-read the live stage and use its row. A claim is not permission to skip analysis or design. |\n| analysis / design | One agent: concept or design proposal with evidence; no product code or PR. |\n| implementation | Builder, other-model review, then deliver the work claim (sections 3-5). |\n| review | One reviewer with a review claim (`fleek orca start KEY --yes --agent OTHER-MODEL` takes it on the delivered branch in its own worktree): checklist, acceptance and evidence; record the verdict, then release that review claim. No builder, implementation, PR or complete_work outcome done loop. Findings go back to the existing implementation work or to the person. |\n| collecting / clarification / acceptance / customer gate | Start no builder; prepare a draft only if requested and wait for the responsible person or customer. Never decide their gate. |\n| done / cancelled | Start nothing. |\n\n- Only implementation uses sections 3-5. `fleek orca tasks` is an overview; `fleek orca pick` works only in a person's terminal and offers only server candidates without an existing work claim. Re-read the live context after claiming: availability is not a status-role decision.\n\n## 3. Claim, worktree, builder\n- `fleek orca start KEY --yes` (the core of `fleek start` for coordinators: Orca required; a new or restarted agent stays in the background, one already running comes to the front) takes or reuses the claim for this machine, creates the Orca worktree named after the key from the project's base branch with the Fleek ticket as reference and starts the agent with a first prompt naming key and claim. You run without a terminal: only `--yes` replaces the person's confirmation, without it the command refuses with CONFIRMATION_REQUIRED. Use it only for tickets your person lets you start; the web link and a person's own terminal keep asking. With the Fleek start command as Orca's agent command (`fleek setup` names it), the agent loads the project's kit. Your own claim is reused, no error. Another holder's claim or NOT_READY: pick another ticket.\n- By hand: fleek_claim_issue (purpose work, runLabel \"orca\" plus the worktree name), then `orca worktree create --name eng-123-slug --reference TICKET-URL --agent claude` from the base branch of fleek_get_project_brief.\n- The builder's task is a pointer: key, claimId, worktree, branch, role builder. Never paste ticket text, criteria or sign-in data; the agent reads them live from Fleek.\n- Models only from providers conventions.aiProviders allows (fleek_get_work_context); a customer's code never goes to another provider.\n- Card: `orca worktree set --worktree id:WORKTREE-ID --workspace-status in-progress`.\n\n## 4. Review by the other model\n- After the builder's worker_done verify its report in two reads before starting a reviewer: the fetched feature branch head equals the reported SHA and the worktree has no uncommitted changes; the test note is on the ticket when the project kit asks for one. A mismatch goes back to the builder, not to the reviewer.\n- Then start a reviewer with the other model (Claude and Codex swap; only one provider allowed: a fresh session of it) in the same worktree, role reviewer. It claims purpose review, checks criteria and checklist and records its verdict at the ticket.\n- Check the review's shape (fleek-work, In Orca, reviewer): verdict on the first line, blockers each with a reproduction, anchors only inside the reviewed range, each finding read or measured, questions for a person at the ticket. A review that misses it goes back to the reviewer once with the exact points.\n- Verdict not ready or a criterion not_met: builder round 2 in the same worktree, then review again. After two rounds ask the person.\n\n## 5. Deliver\n- Clean review: load the guidance (fleek_get_work_context), then fleek_complete_work on the work claim, outcome done, with SHA, branch, PR, checks and result, acceptance per criterion and nextStep. The ticket moves to the project's review state, never Done; check moved and toStateId.\n- A coordination or review claim that only records a status writes fleek_post_progress, not a result. One completion = one fleek_complete_work; no extra summary or analysis comment. Put the recommendation in nextStep; do not add a note about your own draft or publication request.\n- Parts open: outcome partial. Blocked: fleek_release_issue outcome not_doable. Interrupted: outcome paused. A failed dispatch is never done.\n- Card in-review with the existing result; no extra ticket comment.\n\n## 6. People decide\n- Questions only a person can answer go to the ticket (fleek_ask_question); the worker waits, the card gets `--unread`. Gates, acceptance, customer text and Done are decided by a person in Fleek, by an agent only where the project rule allows it and the person approved or gave a standing mandate. Never orca gate-resolve or a terminal yes on their behalf.\n- Answer an orca ask only when a rule or a decision recorded at the ticket settles it, and cite it. Anything else a person decides goes back as \"ask at the ticket\": the asking agent calls fleek_ask_question with the deciding person as addressee and waits. Your own person's answer in chat or terminal is recorded verbatim as an internal ticket comment (\"Answer NAME in chat, DATE: ...\"); pass it on only together with that comment, never a chat answer alone. The comment only records the factual answer of your own person; it decides no gate, customer acceptance or publication and grants or widens no mandate or agent_git_* right - those stay decisions in Fleek.\n\n## 7. Keep claims alive\n- Renew by expiresAt (about every 20 minutes) while a worker runs or waits; an Orca heartbeat is no renewal. The claim belongs to the machine, so a switched account or a usage-limit pause keeps it: renew and resume. Nobody can continue before expiry: release paused. A ticket you paused stays claimable for your agent under your person's work mandate until someone else changes its status or assignee.\n- After a crash read your live claims (fleek_my_work_inbox) and `orca worktree list`, then continue on the same claim (`fleek orca start KEY --yes` restarts an ended agent) or release it. Never claim or complete twice.\n\n## 8. Limits\n- One builder per ticket, one ticket per worktree. Parallel tickets: as many as the person allows, default 2, each with its reviewer; queue the rest. QUOTA_EXCEEDED: the machine's claims are used up - finish or release one first.\n- No Orca code changes, forks or pull requests on Orca. Git effects only as far as the project brief allows.\n"
   }
 ];
 
@@ -51981,8 +52283,9 @@ function initAgentArgs(prompt) {
     JSON.stringify({ disableAllHooks: true })
   ];
 }
-function initAgentEnv(env) {
-  const result = { PATH: dirname9(process.execPath) };
+function initAgentEnv(env, platform = process.platform) {
+  const path = platform === "darwin" ? [dirname9(process.execPath), "/usr/bin"] : [dirname9(process.execPath)];
+  const result = { PATH: path.join(delimiter2) };
   for (const key of [
     "HOME",
     "USER",
@@ -54265,113 +54568,6 @@ var Session = class {
   }
 };
 
-// src/header.ts
-import { win32 as win322, posix as posix2 } from "node:path";
-
-// src/uuid.ts
-var UUID3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function isUuid(value) {
-  return UUID3.test(value);
-}
-function canonicalId(value) {
-  if (!UUID3.test(value)) throw new Error("INVALID_UUID");
-  return value.toLowerCase();
-}
-
-// src/header.ts
-var LOGO2 = ["  ▄██████▀", " ▄█████▀  ", " ██▀      "];
-var ASCII_LOGO = ["  ######/", " #####/  ", " ##/     "];
-var BRAND = "\x1B[38;2;69;94;255m";
-function shouldShowHeader(positionals, options, terminal) {
-  if (options.json || options.version || terminal.stream.isTTY !== true) return false;
-  const active = (value) => value !== void 0 && value !== "" && value !== "0" && value !== "false";
-  if (["CI", "CONTINUOUS_INTEGRATION", "GITHUB_ACTIONS", "BUILD_NUMBER", "TF_BUILD"].some((key) => active(terminal.env[key]))) return false;
-  const [command, sub] = positionals;
-  return !command || command === "help" || !!options.help || command === "setup" || command === "doctor" || command === "init" || command === "kit" && ["setup", "doctor", "pull"].includes(sub ?? "") || command === "service" && sub === "setup";
-}
-function cells(value) {
-  let width = 0;
-  for (const char of value) {
-    const code = char.codePointAt(0);
-    if (new RegExp("\\p{Mark}", "u").test(char)) continue;
-    width += code >= 4352 && (code <= 4447 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744) ? 2 : 1;
-  }
-  return width;
-}
-function fit(value, width, ascii) {
-  if (cells(value) <= width) return value;
-  const suffix = ascii ? "..." : "…";
-  if (width <= suffix.length) return suffix.slice(0, Math.max(0, width));
-  let out = "";
-  for (const char of value) {
-    if (cells(out + char) > width - suffix.length) break;
-    out += char;
-  }
-  return out + suffix;
-}
-var safe = (value) => neutralizeLine(redact(value));
-function directory(context, windows, env) {
-  const path = windows ? win322 : posix2;
-  const home = context.home ?? userHome(env, windows ? "win32" : process.platform);
-  const relative3 = path.relative(home, context.cwd);
-  const inside = relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path.sep}`) && !path.isAbsolute(relative3);
-  return safe(inside ? relative3 ? `~${path.sep}${relative3}` : "~" : context.cwd);
-}
-function headerServer(value) {
-  if (!value) return void 0;
-  try {
-    const url = new URL(value);
-    return ["http:", "https:"].includes(url.protocol) ? url.host : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function renderHeader(context, terminal, t) {
-  const windows = (terminal.platform ?? process.platform) === "win32";
-  const ascii = windows || terminal.env.TERM === "dumb";
-  const separator = ascii ? " - " : " · ";
-  const requested = terminal.stream.columns ?? Number(terminal.env.COLUMNS);
-  const columns = Number.isFinite(requested) && requested > 0 ? Math.floor(requested) : 80;
-  const title = t("header.title", { version: safe(context.version) });
-  const cwd = directory(context, windows, terminal.env);
-  const parts = [context.workspace, context.project && !isUuid(context.project) ? context.project : void 0, headerServer(context.server), context.displayName].filter((value) => !!value);
-  const details = parts.length ? parts.map(safe).join(separator) : t("header.noContext");
-  if (columns < 60) return ["", fit([title, cwd].join(separator), columns, ascii)];
-  const logo = ascii ? ASCII_LOGO : LOGO2;
-  const width = Math.max(...logo.map(cells));
-  const color = colorEnabled(terminal.env, terminal.stream);
-  const available2 = columns - width - 6;
-  const tagline = separator + t("header.tagline");
-  const attribution = separator + t("header.attribution");
-  const secondary = cells(title + tagline) <= available2 ? tagline + (cells(title + tagline + attribution) <= available2 ? attribution : "") : "";
-  const text6 = [title, details, cwd];
-  const rows = logo.map((row, index) => {
-    const mark = row.padEnd(width);
-    const label = fit(text6[index], available2, ascii);
-    if (index === 0) {
-      const heading = color ? `\x1B[1m${label}\x1B[22m` : label;
-      const branding = color && secondary ? `\x1B[2m${secondary}\x1B[22m` : secondary;
-      return `${color ? `${BRAND}${mark}\x1B[39m` : mark}  ${heading}${branding}`;
-    }
-    const styled = color ? `\x1B[2m${label}\x1B[22m` : label;
-    return `${color ? `${BRAND}${mark}\x1B[39m` : mark}  ${styled}`;
-  });
-  const inner = Math.max(...rows.map((row) => cells(stripAnsi(row))));
-  const edge = (value) => color ? `${BRAND}${value}\x1B[39m` : value;
-  const vertical = ascii ? "|" : "│";
-  return [
-    "",
-    edge(`${ascii ? "+" : "╭"}${(ascii ? "-" : "─").repeat(inner + 2)}${ascii ? "+" : "╮"}`),
-    ...rows.map((row) => `${edge(vertical)} ${row}${" ".repeat(inner - cells(stripAnsi(row)))} ${edge(vertical)}`),
-    edge(`${ascii ? "+" : "╰"}${(ascii ? "-" : "─").repeat(inner + 2)}${ascii ? "+" : "╯"}`)
-  ];
-}
-function printHeader(out, context, terminal, t) {
-  for (const line of renderHeader(context, terminal, t)) out.line(line);
-  out.line();
-  out.indentHumanOutput();
-}
-
 // src/project-reference.ts
 async function visibleProject(client, ref) {
   let cursor;
@@ -59288,6 +59484,20 @@ async function guidedMenu(d) {
     out.line(`$ fleek ${args[0] === "setup" && args[1] && !args[1].startsWith("--") ? "setup <code>" : args.map(neutralizeLine).join(" ")}`);
     return d.run(args, cwd2);
   };
+  const choose = async (options) => {
+    if (d.select) return d.select(options);
+    for (const line of [...options.context ? [options.context] : [], ...options.title ?? []]) out.line(line);
+    for (const [i, item2] of options.items.entries()) out.line(`${i + 1}  ${item2.label}${item2.hint ? ` · ${item2.hint}` : ""}`);
+    const answer2 = (await d.ask(t("menu.choose"))).trim();
+    if (!answer2) return { kind: "back" };
+    const chosen = /^[1-9][0-9]*$/.test(answer2) ? options.items[Number(answer2) - 1] : void 0;
+    if (!chosen) throw new CliError("errors.usage", EXIT.usage, {}, "USAGE");
+    return { kind: "select", id: chosen.id };
+  };
+  const confirm2 = async (question) => {
+    if (!d.select) return /^(y|yes|j|ja)$/i.test((await d.ask(`${question} ${t("menu.yesNo")}`)).trim());
+    return isYes(await d.select(yesNoList(question, t)));
+  };
   const connect = async (setup) => {
     await d.connect();
     if (!setup) return EXIT.ok;
@@ -59311,53 +59521,121 @@ async function guidedMenu(d) {
     }
     return run2(["setup", code, ...language ? ["--language", language] : []]);
   };
-  out.line(t("menu.recommend", { action: d.resume ? t("menu.resume", { key: d.resume }) : t(!d.signedIn ? "menu.connect" : d.stateError ? "menu.doctor" : !d.bound ? "menu.bind" : "menu.pick") }));
-  if (d.stateError) out.line(t("menu.stateUnreadable"));
-  if (!d.signedIn) {
-    out.line(`1  ${t("menu.connect")}`);
-    out.line(`2  ${t("menu.help")}`);
-    const choice2 = (await d.ask(t("menu.choose"))).trim();
-    if (!choice2) return EXIT.ok;
-    if (choice2 === "1") return connect(true);
-    if (choice2 === "2") return run2(["help"]);
-    throw new CliError("errors.usage", EXIT.usage, {}, "USAGE");
-  }
   let cwd;
-  if (!d.bound && !d.stateError) {
-    for (const [i, path] of d.checkouts.entries()) out.line(`${i + 1}  ${neutralizeLine(path)}`);
-    out.line(`0  ${t("menu.connect")}`);
-    const choice2 = (await d.ask(t("menu.checkout"))).trim();
-    if (!choice2) return EXIT.ok;
-    if (choice2 === "0") return connect(true);
-    const index = Number(choice2) - 1;
-    if (!/^\d+$/.test(choice2) || !d.checkouts[index]) throw new CliError("errors.usage", EXIT.usage, {}, "USAGE");
-    cwd = d.checkouts[index];
-  }
-  if (d.repair) out.line(t("menu.fix", { command: `fleek ${repair.join(" ")}` }));
-  for (const [i, key] of ["pick", "continue", "doctor", "connections", "help"].entries()) out.line(`${i + 1}  ${t(`menu.${key}`)}`);
-  const choice = (await d.ask(t("menu.choose"))).trim();
-  switch (choice) {
-    case "":
+  let state;
+  let cursor;
+  while (true) {
+    if (!state) {
+      out.progress(t("menu.loading"));
+      try {
+        state = await d.state(cwd);
+      } catch {
+        state = { signedIn: false, bound: false, stateError: true, checkouts: [] };
+      }
+      out.progress(null);
+      if (cwd && !state.bound && !state.stateError) {
+        cwd = void 0;
+        continue;
+      }
+    }
+    const current2 = state;
+    const recommended = (id2, wanted2) => id2 === wanted2 ? { hint: t("menu.recommended") } : {};
+    const chooser2 = current2.signedIn && !current2.bound && !current2.stateError;
+    const canSwitch = !chooser2 && !!cwd;
+    const wanted = !current2.signedIn ? "connect" : current2.resume ? "resume" : current2.stateError ? "doctor" : "pick";
+    const items = !current2.signedIn ? [{ id: "connect", label: t("menu.connect"), ...recommended("connect", wanted) }, { id: "help", label: t("menu.help") }, { id: "quit", label: t("menu.quit") }] : chooser2 ? [
+      ...current2.checkouts.map((checkout, i) => ({ id: `checkout:${i}`, label: checkout.label ?? checkout.path, ...checkout.project ? { hint: checkout.project } : {} })),
+      { id: "connect", label: t("menu.setupComputer") },
+      { id: "help", label: t("menu.help") },
+      { id: "quit", label: t("menu.quit") }
+    ] : [
+      ...current2.resume ? [{ id: "resume", label: t("menu.resume", { key: current2.resume }), ...recommended("resume", wanted) }] : [],
+      { id: "pick", label: t("menu.pick"), ...recommended("pick", wanted) },
+      { id: "continue", label: t("menu.continue") },
+      { id: "doctor", label: t("menu.doctor"), ...recommended("doctor", wanted) },
+      { id: "connections", label: t("menu.connections") },
+      ...canSwitch ? [{ id: "switch", label: t("menu.switchCheckout") }] : [],
+      { id: "help", label: t("menu.help") },
+      { id: "quit", label: t("menu.quit") }
+    ];
+    const title = [
+      ...chooser2 ? [t("menu.checkoutTitle")] : [],
+      ...current2.stateError && current2.signedIn ? [t("menu.stateUnreadable")] : [],
+      ...current2.repair && current2.signedIn && !chooser2 ? [t("menu.fix", { command: `fleek ${repair.join(" ")}` })] : []
+    ];
+    let choice;
+    try {
+      choice = await choose({ ...current2.context ? { context: current2.context } : {}, title, items, initial: cursor && items.some((item2) => item2.id === cursor) ? cursor : wanted, quit: true, back: canSwitch });
+    } catch (error) {
+      d.report(error);
+      out.line();
+      continue;
+    }
+    if (choice.kind !== "select") {
+      if (choice.kind === "back" && canSwitch) {
+        cwd = void 0;
+        state = void 0;
+        cursor = void 0;
+        continue;
+      }
       return EXIT.ok;
-    case "1":
-      return run2(["start", "--mine"], cwd);
-    case "2": {
-      const key = (await d.ask(d.resume ? t("menu.ticketDefault", { key: d.resume }) : t("menu.ticket"))).trim().toUpperCase() || d.resume;
-      if (!key) return EXIT.ok;
-      if (!/^[A-Z0-9]{2,10}-[1-9][0-9]*$/.test(key)) throw new CliError("errors.usage", EXIT.usage, {}, "USAGE");
-      return run2(["start", key], cwd);
-    }
-    case "3": {
-      const code = await run2(["doctor"], cwd);
-      if ((code !== EXIT.ok || d.repair || d.stateError) && /^(y|yes|j|ja)$/i.test((await d.ask(t("menu.repair", { command: `fleek ${repair.join(" ")}` }))).trim())) return run2(repair, cwd);
-      return code;
     }
-    case "4":
-      return connect(false);
-    case "5":
-      return run2(["help"]);
-    default:
-      throw new CliError("errors.usage", EXIT.usage, {}, "USAGE");
+    const id = choice.id;
+    if (id === "quit") return EXIT.ok;
+    cursor = id;
+    if (id === "switch") {
+      cwd = void 0;
+      state = void 0;
+      cursor = void 0;
+      continue;
+    }
+    if (id.startsWith("checkout:")) {
+      cwd = current2.checkouts[Number(id.slice(9))]?.path;
+      state = void 0;
+      cursor = void 0;
+      continue;
+    }
+    let refresh = true, code = EXIT.ok;
+    try {
+      switch (id) {
+        case "connect":
+          code = await connect(true);
+          break;
+        case "resume":
+          code = await run2(["start", current2.resume], cwd);
+          break;
+        case "pick":
+          code = await run2(["start", "--mine"], cwd);
+          break;
+        case "continue": {
+          const key = (await d.ask(current2.resume ? t("menu.ticketDefault", { key: current2.resume }) : t("menu.ticket"))).trim().toUpperCase() || current2.resume;
+          if (!key) {
+            refresh = false;
+            break;
+          }
+          if (!/^[A-Z0-9]{2,10}-[1-9][0-9]*$/.test(key)) throw new CliError("errors.usage", EXIT.usage, {}, "USAGE");
+          code = await run2(["start", key], cwd);
+          break;
+        }
+        case "doctor":
+          code = await run2(["doctor"], cwd);
+          if (!d.leaving?.() && (code !== EXIT.ok || current2.repair || current2.stateError) && await confirm2(t("menu.repair", { command: `fleek ${repair.join(" ")}` }))) code = await run2(repair, cwd);
+          break;
+        case "connections":
+          refresh = false;
+          code = await connect(false);
+          break;
+        case "help":
+          refresh = false;
+          code = await run2(["help"]);
+          break;
+      }
+    } catch (error) {
+      d.report(error);
+    }
+    if (d.leaving?.()) return code;
+    out.line();
+    if (refresh) state = void 0;
   }
 }
 
@@ -59731,6 +60009,10 @@ var Context = class {
   fetch;
   now;
   headerShown = false;
+  /** Bare `fleek` is an application: an update hint once, and these two end it after the current action. */
+  updateChecked = false;
+  agentRan = false;
+  appQuit = false;
   store;
   boundProfile;
   /** The look of human lines (colours only for a TTY, never with --json). */
@@ -60034,7 +60316,7 @@ async function confirmLocal(ctx, lines) {
   const rl = createInterface2({ input: process.stdin, output: process.stderr });
   try {
     for (const line of lines.slice(0, -1)) ctx.out.error(line);
-    const answer2 = await rl.question(`${ctx.out.render(ctx.s.question(lines.at(-1) ?? ""), "err")} `);
+    const answer2 = await askLine(rl, `${ctx.out.render(ctx.s.question(lines.at(-1) ?? ""), "err")} `);
     return /^(?:j|ja|y|yes)$/i.test(answer2.trim());
   } finally {
     rl.close();
@@ -60394,7 +60676,8 @@ async function dispatch(ctx, positionals, values, exec, passthrough) {
       displayName: profile?.needsLogin ? void 0 : profile?.displayName
     }, terminal, ctx.t);
   }
-  if (!["update", "uninstall", "mcp", "listen", "help", "login", "setup"].includes(command ?? "") && !(command === "kit" && sub === "run") && !values.help) {
+  if (!ctx.updateChecked && !["update", "uninstall", "mcp", "listen", "help", "login", "setup"].includes(command ?? "") && !(command === "kit" && sub === "run") && !values.help) {
+    ctx.updateChecked = true;
     await updateHint({
       configDir: ctx.configDir,
       env: ctx.env,
@@ -60408,47 +60691,19 @@ async function dispatch(ctx, positionals, values, exec, passthrough) {
     }, ctx.deps.isTTY ?? (process.stderr.isTTY === true && process.stdin.isTTY === true));
   }
   if (!command && !values.help && !ctx.json && (ctx.deps.isTTY ?? (process.stdin.isTTY === true && (ctx.deps.stdout ?? process.stdout).isTTY === true))) {
-    let stateError = false;
-    const found = await resolveBinding(ctx.profiles, ctx.configDir, { flag: ctx.profileFlag, env: ctx.env, cwd: ctx.deps.cwd ?? process.cwd(), allowCurrent: true }).catch(() => {
-      stateError = true;
-      return null;
-    });
-    const profile = found?.profile ?? await ctx.profiles.current().catch(() => null);
-    const checkouts = profile ? await new CheckoutIndex(ctx.configDir, profile.key).entries().catch(() => {
-      stateError = true;
-      return [];
-    }) : [];
-    const domain = profile && found?.projectId ? new KitDomain(ctx.configDir, profile.key, found.projectId) : null;
-    let kitNeedsRepair = false;
-    if (domain) {
-      try {
-        kitNeedsRepair = !await domain.current() && await domain.pulledAt() === null;
-      } catch {
-        stateError = true;
-        kitNeedsRepair = true;
-      }
-    }
-    const handler = await inspectSetupHandler(kitContext(ctx, values)).catch(() => {
-      stateError = true;
-      return null;
-    });
-    const repair = handler?.state === "missing" || kitNeedsRepair ? ["kit", "setup"] : void 0;
-    const resume = profile && !profile.needsLogin && found?.projectId ? await ctx.session().then(async ({ client }) => {
-      const inbox = (await client.callTool(WIRE.inbox, { limit: 25, kinds: ["claim"], teamId: found.projectId })).structured;
-      const rows = Array.isArray(inbox.items) ? inbox.items : [];
-      return rows.find((row) => row.kind === "claim" && typeof row.identifier === "string" && /^[A-Z0-9]{2,10}-[1-9][0-9]*$/.test(row.identifier))?.identifier;
-    }).catch(() => void 0) : void 0;
+    let leaving = false;
     return guidedMenu({
-      resume,
-      stateError,
       out: ctx.out,
-      t: ctx.t,
+      t: (key, params) => ctx.t(key, params),
       ask: orcaDeps(ctx).ask,
-      signedIn: !!profile && !profile.needsLogin,
-      repair,
-      bound: !!found?.projectId,
-      checkouts: checkouts.map(([path]) => path),
+      ...selectFor(ctx),
+      state: (cwd) => menuState(ctx, values, cwd),
+      leaving: () => leaving,
+      report: (error) => {
+        reportFailure(ctx.out, ctx.t, error, false);
+      },
       connect: async () => {
+        const profile = await ctx.profiles.current().catch(() => null);
         const origin = profile ? webOrigin(profile) : "https://app.onfleek.app";
         if (!origin) {
           ctx.out.line(ctx.t("menu.setupExternal"));
@@ -60462,7 +60717,13 @@ async function dispatch(ctx, positionals, values, exec, passthrough) {
         const target = cwd ? new Context({ ...ctx.deps, cwd }, false, ctx.profileFlag, ctx.languageFlag) : ctx;
         const parsed = parseArgs({ args, options: OPTIONS, allowPositionals: true });
         target.headerShown = ctx.headerShown;
-        return dispatch(target, parsed.positionals, { profile: values.profile, language: values.language, ...parsed.values, yes: false }, null, null);
+        target.updateChecked = true;
+        if (target !== ctx && ctx.headerShown) target.out.indentHumanOutput();
+        try {
+          return await dispatch(target, parsed.positionals, { profile: values.profile, language: values.language, ...parsed.values, yes: false }, null, null);
+        } finally {
+          leaving = target.agentRan || target.appQuit;
+        }
       }
     });
   }
@@ -60750,6 +61011,82 @@ async function mcpProxy(ctx, args, values) {
     ...ctx.deps.proxyRetryDelaysMs ? { retryDelaysMs: ctx.deps.proxyRetryDelaysMs } : {}
   });
 }
+function selectFor(ctx) {
+  const stdin = ctx.deps.stdin ?? process.stdin, stdout = ctx.deps.stdout ?? process.stdout;
+  if (ctx.json || !isKeyInput(stdin) || stdout.isTTY !== true || ctx.env.TERM === "dumb") return {};
+  return { select: async (options) => {
+    const result = await selectList({ stdin, stdout, out: ctx.out, t: ctx.t }, options);
+    if (result.kind === "abort") ctx.appQuit = true;
+    return result;
+  } };
+}
+function askLine(rl, question) {
+  return new Promise((resolve9, reject) => {
+    rl.once("close", () => resolve9(""));
+    rl.question(question).then(resolve9, reject);
+  });
+}
+var RESUME_READ_MS = 3e3;
+async function menuState(ctx, values, cwd) {
+  let stateError = false;
+  const folder = cwd ?? ctx.deps.cwd ?? process.cwd();
+  const found = await resolveBinding(ctx.profiles, ctx.configDir, { flag: ctx.profileFlag, env: ctx.env, cwd: folder, allowCurrent: true }).catch(() => {
+    stateError = true;
+    return null;
+  });
+  const profile = found?.profile ?? await ctx.profiles.current().catch(() => null);
+  if (profile?.language && !ctx.languageFlag) ctx.t = translator(profile.language);
+  const keys = profile ? new ProjectKeyIndex(ctx.configDir, profile.key) : null;
+  const keyOf = async (project2) => await keys?.keyFor(project2).catch(() => null) ?? void 0;
+  const entries = profile ? await new CheckoutIndex(ctx.configDir, profile.key).entries().catch(() => {
+    stateError = true;
+    return [];
+  }) : [];
+  const checkouts = (await Promise.all(entries.map(async ([path, project2]) => {
+    if (!await stat16(path).then((info) => info.isDirectory(), () => false)) return null;
+    const key = await keyOf(project2);
+    return { path, label: displayPath(path, ctx.home, ctx.env), ...key ? { project: key } : {} };
+  }))).filter((entry) => entry !== null);
+  const domain = profile && found?.projectId ? new KitDomain(ctx.configDir, profile.key, found.projectId) : null;
+  let kitNeedsRepair = false;
+  if (domain) {
+    try {
+      kitNeedsRepair = !await domain.current() && await domain.pulledAt() === null;
+    } catch {
+      stateError = true;
+      kitNeedsRepair = true;
+    }
+  }
+  const handler = await inspectSetupHandler(kitContext(ctx, values)).catch(() => {
+    stateError = true;
+    return null;
+  });
+  const signedIn = !!profile && !profile.needsLogin;
+  let resume;
+  if (signedIn && found?.projectId) {
+    const read2 = ctx.sessionFor(profile).then(async ({ client }) => {
+      const inbox = (await client.callTool(WIRE.inbox, { limit: 25, kinds: ["claim"], teamId: found.projectId })).structured;
+      const rows = Array.isArray(inbox.items) ? inbox.items : [];
+      return rows.find((row) => row.kind === "claim" && typeof row.identifier === "string" && /^[A-Z0-9]{2,10}-[1-9][0-9]*$/.test(row.identifier))?.identifier;
+    }).catch(() => void 0);
+    let timer;
+    resume = await Promise.race([read2, new Promise((resolve9) => {
+      timer = setTimeout(() => resolve9(void 0), RESUME_READ_MS);
+    })]);
+    clearTimeout(timer);
+  }
+  const project = found?.projectId ? await keyOf(found.projectId) : void 0;
+  const context = signedIn ? [profile.workspace.name, project, displayPath(folder, ctx.home, ctx.env)].filter(Boolean).map((part) => neutralizeLine(part)).join(" · ") : void 0;
+  return {
+    signedIn,
+    bound: !!found?.projectId,
+    stateError,
+    checkouts,
+    ...resume ? { resume } : {},
+    ...context ? { context } : {},
+    ...handler?.state === "missing" || kitNeedsRepair ? { repair: true } : {}
+  };
+}
 function orcaDeps(ctx) {
   return {
     out: ctx.out,
@@ -60768,11 +61105,12 @@ function orcaDeps(ctx) {
       const { createInterface: createInterface2 } = await import("node:readline/promises");
       const rl = createInterface2({ input: process.stdin, output: ctx.json ? process.stderr : process.stdout });
       try {
-        return await rl.question(`${ctx.out.style.question(question)} `);
+        return await askLine(rl, `${ctx.out.render(ctx.out.style.question(question), ctx.json ? "err" : "out")} `);
       } finally {
         rl.close();
       }
     }),
+    ...selectFor(ctx),
     ...ctx.deps.mutationBackoffMs !== void 0 ? { backoffMs: ctx.deps.mutationBackoffMs } : {}
   };
 }
@@ -60789,7 +61127,11 @@ async function start(ctx, key, values) {
     ...orcaDeps(ctx),
     ...ctx.deps.linkDialog ? { dialog: ctx.deps.linkDialog } : {},
     kitReady: async (agent, found) => !!(await new KitDomain(ctx.configDir, found.profile.key, found.projectId).current())?.state.targets[agent],
-    runAgent: (agent, args, found) => kitRun(kitContext(ctx, values, { profile: found.profile, projectId: found.projectId, source: "repo", root: found.root }), agent, { project: found.projectId }, args)
+    runAgent: async (agent, args, found) => {
+      const code = await kitRun(kitContext(ctx, values, { profile: found.profile, projectId: found.projectId, source: "repo", root: found.root }), agent, { project: found.projectId }, args);
+      ctx.agentRan = code !== 127;
+      return code;
+    }
   };
   return key ? fleekStart(deps, key, own4) : orcaPick(deps, own4, (chosen) => fleekStart(deps, chosen, own4));
 }
@@ -61080,6 +61422,31 @@ async function setupDeveloper(ctx, code, values) {
     }
   }, code, values);
 }
+function reportFailure(out, t, error, json2) {
+  const errno = error?.code;
+  const failure2 = error instanceof CliError ? error : typeof errno === "string" && /^E[A-Z]{2,16}$/.test(errno) ? new CliError("errors.internalCode", EXIT.failed, { code: errno }, "INTERNAL") : new CliError("errors.internal", EXIT.failed, {}, "INTERNAL");
+  if (json2) out.json({ error: failure2.code ?? failure2.key, ...Object.keys(failure2.params).length ? { details: failure2.params } : {} });
+  else {
+    const params = Object.fromEntries(Object.entries(failure2.params).map(([key, value]) => [key, typeof value === "string" ? neutralizeLine(value) : value]));
+    let friendlyKey = failure2 instanceof ToolError && ["RATE_LIMITED", "ACCESS_DENIED", "CONFLICT", "TRANSITION_DENIED"].includes(failure2.code ?? "") ? `errors.server.${failure2.code}` : failure2.key;
+    if (failure2.code === "KIT_INVALID" || failure2.code === "KIT_UNSIGNED") {
+      const reason = String(failure2.params.reason ?? "");
+      const kind = kitRefusalCategory(failure2.code, reason);
+      friendlyKey = `errors.kitRefused.${kind}`;
+    }
+    out.error(out.style.fail(redact(t(friendlyKey, params))));
+    if (failure2 instanceof ToolError && failure2.code === "TRANSITION_DENIED") {
+      const details = failure2.details;
+      const key = typeof details?.reason === "string" ? `errors.transition.${details.reason}` : "";
+      if (Object.hasOwn(EN, key)) out.error(t(key));
+    }
+    const suggestion = failure2.suggestion;
+    if (suggestion) out.error(t("errors.didYouMean", { command: out.style.cmd(suggestion) }));
+    if (failure2.code === "KIT_INVALID" || failure2.code === "KIT_UNSIGNED") out.error(out.style.dim(redact(t("errors.kitReason", { ...params, reason: params.reason ?? failure2.code }))));
+    if (`${friendlyKey}.next` in EN) out.error(`  ${t("next.step", { command: out.style.cmd(redact(t(`${friendlyKey}.next`, params))) })}`);
+  }
+  return failure2;
+}
 async function main(argv, deps = {}) {
   const env = deps.env ?? process.env;
   let t = translator(locale(env));
@@ -61110,30 +61477,7 @@ async function main(argv, deps = {}) {
     context = new Context(deps, json2, parsed.values.profile, parsed.values.language === "en" || parsed.values.language === "de" ? parsed.values.language : void 0);
     return await dispatch(context, parsed.positionals, parsed.values, exec, passthrough);
   } catch (error) {
-    t = context?.t ?? t;
-    const errorOut = context?.out ?? out;
-    const errno = error?.code;
-    const failure2 = error instanceof CliError ? error : typeof errno === "string" && /^E[A-Z]{2,16}$/.test(errno) ? new CliError("errors.internalCode", EXIT.failed, { code: errno }, "INTERNAL") : new CliError("errors.internal", EXIT.failed, {}, "INTERNAL");
-    if (json2) errorOut.json({ error: failure2.code ?? failure2.key, ...Object.keys(failure2.params).length ? { details: failure2.params } : {} });
-    else {
-      const params = Object.fromEntries(Object.entries(failure2.params).map(([key, value]) => [key, typeof value === "string" ? neutralizeLine(value) : value]));
-      let friendlyKey = failure2 instanceof ToolError && ["RATE_LIMITED", "ACCESS_DENIED", "CONFLICT", "TRANSITION_DENIED"].includes(failure2.code ?? "") ? `errors.server.${failure2.code}` : failure2.key;
-      if (failure2.code === "KIT_INVALID" || failure2.code === "KIT_UNSIGNED") {
-        const reason = String(failure2.params.reason ?? "");
-        const kind = kitRefusalCategory(failure2.code, reason);
-        friendlyKey = `errors.kitRefused.${kind}`;
-      }
-      errorOut.error(errorOut.style.fail(redact(t(friendlyKey, params))));
-      if (failure2 instanceof ToolError && failure2.code === "TRANSITION_DENIED") {
-        const details = failure2.details;
-        const key = typeof details?.reason === "string" ? `errors.transition.${details.reason}` : "";
-        if (Object.hasOwn(EN, key)) errorOut.error(t(key));
-      }
-      const suggestion = failure2.suggestion;
-      if (suggestion) errorOut.error(t("errors.didYouMean", { command: errorOut.style.cmd(suggestion) }));
-      if (failure2.code === "KIT_INVALID" || failure2.code === "KIT_UNSIGNED") errorOut.error(errorOut.style.dim(redact(t("errors.kitReason", { ...params, reason: params.reason ?? failure2.code }))));
-      if (`${friendlyKey}.next` in EN) errorOut.error(`  ${t("next.step", { command: errorOut.style.cmd(redact(t(`${friendlyKey}.next`, params))) })}`);
-    }
+    const failure2 = reportFailure(context?.out ?? out, context?.t ?? t, error, json2);
     if (["listen", "mcp"].includes(commandName ?? "") && failure2.code === "ACCESS_DENIED") return EXIT.accessDenied;
     return failure2.exitCode;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-joe/fleek",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "fleek - command line client for the Fleek agent hub (MCP over OAuth, OS keychain, signed role/project kits)",
   "license": "Apache-2.0",
   "type": "module",