gitpadi 2.1.4 → 2.1.6

package/dist/cli.js

@@ -26,7 +26,7 @@ import { dripsMenu } from './commands/drips.js';
 import * as gitlabIssues from './commands/gitlab-issues.js';
 import * as gitlabMRs from './commands/gitlab-mrs.js';
 import * as gitlabPipelines from './commands/gitlab-pipelines.js';
-const VERSION = '2.1.4';
+const VERSION = '2.1.6';
 let targetConfirmed = false;
 let gitlabProjectConfirmed = false;
 // ── Styling ────────────────────────────────────────────────────────────

package/dist/commands/drips.js

@@ -456,13 +456,127 @@ async function autoApply(program, profile) {
     console.log(bold(`  Done: ${green(applied + ' applied')}${skipped > 0 ? ', ' + yellow(skipped + ' skipped (org limit)') : ''}${failed > 0 ? ', ' + red(failed + ' failed') : ''}`));
     console.log(dim(`\n  Track your applications: ${cyan(DRIPS_WEB + '/wave/' + program.slug)}\n`));
 }
-// ── Browse by track ───────────────────────────────────────────────────────────
+// ── Repo/org search ───────────────────────────────────────────────────────────
+/**
+ * Scans the wave program and returns unique repos whose org or repo name
+ * contains the search term (case-insensitive).
+ */
+async function searchRepos(program, term) {
+    const termLower = term.toLowerCase();
+    const repoMap = new Map();
+    const MAX_SEARCH_PAGES = 20;
+    for (let p = 1; p <= MAX_SEARCH_PAGES; p++) {
+        const res = await fetchIssuePage(program.id, p, 50);
+        for (const issue of res.data) {
+            if (!issue.repo)
+                continue;
+            const fullName = issue.repo.fullName.toLowerCase();
+            const [org, repo] = fullName.split('/');
+            if (!org.includes(termLower) && !repo.includes(termLower))
+                continue;
+            const existing = repoMap.get(fullName);
+            if (existing) {
+                existing.issueCount++;
+            }
+            else {
+                repoMap.set(fullName, { org, repo, fullName, issueCount: 1 });
+            }
+        }
+        if (!res.pagination.hasNextPage)
+            break;
+    }
+    return Array.from(repoMap.values()).sort((a, b) => b.issueCount - a.issueCount);
+}
+// ── Browse by org + track ─────────────────────────────────────────────────────
 async function browseByTrack(program, profile) {
-    // Ask which track to browse if they want to override
+    // Step 1: ask for org/repo name with search fallback
+    const { orgInput } = await inquirer.prompt([{
+            type: 'input',
+            name: 'orgInput',
+            message: bold('Enter org name or repo name to search (e.g. stellar, Inheritx, uniswap):'),
+            validate: (v) => v.trim().length > 0 || 'Required',
+        }]);
+    const term = orgInput.trim();
+    // Search for matching repos in the wave program
+    const searchSpinner = ora(dim(`  Searching for "${term}" in ${program.name} wave…`)).start();
+    let matches;
+    try {
+        matches = await searchRepos(program, term);
+    }
+    catch (e) {
+        searchSpinner.fail(`  Search failed: ${e.message}`);
+        return;
+    }
+    if (matches.length === 0) {
+        searchSpinner.warn(yellow(`  No repos found matching "${term}" in the ${program.name} wave.`));
+        console.log(dim('  Try a shorter or different search term.\n'));
+        return browseByTrack(program, profile);
+    }
+    searchSpinner.succeed(`  Found ${matches.length} repo(s) matching "${term}"`);
+    console.log();
+    // If exact single match, use it directly — otherwise let user pick
+    // Value is the full repo name (org/repo) so we can filter precisely
+    let targetFullName; // e.g. "inheritx/smart-contracts" or "stellar" (org-level)
+    let displayLabel;
+    const exactOrg = matches.find(m => m.org === term.toLowerCase());
+    const exactRepo = matches.find(m => m.fullName === term.toLowerCase());
+    if (matches.length === 1) {
+        targetFullName = matches[0].fullName;
+        displayLabel = matches[0].fullName;
+        console.log(dim(`  Using repo: ${cyan(displayLabel)}\n`));
+    }
+    else if (exactRepo) {
+        targetFullName = exactRepo.fullName;
+        displayLabel = exactRepo.fullName;
+        console.log(dim(`  Using repo: ${cyan(displayLabel)}\n`));
+    }
+    else if (exactOrg) {
+        // Exact org match — show all repos under that org
+        targetFullName = exactOrg.org; // org-level (prefix match)
+        displayLabel = exactOrg.org + '/*';
+        console.log(dim(`  Using org: ${cyan(exactOrg.org)} (all repos)\n`));
+    }
+    else {
+        // Multiple partial matches — let user pick repo or entire org
+        const repoChoices = [];
+        // Group by org: if org has multiple repos, offer org-level option first
+        const orgs = [...new Set(matches.map(m => m.org))];
+        for (const org of orgs) {
+            const orgRepos = matches.filter(m => m.org === org);
+            if (orgRepos.length > 1) {
+                const total = orgRepos.reduce((s, r) => s + r.issueCount, 0);
+                repoChoices.push({
+                    name: `  ${cyan(org + '/*')}  ${dim(`all ${orgRepos.length} repos · ${total} issues`)}`,
+                    value: org,
+                    short: org + '/*',
+                });
+            }
+            for (const r of orgRepos) {
+                repoChoices.push({
+                    name: `    ${dim('└')} ${cyan(r.fullName)}  ${dim(r.issueCount + ' issue(s)')}`,
+                    value: r.fullName,
+                    short: r.fullName,
+                });
+            }
+        }
+        repoChoices.push(new inquirer.Separator(dim('  ───────────────────────────')), { name: `  ${dim('🔍  Search again')}`, value: '__search__', short: 'search' });
+        const { picked } = await inquirer.prompt([{
+                type: 'list',
+                name: 'picked',
+                message: bold('Pick the org or repo to browse:'),
+                choices: repoChoices,
+                pageSize: 18,
+            }]);
+        if (picked === '__search__')
+            return browseByTrack(program, profile);
+        targetFullName = picked;
+        displayLabel = picked.includes('/') && !picked.endsWith('/*') ? picked : picked + '/*';
+    }
+    // Step 2: ask for track
     const { browseTrack } = await inquirer.prompt([{
             type: 'list',
             name: 'browseTrack',
-            message: bold('Browse which track?'),
+            message: bold('Filter by track:'),
             default: profile.track,
             choices: [
                 { name: `  ${cyan('⚙️')}  Backend`, value: 'backend' },
@@ -472,40 +586,60 @@ async function browseByTrack(program, profile) {
             ],
         }]);
     const selectedTrack = browseTrack;
-    let page = 1;
-    while (true) {
-        const spinner = ora(dim(`  Fetching unassigned issues (page ${page})…`)).start();
-        let allIssues = [];
-        let hasNextPage = false;
-        let totalFetched = 0;
-        // Fetch a batch and filter client-side for unassigned + track
-        try {
-            // Fetch 2 pages worth (100 issues) to ensure we have enough unassigned after filtering
-            const batchStart = (page - 1) * 2 + 1;
-            const pageA = await fetchIssuePage(program.id, batchStart, 50);
-            const pageB = pageA.pagination.hasNextPage
-                ? await fetchIssuePage(program.id, batchStart + 1, 50)
-                : { data: [], pagination: { ...pageA.pagination, hasNextPage: false } };
-            const raw = [...pageA.data, ...pageB.data];
-            totalFetched = raw.length;
-            // Filter: unassigned + track + min points
-            allIssues = raw.filter(i => i.assignedApplicant === null &&
-                matchesTrack(i, selectedTrack) &&
-                (profile.minPoints === 0 || i.points === null || i.points >= profile.minPoints));
-            // Sort by points descending (highest reward first)
-            allIssues.sort((a, b) => (b.points || 0) - (a.points || 0));
-            hasNextPage = pageB.pagination.hasNextPage || (pageA.pagination.hasNextPage && !pageB.pagination.hasNextPage);
-            spinner.succeed(`  ${allIssues.length} unassigned ${selectedTrack} issue(s) found (from ${totalFetched} scanned) — sorted by points`);
-        }
-        catch (e) {
-            spinner.fail(`  ${e.message}`);
-            return;
-        }
-        if (allIssues.length === 0) {
-            console.log(yellow(`\n  No unassigned ${selectedTrack} issues found on this page. Try next page or change track.\n`));
+    // Step 3: scan and collect — match by exact repo fullName or org prefix
+    const isOrgLevel = !targetFullName.includes('/'); // "stellar" vs "stellar/js-stellar-sdk"
+    const spinner = ora(dim(`  Scanning ${program.name} for unassigned ${selectedTrack} issues in ${bold(displayLabel)}…`)).start();
+    const collected = [];
+    let apiPage = 1;
+    const MAX_SCAN_PAGES = 20;
+    try {
+        while (apiPage <= MAX_SCAN_PAGES) {
+            const res = await fetchIssuePage(program.id, apiPage, 50);
+            for (const issue of res.data) {
+                if (!issue.repo)
+                    continue;
+                const issueFullName = issue.repo.fullName.toLowerCase();
+                const issueOrg = issueFullName.split('/')[0];
+                // Match: exact repo OR org-level (all repos under that org)
+                const matches = isOrgLevel
+                    ? issueOrg === targetFullName
+                    : issueFullName === targetFullName;
+                if (!matches)
+                    continue;
+                if (issue.assignedApplicant !== null)
+                    continue;
+                if (!matchesTrack(issue, selectedTrack))
+                    continue;
+                if (profile.minPoints > 0 && issue.points !== null && issue.points < profile.minPoints)
+                    continue;
+                collected.push(issue);
+            }
+            spinner.text = dim(`  Scanning page ${apiPage}/${MAX_SCAN_PAGES} — ${collected.length} matching issue(s) so far…`);
+            if (!res.pagination.hasNextPage)
+                break;
+            apiPage++;
         }
+    }
+    catch (e) {
+        spinner.fail(`  ${e.message}`);
+        return;
+    }
+    // Sort by points descending
+    collected.sort((a, b) => (b.points || 0) - (a.points || 0));
+    if (collected.length === 0) {
+        spinner.warn(yellow(`  No unassigned ${selectedTrack} issues found for "${displayLabel}" in the ${program.name} wave.`));
+        console.log(dim('  Try a different track, lower min points, or search again.\n'));
+        return;
+    }
+    spinner.succeed(`  ${bold(collected.length + '')} unassigned ${selectedTrack} issue(s) from ${cyan(displayLabel)} — sorted by points`);
+    // Step 4: paginate through results (20 per page)
+    const PAGE_SIZE = 20;
+    let viewPage = 0;
+    while (true) {
+        const pageSlice = collected.slice(viewPage * PAGE_SIZE, (viewPage + 1) * PAGE_SIZE);
+        const totalPages = Math.ceil(collected.length / PAGE_SIZE);
         console.log();
-        const choices = allIssues.slice(0, 20).map((issue) => {
+        const choices = pageSlice.map((issue) => {
             const age = diffDays(issue.updatedAt);
             const ageStr = age === 0 ? dim('today') : dim(`${age}d ago`);
             const pts = issue.points ? green(`+${issue.points}pts`) : dim('  —pts');
@@ -524,26 +658,29 @@ async function browseByTrack(program, profile) {
         const nav = [
             new inquirer.Separator(dim('  ─────────────────────────────────────────────────────')),
         ];
-        if (hasNextPage)
-            nav.push({ name: `  ${dim('→  Next page')}`, value: '__next__' });
-        if (page > 1)
-            nav.push({ name: `  ${dim('←  Previous page')}`, value: '__prev__' });
+        if ((viewPage + 1) < totalPages)
+            nav.push({ name: `  ${dim(`→  Next page (${viewPage + 2}/${totalPages})`)}`, value: '__next__' });
+        if (viewPage > 0)
+            nav.push({ name: `  ${dim(`←  Previous page (${viewPage}/${totalPages})`)}`, value: '__prev__' });
+        nav.push({ name: `  ${dim('🔍  Search a different org')}`, value: '__reorg__' });
         nav.push({ name: `  ${dim('⬅  Back')}`, value: '__back__' });
         const { selected } = await inquirer.prompt([{
                 type: 'list',
                 name: 'selected',
-                message: bold(`${program.name} — ${selectedTrack} issues sorted by points:`),
-                choices: allIssues.length > 0 ? [...choices, ...nav] : nav,
-                pageSize: 18,
+                message: bold(`${displayLabel} — ${selectedTrack} issues (${collected.length} total, page ${viewPage + 1}/${totalPages}):`),
+                choices: [...choices, ...nav],
+                pageSize: 20,
             }]);
         if (selected === '__back__')
             return;
+        if (selected === '__reorg__')
+            return browseByTrack(program, profile);
         if (selected === '__next__') {
-            page++;
+            viewPage++;
             continue;
         }
         if (selected === '__prev__') {
-            page = Math.max(1, page - 1);
+            viewPage = Math.max(0, viewPage - 1);
             continue;
         }
         await applySingle(program, selected, profile);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitpadi",
-    "version": "2.1.4",
+    "version": "2.1.6",
     "description": "GitPadi — AI-powered GitHub & GitLab management CLI. Fork repos, manage issues & PRs, score contributors, grade assignments, and automate everything. Powered by Anthropic Claude via GitLab Duo Agent Platform.",
     "type": "module",
     "bin": {

package/src/cli.ts

@@ -35,7 +35,7 @@ import * as gitlabIssues from './commands/gitlab-issues.js';
 import * as gitlabMRs from './commands/gitlab-mrs.js';
 import * as gitlabPipelines from './commands/gitlab-pipelines.js';
 
-const VERSION = '2.1.4';
+const VERSION = '2.1.6';
 let targetConfirmed = false;
 let gitlabProjectConfirmed = false;
 

package/src/commands/drips.ts

@@ -554,70 +554,218 @@ async function autoApply(program: DripsProgram, profile: DripsProfile): Promise<
     console.log(dim(`\n  Track your applications: ${cyan(DRIPS_WEB + '/wave/' + program.slug)}\n`));
 }
 
-// ── Browse by track ───────────────────────────────────────────────────────────
+// ── Repo/org search ───────────────────────────────────────────────────────────
+
+/**
+ * Scans the wave program and returns unique repos whose org or repo name
+ * contains the search term (case-insensitive).
+ */
+async function searchRepos(
+    program: DripsProgram,
+    term: string,
+): Promise<Array<{ org: string; repo: string; fullName: string; issueCount: number }>> {
+    const termLower = term.toLowerCase();
+    const repoMap = new Map<string, { org: string; repo: string; fullName: string; issueCount: number }>();
+    const MAX_SEARCH_PAGES = 20;
+
+    for (let p = 1; p <= MAX_SEARCH_PAGES; p++) {
+        const res = await fetchIssuePage(program.id, p, 50);
+
+        for (const issue of res.data) {
+            if (!issue.repo) continue;
+            const fullName = issue.repo.fullName.toLowerCase();
+            const [org, repo] = fullName.split('/');
+            if (!org.includes(termLower) && !repo.includes(termLower)) continue;
+
+            const existing = repoMap.get(fullName);
+            if (existing) {
+                existing.issueCount++;
+            } else {
+                repoMap.set(fullName, { org, repo, fullName, issueCount: 1 });
+            }
+        }
+
+        if (!res.pagination.hasNextPage) break;
+    }
+
+    return Array.from(repoMap.values()).sort((a, b) => b.issueCount - a.issueCount);
+}
+
+// ── Browse by org + track ─────────────────────────────────────────────────────
 
 async function browseByTrack(program: DripsProgram, profile: DripsProfile): Promise<void> {
-    // Ask which track to browse if they want to override
+    // Step 1: ask for org/repo name with search fallback
+    const { orgInput } = await inquirer.prompt([{
+        type: 'input',
+        name: 'orgInput',
+        message: bold('Enter org name or repo name to search (e.g. stellar, Inheritx, uniswap):'),
+        validate: (v: string) => v.trim().length > 0 || 'Required',
+    }]);
+
+    const term = orgInput.trim();
+
+    // Search for matching repos in the wave program
+    const searchSpinner = ora(dim(`  Searching for "${term}" in ${program.name} wave…`)).start();
+    let matches: Array<{ org: string; repo: string; fullName: string; issueCount: number }>;
+    try {
+        matches = await searchRepos(program, term);
+    } catch (e: any) {
+        searchSpinner.fail(`  Search failed: ${e.message}`);
+        return;
+    }
+
+    if (matches.length === 0) {
+        searchSpinner.warn(yellow(`  No repos found matching "${term}" in the ${program.name} wave.`));
+        console.log(dim('  Try a shorter or different search term.\n'));
+        return browseByTrack(program, profile);
+    }
+
+    searchSpinner.succeed(`  Found ${matches.length} repo(s) matching "${term}"`);
+    console.log();
+
+    // If exact single match, use it directly — otherwise let user pick
+    // Value is the full repo name (org/repo) so we can filter precisely
+    let targetFullName: string; // e.g. "inheritx/smart-contracts" or "stellar" (org-level)
+    let displayLabel: string;
+
+    const exactOrg = matches.find(m => m.org === term.toLowerCase());
+    const exactRepo = matches.find(m => m.fullName === term.toLowerCase());
+
+    if (matches.length === 1) {
+        targetFullName = matches[0].fullName;
+        displayLabel = matches[0].fullName;
+        console.log(dim(`  Using repo: ${cyan(displayLabel)}\n`));
+    } else if (exactRepo) {
+        targetFullName = exactRepo.fullName;
+        displayLabel = exactRepo.fullName;
+        console.log(dim(`  Using repo: ${cyan(displayLabel)}\n`));
+    } else if (exactOrg) {
+        // Exact org match — show all repos under that org
+        targetFullName = exactOrg.org; // org-level (prefix match)
+        displayLabel = exactOrg.org + '/*';
+        console.log(dim(`  Using org: ${cyan(exactOrg.org)} (all repos)\n`));
+    } else {
+        // Multiple partial matches — let user pick repo or entire org
+        const repoChoices: any[] = [];
+
+        // Group by org: if org has multiple repos, offer org-level option first
+        const orgs = [...new Set(matches.map(m => m.org))];
+        for (const org of orgs) {
+            const orgRepos = matches.filter(m => m.org === org);
+            if (orgRepos.length > 1) {
+                const total = orgRepos.reduce((s, r) => s + r.issueCount, 0);
+                repoChoices.push({
+                    name: `  ${cyan(org + '/*')}  ${dim(`all ${orgRepos.length} repos · ${total} issues`)}`,
+                    value: org,
+                    short: org + '/*',
+                });
+            }
+            for (const r of orgRepos) {
+                repoChoices.push({
+                    name: `    ${dim('└')} ${cyan(r.fullName)}  ${dim(r.issueCount + ' issue(s)')}`,
+                    value: r.fullName,
+                    short: r.fullName,
+                });
+            }
+        }
+
+        repoChoices.push(
+            new inquirer.Separator(dim('  ───────────────────────────')) as any,
+            { name: `  ${dim('🔍  Search again')}`, value: '__search__', short: 'search' },
+        );
+
+        const { picked } = await inquirer.prompt([{
+            type: 'list',
+            name: 'picked',
+            message: bold('Pick the org or repo to browse:'),
+            choices: repoChoices,
+            pageSize: 18,
+        }]);
+
+        if (picked === '__search__') return browseByTrack(program, profile);
+        targetFullName = picked;
+        displayLabel = picked.includes('/') && !picked.endsWith('/*') ? picked : picked + '/*';
+    }
+
+    // Step 2: ask for track
     const { browseTrack } = await inquirer.prompt([{
         type: 'list',
         name: 'browseTrack',
-        message: bold('Browse which track?'),
+        message: bold('Filter by track:'),
         default: profile.track,
         choices: [
-            { name: `  ${cyan('⚙️')}  Backend`, value: 'backend' },
-            { name: `  ${magenta('🎨')}  Frontend`, value: 'frontend' },
+            { name: `  ${cyan('⚙️')}  Backend`,        value: 'backend' },
+            { name: `  ${magenta('🎨')}  Frontend`,      value: 'frontend' },
             { name: `  ${yellow('📜')}  Smart Contract`, value: 'contract' },
-            { name: `  ${green('🌐')}  All tracks`, value: 'all' },
+            { name: `  ${green('🌐')}  All tracks`,      value: 'all' },
         ],
     }]);
 
     const selectedTrack: Track = browseTrack;
-    let page = 1;
 
-    while (true) {
-        const spinner = ora(dim(`  Fetching unassigned issues (page ${page})…`)).start();
-        let allIssues: DripsIssue[] = [];
-        let hasNextPage = false;
-        let totalFetched = 0;
+    // Step 3: scan and collect — match by exact repo fullName or org prefix
+    const isOrgLevel = !targetFullName.includes('/'); // "stellar" vs "stellar/js-stellar-sdk"
+    const spinner = ora(dim(`  Scanning ${program.name} for unassigned ${selectedTrack} issues in ${bold(displayLabel)}…`)).start();
 
-        // Fetch a batch and filter client-side for unassigned + track
-        try {
-            // Fetch 2 pages worth (100 issues) to ensure we have enough unassigned after filtering
-            const batchStart = (page - 1) * 2 + 1;
-            const pageA = await fetchIssuePage(program.id, batchStart, 50);
-            const pageB = pageA.pagination.hasNextPage
-                ? await fetchIssuePage(program.id, batchStart + 1, 50)
-                : { data: [], pagination: { ...pageA.pagination, hasNextPage: false } };
-
-            const raw = [...pageA.data, ...pageB.data];
-            totalFetched = raw.length;
-
-            // Filter: unassigned + track + min points
-            allIssues = raw.filter(i =>
-                i.assignedApplicant === null &&
-                matchesTrack(i, selectedTrack) &&
-                (profile.minPoints === 0 || i.points === null || i.points >= profile.minPoints)
-            );
+    const collected: DripsIssue[] = [];
+    let apiPage = 1;
+    const MAX_SCAN_PAGES = 20;
 
-            // Sort by points descending (highest reward first)
-            allIssues.sort((a, b) => (b.points || 0) - (a.points || 0));
+    try {
+        while (apiPage <= MAX_SCAN_PAGES) {
+            const res = await fetchIssuePage(program.id, apiPage, 50);
+
+            for (const issue of res.data) {
+                if (!issue.repo) continue;
+                const issueFullName = issue.repo.fullName.toLowerCase();
+                const issueOrg = issueFullName.split('/')[0];
+
+                // Match: exact repo OR org-level (all repos under that org)
+                const matches = isOrgLevel
+                    ? issueOrg === targetFullName
+                    : issueFullName === targetFullName;
+                if (!matches) continue;
+
+                if (issue.assignedApplicant !== null) continue;
+                if (!matchesTrack(issue, selectedTrack)) continue;
+                if (profile.minPoints > 0 && issue.points !== null && issue.points < profile.minPoints) continue;
+                collected.push(issue);
+            }
 
-            hasNextPage = pageB.pagination.hasNextPage || (pageA.pagination.hasNextPage && !pageB.pagination.hasNextPage);
+            spinner.text = dim(`  Scanning page ${apiPage}/${MAX_SCAN_PAGES} — ${collected.length} matching issue(s) so far…`);
 
-            spinner.succeed(
-                `  ${allIssues.length} unassigned ${selectedTrack} issue(s) found (from ${totalFetched} scanned) — sorted by points`
-            );
-        } catch (e: any) {
-            spinner.fail(`  ${e.message}`);
-            return;
+            if (!res.pagination.hasNextPage) break;
+            apiPage++;
         }
+    } catch (e: any) {
+        spinner.fail(`  ${e.message}`);
+        return;
+    }
 
-        if (allIssues.length === 0) {
-            console.log(yellow(`\n  No unassigned ${selectedTrack} issues found on this page. Try next page or change track.\n`));
-        }
+    // Sort by points descending
+    collected.sort((a, b) => (b.points || 0) - (a.points || 0));
+
+    if (collected.length === 0) {
+        spinner.warn(yellow(`  No unassigned ${selectedTrack} issues found for "${displayLabel}" in the ${program.name} wave.`));
+        console.log(dim('  Try a different track, lower min points, or search again.\n'));
+        return;
+    }
+
+    spinner.succeed(
+        `  ${bold(collected.length + '')} unassigned ${selectedTrack} issue(s) from ${cyan(displayLabel)} — sorted by points`
+    );
+
+    // Step 4: paginate through results (20 per page)
+    const PAGE_SIZE = 20;
+    let viewPage = 0;
+
+    while (true) {
+        const pageSlice = collected.slice(viewPage * PAGE_SIZE, (viewPage + 1) * PAGE_SIZE);
+        const totalPages = Math.ceil(collected.length / PAGE_SIZE);
 
         console.log();
-        const choices = allIssues.slice(0, 20).map((issue) => {
+
+        const choices = pageSlice.map((issue) => {
             const age = diffDays(issue.updatedAt);
             const ageStr = age === 0 ? dim('today') : dim(`${age}d ago`);
             const pts = issue.points ? green(`+${issue.points}pts`) : dim('  —pts');
@@ -637,21 +785,23 @@ async function browseByTrack(program: DripsProgram, profile: DripsProfile): Prom
         const nav: any[] = [
             new inquirer.Separator(dim('  ─────────────────────────────────────────────────────')),
         ];
-        if (hasNextPage) nav.push({ name: `  ${dim('→  Next page')}`, value: '__next__' });
-        if (page > 1) nav.push({ name: `  ${dim('←  Previous page')}`, value: '__prev__' });
+        if ((viewPage + 1) < totalPages) nav.push({ name: `  ${dim(`→  Next page (${viewPage + 2}/${totalPages})`)}`, value: '__next__' });
+        if (viewPage > 0) nav.push({ name: `  ${dim(`←  Previous page (${viewPage}/${totalPages})`)}`, value: '__prev__' });
+        nav.push({ name: `  ${dim('🔍  Search a different org')}`, value: '__reorg__' });
         nav.push({ name: `  ${dim('⬅  Back')}`, value: '__back__' });
 
         const { selected } = await inquirer.prompt([{
             type: 'list',
             name: 'selected',
-            message: bold(`${program.name} — ${selectedTrack} issues sorted by points:`),
-            choices: allIssues.length > 0 ? [...choices, ...nav] : nav,
-            pageSize: 18,
+            message: bold(`${displayLabel} — ${selectedTrack} issues (${collected.length} total, page ${viewPage + 1}/${totalPages}):`),
+            choices: [...choices, ...nav],
+            pageSize: 20,
         }]);
 
         if (selected === '__back__') return;
-        if (selected === '__next__') { page++; continue; }
-        if (selected === '__prev__') { page = Math.max(1, page - 1); continue; }
+        if (selected === '__reorg__') return browseByTrack(program, profile);
+        if (selected === '__next__') { viewPage++; continue; }
+        if (selected === '__prev__') { viewPage = Math.max(0, viewPage - 1); continue; }
 
         await applySingle(program, selected as DripsIssue, profile);
     }