@wrongstack/tui 0.8.5 → 0.8.6

package/dist/index.js

@@ -1151,18 +1151,18 @@ function PhasePanel({ phases, runningPhaseIds, nowTick }) {
         ] }),
         list.map((phase, i) => {
           const phaseKey = Object.keys(phases).find((k) => phases[k] === phase) ?? String(i);
-          const st = s(phase.status);
+          const st2 = s(phase.status);
           const progress = phase.totalTasks > 0 ? `${phase.completedTasks}/${phase.totalTasks}` : "";
           const elapsed = phase.startedAt ? fmtElapsed3(nowTick - phase.startedAt) : "";
           return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
-            /* @__PURE__ */ jsx(Text, { color: st.color, children: st.icon }),
+            /* @__PURE__ */ jsx(Text, { color: st2.color, children: st2.icon }),
             /* @__PURE__ */ jsx(Text, { children: phase.name.slice(0, 14).padEnd(14) }),
-            /* @__PURE__ */ jsx(Text, { color: st.color, dimColor: true, children: st.icon === "\u25CF" ? phase.status : "" }),
+            /* @__PURE__ */ jsx(Text, { color: st2.color, dimColor: true, children: st2.icon === "\u25CF" ? phase.status : "" }),
             progress ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
               " ",
               progress
             ] }) : null,
-            elapsed && st.icon === "\u25CF" ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            elapsed && st2.icon === "\u25CF" ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
               " ",
               elapsed
             ] }) : null
@@ -1172,6 +1172,204 @@ function PhasePanel({ phases, runningPhaseIds, nowTick }) {
     }
   );
 }
+var fmtElapsed4 = (ms) => {
+  const s2 = Math.floor(ms / 1e3);
+  const m = Math.floor(s2 / 60);
+  const h = Math.floor(m / 60);
+  if (h > 0) return `${h}:${String(m % 60).padStart(2, "0")}:${String(s2 % 60).padStart(2, "0")}`;
+  if (m > 0) return `${m}:${String(s2 % 60).padStart(2, "0")}`;
+  return `${s2}s`;
+};
+var STATUS4 = {
+  allocating: { icon: "\u25CB", color: "gray" },
+  active: { icon: "\u25CF", color: "yellow" },
+  committing: { icon: "\u25D0", color: "cyan" },
+  merging: { icon: "\u21E1", color: "blue" },
+  merged: { icon: "\u2713", color: "green" },
+  "needs-review": { icon: "\u26A0", color: "magenta" },
+  failed: { icon: "\u2717", color: "red" }
+};
+function st(status) {
+  return STATUS4[status] ?? { icon: "?", color: "white" };
+}
+function WorktreePanel({
+  worktrees,
+  nowTick
+}) {
+  const list = Object.values(worktrees);
+  if (list.length === 0) return null;
+  const active = list.filter((w) => w.status === "active" || w.status === "committing" || w.status === "merging").length;
+  const merged = list.filter((w) => w.status === "merged").length;
+  const failed = list.filter((w) => w.status === "failed" || w.status === "needs-review").length;
+  return /* @__PURE__ */ jsxs(
+    Box,
+    {
+      flexDirection: "column",
+      paddingX: 1,
+      borderStyle: "single",
+      borderTop: false,
+      borderBottom: false,
+      borderLeft: false,
+      borderRight: false,
+      children: [
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 2, children: [
+          /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Worktrees" }),
+          /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
+          /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
+            "\u25B6",
+            active
+          ] }),
+          /* @__PURE__ */ jsxs(Text, { color: "green", children: [
+            "\u2713",
+            merged
+          ] }),
+          failed > 0 ? /* @__PURE__ */ jsxs(Text, { color: "red", children: [
+            "\u2717",
+            failed
+          ] }) : null,
+          /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            "\xB7 ",
+            list.length,
+            " total \xB7 Ctrl+W for details"
+          ] })
+        ] }),
+        list.map((w) => {
+          const s2 = st(w.status);
+          const conflict = w.status === "needs-review";
+          const elapsed = w.allocatedAt ? fmtElapsed4(nowTick - w.allocatedAt) : "";
+          return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+            /* @__PURE__ */ jsx(Text, { color: s2.color, children: s2.icon }),
+            /* @__PURE__ */ jsx(Text, { children: w.branch.replace(/^wstack\/ap\//, "").slice(0, 18).padEnd(18) }),
+            /* @__PURE__ */ jsx(Text, { dimColor: true, children: w.ownerLabel.slice(0, 12) }),
+            conflict ? /* @__PURE__ */ jsx(Text, { color: "magenta", children: " CONFLICT" }) : /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+              " +",
+              w.insertions,
+              "/-",
+              w.deletions,
+              " ",
+              w.files,
+              "f"
+            ] }),
+            elapsed && (w.status === "active" || w.status === "committing") ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+              " ",
+              elapsed
+            ] }) : null
+          ] }, w.branch);
+        })
+      ]
+    }
+  );
+}
+var fmtElapsed5 = (ms) => {
+  const s2 = Math.floor(ms / 1e3);
+  const m = Math.floor(s2 / 60);
+  const h = Math.floor(m / 60);
+  if (h > 0) return `${h}:${String(m % 60).padStart(2, "0")}:${String(s2 % 60).padStart(2, "0")}`;
+  if (m > 0) return `${m}:${String(s2 % 60).padStart(2, "0")}`;
+  return `${s2}s`;
+};
+var WT_STATUS = {
+  allocating: { icon: "\u25CB", color: "gray", label: "allocating" },
+  active: { icon: "\u25CF", color: "yellow", label: "active" },
+  committing: { icon: "\u25D0", color: "cyan", label: "committing" },
+  merging: { icon: "\u21E1", color: "blue", label: "merging" },
+  merged: { icon: "\u2713", color: "green", label: "merged" },
+  "needs-review": { icon: "\u26A0", color: "magenta", label: "needs-review" },
+  failed: { icon: "\u2717", color: "red", label: "failed" }
+};
+function fmt(s2) {
+  return WT_STATUS[s2] ?? { icon: "?", color: "white", label: s2 };
+}
+function WorktreeMonitor({
+  worktrees,
+  baseBranch,
+  nowTick,
+  onClose
+}) {
+  useInput((_, key) => {
+    if (key.escape) onClose();
+  });
+  const list = Object.values(worktrees);
+  const active = list.filter((w) => ["active", "committing", "merging"].includes(w.status)).length;
+  const merged = list.filter((w) => w.status === "merged").length;
+  const failed = list.filter((w) => w.status === "failed" || w.status === "needs-review").length;
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "WORKTREE MONITOR" }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
+      baseBranch ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+        "base ",
+        baseBranch
+      ] }) : null,
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
+      /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
+        "\u25B6",
+        active
+      ] }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7" }),
+      /* @__PURE__ */ jsxs(Text, { color: "green", children: [
+        "\u2713",
+        merged
+      ] }),
+      failed > 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7" }),
+        /* @__PURE__ */ jsxs(Text, { color: "red", children: [
+          "\u2717",
+          failed
+        ] })
+      ] }) : null,
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502 Ctrl+W / 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);
+      const short = w.branch.replace(/^wstack\/ap\//, "");
+      const elapsed = w.allocatedAt ? fmtElapsed5(nowTick - w.allocatedAt) : "\u2014";
+      return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
+        /* @__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: short }),
+          /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\xB7" }),
+          /* @__PURE__ */ jsx(Text, { color: s2.color, children: s2.label }),
+          /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            "\xB7 elapsed ",
+            elapsed
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, marginLeft: 2, children: [
+          /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            w.baseBranch ?? baseBranch ?? "base",
+            " \u2192 ",
+            short
+          ] }),
+          /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            "\xB7 owner: ",
+            w.ownerLabel
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, marginLeft: 2, children: [
+          /* @__PURE__ */ jsxs(Text, { color: "green", children: [
+            "+",
+            w.insertions
+          ] }),
+          /* @__PURE__ */ jsxs(Text, { color: "red", children: [
+            "-",
+            w.deletions
+          ] }),
+          /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            "\xB7 ",
+            w.files,
+            " files"
+          ] })
+        ] }),
+        w.conflictFiles && w.conflictFiles.length > 0 ? /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsxs(Text, { color: "magenta", children: [
+          "conflicts: ",
+          w.conflictFiles.join(", ")
+        ] }) }) : null
+      ] }, w.branch);
+    }),
+    /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Esc close \xB7 merge conflicts with /worktree merge <branch>" }) })
+  ] });
+}
 
 // src/markdown-table.ts
 function renderMarkdownTables(text, maxWidth) {
@@ -2350,7 +2548,7 @@ function Input({
     hint ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: hint }) : null
   ] });
 }
-function fmtElapsed4(ms) {
+function fmtElapsed6(ms) {
   if (ms < 1e3) return `${ms}ms`;
   if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}s`;
   const m = Math.floor(ms / 6e4);
@@ -2365,7 +2563,7 @@ function fmtRecentTool2(tool) {
   const status = tool.ok === false ? "fail" : "ok";
   const name = tool.name.length > 18 ? `${tool.name.slice(0, 17)}...` : tool.name;
   const parts = [status, name];
-  if (typeof tool.durationMs === "number") parts.push(fmtElapsed4(tool.durationMs));
+  if (typeof tool.durationMs === "number") parts.push(fmtElapsed6(tool.durationMs));
   if (typeof tool.outputBytes === "number" && tool.outputBytes > 0) parts.push(fmtBytes3(tool.outputBytes));
   if (typeof tool.outputLines === "number" && tool.outputLines > 0) parts.push(`${tool.outputLines}L`);
   return parts.join(" ");
@@ -2386,7 +2584,7 @@ function LiveActivityStrip({
     running.map((e) => {
       const toolElapsed = e.currentTool ? now - e.currentTool.startedAt : 0;
       const taskElapsed = now - e.startedAt;
-      const toolSeg = e.currentTool ? `\u2192 ${e.currentTool.name} (${fmtElapsed4(toolElapsed)})` : "idle between tools";
+      const toolSeg = e.currentTool ? `\u2192 ${e.currentTool.name} (${fmtElapsed6(toolElapsed)})` : "idle between tools";
       const recentTools = (e.recentTools ?? []).slice(-2).map(fmtRecentTool2).join(" | ");
       const messageText = e.streamingText.trim() || (e.recentMessages ?? []).slice(-1).map(fmtRecentMessage2).join("");
       return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
@@ -2400,7 +2598,7 @@ function LiveActivityStrip({
           "it ",
           e.toolCalls,
           "tc \xB7 ",
-          fmtElapsed4(taskElapsed)
+          fmtElapsed6(taskElapsed)
         ] }),
         recentTools ? /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: "|" }),
@@ -3452,6 +3650,34 @@ function reducer(state, action) {
     case "autoPhaseReset": {
       return { ...state, autoPhase: null };
     }
+    case "worktreeUpsert": {
+      const prev = state.worktrees[action.handleId];
+      const merged = {
+        branch: "",
+        ownerLabel: "",
+        status: "active",
+        insertions: 0,
+        deletions: 0,
+        files: 0,
+        allocatedAt: Date.now(),
+        ...prev,
+        ...action.row
+      };
+      return {
+        ...state,
+        worktrees: { ...state.worktrees, [action.handleId]: merged },
+        worktreeBase: action.baseBranch ?? state.worktreeBase
+      };
+    }
+    case "worktreeRemove": {
+      if (!state.worktrees[action.handleId]) return state;
+      const next = { ...state.worktrees };
+      delete next[action.handleId];
+      return { ...state, worktrees: next };
+    }
+    case "worktreeMonitorToggle": {
+      return { ...state, worktreeMonitorOpen: !state.worktreeMonitorOpen };
+    }
   }
 }
 var PASTE_THRESHOLD_CHARS = 200;
@@ -3625,7 +3851,9 @@ function App({
     rewindOverlay: null,
     eternalStage: null,
     goalSummary: null,
-    autoPhase: null
+    autoPhase: null,
+    worktrees: {},
+    worktreeMonitorOpen: false
   });
   const builderRef = useRef(null);
   if (builderRef.current === null) {
@@ -4490,6 +4718,45 @@ function App({
           dispatch({ type: "autoPhaseReset" });
           break;
         }
+        case "worktree.allocated": {
+          const p = payload;
+          dispatch({
+            type: "worktreeUpsert",
+            handleId: p.handleId,
+            baseBranch: p.baseBranch,
+            row: { branch: p.branch, ownerLabel: p.ownerLabel, baseBranch: p.baseBranch, status: "active", allocatedAt: Date.now() }
+          });
+          break;
+        }
+        case "worktree.committed": {
+          const p = payload;
+          dispatch({
+            type: "worktreeUpsert",
+            handleId: p.handleId,
+            row: { insertions: p.insertions, deletions: p.deletions, files: p.files, status: "committing" }
+          });
+          break;
+        }
+        case "worktree.merged": {
+          const p = payload;
+          dispatch({ type: "worktreeUpsert", handleId: p.handleId, row: { status: "merged" } });
+          break;
+        }
+        case "worktree.conflict": {
+          const p = payload;
+          dispatch({ type: "worktreeUpsert", handleId: p.handleId, row: { status: "needs-review", conflictFiles: p.conflictFiles } });
+          break;
+        }
+        case "worktree.failed": {
+          const p = payload;
+          dispatch({ type: "worktreeUpsert", handleId: p.handleId, row: { status: "failed" } });
+          break;
+        }
+        case "worktree.released": {
+          const p = payload;
+          if (!p.kept) dispatch({ type: "worktreeRemove", handleId: p.handleId });
+          break;
+        }
       }
     };
     return subscribeAutoPhase(handler);
@@ -5023,6 +5290,10 @@ function App({
       dispatch({ type: "autoPhaseMonitorToggle" });
       return;
     }
+    if (key.ctrl && input === "t") {
+      dispatch({ type: "worktreeMonitorToggle" });
+      return;
+    }
     if (state.autonomyPicker.open) {
       if (key.escape) {
         dispatch({ type: "autonomyPickerClose" });
@@ -5752,6 +6023,14 @@ User message:
         nowTick,
         onClose: () => dispatch({ type: "autoPhaseMonitorToggle" })
       }
+    ) : state.worktreeMonitorOpen ? /* @__PURE__ */ jsx(
+      WorktreeMonitor,
+      {
+        worktrees: state.worktrees,
+        baseBranch: state.worktreeBase,
+        nowTick,
+        onClose: () => dispatch({ type: "worktreeMonitorToggle" })
+      }
     ) : state.monitorOpen ? /* @__PURE__ */ jsx(
       FleetMonitor,
       {
@@ -5768,7 +6047,8 @@ User message:
         runningPhaseIds: state.autoPhase.runningPhaseIds,
         nowTick
       }
-    ) : null
+    ) : null,
+    Object.keys(state.worktrees).length > 0 && !state.worktreeMonitorOpen && !state.monitorOpen ? /* @__PURE__ */ jsx(WorktreePanel, { worktrees: state.worktrees, nowTick }) : null
   ] });
 }
 function renderRunningTools(running) {
@@ -5803,6 +6083,75 @@ function fmtTok3(n) {
   return `${(n / 1e6).toFixed(1)}M`;
 }
 
+// src/terminal-title.ts
+var SPINNER = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var setTitle = (s2) => `\x1B]0;${s2}\x07`;
+function shortModel(model) {
+  if (!model) return "";
+  const base = model.split("/").pop() ?? model;
+  return base.replace(/-\d{8}$/, "").replace(/\[.*?\]$/, "");
+}
+function marquee(text, offset, width) {
+  const padded = `${text}   `;
+  const start = offset % padded.length;
+  return (padded + padded).slice(start, start + width);
+}
+function startTerminalTitle(opts) {
+  const { stdout, events } = opts;
+  if (process.env["WRONGSTACK_NO_TITLE"] === "1" || !stdout.isTTY) {
+    return () => {
+    };
+  }
+  const app = opts.appName ?? "WrongStack";
+  const model = shortModel(opts.model);
+  const idleAfter = opts.idleAfterMs ?? 3500;
+  const suffix = model ? ` \xB7 ${model}` : "";
+  let frame = 0;
+  let scroll = 0;
+  let phase = "idle";
+  let toolName = "";
+  let lastActivity = 0;
+  const touch = (next, tool) => {
+    phase = next;
+    if (tool) toolName = tool;
+    lastActivity = Date.now();
+  };
+  const offs = [
+    events.on("iteration.started", () => touch("thinking")),
+    events.on("provider.text_delta", () => touch("thinking")),
+    events.on("provider.thinking_delta", () => touch("thinking")),
+    events.on("tool.started", (e) => touch("tool", e.name ?? "tool")),
+    events.on("tool.executed", () => touch("thinking"))
+  ];
+  const write = (s2) => {
+    try {
+      stdout.write(s2);
+    } catch {
+    }
+  };
+  const timer = setInterval(() => {
+    frame = (frame + 1) % SPINNER.length;
+    scroll += 1;
+    if (lastActivity && Date.now() - lastActivity > idleAfter) phase = "idle";
+    const sp = SPINNER[frame];
+    let title;
+    if (phase === "tool") {
+      title = `${sp} \u25B8 ${toolName}${suffix}`;
+    } else if (phase === "thinking") {
+      title = `${sp} thinking\u2026${suffix}`;
+    } else {
+      title = marquee(`\u2726 ${app}${suffix}`, scroll >> 1, 22);
+    }
+    write(setTitle(title));
+  }, opts.intervalMs ?? 130);
+  timer.unref?.();
+  return () => {
+    clearInterval(timer);
+    for (const off of offs) off();
+    write(setTitle(model ? `${app} \xB7 ${model}` : app));
+  };
+}
+
 // src/run-tui.ts
 var BRACKETED_PASTE_ON = "\x1B[?2004h";
 var BRACKETED_PASTE_OFF = "\x1B[?2004l";
@@ -5824,6 +6173,7 @@ async function runTui(opts) {
     stdout.write(CURSOR_HOME);
   }
   stdout.write(BRACKETED_PASTE_ON);
+  const stopTitle = startTerminalTitle({ stdout, events: opts.events, model: opts.model });
   const swallowSignals = ["SIGTSTP", "SIGQUIT", "SIGTTIN", "SIGTTOU"];
   const swallow = () => {
   };
@@ -5837,6 +6187,10 @@ async function runTui(opts) {
   const cleanup = () => {
     if (cleaned) return;
     cleaned = true;
+    try {
+      stopTitle();
+    } catch {
+    }
     try {
       stdout.write(BRACKETED_PASTE_OFF);
       if (useAltScreen) {