github-search-cli 9.6.0 → 9.7.1

package/src/tui.ts

@@ -38,6 +38,8 @@ import type {
   SortStrategy,
   Package,
   SessionState,
+  HistoryEntry,
+  SavedSearch,
 } from "./types";
 import { fetchOrgProfile, type OrgProfile } from "./org";
 import {
@@ -54,13 +56,7 @@ import {
 import { tabSince, TAB_NAMES, fmtStars } from "./trending";
 import { loadConfig, saveConfig } from "./config";
 import { buildHelpSections, HELP_KEYS_COLUMN } from "./help";
-import {
-  SearchCliError,
-  NetworkError,
-  RateLimitError,
-  BadQueryError,
-  NoResultsError,
-} from "./errors";
+import { SearchCliError, NoResultsError } from "./errors";
 import {
   appendHistory,
   readHistory,
@@ -68,12 +64,7 @@ import {
   clearHistory,
   rotateHistory,
 } from "./history";
-import {
-  getBookmarks,
-  isBookmarked,
-  toggleBookmark,
-  removeBookmark,
-} from "./bookmarks";
+import { getBookmarks, toggleBookmark, removeBookmark } from "./bookmarks";
 import {
   getSavedSearches,
   saveSearch,
@@ -84,7 +75,7 @@ import { saveSession, restoreSession } from "./session";
 import { fetchDeepDive, buildDeepDiveText } from "./deepdive";
 import { buildComparisonTable } from "./compare";
 import { renderMarkdown } from "./markdown-render";
-import { fetchTopics, type TopicItem } from "./explore";
+import { fetchTopics } from "./explore";
 import { exportToFile, type ExportFormat } from "./output";
 import {
   listThemes,
@@ -269,8 +260,8 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
   let currentPage = 1;
   let totalCount = 0;
   let deepDiveActive = false;
-  let compareList: Repo[] = [];
-  let quitArmed = false;
+  const compareList: Repo[] = [];
+  const _quitArmed = false;
 
   const header = new TextRenderable(renderer, {
     content:
@@ -1259,7 +1250,8 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
   function popMenuLevel(): boolean {
     if (menuStack.length <= 1) return false;
     const prev = menuStack[menuStack.length - 2];
-    const current = menuStack.pop()!;
+    const current = menuStack.pop();
+    if (!current) return false;
     leaderSelect.options = prev.entries.map((e) => ({
       name:
         e.type === "category" ? `  ${e.icon} ${e.name} \u2192` : `  ${e.name}`,
@@ -1283,7 +1275,10 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
   function buildMenuHierarchy(): MenuCategory[] {
     const hasRepo = (() => {
       const opt = resultsSelect.getSelectedOption();
-      return opt?.value && typeof (opt.value as any)?.fullName === "string";
+      return (
+        opt?.value &&
+        typeof (opt.value as { fullName?: unknown })?.fullName === "string"
+      );
     })();
 
     const groups: MenuCategory[] = [];
@@ -1694,7 +1689,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     if (currentQueryInput) {
       const name =
         currentQueryInput.length > 40
-          ? currentQueryInput.slice(0, 37) + "..."
+          ? `${currentQueryInput.slice(0, 37)}...`
           : currentQueryInput;
       saveSearch(
         name,
@@ -1925,16 +1920,11 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     statusBar.content = ` ${text}`;
     renderer.requestRender();
   });
-
-  // ── Startup tip ──
-  if (config.theme !== undefined || true) {
-    // Show a tip after 2s idle
-    setTimeout(() => {
-      if (currentOverlay === "none") {
-        setStatus(nextTip());
-      }
-    }, 2000);
-  }
+  setTimeout(() => {
+    if (currentOverlay === "none") {
+      setStatus(nextTip());
+    }
+  }, 2000);
 
   // ── Helper functions ────────────────────────────────────────────────
 
@@ -2097,7 +2087,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
           val >= 1000
             ? `${(val / 1000).toFixed(1).replace(/\.0$/, "")}k`
             : String(val);
-        label = label.padStart(5) + " ";
+        label = `${label.padStart(5)} `;
       }
       lines.push(`${label}┆${chars.join("")}`);
     }
@@ -2624,7 +2614,8 @@ ${pack.description ?? ""}`;
         if (key.name === "d") {
           const sel = historySelect.getSelectedOption();
           if (sel?.value) {
-            deleteHistoryEntry((sel.value as any).index);
+            const idx = (sel.value as { index?: number }).index;
+            if (idx !== undefined) deleteHistoryEntry(idx);
             refreshHistory();
             setStatus("Deleted history entry");
           }
@@ -2641,8 +2632,9 @@ ${pack.description ?? ""}`;
         if (key.name === "enter" || key.name === "return") {
           const sel = historySelect.getSelectedOption();
           if (sel?.value) {
-            const entry = (sel.value as any).entry;
+            const entry = (sel.value as { entry?: HistoryEntry }).entry;
             showOverlay("none");
+            if (!entry) return;
             if (entry.mode === "trending") {
               if (entry.tab)
                 trendingTab = entry.tab as (typeof TAB_NAMES)[number];
@@ -2663,7 +2655,10 @@ ${pack.description ?? ""}`;
         if (key.name === "d") {
           const sel = bookmarksSelect.getSelectedOption();
           if (sel?.value) {
-            removeBookmark((sel.value as any).repo.fullName);
+            removeBookmark(
+              (sel.value as { repo?: { fullName: string } }).repo?.fullName ??
+                "",
+            );
             refreshBookmarks();
             setStatus("Bookmark removed");
           }
@@ -2672,7 +2667,8 @@ ${pack.description ?? ""}`;
         }
         if (key.name === "enter" || key.name === "return") {
           const sel = bookmarksSelect.getSelectedOption();
-          if (sel?.value) openUrl((sel.value as any).repo.url);
+          if (sel?.value)
+            openUrl((sel.value as { repo?: { url?: string } }).repo?.url ?? "");
           return;
         }
         return;
@@ -2683,7 +2679,7 @@ ${pack.description ?? ""}`;
         if (key.name === "d") {
           const sel = savedSelect.getSelectedOption();
           if (sel?.value) {
-            deleteSavedSearch((sel.value as any).name);
+            deleteSavedSearch((sel.value as { name?: string }).name ?? "");
             refreshSavedSearches();
             setStatus("Saved search deleted");
           }
@@ -2693,7 +2689,7 @@ ${pack.description ?? ""}`;
         if (key.name === "enter" || key.name === "return") {
           const sel = savedSelect.getSelectedOption();
           if (sel?.value) {
-            const s = sel.value as any;
+            const s = sel.value as SavedSearch;
             showOverlay("none");
             touchSavedSearch(s.name);
             if (s.mode === "trending") {
@@ -2718,9 +2714,9 @@ ${pack.description ?? ""}`;
         if (key.name === "enter" || key.name === "return") {
           const sel = topicsSelect.getSelectedOption();
           if (sel?.value) {
-            const topic = sel.value as any;
+            const topic = sel.value as { name?: string };
             showOverlay("none");
-            searchInput.value = `topic:${topic.name}`;
+            searchInput.value = `topic:${topic.name ?? ""}`;
             showSearchMode();
             doSearch(`topic:${topic.name}`);
           }
@@ -2973,7 +2969,7 @@ ${pack.description ?? ""}`;
     // Number keys 1-5 switch trending tabs (only in trending mode)
     if (/^[1-5]$/.test(key.name)) {
       if (currentMode === "trending") {
-        const idx = parseInt(key.name) - 1;
+        const idx = parseInt(key.name, 10) - 1;
         if (idx >= 0 && idx < TAB_NAMES.length) {
           trendingTab = TAB_NAMES[idx];
           loadTrending();
@@ -3025,16 +3021,16 @@ ${pack.description ?? ""}`;
   });
 
   // ── Update check (before start) ──────────────────────────────────────
-  const currentVersion = getVersion();
+  const _currentVersion = getVersion();
   // ── Start ──────────────────────────────────────────────────────────
   // Check for updates (non-blocking — doesn't delay TUI startup)
-  if (!session || !session.mode) {
+  if (!session?.mode) {
     showLanding(true);
   }
   checkForUpdateAndShow();
   checkPostUpgradePanel();
   renderer.start();
-  if (session && session.mode) {
+  if (session?.mode) {
     if (currentMode === "trending") {
       loadTrending();
     } else {

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,