@mrciphersmith/keryx 0.2.116 → 0.2.118

package/dist/cli.js

@@ -50252,7 +50252,7 @@ import path47 from "path";
 // package.json
 var package_default = {
   name: "@mrciphersmith/keryx",
-  version: "0.2.116",
+  version: "0.2.118",
   description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   private: false,
   publishConfig: {
@@ -74138,6 +74138,15 @@ function parseGrokToml(file, text) {
       }
       continue;
     }
+    const arrayHeader = /^\[\[([^[\]]+)\]\]$/.exec(line);
+    if (arrayHeader !== null) {
+      const first = arrayHeader[1].split(".")[0]?.trim().replace(/^(["'])(.*)\1$/, "$2");
+      current = undefined;
+      if (first === "mcp_servers") {
+        problems.push({ file, message: `line ${lineNo}: "${line}" is not a table header this reader understands` });
+      }
+      continue;
+    }
     if (line.startsWith("[")) {
       problems.push({ file, message: `line ${lineNo}: "${line}" is not a table header this reader understands` });
       current = undefined;
@@ -82502,8 +82511,6 @@ function realSpawner() {
       env,
       detached: true
     });
-    let dataCb;
-    let exitCb;
     let netClosed = false;
     const closeNetOnce = async () => {
       if (netClosed)
@@ -82511,43 +82518,81 @@ function realSpawner() {
       netClosed = true;
       await netClose();
     };
-    const outDecoder = new TextDecoder;
-    const errDecoder = new TextDecoder;
-    const pump = async (stream, kind, decoder) => {
-      if (stream === undefined)
-        return;
-      const reader = stream.getReader();
-      try {
-        for (;; ) {
-          const chunk = await reader.read();
-          if (chunk.done)
-            break;
-          if (chunk.value !== undefined)
-            dataCb?.(decoder.decode(chunk.value, { stream: true }), kind);
-        }
-      } catch {} finally {
-        reader.releaseLock();
-      }
-    };
-    Promise.all([pump(proc.stdout, "stdout", outDecoder), pump(proc.stderr, "stderr", errDecoder)]);
-    proc.exited.then(async (exitCode) => {
-      exitCb?.({ exitCode });
-      await closeNetOnce();
-    });
-    return {
-      pid: proc.pid,
-      onOutput: (cb) => {
-        dataCb = cb;
-      },
-      onExit: (cb) => {
-        exitCb = cb;
-      },
+    return superviseSpawnedProcess(proc, {
       kill: (signal) => {
         try {
           process.kill(-proc.pid, signal);
         } catch {}
+      },
+      afterExit: closeNetOnce
+    });
+  };
+}
+var EXIT_OUTPUT_DRAIN_MS = 2000;
+function superviseSpawnedProcess(proc, opts) {
+  const drainMs = opts.drainMs ?? EXIT_OUTPUT_DRAIN_MS;
+  let dataCb;
+  let exitCb;
+  const pendingChunks = [];
+  let pendingExit;
+  const emitData = (chunk, stream) => {
+    if (dataCb === undefined)
+      pendingChunks.push({ chunk, stream });
+    else
+      dataCb(chunk, stream);
+  };
+  const outDecoder = new TextDecoder;
+  const errDecoder = new TextDecoder;
+  const pump = async (stream, kind, decoder) => {
+    if (stream === undefined)
+      return;
+    const reader = stream.getReader();
+    try {
+      for (;; ) {
+        const chunk = await reader.read();
+        if (chunk.done)
+          break;
+        if (chunk.value !== undefined)
+          emitData(decoder.decode(chunk.value, { stream: true }), kind);
       }
-    };
+    } catch {} finally {
+      reader.releaseLock();
+    }
+  };
+  const drained = Promise.all([
+    pump(proc.stdout, "stdout", outDecoder),
+    pump(proc.stderr, "stderr", errDecoder)
+  ]);
+  proc.exited.then(async (exitCode) => {
+    let timer;
+    await Promise.race([
+      drained,
+      new Promise((resolve) => {
+        timer = setTimeout(resolve, drainMs);
+        timer.unref?.();
+      })
+    ]);
+    if (timer !== undefined)
+      clearTimeout(timer);
+    if (exitCb === undefined)
+      pendingExit = { exitCode };
+    else
+      exitCb({ exitCode });
+    await opts.afterExit?.();
+  });
+  return {
+    pid: proc.pid,
+    onOutput: (cb) => {
+      dataCb = cb;
+      for (const { chunk, stream } of pendingChunks.splice(0))
+        cb(chunk, stream);
+    },
+    onExit: (cb) => {
+      exitCb = cb;
+      if (pendingExit !== undefined)
+        cb(pendingExit);
+    },
+    kill: opts.kill
   };
 }
 function createJobRegistry(options) {
@@ -89158,6 +89203,7 @@ function resolveInitialTab(tabs, initialTab) {
   }
   return first.id;
 }
+var MODAL_BODY_SCROLLBAR_COLS = 1;
 function innerWidthOf(state) {
   const panelWidth = state.panel.width;
   if (typeof panelWidth === "number" && panelWidth > MODAL_PANEL_CHROME_X) {
@@ -89210,7 +89256,7 @@ function mountTab(state, input, tabId) {
   const size = resolveModalPanelSize(availWidth, state.chrome.renderer.height, input.contentRows);
   const panelWidth = Math.min(availWidth, size.width);
   const cleanup = input.renderTab(tabId, state.body, {
-    width: resolveModalInnerWidth(panelWidth),
+    width: resolveModalInnerWidth(panelWidth) - MODAL_BODY_SCROLLBAR_COLS,
     height: modalBodyRows(size.height)
   });
   state.tabCleanup = typeof cleanup === "function" ? cleanup : undefined;
@@ -89387,6 +89433,9 @@ function ensureHost(otui, chrome) {
     if (key.name === "right" && claimArrow("right")) {
       return;
     }
+    if (state.tabs.length < 2 && (key.name === "left" || key.name === "right")) {
+      return;
+    }
     if (key.name === "left" || onStrip && key.name === "tab" && key.shift === true) {
       const prev = idx > 0 ? state.tabs[idx - 1] : undefined;
       if (prev !== undefined) {
@@ -89428,11 +89477,11 @@ function ensureHost(otui, chrome) {
 }
 function makeHandle(state, generation) {
   return {
-    close() {
+    close(opts) {
       if (state.generation !== generation) {
         return;
       }
-      closeHost(state, { restoreFocus: true, runOnClose: true });
+      closeHost(state, { restoreFocus: opts?.restoreFocus ?? true, runOnClose: true });
     },
     setTab(id) {
       if (state.generation !== generation || !state.open || state.input === undefined) {
@@ -89481,6 +89530,12 @@ function openModal(otui, chrome, input) {
   if (focused === null || !containsNode(state.scroll, focused)) {
     state.tabStrip.focus();
   }
+  const r = chrome.renderer;
+  setTimeout(() => {
+    if (state.generation === generation && state.open) {
+      r.requestRender();
+    }
+  }, 0);
   return makeHandle(state, generation);
 }
 
@@ -90475,7 +90530,7 @@ function classifyBusyDispatch(params) {
 // src/tui/boot-animation.ts
 var DEFAULT_BOOT_DURATION_MS = 350;
 var WORDMARK = ["========================", "       K E R Y X        ", "========================"];
-var STEPS = ["Reading .metaproject index", "Connecting provider", "Warming graph"];
+var SPLASH_HINT = "type a message to start \xB7 / for commands";
 async function playBootAnimation(otui, r, opts) {
   if (process.env.KERYX_SKIP_BOOT === "1" || opts.skip === true) {
     return;
@@ -90500,29 +90555,14 @@ async function playBootAnimation(otui, r, opts) {
   for (const [index, line] of WORDMARK.entries()) {
     logoBox.add(new otui.TextRenderable(r, { id: `boot-logo-${index}`, content: otui.t`${otui.bold(line)}` }));
   }
-  const statusText = new otui.TextRenderable(r, {
-    id: "boot-status",
-    content: otui.t`${otui.dim(STEPS[0] ?? "")}`,
-    marginTop: 1
-  });
-  box.add(statusText);
   box.add(new otui.TextRenderable(r, { id: "boot-hint", content: otui.t`${otui.dim("any key to skip")}`, marginTop: 1 }));
   await new Promise((resolve) => {
     let settled = false;
-    let stepIndex = 0;
-    const stepTimer = setInterval(() => {
-      stepIndex = Math.min(stepIndex + 1, STEPS.length - 1);
-      const step = STEPS[stepIndex];
-      if (step !== undefined) {
-        statusText.content = otui.t`${otui.dim(step)}`;
-      }
-    }, Math.max(1, Math.floor(durationMs / STEPS.length)));
     const finish = () => {
       if (settled) {
         return;
       }
       settled = true;
-      clearInterval(stepTimer);
       clearTimeout(doneTimer);
       unsubscribe();
       r.root.remove(box);
@@ -90532,6 +90572,31 @@ async function playBootAnimation(otui, r, opts) {
     const unsubscribe = opts.onKeypress(() => finish());
   });
 }
+var SHELL_CHROME_ROWS = 8;
+function mountEmptyTranscriptSplash(otui, r, transcript) {
+  const rows = WORDMARK.length + 2;
+  const paneRows = Math.max(0, r.height - SHELL_CHROME_ROWS);
+  const box = new otui.BoxRenderable(r, {
+    id: "transcript-splash",
+    width: "100%",
+    flexDirection: "column",
+    alignItems: "center",
+    flexShrink: 0,
+    marginTop: Math.max(1, Math.floor((paneRows - rows) / 2))
+  });
+  for (const [index, line] of WORDMARK.entries()) {
+    box.add(new otui.TextRenderable(r, { id: `splash-logo-${index}`, content: otui.t`${otui.bold(line)}` }));
+  }
+  box.add(new otui.TextRenderable(r, { id: "splash-hint", content: otui.t`${otui.dim(SPLASH_HINT)}`, marginTop: 1 }));
+  transcript.add(box);
+  let removed = false;
+  return () => {
+    if (removed)
+      return;
+    removed = true;
+    transcript.remove(box);
+  };
+}
 
 // src/tui/workspace-inspector.ts
 var WORKSPACE_COMMAND = "/workspace";
@@ -91270,13 +91335,11 @@ async function declineProposalViaShell(run, workspaceId, proposalId) {
 
 // src/tui/mcp-inspector.ts
 var MCP_INSPECTOR_FOOTER = [
-  { key: "\u2191/\u2193", label: "select" },
-  { key: "click", label: "row: select/act" },
-  { key: "c/d", label: "connect/disconnect" },
-  { key: "y", label: "confirm" },
+  { key: "\u2191/\u2193", label: "scroll/select" },
   { key: "\u2190/\u2192", label: "tabs" },
   { key: "esc", label: "close" }
 ];
+var MCP_TAB_KEYS = "keys: c/d connect/disconnect \xB7 y confirm \xB7 click a row to arm, again to confirm";
 var MCP_TOOLS_COMMAND = "/integrations";
 function isMcpToolsCommand(line) {
   return (line.trim().split(/\s+/)[0] ?? "") === MCP_TOOLS_COMMAND;
@@ -91294,10 +91357,87 @@ var RUNTIME_LABELS = {
 function runtimeLabel(id) {
   return RUNTIME_LABELS[id] ?? id;
 }
-function formatToolRowLine(tool) {
-  const risk = (tool.risk ?? "read").padEnd(6);
-  const name = tool.name.padEnd(28);
-  return `${name} ${risk} ${tool.description ?? ""}`.trimEnd();
+var MIN_HANGING_BUDGET = 24;
+var FALLBACK_INDENT = 4;
+function splitLongWord(word, budget) {
+  const pieces = [];
+  let rest = word;
+  while (rest.length > budget) {
+    const slash = rest.lastIndexOf("/", budget);
+    const cut = slash > 0 ? slash : budget;
+    pieces.push(rest.slice(0, cut));
+    rest = rest.slice(cut);
+  }
+  pieces.push(rest);
+  return pieces;
+}
+function wrapHangingRow(head, text, width, indent = head.length) {
+  if (width === undefined) {
+    return [`${head}${text}`.trimEnd()];
+  }
+  const hang = width - indent >= MIN_HANGING_BUDGET ? indent : Math.min(indent, FALLBACK_INDENT);
+  const pad = " ".repeat(hang);
+  const budget = Math.max(1, width - hang);
+  const out = [];
+  let current = head;
+  let fresh = true;
+  const units = [];
+  for (const match of text.matchAll(/(\S+)( *)/g)) {
+    const word = match[1];
+    const last = units.at(-1);
+    if (last !== undefined && last.gap === " " && last.word.includes("/") && word.includes("/") && !/^[/~-]/.test(word)) {
+      last.word += ` ${word}`;
+      last.gap = match[2];
+      continue;
+    }
+    units.push({ word, gap: match[2] });
+  }
+  let gap = "";
+  for (const unit of units) {
+    for (const [i, piece] of splitLongWord(unit.word, budget).entries()) {
+      const sep = fresh || i > 0 ? "" : gap;
+      if (current.length + sep.length + piece.length <= width || fresh && current === pad) {
+        current += sep + piece;
+      } else {
+        out.push(current.trimEnd());
+        current = pad + piece;
+      }
+      fresh = false;
+    }
+    gap = unit.gap;
+  }
+  out.push(current.trimEnd());
+  return out;
+}
+var TOOL_NAME_COLUMN = 28;
+var TOOL_APPROVAL_COLUMN = 8;
+function approvalLabel(risk) {
+  const value = risk ?? "read";
+  return value === "read" ? "none" : value;
+}
+var TOOLS_COLUMN_HEADER = `${"tool".padEnd(TOOL_NAME_COLUMN)} ${"approval".padEnd(TOOL_APPROVAL_COLUMN)} description`;
+function formatToolRowLines(tool, width) {
+  const head = `${tool.name.padEnd(TOOL_NAME_COLUMN)} ${approvalLabel(tool.risk).padEnd(TOOL_APPROVAL_COLUMN)} `;
+  return wrapHangingRow(head, tool.description ?? "", width, TOOL_NAME_COLUMN + TOOL_APPROVAL_COLUMN + 2);
+}
+function fitRowsByLines(lineCounts, start, rows) {
+  if (lineCounts.length === 0) {
+    return { start: 0, end: 0 };
+  }
+  let maxStart = lineCounts.length - 1;
+  let tail = lineCounts[maxStart] ?? 1;
+  while (maxStart > 0 && tail + (lineCounts[maxStart - 1] ?? 1) <= rows) {
+    maxStart -= 1;
+    tail += lineCounts[maxStart] ?? 1;
+  }
+  const from = Math.min(maxStart, Math.max(0, start));
+  let end = from + 1;
+  let used = lineCounts[from] ?? 1;
+  while (end < lineCounts.length && used + (lineCounts[end] ?? 1) <= rows) {
+    used += lineCounts[end] ?? 1;
+    end += 1;
+  }
+  return { start: from, end };
 }
 function isActionable(id) {
   return id !== "generic";
@@ -91312,7 +91452,7 @@ function formatOtherServers(otherServers) {
   const list = rest > 0 ? `${shown.join(", ")}, +${rest} more` : shown.join(", ");
   return `  \xB7 also has: ${list}`;
 }
-function formatMcpRowLine(runtime, isSelected, status) {
+function formatMcpRowLine(runtime, isSelected, status, width) {
   const mark = isSelected ? ">" : " ";
   const label = runtimeLabel(runtime.id).padEnd(20);
   const statusText = runtime.connected ? "\u25CF keryx connected" : "\u25CB keryx not connected";
@@ -91328,7 +91468,8 @@ function formatMcpRowLine(runtime, isSelected, status) {
   } else {
     action = runtime.connected ? "  [d] disconnect" : "  [c] connect";
   }
-  return `${mark} ${label} ${statusText}${action}${formatOtherServers(runtime.otherServers)}`;
+  return wrapHangingRow(`${mark} ${label} `, `${statusText}${action}${formatOtherServers(runtime.otherServers)}`, width).join(`
+`);
 }
 function asRowTarget(body) {
   const parent = body;
@@ -91352,6 +91493,7 @@ function presentMcpTools(openModal, otui, chrome, options) {
   let rowCtor;
   let activeRenderer;
   let unsubscribeKey;
+  let bodyWidth;
   const rendererHint = options.renderer ?? chrome?.renderer;
   const bodyRows = options.visibleRows ?? (typeof rendererHint?.width === "number" && typeof rendererHint.height === "number" ? modalBodyRows(resolveModalPanelSize(rendererHint.width, rendererHint.height).height) : 13);
   const paintToolsRows = () => {
@@ -91364,11 +91506,23 @@ function presentMcpTools(openModal, otui, chrome, options) {
       toolsBody.add(new rowCtor(activeRenderer, { id: "mcp-tools-empty", content: "No tools available." }));
       return;
     }
-    const start = clampScroll3(toolsScroll, options.tools.length, bodyRows);
-    for (const [i, tool] of options.tools.slice(start, start + bodyRows).entries()) {
-      toolsBody.add(new rowCtor(activeRenderer, { id: `mcp-tool-row-${start + i}`, content: formatToolRowLine(tool) }));
+    toolsBody.add(new rowCtor(activeRenderer, { id: "mcp-tools-columns", content: TOOLS_COLUMN_HEADER }));
+    const rows = options.tools.map((tool) => formatToolRowLines(tool, bodyWidth));
+    const window = toolsWindow(rows);
+    toolsScroll = window.start;
+    for (let index = window.start;index < window.end; index++) {
+      toolsBody.add(new rowCtor(activeRenderer, {
+        id: `mcp-tool-row-${index}`,
+        content: (rows[index] ?? []).join(`
+`)
+      }));
     }
   };
+  const toolsRowBudget = () => {
+    const captionLines = wrapHangingRow("", TOOLS_TAB_HEADER, bodyWidth, 0).length;
+    return Math.max(1, bodyRows - captionLines - 1);
+  };
+  const toolsWindow = (rows) => fitRowsByLines(rows.map((lines) => lines.length), toolsScroll, toolsRowBudget());
   const paintMcpRows = () => {
     if (mcpBody === undefined || rowCtor === undefined) {
       return;
@@ -91380,18 +91534,19 @@ function presentMcpTools(openModal, otui, chrome, options) {
       mcpBody.add(new rowCtor(activeRenderer, { id: "mcp-mcp-empty", content: "No MCP client runtimes registered." }));
       return;
     }
+    mcpBody.add(new rowCtor(activeRenderer, { id: "mcp-mcp-keys", content: MCP_TAB_KEYS }));
     const start = clampScroll3(mcpScroll, runtimes.length, bodyRows);
     for (const [i, runtime] of runtimes.slice(start, start + bodyRows).entries()) {
       const index = start + i;
       mcpBody.add(new rowCtor(activeRenderer, {
         id: `mcp-row-${runtime.id}`,
-        content: formatMcpRowLine(runtime, index === mcpSelected, status),
+        content: formatMcpRowLine(runtime, index === mcpSelected, status, bodyWidth),
         onMouseDown: () => handleRowClick(runtime.id, index)
       }));
     }
   };
   const paint = () => {
-    toolsScroll = clampScroll3(toolsScroll, options.tools.length, bodyRows);
+    toolsScroll = Math.max(0, toolsScroll);
     mcpScroll = scrollToReveal3(mcpSelected, mcpScroll, bodyRows);
     mcpScroll = clampScroll3(mcpScroll, runtimes.length, bodyRows);
     paintToolsRows();
@@ -91474,9 +91629,10 @@ function presentMcpTools(openModal, otui, chrome, options) {
       }
       rowCtor = ctor;
       activeRenderer = renderer;
+      bodyWidth = ctx?.width;
       if (tabId === "tools") {
         toolsBody = target;
-        toolsScroll = clampScroll3(toolsScroll, options.tools.length, bodyRows);
+        toolsScroll = Math.max(0, toolsScroll);
         paintToolsRows();
         return;
       }
@@ -91524,7 +91680,7 @@ function presentMcpTools(openModal, otui, chrome, options) {
         if (onMcp) {
           moveMcpSelection(mcpSelected - 1);
         } else {
-          toolsScroll = clampScroll3(toolsScroll - 1, options.tools.length, bodyRows);
+          toolsScroll = Math.max(0, toolsScroll - 1);
           paint();
         }
         return;
@@ -91533,7 +91689,7 @@ function presentMcpTools(openModal, otui, chrome, options) {
         if (onMcp) {
           moveMcpSelection(mcpSelected + 1);
         } else {
-          toolsScroll = clampScroll3(toolsScroll + 1, options.tools.length, bodyRows);
+          toolsScroll += 1;
           paint();
         }
         return;
@@ -91543,7 +91699,7 @@ function presentMcpTools(openModal, otui, chrome, options) {
         if (onMcp) {
           mcpScroll = clampScroll3(mcpScroll + step, runtimes.length, bodyRows);
         } else {
-          toolsScroll = clampScroll3(toolsScroll + step, options.tools.length, bodyRows);
+          toolsScroll = Math.max(0, toolsScroll + step);
         }
         paint();
       }
@@ -91556,6 +91712,7 @@ function openMcpTools(otui, chrome, options) {
 }
 
 // src/tui/mcp-consumer.ts
+import { homedir as homedir9 } from "os";
 var MCP_CONSUMER_COMMAND = "/mcp";
 function isMcpConsumerCommand(line) {
   return (line.trim().split(/\s+/)[0] ?? "") === MCP_CONSUMER_COMMAND;
@@ -91584,12 +91741,21 @@ function credentialNames(server) {
   }
   return [...names].sort();
 }
-function targetOf(server) {
+var MAX_TARGET_CHARS = 240;
+function collapseHome2(text, home) {
+  const trimmed = home.replace(/\/+$/, "");
+  if (trimmed === "")
+    return text;
+  const escaped = trimmed.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return text.replace(new RegExp(`(^|[\\s="'])${escaped}(?=/|$|[\\s"'])`, "g"), "$1~");
+}
+function targetOf(server, home) {
   const raw = server.raw;
-  const target = typeof raw.url === "string" && raw.url.length > 0 ? displayUrl(raw.url) : [raw.command, ...raw.args ?? []].filter(Boolean).join(" ");
-  return sanitiseIdentifier(target);
+  const target = typeof raw.url === "string" && raw.url.length > 0 ? displayUrl(raw.url) : collapseHome2([raw.command, ...raw.args ?? []].filter(Boolean).join(" "), home);
+  return sanitiseIdentifier(target, MAX_TARGET_CHARS);
 }
 function buildConsumerModel(input) {
+  const home = input.home ?? homedir9();
   const stateByName = new Map(input.states.map((s) => [s.name, s]));
   const rows = input.configured.map((server) => {
     const state = stateByName.get(server.name);
@@ -91601,7 +91767,7 @@ function buildConsumerModel(input) {
       transport: transportOf(server),
       status,
       toolCount: state?.toolCount ?? 0,
-      target: targetOf(server),
+      target: targetOf(server, home),
       credentials: credentialNames(server),
       detail,
       action: status === "needs-approval" ? `keryx mcp trust ${server.name}` : status === "needs_auth" ? "set the variable named above, then restart the session" : undefined
@@ -91609,10 +91775,10 @@ function buildConsumerModel(input) {
   });
   return {
     rows,
-    problems: input.problems.map((p) => `${p.file}: ${sanitiseForDisplay(p.message)}`),
+    problems: input.problems.map((p) => `${collapseHome2(p.file, home)}: ${sanitiseForDisplay(p.message)}`),
     emptyHint: rows.length > 0 ? undefined : `No MCP servers configured.
-  user:    ${input.userFile}
-  project: ${input.projectFile}`
+  user:    ${collapseHome2(input.userFile, home)}
+  project: ${collapseHome2(input.projectFile, home)}`
   };
 }
 var MCP_CONSUMER_FOOTER = [
@@ -91641,7 +91807,7 @@ function consumerActionFor(status) {
 function statusGlyph(status) {
   return STATUS_GLYPH[status] ?? status;
 }
-function formatConsumerModalRow(row, isSelected, status) {
+function formatConsumerModalRow(row, isSelected, status, width) {
   const mark = isSelected ? ">" : " ";
   const name = row.name.padEnd(18);
   const source = row.source.padEnd(10);
@@ -91666,7 +91832,8 @@ function formatConsumerModalRow(row, isSelected, status) {
     action = "";
   }
   const creds = row.credentials.length > 0 ? `  [reads ${row.credentials.join(", ")}]` : "";
-  return `${mark} ${name} ${source} ${transport} ${glyph}${tools}${action}  ${row.target}${creds}`.trimEnd();
+  return wrapHangingRow(`${mark} ${name} ${source} ${transport} ${glyph}`, `${tools}${action}  ${row.target}${creds}`, width).join(`
+`);
 }
 function formatConsumerModalLines(model, selected, status) {
   if (model === undefined) {
@@ -91707,6 +91874,7 @@ function presentMcpConsumer(openModalFn, otui, chrome, options) {
   let rowCtor;
   let activeRenderer;
   let unsubscribeKey;
+  let bodyWidth;
   const rendererHint = options.renderer ?? chrome?.renderer;
   const bodyRows = options.visibleRows ?? (typeof rendererHint?.width === "number" && typeof rendererHint.height === "number" ? modalBodyRows(resolveModalPanelSize(rendererHint.width, rendererHint.height).height) : 13);
   const rowsOf = () => options.snapshot()?.rows ?? [];
@@ -91739,7 +91907,7 @@ function presentMcpConsumer(openModalFn, otui, chrome, options) {
       const index = start + i;
       body.add(new rowCtor(activeRenderer, {
         id: `mcp-consumer-row-${row.name}`,
-        content: formatConsumerModalRow(row, index === selected, status),
+        content: formatConsumerModalRow(row, index === selected, status, bodyWidth),
         onMouseDown: () => handleRowClick(row.name, index)
       }));
     }
@@ -91810,6 +91978,7 @@ function presentMcpConsumer(openModalFn, otui, chrome, options) {
       rowCtor = ctor;
       activeRenderer = renderer;
       body = target;
+      bodyWidth = ctx?.width;
       paint();
     },
     onClose: () => {
@@ -97618,30 +97787,31 @@ var CUSTOM_ADD_ENTRY = {
   label: "\uFF0B Add custom provider (OpenAI-compatible)",
   note: "name \xB7 URL \xB7 key \xB7 models \u2192 saved to llm-providers.json"
 };
-function promptCustomFieldStep(otui, r, opts) {
+function promptCustomFieldStep(otui, target, opts) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "custom-field-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "cf-title", content: otui.t`${otui.bold(opts.title)} ${otui.dim("(Enter \xB7 Esc to go back)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "custom-field-picker",
+      title: opts.title,
+      tab: "Custom provider",
+      hint: "(Enter \xB7 Esc to go back)",
+      footer: inputStepFooter("back"),
+      contentRows: opts.note !== undefined ? 4 : 2,
+      onEscape: () => {
+        input.blur();
+        resolve({ kind: "back" });
+      }
+    });
     if (opts.note !== undefined) {
-      box.add(new otui.TextRenderable(r, { id: "cf-note", content: otui.t`${otui.dim(opts.note)}`, marginTop: 1 }));
+      surface.body.add(new otui.TextRenderable(r, { id: "cf-note", content: otui.t`${otui.dim(opts.note)}`, marginTop: 1 }));
     }
     const input = new otui.InputRenderable(r, { id: "cf-input", value: opts.value ?? "", marginTop: 1 });
-    box.add(input);
+    surface.body.add(input);
     input.focus();
     const cleanup = () => {
-      unsub();
       input.blur();
-      r.root.remove(box);
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve({ kind: "back" });
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     input.on(otui.InputRenderableEvents.ENTER, () => {
       const entered = input.value.trim();
       cleanup();
@@ -97661,9 +97831,9 @@ function parseOptionalPositiveWizardNumber(raw) {
   const parsed = parseOptionalWizardNumber(raw);
   return parsed !== undefined && parsed > 0 ? parsed : undefined;
 }
-async function promptCustomProviderWizard(otui, r) {
+async function promptCustomProviderWizard(otui, target) {
   while (true) {
-    const nameStep = await promptCustomFieldStep(otui, r, {
+    const nameStep = await promptCustomFieldStep(otui, target, {
       title: "Provider name",
       note: "unique id used in /provider (letters, digits, - _)"
     });
@@ -97675,7 +97845,7 @@ async function promptCustomProviderWizard(otui, r) {
       continue;
     }
     while (true) {
-      const urlStep = await promptCustomFieldStep(otui, r, {
+      const urlStep = await promptCustomFieldStep(otui, target, {
         title: "Base URL",
         note: "before the chat path \u2014 /v1/chat/completions is appended, e.g. http://10.110.43.19:8080",
         value: "http://localhost:8000"
@@ -97697,7 +97867,7 @@ async function promptCustomProviderWizard(otui, r) {
         continue;
       }
       const baseUrl = baseUrlRaw.replace(/\/+$/, "");
-      const keyStep = await promptCustomFieldStep(otui, r, {
+      const keyStep = await promptCustomFieldStep(otui, target, {
         title: "API key (optional)",
         note: "empty = no key \xB7 saved owner-only (0600) in your keryx config dir"
       });
@@ -97705,7 +97875,7 @@ async function promptCustomProviderWizard(otui, r) {
         continue;
       }
       const apiKey = keyStep.value.length > 0 ? keyStep.value : undefined;
-      const modelsStep = await promptCustomFieldStep(otui, r, {
+      const modelsStep = await promptCustomFieldStep(otui, target, {
         title: "Models (optional)",
         note: "comma-separated ids \xB7 empty = fetch the live /v1/models list"
       });
@@ -97713,7 +97883,7 @@ async function promptCustomProviderWizard(otui, r) {
         continue;
       }
       const models = modelsStep.value.split(",").map((m) => m.trim()).filter((m) => m.length > 0);
-      const temperatureStep = await promptCustomFieldStep(otui, r, {
+      const temperatureStep = await promptCustomFieldStep(otui, target, {
         title: "Temperature (optional)",
         note: "empty = provider default \xB7 e.g. 0.2"
       });
@@ -97721,7 +97891,7 @@ async function promptCustomProviderWizard(otui, r) {
         continue;
       }
       const temperature = parseOptionalWizardNumber(temperatureStep.value);
-      const maxOutputTokensStep = await promptCustomFieldStep(otui, r, {
+      const maxOutputTokensStep = await promptCustomFieldStep(otui, target, {
         title: "Max output tokens (optional)",
         note: "empty = default 1024 \xB7 e.g. 4096"
       });
@@ -97729,7 +97899,7 @@ async function promptCustomProviderWizard(otui, r) {
         continue;
       }
       const maxOutputTokens = parseOptionalPositiveWizardNumber(maxOutputTokensStep.value);
-      const timeoutMsStep = await promptCustomFieldStep(otui, r, {
+      const timeoutMsStep = await promptCustomFieldStep(otui, target, {
         title: "Request timeout ms (optional)",
         note: "empty = no engine-internal timeout \xB7 e.g. 180000"
       });
@@ -98084,6 +98254,78 @@ function onKeypress4(r, handler) {
   r._internalKeyInput.onInternal("keypress", handler);
   return () => r._internalKeyInput.offInternal("keypress", handler);
 }
+function isModalChrome(target) {
+  return target !== null && typeof target === "object" && "renderer" in target && "focusComposer" in target;
+}
+function stepRenderer(target) {
+  return isModalChrome(target) ? target.renderer : target;
+}
+function openStepSurface(otui, target, opts) {
+  const r = stepRenderer(target);
+  if (!isModalChrome(target)) {
+    const box = overlayBox(otui, r, opts.id);
+    r.root.add(box);
+    box.add(new otui.TextRenderable(r, { id: `${opts.id}-title`, content: otui.t`${otui.bold(opts.title)} ${otui.dim(opts.hint)}` }));
+    let closed = false;
+    const close = () => {
+      if (closed)
+        return;
+      closed = true;
+      unsub();
+      r.root.remove(box);
+    };
+    const unsub = onKeypress4(r, (key) => {
+      if (key.name === "escape") {
+        close();
+        opts.onEscape();
+        key.preventDefault();
+        key.stopPropagation();
+      }
+    });
+    return { body: box, modal: false, close };
+  }
+  let body;
+  let closedByStep = false;
+  const handle = openModal(otui, target, {
+    title: opts.title,
+    tabs: [{ id: opts.id, label: opts.tab }],
+    footer: opts.footer,
+    contentRows: opts.contentRows,
+    renderTab: (_tabId, tabBody) => {
+      body = tabBody;
+    },
+    onClose: () => {
+      if (!closedByStep)
+        opts.onEscape();
+    }
+  });
+  if (handle === undefined || body === undefined) {
+    return openStepSurface(otui, r, opts);
+  }
+  return {
+    body,
+    modal: true,
+    close: () => {
+      if (closedByStep)
+        return;
+      closedByStep = true;
+      handle.close({ restoreFocus: false });
+    }
+  };
+}
+function selectStepFooter(escLabel) {
+  return [
+    { key: "\u2191/\u2193", label: "select" },
+    { key: "Enter", label: "confirm" },
+    { key: "esc", label: escLabel }
+  ];
+}
+function inputStepFooter(escLabel) {
+  return [
+    { key: "Enter", label: "confirm" },
+    { key: "esc", label: escLabel }
+  ];
+}
 function parseSearchProviderArgs(line) {
   const parts = line.trim().length === 0 ? [] : line.trim().split(/\s+/);
   const [providerId, ...tail] = parts;
@@ -98130,27 +98372,28 @@ async function selectSearchProviderAndReport(controller, onSystem, providerId) {
   onSystem?.(`Search provider '${providerId}' selected.
 `);
 }
-function promptSearchFieldStep(otui, r, field, value) {
+function promptSearchFieldStep(otui, target, field, value) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "search-field-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "sf-title", content: otui.t`${otui.bold(field.label)} ${otui.dim(`${field.required ? "required" : "optional"} \xB7 Enter \xB7 Esc to go back`)}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "search-field-picker",
+      title: field.label,
+      tab: field.required ? "Required" : "Optional",
+      hint: `${field.required ? "required" : "optional"} \xB7 Enter \xB7 Esc to go back`,
+      footer: inputStepFooter("back"),
+      contentRows: 2,
+      onEscape: () => {
+        input.blur();
+        resolve({ kind: "back" });
+      }
+    });
     const input = new otui.InputRenderable(r, { id: "sf-input", value, marginTop: 1 });
-    box.add(input);
+    surface.body.add(input);
     input.focus();
     const cleanup = () => {
-      unsub();
       input.blur();
-      r.root.remove(box);
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve({ kind: "back" });
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     input.on(otui.InputRenderableEvents.ENTER, () => {
       const entered = input.value.trim();
       cleanup();
@@ -98158,32 +98401,33 @@ function promptSearchFieldStep(otui, r, field, value) {
     });
   });
 }
-function promptSearchCredentialStep(otui, r, opts) {
+function promptSearchCredentialStep(otui, target, opts) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "search-credential-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "sc-title", content: otui.t`${otui.bold(`Paste your ${opts.label}`)} ${otui.dim("(Enter \xB7 Esc to go back)")}` }));
-    box.add(new otui.TextRenderable(r, {
+    const surface = openStepSurface(otui, target, {
+      id: "search-credential-picker",
+      title: `Paste your ${opts.label}`,
+      tab: "Credential",
+      hint: "(Enter \xB7 Esc to go back)",
+      footer: inputStepFooter("back"),
+      contentRows: 4,
+      onEscape: () => {
+        keyInput.blur();
+        resolve({ kind: "back" });
+      }
+    });
+    surface.body.add(new otui.TextRenderable(r, {
       id: "sc-note",
       content: otui.t`${otui.dim("Saved to your keryx config dir (owner-only, 0600)")}`,
       marginTop: 1
     }));
     const keyInput = new otui.InputRenderable(r, { id: "sc-input", placeholder: "...", marginTop: 1 });
-    box.add(keyInput);
+    surface.body.add(keyInput);
     keyInput.focus();
     const cleanup = () => {
-      unsub();
       keyInput.blur();
-      r.root.remove(box);
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve({ kind: "back" });
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     keyInput.on(otui.InputRenderableEvents.ENTER, () => {
       const value = keyInput.value.trim();
       cleanup();
@@ -98191,14 +98435,24 @@ function promptSearchCredentialStep(otui, r, opts) {
     });
   });
 }
-function promptSetActiveProviderStep(otui, r) {
+function promptSetActiveProviderStep(otui, target) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "search-active-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "sa-title", content: otui.t`${otui.bold("Set as active provider after a successful test?")} ${otui.dim("(\u2191/\u2193, Enter \xB7 Esc to go back)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "search-active-picker",
+      title: "Set as active provider after a successful test?",
+      tab: "Active",
+      hint: "(\u2191/\u2193, Enter \xB7 Esc to go back)",
+      footer: selectStepFooter("back"),
+      contentRows: selectBoxHeight(2, true),
+      onEscape: () => {
+        select.blur();
+        resolve(undefined);
+      }
+    });
     const select = new otui.SelectRenderable(r, {
       id: "sa-select",
-      width: 60,
+      width: surface.modal ? "100%" : 60,
       height: selectBoxHeight(2, true),
       options: [
         { name: "Yes", description: "select it once the test passes" },
@@ -98206,21 +98460,12 @@ function promptSetActiveProviderStep(otui, r) {
       ],
       selectedTextColor: "#ffd166"
     });
-    box.add(select);
+    surface.body.add(select);
     select.focus();
     const cleanup = () => {
-      unsub();
       select.blur();
-      r.root.remove(box);
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve(undefined);
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     select.on(otui.SelectRenderableEvents.ITEM_SELECTED, () => {
       const chosen = select.getSelectedOption();
       cleanup();
@@ -98228,35 +98473,36 @@ function promptSetActiveProviderStep(otui, r) {
     });
   });
 }
-function pickSearchProviderStep(otui, r, providers) {
+function pickSearchProviderStep(otui, target, providers) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "search-provider-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "spp-title", content: otui.t`${otui.bold("Select a search provider")} ${otui.dim("(\u2191/\u2193, Enter \xB7 Esc to cancel)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "search-provider-picker",
+      title: "Select a search provider",
+      tab: "Search providers",
+      hint: "(\u2191/\u2193, Enter \xB7 Esc to cancel)",
+      footer: selectStepFooter("cancel"),
+      contentRows: selectBoxHeight(providers.length, true),
+      onEscape: () => {
+        select.blur();
+        resolve(undefined);
+      }
+    });
     const labelOf = (p) => `${p.id} (${p.displayName})`;
     const select = new otui.SelectRenderable(r, {
       id: "spp-select",
-      width: 60,
+      width: surface.modal ? "100%" : 60,
       height: selectBoxHeight(providers.length, true),
       showScrollIndicator: true,
       options: providers.map((p) => ({ name: labelOf(p), description: p.kind })),
       selectedTextColor: "#ffd166"
     });
-    box.add(select);
+    surface.body.add(select);
     select.focus();
     const cleanup = () => {
-      unsub();
       select.blur();
-      r.root.remove(box);
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve(undefined);
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     select.on(otui.SelectRenderableEvents.ITEM_SELECTED, () => {
       const chosen = select.getSelectedOption();
       cleanup();
@@ -98316,19 +98562,46 @@ async function runSearchProviderFieldsStep(otui, r, provider, seed) {
   }
   return { kind: "done", fields, credential, setActive };
 }
-function runSearchProviderTestStep(otui, r, controller, provider, fields, credential, setActive) {
+function runSearchProviderTestStep(otui, target, controller, provider, fields, credential, setActive) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "search-test-picker");
-    r.root.add(box);
+    let settled;
+    let left = false;
+    const modal = isModalChrome(target);
+    let surface;
+    if (modal) {
+      surface = openStepSurface(otui, target, {
+        id: "search-test-picker",
+        title: `Test '${provider.id}'`,
+        tab: "Test",
+        hint: "",
+        footer: [
+          { key: "Enter", label: "close after success" },
+          { key: "esc", label: "back" }
+        ],
+        contentRows: 2,
+        onEscape: () => {
+          left = true;
+          unsub();
+          resolve(settled === "success" ? "done" : "retry");
+        }
+      });
+    }
+    const box = surface?.body ?? overlayBox(otui, r, "search-test-picker");
+    if (surface === undefined)
+      r.root.add(box);
     const status = new otui.TextRenderable(r, { id: "st-title", content: otui.t`${otui.bold(`Testing '${provider.id}'`)} ${otui.dim("...")}` });
     box.add(status);
-    let settled;
     const cleanup = () => {
+      left = true;
       unsub();
-      r.root.remove(box);
+      if (surface !== undefined)
+        surface.close();
+      else
+        r.root.remove(box);
     };
     const unsub = onKeypress4(r, (key) => {
-      if (settled === "failure" && key.name === "escape") {
+      if (!modal && settled === "failure" && key.name === "escape") {
         cleanup();
         resolve("retry");
         key.preventDefault();
@@ -98343,6 +98616,9 @@ function runSearchProviderTestStep(otui, r, controller, provider, fields, creden
     (async () => {
       controller.configure(provider.id, { ...provider.defaults, ...fields }, credential);
       const tested = await controller.test(provider.id);
+      if (left) {
+        return;
+      }
       if (!tested.ok) {
         settled = "failure";
         const reason = tested.reason === "missing-credential" ? "missing credential" : "connection validation failed";
@@ -98355,6 +98631,9 @@ function runSearchProviderTestStep(otui, r, controller, provider, fields, creden
         return;
       }
       const selected = await controller.select(provider.id);
+      if (left) {
+        return;
+      }
       status.content = selected.ok ? otui.t`${otui.green("\u2713")} ${otui.bold(`'${provider.id}' configured, tested, and set as active`)} ${otui.dim("(Enter to close)")}` : otui.t`${otui.green("\u2713")} ${otui.bold(`'${provider.id}' configured and tested`)} ${otui.dim(`but could not be set active (${selected.reason ?? "unknown"})`)} ${otui.dim("(Enter to close)")}`;
     })();
   });
@@ -98381,11 +98660,22 @@ async function searchProviderWizardInTui(otui, r, controller) {
       }
     }
 }
-function promptBaseUrlStep(otui, r, label, baseUrl, notice) {
+function promptBaseUrlStep(otui, target, label, baseUrl, notice) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "base-url-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "bp-title", content: otui.t`${otui.bold(`${label} endpoint URL`)} ${otui.dim("(Enter \xB7 Esc to go back)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "base-url-picker",
+      title: `${label} endpoint URL`,
+      tab: "Endpoint",
+      hint: "(Enter \xB7 Esc to go back)",
+      footer: inputStepFooter("back"),
+      contentRows: notice !== undefined ? 6 : 4,
+      onEscape: () => {
+        input.blur();
+        resolve(undefined);
+      }
+    });
+    const box = surface.body;
     if (notice !== undefined) {
       box.add(new otui.TextRenderable(r, { id: "bp-notice", content: otui.t`${otui.red("\u2717")} ${notice}`, marginTop: 1 }));
     }
@@ -98394,17 +98684,9 @@ function promptBaseUrlStep(otui, r, label, baseUrl, notice) {
     box.add(input);
     input.focus();
     const cleanup = () => {
-      unsub();
-      r.root.remove(box);
+      input.blur();
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve(undefined);
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     input.on(otui.InputRenderableEvents.ENTER, () => {
       const value = input.value.trim();
       cleanup();
@@ -98412,11 +98694,25 @@ function promptBaseUrlStep(otui, r, label, baseUrl, notice) {
     });
   });
 }
-function promptApiKeyStep(otui, r, opts) {
+function promptApiKeyStep(otui, target, opts) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "key-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "kp-title", content: otui.t`${otui.bold(`Paste your ${opts.label} API key`)} ${otui.dim("(Enter \xB7 Esc to go back)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "key-picker",
+      title: `Paste your ${opts.label} API key`,
+      tab: "API key",
+      hint: "(Enter \xB7 Esc to go back)",
+      footer: [
+        { key: "Enter", label: "save (empty = skip)" },
+        { key: "esc", label: "back" }
+      ],
+      contentRows: opts.notice !== undefined ? 6 : 4,
+      onEscape: () => {
+        keyInput.blur();
+        resolve({ kind: "back" });
+      }
+    });
+    const box = surface.body;
     if (opts.notice !== undefined) {
       box.add(new otui.TextRenderable(r, { id: "kp-notice", content: otui.t`${otui.red("\u2717")} ${opts.notice}`, marginTop: 1 }));
     }
@@ -98428,18 +98724,9 @@ function promptApiKeyStep(otui, r, opts) {
     const keyInput = new otui.InputRenderable(r, { id: "kp-input", placeholder: opts.placeholder ?? "sk-...", marginTop: 1 });
     box.add(keyInput);
     keyInput.focus();
-    const onKey = (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve({ kind: "back" });
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    };
-    const unsub = onKeypress4(r, onKey);
     const cleanup = () => {
-      unsub();
-      r.root.remove(box);
+      keyInput.blur();
+      surface.close();
     };
     keyInput.on(otui.InputRenderableEvents.ENTER, () => {
       const value = keyInput.value.trim();
@@ -98448,38 +98735,39 @@ function promptApiKeyStep(otui, r, opts) {
     });
   });
 }
-function pickAuthMethodStep(otui, r, providerLabel, methods) {
+function pickAuthMethodStep(otui, target, providerLabel, methods) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "auth-method-picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "amp-title", content: otui.t`${otui.bold(`How to connect ${providerLabel}`)} ${otui.dim("(\u2191/\u2193, Enter \xB7 Esc to go back)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "auth-method-picker",
+      title: `How to connect ${providerLabel}`,
+      tab: "Sign-in",
+      hint: "(\u2191/\u2193, Enter \xB7 Esc to go back)",
+      footer: selectStepFooter("back"),
+      contentRows: selectBoxHeight(methods.length, true),
+      onEscape: () => {
+        select.blur();
+        resolve(undefined);
+      }
+    });
     const descriptions = {
       "device-code": deviceCodeMethodLabel(providerLabel === "GitHub Copilot" ? "github-copilot" : providerLabel === "OpenAI" ? "openai" : "grok"),
       "api-key": "Manually enter API Key"
     };
     const select = new otui.SelectRenderable(r, {
       id: "amp-select",
-      width: 60,
+      width: surface.modal ? "100%" : 60,
       height: selectBoxHeight(methods.length, true),
       showScrollIndicator: true,
       options: methods.map((m) => ({ name: m, description: descriptions[m] })),
       selectedTextColor: "#ffd166"
     });
-    box.add(select);
+    surface.body.add(select);
     select.focus();
     const cleanup = () => {
-      unsub();
       select.blur();
-      r.root.remove(box);
+      surface.close();
     };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve(undefined);
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    });
     select.on(otui.SelectRenderableEvents.ITEM_SELECTED, () => {
       const chosen = select.getSelectedOption();
       cleanup();
@@ -98487,30 +98775,27 @@ function pickAuthMethodStep(otui, r, providerLabel, methods) {
     });
   });
 }
-function runDeviceLoginInTui(otui, r, provider, dir) {
+function runDeviceLoginInTui(otui, target, provider, dir) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "device-login");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, {
-      id: "dl-title",
-      content: otui.t`${otui.bold(deviceCodeMethodLabel(provider))} ${otui.dim("(Esc to cancel)")}`
-    }));
-    const status = new otui.TextRenderable(r, { id: "dl-status", content: otui.t`${otui.dim("Requesting a device code\u2026")}`, marginTop: 1 });
-    box.add(status);
     const controller = new AbortController;
-    const cleanup = () => {
-      unsub();
-      r.root.remove(box);
-    };
-    const unsub = onKeypress4(r, (key) => {
-      if (key.name === "escape") {
+    const surface = openStepSurface(otui, target, {
+      id: "device-login",
+      title: deviceCodeMethodLabel(provider),
+      tab: "Device login",
+      hint: "(Esc to cancel)",
+      footer: [{ key: "esc", label: "cancel" }],
+      contentRows: 4,
+      onEscape: () => {
         controller.abort();
-        cleanup();
         resolve(false);
-        key.preventDefault();
-        key.stopPropagation();
       }
     });
+    const status = new otui.TextRenderable(r, { id: "dl-status", content: otui.t`${otui.dim("Requesting a device code\u2026")}`, marginTop: 1 });
+    surface.body.add(status);
+    const cleanup = () => {
+      surface.close();
+    };
     loginDeviceCode({
       provider,
       fetch: (input, init) => globalThis.fetch(input, init),
@@ -98552,15 +98837,26 @@ function modelPickerNotice(label, result) {
   }
   return modelsFailureLine(label, result.failure);
 }
-function pickProviderStep(otui, r, detected) {
+function pickProviderStep(otui, target, detected) {
+  const r = stepRenderer(target);
   return new Promise((resolve) => {
-    const box = overlayBox(otui, r, "picker");
-    r.root.add(box);
-    box.add(new otui.TextRenderable(r, { id: "picker-title", content: otui.t`${otui.bold("Select a provider")} ${otui.dim("(\u2191/\u2193, Enter \xB7 Esc to cancel)")}` }));
+    const surface = openStepSurface(otui, target, {
+      id: "picker",
+      title: "Select a provider",
+      tab: "Providers",
+      hint: "(\u2191/\u2193, Enter \xB7 Esc to cancel)",
+      footer: selectStepFooter("cancel"),
+      contentRows: selectBoxHeight(detected.length, true),
+      onEscape: () => {
+        provSelect.blur();
+        resolve(undefined);
+      }
+    });
+    const box = surface.body;
     const labelOf = (d) => d.label ?? d.name;
     const provSelect = new otui.SelectRenderable(r, {
       id: "picker-provider",
-      width: 60,
+      width: surface.modal ? "100%" : 60,
       height: selectBoxHeight(detected.length, true),
       showScrollIndicator: true,
       options: detected.map((d) => ({ name: labelOf(d), description: d.note ?? `${d.models.length} model(s)` })),
@@ -98568,18 +98864,9 @@ function pickProviderStep(otui, r, detected) {
     });
     box.add(provSelect);
     provSelect.focus();
-    const onKey = (key) => {
-      if (key.name === "escape") {
-        cleanup();
-        resolve(undefined);
-        key.preventDefault();
-        key.stopPropagation();
-      }
-    };
-    const unsub = onKeypress4(r, onKey);
     const cleanup = () => {
-      unsub();
-      r.root.remove(box);
+      provSelect.blur();
+      surface.close();
     };
     provSelect.on(otui.SelectRenderableEvents.ITEM_SELECTED, () => {
       const chosen = provSelect.getSelectedOption();
@@ -98588,12 +98875,7 @@ function pickProviderStep(otui, r, detected) {
     });
   });
 }
-function isModalChrome(target) {
-  return target !== null && typeof target === "object" && "renderer" in target && "focusComposer" in target;
-}
 function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
-  const chrome = isModalChrome(rOrChrome) ? rOrChrome : undefined;
-  const r = chrome !== undefined ? chrome.renderer : rOrChrome;
   return new Promise((resolve) => {
     if (detected.length === 0) {
       resolve(undefined);
@@ -98611,13 +98893,13 @@ function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
       }
       const allCandidates = options.onlyConnected ? candidates : [...candidates, CUSTOM_ADD_ENTRY];
       while (true) {
-        const prov = await pickProviderStep(otui, r, allCandidates);
+        const prov = await pickProviderStep(otui, rOrChrome, allCandidates);
         if (prov === undefined) {
           resolve(undefined);
           return;
         }
         if (prov.name === CUSTOM_PROVIDER_ADD_ID) {
-          const created = await promptCustomProviderWizard(otui, r);
+          const created = await promptCustomProviderWizard(otui, rOrChrome);
           if (created !== undefined) {
             saveCustomCompatProvider({
               name: created.name,
@@ -98641,7 +98923,7 @@ function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
           continue;
         }
         const lockDiscoveredHost = prov.name === "github-copilot";
-        let selectedBaseUrl = options.onlyConnected || prov.baseUrl === undefined || lockDiscoveredHost ? prov.baseUrl : await promptBaseUrlStep(otui, r, prov.label ?? prov.name, prov.baseUrl);
+        let selectedBaseUrl = options.onlyConnected || prov.baseUrl === undefined || lockDiscoveredHost ? prov.baseUrl : await promptBaseUrlStep(otui, rOrChrome, prov.label ?? prov.name, prov.baseUrl);
         if (!options.onlyConnected && !lockDiscoveredHost && prov.baseUrl !== undefined && selectedBaseUrl === undefined) {
           continue;
         }
@@ -98669,13 +98951,13 @@ function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
             offered.push("api-key");
           let method = offered.length === 1 ? offered[0] : undefined;
           if (offered.length > 1) {
-            method = await pickAuthMethodStep(otui, r, label, offered);
+            method = await pickAuthMethodStep(otui, rOrChrome, label, offered);
             if (method === undefined) {
               return "back";
             }
           }
           if (method === "device-code") {
-            if (!await runDeviceLoginInTui(otui, r, prov.name, options.configDir)) {
+            if (!await runDeviceLoginInTui(otui, rOrChrome, prov.name, options.configDir)) {
               return "back";
             }
             const saved = loadShellConfig(options.configDir).baseUrls?.[prov.name];
@@ -98685,7 +98967,7 @@ function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
             }
             return "ok";
           }
-          const kr = await promptApiKeyStep(otui, r, {
+          const kr = await promptApiKeyStep(otui, rOrChrome, {
             label,
             envKey,
             ...notice === undefined ? {} : { notice }
@@ -98715,7 +98997,7 @@ function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
           models = await modelsForPicker(selectedProvider, modelDeps);
         }
         if (!options.onlyConnected && selectedProvider.baseUrl !== undefined && endpointMayBeAtFault(models.failure)) {
-          const corrected = await promptBaseUrlStep(otui, r, label, selectedProvider.baseUrl, modelsFailureLine(label, models.failure));
+          const corrected = await promptBaseUrlStep(otui, rOrChrome, label, selectedProvider.baseUrl, modelsFailureLine(label, models.failure));
           if (corrected === undefined) {
             continue;
           }
@@ -98726,7 +99008,7 @@ function selectProviderModelInTui(otui, rOrChrome, detected, options = {}) {
             models = await modelsForPicker(selectedProvider, modelDeps);
           }
         }
-        const model = await pickModelInTui(otui, chrome ?? r, models.models, modelPickerNotice(label, models), {
+        const model = await pickModelInTui(otui, rOrChrome, models.models, modelPickerNotice(label, models), {
           escLabel: "back"
         });
         if (model === undefined) {
@@ -98962,6 +99244,9 @@ function pickSessionInTui(otui, rOrChrome, sessions) {
     });
   });
 }
+function describeModeRow(mode, readOnly) {
+  return readOnly ? { mode, readOnly: "\xB7 read-only" } : { mode };
+}
 var MODE_PICKER_DESCRIPTIONS = {
   ask: "Every mutating action asks first (today's default)",
   trust: "Auto-approves safe actions; still asks for destructive/credential ones",
@@ -99073,6 +99358,8 @@ async function launchTuiAgentShell(opts) {
     sidebar.add(new otui.TextRenderable(r, { id: "sb-model-k", content: otui.t`${otui.dim("Model")}`, marginTop: 1 }));
     const sbModelV = new otui.TextRenderable(r, { id: "sb-model-v", content: otui.t`${otui.dim(`${sel.provider}/${sel.model}`)}` });
     sidebar.add(sbModelV);
+    const sbModeV = new otui.TextRenderable(r, { id: "sb-mode-v", content: "" });
+    sidebar.add(sbModeV);
     sidebar.add(new otui.TextRenderable(r, { id: "sb-usage-k", content: otui.t`${otui.dim("Usage")}`, marginTop: 1 }));
     const sbUsageV = new otui.TextRenderable(r, { id: "sb-usage-v", content: otui.t`${otui.dim("\u21910 \u21930")}` });
     sidebar.add(sbUsageV);
@@ -99689,6 +99976,11 @@ async function launchTuiAgentShell(opts) {
     io.permissionMode = () => permissionMode;
     let readOnly = false;
     io.readOnly = () => readOnly;
+    const paintModeRow = () => {
+      const row = describeModeRow(permissionMode, readOnly);
+      sbModeV.content = row.readOnly === undefined ? otui.t`${otui.dim(`mode ${row.mode}`)}` : otui.t`${otui.dim(`mode ${row.mode}`)} ${otui.yellow(row.readOnly)}`;
+    };
+    paintModeRow();
     io.onAutoApproved = (tool, input, meta) => {
       const preview = tool === "shell_exec" ? parseShellExecCommand(input) : tool;
       const label = meta.destructive ? `\u25C7 auto-approved (${permissionMode}) [destructive]` : `\u25C7 auto-approved (${permissionMode})`;
@@ -99716,7 +100008,12 @@ async function launchTuiAgentShell(opts) {
     };
     deps = { ...deps, onContextCompaction };
     liveDeps = deps;
+    let removeSplash;
     const applyOpened = (opened, previewHistory) => {
+      if (opened.history.length > 0) {
+        removeSplash?.();
+        removeSplash = undefined;
+      }
       liveSession = opened.handle;
       history = previewHistory === true ? opened.history.slice(-SESSION_PREVIEW_MESSAGE_COUNT) : opened.history;
       archive = opened.archive.length > 0 ? [...opened.archive] : [...opened.history];
@@ -99832,6 +100129,9 @@ async function launchTuiAgentShell(opts) {
       }));
     }
     slateSession = { dir: liveSession.dir, cwd: sessionCwd, opened: false };
+    if (history.length === 0) {
+      removeSplash = mountEmptyTranscriptSplash(otui, r, transcript);
+    }
     refreshWorkspaceSidebar();
     refreshReviewSidebar();
     const paintSessionHeader = () => {
@@ -100128,6 +100428,7 @@ Staying in the current session.
           }
         }
         permissionMode = next;
+        paintModeRow();
         chrome.showToast(`Permission mode: ${next}`);
         if (saveFlag) {
           const saved = setProjectPermissionMode(sessionCwd, next);
@@ -100185,11 +100486,13 @@ Staying in the current session.
       }
       if (wanted === "on") {
         readOnly = true;
+        paintModeRow();
         chrome.showToast("Read-only mode: on");
         return;
       }
       if (wanted === "off") {
         readOnly = false;
+        paintModeRow();
         chrome.showToast(`Read-only mode: off (permission mode stays: ${permissionMode})`);
         return;
       }
@@ -100569,6 +100872,8 @@ Staying in the current session.
       suggestionGate.cancel("new turn started");
       if (origin === "operator") {
         consecutiveAutoWakes = 0;
+        removeSplash?.();
+        removeSplash = undefined;
       }
       const displayLine = summarizeSubmittedLine(line);
       if (chrome.isBusy()) {
@@ -100874,7 +101179,7 @@ Staying in the current session.
             const args = parseSearchProviderArgs(line.slice(16));
             const all = searchProviderController.configurable();
             if (args.providerId === undefined) {
-              await chrome.withOverlay(() => searchProviderWizardInTui(otui, r, searchProviderController));
+              await chrome.withOverlay(() => searchProviderWizardInTui(otui, chrome, searchProviderController));
               input.focus();
               return;
             }
@@ -100910,7 +101215,7 @@ Staying in the current session.
 `);
                 return;
               }
-              const picked = await chrome.withOverlay(() => pickSearchProviderStep(otui, r, selectable));
+              const picked = await chrome.withOverlay(() => pickSearchProviderStep(otui, chrome, selectable));
               input.focus();
               if (picked === undefined) {
                 return;
@@ -101100,12 +101405,10 @@ Usage: /reasoning <${REASONING_EFFORT_LEVELS.join("|")}>
             const ns = await chrome.withOverlay(() => command.name === "/connect" ? selectProviderModelInTui(otui, chrome, detected, { onlyConnected: true, env: process.env }) : selectProviderModelInTui(otui, chrome, detected));
             if (ns !== undefined) {
               await switchTo(ns);
-            } else {
-              if (command.name === "/connect") {
-                chrome.showToast("No connected providers found. Run /provider to configure one first.");
-              }
-              input.focus();
+            } else if (command.name === "/connect") {
+              chrome.showToast("No connected providers found. Run /provider to configure one first.");
             }
+            input.focus();
           })();
           return;
         }
@@ -106920,7 +107223,7 @@ import { readFileSync as readFileSync9 } from "fs";
 
 // src/agents/bootstrap.ts
 import { mkdir as mkdir64, readFile as readFile101, writeFile as writeFile55 } from "fs/promises";
-import { homedir as homedir9 } from "os";
+import { homedir as homedir10 } from "os";
 import path200 from "path";
 init_fs();
 var AGENT_BOOTSTRAP_START = "<!-- keryx:global-bootstrap -->";
@@ -106989,7 +107292,7 @@ function resolveAgentBootstrapRuntimes(ids) {
   }
   return { runtimes, unknown };
 }
-async function agentBootstrapStatus(runtime, homeRoot = homedir9()) {
+async function agentBootstrapStatus(runtime, homeRoot = homedir10()) {
   const filePath = runtime.filePath(homeRoot);
   const exists = await pathExists(filePath);
   const content = exists ? await readFile101(filePath, "utf8") : "";
@@ -106999,7 +107302,7 @@ async function agentBootstrapStatus(runtime, homeRoot = homedir9()) {
   return { runtime: runtime.id, label: runtime.label, filePath, exists, installed, current };
 }
 async function installAgentBootstrap(runtime, options = {}) {
-  const homeRoot = options.homeRoot ?? homedir9();
+  const homeRoot = options.homeRoot ?? homedir10();
   const filePath = runtime.filePath(homeRoot);
   const exists = await pathExists(filePath);
   const current = exists ? await readFile101(filePath, "utf8") : "";
@@ -107014,7 +107317,7 @@ async function installAgentBootstrap(runtime, options = {}) {
   return { ...status, wrote, dryRun };
 }
 async function uninstallAgentBootstrap(runtime, options = {}) {
-  const homeRoot = options.homeRoot ?? homedir9();
+  const homeRoot = options.homeRoot ?? homedir10();
   const filePath = runtime.filePath(homeRoot);
   const exists = await pathExists(filePath);
   const current = exists ? await readFile101(filePath, "utf8") : "";