@wrongstack/tui 0.104.0 → 0.109.1

package/dist/index.js

@@ -1,7 +1,7 @@
-import { expectDefined, writeErr, InputBuilder, DefaultSessionRewinder, writeOut, formatTodosList, buildGoalPreamble, shouldEnhance, enhanceUserPrompt, recentTextTurns, normalizedEqual, buildChildEnv } from '@wrongstack/core';
+import { expectDefined, writeErr, resolveWstackPaths, loadGoal, InputBuilder, DefaultSessionRewinder, writeOut, formatTodosList, buildGoalPreamble, shouldEnhance, enhanceUserPrompt, recentTextTurns, normalizedEqual, buildChildEnv } from '@wrongstack/core';
 export { buildGoalPreamble } from '@wrongstack/core';
 import { Box, Text, useInput, useStdin, useStdout, render, useApp, Static } from 'ink';
-import React6, { useState, useEffect, memo, useReducer, useRef, useMemo, useCallback } from 'react';
+import React6, { useState, useEffect, memo, useCallback, useReducer, useRef, useMemo } from 'react';
 import * as fs2 from 'fs/promises';
 import * as path2 from 'path';
 import { routeImagesForModel } from '@wrongstack/runtime/vision';
@@ -913,10 +913,10 @@ function AgentsMonitor({
   const live = useMemo(() => selectLiveAgents(all, nowTick), [all, nowTick]);
   const [selectedIndex, setSelectedIndex] = useState(0);
   const safeIndex = Math.min(selectedIndex, Math.max(0, live.length - 1));
-  useInput((input, key) => {
-    if (key.upArrow || input === "k") {
+  useInput((_input, key) => {
+    if (key.upArrow) {
       setSelectedIndex((prev) => Math.max(0, prev - 1));
-    } else if (key.downArrow || input === "j") {
+    } else if (key.downArrow) {
       setSelectedIndex((prev) => Math.min(live.length - 1, prev + 1));
     }
   });
@@ -2065,9 +2065,8 @@ function computeWidths(allRows, cols, maxWidth, sepWidths) {
     for (let c = 0; c < cols; c++) {
       const cell = row[c] ?? "";
       const stripped = stripInlineMarkers(cell);
-      const w = longestWord(stripped);
       const total = strWidth(stripped);
-      natural[c] = Math.max(expectDefined$1(natural[c]), w, total);
+      natural[c] = Math.max(expectDefined$1(natural[c]), total);
     }
   }
   if (sepWidths) {
@@ -2200,19 +2199,16 @@ function strWidth(s2) {
       i += cpLen;
       continue;
     }
+    if (code >= 9472 && code <= 9599) {
+      width += 1;
+      i += cpLen;
+      continue;
+    }
     width += 1;
     i += cpLen;
   }
   return width;
 }
-function longestWord(s2) {
-  let max = 0;
-  for (const w of s2.split(/\s+/)) {
-    const visualWidth = strWidth(w);
-    if (visualWidth > max) max = visualWidth;
-  }
-  return max;
-}
 function border(left, mid, right, widths) {
   return left + widths.map((w) => "\u2500".repeat(w + 2)).join(mid) + right;
 }
@@ -2220,13 +2216,12 @@ function stripInlineMarkers(text) {
   return text.replace(/\*\*(.+?)\*\*/g, "$1").replace(/(?<!\*)\*(?!\*)(.+?)(?<!\*)\*(?!\*)/g, "$1").replace(/`(.+?)`/g, "$1").replace(/~~(.+?)~~/g, "$1");
 }
 var ANSI_BOLD = "\x1B[1m";
-var ANSI_RESET = "\x1B[22m";
 var ANSI_DIM = "\x1B[2m";
 var ANSI_CYAN = "\x1B[36m";
 var ANSI_STRIKE = "\x1B[9m";
 var ANSI_RESET_ALL = "\x1B[0m";
 function applyInlineAnsi(text) {
-  return text.replace(/\*\*(.+?)\*\*/g, `${ANSI_BOLD}$1${ANSI_RESET}`).replace(/(?<!\*)\*(?!\*)(.+?)(?<!\*)\*(?!\*)/g, `${ANSI_DIM}$1${ANSI_RESET_ALL}`).replace(/`(.+?)`/g, `${ANSI_CYAN}$1${ANSI_RESET_ALL}`).replace(/~~(.+?)~~/g, `${ANSI_STRIKE}$1${ANSI_RESET_ALL}`);
+  return text.replace(/\*\*(.+?)\*\*/g, `${ANSI_BOLD}$1${ANSI_RESET_ALL}`).replace(/(?<!\*)\*(?!\*)(.+?)(?<!\*)\*(?!\*)/g, `${ANSI_DIM}$1${ANSI_RESET_ALL}`).replace(/`(.+?)`/g, `${ANSI_CYAN}$1${ANSI_RESET_ALL}`).replace(/~~(.+?)~~/g, `${ANSI_STRIKE}$1${ANSI_RESET_ALL}`);
 }
 function renderRow(cells, widths, aligns) {
   const styled = cells.map((c) => applyInlineAnsi(c));
@@ -2239,7 +2234,7 @@ function renderRow(cells, widths, aligns) {
     for (let c = 0; c < widths.length; c++) {
       const w = widths[c] ?? MIN_COL_WIDTH;
       const text = wrapped[c]?.[line] ?? "";
-      parts.push(padCell(text, w, aligns[c] ?? "left"));
+      parts.push(padCell(text, w, aligns[c] ?? "left") + ANSI_RESET_ALL);
     }
     out.push("\u2502 " + parts.join(" \u2502 ") + " \u2502");
   }
@@ -3089,7 +3084,8 @@ function CodeBlock({
   const hidden = Math.max(0, lines.length - MAX_CODE_LINES);
   if (hidden > 0) lines = lines.slice(0, MAX_CODE_LINES);
   const gutterW = String(lines.length).length;
-  const maxW = Math.max(20, Math.min(contentWidth - 6 - gutterW - 1, 120));
+  const boxWidth = Math.max(22, contentWidth - 2);
+  const maxW = Math.max(20, Math.min(boxWidth - 4 - gutterW - 1, 120));
   let carry = {};
   const rows = lines.map((raw) => {
     const display = raw.length > maxW ? `${raw.slice(0, maxW - 1)}\u2026` : raw;
@@ -3101,6 +3097,8 @@ function CodeBlock({
     Box,
     {
       flexDirection: "column",
+      width: boxWidth,
+      flexShrink: 0,
       marginLeft: 2,
       marginY: 0,
       borderStyle: "round",
@@ -3224,6 +3222,10 @@ function extractDiffPreview(toolName, output) {
   return parseUnifiedDiff(diff, DIFF_MAX_LINES);
 }
 var MESSAGE_PANEL_CHROME_WIDTH = 2;
+var MESSAGE_PANEL_MARGIN = 2;
+function assistantContentWidth(termWidth) {
+  return Math.max(20, termWidth - MESSAGE_PANEL_CHROME_WIDTH - MESSAGE_PANEL_MARGIN * 2);
+}
 function splitFencedBlocks(text) {
   const lines = text.split("\n");
   const segs = [];
@@ -3377,9 +3379,6 @@ function brainRiskColor(risk) {
       return "red";
   }
 }
-function assistantContentWidth(termWidth) {
-  return Math.max(20, termWidth - MESSAGE_PANEL_CHROME_WIDTH);
-}
 var Entry = React6.memo(function Entry2({
   entry,
   termWidth
@@ -3389,6 +3388,7 @@ var Entry = React6.memo(function Entry2({
       return /* @__PURE__ */ jsx(
         Box,
         {
+          marginX: MESSAGE_PANEL_MARGIN,
           borderStyle: "single",
           borderTop: false,
           borderRight: false,
@@ -3415,6 +3415,7 @@ var Entry = React6.memo(function Entry2({
         Box,
         {
           flexDirection: "column",
+          marginX: MESSAGE_PANEL_MARGIN,
           marginY: 1,
           borderStyle: "single",
           borderTop: false,
@@ -3488,6 +3489,7 @@ var Entry = React6.memo(function Entry2({
       return /* @__PURE__ */ jsx(
         Box,
         {
+          marginX: MESSAGE_PANEL_MARGIN,
           borderStyle: "single",
           borderTop: false,
           borderRight: false,
@@ -3501,6 +3503,7 @@ var Entry = React6.memo(function Entry2({
       return /* @__PURE__ */ jsx(
         Box,
         {
+          marginX: MESSAGE_PANEL_MARGIN,
           borderStyle: "single",
           borderTop: false,
           borderRight: false,
@@ -3519,6 +3522,7 @@ var Entry = React6.memo(function Entry2({
         Box,
         {
           flexDirection: "column",
+          marginX: MESSAGE_PANEL_MARGIN,
           marginY: 1,
           borderStyle: "single",
           borderTop: false,
@@ -3799,6 +3803,8 @@ var Input = memo(function Input2({
   cursor,
   disabled,
   hint,
+  hidden,
+  placeholderHeight,
   onKey
 }) {
   useInput((input, key) => {
@@ -3854,6 +3860,9 @@ var Input = memo(function Input2({
   }, [stdout]);
   const promptColor = disabled ? "red" : "cyan";
   const rows = layoutInputRows(prompt, value, cursor, cols);
+  if (hidden) {
+    return /* @__PURE__ */ jsx(Box, { height: Math.max(1, placeholderHeight ?? rows.length) });
+  }
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     rows.map(
       (row, i) => row.length === 0 ? (
@@ -3922,8 +3931,8 @@ var LiveActivityStrip = React6.memo(function LiveActivityStrip2({
 }) {
   const { stdout } = useStdout();
   const width = Math.max(10, (stdout?.columns ?? 80) - 2);
-  if (Object.keys(entries).length === 0) return null;
-  const rows = activityStripRows(entries, Date.now(), maxRows, width);
+  const hasEntries = Object.keys(entries).length > 0;
+  const rows = hasEntries ? activityStripRows(entries, Date.now(), maxRows, width) : new Array(maxRows).fill("");
   return /* @__PURE__ */ jsx(Box, { flexDirection: "column", paddingX: 1, children: rows.map((text, slot) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: fixed-height slots, index IS the identity
     /* @__PURE__ */ jsx(Box, { height: 1, children: text === "" ? /* @__PURE__ */ jsx(Text, { children: " " }) : /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -7310,6 +7319,7 @@ function App({
   getModeLabel
 }) {
   const { exit } = useApp();
+  const { stdout } = useStdout();
   const [liveModel, setLiveModel] = useState(model);
   const [liveProvider, setLiveProvider] = useState(provider ?? "agent");
   const [activeMaxContext, setActiveMaxContext] = useState(effectiveMaxContext);
@@ -7329,32 +7339,33 @@ function App({
     setStatuslineHiddenItems(hiddenItems);
   }, [setStatuslineHiddenItems, hiddenItems]);
   const projectRoot = agent.ctx.projectRoot;
-  useEffect(() => {
+  const refreshGoalSummary = useCallback(() => {
     if (!projectRoot) return;
-    const goalPath = path2.join(projectRoot, ".wrongstack", "goal.json");
-    fs2.readFile(goalPath, "utf8").then((raw) => {
-      const goal = JSON.parse(raw);
-      if (goal?.goal && typeof goal.iterations === "number") {
-        const lastEntry = goal.journal?.[goal.journal.length - 1];
-        dispatch({
-          type: "goalSummary",
-          summary: {
-            goal: goal.goal,
-            refinedGoal: goal.refinedGoal,
-            goalState: goal.goalState ?? "active",
-            iterations: goal.iterations,
-            progress: goal.progress,
-            progressNote: goal.progressNote,
-            progressTrend: goal.progressTrend,
-            deliverables: goal.deliverables,
-            lastTask: lastEntry?.task,
-            lastStatus: lastEntry?.status
-          }
-        });
-      }
+    const goalPath = resolveWstackPaths({ projectRoot }).projectGoal;
+    loadGoal(goalPath).then((goal) => {
+      if (!goal) return;
+      const lastEntry = goal.journal?.[goal.journal.length - 1];
+      dispatch({
+        type: "goalSummary",
+        summary: {
+          goal: goal.goal,
+          refinedGoal: goal.refinedGoal,
+          goalState: goal.goalState ?? "active",
+          iterations: goal.iterations,
+          progress: goal.progress,
+          progressNote: goal.progressNote,
+          progressTrend: goal.progressTrend,
+          deliverables: goal.deliverables,
+          lastTask: lastEntry?.task,
+          lastStatus: lastEntry?.status
+        }
+      });
     }).catch(() => {
     });
   }, [projectRoot]);
+  useEffect(() => {
+    refreshGoalSummary();
+  }, [refreshGoalSummary]);
   const restoredEntries = (() => {
     const msgs = agent.ctx.messages;
     if (!msgs || msgs.length === 0) return [];
@@ -7504,6 +7515,9 @@ function App({
     const t = setInterval(() => setNowTick(Date.now()), 1e4);
     return () => clearInterval(t);
   }, []);
+  useEffect(() => {
+    if (state.goalPanelOpen) refreshGoalSummary();
+  }, [state.goalPanelOpen, nowTick, refreshGoalSummary]);
   const [enhanceDots, setEnhanceDots] = useState(0);
   useEffect(() => {
     if (!state.enhanceBusy) return;
@@ -8979,18 +8993,10 @@ function App({
         dispatch({ type: "toggleMonitor" });
         return;
       }
-      if (state.worktreeMonitorOpen) {
-        dispatch({ type: "worktreeMonitorToggle" });
-        return;
-      }
       if (state.todosMonitorOpen) {
         dispatch({ type: "toggleTodosMonitor" });
         return;
       }
-      if (state.autoPhase?.monitorOpen) {
-        dispatch({ type: "autoPhaseMonitorToggle" });
-        return;
-      }
       if (state.settingsPicker.open) {
         dispatch({ type: "settingsClose" });
         return;
@@ -9008,6 +9014,9 @@ function App({
         return;
       }
     }
+    if (state.processListOpen) {
+      return;
+    }
     if (input === "?" && !key.ctrl && !key.meta && draftRef.current.buffer === "" && !state.slashPicker.open && !state.picker.open && !state.modelPicker.open && !state.autonomyPicker.open && !state.settingsPicker.open && !state.rewindOverlay && !state.monitorOpen && !state.agentsMonitorOpen && !state.worktreeMonitorOpen && !state.todosMonitorOpen && !state.autoPhase?.monitorOpen) {
       dispatch({ type: "toggleHelp" });
       return;
@@ -9601,6 +9610,14 @@ User message:
     return "";
   }, [state.buffer, state.status, state.picker.open]);
   const enhanceActive = state.enhanceBusy || state.enhance != null;
+  const inputCellRows = layoutInputRows(
+    INPUT_PROMPT,
+    state.buffer,
+    state.cursor,
+    stdout?.columns ?? 80
+  );
+  const inputHeight = Math.max(1, inputCellRows.length);
+  const hideInput = enhanceActive || state.helpOpen || state.processListOpen;
   return /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 0, children: [
     /* @__PURE__ */ jsx(
       History,
@@ -9612,12 +9629,14 @@ User message:
     ),
     /* @__PURE__ */ jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [
       /* @__PURE__ */ jsx(LiveActivityStrip, { entries: state.fleet, nowTick }),
-      enhanceActive ? /* @__PURE__ */ jsx(Box, { height: 1 }) : /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx(
         Input,
         {
           prompt: INPUT_PROMPT,
           value: state.buffer,
           cursor: state.cursor,
+          hidden: hideInput,
+          placeholderHeight: inputHeight,
           disabled: state.status === "aborting" && !state.steeringPending || state.confirmQueue.length > 0,
           hint: inputHint,
           onKey: stableOnKey