revspec 0.4.0 → 0.5.0

package/README.md

@@ -29,6 +29,19 @@ revspec spec.md
 
 Opens a TUI in line mode with vim-style navigation. Press `c` on any line to open a thread and start commenting.
 
+### Markdown rendering
+
+Revspec renders markdown in-place (toggle with `m`):
+
+- **Headings** — colored and bold, `#`–`######`
+- **Inline** — bold (`**`/`__`), italic (`*`/`_`), bold-italic (`***`), strikethrough (`~~`), `code`, [links](url)
+- **Fenced code blocks** — fence markers dimmed, body in green
+- **Tables** — box-drawing borders, header row bolded, auto-column-widths
+- **Lists** — unordered (`•`), ordered, task lists (`☐`/`☑`)
+- **Blockquotes** — bar gutter, italicized text
+- **Cursor line** highlighting across all elements
+- **Search highlights** — colored match segments
+
 ### Keybindings
 
 | Key | Action |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revspec",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "module",
   "bin": {
     "revspec": "./bin/revspec.ts"

package/src/state/review-state.ts

@@ -136,6 +136,11 @@ export class ReviewState {
     }
   }
 
+  deleteThread(threadId: string): void {
+    this.threads = this.threads.filter((t) => t.id !== threadId);
+    this._unreadThreadIds.delete(threadId);
+  }
+
   addOwnerReply(threadId: string, text: string, ts?: number): void {
     const thread = this.threads.find((t) => t.id === threadId);
     if (!thread) return;

package/src/tui/app.ts

@@ -17,6 +17,7 @@ import { buildPagerNodes, createPager, countExtraVisualLines, type PagerComponen
 import {
   buildTopBar,
   buildBottomBar,
+  setBottomBarMessage,
   createTopBar,
   createBottomBar,
   type TopBarComponents,
@@ -129,7 +130,8 @@ export async function runTui(
 
     buildPagerNodes(pager.lineNode, state, searchQuery, state.unreadThreadIds);
     buildTopBar(topBar, specFile, state, state.unreadCount(), specMtimeChanged);
-    buildBottomBar(bottomBar, commandBuffer);
+    const hasThread = !!state.threadAtLine(state.cursorLine);
+    buildBottomBar(bottomBar, commandBuffer, hasThread);
     renderer.requestRender();
   }
 
@@ -221,12 +223,12 @@ export async function runTui(
     if (cmd === "w") {
       // Merge JSONL -> JSON, stay open
       doMerge();
-      bottomBar.text.content = " \u2714 Merged to review JSON";
+      setBottomBarMessage(bottomBar, " \u2714 Merged to review JSON");
       renderer.requestRender();
       setTimeout(() => { refreshPager(); }, 1200);
       return "stay";
     }
-    if (cmd === "wq") {
+    if (cmd === "wq" || cmd === "qw") {
       // Merge and exit
       mergeAndExit(resolve);
       return "merged";
@@ -234,7 +236,7 @@ export async function runTui(
     if (cmd === "q") {
       // Exit only if merged (no pending changes)
       if (hasPendingChanges()) {
-        bottomBar.text.content = " Unmerged changes. Use :w to save or :q! to discard";
+        setBottomBarMessage(bottomBar, " Unmerged changes. Use :w to save or :q! to discard");
         renderer.requestRender();
         setTimeout(() => { refreshPager(); }, 2000);
         return "stay";
@@ -480,7 +482,7 @@ export async function runTui(
       if (!action) {
         const p = keybinds.pending();
         if (p) {
-          bottomBar.text.content = ` ${p}`;
+          setBottomBarMessage(bottomBar, ` ${p}`);
           renderer.requestRender();
         }
         return;
@@ -533,7 +535,7 @@ export async function runTui(
               ensureCursorVisible();
             }
           } else {
-            bottomBar.text.content = " No active search \u2014 use / to search";
+            setBottomBarMessage(bottomBar, " No active search \u2014 use / to search");
             renderer.requestRender();
             setTimeout(() => { refreshPager(); }, 1500);
           }
@@ -547,7 +549,7 @@ export async function runTui(
               ensureCursorVisible();
             }
           } else {
-            bottomBar.text.content = " No active search \u2014 use / to search";
+            setBottomBarMessage(bottomBar, " No active search \u2014 use / to search");
             renderer.requestRender();
             setTimeout(() => { refreshPager(); }, 1500);
           }
@@ -570,7 +572,7 @@ export async function runTui(
             const msg = wasResolved
               ? ` \u21a9 Reopened thread #${thread.id}`
               : ` \u2714 Resolved thread #${thread.id}`;
-            bottomBar.text.content = msg;
+            setBottomBarMessage(bottomBar, msg);
             renderer.requestRender();
             setTimeout(() => { refreshPager(); }, 1500);
           }
@@ -584,7 +586,7 @@ export async function runTui(
             appendEvent(jsonlPath, { type: "resolve", threadId: t.id, author: "reviewer", ts: Date.now() });
           }
           refreshPager();
-          bottomBar.text.content = ` \u2714 Resolved ${pending} pending thread(s)`;
+          setBottomBarMessage(bottomBar, ` \u2714 Resolved ${pending} pending thread(s)`);
           renderer.requestRender();
           setTimeout(() => { refreshPager(); }, 1500);
           break;
@@ -592,26 +594,31 @@ export async function runTui(
         case "delete-draft": {
           const thread = state.threadAtLine(state.cursorLine);
           if (!thread) break;
-          const hadReviewerMsg = thread.messages.some((m) => m.author === "reviewer");
-          if (hadReviewerMsg) {
-            state.deleteLastDraftMessage(thread.id);
-            appendEvent(jsonlPath, { type: "delete", threadId: thread.id, author: "reviewer", ts: Date.now() });
-            refreshPager();
-            bottomBar.text.content = " \u2714 Deleted draft comment";
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
-          } else {
-            bottomBar.text.content = " No reviewer message to delete";
-            renderer.requestRender();
-            setTimeout(() => { refreshPager(); }, 1500);
-          }
+          const deleteOverlay = createConfirm({
+            renderer,
+            title: "Delete Thread",
+            message: `Delete thread #${thread.id} on line ${thread.line}?`,
+            onConfirm: () => {
+              dismissOverlay();
+              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);
+            },
+            onCancel: () => {
+              dismissOverlay();
+            },
+          });
+          showOverlay(deleteOverlay);
           break;
         }
         case "approve":
           if (state.canApprove()) {
             const confirmOverlay = createConfirm({
               renderer,
-              message: "Approve spec and proceed to implementation? [y/n]",
+              message: "Approve spec and proceed to implementation?",
               onConfirm: () => {
                 dismissOverlay();
                 appendEvent(jsonlPath, { type: "approve", author: "reviewer", ts: Date.now() });
@@ -628,7 +635,7 @@ export async function runTui(
             const msg = total === 0
               ? "No threads to approve"
               : `${total} thread${total !== 1 ? "s" : ""} still open/pending`;
-            bottomBar.text.content = ` \u26a0  ${msg}`;
+            setBottomBarMessage(bottomBar, ` \u26a0  ${msg}`);
             renderer.requestRender();
             setTimeout(() => { refreshPager(); }, 2000);
           }
@@ -638,8 +645,8 @@ export async function runTui(
           if (next !== null) {
             state.cursorLine = next;
             ensureCursorVisible();
-            refreshPager();
           }
+          refreshPager();
           break;
         }
         case "prev-thread": {
@@ -647,8 +654,8 @@ export async function runTui(
           if (prev !== null) {
             state.cursorLine = prev;
             ensureCursorVisible();
-            refreshPager();
           }
+          refreshPager();
           break;
         }
         case "next-unread": {
@@ -656,8 +663,8 @@ export async function runTui(
           if (nextLine !== null) {
             state.cursorLine = nextLine;
             ensureCursorVisible();
-            refreshPager();
           }
+          refreshPager();
           break;
         }
         case "prev-unread": {
@@ -665,8 +672,8 @@ export async function runTui(
           if (prevLine !== null) {
             state.cursorLine = prevLine;
             ensureCursorVisible();
-            refreshPager();
           }
+          refreshPager();
           break;
         }
         case "help":

package/src/tui/comment-input.ts

@@ -173,6 +173,7 @@ function createThreadView(
     hints: insertHints,
   });
 
+
   // --- Scrollable conversation history ---
   const scrollBox = dialog.content;
 

package/src/tui/help.ts

@@ -2,6 +2,7 @@ import {
   TextRenderable,
   type CliRenderer,
   type KeyEvent,
+  type ScrollBoxRenderable,
 } from "@opentui/core";
 import { theme } from "./ui/theme";
 import { createDialog } from "./ui/dialog";
@@ -11,6 +12,29 @@ export interface HelpOverlay {
   cleanup: () => void;
 }
 
+function addHelpSection(container: ScrollBoxRenderable, renderer: CliRenderer, title: string, lines: string[]): void {
+  // Blank line before section
+  container.add(new TextRenderable(renderer, { content: "", width: "100%", height: 1, wrapMode: "none" }));
+  // Section header in blue
+  container.add(new TextRenderable(renderer, {
+    content: `  ${title}`,
+    width: "100%",
+    height: 1,
+    fg: theme.blue,
+    wrapMode: "none",
+  }));
+  // Content lines
+  for (const line of lines) {
+    container.add(new TextRenderable(renderer, {
+      content: line,
+      width: "100%",
+      height: 1,
+      fg: theme.text,
+      wrapMode: "none",
+    }));
+  }
+}
+
 /**
  * Create a help overlay popup showing all keybindings.
  * Dismissable with `?`, `q`, or `Esc`.
@@ -22,37 +46,6 @@ export function createHelp(opts: {
 }): HelpOverlay {
   const { renderer, version, onClose } = opts;
 
-  const helpText = [
-    "",
-    `  revspec v${version}`,
-    "",
-    "  Navigation",
-    "  j/k       Down/up",
-    "  gg        Go to first line / scroll to top",
-    "  G         Go to last line / scroll to bottom",
-    "  Ctrl+d/u  Half page down/up",
-    "  /         Search",
-    "  n/N       Next/prev search match",
-    "  Esc       Clear search highlights",
-    "  ]t/[t     Next/prev thread",
-    "  ]r/[r     Next/prev unread thread",
-    "",
-    "  Review",
-    "  c         Comment / view thread / reply",
-    "  r         Resolve thread",
-    "  R         Resolve all pending",
-    "  dd        Delete draft comment (double-tap)",
-    "  l         List threads",
-    "  a         Approve spec",
-    "",
-    "  Commands",
-    "  :w        Show save status",
-    "  :q        Save and quit",
-    "  :wq       Save and quit",
-    "  :q!       Quit without saving",
-    "",
-  ].join("\n");
-
   const dialog = createDialog({
     renderer,
     title: "Help",
@@ -68,14 +61,46 @@ export function createHelp(opts: {
     ],
   });
 
-  const content = new TextRenderable(renderer, {
-    content: helpText,
+  // Version header
+  dialog.content.add(new TextRenderable(renderer, { content: "", width: "100%", height: 1, wrapMode: "none" }));
+  dialog.content.add(new TextRenderable(renderer, {
+    content: `  revspec v${version}`,
     width: "100%",
-    fg: theme.text,
+    height: 1,
+    fg: theme.textMuted,
     wrapMode: "none",
-  });
+  }));
+
+  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",
+    "  Ctrl+d/u  Half page down/up",
+    "  /         Search",
+    "  n/N       Next/prev search match",
+    "  Esc       Clear search highlights",
+    "  ]t/[t     Next/prev thread",
+    "  ]r/[r     Next/prev unread thread",
+  ]);
+
+  addHelpSection(dialog.content, renderer, "Review", [
+    "  c         Comment / view thread / reply",
+    "  r         Resolve thread",
+    "  R         Resolve all pending",
+    "  dd        Delete thread (with confirm)",
+    "  l         List threads",
+    "  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",
+  ]);
 
-  dialog.content.add(content);
+  // Trailing blank line
+  dialog.content.add(new TextRenderable(renderer, { content: "", width: "100%", height: 1, wrapMode: "none" }));
 
   const extraKeyHandler = (key: KeyEvent) => {
     if (key.name === "q" || key.sequence === "?") {

package/src/tui/pager.ts

@@ -12,12 +12,6 @@ import { parseMarkdownLine, addSegments, collectTable, renderTableBorder, render
 
 const MAX_HINT_LENGTH = 40;
 
-function padLineNum(n: number): string {
-  const s = String(n);
-  if (s.length >= 4) return s;
-  return " ".repeat(4 - s.length) + s;
-}
-
 function threadHint(thread: Thread): string {
   if (thread.messages.length === 0) return "";
   const last = thread.messages[thread.messages.length - 1];
@@ -32,6 +26,7 @@ function threadHint(thread: Thread): string {
  * Build plain text line-mode content (for testing / plain fallback).
  */
 export function buildPagerContent(state: ReviewState, searchQuery?: string | null, unreadThreadIds?: ReadonlySet<string>): string {
+  const numWidth = Math.max(String(state.lineCount).length, 3);
   const lines: string[] = [];
   for (let i = 0; i < state.specLines.length; i++) {
     const lineNum = i + 1;
@@ -54,7 +49,9 @@ export function buildPagerContent(state: ReviewState, searchQuery?: string | nul
         indicator = "\u258c";
       }
     }
-    lines.push(`${prefix}${indicator}${padLineNum(lineNum)}  ${specText}`);
+    const numStr = String(lineNum);
+    const padded = " ".repeat(numWidth - numStr.length) + numStr;
+    lines.push(`${prefix}${indicator}${padded}  ${specText}`);
   }
   return lines.join("\n");
 }
@@ -69,6 +66,11 @@ export function buildPagerContent(state: ReviewState, searchQuery?: string | nul
 export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, searchQuery?: string | null, unreadThreadIds?: ReadonlySet<string>): void {
   lineNode.clear();
 
+  // Calculate dynamic gutter width based on total line count
+  const numWidth = Math.max(String(state.lineCount).length, 3);
+  // Blank gutter for table borders: prefix(1) + indicator(1) + numWidth + spaces(2)
+  const gutterBlank = " ".repeat(2 + numWidth + 2);
+
   // Pre-scan for table blocks so we can calculate column widths
   const tableBlocks = new Map<number, TableBlock>();
   for (let i = 0; i < state.specLines.length; i++) {
@@ -81,6 +83,9 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
     }
   }
 
+  // Track fenced code block state
+  let inCodeBlock = false;
+
   for (let i = 0; i < state.specLines.length; i++) {
     const lineNum = i + 1;
     const thread = state.threadAtLine(lineNum);
@@ -113,7 +118,7 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
 
     // Top border before first table row (on its own visual line with blank gutter)
     if (isTable && relIdx === 0) {
-      lineNode.add(TextNodeRenderable.fromString("        ", { fg: theme.textDim }));
+      lineNode.add(TextNodeRenderable.fromString(gutterBlank, { fg: theme.textDim }));
       renderTableBorder(lineNode, tableBlock.colWidths, "top");
       lineNode.add(TextNodeRenderable.fromString("\n", {}));
     }
@@ -127,13 +132,28 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
       indicator,
       { fg: indicatorColor, bg: isCursor ? theme.backgroundElement : undefined }
     ));
+    const numStr = String(lineNum);
+    const paddedNum = " ".repeat(numWidth - numStr.length) + numStr;
     lineNode.add(TextNodeRenderable.fromString(
-      `${padLineNum(lineNum)}  `,
+      `${paddedNum}  `,
       { fg: theme.textDim, attributes: TextAttributes.DIM, bg: isCursor ? theme.backgroundElement : undefined }
     ));
 
-    // Spec text — table or regular markdown
-    if (isTable) {
+    // Spec text — fenced code block, table, or regular markdown
+    if (specText.trimStart().startsWith("```")) {
+      inCodeBlock = !inCodeBlock;
+      // Render the fence line itself as dim
+      lineNode.add(TextNodeRenderable.fromString(specText, {
+        fg: theme.textDim,
+        bg: isCursor ? theme.backgroundElement : undefined,
+      }));
+    } else if (inCodeBlock) {
+      // Inside code block — render as green, no markdown parsing
+      lineNode.add(TextNodeRenderable.fromString(specText, {
+        fg: theme.green,
+        bg: isCursor ? theme.backgroundElement : undefined,
+      }));
+    } else if (isTable) {
       if (relIdx === tableBlock.separatorIndex) {
         // Separator row → box-drawing line
         renderTableSeparator(lineNode, tableBlock.colWidths);
@@ -147,7 +167,7 @@ export function buildPagerNodes(lineNode: TextRenderable, state: ReviewState, se
       // Bottom border after last row (on its own visual line with blank gutter)
       if (relIdx === tableBlock.lines.length - 1) {
         lineNode.add(TextNodeRenderable.fromString("\n", {}));
-        lineNode.add(TextNodeRenderable.fromString("        ", { fg: theme.textDim }));
+        lineNode.add(TextNodeRenderable.fromString(gutterBlank, { fg: theme.textDim }));
         renderTableBorder(lineNode, tableBlock.colWidths, "bottom");
       }
     } else if (searchQuery) {

package/src/tui/status-bar.ts

@@ -2,7 +2,7 @@ import { BoxRenderable, TextRenderable, TextNodeRenderable, TextAttributes, type
 import type { ReviewState } from "../state/review-state";
 import { basename } from "path";
 import { theme } from "./ui/theme";
-import { buildHints } from "./ui/hint-bar";
+import { buildHints, type Hint } from "./ui/hint-bar";
 
 export interface TopBarComponents {
   box: BoxRenderable;
@@ -64,23 +64,35 @@ export function buildTopBar(
   t.add(TextNodeRenderable.fromString(`L${state.cursorLine}/${state.lineCount}`, { fg: theme.textMuted }));
 }
 
+/**
+ * Set a transient message on the bottom bar (using TextNodes, not .content).
+ */
+export function setBottomBarMessage(bar: BottomBarComponents, message: string, fg?: string): void {
+  const t = bar.text;
+  t.clear();
+  t.add(TextNodeRenderable.fromString(message, { fg: fg ?? theme.text }));
+}
+
 /**
  * Build the bottom bar with styled TextNodes.
  */
-export function buildBottomBar(bar: BottomBarComponents, commandBuffer: string | null): void {
+export function buildBottomBar(bar: BottomBarComponents, commandBuffer: string | null, hasThread?: boolean): void {
   const t = bar.text;
   t.clear();
   if (commandBuffer !== null) {
     t.add(TextNodeRenderable.fromString(` :${commandBuffer}`, { fg: theme.text }));
     return;
   }
-  const hints = [
+  const hints: Hint[] = [
     { key: "j/k", action: "move" },
     { key: "c", action: "comment" },
-    { key: "r", action: "resolve" },
-    { key: "/", action: "search" },
-    { key: "?", action: "help" },
   ];
+  if (hasThread) {
+    hints.push({ key: "r", action: "resolve" });
+    hints.push({ key: "dd", action: "delete thread" });
+  }
+  hints.push({ key: "/", action: "search" });
+  hints.push({ key: "?", action: "help" });
   buildHints(t, hints);
 }
 

package/src/tui/thread-list.ts

@@ -24,7 +24,7 @@ const MAX_PREVIEW_LENGTH = 50;
 
 function previewText(thread: Thread): string {
   if (thread.messages.length === 0) return "(empty)";
-  const last = thread.messages[thread.messages.length - 1];
+  const last = thread.messages[0];
   const text = last.text.replace(/\n/g, " ");
   if (text.length <= MAX_PREVIEW_LENGTH) return text;
   return text.slice(0, MAX_PREVIEW_LENGTH - 1) + "\u2026";

package/src/tui/ui/keybinds.ts

@@ -53,6 +53,7 @@ export function createKeybindRegistry(bindings: KeyBinding[], timeout = 500): Ke
 
   function match(key: KeyEvent): string | null {
     const keyStr = keyToString(key);
+    let skipSequenceCheck = false;
 
     if (sequence) {
       const seq = sequence.first + keyStr;
@@ -61,6 +62,7 @@ export function createKeybindRegistry(bindings: KeyBinding[], timeout = 500): Ke
 
       const action = sequenceBindings.get(seq);
       if (action) return action;
+      skipSequenceCheck = true; // Don't start a new sequence with the failed second key
     }
 
     // Check ctrl variants first
@@ -69,8 +71,8 @@ export function createKeybindRegistry(bindings: KeyBinding[], timeout = 500): Ke
       if (action) return action;
     }
 
-    // Check if this starts a sequence (but not if ctrl is held)
-    if (!key.ctrl && sequenceStarters.has(keyStr)) {
+    // Check if this starts a sequence (but not if ctrl is held, and not if from failed sequence)
+    if (!key.ctrl && !skipSequenceCheck && sequenceStarters.has(keyStr)) {
       sequence = {
         first: keyStr,
         timer: setTimeout(() => { sequence = null; }, timeout),

package/src/tui/ui/markdown.ts

@@ -14,13 +14,22 @@ export interface StyledSegment {
 }
 
 /**
- * Parse inline markdown (bold, italic, code) into styled segments.
+ * Parse inline markdown (bold italic, bold, italic, code, links, strikethrough) into styled segments.
  * Strips syntax markers and returns display text with style info.
+ * Order matters: longer patterns first (***bold italic*** before **bold** before *italic*).
  */
 export function parseInlineMarkdown(text: string): StyledSegment[] {
   const segments: StyledSegment[] = [];
-  // Order matters: **bold** before *italic*
-  const regex = /(\*\*(.+?)\*\*|\*(.+?)\*|`([^`]+)`)/g;
+  // Groups:
+  //   2: ***bold italic***
+  //   3: **bold**
+  //   4: *italic*
+  //   5: __bold__
+  //   6: _italic_
+  //   7: ~~strikethrough~~
+  //   8: [link text](url) — display text only
+  //   9: `code`
+  const regex = /(\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(.+?)\*|__(.+?)__|_(.+?)_|~~(.+?)~~|\[([^\]]+)\]\([^)]+\)|`([^`]+)`)/g;
   let pos = 0;
   let match;
   while ((match = regex.exec(text)) !== null) {
@@ -28,14 +37,29 @@ export function parseInlineMarkdown(text: string): StyledSegment[] {
       segments.push({ text: text.slice(pos, match.index) });
     }
     if (match[2] !== undefined) {
-      // **bold**
-      segments.push({ text: match[2], attributes: TextAttributes.BOLD });
+      // ***bold italic***
+      segments.push({ text: match[2], attributes: TextAttributes.BOLD | TextAttributes.ITALIC });
     } else if (match[3] !== undefined) {
-      // *italic*
-      segments.push({ text: match[3], attributes: TextAttributes.ITALIC });
+      // **bold**
+      segments.push({ text: match[3], attributes: TextAttributes.BOLD });
     } else if (match[4] !== undefined) {
+      // *italic*
+      segments.push({ text: match[4], attributes: TextAttributes.ITALIC });
+    } else if (match[5] !== undefined) {
+      // __bold__
+      segments.push({ text: match[5], attributes: TextAttributes.BOLD });
+    } else if (match[6] !== undefined) {
+      // _italic_
+      segments.push({ text: match[6], attributes: TextAttributes.ITALIC });
+    } else if (match[7] !== undefined) {
+      // ~~strikethrough~~ — use actual terminal strikethrough + dim
+      segments.push({ text: match[7], fg: theme.textDim, attributes: TextAttributes.STRIKETHROUGH });
+    } else if (match[8] !== undefined) {
+      // [link text](url) — show text in blue + underline
+      segments.push({ text: match[8], fg: theme.blue, attributes: TextAttributes.UNDERLINE });
+    } else if (match[9] !== undefined) {
       // `code`
-      segments.push({ text: match[4], fg: theme.green });
+      segments.push({ text: match[9], fg: theme.mauve });
     }
     pos = match.index + match[0].length;
   }
@@ -86,6 +110,18 @@ export function parseMarkdownLine(line: string): StyledSegment[] {
     ];
   }
 
+  // Task list: - [ ] or - [x]
+  const taskMatch = line.match(/^(\s*)[-*+]\s+\[([ xX])\]\s+(.*)/);
+  if (taskMatch) {
+    const checked = taskMatch[2].toLowerCase() === "x";
+    const checkbox = checked ? "\u2611 " : "\u2610 "; // ☑ or ☐
+    const color = checked ? theme.green : theme.textDim;
+    return [
+      { text: taskMatch[1] + checkbox, fg: color },
+      ...parseInlineMarkdown(taskMatch[3]),
+    ];
+  }
+
   // Unordered list: - item, * item, + item
   const ulMatch = line.match(/^(\s*)([-*+])\s+(.*)/);
   if (ulMatch) {
@@ -137,10 +173,15 @@ export function parseTableCells(line: string): string[] {
 
 /** Compute the display width of a string (strips inline markdown markers). */
 export function displayWidth(text: string): number {
-  // Remove **bold**, *italic*, `code` markers to get display length
+  // Remove all inline markdown markers to get display length
   return text
+    .replace(/\*\*\*(.+?)\*\*\*/g, "$1")
     .replace(/\*\*(.+?)\*\*/g, "$1")
     .replace(/\*(.+?)\*/g, "$1")
+    .replace(/__(.+?)__/g, "$1")
+    .replace(/_(.+?)_/g, "$1")
+    .replace(/~~(.+?)~~/g, "$1")
+    .replace(/\[([^\]]+)\]\([^)]+\)/g, "$1")
     .replace(/`([^`]+)`/g, "$1")
     .length;
 }