@oss-scout/core 0.2.0 → 0.3.0

package/dist/core/issue-discovery.js

@@ -11,30 +11,189 @@
  *
  * All state is injected via constructor parameters (ScoutStateReader + ScoutPreferences).
  */
-import { getOctokit, checkRateLimit } from './github.js';
-import { getSearchBudgetTracker } from './search-budget.js';
-import { daysBetween, sleep } from './utils.js';
-import { SCOPE_LABELS } from './types.js';
-import { CONCRETE_STRATEGIES } from './schemas.js';
-import { ValidationError, errorMessage, getHttpStatusCode, isRateLimitError } from './errors.js';
-import { debug, info, warn } from './logger.js';
-import { isDocOnlyIssue, applyPerRepoCap } from './issue-filtering.js';
-import { IssueVetter } from './issue-vetting.js';
-import { getTopicsForCategories } from './category-mapping.js';
-import { buildEffectiveLabels, interleaveArrays, cachedSearchIssues, filterVetAndScore, searchInRepos, searchWithChunkedLabels, } from './search-phases.js';
-const MODULE = 'issue-discovery';
+import { getOctokit, checkRateLimit } from "./github.js";
+import { getSearchBudgetTracker } from "./search-budget.js";
+import { daysBetween, extractRepoFromUrl, sleep } from "./utils.js";
+import { SCOPE_LABELS, } from "./types.js";
+import { CONCRETE_STRATEGIES } from "./schemas.js";
+import { ValidationError, errorMessage, getHttpStatusCode, isRateLimitError, } from "./errors.js";
+import { debug, info, warn } from "./logger.js";
+import { isDocOnlyIssue, applyPerRepoCap, } from "./issue-filtering.js";
+import { IssueVetter } from "./issue-vetting.js";
+import { getTopicsForCategories } from "./category-mapping.js";
+import { buildEffectiveLabels, interleaveArrays, cachedSearchIssues, filterVetAndScore, searchInRepos, searchWithChunkedLabels, } from "./search-phases.js";
+const MODULE = "issue-discovery";
 /** Delay between major search phases to let GitHub's rate limit window cool down. */
 const INTER_PHASE_DELAY_MS = 2000;
 /** If remaining search quota is below this, skip heavy phases (2, 3). */
 const LOW_BUDGET_THRESHOLD = 20;
 /** If remaining search quota is below this, only run Phase 0. */
 const CRITICAL_BUDGET_THRESHOLD = 10;
+/** Build a reusable filter function from config. */
+function buildIssueFilter(config) {
+    return (items) => {
+        return items.filter((item) => {
+            const repoFullName = extractRepoFromUrl(item.repository_url);
+            if (!repoFullName)
+                return false;
+            if (config.excludedRepos.has(repoFullName))
+                return false;
+            if (config.excludeOrgs.size > 0) {
+                const orgName = repoFullName.split("/")[0]?.toLowerCase();
+                if (orgName && config.excludeOrgs.has(orgName))
+                    return false;
+            }
+            if (config.aiBlocklisted.has(repoFullName))
+                return false;
+            if (config.lowScoringRepos.has(repoFullName))
+                return false;
+            if (config.skippedUrls.has(item.html_url))
+                return false;
+            const updatedAt = new Date(item.updated_at);
+            const ageDays = daysBetween(updatedAt, config.now);
+            if (ageDays > config.maxAgeDays)
+                return false;
+            if (!config.includeDocIssues && isDocOnlyIssue(item))
+                return false;
+            return true;
+        });
+    };
+}
+/** Phase 0: Search repos where user has merged PRs (highest merge probability). */
+async function runPhase0(octokit, vetter, repos, baseQualifiers, maxResults, filterIssues) {
+    info(MODULE, `Phase 0: Searching issues in ${repos.length} merged-PR repos (no label filter)...`);
+    const { candidates, allBatchesFailed, rateLimitHit } = await searchInRepos(octokit, vetter, repos, baseQualifiers, [], maxResults, "merged_pr", filterIssues);
+    info(MODULE, `Found ${candidates.length} candidates from merged-PR repos`);
+    return {
+        candidates,
+        error: allBatchesFailed ? "All merged-PR repo batches failed" : null,
+        rateLimitHit,
+    };
+}
+/** Phase 1: Search starred repos. */
+async function runPhase1(octokit, vetter, repos, baseQualifiers, labels, maxResults, filterIssues) {
+    info(MODULE, `Phase 1: Searching issues in ${repos.length} starred repos...`);
+    // Cap labels to reduce Search API calls: starred repos already signal user
+    // interest, so fewer labels suffice.
+    const phase1Labels = labels.slice(0, 3);
+    const { candidates, allBatchesFailed, rateLimitHit } = await searchInRepos(octokit, vetter, repos.slice(0, 10), baseQualifiers, phase1Labels, maxResults, "starred", filterIssues);
+    info(MODULE, `Found ${candidates.length} candidates from starred repos`);
+    return {
+        candidates,
+        error: allBatchesFailed ? "All starred repo batches failed" : null,
+        rateLimitHit,
+    };
+}
+/** Phase 2: General label-filtered search with multi-tier interleaving. */
+async function runPhase2(octokit, vetter, scopes, labels, configLabels, baseQualifiers, maxResults, minStars, phase0RepoSet, starredRepoSet, existingCandidates, filterIssues) {
+    info(MODULE, "Phase 2: General issue search...");
+    const seenRepos = new Set(existingCandidates.map((c) => c.issue.repo));
+    // Build per-tier label groups. Multi-tier when 2+ scopes; single-tier otherwise.
+    const tierLabelGroups = [];
+    if (scopes && scopes.length > 1) {
+        for (const scope of scopes) {
+            const scopeLabels = SCOPE_LABELS[scope] ?? [];
+            if (scopeLabels.length === 0) {
+                warn(MODULE, `Scope "${scope}" has no labels, skipping tier`);
+                continue;
+            }
+            tierLabelGroups.push({ tier: scope, tierLabels: scopeLabels });
+        }
+        const allScopeLabels = new Set(scopes.flatMap((s) => SCOPE_LABELS[s] ?? []));
+        const customOnly = configLabels.filter((l) => !allScopeLabels.has(l));
+        if (customOnly.length > 0) {
+            tierLabelGroups.push({ tier: "custom", tierLabels: customOnly });
+        }
+    }
+    else {
+        tierLabelGroups.push({ tier: "general", tierLabels: labels });
+    }
+    const budgetPerTier = Math.ceil(maxResults / tierLabelGroups.length);
+    const tierResults = [];
+    let error = null;
+    let rateLimitHit = false;
+    for (const { tier, tierLabels } of tierLabelGroups) {
+        try {
+            const allItems = await searchWithChunkedLabels(octokit, tierLabels, 0, (labelQ) => `${baseQualifiers} ${labelQ}`.replace(/  +/g, " ").trim(), budgetPerTier * 3);
+            info(MODULE, `Phase 2 [${tier}]: processing ${allItems.length} items...`);
+            const { candidates: tierCandidates, allVetFailed, rateLimitHit: vetRateLimitHit, } = await filterVetAndScore(vetter, allItems, filterIssues, [phase0RepoSet, starredRepoSet, seenRepos], budgetPerTier, minStars, `Phase 2 [${tier}]`);
+            tierResults.push(tierCandidates);
+            for (const c of tierCandidates)
+                seenRepos.add(c.issue.repo);
+            if (allVetFailed) {
+                error = (error ? error + "; " : "") + `${tier}: all vetting failed`;
+            }
+            if (vetRateLimitHit) {
+                rateLimitHit = true;
+            }
+            info(MODULE, `Found ${tierCandidates.length} candidates from ${tier} tier`);
+        }
+        catch (err) {
+            if (getHttpStatusCode(err) === 401)
+                throw err;
+            const errMsg = errorMessage(err);
+            error = (error ? error + "; " : "") + `${tier}: ${errMsg}`;
+            if (isRateLimitError(err)) {
+                rateLimitHit = true;
+            }
+            warn(MODULE, `Error in ${tier} tier search: ${errMsg}`);
+            tierResults.push([]);
+        }
+    }
+    const interleaved = interleaveArrays(tierResults);
+    if (interleaved.length === 0 && error) {
+        warn(MODULE, `All ${tierLabelGroups.length} scope tiers failed in Phase 2: ${error}`);
+    }
+    return {
+        candidates: interleaved.slice(0, maxResults),
+        error,
+        rateLimitHit,
+    };
+}
+/** Phase 3: Actively maintained repos. */
+async function runPhase3(octokit, vetter, langQuery, minStars, projectCategories, maxResults, phase0RepoSet, starredRepoSet, existingCandidates, filterIssues) {
+    info(MODULE, "Phase 3: Searching actively maintained repos...");
+    const thirtyDaysAgo = new Date();
+    thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
+    const pushedSince = thirtyDaysAgo.toISOString().split("T")[0];
+    const categoryTopics = getTopicsForCategories(projectCategories);
+    const topicQuery = categoryTopics.length > 0 ? `topic:${categoryTopics[0]}` : "";
+    const phase3Query = `is:issue is:open no:assignee ${langQuery} ${topicQuery} stars:>=${minStars} pushed:>=${pushedSince} archived:false`
+        .replace(/  +/g, " ")
+        .trim();
+    try {
+        const data = await cachedSearchIssues(octokit, {
+            q: phase3Query,
+            sort: "updated",
+            order: "desc",
+            per_page: maxResults * 3,
+        });
+        info(MODULE, `Found ${data.total_count} issues in maintained-repo search, processing top ${data.items.length}...`);
+        const seenRepos = new Set(existingCandidates.map((c) => c.issue.repo));
+        const { candidates, allVetFailed, rateLimitHit: vetRateLimitHit, } = await filterVetAndScore(vetter, data.items, filterIssues, [phase0RepoSet, starredRepoSet, seenRepos], maxResults, minStars, "Phase 3");
+        info(MODULE, `Found ${candidates.length} candidates from maintained-repo search`);
+        return {
+            candidates,
+            error: allVetFailed ? "all vetting failed" : null,
+            rateLimitHit: vetRateLimitHit,
+        };
+    }
+    catch (error) {
+        const errMsg = errorMessage(error);
+        warn(MODULE, `Error in maintained-repo search: ${errMsg}`);
+        return {
+            candidates: [],
+            error: errMsg,
+            rateLimitHit: isRateLimitError(error),
+        };
+    }
+}
+// ── IssueDiscovery class ─────────────────────────────────────────────
 /**
  * Multi-phase issue discovery engine that searches GitHub for contributable issues.
  *
  * Search phases (in priority order):
  * 0. Repos where user has merged PRs (highest merge probability)
- * 0.5. Preferred organizations
  * 1. Starred repos
  * 2. General label-filtered search
  * 3. Actively maintained repos
@@ -70,8 +229,8 @@ export class IssueDiscovery {
     }
     /**
      * Search for issues matching our criteria.
-     * Searches in priority order: merged-PR repos first (no label filter), then preferred
-     * organizations, then starred repos, then general search, then actively maintained repos.
+     * Searches in priority order: merged-PR repos first (no label filter), then starred
+     * repos, then general search, then actively maintained repos.
      * Filters out issues from low-scoring and excluded repos.
      *
      * @param options - Search configuration
@@ -95,29 +254,30 @@ export class IssueDiscovery {
     async searchIssues(options = {}) {
         const config = this.preferences;
         const languages = options.languages || config.languages;
-        const scopes = config.scope; // undefined = legacy mode
-        const labels = options.labels || (scopes ? buildEffectiveLabels(scopes, config.labels) : config.labels);
+        const scopes = config.scope;
+        const labels = options.labels ||
+            (scopes ? buildEffectiveLabels(scopes, config.labels) : config.labels);
         const maxResults = options.maxResults || 10;
         const minStars = config.minStars ?? 50;
-        // Strategy selection: resolve which phases to run
+        // Strategy selection
         const ALL_STRATEGIES = CONCRETE_STRATEGIES;
-        const rawStrategies = options.strategies ?? config.defaultStrategy ?? ['all'];
-        const enabledStrategies = new Set(rawStrategies.includes('all') ? ALL_STRATEGIES : rawStrategies);
+        const rawStrategies = options.strategies ??
+            config.defaultStrategy ?? ["all"];
+        const enabledStrategies = new Set(rawStrategies.includes("all") ? ALL_STRATEGIES : rawStrategies);
         const strategiesUsed = [];
         const allCandidates = [];
-        let phase0Error = null;
-        let phase1Error = null;
+        const phaseErrors = {};
         let rateLimitHitDuringSearch = false;
-        // Pre-flight rate limit check — also determines adaptive phase budget
+        // Pre-flight rate limit check
         this.rateLimitWarning = null;
         const tracker = getSearchBudgetTracker();
-        let searchBudget = LOW_BUDGET_THRESHOLD - 1; // conservative: below threshold to skip heavy phases
+        let searchBudget = LOW_BUDGET_THRESHOLD - 1;
         try {
             const rateLimit = await checkRateLimit(this.githubToken);
             searchBudget = rateLimit.remaining;
             tracker.init(rateLimit.remaining, rateLimit.resetAt);
             if (rateLimit.remaining < 5) {
-                const resetTime = new Date(rateLimit.resetAt).toLocaleTimeString('en-US', { hour12: false });
+                const resetTime = new Date(rateLimit.resetAt).toLocaleTimeString("en-US", { hour12: false });
                 this.rateLimitWarning = `GitHub search API quota low (${rateLimit.remaining}/${rateLimit.limit} remaining, resets at ${resetTime}). Search may be slow.`;
                 warn(MODULE, this.rateLimitWarning);
             }
@@ -129,278 +289,106 @@ export class IssueDiscovery {
             }
         }
         catch (error) {
-            // Fail fast on auth errors — no point searching with a bad token
-            if (getHttpStatusCode(error) === 401) {
+            if (getHttpStatusCode(error) === 401)
                 throw error;
-            }
-            // Non-fatal: proceed with conservative budget for transient/network errors.
-            // Initialize tracker with conservative defaults so it doesn't fly blind.
             tracker.init(CRITICAL_BUDGET_THRESHOLD, new Date(Date.now() + 60000).toISOString());
-            warn(MODULE, 'Could not check rate limit — using conservative budget, skipping heavy phases:', errorMessage(error));
+            warn(MODULE, "Could not check rate limit — using conservative budget, skipping heavy phases:", errorMessage(error));
         }
-        // Get merged-PR repos (highest merge probability)
+        if (searchBudget <= 0) {
+            this.rateLimitWarning =
+                "GitHub search API quota exhausted. Try again after the rate limit resets.";
+            return { candidates: [], strategiesUsed: [] };
+        }
+        // Derive search context
         const mergedPRRepos = this.stateReader.getReposWithMergedPRs();
-        // Get starred repos (from local cache or state reader)
         const starredRepos = this.getStarredRepos();
         const starredRepoSet = new Set(starredRepos);
-        // Get low-scoring repos from state reader
-        const minRepoScoreThreshold = config.minRepoScoreThreshold;
-        const lowScoringRepos = new Set(this.deriveLowScoringRepos(minRepoScoreThreshold));
-        // Common filters
-        const excludedRepos = new Set(config.excludeRepos);
-        const excludeOrgs = new Set((config.excludeOrgs ?? []).map(o => o.toLowerCase()));
-        const maxAgeDays = config.maxIssueAgeDays || 90;
-        const now = new Date();
+        const lowScoringRepos = new Set(this.deriveLowScoringRepos(config.minRepoScoreThreshold));
         // Build query parts
-        // When languages includes 'any', omit the language filter entirely
-        const isAnyLanguage = languages.some((l) => l.toLowerCase() === 'any');
-        const langQuery = isAnyLanguage ? '' : languages.map((l) => `language:${l}`).join(' ');
-        // Phase 0 uses a broader query — established contributors don't need beginner labels
-        // Phases 1+ pass labels separately to searchInRepos/searchWithChunkedLabels
-        const baseQualifiers = `is:issue is:open ${langQuery} no:assignee`.replace(/  +/g, ' ').trim();
-        // Helper to filter issues
-        const includeDocIssues = config.includeDocIssues ?? true;
+        const isAnyLanguage = languages.some((l) => l.toLowerCase() === "any");
+        const langQuery = isAnyLanguage
+            ? ""
+            : languages.map((l) => `language:${l}`).join(" ");
+        const baseQualifiers = `is:issue is:open ${langQuery} no:assignee`
+            .replace(/  +/g, " ")
+            .trim();
+        // Build reusable filter
         const aiBlocklisted = new Set(config.aiPolicyBlocklist);
         if (aiBlocklisted.size > 0) {
-            debug(MODULE, `[AI_POLICY_FILTER] Filtering issues from ${aiBlocklisted.size} blocklisted repo(s): ${[...aiBlocklisted].join(', ')}`);
+            debug(MODULE, `[AI_POLICY_FILTER] Filtering issues from ${aiBlocklisted.size} blocklisted repo(s): ${[...aiBlocklisted].join(", ")}`);
         }
-        const filterIssues = (items) => {
-            return items.filter((item) => {
-                const repoFullName = item.repository_url.split('/').slice(-2).join('/');
-                if (excludedRepos.has(repoFullName))
-                    return false;
-                // Filter out entire orgs
-                if (excludeOrgs.size > 0) {
-                    const orgName = repoFullName.split('/')[0]?.toLowerCase();
-                    if (orgName && excludeOrgs.has(orgName))
-                        return false;
-                }
-                // Filter repos with known anti-AI contribution policies
-                if (aiBlocklisted.has(repoFullName))
-                    return false;
-                // Filter OUT low-scoring repos
-                if (lowScoringRepos.has(repoFullName))
-                    return false;
-                // Filter by issue age based on updated_at
-                const updatedAt = new Date(item.updated_at);
-                const ageDays = daysBetween(updatedAt, now);
-                if (ageDays > maxAgeDays)
-                    return false;
-                // Filter out doc-only issues unless opted in
-                if (!includeDocIssues && isDocOnlyIssue(item))
-                    return false;
-                return true;
-            });
-        };
-        // Phase 0: Search repos where user has merged PRs (highest merge probability)
+        const filterIssues = buildIssueFilter({
+            excludedRepos: new Set(config.excludeRepos),
+            excludeOrgs: new Set((config.excludeOrgs ?? []).map((o) => o.toLowerCase())),
+            aiBlocklisted,
+            lowScoringRepos,
+            skippedUrls: options.skippedUrls ?? new Set(),
+            maxAgeDays: config.maxIssueAgeDays || 90,
+            now: new Date(),
+            includeDocIssues: config.includeDocIssues ?? true,
+        });
+        // Phase 0: Merged-PR repos
         const phase0Repos = mergedPRRepos.slice(0, 10);
         const phase0RepoSet = new Set(phase0Repos);
-        if (phase0Repos.length > 0 && enabledStrategies.has('merged')) {
-            info(MODULE, `Phase 0: Searching issues in ${phase0Repos.length} merged-PR repos (no label filter)...`);
-            const remainingNeeded = maxResults - allCandidates.length;
-            if (remainingNeeded > 0) {
-                const { candidates: mergedCandidates, allBatchesFailed, rateLimitHit, } = await searchInRepos(this.octokit, this.vetter, phase0Repos, baseQualifiers, [], remainingNeeded, 'merged_pr', filterIssues);
-                allCandidates.push(...mergedCandidates);
-                if (allBatchesFailed) {
-                    phase0Error = 'All merged-PR repo batches failed';
-                }
-                if (rateLimitHit) {
+        if (phase0Repos.length > 0 && enabledStrategies.has("merged")) {
+            const remaining = maxResults - allCandidates.length;
+            if (remaining > 0) {
+                const result = await runPhase0(this.octokit, this.vetter, phase0Repos, baseQualifiers, remaining, filterIssues);
+                allCandidates.push(...result.candidates);
+                phaseErrors["0"] = result.error;
+                if (result.rateLimitHit)
                     rateLimitHitDuringSearch = true;
-                }
-                info(MODULE, `Found ${mergedCandidates.length} candidates from merged-PR repos`);
             }
-            strategiesUsed.push('merged');
+            strategiesUsed.push("merged");
         }
-        // Phase 0.5: Search preferred organizations (explicit user preference)
-        // Skip if budget is critical — Phase 0 results are sufficient
-        let phase0_5Error = null;
-        const preferredOrgs = config.preferredOrgs ?? [];
-        if (allCandidates.length < maxResults && preferredOrgs.length > 0 && searchBudget >= CRITICAL_BUDGET_THRESHOLD && enabledStrategies.has('orgs')) {
-            // Inter-phase delay to let GitHub's rate limit window cool down
-            if (phase0Repos.length > 0)
-                await sleep(INTER_PHASE_DELAY_MS);
-            // Filter out orgs already covered by Phase 0 repos
-            const phase0Orgs = new Set(phase0Repos.map((r) => r.split('/')[0]?.toLowerCase()));
-            const orgsToSearch = preferredOrgs.filter((org) => !phase0Orgs.has(org.toLowerCase())).slice(0, 5);
-            if (orgsToSearch.length > 0) {
-                info(MODULE, `Phase 0.5: Searching issues in ${orgsToSearch.length} preferred org(s)...`);
-                const remainingNeeded = maxResults - allCandidates.length;
-                const orgRepoFilter = orgsToSearch.map((org) => `org:${org}`).join(' OR ');
-                const orgOps = orgsToSearch.length - 1;
-                try {
-                    const allItems = await searchWithChunkedLabels(this.octokit, labels, orgOps, (labelQ) => `${baseQualifiers} ${labelQ} (${orgRepoFilter})`.replace(/  +/g, ' ').trim(), remainingNeeded * 3);
-                    if (allItems.length > 0) {
-                        const filtered = filterIssues(allItems).filter((item) => {
-                            const repoFullName = item.repository_url.split('/').slice(-2).join('/');
-                            return !phase0RepoSet.has(repoFullName);
-                        });
-                        const { candidates: orgCandidates, allFailed: allVetFailed, rateLimitHit, } = await this.vetter.vetIssuesParallel(filtered.slice(0, remainingNeeded * 2).map((i) => i.html_url), remainingNeeded, 'preferred_org');
-                        allCandidates.push(...orgCandidates);
-                        if (allVetFailed) {
-                            phase0_5Error = 'All preferred org issue vetting failed';
-                        }
-                        if (rateLimitHit) {
-                            rateLimitHitDuringSearch = true;
-                        }
-                        info(MODULE, `Found ${orgCandidates.length} candidates from preferred orgs`);
-                    }
-                }
-                catch (error) {
-                    const errMsg = errorMessage(error);
-                    phase0_5Error = errMsg;
-                    if (isRateLimitError(error)) {
-                        rateLimitHitDuringSearch = true;
-                    }
-                    warn(MODULE, `Error searching preferred orgs: ${errMsg}`);
-                }
-            }
-            strategiesUsed.push('orgs');
-        }
-        // Phase 1: Search starred repos (filter out already-searched Phase 0 repos)
-        // Skip if budget is critical
-        if (allCandidates.length < maxResults && starredRepos.length > 0 && searchBudget >= CRITICAL_BUDGET_THRESHOLD && enabledStrategies.has('starred')) {
+        // Phase 1: Starred repos
+        if (allCandidates.length < maxResults &&
+            starredRepos.length > 0 &&
+            searchBudget >= CRITICAL_BUDGET_THRESHOLD &&
+            enabledStrategies.has("starred")) {
             await sleep(INTER_PHASE_DELAY_MS);
             const reposToSearch = starredRepos.filter((r) => !phase0RepoSet.has(r));
             if (reposToSearch.length > 0) {
-                info(MODULE, `Phase 1: Searching issues in ${reposToSearch.length} starred repos...`);
-                const remainingNeeded = maxResults - allCandidates.length;
-                if (remainingNeeded > 0) {
-                    // Cap labels to reduce Search API calls: starred repos already signal user
-                    // interest, so fewer labels suffice. With 3 labels and batch size 3 (2 repo ORs),
-                    // each batch fits in a single label chunk instead of 3+, cutting Phase 1 calls
-                    // from ~12 to ~4.
-                    const phase1Labels = labels.slice(0, 3);
-                    const { candidates: starredCandidates, allBatchesFailed, rateLimitHit, } = await searchInRepos(this.octokit, this.vetter, reposToSearch.slice(0, 10), baseQualifiers, phase1Labels, remainingNeeded, 'starred', filterIssues);
-                    allCandidates.push(...starredCandidates);
-                    if (allBatchesFailed) {
-                        phase1Error = 'All starred repo batches failed';
-                    }
-                    if (rateLimitHit) {
+                const remaining = maxResults - allCandidates.length;
+                if (remaining > 0) {
+                    const result = await runPhase1(this.octokit, this.vetter, reposToSearch, baseQualifiers, labels, remaining, filterIssues);
+                    allCandidates.push(...result.candidates);
+                    phaseErrors["1"] = result.error;
+                    if (result.rateLimitHit)
                         rateLimitHitDuringSearch = true;
-                    }
-                    info(MODULE, `Found ${starredCandidates.length} candidates from starred repos`);
                 }
             }
-            strategiesUsed.push('starred');
+            strategiesUsed.push("starred");
         }
-        // Phase 2: General search (if still need more)
-        // Skip if budget is low — Phases 0, 0.5, 1 are cheaper and higher-value
-        // When multiple scope tiers are active, fire one query per tier and interleave
-        // results to prevent high-volume tiers (e.g., "enhancement") from drowning out
-        // beginner results.
-        let phase2Error = null;
-        if (allCandidates.length < maxResults && searchBudget >= LOW_BUDGET_THRESHOLD && enabledStrategies.has('broad')) {
+        // Phase 2: General search
+        if (allCandidates.length < maxResults &&
+            searchBudget >= LOW_BUDGET_THRESHOLD &&
+            enabledStrategies.has("broad")) {
             await sleep(INTER_PHASE_DELAY_MS);
-            info(MODULE, 'Phase 2: General issue search...');
-            const remainingNeeded = maxResults - allCandidates.length;
-            const seenRepos = new Set(allCandidates.map((c) => c.issue.repo));
-            // Build per-tier label groups. Multi-tier when 2+ scopes; single-tier otherwise.
-            const tierLabelGroups = [];
-            if (scopes && scopes.length > 1) {
-                for (const scope of scopes) {
-                    const scopeLabels = SCOPE_LABELS[scope] ?? [];
-                    if (scopeLabels.length === 0) {
-                        warn(MODULE, `Scope "${scope}" has no labels, skipping tier`);
-                        continue;
-                    }
-                    tierLabelGroups.push({ tier: scope, tierLabels: scopeLabels });
-                }
-                // Custom labels not in any tier get their own pseudo-tier
-                const allScopeLabels = new Set(scopes.flatMap((s) => SCOPE_LABELS[s] ?? []));
-                const customOnly = config.labels.filter((l) => !allScopeLabels.has(l));
-                if (customOnly.length > 0) {
-                    tierLabelGroups.push({ tier: 'custom', tierLabels: customOnly });
-                }
-            }
-            else {
-                tierLabelGroups.push({ tier: 'general', tierLabels: labels });
-            }
-            const budgetPerTier = Math.ceil(remainingNeeded / tierLabelGroups.length);
-            const tierResults = [];
-            for (const { tier, tierLabels } of tierLabelGroups) {
-                try {
-                    const allItems = await searchWithChunkedLabels(this.octokit, tierLabels, 0, // no repo/org ORs in Phase 2
-                    (labelQ) => `${baseQualifiers} ${labelQ}`.replace(/  +/g, ' ').trim(), budgetPerTier * 3);
-                    info(MODULE, `Phase 2 [${tier}]: processing ${allItems.length} items...`);
-                    const { candidates: tierCandidates, allVetFailed, rateLimitHit: vetRateLimitHit, } = await filterVetAndScore(this.vetter, allItems, filterIssues, [phase0RepoSet, starredRepoSet, seenRepos], budgetPerTier, minStars, `Phase 2 [${tier}]`);
-                    tierResults.push(tierCandidates);
-                    // Update seenRepos so later tiers don't return duplicate repos
-                    for (const c of tierCandidates)
-                        seenRepos.add(c.issue.repo);
-                    if (allVetFailed) {
-                        phase2Error = (phase2Error ? phase2Error + '; ' : '') + `${tier}: all vetting failed`;
-                    }
-                    if (vetRateLimitHit) {
-                        rateLimitHitDuringSearch = true;
-                    }
-                    info(MODULE, `Found ${tierCandidates.length} candidates from ${tier} tier`);
-                }
-                catch (error) {
-                    if (getHttpStatusCode(error) === 401)
-                        throw error;
-                    const errMsg = errorMessage(error);
-                    phase2Error = (phase2Error ? phase2Error + '; ' : '') + `${tier}: ${errMsg}`;
-                    if (isRateLimitError(error)) {
-                        rateLimitHitDuringSearch = true;
-                    }
-                    warn(MODULE, `Error in ${tier} tier search: ${errMsg}`);
-                    tierResults.push([]);
-                }
-            }
-            const interleaved = interleaveArrays(tierResults);
-            if (interleaved.length === 0 && phase2Error) {
-                warn(MODULE, `All ${tierLabelGroups.length} scope tiers failed in Phase 2: ${phase2Error}`);
-            }
-            allCandidates.push(...interleaved.slice(0, remainingNeeded));
-            strategiesUsed.push('broad');
+            const remaining = maxResults - allCandidates.length;
+            const result = await runPhase2(this.octokit, this.vetter, scopes, labels, config.labels, baseQualifiers, remaining, minStars, phase0RepoSet, starredRepoSet, allCandidates, filterIssues);
+            allCandidates.push(...result.candidates);
+            phaseErrors["2"] = result.error;
+            if (result.rateLimitHit)
+                rateLimitHitDuringSearch = true;
+            strategiesUsed.push("broad");
         }
         // Phase 3: Actively maintained repos
-        // Skip if budget is low — this phase is API-heavy with broad queries
-        let phase3Error = null;
-        if (allCandidates.length < maxResults && searchBudget >= LOW_BUDGET_THRESHOLD && enabledStrategies.has('maintained')) {
+        if (allCandidates.length < maxResults &&
+            searchBudget >= LOW_BUDGET_THRESHOLD &&
+            enabledStrategies.has("maintained")) {
             await sleep(INTER_PHASE_DELAY_MS);
-            info(MODULE, 'Phase 3: Searching actively maintained repos...');
-            const remainingNeeded = maxResults - allCandidates.length;
-            const thirtyDaysAgo = new Date();
-            thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
-            const pushedSince = thirtyDaysAgo.toISOString().split('T')[0];
-            const categoryTopics = getTopicsForCategories(config.projectCategories ?? []);
-            const topicQuery = categoryTopics.length > 0 ? `topic:${categoryTopics[0]}` : '';
-            const phase3Query = `is:issue is:open no:assignee ${langQuery} ${topicQuery} stars:>=${minStars} pushed:>=${pushedSince} archived:false`
-                .replace(/  +/g, ' ')
-                .trim();
-            try {
-                const data = await cachedSearchIssues(this.octokit, {
-                    q: phase3Query,
-                    sort: 'updated',
-                    order: 'desc',
-                    per_page: remainingNeeded * 3,
-                });
-                info(MODULE, `Found ${data.total_count} issues in maintained-repo search, processing top ${data.items.length}...`);
-                const seenRepos = new Set(allCandidates.map((c) => c.issue.repo));
-                const { candidates: starFiltered, allVetFailed, rateLimitHit: vetRateLimitHit, } = await filterVetAndScore(this.vetter, data.items, filterIssues, [phase0RepoSet, starredRepoSet, seenRepos], remainingNeeded, minStars, 'Phase 3');
-                allCandidates.push(...starFiltered);
-                if (allVetFailed) {
-                    phase3Error = 'all vetting failed';
-                }
-                if (vetRateLimitHit) {
-                    rateLimitHitDuringSearch = true;
-                }
-                info(MODULE, `Found ${starFiltered.length} candidates from maintained-repo search`);
-            }
-            catch (error) {
-                const errMsg = errorMessage(error);
-                phase3Error = errMsg;
-                if (isRateLimitError(error)) {
-                    rateLimitHitDuringSearch = true;
-                }
-                warn(MODULE, `Error in maintained-repo search: ${errMsg}`);
-            }
-            strategiesUsed.push('maintained');
+            const remaining = maxResults - allCandidates.length;
+            const result = await runPhase3(this.octokit, this.vetter, langQuery, minStars, config.projectCategories ?? [], remaining, phase0RepoSet, starredRepoSet, allCandidates, filterIssues);
+            allCandidates.push(...result.candidates);
+            phaseErrors["3"] = result.error;
+            if (result.rateLimitHit)
+                rateLimitHitDuringSearch = true;
+            strategiesUsed.push("maintained");
         }
-        // Determine if phases were skipped due to budget constraints
+        // Build result / error summary
         const phasesSkippedForBudget = searchBudget < LOW_BUDGET_THRESHOLD;
-        let budgetNote = '';
+        let budgetNote = "";
         if (searchBudget < CRITICAL_BUDGET_THRESHOLD) {
             budgetNote = ` Most search phases were skipped due to critically low API quota (${searchBudget} remaining).`;
         }
@@ -408,14 +396,19 @@ export class IssueDiscovery {
             budgetNote = ` Some search phases were skipped due to low API quota (${searchBudget} remaining).`;
         }
         if (allCandidates.length === 0) {
-            const phaseErrors = [
-                phase0Error ? `Phase 0 (merged-PR repos): ${phase0Error}` : null,
-                phase0_5Error ? `Phase 0.5 (preferred orgs): ${phase0_5Error}` : null,
-                phase1Error ? `Phase 1 (starred repos): ${phase1Error}` : null,
-                phase2Error ? `Phase 2 (general): ${phase2Error}` : null,
-                phase3Error ? `Phase 3 (maintained repos): ${phase3Error}` : null,
+            const errorDetails = [
+                phaseErrors["0"]
+                    ? `Phase 0 (merged-PR repos): ${phaseErrors["0"]}`
+                    : null,
+                phaseErrors["1"]
+                    ? `Phase 1 (starred repos): ${phaseErrors["1"]}`
+                    : null,
+                phaseErrors["2"] ? `Phase 2 (general): ${phaseErrors["2"]}` : null,
+                phaseErrors["3"]
+                    ? `Phase 3 (maintained repos): ${phaseErrors["3"]}`
+                    : null,
             ].filter(Boolean);
-            const details = phaseErrors.length > 0 ? ` ${phaseErrors.join('. ')}.` : '';
+            const details = errorDetails.length > 0 ? ` ${errorDetails.join(". ")}.` : "";
             if (rateLimitHitDuringSearch || phasesSkippedForBudget) {
                 this.rateLimitWarning =
                     `Search returned no results due to GitHub API rate limits.${details}${budgetNote} ` +
@@ -423,28 +416,31 @@ export class IssueDiscovery {
                 return { candidates: [], strategiesUsed };
             }
             throw new ValidationError(`No issue candidates found across all search phases.${details} ` +
-                'Try adjusting your search criteria (languages, labels) or check your network connection.');
+                "Try adjusting your search criteria (languages, labels) or check your network connection.");
         }
-        // Surface rate limit warning even with partial results
         if (rateLimitHitDuringSearch || phasesSkippedForBudget) {
             this.rateLimitWarning =
                 `Search results may be incomplete: GitHub API rate limits were hit during search.${budgetNote} ` +
-                    `Found ${allCandidates.length} candidate${allCandidates.length === 1 ? '' : 's'} but some search phases were limited. ` +
+                    `Found ${allCandidates.length} candidate${allCandidates.length === 1 ? "" : "s"} but some search phases were limited. ` +
                     `Try again after the rate limit resets for complete results.`;
         }
-        // Sort by priority first, then by recommendation, then by viability score
+        // Sort by priority, recommendation, then viability score
         allCandidates.sort((a, b) => {
-            const priorityOrder = { merged_pr: 0, preferred_org: 1, starred: 2, normal: 3 };
+            const priorityOrder = {
+                merged_pr: 0,
+                starred: 1,
+                normal: 2,
+            };
             const priorityDiff = priorityOrder[a.searchPriority] - priorityOrder[b.searchPriority];
             if (priorityDiff !== 0)
                 return priorityDiff;
             const recommendationOrder = { approve: 0, needs_review: 1, skip: 2 };
-            const recDiff = recommendationOrder[a.recommendation] - recommendationOrder[b.recommendation];
+            const recDiff = recommendationOrder[a.recommendation] -
+                recommendationOrder[b.recommendation];
             if (recDiff !== 0)
                 return recDiff;
             return b.viabilityScore - a.viabilityScore;
         });
-        // Apply per-repo cap: max 2 issues from any single repo
         const capped = applyPerRepoCap(allCandidates, 2);
         info(MODULE, `Search complete: ${tracker.getTotalCalls()} Search API calls used, ${capped.length} candidates returned`);
         return { candidates: capped.slice(0, maxResults), strategiesUsed };
@@ -464,9 +460,6 @@ export class IssueDiscovery {
      */
     deriveLowScoringRepos(threshold) {
         const lowScoring = [];
-        // The ScoutStateReader doesn't expose a bulk "get all repos with scores" method,
-        // so we rely on the mergedPRRepos + starredRepos as the universe of known repos
-        // and check each one's score. Repos not in state simply return null (no penalty).
         const knownRepos = new Set([
             ...this.stateReader.getReposWithMergedPRs(),
             ...this.stateReader.getStarredRepos(),