revspec 0.8.1 → 0.8.3

package/README.md

@@ -54,12 +54,18 @@ Opens a TUI with vim-style navigation. Press `c` on any line to open a thread an
 | `j/k` | Move cursor down/up |
 | `gg` / `G` | Go to top / bottom |
 | `Ctrl+D/U` | Half page down/up |
+| `H/M/L` | Jump to screen top / middle / bottom |
 | `zz` | Center cursor line in viewport |
 | `/` | Search (smartcase) |
 | `n/N` | Next/prev search match |
 | `Esc` | Clear search highlights |
 | `]t/[t` | Next/prev thread |
 | `]r/[r` | Next/prev unread AI reply |
+| `]1/[1` | Next/prev h1 heading |
+| `]2/[2` | Next/prev h2 heading |
+| `]3/[3` | Next/prev h3 heading |
+| `Ctrl+O/I` | Jump list back/forward |
+| `''` | Jump to previous position |
 
 **Review**
 
@@ -69,7 +75,7 @@ Opens a TUI with vim-style navigation. Press `c` on any line to open a thread an
 | `r` | Resolve thread (toggle) |
 | `R` | Resolve all pending |
 | `dd` | Delete thread (with confirm) |
-| `t` | List threads |
+| `t` | List threads (`Ctrl+F` to filter all/active/resolved) |
 | `S` | Submit for rewrite (AI updates spec, TUI reloads) |
 | `A` | Approve spec (finalize and exit) |
 
@@ -78,24 +84,17 @@ Opens a TUI with vim-style navigation. Press `c` on any line to open a thread an
 | Key | Action |
 |-----|--------|
 | `:q` | Quit (warns if unresolved threads) |
-| `:q!` | Force quit |
+| `:q!` | Force quit (also `:wq!`, `:qa!`, etc.) |
 | `:{N}` | Jump to line N |
 | `Ctrl+C` | Force quit |
 | `?` | Help |
 
-**Popups**
-
-| Key | Action |
-|-----|--------|
-| `y/Enter` | Confirm / select |
-| `q/Esc` | Cancel / close |
-
 ### Thread popup
 
-The thread popup has two modes:
+The thread popup has two vim-style modes, indicated by border color and label:
 
-- **Insert mode** — type your comment, `Tab` sends, `Esc` switches to normal mode
-- **Normal mode** — `j/k` and `Ctrl+D/U` scroll the conversation, `gg/G` top/bottom, `c` to reply, `r` to resolve, `q/Esc` to close
+- **Insert mode** (green border) — type your comment, `Tab` sends, `Esc` switches to normal mode
+- **Normal mode** (blue border) — `j/k` and `Ctrl+D/U` scroll the conversation, `gg/G` top/bottom, `i/c` to reply, `r` to resolve, `q/Esc` to close
 
 ### Markdown rendering
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revspec",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Terminal-based spec review tool with real-time AI conversation",
   "type": "module",
   "license": "MIT",

package/src/tui/app.ts

@@ -61,9 +61,12 @@ export async function runTui(
 
   // Create and start the live watcher
   const liveWatcher: LiveWatcher = createLiveWatcher(jsonlPath, (ownerEvents) => {
+    let lastReplyThread: { id: string; line: number } | null = null;
     for (const event of ownerEvents) {
       if (event.type === "reply" && event.threadId && event.text) {
         state.addOwnerReply(event.threadId, event.text, event.ts);
+        const thread = state.threads.find((t) => t.id === event.threadId);
+        if (thread) lastReplyThread = { id: thread.id, line: thread.line };
         // If the thread popup is open for this thread, push the message in
         if (activeOverlay?.addMessage && activeOverlay?.threadId === event.threadId) {
           activeOverlay.addMessage({ author: "owner", text: event.text, ts: event.ts });
@@ -71,6 +74,10 @@ export async function runTui(
       }
     }
     refreshPager();
+    // Flash notification for AI replies when not viewing that thread
+    if (lastReplyThread && activeOverlay?.threadId !== lastReplyThread.id) {
+      showTransient(`AI replied on line ${lastReplyThread.line}`, "info");
+    }
   });
   liveWatcher.start();
 
@@ -113,8 +120,11 @@ export async function runTui(
 
     buildPagerNodes(pager.lineNode, state, searchQuery, state.unreadThreadIds);
     buildTopBar(topBar, specFile, state, state.unreadCount(), specMtimeChanged);
-    const hasThread = !!state.threadAtLine(state.cursorLine);
-    buildBottomBar(bottomBar, commandBuffer, hasThread);
+    // Don't overwrite transient messages (welcome hint, warnings) during navigation
+    if (!messageTimer) {
+      const hasThread = !!state.threadAtLine(state.cursorLine);
+      buildBottomBar(bottomBar, commandBuffer, hasThread);
+    }
     renderer.requestRender();
   }
 
@@ -124,6 +134,15 @@ export async function runTui(
   // Command mode state
   let commandBuffer: string | null = null;
 
+  // Transient message timer — prevents stale timeouts from clobbering each other
+  let messageTimer: ReturnType<typeof setTimeout> | null = null;
+  function showTransient(message: string, icon?: import("./status-bar").MessageIcon, ms = 1500): void {
+    if (messageTimer) clearTimeout(messageTimer);
+    setBottomBarMessage(bottomBar, message, icon);
+    renderer.requestRender();
+    messageTimer = setTimeout(() => { messageTimer = null; refreshPager(); }, ms);
+  }
+
   // Jump list — mirrors vim's :jumps behavior.
   // pushJump() is called BEFORE each big jump to record the departure position.
   // Ctrl+O traverses backward, Ctrl+I forward. Making a new jump while in the
@@ -219,22 +238,22 @@ export async function runTui(
 
   // Process command buffer input
   function processCommand(cmd: string, resolve: () => void): "exit" | "stay" {
-    if (cmd === "q" || cmd === "wq" || cmd === "qw") {
+    const forceQuit = ["q!", "qa!", "wq!", "wqa!", "qw!", "qwa!"];
+    const safeQuit = ["q", "qa", "wq", "wqa", "qw", "qwa"];
+    if (forceQuit.includes(cmd)) {
+      exitTui(resolve, "session-end");
+      return "exit";
+    }
+    if (safeQuit.includes(cmd)) {
       const { open, pending } = state.activeThreadCount();
       const total = open + pending;
       if (total > 0) {
-        setBottomBarMessage(bottomBar, `${total} unresolved thread(s). Use :q! to force quit`, "warn");
-        renderer.requestRender();
-        setTimeout(() => { refreshPager(); }, 2000);
+        showTransient(`${total} unresolved thread(s). Use :q! to force quit`, "warn", 2000);
         return "stay";
       }
       exitTui(resolve, "session-end");
       return "exit";
     }
-    if (cmd === "q!") {
-      exitTui(resolve, "session-end");
-      return "exit";
-    }
     // :{N} — jump to line number
     const lineNum = parseInt(cmd, 10);
     if (!isNaN(lineNum) && lineNum > 0) {
@@ -244,9 +263,7 @@ export async function runTui(
       refreshPager();
       return "stay";
     }
-    setBottomBarMessage(bottomBar, `Unknown command: ${cmd}`, "warn");
-    renderer.requestRender();
-    setTimeout(() => { refreshPager(); }, 1500);
+    showTransient(`Unknown command: ${cmd}`, "warn");
     return "stay";
   }
 
@@ -284,13 +301,24 @@ export async function runTui(
         }
       },
       onResolve: () => {
+        let didResolve = false;
         if (existingThread) {
           const wasResolved = existingThread.status === "resolved";
+          didResolve = !wasResolved;
           state.resolveThread(existingThread.id);
           state.markRead(existingThread.id);
           appendEvent(jsonlPath, { type: wasResolved ? "unresolve" : "resolve", threadId: existingThread.id, author: "reviewer", ts: Date.now() });
         }
         dismissOverlay();
+        // Auto-advance to next thread only when resolving (not reopening)
+        if (didResolve) {
+          const nextLine = state.nextThread();
+          if (nextLine !== null) {
+            state.cursorLine = nextLine;
+            ensureCursorVisible();
+          }
+        }
+        refreshPager();
       },
       onCancel: () => {
         if (existingThread) state.markRead(existingThread.id);
@@ -448,8 +476,7 @@ export async function runTui(
 
   refreshPager();
   if (state.threads.length === 0) {
-    setBottomBarMessage(bottomBar, "Navigate to a line and press c to start reviewing", "info");
-    renderer.requestRender();
+    showTransient("Navigate to a line and press c to comment  |  ? for help", "info", 8000);
   }
   renderer.start();
 
@@ -626,17 +653,13 @@ export async function runTui(
               ensureCursorVisible();
               refreshPager();
               if (wrapped) {
-                setBottomBarMessage(bottomBar, "Search wrapped to top", "info");
-                renderer.requestRender();
-                setTimeout(() => { refreshPager(); }, 1200);
+                showTransient("Search wrapped to top", "info", 1200);
               }
             } else {
               refreshPager();
             }
           } else {
-            setBottomBarMessage(bottomBar, "No active search \u2014 use / to search");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No active search \u2014 use / to search");
           }
           break;
         case "search-prev":
@@ -649,17 +672,13 @@ export async function runTui(
               ensureCursorVisible();
               refreshPager();
               if (wrapped) {
-                setBottomBarMessage(bottomBar, "Search wrapped to bottom", "info");
-                renderer.requestRender();
-                setTimeout(() => { refreshPager(); }, 1200);
+                showTransient("Search wrapped to bottom", "info", 1200);
               }
             } else {
               refreshPager();
             }
           } else {
-            setBottomBarMessage(bottomBar, "No active search \u2014 use / to search");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No active search \u2014 use / to search");
           }
           break;
         case "comment":
@@ -676,37 +695,33 @@ export async function runTui(
             state.markRead(thread.id);
             appendEvent(jsonlPath, { type: wasResolved ? "unresolve" : "resolve", threadId: thread.id, author: "reviewer", ts: Date.now() });
             refreshPager();
-            setBottomBarMessage(bottomBar,
+            showTransient(
               wasResolved ? `Reopened thread #${thread.id}` : `Resolved thread #${thread.id}`,
               "success");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
           } else {
-            setBottomBarMessage(bottomBar, "No thread on this line");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No thread on this line");
           }
           break;
         }
         case "resolve-all": {
           const { pending } = state.activeThreadCount();
+          if (pending === 0) {
+            showTransient("No pending threads");
+            break;
+          }
           const pendingThreads = state.threads.filter(t => t.status === "pending");
           state.resolveAllPending();
           for (const t of pendingThreads) {
             appendEvent(jsonlPath, { type: "resolve", threadId: t.id, author: "reviewer", ts: Date.now() });
           }
           refreshPager();
-          setBottomBarMessage(bottomBar, `Resolved ${pending} pending thread(s)`, "success");
-          renderer.requestRender();
-          setTimeout(() => { refreshPager(); }, 1500);
+          showTransient(`Resolved ${pending} pending thread(s)`, "success");
           break;
         }
         case "delete-draft": {
           const thread = state.threadAtLine(state.cursorLine);
           if (!thread) {
-            setBottomBarMessage(bottomBar, "No thread on this line");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No thread on this line");
             break;
           }
           const deleteOverlay = createConfirm({
@@ -718,9 +733,7 @@ export async function runTui(
               state.deleteThread(thread.id);
               appendEvent(jsonlPath, { type: "delete", threadId: thread.id, author: "reviewer", ts: Date.now() });
               refreshPager();
-              setBottomBarMessage(bottomBar, `Deleted thread #${thread.id}`, "success");
-              renderer.requestRender();
-              setTimeout(() => { refreshPager(); }, 1500);
+              showTransient(`Deleted thread #${thread.id}`, "success");
             },
             onCancel: () => {
               dismissOverlay();
@@ -751,9 +764,7 @@ export async function runTui(
                 clearInterval(activeSpecPoll!);
                 activeSpecPoll = null;
                 dismissOverlay();
-                setBottomBarMessage(bottomBar, "Agent did not update spec. Press S to retry.", "warn");
-                renderer.requestRender();
-                setTimeout(() => { refreshPager(); }, 3000);
+                showTransient("AI did not update the spec. Press S to resubmit.", "warn", 3000);
               },
             });
             showOverlay(spinnerOverlay);
@@ -772,11 +783,12 @@ export async function runTui(
                   liveWatcher.start();
                   dismissOverlay();
                   searchQuery = null;
+                  jumpList.length = 0;
+                  jumpList.push(1);
+                  jumpIndex = 0;
                   ensureCursorVisible();
                   refreshPager();
-                  setBottomBarMessage(bottomBar, "Spec rewritten \u2014 review cleared", "success");
-                  renderer.requestRender();
-                  setTimeout(() => { refreshPager(); }, 2500);
+                  showTransient("Spec rewritten \u2014 review cleared", "success", 2500);
                 }
               } catch {}
             }, 500);
@@ -784,45 +796,34 @@ export async function runTui(
           break;
         case "approve":
           unresolvedGate(() => {
-            const confirmOverlay = createConfirm({
-              renderer,
-              message: "Approve spec and proceed to implementation?",
-              onConfirm: () => {
-                dismissOverlay();
-                exitTui(resolve, "approve");
-              },
-              onCancel: () => {
-                dismissOverlay();
-              },
-            });
-            showOverlay(confirmOverlay);
+            exitTui(resolve, "approve");
           });
           break;
         case "next-thread": {
-          const next = state.nextThread();
-          if (next !== null) {
+          const nextT = state.nextThread();
+          if (nextT !== null) {
+            const wrapped = nextT <= state.cursorLine;
             savePrevPosition();
-            state.cursorLine = next;
+            state.cursorLine = nextT;
             ensureCursorVisible();
             refreshPager();
+            if (wrapped) showTransient("Wrapped to first thread", "info", 1200);
           } else {
-            setBottomBarMessage(bottomBar, "No threads");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No threads");
           }
           break;
         }
         case "prev-thread": {
-          const prev = state.prevThread();
-          if (prev !== null) {
+          const prevT = state.prevThread();
+          if (prevT !== null) {
+            const wrapped = prevT >= state.cursorLine;
             savePrevPosition();
-            state.cursorLine = prev;
+            state.cursorLine = prevT;
             ensureCursorVisible();
             refreshPager();
+            if (wrapped) showTransient("Wrapped to last thread", "info", 1200);
           } else {
-            setBottomBarMessage(bottomBar, "No threads");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No threads");
           }
           break;
         }
@@ -834,9 +835,7 @@ export async function runTui(
             ensureCursorVisible();
             refreshPager();
           } else {
-            setBottomBarMessage(bottomBar, "No unread replies");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No unread replies");
           }
           break;
         }
@@ -848,9 +847,7 @@ export async function runTui(
             ensureCursorVisible();
             refreshPager();
           } else {
-            setBottomBarMessage(bottomBar, "No unread replies");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No unread replies");
           }
           break;
         }
@@ -865,9 +862,7 @@ export async function runTui(
             ensureCursorVisible();
             refreshPager();
           } else {
-            setBottomBarMessage(bottomBar, `No h${level} headings`);
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient(`No h${level} headings`);
           }
           break;
         }
@@ -882,9 +877,7 @@ export async function runTui(
             ensureCursorVisible();
             refreshPager();
           } else {
-            setBottomBarMessage(bottomBar, `No h${level} headings`);
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient(`No h${level} headings`);
           }
           break;
         }
@@ -931,6 +924,7 @@ export async function runTui(
           showSearchOverlay();
           break;
         case "command-mode":
+          if (messageTimer) { clearTimeout(messageTimer); messageTimer = null; }
           commandBuffer = "";
           refreshPager();
           break;

package/src/tui/comment-input.ts

@@ -65,7 +65,7 @@ function createThreadView(
     focusedBackgroundColor: theme.backgroundPanel,
     focusedTextColor: theme.text,
     wrapMode: "word",
-    placeholder: "Press c to reply...",
+    placeholder: "Type your comment...",
     placeholderColor: theme.textDim,
     initialValue: "",
   });
@@ -107,6 +107,7 @@ function createThreadView(
         onCancel();
         return;
 
+      case "i":
       case "c":
         enterInsert();
         return;
@@ -251,6 +252,7 @@ function createThreadView(
     mode = "insert";
     textarea.focus();
     dialog.setHints(insertHints);
+    dialog.container.borderColor = theme.green;
     renderer.requestRender();
   }
 
@@ -258,6 +260,7 @@ function createThreadView(
     mode = "normal";
     textarea.blur();
     dialog.setHints(normalHints);
+    dialog.container.borderColor = theme.blue;
     renderer.requestRender();
   }
 

package/src/tui/confirm.ts

@@ -35,7 +35,7 @@ export function createConfirm(opts: ConfirmOptions): ConfirmOverlay {
     height: 9,
     top: "30%",
     left: "28%",
-    borderColor: theme.warning,
+    borderColor: theme.mauve,
     onDismiss: onCancel,
     hints: CONFIRM_HINTS,
   });

package/src/tui/help.ts

@@ -54,7 +54,7 @@ export function createHelp(opts: {
     height: Math.min(32, renderer.height - 4),
     top: "10%",
     left: "18%",
-    borderColor: theme.info,
+    borderColor: theme.blue,
     onDismiss: onClose,
     hints: HELP_HINTS,
   });
@@ -77,8 +77,8 @@ export function createHelp(opts: {
   ]);
 
   addHelpSection(dialog.content, renderer, "Thread Popup", [
-    "  New thread: INSERT mode — type and Tab to send.",
-    "  Existing thread: NORMAL mode — read conversation,",
+    "  New thread: INSERT mode (green border) — type and Tab to send.",
+    "  Existing thread: NORMAL mode (blue border) — scroll conversation,",
     "  c to reply, r to resolve, q/Esc to close.",
   ]);
 

package/src/tui/live-watcher.ts

@@ -15,14 +15,16 @@ export function createLiveWatcher(
   let pollTimer: ReturnType<typeof setInterval> | null = null
 
   function check() {
-    const { events, newOffset } = readEventsFromOffset(jsonlPath, offset)
-    if (events.length > 0) {
-      offset = newOffset
-      const ownerEvents = events.filter((e) => e.author === "owner")
-      if (ownerEvents.length > 0) {
-        onOwnerEvents(ownerEvents)
+    try {
+      const { events, newOffset } = readEventsFromOffset(jsonlPath, offset)
+      if (events.length > 0) {
+        offset = newOffset
+        const ownerEvents = events.filter((e) => e.author === "owner")
+        if (ownerEvents.length > 0) {
+          onOwnerEvents(ownerEvents)
+        }
       }
-    }
+    } catch {}
   }
 
   return {

package/src/tui/pager.ts

@@ -1,5 +1,4 @@
 import type { ReviewState } from "../state/review-state";
-import type { Thread } from "../protocol/types";
 import {
   ScrollBoxRenderable,
   TextRenderable,
@@ -10,16 +9,6 @@ import {
 import { theme } from "./ui/theme";
 import { parseMarkdownLine, addSegments, collectTable, renderTableBorder, renderTableSeparator, renderTableRow, parseTableCells, type TableBlock } from "./ui/markdown";
 
-const MAX_HINT_LENGTH = 40;
-
-function threadHint(thread: Thread): string {
-  if (thread.messages.length === 0) return "";
-  const last = thread.messages[thread.messages.length - 1];
-  const text = last.text.replace(/\n/g, " ");
-  if (text.length <= MAX_HINT_LENGTH) return text;
-  return text.slice(0, MAX_HINT_LENGTH - 1) + "\u2026";
-}
-
 // --- Plain text builder (for tests) ---
 
 /**
@@ -127,7 +116,7 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
     // Gutter: cursor + indicator + line number (dimmed)
     lineNode.add(TextNodeRenderable.fromString(
       `${prefix}`,
-      { fg: isCursor ? theme.text : theme.textDim, bg: isCursor ? theme.backgroundElement : undefined }
+      { fg: isCursor ? theme.mauve : theme.textDim, bg: isCursor ? theme.backgroundElement : undefined }
     ));
     lineNode.add(TextNodeRenderable.fromString(
       indicator,
@@ -171,7 +160,10 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
         lineNode.add(TextNodeRenderable.fromString(gutterBlank, { fg: theme.textDim }));
         renderTableBorder(lineNode, tableBlock.colWidths, "bottom");
       }
-    } else if (searchQuery && specText.toLowerCase().includes(searchQuery.toLowerCase())) {
+    } else if (searchQuery && (() => {
+      const cs = searchQuery !== searchQuery.toLowerCase();
+      return cs ? specText.includes(searchQuery) : specText.toLowerCase().includes(searchQuery.toLowerCase());
+    })()) {
       // Line contains search match — show colored match segments (no markdown styling)
       const escaped = searchQuery.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
       const caseSensitive = searchQuery !== searchQuery.toLowerCase();
@@ -193,15 +185,6 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
       addSegments(lineNode, segments, theme.text, isCursor ? theme.backgroundElement : undefined);
     }
 
-    // Thread hint (dimmed, inline)
-    if (thread && thread.messages.length > 0) {
-      const hint = threadHint(thread);
-      lineNode.add(TextNodeRenderable.fromString(
-        `  \u00ab ${hint}`,
-        { fg: theme.textDim, attributes: TextAttributes.DIM, bg: isCursor ? theme.backgroundElement : undefined }
-      ));
-    }
-
     // Newline between lines (except last)
     if (i < state.specLines.length - 1) {
       lineNode.add(TextNodeRenderable.fromString("\n", {}));

package/src/tui/spinner.ts

@@ -6,7 +6,7 @@ import {
 } from "@opentui/core";
 import { theme } from "./ui/theme";
 
-const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const SPINNER_FRAMES = ["|", "/", "-", "\\"];
 
 export interface SpinnerOverlay {
   container: BoxRenderable;
@@ -32,7 +32,7 @@ export function createSpinner(opts: {
     backgroundColor: theme.backgroundPanel,
     border: true,
     borderStyle: "single",
-    borderColor: theme.blue,
+    borderColor: theme.mauve,
     title: " Submitting ",
     flexDirection: "column",
     paddingLeft: 2,

package/src/tui/status-bar.ts

@@ -33,16 +33,16 @@ export function buildTopBar(
   // Filename — bold
   t.add(TextNodeRenderable.fromString(` ${name}`, { fg: theme.text, attributes: TextAttributes.BOLD }));
 
-  t.add(TextNodeRenderable.fromString("  \u00b7  ", { fg: theme.textDim }));
-
-  // Thread summary
-  if (open > 0 || pending > 0) {
-    const parts: string[] = [];
-    if (open > 0) parts.push(`${open} open`);
-    if (pending > 0) parts.push(`${pending} pending`);
-    t.add(TextNodeRenderable.fromString(parts.join(", "), { fg: theme.yellow }));
-  } else {
-    t.add(TextNodeRenderable.fromString("No active threads", { fg: theme.textMuted }));
+  // Thread progress — shown when threads exist
+  if (state.threads.length > 0) {
+    const resolved = state.threads.filter((t) => t.status === "resolved").length;
+    const total = state.threads.length;
+    t.add(TextNodeRenderable.fromString("  \u00b7  ", { fg: theme.textDim }));
+    if (resolved === total) {
+      t.add(TextNodeRenderable.fromString(`${resolved}/${total} resolved`, { fg: theme.green }));
+    } else {
+      t.add(TextNodeRenderable.fromString(`${resolved}/${total} resolved`, { fg: theme.yellow }));
+    }
   }
 
   // Unread replies
@@ -50,7 +50,7 @@ export function buildTopBar(
     t.add(TextNodeRenderable.fromString("  \u00b7  ", { fg: theme.textDim }));
     t.add(TextNodeRenderable.fromString(
       `${unreadCount} new repl${unreadCount === 1 ? "y" : "ies"}`,
-      { fg: theme.green, attributes: TextAttributes.BOLD }
+      { fg: theme.yellow, attributes: TextAttributes.BOLD }
     ));
   }
 
@@ -66,6 +66,16 @@ export function buildTopBar(
     : `${Math.round(((state.cursorLine - 1) / (state.lineCount - 1)) * 100)}%`;
   t.add(TextNodeRenderable.fromString("  \u00b7  ", { fg: theme.textDim }));
   t.add(TextNodeRenderable.fromString(`L${state.cursorLine}/${state.lineCount} ${posLabel}`, { fg: theme.textMuted }));
+
+  // Current section breadcrumb — nearest heading above cursor
+  for (let i = state.cursorLine - 1; i >= 0; i--) {
+    const match = state.specLines[i].match(/^(#{1,3})\s+(.+)/);
+    if (match) {
+      t.add(TextNodeRenderable.fromString("  \u00b7  ", { fg: theme.textDim }));
+      t.add(TextNodeRenderable.fromString(match[2].trim(), { fg: theme.textDim, attributes: TextAttributes.ITALIC }));
+      break;
+    }
+  }
 }
 
 export type MessageIcon = "warn" | "success" | "info";

package/src/tui/thread-list.ts

@@ -57,7 +57,11 @@ function buildTitle(threads: Thread[], mode: FilterMode): string {
 }
 
 function threadsToOptions(threads: Thread[]) {
-  return threads.map((t) => {
+  const STATUS_ORDER: Record<string, number> = { open: 0, pending: 1, resolved: 2 };
+  const sorted = [...threads].sort((a, b) =>
+    (STATUS_ORDER[a.status] ?? 3) - (STATUS_ORDER[b.status] ?? 3) || a.line - b.line
+  );
+  return sorted.map((t) => {
     const icon = STATUS_ICONS[t.status];
     return {
       name: `${icon} #${t.id} line ${t.line}: ${previewText(t)}`,
@@ -92,7 +96,7 @@ export function createThreadList(opts: ThreadListOptions): ThreadListOverlay {
     height: "50%",
     top: "20%",
     left: "22%",
-    borderColor: theme.mauve,
+    borderColor: theme.blue,
     onDismiss: onCancel,
     hints: THREAD_LIST_HINTS,
   });
@@ -177,7 +181,7 @@ export function createThreadList(opts: ThreadListOptions): ThreadListOverlay {
       return;
     }
     if (filtered.length === 0) return;
-    if (key.name === "return" || key.name === "y") {
+    if (key.name === "return") {
       key.preventDefault();
       key.stopPropagation();
       const selected = select.getSelectedOption();

package/src/tui/ui/hint-bar.ts

@@ -1,4 +1,4 @@
-import { TextRenderable, TextNodeRenderable } from "@opentui/core";
+import { TextRenderable, TextNodeRenderable, TextAttributes } from "@opentui/core";
 import { theme } from "./theme";
 
 export interface Hint {
@@ -11,8 +11,14 @@ export function buildHints(text: TextRenderable, hints: Hint[]): void {
   text.add(TextNodeRenderable.fromString(" ", {}));
   for (let i = 0; i < hints.length; i++) {
     const h = hints[i];
-    text.add(TextNodeRenderable.fromString(`[${h.key}]`, { fg: theme.blue }));
-    text.add(TextNodeRenderable.fromString(` ${h.action}`, { fg: theme.textMuted }));
+    // Mode labels (empty action) get distinct styling so they stand out
+    const isMode = h.action === "";
+    const keyFg = isMode ? (h.key === "INSERT" ? theme.green : theme.blue) : theme.blue;
+    const keyAttrs = isMode ? TextAttributes.BOLD : undefined;
+    text.add(TextNodeRenderable.fromString(`[${h.key}]`, { fg: keyFg, attributes: keyAttrs }));
+    if (!isMode) {
+      text.add(TextNodeRenderable.fromString(` ${h.action}`, { fg: theme.textMuted }));
+    }
     if (i < hints.length - 1) {
       text.add(TextNodeRenderable.fromString("  ", {}));
     }

package/src/tui/ui/keymap.ts

@@ -21,7 +21,7 @@ export const PAGER_HINTS = {
 
 export const THREAD_NORMAL_HINTS: Hint[] = [
   { key: "NORMAL", action: "" },
-  { key: "c", action: "reply" },
+  { key: "i/c", action: "reply" },
   { key: "r", action: "resolve" },
   { key: "q/Esc", action: "close" },
 ];
@@ -36,7 +36,7 @@ export const THREAD_INSERT_HINTS: Hint[] = [
 
 export const THREAD_LIST_HINTS: Hint[] = [
   { key: "j/k", action: "navigate" },
-  { key: "y/Enter", action: "jump" },
+  { key: "Enter", action: "jump" },
   { key: "Ctrl+f", action: "filter" },
   { key: "q/Esc", action: "close" },
 ];
@@ -52,5 +52,5 @@ export const HELP_HINTS: Hint[] = [
 
 export const CONFIRM_HINTS: Hint[] = [
   { key: "y/Enter", action: "yes" },
-  { key: "q/Esc", action: "no" },
+  { key: "q/Esc", action: "cancel" },
 ];

package/src/tui/ui/markdown.ts

@@ -29,7 +29,7 @@ export function parseInlineMarkdown(text: string): StyledSegment[] {
   //   7: ~~strikethrough~~
   //   8: [link text](url) — display text only
   //   9: `code`
-  const regex = /(\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(.+?)\*|__(.+?)__|_(.+?)_|~~(.+?)~~|\[([^\]]+)\]\([^)]+\)|`([^`]+)`)/g;
+  const regex = /(\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(.+?)\*|(?<!\w)__(.+?)__(?!\w)|(?<!\w)_(.+?)_(?!\w)|~~(.+?)~~|\[([^\]]+)\]\([^)]+\)|`([^`]+)`)/g;
   let pos = 0;
   let match;
   while ((match = regex.exec(text)) !== null) {