From 5082fbcb4513ed64c0c854c5635b15b7ccc7943f Mon Sep 17 00:00:00 2001 From: Derek Lewis Date: Mon, 2 Nov 2026 23:27:34 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=F0=9F=94=A7=EF=BC=9Aread?= =?UTF-8?q?=20the=20trailer=20[bot]=20check=20in=20linear=20time?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TOOL_IDENTITY put two runs of \s* side by side after a [bot], so a long run of spaces with something else at the end could be split between them every possible way before the match gave up: 200,000 spaces took 20 seconds, and the landing runner reads contributor commit messages. The address group now takes its own trailing whitespace along, which matches the same strings in linear time. git 2.56 no longer reads a line starting `token://` as a trailer, so on the runners' new git the readTrailers comparison disagreed on a bare link and CI has been red since. The rules keep the older reading, because a history is read by every git and not only the newest, so that one case is only compared against a git before 2.56. This is the same change as OpenINF/sdk#140; the three copies of commit-message.mts stay byte for byte the same. Signed-off-by: Derek Lewis Assisted-by: Claude-Code:claude-opus-5 --- build/shared/commit-message.mts | 8 +++++++- build/shared/commit-message.test.mts | 30 +++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/build/shared/commit-message.mts b/build/shared/commit-message.mts index cd04069e..1b045569 100644 --- a/build/shared/commit-message.mts +++ b/build/shared/commit-message.mts @@ -141,12 +141,18 @@ const ASSISTED_BY_VALUE = /^[^\s:]+:\S+( \S+)*$/; * alternative is a tool standing in the history as an author. If it ever * refuses a real contributor, narrow the pattern rather than drop the trailer. * + * The whitespace after `[bot]` is matched once, with the address taking its + * own trailing whitespace along, because two runs of `\s*` side by side can + * split the same spaces between them every possible way: a long run of them + * after a `[bot]`, with something else at the end, took time quadratic in + * its length to refuse. + * * An agent whose integration commits as a `[bot]` account needs no name here. * Renovate and Dependabot are out of reach either way: their commits are * skipped whole, so their own `[bot]` co-authors are not this check's business. */ const TOOL_IDENTITY = - /\[bot](?=@|\s*(?:<[^>]*>)?\s*$)|\bnoreply@(?:anthropic|openai)\.com\b|\b(?:aider|chatgpt|claude|codex|copilot|cursor)\b/i; + /\[bot](?=@|\s*(?:<[^>]*>\s*)?$)|\bnoreply@(?:anthropic|openai)\.com\b|\b(?:aider|chatgpt|claude|codex|copilot|cursor)\b/i; /** git folds a trailer whose value runs onto an indented line beneath it. */ export const CONTINUATION_LINE = /^\s/; diff --git a/build/shared/commit-message.test.mts b/build/shared/commit-message.test.mts index ba10eb0a..7c3ac213 100644 --- a/build/shared/commit-message.test.mts +++ b/build/shared/commit-message.test.mts @@ -409,6 +409,18 @@ describe('validateCommitMessage: the trailers', () => { ); }); + test('refuses a long run of spaces after [bot] in linear time', () => { + // Two runs of `\s*` side by side once split these spaces between them every + // possible way before giving up on the `x` at the end. + const spaces = ' '.repeat(200_000); + const started = performance.now(); + const problems = validateCommitMessage( + `🏗️🔧：fix it\n\nCo-authored-by: Ada [bot]${spaces}x ` + ); + ok(performance.now() - started < 1000); + ok(!problems.some((problem) => /credits a tool/.test(problem))); + }); + test('leaves a person at one of those companies signing off alone', () => { deepStrictEqual( validateCommitMessage( @@ -468,6 +480,9 @@ describe('validateCommitMessage: against what landed', () => { }); }); +/** Read as a trailer called `https` by git before 2.56, and not since. */ +const BARE_LINK = '🏗️🔧：fix it\n\nhttps://example.com/p'; + describe('readTrailers', () => { test('agrees with git about where the trailers are', () => { // The rules describe git's behavior, so git is the thing to check them @@ -483,10 +498,23 @@ describe('readTrailers', () => { '🏗️🔧：fix it\r\n\r\nBody.\r\n\r\nPR-URL: https://x/1\r\n', '🏗️🔧：fix it\n\n-------\n\nPR-URL: https://x/1', '🏗️🔧：fix it\n\nPR URL: https://x/1\nReviewed-by: A ', - '🏗️🔧：fix it\n\nhttps://example.com/p', + BARE_LINK, ]; + // git 2.56 stopped reading a line that starts `token://` as a trailer. The + // rules keep the older reading, since a history is read by every git + // version and not only the newest, so a newer git is not asked about it. + const [major = 0, minor = 0] = ( + /(\d+)\.(\d+)/.exec( + execFileSync('git', ['--version'], { encoding: 'utf8' }) + ) ?? [] + ) + .slice(1) + .map(Number); + const readsLinksAsTrailers = major < 2 || (major === 2 && minor < 56); for (const message of messages) { + if (message === BARE_LINK && !readsLinksAsTrailers) continue; + const theirs = execFileSync('git', ['interpret-trailers', '--parse'], { encoding: 'utf8', input: message,