github-search-cli 9.7.1 → 9.8.0

package/src/tui.ts

@@ -74,7 +74,8 @@ import {
 import { saveSession, restoreSession } from "./session";
 import { fetchDeepDive, buildDeepDiveText } from "./deepdive";
 import { buildComparisonTable } from "./compare";
-import { renderMarkdown } from "./markdown-render";
+import { createMarkdownView } from "./markdown-view";
+import { fetchImageBytes, readmeBaseUrl } from "./image-loader";
 import { fetchTopics } from "./explore";
 import { exportToFile, type ExportFormat } from "./output";
 import {
@@ -1079,12 +1080,22 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     paddingLeft: 2,
     paddingRight: 2,
   });
-  const updateText = new TextRenderable(renderer, {
+  // Version header only — the release notes below it are rendered markdown.
+  const updateHeader = new TextRenderable(renderer, {
     content: "",
     fg: colors.accent,
     bg: colors.surfaceDim,
   });
-  // ponytail: notes render as plain text with \n; keep it a column so lines stack
+  const updateNotes = createMarkdownView({
+    renderer,
+    colors,
+    // Notes ship with the release and are mostly prose/lists; skip the
+    // image pipeline in this narrow panel.
+    images: false,
+    background: colors.surfaceDim,
+  });
+  // ponytail: the notes are markdown now; keep the content a column so
+  // blocks stack and the scroll box can measure them.
   const updateScroll = new ScrollBoxRenderable(renderer, {
     flexGrow: 1,
     backgroundColor: colors.surfaceDim,
@@ -1187,7 +1198,8 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     paddingX: 1,
   });
   updateBox.add(updateScroll);
-  updateScroll.add(updateText);
+  updateScroll.add(updateHeader);
+  updateScroll.add(updateNotes.renderable);
   updateBox.add(updateOptionsRow);
   updateBox.add(updateFooter);
   root.add(updateDim);
@@ -1597,17 +1609,11 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     if (state.lastInstalledVersion === currentVersion) return;
     // We just upgraded — show notes for the new version
     const notes = fetchReleaseNotes(currentVersion);
-    // Box is 55% of the terminal; subtract border + padding so wrapped
-    // lines never clip horizontally.
-    const notesWidth = Math.max(
-      30,
-      Math.floor((process.stdout.columns || 80) * 0.55) - 8,
-    );
-    const notesBlock = notes
-      ? renderMarkdown(notes, { width: notesWidth })
-      : "  No release notes found for this version.";
     updateSelectedOption = 0;
-    updateText.content = `  Updated ghfind ${state.lastInstalledVersion} → ${currentVersion}\n\n${notesBlock}`;
+    updateHeader.content = `  Updated ghfind ${state.lastInstalledVersion} → ${currentVersion}\n`;
+    updateNotes.setContent(
+      notes ?? "_No release notes found for this version._",
+    );
     renderUpdateOptions();
     showOverlay("update");
   }
@@ -1625,14 +1631,8 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     if (latest) {
       updateSelectedOption = 0;
       const notes = fetchReleaseNotes(latest);
-      const notesWidth = Math.max(
-        30,
-        Math.floor((process.stdout.columns || 80) * 0.55) - 8,
-      );
-      const notesBlock = notes
-        ? renderMarkdown(notes, { width: notesWidth })
-        : `  A new version is available\n\n  Current: ${currentVersion}\n  Latest:   ${latest}\n\n  Run "npm install -g ghfind"`;
-      updateText.content = `  A new version is available\n\n  Current: ${currentVersion}\n  Latest:   ${latest}\n\n${notesBlock}`;
+      updateHeader.content = `  A new version is available\n\n  Current: ${currentVersion}\n  Latest:   ${latest}\n`;
+      updateNotes.setContent(notes ?? "Run `npm install -g ghfind` to update.");
       renderUpdateOptions();
       showOverlay("update");
     } else {
@@ -1852,15 +1852,22 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
       },
     },
   });
-  const readmeText = new TextRenderable(renderer, {
-    content: "",
-    fg: colors.text,
-    bg: colors.bg,
+  // Full markdown rendering (headings, tables, code, inline images).
+  const readmeView = createMarkdownView({
+    renderer,
+    colors,
+    loadImage: (url) => fetchImageBytes(url, { token: githubToken }),
+    getImageWidth: () => Math.max(24, (process.stdout.columns || 80) - 12),
   });
-  readmeScroll.add(readmeText);
+  readmeScroll.add(readmeView.renderable);
   readmeBox.add(readmeScroll);
+
+  const readmeFooterText = () =>
+    `  ↑↓/jk scroll  PgUp/PgDn page  i images: ${
+      readmeView.imagesEnabled ? "on" : "off"
+    }  Esc/q close`;
   const readmeFooter = new TextRenderable(renderer, {
-    content: "  ↑↓/jk scroll  Esc/q close",
+    content: readmeFooterText(),
     fg: colors.muted,
     bg: colors.bg,
     height: 1,
@@ -1876,33 +1883,36 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
       setStatus("No repo selected");
       return;
     }
-    readmeText.content = `  Loading README for ${repo.fullName}...`;
+    readmeView.setContent(`Loading README for ${repo.fullName}…`);
+    readmeFooter.content = readmeFooterText();
+    readmeScroll.scrollTop = 0;
     showOverlay("readme");
     try {
       const headers: Record<string, string> = { "User-Agent": "ghfind/1.0" };
       if (githubToken) headers.Authorization = `Bearer ${githubToken}`;
       let text = "";
-      for (const path of [
-        `${repo.owner}/${repo.name}/main/README.md`,
-        `${repo.owner}/${repo.name}/master/README.md`,
-        `${repo.owner}/${repo.name}/main/README.rst`,
-      ]) {
-        const r = await fetch(`https://raw.githubusercontent.com/${path}`, {
-          headers,
-        });
+      let sourceUrl = "";
+      for (const [branch, file] of [
+        ["main", "README.md"],
+        ["master", "README.md"],
+        ["main", "README.rst"],
+      ] as const) {
+        // The README's own URL doubles as the base for relative image paths.
+        const url = readmeBaseUrl(repo.owner, repo.name, branch, file);
+        const r = await fetch(url, { headers });
         if (r.ok) {
           text = await r.text();
+          sourceUrl = url;
           break;
         }
       }
       if (!text) {
-        readmeText.content = `  (no README found for ${repo.fullName})`;
+        readmeView.setContent(`_(no README found for ${repo.fullName})_`);
       } else {
-        const termW = Math.max(40, (process.stdout.columns || 80) - 4);
-        readmeText.content = renderMarkdown(text, { width: termW });
+        readmeView.setContent(text, sourceUrl);
       }
     } catch {
-      readmeText.content = "  Failed to load README";
+      readmeView.setContent("_Failed to load README._");
     }
     renderer.requestRender();
   }
@@ -2505,6 +2515,24 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     }
   });
 
+  // Pasted content flows through "input"; purge JSON-shaped blobs that
+  // slipped into the query (a search line is never raw JSON: objects/arrays
+  // always arrive as paste payloads from API responses / deep-dive output).
+  searchInput.on("input", () => {
+    const v = searchInput.value;
+    if (v.length > 0) {
+      const t = v.trim();
+      if (
+        (t.startsWith("{") && t.endsWith("}")) ||
+        (t.startsWith("[") && t.endsWith("]"))
+      ) {
+        searchInput.value = "";
+        setStatus("Ignored JSON paste — search queries accept plain text");
+        renderer.requestRender();
+      }
+    }
+  });
+
   // Navigate results → update detail pane
   resultsSelect.on("selectionChanged", () => {
     const opt = resultsSelect.getSelectedOption();
@@ -2606,6 +2634,14 @@ ${pack.description ?? ""}`;
 
       // README viewer: scrollable, Esc/q already handled above
       if (currentOverlay === "readme") {
+        if (key.name === "i") {
+          readmeView.setImagesEnabled(!readmeView.imagesEnabled);
+          readmeFooter.content = readmeFooterText();
+          setStatus(
+            readmeView.imagesEnabled ? "README images on" : "README images off",
+          );
+          renderer.requestRender();
+        }
         return;
       }
 

package/src/markdown-render.ts

@@ -1,211 +0,0 @@
-/**
- * Minimal markdown-to-terminal-text renderer.
- *
- * Renders headings, code blocks, lists, tables, blockquotes, horizontal rules,
- * bold/italic, and links into a plain-text representation suitable for a
- * TextRenderable in the TUI.
- */
-
-interface RenderOptions {
-  /** Terminal width for wrapping and table layout. Default: 80. */
-  width?: number;
-}
-
-/** Render markdown text to terminal-friendly plain text. */
-export function renderMarkdown(md: string, opts: RenderOptions = {}): string {
-  const width = opts.width ?? 80;
-  const lines = md.split("\n");
-  const out: string[] = [];
-  let inCodeBlock = false;
-  let codeLang = "";
-  let codeLines: string[] = [];
-  let inTable = false;
-  let tableRows: string[][] = [];
-
-  function flushCode() {
-    if (codeLines.length === 0) return;
-    const maxLen = Math.max(...codeLines.map((l) => l.length), codeLang.length);
-    const barW = Math.min(maxLen + 4, width - 2);
-    out.push(`┌${"─".repeat(barW)}┐`);
-    if (codeLang) out.push(`│ ${codeLang.padEnd(barW - 1)}│`);
-    for (const cl of codeLines) {
-      out.push(`│ ${cl.padEnd(barW - 1)}│`);
-    }
-    out.push(`└${"─".repeat(barW)}┘`);
-    out.push("");
-    codeLines = [];
-    codeLang = "";
-  }
-
-  function flushTable() {
-    if (tableRows.length === 0) return;
-    const dataRows = tableRows.filter(
-      (r) => !r.every((c) => /^[\s\-:|]+$/.test(c)),
-    );
-    if (dataRows.length === 0) {
-      tableRows = [];
-      return;
-    }
-    const colCount = Math.max(...dataRows.map((r) => r.length));
-    const colW: number[] = [];
-    for (let ci = 0; ci < colCount; ci++) {
-      colW.push(Math.max(3, ...dataRows.map((r) => (r[ci] ?? "").length)));
-    }
-    const totalW = colW.reduce((a, b) => a + b, 0) + colCount * 3 - 1;
-    if (totalW > width) {
-      for (const row of dataRows) {
-        out.push(`  ${row.map((c) => c.trim()).join(" │ ")}`);
-      }
-    } else {
-      const sep = `┌${colW.map((w) => "─".repeat(w + 2)).join("┬")}┐`;
-      const mid = `├${colW.map((w) => "─".repeat(w + 2)).join("┼")}┤`;
-      const end = `└${colW.map((w) => "─".repeat(w + 2)).join("┴")}┘`;
-      out.push(sep);
-      dataRows.forEach((row, i) => {
-        const cells = colW.map((w, ci) => (row[ci] ?? "").trim().padEnd(w));
-        out.push(`│ ${cells.map((c) => ` ${c} `).join("│")}│`);
-        if (i === 0) out.push(mid);
-      });
-      out.push(end);
-    }
-    out.push("");
-    tableRows = [];
-  }
-
-  function renderInline(line: string): string {
-    // Bold
-    line = line.replace(/\*\*(.+?)\*\*/g, "$1");
-    // Italic (no asterisks)
-    line = line.replace(/\*([^*]+?)\*/g, "$1");
-    // Inline code
-    line = line.replace(/`([^`]+)`/g, "⟨$1⟩");
-    // Links [text](url)
-    line = line.replace(/\[([^\]]+)\]\(([^)]+)\)/g, "$1 ($2)");
-    // Images
-    line = line.replace(/!\[([^\]]*)\]\([^)]+\)/g, "🖼 $1");
-    return line;
-  }
-
-  function wrapLine(line: string, maxW: number): string[] {
-    if (line.length <= maxW) return [line];
-    const parts: string[] = [];
-    let remaining = line;
-    while (remaining.length > maxW) {
-      let breakAt = maxW;
-      const spaceIdx = remaining.lastIndexOf(" ", maxW);
-      if (spaceIdx > maxW / 2) breakAt = spaceIdx;
-      parts.push(remaining.slice(0, breakAt));
-      remaining = remaining.slice(breakAt).replace(/^ /, "");
-    }
-    if (remaining) parts.push(remaining);
-    return parts;
-  }
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-
-    // Code block boundaries
-    if (/^```/.test(line)) {
-      if (inCodeBlock) {
-        flushCode();
-        inCodeBlock = false;
-      } else {
-        inCodeBlock = true;
-        codeLang = line.slice(3).trim();
-      }
-      continue;
-    }
-    if (inCodeBlock) {
-      codeLines.push(line);
-      continue;
-    }
-
-    // Table row
-    if (line.includes("|")) {
-      const cells = line
-        .split("|")
-        .map((c) => c.trim())
-        .filter((_, idx, arr) => idx > 0 && idx < arr.length - 1);
-      if (cells.length >= 2) {
-        inTable = true;
-        tableRows.push(cells);
-        continue;
-      }
-    } else if (inTable) {
-      flushTable();
-      inTable = false;
-    }
-
-    // Horizontal rule
-    if (/^(\s*[-*_]){3,}\s*$/.test(line)) {
-      out.push("─".repeat(Math.min(width, 40)));
-      out.push("");
-      continue;
-    }
-
-    // Headings
-    const headingMatch = line.match(/^(#{1,6})\s+(.+)/);
-    if (headingMatch) {
-      const level = headingMatch[1].length;
-      const text = renderInline(headingMatch[2]);
-      const prefix = "█ ".repeat(level);
-      out.push("");
-      out.push(prefix + text);
-      out.push("");
-      continue;
-    }
-
-    // Blockquote
-    const bqMatch = line.match(/^>\s?(.*)/);
-    if (bqMatch) {
-      const inner = renderInline(bqMatch[1]);
-      for (const wl of wrapLine(inner, width - 4)) {
-        out.push(`│ ${wl}`);
-      }
-      continue;
-    }
-
-    // Unordered list
-    const ulMatch = line.match(/^(\s*)[-*+]\s+(.*)/);
-    if (ulMatch) {
-      const indent = ulMatch[1].length;
-      const depth = Math.floor(indent / 2);
-      const prefix = `${"  ".repeat(depth)}• `;
-      const inner = renderInline(ulMatch[2]);
-      for (const wl of wrapLine(inner, width - prefix.length)) {
-        out.push(prefix + wl);
-      }
-      continue;
-    }
-
-    // Ordered list
-    const olMatch = line.match(/^(\s*)\d+\.\s+(.*)/);
-    if (olMatch) {
-      const indent = olMatch[1].length;
-      const depth = Math.floor(indent / 2);
-      const prefix = `${"  ".repeat(depth)}◦ `;
-      const inner = renderInline(olMatch[2]);
-      for (const wl of wrapLine(inner, width - prefix.length)) {
-        out.push(prefix + wl);
-      }
-      continue;
-    }
-
-    // Empty line
-    if (line.trim() === "") {
-      out.push("");
-      continue;
-    }
-
-    // Paragraph
-    const rendered = renderInline(line);
-    for (const wl of wrapLine(rendered, width)) {
-      out.push(wl);
-    }
-  }
-
-  if (inCodeBlock) flushCode();
-  if (inTable) flushTable();
-
-  return out.join("\n");
-}