@tiens.nguyen/gu-cli 1.0.835 → 1.0.836

package/gu-repl.mjs

@@ -140,7 +140,7 @@ import { completedFlush, splitLiveStream } from "./completed-flush.mjs";
 import { isScaffoldStep, isGroupableStep, stepGroupRows, relativizePaths } from "./step-group.mjs";
 import { clearLogsNoticeText } from "./clear-logs.mjs";
 import { allowIn, allowedIn, bridgeCommand, browserReport, bridgeStatus, extensionDir, findDevInstalls, helpInstall, installExtensionFiles, installSteps, localLeftovers, openExtensionsPage, removeLocalFiles, STORE_URL, stopBridge } from "./browser-command.mjs";
-import { commandLogFile, killShell, logTail, markAnnounced, readShells, recapQuestion, shellsToRecap, statusText as shellStatusText, renderShellDetails, shellPickerLabel, shellState, shellsNotice } from "./shell-details.mjs";
+import { commandLogFile, killShell, logTail, markAnnounced, readShells, recapQuestion, shellsToRecap, statusText as shellStatusText, renderShellDetails, shellPanelRows, shellPickerLabel, shellState, shellsNotice } from "./shell-details.mjs";
 import { discoverSkills, matchSkillCommand } from "./skills.mjs";
 import { appendNew, archivePathFor, archivedWorkspaceKey, markReset, seedArchive } from "./conversation-archive.mjs";
 import { addAllowRule, listServers as listMcpServers } from "./mcp-config.mjs";
@@ -9668,20 +9668,49 @@ async function showShells() {
     }
   }
   const rec = entries[pick].rec;
-  for (;;) {
-    const st = printShellDetails(rec);
-    if (following) break;
-    const actions = [{ id: "refresh", label: "Refresh" }];
-    if (st.state === "running") actions.push({ id: "kill", label: "Stop it", note: "kills the command and everything it started" });
-    actions.push({ id: "close", label: "Close" });
-    const act = await pickFromList(actions.map((a) => a.label + (a.note ? dim(`  · ${a.note}`) : "")), 0);
-    const id = act < 0 ? "close" : actions[act].id;
-    if (id === "refresh") continue;
-    if (id === "kill") {
-      await killShell(rec);
-      console.log(GUTTER + accent("✓ stopped") + dim(" — the agent sees it as killed next turn.\n"));
-    }
-    break;
+  // During a turn a picker would fight the turn for the keyboard: the details are printed instead.
+  if (following) {
+    printShellDetails(rec);
+    refreshShells();
+    paintBar();
+    return;
+  }
+  // AT THE BOTTOM, ABOVE THE BAR, LIVE; Esc closes (#376, GitHub #157) — Claude Code's Shell
+  // details. Nothing goes into the scrollback: the panel and its choices are one block that the
+  // picker wipes when it closes. Its height is fixed when it opens (what the screen allows, at most
+  // the details plus 15 output lines) and it redraws once a second, so a build's runtime and
+  // newest output move while you watch.
+  shellsViewed.add(String(rec.id));
+  const panel = (rowsWanted) => {
+    const st = shellState(rec);
+    let output = logTail(rec.log, { lines: 40 });
+    let outputFrom = "";
+    if (!output.length) {
+      const lf = commandLogFile(rec.command, rec.workdir);
+      if (lf) {
+        output = logTail(lf, { lines: 40 });
+        outputFrom = lf.startsWith(String(rec.workdir || "\0") + "/") ? lf.slice(String(rec.workdir).length + 1) : lf;
+      }
+    }
+    return shellPanelRows({
+      rec, st, output, outputFrom, width: Math.max(20, process.stdout.columns || 80) - 1, gutter: GUTTER, rows: rowsWanted,
+      footer: "Esc to close",
+      style: { title: (t) => bold(accent(t)), label: bold, running: accent, ok: accent, bad: red, dim },
+    });
+  };
+  const running = shellState(rec).state === "running";
+  const actions = running
+    ? [{ id: "kill", label: "Stop it", note: "kills the command and everything it started" }, { id: "close", label: "Close" }]
+    : [{ id: "close", label: "Close" }];
+  const headerRows = Math.max(8, Math.min(24, viewportHeight() - 3 - actions.length));
+  const act = await pickFromList(
+    actions.map((a) => a.label + (a.note ? dim(`  · ${a.note}`) : "")),
+    actions.length - 1, // Close: Enter on its own never stops a build
+    { header: panel, headerRows, refreshMs: 1000 },
+  );
+  if (act >= 0 && actions[act].id === "kill") {
+    await killShell(rec);
+    console.log(GUTTER + accent(`✓ stopped shell ${rec.id}`) + dim(" — the agent sees it as killed next turn.\n"));
   }
   refreshShells();
   paintBar();
@@ -10795,6 +10824,12 @@ let listDeleteRequested = false;
 // /use-presets' { o: "open" } (#312, #322). Null unless a caller asks, like ctrl+d above.
 let listKeys = null;
 let listKeyAction = "";
+// A PANEL ABOVE THE CHOICES (#376): `listHeader(rows)` returns exactly `listHeaderRows` rows, drawn
+// at the top of the same in-place block — Shell details sits at the bottom of the screen with its
+// actions under it, and goes with them (Esc) without leaving a line in the scrollback. A fixed
+// height, so the once-a-second redraw walks up the same rows it drew.
+let listHeader = null;
+let listHeaderRows = 0;
 /** #321: the screen under a picker when it opened (content rows, pad, region height), and its tallest draw. */
 let listOpenedOver = null;
 let listMaxRows = 0;
@@ -10807,7 +10842,7 @@ function drawList(redraw) {
   // provider's /v1/models was taller than the terminal: the screen scrolled, the highlighted row
   // went off the top, and the ESC[nA walk below then counted rows that had moved — "cannot scroll
   // up or down, stuck here". Two rows of margin keep the block clear of the line above it.
-  const maxBlock = Math.max(5, viewportHeight() - 2) - (listNote ? 1 : 0);
+  const maxBlock = Math.max(5, viewportHeight() - 2) - (listNote ? 1 : 0) - (listHeader ? listHeaderRows : 0);
   const win = listWindow(listItems.length, listSel, listTop, maxBlock);
   listTop = win.top;
   const row = (i) => {
@@ -10821,6 +10856,11 @@ function drawList(redraw) {
   };
   const marker = (text) => clipVisible(GUTTER + dim(text), width - 1);
   const rows = [];
+  if (listHeader) {
+    let head = [];
+    try { head = listHeader(listHeaderRows) || []; } catch { /* a panel that fails to draw is blank */ }
+    for (let i = 0; i < listHeaderRows; i++) rows.push(clipVisible(head[i] ?? "", width - 1));
+  }
   // Drawn even when empty, so the block keeps a CONSTANT height: every redraw walks up exactly as
   // many rows as it drew, and a block that changed height at the ends would leave that walk out
   // by a row — the bug physicalRows() exists to prevent.
@@ -10863,6 +10903,8 @@ function finishList(index) {
   listMaxRows = 0;
   listRowsDrawn = [];
   listTop = 0;
+  listHeader = null;
+  listHeaderRows = 0;
   const r = listResolve;
   const multi = listMulti;
   const checked = [...listChecked].sort((a, b) => a - b);
@@ -11007,6 +11049,19 @@ function pickFromList(items, initialSel = 0, opts = {}) {
     listPickerActive = true;
     listDeadline = 0;
     listTimeoutIndex = -1;
+    listHeader = typeof opts.header === "function" ? opts.header : null;
+    listHeaderRows = listHeader ? Math.max(0, opts.headerRows | 0) : 0;
+    if (listHeader && opts.refreshMs > 0) {
+      // A live panel (#376): redrawn in place until the picker closes.
+      const live = setInterval(() => {
+        if (listPickerActive && listHeader) drawList(true);
+      }, opts.refreshMs);
+      const done = listResolve;
+      listResolve = (v) => {
+        clearInterval(live);
+        done(v);
+      };
+    }
     if (opts && opts.timeoutMs > 0 && (opts.timeoutIndex ?? -1) >= 0) {
       listDeadline = Date.now() + opts.timeoutMs;
       listTimeoutIndex = opts.timeoutIndex;