gitpadi 2.1.3 → 2.1.5

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.3';
+const VERSION = '2.1.5';
 let targetConfirmed = false;
 let gitlabProjectConfirmed = false;
 // ── Styling ────────────────────────────────────────────────────────────

package/dist/commands/drips.js

@@ -96,6 +96,11 @@ function parseSlug(input) {
 function issueLabels(issue) {
     return issue.labels.map(l => l.name.toLowerCase());
 }
+const ORG_APPLICATION_LIMIT = 4;
+/** Extract the org/owner from a repo fullName like "myorg/myrepo" */
+function extractOrg(issue) {
+    return issue.repo?.fullName?.split('/')[0]?.toLowerCase() || '__unknown__';
+}
 /** Detect which track an issue belongs to based on its labels and title */
 function detectTrack(issue) {
     const haystack = [...issueLabels(issue), issue.title.toLowerCase()].join(' ');
@@ -265,13 +270,12 @@ async function setupProfile(existing) {
             type: 'list',
             name: 'minPoints',
             message: bold('Minimum points to apply for:'),
-            default: existing?.minPoints || 0,
+            default: existing?.minPoints ?? 100,
             choices: [
-                { name: `  Any points (including unspecified)`, value: 0 },
-                { name: `  50+ pts`, value: 50 },
-                { name: `  100+ pts`, value: 100 },
-                { name: `  200+ pts`, value: 200 },
-                { name: `  500+ pts`, value: 500 },
+                { name: `  Any (including unspecified)`, value: 0 },
+                { name: `  100 pts`, value: 100 },
+                { name: `  150 pts`, value: 150 },
+                { name: `  200 pts`, value: 200 },
             ],
         }]);
     const techStack = stackInput.split(',').map((s) => s.trim()).filter(Boolean);
@@ -344,15 +348,23 @@ async function autoApply(program, profile) {
     }
     console.log();
     // Checkbox selection
+    // Pre-compute org counts to show how many slots remain per org
+    const previewOrgCounts = new Map();
     const checkboxChoices = top.map(({ issue, score, matchReasons }) => {
         const pts = issue.points ? green(`+${issue.points}pts`) : dim('—pts');
         const applicants = issue.pendingApplicationsCount > 0 ? yellow(`${issue.pendingApplicationsCount}▲`) : dim('0▲');
         const match = matchReasons.length > 0 ? cyan(`[${matchReasons.slice(0, 3).join(', ')}]`) : '';
-        const title = truncate(issue.title, 44);
+        const org = extractOrg(issue);
+        const orgSlots = ORG_APPLICATION_LIMIT - (previewOrgCounts.get(org) || 0);
+        const orgTag = dim(`(${org} ${orgSlots}/${ORG_APPLICATION_LIMIT} slots)`);
+        const title = truncate(issue.title, 40);
+        const autoCheck = score >= 1 && orgSlots > 0;
+        if (autoCheck)
+            previewOrgCounts.set(org, (previewOrgCounts.get(org) || 0) + 1);
         return {
-            name: `  ${pts}  ${bold(title)}  ${match}  ${applicants}`,
+            name: `  ${pts}  ${bold(title)}  ${match}  ${applicants}  ${orgTag}`,
             value: issue,
-            checked: score >= 1, // pre-select strong matches
+            checked: autoCheck,
         };
     });
     const { selectedIssues } = await inquirer.prompt([{
@@ -413,11 +425,21 @@ async function autoApply(program, profile) {
     console.log();
     let applied = 0;
     let failed = 0;
+    let skipped = 0;
+    const orgCounts = new Map();
     for (const issue of selectedIssues) {
+        const org = extractOrg(issue);
+        const orgCount = orgCounts.get(org) || 0;
+        if (orgCount >= ORG_APPLICATION_LIMIT) {
+            console.log(yellow(`  ⚠  Skipped: ${truncate(issue.title, 50)} — already applied to ${ORG_APPLICATION_LIMIT} issues from ${org}`));
+            skipped++;
+            continue;
+        }
         const spinner = ora(`  Applying to: ${truncate(issue.title, 50)}…`).start();
         try {
             await dripsPost(`/api/wave-programs/${program.id}/issues/${issue.id}/applications`, { applicationText: baseMessage }, token);
-            spinner.succeed(green(`  ✅ ${truncate(issue.title, 55)}`) + (issue.points ? dim(` (+${issue.points}pts)`) : ''));
+            orgCounts.set(org, orgCount + 1);
+            spinner.succeed(green(`  ✅ ${truncate(issue.title, 55)}`) + (issue.points ? dim(` (+${issue.points}pts)`) : '') + dim(` [${org}: ${orgCount + 1}/${ORG_APPLICATION_LIMIT}]`));
             applied++;
         }
         catch (e) {
@@ -431,16 +453,24 @@ async function autoApply(program, profile) {
         }
     }
     console.log();
-    console.log(bold(`  Done: ${green(applied + ' applied')}${failed > 0 ? ', ' + red(failed + ' failed') : ''}`));
+    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 ───────────────────────────────────────────────────────────
+// ── Browse by org + track ─────────────────────────────────────────────────────
 async function browseByTrack(program, profile) {
-    // Ask which track to browse if they want to override
+    // Step 1: ask for org name
+    const { orgInput } = await inquirer.prompt([{
+            type: 'input',
+            name: 'orgInput',
+            message: bold('Enter GitHub org name (e.g. stellar, uniswap, openzeppelin):'),
+            validate: (v) => v.trim().length > 0 || 'Required',
+        }]);
+    const targetOrg = orgInput.trim().toLowerCase();
+    // 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' },
@@ -450,40 +480,52 @@ 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 the wave program and collect ALL unassigned issues from this org
+    const spinner = ora(dim(`  Scanning for unassigned ${selectedTrack} issues in ${bold(targetOrg)}…`)).start();
+    const collected = [];
+    let apiPage = 1;
+    const MAX_SCAN_PAGES = 20; // scan up to 1000 issues to find the org's full list
+    try {
+        while (apiPage <= MAX_SCAN_PAGES) {
+            const res = await fetchIssuePage(program.id, apiPage, 50);
+            for (const issue of res.data) {
+                const issueOrg = extractOrg(issue);
+                if (issueOrg !== targetOrg)
+                    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} — found ${collected.length} issues in ${targetOrg} 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 org "${targetOrg}" in the ${program.name} wave.`));
+        console.log(dim('  Check the org name matches exactly (e.g. "stellar" not "Stellar").\n'));
+        return;
+    }
+    spinner.succeed(`  ${bold(collected.length + '')} unassigned ${selectedTrack} issue(s) from ${cyan(targetOrg)} — 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');
@@ -502,26 +544,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(`${targetOrg} — ${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.3",
+    "version": "2.1.5",
     "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.3';
+const VERSION = '2.1.5';
 let targetConfirmed = false;
 let gitlabProjectConfirmed = false;
 

package/src/commands/drips.ts

@@ -154,6 +154,13 @@ function issueLabels(issue: DripsIssue): string[] {
     return issue.labels.map(l => l.name.toLowerCase());
 }
 
+const ORG_APPLICATION_LIMIT = 4;
+
+/** Extract the org/owner from a repo fullName like "myorg/myrepo" */
+function extractOrg(issue: DripsIssue): string {
+    return issue.repo?.fullName?.split('/')[0]?.toLowerCase() || '__unknown__';
+}
+
 /** Detect which track an issue belongs to based on its labels and title */
 function detectTrack(issue: DripsIssue): Exclude<Track, 'all'> | null {
     const haystack = [...issueLabels(issue), issue.title.toLowerCase()].join(' ');
@@ -335,13 +342,12 @@ async function setupProfile(existing?: DripsProfile): Promise<DripsProfile> {
         type: 'list',
         name: 'minPoints',
         message: bold('Minimum points to apply for:'),
-        default: existing?.minPoints || 0,
+        default: existing?.minPoints ?? 100,
         choices: [
-            { name: `  Any points (including unspecified)`, value: 0 },
-            { name: `  50+ pts`, value: 50 },
-            { name: `  100+ pts`, value: 100 },
-            { name: `  200+ pts`, value: 200 },
-            { name: `  500+ pts`, value: 500 },
+            { name: `  Any (including unspecified)`, value: 0 },
+            { name: `  100 pts`,                    value: 100 },
+            { name: `  150 pts`,                    value: 150 },
+            { name: `  200 pts`,                    value: 200 },
         ],
     }]);
 
@@ -427,15 +433,22 @@ async function autoApply(program: DripsProgram, profile: DripsProfile): Promise<
     console.log();
 
     // Checkbox selection
+    // Pre-compute org counts to show how many slots remain per org
+    const previewOrgCounts = new Map<string, number>();
     const checkboxChoices = top.map(({ issue, score, matchReasons }) => {
         const pts = issue.points ? green(`+${issue.points}pts`) : dim('—pts');
         const applicants = issue.pendingApplicationsCount > 0 ? yellow(`${issue.pendingApplicationsCount}▲`) : dim('0▲');
         const match = matchReasons.length > 0 ? cyan(`[${matchReasons.slice(0, 3).join(', ')}]`) : '';
-        const title = truncate(issue.title, 44);
+        const org = extractOrg(issue);
+        const orgSlots = ORG_APPLICATION_LIMIT - (previewOrgCounts.get(org) || 0);
+        const orgTag = dim(`(${org} ${orgSlots}/${ORG_APPLICATION_LIMIT} slots)`);
+        const title = truncate(issue.title, 40);
+        const autoCheck = score >= 1 && orgSlots > 0;
+        if (autoCheck) previewOrgCounts.set(org, (previewOrgCounts.get(org) || 0) + 1);
         return {
-            name: `  ${pts}  ${bold(title)}  ${match}  ${applicants}`,
+            name: `  ${pts}  ${bold(title)}  ${match}  ${applicants}  ${orgTag}`,
             value: issue,
-            checked: score >= 1, // pre-select strong matches
+            checked: autoCheck,
         };
     });
 
@@ -502,8 +515,19 @@ async function autoApply(program: DripsProgram, profile: DripsProfile): Promise<
     console.log();
     let applied = 0;
     let failed = 0;
+    let skipped = 0;
+    const orgCounts = new Map<string, number>();
 
     for (const issue of selectedIssues as DripsIssue[]) {
+        const org = extractOrg(issue);
+        const orgCount = orgCounts.get(org) || 0;
+
+        if (orgCount >= ORG_APPLICATION_LIMIT) {
+            console.log(yellow(`  ⚠  Skipped: ${truncate(issue.title, 50)} — already applied to ${ORG_APPLICATION_LIMIT} issues from ${org}`));
+            skipped++;
+            continue;
+        }
+
         const spinner = ora(`  Applying to: ${truncate(issue.title, 50)}…`).start();
         try {
             await dripsPost(
@@ -511,7 +535,8 @@ async function autoApply(program: DripsProgram, profile: DripsProfile): Promise<
                 { applicationText: baseMessage },
                 token,
             );
-            spinner.succeed(green(`  ✅ ${truncate(issue.title, 55)}`) + (issue.points ? dim(` (+${issue.points}pts)`) : ''));
+            orgCounts.set(org, orgCount + 1);
+            spinner.succeed(green(`  ✅ ${truncate(issue.title, 55)}`) + (issue.points ? dim(` (+${issue.points}pts)`) : '') + dim(` [${org}: ${orgCount + 1}/${ORG_APPLICATION_LIMIT}]`));
             applied++;
         } catch (e: any) {
             spinner.fail(red(`  ✗  ${truncate(issue.title, 55)} — ${e.message}`));
@@ -525,74 +550,93 @@ async function autoApply(program: DripsProgram, profile: DripsProfile): Promise<
     }
 
     console.log();
-    console.log(bold(`  Done: ${green(applied + ' applied')}${failed > 0 ? ', ' + red(failed + ' failed') : ''}`));
+    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 ───────────────────────────────────────────────────────────
+// ── 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 name
+    const { orgInput } = await inquirer.prompt([{
+        type: 'input',
+        name: 'orgInput',
+        message: bold('Enter GitHub org name (e.g. stellar, uniswap, openzeppelin):'),
+        validate: (v: string) => v.trim().length > 0 || 'Required',
+    }]);
+
+    const targetOrg = orgInput.trim().toLowerCase();
+
+    // 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 the wave program and collect ALL unassigned issues from this org
+    const spinner = ora(dim(`  Scanning for unassigned ${selectedTrack} issues in ${bold(targetOrg)}…`)).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; // scan up to 1000 issues to find the org's full list
 
-            // 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) {
+                const issueOrg = extractOrg(issue);
+                if (issueOrg !== targetOrg) 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} — found ${collected.length} issues in ${targetOrg} 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 org "${targetOrg}" in the ${program.name} wave.`));
+        console.log(dim('  Check the org name matches exactly (e.g. "stellar" not "Stellar").\n'));
+        return;
+    }
+
+    spinner.succeed(
+        `  ${bold(collected.length + '')} unassigned ${selectedTrack} issue(s) from ${cyan(targetOrg)} — 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');
@@ -612,21 +656,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(`${targetOrg} — ${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);
     }