github-search-cli 9.7.0 → 9.8.0

package/src/update-check.ts

@@ -5,12 +5,13 @@
  * Persists check state in the XDG state dir via storage.ts.
  */
 import { readJSON, writeJSON, debugLog } from "./storage";
-import { stateDir } from "./config";
-import { readFileSync } from "fs";
-import { join, dirname } from "path";
-import { fileURLToPath } from "url";
+import { readFileSync } from "node:fs";
+import { join, dirname, posix } from "node:path";
+import { fileURLToPath } from "node:url";
 
 const REGISTRY_URL = "https://registry.npmjs.org/github-search-cli/latest";
+// The npm package name is `github-search-cli`; `ghfind` is the bin name.
+const PKG_NAME = "github-search-cli";
 const CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours
 const REQUEST_TIMEOUT_MS = 5000;
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -147,39 +148,100 @@ export function suppressUpdateNotices(): void {
 }
 
 /**
- * Attempt to update ghfind in-place.
- * Uses `process.versions.bun` for reliable runtime detection (works on all platforms).
+ * Where the running install lives and which package manager owns it.
+ *
+ * Detection walks up from the package dir to its `node_modules` ancestor:
+ * - npm global install: `<prefix>/node_modules/<pkg>` (Windows) or
+ *   `<prefix>/lib/node_modules/<pkg>` (Unix)
+ * - Bun global install: `<bun-home>/install/global/node_modules/<pkg>`
+ * - Anything else (compiled binary, `bunx`/`npx` cache edges, dev checkout
+ *   without a `node_modules` ancestor): `null` — self-update is refused
+ *   rather than npm-installing a copy the user isn't running.
+ */
+export interface InstallLocation {
+  channel: "npm" | "bun";
+  /** npm prefix that owns the running install (npm channel only). */
+  prefix?: string;
+}
+
+/**
+ * Detect the install channel and owning npm prefix for a package directory.
+ * Separators are normalized so layouts match regardless of the host OS.
  */
-export async function performUpdate(): Promise<boolean> {
-  // The npm package name is `github-search-cli`; `ghfind` is the bin name.
-  const pkg = "github-search-cli";
-  const isBun =
-    typeof process.versions !== "undefined" && "bun" in process.versions;
-  const cmd = isBun
-    ? ["bun", "install", "-g", pkg]
-    : ["npm", "install", "-g", pkg];
+export function detectInstallLocation(pkgDir: string): InstallLocation | null {
+  const norm = pkgDir.split("\\").join("/");
+  const nodeModules = posix.dirname(norm);
+  if (posix.basename(nodeModules) !== "node_modules") return null;
+  const owner = posix.dirname(nodeModules);
+  // Bun's global root is ~/.bun by default (BUN_INSTALL override may rename
+  // it, but the default layout is what `bun install -g` produces for the
+  // overwhelming majority of installs).
+  if (/(^|\/)\.bun(\/|$)/.test(owner)) return { channel: "bun" };
+  // Unix npm global layout nests one level deeper: <prefix>/lib/node_modules
+  const prefix = posix.basename(owner) === "lib" ? posix.dirname(owner) : owner;
+  return { channel: "npm", prefix };
+}
+
+/**
+ * Build the install command for an update, targeting the npm prefix that
+ * owns the running install. Under Bun this must NOT be `bun install -g`:
+ * that writes to Bun's own global dir, leaving the running npm copy stale
+ * while still exiting 0.
+ */
+export function buildUpdateCommand(loc: InstallLocation): string[] {
+  if (loc.channel === "bun") return ["bun", "install", "-g", PKG_NAME];
+  const args = ["npm", "install", "-g"];
+  if (loc.prefix) args.push("--prefix", loc.prefix);
+  args.push(PKG_NAME);
+  return args;
+}
+
+/** Minimal quoting for win32 spawns, which go through a shell. */
+function quoteWin32(arg: string): string {
+  return /\s/.test(arg) ? `"${arg}"` : arg;
+}
 
+/**
+ * Attempt to update ghfind in-place.
+ *
+ * Runs the install command through `node:child_process` on every runtime
+ * (works under Bun and Node alike; on Windows npm is `npm.cmd`, which needs
+ * `shell: true` to resolve). Always returns a definitive boolean — the TUI
+ * surfaces false as "Update failed".
+ */
+export async function performUpdate(
+  location: InstallLocation | null = detectInstallLocation(PKG_DIR),
+): Promise<boolean> {
+  if (!location) {
+    debugLog(
+      "Update skipped: the running install is not under a node_modules tree " +
+        "(compiled binary or dev checkout). Update it manually.",
+    );
+    return false;
+  }
+  const argv = buildUpdateCommand(location);
   try {
-    if (isBun) {
-      const proc = Bun.spawn(cmd, {
-        stdout: "pipe",
-        stderr: "pipe",
-      });
-      await proc.exited;
-      if (proc.exitCode !== 0) {
-        const err = await proc.stderr.text();
-        debugLog(`Install failed (code ${proc.exitCode}): ${err}`);
-      }
-      return proc.exitCode === 0;
-    }
-    // Node fallback
-    const { spawn } = await import("child_process");
-    return await new Promise<boolean>((resolve) => {
-      const proc = spawn(cmd[0], cmd.slice(1), { stdio: "ignore" });
-      proc.on("close", (code) => resolve(code === 0));
-      proc.on("error", () => resolve(false));
+    const { spawn } = await import("node:child_process");
+    const useShell = process.platform === "win32";
+    const proc = spawn(
+      argv[0],
+      useShell ? argv.slice(1).map(quoteWin32) : argv.slice(1),
+      { stdio: ["ignore", "ignore", "pipe"], shell: useShell },
+    );
+    let stderr = "";
+    proc.stderr?.on("data", (chunk: Buffer) => {
+      stderr += String(chunk);
     });
-  } catch {
+    const code = await new Promise<number | null>((resolve) => {
+      proc.on("close", (c) => resolve(c));
+      proc.on("error", () => resolve(-1));
+    });
+    if (code !== 0) {
+      debugLog(`Install failed (code ${code}): ${stderr.trim()}`);
+    }
+    return code === 0;
+  } catch (e) {
+    debugLog(`Update failed: ${e instanceof Error ? e.message : String(e)}`);
     return false;
   }
 }
@@ -215,7 +277,7 @@ export function fetchReleaseNotes(version: string): string | null {
     const changelogPath = join(PKG_DIR, "CHANGELOG.md");
     const changelog = readFileSync(changelogPath, "utf-8");
     // ponytail: find "## [version]" header, slice until next "## "
-    const header = "## [" + version + "]";
+    const header = `## [${version}]`;
     const start = changelog.indexOf(header);
     if (start === -1) return null;
     const bodyStart = start + header.length;

package/src/version.ts

@@ -6,9 +6,9 @@
  * standalone single-file binaries where package.json is not present.
  * Fallback: read package.json relative to this module (source / dist trees).
  */
-import { readFileSync } from "fs";
-import { join, dirname } from "path";
-import { fileURLToPath } from "url";
+import { readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 
 declare const __GHFIND_VERSION__: string | undefined;
 

package/src/watch.ts

@@ -2,7 +2,7 @@
  * Watch mode — periodically re-run a search and show changes.
  *
  */
-import type { ParsedQuery, SearchOptions, Repo } from "./types";
+import type { SearchOptions, Repo } from "./types";
 import {
   parseQuery,
   applyFlagFilters,

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++) {
-    let 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");
-}