@yemi33/minions 0.1.2375 → 0.1.2376

package/engine/github.js

@@ -99,6 +99,28 @@ function getRepoSlug(project) {
   return `${org}/${repo}`;
 }
 
+function getPrRepoSlug(project, pr) {
+  const scope = shared.getPrScopeInfo(pr, pr?.url || '')?.scope || '';
+  if (scope && scope === shared.getProjectPrScope(project)) return getRepoSlug(project);
+  if (scope.startsWith('github:')) return scope.slice('github:'.length);
+  return getRepoSlug(project);
+}
+
+function getProjectRepoSlugs(project) {
+  const primary = getRepoSlug(project);
+  const slugs = primary ? [primary] : [];
+  const seen = new Set(slugs.map(slug => slug.toLowerCase()));
+  for (const scope of shared.getProjectAllPrScopes(project)) {
+    if (!scope.startsWith('github:')) continue;
+    const slug = scope.slice('github:'.length);
+    if (!seen.has(slug)) {
+      slugs.push(slug);
+      seen.add(slug);
+    }
+  }
+  return slugs;
+}
+
 function getConfiguredGitHubAuthorLogins(config = {}) {
   const accounts = config?.engine?.ghAccounts;
   if (!accounts || typeof accounts !== 'object') return new Set();
@@ -520,40 +542,40 @@ async function forEachActiveGhPr(config, callback) {
     const src = project?.workSources?.pullRequests || config?.workSources?.pullRequests;
     if (src && src.enabled === false) continue;
 
-    const slug = getRepoSlug(project);
-    if (!slug) continue;
-
-    // Skip projects in backoff (inaccessible repo)
-    if (isSlugInBackoff(slug)) continue;
-
     const prs = getPrs(project);
     const activePrs = prs.filter(pr => PR_POLLABLE_STATUSES.has(pr.status)
       && shared.isPrCompatibleWithProject(project, pr, pr.url || ''));
     if (activePrs.length === 0) continue;
 
-    // Probe repo accessibility before iterating PRs — avoids N warnings per inaccessible repo.
-    // W-mp5trwh60008386d: ghApi returns the GH_NOT_FOUND sentinel on 404 (a frozen object,
-    // *not* null). The pre-fix gate only matched `null`, so a 404 on the base repo (caused by
-    // a multi-account `gh auth` switch, network blip, or token rotation) fell through and every
-    // per-PR call below 404'd, permanently flipping all active PRs to `abandoned`. We now treat
-    // both null and GH_NOT_FOUND as "skip the project for this tick" and explicitly do NOT
-    // increment per-PR `_consecutive404s` counters since no per-PR call was made.
-    const probe = await ghApi('', slug);
-    if (probe === null || probe === GH_NOT_FOUND) {
-      if (probe === GH_NOT_FOUND) {
-        log('warn', `GitHub repo probe for ${slug} returned 404 — skipping all per-PR polls for this project this tick (avoids spurious abandonments). Per-PR 404 counters NOT incremented.`);
-      }
-      recordSlugFailure(slug);
-      continue;
-    }
-    resetSlugBackoff(slug);
-
     let projectUpdated = 0;
     const updatedRecords = [];
+    const slugProbes = new Map();
 
     for (const pr of activePrs) {
       const prNum = shared.getPrNumber(pr);
       if (!prNum) continue;
+      const slug = getPrRepoSlug(project, pr);
+      if (!slug) continue;
+
+      let probeResult = slugProbes.get(slug);
+      if (probeResult === undefined) {
+        if (isSlugInBackoff(slug)) {
+          probeResult = 'fail';
+        } else {
+          const probe = await ghApi('', slug);
+          probeResult = (probe === null || probe === GH_NOT_FOUND) ? 'fail' : 'ok';
+          if (probeResult === 'fail') {
+            if (probe === GH_NOT_FOUND) {
+              log('warn', `GitHub repo probe for ${slug} returned 404 — skipping all per-PR polls for this repository this tick (avoids spurious abandonments). Per-PR 404 counters NOT incremented.`);
+            }
+            recordSlugFailure(slug);
+          } else {
+            resetSlugBackoff(slug);
+          }
+        }
+        slugProbes.set(slug, probeResult);
+      }
+      if (probeResult !== 'ok') continue;
 
       try {
         const before = shared.snapshotPrRecord(pr);
@@ -612,7 +634,10 @@ async function forEachActiveGhPr(config, callback) {
   const centralPrs = safeJsonArr(centralPath);
   // Build a slug→project map for configured GitHub projects so we can detect
   // PRs that are actually owned by the project loop (present in per-project file).
-  const configuredGhProjectsBySlug = new Map(projects.map(p => [getRepoSlug(p), p]));
+  const configuredGhProjectsBySlug = new Map();
+  for (const project of projects) {
+    for (const slug of getProjectRepoSlugs(project)) configuredGhProjectsBySlug.set(slug.toLowerCase(), project);
+  }
   const activeCentral = centralPrs.filter(pr => {
     if (!PR_POLLABLE_STATUSES.has(pr.status)) return false;
     if (!pr.url) return false;
@@ -621,7 +646,7 @@ async function forEachActiveGhPr(config, callback) {
     // the project loop will never see it — the central branch must poll it.
     const ghMatch = pr.url.match(/github\.com\/([^/]+\/[^/]+)\/pull\/\d+/);
     if (ghMatch) {
-      const owningProject = configuredGhProjectsBySlug.get(ghMatch[1]);
+      const owningProject = configuredGhProjectsBySlug.get(ghMatch[1].toLowerCase());
       if (owningProject) {
         const projectPrs = safeJsonArr(projectPrPath(owningProject));
         if (projectPrs.some(p => p.id === pr.id)) return false; // present → project loop handles it
@@ -1425,12 +1450,6 @@ async function reconcilePrs(config) {
   let totalAdded = 0;
 
   for (const project of projects) {
-    const slug = getRepoSlug(project);
-    if (!slug) continue;
-
-    // Skip projects in backoff (inaccessible repo)
-    if (isSlugInBackoff(slug)) continue;
-
     // Skip projects with no tracked PRs and no work items — nothing to reconcile
     const existingPrs = getPrs(project);
     if (existingPrs.length === 0) {
@@ -1441,18 +1460,21 @@ async function reconcilePrs(config) {
       } catch { continue; }
     }
 
-    // Fetch open PRs — paginate to handle repos with >100 open PRs
-    const prsData = await ghApi('/pulls?state=open&per_page=100', slug, { paginate: true, timeout: 60000 });
-    if (!prsData || !Array.isArray(prsData)) {
-      recordSlugFailure(slug);
-      continue;
+    const ghPrs = [];
+    for (const slug of getProjectRepoSlugs(project)) {
+      if (isSlugInBackoff(slug)) continue;
+      // Fetch open PRs — paginate to handle repos with >100 open PRs.
+      const prsData = await ghApi('/pulls?state=open&per_page=100', slug, { paginate: true, timeout: 60000 });
+      if (!prsData || !Array.isArray(prsData)) {
+        recordSlugFailure(slug);
+        continue;
+      }
+      resetSlugBackoff(slug);
+      for (const pr of prsData) {
+        const branch = pr.head?.ref || '';
+        if (branchPatterns.some(pat => pat.test(branch))) ghPrs.push({ pr, slug });
+      }
     }
-    resetSlugBackoff(slug);
-
-    const ghPrs = prsData.filter(pr => {
-      const branch = pr.head?.ref || '';
-      return branchPatterns.some(pat => pat.test(branch));
-    });
 
     if (ghPrs.length === 0) continue;
 
@@ -1470,8 +1492,12 @@ async function reconcilePrs(config) {
     const centralItems = safeJsonArr(centralWiPath);
     const allItems = [...workItems, ...centralItems];
 
-    for (const ghPr of ghPrs) {
-      const prUrl = project.prUrlBase ? project.prUrlBase + ghPr.number : ghPr.html_url || '';
+    for (const { pr: ghPr, slug } of ghPrs) {
+      const primarySlug = getRepoSlug(project);
+      const prUrl = ghPr.html_url
+        || (slug.toLowerCase() === primarySlug?.toLowerCase() && project.prUrlBase
+          ? project.prUrlBase + ghPr.number
+          : `https://github.com/${slug}/pull/${ghPr.number}`);
       const prId = shared.getCanonicalPrId(project, ghPr.number, prUrl);
       // P-a7c4d2e8 (F3): validate API-derived branch ref before persistence
       // / regex matching. Defensive degrade — log and treat as missing on
@@ -1604,7 +1630,7 @@ async function reconcilePrs(config) {
  */
 async function checkLiveReviewStatus(pr, project) {
   try {
-    const slug = getRepoSlug(project);
+    const slug = getPrRepoSlug(project, pr);
     if (!slug) return null;
     const prNum = shared.getPrNumber(pr);
     if (!prNum) return null;
@@ -1654,7 +1680,7 @@ async function checkLiveReviewStatus(pr, project) {
 async function dismissPriorViewerChangesRequestedReviews(pr, project) {
   let tmpFile = null;
   try {
-    const slug = getRepoSlug(project);
+    const slug = getPrRepoSlug(project, pr);
     if (!slug) return null;
     const prNum = shared.getPrNumber(pr);
     if (!prNum) return null;
@@ -1758,7 +1784,7 @@ async function dismissPriorViewerChangesRequestedReviews(pr, project) {
  */
 async function checkLiveBuildAndConflict(pr, project) {
   try {
-    const slug = getRepoSlug(project);
+    const slug = getPrRepoSlug(project, pr);
     if (!slug) return null;
     const prNum = shared.getPrNumber(pr);
     if (!prNum) return null;
@@ -1846,9 +1872,6 @@ async function reconcileAbandonedPrs(config) {
   const slugProbeCache = new Map(); // slug → 'ok' | 'fail'
 
   for (const project of projects) {
-    const slug = getRepoSlug(project);
-    if (!slug) continue;
-
     const prPath = projectPrPath(project);
     const prs = safeJsonArr(prPath);
     // Filter: only abandoned PRs that don't already have the confirmed-404
@@ -1862,37 +1885,35 @@ async function reconcileAbandonedPrs(config) {
     );
     if (abandonedPrs.length === 0) continue;
 
-    // Probe base repo (cached). Failure → skip ALL of this slug's abandoned
-    // PRs and increment skipped counter — auth/access issue at boot, retry
-    // next restart.
-    let probeResult = slugProbeCache.get(slug);
-    if (probeResult === undefined) {
-      const probe = await ghApi('', slug);
-      probeResult = (probe === null || probe === GH_NOT_FOUND) ? 'fail' : 'ok';
-      slugProbeCache.set(slug, probeResult);
-    }
-    if (probeResult === 'fail') {
-      log('warn', `Abandoned PR reconciliation: skipping ${slug} (${abandonedPrs.length} PR${abandonedPrs.length === 1 ? '' : 's'}) — base-repo probe failed, retry next startup`);
-      skipped += abandonedPrs.length;
-      continue;
-    }
-
-    // Per-PR re-probe. Collect updates first, then apply via mutatePullRequests
-    // for atomic single-writer semantics. We match by prNumber on writeback
-    // (not id) because mutatePullRequests calls normalizePrRecords which can
-    // lowercase the id slug — prNumber is the stable key within a project's
-    // pull-requests.json.
-    const updates = []; // { prNumber, action, newStatus?, mergedAt? }
+    // Per-PR re-probe. Canonical ids keep same-number PRs from different
+    // repository scopes isolated during writeback.
+    const updates = []; // { prId, prNumber, action, newStatus?, mergedAt? }
     for (const pr of abandonedPrs) {
       const prNum = shared.getPrNumber(pr);
       if (!prNum) continue;
+      const slug = getPrRepoSlug(project, pr);
+      if (!slug) continue;
+      const prId = shared.getCanonicalPrId(project, pr, pr.url || '');
+      if (!prId) continue;
+
+      let probeResult = slugProbeCache.get(slug);
+      if (probeResult === undefined) {
+        const probe = await ghApi('', slug);
+        probeResult = (probe === null || probe === GH_NOT_FOUND) ? 'fail' : 'ok';
+        slugProbeCache.set(slug, probeResult);
+      }
+      if (probeResult === 'fail') {
+        log('warn', `Abandoned PR reconciliation: skipping ${slug} — base-repo probe failed, retry next startup`);
+        skipped++;
+        continue;
+      }
 
       try {
         const prData = await ghApi(`/pulls/${prNum}`, slug);
         if (prData === GH_NOT_FOUND) {
           // 404 with base-probe OK → genuinely deleted. Mark so we don't
           // re-probe this PR on future startups.
-          updates.push({ prNumber: prNum, action: 'confirm404' });
+          updates.push({ prId, prNumber: prNum, action: 'confirm404' });
           confirmedDeleted++;
           log('info', `Confirmed PR #${prNum} (${slug}): truly deleted, leaving abandoned`);
         } else if (prData) {
@@ -1915,6 +1936,7 @@ async function reconcileAbandonedPrs(config) {
             continue;
           }
           updates.push({
+            prId,
             prNumber: prNum,
             action: 'flip',
             newStatus,
@@ -1938,7 +1960,9 @@ async function reconcileAbandonedPrs(config) {
       const reconciledAt = ts();
       mutatePullRequests(prPath, (currentPrs) => {
         for (const upd of updates) {
-          const pr = currentPrs.find(p => shared.getPrNumber(p) === upd.prNumber);
+          const pr = currentPrs.find(p =>
+            shared.getCanonicalPrId(project, p, p.url || '') === upd.prId
+          );
           if (!pr) continue;
           // Defensive: never downgrade a merged record. Should already be
           // filtered by the abandoned-only scan above, but a concurrent writer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2375",
+  "version": "0.1.2376",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"