github-search-cli 9.8.1 → 9.8.3

package/src/tui.ts

@@ -56,7 +56,14 @@ import {
 import { tabSince, TAB_NAMES, fmtStars } from "./trending";
 import { loadConfig, saveConfig } from "./config";
 import { buildHelpSections, HELP_KEYS_COLUMN } from "./help";
-import { SearchCliError, NoResultsError } from "./errors";
+import {
+  SearchCliError,
+  NoResultsError,
+  NetworkError,
+  RateLimitError,
+  AuthError,
+  ForbiddenError,
+} from "./errors";
 import {
   appendHistory,
   readHistory,
@@ -204,7 +211,10 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
 
   // ── Config ──
   const config = loadConfig();
-  const githubToken = config.githubToken || process.env.GITHUB_TOKEN;
+  // Mutable: the AuthError flow lets the user fix or clear the token without
+  // restarting (the next search re-reads this variable).
+  let githubToken: string | undefined =
+    config.githubToken || process.env.GITHUB_TOKEN;
 
   // Apply theme
   const theme = loadTheme(theme_override || config.theme);
@@ -438,6 +448,11 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
         currentMode = "search";
         showLanding(false);
         showSearchMode();
+        // Restore the saved query (if any) as a prefill, never auto-run it.
+        if (currentQueryInput) {
+          searchInput.value = currentQueryInput;
+          renderer.requestRender();
+        }
       },
     },
     {
@@ -1891,6 +1906,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     try {
       const readme = await fetchReadme(repo.owner, repo.name, {
         token: githubToken,
+        private: repo.private,
       });
       if (readme) {
         readmeView.setContent(readme.text, readme.sourceUrl);
@@ -1922,12 +1938,125 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     }
   }, 2000);
 
+  // ── Token fix flow (from 401/403 error hints) ───────────────────────
+  // Inline prompt box that slides over the search input row. Enter saves the
+  // token to config and re-runs the failed query; Esc cancels.
+  const tokenPromptBox = new BoxRenderable(renderer, {
+    visible: false,
+    position: "absolute",
+    top: 0,
+    left: 0,
+    width: "100%",
+    flexDirection: "row",
+    paddingY: 1,
+    paddingLeft: 1,
+    backgroundColor: colors.surface,
+  });
+  const tokenPromptLabel = new TextRenderable(renderer, {
+    content: " GitHub token:",
+    fg: colors.accent,
+    height: 1,
+  });
+  const tokenPromptInput = new InputRenderable(renderer, {
+    placeholder: "paste token, Enter to save — Esc cancels",
+    value: "",
+    backgroundColor: colors.surface,
+    textColor: colors.text,
+    flexGrow: 1,
+  });
+  tokenPromptBox.add(tokenPromptLabel);
+  tokenPromptBox.add(tokenPromptInput);
+  root.add(tokenPromptBox);
+
+  let tokenPromptQuery: string | null = null;
+
+  function showTokenPrompt(query: string) {
+    tokenPromptQuery = query;
+    tokenPromptInput.value = "";
+    tokenPromptBox.visible = true;
+    searchBox.visible = false;
+    tokenPromptInput.focus();
+    renderer.requestRender();
+  }
+
+  function hideTokenPrompt() {
+    tokenPromptBox.visible = false;
+    tokenPromptQuery = null;
+    if (currentMode === "search" || currentMode === "packages") {
+      searchBox.visible = true;
+      searchInput.focus();
+    }
+    renderer.requestRender();
+  }
+
+  function persistToken(token: string): void {
+    githubToken = token;
+    config.githubToken = token;
+    saveConfig(config);
+  }
+
+  tokenPromptInput.on("enter", () => {
+    const token = tokenPromptInput.value.trim();
+    const query = tokenPromptQuery;
+    hideTokenPrompt();
+    if (!token || !query) return;
+    persistToken(token);
+    setStatus("Token saved");
+    doSearch(query);
+  });
+
+  // ── Error-hint key actions ([t] fix token, [u] unset) ──────────────
+
+  function fixTokenAction() {
+    showTokenPrompt(currentQueryInput || "stars:>10000");
+  }
+
+  function unsetTokenAction() {
+    githubToken = undefined;
+    if (config.githubToken) {
+      delete config.githubToken;
+      saveConfig(config);
+    }
+    setStatus("Token cleared — searching without one");
+    if (currentQueryInput) doSearch(currentQueryInput);
+  }
+
   // ── Helper functions ────────────────────────────────────────────────
 
   function setStatus(msg: string) {
     statusMgr.set("idle", msg);
   }
 
+  /**
+   * Which error family is showing in the status bar, for the bracketed key
+   * hints the messages advertise ([r]etry, [t]/[c] token, [u]nset).
+   * Null once the next search starts, so the hint keys can't hijack
+   * theme/compare forever after a transient failure.
+   */
+  type ErrorHintKind = "auth" | "forbidden" | "ratelimit" | "network" | null;
+  let errorHint: ErrorHintKind = null;
+
+  /** Render an error in the status bar and remember which hints apply. */
+  function reportError(err: unknown) {
+    errorHint =
+      err instanceof AuthError
+        ? "auth"
+        : err instanceof ForbiddenError
+          ? "forbidden"
+          : err instanceof RateLimitError
+            ? "ratelimit"
+            : err instanceof NetworkError
+              ? "network"
+              : null;
+    const msg =
+      err instanceof SearchCliError
+        ? err.userMessage
+        : err instanceof Error
+          ? err.message
+          : String(err);
+    statusMgr.set("error", msg.slice(0, 60));
+  }
+
   /** Session snapshot; only restorable modes are persisted (see SessionState). */
   function buildSessionState(): SessionState {
     const mode: SessionState["mode"] =
@@ -2221,6 +2350,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
   async function loadTrending() {
     currentMode = "trending";
     isLoading = true;
+    errorHint = null;
     searchBox.visible = false;
     toolbarText.visible = false;
     trendingTabBox.visible = true;
@@ -2276,16 +2406,10 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
         resultCount: fetched.length,
       });
     } catch (err) {
-      const msg =
-        err instanceof SearchCliError
-          ? err.userMessage
-          : err instanceof Error
-            ? err.message
-            : String(err);
       resultsSelect.options = [
         { name: " (error)", description: "", value: null },
       ];
-      statusMgr.set("error", msg.slice(0, 60));
+      reportError(err);
     }
     isLoading = false;
     renderer.requestRender();
@@ -2328,6 +2452,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     if (q === "" || isLoading) return;
     currentQueryInput = q;
     isLoading = true;
+    errorHint = null; // npm errors never carry GitHub auth hints
     resultsSelect.options = [
       { name: "  Searching packages...", description: "", value: null },
     ];
@@ -2366,6 +2491,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     const q = queryText.trim();
     if (q === "" || isLoading) return;
 
+    errorHint = null; // a fresh search retires the previous error's hint keys
     if (!append) currentPage = 1;
     deepDiveActive = false;
 
@@ -2426,17 +2552,14 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
         }
       }
     } catch (err) {
-      currentRepos = [];
-      resultsSelect.options = [
-        { name: " (error)", description: "", value: null },
-      ];
-      const msg =
-        err instanceof SearchCliError
-          ? err.userMessage
-          : err instanceof Error
-            ? err.message
-            : String(err);
-      statusMgr.set("error", msg.slice(0, 60));
+      // A failed "load more" page must not wipe the pages already on screen.
+      if (!append) {
+        currentRepos = [];
+        resultsSelect.options = [
+          { name: " (error)", description: "", value: null },
+        ];
+      }
+      reportError(err);
     }
 
     isLoading = false;
@@ -2554,6 +2677,18 @@ ${pack.description ?? ""}`;
 
   // ── Global keyboard shortcuts ──────────────────────────────────────
   renderer.keyInput.on("keypress", (key) => {
+    // ── Token prompt (own keyboard scope) ──────────────────────────
+    if (tokenPromptBox.visible) {
+      if (key.name === "escape") {
+        hideTokenPrompt();
+        setStatus("Token entry cancelled");
+        renderer.requestRender();
+        return;
+      }
+      if (key.name === "enter" || key.name === "return") return; // InputRenderable fires "enter"
+      return; // let the input consume everything else (letters, paste, etc.)
+    }
+
     // ── Overlay-mode handling ────────────────────────────────────────
     if (currentOverlay !== "none") {
       // Escape or q closes any overlay (except: leader uses Esc for back-nav, q to close)
@@ -2926,6 +3061,34 @@ ${pack.description ?? ""}`;
       return;
     }
 
+    // Error-hint keys — active only while a status-bar error that advertises
+    // them ([r]etry / [t]oken / [u]nset / [c]ycle) is on screen; the next
+    // search clears the state, returning t/c to their normal roles.
+    if (!searchInput.focused && errorHint) {
+      if (key.name === "r") {
+        errorHint = null;
+        if (currentMode === "trending") loadTrending();
+        else if (currentQueryInput) doSearch(currentQueryInput);
+        renderer.requestRender();
+        return;
+      }
+      if (
+        key.name === "t" &&
+        (errorHint === "auth" || errorHint === "forbidden")
+      ) {
+        fixTokenAction();
+        return;
+      }
+      if (key.name === "u" && errorHint === "auth") {
+        unsetTokenAction();
+        return;
+      }
+      if (key.name === "c" && errorHint === "ratelimit") {
+        fixTokenAction(); // TUI manages a single token — prompt for a different one
+        return;
+      }
+    }
+
     // 't' toggles theme and persists to config
     if (key.name === "t" && !searchInput.focused) {
       const current = config.theme;
@@ -3045,44 +3208,27 @@ ${pack.description ?? ""}`;
   // ── Update check (before start) ──────────────────────────────────────
   const _currentVersion = getVersion();
   // ── Start ──────────────────────────────────────────────────────────
-  // Check for updates (non-blocking — doesn't delay TUI startup)
-  if (!session?.mode) {
-    showLanding(true);
-  }
+  // Always start on the landing menu. Saved sessions restore preferences
+  // (sort/limit/trending tab) and pre-fill the query once a mode is picked,
+  // but never auto-run a search — a stale or corrupted session (e.g. an MCP
+  // handshake blob saved as a query) used to hijack startup and skip the
+  // menu on every launch.
+  showLanding(true);
   checkForUpdateAndShow();
   checkPostUpgradePanel();
   renderer.start();
-  if (session?.mode) {
-    if (currentMode === "trending") {
-      loadTrending();
-    } else {
-      searchInput.value = currentQueryInput;
-      if (currentQueryInput) {
-        doSearch(currentQueryInput);
-      } else {
-        showSearchMode();
-      }
-      searchInput.focus();
-    }
-  }
   renderer.requestRender();
 }
 
 // ── Utilities ─────────────────────────────────────────────────────────
 
 function formatResultLine(repo: Repo): string {
-  const stars = formatStars(repo.stars);
+  const stars = `★ ${fmtStars(repo.stars)}`;
   const lang = (repo.language ?? "?").padEnd(12).slice(0, 12);
   const name = repo.fullName.padEnd(40).slice(0, 40);
   return `${name}  ${lang}  ${stars}`;
 }
 
-function formatStars(n: number): string {
-  if (n >= 1000000) return `★ ${(n / 1000000).toFixed(1).replace(/\.0$/, "")}M`;
-  if (n >= 1000) return `★ ${(n / 1000).toFixed(1).replace(/\.0$/, "")}k`;
-  return `★ ${n}`;
-}
-
 function formatToolbar(
   sort: SortStrategy | PackageSortMode,
   limit: number,

package/src/user.ts

@@ -212,20 +212,21 @@ export async function fetchUserProfile(
   if (userPayload.public_repos > 0) {
     const perPage = Math.min(limit, 100);
     const maxPages = Math.ceil(limit / perPage);
-    for (let page = 1; page <= maxPages; page++) {
-      const url =
-        `https://api.github.com/users/${encodeURIComponent(name)}/repos` +
-        `?per_page=${perPage}&sort=pushed&page=${page}`;
-      const res = await fetch(url, { headers: apiHeaders(token) });
-      if (!res.ok) {
-        // User metadata succeeded; degraded summary beats a hard failure.
-        break;
-      }
-      const items = (await res.json()) as GitHubRepoPayload[];
-      if (!Array.isArray(items)) break; // unexpected shape — degrade gracefully
-      repos.push(...items);
-      if (repos.length >= limit || items.length < perPage) break;
-    }
+    const pages = await Promise.all(
+      Array.from({ length: maxPages }, (_, i) => i + 1).map(async (page) => {
+        const url =
+          `https://api.github.com/users/${encodeURIComponent(name)}/repos` +
+          `?per_page=${perPage}&sort=pushed&page=${page}`;
+        const res = await fetch(url, { headers: apiHeaders(token) });
+        if (!res.ok) {
+          // User metadata succeeded; degraded summary beats a hard failure.
+          return [];
+        }
+        const items = (await res.json()) as GitHubRepoPayload[];
+        return Array.isArray(items) ? items : []; // unexpected shape — skip
+      }),
+    );
+    repos.push(...pages.flat());
   }
 
   return normalizeUser(userPayload, repos.slice(0, limit));

package/dist/chunk-GYIL4S5X.js

@@ -1,59 +0,0 @@
-// src/config.ts
-import { homedir } from "os";
-import { join } from "path";
-import { mkdirSync, readFileSync, writeFileSync } from "fs";
-function stateDir() {
-  const xdg = process.env.XDG_STATE_HOME;
-  const base = xdg ? join(xdg, "ghfind") : join(homedir(), ".local", "share", "ghfind");
-  return base;
-}
-function cacheDir() {
-  const xdg = process.env.XDG_CACHE_HOME;
-  const base = xdg ? join(xdg, "ghfind") : join(homedir(), ".cache", "ghfind");
-  return base;
-}
-var DEFAULTS = {
-  defaultSort: "best-match",
-  defaultLimit: 50,
-  theme: "tokyo-night",
-  cacheTtlSeconds: 300,
-  defaultTab: "search"
-};
-function configPath() {
-  const envPath = process.env.GHFIND_CONFIG;
-  if (envPath) return envPath;
-  const xdg = process.env.XDG_CONFIG_HOME;
-  const base = xdg ? join(xdg, "ghfind") : join(homedir(), ".config", "ghfind");
-  return join(base, "config.json");
-}
-function loadConfig() {
-  const path = configPath();
-  try {
-    const raw = readFileSync(path, "utf-8");
-    const parsed = JSON.parse(raw);
-    return mergeWithEnv({ ...DEFAULTS, ...parsed });
-  } catch {
-    return mergeWithEnv({ ...DEFAULTS });
-  }
-}
-function saveConfig(config) {
-  const path = configPath();
-  const dir = path.slice(
-    0,
-    Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"))
-  );
-  mkdirSync(dir, { recursive: true });
-  writeFileSync(path, JSON.stringify(config, null, 2));
-}
-function mergeWithEnv(config) {
-  if (process.env.GITHUB_TOKEN) config.githubToken = process.env.GITHUB_TOKEN;
-  return config;
-}
-
-export {
-  stateDir,
-  cacheDir,
-  configPath,
-  loadConfig,
-  saveConfig
-};

package/dist/config-OCIPF2IF.js

@@ -1,14 +0,0 @@
-import {
-  cacheDir,
-  configPath,
-  loadConfig,
-  saveConfig,
-  stateDir
-} from "./chunk-GYIL4S5X.js";
-export {
-  cacheDir,
-  configPath,
-  loadConfig,
-  saveConfig,
-  stateDir
-};