[MarcoDotIO]

Problem

With "Remove agent credits on merge" turned on, the Claude Code footer still ends up in squash and merge messages. Claude Code writes 🤖 Generated with [Claude Code](https://claude.com/claude-code), but removeAgentCredits only unwraps links to claude.ai (the old footer URL). So the line never matches GENERATED_BY_AGENT and stays in the message. The Co-Authored-By: Claude <noreply@anthropic.com> trailer next to it is removed as expected, so only the footer is left behind.

To reproduce: merge a pull request whose body (or commits) ends with the current Claude Code footer while the setting is on. The merge commit body still contains the footer line.

Change

Add claude.com to the list of agent hosts whose markdown links are unwrapped before the footer check in packages/source-control-core/src/server/mergeMessage.ts. Nothing else changes: the footer still has to match the existing Generated with|by <agent> pattern, so ordinary prose that links to claude.com is kept.

Scope and approval

This is a very small fix for an obvious bug, so there is no prior issue. The feature (#16192) exists to strip agent footers, and its own test covers the Claude Code footer, but only in its older claude.ai/code form. The footer Claude Code writes today was missed. The fix is one host added to one regex, plus one focused test.

Verification

Added a test for the current footer to mergeMessage.test.ts.

Before the fix (upstream mergeMessage.ts, new test in place):

node_modules/.bin/vp test run packages/source-control-core/src/server/mergeMessage.test.ts
     × removes the footer Claude Code writes today, which links to claude.com
AssertionError: expected 'Details\n\n🤖 Generated with [Claude …' to be 'Details'
+ 🤖 Generated with [Claude Code](https://claude.com/claude-code)
      Tests  1 failed | 10 passed (11)

After the fix:

node_modules/.bin/vp test run packages/source-control-core/src/server/mergeMessage.test.ts
      Tests  11 passed (11)

Other checks:

• node_modules/.bin/vp test run packages/source-control-github/src/server/GitHubPullRequestApi.test.ts (calls removeAgentCredits during merges): 105 passed.
• vp lint --report-unused-disable-directives packages/source-control-core/src: clean.
• vp fmt --check packages/source-control-core/src: clean.
• tsc-rs --noEmit in packages/source-control-core: exit 0.

Not checked: I did not do a real merge on GitHub. The change only touches the text-cleaning function, and the unit tests cover it directly.

Claude Opus 5.5 (Claude Code desktop app)

🤖 Generated with Claude Code

[macroscopeapp]

Approvability

Verdict: Approved at 89850e8

Macroscope's review found this PR approvable — This is a focused bug fix that extends existing opt-in merge-message cleanup to Claude Code’s current claude.com footer, with a matching regression test. It does not alter defaults or broader production behavior.

^{You can add or adjust custom eligibility rules. Learn more.}

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Configuration used: Path: .coderabbit.config.ts
• Review profile: CHILL
• Plan: Advanced
• Run ID: 756dcd08-e8d4-46d7-bcb3-4833d2672525

📥 Commits

Reviewing files that changed from the base of the PR and between a12d6ed and 89850e8.

📒 Files selected for processing: 2

• packages/source-control-core/src/server/mergeMessage.test.ts
• packages/source-control-core/src/server/mergeMessage.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 8 remain after this review.

📝 Walkthrough

The removeAgentCredits matcher now recognizes agent-credit links hosted on claude.com. A test verifies that it removes the Claude Code footer and attribution while preserving the message content.

Changes: Agent credit removal

Layer / File(s)	Summary
Match and test Claude Code credits packages/source-control-core/src/server/mergeMessage.ts, packages/source-control-core/src/server/mergeMessage.test.ts	The matcher recognizes claude.com links. A test checks that the Claude Code footer and attribution are removed while "Details" remains.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~5 minutes

Change: Bug fix

Suggested reviewers: juliusmarminge

Merge Risk: ⚪ Minimal · up to 89850

The update removes the intended Claude Code attribution without affecting unrelated message content.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly and concisely describes the primary fix: removing Claude Code footers that use the current claude.com URL.
Description check		The description includes all required sections. It explains the problem, change, scope rationale, focused verification, observed results, and the untested real GitHub merge.
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

_{Comment @coderabbitai help to get the list of available commands.}