revspec 0.5.0 → 0.7.0

package/src/tui/confirm.ts

@@ -5,6 +5,7 @@ import {
 } from "@opentui/core";
 import { theme } from "./ui/theme";
 import { createDialog } from "./ui/dialog";
+import { CONFIRM_HINTS } from "./ui/keymap";
 
 export interface ConfirmOptions {
   renderer: CliRenderer;
@@ -36,10 +37,7 @@ export function createConfirm(opts: ConfirmOptions): ConfirmOverlay {
     left: "25%",
     borderColor: theme.warning,
     onDismiss: onCancel,
-    hints: [
-      { key: "y", action: "yes" },
-      { key: "n/Esc", action: "no" },
-    ],
+    hints: CONFIRM_HINTS,
   });
 
   const msgText = new TextRenderable(renderer, {
@@ -52,13 +50,13 @@ export function createConfirm(opts: ConfirmOptions): ConfirmOverlay {
   dialog.content.add(msgText);
 
   const extraKeyHandler = (key: KeyEvent) => {
-    if (key.name === "y") {
+    if (key.name === "y" || key.name === "return") {
       key.preventDefault();
       key.stopPropagation();
       onConfirm();
       return;
     }
-    if (key.name === "n") {
+    if (key.name === "q") {
       key.preventDefault();
       key.stopPropagation();
       onCancel();

package/src/tui/help.ts

@@ -6,6 +6,7 @@ import {
 } from "@opentui/core";
 import { theme } from "./ui/theme";
 import { createDialog } from "./ui/dialog";
+import { HELP_HINTS } from "./ui/keymap";
 
 export interface HelpOverlay {
   container: import("@opentui/core").BoxRenderable;
@@ -50,15 +51,12 @@ export function createHelp(opts: {
     renderer,
     title: "Help",
     width: "60%",
-    height: Math.min(26, renderer.height - 2),
+    height: Math.min(34, renderer.height - 2),
     top: "10%",
     left: "20%",
     borderColor: theme.info,
     onDismiss: onClose,
-    hints: [
-      { key: "q/?/Esc", action: "close" },
-      { key: "j/k", action: "scroll" },
-    ],
+    hints: HELP_HINTS,
   });
 
   // Version header
@@ -71,41 +69,58 @@ export function createHelp(opts: {
     wrapMode: "none",
   }));
 
+  addHelpSection(dialog.content, renderer, "Quick Start", [
+    "  Navigate to a line and press c to comment.",
+    "  The AI replies in real-time via the thread popup.",
+    "  Press r to resolve, S to submit for rewrite.",
+    "  Press A to approve when done.",
+  ]);
+
+  addHelpSection(dialog.content, renderer, "Thread Popup", [
+    "  New thread: INSERT mode — type and Tab to send.",
+    "  Existing thread: NORMAL mode — read conversation,",
+    "  c to reply, r to resolve, q/Esc to close.",
+  ]);
+
   addHelpSection(dialog.content, renderer, "Navigation", [
     "  j/k       Down/up",
-    "  gg        Go to first line / scroll to top",
-    "  G         Go to last line / scroll to bottom",
+    "  gg/G      Top/bottom",
     "  Ctrl+d/u  Half page down/up",
-    "  /         Search",
-    "  n/N       Next/prev search match",
-    "  Esc       Clear search highlights",
+    "  zz        Center cursor line",
+    "  /         Search (smartcase)",
+    "  n/N       Next/prev match",
+    "  Esc       Clear search",
     "  ]t/[t     Next/prev thread",
-    "  ]r/[r     Next/prev unread thread",
+    "  ]r/[r     Next/prev unread",
   ]);
 
   addHelpSection(dialog.content, renderer, "Review", [
-    "  c         Comment / view thread / reply",
-    "  r         Resolve thread",
+    "  c         Comment / view thread",
+    "  r         Resolve thread (toggle)",
     "  R         Resolve all pending",
-    "  dd        Delete thread (with confirm)",
-    "  l         List threads",
-    "  a         Approve spec",
+    "  dd        Delete thread",
+    "  t         List threads",
+    "  S         Submit for rewrite",
+    "  A         Approve spec",
   ]);
 
   addHelpSection(dialog.content, renderer, "Commands", [
-    "  :w        Show save status",
-    "  :q        Quit (blocks if unsaved)",
-    "  :wq       Save and quit",
-    "  :q!       Quit without saving",
+    "  :q/:wq    Quit (warns if unresolved)",
+    "  :q!       Force quit",
+    "  :{N}      Jump to line N",
+    "  Ctrl+C    Force quit",
   ]);
 
   // Trailing blank line
   dialog.content.add(new TextRenderable(renderer, { content: "", width: "100%", height: 1, wrapMode: "none" }));
 
+  let pendingG: ReturnType<typeof setTimeout> | null = null;
+
   const extraKeyHandler = (key: KeyEvent) => {
     if (key.name === "q" || key.sequence === "?") {
       key.preventDefault();
       key.stopPropagation();
+      if (pendingG) { clearTimeout(pendingG); pendingG = null; }
       onClose();
       return;
     }
@@ -123,6 +138,47 @@ export function createHelp(opts: {
       renderer.requestRender();
       return;
     }
+    // G = goto bottom
+    if (key.name === "g" && key.shift) {
+      key.preventDefault();
+      key.stopPropagation();
+      if (pendingG) { clearTimeout(pendingG); pendingG = null; }
+      dialog.content.scrollTo(dialog.content.scrollHeight);
+      renderer.requestRender();
+      return;
+    }
+    // gg = goto top
+    if (key.name === "g" && !key.shift && !key.ctrl) {
+      key.preventDefault();
+      key.stopPropagation();
+      if (pendingG) {
+        clearTimeout(pendingG);
+        pendingG = null;
+        dialog.content.scrollTo(0);
+        renderer.requestRender();
+      } else {
+        pendingG = setTimeout(() => { pendingG = null; }, 300);
+      }
+      return;
+    }
+    // Ctrl+D = half page down
+    if (key.ctrl && key.name === "d") {
+      key.preventDefault();
+      key.stopPropagation();
+      const half = Math.max(1, Math.floor((renderer.height - 4) / 2));
+      dialog.content.scrollTo(Math.min(dialog.content.scrollTop + half, dialog.content.scrollHeight));
+      renderer.requestRender();
+      return;
+    }
+    // Ctrl+U = half page up
+    if (key.ctrl && key.name === "u") {
+      key.preventDefault();
+      key.stopPropagation();
+      const half = Math.max(1, Math.floor((renderer.height - 4) / 2));
+      dialog.content.scrollTo(Math.max(dialog.content.scrollTop - half, 0));
+      renderer.requestRender();
+      return;
+    }
   };
 
   renderer.keyInput.on("keypress", extraKeyHandler);
@@ -130,6 +186,7 @@ export function createHelp(opts: {
   return {
     container: dialog.container,
     cleanup() {
+      if (pendingG) clearTimeout(pendingG);
       dialog.cleanup();
       renderer.keyInput.off("keypress", extraKeyHandler);
     },

package/src/tui/pager.ts

@@ -35,7 +35,8 @@ export function buildPagerContent(state: ReviewState, searchQuery?: string | nul
     const prefix = isCursor ? ">" : " ";
     let specText = state.specLines[i];
     if (searchQuery) {
-      const regex = new RegExp(searchQuery.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "gi");
+      const csSensitive = searchQuery !== searchQuery.toLowerCase();
+      const regex = new RegExp(searchQuery.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), csSensitive ? "g" : "gi");
       specText = specText.replace(regex, (match) => `>>${match}<<`);
     }
     let indicator = " ";
@@ -173,7 +174,8 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
     } else if (searchQuery) {
       // When searching, show colored match segments (no markdown styling)
       const escaped = searchQuery.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-      const searchRegex = new RegExp(`(${escaped})`, "gi");
+      const caseSensitive = searchQuery !== searchQuery.toLowerCase();
+      const searchRegex = new RegExp(`(${escaped})`, caseSensitive ? "g" : "gi");
       const parts = specText.split(searchRegex);
       for (let p = 0; p < parts.length; p++) {
         const part = parts[p];

package/src/tui/search.ts

@@ -83,18 +83,23 @@ export function createSearch(opts: SearchOptions): SearchOverlay {
     if (key.name === "return") {
       key.preventDefault();
       key.stopPropagation();
-      const query = input.value.trim().toLowerCase();
-      if (query.length === 0) {
+      const raw = input.value.trim();
+      if (raw.length === 0) {
         onCancel();
         return;
       }
 
+      // Smartcase: if query has any uppercase, case-sensitive; otherwise case-insensitive
+      const caseSensitive = raw !== raw.toLowerCase();
+      const query = caseSensitive ? raw : raw.toLowerCase();
+
       // Search forward from cursor, wrapping around
       const total = specLines.length;
       for (let offset = 1; offset <= total; offset++) {
         const i = (cursorLine - 1 + offset) % total;
-        if (specLines[i].toLowerCase().includes(query)) {
-          onResult(i + 1, query); // 1-based line number + query
+        const line = caseSensitive ? specLines[i] : specLines[i].toLowerCase();
+        if (line.includes(query)) {
+          onResult(i + 1, raw); // 1-based line number + original query (preserves case for n/N)
           return;
         }
       }

package/src/tui/spinner.ts

@@ -0,0 +1,81 @@
+import {
+  BoxRenderable,
+  TextRenderable,
+  type CliRenderer,
+  type KeyEvent,
+} from "@opentui/core";
+import { theme } from "./ui/theme";
+
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+export interface SpinnerOverlay {
+  container: BoxRenderable;
+  cleanup: () => void;
+}
+
+export function createSpinner(opts: {
+  renderer: CliRenderer;
+  message: string;
+  timeoutMs?: number;
+  onCancel: () => void;
+  onTimeout: () => void;
+}): SpinnerOverlay {
+  const { renderer, message, onCancel, onTimeout, timeoutMs = 120_000 } = opts;
+
+  const container = new BoxRenderable(renderer, {
+    position: "absolute",
+    top: "40%",
+    left: "25%",
+    width: "50%",
+    height: 5,
+    zIndex: 100,
+    backgroundColor: theme.backgroundPanel,
+    border: true,
+    borderStyle: "single",
+    borderColor: theme.blue,
+    title: " Submitting ",
+    flexDirection: "column",
+    paddingLeft: 2,
+    paddingRight: 2,
+    paddingTop: 1,
+    alignItems: "center",
+  });
+
+  const text = new TextRenderable(renderer, {
+    content: `${SPINNER_FRAMES[0]} ${message}`,
+    width: "100%",
+    height: 1,
+    fg: theme.text,
+    wrapMode: "none",
+  });
+  container.add(text);
+
+  let frame = 0;
+  const spinInterval = setInterval(() => {
+    frame = (frame + 1) % SPINNER_FRAMES.length;
+    text.content = `${SPINNER_FRAMES[frame]} ${message}`;
+    renderer.requestRender();
+  }, 80);
+
+  const timeout = setTimeout(() => {
+    onTimeout();
+  }, timeoutMs);
+
+  const keyHandler = (key: KeyEvent) => {
+    if (key.ctrl && key.name === "c") {
+      key.preventDefault();
+      key.stopPropagation();
+      onCancel();
+    }
+  };
+  renderer.keyInput.on("keypress", keyHandler);
+
+  return {
+    container,
+    cleanup() {
+      clearInterval(spinInterval);
+      clearTimeout(timeout);
+      renderer.keyInput.off("keypress", keyHandler);
+    },
+  };
+}

package/src/tui/status-bar.ts

@@ -2,7 +2,8 @@ import { BoxRenderable, TextRenderable, TextNodeRenderable, TextAttributes, type
 import type { ReviewState } from "../state/review-state";
 import { basename } from "path";
 import { theme } from "./ui/theme";
-import { buildHints, type Hint } from "./ui/hint-bar";
+import { buildHints } from "./ui/hint-bar";
+import { PAGER_HINTS } from "./ui/keymap";
 
 export interface TopBarComponents {
   box: BoxRenderable;
@@ -83,16 +84,16 @@ export function buildBottomBar(bar: BottomBarComponents, commandBuffer: string |
     t.add(TextNodeRenderable.fromString(` :${commandBuffer}`, { fg: theme.text }));
     return;
   }
-  const hints: Hint[] = [
-    { key: "j/k", action: "move" },
-    { key: "c", action: "comment" },
+  const hints = [
+    PAGER_HINTS.navigate,
+    PAGER_HINTS.comment,
   ];
   if (hasThread) {
-    hints.push({ key: "r", action: "resolve" });
-    hints.push({ key: "dd", action: "delete thread" });
+    hints.push(PAGER_HINTS.resolve);
   }
-  hints.push({ key: "/", action: "search" });
-  hints.push({ key: "?", action: "help" });
+  hints.push(PAGER_HINTS.submit);
+  hints.push(PAGER_HINTS.approve);
+  hints.push(PAGER_HINTS.help);
   buildHints(t, hints);
 }
 

package/src/tui/thread-list.ts

@@ -3,10 +3,12 @@ import {
   SelectRenderable,
   SelectRenderableEvents,
   type CliRenderer,
+  type KeyEvent,
 } from "@opentui/core";
 import type { Thread } from "../protocol/types";
 import { theme, STATUS_ICONS } from "./ui/theme";
 import { createDialog } from "./ui/dialog";
+import { THREAD_LIST_HINTS } from "./ui/keymap";
 
 export interface ThreadListOptions {
   renderer: CliRenderer;
@@ -24,46 +26,44 @@ const MAX_PREVIEW_LENGTH = 50;
 
 function previewText(thread: Thread): string {
   if (thread.messages.length === 0) return "(empty)";
-  const last = thread.messages[0];
-  const text = last.text.replace(/\n/g, " ");
+  const first = thread.messages[0];
+  const text = first.text.replace(/\n/g, " ");
   if (text.length <= MAX_PREVIEW_LENGTH) return text;
   return text.slice(0, MAX_PREVIEW_LENGTH - 1) + "\u2026";
 }
 
 /**
- * Create a thread list overlay showing open/pending threads.
+ * Create a thread list overlay showing all threads.
  * Select + Enter: jump to that thread's line.
  * Escape: cancel.
  */
 export function createThreadList(opts: ThreadListOptions): ThreadListOverlay {
   const { renderer, threads, onSelect, onCancel } = opts;
 
-  // Filter to active threads (open/pending)
-  const activeThreads = threads.filter(
-    (t) => t.status === "open" || t.status === "pending"
+  const allThreads = threads.filter(
+    (t) => t.status === "open" || t.status === "pending" || t.status === "resolved"
   );
-
-  const count = activeThreads.length;
+  const activeCount = threads.filter(
+    (t) => t.status === "open" || t.status === "pending"
+  ).length;
 
   const dialog = createDialog({
     renderer,
-    title: `Threads (${count} active)`,
+    title: `Threads (${activeCount} active, ${allThreads.length} total)`,
     width: "70%",
     height: "60%",
     top: "15%",
     left: "15%",
     borderColor: theme.mauve,
     onDismiss: onCancel,
-    hints: [
-      { key: "j/k", action: "navigate" },
-      { key: "Enter", action: "jump" },
-      { key: "Esc", action: "close" },
-    ],
+    hints: THREAD_LIST_HINTS,
   });
 
-  if (activeThreads.length === 0) {
+  let keyHandler: ((key: KeyEvent) => void) | null = null;
+
+  if (allThreads.length === 0) {
     const emptyMsg = new TextRenderable(renderer, {
-      content: "No active threads. Press [Esc] to close.",
+      content: "No threads. Press [Esc] to close.",
       width: "100%",
       height: 1,
       fg: theme.textDim,
@@ -71,8 +71,7 @@ export function createThreadList(opts: ThreadListOptions): ThreadListOverlay {
     });
     dialog.content.add(emptyMsg);
   } else {
-    // Build select options from threads
-    const selectOptions = activeThreads.map((t) => {
+    const selectOptions = allThreads.map((t) => {
       const icon = STATUS_ICONS[t.status];
       return {
         name: `${icon} #${t.id} line ${t.line}: ${previewText(t)}`,
@@ -100,20 +99,61 @@ export function createThreadList(opts: ThreadListOptions): ThreadListOverlay {
 
     dialog.content.add(select);
 
-    // Focus the select so it handles j/k navigation
-    renderer.focusRenderable(select);
+    setTimeout(() => {
+      renderer.focusRenderable(select);
+      renderer.requestRender();
+    }, 0);
 
-    // Listen for item selection (Enter key)
+    // 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
+    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 {
     container: dialog.container,
-    cleanup: dialog.cleanup,
+    cleanup() {
+      dialog.cleanup();
+      if (keyHandler) {
+        renderer.keyInput.off("keypress", keyHandler);
+      }
+    },
   };
 }

package/src/tui/ui/keymap.ts

@@ -0,0 +1,55 @@
+import type { Hint } from "./hint-bar";
+
+/**
+ * Central keymap definitions.
+ * All keybinding display labels live here — components import hints from this file.
+ * To remap a key, change it here and in the bindings array in app.ts.
+ */
+
+// --- Main pager ---
+
+export const PAGER_HINTS = {
+  navigate: { key: "j/k", action: "navigate" } as Hint,
+  comment: { key: "c", action: "comment" } as Hint,
+  resolve: { key: "r", action: "resolve" } as Hint,
+  submit: { key: "S", action: "submit" } as Hint,
+  approve: { key: "A", action: "approve" } as Hint,
+  help: { key: "?", action: "help" } as Hint,
+};
+
+// --- Thread popup ---
+
+export const THREAD_NORMAL_HINTS: Hint[] = [
+  { key: "NORMAL", action: "" },
+  { key: "c", action: "reply" },
+  { key: "r", action: "resolve" },
+  { key: "q/Esc", action: "close" },
+];
+
+export const THREAD_INSERT_HINTS: Hint[] = [
+  { key: "INSERT", action: "" },
+  { key: "Tab", action: "send" },
+  { key: "Esc", action: "normal" },
+];
+
+// --- Thread list ---
+
+export const THREAD_LIST_HINTS: Hint[] = [
+  { key: "j/k", action: "navigate" },
+  { key: "y/Enter", action: "jump" },
+  { key: "q/Esc", action: "close" },
+];
+
+// --- Help overlay ---
+
+export const HELP_HINTS: Hint[] = [
+  { key: "j/k", action: "navigate" },
+  { key: "q/?/Esc", action: "close" },
+];
+
+// --- Confirm dialog ---
+
+export const CONFIRM_HINTS: Hint[] = [
+  { key: "y/Enter", action: "yes" },
+  { key: "q/Esc", action: "no" },
+];

package/.github/workflows/ci.yml

@@ -1,18 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-      - run: bun install
-      - run: bun test

package/CLAUDE.md

@@ -1,27 +0,0 @@
-# Revspec
-
-- Tech: Bun + TypeScript + @opentui/core
-- npm: `revspec` | GitHub: icyrainz/revspec
-- Run: `bun run bin/revspec.ts <file.md>`
-- Test: `bun test`
-- Release: `./scripts/release.sh` (version is set manually in package.json)
-- Dev: `bun link` to symlink local build to global `revspec` command
-
-## OpenTUI Gotchas
-- Don't use StyledText at all — BigInt FFI crash happens even on small content
-- Don't use ANSI escape codes in TextRenderable content (renders as literal text)
-- MarkdownRenderable needs `syntaxStyle` + `conceal: true` for proper rendering
-- Use `visible: false` to hide renderables, not removal/re-addition
-- ScrollBox: don't use `stickyScroll` with manual scrolling (fights scroll position)
-- ScrollBox: `scrollBy` overshoots silently on large deltas — use `scrollTo` with clamped position
-- Textarea consumes Ctrl+D/U (emacs bindings) — blur textarea in normal mode for vim-style scroll
-
-## Conventions
-- Line mode is default, markdown mode via `m` toggle
-- Tab to submit in all text inputs (works through tmux)
-- Destructive actions need confirmation (dd double-tap, approve confirm dialog)
-- All review actions auto-switch to line mode
-- Thread popup uses vim-style normal/insert modes (blur textarea in normal)
-- Hint bars use `[key] action` bracket format consistently
-- No inline comment previews in pager — gutter indicators only (▌/█/✓)
-- Live integration: JSONL for communication, `revspec watch`/`reply` CLI subcommands