fix: normalize Source to service name for Claude Code tool call messages#2335
Merged
bradcypert merged 3 commits intomainfrom Apr 21, 2026
Merged
fix: normalize Source to service name for Claude Code tool call messages#2335bradcypert merged 3 commits intomainfrom
bradcypert merged 3 commits intomainfrom
Conversation
The PreToolUse and PostToolUse handlers hardcoded "ClaudeCode" while the
UserPromptSubmit/Stop handler used metadata.ServiceName ("claude-code"),
causing split values in the chat_messages.Source column for the same
session. Use metadata.ServiceName consistently across all four writes.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.
Tip: disable this comment in your organization's Code Review settings.
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
🦋 Changeset detectedLatest commit: cbf2930 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
adaam2
approved these changes
Apr 21, 2026
disintegrator
approved these changes
Apr 21, 2026
Member
|
Add a test? |
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Pins the invariant that all chat_messages rows produced by a single Claude Code session carry the same Source value. Exercises all four write paths (UserPromptSubmit/Stop/PreToolUse/PostToolUse/PostToolUseFailure) against a real Postgres test DB and asserts each row's Source matches metadata.ServiceName. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
The PreToolUse and PostToolUse handlers hardcoded "ClaudeCode" while the UserPromptSubmit/Stop handler used metadata.ServiceName ("claude-code"), causing split values in the chat_messages.Source column for the same session.
What changed
Use metadata.ServiceName consistently across all four writes.
Before
We were tracking both "ClaudeCode" and "claude-code" (from the service-name)
After
Just "claude-code"