gh-manager-cli 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.6.2](https://github.com/wiiiimm/gh-manager-cli/compare/v1.6.1...v1.6.2) (2025-08-31)
+
+
+### Bug Fixes
+
+* resolve ES module import issues and improve search UX ([2a08c6b](https://github.com/wiiiimm/gh-manager-cli/commit/2a08c6b557c5a00e1005136074273e38c817a4c3))
+
+## [1.6.1](https://github.com/wiiiimm/gh-manager-cli/compare/v1.6.0...v1.6.1) (2025-08-31)
+
+
+### Bug Fixes
+
+* correct GitHub Packages publishing in workflow ([191fcd5](https://github.com/wiiiimm/gh-manager-cli/commit/191fcd503389cb09774305ebde58481cccc9e518))
+
 # [1.6.0](https://github.com/wiiiimm/gh-manager-cli/compare/v1.5.0...v1.6.0) (2025-08-31)
 
 

package/README.md

@@ -39,7 +39,7 @@ On first run, you'll be prompted for a GitHub Personal Access Token.
 - **Repository Listing**: Browse all your personal repositories with metadata (stars, forks, language, etc.)
 - **Live Pagination**: Infinite scroll with automatic page prefetching
 - **Real-time Sorting**: Server-side sorting by updated, pushed, name, or stars (with direction toggle)
-- **Smart Filtering**: Client-side search through repository names and descriptions
+- **Smart Search**: Server-side search through repository names and descriptions (3+ characters)
 - **Repository Actions**:
   - View detailed info (`I`) - Shows repository metadata, language, size, and timestamps
   - Open in browser (Enter/`O`)
@@ -137,7 +137,9 @@ Launch the app, then use the keys below:
 
 - Navigation: Up/Down, PageUp/PageDown, `Ctrl+G` (top), `G` (bottom)
 - Refresh: `R`
-- Filter: `/` to enter, type query, Enter to apply (Esc cancels)
+- Search: `/` to enter search mode, type 3+ characters for server-side search
+  - Down arrow or Enter: Start browsing search results
+  - Esc: Clear search and return to full repository list
 - Sorting: `S` to cycle field (updated → pushed → name → stars → forks), `D` to toggle direction
 - Display density: `T` to toggle compact/cozy/comfy
 - Repository info: `I` to view detailed metadata (size, language, timestamps)
@@ -152,7 +154,7 @@ Launch the app, then use the keys below:
 - Logout: `Ctrl+L`
 - Toggle fork metrics: `F`
 - Quit: `Q`
-- Esc: cancels modals or exits filter mode (does not quit)
+- Esc: cancels modals, clears search, or returns to normal listing (does not quit)
 
 Status bar shows loaded count vs total. A rate-limit line displays `remaining/limit` and the reset time; it turns yellow when remaining ≤ 10% of the limit.
 
@@ -186,7 +188,7 @@ Notes:
 Project layout:
 - `src/index.tsx` — CLI entry and error handling
 - `src/ui/App.tsx` — token bootstrap, renders `RepoList`
-- `src/ui/RepoList.tsx` — list UI, keys, filtering, sorting, infinite scroll
+- `src/ui/RepoList.tsx` — list UI, keys, search, sorting, infinite scroll
 - `src/github.ts` — GraphQL client and queries (repos + rateLimit)
 - `src/config.ts` — token read/write and file perms
 - `src/types.ts` — shared types
@@ -195,22 +197,31 @@ Project layout:
 
 gh-manager-cli includes built-in Apollo Client caching to reduce GitHub API calls and improve performance. Caching is **always enabled** for optimal performance.
 
-### Verifying Cache is Working
+### Debug Mode
+
+Run with `GH_MANAGER_DEBUG=1` to enable debugging features:
+```bash
+GH_MANAGER_DEBUG=1 npx gh-manager
+```
 
-1. **Debug Output**: Run with `GH_MANAGER_DEBUG=1` to see cache status:
-   ```bash
-   GH_MANAGER_DEBUG=1 npx gh-manager
-   ```
+Debug mode provides:
+- **Apollo performance metrics**: Query execution time, cache hit/miss indicators
+- **Detailed error messages**: Full GraphQL and network errors for troubleshooting
+- **Data source tracking**: Shows whether data came from cache or network
 
-2. **Cache Inspection**: Press `i` (in debug mode) to inspect cache status:
-   - Shows cache file size and age
-   - Lists recent cache entries with timestamps
-   - Displays cache directory location
+### Verifying Cache is Working
 
-3. **Performance Indicators**:
+1. **Performance Indicators** (visible in debug mode):
    - **From cache: YES** = Data served from cache
    - **Query time < 50ms** = Likely cache hit
-   - **API credits stable** = Fewer API calls being made
+   - **Network status codes** = Shows Apollo's internal cache state
+
+2. **API Credits**: Monitor the API counter in the header - it should remain stable when navigating previously loaded data
+
+3. **Cache Inspection**: Press `Ctrl+I` (available anytime) to see:
+   - Cache file location and size
+   - Recent cache entries with timestamps
+   - Cache age for each query type
 
 ### Why API Credits Might Still Decrease
 
@@ -246,7 +257,7 @@ Highlights on deck:
 - Density toggle for row spacing (compact/cozy/comfy)
 - Repo actions (archive/unarchive, delete) with confirmations
 - Organization support and switching
-- Server-side search; cached first page for faster startup
+- Enhanced server-side search with improved UX
 - Optional OS keychain storage via `keytar`
 
 ## License

package/dist/index.js

@@ -9,7 +9,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "gh-manager-cli",
-      version: "1.6.0",
+      version: "1.6.2",
       private: false,
       description: "Interactive CLI to manage your GitHub repos (personal) with Ink",
       license: "MIT",
@@ -47,12 +47,13 @@ var require_package = __commonJS({
         node: ">=18"
       },
       dependencies: {
-        "@apollo/client": "^3.11.10",
+        "@apollo/client": "^3.14.0",
         "@octokit/graphql": "^9.0.1",
         "apollo3-cache-persist": "^0.14.1",
         chalk: "^5.6.0",
         dotenv: "^17.2.1",
         "env-paths": "^3.0.0",
+        graphql: "^16.11.0",
         ink: "^6.2.3",
         "ink-spinner": "^5.0.0",
         "ink-text-input": "^6.0.0",
@@ -187,67 +188,77 @@ function storeUIPrefs(patch) {
 
 // src/github.ts
 import { graphql as makeGraphQL } from "@octokit/graphql";
+import { ApolloClient, InMemoryCache, HttpLink, gql } from "@apollo/client/core/index.js";
+import { persistCache } from "apollo3-cache-persist";
+import fs2 from "fs";
+import path2 from "path";
+import envPaths2 from "env-paths";
 function makeClient(token) {
   return makeGraphQL.defaults({
     headers: { authorization: `token ${token}` }
   });
 }
 async function makeApolloClient(token) {
-  const apollo = await import("@apollo/client/core");
-  const { persistCache } = await import("apollo3-cache-persist");
-  const { ApolloClient, InMemoryCache, HttpLink, gql } = apollo;
-  const cache = new InMemoryCache();
-  const storage = {
-    async getItem(key) {
-      try {
-        const fs3 = await import("fs");
-        const path3 = await import("path");
-        const envPaths3 = (await import("env-paths")).default;
-        const p = envPaths3("gh-manager-cli").data;
-        const file = path3.join(p, "apollo-cache.json");
-        return fs3.readFileSync(file, "utf8");
-      } catch {
-        return null;
-      }
-    },
-    async setItem(key, value) {
-      try {
-        const fs3 = await import("fs");
-        const path3 = await import("path");
-        const envPaths3 = (await import("env-paths")).default;
-        const p = envPaths3("gh-manager-cli").data;
-        fs3.mkdirSync(p, { recursive: true });
-        const file = path3.join(p, "apollo-cache.json");
-        fs3.writeFileSync(file, value, "utf8");
-        if (process.platform !== "win32") {
-          try {
-            fs3.chmodSync(file, 384);
-          } catch {
+  try {
+    if (typeof globalThis.fetch === "undefined") {
+      throw new Error("Fetch API not available. Node 18+ is required.");
+    }
+    const cache = new InMemoryCache();
+    const storage = {
+      async getItem(key) {
+        try {
+          const p = envPaths2("gh-manager-cli").data;
+          const file = path2.join(p, "apollo-cache.json");
+          return fs2.readFileSync(file, "utf8");
+        } catch {
+          return null;
+        }
+      },
+      async setItem(key, value) {
+        try {
+          const p = envPaths2("gh-manager-cli").data;
+          fs2.mkdirSync(p, { recursive: true });
+          const file = path2.join(p, "apollo-cache.json");
+          fs2.writeFileSync(file, value, "utf8");
+          if (process.platform !== "win32") {
+            try {
+              fs2.chmodSync(file, 384);
+            } catch {
+            }
           }
+        } catch {
+        }
+      },
+      async removeItem(key) {
+        try {
+          const p = envPaths2("gh-manager-cli").data;
+          const file = path2.join(p, "apollo-cache.json");
+          fs2.unlinkSync(file);
+        } catch {
         }
-      } catch {
       }
-    },
-    async removeItem(key) {
-      try {
-        const fs3 = await import("fs");
-        const path3 = await import("path");
-        const envPaths3 = (await import("env-paths")).default;
-        const p = envPaths3("gh-manager-cli").data;
-        const file = path3.join(p, "apollo-cache.json");
-        fs3.unlinkSync(file);
-      } catch {
+    };
+    await persistCache({ cache, storage, debounce: 500, maxSize: 5 * 1024 * 1024 });
+    const link = new HttpLink({
+      uri: "https://api.github.com/graphql",
+      fetch: globalThis.fetch,
+      headers: { authorization: `Bearer ${token}` }
+    });
+    const client = new ApolloClient({ cache, link });
+    return { client, gql };
+  } catch (error) {
+    const debug = process.env.GH_MANAGER_DEBUG === "1";
+    if (debug) {
+      process.stderr.write(`
+\u274C Failed to initialize Apollo Client: ${error.message}
+`);
+      if (error.stack) {
+        process.stderr.write(`Stack: ${error.stack}
+`);
       }
     }
-  };
-  await persistCache({ cache, storage, debounce: 500, maxSize: 5 * 1024 * 1024 });
-  const link = new HttpLink({
-    uri: "https://api.github.com/graphql",
-    fetch: globalThis.fetch,
-    headers: { authorization: `Bearer ${token}` }
-  });
-  const client = new ApolloClient({ cache, link });
-  return { client, gql };
+    throw new Error(`Apollo Client initialization failed: ${error.message}`);
+  }
 }
 async function getViewerLogin(client) {
   const query = (
@@ -432,6 +443,73 @@ async function fetchViewerReposPageUnified(token, first, after, orderBy, include
   const octo = makeClient(token);
   return fetchViewerReposPage(octo, first, after, orderBy, includeForkTracking);
 }
+async function searchRepositoriesUnified(token, viewer, text, first, after, sortKey = "UPDATED_AT", sortDir = "DESC", includeForkTracking = true, fetchPolicy = "network-only") {
+  const q = `${text} user:${viewer} in:name,description fork:true`;
+  try {
+    const ap = await makeApolloClient(token);
+    const queryDoc = ap.gql`
+      query SearchRepos($q: String!, $first: Int!, $after: String) {
+        rateLimit { limit remaining resetAt }
+        search(query: $q, type: REPOSITORY, first: $first, after: $after) {
+          repositoryCount
+          pageInfo { endCursor hasNextPage }
+          nodes {
+            ... on Repository {
+              id
+              name
+              nameWithOwner
+              description
+              visibility
+              isPrivate
+              isFork
+              isArchived
+              stargazerCount
+              forkCount
+              primaryLanguage { name color }
+              updatedAt
+              pushedAt
+              diskUsage
+              ${includeForkTracking ? `
+              parent { nameWithOwner defaultBranchRef { name target { ... on Commit { history(first: 0) { totalCount } } } } }
+              defaultBranchRef { name target { ... on Commit { history(first: 0) { totalCount } } } }` : `
+              parent { nameWithOwner }
+              defaultBranchRef { name }`}
+            }
+          }
+        }
+      }
+    `;
+    const res = await ap.client.query({
+      query: queryDoc,
+      variables: { q, first, after: after ?? null },
+      fetchPolicy
+    });
+    const data = res.data.search;
+    return {
+      nodes: data.nodes,
+      endCursor: data.pageInfo.endCursor,
+      hasNextPage: data.pageInfo.hasNextPage,
+      totalCount: data.repositoryCount,
+      rateLimit: res.data.rateLimit
+    };
+  } catch (e) {
+    const debug = process.env.GH_MANAGER_DEBUG === "1";
+    if (debug) {
+      process.stderr.write(`
+\u274C Search failed: ${e.message}
+`);
+      if (e.graphQLErrors) {
+        process.stderr.write(`GraphQL errors: ${JSON.stringify(e.graphQLErrors, null, 2)}
+`);
+      }
+      if (e.networkError) {
+        process.stderr.write(`Network error: ${e.networkError.message}
+`);
+      }
+    }
+    throw e;
+  }
+}
 async function deleteRepositoryRest(token, owner, repo) {
   const url = `https://api.github.com/repos/${owner}/${repo}`;
   const res = await fetch(url, {
@@ -510,21 +588,21 @@ async function syncForkWithUpstream(token, owner, repo, branch = "main") {
 }
 async function purgeApolloCacheFiles() {
   try {
-    const fs3 = await import("fs");
-    const path3 = await import("path");
-    const envPaths3 = (await import("env-paths")).default;
-    const p = envPaths3("gh-manager-cli").data;
-    const cacheFile = path3.join(p, "apollo-cache.json");
-    const metaFile = path3.join(p, "apollo-cache-meta.json");
+    const fs4 = await import("fs");
+    const path4 = await import("path");
+    const envPaths4 = (await import("env-paths")).default;
+    const p = envPaths4("gh-manager-cli").data;
+    const cacheFile = path4.join(p, "apollo-cache.json");
+    const metaFile = path4.join(p, "apollo-cache-meta.json");
     if (process.env.GH_MANAGER_DEBUG === "1") {
       console.log(`\u{1F5D1}\uFE0F  Purging cache files from: ${p}`);
     }
     try {
-      fs3.unlinkSync(cacheFile);
+      fs4.unlinkSync(cacheFile);
     } catch {
     }
     try {
-      fs3.unlinkSync(metaFile);
+      fs4.unlinkSync(metaFile);
     } catch {
     }
   } catch {
@@ -532,17 +610,17 @@ async function purgeApolloCacheFiles() {
 }
 async function inspectCacheStatus() {
   try {
-    const fs3 = await import("fs");
-    const path3 = await import("path");
-    const envPaths3 = (await import("env-paths")).default;
-    const p = envPaths3("gh-manager-cli").data;
-    const cacheFile = path3.join(p, "apollo-cache.json");
-    const metaFile = path3.join(p, "apollo-cache-meta.json");
+    const fs4 = await import("fs");
+    const path4 = await import("path");
+    const envPaths4 = (await import("env-paths")).default;
+    const p = envPaths4("gh-manager-cli").data;
+    const cacheFile = path4.join(p, "apollo-cache.json");
+    const metaFile = path4.join(p, "apollo-cache-meta.json");
     process.stderr.write(`
 \u{1F4C2} Cache directory: ${p}
 `);
     try {
-      const cacheStats = fs3.statSync(cacheFile);
+      const cacheStats = fs4.statSync(cacheFile);
       process.stderr.write(`\u{1F4BE} Cache file: ${Math.round(cacheStats.size / 1024)}KB (${cacheStats.mtime.toISOString()})
 `);
     } catch {
@@ -550,8 +628,8 @@ async function inspectCacheStatus() {
 `);
     }
     try {
-      const metaStats = fs3.statSync(metaFile);
-      const metaContent = fs3.readFileSync(metaFile, "utf8");
+      const metaStats = fs4.statSync(metaFile);
+      const metaContent = fs4.readFileSync(metaFile, "utf8");
       const meta = JSON.parse(metaContent);
       process.stderr.write(`\u{1F4CA} Meta file: ${Object.keys(meta.fetched || {}).length} entries (${metaStats.mtime.toISOString()})
 `);
@@ -576,22 +654,22 @@ async function inspectCacheStatus() {
 }
 
 // src/ui/RepoList.tsx
-import { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Box, Text, useApp, useInput, useStdout } from "ink";
 import TextInput from "ink-text-input";
 import chalk from "chalk";
 
 // src/apolloMeta.ts
-import fs2 from "fs";
-import path2 from "path";
-import envPaths2 from "env-paths";
-var paths2 = envPaths2("gh-manager-cli");
+import fs3 from "fs";
+import path3 from "path";
+import envPaths3 from "env-paths";
+var paths2 = envPaths3("gh-manager-cli");
 var dataDir = paths2.data;
-var metaPath = path2.join(dataDir, "apollo-cache-meta.json");
+var metaPath = path3.join(dataDir, "apollo-cache-meta.json");
 var VERSION = 1;
 function readMeta() {
   try {
-    const raw = fs2.readFileSync(metaPath, "utf8");
+    const raw = fs3.readFileSync(metaPath, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed === "object" && parsed.fetched) return parsed;
   } catch {
@@ -600,11 +678,11 @@ function readMeta() {
 }
 function writeMeta(meta) {
   try {
-    fs2.mkdirSync(dataDir, { recursive: true });
-    fs2.writeFileSync(metaPath, JSON.stringify(meta, null, 2), "utf8");
+    fs3.mkdirSync(dataDir, { recursive: true });
+    fs3.writeFileSync(metaPath, JSON.stringify(meta, null, 2), "utf8");
     if (process.platform !== "win32") {
       try {
-        fs2.chmodSync(metaPath, 384);
+        fs3.chmodSync(metaPath, 384);
       } catch {
       }
     }
@@ -615,6 +693,11 @@ function makeApolloKey(opts) {
   const v = opts.viewer || "unknown";
   return `viewer:${v}|sort:${opts.sortKey}:${opts.sortDir}|ps:${opts.pageSize}|forks:${opts.forkTracking ? "1" : "0"}`;
 }
+function makeSearchKey(opts) {
+  const v = opts.viewer || "unknown";
+  const query = (opts.q || "").trim().toLowerCase();
+  return `search:${query}|viewer:${v}|sort:${opts.sortKey}:${opts.sortDir}|ps:${opts.pageSize}|forks:${opts.forkTracking ? "1" : "0"}`;
+}
 function isFresh(key, ttlMs = Number(process.env.APOLLO_TTL_MS || 30 * 60 * 1e3)) {
   const meta = readMeta();
   const iso = meta.fetched[key];
@@ -699,6 +782,15 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
   const { exit } = useApp();
   const { stdout } = useStdout();
   const client = useMemo(() => makeClient(token), [token]);
+  const [debugMessages, setDebugMessages] = useState([]);
+  const addDebugMessage = (msg) => {
+    if (process.env.GH_MANAGER_DEBUG === "1") {
+      setDebugMessages((prev) => [...prev.slice(-9), msg]);
+    }
+  };
+  React.useEffect(() => {
+    addDebugMessage(`[RepoList] Component mounted`);
+  }, []);
   const terminalWidth = stdout?.columns ?? 80;
   const availableHeight = maxVisibleRows ?? 20;
   const [items, setItems] = useState([]);
@@ -715,6 +807,11 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
   const [prevRateLimit, setPrevRateLimit] = useState(void 0);
   const [density, setDensity] = useState(2);
   const [prefsLoaded, setPrefsLoaded] = useState(false);
+  const [searchItems, setSearchItems] = useState([]);
+  const [searchEndCursor, setSearchEndCursor] = useState(null);
+  const [searchHasNextPage, setSearchHasNextPage] = useState(false);
+  const [searchTotalCount, setSearchTotalCount] = useState(0);
+  const [searchLoading, setSearchLoading] = useState(false);
   const [deleteMode, setDeleteMode] = useState(false);
   const [deleteTarget, setDeleteTarget] = useState(null);
   const [deleteCode, setDeleteCode] = useState("");
@@ -774,7 +871,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       setDeleteError(null);
       setDeleting(false);
       setDeleteConfirmStage(false);
-      setCursor((c) => Math.max(0, Math.min(c, filteredAndSorted.length - 2)));
+      setCursor((c) => Math.max(0, Math.min(c, visibleItems.length - 2)));
     } catch (e) {
       setDeleting(false);
       setDeleteError("Failed to delete repository. Ensure delete_repo scope and admin permissions.");
@@ -843,6 +940,62 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       setLoadingMore(false);
     }
   };
+  const fetchSearchPage = async (after, reset = false, policy, searchQuery) => {
+    const query = searchQuery ?? filter;
+    addDebugMessage(`[fetchSearchPage] query="${query}", searchQuery="${searchQuery}", filter="${filter}"`);
+    if (!viewerLogin) {
+      addDebugMessage("\u274C No viewerLogin for search");
+      return;
+    }
+    setSearchLoading(true);
+    try {
+      const orderBy = { field: sortFieldMap[sortKey], direction: sortDir.toUpperCase() };
+      addDebugMessage(`[fetchSearchPage] Calling API with viewer="${viewerLogin}", query="${query.trim()}"`);
+      const page = await searchRepositoriesUnified(
+        token,
+        viewerLogin,
+        query.trim(),
+        PAGE_SIZE,
+        after ?? null,
+        orderBy.field,
+        orderBy.direction,
+        forkTracking,
+        policy ?? (after ? "network-only" : "cache-first")
+      );
+      addDebugMessage(`[fetchSearchPage] API returned ${page.nodes.length} results, totalCount=${page.totalCount}`);
+      if (page.nodes.length > 0) {
+        addDebugMessage(`[fetchSearchPage] First result: ${page.nodes[0].name}`);
+      }
+      setSearchItems((prev) => reset || !after ? page.nodes : [...prev, ...page.nodes]);
+      setSearchEndCursor(page.endCursor);
+      setSearchHasNextPage(page.hasNextPage);
+      setSearchTotalCount(page.totalCount);
+      if (!after) {
+        try {
+          const key = makeSearchKey({
+            viewer: viewerLogin || "unknown",
+            q: query.trim(),
+            sortKey,
+            sortDir,
+            pageSize: PAGE_SIZE,
+            forkTracking
+          });
+          markFetched(key);
+        } catch {
+        }
+      }
+      setError(null);
+    } catch (e) {
+      const errorMsg = `Failed to search: ${e.message || e}`;
+      addDebugMessage(`\u274C Search error: ${e.message || e}`);
+      if (e.stack) {
+        addDebugMessage(`Stack: ${e.stack.split("\n")[0]}`);
+      }
+      setError(errorMsg);
+    } finally {
+      setSearchLoading(false);
+    }
+  };
   useEffect(() => {
     const ui = getUIPrefs();
     if (ui.density !== void 0) setDensity(ui.density);
@@ -867,28 +1020,65 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
         pageSize: PAGE_SIZE,
         forkTracking
       });
-      policy = isFresh(key) ? "cache-first" : "cache-and-network";
+      policy = isFresh(key) ? "cache-first" : "network-only";
     } catch {
     }
     fetchPage(null, true, false, void 0, policy);
   }, [client, prefsLoaded]);
   useEffect(() => {
-    if (items.length > 0) {
+    if (!searchActive) {
+      if (items.length > 0) {
+        let policy = "cache-first";
+        try {
+          const key = makeApolloKey({
+            viewer: viewerLogin || "unknown",
+            sortKey,
+            sortDir,
+            pageSize: PAGE_SIZE,
+            forkTracking
+          });
+          policy = isFresh(key) ? "cache-first" : "network-only";
+        } catch {
+        }
+        fetchPage(null, true, true, void 0, policy);
+      }
+    } else {
+      if (!searchLoading && filter.trim().length >= 3) {
+        let policy = "cache-first";
+        try {
+          const key = makeSearchKey({
+            viewer: viewerLogin || "unknown",
+            q: filter.trim(),
+            sortKey,
+            sortDir,
+            pageSize: PAGE_SIZE,
+            forkTracking
+          });
+          policy = isFresh(key, 90 * 1e3) ? "cache-first" : "network-only";
+        } catch {
+        }
+        fetchSearchPage(null, true, policy);
+      }
+    }
+  }, [sortKey, sortDir]);
+  useEffect(() => {
+    if (viewerLogin && searchActive && !searchLoading && searchItems.length === 0) {
       let policy = "cache-first";
       try {
-        const key = makeApolloKey({
+        const key = makeSearchKey({
           viewer: viewerLogin || "unknown",
+          q: filter.trim(),
           sortKey,
           sortDir,
           pageSize: PAGE_SIZE,
           forkTracking
         });
-        policy = isFresh(key) ? "cache-first" : "cache-and-network";
+        policy = isFresh(key, 90 * 1e3) ? "cache-first" : "network-only";
       } catch {
       }
-      fetchPage(null, true, true, void 0, policy);
+      fetchSearchPage(null, true, policy);
     }
-  }, [sortKey, sortDir]);
+  }, [viewerLogin]);
   useInput((input, key) => {
     if (deleteMode) {
       if (key.escape || input && input.toUpperCase() === "C") {
@@ -1044,8 +1234,31 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
     if (filterMode) {
       if (key.escape) {
         setFilterMode(false);
+        setFilter("");
+        setSearchItems([]);
+        setSearchEndCursor(null);
+        setSearchHasNextPage(false);
+        setSearchTotalCount(0);
+        setCursor(0);
+        addDebugMessage("[ESC] Cleared search and returned to normal listing");
         return;
       }
+      if (key.downArrow && searchActive && visibleItems.length > 0) {
+        setFilterMode(false);
+        setCursor(0);
+        addDebugMessage("[DOWN] Exited filter mode and selected first search result");
+        return;
+      }
+      return;
+    }
+    if (key.escape && searchActive) {
+      setFilter("");
+      setSearchItems([]);
+      setSearchEndCursor(null);
+      setSearchHasNextPage(false);
+      setSearchTotalCount(0);
+      setCursor(0);
+      addDebugMessage("[ESC] Cleared search and returned to normal listing");
       return;
     }
     if (input && input.toUpperCase() === "Q") {
@@ -1058,16 +1271,16 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       exit();
       return;
     }
-    if (key.downArrow) setCursor((c) => Math.min(c + 1, items.length - 1));
+    if (key.downArrow) setCursor((c) => Math.min(c + 1, visibleItems.length - 1));
     if (key.upArrow) setCursor((c) => Math.max(c - 1, 0));
-    if (key.pageDown) setCursor((c) => Math.min(c + 10, items.length - 1));
+    if (key.pageDown) setCursor((c) => Math.min(c + 10, visibleItems.length - 1));
     if (key.pageUp) setCursor((c) => Math.max(c - 10, 0));
     if (key.return) {
-      const repo = filteredAndSorted[cursor];
+      const repo = visibleItems[cursor];
       if (repo) openInBrowser(`https://github.com/${repo.nameWithOwner}`);
     }
     if (key.delete && !key.backspace || key.backspace && key.ctrl) {
-      const repo = filteredAndSorted[cursor];
+      const repo = visibleItems[cursor];
       if (repo) {
         setDeleteTarget(repo);
         setDeleteMode(true);
@@ -1086,7 +1299,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       return;
     }
     if (!key.ctrl && input && input.toUpperCase() === "G") {
-      setCursor(items.length - 1);
+      setCursor(visibleItems.length - 1);
       return;
     }
     if (input && input.toUpperCase() === "R") {
@@ -1103,7 +1316,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       })();
     }
     if (key.ctrl && (input === "a" || input === "A")) {
-      const repo = filteredAndSorted[cursor];
+      const repo = visibleItems[cursor];
       if (repo) {
         setArchiveTarget(repo);
         setArchiveMode(true);
@@ -1114,7 +1327,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       return;
     }
     if (key.ctrl && (input === "u" || input === "U")) {
-      const repo = filteredAndSorted[cursor];
+      const repo = visibleItems[cursor];
       if (repo && repo.isFork && repo.parent) {
         const hasCommitData = repo.defaultBranchRef && repo.parent.defaultBranchRef && repo.parent.defaultBranchRef.target?.history && repo.defaultBranchRef.target?.history;
         const commitsBehind = hasCommitData ? repo.parent.defaultBranchRef.target.history.totalCount - repo.defaultBranchRef.target.history.totalCount : 0;
@@ -1132,12 +1345,13 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       setLogoutFocus("confirm");
       return;
     }
-    if (key.ctrl && key.shift && (input === "d" || input === "D") || process.env.GH_MANAGER_DEBUG === "1" && input === "i") {
+    if (key.ctrl && (input === "i" || input === "I")) {
       (async () => {
         try {
           await inspectCacheStatus();
         } catch (e) {
-          console.log("Failed to inspect cache:", e);
+          process.stderr.write(`\u274C Failed to inspect cache: ${e.message}
+`);
         }
       })();
       return;
@@ -1169,7 +1383,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       return;
     }
     if (input && input.toUpperCase() === "O") {
-      const repo = filteredAndSorted[cursor];
+      const repo = visibleItems[cursor];
       if (repo) openInBrowser(`https://github.com/${repo.nameWithOwner}`);
       return;
     }
@@ -1197,11 +1411,6 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       return;
     }
   });
-  useEffect(() => {
-    if (!loading && !loadingMore && hasNextPage && cursor >= filteredAndSorted.length - 5) {
-      fetchPage(endCursor);
-    }
-  }, [cursor, hasNextPage, endCursor, loading, loadingMore]);
   const filtered = useMemo(() => {
     const q = filter.trim().toLowerCase();
     if (!q) return items;
@@ -1229,9 +1438,16 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
     });
     return arr;
   }, [filtered, sortKey, sortDir]);
+  const searchActive = filter.trim().length >= 3;
+  const visibleItems = searchActive ? searchItems : filteredAndSorted;
   useEffect(() => {
-    setCursor((c) => Math.min(c, Math.max(0, filteredAndSorted.length - 1)));
-  }, [filteredAndSorted.length]);
+    if (searchActive) {
+      addDebugMessage(`[State] searchActive=${searchActive}, searchItems=${searchItems.length}, visibleItems=${visibleItems.length}, filter="${filter}"`);
+    }
+  }, [searchActive, searchItems.length, visibleItems.length, filter]);
+  useEffect(() => {
+    setCursor((c) => Math.min(c, Math.max(0, (searchActive ? searchItems.length : items.length) - 1)));
+  }, [searchActive, searchItems.length, items.length]);
   const headerHeight = 2;
   const footerHeight = 4;
   const containerPadding = 2;
@@ -1239,7 +1455,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
   const listHeight = Math.max(1, contentHeight - (filterMode ? 2 : 0) - 2);
   const spacingLines = density;
   const windowed = useMemo(() => {
-    const total = filteredAndSorted.length;
+    const total = visibleItems.length;
     const LINES_PER_REPO = 3 + spacingLines;
     const visibleRepos = Math.max(1, Math.floor(listHeight / LINES_PER_REPO));
     if (visibleRepos >= total) return { start: 0, end: total };
@@ -1249,7 +1465,15 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
     start = Math.min(start, Math.max(0, total - visibleRepos));
     const end = Math.min(total, start + visibleRepos + buffer);
     return { start, end };
-  }, [filteredAndSorted.length, cursor, listHeight, spacingLines]);
+  }, [visibleItems.length, cursor, listHeight, spacingLines]);
+  useEffect(() => {
+    const nearEnd = cursor >= visibleItems.length - 5;
+    if (searchActive) {
+      if (!searchLoading && searchHasNextPage && nearEnd) fetchSearchPage(searchEndCursor);
+    } else {
+      if (!loading && !loadingMore && hasNextPage && nearEnd) fetchPage(endCursor);
+    }
+  }, [cursor, visibleItems.length, searchActive, searchLoading, searchHasNextPage, searchEndCursor, loading, loadingMore, hasNextPage, endCursor]);
   function openInBrowser(url) {
     const platform = process.platform;
     const cmd = platform === "darwin" ? `open "${url}"` : platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
@@ -1262,12 +1486,12 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       /* @__PURE__ */ jsx(Text, { bold: true, color: modalOpen ? "gray" : void 0, dimColor: modalOpen ? true : void 0, children: "  Repositories" }),
       /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
         "(",
-        filteredAndSorted.length,
+        visibleItems.length,
         "/",
-        totalCount,
+        searchActive ? searchTotalCount : totalCount,
         ")"
       ] }),
-      loading && /* @__PURE__ */ jsx(Box, { width: 2, flexShrink: 0, flexGrow: 0, marginLeft: 1, children: /* @__PURE__ */ jsx(Text, { color: "yellow", children: /* @__PURE__ */ jsx(SlowSpinner, {}) }) })
+      (loading || searchLoading) && /* @__PURE__ */ jsx(Box, { width: 2, flexShrink: 0, flexGrow: 0, marginLeft: 1, children: /* @__PURE__ */ jsx(Text, { color: "yellow", children: /* @__PURE__ */ jsx(SlowSpinner, {}) }) })
     ] }),
     rateLimit && /* @__PURE__ */ jsxs(Text, { color: lowRate ? "yellow" : "gray", children: [
       "API: ",
@@ -1276,7 +1500,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
       rateLimit.limit,
       prevRateLimit !== void 0 && prevRateLimit !== rateLimit.remaining && /* @__PURE__ */ jsx(Text, { color: rateLimit.remaining < prevRateLimit ? "red" : "green", children: ` (${rateLimit.remaining - prevRateLimit > 0 ? "+" : ""}${rateLimit.remaining - prevRateLimit})` })
     ] })
-  ] }), [filteredAndSorted.length, totalCount, loading, rateLimit, lowRate, modalOpen, prevRateLimit]);
+  ] }), [visibleItems.length, searchActive, searchTotalCount, totalCount, loading, searchLoading, rateLimit, lowRate, modalOpen, prevRateLimit]);
   if (error) {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", alignItems: "center", justifyContent: "center", flexGrow: 1, children: [
       /* @__PURE__ */ jsx(Text, { color: "red", children: error }),
@@ -1602,7 +1826,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
         " \u2022 Y to confirm \u2022 C to cancel"
       ] }) })
     ] }) }) : infoMode ? /* @__PURE__ */ jsx(Box, { height: contentHeight, alignItems: "center", justifyContent: "center", children: (() => {
-      const repo = filteredAndSorted[cursor];
+      const repo = visibleItems[cursor];
       if (!repo) return /* @__PURE__ */ jsx(Text, { color: "red", children: "No repository selected." });
       const langName = repo.primaryLanguage?.name || "N/A";
       const langColor = repo.primaryLanguage?.color || "#666666";
@@ -1648,10 +1872,21 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
           "Forks - Commits Behind: ",
           forkTracking ? "ON" : "OFF"
         ] }),
-        filter && /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+        filter && !searchActive && /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
           'Filter: "',
           filter,
           '"'
+        ] }),
+        searchActive && /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+            'Search: "',
+            filter.trim(),
+            '"'
+          ] }),
+          searchLoading && /* @__PURE__ */ jsx(Box, { marginLeft: 1, children: /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+            /* @__PURE__ */ jsx(SlowSpinner, {}),
+            " Searching\u2026"
+          ] }) })
         ] })
       ] }),
       filterMode && /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
@@ -1660,20 +1895,50 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
           TextInput,
           {
             value: filter,
-            onChange: setFilter,
-            onSubmit: () => setFilterMode(false),
-            placeholder: "Type to filter..."
+            onChange: (val) => {
+              addDebugMessage(`[onChange] val="${val}"`);
+              setFilter(val);
+              const q = (val || "").trim();
+              addDebugMessage(`[onChange] trimmed="${q}", len=${q.length}`);
+              if (q.length >= 3) {
+                addDebugMessage(`[onChange] Triggering search for "${q}"`);
+                let policy = "cache-first";
+                try {
+                  const key = makeSearchKey({
+                    viewer: viewerLogin || "unknown",
+                    q,
+                    sortKey,
+                    sortDir,
+                    pageSize: PAGE_SIZE,
+                    forkTracking
+                  });
+                  policy = isFresh(key, 90 * 1e3) ? "cache-first" : "network-only";
+                } catch {
+                }
+                addDebugMessage(`[onChange] Calling fetchSearchPage with q="${q}"`);
+                fetchSearchPage(null, true, policy, q);
+              } else {
+                setSearchItems([]);
+                setSearchEndCursor(null);
+                setSearchHasNextPage(false);
+                setSearchTotalCount(0);
+              }
+            },
+            onSubmit: () => {
+              setFilterMode(false);
+            },
+            placeholder: "Type to search (3+ chars for server search)..."
           }
         )
       ] }),
       /* @__PURE__ */ jsxs(Box, { flexDirection: "column", height: listHeight, children: [
-        filteredAndSorted.slice(windowed.start, windowed.end).map((repo, i) => {
+        filterMode && filter.trim().length > 0 && filter.trim().length < 3 ? /* @__PURE__ */ jsx(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, children: /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "Type at least 3 characters to search" }) }) : visibleItems.slice(windowed.start, windowed.end).map((repo, i) => {
           const idx = windowed.start + i;
           return /* @__PURE__ */ jsx(
             RepoRow,
             {
               repo,
-              selected: idx === cursor,
+              selected: filterMode && searchActive ? false : idx === cursor,
               index: idx + 1,
               maxWidth: terminalWidth - 6,
               spacingLines,
@@ -1686,15 +1951,16 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin }) {
           /* @__PURE__ */ jsx(Box, { width: 2, flexShrink: 0, flexGrow: 0, marginRight: 1, children: /* @__PURE__ */ jsx(Text, { color: "cyan", children: /* @__PURE__ */ jsx(SlowSpinner, {}) }) }),
           /* @__PURE__ */ jsx(Text, { color: "cyan", children: "Loading more repositories..." })
         ] }) }),
-        !loading && filteredAndSorted.length === 0 && /* @__PURE__ */ jsx(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, children: /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: filter ? "No repositories match your filter" : "No repositories found" }) })
+        !loading && !searchLoading && visibleItems.length === 0 && /* @__PURE__ */ jsx(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, children: /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: searchActive ? "No repositories match your search" : filter ? "No repositories match your filter" : "No repositories found" }) })
       ] })
     ] }) }),
     /* @__PURE__ */ jsxs(Box, { marginTop: 1, paddingX: 1, flexDirection: "column", children: [
       /* @__PURE__ */ jsx(Box, { width: terminalWidth, justifyContent: "center", children: /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: modalOpen ? true : void 0, children: "\u2191\u2193 Navigate \u2022 Ctrl+G Top \u2022 G Bottom \u2022 / Filter \u2022 S Sort \u2022 D Direction \u2022 T Density \u2022 F Forks - Commits Behind \u2022 \u23CE/O Open" }) }),
-      /* @__PURE__ */ jsx(Box, { width: terminalWidth, justifyContent: "center", children: /* @__PURE__ */ jsxs(Text, { color: "gray", dimColor: modalOpen ? true : void 0, children: [
-        "Del/Ctrl+Backspace Delete \u2022 Ctrl+A Un/Archive \u2022 Ctrl+U Sync Fork \u2022 Ctrl+L Logout \u2022 R Refresh \u2022 Q Quit",
-        process.env.GH_MANAGER_DEBUG === "1" && " \u2022 I Cache Info"
-      ] }) })
+      /* @__PURE__ */ jsx(Box, { width: terminalWidth, justifyContent: "center", children: /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: modalOpen ? true : void 0, children: "Del/Ctrl+Backspace Delete \u2022 Ctrl+A Un/Archive \u2022 Ctrl+U Sync Fork \u2022 I Info \u2022 Ctrl+I Cache \u2022 Ctrl+L Logout \u2022 R Refresh \u2022 Q Quit" }) })
+    ] }),
+    process.env.GH_MANAGER_DEBUG === "1" && /* @__PURE__ */ jsxs(Box, { marginTop: 1, borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "yellow", children: "Debug Messages:" }),
+      debugMessages.length === 0 ? /* @__PURE__ */ jsx(Text, { color: "gray", children: "No debug messages yet..." }) : debugMessages.map((msg, i) => /* @__PURE__ */ jsx(Text, { color: "gray", children: msg }, i))
     ] })
   ] });
 }
@@ -1861,7 +2127,8 @@ function App() {
       /* @__PURE__ */ jsxs2(Text2, { color: "gray", dimColor: true, children: [
         "v",
         packageJson.version
-      ] })
+      ] }),
+      process.env.GH_MANAGER_DEBUG === "1" && /* @__PURE__ */ jsx2(Text2, { backgroundColor: "blue", color: "white", children: " debug mode " })
     ] }),
     viewer && /* @__PURE__ */ jsxs2(Text2, { color: "gray", children: [
       "@",
@@ -1985,6 +2252,9 @@ function App() {
 
 // src/index.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+if (process.env.GH_MANAGER_DEBUG === "1") {
+  process.stderr.write("\u{1F41B} Debug mode enabled\n");
+}
 process.on("uncaughtException", (err) => {
   console.error("Unhandled error:", err.message || err);
   process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-manager-cli",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "private": false,
   "description": "Interactive CLI to manage your GitHub repos (personal) with Ink",
   "license": "MIT",
@@ -38,12 +38,13 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@apollo/client": "^3.11.10",
+    "@apollo/client": "^3.14.0",
     "@octokit/graphql": "^9.0.1",
     "apollo3-cache-persist": "^0.14.1",
     "chalk": "^5.6.0",
     "dotenv": "^17.2.1",
     "env-paths": "^3.0.0",
+    "graphql": "^16.11.0",
     "ink": "^6.2.3",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",