revspec 0.8.0 → 0.8.2

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, `c` to reply, `r` to resolve, `q/Esc` to close
 
 ### Markdown rendering
 

package/package.json

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

package/src/tui/app.ts

@@ -27,6 +27,7 @@ import { createConfirm } from "./confirm";
 import { createHelp } from "./help";
 import { createSpinner } from "./spinner";
 import { createKeybindRegistry, type KeyBinding } from "./ui/keybinds";
+import { theme } from "./ui/theme";
 
 export async function runTui(
   specFile: string,
@@ -123,10 +124,38 @@ export async function runTui(
   // Command mode state
   let commandBuffer: string | null = null;
 
-  // Previous position for '' jump-back
-  let prevCursorLine: number = 1;
+  // 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
+  // middle of the list discards forward history (same as vim).
+  const jumpList: number[] = [1];
+  let jumpIndex: number = 0;
+  const MAX_JUMP_LIST = 50;
+
+  function pushJump(): void {
+    const cur = state.cursorLine;
+    // Discard forward history when making a new jump from the middle
+    if (jumpIndex < jumpList.length - 1) {
+      jumpList.splice(jumpIndex + 1);
+    }
+    // Don't push duplicate of the list tail
+    if (jumpList.length > 0 && jumpList[jumpList.length - 1] === cur) return;
+    jumpList.push(cur);
+    if (jumpList.length > MAX_JUMP_LIST) jumpList.shift();
+    jumpIndex = jumpList.length - 1;
+  }
+
   function savePrevPosition(): void {
-    prevCursorLine = state.cursorLine;
+    pushJump();
   }
 
   // Map visual row back to spec line number (for H/M/L)
@@ -199,22 +228,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, ` \u26a0 ${total} unresolved thread(s). Use :q! to force quit`);
-        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) {
@@ -224,9 +253,7 @@ export async function runTui(
       refreshPager();
       return "stay";
     }
-    setBottomBarMessage(bottomBar, ` Unknown command: ${cmd}`);
-    renderer.requestRender();
-    setTimeout(() => { refreshPager(); }, 1500);
+    showTransient(`Unknown command: ${cmd}`, "warn");
     return "stay";
   }
 
@@ -273,6 +300,7 @@ export async function runTui(
         dismissOverlay();
       },
       onCancel: () => {
+        if (existingThread) state.markRead(existingThread.id);
         dismissOverlay();
       },
     });
@@ -426,6 +454,10 @@ export async function runTui(
   const keybinds = createKeybindRegistry(bindings, 300);
 
   refreshPager();
+  if (state.threads.length === 0) {
+    setBottomBarMessage(bottomBar, "Navigate to a line and press c to comment  |  ? for help", "info");
+    renderer.requestRender();
+  }
   renderer.start();
 
   // 8. Set up keybinding handler
@@ -488,6 +520,38 @@ export async function runTui(
         return;
       }
 
+      // Ctrl+O: jump back in jump list
+      if (key.ctrl && key.name === "o") {
+        // Starting backward traversal from head — save current position first
+        // (without splicing forward history, unlike pushJump)
+        if (jumpIndex === jumpList.length - 1) {
+          const cur = state.cursorLine;
+          if (jumpList[jumpIndex] !== cur) {
+            jumpList.push(cur);
+            if (jumpList.length > MAX_JUMP_LIST) jumpList.shift();
+            jumpIndex = jumpList.length - 1;
+          }
+        }
+        if (jumpIndex > 0) {
+          jumpIndex--;
+          state.cursorLine = Math.min(jumpList[jumpIndex], state.lineCount);
+          ensureCursorVisible();
+          refreshPager();
+        }
+        return;
+      }
+
+      // Ctrl+I / Tab: jump forward in jump list
+      if ((key.ctrl && key.name === "i") || key.name === "tab") {
+        if (jumpIndex < jumpList.length - 1) {
+          jumpIndex++;
+          state.cursorLine = Math.min(jumpList[jumpIndex], state.lineCount);
+          ensureCursorVisible();
+          refreshPager();
+        }
+        return;
+      }
+
       // Escape clears search highlights
       if (key.name === "escape") {
         if (searchQuery) {
@@ -563,31 +627,39 @@ export async function runTui(
           if (searchQuery) {
             const match = findNextMatch(state.specLines, searchQuery, state.cursorLine, 1);
             if (match !== null) {
+              const wrapped = match <= state.cursorLine;
               savePrevPosition();
               state.cursorLine = match;
               ensureCursorVisible();
+              refreshPager();
+              if (wrapped) {
+                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");
           }
-          refreshPager();
           break;
         case "search-prev":
           if (searchQuery) {
             const match = findNextMatch(state.specLines, searchQuery, state.cursorLine, -1);
             if (match !== null) {
+              const wrapped = match >= state.cursorLine;
               savePrevPosition();
               state.cursorLine = match;
               ensureCursorVisible();
+              refreshPager();
+              if (wrapped) {
+                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");
           }
-          refreshPager();
           break;
         case "comment":
           showCommentInput();
@@ -603,38 +675,33 @@ export async function runTui(
             state.markRead(thread.id);
             appendEvent(jsonlPath, { type: wasResolved ? "unresolve" : "resolve", threadId: thread.id, author: "reviewer", ts: Date.now() });
             refreshPager();
-            const msg = wasResolved
-              ? ` \u21a9 Reopened thread #${thread.id}`
-              : ` \u2714 Resolved thread #${thread.id}`;
-            setBottomBarMessage(bottomBar, msg);
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient(
+              wasResolved ? `Reopened thread #${thread.id}` : `Resolved thread #${thread.id}`,
+              "success");
           } 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, ` \u2714 Resolved ${pending} pending thread(s)`);
-          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({
@@ -646,9 +713,7 @@ export async function runTui(
               state.deleteThread(thread.id);
               appendEvent(jsonlPath, { type: "delete", threadId: thread.id, author: "reviewer", ts: Date.now() });
               refreshPager();
-              setBottomBarMessage(bottomBar, ` \u2714 Deleted thread #${thread.id}`);
-              renderer.requestRender();
-              setTimeout(() => { refreshPager(); }, 1500);
+              showTransient(`Deleted thread #${thread.id}`, "success");
             },
             onCancel: () => {
               dismissOverlay();
@@ -659,16 +724,17 @@ export async function runTui(
         }
         case "submit":
           if (state.threads.length === 0) {
-            setBottomBarMessage(bottomBar, " No threads to submit.");
+            setBottomBarMessage(bottomBar, "No threads to submit.");
             renderer.requestRender();
             break;
           }
           unresolvedGate(() => {
             appendEvent(jsonlPath, { type: "submit", author: "reviewer", ts: Date.now() });
 
+            const count = state.threads.length;
             const spinnerOverlay = createSpinner({
               renderer,
-              message: "Waiting for agent to update spec...",
+              message: `Submitting ${count} thread${count === 1 ? "" : "s"}...`,
               onCancel: () => {
                 clearInterval(activeSpecPoll!);
                 activeSpecPoll = null;
@@ -678,9 +744,7 @@ export async function runTui(
                 clearInterval(activeSpecPoll!);
                 activeSpecPoll = null;
                 dismissOverlay();
-                setBottomBarMessage(bottomBar, " \u26a0 Agent did not update spec. Press S to retry.");
-                renderer.requestRender();
-                setTimeout(() => { refreshPager(); }, 3000);
+                showTransient("AI did not update the spec. Press S to resubmit.", "warn", 3000);
               },
             });
             showOverlay(spinnerOverlay);
@@ -701,6 +765,7 @@ export async function runTui(
                   searchQuery = null;
                   ensureCursorVisible();
                   refreshPager();
+                  showTransient("Spec rewritten \u2014 review cleared", "success", 2500);
                 }
               } catch {}
             }, 500);
@@ -723,30 +788,30 @@ export async function runTui(
           });
           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;
         }
@@ -758,9 +823,7 @@ export async function runTui(
             ensureCursorVisible();
             refreshPager();
           } else {
-            setBottomBarMessage(bottomBar, " No unread replies");
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient("No unread replies");
           }
           break;
         }
@@ -772,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;
         }
@@ -789,9 +850,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;
         }
@@ -806,18 +865,23 @@ export async function runTui(
             ensureCursorVisible();
             refreshPager();
           } else {
-            setBottomBarMessage(bottomBar, ` No h${level} headings`);
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
+            showTransient(`No h${level} headings`);
           }
           break;
         }
         case "jump-back": {
-          const tmp = state.cursorLine;
-          state.cursorLine = prevCursorLine;
-          prevCursorLine = tmp;
-          ensureCursorVisible();
-          refreshPager();
+          // '' swaps between current position and last jump entry
+          if (jumpList.length > 1) {
+            const cur = state.cursorLine;
+            const prevIdx = jumpIndex > 0 ? jumpIndex - 1 : 0;
+            const target = jumpList[prevIdx];
+            // Record current position at our spot so '' can swap back
+            jumpList[jumpIndex] = cur;
+            jumpIndex = prevIdx;
+            state.cursorLine = Math.min(target, state.lineCount);
+            ensureCursorVisible();
+            refreshPager();
+          }
           break;
         }
         case "screen-top": {
@@ -848,6 +912,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) — read conversation,",
     "  c to reply, r to resolve, q/Esc to close.",
   ]);
 
@@ -95,6 +95,7 @@ export function createHelp(opts: {
     "  ]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",
     "  H/M/L     Screen top/middle/bottom",
   ]);
@@ -104,7 +105,7 @@ export function createHelp(opts: {
     "  r         Resolve thread (toggle)",
     "  R         Resolve all pending",
     "  dd        Delete thread",
-    "  t         List threads",
+    "  t         List threads (Ctrl+f to filter)",
     "  S         Submit for rewrite",
     "  A         Approve spec",
   ]);

package/src/tui/pager.ts

@@ -45,7 +45,7 @@ export function buildPagerContent(state: ReviewState, searchQuery?: string | nul
       if (isUnread) {
         indicator = "\u2588";
       } else if (thread.status === "resolved") {
-        indicator = "\u2713";
+        indicator = "=";
       } else {
         indicator = "\u258c";
       }
@@ -104,7 +104,7 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
         indicator = "\u2588"; // █ full block — unread reply
         indicatorColor = theme.yellow;
       } else if (thread.status === "resolved") {
-        indicator = "\u2713"; // ✓ resolved
+        indicator = "="; // resolved
         indicatorColor = theme.green;
       } else {
         indicator = "\u258c"; // ▌ half block — has thread
@@ -127,7 +127,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.yellow : theme.textDim, bg: isCursor ? theme.backgroundElement : undefined }
     ));
     lineNode.add(TextNodeRenderable.fromString(
       indicator,
@@ -171,8 +171,8 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
         lineNode.add(TextNodeRenderable.fromString(gutterBlank, { fg: theme.textDim }));
         renderTableBorder(lineNode, tableBlock.colWidths, "bottom");
       }
-    } else if (searchQuery) {
-      // When searching, show colored match segments (no markdown styling)
+    } else if (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();
       const searchRegex = new RegExp(`(${escaped})`, caseSensitive ? "g" : "gi");

package/src/tui/spinner.ts

@@ -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,
@@ -51,9 +51,11 @@ export function createSpinner(opts: {
   container.add(text);
 
   let frame = 0;
+  const startTime = Date.now();
   const spinInterval = setInterval(() => {
     frame = (frame + 1) % SPINNER_FRAMES.length;
-    text.content = `${SPINNER_FRAMES[frame]} ${message}`;
+    const elapsed = Math.floor((Date.now() - startTime) / 1000);
+    text.content = `${SPINNER_FRAMES[frame]} ${message} (${elapsed}s)`;
     renderer.requestRender();
   }, 80);
 

package/src/tui/status-bar.ts

@@ -60,18 +60,45 @@ export function buildTopBar(
     t.add(TextNodeRenderable.fromString("!! Spec changed externally", { fg: theme.red, attributes: TextAttributes.BOLD }));
   }
 
-  // Cursor position
+  // Cursor position + scroll percentage
+  const posLabel = state.cursorLine <= 1 ? "Top"
+    : state.cursorLine >= state.lineCount ? "Bot"
+    : `${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}`, { fg: theme.textMuted }));
+  t.add(TextNodeRenderable.fromString(`L${state.cursorLine}/${state.lineCount} ${posLabel}`, { fg: theme.textMuted }));
 }
 
+export type MessageIcon = "warn" | "success" | "info";
+
+const ICON_MAP: Record<MessageIcon, { symbol: string; fg: string }> = {
+  warn:    { symbol: "!", fg: theme.yellow! },
+  success: { symbol: "*", fg: theme.green! },
+  info:    { symbol: "-", fg: theme.blue! },
+};
+
 /**
- * Set a transient message on the bottom bar (using TextNodes, not .content).
+ * Set a transient message on the bottom bar.
+ * With icon: renders as " ⚠ │ message text"
+ * Without icon: renders as " message text"
  */
-export function setBottomBarMessage(bar: BottomBarComponents, message: string, fg?: string): void {
+export function setBottomBarMessage(
+  bar: BottomBarComponents,
+  message: string,
+  iconOrFg?: MessageIcon | string,
+): void {
   const t = bar.text;
   t.clear();
-  t.add(TextNodeRenderable.fromString(message, { fg: fg ?? theme.text }));
+
+  // Detect if it's an icon type or a raw fg color
+  const icon = iconOrFg && iconOrFg in ICON_MAP ? ICON_MAP[iconOrFg as MessageIcon] : null;
+  const fg = icon ? icon.fg : (iconOrFg as string | undefined) ?? theme.text;
+
+  if (icon) {
+    t.add(TextNodeRenderable.fromString(` ${icon.symbol} `, { fg: icon.fg }));
+    t.add(TextNodeRenderable.fromString(message, { fg: fg! }));
+  } else {
+    t.add(TextNodeRenderable.fromString(` ${message}`, { fg: fg! }));
+  }
 }
 
 /**

package/src/tui/thread-list.ts

@@ -24,6 +24,9 @@ export interface ThreadListOverlay {
 
 const MAX_PREVIEW_LENGTH = 50;
 
+type FilterMode = "all" | "active" | "resolved";
+const FILTER_CYCLE: FilterMode[] = ["all", "active", "resolved"];
+
 function previewText(thread: Thread): string {
   if (thread.messages.length === 0) return "(empty)";
   const first = thread.messages[0];
@@ -32,128 +35,179 @@ function previewText(thread: Thread): string {
   return text.slice(0, MAX_PREVIEW_LENGTH - 1) + "\u2026";
 }
 
+function filterThreads(threads: Thread[], mode: FilterMode): Thread[] {
+  switch (mode) {
+    case "active":
+      return threads.filter((t) => t.status === "open" || t.status === "pending");
+    case "resolved":
+      return threads.filter((t) => t.status === "resolved");
+    case "all":
+    default:
+      return threads;
+  }
+}
+
+function buildTitle(threads: Thread[], mode: FilterMode): string {
+  const activeCount = threads.filter(
+    (t) => t.status === "open" || t.status === "pending"
+  ).length;
+  const total = threads.length;
+  const label = mode === "all" ? "all" : mode;
+  return `Threads (${activeCount} active, ${total} total) [${label}]`;
+}
+
+function threadsToOptions(threads: Thread[]) {
+  return threads.map((t) => {
+    const icon = STATUS_ICONS[t.status];
+    return {
+      name: `${icon} #${t.id} line ${t.line}: ${previewText(t)}`,
+      description: `${t.status} - ${t.messages.length} message(s)`,
+      value: t.line,
+    };
+  });
+}
+
 /**
  * Create a thread list overlay showing all threads.
  * Select + Enter: jump to that thread's line.
+ * Ctrl+F: cycle filter (all → active → resolved).
  * Escape: cancel.
  */
 export function createThreadList(opts: ThreadListOptions): ThreadListOverlay {
   const { renderer, threads, onSelect, onCancel } = opts;
 
+  // Exclude outdated threads from the pool
   const allThreads = threads.filter(
     (t) => t.status === "open" || t.status === "pending" || t.status === "resolved"
   );
-  const activeCount = threads.filter(
-    (t) => t.status === "open" || t.status === "pending"
-  ).length;
+
+  let filterIndex = 0;
+  let currentFilter: FilterMode = FILTER_CYCLE[0];
+  let filtered = filterThreads(allThreads, currentFilter);
 
   const dialog = createDialog({
     renderer,
-    title: `Threads (${activeCount} active, ${allThreads.length} total)`,
+    title: buildTitle(allThreads, currentFilter),
     width: "56%",
     height: "50%",
     top: "20%",
     left: "22%",
-    borderColor: theme.mauve,
+    borderColor: theme.blue,
     onDismiss: onCancel,
     hints: THREAD_LIST_HINTS,
   });
 
-  let keyHandler: ((key: KeyEvent) => void) | null = null;
-
-  if (allThreads.length === 0) {
-    const emptyMsg = new TextRenderable(renderer, {
-      content: "No threads. Press [Esc] to close.",
-      width: "100%",
-      height: 1,
-      fg: theme.textDim,
-      wrapMode: "none",
-    });
-    dialog.content.add(emptyMsg);
-  } else {
-    const selectOptions = allThreads.map((t) => {
-      const icon = STATUS_ICONS[t.status];
-      return {
-        name: `${icon} #${t.id} line ${t.line}: ${previewText(t)}`,
-        description: `${t.status} - ${t.messages.length} message(s)`,
-        value: t.line,
-      };
-    });
-
-    const select = new SelectRenderable(renderer, {
-      width: "100%",
-      flexGrow: 1,
-      options: selectOptions,
-      selectedIndex: 0,
-      backgroundColor: theme.backgroundPanel,
-      textColor: theme.text,
-      focusedBackgroundColor: theme.backgroundPanel,
-      focusedTextColor: theme.text,
-      selectedBackgroundColor: theme.backgroundElement,
-      selectedTextColor: "#f5c2e7",
-      descriptionColor: theme.textDim,
-      selectedDescriptionColor: theme.textMuted,
-      showDescription: true,
-      wrapSelection: true,
-    });
-
-    dialog.content.add(select);
+  const emptyMsg = new TextRenderable(renderer, {
+    content: "No threads. Press [Esc] to close.",
+    width: "100%",
+    height: 1,
+    fg: theme.textDim,
+    wrapMode: "none",
+    visible: filtered.length === 0,
+  });
+  dialog.content.add(emptyMsg);
+
+  const select = new SelectRenderable(renderer, {
+    width: "100%",
+    flexGrow: 1,
+    options: threadsToOptions(filtered),
+    selectedIndex: 0,
+    backgroundColor: theme.backgroundPanel,
+    textColor: theme.text,
+    focusedBackgroundColor: theme.backgroundPanel,
+    focusedTextColor: theme.text,
+    selectedBackgroundColor: theme.backgroundElement,
+    selectedTextColor: "#f5c2e7",
+    descriptionColor: theme.textDim,
+    selectedDescriptionColor: theme.textMuted,
+    showDescription: true,
+    wrapSelection: true,
+    visible: filtered.length > 0,
+  });
+  dialog.content.add(select);
 
+  if (filtered.length > 0) {
     setTimeout(() => {
       renderer.focusRenderable(select);
       renderer.requestRender();
     }, 0);
+  }
+
+  function applyFilter(): void {
+    filtered = filterThreads(allThreads, currentFilter);
+    dialog.container.title = ` ${buildTitle(allThreads, currentFilter)} `;
+    select.options = threadsToOptions(filtered);
+    select.visible = filtered.length > 0;
+    emptyMsg.visible = filtered.length === 0;
+    if (filtered.length === 0) {
+      emptyMsg.content = `No ${currentFilter === "all" ? "" : currentFilter + " "}threads. Press [Ctrl+f] to change filter.`;
+    }
+    if (filtered.length > 0) {
+      setTimeout(() => {
+        renderer.focusRenderable(select);
+        renderer.requestRender();
+      }, 0);
+    }
+    renderer.requestRender();
+  }
 
-    // SelectRenderable ITEM_SELECTED event
-    select.on(SelectRenderableEvents.ITEM_SELECTED, () => {
+  // SelectRenderable ITEM_SELECTED event
+  select.on(SelectRenderableEvents.ITEM_SELECTED, () => {
+    const selected = select.getSelectedOption();
+    if (selected && selected.value != null) {
+      onSelect(selected.value as number);
+    }
+  });
+
+  // Manual key handler — SelectRenderable focus is unreliable
+  const keyHandler = (key: KeyEvent) => {
+    if (key.name === "q") {
+      key.preventDefault();
+      key.stopPropagation();
+      onCancel();
+      return;
+    }
+    // Ctrl+F: cycle filter
+    if (key.ctrl && key.name === "f") {
+      key.preventDefault();
+      key.stopPropagation();
+      filterIndex = (filterIndex + 1) % FILTER_CYCLE.length;
+      currentFilter = FILTER_CYCLE[filterIndex];
+      applyFilter();
+      return;
+    }
+    if (filtered.length === 0) return;
+    if (key.name === "return") {
+      key.preventDefault();
+      key.stopPropagation();
       const selected = select.getSelectedOption();
       if (selected && selected.value != null) {
         onSelect(selected.value as number);
       }
-    });
-
-    // Manual key handler — SelectRenderable focus is unreliable
-    keyHandler = (key: KeyEvent) => {
-      if (key.name === "q") {
-        key.preventDefault();
-        key.stopPropagation();
-        onCancel();
-        return;
-      }
-      if (key.name === "return" || key.name === "y") {
-        key.preventDefault();
-        key.stopPropagation();
-        const selected = select.getSelectedOption();
-        if (selected && selected.value != null) {
-          onSelect(selected.value as number);
-        }
-        return;
-      }
-      if (key.name === "j" || key.name === "down") {
-        key.preventDefault();
-        key.stopPropagation();
-        select.moveDown();
-        renderer.requestRender();
-        return;
-      }
-      if (key.name === "k" || key.name === "up") {
-        key.preventDefault();
-        key.stopPropagation();
-        select.moveUp();
-        renderer.requestRender();
-        return;
-      }
-    };
-    renderer.keyInput.on("keypress", keyHandler);
-  }
+      return;
+    }
+    if (key.name === "j" || key.name === "down") {
+      key.preventDefault();
+      key.stopPropagation();
+      select.moveDown();
+      renderer.requestRender();
+      return;
+    }
+    if (key.name === "k" || key.name === "up") {
+      key.preventDefault();
+      key.stopPropagation();
+      select.moveUp();
+      renderer.requestRender();
+      return;
+    }
+  };
+  renderer.keyInput.on("keypress", keyHandler);
 
   return {
     container: dialog.container,
     cleanup() {
       dialog.cleanup();
-      if (keyHandler) {
-        renderer.keyInput.off("keypress", keyHandler);
-      }
+      renderer.keyInput.off("keypress", keyHandler);
     },
   };
 }

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,8 @@ 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" },
 ];
 
@@ -51,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/theme.ts

@@ -29,9 +29,9 @@ export const theme = {
 
 export const STATUS_ICONS: Record<string, string> = {
   open: "\u258c",     // ▌ half block
-  pending: "\u25cb",  // ○ circle
-  resolved: "\u2713", // ✓ checkmark
-  outdated: "\u223c", // ∼ tilde
+  pending: "\u2588",  // █ full block
+  resolved: "=",
+  outdated: "-",
 };
 
 export const SPLIT_BORDER = {