@standardagents/code 0.10.0 → 0.11.0

package/dist/index.js

@@ -356,9 +356,13 @@ var ApiClient = class {
         ).catch(() => [])
       )
     ]);
-    const arr = pages.flatMap((res) => Array.isArray(res) ? res : res.threads || []);
+    const arr = pages.flatMap((res, i) => {
+      const list = Array.isArray(res) ? res : res.threads || [];
+      return list.map((t) => ({ ...t, agent_id: t.agent_id ?? ids[i] }));
+    });
     return arr.map((t) => ({
       id: t.id,
+      agent_id: t.agent_id,
       tags: Array.isArray(t.tags) ? t.tags : [],
       created_at: t.created_at,
       title: t.title,
@@ -1026,7 +1030,7 @@ function truncateMiddle(text, maxColumns) {
   const headBudget = Math.ceil(available / 2);
   const tailBudget = Math.floor(available / 2);
   const head = [];
-  const tail = [];
+  const tail2 = [];
   let headWidth = 0;
   let tailWidth = 0;
   for (let i = 0; i < chars.length; i++) {
@@ -1038,12 +1042,12 @@ function truncateMiddle(text, maxColumns) {
   for (let i = chars.length - 1; i >= head.length; i--) {
     const width = terminalGlyphWidth(chars[i]);
     if (tailWidth + width > tailBudget) break;
-    tail.unshift(chars[i]);
+    tail2.unshift(chars[i]);
     tailWidth += width;
   }
   const isSeparator = (ch) => ch === "/" || ch === "\\";
   let headEnd = head.length;
-  let tailStart = chars.length - tail.length;
+  let tailStart = chars.length - tail2.length;
   for (let i = headEnd - 1; i >= 0; i--) {
     if (isSeparator(chars[i])) {
       headEnd = i + 1;
@@ -1059,7 +1063,7 @@ function truncateMiddle(text, maxColumns) {
   if (headEnd < tailStart && headEnd > 0 && tailStart < chars.length) {
     return `${chars.slice(0, headEnd).join("")}\u2026${chars.slice(tailStart).join("")}`;
   }
-  return `${head.join("")}\u2026${tail.join("")}`;
+  return `${head.join("")}\u2026${tail2.join("")}`;
 }
 function clamp(s, max) {
   return s.length > max ? s.slice(0, Math.max(0, max - 1)) + "\u2026" : s;
@@ -1243,8 +1247,8 @@ var Bridge = class {
   // Durable forwarded calls we've started handling, so a server re-send (after a
   // reconnect) doesn't prompt or run them twice.
   handledDurable = /* @__PURE__ */ new Set();
-  // Raw TCP tunnels (Sama One's direct egress): the Worker terminates TLS over
-  // these; we only shuttle ciphertext. Bound to this socket, torn down with it.
+  // Raw TCP tunnels: the provider owns TLS over these runtime bytes; this
+  // execution-owner bridge only shuttles ciphertext and tears it down on close.
   tunnels;
   // Durable, exactly-once ledger of completed forwarded calls. Survives a crash
   // AFTER execution but BEFORE delivery: on redelivery we return the cached
@@ -2164,14 +2168,14 @@ ${truncated}`
     }
     if (!pid) return { ok: false, error: "Process failed to start (no pid)." };
     if (earlyExit !== void 0 || !isAlive2(pid)) {
-      const tail = await readLogTail(logPath, 15);
+      const tail2 = await readLogTail(logPath, 15);
       const code = earlyExit ?? "unknown";
       return {
         ok: false,
-        error: `The process exited immediately (exit code ${code}) \u2014 it did not stay running, so nothing was started or tracked.` + (tail ? `
+        error: `The process exited immediately (exit code ${code}) \u2014 it did not stay running, so nothing was started or tracked.` + (tail2 ? `
 
 Output:
-${tail}` : " No output was captured.")
+${tail2}` : " No output was captured.")
       };
     }
     child.removeListener("exit", onEarlyExit);
@@ -2288,8 +2292,8 @@ ${tail}` : " No output was captured.")
       } catch {
         return { ok: true, result: `(no output captured yet for ${id})` };
       }
-      const tail = content.split("\n").slice(-maxLines).join("\n");
-      return { ok: true, result: tail || `(no output yet for ${id})` };
+      const tail2 = content.split("\n").slice(-maxLines).join("\n");
+      return { ok: true, result: tail2 || `(no output yet for ${id})` };
     }
     if (action === "stop") {
       if (proc.status !== "running") {
@@ -2673,7 +2677,7 @@ var McpManager = class {
     }
   }
   closeAll() {
-    for (const [, c4] of this.clients) c4.close();
+    for (const [, c5] of this.clients) c5.close();
     this.clients.clear();
   }
   get(name) {
@@ -2684,13 +2688,13 @@ var McpManager = class {
   }
   toolCount() {
     let n = 0;
-    for (const [, c4] of this.clients) n += c4.tools.length;
+    for (const [, c5] of this.clients) n += c5.tools.length;
     return n;
   }
   /** A JSON-serializable catalog of every connected server for the KV/context. */
   catalog() {
     return {
-      servers: Array.from(this.clients.values()).map((c4) => c4.catalogEntry()),
+      servers: Array.from(this.clients.values()).map((c5) => c5.catalogEntry()),
       generatedAt: Date.now()
     };
   }
@@ -2780,9 +2784,9 @@ function flattenContent(content, structured) {
 }
 function flattenResourceContents(contents) {
   const parts = [];
-  for (const c4 of contents || []) {
-    if (typeof c4.text === "string") parts.push(c4.text);
-    else if (typeof c4.blob === "string") parts.push(`[binary resource ${String(c4.uri ?? "")} (${c4.blob.length} b64 chars)]`);
+  for (const c5 of contents || []) {
+    if (typeof c5.text === "string") parts.push(c5.text);
+    else if (typeof c5.blob === "string") parts.push(`[binary resource ${String(c5.uri ?? "")} (${c5.blob.length} b64 chars)]`);
   }
   return parts.join("\n").trim();
 }
@@ -3593,8 +3597,8 @@ function parseStreamingMarkdown(source) {
       let codeEnd = closing?.start ?? source.length;
       if (!closing) {
         const tailStart = Math.max(codeStart, source.lastIndexOf("\n") + 1);
-        const tail = source.slice(tailStart);
-        const pending = /^ {0,3}(`+|~+)[ \t]*$/.exec(tail);
+        const tail2 = source.slice(tailStart);
+        const pending = /^ {0,3}(`+|~+)[ \t]*$/.exec(tail2);
         if (pending && pending[1][0] === opening.marker && pending[1].length < opening.length) codeEnd = tailStart;
       }
       if (codeEnd > codeStart && source[codeEnd - 1] === "\n") codeEnd--;
@@ -3813,17 +3817,17 @@ function wrapBlock(out, cols2, leadFirst, leadRest, leadWidth, text) {
 function renderTable(rows) {
   const cols2 = Math.max(...rows.map((r) => r.length));
   const widths = [];
-  for (let c4 = 0; c4 < cols2; c4++) {
-    widths[c4] = Math.max(...rows.map((r) => visibleWidth(inline(r[c4] ?? ""))));
+  for (let c5 = 0; c5 < cols2; c5++) {
+    widths[c5] = Math.max(...rows.map((r) => visibleWidth(inline(r[c5] ?? ""))));
   }
   const sep = `${GRAY} \u2502 ${R}`;
   const out = [];
   rows.forEach((r, ri) => {
     const cells = [];
-    for (let c4 = 0; c4 < cols2; c4++) {
-      const raw = r[c4] ?? "";
+    for (let c5 = 0; c5 < cols2; c5++) {
+      const raw = r[c5] ?? "";
       const styled = ri === 0 ? `${BOLD}${inline(raw)}${R}` : inline(raw);
-      cells.push(padEndVisible(styled, widths[c4]));
+      cells.push(padEndVisible(styled, widths[c5]));
     }
     out.push(("  " + cells.join(sep)).replace(/\s+$/, ""));
     if (ri === 0) {
@@ -4260,7 +4264,11 @@ function buildInputBoxRows(opts) {
   if (phase == null || !Number.isFinite(phase)) {
     const dots2 = borderLevelDots(level);
     const dotsStyled2 = borderLevelDotsStyled(level, levelColor);
-    const top2 = buildBoxTop(geo.boxW, dots2, borderColor, levelColor, "\x1B[0m", dotsStyled2);
+    const agent2 = (opts.agentLabel ?? "").trim();
+    const withAgent2 = agent2.length > 0 && ` ${agent2} ${dots2} `.length <= geo.boxW - 3;
+    const levelText = withAgent2 ? `${agent2} ${dots2}` : dots2;
+    const levelStyled = withAgent2 ? `\x1B[2m${themeGray}${agent2}\x1B[0m ${dotsStyled2}` : dotsStyled2;
+    const top2 = buildBoxTop(geo.boxW, levelText, borderColor, levelColor, "\x1B[0m", levelStyled);
     const bottom2 = buildBoxBottom(geo.boxW, borderColor);
     return [pad + top2, ...body.map((b) => pad + buildBoxBody(b, geo.contentW, borderColor)), pad + bottom2];
   }
@@ -4271,7 +4279,11 @@ function buildInputBoxRows(opts) {
   const colorAt = (i) => rotatingBorderCellColor(i, P, phase);
   const dots = borderLevelDots(level);
   borderLevelDotsStyled(level, levelColor);
-  const labelPlain = ` ${dots} `;
+  const agent = (opts.agentLabel ?? "").trim();
+  const withAgent = agent.length > 0 && ` ${agent} ${dots} `.length <= W - 3;
+  const labelPlain = withAgent ? ` ${agent} ${dots} ` : ` ${dots} `;
+  const agentSpanStart = withAgent ? 1 : -1;
+  const agentSpanEnd = withAgent ? 1 + agent.length : -1;
   const rightFillN = 1;
   const budget = Math.max(1, W - 2 - rightFillN);
   const plain = labelPlain.length > budget ? labelPlain.slice(0, Math.max(1, budget)) : labelPlain;
@@ -4285,15 +4297,20 @@ function buildInputBoxRows(opts) {
   {
     const plainChars = [...plain];
     let di = 0;
-    for (const ch of plainChars) {
-      const c4 = colorAt(perimeterIndex("top", xi++, W, bodyH));
+    for (let ci = 0; ci < plainChars.length; ci++) {
+      const ch = plainChars[ci];
+      const c5 = colorAt(perimeterIndex("top", xi++, W, bodyH));
+      if (ci >= agentSpanStart && ci < agentSpanEnd) {
+        top += `\x1B[2m${themeGray}${ch}\x1B[0m`;
+        continue;
+      }
       if (ch === "\u25CF" || ch === "\u25CB") {
         const levelN = Math.max(1, Math.min(5, level));
         const filled = di < levelN;
         di++;
-        top += (filled ? levelColor || c4 : "\x1B[38;5;240m") + (filled ? "\u25CF" : "\u25CB") + reset;
+        top += (filled ? levelColor || c5 : "\x1B[38;5;240m") + (filled ? "\u25CF" : "\u25CB") + reset;
       } else {
-        top += c4 + ch + reset;
+        top += c5 + ch + reset;
       }
     }
   }
@@ -4314,10 +4331,10 @@ function buildInputBoxRows(opts) {
   let bottom = "";
   for (let x = 0; x < W; x++) {
     const idx = perimeterIndex("bottom", W - 1 - x, W, bodyH);
-    const c4 = colorAt(idx);
-    if (x === 0) bottom += c4 + "\u2570" + reset;
-    else if (x === W - 1) bottom += c4 + "\u256F" + reset;
-    else bottom += c4 + "\u2500" + reset;
+    const c5 = colorAt(idx);
+    if (x === 0) bottom += c5 + "\u2570" + reset;
+    else if (x === W - 1) bottom += c5 + "\u256F" + reset;
+    else bottom += c5 + "\u2500" + reset;
   }
   return [pad + top, ...bodyRows, pad + bottom];
 }
@@ -4334,6 +4351,36 @@ var C = {
   gray: themeGray,
   teal: "\x1B[38;5;37m"
 };
+function renderSelectItemRows(it, sel, contentW, busyGlyph) {
+  const hint = it.hint ?? "";
+  const hintW = boxVisibleWidth(hint);
+  const pointerW = 2;
+  const labelMax = Math.max(4, contentW - pointerW - (hintW ? hintW + 2 : 0));
+  let label = it.label.replace(/\s+/g, " ").trim();
+  if (boxVisibleWidth(label) > labelMax) {
+    while (label.length > 0 && boxVisibleWidth(label) > labelMax - 1) label = label.slice(0, -1);
+    label += "\u2026";
+  }
+  const pointer = busyGlyph ? `${busyGlyph} ` : sel ? `${C.magenta}\u276F${C.reset} ` : "  ";
+  const styledLabel = it.disabled ? `${C.gray}${label}${C.reset}` : sel ? `${C.bold}${C.cyan}${label}${C.reset}` : `${C.dim}${label}${C.reset}`;
+  let content = `${pointer}${styledLabel}`;
+  if (hintW) {
+    const used = pointerW + boxVisibleWidth(label);
+    const gap = Math.max(1, contentW - used - hintW);
+    content += `${" ".repeat(gap)}${sel ? C.gray : C.dim}${hint}${C.reset}`;
+  }
+  const rows = [content];
+  if (it.detail) {
+    let detail = it.detail.replace(/\s+/g, " ").trim();
+    const detailMax = Math.max(4, contentW - pointerW - 1);
+    if (boxVisibleWidth(detail) > detailMax) {
+      while (detail.length > 0 && boxVisibleWidth(detail) > detailMax - 1) detail = detail.slice(0, -1);
+      detail += "\u2026";
+    }
+    rows.push(`${" ".repeat(pointerW)}${sel ? `${C.dim}${C.cyan}` : `${C.dim}${C.gray}`}${detail}${C.reset}`);
+  }
+  return rows;
+}
 var SYNC_OUTPUT_BEGIN = "\x1B[?2026h";
 var SYNC_OUTPUT_END = "\x1B[?2026l";
 var CURSOR_HIDE = "\x1B[?25l";
@@ -4486,7 +4533,7 @@ var Tui = class _Tui {
   // event hooks (wired by index.ts)
   onSubmit = () => {
   };
-  /** Shift+Return sends a steering input through the portable messaging endpoint. */
+  /** Option/Alt+Return sends a steering input through the portable messaging endpoint. */
   onSteer = () => {
   };
   onInterrupt = () => {
@@ -4584,7 +4631,7 @@ var Tui = class _Tui {
   dispatch(str, key) {
     const seq = key && key.sequence || str || "";
     if (seq === "\n" || seq === "\x1B[13;2u" || seq === "\x1B[27;2;13~") {
-      if (!this.takeoverHandler && !this.pasting && !this.paletteOpen()) this.submitInput(true);
+      if (!this.takeoverHandler && !this.pasting && !this.paletteOpen()) this.insertAtCursor("\n");
       return;
     }
     if (key && key.ctrl && key.name === "c") {
@@ -4717,11 +4764,11 @@ var Tui = class _Tui {
     }
     if (key.name === "return" || key.name === "enter") {
       if (key.meta) {
-        this.insertAtCursor("\n");
+        this.submitInput(true);
         return;
       }
       if (key.shift) {
-        this.submitInput(true);
+        this.insertAtCursor("\n");
         return;
       }
       this.submitInput(false);
@@ -5022,7 +5069,7 @@ var Tui = class _Tui {
     const q = this.inputBuffer.slice(1).trim().toLowerCase();
     if (q === "") return this.commands;
     return this.commands.filter(
-      (c4) => c4.name.startsWith(q) || c4.name.includes(q) || c4.label.toLowerCase().includes(q)
+      (c5) => c5.name.startsWith(q) || c5.name.includes(q) || c5.label.toLowerCase().includes(q)
     );
   }
   runCommand(cmd) {
@@ -5276,7 +5323,8 @@ var Tui = class _Tui {
       level: this.level,
       levelColor: this.levelColor(),
       borderColor: inputBoxBorderColor(),
-      borderPhase
+      borderPhase,
+      agentLabel: this.agentLabel
     });
     const boxTop = boxRows[0];
     const boxBottom = boxRows[boxRows.length - 1];
@@ -5550,6 +5598,14 @@ var Tui = class _Tui {
     });
     this.print("");
   }
+  // ─── agent label (under the input box) ─────────────────────────────────────
+  /** The loaded agent's display title, shown low-contrast under the input. */
+  agentLabel = "";
+  setAgentLabel(label) {
+    if (label === this.agentLabel) return;
+    this.agentLabel = label;
+    this.renderBottom();
+  }
   // ─── working indicator (turn state) ───────────────────────────────────────
   setWorking(on) {
     if (on === this.working) return;
@@ -5930,8 +5986,13 @@ var Tui = class _Tui {
    * Arrow-key selection menu (slash menu, process menu, resume). Pauses input.
    * Boxed chrome matches the bottom input HUD: side margin + grey rounded
    * border, selected row with a brand-tinted pointer.
+   *
+   * An item may carry a `detail` — a dim second physical line under its label
+   * for context that doesn't fit the one-row label+hint layout (e.g. a
+   * machine's hostname · daemon status). `opts.spaced` inserts a blank row
+   * between items for readability in short, dense menus.
    */
-  select(title, items) {
+  select(title, items, opts) {
     return new Promise((resolve) => {
       let idx = Math.max(0, items.findIndex((it) => !it.disabled));
       this.beginTakeover();
@@ -5944,41 +6005,28 @@ var Tui = class _Tui {
 ${pad}${title}
 `);
       else process.stdout.write("\n");
-      const renderItemContent = (i) => {
-        const it = items[i];
-        const sel = i === idx;
-        const hint = it.hint ?? "";
-        const hintW = hint.length;
-        const pointerW = 2;
-        const labelMax = Math.max(4, geo.contentW - pointerW - (hintW ? hintW + 2 : 0));
-        let label = it.label.replace(/\s+/g, " ").trim();
-        if (label.length > labelMax) label = label.slice(0, Math.max(0, labelMax - 1)) + "\u2026";
-        const pointer = sel ? `${C.magenta}\u276F${C.reset} ` : "  ";
-        const styledLabel = it.disabled ? `${C.gray}${label}${C.reset}` : sel ? `${C.bold}${C.cyan}${label}${C.reset}` : `${C.dim}${label}${C.reset}`;
-        let content = `${pointer}${styledLabel}`;
-        if (hintW) {
-          const used = pointerW + label.length;
-          const gap = Math.max(1, geo.contentW - used - hintW);
-          content += `${" ".repeat(gap)}${sel ? C.gray : C.dim}${hint}${C.reset}`;
-        }
-        return content;
-      };
+      const renderItemRows = (i) => renderSelectItemRows(items[i], i === idx, geo.contentW);
       const writeRow = (line) => {
         const row = this.clampVisible(sanitizeHudRow(line), rowCap);
         process.stdout.write(`\r\x1B[K${row}
 `);
       };
+      const spaced = opts?.spaced ?? false;
+      const contentRows = items.reduce((n, it) => n + 1 + (it.detail ? 1 : 0), 0) + (spaced ? Math.max(0, items.length - 1) : 0);
       const draw = (moveUp) => {
-        if (moveUp) process.stdout.write(`\x1B[${items.length + 1}A`);
+        if (moveUp) process.stdout.write(`\x1B[${contentRows + 1}A`);
         else writeRow(pad + buildBoxTopPlain(geo.boxW, border));
         for (let i = 0; i < items.length; i++) {
-          writeRow(pad + buildBoxBody(renderItemContent(i), geo.contentW, border));
+          if (spaced && i > 0) writeRow(pad + buildBoxBody("", geo.contentW, border));
+          for (const row of renderItemRows(i)) {
+            writeRow(pad + buildBoxBody(row, geo.contentW, border));
+          }
         }
         writeRow(pad + buildBoxBottom(geo.boxW, border));
       };
       draw(false);
       const titleRows = title ? 2 : 1;
-      const boxRows = 1 + items.length + 1;
+      const boxRows = 1 + contentRows + 1;
       const erase = () => {
         process.stdout.write("\r");
         const up = titleRows + boxRows;
@@ -6006,6 +6054,182 @@ ${pad}${title}
       };
     });
   }
+  /**
+   * A select menu that stays OPEN while its contents change — the primitive
+   * behind in-place navigation UIs like the directory browser. Instead of
+   * resolving once like `select`, it returns a handle:
+   *
+   * - `next()` awaits the next interaction: a pick, a registered extra key
+   *   (e.g. "." to toggle hidden files), or Escape (cancel).
+   * - `update()` swaps title/items/footer and redraws the SAME screen region
+   *   (erase + repaint in one write), so navigating levels never feels like
+   *   leaving the menu.
+   * - `setBusy(i)` animates a spinner in row i's pointer column while the
+   *   caller loads what's behind it; input (except Escape) is swallowed until
+   *   the next update()/setBusy(null).
+   * - `close()` erases the region and releases the takeover.
+   *
+   * The optional `footer` is a dim line under the box — the home for key
+   * hints and transient error text.
+   */
+  openLiveSelect(opts) {
+    let { title, items } = opts;
+    let footer = opts.footer ?? "";
+    const spaced = opts.spaced ?? false;
+    const extraKeys = opts.keys ?? [];
+    let idx = Math.max(0, items.findIndex((it) => !it.disabled));
+    let busyIdx = null;
+    let busyTimer = null;
+    let closed = false;
+    let edit = null;
+    this.beginTakeover();
+    const cols2 = process.stdout.columns || 80;
+    const geo = inputBoxGeometry(cols2);
+    const border = inputBoxBorderColor();
+    const pad = " ".repeat(geo.margin);
+    const rowCap = Math.max(1, cols2 - 1);
+    let regionRows = 0;
+    let lifted = 0;
+    const draw = () => {
+      if (closed) return;
+      const rows = [""];
+      let editCursor = null;
+      if (title) rows.push(pad + title);
+      rows.push(pad + buildBoxTopPlain(geo.boxW, border));
+      for (let i = 0; i < items.length; i++) {
+        const it = items[i];
+        if (spaced && i > 0) rows.push(pad + buildBoxBody("", geo.contentW, border));
+        const glyph = busyIdx === i ? this.spinnerFrame() : void 0;
+        if (edit && edit.index === i) {
+          const pointer = `${glyph ?? `${C.magenta}\u276F${C.reset}`} `;
+          const max = Math.max(4, geo.contentW - 2 - boxVisibleWidth(edit.prefix) - 1);
+          let buf = edit.buf;
+          while (buf.length > 0 && boxVisibleWidth(buf) > max) buf = buf.slice(1);
+          const body = buf ? `${C.bold}${C.cyan}${buf}${C.reset}` : `${C.dim}${edit.placeholder}${C.reset}`;
+          rows.push(pad + buildBoxBody(`${pointer}${C.dim}${edit.prefix}${C.reset}${body}`, geo.contentW, border));
+          if (!glyph) {
+            editCursor = {
+              rowIndex: rows.length - 1,
+              // 1-based ANSI column: margin + "│ " + pointer(2) + prefix + typed text.
+              col: geo.margin + 2 + 2 + boxVisibleWidth(edit.prefix) + boxVisibleWidth(buf) + 1
+            };
+          }
+          continue;
+        }
+        for (const r of renderSelectItemRows(it, i === idx, geo.contentW, glyph)) {
+          rows.push(pad + buildBoxBody(r, geo.contentW, border));
+        }
+      }
+      rows.push(pad + buildBoxBottom(geo.boxW, border));
+      if (footer) rows.push(pad + footer);
+      let out = lifted > 0 ? `\x1B[${lifted}B` : "";
+      lifted = 0;
+      out += regionRows > 0 ? `\r\x1B[${regionRows}A\x1B[J` : "";
+      for (const line of rows) out += `\r\x1B[K${this.clampVisible(sanitizeHudRow(line), rowCap)}
+`;
+      if (editCursor) {
+        lifted = rows.length - editCursor.rowIndex;
+        out += `\x1B[${lifted}A\x1B[${editCursor.col}G\x1B[?25h`;
+      } else {
+        out += "\x1B[?25l";
+      }
+      process.stdout.write(out);
+      regionRows = rows.length;
+    };
+    draw();
+    const queue = [];
+    let waiter = null;
+    const emit = (e) => {
+      if (waiter) {
+        const w = waiter;
+        waiter = null;
+        w(e);
+      } else queue.push(e);
+    };
+    const stopSpinner = () => {
+      if (busyTimer) clearInterval(busyTimer);
+      busyTimer = null;
+      busyIdx = null;
+    };
+    this.takeoverHandler = (str, key) => {
+      if (edit && busyIdx === null) {
+        if (key?.name === "escape") {
+          edit = null;
+          draw();
+        } else if (key?.name === "return" || key?.name === "enter") {
+          const text = edit.buf.trim();
+          if (!text) {
+            edit = null;
+            draw();
+          } else {
+            emit({ kind: "edit", text, index: edit.index });
+          }
+        } else if (key?.name === "backspace") {
+          edit.buf = edit.buf.slice(0, -1);
+          draw();
+        } else if (str && !key?.ctrl && !key?.meta) {
+          const clean2 = str.replace(/[\x00-\x1f\x7f]/g, "");
+          if (clean2) {
+            edit.buf += clean2;
+            draw();
+          }
+        }
+        return;
+      }
+      if (key?.name === "escape") return emit({ kind: "cancel" });
+      if (busyIdx !== null) return;
+      if (key?.name === "up" || str === "k") {
+        idx = (idx - 1 + items.length) % items.length;
+        draw();
+      } else if (key?.name === "down" || str === "j") {
+        idx = (idx + 1) % items.length;
+        draw();
+      } else if (key?.name === "return" || key?.name === "enter") {
+        if (!items[idx]?.disabled) emit({ kind: "pick", value: items[idx].value, index: idx });
+      } else if (str && extraKeys.includes(str)) {
+        emit({ kind: "key", name: str, index: idx });
+      }
+    };
+    return {
+      next: () => queue.length > 0 ? Promise.resolve(queue.shift()) : new Promise((r) => waiter = r),
+      update: (state) => {
+        stopSpinner();
+        edit = null;
+        if (state.title !== void 0) title = state.title;
+        if (state.items) {
+          items = state.items;
+          if (idx >= items.length || items[idx]?.disabled) {
+            idx = Math.max(0, items.findIndex((it) => !it.disabled));
+          }
+        }
+        if (state.footer !== void 0) footer = state.footer;
+        draw();
+      },
+      setBusy: (index) => {
+        stopSpinner();
+        if (index !== null) {
+          busyIdx = index;
+          busyTimer = setInterval(draw, SPINNER_FRAME_MS);
+        }
+        draw();
+      },
+      beginEdit: (index, editOpts) => {
+        stopSpinner();
+        edit = { index, buf: "", placeholder: editOpts?.placeholder ?? "", prefix: editOpts?.prefix ?? "" };
+        idx = index;
+        draw();
+      },
+      close: () => {
+        if (closed) return;
+        closed = true;
+        stopSpinner();
+        if (lifted > 0) process.stdout.write(`\x1B[${lifted}B`);
+        lifted = 0;
+        if (regionRows > 0) process.stdout.write(`\r\x1B[${regionRows}A\x1B[J`);
+        this.endTakeover();
+      }
+    };
+  }
   /**
    * Free-text prompt (single line). Pauses the main input and reads a line —
    * used where a menu can't, e.g. entering an MCP server command. Enter submits,
@@ -6257,6 +6481,7 @@ var NAME_SUFFIX = ".name";
 var ICON_SUFFIX = ".icon";
 var FSREQ_SUFFIX = ".fsreq";
 var FSRES_SUFFIX = ".fsres";
+var PROJNAMES_SUFFIX = ".projnames";
 var DAEMON_ONLINE_WINDOW_MS = 90 * 1e3;
 function machineKey(machineId) {
   return `${KEY_PREFIX}${machineId}`;
@@ -6270,6 +6495,9 @@ function nameKey(machineId) {
 function iconKey(machineId) {
   return `${KEY_PREFIX}${machineId}${ICON_SUFFIX}`;
 }
+function projectNamesKey(machineId) {
+  return `${KEY_PREFIX}${machineId}${PROJNAMES_SUFFIX}`;
+}
 function fsRequestKey(machineId) {
   return `${KEY_PREFIX}${machineId}${FSREQ_SUFFIX}`;
 }
@@ -6312,25 +6540,6 @@ async function readFsRequest(api, machineId) {
 async function writeFsResponse(api, machineId, res) {
   await api.userKvSet(fsResponseKey(machineId), { ...res, responded_at: Date.now() });
 }
-async function resolveRemoteProjectPath(api, machineId, typedPath, timeoutMs = 12e3) {
-  const trimmed = typedPath.trim();
-  if (!trimmed.startsWith("~")) return trimmed;
-  const nonce = crypto.randomBytes(8).toString("hex");
-  try {
-    await writeFsRequest(api, machineId, { nonce, op: "list", path: trimmed });
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-      await new Promise((r) => setTimeout(r, 700));
-      const res = await readFsResponse(api, machineId).catch(() => null);
-      if (res && res.nonce === nonce) {
-        const resolved = res.result && typeof res.result.path === "string" ? res.result.path : "";
-        return resolved || trimmed;
-      }
-    }
-  } catch {
-  }
-  return trimmed;
-}
 function machineIcon(record2) {
   if (record2.icon && record2.icon.trim()) return record2.icon.trim();
   if (record2.platform === "darwin") return "\u{1F4BB}";
@@ -6360,7 +6569,10 @@ function parseMachineRecord(value) {
     arch: typeof r.arch === "string" ? r.arch : "",
     version: typeof r.version === "string" ? r.version : void 0,
     daemon: r.daemon && typeof r.daemon === "object" && !Array.isArray(r.daemon) ? r.daemon : null,
-    projects: r.projects && typeof r.projects === "object" && !Array.isArray(r.projects) ? r.projects : {},
+    // Clone rather than alias the caller's object: read-side overlays (e.g.
+    // user-assigned project names) mutate the parsed record's entries and
+    // must never write through into the source value.
+    projects: r.projects && typeof r.projects === "object" && !Array.isArray(r.projects) ? structuredClone(r.projects) : {},
     created_at: typeof r.created_at === "number" ? r.created_at : 0,
     updated_at: typeof r.updated_at === "number" ? r.updated_at : 0
   };
@@ -6373,6 +6585,7 @@ async function loadMachines(api) {
   const records = [];
   const names = /* @__PURE__ */ new Map();
   const icons = /* @__PURE__ */ new Map();
+  const projNames = /* @__PURE__ */ new Map();
   for (const e of entries) {
     const rest = e.key.slice(KEY_PREFIX.length);
     if (rest.endsWith(CMD_SUFFIX) || rest.endsWith(FSREQ_SUFFIX) || rest.endsWith(FSRES_SUFFIX)) continue;
@@ -6386,6 +6599,12 @@ async function loadMachines(api) {
       if (typeof e.value === "string" && e.value.trim()) icons.set(id, e.value.trim());
       continue;
     }
+    if (rest.endsWith(PROJNAMES_SUFFIX)) {
+      const id = rest.slice(0, -PROJNAMES_SUFFIX.length);
+      const map = parseProjectNames(e.value);
+      if (map) projNames.set(id, map);
+      continue;
+    }
     const rec = parseMachineRecord(e.value);
     if (rec) records.push(rec);
   }
@@ -6394,9 +6613,58 @@ async function loadMachines(api) {
     if (override) rec.name = override;
     const icon = icons.get(rec.id);
     if (icon) rec.icon = icon;
+    overlayProjectNames(rec, projNames.get(rec.id));
   }
   return records;
 }
+function parseProjectNames(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const out = {};
+  for (const [dir2, name] of Object.entries(value)) {
+    if (typeof name === "string" && name.trim()) out[dir2] = name.trim();
+  }
+  return out;
+}
+function overlayProjectNames(record2, names) {
+  if (!names) return;
+  for (const [dir2, name] of Object.entries(names)) {
+    const project = record2.projects[dir2];
+    if (project) project.name = name;
+  }
+}
+function projectDisplayName(dir2, project) {
+  return project?.name?.trim() || path4.basename(dir2) || dir2;
+}
+function projectDisplayLabels(projects) {
+  const names = /* @__PURE__ */ new Map();
+  const counts = /* @__PURE__ */ new Map();
+  for (const [dir2, p] of Object.entries(projects)) {
+    const n = projectDisplayName(dir2, p);
+    names.set(dir2, n);
+    counts.set(n, (counts.get(n) ?? 0) + 1);
+  }
+  const out = /* @__PURE__ */ new Map();
+  for (const [dir2, n] of names) {
+    if ((counts.get(n) ?? 0) > 1) {
+      const parts = dir2.split(/[\\/]/).filter(Boolean);
+      const parent = parts.length > 1 ? parts[parts.length - 2] : "";
+      out.set(dir2, parent ? `${parent}/${n}` : n);
+    } else {
+      out.set(dir2, n);
+    }
+  }
+  return out;
+}
+async function getProjectNames(api, machineId) {
+  return parseProjectNames(await api.userKvGet(projectNamesKey(machineId))) ?? {};
+}
+async function setProjectName(api, machineId, dir2, name) {
+  const map = await getProjectNames(api, machineId);
+  const trimmed = name.trim();
+  if (trimmed) map[dir2] = trimmed;
+  else delete map[dir2];
+  await api.userKvSet(projectNamesKey(machineId), Object.keys(map).length ? map : null);
+}
 async function getMachineIcon(api, machineId) {
   const v = await api.userKvGet(iconKey(machineId));
   return typeof v === "string" && v.trim() ? v.trim() : null;
@@ -6408,9 +6676,14 @@ async function setMachineIcon(api, machineId, icon) {
 async function loadMachine(api, machineId) {
   const rec = await loadRawMachine(api, machineId);
   if (!rec) return null;
-  const [override, icon] = await Promise.all([getMachineName(api, machineId), getMachineIcon(api, machineId)]);
+  const [override, icon, projNames] = await Promise.all([
+    getMachineName(api, machineId),
+    getMachineIcon(api, machineId),
+    getProjectNames(api, machineId)
+  ]);
   if (override) rec.name = override;
   if (icon) rec.icon = icon;
+  overlayProjectNames(rec, projNames);
   return rec;
 }
 function daemonOnline(record2, now = Date.now()) {
@@ -6508,7 +6781,7 @@ async function clearDaemon(api, identity) {
 function parseCommands(value) {
   if (!Array.isArray(value)) return [];
   return value.filter(
-    (c4) => !!c4 && typeof c4 === "object" && typeof c4.id === "string" && typeof c4.kind === "string"
+    (c5) => !!c5 && typeof c5 === "object" && typeof c5.id === "string" && typeof c5.kind === "string"
   );
 }
 async function enqueueMachineCommand(api, machineId, kind, args) {
@@ -6531,7 +6804,7 @@ async function clearMachineCommands(api, machineId, appliedIds) {
   if (appliedIds.length === 0) return;
   const key = commandKey(machineId);
   const remaining = parseCommands(await api.userKvGet(key)).filter(
-    (c4) => !appliedIds.includes(c4.id)
+    (c5) => !appliedIds.includes(c5.id)
   );
   await api.userKvSet(key, remaining.length ? remaining : null);
 }
@@ -6555,6 +6828,290 @@ async function applyMachineCommand(api, identity, cmd) {
       return `unknown command ${cmd.kind}`;
   }
 }
+var PROJECT_MARKERS = [
+  ".git",
+  "package.json",
+  "pyproject.toml",
+  "Cargo.toml",
+  "go.mod",
+  "pom.xml",
+  "build.gradle",
+  "Gemfile",
+  "composer.json",
+  "requirements.txt",
+  ".standardagents"
+];
+var MAX_ENTRIES3 = 500;
+function resolveBrowsePath(input3) {
+  const home = os8.homedir();
+  let p = (input3 ?? "").trim();
+  if (!p) return home;
+  if (p === "~") return home;
+  if (p.startsWith("~/")) p = path4.join(home, p.slice(2));
+  return path4.resolve(p);
+}
+function markers(dirPath) {
+  let repo = false;
+  let project = false;
+  for (const marker of PROJECT_MARKERS) {
+    let hit = false;
+    try {
+      hit = fs5.existsSync(path4.join(dirPath, marker));
+    } catch {
+      hit = false;
+    }
+    if (!hit) continue;
+    project = true;
+    if (marker === ".git") repo = true;
+    if (repo) break;
+  }
+  return { project, repo };
+}
+function browseDirectory(input3, opts = {}) {
+  const home = os8.homedir();
+  const abs = resolveBrowsePath(input3);
+  const parent = path4.dirname(abs);
+  const base = {
+    path: abs,
+    parent: parent === abs ? null : parent,
+    home
+  };
+  let dirents;
+  try {
+    const stat = fs5.statSync(abs);
+    if (!stat.isDirectory()) {
+      return { ...base, entries: [], truncated: false, error: "Not a directory" };
+    }
+    dirents = fs5.readdirSync(abs, { withFileTypes: true });
+  } catch (err) {
+    const code = err?.code;
+    const message = code === "EACCES" || code === "EPERM" ? "Permission denied" : code === "ENOENT" ? "Folder not found" : "Could not read this folder";
+    return { ...base, entries: [], truncated: false, error: message };
+  }
+  const showHidden = !!opts.showHidden;
+  const rawDirs = [];
+  const rawFiles = [];
+  for (const d of dirents) {
+    const name = d.name;
+    if (!showHidden && name.startsWith(".")) continue;
+    let isDir = d.isDirectory();
+    if (d.isSymbolicLink()) {
+      try {
+        isDir = fs5.statSync(path4.join(abs, name)).isDirectory();
+      } catch {
+        isDir = false;
+      }
+    }
+    if (isDir) {
+      const { project, repo } = markers(path4.join(abs, name));
+      rawDirs.push({ name, dir: true, project: project || void 0, repo: repo || void 0 });
+    } else {
+      rawFiles.push({ name, dir: false });
+    }
+  }
+  const cmp = (a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+  rawDirs.sort(cmp);
+  rawFiles.sort(cmp);
+  const all = [...rawDirs, ...rawFiles];
+  const truncated = all.length > MAX_ENTRIES3;
+  return { ...base, entries: truncated ? all.slice(0, MAX_ENTRIES3) : all, truncated };
+}
+function mkdirDirectory(parentInput, name, opts = {}) {
+  const parent = resolveBrowsePath(parentInput);
+  const clean2 = (name ?? "").trim();
+  const listParent = () => browseDirectory(parent, opts);
+  if (!clean2 || clean2 === "." || clean2 === ".." || clean2.includes("/") || clean2.includes("\\") || clean2.includes("\0")) {
+    return { ...listParent(), error: "Invalid folder name." };
+  }
+  const target = path4.join(parent, clean2);
+  if (path4.dirname(target) !== parent) {
+    return { ...listParent(), error: "Invalid folder name." };
+  }
+  try {
+    fs5.mkdirSync(target, { recursive: false });
+  } catch (err) {
+    const code = err?.code;
+    const message = code === "EEXIST" ? "A folder with that name already exists." : code === "EACCES" || code === "EPERM" ? "Permission denied." : code === "ENOENT" ? "The parent folder no longer exists." : "Could not create the folder.";
+    return { ...listParent(), error: message };
+  }
+  return listParent();
+}
+
+// src/dir-picker.ts
+var c2 = {
+  reset: "\x1B[0m",
+  dim: "\x1B[2m",
+  bold: "\x1B[1m",
+  gray: themeGray,
+  yellow: "\x1B[33m",
+  red: "\x1B[31m",
+  teal: "\x1B[38;5;37m"
+};
+function localBrowseBackend(label = "this machine") {
+  return {
+    label,
+    list: async (p, showHidden) => browseDirectory(p, { showHidden }),
+    mkdir: async (parent, name, showHidden) => mkdirDirectory(parent, name, { showHidden })
+  };
+}
+function parseBrowseResult(value) {
+  if (!value || typeof value !== "object") return null;
+  const r = value;
+  if (typeof r.path !== "string" || !Array.isArray(r.entries)) return null;
+  return {
+    path: r.path,
+    parent: typeof r.parent === "string" ? r.parent : null,
+    home: typeof r.home === "string" ? r.home : "",
+    entries: r.entries.filter(
+      (e) => !!e && typeof e.name === "string"
+    ),
+    truncated: r.truncated === true,
+    error: typeof r.error === "string" ? r.error : void 0
+  };
+}
+function remoteBrowseBackend(api, machineId, label) {
+  const rpc = async (req) => {
+    const nonce = crypto.randomBytes(8).toString("hex");
+    await writeFsRequest(api, machineId, { nonce, ...req });
+    const deadline = Date.now() + 15e3;
+    while (Date.now() < deadline) {
+      await new Promise((r) => setTimeout(r, 700));
+      const res = await readFsResponse(api, machineId).catch(() => null);
+      if (res && res.nonce === nonce) {
+        if (!res.ok) throw new Error(res.error || "Browse failed on the remote machine.");
+        const parsed = parseBrowseResult(res.result);
+        if (!parsed) throw new Error("The remote machine sent an unreadable listing.");
+        return parsed;
+      }
+    }
+    throw new Error(`${label} didn't answer \u2014 is its daemon online?`);
+  };
+  return {
+    label,
+    list: (p, showHidden) => rpc({ op: "list", path: p ?? "~", show_hidden: showHidden }),
+    mkdir: (parent, name, showHidden) => rpc({ op: "mkdir", path: parent, name, show_hidden: showHidden })
+  };
+}
+function joinBrowsed(parent, name) {
+  const sep = parent.includes("\\") && !parent.includes("/") ? "\\" : "/";
+  return parent.endsWith(sep) ? parent + name : parent + sep + name;
+}
+function tail(p, max = 44) {
+  return p.length > max ? "\u2026" + p.slice(-(max - 1)) : p;
+}
+var KEY_HINTS = `enter open \xB7 s use this directory \xB7 . hidden files \xB7 esc back`;
+async function pickDirectory(tui, backend, opts = {}) {
+  let showHidden = false;
+  let page = 0;
+  const spin = opts.loader?.(`Reading ${backend.label}`);
+  let listing;
+  try {
+    listing = await backend.list(opts.startPath ?? null, showHidden);
+  } catch (e) {
+    spin?.stop();
+    tui.print(`${c2.red}\u2717${c2.reset} ${c2.gray}${e instanceof Error ? e.message : String(e)}${c2.reset}`);
+    return null;
+  }
+  spin?.stop();
+  const title = () => `${c2.bold}${gradientText(`Browse ${backend.label}`)}${c2.reset}  ${c2.teal}${tail(listing.path, 48)}${c2.reset}` + (showHidden ? `  ${c2.dim}\xB7 hidden shown${c2.reset}` : "");
+  const footer = (error) => error ? `${c2.yellow}${error}${c2.reset}  ${c2.dim}${KEY_HINTS}${c2.reset}` : `${c2.dim}${KEY_HINTS}${c2.reset}`;
+  const buildItems = () => {
+    const pageSize = Math.max(5, Math.min(14, (process.stdout.rows || 24) - 9));
+    const pages = Math.max(1, Math.ceil(listing.entries.length / pageSize));
+    if (page >= pages) page = 0;
+    const slice = listing.entries.slice(page * pageSize, (page + 1) * pageSize);
+    const items = [];
+    if (listing.parent) items.push({ label: "..", hint: "up a level", value: { kind: "up", to: listing.parent } });
+    for (const entry of slice) {
+      if (entry.dir) {
+        items.push({
+          label: `${entry.name}/`,
+          hint: entry.repo ? "git repo" : entry.project ? "project" : "",
+          value: { kind: "open", to: joinBrowsed(listing.path, entry.name) }
+        });
+      } else {
+        items.push({ label: entry.name, value: { kind: "noop" }, disabled: true });
+      }
+    }
+    if (listing.entries.length === 0) {
+      items.push({ label: "(empty directory)", value: { kind: "noop" }, disabled: true });
+    }
+    if (pages > 1) {
+      const remaining = listing.entries.length - slice.length;
+      items.push({
+        label: `\u2192 more  (page ${page + 1}/${pages}, ${remaining} more entr${remaining === 1 ? "y" : "ies"})`,
+        value: { kind: "page" }
+      });
+    }
+    if (listing.truncated) {
+      items.push({ label: "\u2026listing capped \u2014 very large directory", value: { kind: "noop" }, disabled: true });
+    }
+    items.push({ label: "\uFF0B New folder here\u2026", value: { kind: "mkdir" } });
+    return items;
+  };
+  const menu = tui.openLiveSelect({
+    title: title(),
+    items: buildItems(),
+    footer: footer(listing.error),
+    keys: ["s", "."]
+  });
+  const refresh = () => menu.update({ title: title(), items: buildItems(), footer: footer(listing.error) });
+  const navigate = async (to, index) => {
+    menu.setBusy(index);
+    try {
+      listing = await backend.list(to, showHidden);
+      page = 0;
+      refresh();
+    } catch (e) {
+      menu.update({ footer: footer(e instanceof Error ? e.message : String(e)) });
+    }
+  };
+  for (; ; ) {
+    const ev = await menu.next();
+    if (ev.kind === "cancel") {
+      menu.close();
+      return null;
+    }
+    if (ev.kind === "key") {
+      if (ev.name === "s") {
+        menu.close();
+        return listing.path;
+      }
+      if (ev.name === ".") {
+        showHidden = !showHidden;
+        await navigate(listing.path, ev.index);
+      }
+      continue;
+    }
+    if (ev.kind === "edit") {
+      menu.setBusy(ev.index);
+      try {
+        const after = await backend.mkdir(listing.path, ev.text, showHidden);
+        if (after.error) {
+          listing = after;
+          page = 0;
+          menu.update({ title: title(), items: buildItems(), footer: footer(after.error) });
+        } else {
+          listing = await backend.list(joinBrowsed(listing.path, ev.text), showHidden);
+          page = 0;
+          refresh();
+        }
+      } catch (e) {
+        menu.update({ footer: footer(e instanceof Error ? e.message : String(e)) });
+      }
+      continue;
+    }
+    const move = ev.value;
+    if (move.kind === "up" || move.kind === "open") {
+      await navigate(move.to, ev.index);
+    } else if (move.kind === "page") {
+      page += 1;
+      refresh();
+    } else if (move.kind === "mkdir") {
+      menu.beginEdit(ev.index, { placeholder: "folder name\u2026", prefix: "\uFF0B " });
+    }
+  }
+}
 
 // src/relay.ts
 var APPROVAL_REQUEST_KEY = "approval_request";
@@ -6704,114 +7261,6 @@ var HubSocket = class {
     this.ws?.close();
   }
 };
-var PROJECT_MARKERS = [
-  ".git",
-  "package.json",
-  "pyproject.toml",
-  "Cargo.toml",
-  "go.mod",
-  "pom.xml",
-  "build.gradle",
-  "Gemfile",
-  "composer.json",
-  "requirements.txt",
-  ".standardagents"
-];
-var MAX_ENTRIES3 = 500;
-function resolveBrowsePath(input3) {
-  const home = os8.homedir();
-  let p = (input3 ?? "").trim();
-  if (!p) return home;
-  if (p === "~") return home;
-  if (p.startsWith("~/")) p = path4.join(home, p.slice(2));
-  return path4.resolve(p);
-}
-function markers(dirPath) {
-  let repo = false;
-  let project = false;
-  for (const marker of PROJECT_MARKERS) {
-    let hit = false;
-    try {
-      hit = fs5.existsSync(path4.join(dirPath, marker));
-    } catch {
-      hit = false;
-    }
-    if (!hit) continue;
-    project = true;
-    if (marker === ".git") repo = true;
-    if (repo) break;
-  }
-  return { project, repo };
-}
-function browseDirectory(input3, opts = {}) {
-  const home = os8.homedir();
-  const abs = resolveBrowsePath(input3);
-  const parent = path4.dirname(abs);
-  const base = {
-    path: abs,
-    parent: parent === abs ? null : parent,
-    home
-  };
-  let dirents;
-  try {
-    const stat = fs5.statSync(abs);
-    if (!stat.isDirectory()) {
-      return { ...base, entries: [], truncated: false, error: "Not a directory" };
-    }
-    dirents = fs5.readdirSync(abs, { withFileTypes: true });
-  } catch (err) {
-    const code = err?.code;
-    const message = code === "EACCES" || code === "EPERM" ? "Permission denied" : code === "ENOENT" ? "Folder not found" : "Could not read this folder";
-    return { ...base, entries: [], truncated: false, error: message };
-  }
-  const showHidden = !!opts.showHidden;
-  const rawDirs = [];
-  const rawFiles = [];
-  for (const d of dirents) {
-    const name = d.name;
-    if (!showHidden && name.startsWith(".")) continue;
-    let isDir = d.isDirectory();
-    if (d.isSymbolicLink()) {
-      try {
-        isDir = fs5.statSync(path4.join(abs, name)).isDirectory();
-      } catch {
-        isDir = false;
-      }
-    }
-    if (isDir) {
-      const { project, repo } = markers(path4.join(abs, name));
-      rawDirs.push({ name, dir: true, project: project || void 0, repo: repo || void 0 });
-    } else {
-      rawFiles.push({ name, dir: false });
-    }
-  }
-  const cmp = (a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase());
-  rawDirs.sort(cmp);
-  rawFiles.sort(cmp);
-  const all = [...rawDirs, ...rawFiles];
-  const truncated = all.length > MAX_ENTRIES3;
-  return { ...base, entries: truncated ? all.slice(0, MAX_ENTRIES3) : all, truncated };
-}
-function mkdirDirectory(parentInput, name, opts = {}) {
-  const parent = resolveBrowsePath(parentInput);
-  const clean2 = (name ?? "").trim();
-  const listParent = () => browseDirectory(parent, opts);
-  if (!clean2 || clean2 === "." || clean2 === ".." || clean2.includes("/") || clean2.includes("\\") || clean2.includes("\0")) {
-    return { ...listParent(), error: "Invalid folder name." };
-  }
-  const target = path4.join(parent, clean2);
-  if (path4.dirname(target) !== parent) {
-    return { ...listParent(), error: "Invalid folder name." };
-  }
-  try {
-    fs5.mkdirSync(target, { recursive: false });
-  } catch (err) {
-    const code = err?.code;
-    const message = code === "EEXIST" ? "A folder with that name already exists." : code === "EACCES" || code === "EPERM" ? "Permission denied." : code === "ENOENT" ? "The parent folder no longer exists." : "Could not create the folder.";
-    return { ...listParent(), error: message };
-  }
-  return listParent();
-}
 var PKG_NAME = "@standardagents/code";
 var REGISTRY_URL = `https://registry.npmjs.org/${encodeURIComponent(PKG_NAME)}`;
 var CACHE_REL_DIR = ".config/standardagents-cli";
@@ -7576,7 +8025,7 @@ function serviceStatus() {
 }
 
 // src/daemon-cli.ts
-var c2 = {
+var c3 = {
   reset: "\x1B[0m",
   dim: "\x1B[2m",
   bold: "\x1B[1m",
@@ -7589,9 +8038,9 @@ function usage() {
   stdout.write(
     [
       "",
-      `${c2.bold}standardcode daemon${c2.reset} \u2014 headless execution client for this machine`,
+      `${c3.bold}standardcode daemon${c3.reset} \u2014 headless execution client for this machine`,
       "",
-      `${c2.bold}Commands${c2.reset}`,
+      `${c3.bold}Commands${c3.reset}`,
       "  install [--endpoint url]   Sign in (if needed), name this machine, and install",
       "                             the always-on service (launchd / systemd).",
       "  uninstall                  Stop and remove the service.",
@@ -7631,11 +8080,11 @@ async function ensureSignedIn(endpoint) {
     const api2 = new ApiClient(endpoint, stored.access_token);
     const check2 = await api2.verifyDetailed();
     if (check2.ok) return api2;
-    stdout.write(`${c2.yellow}Saved sign-in for ${host} failed:${c2.reset} ${check2.reason}
+    stdout.write(`${c3.yellow}Saved sign-in for ${host} failed:${c3.reset} ${check2.reason}
 
 `);
   }
-  stdout.write(`${c2.bold}Sign in to Standard Code${c2.reset} ${c2.dim}(${host})${c2.reset}
+  stdout.write(`${c3.bold}Sign in to Standard Code${c3.reset} ${c3.dim}(${host})${c3.reset}
 
 `);
   const token = await deviceLogin(endpoint);
@@ -7646,7 +8095,7 @@ async function ensureSignedIn(endpoint) {
     { endpoint, access_token: token, token_type: "Bearer", saved_at: Date.now() },
     { updateDefault: false }
   );
-  stdout.write(`${c2.green}\u2713${c2.reset} Signed in to ${c2.teal}${host}${c2.reset}
+  stdout.write(`${c3.green}\u2713${c3.reset} Signed in to ${c3.teal}${host}${c3.reset}
 
 `);
   return api;
@@ -7659,26 +8108,26 @@ async function installCommand(endpointFlag) {
   const suggested = machineDisplayName(existing ?? { hostname: os8.hostname(), id: identity.machine_id });
   const rl = readline2.createInterface({ input: stdin, output: stdout });
   const answer = (await rl.question(
-    `${c2.bold}Machine name${c2.reset} ${c2.dim}(shown in the session picker)${c2.reset} [${suggested}]: `
+    `${c3.bold}Machine name${c3.reset} ${c3.dim}(shown in the session picker)${c3.reset} [${suggested}]: `
   )).trim();
   rl.close();
   if (answer) await setMachineName(api, identity.machine_id, answer);
   await updateOwnMachineRecord(api, identity);
   const displayName = answer || suggested;
-  stdout.write(`${c2.dim}Installing the always-on service\u2026${c2.reset}
+  stdout.write(`${c3.dim}Installing the always-on service\u2026${c3.reset}
 `);
   const extra = endpointFlag ? ["--endpoint", endpoint] : [];
   const result = installService(resolveDaemonCommand(extra), endpointFlag ? endpoint : void 0);
   if (!result.ok) {
-    stdout.write(`${c2.red}\u2717${c2.reset} ${result.detail}
+    stdout.write(`${c3.red}\u2717${c3.reset} ${result.detail}
 `);
-    if (result.manualHint) stdout.write(`${c2.dim}${result.manualHint}${c2.reset}
+    if (result.manualHint) stdout.write(`${c3.dim}${result.manualHint}${c3.reset}
 `);
     process.exit(1);
   }
-  stdout.write(`${c2.green}\u2713${c2.reset} ${result.detail}
+  stdout.write(`${c3.green}\u2713${c3.reset} ${result.detail}
 `);
-  stdout.write(`${c2.dim}Waiting for the daemon's first heartbeat\u2026${c2.reset}
+  stdout.write(`${c3.dim}Waiting for the daemon's first heartbeat\u2026${c3.reset}
 `);
   const deadline = Date.now() + 6e4;
   let alive = false;
@@ -7692,17 +8141,17 @@ async function installCommand(endpointFlag) {
   }
   if (alive) {
     stdout.write(
-      `${c2.green}\u2713${c2.reset} ${c2.bold}${displayName}${c2.reset} is online.
+      `${c3.green}\u2713${c3.reset} ${c3.bold}${displayName}${c3.reset} is online.
 
 Sessions started elsewhere can now run on this machine.
-${c2.dim}Projects register automatically when you run standardcode in a directory here,
-or add one now: standardcode daemon add-project <path>${c2.reset}
+${c3.dim}Projects register automatically when you run standardcode in a directory here,
+or add one now: standardcode daemon add-project <path>${c3.reset}
 `
     );
   } else {
     stdout.write(
-      `${c2.yellow}\u26A0${c2.reset} The service installed but no heartbeat arrived yet.
-${c2.dim}Check ~/.standardagents/daemon.log and \`standardcode daemon status\`.${c2.reset}
+      `${c3.yellow}\u26A0${c3.reset} The service installed but no heartbeat arrived yet.
+${c3.dim}Check ~/.standardagents/daemon.log and \`standardcode daemon status\`.${c3.reset}
 `
     );
   }
@@ -7710,16 +8159,16 @@ ${c2.dim}Check ~/.standardagents/daemon.log and \`standardcode daemon status\`.$
 async function statusCommand() {
   const status = serviceStatus();
   const identity = loadMachineIdentity();
-  stdout.write(`${c2.bold}Service:${c2.reset}  ${status.detail}
+  stdout.write(`${c3.bold}Service:${c3.reset}  ${status.detail}
 `);
   const endpoint = resolveEndpoint();
   const cred = getCredential(endpoint);
   if (!cred) {
     stdout.write(
-      `${c2.bold}Machine:${c2.reset}  ${os8.hostname()} ${c2.dim}(${identity.machine_id})${c2.reset}
+      `${c3.bold}Machine:${c3.reset}  ${os8.hostname()} ${c3.dim}(${identity.machine_id})${c3.reset}
 `
     );
-    stdout.write(`${c2.bold}Account:${c2.reset}  ${c2.yellow}not signed in to ${endpoint}${c2.reset}
+    stdout.write(`${c3.bold}Account:${c3.reset}  ${c3.yellow}not signed in to ${endpoint}${c3.reset}
 `);
     return;
   }
@@ -7727,33 +8176,33 @@ async function statusCommand() {
   const api = new ApiClient(endpoint, cred.access_token);
   const record2 = await loadMachine(api, identity.machine_id).catch(() => null);
   stdout.write(
-    `${c2.bold}Machine:${c2.reset}  ${machineDisplayName(record2 ?? { hostname: os8.hostname(), id: identity.machine_id })} ${c2.dim}(${identity.machine_id})${c2.reset}
+    `${c3.bold}Machine:${c3.reset}  ${machineDisplayName(record2 ?? { hostname: os8.hostname(), id: identity.machine_id })} ${c3.dim}(${identity.machine_id})${c3.reset}
 `
   );
   if (!record2) {
-    stdout.write(`${c2.bold}Registry:${c2.reset} not registered yet
+    stdout.write(`${c3.bold}Registry:${c3.reset} not registered yet
 `);
     return;
   }
   const online = daemonOnline(record2);
   const seen = record2.daemon ? `${Math.round((Date.now() - record2.daemon.last_seen_at) / 1e3)}s ago (v${record2.daemon.version})` : "never";
-  stdout.write(`${c2.bold}Registry:${c2.reset} ${online ? `${c2.green}online${c2.reset}` : `${c2.yellow}offline${c2.reset}`} \xB7 last heartbeat ${seen}
+  stdout.write(`${c3.bold}Registry:${c3.reset} ${online ? `${c3.green}online${c3.reset}` : `${c3.yellow}offline${c3.reset}`} \xB7 last heartbeat ${seen}
 `);
   const projects = Object.keys(record2.projects);
-  stdout.write(`${c2.bold}Projects:${c2.reset} ${projects.length ? "" : c2.dim + "none registered" + c2.reset}
+  stdout.write(`${c3.bold}Projects:${c3.reset} ${projects.length ? "" : c3.dim + "none registered" + c3.reset}
 `);
-  for (const p of projects.sort()) stdout.write(`  ${c2.dim}${p}${c2.reset}
+  for (const p of projects.sort()) stdout.write(`  ${c3.dim}${p}${c3.reset}
 `);
 }
 async function projectCommand(action, target) {
   if (!target) {
-    stdout.write(`${c2.red}\u2717${c2.reset} Expected a project path.
+    stdout.write(`${c3.red}\u2717${c3.reset} Expected a project path.
 `);
     process.exit(1);
   }
   const dir2 = path4.resolve(target);
   if (action === "add" && !fs5.existsSync(dir2)) {
-    stdout.write(`${c2.red}\u2717${c2.reset} ${dir2} does not exist on this machine.
+    stdout.write(`${c3.red}\u2717${c3.reset} ${dir2} does not exist on this machine.
 `);
     process.exit(1);
   }
@@ -7764,11 +8213,11 @@ async function projectCommand(action, target) {
   const displayName = machineDisplayName(record2 ?? { hostname: os8.hostname(), id: identity.machine_id });
   if (action === "add") {
     await registerProject(api, identity, dir2);
-    stdout.write(`${c2.green}\u2713${c2.reset} Registered ${dir2} for remote sessions on ${displayName}.
+    stdout.write(`${c3.green}\u2713${c3.reset} Registered ${dir2} for remote sessions on ${displayName}.
 `);
   } else {
     await unregisterProject(api, identity, dir2);
-    stdout.write(`${c2.green}\u2713${c2.reset} Removed ${dir2} from this machine's projects.
+    stdout.write(`${c3.green}\u2713${c3.reset} Removed ${dir2} from this machine's projects.
 `);
   }
 }
@@ -7784,7 +8233,7 @@ async function runDaemonCommand(argv) {
       return;
     case "uninstall": {
       const result = uninstallService();
-      stdout.write(`${result.ok ? c2.green + "\u2713" : c2.red + "\u2717"}${c2.reset} ${result.detail}
+      stdout.write(`${result.ok ? c3.green + "\u2713" : c3.red + "\u2717"}${c3.reset} ${result.detail}
 `);
       const ep = resolveEndpoint(endpoint);
       const cred = getCredential(ep);
@@ -7817,7 +8266,7 @@ async function runDaemonCommand(argv) {
 }
 
 // src/index.ts
-var c3 = {
+var c4 = {
   reset: "\x1B[0m",
   dim: "\x1B[2m",
   bold: "\x1B[1m",
@@ -7846,10 +8295,10 @@ function printUsage() {
   stdout.write(
     [
       "",
-      `${c3.bold}Usage${c3.reset}`,
+      `${c4.bold}Usage${c4.reset}`,
       "  standardcode [options] [dir]",
       "",
-      `${c3.bold}Options${c3.reset}`,
+      `${c4.bold}Options${c4.reset}`,
       "  -e, --endpoint [url]  Use a different Standard Agents instance for this run",
       "                       (default: https://api.standardcode.ai).",
       "                       If url is omitted, prompt for it.",
@@ -7917,15 +8366,15 @@ function parseArgs2(args) {
 }
 function printCommandBlock(tui, command, output4, ok, where) {
   tui.print("");
-  const note = where ? `  ${c3.dim}(ran on ${where})${c3.reset}` : "";
-  tui.print(`${c3.magenta}!${c3.reset} ${c3.bold}${command}${c3.reset}${note}`);
+  const note = where ? `  ${c4.dim}(ran on ${where})${c4.reset}` : "";
+  tui.print(`${c4.magenta}!${c4.reset} ${c4.bold}${command}${c4.reset}${note}`);
   const body = (output4 ?? "").replace(/\s+$/, "");
   if (body) {
     for (const line of body.split("\n")) {
-      tui.print(`  ${ok ? c3.dim : c3.red}${line}${c3.reset}`);
+      tui.print(`  ${ok ? c4.dim : c4.red}${line}${c4.reset}`);
     }
   } else {
-    tui.print(`  ${c3.dim}(no output)${c3.reset}`);
+    tui.print(`  ${c4.dim}(no output)${c4.reset}`);
   }
   tui.print("");
 }
@@ -7936,7 +8385,7 @@ function printAssistant(tui, text) {
   let dotted = false;
   for (const line of renderStreamingMarkdown(text, cols2)) {
     if (!dotted && line.trim()) {
-      tui.print(`${c3.gray}\u2022${c3.reset} ${line}`);
+      tui.print(`${c4.gray}\u2022${c4.reset} ${line}`);
       dotted = true;
     } else {
       tui.print(`  ${line}`);
@@ -7951,7 +8400,7 @@ function startLoader(label) {
   const draw = () => {
     const now = Date.now();
     const f = frames[Math.floor(now / 70) % frames.length];
-    stdout.write(`\r\x1B[K${pad}${brandCycleColor(now)}${f}${c3.reset} ${c3.dim}${label}\u2026${c3.reset}`);
+    stdout.write(`\r\x1B[K${pad}${brandCycleColor(now)}${f}${c4.reset} ${c4.dim}${label}\u2026${c4.reset}`);
   };
   draw();
   const timer = setInterval(draw, 70);
@@ -7967,12 +8416,12 @@ function farewell(stoppedProcs = 0) {
   if (stoppedProcs > 0) {
     stdout.write(
       `
-${c3.cyan}\u2699${c3.reset} Stopped ${stoppedProcs} background process${stoppedProcs === 1 ? "" : "es"}.
+${c4.cyan}\u2699${c4.reset} Stopped ${stoppedProcs} background process${stoppedProcs === 1 ? "" : "es"}.
 `
     );
   }
   stdout.write(`
-${c3.teal}\u25C7${c3.reset} ${c3.dim}Standard Code \u2014 see you soon.${c3.reset}
+${c4.teal}\u25C7${c4.reset} ${c4.dim}Standard Code \u2014 see you soon.${c4.reset}
 `);
 }
 function printWelcome(endpoint, projectDir) {
@@ -7986,10 +8435,10 @@ function printWelcome(endpoint, projectDir) {
   const metaWidth = Math.max(1, terminalColumns - pad.length - markWidth - 3 - 1);
   const displayDir = truncateMiddle(dir2, metaWidth);
   const meta = [
-    `${c3.bold}${gradientText("Standard Code")}${c3.reset}${version ? `  ${c3.dim}v${version}${c3.reset}` : ""}`,
-    `${c3.dim}terminal coding agent${c3.reset}`,
-    ...endpoint === PRODUCTION_ENDPOINT ? [] : [`${c3.teal}${host}${c3.reset}`],
-    `${c3.dim}${displayDir}${c3.reset}`
+    `${c4.bold}${gradientText("Standard Code")}${c4.reset}${version ? `  ${c4.dim}v${version}${c4.reset}` : ""}`,
+    `${c4.dim}terminal coding agent${c4.reset}`,
+    ...endpoint === PRODUCTION_ENDPOINT ? [] : [`${c4.teal}${host}${c4.reset}`],
+    `${c4.dim}${displayDir}${c4.reset}`
   ];
   const metaTop = Math.floor((LOGO_MARK.length - meta.length) / 2);
   stdout.write("\n");
@@ -8003,11 +8452,11 @@ function printWelcome(endpoint, projectDir) {
 }
 function colorActivity(line) {
   const m = line.match(/^(\s*)([✓✗⛔])\s?([\s\S]*)$/);
-  if (!m) return `${c3.dim}${line}${c3.reset}`;
+  if (!m) return `${c4.dim}${line}${c4.reset}`;
   const [, indent, glyph, rest] = m;
   if (glyph === "\u2713") {
-    const body = rest.replace(/\s(\([^()]*\))\s*$/, ` ${c3.dim}$1${c3.reset}`);
-    return `${indent}${c3.green}\u2713${c3.reset} ${body}`;
+    const body = rest.replace(/\s(\([^()]*\))\s*$/, ` ${c4.dim}$1${c4.reset}`);
+    return `${indent}${c4.green}\u2713${c4.reset} ${body}`;
   }
   if (glyph === "\u2717") {
     const ERR_MAX_LINES = 7;
@@ -8015,15 +8464,15 @@ function colorActivity(line) {
     const shown = lines.slice(0, ERR_MAX_LINES);
     const hidden = lines.length - shown.length;
     const body = shown.map(
-      (l, i) => i === 0 ? `${indent}${c3.red}\u2717 ${l}${c3.reset}` : `${indent}${c3.red}${c3.dim}${l}${c3.reset}`
+      (l, i) => i === 0 ? `${indent}${c4.red}\u2717 ${l}${c4.reset}` : `${indent}${c4.red}${c4.dim}${l}${c4.reset}`
     ).join("\n");
     if (hidden > 0) {
       return `${body}
-${indent}${c3.dim}\u2026 +${hidden} more line${hidden === 1 ? "" : "s"}${c3.reset}`;
+${indent}${c4.dim}\u2026 +${hidden} more line${hidden === 1 ? "" : "s"}${c4.reset}`;
     }
     return body;
   }
-  return `${indent}${c3.yellow}\u26D4 ${rest}${c3.reset}`;
+  return `${indent}${c4.yellow}\u26D4 ${rest}${c4.reset}`;
 }
 async function main() {
   if (process.argv[2] === "daemon") {
@@ -8034,7 +8483,7 @@ async function main() {
   try {
     cliArgs = parseArgs2(process.argv.slice(2));
   } catch (error) {
-    stdout.write(`${c3.red}error:${c3.reset} ${error instanceof Error ? error.message : String(error)}
+    stdout.write(`${c4.red}error:${c4.reset} ${error instanceof Error ? error.message : String(error)}
 `);
     printUsage();
     process.exit(1);
@@ -8046,7 +8495,7 @@ async function main() {
   const endpointArg = cliArgs.endpoint;
   const endpointOverride = cliArgs.promptEndpoint || typeof endpointArg === "string" && endpointArg.trim() !== "";
   const dirArg = cliArgs.dir;
-  const projectDir = path4.resolve(dirArg || process.cwd());
+  let projectDir = path4.resolve(dirArg || process.cwd());
   const machine = os8.hostname();
   const reader = { rl: null };
   let handoffClosing = false;
@@ -8061,7 +8510,7 @@ async function main() {
     }
     preflightArmed = true;
     stdout.write(`
-${c3.dim}Press Control-C again to exit${c3.reset}
+${c4.dim}Press Control-C again to exit${c4.reset}
 `);
     preflightTimer = setTimeout(() => {
       preflightArmed = false;
@@ -8083,10 +8532,10 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
   const askEndpoint = async () => {
     for (; ; ) {
       const answer = (await ask(
-        `${c3.cyan}Standard Agents instance URL${c3.reset} (e.g. http://localhost:5178): `
+        `${c4.cyan}Standard Agents instance URL${c4.reset} (e.g. http://localhost:5178): `
       )).trim();
       if (answer) return answer;
-      stdout.write(`${c3.dim}An endpoint URL is required.${c3.reset}
+      stdout.write(`${c4.dim}An endpoint URL is required.${c4.reset}
 `);
     }
   };
@@ -8101,7 +8550,7 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
   const tlsRelaxed = relaxTlsForLocalEndpoint(endpoint);
   printWelcome(endpoint, projectDir);
   if (tlsRelaxed) {
-    stdout.write(`${c3.dim}  TLS verification relaxed for local endpoint.${c3.reset}
+    stdout.write(`${c4.dim}  TLS verification relaxed for local endpoint.${c4.reset}
 
 `);
   }
@@ -8113,7 +8562,7 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
     loading.stop();
     const applied = consumeAppliedUpdate(version);
     if (applied) {
-      stdout.write(`  ${c3.green}\u2713${c3.reset} ${c3.dim}Standard Code updated to v${version}.${c3.reset}
+      stdout.write(`  ${c4.green}\u2713${c4.reset} ${c4.dim}Standard Code updated to v${version}.${c4.reset}
 
 `);
     }
@@ -8122,21 +8571,21 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
       const decision = decideAutoUpdate(updateAvailable, { state: readAutoUpdateState(), pm });
       if (decision === "start" && pm && startBackgroundUpdate(updateAvailable.latest, pm)) {
         stdout.write(
-          `  ${c3.teal}\u27F3${c3.reset} ${c3.dim}Standard Code ${c3.reset}${c3.bold}v${updateAvailable.latest}${c3.reset}${c3.dim} is installing in the background \u2014 it applies on your next launch.${c3.reset}
+          `  ${c4.teal}\u27F3${c4.reset} ${c4.dim}Standard Code ${c4.reset}${c4.bold}v${updateAvailable.latest}${c4.reset}${c4.dim} is installing in the background \u2014 it applies on your next launch.${c4.reset}
 
 `
         );
       } else if (decision === "in_flight") {
         stdout.write(
-          `  ${c3.teal}\u27F3${c3.reset} ${c3.dim}Standard Code v${updateAvailable.latest} is still installing in the background.${c3.reset}
+          `  ${c4.teal}\u27F3${c4.reset} ${c4.dim}Standard Code v${updateAvailable.latest} is still installing in the background.${c4.reset}
 
 `
         );
       } else {
         const display = updateCommand(pm ?? "npm").display;
         stdout.write(
-          `  ${c3.teal}\u25C7${c3.reset} ${c3.dim}Update available:${c3.reset} ${c3.dim}v${updateAvailable.current}${c3.reset} \u2192 ${c3.bold}v${updateAvailable.latest}${c3.reset}
-  ${c3.dim}Run ${c3.reset}${c3.bold}${display}${c3.reset}${c3.dim} to update${c3.reset}
+          `  ${c4.teal}\u25C7${c4.reset} ${c4.dim}Update available:${c4.reset} ${c4.dim}v${updateAvailable.current}${c4.reset} \u2192 ${c4.bold}v${updateAvailable.latest}${c4.reset}
+  ${c4.dim}Run ${c4.reset}${c4.bold}${display}${c4.reset}${c4.dim} to update${c4.reset}
 
 `
         );
@@ -8154,39 +8603,39 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
   if (!api || !storedCheck?.ok) {
     const host = endpoint.replace(/^https?:\/\//, "").replace(/\/$/, "");
     if (storedCheck && !storedCheck.ok) {
-      stdout.write(`${c3.red}\u2717${c3.reset} ${c3.dim}Saved sign-in for this endpoint failed:${c3.reset} ${storedCheck.reason}
+      stdout.write(`${c4.red}\u2717${c4.reset} ${c4.dim}Saved sign-in for this endpoint failed:${c4.reset} ${storedCheck.reason}
 `);
-      if (storedCheck.hint) stdout.write(`  ${c3.dim}${storedCheck.hint}${c3.reset}
+      if (storedCheck.hint) stdout.write(`  ${c4.dim}${storedCheck.hint}${c4.reset}
 `);
       stdout.write("\n");
     }
     const explainFailure = (result, prefix) => {
-      stdout.write(`${c3.red}\u2717${c3.reset} ${prefix}${result.reason}
+      stdout.write(`${c4.red}\u2717${c4.reset} ${prefix}${result.reason}
 `);
-      if (result.hint) stdout.write(`  ${c3.dim}${result.hint}${c3.reset}
+      if (result.hint) stdout.write(`  ${c4.dim}${result.hint}${c4.reset}
 `);
     };
-    stdout.write(`${c3.bold}${gradientText("Sign in to Standard Code")}${c3.reset}
+    stdout.write(`${c4.bold}${gradientText("Sign in to Standard Code")}${c4.reset}
 `);
     if (`https://${host}` !== PRODUCTION_ENDPOINT) {
-      stdout.write(`${c3.dim}Connecting to${c3.reset} ${c3.teal}${host}${c3.reset}
+      stdout.write(`${c4.dim}Connecting to${c4.reset} ${c4.teal}${host}${c4.reset}
 `);
     }
     stdout.write(
-      `${c3.dim}You'll only need to do this once on this machine.${c3.reset}
+      `${c4.dim}You'll only need to do this once on this machine.${c4.reset}
 
 `
     );
     stdout.write(
-      `${c3.white}Press ${c3.bold}Enter${c3.reset}${c3.white} to open your browser and sign in.${c3.reset} ${c3.dim}(or paste an API token)${c3.reset}
+      `${c4.white}Press ${c4.bold}Enter${c4.reset}${c4.white} to open your browser and sign in.${c4.reset} ${c4.dim}(or paste an API token)${c4.reset}
 
 `
     );
     for (; ; ) {
-      const token = (await ask(`${c3.teal}\u276F${c3.reset} `)).trim();
+      const token = (await ask(`${c4.teal}\u276F${c4.reset} `)).trim();
       if (!token) {
         const got = await deviceLogin(endpoint).catch((e) => {
-          stdout.write(`${c3.red}\u2717${c3.reset} ${c3.dim}${e instanceof Error ? e.message : String(e)}${c3.reset}
+          stdout.write(`${c4.red}\u2717${c4.reset} ${c4.dim}${e instanceof Error ? e.message : String(e)}${c4.reset}
 `);
           return null;
         });
@@ -8200,7 +8649,7 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
             { endpoint, access_token: got, token_type: "Bearer", saved_at: Date.now() },
             { updateDefault: !endpointOverride }
           );
-          stdout.write(`${c3.green}\u2713${c3.reset} Connected to ${c3.teal}${host}${c3.reset}
+          stdout.write(`${c4.green}\u2713${c4.reset} Connected to ${c4.teal}${host}${c4.reset}
 `);
           break;
         }
@@ -8216,7 +8665,7 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
           { endpoint, access_token: token, token_type: "Bearer", saved_at: Date.now() },
           { updateDefault: !endpointOverride }
         );
-        stdout.write(`${c3.green}\u2713${c3.reset} Connected to ${c3.teal}${host}${c3.reset}
+        stdout.write(`${c4.green}\u2713${c4.reset} Connected to ${c4.teal}${host}${c4.reset}
 `);
         break;
       }
@@ -8232,92 +8681,30 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
   void registerProject(api, identity, projectDir).catch(() => {
   });
   const tui = new Tui(1);
-  let selectedAgent = AGENT_ID;
+  let agentOverride;
   if (cliArgs.agent) {
     const wanted = cliArgs.agent.toLowerCase();
     if (["sama", "opensama", "sama_one", OPENSAMA_AGENT_ID].includes(wanted)) {
-      selectedAgent = OPENSAMA_AGENT_ID;
+      agentOverride = OPENSAMA_AGENT_ID;
     } else if (["unlimited", "standard", "unlimited_one", AGENT_ID].includes(wanted)) {
-      selectedAgent = AGENT_ID;
+      agentOverride = AGENT_ID;
     } else {
-      stdout.write(`${c3.red}error:${c3.reset} Unknown agent "${cliArgs.agent}". Use unlimited or sama.
+      stdout.write(`${c4.red}error:${c4.reset} Unknown agent "${cliArgs.agent}". Use unlimited or sama.
 `);
       process.exit(1);
     }
-  } else {
-    const picked = await tui.select(
-      `${c3.bold}${gradientText("Which agent?")}${c3.reset}  ${c3.dim}\u2191\u2193 \xB7 enter \xB7 esc${c3.reset}`,
-      AGENT_CHOICES.map((choice) => ({
-        label: choice.title,
-        hint: choice.description,
-        value: choice.id,
-        disabled: choice.disabled
-      }))
-    );
-    if (!picked) process.exit(0);
-    selectedAgent = picked;
   }
-  if (selectedAgent === OPENSAMA_AGENT_ID) {
-    const ok = await ensureSamaAuth(tui, api);
-    if (!ok) process.exit(0);
-  }
-  const home = os8.homedir();
-  const tildeDir = projectDir.startsWith(home) ? "~" + projectDir.slice(home.length) : projectDir;
-  const shortDir = tildeDir.length > 38 ? "\u2026" + tildeDir.slice(-37) : tildeDir;
+  let selectedAgent = agentOverride ?? AGENT_ID;
   const session = { mode: "local", identity };
-  {
-    const loadingMachines = startLoader("Checking your machines");
-    const machines = await loadMachines(api).catch(() => []);
-    loadingMachines.stop();
-    session.suggestDaemonInstall = machines.every((m) => !m.daemon);
-    const remoteTargets = machines.filter((m) => m.id !== identity.machine_id && daemonOnline(m));
-    if (remoteTargets.length > 0) {
-      const where = await tui.select(
-        `${c3.bold}${gradientText("Where should this session run?")}${c3.reset}  ${c3.dim}\u2191\u2193 \xB7 enter \xB7 esc${c3.reset}`,
-        [
-          { label: `\u{1F5A5}\uFE0F  This machine \u2014 ${shortDir}`, hint: "tools run locally", value: null },
-          ...remoteTargets.map((m) => ({
-            label: `${machineIcon(m)}  ${m.name}`,
-            hint: `${m.hostname} \xB7 daemon online${m.daemon ? ` \xB7 v${m.daemon.version}` : ""}`,
-            value: m
-          }))
-        ]
-      );
-      if (where) {
-        const remotePath = await pickRemoteProject(tui, api, where);
-        if (remotePath) {
-          session.mode = "remote";
-          session.runner = where;
-          session.remotePath = remotePath;
-        }
-      }
-    }
-  }
-  let tags;
-  let resumeTags;
-  if (session.mode === "remote" && session.runner && session.remotePath) {
-    tags = [
-      `path:${session.remotePath}`,
-      `machine:${session.runner.hostname || session.runner.name}`,
-      `runner:${session.runner.id}`
-    ];
-    resumeTags = [`path:${session.remotePath}`, `runner:${session.runner.id}`];
-  } else {
-    tags = [`path:${projectDir}`, `machine:${machine}`, `runner:${identity.machine_id}`];
-    resumeTags = [`path:${projectDir}`, `machine:${machine}`];
-  }
-  const loadingSessions = startLoader("Loading sessions");
-  let existing = [];
-  try {
-    existing = await api.listThreads(
-      selectedAgent === OPENSAMA_AGENT_ID ? [OPENSAMA_AGENT_ID] : AGENT_ID_VARIANTS,
-      resumeTags
-    );
-  } catch {
-    existing = [];
-  }
-  const summaries = existing.length > 0 ? await summarizeThreads(api, existing.slice(0, 8)) : [];
-  loadingSessions.stop();
+  const loadingMachines = startLoader("Checking your machines");
+  const machines = await loadMachines(api).catch(() => []);
+  loadingMachines.stop();
+  session.suggestDaemonInstall = machines.every((m) => !m.daemon);
+  const remoteTargets = machines.filter((m) => m.id !== identity.machine_id && daemonOnline(m));
+  const self = machines.find((m) => m.id === identity.machine_id);
+  const launchDir = projectDir;
+  let tags = [];
+  let resumeTags = [];
   const createSessionThread = async () => {
     const id = await api.createThread(selectedAgent, tags);
     if (session.mode === "remote" && session.runner && session.remotePath) {
@@ -8330,33 +8717,161 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
     }
     return id;
   };
-  let threadId;
+  let threadId = "";
   let resumed = false;
   let historySeed;
-  if (existing.length > 0) {
-    const items = summaries.map((s) => ({
-      label: s.label,
-      hint: s.hint,
-      value: s.id
-    }));
-    items.push({ label: "\uFF0B Start a new session", value: null });
-    const whereLabel = session.mode === "remote" && session.runner ? `${session.runner.name}:${shortenPath(session.remotePath ?? "")}` : shortDir;
-    const picked = await tui.select(
-      `${c3.bold}${gradientText("Resume a session")}${c3.reset}  ${c3.gray}${whereLabel}${c3.reset}  ${c3.dim}\u2191\u2193 \xB7 enter \xB7 esc${c3.reset}`,
-      items
-    );
-    if (typeof picked === "string") {
-      threadId = picked;
-      resumed = true;
+  let existing = [];
+  let hadResumeMenu = false;
+  let where = null;
+  let step = remoteTargets.length > 0 ? "machine" : "thread";
+  flow: for (; ; ) {
+    if (step === "machine") {
+      const picked = await tui.select(
+        `${c4.bold}${gradientText("Where should this session run?")}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+        [
+          {
+            label: `This machine \u2014 ${self ? machineDisplayName(self) : machine}`,
+            detail: "tools run locally",
+            value: null
+          },
+          ...remoteTargets.map((m) => ({
+            label: machineDisplayName(m),
+            detail: `${m.hostname} \xB7 daemon online${m.daemon ? ` \xB7 v${m.daemon.version}` : ""}`,
+            value: m
+          }))
+        ],
+        { spaced: true }
+      );
+      if (picked === void 0) process.exit(0);
+      where = picked;
+      step = "project";
+    } else if (step === "project") {
+      session.mode = "local";
+      session.runner = void 0;
+      session.remotePath = void 0;
+      projectDir = launchDir;
+      if (where) {
+        const remotePath = await pickRemoteProject(tui, api, where);
+        if (!remotePath) {
+          step = "machine";
+          continue;
+        }
+        session.mode = "remote";
+        session.runner = where;
+        session.remotePath = remotePath;
+      } else {
+        const localPath = await pickLocalProject(tui, api, self, launchDir, machine);
+        if (localPath === null) {
+          step = "machine";
+          continue;
+        }
+        if (localPath !== launchDir) {
+          projectDir = localPath;
+          void registerProject(api, identity, projectDir).catch(() => {
+          });
+        }
+      }
+      step = "thread";
+    } else if (step === "thread") {
+      if (session.mode === "remote" && session.runner && session.remotePath) {
+        tags = [
+          `path:${session.remotePath}`,
+          `machine:${session.runner.hostname || session.runner.name}`,
+          `runner:${session.runner.id}`
+        ];
+        resumeTags = [`path:${session.remotePath}`, `runner:${session.runner.id}`];
+      } else {
+        tags = [`path:${projectDir}`, `machine:${machine}`, `runner:${identity.machine_id}`];
+        resumeTags = [`path:${projectDir}`, `machine:${machine}`];
+      }
+      const loadingSessions = startLoader("Loading sessions");
+      try {
+        const listIds = agentOverride ? agentOverride === OPENSAMA_AGENT_ID ? [OPENSAMA_AGENT_ID] : AGENT_ID_VARIANTS : [...AGENT_ID_VARIANTS, OPENSAMA_AGENT_ID];
+        existing = await api.listThreads(listIds, resumeTags);
+        existing.sort((a, b) => (b.created_at ?? 0) - (a.created_at ?? 0));
+      } catch {
+        existing = [];
+      }
+      const summaries = existing.length > 0 ? await summarizeThreads(api, existing.slice(0, 8)) : [];
+      loadingSessions.stop();
+      if (existing.length === 0) {
+        hadResumeMenu = false;
+        step = "agent";
+        continue;
+      }
+      hadResumeMenu = true;
+      const home = os8.homedir();
+      const tildeDir = projectDir.startsWith(home) ? "~" + projectDir.slice(home.length) : projectDir;
+      const shortDir = tildeDir.length > 38 ? "\u2026" + tildeDir.slice(-37) : tildeDir;
+      const items = summaries.map((s) => ({
+        label: s.label,
+        hint: s.hint,
+        value: s.id
+      }));
+      items.push({ label: "\uFF0B Start a new session", value: null });
+      const whereLabel = session.mode === "remote" && session.runner ? `${session.runner.name}:${shortenPath(session.remotePath ?? "")}` : shortDir;
+      const picked = await tui.select(
+        `${c4.bold}${gradientText("Resume a session")}${c4.reset}  ${c4.gray}${whereLabel}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+        items
+      );
+      if (picked === void 0) {
+        if (remoteTargets.length > 0) {
+          step = "project";
+          continue;
+        }
+        process.exit(0);
+      }
+      if (typeof picked === "string") {
+        threadId = picked;
+        resumed = true;
+        const threadAgent = existing.find((t) => t.id === picked)?.agent_id;
+        selectedAgent = threadAgent === OPENSAMA_AGENT_ID ? OPENSAMA_AGENT_ID : AGENT_ID;
+        if (selectedAgent === OPENSAMA_AGENT_ID) {
+          const ok = await ensureSamaAuth(tui, api);
+          if (!ok) continue;
+        }
+        break flow;
+      }
+      historySeed = existing[0]?.id;
+      step = "agent";
     } else {
+      if (!agentOverride) {
+        const picked = await tui.select(
+          `${c4.bold}${gradientText("Which agent?")}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+          AGENT_CHOICES.map((choice) => ({
+            label: choice.title,
+            hint: choice.description,
+            value: choice.id,
+            disabled: choice.disabled
+          }))
+        );
+        if (!picked) {
+          if (hadResumeMenu) {
+            step = "thread";
+            continue;
+          }
+          if (remoteTargets.length > 0) {
+            step = "project";
+            continue;
+          }
+          process.exit(0);
+        }
+        selectedAgent = picked;
+      }
+      if (selectedAgent === OPENSAMA_AGENT_ID) {
+        const ok = await ensureSamaAuth(tui, api);
+        if (!ok) {
+          if (agentOverride) process.exit(0);
+          continue;
+        }
+      }
       threadId = await createSessionThread();
-      historySeed = existing[0]?.id;
+      break flow;
     }
-  } else {
-    threadId = await createSessionThread();
   }
   for (; ; ) {
-    await runInteractive(tui, api, threadId, projectDir, machine, resumed, session, historySeed);
+    const agentTitle = AGENT_CHOICES.find((a) => a.id === selectedAgent)?.title ?? selectedAgent;
+    await runInteractive(tui, api, threadId, projectDir, machine, resumed, session, agentTitle, historySeed);
     historySeed = threadId;
     threadId = await createSessionThread();
     await api.kvSet(threadId, "lease_supersedes", historySeed);
@@ -8372,7 +8887,7 @@ async function ensureSamaAuth(tui, api) {
   checking.stop();
   if (already) return true;
   const picked = await tui.select(
-    `${c3.bold}${gradientText("Authenticate with ChatGPT")}${c3.reset}  ${c3.dim}Sama One runs on OpenAI using your own ChatGPT Pro account${c3.reset}`,
+    `${c4.bold}${gradientText("Authenticate with ChatGPT")}${c4.reset}  ${c4.dim}Sama One runs on OpenAI using your own ChatGPT Pro account${c4.reset}`,
     [
       {
         label: "Continue with ChatGPT",
@@ -8385,7 +8900,7 @@ async function ensureSamaAuth(tui, api) {
   if (picked !== "continue") return false;
   openUrl("https://standardcode.ai/app?connect=sama");
   tui.print(
-    `${c3.dim}Finish connecting ChatGPT in the browser \u2014 waiting here for the authorization to land on your account\u2026${c3.reset}`
+    `${c4.dim}Finish connecting ChatGPT in the browser \u2014 waiting here for the authorization to land on your account\u2026${c4.reset}`
   );
   const waiting = startLoader("Waiting for your ChatGPT authorization");
   const deadline = Date.now() + 5 * 60 * 1e3;
@@ -8394,20 +8909,20 @@ async function ensureSamaAuth(tui, api) {
     if (await api.openSamaStatus().catch(() => false)) {
       waiting.stop();
       tui.print(
-        `${c3.green}\u2713${c3.reset} ChatGPT connected \u2014 Sama One is now unlocked on your account (terminal, web, and macOS app).`
+        `${c4.green}\u2713${c4.reset} ChatGPT connected \u2014 Sama One is now unlocked on your account (terminal, web, and macOS app).`
       );
       return true;
     }
   }
   waiting.stop();
   tui.print(
-    `${c3.yellow}Still not connected.${c3.reset} Finish the flow at ${c3.teal}standardcode.ai/app${c3.reset} and pick Sama One again.`
+    `${c4.yellow}Still not connected.${c4.reset} Finish the flow at ${c4.teal}standardcode.ai/app${c4.reset} and pick Sama One again.`
   );
   return false;
 }
 async function runAgentSwitchMenu(tui, api, threadId) {
   const picked = await tui.select(
-    `${c3.bold}${gradientText("Switch agent")}${c3.reset}  ${c3.dim}takes effect on the next message${c3.reset}`,
+    `${c4.bold}${gradientText("Switch agent")}${c4.reset}  ${c4.dim}takes effect on the next message${c4.reset}`,
     AGENT_CHOICES.map((choice) => ({
       label: choice.title,
       hint: choice.description,
@@ -8423,41 +8938,68 @@ async function runAgentSwitchMenu(tui, api, threadId) {
   const title = AGENT_CHOICES.find((choice) => choice.id === picked)?.title ?? picked;
   try {
     await api.setThreadAgent(threadId, picked);
-    tui.print(`${c3.green}\u2713${c3.reset} Session handed to ${c3.bold}${title}${c3.reset} \u2014 applies from your next message.`);
+    tui.setAgentLabel(title);
+    tui.print(`${c4.green}\u2713${c4.reset} Session handed to ${c4.bold}${title}${c4.reset} \u2014 applies from your next message.`);
   } catch (e) {
     tui.print(
-      `${c3.red}\u2717 couldn't switch agent:${c3.reset} ${c3.gray}${e instanceof Error ? e.message : String(e)}${c3.reset}`
+      `${c4.red}\u2717 couldn't switch agent:${c4.reset} ${c4.gray}${e instanceof Error ? e.message : String(e)}${c4.reset}`
     );
   }
 }
+async function pickLocalProject(tui, api, self, cwd, machineName) {
+  const NEW = "__new__";
+  const label = self ? machineDisplayName(self) : machineName;
+  const others = Object.entries(self?.projects ?? {}).filter(([dir2]) => dir2 !== cwd).sort((a, b) => (b[1]?.last_used_at ?? 0) - (a[1]?.last_used_at ?? 0));
+  const labels = projectDisplayLabels({ ...self?.projects ?? {}, [cwd]: self?.projects?.[cwd] });
+  const items = [
+    {
+      label: labels.get(cwd) ?? projectDisplayName(cwd, self?.projects?.[cwd]),
+      hint: "current directory",
+      detail: shortenPath(cwd, 60),
+      value: cwd
+    },
+    ...others.map(([dir2, p]) => ({
+      label: labels.get(dir2) ?? projectDisplayName(dir2, p),
+      hint: p?.last_used_at ? relativeTime(p.last_used_at / 1e3) : "",
+      detail: shortenPath(dir2, 60),
+      value: dir2
+    })),
+    { label: "\uFF0B New project", hint: "browse or create a directory", value: NEW }
+  ];
+  const picked = await tui.select(
+    `${c4.bold}${gradientText(`Project on ${label}`)}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+    items,
+    { spaced: true }
+  );
+  if (!picked) return null;
+  if (picked !== NEW) return picked;
+  return await pickDirectory(tui, localBrowseBackend(label), { startPath: cwd, loader: startLoader });
+}
 async function pickRemoteProject(tui, api, runner) {
   const ENTER_PATH = "__enter_path__";
   const projects = Object.entries(runner.projects).sort(
     (a, b) => (b[1]?.last_used_at ?? 0) - (a[1]?.last_used_at ?? 0)
   );
-  const items = projects.map(([dir2, p]) => ({
-    label: shortenPath(dir2, 48),
-    hint: p?.last_used_at ? relativeTime(p.last_used_at / 1e3) : "",
-    value: dir2
-  }));
-  items.push({ label: `\uFF0B Another path on ${runner.name}\u2026`, hint: "type a directory", value: ENTER_PATH });
+  const labels = projectDisplayLabels(runner.projects);
+  const items = projects.map(
+    ([dir2, p]) => ({
+      label: labels.get(dir2) ?? projectDisplayName(dir2, p),
+      hint: p?.last_used_at ? relativeTime(p.last_used_at / 1e3) : "",
+      detail: shortenPath(dir2, 60),
+      value: dir2
+    })
+  );
+  items.push({ label: "\uFF0B New project", hint: "browse or create a directory", value: ENTER_PATH });
   const picked = await tui.select(
-    `${c3.bold}${gradientText(`Project on ${runner.name}`)}${c3.reset}  ${c3.dim}\u2191\u2193 \xB7 enter \xB7 esc${c3.reset}`,
-    items
+    `${c4.bold}${gradientText(`Project on ${runner.name}`)}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+    items,
+    { spaced: true }
   );
   if (!picked) return null;
   if (picked !== ENTER_PATH) return picked;
-  const typed = await tui.prompt(
-    `Directory on ${runner.name} (absolute, created if missing)`,
-    "~/projects/my-app"
-  );
-  if (!typed) return null;
-  const trimmed = typed.trim();
-  if (!trimmed.startsWith("/") && !trimmed.startsWith("~")) {
-    tui.print(`${c3.yellow}Use an absolute path (starting with / or ~).${c3.reset}`);
-    return null;
-  }
-  return await resolveRemoteProjectPath(api, runner.id, trimmed);
+  return await pickDirectory(tui, remoteBrowseBackend(api, runner.id, runner.name), {
+    loader: startLoader
+  });
 }
 function isSilentMessage(m) {
   return m?.silent === true || m?.metadata?.silent === true;
@@ -8474,14 +9016,15 @@ async function summarizeThreads(api, threads) {
       }
       const label = preview ? preview.length > 64 ? preview.slice(0, 63) + "\u2026" : preview : "(empty session)";
       const when = t.created_at ? relativeTime(t.created_at) : "";
-      const hint = [t.id.slice(0, 8), when].filter(Boolean).join(" \xB7 ");
+      const agentTag = t.agent_id === OPENSAMA_AGENT_ID ? AGENT_CHOICES.find((a) => a.id === OPENSAMA_AGENT_ID)?.title ?? "Sama One" : "";
+      const hint = [t.id.slice(0, 8), when, agentTag].filter(Boolean).join(" \xB7 ");
       return { id: t.id, label, hint };
     })
   );
 }
 function subagentLabel(s, titles) {
   const agentName = (s.agent_name || "").trim();
-  const title = (s.title || "").trim() || titles.get(agentName) || (agentName ? agentName.replace(/[_-]+/g, " ").replace(/\b\w/g, (c4) => c4.toUpperCase()) : "Subagent");
+  const title = (s.title || "").trim() || titles.get(agentName) || (agentName ? agentName.replace(/[_-]+/g, " ").replace(/\b\w/g, (c5) => c5.toUpperCase()) : "Subagent");
   const tagged = (s.threadName || "").trim();
   return tagged ? `${title} \xB7 ${tagged}` : title;
 }
@@ -8504,8 +9047,8 @@ async function printHistory(api, threadId, tui) {
   ).sort((a, b) => (a.created_at ?? 0) - (b.created_at ?? 0));
   if (!convo.length) return;
   const shown = convo.slice(-24);
-  tui.print(`${c3.dim}\u2500\u2500 resuming session \xB7 ${convo.length} message${convo.length === 1 ? "" : "s"} \u2500\u2500${c3.reset}`);
-  if (shown.length < convo.length) tui.print(`${c3.dim}   \u2026 earlier messages omitted${c3.reset}`);
+  tui.print(`${c4.dim}\u2500\u2500 resuming session \xB7 ${convo.length} message${convo.length === 1 ? "" : "s"} \u2500\u2500${c4.reset}`);
+  if (shown.length < convo.length) tui.print(`${c4.dim}   \u2026 earlier messages omitted${c4.reset}`);
   for (const m of shown) {
     if (m.metadata?.user_command) {
       printCommandBlock(
@@ -8522,9 +9065,12 @@ async function printHistory(api, threadId, tui) {
     else printAssistant(tui, text);
   }
 }
-async function runInteractive(tui, api, threadId, projectDir, machine, resumed, session, historySeedThreadId) {
+async function runInteractive(tui, api, threadId, projectDir, machine, resumed, session, agentTitle, historySeedThreadId) {
   const remote = session.mode === "remote";
   const runnerName = session.runner?.name ?? "the remote machine";
+  let currentOwner = null;
+  let ownershipKnown = false;
+  const describeExecOwner = (o) => o?.client_kind === "daemon" ? "the daemon on this machine" : o?.client_name || "another client";
   const registry = new ProcessRegistry(api, threadId, machine);
   const refreshBgCount = () => {
     void registry.runningCount().then((n) => tui.setBackgroundCount(n)).catch(() => {
@@ -8550,6 +9096,7 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
   saveApprovals(api, threadId, perm);
   const attaching = startLoader("Attaching to thread");
   let busy = false;
+  let optimisticBusyUntil = 0;
   let sharedMessaging = emptySharedMessagingSnapshot();
   let mirroredDraftRefs = [];
   let sharedMessagingReady = false;
@@ -8609,26 +9156,28 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
           if (detail) for (const d of detail) tui.print(d);
           refreshBgCount();
         },
-        onOwnership: (isOwner, owner) => {
+        onOwnership: (isOwner, owner2) => {
+          const wasKnown = ownershipKnown;
+          ownershipKnown = true;
+          currentOwner = owner2;
           if (isOwner) {
             bridge?.setClaim("takeover");
             exec?.writeSessionInfo();
-          } else {
-            tui.print(
-              `${c3.yellow}\u26A0 Another client${owner?.client_name ? ` (${owner.client_name})` : ""} is executing tools for this session \u2014 this terminal is watching.${c3.reset}`
-            );
+            if (wasKnown) tui.print(`${c4.dim}Tool execution moved to this terminal.${c4.reset}`);
+          } else if (wasKnown) {
+            tui.print(`${c4.dim}Tool execution moved to ${describeExecOwner(owner2)}.${c4.reset}`);
           }
         },
         onClaimRefused: (reason) => {
           if (reason === "in_flight") {
             tui.print(
-              `${c3.yellow}\u26A0 The session's current client is mid-operation \u2014 execution can't move here until it finishes. Watching for now.${c3.reset}`
+              `${c4.dim}The session's current client is mid-operation \u2014 execution stays there until it finishes.${c4.reset}`
             );
           }
         },
         onSuperseded: () => {
           tui.print(
-            `${c3.yellow}\u26A0 Another Standard Code process on this machine took over this session \u2014 this terminal is watching.${c3.reset}`
+            `${c4.yellow}\u26A0 Another Standard Code process on this machine took over this session \u2014 this terminal is watching.${c4.reset}`
           );
         },
         onStatus: (id, summary) => {
@@ -8786,7 +9335,7 @@ why: ${req.requestPermission}` : ""}`,
   const logout = async () => {
     deleteCredential(api.origin);
     const instanceHost = api.origin.replace(/^https?:\/\//, "");
-    tui.print(`${c3.gray}Signed out \u2014 removed the saved token for ${c3.teal}${instanceHost}${c3.reset}${c3.gray}. Run standardcode to sign in again.${c3.reset}`);
+    tui.print(`${c4.gray}Signed out \u2014 removed the saved token for ${c4.teal}${instanceHost}${c4.reset}${c4.gray}. Run standardcode to sign in again.${c4.reset}`);
     await quit();
   };
   const bgMgr = {
@@ -8794,7 +9343,7 @@ why: ${req.requestPermission}` : ""}`,
     stop: async (id) => {
       if (!host) {
         tui.print(
-          `${c3.gray}That process runs on ${runnerName} \u2014 ask the agent to stop it (it manages processes there).${c3.reset}`
+          `${c4.gray}That process runs on ${runnerName} \u2014 ask the agent to stop it (it manages processes there).${c4.reset}`
         );
         return;
       }
@@ -8875,7 +9424,7 @@ why: ${req.requestPermission}` : ""}`,
     } catch (error) {
       if (!sharedMessagingReady && !sharedMessagingUnavailableShown) {
         sharedMessagingUnavailableShown = true;
-        tui.print(`${c3.dim}shared messaging unavailable: ${error instanceof Error ? error.message : String(error)}${c3.reset}`);
+        tui.print(`${c4.dim}shared messaging unavailable: ${error instanceof Error ? error.message : String(error)}${c4.reset}`);
       }
     }
   };
@@ -8885,7 +9434,7 @@ why: ${req.requestPermission}` : ""}`,
     applySharedMessaging(snapshot, false);
     return true;
   }).catch((error) => {
-    tui.print(`${c3.dim}shared messaging failed: ${error instanceof Error ? error.message : String(error)}${c3.reset}`);
+    tui.print(`${c4.dim}shared messaging failed: ${error instanceof Error ? error.message : String(error)}${c4.reset}`);
     return false;
   });
   const appendSharedPending = (text, images, refs = []) => applySharedMutation(api.appendPendingInput(threadId, {
@@ -8913,28 +9462,32 @@ why: ${req.requestPermission}` : ""}`,
     tui.printUserMessage(text || `\u{1F4CE} ${refs.length + images.length} attachment(s)`);
     const key = text.trim();
     pendingSent.set(key, (pendingSent.get(key) ?? 0) + 1);
+    busy = true;
+    optimisticBusyUntil = Date.now() + 8e3;
+    tui.setWorking(true);
     try {
       await api.sendMessage(threadId, text, [...refs, ...toAttachments(images)]);
     } catch (e) {
       const n = (pendingSent.get(key) ?? 1) - 1;
       if (n > 0) pendingSent.set(key, n);
       else pendingSent.delete(key);
-      tui.print(`${c3.dim}failed to send: ${e instanceof Error ? e.message : String(e)}${c3.reset}`);
+      busy = false;
+      optimisticBusyUntil = 0;
+      tui.setWorking(false);
+      tui.print(`${c4.dim}failed to send: ${e instanceof Error ? e.message : String(e)}${c4.reset}`);
       return false;
     }
-    busy = true;
-    tui.setWorking(true);
     return true;
   };
   const whereLabel = remote ? runnerName : "this machine";
   let bangRunning = false;
   const runBangCommand = async (command) => {
     if (bangRunning) {
-      tui.print(`${c3.dim}a command is already running \u2014 one at a time.${c3.reset}`);
+      tui.print(`${c4.dim}a command is already running \u2014 one at a time.${c4.reset}`);
       return;
     }
     bangRunning = true;
-    tui.print(`${c3.magenta}!${c3.reset} ${c3.dim}running on ${whereLabel}\u2026${c3.reset}`);
+    tui.print(`${c4.magenta}!${c4.reset} ${c4.dim}running on ${whereLabel}\u2026${c4.reset}`);
     try {
       const res = await api.runCommand(threadId, command);
       if (res.messageId) shownIds.add(res.messageId);
@@ -8948,7 +9501,7 @@ why: ${req.requestPermission}` : ""}`,
   const openPendingMenu = async () => {
     const items = sharedMessaging.pending.items;
     if (!items.length) {
-      tui.print(`${c3.dim}No pending messages.${c3.reset}`);
+      tui.print(`${c4.dim}No pending messages.${c4.reset}`);
       return;
     }
     const picked = await tui.select("Pending messages", items.map((item, index) => ({
@@ -8978,16 +9531,16 @@ why: ${req.requestPermission}` : ""}`,
     try {
       await api.compact(threadId);
     } catch (err) {
-      tui.print(`${c3.red}\u2717${c3.reset} couldn't start compaction: ${err.message}`);
+      tui.print(`${c4.red}\u2717${c4.reset} couldn't start compaction: ${err.message}`);
     }
   };
   const runAccountCommand = async () => {
-    tui.print(`${c3.gray}Opening your account\u2026${c3.reset}`);
+    tui.print(`${c4.gray}Opening your account\u2026${c4.reset}`);
     const link = await api.accountLink(threadId).catch(() => null);
     const target = link?.url ?? "https://standardcode.ai/account";
     openUrl(target);
     tui.print(
-      link?.preauthed ? `${c3.gray}\u2192 account dashboard opened in your browser (signed in)${c3.reset}` : `${c3.gray}\u2192 opened ${target} \u2014 sign in with your account email${c3.reset}`
+      link?.preauthed ? `${c4.gray}\u2192 account dashboard opened in your browser (signed in)${c4.reset}` : `${c4.gray}\u2192 opened ${target} \u2014 sign in with your account email${c4.reset}`
     );
   };
   const ordinal = (n) => {
@@ -8998,24 +9551,24 @@ why: ${req.requestPermission}` : ""}`,
   const renderUpgradePanel = (q) => {
     const dots = [];
     for (let i = 0; i < q.max; i++) {
-      if (i < q.current) dots.push(`${c3.teal}\u25CF${c3.reset}`);
-      else if (i === q.current) dots.push(`${c3.bold}${gradientText("\uFF0B")}${c3.reset}`);
-      else dots.push(`${c3.dim}\xB7${c3.reset}`);
+      if (i < q.current) dots.push(`${c4.teal}\u25CF${c4.reset}`);
+      else if (i === q.current) dots.push(`${c4.bold}${gradientText("\uFF0B")}${c4.reset}`);
+      else dots.push(`${c4.dim}\xB7${c4.reset}`);
     }
     const cost = fmtCost(q);
     const lines = [
       "",
-      `${c3.bold}${gradientText("\u2726 Add a parallel session")}${c3.reset}`,
+      `${c4.bold}${gradientText("\u2726 Add a parallel session")}${c4.reset}`,
       "",
-      `${dots.join(" ")}   ${c3.dim}${q.current} of ${q.current} session${q.current === 1 ? "" : "s"} in use${c3.reset}`
+      `${dots.join(" ")}   ${c4.dim}${q.current} of ${q.current} session${q.current === 1 ? "" : "s"} in use${c4.reset}`
     ];
     if (q.ends_trial) {
       lines.push(
-        `${c3.yellow}Your $5 trial covers 1 session. Adding a ${ordinal(q.sessions)} ends the trial${c3.reset}`,
-        `${c3.yellow}and starts your $49/mo plan now${cost ? ` \u2014 ${c3.bold}${cost} charged today${c3.reset}${c3.yellow}` : ""}.${c3.reset}`
+        `${c4.yellow}Your $5 trial covers 1 session. Adding a ${ordinal(q.sessions)} ends the trial${c4.reset}`,
+        `${c4.yellow}and starts your $49/mo plan now${cost ? ` \u2014 ${c4.bold}${cost} charged today${c4.reset}${c4.yellow}` : ""}.${c4.reset}`
       );
     } else if (cost) {
-      lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 ${c3.bold}${cost} charged now${c3.reset}.`);
+      lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 ${c4.bold}${cost} charged now${c4.reset}.`);
     } else {
       lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 prorated on your next invoice.`);
     }
@@ -9028,7 +9581,7 @@ why: ${req.requestPermission}` : ""}`,
     try {
       if (opts.auto) {
         tui.print(
-          `${c3.yellow}You're out of simultaneous sessions \u2014 another Standard Code session is using your slot.${c3.reset}`
+          `${c4.yellow}You're out of simultaneous sessions \u2014 another Standard Code session is using your slot.${c4.reset}`
         );
       }
       const quote = await api.sessionsQuote(threadId);
@@ -9036,16 +9589,16 @@ why: ${req.requestPermission}` : ""}`,
         const link = await api.accountLink(threadId).catch(() => null);
         const target = link?.url ?? "https://standardcode.ai/account";
         tui.print(
-          `${c3.gray}Close the other session (its slot frees within ~90s) \u2014 or add another simultaneous session to your plan, then resend your message.${c3.reset}`
+          `${c4.gray}Close the other session (its slot frees within ~90s) \u2014 or add another simultaneous session to your plan, then resend your message.${c4.reset}`
         );
         openUrl(target);
-        tui.print(`${c3.gray}\u2192 opened ${target} to manage your plan${c3.reset}`);
+        tui.print(`${c4.gray}\u2192 opened ${target} to manage your plan${c4.reset}`);
         return;
       }
       if (quote.current >= quote.max) {
         tui.print(
-          `${c3.yellow}You're at the maximum of ${quote.max} parallel session${quote.max === 1 ? "" : "s"}.${c3.reset}
-${c3.gray}Close another session (its slot frees within ~90s), then resend your message.${c3.reset}`
+          `${c4.yellow}You're at the maximum of ${quote.max} parallel session${quote.max === 1 ? "" : "s"}.${c4.reset}
+${c4.gray}Close another session (its slot frees within ~90s), then resend your message.${c4.reset}`
         );
         return;
       }
@@ -9057,25 +9610,25 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
         { label: "Not now", value: "no" }
       ]);
       if (choice !== "go") {
-        tui.print(`${c3.gray}No change made \u2014 you can upgrade anytime with /upgrade.${c3.reset}`);
+        tui.print(`${c4.gray}No change made \u2014 you can upgrade anytime with /upgrade.${c4.reset}`);
         return;
       }
-      tui.print(`${c3.gray}Applying\u2026${c3.reset}`);
+      tui.print(`${c4.gray}Applying\u2026${c4.reset}`);
       let applied;
       try {
         applied = await api.sessionsUpgrade(threadId, quote.sessions);
       } catch (e) {
-        tui.print(`${c3.red}\u2717${c3.reset} Upgrade failed: ${e instanceof Error ? e.message : String(e)}`);
+        tui.print(`${c4.red}\u2717${c4.reset} Upgrade failed: ${e instanceof Error ? e.message : String(e)}`);
         return;
       }
       if (!applied?.ok) {
-        tui.print(`${c3.red}\u2717${c3.reset} Upgrade failed: ${applied?.error ?? "unknown error"}`);
+        tui.print(`${c4.red}\u2717${c4.reset} Upgrade failed: ${applied?.error ?? "unknown error"}`);
         return;
       }
       const n = applied.sessions ?? quote.sessions;
-      tui.print(`${c3.green}\u2713${c3.reset} ${c3.bold}${gradientText(`You now have ${n} parallel session${n === 1 ? "" : "s"}.`)}${c3.reset}`);
+      tui.print(`${c4.green}\u2713${c4.reset} ${c4.bold}${gradientText(`You now have ${n} parallel session${n === 1 ? "" : "s"}.`)}${c4.reset}`);
       if (opts.auto && lastSent) {
-        tui.print(`${c3.gray}Continuing\u2026${c3.reset}`);
+        tui.print(`${c4.gray}Continuing\u2026${c4.reset}`);
         await sendNow(lastSent.text, lastSent.images, lastSent.refs);
       }
     } finally {
@@ -9217,7 +9770,7 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
   const submitComposer = async (text, images, steer) => {
     const draftRefs = mirroredDraftRefs;
     if (!sharedMessagingReady && (busy || steer || editingPendingId !== null)) {
-      tui.print(`${c3.dim}Restoring shared message state \u2014 try again in a moment.${c3.reset}`);
+      tui.print(`${c4.dim}Restoring shared message state \u2014 try again in a moment.${c4.reset}`);
       tui.setExternalAttachmentNames(draftRefs.map((attachment) => attachment.name));
       tui.setInput(text, images);
       return;
@@ -9240,7 +9793,7 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
       const item = sharedMessaging.pending.items.find((candidate) => candidate.id === pendingId);
       editingPendingId = null;
       if (!item) {
-        tui.print(`${c3.dim}That pending message was already dispatched or dismissed.${c3.reset}`);
+        tui.print(`${c4.dim}That pending message was already dispatched or dismissed.${c4.reset}`);
         return;
       }
       const updated = await editSharedPending(item, text, images, draftRefs);
@@ -9253,7 +9806,7 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
       return;
     }
     if (steer) {
-      tui.print(`${c3.yellow}\u21AA steering at the next safe model boundary:${c3.reset} ${text}`);
+      tui.print(`${c4.yellow}\u21AA steering at the next safe model boundary:${c4.reset} ${text}`);
       if (!await steerSharedInput(text, images, draftRefs)) {
         mirroredDraftRefs = draftRefs;
         tui.setExternalAttachmentNames(draftRefs.map((attachment) => attachment.name));
@@ -9263,7 +9816,7 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
     }
     if (busy) {
       if (await appendSharedPending(text, images, draftRefs)) {
-        tui.print(`${c3.gray}\u23F3 pending:${c3.reset} ${text}  ${c3.dim}(/queue to edit, steer, or dismiss)${c3.reset}`);
+        tui.print(`${c4.gray}\u23F3 pending:${c4.reset} ${text}  ${c4.dim}(/queue to edit, steer, or dismiss)${c4.reset}`);
       } else {
         mirroredDraftRefs = draftRefs;
         tui.setExternalAttachmentNames(draftRefs.map((attachment) => attachment.name));
@@ -9286,17 +9839,17 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
   tui.onInterrupt = () => {
     const firstPending = sharedMessaging.pending.items[0];
     if (!busy && firstPending) {
-      tui.print(`${c3.yellow}\u21AA steering the first pending message\u2026${c3.reset}`);
+      tui.print(`${c4.yellow}\u21AA steering the first pending message\u2026${c4.reset}`);
       void promoteSharedPending(firstPending);
       return;
     }
     if (busy) {
       if (!sharedMessagingReady) {
-        tui.print(`${c3.dim}Shared messaging is not connected; the session was not stopped.${c3.reset}`);
+        tui.print(`${c4.dim}Shared messaging is not connected; the session was not stopped.${c4.reset}`);
         return;
       }
       const advancing = sharedMessaging.pending.items.length > 0;
-      tui.print(`${c3.yellow}${advancing ? "[stopping; next pending message will run]" : "[stopping at the next safe boundary]"}${c3.reset}`);
+      tui.print(`${c4.yellow}${advancing ? "[stopping; next pending message will run]" : "[stopping at the next safe boundary]"}${c4.reset}`);
       void applySharedMutation(api.requestSharedStop(threadId, messagingOrigin));
     }
   };
@@ -9320,20 +9873,32 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
   void api.getGoal(threadId).then((g) => tui.setGoal(g)).catch(() => {
   });
   attaching.stop();
+  const header = `${c4.bold}${c4.magenta}Standard Code${c4.reset} ${c4.dim}\u2014 ${agentTitle}${c4.reset}`;
+  const remoteDaemonV = session.runner?.daemon?.version;
+  const owner = currentOwner;
+  let localOwnerDesc = ownsExecution ? "this terminal" : describeExecOwner(owner);
+  if (!remote && !ownsExecution && owner?.client_kind === "daemon") {
+    const selfRec = await loadMachine(api, session.identity.machine_id).catch(() => null);
+    if (selfRec?.daemon?.version) localOwnerDesc = `the daemon on this machine (v${selfRec.daemon.version})`;
+  }
+  const execLine = remote ? `${c4.gray}tool execution:${c4.reset} daemon${remoteDaemonV ? ` v${remoteDaemonV}` : ""} on ${runnerName}` : `${c4.gray}tool execution:${c4.reset} ${localOwnerDesc}`;
+  tui.setAgentLabel(agentTitle);
   tui.banner(
     remote ? [
-      `${c3.bold}${c3.magenta}Standard Code${c3.reset} ${c3.dim}\u2014 coding agent${c3.reset}`,
-      `${c3.gray}project:${c3.reset} ${session.remotePath ?? "?"} ${c3.teal}on ${runnerName}${c3.reset}`,
-      `${c3.gray}runs on:${c3.reset} ${runnerName} ${c3.dim}(daemon executes tools; you're watching from ${machine})${c3.reset}   ${c3.gray}thread:${c3.reset} ${threadId.slice(0, 8)}`
+      header,
+      `${c4.gray}project:${c4.reset} ${session.remotePath ?? "?"} ${c4.teal}on ${runnerName}${c4.reset}`,
+      `${c4.gray}machine:${c4.reset} ${runnerName}   ${c4.gray}thread:${c4.reset} ${threadId.slice(0, 8)}`,
+      execLine
     ] : [
-      `${c3.bold}${c3.magenta}Standard Code${c3.reset} ${c3.dim}\u2014 coding agent${c3.reset}`,
-      `${c3.gray}project:${c3.reset} ${projectDir}`,
-      `${c3.gray}machine:${c3.reset} ${machine}   ${c3.gray}thread:${c3.reset} ${threadId.slice(0, 8)}`
+      header,
+      `${c4.gray}project:${c4.reset} ${projectDir}`,
+      `${c4.gray}machine:${c4.reset} ${machine}   ${c4.gray}thread:${c4.reset} ${threadId.slice(0, 8)}`,
+      execLine
     ]
   );
   if (!remote && session.suggestDaemonInstall && process.platform !== "win32" && !serviceStatus().installed) {
     tui.print(
-      `${c3.dim}Tip: install the always-on daemon (${c3.reset}standardcode daemon install${c3.dim}) to start sessions on this machine from anywhere.${c3.reset}`
+      `${c4.dim}Tip: install the always-on daemon (${c4.reset}standardcode daemon install${c4.dim}) to start sessions on this machine from anywhere.${c4.reset}`
     );
   }
   if (resumed) await printHistory(api, threadId, tui);
@@ -9344,17 +9909,17 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
   const runningProcs = (await registry.list()).filter((p) => p.status === "running");
   if (runningProcs.length) {
     tui.print(
-      `${c3.cyan}\u2699 ${runningProcs.length} background process${runningProcs.length === 1 ? "" : "es"} running:${c3.reset}`
+      `${c4.cyan}\u2699 ${runningProcs.length} background process${runningProcs.length === 1 ? "" : "es"} running:${c4.reset}`
     );
-    for (const p of runningProcs) tui.print(`${c3.gray}  ${p.id}  ${p.description || p.command}${c3.reset}`);
+    for (const p of runningProcs) tui.print(`${c4.gray}  ${p.id}  ${p.description || p.command}${c4.reset}`);
   }
   refreshBgCount();
   if (exec && ownsExecution) {
     for (const res of await exec.connectEnabledMcpServers()) {
       if (res.ok) {
-        tui.print(`${c3.cyan}\u26A1 MCP "${res.name}" connected${c3.reset} ${c3.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c3.reset}`);
+        tui.print(`${c4.cyan}\u26A1 MCP "${res.name}" connected${c4.reset} ${c4.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c4.reset}`);
       } else {
-        tui.print(`${c3.red}\u26A0 MCP "${res.name}" failed:${c3.reset} ${c3.gray}${res.error}${c3.reset}`);
+        tui.print(`${c4.red}\u26A0 MCP "${res.name}" failed:${c4.reset} ${c4.gray}${res.error}${c4.reset}`);
       }
     }
   }
@@ -9370,8 +9935,8 @@ ${c3.gray}Close another session (its slot frees within ~90s), then resend your m
     try {
       const { choice, reason } = await tui.approval(
         `${request.summary}${request.permission ? `
-${c3.bold}why: ${request.permission}${c3.reset}` : ""}
-${c3.dim}runs on ${request.machine || runnerName}${c3.reset}`,
+${c4.bold}why: ${request.permission}${c4.reset}` : ""}
+${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
         request.risk
       );
       answeredApprovals.add(request.tool_call_id);
@@ -9422,7 +9987,7 @@ ${c3.dim}runs on ${request.machine || runnerName}${c3.reset}`,
         continue;
       }
       if (m.role === "assistant" && text) printAssistant(tui, text);
-      else if (m.role === "system" && text) tui.print(`${c3.dim}${text}${c3.reset}`);
+      else if (m.role === "system" && text) tui.print(`${c4.dim}${text}${c4.reset}`);
       else if (m.role === "user" && text) {
         const pending = pendingSent.get(text) ?? 0;
         if (pending > 0) {
@@ -9444,7 +10009,8 @@ ${c3.dim}runs on ${request.machine || runnerName}${c3.reset}`,
       activeSteps.clear();
       refreshStatus();
     }
-    busy = polledBusy;
+    if (polledBusy) optimisticBusyUntil = 0;
+    busy = polledBusy || Date.now() < optimisticBusyUntil;
     tui.setWorking(busy);
     if (!busy) {
       if (activeSteps.size) activeSteps.clear();
@@ -9515,16 +10081,16 @@ ${c3.dim}runs on ${request.machine || runnerName}${c3.reset}`,
   tui.setStep(null, 0);
   tui.setBackgroundCount(0);
   if (killed > 0) {
-    tui.print(`${c3.cyan}\u2699${c3.reset} Stopped ${killed} background process${killed === 1 ? "" : "es"}.`);
+    tui.print(`${c4.cyan}\u2699${c4.reset} Stopped ${killed} background process${killed === 1 ? "" : "es"}.`);
   }
-  tui.print(`${c3.dim}\u2500\u2500 conversation cleared \u2014 starting a fresh session \u2500\u2500${c3.reset}`);
+  tui.print(`${c4.dim}\u2500\u2500 conversation cleared \u2014 starting a fresh session \u2500\u2500${c4.reset}`);
 }
 async function runSkillsMenu(tui, skills) {
   let list;
   try {
     list = await skills.list();
   } catch (e) {
-    tui.print(`${c3.red}\u2717 couldn't load skills:${c3.reset} ${c3.gray}${e instanceof Error ? e.message : String(e)}${c3.reset}`);
+    tui.print(`${c4.red}\u2717 couldn't load skills:${c4.reset} ${c4.gray}${e instanceof Error ? e.message : String(e)}${c4.reset}`);
     return;
   }
   const INSTALL = "__install__";
@@ -9535,7 +10101,7 @@ async function runSkillsMenu(tui, skills) {
   }));
   items.push({ label: "\uFF0B Install a skill\u2026", hint: "find & install", value: INSTALL });
   const picked = await tui.select(
-    `${c3.bold}Agent skills${c3.reset}  ${c3.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c3.reset}`,
+    `${c4.bold}Agent skills${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c4.reset}`,
     items
   );
   if (!picked) return;
@@ -9548,8 +10114,8 @@ async function runSkillsMenu(tui, skills) {
     return;
   }
   const skill = list.find((s) => s.name === picked);
-  tui.print(`${c3.cyan}${skill.name}${c3.reset}${skill.version ? ` ${c3.dim}v${skill.version}${c3.reset}` : ""} ${c3.gray}\u2014 ${skill.description}${c3.reset}`);
-  const action = await tui.select(`${c3.bold}${picked}${c3.reset}`, [
+  tui.print(`${c4.cyan}${skill.name}${c4.reset}${skill.version ? ` ${c4.dim}v${skill.version}${c4.reset}` : ""} ${c4.gray}\u2014 ${skill.description}${c4.reset}`);
+  const action = await tui.select(`${c4.bold}${picked}${c4.reset}`, [
     skill.enabled ? { label: "Disable (hide from the agent)", value: "disable" } : { label: "Enable", value: "enable" },
     { label: "View files", value: "files" },
     { label: "Remove this skill", value: "remove" },
@@ -9558,20 +10124,20 @@ async function runSkillsMenu(tui, skills) {
   try {
     if (action === "enable" || action === "disable") {
       await skills.setEnabled(picked, action === "enable");
-      tui.print(`${c3.gray}${action}d ${picked}${c3.reset}`);
+      tui.print(`${c4.gray}${action}d ${picked}${c4.reset}`);
     } else if (action === "files") {
-      for (const f of skill.files) tui.print(`  ${c3.gray}${f}${c3.reset}`);
+      for (const f of skill.files) tui.print(`  ${c4.gray}${f}${c4.reset}`);
     } else if (action === "remove") {
       await skills.remove(picked);
-      tui.print(`${c3.gray}removed ${picked}${c3.reset}`);
+      tui.print(`${c4.gray}removed ${picked}${c4.reset}`);
     }
   } catch (e) {
-    tui.print(`${c3.red}\u2717 ${e instanceof Error ? e.message : String(e)}${c3.reset}`);
+    tui.print(`${c4.red}\u2717 ${e instanceof Error ? e.message : String(e)}${c4.reset}`);
   }
 }
 async function runLevelMenu(tui, perm) {
   const picked = await tui.select(
-    `${c3.bold}Auto-accept level${c3.reset}  ${c3.dim}(\u2191/\u2193 \xB7 enter \xB7 shift-tab cycles)${c3.reset}`,
+    `${c4.bold}Auto-accept level${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 shift-tab cycles)${c4.reset}`,
     LEVELS.map((l) => ({
       label: levelLabel(l),
       hint: l === tui.level ? "current" : "",
@@ -9588,16 +10154,16 @@ async function runMachinesMenu(tui, api, self) {
   try {
     machines = await loadMachines(api);
   } catch (e) {
-    tui.print(`${c3.red}\u2717 couldn't load machines:${c3.reset} ${c3.gray}${e instanceof Error ? e.message : String(e)}${c3.reset}`);
+    tui.print(`${c4.red}\u2717 couldn't load machines:${c4.reset} ${c4.gray}${e instanceof Error ? e.message : String(e)}${c4.reset}`);
     return;
   }
   if (!machines.length) {
-    tui.print(`${c3.gray}No machines registered yet. Run standardcode on a machine (or install its daemon) to register it.${c3.reset}`);
+    tui.print(`${c4.gray}No machines registered yet. Run standardcode on a machine (or install its daemon) to register it.${c4.reset}`);
     return;
   }
   machines.sort((a, b) => (b.updated_at ?? 0) - (a.updated_at ?? 0));
   const picked = await tui.select(
-    `${c3.bold}Your machines${c3.reset}  ${c3.dim}(\u2191/\u2193 \xB7 enter \xB7 esc)${c3.reset}`,
+    `${c4.bold}Your machines${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 esc)${c4.reset}`,
     machines.map((m) => {
       const isSelf = m.id === self.machine_id;
       const online = daemonOnline(m);
@@ -9631,26 +10197,26 @@ async function manageMachine(tui, api, self, machine) {
   options.push({ label: "Back", value: "back" });
   if (!isSelf && !machine.daemon) {
     tui.print(
-      `${c3.dim}${machine.name} has no daemon \u2014 you can rename it here; update and project changes need its daemon installed.${c3.reset}`
+      `${c4.dim}${machine.name} has no daemon \u2014 you can rename it here; update and project changes need its daemon installed.${c4.reset}`
     );
   } else if (!isSelf && machine.daemon && !online) {
     tui.print(
-      `${c3.dim}${machine.name}'s daemon is offline \u2014 queued changes apply when it next comes online.${c3.reset}`
+      `${c4.dim}${machine.name}'s daemon is offline \u2014 queued changes apply when it next comes online.${c4.reset}`
     );
   }
-  const action = await tui.select(`${c3.bold}${machineIcon(machine)}  ${machine.name}${c3.reset}`, options);
+  const action = await tui.select(`${c4.bold}${machineIcon(machine)}  ${machine.name}${c4.reset}`, options);
   if (!action || action === "back") return;
   if (action === "icon") {
     const current = machine.icon ?? "";
     const emoji = await tui.prompt(
-      `${c3.bold}Icon for ${machine.name}${c3.reset} ${c3.dim}(paste an emoji, blank to reset)${c3.reset}`,
+      `${c4.bold}Icon for ${machine.name}${c4.reset} ${c4.dim}(paste an emoji, blank to reset)${c4.reset}`,
       current
     );
     if (emoji !== null) {
       const trimmed = emoji.trim();
       await setMachineIcon(api, machine.id, trimmed);
       machine.icon = trimmed || void 0;
-      tui.print(`${c3.green}\u2713${c3.reset} icon ${trimmed ? `set to ${trimmed}` : "reset"} for ${machine.name}`);
+      tui.print(`${c4.green}\u2713${c4.reset} icon ${trimmed ? `set to ${trimmed}` : "reset"} for ${machine.name}`);
     }
     return manageMachine(tui, api, self, machine);
   }
@@ -9666,7 +10232,7 @@ async function manageMachine(tui, api, self, machine) {
     const name = await tui.prompt(`New name for ${machine.name}`, machine.name);
     if (name === null || !name.trim()) return;
     await setMachineName(api, machine.id, name.trim());
-    tui.print(`${c3.green}\u2713${c3.reset} Renamed ${c3.bold}${machine.name}${c3.reset} \u2192 ${c3.bold}${name.trim()}${c3.reset}.`);
+    tui.print(`${c4.green}\u2713${c4.reset} Renamed ${c4.bold}${machine.name}${c4.reset} \u2192 ${c4.bold}${name.trim()}${c4.reset}.`);
   } else if (action === "update") {
     if (isSelf) {
       await runUpdateCommand(tui);
@@ -9677,7 +10243,7 @@ async function manageMachine(tui, api, self, machine) {
       ]);
       if (go !== "yes") return;
       await dispatch("update");
-      tui.print(`${c3.green}\u2713${c3.reset} Update ${c3.gray}${applyNote} (its daemon updates and restarts on the new version).${c3.reset}`);
+      tui.print(`${c4.green}\u2713${c4.reset} Update ${c4.gray}${applyNote} (its daemon updates and restarts on the new version).${c4.reset}`);
     }
   } else if (action === "projects") {
     await manageMachineProjects(tui, api, self, machine, dispatch, applyNote);
@@ -9686,78 +10252,103 @@ async function manageMachine(tui, api, self, machine) {
 async function manageMachineProjects(tui, api, self, machine, dispatch, applyNote) {
   const ADD = "__add__";
   const paths = Object.keys(machine.projects).sort();
+  const projLabels = projectDisplayLabels(machine.projects);
   const picked = await tui.select(
-    `${c3.bold}Projects on ${machine.name}${c3.reset}  ${c3.dim}(enter to remove \xB7 esc)${c3.reset}`,
+    `${c4.bold}Projects on ${machine.name}${c4.reset}  ${c4.dim}(\u2191\u2193 \xB7 enter \xB7 esc)${c4.reset}`,
     [
-      ...paths.map((p) => ({ label: p, hint: "enter to remove", value: p })),
+      ...paths.map((p) => ({
+        label: projLabels.get(p) ?? projectDisplayName(p, machine.projects[p]),
+        detail: p,
+        value: p
+      })),
       { label: "\uFF0B Add a project directory\u2026", hint: "absolute path", value: ADD }
-    ]
+    ],
+    { spaced: true }
   );
   if (!picked) return;
   if (picked === ADD) {
-    const path15 = await tui.prompt(
-      `Absolute project path on ${machine.name}`,
-      machine.id === self.machine_id ? process.cwd() : "/home/you/project"
+    const isSelf = machine.id === self.machine_id;
+    const backend = isSelf ? localBrowseBackend(machine.name) : remoteBrowseBackend(api, machine.id, machine.name);
+    const chosen = await pickDirectory(tui, backend, {
+      startPath: isSelf ? process.cwd() : null,
+      loader: startLoader
+    });
+    if (!chosen) return;
+    await dispatch("add_project", { path: chosen });
+    tui.print(`${c4.green}\u2713${c4.reset} Add ${chosen} ${c4.gray}${applyNote}.${c4.reset}`);
+    return;
+  }
+  const project = machine.projects[picked];
+  const displayName = projectDisplayName(picked, project);
+  const action = await tui.select(`${c4.bold}${displayName}${c4.reset}  ${c4.dim}${shortenPath(picked, 48)}${c4.reset}`, [
+    { label: "Rename", hint: "display name only \u2014 the directory is untouched", value: "rename" },
+    { label: "Remove from this machine's projects", hint: "doesn't delete the directory", value: "remove" },
+    { label: "Back", value: "back" }
+  ]);
+  if (!action || action === "back") return;
+  if (action === "rename") {
+    const name = await tui.prompt(
+      `New name for ${displayName} (blank resets to the directory name)`,
+      displayName
     );
-    if (!path15 || !path15.trim()) return;
-    const trimmed = path15.trim();
-    if (!trimmed.startsWith("/") && !trimmed.startsWith("~")) {
-      tui.print(`${c3.yellow}Use an absolute path (starting with / or ~).${c3.reset}`);
-      return;
-    }
-    await dispatch("add_project", { path: trimmed });
-    tui.print(`${c3.green}\u2713${c3.reset} Add ${trimmed} ${c3.gray}${applyNote}.${c3.reset}`);
+    if (name === null) return;
+    await setProjectName(api, machine.id, picked, name);
+    const now = name.trim() || projectDisplayName(picked, null);
+    if (project) project.name = now;
+    tui.print(`${c4.green}\u2713${c4.reset} Renamed ${c4.bold}${displayName}${c4.reset} \u2192 ${c4.bold}${now}${c4.reset}.`);
   } else {
     await dispatch("remove_project", { path: picked });
-    tui.print(`${c3.green}\u2713${c3.reset} Remove ${picked} ${c3.gray}${applyNote}.${c3.reset}`);
+    tui.print(`${c4.green}\u2713${c4.reset} Remove ${picked} ${c4.gray}${applyNote}.${c4.reset}`);
   }
 }
 function showDaemonInfo(tui, session) {
   if (session.mode === "remote" && session.runner) {
     tui.print(
-      `${c3.gray}This session runs on${c3.reset} ${c3.bold}${session.runner.name}${c3.reset} ${c3.gray}(${session.runner.hostname}) \u2014 its daemon executes the tools.${c3.reset}`
+      `${c4.gray}This session runs on${c4.reset} ${c4.bold}${session.runner.name}${c4.reset} ${c4.gray}(${session.runner.hostname}) \u2014 its daemon executes the tools.${c4.reset}`
     );
   } else {
-    tui.print(`${c3.gray}This session runs on this machine.${c3.reset}`);
+    tui.print(`${c4.gray}This session runs on this machine.${c4.reset}`);
   }
   const status = serviceStatus();
   tui.print(
-    `${c3.gray}Daemon on this machine:${c3.reset} ${status.installed ? status.detail : "not installed"}`
+    `${c4.gray}Daemon on this machine:${c4.reset} ${status.installed ? status.detail : "not installed"}`
   );
   if (!status.installed) {
     tui.print(
-      `${c3.gray}Install it to start sessions on this machine from anywhere:${c3.reset} ${c3.bold}standardcode daemon install${c3.reset}`
+      `${c4.gray}Install it to start sessions on this machine from anywhere:${c4.reset} ${c4.bold}standardcode daemon install${c4.reset}`
     );
     tui.print(
-      `${c3.dim}The daemon keeps running after you close the terminal \u2014 it self-restarts, self-updates, and executes sessions you start from other machines.${c3.reset}`
+      `${c4.dim}The daemon keeps running after you close the terminal \u2014 it self-restarts, self-updates, and executes sessions you start from other machines.${c4.reset}`
     );
   } else {
-    tui.print(`${c3.dim}Manage it with standardcode daemon status | uninstall | add-project <path>.${c3.reset}`);
+    tui.print(`${c4.dim}Manage it with standardcode daemon status | uninstall | add-project <path>.${c4.reset}`);
   }
 }
 function showKeybindings(tui) {
-  tui.print(`${c3.gray}shortcuts:${c3.reset}`);
-  tui.print(`${c3.gray}  shift-tab${c3.reset}  cycle auto-accept level (1\u20135)`);
-  tui.print(`${c3.gray}  /${c3.reset}          open the command palette (type to filter)`);
-  tui.print(`${c3.gray}  !cmd${c3.reset}       run a shell command on the session's machine (e.g. !ls); !! to send a literal !`);
-  tui.print(`${c3.gray}  ctrl-v${c3.reset}     paste an image from the clipboard ([#Image 1])`);
-  tui.print(`${c3.gray}  \u2191 / \u2193${c3.reset}      cycle past messages (on the input's top line)`);
-  tui.print(`${c3.gray}  \u2190${c3.reset}          from the start of the input: select the [\u2699 n bg] badge (enter opens it)`);
-  tui.print(`${c3.gray}  ctrl-c${c3.reset}     quit`);
+  tui.print(`${c4.gray}shortcuts:${c4.reset}`);
+  tui.print(`${c4.gray}  shift-tab${c4.reset}  cycle auto-accept level (1\u20135)`);
+  tui.print(`${c4.gray}  shift-\u23CE${c4.reset}    insert a newline (multiline input)`);
+  tui.print(`${c4.gray}  option-\u23CE${c4.reset}   steer the working agent at the next safe boundary`);
+  tui.print(`${c4.gray}  /${c4.reset}          open the command palette (type to filter)`);
+  tui.print(`${c4.gray}  !cmd${c4.reset}       run a shell command on the session's machine (e.g. !ls); !! to send a literal !`);
+  tui.print(`${c4.gray}  ctrl-v${c4.reset}     paste an image from the clipboard ([#Image 1])`);
+  tui.print(`${c4.gray}  \u2191 / \u2193${c4.reset}      cycle past messages (on the input's top line)`);
+  tui.print(`${c4.gray}  \u2190${c4.reset}          from the start of the input: select the [\u2699 n bg] badge (enter opens it)`);
+  tui.print(`${c4.gray}  ctrl-c${c4.reset}     quit`);
 }
 async function runUpdateCommand(tui) {
   const version = readVersion();
   const result = await forceCheckForUpdate(version);
   if (!result) {
-    tui.print(`${c3.green}\u2713${c3.reset} ${c3.gray}@standardagents/code${c3.reset} is up to date (v${version})`);
+    tui.print(`${c4.green}\u2713${c4.reset} ${c4.gray}@standardagents/code${c4.reset} is up to date (v${version})`);
     return;
   }
   const { latest } = result;
   tui.print(`
-  ${c3.yellow}\u27F3${c3.reset} Update available: ${c3.gray}v${version}${c3.reset} \u2192 ${c3.green}v${latest}${c3.reset}`);
+  ${c4.yellow}\u27F3${c4.reset} Update available: ${c4.gray}v${version}${c4.reset} \u2192 ${c4.green}v${latest}${c4.reset}`);
   const pm = detectPackageManager();
   if (!pm) {
-    tui.print(`  ${c3.gray}This is a source checkout \u2014 pull the repo to update.${c3.reset}`);
+    tui.print(`  ${c4.gray}This is a source checkout \u2014 pull the repo to update.${c4.reset}`);
     return;
   }
   const { display } = updateCommand(pm);
@@ -9766,28 +10357,28 @@ async function runUpdateCommand(tui) {
     { label: "No, skip", value: "no" }
   ]);
   if (choice === "yes") {
-    tui.print(`  ${c3.gray}Running ${display}\u2026${c3.reset}`);
+    tui.print(`  ${c4.gray}Running ${display}\u2026${c4.reset}`);
     const { ok, output: pmOutput } = await runUpdate(pm);
     if (ok) {
-      tui.print(`  ${c3.green}\u2713${c3.reset} Updated to v${latest}. Restart to use the new version.`);
+      tui.print(`  ${c4.green}\u2713${c4.reset} Updated to v${latest}. Restart to use the new version.`);
     } else {
-      tui.print(`  ${c3.red}\u2717${c3.reset} Update failed:`);
+      tui.print(`  ${c4.red}\u2717${c4.reset} Update failed:`);
       for (const line of pmOutput.trim().split("\n").slice(-6)) {
-        tui.print(`  ${c3.dim}${line}${c3.reset}`);
+        tui.print(`  ${c4.dim}${line}${c4.reset}`);
       }
     }
   } else {
-    tui.print(`  ${c3.gray}Skipped. Run /update later.${c3.reset}`);
+    tui.print(`  ${c4.gray}Skipped. Run /update later.${c4.reset}`);
   }
 }
 async function runProcessMenu(tui, bg) {
   const procs = await bg.list();
   if (!procs.length) {
-    tui.print(`${c3.gray}No background processes for this session.${c3.reset}`);
+    tui.print(`${c4.gray}No background processes for this session.${c4.reset}`);
     return;
   }
   const items = procs.map((p) => {
-    const status = p.status === "running" ? `${c3.green}running${c3.reset}` : `${c3.gray}${p.status}${typeof p.exitCode === "number" ? ` (exit ${p.exitCode})` : ""}${c3.reset}`;
+    const status = p.status === "running" ? `${c4.green}running${c4.reset}` : `${c4.gray}${p.status}${typeof p.exitCode === "number" ? ` (exit ${p.exitCode})` : ""}${c4.reset}`;
     return {
       label: `${p.description || p.command}`,
       hint: `${p.id} \xB7 ${status}`,
@@ -9795,22 +10386,22 @@ async function runProcessMenu(tui, bg) {
     };
   });
   const picked = await tui.select(
-    `${c3.bold}Background processes${c3.reset}  ${c3.dim}(\u2191/\u2193 \xB7 enter to manage \xB7 esc to close)${c3.reset}`,
+    `${c4.bold}Background processes${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter to manage \xB7 esc to close)${c4.reset}`,
     items
   );
   if (!picked) return;
   const proc = procs.find((p) => p.id === picked);
   if (!proc || proc.status !== "running") {
-    tui.print(`${c3.gray}${picked} is not running.${c3.reset}`);
+    tui.print(`${c4.gray}${picked} is not running.${c4.reset}`);
     return;
   }
-  const action = await tui.select(`${c3.bold}${proc.description || proc.command}${c3.reset}`, [
+  const action = await tui.select(`${c4.bold}${proc.description || proc.command}${c4.reset}`, [
     { label: "Stop this process", value: "stop" },
     { label: "Leave it running", value: "leave" }
   ]);
   if (action === "stop") {
     await bg.stop(picked);
-    tui.print(`${c3.gray}stopped ${picked}${c3.reset}`);
+    tui.print(`${c4.gray}stopped ${picked}${c4.reset}`);
   }
 }
 async function runApprovalsMenu(tui, perm, save) {
@@ -9818,7 +10409,7 @@ async function runApprovalsMenu(tui, perm, save) {
   const risks = Array.from(perm.allowRisk).sort((a, b) => a - b);
   if (!tools.length && !risks.length) {
     tui.print(
-      `${c3.gray}No pre-approved commands. At a permission prompt, choose "Always allow this tool" or "Allow all level N" to add some.${c3.reset}`
+      `${c4.gray}No pre-approved commands. At a permission prompt, choose "Always allow this tool" or "Allow all level N" to add some.${c4.reset}`
     );
     return;
   }
@@ -9828,22 +10419,22 @@ async function runApprovalsMenu(tui, perm, save) {
     { label: "Clear all approvals", hint: "", value: "clear" }
   ];
   const picked = await tui.select(
-    `${c3.bold}Approved commands${c3.reset}  ${c3.dim}(enter to revoke \xB7 esc to close)${c3.reset}`,
+    `${c4.bold}Approved commands${c4.reset}  ${c4.dim}(enter to revoke \xB7 esc to close)${c4.reset}`,
     items
   );
   if (!picked) return;
   if (picked === "clear") {
     perm.alwaysAllow.clear();
     perm.allowRisk.clear();
-    tui.print(`${c3.gray}cleared all approvals${c3.reset}`);
+    tui.print(`${c4.gray}cleared all approvals${c4.reset}`);
   } else if (picked.startsWith("tool:")) {
     const t = picked.slice(5);
     perm.alwaysAllow.delete(t);
-    tui.print(`${c3.gray}revoked tool ${t}${c3.reset}`);
+    tui.print(`${c4.gray}revoked tool ${t}${c4.reset}`);
   } else if (picked.startsWith("risk:")) {
     const r = Number(picked.slice(5));
     perm.allowRisk.delete(r);
-    tui.print(`${c3.gray}revoked level ${r}${c3.reset}`);
+    tui.print(`${c4.gray}revoked level ${r}${c4.reset}`);
   }
   save();
 }
@@ -9861,7 +10452,7 @@ async function runMcpMenu(tui, mcp) {
   items.push({ label: "\uFF0B Install a new MCP server\u2026", hint: "find & install", value: INSTALL });
   items.push({ label: "Add manually (name: command)\u2026", hint: "advanced", value: ADD_MANUAL });
   const picked = await tui.select(
-    `${c3.bold}MCP servers${c3.reset}  ${c3.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c3.reset}`,
+    `${c4.bold}MCP servers${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c4.reset}`,
     items
   );
   if (!picked) return;
@@ -9875,7 +10466,7 @@ async function runMcpMenu(tui, mcp) {
   }
   const server = configured.find((s) => s.name === picked);
   const isConnected = connected.has(picked);
-  const action = await tui.select(`${c3.bold}${picked}${c3.reset}`, [
+  const action = await tui.select(`${c4.bold}${picked}${c4.reset}`, [
     { label: "View tools", value: "tools" },
     isConnected ? { label: "Disconnect", value: "disconnect" } : { label: "Connect", value: "connect" },
     server.enabled ? { label: "Disable (don't auto-connect)", value: "disable" } : { label: "Enable (auto-connect on start)", value: "enable" },
@@ -9885,29 +10476,29 @@ async function runMcpMenu(tui, mcp) {
   if (action === "tools") {
     const entry = mcp.catalog().servers.find((e) => e.name === picked);
     if (!entry || entry.status !== "connected") {
-      tui.print(`${c3.gray}${picked} is not connected \u2014 connect it to list tools.${c3.reset}`);
+      tui.print(`${c4.gray}${picked} is not connected \u2014 connect it to list tools.${c4.reset}`);
       return;
     }
-    if (!entry.tools.length) tui.print(`${c3.gray}${picked} exposes no tools.${c3.reset}`);
-    for (const t of entry.tools) tui.print(`  ${c3.cyan}${t.name}${c3.reset}${t.description ? ` ${c3.gray}\u2014 ${t.description}${c3.reset}` : ""}`);
-    if (entry.resources.length) tui.print(`  ${c3.gray}${entry.resources.length} resource(s)${c3.reset}`);
+    if (!entry.tools.length) tui.print(`${c4.gray}${picked} exposes no tools.${c4.reset}`);
+    for (const t of entry.tools) tui.print(`  ${c4.cyan}${t.name}${c4.reset}${t.description ? ` ${c4.gray}\u2014 ${t.description}${c4.reset}` : ""}`);
+    if (entry.resources.length) tui.print(`  ${c4.gray}${entry.resources.length} resource(s)${c4.reset}`);
   } else if (action === "connect") {
     const res = await mcp.connect(server);
-    tui.print(res.ok ? `${c3.cyan}\u26A1 connected (${res.tools} tools)${c3.reset}` : `${c3.red}\u26A0 ${res.error}${c3.reset}`);
+    tui.print(res.ok ? `${c4.cyan}\u26A1 connected (${res.tools} tools)${c4.reset}` : `${c4.red}\u26A0 ${res.error}${c4.reset}`);
   } else if (action === "disconnect") {
     mcp.disconnect(picked);
-    tui.print(`${c3.gray}disconnected ${picked}${c3.reset}`);
+    tui.print(`${c4.gray}disconnected ${picked}${c4.reset}`);
   } else if (action === "enable") {
     mcp.setEnabled(picked, true);
     const res = await mcp.connect(server);
-    tui.print(res.ok ? `${c3.cyan}\u26A1 enabled + connected (${res.tools} tools)${c3.reset}` : `${c3.red}\u26A0 enabled but failed: ${res.error}${c3.reset}`);
+    tui.print(res.ok ? `${c4.cyan}\u26A1 enabled + connected (${res.tools} tools)${c4.reset}` : `${c4.red}\u26A0 enabled but failed: ${res.error}${c4.reset}`);
   } else if (action === "disable") {
     mcp.setEnabled(picked, false);
     mcp.disconnect(picked);
-    tui.print(`${c3.gray}disabled + disconnected ${picked}${c3.reset}`);
+    tui.print(`${c4.gray}disabled + disconnected ${picked}${c4.reset}`);
   } else if (action === "remove") {
     mcp.remove(picked);
-    tui.print(`${c3.gray}removed ${picked}${c3.reset}`);
+    tui.print(`${c4.gray}removed ${picked}${c4.reset}`);
   }
 }
 async function addMcpServer(tui, mcp) {
@@ -9918,13 +10509,13 @@ async function addMcpServer(tui, mcp) {
   if (!spec) return;
   const cfg = parseServerSpec(spec);
   if (!cfg) {
-    tui.print(`${c3.yellow}couldn't parse that. Use  name: command [args]${c3.reset}`);
+    tui.print(`${c4.yellow}couldn't parse that. Use  name: command [args]${c4.reset}`);
     return;
   }
-  tui.print(`${c3.gray}connecting MCP "${cfg.name}" (${cfg.command} ${cfg.args.join(" ")})\u2026${c3.reset}`);
+  tui.print(`${c4.gray}connecting MCP "${cfg.name}" (${cfg.command} ${cfg.args.join(" ")})\u2026${c4.reset}`);
   const res = await mcp.add(cfg);
-  if (res.ok) tui.print(`${c3.cyan}\u26A1 MCP "${cfg.name}" connected${c3.reset} ${c3.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c3.reset}`);
-  else tui.print(`${c3.red}\u26A0 MCP "${cfg.name}" failed:${c3.reset} ${c3.gray}${res.error}${c3.reset} ${c3.dim}(saved; retry from the MCP menu)${c3.reset}`);
+  if (res.ok) tui.print(`${c4.cyan}\u26A1 MCP "${cfg.name}" connected${c4.reset} ${c4.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c4.reset}`);
+  else tui.print(`${c4.red}\u26A0 MCP "${cfg.name}" failed:${c4.reset} ${c4.gray}${res.error}${c4.reset} ${c4.dim}(saved; retry from the MCP menu)${c4.reset}`);
 }
 async function installMcpServerFlow(tui, mcp) {
   const query = await tui.prompt(