diff --git a/packages/loopover-engine/src/discovery-index-contract.ts b/packages/loopover-engine/src/discovery-index-contract.ts index 6ec310f2a..b3d15cb28 100644 --- a/packages/loopover-engine/src/discovery-index-contract.ts +++ b/packages/loopover-engine/src/discovery-index-contract.ts @@ -48,6 +48,11 @@ export type DiscoveryIndexCandidate = { issueNumber: number; title: string; labels: readonly string[]; + /** Repo login(s) the issue is assigned to on GitHub (#7442). OPTIONAL: an older, backward-compatible hosted + * server build that doesn't populate it leaves the field absent, which lets a client distinguish "assignees + * were never served" from "served, and empty" -- the former falls back to [] at the merge site rather than + * silently no-opping contribution-profile-filter's repo-owner exclusion (#7040). Normalized like `labels`. */ + assignees?: readonly string[]; commentsCount: number; createdAt: string | null; updatedAt: string | null; @@ -197,6 +202,12 @@ export function normalizeDiscoveryIndexCandidate(raw: unknown): DiscoveryIndexCa const labels = Array.isArray(candidate.labels) ? candidate.labels.filter((label): label is string => typeof label === "string" && label.trim() !== "").map((label) => label.trim()) : []; + // #7442: carry real assignees through when the server provides them (same string normalization as `labels`); an + // older build omits the field, leaving `assignees` off the result (undefined) so the merge site falls back to [] + // -- fail-safe, never silently skipping the repo-owner exclusion filter. + const assignees = Array.isArray(candidate.assignees) + ? candidate.assignees.filter((entry): entry is string => typeof entry === "string" && entry.trim() !== "").map((entry) => entry.trim()) + : undefined; return { owner, repo, @@ -204,6 +215,7 @@ export function normalizeDiscoveryIndexCandidate(raw: unknown): DiscoveryIndexCa issueNumber, title, labels, + ...(assignees !== undefined ? { assignees } : {}), commentsCount: typeof candidate.commentsCount === "number" && Number.isFinite(candidate.commentsCount) ? candidate.commentsCount : 0, createdAt: typeof candidate.createdAt === "string" ? candidate.createdAt : null, updatedAt: typeof candidate.updatedAt === "string" ? candidate.updatedAt : null, diff --git a/packages/loopover-miner/lib/discover-cli.js b/packages/loopover-miner/lib/discover-cli.js index e162957b2..fce13f304 100644 --- a/packages/loopover-miner/lib/discover-cli.js +++ b/packages/loopover-miner/lib/discover-cli.js @@ -37,9 +37,11 @@ function dedupeKey(repoFullName, issueNumber) { * no-op (returns `fanOut` unchanged) unless the plane is enabled, so a run with the flag unset behaves exactly * as before this feature existed. Local results always win on a duplicate issue (the discovery-index candidate * is dropped, not merged over it) -- this instance's own live fan-out is more current than a cached shared - * index entry. Discovery-index candidates lack `assignees` (not part of the public contract), so they're - * annotated with an empty array to match opportunity-fanout.js's own candidate shape; contribution-profile- - * filter.js's assignee-exclusion rule treats that identically to "no assignees on this issue". + * index entry. Discovery-index candidates now carry their real `assignees` when the hosted contract supplies them + * (#7442): the value flows through so contribution-profile-filter.js's repo-owner exclusion (#7040) engages for + * index-sourced candidates exactly as it does for direct fan-out ones. A candidate whose response omitted the + * field (older discovery-index build) falls back to `[]` -- fail-safe: the filter still runs, it just can't detect + * an owner-assignment it was never told about, rather than the check being silently skipped. */ async function supplementWithDiscoveryIndex(fanOut, queryScope, options) { const env = options.env ?? process.env; @@ -53,9 +55,10 @@ async function supplementWithDiscoveryIndex(fanOut, queryScope, options) { const seen = new Set(fanOut.issues.map((issue) => dedupeKey(issue.repoFullName, issue.issueNumber))); const supplemented = response.candidates .filter((candidate) => !seen.has(dedupeKey(candidate.repoFullName, candidate.issueNumber))) - // DiscoveryIndexCandidate is a near-superset of RawCandidateIssue; assignees is absent from the hosted - // contract (#7168) so we annotate [] — cast preserves pre-existing runtime shape rather than re-mapping. - .map((candidate) => ({ ...candidate, assignees: [], labels: [...candidate.labels] })); + // DiscoveryIndexCandidate is a near-superset of RawCandidateIssue; copy the real assignees through when the + // hosted contract carried them (#7442), falling back to [] only when the served response genuinely omitted the + // field — cast preserves pre-existing runtime shape rather than re-mapping. + .map((candidate) => ({ ...candidate, assignees: [...(candidate.assignees ?? [])], labels: [...candidate.labels] })); if (supplemented.length === 0) return fanOut; return { ...fanOut, issues: [...fanOut.issues, ...supplemented] }; @@ -452,4 +455,4 @@ export async function runDiscover(args, options = {}) { rankedCandidatesStore.close(); } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"discover-cli.js","sourceRoot":"","sources":["discover-cli.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"discover-cli.js","sourceRoot":"","sources":["discover-cli.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/loopover-miner/lib/discover-cli.ts b/packages/loopover-miner/lib/discover-cli.ts index 40f9c7a08..3f0225fe9 100644 --- a/packages/loopover-miner/lib/discover-cli.ts +++ b/packages/loopover-miner/lib/discover-cli.ts @@ -162,9 +162,11 @@ function dedupeKey(repoFullName: string, issueNumber: number): string { * no-op (returns `fanOut` unchanged) unless the plane is enabled, so a run with the flag unset behaves exactly * as before this feature existed. Local results always win on a duplicate issue (the discovery-index candidate * is dropped, not merged over it) -- this instance's own live fan-out is more current than a cached shared - * index entry. Discovery-index candidates lack `assignees` (not part of the public contract), so they're - * annotated with an empty array to match opportunity-fanout.js's own candidate shape; contribution-profile- - * filter.js's assignee-exclusion rule treats that identically to "no assignees on this issue". + * index entry. Discovery-index candidates now carry their real `assignees` when the hosted contract supplies them + * (#7442): the value flows through so contribution-profile-filter.js's repo-owner exclusion (#7040) engages for + * index-sourced candidates exactly as it does for direct fan-out ones. A candidate whose response omitted the + * field (older discovery-index build) falls back to `[]` -- fail-safe: the filter still runs, it just can't detect + * an owner-assignment it was never told about, rather than the check being silently skipped. */ async function supplementWithDiscoveryIndex( fanOut: DiscoverFanOutSummary, @@ -181,9 +183,10 @@ async function supplementWithDiscoveryIndex( const seen = new Set(fanOut.issues.map((issue) => dedupeKey(issue.repoFullName, issue.issueNumber))); const supplemented = response.candidates .filter((candidate) => !seen.has(dedupeKey(candidate.repoFullName, candidate.issueNumber))) - // DiscoveryIndexCandidate is a near-superset of RawCandidateIssue; assignees is absent from the hosted - // contract (#7168) so we annotate [] — cast preserves pre-existing runtime shape rather than re-mapping. - .map((candidate) => ({ ...candidate, assignees: [], labels: [...candidate.labels] }) as RawCandidateIssue); + // DiscoveryIndexCandidate is a near-superset of RawCandidateIssue; copy the real assignees through when the + // hosted contract carried them (#7442), falling back to [] only when the served response genuinely omitted the + // field — cast preserves pre-existing runtime shape rather than re-mapping. + .map((candidate) => ({ ...candidate, assignees: [...(candidate.assignees ?? [])], labels: [...candidate.labels] }) as RawCandidateIssue); if (supplemented.length === 0) return fanOut; return { ...fanOut, issues: [...fanOut.issues, ...supplemented] }; } diff --git a/test/unit/discovery-index-contract.test.ts b/test/unit/discovery-index-contract.test.ts index 61e776a03..5c48c4d13 100644 --- a/test/unit/discovery-index-contract.test.ts +++ b/test/unit/discovery-index-contract.test.ts @@ -122,6 +122,18 @@ describe("discovery-index API contract (#4300)", () => { }); }); + it("normalizes assignees like labels, and omits the field entirely when the response never carries it (#7442)", () => { + // Present: filtered + trimmed exactly like labels (non-strings and blanks dropped). + expect( + normalizeDiscoveryIndexCandidate({ repoFullName: "acme/widgets", issueNumber: 1, title: "t", assignees: ["acme", " ", 42, " maintainer "] })?.assignees, + ).toEqual(["acme", "maintainer"]); + // Explicitly served empty: present as [] (a real "no assignees" signal). + expect(normalizeDiscoveryIndexCandidate({ repoFullName: "acme/widgets", issueNumber: 1, title: "t", assignees: [] })?.assignees).toEqual([]); + // Never served (older server build): the field is omitted, so a client can tell it apart from served-empty + // and fall back to [] at the merge site rather than silently skipping the repo-owner exclusion filter. + expect("assignees" in (normalizeDiscoveryIndexCandidate({ repoFullName: "acme/widgets", issueNumber: 1, title: "t" }) ?? {})).toBe(false); + }); + it("maps aiPolicySource and respects an explicit aiPolicyAllowed:false", () => { expect(normalizeDiscoveryIndexCandidate({ repoFullName: "o/r", issueNumber: 1, title: "t", aiPolicySource: "CONTRIBUTING.md", aiPolicyAllowed: false })).toMatchObject({ aiPolicySource: "CONTRIBUTING.md", diff --git a/test/unit/miner-discover-cli.test.ts b/test/unit/miner-discover-cli.test.ts index 5e39e2822..929ae1ef2 100644 --- a/test/unit/miner-discover-cli.test.ts +++ b/test/unit/miner-discover-cli.test.ts @@ -82,6 +82,26 @@ function fanOutIssue(overrides: Record = {}) { }; } +// A hosted discovery-index candidate (#7168 shape). assignees is optional in the contract (#7442) — omit it to +// simulate an older server build that never populated the field. +function indexCandidate(overrides: Record = {}) { + return { + owner: "acme", + repo: "widgets", + repoFullName: "acme/widgets", + issueNumber: 2, + title: "index-sourced issue", + labels: ["help wanted"], + commentsCount: 0, + createdAt: null, + updatedAt: null, + htmlUrl: null, + aiPolicyAllowed: true as const, + aiPolicySource: "none" as const, + ...overrides, + }; +} + afterEach(() => { for (const store of stores.splice(0)) store.close(); closeDefaultPortfolioQueueStore(); @@ -469,6 +489,67 @@ describe("runDiscover (#4247)", () => { ]); }); + it("REGRESSION (#7442): a discovery-index candidate assigned to its own repo owner is excluded once real assignees flow through", async () => { + const portfolioQueue = tempQueueStore(); + const fetchCandidateIssuesWithSummary = vi.fn(async () => ({ + issues: [fanOutIssue({ issueNumber: 1, title: "direct fan-out issue" })], + warnings: [], + rateLimitRemaining: 5000, + rateLimitResetAt: "2026-07-09T13:00:00.000Z", + })); + // The hosted index supplies a DIFFERENT issue (so it survives dedupe) assigned to the repo owner "acme". + const queryDiscoveryIndex = vi.fn(async () => ({ contractVersion: 1, candidates: [indexCandidate({ issueNumber: 2, assignees: ["acme"] })], nextCursor: null })); + + const log = vi.spyOn(console, "log").mockImplementation(() => undefined); + const exitCode = await runDiscover(["acme/widgets", "--json"], { + nowMs: NOW, + env: { ...process.env, LOOPOVER_MINER_DISCOVERY_PLANE: "1" }, + initPortfolioQueue: () => portfolioQueue, + initPolicyDocCache: () => tempPolicyDocCacheStore(), + initPolicyVerdictCache: () => tempPolicyVerdictCacheStore(), + initRankedCandidatesStore: () => tempRankedCandidatesStore(), + fetchCandidateIssuesWithSummary, + queryDiscoveryIndex: queryDiscoveryIndex as never, + }); + + expect(exitCode).toBe(0); + expect(queryDiscoveryIndex).toHaveBeenCalled(); + const payload = JSON.parse(String(log.mock.calls[0]?.[0])); + // The owner-assigned index candidate (issue 2) is excluded by the #7040 filter; only the direct fan-out issue survives. + expect(payload.ranked.map((e: { issueNumber: number }) => e.issueNumber)).toEqual([1]); + expect(portfolioQueue.listQueue("acme/widgets").map((e) => e.identifier)).toEqual(["issue:1"]); + }); + + it("REGRESSION (#7442): a discovery-index response that omits assignees falls back to [] and still runs the filter (kept, not skipped)", async () => { + const portfolioQueue = tempQueueStore(); + const fetchCandidateIssuesWithSummary = vi.fn(async () => ({ + issues: [fanOutIssue({ issueNumber: 1, title: "direct fan-out issue" })], + warnings: [], + rateLimitRemaining: 5000, + rateLimitResetAt: "2026-07-09T13:00:00.000Z", + })); + // Older server build: the candidate carries NO assignees field at all. + const queryDiscoveryIndex = vi.fn(async () => ({ contractVersion: 1, candidates: [indexCandidate({ issueNumber: 2 })], nextCursor: null })); + + const log = vi.spyOn(console, "log").mockImplementation(() => undefined); + const exitCode = await runDiscover(["acme/widgets", "--json"], { + nowMs: NOW, + env: { ...process.env, LOOPOVER_MINER_DISCOVERY_PLANE: "1" }, + initPortfolioQueue: () => portfolioQueue, + initPolicyDocCache: () => tempPolicyDocCacheStore(), + initPolicyVerdictCache: () => tempPolicyVerdictCacheStore(), + initRankedCandidatesStore: () => tempRankedCandidatesStore(), + fetchCandidateIssuesWithSummary, + queryDiscoveryIndex: queryDiscoveryIndex as never, + }); + + expect(exitCode).toBe(0); + const payload = JSON.parse(String(log.mock.calls[0]?.[0])); + // Fail-safe: the omitted field becomes [], the owner-exclusion filter still runs (finds no assignment), issue 2 is KEPT. + expect(payload.ranked.map((e: { issueNumber: number }) => e.issueNumber).sort()).toEqual([1, 2]); + expect(portfolioQueue.listQueue("acme/widgets").map((e) => e.identifier).sort()).toEqual(["issue:1", "issue:2"]); + }); + it("#4847: --dry-run performs the real fan-out/rank but never opens any local store", async () => { const initPortfolioQueue = vi.fn(); const initPolicyDocCache = vi.fn();