github-search-cli 9.8.2 → 9.8.3

package/src/session.ts

@@ -6,9 +6,63 @@ import { readJSON, writeJSON } from "./storage";
 
 const SESSION_FILE = "session.json";
 
+/** Upper bound for a plausible search query; anything longer is garbage. */
+const MAX_QUERY_LENGTH = 200;
+
+/**
+ * Drop JSON-shaped or oversized queries. A search line is never raw JSON
+ * (objects/arrays always arrive as paste payloads — e.g. an MCP handshake
+ * request that a client piped into the TUI) and never thousands of chars,
+ * so such a "query" is corruption, not intent. The TUI's input handler
+ * applies the same shape rule to live pastes.
+ */
+export function sanitizeQuery(query: unknown): string | undefined {
+  if (typeof query !== "string") return undefined;
+  const trimmed = query.trim();
+  if (trimmed.length === 0 || trimmed.length > MAX_QUERY_LENGTH) {
+    return undefined;
+  }
+  if (
+    (trimmed.startsWith("{") && trimmed.endsWith("}")) ||
+    (trimmed.startsWith("[") && trimmed.endsWith("]"))
+  ) {
+    return undefined;
+  }
+  return trimmed;
+}
+
+/** Keep only well-formed, known-good fields from a session snapshot. */
+export function sanitizeSession(
+  state: SessionState | null | undefined,
+): SessionState | null {
+  if (!state || typeof state !== "object") return null;
+  const mode =
+    state.mode === "trending" ||
+    state.mode === "packages" ||
+    state.mode === "search"
+      ? state.mode
+      : "search";
+  const trendingTab =
+    typeof state.trendingTab === "string" && state.trendingTab.length > 0
+      ? state.trendingTab
+      : "This Week";
+  const limit =
+    typeof state.limit === "number" && Number.isFinite(state.limit)
+      ? state.limit
+      : 50;
+  const sort = typeof state.sort === "string" ? state.sort : "best-match";
+  return {
+    mode,
+    query: sanitizeQuery(state.query) ?? "",
+    sort,
+    limit,
+    trendingTab,
+  };
+}
+
 export function saveSession(state: SessionState): void {
   try {
-    writeJSON(SESSION_FILE, state);
+    writeJSON(SESSION_FILE, sanitizeSession(state));
   } catch (err) {
     if (process.env.DEBUG)
       console.error(
@@ -18,7 +72,9 @@ export function saveSession(state: SessionState): void {
 }
 
 export function restoreSession(): SessionState | null {
-  return readJSON<SessionState | null>(SESSION_FILE, null);
+  // Anything read from disk passes the same sanitizer as anything written —
+  // protects against files corrupted before this guard existed.
+  return sanitizeSession(readJSON<SessionState | null>(SESSION_FILE, null));
 }
 
 export function clearSession(): void {

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();
+        }
       },
     },
     {
@@ -1923,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"] =
@@ -2222,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;
@@ -2277,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();
@@ -2329,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 },
     ];
@@ -2367,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;
 
@@ -2434,13 +2559,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
           { 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));
+      reportError(err);
     }
 
     isLoading = false;
@@ -2558,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)
@@ -2930,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;
@@ -3049,26 +3208,15 @@ ${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();
 }