From 480d2c2bfed82af5d52a032344884f744c5da43f Mon Sep 17 00:00:00 2001 From: shin-core <153108882+shin-core@users.noreply.github.com> Date: Tue, 21 Jul 2026 08:05:03 +1000 Subject: [PATCH] fix(miner): bring extractLinkedIssueNumbers to parity with the host's code-span and URL handling extractLinkedIssueNumbers stripped inline code spans with a string replace before matching, which could pull a bare #N up against a preceding closing keyword that was not adjacent in the original text (e.g. "Fixes `x` #45" -> "Fixes #45"), spuriously linking #45. It also missed GitHub's full issue-URL closing form, so a contributor pasting the browser URL produced zero linked issues and could trip the no-linked-issue hard rule on a PR that genuinely had one. Match the host's extractLinkedIssueNumbersWithOverflow: exclude code spans by byte range (preserving the original keyword/#N adjacency the regex depends on) and recognize the `https://github.com/owner/repo/issues/N` form alongside the qualified and bare forms, counting the qualified and URL forms only when they target this repo. Closes #7527 --- .../loopover-miner/lib/self-review-context.js | 34 +++++--- .../loopover-miner/lib/self-review-context.ts | 32 +++++-- test/unit/miner-self-review-context.test.ts | 85 +++++++++++++++++++ 3 files changed, 132 insertions(+), 19 deletions(-) diff --git a/packages/loopover-miner/lib/self-review-context.js b/packages/loopover-miner/lib/self-review-context.js index abaf522995..a89380e971 100644 --- a/packages/loopover-miner/lib/self-review-context.js +++ b/packages/loopover-miner/lib/self-review-context.js @@ -200,19 +200,33 @@ function extractLinkedPrNumbers(body) { } return numbers; } -// Mirrors src/db/repositories.ts's extractLinkedIssueNumbers: GitHub's own closing-keyword vocabulary, only -// counting a fully-qualified owner/repo#N reference when it targets the SAME repo being fetched. -const LINKED_ISSUE_PATTERN = /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+(?:([\w.-]+\/[\w.-]+)#|#)(\d+)\b/gi; +// Mirrors src/db/repositories.ts's extractLinkedIssueNumbersWithOverflow (#7527): GitHub's own closing-keyword +// vocabulary, counting a qualified `owner/repo#N` or full `https://github.com/owner/repo/issues/N` reference +// only when it targets THIS repo. The bare `#N` form always counts. GitHub's linker also recognizes the full +// issue URL after a closing keyword, so a contributor pasting the browser URL still links the issue (the host +// port fixed the same gap) rather than silently tripping the "no linked issue" hard rule. +const LINKED_ISSUE_PATTERN = /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+(?:https?:\/\/(?:www\.)?github\.com\/(?[\w.-]+\/[\w.-]+)\/issues\/(?\d+)|(?[\w.-]+\/[\w.-]+)#(?\d+)|#(?\d+))\b/gi; function extractLinkedIssueNumbers(body, repoFullName) { - // Strip backtick code spans first so a closing-keyword pattern quoted as example code doesn't count. - const withoutCodeSpans = body.replace(/`[^`]*`/g, ""); + // Exclude code spans by BYTE RANGE, not string-replace: `body.replace(/`[^`]*`/g, "")` deletes the span's + // characters, which can pull a bare `#N` up against a preceding closing keyword that was NOT adjacent to it in + // the original text (e.g. "Fixes `x` #45" -> "Fixes #45"), spuriously linking #45. Matching span ranges and + // skipping any keyword hit that overlaps one preserves the original adjacency the regex depends on. + const codeSpanRanges = [...String(body).matchAll(/`[^`\n]*`/g)].map((match) => ({ + start: match.index, + end: match.index + match[0].length, + })); const numbers = []; const normalizedRepo = repoFullName.toLowerCase(); - for (const match of withoutCodeSpans.matchAll(LINKED_ISSUE_PATTERN)) { - const qualifiedRepo = match[1]; - if (qualifiedRepo !== undefined && qualifiedRepo.toLowerCase() !== normalizedRepo) + for (const match of String(body).matchAll(LINKED_ISSUE_PATTERN)) { + const matchStart = match.index; + const matchEnd = matchStart + match[0].length; + if (codeSpanRanges.some((range) => matchStart < range.end && matchEnd > range.start)) continue; - const number = Number(match[2]); + const groups = match.groups; + const owner = groups.urlOwner ?? groups.qualOwner; + if (owner && owner.toLowerCase() !== normalizedRepo) + continue; + const number = Number(groups.urlNum ?? groups.qualNum ?? groups.bareNum); if (Number.isInteger(number) && number > 0) numbers.push(number); } @@ -430,4 +444,4 @@ export async function fetchSelfReviewContext(repoFullName, options = {}) { issueQuality, }; } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"self-review-context.js","sourceRoot":"","sources":["self-review-context.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"self-review-context.js","sourceRoot":"","sources":["self-review-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAkD7E,2GAA2G;AAC3G,0GAA0G;AAC1G,kGAAkG;AAClG,6GAA6G;AAC7G,wGAAwG;AACxG,EAAE;AACF,wGAAwG;AACxG,2GAA2G;AAC3G,yEAAyE;AACzE,EAAE;AACF,6GAA6G;AAC7G,4GAA4G;AAC5G,gHAAgH;AAChH,EAAE;AACF,+GAA+G;AAC/G,oGAAoG;AACpG,2GAA2G;AAC3G,4FAA4F;AAE5F,MAAM,kBAAkB,GAAG,YAAY,CAAC;AACxC,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;AACtD,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AACzE,MAAM,0BAA0B,GAAG,0BAA0B,CAAC;AAC9D,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAC1C,wHAAwH;AACxH,MAAM,kCAAkC,GAAG,GAAG,CAAC;AAE/C,0GAA0G;AAC1G,2DAA2D;AAC3D,MAAM,wBAAwB,GAAG,CAAC,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;AAEtH,SAAS,iBAAiB,CAAC,YAAiB;IAC1C,IAAI,OAAO,YAAY,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAClD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACxD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,SAAS,aAAa,CAAC,WAAgB;IACrC,MAAM,OAAO,GAA2B;QACtC,MAAM,EAAE,6BAA6B;QACrC,YAAY,EAAE,gBAAgB;QAC9B,sBAAsB,EAAE,kBAAkB;KAC3C,CAAC;IACF,MAAM,KAAK,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,IAAI,KAAK;QAAE,OAAO,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAC;IACrD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAe,EAAE;IACzC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,4GAA4G;IAC5G,MAAM,YAAY,GAChB,OAAO,CAAC,YAAY,KAAK,IAAI;QAC3B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,OAAO,CAAC,YAAY,CAAC,YAAY,KAAK,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY;YAClH,CAAC,CAAC;gBACE,MAAM,EACJ,OAAO,OAAO,CAAC,YAAY,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE;oBACnF,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;oBACjD,CAAC,CAAC,CAAC,6BAA6B,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,yBAAyB,CAAC;gBAC/E,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,YAAY;aAChD;YACH,CAAC,CAAC,6BAA6B,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO;QACL,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,GAAG,CAAC,YAAY,IAAI,EAAE;QAC1D,UAAU,EAAE,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,oBAAoB;QAClI,iBAAiB,EACf,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,4BAA4B;QACrJ,gBAAgB,EACd,OAAO,OAAO,CAAC,gBAAgB,KAAK,QAAQ,IAAI,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,0BAA0B;QAChJ,SAAS,EAAE,CAAC,OAAO,CAAC,SAAS,IAAI,KAAK,CAA2B;QACjE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB;QACtG,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB;QAC3G,gBAAgB,EAAE,OAAO,OAAO,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QACrG,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QACrH,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,0BAA0B;QACpJ,sBAAsB,EACpB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,OAAO,CAAC,sBAAsB,GAAG,CAAC;YACpF,CAAC,CAAC,OAAO,CAAC,sBAAsB;YAChC,CAAC,CAAC,kCAAkC;QACxC,YAAY;KACb,CAAC;AACJ,CAAC;AAED,2FAA2F;AAC3F,MAAM,UAAU,4BAA4B,CAAC,OAAgB;IAC3D,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACnF,MAAM,MAAM,GAAG,OAAkC,CAAC;IAClD,MAAM,gBAAgB,GACpB,OAAO,MAAM,CAAC,gBAAgB,KAAK,QAAQ,IAAI,MAAM,CAAC,gBAAgB,IAAI,CAAC,IAAI,MAAM,CAAC,gBAAgB,IAAI,CAAC;QACzG,CAAC,CAAC,MAAM,CAAC,gBAAgB;QACzB,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,eAAe,GAAG,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;IACjI,MAAM,eAAe,GAAG,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;IACjI,IAAI,gBAAgB,KAAK,IAAI,IAAI,eAAe,KAAK,IAAI,IAAI,eAAe,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACnG,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAChE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iCAAiC,CAC/C,QAAuB,EACvB,MAAsC;IAEtC,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IAC1C,MAAM,IAAI,GAAG,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACzF,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,QAAQ,IAAI,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACtF,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;QACtC,CAAC;IACH,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,EAAE,CAAC;QAC7E,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC;IAC7C,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,EAAE,CAAC;QAC7E,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC;IAC7C,CAAC;IACD,OAAO,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,MAAW,EAAE,QAAa;IAC/D,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC;IACnC,IAAI,CAAC,IAAI,EAAE,YAAY;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,aAAa,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC;IAClI,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,QAAQ,CAAC,SAAS,EAClB,GAAG,EACH;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,IAAI,CAAC,YAAY,EAAE;gBAC5C,MAAM,EAAE,kBAAkB;gBAC1B,YAAY,EAAE,gBAAgB;aAC/B;SACF,EACD,QAAQ,CAAC,sBAAsB,CAChC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,0GAA0G;AAC1G,8GAA8G;AAC9G,uDAAuD;AACvD,KAAK,UAAU,gBAAgB,CAAC,SAAc,EAAE,GAAQ,EAAE,IAAS,EAAE,SAAc;IACjF,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,GAAQ,EAAE,QAAa;IAClD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC7J,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACxD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAAS,EAAE,KAAU,EAAE,QAAa;IAChE,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,UAAU,GAAG,IAAI,IAAI,MAAM,EAAE,CAAC;QACtD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,MAAM;QACnD,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QACzB,IAAI,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,OAAO;YAAE,MAAM;IAC/C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,wGAAwG;AACxG,yGAAyG;AACzG,4GAA4G;AAC5G,KAAK,UAAU,qBAAqB,CAAC,MAAW,EAAE,QAAa;IAC7D,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,UAAU,UAAU,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAClH,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACjE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACzE,OAAO;QACL,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE;QAC1C,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK;QAC3C,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI;QACjC,cAAc,EAAE,SAAS;QACzB,WAAW,EAAE,KAAK;QAClB,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK;QACnC,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;QACjC,aAAa,EAAE,OAAO,CAAC,cAAc,IAAI,IAAI;QAC7C,cAAc,EAAE,IAAI;KACrB,CAAC;AACJ,CAAC;AAED,2GAA2G;AAC3G,6GAA6G;AAC7G,+GAA+G;AAC/G,6GAA6G;AAC7G,MAAM,iBAAiB,GAAG,gFAAgF,CAAC;AAC3G,SAAS,sBAAsB,CAAC,IAAS;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,+GAA+G;AAC/G,6GAA6G;AAC7G,6GAA6G;AAC7G,8GAA8G;AAC9G,0FAA0F;AAC1F,MAAM,oBAAoB,GACxB,+MAA+M,CAAC;AAClN,SAAS,yBAAyB,CAAC,IAAS,EAAE,YAAiB;IAC7D,0GAA0G;IAC1G,+GAA+G;IAC/G,6GAA6G;IAC7G,oGAAoG;IACpG,MAAM,cAAc,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC9E,KAAK,EAAE,KAAK,CAAC,KAAM;QACnB,GAAG,EAAE,KAAK,CAAC,KAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;KACpC,CAAC,CAAC,CAAC;IACJ,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAClD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,KAAK,CAAC,KAAM,CAAC;QAChC,MAAM,QAAQ,GAAG,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9C,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,GAAG,KAAK,CAAC,GAAG,IAAI,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC;YAAE,SAAS;QAC/F,MAAM,MAAM,GAAG,KAAK,CAAC,MAAO,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC;QAClD,IAAI,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,cAAc;YAAE,SAAS;QAC9D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;QACzE,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,MAAW;IAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/H,CAAC;AAED,uGAAuG;AACvG,qGAAqG;AACrG,0DAA0D;AAC1D,SAAS,aAAa,CAAC,YAAiB,EAAE,KAAU;IAClD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IAC9B,OAAO;QACL,YAAY;QACZ,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI;QACtC,iBAAiB,EAAE,KAAK,CAAC,kBAAkB,IAAI,IAAI;QACnD,OAAO,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;QAC/B,IAAI;QACJ,SAAS,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI;QACnC,SAAS,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI;QACnC,QAAQ,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;QACjC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,SAAS,EAAE,sBAAsB,CAAC,IAAI,CAAC;KACxC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,MAAW,EAAE,QAAa;IAC7D,MAAM,QAAQ,GAAG,MAAM,cAAc,CACnC,UAAU,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EACtF,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EACpD,QAAQ,CACT,CAAC;IACF,6GAA6G;IAC7G,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;AACtK,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAc;IAC3C,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IACvC,IAAI,SAAS,KAAK,KAAK;QAAE,OAAO,OAAO,CAAC;IACxC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+GAA+G;AAC/G,4GAA4G;AAC5G,0GAA0G;AAC1G,uEAAuE;AACvE,SAAS,mBAAmB,CAAC,YAAiB,EAAE,EAAO;IACrD,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;IAC3B,OAAO;QACL,YAAY;QACZ,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,WAAW,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI;QACnC,iBAAiB,EAAE,EAAE,CAAC,kBAAkB,IAAI,IAAI;QAChD,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI;QAC7B,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI;QAC7B,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI;QAC7B,OAAO,EAAE,EAAE,CAAC,QAAQ,IAAI,IAAI;QAC5B,QAAQ,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI;QAC9B,OAAO,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI;QACzB,cAAc,EAAE,EAAE,CAAC,eAAe,IAAI,qBAAqB,CAAC,EAAE,CAAC,SAAS,CAAC;QACzE,cAAc,EAAE,IAAI;QACpB,IAAI;QACJ,SAAS,EAAE,EAAE,CAAC,UAAU,IAAI,IAAI;QAChC,SAAS,EAAE,EAAE,CAAC,UAAU,IAAI,IAAI;QAChC,QAAQ,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI;QAC9B,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC;QAC7B,YAAY,EAAE,yBAAyB,CAAC,IAAI,EAAE,YAAY,CAAC;KAC5D,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,MAAW,EAAE,QAAa;IACnE,MAAM,QAAQ,GAAG,MAAM,cAAc,CACnC,UAAU,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EACrF,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EACpD,QAAQ,CACT,CAAC;IACF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC;AAED,iGAAiG;AACjG,6GAA6G;AAC7G,KAAK,UAAU,+BAA+B,CAAC,QAAa;IAC1D,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC;IACxE,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACxD,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,wBAAwB;YAAE,OAAO,IAAI,CAAC;IAC5F,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC1C,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,GAAG,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAChB,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC;YAC/B,IAAI,UAAU,GAAG,wBAAwB,EAAE,CAAC;gBAC1C,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,MAAW,EAAE,QAAa;IAC5D,KAAK,MAAM,IAAI,IAAI,wBAAwB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,iBAAiB,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;QAChI,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YACxL,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,MAAM,IAAI,GAAG,MAAM,+BAA+B,CAAC,QAAQ,CAAC,CAAC;gBAC7D,IAAI,OAAO,IAAI,KAAK,QAAQ;oBAAE,OAAO,IAAI,CAAC;YAC5C,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,+BAA+B;QACjC,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,0GAA0G;AAC1G,wGAAwG;AACxG,6GAA6G;AAC7G,KAAK,UAAU,yBAAyB,CAAC,KAAU,EAAE,QAAa;IAChE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,gBAAgB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC1L,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,KAAK,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,OAAO,KAAK,CAAC;QAC1C,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,cAAc,KAAK,QAAQ,IAAI,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,eAAe,CAAC,CAAC;IACtI,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,yGAAyG;AACzG,mFAAmF;AACnF,wGAAwG;AACxG,wGAAwG;AACxG,qGAAqG;AACrG,2GAA2G;AAC3G,wGAAwG;AACxG,uGAAuG;AACvG,8GAA8G;AAC9G,oGAAoG;AACpG,SAAS,yBAAyB,CAAC,eAAoB,EAAE,kBAAuB;IAC9E,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAClD,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,CAClC,CAAC,OAAY,EAAE,EAAE,CACf,OAAO,CAAC,IAAI,KAAK,MAAM;QACvB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,MAAM,IAAI,CAAC;QAC7E,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CACvG,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,YAAoB,EACpB,UAAyC,EAAE;IAE3C,MAAM,MAAM,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAE3C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChH,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC;QACvC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC;QACvC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,CAAC;QAC7C,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC;QACtC,yBAAyB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,QAAQ,CAAC;QAC9D,uBAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC;KAC1C,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,yBAAyB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,iCAAiC,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IACvF,2HAA2H;IAC3H,2GAA2G;IAC3G,0FAA0F;IAC1F,MAAM,QAAQ,GAAG,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACxE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACxF,MAAM,YAAY,GAAG,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAEvG,OAAO;QACL,QAAQ;QACR,IAAI;QACJ,MAAM;QACN,YAAY;QACZ,oBAAoB;QACpB,kBAAkB;QAClB,YAAY;KACc,CAAC;AAC/B,CAAC"} \ No newline at end of file diff --git a/packages/loopover-miner/lib/self-review-context.ts b/packages/loopover-miner/lib/self-review-context.ts index 81ae73dce2..8bd946b71b 100644 --- a/packages/loopover-miner/lib/self-review-context.ts +++ b/packages/loopover-miner/lib/self-review-context.ts @@ -270,18 +270,32 @@ function extractLinkedPrNumbers(body: any) { return numbers; } -// Mirrors src/db/repositories.ts's extractLinkedIssueNumbers: GitHub's own closing-keyword vocabulary, only -// counting a fully-qualified owner/repo#N reference when it targets the SAME repo being fetched. -const LINKED_ISSUE_PATTERN = /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+(?:([\w.-]+\/[\w.-]+)#|#)(\d+)\b/gi; +// Mirrors src/db/repositories.ts's extractLinkedIssueNumbersWithOverflow (#7527): GitHub's own closing-keyword +// vocabulary, counting a qualified `owner/repo#N` or full `https://github.com/owner/repo/issues/N` reference +// only when it targets THIS repo. The bare `#N` form always counts. GitHub's linker also recognizes the full +// issue URL after a closing keyword, so a contributor pasting the browser URL still links the issue (the host +// port fixed the same gap) rather than silently tripping the "no linked issue" hard rule. +const LINKED_ISSUE_PATTERN = + /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+(?:https?:\/\/(?:www\.)?github\.com\/(?[\w.-]+\/[\w.-]+)\/issues\/(?\d+)|(?[\w.-]+\/[\w.-]+)#(?\d+)|#(?\d+))\b/gi; function extractLinkedIssueNumbers(body: any, repoFullName: any) { - // Strip backtick code spans first so a closing-keyword pattern quoted as example code doesn't count. - const withoutCodeSpans = body.replace(/`[^`]*`/g, ""); + // Exclude code spans by BYTE RANGE, not string-replace: `body.replace(/`[^`]*`/g, "")` deletes the span's + // characters, which can pull a bare `#N` up against a preceding closing keyword that was NOT adjacent to it in + // the original text (e.g. "Fixes `x` #45" -> "Fixes #45"), spuriously linking #45. Matching span ranges and + // skipping any keyword hit that overlaps one preserves the original adjacency the regex depends on. + const codeSpanRanges = [...String(body).matchAll(/`[^`\n]*`/g)].map((match) => ({ + start: match.index!, + end: match.index! + match[0].length, + })); const numbers = []; const normalizedRepo = repoFullName.toLowerCase(); - for (const match of withoutCodeSpans.matchAll(LINKED_ISSUE_PATTERN)) { - const qualifiedRepo = match[1]; - if (qualifiedRepo !== undefined && qualifiedRepo.toLowerCase() !== normalizedRepo) continue; - const number = Number(match[2]); + for (const match of String(body).matchAll(LINKED_ISSUE_PATTERN)) { + const matchStart = match.index!; + const matchEnd = matchStart + match[0].length; + if (codeSpanRanges.some((range) => matchStart < range.end && matchEnd > range.start)) continue; + const groups = match.groups!; + const owner = groups.urlOwner ?? groups.qualOwner; + if (owner && owner.toLowerCase() !== normalizedRepo) continue; + const number = Number(groups.urlNum ?? groups.qualNum ?? groups.bareNum); if (Number.isInteger(number) && number > 0) numbers.push(number); } return numbers; diff --git a/test/unit/miner-self-review-context.test.ts b/test/unit/miner-self-review-context.test.ts index 75ed767601..07dd35f411 100644 --- a/test/unit/miner-self-review-context.test.ts +++ b/test/unit/miner-self-review-context.test.ts @@ -515,6 +515,91 @@ describe("fetchSelfReviewContext (#5145)", () => { expect(result.pullRequests[0]?.linkedIssues).toEqual([7]); }); + it("REGRESSION (#7527): a closing keyword separated from #N only by an inline code span is NOT a linked issue", async () => { + // Byte-range exclusion, not string-replace: "Fixes `x` #45" must NOT collapse to "Fixes #45" and link #45. + const fetchImpl = routedFetch({ + "/repos/acme/widgets/issues": () => jsonResponse([]), + "/repos/acme/widgets/pulls": () => jsonResponse([prPayload({ body: "Fixes `some code` #45" })]), + "/repos/acme/widgets": () => jsonResponse(REPO_PAYLOAD), + "raw.githubusercontent.com": () => jsonResponse(null, 404), + "api.gittensor.io/miners": () => jsonResponse([]), + }); + + const result = await fetchSelfReviewContext("acme/widgets", { fetchImpl: fetchImpl as never, loopoverAuth: null }); + expect(result.pullRequests[0]?.linkedIssues).toEqual([]); + }); + + it("REGRESSION (#7527): a genuine closing keyword elsewhere still links even when an unrelated code span is present", async () => { + const fetchImpl = routedFetch({ + "/repos/acme/widgets/issues": () => jsonResponse([]), + "/repos/acme/widgets/pulls": () => jsonResponse([prPayload({ body: "See `Closes #999` in the docs. Closes #7 for real." })]), + "/repos/acme/widgets": () => jsonResponse(REPO_PAYLOAD), + "raw.githubusercontent.com": () => jsonResponse(null, 404), + "api.gittensor.io/miners": () => jsonResponse([]), + }); + + const result = await fetchSelfReviewContext("acme/widgets", { fetchImpl: fetchImpl as never, loopoverAuth: null }); + // The span-internal "Closes #999" is rejected; the real "Closes #7" outside any span still links. + expect(result.pullRequests[0]?.linkedIssues).toEqual([7]); + }); + + it("REGRESSION (#7527): the full issue-URL closing form links the issue when owner/repo matches this repo", async () => { + const fetchImpl = routedFetch({ + "/repos/acme/widgets/issues": () => jsonResponse([]), + "/repos/acme/widgets/pulls": () => + jsonResponse([prPayload({ body: "Closes https://github.com/acme/widgets/issues/88 and Fixes https://www.github.com/acme/widgets/issues/89" })]), + "/repos/acme/widgets": () => jsonResponse(REPO_PAYLOAD), + "raw.githubusercontent.com": () => jsonResponse(null, 404), + "api.gittensor.io/miners": () => jsonResponse([]), + }); + + const result = await fetchSelfReviewContext("acme/widgets", { fetchImpl: fetchImpl as never, loopoverAuth: null }); + expect(result.pullRequests[0]?.linkedIssues).toEqual([88, 89]); + }); + + it("REGRESSION (#7527): a full-URL closing form pointing at a DIFFERENT repo does not spoof a same-repo link", async () => { + const fetchImpl = routedFetch({ + "/repos/acme/widgets/issues": () => jsonResponse([]), + "/repos/acme/widgets/pulls": () => + jsonResponse([prPayload({ body: "Closes https://github.com/other/project/issues/12" })]), + "/repos/acme/widgets": () => jsonResponse(REPO_PAYLOAD), + "raw.githubusercontent.com": () => jsonResponse(null, 404), + "api.gittensor.io/miners": () => jsonResponse([]), + }); + + const result = await fetchSelfReviewContext("acme/widgets", { fetchImpl: fetchImpl as never, loopoverAuth: null }); + expect(result.pullRequests[0]?.linkedIssues).toEqual([]); + }); + + it("REGRESSION (#7527): bare #N and qualified owner/repo#N forms still link exactly as before", async () => { + const fetchImpl = routedFetch({ + "/repos/acme/widgets/issues": () => jsonResponse([]), + "/repos/acme/widgets/pulls": () => + jsonResponse([prPayload({ body: "Fixes #3, Closes acme/widgets#4, Resolves other/repo#5" })]), + "/repos/acme/widgets": () => jsonResponse(REPO_PAYLOAD), + "raw.githubusercontent.com": () => jsonResponse(null, 404), + "api.gittensor.io/miners": () => jsonResponse([]), + }); + + const result = await fetchSelfReviewContext("acme/widgets", { fetchImpl: fetchImpl as never, loopoverAuth: null }); + // #3 (bare) + #4 (same-repo qualified) link; #5 (different-repo qualified) does not. + expect(result.pullRequests[0]?.linkedIssues).toEqual([3, 4]); + }); + + it("REGRESSION (#7527): a closing keyword pointing at issue #0 is rejected (issue numbers are 1-based)", async () => { + const fetchImpl = routedFetch({ + "/repos/acme/widgets/issues": () => jsonResponse([]), + "/repos/acme/widgets/pulls": () => jsonResponse([prPayload({ body: "Closes #0, Fixes #6" })]), + "/repos/acme/widgets": () => jsonResponse(REPO_PAYLOAD), + "raw.githubusercontent.com": () => jsonResponse(null, 404), + "api.gittensor.io/miners": () => jsonResponse([]), + }); + + const result = await fetchSelfReviewContext("acme/widgets", { fetchImpl: fetchImpl as never, loopoverAuth: null }); + // #0 fails the `number > 0` guard; only the real #6 survives. + expect(result.pullRequests[0]?.linkedIssues).toEqual([6]); + }); + it("maps a dirty and an unknown mergeable state correctly", async () => { const fetchImpl = routedFetch({ "/repos/acme/widgets/issues": () => jsonResponse([]),