@standardagents/code 0.11.5 → 0.11.7

package/dist/index.js

@@ -135,6 +135,36 @@ function parseSharedMessagingSnapshot(value) {
     }
   };
 }
+function parseComposerDraft(value) {
+  const draft = record(value);
+  if (!draft || draft.version !== 1 || typeof draft.content !== "string") {
+    throw new TypeError("unsupported or malformed shared draft");
+  }
+  return {
+    version: 1,
+    revision: finiteNumber(draft.revision, "draft revision"),
+    content: draft.content,
+    attachments: attachments(draft.attachments),
+    updatedAt: finiteNumber(draft.updatedAt, "draft updatedAt"),
+    ...origin(draft)
+  };
+}
+function parseMessagingChangedEvent(value) {
+  const event = record(value);
+  if (!event || event.version !== 1) return null;
+  try {
+    return {
+      version: 1,
+      pendingRevision: finiteNumber(event.pendingRevision, "event pending revision"),
+      draftRevision: finiteNumber(event.draftRevision, "event draft revision"),
+      ...event.draft !== void 0 ? { draft: parseComposerDraft(event.draft) } : {},
+      ...event.draftOmitted === true ? { draftOmitted: true } : {},
+      ...origin(event)
+    };
+  } catch {
+    return null;
+  }
+}
 
 // src/api.ts
 var ApiHttpError = class extends Error {
@@ -1565,8 +1595,9 @@ var Bridge = class {
     } finally {
       this.hooks.onStatus?.(callKey, null);
     }
-    if (req.durable && req.toolCallId) {
-      this.ledger.record(req.toolCallId, {
+    const ledgerKey = req.toolCallId ?? req.id;
+    if (ledgerKey) {
+      this.ledger.record(ledgerKey, {
         ok: result.ok,
         result: result.ok ? result.result ?? "" : void 0,
         error: result.ok ? void 0 : result.error
@@ -2689,7 +2720,7 @@ var McpManager = class {
     }
   }
   closeAll() {
-    for (const [, c5] of this.clients) c5.close();
+    for (const [, c6] of this.clients) c6.close();
     this.clients.clear();
   }
   get(name) {
@@ -2700,13 +2731,13 @@ var McpManager = class {
   }
   toolCount() {
     let n = 0;
-    for (const [, c5] of this.clients) n += c5.tools.length;
+    for (const [, c6] of this.clients) n += c6.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((c5) => c5.catalogEntry()),
+      servers: Array.from(this.clients.values()).map((c6) => c6.catalogEntry()),
       generatedAt: Date.now()
     };
   }
@@ -2796,9 +2827,9 @@ function flattenContent(content, structured) {
 }
 function flattenResourceContents(contents) {
   const parts = [];
-  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)]`);
+  for (const c6 of contents || []) {
+    if (typeof c6.text === "string") parts.push(c6.text);
+    else if (typeof c6.blob === "string") parts.push(`[binary resource ${String(c6.uri ?? "")} (${c6.blob.length} b64 chars)]`);
   }
   return parts.join("\n").trim();
 }
@@ -3299,6 +3330,7 @@ function parseToolCalls(message) {
 var EMPTY_BOUNDARY_STALE_MS = 15e4;
 var WAITING_FOR_CLIENT_MARKER = "Waiting for your machine to reconnect";
 var PENDING_TAIL_STALE_MS = 10 * 6e4;
+var FORWARDED_TOOL_STALE_MS = 6.5 * 6e4;
 var BUSY_TAIL_STALE_MS = 30 * 6e4;
 function toMs(raw) {
   return raw > 1e14 ? raw / 1e3 : raw < 1e12 ? raw * 1e3 : raw;
@@ -3328,7 +3360,17 @@ function deriveSessionActivity(messages, nowMs = Date.now()) {
     return { busy: true, currentTool: { ...tool ?? { id: last.tool_call_id ?? "", name: "forwarded", arguments: {} }, waitingForHost: true } };
   }
   const currentTool = unresolvedTool(visible);
-  if (currentTool) return { busy: true, currentTool };
+  if (currentTool) {
+    const carrier = [...visible].reverse().find((message) => {
+      const raw = message.tool_calls;
+      return typeof raw === "string" && raw.includes(currentTool.id);
+    });
+    const carrierMs = carrier ? toMs(createdAt(carrier)) : 0;
+    if (carrierMs > 0 && nowMs - carrierMs > FORWARDED_TOOL_STALE_MS) {
+      return { busy: false, currentTool: null, stalled: true };
+    }
+    return { busy: true, currentTool };
+  }
   if (last.role === "user" || last.role === "tool") {
     const lastMs = toMs(createdAt(last));
     if (lastMs > 0 && nowMs - lastMs > BUSY_TAIL_STALE_MS) {
@@ -3837,17 +3879,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 c5 = 0; c5 < cols2; c5++) {
-    widths[c5] = Math.max(...rows.map((r) => visibleWidth(inline(r[c5] ?? ""))));
+  for (let c6 = 0; c6 < cols2; c6++) {
+    widths[c6] = Math.max(...rows.map((r) => visibleWidth(inline(r[c6] ?? ""))));
   }
   const sep = `${GRAY} \u2502 ${R}`;
   const out = [];
   rows.forEach((r, ri) => {
     const cells = [];
-    for (let c5 = 0; c5 < cols2; c5++) {
-      const raw = r[c5] ?? "";
+    for (let c6 = 0; c6 < cols2; c6++) {
+      const raw = r[c6] ?? "";
       const styled = ri === 0 ? `${BOLD}${inline(raw)}${R}` : inline(raw);
-      cells.push(padEndVisible(styled, widths[c5]));
+      cells.push(padEndVisible(styled, widths[c6]));
     }
     out.push(("  " + cells.join(sep)).replace(/\s+$/, ""));
     if (ri === 0) {
@@ -4319,7 +4361,7 @@ function buildInputBoxRows(opts) {
     let di = 0;
     for (let ci = 0; ci < plainChars.length; ci++) {
       const ch = plainChars[ci];
-      const c5 = colorAt(perimeterIndex("top", xi++, W, bodyH));
+      const c6 = colorAt(perimeterIndex("top", xi++, W, bodyH));
       if (ci >= agentSpanStart && ci < agentSpanEnd) {
         top += `\x1B[2m${themeGray}${ch}\x1B[0m`;
         continue;
@@ -4328,9 +4370,9 @@ function buildInputBoxRows(opts) {
         const levelN = Math.max(1, Math.min(5, level));
         const filled = di < levelN;
         di++;
-        top += (filled ? levelColor || c5 : "\x1B[38;5;240m") + (filled ? "\u25CF" : "\u25CB") + reset;
+        top += (filled ? levelColor || c6 : "\x1B[38;5;240m") + (filled ? "\u25CF" : "\u25CB") + reset;
       } else {
-        top += c5 + ch + reset;
+        top += c6 + ch + reset;
       }
     }
   }
@@ -4351,10 +4393,10 @@ function buildInputBoxRows(opts) {
   let bottom = "";
   for (let x = 0; x < W; x++) {
     const idx = perimeterIndex("bottom", W - 1 - x, W, bodyH);
-    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;
+    const c6 = colorAt(idx);
+    if (x === 0) bottom += c6 + "\u2570" + reset;
+    else if (x === W - 1) bottom += c6 + "\u256F" + reset;
+    else bottom += c6 + "\u2500" + reset;
   }
   return [pad + top, ...bodyRows, pad + bottom];
 }
@@ -4464,7 +4506,7 @@ var Tui = class _Tui {
   // The `[⚙ n bg]` prompt badge can be selected with ← from the start of the
   // input (rendered inverted); Enter then opens the background-process panel.
   bgBadgeSelected = false;
-  queuedCount = 0;
+  queuedMessages = [];
   subagents = [];
   // active subagents (one line each)
   subagentColorByID = /* @__PURE__ */ new Map();
@@ -5089,7 +5131,7 @@ var Tui = class _Tui {
     const q = this.inputBuffer.slice(1).trim().toLowerCase();
     if (q === "") return this.commands;
     return this.commands.filter(
-      (c5) => c5.name.startsWith(q) || c5.name.includes(q) || c5.label.toLowerCase().includes(q)
+      (c6) => c6.name.startsWith(q) || c6.name.includes(q) || c6.label.toLowerCase().includes(q)
     );
   }
   runCommand(cmd) {
@@ -5139,11 +5181,10 @@ var Tui = class _Tui {
   }
   /** The prompt line prefix (with ANSI colour) that precedes the typed text. */
   promptPrefix() {
-    const q = this.queuedCount > 0 ? `${C.yellow}[\u23F3 ${this.queuedCount} queued]${C.reset} ` : "";
     const attachments2 = this.externalAttachmentNames.length > 0 ? `${C.gray}[\u{1F4CE} ${this.externalAttachmentNames.length}]${C.reset} ` : "";
     const bgText = `[\u2699 ${this.bgCount} bg]`;
     const bg = this.bgCount > 0 ? this.bgBadgeSelected ? `${C.cyan}\x1B[7m${bgText}\x1B[27m${C.reset} ` : `${C.cyan}${bgText}${C.reset} ` : "";
-    return `${q}${attachments2}${bg}${this.levelColor()}\u276F${C.reset} `;
+    return `${attachments2}${bg}${this.levelColor()}\u276F${C.reset} `;
   }
   visibleWidth(s) {
     let w = 0;
@@ -5331,6 +5372,13 @@ var Tui = class _Tui {
     }
     const goalLines = this.goalLines(workCols);
     for (const line of goalLines) writeHudRow(workPad + line);
+    for (const [i, text] of this.queuedMessages.entries()) {
+      const hint = i === 0 ? `  ${C.dim}esc to steer \xB7 /queue to edit${C.reset}` : "";
+      const budget = workCols - 3 - (i === 0 ? 30 : 0);
+      let msg = text.replace(/\s+/g, " ").trim();
+      if (budget > 1 && msg.length > budget) msg = msg.slice(0, budget - 1) + "\u2026";
+      writeHudRow(workPad + `${C.yellow}\u23F3${C.reset} ${C.gray}${msg}${C.reset}${hint}`);
+    }
     const prefix = this.promptPrefix();
     const pw = this.visibleWidth(prefix);
     const borderAnimating = this.working;
@@ -5684,9 +5732,9 @@ var Tui = class _Tui {
     if (n === 0) this.bgBadgeSelected = false;
     this.renderBottom();
   }
-  setQueuedCount(n) {
-    if (n === this.queuedCount) return;
-    this.queuedCount = n;
+  setQueuedMessages(texts) {
+    if (texts.length === this.queuedMessages.length && texts.every((t, i) => t === this.queuedMessages[i])) return;
+    this.queuedMessages = texts;
     this.renderBottom();
   }
   setConnected(connected) {
@@ -6442,7 +6490,7 @@ function readVersion() {
     if (typeof pkg.version === "string" && pkg.version) return pkg.version;
   } catch {
   }
-  return "0.11.5" ;
+  return "0.11.7" ;
 }
 function isLocalHost(host) {
   return host === "localhost" || host === "127.0.0.1" || host === "::1" || host.endsWith(".local") || host.endsWith(".localhost") || /^10\./.test(host) || /^192\.168\./.test(host) || /^172\.(1[6-9]|2\d|3[01])\./.test(host);
@@ -6801,7 +6849,7 @@ async function clearDaemon(api, identity) {
 function parseCommands(value) {
   if (!Array.isArray(value)) return [];
   return value.filter(
-    (c5) => !!c5 && typeof c5 === "object" && typeof c5.id === "string" && typeof c5.kind === "string"
+    (c6) => !!c6 && typeof c6 === "object" && typeof c6.id === "string" && typeof c6.kind === "string"
   );
 }
 async function enqueueMachineCommand(api, machineId, kind, args) {
@@ -6824,7 +6872,7 @@ async function clearMachineCommands(api, machineId, appliedIds) {
   if (appliedIds.length === 0) return;
   const key = commandKey(machineId);
   const remaining = parseCommands(await api.userKvGet(key)).filter(
-    (c5) => !appliedIds.includes(c5.id)
+    (c6) => !appliedIds.includes(c6.id)
   );
   await api.userKvSet(key, remaining.length ? remaining : null);
 }
@@ -7210,7 +7258,7 @@ var HubSocket = class {
   }
   openSocket() {
     if (this.closed) return;
-    let url = `${this.api.wsEndpoint}/api/users/me/hub?token=${encodeURIComponent(this.api.bearer)}&client_id=${encodeURIComponent(this.clientId)}&client_kind=daemon`;
+    let url = `${this.api.wsEndpoint}/api/users/me/stream?token=${encodeURIComponent(this.api.bearer)}&client_id=${encodeURIComponent(this.clientId)}&client_kind=daemon`;
     if (this.clientName) url += `&client_name=${encodeURIComponent(this.clientName)}`;
     let ws;
     try {
@@ -7239,8 +7287,15 @@ var HubSocket = class {
     } catch {
       return;
     }
-    if (msg && typeof msg === "object" && msg.type === "wake" && typeof msg.threadId === "string") {
-      this.hooks.onWake(msg.threadId);
+    if (!msg || typeof msg !== "object") return;
+    const frame = msg;
+    if (frame.event === "standardagents.wake") {
+      const threadId = frame.data?.thread_id;
+      if (typeof threadId === "string") this.hooks.onWake(threadId);
+      return;
+    }
+    if (frame.type === "wake" && typeof frame.threadId === "string") {
+      this.hooks.onWake(frame.threadId);
     }
   }
   handleDrop(ws) {
@@ -8285,8 +8340,127 @@ async function runDaemonCommand(argv) {
   }
 }
 
-// src/index.ts
+// src/auth-cli.ts
 var c4 = {
+  reset: "\x1B[0m",
+  dim: "\x1B[2m",
+  bold: "\x1B[1m",
+  green: "\x1B[32m",
+  red: "\x1B[31m",
+  teal: "\x1B[38;5;43m"
+};
+function parseAuthArgs(argv) {
+  let endpoint = null;
+  let token = null;
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (arg === "--endpoint" || arg === "-e") {
+      endpoint = argv[++i] ?? "";
+      if (!endpoint) throw new Error("--endpoint requires a URL");
+    } else if (arg.startsWith("--endpoint=")) {
+      endpoint = arg.slice("--endpoint=".length);
+    } else if (arg === "--token") {
+      token = argv[++i] ?? "";
+      if (!token) throw new Error("--token requires a value");
+    } else if (arg.startsWith("--token=")) {
+      token = arg.slice("--token=".length);
+    } else {
+      throw new Error(`Unknown option for login/logout: ${arg}`);
+    }
+  }
+  const endpointExplicit = endpoint !== null;
+  const resolved = normalizeEndpoint(endpoint ?? defaultEndpoint() ?? PRODUCTION_ENDPOINT);
+  return { endpoint: resolved, endpointExplicit, token };
+}
+function hostLabel(endpoint) {
+  return endpoint.replace(/^https?:\/\//, "").replace(/\/$/, "");
+}
+async function signedInLabel(endpoint, token) {
+  try {
+    const res = await fetch(`${endpoint}/api/auth/me`, {
+      headers: { Authorization: `Bearer ${token}` },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok) return null;
+    const body = await res.json();
+    return body.user?.email || body.user?.username || null;
+  } catch {
+    return null;
+  }
+}
+async function runAuthCommand(command, argv) {
+  let args;
+  try {
+    args = parseAuthArgs(argv);
+  } catch (error) {
+    process.stdout.write(`${c4.red}error:${c4.reset} ${error instanceof Error ? error.message : String(error)}
+`);
+    process.stdout.write(`${c4.dim}usage: standardcode ${command} [--endpoint <url>]${command === "login" ? " [--token <key>]" : ""}${c4.reset}
+`);
+    process.exitCode = 1;
+    return;
+  }
+  const host = hostLabel(args.endpoint);
+  relaxTlsForLocalEndpoint(args.endpoint);
+  const existing = getCredential(args.endpoint);
+  if (command === "logout") {
+    if (!existing) {
+      process.stdout.write(`You're not signed in to ${c4.teal}${host}${c4.reset} \u2014 nothing to do.
+`);
+      return;
+    }
+    deleteCredential(args.endpoint);
+    process.stdout.write(`${c4.green}\u2713${c4.reset} Signed out of ${c4.teal}${host}${c4.reset}.
+`);
+    process.stdout.write(`${c4.dim}Run \`standardcode login\` to sign in again \u2014 with any account.${c4.reset}
+`);
+    return;
+  }
+  if (existing) {
+    const who2 = await signedInLabel(args.endpoint, existing.access_token);
+    process.stdout.write(
+      `${c4.dim}Currently signed in to ${host}${who2 ? ` as ${who2}` : ""} \u2014 replacing that sign-in.${c4.reset}
+`
+    );
+  }
+  let token = args.token;
+  if (!token) {
+    process.stdout.write(`${c4.bold}Sign in to Standard Code${c4.reset}
+`);
+    if (`https://${host}` !== PRODUCTION_ENDPOINT && `http://${host}` !== PRODUCTION_ENDPOINT) {
+      process.stdout.write(`${c4.dim}Connecting to${c4.reset} ${c4.teal}${host}${c4.reset}
+`);
+    }
+    try {
+      token = await deviceLogin(args.endpoint);
+    } catch (error) {
+      process.stdout.write(`${c4.red}\u2717${c4.reset} ${error instanceof Error ? error.message : String(error)}
+`);
+      process.exitCode = 1;
+      return;
+    }
+  }
+  const api = new ApiClient(args.endpoint, token);
+  const check = await api.verifyDetailed();
+  if (!check.ok) {
+    process.stdout.write(`${c4.red}\u2717${c4.reset} Sign-in didn't verify: ${check.reason}
+`);
+    if (check.hint) process.stdout.write(`  ${c4.dim}${check.hint}${c4.reset}
+`);
+    process.exitCode = 1;
+    return;
+  }
+  saveCredential(
+    { endpoint: args.endpoint, access_token: token, token_type: "Bearer", saved_at: Date.now() },
+    { updateDefault: !args.endpointExplicit }
+  );
+  const who = await signedInLabel(args.endpoint, token);
+  process.stdout.write(`${c4.green}\u2713${c4.reset} Signed in to ${c4.teal}${host}${c4.reset}${who ? ` as ${c4.bold}${who}${c4.reset}` : ""}.
+`);
+}
+
+// src/index.ts
+var c5 = {
   reset: "\x1B[0m",
   dim: "\x1B[2m",
   bold: "\x1B[1m",
@@ -8315,10 +8489,16 @@ function printUsage() {
   stdout.write(
     [
       "",
-      `${c4.bold}Usage${c4.reset}`,
+      `${c5.bold}Usage${c5.reset}`,
       "  standardcode [options] [dir]",
+      "  standardcode login [--endpoint <url>] [--token <key>]",
+      "                        Sign in (or switch accounts \u2014 always re-runs the flow).",
+      "  standardcode logout [--endpoint <url>]",
+      "                        Sign out of the saved endpoint.",
+      "  standardcode daemon <install|run|status|uninstall>",
+      "                        Manage this machine's headless execution daemon.",
       "",
-      `${c4.bold}Options${c4.reset}`,
+      `${c5.bold}Options${c5.reset}`,
       "  -v, --version         Print the Standard Code version and exit.",
       "  -e, --endpoint [url]  Use a different Standard Agents instance for this run",
       "                       (default: https://api.standardcode.ai).",
@@ -8387,15 +8567,15 @@ function parseArgs2(args) {
 }
 function printCommandBlock(tui, command, output4, ok, where) {
   tui.print("");
-  const note = where ? `  ${c4.dim}(ran on ${where})${c4.reset}` : "";
-  tui.print(`${c4.magenta}!${c4.reset} ${c4.bold}${command}${c4.reset}${note}`);
+  const note = where ? `  ${c5.dim}(ran on ${where})${c5.reset}` : "";
+  tui.print(`${c5.magenta}!${c5.reset} ${c5.bold}${command}${c5.reset}${note}`);
   const body = (output4 ?? "").replace(/\s+$/, "");
   if (body) {
     for (const line of body.split("\n")) {
-      tui.print(`  ${ok ? c4.dim : c4.red}${line}${c4.reset}`);
+      tui.print(`  ${ok ? c5.dim : c5.red}${line}${c5.reset}`);
     }
   } else {
-    tui.print(`  ${c4.dim}(no output)${c4.reset}`);
+    tui.print(`  ${c5.dim}(no output)${c5.reset}`);
   }
   tui.print("");
 }
@@ -8406,7 +8586,7 @@ function printAssistant(tui, text) {
   let dotted = false;
   for (const line of renderStreamingMarkdown(text, cols2)) {
     if (!dotted && line.trim()) {
-      tui.print(`${c4.gray}\u2022${c4.reset} ${line}`);
+      tui.print(`${c5.gray}\u2022${c5.reset} ${line}`);
       dotted = true;
     } else {
       tui.print(`  ${line}`);
@@ -8421,7 +8601,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}${c4.reset} ${c4.dim}${label}\u2026${c4.reset}`);
+    stdout.write(`\r\x1B[K${pad}${brandCycleColor(now)}${f}${c5.reset} ${c5.dim}${label}\u2026${c5.reset}`);
   };
   draw();
   const timer = setInterval(draw, 70);
@@ -8437,12 +8617,12 @@ function farewell(stoppedProcs = 0) {
   if (stoppedProcs > 0) {
     stdout.write(
       `
-${c4.cyan}\u2699${c4.reset} Stopped ${stoppedProcs} background process${stoppedProcs === 1 ? "" : "es"}.
+${c5.cyan}\u2699${c5.reset} Stopped ${stoppedProcs} background process${stoppedProcs === 1 ? "" : "es"}.
 `
     );
   }
   stdout.write(`
-${c4.teal}\u25C7${c4.reset} ${c4.dim}Standard Code \u2014 see you soon.${c4.reset}
+${c5.teal}\u25C7${c5.reset} ${c5.dim}Standard Code \u2014 see you soon.${c5.reset}
 `);
 }
 function printWelcome(endpoint, projectDir) {
@@ -8456,10 +8636,10 @@ function printWelcome(endpoint, projectDir) {
   const metaWidth = Math.max(1, terminalColumns - pad.length - markWidth - 3 - 1);
   const displayDir = truncateMiddle(dir2, metaWidth);
   const meta = [
-    `${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}`
+    `${c5.bold}${gradientText("Standard Code")}${c5.reset}${version ? `  ${c5.dim}v${version}${c5.reset}` : ""}`,
+    `${c5.dim}terminal coding agent${c5.reset}`,
+    ...endpoint === PRODUCTION_ENDPOINT ? [] : [`${c5.teal}${host}${c5.reset}`],
+    `${c5.dim}${displayDir}${c5.reset}`
   ];
   const metaTop = Math.floor((LOGO_MARK.length - meta.length) / 2);
   stdout.write("\n");
@@ -8473,11 +8653,11 @@ function printWelcome(endpoint, projectDir) {
 }
 function colorActivity(line) {
   const m = line.match(/^(\s*)([✓✗⛔])\s?([\s\S]*)$/);
-  if (!m) return `${c4.dim}${line}${c4.reset}`;
+  if (!m) return `${c5.dim}${line}${c5.reset}`;
   const [, indent, glyph, rest] = m;
   if (glyph === "\u2713") {
-    const body = rest.replace(/\s(\([^()]*\))\s*$/, ` ${c4.dim}$1${c4.reset}`);
-    return `${indent}${c4.green}\u2713${c4.reset} ${body}`;
+    const body = rest.replace(/\s(\([^()]*\))\s*$/, ` ${c5.dim}$1${c5.reset}`);
+    return `${indent}${c5.green}\u2713${c5.reset} ${body}`;
   }
   if (glyph === "\u2717") {
     const ERR_MAX_LINES = 7;
@@ -8485,15 +8665,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}${c4.red}\u2717 ${l}${c4.reset}` : `${indent}${c4.red}${c4.dim}${l}${c4.reset}`
+      (l, i) => i === 0 ? `${indent}${c5.red}\u2717 ${l}${c5.reset}` : `${indent}${c5.red}${c5.dim}${l}${c5.reset}`
     ).join("\n");
     if (hidden > 0) {
       return `${body}
-${indent}${c4.dim}\u2026 +${hidden} more line${hidden === 1 ? "" : "s"}${c4.reset}`;
+${indent}${c5.dim}\u2026 +${hidden} more line${hidden === 1 ? "" : "s"}${c5.reset}`;
     }
     return body;
   }
-  return `${indent}${c4.yellow}\u26D4 ${rest}${c4.reset}`;
+  return `${indent}${c5.yellow}\u26D4 ${rest}${c5.reset}`;
 }
 async function main() {
   if (process.argv.slice(2).some((arg) => arg === "-v" || arg === "--version")) {
@@ -8505,11 +8685,15 @@ async function main() {
     await runDaemonCommand(process.argv.slice(3));
     return;
   }
+  if (process.argv[2] === "login" || process.argv[2] === "logout") {
+    await runAuthCommand(process.argv[2], process.argv.slice(3));
+    return;
+  }
   let cliArgs;
   try {
     cliArgs = parseArgs2(process.argv.slice(2));
   } catch (error) {
-    stdout.write(`${c4.red}error:${c4.reset} ${error instanceof Error ? error.message : String(error)}
+    stdout.write(`${c5.red}error:${c5.reset} ${error instanceof Error ? error.message : String(error)}
 `);
     printUsage();
     process.exit(1);
@@ -8536,7 +8720,7 @@ async function main() {
     }
     preflightArmed = true;
     stdout.write(`
-${c4.dim}Press Control-C again to exit${c4.reset}
+${c5.dim}Press Control-C again to exit${c5.reset}
 `);
     preflightTimer = setTimeout(() => {
       preflightArmed = false;
@@ -8558,10 +8742,10 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
   const askEndpoint = async () => {
     for (; ; ) {
       const answer = (await ask(
-        `${c4.cyan}Standard Agents instance URL${c4.reset} (e.g. http://localhost:5178): `
+        `${c5.cyan}Standard Agents instance URL${c5.reset} (e.g. http://localhost:5178): `
       )).trim();
       if (answer) return answer;
-      stdout.write(`${c4.dim}An endpoint URL is required.${c4.reset}
+      stdout.write(`${c5.dim}An endpoint URL is required.${c5.reset}
 `);
     }
   };
@@ -8576,7 +8760,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
   const tlsRelaxed = relaxTlsForLocalEndpoint(endpoint);
   printWelcome(endpoint, projectDir);
   if (tlsRelaxed) {
-    stdout.write(`${c4.dim}  TLS verification relaxed for local endpoint.${c4.reset}
+    stdout.write(`${c5.dim}  TLS verification relaxed for local endpoint.${c5.reset}
 
 `);
   }
@@ -8588,7 +8772,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
     loading.stop();
     const applied = consumeAppliedUpdate(version);
     if (applied) {
-      stdout.write(`  ${c4.green}\u2713${c4.reset} ${c4.dim}Standard Code updated to v${version}.${c4.reset}
+      stdout.write(`  ${c5.green}\u2713${c5.reset} ${c5.dim}Standard Code updated to v${version}.${c5.reset}
 
 `);
     }
@@ -8597,21 +8781,21 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
       const decision = decideAutoUpdate(updateAvailable, { state: readAutoUpdateState(), pm });
       if (decision === "start" && pm && startBackgroundUpdate(updateAvailable.latest, pm)) {
         stdout.write(
-          `  ${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}
+          `  ${c5.teal}\u27F3${c5.reset} ${c5.dim}Standard Code ${c5.reset}${c5.bold}v${updateAvailable.latest}${c5.reset}${c5.dim} is installing in the background \u2014 it applies on your next launch.${c5.reset}
 
 `
         );
       } else if (decision === "in_flight") {
         stdout.write(
-          `  ${c4.teal}\u27F3${c4.reset} ${c4.dim}Standard Code v${updateAvailable.latest} is still installing in the background.${c4.reset}
+          `  ${c5.teal}\u27F3${c5.reset} ${c5.dim}Standard Code v${updateAvailable.latest} is still installing in the background.${c5.reset}
 
 `
         );
       } else {
         const display = updateCommand(pm ?? "npm").display;
         stdout.write(
-          `  ${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}
+          `  ${c5.teal}\u25C7${c5.reset} ${c5.dim}Update available:${c5.reset} ${c5.dim}v${updateAvailable.current}${c5.reset} \u2192 ${c5.bold}v${updateAvailable.latest}${c5.reset}
+  ${c5.dim}Run ${c5.reset}${c5.bold}${display}${c5.reset}${c5.dim} to update${c5.reset}
 
 `
         );
@@ -8629,39 +8813,39 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
   if (!api || !storedCheck?.ok) {
     const host = endpoint.replace(/^https?:\/\//, "").replace(/\/$/, "");
     if (storedCheck && !storedCheck.ok) {
-      stdout.write(`${c4.red}\u2717${c4.reset} ${c4.dim}Saved sign-in for this endpoint failed:${c4.reset} ${storedCheck.reason}
+      stdout.write(`${c5.red}\u2717${c5.reset} ${c5.dim}Saved sign-in for this endpoint failed:${c5.reset} ${storedCheck.reason}
 `);
-      if (storedCheck.hint) stdout.write(`  ${c4.dim}${storedCheck.hint}${c4.reset}
+      if (storedCheck.hint) stdout.write(`  ${c5.dim}${storedCheck.hint}${c5.reset}
 `);
       stdout.write("\n");
     }
     const explainFailure = (result, prefix) => {
-      stdout.write(`${c4.red}\u2717${c4.reset} ${prefix}${result.reason}
+      stdout.write(`${c5.red}\u2717${c5.reset} ${prefix}${result.reason}
 `);
-      if (result.hint) stdout.write(`  ${c4.dim}${result.hint}${c4.reset}
+      if (result.hint) stdout.write(`  ${c5.dim}${result.hint}${c5.reset}
 `);
     };
-    stdout.write(`${c4.bold}Sign in to ${gradientText("Standard Code")}${c4.reset}
+    stdout.write(`${c5.bold}Sign in to ${gradientText("Standard Code")}${c5.reset}
 `);
     if (`https://${host}` !== PRODUCTION_ENDPOINT) {
-      stdout.write(`${c4.dim}Connecting to${c4.reset} ${c4.teal}${host}${c4.reset}
+      stdout.write(`${c5.dim}Connecting to${c5.reset} ${c5.teal}${host}${c5.reset}
 `);
     }
     stdout.write(
-      `${c4.dim}You'll only need to do this once on this machine.${c4.reset}
+      `${c5.dim}You'll only need to do this once on this machine.${c5.reset}
 
 `
     );
     stdout.write(
-      `${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}
+      `${c5.white}Press ${c5.bold}Enter${c5.reset}${c5.white} to open your browser and sign in.${c5.reset} ${c5.dim}(or paste an API token)${c5.reset}
 
 `
     );
     for (; ; ) {
-      const token = (await ask(`${c4.teal}\u276F${c4.reset} `)).trim();
+      const token = (await ask(`${c5.teal}\u276F${c5.reset} `)).trim();
       if (!token) {
         const got = await deviceLogin(endpoint).catch((e) => {
-          stdout.write(`${c4.red}\u2717${c4.reset} ${c4.dim}${e instanceof Error ? e.message : String(e)}${c4.reset}
+          stdout.write(`${c5.red}\u2717${c5.reset} ${c5.dim}${e instanceof Error ? e.message : String(e)}${c5.reset}
 `);
           return null;
         });
@@ -8675,7 +8859,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
             { endpoint, access_token: got, token_type: "Bearer", saved_at: Date.now() },
             { updateDefault: !endpointOverride }
           );
-          stdout.write(`${c4.green}\u2713${c4.reset} Connected to ${c4.teal}${host}${c4.reset}
+          stdout.write(`${c5.green}\u2713${c5.reset} Connected to ${c5.teal}${host}${c5.reset}
 `);
           break;
         }
@@ -8691,7 +8875,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
           { endpoint, access_token: token, token_type: "Bearer", saved_at: Date.now() },
           { updateDefault: !endpointOverride }
         );
-        stdout.write(`${c4.green}\u2713${c4.reset} Connected to ${c4.teal}${host}${c4.reset}
+        stdout.write(`${c5.green}\u2713${c5.reset} Connected to ${c5.teal}${host}${c5.reset}
 `);
         break;
       }
@@ -8715,7 +8899,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
     } else if (["unlimited", "standard", "unlimited_one", AGENT_ID].includes(wanted)) {
       agentOverride = AGENT_ID;
     } else {
-      stdout.write(`${c4.red}error:${c4.reset} Unknown agent "${cliArgs.agent}". Use unlimited or sama.
+      stdout.write(`${c5.red}error:${c5.reset} Unknown agent "${cliArgs.agent}". Use unlimited or sama.
 `);
       process.exit(1);
     }
@@ -8753,7 +8937,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
   flow: for (; ; ) {
     if (step === "machine") {
       const picked = await tui.select(
-        `${c4.bold}Where should this session run?${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+        `${c5.bold}Where should this session run?${c5.reset}  ${c5.dim}\u2191\u2193 \xB7 enter \xB7 esc${c5.reset}`,
         [
           {
             label: `This machine \u2014 ${self ? machineDisplayName(self) : machine}`,
@@ -8837,7 +9021,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
       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}Resume a session${c4.reset}  ${c4.gray}${whereLabel}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+        `${c5.bold}Resume a session${c5.reset}  ${c5.gray}${whereLabel}${c5.reset}  ${c5.dim}\u2191\u2193 \xB7 enter \xB7 esc${c5.reset}`,
         items
       );
       if (picked === void 0) {
@@ -8863,7 +9047,7 @@ ${c4.dim}Press Control-C again to exit${c4.reset}
     } else {
       if (!agentOverride) {
         const picked = await tui.select(
-          `${c4.bold}Which agent?${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+          `${c5.bold}Which agent?${c5.reset}  ${c5.dim}\u2191\u2193 \xB7 enter \xB7 esc${c5.reset}`,
           AGENT_CHOICES.map((choice) => ({
             label: choice.title,
             hint: choice.description,
@@ -8913,7 +9097,7 @@ async function ensureSamaAuth(tui, api) {
   checking.stop();
   if (already) return true;
   const picked = await tui.select(
-    `${c4.bold}Authenticate with ChatGPT${c4.reset}  ${c4.dim}Sama One runs on OpenAI using your own ChatGPT Pro account${c4.reset}`,
+    `${c5.bold}Authenticate with ChatGPT${c5.reset}  ${c5.dim}Sama One runs on OpenAI using your own ChatGPT Pro account${c5.reset}`,
     [
       {
         label: "Continue with ChatGPT",
@@ -8926,7 +9110,7 @@ async function ensureSamaAuth(tui, api) {
   if (picked !== "continue") return false;
   openUrl("https://standardcode.ai/app?connect=sama");
   tui.print(
-    `${c4.dim}Finish connecting ChatGPT in the browser \u2014 waiting here for the authorization to land on your account\u2026${c4.reset}`
+    `${c5.dim}Finish connecting ChatGPT in the browser \u2014 waiting here for the authorization to land on your account\u2026${c5.reset}`
   );
   const waiting = startLoader("Waiting for your ChatGPT authorization");
   const deadline = Date.now() + 5 * 60 * 1e3;
@@ -8935,20 +9119,20 @@ async function ensureSamaAuth(tui, api) {
     if (await api.openSamaStatus().catch(() => false)) {
       waiting.stop();
       tui.print(
-        `${c4.green}\u2713${c4.reset} ChatGPT connected \u2014 Sama One is now unlocked on your account (terminal, web, and macOS app).`
+        `${c5.green}\u2713${c5.reset} ChatGPT connected \u2014 Sama One is now unlocked on your account (terminal, web, and macOS app).`
       );
       return true;
     }
   }
   waiting.stop();
   tui.print(
-    `${c4.yellow}Still not connected.${c4.reset} Finish the flow at ${c4.teal}standardcode.ai/app${c4.reset} and pick Sama One again.`
+    `${c5.yellow}Still not connected.${c5.reset} Finish the flow at ${c5.teal}standardcode.ai/app${c5.reset} and pick Sama One again.`
   );
   return false;
 }
 async function runAgentSwitchMenu(tui, api, threadId) {
   const picked = await tui.select(
-    `${c4.bold}Switch agent${c4.reset}  ${c4.dim}takes effect on the next message${c4.reset}`,
+    `${c5.bold}Switch agent${c5.reset}  ${c5.dim}takes effect on the next message${c5.reset}`,
     AGENT_CHOICES.map((choice) => ({
       label: choice.title,
       hint: choice.description,
@@ -8965,10 +9149,10 @@ async function runAgentSwitchMenu(tui, api, threadId) {
   try {
     await api.setThreadAgent(threadId, picked);
     tui.setAgentLabel(title);
-    tui.print(`${c4.green}\u2713${c4.reset} Session handed to ${c4.bold}${title}${c4.reset} \u2014 applies from your next message.`);
+    tui.print(`${c5.green}\u2713${c5.reset} Session handed to ${c5.bold}${title}${c5.reset} \u2014 applies from your next message.`);
   } catch (e) {
     tui.print(
-      `${c4.red}\u2717 couldn't switch agent:${c4.reset} ${c4.gray}${e instanceof Error ? e.message : String(e)}${c4.reset}`
+      `${c5.red}\u2717 couldn't switch agent:${c5.reset} ${c5.gray}${e instanceof Error ? e.message : String(e)}${c5.reset}`
     );
   }
 }
@@ -8993,7 +9177,7 @@ async function pickLocalProject(tui, api, self, cwd, machineName) {
     { label: "\uFF0B New project", hint: "browse or create a directory", value: NEW }
   ];
   const picked = await tui.select(
-    `${c4.bold}Project on ${label}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+    `${c5.bold}Project on ${label}${c5.reset}  ${c5.dim}\u2191\u2193 \xB7 enter \xB7 esc${c5.reset}`,
     items,
     { spaced: true }
   );
@@ -9017,7 +9201,7 @@ async function pickRemoteProject(tui, api, runner) {
   );
   items.push({ label: "\uFF0B New project", hint: "browse or create a directory", value: ENTER_PATH });
   const picked = await tui.select(
-    `${c4.bold}Project on ${runner.name}${c4.reset}  ${c4.dim}\u2191\u2193 \xB7 enter \xB7 esc${c4.reset}`,
+    `${c5.bold}Project on ${runner.name}${c5.reset}  ${c5.dim}\u2191\u2193 \xB7 enter \xB7 esc${c5.reset}`,
     items,
     { spaced: true }
   );
@@ -9050,7 +9234,7 @@ async function summarizeThreads(api, threads) {
 }
 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, (c5) => c5.toUpperCase()) : "Subagent");
+  const title = (s.title || "").trim() || titles.get(agentName) || (agentName ? agentName.replace(/[_-]+/g, " ").replace(/\b\w/g, (c6) => c6.toUpperCase()) : "Subagent");
   const tagged = (s.threadName || "").trim();
   return tagged ? `${title} \xB7 ${tagged}` : title;
 }
@@ -9073,8 +9257,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(`${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}`);
+  tui.print(`${c5.dim}\u2500\u2500 resuming session \xB7 ${convo.length} message${convo.length === 1 ? "" : "s"} \u2500\u2500${c5.reset}`);
+  if (shown.length < convo.length) tui.print(`${c5.dim}   \u2026 earlier messages omitted${c5.reset}`);
   for (const m of shown) {
     if (m.metadata?.user_command) {
       printCommandBlock(
@@ -9135,6 +9319,7 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
   let editingPendingId = null;
   let reconcileSharedMessaging = async () => {
   };
+  let applySharedMessagingEvent = () => false;
   let refreshSessionProjection = async () => {
   };
   const shownIds = /* @__PURE__ */ new Set();
@@ -9192,21 +9377,21 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
           if (isOwner) {
             bridge?.setClaim("takeover");
             exec?.writeSessionInfo();
-            if (wasKnown && moved) tui.print(`${c4.dim}Tool execution moved to this terminal.${c4.reset}`);
+            if (wasKnown && moved) tui.print(`${c5.dim}Tool execution moved to this terminal.${c5.reset}`);
           } else if (wasKnown && moved) {
-            tui.print(`${c4.dim}Tool execution moved to ${describeExecOwner(owner2)}.${c4.reset}`);
+            tui.print(`${c5.dim}Tool execution moved to ${describeExecOwner(owner2)}.${c5.reset}`);
           }
         },
         onClaimRefused: (reason) => {
           if (reason === "in_flight") {
             tui.print(
-              `${c4.dim}The session's current client is mid-operation \u2014 execution stays there until it finishes.${c4.reset}`
+              `${c5.dim}The session's current client is mid-operation \u2014 execution stays there until it finishes.${c5.reset}`
             );
           }
         },
         onSuperseded: () => {
           tui.print(
-            `${c4.yellow}\u26A0 Another Standard Code process on this machine took over this session \u2014 this terminal is watching.${c4.reset}`
+            `${c5.yellow}\u26A0 Another Standard Code process on this machine took over this session \u2014 this terminal is watching.${c5.reset}`
           );
         },
         onStatus: (id, summary) => {
@@ -9268,7 +9453,7 @@ why: ${req.requestPermission}` : ""}`,
       } else if (eventType === "goal_updated" && data) {
         tui.setGoal(data);
       } else if (eventType === SHARED_MESSAGING_EVENT) {
-        void reconcileSharedMessaging(true);
+        if (!applySharedMessagingEvent(data)) void reconcileSharedMessaging(true);
       }
     },
     // A failed turn whose message is the lease service's at-limit denial → offer
@@ -9364,7 +9549,7 @@ why: ${req.requestPermission}` : ""}`,
   const logout = async () => {
     deleteCredential(api.origin);
     const instanceHost = api.origin.replace(/^https?:\/\//, "");
-    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}`);
+    tui.print(`${c5.gray}Signed out \u2014 removed the saved token for ${c5.teal}${instanceHost}${c5.reset}${c5.gray}. Run standardcode to sign in again.${c5.reset}`);
     await quit();
   };
   const bgMgr = {
@@ -9372,7 +9557,7 @@ why: ${req.requestPermission}` : ""}`,
     stop: async (id) => {
       if (!host) {
         tui.print(
-          `${c4.gray}That process runs on ${runnerName} \u2014 ask the agent to stop it (it manages processes there).${c4.reset}`
+          `${c5.gray}That process runs on ${runnerName} \u2014 ask the agent to stop it (it manages processes there).${c5.reset}`
         );
         return;
       }
@@ -9435,7 +9620,7 @@ why: ${req.requestPermission}` : ""}`,
     sharedMessaging = firstSnapshot ? snapshot : mergeSharedMessagingSnapshot(sharedMessaging, snapshot);
     sharedMessagingReady = true;
     sharedMessagingUnavailableShown = false;
-    tui.setQueuedCount(sharedMessaging.pending.items.length);
+    tui.setQueuedMessages(sharedMessaging.pending.items.map((item) => item.content));
     if (mirrorDraft && (firstSnapshot || sharedMessaging.draft.revision > previousDraftRevision) && (firstSnapshot || sharedMessaging.draft.originClientId !== messagingOrigin.originClientId)) {
       mirroredDraftRefs = sharedMessaging.draft.attachments.filter(isSharedAttachmentRef);
       tui.setExternalAttachmentNames(mirroredDraftRefs.map((attachment) => attachment.name));
@@ -9453,17 +9638,25 @@ why: ${req.requestPermission}` : ""}`,
     } catch (error) {
       if (!sharedMessagingReady && !sharedMessagingUnavailableShown) {
         sharedMessagingUnavailableShown = true;
-        tui.print(`${c4.dim}shared messaging unavailable: ${error instanceof Error ? error.message : String(error)}${c4.reset}`);
+        tui.print(`${c5.dim}shared messaging unavailable: ${error instanceof Error ? error.message : String(error)}${c5.reset}`);
       }
     }
   };
+  applySharedMessagingEvent = (data) => {
+    if (!sharedMessagingReady) return false;
+    const event = parseMessagingChangedEvent(data);
+    if (!event || !event.draft || event.draftOmitted) return false;
+    if (event.pendingRevision > sharedMessaging.pending.revision) return false;
+    applySharedMessaging({ version: 1, pending: sharedMessaging.pending, draft: event.draft }, true);
+    return true;
+  };
   const onTerminalResume = () => void reconcileSharedMessaging(true);
   process.on("SIGCONT", onTerminalResume);
   const applySharedMutation = (promise) => promise.then((snapshot) => {
     applySharedMessaging(snapshot, false);
     return true;
   }).catch((error) => {
-    tui.print(`${c4.dim}shared messaging failed: ${error instanceof Error ? error.message : String(error)}${c4.reset}`);
+    tui.print(`${c5.dim}shared messaging failed: ${error instanceof Error ? error.message : String(error)}${c5.reset}`);
     return false;
   });
   const appendSharedPending = (text, images, refs = []) => applySharedMutation(api.appendPendingInput(threadId, {
@@ -9512,7 +9705,7 @@ why: ${req.requestPermission}` : ""}`,
       busy = false;
       optimisticBusyUntil = 0;
       tui.setWorking(false);
-      tui.print(`${c4.dim}failed to send: ${e instanceof Error ? e.message : String(e)}${c4.reset}`);
+      tui.print(`${c5.dim}failed to send: ${e instanceof Error ? e.message : String(e)}${c5.reset}`);
       return false;
     }
     return true;
@@ -9521,11 +9714,11 @@ why: ${req.requestPermission}` : ""}`,
   let bangRunning = false;
   const runBangCommand = async (command) => {
     if (bangRunning) {
-      tui.print(`${c4.dim}a command is already running \u2014 one at a time.${c4.reset}`);
+      tui.print(`${c5.dim}a command is already running \u2014 one at a time.${c5.reset}`);
       return;
     }
     bangRunning = true;
-    tui.print(`${c4.magenta}!${c4.reset} ${c4.dim}running on ${whereLabel}\u2026${c4.reset}`);
+    tui.print(`${c5.magenta}!${c5.reset} ${c5.dim}running on ${whereLabel}\u2026${c5.reset}`);
     try {
       const res = await api.runCommand(threadId, command);
       if (res.messageId) shownIds.add(res.messageId);
@@ -9539,7 +9732,7 @@ why: ${req.requestPermission}` : ""}`,
   const openPendingMenu = async () => {
     const items = sharedMessaging.pending.items;
     if (!items.length) {
-      tui.print(`${c4.dim}No pending messages.${c4.reset}`);
+      tui.print(`${c5.dim}No pending messages.${c5.reset}`);
       return;
     }
     const picked = await tui.select("Pending messages", items.map((item, index) => ({
@@ -9569,16 +9762,16 @@ why: ${req.requestPermission}` : ""}`,
     try {
       await api.compact(threadId);
     } catch (err) {
-      tui.print(`${c4.red}\u2717${c4.reset} couldn't start compaction: ${err.message}`);
+      tui.print(`${c5.red}\u2717${c5.reset} couldn't start compaction: ${err.message}`);
     }
   };
   const runAccountCommand = async () => {
-    tui.print(`${c4.gray}Opening your account\u2026${c4.reset}`);
+    tui.print(`${c5.gray}Opening your account\u2026${c5.reset}`);
     const link = await api.accountLink(threadId).catch(() => null);
     const target = link?.url ?? "https://standardcode.ai/account";
     openUrl(target);
     tui.print(
-      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}`
+      link?.preauthed ? `${c5.gray}\u2192 account dashboard opened in your browser (signed in)${c5.reset}` : `${c5.gray}\u2192 opened ${target} \u2014 sign in with your account email${c5.reset}`
     );
   };
   const ordinal = (n) => {
@@ -9589,24 +9782,24 @@ why: ${req.requestPermission}` : ""}`,
   const renderUpgradePanel = (q) => {
     const dots = [];
     for (let i = 0; i < q.max; i++) {
-      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}`);
+      if (i < q.current) dots.push(`${c5.teal}\u25CF${c5.reset}`);
+      else if (i === q.current) dots.push(`${c5.bold}${gradientText("\uFF0B")}${c5.reset}`);
+      else dots.push(`${c5.dim}\xB7${c5.reset}`);
     }
     const cost = fmtCost(q);
     const lines = [
       "",
-      `${c4.bold}\u2726 Add a parallel session${c4.reset}`,
+      `${c5.bold}\u2726 Add a parallel session${c5.reset}`,
       "",
-      `${dots.join(" ")}   ${c4.dim}${q.current} of ${q.current} session${q.current === 1 ? "" : "s"} in use${c4.reset}`
+      `${dots.join(" ")}   ${c5.dim}${q.current} of ${q.current} session${q.current === 1 ? "" : "s"} in use${c5.reset}`
     ];
     if (q.ends_trial) {
       lines.push(
-        `${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}`
+        `${c5.yellow}Your $5 trial covers 1 session. Adding a ${ordinal(q.sessions)} ends the trial${c5.reset}`,
+        `${c5.yellow}and starts your $49/mo plan now${cost ? ` \u2014 ${c5.bold}${cost} charged today${c5.reset}${c5.yellow}` : ""}.${c5.reset}`
       );
     } else if (cost) {
-      lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 ${c4.bold}${cost} charged now${c4.reset}.`);
+      lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 ${c5.bold}${cost} charged now${c5.reset}.`);
     } else {
       lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 prorated on your next invoice.`);
     }
@@ -9619,7 +9812,7 @@ why: ${req.requestPermission}` : ""}`,
     try {
       if (opts.auto) {
         tui.print(
-          `${c4.yellow}You're out of simultaneous sessions \u2014 another Standard Code session is using your slot.${c4.reset}`
+          `${c5.yellow}You're out of simultaneous sessions \u2014 another Standard Code session is using your slot.${c5.reset}`
         );
       }
       const quote = await api.sessionsQuote(threadId);
@@ -9627,16 +9820,16 @@ why: ${req.requestPermission}` : ""}`,
         const link = await api.accountLink(threadId).catch(() => null);
         const target = link?.url ?? "https://standardcode.ai/account";
         tui.print(
-          `${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}`
+          `${c5.gray}Close the other session (its slot frees within ~90s) \u2014 or add another simultaneous session to your plan, then resend your message.${c5.reset}`
         );
         openUrl(target);
-        tui.print(`${c4.gray}\u2192 opened ${target} to manage your plan${c4.reset}`);
+        tui.print(`${c5.gray}\u2192 opened ${target} to manage your plan${c5.reset}`);
         return;
       }
       if (quote.current >= quote.max) {
         tui.print(
-          `${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}`
+          `${c5.yellow}You're at the maximum of ${quote.max} parallel session${quote.max === 1 ? "" : "s"}.${c5.reset}
+${c5.gray}Close another session (its slot frees within ~90s), then resend your message.${c5.reset}`
         );
         return;
       }
@@ -9648,25 +9841,25 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
         { label: "Not now", value: "no" }
       ]);
       if (choice !== "go") {
-        tui.print(`${c4.gray}No change made \u2014 you can upgrade anytime with /upgrade.${c4.reset}`);
+        tui.print(`${c5.gray}No change made \u2014 you can upgrade anytime with /upgrade.${c5.reset}`);
         return;
       }
-      tui.print(`${c4.gray}Applying\u2026${c4.reset}`);
+      tui.print(`${c5.gray}Applying\u2026${c5.reset}`);
       let applied;
       try {
         applied = await api.sessionsUpgrade(threadId, quote.sessions);
       } catch (e) {
-        tui.print(`${c4.red}\u2717${c4.reset} Upgrade failed: ${e instanceof Error ? e.message : String(e)}`);
+        tui.print(`${c5.red}\u2717${c5.reset} Upgrade failed: ${e instanceof Error ? e.message : String(e)}`);
         return;
       }
       if (!applied?.ok) {
-        tui.print(`${c4.red}\u2717${c4.reset} Upgrade failed: ${applied?.error ?? "unknown error"}`);
+        tui.print(`${c5.red}\u2717${c5.reset} Upgrade failed: ${applied?.error ?? "unknown error"}`);
         return;
       }
       const n = applied.sessions ?? quote.sessions;
-      tui.print(`${c4.green}\u2713${c4.reset} ${c4.bold}${gradientText(`You now have ${n} parallel session${n === 1 ? "" : "s"}.`)}${c4.reset}`);
+      tui.print(`${c5.green}\u2713${c5.reset} ${c5.bold}${gradientText(`You now have ${n} parallel session${n === 1 ? "" : "s"}.`)}${c5.reset}`);
       if (opts.auto && lastSent) {
-        tui.print(`${c4.gray}Continuing\u2026${c4.reset}`);
+        tui.print(`${c5.gray}Continuing\u2026${c5.reset}`);
         await sendNow(lastSent.text, lastSent.images, lastSent.refs);
       }
     } finally {
@@ -9777,38 +9970,50 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
   const history = await loadHistory(api, threadId, historySeedThreadId);
   tui.setHistory(history);
   await reconcileSharedMessaging(true);
-  let draftTimer;
-  const clearComposerDraft = () => {
-    if (draftTimer) clearTimeout(draftTimer);
-    draftTimer = void 0;
-    mirroredDraftRefs = [];
-    tui.setExternalAttachmentNames([]);
-    if (sharedMessagingReady) void applySharedMutation(api.clearSharedDraft(threadId, messagingOrigin));
-  };
-  tui.onDraftChange = (textVal, images) => {
-    if (draftTimer) clearTimeout(draftTimer);
-    draftTimer = setTimeout(() => {
-      draftTimer = void 0;
-      if (sharedMessagingReady) {
-        const hasDraft = !!textVal.trim() || images.length > 0 || mirroredDraftRefs.length > 0;
+  let latestDraftPayload = null;
+  let draftDirty = false;
+  let draftInFlight = false;
+  const pumpComposerDraft = async () => {
+    if (draftInFlight) return;
+    draftInFlight = true;
+    try {
+      while (draftDirty) {
+        draftDirty = false;
+        const payload = latestDraftPayload;
+        if (!payload || !sharedMessagingReady) continue;
+        const hasDraft = !!payload.text.trim() || payload.images.length > 0 || mirroredDraftRefs.length > 0;
         const mutation = {
-          content: textVal,
+          content: payload.text,
           attachments: [
             ...hasDraft ? mirroredDraftRefs : [],
-            ...toSharedAttachments(images)
+            ...toSharedAttachments(payload.images)
           ],
           ...messagingOrigin
         };
-        void applySharedMutation(
+        await applySharedMutation(
           hasDraft ? api.putSharedDraft(threadId, mutation) : api.clearSharedDraft(threadId, messagingOrigin)
         );
       }
-    }, 150);
+    } finally {
+      draftInFlight = false;
+    }
+  };
+  const clearComposerDraft = () => {
+    mirroredDraftRefs = [];
+    tui.setExternalAttachmentNames([]);
+    latestDraftPayload = { text: "", images: [] };
+    draftDirty = true;
+    void pumpComposerDraft();
+  };
+  tui.onDraftChange = (textVal, images) => {
+    latestDraftPayload = { text: textVal, images };
+    draftDirty = true;
+    void pumpComposerDraft();
   };
   const submitComposer = async (text, images, steer) => {
     const draftRefs = mirroredDraftRefs;
     if (!sharedMessagingReady && (busy || steer || editingPendingId !== null)) {
-      tui.print(`${c4.dim}Restoring shared message state \u2014 try again in a moment.${c4.reset}`);
+      tui.print(`${c5.dim}Restoring shared message state \u2014 try again in a moment.${c5.reset}`);
       tui.setExternalAttachmentNames(draftRefs.map((attachment) => attachment.name));
       tui.setInput(text, images);
       return;
@@ -9831,7 +10036,7 @@ ${c4.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(`${c4.dim}That pending message was already dispatched or dismissed.${c4.reset}`);
+        tui.print(`${c5.dim}That pending message was already dispatched or dismissed.${c5.reset}`);
         return;
       }
       const updated = await editSharedPending(item, text, images, draftRefs);
@@ -9844,7 +10049,7 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
       return;
     }
     if (steer) {
-      tui.print(`${c4.yellow}\u21AA steering now \u2014 stopping the current step${c4.reset}`);
+      tui.print(`${c5.yellow}\u21AA steering now \u2014 stopping the current step${c5.reset}`);
       await Promise.all([
         api.stopThread(threadId).catch(() => {
         }),
@@ -9859,9 +10064,7 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
       return;
     }
     if (busy) {
-      if (await appendSharedPending(text, images, draftRefs)) {
-        tui.print(`${c4.gray}\u23F3 pending:${c4.reset} ${text}  ${c4.dim}(/queue to edit, steer, or dismiss)${c4.reset}`);
-      } else {
+      if (await appendSharedPending(text, images, draftRefs)) ; else {
         mirroredDraftRefs = draftRefs;
         tui.setExternalAttachmentNames(draftRefs.map((attachment) => attachment.name));
         tui.setInput(text, images);
@@ -9883,13 +10086,18 @@ ${c4.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(`${c4.yellow}\u21AA steering the first pending message\u2026${c4.reset}`);
+      tui.print(`${c5.yellow}\u21AA steering the first pending message\u2026${c5.reset}`);
       void promoteSharedPending(firstPending);
       return;
     }
     if (busy) {
-      const queued = sharedMessaging.pending.items.length;
-      tui.print(`${c4.yellow}\u25A0 stopping now${queued > 0 ? ` \u2014 ${queued} queued message${queued === 1 ? "" : "s"} kept` : ""}${c4.reset}`);
+      const head = sharedMessaging.pending.items[0];
+      if (head) {
+        tui.print(`${c5.yellow}\u21AA steering \u2014 stopping the current step to run the queued message${c5.reset}`);
+        void promoteSharedPending(head);
+        return;
+      }
+      tui.print(`${c5.yellow}\u25A0 stopping now${c5.reset}`);
       const stops = [api.stopThread(threadId).catch(() => {
       })];
       for (const childId of activeSubagents.keys()) {
@@ -9919,7 +10127,7 @@ ${c4.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 header = `${c5.bold}${c5.magenta}Standard Code${c5.reset} ${c5.dim}\u2014 ${agentTitle}${c5.reset}`;
   const remoteDaemonV = session.runner?.daemon?.version;
   const owner = currentOwner;
   let localOwnerDesc = ownsExecution ? "this terminal" : describeExecOwner(owner);
@@ -9927,24 +10135,24 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
     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}`;
+  const execLine = remote ? `${c5.gray}tool execution:${c5.reset} daemon${remoteDaemonV ? ` v${remoteDaemonV}` : ""} on ${runnerName}` : `${c5.gray}tool execution:${c5.reset} ${localOwnerDesc}`;
   tui.setAgentLabel(agentTitle);
   tui.banner(
     remote ? [
       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)}`,
+      `${c5.gray}project:${c5.reset} ${session.remotePath ?? "?"} ${c5.teal}on ${runnerName}${c5.reset}`,
+      `${c5.gray}machine:${c5.reset} ${runnerName}   ${c5.gray}thread:${c5.reset} ${threadId.slice(0, 8)}`,
       execLine
     ] : [
       header,
-      `${c4.gray}project:${c4.reset} ${projectDir}`,
-      `${c4.gray}machine:${c4.reset} ${machine}   ${c4.gray}thread:${c4.reset} ${threadId.slice(0, 8)}`,
+      `${c5.gray}project:${c5.reset} ${projectDir}`,
+      `${c5.gray}machine:${c5.reset} ${machine}   ${c5.gray}thread:${c5.reset} ${threadId.slice(0, 8)}`,
       execLine
     ]
   );
   if (!remote && session.suggestDaemonInstall && process.platform !== "win32" && !serviceStatus().installed) {
     tui.print(
-      `${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}`
+      `${c5.dim}Tip: install the always-on daemon (${c5.reset}standardcode daemon install${c5.dim}) to start sessions on this machine from anywhere.${c5.reset}`
     );
   }
   if (resumed) await printHistory(api, threadId, tui);
@@ -9955,17 +10163,17 @@ ${c4.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(
-      `${c4.cyan}\u2699 ${runningProcs.length} background process${runningProcs.length === 1 ? "" : "es"} running:${c4.reset}`
+      `${c5.cyan}\u2699 ${runningProcs.length} background process${runningProcs.length === 1 ? "" : "es"} running:${c5.reset}`
     );
-    for (const p of runningProcs) tui.print(`${c4.gray}  ${p.id}  ${p.description || p.command}${c4.reset}`);
+    for (const p of runningProcs) tui.print(`${c5.gray}  ${p.id}  ${p.description || p.command}${c5.reset}`);
   }
   refreshBgCount();
   if (exec && ownsExecution) {
     for (const res of await exec.connectEnabledMcpServers()) {
       if (res.ok) {
-        tui.print(`${c4.cyan}\u26A1 MCP "${res.name}" connected${c4.reset} ${c4.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c4.reset}`);
+        tui.print(`${c5.cyan}\u26A1 MCP "${res.name}" connected${c5.reset} ${c5.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c5.reset}`);
       } else {
-        tui.print(`${c4.red}\u26A0 MCP "${res.name}" failed:${c4.reset} ${c4.gray}${res.error}${c4.reset}`);
+        tui.print(`${c5.red}\u26A0 MCP "${res.name}" failed:${c5.reset} ${c5.gray}${res.error}${c5.reset}`);
       }
     }
   }
@@ -9981,8 +10189,8 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
     try {
       const { choice, reason } = await tui.approval(
         `${request.summary}${request.permission ? `
-${c4.bold}why: ${request.permission}${c4.reset}` : ""}
-${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
+${c5.bold}why: ${request.permission}${c5.reset}` : ""}
+${c5.dim}runs on ${request.machine || runnerName}${c5.reset}`,
         request.risk
       );
       answeredApprovals.add(request.tool_call_id);
@@ -9996,6 +10204,7 @@ ${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
       approvalPromptOpen = false;
     }
   };
+  let stalledNoticeShown = false;
   const poll = async () => {
     let msgs;
     let serverBusy = null;
@@ -10005,6 +10214,14 @@ ${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
       msgs = snapshot.messages.slice(-60);
       serverBusy = snapshot.busy;
       serverTool = snapshot.current_tool;
+      if (snapshot.stalled && !stalledNoticeShown) {
+        stalledNoticeShown = true;
+        tui.print(
+          `${c5.yellow}\u26A0 session interrupted${c5.reset} ${c5.dim}\u2014 the last operation never finished (the runtime is attempting recovery). Send a message to continue.${c5.reset}`
+        );
+      } else if (!snapshot.stalled && stalledNoticeShown && snapshot.busy) {
+        stalledNoticeShown = false;
+      }
     } catch {
       try {
         msgs = await api.getMessages(threadId, 60);
@@ -10033,7 +10250,7 @@ ${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
         continue;
       }
       if (m.role === "assistant" && text) printAssistant(tui, text);
-      else if (m.role === "system" && text) tui.print(`${c4.dim}${text}${c4.reset}`);
+      else if (m.role === "system" && text) tui.print(`${c5.dim}${text}${c5.reset}`);
       else if (m.role === "user" && text) {
         const pending = pendingSent.get(text) ?? 0;
         if (pending > 0) {
@@ -10122,21 +10339,21 @@ ${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
   tui.setWorking(false);
   tui.setSubagents([]);
   tui.setGoal(null);
-  tui.setQueuedCount(0);
+  tui.setQueuedMessages([]);
   tui.setContextPct(null);
   tui.setStep(null, 0);
   tui.setBackgroundCount(0);
   if (killed > 0) {
-    tui.print(`${c4.cyan}\u2699${c4.reset} Stopped ${killed} background process${killed === 1 ? "" : "es"}.`);
+    tui.print(`${c5.cyan}\u2699${c5.reset} Stopped ${killed} background process${killed === 1 ? "" : "es"}.`);
   }
-  tui.print(`${c4.dim}\u2500\u2500 conversation cleared \u2014 starting a fresh session \u2500\u2500${c4.reset}`);
+  tui.print(`${c5.dim}\u2500\u2500 conversation cleared \u2014 starting a fresh session \u2500\u2500${c5.reset}`);
 }
 async function runSkillsMenu(tui, skills) {
   let list;
   try {
     list = await skills.list();
   } catch (e) {
-    tui.print(`${c4.red}\u2717 couldn't load skills:${c4.reset} ${c4.gray}${e instanceof Error ? e.message : String(e)}${c4.reset}`);
+    tui.print(`${c5.red}\u2717 couldn't load skills:${c5.reset} ${c5.gray}${e instanceof Error ? e.message : String(e)}${c5.reset}`);
     return;
   }
   const INSTALL = "__install__";
@@ -10147,7 +10364,7 @@ async function runSkillsMenu(tui, skills) {
   }));
   items.push({ label: "\uFF0B Install a skill\u2026", hint: "find & install", value: INSTALL });
   const picked = await tui.select(
-    `${c4.bold}Agent skills${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c4.reset}`,
+    `${c5.bold}Agent skills${c5.reset}  ${c5.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c5.reset}`,
     items
   );
   if (!picked) return;
@@ -10160,8 +10377,8 @@ async function runSkillsMenu(tui, skills) {
     return;
   }
   const skill = list.find((s) => s.name === picked);
-  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}`, [
+  tui.print(`${c5.cyan}${skill.name}${c5.reset}${skill.version ? ` ${c5.dim}v${skill.version}${c5.reset}` : ""} ${c5.gray}\u2014 ${skill.description}${c5.reset}`);
+  const action = await tui.select(`${c5.bold}${picked}${c5.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" },
@@ -10170,20 +10387,20 @@ async function runSkillsMenu(tui, skills) {
   try {
     if (action === "enable" || action === "disable") {
       await skills.setEnabled(picked, action === "enable");
-      tui.print(`${c4.gray}${action}d ${picked}${c4.reset}`);
+      tui.print(`${c5.gray}${action}d ${picked}${c5.reset}`);
     } else if (action === "files") {
-      for (const f of skill.files) tui.print(`  ${c4.gray}${f}${c4.reset}`);
+      for (const f of skill.files) tui.print(`  ${c5.gray}${f}${c5.reset}`);
     } else if (action === "remove") {
       await skills.remove(picked);
-      tui.print(`${c4.gray}removed ${picked}${c4.reset}`);
+      tui.print(`${c5.gray}removed ${picked}${c5.reset}`);
     }
   } catch (e) {
-    tui.print(`${c4.red}\u2717 ${e instanceof Error ? e.message : String(e)}${c4.reset}`);
+    tui.print(`${c5.red}\u2717 ${e instanceof Error ? e.message : String(e)}${c5.reset}`);
   }
 }
 async function runLevelMenu(tui, perm) {
   const picked = await tui.select(
-    `${c4.bold}Auto-accept level${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 shift-tab cycles)${c4.reset}`,
+    `${c5.bold}Auto-accept level${c5.reset}  ${c5.dim}(\u2191/\u2193 \xB7 enter \xB7 shift-tab cycles)${c5.reset}`,
     LEVELS.map((l) => ({
       label: levelLabel(l),
       hint: l === tui.level ? "current" : "",
@@ -10200,16 +10417,16 @@ async function runMachinesMenu(tui, api, self) {
   try {
     machines = await loadMachines(api);
   } catch (e) {
-    tui.print(`${c4.red}\u2717 couldn't load machines:${c4.reset} ${c4.gray}${e instanceof Error ? e.message : String(e)}${c4.reset}`);
+    tui.print(`${c5.red}\u2717 couldn't load machines:${c5.reset} ${c5.gray}${e instanceof Error ? e.message : String(e)}${c5.reset}`);
     return;
   }
   if (!machines.length) {
-    tui.print(`${c4.gray}No machines registered yet. Run standardcode on a machine (or install its daemon) to register it.${c4.reset}`);
+    tui.print(`${c5.gray}No machines registered yet. Run standardcode on a machine (or install its daemon) to register it.${c5.reset}`);
     return;
   }
   machines.sort((a, b) => (b.updated_at ?? 0) - (a.updated_at ?? 0));
   const picked = await tui.select(
-    `${c4.bold}Your machines${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 esc)${c4.reset}`,
+    `${c5.bold}Your machines${c5.reset}  ${c5.dim}(\u2191/\u2193 \xB7 enter \xB7 esc)${c5.reset}`,
     machines.map((m) => {
       const isSelf = m.id === self.machine_id;
       const online = daemonOnline(m);
@@ -10243,26 +10460,26 @@ async function manageMachine(tui, api, self, machine) {
   options.push({ label: "Back", value: "back" });
   if (!isSelf && !machine.daemon) {
     tui.print(
-      `${c4.dim}${machine.name} has no daemon \u2014 you can rename it here; update and project changes need its daemon installed.${c4.reset}`
+      `${c5.dim}${machine.name} has no daemon \u2014 you can rename it here; update and project changes need its daemon installed.${c5.reset}`
     );
   } else if (!isSelf && machine.daemon && !online) {
     tui.print(
-      `${c4.dim}${machine.name}'s daemon is offline \u2014 queued changes apply when it next comes online.${c4.reset}`
+      `${c5.dim}${machine.name}'s daemon is offline \u2014 queued changes apply when it next comes online.${c5.reset}`
     );
   }
-  const action = await tui.select(`${c4.bold}${machineIcon(machine)}  ${machine.name}${c4.reset}`, options);
+  const action = await tui.select(`${c5.bold}${machineIcon(machine)}  ${machine.name}${c5.reset}`, options);
   if (!action || action === "back") return;
   if (action === "icon") {
     const current = machine.icon ?? "";
     const emoji = await tui.prompt(
-      `${c4.bold}Icon for ${machine.name}${c4.reset} ${c4.dim}(paste an emoji, blank to reset)${c4.reset}`,
+      `${c5.bold}Icon for ${machine.name}${c5.reset} ${c5.dim}(paste an emoji, blank to reset)${c5.reset}`,
       current
     );
     if (emoji !== null) {
       const trimmed = emoji.trim();
       await setMachineIcon(api, machine.id, trimmed);
       machine.icon = trimmed || void 0;
-      tui.print(`${c4.green}\u2713${c4.reset} icon ${trimmed ? `set to ${trimmed}` : "reset"} for ${machine.name}`);
+      tui.print(`${c5.green}\u2713${c5.reset} icon ${trimmed ? `set to ${trimmed}` : "reset"} for ${machine.name}`);
     }
     return manageMachine(tui, api, self, machine);
   }
@@ -10278,7 +10495,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(`${c4.green}\u2713${c4.reset} Renamed ${c4.bold}${machine.name}${c4.reset} \u2192 ${c4.bold}${name.trim()}${c4.reset}.`);
+    tui.print(`${c5.green}\u2713${c5.reset} Renamed ${c5.bold}${machine.name}${c5.reset} \u2192 ${c5.bold}${name.trim()}${c5.reset}.`);
   } else if (action === "update") {
     if (isSelf) {
       await runUpdateCommand(tui);
@@ -10289,7 +10506,7 @@ async function manageMachine(tui, api, self, machine) {
       ]);
       if (go !== "yes") return;
       await dispatch("update");
-      tui.print(`${c4.green}\u2713${c4.reset} Update ${c4.gray}${applyNote} (its daemon updates and restarts on the new version).${c4.reset}`);
+      tui.print(`${c5.green}\u2713${c5.reset} Update ${c5.gray}${applyNote} (its daemon updates and restarts on the new version).${c5.reset}`);
     }
   } else if (action === "projects") {
     await manageMachineProjects(tui, api, self, machine, dispatch, applyNote);
@@ -10300,7 +10517,7 @@ async function manageMachineProjects(tui, api, self, machine, dispatch, applyNot
   const paths = Object.keys(machine.projects).sort();
   const projLabels = projectDisplayLabels(machine.projects);
   const picked = await tui.select(
-    `${c4.bold}Projects on ${machine.name}${c4.reset}  ${c4.dim}(\u2191\u2193 \xB7 enter \xB7 esc)${c4.reset}`,
+    `${c5.bold}Projects on ${machine.name}${c5.reset}  ${c5.dim}(\u2191\u2193 \xB7 enter \xB7 esc)${c5.reset}`,
     [
       ...paths.map((p) => ({
         label: projLabels.get(p) ?? projectDisplayName(p, machine.projects[p]),
@@ -10321,12 +10538,12 @@ async function manageMachineProjects(tui, api, self, machine, dispatch, applyNot
     });
     if (!chosen) return;
     await dispatch("add_project", { path: chosen });
-    tui.print(`${c4.green}\u2713${c4.reset} Add ${chosen} ${c4.gray}${applyNote}.${c4.reset}`);
+    tui.print(`${c5.green}\u2713${c5.reset} Add ${chosen} ${c5.gray}${applyNote}.${c5.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}`, [
+  const action = await tui.select(`${c5.bold}${displayName}${c5.reset}  ${c5.dim}${shortenPath(picked, 48)}${c5.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" }
@@ -10341,60 +10558,60 @@ async function manageMachineProjects(tui, api, self, machine, dispatch, applyNot
     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}.`);
+    tui.print(`${c5.green}\u2713${c5.reset} Renamed ${c5.bold}${displayName}${c5.reset} \u2192 ${c5.bold}${now}${c5.reset}.`);
   } else {
     await dispatch("remove_project", { path: picked });
-    tui.print(`${c4.green}\u2713${c4.reset} Remove ${picked} ${c4.gray}${applyNote}.${c4.reset}`);
+    tui.print(`${c5.green}\u2713${c5.reset} Remove ${picked} ${c5.gray}${applyNote}.${c5.reset}`);
   }
 }
 function showDaemonInfo(tui, session) {
   if (session.mode === "remote" && session.runner) {
     tui.print(
-      `${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}`
+      `${c5.gray}This session runs on${c5.reset} ${c5.bold}${session.runner.name}${c5.reset} ${c5.gray}(${session.runner.hostname}) \u2014 its daemon executes the tools.${c5.reset}`
     );
   } else {
-    tui.print(`${c4.gray}This session runs on this machine.${c4.reset}`);
+    tui.print(`${c5.gray}This session runs on this machine.${c5.reset}`);
   }
   const status = serviceStatus();
   tui.print(
-    `${c4.gray}Daemon on this machine:${c4.reset} ${status.installed ? status.detail : "not installed"}`
+    `${c5.gray}Daemon on this machine:${c5.reset} ${status.installed ? status.detail : "not installed"}`
   );
   if (!status.installed) {
     tui.print(
-      `${c4.gray}Install it to start sessions on this machine from anywhere:${c4.reset} ${c4.bold}standardcode daemon install${c4.reset}`
+      `${c5.gray}Install it to start sessions on this machine from anywhere:${c5.reset} ${c5.bold}standardcode daemon install${c5.reset}`
     );
     tui.print(
-      `${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}`
+      `${c5.dim}The daemon keeps running after you close the terminal \u2014 it self-restarts, self-updates, and executes sessions you start from other machines.${c5.reset}`
     );
   } else {
-    tui.print(`${c4.dim}Manage it with standardcode daemon status | uninstall | add-project <path>.${c4.reset}`);
+    tui.print(`${c5.dim}Manage it with standardcode daemon status | uninstall | add-project <path>.${c5.reset}`);
   }
 }
 function showKeybindings(tui) {
-  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 now \u2014 stops the current step and plays your message`);
-  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`);
+  tui.print(`${c5.gray}shortcuts:${c5.reset}`);
+  tui.print(`${c5.gray}  shift-tab${c5.reset}  cycle auto-accept level (1\u20135)`);
+  tui.print(`${c5.gray}  shift-\u23CE${c5.reset}    insert a newline (multiline input)`);
+  tui.print(`${c5.gray}  option-\u23CE${c5.reset}   steer now \u2014 stops the current step and plays your message`);
+  tui.print(`${c5.gray}  /${c5.reset}          open the command palette (type to filter)`);
+  tui.print(`${c5.gray}  !cmd${c5.reset}       run a shell command on the session's machine (e.g. !ls); !! to send a literal !`);
+  tui.print(`${c5.gray}  ctrl-v${c5.reset}     paste an image from the clipboard ([#Image 1])`);
+  tui.print(`${c5.gray}  \u2191 / \u2193${c5.reset}      cycle past messages (on the input's top line)`);
+  tui.print(`${c5.gray}  \u2190${c5.reset}          from the start of the input: select the [\u2699 n bg] badge (enter opens it)`);
+  tui.print(`${c5.gray}  ctrl-c${c5.reset}     quit`);
 }
 async function runUpdateCommand(tui) {
   const version = readVersion();
   const result = await forceCheckForUpdate(version);
   if (!result) {
-    tui.print(`${c4.green}\u2713${c4.reset} ${c4.gray}@standardagents/code${c4.reset} is up to date (v${version})`);
+    tui.print(`${c5.green}\u2713${c5.reset} ${c5.gray}@standardagents/code${c5.reset} is up to date (v${version})`);
     return;
   }
   const { latest } = result;
   tui.print(`
-  ${c4.yellow}\u27F3${c4.reset} Update available: ${c4.gray}v${version}${c4.reset} \u2192 ${c4.green}v${latest}${c4.reset}`);
+  ${c5.yellow}\u27F3${c5.reset} Update available: ${c5.gray}v${version}${c5.reset} \u2192 ${c5.green}v${latest}${c5.reset}`);
   const pm = detectPackageManager();
   if (!pm) {
-    tui.print(`  ${c4.gray}This is a source checkout \u2014 pull the repo to update.${c4.reset}`);
+    tui.print(`  ${c5.gray}This is a source checkout \u2014 pull the repo to update.${c5.reset}`);
     return;
   }
   const { display } = updateCommand(pm);
@@ -10403,28 +10620,28 @@ async function runUpdateCommand(tui) {
     { label: "No, skip", value: "no" }
   ]);
   if (choice === "yes") {
-    tui.print(`  ${c4.gray}Running ${display}\u2026${c4.reset}`);
+    tui.print(`  ${c5.gray}Running ${display}\u2026${c5.reset}`);
     const { ok, output: pmOutput } = await runUpdate(pm);
     if (ok) {
-      tui.print(`  ${c4.green}\u2713${c4.reset} Updated to v${latest}. Restart to use the new version.`);
+      tui.print(`  ${c5.green}\u2713${c5.reset} Updated to v${latest}. Restart to use the new version.`);
     } else {
-      tui.print(`  ${c4.red}\u2717${c4.reset} Update failed:`);
+      tui.print(`  ${c5.red}\u2717${c5.reset} Update failed:`);
       for (const line of pmOutput.trim().split("\n").slice(-6)) {
-        tui.print(`  ${c4.dim}${line}${c4.reset}`);
+        tui.print(`  ${c5.dim}${line}${c5.reset}`);
       }
     }
   } else {
-    tui.print(`  ${c4.gray}Skipped. Run /update later.${c4.reset}`);
+    tui.print(`  ${c5.gray}Skipped. Run /update later.${c5.reset}`);
   }
 }
 async function runProcessMenu(tui, bg) {
   const procs = await bg.list();
   if (!procs.length) {
-    tui.print(`${c4.gray}No background processes for this session.${c4.reset}`);
+    tui.print(`${c5.gray}No background processes for this session.${c5.reset}`);
     return;
   }
   const items = procs.map((p) => {
-    const status = p.status === "running" ? `${c4.green}running${c4.reset}` : `${c4.gray}${p.status}${typeof p.exitCode === "number" ? ` (exit ${p.exitCode})` : ""}${c4.reset}`;
+    const status = p.status === "running" ? `${c5.green}running${c5.reset}` : `${c5.gray}${p.status}${typeof p.exitCode === "number" ? ` (exit ${p.exitCode})` : ""}${c5.reset}`;
     return {
       label: `${p.description || p.command}`,
       hint: `${p.id} \xB7 ${status}`,
@@ -10432,22 +10649,22 @@ async function runProcessMenu(tui, bg) {
     };
   });
   const picked = await tui.select(
-    `${c4.bold}Background processes${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter to manage \xB7 esc to close)${c4.reset}`,
+    `${c5.bold}Background processes${c5.reset}  ${c5.dim}(\u2191/\u2193 \xB7 enter to manage \xB7 esc to close)${c5.reset}`,
     items
   );
   if (!picked) return;
   const proc = procs.find((p) => p.id === picked);
   if (!proc || proc.status !== "running") {
-    tui.print(`${c4.gray}${picked} is not running.${c4.reset}`);
+    tui.print(`${c5.gray}${picked} is not running.${c5.reset}`);
     return;
   }
-  const action = await tui.select(`${c4.bold}${proc.description || proc.command}${c4.reset}`, [
+  const action = await tui.select(`${c5.bold}${proc.description || proc.command}${c5.reset}`, [
     { label: "Stop this process", value: "stop" },
     { label: "Leave it running", value: "leave" }
   ]);
   if (action === "stop") {
     await bg.stop(picked);
-    tui.print(`${c4.gray}stopped ${picked}${c4.reset}`);
+    tui.print(`${c5.gray}stopped ${picked}${c5.reset}`);
   }
 }
 async function runApprovalsMenu(tui, perm, save) {
@@ -10455,7 +10672,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(
-      `${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}`
+      `${c5.gray}No pre-approved commands. At a permission prompt, choose "Always allow this tool" or "Allow all level N" to add some.${c5.reset}`
     );
     return;
   }
@@ -10465,22 +10682,22 @@ async function runApprovalsMenu(tui, perm, save) {
     { label: "Clear all approvals", hint: "", value: "clear" }
   ];
   const picked = await tui.select(
-    `${c4.bold}Approved commands${c4.reset}  ${c4.dim}(enter to revoke \xB7 esc to close)${c4.reset}`,
+    `${c5.bold}Approved commands${c5.reset}  ${c5.dim}(enter to revoke \xB7 esc to close)${c5.reset}`,
     items
   );
   if (!picked) return;
   if (picked === "clear") {
     perm.alwaysAllow.clear();
     perm.allowRisk.clear();
-    tui.print(`${c4.gray}cleared all approvals${c4.reset}`);
+    tui.print(`${c5.gray}cleared all approvals${c5.reset}`);
   } else if (picked.startsWith("tool:")) {
     const t = picked.slice(5);
     perm.alwaysAllow.delete(t);
-    tui.print(`${c4.gray}revoked tool ${t}${c4.reset}`);
+    tui.print(`${c5.gray}revoked tool ${t}${c5.reset}`);
   } else if (picked.startsWith("risk:")) {
     const r = Number(picked.slice(5));
     perm.allowRisk.delete(r);
-    tui.print(`${c4.gray}revoked level ${r}${c4.reset}`);
+    tui.print(`${c5.gray}revoked level ${r}${c5.reset}`);
   }
   save();
 }
@@ -10498,7 +10715,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(
-    `${c4.bold}MCP servers${c4.reset}  ${c4.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c4.reset}`,
+    `${c5.bold}MCP servers${c5.reset}  ${c5.dim}(\u2191/\u2193 \xB7 enter \xB7 esc to close)${c5.reset}`,
     items
   );
   if (!picked) return;
@@ -10512,7 +10729,7 @@ async function runMcpMenu(tui, mcp) {
   }
   const server = configured.find((s) => s.name === picked);
   const isConnected = connected.has(picked);
-  const action = await tui.select(`${c4.bold}${picked}${c4.reset}`, [
+  const action = await tui.select(`${c5.bold}${picked}${c5.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" },
@@ -10522,29 +10739,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(`${c4.gray}${picked} is not connected \u2014 connect it to list tools.${c4.reset}`);
+      tui.print(`${c5.gray}${picked} is not connected \u2014 connect it to list tools.${c5.reset}`);
       return;
     }
-    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}`);
+    if (!entry.tools.length) tui.print(`${c5.gray}${picked} exposes no tools.${c5.reset}`);
+    for (const t of entry.tools) tui.print(`  ${c5.cyan}${t.name}${c5.reset}${t.description ? ` ${c5.gray}\u2014 ${t.description}${c5.reset}` : ""}`);
+    if (entry.resources.length) tui.print(`  ${c5.gray}${entry.resources.length} resource(s)${c5.reset}`);
   } else if (action === "connect") {
     const res = await mcp.connect(server);
-    tui.print(res.ok ? `${c4.cyan}\u26A1 connected (${res.tools} tools)${c4.reset}` : `${c4.red}\u26A0 ${res.error}${c4.reset}`);
+    tui.print(res.ok ? `${c5.cyan}\u26A1 connected (${res.tools} tools)${c5.reset}` : `${c5.red}\u26A0 ${res.error}${c5.reset}`);
   } else if (action === "disconnect") {
     mcp.disconnect(picked);
-    tui.print(`${c4.gray}disconnected ${picked}${c4.reset}`);
+    tui.print(`${c5.gray}disconnected ${picked}${c5.reset}`);
   } else if (action === "enable") {
     mcp.setEnabled(picked, true);
     const res = await mcp.connect(server);
-    tui.print(res.ok ? `${c4.cyan}\u26A1 enabled + connected (${res.tools} tools)${c4.reset}` : `${c4.red}\u26A0 enabled but failed: ${res.error}${c4.reset}`);
+    tui.print(res.ok ? `${c5.cyan}\u26A1 enabled + connected (${res.tools} tools)${c5.reset}` : `${c5.red}\u26A0 enabled but failed: ${res.error}${c5.reset}`);
   } else if (action === "disable") {
     mcp.setEnabled(picked, false);
     mcp.disconnect(picked);
-    tui.print(`${c4.gray}disabled + disconnected ${picked}${c4.reset}`);
+    tui.print(`${c5.gray}disabled + disconnected ${picked}${c5.reset}`);
   } else if (action === "remove") {
     mcp.remove(picked);
-    tui.print(`${c4.gray}removed ${picked}${c4.reset}`);
+    tui.print(`${c5.gray}removed ${picked}${c5.reset}`);
   }
 }
 async function addMcpServer(tui, mcp) {
@@ -10555,13 +10772,13 @@ async function addMcpServer(tui, mcp) {
   if (!spec) return;
   const cfg = parseServerSpec(spec);
   if (!cfg) {
-    tui.print(`${c4.yellow}couldn't parse that. Use  name: command [args]${c4.reset}`);
+    tui.print(`${c5.yellow}couldn't parse that. Use  name: command [args]${c5.reset}`);
     return;
   }
-  tui.print(`${c4.gray}connecting MCP "${cfg.name}" (${cfg.command} ${cfg.args.join(" ")})\u2026${c4.reset}`);
+  tui.print(`${c5.gray}connecting MCP "${cfg.name}" (${cfg.command} ${cfg.args.join(" ")})\u2026${c5.reset}`);
   const res = await mcp.add(cfg);
-  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}`);
+  if (res.ok) tui.print(`${c5.cyan}\u26A1 MCP "${cfg.name}" connected${c5.reset} ${c5.gray}(${res.tools} tool${res.tools === 1 ? "" : "s"})${c5.reset}`);
+  else tui.print(`${c5.red}\u26A0 MCP "${cfg.name}" failed:${c5.reset} ${c5.gray}${res.error}${c5.reset} ${c5.dim}(saved; retry from the MCP menu)${c5.reset}`);
 }
 async function installMcpServerFlow(tui, mcp) {
   const query = await tui.prompt(