@wrongstack/tui 0.32.0 → 0.41.0

package/dist/index.js

@@ -1,10 +1,10 @@
 import { Readable } from 'stream';
+import { writeErr, InputBuilder, DefaultSessionRewinder, writeOut, formatTodosList, buildGoalPreamble, buildChildEnv } from '@wrongstack/core';
+export { buildGoalPreamble } from '@wrongstack/core';
 import { Box, Text, render, useApp, useStdout, measureElement, Static, useInput, useStdin } from 'ink';
 import React4, { useState, useEffect, useReducer, useRef, useMemo, useCallback, useLayoutEffect } from 'react';
 import * as fs2 from 'fs/promises';
 import * as path2 from 'path';
-import { InputBuilder, DefaultSessionRewinder, formatTodosList, buildGoalPreamble, buildChildEnv } from '@wrongstack/core';
-export { buildGoalPreamble } from '@wrongstack/core';
 import { routeImagesForModel } from '@wrongstack/runtime/vision';
 import { getProcessRegistry } from '@wrongstack/tools';
 import { readClipboardImage } from '@wrongstack/runtime/clipboard';
@@ -526,6 +526,11 @@ function fmtCost(n) {
   if (n === 0) return "\u2014";
   return `$${n.toFixed(3)}`;
 }
+function fmtModelLabel(provider, model) {
+  if (!model && !provider) return "";
+  const short = model ? model.includes("/") ? model.slice(model.lastIndexOf("/") + 1) : model : "?";
+  return provider ? `${provider}:${short}` : short;
+}
 function FleetMonitor({
   entries,
   totalCost,
@@ -598,7 +603,7 @@ function FleetMonitor({
         "\u2717",
         failed
       ] }) : null,
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7 Ctrl+F to close" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7 Ctrl+F / F2 to close" })
     ] }),
     collabSession ? /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
@@ -658,20 +663,24 @@ function FleetMonitor({
     shown.length > 0 ? /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  " }),
-        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "name".padEnd(16) }),
-        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "status".padEnd(10) }),
-        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "L/t".padEnd(8) }),
+        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "name".padEnd(14) }),
+        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "model".padEnd(18) }),
+        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "status".padEnd(9) }),
+        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "L/t\xB7ctx".padEnd(12) }),
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "elapsed".padEnd(8) }),
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "cost" })
       ] }),
       shown.map((e) => {
         const s2 = STATUS[e.status];
         const elapsed = e.status === "running" ? fmtElapsed(Math.max(0, nowTick - e.startedAt)) : fmtElapsed(Math.max(0, nowTick - e.lastEventAt)) + " ago";
+        const model = fmtModelLabel(e.provider, e.model) || "\u2014";
+        const ltCtx = e.ctxPct !== void 0 ? `L${e.iterations} ${e.toolCalls}t ${Math.round(e.ctxPct * 100)}%` : `L${e.iterations} ${e.toolCalls}t`;
         return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
           /* @__PURE__ */ jsx(Text, { color: s2.color, children: s2.icon }),
-          /* @__PURE__ */ jsx(Text, { children: e.name.padEnd(16).slice(0, 16) }),
-          /* @__PURE__ */ jsx(Text, { color: s2.color, children: e.status.padEnd(10) }),
-          /* @__PURE__ */ jsx(Text, { dimColor: true, children: `L${e.iterations} ${e.toolCalls}t`.padEnd(8) }),
+          /* @__PURE__ */ jsx(Text, { children: e.name.padEnd(14).slice(0, 14) }),
+          /* @__PURE__ */ jsx(Text, { dimColor: true, children: model.padEnd(18).slice(0, 18) }),
+          /* @__PURE__ */ jsx(Text, { color: s2.color, children: e.status.padEnd(9) }),
+          /* @__PURE__ */ jsx(Text, { dimColor: true, children: ltCtx.padEnd(12).slice(0, 12) }),
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: elapsed.padEnd(8).slice(0, 8) }),
           /* @__PURE__ */ jsx(Text, { color: "yellow", children: fmtCost(e.cost) }),
           e.extensions && e.extensions > 0 ? /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
@@ -786,7 +795,7 @@ function AgentsMonitor({
         "\u2717",
         totalFailed
       ] }) : null,
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7 Ctrl+G to close" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7 Ctrl+G / F3 to close" })
     ] }),
     /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "shown" }),
@@ -821,6 +830,7 @@ function AgentsMonitor({
         /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
           /* @__PURE__ */ jsx(Text, { color: s2.color, bold: true, children: s2.icon }),
           /* @__PURE__ */ jsx(Text, { bold: true, children: e.name }),
+          fmtModelLabel(e.provider, e.model) ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: fmtModelLabel(e.provider, e.model) }) : null,
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7" }),
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: elapsed }),
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7" }),
@@ -831,6 +841,10 @@ function AgentsMonitor({
             e.toolCalls,
             "t"
           ] }),
+          e.ctxPct !== void 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7" }),
+            /* @__PURE__ */ jsx(ContextBar, { pct: e.ctxPct, tokens: e.ctxTokens, maxTokens: e.ctxMaxTokens })
+          ] }) : null,
           e.extensions && e.extensions > 0 ? /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
             "\u26A1\xD7",
             e.extensions
@@ -877,11 +891,7 @@ function AgentsMonitor({
         e.failureReason && e.status !== "success" ? /* @__PURE__ */ jsx(Box, { paddingLeft: 2, children: /* @__PURE__ */ jsxs(Text, { color: "red", children: [
           "\u2717 ",
           e.failureReason
-        ] }) }) : null,
-        e.ctxPct !== void 0 ? /* @__PURE__ */ jsxs(Box, { paddingLeft: 2, children: [
-          /* @__PURE__ */ jsx(Text, { dimColor: true, children: "ctx " }),
-          /* @__PURE__ */ jsx(ContextBar, { pct: e.ctxPct, tokens: e.ctxTokens, maxTokens: e.ctxMaxTokens })
-        ] }) : null
+        ] }) }) : null
       ] }, e.id);
     })
   ] });
@@ -1041,7 +1051,7 @@ function ConfirmPrompt({
   onDecision
 }) {
   React4.useEffect(() => {
-    process.stdout.write("\x07");
+    writeOut("\x07");
   }, []);
   useInput((input2, _key) => {
     if (!input2 || input2 === "\r" || input2 === "\n") return;
@@ -1182,9 +1192,9 @@ function helpSections(opts) {
     {
       title: "Monitors",
       entries: [
-        { keys: "Ctrl+F", desc: "fleet orchestration monitor" },
-        { keys: "Ctrl+G", desc: "agents live monitor" },
-        { keys: "Ctrl+T", desc: "worktree monitor" },
+        { keys: "Ctrl+F / F2", desc: "fleet orchestration monitor" },
+        { keys: "Ctrl+G / F3", desc: "agents live monitor" },
+        { keys: "Ctrl+T / F4", desc: "worktree monitor" },
         { keys: "Esc", desc: "close the open monitor / overlay" }
       ]
     },
@@ -3181,6 +3191,42 @@ function truncMid(s2, max) {
   return `${s2.slice(0, max - 1)}\u2026`;
 }
 
+// src/fn-keys.ts
+function fnKey(data) {
+  switch (data) {
+    case "\x1BOP":
+    case "\x1B[11~":
+      return 1;
+    case "\x1BOQ":
+    case "\x1B[12~":
+      return 2;
+    case "\x1BOR":
+    case "\x1B[13~":
+      return 3;
+    case "\x1BOS":
+    case "\x1B[14~":
+      return 4;
+    case "\x1B[15~":
+      return 5;
+    case "\x1B[17~":
+      return 6;
+    case "\x1B[18~":
+      return 7;
+    case "\x1B[19~":
+      return 8;
+    case "\x1B[20~":
+      return 9;
+    case "\x1B[21~":
+      return 10;
+    case "\x1B[23~":
+      return 11;
+    case "\x1B[24~":
+      return 12;
+    default:
+      return null;
+  }
+}
+
 // src/input-tokens.ts
 var INLINE_TOKEN_SRC = "\\[(?:pasted|image|file) #\\d+[^\\]]*\\]|\\[file:[^\\]]+\\]";
 var AT_END = new RegExp(`(?:${INLINE_TOKEN_SRC})$`);
@@ -3375,9 +3421,18 @@ function Input({
   useEffect(() => {
     if (!stdin || disabled) return;
     const handleData = (data) => {
-      const kind = isHomeEnd(data.toString());
-      if (kind === "home") onKey("", { ...EMPTY_KEY, home: true });
-      else if (kind === "end") onKey("", { ...EMPTY_KEY, end: true });
+      const s2 = data.toString();
+      const kind = isHomeEnd(s2);
+      if (kind === "home") {
+        onKey("", { ...EMPTY_KEY, home: true });
+        return;
+      }
+      if (kind === "end") {
+        onKey("", { ...EMPTY_KEY, end: true });
+        return;
+      }
+      const fn = fnKey(s2);
+      if (fn !== null) onKey("", { ...EMPTY_KEY, fn });
     };
     stdin.on("data", handleData);
     return () => {
@@ -3974,7 +4029,7 @@ function WorktreeMonitor({
           failed
         ] })
       ] }) : null,
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502 Ctrl+T / Esc to close" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502 Ctrl+T / F4 / Esc to close" })
     ] }),
     list.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "No worktrees. They appear when AutoPhase runs with isolation on." }) : list.map((w) => {
       const s2 = fmt(w.status);
@@ -5990,7 +6045,7 @@ function App({
   const prevEntriesCount = useRef(0);
   const eraseLiveRegion = useCallback(() => {
     try {
-      process.stdout.write("\x1B[J");
+      writeOut("\x1B[J");
     } catch {
     }
   }, []);
@@ -6202,7 +6257,7 @@ function App({
         const arg = args.trim().toLowerCase();
         if (arg === "off") {
           try {
-            process.stdout.write(ALT_OFF);
+            writeOut(ALT_OFF);
           } catch {
             return { message: "Failed to exit alt-screen." };
           }
@@ -6213,7 +6268,7 @@ function App({
         }
         if (arg === "on") {
           try {
-            process.stdout.write(ALT_ON);
+            writeOut(ALT_ON);
           } catch {
             return { message: "Failed to re-enter alt-screen." };
           }
@@ -6254,9 +6309,9 @@ function App({
             };
           }
           try {
-            process.stdout.write(ALT_ON);
-            process.stdout.write("\x1B[H");
-            process.stdout.write(MOUSE_ON_SEQ);
+            writeOut(ALT_ON);
+            writeOut("\x1B[H");
+            writeOut(MOUSE_ON_SEQ);
           } catch {
             return { message: "Failed to enable mouse mode." };
           }
@@ -6267,8 +6322,8 @@ function App({
           };
         }
         try {
-          process.stdout.write(MOUSE_OFF_SEQ);
-          process.stdout.write(ALT_OFF);
+          writeOut(MOUSE_OFF_SEQ);
+          writeOut(ALT_OFF);
         } catch {
           return { message: "Failed to disable mouse mode." };
         }
@@ -7728,25 +7783,23 @@ function App({
       });
       return;
     }
-    if (key.ctrl && input === "f") {
+    const toggleFleetOverlay = () => {
       if (state.agentsMonitorOpen) {
         dispatch({ type: "toggleAgentsMonitor" });
         dispatch({ type: "toggleMonitor" });
       } else {
         dispatch({ type: "toggleMonitor" });
       }
-      return;
-    }
-    if (key.ctrl && input === "g") {
+    };
+    const toggleAgentsOverlay = () => {
       if (state.monitorOpen) {
         dispatch({ type: "toggleMonitor" });
         dispatch({ type: "toggleAgentsMonitor" });
       } else {
         dispatch({ type: "toggleAgentsMonitor" });
       }
-      return;
-    }
-    if (key.ctrl && input === "t") {
+    };
+    const toggleWorktreeOverlay = () => {
       if (state.worktreeMonitorOpen) {
         dispatch({ type: "worktreeMonitorToggle" });
         return;
@@ -7755,6 +7808,17 @@ function App({
       if (state.monitorOpen) dispatch({ type: "toggleMonitor" });
       if (state.autoPhase?.monitorOpen) dispatch({ type: "autoPhaseMonitorToggle" });
       dispatch({ type: "worktreeMonitorToggle" });
+    };
+    if (key.ctrl && input === "f" || key.fn === 2) {
+      toggleFleetOverlay();
+      return;
+    }
+    if (key.ctrl && input === "g" || key.fn === 3) {
+      toggleAgentsOverlay();
+      return;
+    }
+    if (key.ctrl && input === "t" || key.fn === 4) {
+      toggleWorktreeOverlay();
       return;
     }
     if (key.ctrl && input === "s") {
@@ -7910,6 +7974,7 @@ function App({
       return;
     }
     if (!input || key.ctrl || key.meta) return;
+    if (input.charCodeAt(0) === 27) return;
     if (input.length > PASTE_THRESHOLD_CHARS) {
       await commitPaste(input);
       return;
@@ -8634,7 +8699,7 @@ async function runTui(opts) {
   const stdout = process.stdout;
   const stdin = process.stdin;
   if (!stdout.isTTY || !stdin.isTTY) {
-    process.stderr.write(
+    writeErr(
       "wstack: --tui requires an interactive terminal on both stdin and stdout.\n       Drop the flag (use the plain REPL) or run wstack directly without piping.\n"
     );
     return 2;
@@ -8861,7 +8926,7 @@ async function runTui(opts) {
         { exitOnCtrlC: false, stdin: inkStdin }
       );
     } catch (err) {
-      process.stderr.write(
+      writeErr(
         `wstack: TUI failed to start: ${err instanceof Error ? err.message : String(err)}
 `
       );