@tmustier/pi-files-widget 0.1.15 → 0.1.17

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this extension will be documented in this file.
 
+## [Unreleased]
+
+## [0.1.17] - 2026-04-19
+
+### Changed
+- Make the inline comment editor multiline with wrapped footer rendering, `Enter` for a new line, and `Ctrl+Enter`/`Ctrl+D` to send.
+- Add an `m` toggle for rendered vs raw Markdown in the viewer, and fall back to raw mode before line-based search or selection.
+- Show a sent/queued confirmation toast after returning an inline comment to the agent.
+
+### Thanks
+- Thanks to avg8888 in the Pi Discord for surfacing the comment editor and Markdown review issues fixed in this release.
+
+## [0.1.16] - 2026-04-19
+
+### Fixed
+- Let `/readfiles` browser search accept `j` and `k` as search text instead of hijacking them for navigation.
+- Fix viewer scrolling so the last lines of a file remain reachable.
+- Restore `G` / `Shift+G` navigation to jump to the bottom of the viewer.
+- Refresh an open viewer when the file changes on disk while `/readfiles` is open.
+- Accept pasted, multi-character, and chunked bracketed-paste input in browser search and the inline comment prompt.
+- Keep viewer search results in sync after live refreshes.
+- Pause live refresh while a line selection or inline comment is active so comments stay anchored to what the user selected.
+
 ## [0.1.14] - 2026-02-03
 
 ### Added

package/README.md

@@ -113,10 +113,13 @@ If missing, `/review` or `/diff` will show a clear install prompt.
 - `PgUp/PgDn`: page up/down
 - `g/G`: top/bottom
 - `d`: toggle diff (tracked files only)
+- `m`: toggle rendered/raw view for Markdown files
 - `/`: search (type to search)
 - `n` / `N`: next/prev match
 - `v`: select mode (line selection)
 - `c`: comment on selected lines (inline prompt)
+- `Enter`: new line in the comment editor
+- `Ctrl+Enter` or `Ctrl+D`: send the comment (`Alt+Enter` also works when supported)
 - `]` / `[`: next/prev changed file
 - `+` / `-`: increase/decrease viewer height
 - `q`: back to browser
@@ -124,6 +127,7 @@ If missing, `/review` or `/diff` will show a clear install prompt.
 ## Notes
 
 - Untracked files show as `[UNTRACKED]` and open in normal view.
+- Searching in rendered Markdown switches to raw mode first, and selecting from rendered Markdown first switches you back to raw so line-based matches and comments stay aligned with the source file.
 - Folder LOCs are shown only when the folder is collapsed (expanded folders would duplicate counts).
 - Line counts load asynchronously; the header shows activity while counts are computed.
 - Large non-git folders load progressively and may show `[partial]` while loading in safe mode.

package/TODO.md

@@ -46,7 +46,7 @@
 ### Markdown Rendering
 - [x] Detect `glow` availability
 - [x] Shell out to `glow` for .md files
-- [ ] Toggle between rendered and raw (`m` key?)
+- [x] Toggle between rendered and raw (`m`)
 - [x] Fallback to syntax-highlighted raw
 
 ### Diff View
@@ -66,15 +66,15 @@
 
 ### Comment Dialog
 - [x] `c` to open comment input
-- [ ] Multi-line text input
-- [x] `Enter` or `Ctrl+Enter` to confirm
+- [x] Multi-line text input
+- [x] `Enter` for newline and `Ctrl+Enter` / `Ctrl+D` to confirm
 - [x] `Esc` to cancel
 
 ### Send to Agent
 - [x] Format message with file path, line range, code snippet, comment
 - [x] Use `pi.sendUserMessage()` with `deliverAs: "followUp"`
 - [x] Handle case when agent is idle vs streaming
-- [ ] Show confirmation notification
+- [x] Show confirmation notification
 
 ## Phase 4: tuicr Integration (Optional)
 

package/browser.ts

@@ -22,7 +22,7 @@ import { buildFileTreeFromPaths, flattenTree, getIgnoredNames, sortChildren, upd
 import type { DiffStats, FileNode, FlatNode } from "./types";
 import { isIgnoredStatus, isUntrackedStatus } from "./utils";
 import { createViewer, type CommentPayload, type ViewerAction } from "./viewer";
-import { isPrintableChar } from "./input-utils";
+import { createTextInputBuffer } from "./input-utils";
 
 export interface BrowserController {
   render(width: number): string[];
@@ -219,6 +219,7 @@ export function createFileBrowser(
   const gitBranch = repo ? getGitBranch(cwd) : "";
 
   const viewer = createViewer(cwd, theme, requestComment);
+  const textInput = createTextInputBuffer();
 
   const root = repo
     ? buildFileTreeFromPaths(cwd, getGitFileList(cwd), gitStatus, diffStats, ignored, agentModifiedFiles)
@@ -794,8 +795,10 @@ export function createFileBrowser(
 
   function handleBrowserInput(data: string): void {
     const displayList = getDisplayList();
+    const maxIndex = Math.max(0, displayList.length - 1);
 
     if (matchesKey(data, "q") && !browser.searchMode) {
+      textInput.reset();
       stopBackgroundTasks();
       onClose();
       return;
@@ -804,7 +807,9 @@ export function createFileBrowser(
       if (browser.searchMode) {
         browser.searchMode = false;
         browser.searchQuery = "";
+        textInput.reset();
       } else {
+        textInput.reset();
         stopBackgroundTasks();
         onClose();
       }
@@ -813,29 +818,38 @@ export function createFileBrowser(
     if (matchesKey(data, "/") && !browser.searchMode) {
       browser.searchMode = true;
       browser.searchQuery = "";
-      return;
-    }
-    if (matchesKey(data, "j") || matchesKey(data, Key.down)) {
-      browser.selectedIndex = Math.min(displayList.length - 1, browser.selectedIndex + 1);
-      return;
-    }
-    if (matchesKey(data, "k") || matchesKey(data, Key.up)) {
-      browser.selectedIndex = Math.max(0, browser.selectedIndex - 1);
+      textInput.reset();
       return;
     }
     if (browser.searchMode) {
       if (matchesKey(data, Key.enter)) {
         browser.searchMode = false;
         browser.selectedIndex = 0;
+        textInput.reset();
       } else if (matchesKey(data, Key.backspace)) {
         browser.searchQuery = browser.searchQuery.slice(0, -1);
         browser.selectedIndex = 0;
-      } else if (isPrintableChar(data)) {
-        browser.searchQuery += data;
-        browser.selectedIndex = 0;
+      } else if (matchesKey(data, Key.down)) {
+        browser.selectedIndex = Math.min(maxIndex, browser.selectedIndex + 1);
+      } else if (matchesKey(data, Key.up)) {
+        browser.selectedIndex = Math.max(0, browser.selectedIndex - 1);
+      } else {
+        const text = textInput.push(data);
+        if (text) {
+          browser.searchQuery += text;
+          browser.selectedIndex = 0;
+        }
       }
       return;
     }
+    if (matchesKey(data, "j") || matchesKey(data, Key.down)) {
+      browser.selectedIndex = Math.min(maxIndex, browser.selectedIndex + 1);
+      return;
+    }
+    if (matchesKey(data, "k") || matchesKey(data, Key.up)) {
+      browser.selectedIndex = Math.max(0, browser.selectedIndex - 1);
+      return;
+    }
     if (matchesKey(data, Key.enter)) {
       const item = displayList[browser.selectedIndex];
       if (item) {
@@ -864,7 +878,7 @@ export function createFileBrowser(
       return;
     }
     if (matchesKey(data, Key.pageDown)) {
-      browser.selectedIndex = Math.min(displayList.length - 1, browser.selectedIndex + browser.browserHeight);
+      browser.selectedIndex = Math.min(maxIndex, browser.selectedIndex + browser.browserHeight);
       return;
     }
     if (matchesKey(data, Key.pageUp)) {

package/constants.ts

@@ -14,5 +14,4 @@ export const MIN_PANEL_HEIGHT = 5;
 export const MAX_VIEWER_HEIGHT = 50;
 export const MAX_BROWSER_HEIGHT = 40;
 
-export const VIEWER_SCROLL_MARGIN = 10;
 export const SEARCH_SCROLL_OFFSET = 3;

package/file-viewer.ts

@@ -3,7 +3,7 @@ import { execSync } from "node:child_process";
 import { readFileSync, statSync } from "node:fs";
 
 import { isGitRepo } from "./git";
-import { hasCommand, stripLeadingEmptyLines } from "./utils";
+import { hasCommand, isMarkdownPath, stripLeadingEmptyLines } from "./utils";
 
 const DIFF_CONTENT_PREFIXES = new Set(["+", "-", " "]);
 
@@ -152,14 +152,20 @@ function wrapDeltaLines(lines: string[], width: number): string[] {
   return wrapped;
 }
 
+export interface LoadedFileContent {
+  lines: string[];
+  renderedMarkdown: boolean;
+}
+
 export function loadFileContent(
   filePath: string,
   cwd: string,
   diffMode: boolean,
   hasChanges: boolean,
-  width?: number
-): string[] {
-  const isMarkdown = filePath.endsWith(".md");
+  width?: number,
+  renderMarkdown = true
+): LoadedFileContent {
+  const isMarkdown = isMarkdownPath(filePath);
   const termWidth = width || process.stdout.columns || 80;
 
   try {
@@ -195,7 +201,7 @@ export function loadFileContent(
         }
 
         if (!diffOutput.trim()) {
-          return ["No diff available - file may be untracked or unchanged"];
+          return { lines: ["No diff available - file may be untracked or unchanged"], renderedMarkdown: false };
         }
 
         if (hasCommand("delta")) {
@@ -211,23 +217,23 @@ export function loadFileContent(
                 stdio: ["pipe", "pipe", "pipe"],
               }
             );
-            return wrapDeltaLines(stripLeadingEmptyLines(deltaOutput.split("\n")), termWidth);
+            return { lines: wrapDeltaLines(stripLeadingEmptyLines(deltaOutput.split("\n")), termWidth), renderedMarkdown: false };
           } catch {
             // Fall back to raw diff
           }
         }
 
-        return wrapDiffLines(stripLeadingEmptyLines(diffOutput.split("\n")), termWidth);
+        return { lines: wrapDiffLines(stripLeadingEmptyLines(diffOutput.split("\n")), termWidth), renderedMarkdown: false };
       } catch (e: any) {
-        return [`Diff error: ${e.message}`];
+        return { lines: [`Diff error: ${e.message}`], renderedMarkdown: false };
       }
     }
 
-    if (isMarkdown && hasCommand("glow")) {
+    if (isMarkdown && renderMarkdown && hasCommand("glow")) {
       try {
         const output = execSync(`glow -s dark -w ${termWidth} "${filePath}"`, { encoding: "utf-8", timeout: 10000 });
         if (output.trim()) {
-          return stripLeadingEmptyLines(output.split("\n"));
+          return { lines: stripLeadingEmptyLines(output.split("\n")), renderedMarkdown: true };
         }
       } catch {
         // Fall through to bat
@@ -236,16 +242,22 @@ export function loadFileContent(
 
     if (hasCommand("bat")) {
       try {
-        return execSync(
-          `bat --style=numbers --color=always --paging=never --wrap=auto --terminal-width=${termWidth} "${filePath}"`,
-          { encoding: "utf-8", timeout: 10000 }
-        ).split("\n");
+        return {
+          lines: execSync(
+            `bat --style=numbers --color=always --paging=never --wrap=auto --terminal-width=${termWidth} "${filePath}"`,
+            { encoding: "utf-8", timeout: 10000 }
+          ).split("\n"),
+          renderedMarkdown: false,
+        };
       } catch {
         try {
-          return execSync(
-            `bat --style=numbers --color=always --paging=never --terminal-width=${termWidth} "${filePath}"`,
-            { encoding: "utf-8", timeout: 10000 }
-          ).split("\n");
+          return {
+            lines: execSync(
+              `bat --style=numbers --color=always --paging=never --terminal-width=${termWidth} "${filePath}"`,
+              { encoding: "utf-8", timeout: 10000 }
+            ).split("\n"),
+            renderedMarkdown: false,
+          };
         } catch {
           // Fall through to raw file read
         }
@@ -253,8 +265,11 @@ export function loadFileContent(
     }
 
     const raw = readFileSync(filePath, "utf-8");
-    return raw.split("\n").map((line, i) => `${String(i + 1).padStart(4)} │ ${line}`);
+    return {
+      lines: raw.split("\n").map((line, i) => `${String(i + 1).padStart(4)} │ ${line}`),
+      renderedMarkdown: false,
+    };
   } catch (e: any) {
-    return [`Error loading file: ${e.message}`];
+    return { lines: [`Error loading file: ${e.message}`], renderedMarkdown: false };
   }
 }

package/index.ts

@@ -41,10 +41,14 @@ export default function editorExtension(pi: ExtensionAPI): void {
         };
 
         const requestComment = (payload: { relPath: string; lineRange: string; ext: string; selectedText: string }, comment: string) => {
-          pi.sendUserMessage(formatCommentMessage(payload, comment), {
-            deliverAs: "followUp",
-            streamingBehavior: "followUp" as any,
-          } as any);
+          const message = formatCommentMessage(payload, comment);
+          if (ctx.isIdle()) {
+            pi.sendUserMessage(message);
+            ctx.ui.notify(`Comment sent to agent for ${payload.relPath} (${payload.lineRange})`, "success");
+          } else {
+            pi.sendUserMessage(message, { deliverAs: "followUp" });
+            ctx.ui.notify(`Comment queued for agent for ${payload.relPath} (${payload.lineRange})`, "info");
+          }
         };
 
         const requestRender = () => tui.requestRender();

package/input-utils.ts

@@ -1,3 +1,96 @@
-export function isPrintableChar(data: string): boolean {
-  return data.length === 1 && data.charCodeAt(0) >= 32 && data.charCodeAt(0) < 127;
+import { decodeKittyPrintable } from "@mariozechner/pi-tui";
+
+const CONTROL_CHARS = /[\u0000-\u0008\u000B-\u001F\u007F]/g;
+const BRACKETED_PASTE_START = "\u001b[200~";
+const BRACKETED_PASTE_END = "\u001b[201~";
+
+interface SanitizeTextInputOptions {
+  preserveNewlines?: boolean;
+}
+
+function sanitizeTextInput(data: string, options: SanitizeTextInputOptions = {}): string {
+  const normalized = decodeKittyPrintable(data) ?? data;
+  if (!normalized || normalized.includes("\u001b")) {
+    return "";
+  }
+
+  const withNewlines = normalized.replace(/\r\n?/g, "\n");
+  const withoutTabs = options.preserveNewlines
+    ? withNewlines.replace(/\t/g, "  ")
+    : withNewlines.replace(/\n/g, " ").replace(/\t/g, " ");
+
+  return withoutTabs.replace(CONTROL_CHARS, "");
+}
+
+function getPendingStartSuffix(data: string): string {
+  const maxLength = BRACKETED_PASTE_START.length - 1;
+  for (let length = Math.min(data.length, maxLength); length > 0; length--) {
+    const suffix = data.slice(-length);
+    if (BRACKETED_PASTE_START.startsWith(suffix)) {
+      return suffix;
+    }
+  }
+  return "";
+}
+
+export interface TextInputBuffer {
+  push(data: string): string;
+  reset(): void;
+}
+
+interface TextInputBufferOptions {
+  preserveNewlines?: boolean;
+}
+
+export function createTextInputBuffer(options: TextInputBufferOptions = {}): TextInputBuffer {
+  let isInPaste = false;
+  let pasteBuffer = "";
+  let pendingStart = "";
+
+  const push = (data: string): string => {
+    if (!data) {
+      return "";
+    }
+
+    const combined = pendingStart + data;
+    pendingStart = "";
+
+    if (!isInPaste) {
+      const startIndex = combined.indexOf(BRACKETED_PASTE_START);
+      if (startIndex === -1) {
+        const pendingSuffix = getPendingStartSuffix(combined);
+        const completeText = pendingSuffix ? combined.slice(0, combined.length - pendingSuffix.length) : combined;
+        pendingStart = pendingSuffix;
+        return sanitizeTextInput(completeText, options);
+      }
+
+      const beforePaste = combined.slice(0, startIndex);
+      const afterStart = combined.slice(startIndex + BRACKETED_PASTE_START.length);
+      isInPaste = true;
+      pasteBuffer = "";
+      return sanitizeTextInput(beforePaste, options) + push(afterStart);
+    }
+
+    pasteBuffer += combined;
+    const endIndex = pasteBuffer.indexOf(BRACKETED_PASTE_END);
+    if (endIndex === -1) {
+      return "";
+    }
+
+    const pastedText = pasteBuffer.slice(0, endIndex);
+    const remaining = pasteBuffer.slice(endIndex + BRACKETED_PASTE_END.length);
+    isInPaste = false;
+    pasteBuffer = "";
+
+    return sanitizeTextInput(pastedText, options) + push(remaining);
+  };
+
+  return {
+    push,
+    reset(): void {
+      isInPaste = false;
+      pasteBuffer = "";
+      pendingStart = "";
+    },
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-files-widget",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "In-terminal file browser and viewer for Pi.",
   "license": "MIT",
   "author": "Thomas Mustier",

package/utils.ts

@@ -17,6 +17,10 @@ export function isIgnoredStatus(status?: string): boolean {
   return status === "!" || status === "!!";
 }
 
+export function isMarkdownPath(path: string): boolean {
+  return path.toLowerCase().endsWith(".md");
+}
+
 export function stripLeadingEmptyLines(lines: string[]): string[] {
   let startIdx = 0;
   while (startIdx < lines.length && !lines[startIdx].trim()) {

package/viewer.ts

@@ -1,6 +1,6 @@
 import type { Theme } from "@mariozechner/pi-coding-agent";
-import { Key, matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
-import { readFileSync } from "node:fs";
+import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import { readFileSync, statSync } from "node:fs";
 import { relative } from "node:path";
 
 import {
@@ -8,12 +8,13 @@ import {
   MAX_VIEWER_HEIGHT,
   MIN_PANEL_HEIGHT,
   SEARCH_SCROLL_OFFSET,
-  VIEWER_SCROLL_MARGIN,
 } from "./constants";
 import { loadFileContent } from "./file-viewer";
 import type { FileNode } from "./types";
-import { isUntrackedStatus } from "./utils";
-import { isPrintableChar } from "./input-utils";
+import { isMarkdownPath, isUntrackedStatus } from "./utils";
+import { createTextInputBuffer } from "./input-utils";
+
+const COMMENT_EDITOR_MAX_VISIBLE_LINES = 4;
 
 export interface CommentPayload {
   relPath: string;
@@ -35,6 +36,7 @@ interface ViewerState {
   rawContent: string;
   scroll: number;
   diffMode: boolean;
+  renderMarkdown: boolean;
   mode: ViewerMode;
   selectStart: number;
   selectEnd: number;
@@ -43,6 +45,7 @@ interface ViewerState {
   searchMatches: number[];
   searchIndex: number;
   lastRenderWidth: number;
+  lastLoadedMtimeMs: number | null;
   height: number;
 }
 
@@ -61,12 +64,16 @@ export function createViewer(
   theme: Theme,
   requestComment: (payload: CommentPayload, comment: string) => void
 ): ViewerController {
+  const searchInput = createTextInputBuffer();
+  const commentInput = createTextInputBuffer({ preserveNewlines: true });
+
   const state: ViewerState = {
     file: null,
     content: [],
     rawContent: "",
     scroll: 0,
     diffMode: false,
+    renderMarkdown: true,
     mode: "normal",
     selectStart: 0,
     selectEnd: 0,
@@ -75,9 +82,35 @@ export function createViewer(
     searchMatches: [],
     searchIndex: 0,
     lastRenderWidth: 0,
+    lastLoadedMtimeMs: null,
     height: DEFAULT_VIEWER_HEIGHT,
   };
 
+  function isMarkdownFile(): boolean {
+    return !!state.file && isMarkdownPath(state.file.path);
+  }
+
+  function isRenderedMarkdownMode(): boolean {
+    return isMarkdownFile() && !state.diffMode && state.renderMarkdown;
+  }
+
+  function switchMarkdownToRaw(): boolean {
+    if (!isRenderedMarkdownMode()) return false;
+    state.renderMarkdown = false;
+    const width = state.lastRenderWidth || process.stdout.columns || 80;
+    reloadContent(width);
+    return true;
+  }
+
+  function toggleMarkdownMode(): void {
+    if (!isMarkdownFile() || state.diffMode) return;
+    state.renderMarkdown = !state.renderMarkdown;
+    state.lastRenderWidth = 0;
+    resetSearch();
+    setMode("normal");
+    clampScroll();
+  }
+
   function resetSearch(): void {
     state.searchQuery = "";
     state.searchMatches = [];
@@ -94,6 +127,11 @@ export function createViewer(
   }
 
   function setMode(mode: ViewerMode): void {
+    if (mode !== state.mode) {
+      searchInput.reset();
+      commentInput.reset();
+    }
+
     state.mode = mode;
     if (mode !== "search") resetSearch();
     if (mode !== "comment") resetComment();
@@ -102,16 +140,61 @@ export function createViewer(
     }
   }
 
+  function getMaxScroll(): number {
+    return Math.max(0, state.content.length - state.height);
+  }
+
+  function refreshRawContent(): void {
+    if (!state.file) return;
+
+    try {
+      const fileStat = statSync(state.file.path);
+      state.rawContent = readFileSync(state.file.path, "utf-8");
+      state.file.lineCount = state.rawContent.split("\n").length;
+      state.lastLoadedMtimeMs = fileStat.mtimeMs;
+    } catch {
+      state.rawContent = "";
+      state.file.lineCount = undefined;
+      state.lastLoadedMtimeMs = null;
+    }
+  }
+
+  function hasFileChangedOnDisk(): boolean {
+    if (!state.file) return false;
+
+    try {
+      return state.lastLoadedMtimeMs === null || statSync(state.file.path).mtimeMs !== state.lastLoadedMtimeMs;
+    } catch {
+      return state.lastLoadedMtimeMs !== null;
+    }
+  }
+
+  function clampScroll(): void {
+    state.scroll = Math.min(getMaxScroll(), Math.max(0, state.scroll));
+  }
+
   function reloadContent(width: number): void {
     if (!state.file) return;
+    refreshRawContent();
     const hasChanges = !!state.file.gitStatus;
-    state.content = loadFileContent(state.file.path, cwd, state.diffMode, hasChanges, width);
+    const result = loadFileContent(state.file.path, cwd, state.diffMode, hasChanges, width, state.renderMarkdown);
+    state.content = result.lines;
+    state.renderMarkdown = result.renderedMarkdown;
     state.lastRenderWidth = width;
+    clampScroll();
+    if (state.searchQuery) {
+      updateSearchMatches({ preserveActiveMatch: true });
+    }
   }
 
-  function updateSearchMatches(): void {
+  function updateSearchMatches(options: { preserveActiveMatch?: boolean } = {}): void {
+    const activeMatch = options.preserveActiveMatch ? state.searchMatches[state.searchIndex] : undefined;
+
     state.searchMatches = [];
-    if (!state.searchQuery) return;
+    if (!state.searchQuery) {
+      state.searchIndex = 0;
+      return;
+    }
 
     const q = state.searchQuery.toLowerCase();
     const rawLines = state.rawContent.split("\n");
@@ -120,11 +203,29 @@ export function createViewer(
         state.searchMatches.push(i);
       }
     }
-    state.searchIndex = 0;
 
-    if (state.searchMatches.length > 0) {
-      state.scroll = Math.max(0, state.searchMatches[0] - SEARCH_SCROLL_OFFSET);
+    if (state.searchMatches.length === 0) {
+      state.searchIndex = 0;
+      return;
     }
+
+    if (activeMatch === undefined) {
+      state.searchIndex = 0;
+    } else {
+      let nearestIndex = 0;
+      let nearestDistance = Number.POSITIVE_INFINITY;
+      for (let i = 0; i < state.searchMatches.length; i++) {
+        const distance = Math.abs(state.searchMatches[i] - activeMatch);
+        if (distance < nearestDistance) {
+          nearestDistance = distance;
+          nearestIndex = i;
+        }
+      }
+      state.searchIndex = nearestIndex;
+    }
+
+    state.scroll = Math.max(0, state.searchMatches[state.searchIndex] - SEARCH_SCROLL_OFFSET);
+    clampScroll();
   }
 
   function jumpToNextMatch(direction: 1 | -1): void {
@@ -133,6 +234,7 @@ export function createViewer(
     if (state.searchIndex < 0) state.searchIndex = state.searchMatches.length - 1;
     if (state.searchIndex >= state.searchMatches.length) state.searchIndex = 0;
     state.scroll = Math.max(0, state.searchMatches[state.searchIndex] - SEARCH_SCROLL_OFFSET);
+    clampScroll();
   }
 
   function buildCommentPayload(): CommentPayload | null {
@@ -166,6 +268,8 @@ export function createViewer(
       header += theme.fg("dim", " [UNTRACKED]");
     } else if (state.diffMode) {
       header += theme.fg("warning", " [DIFF]");
+    } else if (isMarkdownFile()) {
+      header += theme.fg("accent", state.renderMarkdown ? " [RENDERED]" : " [RAW]");
     }
     if (state.mode === "select" || state.mode === "comment") {
       header += theme.fg("accent", ` [SELECT ${state.selectStart + 1}-${state.selectEnd + 1}]`);
@@ -195,6 +299,38 @@ export function createViewer(
     return truncateToWidth(header, width);
   }
 
+  function renderCommentEditor(width: number): string[] {
+    const contentWidth = Math.max(1, width - 2);
+    const wrappedLines: string[] = [];
+    const logicalLines = state.commentText.split("\n");
+
+    for (const line of logicalLines) {
+      if (line.length === 0) {
+        wrappedLines.push("");
+        continue;
+      }
+      wrappedLines.push(...wrapTextWithAnsi(line, contentWidth));
+    }
+
+    if (wrappedLines.length === 0) {
+      wrappedLines.push("");
+    }
+
+    const lastIndex = wrappedLines.length - 1;
+    wrappedLines[lastIndex] = `${wrappedLines[lastIndex]}█`;
+
+    const overflow = Math.max(0, wrappedLines.length - COMMENT_EDITOR_MAX_VISIBLE_LINES);
+    const visibleLines = wrappedLines.slice(-COMMENT_EDITOR_MAX_VISIBLE_LINES);
+    if (overflow > 0 && visibleLines.length > 0) {
+      visibleLines[0] = `…${visibleLines[0]}`;
+    }
+
+    return [
+      truncateToWidth(theme.fg("accent", "Comment:"), width),
+      ...visibleLines.map(line => truncateToWidth(`  ${line}`, width)),
+    ];
+  }
+
   function renderFooter(width: number): string[] {
     const lines: string[] = [];
     const pct = state.content.length > 0
@@ -202,23 +338,23 @@ export function createViewer(
       : 0;
 
     if (state.mode === "comment") {
-      const prompt = theme.fg("accent", `Comment: ${state.commentText}█`);
-      lines.push(truncateToWidth(prompt, width));
+      lines.push(...renderCommentEditor(width));
       lines.push(theme.fg("borderMuted", "─".repeat(width)));
     }
 
     let help: string;
     if (state.mode === "comment") {
-      help = theme.fg("dim", "Enter: send  Esc: cancel");
+      help = theme.fg("dim", "Enter: newline  Ctrl+Enter/Ctrl+D: send  Esc: cancel");
     } else if (state.mode === "select") {
       help = theme.fg("dim", "j/k: extend  c: comment  Esc: cancel");
     } else if (state.mode === "search") {
       help = theme.fg("dim", "Type to search  Enter: confirm  Esc: cancel");
     } else {
       const isUntracked = state.file && isUntrackedStatus(state.file.gitStatus);
+      const markdownHelp = isMarkdownFile() && !state.diffMode ? "m: raw/render  " : "";
       help = theme.fg(
         "dim",
-        `j/k: scroll  /: search  n/N: next/prev match  []: files  ${state.file?.gitStatus && !isUntracked ? "d: diff  " : ""}q: back  ${pct}%`
+        `j/k: scroll  /: search  n/N: next/prev match  ${markdownHelp}[]: files  ${state.file?.gitStatus && !isUntracked ? "d: diff  " : ""}q: back  ${pct}%`
       );
     }
     lines.push(truncateToWidth(help, width));
@@ -239,17 +375,12 @@ export function createViewer(
       state.file = file;
       state.scroll = 0;
       state.diffMode = !!file.gitStatus && !isUntrackedStatus(file.gitStatus);
+      state.renderMarkdown = isMarkdownPath(file.path);
       setMode("normal");
       state.content = [];
       state.lastRenderWidth = 0;
-
-      try {
-        state.rawContent = readFileSync(file.path, "utf-8");
-        file.lineCount = state.rawContent.split("\n").length;
-      } catch {
-        state.rawContent = "";
-        file.lineCount = undefined;
-      }
+      state.lastLoadedMtimeMs = null;
+      refreshRawContent();
     },
 
     updateFileRef(file: FileNode | null): void {
@@ -259,13 +390,17 @@ export function createViewer(
     close(): void {
       state.file = null;
       state.content = [];
+      state.rawContent = "";
+      state.renderMarkdown = true;
+      state.lastLoadedMtimeMs = null;
       setMode("normal");
     },
 
     render(width: number): string[] {
       if (!state.file) return [];
 
-      if (state.lastRenderWidth !== width || state.content.length === 0) {
+      const shouldAutoRefresh = state.mode !== "select" && state.mode !== "comment";
+      if (state.lastRenderWidth !== width || state.content.length === 0 || (shouldAutoRefresh && hasFileChangedOnDisk())) {
         reloadContent(width);
       }
 
@@ -297,19 +432,24 @@ export function createViewer(
       if (!state.file) return { type: "none" };
 
       if (state.mode === "comment") {
-        if (matchesKey(data, Key.enter)) {
+        if (matchesKey(data, "ctrl+enter") || matchesKey(data, "ctrl+d") || matchesKey(data, "alt+enter")) {
           const comment = state.commentText.trim();
           if (comment) {
             sendComment(comment);
           } else {
             setMode("normal");
           }
+        } else if (matchesKey(data, Key.enter) || matchesKey(data, "shift+enter")) {
+          state.commentText += "\n";
         } else if (matchesKey(data, Key.escape)) {
           setMode("normal");
         } else if (matchesKey(data, Key.backspace)) {
           state.commentText = state.commentText.slice(0, -1);
-        } else if (isPrintableChar(data)) {
-          state.commentText += data;
+        } else {
+          const text = commentInput.push(data);
+          if (text) {
+            state.commentText += text;
+          }
         }
         return { type: "none" };
       }
@@ -322,9 +462,12 @@ export function createViewer(
         } else if (matchesKey(data, Key.backspace)) {
           state.searchQuery = state.searchQuery.slice(0, -1);
           updateSearchMatches();
-        } else if (isPrintableChar(data)) {
-          state.searchQuery += data;
-          updateSearchMatches();
+        } else {
+          const text = searchInput.push(data);
+          if (text) {
+            state.searchQuery += text;
+            updateSearchMatches();
+          }
         }
         return { type: "none" };
       }
@@ -343,6 +486,7 @@ export function createViewer(
         return { type: "none" };
       }
       if (matchesKey(data, "/") && state.mode !== "select") {
+        switchMarkdownToRaw();
         setMode("search");
         return { type: "none" };
       }
@@ -358,7 +502,7 @@ export function createViewer(
         if (state.mode === "select") {
           state.selectEnd = Math.min(state.content.length - 1, state.selectEnd + 1);
         } else {
-          state.scroll = Math.min(Math.max(0, state.content.length - VIEWER_SCROLL_MARGIN), state.scroll + 1);
+          state.scroll = Math.min(getMaxScroll(), state.scroll + 1);
         }
         return { type: "none" };
       }
@@ -371,7 +515,7 @@ export function createViewer(
         return { type: "none" };
       }
       if (matchesKey(data, Key.pageDown)) {
-        state.scroll = Math.min(Math.max(0, state.content.length - state.height), state.scroll + state.height);
+        state.scroll = Math.min(getMaxScroll(), state.scroll + state.height);
         return { type: "none" };
       }
       if (matchesKey(data, Key.pageUp)) {
@@ -382,16 +526,18 @@ export function createViewer(
         state.scroll = 0;
         return { type: "none" };
       }
-      if (matchesKey(data, "G")) {
-        state.scroll = Math.max(0, state.content.length - state.height);
+      if (matchesKey(data, "shift+g")) {
+        state.scroll = getMaxScroll();
         return { type: "none" };
       }
       if (matchesKey(data, "+") || matchesKey(data, "=")) {
         state.height = Math.min(MAX_VIEWER_HEIGHT, state.height + 5);
+        clampScroll();
         return { type: "none" };
       }
       if (matchesKey(data, "-") || matchesKey(data, "_")) {
         state.height = Math.max(MIN_PANEL_HEIGHT, state.height - 5);
+        clampScroll();
         return { type: "none" };
       }
       if (matchesKey(data, "d") && state.mode !== "select" && state.file.gitStatus && !isUntrackedStatus(state.file.gitStatus)) {
@@ -400,7 +546,14 @@ export function createViewer(
         state.scroll = 0;
         return { type: "none" };
       }
+      if (matchesKey(data, "m") && state.mode !== "select" && state.mode !== "comment") {
+        toggleMarkdownMode();
+        return { type: "none" };
+      }
       if (matchesKey(data, "v") && state.mode !== "select") {
+        if (switchMarkdownToRaw()) {
+          return { type: "none" };
+        }
         state.mode = "select";
         state.selectStart = state.scroll;
         state.selectEnd = state.scroll;