@tmustier/pi-files-widget 0.1.16 → 0.1.17

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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

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/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

@@ -4,17 +4,22 @@ const CONTROL_CHARS = /[\u0000-\u0008\u000B-\u001F\u007F]/g;
 const BRACKETED_PASTE_START = "\u001b[200~";
 const BRACKETED_PASTE_END = "\u001b[201~";
 
-function sanitizeTextInput(data: string): string {
+interface SanitizeTextInputOptions {
+  preserveNewlines?: boolean;
+}
+
+function sanitizeTextInput(data: string, options: SanitizeTextInputOptions = {}): string {
   const normalized = decodeKittyPrintable(data) ?? data;
   if (!normalized || normalized.includes("\u001b")) {
     return "";
   }
 
-  return normalized
-    .replace(/\r\n?/g, "\n")
-    .replace(/\n/g, " ")
-    .replace(/\t/g, " ")
-    .replace(CONTROL_CHARS, "");
+  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 {
@@ -33,7 +38,11 @@ export interface TextInputBuffer {
   reset(): void;
 }
 
-export function createTextInputBuffer(): TextInputBuffer {
+interface TextInputBufferOptions {
+  preserveNewlines?: boolean;
+}
+
+export function createTextInputBuffer(options: TextInputBufferOptions = {}): TextInputBuffer {
   let isInPaste = false;
   let pasteBuffer = "";
   let pendingStart = "";
@@ -52,14 +61,14 @@ export function createTextInputBuffer(): TextInputBuffer {
         const pendingSuffix = getPendingStartSuffix(combined);
         const completeText = pendingSuffix ? combined.slice(0, combined.length - pendingSuffix.length) : combined;
         pendingStart = pendingSuffix;
-        return sanitizeTextInput(completeText);
+        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) + push(afterStart);
+      return sanitizeTextInput(beforePaste, options) + push(afterStart);
     }
 
     pasteBuffer += combined;
@@ -73,7 +82,7 @@ export function createTextInputBuffer(): TextInputBuffer {
     isInPaste = false;
     pasteBuffer = "";
 
-    return sanitizeTextInput(pastedText) + push(remaining);
+    return sanitizeTextInput(pastedText, options) + push(remaining);
   };
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-files-widget",
-  "version": "0.1.16",
+  "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,5 +1,5 @@
 import type { Theme } from "@mariozechner/pi-coding-agent";
-import { Key, matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
+import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
 import { readFileSync, statSync } from "node:fs";
 import { relative } from "node:path";
 
@@ -11,9 +11,11 @@ import {
 } from "./constants";
 import { loadFileContent } from "./file-viewer";
 import type { FileNode } from "./types";
-import { isUntrackedStatus } from "./utils";
+import { isMarkdownPath, isUntrackedStatus } from "./utils";
 import { createTextInputBuffer } from "./input-utils";
 
+const COMMENT_EDITOR_MAX_VISIBLE_LINES = 4;
+
 export interface CommentPayload {
   relPath: string;
   lineRange: string;
@@ -34,6 +36,7 @@ interface ViewerState {
   rawContent: string;
   scroll: number;
   diffMode: boolean;
+  renderMarkdown: boolean;
   mode: ViewerMode;
   selectStart: number;
   selectEnd: number;
@@ -61,7 +64,8 @@ export function createViewer(
   theme: Theme,
   requestComment: (payload: CommentPayload, comment: string) => void
 ): ViewerController {
-  const textInput = createTextInputBuffer();
+  const searchInput = createTextInputBuffer();
+  const commentInput = createTextInputBuffer({ preserveNewlines: true });
 
   const state: ViewerState = {
     file: null,
@@ -69,6 +73,7 @@ export function createViewer(
     rawContent: "",
     scroll: 0,
     diffMode: false,
+    renderMarkdown: true,
     mode: "normal",
     selectStart: 0,
     selectEnd: 0,
@@ -81,6 +86,31 @@ export function createViewer(
     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 = [];
@@ -98,7 +128,8 @@ export function createViewer(
 
   function setMode(mode: ViewerMode): void {
     if (mode !== state.mode) {
-      textInput.reset();
+      searchInput.reset();
+      commentInput.reset();
     }
 
     state.mode = mode;
@@ -146,7 +177,9 @@ export function createViewer(
     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) {
@@ -235,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}]`);
@@ -264,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
@@ -271,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));
@@ -308,6 +375,7 @@ 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;
@@ -323,6 +391,7 @@ export function createViewer(
       state.file = null;
       state.content = [];
       state.rawContent = "";
+      state.renderMarkdown = true;
       state.lastLoadedMtimeMs = null;
       setMode("normal");
     },
@@ -363,19 +432,21 @@ 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 {
-          const text = textInput.push(data);
+          const text = commentInput.push(data);
           if (text) {
             state.commentText += text;
           }
@@ -392,7 +463,7 @@ export function createViewer(
           state.searchQuery = state.searchQuery.slice(0, -1);
           updateSearchMatches();
         } else {
-          const text = textInput.push(data);
+          const text = searchInput.push(data);
           if (text) {
             state.searchQuery += text;
             updateSearchMatches();
@@ -415,6 +486,7 @@ export function createViewer(
         return { type: "none" };
       }
       if (matchesKey(data, "/") && state.mode !== "select") {
+        switchMarkdownToRaw();
         setMode("search");
         return { type: "none" };
       }
@@ -474,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;